From 62e10b80a968b325e5ca585172f2005e7460d5d9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 10 Feb 2016 18:04:44 +0100
Subject: [PATCH 0001/1569] Changed Pop-Up and updated Forms

---
 characters/js/directives.js    |  2 +-
 common/js/dismissal.js         | 11 ++++-------
 common/views/links.html        |  2 +-
 damage/views/popup/gather.html |  2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 9634da5d1..072b9cff7 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -56,7 +56,7 @@ directives.characterTable = function($rootScope, $timeout, $compile, $storage) {
             };
             // report link
             var link = $('<span class="help-link">Want to report or request something? Use <a>this form</a>.</span>');
-            link.find('a').attr('href', 'https://docs.google.com/forms/d/1jSlwN0Ruyc5bFfxdXlwihqfLdCiELX7HQTabXoCV7hU/viewform?usp=send_form');
+            link.find('a').attr('href', 'http://goo.gl/forms/4FWGgVOQKh');
             link.insertAfter($('.dataTables_length'));
             // pick column link
             var pick = $('<a id="pick-link" popover-placement="bottom" popover-trigger="click" popover-title="Additional Columns" ' +
diff --git a/common/js/dismissal.js b/common/js/dismissal.js
index 331569952..eaa020aed 100644
--- a/common/js/dismissal.js
+++ b/common/js/dismissal.js
@@ -14,14 +14,11 @@ app.controller('DismissalCtrl', function(ngDialog, $templateCache) {
 
     $templateCache.put('dismissal',
         '<div>' +
-            '<h4>Discontinuation Notice</h4>' +
+            '<h4>Important Notice</h4>' +
             '<div id="dismissalBody">' +
-                '<div>The site will be no longer kept updated due to dwindling interest and lack of time. ' +
-                'All past, present and future bugs will now become features.</div>' +
-                '<div>Existing data will not be removed, you will still be able to browse it.</div>' +
-                '<div>If someone is interested in picking up ' + 
-                    '<a href="https://github.com/optc/optc.github.io">the torch</a>, you are welcome to do so.</div>' +
-                '<div>You won\'t be shown this popup again once you click on the button.</div>' +
+                '<div>I\'m picking up this project for now.<br> For the beggining you can at least expect updates for the DB part of the project. It will probably be a while before I understand the rest of the code.</div>' +
+                '<div>That\'s it for now.</div>' +
+                '<div><br>You won\'t be shown this popup again once you click on the button.</div>' +
             '</div>' +
             '<br/>' +
             '<div class="ngdialog-buttons">' +
diff --git a/common/views/links.html b/common/views/links.html
index c74e3c0ee..a7e137425 100644
--- a/common/views/links.html
+++ b/common/views/links.html
@@ -8,7 +8,7 @@
 
         <div class="rotater" id="link-report" title="Bug report">
             <a class="btn btn-icon" target="_blank"
-                    href="https://docs.google.com/forms/d/1jSlwN0Ruyc5bFfxdXlwihqfLdCiELX7HQTabXoCV7hU/viewform?usp=send_form">
+                    href="http://goo.gl/forms/4FWGgVOQKh">
                 <i class="fa fa-flag"></i>
             </a>
             <a class="tip">Bug report</a>
diff --git a/damage/views/popup/gather.html b/damage/views/popup/gather.html
index dce18a46d..26c3e16e9 100644
--- a/damage/views/popup/gather.html
+++ b/damage/views/popup/gather.html
@@ -18,7 +18,7 @@
                         <li>They're <b>NOT</b> at max level</li>
                     </ol>
 
-                    please head over <a href="https://docs.google.com/forms/d/1cRYPbL6IY9Lz5wyAyBnisZtDvWrLYgEBKS6qwRX_Fqw/viewform">here</a> and complete the form (it takes like 20 seconds), any help is appreciated.
+                    please head over <a href="http://goo.gl/forms/oGMIPv3QTc">here</a> and complete the form (it takes like 20 seconds), any help is appreciated.
                     <br><br>
 
                     <div id="pickerUnits" class="modal-div">

From e676003527350957222b8be9e9e3fb1dde672c17 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 10 Feb 2016 19:22:03 +0100
Subject: [PATCH 0002/1569] Added Updates Box to Index

---
 index.css  | 27 +++++++++++++++++++++++++++
 index.html | 10 ++++++++++
 2 files changed, 37 insertions(+)

diff --git a/index.css b/index.css
index a213959d3..5e7f033c6 100644
--- a/index.css
+++ b/index.css
@@ -23,6 +23,33 @@ body {
     transform: translate3d(0,-50%,0);
 }
 
+#changelog {
+    position: relative;
+    margin-right: 25px;
+    top: 60%;
+    padding: 35px;
+    float: right;
+    background-color: #74B0E4;
+}
+
+#changelog > p {
+    width: 100%;
+    margin: auto;
+    text-align: center;
+    
+}
+
+#changelog > ul {
+    list-style-type: none;
+    text-align: left;
+    margin: auto;
+    padding-left: 0;
+}
+
+#update {
+    font-size: 20;    
+}
+
 .button {
     display: block;
     width: 250px;
diff --git a/index.html b/index.html
index 3744ff03f..4fda13776 100644
--- a/index.html
+++ b/index.html
@@ -19,6 +19,16 @@
             <a class="animated zoomInLeft button purple" href="slots">Slot Planner</a>
 
         </div> 
+        <div class="animated zoomIn blue" id="changelog">
+            <p id="update">Updates</p>
+            
+            <p>10.02.2016</p>
+            <br>
+            <ul>
+                <li>Updated Popup</li>
+                <li>Updated Contact Forms</li>
+            </ul>
+        </div>
     </body>
 
 </html>

From 6e0991d0aaacccab4383feefceb19ba7d514d84c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 10 Feb 2016 20:55:55 +0100
Subject: [PATCH 0003/1569] Create README.md

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..1599b4c01
--- /dev/null
+++ b/README.md
@@ -0,0 +1,9 @@
+# optc-db.github.io
+
+The Continuation of the highly loved and apreciated OPTC Database that has stopped being updated.
+
+For the beginning I will only update the Database part while figuring out how everything works.
+If you want to contribute or work together just shoot me a message on here or through the contact forms in the project itself.
+I will also be available on Reddit under Mondfischer
+
+I am also writing a few wiki entries while I figure everything out so feel free to check them out.

From 3d87923ab3435cbfb5348f106668bd36a012c9d8 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 10 Feb 2016 21:16:34 +0100
Subject: [PATCH 0004/1569] Disable Popup and Analytics

---
 characters/index.html  | 7 ++++---
 common/js/dismissal.js | 4 ++--
 damage/index.html      | 7 ++++---
 drops/index.html       | 7 ++++---
 index.html             | 2 +-
 mats/index.html        | 7 ++++---
 slots/index.html       | 7 ++++---
 7 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/characters/index.html b/characters/index.html
index 2c406572a..1a56ce60a 100644
--- a/characters/index.html
+++ b/characters/index.html
@@ -83,9 +83,10 @@
         (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');
-        ga('send', 'pageview', '/characters');
+         })
+//        (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+//        ga('create', 'UA-64769042-1', 'auto');
+//        ga('send', 'pageview', '/characters');
         </script>
 
         <error-report></error-report>
diff --git a/common/js/dismissal.js b/common/js/dismissal.js
index eaa020aed..1a7cb41fe 100644
--- a/common/js/dismissal.js
+++ b/common/js/dismissal.js
@@ -7,8 +7,8 @@ app.controller('DismissalCtrl', function(ngDialog, $templateCache) {
 
     var dismissalPopupShown = true;
 
-    try { dismissalPopupShown = JSON.parse(localStorage.getItem('dismissalShown')) || false; }
-    catch (e) { }
+//    try { dismissalPopupShown = JSON.parse(localStorage.getItem('dismissalShown')) || false; }
+//    catch (e) { }
 
     if (dismissalPopupShown) return;
 
diff --git a/damage/index.html b/damage/index.html
index 2bfdfa7ed..a29c8ebdc 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -83,9 +83,10 @@
           (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');
-          ga('send', 'pageview', '/damage');
+          })
+//          (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+//          ga('create', 'UA-64769042-1', 'auto');
+//          ga('send', 'pageview', '/damage');
         </script>
 
     </head>
diff --git a/drops/index.html b/drops/index.html
index d26173536..10767504b 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -148,9 +148,10 @@ <h1 class="page-header">Bonus Table</h1>
         (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');
-        ga('send', 'pageview', '/drops');
+         })
+//        (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+//        ga('create', 'UA-64769042-1', 'auto');
+//        ga('send', 'pageview', '/drops');
         </script>
 
         <error-report></error-report>
diff --git a/index.html b/index.html
index 4fda13776..b7e125b33 100644
--- a/index.html
+++ b/index.html
@@ -25,7 +25,7 @@
             <p>10.02.2016</p>
             <br>
             <ul>
-                <li>Updated Popup</li>
+                <li>Disabled Popup</li>
                 <li>Updated Contact Forms</li>
             </ul>
         </div>
diff --git a/mats/index.html b/mats/index.html
index 5ad5a60c5..0dff96dbf 100644
--- a/mats/index.html
+++ b/mats/index.html
@@ -56,9 +56,10 @@
         (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');
-        ga('send', 'pageview', '/mats');
+         })
+//        (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+//        ga('create', 'UA-64769042-1', 'auto');
+//        ga('send', 'pageview', '/mats');
         </script>
 
         <error-report></error-report>
diff --git a/slots/index.html b/slots/index.html
index 9400b58bb..41c4b500d 100644
--- a/slots/index.html
+++ b/slots/index.html
@@ -55,9 +55,10 @@
           (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');
-          ga('send', 'pageview', '/slots');
+          })
+//          (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+//          ga('create', 'UA-64769042-1', 'auto');
+//          ga('send', 'pageview', '/slots');
         </script>
 
     </head>

From 2620e4c3f415cbba36cf5ee619e9933dd0640e6e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 10 Feb 2016 22:36:59 +0100
Subject: [PATCH 0005/1569] Disable Changelog for now

---
 index.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.css b/index.css
index 5e7f033c6..e5ce5dd06 100644
--- a/index.css
+++ b/index.css
@@ -26,10 +26,11 @@ body {
 #changelog {
     position: relative;
     margin-right: 25px;
-    top: 60%;
+    top: 50%;
     padding: 35px;
     float: right;
     background-color: #74B0E4;
+    display: none;
 }
 
 #changelog > p {

From 71d85ce436a11c8a7ac59a461228d130067869fa Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 10 Feb 2016 22:49:13 +0100
Subject: [PATCH 0006/1569] Hopefully fixed Update Box for small Screens

Looked good on 1440p less so on smaller Screens
Now uses fixed position and disables itself on screens thinner than 1000px
---
 index.css | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/index.css b/index.css
index e5ce5dd06..19e14481c 100644
--- a/index.css
+++ b/index.css
@@ -24,13 +24,12 @@ body {
 }
 
 #changelog {
-    position: relative;
-    margin-right: 25px;
-    top: 50%;
+    position: fixed;
     padding: 35px;
     float: right;
-    background-color: #74B0E4;
-    display: none;
+    bottom: 10;
+    right: 10;
+    z-index: -1;
 }
 
 #changelog > p {
@@ -51,6 +50,12 @@ body {
     font-size: 20;    
 }
 
+@media only screen and (max-width: 1000px) { 
+  #changelog { 
+    display: none; 
+  } 
+}
+
 .button {
     display: block;
     width: 250px;

From 377a20d282342f75fa409a0fb26a8ce80f37776c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 11 Feb 2016 12:04:30 +0100
Subject: [PATCH 0007/1569] Added 5* Wedding Robin Max Stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 4456548dd..bbd78b83a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -914,9 +914,9 @@ window.units = [
 	[ "Brook, Harahetternia's Demon Lord", "QCK", [ "Freedom", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
 	[ "Brook, BONE to be Wild!!!", "QCK", [ "Freedom", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
 	[ "Nico Robin, Bride of Ohara", "QCK", [ "Knowledge", "Fighter" ], 4, 12, 4, 2, 50, null, 72, 38, 43, 899, 409, 105, 1 ],
-	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Knowledge", "Fighter" ], 5, 20, 4, 3, 99, null, 826, 327, 143, null, null, null, 0 ],
+	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Knowledge", "Fighter" ], 5, 20, 4, 3, 99, null, 826, 327, 143, 1851, 812, 371, 0 ],
 	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ]
-];
\ No newline at end of file
+];

From f357e75e6f4016c1f430fecf89ebf0b8400c846c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 11 Feb 2016 20:47:56 +0100
Subject: [PATCH 0008/1569] First Batch of Japanese aliases

---
 characters/opensearch.xml |   4 +-
 common/data/aliases.js    | 210 +++++++++++++++++++++++++++++++++++++-
 2 files changed, 208 insertions(+), 6 deletions(-)

diff --git a/characters/opensearch.xml b/characters/opensearch.xml
index 58273f5d0..bbd625b0d 100644
--- a/characters/opensearch.xml
+++ b/characters/opensearch.xml
@@ -3,6 +3,6 @@
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
     <ShortName>OPTC Character Table</ShortName>
     <Description></Description>
-    <Image width="16" height="16" type="image/x-icon">https://optc.github.io/favicon.ico</Image>
-    <Url type="text/html" template="https://optc.github.io/characters/#/search/{searchTerms}"/>
+    <Image width="16" height="16" type="image/x-icon">https://optc-db.github.io/favicon.ico</Image>
+    <Url type="text/html" template="https://optc-db.github.io/characters/#/search/{searchTerms}"/>
 </OpenSearchDescription>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 20b0d058c..dad7d6ca5 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,8 +1,210 @@
 window.aliases = {
-    4: [ 'G2' ],
-    15: [ 'GPU' ],
-    16: [ 'Usopp' ],
-    63: [ 'Hachi' ],
+    1: ['モンキー・D・ルフィ','Test'],
+    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)','Test'],
+    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ','Test'],
+    4: ['モンキー・D・ルフィ ギア２','G2'],
+    5: ['ロロノア・ゾロ','Test'],
+    6: ['ロロノア・ゾロ 三・千・世・界','Test'],
+    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）','Test'],
+    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）','Test'],
+    9: ['ナミ','Test'],
+    10: ['ナミ トルネード=テンポ','Test'],
+    11: ['ナミ 蜃気楼＝テンポ','Test'],
+    12: ['ナミ サンダーボルト=テンポ','Test'],
+    13: ['ウソップ','Test'],
+    14: ['ウソップ タバスコ星'],
+    15: ['ウソップ ゴールデンパウンド','GPU'],
+    16: [ 'そげキング','Usopp'],
+    17: ['サンジ'],
+    18: ['サンジ 整形ショット(パラージュショット)'],
+    19: ['料理人サンジ 焼き石シチュー'],
+    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)'],
+    21: ['トニートニー・チョッパー'],
+    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）'],
+    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）'],
+    24: ['トニートニー・チョッパー 腕力強化（アームポイント）'],
+    25: ['トニートニー・チョッパー 角強化（ホーンポイント）'],
+    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）'],
+    27: ['ヒグマ'],
+    28: ['近海の主（ヌシ）'],
+    29: ['金棒のアルビダ'],
+    30: ['金棒のアルビダ スベスベの実'],
+    31: ['コビー'],
+    32: ['雑用コビー'],
+    33: ['ヘルメッポ'],
+    34: ['雑用ヘルメッポ'],
+    35: ['斧手のモーガン'],
+    36: ['モージ＆リッチー'],
+    37: ['曲芸のカバジ'],
+    38: ['バギー'],
+    39: ['道化のバギー'],
+    40: ['ガイモン'],
+    41: ['シャム'],
+    42: ['ブチ'],
+    43: ['１・２のジャンゴ'],
+    44: ['ダンシングジャンゴ'],
+    45: ['キャプテン・クロ'],
+    46: ['百計のクロ'],
+    47: ['ヨサク'],
+    48: ['ジョニー'],
+    49: ['鉄拳のフルボディ'],
+    50: ['パティ'],
+    51: ['カルネ'],
+    52: ['料理長ゼフ'],
+    53: ['ギン'],
+    54: ['鬼人ギン'],
+    55: ['パール'],
+    56: ['ファイヤーパール'],
+    57: ['首領・クリーク'],
+    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」'],
+    59: ['ネズミ'],
+    60: ['モーム'],
+    61: ['チュウ'],
+    62: ['クロオビ'],
+    63: ['はっちゃん', 'Hachi' ],
+    64: ['六刀流のハチ'],
+    65: ['アーロン'],
+    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）'],
+    67: ['たしぎ'],
+    68: ['たしぎ 海軍本部少尉'],
+    69: ['スモーカー'],
+    70: ['白猟のスモーカー'],
+    71: ['ミス・ウェンズデー'],
+    72: ['ネフェルタリ・ビビ'],
+    73: ['王女ビビ'],
+    74: ['ポートガス・D・エース'],
+    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）'],
+    76: ['シャンクス'],
+    77: ['赤髪のシャンクス'],
+    78: ['赤盗人ペンギン'],
+    79: ['青盗人ペンギン'],
+    80: ['緑盗人ペンギン'],
+    81: ['黄盗人ペンギン'],
+    82: ['黒盗人ペンギン'],
+    83: ['虹盗人ペンギン'],
+    84: ['赤海賊ペンギン'],
+    85: ['赤海賊ペンギン'],
+    86: ['赤海賊ペンギン'],
+    87: ['赤海賊ペンギン'],
+    88: ['赤海賊ペンギン'],
+    89: ['赤カブトヤドカリ'],
+    90: ['赤カブトヤドカリ'],
+    91: ['赤カブトヤドカリ'],
+    92: ['赤カブトヤドカリ'],
+    93: ['赤カブトヤドカリ'],
+    94: ['赤カブトヤドカリ'],
+    95: ['赤ヨロイガニ'],
+    96: ['赤ヨロイガニ'],
+    97: ['赤ヨロイガニ'],
+    98: ['赤ヨロイガニ'],
+    99: ['赤ヨロイガニ'],
+    100: ['赤しま番竜'],
+    101: ['赤しま番竜'],
+    102: ['赤しま番竜'],
+    103: ['赤しま番竜'],
+    104: ['赤しま番竜'],
+    105: ['赤タカラガメ'],
+    106: ['赤タカラガメ'],
+    107: ['赤タカラガメ'],
+    108: ['赤タカラガメ'],
+    109: ['赤タカラガメ'],
+    110: ['赤ダイミョウガメ'],
+    111: ['赤ダイミョウガメ'],
+    112: ['赤ダイミョウガメ'],
+    113: ['赤ダイミョウガメ'],
+    114: ['赤ダイミョウガメ'],
+    115: ['タツノコ'],
+    116: ['タツノワカ'],
+    117: ['タツノミコト'],
+    118: ['タツノオウ'],
+    119: ['カタナ山賊'],
+    120: ['ピストル山賊'],
+    121: ['格闘隊 雑用 レッドパイレーツ'],
+    122: ['格闘隊 雑用 ブルーパイレーツ'],
+    123: ['格闘隊 雑用 グリーンパイレーツ'],
+    124: ['格闘隊 雑用 イエローパイレーツ'],
+    125: ['格闘隊 雑用 ブラックパイレーツ'],
+    126: ['斬撃隊 雑用 レッドパイレーツ'],
+    127: ['斬撃隊 雑用 ブルーパイレーツ'],
+    128: ['斬撃隊 雑用 グリーンパイレーツ'],
+    129: ['斬撃隊 雑用 イエローパイレーツ'],
+    130: ['斬撃隊 雑用 ブラックパイレーツ'],
+    131: ['突撃隊 雑用 レッドパイレーツ'],
+    132: ['突撃隊 雑用 ブルーパイレーツ'],
+    133: ['突撃隊 雑用 グリーンパイレーツ'],
+    134: ['突撃隊 雑用 イエローパイレーツ'],
+    135: ['突撃隊 雑用 ブラックパイレーツ'],
+    136: ['狙撃隊 雑用 レッドパイレーツ'],
+    137: ['狙撃隊 雑用 ブルーパイレーツ'],
+    138: ['狙撃隊 雑用 グリーンパイレーツ'],
+    139: ['狙撃隊 雑用 イエローパイレーツ'],
+    140: ['狙撃隊 雑用 ブラックパイレーツ'],
+    141: ['砲撃手 雑用'],
+    142: ['格闘隊 隊員 レッドパイレーツ'],
+    143: ['格闘隊 隊員 ブルーパイレーツ'],
+    144: ['格闘隊 隊員 グリーンパイレーツ'],
+    145: ['格闘隊 隊員 イエローパイレーツ'],
+    146: ['格闘隊 隊員 ブラックパイレーツ'],
+    147: ['斬撃隊 隊員 レッドパイレーツ'],
+    148: ['斬撃隊 隊員 ブルーパイレーツ'],
+    149: ['斬撃隊 隊員 グリーンパイレーツ'],
+    150: ['斬撃隊 隊員 イエローパイレーツ'],
+    151: ['斬撃隊 隊員 ブラックパイレーツ'],
+    152: ['突撃隊 隊員 レッドパイレーツ'],
+    153: ['突撃隊 隊員 ブルーパイレーツ'],
+    154: ['突撃隊 隊員 グリーンパイレーツ'],
+    155: ['突撃隊 隊員 イエローパイレーツ'],
+    156: ['突撃隊 隊員 ブラックパイレーツ'],
+    157: ['狙撃隊 隊員 レッドパイレーツ'],
+    158: ['狙撃隊 隊員 ブルーパイレーツ'],
+    159: ['狙撃隊 隊員 グリーンパイレーツ'],
+    160: ['狙撃隊 隊員 イエローパイレーツ'],
+    161: ['狙撃隊 隊員 ブラックパイレーツ'],
+    162: ['砲撃手 腕利き'],
+    163: ['ボディガード・サングラス'],
+    164: ['ボディガード・ヒゲ'],
+    165: ['ナックルごろつき クロネコ海賊団'],
+    166: ['サーベルごろつき クロネコ海賊団'],
+    167: ['ナギナタごろつき クロネコ海賊団'],
+    168: ['ピストルごろつき クロネコ海賊団'],
+    169: ['バズーカごろつき クロネコ海賊団'],
+    170: ['格闘隊 隊長'],
+    171: ['斬撃隊 隊長'],
+    172: ['突撃隊 隊長'],
+    173: ['狙撃隊 隊長'],
+    174: ['遊撃手 凄腕'],
+    175: ['空手使いの魚人 アーロン一味'],
+    176: ['カタナ使いの魚人 アーロン一味'],
+    177: ['ヤリ使いの魚人 アーロン一味'],
+    178: ['銃使いの魚人 アーロン一味'],
+    179: ['ナックル三等兵 海軍'],
+    180: ['サーベル三等兵 海軍'],
+    181: ['ナギナタ三等兵 海軍'],
+    182: ['ピストル三等兵 海軍'],
+    183: ['バズーカ三等兵 海軍'],
+    184: ['ナックル一等兵 海軍'],
+    185: ['サーベル一等兵 海軍'],
+    186: ['ナギナタ一等兵 海軍'],
+    187: ['ピストル一等兵 海軍'],
+    188: ['バズーカ一等兵 海軍'],
+    189: ['赤タイロウガメ'],
+    190: ['青タイロウガメ'],
+    191: ['青タイロウガメ'],
+    192: ['青タイロウガメ'],
+    193: ['青タイロウガメ'],
+    194: ['ナックル少尉 海軍本部'],
+    195: ['サーベル少尉 海軍本部'],
+    196: ['ナギナタ少尉 海軍本部'],
+    197: ['ピストル少尉 海軍本部'],
+    198: ['バズーカ少尉 海軍本部'],
+    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)'],
+    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）'],
+    201: ['ミス・バレンタイン'],
+    202: ['ミス・バレンタイン 1万キロギロチン'],
+    203: ['Mr.3'],
+    204: ['Mr.3 特大キャンドルサービスセット'],
+    205: ['ミス・ゴールデンウィーク'],
+    206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑'],
     207: [ 'Mr. 2 Bonclay' ],
     208: [ 'Mr. 2 Bonclay Bombardier Arabesque' ],
     209: [ 'Nico Robin' ],

From 87abf160ef7f968b21a28f20b6ec51dfbb2e4509 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 11 Feb 2016 16:30:47 -0600
Subject: [PATCH 0009/1569] Additional Aliases

Add aliases, updated update message on home
---
 common/data/aliases.js | 32 ++++++++++++++++----------------
 index.html             |  3 ++-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index dad7d6ca5..3df570ded 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,4 +1,4 @@
-window.aliases = {
+window.aliases = {
     1: ['モンキー・D・ルフィ','Test'],
     2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)','Test'],
     3: ['モンキー・D・ルフィ ゴムゴムのバズーカ','Test'],
@@ -197,18 +197,18 @@ window.aliases = {
     196: ['ナギナタ少尉 海軍本部'],
     197: ['ピストル少尉 海軍本部'],
     198: ['バズーカ少尉 海軍本部'],
-    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)'],
-    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）'],
+    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)', 'Mr 5'],
+    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）', 'Mr 5'],
     201: ['ミス・バレンタイン'],
     202: ['ミス・バレンタイン 1万キロギロチン'],
-    203: ['Mr.3'],
-    204: ['Mr.3 特大キャンドルサービスセット'],
+    203: ['Mr.3', 'Mr 3'],
+    204: ['Mr.3 特大キャンドルサービスセット', 'Mr 3'],
     205: ['ミス・ゴールデンウィーク'],
     206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑'],
-    207: [ 'Mr. 2 Bonclay' ],
-    208: [ 'Mr. 2 Bonclay Bombardier Arabesque' ],
+    207: [ 'Mr. 2 Bonclay', 'Mr 2 Bonclay' ],
+    208: [ 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
     209: [ 'Nico Robin' ],
-    217: [ 'Mistake', 'G3' ],
+    217: [ 'Gear 3', 'G3' ],
     221: [ 'Towel Nami' ],
     224: [ 'Sanji' ],
     225: [ 'Sanji' ],
@@ -244,15 +244,15 @@ window.aliases = {
     446: [ 'Blackbeard' ],
     450: [ 'Namur' ],
     451: [ 'One-Hit Namur' ],
-    461: [ 'Fugitive Bentham Mr. 2 Bonclay' ],
-    462: [ 'Prison Break Expert Mr. 2 Bonclay' ],
+    461: [ 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
+    462: [ 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
     472: [ 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
     473: [ 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
     474: [ 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
     475: [ 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
     476: [ 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
     517: [ 'Usoppun' ],
-    518: [ 'Usoppun, Pupil of Heracles\'n' ],
+    518: [ 'Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
     519: [ 'Strong World Luffy', 'SW Luffy' ],
     520: [ 'Strong World Luffy', 'SW Luffy' ],
     521: [ 'Strong World Sanji', 'SW Sanji' ],
@@ -335,8 +335,8 @@ window.aliases = {
     769: [ 'Halloween Brook' ],
     782: [ 'Kimono Tashigi' ],
     783: [ 'Kimono Tashigi' ],
-    786: [ 'Dr. Hiruruk' ],
-    787: [ 'Dr. Hiruruk, Quack Doctor' ],
+    786: [ 'Dr. Hiruruk', 'Dr Hiruruk'],
+    787: [ 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
     790: [ 'Usopp Pirates' ],
     791: [ 'Usopp Pirates' ],
     792: [ 'Iceberg' ],
@@ -359,9 +359,9 @@ window.aliases = {
     877: [ 'Giolla' ],
     878: [ 'Giolla, Donquixote Pirates' ],
     885: [ 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
-    886: [ 'Kimono Mr. 1' ],
+    886: [ 'Kimono Mr. 1', 'Kimono Mr 1' ],
     887: [ 'Kimono Buggy' ],
     897: [ 'Kimono Crocodile' ],
-    898: [ 'Kimono Mr. 3', 'Kimono Galdino' ],
-    899: [ 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay' ]
+    898: [ 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
+    899: [ 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ]
 };
diff --git a/index.html b/index.html
index b7e125b33..c4b58142e 100644
--- a/index.html
+++ b/index.html
@@ -22,11 +22,12 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>10.02.2016</p>
+            <p>11/02/2016</p>
             <br>
             <ul>
                 <li>Disabled Popup</li>
                 <li>Updated Contact Forms</li>
+			<li>Additional Search Aliases</li>
             </ul>
         </div>
     </body>

From 42d46c535998928dd29ed71b9891f19225f1a99c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 11 Feb 2016 17:11:23 -0600
Subject: [PATCH 0010/1569] Google Analytics

modified Analytics to our tracking data. Reactivated.
---
 README.md             |  2 +-
 characters/index.html |  6 +++---
 damage/index.html     |  6 +++---
 drops/index.html      |  6 +++---
 index.html            | 13 +++++++++++++
 mats/index.html       |  6 +++---
 slots/index.html      |  6 +++---
 7 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 1599b4c01..0cafb7d01 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,6 @@ The Continuation of the highly loved and apreciated OPTC Database that has stopp
 
 For the beginning I will only update the Database part while figuring out how everything works.
 If you want to contribute or work together just shoot me a message on here or through the contact forms in the project itself.
-I will also be available on Reddit under Mondfischer
+I will also be available on Reddit under Mondfischer. Included working on this project are several admins from optc-guide.com including Zeenigami and Xystos.
 
 I am also writing a few wiki entries while I figure everything out so feel free to check them out.
diff --git a/characters/index.html b/characters/index.html
index 1a56ce60a..749728deb 100644
--- a/characters/index.html
+++ b/characters/index.html
@@ -84,9 +84,9 @@
          (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');
-//        ga('send', 'pageview', '/characters');
+        (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', 'UA-73715806-1', 'auto');
+        ga('send', 'pageview', '/characters');
         </script>
 
         <error-report></error-report>
diff --git a/damage/index.html b/damage/index.html
index a29c8ebdc..ca472f8b4 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -84,9 +84,9 @@
           (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');
-//          ga('send', 'pageview', '/damage');
+          (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+          ga('create', 'UA-73715806-1', 'auto');
+          ga('send', 'pageview', '/damage');
         </script>
 
     </head>
diff --git a/drops/index.html b/drops/index.html
index 10767504b..e37e2c6ee 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -149,9 +149,9 @@ <h1 class="page-header">Bonus Table</h1>
          (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');
-//        ga('send', 'pageview', '/drops');
+        (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', 'UA-73715806-1', 'auto');
+        ga('send', 'pageview', '/drops');
         </script>
 
         <error-report></error-report>
diff --git a/index.html b/index.html
index c4b58142e..d3606dc48 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,19 @@
         <link rel="stylesheet" type="text/css" href="index.css" />
         <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
         <meta name="viewport" content="initial-scale=1, user-scalable=no, user-scalable=0">
+
+//Google Analytics
+<script>
+  (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-73715806-1', 'auto');
+  ga('send', 'pageview');
+
+</script>
+
     </head>
 
     <body>
diff --git a/mats/index.html b/mats/index.html
index 0dff96dbf..5a3afe75a 100644
--- a/mats/index.html
+++ b/mats/index.html
@@ -57,9 +57,9 @@
          (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');
-//        ga('send', 'pageview', '/mats');
+        (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', 'UA-73715806-1', 'auto');
+        ga('send', 'pageview', '/mats');
         </script>
 
         <error-report></error-report>
diff --git a/slots/index.html b/slots/index.html
index 41c4b500d..76da0ad8b 100644
--- a/slots/index.html
+++ b/slots/index.html
@@ -56,9 +56,9 @@
           (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');
-//          ga('send', 'pageview', '/slots');
+          (window,document,'script','//www.google-analytics.com/analytics.js','ga');
+          ga('create', 'UA-73715806-1', 'auto');
+          ga('send', 'pageview', '/slots');
         </script>
 
     </head>

From a47dad6e6434d2dbfa79eaa59dd7d0f60f358cb3 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 12 Feb 2016 00:19:36 +0100
Subject: [PATCH 0011/1569] Placeholder Alliases for all Characters

---
 common/data/aliases.js | 585 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 570 insertions(+), 15 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index dad7d6ca5..ce1405879 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,17 +1,17 @@
 window.aliases = {
-    1: ['モンキー・D・ルフィ','Test'],
-    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)','Test'],
-    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ','Test'],
-    4: ['モンキー・D・ルフィ ギア２','G2'],
-    5: ['ロロノア・ゾロ','Test'],
-    6: ['ロロノア・ゾロ 三・千・世・界','Test'],
-    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）','Test'],
-    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）','Test'],
-    9: ['ナミ','Test'],
-    10: ['ナミ トルネード=テンポ','Test'],
-    11: ['ナミ 蜃気楼＝テンポ','Test'],
-    12: ['ナミ サンダーボルト=テンポ','Test'],
-    13: ['ウソップ','Test'],
+    1: ['モンキー・D・ルフィ'],
+    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)'],
+    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ'],
+    4: ['モンキー・D・ルフィ ギア２','Monkey D. Luffy','G2'],
+    5: ['ロロノア・ゾロ'],
+    6: ['ロロノア・ゾロ 三・千・世・界'],
+    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）'],
+    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）'],
+    9: ['ナミ'],
+    10: ['ナミ トルネード=テンポ'],
+    11: ['ナミ 蜃気楼＝テンポ'],
+    12: ['ナミ サンダーボルト=テンポ'],
+    13: ['ウソップ'],
     14: ['ウソップ タバスコ星'],
     15: ['ウソップ ゴールデンパウンド','GPU'],
     16: [ 'そげキング','Usopp'],
@@ -208,49 +208,313 @@ window.aliases = {
     207: [ 'Mr. 2 Bonclay' ],
     208: [ 'Mr. 2 Bonclay Bombardier Arabesque' ],
     209: [ 'Nico Robin' ],
+    210: [''],
+    211: [''],
+    212: [''],
+    213: [''],
+    214: [''],
+    215: [''],
+    216: [''],
     217: [ 'Mistake', 'G3' ],
+    218: [''],
+    219: [''],
+    220: [''],
     221: [ 'Towel Nami' ],
+    222: [''],
+    223: [''],
     224: [ 'Sanji' ],
     225: [ 'Sanji' ],
+    226: [''],
+    227: [''],
+    228: [''],
+    229: [''],
+    230: [''],
+    231: [''],
+    232: [''],
+    233: [''],
+    234: [''],
+    235: [''],
+    236: [''],
+    237: [''],
+    238: [''],
+    239: [''],
+    240: [''],
+    241: [''],
+    242: [''],
+    243: [''],
+    244: [''],
+    245: [''],
+    246: [''],  
     247: [ 'Chopperman', 'Chopper Man' ],
     248: [ 'Monster Chopper' ],
     249: [ 'Monster Chopper' ],
+    250: [''],
+    251: [''],
+    252: [''],
+    253: [''],
+    254: [''],
+    255: [''],
+    256: [''],
+    257: [''],
+    258: [''],
+    259: [''],
     260: [ 'Whitebeard' ],
+    261: [''],
+    262: [''],
+    263: [''],
+    264: [''],
+    265: [''],
+    266: [''],
+    267: [''],
+    268: [''],
+    269: [''],
+    270: [''],
+    271: [''],
+    272: [''],
+    273: [''],
+    274: [''],
+    275: [''],
+    276: [''],
+    277: [''],
+    278: [''],
+    279: [''],
+    280: [''],
+    281: [''],
+    282: [''],
+    283: [''],
+    284: [''],
+    285: [''],
+    286: [''],
+    287: [''],
+    288: [''],
+    289: [''],
+    290: [''],
+    291: [''],
+    292: [''],
+    293: [''],
+    294: [''],
+    295: [''],
+    296: [''],
+    297: [''],
+    298: [''],
+    299: [''],
+    300: [''],
+    301: [''],
+    302: [''],
+    303: [''],
+    304: [''],
+    305: [''],
+    306: [''],
+    307: [''],
+    308: [''],
+    309: [''],
+    310: [''],
+    311: [''],
+    312: [''],
+    313: [''],
+    314: [''],
+    315: [''],
+    316: [''],
     317: [ 'Califa', 'Calipha', 'Kalipha' ],
     318: [ 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
+    319: [''],
+    320: [''],
+    321: [''],
+    322: [''],
+    323: [''],
+    324: [''],
+    325: [''],
+    326: [''],
+    327: [''],
+    328: [''],
+    329: [''],
+    330: [''],
+    331: [''],
+    332: [''],
+    333: [''],
     334: [ 'Lapahn', 'Lapan', 'Rapan' ],
     335: [ 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
+    336: [''],
+    337: [''],
+    338: [''],
+    339: [''],
+    340: [''],
+    341: [''],
+    342: [''],
+    343: [''],
+    344: [''],
+    345: [''],
+    346: [''],
+    347: [''],
+    348: [''],
+    349: [''],
+    350: [''],
+    351: [''],
+    352: [''],
+    353: [''],
+    354: [''],
+    355: [''],
+    356: [''],
+    357: [''],
+    358: [''],
+    359: [''],
+    360: [''],
+    361: [''],
+    362: [''],
+    363: [''],
+    364: [''],
+    365: [''],
+    366: [''],
+    367: [''],
+    368: [''],
+    369: [''],
+    370: [''],
+    371: [''],
+    372: [''],
+    373: [''],
+    374: [''],
+    375: [''],
+    376: [''],
+    377: [''],
+    378: [''],
+    379: [''],
+    380: [''],
+    381: [''],
+    382: [''],
     383: [ 'Crocodile' ],
     384: [ 'Strikerdile', 'Impactdile' ],
+    385: [''],
+    386: [''],
+    387: [''],
+    388: [''],
+    389: [''],
+    390: [''],
+    391: [''],
+    392: [''],
     393: [ 'Kumashi' ],
     394: [ 'Inuppe' ],
+    395: [''],
+    396: [''],
+    397: [''],
+    398: [''],
+    399: [''],
+    400: [''],
+    401: [''],
+    402: [''],
+    403: [''],
+    404: [''],
+    405: [''],
+    406: [''],
+    407: [''],
     408: [ 'Slasherdile' ],
     409: [ 'Jinbe', 'Jimbei', 'Jinbei' ],
     410: [ 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
+    411: [''],
+    412: [''],
+    413: [''],
+    414: [''],
+    415: [''],
+    416: [''],
     417: [ 'Doffy' ],
     418: [ 'Doffy' ],
     419: [ 'Kimono Sanji' ],
     420: [ 'Kimono Luffy' ],
     421: [ 'Kimono Zoro' ],
     422: [ 'Kimono Nami' ],
+    423: [''],
+    424: [''],
     425: [ 'Ryuuma' ],
+    426: [''],
+    427: [''],
+    428: [''],
+    429: [''],
+    430: [''],
+    431: [''],
     432: [ 'Sarkies' ],
+    433: [''],
+    434: [''],
+    435: [''],
+    436: [''],
     437: [ 'Valentine Perona' ],
     438: [ 'Valentine Perona' ],
     439: [ 'Valentine Vivi' ],
     440: [ 'Valentine Vivi' ],
+    441: [''],
+    442: [''],
+    443: [''],
     444: [ 'Carue', 'Karue' ],
     445: [ 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
     446: [ 'Blackbeard' ],
+    447: [''],
+    448: [''],
+    449: [''],
     450: [ 'Namur' ],
     451: [ 'One-Hit Namur' ],
+    452: [''],
+    453: [''],
+    454: [''],
+    455: [''],
+    456: [''],
+    457: [''],
+    458: [''],
+    459: [''],
+    460: [''],
     461: [ 'Fugitive Bentham Mr. 2 Bonclay' ],
     462: [ 'Prison Break Expert Mr. 2 Bonclay' ],
+    463: [''],
+    464: [''],
+    465: [''],
+    466: [''],
+    467: [''],
+    468: [''],
+    469: [''],
+    470: [''],
+    471: [''],
     472: [ 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
     473: [ 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
     474: [ 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
     475: [ 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
     476: [ 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
+    477: [''],
+    478: [''],
+    479: [''],
+    480: [''],
+    481: [''],
+    482: [''],
+    483: [''],
+    484: [''],
+    485: [''],
+    486: [''],
+    487: [''],
+    488: [''],
+    489: [''],
+    490: [''],
+    491: [''],
+    492: [''],
+    493: [''],
+    494: [''],
+    495: [''],
+    496: [''],
+    497: [''],
+    498: [''],
+    499: [''],
+    500: [''],
+    501: [''],
+    502: [''],
+    503: [''],
+    504: [''],
+    505: [''],
+    506: [''],
+    507: [''],
+    508: [''],
+    509: [''],
+    510: [''],
+    511: [''],
+    512: [''],
+    513: [''],
+    514: [''],
+    515: [''],
+    516: [''],
     517: [ 'Usoppun' ],
     518: [ 'Usoppun, Pupil of Heracles\'n' ],
     519: [ 'Strong World Luffy', 'SW Luffy' ],
@@ -271,10 +535,22 @@ window.aliases = {
     534: [ 'Sakura Brook' ],
     535: [ 'Sakura Nami' ],
     536: [ 'Sakura Nami' ],
+    537: [''],
+    538: [''],
+    539: [''],
+    540: [''],
+    541: [''],
+    542: [''],
     543: [ 'Wiper' ],
     544: [ 'Wiper, Descendant of Great Warrior Calgara' ],
     545: [ 'Enel' ],
     546: [ 'God Enel' ],
+    547: [''],
+    548: [''],
+    549: [''],
+    550: [''],
+    551: [''],
+    552: [''],
     553: [ 'Strong World Zoro', 'SW Zoro' ],
     554: [ 'Strong World Zoro', 'SW Zoro' ],
     555: [ 'Strong World Usopp', 'SW Usopp' ],
@@ -285,45 +561,204 @@ window.aliases = {
     560: [ 'Strong World Franky', 'SW Franky' ],
     561: [ 'Strong World Ace', 'SW Ace' ],
     562: [ 'Strong World Ace', 'SW Ace' ],
+    563: [''],
+    564: [''],
+    565: [''],
+    566: [''],
     567: [ 'Big Pan' ],
+    568: [''],
+    569: [''],
     570: [ 'Afro Luffy', 'Afroluffy' ],
     571: [ 'Afro Luffy', 'Afroluffy' ],
+    572: [''],
+    573: [''],
+    574: [''],
+    575: [''],
+    576: [''],
     577: [ 'Log Luffy' ],
     578: [ 'Log Luffy' ],
     579: [ 'Log Zoro' ],
     580: [ 'Log Zoro' ],
+    581: [''],
+    582: [''],
     583: [ 'Laki' ],
-    596: [ 'Log Chopper' ],
+    584: [''],
+    585: [''],
+    586: [''],
+    587: [''],
+    588: [''],
+    589: [''],
+    590: [''],
     591: [ 'Princess Turtle' ],
     592: [ 'Princess Turtle' ],
     593: [ 'Princess Turtle' ],
     594: [ 'Princess Turtle' ],
     595: [ 'Princess Turtle' ],
+    596: [ 'Log Chopper' ],
     597: [ 'Log Chopper' ],
+    598: [''],
+    599: [''],
+    600: [''],
+    601: [''],
     602: [ 'Enel, 200 Million Volt Thunder God' ],
     603: [ 'Enel the Lightning Human, 200 Million Volt Thunder God' ],
     604: [ 'Log Sanji' ],
     605: [ 'Log Sanji' ],
+    606: [''],
+    607: [''],
+    608: [''],
+    609: [''],
+    610: [''],
     611: [ 'Pudding Pudding' ],
     612: [ 'Log Brook' ],
     613: [ 'Log Brook' ],
+    614: [''],
+    615: [''],
+    616: [''],
+    617: [''],
+    618: [''],
+    619: [''],
+    620: [''],
+    621: [''],
+    622: [''],
+    623: [''],
+    624: [''],
+    625: [''],
+    626: [''],
+    627: [''],
+    628: [''],
+    629: [''],
+    630: [''],
+    631: [''],
+    632: [''],
+    633: [''],
+    634: [''],
+    635: [''],
+    636: [''],
     637: [ 'Hachi, Takoyaki Stand Owner' ],
+    638: [''],
+    639: [''],
+    640: [''],
+    641: [''],
+    642: [''],
+    643: [''],
+    644: [''],
+    645: [''],
+    646: [''],
+    647: [''],
+    648: [''],
+    649: [''],
     650: [ 'Log Nami' ],
     651: [ 'Log Nami' ],
+    652: [''],
+    653: [''],
+    654: [''],
+    655: [''],
+    656: [''],
+    657: [''],
+    658: [''],
+    659: [''],
     660: [ 'Log Usopp' ],
     661: [ 'Log Usopp' ],
+    662: [''],
+    663: [''],
+    664: [''],
+    665: [''],
+    666: [''],
+    667: [''],
+    668: [''],
+    669: [''],
+    670: [''],
+    671: [''],
+    672: [''],
+    673: [''],
+    674: [''],
+    675: [''],
+    676: [''],
+    677: [''],
     678: [ 'Log Robin' ],
     679: [ 'Log Robin' ],
+    680: [''],
+    681: [''],
+    682: [''],
+    683: [''],
+    684: [''],
+    685: [''],
+    686: [''],
+    687: [''],
+    688: [''],
+    689: [''],
+    690: [''],
+    691: [''],
+    692: [''],
+    693: [''],
+    694: [''],
+    695: [''],
+    696: [''],
+    697: [''],
+    698: [''],
+    699: [''],
+    700: [''],
+    701: [''],
+    702: [''],
+    703: [''],
+    704: [''],
+    705: [''],
+    706: [''],
+    707: [''],
+    708: [''],
+    709: [''],
     710: [ 'Log Franky' ],
     711: [ 'Log Franky' ],
+    712: [''],
+    713: [''],
+    714: [''],
+    715: [''],
+    716: [''],
+    717: [''],
+    718: [''],
+    719: [''],
+    720: [''],
+    721: [''],
+    722: [''],
+    723: [''],
+    724: [''],
     725: [ 'Log Vivi' ],
     726: [ 'Log Vivi' ],
+    727: [''],
     728: [ 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
     729: [ 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
+    730: [''],
+    731: [''],
+    732: [''],
+    733: [''],
+    734: [''],
+    735: [''],
+    736: [''],
+    737: [''],
+    738: [''],
+    739: [''],
+    740: [''],
+    741: [''],
+    742: [''],
+    743: [''],
     744: [ 'Log Ace' ],
     745: [ 'Log Ace' ],
+    746: [''],
+    747: [''],
+    748: [''],
+    749: [''],
+    750: [''],
     751: [ 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
     752: [ 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
+    753: [''],
+    754: [''],
+    755: [''],
+    756: [''],
+    757: [''],
+    758: [''],
+    759: [''],
+    760: [''],
     761: [ 'Halloween Luffy' ],
     762: [ 'Halloween Usopp' ],
     763: [ 'Halloween Franky' ],
@@ -333,35 +768,155 @@ window.aliases = {
     767: [ 'Halloween Robin' ],
     768: [ 'Halloween Sanji' ],
     769: [ 'Halloween Brook' ],
+    770: [''],
+    771: [''],
+    772: [''],
+    773: [''],
+    774: [''],
+    775: [''],
+    776: [''],
+    777: [''],
+    778: [''],
+    779: [''],
+    780: [''],
+    781: [''],
     782: [ 'Kimono Tashigi' ],
     783: [ 'Kimono Tashigi' ],
+    784: [''],
+    785: [''],
     786: [ 'Dr. Hiruruk' ],
     787: [ 'Dr. Hiruruk, Quack Doctor' ],
+    788: [''],
+    789: [''],
     790: [ 'Usopp Pirates' ],
     791: [ 'Usopp Pirates' ],
     792: [ 'Iceberg' ],
     793: [ 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
+    794: [''],
+    795: [''],
+    796: [''],
+    797: [''],
+    798: [''],
     799: [ 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
+    800: [''],
     801: [ 'Log Bon Clay', 'Log Bonclay' ],
     802: [ 'Log Bon Clay', 'Log Bonclay' ],
+    803: [''],
+    804: [''],
+    805: [''],
+    806: [''],
+    807: [''],
+    808: [''],
+    809: [''],
+    810: [''],
+    811: [''],
+    812: [''],
     813: [ 'Spider Monkey' ],
+    814: [''],
+    815: [''],
+    816: [''],
+    817: [''],
+    818: [''],
+    819: [''],
+    820: [''],
+    821: [''],
+    822: [''],
+    823: [''],
+    824: [''],
+    825: [''],
+    826: [''],
+    827: [''],
+    828: [''],
+    829: [''],
+    830: [''],
+    831: [''],
     832: [ 'Wiper, Warrior of Shandia' ],
     833: [ 'Berserker Wiper, Warrior of Shandia' ],
+    834: [''],
+    835: [''],
+    836: [''],
+    837: [''],
+    838: [''],
+    839: [''],
+    840: [''],
+    841: [''],
+    842: [''],
+    843: [''],
+    844: [''],
+    845: [''],
+    846: [''],
+    847: [''],
+    848: [''],
     849: [ 'Franky, Tom\'s Workers' ],
     850: [ 'Iceburg, Tom\'s Workers' ],
+    851: [''],
+    852: [''],
+    853: [''],
+    854: [''],
+    855: [''],
+    856: [''],
+    857: [''],
+    858: [''],
+    859: [''],
+    860: [''],
+    861: [''],
+    862: [''],
+    863: [''],
+    864: [''],
+    865: [''],
     866: [ 'Kimono Robin' ],
     867: [ 'Kimono Usopp' ],
     868: [ 'Kimono Chopper' ],
     869: [ 'Doffy' ],
     870: [ 'Doffy' ],
+    871: [''],
+    872: [''],
     873: [ 'Senor Pink', 'Senior Pink' ],
     874: [ 'Senor Pink', 'Senior Pink' ],
+    875: [''],
+    876: [''],
     877: [ 'Giolla' ],
     878: [ 'Giolla, Donquixote Pirates' ],
+    879: [''],
+    880: [''],
+    881: [''],
+    882: [''],
+    883: [''],
+    884: [''],
     885: [ 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
     886: [ 'Kimono Mr. 1' ],
     887: [ 'Kimono Buggy' ],
+    888: [''],
+    889: [''],
+    890: [''],
+    891: [''],
+    892: [''],
+    893: [''],
+    894: [''],
+    895: [''],
+    896: [''],
     897: [ 'Kimono Crocodile' ],
     898: [ 'Kimono Mr. 3', 'Kimono Galdino' ],
-    899: [ 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay' ]
+    899: [ 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay' ],
+    900: [''],
+    901: [''],
+    902: [''],
+    903: [''],
+    904: [''],
+    905: [''],
+    906: [''],
+    907: [''],
+    908: [''],
+    909: [''],
+    910: [''],
+    911: [''],
+    912: [''],
+    913: [''],
+    914: [''],
+    915: [''],
+    916: [''],
+    917: [''],
+    918: [''],
+    919: [''],
+    920: ['']
 };

From 96bf964fddb6870ba7597eab9c1b8c926da9d533 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 11 Feb 2016 17:22:16 -0600
Subject: [PATCH 0012/1569] Oops

wrong comment tag
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index d3606dc48..1f3d03e21 100644
--- a/index.html
+++ b/index.html
@@ -8,7 +8,7 @@
         <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
         <meta name="viewport" content="initial-scale=1, user-scalable=no, user-scalable=0">
 
-//Google Analytics
+<!-- Google Analytics -->
 <script>
   (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),

From 72c90d2f822b8cfd25966ba33852db8d31113670 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 12 Feb 2016 00:33:17 +0100
Subject: [PATCH 0013/1569] Quickfix for Aliases

Missed a , in there
---
 common/data/aliases.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 8f6663550..11ada15a0 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,4 +1,3 @@
-
 window.aliases = {
     1: ['モンキー・D・ルフィ'],
     2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)'],
@@ -898,7 +897,7 @@ window.aliases = {
     896: [''],
     897: [ 'Kimono Crocodile' ],
     898: [ 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
-    899: [ 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ]
+    899: [ 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
     900: [''],
     901: [''],
     902: [''],

From c1aff9e979b9b5610fbd6af9e89f318bd13f21e3 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 12 Feb 2016 10:55:52 +0100
Subject: [PATCH 0014/1569] Added missing Placeholders for French + 50 more JPN

---
 common/data/aliases.js | 1836 ++++++++++++++++++++--------------------
 1 file changed, 918 insertions(+), 918 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 11ada15a0..e6d4ae14d 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,922 +1,922 @@
 window.aliases = {
-    1: ['モンキー・D・ルフィ'],
-    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)'],
-    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ'],
-    4: ['モンキー・D・ルフィ ギア２','Monkey D. Luffy','G2'],
-    5: ['ロロノア・ゾロ'],
-    6: ['ロロノア・ゾロ 三・千・世・界'],
-    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）'],
-    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）'],
-    9: ['ナミ'],
-    10: ['ナミ トルネード=テンポ'],
-    11: ['ナミ 蜃気楼＝テンポ'],
-    12: ['ナミ サンダーボルト=テンポ'],
-    13: ['ウソップ'],
-    14: ['ウソップ タバスコ星'],
-    15: ['ウソップ ゴールデンパウンド','GPU'],
-    16: [ 'そげキング','Usopp'],
-    17: ['サンジ'],
-    18: ['サンジ 整形ショット(パラージュショット)'],
-    19: ['料理人サンジ 焼き石シチュー'],
-    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)'],
-    21: ['トニートニー・チョッパー'],
-    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）'],
-    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）'],
-    24: ['トニートニー・チョッパー 腕力強化（アームポイント）'],
-    25: ['トニートニー・チョッパー 角強化（ホーンポイント）'],
-    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）'],
-    27: ['ヒグマ'],
-    28: ['近海の主（ヌシ）'],
-    29: ['金棒のアルビダ'],
-    30: ['金棒のアルビダ スベスベの実'],
-    31: ['コビー'],
-    32: ['雑用コビー'],
-    33: ['ヘルメッポ'],
-    34: ['雑用ヘルメッポ'],
-    35: ['斧手のモーガン'],
-    36: ['モージ＆リッチー'],
-    37: ['曲芸のカバジ'],
-    38: ['バギー'],
-    39: ['道化のバギー'],
-    40: ['ガイモン'],
-    41: ['シャム'],
-    42: ['ブチ'],
-    43: ['１・２のジャンゴ'],
-    44: ['ダンシングジャンゴ'],
-    45: ['キャプテン・クロ'],
-    46: ['百計のクロ'],
-    47: ['ヨサク'],
-    48: ['ジョニー'],
-    49: ['鉄拳のフルボディ'],
-    50: ['パティ'],
-    51: ['カルネ'],
-    52: ['料理長ゼフ'],
-    53: ['ギン'],
-    54: ['鬼人ギン'],
-    55: ['パール'],
-    56: ['ファイヤーパール'],
-    57: ['首領・クリーク'],
-    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」'],
-    59: ['ネズミ'],
-    60: ['モーム'],
-    61: ['チュウ'],
-    62: ['クロオビ'],
-    63: ['はっちゃん', 'Hachi' ],
-    64: ['六刀流のハチ'],
-    65: ['アーロン'],
-    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）'],
-    67: ['たしぎ'],
-    68: ['たしぎ 海軍本部少尉'],
-    69: ['スモーカー'],
-    70: ['白猟のスモーカー'],
-    71: ['ミス・ウェンズデー'],
-    72: ['ネフェルタリ・ビビ'],
-    73: ['王女ビビ'],
-    74: ['ポートガス・D・エース'],
-    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）'],
-    76: ['シャンクス'],
-    77: ['赤髪のシャンクス'],
-    78: ['赤盗人ペンギン'],
-    79: ['青盗人ペンギン'],
-    80: ['緑盗人ペンギン'],
-    81: ['黄盗人ペンギン'],
-    82: ['黒盗人ペンギン'],
-    83: ['虹盗人ペンギン'],
-    84: ['赤海賊ペンギン'],
-    85: ['赤海賊ペンギン'],
-    86: ['赤海賊ペンギン'],
-    87: ['赤海賊ペンギン'],
-    88: ['赤海賊ペンギン'],
-    89: ['赤カブトヤドカリ'],
-    90: ['赤カブトヤドカリ'],
-    91: ['赤カブトヤドカリ'],
-    92: ['赤カブトヤドカリ'],
-    93: ['赤カブトヤドカリ'],
-    94: ['赤カブトヤドカリ'],
-    95: ['赤ヨロイガニ'],
-    96: ['赤ヨロイガニ'],
-    97: ['赤ヨロイガニ'],
-    98: ['赤ヨロイガニ'],
-    99: ['赤ヨロイガニ'],
-    100: ['赤しま番竜'],
-    101: ['赤しま番竜'],
-    102: ['赤しま番竜'],
-    103: ['赤しま番竜'],
-    104: ['赤しま番竜'],
-    105: ['赤タカラガメ'],
-    106: ['赤タカラガメ'],
-    107: ['赤タカラガメ'],
-    108: ['赤タカラガメ'],
-    109: ['赤タカラガメ'],
-    110: ['赤ダイミョウガメ'],
-    111: ['赤ダイミョウガメ'],
-    112: ['赤ダイミョウガメ'],
-    113: ['赤ダイミョウガメ'],
-    114: ['赤ダイミョウガメ'],
-    115: ['タツノコ'],
-    116: ['タツノワカ'],
-    117: ['タツノミコト'],
-    118: ['タツノオウ'],
-    119: ['カタナ山賊'],
-    120: ['ピストル山賊'],
-    121: ['格闘隊 雑用 レッドパイレーツ'],
-    122: ['格闘隊 雑用 ブルーパイレーツ'],
-    123: ['格闘隊 雑用 グリーンパイレーツ'],
-    124: ['格闘隊 雑用 イエローパイレーツ'],
-    125: ['格闘隊 雑用 ブラックパイレーツ'],
-    126: ['斬撃隊 雑用 レッドパイレーツ'],
-    127: ['斬撃隊 雑用 ブルーパイレーツ'],
-    128: ['斬撃隊 雑用 グリーンパイレーツ'],
-    129: ['斬撃隊 雑用 イエローパイレーツ'],
-    130: ['斬撃隊 雑用 ブラックパイレーツ'],
-    131: ['突撃隊 雑用 レッドパイレーツ'],
-    132: ['突撃隊 雑用 ブルーパイレーツ'],
-    133: ['突撃隊 雑用 グリーンパイレーツ'],
-    134: ['突撃隊 雑用 イエローパイレーツ'],
-    135: ['突撃隊 雑用 ブラックパイレーツ'],
-    136: ['狙撃隊 雑用 レッドパイレーツ'],
-    137: ['狙撃隊 雑用 ブルーパイレーツ'],
-    138: ['狙撃隊 雑用 グリーンパイレーツ'],
-    139: ['狙撃隊 雑用 イエローパイレーツ'],
-    140: ['狙撃隊 雑用 ブラックパイレーツ'],
-    141: ['砲撃手 雑用'],
-    142: ['格闘隊 隊員 レッドパイレーツ'],
-    143: ['格闘隊 隊員 ブルーパイレーツ'],
-    144: ['格闘隊 隊員 グリーンパイレーツ'],
-    145: ['格闘隊 隊員 イエローパイレーツ'],
-    146: ['格闘隊 隊員 ブラックパイレーツ'],
-    147: ['斬撃隊 隊員 レッドパイレーツ'],
-    148: ['斬撃隊 隊員 ブルーパイレーツ'],
-    149: ['斬撃隊 隊員 グリーンパイレーツ'],
-    150: ['斬撃隊 隊員 イエローパイレーツ'],
-    151: ['斬撃隊 隊員 ブラックパイレーツ'],
-    152: ['突撃隊 隊員 レッドパイレーツ'],
-    153: ['突撃隊 隊員 ブルーパイレーツ'],
-    154: ['突撃隊 隊員 グリーンパイレーツ'],
-    155: ['突撃隊 隊員 イエローパイレーツ'],
-    156: ['突撃隊 隊員 ブラックパイレーツ'],
-    157: ['狙撃隊 隊員 レッドパイレーツ'],
-    158: ['狙撃隊 隊員 ブルーパイレーツ'],
-    159: ['狙撃隊 隊員 グリーンパイレーツ'],
-    160: ['狙撃隊 隊員 イエローパイレーツ'],
-    161: ['狙撃隊 隊員 ブラックパイレーツ'],
-    162: ['砲撃手 腕利き'],
-    163: ['ボディガード・サングラス'],
-    164: ['ボディガード・ヒゲ'],
-    165: ['ナックルごろつき クロネコ海賊団'],
-    166: ['サーベルごろつき クロネコ海賊団'],
-    167: ['ナギナタごろつき クロネコ海賊団'],
-    168: ['ピストルごろつき クロネコ海賊団'],
-    169: ['バズーカごろつき クロネコ海賊団'],
-    170: ['格闘隊 隊長'],
-    171: ['斬撃隊 隊長'],
-    172: ['突撃隊 隊長'],
-    173: ['狙撃隊 隊長'],
-    174: ['遊撃手 凄腕'],
-    175: ['空手使いの魚人 アーロン一味'],
-    176: ['カタナ使いの魚人 アーロン一味'],
-    177: ['ヤリ使いの魚人 アーロン一味'],
-    178: ['銃使いの魚人 アーロン一味'],
-    179: ['ナックル三等兵 海軍'],
-    180: ['サーベル三等兵 海軍'],
-    181: ['ナギナタ三等兵 海軍'],
-    182: ['ピストル三等兵 海軍'],
-    183: ['バズーカ三等兵 海軍'],
-    184: ['ナックル一等兵 海軍'],
-    185: ['サーベル一等兵 海軍'],
-    186: ['ナギナタ一等兵 海軍'],
-    187: ['ピストル一等兵 海軍'],
-    188: ['バズーカ一等兵 海軍'],
-    189: ['赤タイロウガメ'],
-    190: ['青タイロウガメ'],
-    191: ['青タイロウガメ'],
-    192: ['青タイロウガメ'],
-    193: ['青タイロウガメ'],
-    194: ['ナックル少尉 海軍本部'],
-    195: ['サーベル少尉 海軍本部'],
-    196: ['ナギナタ少尉 海軍本部'],
-    197: ['ピストル少尉 海軍本部'],
-    198: ['バズーカ少尉 海軍本部'],
-    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)', 'Mr 5'],
-    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）', 'Mr 5'],
-    201: ['ミス・バレンタイン'],
-    202: ['ミス・バレンタイン 1万キロギロチン'],
-    203: ['Mr.3', 'Mr 3'],
-    204: ['Mr.3 特大キャンドルサービスセット', 'Mr 3'],
-    205: ['ミス・ゴールデンウィーク'],
-    206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑'],
-    207: [ 'Mr. 2 Bonclay', 'Mr 2 Bonclay' ],
-    208: [ 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
-    209: [ 'Nico Robin' ],
-    210: [''],
-    211: [''],
-    212: [''],
-    213: [''],
-    214: [''],
-    215: [''],
-    216: [''],
-    217: [ 'Mistake', 'G3','Gear 3' ],
-    218: [''],
-    219: [''],
-    220: [''],
-    221: [ 'Towel Nami' ],
-    222: [''],
-    223: [''],
-    224: [ 'Sanji' ],
-    225: [ 'Sanji' ],
-    226: [''],
-    227: [''],
-    228: [''],
-    229: [''],
-    230: [''],
-    231: [''],
-    232: [''],
-    233: [''],
-    234: [''],
-    235: [''],
-    236: [''],
-    237: [''],
-    238: [''],
-    239: [''],
-    240: [''],
-    241: [''],
-    242: [''],
-    243: [''],
-    244: [''],
-    245: [''],
-    246: [''],  
-    247: [ 'Chopperman', 'Chopper Man' ],
-    248: [ 'Monster Chopper' ],
-    249: [ 'Monster Chopper' ],
-    250: [''],
-    251: [''],
-    252: [''],
-    253: [''],
-    254: [''],
-    255: [''],
-    256: [''],
-    257: [''],
-    258: [''],
-    259: [''],
-    260: [ 'Whitebeard' ],
-    261: [''],
-    262: [''],
-    263: [''],
-    264: [''],
-    265: [''],
-    266: [''],
-    267: [''],
-    268: [''],
-    269: [''],
-    270: [''],
-    271: [''],
-    272: [''],
-    273: [''],
-    274: [''],
-    275: [''],
-    276: [''],
-    277: [''],
-    278: [''],
-    279: [''],
-    280: [''],
-    281: [''],
-    282: [''],
-    283: [''],
-    284: [''],
-    285: [''],
-    286: [''],
-    287: [''],
-    288: [''],
-    289: [''],
-    290: [''],
-    291: [''],
-    292: [''],
-    293: [''],
-    294: [''],
-    295: [''],
-    296: [''],
-    297: [''],
-    298: [''],
-    299: [''],
-    300: [''],
-    301: [''],
-    302: [''],
-    303: [''],
-    304: [''],
-    305: [''],
-    306: [''],
-    307: [''],
-    308: [''],
-    309: [''],
-    310: [''],
-    311: [''],
-    312: [''],
-    313: [''],
-    314: [''],
-    315: [''],
-    316: [''],
-    317: [ 'Califa', 'Calipha', 'Kalipha' ],
-    318: [ 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
-    319: [''],
-    320: [''],
-    321: [''],
-    322: [''],
-    323: [''],
-    324: [''],
-    325: [''],
-    326: [''],
-    327: [''],
-    328: [''],
-    329: [''],
-    330: [''],
-    331: [''],
-    332: [''],
-    333: [''],
-    334: [ 'Lapahn', 'Lapan', 'Rapan' ],
-    335: [ 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
-    336: [''],
-    337: [''],
-    338: [''],
-    339: [''],
-    340: [''],
-    341: [''],
-    342: [''],
-    343: [''],
-    344: [''],
-    345: [''],
-    346: [''],
-    347: [''],
-    348: [''],
-    349: [''],
-    350: [''],
-    351: [''],
-    352: [''],
-    353: [''],
-    354: [''],
-    355: [''],
-    356: [''],
-    357: [''],
-    358: [''],
-    359: [''],
-    360: [''],
-    361: [''],
-    362: [''],
-    363: [''],
-    364: [''],
-    365: [''],
-    366: [''],
-    367: [''],
-    368: [''],
-    369: [''],
-    370: [''],
-    371: [''],
-    372: [''],
-    373: [''],
-    374: [''],
-    375: [''],
-    376: [''],
-    377: [''],
-    378: [''],
-    379: [''],
-    380: [''],
-    381: [''],
-    382: [''],
-    383: [ 'Crocodile' ],
-    384: [ 'Strikerdile', 'Impactdile' ],
-    385: [''],
-    386: [''],
-    387: [''],
-    388: [''],
-    389: [''],
-    390: [''],
-    391: [''],
-    392: [''],
-    393: [ 'Kumashi' ],
-    394: [ 'Inuppe' ],
-    395: [''],
-    396: [''],
-    397: [''],
-    398: [''],
-    399: [''],
-    400: [''],
-    401: [''],
-    402: [''],
-    403: [''],
-    404: [''],
-    405: [''],
-    406: [''],
-    407: [''],
-    408: [ 'Slasherdile' ],
-    409: [ 'Jinbe', 'Jimbei', 'Jinbei' ],
-    410: [ 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
-    411: [''],
-    412: [''],
-    413: [''],
-    414: [''],
-    415: [''],
-    416: [''],
-    417: [ 'Doffy' ],
-    418: [ 'Doffy' ],
-    419: [ 'Kimono Sanji' ],
-    420: [ 'Kimono Luffy' ],
-    421: [ 'Kimono Zoro' ],
-    422: [ 'Kimono Nami' ],
-    423: [''],
-    424: [''],
-    425: [ 'Ryuuma' ],
-    426: [''],
-    427: [''],
-    428: [''],
-    429: [''],
-    430: [''],
-    431: [''],
-    432: [ 'Sarkies' ],
-    433: [''],
-    434: [''],
-    435: [''],
-    436: [''],
-    437: [ 'Valentine Perona' ],
-    438: [ 'Valentine Perona' ],
-    439: [ 'Valentine Vivi' ],
-    440: [ 'Valentine Vivi' ],
-    441: [''],
-    442: [''],
-    443: [''],
-    444: [ 'Carue', 'Karue' ],
-    445: [ 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
-    446: [ 'Blackbeard' ],
-    447: [''],
-    448: [''],
-    449: [''],
-    450: [ 'Namur' ],
-    451: [ 'One-Hit Namur' ],
-    452: [''],
-    453: [''],
-    454: [''],
-    455: [''],
-    456: [''],
-    457: [''],
-    458: [''],
-    459: [''],
-    460: [''],
-    461: [ 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
-    462: [ 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
-    463: [''],
-    464: [''],
-    465: [''],
-    466: [''],
-    467: [''],
-    468: [''],
-    469: [''],
-    470: [''],
-    471: [''],
-    472: [ 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
-    473: [ 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
-    474: [ 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
-    475: [ 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
-    476: [ 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
-    477: [''],
-    478: [''],
-    479: [''],
-    480: [''],
-    481: [''],
-    482: [''],
-    483: [''],
-    484: [''],
-    485: [''],
-    486: [''],
-    487: [''],
-    488: [''],
-    489: [''],
-    490: [''],
-    491: [''],
-    492: [''],
-    493: [''],
-    494: [''],
-    495: [''],
-    496: [''],
-    497: [''],
-    498: [''],
-    499: [''],
-    500: [''],
-    501: [''],
-    502: [''],
-    503: [''],
-    504: [''],
-    505: [''],
-    506: [''],
-    507: [''],
-    508: [''],
-    509: [''],
-    510: [''],
-    511: [''],
-    512: [''],
-    513: [''],
-    514: [''],
-    515: [''],
-    516: [''],
-    517: [ 'Usoppun' ],
-    518: [ 'Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
-    519: [ 'Strong World Luffy', 'SW Luffy' ],
-    520: [ 'Strong World Luffy', 'SW Luffy' ],
-    521: [ 'Strong World Sanji', 'SW Sanji' ],
-    522: [ 'Strong World Sanji', 'SW Sanji' ],
-    523: [ 'Strong World Nami', 'SW Nami' ],
-    524: [ 'Strong World Nami', 'SW Nami' ],
-    525: [ 'Strong World Brook', 'SW Brook' ],
-    526: [ 'Strong World Brook', 'SW Brook' ],
-    527: [ 'Strong World Chopper', 'SW Chopper' ],
-    528: [ 'Strong World Chopper', 'SW Chopper' ],
-    529: [ 'Strong World Shanks', 'SW Shanks' ],
-    530: [ 'Strong World Shanks', 'SW Shanks' ],
-    531: [ 'Sakura Robin' ],
-    532: [ 'Sakura Robin' ],
-    533: [ 'Sakura Brook' ],
-    534: [ 'Sakura Brook' ],
-    535: [ 'Sakura Nami' ],
-    536: [ 'Sakura Nami' ],
-    537: [''],
-    538: [''],
-    539: [''],
-    540: [''],
-    541: [''],
-    542: [''],
-    543: [ 'Wiper' ],
-    544: [ 'Wiper, Descendant of Great Warrior Calgara' ],
-    545: [ 'Enel' ],
-    546: [ 'God Enel' ],
-    547: [''],
-    548: [''],
-    549: [''],
-    550: [''],
-    551: [''],
-    552: [''],
-    553: [ 'Strong World Zoro', 'SW Zoro' ],
-    554: [ 'Strong World Zoro', 'SW Zoro' ],
-    555: [ 'Strong World Usopp', 'SW Usopp' ],
-    556: [ 'Strong World Usopp', 'SW Usopp' ],
-    557: [ 'Strong World Robin', 'SW Robin' ],
-    558: [ 'Strong World Robin', 'SW Robin' ],
-    559: [ 'Strong World Franky', 'SW Franky' ],
-    560: [ 'Strong World Franky', 'SW Franky' ],
-    561: [ 'Strong World Ace', 'SW Ace' ],
-    562: [ 'Strong World Ace', 'SW Ace' ],
-    563: [''],
-    564: [''],
-    565: [''],
-    566: [''],
-    567: [ 'Big Pan' ],
-    568: [''],
-    569: [''],
-    570: [ 'Afro Luffy', 'Afroluffy' ],
-    571: [ 'Afro Luffy', 'Afroluffy' ],
-    572: [''],
-    573: [''],
-    574: [''],
-    575: [''],
-    576: [''],
-    577: [ 'Log Luffy' ],
-    578: [ 'Log Luffy' ],
-    579: [ 'Log Zoro' ],
-    580: [ 'Log Zoro' ],
-    581: [''],
-    582: [''],
-    583: [ 'Laki' ],
-    584: [''],
-    585: [''],
-    586: [''],
-    587: [''],
-    588: [''],
-    589: [''],
-    590: [''],
-    591: [ 'Princess Turtle' ],
-    592: [ 'Princess Turtle' ],
-    593: [ 'Princess Turtle' ],
-    594: [ 'Princess Turtle' ],
-    595: [ 'Princess Turtle' ],
-    596: [ 'Log Chopper' ],
-    597: [ 'Log Chopper' ],
-    598: [''],
-    599: [''],
-    600: [''],
-    601: [''],
-    602: [ 'Enel, 200 Million Volt Thunder God' ],
-    603: [ 'Enel the Lightning Human, 200 Million Volt Thunder God' ],
-    604: [ 'Log Sanji' ],
-    605: [ 'Log Sanji' ],
-    606: [''],
-    607: [''],
-    608: [''],
-    609: [''],
-    610: [''],
-    611: [ 'Pudding Pudding' ],
-    612: [ 'Log Brook' ],
-    613: [ 'Log Brook' ],
-    614: [''],
-    615: [''],
-    616: [''],
-    617: [''],
-    618: [''],
-    619: [''],
-    620: [''],
-    621: [''],
-    622: [''],
-    623: [''],
-    624: [''],
-    625: [''],
-    626: [''],
-    627: [''],
-    628: [''],
-    629: [''],
-    630: [''],
-    631: [''],
-    632: [''],
-    633: [''],
-    634: [''],
-    635: [''],
-    636: [''],
-    637: [ 'Hachi, Takoyaki Stand Owner' ],
-    638: [''],
-    639: [''],
-    640: [''],
-    641: [''],
-    642: [''],
-    643: [''],
-    644: [''],
-    645: [''],
-    646: [''],
-    647: [''],
-    648: [''],
-    649: [''],
-    650: [ 'Log Nami' ],
-    651: [ 'Log Nami' ],
-    652: [''],
-    653: [''],
-    654: [''],
-    655: [''],
-    656: [''],
-    657: [''],
-    658: [''],
-    659: [''],
+    1: ['モンキー・D・ルフィ',''],
+    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)',''],
+    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ',''],
+    4: ['モンキー・D・ルフィ ギア２','','Monkey D. Luffy','G2'],
+    5: ['ロロノア・ゾロ',''],
+    6: ['ロロノア・ゾロ 三・千・世・界',''],
+    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）',''],
+    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）',''],
+    9: ['ナミ',''],
+    10: ['ナミ トルネード=テンポ',''],
+    11: ['ナミ 蜃気楼＝テンポ',''],
+    12: ['ナミ サンダーボルト=テンポ',''],
+    13: ['ウソップ',''],
+    14: ['ウソップ タバスコ星',''],
+    15: ['ウソップ ゴールデンパウンド','','GPU'],
+    16: [ 'そげキング','','Usopp'],
+    17: ['サンジ',''],
+    18: ['サンジ 整形ショット(パラージュショット)',''],
+    19: ['料理人サンジ 焼き石シチュー',''],
+    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)',''],
+    21: ['トニートニー・チョッパー',''],
+    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）',''],
+    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）',''],
+    24: ['トニートニー・チョッパー 腕力強化（アームポイント）',''],
+    25: ['トニートニー・チョッパー 角強化（ホーンポイント）',''],
+    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）',''],
+    27: ['ヒグマ',''],
+    28: ['近海の主（ヌシ）',''],
+    29: ['金棒のアルビダ',''],
+    30: ['金棒のアルビダ スベスベの実',''],
+    31: ['コビー',''],
+    32: ['雑用コビー',''],
+    33: ['ヘルメッポ',''],
+    34: ['雑用ヘルメッポ',''],
+    35: ['斧手のモーガン',''],
+    36: ['モージ＆リッチー',''],
+    37: ['曲芸のカバジ',''],
+    38: ['バギー',''],
+    39: ['道化のバギー',''],
+    40: ['ガイモン',''],
+    41: ['シャム',''],
+    42: ['ブチ',''],
+    43: ['１・２のジャンゴ',''],
+    44: ['ダンシングジャンゴ',''],
+    45: ['キャプテン・クロ',''],
+    46: ['百計のクロ',''],
+    47: ['ヨサク',''],
+    48: ['ジョニー',''],
+    49: ['鉄拳のフルボディ',''],
+    50: ['パティ',''],
+    51: ['カルネ',''],
+    52: ['料理長ゼフ',''],
+    53: ['ギン',''],
+    54: ['鬼人ギン',''],
+    55: ['パール',''],
+    56: ['ファイヤーパール',''],
+    57: ['首領・クリーク',''],
+    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」',''],
+    59: ['ネズミ',''],
+    60: ['モーム',''],
+    61: ['チュウ',''],
+    62: ['クロオビ',''],
+    63: ['はっちゃん','', 'Hachi' ],
+    64: ['六刀流のハチ',''],
+    65: ['アーロン',''],
+    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）',''],
+    67: ['たしぎ',''],
+    68: ['たしぎ 海軍本部少尉',''],
+    69: ['スモーカー',''],
+    70: ['白猟のスモーカー',''],
+    71: ['ミス・ウェンズデー',''],
+    72: ['ネフェルタリ・ビビ',''],
+    73: ['王女ビビ',''],
+    74: ['ポートガス・D・エース',''],
+    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）',''],
+    76: ['シャンクス',''],
+    77: ['赤髪のシャンクス',''],
+    78: ['赤盗人ペンギン',''],
+    79: ['青盗人ペンギン',''],
+    80: ['緑盗人ペンギン',''],
+    81: ['黄盗人ペンギン',''],
+    82: ['黒盗人ペンギン',''],
+    83: ['虹盗人ペンギン',''],
+    84: ['赤海賊ペンギン',''],
+    85: ['赤海賊ペンギン',''],
+    86: ['赤海賊ペンギン',''],
+    87: ['赤海賊ペンギン',''],
+    88: ['赤海賊ペンギン',''],
+    89: ['赤カブトヤドカリ',''],
+    90: ['赤カブトヤドカリ',''],
+    91: ['赤カブトヤドカリ',''],
+    92: ['赤カブトヤドカリ',''],
+    93: ['赤カブトヤドカリ',''],
+    94: ['赤カブトヤドカリ',''],
+    95: ['赤ヨロイガニ',''],
+    96: ['赤ヨロイガニ',''],
+    97: ['赤ヨロイガニ',''],
+    98: ['赤ヨロイガニ',''],
+    99: ['赤ヨロイガニ',''],
+    100: ['赤しま番竜',''],
+    101: ['赤しま番竜',''],
+    102: ['赤しま番竜',''],
+    103: ['赤しま番竜',''],
+    104: ['赤しま番竜',''],
+    105: ['赤タカラガメ',''],
+    106: ['赤タカラガメ',''],
+    107: ['赤タカラガメ',''],
+    108: ['赤タカラガメ',''],
+    109: ['赤タカラガメ',''],
+    110: ['赤ダイミョウガメ',''],
+    111: ['赤ダイミョウガメ',''],
+    112: ['赤ダイミョウガメ',''],
+    113: ['赤ダイミョウガメ',''],
+    114: ['赤ダイミョウガメ',''],
+    115: ['タツノコ',''],
+    116: ['タツノワカ',''],
+    117: ['タツノミコト',''],
+    118: ['タツノオウ',''],
+    119: ['カタナ山賊',''],
+    120: ['ピストル山賊',''],
+    121: ['格闘隊 雑用 レッドパイレーツ',''],
+    122: ['格闘隊 雑用 ブルーパイレーツ',''],
+    123: ['格闘隊 雑用 グリーンパイレーツ',''],
+    124: ['格闘隊 雑用 イエローパイレーツ',''],
+    125: ['格闘隊 雑用 ブラックパイレーツ',''],
+    126: ['斬撃隊 雑用 レッドパイレーツ',''],
+    127: ['斬撃隊 雑用 ブルーパイレーツ',''],
+    128: ['斬撃隊 雑用 グリーンパイレーツ',''],
+    129: ['斬撃隊 雑用 イエローパイレーツ',''],
+    130: ['斬撃隊 雑用 ブラックパイレーツ',''],
+    131: ['突撃隊 雑用 レッドパイレーツ',''],
+    132: ['突撃隊 雑用 ブルーパイレーツ',''],
+    133: ['突撃隊 雑用 グリーンパイレーツ',''],
+    134: ['突撃隊 雑用 イエローパイレーツ',''],
+    135: ['突撃隊 雑用 ブラックパイレーツ',''],
+    136: ['狙撃隊 雑用 レッドパイレーツ',''],
+    137: ['狙撃隊 雑用 ブルーパイレーツ',''],
+    138: ['狙撃隊 雑用 グリーンパイレーツ',''],
+    139: ['狙撃隊 雑用 イエローパイレーツ',''],
+    140: ['狙撃隊 雑用 ブラックパイレーツ',''],
+    141: ['砲撃手 雑用',''],
+    142: ['格闘隊 隊員 レッドパイレーツ',''],
+    143: ['格闘隊 隊員 ブルーパイレーツ',''],
+    144: ['格闘隊 隊員 グリーンパイレーツ',''],
+    145: ['格闘隊 隊員 イエローパイレーツ',''],
+    146: ['格闘隊 隊員 ブラックパイレーツ',''],
+    147: ['斬撃隊 隊員 レッドパイレーツ',''],
+    148: ['斬撃隊 隊員 ブルーパイレーツ',''],
+    149: ['斬撃隊 隊員 グリーンパイレーツ',''],
+    150: ['斬撃隊 隊員 イエローパイレーツ',''],
+    151: ['斬撃隊 隊員 ブラックパイレーツ',''],
+    152: ['突撃隊 隊員 レッドパイレーツ',''],
+    153: ['突撃隊 隊員 ブルーパイレーツ',''],
+    154: ['突撃隊 隊員 グリーンパイレーツ',''],
+    155: ['突撃隊 隊員 イエローパイレーツ',''],
+    156: ['突撃隊 隊員 ブラックパイレーツ',''],
+    157: ['狙撃隊 隊員 レッドパイレーツ',''],
+    158: ['狙撃隊 隊員 ブルーパイレーツ',''],
+    159: ['狙撃隊 隊員 グリーンパイレーツ',''],
+    160: ['狙撃隊 隊員 イエローパイレーツ',''],
+    161: ['狙撃隊 隊員 ブラックパイレーツ',''],
+    162: ['砲撃手 腕利き',''],
+    163: ['ボディガード・サングラス',''],
+    164: ['ボディガード・ヒゲ',''],
+    165: ['ナックルごろつき クロネコ海賊団',''],
+    166: ['サーベルごろつき クロネコ海賊団',''],
+    167: ['ナギナタごろつき クロネコ海賊団',''],
+    168: ['ピストルごろつき クロネコ海賊団',''],
+    169: ['バズーカごろつき クロネコ海賊団',''],
+    170: ['格闘隊 隊長',''],
+    171: ['斬撃隊 隊長',''],
+    172: ['突撃隊 隊長',''],
+    173: ['狙撃隊 隊長',''],
+    174: ['遊撃手 凄腕',''],
+    175: ['空手使いの魚人 アーロン一味',''],
+    176: ['カタナ使いの魚人 アーロン一味',''],
+    177: ['ヤリ使いの魚人 アーロン一味',''],
+    178: ['銃使いの魚人 アーロン一味',''],
+    179: ['ナックル三等兵 海軍',''],
+    180: ['サーベル三等兵 海軍',''],
+    181: ['ナギナタ三等兵 海軍',''],
+    182: ['ピストル三等兵 海軍',''],
+    183: ['バズーカ三等兵 海軍',''],
+    184: ['ナックル一等兵 海軍',''],
+    185: ['サーベル一等兵 海軍',''],
+    186: ['ナギナタ一等兵 海軍',''],
+    187: ['ピストル一等兵 海軍',''],
+    188: ['バズーカ一等兵 海軍',''],
+    189: ['赤タイロウガメ',''],
+    190: ['青タイロウガメ',''],
+    191: ['青タイロウガメ',''],
+    192: ['青タイロウガメ',''],
+    193: ['青タイロウガメ',''],
+    194: ['ナックル少尉 海軍本部',''],
+    195: ['サーベル少尉 海軍本部',''],
+    196: ['ナギナタ少尉 海軍本部',''],
+    197: ['ピストル少尉 海軍本部',''],
+    198: ['バズーカ少尉 海軍本部',''],
+    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)','', 'Mr 5'],
+    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）','', 'Mr 5'],
+    201: ['ミス・バレンタイン',''],
+    202: ['ミス・バレンタイン 1万キロギロチン',''],
+    203: ['Mr.3',''],
+    204: ['Mr.3 特大キャンドルサービスセット','', 'Mr 3'],
+    205: ['ミス・ゴールデンウィーク',''],
+    206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑',''],
+    207: ['Mr.2・ボン・クレー ','', 'Mr. 2 Bonclay', 'Mr 2 Bonclay' ],
+    208: ['Mr.2・ボン・クレー  爆撃白鳥アラベスク(ボンバルディエ)','', 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
+    209: ['ミス・オールサンデー バロックワークス副社長','', 'Nico Robin' ],
+    210: ['ニコ・ロビン',''],
+    211: ['Mr.9',''],
+    212: ['Mr.9 （熱血ナイン根性バット）',''],
+    213: ['ラブーン',''],
+    214: ['ラブーン(ルフィ落書き)',''],
+    215: ['大王イカ',''],
+    216: ['モンキー・D・ルフィ（ゴムゴムの風船）',''],
+    217: ['モンキー・D・ルフィ（ギア３）','', 'Mistake', 'G3','Gear 3' ],
+    218: ['ゾロ_刀狼流し（とうろうながし）',''],
+    219: ['ロロノア・ゾロ_獅子歌歌（ししソンソン）',''],
+    220: ['ナミ（ファイン=テンポ）',''],
+    221: ['ナミ（幸せパンチ）','', 'Towel Nami' ],
+    222: ['ウソップ（ウソップハンマー）',''],
+    223: ['ウソップ（衝撃（インパクト））',''],
+    224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji' ],
+    225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji' ],
+    226: ['ジュラキュール・ミホーク',''],
+    227: ['鷹の目のミホーク',''],
+    228: ['脱獄モーガン',''],
+    229: ['寝返りのジャンゴ',''],
+    230: ['両鉄拳のフルボディ',''],
+    231: ['ヒナ',''],
+    232: ['黒檻のヒナ',''],
+    233: ['Mr.8',''],
+    234: ['Mr.8 イガラッパッパ',''],
+    235: ['ミス・マンデー',''],
+    236: ['ミス・マンデー カ・イ・リ・キ メリケン',''],
+    237: ['ナックルミリオンズ バロックワークス',''],
+    238: ['サーベルミリオンズ バロックワークス',''],
+    239: ['ナギナタミリオンズ バロックワークス',''],
+    240: ['ピストルミリオンズ バロックワークス',''],
+    241: ['バズーカミリオンズ バロックワークス',''],
+    242: ['ナックルビリオンズ バロックワークス',''],
+    243: ['サーベルビリオンズ バロックワークス',''],
+    244: ['ナギナタビリオンズ バロックワークス',''],
+    245: ['ピストルビリオンズ バロックワークス',''],
+    246: ['バズーカビリオンズ バロックワークス',''],  
+    247: ['チョッパーマン','', 'Chopperman', 'Chopper Man' ],
+    248: ['トニートニー・チョッパー 暴走前','', 'Monster Chopper' ],
+    249: ['トニートニー・チョッパー 暴走後','', 'Monster Chopper' ],
+    250: ['マルコ',''],
+    251: ['',''],
+    252: ['',''],
+    253: ['',''],
+    254: ['',''],
+    255: ['',''],
+    256: ['',''],
+    257: ['',''],
+    258: ['',''],
+    259: ['',''],
+    260: ['','', 'Whitebeard' ],
+    261: ['',''],
+    262: ['',''],
+    263: ['',''],
+    264: ['',''],
+    265: ['',''],
+    266: ['',''],
+    267: ['',''],
+    268: ['',''],
+    269: ['',''],
+    270: ['',''],
+    271: ['',''],
+    272: ['',''],
+    273: ['',''],
+    274: ['',''],
+    275: ['',''],
+    276: ['',''],
+    277: ['',''],
+    278: ['',''],
+    279: ['',''],
+    280: ['',''],
+    281: ['',''],
+    282: ['',''],
+    283: ['',''],
+    284: ['',''],
+    285: ['',''],
+    286: ['',''],
+    287: ['',''],
+    288: ['',''],
+    289: ['',''],
+    290: ['',''],
+    291: ['',''],
+    292: ['',''],
+    293: ['',''],
+    294: ['',''],
+    295: ['',''],
+    296: ['',''],
+    297: ['',''],
+    298: ['',''],
+    299: ['',''],
+    300: ['',''],
+    301: ['',''],
+    302: ['',''],
+    303: ['',''],
+    304: ['',''],
+    305: ['',''],
+    306: ['',''],
+    307: ['',''],
+    308: ['',''],
+    309: ['',''],
+    310: ['',''],
+    311: ['',''],
+    312: ['',''],
+    313: ['',''],
+    314: ['',''],
+    315: ['',''],
+    316: ['',''],
+    317: ['','', 'Califa', 'Calipha', 'Kalipha' ],
+    318: ['','', 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
+    319: ['',''],
+    320: ['',''],
+    321: ['',''],
+    322: ['',''],
+    323: ['',''],
+    324: ['',''],
+    325: ['',''],
+    326: ['',''],
+    327: ['',''],
+    328: ['',''],
+    329: ['',''],
+    330: ['',''],
+    331: ['',''],
+    332: ['',''],
+    333: ['',''],
+    334: ['','', 'Lapahn', 'Lapan', 'Rapan' ],
+    335: ['','', 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
+    336: ['',''],
+    337: ['',''],
+    338: ['',''],
+    339: ['',''],
+    340: ['',''],
+    341: ['',''],
+    342: ['',''],
+    343: ['',''],
+    344: ['',''],
+    345: ['',''],
+    346: ['',''],
+    347: ['',''],
+    348: ['',''],
+    349: ['',''],
+    350: ['',''],
+    351: ['',''],
+    352: ['',''],
+    353: ['',''],
+    354: ['',''],
+    355: ['',''],
+    356: ['',''],
+    357: ['',''],
+    358: ['',''],
+    359: ['',''],
+    360: ['',''],
+    361: ['',''],
+    362: ['',''],
+    363: ['',''],
+    364: ['',''],
+    365: ['',''],
+    366: ['',''],
+    367: ['',''],
+    368: ['',''],
+    369: ['',''],
+    370: ['',''],
+    371: ['',''],
+    372: ['',''],
+    373: ['',''],
+    374: ['',''],
+    375: ['',''],
+    376: ['',''],
+    377: ['',''],
+    378: ['',''],
+    379: ['',''],
+    380: ['',''],
+    381: ['',''],
+    382: ['',''],
+    383: ['','', 'Crocodile' ],
+    384: ['','', 'Strikerdile', 'Impactdile' ],
+    385: ['',''],
+    386: ['',''],
+    387: ['',''],
+    388: ['',''],
+    389: ['',''],
+    390: ['',''],
+    391: ['',''],
+    392: ['',''],
+    393: ['','', 'Kumashi' ],
+    394: ['','', 'Inuppe' ],
+    395: ['',''],
+    396: ['',''],
+    397: ['',''],
+    398: ['',''],
+    399: ['',''],
+    400: ['',''],
+    401: ['',''],
+    402: ['',''],
+    403: ['',''],
+    404: ['',''],
+    405: ['',''],
+    406: ['',''],
+    407: ['',''],
+    408: ['','', 'Slasherdile' ],
+    409: ['','', 'Jinbe', 'Jimbei', 'Jinbei' ],
+    410: ['','', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
+    411: ['',''],
+    412: ['',''],
+    413: ['',''],
+    414: ['',''],
+    415: ['',''],
+    416: ['',''],
+    417: ['','', 'Doffy' ],
+    418: ['','', 'Doffy' ],
+    419: ['','', 'Kimono Sanji' ],
+    420: ['','', 'Kimono Luffy' ],
+    421: ['','', 'Kimono Zoro' ],
+    422: ['','', 'Kimono Nami' ],
+    423: ['',''],
+    424: ['',''],
+    425: ['','', 'Ryuuma' ],
+    426: ['',''],
+    427: ['',''],
+    428: ['',''],
+    429: ['',''],
+    430: ['',''],
+    431: ['',''],
+    432: ['','', 'Sarkies' ],
+    433: ['',''],
+    434: ['',''],
+    435: ['',''],
+    436: ['',''],
+    437: ['','', 'Valentine Perona' ],
+    438: ['','', 'Valentine Perona' ],
+    439: ['','', 'Valentine Vivi' ],
+    440: ['','', 'Valentine Vivi' ],
+    441: ['',''],
+    442: ['',''],
+    443: ['',''],
+    444: ['','', 'Carue', 'Karue' ],
+    445: ['','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
+    446: ['','', 'Blackbeard' ],
+    447: ['',''],
+    448: ['',''],
+    449: ['',''],
+    450: ['','', 'Namur' ],
+    451: ['','', 'One-Hit Namur' ],
+    452: ['',''],
+    453: ['',''],
+    454: ['',''],
+    455: ['',''],
+    456: ['',''],
+    457: ['',''],
+    458: ['',''],
+    459: ['',''],
+    460: ['',''],
+    461: ['','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
+    462: ['','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
+    463: ['',''],
+    464: ['',''],
+    465: ['',''],
+    466: ['',''],
+    467: ['',''],
+    468: ['',''],
+    469: ['',''],
+    470: ['',''],
+    471: ['',''],
+    472: ['','', 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
+    473: ['','', 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
+    474: ['','', 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
+    475: ['','', 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
+    476: ['','', 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
+    477: ['',''],
+    478: ['',''],
+    479: ['',''],
+    480: ['',''],
+    481: ['',''],
+    482: ['',''],
+    483: ['',''],
+    484: ['',''],
+    485: ['',''],
+    486: ['',''],
+    487: ['',''],
+    488: ['',''],
+    489: ['',''],
+    490: ['',''],
+    491: ['',''],
+    492: ['',''],
+    493: ['',''],
+    494: ['',''],
+    495: ['',''],
+    496: ['',''],
+    497: ['',''],
+    498: ['',''],
+    499: ['',''],
+    500: ['',''],
+    501: ['',''],
+    502: ['',''],
+    503: ['',''],
+    504: ['',''],
+    505: ['',''],
+    506: ['',''],
+    507: ['',''],
+    508: ['',''],
+    509: ['',''],
+    510: ['',''],
+    511: ['',''],
+    512: ['',''],
+    513: ['',''],
+    514: ['',''],
+    515: ['',''],
+    516: ['',''],
+    517: ['','', 'Usoppun' ],
+    518: ['','', 'Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
+    519: ['','', 'Strong World Luffy', 'SW Luffy' ],
+    520: ['','', 'Strong World Luffy', 'SW Luffy' ],
+    521: ['','', 'Strong World Sanji', 'SW Sanji' ],
+    522: ['','', 'Strong World Sanji', 'SW Sanji' ],
+    523: ['','', 'Strong World Nami', 'SW Nami' ],
+    524: ['','', 'Strong World Nami', 'SW Nami' ],
+    525: ['','', 'Strong World Brook', 'SW Brook' ],
+    526: ['','', 'Strong World Brook', 'SW Brook' ],
+    527: ['','', 'Strong World Chopper', 'SW Chopper' ],
+    528: ['','', 'Strong World Chopper', 'SW Chopper' ],
+    529: ['','', 'Strong World Shanks', 'SW Shanks' ],
+    530: ['','', 'Strong World Shanks', 'SW Shanks' ],
+    531: ['','', 'Sakura Robin' ],
+    532: ['','', 'Sakura Robin' ],
+    533: ['','', 'Sakura Brook' ],
+    534: ['','', 'Sakura Brook' ],
+    535: ['','', 'Sakura Nami' ],
+    536: ['','', 'Sakura Nami' ],
+    537: ['',''],
+    538: ['',''],
+    539: ['',''],
+    540: ['',''],
+    541: ['',''],
+    542: ['',''],
+    543: ['','', 'Wiper' ],
+    544: ['','', 'Wiper, Descendant of Great Warrior Calgara' ],
+    545: ['','', 'Enel' ],
+    546: ['','', 'God Enel' ],
+    547: ['',''],
+    548: ['',''],
+    549: ['',''],
+    550: ['',''],
+    551: ['',''],
+    552: ['',''],
+    553: ['','', 'Strong World Zoro', 'SW Zoro' ],
+    554: ['','', 'Strong World Zoro', 'SW Zoro' ],
+    555: ['','', 'Strong World Usopp', 'SW Usopp' ],
+    556: ['','', 'Strong World Usopp', 'SW Usopp' ],
+    557: ['','', 'Strong World Robin', 'SW Robin' ],
+    558: ['','', 'Strong World Robin', 'SW Robin' ],
+    559: ['','', 'Strong World Franky', 'SW Franky' ],
+    560: ['','', 'Strong World Franky', 'SW Franky' ],
+    561: ['','', 'Strong World Ace', 'SW Ace' ],
+    562: ['','', 'Strong World Ace', 'SW Ace' ],
+    563: ['',''],
+    564: ['',''],
+    565: ['',''],
+    566: ['',''],
+    567: ['','', 'Big Pan' ],
+    568: ['',''],
+    569: ['',''],
+    570: ['','', 'Afro Luffy', 'Afroluffy' ],
+    571: ['','', 'Afro Luffy', 'Afroluffy' ],
+    572: ['',''],
+    573: ['',''],
+    574: ['',''],
+    575: ['',''],
+    576: ['',''],
+    577: ['','', 'Log Luffy' ],
+    578: ['','', 'Log Luffy' ],
+    579: ['','', 'Log Zoro' ],
+    580: ['','', 'Log Zoro' ],
+    581: ['',''],
+    582: ['',''],
+    583: ['','', 'Laki' ],
+    584: ['',''],
+    585: ['',''],
+    586: ['',''],
+    587: ['',''],
+    588: ['',''],
+    589: ['',''],
+    590: ['',''],
+    591: ['','', 'Princess Turtle' ],
+    592: ['','', 'Princess Turtle' ],
+    593: ['','', 'Princess Turtle' ],
+    594: ['','', 'Princess Turtle' ],
+    595: ['','', 'Princess Turtle' ],
+    596: ['','', 'Log Chopper' ],
+    597: ['','', 'Log Chopper' ],
+    598: ['',''],
+    599: ['',''],
+    600: ['',''],
+    601: ['',''],
+    602: ['','', 'Enel, 200 Million Volt Thunder God' ],
+    603: ['','', 'Enel the Lightning Human, 200 Million Volt Thunder God' ],
+    604: ['','', 'Log Sanji' ],
+    605: ['','', 'Log Sanji' ],
+    606: ['',''],
+    607: ['',''],
+    608: ['',''],
+    609: ['',''],
+    610: ['',''],
+    611: ['','', 'Pudding Pudding' ],
+    612: ['','', 'Log Brook' ],
+    613: ['','','Log Brook' ],
+    614: ['',''],
+    615: ['',''],
+    616: ['',''],
+    617: ['',''],
+    618: ['',''],
+    619: ['',''],
+    620: ['',''],
+    621: ['',''],
+    622: ['',''],
+    623: ['',''],
+    624: ['',''],
+    625: ['',''],
+    626: ['',''],
+    627: ['',''],
+    628: ['',''],
+    629: ['',''],
+    630: ['',''],
+    631: ['',''],
+    632: ['',''],
+    633: ['',''],
+    634: ['',''],
+    635: ['',''],
+    636: ['',''],
+    637: ['','', 'Hachi, Takoyaki Stand Owner' ],
+    638: ['',''],
+    639: ['',''],
+    640: ['',''],
+    641: ['',''],
+    642: ['',''],
+    643: ['',''],
+    644: ['',''],
+    645: ['',''],
+    646: ['',''],
+    647: ['',''],
+    648: ['',''],
+    649: ['',''],
+    650: ['','', 'Log Nami' ],
+    651: ['','', 'Log Nami' ],
+    652: ['',''],
+    653: ['',''],
+    654: ['',''],
+    655: ['',''],
+    656: ['',''],
+    657: ['',''],
+    658: ['',''],
+    659: ['',''],
     660: [ 'Log Usopp' ],
     661: [ 'Log Usopp' ],
-    662: [''],
-    663: [''],
-    664: [''],
-    665: [''],
-    666: [''],
-    667: [''],
-    668: [''],
-    669: [''],
-    670: [''],
-    671: [''],
-    672: [''],
-    673: [''],
-    674: [''],
-    675: [''],
-    676: [''],
-    677: [''],
-    678: [ 'Log Robin' ],
-    679: [ 'Log Robin' ],
-    680: [''],
-    681: [''],
-    682: [''],
-    683: [''],
-    684: [''],
-    685: [''],
-    686: [''],
-    687: [''],
-    688: [''],
-    689: [''],
-    690: [''],
-    691: [''],
-    692: [''],
-    693: [''],
-    694: [''],
-    695: [''],
-    696: [''],
-    697: [''],
-    698: [''],
-    699: [''],
-    700: [''],
-    701: [''],
-    702: [''],
-    703: [''],
-    704: [''],
-    705: [''],
-    706: [''],
-    707: [''],
-    708: [''],
-    709: [''],
-    710: [ 'Log Franky' ],
-    711: [ 'Log Franky' ],
-    712: [''],
-    713: [''],
-    714: [''],
-    715: [''],
-    716: [''],
-    717: [''],
-    718: [''],
-    719: [''],
-    720: [''],
-    721: [''],
-    722: [''],
-    723: [''],
-    724: [''],
-    725: [ 'Log Vivi' ],
-    726: [ 'Log Vivi' ],
-    727: [''],
-    728: [ 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
-    729: [ 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
-    730: [''],
-    731: [''],
-    732: [''],
-    733: [''],
-    734: [''],
-    735: [''],
-    736: [''],
-    737: [''],
-    738: [''],
-    739: [''],
-    740: [''],
-    741: [''],
-    742: [''],
-    743: [''],
-    744: [ 'Log Ace' ],
-    745: [ 'Log Ace' ],
-    746: [''],
-    747: [''],
-    748: [''],
-    749: [''],
-    750: [''],
-    751: [ 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
-    752: [ 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
-    753: [''],
-    754: [''],
-    755: [''],
-    756: [''],
-    757: [''],
-    758: [''],
-    759: [''],
-    760: [''],
-    761: [ 'Halloween Luffy' ],
-    762: [ 'Halloween Usopp' ],
-    763: [ 'Halloween Franky' ],
-    764: [ 'Halloween Nami' ],
-    765: [ 'Halloween Chopper' ],
-    766: [ 'Halloween Zoro' ],
-    767: [ 'Halloween Robin' ],
-    768: [ 'Halloween Sanji' ],
-    769: [ 'Halloween Brook' ],
-    770: [''],
-    771: [''],
-    772: [''],
-    773: [''],
-    774: [''],
-    775: [''],
-    776: [''],
-    777: [''],
-    778: [''],
-    779: [''],
-    780: [''],
-    781: [''],
-    782: [ 'Kimono Tashigi' ],
-    783: [ 'Kimono Tashigi' ],
-    784: [''],
-    785: [''],
-    786: [ 'Dr. Hiruruk', 'Dr Hiruruk'],
-    787: [ 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
-    788: [''],
-    789: [''],
-    790: [ 'Usopp Pirates' ],
-    791: [ 'Usopp Pirates' ],
-    792: [ 'Iceberg' ],
-    793: [ 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
-    794: [''],
-    795: [''],
-    796: [''],
-    797: [''],
-    798: [''],
-    799: [ 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
-    800: [''],
-    801: [ 'Log Bon Clay', 'Log Bonclay' ],
-    802: [ 'Log Bon Clay', 'Log Bonclay' ],
-    803: [''],
-    804: [''],
-    805: [''],
-    806: [''],
-    807: [''],
-    808: [''],
-    809: [''],
-    810: [''],
-    811: [''],
-    812: [''],
-    813: [ 'Spider Monkey' ],
-    814: [''],
-    815: [''],
-    816: [''],
-    817: [''],
-    818: [''],
-    819: [''],
-    820: [''],
-    821: [''],
-    822: [''],
-    823: [''],
-    824: [''],
-    825: [''],
-    826: [''],
-    827: [''],
-    828: [''],
-    829: [''],
-    830: [''],
-    831: [''],
-    832: [ 'Wiper, Warrior of Shandia' ],
-    833: [ 'Berserker Wiper, Warrior of Shandia' ],
-    834: [''],
-    835: [''],
-    836: [''],
-    837: [''],
-    838: [''],
-    839: [''],
-    840: [''],
-    841: [''],
-    842: [''],
-    843: [''],
-    844: [''],
-    845: [''],
-    846: [''],
-    847: [''],
-    848: [''],
-    849: [ 'Franky, Tom\'s Workers' ],
-    850: [ 'Iceburg, Tom\'s Workers' ],
-    851: [''],
-    852: [''],
-    853: [''],
-    854: [''],
-    855: [''],
-    856: [''],
-    857: [''],
-    858: [''],
-    859: [''],
-    860: [''],
-    861: [''],
-    862: [''],
-    863: [''],
-    864: [''],
-    865: [''],
-    866: [ 'Kimono Robin' ],
-    867: [ 'Kimono Usopp' ],
-    868: [ 'Kimono Chopper' ],
-    869: [ 'Doffy' ],
-    870: [ 'Doffy' ],
-    871: [''],
-    872: [''],
-    873: [ 'Senor Pink', 'Senior Pink' ],
-    874: [ 'Senor Pink', 'Senior Pink' ],
-    875: [''],
-    876: [''],
-    877: [ 'Giolla' ],
-    878: [ 'Giolla, Donquixote Pirates' ],
-    879: [''],
-    880: [''],
-    881: [''],
-    882: [''],
-    883: [''],
-    884: [''],
-    885: [ 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
-    886: [ 'Kimono Mr. 1', 'Kimono Mr 1' ],
-    887: [ 'Kimono Buggy' ],
-    888: [''],
-    889: [''],
-    890: [''],
-    891: [''],
-    892: [''],
-    893: [''],
-    894: [''],
-    895: [''],
-    896: [''],
-    897: [ 'Kimono Crocodile' ],
-    898: [ 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
-    899: [ 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
-    900: [''],
-    901: [''],
-    902: [''],
-    903: [''],
-    904: [''],
-    905: [''],
-    906: [''],
-    907: [''],
-    908: [''],
-    909: [''],
-    910: [''],
-    911: [''],
-    912: [''],
-    913: [''],
-    914: [''],
-    915: [''],
-    916: [''],
-    917: [''],
-    918: [''],
-    919: [''],
-    920: ['']
+    662: ['',''],
+    663: ['',''],
+    664: ['',''],
+    665: ['',''],
+    666: ['',''],
+    667: ['',''],
+    668: ['',''],
+    669: ['',''],
+    670: ['',''],
+    671: ['',''],
+    672: ['',''],
+    673: ['',''],
+    674: ['',''],
+    675: ['',''],
+    676: ['',''],
+    677: ['',''],
+    678: ['','', 'Log Robin' ],
+    679: ['','', 'Log Robin' ],
+    680: ['',''],
+    681: ['',''],
+    682: ['',''],
+    683: ['',''],
+    684: ['',''],
+    685: ['',''],
+    686: ['',''],
+    687: ['',''],
+    688: ['',''],
+    689: ['',''],
+    690: ['',''],
+    691: ['',''],
+    692: ['',''],
+    693: ['',''],
+    694: ['',''],
+    695: ['',''],
+    696: ['',''],
+    697: ['',''],
+    698: ['',''],
+    699: ['',''],
+    700: ['',''],
+    701: ['',''],
+    702: ['',''],
+    703: ['',''],
+    704: ['',''],
+    705: ['',''],
+    706: ['',''],
+    707: ['',''],
+    708: ['',''],
+    709: ['',''],
+    710: ['','', 'Log Franky' ],
+    711: ['','', 'Log Franky' ],
+    712: ['',''],
+    713: ['',''],
+    714: ['',''],
+    715: ['',''],
+    716: ['',''],
+    717: ['',''],
+    718: ['',''],
+    719: ['',''],
+    720: ['',''],
+    721: ['',''],
+    722: ['',''],
+    723: ['',''],
+    724: ['',''],
+    725: ['','', 'Log Vivi' ],
+    726: ['','', 'Log Vivi' ],
+    727: ['',''],
+    728: ['','', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
+    729: ['','', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
+    730: ['',''],
+    731: ['',''],
+    732: ['',''],
+    733: ['',''],
+    734: ['',''],
+    735: ['',''],
+    736: ['',''],
+    737: ['',''],
+    738: ['',''],
+    739: ['',''],
+    740: ['',''],
+    741: ['',''],
+    742: ['',''],
+    743: ['',''],
+    744: ['','', 'Log Ace' ],
+    745: ['','', 'Log Ace' ],
+    746: ['',''],
+    747: ['',''],
+    748: ['',''],
+    749: ['',''],
+    750: ['',''],
+    751: ['','', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
+    752: ['','', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
+    753: ['',''],
+    754: ['',''],
+    755: ['',''],
+    756: ['',''],
+    757: ['',''],
+    758: ['',''],
+    759: ['',''],
+    760: ['',''],
+    761: ['','', 'Halloween Luffy' ],
+    762: ['','', 'Halloween Usopp' ],
+    763: ['','', 'Halloween Franky' ],
+    764: ['','', 'Halloween Nami' ],
+    765: ['','', 'Halloween Chopper' ],
+    766: ['','', 'Halloween Zoro' ],
+    767: ['','', 'Halloween Robin' ],
+    768: ['','', 'Halloween Sanji' ],
+    769: ['','', 'Halloween Brook' ],
+    770: ['',''],
+    771: ['',''],
+    772: ['',''],
+    773: ['',''],
+    774: ['',''],
+    775: ['',''],
+    776: ['',''],
+    777: ['',''],
+    778: ['',''],
+    779: ['',''],
+    780: ['',''],
+    781: ['',''],
+    782: ['','', 'Kimono Tashigi' ],
+    783: ['','', 'Kimono Tashigi' ],
+    784: ['',''],
+    785: ['',''],
+    786: ['','', 'Dr. Hiruruk', 'Dr Hiruruk'],
+    787: ['','', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
+    788: ['',''],
+    789: ['',''],
+    790: ['','', 'Usopp Pirates' ],
+    791: ['','', 'Usopp Pirates' ],
+    792: ['','', 'Iceberg' ],
+    793: ['','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
+    794: ['',''],
+    795: ['',''],
+    796: ['',''],
+    797: ['',''],
+    798: ['',''],
+    799: ['','', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
+    800: ['',''],
+    801: ['','', 'Log Bon Clay', 'Log Bonclay' ],
+    802: ['','', 'Log Bon Clay', 'Log Bonclay' ],
+    803: ['',''],
+    804: ['',''],
+    805: ['',''],
+    806: ['',''],
+    807: ['',''],
+    808: ['',''],
+    809: ['',''],
+    810: ['',''],
+    811: ['',''],
+    812: ['',''],
+    813: ['','', 'Spider Monkey' ],
+    814: ['',''],
+    815: ['',''],
+    816: ['',''],
+    817: ['',''],
+    818: ['',''],
+    819: ['',''],
+    820: ['',''],
+    821: ['',''],
+    822: ['',''],
+    823: ['',''],
+    824: ['',''],
+    825: ['',''],
+    826: ['',''],
+    827: ['',''],
+    828: ['',''],
+    829: ['',''],
+    830: ['',''],
+    831: ['',''],
+    832: ['','', 'Wiper, Warrior of Shandia' ],
+    833: ['','', 'Berserker Wiper, Warrior of Shandia' ],
+    834: ['',''],
+    835: ['',''],
+    836: ['',''],
+    837: ['',''],
+    838: ['',''],
+    839: ['',''],
+    840: ['',''],
+    841: ['',''],
+    842: ['',''],
+    843: ['',''],
+    844: ['',''],
+    845: ['',''],
+    846: ['',''],
+    847: ['',''],
+    848: ['',''],
+    849: ['','', 'Franky, Tom\'s Workers' ],
+    850: ['','', 'Iceburg, Tom\'s Workers' ],
+    851: ['',''],
+    852: ['',''],
+    853: ['',''],
+    854: ['',''],
+    855: ['',''],
+    856: ['',''],
+    857: ['',''],
+    858: ['',''],
+    859: ['',''],
+    860: ['',''],
+    861: ['',''],
+    862: ['',''],
+    863: ['',''],
+    864: ['',''],
+    865: ['',''],
+    866: ['','', 'Kimono Robin' ],
+    867: ['','', 'Kimono Usopp' ],
+    868: ['','', 'Kimono Chopper' ],
+    869: ['','', 'Doffy' ],
+    870: ['','', 'Doffy' ],
+    871: ['',''],
+    872: ['',''],
+    873: ['','', 'Senor Pink', 'Senior Pink' ],
+    874: ['','', 'Senor Pink', 'Senior Pink' ],
+    875: ['',''],
+    876: ['',''],
+    877: ['','', 'Giolla' ],
+    878: ['','', 'Giolla, Donquixote Pirates' ],
+    879: ['',''],
+    880: ['',''],
+    881: ['',''],
+    882: ['',''],
+    883: ['',''],
+    884: ['',''],
+    885: ['','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
+    886: ['','', 'Kimono Mr. 1', 'Kimono Mr 1' ],
+    887: ['','', 'Kimono Buggy' ],
+    888: ['',''],
+    889: ['',''],
+    890: ['',''],
+    891: ['',''],
+    892: ['',''],
+    893: ['',''],
+    894: ['',''],
+    895: ['',''],
+    896: ['',''],
+    897: ['','', 'Kimono Crocodile' ],
+    898: ['','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
+    899: ['','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
+    900: ['',''],
+    901: ['',''],
+    902: ['',''],
+    903: ['',''],
+    904: ['',''],
+    905: ['',''],
+    906: ['',''],
+    907: ['',''],
+    908: ['',''],
+    909: ['',''],
+    910: ['',''],
+    911: ['',''],
+    912: ['',''],
+    913: ['',''],
+    914: ['',''],
+    915: ['',''],
+    916: ['',''],
+    917: ['',''],
+    918: ['',''],
+    919: ['',''],
+    920: ['','']
 };

From bfbf7ba0c2b7bac42e1e1641bed0bd7588f028b7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 12 Feb 2016 15:19:39 +0100
Subject: [PATCH 0015/1569] Names in Details feature + Rest of JPN Aliases

Finished Issues #1 #3 and one part of #2
---
 characters/js/directives.js |   26 +
 common/data/aliases.js      | 1342 +++++++++++++++++------------------
 index.html                  |    9 +-
 3 files changed, 702 insertions(+), 675 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 072b9cff7..7222bc844 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -294,6 +294,32 @@ directives.comparison = function() {
     };
 };
 
+directives.addNames = function($stateParams, $rootScope) {
+    var name = window.aliases;
+    return {
+        restrict: 'E',
+        replace: true,
+        template: '<table class="table table-striped-column abilities"><tbody></tbody></table>',
+        link: function(scope, element, attrs) {
+            var id = $stateParams.id, data = details[id];
+
+                var currentAliases = name[id];
+                console.log(currentAliases);
+                if(currentAliases[0]!=''){
+                element.append($('<tr><td>Japanese</td><td><div>'+ currentAliases[0] +'</div></td></tr>'));
+                }
+                if(currentAliases[1]!=''){
+                    element.append($('<tr><td>French</td><td><div>'+ currentAliases[1] +'</div></td></tr>'));
+                }
+                if(currentAliases[2]){
+                    currentAliases.splice(0, 2);
+                    element.append($('<tr><td>Others</td><td><div>'+ currentAliases +'</div></td></tr>'));
+                }
+                }
+    }
+};    
+    
+    
 directives.addTags = function($stateParams, $rootScope) {
     return {
         restrict: 'E',
diff --git a/common/data/aliases.js b/common/data/aliases.js
index e6d4ae14d..7074b727f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -2,7 +2,7 @@ window.aliases = {
     1: ['モンキー・D・ルフィ',''],
     2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)',''],
     3: ['モンキー・D・ルフィ ゴムゴムのバズーカ',''],
-    4: ['モンキー・D・ルフィ ギア２','','Monkey D. Luffy','G2'],
+    4: ['モンキー・D・ルフィ ギア２','','Monkey D. Luffy', ' G2'],
     5: ['ロロノア・ゾロ',''],
     6: ['ロロノア・ゾロ 三・千・世・界',''],
     7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）',''],
@@ -249,674 +249,674 @@ window.aliases = {
     248: ['トニートニー・チョッパー 暴走前','', 'Monster Chopper' ],
     249: ['トニートニー・チョッパー 暴走後','', 'Monster Chopper' ],
     250: ['マルコ',''],
-    251: ['',''],
-    252: ['',''],
-    253: ['',''],
-    254: ['',''],
-    255: ['',''],
-    256: ['',''],
-    257: ['',''],
-    258: ['',''],
-    259: ['',''],
-    260: ['','', 'Whitebeard' ],
-    261: ['',''],
-    262: ['',''],
-    263: ['',''],
-    264: ['',''],
-    265: ['',''],
-    266: ['',''],
-    267: ['',''],
-    268: ['',''],
-    269: ['',''],
-    270: ['',''],
-    271: ['',''],
-    272: ['',''],
-    273: ['',''],
-    274: ['',''],
-    275: ['',''],
-    276: ['',''],
-    277: ['',''],
-    278: ['',''],
-    279: ['',''],
-    280: ['',''],
-    281: ['',''],
-    282: ['',''],
-    283: ['',''],
-    284: ['',''],
-    285: ['',''],
-    286: ['',''],
-    287: ['',''],
-    288: ['',''],
-    289: ['',''],
-    290: ['',''],
-    291: ['',''],
-    292: ['',''],
-    293: ['',''],
-    294: ['',''],
-    295: ['',''],
-    296: ['',''],
-    297: ['',''],
-    298: ['',''],
-    299: ['',''],
-    300: ['',''],
-    301: ['',''],
-    302: ['',''],
-    303: ['',''],
-    304: ['',''],
-    305: ['',''],
-    306: ['',''],
-    307: ['',''],
-    308: ['',''],
-    309: ['',''],
-    310: ['',''],
-    311: ['',''],
-    312: ['',''],
-    313: ['',''],
-    314: ['',''],
-    315: ['',''],
-    316: ['',''],
-    317: ['','', 'Califa', 'Calipha', 'Kalipha' ],
-    318: ['','', 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
-    319: ['',''],
-    320: ['',''],
-    321: ['',''],
-    322: ['',''],
-    323: ['',''],
-    324: ['',''],
-    325: ['',''],
-    326: ['',''],
-    327: ['',''],
-    328: ['',''],
-    329: ['',''],
-    330: ['',''],
-    331: ['',''],
-    332: ['',''],
-    333: ['',''],
-    334: ['','', 'Lapahn', 'Lapan', 'Rapan' ],
-    335: ['','', 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
-    336: ['',''],
-    337: ['',''],
-    338: ['',''],
-    339: ['',''],
-    340: ['',''],
-    341: ['',''],
-    342: ['',''],
-    343: ['',''],
-    344: ['',''],
-    345: ['',''],
-    346: ['',''],
-    347: ['',''],
-    348: ['',''],
-    349: ['',''],
-    350: ['',''],
-    351: ['',''],
-    352: ['',''],
-    353: ['',''],
-    354: ['',''],
-    355: ['',''],
-    356: ['',''],
-    357: ['',''],
-    358: ['',''],
-    359: ['',''],
-    360: ['',''],
-    361: ['',''],
-    362: ['',''],
-    363: ['',''],
-    364: ['',''],
-    365: ['',''],
-    366: ['',''],
-    367: ['',''],
-    368: ['',''],
-    369: ['',''],
-    370: ['',''],
-    371: ['',''],
-    372: ['',''],
-    373: ['',''],
-    374: ['',''],
-    375: ['',''],
-    376: ['',''],
-    377: ['',''],
-    378: ['',''],
-    379: ['',''],
-    380: ['',''],
-    381: ['',''],
-    382: ['',''],
-    383: ['','', 'Crocodile' ],
-    384: ['','', 'Strikerdile', 'Impactdile' ],
-    385: ['',''],
-    386: ['',''],
-    387: ['',''],
-    388: ['',''],
-    389: ['',''],
-    390: ['',''],
-    391: ['',''],
-    392: ['',''],
-    393: ['','', 'Kumashi' ],
-    394: ['','', 'Inuppe' ],
-    395: ['',''],
-    396: ['',''],
-    397: ['',''],
-    398: ['',''],
-    399: ['',''],
-    400: ['',''],
-    401: ['',''],
-    402: ['',''],
-    403: ['',''],
-    404: ['',''],
-    405: ['',''],
-    406: ['',''],
-    407: ['',''],
-    408: ['','', 'Slasherdile' ],
-    409: ['','', 'Jinbe', 'Jimbei', 'Jinbei' ],
-    410: ['','', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
-    411: ['',''],
-    412: ['',''],
-    413: ['',''],
-    414: ['',''],
-    415: ['',''],
-    416: ['',''],
-    417: ['','', 'Doffy' ],
-    418: ['','', 'Doffy' ],
-    419: ['','', 'Kimono Sanji' ],
-    420: ['','', 'Kimono Luffy' ],
-    421: ['','', 'Kimono Zoro' ],
-    422: ['','', 'Kimono Nami' ],
-    423: ['',''],
-    424: ['',''],
-    425: ['','', 'Ryuuma' ],
-    426: ['',''],
-    427: ['',''],
-    428: ['',''],
-    429: ['',''],
-    430: ['',''],
-    431: ['',''],
-    432: ['','', 'Sarkies' ],
-    433: ['',''],
-    434: ['',''],
-    435: ['',''],
-    436: ['',''],
-    437: ['','', 'Valentine Perona' ],
-    438: ['','', 'Valentine Perona' ],
-    439: ['','', 'Valentine Vivi' ],
-    440: ['','', 'Valentine Vivi' ],
-    441: ['',''],
-    442: ['',''],
-    443: ['',''],
-    444: ['','', 'Carue', 'Karue' ],
-    445: ['','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
-    446: ['','', 'Blackbeard' ],
-    447: ['',''],
-    448: ['',''],
-    449: ['',''],
-    450: ['','', 'Namur' ],
-    451: ['','', 'One-Hit Namur' ],
-    452: ['',''],
-    453: ['',''],
-    454: ['',''],
-    455: ['',''],
-    456: ['',''],
-    457: ['',''],
-    458: ['',''],
-    459: ['',''],
-    460: ['',''],
-    461: ['','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
-    462: ['','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
-    463: ['',''],
-    464: ['',''],
-    465: ['',''],
-    466: ['',''],
-    467: ['',''],
-    468: ['',''],
-    469: ['',''],
-    470: ['',''],
-    471: ['',''],
-    472: ['','', 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
-    473: ['','', 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
-    474: ['','', 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
-    475: ['','', 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
-    476: ['','', 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
-    477: ['',''],
-    478: ['',''],
-    479: ['',''],
-    480: ['',''],
-    481: ['',''],
-    482: ['',''],
-    483: ['',''],
-    484: ['',''],
-    485: ['',''],
-    486: ['',''],
-    487: ['',''],
-    488: ['',''],
-    489: ['',''],
-    490: ['',''],
-    491: ['',''],
-    492: ['',''],
-    493: ['',''],
-    494: ['',''],
-    495: ['',''],
-    496: ['',''],
-    497: ['',''],
-    498: ['',''],
-    499: ['',''],
-    500: ['',''],
-    501: ['',''],
-    502: ['',''],
-    503: ['',''],
-    504: ['',''],
-    505: ['',''],
-    506: ['',''],
-    507: ['',''],
-    508: ['',''],
-    509: ['',''],
-    510: ['',''],
-    511: ['',''],
-    512: ['',''],
-    513: ['',''],
-    514: ['',''],
-    515: ['',''],
-    516: ['',''],
-    517: ['','', 'Usoppun' ],
-    518: ['','', 'Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
-    519: ['','', 'Strong World Luffy', 'SW Luffy' ],
-    520: ['','', 'Strong World Luffy', 'SW Luffy' ],
-    521: ['','', 'Strong World Sanji', 'SW Sanji' ],
-    522: ['','', 'Strong World Sanji', 'SW Sanji' ],
-    523: ['','', 'Strong World Nami', 'SW Nami' ],
-    524: ['','', 'Strong World Nami', 'SW Nami' ],
-    525: ['','', 'Strong World Brook', 'SW Brook' ],
-    526: ['','', 'Strong World Brook', 'SW Brook' ],
-    527: ['','', 'Strong World Chopper', 'SW Chopper' ],
-    528: ['','', 'Strong World Chopper', 'SW Chopper' ],
-    529: ['','', 'Strong World Shanks', 'SW Shanks' ],
-    530: ['','', 'Strong World Shanks', 'SW Shanks' ],
-    531: ['','', 'Sakura Robin' ],
-    532: ['','', 'Sakura Robin' ],
-    533: ['','', 'Sakura Brook' ],
-    534: ['','', 'Sakura Brook' ],
-    535: ['','', 'Sakura Nami' ],
-    536: ['','', 'Sakura Nami' ],
-    537: ['',''],
-    538: ['',''],
-    539: ['',''],
-    540: ['',''],
-    541: ['',''],
-    542: ['',''],
-    543: ['','', 'Wiper' ],
-    544: ['','', 'Wiper, Descendant of Great Warrior Calgara' ],
-    545: ['','', 'Enel' ],
-    546: ['','', 'God Enel' ],
-    547: ['',''],
-    548: ['',''],
-    549: ['',''],
-    550: ['',''],
-    551: ['',''],
-    552: ['',''],
-    553: ['','', 'Strong World Zoro', 'SW Zoro' ],
-    554: ['','', 'Strong World Zoro', 'SW Zoro' ],
-    555: ['','', 'Strong World Usopp', 'SW Usopp' ],
-    556: ['','', 'Strong World Usopp', 'SW Usopp' ],
-    557: ['','', 'Strong World Robin', 'SW Robin' ],
-    558: ['','', 'Strong World Robin', 'SW Robin' ],
-    559: ['','', 'Strong World Franky', 'SW Franky' ],
-    560: ['','', 'Strong World Franky', 'SW Franky' ],
-    561: ['','', 'Strong World Ace', 'SW Ace' ],
-    562: ['','', 'Strong World Ace', 'SW Ace' ],
-    563: ['',''],
-    564: ['',''],
-    565: ['',''],
-    566: ['',''],
-    567: ['','', 'Big Pan' ],
-    568: ['',''],
-    569: ['',''],
-    570: ['','', 'Afro Luffy', 'Afroluffy' ],
-    571: ['','', 'Afro Luffy', 'Afroluffy' ],
-    572: ['',''],
-    573: ['',''],
-    574: ['',''],
-    575: ['',''],
-    576: ['',''],
-    577: ['','', 'Log Luffy' ],
-    578: ['','', 'Log Luffy' ],
-    579: ['','', 'Log Zoro' ],
-    580: ['','', 'Log Zoro' ],
-    581: ['',''],
-    582: ['',''],
-    583: ['','', 'Laki' ],
-    584: ['',''],
-    585: ['',''],
-    586: ['',''],
-    587: ['',''],
-    588: ['',''],
-    589: ['',''],
-    590: ['',''],
-    591: ['','', 'Princess Turtle' ],
-    592: ['','', 'Princess Turtle' ],
-    593: ['','', 'Princess Turtle' ],
-    594: ['','', 'Princess Turtle' ],
-    595: ['','', 'Princess Turtle' ],
-    596: ['','', 'Log Chopper' ],
-    597: ['','', 'Log Chopper' ],
-    598: ['',''],
-    599: ['',''],
-    600: ['',''],
-    601: ['',''],
-    602: ['','', 'Enel, 200 Million Volt Thunder God' ],
-    603: ['','', 'Enel the Lightning Human, 200 Million Volt Thunder God' ],
-    604: ['','', 'Log Sanji' ],
-    605: ['','', 'Log Sanji' ],
-    606: ['',''],
-    607: ['',''],
-    608: ['',''],
-    609: ['',''],
-    610: ['',''],
-    611: ['','', 'Pudding Pudding' ],
-    612: ['','', 'Log Brook' ],
-    613: ['','','Log Brook' ],
-    614: ['',''],
-    615: ['',''],
-    616: ['',''],
-    617: ['',''],
-    618: ['',''],
-    619: ['',''],
-    620: ['',''],
-    621: ['',''],
-    622: ['',''],
-    623: ['',''],
-    624: ['',''],
-    625: ['',''],
-    626: ['',''],
-    627: ['',''],
-    628: ['',''],
-    629: ['',''],
-    630: ['',''],
-    631: ['',''],
-    632: ['',''],
-    633: ['',''],
-    634: ['',''],
-    635: ['',''],
-    636: ['',''],
-    637: ['','', 'Hachi, Takoyaki Stand Owner' ],
-    638: ['',''],
-    639: ['',''],
-    640: ['',''],
-    641: ['',''],
-    642: ['',''],
-    643: ['',''],
-    644: ['',''],
-    645: ['',''],
-    646: ['',''],
-    647: ['',''],
-    648: ['',''],
-    649: ['',''],
-    650: ['','', 'Log Nami' ],
-    651: ['','', 'Log Nami' ],
-    652: ['',''],
-    653: ['',''],
-    654: ['',''],
-    655: ['',''],
-    656: ['',''],
-    657: ['',''],
-    658: ['',''],
-    659: ['',''],
-    660: [ 'Log Usopp' ],
-    661: [ 'Log Usopp' ],
-    662: ['',''],
-    663: ['',''],
-    664: ['',''],
-    665: ['',''],
-    666: ['',''],
-    667: ['',''],
-    668: ['',''],
-    669: ['',''],
-    670: ['',''],
-    671: ['',''],
-    672: ['',''],
-    673: ['',''],
-    674: ['',''],
-    675: ['',''],
-    676: ['',''],
-    677: ['',''],
-    678: ['','', 'Log Robin' ],
-    679: ['','', 'Log Robin' ],
-    680: ['',''],
-    681: ['',''],
-    682: ['',''],
-    683: ['',''],
-    684: ['',''],
-    685: ['',''],
-    686: ['',''],
-    687: ['',''],
-    688: ['',''],
-    689: ['',''],
-    690: ['',''],
-    691: ['',''],
-    692: ['',''],
-    693: ['',''],
-    694: ['',''],
-    695: ['',''],
-    696: ['',''],
-    697: ['',''],
-    698: ['',''],
-    699: ['',''],
-    700: ['',''],
-    701: ['',''],
-    702: ['',''],
-    703: ['',''],
-    704: ['',''],
-    705: ['',''],
-    706: ['',''],
-    707: ['',''],
-    708: ['',''],
-    709: ['',''],
-    710: ['','', 'Log Franky' ],
-    711: ['','', 'Log Franky' ],
-    712: ['',''],
-    713: ['',''],
-    714: ['',''],
-    715: ['',''],
-    716: ['',''],
-    717: ['',''],
-    718: ['',''],
-    719: ['',''],
-    720: ['',''],
-    721: ['',''],
-    722: ['',''],
-    723: ['',''],
-    724: ['',''],
-    725: ['','', 'Log Vivi' ],
-    726: ['','', 'Log Vivi' ],
-    727: ['',''],
-    728: ['','', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
-    729: ['','', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
-    730: ['',''],
-    731: ['',''],
-    732: ['',''],
-    733: ['',''],
-    734: ['',''],
-    735: ['',''],
-    736: ['',''],
-    737: ['',''],
-    738: ['',''],
-    739: ['',''],
-    740: ['',''],
-    741: ['',''],
-    742: ['',''],
-    743: ['',''],
-    744: ['','', 'Log Ace' ],
-    745: ['','', 'Log Ace' ],
-    746: ['',''],
-    747: ['',''],
-    748: ['',''],
-    749: ['',''],
-    750: ['',''],
-    751: ['','', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
-    752: ['','', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
-    753: ['',''],
-    754: ['',''],
-    755: ['',''],
-    756: ['',''],
-    757: ['',''],
-    758: ['',''],
-    759: ['',''],
-    760: ['',''],
-    761: ['','', 'Halloween Luffy' ],
-    762: ['','', 'Halloween Usopp' ],
-    763: ['','', 'Halloween Franky' ],
-    764: ['','', 'Halloween Nami' ],
-    765: ['','', 'Halloween Chopper' ],
-    766: ['','', 'Halloween Zoro' ],
-    767: ['','', 'Halloween Robin' ],
-    768: ['','', 'Halloween Sanji' ],
-    769: ['','', 'Halloween Brook' ],
-    770: ['',''],
-    771: ['',''],
-    772: ['',''],
-    773: ['',''],
-    774: ['',''],
-    775: ['',''],
-    776: ['',''],
-    777: ['',''],
-    778: ['',''],
-    779: ['',''],
-    780: ['',''],
-    781: ['',''],
-    782: ['','', 'Kimono Tashigi' ],
-    783: ['','', 'Kimono Tashigi' ],
-    784: ['',''],
-    785: ['',''],
-    786: ['','', 'Dr. Hiruruk', 'Dr Hiruruk'],
-    787: ['','', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
-    788: ['',''],
-    789: ['',''],
-    790: ['','', 'Usopp Pirates' ],
-    791: ['','', 'Usopp Pirates' ],
-    792: ['','', 'Iceberg' ],
-    793: ['','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
-    794: ['',''],
-    795: ['',''],
-    796: ['',''],
-    797: ['',''],
-    798: ['',''],
-    799: ['','', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
-    800: ['',''],
-    801: ['','', 'Log Bon Clay', 'Log Bonclay' ],
-    802: ['','', 'Log Bon Clay', 'Log Bonclay' ],
-    803: ['',''],
-    804: ['',''],
-    805: ['',''],
-    806: ['',''],
-    807: ['',''],
-    808: ['',''],
-    809: ['',''],
-    810: ['',''],
-    811: ['',''],
-    812: ['',''],
-    813: ['','', 'Spider Monkey' ],
-    814: ['',''],
-    815: ['',''],
-    816: ['',''],
-    817: ['',''],
-    818: ['',''],
-    819: ['',''],
-    820: ['',''],
-    821: ['',''],
-    822: ['',''],
-    823: ['',''],
-    824: ['',''],
-    825: ['',''],
-    826: ['',''],
-    827: ['',''],
-    828: ['',''],
-    829: ['',''],
-    830: ['',''],
-    831: ['',''],
-    832: ['','', 'Wiper, Warrior of Shandia' ],
-    833: ['','', 'Berserker Wiper, Warrior of Shandia' ],
-    834: ['',''],
-    835: ['',''],
-    836: ['',''],
-    837: ['',''],
-    838: ['',''],
-    839: ['',''],
-    840: ['',''],
-    841: ['',''],
-    842: ['',''],
-    843: ['',''],
-    844: ['',''],
-    845: ['',''],
-    846: ['',''],
-    847: ['',''],
-    848: ['',''],
-    849: ['','', 'Franky, Tom\'s Workers' ],
-    850: ['','', 'Iceburg, Tom\'s Workers' ],
-    851: ['',''],
-    852: ['',''],
-    853: ['',''],
-    854: ['',''],
-    855: ['',''],
-    856: ['',''],
-    857: ['',''],
-    858: ['',''],
-    859: ['',''],
-    860: ['',''],
-    861: ['',''],
-    862: ['',''],
-    863: ['',''],
-    864: ['',''],
-    865: ['',''],
-    866: ['','', 'Kimono Robin' ],
-    867: ['','', 'Kimono Usopp' ],
-    868: ['','', 'Kimono Chopper' ],
-    869: ['','', 'Doffy' ],
-    870: ['','', 'Doffy' ],
-    871: ['',''],
-    872: ['',''],
-    873: ['','', 'Senor Pink', 'Senior Pink' ],
-    874: ['','', 'Senor Pink', 'Senior Pink' ],
-    875: ['',''],
-    876: ['',''],
-    877: ['','', 'Giolla' ],
-    878: ['','', 'Giolla, Donquixote Pirates' ],
-    879: ['',''],
-    880: ['',''],
-    881: ['',''],
-    882: ['',''],
-    883: ['',''],
-    884: ['',''],
-    885: ['','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
-    886: ['','', 'Kimono Mr. 1', 'Kimono Mr 1' ],
-    887: ['','', 'Kimono Buggy' ],
-    888: ['',''],
-    889: ['',''],
-    890: ['',''],
-    891: ['',''],
-    892: ['',''],
-    893: ['',''],
-    894: ['',''],
-    895: ['',''],
-    896: ['',''],
-    897: ['','', 'Kimono Crocodile' ],
-    898: ['','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
-    899: ['','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
-    900: ['',''],
-    901: ['',''],
-    902: ['',''],
-    903: ['',''],
-    904: ['',''],
-    905: ['',''],
-    906: ['',''],
-    907: ['',''],
-    908: ['',''],
-    909: ['',''],
-    910: ['',''],
-    911: ['',''],
-    912: ['',''],
-    913: ['',''],
-    914: ['',''],
-    915: ['',''],
-    916: ['',''],
-    917: ['',''],
-    918: ['',''],
-    919: ['',''],
-    920: ['','']
+    251: ['不死鳥マルコ',''],
+    252: ['ジョズ',''],
+    253: ['ダイヤモンド・ジョズ',''],
+    254: ['ビスタ',''],
+    255: ['花剣のビスタ',''],
+    256: ['イゾウ',''],
+    257: ['短筒使いのイゾウ',''],
+    258: ['ブラメンコ',''],
+    259: ['大槌のブラメンコ',''],
+    260: ['エドワード・ニューゲート','', 'Whitebeard' ],
+    261: ['白ひげ',''],
+    262: ['特訓コビー',''],
+    263: ['曹長コビー',''],
+    264: ['特訓ヘルメッポ',''],
+    265: ['軍曹ヘルメッポ',''],
+    266: ['虹海賊ペンギン',''],
+    267: ['虹しま番竜',''],
+    268: ['白猟のスモーカー ビローアバイク',''],
+    269: ['格闘隊　武装隊員 レッドパイレーツ',''],
+    270: ['格闘隊　武装隊員 ブルーパイレーツ',''],
+    271: ['格闘隊　武装隊員 グリーンパイレーツ',''],
+    272: ['格闘隊　武装隊員 イエローパイレーツ',''],
+    273: ['格闘隊　武装隊員 ブラックパイレーツ',''],
+    274: ['斬撃隊　武装隊員 レッドパイレーツ',''],
+    275: ['斬撃隊　武装隊員 ブルーパイレーツ',''],
+    276: ['斬撃隊　武装隊員 グリーンパイレーツ',''],
+    277: ['斬撃隊　武装隊員 イエローパイレーツ',''],
+    278: ['斬撃隊　武装隊員 ブラックパイレーツ',''],
+    279: ['突撃隊　武装隊員 レッドパイレーツ',''],
+    280: ['突撃隊　武装隊員 ブルーパイレーツ',''],
+    281: ['突撃隊　武装隊員 グリーンパイレーツ',''],
+    282: ['突撃隊　武装隊員 イエローパイレーツ',''],
+    283: ['突撃隊　武装隊員 ブラックパイレーツ',''],
+    284: ['狙撃隊　武装隊員 レッドパイレーツ',''],
+    285: ['狙撃隊　武装隊員 ブルーパイレーツ',''],
+    286: ['狙撃隊　武装隊員 グリーンパイレーツ',''],
+    287: ['狙撃隊　武装隊員 イエローパイレーツ',''],
+    288: ['狙撃隊　武装隊員 ブラックパイレーツ',''],
+    289: ['砲撃手　敏腕',''],
+    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）',''],
+    291: ['ドリー',''],
+    292: ['ブロギー',''],
+    293: ['トリケラトプス',''],
+    294: ['レックス',''],
+    295: ['ブロントザウルス',''],
+    296: ['おつるさん',''],
+    297: ['大参謀つる',''],
+    298: ['モモンガ',''],
+    299: ['オニグモ',''],
+    300: ['赤アーマーロブスター',''],
+    301: ['青アーマーロブスター',''],
+    302: ['緑アーマーロブスター',''],
+    303: ['黄アーマーロブスター',''],
+    304: ['黒アーマーロブスター',''],
+    305: ['モンキー・D・ガープ',''],
+    306: ['ゲンコツのガープ',''],
+    307: ['トラファルガー・ロー','','Supernova'],
+    308: ['トラファルガー・ロー ROOMバジル・ホーキンス','','Supernova'],
+    309: ['バジル・ホーキンス','','Supernova'],
+    310: ['魔術師バジル・ホーキンス','','Supernova'],
+    311: ['キラー','','Supernova'],
+    312: ['殺戮武人キラー','','Supernova'],
+    313: ['ウルージ','','Supernova'],
+    314: ['怪僧ウルージ','','Supernova'],
+    315: ['ベポ',''],
+    316: ['武闘家のベポ',''],
+    317: ['カリファ','', 'Califa', 'Calipha', 'Kalipha' ],
+    318: ['美人秘書カリファ','', 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
+    319: ['パウリー',''],
+    320: ['パウリー 1番ドック艤装(ぎそう)・マスト職職長',''],
+    321: ['ロブ・ルッチ',''],
+    322: ['ロブ・ルッチ 1番ドック木びき・木釘職職長',''],
+    323: ['カク',''],
+    324: ['カク 1番ドック大工職職長',''],
+    325: ['ルル',''],
+    326: ['ワポル',''],
+    327: ['ワポルハウス',''],
+    328: ['ドルトン',''],
+    329: ['ドルトン 野牛（バイソン）',''],
+    330: ['チェス',''],
+    331: ['クロマーリモ',''],
+    332: ['チェスマーリモ',''],
+    333: ['Dr.くれは',''],
+    334: ['ラパーン','', 'Lapahn', 'Lapan', 'Rapan' ],
+    335: ['ラパーン 成獣','', 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
+    336: ['フランキー',''],
+    337: ['解体屋フランキー',''],
+    338: ['キウイ',''],
+    339: ['モズ',''],
+    340: ['クラーケン スルメ',''],
+    341: ['クラーケン 北極の怪物',''],
+    342: ['赤パワース豚（トーン）',''],
+    343: ['青パワース豚（トーン）',''],
+    344: ['緑パワース豚（トーン）',''],
+    345: ['黄パワース豚（トーン）',''],
+    346: ['黒パワース豚（トーン）',''],
+    347: ['ルビーパワース豚（トーン）',''],
+    348: ['サファイアパワース豚（トーン）',''],
+    349: ['エメラルドパワース豚（トーン）',''],
+    350: ['トパーズパワース豚（トーン）',''],
+    351: ['アメジストパワース豚（トーン）',''],
+    352: ['ゼファー',''],
+    353: ['ゼファー NEO海軍総帥',''],
+    354: ['アイン',''],
+    355: ['アイン NEO海軍バイス・アドミラル',''],
+    356: ['ユースタス・キッド','','Supernova'],
+    357: ['キャプテン・キッド','','Supernova'],
+    358: ['スクラッチメン・アプー','','Supernova'],
+    359: ['海鳴り スクラッチメン・アプー','','Supernova'],
+    360: ['X・ドレーク','','Supernova'],
+    361: ['赤旗 X・ドレーク','','Supernova'],
+    362: ['ジュエリー・ボニー','','Supernova'],
+    363: ['大喰らい ジュエリー・ボニー','','Supernova'],
+    364: ['カポネ・ベッジ','','Supernova'],
+    365: ['カポネ・ギャング・ベッジ','','Supernova'],
+    366: ['シルバーズ・レイリー',''],
+    367: ['冥王レイリー',''],
+    368: ['巨人斬撃隊 レッドパイレーツ',''],
+    369: ['巨人射撃隊 ブルーパイレーツ',''],
+    370: ['巨人女戦士隊 グリーンパイレーツ',''],
+    371: ['巨人格闘隊 イエローパイレーツ',''],
+    372: ['巨人突撃隊 ブラックパイレーツ',''],
+    373: ['巨人斬撃近衛隊 レッドパイレーツ',''],
+    374: ['巨人射撃近衛隊 ブルーパイレーツ',''],
+    375: ['巨人女戦士近衛隊 グリーンパイレーツ',''],
+    376: ['巨人格闘近衛隊 イエローパイレーツ',''],
+    377: ['巨人突撃近衛隊 ブラックパイレーツ',''],
+    378: ['海ネコ',''],
+    379: ['クンフージュゴン',''],
+    380: ['クンフージュゴン 兄弟弟子',''],
+    381: ['バナナワニ',''],
+    382: ['サンドラ大トカゲ',''],
+    383: ['Mr.0 バロックワークス社長','', 'Crocodile' ],
+    384: ['サー・クロコダイル','', 'Strikerdile', 'Impactdile' ],
+    385: ['ホグバック',''],
+    386: ['ドクトル・ホグバック',''],
+    387: ['シンドリーちゃん',''],
+    388: ['ビクトリア・シンドリー',''],
+    389: ['エンポリオ・イワンコフ',''],
+    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】',''],
+    391: ['ペローナ',''],
+    392: ['ペローナ ゴーストプリンセス',''],
+    393: ['クマシー','', 'Kumashi' ],
+    394: ['犬ッペ','', 'Inuppe' ],
+    395: ['ミス・メリークリスマス',''],
+    396: ['ミス・メリークリスマス モグラ人間',''],
+    397: ['Mr.4',''],
+    398: ['Mr.4と犬銃ラッスー',''],
+    399: ['ミス・ダブルフィンガー',''],
+    400: ['ミス・ダブルフィンガー 棘（とげ）人間',''],
+    401: ['Mr.1',''],
+    402: ['Mr.1 全身刃物人間',''],
+    403: ['レベッカ',''],
+    404: ['アブサロム',''],
+    405: ['墓場のアブサロム',''],
+    406: ['将軍ゾンビ',''],
+    407: ['風のジゴロウ',''],
+    408: ['サー・クロコダイル 王下七武海','', 'Slasherdile' ],
+    409: ['ジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei' ],
+    410: ['ジンベエ 王下七武海','', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
+    411: ['バーソロミュー・くま',''],
+    412: ['バーソロミュー・くま 王下七武海',''],
+    413: ['ゲッコー・モリア',''],
+    414: ['ゲッコー・モリア 王下七武海',''],
+    415: ['ボア・ハンコック',''],
+    416: ['ボア・ハンコック 王下七武海',''],
+    417: ['ドンキホーテ・ドフラミンゴ','', 'Doffy' ],
+    418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Doffy' ],
+    419: ['サンジ 整形ショット(パラージュショット)　“嵐”','', 'Kimono Sanji' ],
+    420: ['モンキー・D・ルフィ ゴムゴムのバズーカ“覇”','', 'Kimono Luffy' ],
+    421: ['ロロノア・ゾロ 三・千・世・界“斬”','', 'Kimono Zoro' ],
+    422: ['ナミ 蜃気楼＝テンポ“天”','', 'Kimono Nami' ],
+    423: ['ブルック',''],
+    424: ['鼻唄のブルック',''],
+    425: ['リューマ','', 'Ryuuma' ],
+    426: ['マシラ',''],
+    427: ['ショウジョウ',''],
+    428: ['モンブラン・クリケット',''],
+    429: ['サウスバードと森の住民',''],
+    430: ['ベラミー',''],
+    431: ['ハイエナのベラミー',''],
+    432: ['サーキース','', 'Sarkies' ],
+    433: ['エリザベス',''],
+    434: ['キャロライン',''],
+    435: ['サンジ カマバッカ王国伝統の決闘スタイル',''],
+    436: ['サンジ キャンディーちゃん',''],
+    437: ['ペローナ　スイート','', 'Valentine Perona' ],
+    438: ['ペローナ　スイート ゴーストプリンセス','', 'Valentine Perona' ],
+    439: ['ネフェルタリ・ビビ　ラブ','', 'Valentine Vivi' ],
+    440: ['王女ビビ　ラブ','', 'Valentine Vivi' ],
+    441: ['カウボーイとバーボンJr. 超カルガモ部隊',''],
+    442: ['ストンプとイワンX 超カルガモ部隊',''],
+    443: ['ケンタロウスとヒコイチ 超カルガモ部隊',''],
+    444: ['カルー','', 'Carue', 'Karue' ],
+    445: ['カルー隊長と超カルガモ部隊','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
+    446: ['マーシャル・Ｄ・ティーチ','', 'Blackbeard' ],
+    447: ['黒ひげ',''],
+    448: ['サッチ',''],
+    449: ['双剣のサッチ',''],
+    450: ['ナミュール','', 'Namur' ],
+    451: ['一撃のナミュール','', 'One-Hit Namur' ],
+    452: ['ラクヨウ',''],
+    453: ['モーニングスターのラクヨウ',''],
+    454: ['フォッサ',''],
+    455: ['火炎刀のフォッサ',''],
+    456: ['クリエル',''],
+    457: ['重火器使いのクリエル',''],
+    458: ['センゴク',''],
+    459: ['仏のセンゴク',''],
+    460: ['犯罪者ギャルディーノ Mr.3',''],
+    461: ['脱走者ベンサム Mr.2・ボン・クレー','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
+    462: ['脱獄名人ベンサム Mr.2・ボン・クレー','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
+    463: ['サトリ',''],
+    464: ['シュラ',''],
+    465: ['ゲダツ',''],
+    466: ['ブラハム',''],
+    467: ['ヤマ',''],
+    468: ['黄のホワイトベレー部隊　隊員 スカイピア神隊',''],
+    469: ['黒のホワイトベレー部隊　隊員 スカイピア神隊',''],
+    470: ['黄のホワイトベレー部隊　隊長 スカイピア神隊',''],
+    471: ['黒のホワイトベレー部隊　隊長 スカイピア神隊',''],
+    472: ['赤のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
+    473: ['青のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
+    474: ['緑のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
+    475: ['黄のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
+    476: ['黒のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
+    477: ['赤の突撃隊　隊員 スカイピア神兵',''],
+    478: ['青の突撃隊　隊員 スカイピア神兵',''],
+    479: ['緑の突撃隊　隊員 スカイピア神兵',''],
+    480: ['黄の突撃隊　隊員 スカイピア神兵',''],
+    481: ['黒の突撃隊　隊員 スカイピア神兵',''],
+    482: ['赤の突撃隊　エリート スカイピア神兵',''],
+    483: ['青の突撃隊　エリート スカイピア神兵',''],
+    484: ['緑の突撃隊　エリート スカイピア神兵',''],
+    485: ['黄の突撃隊　エリート スカイピア神兵',''],
+    486: ['黒の突撃隊　エリート スカイピア神兵',''],
+    487: ['赤の遊牧隊　隊員 シャンディアの戦士',''],
+    488: ['青の遊牧隊　隊員 シャンディアの戦士',''],
+    489: ['緑の遊牧隊　隊員 シャンディアの戦士',''],
+    490: ['赤の遊牧隊　達人 シャンディアの戦士',''],
+    491: ['青の遊牧隊　達人 シャンディアの戦士',''],
+    492: ['緑の遊牧隊　達人 シャンディアの戦士',''],
+    493: ['黄の狩猟隊　隊員 シャンディアの戦士',''],
+    494: ['黒の狩猟隊　隊員 シャンディアの戦士',''],
+    495: ['黄の狩猟隊　達人 シャンディアの戦士',''],
+    496: ['黒の狩猟隊　達人 シャンディアの戦士',''],
+    497: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟',''],
+    498: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟“兄弟盃”',''],
+    499: ['ベルメール',''],
+    500: ['ベルメール ナミとノジコの養母',''],
+    501: ['カヤ',''],
+    502: ['カヤ シロップ村のお嬢様',''],
+    503: ['ホトリ・コトリ',''],
+    504: ['ホトリ・コトリ スカイピア副神兵長',''],
+    505: ['ペル',''],
+    506: ['ペル アラバスタの守護神ファルコン',''],
+    507: ['チャカ',''],
+    508: ['チャカ アラバスタの守護神ジャッカル',''],
+    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長',''],
+    510: ['最強の囚人サー・クロコダイル 元王下七武海',''],
+    511: ['服役囚ダズ・ボーネス Mr.1',''],
+    512: ['サボ コルボ山の悪ガキ３兄弟',''],
+    513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”',''],
+    514: ['ニコ・ロビン トロピカル',''],
+    515: ['ヘラクレスン',''],
+    516: ['ヘラクレスン 森の勇者',''],
+    517: ['ウソップン','', 'Usoppun' ],
+    518: ['ウソップン ヘラクレスンの生徒','', 'Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
+    519: ['モンキー・Ｄ・ルフィ メルヴィユの冒険者','', 'Strong World Luffy', 'SW Luffy' ],
+    520: ['モンキー・Ｄ・ルフィ 特攻の麦わらの一味','', 'Strong World Luffy', 'SW Luffy' ],
+    521: ['サンジ メルヴィユの冒険者','', 'Strong World Sanji', 'SW Sanji' ],
+    522: ['サンジ 特攻の麦わらの一味','', 'Strong World Sanji', 'SW Sanji' ],
+    523: ['ナミ メルヴィユの冒険者','', 'Strong World Nami', 'SW Nami' ],
+    524: ['ナミと雷鳥ビリー','', 'Strong World Nami', 'SW Nami' ],
+    525: ['ブルック メルヴィユの冒険者','', 'Strong World Brook', 'SW Brook' ],
+    526: ['ブルック 特攻の麦わらの一味','', 'Strong World Brook', 'SW Brook' ],
+    527: ['チョッパー メルヴィユの冒険者','', 'Strong World Chopper', 'SW Chopper' ],
+    528: ['チョッパー 特攻の麦わらの一味','', 'Strong World Chopper', 'SW Chopper' ],
+    529: ['シャンクス 黒衣の赤髪','', 'Strong World Shanks', 'SW Shanks' ],
+    530: ['シャンクス 黒衣の四皇','', 'Strong World Shanks', 'SW Shanks' ],
+    531: ['ニコ・ロビン　桜吹雪','', 'Sakura Robin' ],
+    532: ['ニコ・ロビン　桜満開','', 'Sakura Robin' ],
+    533: ['ブルック　チェリーヘッド','', 'Sakura Brook' ],
+    534: ['ブルック　桜音色','', 'Sakura Brook' ],
+    535: ['ナミ　桜雲','', 'Sakura Nami' ],
+    536: ['ナミ　桜日和','', 'Sakura Nami' ],
+    537: ['ドミノ',''],
+    538: ['ドミノ インペルダウン副看守長',''],
+    539: ['ミノリノケロス',''],
+    540: ['バシリスク',''],
+    541: ['オーム',''],
+    542: ['ノラ ウワバミ',''],
+    543: ['ワイパー','', 'Wiper' ],
+    544: ['ワイパー 大戦士カルガラの子孫','', 'Wiper, Descendant of Great Warrior Calgara' ],
+    545: ['エネル','', 'Enel' ],
+    546: ['ゴッド・エネル','', 'God Enel' ],
+    547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟',''],
+    548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”',''],
+    549: ['サディちゃん',''],
+    550: ['サディちゃん インペルダウン獄卒長',''],
+    551: ['ミノコアラ',''],
+    552: ['マンティコラ',''],
+    553: ['ロロノア・ゾロ メルヴィユの冒険者','', 'Strong World Zoro', 'SW Zoro' ],
+    554: ['ロロノア・ゾロ 特攻の麦わらの一味','', 'Strong World Zoro', 'SW Zoro' ],
+    555: ['ウソップ メルヴィユの冒険者','', 'Strong World Usopp', 'SW Usopp' ],
+    556: ['ウソップ 特攻の麦わらの一味','', 'Strong World Usopp', 'SW Usopp' ],
+    557: ['ニコ・ロビン メルヴィユの冒険者','', 'Strong World Robin', 'SW Robin' ],
+    558: ['ニコ・ロビン 特攻の麦わらの一味','', 'Strong World Robin', 'SW Robin' ],
+    559: ['フランキー メルヴィユの冒険者','', 'Strong World Franky', 'SW Franky' ],
+    560: ['フランキー 特攻の麦わらの一味','', 'Strong World Franky', 'SW Franky' ],
+    561: ['ポートガス・D・エース 黒衣の火拳','', 'Strong World Ace', 'SW Ace' ],
+    562: ['ポートガス・D・エース 黒衣の白ひげ海賊団2番隊隊長','', 'Strong World Ace', 'SW Ace' ],
+    563: ['ポルチェ',''],
+    564: ['ポーティ',''],
+    565: ['ハンバーグ',''],
+    566: ['ピクルス',''],
+    567: ['ビッグパン','', 'Big Pan' ],
+    568: ['フォクシー',''],
+    569: ['銀ギツネのフォクシー',''],
+    570: ['モンキー・Ｄ・ルフィ デービーバックファイト・アフロ','', 'Afro Luffy', 'Afroluffy' ],
+    571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット','', 'Afro Luffy', 'Afroluffy' ],
+    572: ['ウソップ デービーバックファイト・セコンド',''],
+    573: ['トニートニー・チョッパー デービーバックファイト・マスク',''],
+    574: ['青キジ',''],
+    575: ['青キジ　氷結人間',''],
+    576: ['ナミのティータイム',''],
+    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy' ],
+    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy' ],
+    579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro' ],
+    580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro' ],
+    581: ['ゲンボウ',''],
+    582: ['カマキリ',''],
+    583: ['ラキ','', 'Laki' ],
+    584: ['アイサ',''],
+    585: ['ノジコ',''],
+    586: ['ノジコ ナミの義姉妹',''],
+    587: ['クロッカス',''],
+    588: ['クロッカス 双子岬の灯台守',''],
+    589: ['コーザ',''],
+    590: ['コーザ 反乱軍リーダー',''],
+    591: ['朱の竜宮カメ姫','', 'Princess Turtle' ],
+    592: ['蒼の竜宮カメ姫','', 'Princess Turtle' ],
+    593: ['翠の竜宮カメ姫','', 'Princess Turtle' ],
+    594: ['琥珀の竜宮カメ姫','', 'Princess Turtle' ],
+    595: ['漆黒の竜宮カメ姫','', 'Princess Turtle' ],
+    596: ['トニートニー・チョッパー 航海の記録・麦わらの一味','', 'Log Chopper' ],
+    597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」','', 'Log Chopper' ],
+    598: ['バギー 海賊見習い',''],
+    599: ['バギー ロジャー海賊団',''],
+    600: ['シャンクス 海賊見習い',''],
+    601: ['シャンクス ロジャー海賊団',''],
+    602: ['エネル ２億Ｖ　雷神','', 'Enel, 200 Million Volt Thunder God' ],
+    603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Enel the Lightning Human, 200 Million Volt Thunder God' ],
+    604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji' ],
+    605: ['サンジ 航海の夢「オールブルー」','', 'Log Sanji' ],
+    606: ['海賊ゼフ',''],
+    607: ['赫足のゼフ クック海賊団船長',''],
+    608: ['ごろつきパティ',''],
+    609: ['ごろつきカルネ',''],
+    610: ['ハイキングベア',''],
+    611: ['プリンプリン','', 'Pudding Pudding' ],
+    612: ['ブルック 航海の記録・麦わらの一味','', 'Log Brook' ],
+    613: ['ブルック 航海の夢「約束の再会」','','Log Brook' ],
+    614: ['ザンバイ',''],
+    615: ['怪力デストロイヤーズ 斧使い',''],
+    616: ['怪力デストロイヤーズ 槍使い',''],
+    617: ['怪力デストロイヤーズ 大砲使い',''],
+    618: ['ナックルチンピラ 赤の賞金稼ぎ',''],
+    619: ['ナックルチンピラ 緑の賞金稼ぎ',''],
+    620: ['カタナチンピラ 青の賞金稼ぎ',''],
+    621: ['カタナチンピラ 赤の賞金稼ぎ',''],
+    622: ['ピストルチンピラ 緑の賞金稼ぎ',''],
+    623: ['ピストルチンピラ 黄の賞金稼ぎ',''],
+    624: ['棍棒チンピラ 黄の賞金稼ぎ',''],
+    625: ['棍棒チンピラ 黒の賞金稼ぎ',''],
+    626: ['ガトリングチンピラ 黒の賞金稼ぎ',''],
+    627: ['ガトリングチンピラ 青の賞金稼ぎ',''],
+    628: ['タイルストン',''],
+    629: ['フランキー フランキー一家棟梁',''],
+    630: ['カク サイファーポールNo.9',''],
+    631: ['カク 六式 サイファーポールNo.9',''],
+    632: ['ロブ・ルッチ サイファーポールNo.9',''],
+    633: ['ロブ・ルッチ 六式 サイファーポールNo.9',''],
+    634: ['ケイミー',''],
+    635: ['ケイミー タコ焼き屋店員',''],
+    636: ['パッパグ',''],
+    637: ['はっちゃん タコ焼き屋店主','', 'Hachi, Takoyaki Stand Owner' ],
+    638: ['ドーマ',''],
+    639: ['遊騎士ドーマ',''],
+    640: ['ディカルバン兄弟',''],
+    641: ['絆のディカルバン兄弟',''],
+    642: ['スクアード',''],
+    643: ['大渦蜘蛛スクアード',''],
+    644: ['ホワイティベイ',''],
+    645: ['氷の魔女ホワイティベイ',''],
+    646: ['リトルオーズJr.',''],
+    647: ['猛攻のリトルオーズJr.',''],
+    648: ['マルコ 白ひげ海賊団１番隊隊長',''],
+    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長',''],
+    650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami' ],
+    651: ['ナミ 航海の夢「世界地図」','', 'Log Nami' ],
+    652: ['鉄仮面のデュバル',''],
+    653: ['デュバル トビウオライダーズ ヘッド',''],
+    654: ['デュバル 人生バラ色ライダーズ ヘッド',''],
+    655: ['海賊アーロン',''],
+    656: ['アーロン タイヨウの海賊団',''],
+    657: ['クロオビ タイヨウの海賊団',''],
+    658: ['チュウ タイヨウの海賊団',''],
+    659: ['モンキー・D・ルフィ うきわ',''],
+    660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp' ],
+    661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp' ],
+    662: ['ナミ バカンス',''],
+    663: ['ネフェルタリ・ビビ アラバスタ王国王女',''],
+    664: ['ネフェルタリ・ビビ 砂砂団　副リーダー',''],
+    665: ['コーザ アラバスタ住民',''],
+    666: ['コーザ 砂砂団　リーダー',''],
+    667: ['ネフェルタリ・コブラ アラバスタ王国国王',''],
+    668: ['サボ',''],
+    669: ['サボ 革命軍',''],
+    670: ['コアラ',''],
+    671: ['コアラ 革命軍',''],
+    672: ['ハック',''],
+    673: ['ハック 革命軍',''],
+    674: ['エンポリオ・イワンコフ ニューカマー拳法　師範',''],
+    675: ['エンポリオ・イワンコフ 革命軍',''],
+    676: ['イナズマ',''],
+    677: ['イナズマ 革命軍',''],
+    678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin' ],
+    679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」','', 'Log Robin' ],
+    680: ['アイス大好きナミ',''],
+    681: ['アイス大好きナミ レモンアイス',''],
+    682: ['アイス大好きロビン',''],
+    683: ['アイス大好きロビン チョコアイス',''],
+    684: ['アイス大好きペローナ',''],
+    685: ['アイス大好きペローナ ストロベリーアイス',''],
+    686: ['ビビのひとやすみ',''],
+    687: ['カルガラ',''],
+    688: ['カルガラ シャンディアの大戦士',''],
+    689: ['モンブラン・ノーランド',''],
+    690: ['モンブラン・ノーランド ルブニール王国探検船提督',''],
+    691: ['ナギナタ伍長 海軍本部',''],
+    692: ['ピストル伍長 海軍本部',''],
+    693: ['サーベル伍長 海軍本部',''],
+    694: ['バズーカ伍長 海軍本部',''],
+    695: ['ナックル伍長 海軍本部',''],
+    696: ['ナギナタ少佐 海軍本部',''],
+    697: ['ピストル少佐 海軍本部',''],
+    698: ['サーベル少佐 海軍本部',''],
+    699: ['バズーカ少佐 海軍本部',''],
+    700: ['ナックル少佐 海軍本部',''],
+    701: ['オイモ',''],
+    702: ['カーシ―',''],
+    703: ['法の番犬部隊',''],
+    704: ['有罪陪審員',''],
+    705: ['３つ首のバスカビル',''],
+    706: ['ブルーノ サイファーポールNo.9',''],
+    707: ['ブルーノ 六式 サイファーポールNo.9',''],
+    708: ['ニコ・ロビン 悪魔の子',''],
+    709: ['ニコ・ロビン 麦わらの一味',''],
+    710: ['フランキー 航海の記録・麦わらの一味','', 'Log Franky' ],
+    711: ['フランキー 航海の夢「海の果てを旅する船」','', 'Log Franky' ],
+    712: ['ガン・フォール',''],
+    713: ['ガン・フォール 空の騎士',''],
+    714: ['ピエール',''],
+    715: ['コニス',''],
+    716: ['コニス スカイピアの少女',''],
+    717: ['ジュラキュール・ミホーク 王下七武海',''],
+    718: ['鷹の目のミホーク 世界最強の剣士',''],
+    719: ['サー・クロコダイル　ロギア 王下七武海',''],
+    720: ['サー・クロコダイル　ロギア 元王下七武海',''],
+    721: ['ジェリー',''],
+    722: ['ジェリー サイファーポールNo.6',''],
+    723: ['Tボーン',''],
+    724: ['船斬りTボーン 海軍本部大佐',''],
+    725: ['ネフェルタリ・ビビ 航海の記録・アラバスタ王国王女','', 'Log Vivi' ],
+    726: ['ネフェルタリ・ビビ 航海の夢「海賊女王」','', 'Log Vivi' ],
+    727: ['モンキー・D・ルフィ ゴムゴムの銃乱打 (ガトリング)',''],
+    728: ['カリファ サイファーポールNo.9','', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
+    729: ['カリファ　六式 サイファーポールNo.9','', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
+    730: ['ジャブラ サイファーポールNo.9',''],
+    731: ['ジャブラ　六式 サイファーポールNo.9',''],
+    732: ['フクロウ サイファーポールNo.9',''],
+    733: ['フクロウ　六式 サイファーポールNo.9',''],
+    734: ['クマドリ サイファーポールNo.9',''],
+    735: ['クマドリ　六式 サイファーポールNo.9',''],
+    736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）',''],
+    737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）',''],
+    738: ['スパンダム',''],
+    739: ['フランキー 麦わらの一味',''],
+    740: ['ネロ',''],
+    741: ['ネロ サイファーポールNo.9',''],
+    742: ['ワンゼ',''],
+    743: ['ワンゼ サイファーポールNo.7',''],
+    744: ['ポートガス・D・エース 航海の記録・白ひげ海賊団','', 'Log Ace' ],
+    745: ['ポートガス・D・エース 航海の夢「海賊の高み」','', 'Log Ace' ],
+    746: ['メガロ＆しらほし姫',''],
+    747: ['ロブ・ルッチ 闇の正義の「ＣＰ９」',''],
+    748: ['ロブ・ルッチ 歴代最強の「ＣＰ９」',''],
+    749: ['カク 闇の正義の「ＣＰ９」',''],
+    750: ['カク 歴代最強の「ＣＰ９」',''],
+    751: ['カリファ 闇の正義の「ＣＰ９」','', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
+    752: ['カリファ 歴代最強の「ＣＰ９」','', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
+    753: ['ジャブラ 闇の正義の「ＣＰ９」',''],
+    754: ['ジャブラ 歴代最強の「ＣＰ９」',''],
+    755: ['ブルーノ 闇の正義の「ＣＰ９」',''],
+    756: ['ブルーノ 歴代最強の「ＣＰ９」',''],
+    757: ['フクロウ 闇の正義の「ＣＰ９」',''],
+    758: ['フクロウ 歴代最強の「ＣＰ９」',''],
+    759: ['クマドリ 闇の正義の「ＣＰ９」',''],
+    760: ['クマドリ 歴代最強の「ＣＰ９」',''],
+    761: ['モンキー・D・ルフィ ハロウィンモンスター','', 'Halloween Luffy' ],
+    762: ['ウソップ うそつき狼','', 'Halloween Usopp' ],
+    763: ['フランキー フランケンシュタイン','', 'Halloween Franky' ],
+    764: ['ナミ かぼちゃランタン','', 'Halloween Nami' ],
+    765: ['トニートニー・チョッパー リトルヴァンパイア','', 'Halloween Chopper' ],
+    766: ['ロロノア・ゾロ ジャック・ザ・リッパ―','', 'Halloween Zoro' ],
+    767: ['ニコ・ロビン セクシーデビル','', 'Halloween Robin' ],
+    768: ['サンジ ゴーストナイト','', 'Halloween Sanji' ],
+    769: ['ブルック こわがりスケルトン','', 'Halloween Brook' ],
+    770: ['ダルメシアン 海軍本部中将',''],
+    771: ['モモンガ 海軍本部中将',''],
+    772: ['オニグモ 海軍本部中将',''],
+    773: ['シュウ',''],
+    774: ['ベリーグッド',''],
+    775: ['ストロベリー 海軍本部中将',''],
+    776: ['ラッキー・ルウ',''],
+    777: ['ラッキー・ルウ 赤髪海賊団',''],
+    778: ['レベッカ 囚人剣闘士',''],
+    779: ['レベッカ コロシアム専属剣闘士',''],
+    780: ['ウルージ 破戒僧海賊団船長','','Supernova'],
+    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova'],
+    782: ['たしぎ 正義の華','', 'Kimono Tashigi' ],
+    783: ['たしぎ 海軍本部少尉・正義の華','', 'Kimono Tashigi' ],
+    784: ['ゲンさん',''],
+    785: ['ゲンゾウ ココヤシ村の駐在',''],
+    786: ['Dr.ヒルルク','', 'Dr. Hiruruk', 'Dr Hiruruk'],
+    787: ['Dr.ヒルルク ヤブ医者','', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
+    788: ['くいな',''],
+    789: ['くいな シモツキ村の少女剣士',''],
+    790: ['たまねぎ＆ピーマン＆にんじん','', 'Usopp Pirates' ],
+    791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団','', 'Usopp Pirates' ],
+    792: ['アイスバーグ','', 'Iceberg' ],
+    793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
+    794: ['モンキー・D・ルフィ 希望の星',''],
+    795: ['ナイトメア・ルフィ 希望の戦士',''],
+    796: ['ブリード',''],
+    797: ['ブリード ペトペトの実の能力者',''],
+    798: ['クンフージュゴン 海獣海賊団',''],
+    799: ['シーラパーン 海獣海賊団','', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
+    800: ['たこボクサー 海獣海賊団',''],
+    801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay' ],
+    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay' ],
+    803: ['ヒナ 海軍本部大佐',''],
+    804: ['黒檻のヒナ 海軍本部大佐',''],
+    805: ['スモーカー 海軍本部大佐',''],
+    806: ['白猟のスモーカー 海軍本部大佐',''],
+    807: ['純白の天使ナミ ウエディング',''],
+    808: ['純白の女神ナミ ウエディング',''],
+    809: ['ローラ スリラーバークの花嫁',''],
+    810: ['求愛のローラ スリラーバークの花嫁',''],
+    811: ['リスキー兄弟',''],
+    812: ['ケルベロス',''],
+    813: ['タララン','', 'Spider Monkey' ],
+    814: ['敷きグマ',''],
+    815: ['ゲッコー・モリア スリラーバークの怪人',''],
+    816: ['ゲッコー・モリア スリラーバークの支配者',''],
+    817: ['ソルジャーゾンビ　力自慢の影',''],
+    818: ['ソルジャーゾンビ　素早さの影',''],
+    819: ['ソルジャーゾンビ　悪巧みの影',''],
+    820: ['ソルジャーゾンビ　憎しみの影',''],
+    821: ['ソルジャーゾンビ　自尊心の影',''],
+    822: ['トリッキー・ワイルドゾンビ',''],
+    823: ['インテリ・ワイルドゾンビ',''],
+    824: ['ハートフル・ワイルドゾンビ',''],
+    825: ['ジェネラルゾンビ　怪力の影',''],
+    826: ['ジェネラルゾンビ　奇技の影',''],
+    827: ['ジェネラルゾンビ　疾速の影',''],
+    828: ['？？？',''],
+    829: ['？？？',''],
+    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
+    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
+    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia' ],
+    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia' ],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ',''],
+    835: ['暴君バーソロミュー・くま',''],
+    836: ['暴君バーソロミュー・くま 政府の人間兵器',''],
+    837: ['シーザー・クラウン',''],
+    838: ['Ｍ（マスター）・シーザー',''],
+    839: ['ヴェルゴ',''],
+    840: ['ヴェルゴ ドンキホーテ海賊団',''],
+    841: ['モネ',''],
+    842: ['モネ ドンキホーテ海賊団',''],
+    843: ['ベビー５',''],
+    844: ['ベビー５ ドンキホーテ海賊団',''],
+    845: ['バッファロー',''],
+    846: ['バッファロー ドンキホーテ海賊団',''],
+    847: ['トム トムズ　ワーカーズ',''],
+    848: ['伝説の船大工トム トムズ　ワーカーズ',''],
+    849: ['カティ・フラム トムズ　ワーカーズ','', 'Franky, Tom\'s Workers' ],
+    850: ['アイスバーグ トムズ　ワーカーズ','', 'Iceburg, Tom\'s Workers' ],
+    851: ['ブリキのワポル',''],
+    852: ['スリムアップワポル',''],
+    853: ['ロブソン',''],
+    854: ['チョッパーの雪遊び',''],
+    855: ['トラファルガー・ロー 聖夜の紳士','','Supernova'],
+    856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova'],
+    857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova'],
+    858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ','','Supernova'],
+    859: ['コビー 海軍本部曹長',''],
+    860: ['戦火の勇士コビー 海軍本部曹長',''],
+    861: ['レディー・アルビダ うるわしき美女',''],
+    862: ['レディー・アルビダ 絶世の美女',''],
+    863: ['銀世界のナミ',''],
+    864: ['ボア・ハンコック 九蛇海賊団船長',''],
+    865: ['女帝ボア・ハンコック 九蛇海賊団船長',''],
+    866: ['ニコ・ロビン 百花繚乱 ウイング“華”','', 'Kimono Robin' ],
+    867: ['ウソップ タバスコ星“撃”','', 'Kimono Usopp' ],
+    868: ['トニートニー・チョッパー 重量ゴング“獣”','', 'Kimono Chopper' ],
+    869: ['ドンキホーテ・ドフラミンゴ ドンキホーテ海賊団','', 'Doffy' ],
+    870: ['天夜叉ドフラミンゴ','', 'Doffy' ],
+    871: ['シュガー',''],
+    872: ['シュガー ドンキホーテ海賊団',''],
+    873: ['セニョール・ピンク','', 'Senor Pink', 'Senior Pink' ],
+    874: ['セニョール・ピンク ドンキホーテ海賊団','', 'Senor Pink', 'Senior Pink' ],
+    875: ['トレーボル',''],
+    876: ['トレーボル ドンキホーテ海賊団',''],
+    877: ['ジョーラ','', 'Giolla' ],
+    878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates' ],
+    879: ['ラオＧ',''],
+    880: ['ラオＧ ドンキホーテ海賊団',''],
+    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova'],
+    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova'],
+    883: ['ドリー 巨兵海賊団',''],
+    884: ['青鬼のドリー',''],
+    885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
+    886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1' ],
+    887: ['バギー 陽気なかぶき者','', 'Kimono Buggy' ],
+    888: ['ホロホロゴースト',''],
+    889: ['ペローナ スリラーバークの怪人',''],
+    890: ['ペローナ 巨大なゴーストプリンセス',''],
+    891: ['ドクトル・ホグバック スリラーバークの怪人',''],
+    892: ['墓場のアブサロム スリラーバークの怪人',''],
+    893: ['オーズ 特別ゾンビ',''],
+    894: ['ゲッコー・モリア 影の集合地（シャドーズ・アスガルド）',''],
+    895: ['ブルック 紳士なガイコツ',''],
+    896: ['ブルック 麦わらの一味',''],
+    897: ['サー・クロコダイル 砂の武将','', 'Kimono Crocodile' ],
+    898: ['Mr.3 姑息な楽士','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
+    899: ['Mr.2・ボン・クレー あやふやな侍','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
+    900: ['フレッシュ・フランキー 健康第一',''],
+    901: ['鉄人（サイボーグ）フランキー',''],
+    902: ['ブロギー 巨兵海賊団',''],
+    903: ['赤鬼のブロギー',''],
+    904: ['ヨコヅナ',''],
+    905: ['ロロノア・ゾロ クライガナ島をさすらう剣士',''],
+    906: ['ロロノア・ゾロ 世界最強剣士の門弟',''],
+    907: ['ニコ・ロビン テキーラウルフの収監者',''],
+    908: ['ニコ・ロビン 革命の灯火（ともしび）',''],
+    909: ['トニートニー・チョッパー トリノ王国の平和の架け橋',''],
+    910: ['チョッパーマスク 世界の平和を守るヒーロー',''],
+    911: ['サンジ カマバッカ王国の逃走者',''],
+    912: ['サンジ 男を懸けた愛の料理人',''],
+    913: ['ブルック ハラヘッターニャの悪魔王',''],
+    914: ['ブルック 骨（ボーン） to be wild!!!',''],
+    915: ['？？？',''],
+    916: ['？？？',''],
+    917: ['マーガレット',''],
+    918: ['マーガレット 護国の戦士',''],
+    919: ['アフェランドラ',''],
+    920: ['スイトピー','']
 };
diff --git a/index.html b/index.html
index 1f3d03e21..b1f699ec4 100644
--- a/index.html
+++ b/index.html
@@ -35,12 +35,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>11/02/2016</p>
+            <p>12/02/2016</p>
             <br>
             <ul>
-                <li>Disabled Popup</li>
-                <li>Updated Contact Forms</li>
-			<li>Additional Search Aliases</li>
+                <li>Details now Includes Japanese Names</li>
+                <li>as well as other Search Terms</li>
+                <li>Finished Japanese Aliases</li>
+			    <li>First Group Search Aliases (Supernova)</li>
             </ul>
         </div>
     </body>

From 334c693a19d6889c0fd0cd9576bed349c5cb4bbe Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 12 Feb 2016 15:22:31 +0100
Subject: [PATCH 0016/1569] Added Names to Details

---
 characters/views/details.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/characters/views/details.html b/characters/views/details.html
index f90cf5b5e..51dfa52de 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -430,6 +430,12 @@ <h3 class="page-header" ng-if="families.length > 0">Family: {{family}}</h3>
                             </tr>
                         </tbody>
                     </table>
+                    
+                    <!-- Other Names -->
+                    
+                    <h3 class="page-header">Other Names</h3>
+                    
+                    <add-names></add-names>
 
                     <!-- Tags -->
 

From 65f39586c271ae361a58ebd602243e6cd9180fea Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 12 Feb 2016 16:20:10 -0600
Subject: [PATCH 0017/1569] Mr 3 Fix

Mr 3 without punctuation
---
 common/data/aliases.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7074b727f..6c6248274 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,4 +1,4 @@
-window.aliases = {
+window.aliases = {
     1: ['モンキー・D・ルフィ',''],
     2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)',''],
     3: ['モンキー・D・ルフィ ゴムゴムのバズーカ',''],
@@ -201,7 +201,7 @@ window.aliases = {
     200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）','', 'Mr 5'],
     201: ['ミス・バレンタイン',''],
     202: ['ミス・バレンタイン 1万キロギロチン',''],
-    203: ['Mr.3',''],
+    203: ['Mr.3','Mr 3',''],
     204: ['Mr.3 特大キャンドルサービスセット','', 'Mr 3'],
     205: ['ミス・ゴールデンウィーク',''],
     206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑',''],
@@ -458,7 +458,7 @@ window.aliases = {
     457: ['重火器使いのクリエル',''],
     458: ['センゴク',''],
     459: ['仏のセンゴク',''],
-    460: ['犯罪者ギャルディーノ Mr.3',''],
+    460: ['犯罪者ギャルディーノ Mr.3','Mr 3',''],
     461: ['脱走者ベンサム Mr.2・ボン・クレー','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
     462: ['脱獄名人ベンサム Mr.2・ボン・クレー','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
     463: ['サトリ',''],

From 6b071c52b67ce148bee54e52fab83e519e4c6cf5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 13 Feb 2016 09:48:10 +0100
Subject: [PATCH 0018/1569] Fixed wrong Orb for Senor Pink Special

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2be75457f..0cef23669 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3937,7 +3937,7 @@ window.details = {
 				]
 			},
 			{
-				"description": "Changes own orb into [psy], amplifies the effect of orbs by 1.75x for 1 turn",
+				"description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.75x for 1 turn",
 				"cooldown": [
 					19,
 					14
@@ -3958,7 +3958,7 @@ window.details = {
 				]
 			},
 			{
-				"description": "Changes own orb into [psy], amplifies the effect of orbs by 1.75x for 1 turn",
+				"description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.75x for 1 turn",
 				"cooldown": [
 					19,
 					14

From bac35fed2b0a45b4a7c781542966482c4b560be9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 13 Feb 2016 09:51:53 +0100
Subject: [PATCH 0019/1569] Quickfix for Mr 3 Aliase

---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6c6248274..c3c9cf653 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -201,7 +201,7 @@
     200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）','', 'Mr 5'],
     201: ['ミス・バレンタイン',''],
     202: ['ミス・バレンタイン 1万キロギロチン',''],
-    203: ['Mr.3','Mr 3',''],
+    203: ['Mr.3','','Mr 3'],
     204: ['Mr.3 特大キャンドルサービスセット','', 'Mr 3'],
     205: ['ミス・ゴールデンウィーク',''],
     206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑',''],

From 544ecf942057db20d5aca88243c2c5ce75c07abc Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 14 Feb 2016 11:30:31 +0100
Subject: [PATCH 0020/1569] Placeholder for Colosseum Units

---
 characters/js/directives.js |  2 +-
 common/data/aliases.js      | 11 +++++++++--
 common/data/units.js        |  9 ++++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 7222bc844..640fb35d4 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -304,7 +304,7 @@ directives.addNames = function($stateParams, $rootScope) {
             var id = $stateParams.id, data = details[id];
 
                 var currentAliases = name[id];
-                console.log(currentAliases);
+                //console.log(currentAliases);
                 if(currentAliases[0]!=''){
                 element.append($('<tr><td>Japanese</td><td><div>'+ currentAliases[0] +'</div></td></tr>'));
                 }
diff --git a/common/data/aliases.js b/common/data/aliases.js
index c3c9cf653..40723b04e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,4 +1,4 @@
-window.aliases = {
+window.aliases = {
     1: ['モンキー・D・ルフィ',''],
     2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)',''],
     3: ['モンキー・D・ルフィ ゴムゴムのバズーカ',''],
@@ -918,5 +918,12 @@
     917: ['マーガレット',''],
     918: ['マーガレット 護国の戦士',''],
     919: ['アフェランドラ',''],
-    920: ['スイトピー','']
+    920: ['スイトピー',''],
+    921: ['',''],
+    922: ['',''],
+    923: ['',''],
+    924: ['',''],
+    925: ['',''],
+    926: ['',''],
+    927: ['',''],
 };
diff --git a/common/data/units.js b/common/data/units.js
index bbd78b83a..6920848fe 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -918,5 +918,12 @@ window.units = [
 	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
-	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ]
+	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
+    [],
+    [],
+    ["Colosseum Kid", "STR", ["Impact","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Colosseum Kid Evolution", "STR", ["Impact","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Colosseum Sadi", "QCK", ["Impact","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Colosseum Sadi Evolution", "QCK", ["Impact","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Unknow Unit", "INT", ["Slasher","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null]
 ];

From 0238517db7fcb6d402ef7e205d7883d20cfe3345 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 14 Feb 2016 21:39:30 +0100
Subject: [PATCH 0021/1569] Added Conditions and Challenges to Drops

Issue #4
---
 common/data/drops.js | 29 +++++++++++++++++++++++++++++
 drops/index.html     | 12 +++++++++++-
 drops/index.js       |  2 +-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 5b0987041..f757ca20c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -569,6 +569,7 @@ window.drops = {
             name: 'Smoker\'s Great Pursuit',
             thumb: 268,
             global: true,
+            challenge: 'Total Damage dealt to enemies',
             Expert: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ],
             Elite: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
         },
@@ -585,6 +586,7 @@ window.drops = {
             name: 'Kalifa\'s Secret Assignment',
             thumb: 318,
             global: true,
+            condition: 'You may only bring STR units into this island',
             Expert: [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ],
             Elite: [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ]
         },
@@ -593,6 +595,7 @@ window.drops = {
             name: 'Lucci\'s Artisan Spirit',
             thumb: 322,
             global: true,
+            condition: 'You may only bring DEX units for 15 and 30 Stamina',
             Expert: [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ],
             Elite: [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ]
         },
@@ -601,6 +604,7 @@ window.drops = {
             name: 'Franky - Pervert\'s Aesthetic!',
             thumb: 337,
             global: true,
+            condition: 'You may only bring INT units for 15 and 30 Stamina',
             Expert: [ 87, 98, 113, 114, 336, 338, 339, -339, -338, -255, -222, -77, -68 ],
             Elite: [ 87, 98, 113, 336, 338, 339, -339, -338, -255, -222, -77, -68 ]
         },
@@ -609,6 +613,8 @@ window.drops = {
             name: 'Deep Sea Kraken',
             thumb: 341,
             global: true,
+            condition: 'You may only bring QCK units for 15 and 30 Stamina',
+            challenge: 'Low Teamcost, fast Clear and perfect Taps',
             Expert: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ],
             Elite: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ]
         },
@@ -617,6 +623,7 @@ window.drops = {
             name: 'Dr. Hogback\'s Lab of the Dead',
             thumb: 386,
             global: true,
+            condition: 'You may only bring PSY units for 15 and 30 Stamina',
             Expert: [ 385, 387, -388, -335, -314, -36, -16, -11 ],
             Elite: [ 385, 387, -388, -335, -314, -36, -16, -11 ]
         },
@@ -625,6 +632,8 @@ window.drops = {
             name: 'Perona\'s Worden Garden',
             thumb: 392,
             global: true,
+            condition: 'You can only get STR, QCK, INT and Food Orbs',
+            challenge: 'Amount of hits over 50,000',
             Expert: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ],
             Elite: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ]
         },
@@ -633,6 +642,7 @@ window.drops = {
             name: 'Perv-salom\'s Manly Adventure',
             thumb: 405,
             global: true,
+            condition: 'You can only get QCK, DEX, PSY and Food Orbs',
             Expert: [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20 ],
             Elite: [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20 ]
         },
@@ -649,6 +659,8 @@ window.drops = {
             name: 'Adrift!? Humming Brook',
             thumb: 424,
             global: true,
+            condition: 'You can only get STR, DEX, INT and PSY Orbs',
+            challenge: 'Total Damage dealt to enemies',
             Expert: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ],
             Elite: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ]
         },
@@ -657,6 +669,7 @@ window.drops = {
             name: 'Little Ms. Candy the Maiden-Hearted!',
             thumb: 436,
             global: true,
+            condition: 'Each non-Okama in your Team will take 60 Damage each turn',
             Expert: [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ],
             Elite: [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ]
         },
@@ -665,6 +678,7 @@ window.drops = {
             name: 'Supersonic Duck Squadron!',
             thumb: 445,
             global: true,
+            condition: 'Higher Chance of Food orbs',
             Expert: [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ],
             Elite: [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
         },
@@ -672,6 +686,7 @@ window.drops = {
         {
             name: 'Jailbreaking Baroque Works',
             thumb: 462,
+            condition: 'Striker, Shooter and Slashers are weakend.',
             Expert: [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ],
             Elite: [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
         },
@@ -680,6 +695,7 @@ window.drops = {
             name: 'Crocodile: Life on the Inside',
             thumb: 510,
             global: true,
+            condition: 'Shooters, Fighter and Slashers are weakend',
             Expert: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ],
             Elite: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]
         },
@@ -687,6 +703,7 @@ window.drops = {
         {
             name: 'Jailer Domino\' Special Guard',
             thumb: 538,
+            condition: 'Striker, Slasher and Fighter are weakend',
             Expert: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ],
             Elite: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ]
         },
@@ -694,6 +711,7 @@ window.drops = {
         {
             name: 'Chief Guard Sadi-chan\'s Pun♥ish♥ment',
             thumb: 550,
+            condition: 'Shooter, Striker and Fighter are weakend',
             Expert: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ],
             Elite: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
         },
@@ -710,6 +728,7 @@ window.drops = {
             name: 'Warriors of Shandia! Dreams of a Homeland!',
             thumb: 583,
             global: true,
+            condition: 'All Units considered from the “Sea” will lose 20% to all stats',
             Expert: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ],
             Elite: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
         },
@@ -717,6 +736,7 @@ window.drops = {
         {
             name: 'Pirate Apprentices! Shanks and Buggy',
             thumb: 599,
+            condition: 'You cannot use any two units that are the same',
             Expert: [ 598, 600, -504, -467, -463, -414, -372, -332, -310, -77 ],
             Elite: [ 598, 600, -467, -463, -414, -372, -332, -310, -77 ]
         },
@@ -724,6 +744,7 @@ window.drops = {
         {
             name: 'Raging Cook! Red Leg Zeff',
             thumb: 607,
+            condition: 'You cannot use any two units that are the same',
             Expert: [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ],
             Elite: [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]
         },
@@ -731,6 +752,7 @@ window.drops = {
         {
             name: 'Keimi and Hachi\'s Takoyaki Shop!',
             thumb: 635,
+            condition: 'No Units above the cost of 49 is allowed',
             Expert: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ],
             Elite: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
         },
@@ -738,6 +760,7 @@ window.drops = {
         {
             name: 'Invasion! Pirate Arlong\'s Crew!!',
             thumb: 656,
+            condition: 'You can only get STR, QCK, DEX, PSY and INT orbs',
             Expert: [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ],
             Elite: [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
         },
@@ -745,6 +768,7 @@ window.drops = {
         {
             name: 'Fight! Suna Suna Clan!!',
             thumb: 664,
+            condition: 'Heatwave causes damage every 2 turns',
             Expert: [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ],
             Elite: [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ]
         },
@@ -752,6 +776,7 @@ window.drops = {
         {
             name: 'Guidance from the Sound of a Bell! Calgara and Noland!',
             thumb: 688,
+            condition: 'Bomb orbs appear',
             Expert: [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ],
             Elite: [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ],
         },
@@ -759,6 +784,7 @@ window.drops = {
         {
             name: "Knight of the Sky Gan Fall",
             thumb: 713,
+            condition: 'Every class but Freedom is weakend',
             Expert: [ 712, 714, 715, -716, -546, -541, -520 ],
             Elite: [ 712, 714, 715, -716, -546, -541, -520 ]
         },
@@ -766,6 +792,7 @@ window.drops = {
         {
             name: "T-Bone's Absolute Justice",
             thumb: 724,
+            condition: 'You can only bring INT, PSY and QCK units',
             Expert: [ 721, 723, -590, -564, -563, -529, -526, -384, -361, -219 ],
             Elite: [ 721, 723, -590, -564, -563, -529, -526, -384, -361, -219 ]
         },
@@ -773,6 +800,7 @@ window.drops = {
         {
             name: "Explosive! Wanze's Ramen Kenpo!!",
             thumb: 743,
+            condition: 'You can only bring STR, QCK and DEX units',
             Expert: [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ],
             Elite: [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ]
         },
@@ -810,6 +838,7 @@ window.drops = {
         {
             name: "Evil Manager Breed's Marine Circus!",
             thumb: 797,
+            condition: 'You can only bring Fighter and Tough units',
             Expert: [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ],
             Elite: [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ]
         },
diff --git a/drops/index.html b/drops/index.html
index e37e2c6ee..ea8f29211 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -65,9 +65,19 @@ <h3>
 
         <script type="text/ng-template" id="island.html">
             <table class="table table-striped">
+                <tbody>
+                    <tr ng-if="island.condition" hide-when-empty>
+                        <td>Condition</td>
+                        <td>{{island.condition}} </td>
+                    </tr>
+                    <tr ng-if="island.challenge">
+                        <td>Challenge</td>
+                        <td>{{island.challenge}} </td>
+                    </tr>
+                </tbody>
                 <tbody>
                     <tr ng-repeat="(stage,data) in island"
-                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global'">
+                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge'">
                         <td>
                             {{type == 'Story Island' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
                         </td>
diff --git a/drops/index.js b/drops/index.js
index 5906b328e..7f8f8227c 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -61,7 +61,7 @@ app.directive('type',function() {
 app.directive('island',function() {
     return {
         restrict: 'E',
-        scope: { island: '=', data: '=', type: '=', hiddenUnits: '=' },
+        scope: { island: '=', data: '=', type: '=', hiddenUnits: '=', condition: '=', challenge: '=' },
         replace: true,
         templateUrl: 'island.html',
         link: function(scope, element, attrs) {

From cf65fb6b7c27ee9a0b1a84a3ebd46c71be6d416e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 14 Feb 2016 23:23:08 +0100
Subject: [PATCH 0022/1569] Quickfix for Preview

---
 common/data/units.js | 8 ++++----
 index.html           | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 6920848fe..574ad5842 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -921,9 +921,9 @@ window.units = [
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
     [],
     [],
-    ["Colosseum Kid", "STR", ["Impact","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Colosseum Kid Evolution", "STR", ["Impact","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Colosseum Sadi", "QCK", ["Impact","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Colosseum Sadi Evolution", "QCK", ["Impact","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Colosseum Kid", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Colosseum Kid Evolution", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Colosseum Sadi", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
     ["Unknow Unit", "INT", ["Slasher","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null]
 ];
diff --git a/index.html b/index.html
index b1f699ec4..ddda72f4a 100644
--- a/index.html
+++ b/index.html
@@ -35,13 +35,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>12/02/2016</p>
+            <p>14/02/2016</p>
             <br>
             <ul>
+                <li>Added Conditions and Challenges</li>
+                <li>to Dropt Table</li><br>
                 <li>Details now Includes Japanese Names</li>
                 <li>as well as other Search Terms</li>
-                <li>Finished Japanese Aliases</li>
-			    <li>First Group Search Aliases (Supernova)</li>
             </ul>
         </div>
     </body>

From d4fa548a495b3da04f810b10688c99f67eff9126 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 15 Feb 2016 13:58:28 +0100
Subject: [PATCH 0023/1569] Bride Boa + Doberman Preview

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 574ad5842..e03a7ceee 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,11 +919,11 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-    [],
-    [],
+    ["Bride Boa", "INT", ["Shooter","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Bride Boa Evolution", "INT", ["Shooter","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
     ["Colosseum Kid", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
     ["Colosseum Kid Evolution", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
     ["Colosseum Sadi", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
     ["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Unknow Unit", "INT", ["Slasher","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null]
+    ["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null]
 ];

From 6cd0528892e38518ca9bf09cc54bafcbdece814b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 15 Feb 2016 09:39:18 -0600
Subject: [PATCH 0024/1569] Finish Conditions

Finished Conditions & Updated Home page
---
 common/data/drops.js | 8 +++++++-
 index.html           | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index f757ca20c..5b682763e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1,4 +1,4 @@
-window.drops = {
+window.drops = {
 
     'Story Island': [
 
@@ -846,6 +846,7 @@ window.drops = {
         {
             name: "Nami and Lola's Great Proposal Plan",
             thumb: 808,
+            condition: 'You can only bring Slasher and Knowledge units. (No Evolution/Booster)',
             Expert: [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ],
             Elite: [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ]
         },
@@ -853,6 +854,7 @@ window.drops = {
         {
             name: "Legendary Shipbuilding Company Tom's Workers",
             thumb: 848,
+            condition: 'You can only bring Impact and Freedom units',
             Expert: [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ],
             Elite: [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ]
         },
@@ -860,6 +862,7 @@ window.drops = {
         {
             name: "Wapol's Counterattack",
             thumb: 852,
+            condition: 'You can only bring Shooter and Ambition units',
             Expert: [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ],
             Elite: [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
         },
@@ -874,6 +877,7 @@ window.drops = {
         {
             name: "Riverside Banquet! Enter the Crazy Ones!",
             thumb: 885,
+            condition: 'Highly increased chance of TND, Bomb, and G orbs',
             Expert: [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416 ],
             Elite: [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416 ]
         },
@@ -881,6 +885,7 @@ window.drops = {
         {
             name: "Mountaintop Banquet! Enter the Generals!",
             thumb: 897,
+            condition: 'Only STR/DEX/QCK/PSY/INT orbs will appear',
             Expert: [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464 ],
             Elite: [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464 ]
         },
@@ -888,6 +893,7 @@ window.drops = {
         {
             name: "Men are Forbidden!? The Secret Flower Garden",
             thumb: 918,
+            condition: 'You can only bring DEX units',
             Expert: [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ],
             Elite: [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ]
         }
diff --git a/index.html b/index.html
index ddda72f4a..6ab972ce1 100644
--- a/index.html
+++ b/index.html
@@ -35,11 +35,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>14/02/2016</p>
+            <p>15/02/2016</p>
             <br>
             <ul>
-                <li>Added Conditions and Challenges</li>
-                <li>to Dropt Table</li><br>
+                <li>Added Conditions & Challenges</li>
+                <li>to Drop Table</li><br>
                 <li>Details now Includes Japanese Names</li>
                 <li>as well as other Search Terms</li>
             </ul>

From cb50bc5da9c15a279f7d0754b07739403448cee4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 15 Feb 2016 12:52:00 -0600
Subject: [PATCH 0025/1569] Adding Story Completion

Added story completion units to each story mode island. Includes
Ships/Gems and Units.
---
 common/data/drops.js | 31 +++++++++++++++++++++++++++++++
 drops/index.html     |  6 +++++-
 drops/index.js       |  2 +-
 index.html           |  6 +++---
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 5b682763e..3c788d5a4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -6,6 +6,7 @@
             name: "Fushia Village",
             thumb: 28,
             global: true,
+            completion: '5x Rainbow Gems',	
             "01": [ 119, 120 ],
             "02": [ 27, 115, 119, 120 ],
             "03": [ 28, 78, 79, 80, 119, 120 ]
@@ -15,6 +16,8 @@
             name: "Alvida's Hideout",
             thumb: 29,
             global: true,
+            completion: '5x Rainbow Gems',
+            "Completion Units": [31],
             "01": [ 121, 123, 127, 131, 136 ],
             "02": [ 78, 79, 80, 121, 122, 123, 126, 131, 132, 137, 138, 141 ],
             "03": [ 29, 115, 121, 122, 123, 126, 127, 128, 131, 132, 133, 136, 137, 138, 141, 171 ]
@@ -24,6 +27,8 @@
             name: "Shells Town",
             thumb: 35,
             global: true,
+            completion: 'Ship: Navy Ship - 5x Rainbow Gems',
+            "Completion Units": [5],
             "01": [ 81, 82, 179, 180, 181, 182 ],
             "02": [ 78, 79, 80, 179, 180, 181, 183 ],
             "03": [ 33, 81, 82, 179, 180, 181, 182, 183 ],
@@ -39,6 +44,7 @@
             name: "Orange Town",
             thumb: 38,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 115, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 134, 135, 174 ],
             "02": [ 78, 121, 126, 136, 142, 147, 170 ],
             "03": [ 40, 80, 123, 124, 128, 129, 130, 133, 134, 135, 138, 139, 140, 144, 149, 154, 158, 159, 171 ],
@@ -58,6 +64,8 @@
             name: "Syrup Village",
             thumb: 45,
             global: true,
+            completion: 'Ship: Merry Go - 5x Rainbow Gems',
+            "Completion Units": [13],
             "01": [ 13, 78, 79, 80, 81, 82, 89, 90, 91, 95, 96, 97, 105, 106, 107, 115 ],
             "02": [ 108, 109, 163, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
             "03": [ 92, 93, 124, 125, 126, 127, 128, 147, 148, 149, 160, 161, 165, 166, 174 ],
@@ -77,6 +85,8 @@
             name: "Baratie",
             thumb: 57,
             global: true,
+            completion: 'Ship: Baratie - 5x Rainbow Gems',
+            "Completion Units": [17],
             "01": [ 48, 131, 132, 133, 136, 137, 138, 140 ],
             "02": [ 49, 116, 117, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
             "03": [ 50, 51, 52, 184, 185, 186, 187, 188 ],
@@ -98,6 +108,8 @@
             name: "Arlong Park",
             thumb: 65,
             global: true,
+            completion: '5x Rainbow Gems',
+            "Completion Units": [9],
             "01": [ 89, 121, 126, 131, 136, 141, 142, 147, 152, 156, 157, 158, 159, 160, 162, 170, 173, 175, 178 ],
             "02": [ 90, 122, 127, 132, 137, 141, 143, 148, 153, 155, 157, 158, 159, 161, 162, 172, 174, 177 ],
             "03": [ 91, 123, 128, 133, 138, 141, 144, 149, 154, 157, 158, 159, 160, 161, 162, 171, 173, 175, 176, 177 ],
@@ -119,6 +131,7 @@
             name: "Logue Town",
             thumb: 69,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 174, 170, 171, 172, 84 ],
             "02": [ 29, 85 ],
             "03": [ 174, 173, 86 ],
@@ -137,6 +150,7 @@
             name: "Twin Cape",
             thumb: 213,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 215, 83, 95, 110 ],
             "02": [ 174, 96, 111, 83 ],
             "03": [ 173, 174, 97, 112, 83 ],
@@ -153,6 +167,7 @@
             name: "Whiskey Peak",
             thumb: 201,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 237, 238, 239, 110, 118 ],
             "02": [ 111, 118, 240 ],
             "03": [ 84, 118, 235 ],
@@ -174,6 +189,7 @@
             name: "Little Garden",
             thumb: 292,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 289, 162, 141, 83, 116, 117 ],
             "02": [ 83, 85, 90, 293 ],
             "03": [ 83, 84, 89, 294 ],
@@ -195,6 +211,8 @@
             name: "Drum Island",
             thumb: 326,
             global: true,
+            completion: '5x Rainbow Gems',
+            "Completion Units": [21],
             "01": [ 328, 94, 117 ],
             "02": [ 84, 94, 116, 334 ],
             "03": [ 78, 79, 80, 81, 82, 94, 334 ],
@@ -217,6 +235,7 @@
             shortName: "Nanohana",
             thumb: 383,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 116, 300, 301, 302, 303, 304, 378 ],
             "02": [ 69, 300, 301, 302, 303, 304 ],
             "03": [ 113, 114, 184, 185, 186, 300, 301, 302, 303, 304 ],
@@ -238,6 +257,7 @@
             name: "Alubarna",
             thumb: 384,
             global: true,
+            completion: '10x Rainbow Gems',
             "01": [ 368, 237, 78, 83, 89 ],
             "02": [ 369, 239, 79, 90, 83 ],
             "03": [ 207, 80, 91, 83 ],
@@ -259,6 +279,7 @@
             name: "Jaya",
             thumb: 430,
             global: true,
+            completion: 'Ship: Merry Go Flying - 5x Rainbow Gems',
             "01": [ 215, 105, 106, 107, 108, 109, 115, 116, 381 ],
             "02": [ 171, 91, 97, 96 ],
             "03": [ 170, 426, 89, 95 ],
@@ -281,6 +302,7 @@
             shortName: "Angel Island",
             thumb: 467,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 488, 487, 489, 493, 494, 116, 117 ],
             "02": [ 468, 469, 92, 93, 98, 99 ],
             "03": [ 468, 469, 303, 304 ],
@@ -303,6 +325,7 @@
             shortName: "Ark Maxim",
             thumb: 545,
             global: true,
+            completion: '10x Rainbow Gems',
             "01": [ 94, 300, 541 ],
             "02": [ 94, 302, 464, 543 ],
             "03": [ 94, 303, 542 ],
@@ -321,6 +344,7 @@
             name: "Long Ring Long Land",
             thumb: 568,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 368, 147, 152, 300 ],
             "02": [ 564, 158, 301 ],
             "03": [ 171, 144, 149, 302 ],
@@ -338,6 +362,7 @@
             name: "Water Seven",
             thumb: 632,
             global: true,
+            completion: '5x Rainbow Gems',
             "01": [ 614, 87, 88, 266 ],
             "02": [ 84, 85, 86, 173, 174, 237, 238, 239, 266 ],
             "03": [ 110, 266, 615, 616, 617 ],
@@ -359,6 +384,8 @@
             name: "Enies Lobby: Entrance",
             shortName: "Enies Lobby 1",
             thumb: 706,
+            completion: '5x Rainbow Gems',
+            "Completion Units": [708],
             "01": [ 78, 79, 80, 81, 82, 185, 186, 188, 694 ],
             "02": [ 78, 79, 80, 81, 184, 185, 187, 692 ],
             "03": [ 304, 695, 702 ],
@@ -375,6 +402,8 @@
             name: "Enies Lobby: Tower of Justice - Gates of Justice",
             shortName: "Enies Lobby 2",
             thumb: 737,
+            completion: 'Ship: Thousand Sunny - 5x Rainbow Gems',
+            "Completion Units": [739],
             "01": [ 110 ],
             "02": [ 111 ],
             "03": [ 112 ],
@@ -395,6 +424,7 @@
             name: "Thriller Bark: Mouth Gate - Hogback's Residence",
             shortName: "Thriller Bark 1",
             thumb: 816,
+            completion: '5x Rainbow Gems',
             "01": [ 89, 90, 91, 387, 817, 818, 819, 820, 821 ],
             "02": [ 89, 90, 91, 92, 93, 812, 817, 818, 819, 820, 821 ],
             "03": [ 116, 817, 818, 819, 820, 821 ],
@@ -412,6 +442,7 @@
             name: "Thriller Bark: Moria's Mast Mansion",
             shortName: "Thriller Bark 2",
             thumb: 894,
+            completion: '5x Rainbow Gems',
             "01": [ 817, 818, 819, 888 ],
             "02": [ 393, 888, 889 ],
             "03": [ 425 ],
diff --git a/drops/index.html b/drops/index.html
index ea8f29211..b46e0a59f 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -66,6 +66,10 @@ <h3>
         <script type="text/ng-template" id="island.html">
             <table class="table table-striped">
                 <tbody>
+                    <tr ng-if="island.completion" hide-when-empty>
+                        <td>Completion</td>
+                        <td>{{island.completion}} </td>
+                    </tr>
                     <tr ng-if="island.condition" hide-when-empty>
                         <td>Condition</td>
                         <td>{{island.condition}} </td>
@@ -77,7 +81,7 @@ <h3>
                 </tbody>
                 <tbody>
                     <tr ng-repeat="(stage,data) in island"
-                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge'">
+                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion'">
                         <td>
                             {{type == 'Story Island' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
                         </td>
diff --git a/drops/index.js b/drops/index.js
index 7f8f8227c..90168743b 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -61,7 +61,7 @@ app.directive('type',function() {
 app.directive('island',function() {
     return {
         restrict: 'E',
-        scope: { island: '=', data: '=', type: '=', hiddenUnits: '=', condition: '=', challenge: '=' },
+        scope: { island: '=', data: '=', type: '=', hiddenUnits: '=', condition: '=', challenge: '=', completion: '=' },
         replace: true,
         templateUrl: 'island.html',
         link: function(scope, element, attrs) {
diff --git a/index.html b/index.html
index 6ab972ce1..e4fdf8820 100644
--- a/index.html
+++ b/index.html
@@ -39,10 +39,10 @@
             <br>
             <ul>
                 <li>Added Conditions & Challenges</li>
-                <li>to Drop Table</li><br>
+                <li>Added Story Mode Completion Rewards</li>
+                <li>To Drop Table</li><br>
                 <li>Details now Includes Japanese Names</li>
-                <li>as well as other Search Terms</li>
-            </ul>
+                </ul>
         </div>
     </body>
 

From c0e60de0584279e57d715eacb128d76d6c7b4928 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 15 Feb 2016 20:05:13 +0100
Subject: [PATCH 0026/1569] Quickfix to drop Stage of Completion Units

---
 drops/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drops/index.html b/drops/index.html
index b46e0a59f..5ca21f661 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -83,7 +83,7 @@ <h3>
                     <tr ng-repeat="(stage,data) in island"
                         ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion'">
                         <td>
-                            {{type == 'Story Island' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
+                            {{type == 'Story Island'&& stage!='Completion Units' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
                         </td>
                         <td hide-when-empty>
                             <a ng-repeat="uid in data | smartSort:'false'" ng-if="uid > 0 && !hiddenUnits[uid]"

From ed27c83347776654c2154926fe360cd9e014f4af Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 15 Feb 2016 20:27:45 +0100
Subject: [PATCH 0027/1569] Extra Column for MAX EXP

---
 characters/js/controllers.js | 2 +-
 characters/js/table.js       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index 217224408..3b85588e3 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -217,7 +217,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', [ ]);
 
diff --git a/characters/js/table.js b/characters/js/table.js
index 49e5e0666..a2c61f581 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -53,7 +53,8 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
         additionalColumns.forEach(function(x) {
             var title = x
                 .replace(/Minimum cooldown/,'Min CD')
-                .replace(/Initial cooldown/,'Max CD');
+                .replace(/Initial cooldown/,'Max CD')
+                .replace(/MAX EXP/,'MAX EXP');
             result.splice(result.length-1, 0, { title: title, type: 'num-string' });
         });
         return result;
@@ -236,6 +237,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
             else if (c == 'ATK/cost') temp = Math.round(x.maxATK / x.cost * 100) / 100;
             else if (c == 'HP/cost') temp = Math.round(x.maxHP / x.cost * 100) / 100;
             else if (c == 'CMB') temp = x.combo;
+            else if (c == 'MAX EXP') temp = x.maxEXP;
             else if (c == 'Minimum cooldown' || c == 'Initial cooldown') { 
                 var d = cooldowns[x.number];
                 if (!d) temp = 'N/A';

From 1af302bda5246ce6693a4e851516ca2a1ab4b238 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 16 Feb 2016 10:38:01 +0100
Subject: [PATCH 0028/1569] Bride Boa Update

---
 common/data/captains.js   | 10 +++++++++-
 common/data/cooldowns.js  |  9 ++++++++-
 common/data/details.js    | 10 +++++++++-
 common/data/drops.js      |  8 ++++----
 common/data/evolutions.js |  6 +++++-
 common/data/families.js   |  9 ++++++++-
 common/data/flags.js      |  4 +++-
 common/data/gw.js         |  2 +-
 common/data/specials.js   |  8 +++++++-
 common/data/units.js      |  4 ++--
 index.html                |  3 ++-
 11 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 649838608..4bb5c1628 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2109,5 +2109,13 @@ window.captains = {
 	},
 	918: {
 		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
-	}
+	},
+    921: {
+        atk: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; }
+    },
+    922: {
+        atk: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; }
+    }
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 38da79c9c..945e7ba3a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -918,5 +918,12 @@ window.cooldowns = [
 	[ 18, 9 ],
 	[ 18, 9 ],
 	[ 22, 10 ],
-	[ 19, 14 ]
+	[ 19, 14 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    null,
+    null,
+    null,
+    null,
+    null
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 0cef23669..72d65e80e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4256,5 +4256,13 @@ window.details = {
 	920: {
 		specialName: "Snake Bow of the Warrior Defending Her Country",
 		special: "Changes the orbs in the middle row into [RCV] orbs, changes the orbs in the bottom row into [TND] orbs"
-	}
+	},
+    921: {
+        captain: "Boosts ATK and RCV of Freedom characters by 1.2x",
+        special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
+    },
+    922: {
+        captain: "Boosts ATK and RCV of Freedom characters by 1.75x",
+        special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
+    }
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index 3c788d5a4..ed50f1600 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1,4 +1,4 @@
-window.drops = {
+window.drops = {
 
     'Story Island': [
 
@@ -1078,9 +1078,9 @@
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 926, 927 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 926, 927 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 926 ]
         }
 
    ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 207d06a55..f8481da57 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1394,5 +1394,9 @@ window.evolutions = {
 	917: {
 		evolution: 918,
 		evolvers: [ 117, 79, 85, 96, 101 ]
-	}
+	},
+    921: {
+        evolution: 922,
+        evolvers: [ 84 , 85, 86 , 87 , 88]
+    }
 };
\ No newline at end of file
diff --git a/common/data/families.js b/common/data/families.js
index 05a1e1930..bf6ae6937 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -918,5 +918,12 @@ window.families = [
 	"Marguerite",
 	"Marguerite",
 	"Aphelandra",
-	"Sweet Pea"
+	"Sweet Pea",
+    "Boa Hancock",
+    "Boa Hancock",
+    "Eustass Kid",
+    "Eustass Kid",
+    "Sadi-chan",
+    "Sadi-chan",
+    "Doberman"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 7c20427e2..d22a6d67b 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -722,5 +722,7 @@ window.flags = {
 	913: { rr: 1, rro: 1 },
 	914: { rr: 1, rro: 1 },
 	915: { rr: 1, rro: 1, lrr: 1 },
-	916: { rr: 1, rro: 1, lrr: 1 }
+	916: { rr: 1, rro: 1, lrr: 1 },
+    921: { rr: 1, rro: 1, lrr: 1 },
+    922: { rr: 1, rro: 1, lrr: 1 }
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index afdf72025..beaeada7a 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17922,17920,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691];
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17922,17920,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036];
diff --git a/common/data/specials.js b/common/data/specials.js
index 38da34691..252b67d79 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1032,5 +1032,11 @@ window.specials = {
 		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
 		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
 		type: "class"
-	}
+	},
+    921: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    922: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index e03a7ceee..87e85272c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,8 +919,8 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-    ["Bride Boa", "INT", ["Shooter","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Bride Boa Evolution", "INT", ["Shooter","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+    ["Bride Boa", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
+    ["Bride Boa Evolution", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,null,null,null,null],
     ["Colosseum Kid", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
     ["Colosseum Kid Evolution", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
     ["Colosseum Sadi", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
diff --git a/index.html b/index.html
index e4fdf8820..b845dfacc 100644
--- a/index.html
+++ b/index.html
@@ -38,10 +38,11 @@
             <p>15/02/2016</p>
             <br>
             <ul>
+                <li>Updated Bride Boa</li>
                 <li>Added Conditions & Challenges</li>
                 <li>Added Story Mode Completion Rewards</li>
                 <li>To Drop Table</li><br>
-                <li>Details now Includes Japanese Names</li>
+
                 </ul>
         </div>
     </body>

From 7b2ad371814860d155a2875842e99a8881471e34 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 16 Feb 2016 10:41:07 +0100
Subject: [PATCH 0029/1569] Wrong Sadi added to Colosseum

---
 common/data/drops.js | 6 +++---
 index.html           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index ed50f1600..eb404b4b6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1078,9 +1078,9 @@ window.drops = {
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 926, 927 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 926, 927 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 926 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925 ]
         }
 
    ]
diff --git a/index.html b/index.html
index b845dfacc..7643fa9a8 100644
--- a/index.html
+++ b/index.html
@@ -35,7 +35,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>15/02/2016</p>
+            <p>16/02/2016</p>
             <br>
             <ul>
                 <li>Updated Bride Boa</li>

From 12b47143d04f7fc89de0b8c95bbb2d97445ff0fb Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 16 Feb 2016 11:33:46 +0100
Subject: [PATCH 0030/1569] Fix for detailed Drops

Used to show up if their number was found in conditions/completion etc
---
 characters/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/utils.js b/characters/js/utils.js
index cf6cf3ef1..7b5d86851 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -102,7 +102,7 @@ CharUtils.searchDropLocations = function(id) {
         for (var island=0;island<window.drops[type].length;++island) {
             var temp = [ ];
             for (var stage in window.drops[type][island]) {
-                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global') continue;
+                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge') continue;
                 if (window.drops[type][island][stage].indexOf(id) != -1)
                     temp.push(stage);
             }

From 3ba8dfa8c766c01e9f0ff054d3177164a43307a4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 16 Feb 2016 09:49:17 -0600
Subject: [PATCH 0031/1569] More stats, Hancock

Hancock 4* Stats added,
Bridal Hancock alias
Chopperman
---
 Chopperman.psd         | Bin 0 -> 528273 bytes
 common/data/aliases.js |   6 +++---
 common/data/units.js   |  16 ++++++++--------
 favicon.ico            | Bin 2238 -> 6512 bytes
 oldIco.ico             | Bin 0 -> 2238 bytes
 5 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 Chopperman.psd
 create mode 100644 oldIco.ico

diff --git a/Chopperman.psd b/Chopperman.psd
new file mode 100644
index 0000000000000000000000000000000000000000..050e68187a16fc22450d720070531c392124278c
GIT binary patch
literal 528273
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%0D7amKBi?X_ujY)IqS0H$-&K`)7~M>9
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%0A{Rb|GokUPV;yrIe_j=$}K}
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%0AfY%ObYQ@I
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%0A-!khQ3sNZX
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%0APKKZA!=?m
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
Sv#)*8l>bXN%KyLpz5g53>g$F8

literal 0
HcmV?d00001

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 40723b04e..fa57661c1 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,4 +1,4 @@
-window.aliases = {
+window.aliases = {
     1: ['モンキー・D・ルフィ',''],
     2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)',''],
     3: ['モンキー・D・ルフィ ゴムゴムのバズーカ',''],
@@ -919,8 +919,8 @@ window.aliases = {
     918: ['マーガレット 護国の戦士',''],
     919: ['アフェランドラ',''],
     920: ['スイトピー',''],
-    921: ['',''],
-    922: ['',''],
+    921: ['','','Bridal Hancock'],
+    922: ['','','Bridal Hancock'],
     923: ['',''],
     924: ['',''],
     925: ['',''],
diff --git a/common/data/units.js b/common/data/units.js
index 87e85272c..feefb901f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1,4 +1,4 @@
-window.units = [
+window.units = [
 	[ "Monkey D. Luffy", "STR", "Fighter", 2, 1, 5, 0, 5, 163, 42, 15, 8, 134, 68, 15, 1 ],
 	[ "Monkey D. Luffy Gum-Gum Pistol", "STR", "Fighter", 3, 4, 6, 0, 20, 26184, 130, 76, 14, 510, 249, 49, 0.7 ],
 	[ "Monkey D. Luffy Gum-Gum Bazooka", "STR", "Fighter", 4, 7, 6, 2, 35, 136167, 404, 227, 39, 975, 522, 105, 1 ],
@@ -919,11 +919,11 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-    ["Bride Boa", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
-    ["Bride Boa Evolution", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,null,null,null,null],
-    ["Colosseum Kid", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Colosseum Kid Evolution", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Colosseum Sadi", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-    ["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null]
+        ["Bride Boa", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
+        ["Bride Boa Evolution", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
+        ["Colosseum Kid", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+        ["Colosseum Kid Evolution", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+        ["Colosseum Sadi", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+        ["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
+        ["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null]
 ];
diff --git a/favicon.ico b/favicon.ico
index 03e93cb4b9fb92861eb88b8a97ccb67fb860d77e..3ea387b4e85651cbb12784966492f623612cfc16 100644
GIT binary patch
literal 6512
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
S&+vaUP(@Kwp<2%3)Bgc`Ep2E3

literal 2238
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

diff --git a/oldIco.ico b/oldIco.ico
new file mode 100644
index 0000000000000000000000000000000000000000..03e93cb4b9fb92861eb88b8a97ccb67fb860d77e
GIT binary patch
literal 2238
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

literal 0
HcmV?d00001


From e6624ee9d555fcc2c54c482612164aa36b3870dc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 16 Feb 2016 09:51:22 -0600
Subject: [PATCH 0032/1569] Small

updating changelog
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 7643fa9a8..23ad00101 100644
--- a/index.html
+++ b/index.html
@@ -42,7 +42,7 @@
                 <li>Added Conditions & Challenges</li>
                 <li>Added Story Mode Completion Rewards</li>
                 <li>To Drop Table</li><br>
-
+                <li>Now with more Chopperman</li>
                 </ul>
         </div>
     </body>

From ca34aac883a7b2b7e62775c38411b3c83e5f742a Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 16 Feb 2016 18:09:49 +0100
Subject: [PATCH 0033/1569] Fixed Wanze Icon

---
 common/js/utils.js | 2 ++
 index.html         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index a06b0b476..b0b2ed4a7 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -65,6 +65,8 @@ utils.getThumbnailUrl = function(n) {
     if (n === null || n === undefined || (window.units && window.units[n-1].incomplete))
         return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
     var id = ('0000' + n).slice(-4).replace(/(057[54])/,'0$1'); // missing aokiji image
+    if(id=='0742')
+        return 'http://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
     return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
 };
 
diff --git a/index.html b/index.html
index 23ad00101..ac6d57393 100644
--- a/index.html
+++ b/index.html
@@ -41,7 +41,7 @@
                 <li>Updated Bride Boa</li>
                 <li>Added Conditions & Challenges</li>
                 <li>Added Story Mode Completion Rewards</li>
-                <li>To Drop Table</li><br>
+                <li>Fixed Wanze (#742) Icon</li><br>
                 <li>Now with more Chopperman</li>
                 </ul>
         </div>

From 3beee281b97f6f09d4029689e94cb20dada26104 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 16 Feb 2016 23:00:40 +0100
Subject: [PATCH 0034/1569] Changed floor to ceiling for Hits after Tests

INT Baby Turtle hits PSY Unit for 24 not 18
Which means it's ceil(dmg/hits)*hits not floor
Should at most add 10 damage per Unit
---
 damage/js/cruncher.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 257780ff3..8a5b25ca1 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -318,14 +318,14 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             cptsWith.hitMultipliers.forEach(function(x) { lastAtk *= x.hit(result.hits); });
             // apply defense
             lastHit = lastAtk / unit.combo;
-            lastHit = Math.floor(Math.max(1, lastHit - currentDefense));
+            lastHit = Math.ceil(Math.max(1, lastHit - currentDefense));
             // add hit to current total
             result.result += lastHit;
         }
         // apply hit bonus
         if (bonusDamageBase > 0) {
-            if (lastHit > 1) result.result += Math.floor(lastAtk * 0.9 * bonusDamageBase);
-            else result.result += Math.max(0,Math.floor(lastAtk * (0.9 * bonusDamageBase + 1 / unit.combo)) - currentDefense);
+            if (lastHit > 1) result.result += Math.ceil(lastAtk * 0.9 * bonusDamageBase);
+            else result.result += Math.max(0,Math.ceil(lastAtk * (0.9 * bonusDamageBase + 1 / unit.combo)) - currentDefense);
         }
         return result;
     };

From dd5b38fd16dd5932a6a22d18c22e4d132e72e634 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 16 Feb 2016 22:58:46 -0600
Subject: [PATCH 0035/1569] Updated Colosseum Units

Captains, Cooldowns, Details, Units.js all updated with new Colosseum
units.
---
 common/data/captains.js  | 36 ++++++++++++++++++++++++++++--------
 common/data/cooldowns.js | 14 +++++++-------
 common/data/details.js   | 40 +++++++++++++++++++++++++++++++---------
 common/data/units.js     | 14 +++++++-------
 4 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 4bb5c1628..765daa2f4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2110,12 +2110,32 @@ window.captains = {
 	918: {
 		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
 	},
-    921: {
-        atk: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; }
-    },
-    922: {
-        atk: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; }
-    }
+	921: {
+		atk: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; }
+	},
+	922: {
+		atk: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; },
+		rcv: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; }
+	},
+	923: {
+		atk: function(p) {
+			return p.unit.class.has("Ambition") ? 2 + .75 * ((100 - p.percHP) / 100) : 1;
+		}
+	},
+	924: {
+		atk: function(p) {
+			return p.unit.class.has("Ambition") ? 2 + .75 * ((100 - p.percHP) / 100) : 1;
+		}
+	},
+	925: {
+		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
+	},
+	926: {
+		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
+	},
+	927: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
+		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 945e7ba3a..f7063e4a3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -919,11 +919,11 @@ window.cooldowns = [
 	[ 18, 9 ],
 	[ 22, 10 ],
 	[ 19, 14 ],
-    [ 15, 15 ],
-    [ 15, 15 ],
-    null,
-    null,
-    null,
-    null,
-    null
+	[ 15, 15 ],
+	[ 15, 15 ],
+	28,
+	28,
+	22,
+	22,
+	18
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 72d65e80e..3ff7f3c47 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1,4 +1,4 @@
-window.details = {
+window.details = {
 	1: {
 		special: "Deals 5x character's ATK in STR damage to one enemy",
 		specialName: "Spinning Gum Punch"
@@ -4257,12 +4257,34 @@ window.details = {
 		specialName: "Snake Bow of the Warrior Defending Her Country",
 		special: "Changes the orbs in the middle row into [RCV] orbs, changes the orbs in the bottom row into [TND] orbs"
 	},
-    921: {
-        captain: "Boosts ATK and RCV of Freedom characters by 1.2x",
-        special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
-    },
-    922: {
-        captain: "Boosts ATK and RCV of Freedom characters by 1.75x",
-        special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
-    }
+	921: {
+		captain: "Boosts ATK and RCV of Freedom characters by 1.2x",
+		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
+	},
+	922: {
+		captain: "Boosts ATK and RCV of Freedom characters by 1.75x",
+		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
+	},
+	923: {
+		captain: "Boosts ATK of Ambition characters by 2x at Full Heath, and by 2.75x at Low Health",
+		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
+		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
+	},
+	924: {
+		captain: "Boosts ATK of Ambition characters by 2x at Full Heath, and by 2.75x at Low Health",
+		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
+		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
+	},
+	925: {
+		captain: "Boosts ATK of Tough characters by 2x",
+		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x"
+	},
+	926: {
+		captain: "Boosts ATK of Tough characters by 2x",
+		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x"
+	},
+	927: {
+		captain: "Boosts ATK and HP of Ambition Units by 1.5x",
+		special: "Take 1.5x Additional damage; Slasher and Ambition type characters gain 1.2x ATK for 1 turn"
+	}
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index feefb901f..8fbc18011 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,11 +919,11 @@
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-        ["Bride Boa", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
-        ["Bride Boa Evolution", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
-        ["Colosseum Kid", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-        ["Colosseum Kid Evolution", "STR", ["Striker","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-        ["Colosseum Sadi", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-        ["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"],null,null,null,null,null,null,null,null,null,null,null,null,null],
-        ["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"],null,null,null,null,null,null,null,null,null,null,null,null,null]
+	["Bride Boa", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
+	["Bride Boa Evolution", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
+	["Colosseum Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null,null,null,null,null,null,null,null],
+	["Colosseum Kid Evolution", "STR", ["Striker","Ambition"], 5,null,null,null,null,null,null,null,null,null,null,null,null],
+	["Colosseum Sadi", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,null,null,null,null,null,null,null,null],
+	["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"], 5, null,null,null,null,null,null,null,null,null,null,null,null],
+	["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null,null,null,null,null,null,null,null]
 ];

From 56f8c4d6a2922ab18d911408124fec4a996491fc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 16 Feb 2016 23:09:47 -0600
Subject: [PATCH 0036/1569] Fix

Sanji fixed, 5* Sadi Added
---
 common/data/captains.js | 4 ++--
 common/data/details.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 765daa2f4..1d4900c8c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2088,7 +2088,7 @@ window.captains = {
 	},
 	912: {
 		atk: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; }
+		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
 	},
 	913: {
 		atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1); }
@@ -2132,7 +2132,7 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
 	},
 	926: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Tough") ? 2.5 : 1; }
 	},
 	927: {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
diff --git a/common/data/details.js b/common/data/details.js
index 3ff7f3c47..86956cb8d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4280,11 +4280,11 @@
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x"
 	},
 	926: {
-		captain: "Boosts ATK of Tough characters by 2x",
+		captain: "Boosts ATK of Tough characters by 2.5x",
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x"
 	},
 	927: {
 		captain: "Boosts ATK and HP of Ambition Units by 1.5x",
-		special: "Take 1.5x Additional damage; Slasher and Ambition type characters gain 1.2x ATK for 1 turn"
+		special: "Take 1.5x Additional damage; Slasher and Ambition type characters gain 1.2x ATK for 3 turns"
 	}
 };
\ No newline at end of file

From 9eb4a59d0d3f42af55eb40114610b4f1010d8459 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Feb 2016 09:11:52 -0600
Subject: [PATCH 0037/1569] corrections & Data

Added more minimum unit level stats,
corrected data,
Drops page info
---
 common/data/cooldowns.js |  2 +-
 common/data/details.js   | 10 ++++++----
 common/data/drops.js     |  3 ++-
 common/data/units.js     | 10 +++++-----
 index.html               |  7 +++----
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f7063e4a3..c735998ce 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -925,5 +925,5 @@ window.cooldowns = [
 	28,
 	22,
 	22,
-	18
+	[18, 8]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 86956cb8d..5edb7553d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4266,22 +4266,24 @@
 		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
 	},
 	923: {
-		captain: "Boosts ATK of Ambition characters by 2x at Full Heath, and by 2.75x at Low Health",
+		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
+		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
 		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	924: {
-		captain: "Boosts ATK of Ambition characters by 2x at Full Heath, and by 2.75x at Low Health",
+		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
+		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
 		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	925: {
 		captain: "Boosts ATK of Tough characters by 2x",
-		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x"
+		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x for 3 turns"
 	},
 	926: {
 		captain: "Boosts ATK of Tough characters by 2.5x",
-		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x"
+		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x for 3 turns"
 	},
 	927: {
 		captain: "Boosts ATK and HP of Ambition Units by 1.5x",
diff --git a/common/data/drops.js b/common/data/drops.js
index eb404b4b6..f34ed9d69 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -664,7 +664,7 @@ window.drops = {
             thumb: 392,
             global: true,
             condition: 'You can only get STR, QCK, INT and Food Orbs',
-            challenge: 'Amount of hits over 50,000',
+            challenge: 'Total number hits over 50,000',
             Expert: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ],
             Elite: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ]
         },
@@ -760,6 +760,7 @@ window.drops = {
             thumb: 583,
             global: true,
             condition: 'All Units considered from the “Sea” will lose 20% to all stats',
+			challenge: 'Total number hits over 50,000',
             Expert: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ],
             Elite: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
         },
diff --git a/common/data/units.js b/common/data/units.js
index 8fbc18011..1d4f262f1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -921,9 +921,9 @@
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
 	["Bride Boa", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
 	["Bride Boa Evolution", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
-	["Colosseum Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null,null,null,null,null,null,null,null],
-	["Colosseum Kid Evolution", "STR", ["Striker","Ambition"], 5,null,null,null,null,null,null,null,null,null,null,null,null],
-	["Colosseum Sadi", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,null,null,null,null,null,null,null,null],
-	["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"], 5, null,null,null,null,null,null,null,null,null,null,null,null],
-	["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null,null,null,null,null,null,null,null]
+	["Colosseum Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,null,null,null,null],
+	["Colosseum Kid Evolution", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,null,null,null,null],
+	["Colosseum Sadi", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,null, 413, 246, 88, 977, 544, 191, 1],
+	["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159,null,null,null,null],
+	["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71,null,null,null,null]
 ];
diff --git a/index.html b/index.html
index ac6d57393..624f61224 100644
--- a/index.html
+++ b/index.html
@@ -35,12 +35,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>16/02/2016</p>
+            <p>17/02/2016</p>
             <br>
             <ul>
-                <li>Updated Bride Boa</li>
-                <li>Added Conditions & Challenges</li>
-                <li>Added Story Mode Completion Rewards</li>
+                <li>Added Colosseum Units</li>
+                <li>Updated Drops Page info</li>
                 <li>Fixed Wanze (#742) Icon</li><br>
                 <li>Now with more Chopperman</li>
                 </ul>

From fdefe54116f2a00510e2d06e3dfd160a974f114e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Feb 2016 09:15:11 -0600
Subject: [PATCH 0038/1569] Commas

Always the worst
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 5edb7553d..79111c56a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4267,13 +4267,13 @@
 	},
 	923: {
 		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
+		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}",
 		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	924: {
 		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
+		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}",
 		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},

From 58b578bdb873608eb7f615ab9ee14022b4697571 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Feb 2016 09:25:46 -0600
Subject: [PATCH 0039/1569] Kid

Updated Kid info
---
 common/data/cooldowns.js | 4 ++--
 common/data/details.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c735998ce..028b81eb1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -921,8 +921,8 @@ window.cooldowns = [
 	[ 19, 14 ],
 	[ 15, 15 ],
 	[ 15, 15 ],
-	28,
-	28,
+	[28, 16],
+	[28, 16],
 	22,
 	22,
 	[18, 8]
diff --git a/common/data/details.js b/common/data/details.js
index 79111c56a..ce8830325 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4268,13 +4268,13 @@
 	923: {
 		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
 		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}",
-		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
+		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	924: {
 		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
 		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}",
-		special: "Empties all slots with [STR] orbs, deals several times the character's ATK in STR damage to one enemy",
+		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	925: {

From bf0af205e0aa5d7c00628a65c72522890b0652be Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 17 Feb 2016 17:37:54 +0100
Subject: [PATCH 0040/1569] Added Challenge Data/Indicator & one more Kid
 update

---
 characters/js/utils.js  |  2 +-
 common/data/details.js  | 10 +++++-----
 common/data/drops.js    | 16 ++++++++++++++--
 common/js/directives.js |  1 +
 drops/index.html        | 18 ++++++++++++------
 index.html              |  5 +++--
 6 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/characters/js/utils.js b/characters/js/utils.js
index 7b5d86851..3d2a1df3a 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -102,7 +102,7 @@ CharUtils.searchDropLocations = function(id) {
         for (var island=0;island<window.drops[type].length;++island) {
             var temp = [ ];
             for (var stage in window.drops[type][island]) {
-                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge') continue;
+                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge' || stage == 'challengeData') continue;
                 if (window.drops[type][island][stage].indexOf(id) != -1)
                     temp.push(stage);
             }
diff --git a/common/data/details.js b/common/data/details.js
index ce8830325..f6fbf73b6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1,4 +1,4 @@
-window.details = {
+window.details = {
 	1: {
 		special: "Deals 5x character's ATK in STR damage to one enemy",
 		specialName: "Spinning Gum Punch"
@@ -4266,14 +4266,14 @@
 		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
 	},
 	923: {
-		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}",
+		captain: "Boosts ATK of Ambition characters by 2x or by 2.5x",
+		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	924: {
-		captain: "Boosts ATK of Ambition characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : lower : 2 + .75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}",
+		captain: "oosts ATK of Ambition characters by 2x or by 2.75x",
+		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
diff --git a/common/data/drops.js b/common/data/drops.js
index f34ed9d69..aa0f1d331 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -592,6 +592,8 @@ window.drops = {
             name: 'Cobymeppo\'s Proving Ground!',
             thumb: 263,
             global: true,
+            challenge:'Total number of hits above 50,000',
+            challengeData: [['5 Times','1x Yellow Elder'],['15 Times','1x ATK Cotton Candy'],['25 Times','3x Rainbow Gems']],
             Expert: [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ],
             Elite: [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ]
         },
@@ -601,6 +603,7 @@ window.drops = {
             thumb: 268,
             global: true,
             challenge: 'Total Damage dealt to enemies',
+            challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems & 1x Skull Book']],
             Expert: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ],
             Elite: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
         },
@@ -636,6 +639,8 @@ window.drops = {
             thumb: 337,
             global: true,
             condition: 'You may only bring INT units for 15 and 30 Stamina',
+            challenge: 'Total Damage dealt to enemies in one turn',
+            challengeData: [['150,000 Damage','1x Yellow Elder'],['400,000 Damage','1x ATK Cotton Candy'],['800,000 Damage','3x Rainbow Gems']],
             Expert: [ 87, 98, 113, 114, 336, 338, 339, -339, -338, -255, -222, -77, -68 ],
             Elite: [ 87, 98, 113, 336, 338, 339, -339, -338, -255, -222, -77, -68 ]
         },
@@ -646,6 +651,7 @@ window.drops = {
             global: true,
             condition: 'You may only bring QCK units for 15 and 30 Stamina',
             challenge: 'Low Teamcost, fast Clear and perfect Taps',
+            challengeData: [['200,000 Points','1x Red Elder'],['400,000 Points','1x HP Cotton Candy'],['700,000 Points','3x Rainbow Gems']],
             Expert: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ],
             Elite: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ]
         },
@@ -664,7 +670,8 @@ window.drops = {
             thumb: 392,
             global: true,
             condition: 'You can only get STR, QCK, INT and Food Orbs',
-            challenge: 'Total number hits over 50,000',
+            challenge: 'Total number of hits over 50,000',
+            challengeData: [['3 Times','1x Green Elder'],['12 Times','1x RCV Cotton Candy'],['25 Times','3x Rainbow Gems']],
             Expert: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ],
             Elite: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ]
         },
@@ -692,6 +699,7 @@ window.drops = {
             global: true,
             condition: 'You can only get STR, DEX, INT and PSY Orbs',
             challenge: 'Total Damage dealt to enemies',
+            challengeData: [['500,000 Damage','1x Black Elder'],['1,500,000 Damage','1x ATK Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
             Expert: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ],
             Elite: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ]
         },
@@ -717,6 +725,7 @@ window.drops = {
         {
             name: 'Jailbreaking Baroque Works',
             thumb: 462,
+            global: true,
             condition: 'Striker, Shooter and Slashers are weakend.',
             Expert: [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ],
             Elite: [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
@@ -751,6 +760,8 @@ window.drops = {
             name: 'Brother Soul! Afro Luffy!',
             thumb: 571,
             global: true,
+            challenge: 'Total number of hits over 50,000',
+            challengeData: [['3 Times','1x Red Elder'],['12 Times','1x RCV Cotton Candy'],['34 Times','3x Rainbow Gems & 1x Skull Book']],
             Expert: [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ],
             Elite: [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ]
         },
@@ -760,7 +771,8 @@ window.drops = {
             thumb: 583,
             global: true,
             condition: 'All Units considered from the “Sea” will lose 20% to all stats',
-			challenge: 'Total number hits over 50,000',
+			challenge: 'Total number of hits over 50,000',
+            challengeData: [['4 Times','1x Black Elder'],['16 Times','1x ATK Cotton Candy'],['38 Times','3x Rainbow Gems']],
             Expert: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ],
             Elite: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
         },
diff --git a/common/js/directives.js b/common/js/directives.js
index 3bd224d23..84cdf5e16 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -4,6 +4,7 @@ var notes = {
     captainProportional: "The exact multiplier used to compute the damage is proportional to the " +
         "crew's remaining HP and is higher the #1 the HP is. The multiplier is calculated as #2. " +
         "At full health the boost is equal to #3x, with 1 HP left to #4x.",
+    captainFixed:"The multiplier is #1 unless #2, in which case it is #3.",
     fixed: "Fixed damage means it entirely bypasses the enemy's defense.",
     gOrbs: "Characters with [G] orbs will deal 1.5x their normal damage. [G] orbs are affected by orb boosters.",
 	noFixedPerc: "Specials that deal fixed damage or cut a percentage of the enemy's HP are not " +
diff --git a/drops/index.html b/drops/index.html
index 5ca21f661..99790c140 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -56,7 +56,8 @@ <h3>
                     <i class="fa fa-chevron-right"></i>
                     <i class="fa fa-chevron-down"></i>
                     <span>{{island.name}}</span>
-                    <i class="fa fa-globe" ng-show="island.global"></i>
+                    <i class="fa fa-globe" ng-show="island.global" title="Available On Global"></i>
+                    <i class="fa fa-star" ng-show="island.challenge" title="Challenge Available"></i>
                     <bonus-list ng-if="type == 'Story Island'" y="$index"></bonus-list>
                     <day-label ng-if="type == 'Weekly Island'"></day-label>
                 </h3>
@@ -68,24 +69,29 @@ <h3>
                 <tbody>
                     <tr ng-if="island.completion" hide-when-empty>
                         <td>Completion</td>
-                        <td>{{island.completion}} </td>
+                        <td colspan="2">{{island.completion}} </td>
                     </tr>
                     <tr ng-if="island.condition" hide-when-empty>
                         <td>Condition</td>
-                        <td>{{island.condition}} </td>
+                        <td colspan="2">{{island.condition}} </td>
                     </tr>
                     <tr ng-if="island.challenge">
                         <td>Challenge</td>
-                        <td>{{island.challenge}} </td>
+                        <td colspan="2">{{island.challenge}} </td>
+                    </tr>
+                    <tr ng-repeat="challenge in island.challengeData">
+                        <td></td>
+                        <td>{{challenge[0]}}</td>
+                        <td>{{challenge[1]}}</td>
                     </tr>
                 </tbody>
                 <tbody>
                     <tr ng-repeat="(stage,data) in island"
-                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion'">
+                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion' && stage != 'challengeData'">
                         <td>
                             {{type == 'Story Island'&& stage!='Completion Units' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
                         </td>
-                        <td hide-when-empty>
+                        <td hide-when-empty colspan="2">
                             <a ng-repeat="uid in data | smartSort:'false'" ng-if="uid > 0 && !hiddenUnits[uid]"
                                 decorate-slot uid="uid" class="slot small" 
                                 href="../characters/#/view/{{uid}}" target="_blank"
diff --git a/index.html b/index.html
index 624f61224..97b28ab15 100644
--- a/index.html
+++ b/index.html
@@ -39,9 +39,10 @@
             <br>
             <ul>
                 <li>Added Colosseum Units</li>
-                <li>Updated Drops Page info</li>
+                <li>Updated Drops Page Info</li>
+                <li>Added Challenge Levels</li>
+                <li>Star Indicates Challenge</li>
                 <li>Fixed Wanze (#742) Icon</li><br>
-                <li>Now with more Chopperman</li>
                 </ul>
         </div>
     </body>

From 4f4c8f82bb554649bc2cdcc7130c406dab254430 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 17 Feb 2016 19:31:06 +0100
Subject: [PATCH 0041/1569] Updated new Unit Specials to fit matchers

Added Sadi Special + Kid Captain as well
---
 common/data/captains.js | 12 ++++++++++--
 common/data/details.js  |  8 ++++----
 common/data/specials.js |  8 ++++++++
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1d4900c8c..17fd857b3 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2120,12 +2120,20 @@ window.captains = {
 	},
 	923: {
 		atk: function(p) {
-			return p.unit.class.has("Ambition") ? 2 + .75 * ((100 - p.percHP) / 100) : 1;
+            if(p.percHP<30){ 
+                return p.unit.class.has("Ambition") ? 2.5 : 1;
+            } else {
+                return p.unit.class.has("Ambition") ? 2 : 1;
+            }	
 		}
 	},
 	924: {
 		atk: function(p) {
-			return p.unit.class.has("Ambition") ? 2 + .75 * ((100 - p.percHP) / 100) : 1;
+			if(p.percHP<30){
+                return p.unit.class.has("Ambition") ? 2.75 : 1;
+            } else {
+                return p.unit.class.has("Ambition") ? 2 : 1;
+            }
 		}
 	},
 	925: {
diff --git a/common/data/details.js b/common/data/details.js
index f6fbf73b6..0c33fd1ca 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4272,21 +4272,21 @@ window.details = {
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	924: {
-		captain: "oosts ATK of Ambition characters by 2x or by 2.75x",
+		captain: "Boosts ATK of Ambition characters by 2x or by 2.75x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
 	},
 	925: {
 		captain: "Boosts ATK of Tough characters by 2x",
-		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x for 3 turns"
+		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	926: {
 		captain: "Boosts ATK of Tough characters by 2.5x",
-		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts damage dealt to enemies with reduced DEF by 1.3x for 3 turns"
+		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	927: {
 		captain: "Boosts ATK and HP of Ambition Units by 1.5x",
-		special: "Take 1.5x Additional damage; Slasher and Ambition type characters gain 1.2x ATK for 3 turns"
+		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Ambition characters by 1.2x for 3 turns"
 	}
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 252b67d79..2c98fcc58 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1038,5 +1038,13 @@ window.specials = {
     },
     922: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    925: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+		type: "condition"
+    },
+    926: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+		type: "condition"
     }
 };
\ No newline at end of file

From a0c4067a6f85fe0fa9fdb93a7ba1fd8915abd567 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Feb 2016 13:20:13 -0600
Subject: [PATCH 0042/1569] Sadi/Kid

Sadi cooldown
kid special
---
 common/data/cooldowns.js | 4 ++--
 common/data/details.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 028b81eb1..b6a098d79 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -923,7 +923,7 @@ window.cooldowns = [
 	[ 15, 15 ],
 	[28, 16],
 	[28, 16],
-	22,
-	22,
+	[22, 12],
+	[22, 12],
 	[18, 8]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 0c33fd1ca..aac09d437 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4269,13 +4269,13 @@ window.details = {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.5x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
+		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 4 orbs - 45x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	924: {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.75x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [STR] orb."
+		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 4 orbs - 45x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	925: {
 		captain: "Boosts ATK of Tough characters by 2x",

From 4270f2b3ac7408d8dd3f94971a26cadd96454e49 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Feb 2016 21:57:43 -0600
Subject: [PATCH 0043/1569] Update Colo

Sadi / Doberman stats
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 1d4f262f1..68a11d46b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -924,6 +924,6 @@
 	["Colosseum Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,null,null,null,null],
 	["Colosseum Kid Evolution", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,null,null,null,null],
 	["Colosseum Sadi", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,null, 413, 246, 88, 977, 544, 191, 1],
-	["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159,null,null,null,null],
-	["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71,null,null,null,null]
+	["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],
+	["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1]
 ];

From b1066015d1b7910f7f871e64b9bd758cbedaa552 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 18 Feb 2016 12:04:53 +0100
Subject: [PATCH 0044/1569] Various Small Fixes

Street Punk to fooder, Demolisher Canoneer out
English name for 461
Crocus Special fixed
---
 common/data/aliases.js | 4 ++--
 common/data/details.js | 8 ++++----
 common/data/units.js   | 6 +++---
 common/js/utils.js     | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index fa57661c1..36455e71b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,4 +1,4 @@
-window.aliases = {
+window.aliases = {
     1: ['モンキー・D・ルフィ',''],
     2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)',''],
     3: ['モンキー・D・ルフィ ゴムゴムのバズーカ',''],
@@ -615,7 +615,7 @@
     614: ['ザンバイ',''],
     615: ['怪力デストロイヤーズ 斧使い',''],
     616: ['怪力デストロイヤーズ 槍使い',''],
-    617: ['怪力デストロイヤーズ 大砲使い',''],
+    617: ['怪力デストロイヤーズ 大砲使い','','Gunner'],
     618: ['ナックルチンピラ 赤の賞金稼ぎ',''],
     619: ['ナックルチンピラ 緑の賞金稼ぎ',''],
     620: ['カタナチンピラ 青の賞金稼ぎ',''],
diff --git a/common/data/details.js b/common/data/details.js
index aac09d437..6c3e8c744 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1863,12 +1863,12 @@ window.details = {
 	},
 	461: {
 		special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
-		specialName: "Swan Arabesque",
+		specialName: "Escape Dance: White Swan Arabesque",
 		captain: "Boosts ATK of Fighter characters by 2x"
 	},
 	462: {
 		special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
-		specialName: "Swan Arabesque",
+		specialName: "Escape Dance: White Swan Arabesque",
 		captain: "Boosts ATK of Fighter characters by 2x"
 	},
 	463: {
@@ -2500,12 +2500,12 @@ window.details = {
 		captain: "Boosts HP and RCV of PSY characters by 1.5x"
 	},
 	587: {
-		special: "Removes poison, reduces Bind and Seal duration by 2 turns",
+		special: "Removes poison, reduces Bind and Silence duration by 2 turns",
 		specialName: "Merciful Painkiller",
 		captain: "Recovers 3x character's RCV in HP at the end of each turn"
 	},
 	588: {
-		special: "Removes poison, reduces Bind and Seal duration by 2 turns",
+		special: "Removes poison, reduces Bind and Silence duration by 2 turns",
 		specialName: "Merciful Painkiller",
 		captain: "Recovers 5x character's RCV in HP at the end of each turn"
 	},
diff --git a/common/data/units.js b/common/data/units.js
index 68a11d46b..6baed5b35 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1,4 +1,4 @@
-window.units = [
+window.units = [
 	[ "Monkey D. Luffy", "STR", "Fighter", 2, 1, 5, 0, 5, 163, 42, 15, 8, 134, 68, 15, 1 ],
 	[ "Monkey D. Luffy Gum-Gum Pistol", "STR", "Fighter", 3, 4, 6, 0, 20, 26184, 130, 76, 14, 510, 249, 49, 0.7 ],
 	[ "Monkey D. Luffy Gum-Gum Bazooka", "STR", "Fighter", 4, 7, 6, 2, 35, 136167, 404, 227, 39, 975, 522, 105, 1 ],
@@ -459,7 +459,7 @@
 	[ "Sengoku", "PSY", [ "Fighter", "Knowledge" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
 	[ "Sengoku the Buddha", "PSY", [ "Fighter", "Knowledge" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
 	[ "Criminal Galdino Mr. 3", "PSY", [ "Slasher", "Knowledge" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
-	[ "Fugitive Bentham Mr. 2 Bon Clay", "DEX", [ "Fighter", "Freedom" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
+	[ "Escapee Bentham Mr. 2 Bon Clay", "DEX", [ "Fighter", "Freedom" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
 	[ "Prison Break Expert Mr. 2 Bon Clay", "DEX", [ "Fighter", "Freedom" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
 	[ "Satori", "PSY", [ "Shooter", "Knowledge" ], 4, 15, 4, 2, 70, 1066998, 479, 190, 158, 1422, 576, 272, 1 ],
 	[ "Shura", "INT", "Striker", 4, 15, 4, 2, 70, 1066998, 330, 420, 93, 1030, 1002, 175, 1 ],
@@ -615,7 +615,7 @@
 	[ "Zambai", "PSY", "Shooter", 3, 16, 4, 2, 70, 1066998, 230, 90, 48, 1580, 702, 168, 1 ],
 	[ "Demolisher Axeman", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
 	[ "Demolisher Spearman", "STR", [ "Striker", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
-	[ "Demolisher Gunner", "STR", [ "Shooter", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
+	[ "Demolisher G\0unner", "STR", [ "Shooter", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
 	[ "Street Punk: Brawler Red Bounty Hunter", "STR", "Fighter", 3, 13, 6, 1, 60, 674274, 102, 85, 28, 1158, 790, 90, 1 ],
 	[ "Street Punk: Brawler Green Bounty Hunter", "DEX", "Fighter", 3, 13, 6, 1, 60, 674274, 108, 75, 32, 1175, 754, 102, 1 ],
 	[ "Street Punk: Blade Blue Bounty Hunter", "QCK", "Slasher", 3, 13, 5, 1, 60, 674274, 153, 66, 40, 1215, 653, 128, 1 ],
diff --git a/common/js/utils.js b/common/js/utils.js
index b0b2ed4a7..ebe98888f 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@ var FODDER_REGEX = new RegExp('(' + [
     'Skypiea (Guard|Enforcer)', 'Shandian',
     '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
     'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', 'Giant.*Pirates',
-    '(Soldier|General) Zombie.*Shadow', 'Wild Zombie'
+    '(Soldier|General) Zombie.*Shadow', 'Wild Zombie','Street Punk'
 ].join(')|(') + ')','i');
 
 var utils = { };

From 1b0c85d44aa8f6f8b7c4120bde0af7f154aee385 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 18 Feb 2016 12:11:10 +0100
Subject: [PATCH 0045/1569] Finished Bride Robin

Official Guide finally added her
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 6baed5b35..846e578e2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -913,8 +913,8 @@ window.units = [
 	[ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Tough", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
 	[ "Brook, Harahetternia's Demon Lord", "QCK", [ "Freedom", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
 	[ "Brook, BONE to be Wild!!!", "QCK", [ "Freedom", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
-	[ "Nico Robin, Bride of Ohara", "QCK", [ "Knowledge", "Fighter" ], 4, 12, 4, 2, 50, null, 72, 38, 43, 899, 409, 105, 1 ],
-	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Knowledge", "Fighter" ], 5, 20, 4, 3, 99, null, 826, 327, 143, 1851, 812, 371, 0 ],
+	[ "Nico Robin, Bride of Ohara", "QCK", [ "Knowledge", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
+	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Knowledge", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
 	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],

From e3fdf7e09ead22f3753c9e6d8ae2b2e1e3b983a9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 18 Feb 2016 09:31:34 -0600
Subject: [PATCH 0046/1569] small fixes

details updated, fixed, specials fixed
---
 common/data/details.js  | 3 +--
 common/data/specials.js | 8 ++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6c3e8c744..80efe1744 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4056,8 +4056,7 @@ window.details = {
 		captain: "Boosts ATK and RCV of Tough characters by 1.75x",
 		specialName: "Resurrection of the Dead",
 		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Tough characters by 1.25x for 1 turn",
-		specialNotes: "SPECIALNOTES"
-	},
+		},
 	892: {
 		captain: "Boosts chain multiplier by 2x",
 		specialName: "Hands of the Dead",
diff --git a/common/data/specials.js b/common/data/specials.js
index 2c98fcc58..3464e7226 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -882,12 +882,14 @@ window.specials = {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
+		rcv: function(p) { .1; },
 		type: "class"
 	},
 	882: {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
+		rcv: function(p) { .1; },
 		type: "class"
 	},
 	883: {
@@ -1046,5 +1048,11 @@ window.specials = {
     926: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
 		type: "condition"
+    },
+	927: {
+        atk: function(p) {
+			return p.unit.class.has("Slasher") || p.unit.class.has("Ambition") ? 1.2 : 1;
+		},
+		type: "class"
     }
 };
\ No newline at end of file

From 3c7d3ac50e35a52760d6975c510387a4208c7043 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 18 Feb 2016 16:37:30 +0100
Subject: [PATCH 0047/1569] Translated Names

---
 common/data/units.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 846e578e2..122f39769 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,11 +919,11 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-	["Bride Boa", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
-	["Bride Boa Evolution", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
-	["Colosseum Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,null,null,null,null],
-	["Colosseum Kid Evolution", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,null,null,null,null],
-	["Colosseum Sadi", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,null, 413, 246, 88, 977, 544, 191, 1],
-	["Colosseum Sadi Evolution", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],
-	["Colosseum Vice Admiral Doberman", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1]
+	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
+	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
+	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,null,null,null,null],
+	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,null,null,null,null],
+	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,null, 413, 246, 88, 977, 544, 191, 1],
+	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],
+	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1]
 ];

From 200febb71a31df93cc0bc51858f0ee3e63379ff0 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 18 Feb 2016 16:40:30 +0100
Subject: [PATCH 0048/1569] Added translated Special Names

---
 common/data/details.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 80efe1744..3f7b7588d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4258,34 +4258,41 @@ window.details = {
 	},
 	921: {
 		captain: "Boosts ATK and RCV of Freedom characters by 1.2x",
+		specialName: "Pure and Beautiful Shyness",
 		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
 	},
 	922: {
 		captain: "Boosts ATK and RCV of Freedom characters by 1.75x",
+		specialName: "Pure and Beautiful Shyness",
 		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
 	},
 	923: {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.5x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
+		specialName: "Repel: Weapons Reflect",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 4 orbs - 45x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	924: {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.75x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
+		specialName: "Repel: Weapons Reflect",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 4 orbs - 45x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	925: {
 		captain: "Boosts ATK of Tough characters by 2x",
+		specialName: "Let's go, Jailer Beasts!",
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	926: {
 		captain: "Boosts ATK of Tough characters by 2.5x",
+		specialName: "Let's go, Jailer Beasts!",
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	927: {
 		captain: "Boosts ATK and HP of Ambition Units by 1.5x",
+		specialName: "Unwavering Hammer of Justice",
 		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Ambition characters by 1.2x for 3 turns"
 	}
-};
\ No newline at end of file
+};

From 9c7e1b5e96402e53f4b88509c09f73e4d6e24f03 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 18 Feb 2016 10:05:47 -0600
Subject: [PATCH 0049/1569] tiny fix

always the small things
---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 3464e7226..23005fcdd 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -882,14 +882,14 @@ window.specials = {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
-		rcv: function(p) { .1; },
+		rcv: function(p) { return .1; },
 		type: "class"
 	},
 	882: {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
-		rcv: function(p) { .1; },
+		rcv: function(p) { return .1; },
 		type: "class"
 	},
 	883: {

From cb44fa3d0b07f833d1608a75cd1ad170c14d8318 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 18 Feb 2016 17:44:27 +0100
Subject: [PATCH 0050/1569] Collo Evolutions added

---
 common/data/evolutions.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f8481da57..3f5ad7ba3 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1398,5 +1398,13 @@ window.evolutions = {
     921: {
         evolution: 922,
         evolvers: [ 84 , 85, 86 , 87 , 88]
+    },
+    923: {
+        evolution: 924,
+        evolvers: [ 118 , 83, 84 , 95 , 300]
+    },
+    925: {
+        evolution: 926,
+        evolvers: [ 117 , 85, 90 , 96 , 101]
     }
 };
\ No newline at end of file

From d227b19067a56d7953e47a4401c0ac34f01afaf0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 18 Feb 2016 11:14:22 -0600
Subject: [PATCH 0051/1569] Oh

0.1 not .1
---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 23005fcdd..2edf35d84 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -882,14 +882,14 @@ window.specials = {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
-		rcv: function(p) { return .1; },
+		rcv: function(p) { return 0.1; },
 		type: "class"
 	},
 	882: {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
-		rcv: function(p) { return .1; },
+		rcv: function(p) { return 0.1; },
 		type: "class"
 	},
 	883: {

From 0d2ea7ec93fec3fdd92ffb0e777784c00979943b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 18 Feb 2016 12:21:09 -0600
Subject: [PATCH 0052/1569] testing

test
---
 common/data/specials.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 2edf35d84..895fdaf21 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -882,14 +882,11 @@ window.specials = {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
-		rcv: function(p) { return 0.1; },
+		rcv: function(p) { return 2; },
 		type: "class"
 	},
 	882: {
-		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
-		},
-		rcv: function(p) { return 0.1; },
+		rcv: function(p) { return 0.5; },
 		type: "class"
 	},
 	883: {

From 74fbba19b09c3ba071ef94de9f5573db7a13f608 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 18 Feb 2016 13:02:03 -0600
Subject: [PATCH 0053/1569] undo

---
 common/data/specials.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 895fdaf21..2edf35d84 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -882,11 +882,14 @@ window.specials = {
 		atk: function(p) {
 			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
 		},
-		rcv: function(p) { return 2; },
+		rcv: function(p) { return 0.1; },
 		type: "class"
 	},
 	882: {
-		rcv: function(p) { return 0.5; },
+		atk: function(p) {
+			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
+		},
+		rcv: function(p) { return 0.1; },
 		type: "class"
 	},
 	883: {

From 34beea95567afa11fda23d7b7630f995ea379ddf Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 19 Feb 2016 15:46:40 +0100
Subject: [PATCH 0054/1569] Kid Max Stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 122f39769..08b384c86 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -922,8 +922,8 @@ window.units = [
 	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
 	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
 	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,null,null,null,null],
-	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,null,null,null,null],
-	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,null, 413, 246, 88, 977, 544, 191, 1],
+	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,2727,1319,224,1],
+	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, null],
 	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],
 	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1]
 ];

From 616dd004597a78f97122211ad6891b00336b80a0 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 19 Feb 2016 18:46:23 +0100
Subject: [PATCH 0055/1569] Fixed Kid Special (again)

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3f7b7588d..6b77d110d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4271,14 +4271,14 @@ window.details = {
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
 		specialName: "Repel: Weapons Reflect",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 4 orbs - 45x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
+		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	924: {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.75x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
 		specialName: "Repel: Weapons Reflect",
 		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 4 orbs - 45x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
+		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	925: {
 		captain: "Boosts ATK of Tough characters by 2x",

From 3f0286ed1b31cd1d5022f185a39c69fd9f34054c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 20 Feb 2016 11:41:08 +0100
Subject: [PATCH 0056/1569] Prison Units Flag update

---
 common/data/flags.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/data/flags.js b/common/data/flags.js
index d22a6d67b..747c76b30 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -454,6 +454,9 @@ window.flags = {
 	457: { global: 1, rr: 1, rro: 1 },
 	458: { global: 1, rr: 1, rro: 1 },
 	459: { global: 1, rr: 1, rro: 1 },
+    460: { global: 1 },
+    461: { global: 1 },
+    462: { global: 1 },
 	463: { global: 1 },
 	464: { global: 1 },
 	465: { global: 1 },

From 72794db3720325a1bbeae3f77abb2c561ad26380 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 20 Feb 2016 20:31:21 +0100
Subject: [PATCH 0057/1569] 4* Kid Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 08b384c86..bdf434291 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -921,7 +921,7 @@ window.units = [
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
 	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
 	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
-	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,null,null,null,null],
+	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,1600,703,146,null],
 	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,2727,1319,224,1],
 	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, null],
 	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],

From 4558ed512fa75ca75343cd9536b9bb5840ccc960 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 20 Feb 2016 20:41:23 +0100
Subject: [PATCH 0058/1569] 4* Boa Stats & Basker CD

---
 common/data/cooldowns.js | 2 +-
 common/data/units.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b6a098d79..738adaa6c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -703,7 +703,7 @@ window.cooldowns = [
 	[ 25, 20 ],
 	[ 12, 5 ],
 	[ 25, 18 ],
-	20,
+	[ 20, 14 ],
 	[ 18, 10 ],
 	[ 18, 10 ],
 	[ 21, 15 ],
diff --git a/common/data/units.js b/common/data/units.js
index bdf434291..3b4380cc7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,7 +919,7 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,null,null,null,null],
+	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,912,556,153,null],
 	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
 	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,1600,703,146,null],
 	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,2727,1319,224,1],

From 300bcd4d280c4988a3f3fad6e9cb500af6c195f1 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 21 Feb 2016 10:52:47 +0100
Subject: [PATCH 0059/1569] Halloween Robin Zoro GW Switch

---
 common/data/gw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index beaeada7a..dcda80702 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17922,17920,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036];
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036];

From f2960b277551ba010b93ec6ee82fb41cb318904d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 21 Feb 2016 10:55:58 +0100
Subject: [PATCH 0060/1569] Update cooldowns.js

---
 common/data/cooldowns.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 738adaa6c..468c5d018 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -782,8 +782,8 @@ window.cooldowns = [
 	[ 19, 7 ],
 	[ 11, 11 ],
 	[ 11, 11 ],
-	15,
-	15,
+	[ 15, 8 ],
+	[ 15, 8 ],
 	[ 23, 17 ],
 	[ 23, 17 ],
 	[ 15, 8 ],
@@ -907,12 +907,12 @@ window.cooldowns = [
 	24,
 	15,
 	15,
-	20,
-	20,
+	[ 20, 15 ],
+	[ 20, 15 ],
 	25,
 	25,
-	16,
-	16,
+	[ 16, 10 ],
+	[ 16, 10 ],
 	[ 13, 13 ],
 	[ 13, 13 ],
 	[ 18, 9 ],

From 022d122b33b4dd074225d7301836ad536ca3f3a4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 22 Feb 2016 09:38:55 -0600
Subject: [PATCH 0061/1569] Heal per turn added

Heal/turn added to image creation
---
 damage/js/images.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index f7afc55e6..64e56fa80 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -39,12 +39,21 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
             var percHP = $filter('number')(Math.round($scope.data.percHP * 100) / 100);
             var rcv = $filter('number')($scope.numbers.rcv);
             var cost = $filter('number')($scope.numbers.cost.cost);
+			var healPerTurn = $filter('number')($scope.numbers.healPerTurn);
+			//HP
             awesome(context, { text: 'f21e', x: baseX + 8, y: baseY, align: 'center' });
             type(context, { text: currentHP + ' HP (' + percHP + '%)', x: baseX + 25, y: baseY });
-            awesome(context, { text: 'f0f5', x: baseX + 8, y: baseY + 25, align: 'center' });
+            //RCV
+			awesome(context, { text: 'f0f5', x: baseX + 8, y: baseY + 25, align: 'center' });
             type(context, { text: rcv + ' RCV', x: baseX + 25, y: baseY + 25 });
-            awesome(context, { text: 'f039', x: baseX + 8, y: baseY + 50, align: 'center' });
+            //Cost
+			awesome(context, { text: 'f039', x: baseX + 8, y: baseY + 50, align: 'center' });
             type(context, { text: cost + ' cost', x: baseX + 25, y: baseY + 50 });
+			//Heal per Turn
+			if(healPerTurn){
+			awesome(context, { text: 'f0fa', x: baseX + 8, y: baseY + 75, align: 'center' });
+            type(context, { text: healPerTurn + ' Heal per turn', x: baseX + 25, y: baseY + 75 });
+			}
         }
     },true);
 
@@ -115,6 +124,8 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
 
     baseX = 10; baseY = 85;
 
+	if($scope.numbers.healPerTurn) baseY +=25;
+	
     if ($scope.data.effect) {
         awesome(context, { text: 'f02d', x: baseX + 8, y: baseY + 20, align: 'center', color: 'darkorchid' });
         type(context, { text: $scope.data.effect, x: baseX + 25, y: baseY + 20, maxWidth: 155, truncate: true, color: 'darkorchid' });

From 1f25a451032eb561ad3cc21cbb81c9691d3cf56b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 22 Feb 2016 09:46:05 -0600
Subject: [PATCH 0062/1569] index update change

update pop-up changed
---
 index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/index.html b/index.html
index 97b28ab15..2cc77b4b5 100644
--- a/index.html
+++ b/index.html
@@ -35,14 +35,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>17/02/2016</p>
+            <p>22/02/2016</p>
             <br>
             <ul>
                 <li>Added Colosseum Units</li>
                 <li>Updated Drops Page Info</li>
                 <li>Added Challenge Levels</li>
-                <li>Star Indicates Challenge</li>
-                <li>Fixed Wanze (#742) Icon</li><br>
+                <li>Damage Calculator Image Export</li>
+                <li>Now Shows Healing Per Turn</li><br>
                 </ul>
         </div>
     </body>

From e4813a56a2d844880520299cce8d8b3ceec9cd02 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 22 Feb 2016 17:50:39 +0100
Subject: [PATCH 0063/1569] Instructions added to Calculator

#9 done
Also added the first 100ish French names
---
 common/data/aliases.js    | 236 +++++++++++++++++++-------------------
 damage/css/main.css       |  12 ++
 damage/index.html         |  31 +++++
 damage/views/content.html |   5 +
 index.html                |   5 +-
 5 files changed, 168 insertions(+), 121 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 36455e71b..207f1caee 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,122 +1,122 @@
 window.aliases = {
-    1: ['モンキー・D・ルフィ',''],
-    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)',''],
-    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ',''],
-    4: ['モンキー・D・ルフィ ギア２','','Monkey D. Luffy', ' G2'],
-    5: ['ロロノア・ゾロ',''],
-    6: ['ロロノア・ゾロ 三・千・世・界',''],
-    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）',''],
-    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）',''],
-    9: ['ナミ',''],
-    10: ['ナミ トルネード=テンポ',''],
-    11: ['ナミ 蜃気楼＝テンポ',''],
-    12: ['ナミ サンダーボルト=テンポ',''],
-    13: ['ウソップ',''],
-    14: ['ウソップ タバスコ星',''],
-    15: ['ウソップ ゴールデンパウンド','','GPU'],
-    16: [ 'そげキング','','Usopp'],
-    17: ['サンジ',''],
-    18: ['サンジ 整形ショット(パラージュショット)',''],
-    19: ['料理人サンジ 焼き石シチュー',''],
-    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)',''],
-    21: ['トニートニー・チョッパー',''],
-    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）',''],
-    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）',''],
-    24: ['トニートニー・チョッパー 腕力強化（アームポイント）',''],
-    25: ['トニートニー・チョッパー 角強化（ホーンポイント）',''],
-    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）',''],
-    27: ['ヒグマ',''],
-    28: ['近海の主（ヌシ）',''],
-    29: ['金棒のアルビダ',''],
-    30: ['金棒のアルビダ スベスベの実',''],
-    31: ['コビー',''],
-    32: ['雑用コビー',''],
-    33: ['ヘルメッポ',''],
-    34: ['雑用ヘルメッポ',''],
-    35: ['斧手のモーガン',''],
-    36: ['モージ＆リッチー',''],
-    37: ['曲芸のカバジ',''],
-    38: ['バギー',''],
-    39: ['道化のバギー',''],
-    40: ['ガイモン',''],
-    41: ['シャム',''],
-    42: ['ブチ',''],
-    43: ['１・２のジャンゴ',''],
-    44: ['ダンシングジャンゴ',''],
-    45: ['キャプテン・クロ',''],
-    46: ['百計のクロ',''],
-    47: ['ヨサク',''],
-    48: ['ジョニー',''],
-    49: ['鉄拳のフルボディ',''],
-    50: ['パティ',''],
-    51: ['カルネ',''],
-    52: ['料理長ゼフ',''],
-    53: ['ギン',''],
-    54: ['鬼人ギン',''],
-    55: ['パール',''],
-    56: ['ファイヤーパール',''],
-    57: ['首領・クリーク',''],
-    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」',''],
-    59: ['ネズミ',''],
-    60: ['モーム',''],
-    61: ['チュウ',''],
-    62: ['クロオビ',''],
-    63: ['はっちゃん','', 'Hachi' ],
-    64: ['六刀流のハチ',''],
-    65: ['アーロン',''],
-    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）',''],
-    67: ['たしぎ',''],
-    68: ['たしぎ 海軍本部少尉',''],
-    69: ['スモーカー',''],
-    70: ['白猟のスモーカー',''],
-    71: ['ミス・ウェンズデー',''],
-    72: ['ネフェルタリ・ビビ',''],
-    73: ['王女ビビ',''],
-    74: ['ポートガス・D・エース',''],
-    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）',''],
-    76: ['シャンクス',''],
-    77: ['赤髪のシャンクス',''],
-    78: ['赤盗人ペンギン',''],
-    79: ['青盗人ペンギン',''],
-    80: ['緑盗人ペンギン',''],
-    81: ['黄盗人ペンギン',''],
-    82: ['黒盗人ペンギン',''],
-    83: ['虹盗人ペンギン',''],
-    84: ['赤海賊ペンギン',''],
-    85: ['赤海賊ペンギン',''],
-    86: ['赤海賊ペンギン',''],
-    87: ['赤海賊ペンギン',''],
-    88: ['赤海賊ペンギン',''],
-    89: ['赤カブトヤドカリ',''],
-    90: ['赤カブトヤドカリ',''],
-    91: ['赤カブトヤドカリ',''],
-    92: ['赤カブトヤドカリ',''],
-    93: ['赤カブトヤドカリ',''],
-    94: ['赤カブトヤドカリ',''],
-    95: ['赤ヨロイガニ',''],
-    96: ['赤ヨロイガニ',''],
-    97: ['赤ヨロイガニ',''],
-    98: ['赤ヨロイガニ',''],
-    99: ['赤ヨロイガニ',''],
-    100: ['赤しま番竜',''],
-    101: ['赤しま番竜',''],
-    102: ['赤しま番竜',''],
-    103: ['赤しま番竜',''],
-    104: ['赤しま番竜',''],
-    105: ['赤タカラガメ',''],
-    106: ['赤タカラガメ',''],
-    107: ['赤タカラガメ',''],
-    108: ['赤タカラガメ',''],
-    109: ['赤タカラガメ',''],
-    110: ['赤ダイミョウガメ',''],
-    111: ['赤ダイミョウガメ',''],
-    112: ['赤ダイミョウガメ',''],
-    113: ['赤ダイミョウガメ',''],
-    114: ['赤ダイミョウガメ',''],
-    115: ['タツノコ',''],
-    116: ['タツノワカ',''],
-    117: ['タツノミコト',''],
-    118: ['タツノオウ',''],
+    1: ['モンキー・D・ルフィ','Monkey D. Luffy'],
+    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)','Monkey D. Luffy Gum-Gum Carabine'],
+    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ','Monkey D. Luffy Gum-Gum Bazooka'],
+    4: ['モンキー・D・ルフィ ギア２','Monkey D. Luffy Gear 2','Monkey D. Luffy', ' G2'],
+    5: ['ロロノア・ゾロ','Roronoa Zoro'],
+    6: ['ロロノア・ゾロ 三・千・世・界','Roronoa Zoro Moulinet Infernal'],
+    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）','Roronoa Zoro Calibre'],
+    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）','Roronoa Zoro Brume Argentée'],
+    9: ['ナミ','Nami'],
+    10: ['ナミ トルネード=テンポ','Nami Tornado Tempo'],
+    11: ['ナミ 蜃気楼＝テンポ','Nami MirageTempo'],
+    12: ['ナミ サンダーボルト=テンポ','Nami Fulguro Tempo'],
+    13: ['ウソップ','Usopp'],
+    14: ['ウソップ タバスコ星','Usopp Etoile Piquante'],
+    15: ['ウソップ ゴールデンパウンド','Usopp Usopp-Pilon doré','GPU'],
+    16: [ 'そげキング','Sniperking','Usopp'],
+    17: ['サンジ','Sanji'],
+    18: ['サンジ 整形ショット(パラージュショット)','Sanji Tir esthétique'],
+    19: ['料理人サンジ 焼き石シチュー','Chef Sanji Ragoût bouillonnant'],
+    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)','Sanji Jambe du diable'],
+    21: ['トニートニー・チョッパー','Tony Tony Chopper'],
+    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）','Tony Tony Chopper Weight Boost'],
+    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）','Tony Tony Chopper Brain Boost'],
+    24: ['トニートニー・チョッパー 腕力強化（アームポイント）','Tony Tony Chopper Arm Boost'],
+    25: ['トニートニー・チョッパー 角強化（ホーンポイント）','Tony Tony Chopper Horn Boost'],
+    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）','Tony Tony Chopper Guard Boost'],
+    27: ['ヒグマ','Higuma'],
+    28: ['近海の主（ヌシ）','Seigneur de la côte'],
+    29: ['金棒のアルビダ','Alvida à la Massue'],
+    30: ['金棒のアルビダ スベスベの実','Alvida à la Massue Fruit Glisse-Glisse'],
+    31: ['コビー','Kobby'],
+    32: ['雑用コビー','Kobby le mousse'],
+    33: ['ヘルメッポ','Hermep'],
+    34: ['雑用ヘルメッポ','Hermep le mousse'],
+    35: ['斧手のモーガン','Morgan le Hacheur'],
+    36: ['モージ＆リッチー','Morge et Richy'],
+    37: ['曲芸のカバジ','Cabaji l\'acrobate'],
+    38: ['バギー','Baggy'],
+    39: ['道化のバギー','Baggy le Clown'],
+    40: ['ガイモン','Gaimon'],
+    41: ['シャム','Sham'],
+    42: ['ブチ','Buchi'],
+    43: ['１・２のジャンゴ','Jango l\'hypnotiseur'],
+    44: ['ダンシングジャンゴ','Jango le danseur'],
+    45: ['キャプテン・クロ','Capitaine Kuro'],
+    46: ['百計のクロ','Kuro les pattes de velours'],
+    47: ['ヨサク','Yosaku'],
+    48: ['ジョニー','Jhonny'],
+    49: ['鉄拳のフルボディ','Fullbody au poing d\'acier'],
+    50: ['パティ','Patty'],
+    51: ['カルネ','Carne'],
+    52: ['料理長ゼフ','Zeff le chef'],
+    53: ['ギン','Gyn'],
+    54: ['鬼人ギン','Gyn le démon enragé'],
+    55: ['パール','Pearl'],
+    56: ['ファイヤーパール','Fire Pearl'],
+    57: ['首領・クリーク','Don Krieg '],
+    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」','Don Krieg Bombe à gaz toxique MH5'],
+    59: ['ネズミ','Nezumi'],
+    60: ['モーム','Meuh-Meuh'],
+    61: ['チュウ','Smack'],
+    62: ['クロオビ','Kuroobi'],
+    63: ['はっちゃん','Octy', 'Hachi' ],
+    64: ['六刀流のハチ','Octy aux six lames'],
+    65: ['アーロン','Arlong'],
+    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）','Arlong enragé Squalo Crunch'],
+    67: ['たしぎ','Tashigi'],
+    68: ['たしぎ 海軍本部少尉','Tashigi Lieutenant-colonel de la Marine'],
+    69: ['スモーカー','Smoker'],
+    70: ['白猟のスモーカー','Smoker le chasseur blanc'],
+    71: ['ミス・ウェンズデー','Miss Wednesday'],
+    72: ['ネフェルタリ・ビビ','Vivi Nerfertari'],
+    73: ['王女ビビ','Princesse Vivi'],
+    74: ['ポートガス・D・エース','Portgas D. Ace'],
+    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）','Portgas D. Ace Pyro-miroir'],
+    76: ['シャンクス','Shanks'],
+    77: ['赤髪のシャンクス','Shanks le Roux'],
+    78: ['赤盗人ペンギン','Pingouin chapardeur rouge'],
+    79: ['青盗人ペンギン','Pingouin chapardeur bleu'],
+    80: ['緑盗人ペンギン','Pingouin chapardeur vert'],
+    81: ['黄盗人ペンギン','Pingouin chapardeur jaune'],
+    82: ['黒盗人ペンギン','Pingouin chapardeur noir'],
+    83: ['虹盗人ペンギン','Pingouin chapardeur arc-en-ciel'],
+    84: ['赤海賊ペンギン','Pingouin pirate rouge'],
+    85: ['赤海賊ペンギン','Pingouin pirate bleu'],
+    86: ['赤海賊ペンギン','Pingouin pirate vert'],
+    87: ['赤海賊ペンギン','Pingouin pirate jaune'],
+    88: ['赤海賊ペンギン','Pingouin pirate noir'],
+    89: ['赤カブトヤドカリ','Bernard-l\'ermite rouge'],
+    90: ['赤カブトヤドカリ','Bernard-l\'ermite bleu'],
+    91: ['赤カブトヤドカリ','Bernard-l\'ermite vert'],
+    92: ['赤カブトヤドカリ','Bernard-l\'ermite jaune'],
+    93: ['赤カブトヤドカリ','Bernard-l\'ermite noir'],
+    94: ['赤カブトヤドカリ','Bernard-l\'ermite arc-en-ciel'],
+    95: ['赤ヨロイガニ','Crabe blindé rouge'],
+    96: ['赤ヨロイガニ','Crabe blindé bleu'],
+    97: ['赤ヨロイガニ','Crabe blindé vert'],
+    98: ['赤ヨロイガニ','Crabe blindé jaune'],
+    99: ['赤ヨロイガニ','Crabe blindé noir'],
+    100: ['赤しま番竜','Dragon rayé rouge'],
+    101: ['赤しま番竜','Dragon rayé bleu'],
+    102: ['赤しま番竜','Dragon rayé vert'],
+    103: ['赤しま番竜','Dragon rayé jaune'],
+    104: ['赤しま番竜','Dragon rayé noir'],
+    105: ['赤タカラガメ','Tortue-trésor rouge'],
+    106: ['赤タカラガメ','Tortue-trésor bleue'],
+    107: ['赤タカラガメ','Tortue-trésor verte'],
+    108: ['赤タカラガメ','Tortue-trésor jaune'],
+    109: ['赤タカラガメ','Tortue-trésor noire'],
+    110: ['赤ダイミョウガメ','Tortue noble rouge'],
+    111: ['赤ダイミョウガメ','Tortue noble bleue'],
+    112: ['赤ダイミョウガメ','Tortue noble verte'],
+    113: ['赤ダイミョウガメ','Tortue noble jaune'],
+    114: ['赤ダイミョウガメ','Tortue noble noire'],
+    115: ['タツノコ','Poney marin'],
+    116: ['タツノワカ','Poulain marin'],
+    117: ['タツノミコト','Cheval marin'],
+    118: ['タツノオウ','Étalon marin'],
     119: ['カタナ山賊',''],
     120: ['ピストル山賊',''],
     121: ['格闘隊 雑用 レッドパイレーツ',''],
diff --git a/damage/css/main.css b/damage/css/main.css
index e2fac298f..e29dceb89 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -101,6 +101,18 @@ body, html {
     -webkit-animation-duration: 0.5s !important;
 }
 
+#instructions {
+    position: relative;
+    text-align: center;
+    padding: 25px;
+    z-index: 8;
+}
+#instructions > p > span {
+    background: skyblue;
+    padding: 2px;
+    border-radius: 5px;
+}
+
 /******************
  * MAIN UNIT PANE *
  ******************/
diff --git a/damage/index.html b/damage/index.html
index ca472f8b4..08a468e16 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -96,7 +96,38 @@
         <div ui-view></div>
 
         <error-report></error-report>
+        
         <link-button exclude="calculator"></link-button>
+        <script id="instructions.html" type="text/ng-template">
+        <div>
+            <b>Damage Window:</b>
+            <br>
+            <ul>
+                <li><tt>CTRL</tt>: Changes <ul><li>Miss>Below Good>Good>Great>Perfect</li></ul></li>
+                <li><tt>SHIFT</tt>: Changes Opponents Type</li>
+                <li><tt>Drag&Drop</tt>: Changes Attack Order</li>
+            </ul>
+            <br>
+            <b>Units Window:</b>
+            <ul>
+                <li><tt>CTRL</tt>: Changes Orbs Matching>Opposite>None</li>
+                <li><tt>SHIFT</tt>: Silences Captain</li>
+                <li><tt>ALT</tt>: Locks Units</li>
+                <li><tt>SHIFT+ALT</tt>: Disables Unit</li>
+                <li><tt>Drag&Drop</tt>: Change Unit Position</li>
+            </ul>
+            <br>
+            <b>Ship Window:</b>
+            <ul>
+               <li><tt>CTRL</tt>: Opens Ship Selection Window</li> 
+            </ul>
+            <br>
+            <b>Defense Window:</b>
+            <ul>
+               <li><tt>CTRL</tt>: Opens Defense Selection Window</li> 
+            </ul>
+        </div>
+    </script>
 
     </body>
 
diff --git a/damage/views/content.html b/damage/views/content.html
index 641a69ff0..082600870 100644
--- a/damage/views/content.html
+++ b/damage/views/content.html
@@ -34,6 +34,11 @@
             <i class="fa fa-picture-o"></i>
         </button>
     </div>
+    <div id="instructions">
+        <p>
+           <span class="help" popover-trigger="mouseenter click" popover-placement="top" uib-popover-template="'instructions.html'">Instructions</span>
+        </p>
+    </div>
 
     <url-container></url-container>
 
diff --git a/index.html b/index.html
index 2cc77b4b5..6fd8533ad 100644
--- a/index.html
+++ b/index.html
@@ -38,11 +38,10 @@
             <p>22/02/2016</p>
             <br>
             <ul>
-                <li>Added Colosseum Units</li>
-                <li>Updated Drops Page Info</li>
-                <li>Added Challenge Levels</li>
+                <li>Added Instructions to Calculator</li>
                 <li>Damage Calculator Image Export</li>
                 <li>Now Shows Healing Per Turn</li><br>
+                <li>Added Challenge Levels</li>
                 </ul>
         </div>
     </body>

From ace1466343a5ff115fd3d354e9bb065a223c84a8 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 22 Feb 2016 17:52:00 +0100
Subject: [PATCH 0064/1569] Quickfix

Looks better imo
---
 damage/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/index.html b/damage/index.html
index 08a468e16..22c7e25b8 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -103,7 +103,7 @@
             <b>Damage Window:</b>
             <br>
             <ul>
-                <li><tt>CTRL</tt>: Changes <ul><li>Miss>Below Good>Good>Great>Perfect</li></ul></li>
+                <li><tt>CTRL</tt>: Changes Miss>Below Good>Good>Great>Perfect</li>
                 <li><tt>SHIFT</tt>: Changes Opponents Type</li>
                 <li><tt>Drag&Drop</tt>: Changes Attack Order</li>
             </ul>

From da9f40bb24527886f348f12f48a48487243456ea Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 22 Feb 2016 18:37:49 +0100
Subject: [PATCH 0065/1569] Moved Instructions to Popup

Looks better already
---
 damage/css/main.css                 | 14 ++++-----
 damage/index.html                   | 30 -------------------
 damage/js/controllers.js            |  8 +++++
 damage/js/states.js                 | 10 +++++++
 damage/views/content.html           |  9 +++---
 damage/views/popup/instruction.html | 46 +++++++++++++++++++++++++++++
 6 files changed, 74 insertions(+), 43 deletions(-)
 create mode 100644 damage/views/popup/instruction.html

diff --git a/damage/css/main.css b/damage/css/main.css
index e29dceb89..ce77a11b9 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -102,17 +102,15 @@ body, html {
 }
 
 #instructions {
-    position: relative;
-    text-align: center;
-    padding: 25px;
-    z-index: 8;
+    padding-left:10px
 }
-#instructions > p > span {
-    background: skyblue;
-    padding: 2px;
-    border-radius: 5px;
+
+#instructions > ul {
+    list-style-type: none;
+    margin-left: 15px;
 }
 
+
 /******************
  * MAIN UNIT PANE *
  ******************/
diff --git a/damage/index.html b/damage/index.html
index 22c7e25b8..8d0139244 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -98,36 +98,6 @@
         <error-report></error-report>
         
         <link-button exclude="calculator"></link-button>
-        <script id="instructions.html" type="text/ng-template">
-        <div>
-            <b>Damage Window:</b>
-            <br>
-            <ul>
-                <li><tt>CTRL</tt>: Changes Miss>Below Good>Good>Great>Perfect</li>
-                <li><tt>SHIFT</tt>: Changes Opponents Type</li>
-                <li><tt>Drag&Drop</tt>: Changes Attack Order</li>
-            </ul>
-            <br>
-            <b>Units Window:</b>
-            <ul>
-                <li><tt>CTRL</tt>: Changes Orbs Matching>Opposite>None</li>
-                <li><tt>SHIFT</tt>: Silences Captain</li>
-                <li><tt>ALT</tt>: Locks Units</li>
-                <li><tt>SHIFT+ALT</tt>: Disables Unit</li>
-                <li><tt>Drag&Drop</tt>: Change Unit Position</li>
-            </ul>
-            <br>
-            <b>Ship Window:</b>
-            <ul>
-               <li><tt>CTRL</tt>: Opens Ship Selection Window</li> 
-            </ul>
-            <br>
-            <b>Defense Window:</b>
-            <ul>
-               <li><tt>CTRL</tt>: Opens Defense Selection Window</li> 
-            </ul>
-        </div>
-    </script>
 
     </body>
 
diff --git a/damage/js/controllers.js b/damage/js/controllers.js
index 63826d2b3..78e989570 100644
--- a/damage/js/controllers.js
+++ b/damage/js/controllers.js
@@ -224,6 +224,14 @@ controllers.ResetCtrl = function($scope, $state, $storage) {
         $state.go('^');
     };
 };
+    
+/*******************
+ * InstructionCtrl *
+ ******************/
+
+controllers.InstructionCtrl = function() {
+    //Do nothing
+};
 
 /*************
  * CandyCtrl *
diff --git a/damage/js/states.js b/damage/js/states.js
index d5046de18..3074bba4e 100644
--- a/damage/js/states.js
+++ b/damage/js/states.js
@@ -72,6 +72,16 @@ angular.module('optc').config(function($stateProvider, $urlRouterProvider) {
                 }
             }
         })
+    
+        .state('main.instruction',{
+                url: 'instruction',
+                views: {
+                    popup: {
+                        templateUrl: 'views/popup/instruction.html',
+                        controller: 'InstructionCtrl'
+                    }
+                }
+            })
 
         .state('main.effects',{
             url: 'effects',
diff --git a/damage/views/content.html b/damage/views/content.html
index 082600870..005c08274 100644
--- a/damage/views/content.html
+++ b/damage/views/content.html
@@ -33,11 +33,10 @@
                 uib-tooltip="Export Image" tooltip-append-to-body="true">
             <i class="fa fa-picture-o"></i>
         </button>
-    </div>
-    <div id="instructions">
-        <p>
-           <span class="help" popover-trigger="mouseenter click" popover-placement="top" uib-popover-template="'instructions.html'">Instructions</span>
-        </p>
+        <button type="button" class="btn" ui-sref=".instruction" title="Instructions"
+                uib-tooltip="Instructions" tooltip-append-to-body="true">
+            <i class="fa fa-question-circle"></i>
+        </button>
     </div>
 
     <url-container></url-container>
diff --git a/damage/views/popup/instruction.html b/damage/views/popup/instruction.html
new file mode 100644
index 000000000..1816cb738
--- /dev/null
+++ b/damage/views/popup/instruction.html
@@ -0,0 +1,46 @@
+<div class="backdrop" ui-sref="^"></div>
+
+<div class="inner-container" go-back>
+
+    <div class="custom-modal">
+        <div id="picker" class="modal-dialog">
+            <div class="modal-content animated fadeInDown">
+                <div class="modal-header">Instructions</div>
+                <div class="modal-body slim">
+                    <div id="instructions">
+                    <b>Damage Window:</b>
+                    <br>
+                    <ul>
+                        <li><tt>CTRL</tt>: Changes Miss>Below Good>Good>Great>Perfect</li>
+                        <li><tt>SHIFT</tt>: Changes Opponents Type</li>
+                        <li><tt>Drag&amp;Drop</tt>: Changes Attack Order</li>
+                    </ul>
+                    <br>
+                    <b>Units Window:</b>
+                    <ul>
+                        <li><tt>CTRL</tt>: Changes Orbs Matching>Opposite>None</li>
+                        <li><tt>SHIFT</tt>: Silences Captain</li>
+                        <li><tt>ALT</tt>: Locks Units</li>
+                        <li><tt>SHIFT+ALT</tt>: Disables Unit</li>
+                        <li><tt>Drag&amp;Drop</tt>: Change Unit Position</li>
+                    </ul>
+                    <br>
+                    <b>Ship Window:</b>
+                    <ul>
+                       <li><tt>CTRL</tt>: Opens Ship Selection Window</li> 
+                    </ul>
+                    <br>
+                    <b>Defense Window:</b>
+                    <ul>
+                       <li><tt>CTRL</tt>: Opens Defense Selection Window</li> 
+                    </ul>
+                </div>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary" ui-sref="^">Dismiss</button> 
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>

From 31dad7579091c2c3e950dd39e3c1671dcf3374dc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 22 Feb 2016 11:46:39 -0600
Subject: [PATCH 0066/1569] instructions & Calculations

better instructions
---
 damage/views/popup/instruction.html | 21 +++++++++++----------
 damage/views/sidebar.html           |  6 +++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/damage/views/popup/instruction.html b/damage/views/popup/instruction.html
index 1816cb738..c85b427d0 100644
--- a/damage/views/popup/instruction.html
+++ b/damage/views/popup/instruction.html
@@ -8,36 +8,37 @@
                 <div class="modal-header">Instructions</div>
                 <div class="modal-body slim">
                     <div id="instructions">
-                    <b>Damage Window:</b>
+					<br>Hold down the desired action while clicking in order to change how the action works.</br>
+                    <b>Damage Window: (Right side)</b>
                     <br>
                     <ul>
-                        <li><tt>CTRL</tt>: Changes Miss>Below Good>Good>Great>Perfect</li>
-                        <li><tt>SHIFT</tt>: Changes Opponents Type</li>
-                        <li><tt>Drag&amp;Drop</tt>: Changes Attack Order</li>
+                        <li><tt>CTRL</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
+                        <li><tt>SHIFT</tt>: Changes Opponent's Type (For individual targets)</li>
+                        <li><tt>Drag &amp; Drop</tt>: Changes Attack Order</li>
                     </ul>
                     <br>
-                    <b>Units Window:</b>
+                    <b>Units Window: (Center area)</b>
                     <ul>
-                        <li><tt>CTRL</tt>: Changes Orbs Matching>Opposite>None</li>
+                        <li><tt>CTRL</tt>: Changes Orbs Matching > Opposite > None (You may also click on orb)</li> 
                         <li><tt>SHIFT</tt>: Silences Captain</li>
                         <li><tt>ALT</tt>: Locks Units</li>
                         <li><tt>SHIFT+ALT</tt>: Disables Unit</li>
-                        <li><tt>Drag&amp;Drop</tt>: Change Unit Position</li>
+                        <li><tt>Drag &amp; Drop</tt>: Change Unit Position</li>
                     </ul>
                     <br>
-                    <b>Ship Window:</b>
+                    <b>Ship Slider: (Under Settings)</b>
                     <ul>
                        <li><tt>CTRL</tt>: Opens Ship Selection Window</li> 
                     </ul>
                     <br>
-                    <b>Defense Window:</b>
+                    <b>Enemy Defense: (Under Settings)</b>
                     <ul>
                        <li><tt>CTRL</tt>: Opens Defense Selection Window</li> 
                     </ul>
                 </div>
                 </div>
                 <div class="modal-footer">
-                    <button class="btn btn-primary" ui-sref="^">Dismiss</button> 
+                    <button class="btn btn-primary" ui-sref="^">Go Back</button> 
                 </div>
             </div>
         </div>
diff --git a/damage/views/sidebar.html b/damage/views/sidebar.html
index 5036e07d5..0e6385524 100644
--- a/damage/views/sidebar.html
+++ b/damage/views/sidebar.html
@@ -22,14 +22,14 @@
             <div id="defenseContainer" title="Middle-click or CTRL-click for details" defense-on-click>
                 <i class="fa fa-level-up comodity" ui-sref="main.defense"></i>
                 <i class="fa fa-shield"></i>
-                Enemy defense: <input type="number" id="defense" to-int ng-model="data.defense"></input>
+                Enemy Defense: <input type="number" id="defense" to-int ng-model="data.defense"></input>
             </div>
         </li>
 
         <li ui-sref=".candy">
             <div id="candyContainer">
                 <i class="fa fa-sliders"></i>
-                <a>Cotton candies</a>
+                <a>Cotton Candies</a>
             </div>
         </li>
 
@@ -43,7 +43,7 @@
         <li ng-show="showGatherButton">
             <div id="gather" ui-sref=".gather">
                 <i class="fa fa-heartbeat"></i>
-                Data gathering
+                Data Gathering
             </div>
         </li>
 

From c67374efb78c79beb05f83db5a4a22840ae4d886 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 22 Feb 2016 12:06:22 -0600
Subject: [PATCH 0067/1569] Instructions

updated instructions
---
 damage/views/popup/instruction.html | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/damage/views/popup/instruction.html b/damage/views/popup/instruction.html
index c85b427d0..12a661c00 100644
--- a/damage/views/popup/instruction.html
+++ b/damage/views/popup/instruction.html
@@ -8,11 +8,13 @@
                 <div class="modal-header">Instructions</div>
                 <div class="modal-body slim">
                     <div id="instructions">
-					<br>Hold down the desired action while clicking in order to change how the action works.</br>
-                    <b>Damage Window: (Right side)</b>
+					Hold down the desired action while clicking in order to change how the action works.
+                    <p>
+					<b>Damage Window: (Right side)</b>
                     <br>
                     <ul>
                         <li><tt>CTRL</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
+						<li><tt>Middle Mouse Click</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
                         <li><tt>SHIFT</tt>: Changes Opponent's Type (For individual targets)</li>
                         <li><tt>Drag &amp; Drop</tt>: Changes Attack Order</li>
                     </ul>
@@ -20,10 +22,15 @@
                     <b>Units Window: (Center area)</b>
                     <ul>
                         <li><tt>CTRL</tt>: Changes Orbs Matching > Opposite > None (You may also click on orb)</li> 
+						<li><tt>Middle Mouse Click</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
                         <li><tt>SHIFT</tt>: Silences Captain</li>
                         <li><tt>ALT</tt>: Locks Units</li>
-                        <li><tt>SHIFT+ALT</tt>: Disables Unit</li>
+                        <li><tt>SHIFT + ALT</tt>: Disables Unit</li>
                         <li><tt>Drag &amp; Drop</tt>: Change Unit Position</li>
+						<li><tt>SHIFT + ALT</tt>: Disables Unit</li>
+						<li><tt>Click on Level</tt>: Opens level slider</li>
+						<li><tt>Middle Mouse Click on Level</tt>: Sets unit to MAX level</li>
+
                     </ul>
                     <br>
                     <b>Ship Slider: (Under Settings)</b>

From b5f84ea5a34219134b19aaf76352d1e4a17730a3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 22 Feb 2016 12:09:28 -0600
Subject: [PATCH 0068/1569] instructions

Duplicate line removed
---
 damage/views/popup/instruction.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/damage/views/popup/instruction.html b/damage/views/popup/instruction.html
index 12a661c00..ab2cfc84b 100644
--- a/damage/views/popup/instruction.html
+++ b/damage/views/popup/instruction.html
@@ -9,25 +9,24 @@
                 <div class="modal-body slim">
                     <div id="instructions">
 					Hold down the desired action while clicking in order to change how the action works.
-                    <p>
+                    <p><p>
 					<b>Damage Window: (Right side)</b>
                     <br>
                     <ul>
+  						<li><tt>Middle Mouse Click</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
                         <li><tt>CTRL</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
-						<li><tt>Middle Mouse Click</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
                         <li><tt>SHIFT</tt>: Changes Opponent's Type (For individual targets)</li>
                         <li><tt>Drag &amp; Drop</tt>: Changes Attack Order</li>
                     </ul>
                     <br>
                     <b>Units Window: (Center area)</b>
                     <ul>
-                        <li><tt>CTRL</tt>: Changes Orbs Matching > Opposite > None (You may also click on orb)</li> 
 						<li><tt>Middle Mouse Click</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
+                        <li><tt>CTRL</tt>: Changes Orbs Matching > Opposite > None (You may also click on orb)</li> 
                         <li><tt>SHIFT</tt>: Silences Captain</li>
                         <li><tt>ALT</tt>: Locks Units</li>
                         <li><tt>SHIFT + ALT</tt>: Disables Unit</li>
                         <li><tt>Drag &amp; Drop</tt>: Change Unit Position</li>
-						<li><tt>SHIFT + ALT</tt>: Disables Unit</li>
 						<li><tt>Click on Level</tt>: Opens level slider</li>
 						<li><tt>Middle Mouse Click on Level</tt>: Sets unit to MAX level</li>
 

From 4fbfefc9e3c0cbe75237012b31a011d139efce67 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 23 Feb 2016 00:05:19 -0600
Subject: [PATCH 0069/1569] Hannyabal Fortnight Units

New units added to database (928-931)
---
 common/data/aliases.js    |  4 ++++
 common/data/captains.js   | 21 +++++++++++++++++++++
 common/data/cooldowns.js  |  6 +++++-
 common/data/details.js    | 19 +++++++++++++++++++
 common/data/drops.js      |  8 ++++++++
 common/data/evolutions.js |  4 ++++
 common/data/specials.js   | 10 ++++++++++
 common/data/units.js      |  6 +++++-
 8 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 207f1caee..ad324f61a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -926,4 +926,8 @@ window.aliases = {
     925: ['',''],
     926: ['',''],
     927: ['',''],
+	928: ['ハンニャバル','','Hannibal'],
+    929: ['ハンニャバル','','Hannibal'],
+    930: ['サルデス',''],
+    931: ['ブルゴリ ','','Blue Gorilla']
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 17fd857b3..1a84ce784 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2145,5 +2145,26 @@ window.captains = {
 	927: {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
 		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+	},
+	928: {
+		atk: function(p) {
+			if(p.percHP<30){
+                return p.unit.class.has("Ambition") ? 1.75 : 1;
+            } else {
+                return p.unit.class.has("Striker") ? 1.75 : 1;
+            }
+		}
+	},
+	929: {
+		atk: function(p) {
+			if(p.percHP<30){
+                return p.unit.class.has("Ambition") ? 1.75 : 1;
+            } else {
+                return p.unit.class.has("Striker") ? 1.75 : 1;
+            }
+		}
+	},
+	930: {
+		chainModifier: function(p) { return 2; }
 	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 468c5d018..15245a1ec 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -925,5 +925,9 @@ window.cooldowns = [
 	[28, 16],
 	[22, 12],
 	[22, 12],
-	[18, 8]
+	[18, 8],
+	21,
+	21,
+	16,
+	30
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 6b77d110d..19bde38e1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4294,5 +4294,24 @@ window.details = {
 		captain: "Boosts ATK and HP of Ambition Units by 1.5x",
 		specialName: "Unwavering Hammer of Justice",
 		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Ambition characters by 1.2x for 3 turns"
+	},
+	928: {
+		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Impact Characters by 1.75x while below 30% HP",
+		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned units by 1.3x for 3 turns",
+		specialName: "Hell Wisdom Rush"
+	},
+	929: {
+		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Impact Characters by 1.75x while below 30% HP",
+		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned units by 1.3x for 3 turns",
+		specialName: "Hannyabal Evolved Special"
+	},
+	930: {
+		captain: "Boosts chain multiplier by 2x",
+		specialName: "Blugori Flute",
+		special: "Changes orbs in left column to [DEX], then [QCK], then [INT]. Locks himself for 3 turns."
+	},
+	931: {
+		specialName: "Blugori Attack",
+		special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
 	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index aa0f1d331..7d37ff735 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -940,6 +940,14 @@ window.drops = {
             condition: 'You can only bring DEX units',
             Expert: [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ],
             Elite: [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ]
+        },
+		
+		{
+            name: "Hannyabal's Great Ambition",
+            thumb: 929,
+            condition: 'You can only bring STR units',
+            Expert: [ 928, 929, 930, 931 ],
+            Elite: [ 928, 929, 930, 931 ]
         }
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3f5ad7ba3..651aeeb88 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1406,5 +1406,9 @@ window.evolutions = {
     925: {
         evolution: 926,
         evolvers: [ 117 , 85, 90 , 96 , 101]
+    },
+	928: {
+        evolution: 929,
+        evolvers: [ 117, 80, 86, 97, 102 ]
     }
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 2edf35d84..651f1b002 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1054,5 +1054,15 @@ window.specials = {
 			return p.unit.class.has("Slasher") || p.unit.class.has("Ambition") ? 1.2 : 1;
 		},
 		type: "class"
+    },
+	928: {
+        atk: function(p) { return 1.3; },
+		type: "condition",
+		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+    },
+    929: {
+        atk: function(p) { return 1.3; },
+		type: "condition",
+		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 3b4380cc7..759169d17 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -925,5 +925,9 @@ window.units = [
 	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,2727,1319,224,1],
 	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, null],
 	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],
-	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1]
+	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1],
+	["Hannyabal", "QCK", ["Striker","Freedom"],4, 13, 6, 1, 50, null, 157, 44, 39, null, null, null, null],
+	["Hannyabal Evolved", "QCK", ["Striker","Freedom"],5, 18, 6, 1, 50, null, null, null, null, null, null, null, null],
+	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, null, 34, 25, 34, null, null, null, null],
+	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, null, 103, 99, 1, null, null, null, null]
 ];

From 5989bd08eb5ac7fb08342ab048a3a37a47a17c7a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 23 Feb 2016 00:12:06 -0600
Subject: [PATCH 0070/1569] Gamewith links & Fixes

to Hannyabal & Friends
---
 common/data/gw.js    | 2 +-
 common/data/units.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index dcda80702..9db37109b 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036];
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306];
diff --git a/common/data/units.js b/common/data/units.js
index 759169d17..75fbe1408 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -926,8 +926,8 @@ window.units = [
 	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, null],
 	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],
 	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1],
-	["Hannyabal", "QCK", ["Striker","Freedom"],4, 13, 6, 1, 50, null, 157, 44, 39, null, null, null, null],
-	["Hannyabal Evolved", "QCK", ["Striker","Freedom"],5, 18, 6, 1, 50, null, null, null, null, null, null, null, null],
+	["Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, null, 157, 44, 39, null, null, null, null],
+	["Hannyabal Evolved", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 1333, 429, 102, null, null, null, null, null],
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, null, 34, 25, 34, null, null, null, null],
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, null, 103, 99, 1, null, null, null, null]
 ];

From 41c4ae1dfabef4091e6c965c627137def69f0783 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 23 Feb 2016 09:28:54 +0100
Subject: [PATCH 0071/1569] Hannyabal Skillbook Drops

---
 common/data/drops.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 7d37ff735..595cd7ec2 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -946,8 +946,8 @@ window.drops = {
             name: "Hannyabal's Great Ambition",
             thumb: 929,
             condition: 'You can only bring STR units',
-            Expert: [ 928, 929, 930, 931 ],
-            Elite: [ 928, 929, 930, 931 ]
+            Expert: [ 928, 929, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ],
+            Elite: [ 928, 929, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
         }
 
     ],

From 0f00550ff0ce8a2e7df9c970ee92dd126e386ceb Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 23 Feb 2016 13:28:12 +0100
Subject: [PATCH 0072/1569] CD Update

---
 common/data/cooldowns.js | 34 +++++++++++++++++-----------------
 common/data/details.js   |  8 ++++----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 15245a1ec..64d156d65 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -726,12 +726,12 @@ window.cooldowns = [
 	[ 11, 8 ],
 	[ 11, 8 ],
 	[ 15, 15 ],
-	20,
-	20,
+	[ 20, 14 ],
+	[ 20, 14 ],
 	25,
 	25,
-	18,
-	18,
+	[ 18, 12 ],
+	[ 18, 12 ],
 	14,
 	14,
 	25,
@@ -749,14 +749,14 @@ window.cooldowns = [
 	25,
 	[ 23, 16 ],
 	[ 23, 16 ],
-	21,
-	21,
+	[ 21, 14 ],
+	[ 21, 14 ],
 	[ 22, 15 ],
 	[ 22, 15 ],
 	[ 20, 14 ],
 	[ 20, 14 ],
-	18,
-	18,
+	[ 18, 10 ],
+	[ 18, 10 ],
 	21,
 	21,
 	[ 23, 15 ],
@@ -921,13 +921,13 @@ window.cooldowns = [
 	[ 19, 14 ],
 	[ 15, 15 ],
 	[ 15, 15 ],
-	[28, 16],
-	[28, 16],
-	[22, 12],
-	[22, 12],
-	[18, 8],
-	21,
-	21,
-	16,
-	30
+	[ 28, 16 ],
+	[ 28, 16 ],
+	[ 22, 12 ],
+	[ 22, 12 ],
+	[ 18, 8 ],
+	[ 21, 12 ],
+	[ 21, 12 ],
+	[ 16, 11 ],
+	[ 30, 17]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 19bde38e1..213f37ca6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4296,13 +4296,13 @@ window.details = {
 		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Ambition characters by 1.2x for 3 turns"
 	},
 	928: {
-		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Impact Characters by 1.75x while below 30% HP",
-		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned units by 1.3x for 3 turns",
+		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
+		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
 		specialName: "Hell Wisdom Rush"
 	},
 	929: {
-		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Impact Characters by 1.75x while below 30% HP",
-		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned units by 1.3x for 3 turns",
+		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
+		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
 		specialName: "Hannyabal Evolved Special"
 	},
 	930: {

From 997d574dee1879026f545e5596fc950f30ee3253 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 23 Feb 2016 14:09:27 +0100
Subject: [PATCH 0073/1569] Completed New Units

---
 common/data/aliases.js | 10 +++++-----
 common/data/units.js   | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ad324f61a..c92d1cdbd 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -921,11 +921,11 @@ window.aliases = {
     920: ['スイトピー',''],
     921: ['','','Bridal Hancock'],
     922: ['','','Bridal Hancock'],
-    923: ['',''],
-    924: ['',''],
-    925: ['',''],
-    926: ['',''],
-    927: ['',''],
+    923: ['南の海のキャプテン・キッド',''],
+    924: ['キャプテン・キッド キッド海賊団船長',''],
+    925: ['獄卒長サディちゃん',''],
+    926: ['獄卒長サディちゃん 獄卒獣の指揮官',''],
+    927: ['ドーベルマン 海軍本部中将',''],
 	928: ['ハンニャバル','','Hannibal'],
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
diff --git a/common/data/units.js b/common/data/units.js
index 75fbe1408..33a4b2aa7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -921,13 +921,13 @@ window.units = [
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
 	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,912,556,153,null],
 	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
-	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, null, 710, 309, 44,1600,703,146,null],
-	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, null, 1549, 640, 112,2727,1319,224,1],
-	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, null],
-	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, null, 920, 488, 159, 1901, 912, 357, 1],
-	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70,null, 200, 210, 71, 1085, 951, 205, 1],
-	["Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, null, 157, 44, 39, null, null, null, null],
-	["Hannyabal Evolved", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 1333, 429, 102, null, null, null, null, null],
-	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, null, 34, 25, 34, null, null, null, null],
-	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, null, 103, 99, 1, null, null, null, null]
+	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
+	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
+	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
+	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
+	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
+	["Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
+	["Hannyabal Evolved", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
+	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
+	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1]
 ];

From edf4c5c92c1e631229da7ace1ca1f3e3b6f521a1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 23 Feb 2016 08:58:17 -0600
Subject: [PATCH 0074/1569] Pica Preview

And small fixes to Hannyabal units
---
 common/data/captains.js | 4 ++--
 common/data/details.js  | 8 ++++----
 common/data/units.js    | 5 ++++-
 index.html              | 4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1a84ce784..9e943cec5 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2158,9 +2158,9 @@ window.captains = {
 	929: {
 		atk: function(p) {
 			if(p.percHP<30){
-                return p.unit.class.has("Ambition") ? 1.75 : 1;
+                return p.unit.class.has("Ambition") ? 2.25 : 1;
             } else {
-                return p.unit.class.has("Striker") ? 1.75 : 1;
+                return p.unit.class.has("Striker") ? 2.25 : 1;
             }
 		}
 	},
diff --git a/common/data/details.js b/common/data/details.js
index 213f37ca6..19f7ad0d3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4301,17 +4301,17 @@ window.details = {
 		specialName: "Hell Wisdom Rush"
 	},
 	929: {
-		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
+		captain: "Boosts ATK of Ambition Characters by 2.25x while above 30% HP and boosts ATK of Striker Characters by 2.25x while below 30% HP",
 		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
-		specialName: "Hannyabal Evolved Special"
+		specialName: "Hell Wisdom Rush"
 	},
 	930: {
 		captain: "Boosts chain multiplier by 2x",
-		specialName: "Blugori Flute",
+		specialName: "Blugori Manipulation Song",
 		special: "Changes orbs in left column to [DEX], then [QCK], then [INT]. Locks himself for 3 turns."
 	},
 	931: {
-		specialName: "Blugori Attack",
+		specialName: "Large Axe of Punishment",
 		special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 33a4b2aa7..73e9218b2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -929,5 +929,8 @@ window.units = [
 	["Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
 	["Hannyabal Evolved", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
-	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1]
+	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
+	["Pica", null, [null], 4, null, null, null, null, null, null, null, null, null, null, null, null],
+	["Pica Evolved", null, [null], 5, null, null, null, null, null, null, null, null, null, null, null, null]
+
 ];
diff --git a/index.html b/index.html
index 6fd8533ad..b93ace93d 100644
--- a/index.html
+++ b/index.html
@@ -39,9 +39,9 @@
             <br>
             <ul>
                 <li>Added Instructions to Calculator</li>
-                <li>Damage Calculator Image Export</li>
+                <li>Damage Calculator: Image Export</li>
                 <li>Now Shows Healing Per Turn</li><br>
-                <li>Added Challenge Levels</li>
+                <li>New Hannyabal Fortnight Units!</li>
                 </ul>
         </div>
     </body>

From 64a475bea9691e4dff1f501f0b60ad76c59b6da7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 24 Feb 2016 15:27:54 +0100
Subject: [PATCH 0075/1569] Hannyabal Full Name

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 73e9218b2..cc88ed8dc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -927,7 +927,7 @@ window.units = [
 	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
 	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
 	["Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
-	["Hannyabal Evolved", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
+	["Hannyabal, Impel Down Vice Warden", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	["Pica", null, [null], 4, null, null, null, null, null, null, null, null, null, null, null, null],

From 3a6396189deff7611d9110de259bc7d13f88a596 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 24 Feb 2016 09:34:44 -0600
Subject: [PATCH 0076/1569] Fix Moria's name

matching everywhere, add alias
---
 common/data/aliases.js | 10 +++++-----
 common/data/units.js   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c92d1cdbd..ba458625a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -411,8 +411,8 @@ window.aliases = {
     410: ['ジンベエ 王下七武海','', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
     411: ['バーソロミュー・くま',''],
     412: ['バーソロミュー・くま 王下七武海',''],
-    413: ['ゲッコー・モリア',''],
-    414: ['ゲッコー・モリア 王下七武海',''],
+    413: ['ゲッコー・モリア','', 'Gekko Moriah'],
+    414: ['ゲッコー・モリア 王下七武海','', 'Gekko Moriah Warlord of the Sea'],
     415: ['ボア・ハンコック',''],
     416: ['ボア・ハンコック 王下七武海',''],
     417: ['ドンキホーテ・ドフラミンゴ','', 'Doffy' ],
@@ -813,8 +813,8 @@ window.aliases = {
     812: ['ケルベロス',''],
     813: ['タララン','', 'Spider Monkey' ],
     814: ['敷きグマ',''],
-    815: ['ゲッコー・モリア スリラーバークの怪人',''],
-    816: ['ゲッコー・モリア スリラーバークの支配者',''],
+    815: ['ゲッコー・モリア スリラーバークの怪人','', 'Gekko Moriah, Thriller Bark\'s Mysterious Four'],
+    816: ['ゲッコー・モリア スリラーバークの支配者','', 'Gekko Moriah, Ruler of Thriller Bark'],
     817: ['ソルジャーゾンビ　力自慢の影',''],
     818: ['ソルジャーゾンビ　素早さの影',''],
     819: ['ソルジャーゾンビ　悪巧みの影',''],
@@ -892,7 +892,7 @@ window.aliases = {
     891: ['ドクトル・ホグバック スリラーバークの怪人',''],
     892: ['墓場のアブサロム スリラーバークの怪人',''],
     893: ['オーズ 特別ゾンビ',''],
-    894: ['ゲッコー・モリア 影の集合地（シャドーズ・アスガルド）',''],
+    894: ['ゲッコー・モリア 影の集合地（シャドーズ・アスガルド）','', 'Gekko Moriah, Shadow\'s Asgard'],
     895: ['ブルック 紳士なガイコツ',''],
     896: ['ブルック 麦わらの一味',''],
     897: ['サー・クロコダイル 砂の武将','', 'Kimono Crocodile' ],
diff --git a/common/data/units.js b/common/data/units.js
index cc88ed8dc..b77b8db61 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -813,8 +813,8 @@ window.units = [
 	[ "Cerberus", "QCK", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
 	[ "Tararan", "INT", [ "Knowledge", "Tough" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
 	[ "Bear-Skin Rug", "DEX", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
-	[ "Gecko Moriah, Thriller Bark's Mysterious Four", "INT", [ "Freedom", "Ambition" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
-	[ "Gecko Moriah, Ruler of Thriller Bark", "INT", [ "Freedom", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
+	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Freedom", "Ambition" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
+	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Freedom", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
 	[ "Soldier Zombie Boastful Shadow", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
 	[ "Soldier Zombie Quick Shadow", "QCK", "Fighter", 2, 7, 6, 0, 35, 90778, 77, 30, 92, 944, 590, 43, 1 ],
 	[ "Soldier Zombie Vile Shadow", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],

From dc6e1b58abaf849adc99860b8ab1d77dcb2faa15 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 24 Feb 2016 14:21:04 -0600
Subject: [PATCH 0077/1569] remove Hancock Bug

removed from game in 5.2
---
 common/data/effects.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index d5c82c5b9..428e0a6ea 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -209,18 +209,11 @@ window.effects = {
         comboShield: 26
     },
 
-    'Hancock chain bug': {
-        description: 'Allows higher than usual chain multipliers',
-        thumb: 865,
-        id: 24, // don't change this
-        chainLimiter: function(p) { return Infinity; }
-    },
-
     'There\'s the G!': {
         description: 'Activates [G] orb support even when Lao-G is not in the team',
         thumb: 880,
-        id: 25, // don't change this
+        id: 24, // don't change this
         gOrbsEnabled: true
-    },
+    }
 
 };

From e867cbce3bbb222883f297dc78d3c22a50f3ffae Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 24 Feb 2016 15:18:41 -0600
Subject: [PATCH 0078/1569] Robin name fixes

too many Nicos
---
 common/data/aliases.js  | 4 ++--
 common/data/families.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ba458625a..885c03cfa 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -913,8 +913,8 @@ window.aliases = {
     912: ['サンジ 男を懸けた愛の料理人',''],
     913: ['ブルック ハラヘッターニャの悪魔王',''],
     914: ['ブルック 骨（ボーン） to be wild!!!',''],
-    915: ['？？？',''],
-    916: ['？？？',''],
+    915: ['？？？','','Wedding Nico Robin'],
+    916: ['？？？','','Bride Nico Robin'],
     917: ['マーガレット',''],
     918: ['マーガレット 護国の戦士',''],
     919: ['アフェランドラ',''],
diff --git a/common/data/families.js b/common/data/families.js
index bf6ae6937..c6f82d3f5 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -913,8 +913,8 @@ window.families = [
 	"Sanji",
 	"Brook",
 	"Brook",
-	"Nico Nico Robin",
-	"Nico Nico Robin",
+	"Nico Robin",
+	"Nico Robin",
 	"Marguerite",
 	"Marguerite",
 	"Aphelandra",

From b81a938e626ff8bfc9cbf267c3929765a647e42e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 14:18:09 +0100
Subject: [PATCH 0079/1569] New Placeholder Units

---
 common/data/aliases.js    | 14 +++++++++++++-
 common/data/evolutions.js | 24 ++++++++++++++++++++++++
 common/data/units.js      | 15 ++++++++++++---
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 885c03cfa..aa2f7d1be 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -929,5 +929,17 @@ window.aliases = {
 	928: ['ハンニャバル','','Hannibal'],
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
-    931: ['ブルゴリ ','','Blue Gorilla']
+    931: ['ブルゴリ ','','Blue Gorilla'],
+    932: ['',''],
+    933: ['',''],
+    934: ['',''],
+    935: ['',''],
+    936: ['',''],
+    937: ['',''],
+    938: ['',''],
+    939: ['',''],
+    940: ['',''],
+    941: ['',''],
+    942: ['',''],
+    943: ['','']
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 651aeeb88..b43d864c3 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1410,5 +1410,29 @@ window.evolutions = {
 	928: {
         evolution: 929,
         evolvers: [ 117, 80, 86, 97, 102 ]
+    },
+    932: {
+        evolution: 933,
+        evolvers: []
+    },
+    934: {
+        evolution: 935,
+        evolvers: []
+    },
+    936: {
+        evolution: 937,
+        evolvers: []
+    },
+    938: {
+        evolution: 939,
+        evolvers: []
+    },
+    940: {
+        evolution: 941,
+        evolvers: []
+    },
+    942: {
+        evolution: 943,
+        evolvers: []
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b77b8db61..693e597ed 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -930,7 +930,16 @@ window.units = [
 	["Hannyabal, Impel Down Vice Warden", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	["Pica", null, [null], 4, null, null, null, null, null, null, null, null, null, null, null, null],
-	["Pica Evolved", null, [null], 5, null, null, null, null, null, null, null, null, null, null, null, null]
-
+	["Raid Pica", "PSY", ["Tough","Ambition"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
+	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Nami", "PSY", ["Stiker","Knowledge"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Nami Evolved", "PSY", ["Stiker","Knowledge"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Usopp", "DEX", "Fighter", 4, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Franky Evolved", "STR", ["Stiker","Knowledge"], 5, null, null, null, null, null, null, null, null, null, null, null, null]
 ];

From d4ecef2ab04e3c0ab3ad4999c1fdc7e20287d184 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 15:11:47 +0100
Subject: [PATCH 0080/1569] Quickfix

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 693e597ed..b2bc0d506 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -941,5 +941,5 @@ window.units = [
     ["3D2Y Usopp", "DEX", "Fighter", 4, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Franky Evolved", "STR", ["Stiker","Knowledge"], 5, null, null, null, null, null, null, null, null, null, null, null, null]
+    ["3D2Y Franky Evolved", "STR", ["Stiker","Shooter"], 5, null, null, null, null, null, null, null, null, null, null, null, null]
 ];

From 3969660bd8ee1f1e60677a62d06ef36e9674496c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 15:13:02 +0100
Subject: [PATCH 0081/1569] Quickfix the Second

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index b2bc0d506..cde78a14e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -936,10 +936,10 @@ window.units = [
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Nami", "PSY", ["Stiker","Knowledge"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Nami Evolved", "PSY", ["Stiker","Knowledge"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Nami Evolved", "PSY", ["Striker","Knowledge"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Usopp", "DEX", "Fighter", 4, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Franky Evolved", "STR", ["Stiker","Shooter"], 5, null, null, null, null, null, null, null, null, null, null, null, null]
+    ["3D2Y Franky Evolved", "STR", ["Freedom","Shooter"], 5, null, null, null, null, null, null, null, null, null, null, null, null]
 ];

From 8d20c11cae1a7f135248873ded2b6db9f8e9e934 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 17:18:47 +0100
Subject: [PATCH 0082/1569] Added Boa Ship

Placehodler Multipliers exept for max level
The HP reducing percentage is a placeholder as well
---
 common/data/ships.js | 14 ++++++++++++++
 index.html           |  5 ++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 04b900f6a..783cce59f 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -176,6 +176,20 @@ window.ships = [
         atk: function(p) {
             return [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.5 ][p.boatLevel - 1];
         }
+    },
+    
+    { //14
+        name: 'Boa Ship',
+        thumb: null,
+        description: 'Boosts ATK of Freedom characters by 1.5x and their HP by 1.35x, reduces the HP of everyone else by ?x. Special: heals the crew by 6,500HP (cooldown: 15 turns).',
+        atk: function(p) {
+            return !p.unit.class.has('Freedom') ? 1 :
+            [ 1.2, 1.2, 1.2, 1.25, 1.25, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return !p.unit.class.has('Freedom') ? 0.3 :
+                [ 1, 1.1, 1.1, 1.1, 1.2, 1.2, 1.25, 1.25, 1.35, 1.35 ][p.boatLevel - 1];
+        }
     }
 
 ];
diff --git a/index.html b/index.html
index b93ace93d..b709d54a6 100644
--- a/index.html
+++ b/index.html
@@ -39,9 +39,8 @@
             <br>
             <ul>
                 <li>Added Instructions to Calculator</li>
-                <li>Damage Calculator: Image Export</li>
-                <li>Now Shows Healing Per Turn</li><br>
-                <li>New Hannyabal Fortnight Units!</li>
+                <li>Added Boa Boat with Placeholder Stats</li>
+                <li>New 3D2Y Units + Legend Jimbe!</li>
                 </ul>
         </div>
     </body>

From 136e47a90c550e826fe73a2ce487961356b4eeaf Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 17:25:34 +0100
Subject: [PATCH 0083/1569] Pica Raid to Drops

---
 common/data/drops.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 595cd7ec2..09f37d314 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1072,6 +1072,13 @@ window.drops = {
             Ultimate: [ 864 ],
             Master: [ 864 ],
             Expert: [ 864 ]
+        },
+        
+        {
+            name: 'Clash!! Pica',
+            thumb: 932,
+            Master: [ 932 ],
+            Expert: [ 932 ]
         }
 
     ],

From b6455f11de6b561d8b21268fce4c80a663106581 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 21:36:41 +0100
Subject: [PATCH 0084/1569] Added Server Time to Drops

---
 common/libs/js/moment-timezone.js | 1173 ++++++++++
 common/libs/js/moment.js          | 3606 +++++++++++++++++++++++++++++
 drops/index.css                   |    3 +
 drops/index.html                  |   11 +-
 drops/index.js                    |   10 +
 index.html                        |    1 +
 6 files changed, 4802 insertions(+), 2 deletions(-)
 create mode 100644 common/libs/js/moment-timezone.js
 create mode 100644 common/libs/js/moment.js

diff --git a/common/libs/js/moment-timezone.js b/common/libs/js/moment-timezone.js
new file mode 100644
index 000000000..1e17e2334
--- /dev/null
+++ b/common/libs/js/moment-timezone.js
@@ -0,0 +1,1173 @@
+//! moment-timezone.js
+//! version : 0.5.0
+//! author : Tim Wood
+//! license : MIT
+//! github.com/moment/moment-timezone
+
+(function (root, factory) {
+	"use strict";
+
+	/*global define*/
+	if (typeof define === 'function' && define.amd) {
+		define(['moment'], factory);                 // AMD
+	} else if (typeof module === 'object' && module.exports) {
+		module.exports = factory(require('moment')); // Node
+	} else {
+		factory(root.moment);                        // Browser
+	}
+}(this, function (moment) {
+	"use strict";
+
+	// Do not load moment-timezone a second time.
+	if (moment.tz !== undefined) {
+		logError('Moment Timezone ' + moment.tz.version + ' was already loaded ' + (moment.tz.dataVersion ? 'with data from ' : 'without any data') + moment.tz.dataVersion);
+		return moment;
+	}
+
+	var VERSION = "0.5.0",
+		zones = {},
+		links = {},
+		names = {},
+		guesses = {},
+		cachedGuess,
+
+		momentVersion = moment.version.split('.'),
+		major = +momentVersion[0],
+		minor = +momentVersion[1];
+
+	// Moment.js version check
+	if (major < 2 || (major === 2 && minor < 6)) {
+		logError('Moment Timezone requires Moment.js >= 2.6.0. You are using Moment.js ' + moment.version + '. See momentjs.com');
+	}
+
+	/************************************
+		Unpacking
+	************************************/
+
+	function charCodeToInt(charCode) {
+		if (charCode > 96) {
+			return charCode - 87;
+		} else if (charCode > 64) {
+			return charCode - 29;
+		}
+		return charCode - 48;
+	}
+
+	function unpackBase60(string) {
+		var i = 0,
+			parts = string.split('.'),
+			whole = parts[0],
+			fractional = parts[1] || '',
+			multiplier = 1,
+			num,
+			out = 0,
+			sign = 1;
+
+		// handle negative numbers
+		if (string.charCodeAt(0) === 45) {
+			i = 1;
+			sign = -1;
+		}
+
+		// handle digits before the decimal
+		for (i; i < whole.length; i++) {
+			num = charCodeToInt(whole.charCodeAt(i));
+			out = 60 * out + num;
+		}
+
+		// handle digits after the decimal
+		for (i = 0; i < fractional.length; i++) {
+			multiplier = multiplier / 60;
+			num = charCodeToInt(fractional.charCodeAt(i));
+			out += num * multiplier;
+		}
+
+		return out * sign;
+	}
+
+	function arrayToInt (array) {
+		for (var i = 0; i < array.length; i++) {
+			array[i] = unpackBase60(array[i]);
+		}
+	}
+
+	function intToUntil (array, length) {
+		for (var i = 0; i < length; i++) {
+			array[i] = Math.round((array[i - 1] || 0) + (array[i] * 60000)); // minutes to milliseconds
+		}
+
+		array[length - 1] = Infinity;
+	}
+
+	function mapIndices (source, indices) {
+		var out = [], i;
+
+		for (i = 0; i < indices.length; i++) {
+			out[i] = source[indices[i]];
+		}
+
+		return out;
+	}
+
+	function unpack (string) {
+		var data = string.split('|'),
+			offsets = data[2].split(' '),
+			indices = data[3].split(''),
+			untils  = data[4].split(' ');
+
+		arrayToInt(offsets);
+		arrayToInt(indices);
+		arrayToInt(untils);
+
+		intToUntil(untils, indices.length);
+
+		return {
+			name       : data[0],
+			abbrs      : mapIndices(data[1].split(' '), indices),
+			offsets    : mapIndices(offsets, indices),
+			untils     : untils,
+			population : data[5] | 0
+		};
+	}
+
+	/************************************
+		Zone object
+	************************************/
+
+	function Zone (packedString) {
+		if (packedString) {
+			this._set(unpack(packedString));
+		}
+	}
+
+	Zone.prototype = {
+		_set : function (unpacked) {
+			this.name       = unpacked.name;
+			this.abbrs      = unpacked.abbrs;
+			this.untils     = unpacked.untils;
+			this.offsets    = unpacked.offsets;
+			this.population = unpacked.population;
+		},
+
+		_index : function (timestamp) {
+			var target = +timestamp,
+				untils = this.untils,
+				i;
+
+			for (i = 0; i < untils.length; i++) {
+				if (target < untils[i]) {
+					return i;
+				}
+			}
+		},
+
+		parse : function (timestamp) {
+			var target  = +timestamp,
+				offsets = this.offsets,
+				untils  = this.untils,
+				max     = untils.length - 1,
+				offset, offsetNext, offsetPrev, i;
+
+			for (i = 0; i < max; i++) {
+				offset     = offsets[i];
+				offsetNext = offsets[i + 1];
+				offsetPrev = offsets[i ? i - 1 : i];
+
+				if (offset < offsetNext && tz.moveAmbiguousForward) {
+					offset = offsetNext;
+				} else if (offset > offsetPrev && tz.moveInvalidForward) {
+					offset = offsetPrev;
+				}
+
+				if (target < untils[i] - (offset * 60000)) {
+					return offsets[i];
+				}
+			}
+
+			return offsets[max];
+		},
+
+		abbr : function (mom) {
+			return this.abbrs[this._index(mom)];
+		},
+
+		offset : function (mom) {
+			return this.offsets[this._index(mom)];
+		}
+	};
+
+	/************************************
+		Current Timezone
+	************************************/
+
+	function OffsetAt(at) {
+		var timeString = at.toTimeString();
+		var abbr = timeString.match(/\(.+\)/);
+		if (abbr && abbr[0]) {
+			// 17:56:31 GMT-0600 (CST)
+			// 17:56:31 GMT-0600 (Central Standard Time)
+			abbr = abbr[0].match(/[A-Z]/g).join('');
+		} else {
+			// 17:56:31 CST
+			abbr = timeString.match(/[A-Z]{3,5}/g)[0];
+		}
+
+		if (abbr === 'GMT') {
+			abbr = undefined;
+		}
+
+		this.at = +at;
+		this.abbr = abbr;
+		this.offset = at.getTimezoneOffset();
+	}
+
+	function ZoneScore(zone) {
+		this.zone = zone;
+		this.offsetScore = 0;
+		this.abbrScore = 0;
+	}
+
+	ZoneScore.prototype.scoreOffsetAt = function (offsetAt) {
+		this.offsetScore += Math.abs(this.zone.offset(offsetAt.at) - offsetAt.offset);
+		if (this.zone.abbr(offsetAt.at).match(/[A-Z]/g).join('') !== offsetAt.abbr) {
+			this.abbrScore++;
+		}
+	};
+
+	function findChange(low, high) {
+		var mid, diff;
+
+		while ((diff = ((high.at - low.at) / 12e4 | 0) * 6e4)) {
+			mid = new OffsetAt(new Date(low.at + diff));
+			if (mid.offset === low.offset) {
+				low = mid;
+			} else {
+				high = mid;
+			}
+		}
+
+		return low;
+	}
+
+	function userOffsets() {
+		var startYear = new Date().getFullYear() - 2,
+			last = new OffsetAt(new Date(startYear, 0, 1)),
+			offsets = [last],
+			change, next, i;
+
+		for (i = 1; i < 48; i++) {
+			next = new OffsetAt(new Date(startYear, i, 1));
+			if (next.offset !== last.offset) {
+				change = findChange(last, next);
+				offsets.push(change);
+				offsets.push(new OffsetAt(new Date(change.at + 6e4)));
+			}
+			last = next;
+		}
+
+		for (i = 0; i < 4; i++) {
+			offsets.push(new OffsetAt(new Date(startYear + i, 0, 1)));
+			offsets.push(new OffsetAt(new Date(startYear + i, 6, 1)));
+		}
+
+		return offsets;
+	}
+
+	function sortZoneScores (a, b) {
+		if (a.offsetScore !== b.offsetScore) {
+			return a.offsetScore - b.offsetScore;
+		}
+		if (a.abbrScore !== b.abbrScore) {
+			return a.abbrScore - b.abbrScore;
+		}
+		return b.zone.population - a.zone.population;
+	}
+
+	function addToGuesses (name, offsets) {
+		var i, offset;
+		arrayToInt(offsets);
+		for (i = 0; i < offsets.length; i++) {
+			offset = offsets[i];
+			guesses[offset] = guesses[offset] || {};
+			guesses[offset][name] = true;
+		}
+	}
+
+	function guessesForUserOffsets (offsets) {
+		var offsetsLength = offsets.length,
+			filteredGuesses = {},
+			out = [],
+			i, j, guessesOffset;
+
+		for (i = 0; i < offsetsLength; i++) {
+			guessesOffset = guesses[offsets[i].offset] || {};
+			for (j in guessesOffset) {
+				if (guessesOffset.hasOwnProperty(j)) {
+					filteredGuesses[j] = true;
+				}
+			}
+		}
+
+		for (i in filteredGuesses) {
+			if (filteredGuesses.hasOwnProperty(i)) {
+				out.push(names[i]);
+			}
+		}
+
+		return out;
+	}
+
+	function rebuildGuess () {
+		var offsets = userOffsets(),
+			offsetsLength = offsets.length,
+			guesses = guessesForUserOffsets(offsets),
+			zoneScores = [],
+			zoneScore, i, j;
+
+		for (i = 0; i < guesses.length; i++) {
+			zoneScore = new ZoneScore(getZone(guesses[i]), offsetsLength);
+			for (j = 0; j < offsetsLength; j++) {
+				zoneScore.scoreOffsetAt(offsets[j]);
+			}
+			zoneScores.push(zoneScore);
+		}
+
+		zoneScores.sort(sortZoneScores);
+
+		return zoneScores.length > 0 ? zoneScores[0].zone.name : undefined;
+	}
+
+	function guess (ignoreCache) {
+		if (!cachedGuess || ignoreCache) {
+			cachedGuess = rebuildGuess();
+		}
+		return cachedGuess;
+	}
+
+	/************************************
+		Global Methods
+	************************************/
+
+	function normalizeName (name) {
+		return (name || '').toLowerCase().replace(/\//g, '_');
+	}
+
+	function addZone (packed) {
+		var i, name, split, normalized;
+
+		if (typeof packed === "string") {
+			packed = [packed];
+		}
+
+		for (i = 0; i < packed.length; i++) {
+			split = packed[i].split('|');
+			name = split[0];
+			normalized = normalizeName(name);
+			zones[normalized] = packed[i];
+			names[normalized] = name;
+			if (split[5]) {
+				addToGuesses(normalized, split[2].split(' '));
+			}
+		}
+	}
+
+	function getZone (name, caller) {
+		name = normalizeName(name);
+
+		var zone = zones[name];
+		var link;
+
+		if (zone instanceof Zone) {
+			return zone;
+		}
+
+		if (typeof zone === 'string') {
+			zone = new Zone(zone);
+			zones[name] = zone;
+			return zone;
+		}
+
+		// Pass getZone to prevent recursion more than 1 level deep
+		if (links[name] && caller !== getZone && (link = getZone(links[name], getZone))) {
+			zone = zones[name] = new Zone();
+			zone._set(link);
+			zone.name = names[name];
+			return zone;
+		}
+
+		return null;
+	}
+
+	function getNames () {
+		var i, out = [];
+
+		for (i in names) {
+			if (names.hasOwnProperty(i) && (zones[i] || zones[links[i]]) && names[i]) {
+				out.push(names[i]);
+			}
+		}
+
+		return out.sort();
+	}
+
+	function addLink (aliases) {
+		var i, alias, normal0, normal1;
+
+		if (typeof aliases === "string") {
+			aliases = [aliases];
+		}
+
+		for (i = 0; i < aliases.length; i++) {
+			alias = aliases[i].split('|');
+
+			normal0 = normalizeName(alias[0]);
+			normal1 = normalizeName(alias[1]);
+
+			links[normal0] = normal1;
+			names[normal0] = alias[0];
+
+			links[normal1] = normal0;
+			names[normal1] = alias[1];
+		}
+	}
+
+	function loadData (data) {
+		addZone(data.zones);
+		addLink(data.links);
+		tz.dataVersion = data.version;
+	}
+
+	function zoneExists (name) {
+		if (!zoneExists.didShowError) {
+			zoneExists.didShowError = true;
+				logError("moment.tz.zoneExists('" + name + "') has been deprecated in favor of !moment.tz.zone('" + name + "')");
+		}
+		return !!getZone(name);
+	}
+
+	function needsOffset (m) {
+		return !!(m._a && (m._tzm === undefined));
+	}
+
+	function logError (message) {
+		if (typeof console !== 'undefined' && typeof console.error === 'function') {
+			console.error(message);
+		}
+	}
+
+	/************************************
+		moment.tz namespace
+	************************************/
+
+	function tz (input) {
+		var args = Array.prototype.slice.call(arguments, 0, -1),
+			name = arguments[arguments.length - 1],
+			zone = getZone(name),
+			out  = moment.utc.apply(null, args);
+
+		if (zone && !moment.isMoment(input) && needsOffset(out)) {
+			out.add(zone.parse(out), 'minutes');
+		}
+
+		out.tz(name);
+
+		return out;
+	}
+
+	tz.version      = VERSION;
+	tz.dataVersion  = '';
+	tz._zones       = zones;
+	tz._links       = links;
+	tz._names       = names;
+	tz.add          = addZone;
+	tz.link         = addLink;
+	tz.load         = loadData;
+	tz.zone         = getZone;
+	tz.zoneExists   = zoneExists; // deprecated in 0.1.0
+	tz.guess        = guess;
+	tz.names        = getNames;
+	tz.Zone         = Zone;
+	tz.unpack       = unpack;
+	tz.unpackBase60 = unpackBase60;
+	tz.needsOffset  = needsOffset;
+	tz.moveInvalidForward   = true;
+	tz.moveAmbiguousForward = false;
+
+	/************************************
+		Interface with Moment.js
+	************************************/
+
+	var fn = moment.fn;
+
+	moment.tz = tz;
+
+	moment.defaultZone = null;
+
+	moment.updateOffset = function (mom, keepTime) {
+		var zone = moment.defaultZone,
+			offset;
+
+		if (mom._z === undefined) {
+			if (zone && needsOffset(mom) && !mom._isUTC) {
+				mom._d = moment.utc(mom._a)._d;
+				mom.utc().add(zone.parse(mom), 'minutes');
+			}
+			mom._z = zone;
+		}
+		if (mom._z) {
+			offset = mom._z.offset(mom);
+			if (Math.abs(offset) < 16) {
+				offset = offset / 60;
+			}
+			if (mom.utcOffset !== undefined) {
+				mom.utcOffset(-offset, keepTime);
+			} else {
+				mom.zone(offset, keepTime);
+			}
+		}
+	};
+
+	fn.tz = function (name) {
+		if (name) {
+			this._z = getZone(name);
+			if (this._z) {
+				moment.updateOffset(this);
+			} else {
+				logError("Moment Timezone has no data for " + name + ". See http://momentjs.com/timezone/docs/#/data-loading/.");
+			}
+			return this;
+		}
+		if (this._z) { return this._z.name; }
+	};
+
+	function abbrWrap (old) {
+		return function () {
+			if (this._z) { return this._z.abbr(this); }
+			return old.call(this);
+		};
+	}
+
+	function resetZoneWrap (old) {
+		return function () {
+			this._z = null;
+			return old.apply(this, arguments);
+		};
+	}
+
+	fn.zoneName = abbrWrap(fn.zoneName);
+	fn.zoneAbbr = abbrWrap(fn.zoneAbbr);
+	fn.utc      = resetZoneWrap(fn.utc);
+
+	moment.tz.setDefault = function(name) {
+		if (major < 2 || (major === 2 && minor < 9)) {
+			logError('Moment Timezone setDefault() requires Moment.js >= 2.9.0. You are using Moment.js ' + moment.version + '.');
+		}
+		moment.defaultZone = name ? getZone(name) : null;
+		return moment;
+	};
+
+	// Cloning a moment should include the _z property.
+	var momentProperties = moment.momentProperties;
+	if (Object.prototype.toString.call(momentProperties) === '[object Array]') {
+		// moment 2.8.1+
+		momentProperties.push('_z');
+		momentProperties.push('_a');
+	} else if (momentProperties) {
+		// moment 2.7.0
+		momentProperties._z = null;
+	}
+
+	loadData({
+		"version": "2015g",
+		"zones": [
+			"Africa/Abidjan|LMT GMT|g.8 0|01|-2ldXH.Q|48e5",
+			"Africa/Accra|LMT GMT GHST|.Q 0 -k|012121212121212121212121212121212121212121212121|-26BbX.8 6tzX.8 MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE 1BAk MnE 1C0k MnE 1BAk MnE 1BAk MnE|41e5",
+			"Africa/Nairobi|LMT EAT BEAT BEAUT|-2r.g -30 -2u -2J|01231|-1F3Cr.g 3Dzr.g okMu MFXJ|47e5",
+			"Africa/Algiers|PMT WET WEST CET CEST|-9.l 0 -10 -10 -20|0121212121212121343431312123431213|-2nco9.l cNb9.l HA0 19A0 1iM0 11c0 1oo0 Wo0 1rc0 QM0 1EM0 UM0 DA0 Imo0 rd0 De0 9Xz0 1fb0 1ap0 16K0 2yo0 mEp0 hwL0 jxA0 11A0 dDd0 17b0 11B0 1cN0 2Dy0 1cN0 1fB0 1cL0|26e5",
+			"Africa/Lagos|LMT WAT|-d.A -10|01|-22y0d.A|17e6",
+			"Africa/Bissau|LMT WAT GMT|12.k 10 0|012|-2ldWV.E 2xonV.E|39e4",
+			"Africa/Maputo|LMT CAT|-2a.k -20|01|-2GJea.k|26e5",
+			"Africa/Cairo|EET EEST|-20 -30|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-1bIO0 vb0 1ip0 11z0 1iN0 1nz0 12p0 1pz0 10N0 1pz0 16p0 1jz0 s3d0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1WL0 rd0 1Rz0 wp0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1qL0 Xd0 1oL0 11d0 1oL0 11d0 1pb0 11d0 1oL0 11d0 1oL0 11d0 1ny0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 WL0 1qN0 Rb0 1wp0 On0 1zd0 Lz0 1EN0 Fb0 c10 8n0 8Nd0 gL0 e10 mn0|15e6",
+			"Africa/Casablanca|LMT WET WEST CET|u.k 0 -10 -10|0121212121212121213121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2gMnt.E 130Lt.E rb0 Dd0 dVb0 b6p0 TX0 EoB0 LL0 gnd0 rz0 43d0 AL0 1Nd0 XX0 1Cp0 pz0 dEp0 4mn0 SyN0 AL0 1Nd0 wn0 1FB0 Db0 1zd0 Lz0 1Nf0 wM0 co0 go0 1o00 s00 dA0 vc0 11A0 A00 e00 y00 11A0 uM0 e00 Dc0 11A0 s00 e00 IM0 WM0 mo0 gM0 LA0 WM0 jA0 e00 Rc0 11A0 e00 e00 U00 11A0 8o0 e00 11A0 11A0 5A0 e00 17c0 1fA0 1a00 1a00 1fA0 17c0 1io0 14o0 1lc0 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1lc0 14o0 1fA0|32e5",
+			"Africa/Ceuta|WET WEST CET CEST|0 -10 -10 -20|010101010101010101010232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-25KN0 11z0 drd0 18o0 3I00 17c0 1fA0 1a00 1io0 1a00 1y7p0 LL0 gnd0 rz0 43d0 AL0 1Nd0 XX0 1Cp0 pz0 dEp0 4VB0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|85e3",
+			"Africa/El_Aaiun|LMT WAT WET WEST|Q.M 10 0 -10|01232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1rDz7.c 1GVA7.c 6L0 AL0 1Nd0 XX0 1Cp0 pz0 1cBB0 AL0 1Nd0 wn0 1FB0 Db0 1zd0 Lz0 1Nf0 wM0 co0 go0 1o00 s00 dA0 vc0 11A0 A00 e00 y00 11A0 uM0 e00 Dc0 11A0 s00 e00 IM0 WM0 mo0 gM0 LA0 WM0 jA0 e00 Rc0 11A0 e00 e00 U00 11A0 8o0 e00 11A0 11A0 5A0 e00 17c0 1fA0 1a00 1a00 1fA0 17c0 1io0 14o0 1lc0 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1lc0 14o0 1fA0|20e4",
+			"Africa/Johannesburg|SAST SAST SAST|-1u -20 -30|012121|-2GJdu 1Ajdu 1cL0 1cN0 1cL0|84e5",
+			"Africa/Khartoum|LMT CAT CAST EAT|-2a.8 -20 -30 -30|01212121212121212121212121212121213|-1yW2a.8 1zK0a.8 16L0 1iN0 17b0 1jd0 17b0 1ip0 17z0 1i10 17X0 1hB0 18n0 1hd0 19b0 1gp0 19z0 1iN0 17b0 1ip0 17z0 1i10 18n0 1hd0 18L0 1gN0 19b0 1gp0 19z0 1iN0 17z0 1i10 17X0 yGd0|51e5",
+			"Africa/Monrovia|MMT LRT GMT|H.8 I.u 0|012|-23Lzg.Q 29s01.m|11e5",
+			"Africa/Ndjamena|LMT WAT WAST|-10.c -10 -20|0121|-2le10.c 2J3c0.c Wn0|13e5",
+			"Africa/Tripoli|LMT CET CEST EET|-Q.I -10 -20 -20|012121213121212121212121213123123|-21JcQ.I 1hnBQ.I vx0 4iP0 xx0 4eN0 Bb0 7ip0 U0n0 A10 1db0 1cN0 1db0 1dd0 1db0 1eN0 1bb0 1e10 1cL0 1c10 1db0 1dd0 1db0 1cN0 1db0 1q10 fAn0 1ep0 1db0 AKq0 TA0 1o00|11e5",
+			"Africa/Tunis|PMT CET CEST|-9.l -10 -20|0121212121212121212121212121212121|-2nco9.l 18pa9.l 1qM0 DA0 3Tc0 11B0 1ze0 WM0 7z0 3d0 14L0 1cN0 1f90 1ar0 16J0 1gXB0 WM0 1rA0 11c0 nwo0 Ko0 1cM0 1cM0 1rA0 10M0 zuM0 10N0 1aN0 1qM0 WM0 1qM0 11A0 1o00|20e5",
+			"Africa/Windhoek|SWAT SAST SAST CAT WAT WAST|-1u -20 -30 -20 -10 -20|012134545454545454545454545454545454545454545454545454545454545454545454545454545454545454545|-2GJdu 1Ajdu 1cL0 1SqL0 9NA0 11D0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 11B0 1nX0 11B0|32e4",
+			"America/Adak|NST NWT NPT BST BDT AHST HST HDT|b0 a0 a0 b0 a0 a0 a0 90|012034343434343434343434343434343456767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17SX0 8wW0 iB0 Qlb0 52O0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cm0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|326",
+			"America/Anchorage|CAT CAWT CAPT AHST AHDT YST AKST AKDT|a0 90 90 a0 90 90 90 80|012034343434343434343434343434343456767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17T00 8wX0 iA0 Qlb0 52O0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cm0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|30e4",
+			"America/Port_of_Spain|LMT AST|46.4 40|01|-2kNvR.U|43e3",
+			"America/Araguaina|LMT BRT BRST|3c.M 30 20|0121212121212121212121212121212121212121212121212121|-2glwL.c HdKL.c 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 dMN0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 ny10 Lz0|14e4",
+			"America/Argentina/Buenos_Aires|CMT ART ARST ART ARST|4g.M 40 30 30 20|0121212121212121212121212121212121212121213434343434343234343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wp0 Rb0 1wp0 TX0 g0p0 10M0 j3c0 uL0 1qN0 WL0",
+			"America/Argentina/Catamarca|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|0121212121212121212121212121212121212121213434343454343235343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 g0p0 10M0 ako0 7B0 8zb0 uL0",
+			"America/Argentina/Cordoba|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|0121212121212121212121212121212121212121213434343454343234343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 g0p0 10M0 j3c0 uL0 1qN0 WL0",
+			"America/Argentina/Jujuy|CMT ART ARST ART ARST WART WARST|4g.M 40 30 30 20 40 30|01212121212121212121212121212121212121212134343456543432343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1ze0 TX0 1ld0 WK0 1wp0 TX0 g0p0 10M0 j3c0 uL0",
+			"America/Argentina/La_Rioja|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|01212121212121212121212121212121212121212134343434534343235343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Qn0 qO0 16n0 Rb0 1wp0 TX0 g0p0 10M0 ako0 7B0 8zb0 uL0",
+			"America/Argentina/Mendoza|CMT ART ARST ART ARST WART WARST|4g.M 40 30 30 20 40 30|0121212121212121212121212121212121212121213434345656543235343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1u20 SL0 1vd0 Tb0 1wp0 TW0 g0p0 10M0 agM0 Op0 7TX0 uL0",
+			"America/Argentina/Rio_Gallegos|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|0121212121212121212121212121212121212121213434343434343235343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wp0 Rb0 1wp0 TX0 g0p0 10M0 ako0 7B0 8zb0 uL0",
+			"America/Argentina/Salta|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|01212121212121212121212121212121212121212134343434543432343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 g0p0 10M0 j3c0 uL0",
+			"America/Argentina/San_Juan|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|01212121212121212121212121212121212121212134343434534343235343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Qn0 qO0 16n0 Rb0 1wp0 TX0 g0p0 10M0 ak00 m10 8lb0 uL0",
+			"America/Argentina/San_Luis|CMT ART ARST ART ARST WART WARST|4g.M 40 30 30 20 40 30|01212121212121212121212121212121212121212134343456536353465653|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 XX0 1q20 SL0 AN0 kin0 10M0 ak00 m10 8lb0 8L0 jd0 1qN0 WL0 1qN0",
+			"America/Argentina/Tucuman|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|012121212121212121212121212121212121212121343434345434323534343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wq0 Ra0 1wp0 TX0 g0p0 10M0 ako0 4N0 8BX0 uL0 1qN0 WL0",
+			"America/Argentina/Ushuaia|CMT ART ARST ART ARST WART|4g.M 40 30 30 20 40|0121212121212121212121212121212121212121213434343434343235343|-20UHH.c pKnH.c Mn0 1iN0 Tb0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 1C10 LX0 1C10 LX0 1C10 LX0 1C10 Mn0 MN0 2jz0 MN0 4lX0 u10 5Lb0 1pB0 Fnz0 u10 uL0 1vd0 SL0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 zvd0 Bz0 1tB0 TX0 1wp0 Rb0 1wp0 Rb0 1wp0 TX0 g0p0 10M0 ajA0 8p0 8zb0 uL0",
+			"America/Curacao|LMT ANT AST|4z.L 4u 40|012|-2kV7o.d 28KLS.d|15e4",
+			"America/Asuncion|AMT PYT PYT PYST|3O.E 40 30 30|012131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313|-1x589.k 1DKM9.k 3CL0 3Dd0 10L0 1pB0 10n0 1pB0 10n0 1pB0 1cL0 1dd0 1db0 1dd0 1cL0 1dd0 1cL0 1dd0 1cL0 1dd0 1db0 1dd0 1cL0 1dd0 1cL0 1dd0 1cL0 1dd0 1db0 1dd0 1cL0 1lB0 14n0 1dd0 1cL0 1fd0 WL0 1rd0 1aL0 1dB0 Xz0 1qp0 Xb0 1qN0 10L0 1rB0 TX0 1tB0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 WN0 1qL0 11B0 1nX0 1ip0 WL0 1qN0 WL0 1qN0 WL0 1tB0 TX0 1tB0 TX0 1tB0 19X0 1a10 1fz0 1a10 1fz0 1cN0 17b0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1ip0 17b0 1ip0 17b0 1ip0|28e5",
+			"America/Atikokan|CST CDT CWT CPT EST|60 50 50 50 50|0101234|-25TQ0 1in0 Rnb0 3je0 8x30 iw0|28e2",
+			"America/Bahia|LMT BRT BRST|2y.4 30 20|01212121212121212121212121212121212121212121212121212121212121|-2glxp.U HdLp.U 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 l5B0 Rb0|27e5",
+			"America/Bahia_Banderas|LMT MST CST PST MDT CDT|71 70 60 80 60 50|0121212131414141414141414141414141414152525252525252525252525252525252525252525252525252525252|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 otX0 gmN0 P2N0 13Vd0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nW0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|84e3",
+			"America/Barbados|LMT BMT AST ADT|3W.t 3W.t 40 30|01232323232|-1Q0I1.v jsM0 1ODC1.v IL0 1ip0 17b0 1ip0 17b0 1ld0 13b0|28e4",
+			"America/Belem|LMT BRT BRST|3d.U 30 20|012121212121212121212121212121|-2glwK.4 HdKK.4 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0|20e5",
+			"America/Belize|LMT CST CHDT CDT|5Q.M 60 5u 50|01212121212121212121212121212121212121212121212121213131|-2kBu7.c fPA7.c Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1wou Rbu 1zcu Onu 1zcu Onu 1zcu Rbu 1wou Rbu 1f0Mu qn0 lxB0 mn0|57e3",
+			"America/Blanc-Sablon|AST ADT AWT APT|40 30 30 30|010230|-25TS0 1in0 UGp0 8x50 iu0|11e2",
+			"America/Boa_Vista|LMT AMT AMST|42.E 40 30|0121212121212121212121212121212121|-2glvV.k HdKV.k 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 smp0 WL0 1tB0 2L0|62e2",
+			"America/Bogota|BMT COT COST|4U.g 50 40|0121|-2eb73.I 38yo3.I 2en0|90e5",
+			"America/Boise|PST PDT MST MWT MPT MDT|80 70 70 60 60 60|0101023425252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252|-261q0 1nX0 11B0 1nX0 8C10 JCL0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 Dd0 1Kn0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|21e4",
+			"America/Cambridge_Bay|zzz MST MWT MPT MDDT MDT CST CDT EST|0 70 60 60 50 60 60 50 50|0123141515151515151515151515151515151515151515678651515151515151515151515151515151515151515151515151515151515151515151515151|-21Jc0 RO90 8x20 ix0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11A0 1nX0 2K0 WQ0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|15e2",
+			"America/Campo_Grande|LMT AMT AMST|3C.s 40 30|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-2glwl.w HdLl.w 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 1C10 Lz0 1Ip0 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0|77e4",
+			"America/Cancun|LMT CST EST EDT CDT|5L.4 60 50 40 50|0123232341414141414141414141414141414141412|-1UQG0 2q2o0 yLB0 1lb0 14p0 1lb0 14p0 Lz0 xB0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 Dd0|63e4",
+			"America/Caracas|CMT VET VET|4r.E 4u 40|0121|-2kV7w.k 28KM2.k 1IwOu|29e5",
+			"America/Cayenne|LMT GFT GFT|3t.k 40 30|012|-2mrwu.E 2gWou.E|58e3",
+			"America/Cayman|KMT EST EDT|57.b 50 40|0121212121212121212121212121212121212121212121|-2l1uQ.N 4duNQ.N 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|58e3",
+			"America/Chicago|CST CDT EST CWT CPT|60 50 50 50 50|01010101010101010101010101010101010102010101010103401010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 1wp0 TX0 WN0 1qL0 1cN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 11B0 1Hz0 14p0 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 RB0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|92e5",
+			"America/Chihuahua|LMT MST CST CDT MDT|74.k 70 60 50 60|0121212323241414141414141414141414141414141414141414141414141414141414141414141414141414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|81e4",
+			"America/Costa_Rica|SJMT CST CDT|5A.d 60 50|0121212121|-1Xd6n.L 2lu0n.L Db0 1Kp0 Db0 pRB0 15b0 1kp0 mL0|12e5",
+			"America/Creston|MST PST|70 80|010|-29DR0 43B0|53e2",
+			"America/Cuiaba|LMT AMT AMST|3I.k 40 30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-2glwf.E HdLf.E 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 4a10 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0|54e4",
+			"America/Danmarkshavn|LMT WGT WGST GMT|1e.E 30 20 0|01212121212121212121212121212121213|-2a5WJ.k 2z5fJ.k 19U0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 DC0|8",
+			"America/Dawson|YST YDT YWT YPT YDDT PST PDT|90 80 80 80 70 80 70|0101023040565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-25TN0 1in0 1o10 13V0 Ser0 8x00 iz0 LCL0 1fA0 jrA0 fNd0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|13e2",
+			"America/Dawson_Creek|PST PDT PWT PPT MST|80 70 70 70 70|0102301010101010101010101010101010101010101010101010101014|-25TO0 1in0 UGp0 8x10 iy0 3NB0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 ML0|12e3",
+			"America/Denver|MST MDT MWT MPT|70 60 60 60|01010101023010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261r0 1nX0 11B0 1nX0 11B0 1qL0 WN0 mn0 Ord0 8x20 ix0 LCN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|26e5",
+			"America/Detroit|LMT CST EST EWT EPT EDT|5w.b 60 50 40 40 40|01234252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252|-2Cgir.N peqr.N 156L0 8x40 iv0 6fd0 11z0 Jy10 SL0 dnB0 1cL0 s10 1Vz0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|37e5",
+			"America/Edmonton|LMT MST MDT MWT MPT|7x.Q 70 60 60 60|01212121212121341212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2yd4q.8 shdq.8 1in0 17d0 hz0 2dB0 1fz0 1a10 11z0 1qN0 WL0 1qN0 11z0 IGN0 8x20 ix0 3NB0 11z0 LFB0 1cL0 3Cp0 1cL0 66N0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|10e5",
+			"America/Eirunepe|LMT ACT ACST AMT|4D.s 50 40 40|0121212121212121212121212121212131|-2glvk.w HdLk.w 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 dPB0 On0 yTd0 d5X0|31e3",
+			"America/El_Salvador|LMT CST CDT|5U.M 60 50|012121|-1XiG3.c 2Fvc3.c WL0 1qN0 WL0|11e5",
+			"America/Tijuana|LMT MST PST PDT PWT PPT|7M.4 70 80 70 70 70|012123245232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1UQE0 4PX0 8mM0 8lc0 SN0 1cL0 pHB0 83r0 zI0 5O10 1Rz0 cOP0 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 BUp0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|20e5",
+			"America/Fort_Nelson|PST PDT PWT PPT MST|80 70 70 70 70|01023010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010104|-25TO0 1in0 UGp0 8x10 iy0 3NB0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0|39e2",
+			"America/Fort_Wayne|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|010101023010101010101010101040454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 QI10 Db0 RB0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 5Tz0 1o10 qLb0 1cL0 1cN0 1cL0 1qhd0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Fortaleza|LMT BRT BRST|2y 30 20|0121212121212121212121212121212121212121|-2glxq HdLq 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 nsp0 WL0 1tB0 5z0 2mN0 On0|34e5",
+			"America/Glace_Bay|LMT AST ADT AWT APT|3X.M 40 30 30 30|012134121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2IsI0.c CwO0.c 1in0 UGp0 8x50 iu0 iq10 11z0 Jg10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|19e3",
+			"America/Godthab|LMT WGT WGST|3q.U 30 20|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2a5Ux.4 2z5dx.4 19U0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|17e3",
+			"America/Goose_Bay|NST NDT NST NDT NWT NPT AST ADT ADDT|3u.Q 2u.Q 3u 2u 2u 2u 40 30 20|010232323232323245232323232323232323232323232323232323232326767676767676767676767676767676767676767676768676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-25TSt.8 1in0 DXb0 2HbX.8 WL0 1qN0 WL0 1qN0 WL0 1tB0 TX0 1tB0 WL0 1qN0 WL0 1qN0 7UHu itu 1tB0 WL0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1tB0 WL0 1ld0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 S10 g0u 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14n1 1lb0 14p0 1nW0 11C0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zcX Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|76e2",
+			"America/Grand_Turk|KMT EST EDT AST|57.b 50 40 40|0121212121212121212121212121212121212121212121212121212121212121212121212123|-2l1uQ.N 2HHBQ.N 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|37e2",
+			"America/Guatemala|LMT CST CDT|62.4 60 50|0121212121|-24KhV.U 2efXV.U An0 mtd0 Nz0 ifB0 17b0 zDB0 11z0|13e5",
+			"America/Guayaquil|QMT ECT|5e 50|01|-1yVSK|27e5",
+			"America/Guyana|LMT GBGT GYT GYT GYT|3Q.E 3J 3J 30 40|01234|-2dvU7.k 24JzQ.k mlc0 Bxbf|80e4",
+			"America/Halifax|LMT AST ADT AWT APT|4e.o 40 30 30 30|0121212121212121212121212121212121212121212121212134121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2IsHJ.A xzzJ.A 1db0 3I30 1in0 3HX0 IL0 1E10 ML0 1yN0 Pb0 1Bd0 Mn0 1Bd0 Rz0 1w10 Xb0 1w10 LX0 1w10 Xb0 1w10 Lz0 1C10 Jz0 1E10 OL0 1yN0 Un0 1qp0 Xb0 1qp0 11X0 1w10 Lz0 1HB0 LX0 1C10 FX0 1w10 Xb0 1qp0 Xb0 1BB0 LX0 1td0 Xb0 1qp0 Xb0 Rf0 8x50 iu0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 3Qp0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 3Qp0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 6i10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|39e4",
+			"America/Havana|HMT CST CDT|5t.A 50 40|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1Meuu.o 72zu.o ML0 sld0 An0 1Nd0 Db0 1Nd0 An0 6Ep0 An0 1Nd0 An0 JDd0 Mn0 1Ap0 On0 1fd0 11X0 1qN0 WL0 1wp0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 14n0 1ld0 14L0 1kN0 15b0 1kp0 1cL0 1cN0 1fz0 1a10 1fz0 1fB0 11z0 14p0 1nX0 11B0 1nX0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 14n0 1ld0 14n0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 1a10 1in0 1a10 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 17c0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 11A0 6i00 Rc0 1wo0 U00 1tA0 Rc0 1wo0 U00 1wo0 U00 1zc0 U00 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0|21e5",
+			"America/Hermosillo|LMT MST CST PST MDT|7n.Q 70 60 80 60|0121212131414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 otX0 gmN0 P2N0 13Vd0 1lb0 14p0 1lb0 14p0 1lb0|64e4",
+			"America/Indiana/Knox|CST CDT CWT CPT EST|60 50 50 50 50|0101023010101010101010101010101010101040101010101010101010101010101010101010101010101010141010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 3NB0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 11z0 1o10 11z0 1o10 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 3Cn0 8wp0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 z8o0 1o00 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Marengo|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|0101023010101010101010104545454545414545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 dyN0 11z0 6fd0 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 jrz0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1VA0 LA0 1BX0 1e6p0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Petersburg|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010104010101010101010101010141014545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 njX0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 3Fb0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 19co0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Tell_City|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010101010454541010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 g0p0 11z0 1o10 11z0 1qL0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 caL0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Vevay|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|010102304545454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 kPB0 Awn0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1lnd0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Vincennes|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010101010454541014545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 g0p0 11z0 1o10 11z0 1qL0 WN0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 caL0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Indiana/Winamac|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|01010230101010101010101010101010101010454541054545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 jrz0 1cL0 1cN0 1cL0 1qhd0 1o00 Rd0 1za0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Inuvik|zzz PST PDDT MST MDT|0 80 60 70 60|0121343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-FnA0 tWU0 1fA0 wPe0 2pz0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|35e2",
+			"America/Iqaluit|zzz EWT EPT EST EDDT EDT CST CDT|0 40 40 50 30 40 60 50|01234353535353535353535353535353535353535353567353535353535353535353535353535353535353535353535353535353535353535353535353|-16K00 7nX0 iv0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11C0 1nX0 11A0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|67e2",
+			"America/Jamaica|KMT EST EDT|57.b 50 40|0121212121212121212121|-2l1uQ.N 2uM1Q.N 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0|94e4",
+			"America/Juneau|PST PWT PPT PDT YDT YST AKST AKDT|80 70 70 70 80 90 90 80|01203030303030303030303030403030356767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17T20 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cM0 1cM0 1cL0 1cN0 1fz0 1a10 1fz0 co0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|33e3",
+			"America/Kentucky/Louisville|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|0101010102301010101010101010101010101454545454545414545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 3Fd0 Nb0 LPd0 11z0 RB0 8x30 iw0 Bb0 10N0 2bB0 8in0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 xz0 gso0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1VA0 LA0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Kentucky/Monticello|CST CDT CWT CPT EST EDT|60 50 50 50 50 40|0101023010101010101010101010101010101010101010101010101010101010101010101454545454545454545454545454545454545454545454545454545454545454545454545454|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 SWp0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11A0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/La_Paz|CMT BOST BOT|4w.A 3w.A 40|012|-1x37r.o 13b0|19e5",
+			"America/Lima|LMT PET PEST|58.A 50 40|0121212121212121|-2tyGP.o 1bDzP.o zX0 1aN0 1cL0 1cN0 1cL0 1PrB0 zX0 1O10 zX0 6Gp0 zX0 98p0 zX0|11e6",
+			"America/Los_Angeles|PST PDT PWT PPT|80 70 70 70|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261q0 1nX0 11B0 1nX0 SgN0 8x10 iy0 5Wp0 1Vb0 3dB0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|15e6",
+			"America/Maceio|LMT BRT BRST|2m.Q 30 20|012121212121212121212121212121212121212121|-2glxB.8 HdLB.8 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 dMN0 Lz0 8Q10 WL0 1tB0 5z0 2mN0 On0|93e4",
+			"America/Managua|MMT CST EST CDT|5J.c 60 50 50|0121313121213131|-1quie.M 1yAMe.M 4mn0 9Up0 Dz0 1K10 Dz0 s3F0 1KH0 DB0 9In0 k8p0 19X0 1o30 11y0|22e5",
+			"America/Manaus|LMT AMT AMST|40.4 40 30|01212121212121212121212121212121|-2glvX.U HdKX.U 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 dPB0 On0|19e5",
+			"America/Martinique|FFMT AST ADT|44.k 40 30|0121|-2mPTT.E 2LPbT.E 19X0|39e4",
+			"America/Matamoros|LMT CST CDT|6E 60 50|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1UQG0 2FjC0 1nX0 i6p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|45e4",
+			"America/Mazatlan|LMT MST CST PST MDT|75.E 70 60 80 60|0121212131414141414141414141414141414141414141414141414141414141414141414141414141414141414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 otX0 gmN0 P2N0 13Vd0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|44e4",
+			"America/Menominee|CST CDT CWT CPT EST|60 50 50 50 50|01010230101041010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 1o10 11z0 LCN0 1fz0 6410 9Jb0 1cM0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|85e2",
+			"America/Merida|LMT CST EST CDT|5W.s 60 50 50|0121313131313131313131313131313131313131313131313131313131313131313131313131313131313131|-1UQG0 2q2o0 2hz0 wu30 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|11e5",
+			"America/Metlakatla|PST PWT PPT PDT|80 70 70 70|0120303030303030303030303030303030|-17T20 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0|14e2",
+			"America/Mexico_City|LMT MST CST CDT CWT|6A.A 70 60 50 50|012121232324232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 gEn0 TX0 3xd0 Jb0 6zB0 SL0 e5d0 17b0 1Pff0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|20e6",
+			"America/Miquelon|LMT AST PMST PMDT|3I.E 40 30 20|012323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2mKkf.k 2LTAf.k gQ10 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|61e2",
+			"America/Moncton|EST AST ADT AWT APT|50 40 30 30 30|012121212121212121212134121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2IsH0 CwN0 1in0 zAo0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1Nd0 An0 1K10 Lz0 1zB0 NX0 1u10 Wn0 S20 8x50 iu0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 3Cp0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14n1 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 ReX 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|64e3",
+			"America/Monterrey|LMT CST CDT|6F.g 60 50|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1UQG0 2FjC0 1nX0 i6p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|41e5",
+			"America/Montevideo|MMT UYT UYHST UYST UYT UYHST|3I.I 3u 30 20 30 2u|012121212121212121212121213434343434345454543453434343434343434343434343434343434343434|-20UIf.g 8jzJ.g 1cLu 1dcu 1cLu 1dcu 1cLu ircu 11zu 1o0u 11zu 1o0u 11zu 1qMu WLu 1qMu WLu 1qMu WLu 1qMu 11zu 1o0u 11zu NAu 11bu 2iMu zWu Dq10 19X0 pd0 jz0 cm10 19X0 1fB0 1on0 11d0 1oL0 1nB0 1fzu 1aou 1fzu 1aou 1fzu 3nAu Jb0 3MN0 1SLu 4jzu 2PB0 Lb0 3Dd0 1pb0 ixd0 An0 1MN0 An0 1wp0 On0 1wp0 Rb0 1zd0 On0 1wp0 Rb0 s8p0 1fB0 1ip0 11z0 1ld0 14n0 1o10 11z0 1o10 11z0 1o10 14n0 1ld0 14n0 1ld0 14n0 1o10 11z0 1o10 11z0 1o10 11z0|17e5",
+			"America/Toronto|EST EDT EWT EPT|50 40 40 40|01010101010101010101010101010101010101010101012301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TR0 1in0 11Wu 1nzu 1fD0 WJ0 1wr0 Nb0 1Ap0 On0 1zd0 On0 1wp0 TX0 1tB0 TX0 1tB0 TX0 1tB0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 4kM0 8x40 iv0 1o10 11z0 1nX0 11z0 1o10 11z0 1o10 1qL0 11D0 1nX0 11B0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|65e5",
+			"America/Nassau|LMT EST EDT|59.u 50 40|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2kNuO.u 26XdO.u 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|24e4",
+			"America/New_York|EST EDT EWT EPT|50 40 40 40|01010101010101010101010101010101010101010101010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261t0 1nX0 11B0 1nX0 11B0 1qL0 1a10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 RB0 8x40 iv0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|21e6",
+			"America/Nipigon|EST EDT EWT EPT|50 40 40 40|010123010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TR0 1in0 Rnb0 3je0 8x40 iv0 19yN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|16e2",
+			"America/Nome|NST NWT NPT BST BDT YST AKST AKDT|b0 a0 a0 b0 a0 90 90 80|012034343434343434343434343434343456767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676767676|-17SX0 8wW0 iB0 Qlb0 52O0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cl0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|38e2",
+			"America/Noronha|LMT FNT FNST|29.E 20 10|0121212121212121212121212121212121212121|-2glxO.k HdKO.k 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 nsp0 WL0 1tB0 2L0 2pB0 On0|30e2",
+			"America/North_Dakota/Beulah|MST MDT MWT MPT CST CDT|70 60 60 60 60 50|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101014545454545454545454545454545454545454545454545454545454|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Oo0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/North_Dakota/Center|MST MDT MWT MPT CST CDT|70 60 60 60 60 50|010102301010101010101010101010101010101010101010101010101014545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14o0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/North_Dakota/New_Salem|MST MDT MWT MPT CST CDT|70 60 60 60 60 50|010102301010101010101010101010101010101010101010101010101010101010101010101010101454545454545454545454545454545454545454545454545454545454545454545454|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14o0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"America/Ojinaga|LMT MST CST CDT MDT|6V.E 70 60 50 60|0121212323241414141414141414141414141414141414141414141414141414141414141414141414141414141|-1UQF0 deL0 8lc0 17c0 10M0 1dd0 2zQN0 1lb0 14p0 1lb0 14q0 1lb0 14p0 1nX0 11B0 1nX0 1fB0 WL0 1fB0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 U10 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e3",
+			"America/Panama|CMT EST|5j.A 50|01|-2uduE.o|15e5",
+			"America/Pangnirtung|zzz AST AWT APT ADDT ADT EDT EST CST CDT|0 40 30 30 20 30 40 50 60 50|012314151515151515151515151515151515167676767689767676767676767676767676767676767676767676767676767676767676767676767676767|-1XiM0 PnG0 8x50 iu0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1o00 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11C0 1nX0 11A0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|14e2",
+			"America/Paramaribo|LMT PMT PMT NEGT SRT SRT|3E.E 3E.Q 3E.A 3u 3u 30|012345|-2nDUj.k Wqo0.c qanX.I 1dmLN.o lzc0|24e4",
+			"America/Phoenix|MST MDT MWT|70 60 60|01010202010|-261r0 1nX0 11B0 1nX0 SgN0 4Al1 Ap0 1db0 SWqX 1cL0|42e5",
+			"America/Port-au-Prince|PPMT EST EDT|4N 50 40|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-28RHb 2FnMb 19X0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14q0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 i6n0 1nX0 11B0 1nX0 d430 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e5",
+			"America/Rio_Branco|LMT ACT ACST AMT|4v.c 50 40 40|01212121212121212121212121212131|-2glvs.M HdLs.M 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 NBd0 d5X0|31e4",
+			"America/Porto_Velho|LMT AMT AMST|4f.A 40 30|012121212121212121212121212121|-2glvI.o HdKI.o 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0|37e4",
+			"America/Puerto_Rico|AST AWT APT|40 30 30|0120|-17lU0 7XT0 iu0|24e5",
+			"America/Rainy_River|CST CDT CWT CPT|60 50 50 50|010123010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TQ0 1in0 Rnb0 3je0 8x30 iw0 19yN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|842",
+			"America/Rankin_Inlet|zzz CST CDDT CDT EST|0 60 40 50 50|012131313131313131313131313131313131313131313431313131313131313131313131313131313131313131313131313131313131313131313131|-vDc0 keu0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|26e2",
+			"America/Recife|LMT BRT BRST|2j.A 30 20|0121212121212121212121212121212121212121|-2glxE.o HdLE.o 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 nsp0 WL0 1tB0 2L0 2pB0 On0|33e5",
+			"America/Regina|LMT MST MDT MWT MPT CST|6W.A 70 60 60 60 60|012121212121212121212121341212121212121212121212121215|-2AD51.o uHe1.o 1in0 s2L0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 66N0 1cL0 1cN0 19X0 1fB0 1cL0 1fB0 1cL0 1cN0 1cL0 M30 8x20 ix0 1ip0 1cL0 1ip0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 3NB0 1cL0 1cN0|19e4",
+			"America/Resolute|zzz CST CDDT CDT EST|0 60 40 50 50|012131313131313131313131313131313131313131313431313131313431313131313131313131313131313131313131313131313131313131313131|-SnA0 GWS0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|229",
+			"America/Santa_Isabel|LMT MST PST PDT PWT PPT|7D.s 70 80 70 70 70|012123245232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1UQE0 4PX0 8mM0 8lc0 SN0 1cL0 pHB0 83r0 zI0 5O10 1Rz0 cOP0 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 BUp0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0|23e3",
+			"America/Santarem|LMT AMT AMST BRT|3C.M 40 30 30|0121212121212121212121212121213|-2glwl.c HdLl.c 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 qe10 xb0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 NBd0|21e4",
+			"America/Santiago|SMT CLT CLT CLST CLST CLT|4G.K 50 40 40 30 30|01020313131313121242124242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424245|-2q2jh.e fJAh.e 5knG.K 1Vzh.e jRAG.K 1pbh.e 11d0 1oL0 11d0 1oL0 11d0 1oL0 11d0 1pb0 11d0 nHX0 op0 9Bz0 jb0 1oN0 ko0 Qeo0 WL0 1zd0 On0 1ip0 11z0 1o10 11z0 1qN0 WL0 1ld0 14n0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 1wn0|62e5",
+			"America/Santo_Domingo|SDMT EST EDT EHDT AST|4E 50 40 4u 40|01213131313131414|-1ttjk 1lJMk Mn0 6sp0 Lbu 1Cou yLu 1RAu wLu 1QMu xzu 1Q0u xXu 1PAu 13jB0 e00|29e5",
+			"America/Sao_Paulo|LMT BRT BRST|36.s 30 20|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-2glwR.w HdKR.w 1cc0 1e10 1bX0 Ezd0 So0 1vA0 Mn0 1BB0 ML0 1BB0 zX0 pTd0 PX0 2ep0 nz0 1C10 zX0 1C10 LX0 1C10 Mn0 H210 Rb0 1tB0 IL0 1Fd0 FX0 1EN0 FX0 1HB0 Lz0 1EN0 Lz0 1C10 IL0 1HB0 Db0 1HB0 On0 1zd0 On0 1zd0 Lz0 1zd0 Rb0 1wN0 Wn0 1tB0 Rb0 1tB0 WL0 1tB0 Rb0 1zd0 On0 1HB0 FX0 1C10 Lz0 1Ip0 HX0 1zd0 On0 1HB0 IL0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1zd0 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0 On0 1zd0 On0 1zd0 On0 1C10 Lz0 1C10 Lz0 1C10 Lz0 1C10 On0 1zd0 Rb0 1wp0 On0 1C10 Lz0 1C10 On0 1zd0|20e6",
+			"America/Scoresbysund|LMT CGT CGST EGST EGT|1r.Q 20 10 0 10|0121343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434|-2a5Ww.8 2z5ew.8 1a00 1cK0 1cL0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|452",
+			"America/Sitka|PST PWT PPT PDT YST AKST AKDT|80 70 70 70 90 90 80|01203030303030303030303030303030345656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-17T20 8x10 iy0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 co0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|90e2",
+			"America/St_Johns|NST NDT NST NDT NWT NPT NDDT|3u.Q 2u.Q 3u 2u 2u 2u 1u|01010101010101010101010101010101010102323232323232324523232323232323232323232323232323232323232323232323232323232323232323232323232323232326232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-28oit.8 14L0 1nB0 1in0 1gm0 Dz0 1JB0 1cL0 1cN0 1cL0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 1cL0 1cN0 1cL0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 19X0 1fB0 1cL0 1fB0 19X0 1fB0 19X0 10O0 eKX.8 19X0 1iq0 WL0 1qN0 WL0 1qN0 WL0 1tB0 TX0 1tB0 WL0 1qN0 WL0 1qN0 7UHu itu 1tB0 WL0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1tB0 WL0 1ld0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14n1 1lb0 14p0 1nW0 11C0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zcX Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|11e4",
+			"America/Swift_Current|LMT MST MDT MWT MPT CST|7b.k 70 60 60 60 60|012134121212121212121215|-2AD4M.E uHdM.E 1in0 UGp0 8x20 ix0 1o10 17b0 1ip0 11z0 1o10 11z0 1o10 11z0 isN0 1cL0 3Cp0 1cL0 1cN0 11z0 1qN0 WL0 pMp0|16e3",
+			"America/Tegucigalpa|LMT CST CDT|5M.Q 60 50|01212121|-1WGGb.8 2ETcb.8 WL0 1qN0 WL0 GRd0 AL0|11e5",
+			"America/Thule|LMT AST ADT|4z.8 40 30|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2a5To.Q 31NBo.Q 1cL0 1cN0 1cL0 1fB0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|656",
+			"America/Thunder_Bay|CST EST EWT EPT EDT|60 50 40 40 40|0123141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141414141|-2q5S0 1iaN0 8x40 iv0 XNB0 1cL0 1cN0 1fz0 1cN0 1cL0 3Cp0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|11e4",
+			"America/Vancouver|PST PDT PWT PPT|80 70 70 70|0102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-25TO0 1in0 UGp0 8x10 iy0 1o10 17b0 1ip0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e5",
+			"America/Whitehorse|YST YDT YWT YPT YDDT PST PDT|90 80 80 80 70 80 70|0101023040565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565|-25TN0 1in0 1o10 13V0 Ser0 8x00 iz0 LCL0 1fA0 3NA0 vrd0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|23e3",
+			"America/Winnipeg|CST CDT CWT CPT|60 50 50 50|010101023010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aIi0 WL0 3ND0 1in0 Jap0 Rb0 aCN0 8x30 iw0 1tB0 11z0 1ip0 11z0 1o10 11z0 1o10 11z0 1rd0 10L0 1op0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 1cL0 1cN0 11z0 6i10 WL0 6i10 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1a00 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1a00 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1o00 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1o00 11A0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|66e4",
+			"America/Yakutat|YST YWT YPT YDT AKST AKDT|90 80 80 80 90 80|01203030303030303030303030303030304545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-17T10 8x00 iz0 Vo10 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 cn0 10q0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|642",
+			"America/Yellowknife|zzz MST MWT MPT MDDT MDT|0 70 60 60 50 60|012314151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151515151|-1pdA0 hix0 8x20 ix0 LCL0 1fA0 zgO0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|19e3",
+			"Antarctica/Casey|zzz AWST CAST|0 -80 -b0|012121|-2q00 1DjS0 T90 40P0 KL0|10",
+			"Antarctica/Davis|zzz DAVT DAVT|0 -70 -50|01012121|-vyo0 iXt0 alj0 1D7v0 VB0 3Wn0 KN0|70",
+			"Antarctica/DumontDUrville|zzz PMT DDUT|0 -a0 -a0|0102|-U0o0 cfq0 bFm0|80",
+			"Antarctica/Macquarie|AEST AEDT zzz MIST|-a0 -b0 0 -b0|0102010101010101010101010101010101010101010101010101010101010101010101010101010101010101013|-29E80 19X0 4SL0 1ayy0 Lvs0 1cM0 1o00 Rc0 1wo0 Rc0 1wo0 U00 1wo0 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1qM0 WM0 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1wo0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 11A0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 11A0 1o00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1cM0 1cM0 1cM0|1",
+			"Antarctica/Mawson|zzz MAWT MAWT|0 -60 -50|012|-CEo0 2fyk0|60",
+			"Pacific/Auckland|NZMT NZST NZST NZDT|-bu -cu -c0 -d0|01020202020202020202020202023232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323|-1GCVu Lz0 1tB0 11zu 1o0u 11zu 1o0u 11zu 1o0u 14nu 1lcu 14nu 1lcu 1lbu 11Au 1nXu 11Au 1nXu 11Au 1nXu 11Au 1nXu 11Au 1qLu WMu 1qLu 11Au 1n1bu IM0 1C00 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1qM0 14o0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1io0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00|14e5",
+			"Antarctica/Palmer|zzz ARST ART ART ARST CLT CLST CLT|0 30 40 30 20 40 30 30|012121212123435656565656565656565656565656565656565656565656565656565656565656567|-cao0 nD0 1vd0 SL0 1vd0 17z0 1cN0 1fz0 1cN0 1cL0 1cN0 asn0 Db0 jsN0 14N0 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 1wn0|40",
+			"Antarctica/Rothera|zzz ROTT|0 30|01|gOo0|130",
+			"Antarctica/Syowa|zzz SYOT|0 -30|01|-vs00|20",
+			"Antarctica/Troll|zzz UTC CEST|0 0 -20|01212121212121212121212121212121212121212121212121212121212121212121|1puo0 hd0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|40",
+			"Antarctica/Vostok|zzz VOST|0 -60|01|-tjA0|25",
+			"Europe/Oslo|CET CEST|-10 -20|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2awM0 Qm0 W6o0 5pf0 WM0 1fA0 1cM0 1cM0 1cM0 1cM0 wJc0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1qM0 WM0 zpc0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|62e4",
+			"Asia/Riyadh|LMT AST|-36.Q -30|01|-TvD6.Q|57e5",
+			"Asia/Almaty|LMT ALMT ALMT ALMST|-57.M -50 -60 -70|0123232323232323232323232323232323232323232323232|-1Pc57.M eUo7.M 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 3Cl0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0|15e5",
+			"Asia/Amman|LMT EET EEST|-2n.I -20 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1yW2n.I 1HiMn.I KL0 1oN0 11b0 1oN0 11b0 1pd0 1dz0 1cp0 11b0 1op0 11b0 fO10 1db0 1e10 1cL0 1cN0 1cL0 1cN0 1fz0 1pd0 10n0 1ld0 14n0 1hB0 15b0 1ip0 19X0 1cN0 1cL0 1cN0 17b0 1ld0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1So0 y00 1fc0 1dc0 1co0 1dc0 1cM0 1cM0 1cM0 1o00 11A0 1lc0 17c0 1cM0 1cM0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 4bX0 Dd0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|25e5",
+			"Asia/Anadyr|LMT ANAT ANAT ANAST ANAST ANAST ANAT|-bN.U -c0 -d0 -e0 -d0 -c0 -b0|01232414141414141414141561414141414141414141414141414141414141561|-1PcbN.U eUnN.U 23CL0 1db0 1cN0 1dc0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qN0 WM0|13e3",
+			"Asia/Aqtau|LMT FORT FORT SHET SHET SHEST AQTT AQTST AQTST AQTT|-3l.4 -40 -50 -50 -60 -60 -50 -60 -50 -40|012345353535353535353536767676898989898989898989896|-1Pc3l.4 eUnl.4 1jcL0 JDc0 1cL0 1dc0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2UK0 Fz0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cN0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 RW0|15e4",
+			"Asia/Aqtobe|LMT AKTT AKTT AKTST AKTT AQTT AQTST|-3M.E -40 -50 -60 -60 -50 -60|01234323232323232323232565656565656565656565656565|-1Pc3M.E eUnM.E 23CL0 1db0 1cM0 1dc0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2UK0 Fz0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0|27e4",
+			"Asia/Ashgabat|LMT ASHT ASHT ASHST ASHST TMT TMT|-3R.w -40 -50 -60 -50 -40 -50|012323232323232323232324156|-1Pc3R.w eUnR.w 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 ba0 xC0|41e4",
+			"Asia/Baghdad|BMT AST ADT|-2V.A -30 -40|012121212121212121212121212121212121212121212121212121|-26BeV.A 2ACnV.A 11b0 1cp0 1dz0 1dd0 1db0 1cN0 1cp0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1de0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0 1dc0 1dc0 1cM0 1dc0 1cM0 1dc0 1cM0 1dc0|66e5",
+			"Asia/Qatar|LMT GST AST|-3q.8 -40 -30|012|-21Jfq.8 27BXq.8|96e4",
+			"Asia/Baku|LMT BAKT BAKT BAKST BAKST AZST AZT AZT AZST|-3j.o -30 -40 -50 -40 -40 -30 -40 -50|0123232323232323232323245657878787878787878787878787878787878787878787878787878787878787878787878787878787878787|-1Pc3j.o 1jUoj.o WCL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 10K0 c30 1cJ0 1cL0 8wu0 1o00 11z0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|27e5",
+			"Asia/Bangkok|BMT ICT|-6G.4 -70|01|-218SG.4|15e6",
+			"Asia/Beirut|EET EEST|-20 -30|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-21aq0 1on0 1410 1db0 19B0 1in0 1ip0 WL0 1lQp0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 11b0 q6N0 En0 1oN0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 11b0 1op0 11b0 dA10 17b0 1iN0 17b0 1iN0 17b0 1iN0 17b0 1vB0 SL0 1mp0 13z0 1iN0 17b0 1iN0 17b0 1jd0 12n0 1a10 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0|22e5",
+			"Asia/Bishkek|LMT FRUT FRUT FRUST FRUST KGT KGST KGT|-4W.o -50 -60 -70 -60 -50 -60 -60|01232323232323232323232456565656565656565656565656567|-1Pc4W.o eUnW.o 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 11c0 1tX0 17b0 1ip0 17b0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1cPu 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 T8u|87e4",
+			"Asia/Brunei|LMT BNT BNT|-7D.E -7u -80|012|-1KITD.E gDc9.E|42e4",
+			"Asia/Kolkata|HMT BURT IST IST|-5R.k -6u -5u -6u|01232|-18LFR.k 1unn.k HB0 7zX0|15e6",
+			"Asia/Chita|LMT YAKT YAKT YAKST YAKST YAKT IRKT|-7x.Q -80 -90 -a0 -90 -a0 -80|012323232323232323232324123232323232323232323232323232323232323256|-21Q7x.Q pAnx.Q 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|33e4",
+			"Asia/Choibalsan|LMT ULAT ULAT CHOST CHOT CHOT CHOST|-7C -70 -80 -a0 -90 -80 -90|0123434343434343434343434343434343434343434343456565656565656565656565656565656565656565656565|-2APHC 2UkoC cKn0 1da0 1dd0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 6hD0 11z0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 3Db0 h1f0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0|38e3",
+			"Asia/Shanghai|CST CDT|-80 -90|01010101010101010|-1c1I0 LX0 16p0 1jz0 1Myp0 Rb0 1o10 11z0 1o10 11z0 1qN0 11z0 1o10 11z0 1o10 11z0|23e6",
+			"Asia/Colombo|MMT IST IHST IST LKT LKT|-5j.w -5u -60 -6u -6u -60|01231451|-2zOtj.w 1rFbN.w 1zzu 7Apu 23dz0 11zu n3cu|22e5",
+			"Asia/Dhaka|HMT BURT IST DACT BDT BDST|-5R.k -6u -5u -60 -60 -70|01213454|-18LFR.k 1unn.k HB0 m6n0 LqMu 1x6n0 1i00|16e6",
+			"Asia/Damascus|LMT EET EEST|-2p.c -20 -30|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-21Jep.c Hep.c 17b0 1ip0 17b0 1ip0 17b0 1ip0 19X0 1xRB0 11X0 1oN0 10L0 1pB0 11b0 1oN0 10L0 1mp0 13X0 1oN0 11b0 1pd0 11b0 1oN0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 11b0 1oN0 11b0 1oN0 11b0 1pd0 11b0 1oN0 Nb0 1AN0 Nb0 bcp0 19X0 1gp0 19X0 3ld0 1xX0 Vd0 1Bz0 Sp0 1vX0 10p0 1dz0 1cN0 1cL0 1db0 1db0 1g10 1an0 1ap0 1db0 1fd0 1db0 1cN0 1db0 1dd0 1db0 1cp0 1dz0 1c10 1dX0 1cN0 1db0 1dd0 1db0 1cN0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1db0 1cN0 1db0 1cN0 19z0 1fB0 1qL0 11B0 1on0 Wp0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 1qL0 WN0 1qL0|26e5",
+			"Asia/Dili|LMT TLT JST TLT WITA|-8m.k -80 -90 -90 -80|012343|-2le8m.k 1dnXm.k 8HA0 1ew00 Xld0|19e4",
+			"Asia/Dubai|LMT GST|-3F.c -40|01|-21JfF.c|39e5",
+			"Asia/Dushanbe|LMT DUST DUST DUSST DUSST TJT|-4z.c -50 -60 -70 -60 -50|0123232323232323232323245|-1Pc4z.c eUnz.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 14N0|76e4",
+			"Asia/Gaza|EET EET EEST IST IDT|-20 -30 -30 -20 -30|010101010102020202020202020202023434343434343434343434343430202020202020202020202020202020202020202020202020202020202020202020202020202020202020|-1c2q0 5Rb0 10r0 1px0 10N0 1pz0 16p0 1jB0 16p0 1jx0 pBd0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 npB0 11z0 1C10 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 11z0 1o10 14o0 1lA1 SKX 1xd1 MKX 1AN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0|18e5",
+			"Asia/Hebron|EET EET EEST IST IDT|-20 -30 -30 -20 -30|01010101010202020202020202020202343434343434343434343434343020202020202020202020202020202020202020202020202020202020202020202020202020202020202020|-1c2q0 5Rb0 10r0 1px0 10N0 1pz0 16p0 1jB0 16p0 1jx0 pBd0 Vz0 1oN0 11b0 1oO0 10N0 1pz0 10N0 1pb0 10N0 1pb0 10N0 1pb0 10N0 1pz0 10N0 1pb0 10N0 1pb0 11d0 1oL0 dW0 hfB0 Db0 1fB0 Rb0 npB0 11z0 1C10 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 M10 C00 17c0 1io0 17c0 1io0 17c0 1o00 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 17c0 1io0 18N0 1bz0 19z0 1gp0 1610 1iL0 12L0 1mN0 14o0 1lc0 Tb0 1xd1 MKX bB0 cn0 1cN0 1a00 1fA0 1cL0 1cN0 1nX0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 1210 1nz0 14N0 1nz0 1210 1nz0 1210 1nz0 1210 1nz0|25e4",
+			"Asia/Ho_Chi_Minh|LMT PLMT ICT IDT JST|-76.E -76.u -70 -80 -90|0123423232|-2yC76.E bK00.a 1h7b6.u 5lz0 18o0 3Oq0 k5b0 aW00 BAM0|90e5",
+			"Asia/Hong_Kong|LMT HKT HKST JST|-7A.G -80 -90 -90|0121312121212121212121212121212121212121212121212121212121212121212121|-2CFHA.G 1sEP6.G 1cL0 ylu 93X0 1qQu 1tX0 Rd0 1In0 NB0 1cL0 11B0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1kL0 14N0 1nX0 U10 1tz0 U10 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 U10 1tz0 U10 1wn0 Rd0 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 17d0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 s10 1Vz0 1cN0 1cL0 1cN0 1cL0 6fd0 14n0|73e5",
+			"Asia/Hovd|LMT HOVT HOVT HOVST|-66.A -60 -70 -80|012323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2APG6.A 2Uko6.A cKn0 1db0 1dd0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 6hD0 11z0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 kEp0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0|81e3",
+			"Asia/Irkutsk|IMT IRKT IRKT IRKST IRKST IRKT|-6V.5 -70 -80 -90 -80 -90|012323232323232323232324123232323232323232323232323232323232323252|-21zGV.5 pjXV.5 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|60e4",
+			"Europe/Istanbul|IMT EET EEST TRST TRT|-1U.U -20 -30 -40 -30|012121212121212121212121212121212121212121212121212121234343434342121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2ogNU.U dzzU.U 11b0 8tB0 1on0 1410 1db0 19B0 1in0 3Rd0 Un0 1oN0 11b0 zSp0 CL0 mN0 1Vz0 1gN0 1pz0 5Rd0 1fz0 1yp0 ML0 1kp0 17b0 1ip0 17b0 1fB0 19X0 1jB0 18L0 1ip0 17z0 qdd0 xX0 3S10 Tz0 dA10 11z0 1o10 11z0 1qN0 11z0 1ze0 11B0 WM0 1qO0 WI0 1nX0 1rB0 10L0 11B0 1in0 17d0 1in0 2pX0 19E0 1fU0 16Q0 1iI0 16Q0 1iI0 1Vd0 pb0 3Kp0 14o0 1df0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cL0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WO0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 Xc0 1qo0 WM0 1qM0 11A0 1o00 1200 1nA0 11A0 1tA0 U00 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|13e6",
+			"Asia/Jakarta|BMT JAVT WIB JST WIB WIB|-77.c -7k -7u -90 -80 -70|01232425|-1Q0Tk luM0 mPzO 8vWu 6kpu 4PXu xhcu|31e6",
+			"Asia/Jayapura|LMT WIT ACST|-9m.M -90 -9u|0121|-1uu9m.M sMMm.M L4nu|26e4",
+			"Asia/Jerusalem|JMT IST IDT IDDT|-2k.E -20 -30 -40|01212121212132121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-26Bek.E SyMk.E 5Rb0 10r0 1px0 10N0 1pz0 16p0 1jB0 16p0 1jx0 3LB0 Em0 or0 1cn0 1dB0 16n0 10O0 1ja0 1tC0 14o0 1cM0 1a00 11A0 1Na0 An0 1MP0 AJ0 1Kp0 LC0 1oo0 Wl0 EQN0 Db0 1fB0 Rb0 npB0 11z0 1C10 IL0 1s10 10n0 1o10 WL0 1zd0 On0 1ld0 11z0 1o10 14n0 1o10 14n0 1nd0 12n0 1nd0 Xz0 1q10 12n0 1hB0 1dX0 1ep0 1aL0 1eN0 17X0 1nf0 11z0 1tB0 19W0 1e10 17b0 1ep0 1gL0 18N0 1fz0 1eN0 17b0 1gq0 1gn0 19d0 1dz0 1c10 17X0 1hB0 1gn0 19d0 1dz0 1c10 17X0 1kp0 1dz0 1c10 1aL0 1eN0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0 10N0 1rz0 W10 1rz0 W10 1rz0 W10 1rz0 10N0 1oL0 10N0 1oL0|81e4",
+			"Asia/Kabul|AFT AFT|-40 -4u|01|-10Qs0|46e5",
+			"Asia/Kamchatka|LMT PETT PETT PETST PETST|-ay.A -b0 -c0 -d0 -c0|01232323232323232323232412323232323232323232323232323232323232412|-1SLKy.A ivXy.A 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qN0 WM0|18e4",
+			"Asia/Karachi|LMT IST IST KART PKT PKST|-4s.c -5u -6u -50 -50 -60|012134545454|-2xoss.c 1qOKW.c 7zX0 eup0 LqMu 1fy01 1cL0 dK0X 11b0 1610 1jX0|24e6",
+			"Asia/Urumqi|LMT XJT|-5O.k -60|01|-1GgtO.k|32e5",
+			"Asia/Kathmandu|LMT IST NPT|-5F.g -5u -5J|012|-21JhF.g 2EGMb.g|12e5",
+			"Asia/Khandyga|LMT YAKT YAKT YAKST YAKST VLAT VLAST VLAT YAKT|-92.d -80 -90 -a0 -90 -a0 -b0 -b0 -a0|01232323232323232323232412323232323232323232323232565656565656565782|-21Q92.d pAp2.d 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 qK0 yN0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 17V0 7zD0|66e2",
+			"Asia/Krasnoyarsk|LMT KRAT KRAT KRAST KRAST KRAT|-6b.q -60 -70 -80 -70 -80|012323232323232323232324123232323232323232323232323232323232323252|-21Hib.q prAb.q 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|10e5",
+			"Asia/Kuala_Lumpur|SMT MALT MALST MALT MALT JST MYT|-6T.p -70 -7k -7k -7u -90 -80|01234546|-2Bg6T.p 17anT.p 7hXE dM00 17bO 8Fyu 1so1u|71e5",
+			"Asia/Kuching|LMT BORT BORT BORTST JST MYT|-7l.k -7u -80 -8k -90 -80|01232323232323232425|-1KITl.k gDbP.k 6ynu AnE 1O0k AnE 1NAk AnE 1NAk AnE 1NAk AnE 1O0k AnE 1NAk AnE pAk 8Fz0 1so10|13e4",
+			"Asia/Macau|LMT MOT MOST CST|-7y.k -80 -90 -80|0121212121212121212121212121212121212121213|-2le7y.k 1XO34.k 1wn0 Rd0 1wn0 R9u 1wqu U10 1tz0 TVu 1tz0 17gu 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cJu 1cL0 1cN0 1fz0 1cN0 1cOu 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cJu 1cL0 1cN0 1fz0 1cN0 1cL0 KEp0|57e4",
+			"Asia/Magadan|LMT MAGT MAGT MAGST MAGST MAGT|-a3.c -a0 -b0 -c0 -b0 -c0|012323232323232323232324123232323232323232323232323232323232323251|-1Pca3.c eUo3.c 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|95e3",
+			"Asia/Makassar|LMT MMT WITA JST|-7V.A -7V.A -80 -90|01232|-21JjV.A vfc0 myLV.A 8ML0|15e5",
+			"Asia/Manila|PHT PHST JST|-80 -90 -90|010201010|-1kJI0 AL0 cK10 65X0 mXB0 vX0 VK10 1db0|24e6",
+			"Asia/Nicosia|LMT EET EEST|-2d.s -20 -30|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1Vc2d.s 2a3cd.s 1cL0 1qp0 Xz0 19B0 19X0 1fB0 1db0 1cp0 1cL0 1fB0 19X0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1o30 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|32e4",
+			"Asia/Novokuznetsk|LMT KRAT KRAT KRAST KRAST NOVST NOVT NOVT|-5M.M -60 -70 -80 -70 -70 -60 -70|012323232323232323232324123232323232323232323232323232323232325672|-1PctM.M eULM.M 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qN0 WM0 8Hz0|55e4",
+			"Asia/Novosibirsk|LMT NOVT NOVT NOVST NOVST|-5v.E -60 -70 -80 -70|0123232323232323232323241232341414141414141414141414141414141414121|-21Qnv.E pAFv.E 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 ml0 Os0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|15e5",
+			"Asia/Omsk|LMT OMST OMST OMSST OMSST OMST|-4R.u -50 -60 -70 -60 -70|012323232323232323232324123232323232323232323232323232323232323252|-224sR.u pMLR.u 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|12e5",
+			"Asia/Oral|LMT URAT URAT URAST URAT URAST ORAT ORAST ORAT|-3p.o -40 -50 -60 -60 -50 -40 -50 -50|012343232323232323251516767676767676767676767676768|-1Pc3p.o eUnp.o 23CL0 1db0 1cM0 1dc0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 2UK0 Fz0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 RW0|27e4",
+			"Asia/Pontianak|LMT PMT WIB JST WIB WITA WIB|-7h.k -7h.k -7u -90 -80 -80 -70|012324256|-2ua7h.k XE00 munL.k 8Rau 6kpu 4PXu xhcu Wqnu|23e4",
+			"Asia/Pyongyang|LMT KST JCST JST KST|-8n -8u -90 -90 -90|012341|-2um8n 97XR 12FXu jdA0 2Onc0|29e5",
+			"Asia/Qyzylorda|LMT KIZT KIZT KIZST KIZT QYZT QYZT QYZST|-4l.Q -40 -50 -60 -60 -50 -60 -70|012343232323232323232325676767676767676767676767676|-1Pc4l.Q eUol.Q 23CL0 1db0 1cM0 1dc0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 2UK0 dC0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0|73e4",
+			"Asia/Rangoon|RMT BURT JST MMT|-6o.E -6u -90 -6u|0123|-21Jio.E SmnS.E 7j9u|48e5",
+			"Asia/Sakhalin|LMT JCST JST SAKT SAKST SAKST SAKT|-9u.M -90 -90 -b0 -c0 -b0 -a0|0123434343434343434343435634343434343565656565656565656565656565636|-2AGVu.M 1iaMu.M je00 1qFa0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o10 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|58e4",
+			"Asia/Samarkand|LMT SAMT SAMT SAMST TAST UZST UZT|-4r.R -40 -50 -60 -60 -60 -50|01234323232323232323232356|-1Pc4r.R eUor.R 23CL0 1db0 1cM0 1dc0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 11x0 bf0|36e4",
+			"Asia/Seoul|LMT KST JCST JST KST KDT KDT|-8r.Q -8u -90 -90 -90 -9u -a0|01234151515151515146464|-2um8r.Q 97XV.Q 12FXu jjA0 kKo0 2I0u OL0 1FB0 Rb0 1qN0 TX0 1tB0 TX0 1tB0 TX0 1tB0 TX0 2ap0 12FBu 11A0 1o00 11A0|23e6",
+			"Asia/Singapore|SMT MALT MALST MALT MALT JST SGT SGT|-6T.p -70 -7k -7k -7u -90 -7u -80|012345467|-2Bg6T.p 17anT.p 7hXE dM00 17bO 8Fyu Mspu DTA0|56e5",
+			"Asia/Srednekolymsk|LMT MAGT MAGT MAGST MAGST MAGT SRET|-ae.Q -a0 -b0 -c0 -b0 -c0 -b0|012323232323232323232324123232323232323232323232323232323232323256|-1Pcae.Q eUoe.Q 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|35e2",
+			"Asia/Taipei|JWST JST CST CDT|-80 -90 -80 -90|01232323232323232323232323232323232323232|-1iw80 joM0 1yo0 Tz0 1ip0 1jX0 1cN0 11b0 1oN0 11b0 1oN0 11b0 1oN0 11b0 10N0 1BX0 10p0 1pz0 10p0 1pz0 10p0 1db0 1dd0 1db0 1cN0 1db0 1cN0 1db0 1cN0 1db0 1BB0 ML0 1Bd0 ML0 uq10 1db0 1cN0 1db0 97B0 AL0|74e5",
+			"Asia/Tashkent|LMT TAST TAST TASST TASST UZST UZT|-4B.b -50 -60 -70 -60 -60 -50|01232323232323232323232456|-1Pc4B.b eUnB.b 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 11y0 bf0|23e5",
+			"Asia/Tbilisi|TBMT TBIT TBIT TBIST TBIST GEST GET GET GEST|-2X.b -30 -40 -50 -40 -40 -30 -40 -50|0123232323232323232323245656565787878787878787878567|-1Pc2X.b 1jUnX.b WCL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 3y0 19f0 1cK0 1cL0 1cN0 1cL0 1cN0 1cL0 1cM0 1cL0 1fB0 3Nz0 11B0 1nX0 11B0 1qL0 WN0 1qL0 WN0 1qL0 11B0 1nX0 11B0 1nX0 11B0 An0 Os0 WM0|11e5",
+			"Asia/Tehran|LMT TMT IRST IRST IRDT IRDT|-3p.I -3p.I -3u -40 -50 -4u|01234325252525252525252525252525252525252525252525252525252525252525252525252525252525252525252525252|-2btDp.I 1d3c0 1huLT.I TXu 1pz0 sN0 vAu 1cL0 1dB0 1en0 pNB0 UL0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 64p0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0 1cN0 1dz0 1cp0 1dz0 1cp0 1dz0 1cp0 1dz0|14e6",
+			"Asia/Thimphu|LMT IST BTT|-5W.A -5u -60|012|-Su5W.A 1BGMs.A|79e3",
+			"Asia/Tokyo|JCST JST JDT|-90 -90 -a0|0121212121|-1iw90 pKq0 QL0 1lB0 13X0 1zB0 NX0 1zB0 NX0|38e6",
+			"Asia/Ulaanbaatar|LMT ULAT ULAT ULAST|-77.w -70 -80 -90|012323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-2APH7.w 2Uko7.w cKn0 1db0 1dd0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 6hD0 11z0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 kEp0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1fx0 1cP0 1cJ0 1cP0 1cJ0 1cP0 1cJ0|12e5",
+			"Asia/Ust-Nera|LMT YAKT YAKT MAGST MAGT MAGST MAGT MAGT VLAT VLAT|-9w.S -80 -90 -c0 -b0 -b0 -a0 -c0 -b0 -a0|0123434343434343434343456434343434343434343434343434343434343434789|-21Q9w.S pApw.S 23CL0 1d90 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 17V0 7zD0|65e2",
+			"Asia/Vladivostok|LMT VLAT VLAT VLAST VLAST VLAT|-8L.v -90 -a0 -b0 -a0 -b0|012323232323232323232324123232323232323232323232323232323232323252|-1SJIL.v itXL.v 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|60e4",
+			"Asia/Yakutsk|LMT YAKT YAKT YAKST YAKST YAKT|-8C.W -80 -90 -a0 -90 -a0|012323232323232323232324123232323232323232323232323232323232323252|-21Q8C.W pAoC.W 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|28e4",
+			"Asia/Yekaterinburg|LMT PMT SVET SVET SVEST SVEST YEKT YEKST YEKT|-42.x -3J.5 -40 -50 -60 -50 -50 -60 -60|0123434343434343434343435267676767676767676767676767676767676767686|-2ag42.x 7mQh.s qBvJ.5 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|14e5",
+			"Asia/Yerevan|LMT YERT YERT YERST YERST AMST AMT AMT AMST|-2W -30 -40 -50 -40 -40 -30 -40 -50|0123232323232323232323245656565657878787878787878787878787878787|-1Pc2W 1jUnW WCL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1am0 2r0 1cJ0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 3Fb0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0|13e5",
+			"Atlantic/Azores|HMT AZOT AZOST AZOMT AZOT AZOST WET|1S.w 20 10 0 10 0 0|01212121212121212121212121212121212121212121232123212321232121212121212121212121212121212121212121454545454545454545454545454545456545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-2ldW5.s aPX5.s Sp0 LX0 1vc0 Tc0 1uM0 SM0 1vc0 Tc0 1vc0 SM0 1vc0 6600 1co0 3E00 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 3I00 17c0 1cM0 1cM0 3Fc0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 1tA0 1cM0 1dc0 1400 gL0 IM0 s10 U00 dX0 Rc0 pd0 Rc0 gL0 Oo0 pd0 Rc0 gL0 Oo0 pd0 14o0 1cM0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 3Co0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 qIl0 1cM0 1fA0 1cM0 1cM0 1cN0 1cL0 1cN0 1cM0 1cM0 1cM0 1cM0 1cN0 1cL0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cL0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|25e4",
+			"Atlantic/Bermuda|LMT AST ADT|4j.i 40 30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1BnRE.G 1LTbE.G 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0|65e3",
+			"Atlantic/Canary|LMT CANT WET WEST|11.A 10 0 -10|01232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-1UtaW.o XPAW.o 1lAK0 1a10 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|54e4",
+			"Atlantic/Cape_Verde|LMT CVT CVST CVT|1y.4 20 10 10|01213|-2xomp.U 1qOMp.U 7zX0 1djf0|50e4",
+			"Atlantic/Faroe|LMT WET WEST|r.4 0 -10|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2uSnw.U 2Wgow.U 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|49e3",
+			"Atlantic/Madeira|FMT MADT MADST MADMT WET WEST|17.A 10 0 -10 0 -10|01212121212121212121212121212121212121212121232123212321232121212121212121212121212121212121212121454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-2ldWQ.o aPWQ.o Sp0 LX0 1vc0 Tc0 1uM0 SM0 1vc0 Tc0 1vc0 SM0 1vc0 6600 1co0 3E00 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 3I00 17c0 1cM0 1cM0 3Fc0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 1tA0 1cM0 1dc0 1400 gL0 IM0 s10 U00 dX0 Rc0 pd0 Rc0 gL0 Oo0 pd0 Rc0 gL0 Oo0 pd0 14o0 1cM0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 3Co0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 qIl0 1cM0 1fA0 1cM0 1cM0 1cN0 1cL0 1cN0 1cM0 1cM0 1cM0 1cM0 1cN0 1cL0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|27e4",
+			"Atlantic/Reykjavik|LMT IST ISST GMT|1s 10 0 0|012121212121212121212121212121212121212121212121212121212121212121213|-2uWmw mfaw 1Bd0 ML0 1LB0 Cn0 1LB0 3fX0 C10 HrX0 1cO0 LB0 1EL0 LA0 1C00 Oo0 1wo0 Rc0 1wo0 Rc0 1wo0 Rc0 1zc0 Oo0 1zc0 14o0 1lc0 14o0 1lc0 14o0 1o00 11A0 1lc0 14o0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1lc0 14o0 1o00 14o0|12e4",
+			"Atlantic/South_Georgia|GST|20|0||30",
+			"Atlantic/Stanley|SMT FKT FKST FKT FKST|3P.o 40 30 30 20|0121212121212134343212121212121212121212121212121212121212121212121212|-2kJw8.A 12bA8.A 19X0 1fB0 19X0 1ip0 19X0 1fB0 19X0 1fB0 19X0 1fB0 Cn0 1Cc10 WL0 1qL0 U10 1tz0 U10 1qM0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1tz0 U10 1tz0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1tz0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qL0 WN0 1qN0 U10 1wn0 Rd0 1wn0 U10 1tz0 U10 1tz0 U10 1tz0 U10 1tz0 U10 1wn0 U10 1tz0 U10 1tz0 U10|21e2",
+			"Australia/Sydney|AEST AEDT|-a0 -b0|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 14o0 1o00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1tA0 WM0 1tA0 U00 1tA0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 11A0 1o00 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|40e5",
+			"Australia/Adelaide|ACST ACDT|-9u -au|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lt xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 Oo0 1zc0 WM0 1qM0 Rc0 1zc0 U00 1tA0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|11e5",
+			"Australia/Brisbane|AEST AEDT|-a0 -b0|01010101010101010|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 H1A0 Oo0 1zc0 Oo0 1zc0 Oo0|20e5",
+			"Australia/Broken_Hill|ACST ACDT|-9u -au|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lt xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 14o0 1o00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1tA0 WM0 1tA0 U00 1tA0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|18e3",
+			"Australia/Currie|AEST AEDT|-a0 -b0|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-29E80 19X0 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1qM0 WM0 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1wo0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 11A0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 11A0 1o00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|746",
+			"Australia/Darwin|ACST ACDT|-9u -au|010101010|-293lt xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0|12e4",
+			"Australia/Eucla|ACWST ACWDT|-8J -9J|0101010101010101010|-293kI xcX 10jd0 yL0 1cN0 1cL0 1gSp0 Oo0 l5A0 Oo0 iJA0 G00 zU00 IM0 1qM0 11A0 1o00 11A0|368",
+			"Australia/Hobart|AEST AEDT|-a0 -b0|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-29E80 19X0 10jd0 yL0 1cN0 1cL0 1fB0 19X0 VfB0 1cM0 1o00 Rc0 1wo0 Rc0 1wo0 U00 1wo0 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 11A0 1qM0 WM0 1qM0 Oo0 1zc0 Oo0 1zc0 Oo0 1wo0 WM0 1tA0 WM0 1tA0 U00 1tA0 U00 1tA0 11A0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 11A0 1o00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|21e4",
+			"Australia/Lord_Howe|AEST LHST LHDT LHDT|-a0 -au -bu -b0|0121212121313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313131313|raC0 1zdu Rb0 1zd0 On0 1zd0 On0 1zd0 On0 1zd0 TXu 1qMu WLu 1tAu WLu 1tAu TXu 1tAu Onu 1zcu Onu 1zcu Onu 1zcu Rbu 1zcu Onu 1zcu Onu 1zcu 11zu 1o0u 11zu 1o0u 11zu 1o0u 11zu 1qMu WLu 11Au 1nXu 1qMu 11zu 1o0u 11zu 1o0u 11zu 1qMu WLu 1qMu 11zu 1o0u WLu 1qMu 14nu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1fzu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1cMu 1cLu 1fAu 1cLu 1cMu 1cLu 1cMu|347",
+			"Australia/Lindeman|AEST AEDT|-a0 -b0|010101010101010101010|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 H1A0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0|10",
+			"Australia/Melbourne|AEST AEDT|-a0 -b0|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101|-293lX xcX 10jd0 yL0 1cN0 1cL0 1fB0 19X0 17c10 LA0 1C00 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 U00 1qM0 WM0 1qM0 11A0 1tA0 U00 1tA0 U00 1tA0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 11A0 1o00 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 14o0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0|39e5",
+			"Australia/Perth|AWST AWDT|-80 -90|0101010101010101010|-293jX xcX 10jd0 yL0 1cN0 1cL0 1gSp0 Oo0 l5A0 Oo0 iJA0 G00 zU00 IM0 1qM0 11A0 1o00 11A0|18e5",
+			"CET|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00",
+			"CST6CDT|CST CDT CWT CPT|60 50 50 50|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261s0 1nX0 11B0 1nX0 SgN0 8x30 iw0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Pacific/Easter|EMT EAST EASST EAST EASST EAST|7h.s 70 60 60 50 50|012121212121212121212121212123434343434343434343434343434343434343434343434343434343434343434345|-1uSgG.w 1s4IG.w WL0 1zd0 On0 1ip0 11z0 1o10 11z0 1qN0 WL0 1ld0 14n0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 WL0 1qN0 1cL0 1cN0 11z0 1o10 11z0 1qN0 WL0 1fB0 19X0 1qN0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1ip0 1fz0 1fB0 11z0 1qN0 WL0 1qN0 WL0 1qN0 WL0 1qN0 11z0 1o10 11z0 1o10 11z0 1qN0 WL0 1qN0 17b0 1ip0 11z0 1o10 19X0 1fB0 1nX0 G10 1EL0 Op0 1zb0 Rd0 1wn0 Rd0 1wn0|30e2",
+			"EET|EET EEST|-20 -30|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|hDB0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00",
+			"EST|EST|50|0|",
+			"EST5EDT|EST EDT EWT EPT|50 40 40 40|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261t0 1nX0 11B0 1nX0 SgN0 8x40 iv0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Europe/Dublin|DMT IST GMT BST IST|p.l -y.D 0 -10 -10|01232323232324242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242|-2ax9y.D Rc0 1fzy.D 14M0 1fc0 1g00 1co0 1dc0 1co0 1oo0 1400 1dc0 19A0 1io0 1io0 WM0 1o00 14o0 1o00 17c0 1io0 17c0 1fA0 1a00 1lc0 17c0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1cM0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1io0 1qM0 Dc0 g5X0 14p0 1wn0 17d0 1io0 11A0 1o00 17c0 1fA0 1a00 1fA0 1cM0 1fA0 1a00 17c0 1fA0 1a00 1io0 17c0 1lc0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1a00 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1tA0 IM0 90o0 U00 1tA0 U00 1tA0 U00 1tA0 U00 1tA0 WM0 1qM0 WM0 1qM0 WM0 1tA0 U00 1tA0 U00 1tA0 11z0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 14o0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Etc/GMT+0|GMT|0|0|",
+			"Etc/GMT+1|GMT+1|10|0|",
+			"Etc/GMT+10|GMT+10|a0|0|",
+			"Etc/GMT+11|GMT+11|b0|0|",
+			"Etc/GMT+12|GMT+12|c0|0|",
+			"Etc/GMT+2|GMT+2|20|0|",
+			"Etc/GMT+3|GMT+3|30|0|",
+			"Etc/GMT+4|GMT+4|40|0|",
+			"Etc/GMT+5|GMT+5|50|0|",
+			"Etc/GMT+6|GMT+6|60|0|",
+			"Etc/GMT+7|GMT+7|70|0|",
+			"Etc/GMT+8|GMT+8|80|0|",
+			"Etc/GMT+9|GMT+9|90|0|",
+			"Etc/GMT-1|GMT-1|-10|0|",
+			"Etc/GMT-10|GMT-10|-a0|0|",
+			"Etc/GMT-11|GMT-11|-b0|0|",
+			"Etc/GMT-12|GMT-12|-c0|0|",
+			"Etc/GMT-13|GMT-13|-d0|0|",
+			"Etc/GMT-14|GMT-14|-e0|0|",
+			"Etc/GMT-2|GMT-2|-20|0|",
+			"Etc/GMT-3|GMT-3|-30|0|",
+			"Etc/GMT-4|GMT-4|-40|0|",
+			"Etc/GMT-5|GMT-5|-50|0|",
+			"Etc/GMT-6|GMT-6|-60|0|",
+			"Etc/GMT-7|GMT-7|-70|0|",
+			"Etc/GMT-8|GMT-8|-80|0|",
+			"Etc/GMT-9|GMT-9|-90|0|",
+			"Etc/UCT|UCT|0|0|",
+			"Etc/UTC|UTC|0|0|",
+			"Europe/Amsterdam|AMT NST NEST NET CEST CET|-j.w -1j.w -1k -k -20 -10|010101010101010101010101010101010101010101012323234545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545|-2aFcj.w 11b0 1iP0 11A0 1io0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1co0 1io0 1yo0 Pc0 1a00 1fA0 1Bc0 Mo0 1tc0 Uo0 1tA0 U00 1uo0 W00 1s00 VA0 1so0 Vc0 1sM0 UM0 1wo0 Rc0 1u00 Wo0 1rA0 W00 1s00 VA0 1sM0 UM0 1w00 fV0 BCX.w 1tA0 U00 1u00 Wo0 1sm0 601k WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|16e5",
+			"Europe/Andorra|WET CET CEST|0 -10 -20|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-UBA0 1xIN0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|79e3",
+			"Europe/Athens|AMT EET EEST CEST CET|-1y.Q -20 -30 -20 -10|012123434121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2a61x.Q CNbx.Q mn0 kU10 9b0 3Es0 Xa0 1fb0 1dd0 k3X0 Nz0 SCp0 1vc0 SO0 1cM0 1a00 1ao0 1fc0 1a10 1fG0 1cg0 1dX0 1bX0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|35e5",
+			"Europe/London|GMT BST BDST|0 -10 -20|0101010101010101010101010101010101010101010101010121212121210101210101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2axa0 Rc0 1fA0 14M0 1fc0 1g00 1co0 1dc0 1co0 1oo0 1400 1dc0 19A0 1io0 1io0 WM0 1o00 14o0 1o00 17c0 1io0 17c0 1fA0 1a00 1lc0 17c0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1cM0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1io0 1qM0 Dc0 2Rz0 Dc0 1zc0 Oo0 1zc0 Rc0 1wo0 17c0 1iM0 FA0 xB0 1fA0 1a00 14o0 bb0 LA0 xB0 Rc0 1wo0 11A0 1o00 17c0 1fA0 1a00 1fA0 1cM0 1fA0 1a00 17c0 1fA0 1a00 1io0 17c0 1lc0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1a00 1qM0 WM0 1qM0 11A0 1o00 WM0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1tA0 IM0 90o0 U00 1tA0 U00 1tA0 U00 1tA0 U00 1tA0 WM0 1qM0 WM0 1qM0 WM0 1tA0 U00 1tA0 U00 1tA0 11z0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1o00 14o0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|10e6",
+			"Europe/Belgrade|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-19RC0 3IP0 WM0 1fA0 1cM0 1cM0 1rc0 Qo0 1vmo0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Berlin|CET CEST CEMT|-10 -20 -30|01010101010101210101210101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 1cM0 kL0 Nc0 m10 WM0 1ao0 1cp0 dX0 jz0 Dd0 1io0 17c0 1fA0 1a00 1ehA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|41e5",
+			"Europe/Prague|CET CEST|-10 -20|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 16M0 1lc0 1tA0 17A0 11c0 1io0 17c0 1io0 17c0 1fc0 1ao0 1bNc0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|13e5",
+			"Europe/Brussels|WET CET CEST WEST|0 -10 -20 -10|0121212103030303030303030303030303030303030303030303212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2ehc0 3zX0 11c0 1iO0 11A0 1o00 11A0 my0 Ic0 1qM0 Rc0 1EM0 UM0 1u00 10o0 1io0 1io0 17c0 1a00 1fA0 1cM0 1cM0 1io0 17c0 1fA0 1a00 1io0 1a30 1io0 17c0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 y00 5Wn0 WM0 1fA0 1cM0 16M0 1iM0 16M0 1C00 Uo0 1eeo0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|21e5",
+			"Europe/Bucharest|BMT EET EEST|-1I.o -20 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1xApI.o 20LI.o RA0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1Axc0 On0 1fA0 1a10 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cK0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cL0 1cN0 1cL0 1fB0 1nX0 11E0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|19e5",
+			"Europe/Budapest|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1ip0 17b0 1op0 1tb0 Q2m0 3Ne0 WM0 1fA0 1cM0 1cM0 1oJ0 1dc0 1030 1fA0 1cM0 1cM0 1cM0 1cM0 1fA0 1a00 1iM0 1fA0 8Ha0 Rb0 1wN0 Rb0 1BB0 Lz0 1C20 LB0 SNX0 1a10 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|17e5",
+			"Europe/Zurich|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-19Lc0 11A0 1o00 11A0 1xG10 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|38e4",
+			"Europe/Chisinau|CMT BMT EET EEST CEST CET MSK MSD|-1T -1I.o -20 -30 -20 -10 -30 -40|0123232323232323232345454676767676767676767623232323232323232323232323232323232323232323232323232323232323232323232323232323232323232323232|-26jdT wGMa.A 20LI.o RA0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 27A0 2en0 39g0 WM0 1fA0 1cM0 V90 1t7z0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1ty0 2bD0 1cM0 1cK0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1nX0 11D0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|67e4",
+			"Europe/Copenhagen|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2azC0 Tz0 VuO0 60q0 WM0 1fA0 1cM0 1cM0 1cM0 S00 1HA0 Nc0 1C00 Dc0 1Nc0 Ao0 1h5A0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Gibraltar|GMT BST BDST CET CEST|0 -10 -20 -10 -20|010101010101010101010101010101010101010101010101012121212121010121010101010101010101034343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-2axa0 Rc0 1fA0 14M0 1fc0 1g00 1co0 1dc0 1co0 1oo0 1400 1dc0 19A0 1io0 1io0 WM0 1o00 14o0 1o00 17c0 1io0 17c0 1fA0 1a00 1lc0 17c0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1cM0 1io0 17c0 1fA0 1a00 1io0 17c0 1io0 17c0 1fA0 1a00 1io0 1qM0 Dc0 2Rz0 Dc0 1zc0 Oo0 1zc0 Rc0 1wo0 17c0 1iM0 FA0 xB0 1fA0 1a00 14o0 bb0 LA0 xB0 Rc0 1wo0 11A0 1o00 17c0 1fA0 1a00 1fA0 1cM0 1fA0 1a00 17c0 1fA0 1a00 1io0 17c0 1lc0 17c0 1fA0 10Jz0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|30e3",
+			"Europe/Helsinki|HMT EET EEST|-1D.N -20 -30|0121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-1WuND.N OULD.N 1dA0 1xGq0 1cM0 1cM0 1cM0 1cN0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Kaliningrad|CET CEST CET CEST MSK MSD EEST EET FET|-10 -20 -20 -30 -30 -40 -30 -20 -30|0101010101010232454545454545454545454676767676767676767676767676767676767676787|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 Am0 Lb0 1en0 op0 1pNz0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 1cJ0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|44e4",
+			"Europe/Kiev|KMT EET MSK CEST CET MSD EEST|-22.4 -20 -30 -20 -10 -40 -30|0123434252525252525252525256161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161|-1Pc22.4 eUo2.4 rnz0 2Hg0 WM0 1fA0 da0 1v4m0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 Db0 3220 1cK0 1cL0 1cN0 1cL0 1cN0 1cL0 1cQ0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|34e5",
+			"Europe/Lisbon|LMT WET WEST WEMT CET CEST|A.J 0 -10 -20 -10 -20|012121212121212121212121212121212121212121212321232123212321212121212121212121212121212121212121214121212121212121212121212121212124545454212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2ldXn.f aPWn.f Sp0 LX0 1vc0 Tc0 1uM0 SM0 1vc0 Tc0 1vc0 SM0 1vc0 6600 1co0 3E00 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 3I00 17c0 1cM0 1cM0 3Fc0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 1tA0 1cM0 1dc0 1400 gL0 IM0 s10 U00 dX0 Rc0 pd0 Rc0 gL0 Oo0 pd0 Rc0 gL0 Oo0 pd0 14o0 1cM0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 3Co0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 pvy0 1cM0 1cM0 1fA0 1cM0 1cM0 1cN0 1cL0 1cN0 1cM0 1cM0 1cM0 1cM0 1cN0 1cL0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|27e5",
+			"Europe/Luxembourg|LMT CET CEST WET WEST WEST WET|-o.A -10 -20 0 -10 -20 -10|0121212134343434343434343434343434343434343434343434565651212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2DG0o.A t6mo.A TB0 1nX0 Up0 1o20 11A0 rW0 CM0 1qP0 R90 1EO0 UK0 1u20 10m0 1ip0 1in0 17e0 19W0 1fB0 1db0 1cp0 1in0 17d0 1fz0 1a10 1in0 1a10 1in0 17f0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Dc0 vA0 60L0 WM0 1fA0 1cM0 17c0 1io0 16M0 1C00 Uo0 1eeo0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|54e4",
+			"Europe/Madrid|WET WEST WEMT CET CEST|0 -10 -20 -10 -20|01010101010101010101010121212121234343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343|-28dd0 11A0 1go0 19A0 1co0 1dA0 b1A0 18o0 3I00 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 iyo0 Rc0 18o0 1hc0 1io0 1a00 14o0 5aL0 MM0 1vc0 17A0 1i00 1bc0 1eo0 17d0 1in0 17A0 6hA0 10N0 XIL0 1a10 1in0 17d0 19X0 1cN0 1fz0 1a10 1fX0 1cp0 1cO0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|62e5",
+			"Europe/Malta|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2as10 M00 1cM0 1cM0 14o0 1o00 WM0 1qM0 17c0 1cM0 M3A0 5M20 WM0 1fA0 1cM0 1cM0 1cM0 16m0 1de0 1lc0 14m0 1lc0 WO0 1qM0 GTW0 On0 1C10 Lz0 1C10 Lz0 1EN0 Lz0 1C10 Lz0 1zd0 Oo0 1C00 On0 1cp0 1cM0 1lA0 Xc0 1qq0 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1o10 11z0 1iN0 19z0 1fB0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|42e4",
+			"Europe/Minsk|MMT EET MSK CEST CET MSD EEST FET|-1O -20 -30 -20 -10 -40 -30 -30|012343432525252525252525252616161616161616161616161616161616161616172|-1Pc1O eUnO qNX0 3gQ0 WM0 1fA0 1cM0 Al0 1tsn0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 3Fc0 1cN0 1cK0 1cM0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hy0|19e5",
+			"Europe/Monaco|PMT WET WEST WEMT CET CEST|-9.l 0 -10 -20 -10 -20|01212121212121212121212121212121212121212121212121232323232345454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-2nco9.l cNb9.l HA0 19A0 1iM0 11c0 1oo0 Wo0 1rc0 QM0 1EM0 UM0 1u00 10o0 1io0 1wo0 Rc0 1a00 1fA0 1cM0 1cM0 1io0 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Df0 2RV0 11z0 11B0 1ze0 WM0 1fA0 1cM0 1fa0 1aq0 16M0 1ekn0 1cL0 1fC0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|38e3",
+			"Europe/Moscow|MMT MMT MST MDST MSD MSK MSM EET EEST MSK|-2u.h -2v.j -3v.j -4v.j -40 -30 -50 -20 -30 -40|012132345464575454545454545454545458754545454545454545454545454545454545454595|-2ag2u.h 2pyW.W 1bA0 11X0 GN0 1Hb0 c20 imv.j 3DA0 dz0 15A0 c10 2q10 iM10 23CL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 IM0 rU0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|16e6",
+			"Europe/Paris|PMT WET WEST CEST CET WEMT|-9.l 0 -10 -20 -10 -20|0121212121212121212121212121212121212121212121212123434352543434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434343434|-2nco8.l cNb8.l HA0 19A0 1iM0 11c0 1oo0 Wo0 1rc0 QM0 1EM0 UM0 1u00 10o0 1io0 1wo0 Rc0 1a00 1fA0 1cM0 1cM0 1io0 17c0 1fA0 1a00 1io0 1a00 1io0 17c0 1fA0 1a00 1io0 17c0 1cM0 1cM0 1a00 1io0 1cM0 1cM0 1a00 1fA0 1io0 17c0 1cM0 1cM0 1a00 1fA0 1io0 1qM0 Df0 Ik0 5M30 WM0 1fA0 1cM0 Vx0 hB0 1aq0 16M0 1ekn0 1cL0 1fC0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|11e6",
+			"Europe/Riga|RMT LST EET MSK CEST CET MSD EEST|-1A.y -2A.y -20 -30 -20 -10 -40 -30|010102345454536363636363636363727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272727272|-25TzA.y 11A0 1iM0 ko0 gWm0 yDXA.y 2bX0 3fE0 WM0 1fA0 1cM0 1cM0 4m0 1sLy0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 1o00 11A0 1o00 11A0 1qM0 3oo0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|64e4",
+			"Europe/Rome|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2as10 M00 1cM0 1cM0 14o0 1o00 WM0 1qM0 17c0 1cM0 M3A0 5M20 WM0 1fA0 1cM0 16K0 1iO0 16m0 1de0 1lc0 14m0 1lc0 WO0 1qM0 GTW0 On0 1C10 Lz0 1C10 Lz0 1EN0 Lz0 1C10 Lz0 1zd0 Oo0 1C00 On0 1C10 Lz0 1zd0 On0 1C10 LA0 1C00 LA0 1zc0 Oo0 1C00 Oo0 1zc0 Oo0 1fC0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|39e5",
+			"Europe/Samara|LMT SAMT SAMT KUYT KUYST MSD MSK EEST KUYT SAMST SAMST|-3k.k -30 -40 -40 -50 -40 -30 -30 -30 -50 -40|012343434343434343435656782929292929292929292929292929292929292a12|-22WNk.k qHak.k bcn0 1Qqo0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 1cN0 8o0 14j0 1cL0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qN0 WM0|12e5",
+			"Europe/Simferopol|SMT EET MSK CEST CET MSD EEST MSK|-2g -20 -30 -20 -10 -40 -30 -40|012343432525252525252525252161616525252616161616161616161616161616161616172|-1Pc2g eUog rEn0 2qs0 WM0 1fA0 1cM0 3V0 1u0L0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1Q00 4eL0 1cL0 1cN0 1cL0 1cN0 dX0 WL0 1cN0 1cL0 1fB0 1o30 11B0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11z0 1nW0|33e4",
+			"Europe/Sofia|EET CET CEST EEST|-20 -10 -20 -30|01212103030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030303030|-168L0 WM0 1fA0 1cM0 1cM0 1cN0 1mKH0 1dd0 1fb0 1ap0 1fb0 1a20 1fy0 1a30 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cK0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 1nX0 11E0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|12e5",
+			"Europe/Stockholm|CET CEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2azC0 TB0 2yDe0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|15e5",
+			"Europe/Tallinn|TMT CET CEST EET MSK MSD EEST|-1D -10 -20 -20 -30 -40 -30|012103421212454545454545454546363636363636363636363636363636363636363636363636363636363636363636363636363636363636363636363|-26oND teD 11A0 1Ta0 4rXl KSLD 2FX0 2Jg0 WM0 1fA0 1cM0 18J0 1sTX0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o10 11A0 1qM0 5QM0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|41e4",
+			"Europe/Tirane|LMT CET CEST|-1j.k -10 -20|01212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2glBj.k 14pcj.k 5LC0 WM0 4M0 1fCK0 10n0 1op0 11z0 1pd0 11z0 1qN0 WL0 1qp0 Xb0 1qp0 Xb0 1qp0 11z0 1lB0 11z0 1qN0 11z0 1iN0 16n0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|42e4",
+			"Europe/Uzhgorod|CET CEST MSK MSD EET EEST|-10 -20 -30 -40 -20 -30|010101023232323232323232320454545454545454545454545454545454545454545454545454545454545454545454545454545454545454545454|-1cqL0 6i00 WM0 1fA0 1cM0 1ml0 1Cp0 1r3W0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1Q00 1Nf0 2pw0 1cL0 1cN0 1cL0 1cN0 1cL0 1cQ0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|11e4",
+			"Europe/Vienna|CET CEST|-10 -20|0101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 3KM0 14o0 LA00 6i00 WM0 1fA0 1cM0 1cM0 1cM0 400 2qM0 1a00 1cM0 1cM0 1io0 17c0 1gHa0 19X0 1cP0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|18e5",
+			"Europe/Vilnius|WMT KMT CET EET MSK CEST MSD EEST|-1o -1z.A -10 -20 -30 -20 -40 -30|012324525254646464646464646464647373737373737352537373737373737373737373737373737373737373737373737373737373737373737373|-293do 6ILM.o 1Ooz.A zz0 Mfd0 29W0 3is0 WM0 1fA0 1cM0 LV0 1tgL0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cN0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11B0 1o00 11A0 1qM0 8io0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|54e4",
+			"Europe/Volgograd|LMT TSAT STAT STAT VOLT VOLST VOLST VOLT MSD MSK MSK|-2V.E -30 -30 -40 -40 -50 -40 -30 -40 -30 -40|0123454545454545454546767489898989898989898989898989898989898989a9|-21IqV.E cLXV.E cEM0 1gqn0 Lco0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1fA0 1cM0 2pz0 1cJ0 1cQ0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 8Hz0|10e5",
+			"Europe/Warsaw|WMT CET CEST EET EEST|-1o -10 -20 -20 -30|012121234312121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121|-2ctdo 1LXo 11d0 1iO0 11A0 1o00 11A0 1on0 11A0 6zy0 HWP0 5IM0 WM0 1fA0 1cM0 1dz0 1mL0 1en0 15B0 1aq0 1nA0 11A0 1io0 17c0 1fA0 1a00 iDX0 LA0 1cM0 1cM0 1C00 Oo0 1cM0 1cM0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1C00 LA0 uso0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cN0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|17e5",
+			"Europe/Zaporozhye|CUT EET MSK CEST CET MSD EEST|-2k -20 -30 -20 -10 -40 -30|01234342525252525252525252526161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161|-1Pc2k eUok rdb0 2RE0 WM0 1fA0 8m0 1v9a0 1db0 1cN0 1db0 1cN0 1db0 1dd0 1cO0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cK0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cQ0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00|77e4",
+			"HST|HST|a0|0|",
+			"Indian/Chagos|LMT IOT IOT|-4N.E -50 -60|012|-2xosN.E 3AGLN.E|30e2",
+			"Indian/Christmas|CXT|-70|0||21e2",
+			"Indian/Cocos|CCT|-6u|0||596",
+			"Indian/Kerguelen|zzz TFT|0 -50|01|-MG00|130",
+			"Indian/Mahe|LMT SCT|-3F.M -40|01|-2yO3F.M|79e3",
+			"Indian/Maldives|MMT MVT|-4S -50|01|-olgS|35e4",
+			"Indian/Mauritius|LMT MUT MUST|-3O -40 -50|012121|-2xorO 34unO 14L0 12kr0 11z0|15e4",
+			"Indian/Reunion|LMT RET|-3F.Q -40|01|-2mDDF.Q|84e4",
+			"Pacific/Kwajalein|MHT KWAT MHT|-b0 c0 -c0|012|-AX0 W9X0|14e3",
+			"MET|MET MEST|-10 -20|01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-2aFe0 11d0 1iO0 11A0 1o00 11A0 Qrc0 6i00 WM0 1fA0 1cM0 1cM0 1cM0 16M0 1gMM0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00",
+			"MST|MST|70|0|",
+			"MST7MDT|MST MDT MWT MPT|70 60 60 60|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261r0 1nX0 11B0 1nX0 SgN0 8x20 ix0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Pacific/Chatham|CHAST CHAST CHADT|-cf -cJ -dJ|012121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212121212|-WqAf 1adef IM0 1C00 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Oo0 1zc0 Rc0 1zc0 Oo0 1qM0 14o0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1lc0 14o0 1lc0 14o0 1lc0 17c0 1io0 17c0 1io0 17c0 1io0 17c0 1io0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00|600",
+			"PST8PDT|PST PDT PWT PPT|80 70 70 70|010102301010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|-261q0 1nX0 11B0 1nX0 SgN0 8x10 iy0 QwN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1cN0 1cL0 1cN0 1cL0 s10 1Vz0 LB0 1BX0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1fz0 1a10 1fz0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 14p0 1lb0 14p0 1lb0 14p0 1nX0 11B0 1nX0 11B0 1nX0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Rd0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0 Op0 1zb0",
+			"Pacific/Apia|LMT WSST SST SDT WSDT WSST|bq.U bu b0 a0 -e0 -d0|01232345454545454545454545454545454545454545454545454545454|-2nDMx.4 1yW03.4 2rRbu 1ff0 1a00 CI0 AQ0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1io0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1a00 1fA0 1cM0 1fA0 1a00 1fA0 1a00|37e3",
+			"Pacific/Bougainville|PGT JST BST|-a0 -90 -b0|0102|-16Wy0 7CN0 2MQp0|18e4",
+			"Pacific/Chuuk|CHUT|-a0|0||49e3",
+			"Pacific/Efate|LMT VUT VUST|-bd.g -b0 -c0|0121212121212121212121|-2l9nd.g 2Szcd.g 1cL0 1oN0 10L0 1fB0 19X0 1fB0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1cN0 1cL0 1fB0 Lz0 1Nd0 An0|66e3",
+			"Pacific/Enderbury|PHOT PHOT PHOT|c0 b0 -d0|012|nIc0 B8n0|1",
+			"Pacific/Fakaofo|TKT TKT|b0 -d0|01|1Gfn0|483",
+			"Pacific/Fiji|LMT FJT FJST|-bT.I -c0 -d0|0121212121212121212121212121212121212121212121212121212121212121|-2bUzT.I 3m8NT.I LA0 1EM0 IM0 nJc0 LA0 1o00 Rc0 1wo0 Ao0 1Nc0 Ao0 1Q00 xz0 1SN0 uM0 1SM0 uM0 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0 1SM0 uM0 1VA0 s00 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0 1SM0 uM0 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0 1SM0 uM0 1VA0 s00 1VA0 s00 1VA0 uM0 1SM0 uM0 1SM0 uM0 1SM0 uM0|88e4",
+			"Pacific/Funafuti|TVT|-c0|0||45e2",
+			"Pacific/Galapagos|LMT ECT GALT|5W.o 50 60|012|-1yVS1.A 2dTz1.A|25e3",
+			"Pacific/Gambier|LMT GAMT|8X.M 90|01|-2jof0.c|125",
+			"Pacific/Guadalcanal|LMT SBT|-aD.M -b0|01|-2joyD.M|11e4",
+			"Pacific/Guam|GST ChST|-a0 -a0|01|1fpq0|17e4",
+			"Pacific/Honolulu|HST HDT HST|au 9u a0|010102|-1thLu 8x0 lef0 8Pz0 46p0|37e4",
+			"Pacific/Kiritimati|LINT LINT LINT|aE a0 -e0|012|nIaE B8nk|51e2",
+			"Pacific/Kosrae|KOST KOST|-b0 -c0|010|-AX0 1bdz0|66e2",
+			"Pacific/Majuro|MHT MHT|-b0 -c0|01|-AX0|28e3",
+			"Pacific/Marquesas|LMT MART|9i 9u|01|-2joeG|86e2",
+			"Pacific/Pago_Pago|LMT NST BST SST|bm.M b0 b0 b0|0123|-2nDMB.c 2gVzB.c EyM0|37e2",
+			"Pacific/Nauru|LMT NRT JST NRT|-b7.E -bu -90 -c0|01213|-1Xdn7.E PvzB.E 5RCu 1ouJu|10e3",
+			"Pacific/Niue|NUT NUT NUT|bk bu b0|012|-KfME 17y0a|12e2",
+			"Pacific/Norfolk|NMT NFT NFST NFT|-bc -bu -cu -b0|01213|-Kgbc W01G On0 1COp0|25e4",
+			"Pacific/Noumea|LMT NCT NCST|-b5.M -b0 -c0|01212121|-2l9n5.M 2EqM5.M xX0 1PB0 yn0 HeP0 Ao0|98e3",
+			"Pacific/Palau|PWT|-90|0||21e3",
+			"Pacific/Pitcairn|PNT PST|8u 80|01|18Vku|56",
+			"Pacific/Pohnpei|PONT|-b0|0||34e3",
+			"Pacific/Port_Moresby|PGT|-a0|0||25e4",
+			"Pacific/Rarotonga|CKT CKHST CKT|au 9u a0|012121212121212121212121212|lyWu IL0 1zcu Onu 1zcu Onu 1zcu Rbu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Onu 1zcu Rbu 1zcu Onu 1zcu Onu 1zcu Onu|13e3",
+			"Pacific/Tahiti|LMT TAHT|9W.g a0|01|-2joe1.I|18e4",
+			"Pacific/Tarawa|GILT|-c0|0||29e3",
+			"Pacific/Tongatapu|TOT TOT TOST|-ck -d0 -e0|01212121|-1aB0k 2n5dk 15A0 1wo0 xz0 1Q10 xz0|75e3",
+			"Pacific/Wake|WAKT|-c0|0||16e3",
+			"Pacific/Wallis|WFT|-c0|0||94",
+			"WET|WET WEST|0 -10|010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010|hDB0 1a00 1fA0 1cM0 1cM0 1cM0 1fA0 1a00 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1cM0 1fA0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00 11A0 1qM0 WM0 1qM0 WM0 1qM0 WM0 1qM0 11A0 1o00 11A0 1o00"
+		],
+		"links": [
+			"Africa/Abidjan|Africa/Bamako",
+			"Africa/Abidjan|Africa/Banjul",
+			"Africa/Abidjan|Africa/Conakry",
+			"Africa/Abidjan|Africa/Dakar",
+			"Africa/Abidjan|Africa/Freetown",
+			"Africa/Abidjan|Africa/Lome",
+			"Africa/Abidjan|Africa/Nouakchott",
+			"Africa/Abidjan|Africa/Ouagadougou",
+			"Africa/Abidjan|Africa/Sao_Tome",
+			"Africa/Abidjan|Africa/Timbuktu",
+			"Africa/Abidjan|Atlantic/St_Helena",
+			"Africa/Cairo|Egypt",
+			"Africa/Johannesburg|Africa/Maseru",
+			"Africa/Johannesburg|Africa/Mbabane",
+			"Africa/Khartoum|Africa/Juba",
+			"Africa/Lagos|Africa/Bangui",
+			"Africa/Lagos|Africa/Brazzaville",
+			"Africa/Lagos|Africa/Douala",
+			"Africa/Lagos|Africa/Kinshasa",
+			"Africa/Lagos|Africa/Libreville",
+			"Africa/Lagos|Africa/Luanda",
+			"Africa/Lagos|Africa/Malabo",
+			"Africa/Lagos|Africa/Niamey",
+			"Africa/Lagos|Africa/Porto-Novo",
+			"Africa/Maputo|Africa/Blantyre",
+			"Africa/Maputo|Africa/Bujumbura",
+			"Africa/Maputo|Africa/Gaborone",
+			"Africa/Maputo|Africa/Harare",
+			"Africa/Maputo|Africa/Kigali",
+			"Africa/Maputo|Africa/Lubumbashi",
+			"Africa/Maputo|Africa/Lusaka",
+			"Africa/Nairobi|Africa/Addis_Ababa",
+			"Africa/Nairobi|Africa/Asmara",
+			"Africa/Nairobi|Africa/Asmera",
+			"Africa/Nairobi|Africa/Dar_es_Salaam",
+			"Africa/Nairobi|Africa/Djibouti",
+			"Africa/Nairobi|Africa/Kampala",
+			"Africa/Nairobi|Africa/Mogadishu",
+			"Africa/Nairobi|Indian/Antananarivo",
+			"Africa/Nairobi|Indian/Comoro",
+			"Africa/Nairobi|Indian/Mayotte",
+			"Africa/Tripoli|Libya",
+			"America/Adak|America/Atka",
+			"America/Adak|US/Aleutian",
+			"America/Anchorage|US/Alaska",
+			"America/Argentina/Buenos_Aires|America/Buenos_Aires",
+			"America/Argentina/Catamarca|America/Argentina/ComodRivadavia",
+			"America/Argentina/Catamarca|America/Catamarca",
+			"America/Argentina/Cordoba|America/Cordoba",
+			"America/Argentina/Cordoba|America/Rosario",
+			"America/Argentina/Jujuy|America/Jujuy",
+			"America/Argentina/Mendoza|America/Mendoza",
+			"America/Atikokan|America/Coral_Harbour",
+			"America/Chicago|US/Central",
+			"America/Curacao|America/Aruba",
+			"America/Curacao|America/Kralendijk",
+			"America/Curacao|America/Lower_Princes",
+			"America/Denver|America/Shiprock",
+			"America/Denver|Navajo",
+			"America/Denver|US/Mountain",
+			"America/Detroit|US/Michigan",
+			"America/Edmonton|Canada/Mountain",
+			"America/Fort_Wayne|America/Indiana/Indianapolis",
+			"America/Fort_Wayne|America/Indianapolis",
+			"America/Fort_Wayne|US/East-Indiana",
+			"America/Halifax|Canada/Atlantic",
+			"America/Havana|Cuba",
+			"America/Indiana/Knox|America/Knox_IN",
+			"America/Indiana/Knox|US/Indiana-Starke",
+			"America/Jamaica|Jamaica",
+			"America/Kentucky/Louisville|America/Louisville",
+			"America/Los_Angeles|US/Pacific",
+			"America/Los_Angeles|US/Pacific-New",
+			"America/Manaus|Brazil/West",
+			"America/Mazatlan|Mexico/BajaSur",
+			"America/Mexico_City|Mexico/General",
+			"America/New_York|US/Eastern",
+			"America/Noronha|Brazil/DeNoronha",
+			"America/Phoenix|US/Arizona",
+			"America/Port_of_Spain|America/Anguilla",
+			"America/Port_of_Spain|America/Antigua",
+			"America/Port_of_Spain|America/Dominica",
+			"America/Port_of_Spain|America/Grenada",
+			"America/Port_of_Spain|America/Guadeloupe",
+			"America/Port_of_Spain|America/Marigot",
+			"America/Port_of_Spain|America/Montserrat",
+			"America/Port_of_Spain|America/St_Barthelemy",
+			"America/Port_of_Spain|America/St_Kitts",
+			"America/Port_of_Spain|America/St_Lucia",
+			"America/Port_of_Spain|America/St_Thomas",
+			"America/Port_of_Spain|America/St_Vincent",
+			"America/Port_of_Spain|America/Tortola",
+			"America/Port_of_Spain|America/Virgin",
+			"America/Regina|Canada/East-Saskatchewan",
+			"America/Regina|Canada/Saskatchewan",
+			"America/Rio_Branco|America/Porto_Acre",
+			"America/Rio_Branco|Brazil/Acre",
+			"America/Santiago|Chile/Continental",
+			"America/Sao_Paulo|Brazil/East",
+			"America/St_Johns|Canada/Newfoundland",
+			"America/Tijuana|America/Ensenada",
+			"America/Tijuana|Mexico/BajaNorte",
+			"America/Toronto|America/Montreal",
+			"America/Toronto|Canada/Eastern",
+			"America/Vancouver|Canada/Pacific",
+			"America/Whitehorse|Canada/Yukon",
+			"America/Winnipeg|Canada/Central",
+			"Asia/Ashgabat|Asia/Ashkhabad",
+			"Asia/Bangkok|Asia/Phnom_Penh",
+			"Asia/Bangkok|Asia/Vientiane",
+			"Asia/Dhaka|Asia/Dacca",
+			"Asia/Dubai|Asia/Muscat",
+			"Asia/Ho_Chi_Minh|Asia/Saigon",
+			"Asia/Hong_Kong|Hongkong",
+			"Asia/Jerusalem|Asia/Tel_Aviv",
+			"Asia/Jerusalem|Israel",
+			"Asia/Kathmandu|Asia/Katmandu",
+			"Asia/Kolkata|Asia/Calcutta",
+			"Asia/Macau|Asia/Macao",
+			"Asia/Makassar|Asia/Ujung_Pandang",
+			"Asia/Nicosia|Europe/Nicosia",
+			"Asia/Qatar|Asia/Bahrain",
+			"Asia/Riyadh|Asia/Aden",
+			"Asia/Riyadh|Asia/Kuwait",
+			"Asia/Seoul|ROK",
+			"Asia/Shanghai|Asia/Chongqing",
+			"Asia/Shanghai|Asia/Chungking",
+			"Asia/Shanghai|Asia/Harbin",
+			"Asia/Shanghai|PRC",
+			"Asia/Singapore|Singapore",
+			"Asia/Taipei|ROC",
+			"Asia/Tehran|Iran",
+			"Asia/Thimphu|Asia/Thimbu",
+			"Asia/Tokyo|Japan",
+			"Asia/Ulaanbaatar|Asia/Ulan_Bator",
+			"Asia/Urumqi|Asia/Kashgar",
+			"Atlantic/Faroe|Atlantic/Faeroe",
+			"Atlantic/Reykjavik|Iceland",
+			"Australia/Adelaide|Australia/South",
+			"Australia/Brisbane|Australia/Queensland",
+			"Australia/Broken_Hill|Australia/Yancowinna",
+			"Australia/Darwin|Australia/North",
+			"Australia/Hobart|Australia/Tasmania",
+			"Australia/Lord_Howe|Australia/LHI",
+			"Australia/Melbourne|Australia/Victoria",
+			"Australia/Perth|Australia/West",
+			"Australia/Sydney|Australia/ACT",
+			"Australia/Sydney|Australia/Canberra",
+			"Australia/Sydney|Australia/NSW",
+			"Etc/GMT+0|Etc/GMT",
+			"Etc/GMT+0|Etc/GMT-0",
+			"Etc/GMT+0|Etc/GMT0",
+			"Etc/GMT+0|Etc/Greenwich",
+			"Etc/GMT+0|GMT",
+			"Etc/GMT+0|GMT+0",
+			"Etc/GMT+0|GMT-0",
+			"Etc/GMT+0|GMT0",
+			"Etc/GMT+0|Greenwich",
+			"Etc/UCT|UCT",
+			"Etc/UTC|Etc/Universal",
+			"Etc/UTC|Etc/Zulu",
+			"Etc/UTC|UTC",
+			"Etc/UTC|Universal",
+			"Etc/UTC|Zulu",
+			"Europe/Belgrade|Europe/Ljubljana",
+			"Europe/Belgrade|Europe/Podgorica",
+			"Europe/Belgrade|Europe/Sarajevo",
+			"Europe/Belgrade|Europe/Skopje",
+			"Europe/Belgrade|Europe/Zagreb",
+			"Europe/Chisinau|Europe/Tiraspol",
+			"Europe/Dublin|Eire",
+			"Europe/Helsinki|Europe/Mariehamn",
+			"Europe/Istanbul|Asia/Istanbul",
+			"Europe/Istanbul|Turkey",
+			"Europe/Lisbon|Portugal",
+			"Europe/London|Europe/Belfast",
+			"Europe/London|Europe/Guernsey",
+			"Europe/London|Europe/Isle_of_Man",
+			"Europe/London|Europe/Jersey",
+			"Europe/London|GB",
+			"Europe/London|GB-Eire",
+			"Europe/Moscow|W-SU",
+			"Europe/Oslo|Arctic/Longyearbyen",
+			"Europe/Oslo|Atlantic/Jan_Mayen",
+			"Europe/Prague|Europe/Bratislava",
+			"Europe/Rome|Europe/San_Marino",
+			"Europe/Rome|Europe/Vatican",
+			"Europe/Warsaw|Poland",
+			"Europe/Zurich|Europe/Busingen",
+			"Europe/Zurich|Europe/Vaduz",
+			"Pacific/Auckland|Antarctica/McMurdo",
+			"Pacific/Auckland|Antarctica/South_Pole",
+			"Pacific/Auckland|NZ",
+			"Pacific/Chatham|NZ-CHAT",
+			"Pacific/Chuuk|Pacific/Truk",
+			"Pacific/Chuuk|Pacific/Yap",
+			"Pacific/Easter|Chile/EasterIsland",
+			"Pacific/Guam|Pacific/Saipan",
+			"Pacific/Honolulu|Pacific/Johnston",
+			"Pacific/Honolulu|US/Hawaii",
+			"Pacific/Kwajalein|Kwajalein",
+			"Pacific/Pago_Pago|Pacific/Midway",
+			"Pacific/Pago_Pago|Pacific/Samoa",
+			"Pacific/Pago_Pago|US/Samoa",
+			"Pacific/Pohnpei|Pacific/Ponape"
+		]
+	});
+
+
+	return moment;
+}));
\ No newline at end of file
diff --git a/common/libs/js/moment.js b/common/libs/js/moment.js
new file mode 100644
index 000000000..7299fa45c
--- /dev/null
+++ b/common/libs/js/moment.js
@@ -0,0 +1,3606 @@
+//! moment.js
+//! version : 2.11.2
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+
+;(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    global.moment = factory()
+}(this, function () { 'use strict';
+
+    var hookCallback;
+
+    function utils_hooks__hooks () {
+        return hookCallback.apply(null, arguments);
+    }
+
+    // This is done to register the method called with moment()
+    // without creating circular dependencies.
+    function setHookCallback (callback) {
+        hookCallback = callback;
+    }
+
+    function isArray(input) {
+        return Object.prototype.toString.call(input) === '[object Array]';
+    }
+
+    function isDate(input) {
+        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+    }
+
+    function map(arr, fn) {
+        var res = [], i;
+        for (i = 0; i < arr.length; ++i) {
+            res.push(fn(arr[i], i));
+        }
+        return res;
+    }
+
+    function hasOwnProp(a, b) {
+        return Object.prototype.hasOwnProperty.call(a, b);
+    }
+
+    function extend(a, b) {
+        for (var i in b) {
+            if (hasOwnProp(b, i)) {
+                a[i] = b[i];
+            }
+        }
+
+        if (hasOwnProp(b, 'toString')) {
+            a.toString = b.toString;
+        }
+
+        if (hasOwnProp(b, 'valueOf')) {
+            a.valueOf = b.valueOf;
+        }
+
+        return a;
+    }
+
+    function create_utc__createUTC (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, true).utc();
+    }
+
+    function defaultParsingFlags() {
+        // We need to deep clone this object.
+        return {
+            empty           : false,
+            unusedTokens    : [],
+            unusedInput     : [],
+            overflow        : -2,
+            charsLeftOver   : 0,
+            nullInput       : false,
+            invalidMonth    : null,
+            invalidFormat   : false,
+            userInvalidated : false,
+            iso             : false
+        };
+    }
+
+    function getParsingFlags(m) {
+        if (m._pf == null) {
+            m._pf = defaultParsingFlags();
+        }
+        return m._pf;
+    }
+
+    function valid__isValid(m) {
+        if (m._isValid == null) {
+            var flags = getParsingFlags(m);
+            m._isValid = !isNaN(m._d.getTime()) &&
+                flags.overflow < 0 &&
+                !flags.empty &&
+                !flags.invalidMonth &&
+                !flags.invalidWeekday &&
+                !flags.nullInput &&
+                !flags.invalidFormat &&
+                !flags.userInvalidated;
+
+            if (m._strict) {
+                m._isValid = m._isValid &&
+                    flags.charsLeftOver === 0 &&
+                    flags.unusedTokens.length === 0 &&
+                    flags.bigHour === undefined;
+            }
+        }
+        return m._isValid;
+    }
+
+    function valid__createInvalid (flags) {
+        var m = create_utc__createUTC(NaN);
+        if (flags != null) {
+            extend(getParsingFlags(m), flags);
+        }
+        else {
+            getParsingFlags(m).userInvalidated = true;
+        }
+
+        return m;
+    }
+
+    function isUndefined(input) {
+        return input === void 0;
+    }
+
+    // Plugins that add properties should also add the key here (null value),
+    // so we can properly clone ourselves.
+    var momentProperties = utils_hooks__hooks.momentProperties = [];
+
+    function copyConfig(to, from) {
+        var i, prop, val;
+
+        if (!isUndefined(from._isAMomentObject)) {
+            to._isAMomentObject = from._isAMomentObject;
+        }
+        if (!isUndefined(from._i)) {
+            to._i = from._i;
+        }
+        if (!isUndefined(from._f)) {
+            to._f = from._f;
+        }
+        if (!isUndefined(from._l)) {
+            to._l = from._l;
+        }
+        if (!isUndefined(from._strict)) {
+            to._strict = from._strict;
+        }
+        if (!isUndefined(from._tzm)) {
+            to._tzm = from._tzm;
+        }
+        if (!isUndefined(from._isUTC)) {
+            to._isUTC = from._isUTC;
+        }
+        if (!isUndefined(from._offset)) {
+            to._offset = from._offset;
+        }
+        if (!isUndefined(from._pf)) {
+            to._pf = getParsingFlags(from);
+        }
+        if (!isUndefined(from._locale)) {
+            to._locale = from._locale;
+        }
+
+        if (momentProperties.length > 0) {
+            for (i in momentProperties) {
+                prop = momentProperties[i];
+                val = from[prop];
+                if (!isUndefined(val)) {
+                    to[prop] = val;
+                }
+            }
+        }
+
+        return to;
+    }
+
+    var updateInProgress = false;
+
+    // Moment prototype object
+    function Moment(config) {
+        copyConfig(this, config);
+        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
+        // Prevent infinite loop in case updateOffset creates new moment
+        // objects.
+        if (updateInProgress === false) {
+            updateInProgress = true;
+            utils_hooks__hooks.updateOffset(this);
+            updateInProgress = false;
+        }
+    }
+
+    function isMoment (obj) {
+        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
+    }
+
+    function absFloor (number) {
+        if (number < 0) {
+            return Math.ceil(number);
+        } else {
+            return Math.floor(number);
+        }
+    }
+
+    function toInt(argumentForCoercion) {
+        var coercedNumber = +argumentForCoercion,
+            value = 0;
+
+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+            value = absFloor(coercedNumber);
+        }
+
+        return value;
+    }
+
+    // compare two arrays, return the number of differences
+    function compareArrays(array1, array2, dontConvert) {
+        var len = Math.min(array1.length, array2.length),
+            lengthDiff = Math.abs(array1.length - array2.length),
+            diffs = 0,
+            i;
+        for (i = 0; i < len; i++) {
+            if ((dontConvert && array1[i] !== array2[i]) ||
+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+                diffs++;
+            }
+        }
+        return diffs + lengthDiff;
+    }
+
+    function Locale() {
+    }
+
+    // internal storage for locale config files
+    var locales = {};
+    var globalLocale;
+
+    function normalizeLocale(key) {
+        return key ? key.toLowerCase().replace('_', '-') : key;
+    }
+
+    // pick the locale from the array
+    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+    function chooseLocale(names) {
+        var i = 0, j, next, locale, split;
+
+        while (i < names.length) {
+            split = normalizeLocale(names[i]).split('-');
+            j = split.length;
+            next = normalizeLocale(names[i + 1]);
+            next = next ? next.split('-') : null;
+            while (j > 0) {
+                locale = loadLocale(split.slice(0, j).join('-'));
+                if (locale) {
+                    return locale;
+                }
+                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+                    //the next array item is better than a shallower substring of this one
+                    break;
+                }
+                j--;
+            }
+            i++;
+        }
+        return null;
+    }
+
+    function loadLocale(name) {
+        var oldLocale = null;
+        // TODO: Find a better way to register and load all the locales in Node
+        if (!locales[name] && (typeof module !== 'undefined') &&
+                module && module.exports) {
+            try {
+                oldLocale = globalLocale._abbr;
+                require('./locale/' + name);
+                // because defineLocale currently also sets the global locale, we
+                // want to undo that for lazy loaded locales
+                locale_locales__getSetGlobalLocale(oldLocale);
+            } catch (e) { }
+        }
+        return locales[name];
+    }
+
+    // This function will load locale and then set the global locale.  If
+    // no arguments are passed in, it will simply return the current global
+    // locale key.
+    function locale_locales__getSetGlobalLocale (key, values) {
+        var data;
+        if (key) {
+            if (isUndefined(values)) {
+                data = locale_locales__getLocale(key);
+            }
+            else {
+                data = defineLocale(key, values);
+            }
+
+            if (data) {
+                // moment.duration._locale = moment._locale = data;
+                globalLocale = data;
+            }
+        }
+
+        return globalLocale._abbr;
+    }
+
+    function defineLocale (name, values) {
+        if (values !== null) {
+            values.abbr = name;
+            locales[name] = locales[name] || new Locale();
+            locales[name].set(values);
+
+            // backwards compat for now: also set the locale
+            locale_locales__getSetGlobalLocale(name);
+
+            return locales[name];
+        } else {
+            // useful for testing
+            delete locales[name];
+            return null;
+        }
+    }
+
+    // returns locale data
+    function locale_locales__getLocale (key) {
+        var locale;
+
+        if (key && key._locale && key._locale._abbr) {
+            key = key._locale._abbr;
+        }
+
+        if (!key) {
+            return globalLocale;
+        }
+
+        if (!isArray(key)) {
+            //short-circuit everything else
+            locale = loadLocale(key);
+            if (locale) {
+                return locale;
+            }
+            key = [key];
+        }
+
+        return chooseLocale(key);
+    }
+
+    var aliases = {};
+
+    function addUnitAlias (unit, shorthand) {
+        var lowerCase = unit.toLowerCase();
+        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+    }
+
+    function normalizeUnits(units) {
+        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
+    }
+
+    function normalizeObjectUnits(inputObject) {
+        var normalizedInput = {},
+            normalizedProp,
+            prop;
+
+        for (prop in inputObject) {
+            if (hasOwnProp(inputObject, prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = inputObject[prop];
+                }
+            }
+        }
+
+        return normalizedInput;
+    }
+
+    function isFunction(input) {
+        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
+    }
+
+    function makeGetSet (unit, keepTime) {
+        return function (value) {
+            if (value != null) {
+                get_set__set(this, unit, value);
+                utils_hooks__hooks.updateOffset(this, keepTime);
+                return this;
+            } else {
+                return get_set__get(this, unit);
+            }
+        };
+    }
+
+    function get_set__get (mom, unit) {
+        return mom.isValid() ?
+            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
+    }
+
+    function get_set__set (mom, unit, value) {
+        if (mom.isValid()) {
+            mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
+        }
+    }
+
+    // MOMENTS
+
+    function getSet (units, value) {
+        var unit;
+        if (typeof units === 'object') {
+            for (unit in units) {
+                this.set(unit, units[unit]);
+            }
+        } else {
+            units = normalizeUnits(units);
+            if (isFunction(this[units])) {
+                return this[units](value);
+            }
+        }
+        return this;
+    }
+
+    function zeroFill(number, targetLength, forceSign) {
+        var absNumber = '' + Math.abs(number),
+            zerosToFill = targetLength - absNumber.length,
+            sign = number >= 0;
+        return (sign ? (forceSign ? '+' : '') : '-') +
+            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
+    }
+
+    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
+
+    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
+
+    var formatFunctions = {};
+
+    var formatTokenFunctions = {};
+
+    // token:    'M'
+    // padded:   ['MM', 2]
+    // ordinal:  'Mo'
+    // callback: function () { this.month() + 1 }
+    function addFormatToken (token, padded, ordinal, callback) {
+        var func = callback;
+        if (typeof callback === 'string') {
+            func = function () {
+                return this[callback]();
+            };
+        }
+        if (token) {
+            formatTokenFunctions[token] = func;
+        }
+        if (padded) {
+            formatTokenFunctions[padded[0]] = function () {
+                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+            };
+        }
+        if (ordinal) {
+            formatTokenFunctions[ordinal] = function () {
+                return this.localeData().ordinal(func.apply(this, arguments), token);
+            };
+        }
+    }
+
+    function removeFormattingTokens(input) {
+        if (input.match(/\[[\s\S]/)) {
+            return input.replace(/^\[|\]$/g, '');
+        }
+        return input.replace(/\\/g, '');
+    }
+
+    function makeFormatFunction(format) {
+        var array = format.match(formattingTokens), i, length;
+
+        for (i = 0, length = array.length; i < length; i++) {
+            if (formatTokenFunctions[array[i]]) {
+                array[i] = formatTokenFunctions[array[i]];
+            } else {
+                array[i] = removeFormattingTokens(array[i]);
+            }
+        }
+
+        return function (mom) {
+            var output = '';
+            for (i = 0; i < length; i++) {
+                output += array[i] instanceof Function ? array[i].call(mom, format) : array[i];
+            }
+            return output;
+        };
+    }
+
+    // format date using native date object
+    function formatMoment(m, format) {
+        if (!m.isValid()) {
+            return m.localeData().invalidDate();
+        }
+
+        format = expandFormat(format, m.localeData());
+        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
+
+        return formatFunctions[format](m);
+    }
+
+    function expandFormat(format, locale) {
+        var i = 5;
+
+        function replaceLongDateFormatTokens(input) {
+            return locale.longDateFormat(input) || input;
+        }
+
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
+            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
+        }
+
+        return format;
+    }
+
+    var match1         = /\d/;            //       0 - 9
+    var match2         = /\d\d/;          //      00 - 99
+    var match3         = /\d{3}/;         //     000 - 999
+    var match4         = /\d{4}/;         //    0000 - 9999
+    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
+    var match1to2      = /\d\d?/;         //       0 - 99
+    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
+    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
+    var match1to3      = /\d{1,3}/;       //       0 - 999
+    var match1to4      = /\d{1,4}/;       //       0 - 9999
+    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
+
+    var matchUnsigned  = /\d+/;           //       0 - inf
+    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
+
+    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
+    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
+
+    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
+
+    // any word (or two) characters or numbers including two/three word month in arabic.
+    // includes scottish gaelic two word and hyphenated months
+    var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
+
+
+    var regexes = {};
+
+    function addRegexToken (token, regex, strictRegex) {
+        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
+            return (isStrict && strictRegex) ? strictRegex : regex;
+        };
+    }
+
+    function getParseRegexForToken (token, config) {
+        if (!hasOwnProp(regexes, token)) {
+            return new RegExp(unescapeFormat(token));
+        }
+
+        return regexes[token](config._strict, config._locale);
+    }
+
+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+    function unescapeFormat(s) {
+        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+            return p1 || p2 || p3 || p4;
+        }));
+    }
+
+    function regexEscape(s) {
+        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+
+    var tokens = {};
+
+    function addParseToken (token, callback) {
+        var i, func = callback;
+        if (typeof token === 'string') {
+            token = [token];
+        }
+        if (typeof callback === 'number') {
+            func = function (input, array) {
+                array[callback] = toInt(input);
+            };
+        }
+        for (i = 0; i < token.length; i++) {
+            tokens[token[i]] = func;
+        }
+    }
+
+    function addWeekParseToken (token, callback) {
+        addParseToken(token, function (input, array, config, token) {
+            config._w = config._w || {};
+            callback(input, config._w, config, token);
+        });
+    }
+
+    function addTimeToArrayFromToken(token, input, config) {
+        if (input != null && hasOwnProp(tokens, token)) {
+            tokens[token](input, config._a, config, token);
+        }
+    }
+
+    var YEAR = 0;
+    var MONTH = 1;
+    var DATE = 2;
+    var HOUR = 3;
+    var MINUTE = 4;
+    var SECOND = 5;
+    var MILLISECOND = 6;
+    var WEEK = 7;
+    var WEEKDAY = 8;
+
+    function daysInMonth(year, month) {
+        return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+    }
+
+    // FORMATTING
+
+    addFormatToken('M', ['MM', 2], 'Mo', function () {
+        return this.month() + 1;
+    });
+
+    addFormatToken('MMM', 0, 0, function (format) {
+        return this.localeData().monthsShort(this, format);
+    });
+
+    addFormatToken('MMMM', 0, 0, function (format) {
+        return this.localeData().months(this, format);
+    });
+
+    // ALIASES
+
+    addUnitAlias('month', 'M');
+
+    // PARSING
+
+    addRegexToken('M',    match1to2);
+    addRegexToken('MM',   match1to2, match2);
+    addRegexToken('MMM',  function (isStrict, locale) {
+        return locale.monthsShortRegex(isStrict);
+    });
+    addRegexToken('MMMM', function (isStrict, locale) {
+        return locale.monthsRegex(isStrict);
+    });
+
+    addParseToken(['M', 'MM'], function (input, array) {
+        array[MONTH] = toInt(input) - 1;
+    });
+
+    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+        var month = config._locale.monthsParse(input, token, config._strict);
+        // if we didn't find a month name, mark the date as invalid.
+        if (month != null) {
+            array[MONTH] = month;
+        } else {
+            getParsingFlags(config).invalidMonth = input;
+        }
+    });
+
+    // LOCALES
+
+    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/;
+    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
+    function localeMonths (m, format) {
+        return isArray(this._months) ? this._months[m.month()] :
+            this._months[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
+    }
+
+    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
+    function localeMonthsShort (m, format) {
+        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
+            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
+    }
+
+    function localeMonthsParse (monthName, format, strict) {
+        var i, mom, regex;
+
+        if (!this._monthsParse) {
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+        }
+
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = create_utc__createUTC([2000, i]);
+            if (strict && !this._longMonthsParse[i]) {
+                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
+                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
+            }
+            if (!strict && !this._monthsParse[i]) {
+                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (!strict && this._monthsParse[i].test(monthName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function setMonth (mom, value) {
+        var dayOfMonth;
+
+        if (!mom.isValid()) {
+            // No op
+            return mom;
+        }
+
+        // TODO: Move this out of here!
+        if (typeof value === 'string') {
+            value = mom.localeData().monthsParse(value);
+            // TODO: Another silent failure?
+            if (typeof value !== 'number') {
+                return mom;
+            }
+        }
+
+        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
+        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
+        return mom;
+    }
+
+    function getSetMonth (value) {
+        if (value != null) {
+            setMonth(this, value);
+            utils_hooks__hooks.updateOffset(this, true);
+            return this;
+        } else {
+            return get_set__get(this, 'Month');
+        }
+    }
+
+    function getDaysInMonth () {
+        return daysInMonth(this.year(), this.month());
+    }
+
+    var defaultMonthsShortRegex = matchWord;
+    function monthsShortRegex (isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
+            }
+            if (isStrict) {
+                return this._monthsShortStrictRegex;
+            } else {
+                return this._monthsShortRegex;
+            }
+        } else {
+            return this._monthsShortStrictRegex && isStrict ?
+                this._monthsShortStrictRegex : this._monthsShortRegex;
+        }
+    }
+
+    var defaultMonthsRegex = matchWord;
+    function monthsRegex (isStrict) {
+        if (this._monthsParseExact) {
+            if (!hasOwnProp(this, '_monthsRegex')) {
+                computeMonthsParse.call(this);
+            }
+            if (isStrict) {
+                return this._monthsStrictRegex;
+            } else {
+                return this._monthsRegex;
+            }
+        } else {
+            return this._monthsStrictRegex && isStrict ?
+                this._monthsStrictRegex : this._monthsRegex;
+        }
+    }
+
+    function computeMonthsParse () {
+        function cmpLenRev(a, b) {
+            return b.length - a.length;
+        }
+
+        var shortPieces = [], longPieces = [], mixedPieces = [],
+            i, mom;
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = create_utc__createUTC([2000, i]);
+            shortPieces.push(this.monthsShort(mom, ''));
+            longPieces.push(this.months(mom, ''));
+            mixedPieces.push(this.months(mom, ''));
+            mixedPieces.push(this.monthsShort(mom, ''));
+        }
+        // Sorting makes sure if one month (or abbr) is a prefix of another it
+        // will match the longer piece.
+        shortPieces.sort(cmpLenRev);
+        longPieces.sort(cmpLenRev);
+        mixedPieces.sort(cmpLenRev);
+        for (i = 0; i < 12; i++) {
+            shortPieces[i] = regexEscape(shortPieces[i]);
+            longPieces[i] = regexEscape(longPieces[i]);
+            mixedPieces[i] = regexEscape(mixedPieces[i]);
+        }
+
+        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+        this._monthsShortRegex = this._monthsRegex;
+        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')$', 'i');
+        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')$', 'i');
+    }
+
+    function checkOverflow (m) {
+        var overflow;
+        var a = m._a;
+
+        if (a && getParsingFlags(m).overflow === -2) {
+            overflow =
+                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
+                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
+                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
+                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
+                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
+                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
+                -1;
+
+            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+                overflow = DATE;
+            }
+            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
+                overflow = WEEK;
+            }
+            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
+                overflow = WEEKDAY;
+            }
+
+            getParsingFlags(m).overflow = overflow;
+        }
+
+        return m;
+    }
+
+    function warn(msg) {
+        if (utils_hooks__hooks.suppressDeprecationWarnings === false &&
+                (typeof console !==  'undefined') && console.warn) {
+            console.warn('Deprecation warning: ' + msg);
+        }
+    }
+
+    function deprecate(msg, fn) {
+        var firstTime = true;
+
+        return extend(function () {
+            if (firstTime) {
+                warn(msg + '\nArguments: ' + Array.prototype.slice.call(arguments).join(', ') + '\n' + (new Error()).stack);
+                firstTime = false;
+            }
+            return fn.apply(this, arguments);
+        }, fn);
+    }
+
+    var deprecations = {};
+
+    function deprecateSimple(name, msg) {
+        if (!deprecations[name]) {
+            warn(msg);
+            deprecations[name] = true;
+        }
+    }
+
+    utils_hooks__hooks.suppressDeprecationWarnings = false;
+
+    // iso 8601 regex
+    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/;
+    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?/;
+
+    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
+
+    var isoDates = [
+        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
+        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
+        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
+        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
+        ['YYYY-DDD', /\d{4}-\d{3}/],
+        ['YYYY-MM', /\d{4}-\d\d/, false],
+        ['YYYYYYMMDD', /[+-]\d{10}/],
+        ['YYYYMMDD', /\d{8}/],
+        // YYYYMM is NOT allowed by the standard
+        ['GGGG[W]WWE', /\d{4}W\d{3}/],
+        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
+        ['YYYYDDD', /\d{7}/]
+    ];
+
+    // iso time formats and regexes
+    var isoTimes = [
+        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
+        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
+        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
+        ['HH:mm', /\d\d:\d\d/],
+        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
+        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
+        ['HHmmss', /\d\d\d\d\d\d/],
+        ['HHmm', /\d\d\d\d/],
+        ['HH', /\d\d/]
+    ];
+
+    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
+
+    // date from iso format
+    function configFromISO(config) {
+        var i, l,
+            string = config._i,
+            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
+            allowTime, dateFormat, timeFormat, tzFormat;
+
+        if (match) {
+            getParsingFlags(config).iso = true;
+
+            for (i = 0, l = isoDates.length; i < l; i++) {
+                if (isoDates[i][1].exec(match[1])) {
+                    dateFormat = isoDates[i][0];
+                    allowTime = isoDates[i][2] !== false;
+                    break;
+                }
+            }
+            if (dateFormat == null) {
+                config._isValid = false;
+                return;
+            }
+            if (match[3]) {
+                for (i = 0, l = isoTimes.length; i < l; i++) {
+                    if (isoTimes[i][1].exec(match[3])) {
+                        // match[2] should be 'T' or space
+                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
+                        break;
+                    }
+                }
+                if (timeFormat == null) {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            if (!allowTime && timeFormat != null) {
+                config._isValid = false;
+                return;
+            }
+            if (match[4]) {
+                if (tzRegex.exec(match[4])) {
+                    tzFormat = 'Z';
+                } else {
+                    config._isValid = false;
+                    return;
+                }
+            }
+            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
+            configFromStringAndFormat(config);
+        } else {
+            config._isValid = false;
+        }
+    }
+
+    // date from iso format or fallback
+    function configFromString(config) {
+        var matched = aspNetJsonRegex.exec(config._i);
+
+        if (matched !== null) {
+            config._d = new Date(+matched[1]);
+            return;
+        }
+
+        configFromISO(config);
+        if (config._isValid === false) {
+            delete config._isValid;
+            utils_hooks__hooks.createFromInputFallback(config);
+        }
+    }
+
+    utils_hooks__hooks.createFromInputFallback = deprecate(
+        'moment construction falls back to js Date. This is ' +
+        'discouraged and will be removed in upcoming major ' +
+        'release. Please refer to ' +
+        'https://github.com/moment/moment/issues/1407 for more info.',
+        function (config) {
+            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
+        }
+    );
+
+    function createDate (y, m, d, h, M, s, ms) {
+        //can't just apply() to create a date:
+        //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply
+        var date = new Date(y, m, d, h, M, s, ms);
+
+        //the date constructor remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0 && isFinite(date.getFullYear())) {
+            date.setFullYear(y);
+        }
+        return date;
+    }
+
+    function createUTCDate (y) {
+        var date = new Date(Date.UTC.apply(null, arguments));
+
+        //the Date.UTC function remaps years 0-99 to 1900-1999
+        if (y < 100 && y >= 0 && isFinite(date.getUTCFullYear())) {
+            date.setUTCFullYear(y);
+        }
+        return date;
+    }
+
+    // FORMATTING
+
+    addFormatToken('Y', 0, 0, function () {
+        var y = this.year();
+        return y <= 9999 ? '' + y : '+' + y;
+    });
+
+    addFormatToken(0, ['YY', 2], 0, function () {
+        return this.year() % 100;
+    });
+
+    addFormatToken(0, ['YYYY',   4],       0, 'year');
+    addFormatToken(0, ['YYYYY',  5],       0, 'year');
+    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
+
+    // ALIASES
+
+    addUnitAlias('year', 'y');
+
+    // PARSING
+
+    addRegexToken('Y',      matchSigned);
+    addRegexToken('YY',     match1to2, match2);
+    addRegexToken('YYYY',   match1to4, match4);
+    addRegexToken('YYYYY',  match1to6, match6);
+    addRegexToken('YYYYYY', match1to6, match6);
+
+    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
+    addParseToken('YYYY', function (input, array) {
+        array[YEAR] = input.length === 2 ? utils_hooks__hooks.parseTwoDigitYear(input) : toInt(input);
+    });
+    addParseToken('YY', function (input, array) {
+        array[YEAR] = utils_hooks__hooks.parseTwoDigitYear(input);
+    });
+    addParseToken('Y', function (input, array) {
+        array[YEAR] = parseInt(input, 10);
+    });
+
+    // HELPERS
+
+    function daysInYear(year) {
+        return isLeapYear(year) ? 366 : 365;
+    }
+
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
+
+    // HOOKS
+
+    utils_hooks__hooks.parseTwoDigitYear = function (input) {
+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+    };
+
+    // MOMENTS
+
+    var getSetYear = makeGetSet('FullYear', false);
+
+    function getIsLeapYear () {
+        return isLeapYear(this.year());
+    }
+
+    // start-of-first-week - start-of-year
+    function firstWeekOffset(year, dow, doy) {
+        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
+            fwd = 7 + dow - doy,
+            // first-week day local weekday -- which local weekday is fwd
+            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
+
+        return -fwdlw + fwd - 1;
+    }
+
+    //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
+        var localWeekday = (7 + weekday - dow) % 7,
+            weekOffset = firstWeekOffset(year, dow, doy),
+            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
+            resYear, resDayOfYear;
+
+        if (dayOfYear <= 0) {
+            resYear = year - 1;
+            resDayOfYear = daysInYear(resYear) + dayOfYear;
+        } else if (dayOfYear > daysInYear(year)) {
+            resYear = year + 1;
+            resDayOfYear = dayOfYear - daysInYear(year);
+        } else {
+            resYear = year;
+            resDayOfYear = dayOfYear;
+        }
+
+        return {
+            year: resYear,
+            dayOfYear: resDayOfYear
+        };
+    }
+
+    function weekOfYear(mom, dow, doy) {
+        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
+            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
+            resWeek, resYear;
+
+        if (week < 1) {
+            resYear = mom.year() - 1;
+            resWeek = week + weeksInYear(resYear, dow, doy);
+        } else if (week > weeksInYear(mom.year(), dow, doy)) {
+            resWeek = week - weeksInYear(mom.year(), dow, doy);
+            resYear = mom.year() + 1;
+        } else {
+            resYear = mom.year();
+            resWeek = week;
+        }
+
+        return {
+            week: resWeek,
+            year: resYear
+        };
+    }
+
+    function weeksInYear(year, dow, doy) {
+        var weekOffset = firstWeekOffset(year, dow, doy),
+            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
+        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
+    }
+
+    // Pick the first defined of two or three arguments.
+    function defaults(a, b, c) {
+        if (a != null) {
+            return a;
+        }
+        if (b != null) {
+            return b;
+        }
+        return c;
+    }
+
+    function currentDateArray(config) {
+        // hooks is actually the exported moment object
+        var nowValue = new Date(utils_hooks__hooks.now());
+        if (config._useUTC) {
+            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
+        }
+        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
+    }
+
+    // convert an array to a date.
+    // the array should mirror the parameters below
+    // note: all values past the year are optional and will default to the lowest possible value.
+    // [year, month, day , hour, minute, second, millisecond]
+    function configFromArray (config) {
+        var i, date, input = [], currentDate, yearToUse;
+
+        if (config._d) {
+            return;
+        }
+
+        currentDate = currentDateArray(config);
+
+        //compute day of the year from weeks and weekdays
+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+            dayOfYearFromWeekInfo(config);
+        }
+
+        //if the day of the year is set, figure out what it is
+        if (config._dayOfYear) {
+            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
+
+            if (config._dayOfYear > daysInYear(yearToUse)) {
+                getParsingFlags(config)._overflowDayOfYear = true;
+            }
+
+            date = createUTCDate(yearToUse, 0, config._dayOfYear);
+            config._a[MONTH] = date.getUTCMonth();
+            config._a[DATE] = date.getUTCDate();
+        }
+
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
+
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
+            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+        }
+
+        // Check for 24:00:00.000
+        if (config._a[HOUR] === 24 &&
+                config._a[MINUTE] === 0 &&
+                config._a[SECOND] === 0 &&
+                config._a[MILLISECOND] === 0) {
+            config._nextDay = true;
+            config._a[HOUR] = 0;
+        }
+
+        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
+        // Apply timezone offset from input. The actual utcOffset can be changed
+        // with parseZone.
+        if (config._tzm != null) {
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+        }
+
+        if (config._nextDay) {
+            config._a[HOUR] = 24;
+        }
+    }
+
+    function dayOfYearFromWeekInfo(config) {
+        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
+
+        w = config._w;
+        if (w.GG != null || w.W != null || w.E != null) {
+            dow = 1;
+            doy = 4;
+
+            // TODO: We need to take the current isoWeekYear, but that depends on
+            // how we interpret now (local, utc, fixed offset). So create
+            // a now version of current config (take local/utc/offset flags, and
+            // create now).
+            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(local__createLocal(), 1, 4).year);
+            week = defaults(w.W, 1);
+            weekday = defaults(w.E, 1);
+            if (weekday < 1 || weekday > 7) {
+                weekdayOverflow = true;
+            }
+        } else {
+            dow = config._locale._week.dow;
+            doy = config._locale._week.doy;
+
+            weekYear = defaults(w.gg, config._a[YEAR], weekOfYear(local__createLocal(), dow, doy).year);
+            week = defaults(w.w, 1);
+
+            if (w.d != null) {
+                // weekday -- low day numbers are considered next week
+                weekday = w.d;
+                if (weekday < 0 || weekday > 6) {
+                    weekdayOverflow = true;
+                }
+            } else if (w.e != null) {
+                // local weekday -- counting starts from begining of week
+                weekday = w.e + dow;
+                if (w.e < 0 || w.e > 6) {
+                    weekdayOverflow = true;
+                }
+            } else {
+                // default to begining of week
+                weekday = dow;
+            }
+        }
+        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
+            getParsingFlags(config)._overflowWeeks = true;
+        } else if (weekdayOverflow != null) {
+            getParsingFlags(config)._overflowWeekday = true;
+        } else {
+            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
+            config._a[YEAR] = temp.year;
+            config._dayOfYear = temp.dayOfYear;
+        }
+    }
+
+    // constant that refers to the ISO standard
+    utils_hooks__hooks.ISO_8601 = function () {};
+
+    // date from string and format string
+    function configFromStringAndFormat(config) {
+        // TODO: Move this to another part of the creation flow to prevent circular deps
+        if (config._f === utils_hooks__hooks.ISO_8601) {
+            configFromISO(config);
+            return;
+        }
+
+        config._a = [];
+        getParsingFlags(config).empty = true;
+
+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
+        var string = '' + config._i,
+            i, parsedInput, tokens, token, skipped,
+            stringLength = string.length,
+            totalParsedInputLength = 0;
+
+        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
+
+        for (i = 0; i < tokens.length; i++) {
+            token = tokens[i];
+            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+            // console.log('token', token, 'parsedInput', parsedInput,
+            //         'regex', getParseRegexForToken(token, config));
+            if (parsedInput) {
+                skipped = string.substr(0, string.indexOf(parsedInput));
+                if (skipped.length > 0) {
+                    getParsingFlags(config).unusedInput.push(skipped);
+                }
+                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+                totalParsedInputLength += parsedInput.length;
+            }
+            // don't parse if it's not a known token
+            if (formatTokenFunctions[token]) {
+                if (parsedInput) {
+                    getParsingFlags(config).empty = false;
+                }
+                else {
+                    getParsingFlags(config).unusedTokens.push(token);
+                }
+                addTimeToArrayFromToken(token, parsedInput, config);
+            }
+            else if (config._strict && !parsedInput) {
+                getParsingFlags(config).unusedTokens.push(token);
+            }
+        }
+
+        // add remaining unparsed input length to the string
+        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
+        if (string.length > 0) {
+            getParsingFlags(config).unusedInput.push(string);
+        }
+
+        // clear _12h flag if hour is <= 12
+        if (getParsingFlags(config).bigHour === true &&
+                config._a[HOUR] <= 12 &&
+                config._a[HOUR] > 0) {
+            getParsingFlags(config).bigHour = undefined;
+        }
+        // handle meridiem
+        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
+
+        configFromArray(config);
+        checkOverflow(config);
+    }
+
+
+    function meridiemFixWrap (locale, hour, meridiem) {
+        var isPm;
+
+        if (meridiem == null) {
+            // nothing to do
+            return hour;
+        }
+        if (locale.meridiemHour != null) {
+            return locale.meridiemHour(hour, meridiem);
+        } else if (locale.isPM != null) {
+            // Fallback
+            isPm = locale.isPM(meridiem);
+            if (isPm && hour < 12) {
+                hour += 12;
+            }
+            if (!isPm && hour === 12) {
+                hour = 0;
+            }
+            return hour;
+        } else {
+            // this is not supposed to happen
+            return hour;
+        }
+    }
+
+    // date from string and array of format strings
+    function configFromStringAndArray(config) {
+        var tempConfig,
+            bestMoment,
+
+            scoreToBeat,
+            i,
+            currentScore;
+
+        if (config._f.length === 0) {
+            getParsingFlags(config).invalidFormat = true;
+            config._d = new Date(NaN);
+            return;
+        }
+
+        for (i = 0; i < config._f.length; i++) {
+            currentScore = 0;
+            tempConfig = copyConfig({}, config);
+            if (config._useUTC != null) {
+                tempConfig._useUTC = config._useUTC;
+            }
+            tempConfig._f = config._f[i];
+            configFromStringAndFormat(tempConfig);
+
+            if (!valid__isValid(tempConfig)) {
+                continue;
+            }
+
+            // if there is any input that was not parsed add a penalty for that format
+            currentScore += getParsingFlags(tempConfig).charsLeftOver;
+
+            //or tokens
+            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
+
+            getParsingFlags(tempConfig).score = currentScore;
+
+            if (scoreToBeat == null || currentScore < scoreToBeat) {
+                scoreToBeat = currentScore;
+                bestMoment = tempConfig;
+            }
+        }
+
+        extend(config, bestMoment || tempConfig);
+    }
+
+    function configFromObject(config) {
+        if (config._d) {
+            return;
+        }
+
+        var i = normalizeObjectUnits(config._i);
+        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
+            return obj && parseInt(obj, 10);
+        });
+
+        configFromArray(config);
+    }
+
+    function createFromConfig (config) {
+        var res = new Moment(checkOverflow(prepareConfig(config)));
+        if (res._nextDay) {
+            // Adding is smart enough around DST
+            res.add(1, 'd');
+            res._nextDay = undefined;
+        }
+
+        return res;
+    }
+
+    function prepareConfig (config) {
+        var input = config._i,
+            format = config._f;
+
+        config._locale = config._locale || locale_locales__getLocale(config._l);
+
+        if (input === null || (format === undefined && input === '')) {
+            return valid__createInvalid({nullInput: true});
+        }
+
+        if (typeof input === 'string') {
+            config._i = input = config._locale.preparse(input);
+        }
+
+        if (isMoment(input)) {
+            return new Moment(checkOverflow(input));
+        } else if (isArray(format)) {
+            configFromStringAndArray(config);
+        } else if (format) {
+            configFromStringAndFormat(config);
+        } else if (isDate(input)) {
+            config._d = input;
+        } else {
+            configFromInput(config);
+        }
+
+        if (!valid__isValid(config)) {
+            config._d = null;
+        }
+
+        return config;
+    }
+
+    function configFromInput(config) {
+        var input = config._i;
+        if (input === undefined) {
+            config._d = new Date(utils_hooks__hooks.now());
+        } else if (isDate(input)) {
+            config._d = new Date(+input);
+        } else if (typeof input === 'string') {
+            configFromString(config);
+        } else if (isArray(input)) {
+            config._a = map(input.slice(0), function (obj) {
+                return parseInt(obj, 10);
+            });
+            configFromArray(config);
+        } else if (typeof(input) === 'object') {
+            configFromObject(config);
+        } else if (typeof(input) === 'number') {
+            // from milliseconds
+            config._d = new Date(input);
+        } else {
+            utils_hooks__hooks.createFromInputFallback(config);
+        }
+    }
+
+    function createLocalOrUTC (input, format, locale, strict, isUTC) {
+        var c = {};
+
+        if (typeof(locale) === 'boolean') {
+            strict = locale;
+            locale = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c._isAMomentObject = true;
+        c._useUTC = c._isUTC = isUTC;
+        c._l = locale;
+        c._i = input;
+        c._f = format;
+        c._strict = strict;
+
+        return createFromConfig(c);
+    }
+
+    function local__createLocal (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, false);
+    }
+
+    var prototypeMin = deprecate(
+         'moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548',
+         function () {
+             var other = local__createLocal.apply(null, arguments);
+             if (this.isValid() && other.isValid()) {
+                 return other < this ? this : other;
+             } else {
+                 return valid__createInvalid();
+             }
+         }
+     );
+
+    var prototypeMax = deprecate(
+        'moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548',
+        function () {
+            var other = local__createLocal.apply(null, arguments);
+            if (this.isValid() && other.isValid()) {
+                return other > this ? this : other;
+            } else {
+                return valid__createInvalid();
+            }
+        }
+    );
+
+    // Pick a moment m from moments so that m[fn](other) is true for all
+    // other. This relies on the function fn to be transitive.
+    //
+    // moments should either be an array of moment objects or an array, whose
+    // first element is an array of moment objects.
+    function pickBy(fn, moments) {
+        var res, i;
+        if (moments.length === 1 && isArray(moments[0])) {
+            moments = moments[0];
+        }
+        if (!moments.length) {
+            return local__createLocal();
+        }
+        res = moments[0];
+        for (i = 1; i < moments.length; ++i) {
+            if (!moments[i].isValid() || moments[i][fn](res)) {
+                res = moments[i];
+            }
+        }
+        return res;
+    }
+
+    // TODO: Use [].sort instead?
+    function min () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isBefore', args);
+    }
+
+    function max () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isAfter', args);
+    }
+
+    var now = function () {
+        return Date.now ? Date.now() : +(new Date());
+    };
+
+    function Duration (duration) {
+        var normalizedInput = normalizeObjectUnits(duration),
+            years = normalizedInput.year || 0,
+            quarters = normalizedInput.quarter || 0,
+            months = normalizedInput.month || 0,
+            weeks = normalizedInput.week || 0,
+            days = normalizedInput.day || 0,
+            hours = normalizedInput.hour || 0,
+            minutes = normalizedInput.minute || 0,
+            seconds = normalizedInput.second || 0,
+            milliseconds = normalizedInput.millisecond || 0;
+
+        // representation for dateAddRemove
+        this._milliseconds = +milliseconds +
+            seconds * 1e3 + // 1000
+            minutes * 6e4 + // 1000 * 60
+            hours * 36e5; // 1000 * 60 * 60
+        // Because of dateAddRemove treats 24 hours as different from a
+        // day when working around DST, we need to store them separately
+        this._days = +days +
+            weeks * 7;
+        // It is impossible translate months into days without knowing
+        // which months you are are talking about, so we have to store
+        // it separately.
+        this._months = +months +
+            quarters * 3 +
+            years * 12;
+
+        this._data = {};
+
+        this._locale = locale_locales__getLocale();
+
+        this._bubble();
+    }
+
+    function isDuration (obj) {
+        return obj instanceof Duration;
+    }
+
+    // FORMATTING
+
+    function offset (token, separator) {
+        addFormatToken(token, 0, 0, function () {
+            var offset = this.utcOffset();
+            var sign = '+';
+            if (offset < 0) {
+                offset = -offset;
+                sign = '-';
+            }
+            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
+        });
+    }
+
+    offset('Z', ':');
+    offset('ZZ', '');
+
+    // PARSING
+
+    addRegexToken('Z',  matchShortOffset);
+    addRegexToken('ZZ', matchShortOffset);
+    addParseToken(['Z', 'ZZ'], function (input, array, config) {
+        config._useUTC = true;
+        config._tzm = offsetFromString(matchShortOffset, input);
+    });
+
+    // HELPERS
+
+    // timezone chunker
+    // '+10:00' > ['10',  '00']
+    // '-1530'  > ['-15', '30']
+    var chunkOffset = /([\+\-]|\d\d)/gi;
+
+    function offsetFromString(matcher, string) {
+        var matches = ((string || '').match(matcher) || []);
+        var chunk   = matches[matches.length - 1] || [];
+        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+        var minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+        return parts[0] === '+' ? minutes : -minutes;
+    }
+
+    // Return a moment from input, that is local/utc/zone equivalent to model.
+    function cloneWithOffset(input, model) {
+        var res, diff;
+        if (model._isUTC) {
+            res = model.clone();
+            diff = (isMoment(input) || isDate(input) ? +input : +local__createLocal(input)) - (+res);
+            // Use low-level api, because this fn is low-level api.
+            res._d.setTime(+res._d + diff);
+            utils_hooks__hooks.updateOffset(res, false);
+            return res;
+        } else {
+            return local__createLocal(input).local();
+        }
+    }
+
+    function getDateOffset (m) {
+        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+        // https://github.com/moment/moment/pull/1871
+        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
+    }
+
+    // HOOKS
+
+    // This function will be called whenever a moment is mutated.
+    // It is intended to keep the offset in sync with the timezone.
+    utils_hooks__hooks.updateOffset = function () {};
+
+    // MOMENTS
+
+    // keepLocalTime = true means only change the timezone, without
+    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+    // +0200, so we adjust the time as needed, to be valid.
+    //
+    // Keeping the time actually adds/subtracts (one hour)
+    // from the actual represented time. That is why we call updateOffset
+    // a second time. In case it wants us to change the offset again
+    // _changeInProgress == true case, then we have to adjust, because
+    // there is no such time in the given timezone.
+    function getSetOffset (input, keepLocalTime) {
+        var offset = this._offset || 0,
+            localAdjust;
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        if (input != null) {
+            if (typeof input === 'string') {
+                input = offsetFromString(matchShortOffset, input);
+            } else if (Math.abs(input) < 16) {
+                input = input * 60;
+            }
+            if (!this._isUTC && keepLocalTime) {
+                localAdjust = getDateOffset(this);
+            }
+            this._offset = input;
+            this._isUTC = true;
+            if (localAdjust != null) {
+                this.add(localAdjust, 'm');
+            }
+            if (offset !== input) {
+                if (!keepLocalTime || this._changeInProgress) {
+                    add_subtract__addSubtract(this, create__createDuration(input - offset, 'm'), 1, false);
+                } else if (!this._changeInProgress) {
+                    this._changeInProgress = true;
+                    utils_hooks__hooks.updateOffset(this, true);
+                    this._changeInProgress = null;
+                }
+            }
+            return this;
+        } else {
+            return this._isUTC ? offset : getDateOffset(this);
+        }
+    }
+
+    function getSetZone (input, keepLocalTime) {
+        if (input != null) {
+            if (typeof input !== 'string') {
+                input = -input;
+            }
+
+            this.utcOffset(input, keepLocalTime);
+
+            return this;
+        } else {
+            return -this.utcOffset();
+        }
+    }
+
+    function setOffsetToUTC (keepLocalTime) {
+        return this.utcOffset(0, keepLocalTime);
+    }
+
+    function setOffsetToLocal (keepLocalTime) {
+        if (this._isUTC) {
+            this.utcOffset(0, keepLocalTime);
+            this._isUTC = false;
+
+            if (keepLocalTime) {
+                this.subtract(getDateOffset(this), 'm');
+            }
+        }
+        return this;
+    }
+
+    function setOffsetToParsedOffset () {
+        if (this._tzm) {
+            this.utcOffset(this._tzm);
+        } else if (typeof this._i === 'string') {
+            this.utcOffset(offsetFromString(matchOffset, this._i));
+        }
+        return this;
+    }
+
+    function hasAlignedHourOffset (input) {
+        if (!this.isValid()) {
+            return false;
+        }
+        input = input ? local__createLocal(input).utcOffset() : 0;
+
+        return (this.utcOffset() - input) % 60 === 0;
+    }
+
+    function isDaylightSavingTime () {
+        return (
+            this.utcOffset() > this.clone().month(0).utcOffset() ||
+            this.utcOffset() > this.clone().month(5).utcOffset()
+        );
+    }
+
+    function isDaylightSavingTimeShifted () {
+        if (!isUndefined(this._isDSTShifted)) {
+            return this._isDSTShifted;
+        }
+
+        var c = {};
+
+        copyConfig(c, this);
+        c = prepareConfig(c);
+
+        if (c._a) {
+            var other = c._isUTC ? create_utc__createUTC(c._a) : local__createLocal(c._a);
+            this._isDSTShifted = this.isValid() &&
+                compareArrays(c._a, other.toArray()) > 0;
+        } else {
+            this._isDSTShifted = false;
+        }
+
+        return this._isDSTShifted;
+    }
+
+    function isLocal () {
+        return this.isValid() ? !this._isUTC : false;
+    }
+
+    function isUtcOffset () {
+        return this.isValid() ? this._isUTC : false;
+    }
+
+    function isUtc () {
+        return this.isValid() ? this._isUTC && this._offset === 0 : false;
+    }
+
+    // ASP.NET json date format regex
+    var aspNetRegex = /^(\-)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?\d*)?$/;
+
+    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+    var isoRegex = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;
+
+    function create__createDuration (input, key) {
+        var duration = input,
+            // matching against regexp is expensive, do it on demand
+            match = null,
+            sign,
+            ret,
+            diffRes;
+
+        if (isDuration(input)) {
+            duration = {
+                ms : input._milliseconds,
+                d  : input._days,
+                M  : input._months
+            };
+        } else if (typeof input === 'number') {
+            duration = {};
+            if (key) {
+                duration[key] = input;
+            } else {
+                duration.milliseconds = input;
+            }
+        } else if (!!(match = aspNetRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y  : 0,
+                d  : toInt(match[DATE])        * sign,
+                h  : toInt(match[HOUR])        * sign,
+                m  : toInt(match[MINUTE])      * sign,
+                s  : toInt(match[SECOND])      * sign,
+                ms : toInt(match[MILLISECOND]) * sign
+            };
+        } else if (!!(match = isoRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y : parseIso(match[2], sign),
+                M : parseIso(match[3], sign),
+                d : parseIso(match[4], sign),
+                h : parseIso(match[5], sign),
+                m : parseIso(match[6], sign),
+                s : parseIso(match[7], sign),
+                w : parseIso(match[8], sign)
+            };
+        } else if (duration == null) {// checks for null or undefined
+            duration = {};
+        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
+            diffRes = momentsDifference(local__createLocal(duration.from), local__createLocal(duration.to));
+
+            duration = {};
+            duration.ms = diffRes.milliseconds;
+            duration.M = diffRes.months;
+        }
+
+        ret = new Duration(duration);
+
+        if (isDuration(input) && hasOwnProp(input, '_locale')) {
+            ret._locale = input._locale;
+        }
+
+        return ret;
+    }
+
+    create__createDuration.fn = Duration.prototype;
+
+    function parseIso (inp, sign) {
+        // We'd normally use ~~inp for this, but unfortunately it also
+        // converts floats to ints.
+        // inp may be undefined, so careful calling replace on it.
+        var res = inp && parseFloat(inp.replace(',', '.'));
+        // apply sign while we're at it
+        return (isNaN(res) ? 0 : res) * sign;
+    }
+
+    function positiveMomentsDifference(base, other) {
+        var res = {milliseconds: 0, months: 0};
+
+        res.months = other.month() - base.month() +
+            (other.year() - base.year()) * 12;
+        if (base.clone().add(res.months, 'M').isAfter(other)) {
+            --res.months;
+        }
+
+        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
+
+        return res;
+    }
+
+    function momentsDifference(base, other) {
+        var res;
+        if (!(base.isValid() && other.isValid())) {
+            return {milliseconds: 0, months: 0};
+        }
+
+        other = cloneWithOffset(other, base);
+        if (base.isBefore(other)) {
+            res = positiveMomentsDifference(base, other);
+        } else {
+            res = positiveMomentsDifference(other, base);
+            res.milliseconds = -res.milliseconds;
+            res.months = -res.months;
+        }
+
+        return res;
+    }
+
+    // TODO: remove 'name' arg after deprecation is removed
+    function createAdder(direction, name) {
+        return function (val, period) {
+            var dur, tmp;
+            //invert the arguments, but complain about it
+            if (period !== null && !isNaN(+period)) {
+                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period).');
+                tmp = val; val = period; period = tmp;
+            }
+
+            val = typeof val === 'string' ? +val : val;
+            dur = create__createDuration(val, period);
+            add_subtract__addSubtract(this, dur, direction);
+            return this;
+        };
+    }
+
+    function add_subtract__addSubtract (mom, duration, isAdding, updateOffset) {
+        var milliseconds = duration._milliseconds,
+            days = duration._days,
+            months = duration._months;
+
+        if (!mom.isValid()) {
+            // No op
+            return;
+        }
+
+        updateOffset = updateOffset == null ? true : updateOffset;
+
+        if (milliseconds) {
+            mom._d.setTime(+mom._d + milliseconds * isAdding);
+        }
+        if (days) {
+            get_set__set(mom, 'Date', get_set__get(mom, 'Date') + days * isAdding);
+        }
+        if (months) {
+            setMonth(mom, get_set__get(mom, 'Month') + months * isAdding);
+        }
+        if (updateOffset) {
+            utils_hooks__hooks.updateOffset(mom, days || months);
+        }
+    }
+
+    var add_subtract__add      = createAdder(1, 'add');
+    var add_subtract__subtract = createAdder(-1, 'subtract');
+
+    function moment_calendar__calendar (time, formats) {
+        // We want to compare the start of today, vs this.
+        // Getting start-of-today depends on whether we're local/utc/offset or not.
+        var now = time || local__createLocal(),
+            sod = cloneWithOffset(now, this).startOf('day'),
+            diff = this.diff(sod, 'days', true),
+            format = diff < -6 ? 'sameElse' :
+                diff < -1 ? 'lastWeek' :
+                diff < 0 ? 'lastDay' :
+                diff < 1 ? 'sameDay' :
+                diff < 2 ? 'nextDay' :
+                diff < 7 ? 'nextWeek' : 'sameElse';
+
+        var output = formats && (isFunction(formats[format]) ? formats[format]() : formats[format]);
+
+        return this.format(output || this.localeData().calendar(format, this, local__createLocal(now)));
+    }
+
+    function clone () {
+        return new Moment(this);
+    }
+
+    function isAfter (input, units) {
+        var localInput = isMoment(input) ? input : local__createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
+        if (units === 'millisecond') {
+            return +this > +localInput;
+        } else {
+            return +localInput < +this.clone().startOf(units);
+        }
+    }
+
+    function isBefore (input, units) {
+        var localInput = isMoment(input) ? input : local__createLocal(input);
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(!isUndefined(units) ? units : 'millisecond');
+        if (units === 'millisecond') {
+            return +this < +localInput;
+        } else {
+            return +this.clone().endOf(units) < +localInput;
+        }
+    }
+
+    function isBetween (from, to, units) {
+        return this.isAfter(from, units) && this.isBefore(to, units);
+    }
+
+    function isSame (input, units) {
+        var localInput = isMoment(input) ? input : local__createLocal(input),
+            inputMs;
+        if (!(this.isValid() && localInput.isValid())) {
+            return false;
+        }
+        units = normalizeUnits(units || 'millisecond');
+        if (units === 'millisecond') {
+            return +this === +localInput;
+        } else {
+            inputMs = +localInput;
+            return +(this.clone().startOf(units)) <= inputMs && inputMs <= +(this.clone().endOf(units));
+        }
+    }
+
+    function isSameOrAfter (input, units) {
+        return this.isSame(input, units) || this.isAfter(input,units);
+    }
+
+    function isSameOrBefore (input, units) {
+        return this.isSame(input, units) || this.isBefore(input,units);
+    }
+
+    function diff (input, units, asFloat) {
+        var that,
+            zoneDelta,
+            delta, output;
+
+        if (!this.isValid()) {
+            return NaN;
+        }
+
+        that = cloneWithOffset(input, this);
+
+        if (!that.isValid()) {
+            return NaN;
+        }
+
+        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
+
+        units = normalizeUnits(units);
+
+        if (units === 'year' || units === 'month' || units === 'quarter') {
+            output = monthDiff(this, that);
+            if (units === 'quarter') {
+                output = output / 3;
+            } else if (units === 'year') {
+                output = output / 12;
+            }
+        } else {
+            delta = this - that;
+            output = units === 'second' ? delta / 1e3 : // 1000
+                units === 'minute' ? delta / 6e4 : // 1000 * 60
+                units === 'hour' ? delta / 36e5 : // 1000 * 60 * 60
+                units === 'day' ? (delta - zoneDelta) / 864e5 : // 1000 * 60 * 60 * 24, negate dst
+                units === 'week' ? (delta - zoneDelta) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst
+                delta;
+        }
+        return asFloat ? output : absFloor(output);
+    }
+
+    function monthDiff (a, b) {
+        // difference in months
+        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
+            // b is in (anchor - 1 month, anchor + 1 month)
+            anchor = a.clone().add(wholeMonthDiff, 'months'),
+            anchor2, adjust;
+
+        if (b - anchor < 0) {
+            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor - anchor2);
+        } else {
+            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor2 - anchor);
+        }
+
+        return -(wholeMonthDiff + adjust);
+    }
+
+    utils_hooks__hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+
+    function toString () {
+        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+    }
+
+    function moment_format__toISOString () {
+        var m = this.clone().utc();
+        if (0 < m.year() && m.year() <= 9999) {
+            if (isFunction(Date.prototype.toISOString)) {
+                // native implementation is ~50x faster, use it when we can
+                return this.toDate().toISOString();
+            } else {
+                return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+            }
+        } else {
+            return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+        }
+    }
+
+    function format (inputString) {
+        var output = formatMoment(this, inputString || utils_hooks__hooks.defaultFormat);
+        return this.localeData().postformat(output);
+    }
+
+    function from (time, withoutSuffix) {
+        if (this.isValid() &&
+                ((isMoment(time) && time.isValid()) ||
+                 local__createLocal(time).isValid())) {
+            return create__createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
+        }
+    }
+
+    function fromNow (withoutSuffix) {
+        return this.from(local__createLocal(), withoutSuffix);
+    }
+
+    function to (time, withoutSuffix) {
+        if (this.isValid() &&
+                ((isMoment(time) && time.isValid()) ||
+                 local__createLocal(time).isValid())) {
+            return create__createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
+        } else {
+            return this.localeData().invalidDate();
+        }
+    }
+
+    function toNow (withoutSuffix) {
+        return this.to(local__createLocal(), withoutSuffix);
+    }
+
+    // If passed a locale key, it will set the locale for this
+    // instance.  Otherwise, it will return the locale configuration
+    // variables for this instance.
+    function locale (key) {
+        var newLocaleData;
+
+        if (key === undefined) {
+            return this._locale._abbr;
+        } else {
+            newLocaleData = locale_locales__getLocale(key);
+            if (newLocaleData != null) {
+                this._locale = newLocaleData;
+            }
+            return this;
+        }
+    }
+
+    var lang = deprecate(
+        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+        function (key) {
+            if (key === undefined) {
+                return this.localeData();
+            } else {
+                return this.locale(key);
+            }
+        }
+    );
+
+    function localeData () {
+        return this._locale;
+    }
+
+    function startOf (units) {
+        units = normalizeUnits(units);
+        // the following switch intentionally omits break keywords
+        // to utilize falling through the cases.
+        switch (units) {
+        case 'year':
+            this.month(0);
+            /* falls through */
+        case 'quarter':
+        case 'month':
+            this.date(1);
+            /* falls through */
+        case 'week':
+        case 'isoWeek':
+        case 'day':
+            this.hours(0);
+            /* falls through */
+        case 'hour':
+            this.minutes(0);
+            /* falls through */
+        case 'minute':
+            this.seconds(0);
+            /* falls through */
+        case 'second':
+            this.milliseconds(0);
+        }
+
+        // weeks are a special case
+        if (units === 'week') {
+            this.weekday(0);
+        }
+        if (units === 'isoWeek') {
+            this.isoWeekday(1);
+        }
+
+        // quarters are also special
+        if (units === 'quarter') {
+            this.month(Math.floor(this.month() / 3) * 3);
+        }
+
+        return this;
+    }
+
+    function endOf (units) {
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond') {
+            return this;
+        }
+        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
+    }
+
+    function to_type__valueOf () {
+        return +this._d - ((this._offset || 0) * 60000);
+    }
+
+    function unix () {
+        return Math.floor(+this / 1000);
+    }
+
+    function toDate () {
+        return this._offset ? new Date(+this) : this._d;
+    }
+
+    function toArray () {
+        var m = this;
+        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
+    }
+
+    function toObject () {
+        var m = this;
+        return {
+            years: m.year(),
+            months: m.month(),
+            date: m.date(),
+            hours: m.hours(),
+            minutes: m.minutes(),
+            seconds: m.seconds(),
+            milliseconds: m.milliseconds()
+        };
+    }
+
+    function toJSON () {
+        // JSON.stringify(new Date(NaN)) === 'null'
+        return this.isValid() ? this.toISOString() : 'null';
+    }
+
+    function moment_valid__isValid () {
+        return valid__isValid(this);
+    }
+
+    function parsingFlags () {
+        return extend({}, getParsingFlags(this));
+    }
+
+    function invalidAt () {
+        return getParsingFlags(this).overflow;
+    }
+
+    function creationData() {
+        return {
+            input: this._i,
+            format: this._f,
+            locale: this._locale,
+            isUTC: this._isUTC,
+            strict: this._strict
+        };
+    }
+
+    // FORMATTING
+
+    addFormatToken(0, ['gg', 2], 0, function () {
+        return this.weekYear() % 100;
+    });
+
+    addFormatToken(0, ['GG', 2], 0, function () {
+        return this.isoWeekYear() % 100;
+    });
+
+    function addWeekYearFormatToken (token, getter) {
+        addFormatToken(0, [token, token.length], 0, getter);
+    }
+
+    addWeekYearFormatToken('gggg',     'weekYear');
+    addWeekYearFormatToken('ggggg',    'weekYear');
+    addWeekYearFormatToken('GGGG',  'isoWeekYear');
+    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
+
+    // ALIASES
+
+    addUnitAlias('weekYear', 'gg');
+    addUnitAlias('isoWeekYear', 'GG');
+
+    // PARSING
+
+    addRegexToken('G',      matchSigned);
+    addRegexToken('g',      matchSigned);
+    addRegexToken('GG',     match1to2, match2);
+    addRegexToken('gg',     match1to2, match2);
+    addRegexToken('GGGG',   match1to4, match4);
+    addRegexToken('gggg',   match1to4, match4);
+    addRegexToken('GGGGG',  match1to6, match6);
+    addRegexToken('ggggg',  match1to6, match6);
+
+    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
+        week[token.substr(0, 2)] = toInt(input);
+    });
+
+    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+        week[token] = utils_hooks__hooks.parseTwoDigitYear(input);
+    });
+
+    // MOMENTS
+
+    function getSetWeekYear (input) {
+        return getSetWeekYearHelper.call(this,
+                input,
+                this.week(),
+                this.weekday(),
+                this.localeData()._week.dow,
+                this.localeData()._week.doy);
+    }
+
+    function getSetISOWeekYear (input) {
+        return getSetWeekYearHelper.call(this,
+                input, this.isoWeek(), this.isoWeekday(), 1, 4);
+    }
+
+    function getISOWeeksInYear () {
+        return weeksInYear(this.year(), 1, 4);
+    }
+
+    function getWeeksInYear () {
+        var weekInfo = this.localeData()._week;
+        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+    }
+
+    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
+        var weeksTarget;
+        if (input == null) {
+            return weekOfYear(this, dow, doy).year;
+        } else {
+            weeksTarget = weeksInYear(input, dow, doy);
+            if (week > weeksTarget) {
+                week = weeksTarget;
+            }
+            return setWeekAll.call(this, input, week, weekday, dow, doy);
+        }
+    }
+
+    function setWeekAll(weekYear, week, weekday, dow, doy) {
+        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
+            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
+
+        // console.log("got", weekYear, week, weekday, "set", date.toISOString());
+        this.year(date.getUTCFullYear());
+        this.month(date.getUTCMonth());
+        this.date(date.getUTCDate());
+        return this;
+    }
+
+    // FORMATTING
+
+    addFormatToken('Q', 0, 'Qo', 'quarter');
+
+    // ALIASES
+
+    addUnitAlias('quarter', 'Q');
+
+    // PARSING
+
+    addRegexToken('Q', match1);
+    addParseToken('Q', function (input, array) {
+        array[MONTH] = (toInt(input) - 1) * 3;
+    });
+
+    // MOMENTS
+
+    function getSetQuarter (input) {
+        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
+    }
+
+    // FORMATTING
+
+    addFormatToken('w', ['ww', 2], 'wo', 'week');
+    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
+
+    // ALIASES
+
+    addUnitAlias('week', 'w');
+    addUnitAlias('isoWeek', 'W');
+
+    // PARSING
+
+    addRegexToken('w',  match1to2);
+    addRegexToken('ww', match1to2, match2);
+    addRegexToken('W',  match1to2);
+    addRegexToken('WW', match1to2, match2);
+
+    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
+        week[token.substr(0, 1)] = toInt(input);
+    });
+
+    // HELPERS
+
+    // LOCALES
+
+    function localeWeek (mom) {
+        return weekOfYear(mom, this._week.dow, this._week.doy).week;
+    }
+
+    var defaultLocaleWeek = {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    };
+
+    function localeFirstDayOfWeek () {
+        return this._week.dow;
+    }
+
+    function localeFirstDayOfYear () {
+        return this._week.doy;
+    }
+
+    // MOMENTS
+
+    function getSetWeek (input) {
+        var week = this.localeData().week(this);
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    function getSetISOWeek (input) {
+        var week = weekOfYear(this, 1, 4).week;
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    // FORMATTING
+
+    addFormatToken('D', ['DD', 2], 'Do', 'date');
+
+    // ALIASES
+
+    addUnitAlias('date', 'D');
+
+    // PARSING
+
+    addRegexToken('D',  match1to2);
+    addRegexToken('DD', match1to2, match2);
+    addRegexToken('Do', function (isStrict, locale) {
+        return isStrict ? locale._ordinalParse : locale._ordinalParseLenient;
+    });
+
+    addParseToken(['D', 'DD'], DATE);
+    addParseToken('Do', function (input, array) {
+        array[DATE] = toInt(input.match(match1to2)[0], 10);
+    });
+
+    // MOMENTS
+
+    var getSetDayOfMonth = makeGetSet('Date', true);
+
+    // FORMATTING
+
+    addFormatToken('d', 0, 'do', 'day');
+
+    addFormatToken('dd', 0, 0, function (format) {
+        return this.localeData().weekdaysMin(this, format);
+    });
+
+    addFormatToken('ddd', 0, 0, function (format) {
+        return this.localeData().weekdaysShort(this, format);
+    });
+
+    addFormatToken('dddd', 0, 0, function (format) {
+        return this.localeData().weekdays(this, format);
+    });
+
+    addFormatToken('e', 0, 0, 'weekday');
+    addFormatToken('E', 0, 0, 'isoWeekday');
+
+    // ALIASES
+
+    addUnitAlias('day', 'd');
+    addUnitAlias('weekday', 'e');
+    addUnitAlias('isoWeekday', 'E');
+
+    // PARSING
+
+    addRegexToken('d',    match1to2);
+    addRegexToken('e',    match1to2);
+    addRegexToken('E',    match1to2);
+    addRegexToken('dd',   matchWord);
+    addRegexToken('ddd',  matchWord);
+    addRegexToken('dddd', matchWord);
+
+    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
+        var weekday = config._locale.weekdaysParse(input, token, config._strict);
+        // if we didn't get a weekday name, mark the date as invalid
+        if (weekday != null) {
+            week.d = weekday;
+        } else {
+            getParsingFlags(config).invalidWeekday = input;
+        }
+    });
+
+    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+        week[token] = toInt(input);
+    });
+
+    // HELPERS
+
+    function parseWeekday(input, locale) {
+        if (typeof input !== 'string') {
+            return input;
+        }
+
+        if (!isNaN(input)) {
+            return parseInt(input, 10);
+        }
+
+        input = locale.weekdaysParse(input);
+        if (typeof input === 'number') {
+            return input;
+        }
+
+        return null;
+    }
+
+    // LOCALES
+
+    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
+    function localeWeekdays (m, format) {
+        return isArray(this._weekdays) ? this._weekdays[m.day()] :
+            this._weekdays[this._weekdays.isFormat.test(format) ? 'format' : 'standalone'][m.day()];
+    }
+
+    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
+    function localeWeekdaysShort (m) {
+        return this._weekdaysShort[m.day()];
+    }
+
+    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
+    function localeWeekdaysMin (m) {
+        return this._weekdaysMin[m.day()];
+    }
+
+    function localeWeekdaysParse (weekdayName, format, strict) {
+        var i, mom, regex;
+
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+            this._minWeekdaysParse = [];
+            this._shortWeekdaysParse = [];
+            this._fullWeekdaysParse = [];
+        }
+
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+
+            mom = local__createLocal([2000, 1]).day(i);
+            if (strict && !this._fullWeekdaysParse[i]) {
+                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\.?') + '$', 'i');
+                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\.?') + '$', 'i');
+                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\.?') + '$', 'i');
+            }
+            if (!this._weekdaysParse[i]) {
+                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
+                return i;
+            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function getSetDayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+        if (input != null) {
+            input = parseWeekday(input, this.localeData());
+            return this.add(input - day, 'd');
+        } else {
+            return day;
+        }
+    }
+
+    function getSetLocaleDayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+        return input == null ? weekday : this.add(input - weekday, 'd');
+    }
+
+    function getSetISODayOfWeek (input) {
+        if (!this.isValid()) {
+            return input != null ? this : NaN;
+        }
+        // behaves the same as moment#day except
+        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+        // as a setter, sunday should belong to the previous week.
+        return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
+    }
+
+    // FORMATTING
+
+    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
+
+    // ALIASES
+
+    addUnitAlias('dayOfYear', 'DDD');
+
+    // PARSING
+
+    addRegexToken('DDD',  match1to3);
+    addRegexToken('DDDD', match3);
+    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+        config._dayOfYear = toInt(input);
+    });
+
+    // HELPERS
+
+    // MOMENTS
+
+    function getSetDayOfYear (input) {
+        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
+        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
+    }
+
+    // FORMATTING
+
+    function hFormat() {
+        return this.hours() % 12 || 12;
+    }
+
+    addFormatToken('H', ['HH', 2], 0, 'hour');
+    addFormatToken('h', ['hh', 2], 0, hFormat);
+
+    addFormatToken('hmm', 0, 0, function () {
+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
+    });
+
+    addFormatToken('hmmss', 0, 0, function () {
+        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2);
+    });
+
+    addFormatToken('Hmm', 0, 0, function () {
+        return '' + this.hours() + zeroFill(this.minutes(), 2);
+    });
+
+    addFormatToken('Hmmss', 0, 0, function () {
+        return '' + this.hours() + zeroFill(this.minutes(), 2) +
+            zeroFill(this.seconds(), 2);
+    });
+
+    function meridiem (token, lowercase) {
+        addFormatToken(token, 0, 0, function () {
+            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
+        });
+    }
+
+    meridiem('a', true);
+    meridiem('A', false);
+
+    // ALIASES
+
+    addUnitAlias('hour', 'h');
+
+    // PARSING
+
+    function matchMeridiem (isStrict, locale) {
+        return locale._meridiemParse;
+    }
+
+    addRegexToken('a',  matchMeridiem);
+    addRegexToken('A',  matchMeridiem);
+    addRegexToken('H',  match1to2);
+    addRegexToken('h',  match1to2);
+    addRegexToken('HH', match1to2, match2);
+    addRegexToken('hh', match1to2, match2);
+
+    addRegexToken('hmm', match3to4);
+    addRegexToken('hmmss', match5to6);
+    addRegexToken('Hmm', match3to4);
+    addRegexToken('Hmmss', match5to6);
+
+    addParseToken(['H', 'HH'], HOUR);
+    addParseToken(['a', 'A'], function (input, array, config) {
+        config._isPm = config._locale.isPM(input);
+        config._meridiem = input;
+    });
+    addParseToken(['h', 'hh'], function (input, array, config) {
+        array[HOUR] = toInt(input);
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('hmmss', function (input, array, config) {
+        var pos1 = input.length - 4;
+        var pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+        getParsingFlags(config).bigHour = true;
+    });
+    addParseToken('Hmm', function (input, array, config) {
+        var pos = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos));
+        array[MINUTE] = toInt(input.substr(pos));
+    });
+    addParseToken('Hmmss', function (input, array, config) {
+        var pos1 = input.length - 4;
+        var pos2 = input.length - 2;
+        array[HOUR] = toInt(input.substr(0, pos1));
+        array[MINUTE] = toInt(input.substr(pos1, 2));
+        array[SECOND] = toInt(input.substr(pos2));
+    });
+
+    // LOCALES
+
+    function localeIsPM (input) {
+        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+        // Using charAt should be more compatible.
+        return ((input + '').toLowerCase().charAt(0) === 'p');
+    }
+
+    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+    function localeMeridiem (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'pm' : 'PM';
+        } else {
+            return isLower ? 'am' : 'AM';
+        }
+    }
+
+
+    // MOMENTS
+
+    // Setting the hour should keep the time, because the user explicitly
+    // specified which hour he wants. So trying to maintain the same hour (in
+    // a new timezone) makes sense. Adding/subtracting hours does not follow
+    // this rule.
+    var getSetHour = makeGetSet('Hours', true);
+
+    // FORMATTING
+
+    addFormatToken('m', ['mm', 2], 0, 'minute');
+
+    // ALIASES
+
+    addUnitAlias('minute', 'm');
+
+    // PARSING
+
+    addRegexToken('m',  match1to2);
+    addRegexToken('mm', match1to2, match2);
+    addParseToken(['m', 'mm'], MINUTE);
+
+    // MOMENTS
+
+    var getSetMinute = makeGetSet('Minutes', false);
+
+    // FORMATTING
+
+    addFormatToken('s', ['ss', 2], 0, 'second');
+
+    // ALIASES
+
+    addUnitAlias('second', 's');
+
+    // PARSING
+
+    addRegexToken('s',  match1to2);
+    addRegexToken('ss', match1to2, match2);
+    addParseToken(['s', 'ss'], SECOND);
+
+    // MOMENTS
+
+    var getSetSecond = makeGetSet('Seconds', false);
+
+    // FORMATTING
+
+    addFormatToken('S', 0, 0, function () {
+        return ~~(this.millisecond() / 100);
+    });
+
+    addFormatToken(0, ['SS', 2], 0, function () {
+        return ~~(this.millisecond() / 10);
+    });
+
+    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
+    addFormatToken(0, ['SSSS', 4], 0, function () {
+        return this.millisecond() * 10;
+    });
+    addFormatToken(0, ['SSSSS', 5], 0, function () {
+        return this.millisecond() * 100;
+    });
+    addFormatToken(0, ['SSSSSS', 6], 0, function () {
+        return this.millisecond() * 1000;
+    });
+    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
+        return this.millisecond() * 10000;
+    });
+    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
+        return this.millisecond() * 100000;
+    });
+    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
+        return this.millisecond() * 1000000;
+    });
+
+
+    // ALIASES
+
+    addUnitAlias('millisecond', 'ms');
+
+    // PARSING
+
+    addRegexToken('S',    match1to3, match1);
+    addRegexToken('SS',   match1to3, match2);
+    addRegexToken('SSS',  match1to3, match3);
+
+    var token;
+    for (token = 'SSSS'; token.length <= 9; token += 'S') {
+        addRegexToken(token, matchUnsigned);
+    }
+
+    function parseMs(input, array) {
+        array[MILLISECOND] = toInt(('0.' + input) * 1000);
+    }
+
+    for (token = 'S'; token.length <= 9; token += 'S') {
+        addParseToken(token, parseMs);
+    }
+    // MOMENTS
+
+    var getSetMillisecond = makeGetSet('Milliseconds', false);
+
+    // FORMATTING
+
+    addFormatToken('z',  0, 0, 'zoneAbbr');
+    addFormatToken('zz', 0, 0, 'zoneName');
+
+    // MOMENTS
+
+    function getZoneAbbr () {
+        return this._isUTC ? 'UTC' : '';
+    }
+
+    function getZoneName () {
+        return this._isUTC ? 'Coordinated Universal Time' : '';
+    }
+
+    var momentPrototype__proto = Moment.prototype;
+
+    momentPrototype__proto.add               = add_subtract__add;
+    momentPrototype__proto.calendar          = moment_calendar__calendar;
+    momentPrototype__proto.clone             = clone;
+    momentPrototype__proto.diff              = diff;
+    momentPrototype__proto.endOf             = endOf;
+    momentPrototype__proto.format            = format;
+    momentPrototype__proto.from              = from;
+    momentPrototype__proto.fromNow           = fromNow;
+    momentPrototype__proto.to                = to;
+    momentPrototype__proto.toNow             = toNow;
+    momentPrototype__proto.get               = getSet;
+    momentPrototype__proto.invalidAt         = invalidAt;
+    momentPrototype__proto.isAfter           = isAfter;
+    momentPrototype__proto.isBefore          = isBefore;
+    momentPrototype__proto.isBetween         = isBetween;
+    momentPrototype__proto.isSame            = isSame;
+    momentPrototype__proto.isSameOrAfter     = isSameOrAfter;
+    momentPrototype__proto.isSameOrBefore    = isSameOrBefore;
+    momentPrototype__proto.isValid           = moment_valid__isValid;
+    momentPrototype__proto.lang              = lang;
+    momentPrototype__proto.locale            = locale;
+    momentPrototype__proto.localeData        = localeData;
+    momentPrototype__proto.max               = prototypeMax;
+    momentPrototype__proto.min               = prototypeMin;
+    momentPrototype__proto.parsingFlags      = parsingFlags;
+    momentPrototype__proto.set               = getSet;
+    momentPrototype__proto.startOf           = startOf;
+    momentPrototype__proto.subtract          = add_subtract__subtract;
+    momentPrototype__proto.toArray           = toArray;
+    momentPrototype__proto.toObject          = toObject;
+    momentPrototype__proto.toDate            = toDate;
+    momentPrototype__proto.toISOString       = moment_format__toISOString;
+    momentPrototype__proto.toJSON            = toJSON;
+    momentPrototype__proto.toString          = toString;
+    momentPrototype__proto.unix              = unix;
+    momentPrototype__proto.valueOf           = to_type__valueOf;
+    momentPrototype__proto.creationData      = creationData;
+
+    // Year
+    momentPrototype__proto.year       = getSetYear;
+    momentPrototype__proto.isLeapYear = getIsLeapYear;
+
+    // Week Year
+    momentPrototype__proto.weekYear    = getSetWeekYear;
+    momentPrototype__proto.isoWeekYear = getSetISOWeekYear;
+
+    // Quarter
+    momentPrototype__proto.quarter = momentPrototype__proto.quarters = getSetQuarter;
+
+    // Month
+    momentPrototype__proto.month       = getSetMonth;
+    momentPrototype__proto.daysInMonth = getDaysInMonth;
+
+    // Week
+    momentPrototype__proto.week           = momentPrototype__proto.weeks        = getSetWeek;
+    momentPrototype__proto.isoWeek        = momentPrototype__proto.isoWeeks     = getSetISOWeek;
+    momentPrototype__proto.weeksInYear    = getWeeksInYear;
+    momentPrototype__proto.isoWeeksInYear = getISOWeeksInYear;
+
+    // Day
+    momentPrototype__proto.date       = getSetDayOfMonth;
+    momentPrototype__proto.day        = momentPrototype__proto.days             = getSetDayOfWeek;
+    momentPrototype__proto.weekday    = getSetLocaleDayOfWeek;
+    momentPrototype__proto.isoWeekday = getSetISODayOfWeek;
+    momentPrototype__proto.dayOfYear  = getSetDayOfYear;
+
+    // Hour
+    momentPrototype__proto.hour = momentPrototype__proto.hours = getSetHour;
+
+    // Minute
+    momentPrototype__proto.minute = momentPrototype__proto.minutes = getSetMinute;
+
+    // Second
+    momentPrototype__proto.second = momentPrototype__proto.seconds = getSetSecond;
+
+    // Millisecond
+    momentPrototype__proto.millisecond = momentPrototype__proto.milliseconds = getSetMillisecond;
+
+    // Offset
+    momentPrototype__proto.utcOffset            = getSetOffset;
+    momentPrototype__proto.utc                  = setOffsetToUTC;
+    momentPrototype__proto.local                = setOffsetToLocal;
+    momentPrototype__proto.parseZone            = setOffsetToParsedOffset;
+    momentPrototype__proto.hasAlignedHourOffset = hasAlignedHourOffset;
+    momentPrototype__proto.isDST                = isDaylightSavingTime;
+    momentPrototype__proto.isDSTShifted         = isDaylightSavingTimeShifted;
+    momentPrototype__proto.isLocal              = isLocal;
+    momentPrototype__proto.isUtcOffset          = isUtcOffset;
+    momentPrototype__proto.isUtc                = isUtc;
+    momentPrototype__proto.isUTC                = isUtc;
+
+    // Timezone
+    momentPrototype__proto.zoneAbbr = getZoneAbbr;
+    momentPrototype__proto.zoneName = getZoneName;
+
+    // Deprecations
+    momentPrototype__proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
+    momentPrototype__proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
+    momentPrototype__proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
+    momentPrototype__proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779', getSetZone);
+
+    var momentPrototype = momentPrototype__proto;
+
+    function moment__createUnix (input) {
+        return local__createLocal(input * 1000);
+    }
+
+    function moment__createInZone () {
+        return local__createLocal.apply(null, arguments).parseZone();
+    }
+
+    var defaultCalendar = {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
+    };
+
+    function locale_calendar__calendar (key, mom, now) {
+        var output = this._calendar[key];
+        return isFunction(output) ? output.call(mom, now) : output;
+    }
+
+    var defaultLongDateFormat = {
+        LTS  : 'h:mm:ss A',
+        LT   : 'h:mm A',
+        L    : 'MM/DD/YYYY',
+        LL   : 'MMMM D, YYYY',
+        LLL  : 'MMMM D, YYYY h:mm A',
+        LLLL : 'dddd, MMMM D, YYYY h:mm A'
+    };
+
+    function longDateFormat (key) {
+        var format = this._longDateFormat[key],
+            formatUpper = this._longDateFormat[key.toUpperCase()];
+
+        if (format || !formatUpper) {
+            return format;
+        }
+
+        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
+            return val.slice(1);
+        });
+
+        return this._longDateFormat[key];
+    }
+
+    var defaultInvalidDate = 'Invalid date';
+
+    function invalidDate () {
+        return this._invalidDate;
+    }
+
+    var defaultOrdinal = '%d';
+    var defaultOrdinalParse = /\d{1,2}/;
+
+    function ordinal (number) {
+        return this._ordinal.replace('%d', number);
+    }
+
+    function preParsePostFormat (string) {
+        return string;
+    }
+
+    var defaultRelativeTime = {
+        future : 'in %s',
+        past   : '%s ago',
+        s  : 'a few seconds',
+        m  : 'a minute',
+        mm : '%d minutes',
+        h  : 'an hour',
+        hh : '%d hours',
+        d  : 'a day',
+        dd : '%d days',
+        M  : 'a month',
+        MM : '%d months',
+        y  : 'a year',
+        yy : '%d years'
+    };
+
+    function relative__relativeTime (number, withoutSuffix, string, isFuture) {
+        var output = this._relativeTime[string];
+        return (isFunction(output)) ?
+            output(number, withoutSuffix, string, isFuture) :
+            output.replace(/%d/i, number);
+    }
+
+    function pastFuture (diff, output) {
+        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
+    }
+
+    function locale_set__set (config) {
+        var prop, i;
+        for (i in config) {
+            prop = config[i];
+            if (isFunction(prop)) {
+                this[i] = prop;
+            } else {
+                this['_' + i] = prop;
+            }
+        }
+        // Lenient ordinal parsing accepts just a number in addition to
+        // number + (possibly) stuff coming from _ordinalParseLenient.
+        this._ordinalParseLenient = new RegExp(this._ordinalParse.source + '|' + (/\d{1,2}/).source);
+    }
+
+    var prototype__proto = Locale.prototype;
+
+    prototype__proto._calendar       = defaultCalendar;
+    prototype__proto.calendar        = locale_calendar__calendar;
+    prototype__proto._longDateFormat = defaultLongDateFormat;
+    prototype__proto.longDateFormat  = longDateFormat;
+    prototype__proto._invalidDate    = defaultInvalidDate;
+    prototype__proto.invalidDate     = invalidDate;
+    prototype__proto._ordinal        = defaultOrdinal;
+    prototype__proto.ordinal         = ordinal;
+    prototype__proto._ordinalParse   = defaultOrdinalParse;
+    prototype__proto.preparse        = preParsePostFormat;
+    prototype__proto.postformat      = preParsePostFormat;
+    prototype__proto._relativeTime   = defaultRelativeTime;
+    prototype__proto.relativeTime    = relative__relativeTime;
+    prototype__proto.pastFuture      = pastFuture;
+    prototype__proto.set             = locale_set__set;
+
+    // Month
+    prototype__proto.months            =        localeMonths;
+    prototype__proto._months           = defaultLocaleMonths;
+    prototype__proto.monthsShort       =        localeMonthsShort;
+    prototype__proto._monthsShort      = defaultLocaleMonthsShort;
+    prototype__proto.monthsParse       =        localeMonthsParse;
+    prototype__proto._monthsRegex      = defaultMonthsRegex;
+    prototype__proto.monthsRegex       = monthsRegex;
+    prototype__proto._monthsShortRegex = defaultMonthsShortRegex;
+    prototype__proto.monthsShortRegex  = monthsShortRegex;
+
+    // Week
+    prototype__proto.week = localeWeek;
+    prototype__proto._week = defaultLocaleWeek;
+    prototype__proto.firstDayOfYear = localeFirstDayOfYear;
+    prototype__proto.firstDayOfWeek = localeFirstDayOfWeek;
+
+    // Day of Week
+    prototype__proto.weekdays       =        localeWeekdays;
+    prototype__proto._weekdays      = defaultLocaleWeekdays;
+    prototype__proto.weekdaysMin    =        localeWeekdaysMin;
+    prototype__proto._weekdaysMin   = defaultLocaleWeekdaysMin;
+    prototype__proto.weekdaysShort  =        localeWeekdaysShort;
+    prototype__proto._weekdaysShort = defaultLocaleWeekdaysShort;
+    prototype__proto.weekdaysParse  =        localeWeekdaysParse;
+
+    // Hours
+    prototype__proto.isPM = localeIsPM;
+    prototype__proto._meridiemParse = defaultLocaleMeridiemParse;
+    prototype__proto.meridiem = localeMeridiem;
+
+    function lists__get (format, index, field, setter) {
+        var locale = locale_locales__getLocale();
+        var utc = create_utc__createUTC().set(setter, index);
+        return locale[field](utc, format);
+    }
+
+    function list (format, index, field, count, setter) {
+        if (typeof format === 'number') {
+            index = format;
+            format = undefined;
+        }
+
+        format = format || '';
+
+        if (index != null) {
+            return lists__get(format, index, field, setter);
+        }
+
+        var i;
+        var out = [];
+        for (i = 0; i < count; i++) {
+            out[i] = lists__get(format, i, field, setter);
+        }
+        return out;
+    }
+
+    function lists__listMonths (format, index) {
+        return list(format, index, 'months', 12, 'month');
+    }
+
+    function lists__listMonthsShort (format, index) {
+        return list(format, index, 'monthsShort', 12, 'month');
+    }
+
+    function lists__listWeekdays (format, index) {
+        return list(format, index, 'weekdays', 7, 'day');
+    }
+
+    function lists__listWeekdaysShort (format, index) {
+        return list(format, index, 'weekdaysShort', 7, 'day');
+    }
+
+    function lists__listWeekdaysMin (format, index) {
+        return list(format, index, 'weekdaysMin', 7, 'day');
+    }
+
+    locale_locales__getSetGlobalLocale('en', {
+        ordinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (toInt(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    // Side effect imports
+    utils_hooks__hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', locale_locales__getSetGlobalLocale);
+    utils_hooks__hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', locale_locales__getLocale);
+
+    var mathAbs = Math.abs;
+
+    function duration_abs__abs () {
+        var data           = this._data;
+
+        this._milliseconds = mathAbs(this._milliseconds);
+        this._days         = mathAbs(this._days);
+        this._months       = mathAbs(this._months);
+
+        data.milliseconds  = mathAbs(data.milliseconds);
+        data.seconds       = mathAbs(data.seconds);
+        data.minutes       = mathAbs(data.minutes);
+        data.hours         = mathAbs(data.hours);
+        data.months        = mathAbs(data.months);
+        data.years         = mathAbs(data.years);
+
+        return this;
+    }
+
+    function duration_add_subtract__addSubtract (duration, input, value, direction) {
+        var other = create__createDuration(input, value);
+
+        duration._milliseconds += direction * other._milliseconds;
+        duration._days         += direction * other._days;
+        duration._months       += direction * other._months;
+
+        return duration._bubble();
+    }
+
+    // supports only 2.0-style add(1, 's') or add(duration)
+    function duration_add_subtract__add (input, value) {
+        return duration_add_subtract__addSubtract(this, input, value, 1);
+    }
+
+    // supports only 2.0-style subtract(1, 's') or subtract(duration)
+    function duration_add_subtract__subtract (input, value) {
+        return duration_add_subtract__addSubtract(this, input, value, -1);
+    }
+
+    function absCeil (number) {
+        if (number < 0) {
+            return Math.floor(number);
+        } else {
+            return Math.ceil(number);
+        }
+    }
+
+    function bubble () {
+        var milliseconds = this._milliseconds;
+        var days         = this._days;
+        var months       = this._months;
+        var data         = this._data;
+        var seconds, minutes, hours, years, monthsFromDays;
+
+        // if we have a mix of positive and negative values, bubble down first
+        // check: https://github.com/moment/moment/issues/2166
+        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
+                (milliseconds <= 0 && days <= 0 && months <= 0))) {
+            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
+            days = 0;
+            months = 0;
+        }
+
+        // The following code bubbles up values, see the tests for
+        // examples of what that means.
+        data.milliseconds = milliseconds % 1000;
+
+        seconds           = absFloor(milliseconds / 1000);
+        data.seconds      = seconds % 60;
+
+        minutes           = absFloor(seconds / 60);
+        data.minutes      = minutes % 60;
+
+        hours             = absFloor(minutes / 60);
+        data.hours        = hours % 24;
+
+        days += absFloor(hours / 24);
+
+        // convert days to months
+        monthsFromDays = absFloor(daysToMonths(days));
+        months += monthsFromDays;
+        days -= absCeil(monthsToDays(monthsFromDays));
+
+        // 12 months -> 1 year
+        years = absFloor(months / 12);
+        months %= 12;
+
+        data.days   = days;
+        data.months = months;
+        data.years  = years;
+
+        return this;
+    }
+
+    function daysToMonths (days) {
+        // 400 years have 146097 days (taking into account leap year rules)
+        // 400 years have 12 months === 4800
+        return days * 4800 / 146097;
+    }
+
+    function monthsToDays (months) {
+        // the reverse of daysToMonths
+        return months * 146097 / 4800;
+    }
+
+    function as (units) {
+        var days;
+        var months;
+        var milliseconds = this._milliseconds;
+
+        units = normalizeUnits(units);
+
+        if (units === 'month' || units === 'year') {
+            days   = this._days   + milliseconds / 864e5;
+            months = this._months + daysToMonths(days);
+            return units === 'month' ? months : months / 12;
+        } else {
+            // handle milliseconds separately because of floating point math errors (issue #1867)
+            days = this._days + Math.round(monthsToDays(this._months));
+            switch (units) {
+                case 'week'   : return days / 7     + milliseconds / 6048e5;
+                case 'day'    : return days         + milliseconds / 864e5;
+                case 'hour'   : return days * 24    + milliseconds / 36e5;
+                case 'minute' : return days * 1440  + milliseconds / 6e4;
+                case 'second' : return days * 86400 + milliseconds / 1000;
+                // Math.floor prevents floating point math errors here
+                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
+                default: throw new Error('Unknown unit ' + units);
+            }
+        }
+    }
+
+    // TODO: Use this.as('ms')?
+    function duration_as__valueOf () {
+        return (
+            this._milliseconds +
+            this._days * 864e5 +
+            (this._months % 12) * 2592e6 +
+            toInt(this._months / 12) * 31536e6
+        );
+    }
+
+    function makeAs (alias) {
+        return function () {
+            return this.as(alias);
+        };
+    }
+
+    var asMilliseconds = makeAs('ms');
+    var asSeconds      = makeAs('s');
+    var asMinutes      = makeAs('m');
+    var asHours        = makeAs('h');
+    var asDays         = makeAs('d');
+    var asWeeks        = makeAs('w');
+    var asMonths       = makeAs('M');
+    var asYears        = makeAs('y');
+
+    function duration_get__get (units) {
+        units = normalizeUnits(units);
+        return this[units + 's']();
+    }
+
+    function makeGetter(name) {
+        return function () {
+            return this._data[name];
+        };
+    }
+
+    var milliseconds = makeGetter('milliseconds');
+    var seconds      = makeGetter('seconds');
+    var minutes      = makeGetter('minutes');
+    var hours        = makeGetter('hours');
+    var days         = makeGetter('days');
+    var months       = makeGetter('months');
+    var years        = makeGetter('years');
+
+    function weeks () {
+        return absFloor(this.days() / 7);
+    }
+
+    var round = Math.round;
+    var thresholds = {
+        s: 45,  // seconds to minute
+        m: 45,  // minutes to hour
+        h: 22,  // hours to day
+        d: 26,  // days to month
+        M: 11   // months to year
+    };
+
+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+    }
+
+    function duration_humanize__relativeTime (posNegDuration, withoutSuffix, locale) {
+        var duration = create__createDuration(posNegDuration).abs();
+        var seconds  = round(duration.as('s'));
+        var minutes  = round(duration.as('m'));
+        var hours    = round(duration.as('h'));
+        var days     = round(duration.as('d'));
+        var months   = round(duration.as('M'));
+        var years    = round(duration.as('y'));
+
+        var a = seconds < thresholds.s && ['s', seconds]  ||
+                minutes <= 1           && ['m']           ||
+                minutes < thresholds.m && ['mm', minutes] ||
+                hours   <= 1           && ['h']           ||
+                hours   < thresholds.h && ['hh', hours]   ||
+                days    <= 1           && ['d']           ||
+                days    < thresholds.d && ['dd', days]    ||
+                months  <= 1           && ['M']           ||
+                months  < thresholds.M && ['MM', months]  ||
+                years   <= 1           && ['y']           || ['yy', years];
+
+        a[2] = withoutSuffix;
+        a[3] = +posNegDuration > 0;
+        a[4] = locale;
+        return substituteTimeAgo.apply(null, a);
+    }
+
+    // This function allows you to set a threshold for relative time strings
+    function duration_humanize__getSetRelativeTimeThreshold (threshold, limit) {
+        if (thresholds[threshold] === undefined) {
+            return false;
+        }
+        if (limit === undefined) {
+            return thresholds[threshold];
+        }
+        thresholds[threshold] = limit;
+        return true;
+    }
+
+    function humanize (withSuffix) {
+        var locale = this.localeData();
+        var output = duration_humanize__relativeTime(this, !withSuffix, locale);
+
+        if (withSuffix) {
+            output = locale.pastFuture(+this, output);
+        }
+
+        return locale.postformat(output);
+    }
+
+    var iso_string__abs = Math.abs;
+
+    function iso_string__toISOString() {
+        // for ISO strings we do not use the normal bubbling rules:
+        //  * milliseconds bubble up until they become hours
+        //  * days do not bubble at all
+        //  * months bubble up until they become years
+        // This is because there is no context-free conversion between hours and days
+        // (think of clock changes)
+        // and also not between days and months (28-31 days per month)
+        var seconds = iso_string__abs(this._milliseconds) / 1000;
+        var days         = iso_string__abs(this._days);
+        var months       = iso_string__abs(this._months);
+        var minutes, hours, years;
+
+        // 3600 seconds -> 60 minutes -> 1 hour
+        minutes           = absFloor(seconds / 60);
+        hours             = absFloor(minutes / 60);
+        seconds %= 60;
+        minutes %= 60;
+
+        // 12 months -> 1 year
+        years  = absFloor(months / 12);
+        months %= 12;
+
+
+        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+        var Y = years;
+        var M = months;
+        var D = days;
+        var h = hours;
+        var m = minutes;
+        var s = seconds;
+        var total = this.asSeconds();
+
+        if (!total) {
+            // this is the same as C#'s (Noda) and python (isodate)...
+            // but not other JS (goog.date)
+            return 'P0D';
+        }
+
+        return (total < 0 ? '-' : '') +
+            'P' +
+            (Y ? Y + 'Y' : '') +
+            (M ? M + 'M' : '') +
+            (D ? D + 'D' : '') +
+            ((h || m || s) ? 'T' : '') +
+            (h ? h + 'H' : '') +
+            (m ? m + 'M' : '') +
+            (s ? s + 'S' : '');
+    }
+
+    var duration_prototype__proto = Duration.prototype;
+
+    duration_prototype__proto.abs            = duration_abs__abs;
+    duration_prototype__proto.add            = duration_add_subtract__add;
+    duration_prototype__proto.subtract       = duration_add_subtract__subtract;
+    duration_prototype__proto.as             = as;
+    duration_prototype__proto.asMilliseconds = asMilliseconds;
+    duration_prototype__proto.asSeconds      = asSeconds;
+    duration_prototype__proto.asMinutes      = asMinutes;
+    duration_prototype__proto.asHours        = asHours;
+    duration_prototype__proto.asDays         = asDays;
+    duration_prototype__proto.asWeeks        = asWeeks;
+    duration_prototype__proto.asMonths       = asMonths;
+    duration_prototype__proto.asYears        = asYears;
+    duration_prototype__proto.valueOf        = duration_as__valueOf;
+    duration_prototype__proto._bubble        = bubble;
+    duration_prototype__proto.get            = duration_get__get;
+    duration_prototype__proto.milliseconds   = milliseconds;
+    duration_prototype__proto.seconds        = seconds;
+    duration_prototype__proto.minutes        = minutes;
+    duration_prototype__proto.hours          = hours;
+    duration_prototype__proto.days           = days;
+    duration_prototype__proto.weeks          = weeks;
+    duration_prototype__proto.months         = months;
+    duration_prototype__proto.years          = years;
+    duration_prototype__proto.humanize       = humanize;
+    duration_prototype__proto.toISOString    = iso_string__toISOString;
+    duration_prototype__proto.toString       = iso_string__toISOString;
+    duration_prototype__proto.toJSON         = iso_string__toISOString;
+    duration_prototype__proto.locale         = locale;
+    duration_prototype__proto.localeData     = localeData;
+
+    // Deprecations
+    duration_prototype__proto.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', iso_string__toISOString);
+    duration_prototype__proto.lang = lang;
+
+    // Side effect imports
+
+    // FORMATTING
+
+    addFormatToken('X', 0, 0, 'unix');
+    addFormatToken('x', 0, 0, 'valueOf');
+
+    // PARSING
+
+    addRegexToken('x', matchSigned);
+    addRegexToken('X', matchTimestamp);
+    addParseToken('X', function (input, array, config) {
+        config._d = new Date(parseFloat(input, 10) * 1000);
+    });
+    addParseToken('x', function (input, array, config) {
+        config._d = new Date(toInt(input));
+    });
+
+    // Side effect imports
+
+
+    utils_hooks__hooks.version = '2.11.2';
+
+    setHookCallback(local__createLocal);
+
+    utils_hooks__hooks.fn                    = momentPrototype;
+    utils_hooks__hooks.min                   = min;
+    utils_hooks__hooks.max                   = max;
+    utils_hooks__hooks.now                   = now;
+    utils_hooks__hooks.utc                   = create_utc__createUTC;
+    utils_hooks__hooks.unix                  = moment__createUnix;
+    utils_hooks__hooks.months                = lists__listMonths;
+    utils_hooks__hooks.isDate                = isDate;
+    utils_hooks__hooks.locale                = locale_locales__getSetGlobalLocale;
+    utils_hooks__hooks.invalid               = valid__createInvalid;
+    utils_hooks__hooks.duration              = create__createDuration;
+    utils_hooks__hooks.isMoment              = isMoment;
+    utils_hooks__hooks.weekdays              = lists__listWeekdays;
+    utils_hooks__hooks.parseZone             = moment__createInZone;
+    utils_hooks__hooks.localeData            = locale_locales__getLocale;
+    utils_hooks__hooks.isDuration            = isDuration;
+    utils_hooks__hooks.monthsShort           = lists__listMonthsShort;
+    utils_hooks__hooks.weekdaysMin           = lists__listWeekdaysMin;
+    utils_hooks__hooks.defineLocale          = defineLocale;
+    utils_hooks__hooks.weekdaysShort         = lists__listWeekdaysShort;
+    utils_hooks__hooks.normalizeUnits        = normalizeUnits;
+    utils_hooks__hooks.relativeTimeThreshold = duration_humanize__getSetRelativeTimeThreshold;
+    utils_hooks__hooks.prototype             = momentPrototype;
+
+    var _moment = utils_hooks__hooks;
+
+    return _moment;
+
+}));
\ No newline at end of file
diff --git a/drops/index.css b/drops/index.css
index bc329b48e..6a026de7a 100644
--- a/drops/index.css
+++ b/drops/index.css
@@ -188,3 +188,6 @@ h1 > label > input {
 .bonus.JP:before {
     content: "JP: ";
 }
+#times {
+    text-align: center;
+}
diff --git a/drops/index.html b/drops/index.html
index 99790c140..723b369b3 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -42,10 +42,13 @@
         <script src="../common/js/dismissal.js"></script>
 
         <script src="../characters/js/utils.js"></script>
+        
+        <script src="../common/libs/js/moment.js"></script>
+        <script src="../common/libs/js/moment-timezone.js"></script>
 
     </head>
 
-    <body ng-controller="MainCtrl">
+    <body ng-controller="MainCtrl" onload="updateTimes()">
 
         <script type="text/ng-template" id="type.html">
             <div ng-repeat="island in data[type]" ng-if="island.name != 'Oars Special'" class="island collapsed"
@@ -134,7 +137,11 @@ <h2>
             </div>
 
             <h1 class="page-header">Bonus Table</h1>
-
+            
+            <div>
+                <p id="times"></p>
+            </div>
+            
             <table class="table table-striped" id="bonus-table" add-bonuses>
                 <thead>
                     <tr>
diff --git a/drops/index.js b/drops/index.js
index 90168743b..db24586eb 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -224,3 +224,13 @@ app.filter('smartSort',function($rootScope) {
 });
 
 })();
+
+function refreshTimer(){
+var refresh=1000; // Refresh rate in milli seconds
+mytime=setTimeout('updateTimes()',refresh)
+}
+
+function updateTimes(){
+    document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('America/Los_Angeles').format('LTS')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('LTS')+"</b>";
+    tt=refreshTimer();
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index b709d54a6..45ffead4e 100644
--- a/index.html
+++ b/index.html
@@ -41,6 +41,7 @@
                 <li>Added Instructions to Calculator</li>
                 <li>Added Boa Boat with Placeholder Stats</li>
                 <li>New 3D2Y Units + Legend Jimbe!</li>
+                <li>Added Server Time to Drop Page</li>
                 </ul>
         </div>
     </body>

From f5e9f4030ca09af42a70edf032d7e8cf20612e7d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 21:41:16 +0100
Subject: [PATCH 0085/1569] Changed Health penalty of Boa Ship

---
 common/data/ships.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 783cce59f..2ccf14cb1 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -187,7 +187,7 @@ window.ships = [
             [ 1.2, 1.2, 1.2, 1.25, 1.25, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !p.unit.class.has('Freedom') ? 0.3 :
+            return !p.unit.class.has('Freedom') ? 0.01 :
                 [ 1, 1.1, 1.1, 1.1, 1.2, 1.2, 1.25, 1.25, 1.35, 1.35 ][p.boatLevel - 1];
         }
     }

From 73c258bc9be7b9d590106d9fc9209211c6fe7cb7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 21:44:12 +0100
Subject: [PATCH 0086/1569] Added Note for JPN Bonus Table

---
 drops/index.css  | 4 ++++
 drops/index.html | 1 +
 2 files changed, 5 insertions(+)

diff --git a/drops/index.css b/drops/index.css
index 6a026de7a..4cd34e6ec 100644
--- a/drops/index.css
+++ b/drops/index.css
@@ -191,3 +191,7 @@ h1 > label > input {
 #times {
     text-align: center;
 }
+
+#timesNote {
+    text-align: center;
+}
diff --git a/drops/index.html b/drops/index.html
index 723b369b3..778ab6045 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -140,6 +140,7 @@ <h1 class="page-header">Bonus Table</h1>
             
             <div>
                 <p id="times"></p>
+                <p id="timesNote">The Events in the Japanese Version only last from 12AM till 12PM. Global ones are the whole Day.</p>
             </div>
             
             <table class="table table-striped" id="bonus-table" add-bonuses>

From 873c4fa843855e62efcb9dc99d6cf7470634f633 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 22:00:50 +0100
Subject: [PATCH 0087/1569] Added Notice about 12h Japan Bonus

Switches depending on whether they are currently active or not
---
 drops/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drops/index.js b/drops/index.js
index db24586eb..508a130b5 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -232,5 +232,11 @@ mytime=setTimeout('updateTimes()',refresh)
 
 function updateTimes(){
     document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('America/Los_Angeles').format('LTS')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('LTS')+"</b>";
+    
+    if(12>moment().tz('Asia/Tokyo').format('h')>24){
+        document.getElementById("timesNote").innerHTML = "<b>Japan Bonuses are currently active<b>";
+    }else{
+         document.getElementById("timesNote").innerHTML = "The Events in the Japanese Version only last from 12AM till 12PM";
+    }
     tt=refreshTimer();
 }
\ No newline at end of file

From 05ebe38cd421cb4d3d38c8b48efcb466f618ed5d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 22:06:48 +0100
Subject: [PATCH 0088/1569] Quickfix for 24h System

---
 drops/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drops/index.js b/drops/index.js
index 508a130b5..ae85bc3f7 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -233,7 +233,7 @@ mytime=setTimeout('updateTimes()',refresh)
 function updateTimes(){
     document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('America/Los_Angeles').format('LTS')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('LTS')+"</b>";
     
-    if(12>moment().tz('Asia/Tokyo').format('h')>24){
+    if(moment().tz('Asia/Tokyo').format('H')>12){
         document.getElementById("timesNote").innerHTML = "<b>Japan Bonuses are currently active<b>";
     }else{
          document.getElementById("timesNote").innerHTML = "The Events in the Japanese Version only last from 12AM till 12PM";

From 5bb01bcc7ccabe529b3a0939e9e422e76ebec776 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 25 Feb 2016 22:17:27 +0100
Subject: [PATCH 0089/1569] Switch to 24h Display

JPN Bonuses also only go till 23:00
---
 drops/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drops/index.js b/drops/index.js
index ae85bc3f7..3a7d6eff6 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -231,12 +231,12 @@ mytime=setTimeout('updateTimes()',refresh)
 }
 
 function updateTimes(){
-    document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('America/Los_Angeles').format('LTS')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('LTS')+"</b>";
+    document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('America/Los_Angeles').format('H:mm:ss')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('H:mm:ss')+"</b>";
     
-    if(moment().tz('Asia/Tokyo').format('H')>12){
+    if(moment().tz('Asia/Tokyo').format('H')>12 && moment().tz('Asia/Tokyo').format('H')<23){
         document.getElementById("timesNote").innerHTML = "<b>Japan Bonuses are currently active<b>";
     }else{
-         document.getElementById("timesNote").innerHTML = "The Events in the Japanese Version only last from 12AM till 12PM";
+         document.getElementById("timesNote").innerHTML = "The Events in the Japanese Version only last from 12:00 till 23:00";
     }
     tt=refreshTimer();
 }
\ No newline at end of file

From 345397e34ffa4f458ef12b4d92e6c7f821c41834 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Feb 2016 22:18:36 -0600
Subject: [PATCH 0090/1569] Adding Pica Raid Stats

wha-bam
---
 common/data/captains.js  |  8 ++++++++
 common/data/cooldowns.js |  4 +++-
 common/data/details.js   | 29 +++++++++++++++++++++++++++++
 common/data/units.js     |  4 ++--
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 9e943cec5..b39e88142 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2166,5 +2166,13 @@ window.captains = {
 	},
 	930: {
 		chainModifier: function(p) { return 2; }
+	},
+	932: {
+		atk: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+	},
+	933: {
+		atk: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
 	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 64d156d65..7bd5dac45 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -929,5 +929,7 @@ window.cooldowns = [
 	[ 21, 12 ],
 	[ 21, 12 ],
 	[ 16, 11 ],
-	[ 30, 17]
+	[ 30, 17],
+	31,
+	31
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 19f7ad0d3..758fef8b3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4314,4 +4314,33 @@ window.details = {
 		specialName: "Large Axe of Punishment",
 		special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
 	}
+	932: {
+		captain: "Boosts ATK of Tough Characters by 1.5x, and their HP by 1.5x",
+		specialName: "Rock Domination Wall",
+		special: [
+			{
+				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
+				"cooldown": 25
+			},
+			{
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
+				"cooldown": 31
+			}
+		],
+		specialNotes: "#{stages}"	}
+	933: {
+		captain: "Boosts ATK of Tough Characters by 2.25x, and their HP by 1.5x",
+		specialName: "Rock Domination Wall",
+		special: [
+			{
+				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
+				"cooldown": 25
+			},
+			{
+				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
+				"cooldown": 31
+			}
+		],
+		specialNotes: "#{stages}"	}
+	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index cde78a14e..a6ef8322d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -930,8 +930,8 @@ window.units = [
 	["Hannyabal, Impel Down Vice Warden", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	["Raid Pica", "PSY", ["Tough","Ambition"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
-	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
+	["Raid Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, null, 300, 99, 5, 1730, 630, 6, 1],
+	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, null, 1660, 552, 5, null, null, null, null],
     ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, null, null, null, null, null, null, null, null, null, null, null, null],

From 0a2b167609f2daebda94a636f8b146f238cc719d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Feb 2016 22:21:41 -0600
Subject: [PATCH 0091/1569] Too many brackets!

}
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 758fef8b3..41e4c64fb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4341,6 +4341,6 @@ window.details = {
 				"cooldown": 31
 			}
 		],
-		specialNotes: "#{stages}"	}
+		specialNotes: "#{stages}"
 	}
 };

From da9c4ee1635cec5d08a19620e73569610aff9b99 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Feb 2016 22:26:46 -0600
Subject: [PATCH 0092/1569] Commas

I dropped these: , ,
---
 common/data/details.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 41e4c64fb..b611e62dd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4313,7 +4313,7 @@ window.details = {
 	931: {
 		specialName: "Large Axe of Punishment",
 		special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
-	}
+	},
 	932: {
 		captain: "Boosts ATK of Tough Characters by 1.5x, and their HP by 1.5x",
 		specialName: "Rock Domination Wall",
@@ -4327,7 +4327,8 @@ window.details = {
 				"cooldown": 31
 			}
 		],
-		specialNotes: "#{stages}"	}
+		specialNotes: "#{stages}"	
+		},
 	933: {
 		captain: "Boosts ATK of Tough Characters by 2.25x, and their HP by 1.5x",
 		specialName: "Rock Domination Wall",

From 15be017493c32135b7d061cfffa18da556204496 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Feb 2016 22:29:59 -0600
Subject: [PATCH 0093/1569] evo & update

wamo bamo
---
 common/data/evolutions.js | 2 +-
 index.html                | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b43d864c3..ae6e2df18 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1413,7 +1413,7 @@ window.evolutions = {
     },
     932: {
         evolution: 933,
-        evolvers: []
+		evolvers: [ 118, 87, 266, 303, 103 ]
     },
     934: {
         evolution: 935,
diff --git a/index.html b/index.html
index 45ffead4e..b0b978bab 100644
--- a/index.html
+++ b/index.html
@@ -35,12 +35,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
             
-            <p>22/02/2016</p>
+            <p>25/02/2016</p>
             <br>
             <ul>
                 <li>Added Instructions to Calculator</li>
                 <li>Added Boa Boat with Placeholder Stats</li>
                 <li>New 3D2Y Units + Legend Jimbe!</li>
+				<li>Pica Raid boss stats added!</li>
                 <li>Added Server Time to Drop Page</li>
                 </ul>
         </div>

From 23bc3a31bc7288d696328c0b7965d7f5c1bb1325 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Feb 2016 22:57:36 -0600
Subject: [PATCH 0094/1569] Max Pica Stats

updated
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index a6ef8322d..76914b7bc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -931,7 +931,7 @@ window.units = [
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	["Raid Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, null, 300, 99, 5, 1730, 630, 6, 1],
-	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, null, 1660, 552, 5, null, null, null, null],
+	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, null, 1660, 552, 5, 4050, 1180, 9, 1],
     ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, null, null, null, null, null, null, null, null, null, null, null, null],

From 8788760de81c776be0b4ab500d1961bc3a3a5adc Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 26 Feb 2016 10:22:46 +0100
Subject: [PATCH 0095/1569] Almost Complete Pica

Just missing Traslations for name and name of special
---
 common/data/aliases.js   |  4 ++--
 common/data/cooldowns.js | 16 +++++++++++++---
 common/data/details.js   | 10 +++++-----
 common/data/units.js     |  4 ++--
 drops/index.html         |  2 +-
 5 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index aa2f7d1be..155869820 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -930,8 +930,8 @@ window.aliases = {
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
     931: ['ブルゴリ ','','Blue Gorilla'],
-    932: ['',''],
-    933: ['',''],
+    932: ['ピーカ',''],
+    933: ['ピーカ ドンキホーテ海賊団',''],
     934: ['',''],
     935: ['',''],
     936: ['',''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7bd5dac45..0a05ebbc8 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -929,7 +929,17 @@ window.cooldowns = [
 	[ 21, 12 ],
 	[ 21, 12 ],
 	[ 16, 11 ],
-	[ 30, 17],
-	31,
-	31
+	[ 30, 17 ],
+	null, //Pica has Stages - Look into details
+	null, //Pica has Stages - Look into details
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null
 ];
diff --git a/common/data/details.js b/common/data/details.js
index b611e62dd..bb6516437 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4320,11 +4320,11 @@ window.details = {
 		special: [
 			{
 				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
-				"cooldown": 25
+				"cooldown": [ 24, 11 ]
 			},
 			{
 				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
-				"cooldown": 31
+				"cooldown": [ 31, 17 ]
 			}
 		],
 		specialNotes: "#{stages}"	
@@ -4335,11 +4335,11 @@ window.details = {
 		special: [
 			{
 				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
-				"cooldown": 25
+				"cooldown": [ 24, 11 ]
 			},
 			{
-				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
-				"cooldown": 31
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
+				"cooldown": [ 31, 17 ]
 			}
 		],
 		specialNotes: "#{stages}"
diff --git a/common/data/units.js b/common/data/units.js
index 76914b7bc..5001e5910 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -930,8 +930,8 @@ window.units = [
 	["Hannyabal, Impel Down Vice Warden", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	["Raid Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, null, 300, 99, 5, 1730, 630, 6, 1],
-	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, null, 1660, 552, 5, 4050, 1180, 9, 1],
+	["Raid Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
+	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
     ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
diff --git a/drops/index.html b/drops/index.html
index 778ab6045..99a8d9cdd 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -140,7 +140,7 @@ <h1 class="page-header">Bonus Table</h1>
             
             <div>
                 <p id="times"></p>
-                <p id="timesNote">The Events in the Japanese Version only last from 12AM till 12PM. Global ones are the whole Day.</p>
+                <p id="timesNote"></p>
             </div>
             
             <table class="table table-striped" id="bonus-table" add-bonuses>

From fb54a97b4344fc4831906084782c0d5e09dc1d91 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 26 Feb 2016 10:44:31 +0100
Subject: [PATCH 0096/1569] Added GW link for Pica

---
 common/data/details.js | 4 ++--
 common/data/gw.js      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index bb6516437..162d96b16 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4320,7 +4320,7 @@ window.details = {
 		special: [
 			{
 				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
-				"cooldown": [ 24, 11 ]
+				"cooldown": [ 25, 11 ]
 			},
 			{
 				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
@@ -4335,7 +4335,7 @@ window.details = {
 		special: [
 			{
 				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
-				"cooldown": [ 24, 11 ]
+				"cooldown": [ 25, 11 ]
 			},
 			{
 				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
diff --git a/common/data/gw.js b/common/data/gw.js
index 9db37109b..59b776f9b 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306];
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506];

From b0a07ddab88a178b68b98c2f32c25ebf3981f825 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 26 Feb 2016 13:51:43 +0100
Subject: [PATCH 0097/1569] Finished Boa Ship

---
 common/data/ships.js | 6 +++---
 index.html           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 2ccf14cb1..4378d5840 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -179,16 +179,16 @@ window.ships = [
     },
     
     { //14
-        name: 'Boa Ship',
+        name: 'Kuja Pirate Ship',
         thumb: null,
         description: 'Boosts ATK of Freedom characters by 1.5x and their HP by 1.35x, reduces the HP of everyone else by ?x. Special: heals the crew by 6,500HP (cooldown: 15 turns).',
         atk: function(p) {
             return !p.unit.class.has('Freedom') ? 1 :
-            [ 1.2, 1.2, 1.2, 1.25, 1.25, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
+            [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
             return !p.unit.class.has('Freedom') ? 0.01 :
-                [ 1, 1.1, 1.1, 1.1, 1.2, 1.2, 1.25, 1.25, 1.35, 1.35 ][p.boatLevel - 1];
+                [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.35 ][p.boatLevel - 1];
         }
     }
 
diff --git a/index.html b/index.html
index b0b978bab..1d901f0c6 100644
--- a/index.html
+++ b/index.html
@@ -39,7 +39,7 @@
             <br>
             <ul>
                 <li>Added Instructions to Calculator</li>
-                <li>Added Boa Boat with Placeholder Stats</li>
+                <li>Finished Boa Ship</li>
                 <li>New 3D2Y Units + Legend Jimbe!</li>
 				<li>Pica Raid boss stats added!</li>
                 <li>Added Server Time to Drop Page</li>

From 278f79efc4d94fccedb06ea60055d9efe7b0b334 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 26 Feb 2016 09:51:28 -0600
Subject: [PATCH 0098/1569] pica's name

fixed his name to match his voice
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 5001e5910..29816e564 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -930,8 +930,8 @@ window.units = [
 	["Hannyabal, Impel Down Vice Warden", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	["Raid Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
-	["Raid Pica Evolved", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
+	["Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
+	["Pica, Donquixote Pirates", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
     ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, null, null, null, null, null, null, null, null, null, null, null, null],
     ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, null, null, null, null, null, null, null, null, null, null, null, null],

From 61d372167e1c7808701f84f97811d1362c74318f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 26 Feb 2016 10:20:31 -0600
Subject: [PATCH 0099/1569] Franky special

preliminary guess at Franky's special based on talking.
---
 common/data/details.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 162d96b16..2f2715c29 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4343,5 +4343,13 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}"
+	},
+	943: {
+		specialName: "The Nightmare of Barujimoa",
+		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
+	},
+	944: {
+		specialName: "The Nightmare of Barujimoa",
+		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
 	}
 };

From 943168c743bae6dbd2cfaf77fadbaa1b16a04ccc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 26 Feb 2016 23:04:49 -0600
Subject: [PATCH 0100/1569] Tom's Workers

Updated Mission
---
 common/data/drops.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 09f37d314..551cf1383 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -898,7 +898,9 @@ window.drops = {
         {
             name: "Legendary Shipbuilding Company Tom's Workers",
             thumb: 848,
-            condition: 'You can only bring Impact and Freedom units',
+            condition: 'You can only bring Impact and Freedom units. (No Evo/Boosters)',
+            challenge: 'Total Damage dealt to enemies in one turn',
+            challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
             Expert: [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ],
             Elite: [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ]
         },

From 118667b24b952f5f52007de18fe2a7963c71019e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sat, 27 Feb 2016 01:08:11 -0600
Subject: [PATCH 0101/1569] Usopp Special

estimation
---
 common/data/details.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 2f2715c29..b894fd449 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4344,6 +4344,14 @@ window.details = {
 		],
 		specialNotes: "#{stages}"
 	},
+	940: {
+		specialName: "Fat Usopp Special",
+		special: "Deals [DEX] damage to all enemies, and boosts the ATK of [DEX] characters"
+	},
+	941: {
+		specialName: "Fat Usopp Special",
+		special: "Deals [DEX] damage to all enemies, and boosts the ATK of [DEX] characters"
+	},
 	943: {
 		specialName: "The Nightmare of Barujimoa",
 		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"

From de31f1683920a20665cac6759d8aad208fdb6c84 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 28 Feb 2016 14:56:45 +0100
Subject: [PATCH 0102/1569] Removed Evoled Hannyabal from Drops

---
 common/data/drops.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 551cf1383..dadcab998 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -948,8 +948,8 @@ window.drops = {
             name: "Hannyabal's Great Ambition",
             thumb: 929,
             condition: 'You can only bring STR units',
-            Expert: [ 928, 929, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ],
-            Elite: [ 928, 929, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
+            Expert: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ],
+            Elite: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
         }
 
     ],

From 18bb90b73fb37505272b918d13bfca3766706209 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 28 Feb 2016 15:06:13 +0100
Subject: [PATCH 0103/1569] Added Nami special

---
 common/data/details.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index b894fd449..842c7cb75 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4344,19 +4344,27 @@ window.details = {
 		],
 		specialNotes: "#{stages}"
 	},
+	938: {
+		specialName: "Cyclone Burst",
+		special: "Reduces Bind duration for one character completely, for Striker and Knowledge characters, changes Bad orbs to Matching"
+	},
+	939: {
+		specialName: "Cyclone Burst",
+		special: "Reduces Bind duration for one character completely, for Striker and Knowledge characters, changes Bad orbs to Matching"
+	},
 	940: {
-		specialName: "Fat Usopp Special",
+		specialName: "Sure Kill: Exploding Star",
 		special: "Deals [DEX] damage to all enemies, and boosts the ATK of [DEX] characters"
 	},
 	941: {
-		specialName: "Fat Usopp Special",
+		specialName: "Sure Kill: Exploding Star",
 		special: "Deals [DEX] damage to all enemies, and boosts the ATK of [DEX] characters"
 	},
-	943: {
+	942: {
 		specialName: "The Nightmare of Barujimoa",
 		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
 	},
-	944: {
+	943: {
 		specialName: "The Nightmare of Barujimoa",
 		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
 	}

From c51f904a9853dc1c6b9add9d656114041e610f16 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 28 Feb 2016 18:29:55 +0100
Subject: [PATCH 0104/1569] Meta Change for Linking

---
 characters/index.html |  2 +-
 damage/index.html     |  2 +-
 drops/index.html      |  2 +-
 drops/index.js        |  2 +-
 index.html            | 19 ++++++++++++++++++-
 mats/index.html       |  2 +-
 slots/index.html      |  2 +-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/characters/index.html b/characters/index.html
index 749728deb..2f80f6845 100644
--- a/characters/index.html
+++ b/characters/index.html
@@ -4,7 +4,7 @@
     <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">
 
         <title>One Piece Treasure Cruise Character Table</title>
 
diff --git a/damage/index.html b/damage/index.html
index 8d0139244..46a38aa49 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=yes, user-scalable=1">
-        <meta name="description" itemprop="description" content="We math now">
+        <meta name="description" itemprop="description" content="One Piece Treasure Cruise Damage Calculator">
 
         <title>One Piece Treasure Cruise Damage Calculator</title>
 
diff --git a/drops/index.html b/drops/index.html
index 99a8d9cdd..f9e4696b1 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=no, user-scalable=0">
-        <meta name="description" itemprop="description" content="We tables now">
+        <meta name="description" itemprop="description" content="One Piece Treasure Cruise Drop Table">
 
         <title>One Piece Treasure Cruise Drop Table</title>
 
diff --git a/drops/index.js b/drops/index.js
index 3a7d6eff6..5a28dc847 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -236,7 +236,7 @@ function updateTimes(){
     if(moment().tz('Asia/Tokyo').format('H')>12 && moment().tz('Asia/Tokyo').format('H')<23){
         document.getElementById("timesNote").innerHTML = "<b>Japan Bonuses are currently active<b>";
     }else{
-         document.getElementById("timesNote").innerHTML = "The Events in the Japanese Version only last from 12:00 till 23:00";
+         document.getElementById("timesNote").innerHTML = "The  in the Japanese Version only last from 12:00 till 23:00";
     }
     tt=refreshTimer();
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 1d901f0c6..bbf0e637c 100644
--- a/index.html
+++ b/index.html
@@ -1,7 +1,24 @@
 <html>
+<!--
+                           ____   _   __ ______   ____   ____ ______ ______ ______                 
+                          / __ \ / | / // ____/  / __ \ /  _// ____// ____// ____/                 
+                         / / / //  |/ // __/    / /_/ / / / / __/  / /    / __/                    
+                        / /_/ // /|  // /___   / ____/_/ / / /___ / /___ / /___                    
+                        \____//_/ |_//_____/  /_/    /___//_____/ \____//_____/                    
+  ______ ____   ______ ___    _____  __  __ ____   ______   ______ ____   __  __ ____ _____  ______
+ /_  __// __ \ / ____//   |  / ___/ / / / // __ \ / ____/  / ____// __ \ / / / //  _// ___/ / ____/
+  / /  / /_/ // __/  / /| |  \__ \ / / / // /_/ // __/    / /    / /_/ // / / / / /  \__ \ / __/   
+ / /  / _, _// /___ / ___ | ___/ // /_/ // _, _// /___   / /___ / _, _// /_/ /_/ /  ___/ // /___   
+/_/  /_/ |_|/_____//_/  |_|/____/ \____//_/ |_|/_____/   \____//_/ |_| \____//___/ /____//_____/   
+                       ____   ___   ______ ___     ____   ___    _____  ______                     
+                      / __ \ /   | /_  __//   |   / __ ) /   |  / ___/ / ____/                     
+                     / / / // /| |  / /  / /| |  / __  |/ /| |  \__ \ / __/                        
+                    / /_/ // ___ | / /  / ___ | / /_/ // ___ | ___/ // /___                        
+                   /_____//_/  |_|/_/  /_/  |_|/_____//_/  |_|/____//_____/
+-->
 
     <head>
-        <title>OPTC Stuff</title>
+        <title>OPTC Database</title>
         <link rel="stylesheet" type="text/css" href="common/libs/css/animate.css" />
         <link rel="stylesheet" type="text/css" href="common/libs/css/font-awesome.min.css" />
         <link rel="stylesheet" type="text/css" href="index.css" />
diff --git a/mats/index.html b/mats/index.html
index 5a3afe75a..df35c1fd9 100644
--- a/mats/index.html
+++ b/mats/index.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=no, user-scalable=0">
-        <meta name="description" itemprop="description" content="We tally now">
+        <meta name="description" itemprop="description" content="One Piece Treasure Cruise Evolution Helper">
 
         <title>One Piece Treasure Cruise Evolution Helper</title>
 
diff --git a/slots/index.html b/slots/index.html
index 76da0ad8b..a36868ba8 100644
--- a/slots/index.html
+++ b/slots/index.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=yes, user-scalable=1">
-        <meta name="description" itemprop="description" content="We slots now">
+        <meta name="description" itemprop="description" content="One Piece Treasure Cruise Slot Planner">
 
         <title>One Piece Treasure Cruise Slot Planner</title>
 

From b4e276f0dda864436ffe70ffa2da94cca6254657 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 29 Feb 2016 01:33:10 -0600
Subject: [PATCH 0105/1569] Luffy Special

added
---
 common/data/details.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 842c7cb75..90e86fccb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4344,6 +4344,16 @@ window.details = {
 		],
 		specialNotes: "#{stages}"
 	},
+	936: {
+		specialName: "Luffy Special",
+		special: "Deals QCK damage, and makes Perfects easier to hit",
+		specialNotes: "Not sure how this will work at the moment"
+	},
+	937: {
+		specialName: "Luffy Special",
+		special: "Deals QCK damage, and makes Perfects easier to hit",
+		specialNotes: "Not sure how this will work at the moment"
+	},
 	938: {
 		specialName: "Cyclone Burst",
 		special: "Reduces Bind duration for one character completely, for Striker and Knowledge characters, changes Bad orbs to Matching"

From ce70466e3db283e9d0e816d85c37c5e1957890d9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 29 Feb 2016 16:14:26 -0600
Subject: [PATCH 0106/1569] Small changes

Small damage ranges and cooldowns added.
---
 common/data/cooldowns.js | 6 +++---
 common/data/details.js   | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0a05ebbc8..7733b2b36 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -810,7 +810,7 @@ window.cooldowns = [
 	[ 25, 13 ],
 	[ 25, 13 ],
 	[ 20, 6 ],
-	20,
+	[ 20, 13 ],
 	17,
 	18,
 	[ 22, 16 ],
@@ -887,8 +887,8 @@ window.cooldowns = [
 	[ 28, 19 ],
 	[ 32, 18 ],
 	[ 25, 15 ],
-	20,
-	20,
+	[ 20, 12 ],
+	[ 20, 12 ],
 	18,
 	14,
 	[ 28, 22 ],
diff --git a/common/data/details.js b/common/data/details.js
index 90e86fccb..d5f058eda 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2687,12 +2687,14 @@ window.details = {
 	632: {
 		special: "Randomly changes all orbs into either [STR], [PSY] or [INT] orbs, deals random STR damage to all enemies, reduces the defense of all enemies by 50% for 2 turns",
 		specialName: "Finger Pistol: Yellow Lotus",
-		captain: "Boosts ATK of Fighter characters by 1.5x"
+		captain: "Boosts ATK of Fighter characters by 1.5x",
+		specialNotes: "#{random : 2,000 : 20,000}"
 	},
 	633: {
 		special: "Randomly changes all orbs into either [STR], [PSY] or [INT] orbs, deals random STR damage to all enemies, reduces the defense of all enemies by 50% for 2 turns",
 		specialName: "Finger Pistol: Yellow Lotus",
-		captain: "Boosts ATK of Fighter characters by 2x"
+		captain: "Boosts ATK of Fighter characters by 2x",
+		specialNotes: "#{random : 2,000 : 20,000}"
 	},
 	634: {
 		special: "Boosts chances of getting [QCK] and [PSY] orbs for 3 turns, boosts ATK of QCK and PSY characters by 1.2x for 3 turns",

From 7950829bec756a37042c16d8b2288d301b655129 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 29 Feb 2016 22:10:12 -0600
Subject: [PATCH 0107/1569] All new 3D2Y units updated

lets see where I missed commas
---
 common/data/cooldowns.js | 22 ++++++++++++----------
 common/data/details.js   | 40 ++++++++++++++++++++++++++++++++++------
 common/data/families.js  | 20 +++++++++++++++++++-
 common/data/flags.js     | 13 ++++++++++++-
 common/data/units.js     | 19 ++++++++++---------
 5 files changed, 87 insertions(+), 27 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7733b2b36..d44a43532 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -932,14 +932,16 @@ window.cooldowns = [
 	[ 30, 17 ],
 	null, //Pica has Stages - Look into details
 	null, //Pica has Stages - Look into details
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null
+    19,
+    19,
+    19,
+    19,
+    24,
+    24,
+    21,
+    21,
+    15,
+	15,
+    13,
+	13
 ];
diff --git a/common/data/details.js b/common/data/details.js
index d5f058eda..5d3a03897 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4346,38 +4346,66 @@ window.details = {
 		],
 		specialNotes: "#{stages}"
 	},
+	934: {
+		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
+		specialName: "Legend Jinbei Special",
+		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching"
+	},
+	935: {
+		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
+		specialName: "Legend Jinbei Special",
+		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching"
+	},
 	936: {
+		captain: "Boosts Chain Multiplier by 3x",
 		specialName: "Luffy Special",
-		special: "Deals QCK damage, and makes Perfects easier to hit",
+		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
 		specialNotes: "Not sure how this will work at the moment"
 	},
 	937: {
+		captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.2x",
 		specialName: "Luffy Special",
-		special: "Deals QCK damage, and makes Perfects easier to hit",
+		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
 		specialNotes: "Not sure how this will work at the moment"
 	},
 	938: {
+		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Knowledge characters by 2x",
 		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely, for Striker and Knowledge characters, changes Bad orbs to Matching"
+		special: "Reduces Bind duration for one character completely. For Striker and Knowledge characters, changes Bad orbs to Matching"
 	},
 	939: {
+		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Knowledge characters by 2x",
 		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely, for Striker and Knowledge characters, changes Bad orbs to Matching"
+		special: "Reduces Bind duration for one character completely. For Striker and Knowledge characters, changes Bad orbs to Matching"
 	},
 	940: {
+		captain: "Boosts [DEX] Characters ATK and HP by 1.5x",
 		specialName: "Sure Kill: Exploding Star",
-		special: "Deals [DEX] damage to all enemies, and boosts the ATK of [DEX] characters"
+		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	941: {
+		captain: "Boosts [DEX] Characters ATK by 2.25x and their HP by 1.75x",
 		specialName: "Sure Kill: Exploding Star",
-		special: "Deals [DEX] damage to all enemies, and boosts the ATK of [DEX] characters"
+		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	942: {
+		captain: "Boosts [STR] Characters ATK and HP by 1.5x",
 		specialName: "The Nightmare of Barujimoa",
 		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
 	},
 	943: {
+		captain: "Boosts [STR] Characters ATK by 2.25x and their HP by 1.75x",
 		specialName: "The Nightmare of Barujimoa",
 		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
+	},
+	944: {
+		captain: "Boosts the ATK and RCV of Ambition Characters by 1.2x",
+		specialName: "Bridal Perona Special",
+		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
+	},
+	945: {
+		captain: "Boosts the ATK and RCV of Ambition Characters by 1.2x",
+		specialName: "Bridal Perona Special",
+		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index c6f82d3f5..fd8afe607 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -925,5 +925,23 @@ window.families = [
     "Eustass Kid",
     "Sadi-chan",
     "Sadi-chan",
-    "Doberman"
+    "Doberman",
+	"Hannyabal",
+	"Hannyabal",
+	"Saldeath",
+	null,
+	"Pica",
+	"Pica",
+	"Jimbe",
+	"Jimbe",
+	"Monkey D. Luffy",
+	"Monkey D. Luffy",
+	"Nami",
+	"Nami",
+	"Usopp",
+	"Usopp",
+	"Franky",
+	"Franky",
+	"Perona",
+	"Perona"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 747c76b30..13d416f29 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -727,5 +727,16 @@ window.flags = {
 	915: { rr: 1, rro: 1, lrr: 1 },
 	916: { rr: 1, rro: 1, lrr: 1 },
     921: { rr: 1, rro: 1, lrr: 1 },
-    922: { rr: 1, rro: 1, lrr: 1 }
+    922: { rr: 1, rro: 1, lrr: 1 },
+	934: { rr: 1, rro: 1 },
+	935: { rr: 1, rro: 1 },
+	936: { rr: 1, rro: 1 },
+	937: { rr: 1, rro: 1 },
+	938: { rr: 1, rro: 1 },
+	939: { rr: 1, rro: 1 },
+	940: { rr: 1, rro: 1 },
+	941: { rr: 1, rro: 1 },
+	942: { rr: 1, rro: 1 },
+	943: { rr: 1, rro: 1, lrr: 1 },
+	944: { rr: 1, rro: 1, lrr: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 29816e564..ce673bc85 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -932,14 +932,15 @@ window.units = [
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	["Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	["Pica, Donquixote Pirates", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-    ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, null, null, null, null],
+    ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
+    ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, null, null, null, null],
     ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Nami Evolved", "PSY", ["Striker","Knowledge"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Usopp", "DEX", "Fighter", 4, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, null, null, null, null, null, null, null, null, null, null, null, null],
-    ["3D2Y Franky Evolved", "STR", ["Freedom","Shooter"], 5, null, null, null, null, null, null, null, null, null, null, null, null]
+    ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, null, null, null, null],
+    ["3D2Y Nami Evolved", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
+    ["3D2Y Usopp", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, null, null, null, null],
+    ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, null, null, null, null],
+    ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, null, null, null, null],
+    ["3D2Y Franky Evolved", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, null, null, null, null],
+	["Bridal Perona", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, null, null, null, null],
 ];

From 4fe9a21cb800641d1944ea758a6eedb4e75eae22 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 29 Feb 2016 22:17:38 -0600
Subject: [PATCH 0108/1569] Recommit Perona

got lost somehow.
---
 common/data/cooldowns.js | 4 ++--
 common/data/details.js   | 4 ++--
 common/data/flags.js     | 5 +++--
 common/data/units.js     | 1 +
 index.html               | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d44a43532..80ac1eed4 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -942,6 +942,6 @@ window.cooldowns = [
     21,
     15,
 	15,
-    13,
-	13
+    [ 13, 13 ],
+	[ 13, 13 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 5d3a03897..eae56cd9e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4391,12 +4391,12 @@ window.details = {
 	942: {
 		captain: "Boosts [STR] Characters ATK and HP by 1.5x",
 		specialName: "The Nightmare of Barujimoa",
-		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
+		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	943: {
 		captain: "Boosts [STR] Characters ATK by 2.25x and their HP by 1.75x",
 		specialName: "The Nightmare of Barujimoa",
-		special: "Reduces damage receied from [QCK] enemies by 100% for 1 turn"
+		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	944: {
 		captain: "Boosts the ATK and RCV of Ambition Characters by 1.2x",
diff --git a/common/data/flags.js b/common/data/flags.js
index 13d416f29..a90990095 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -737,6 +737,7 @@ window.flags = {
 	940: { rr: 1, rro: 1 },
 	941: { rr: 1, rro: 1 },
 	942: { rr: 1, rro: 1 },
-	943: { rr: 1, rro: 1, lrr: 1 },
-	944: { rr: 1, rro: 1, lrr: 1 }
+	943: { rr: 1, rro: 1 },
+	944: { rr: 1, rro: 1, lrr: 1 },
+	945: { rr: 1, rro: 1, lrr: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index ce673bc85..b9c2bdf58 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -943,4 +943,5 @@ window.units = [
     ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, null, null, null, null],
     ["3D2Y Franky Evolved", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, null, null, null, null],
 	["Bridal Perona", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, null, null, null, null],
+    ["Bridal Perona Evolved", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, null, null, null, null]
 ];
diff --git a/index.html b/index.html
index bbf0e637c..17d5b9330 100644
--- a/index.html
+++ b/index.html
@@ -55,9 +55,9 @@
             <p>25/02/2016</p>
             <br>
             <ul>
-                <li>Added Instructions to Calculator</li>
-                <li>Finished Boa Ship</li>
                 <li>New 3D2Y Units + Legend Jimbe!</li>
+				<li>Full info of 3D2Y units added!</li>
+				<br>
 				<li>Pica Raid boss stats added!</li>
                 <li>Added Server Time to Drop Page</li>
                 </ul>

From 06c62f49a87bb907a06cbc525c2b95b029627086 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 29 Feb 2016 22:33:35 -0600
Subject: [PATCH 0109/1569] Luffy stats, special notes

Just need MAX level stats now
---
 common/data/details.js | 10 ++++++----
 common/data/units.js   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index eae56cd9e..7c0807c7e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4349,24 +4349,26 @@ window.details = {
 	934: {
 		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
 		specialName: "Legend Jinbei Special",
-		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching"
+		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
+		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	935: {
 		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
 		specialName: "Legend Jinbei Special",
-		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching"
+		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
+		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	936: {
 		captain: "Boosts Chain Multiplier by 3x",
 		specialName: "Luffy Special",
 		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
-		specialNotes: "Not sure how this will work at the moment"
+		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	937: {
 		captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.2x",
 		specialName: "Luffy Special",
 		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
-		specialNotes: "Not sure how this will work at the moment"
+		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	938: {
 		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Knowledge characters by 2x",
diff --git a/common/data/units.js b/common/data/units.js
index b9c2bdf58..53248aff2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -935,7 +935,7 @@ window.units = [
     ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, null, null, null, null],
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
     ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, null, null, null, null],
-    ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, null, null, null, null, null, null, null, null, null, null, null, null],
+    ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, null, null, null, null, null],
     ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, null, null, null, null],
     ["3D2Y Nami Evolved", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
     ["3D2Y Usopp", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, null, null, null, null],

From 79cadd8de64f7d565f3cb6e32c1713c041b76f65 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 29 Feb 2016 23:27:27 -0600
Subject: [PATCH 0110/1569] Luffy

max stats added
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 53248aff2..3f83499f9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -934,7 +934,7 @@ window.units = [
 	["Pica, Donquixote Pirates", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
     ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, null, null, null, null],
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-    ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, null, null, null, null],
+    ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
     ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, null, null, null, null, null],
     ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, null, null, null, null],
     ["3D2Y Nami Evolved", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],

From d3117c5b141e2cd64385ce58060de9f842b99853 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 1 Mar 2016 09:55:24 +0100
Subject: [PATCH 0111/1569] Added gw link to new Units

---
 common/data/gw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index 59b776f9b..3baaf117d 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506];
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807];

From 5c0486f2508bd6c35a084dea6ac2e18b252fbf03 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 1 Mar 2016 10:16:50 +0100
Subject: [PATCH 0112/1569] Fixes + Evolution Materials for 3D2Y

---
 common/data/details.js    |  8 ++++----
 common/data/evolutions.js | 14 +++++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 7c0807c7e..bbd389917 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4365,13 +4365,13 @@ window.details = {
 		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	937: {
-		captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.2x",
+		captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.25x",
 		specialName: "Luffy Special",
 		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
 		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	938: {
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Knowledge characters by 2x",
+		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Knowledge characters by 1.5x",
 		specialName: "Cyclone Burst",
 		special: "Reduces Bind duration for one character completely. For Striker and Knowledge characters, changes Bad orbs to Matching"
 	},
@@ -4386,7 +4386,7 @@ window.details = {
 		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	941: {
-		captain: "Boosts [DEX] Characters ATK by 2.25x and their HP by 1.75x",
+		captain: "Boosts [DEX] Characters ATK by 1.5x and their HP by 2.25x",
 		specialName: "Sure Kill: Exploding Star",
 		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
 	},
@@ -4406,7 +4406,7 @@ window.details = {
 		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	},
 	945: {
-		captain: "Boosts the ATK and RCV of Ambition Characters by 1.2x",
+		captain: "Boosts the ATK and RCV of Ambition Characters by 1.75x",
 		specialName: "Bridal Perona Special",
 		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	}
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ae6e2df18..1daa36dc0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1417,22 +1417,26 @@ window.evolutions = {
     },
     934: {
         evolution: 935,
-        evolvers: []
+        evolvers: [ 118, 88, 266, 304, 104 ]
     },
     936: {
         evolution: 937,
-        evolvers: []
+        evolvers: [ 118, 94, 96, 301, 101 ]
     },
     938: {
         evolution: 939,
-        evolvers: []
+        evolvers: [ 117, 118, 83, 87, 103 ]
     },
     940: {
         evolution: 941,
-        evolvers: []
+        evolvers: [ 94, 97, 97, 302, 102 ]
     },
     942: {
         evolution: 943,
-        evolvers: []
+        evolvers: [ 118, 83, 84, 95, 100 ]
+    },
+    944: {
+        evolution: 945,
+        evolvers: [ 84, 85, 86, 87, 88 ]
     }
 };
\ No newline at end of file

From 8cae3f223a6575815c06cb29a93f5a4b7965d292 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 09:08:13 -0600
Subject: [PATCH 0113/1569] captains/specials

of 3d2y units added
---
 common/data/captains.js | 55 +++++++++++++++++++++++++++++++++++++++++
 common/data/specials.js | 18 ++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index b39e88142..925a33b24 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2174,5 +2174,60 @@ window.captains = {
 	933: {
 		atk: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; },
 		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+	},
+	934: {
+		atk: function(p) {
+			if(p.percHP<30 || p.percHP>70){
+                return p.unit.class.has("Fighter") ? 2.75 : 1;
+            } else {
+                return p.unit.class.has("Fighter") ? 2 : 1;
+            }
+		}
+	},
+	935: {
+		atk: function(p) {
+			if(p.percHP<30 || p.percHP>70){
+                return p.unit.class.has("Fighter") ? 2.75 : 1;
+            } else {
+                return p.unit.class.has("Fighter") ? 2 : 1;
+            }
+		}
+	},
+	936: {
+		chainModifier: function(p) { return 3; }
+	},
+	937: {
+		chainModifier: function(p) { return 3.5; },
+		hp: function(p) { return 1.25; }
+	},
+	938: {
+		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+	},
+	939: {
+		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+	},
+	940: {
+		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+		hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+	},
+	941: {
+		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+		hp: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
+	},
+	942: {
+		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+		hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+	},
+	943: {
+		atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
+		hp: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
+	},
+	944: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 1.2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.2 : 1; }
+	},
+	945: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; },
+		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; }
 	}
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 651f1b002..43220d25b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1064,5 +1064,23 @@ window.specials = {
         atk: function(p) { return 1.3; },
 		type: "condition",
 		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+    },
+	940: {
+		atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+		type: "type"
+    },
+	941: {
+		atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+		type: "type"
+    },
+	944: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
+		type: "class"
+    },
+	945: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
+		type: "class"
     }
 };
\ No newline at end of file

From 1bfd63c6e4047c89ffc68faea2055770eb808d69 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 09:14:52 -0600
Subject: [PATCH 0114/1569] update aliases

3d2y
---
 common/data/aliases.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 155869820..87051019a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -934,12 +934,14 @@ window.aliases = {
     933: ['ピーカ ドンキホーテ海賊団',''],
     934: ['',''],
     935: ['',''],
-    936: ['',''],
-    937: ['',''],
-    938: ['',''],
-    939: ['',''],
-    940: ['',''],
-    941: ['',''],
-    942: ['',''],
-    943: ['','']
+    936: ['','','Timeskip Luffy'],
+    937: ['','','Timeskip Luffy'],
+    938: ['','','Timeskip Nami'],
+    939: ['','','Timeskip Nami'],
+    940: ['','','Timeskip Usopp'],
+    941: ['','','Timeskip Usopp'],
+    942: ['','','Timeskip Franky'],
+    943: ['','','Timeskip Franky'],
+	944: ['','','Wedding Perona'],
+    945: ['','','Wedding Perona']
 };

From 5b5e299f5a79b0da50bb29326ef395cea8bc5af0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 09:24:35 -0600
Subject: [PATCH 0115/1569] Max stats/aliases

jimmmbeeyyy
---
 common/data/aliases.js |  4 ++--
 common/data/units.js   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 87051019a..a719cfb45 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -932,8 +932,8 @@ window.aliases = {
     931: ['ブルゴリ ','','Blue Gorilla'],
     932: ['ピーカ',''],
     933: ['ピーカ ドンキホーテ海賊団',''],
-    934: ['',''],
-    935: ['',''],
+    934: ['','', 'Jinbe', 'Jimbe', 'Jinbei'],
+    935: ['','', 'Jinbe', 'Jimbe', 'Jinbei'],
     936: ['','','Timeskip Luffy'],
     937: ['','','Timeskip Luffy'],
     938: ['','','Timeskip Nami'],
diff --git a/common/data/units.js b/common/data/units.js
index 3f83499f9..88b4bbb1b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -932,16 +932,16 @@ window.units = [
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	["Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	["Pica, Donquixote Pirates", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-    ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, null, null, null, null],
+    ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
     ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
     ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-    ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, null, null, null, null, null],
-    ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, null, null, null, null],
+    ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
+    ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
     ["3D2Y Nami Evolved", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
     ["3D2Y Usopp", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, null, null, null, null],
-    ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, null, null, null, null],
-    ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, null, null, null, null],
+    ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
+    ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
     ["3D2Y Franky Evolved", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, null, null, null, null],
-	["Bridal Perona", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, null, null, null, null],
+	["Bridal Perona", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
     ["Bridal Perona Evolved", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, null, null, null, null]
 ];

From 026162d873a62888a045ae993e79ab948077e3a6 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 09:44:10 -0600
Subject: [PATCH 0116/1569] Jinbei

forgot HP
---
 common/data/captains.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 925a33b24..43b121c25 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2182,7 +2182,8 @@ window.captains = {
             } else {
                 return p.unit.class.has("Fighter") ? 2 : 1;
             }
-		}
+		},
+		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
 	},
 	935: {
 		atk: function(p) {
@@ -2191,7 +2192,8 @@ window.captains = {
             } else {
                 return p.unit.class.has("Fighter") ? 2 : 1;
             }
-		}
+		},
+		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
 	},
 	936: {
 		chainModifier: function(p) { return 3; }

From 99c503b627daaed546cc01d26a973f95550ad7ee Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 12:02:34 -0600
Subject: [PATCH 0117/1569] Added Aliases

'Young' added, Cutty Flam wasn't showing up.
---
 common/data/aliases.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index a719cfb45..e0b8b2edc 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -495,8 +495,8 @@ window.aliases = {
     494: ['黒の狩猟隊　隊員 シャンディアの戦士',''],
     495: ['黄の狩猟隊　達人 シャンディアの戦士',''],
     496: ['黒の狩猟隊　達人 シャンディアの戦士',''],
-    497: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟',''],
-    498: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟“兄弟盃”',''],
+    497: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟','','Kid Ace'],
+    498: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Ace'],
     499: ['ベルメール',''],
     500: ['ベルメール ナミとノジコの養母',''],
     501: ['カヤ',''],
@@ -510,8 +510,8 @@ window.aliases = {
     509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長',''],
     510: ['最強の囚人サー・クロコダイル 元王下七武海',''],
     511: ['服役囚ダズ・ボーネス Mr.1',''],
-    512: ['サボ コルボ山の悪ガキ３兄弟',''],
-    513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”',''],
+    512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
+    513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
     514: ['ニコ・ロビン トロピカル',''],
     515: ['ヘラクレスン',''],
     516: ['ヘラクレスン 森の勇者',''],
@@ -545,8 +545,8 @@ window.aliases = {
     544: ['ワイパー 大戦士カルガラの子孫','', 'Wiper, Descendant of Great Warrior Calgara' ],
     545: ['エネル','', 'Enel' ],
     546: ['ゴッド・エネル','', 'God Enel' ],
-    547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟',''],
-    548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”',''],
+    547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟','','Kid Luffy'],
+    548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Luffy'],
     549: ['サディちゃん',''],
     550: ['サディちゃん インペルダウン獄卒長',''],
     551: ['ミノコアラ',''],
@@ -596,10 +596,10 @@ window.aliases = {
     595: ['漆黒の竜宮カメ姫','', 'Princess Turtle' ],
     596: ['トニートニー・チョッパー 航海の記録・麦わらの一味','', 'Log Chopper' ],
     597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」','', 'Log Chopper' ],
-    598: ['バギー 海賊見習い',''],
-    599: ['バギー ロジャー海賊団',''],
-    600: ['シャンクス 海賊見習い',''],
-    601: ['シャンクス ロジャー海賊団',''],
+    598: ['バギー 海賊見習い','','Young Buggy'],
+    599: ['バギー ロジャー海賊団','','Young Buggy'],
+    600: ['シャンクス 海賊見習い','','Young Shanks'],
+    601: ['シャンクス ロジャー海賊団','','Young Shanks'],
     602: ['エネル ２億Ｖ　雷神','', 'Enel, 200 Million Volt Thunder God' ],
     603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Enel the Lightning Human, 200 Million Volt Thunder God' ],
     604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji' ],
@@ -653,18 +653,18 @@ window.aliases = {
     652: ['鉄仮面のデュバル',''],
     653: ['デュバル トビウオライダーズ ヘッド',''],
     654: ['デュバル 人生バラ色ライダーズ ヘッド',''],
-    655: ['海賊アーロン',''],
-    656: ['アーロン タイヨウの海賊団',''],
-    657: ['クロオビ タイヨウの海賊団',''],
-    658: ['チュウ タイヨウの海賊団',''],
+    655: ['海賊アーロン','','Young Arlong'],
+    656: ['アーロン タイヨウの海賊団','','Young Arlong'],
+    657: ['クロオビ タイヨウの海賊団','','Young Kuroobi'],
+    658: ['チュウ タイヨウの海賊団','','Young Choo'],
     659: ['モンキー・D・ルフィ うきわ',''],
     660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp' ],
     661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp' ],
     662: ['ナミ バカンス',''],
-    663: ['ネフェルタリ・ビビ アラバスタ王国王女',''],
-    664: ['ネフェルタリ・ビビ 砂砂団　副リーダー',''],
-    665: ['コーザ アラバスタ住民',''],
-    666: ['コーザ 砂砂団　リーダー',''],
+    663: ['ネフェルタリ・ビビ アラバスタ王国王女','','Young Vivi'],
+    664: ['ネフェルタリ・ビビ 砂砂団　副リーダー','','Young Vivi'],
+    665: ['コーザ アラバスタ住民','','Young Koza'],
+    666: ['コーザ 砂砂団　リーダー','','Young Koza'],
     667: ['ネフェルタリ・コブラ アラバスタ王国国王',''],
     668: ['サボ',''],
     669: ['サボ 革命軍',''],
@@ -847,8 +847,8 @@ window.aliases = {
     846: ['バッファロー ドンキホーテ海賊団',''],
     847: ['トム トムズ　ワーカーズ',''],
     848: ['伝説の船大工トム トムズ　ワーカーズ',''],
-    849: ['カティ・フラム トムズ　ワーカーズ','', 'Franky, Tom\'s Workers' ],
-    850: ['アイスバーグ トムズ　ワーカーズ','', 'Iceburg, Tom\'s Workers' ],
+    849: ['カティ・フラム トムズ　ワーカーズ','', 'Franky, Tom\'s Workers','Young Franky' ],
+    850: ['アイスバーグ トムズ　ワーカーズ','', 'Iceburg, Tom\'s Workers','Young Iceberg' ],
     851: ['ブリキのワポル',''],
     852: ['スリムアップワポル',''],
     853: ['ロブソン',''],

From 094d47d9ea25c9d9f2ebac8c270b6c277bdd2971 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 1 Mar 2016 21:07:50 +0100
Subject: [PATCH 0118/1569] Drop/Manual Locations now link to Correct Drop Page

Completed Issue #20
---
 characters/views/details.html |  4 ++--
 drops/index.html              |  2 +-
 drops/index.js                | 11 +++++++++++
 index.html                    | 13 ++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/characters/views/details.html b/characters/views/details.html
index 51dfa52de..d788df575 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -359,7 +359,7 @@ <h3 class="page-header" ng-if="drops.length > 0">Drop Locations</h3>
                             <tr ng-if="!collapsed.drops || drops.length < 4" ng-repeat="drop in drops">
                                 <td>
                                     <div class="slot small" decorate-slot uid="drop.thumb"></div>
-                                    {{drop.name}}
+                                    <a href="{{'../drops/?'+drop.name}}" target="_blank">{{drop.name}}</a>
                                     <span ng-repeat="bonus in drop.bonuses" class="bonus {{bonus.slice(0,2)}} {{bonus.slice(3)}}"></span>
                                 </td>
                                 <td>{{drop.data.join(', ')}}</td>
@@ -391,7 +391,7 @@ <h3 class="page-header" ng-if="manuals.length > 0">Manual Locations</h3>
                             <tr ng-if="!collapsed.manuals || manuals.length < 4" ng-repeat="drop in manuals">
                                 <td>
                                     <div class="slot small" decorate-slot uid="drop.thumb"></div>
-                                    {{drop.name}}
+                                    <a href="{{'../drops/?'+drop.name}}" target="_blank">{{drop.name}}</a>
                                 </td>
                                 <td>{{drop.data.join(', ')}}</td>
                             </tr>
diff --git a/drops/index.html b/drops/index.html
index f9e4696b1..1dacc43be 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -123,7 +123,7 @@ <h1 class="page-header">
                 <label><input type="checkbox" ng-model="noEvolverBooster" ng-change="changeFilters()">Hide Boosters and Evolvers</label>
                 <label><input type="checkbox" ng-model="sortByType" ng-change="changeSorting()">Sort by type</label>
                 <input class="pull-right" type="text" placeholder="Filter by name" auto-focus
-                    ng-model="queryFilter" ng-model-options="{ debounce: 500 }" ng-change="changeQueryFilter()">
+                    ng-model="queryFilter" ng-model-options="{ debounce: 500 }" ng-change="changeQueryFilter()" id="search">
             </h1>
 
             <div ng-repeat="type in [ 'Story Island', 'Weekly Island', 'Fortnight', 'Raid', 'Special' ]"
diff --git a/drops/index.js b/drops/index.js
index 5a28dc847..2b0085d68 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -18,6 +18,8 @@ app.controller('MainCtrl',function($scope, $rootScope, $timeout, $controller) {
     $rootScope.query = '';
     $scope.data = drops;
     $scope.hiddenUnits = [ ];
+    var searchQuery = location.search.replace('?','');
+    
 
     // units
     $scope.reverse = function(x) { return -x; };
@@ -33,6 +35,11 @@ app.controller('MainCtrl',function($scope, $rootScope, $timeout, $controller) {
         if (!$scope.$$phase) $scope.$apply();
     };
 
+    //Use URI for one time search
+    if(searchQuery!=""){
+        $scope.query = Utils.getRegex(decodeURI(searchQuery.replace(/Adrift!?|%20Fortnight|%20Raid/g,"")));
+    }
+    
     $controller('DismissalCtrl');
 
 });
@@ -239,4 +246,8 @@ function updateTimes(){
          document.getElementById("timesNote").innerHTML = "The  in the Japanese Version only last from 12:00 till 23:00";
     }
     tt=refreshTimer();
+}
+window.onload = function() {
+    //Also add the URI Search into the Search Bar
+    document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/Adrift!?|%20Fortnight|%20Raid/g,""));
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index 17d5b9330..a94d362a0 100644
--- a/index.html
+++ b/index.html
@@ -51,16 +51,19 @@
         </div> 
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
-            
+
             <p>25/02/2016</p>
             <br>
             <ul>
                 <li>New 3D2Y Units + Legend Jimbe!</li>
-				<li>Full info of 3D2Y units added!</li>
-				<br>
-				<li>Pica Raid boss stats added!</li>
+                <li>Full info of 3D2Y units added!</li>
+                <br>
+                <li>Drop and Manual Locations in </li>
+                <li>the Character Details now</li>
+                <li>link to their Drop Page</li>
+                <br>
                 <li>Added Server Time to Drop Page</li>
-                </ul>
+            </ul>
         </div>
     </body>
 

From bb02808b9687e091c3fc300efbdcd04bce84ade0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 14:57:08 -0600
Subject: [PATCH 0119/1569] Updated drops

for early story islands
---
 common/data/drops.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index dadcab998..0a2b98d6d 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -16,8 +16,7 @@ window.drops = {
             name: "Alvida's Hideout",
             thumb: 29,
             global: true,
-            completion: '5x Rainbow Gems',
-            "Completion Units": [31],
+            "Completion Units": [31, 105 ],
             "01": [ 121, 123, 127, 131, 136 ],
             "02": [ 78, 79, 80, 121, 122, 123, 126, 131, 132, 137, 138, 141 ],
             "03": [ 29, 115, 121, 122, 123, 126, 127, 128, 131, 132, 133, 136, 137, 138, 141, 171 ]
@@ -27,8 +26,8 @@ window.drops = {
             name: "Shells Town",
             thumb: 35,
             global: true,
-            completion: 'Ship: Navy Ship - 5x Rainbow Gems',
-            "Completion Units": [5],
+            completion: 'Ship: Navy Ship, Unlocks Extra Islands',
+            "Completion Units": [5, 80, 97, 116 ],
             "01": [ 81, 82, 179, 180, 181, 182 ],
             "02": [ 78, 79, 80, 179, 180, 181, 183 ],
             "03": [ 33, 81, 82, 179, 180, 181, 182, 183 ],

From 45ca77857d0817e060c33031341deb38e9f98684 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 15:55:56 -0600
Subject: [PATCH 0120/1569] Names

Updated Aliases/Official names.
---
 common/data/aliases.js | 42 +++++++++++++++++++++---------------------
 common/data/details.js | 20 ++++++++++----------
 common/data/units.js   | 24 ++++++++++++------------
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index e0b8b2edc..f91228291 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -903,16 +903,16 @@ window.aliases = {
     902: ['ブロギー 巨兵海賊団',''],
     903: ['赤鬼のブロギー',''],
     904: ['ヨコヅナ',''],
-    905: ['ロロノア・ゾロ クライガナ島をさすらう剣士',''],
-    906: ['ロロノア・ゾロ 世界最強剣士の門弟',''],
-    907: ['ニコ・ロビン テキーラウルフの収監者',''],
-    908: ['ニコ・ロビン 革命の灯火（ともしび）',''],
-    909: ['トニートニー・チョッパー トリノ王国の平和の架け橋',''],
-    910: ['チョッパーマスク 世界の平和を守るヒーロー',''],
-    911: ['サンジ カマバッカ王国の逃走者',''],
-    912: ['サンジ 男を懸けた愛の料理人',''],
-    913: ['ブルック ハラヘッターニャの悪魔王',''],
-    914: ['ブルック 骨（ボーン） to be wild!!!',''],
+    905: ['ロロノア・ゾロ クライガナ島をさすらう剣士','','3D2Y Zoro','Timeskip Zoro'],
+    906: ['ロロノア・ゾロ 世界最強剣士の門弟','','3D2Y Zoro','Timeskip Zoro'],
+    907: ['ニコ・ロビン テキーラウルフの収監者','','3D2Y Robin','Timeskip Robin'],
+    908: ['ニコ・ロビン 革命の灯火（ともしび）','','3D2Y Robin','Timeskip Robin'],
+    909: ['トニートニー・チョッパー トリノ王国の平和の架け橋','','3D2Y Chopper','Timeskip Chopper'],
+    910: ['チョッパーマスク 世界の平和を守るヒーロー','','3D2Y Chopper','Timeskip Chopper'],
+    911: ['サンジ カマバッカ王国の逃走者','','3D2Y Sanji','Timeskip Sanji'],
+    912: ['サンジ 男を懸けた愛の料理人','','3D2Y Sanji','Timeskip Sanji'],
+    913: ['ブルック ハラヘッターニャの悪魔王','','3D2Y Brook','Timeskip Brook'],
+    914: ['ブルック 骨（ボーン） to be wild!!!','','3D2Y Brook','Timeskip Brook'],
     915: ['？？？','','Wedding Nico Robin'],
     916: ['？？？','','Bride Nico Robin'],
     917: ['マーガレット',''],
@@ -932,16 +932,16 @@ window.aliases = {
     931: ['ブルゴリ ','','Blue Gorilla'],
     932: ['ピーカ',''],
     933: ['ピーカ ドンキホーテ海賊団',''],
-    934: ['','', 'Jinbe', 'Jimbe', 'Jinbei'],
-    935: ['','', 'Jinbe', 'Jimbe', 'Jinbei'],
-    936: ['','','Timeskip Luffy'],
-    937: ['','','Timeskip Luffy'],
-    938: ['','','Timeskip Nami'],
-    939: ['','','Timeskip Nami'],
-    940: ['','','Timeskip Usopp'],
-    941: ['','','Timeskip Usopp'],
-    942: ['','','Timeskip Franky'],
-    943: ['','','Timeskip Franky'],
+    934: ['','', 'Jinbe', 'Jimbei', 'Jinbei'],
+    935: ['','', 'Jinbe', 'Jimbei', 'Jinbei'],
+    936: ['','','Timeskip Luffy','3D2Y Luffy'],
+    937: ['','','Timeskip Luffy','3D2Y Luffy'],
+    938: ['','','Timeskip Nami','3D2Y Nami'],
+    939: ['','','Timeskip Nami','3D2Y Nami'],
+    940: ['','','Timeskip Usopp','3D2Y Usopp'],
+    941: ['','','Timeskip Usopp','3D2Y Usopp'],
+    942: ['','','Timeskip Franky','3D2Y Franky'],
+    943: ['','','Timeskip Franky','3D2Y Franky'],
 	944: ['','','Wedding Perona'],
-    945: ['','','Wedding Perona']
+    945: ['','','Bride Perona']
 };
diff --git a/common/data/details.js b/common/data/details.js
index bbd389917..a2ed6d876 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4348,25 +4348,25 @@ window.details = {
 	},
 	934: {
 		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
-		specialName: "Legend Jinbei Special",
+		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
 		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	935: {
 		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
-		specialName: "Legend Jinbei Special",
+		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
 		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	936: {
 		captain: "Boosts Chain Multiplier by 3x",
-		specialName: "Luffy Special",
+		specialName: "Gum-Gum Giant Jet Shell",
 		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
 		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	937: {
 		captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.25x",
-		specialName: "Luffy Special",
+		specialName: "Gum-Gum Giant Jet Shell",
 		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
 		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
 	},
@@ -4382,32 +4382,32 @@ window.details = {
 	},
 	940: {
 		captain: "Boosts [DEX] Characters ATK and HP by 1.5x",
-		specialName: "Sure Kill: Exploding Star",
+		specialName: "Sure Kill! Exploding Star!!",
 		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	941: {
 		captain: "Boosts [DEX] Characters ATK by 1.5x and their HP by 2.25x",
-		specialName: "Sure Kill: Exploding Star",
+		specialName: "Sure Kill! Exploding Star!!",
 		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	942: {
 		captain: "Boosts [STR] Characters ATK and HP by 1.5x",
-		specialName: "The Nightmare of Barujimoa",
+		specialName: "Future Country's Big Incident: The Nightmare of Barujimoa",
 		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	943: {
 		captain: "Boosts [STR] Characters ATK by 2.25x and their HP by 1.75x",
-		specialName: "The Nightmare of Barujimoa",
+		specialName: "Future Country's Big Incident: The Nightmare of Barujimoa",
 		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	944: {
 		captain: "Boosts the ATK and RCV of Ambition Characters by 1.2x",
-		specialName: "Bridal Perona Special",
+		specialName: "Spiritual Bouquet",
 		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	},
 	945: {
 		captain: "Boosts the ATK and RCV of Ambition Characters by 1.75x",
-		specialName: "Bridal Perona Special",
+		specialName: "Spiritual Bouquet",
 		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 88b4bbb1b..570b00305 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -932,16 +932,16 @@ window.units = [
 	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	["Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	["Pica, Donquixote Pirates", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-    ["Legend Jimbei", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
-    ["Legend Jimbei Evolved", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-    ["3D2Y Luffy", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-    ["3D2Y Luffy Evolved", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
-    ["3D2Y Nami", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
-    ["3D2Y Nami Evolved", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
-    ["3D2Y Usopp", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, null, null, null, null],
-    ["3D2Y Usopp Evolved", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
-    ["3D2Y Franky", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-    ["3D2Y Franky Evolved", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, null, null, null, null],
-	["Bridal Perona", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-    ["Bridal Perona Evolved", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, null, null, null, null]
+    ["Knight of the Sea Jimbe", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
+    ["Knight of the Sea Jimbe, Warlord of the Sea", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
+    ["Monkey D. Luffy, Summit War Survivor", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
+    ["Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
+    ["Nami, Seeker of Weather Science", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
+    ["Nami, Weatheria's Cat Burglar", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
+    ["Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, null, null, null, null],
+    ["Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
+    ["Franky, Cyborg Fighting Mecha Animals", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
+    ["Cyborg Franky, Sacred Beast of Barujimoa", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, null, null, null, null],
+	["Perona, Malicious Old Castle Bride", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
+    ["Fancy Princess Wedding Perona", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, null, null, null, null]
 ];

From b3c90c24700d8c4a2c92571c404ae99ef7b1d0a2 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 1 Mar 2016 23:28:18 +0100
Subject: [PATCH 0121/1569] Update README.md

---
 README.md | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 0cafb7d01..edac4f63d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,33 @@
 # optc-db.github.io
 
-The Continuation of the highly loved and apreciated OPTC Database that has stopped being updated.
+The Continuation of the highly loved and apreciated OPTC Database.
 
-For the beginning I will only update the Database part while figuring out how everything works.
-If you want to contribute or work together just shoot me a message on here or through the contact forms in the project itself.
-I will also be available on Reddit under Mondfischer. Included working on this project are several admins from optc-guide.com including Zeenigami and Xystos.
+This is a Database for all things One Piece Treasure Cruise, including Stats, Drops, Sockets and a Damage Calculator.
 
-I am also writing a few wiki entries while I figure everything out so feel free to check them out.
+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.

From 222db1460337c87ab45f995b89027fd72c0e7f3d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 22:56:58 -0600
Subject: [PATCH 0122/1569] Update drop flags

global drops updated
---
 common/data/flags.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index a90990095..f7754d040 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -535,6 +535,10 @@ window.flags = {
 	546: { global: 1 },
 	547: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	548: { global: 1, rr: 1, rro: 1, lrr: 1 },
+	549: { global: 1 },
+	550: { global: 1 },
+	551: { global: 1 },
+	552: { global: 1 },
 	553: { rr: 1, rro: 1 },
 	554: { rr: 1, rro: 1 },
 	555: { rr: 1, rro: 1 },
@@ -634,8 +638,25 @@ window.flags = {
 	677: { rr: 1, rro: 1 },
 	678: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	679: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	708: { special: 1 },
-	709: { special: 1 },
+	691: { global: 1 },
+	692: { global: 1 },
+	693: { global: 1 },
+	694: { global: 1 },
+	695: { global: 1 },
+	696: { global: 1 },
+	697: { global: 1 },
+	698: { global: 1 },
+	699: { global: 1 },
+	700: { global: 1 },
+	701: { global: 1 },
+	702: { global: 1 },
+	703: { global: 1 },
+	704: { global: 1 },
+	705: { global: 1 },
+	706: { global: 1 },
+	707: { global: 1 },
+	708: { global: 1 },
+	709: { global: 1 },
 	710: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	711: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	717: { rr: 1, rro: 1, global: 1 },

From 1c2c2efde730830deaef6fe4c1cf631a2c974470 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 1 Mar 2016 23:04:20 -0600
Subject: [PATCH 0123/1569] island global flags

woop woop
---
 common/data/drops.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 0a2b98d6d..5951b0814 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -383,6 +383,7 @@ window.drops = {
             name: "Enies Lobby: Entrance",
             shortName: "Enies Lobby 1",
             thumb: 706,
+			global: true,
             completion: '5x Rainbow Gems',
             "Completion Units": [708],
             "01": [ 78, 79, 80, 81, 82, 185, 186, 188, 694 ],
@@ -750,6 +751,7 @@ window.drops = {
         {
             name: 'Chief Guard Sadi-chan\'s Pun♥ish♥ment',
             thumb: 550,
+			global: true,
             condition: 'Shooter, Striker and Fighter are weakend',
             Expert: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ],
             Elite: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]

From f05fde372e26549f9e5f96012a7f74c1ada51325 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 2 Mar 2016 11:12:39 +0100
Subject: [PATCH 0124/1569] Completed Bridal Boa/Robin + Fix for Names Bug

Fixes #21
---
 characters/js/directives.js | 5 ++---
 common/data/aliases.js      | 8 ++++----
 common/data/units.js        | 4 ++--
 index.html                  | 3 ++-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 640fb35d4..aae43c573 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -304,7 +304,6 @@ directives.addNames = function($stateParams, $rootScope) {
             var id = $stateParams.id, data = details[id];
 
                 var currentAliases = name[id];
-                //console.log(currentAliases);
                 if(currentAliases[0]!=''){
                 element.append($('<tr><td>Japanese</td><td><div>'+ currentAliases[0] +'</div></td></tr>'));
                 }
@@ -312,8 +311,8 @@ directives.addNames = function($stateParams, $rootScope) {
                     element.append($('<tr><td>French</td><td><div>'+ currentAliases[1] +'</div></td></tr>'));
                 }
                 if(currentAliases[2]){
-                    currentAliases.splice(0, 2);
-                    element.append($('<tr><td>Others</td><td><div>'+ currentAliases +'</div></td></tr>'));
+                    var otherAliases = currentAliases.toString().replace(/(.*?),(.*?),/,"");
+                    element.append($('<tr><td>Others</td><td><div>'+ otherAliases +'</div></td></tr>'));
                 }
                 }
     }
diff --git a/common/data/aliases.js b/common/data/aliases.js
index f91228291..c69c45575 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -913,14 +913,14 @@ window.aliases = {
     912: ['サンジ 男を懸けた愛の料理人','','3D2Y Sanji','Timeskip Sanji'],
     913: ['ブルック ハラヘッターニャの悪魔王','','3D2Y Brook','Timeskip Brook'],
     914: ['ブルック 骨（ボーン） to be wild!!!','','3D2Y Brook','Timeskip Brook'],
-    915: ['？？？','','Wedding Nico Robin'],
-    916: ['？？？','','Bride Nico Robin'],
+    915: ['ニコ・ロビン オハラの花嫁','','Wedding Nico Robin'],
+    916: ['麗らかな才女 ロビン ウエディング','','Bride Nico Robin'],
     917: ['マーガレット',''],
     918: ['マーガレット 護国の戦士',''],
     919: ['アフェランドラ',''],
     920: ['スイトピー',''],
-    921: ['','','Bridal Hancock'],
-    922: ['','','Bridal Hancock'],
+    921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
+    922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
     923: ['南の海のキャプテン・キッド',''],
     924: ['キャプテン・キッド キッド海賊団船長',''],
     925: ['獄卒長サディちゃん',''],
diff --git a/common/data/units.js b/common/data/units.js
index 570b00305..7a9d1a8de 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,8 +919,8 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,null, 142 , 91 , 46 ,912,556,153,null],
-	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,null, 832 , 497 , 106 ,1913,1012,294,1],
+	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
+	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
 	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
 	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
 	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
diff --git a/index.html b/index.html
index a94d362a0..305c6c72c 100644
--- a/index.html
+++ b/index.html
@@ -52,11 +52,12 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>25/02/2016</p>
+            <p>02/03/2016</p>
             <br>
             <ul>
                 <li>New 3D2Y Units + Legend Jimbe!</li>
                 <li>Full info of 3D2Y units added!</li>
+                <li>Finished Bridal Boa</li>
                 <br>
                 <li>Drop and Manual Locations in </li>
                 <li>the Character Details now</li>

From 09980ae41837e3b00cc4b5dd7eff909ff4ddf0ce Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 2 Mar 2016 17:06:58 +0100
Subject: [PATCH 0125/1569] Usopp and Perona Stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 7a9d1a8de..7246421e5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -938,10 +938,10 @@ window.units = [
     ["Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
     ["Nami, Seeker of Weather Science", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
     ["Nami, Weatheria's Cat Burglar", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
-    ["Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, null, null, null, null],
+    ["Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
     ["Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
     ["Franky, Cyborg Fighting Mecha Animals", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
     ["Cyborg Franky, Sacred Beast of Barujimoa", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, null, null, null, null],
 	["Perona, Malicious Old Castle Bride", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-    ["Fancy Princess Wedding Perona", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, null, null, null, null]
+    ["Fancy Princess Wedding Perona", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null]
 ];

From ddb51dd8b24d2a7dc68fc8ff134a5ba20c28b9f6 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 3 Mar 2016 10:31:32 +0100
Subject: [PATCH 0126/1569] Franky Max Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 7246421e5..01f9c42b0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -941,7 +941,7 @@ window.units = [
     ["Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
     ["Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
     ["Franky, Cyborg Fighting Mecha Animals", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-    ["Cyborg Franky, Sacred Beast of Barujimoa", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, null, null, null, null],
+    ["Cyborg Franky, Sacred Beast of Barujimoa", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
 	["Perona, Malicious Old Castle Bride", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
     ["Fancy Princess Wedding Perona", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null]
 ];

From 3c2ef31d3919c0d682962b7646de6b65c478c8a9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 3 Mar 2016 20:43:10 +0100
Subject: [PATCH 0127/1569] Made JPN Bonuses a bit clearer

---
 drops/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drops/index.js b/drops/index.js
index 2b0085d68..7f8d6a3e9 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -241,9 +241,9 @@ function updateTimes(){
     document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('America/Los_Angeles').format('H:mm:ss')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('H:mm:ss')+"</b>";
     
     if(moment().tz('Asia/Tokyo').format('H')>12 && moment().tz('Asia/Tokyo').format('H')<23){
-        document.getElementById("timesNote").innerHTML = "<b>Japan Bonuses are currently active<b>";
+        document.getElementById("timesNote").innerHTML = "The Bonuses in the Japanese Version only last from 12:00 till 23:00<br><b>Japan Bonuses are currently active<b>";
     }else{
-         document.getElementById("timesNote").innerHTML = "The  in the Japanese Version only last from 12:00 till 23:00";
+         document.getElementById("timesNote").innerHTML = "The Bonuses in the Japanese Version only last from 12:00 till 23:00<br><b>Japan Bonuses are currently not active<b>";
     }
     tt=refreshTimer();
 }

From be082bd42bf9a75e612a14311698e908e6aa650d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 4 Mar 2016 10:51:29 +0100
Subject: [PATCH 0128/1569] Aokiji arrived on Global

---
 common/data/drops.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 5951b0814..a6300c529 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1028,6 +1028,7 @@ window.drops = {
         {
             name: 'Clash!! Aokiji',
             thumb: 575,
+            global: true,
             Ultimate: [ 88, 114, 118, 304, 574 ],
             Master: [ 114, 118, 574 ]
         },

From c151b88f8e22fc2e62bdb05a081473dd5533b524 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 4 Mar 2016 21:32:03 +0100
Subject: [PATCH 0129/1569] Change to Free Spirit + Bugfixes

---
 characters/js/directives.js    |   4 +-
 characters/views/main.html     |   1 +
 characters/views/sidebar.html  |   2 +-
 common/data/aliases.js         |  10 +-
 common/data/captains.js        |  56 +++---
 common/data/details.js         |  72 +++----
 common/data/drops.js           |   8 +-
 common/data/effects.js         |   8 +-
 common/data/evolutions.js      |   8 +
 common/data/flags.js           |  28 +--
 common/data/matchers.js        |   4 +-
 common/data/ships.js           |   6 +-
 common/data/specials.js        |  20 +-
 common/data/units.js           | 338 +++++++++++++++++----------------
 common/js/utils.js             |   3 +-
 damage/views/popup/picker.html |   1 +
 16 files changed, 298 insertions(+), 271 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index aae43c573..93279d53e 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -116,7 +116,7 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Freedom', 'Knowledge', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
                     'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
@@ -138,7 +138,7 @@ directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Freedom', 'Knowledge', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classSpecial == \'%s\' }" ' +
                     'ng-click="onSpecialClick($event,\'%s\')">%s</span>';
diff --git a/characters/views/main.html b/characters/views/main.html
index 32b18ba61..87a41a68e 100644
--- a/characters/views/main.html
+++ b/characters/views/main.html
@@ -25,6 +25,7 @@
             <ul>
                 <li><tt>type:X</tt>: shows only units of type X (STR, DEX, QCK, ...)</li>
                 <li><tt>class:X</tt>: shows only units of class X (fighter, slasher, ...)</li>
+                <ul><li>For Free Spirit units enter free_spirit or just free</li></ul>
             </ul>
             <br>
             Supported mathematical operators:
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 6f617da61..6536ed5d1 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -9,7 +9,7 @@
 
 <div class="filter-container">
     <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Freedom', 'Knowledge', 'Tough', 'Ambition' ]"
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ]"
         class="filter width-6 class" ng-click="onClassClick($event,class)"
         ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
 </div>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index c69c45575..200afa8e1 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -943,5 +943,13 @@ window.aliases = {
     942: ['','','Timeskip Franky','3D2Y Franky'],
     943: ['','','Timeskip Franky','3D2Y Franky'],
 	944: ['','','Wedding Perona'],
-    945: ['','','Bride Perona']
+    945: ['','','Bride Perona'],
+    946: ['',''],
+    947: ['',''],
+    948: ['',''],
+    949: ['',''],
+    950: ['',''],
+    951: ['',''],
+    952: ['',''],
+    953: ['','']
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 43b121c25..5a8b08e0f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1322,12 +1322,12 @@ window.captains = {
 		atk: function(p) { return 1.75; }
 	},
 	668: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 + 0.75 * p.percHP / 100 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
 		hp: function(p) { return 1.2; },
 		rcv: function(p) { return 1.2; }
 	},
 	669: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 + 0.75 * p.percHP / 100 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
 		hp: function(p) { return 1.2; },
 		rcv: function(p) { return 1.2; }
 	},
@@ -1345,10 +1345,10 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
 	},
 	674: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	675: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
 	},
 	676: {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
@@ -1381,10 +1381,10 @@ window.captains = {
 		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
 	},
 	687: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
 	},
 	688: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	689: {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
@@ -1498,7 +1498,7 @@ window.captains = {
 	},
 	727: {
 		atk: function(p) {
-			return p.unit.class.has("Freedom") || p.unit.class.has("Fighter") ? 1.75 : 1;
+			return p.unit.class.has("Free Spirit") || p.unit.class.has("Fighter") ? 1.75 : 1;
 		}
 	},
 	728: {
@@ -1537,21 +1537,21 @@ window.captains = {
 		atk: function(p) { return p.unit.cost >= 21 ? 2 : 1; }
 	},
 	739: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	742: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
 	},
 	743: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Freedom") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
 	},
 	744: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	745: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
 	},
 	747: {
 		atk: function(p) { return !p.unit.class.has("Tough") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
@@ -1637,7 +1637,7 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
 	},
 	774: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	775: {
 		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
@@ -1790,12 +1790,12 @@ window.captains = {
 	},
 	832: {
 		atk: function(p) {
-			return p.unit.class.has("Freedom") ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+			return p.unit.class.has("Free Spirit") ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
 		}
 	},
 	833: {
 		atk: function(p) {
-			return p.unit.class.has("Freedom") ? 1 + 1.75 * ((100 - p.percHP) / 100) : 1;
+			return p.unit.class.has("Free Spirit") ? 1 + 1.75 * ((100 - p.percHP) / 100) : 1;
 		}
 	},
 	834: {
@@ -1895,11 +1895,11 @@ window.captains = {
 		atk: function(p) { return p.unit.type == 'QCK' ? 1.75 : 1; }
 	},
 	864: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	865: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Freedom") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+		hp: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	866: {
 		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
@@ -1959,14 +1959,14 @@ window.captains = {
 	},
 	881: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Freedom")) return 1;
+			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2 : 1;
 		},
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	882: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Freedom")) return 1;
+			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
 		},
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
@@ -2040,10 +2040,10 @@ window.captains = {
 	},
 	899: {
 		atk: function(p) {
-			return p.unit.class.has("Fighter") || p.unit.class.has("Freedom") ? 1.75 : 1;
+			return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
 		},
 		hp: function(p) {
-			return p.unit.class.has("Fighter") || p.unit.class.has("Freedom") ? 1.25 : 1;
+			return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1;
 		}
 	},
 	900: {
@@ -2111,12 +2111,12 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
 	},
 	921: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Freedom") ? 1.2 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
 	},
 	922: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.class.has("Freedom") ? 1.75 : 1; }
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
 	},
 	923: {
 		atk: function(p) {
diff --git a/common/data/details.js b/common/data/details.js
index a2ed6d876..293c9e215 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2880,15 +2880,15 @@ window.details = {
 		captain: "Reduces damage received by 10%, boosts ATK of all characters by 1.5x"
 	},
 	668: {
-		special: "Boosts ATK of Freedom characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Freedom characters by 2x in the following turn.",
+		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Free Spirit characters by 2x in the following turn.",
 		specialName: "Dragon's Claw",
-		captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Freedom characters proportionally to the crew's current HP",
+		captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters proportionally to the crew's current HP",
 		captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
 	},
 	669: {
-		special: "Boosts ATK of Freedom characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Freedom characters by 2x in the following turn.",
+		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Free Spirit characters by 2x in the following turn.",
 		specialName: "Dragon's Claw",
-		captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Freedom characters proportionally to the crew's current HP",
+		captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters proportionally to the crew's current HP",
 		captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
 	},
 	670: {
@@ -2914,12 +2914,12 @@ window.details = {
 	674: {
 		special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
 		specialName: "Emporio Healing Hormone",
-		captain: "Boosts ATK of Freedom characters by 2x"
+		captain: "Boosts ATK of Free Spirit characters by 2x"
 	},
 	675: {
 		special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
 		specialName: "Emporio Healing Hormone",
-		captain: "Boosts ATK of Freedom characters by 2.5x"
+		captain: "Boosts ATK of Free Spirit characters by 2.5x"
 	},
 	676: {
 		special: "Reduces any damage received above 5,000 HP by 97% for 3 turns",
@@ -2976,14 +2976,14 @@ window.details = {
 		captain: "Boosts ATK and RCV of Slasher characters by 1.5x"
 	},
 	687: {
-		special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Freedom characters by 1.3x for 1 turn",
+		special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Free Spirit characters by 1.3x for 1 turn",
 		specialName: "First Spear of the Battle",
-		captain: "Boosts ATK of Freedom characters by 1.5x"
+		captain: "Boosts ATK of Free Spirit characters by 1.5x"
 	},
 	688: {
-		special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Freedom characters by 1.3x for 1 turn",
+		special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Free Spirit characters by 1.3x for 1 turn",
 		specialName: "First Spear of the Battle",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Freedom characters by 2x"
+		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Free Spirit characters by 2x"
 	},
 	689: {
 		special: "Amplifies the effect of orbs by 1.5x for 2 turns",
@@ -3112,12 +3112,12 @@ window.details = {
 		specialName: "Pegasus' Neigh"
 	},
 	715: {
-		special: "Boosts ATK and RCV of Freedom characters by 1.5x for 2 turns, seals herself for 3 turns",
+		special: "Boosts ATK and RCV of Free Spirit characters by 1.5x for 2 turns, seals herself for 3 turns",
 		specialName: "Angel's Harp - Healing",
 		captain: "Boosts RCV of all characters by 2x if HP is below 30% at the start of the turn"
 	},
 	716: {
-		special: "Boosts ATK and RCV of Freedom characters by 1.5x for 2 turns, seals herself for 3 turns",
+		special: "Boosts ATK and RCV of Free Spirit characters by 1.5x for 2 turns, seals herself for 3 turns",
 		specialName: "Angel's Harp - Healing",
 		captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
 	},
@@ -3182,7 +3182,7 @@ window.details = {
 	727: {
 		special: "Deals 10x character's ATK in DEX damage to all enemies, reduces the defense of all enemies by 50% for 1 turn",
 		specialName: "Gum-Gum Gatling",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Freedom and Fighter characters by 1.75x"
+		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Free Spirit and Fighter characters by 1.75x"
 	},
 	728: {
 		special: "Randomizes all orbs, recovers 6x character's RCV in HP at the end of each turn for 3 turns",
@@ -3244,7 +3244,7 @@ window.details = {
 	739: {
 		special: "Reduces Bind duration by 5 turns, randomizes all orbs",
 		specialName: "Coup de Boo",
-		captain: "Boosts ATK of Freedom characters by 2x"
+		captain: "Boosts ATK of Free Spirit characters by 2x"
 	},
 	740: {
 		special: "Deals 10x character's ATK in QCK damage to all enemies, boosts ATK against enemies with increased defense by 1.3x for 2 turns",
@@ -3260,23 +3260,23 @@ window.details = {
 		special: "Amplifies the effect of orbs by 1.25x for 2 turns, reduces the defense of all enemies by 80% for 2 turns",
 		specialNotes: "#{orb : 1.25x}",
 		specialName: "Ramen Beam",
-		captain: "Boosts ATK and RCV of Freedom characters by 1.2x"
+		captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x"
 	},
 	743: {
 		special: "Amplifies the effect of orbs by 1.25x for 2 turns, reduces the defense of all enemies by 80% for 2 turns",
 		specialNotes: "#{orb : 1.25x}",
 		specialName: "Ramen Beam",
-		captain: "Boosts ATK and RCV of Freedom characters by 1.5x"
+		captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x"
 	},
 	744: {
 		special: "Reduces damage received by 50% for 3 turns",
 		specialName: "Flame Fence",
-		captain: "Boosts ATK of Freedom characters by 2x"
+		captain: "Boosts ATK of Free Spirit characters by 2x"
 	},
 	745: {
 		special: "Reduces damage received by 50% for 3 turns",
 		specialName: "Flame Fence",
-		captain: "Boosts ATK of Freedom characters by 2.5x"
+		captain: "Boosts ATK of Free Spirit characters by 2.5x"
 	},
 	746: {
 		special: "Deals 10x character's ATK in QCK damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
@@ -3432,7 +3432,7 @@ window.details = {
 	774: {
 		special: "Randomly changes [TND], [RCV], [EMPTY], [BLOCK] and [BOMB] orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs, switches orbs between slots 3 times",
 		specialName: "Berry-Berry Fruit",
-		captain: "Boosts ATK of Freedom characters by 2x"
+		captain: "Boosts ATK of Free Spirit characters by 2x"
 	},
 	775: {
 		special: "Deals several times the character's ATK in PSY damage to one enemy",
@@ -3709,15 +3709,15 @@ window.details = {
 		special: "Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [DEX] orbs, changes the orbs in the bottom row into [QCK] orbs"
 	},
 	832: {
-		captain: "Boosts ATK of Freedom characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
+		captain: "Boosts ATK of Free Spirit characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
 		specialName: "Burn Bazooka",
-		special: "Boosts ATK of Freedom characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
+		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
 		captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}"
 	},
 	833: {
-		captain: "Boosts ATK of Freedom characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
+		captain: "Boosts ATK of Free Spirit characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
 		specialName: "Burn Bazooka",
-		special: "Boosts ATK of Freedom characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
+		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
 		captainNotes: "#{captainProportional : lower : 1 + 1.75 * (1 - (remaining HP) / (total HP)) : 1 : 2.75}"
 	},
 	834: {
@@ -3879,12 +3879,12 @@ window.details = {
 		special: "Reduces the defense of all enemies by 50% for 2 turns, reduces the ATK of all enemies by 10% for 2 turns"
 	},
 	864: {
-		captain: "Boosts ATK of Freedom characters by 2x",
+		captain: "Boosts ATK of Free Spirit characters by 2x",
 		specialName: "Slave Arrow",
 		special: "Locks the chain multiplier at 2.5x for 2 turns, delays all enemies for 1 turn"
 	},
 	865: {
-		captain: "Boosts ATK and HP of Freedom characters by 2x",
+		captain: "Boosts ATK and HP of Free Spirit characters by 2x",
 		specialName: "Slave Arrow",
 		special: "Locks the chain multiplier at 2.5x for 2 turns, delays all enemies for 1 turn"
 	},
@@ -4005,14 +4005,14 @@ window.details = {
 		specialNotes: "#{gOrbs}"
 	},
 	881: {
-		captain: "Boosts ATK of Shooter and Freedom characters by 2x following a chain of Good > Great > Perfect hits",
+		captain: "Boosts ATK of Shooter and Free Spirit characters by 2x following a chain of Good > Great > Perfect hits",
 		specialName: "Fighting Music: Conflict Chekera",
-		special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Freedom characters by 1.75x for 1 turn"
+		special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
 	},
 	882: {
-		captain: "Boosts ATK of Shooter and Freedom characters by 3x following a chain of Good > Great > Perfect hits",
+		captain: "Boosts ATK of Shooter and Free Spirit characters by 3x following a chain of Good > Great > Perfect hits",
 		specialName: "Fighting Music: Conflict Chekera",
-		special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Freedom characters by 1.75x for 1 turn"
+		special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
 	},
 	883: {
 		captain: "Boosts ATK and HP of Tough characters by 1.25x",
@@ -4097,21 +4097,21 @@ window.details = {
 		specialNotes: "#{gOrbs}"
 	},
 	899: {
-		captain: "Boosts ATK of Fighter and Freedom characters by 1.75x and their RCV by 1.25x",
+		captain: "Boosts ATK of Fighter and Free Spirit characters by 1.75x and their RCV by 1.25x",
 		specialName: "Hymn to Friendship: \"Okama Way\" Two",
 		special: "Reduces Silence duration by 5 turns, recovers 10x character's RCV in HP"
 	},
 	900: {
 		captain: "Boosts ATK of Shooter characters by 2x if HP is above 99% at the start of the turn",
 		specialName: "Franky Destroy Gun",
-		special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Freedom characters into either [G] orbs or matching orbs",
-		specialNotes: "The orb shuffle only applies to Shooter and Freedom characters, other classes are unaffected. #{gOrbs}"
+		special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+		specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
 	},
 	901: {
 		captain: "Boosts ATK of Shooter characters by 2.75x if HP is above 99% at the start of the turn",
 		specialName: "Franky Destroy Gun",
-		special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Freedom characters into either [G] orbs or matching orbs",
-		specialNotes: "The orb shuffle only applies to Shooter and Freedom characters, other classes are unaffected. #{gOrbs}"
+		special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+		specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
 	},
 	902: {
 		captain: "Boosts ATK and HP of Tough characters by 1.25x",
@@ -4259,12 +4259,12 @@ window.details = {
 		special: "Changes the orbs in the middle row into [RCV] orbs, changes the orbs in the bottom row into [TND] orbs"
 	},
 	921: {
-		captain: "Boosts ATK and RCV of Freedom characters by 1.2x",
+		captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x",
 		specialName: "Pure and Beautiful Shyness",
 		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
 	},
 	922: {
-		captain: "Boosts ATK and RCV of Freedom characters by 1.75x",
+		captain: "Boosts ATK and RCV of Free Spirit characters by 1.75x",
 		specialName: "Pure and Beautiful Shyness",
 		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
 	},
diff --git a/common/data/drops.js b/common/data/drops.js
index a6300c529..d5fe61db7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -723,7 +723,7 @@ window.drops = {
         },
 
         {
-            name: 'Jailbreaking Baroque Works',
+            name: 'Prison Break! Baroque Works',
             thumb: 462,
             global: true,
             condition: 'Striker, Shooter and Slashers are weakend.',
@@ -749,7 +749,7 @@ window.drops = {
         },
 
         {
-            name: 'Chief Guard Sadi-chan\'s Pun♥ish♥ment',
+            name: 'Chief Jailer Sadie: Cruel and Unusual',
             thumb: 550,
 			global: true,
             condition: 'Shooter, Striker and Fighter are weakend',
@@ -829,7 +829,7 @@ window.drops = {
         {
             name: "Knight of the Sky Gan Fall",
             thumb: 713,
-            condition: 'Every class but Freedom is weakend',
+            condition: 'Every class but Free Spirit is weakend',
             Expert: [ 712, 714, 715, -716, -546, -541, -520 ],
             Elite: [ 712, 714, 715, -716, -546, -541, -520 ]
         },
@@ -899,7 +899,7 @@ window.drops = {
         {
             name: "Legendary Shipbuilding Company Tom's Workers",
             thumb: 848,
-            condition: 'You can only bring Impact and Freedom units. (No Evo/Boosters)',
+            condition: 'You can only bring Impact and Free Spirit units. (No Evo/Boosters)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
             Expert: [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ],
diff --git a/common/data/effects.js b/common/data/effects.js
index 428e0a6ea..e08fedd81 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -116,12 +116,12 @@ window.effects = {
     },
 
     'Gan Fall': {
-        description: 'Stats of non-Freedom, non-Booster, non-Evolver units reduced by 90%',
+        description: 'Stats of non-Free Spirit, non-Booster, non-Evolver units reduced by 90%',
         thumb: 713,
         id: 11, // don't change this
-        atk: function(p) { return p.class.has('Freedom') || p.class.has('Booster') || p.class.has('Evolver') ? 1 : 0.1; },
-        hp: function(p)  { return p.class.has('Freedom') || p.class.has('Booster') || p.class.has('Evolver') ? 1 : 0.1; },
-        rcv: function(p) { return p.class.has('Freedom') || p.class.has('Booster') || p.class.has('Evolver') ? 1 : 0.1; }
+        atk: function(p) { return p.class.has('Free Spirit') || p.class.has('Booster') || p.class.has('Evolver') ? 1 : 0.1; },
+        hp: function(p)  { return p.class.has('Free Spirit') || p.class.has('Booster') || p.class.has('Evolver') ? 1 : 0.1; },
+        rcv: function(p) { return p.class.has('Free Spirit') || p.class.has('Booster') || p.class.has('Evolver') ? 1 : 0.1; }
     },
 
     'Orb amplification (1.05x)': {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 1daa36dc0..3b1465a6b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1438,5 +1438,13 @@ window.evolutions = {
     944: {
         evolution: 945,
         evolvers: [ 84, 85, 86, 87, 88 ]
+    },
+    950: {
+        evolution: 951,
+        evolvers: []
+    },
+    952: {
+        evolution: 953,
+        evolvers: []
     }
 };
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index f7754d040..98cadec8b 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -626,16 +626,16 @@ window.flags = {
 	651: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	660: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	661: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	668: { rr: 1, rro: 1 },
-	669: { rr: 1, rro: 1 },
-	670: { rr: 1, rro: 1 },
-	671: { rr: 1, rro: 1 },
-	672: { rr: 1, rro: 1 },
-	673: { rr: 1, rro: 1 },
-	674: { rr: 1, rro: 1 },
-	675: { rr: 1, rro: 1 },
-	676: { rr: 1, rro: 1 },
-	677: { rr: 1, rro: 1 },
+	668: { rr: 1, rro: 1, global: 1 },
+	669: { rr: 1, rro: 1, global: 1 },
+	670: { rr: 1, rro: 1, global: 1 },
+	671: { rr: 1, rro: 1, global: 1 },
+	672: { rr: 1, rro: 1, global: 1 },
+	673: { rr: 1, rro: 1, global: 1 },
+	674: { rr: 1, rro: 1, global: 1 },
+	675: { rr: 1, rro: 1, global: 1 },
+	676: { rr: 1, rro: 1, global: 1 },
+	677: { rr: 1, rro: 1, global: 1 },
 	678: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	679: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	691: { global: 1 },
@@ -716,10 +716,10 @@ window.flags = {
 	844: { rr: 1, rro: 1 },
 	845: { rr: 1, rro: 1 },
 	846: { rr: 1, rro: 1 },
-	855: { rr: 1, rro: 1, global: 1 },
-	856: { rr: 1, rro: 1, global: 1 },
-	857: { rr: 1, rro: 1, global: 1 },
-	858: { rr: 1, rro: 1, global: 1 },
+	855: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	856: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	857: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	858: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	863: { special: 1 },
 	869: { rr: 1, rro: 1 },
 	870: { rr: 1, rro: 1 },
diff --git a/common/data/matchers.js b/common/data/matchers.js
index e67dbab74..6baadd7d2 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -11,7 +11,7 @@ window.matchers = [
     {
         name: 'Class-boosting captains',
         target: 'captain',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Freedom|Knowledge|Tough|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Knowledge|Tough|Ambition)/i
     },
 
     {
@@ -128,7 +128,7 @@ window.matchers = [
     {
         name: 'Class-boosting specials',
         target: 'special',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Freedom|Knowledge|Tough|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Knowledge|Tough|Ambition)/i
     },
 
     {
diff --git a/common/data/ships.js b/common/data/ships.js
index 4378d5840..9890ecee7 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -181,13 +181,13 @@ window.ships = [
     { //14
         name: 'Kuja Pirate Ship',
         thumb: null,
-        description: 'Boosts ATK of Freedom characters by 1.5x and their HP by 1.35x, reduces the HP of everyone else by ?x. Special: heals the crew by 6,500HP (cooldown: 15 turns).',
+        description: 'Boosts ATK of Free Spirit characters by 1.5x and their HP by 1.35x, reduces the HP of everyone else by ?x. Special: heals the crew by 6,500HP (cooldown: 15 turns).',
         atk: function(p) {
-            return !p.unit.class.has('Freedom') ? 1 :
+            return !p.unit.class.has('Free Spirit') ? 1 :
             [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !p.unit.class.has('Freedom') ? 0.01 :
+            return !p.unit.class.has('Free Spirit') ? 0.01 :
                 [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.35 ][p.boatLevel - 1];
         }
     }
diff --git a/common/data/specials.js b/common/data/specials.js
index 43220d25b..8bc0092d0 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -451,7 +451,7 @@ window.specials = {
 		type: "condition"
 	},
 	668: {
-		atk: function(p) { return !p.unit.class.has('Freedom') ? 1 : window.specials[668].multiplier; },
+		atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[668].multiplier; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[668].multiplier == 1.5 ? 1 : 0);
@@ -463,7 +463,7 @@ window.specials = {
 		}
 	},
 	669: {
-		atk: function(p) { return !p.unit.class.has('Freedom') ? 1 : window.specials[669].multiplier; },
+		atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[669].multiplier; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[669].multiplier == 1.5 ? 1 : 0);
@@ -493,11 +493,11 @@ window.specials = {
 		type: "type"
 	},
 	687: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.3 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
 		type: "class"
 	},
 	688: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.3 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
 		type: "class"
 	},
 	689: {
@@ -523,11 +523,11 @@ window.specials = {
 		type: "class"
 	},
 	715: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
 		type: "class"
 	},
 	716: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
 		type: "class"
 	},
 	719: {
@@ -721,11 +721,11 @@ window.specials = {
 		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
 	},
 	832: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
 		type: "class"
 	},
 	833: {
-		atk: function(p) { return p.unit.class.has("Freedom") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
 		type: "class"
 	},
 	835: {
@@ -880,14 +880,14 @@ window.specials = {
 	},
 	881: {
 		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
+			return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
 		},
 		rcv: function(p) { return 0.1; },
 		type: "class"
 	},
 	882: {
 		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Freedom") ? 1.75 : 1;
+			return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
 		},
 		rcv: function(p) { return 0.1; },
 		type: "class"
diff --git a/common/data/units.js b/common/data/units.js
index 01f9c42b0..bf9281f47 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -2,7 +2,7 @@ window.units = [
 	[ "Monkey D. Luffy", "STR", "Fighter", 2, 1, 5, 0, 5, 163, 42, 15, 8, 134, 68, 15, 1 ],
 	[ "Monkey D. Luffy Gum-Gum Pistol", "STR", "Fighter", 3, 4, 6, 0, 20, 26184, 130, 76, 14, 510, 249, 49, 0.7 ],
 	[ "Monkey D. Luffy Gum-Gum Bazooka", "STR", "Fighter", 4, 7, 6, 2, 35, 136167, 404, 227, 39, 975, 522, 105, 1 ],
-	[ "Monkey D. Luffy Gear 2", "STR", [ "Fighter", "Freedom" ], 5, 15, 8, 3, 99, 3000000, 902, 473, 74, 1772, 1313, 227, 1 ],
+	[ "Monkey D. Luffy Gear 2", "STR", [ "Fighter", "Free Spirit" ], 5, 15, 8, 3, 99, 3000000, 902, 473, 74, 1772, 1313, 227, 1 ],
 	[ "Roronoa Zoro", "DEX", "Slasher", 3, 4, 6, 0, 20, 26184, 126, 75, 15, 488, 239, 56, 0.7 ],
 	[ "Roronoa Zoro Three Thousand Worlds", "DEX", [ "Slasher", "Ambition" ], 4, 7, 6, 2, 35, 136167, 426, 222, 37, 899, 515, 120, 1 ],
 	[ "Roronoa Zoro Pound Phoenix", "DEX", [ "Slasher", "Ambition" ], 4, 9, 4, 2, 50, 392109, 462, 258, 37, 1216, 694, 106, 1 ],
@@ -20,7 +20,7 @@ window.units = [
 	[ "Chef Sanji Hot Rock Stew", "QCK", [ "Fighter", "Tough" ], 4, 9, 4, 2, 50, 392109, 494, 191, 54, 986, 500, 209, 1 ],
 	[ "Sanji Diable Jambe Flambe", "QCK", [ "Fighter", "Tough" ], 5, 15, 4, 3, 99, 3000000, 406, 418, 175, 2206, 1030, 249, 1 ],
 	[ "Tony Tony Chopper", "PSY", "Fighter", 3, 4, 5, 0, 20, 26184, 52, 40, 39, 294, 144, 120, 1 ],
-	[ "Tony Tony Chopper Heavy Point", "PSY", [ "Fighter", "Freedom" ], 4, 9, 5, 2, 50, 392109, 306, 213, 78, 754, 622, 207, 1 ],
+	[ "Tony Tony Chopper Heavy Point", "PSY", [ "Fighter", "Free Spirit" ], 4, 9, 5, 2, 50, 392109, 306, 213, 78, 754, 622, 207, 1 ],
 	[ "Tony Tony Chopper Brain Point", "INT", [ "Fighter", "Knowledge" ], 4, 9, 5, 2, 50, 392109, 258, 198, 91, 520, 454, 302, 1 ],
 	[ "Tony Tony Chopper Arm Point", "STR", [ "Fighter", "Tough" ], 4, 9, 4, 2, 50, 392109, 356, 260, 54, 868, 820, 122, 1 ],
 	[ "Tony Tony Chopper Horn Point", "QCK", "Fighter", 4, 9, 6, 2, 50, 392109, 414, 306, 29, 958, 856, 95, 1 ],
@@ -28,7 +28,7 @@ window.units = [
 	[ "Higuma", "QCK", "Slasher", 2, 8, 5, 0, 35, 45389, 132, 87, 29, 692, 323, 99, 1 ],
 	[ "Master of the Near Sea", "STR", "Fighter", 2, 20, 5, 0, 35, 90778, 500, 350, 80, 550, 400, 100, 1.5 ],
 	[ "Iron-Mace Alvida", "STR", [ "Striker", "Tough" ], 3, 10, 5, 0, 50, 392109, 184, 154, 5, 1412, 755, 61, 1 ],
-	[ "Iron-Mace Alvida Smooth-Smooth Fruit", "STR", [ "Striker", "Freedom" ], 4, 15, 6, 1, 99, 3000000, 766, 625, 135, 1668, 999, 369, 1 ],
+	[ "Iron-Mace Alvida Smooth-Smooth Fruit", "STR", [ "Striker", "Free Spirit" ], 4, 15, 6, 1, 99, 3000000, 766, 625, 135, 1668, 999, 369, 1 ],
 	[ "Coby", "PSY", "Fighter", 2, 4, 5, 0, 25, 50439, 70, 25, 32, 166, 70, 120, 1 ],
 	[ "Cabin Boy Coby", "PSY", [ "Fighter", "Ambition" ], 3, 9, 5, 3, 50, 392109, 130, 49, 100, 524, 155, 216, 1 ],
 	[ "Helmeppo", "INT", "Shooter", 2, 4, 5, 0, 25, 50439, 62, 62, 21, 308, 242, 39, 1 ],
@@ -71,9 +71,9 @@ window.units = [
 	[ "Smoker the White Hunter", "DEX", [ "Striker", "Ambition" ], 4, 15, 5, 2, 99, 3000000, 872, 515, 154, 1736, 1070, 334, 1.5 ],
 	[ "Miss Wednesday", "PSY", "Slasher", 3, 9, 5, 0, 35, 136167, 22, 10, 74, 190, 127, 216, 0.7 ],
 	[ "Nefertari Vivi", "PSY", "Slasher", 4, 13, 5, 1, 70, 1066998, 138, 102, 183, 682, 454, 350, 1 ],
-	[ "Princess Vivi", "PSY", [ "Slasher", "Freedom" ], 5, 20, 6, 3, 99, 4000000, 602, 414, 280, 908, 747, 477, 1.5 ],
-	[ "Portgas D. Ace", "QCK", [ "Fighter", "Freedom" ], 4, 13, 6, 3, 70, 1066998, 252, 144, 40, 1802, 545, 199, 1.5 ],
-	[ "Portgas D. Ace Flame Mirror", "QCK", [ "Fighter", "Freedom" ], 5, 20, 6, 4, 99, 4000000, 1728, 501, 140, 2886, 1020, 279, 1.5 ],
+	[ "Princess Vivi", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 4000000, 602, 414, 280, 908, 747, 477, 1.5 ],
+	[ "Portgas D. Ace", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 70, 1066998, 252, 144, 40, 1802, 545, 199, 1.5 ],
+	[ "Portgas D. Ace Flame Mirror", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 6, 4, 99, 4000000, 1728, 501, 140, 2886, 1020, 279, 1.5 ],
 	[ "Shanks", "PSY", [ "Slasher", "Knowledge" ], 4, 13, 5, 3, 70, 1066998, 186, 159, 46, 1010, 725, 271, 1.5 ],
 	[ "Red-Haired Shanks", "PSY", [ "Slasher", "Knowledge" ], 5, 20, 4, 4, 99, 4000000, 898, 670, 222, 2118, 990, 417, 1 ],
 	[ "Red Robber Penguin", "STR", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
@@ -203,10 +203,10 @@ window.units = [
 	[ "Miss Valentine 10,000 Kilo Guillotine", "QCK", "Fighter", 4, 15, 5, 2, 70, 1066998, 804, 426, 104, 1324, 787, 198, 1 ],
 	[ "Mr. 3", "INT", [ "Slasher", "Knowledge" ], 3, 11, 4, 1, 35, 136167, 196, 100, 26, 926, 515, 120, 1 ],
 	[ "Mr. 3 Extra Special Candelabra", "INT", [ "Slasher", "Knowledge" ], 4, 15, 4, 2, 70, 1066998, 600, 449, 120, 1394, 818, 176, 1 ],
-	[ "Miss Goldenweek", "DEX", [ "Striker", "Freedom" ], 3, 11, 5, 1, 35, 136167, 51, 51, 81, 301, 301, 305, 1 ],
-	[ "Miss Goldenweek Colors Trap: Calming Green", "DEX", [ "Striker", "Freedom" ], 4, 15, 5, 2, 70, 1066998, 264, 264, 268, 412, 390, 530, 1 ],
-	[ "Mr. 2 Bon Clay", "PSY", [ "Fighter", "Freedom" ], 3, 11, 5, 1, 35, 136167, 94, 93, 46, 690, 403, 201, 1 ],
-	[ "Mr. 2 Bon Clay Bombardier Arabesque", "PSY", [ "Fighter", "Freedom" ], 4, 15, 4, 2, 70, 1066998, 599, 348, 169, 935, 709, 302, 1 ],
+	[ "Miss Goldenweek", "DEX", [ "Striker", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 51, 51, 81, 301, 301, 305, 1 ],
+	[ "Miss Goldenweek Colors Trap: Calming Green", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 5, 2, 70, 1066998, 264, 264, 268, 412, 390, 530, 1 ],
+	[ "Mr. 2 Bon Clay", "PSY", [ "Fighter", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 94, 93, 46, 690, 403, 201, 1 ],
+	[ "Mr. 2 Bon Clay Bombardier Arabesque", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 599, 348, 169, 935, 709, 302, 1 ],
 	[ "Miss All Sunday Baroque Works VP", "INT", [ "Fighter", "Knowledge" ], 4, 15, 6, 1, 50, 392109, 368, 128, 96, 772, 478, 252, 0.7 ],
 	[ "Nico Robin", "INT", [ "Fighter", "Knowledge" ], 5, 20, 6, 2, 99, 3000000, 736, 430, 214, 1865, 1055, 338, 1 ],
 	[ "Mr. 9", "QCK", "Striker", 2, 10, 5, 0, 35, 90778, 106, 88, 33, 490, 313, 136, 0.7 ],
@@ -214,8 +214,8 @@ window.units = [
 	[ "Laboon", "STR", [ "Fighter", "Tough" ], 3, 18, 5, 1, 50, 392109, 650, 300, 150, 1100, 500, 200, 1 ],
 	[ "Laboon (Luffy's drawing)", "STR", [ "Fighter", "Tough" ], 4, 22, 5, 2, 99, 3000000, 1000, 400, 160, 2500, 850, 250, 1 ],
 	[ "Neptunian Squid", "DEX", "Striker", 3, 18, 8, 1, 50, 392109, 600, 280, 130, 900, 480, 180, 1.5 ],
-	[ "Monkey D. Luffy Gum-Gum Balloon", "STR", [ "Fighter", "Freedom" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
-	[ "Monkey D. Luffy Gear Third", "STR", [ "Fighter", "Freedom" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
+	[ "Monkey D. Luffy Gum-Gum Balloon", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
+	[ "Monkey D. Luffy Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
 	[ "Roronoa Zoro Streaming Wolf Swords", "DEX", [ "Slasher", "Ambition" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
 	[ "Roronoa Zoro Lion's Song", "DEX", [ "Slasher", "Ambition" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
 	[ "Nami Fine Tempo", "INT", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
@@ -227,8 +227,8 @@ window.units = [
 	[ "Dracule Mihawk", "DEX", "Slasher", 4, 30, 4, 1, 70, 1066998, 324, 201, 1, 1998, 814, 7, 1 ],
 	[ "Hawk Eyes Mihawk", "DEX", "Slasher", 5, 50, 4, 1, 99, 5000000, 1916, 782, 5, 3760, 1285, 15, 1 ],
 	[ "Escapee Morgan", "STR", [ "Slasher", "Ambition" ], 3, 17, 5, 1, 70, 711332, 1427, 699, 27, 1600, 1000, 35, 1 ],
-	[ "Double Crosser Django", "PSY", [ "Slasher", "Freedom" ], 3, 11, 5, 1, 70, 1066998, 446, 219, 103, 930, 665, 230, 1 ],
-	[ "Double Ironfist Fullbody", "STR", [ "Fighter", "Freedom" ], 3, 11, 6, 1, 70, 1066998, 150, 150, 80, 890, 809, 187, 1 ],
+	[ "Double Crosser Django", "PSY", [ "Slasher", "Free Spirit" ], 3, 11, 5, 1, 70, 1066998, 446, 219, 103, 930, 665, 230, 1 ],
+	[ "Double Ironfist Fullbody", "STR", [ "Fighter", "Free Spirit" ], 3, 11, 6, 1, 70, 1066998, 150, 150, 80, 890, 809, 187, 1 ],
 	[ "Hina", "QCK", [ "Fighter", "Knowledge" ], 3, 12, 5, 1, 50, 392109, 154, 73, 42, 1176, 495, 187, 1 ],
 	[ "Black Cage Hina", "QCK", [ "Fighter", "Knowledge" ], 4, 18, 4, 2, 99, 3000000, 1088, 422, 149, 2270, 905, 300, 1 ],
 	[ "Mr. 8", "PSY", [ "Shooter", "Knowledge" ], 2, 10, 5, 0, 35, 90778, 178, 55, 32, 530, 248, 151, 1 ],
@@ -256,8 +256,8 @@ window.units = [
 	[ "Flower Sword Vista", "INT", [ "Slasher", "Tough" ], 5, 28, 5, 4, 99, 4000000, 1314, 732, 72, 2840, 1325, 185, 1 ],
 	[ "Izo", "DEX", [ "Shooter", "Knowledge" ], 4, 18, 4, 3, 50, 392109, 232, 130, 50, 1300, 634, 172, 1 ],
 	[ "Flintlock Pistols Izo", "DEX", [ "Shooter", "Knowledge" ], 5, 28, 5, 4, 99, 4000000, 1224, 585, 136, 2550, 1068, 319, 1 ],
-	[ "Blamenco", "STR", [ "Striker", "Freedom" ], 4, 18, 4, 3, 50, 392109, 204, 192, 34, 1150, 775, 150, 1 ],
-	[ "Blamenco the Mallet", "STR", [ "Striker", "Freedom" ], 5, 28, 4, 4, 99, 4000000, 1086, 726, 112, 2488, 1252, 268, 1 ],
+	[ "Blamenco", "STR", [ "Striker", "Free Spirit" ], 4, 18, 4, 3, 50, 392109, 204, 192, 34, 1150, 775, 150, 1 ],
+	[ "Blamenco the Mallet", "STR", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 1086, 726, 112, 2488, 1252, 268, 1 ],
 	[ "Edward Newgate", "STR", [ "Striker", "Tough" ], 5, 40, 4, 4, 70, 1422664, 1338, 522, 80, 3220, 1060, 156, 1 ],
 	[ "Whitebeard", "STR", [ "Striker", "Tough" ], 6, 55, 4, 5, 99, 5000000, 3148, 978, 110, 3900, 1360, 235, 1 ],
 	[ "Training Coby", "PSY", [ "Striker", "Ambition" ], 3, 12, 5, 1, 50, 261406, 90, 81, 55, 780, 514, 218, 0.7 ],
@@ -305,8 +305,8 @@ window.units = [
 	[ "Black Plated Lobster", "INT", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
 	[ "Monkey D. Garp", "PSY", [ "Fighter", "Tough" ], 4, 30, 4, 1, 70, 1066998, 280, 145, 50, 1442, 722, 131, 1 ],
 	[ "Garp the Fist", "PSY", [ "Fighter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1377, 685, 105, 2852, 1220, 225, 1 ],
-	[ "Trafalgar Law", "DEX", [ "Slasher", "Freedom" ], 4, 18, 4, 3, 70, 1066998, 104, 125, 73, 876, 702, 238, 1 ],
-	[ "Trafalgar Law ROOM", "DEX", [ "Slasher", "Freedom" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
+	[ "Trafalgar Law", "DEX", [ "Slasher", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 104, 125, 73, 876, 702, 238, 1 ],
+	[ "Trafalgar Law ROOM", "DEX", [ "Slasher", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
 	[ "Basil Hawkins", "INT", [ "Slasher", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 200, 200, 7, 1165, 750, 127, 1 ],
 	[ "Basil Hawkins the Magician", "INT", [ "Striker", "Knowledge" ], 5, 28, 6, 4, 99, 4000000, 1095, 717, 85, 2480, 1295, 255, 1 ],
 	[ "Killer", "QCK", [ "Striker", "Knowledge" ], 4, 18, 6, 3, 70, 1066998, 180, 250, 0, 1228, 895, -50, 1 ],
@@ -322,10 +322,10 @@ window.units = [
 	[ "Rob Lucci", "QCK", [ "Slasher", "Tough" ], 3, 12, 4, 1, 50, 392109, 132, 126, 28, 1192, 721, 106, 1 ],
 	[ "Rob Lucci Dock One Sawyer, Treenail Specialist", "QCK", [ "Slasher", "Tough" ], 4, 18, 6, 2, 99, 3000000, 1107, 654, 69, 2220, 1203, 177, 1 ],
 	[ "Kaku", "QCK", "Striker", 3, 12, 5, 1, 50, 392109, 172, 79, 37, 1233, 635, 131, 0.7 ],
-	[ "Kaku Dock One Carpentry Specialist", "QCK", [ "Striker", "Freedom" ], 4, 18, 4, 2, 99, 3000000, 1132, 552, 98, 2517, 988, 213, 0.7 ],
+	[ "Kaku Dock One Carpentry Specialist", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 4, 2, 99, 3000000, 1132, 552, 98, 2517, 988, 213, 0.7 ],
 	[ "Lulu", "QCK", "Shooter", 3, 12, 6, 2, 70, 1066998, 290, 168, 88, 985, 682, 223, 1 ],
-	[ "Wapol", "STR", [ "Fighter", "Freedom" ], 3, 8, 4, 1, 50, 392109, 330, 128, 20, 1440, 488, 98, 1 ],
-	[ "Wapol House", "STR", [ "Shooter", "Freedom" ], 4, 15, 4, 2, 99, 3000000, 1390, 423, 77, 2940, 835, 142, [ 1, 1, 0.7 ] ],
+	[ "Wapol", "STR", [ "Fighter", "Free Spirit" ], 3, 8, 4, 1, 50, 392109, 330, 128, 20, 1440, 488, 98, 1 ],
+	[ "Wapol House", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 4, 2, 99, 3000000, 1390, 423, 77, 2940, 835, 142, [ 1, 1, 0.7 ] ],
 	[ "Dalton", "QCK", [ "Slasher", "Knowledge" ], 3, 7, 5, 1, 35, 90778, 192, 110, 45, 751, 390, 140, 0.7 ],
 	[ "Dalton Bison", "QCK", [ "Slasher", "Knowledge" ], 4, 11, 4, 2, 70, 1066998, 690, 322, 102, 1155, 620, 290, 0.7 ],
 	[ "Chess", "DEX", "Shooter", 3, 7, 6, 0, 35, 90778, 186, 90, 31, 668, 296, 121, 1 ],
@@ -334,8 +334,8 @@ window.units = [
 	[ "Dr. Kureha", "PSY", [ "Slasher", "Knowledge" ], 3, 20, 5, 2, 50, 392109, 35, 32, 88, 200, 200, 510, 1.5 ],
 	[ "Lapin", "INT", "Fighter", 2, 15, 5, 0, 35, 90778, 200, 200, 25, 550, 550, 53, 1.5 ],
 	[ "Lapin Adult", "INT", [ "Fighter", "Tough" ], 3, 20, 4, 2, 70, 1066998, 380, 480, 38, 1100, 950, 100, 1.5 ],
-	[ "Franky", "PSY", [ "Shooter", "Freedom" ], 3, 12, 4, 1, 50, 392109, 128, 128, 28, 1220, 680, 112, 1 ],
-	[ "Dismantler Franky", "PSY", [ "Shooter", "Freedom" ], 4, 20, 5, 2, 99, 3000000, 1138, 637, 71, 2453, 1032, 198, 1 ],
+	[ "Franky", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 128, 128, 28, 1220, 680, 112, 1 ],
+	[ "Dismantler Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 3000000, 1138, 637, 71, 2453, 1032, 198, 1 ],
 	[ "Kiwi", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 777, 444, 265, 1 ],
 	[ "Mozu", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 555, 555, 265, 1 ],
 	[ "Kraken Surume", "STR", [ "Striker", "Tough" ], 3, 12, 6, 1, 50, 392109, 99, 99, 188, 1440, 685, 133, 1 ],
@@ -356,14 +356,14 @@ window.units = [
 	[ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Knowledge" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
 	[ "Eustass Kid", "STR", [ "Striker", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
 	[ "Captain Kid", "STR", [ "Striker", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
-	[ "Scratchmen Apoo", "DEX", [ "Shooter", "Freedom" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
-	[ "Roar of the Sea Scratchmen Apoo", "DEX", [ "Shooter", "Freedom" ], 5, 28, 5, 4, 99, 4000000, 1085, 580, 144, 2801, 1111, 300, 1 ],
+	[ "Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
+	[ "Roar of the Sea Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1085, 580, 144, 2801, 1111, 300, 1 ],
 	[ "X Drake", "INT", [ "Striker", "Tough" ], 4, 18, 5, 3, 70, 1066998, 242, 112, 32, 1515, 688, 88, 1 ],
 	[ "Red Flag X Drake", "INT", [ "Fighter", "Tough" ], 5, 28, 6, 4, 99, 4000000, 1432, 611, 57, 3580, 1098, 132, 1 ],
-	[ "Jewelry Bonney", "PSY", [ "Fighter", "Freedom" ], 4, 18, 4, 3, 70, 1066998, 277, 80, 44, 1370, 440, 220, 1 ],
-	[ "Big Eater Jewelry Bonney", "PSY", [ "Fighter", "Freedom" ], 5, 28, 5, 4, 99, 4000000, 1248, 401, 158, 3000, 720, 400, 1 ],
-	[ "Capone Bege", "QCK", [ "Shooter", "Freedom" ], 4, 18, 6, 3, 70, 1066998, 199, 102, 34, 1050, 755, 153, 1 ],
-	[ "Capone Gang Bege", "QCK", [ "Shooter", "Freedom" ], 5, 28, 4, 4, 99, 4000000, 893, 682, 110, 2122, 1323, 313, 1 ],
+	[ "Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 277, 80, 44, 1370, 440, 220, 1 ],
+	[ "Big Eater Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1248, 401, 158, 3000, 720, 400, 1 ],
+	[ "Capone Bege", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 199, 102, 34, 1050, 755, 153, 1 ],
+	[ "Capone Gang Bege", "QCK", [ "Shooter", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 893, 682, 110, 2122, 1323, 313, 1 ],
 	[ "Silvers Rayleigh", "INT", [ "Fighter", "Knowledge" ], 5, 30, 4, 3, 70, 1066998, 488, 302, 168, 1518, 826, 309, 1 ],
 	[ "Dark King Rayleigh", "INT", [ "Fighter", "Knowledge" ], 6, 55, 4, 4, 99, 5000000, 1462, 777, 277, 3001, 1300, 500, 1 ],
 	[ "Giant Slasher Red Pirates", "STR", "Slasher", 2, 8, 6, 0, 30, 57558, 297, 163, 41, 579, 363, 41, 1.5 ],
@@ -387,8 +387,8 @@ window.units = [
 	[ "Doctor Hogback", "INT", [ "Fighter", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 1180, 550, 72, 2741, 945, 189, 1 ],
 	[ "Cindry", "PSY", "Shooter", 3, 12, 5, 1, 50, 392109, 76, 58, 60, 806, 458, 259, 0.7 ],
 	[ "Victoria Cindry", "PSY", "Shooter", 4, 20, 4, 2, 99, 3000000, 622, 398, 231, 1402, 661, 478, 0.7 ],
-	[ "Emporio Ivankov", "QCK", [ "Fighter", "Freedom" ], 4, 30, 4, 3, 70, 1066998, 302, 125, 53, 1682, 512, 161, 1 ],
-	[ "Emporio Ivankov Queen of Kamabakka Queendom", "QCK", [ "Fighter", "Freedom" ], 5, 50, 4, 4, 99, 5000000, 1642, 470, 132, 3030, 1155, 290, 1 ],
+	[ "Emporio Ivankov", "QCK", [ "Fighter", "Free Spirit" ], 4, 30, 4, 3, 70, 1066998, 302, 125, 53, 1682, 512, 161, 1 ],
+	[ "Emporio Ivankov Queen of Kamabakka Queendom", "QCK", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1642, 470, 132, 3030, 1155, 290, 1 ],
 	[ "Perona", "DEX", [ "Shooter", "Ambition" ], 3, 10, 4, 1, 50, 392109, 134, 44, 55, 944, 422, 222, 1 ],
 	[ "Ghost Princess Perona", "DEX", [ "Shooter", "Ambition" ], 4, 18, 4, 2, 99, 3000000, 887, 377, 198, 1598, 791, 430, 1 ],
 	[ "Kumacy", "STR", [ "Fighter", "Tough" ], 3, 11, 6, 1, 70, 1066998, 500, 255, 0, 1660, 904, 0, 1 ],
@@ -413,32 +413,32 @@ window.units = [
 	[ "Bartholomew Kuma Warlord of the Sea", "STR", [ "Shooter", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1445, 644, 82, 2734, 1205, 262, 1 ],
 	[ "Gecko Moria", "INT", [ "Striker", "Ambition" ], 4, 15, 4, 3, 70, 1066998, 355, 102, 15, 1928, 677, 33, 1 ],
 	[ "Gecko Moria Warlord of the Sea", "INT", [ "Striker", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 1845, 612, 33, 3900, 1120, 118, 1 ],
-	[ "Boa Hancock", "QCK", [ "Fighter", "Freedom" ], 5, 30, 4, 4, 70, 1066998, 416, 251, 197, 1595, 859, 340, 1 ],
-	[ "Boa Hancock Warlord of the Sea", "QCK", [ "Fighter", "Freedom" ], 6, 55, 4, 5, 99, 5000000, 1512, 782, 301, 2860, 1320, 515, 1 ],
+	[ "Boa Hancock", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 416, 251, 197, 1595, 859, 340, 1 ],
+	[ "Boa Hancock Warlord of the Sea", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1512, 782, 301, 2860, 1320, 515, 1 ],
 	[ "Donquixote Doflamingo", "DEX", [ "Slasher", "Ambition" ], 4, 30, 4, 1, 70, 1066998, 200, 186, 30, 1061, 790, 145, 1 ],
 	[ "Donquixote Doflamingo Warlord of the Sea", "DEX", [ "Slasher", "Ambition" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
 	[ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Tough" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
-	[ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Freedom" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
+	[ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
 	[ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Ambition" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
 	[ "Nami Mirage Tempo: The Heavens", "INT", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 99, 2000000, 348, 201, 75, 1260, 988, 361, 1 ],
-	[ "Brook", "QCK", [ "Slasher", "Freedom" ], 3, 12, 5, 1, 50, 392109, 220, 43, 45, 1190, 430, 208, 1 ],
-	[ "Humming Swordsman Brook", "QCK", [ "Slasher", "Freedom" ], 4, 20, 4, 2, 99, 3000000, 1138, 368, 162, 2108, 980, 332, 1 ],
+	[ "Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 220, 43, 45, 1190, 430, 208, 1 ],
+	[ "Humming Swordsman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1138, 368, 162, 2108, 980, 332, 1 ],
 	[ "Ryuma", "PSY", "Slasher", 4, 18, 5, 2, 99, 3000000, 1138, 368, 162, 2005, 1088, 162, 1 ],
 	[ "Masira", "STR", "Fighter", 3, 10, 4, 1, 50, 392109, 525, 212, 12, 1120, 655, 95, 1 ],
 	[ "Shoujou", "DEX", "Shooter", 3, 10, 4, 1, 50, 392109, 655, 132, 23, 1334, 401, 144, 1 ],
-	[ "Montblanc Cricket", "PSY", [ "Shooter", "Freedom" ], 3, 12, 4, 1, 50, 392109, 488, 145, 54, 1050, 525, 155, 1.5 ],
+	[ "Montblanc Cricket", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 488, 145, 54, 1050, 525, 155, 1.5 ],
 	[ "South Bird and Forest Residents", "DEX", "Fighter", 3, 8, 6, 1, 50, 261406, 752, 383, 121, 929, 423, 161, 1.5 ],
 	[ "Bellamy", "DEX", [ "Fighter", "Ambition" ], 3, 10, 4, 1, 35, 136167, 131, 152, 24, 769, 692, 89, 1 ],
 	[ "Bellamy the Hyena", "DEX", [ "Fighter", "Ambition" ], 4, 15, 6, 2, 70, 1066998, 726, 600, 67, 1072, 986, 170, 1 ],
 	[ "Sarquiss", "QCK", "Slasher", 3, 10, 5, 1, 50, 392109, 220, 92, 22, 1440, 424, 68, 1 ],
-	[ "Elizabeth", "DEX", [ "Fighter", "Freedom" ], 4, 12, 4, 2, 70, 1422664, 881, 422, 155, 1485, 700, 198, 1.5 ],
-	[ "Caroline", "INT", [ "Fighter", "Freedom" ], 4, 18, 6, 2, 99, 3000000, 772, 389, 177, 1890, 915, 300, [ 1.5, 1.5, 0.7 ] ],
+	[ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 70, 1422664, 881, 422, 155, 1485, 700, 198, 1.5 ],
+	[ "Caroline", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 6, 2, 99, 3000000, 772, 389, 177, 1890, 915, 300, [ 1.5, 1.5, 0.7 ] ],
 	[ "Sanji Kamabakka Queendom Traditional Fighting Style", "QCK", "Fighter", 3, 10, 4, 2, 50, 392109, 221, 58, 29, 1229, 622, 130, [ 0.7, 0.7, 1.5 ] ],
-	[ "Sanji Candy", "QCK", [ "Fighter", "Freedom" ], 4, 18, 4, 3, 99, 3000000, 1155, 545, 76, 1802, 951, 357, [ 0.7, 0.7, 1.5 ] ],
+	[ "Sanji Candy", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1155, 545, 76, 1802, 951, 357, [ 0.7, 0.7, 1.5 ] ],
 	[ "Perona - Sweets", "DEX", [ "Shooter", "Ambition" ], 4, 11, 4, 2, 50, 392109, 168, 98, 58, 928, 412, 231, 1.5 ],
 	[ "Ghost Princess Perona - Sweets", "DEX", [ "Shooter", "Ambition" ], 5, 20, 4, 3, 99, 3000000, 856, 359, 186, 1568, 741, 466, 1.5 ],
-	[ "Nefertari Vivi - Love", "PSY", [ "Slasher", "Freedom" ], 4, 11, 5, 2, 50, 392109, 138, 102, 183, 889, 358, 256, 1.5 ],
-	[ "Princess Vivi - Love", "PSY", [ "Slasher", "Freedom" ], 5, 20, 6, 3, 99, 3000000, 844, 297, 213, 1440, 683, 322, 1.5 ],
+	[ "Nefertari Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 4, 11, 5, 2, 50, 392109, 138, 102, 183, 889, 358, 256, 1.5 ],
+	[ "Princess Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 844, 297, 213, 1440, 683, 322, 1.5 ],
 	[ "Cowboy and Bourbon Jr. Supersonic Duck Squadron", "QCK", "Evolver", 3, 9, 5, 0, 35, 90778, 150, 80, 35, 755, 334, 155, 1 ],
 	[ "Stomp and Ivan X Supersonic Duck Squadron", "DEX", "Evolver", 3, 9, 5, 0, 35, 90778, 126, 98, 33, 719, 361, 152, 1 ],
 	[ "Centaur and Hikoichi Supersonic Duck Squadron", "STR", "Evolver", 3, 9, 5, 0, 35, 90778, 102, 119, 30, 693, 383, 149, 1 ],
@@ -459,12 +459,12 @@ window.units = [
 	[ "Sengoku", "PSY", [ "Fighter", "Knowledge" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
 	[ "Sengoku the Buddha", "PSY", [ "Fighter", "Knowledge" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
 	[ "Criminal Galdino Mr. 3", "PSY", [ "Slasher", "Knowledge" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
-	[ "Escapee Bentham Mr. 2 Bon Clay", "DEX", [ "Fighter", "Freedom" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
-	[ "Prison Break Expert Mr. 2 Bon Clay", "DEX", [ "Fighter", "Freedom" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
+	[ "Escapee Bentham Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
+	[ "Prison Break Expert Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
 	[ "Satori", "PSY", [ "Shooter", "Knowledge" ], 4, 15, 4, 2, 70, 1066998, 479, 190, 158, 1422, 576, 272, 1 ],
 	[ "Shura", "INT", "Striker", 4, 15, 4, 2, 70, 1066998, 330, 420, 93, 1030, 1002, 175, 1 ],
 	[ "Gedatsu", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 622, 378, 53, 2020, 703, 108, 1 ],
-	[ "Braham", "DEX", [ "Shooter", "Freedom" ], 3, 15, 5, 1, 70, 1066998, 374, 283, 96, 1202, 684, 202, 1 ],
+	[ "Braham", "DEX", [ "Shooter", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 374, 283, 96, 1202, 684, 202, 1 ],
 	[ "Yama", "STR", "Fighter", 3, 13, 6, 1, 50, 392109, 800, 228, 1, 1700, 608, 2, 1 ],
 	[ "Yellow White Beret Skypiea Guard", "PSY", "Shooter", 2, 3, 6, 0, 20, 17456, 51, 23, 45, 330, 166, 89, 1 ],
 	[ "Black White Beret Skypiea Guard", "INT", "Shooter", 2, 3, 6, 0, 20, 17456, 49, 38, 40, 320, 197, 80, 1 ],
@@ -495,8 +495,8 @@ window.units = [
 	[ "Black Hunter Shandian Warrior", "INT", "Shooter", 2, 5, 4, 0, 30, 57558, 40, 25, 39, 214, 128, 196, 1 ],
 	[ "Yellow Hunter Adept Shandian Warrior", "PSY", "Shooter", 3, 11, 4, 1, 60, 449516, 150, 60, 160, 502, 258, 365, 1 ],
 	[ "Black Hunter Adept Shandian Warrior", "INT", "Shooter", 3, 11, 4, 1, 60, 449516, 152, 66, 153, 508, 271, 359, 1 ],
-	[ "Portgas D. Ace Mt. Corvo's Brothers 3", "QCK", [ "Fighter", "Freedom" ], 4, 10, 4, 2, 35, 90778, 144, 66, 60, 632, 347, 248, 0.7 ],
-	[ "Portgas D. Ace Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "QCK", [ "Fighter", "Freedom" ], 5, 18, 4, 3, 70, 1066998, 571, 295, 200, 1072, 559, 385, 0.7 ],
+	[ "Portgas D. Ace Mt. Corvo's Brothers 3", "QCK", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 90778, 144, 66, 60, 632, 347, 248, 0.7 ],
+	[ "Portgas D. Ace Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "QCK", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 571, 295, 200, 1072, 559, 385, 0.7 ],
 	[ "Bellmere", "DEX", "Shooter", 3, 9, 5, 1, 35, 136167, 60, 39, 68, 426, 291, 283, 1 ],
 	[ "Bellmere Nami and Nojiko's Mother", "DEX", "Shooter", 4, 15, 4, 2, 70, 1066998, 377, 249, 240, 810, 483, 400, 1 ],
 	[ "Kaya", "PSY", [ "Shooter", "Knowledge" ], 3, 9, 6, 1, 35, 136167, 115, 50, 72, 370, 180, 330, 1.5 ],
@@ -510,29 +510,29 @@ window.units = [
 	[ "Sir Crocodile, the Strongest Prisoner Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Knowledge" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
 	[ "Sir Crocodile, the Strongest Prisoner Ex-Warlord", "QCK", [ "Striker", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
 	[ "Daz Bones, Convict Mr. 1", "INT", [ "Slasher", "Knowledge" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
-	[ "Sabo Mt. Corvo's Brothers 3", "PSY", [ "Striker", "Freedom" ], 4, 10, 5, 2, 35, 90778, 32, 32, 32, 522, 288, 286, 0.7 ],
-	[ "Sabo Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "PSY", [ "Striker", "Freedom" ], 5, 18, 4, 3, 70, 1066998, 440, 233, 242, 951, 460, 450, 0.7 ],
+	[ "Sabo Mt. Corvo's Brothers 3", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 5, 2, 35, 90778, 32, 32, 32, 522, 288, 286, 0.7 ],
+	[ "Sabo Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "PSY", [ "Striker", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 440, 233, 242, 951, 460, 450, 0.7 ],
 	[ "Nico Robin Tropical", "INT", [ "Fighter", "Knowledge" ], 4, 15, 6, 2, 99, 2000000, 368, 128, 96, 1910, 715, 292, 1 ],
 	[ "Heracles'n", "PSY", [ "Shooter", "Knowledge" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
 	[ "Heracles'n the Hero of the Forest", "PSY", [ "Shooter", "Knowledge" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
 	[ "Usopp'n", "PSY", "Shooter", 4, 10, 5, 1, 50, 261406, 444, 237, 47, 1080, 648, 144, 1 ],
 	[ "Usopp'n, Pupil of Heracles'n", "PSY", [ "Shooter", "Tough" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
-	[ "Monkey D. Luffy, Merveille's Adventurer", "STR", [ "Fighter", "Freedom" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
-	[ "Monkey D. Luffy, Straw Hat Pirates' Attack", "STR", [ "Fighter", "Freedom" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
+	[ "Monkey D. Luffy, Merveille's Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
+	[ "Monkey D. Luffy, Straw Hat Pirates' Attack", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
 	[ "Sanji, Merveille's Adventurer", "INT", [ "Fighter", "Tough" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
 	[ "Sanji, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Tough" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
 	[ "Nami, Merveille's Adventurer", "QCK", [ "Striker", "Knowledge" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
 	[ "Nami and Billy the Thunder Bird", "QCK", [ "Striker", "Knowledge" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
-	[ "Brook, Merveille's Adventurer", "PSY", [ "Slasher", "Freedom" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
-	[ "Brook, Straw Hat Pirates' Attack", "PSY", [ "Slasher", "Freedom" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
+	[ "Brook, Merveille's Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
+	[ "Brook, Straw Hat Pirates' Attack", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
 	[ "Chopper, Merveille's Adventurer", "DEX", [ "Shooter", "Knowledge" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
 	[ "Chopper, Straw Hat Pirates' Attack", "DEX", [ "Shooter", "Knowledge" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
 	[ "Shanks Black Clad Redhead", "PSY", [ "Slasher", "Knowledge" ], 5, 30, 4, 4, 70, 1066998, 478, 285, 185, 1650, 780, 291, 1 ],
 	[ "Shanks Black Clad Emperor", "PSY", [ "Slasher", "Knowledge" ], 6, 55, 5, 5, 99, 5000000, 1537, 736, 261, 3140, 1400, 418, 1 ],
 	[ "Nico Robin Cherry Blossoms Falling", "DEX", [ "Fighter", "Knowledge" ], 4, 11, 4, 2, 50, 392109, 171, 55, 65, 976, 328, 252, 1 ],
 	[ "Nico Robin Cherry Blossoms in Full Bloom", "DEX", [ "Fighter", "Knowledge" ], 5, 19, 6, 3, 99, 3000000, 913, 271, 209, 1925, 747, 384, 1 ],
-	[ "Brook Cherry Blossom Hair", "QCK", [ "Slasher", "Freedom" ], 4, 12, 5, 2, 50, 392109, 211, 108, 40, 1267, 448, 163, 1 ],
-	[ "Brook Cherry Blossom Melody", "QCK", [ "Slasher", "Freedom" ], 5, 20, 4, 3, 99, 3000000, 1199, 379, 131, 2311, 885, 281, 1 ],
+	[ "Brook Cherry Blossom Hair", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 5, 2, 50, 392109, 211, 108, 40, 1267, 448, 163, 1 ],
+	[ "Brook Cherry Blossom Melody", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 1199, 379, 131, 2311, 885, 281, 1 ],
 	[ "Nami Blossom Cloud", "DEX", [ "Shooter", "Knowledge" ], 4, 12, 5, 2, 50, 392109, 127, 53, 73, 812, 303, 287, 1 ],
 	[ "Nami Blossom Climate", "DEX", [ "Shooter", "Knowledge" ], 5, 20, 4, 3, 99, 3000000, 750, 247, 241, 1783, 670, 445, 1 ],
 	[ "Domino", "PSY", [ "Fighter", "Knowledge" ], 3, 13, 4, 1, 50, 392109, 32, 20, 80, 713, 366, 318, 1 ],
@@ -541,14 +541,14 @@ window.units = [
 	[ "Basilisk", "DEX", [ "Fighter", "Tough" ], 3, 12, 4, 1, 70, 1066998, 612, 289, 31, 1525, 644, 128, 1 ],
 	[ "Ohm", "STR", [ "Slasher", "Knowledge" ], 4, 16, 4, 2, 70, 1066998, 770, 480, -600, 2200, 1050, -600, 1 ],
 	[ "Nola Giant Snake", "PSY", [ "Fighter", "Tough" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
-	[ "Wyper", "DEX", [ "Shooter", "Freedom" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
-	[ "Wyper Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Freedom" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
+	[ "Wyper", "DEX", [ "Shooter", "Free Spirit" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
+	[ "Wyper Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
 	[ "Eneru", "PSY", [ "Shooter", "Ambition" ], 3, 12, 4, 2, 50, 392109, 177, 141, 58, 951, 615, 185, 1 ],
 	[ "Kami Eneru", "PSY", [ "Shooter", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
-	[ "Monkey D. Luffy Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Freedom" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
-	[ "Monkey D. Luffy Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Freedom" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
-	[ "Sadi-chan", "INT", [ "Striker", "Freedom" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
-	[ "Sadi-chan, Impel Down's Chief Guard", "INT", [ "Striker", "Freedom" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
+	[ "Monkey D. Luffy Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
+	[ "Monkey D. Luffy Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
+	[ "Sadi-chan", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
+	[ "Sadi-chan, Impel Down's Chief Guard", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
 	[ "Minokoala", "STR", [ "Fighter", "Tough" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
 	[ "Manticore", "QCK", [ "Fighter", "Tough" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
 	[ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Ambition" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
@@ -557,30 +557,30 @@ window.units = [
 	[ "Usopp, Straw Hat Pirates' Attack", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
 	[ "Nico Robin, Merveille's Adventurer", "INT", [ "Fighter", "Knowledge" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
 	[ "Nico Robin, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Knowledge" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
-	[ "Franky, Merveille's Adventurer", "STR", [ "Shooter", "Freedom" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
-	[ "Franky, Straw Hat Pirates' Attack", "STR", [ "Shooter", "Freedom" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
-	[ "Portgas D. Ace Black Clad Flame Fist", "DEX", [ "Shooter", "Freedom" ], 5, 30, 6, 4, 70, 1066998, 515, 264, 152, 1922, 758, 253, 1 ],
-	[ "Portgas D. Ace Black Clad Whitebeard 2nd Div. Commander", "DEX", [ "Shooter", "Freedom" ], 6, 55, 4, 5, 99, 5000000, 1877, 702, 214, 3818, 1352, 321, 1 ],
+	[ "Franky, Merveille's Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
+	[ "Franky, Straw Hat Pirates' Attack", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
+	[ "Portgas D. Ace Black Clad Flame Fist", "DEX", [ "Shooter", "Free Spirit" ], 5, 30, 6, 4, 70, 1066998, 515, 264, 152, 1922, 758, 253, 1 ],
+	[ "Portgas D. Ace Black Clad Whitebeard 2nd Div. Commander", "DEX", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1877, 702, 214, 3818, 1352, 321, 1 ],
 	[ "Porche", "PSY", "Shooter", 3, 10, 6, 1, 50, 392109, 33, 29, 58, 536, 338, 300, 1 ],
 	[ "Capote", "QCK", "Striker", 3, 10, 5, 1, 50, 392109, 124, 48, 36, 1188, 482, 139, 1 ],
 	[ "Hamburg", "DEX", [ "Striker", "Tough" ], 3, 10, 5, 1, 50, 392109, 103, 58, 32, 1024, 620, 122, 1 ],
 	[ "Pickles", "QCK", [ "Fighter", "Tough" ], 3, 10, 4, 1, 50, 392109, 130, 51, 25, 1202, 603, 98, 1 ],
 	[ "Big Bun", "STR", [ "Slasher", "Tough" ], 3, 15, 6, 1, 70, 1066998, 180, 105, 2, 1895, 850, 3, 1 ],
-	[ "Foxy", "INT", [ "Fighter", "Freedom" ], 3, 10, 5, 2, 35, 136167, 106, 51, 30, 788, 433, 175, 1 ],
-	[ "The Silver Fox Foxy", "INT", [ "Fighter", "Freedom" ], 4, 18, 5, 3, 70, 1066998, 725, 373, 144, 1212, 698, 266, 1 ],
+	[ "Foxy", "INT", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 106, 51, 30, 788, 433, 175, 1 ],
+	[ "The Silver Fox Foxy", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 725, 373, 144, 1212, 698, 266, 1 ],
 	[ "Monkey D. Luffy Davy Back Fight: Afro", "STR", [ "Fighter", "Tough" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
 	[ "Monkey D. Luffy Davy Back Fight: Combat", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
 	[ "Usopp Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
 	[ "Tony Tony Chopper Davy Back Fight: Mask", "PSY", [ "Fighter", "Knowledge" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
-	[ "Aokiji", "INT", [ "Striker", "Freedom" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
-	[ "Aokiji the Freezing Man", "INT", [ "Striker", "Freedom" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
+	[ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
+	[ "Aokiji the Freezing Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
 	[ "Tea Time Nami", "INT", [ "Striker", "Knowledge" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
-	[ "Monkey D. Luffy Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Freedom" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
-	[ "Monkey D. Luffy Voyage Dream: Pirate King", "STR", [ "Fighter", "Freedom" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
+	[ "Monkey D. Luffy Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
+	[ "Monkey D. Luffy Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
 	[ "Roronoa Zoro Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Ambition" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
 	[ "Roronoa Zoro Voyage Dream: Master Swordsman", "QCK", [ "Slasher", "Ambition" ], 5, 20, 4, 3, 99, 3000000, 1329, 777, 90, 2250, 1118, 201, 1 ],
-	[ "Genbou", "STR", [ "Shooter", "Freedom" ], 3, 15, 4, 1, 70, 1066998, 271, 91, 15, 1855, 711, 54, 0.7 ],
-	[ "Kamakiri", "QCK", [ "Striker", "Freedom" ], 3, 15, 5, 1, 70, 1066998, 195, 84, 30, 1669, 691, 101, 0.7 ],
+	[ "Genbou", "STR", [ "Shooter", "Free Spirit" ], 3, 15, 4, 1, 70, 1066998, 271, 91, 15, 1855, 711, 54, 0.7 ],
+	[ "Kamakiri", "QCK", [ "Striker", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 195, 84, 30, 1669, 691, 101, 0.7 ],
 	[ "Raki", "INT", "Shooter", 4, 18, 4, 2, 99, 3000000, 158, 55, 51, 1544, 668, 460, 0.7 ],
 	[ "Aisa", "PSY", "Fighter", 3, 11, 5, 2, 50, 392109, 32, 15, 80, 223, 109, 475, 0.7 ],
 	[ "Nojiko", "PSY", [ "Striker", "Knowledge" ], 3, 9, 5, 1, 35, 136167, 125, 57, 60, 398, 277, 293, 1 ],
@@ -598,8 +598,8 @@ window.units = [
 	[ "Tony Tony Chopper Voyage Dream: Great Doctor", "STR", [ "Fighter", "Tough" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
 	[ "Buggy the Pirate Apprentice", "INT", [ "Slasher", "Ambition" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
 	[ "Buggy, Roger Pirates", "INT", [ "Slasher", "Ambition" ], 4, 19, 5, 2, 99, 3000000, 813, 358, 123, 1602, 709, 290, 1 ],
-	[ "Shanks the Pirate Apprentice", "PSY", [ "Slasher", "Freedom" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
-	[ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Freedom" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
+	[ "Shanks the Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
+	[ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Free Spirit" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
 	[ "Eneru 200,000,000 Volt Amaru", "QCK", [ "Striker", "Ambition" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
 	[ "Eneru, Lightning Incarnate 200,000,000 Volt Amaru", "QCK", [ "Striker", "Ambition" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
 	[ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Tough" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
@@ -610,8 +610,8 @@ window.units = [
 	[ "Thug Carne", "QCK", "Slasher", 3, 10, 6, 1, 50, 522812, 153, 91, 35, 1054, 571, 162, 0.7 ],
 	[ "Hiking Bear", "INT", "Fighter", 2, 7, 5, 0, 35, 90778, 129, 32, 8, 1410, 225, 30, 0.7 ],
 	[ "Purinpurin", "PSY", "Shooter", 2, 7, 6, 0, 35, 90778, 38, 14, 29, 544, 194, 193, 0.7 ],
-	[ "Brook Voyage Log: Straw Hat Pirates", "DEX", [ "Slasher", "Freedom" ], 4, 12, 6, 2, 50, 392109, 208, 99, 29, 1326, 603, 168, 0.7 ],
-	[ "Brook Voyage Dream: Promised Meeting", "DEX", [ "Slasher", "Freedom" ], 5, 20, 6, 3, 99, 3000000, 1276, 560, 132, 2117, 1009, 279, 0.7 ],
+	[ "Brook Voyage Log: Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 208, 99, 29, 1326, 603, 168, 0.7 ],
+	[ "Brook Voyage Dream: Promised Meeting", "DEX", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1276, 560, 132, 2117, 1009, 279, 0.7 ],
 	[ "Zambai", "PSY", "Shooter", 3, 16, 4, 2, 70, 1066998, 230, 90, 48, 1580, 702, 168, 1 ],
 	[ "Demolisher Axeman", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
 	[ "Demolisher Spearman", "STR", [ "Striker", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
@@ -652,7 +652,7 @@ window.units = [
 	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Knowledge" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
 	[ "Iron Mask Duval", "DEX", [ "Shooter", "Ambition" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
 	[ "Duval, Head of the Flying Fish Riders", "DEX", [ "Shooter", "Ambition" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
-	[ "Duval, Head of the Rosy Life Riders", "DEX", [ "Shooter", "Freedom" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
+	[ "Duval, Head of the Rosy Life Riders", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
 	[ "Pirate Arlong", "STR", [ "Slasher", "Tough" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
 	[ "Arlong, Sun Pirates", "STR", [ "Slasher", "Tough" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
 	[ "Kuroobi, Sun Pirates", "STR", [ "Fighter", "Tough" ], 3, 10, 6, 1, 50, 392109, 160, 103, 9, 1233, 744, 70, 1 ],
@@ -661,19 +661,19 @@ window.units = [
 	[ "Usopp Voyage Log: Straw Hat Pirates", "QCK", "Striker", 4, 12, 6, 2, 50, 392109, 155, 67, 47, 1085, 513, 235, 0.7 ],
 	[ "Usopp Voyage Dream: Brave Sea Warrior", "QCK", "Striker", 5, 20, 4, 3, 99, 3000000, 1024, 468, 185, 2012, 938, 344, 0.7 ],
 	[ "Nami Holiday", "PSY", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 99, 2000000, 70, 30, 100, 1334, 673, 396, 0.7 ],
-	[ "Nefertari Vivi, Princess of the Alabasta Kingdom", "PSY", [ "Striker", "Freedom" ], 3, 9, 6, 1, 35, 136167, 11, 11, 11, 285, 104, 225, 1 ],
-	[ "Nefertari Vivi, Vice-Leader of the Suna Suna Clan", "PSY", [ "Fighter", "Freedom" ], 4, 15, 6, 2, 70, 1066998, 243, 51, 187, 593, 269, 488, 1 ],
-	[ "Koza, Alabasta Citizen", "QCK", [ "Striker", "Freedom" ], 3, 9, 5, 1, 35, 136167, 53, 53, 3, 503, 274, 151, 1 ],
-	[ "Koza, Leader of the Suna Suna Clan", "QCK", [ "Striker", "Freedom" ], 4, 15, 4, 2, 70, 1066998, 445, 230, 123, 1000, 503, 341, 1 ],
+	[ "Nefertari Vivi, Princess of the Alabasta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 6, 1, 35, 136167, 11, 11, 11, 285, 104, 225, 1 ],
+	[ "Nefertari Vivi, Vice-Leader of the Suna Suna Clan", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 243, 51, 187, 593, 269, 488, 1 ],
+	[ "Koza, Alabasta Citizen", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 53, 53, 3, 503, 274, 151, 1 ],
+	[ "Koza, Leader of the Suna Suna Clan", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 445, 230, 123, 1000, 503, 341, 1 ],
 	[ "Nefertari Cobra, King of the Alabasta Kingdom", "PSY", "Fighter", 3, 15, 5, 2, 70, 1066998, 523, 294, 31, 1402, 571, 211, 1 ],
-	[ "Sabo", "PSY", [ "Freedom", "Striker" ], 5, 30, 5, 4, 70, 1066998, 369, 279, 169, 1498, 821, 305, 1.5 ],
-	[ "Sabo the Revolutionary", "PSY", [ "Freedom", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1440, 752, 252, 2985, 1422, 451, 1.5 ],
-	[ "Koala", "DEX", [ "Fighter", "Freedom" ], 4, 18, 4, 3, 70, 1066998, 94, 122, 48, 996, 644, 226, 1.5 ],
-	[ "Koala the Revolutionary", "DEX", [ "Fighter", "Freedom" ], 5, 29, 4, 4, 99, 4000000, 931, 600, 185, 1934, 1212, 392, 1.5 ],
+	[ "Sabo", "PSY", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 70, 1066998, 369, 279, 169, 1498, 821, 305, 1.5 ],
+	[ "Sabo the Revolutionary", "PSY", [ "Free Spirit", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1440, 752, 252, 2985, 1422, 451, 1.5 ],
+	[ "Koala", "DEX", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 94, 122, 48, 996, 644, 226, 1.5 ],
+	[ "Koala the Revolutionary", "DEX", [ "Fighter", "Free Spirit" ], 5, 29, 4, 4, 99, 4000000, 931, 600, 185, 1934, 1212, 392, 1.5 ],
 	[ "Hack", "STR", [ "Fighter", "Tough" ], 4, 18, 4, 3, 70, 1066998, 188, 136, 21, 1241, 721, 151, 1.5 ],
 	[ "Hack the Revolutionary", "STR", [ "Fighter", "Tough" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
-	[ "Emporio Ivankov, Newkama Kenpo Instructor", "INT", [ "Freedom", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
-	[ "Emporio Ivankov the Revolutionary", "INT", [ "Freedom", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
+	[ "Emporio Ivankov, Newkama Kenpo Instructor", "INT", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
+	[ "Emporio Ivankov the Revolutionary", "INT", [ "Free Spirit", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
 	[ "Inazuma", "QCK", [ "Slasher", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 179, 58, 47, 1300, 449, 232, 1.5 ],
 	[ "Inazuma the Revolutionary", "QCK", [ "Slasher", "Knowledge" ], 5, 29, 6, 4, 99, 4000000, 1244, 400, 199, 2559, 833, 380, 1.5 ],
 	[ "Nico Robin Voyage Log: Straw Hat Pirates", "PSY", [ "Fighter", "Knowledge" ], 4, 12, 6, 2, 50, 392109, 155, 62, 58, 1032, 484, 262, 1 ],
@@ -684,9 +684,9 @@ window.units = [
 	[ "Chocolate Ice Cream Loving Robin", "PSY", [ "Fighter", "Knowledge" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
 	[ "Ice Cream Loving Perona", "INT", [ "Shooter", "Ambition" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
 	[ "Strawberry Ice Cream Loving Perona", "INT", [ "Shooter", "Ambition" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
-	[ "Vivi's Breather", "QCK", [ "Slasher", "Freedom" ], 4, 12, 4, 2, 70, 1066998, 102, 37, 91, 1028, 497, 343, 1 ],
-	[ "Calgara", "STR", [ "Freedom", "Striker" ], 3, 12, 6, 1, 50, 392109, 94, 115, 0, 1203, 692, 0, 1 ],
-	[ "Calgara, the Great Warrior of Shandia", "STR", [ "Freedom", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
+	[ "Vivi's Breather", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 4, 2, 70, 1066998, 102, 37, 91, 1028, 497, 343, 1 ],
+	[ "Calgara", "STR", [ "Free Spirit", "Striker" ], 3, 12, 6, 1, 50, 392109, 94, 115, 0, 1203, 692, 0, 1 ],
+	[ "Calgara, the Great Warrior of Shandia", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
 	[ "Montblanc Noland", "INT", [ "Slasher", "Knowledge" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
 	[ "Montblanc Noland, Explorer and Admiral of the Lvneel Kingdom", "INT", [ "Slasher", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
 	[ "Halberd Corporal Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
@@ -708,24 +708,24 @@ window.units = [
 	[ "Blueno Rokushiki, Cipher Pol No.9", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
 	[ "Nico Robin the Devil Child", "PSY", [ "Fighter", "Knowledge" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
 	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Knowledge" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
-	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Freedom" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
-	[ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Freedom" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],
+	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
+	[ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],
 	[ "Gan Fall", "QCK", "Striker", 3, 12, 6, 1, 50, 392109, 80, 40, 48, 930, 452, 185, 1.5 ],
 	[ "Gan Fall the Knight of the Sky", "QCK", "Striker", 4, 20, 4, 2, 99, 3000000, 884, 401, 151, 1704, 1202, 300, 1.5 ],
 	[ "Pierre", "DEX", "Fighter", 3, 12, 4, 1, 50, 392109, 69, 32, 38, 920, 480, 182, 1 ],
-	[ "Konis", "PSY", "Freedom", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
-	[ "Konis, Skypiean Maiden", "PSY", "Freedom", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
+	[ "Konis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
+	[ "Konis, Skypiean Maiden", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
 	[ "Dracule Mihawk Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
 	[ "Dracule Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
 	[ "Sir Crocodile Logia Warlord of the Sea", "DEX", [ "Knowledge", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
 	[ "Sir Crocodile Logia Former Warlord of the Sea", "DEX", [ "Knowledge", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
-	[ "Jerry", "STR", [ "Fighter", "Freedom" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
-	[ "Jerry, Cipher Pol No.6", "STR", [ "Fighter", "Freedom" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
+	[ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
+	[ "Jerry, Cipher Pol No.6", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
 	[ "T-Bone", "PSY", [ "Slasher", "Knowledge" ], 3, 12, 6, 1, 50, 392109, 99, 78, 42, 958, 542, 162, 1 ],
 	[ "Ship Cutter T-Bone, Navy HQ Captain", "PSY", [ "Slasher", "Knowledge" ], 4, 20, 4, 3, 99, 3000000, 900, 493, 133, 1700, 1100, 300, 1 ],
-	[ "Nefertari Vivi Voyage Log: Princess of Alabasta", "QCK", [ "Slasher", "Freedom" ], 4, 12, 6, 2, 50, 392109, 98, 51, 62, 855, 424, 288, 1 ],
-	[ "Nefertari Vivi Voyage Dream: Queen of the Pirates", "QCK", [ "Slasher", "Freedom" ], 5, 20, 4, 3, 99, 3000000, 800, 371, 258, 1591, 777, 474, 1 ],
-	[ "Monkey D. Luffy Gum-Gum Gatling", "DEX", [ "Freedom", "Fighter" ], 4, 15, 8, 3, 99, 2000000, 212, 100, 46, 1777, 795, 270, 0.7 ],
+	[ "Nefertari Vivi Voyage Log: Princess of Alabasta", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 98, 51, 62, 855, 424, 288, 1 ],
+	[ "Nefertari Vivi Voyage Dream: Queen of the Pirates", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 800, 371, 258, 1591, 777, 474, 1 ],
+	[ "Monkey D. Luffy Gum-Gum Gatling", "DEX", [ "Free Spirit", "Fighter" ], 4, 15, 8, 3, 99, 2000000, 212, 100, 46, 1777, 795, 270, 0.7 ],
 	[ "Kalifa, Cipher Pol No.9", "DEX", [ "Fighter", "Knowledge" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
 	[ "Kalifa Rokushiki, Cipher Pol No.9", "DEX", [ "Fighter", "Knowledge" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
 	[ "Jabra, Cipher Pol No.9", "INT", [ "Fighter", "Tough" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
@@ -737,13 +737,13 @@ window.units = [
 	[ "Kaku Human-Beast, Ox-Ox Fruit Model: Giraffe", "STR", [ "Slasher", "Tough" ], 4, 20, 6, 3, 99, 4000000, 1220, 692, 43, 2526, 1200, 114, 1 ],
 	[ "Lucci Human-Beast, Cat-Cat Fruit Model: Leopard", "QCK", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
 	[ "Spandam", "INT", "Slasher", 4, 7, 5, 1, 35, 136167, 52, 25, 25, 258, 196, 89, 1 ],
-	[ "Franky, Straw Hat Pirates", "INT", [ "Fighter", "Freedom" ], 4, 18, 4, 3, 99, 3000000, 1623, 765, 70, 2505, 1149, 130, 1 ],
+	[ "Franky, Straw Hat Pirates", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1623, 765, 70, 2505, 1149, 130, 1 ],
 	[ "Nero", "QCK", [ "Shooter", "Ambition" ], 3, 9, 6, 1, 35, 136167, 59, 112, 20, 324, 543, 83, 0.7 ],
 	[ "Nero, Cipher Pol No.9", "QCK", [ "Shooter", "Ambition" ], 4, 15, 5, 2, 70, 1066998, 277, 489, 51, 755, 1050, 145, 0.7 ],
-	[ "Wanze", "DEX", "Freedom", 3, 11, 4, 1, 50, 392109, 202, 44, 40, 1124, 367, 212, 1 ],
-	[ "Wanze, Cipher Pol No.7", "DEX", "Freedom", 4, 18, 5, 2, 99, 3000000, 1059, 312, 170, 2051, 674, 363, 1 ],
-	[ "Portgas D. Ace, Record of the Voyage - Whitebeard Pirates", "QCK", [ "Freedom", "Fighter" ], 4, 12, 5, 2, 50, 392109, 141, 71, 36, 1121, 585, 189, 1.5 ],
-	[ "Portgas D. Ace Voyage Dream: Pirate Summit", "QCK", [ "Freedom", "Fighter" ], 5, 20, 4, 3, 99, 4000000, 1063, 524, 140, 2181, 1100, 258, 1.5 ],
+	[ "Wanze", "DEX", "Free Spirit", 3, 11, 4, 1, 50, 392109, 202, 44, 40, 1124, 367, 212, 1 ],
+	[ "Wanze, Cipher Pol No.7", "DEX", "Free Spirit", 4, 18, 5, 2, 99, 3000000, 1059, 312, 170, 2051, 674, 363, 1 ],
+	[ "Portgas D. Ace, Record of the Voyage - Whitebeard Pirates", "QCK", [ "Free Spirit", "Fighter" ], 4, 12, 5, 2, 50, 392109, 141, 71, 36, 1121, 585, 189, 1.5 ],
+	[ "Portgas D. Ace Voyage Dream: Pirate Summit", "QCK", [ "Free Spirit", "Fighter" ], 5, 20, 4, 3, 99, 4000000, 1063, 524, 140, 2181, 1100, 258, 1.5 ],
 	[ "Megalo and Princess Shirahoshi", "QCK", "Fighter", 4, 15, 4, 3, 70, 1066998, 1251, 271, 150, 2001, 600, 241, 1 ],
 	[ "Rob Lucci, CP9's Dark Justice", "STR", [ "Tough", "Fighter" ], 5, 30, 4, 4, 70, 1066998, 496, 300, 89, 1656, 800, 245, 1.5 ],
 	[ "Rob Lucci, CP9's Strongest Generation", "STR", [ "Tough", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
@@ -751,31 +751,31 @@ window.units = [
 	[ "Kaku, CP9's Strongest Generation", "DEX", [ "Slasher", "Tough" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
 	[ "Kalifa, CP9's Dark Justice", "QCK", [ "Knowledge", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
 	[ "Kalifa, CP9's Strongest Generation", "QCK", [ "Knowledge", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
-	[ "Jabra, CP9's Dark Justice", "QCK", [ "Tough", "Freedom" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
-	[ "Jabra, CP9's Strongest Generation", "QCK", [ "Tough", "Freedom" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
-	[ "Blueno, CP9's Dark Justice", "INT", [ "Tough", "Freedom" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
-	[ "Blueno, CP9's Strongest Generation", "INT", [ "Tough", "Freedom" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
+	[ "Jabra, CP9's Dark Justice", "QCK", [ "Tough", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
+	[ "Jabra, CP9's Strongest Generation", "QCK", [ "Tough", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
+	[ "Blueno, CP9's Dark Justice", "INT", [ "Tough", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
+	[ "Blueno, CP9's Strongest Generation", "INT", [ "Tough", "Free Spirit" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
 	[ "Fukuro, CP9's Dark Justice", "PSY", [ "Tough", "Fighter" ], 4, 16, 4, 3, 70, 1066998, 151, 97, 46, 1140, 651, 203, 1 ],
 	[ "Fukuro, CP9's Strongest Generation", "PSY", [ "Tough", "Fighter" ], 5, 26, 8, 4, 99, 4000000, 1093, 603, 165, 2415, 1051, 353, 1 ],
 	[ "Kumadori, CP9's Dark Justice", "STR", [ "Tough", "Striker" ], 4, 16, 4, 3, 70, 1066998, 162, 89, 47, 1167, 612, 212, 1 ],
 	[ "Kumadori, CP9's Strongest Generation", "STR", [ "Tough", "Striker" ], 5, 26, 7, 4, 99, 4000000, 1110, 560, 170, 2479, 1018, 355, 1 ],
-	[ "Monkey D. Luffy Halloween Monster", "DEX", [ "Fighter", "Freedom" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
+	[ "Monkey D. Luffy Halloween Monster", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
 	[ "Usopp Lying Wolf", "PSY", "Shooter", 4, 20, 5, 3, 99, 3000000, 51, 23, 46, 1444, 673, 400, 1 ],
-	[ "Franky Frankenstein", "STR", [ "Shooter", "Freedom" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
+	[ "Franky Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
 	[ "Nami Jackie 'o Lantern", "QCK", [ "Striker", "Knowledge" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
 	[ "Tony Tony Chopper Lil' Vampire", "INT", [ "Fighter", "Knowledge" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
 	[ "Roronoa Zoro Jack the Ripper", "QCK", [ "Slasher", "Ambition" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
 	[ "Nico Robin Devil Girl", "DEX", [ "Fighter", "Knowledge" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
 	[ "Sanji Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
-	[ "Brook Cowardly Skeleton", "INT", [ "Slasher", "Freedom" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
+	[ "Brook Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
 	[ "Dalmatian, Navy HQ Vice Admiral", "STR", [ "Fighter", "Tough" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
 	[ "Momonga, Navy HQ Vice Admiral", "PSY", [ "Knowledge", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
 	[ "Onigumo, Navy HQ Vice Admiral", "DEX", [ "Slasher", "Ambition" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
-	[ "Shu", "INT", [ "Fighter", "Freedom" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
-	[ "Very Good", "QCK", [ "Freedom", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
+	[ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
+	[ "Very Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
 	[ "Strawberry, Navy HQ Vice Admiral", "PSY", [ "Knowledge", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
-	[ "Lucky Roo", "PSY", [ "Shooter", "Freedom" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
-	[ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Freedom" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
+	[ "Lucky Roo", "PSY", [ "Shooter", "Free Spirit" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
+	[ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
 	[ "Rebecca, Prisoner Gladiator", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
 	[ "Rebecca, Colosseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
 	[ "Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
@@ -784,12 +784,12 @@ window.units = [
 	[ "Tashigi Marine Officer: Flower of Justice", "INT", [ "Slasher", "Knowledge" ], 5, 20, 5, 3, 99, 3000000, 932, 428, 164, 1804, 890, 378, 1 ],
 	[ "Gen-san", "STR", [ "Slasher", "Knowledge" ], 3, 9, 5, 2, 35, 136167, 211, 45, 33, 930, 288, 190, 1 ],
 	[ "Genzo, Cocoyasi Village Resident", "STR", [ "Slasher", "Knowledge" ], 4, 15, 4, 3, 70, 1066998, 879, 242, 143, 1324, 501, 299, 1 ],
-	[ "Dr. Hiluluk", "PSY", [ "Shooter", "Freedom" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
-	[ "Dr. Hiluluk, Quack Doctor", "PSY", [ "Shooter", "Freedom" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
+	[ "Dr. Hiluluk", "PSY", [ "Shooter", "Free Spirit" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
+	[ "Dr. Hiluluk, Quack Doctor", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
 	[ "Kuina", "DEX", "Striker", 3, 9, 6, 2, 35, 136167, 54, 41, 70, 503, 264, 251, 1 ],
 	[ "Kuina, Shimotsuki Village's Girl Swordsman", "DEX", [ "Slasher", "Ambition" ], 4, 15, 5, 3, 70, 1066998, 448, 220, 213, 917, 582, 338, 1 ],
-	[ "Tamanegi, Piiman & Ninjin", "QCK", [ "Striker", "Freedom" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
-	[ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Freedom" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
+	[ "Tamanegi, Piiman & Ninjin", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
+	[ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
 	[ "Iceburg", "INT", [ "Shooter", "Knowledge" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
 	[ "Iceburg, Mayor of W7 and President of Galley-La Company", "INT", [ "Shooter", "Knowledge" ], 4, 16, 4, 3, 70, 1066998, 723, 343, 122, 1401, 702, 224, 1 ],
 	[ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Tough" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
@@ -799,8 +799,8 @@ window.units = [
 	[ "Kung Fu Dugong, Sea Animal Pirates", "PSY", [ "Fighter", "Tough" ], 4, 18, 5, 2, 70, 1778330, 50, 355, 95, 450, 1115, 225, 1.5 ],
 	[ "Sea Lapin, Sea Animal Pirates", "QCK", [ "Fighter", "Tough" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
 	[ "Octopus Boxer, Sea Animal Pirates", "STR", [ "Fighter", "Tough" ], 3, 15, 8, 1, 70, 711332, 99, 91, 2, 1563, 846, 93, 1 ],
-	[ "Mr. 2 Bon Clay Voyage Log: B.W.", "PSY", [ "Fighter", "Freedom" ], 4, 13, 5, 2, 50, 392109, 109, 57, 32, 1033, 513, 212, 1 ],
-	[ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Freedom" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
+	[ "Mr. 2 Bon Clay Voyage Log: B.W.", "PSY", [ "Fighter", "Free Spirit" ], 4, 13, 5, 2, 50, 392109, 109, 57, 32, 1033, 513, 212, 1 ],
+	[ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
 	[ "Hina, Navy HQ Captain", "DEX", [ "Fighter", "Knowledge" ], 4, 18, 5, 1, 50, 392109, 188, 128, 48, 977, 544, 191, 1 ],
 	[ "Black Cage Hina, Navy HQ Captain", "DEX", [ "Fighter", "Knowledge" ], 5, 30, 5, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1 ],
 	[ "Smoker, Navy HQ Captain", "INT", [ "Striker", "Ambition" ], 4, 25, 6, 2, 70, 1066998, 710, 309, 44, 1600, 703, 146, 1.5 ],
@@ -809,12 +809,12 @@ window.units = [
 	[ "Pure White Goddess Wedding Nami", "PSY", [ "Striker", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
 	[ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Tough" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
 	[ "Courting Lola, Thriller Bark Bride", "STR", [ "Slasher", "Tough" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
-	[ "Risky Brothers", "DEX", [ "Slasher", "Freedom" ], 3, 9, 4, 2, 50, 392109, 30, 15, 40, 707, 368, 287, 1 ],
+	[ "Risky Brothers", "DEX", [ "Slasher", "Free Spirit" ], 3, 9, 4, 2, 50, 392109, 30, 15, 40, 707, 368, 287, 1 ],
 	[ "Cerberus", "QCK", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
 	[ "Tararan", "INT", [ "Knowledge", "Tough" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
 	[ "Bear-Skin Rug", "DEX", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
-	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Freedom", "Ambition" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
-	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Freedom", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
+	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Free Spirit", "Ambition" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
+	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Free Spirit", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
 	[ "Soldier Zombie Boastful Shadow", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
 	[ "Soldier Zombie Quick Shadow", "QCK", "Fighter", 2, 7, 6, 0, 35, 90778, 77, 30, 92, 944, 590, 43, 1 ],
 	[ "Soldier Zombie Vile Shadow", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],
@@ -830,8 +830,8 @@ window.units = [
 	[],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
-	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Freedom" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
-	[ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Freedom" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
+	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
+	[ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
 	[ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
 	[ "Tyrant Bartholomew Kuma", "STR", [ "Knowledge", "Tough" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
 	[ "Tyrant Bartholomew Kuma, Government's Human Weapon", "STR", [ "Knowledge", "Tough" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
@@ -839,12 +839,12 @@ window.units = [
 	[ "Master Caesar", "DEX", [ "Ambition", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
 	[ "Vergo", "INT", [ "Striker", "Tough" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
 	[ "Vergo, Donquixote Pirates", "INT", [ "Striker", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1464, 730, 60, 3003, 1410, 140, 1 ],
-	[ "Monet", "PSY", [ "Freedom", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
-	[ "Monet, Donquixote Pirates", "PSY", [ "Freedom", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 1020, 540, 199, 2131, 1001, 433, 1 ],
+	[ "Monet", "PSY", [ "Free Spirit", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
+	[ "Monet, Donquixote Pirates", "PSY", [ "Free Spirit", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 1020, 540, 199, 2131, 1001, 433, 1 ],
 	[ "Baby 5", "STR", [ "Shooter", "Striker" ], 4, 18, 5, 3, 70, 1066998, 114, 142, 53, 892, 743, 230, 1 ],
 	[ "Baby 5, Donquixote Pirates", "STR", [ "Shooter", "Striker" ], 5, 30, 6, 4, 99, 4000000, 850, 692, 185, 1929, 1352, 349, 1 ],
-	[ "Buffalo", "QCK", [ "Shooter", "Freedom" ], 4, 18, 9, 3, 70, 1066998, 96, 96, 49, 1111, 666, 196, 1 ],
-	[ "Buffalo, Donquixote Pirates", "QCK", [ "Shooter", "Freedom" ], 5, 30, 10, 4, 99, 4000000, 1050, 600, 173, 2769, 1096, 296, 1 ],
+	[ "Buffalo", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 9, 3, 70, 1066998, 96, 96, 49, 1111, 666, 196, 1 ],
+	[ "Buffalo, Donquixote Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 30, 10, 4, 99, 4000000, 1050, 600, 173, 2769, 1096, 296, 1 ],
 	[ "Tom, Tom's Workers", "DEX", [ "Fighter", "Tough" ], 3, 12, 6, 1, 50, 392109, 159, 95, 30, 1103, 614, 141, 1 ],
 	[ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
 	[ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Ambition" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
@@ -853,53 +853,53 @@ window.units = [
 	[ "Slim-up Wapol", "QCK", [ "Shooter", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
 	[ "Robson", "PSY", [ "Fighter", "Tough" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
 	[ "Chopper Playing in the Snow", "DEX", [ "Fighter", "Tough" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
-	[ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Freedom" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
-	[ "Trafalgar Law Holy Night Nobleman", "DEX", [ "Slasher", "Freedom" ], 5, 19, 4, 3, 99, 4000000, 945, 460, 151, 2003, 1030, 313, 1 ],
-	[ "Jewelry Bonney Ravenous Spoiled Santa", "PSY", [ "Fighter", "Freedom" ], 4, 12, 5, 3, 50, 392109, 190, 50, 54, 1003, 403, 213, 1 ],
-	[ "Jewelry Bonney Ravenous Greedy Santa", "PSY", [ "Fighter", "Freedom" ], 5, 19, 4, 3, 99, 4000000, 848, 354, 178, 2380, 769, 338, 1 ],
+	[ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
+	[ "Trafalgar Law Holy Night Nobleman", "DEX", [ "Slasher", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 945, 460, 151, 2003, 1030, 313, 1 ],
+	[ "Jewelry Bonney Ravenous Spoiled Santa", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 5, 3, 50, 392109, 190, 50, 54, 1003, 403, 213, 1 ],
+	[ "Jewelry Bonney Ravenous Greedy Santa", "PSY", [ "Fighter", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 848, 354, 178, 2380, 769, 338, 1 ],
 	[ "Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Ambition" ], 4, 18, 5, 2, 50, 392109, 267, 98, 27, 1193, 561, 158, 1 ],
 	[ "War Hero Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Ambition" ], 5, 30, 4, 3, 99, 3000000, 1121, 500, 104, 2239, 1048, 261, 1 ],
-	[ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Freedom" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
-	[ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Freedom" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
+	[ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
+	[ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
 	[ "Snowy World Nami", "QCK", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
-	[ "Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Freedom" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
-	[ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Freedom" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
+	[ "Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
+	[ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
 	[ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Knowledge", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
 	[ "Usopp Tabasco Star: The Storm", "DEX", "Shooter", 4, 15, 7, 2, 99, 2000000, 258, 152, 94, 1866, 704, 343, 1 ],
 	[ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Tough", "Knowledge" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
 	[ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Ambition", "Knowledge" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
 	[ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Ambition", "Knowledge" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
-	[ "Sugar", "QCK", [ "Freedom", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
-	[ "Sugar, Donquixote Pirates", "QCK", [ "Freedom", "Knowledge" ], 5, 30, 5, 4, 99, 4000000, 896, 342, 274, 1905, 790, 532, 1 ],
-	[ "Señor Pink", "PSY", [ "Freedom", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 292, 103, 24, 1524, 657, 142, 1 ],
-	[ "Señor Pink, Donquixote Pirates", "PSY", [ "Freedom", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1478, 600, 100, 2800, 1242, 241, 1 ],
+	[ "Sugar", "QCK", [ "Free Spirit", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
+	[ "Sugar, Donquixote Pirates", "QCK", [ "Free Spirit", "Knowledge" ], 5, 30, 5, 4, 99, 4000000, 896, 342, 274, 1905, 790, 532, 1 ],
+	[ "Señor Pink", "PSY", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 292, 103, 24, 1524, 657, 142, 1 ],
+	[ "Señor Pink, Donquixote Pirates", "PSY", [ "Free Spirit", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1478, 600, 100, 2800, 1242, 241, 1 ],
 	[ "Trebol", "INT", [ "Knowledge", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
 	[ "Trebol, Donquixote Pirates", "INT", [ "Knowledge", "Ambition" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
-	[ "Jora", "DEX", [ "Freedom", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
-	[ "Jora, Donquixote Pirates", "DEX", [ "Freedom", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
+	[ "Jora", "DEX", [ "Free Spirit", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
+	[ "Jora, Donquixote Pirates", "DEX", [ "Free Spirit", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
 	[ "Lao-G", "STR", [ "Fighter", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
 	[ "Lao-G, Donquixote Pirates", "STR", [ "Fighter", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
-	[ "Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Freedom" ], 4, 25, 5, 2, 70, 1066998, 646, 261, 83, 1247, 693, 220, 1 ],
-	[ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Freedom" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
+	[ "Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, 5, 2, 70, 1066998, 646, 261, 83, 1247, 693, 220, 1 ],
+	[ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
 	[ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Tough" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
 	[ "Dorry the Blue Ogre", "INT", [ "Slasher", "Tough" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
 	[ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
 	[ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Knowledge" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
-	[ "Buggy, Cheerfully Crazy", "QCK", [ "Ambition", "Freedom" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
-	[ "Hollow Hollow Ghost", "PSY", "Freedom", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
+	[ "Buggy, Cheerfully Crazy", "QCK", [ "Ambition", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
+	[ "Hollow Hollow Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
 	[ "Perona, Thriller Bark's Mysterious Four", "DEX", [ "Shooter", "Ambition" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
 	[ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Ambition" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
 	[ "Doctor Hogback, Thriller Bark's Mysterious Four", "INT", [ "Fighter", "Knowledge" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
 	[ "Absalom of the Graveyard, Thriller Bark's Mysterious Four", "STR", [ "Shooter", "Tough" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
 	[ "Oars, Special Zombie", "STR", [ "Fighter", "Tough" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
 	[ "Gecko Moria, Shadow's Asgard", "INT", [ "Ambition", "Tough" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
-	[ "Brook, Gentleman Skeleton", "DEX", [ "Slasher", "Freedom" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
-	[ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Freedom" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
+	[ "Brook, Gentleman Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
+	[ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
 	[ "Sir Crocodile, Sand General", "STR", [ "Knowledge", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
 	[ "Mr. 3, Makeshift Musician", "QCK", [ "Striker", "Knowledge" ], 4, 17, 4, 2, 99, 2000000, 24, 14, 33, 1703, 622, 312, 1.5 ],
-	[ "Mr. 2 Bon Clay, Dubious Samurai", "INT", [ "Fighter", "Freedom" ], 4, 17, 4, 2, 99, 2000000, 42, 20, 22, 1810, 804, 235, 1.5 ],
-	[ "Fresh Franky, Health Comes First", "DEX", [ "Shooter", "Freedom" ], 4, 25, 6, 2, 70, 1066998, 659, 244, 85, 1330, 659, 211, 1 ],
-	[ "Cyborg Franky", "DEX", [ "Shooter", "Freedom" ], 5, 40, 8, 3, 99, 4000000, 1269, 618, 167, 2515, 1172, 323, 1 ],
+	[ "Mr. 2 Bon Clay, Dubious Samurai", "INT", [ "Fighter", "Free Spirit" ], 4, 17, 4, 2, 99, 2000000, 42, 20, 22, 1810, 804, 235, 1.5 ],
+	[ "Fresh Franky, Health Comes First", "DEX", [ "Shooter", "Free Spirit" ], 4, 25, 6, 2, 70, 1066998, 659, 244, 85, 1330, 659, 211, 1 ],
+	[ "Cyborg Franky", "DEX", [ "Shooter", "Free Spirit" ], 5, 40, 8, 3, 99, 4000000, 1269, 618, 167, 2515, 1172, 323, 1 ],
 	[ "Broggy, Giant Warrior Pirates", "PSY", [ "Slasher", "Tough" ], 4, 18, 5, 1, 50, 392109, 261, 120, 20, 1354, 539, 90, 1 ],
 	[ "Broggy the Red Ogre", "PSY", [ "Slasher", "Tough" ], 5, 30, 4, 3, 99, 3000000, 1292, 463, 64, 2460, 1090, 156, 1 ],
 	[ "Yokozuna", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
@@ -911,20 +911,20 @@ window.units = [
 	[ "Chopper Mask, the Hero Who Protects the World", "PSY", [ "Fighter", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
 	[ "Sanji, Kamabakka Queendom Fugitive", "DEX", [ "Tough", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
 	[ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Tough", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
-	[ "Brook, Harahetternia's Demon Lord", "QCK", [ "Freedom", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
-	[ "Brook, BONE to be Wild!!!", "QCK", [ "Freedom", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
+	[ "Brook, Harahetternia's Demon Lord", "QCK", [ "Free Spirit", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
+	[ "Brook, BONE to be Wild!!!", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
 	[ "Nico Robin, Bride of Ohara", "QCK", [ "Knowledge", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
 	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Knowledge", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
 	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Freedom"], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
-	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Freedom"], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
+	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Free Spirit"], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
+	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Free Spirit"], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
 	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
 	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
-	["Chief Guard Sadi-chan", "QCK", ["Striker","Freedom"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
-	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Freedom"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
+	["Chief Guard Sadi-chan", "QCK", ["Striker","Free Spirit"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
+	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
 	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
 	["Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
 	["Hannyabal, Impel Down Vice Warden", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
@@ -934,14 +934,22 @@ window.units = [
 	["Pica, Donquixote Pirates", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
     ["Knight of the Sea Jimbe", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
     ["Knight of the Sea Jimbe, Warlord of the Sea", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-    ["Monkey D. Luffy, Summit War Survivor", "QCK", ["Fighter","Freedom"], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-    ["Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", ["Fighter","Freedom"], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
+    ["Monkey D. Luffy, Summit War Survivor", "QCK", ["Fighter","Free Spirit"], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
+    ["Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", ["Fighter","Free Spirit"], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
     ["Nami, Seeker of Weather Science", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
     ["Nami, Weatheria's Cat Burglar", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
     ["Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
     ["Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
-    ["Franky, Cyborg Fighting Mecha Animals", "STR", ["Freedom","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-    ["Cyborg Franky, Sacred Beast of Barujimoa", "STR", ["Freedom","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
+    ["Franky, Cyborg Fighting Mecha Animals", "STR", ["Free Spirit","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
+    ["Cyborg Franky, Sacred Beast of Barujimoa", "STR", ["Free Spirit","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
 	["Perona, Malicious Old Castle Bride", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-    ["Fancy Princess Wedding Perona", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null]
+    ["Fancy Princess Wedding Perona", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
+    [],
+    [],
+    [],
+    [],
+    ["Colosseum Ace", "PSY", ["Free Spirit", "Fighter"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+    ["Colosseum Ace Evolution", "PSY", ["Free Spirit", "Fighter"], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+    ["Unknown Colosseum Unit", "DEX", ["Striker", "Shooter"], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
+    ["Unknown Colosseum Unit Evolution", "DEX", ["Striker", "Shooter"], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];
diff --git a/common/js/utils.js b/common/js/utils.js
index ebe98888f..414fe6fd3 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -131,9 +131,10 @@ utils.generateSearchParameters = function(query) {
     query = query.toLowerCase().trim();
     var result = { matchers: { }, ranges: { }, query: [ ] };
     var ranges = { }, params = [ 'hp', 'atk', 'stars', 'cost', 'growth', 'rcv', 'id', 'slots', 'combo', 'exp', 'minCD', 'maxCD' ];
-    var regex = new RegExp('^((type|class):(\\w+)|(' + params.join('|') + ')(>|<|>=|<=|=)([\\d.]+))$', 'i');
+    var regex = new RegExp('^((type|class):(\\w+\\s{0,1}\\w+)|(' + params.join('|') + ')(>|<|>=|<=|=)([\\d.]+))$', 'i');
     var tokens = query.replace(/\s+/g,' ').split(' ').filter(function(x) { return x.length > 0; });
     tokens.forEach(function(x) {
+        x = x.replace("_", ' ');
         var temp = x.match(regex);
         if (!temp) // if it couldn't be parsed, treat it as string
             result.query.push(x);
diff --git a/damage/views/popup/picker.html b/damage/views/popup/picker.html
index f4b9896b3..1dcfef696 100644
--- a/damage/views/popup/picker.html
+++ b/damage/views/popup/picker.html
@@ -45,6 +45,7 @@
                 <ul>
                     <li><tt>type:X</tt>: shows only units of type X (STR, DEX, QCK, ...)</li>
                     <li><tt>class:X</tt>: shows only units of class X (fighter, slasher, ...)</li>
+                    <ul><li>For Free Spirit units enter free_spirit or just free</li></ul>
                 </ul>
                 <br>
                 Supported mathematical operators:

From ebae64bac2375410803f5232a29a926edb8ee9e1 Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Sun, 6 Mar 2016 03:05:36 +0800
Subject: [PATCH 0130/1569] Update units.js

Fixed indentations and spacing
---
 common/data/units.js | 66 ++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index bf9281f47..1537b4465 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,37 +919,37 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-	["Boa Hancock, Bride of the Island of Women", "INT", ["Shooter","Free Spirit"], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
-	["Empress in Love Hancock, Wedding", "INT", ["Shooter","Free Spirit"], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
-	["South Blue's Captain Kid", "STR", ["Striker","Ambition"], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
-	["Captain Kid, Captain of the Kid Pirates", "STR", ["Striker","Ambition"], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
-	["Chief Guard Sadi-chan", "QCK", ["Striker","Free Spirit"],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
-	["Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
-	["Doberman, Navy HQ Vice Admiral", "INT", ["Slasher","Ambition"], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
-	["Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
-	["Hannyabal, Impel Down Vice Warden", "DEX", ["Ambition","Striker"],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
-	["Saldeath", "INT", ["Striker","Knowledge"], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
-	["Blugori", "DEX", ["Tough","Slasher"], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	["Pica", "PSY", ["Tough","Ambition"], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
-	["Pica, Donquixote Pirates", "PSY", ["Tough","Ambition"], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-    ["Knight of the Sea Jimbe", "INT", ["Fighter","Tough"], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
-    ["Knight of the Sea Jimbe, Warlord of the Sea", "INT", ["Fighter","Tough"], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-    ["Monkey D. Luffy, Summit War Survivor", "QCK", ["Fighter","Free Spirit"], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-    ["Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", ["Fighter","Free Spirit"], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
-    ["Nami, Seeker of Weather Science", "PSY", ["Striker","Knowledge"], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
-    ["Nami, Weatheria's Cat Burglar", "PSY", ["Striker","Knowledge"], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
-    ["Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
-    ["Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
-    ["Franky, Cyborg Fighting Mecha Animals", "STR", ["Free Spirit","Shooter"], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-    ["Cyborg Franky, Sacred Beast of Barujimoa", "STR", ["Free Spirit","Shooter"], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
-	["Perona, Malicious Old Castle Bride", "PSY", ["Shooter","Ambition"], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-    ["Fancy Princess Wedding Perona", "PSY", ["Shooter","Ambition"], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-    [],
-    [],
-    [],
-    [],
-    ["Colosseum Ace", "PSY", ["Free Spirit", "Fighter"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
-    ["Colosseum Ace Evolution", "PSY", ["Free Spirit", "Fighter"], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
-    ["Unknown Colosseum Unit", "DEX", ["Striker", "Shooter"], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
-    ["Unknown Colosseum Unit Evolution", "DEX", ["Striker", "Shooter"], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter","Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
+	[ "Empress in Love Hancock, Wedding", "INT", [ "Shooter","Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
+	[ "South Blue's Captain Kid", "STR", [ "Striker","Ambition" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
+	[ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker","Ambition" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
+	[ "Chief Guard Sadi-chan", "QCK", [ "Striker","Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
+	[ "Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
+	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher","Ambition" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
+	[ "Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
+	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Ambition","Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
+	[ "Saldeath", "INT", [ "Striker","Knowledge" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
+	[ "Blugori", "DEX", [ "Tough","Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
+	[ "Pica", "PSY", [ "Tough","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
+	[ "Pica, Donquixote Pirates", "PSY", [ "Tough","Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
+        [ "Knight of the Sea Jimbe", "INT", [ "Fighter","Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
+        [ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter","Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
+        [ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
+        [ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
+        [ "Nami, Seeker of Weather Science", "PSY", [ "Striker","Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
+        [ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker","Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
+        [ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
+        [ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
+        [ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit","Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
+        [ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit","Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
+	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter","Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
+        ["Fancy Princess Wedding Perona", "PSY", [ "Shooter","Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
+        [],
+        [],
+        [],
+        [],
+        [ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+        [ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+        [ "Unknown Colosseum Unit", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
+        [ "Unknown Colosseum Unit Evolution", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];

From e9d9edf1d32cbdbd7ff4327efb9b8e904667cb2a Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Sun, 6 Mar 2016 03:13:45 +0800
Subject: [PATCH 0131/1569] Update units.js

---
 common/data/units.js | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 1537b4465..bbc40358c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -919,31 +919,31 @@ window.units = [
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-	[ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter","Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
-	[ "Empress in Love Hancock, Wedding", "INT", [ "Shooter","Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
-	[ "South Blue's Captain Kid", "STR", [ "Striker","Ambition" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
-	[ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker","Ambition" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
-	[ "Chief Guard Sadi-chan", "QCK", [ "Striker","Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
-	[ "Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker","Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
-	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher","Ambition" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
-	[ "Hannyabal", "DEX", ["Ambition","Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
-	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Ambition","Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
-	[ "Saldeath", "INT", [ "Striker","Knowledge" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
-	[ "Blugori", "DEX", [ "Tough","Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
+	[ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter", "Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
+	[ "Empress in Love Hancock, Wedding", "INT", [ "Shooter", "Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
+	[ "South Blue's Captain Kid", "STR", [ "Striker", "Ambition" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
+	[ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker", "Ambition" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
+	[ "Chief Guard Sadi-chan", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
+	[ "Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
+	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
+	[ "Hannyabal", "DEX", ["Ambition", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
+	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Ambition", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
+	[ "Saldeath", "INT", [ "Striker", "Knowledge" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
+	[ "Blugori", "DEX", [ "Tough", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	[ "Pica", "PSY", [ "Tough","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
-	[ "Pica, Donquixote Pirates", "PSY", [ "Tough","Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-        [ "Knight of the Sea Jimbe", "INT", [ "Fighter","Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
-        [ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter","Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-        [ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-        [ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
-        [ "Nami, Seeker of Weather Science", "PSY", [ "Striker","Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
-        [ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker","Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
+	[ "Pica, Donquixote Pirates", "PSY", [ "Tough", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
+        [ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
+        [ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
+        [ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
+        [ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
+        [ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
+        [ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
         [ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
         [ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
-        [ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit","Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-        [ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit","Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
-	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter","Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-        ["Fancy Princess Wedding Perona", "PSY", [ "Shooter","Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
+        [ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
+        [ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
+	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
+        [ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
         [],
         [],
         [],

From b9bf4ded213e9661d3049bc7bded20b7727f09b0 Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Sun, 6 Mar 2016 03:22:38 +0800
Subject: [PATCH 0132/1569] Update units.js

---
 common/data/units.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index bbc40358c..bc209e2a9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -932,24 +932,24 @@ window.units = [
 	[ "Blugori", "DEX", [ "Tough", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	[ "Pica", "PSY", [ "Tough","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	[ "Pica, Donquixote Pirates", "PSY", [ "Tough", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-        [ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
-        [ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-        [ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-        [ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
-        [ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
-        [ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
-        [ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
-        [ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
-        [ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-        [ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
-	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-        [ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-        [],
-        [],
-        [],
-        [],
-        [ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
-        [ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
-        [ "Unknown Colosseum Unit", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
+    	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
+    	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
+    	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
+    	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
+    	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
+    	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
+    	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
+    	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
+    	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
+    	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
+    	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
+    	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
+    	[],
+    	[],
+     	[],
+    	[],
+    	[ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+    	[ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+    	[ "Unknown Colosseum Unit", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
         [ "Unknown Colosseum Unit Evolution", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];

From c4010c17c2c8fa5e82068b882bf171bf77296a47 Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Sun, 6 Mar 2016 03:26:35 +0800
Subject: [PATCH 0133/1569] Update units.js

---
 common/data/units.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index bc209e2a9..65cf9982a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -932,24 +932,24 @@ window.units = [
 	[ "Blugori", "DEX", [ "Tough", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	[ "Pica", "PSY", [ "Tough","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	[ "Pica, Donquixote Pirates", "PSY", [ "Tough", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-    	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
-    	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-    	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-    	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
-    	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
-    	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
-    	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
-    	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
-    	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-    	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
-    	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-    	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-    	[],
-    	[],
-     	[],
-    	[],
-    	[ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
-    	[ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
-    	[ "Unknown Colosseum Unit", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
-        [ "Unknown Colosseum Unit Evolution", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
+	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
+	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
+	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
+	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
+	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
+	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
+	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
+	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
+	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
+	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
+	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
+	[],
+	[],
+	[],
+	[],
+	[ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Unknown Colosseum Unit", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
+ 	[ "Unknown Colosseum Unit Evolution", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];

From e8ef6a0290ef55b6968a572896e77e1ab3c56fa2 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 5 Mar 2016 22:47:46 +0100
Subject: [PATCH 0134/1569] Hotfix

---
 common/data/flags.js | 2 ++
 common/data/units.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 98cadec8b..4714a4867 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -560,6 +560,8 @@ window.flags = {
 	571: { global: 1 },
 	572: { global: 1 },
 	573: { global: 1 },
+    574: { global: 1 },
+    575: { global: 1 },
 	576: { special: 1 },
 	577: { rr: 1, rro: 1, global: 1 },
 	578: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 65cf9982a..de40b2d00 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -916,7 +916,7 @@ window.units = [
 	[ "Nico Robin, Bride of Ohara", "QCK", [ "Knowledge", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
 	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Knowledge", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
 	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
-	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 0 ],
+	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 1 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
 	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
 	[ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter", "Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],

From f982e718a11d5d10c6261d39141105421044b5eb Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 6 Mar 2016 20:38:22 +0100
Subject: [PATCH 0135/1569] Renaming Stuff

---
 common/data/drops.js |  2 +-
 common/data/units.js | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index d5fe61db7..b12199abf 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -181,7 +181,7 @@ window.drops = {
             "12": [ 95, 96, 118, 201 ],
             "13": [ 96, 97, 118, 199 ],
             "14": [ 95, 97, 118, 199, 201 ],
-            "15": [ 2, 110, 111, 112, 118 ]
+            "15": [ 2, 110, 111, 112, 118, 199, 201 ]
         },
 
         {
diff --git a/common/data/units.js b/common/data/units.js
index de40b2d00..c0657014e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -689,24 +689,24 @@ window.units = [
 	[ "Calgara, the Great Warrior of Shandia", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
 	[ "Montblanc Noland", "INT", [ "Slasher", "Knowledge" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
 	[ "Montblanc Noland, Explorer and Admiral of the Lvneel Kingdom", "INT", [ "Slasher", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
-	[ "Halberd Corporal Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
+	[ "Naginata Corporal Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
 	[ "Pistol Corporal Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
 	[ "Saber Corporal Navy HQ", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 51, 34, 22, 466, 330, 111, 1 ],
 	[ "Bazooka Corporal Navy HQ", "STR", "Shooter", 2, 7, 4, 0, 35, 90778, 62, 50, 14, 598, 404, 64, 1 ],
 	[ "Knuckle Corporal Navy HQ", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 55, 48, 22, 522, 392, 82, 1 ],
-	[ "Halberd Major Navy HQ", "DEX", "Striker", 3, 13, 6, 1, 70, 1066998, 554, 250, 61, 1358, 645, 170, 1 ],
+	[ "Naginata Major Navy HQ", "DEX", "Striker", 3, 13, 6, 1, 70, 1066998, 554, 250, 61, 1358, 645, 170, 1 ],
 	[ "Pistol Major Navy HQ", "QCK", "Shooter", 3, 13, 5, 1, 70, 1066998, 444, 244, 96, 1002, 568, 259, 1 ],
 	[ "Saber Major Navy HQ", "PSY", "Slasher", 3, 13, 6, 1, 70, 1066998, 411, 275, 86, 989, 737, 208, 1 ],
 	[ "Bazooka Major Navy HQ", "STR", "Shooter", 3, 13, 6, 1, 70, 1066998, 547, 362, 44, 1301, 833, 117, 1 ],
 	[ "Knuckle Major Navy HQ", "INT", "Fighter", 3, 13, 5, 1, 70, 1066998, 462, 351, 49, 1244, 876, 112, 1 ],
 	[ "Oimo", "PSY", [ "Striker", "Tough" ], 3, 25, 5, 2, 70, 1778330, 452, 223, 23, 1602, 742, 98, 1 ],
-	[ "Kashi", "INT", [ "Slasher", "Tough" ], 3, 25, 6, 2, 70, 1778330, 426, 242, 21, 1551, 798, 87, 1 ],
+	[ "Kashii", "INT", [ "Slasher", "Tough" ], 3, 25, 6, 2, 70, 1778330, 426, 242, 21, 1551, 798, 87, 1 ],
 	[ "Watchdog Unit of the Law", "QCK", "Slasher", 3, 13, 4, 1, 70, 1066998, 122, 43, 40, 1211, 488, 251, 1 ],
-	[ "Just Juryman", "STR", "Striker", 3, 13, 4, 1, 70, 1066998, 108, 129, 34, 990, 900, 144, 1 ],
+	[ "Righteous Juror", "STR", "Striker", 3, 13, 4, 1, 70, 1066998, 108, 129, 34, 990, 900, 144, 1 ],
 	[ "Three-Headed Baskerville", "DEX", "Slasher", 3, 13, 4, 3, 70, 1066998, 102, 78, 38, 1109, 595, 232, 1 ],
-	[ "Blueno, Cipher Pol No.9", "STR", [ "Fighter", "Tough" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
-	[ "Blueno Rokushiki, Cipher Pol No.9", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
-	[ "Nico Robin the Devil Child", "PSY", [ "Fighter", "Knowledge" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
+	[ "Blueno, Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
+	[ "Blueno: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
+	[ "Nico Robin, Devil Child", "PSY", [ "Fighter", "Knowledge" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
 	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Knowledge" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
 	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
 	[ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],

From f522b799e87d43cae794585c9e5c085823c49b51 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 7 Mar 2016 12:01:19 +0100
Subject: [PATCH 0136/1569] Preview for WB Commanders

---
 common/data/drops.js | 13 ++++++++++---
 common/data/units.js | 12 ++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index b12199abf..4ecb6af5e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -951,6 +951,13 @@ window.drops = {
             condition: 'You can only bring STR units',
             Expert: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ],
             Elite: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
+        },
+        {
+            name: "[Preview] Whitebeard Pirates Commanders",
+            thumb: null,
+            condition: "You can only bring PSY units",
+            Expert: [ 946, 947, 948, 949],
+            Elite: [ 946, 947, 948, 949]
         }
 
     ],
@@ -1110,9 +1117,9 @@ window.drops = {
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950 ]
         }
 
    ]
diff --git a/common/data/units.js b/common/data/units.js
index c0657014e..54d3b4a45 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -944,12 +944,12 @@ window.units = [
 	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-	[],
-	[],
-	[],
-	[],
+	[ "Rakuyo", "INT", [ "Striker", "Tough" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Fossa", "INT", [ "Slasher", "Tough" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Curiel", "STR", [ "Shooter", "Tough" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
 	[ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Unknown Colosseum Unit", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
- 	[ "Unknown Colosseum Unit Evolution", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Colosseum Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
+ 	[ "Colosseum Beckman Evolution", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];

From 8412297628e962251b7610266c0e501f0ca5ec56 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 02:09:13 -0600
Subject: [PATCH 0137/1569] Updated Whitebeard Captains

946-949
---
 common/data/cooldowns.js | 10 +++++++---
 common/data/details.js   | 21 +++++++++++++++++++++
 common/data/families.js  | 10 +++++++++-
 common/data/units.js     |  8 ++++----
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 80ac1eed4..defce306c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -715,8 +715,8 @@ window.cooldowns = [
 	[ 22, 14 ],
 	[ 27, 14 ],
 	[ 27, 14 ],
-	25,
-	25,
+	[ 25, 19 ],
+	[ 25, 19 ],
 	[ 21, 14 ],
 	[ 21, 14 ],
 	[ 16, 7 ],
@@ -943,5 +943,9 @@ window.cooldowns = [
     15,
 	15,
     [ 13, 13 ],
-	[ 13, 13 ]
+	[ 13, 13 ],
+	20,
+	25,
+	25,
+	20
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 293c9e215..dd86a2624 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4409,5 +4409,26 @@ window.details = {
 		captain: "Boosts the ATK and RCV of Ambition Characters by 1.75x",
 		specialName: "Spiritual Bouquet",
 		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
+	},
+	946: {
+		specialName: "Persuit of the Morning Star",
+		captain: "Boosts the ATK of Striker Characters by 1.75x. Reduces cooldown of all specials by 3 turns at the start of the fight",
+		special: "Change Friend Captain and this unit's orb to [INT]"
+	},
+	947: {
+		captain: "Boosts the ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
+		specialName: "Flame Flash",
+		special: "[STR] and [INT] Characters gain 1.3x ATK, Deals random [INT] damage",
+		captainNotes: "#{noFixedPerc}"
+	},
+	948: {
+		captain: "Boosts the ATK of Shooter Characters by 1.5x and boosts their RCV by 1.2x",
+		specialName: "Twin Cannons",
+		special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage"
+	},
+	949: {
+		captain: "Boosts the ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
+		specialName: "Ties with Ace",
+		special: "Reduces Silence by 3 turns, and heals for 4,000"
 	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index fd8afe607..064bc8e8a 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -943,5 +943,13 @@ window.families = [
 	"Franky",
 	"Franky",
 	"Perona",
-	"Perona"
+	"Perona",
+	"Rakuyo",
+	"Fossa",
+	"Curiel",
+	"Thatch",
+	"Ace",
+	"Ace",
+	"Beckman",
+	"Beckman"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 54d3b4a45..cdd1cfa53 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -944,10 +944,10 @@ window.units = [
 	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-	[ "Rakuyo", "INT", [ "Striker", "Tough" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Fossa", "INT", [ "Slasher", "Tough" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Curiel", "STR", [ "Shooter", "Tough" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, null, 58, 27, 33, null, null, null, null],
+	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, null, 48, 35, 20, null, null, null, null],
+	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, null, 33, 39, 30, null, null, null, null],
+	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, null, 80, 37, 37, null, null, null, null],
 	[ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],

From 40476608801ff9e5c2580499786e184fbc33794a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 02:39:26 -0600
Subject: [PATCH 0138/1569] Fixes

From xfts
---
 common/data/cooldowns.js |  8 ++---
 common/data/details.js   | 63 ++++++++++++++++++++--------------------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index defce306c..9cc4f6eb0 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -757,8 +757,8 @@ window.cooldowns = [
 	[ 20, 14 ],
 	[ 18, 10 ],
 	[ 18, 10 ],
-	21,
-	21,
+	[ 21, 15 ],
+	[ 21, 15 ],
 	[ 23, 15 ],
 	[ 14, 10 ],
 	[ 15, 7 ],
@@ -938,8 +938,8 @@ window.cooldowns = [
     19,
     24,
     24,
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     15,
 	15,
     [ 13, 13 ],
diff --git a/common/data/details.js b/common/data/details.js
index dd86a2624..915211651 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1325,11 +1325,11 @@ window.details = {
 		captain: "Boosts ATK of Shooter characters by 2.5x"
 	},
 	354: {
-		special: "Reduces Bind and Silence duration by 3 turns",
+		special: "Reduces Bind and Despair duration by 3 turns",
 		specialName: "Two-Sword Dance"
 	},
 	355: {
-		special: "Reduces Bind and Silence duration by 3 turns",
+		special: "Reduces Bind and Despair duration by 3 turns",
 		specialName: "Two-Sword Dance"
 	},
 	356: {
@@ -1662,7 +1662,7 @@ window.details = {
 		captain: "Boosts ATK of QCK characters by 2x"
 	},
 	420: {
-		special: "Reduces Silence duration by 3 turns, deals 15x character's ATK in STR damage to one enemy",
+		special: "Reduces Despair duration by 3 turns, deals 15x character's ATK in STR damage to one enemy",
 		specialName: "Gum-Gum Bazooka: Supremacy",
 		captain: "Boosts ATK, HP and RCV of STR characters by 1.5x"
 	},
@@ -1701,7 +1701,7 @@ window.details = {
 		captain: "Boosts HP of STR characters by 2x"
 	},
 	427: {
-		special: "Reduces Bind and Silence duration by 2 turns",
+		special: "Reduces Bind and Despair duration by 2 turns",
 		specialName: "Havoc Sonar",
 		captain: "Boosts HP of DEX characters by 2x"
 	},
@@ -1731,7 +1731,7 @@ window.details = {
 		specialName: "Big Chop"
 	},
 	433: {
-		special: "Reduces Bind and Silence duration by 1 turn",
+		special: "Reduces Bind and Despair duration by 1 turn",
 		specialName: "New Kama Seduction",
 		captain: "Boosts ATK by 2x following a chain of QCK > STR > DEX attacks no lower than Good"
 	},
@@ -2246,12 +2246,12 @@ window.details = {
 		captain: "Boosts RCV of DEX characters by 2x"
 	},
 	537: {
-		special: "Reduces Bind and Silence duration by 1 turn, locks all orbs for 1 turn",
+		special: "Reduces Bind and Despair duration by 1 turn, locks all orbs for 1 turn",
 		specialName: "Sea Stone Handcuffs",
 		captain: "Boosts chain multiplier by 2x"
 	},
 	538: {
-		special: "Reduces Bind and Silence duration by 1 turn, locks all orbs for 1 turn",
+		special: "Reduces Bind and Despair duration by 1 turn, locks all orbs for 1 turn",
 		specialName: "Sea Stone Handcuffs",
 		captain: "Boosts chain multiplier by 2x, recovers 2x character's RCV in HP at the end of each turn"
 	},
@@ -2397,7 +2397,7 @@ window.details = {
 		specialName: "Wipeout Tackle"
 	},
 	567: {
-		special: "Reduces Bind and Silence duration by 1 turn, deals STR damage to all enemies",
+		special: "Reduces Bind and Despair duration by 1 turn, deals STR damage to all enemies",
 		specialName: "Mudfish Coaster"
 	},
 	568: {
@@ -2428,7 +2428,7 @@ window.details = {
 		captain: "Boosts ATK of Fighter characters by 2.5x if HP is above 99% at the start of the turn"
 	},
 	573: {
-		special: "Reduces Silence duration by 2 turns, recovers 10x character's RCV in HP",
+		special: "Reduces Despair duration by 2 turns, recovers 10x character's RCV in HP",
 		specialName: "Manly Support",
 		captain: "Boosts RCV of all characters by 1.2x"
 	},
@@ -2500,12 +2500,12 @@ window.details = {
 		captain: "Boosts HP and RCV of PSY characters by 1.5x"
 	},
 	587: {
-		special: "Removes poison, reduces Bind and Silence duration by 2 turns",
+		special: "Removes poison, reduces Bind and Despair duration by 2 turns",
 		specialName: "Merciful Painkiller",
 		captain: "Recovers 3x character's RCV in HP at the end of each turn"
 	},
 	588: {
-		special: "Removes poison, reduces Bind and Silence duration by 2 turns",
+		special: "Removes poison, reduces Bind and Despair duration by 2 turns",
 		specialName: "Merciful Painkiller",
 		captain: "Recovers 5x character's RCV in HP at the end of each turn"
 	},
@@ -2751,12 +2751,12 @@ window.details = {
 		captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn"
 	},
 	644: {
-		special: "Reduces Bind and Silence duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
+		special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
 		specialName: "Witch's Icebreaker",
 		captain: "Boosts ATK of INT characters by 2x"
 	},
 	645: {
-		special: "Reduces Bind and Silence duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
+		special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
 		specialName: "Witch's Icebreaker",
 		captain: "Boosts ATK of INT characters by 2.5x"
 	},
@@ -2832,7 +2832,7 @@ window.details = {
 		captain: "Boosts ATK of Shooter characters by 1.5x"
 	},
 	659: {
-		special: "Reduces Bind and Silence duration by 2 turns, reduces damage received by 50% for 2 turns",
+		special: "Reduces Bind and Despair duration by 2 turns, reduces damage received by 50% for 2 turns",
 		specialName: "Gum-Gum Balloon Swim",
 		captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
 	},
@@ -3076,12 +3076,12 @@ window.details = {
 		captain: "Boosts ATK and HP of STR characters by 1.5x"
 	},
 	708: {
-		special: "Reduces Bind and Silence duration by 3 turns",
+		special: "Reduces Bind and Despair duration by 3 turns",
 		specialName: "Cien Fleur - Wing",
 		captain: "Boosts ATK and RCV of PSY characters by 1.2x"
 	},
 	709: {
-		special: "Reduces Bind and Silence duration by 3 turns",
+		special: "Reduces Bind and Despair duration by 3 turns",
 		specialName: "Cien Fleur - Wing",
 		captain: "Boosts ATK and RCV of PSY characters by 1.5x"
 	},
@@ -3380,7 +3380,7 @@ window.details = {
 		captain: "Boosts ATK and RCV of Striker characters by 1.5x"
 	},
 	765: {
-		special: "Reduces Silence duration by 3 turns",
+		special: "Reduces Despair duration by 3 turns",
 		specialName: "Scope Magic",
 		captain: "Recovers 2x character's RCV in HP at the end of each turn"
 	},
@@ -3392,7 +3392,7 @@ window.details = {
 	767: {
 		special: {
 			"japan": "Changes the orbs in the top row into [DEX] orbs, removes blindness",
-			"global": "Changes the orbs in the top row into [DEX] orbs, reduces Silence duration by 1 turn"
+			"global": "Changes the orbs in the top row into [DEX] orbs, reduces Despair duration by 1 turn"
 		},
 		specialName: "Ojos Fleur: Thriller",
 		captain: "Boosts ATK and RCV of DEX characters by 1.5x"
@@ -3485,11 +3485,11 @@ window.details = {
 		captain: "Boosts ATK of Slasher characters by 2x and their RCV by 1.5x"
 	},
 	784: {
-		special: "Reduces Silence duration by 2 turns, removes blindness",
+		special: "Reduces Despair duration by 2 turns, removes blindness",
 		specialName: "Yelling at Lascivious Young Women"
 	},
 	785: {
-		special: "Reduces Silence duration by 2 turns, removes blindness",
+		special: "Reduces Despair duration by 2 turns, removes blindness",
 		specialName: "Yelling at Lascivious Young Women",
 		captain: "Reduces damage received by 20%"
 	},
@@ -3791,13 +3791,13 @@ window.details = {
 	847: {
 		captain: "Boosts ATK of all characters by 1.5x if HP is below 30% at the start of the turn",
 		specialName: "Sturdy Boat: Launch",
-		special: "Reduces Silence duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
+		special: "Reduces Despair duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
 		specialNotes: "#{orb : 1.15x}"
 	},
 	848: {
 		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
 		specialName: "Sturdy Boat: Launch",
-		special: "Reduces Silence duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
+		special: "Reduces Despair duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
 		specialNotes: "#{orb : 1.15x}"
 	},
 	849: {
@@ -4099,7 +4099,7 @@ window.details = {
 	899: {
 		captain: "Boosts ATK of Fighter and Free Spirit characters by 1.75x and their RCV by 1.25x",
 		specialName: "Hymn to Friendship: \"Okama Way\" Two",
-		special: "Reduces Silence duration by 5 turns, recovers 10x character's RCV in HP"
+		special: "Reduces Despair duration by 5 turns, recovers 10x character's RCV in HP"
 	},
 	900: {
 		captain: "Boosts ATK of Shooter characters by 2x if HP is above 99% at the start of the turn",
@@ -4135,15 +4135,15 @@ window.details = {
 		special: [
 			{
 				"description": "Changes own orb into [STR], boosts his own ATK by 1.5x for 2 turns",
-				"cooldown": 17
+				"cooldown": [ 17, 11 ]
 			},
 			{
 				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.5x for 2 turns",
-				"cooldown": 21
+				"cooldown": [ 21, 15 ]
 			},
 			{
 				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.75x for 2 turns",
-				"cooldown": 24
+				"cooldown": [ 24, 18 ]
 			}
 		],
 		specialNotes: "#{stages}"
@@ -4154,15 +4154,15 @@ window.details = {
 		special: [
 			{
 				"description": "Changes own orb into [STR], boosts his own ATK by 1.5x for 2 turns",
-				"cooldown": 17
+				"cooldown": [ 17, 11 ]
 			},
 			{
 				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.5x for 2 turns",
-				"cooldown": 21
+				"cooldown": [ 21, 15 ]
 			},
 			{
 				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.75x for 2 turns",
-				"cooldown": 24
+				"cooldown": [ 24, 18 ]
 			}
 		],
 		specialNotes: "#{stages}"
@@ -4412,13 +4412,13 @@ window.details = {
 	},
 	946: {
 		specialName: "Persuit of the Morning Star",
-		captain: "Boosts the ATK of Striker Characters by 1.75x. Reduces cooldown of all specials by 3 turns at the start of the fight",
+		captain: "Boosts the ATK of Striker Characters by 1.75x. Reduces cooldown of all specials by 1 turn at the start of the fight",
 		special: "Change Friend Captain and this unit's orb to [INT]"
 	},
 	947: {
 		captain: "Boosts the ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
 		specialName: "Flame Flash",
-		special: "[STR] and [INT] Characters gain 1.3x ATK, Deals random [INT] damage",
+		special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals random [INT] damage",
 		captainNotes: "#{noFixedPerc}"
 	},
 	948: {
@@ -4430,5 +4430,6 @@ window.details = {
 		captain: "Boosts the ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
 		specialName: "Ties with Ace",
 		special: "Reduces Silence by 3 turns, and heals for 4,000"
+		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
 	}
 };

From 1e7fc657874518fc8a077d6cd59de21c3feaa783 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 02:41:07 -0600
Subject: [PATCH 0139/1569] comma

stupid commas
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 915211651..bcece91fe 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4429,7 +4429,7 @@ window.details = {
 	949: {
 		captain: "Boosts the ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
 		specialName: "Ties with Ace",
-		special: "Reduces Silence by 3 turns, and heals for 4,000"
+		special: "Reduces Silence by 3 turns, and heals for 4,000",
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
 	}
 };

From 68f3a1b87637bc57ff0e6d773030bd4dae114b99 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 02:46:35 -0600
Subject: [PATCH 0140/1569] Rob lucci

special max
---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9cc4f6eb0..09c48106a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -735,7 +735,7 @@ window.cooldowns = [
 	14,
 	14,
 	25,
-	18,
+	[ 18, 12 ],
 	35,
 	20,
 	[ 23, 15 ],

From 4867a0447478204bee1451695b5bd953a106302c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 03:01:50 -0600
Subject: [PATCH 0141/1569] more cds

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 09c48106a..9981c479b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -944,7 +944,7 @@ window.cooldowns = [
 	15,
     [ 13, 13 ],
 	[ 13, 13 ],
-	20,
+	[ 20, 12 ],
 	25,
 	25,
 	20

From de98a56baf02fa47eac759003dc7e80efdd607f9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 8 Mar 2016 10:58:29 +0100
Subject: [PATCH 0142/1569] Despair + Max Stats

---
 common/data/abilities.js            |  8 ++++----
 common/data/drops.js                |  4 ++--
 common/data/matchers.js             |  4 ++--
 common/data/units.js                | 16 ++++++++--------
 damage/views/popup/instruction.html |  2 +-
 index.html                          |  5 ++---
 6 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/common/data/abilities.js b/common/data/abilities.js
index cbb5140f8..1766f0488 100644
--- a/common/data/abilities.js
+++ b/common/data/abilities.js
@@ -27,11 +27,11 @@ window.abilities = [
     },
 
     {
-        name: 'Silence resistance',
+        name: 'Despair resistance',
         levels: [
-            [ 10, 'Silence duration reduced by 1 turn' ],
-            [ 15, 'Silence duration reduced by 2 turns' ],
-            [ 20, 'Silence duration reduced by 3 turns' ]
+            [ 10, 'Despair duration reduced by 1 turn' ],
+            [ 15, 'Despair duration reduced by 2 turns' ],
+            [ 20, 'Despair duration reduced by 3 turns' ]
         ]
     },
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 4ecb6af5e..cb97029ea 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -953,7 +953,7 @@ window.drops = {
             Elite: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
         },
         {
-            name: "[Preview] Whitebeard Pirates Commanders",
+            name: "Encounter! Whitebeard Pirates!",
             thumb: null,
             condition: "You can only bring PSY units",
             Expert: [ 946, 947, 948, 949],
@@ -1104,7 +1104,7 @@ window.drops = {
 
         {
             name: 'Battle Royal! Oars',
-            thumb: 414,
+            thumb: 893,
             'Master': [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -15, -8 ]
         },
 
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 6baadd7d2..d1bc6f03d 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -294,9 +294,9 @@ window.matchers = [
     },
 
     {
-        name: 'Silence reducers',
+        name: 'Despair reducers',
         target: 'special',
-        matcher: /reduces.+silence.+duration/i,
+        matcher: /reduces.+despair.+duration/i,
     },
 
     {
diff --git a/common/data/units.js b/common/data/units.js
index cdd1cfa53..f790e72cf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -944,12 +944,12 @@ window.units = [
 	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, null, 58, 27, 33, null, null, null, null],
-	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, null, 48, 35, 20, null, null, null, null],
-	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, null, 33, 39, 30, null, null, null, null],
-	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, null, 80, 37, 37, null, null, null, null],
-	[ "Colosseum Ace", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Ace Evolution", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
- 	[ "Colosseum Beckman Evolution", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, null, 58, 27, 33, 2077, 1055, 218, null],
+	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, null, 48, 35, 20, 1911, 1231, 187, null],
+	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, null, 33, 39, 30, 1706, 1252, 187, null],
+	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, null, 80, 37, 37, 1996, 1088, 226, null],
+	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
+ 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];
diff --git a/damage/views/popup/instruction.html b/damage/views/popup/instruction.html
index ab2cfc84b..f950be2cf 100644
--- a/damage/views/popup/instruction.html
+++ b/damage/views/popup/instruction.html
@@ -23,7 +23,7 @@
                     <ul>
 						<li><tt>Middle Mouse Click</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
                         <li><tt>CTRL</tt>: Changes Orbs Matching > Opposite > None (You may also click on orb)</li> 
-                        <li><tt>SHIFT</tt>: Silences Captain</li>
+                        <li><tt>SHIFT</tt>: Despairs Captain</li>
                         <li><tt>ALT</tt>: Locks Units</li>
                         <li><tt>SHIFT + ALT</tt>: Disables Unit</li>
                         <li><tt>Drag &amp; Drop</tt>: Change Unit Position</li>
diff --git a/index.html b/index.html
index 305c6c72c..3381ebaed 100644
--- a/index.html
+++ b/index.html
@@ -55,9 +55,8 @@
             <p>02/03/2016</p>
             <br>
             <ul>
-                <li>New 3D2Y Units + Legend Jimbe!</li>
-                <li>Full info of 3D2Y units added!</li>
-                <li>Finished Bridal Boa</li>
+                <li>Changed Silence to Despair</li>
+                <li>New Silence now refers to Special Blockers</li>
                 <br>
                 <li>Drop and Manual Locations in </li>
                 <li>the Character Details now</li>

From 5ec61aa51c19ebe8fcc96f3b9cb6814ac489f569 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 8 Mar 2016 11:19:10 +0100
Subject: [PATCH 0143/1569] Book Drops + GW Links

---
 common/data/drops.js | 4 ++--
 common/data/gw.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index cb97029ea..4b2641c51 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -956,8 +956,8 @@ window.drops = {
             name: "Encounter! Whitebeard Pirates!",
             thumb: null,
             condition: "You can only bring PSY units",
-            Expert: [ 946, 947, 948, 949],
-            Elite: [ 946, 947, 948, 949]
+            Expert: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738],
+            Elite: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738]
         }
 
     ],
diff --git a/common/data/gw.js b/common/data/gw.js
index 3baaf117d..095db518d 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807];
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133];
\ No newline at end of file

From 1d37417719e613e18625be166e6ab862a11754ba Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 10:22:38 -0600
Subject: [PATCH 0144/1569] captains + Specials + Tags

wording fixed for tags, captains + specials added.
---
 common/data/captains.js  | 13 +++++++++++++
 common/data/cooldowns.js | 12 ++++++------
 common/data/details.js   |  6 +++---
 common/data/zombies.js   |  6 +++++-
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 5a8b08e0f..7b94d4931 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2231,5 +2231,18 @@ window.captains = {
 	945: {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; },
 		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; }
+	},
+	946: {
+		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+	},
+	947: {
+		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+	},
+	948: {
+		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+	},
+	949: {
+		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
 	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9981c479b..97c7c6564 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -732,11 +732,11 @@ window.cooldowns = [
 	25,
 	[ 18, 12 ],
 	[ 18, 12 ],
-	14,
-	14,
+	[ 14, 7 ],
+	[ 14, 7 ],
 	25,
 	[ 18, 12 ],
-	35,
+	[ 35, 20 ],
 	20,
 	[ 23, 15 ],
 	[ 23, 15 ],
@@ -945,7 +945,7 @@ window.cooldowns = [
     [ 13, 13 ],
 	[ 13, 13 ],
 	[ 20, 12 ],
-	25,
-	25,
-	20
+	[ 25, 17 ],
+	[ 25, 18 ],
+	[ 20, 15 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index bcece91fe..dc2146c09 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4412,8 +4412,8 @@ window.details = {
 	},
 	946: {
 		specialName: "Persuit of the Morning Star",
-		captain: "Boosts the ATK of Striker Characters by 1.75x. Reduces cooldown of all specials by 1 turn at the start of the fight",
-		special: "Change Friend Captain and this unit's orb to [INT]"
+		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts the ATK of Striker Characters by 1.75x",
+		special: "Change Friend Captain and changes own orb into [INT]"
 	},
 	947: {
 		captain: "Boosts the ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
@@ -4429,7 +4429,7 @@ window.details = {
 	949: {
 		captain: "Boosts the ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
 		specialName: "Ties with Ace",
-		special: "Reduces Silence by 3 turns, and heals for 4,000",
+		special: "Reduces Silence by 3 turns, and recovers 4,000 HP",
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
 	}
 };
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 2414e3467..8c06d63b9 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -202,5 +202,9 @@ window.zombies = {
     912: { // SH Sanji
         type: 'healer',
         multiplier: 4
-    }
+    },
+	949: { //Fortnight Thatch
+		type: 'healer',
+        multiplier: 2
+	}
 };

From 78e8cd6eba735d042a1681bad77b1d64fa70389d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 10:30:17 -0600
Subject: [PATCH 0145/1569] another special

didn't commit
---
 common/data/specials.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 8bc0092d0..cc1196c47 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1082,5 +1082,9 @@ window.specials = {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
 		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
 		type: "class"
+    },
+	947: {
+		atk: function(p) { return p.unit.type == "STR" || return p.unit.type == "INT" ? 1.3 : 1; },
+		type: "type"
     }
 };
\ No newline at end of file

From 5ff336e55dcff3e797e8b519e791c9ad396543e1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 10:38:31 -0600
Subject: [PATCH 0146/1569] fixed tags

changed lots of wordings so they will be tagged properly
---
 common/data/details.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index dc2146c09..e707cfbd3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4347,13 +4347,13 @@ window.details = {
 		specialNotes: "#{stages}"
 	},
 	934: {
-		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
+		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
 		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	935: {
-		captain: "Boosts the ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts Fighter Characters ATK by 2.75 instead",
+		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
 		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
@@ -4381,53 +4381,53 @@ window.details = {
 		special: "Reduces Bind duration for one character completely. For Striker and Knowledge characters, changes Bad orbs to Matching"
 	},
 	940: {
-		captain: "Boosts [DEX] Characters ATK and HP by 1.5x",
+		captain: "Boosts ATK and HP of [DEX] Characters by 1.5x",
 		specialName: "Sure Kill! Exploding Star!!",
-		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
+		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	941: {
-		captain: "Boosts [DEX] Characters ATK by 1.5x and their HP by 2.25x",
+		captain: "Boosts ATK of [DEX] Characters by 1.5x and their HP by 2.25x",
 		specialName: "Sure Kill! Exploding Star!!",
-		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts the ATK of [DEX] characters by 1.75x for 1 turn"
+		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	942: {
-		captain: "Boosts [STR] Characters ATK and HP by 1.5x",
+		captain: "Boosts ATK and HP of [STR] Characters by 1.5x",
 		specialName: "Future Country's Big Incident: The Nightmare of Barujimoa",
 		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	943: {
-		captain: "Boosts [STR] Characters ATK by 2.25x and their HP by 1.75x",
+		captain: "Boosts ATK of [STR] Characters by 2.25x and their HP by 1.75x",
 		specialName: "Future Country's Big Incident: The Nightmare of Barujimoa",
 		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	944: {
-		captain: "Boosts the ATK and RCV of Ambition Characters by 1.2x",
+		captain: "Boosts ATK and RCV of Ambition Characters by 1.2x",
 		specialName: "Spiritual Bouquet",
-		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
+		special: "Boosts ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	},
 	945: {
-		captain: "Boosts the ATK and RCV of Ambition Characters by 1.75x",
+		captain: "Boosts ATK and RCV of Ambition Characters by 1.75x",
 		specialName: "Spiritual Bouquet",
-		special: "Boosts the ATK and RCV of Ambition Characters by 1.5x for 1 turn"
+		special: "Boosts ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	},
 	946: {
 		specialName: "Persuit of the Morning Star",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts the ATK of Striker Characters by 1.75x",
+		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker Characters by 1.75x",
 		special: "Change Friend Captain and changes own orb into [INT]"
 	},
 	947: {
-		captain: "Boosts the ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
+		captain: "Boosts ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
 		specialName: "Flame Flash",
 		special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals random [INT] damage",
 		captainNotes: "#{noFixedPerc}"
 	},
 	948: {
-		captain: "Boosts the ATK of Shooter Characters by 1.5x and boosts their RCV by 1.2x",
+		captain: "Boosts ATK of Shooter Characters by 1.5x and their RCV by 1.2x",
 		specialName: "Twin Cannons",
 		special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage"
 	},
 	949: {
-		captain: "Boosts the ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
+		captain: "Boosts ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
 		specialName: "Ties with Ace",
 		special: "Reduces Silence by 3 turns, and recovers 4,000 HP",
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"

From c1a7f3f79e97c6bbb8cc443e95b0fbf7f776e5f8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 11:17:14 -0600
Subject: [PATCH 0147/1569] special damage, fix

small fix
---
 common/data/details.js  | 6 +++---
 common/data/specials.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e707cfbd3..23edb4995 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4349,13 +4349,13 @@ window.details = {
 	934: {
 		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
+		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	935: {
 		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals Large [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
+		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	936: {
@@ -4418,7 +4418,7 @@ window.details = {
 	947: {
 		captain: "Boosts ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
 		specialName: "Flame Flash",
-		special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals random [INT] damage",
+		special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals 10x character's ATK in [INT] damage to all enemies",
 		captainNotes: "#{noFixedPerc}"
 	},
 	948: {
diff --git a/common/data/specials.js b/common/data/specials.js
index cc1196c47..7a5ca496d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1084,7 +1084,7 @@ window.specials = {
 		type: "class"
     },
 	947: {
-		atk: function(p) { return p.unit.type == "STR" || return p.unit.type == "INT" ? 1.3 : 1; },
+		atk: function(p) { return p.unit.type == "STR" || return p.unit.type == "INT" ? 1.3 : 1; }
 		type: "type"
     }
 };
\ No newline at end of file

From f7fc2c04773fec29dc2b6a97fc8beba5c016f041 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 11:36:48 -0600
Subject: [PATCH 0148/1569] special fix

oops
---
 common/data/specials.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 7a5ca496d..2b95f2803 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1084,7 +1084,7 @@ window.specials = {
 		type: "class"
     },
 	947: {
-		atk: function(p) { return p.unit.type == "STR" || return p.unit.type == "INT" ? 1.3 : 1; }
+		atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.3 : 1; },
 		type: "type"
     }
 };
\ No newline at end of file

From 8cfa96dff0d4eafd99f603ef18c15604a8c61cce Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 12:21:36 -0600
Subject: [PATCH 0149/1569] fixed stats

small numbers
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index f790e72cf..ac67402d8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -946,8 +946,8 @@ window.units = [
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
 	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, null, 58, 27, 33, 2077, 1055, 218, null],
 	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, null, 48, 35, 20, 1911, 1231, 187, null],
-	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, null, 33, 39, 30, 1706, 1252, 187, null],
-	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, null, 80, 37, 37, 1996, 1088, 226, null],
+	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, null, 33, 39, 30, 1706, 1251, 212, null],
+	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, null, 80, 37, 37, 1995, 1088, 227, null],
 	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],

From c80412d67f98e19d56fe768057c9dfcd54f88748 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 12:40:34 -0600
Subject: [PATCH 0150/1569] Nami

max stats
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index ac67402d8..78794b1e8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -937,7 +937,7 @@ window.units = [
 	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
 	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
 	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
-	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, null, null, null, null],
+	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, 2119, 1081, 413, null],
 	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
 	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
 	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],

From 45d9d79781f7c42b0cd79dbf765fb7c127607e83 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 9 Mar 2016 00:07:39 +0100
Subject: [PATCH 0151/1569] 3D2Y complete

Assumed EXP
---
 common/data/units.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 78794b1e8..d88be5887 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -932,16 +932,16 @@ window.units = [
 	[ "Blugori", "DEX", [ "Tough", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	[ "Pica", "PSY", [ "Tough","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	[ "Pica, Donquixote Pirates", "PSY", [ "Tough", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, null, 572, 268, 102, 1841, 797, 229, null],
-	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, null, 1787, 733, 179, 3400, 1440, 347, 1],
-	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, null, 151, 150, 21, 1220, 764, 149, null],
-	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1173, 712, 99, 2406, 1415, 257, null],
-	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, null, 141, 80, 48, 1102, 584, 233, null],
-	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, null, 1037, 522, 189, 2119, 1081, 413, null],
-	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, null, 271, 52, 34, 1748, 453, 172, null],
-	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, null, 1669, 398, 131, 3239, 800, 323, null],
-	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, null, 220, 112, 22, 1603, 686, 131, null],
-	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, null, 1535, 635, 88, 2810, 1249, 244, null],
+	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, 106699, 572, 268, 102, 1841, 797, 229, 1],
+	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
+	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 106699, 151, 150, 21, 1220, 764, 149, 1],
+	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
+	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, 106699, 141, 80, 48, 1102, 584, 233, 1],
+	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
+	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 106699, 271, 52, 34, 1748, 453, 172, 1],
+	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
+	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 106699, 220, 112, 22, 1603, 686, 131, 1],
+	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
 	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, null, 58, 27, 33, 2077, 1055, 218, null],

From 20648046d2678c3403e74ec0fb890e98e1eb24b9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 9 Mar 2016 01:29:59 +0100
Subject: [PATCH 0152/1569] Commander Info Complete

---
 common/data/units.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index d88be5887..d27d767db 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -944,10 +944,10 @@ window.units = [
 	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, null, 58, 27, 33, 2077, 1055, 218, null],
-	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, null, 48, 35, 20, 1911, 1231, 187, null],
-	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, null, 33, 39, 30, 1706, 1251, 212, null],
-	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, null, 80, 37, 37, 1995, 1088, 227, null],
+	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
+	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1911, 1231, 187, 1],
+	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
+	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
 	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],

From 4802062651ae6b8cc184f950d32ef35ed75da1a3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 22:40:36 -0600
Subject: [PATCH 0153/1569] updated Ace/Ben

Stats
---
 common/data/cooldowns.js |  6 +++++-
 common/data/details.js   | 26 ++++++++++++++++++++++++--
 common/data/units.js     |  6 +++---
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 97c7c6564..6d39e4811 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -947,5 +947,9 @@ window.cooldowns = [
 	[ 20, 12 ],
 	[ 25, 17 ],
 	[ 25, 18 ],
-	[ 20, 15 ]
+	[ 20, 15 ],
+	21,
+	21,
+	18,
+	18
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 23edb4995..321e1c024 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4386,7 +4386,7 @@ window.details = {
 		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
 	},
 	941: {
-		captain: "Boosts ATK of [DEX] Characters by 1.5x and their HP by 2.25x",
+		captain: "Boosts ATK of [DEX] Characters by 1.75x and their HP by 2.25x",
 		specialName: "Sure Kill! Exploding Star!!",
 		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
 	},
@@ -4431,5 +4431,27 @@ window.details = {
 		specialName: "Ties with Ace",
 		special: "Reduces Silence by 3 turns, and recovers 4,000 HP",
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
-	}
+	},
+	950: {
+		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2x after scoring 3 Perfects in a row",
+		specialName: "Pillars of Flame",
+		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
+	},
+	951: {
+		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
+		specialName: "Pillars of Flame",
+		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
+	},
+	952: {
+		captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
+		specialName: "Butt of Gun Attack",
+		special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
+	},
+	953: {
+		captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
+		specialName: "Butt of Gun Attack",
+		special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index d27d767db..5323c5803 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -948,8 +948,8 @@ window.units = [
 	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1911, 1231, 187, 1],
 	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
 	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
-	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, null, 606, 313, 54, null, null, null, null],
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null],
- 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, null, null, null, null],
+ 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, null, null, null, null]
 ];

From d7f5165a1106147823a5dc9bd7f6058f7e27bb89 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 8 Mar 2016 22:50:09 -0600
Subject: [PATCH 0154/1569] Ace Stats

updated
---
 common/data/cooldowns.js | 4 ++--
 common/data/units.js     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6d39e4811..e76c10a52 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -948,8 +948,8 @@ window.cooldowns = [
 	[ 25, 17 ],
 	[ 25, 18 ],
 	[ 20, 15 ],
-	21,
-	21,
+	[ 21, 9 ],
+	[ 21, 9 ],
 	18,
 	18
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 5323c5803..0d0d1e25d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -949,7 +949,7 @@ window.units = [
 	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
 	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
 	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, null, 606, 313, 54, null, null, null, null],
-	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, null, null, null, null, 2599, 1271, 271, null],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, null, null, null, null],
  	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, null, null, null, null]
 ];

From 4fae6611b2036da98674481fb101e125e470b022 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 9 Mar 2016 00:31:26 -0600
Subject: [PATCH 0155/1569] pica

update tags
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 321e1c024..0348563bd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4336,11 +4336,11 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
+				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 31, 17 ]
 			}
 		],

From a468e98b391604266e608e0d3665202db6389d91 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 9 Mar 2016 00:34:51 -0600
Subject: [PATCH 0156/1569] ace fix

2.75
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 0348563bd..36de72980 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4433,13 +4433,13 @@ window.details = {
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
 	},
 	950: {
-		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2x after scoring 3 Perfects in a row",
+		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
 		specialName: "Pillars of Flame",
 		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
 		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
 	},
 	951: {
-		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
+		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
 		specialName: "Pillars of Flame",
 		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
 		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"

From 87fea1393e6fde0aa65dd61a766d85750e279013 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 9 Mar 2016 11:00:05 +0100
Subject: [PATCH 0157/1569] Consistency

---
 common/data/details.js    | 12 ++++++------
 common/data/drops.js      |  2 +-
 common/data/evolutions.js |  4 ++--
 common/data/units.js      | 22 +++++++++++-----------
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 36de72980..e0004a52d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4411,7 +4411,7 @@ window.details = {
 		special: "Boosts ATK and RCV of Ambition Characters by 1.5x for 1 turn"
 	},
 	946: {
-		specialName: "Persuit of the Morning Star",
+		specialName: "Lock-on Iron Ball",
 		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker Characters by 1.75x",
 		special: "Change Friend Captain and changes own orb into [INT]"
 	},
@@ -4434,24 +4434,24 @@ window.details = {
 	},
 	950: {
 		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
-		specialName: "Pillars of Flame",
+		specialName: "Flame Commandment: Fire Pillar",
 		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
 		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
 	},
 	951: {
 		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
-		specialName: "Pillars of Flame",
+		specialName: "Flame Commandment: Fire Pillar",
 		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
 		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
 	},
 	952: {
-		captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
-		specialName: "Butt of Gun Attack",
+		captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.2x",
+		specialName: "Life-saving Gunstock Blow",
 		special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
 	},
 	953: {
 		captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
-		specialName: "Butt of Gun Attack",
+		specialName: "Life-saving Gunstock Blow",
 		special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
 	},
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 4b2641c51..d819f5a41 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -954,7 +954,7 @@ window.drops = {
         },
         {
             name: "Encounter! Whitebeard Pirates!",
-            thumb: null,
+            thumb: 946,
             condition: "You can only bring PSY units",
             Expert: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738],
             Elite: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3b1465a6b..7da6b3742 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1441,10 +1441,10 @@ window.evolutions = {
     },
     950: {
         evolution: 951,
-        evolvers: []
+        evolvers: [ 118, 82, 87, 98, 303 ]
     },
     952: {
         evolution: 953,
-        evolvers: []
+        evolvers: [ 116, 117, 80, 86, 97 ]
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 0d0d1e25d..e178e63c7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -934,22 +934,22 @@ window.units = [
 	[ "Pica, Donquixote Pirates", "PSY", [ "Tough", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
 	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, 106699, 572, 268, 102, 1841, 797, 229, 1],
 	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
-	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 106699, 151, 150, 21, 1220, 764, 149, 1],
+	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
 	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
-	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, 106699, 141, 80, 48, 1102, 584, 233, 1],
+	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
 	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
-	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 106699, 271, 52, 34, 1748, 453, 172, 1],
+	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
 	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
-	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 106699, 220, 112, 22, 1603, 686, 131, 1],
+	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
 	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
-	[ "Whitebeard 7th Division Commander, Rakuyo", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
-	[ "Whitebeard 15th Division Commander, Fossa", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1911, 1231, 187, 1],
-	[ "Whitebeard 10th Division Commander, Curiel", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
-	[ "Whitebeard 4th Division Commander, Thatch", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
-	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, null, 606, 313, 54, null, null, null, null],
-	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, null, null, null, null, 2599, 1271, 271, null],
-	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, null, null, null, null],
+	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
+	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1911, 1231, 187, 1],
+	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
+	[ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
+	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, null, 606, 313, 54, 1496, 744, 152, null],
+	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, null, 1431, 690, 110, 2599, 1271, 271, null],
+	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, 935, 375, 163, null],
  	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, null, null, null, null]
 ];

From 11f035ba4288fcca3041c31b5d6e0705893dd341 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 9 Mar 2016 12:34:47 +0100
Subject: [PATCH 0158/1569] Ben almost complete + Kid Special

---
 common/data/cooldowns.js |  4 ++--
 common/data/details.js   |  4 ++--
 common/data/units.js     | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e76c10a52..11bca2dc2 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -950,6 +950,6 @@ window.cooldowns = [
 	[ 20, 15 ],
 	[ 21, 9 ],
 	[ 21, 9 ],
-	18,
-	18
+	[ 18, 10 ],
+    [ 18, 10 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index e0004a52d..a911a468f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4272,14 +4272,14 @@ window.details = {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.5x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
 		specialName: "Repel: Weapons Reflect",
-		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
+		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	924: {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.75x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
 		specialName: "Repel: Weapons Reflect",
-		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to one enemy",
+		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	925: {
diff --git a/common/data/units.js b/common/data/units.js
index e178e63c7..119ba9feb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -547,8 +547,8 @@ window.units = [
 	[ "Kami Eneru", "PSY", [ "Shooter", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
 	[ "Monkey D. Luffy Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
 	[ "Monkey D. Luffy Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
-	[ "Sadi-chan", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
-	[ "Sadi-chan, Impel Down's Chief Guard", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
+	[ "Sadie-chan", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
+	[ "Sadie-chan, Impel Down's Chief Guard", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
 	[ "Minokoala", "STR", [ "Fighter", "Tough" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
 	[ "Manticore", "QCK", [ "Fighter", "Tough" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
 	[ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Ambition" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
@@ -923,8 +923,8 @@ window.units = [
 	[ "Empress in Love Hancock, Wedding", "INT", [ "Shooter", "Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
 	[ "South Blue's Captain Kid", "STR", [ "Striker", "Ambition" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
 	[ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker", "Ambition" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
-	[ "Chief Guard Sadi-chan", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
-	[ "Chief Guard Sadi-chan, Commander of the Jailer Beasts", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
+	[ "Chief Guard Sadie-chan", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
+	[ "Chief Guard Sadie-chan, Commander of the Jailer Beasts", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
 	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
 	[ "Hannyabal", "DEX", ["Ambition", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
 	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Ambition", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
@@ -945,11 +945,11 @@ window.units = [
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
 	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
-	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1911, 1231, 187, 1],
+	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
 	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
 	[ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
 	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, null, 606, 313, 54, 1496, 744, 152, null],
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, null, 1431, 690, 110, 2599, 1271, 271, null],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, 935, 375, 163, null],
- 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, null, null, null, null]
+ 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, 1403, 800, 229, null]
 ];

From 6468fa0ba9db992f9c0c131991f284c392af38aa Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 9 Mar 2016 13:06:57 +0100
Subject: [PATCH 0159/1569] Update evolutions.js

---
 common/data/evolutions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7da6b3742..9ef01c579 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1441,10 +1441,10 @@ window.evolutions = {
     },
     950: {
         evolution: 951,
-        evolvers: [ 118, 82, 87, 98, 303 ]
+        evolvers: [ 118, 83, 87, 98, 303 ]
     },
     952: {
         evolution: 953,
         evolvers: [ 116, 117, 80, 86, 97 ]
     }
-};
\ No newline at end of file
+};

From e08f5ac64273ebab33d6a1b31258fbf05cc92a9e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 9 Mar 2016 17:22:40 +0100
Subject: [PATCH 0160/1569] Giant Fodder Fix

---
 common/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 414fe6fd3..f6fa48108 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -4,7 +4,7 @@ var FODDER_REGEX = new RegExp('(' + [
     'Group', 'Ensign Navy HQ', 'Armed \\w+ Unit', '[BM]illions Baroque', 'Eneru\'s Elect',
     'Skypiea (Guard|Enforcer)', 'Shandian',
     '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
-    'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', 'Giant.*Pirates',
+    'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^Giant.*Pirates',
     '(Soldier|General) Zombie.*Shadow', 'Wild Zombie','Street Punk'
 ].join(')|(') + ')','i');
 

From 39ba44278bdb910b8fe2ee5e96fa44ddbd32be60 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 10 Mar 2016 02:10:38 -0600
Subject: [PATCH 0161/1569] Super Mega Update

Too many characters
---
 common/data/aliases.js   | 23 +++++++++-
 common/data/cooldowns.js | 23 +++++++++-
 common/data/details.js   | 99 +++++++++++++++++++++++++++++++++++++++-
 common/data/families.js  | 23 +++++++++-
 common/data/units.js     | 23 +++++++++-
 common/data/zombies.js   |  4 ++
 index.html               |  6 +--
 7 files changed, 192 insertions(+), 9 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 200afa8e1..27a4e103b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -951,5 +951,26 @@ window.aliases = {
     950: ['',''],
     951: ['',''],
     952: ['',''],
-    953: ['','']
+    953: ['',''],
+	954: ['',''],
+    955: ['',''],
+    956: ['',''],
+    957: ['',''],
+    958: ['',''],
+    959: ['',''],
+    960: ['',''],
+    961: ['',''],
+	962: ['',''],
+    963: ['',''],
+    964: ['',''],
+    965: ['',''],
+    966: ['',''],
+    967: ['',''],
+    968: ['',''],
+    969: ['',''],
+	970: ['',''],
+    971: ['',''],
+    972: ['',''],
+    973: ['',''],
+    974: ['','']
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 11bca2dc2..62646b125 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -951,5 +951,26 @@ window.cooldowns = [
 	[ 21, 9 ],
 	[ 21, 9 ],
 	[ 18, 10 ],
-    [ 18, 10 ]
+    [ 18, 10 ],
+	20,
+	16,
+	20,
+	20,
+	18,
+	18,
+	22,
+	16,
+	16,
+	23,
+	23,
+	23,
+	25,
+	21,
+	[ 28, 20 ],
+	[ 28, 20 ],
+	[ 28, 20 ],
+	[ 28, 20 ],
+	[ 28, 20 ],
+	22,
+	22
 ];
diff --git a/common/data/details.js b/common/data/details.js
index a911a468f..a95e6bc86 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4272,14 +4272,14 @@ window.details = {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.5x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
 		specialName: "Repel: Weapons Reflect",
-		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to all enemies",
+		special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	924: {
 		captain: "Boosts ATK of Ambition characters by 2x or by 2.75x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
 		specialName: "Repel: Weapons Reflect",
-		special: "Empties all slots, deals STR damage based on number of [STR] slots emptied to all enemies",
+		special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	925: {
@@ -4454,4 +4454,99 @@ window.details = {
 		specialName: "Life-saving Gunstock Blow",
 		special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
 	},
+	954:{
+		captain: "Boosts ATK and HP of [QCK] Characters by 1.5x",
+		specialName: "Gyaro Special",
+		special: "Reduces the defense of all enemies by 80% for 2 turns"
+	},
+	955:{
+		captain: "Boosts ATK and HP of [PSY] Characters by 1.5x",
+		specialName: "Makuro Special",
+		special: "Boosts ATK against enemies with reduced defense by 1.2x for 2 turns"
+	},
+	956:{
+		captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
+		specialName: "Tansui Special",
+		special: "Boosts ATK of Touch characters by 1.2x for 2 turns"
+	},
+	957:{
+		specialName: "Blue Gunner Special",
+		special: "Recover 2,000 HP"
+	},
+	958:{
+		specialName: "Black Gunner Special",
+		special: "Reduces Bind duration by 2 turns"
+	},
+	959:{
+		specialName: "Green Gunman Special",
+		special: "Reduces Despair duration by 2 turns"
+	},
+	960:{
+		specialName: "Blue Gunman Special",
+		special: "Randomly changes all orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs"
+	},
+	961:{
+		specialName: "Red Gunman Special",
+		special: "Amplifies the effect of orbs by 1.25x for 1 turn"
+	},
+	962:{
+		specialName: "Yellow Gunman Special",
+		special: "Changes captain's orb into [RCV]"
+	},
+	963:{
+		captain: "Boosts ATK of characters with cost between 50 and 55 by 2x",
+		specialName: "Charloss Special",
+		special: "Reduces the defense of all enemies by 100% for 1 turn and randomizes all orbs"
+	},
+	964:{
+		captain: "Boosts ATK, HP, and RCV of characters with cost between 50 and 55 by 1.5x",
+		specialName: "Wrath of the Creator Bloodline",
+		special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
+	},
+	965:{
+		captain: "Boosts ATK of characters with cost between 50 and 55 by 1.5x, recovers 500 HP at the end of each turn",
+		specialName: "Wrath of the Creator Bloodline",
+		special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
+	},
+	966:{
+		captain: "Boosts ATK of Ambition Characters by 2.25x",
+		specialName: "Kid Special",
+		special: "Empties all slots, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
+		specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: We do not know the values yet"
+	},
+	967:{
+		captain: "Boosts ATK of Free Spirit Characters by 2.25x",
+		specialName: "Trafalgar Law Special",
+		special: "Recovers 20x character's RCV in HP. Switches orbs between slots twice"
+	},
+	968:{
+		specialName: "High Heat Ray Laser",
+		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+	},
+	969:{
+		specialName: "High Heat Ray Laser",
+		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+	},
+	970:{
+		specialName: "High Heat Ray Laser",
+		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+	},
+	971:{
+		specialName: "High Heat Ray Laser",
+		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+	},
+	972:{
+		specialName: "High Heat Ray Laser",
+		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+	},
+	973:{
+		captain: "Boosts ATK of Tough Characters by 2x if HP is above 99% at the start of the turn",
+		specialName: "Sentoumaru Special",
+		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
+	},
+	974:{
+		captain: "Boosts ATK of Tough Characters by 2.5x if HP is above 99% at the start of the turn",
+		specialName: "Sentoumaru Special",
+		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
+	},
 };
diff --git a/common/data/families.js b/common/data/families.js
index 064bc8e8a..4725048fe 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -951,5 +951,26 @@ window.families = [
 	"Ace",
 	"Ace",
 	"Beckman",
-	"Beckman"
+	"Beckman",
+	"Gyaro",
+	"Makuro",
+	"Tansui",
+	"Blue Gunner Bodyguard",
+	"Black Gunner Bodyguard",
+	"Green Gunman Bodyguard",
+	"Blue Gunman Bodyguard",
+	"Red Gunman Bodyguard",
+	"Yellow Gunman Bodyguard",
+	"Charloss",
+	"Roswald",
+	"Shalulia",
+	"Kid",
+	"Law",
+	"Pacifista",
+	"Pacifista",
+	"Pacifista",
+	"Pacifista",
+	"Pacifista",
+	"Sentoumaru",
+	"Sentoumaru"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 119ba9feb..e03724909 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -951,5 +951,26 @@ window.units = [
 	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, null, 606, 313, 54, 1496, 744, 152, null],
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, null, 1431, 690, 110, 2599, 1271, 271, null],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, 935, 375, 163, null],
- 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, 1403, 800, 229, null]
+ 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, 1403, 800, 229, null],
+	[ "Gyaro", "QCK", [ "Slasher", "Tough" ], 3, 7, 6, 2, 50, null, null, null, null, null, null, null, null],
+	[ "Makuro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, null, null, null, null, null, null, null, null],
+	[ "Tansui", "INT", [ "Fighter", "Tough" ], 3, 7, 4, 2, 50, null, null, null, null, null, null, null, null],
+	[ "Blue Gunner Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, null, 72, 57, 59, null, null, null, null],
+	[ "Black Gunner Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, null, 64, 64, 57, null, null, null, null],
+	[ "Green Gunman Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, null, 80, 69, 51, null, null, null, null],
+	[ "Blue Gunman Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, null, 84, 66, 52, null, null, null, null],
+	[ "Red Gunman Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, null, 82, 80, 44, null, null, null, null],
+	[ "Yellow Gunman Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, null, 89, 73, 46, null, null, null, null],
+	[ "Saint Charloss", "STR", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, 25, 554, -400, null],
+	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, null, null, null, null],
+	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, null, null, null, null],
+	[ "Super Rookie Eustass Kid", "QCK", [ "Ambition", "Striker" ], 4, 20, 5, 3, 99, null, 462, 299, 19, null, null, null, null],
+	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, null, null, null, null, null, null, null, null],
+	[ "Pacifista PX-1", "DEX", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
+	[ "Pacifista PX-2", "PSY", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
+	[ "Pacifista PX-3", "QCK", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
+	[ "Pacifista PX-4", "STR", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
+	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
+	[ "Sentoumaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, null, null, null, null, 1202, 557, 137, null],
+	[ "Sentoumaru Evolved", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, null, 1125, 497, 92, null, null, null, null]
 ];
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 8c06d63b9..0aeaf2b45 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -206,5 +206,9 @@ window.zombies = {
 	949: { //Fortnight Thatch
 		type: 'healer',
         multiplier: 2
+	},
+	965: {//Saint Charloss
+		type: 'healer',
+		amount: 500 
 	}
 };
diff --git a/index.html b/index.html
index 3381ebaed..bbfcc9e6b 100644
--- a/index.html
+++ b/index.html
@@ -58,9 +58,9 @@
                 <li>Changed Silence to Despair</li>
                 <li>New Silence now refers to Special Blockers</li>
                 <br>
-                <li>Drop and Manual Locations in </li>
-                <li>the Character Details now</li>
-                <li>link to their Drop Page</li>
+                <li>Updated with Sabaody Story</li>
+                <li>mode characters</li>
+                <li>So... many... characters...</li>
                 <br>
                 <li>Added Server Time to Drop Page</li>
             </ul>

From 09bba4d8c089b363aeb039997931d154a079ab25 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 10 Mar 2016 02:13:27 -0600
Subject: [PATCH 0162/1569] law max stats

added
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index e03724909..533428235 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -965,7 +965,7 @@ window.units = [
 	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, null, null, null, null],
 	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, null, null, null, null],
 	[ "Super Rookie Eustass Kid", "QCK", [ "Ambition", "Striker" ], 4, 20, 5, 3, 99, null, 462, 299, 19, null, null, null, null],
-	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, null, null, null, null, null, null, null, null],
+	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, null, null, null, null, 2035, 1013, 243, null],
 	[ "Pacifista PX-1", "DEX", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
 	[ "Pacifista PX-2", "PSY", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
 	[ "Pacifista PX-3", "QCK", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],

From 3a7dd86c4e9ecbc8dedb35c625e60dc0715ace66 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 10 Mar 2016 13:20:19 +0100
Subject: [PATCH 0163/1569] Drops/Data/JPN Names

---
 common/data/aliases.js  | 82 ++++++++++++++++++++---------------------
 common/data/drops.js    | 21 +++++++++++
 common/data/families.js | 12 +++---
 common/data/gw.js       |  2 +-
 common/data/units.js    | 42 ++++++++++-----------
 5 files changed, 90 insertions(+), 69 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 27a4e103b..e976a07f8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -932,45 +932,45 @@ window.aliases = {
     931: ['ブルゴリ ','','Blue Gorilla'],
     932: ['ピーカ',''],
     933: ['ピーカ ドンキホーテ海賊団',''],
-    934: ['','', 'Jinbe', 'Jimbei', 'Jinbei'],
-    935: ['','', 'Jinbe', 'Jimbei', 'Jinbei'],
-    936: ['','','Timeskip Luffy','3D2Y Luffy'],
-    937: ['','','Timeskip Luffy','3D2Y Luffy'],
-    938: ['','','Timeskip Nami','3D2Y Nami'],
-    939: ['','','Timeskip Nami','3D2Y Nami'],
-    940: ['','','Timeskip Usopp','3D2Y Usopp'],
-    941: ['','','Timeskip Usopp','3D2Y Usopp'],
-    942: ['','','Timeskip Franky','3D2Y Franky'],
-    943: ['','','Timeskip Franky','3D2Y Franky'],
-	944: ['','','Wedding Perona'],
-    945: ['','','Bride Perona'],
-    946: ['',''],
-    947: ['',''],
-    948: ['',''],
-    949: ['',''],
-    950: ['',''],
-    951: ['',''],
-    952: ['',''],
-    953: ['',''],
-	954: ['',''],
-    955: ['',''],
-    956: ['',''],
-    957: ['',''],
-    958: ['',''],
-    959: ['',''],
-    960: ['',''],
-    961: ['',''],
-	962: ['',''],
-    963: ['',''],
-    964: ['',''],
-    965: ['',''],
-    966: ['',''],
-    967: ['',''],
-    968: ['',''],
-    969: ['',''],
-	970: ['',''],
-    971: ['',''],
-    972: ['',''],
-    973: ['',''],
-    974: ['','']
+    934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei'],
+    935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei'],
+    936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者','','Timeskip Luffy','3D2Y Luffy'],
+    937: ['モンキー・Ｄ・ルフィ 仲間との誓い『３Ｄ２Ｙ』','','Timeskip Luffy','3D2Y Luffy'],
+    938: ['ナミ 天候の科学の探求者','','Timeskip Nami','3D2Y Nami'],
+    939: ['ナミ 空島ウェザリアの泥棒ネコ','','Timeskip Nami','3D2Y Nami'],
+    940: ['ウソップ ボーイン列島の大食漢','','Timeskip Usopp','3D2Y Usopp'],
+    941: ['ウソップ おいはぎの森の果敢な戦士','','Timeskip Usopp','3D2Y Usopp'],
+    942: ['フランキー メカアニマルと戦う改造人間','','Timeskip Franky','3D2Y Franky'],
+    943: ['鉄人（サイボーグ）フランキー バルジモアの霊獣','','Timeskip Franky','3D2Y Franky'],
+	944: ['？？？','','Wedding Perona'],
+    945: ['？？？','','Bride Perona'],
+    946: ['ラクヨウ 白ひげ海賊団７番隊隊長',''],
+    947: ['フォッサ 白ひげ海賊団１５番隊隊長',''],
+    948: ['クリエル 白ひげ海賊団１０番隊隊長',''],
+    949: ['サッチ 白ひげ海賊団４番隊隊長',''],
+    950: ['？？？',''],
+    951: ['？？？',''],
+    952: ['？？？',''],
+    953: ['？？？',''],
+	954: ['ギャロ',''],
+    955: ['マクロ',''],
+    956: ['タンスイ',''],
+    957: ['早業のガンマン 青のボディガード',''],
+    958: ['計略のガンマン 黒のボディガード',''],
+    959: ['技巧のガンマン 緑のボディガード',''],
+    960: ['速攻のガンマン 青のボディガード',''],
+    961: ['豪腕のガンマン 赤のボディガード',''],
+	962: ['強心のガンマン 黄のボディガード',''],
+    963: ['チャルロス聖',''],
+    964: ['ロズワード聖',''],
+    965: ['シャルリア宮',''],
+    966: ['ユースタス・キッド 超新星（スーパールーキー）',''],
+    967: ['トラファルガー・ロー 超新星（スーパールーキー）',''],
+    968: ['パシフィスタ　ＰＸ－1',''],
+    969: ['パシフィスタ　ＰＸ－2',''],
+	970: ['パシフィスタ　ＰＸ－３',''],
+    971: ['パシフィスタ　ＰＸ－４',''],
+    972: ['パシフィスタ　ＰＸ－５',''],
+    973: ['戦桃丸',''],
+    974: ['戦桃丸 海軍本部科学部隊隊長','']
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index d819f5a41..da977a42e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -455,6 +455,27 @@ window.drops = {
             "10": [ 893 ],
             "11": [ 893 ],
             "12": [ 406, 815 ]
+        },
+        
+        {
+            name: "Sabaody Archipelago",
+            shortName: "Sabaody Archipelago",
+            thumb: 964,
+            completion: '5x Rainbow Gems',
+            "01": [ 620, 111 ],
+            "02": [ 954 ],
+            "03": [ 623, 113],
+            "04": [ 955 ],
+            "05": [ 625, 114],
+            "06": [ 956 ],
+            "07": [ 954, 955, 956 ],
+            "08": [ 114, 163, 164, 957, 958, 959, 960, 961, 962, 963 ],
+            "09": [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 967 ],
+            "10": [ 95, 97, 142, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 965, 966 ],
+            "11": [],
+            "12": [],
+            "13": [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
+            "14": [ 111, 112, 113, 114, 185, 186, 187, 691, 693, 695, 968, 969, 970, 972, 973 ]
         }
         
     ],
diff --git a/common/data/families.js b/common/data/families.js
index 4725048fe..21e07e40e 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -955,12 +955,12 @@ window.families = [
 	"Gyaro",
 	"Makuro",
 	"Tansui",
-	"Blue Gunner Bodyguard",
-	"Black Gunner Bodyguard",
-	"Green Gunman Bodyguard",
-	"Blue Gunman Bodyguard",
-	"Red Gunman Bodyguard",
-	"Yellow Gunman Bodyguard",
+	"Bodyguard",
+	"Bodyguard",
+	"Bodyguard",
+	"Bodyguard",
+	"Bodyguard",
+	"Bodyguard",
 	"Charloss",
 	"Roswald",
 	"Shalulia",
diff --git a/common/data/gw.js b/common/data/gw.js
index 095db518d..1615955e2 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 533428235..3eca3e9aa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -952,25 +952,25 @@ window.units = [
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, null, 1431, 690, 110, 2599, 1271, 271, null],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, 935, 375, 163, null],
  	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, 1403, 800, 229, null],
-	[ "Gyaro", "QCK", [ "Slasher", "Tough" ], 3, 7, 6, 2, 50, null, null, null, null, null, null, null, null],
-	[ "Makuro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, null, null, null, null, null, null, null, null],
-	[ "Tansui", "INT", [ "Fighter", "Tough" ], 3, 7, 4, 2, 50, null, null, null, null, null, null, null, null],
-	[ "Blue Gunner Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, null, 72, 57, 59, null, null, null, null],
-	[ "Black Gunner Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, null, 64, 64, 57, null, null, null, null],
-	[ "Green Gunman Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, null, 80, 69, 51, null, null, null, null],
-	[ "Blue Gunman Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, null, 84, 66, 52, null, null, null, null],
-	[ "Red Gunman Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, null, 82, 80, 44, null, null, null, null],
-	[ "Yellow Gunman Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, null, 89, 73, 46, null, null, null, null],
-	[ "Saint Charloss", "STR", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, 25, 554, -400, null],
-	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, null, null, null, null],
-	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, null, null, null, null, null, null, null, null],
-	[ "Super Rookie Eustass Kid", "QCK", [ "Ambition", "Striker" ], 4, 20, 5, 3, 99, null, 462, 299, 19, null, null, null, null],
-	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, null, null, null, null, 2035, 1013, 243, null],
-	[ "Pacifista PX-1", "DEX", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
-	[ "Pacifista PX-2", "PSY", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
-	[ "Pacifista PX-3", "QCK", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
-	[ "Pacifista PX-4", "STR", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
-	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, null, 2000, 1000, -100, 2009, 1016, 0, null],
-	[ "Sentoumaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, null, null, null, null, 1202, 557, 137, null],
-	[ "Sentoumaru Evolved", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, null, 1125, 497, 92, null, null, null, null]
+	[ "Gyaro", "QCK", [ "Slasher", "Tough" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
+	[ "Makuro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
+	[ "Tansui", "INT", [ "Fighter", "Tough" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
+	[ "Blue Gunner Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
+	[ "Black Gunner Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
+	[ "Green Gunman Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
+	[ "Blue Gunman Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 84, 66, 52, 805, 612, 236, 1],
+	[ "Red Gunman Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, 1123790, 82, 80, 44, 821, 700, 204, 1],
+	[ "Yellow Gunman Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
+	[ "Saint Charloss", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
+	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, 1000000, 6, 334, -600, 30, 601, -500, 1],
+	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 0],
+	[ "Super Rookie Eustass Kid", "QCK", [ "Ambition", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
+	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
+	[ "Pacifista PX-1", "DEX", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-2", "PSY", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-3", "QCK", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-4", "STR", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Sentoumaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
+	[ "Sentoumaru Evolved", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1]
 ];

From de44cf93a1e2bc8e1ce50333fb1c8e3b1bc170fb Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 10 Mar 2016 13:24:09 +0100
Subject: [PATCH 0164/1569] Quickfix Drop + Completion

---
 common/data/drops.js | 2 +-
 common/data/units.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index da977a42e..5f8e5c5b6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -471,7 +471,7 @@ window.drops = {
             "07": [ 954, 955, 956 ],
             "08": [ 114, 163, 164, 957, 958, 959, 960, 961, 962, 963 ],
             "09": [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 967 ],
-            "10": [ 95, 97, 142, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 965, 966 ],
+            "10": [ 95, 97, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 965, 966 ],
             "11": [],
             "12": [],
             "13": [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
diff --git a/common/data/units.js b/common/data/units.js
index 3eca3e9aa..5d3b1fbcf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -963,7 +963,7 @@ window.units = [
 	[ "Yellow Gunman Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
 	[ "Saint Charloss", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
 	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, 1000000, 6, 334, -600, 30, 601, -500, 1],
-	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 0],
+	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
 	[ "Super Rookie Eustass Kid", "QCK", [ "Ambition", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
 	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
 	[ "Pacifista PX-1", "DEX", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],

From 00f66cbb8bc7d95d8e9aa4755e4e9906e0b5c990 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 10 Mar 2016 09:59:05 -0600
Subject: [PATCH 0165/1569] Specials/Captains

for damage calculator
---
 common/data/captains.js   | 82 +++++++++++++++++++++++++++++++++++++++
 common/data/details.js    |  8 ++--
 common/data/evolutions.js |  6 ++-
 common/data/specials.js   | 42 +++++++++++++++++++-
 4 files changed, 132 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 7b94d4931..a65054ed7 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2244,5 +2244,87 @@ window.captains = {
 	},
 	949: {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+	},
+	950: {
+		hitAtk: function(p) {
+			if (!p.unit.class.has("Fighter") || !p.unit.class.has("Free Spirit")) return 1;
+			return p.modifiers.slice(0, p.chainPosition)
+				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+	951: {
+		hitAtk: function(p) {
+			if (!p.unit.class.has("Fighter") || !p.unit.class.has("Free Spirit")) return 1;
+			return p.modifiers.slice(0, p.chainPosition)
+				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+	952: {
+		atk: function(p) {
+			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
+		},
+		hp: function(p) {
+			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
+		}
+	},
+	953: {
+		atk: function(p) {
+			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
+		},
+		hp: function(p) {
+			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
+		}
+	},
+	954: {
+		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+		hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+	},
+	955: {
+		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+	},
+	956: {
+		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+		hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+	},
+	963: {
+		atk: function(p) { 
+			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 2; 
+			return 1;
+		}
+	},
+	964: {
+		atk: function(p) { 
+			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+			return 1;
+		},
+		hp: function(p) { 
+			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+			return 1;
+		},
+		rcv: function(p) { 
+			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+			return 1;
+		}
+	},
+	965: {
+		atk: function(p) { 
+			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+			return 1;
+		}
+	},
+	966: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 2.25 : 1; }
+	},
+	967: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+	},
+	973: {
+		atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2 : 1; }
+	},
+	974: {
+		atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.5 : 1; }
 	}
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index a95e6bc86..2f504797f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4433,15 +4433,15 @@ window.details = {
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
 	},
 	950: {
-		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
+		captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
 		specialName: "Flame Commandment: Fire Pillar",
-		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+		special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
 		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
 	},
 	951: {
-		captain: "Boosts ATK of Brawler and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
+		captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
 		specialName: "Flame Commandment: Fire Pillar",
-		special: "Reduces Special Cooldown of Brawler and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+		special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
 		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
 	},
 	952: {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 9ef01c579..0821d16f0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1446,5 +1446,9 @@ window.evolutions = {
     952: {
         evolution: 953,
         evolvers: [ 116, 117, 80, 86, 97 ]
-    }
+    },
+	973: {
+		evolution: 974,
+		evolvers: [ [ 117, 971 ], [ 87, 968], [ 98, 970], [ 87, 969], [ 117, 972] ]
+	}
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 2b95f2803..84d6d9a66 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1086,5 +1086,45 @@ window.specials = {
 	947: {
 		atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.3 : 1; },
 		type: "type"
-    }
+    },
+	954: {
+		def: function(p) { return 0.2; }		
+	},
+	955: {
+		atk: function(p) { return p.defenseDown ? 1.2 : 1; },
+		type: "condition"
+	},
+	956: {
+		atk: function(p) { return p.unit.class.has("Tough") ? 1.2 : 1; }
+	},
+	961: {
+		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+	},
+	963: {
+		def: function(p) { return 0; }
+	},
+	965: {
+		atk: function(p) { return window.specials[965].multiplier; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (window.specials[965].multiplier == 1.5 ? 1 : 0);
+			window.specials[965].multiplier = [1.1, 1.5][n];
+			p.scope.notify({
+				text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
+				name: '965warning'
+			});
+		}
+	},
+	966: {
+		atk: function(p) { return window.specials[966].multiplier; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (window.specials[966].multiplier == 1.5 ? 1 : 0);
+			window.specials[966].multiplier = [1.1, 1.5][n];
+			p.scope.notify({
+				text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
+				name: '965warning'
+			});
+		}
+	}
 };
\ No newline at end of file

From 1201e40cbaf72bcfbdb488695534280b1a964e4a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 10 Mar 2016 10:24:08 -0600
Subject: [PATCH 0166/1569] fixes

special/captain fixes
---
 common/data/captains.js |  6 +++---
 common/data/specials.js | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a65054ed7..80de3d805 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2247,7 +2247,7 @@ window.captains = {
 	},
 	950: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Fighter") || !p.unit.class.has("Free Spirit")) return 1;
+			if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
 				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
 		},
@@ -2255,9 +2255,9 @@ window.captains = {
 	},
 	951: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Fighter") || !p.unit.class.has("Free Spirit")) return 1;
+			if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
-				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 : 1;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
diff --git a/common/data/specials.js b/common/data/specials.js
index 84d6d9a66..ae635364a 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1103,24 +1103,24 @@ window.specials = {
 	963: {
 		def: function(p) { return 0; }
 	},
-	965: {
-		atk: function(p) { return window.specials[965].multiplier; },
+	964: {
+		atk: function(p) { return window.specials[964].multiplier; },
 		type: "class",
 		onActivation: function(p) {
-			var n = (window.specials[965].multiplier == 1.5 ? 1 : 0);
-			window.specials[965].multiplier = [1.1, 1.5][n];
+			var n = (window.specials[964].multiplier == 1.1 ? 1 : 0);
+			window.specials[964].multiplier = [1.1, 1.5][n];
 			p.scope.notify({
 				text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
 				name: '965warning'
 			});
 		}
 	},
-	966: {
-		atk: function(p) { return window.specials[966].multiplier; },
+	965: {
+		atk: function(p) { return window.specials[965].multiplier; },
 		type: "class",
 		onActivation: function(p) {
-			var n = (window.specials[966].multiplier == 1.5 ? 1 : 0);
-			window.specials[966].multiplier = [1.1, 1.5][n];
+			var n = (window.specials[965].multiplier == 1.1 ? 1 : 0);
+			window.specials[965].multiplier = [1.1, 1.5][n];
 			p.scope.notify({
 				text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
 				name: '965warning'

From fee1f4980151df508cc88997ff5bff39b329aba0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 10 Mar 2016 10:38:07 -0600
Subject: [PATCH 0167/1569] keimi mission

added
---
 common/data/drops.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 5f8e5c5b6..41068d51f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -819,6 +819,8 @@ window.drops = {
             name: 'Keimi and Hachi\'s Takoyaki Shop!',
             thumb: 635,
             condition: 'No Units above the cost of 49 is allowed',
+			challenge: 'Total number of hits over 50,000',
+            challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, Orb Matching Forbidden Book']],
             Expert: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ],
             Elite: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
         },

From fca52706eb46adab76f403ca71db827dd9fe1b49 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 10 Mar 2016 10:41:09 -0600
Subject: [PATCH 0168/1569] text changes

remove Skull Book
---
 common/data/drops.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 41068d51f..8e77c43b0 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -624,7 +624,7 @@ window.drops = {
             thumb: 268,
             global: true,
             challenge: 'Total Damage dealt to enemies',
-            challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems & 1x Skull Book']],
+            challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems, 1x Forbidden Tome']],
             Expert: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ],
             Elite: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
         },
@@ -783,7 +783,7 @@ window.drops = {
             thumb: 571,
             global: true,
             challenge: 'Total number of hits over 50,000',
-            challengeData: [['3 Times','1x Red Elder'],['12 Times','1x RCV Cotton Candy'],['34 Times','3x Rainbow Gems & 1x Skull Book']],
+            challengeData: [['3 Times','1x Red Elder'],['12 Times','1x RCV Cotton Candy'],['34 Times','3x Rainbow Gems & 1x Forbidden Tome']],
             Expert: [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ],
             Elite: [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ]
         },
@@ -820,7 +820,7 @@ window.drops = {
             thumb: 635,
             condition: 'No Units above the cost of 49 is allowed',
 			challenge: 'Total number of hits over 50,000',
-            challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, Orb Matching Forbidden Book']],
+            challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, 1x Orb Matching Forbidden Tome']],
             Expert: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ],
             Elite: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
         },

From 8398e1c2b48f7d7d2247335fd92d679c930af064 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 10 Mar 2016 14:26:22 -0600
Subject: [PATCH 0169/1569] name changes

for new units
---
 common/data/aliases.js  |  4 ++--
 common/data/details.js  | 12 ++++++------
 common/data/families.js |  4 ++--
 common/data/tandems.js  |  7 ++++++-
 common/data/units.js    | 16 ++++++++--------
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index e976a07f8..ea5b26d8d 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -971,6 +971,6 @@ window.aliases = {
 	970: ['パシフィスタ　ＰＸ－３',''],
     971: ['パシフィスタ　ＰＸ－４',''],
     972: ['パシフィスタ　ＰＸ－５',''],
-    973: ['戦桃丸',''],
-    974: ['戦桃丸 海軍本部科学部隊隊長','']
+    973: ['戦桃丸','','Sentoumaru'],
+    974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru']
 };
diff --git a/common/data/details.js b/common/data/details.js
index 2f504797f..cda2c2cb4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4456,17 +4456,17 @@ window.details = {
 	},
 	954:{
 		captain: "Boosts ATK and HP of [QCK] Characters by 1.5x",
-		specialName: "Gyaro Special",
+		specialName: "Goldfish Fencing! I'll Dye the Sea Red with Your Blood",
 		special: "Reduces the defense of all enemies by 80% for 2 turns"
 	},
 	955:{
 		captain: "Boosts ATK and HP of [PSY] Characters by 1.5x",
-		specialName: "Makuro Special",
+		specialName: "Get Rich Quick Scheme! We're All Gonna Be Rich",
 		special: "Boosts ATK against enemies with reduced defense by 1.2x for 2 turns"
 	},
 	956:{
 		captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
-		specialName: "Tansui Special",
+		specialName: "Fishman karate! I'll Finish You",
 		special: "Boosts ATK of Touch characters by 1.2x for 2 turns"
 	},
 	957:{
@@ -4495,7 +4495,7 @@ window.details = {
 	},
 	963:{
 		captain: "Boosts ATK of characters with cost between 50 and 55 by 2x",
-		specialName: "Charloss Special",
+		specialName: "Saint Charloss' Stroll",
 		special: "Reduces the defense of all enemies by 100% for 1 turn and randomizes all orbs"
 	},
 	964:{
@@ -4516,7 +4516,7 @@ window.details = {
 	},
 	967:{
 		captain: "Boosts ATK of Free Spirit Characters by 2.25x",
-		specialName: "Trafalgar Law Special",
+		specialName: "Surgeon of Death's First Aid Surgery",
 		special: "Recovers 20x character's RCV in HP. Switches orbs between slots twice"
 	},
 	968:{
@@ -4548,5 +4548,5 @@ window.details = {
 		captain: "Boosts ATK of Tough Characters by 2.5x if HP is above 99% at the start of the turn",
 		specialName: "Sentoumaru Special",
 		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
-	},
+	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index 21e07e40e..b581e4386 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -971,6 +971,6 @@ window.families = [
 	"Pacifista",
 	"Pacifista",
 	"Pacifista",
-	"Sentoumaru",
-	"Sentoumaru"
+	"Sentomaru",
+	"Sentomaru"
 ];
\ No newline at end of file
diff --git a/common/data/tandems.js b/common/data/tandems.js
index 30b15fa20..5c3deff09 100644
--- a/common/data/tandems.js
+++ b/common/data/tandems.js
@@ -318,5 +318,10 @@ window.tandems = [
         "name": "Giant Pirates' Charge",
         "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Tough characters by 1.4x until the end of the current turn",
         "units": [ 884, 903 ]
-    }
+    },
+	{
+		"name": "Kidnapping Trio Rampage",
+		"desc": "Deals 3,000 fixed damage to all enemies",
+		"units": [ 954, 955, 956 ]
+	}
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 5d3b1fbcf..457a7bc2d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -955,12 +955,12 @@ window.units = [
 	[ "Gyaro", "QCK", [ "Slasher", "Tough" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
 	[ "Makuro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
 	[ "Tansui", "INT", [ "Fighter", "Tough" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
-	[ "Blue Gunner Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
-	[ "Black Gunner Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
-	[ "Green Gunman Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
-	[ "Blue Gunman Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 84, 66, 52, 805, 612, 236, 1],
-	[ "Red Gunman Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, 1123790, 82, 80, 44, 821, 700, 204, 1],
-	[ "Yellow Gunman Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
+	[ "Agile Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
+	[ "Tricky Gunman, Black Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
+	[ "Fine Gunman, Green Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
+	[ "Swift Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 84, 66, 52, 805, 612, 236, 1],
+	[ "Strong Gunman, Red Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, 1123790, 82, 80, 44, 821, 700, 204, 1],
+	[ "Heart Gunman, Yellow Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
 	[ "Saint Charloss", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
 	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, 1000000, 6, 334, -600, 30, 601, -500, 1],
 	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
@@ -971,6 +971,6 @@ window.units = [
 	[ "Pacifista PX-3", "QCK", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-4", "STR", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Sentoumaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
-	[ "Sentoumaru Evolved", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1]
+	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
+	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1]
 ];

From a668aa0c4a3ce9a4f3e1194e05605da3035715f7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 11 Mar 2016 10:22:59 +0100
Subject: [PATCH 0170/1569] Hotfix

---
 common/data/details.js    | 4 ++--
 common/data/drops.js      | 4 ++--
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index cda2c2cb4..65d680a16 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4392,12 +4392,12 @@ window.details = {
 	},
 	942: {
 		captain: "Boosts ATK and HP of [STR] Characters by 1.5x",
-		specialName: "Future Country's Big Incident: The Nightmare of Barujimoa",
+		specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
 		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	943: {
 		captain: "Boosts ATK of [STR] Characters by 2.25x and their HP by 1.75x",
-		specialName: "Future Country's Big Incident: The Nightmare of Barujimoa",
+		specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
 		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	944: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 8e77c43b0..1268932c7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -861,8 +861,8 @@ window.drops = {
             name: "T-Bone's Absolute Justice",
             thumb: 724,
             condition: 'You can only bring INT, PSY and QCK units',
-            Expert: [ 721, 723, -590, -564, -563, -529, -526, -384, -361, -219 ],
-            Elite: [ 721, 723, -590, -564, -563, -529, -526, -384, -361, -219 ]
+            Expert: [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ],
+            Elite: [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ]
         },
 
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0821d16f0..96cdb5fe7 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1448,7 +1448,7 @@ window.evolutions = {
         evolvers: [ 116, 117, 80, 86, 97 ]
     },
 	973: {
-		evolution: 974,
+		evolution: [ 974, 974, 974, 974, 974 ],
 		evolvers: [ [ 117, 971 ], [ 87, 968], [ 98, 970], [ 87, 969], [ 117, 972] ]
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 457a7bc2d..99c6a444c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -941,7 +941,7 @@ window.units = [
 	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
 	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
 	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
-	[ "Cyborg Franky, Sacred Beast of Barujimoa", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
+	[ "Cyborg Franky, Sacred Beast of Baldimore", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
 	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],

From bef40a3e05dc1c632ca14af7ffdc21cc30fe49b0 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 12 Mar 2016 13:14:13 +0100
Subject: [PATCH 0171/1569] Kid Special

---
 common/data/details.js  | 4 ++--
 common/data/families.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 65d680a16..a465a6fb0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4511,8 +4511,8 @@ window.details = {
 	966:{
 		captain: "Boosts ATK of Ambition Characters by 2.25x",
 		specialName: "Kid Special",
-		special: "Empties all slots, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
-		specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: We do not know the values yet"
+		special: "Empties slots with [QCK] orbs, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
+		specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: 0 orbs - Can't activate; 1 orb - 14x ATK; 2 orbs - 21x ATK; 3 orbs - 35x ATK; 4 orbs - 49x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	967:{
 		captain: "Boosts ATK of Free Spirit Characters by 2.25x",
diff --git a/common/data/families.js b/common/data/families.js
index b581e4386..96363f725 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -964,8 +964,8 @@ window.families = [
 	"Charloss",
 	"Roswald",
 	"Shalulia",
-	"Kid",
-	"Law",
+	"Eustass Kid",
+	"Trafalgar Law",
 	"Pacifista",
 	"Pacifista",
 	"Pacifista",

From 40da557abca530b7faa9d7529c684fbfac09a319 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 12 Mar 2016 22:15:59 +0100
Subject: [PATCH 0172/1569] Mini fixes

Fixes #24
---
 characters/css/edgy.css     | 7 +++++++
 characters/js/directives.js | 2 +-
 common/data/details.js      | 2 +-
 common/data/evolutions.js   | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/characters/css/edgy.css b/characters/css/edgy.css
index e267634f0..b2a91d43c 100644
--- 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/js/directives.js b/characters/js/directives.js
index 93279d53e..c57389f9c 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -390,7 +390,7 @@ directives.addLinks = function($stateParams) {
             }
             if (!isNaN(gw[id-1])) {
                 ul.append($('<li><a href="http://xn--pck6bvfc.gamewith.jp/article/show/' + gw[id-1] + '" target="_blank">' +
-                        'GameWith Page (Japanese)</a></li>'));
+                        'GameWith Page (Japanese)</a> | <a href="http://translate.google.com/translate?sl=ja&tl=en&u=http://xn--pck6bvfc.gamewith.jp/article/show/' + gw[id-1] + '" target="_blank">' +'Google Translate</a></li>'));
             }
             if (ul.children().length > 0)
                 element.append(ul);
diff --git a/common/data/details.js b/common/data/details.js
index a465a6fb0..fd877c259 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4467,7 +4467,7 @@ window.details = {
 	956:{
 		captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
 		specialName: "Fishman karate! I'll Finish You",
-		special: "Boosts ATK of Touch characters by 1.2x for 2 turns"
+		special: "Boosts ATK of Tough characters by 1.2x for 2 turns"
 	},
 	957:{
 		specialName: "Blue Gunner Special",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 96cdb5fe7..a6750cc88 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1417,7 +1417,7 @@ window.evolutions = {
     },
     934: {
         evolution: 935,
-        evolvers: [ 118, 88, 266, 304, 104 ]
+        evolvers: [ 118, 88, 266, 304, 267 ]
     },
     936: {
         evolution: 937,

From f665353901d42b439c24439c8bca84996d9529c3 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 13 Mar 2016 12:04:40 +0100
Subject: [PATCH 0173/1569] Report Fixes

---
 common/data/drops.js | 16 ++++++++--------
 common/data/units.js |  6 +++---
 common/js/utils.js   |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 1268932c7..9fa289354 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -460,15 +460,15 @@ window.drops = {
         {
             name: "Sabaody Archipelago",
             shortName: "Sabaody Archipelago",
-            thumb: 964,
+            thumb: 974,
             completion: '5x Rainbow Gems',
-            "01": [ 620, 111 ],
-            "02": [ 954 ],
-            "03": [ 623, 113],
-            "04": [ 955 ],
-            "05": [ 625, 114],
-            "06": [ 956 ],
-            "07": [ 954, 955, 956 ],
+            "01": [ 620, 111, 623, 113, 625, 114, 954, 955, 956 ],
+            "02": [ ],
+            "03": [ ],
+            "04": [ ],
+            "05": [ ],
+            "06": [ ],
+            "07": [ ],
             "08": [ 114, 163, 164, 957, 958, 959, 960, 961, 962, 963 ],
             "09": [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 967 ],
             "10": [ 95, 97, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 965, 966 ],
diff --git a/common/data/units.js b/common/data/units.js
index 99c6a444c..924728186 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -547,8 +547,8 @@ window.units = [
 	[ "Kami Eneru", "PSY", [ "Shooter", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
 	[ "Monkey D. Luffy Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
 	[ "Monkey D. Luffy Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
-	[ "Sadie-chan", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
-	[ "Sadie-chan, Impel Down's Chief Guard", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
+	[ "Sadie", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
+	[ "Sadie, Impel Down Chief Jailer", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
 	[ "Minokoala", "STR", [ "Fighter", "Tough" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
 	[ "Manticore", "QCK", [ "Fighter", "Tough" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
 	[ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Ambition" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
@@ -573,7 +573,7 @@ window.units = [
 	[ "Usopp Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
 	[ "Tony Tony Chopper Davy Back Fight: Mask", "PSY", [ "Fighter", "Knowledge" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
 	[ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
-	[ "Aokiji the Freezing Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
+	[ "Aokiji, Ice Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
 	[ "Tea Time Nami", "INT", [ "Striker", "Knowledge" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
 	[ "Monkey D. Luffy Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
 	[ "Monkey D. Luffy Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
diff --git a/common/js/utils.js b/common/js/utils.js
index f6fa48108..3326140d6 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -4,7 +4,7 @@ var FODDER_REGEX = new RegExp('(' + [
     'Group', 'Ensign Navy HQ', 'Armed \\w+ Unit', '[BM]illions Baroque', 'Eneru\'s Elect',
     'Skypiea (Guard|Enforcer)', 'Shandian',
     '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
-    'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^Giant.*Pirates',
+    'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
     '(Soldier|General) Zombie.*Shadow', 'Wild Zombie','Street Punk'
 ].join(')|(') + ')','i');
 

From 5038585a09c0c0acaa4b1698436dbe987bda5103 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 13 Mar 2016 12:08:21 +0100
Subject: [PATCH 0174/1569] Really not necessary Push

People keep asking for updates when we update jsut cause we don't update
the time on the index :|
---
 index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index bbfcc9e6b..dddbe93d2 100644
--- a/index.html
+++ b/index.html
@@ -52,7 +52,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>02/03/2016</p>
+            <p>13/03/2016</p>
             <br>
             <ul>
                 <li>Changed Silence to Despair</li>
@@ -62,7 +62,7 @@
                 <li>mode characters</li>
                 <li>So... many... characters...</li>
                 <br>
-                <li>Added Server Time to Drop Page</li>
+                <li>New Fixes like always</li>
             </ul>
         </div>
     </body>

From 0e11448f0bc99cb6ec5829a3b9f77f184ea10215 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 14 Mar 2016 13:33:21 +0100
Subject: [PATCH 0175/1569] Kid Smoker + Enel Ship

---
 common/data/aliases.js    |  4 +++-
 common/data/evolutions.js |  6 +++++-
 common/data/families.js   |  4 +++-
 common/data/ships.js      | 14 +++++++++++++-
 common/data/units.js      |  4 +++-
 index.html                | 10 ++++------
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ea5b26d8d..6e45eebe0 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -972,5 +972,7 @@ window.aliases = {
     971: ['パシフィスタ　ＰＸ－４',''],
     972: ['パシフィスタ　ＰＸ－５',''],
     973: ['戦桃丸','','Sentoumaru'],
-    974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru']
+    974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
+    975: ['？？？',''],
+    976: ['？？？','']
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a6750cc88..338c56267 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1450,5 +1450,9 @@ window.evolutions = {
 	973: {
 		evolution: [ 974, 974, 974, 974, 974 ],
 		evolvers: [ [ 117, 971 ], [ 87, 968], [ 98, 970], [ 87, 969], [ 117, 972] ]
-	}
+	},
+    975: {
+        evolution: 976,
+        evolvers: []
+    }
 };
diff --git a/common/data/families.js b/common/data/families.js
index 96363f725..c4f109522 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -972,5 +972,7 @@ window.families = [
 	"Pacifista",
 	"Pacifista",
 	"Sentomaru",
-	"Sentomaru"
+	"Sentomaru",
+    "Smoker",
+    "Smoker"
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index 9890ecee7..8f14c9ec5 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -181,7 +181,7 @@ window.ships = [
     { //14
         name: 'Kuja Pirate Ship',
         thumb: null,
-        description: 'Boosts ATK of Free Spirit characters by 1.5x and their HP by 1.35x, reduces the HP of everyone else by ?x. Special: heals the crew by 6,500HP (cooldown: 15 turns).',
+        description: 'Boosts ATK of Free Spirit characters by 1.5x and their HP by 1.35x, reduces the HP of everyone else by 99%. Special: heals the crew by 6,500HP (cooldown: 15 turns).',
         atk: function(p) {
             return !p.unit.class.has('Free Spirit') ? 1 :
             [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1];
@@ -190,6 +190,18 @@ window.ships = [
             return !p.unit.class.has('Free Spirit') ? 0.01 :
                 [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.35 ][p.boatLevel - 1];
         }
+    },
+    
+    { //15
+        name: 'Enel Ship',
+        thumb: null,
+        description: 'Boosts ATK of QCK and PSY characters by 1.5x and their HP by 1.2x. Special: Deals 56560 fixed Damage to all enemies (cooldown: 17 Turns)',
+        atk: function(p) {
+            return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
+        },
+        hp: function(p) {
+            return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.1, 1.2 ][p.boatLevel - 1] : 1;
+        }
     }
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 924728186..6a729739b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -972,5 +972,7 @@ window.units = [
 	[ "Pacifista PX-4", "STR", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
-	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1]
+	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
+    ["Kid Smoker","DEX",["Striker","Ambition"],4,10,null,null,null,null,null,null,null,null,null,null,null],
+    ["Kid Smoker Evolution","DEX",["Striker","Ambition"],5,18,null,null,null,null,null,null,null,null,null,null,null]
 ];
diff --git a/index.html b/index.html
index dddbe93d2..154182f94 100644
--- a/index.html
+++ b/index.html
@@ -52,15 +52,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>13/03/2016</p>
+            <p>14/03/2016</p>
             <br>
             <ul>
-                <li>Changed Silence to Despair</li>
-                <li>New Silence now refers to Special Blockers</li>
+                <li>Added Kid SMoker Preview</li>
                 <br>
-                <li>Updated with Sabaody Story</li>
-                <li>mode characters</li>
-                <li>So... many... characters...</li>
+                <li>Added Enel Ship</li>
+                <li>Max Stats are right everything else is guess work</li>
                 <br>
                 <li>New Fixes like always</li>
             </ul>

From d03f71186519fdc73731cb9ec08ecbc20b8879d9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 14 Mar 2016 09:21:03 -0500
Subject: [PATCH 0176/1569] fixed icons on defenses

buggy/chopper
---
 common/data/defenses.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/defenses.js b/common/data/defenses.js
index aea0396c1..bbecd33d8 100644
--- a/common/data/defenses.js
+++ b/common/data/defenses.js
@@ -113,15 +113,15 @@ window.defenses = [
     [ 'Manticore'                           , 'Sadi-chan Fortnight'                  , 'Expert', 552, 100 ],
     [ 'Sadi-chan'                           , 'Sadi-chan Fortnight'                  , 'Expert', 550, 750 ],
     [ 'DBF Usopp'                           , 'Afro Luffy Fortnight, mid round'      , 'Expert', 572, 150 ],
-    [ 'DBF Chopper'                         , 'Afro Luffy Fortnight'                 , 'Expert', 572, 70 ],
+    [ 'DBF Chopper'                         , 'Afro Luffy Fortnight'                 , 'Expert', 573, 70 ],
     [ 'DBF Usopp'                           , 'Afro Luffy Fortnight, last round'     , 'Expert', 572, 78 ],
     [ 'Afro Luffy'                          , 'Afro Luffy Fortnight'                 , 'Expert', 571, 85 ],
     [ 'Genbou'                              , 'Skypiea Warriors Fortnight'           , 'Expert', 581, 100 ],
     [ 'Kamakiri'                            , 'Skypiea Warriors Fortnight'           , 'Expert', 582, 90 ],
     [ 'Laki'                                , 'Skypiea Warriors Fortnight'           , 'Expert', 583, 65 ],
-    [ 'Young Buggy'                         , 'Young Pirates Fortnight'              , 'Expert', 599, 80 ],
+    [ 'Young Buggy'                         , 'Young Pirates Fortnight'              , 'Expert', 598, 80 ],
     [ 'Young Shanks'                        , 'Young Pirates Fortnight'              , 'Expert', 601, 100 ],
-    [ 'Young Buggy'                         , 'Young Pirates Fortnight, last round'  , 'Expert', 600, 100 ],
+    [ 'Young Buggy'                         , 'Young Pirates Fortnight, last round'  , 'Expert', 599, 100 ],
     [ 'Young Zeff'                          , 'Young Zeff Fortnight, 1st round'      , 'Expert', 606, 250 ],
     [ 'Young Patty'                         , 'Young Zeff Fortnight'                 , 'Expert', 608, 50 ],
     [ 'Young Carne'                         , 'Young Zeff Fortnight'                 , 'Expert', 609, 50 ],

From b3708fea94b2a8c0b6d9c1a343d9d2ac83564597 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 14 Mar 2016 15:39:27 -0500
Subject: [PATCH 0177/1569] Kuma test

testing Kuma damage
---
 common/data/effects.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index e08fedd81..e7a661336 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -178,7 +178,7 @@ window.effects = {
         description: 'Damage of STR and DEX characters nullified',
         thumb: 836,
         id: 19,  // don't change this
-        damage: function(p) { return p.type == 'STR' || p.type == 'DEX' ? 0 : 1; }
+        atk: function(p) { return p.type == 'STR' || p.type == 'DEX' ? 0 : 1; }
     },
 
     'Shu (Expert)': {

From 4e939bd89d26209794af9d565c18d6f4fcb1591e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 15 Mar 2016 11:48:18 +0100
Subject: [PATCH 0178/1569] Wedding Perona Complete

---
 common/data/units.js | 4 ++--
 index.html           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 6a729739b..b6988eca2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -942,8 +942,8 @@ window.units = [
 	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
 	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
 	[ "Cyborg Franky, Sacred Beast of Baldimore", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
-	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, null, 59, 34, 47, 814, 392, 223, null],
-	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, null, 740, 333, 172, 1787, 787, 390, null],
+	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, 392109, 59, 34, 47, 814, 392, 223, 1],
+	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, 3000000, 740, 333, 172, 1787, 787, 390, 1],
 	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
 	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
 	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
diff --git a/index.html b/index.html
index 154182f94..c14c7c649 100644
--- a/index.html
+++ b/index.html
@@ -55,7 +55,7 @@
             <p>14/03/2016</p>
             <br>
             <ul>
-                <li>Added Kid SMoker Preview</li>
+                <li>Added Kid Smoker Preview</li>
                 <br>
                 <li>Added Enel Ship</li>
                 <li>Max Stats are right everything else is guess work</li>

From 3304fcea1c9de9f0c7d1287fe894ca1011e4f7da Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 15 Mar 2016 11:21:19 -0500
Subject: [PATCH 0179/1569] Kid Smoker

Added some stats
---
 common/data/aliases.js   | 24 ++++++++++++------------
 common/data/captains.js  | 10 ++++++++++
 common/data/cooldowns.js |  4 +++-
 common/data/details.js   | 13 +++++++++++++
 common/data/flags.js     |  4 +++-
 common/data/specials.js  | 12 +++++++++++-
 common/data/units.js     |  2 +-
 7 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6e45eebe0..27d26eabe 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -340,16 +340,16 @@ window.aliases = {
     339: ['モズ',''],
     340: ['クラーケン スルメ',''],
     341: ['クラーケン 北極の怪物',''],
-    342: ['赤パワース豚（トーン）',''],
-    343: ['青パワース豚（トーン）',''],
-    344: ['緑パワース豚（トーン）',''],
-    345: ['黄パワース豚（トーン）',''],
-    346: ['黒パワース豚（トーン）',''],
-    347: ['ルビーパワース豚（トーン）',''],
-    348: ['サファイアパワース豚（トーン）',''],
-    349: ['エメラルドパワース豚（トーン）',''],
-    350: ['トパーズパワース豚（トーン）',''],
-    351: ['アメジストパワース豚（トーン）',''],
+    342: ['赤パワース豚（トーン）','','pig','pork'],
+    343: ['青パワース豚（トーン）','','pig','pork'],
+    344: ['緑パワース豚（トーン）','','pig','pork'],
+    345: ['黄パワース豚（トーン）','','pig','pork'],
+    346: ['黒パワース豚（トーン）','','pig','pork'],
+    347: ['ルビーパワース豚（トーン）','','pig','pork'],
+    348: ['サファイアパワース豚（トーン）','','pig','pork'],
+    349: ['エメラルドパワース豚（トーン）','','pig','pork'],
+    350: ['トパーズパワース豚（トーン）','','pig','pork'],
+    351: ['アメジストパワース豚（トーン）','','pig','pork'],
     352: ['ゼファー',''],
     353: ['ゼファー NEO海軍総帥',''],
     354: ['アイン',''],
@@ -973,6 +973,6 @@ window.aliases = {
     972: ['パシフィスタ　ＰＸ－５',''],
     973: ['戦桃丸','','Sentoumaru'],
     974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
-    975: ['？？？',''],
-    976: ['？？？','']
+    975: ['？？？','','Kid Smoker'],
+    976: ['？？？','','Kid Smoker']
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 80de3d805..1bd938217 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2326,5 +2326,15 @@ window.captains = {
 	},
 	974: {
 		atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.5 : 1; }
+	},
+	975: {
+		atk: function(p) {
+			return p.unit.class.has("Striker") || p.unit.class.has("Ambition") ? 2 : 1;
+		}
+	},
+	976: {
+		atk: function(p) {
+			return p.unit.class.has("Striker") || p.unit.class.has("Ambition") ? 2 : 1;
+		}
 	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 62646b125..42272f2f8 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -972,5 +972,7 @@ window.cooldowns = [
 	[ 28, 20 ],
 	[ 28, 20 ],
 	22,
-	22
+	22,
+	[ 15, 15 ],
+	[ 15, 15 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index fd877c259..fa8a918b6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4548,5 +4548,18 @@ window.details = {
 		captain: "Boosts ATK of Tough Characters by 2.5x if HP is above 99% at the start of the turn",
 		specialName: "Sentoumaru Special",
 		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
+	},
+	975:{
+		captain: "Boosts ATK of Ambition Characters by 2x. Reduces damage received by 10%",
+		specialName: "Kid Smoker Special",
+		special: "Boosts the ATK of Striker and Ambition Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+		specialNotes: "#{zombie}"
+	},
+	976:{
+		captain: "Boosts ATK of Ambition Characters by 2x. Reduces damage received by 10%",
+		specialName: "Kid Smoker Special",
+		special: "Boosts the ATK of Striker and Ambition Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+		specialNotes: "#{zombie}"
 	}
+
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 4714a4867..8e1cf8a42 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -762,5 +762,7 @@ window.flags = {
 	942: { rr: 1, rro: 1 },
 	943: { rr: 1, rro: 1 },
 	944: { rr: 1, rro: 1, lrr: 1 },
-	945: { rr: 1, rro: 1, lrr: 1 }
+	945: { rr: 1, rro: 1, lrr: 1 },
+	975: { rr: 1, rro: 1, lrr: 1 },
+	976: { rr: 1, rro: 1, lrr: 1 }
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index ae635364a..7418bcdef 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1126,5 +1126,15 @@ window.specials = {
 				name: '965warning'
 			});
 		}
-	}
+	},
+	975: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 1.3 : 1; },
+		atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
+		type: "class"
+    },
+	976: {
+		atk: function(p) { return p.unit.class.has("Ambition") ? 1.3 : 1; },
+		atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
+		type: "class"
+    }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b6988eca2..2d66d323c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -974,5 +974,5 @@ window.units = [
 	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
     ["Kid Smoker","DEX",["Striker","Ambition"],4,10,null,null,null,null,null,null,null,null,null,null,null],
-    ["Kid Smoker Evolution","DEX",["Striker","Ambition"],5,18,null,null,null,null,null,null,null,null,null,null,null]
+    ["Kid Smoker Evolution","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null]
 ];

From 67e12b94d982b73b5f1bbf507e8fc69c70b21110 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 15 Mar 2016 13:06:06 -0500
Subject: [PATCH 0180/1569] updated Kid Smoker

---
 common/data/captains.js | 5 -----
 common/data/details.js  | 6 +++---
 common/data/units.js    | 4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1bd938217..abab8fcce 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2327,11 +2327,6 @@ window.captains = {
 	974: {
 		atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.5 : 1; }
 	},
-	975: {
-		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Ambition") ? 2 : 1;
-		}
-	},
 	976: {
 		atk: function(p) {
 			return p.unit.class.has("Striker") || p.unit.class.has("Ambition") ? 2 : 1;
diff --git a/common/data/details.js b/common/data/details.js
index fa8a918b6..81c552602 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4550,14 +4550,14 @@ window.details = {
 		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
 	},
 	975:{
-		captain: "Boosts ATK of Ambition Characters by 2x. Reduces damage received by 10%",
-		specialName: "Kid Smoker Special",
+		captain: "Reduces damage received by 10%",
+		specialName: "A Threat That Puts Adults to Shame",
 		special: "Boosts the ATK of Striker and Ambition Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
 		specialNotes: "#{zombie}"
 	},
 	976:{
 		captain: "Boosts ATK of Ambition Characters by 2x. Reduces damage received by 10%",
-		specialName: "Kid Smoker Special",
+		specialName: "A Threat That Puts Adults to Shame",
 		special: "Boosts the ATK of Striker and Ambition Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
 		specialNotes: "#{zombie}"
 	}
diff --git a/common/data/units.js b/common/data/units.js
index 2d66d323c..41dec7dd2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -973,6 +973,6 @@ window.units = [
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
-    ["Kid Smoker","DEX",["Striker","Ambition"],4,10,null,null,null,null,null,null,null,null,null,null,null],
-    ["Kid Smoker Evolution","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null]
+    [ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, null, 210, 86, 100, null,null,null,null],
+    [ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null]
 ];

From b3738575091134c0602fea63e93bd167a132b0dd Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 16 Mar 2016 11:05:55 +0100
Subject: [PATCH 0181/1569] Hina Challenge

---
 common/data/drops.js | 2 ++
 index.html           | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9fa289354..167ba4ec4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -605,6 +605,8 @@ window.drops = {
             name: 'Hina\'s Resort Getaway',
             thumb: 232,
             global: true,
+            challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
+            challengeData: [['150,000','Blue Elder'],['450,000','ATK Cotton Candy'],['750,000','3x Rainbow Gems']],
             Expert: [ 43, 49, 79, 85, 96, 106, 231, -230, -229, -221, -208, -62, -54 ],
             Elite: [ 43, 49, 96, 111, 117, 231, -230, -229, -221, -208 ]
         },
diff --git a/index.html b/index.html
index c14c7c649..c1e8a4db0 100644
--- a/index.html
+++ b/index.html
@@ -52,10 +52,10 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>14/03/2016</p>
+            <p>16/03/2016</p>
             <br>
             <ul>
-                <li>Added Kid Smoker Preview</li>
+                <li>Added Hina Challenge</li>
                 <br>
                 <li>Added Enel Ship</li>
                 <li>Max Stats are right everything else is guess work</li>

From 7848f910d558f5d385961d794c0579ff1e6863be Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 16 Mar 2016 14:30:07 +0100
Subject: [PATCH 0182/1569] Quick rename + more Help

---
 common/data/ships.js                | 2 +-
 damage/views/popup/instruction.html | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 8f14c9ec5..02407ac18 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -193,7 +193,7 @@ window.ships = [
     },
     
     { //15
-        name: 'Enel Ship',
+        name: 'Ark Maxim',
         thumb: null,
         description: 'Boosts ATK of QCK and PSY characters by 1.5x and their HP by 1.2x. Special: Deals 56560 fixed Damage to all enemies (cooldown: 17 Turns)',
         atk: function(p) {
diff --git a/damage/views/popup/instruction.html b/damage/views/popup/instruction.html
index f950be2cf..3c4c14669 100644
--- a/damage/views/popup/instruction.html
+++ b/damage/views/popup/instruction.html
@@ -41,6 +41,12 @@
                     <ul>
                        <li><tt>CTRL</tt>: Opens Defense Selection Window</li> 
                     </ul>
+                    <br>
+                    <b>Stat Window: (Under Units Window)</b>
+                    <ul>
+                        <li><tt>Drag Slider</tt>: Adjusts Health Percentage</li>
+                        <li><tt>Left Click on Health</tt>: Opens prompt where you can set HP or HP in %</li>
+                    </ul>
                 </div>
                 </div>
                 <div class="modal-footer">

From 92b13644c8e0cff9dea7673256a484e2fab44be3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 16 Mar 2016 08:45:17 -0500
Subject: [PATCH 0183/1569] Flags

Global flags
---
 common/data/drops.js | 1 +
 common/data/flags.js | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 167ba4ec4..396ddbc28 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -804,6 +804,7 @@ window.drops = {
         {
             name: 'Pirate Apprentices! Shanks and Buggy',
             thumb: 599,
+			global: true,
             condition: 'You cannot use any two units that are the same',
             Expert: [ 598, 600, -504, -467, -463, -414, -372, -332, -310, -77 ],
             Elite: [ 598, 600, -467, -463, -414, -372, -332, -310, -77 ]
diff --git a/common/data/flags.js b/common/data/flags.js
index 8e1cf8a42..cc1130cae 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -584,6 +584,10 @@ window.flags = {
 	595: { global: 1 },
 	596: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	597: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	598: { global: 1 },
+	599: { global: 1 },
+	600: { global: 1 },
+	601: { global: 1 },
 	602: { global: 1 },
 	603: { global: 1 },
 	604: { rr: 1, rro: 1, lrr: 1, global: 1 },

From 76664ccdcdb74d830374e3efd14ffbc26418d554 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 16 Mar 2016 09:27:49 -0500
Subject: [PATCH 0184/1569] filter cost

changed to 99
---
 characters/js/controllers.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index 3b85588e3..b6b385848 100644
--- 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 *
@@ -48,8 +48,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) {

From 5185f49e0c0fd782c8bd8ee5e9c01e269a415831 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 16 Mar 2016 16:48:29 -0500
Subject: [PATCH 0185/1569] update gamewith links

smoker kid
---
 common/data/gw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index 1615955e2..b7b6829a2 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365];
\ No newline at end of file

From 064dc5f89da9e169c2875fdafe97f9fb61abbde9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 18 Mar 2016 10:52:39 +0100
Subject: [PATCH 0186/1569] New Units

---
 common/data/units.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 41dec7dd2..20833391c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -973,6 +973,11 @@ window.units = [
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
-    [ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, null, 210, 86, 100, null,null,null,null],
-    [ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null]
+    	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, null, 210, 86, 100, null,null,null,null],
+    	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null],
+    	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, null, null, null, null, null, null, null, null,null,null,null],
+    	[ "Kizaru Evolution","QCK",["Shooter","Fighter"], 5, 50, null, null, null, null, null, null, null, null,null,null,null],
+    	[ "Izo","PSY",["Shooter","Knowledge"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
+    	[ "Blamenco","DEX",["Striker","Free Spirit"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
+    	[ "Namur","PSY",["Fighter","Tough"], 4, 25, null, null, null, null, null, null, null, null,null,null,null]
 ];

From f64bfb82db913d669354da5e7161f796ed52b1ec Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 18 Mar 2016 08:59:22 -0500
Subject: [PATCH 0187/1569] New Islands

Kizaru/WB pt 2
---
 common/data/drops.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 396ddbc28..4069d5289 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -978,13 +978,21 @@ window.drops = {
             Expert: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ],
             Elite: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
         },
+		
         {
-            name: "Encounter! Whitebeard Pirates!",
+            name: "Encounter! Whitebeard Pirates",
             thumb: 946,
             condition: "You can only bring PSY units",
             Expert: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738],
             Elite: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738]
-        }
+        },
+		
+		{
+			name: "Clash! Whitebeard Pirates",
+			condition: "You can only bring INT units",
+			Expert: [ 979, 980, 981, 949 ],
+			Elite: [ 979, 980, 981, 949 ]
+		}
 
     ],
 
@@ -1116,7 +1124,13 @@ window.drops = {
             thumb: 932,
             Master: [ 932 ],
             Expert: [ 932 ]
-        }
+        },
+		
+		{
+			name: 'Clash!! Kizaru',
+			Ultimate: [ 977 ],
+			Master: [ 977 ]
+		}
 
     ],
 

From b04b509ba26bcf92d201217d1e95676687cbece2 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 20 Mar 2016 00:31:55 -0500
Subject: [PATCH 0188/1569] Kizaru Added

stats & Stuffs
---
 common/data/details.js | 30 ++++++++++++++++++++++++++++++
 common/data/units.js   | 14 +++++++-------
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 81c552602..0be1dc2a2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4560,6 +4560,36 @@ window.details = {
 		specialName: "A Threat That Puts Adults to Shame",
 		special: "Boosts the ATK of Striker and Ambition Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
 		specialNotes: "#{zombie}"
+	},
+	977:{
+		captain: "Boosts ATK of Shooter Characters by 2x",
+		specialName: "Yata no Kagami (Sacred Mirror)",
+		special: [
+			{
+				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
+				"cooldown": 19
+			},
+			{
+				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain Miltiplier for 2 turns",
+				"cooldown": 25
+			}
+		],
+		specialNotes: "#{stages}"
+	},
+	978:{
+		captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight, boosts ATK of Shooter Characters by 2.25x and Health by 1.5x",
+		specialName: "Yata no Kagami (Sacred Mirror)",
+		special: [
+			{
+				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
+				"cooldown": 19
+			},
+			{
+				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain Miltiplier for 2 turns",
+				"cooldown": 25
+			}
+		],
+		specialNotes: "#{stages}"
 	}
 
 };
diff --git a/common/data/units.js b/common/data/units.js
index 20833391c..4c10db95f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -973,11 +973,11 @@ window.units = [
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
-    	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, null, 210, 86, 100, null,null,null,null],
-    	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null],
-    	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, null, null, null, null, null, null, null, null,null,null,null],
-    	[ "Kizaru Evolution","QCK",["Shooter","Fighter"], 5, 50, null, null, null, null, null, null, null, null,null,null,null],
-    	[ "Izo","PSY",["Shooter","Knowledge"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
-    	[ "Blamenco","DEX",["Striker","Free Spirit"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
-    	[ "Namur","PSY",["Fighter","Tough"], 4, 25, null, null, null, null, null, null, null, null,null,null,null]
+	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, null, 210, 86, 100, 610, 286, 273, null],
+	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null],
+	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, null, 221, 169, 36,  1241, 741, 160, null],
+	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, null, 1179, 665, 130, 2506, 1410, 277, null],
+	[ "Izo","PSY",["Shooter","Knowledge"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
+	[ "Blamenco","DEX",["Striker","Free Spirit"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
+	[ "Namur","PSY",["Fighter","Tough"], 4, 25, null, null, null, null, null, null, null, null,null,null,null]
 ];

From a5a2e430695de8e316731e8e65f05ffc78410078 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 20 Mar 2016 00:40:21 -0500
Subject: [PATCH 0189/1569] spelling

sp
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 0be1dc2a2..839557e3c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4570,7 +4570,7 @@ window.details = {
 				"cooldown": 19
 			},
 			{
-				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain Miltiplier for 2 turns",
+				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
 				"cooldown": 25
 			}
 		],
@@ -4585,7 +4585,7 @@ window.details = {
 				"cooldown": 19
 			},
 			{
-				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain Miltiplier for 2 turns",
+				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
 				"cooldown": 25
 			}
 		],

From bf545bef745b2bb918d80a1f3466c168f0b6dbe3 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 20 Mar 2016 15:50:39 +0100
Subject: [PATCH 0190/1569] Kizaru Push

---
 common/data/aliases.js    | 7 ++++++-
 common/data/details.js    | 4 ++--
 common/data/evolutions.js | 4 ++++
 common/data/families.js   | 7 ++++++-
 common/data/gw.js         | 2 +-
 common/data/units.js      | 6 +++---
 index.html                | 4 ++--
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 27d26eabe..ac25beef2 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -974,5 +974,10 @@ window.aliases = {
     973: ['戦桃丸','','Sentoumaru'],
     974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
     975: ['？？？','','Kid Smoker'],
-    976: ['？？？','','Kid Smoker']
+    976: ['？？？','','Kid Smoker'],
+    977: ['黄猿',''],
+    978: ['黄猿　光人間',''],
+    979: ['？？？',''],
+    980: ['？？？',''],
+    981: ['？？？','']
 };
diff --git a/common/data/details.js b/common/data/details.js
index 839557e3c..2ed75bd4a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4582,11 +4582,11 @@ window.details = {
 		special: [
 			{
 				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
-				"cooldown": 19
+				"cooldown": [19,5]
 			},
 			{
 				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
-				"cooldown": 25
+				"cooldown": [25,11]
 			}
 		],
 		specialNotes: "#{stages}"
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 338c56267..35e6d4252 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1454,5 +1454,9 @@ window.evolutions = {
     975: {
         evolution: 976,
         evolvers: []
+    },
+    977: {
+        evolution: 978,
+        evolvers: [ 118, 85, 266, 301, 101 ]
     }
 };
diff --git a/common/data/families.js b/common/data/families.js
index c4f109522..62ed6cf24 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -974,5 +974,10 @@ window.families = [
 	"Sentomaru",
 	"Sentomaru",
     "Smoker",
-    "Smoker"
+    "Smoker",
+    "Kizaru",
+    "Kizaru",
+    "Izo",
+    "Blamenco",
+    "Namule"
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index b7b6829a2..8ab97864d 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 4c10db95f..e368d8757 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -975,9 +975,9 @@ window.units = [
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
 	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, null, 210, 86, 100, 610, 286, 273, null],
 	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null],
-	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, null, 221, 169, 36,  1241, 741, 160, null],
-	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, null, 1179, 665, 130, 2506, 1410, 277, null],
+	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
+	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
 	[ "Izo","PSY",["Shooter","Knowledge"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
 	[ "Blamenco","DEX",["Striker","Free Spirit"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
-	[ "Namur","PSY",["Fighter","Tough"], 4, 25, null, null, null, null, null, null, null, null,null,null,null]
+	[ "Namule","PSY",["Fighter","Tough"], 4, 25, null, null, null, null, null, null, null, null,null,null,null]
 ];
diff --git a/index.html b/index.html
index c1e8a4db0..8017141fa 100644
--- a/index.html
+++ b/index.html
@@ -52,10 +52,10 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>16/03/2016</p>
+            <p>20/03/2016</p>
             <br>
             <ul>
-                <li>Added Hina Challenge</li>
+                <li>Added Kizaru</li>
                 <br>
                 <li>Added Enel Ship</li>
                 <li>Max Stats are right everything else is guess work</li>

From a0666b5d9dedd431de5ad223187161193abb1d68 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 20 Mar 2016 17:22:40 +0100
Subject: [PATCH 0191/1569] Kizaru Special Workaround

We really need to add Chain Additions to the code
---
 common/data/details.js  |  2 +-
 common/data/drops.js    |  6 +++---
 common/data/specials.js | 21 +++++++++++++++++++++
 common/data/units.js    |  4 ++--
 common/data/zombies.js  |  2 +-
 index.html              |  7 ++++---
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2ed75bd4a..ca7a934e6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4215,7 +4215,7 @@ window.details = {
 				"cooldown": 25
 			}
 		],
-		captain: "Boosts ATK of Tough characters by 2.25x, their HP by 1.5x, recovers 4x character's RCV in HP at the end of each turn",
+		captain: "Boosts ATK of Tough characters by 2.25x, their HP by 1.5x, recovers 2x character's RCV in HP at the end of each turn",
 		specialNotes: "#{stages}"
 	},
 	913: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 4069d5289..0938508c0 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -470,8 +470,8 @@ window.drops = {
             "06": [ ],
             "07": [ ],
             "08": [ 114, 163, 164, 957, 958, 959, 960, 961, 962, 963 ],
-            "09": [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 967 ],
-            "10": [ 95, 97, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 965, 966 ],
+            "09": [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 965, 967 ],
+            "10": [ 95, 97, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 966 ],
             "11": [],
             "12": [],
             "13": [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
@@ -1170,7 +1170,7 @@ var bonuses = [
     { type: 'stamina' , x: 3 , y: 0  },
     { type: 'stamina' , x: 6 , y: 5  },
     { type: 'stamina' , x: 6 , y: 12 },
-    { type: 'stamina' , x: 6 , y: 19, stop: 4 },
+    { type: 'stamina' , x: 6 , y: 19 },
     { type: 'drop'    , x: 6 , y: 1  },
     { type: 'drop'    , x: 6 , y: 8  },
     { type: 'drop'    , x: 6 , y: 15 },
diff --git a/common/data/specials.js b/common/data/specials.js
index 7418bcdef..37d5955cd 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1136,5 +1136,26 @@ window.specials = {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 1.3 : 1; },
 		atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
 		type: "class"
+    },
+    977: {
+        chainAdd: function(p) {return 1;},
+        chain: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
+        chainLimiter: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
+        onActivation: function(p) {
+            p.scope.notify({
+				text: 'Please reactivate this Special everytime you change anything',
+				name: '977warning'
+			});
+        }
+    },
+    978: {
+        chain: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
+        chainLimiter: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
+        onActivation: function(p) {
+            p.scope.notify({
+				text: 'Please reactivate this Special everytime you change anything',
+				name: '977warning'
+			});
+        }
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index e368d8757..fe7d931a0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -690,12 +690,12 @@ window.units = [
 	[ "Montblanc Noland", "INT", [ "Slasher", "Knowledge" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
 	[ "Montblanc Noland, Explorer and Admiral of the Lvneel Kingdom", "INT", [ "Slasher", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
 	[ "Naginata Corporal Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
-	[ "Pistol Corporal Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
+	[ "Rifle Corporal Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
 	[ "Saber Corporal Navy HQ", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 51, 34, 22, 466, 330, 111, 1 ],
 	[ "Bazooka Corporal Navy HQ", "STR", "Shooter", 2, 7, 4, 0, 35, 90778, 62, 50, 14, 598, 404, 64, 1 ],
 	[ "Knuckle Corporal Navy HQ", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 55, 48, 22, 522, 392, 82, 1 ],
 	[ "Naginata Major Navy HQ", "DEX", "Striker", 3, 13, 6, 1, 70, 1066998, 554, 250, 61, 1358, 645, 170, 1 ],
-	[ "Pistol Major Navy HQ", "QCK", "Shooter", 3, 13, 5, 1, 70, 1066998, 444, 244, 96, 1002, 568, 259, 1 ],
+	[ "Rifle Major Navy HQ", "QCK", "Shooter", 3, 13, 5, 1, 70, 1066998, 444, 244, 96, 1002, 568, 259, 1 ],
 	[ "Saber Major Navy HQ", "PSY", "Slasher", 3, 13, 6, 1, 70, 1066998, 411, 275, 86, 989, 737, 208, 1 ],
 	[ "Bazooka Major Navy HQ", "STR", "Shooter", 3, 13, 6, 1, 70, 1066998, 547, 362, 44, 1301, 833, 117, 1 ],
 	[ "Knuckle Major Navy HQ", "INT", "Fighter", 3, 13, 5, 1, 70, 1066998, 462, 351, 49, 1244, 876, 112, 1 ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 0aeaf2b45..beab872d7 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -201,7 +201,7 @@ window.zombies = {
     },
     912: { // SH Sanji
         type: 'healer',
-        multiplier: 4
+        multiplier: 2
     },
 	949: { //Fortnight Thatch
 		type: 'healer',
diff --git a/index.html b/index.html
index 8017141fa..4c6d491cc 100644
--- a/index.html
+++ b/index.html
@@ -56,9 +56,10 @@
             <br>
             <ul>
                 <li>Added Kizaru</li>
-                <br>
-                <li>Added Enel Ship</li>
-                <li>Max Stats are right everything else is guess work</li>
+                <li>Regarding his Special:</li>
+                <li>Currently a workaround that needs to be reset</li>
+                <li>everytime you change something</li>
+                <li>Will be fixed soon-ish</li>
                 <br>
                 <li>New Fixes like always</li>
             </ul>

From 0e186083da92fd21e551c913cadcb4ae91b6770a Mon Sep 17 00:00:00 2001
From: Hibashira <maximilian.stief@t-online.de>
Date: Sun, 20 Mar 2016 23:55:06 +0100
Subject: [PATCH 0192/1569] issue: Import Team into Slotplanner #23 added
 import-option in slotplaner that tries to import the current damage
 calculator team. also added tooltips for the slotplaner.

---
 slots/index.html            |  1 +
 slots/js/controllers.js     | 42 +++++++++++++++++++++++++++++++++++++
 slots/js/states.js          |  8 +++++++
 slots/views/main.html       | 16 ++++++++------
 slots/views/popup/copy.html | 20 ++++++++++++++++++
 5 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 slots/views/popup/copy.html

diff --git a/slots/index.html b/slots/index.html
index a36868ba8..c06e6f29f 100644
--- a/slots/index.html
+++ b/slots/index.html
@@ -27,6 +27,7 @@
         <script src="../common/libs/js/angular.min.js"></script>
         <script src="../common/libs/js/angular-ui-router.min.js"></script>
         <script src="../common/libs/js/bootstrap.min.js"></script>
+        <script src="../common/libs/js/jquery.noty.packaged.min.js"></script>
 
         <script src="../common/libs/js/interact.min.js"></script>
         <script src="../common/libs/js/jquery.longpress.js"></script>
diff --git a/slots/js/controllers.js b/slots/js/controllers.js
index 83b565be5..740ad03fa 100644
--- a/slots/js/controllers.js
+++ b/slots/js/controllers.js
@@ -76,7 +76,17 @@ controllers.MainCtrl = function($scope, $rootScope, $state, $stateParams, $contr
         for (var i=0;i<slotCount;++i)
             slot.slots.push({ id: [ 2, 3, 1, 6, 4][i], level: 5 });
     };
+        var notifications = { };
 
+    $rootScope.notify = function(data) {
+        data = jQuery.extend({ type: 'information' },data);
+        if (data.name && notifications[data[name]]) notifications[data[name]].close(); 
+        var notification = noty(jQuery.extend({ timeout: 2500, layout: 'topRight', theme: 'relax' }, data));
+        if (data.name) notifications[data[name]] = notification;
+        return notification;
+
+    };
+    
     $controller('StorageCtrl', { $scope: $scope });
     $controller('DismissalCtrl');
 
@@ -311,6 +321,38 @@ controllers.ResetCtrl = function($scope, $rootScope, $state) {
 
 };
 
+/******************
+ * CopyCtrl used to copy current Calc Team *
+ ******************/
+
+controllers.CopyCtrl = function($scope, $storage, $rootScope, $state){
+    var validate = function(data){
+        return data.team.some(function(unitData) {
+             return unitData.unit !== null;
+         });
+    };
+    
+    $scope.copyCurrentCalcTeam = function () {
+        var data = $storage.get('data');
+
+        if(validate(data)!== true){
+            $rootScope.notify({
+                text: 'No characters found.' + 
+                    ' Your current calc team seems to be empty.',
+                type: 'error'
+            });
+            $state.go('^');
+            return;
+        } 
+        
+        var result = data.team.map(function(unitData) {
+            return {uid:  unitData.unit !== null ? unitData.unit + 1 : unitData.unit, slots: []};
+        });
+        $rootScope.team = result;
+        $state.go('^');
+    };
+};
+
 /******************
  * Initialization *
  ******************/
diff --git a/slots/js/states.js b/slots/js/states.js
index c2af54c20..1162dc904 100644
--- a/slots/js/states.js
+++ b/slots/js/states.js
@@ -76,6 +76,14 @@ angular.module('optc').config(function($stateProvider, $urlRouterProvider) {
                     controller: 'ImageGeneratorCtrl'
                 }
             }
+        })
+        .state('main.copy',{
+            views:{
+                'popup@':{
+                    templateUrl: 'views/popup/copy.html',
+                    controller: 'CopyCtrl'
+                }
+            }
         });
 
 });
diff --git a/slots/views/main.html b/slots/views/main.html
index e7da0ea4e..3da6a365f 100644
--- a/slots/views/main.html
+++ b/slots/views/main.html
@@ -34,29 +34,33 @@
 
             <div id="buttonContainer">
 
-                <button class="btn btn-info" ui-sref="main.save" ng-disabled="!team.length">
+                <button class="btn color6" ui-sref="main.copy"  uib-tooltip="Copy" tooltip-append-to-body="true">
+                    <i class="fa fa-refresh"></i>
+                </button>
+
+                <button class="btn btn-info" ui-sref="main.save" ng-disabled="!team.length"  uib-tooltip="Save" tooltip-append-to-body="true">
                     <i class="fa fa-download"></i>
                 </button>
 
-                <button class="btn btn-primary" ui-sref="main.load">
+                <button class="btn btn-primary" ui-sref="main.load"  uib-tooltip="Load" tooltip-append-to-body="true">
                     <i class="fa fa-upload"></i>
                 </button>
 
-                <button class="btn btn-danger" ui-sref="main.reset" ng-disabled="!team.length">
+                <button class="btn btn-danger" ui-sref="main.reset" ng-disabled="!team.length"  uib-tooltip="Reset" tooltip-append-to-body="true">
                     <i class="fa fa-eraser"></i>
                 </button>
 
-                <button class="btn btn-success" ng-click="generateURL()" ng-disabled="!team.length">
+                <button class="btn btn-success" ng-click="generateURL()" ng-disabled="!team.length"  uib-tooltip="Export URL" tooltip-append-to-body="true">
                     <i class="fa fa-exchange"></i>
                 </button>
 
-                <button class="btn btn-warning" ui-sref="main.image" ng-disabled="!team.length">
+                <button class="btn btn-warning" ui-sref="main.image" ng-disabled="!team.length"  uib-tooltip="Export Image" tooltip-append-to-body="true">
                     <i class="fa fa-picture-o"></i>
                 </button>
 
             </div>
 
-            <div id="transient" class="alert alert-danger" ng-show="options.transient" ng-click="options.transient = false">
+            <div id="transient" class="alert alert-danger" ng-show="options.transient" ng-click="options.transient = false"  uib-tooltip="Save" tooltip-append-to-body="true">
                 <i class="fa fa-lock"></i>
                 Transient mode enabled. Click to disable.
             </div>
diff --git a/slots/views/popup/copy.html b/slots/views/popup/copy.html
new file mode 100644
index 000000000..83ec50656
--- /dev/null
+++ b/slots/views/popup/copy.html
@@ -0,0 +1,20 @@
+<div class="backdrop" ui-sref="^"></div>
+
+<div class="inner-container" go-back>
+
+    <div class="custom-modal">
+        <div id="picker" class="modal-dialog">
+            <div class="modal-content animated fadeInDown">
+                <div class="modal-header">Copy your current Team from the Calculator</div>
+                <div class="modal-body slim">
+                    Are you sure? This will DELETE your current setup!
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-default" ng-click="copyCurrentCalcTeam()">Yep</button> 
+                    <button class="btn btn-primary" ui-sref="^">Nope</button> 
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>

From 36b0f2936a22ace43ab84fbb7f40d606df4e00e5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 21 Mar 2016 00:39:30 +0100
Subject: [PATCH 0193/1569] Kizaru Captain

---
 common/data/captains.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index abab8fcce..d728fb8de 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2331,5 +2331,12 @@ window.captains = {
 		atk: function(p) {
 			return p.unit.class.has("Striker") || p.unit.class.has("Ambition") ? 2 : 1;
 		}
-	}
+	},
+    977: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    978: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    }
 };
\ No newline at end of file

From 3334c5dfa961a6ea5cc4a95c297e5bc1ee24f598 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 21 Mar 2016 18:37:29 +0100
Subject: [PATCH 0194/1569] Fixed Kizaru Special + New Feature to Calc

Fixes #26
---
 common/data/specials.js | 21 ++++-----------------
 damage/js/cruncher.js   |  5 ++++-
 index.html              |  4 +---
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 37d5955cd..cc0abd211 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1138,24 +1138,11 @@ window.specials = {
 		type: "class"
     },
     977: {
-        chainAdd: function(p) {return 1;},
-        chain: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
-        chainLimiter: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
-        onActivation: function(p) {
-            p.scope.notify({
-				text: 'Please reactivate this Special everytime you change anything',
-				name: '977warning'
-			});
-        }
+        chain: function(p) { return 1;},
+        chainAddition: function(p) {return 0.5},
     },
     978: {
-        chain: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
-        chainLimiter: function(p) { return p.scope.numbers.DEX.chainMultipliers[p.chainPosition]+0.5;},
-        onActivation: function(p) {
-            p.scope.notify({
-				text: 'Please reactivate this Special everytime you change anything',
-				name: '977warning'
-			});
-        }
+        chain: function(p) {return 1;},
+        chainAddition: function(p){ return 0.5;},
     }
 };
\ No newline at end of file
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 8a5b25ca1..a28efcbc7 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -435,6 +435,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     return prev * next.chainModifier(getParameters(x.position, n));
                 },1);
                 var chainMultiplier = getChainMultiplier(special.chain(params[n]), modifiers.slice(0,n), chainModifier);
+                //Add flat Multiplier Bonuses
+                if(special.hasOwnProperty('chainAddition'))
+                    chainMultiplier = chainMultiplier + special.chainAddition(params[n]);
                 if (mapEffect.hasOwnProperty('chainLimiter'))
                     chainMultiplier = Math.min(mapEffect.chainLimiter(params[n]), chainMultiplier);
                 else if (special.hasOwnProperty('chainLimiter'))
@@ -550,7 +553,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (data.hasOwnProperty('orb'))
                 result.orb.push({ sourceSlot: data.sourceSlot, f: data.orb });
             if (data.hasOwnProperty('chain'))
-                chainSpecials.push({ sourceSlot: data.sourceSlot, chain: data.chain, chainLimiter: data.chainLimiter || function() { return Infinity; } });
+                chainSpecials.push({ sourceSlot: data.sourceSlot, chain: data.chain, chainLimiter: data.chainLimiter || function() { return Infinity; }, chainAddition: data.chainAddition || function(){ return 0;} });
         });
         specialsCombinations = Utils.arrayProduct([ result.type.concat(result.class), result.condition, result.orb ]);
         if (chainSpecials.length === 0) chainSpecials.push({
diff --git a/index.html b/index.html
index 4c6d491cc..f4168c794 100644
--- a/index.html
+++ b/index.html
@@ -57,9 +57,7 @@
             <ul>
                 <li>Added Kizaru</li>
                 <li>Regarding his Special:</li>
-                <li>Currently a workaround that needs to be reset</li>
-                <li>everytime you change something</li>
-                <li>Will be fixed soon-ish</li>
+                <li>Has been fixed and should work from now on</li>
                 <br>
                 <li>New Fixes like always</li>
             </ul>

From 47035d8380dac5904661d8b6ed6b3ee42f2674e5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 22 Mar 2016 15:55:42 +0100
Subject: [PATCH 0195/1569] WB FN Part 2 Update

---
 common/data/aliases.js  |  8 ++++----
 common/data/captains.js | 12 ++++++++++++
 common/data/details.js  | 20 +++++++++++++++++++-
 common/data/drops.js    |  4 ++--
 common/data/specials.js |  4 ++++
 common/data/units.js    | 14 +++++++-------
 index.html              |  7 +++++--
 7 files changed, 53 insertions(+), 16 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ac25beef2..27762dd3a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -948,10 +948,10 @@ window.aliases = {
     947: ['フォッサ 白ひげ海賊団１５番隊隊長',''],
     948: ['クリエル 白ひげ海賊団１０番隊隊長',''],
     949: ['サッチ 白ひげ海賊団４番隊隊長',''],
-    950: ['？？？',''],
-    951: ['？？？',''],
-    952: ['？？？',''],
-    953: ['？？？',''],
+    950: ['火拳のエース',''],
+    951: ['火拳のエース 白ひげ海賊団２番隊隊長',''],
+    952: ['ベン・ベックマン',''],
+    953: ['ベン・ベックマン 赤髪海賊団',''],
 	954: ['ギャロ',''],
     955: ['マクロ',''],
     956: ['タンスイ',''],
diff --git a/common/data/captains.js b/common/data/captains.js
index d728fb8de..068cadb22 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2338,5 +2338,17 @@ window.captains = {
     978: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    979: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    980: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    981: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Tough") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Tough") ? 0.1 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index ca7a934e6..27110f4ab 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4590,6 +4590,24 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}"
-	}
+	},
+    979: {
+        captain: "Boosts ATK of [PSY] and [DEX] characters by 1.75x and their RCV by 1.2x",
+        specialName: "Flintlock Barrage",
+        special: "Randomly changes all orbs into either [PSY] or [DEX] orbs, deals random PSY damage to all enemies",
+        specialNotes: "Random Damage is currently unknown"
+    },
+    980: {
+        captain: "Boosts ATK of [DEX] and [STR] characters by 1.75x and their RCV by 1.2x",
+        specialName: "Hidden King Mallet",
+        special: "Changes own orb into [DEX] and randomizes every other orb"
+    },
+    981: {
+        captain: "Boosts ATK of Fighters and Tough characters by 2x and sharply reduces their RCV",
+        captainNotes: "The RCV Reduction is around 90%",
+        specialName: "Martial Art Diving Fist",
+        special: "Boosts own ATK by 1.75x for 1 turn and deals 800 fixed damage to one enemy",
+        specialNotes: "#{fixed}"
+    }
 
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 0938508c0..63e6d1556 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -990,8 +990,8 @@ window.drops = {
 		{
 			name: "Clash! Whitebeard Pirates",
 			condition: "You can only bring INT units",
-			Expert: [ 979, 980, 981, 949 ],
-			Elite: [ 979, 980, 981, 949 ]
+			Expert: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ],
+			Elite: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
 		}
 
     ],
diff --git a/common/data/specials.js b/common/data/specials.js
index cc0abd211..5202ef5f9 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1144,5 +1144,9 @@ window.specials = {
     978: {
         chain: function(p) {return 1;},
         chainAddition: function(p){ return 0.5;},
+    },
+    981: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+		type: "type"
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index fe7d931a0..c58e46d88 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -948,10 +948,10 @@ window.units = [
 	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
 	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
 	[ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
-	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, null, 606, 313, 54, 1496, 744, 152, null],
-	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, null, 1431, 690, 110, 2599, 1271, 271, null],
-	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, null, 131, 98, 25, 935, 375, 163, null],
- 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, null, 867, 329, 122, 1403, 800, 229, null],
+	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, 1066998, 606, 313, 54, 1496, 744, 152, 1],
+	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1431, 690, 110, 2599, 1271, 271, 1],
+	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, 136167, 131, 98, 25, 935, 375, 163, 1],
+ 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, 1778330, 867, 329, 122, 1403, 800, 229, 1],
 	[ "Gyaro", "QCK", [ "Slasher", "Tough" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
 	[ "Makuro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
 	[ "Tansui", "INT", [ "Fighter", "Tough" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
@@ -977,7 +977,7 @@ window.units = [
 	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null],
 	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
 	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
-	[ "Izo","PSY",["Shooter","Knowledge"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
-	[ "Blamenco","DEX",["Striker","Free Spirit"], 4, 25, null, null, null, null, null, null, null, null,null,null,null],
-	[ "Namule","PSY",["Fighter","Tough"], 4, 25, null, null, null, null, null, null, null, null,null,null,null]
+	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, null, 37, 22, 39, null,null,null,null],
+	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, null, 66, 40, 18, null,null,null,null],
+	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, null, 49, 48, 26, null,null,null,null]
 ];
diff --git a/index.html b/index.html
index f4168c794..bb02d22f4 100644
--- a/index.html
+++ b/index.html
@@ -52,14 +52,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>20/03/2016</p>
+            <p>22/03/2016</p>
             <br>
             <ul>
                 <li>Added Kizaru</li>
                 <li>Regarding his Special:</li>
                 <li>Has been fixed and should work from now on</li>
                 <br>
-                <li>New Fixes like always</li>
+                <li>Izo/Blamenco/Namule updated</li>
+                <br>
+                <li>Slot Planner can now </li>
+                <li>Import the current Calculator Team</li>
             </ul>
         </div>
     </body>

From c72e517629b3190dbc1c25e1712bc58a17b0372e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 22 Mar 2016 12:12:03 -0500
Subject: [PATCH 0196/1569] caesar special

18
---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 42272f2f8..e28ad1edd 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -835,8 +835,8 @@ window.cooldowns = [
 	[ 20, 10 ],
 	[ 28, 14 ],
 	[ 28, 14 ],
-	25,
-	25,
+	[ 25, 18 ],
+	[ 25, 18 ],
 	[ 18, 12 ],
 	[ 18, 12 ],
 	[ 16, 10 ],

From 67e489944d9f4673ce0a72af6150c9054710f5d7 Mon Sep 17 00:00:00 2001
From: Hibashira <maximilian.stief@t-online.de>
Date: Tue, 22 Mar 2016 22:19:31 +0100
Subject: [PATCH 0197/1569] bugfix for issue 22: Transfer Codes in Firefox
 disable Back button the transfer code results in a separate history entry
 which caused kind of a redirect loop when using the back-button. therefore
 the button appeared to be broken. no idea why this problem does not appear in
 chrome.

---
 damage/js/transfer.js   | 1 +
 slots/js/controllers.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index 656782e0f..deafb7288 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -7,6 +7,7 @@
  **************/
 
 var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
+    history.replaceState(null, null, '#/');
 
     var checkInt = function(n, min, max) {
         var temp = parseInt(n, 10);
diff --git a/slots/js/controllers.js b/slots/js/controllers.js
index 740ad03fa..a76e7f7eb 100644
--- a/slots/js/controllers.js
+++ b/slots/js/controllers.js
@@ -189,6 +189,7 @@ controllers.SummaryCtrl = function($scope, $rootScope, $state, $stateParams) {
  **************/
 
 controllers.ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
+    history.replaceState(null, null, '#/');
 
     var data = $stateParams.data;
 

From 11e70adb5add406eac7170e510b1e947ba12968d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 22 Mar 2016 23:17:54 +0100
Subject: [PATCH 0198/1569] Improved Chain Addition Handling

---
 common/data/specials.js |  6 ++----
 damage/js/cruncher.js   | 22 ++++++++++++++++------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 5202ef5f9..de5781c7c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1138,12 +1138,10 @@ window.specials = {
 		type: "class"
     },
     977: {
-        chain: function(p) { return 1;},
-        chainAddition: function(p) {return 0.5},
+        chainAddition: function(p) {return 0.5;}
     },
     978: {
-        chain: function(p) {return 1;},
-        chainAddition: function(p){ return 0.5;},
+        chainAddition: function(p){ return 0.5;}
     },
     981: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index a28efcbc7..8f4ad09b0 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -424,7 +424,14 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     };
 
     var applyChainAndBonusMultipliers = function(damage,modifiers) {
-        var currentMax = -1, currentResult = null;
+        var currentMax = -1, currentResult = null, addition = 0.0;
+
+        //get the highest Chain Addition if it exists
+        chainAddition.forEach(function(special){
+                    if(addition<special.chainAddition())
+                        addition = special.chainAddition();
+                });
+//        
         chainSpecials.forEach(function(special) {
             var multipliersUsed = [ ], currentHits = 0, overall = 0;
             var i, params = [ ];
@@ -435,9 +442,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     return prev * next.chainModifier(getParameters(x.position, n));
                 },1);
                 var chainMultiplier = getChainMultiplier(special.chain(params[n]), modifiers.slice(0,n), chainModifier);
-                //Add flat Multiplier Bonuses
-                if(special.hasOwnProperty('chainAddition'))
-                    chainMultiplier = chainMultiplier + special.chainAddition(params[n]);
+                //Add flat Multiplier Bonuses if they exist
+                if(addition>0.0)
+                    chainMultiplier = chainMultiplier + addition;
                 if (mapEffect.hasOwnProperty('chainLimiter'))
                     chainMultiplier = Math.min(mapEffect.chainLimiter(params[n]), chainMultiplier);
                 else if (special.hasOwnProperty('chainLimiter'))
@@ -545,6 +552,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     var computeSpecialsCombinations = function() {
         var result = { type: [ ], class: [ ], orb: [ ], condition: [ ] };
         chainSpecials = [ ];
+        chainAddition = [ ];
         enabledSpecials.forEach(function(data) {
             if (data === null) return;
             // notice specials with both atk and atkStatic defined are not supported right now
@@ -553,7 +561,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (data.hasOwnProperty('orb'))
                 result.orb.push({ sourceSlot: data.sourceSlot, f: data.orb });
             if (data.hasOwnProperty('chain'))
-                chainSpecials.push({ sourceSlot: data.sourceSlot, chain: data.chain, chainLimiter: data.chainLimiter || function() { return Infinity; }, chainAddition: data.chainAddition || function(){ return 0;} });
+                chainSpecials.push({ sourceSlot: data.sourceSlot, chain: data.chain, chainLimiter: data.chainLimiter || function() { return Infinity; } });
+            if (data.hasOwnProperty('chainAddition'))
+                chainAddition.push({chainAddition: data.chainAddition || function(){ return 0.0;} });
         });
         specialsCombinations = Utils.arrayProduct([ result.type.concat(result.class), result.condition, result.orb ]);
         if (chainSpecials.length === 0) chainSpecials.push({
@@ -634,7 +644,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         hitModifiers = getPossibleHitModifiers(cptsWith.hitModifiers);
         // compute special combinations
         computeSpecialsCombinations();
-        $scope.conflictingSpecials = (specialsCombinations.length > 1 || chainSpecials.length > 1);
+        $scope.conflictingSpecials = (specialsCombinations.length > 1 || chainSpecials.length > 1 || chainAddition.length > 1);
         // get ship bonus
         shipBonus = jQuery.extend({ bonus: window.ships[$scope.data.ship[0]] },{ level: $scope.data.ship[1] });
     };

From fb4dd2388b1ece9919196688d555568705577b8d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 23 Mar 2016 12:15:36 +0100
Subject: [PATCH 0199/1569] WB Finished

and fixed 4* monet zombie
also added drop link to family view
---
 characters/views/details.html | 2 +-
 common/data/aliases.js        | 6 +++---
 common/data/drops.js          | 1 +
 common/data/units.js          | 6 +++---
 common/data/zombies.js        | 2 +-
 index.html                    | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/characters/views/details.html b/characters/views/details.html
index d788df575..b502656cd 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -425,7 +425,7 @@ <h3 class="page-header" ng-if="families.length > 0">Family: {{family}}</h3>
                                     <div class="slot small" decorate-slot uid="data.uid"></div>
                                     <a ui-sref="main.search.view({ id: data.uid, previous: getPrevious() })">{{data.name}}</a>
                                 </td>
-                                <td>{{data.location.name}}</td>
+                                <td><a href="{{'../drops/?'+data.location.name}}" target="_blank">{{data.location.name}}</a></td>
                                 <td>{{data.location.data.join(', ')}}</td>
                             </tr>
                         </tbody>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 27762dd3a..0c0144566 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -977,7 +977,7 @@ window.aliases = {
     976: ['？？？','','Kid Smoker'],
     977: ['黄猿',''],
     978: ['黄猿　光人間',''],
-    979: ['？？？',''],
-    980: ['？？？',''],
-    981: ['？？？','']
+    979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
+    980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
+    981: ['ナミュール 白ひげ海賊団８番隊隊長','']
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 63e6d1556..404b5862e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -989,6 +989,7 @@ window.drops = {
 		
 		{
 			name: "Clash! Whitebeard Pirates",
+            thumb: 979,
 			condition: "You can only bring INT units",
 			Expert: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ],
 			Elite: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
diff --git a/common/data/units.js b/common/data/units.js
index c58e46d88..b28e7386a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -977,7 +977,7 @@ window.units = [
 	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null],
 	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
 	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
-	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, null, 37, 22, 39, null,null,null,null],
-	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, null, 66, 40, 18, null,null,null,null],
-	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, null, 49, 48, 26, null,null,null,null]
+	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
+	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
+	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ]
 ];
diff --git a/common/data/zombies.js b/common/data/zombies.js
index beab872d7..db6f1b31e 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -181,7 +181,7 @@ window.zombies = {
     },
     841: { // Monet
         type: 'healer',
-        multiplier: 5
+        multiplier: 3
     },
     842: { // Monet
         type: 'healer',
diff --git a/index.html b/index.html
index bb02d22f4..8b112fe52 100644
--- a/index.html
+++ b/index.html
@@ -52,14 +52,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>22/03/2016</p>
+            <p>23/03/2016</p>
             <br>
             <ul>
                 <li>Added Kizaru</li>
                 <li>Regarding his Special:</li>
                 <li>Has been fixed and should work from now on</li>
                 <br>
-                <li>Izo/Blamenco/Namule updated</li>
+                <li>Izo/Blamenco/Namule finished</li>
                 <br>
                 <li>Slot Planner can now </li>
                 <li>Import the current Calculator Team</li>

From 1f54e755a7f22f4da0e5352033e31c10a42ed39c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 23 Mar 2016 13:13:47 +0100
Subject: [PATCH 0200/1569] Cooldown Update

---
 common/data/cooldowns.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e28ad1edd..bd4275a38 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -728,13 +728,13 @@ window.cooldowns = [
 	[ 15, 15 ],
 	[ 20, 14 ],
 	[ 20, 14 ],
-	25,
-	25,
+	[ 25, 18 ],
+	[ 25, 18 ],
 	[ 18, 12 ],
 	[ 18, 12 ],
 	[ 14, 7 ],
 	[ 14, 7 ],
-	25,
+	[ 25, 18 ],
 	[ 18, 12 ],
 	[ 35, 20 ],
 	20,
@@ -974,5 +974,10 @@ window.cooldowns = [
 	22,
 	22,
 	[ 15, 15 ],
-	[ 15, 15 ]
+	[ 15, 15 ],
+    null,
+    null,
+    [ 25, 18 ],
+    [ 15, 7 ],
+    [ 16, 8 ]
 ];

From 1127ec40a542bfd6b2f8e3ccab21cdc62143e7c4 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 23 Mar 2016 14:44:42 +0100
Subject: [PATCH 0201/1569] Fodder Special Names

---
 common/data/details.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 27110f4ab..bceb3fe1b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4470,27 +4470,27 @@ window.details = {
 		special: "Boosts ATK of Tough characters by 1.2x for 2 turns"
 	},
 	957:{
-		specialName: "Blue Gunner Special",
+		specialName: "First Aid",
 		special: "Recover 2,000 HP"
 	},
 	958:{
-		specialName: "Black Gunner Special",
+		specialName: "Bind Purge",
 		special: "Reduces Bind duration by 2 turns"
 	},
 	959:{
-		specialName: "Green Gunman Special",
+		specialName: "Captain Soul Recovery",
 		special: "Reduces Despair duration by 2 turns"
 	},
 	960:{
-		specialName: "Blue Gunman Special",
+		specialName: "Slot Color Shuffle",
 		special: "Randomly changes all orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs"
 	},
 	961:{
-		specialName: "Red Gunman Special",
+		specialName: "Slot Power Light",
 		special: "Amplifies the effect of orbs by 1.25x for 1 turn"
 	},
 	962:{
-		specialName: "Yellow Gunman Special",
+		specialName: "Captain Slot Change RCV",
 		special: "Changes captain's orb into [RCV]"
 	},
 	963:{

From 710aba4797b39ac32b269fa7707d6bd7907cf19f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 23 Mar 2016 10:00:04 -0500
Subject: [PATCH 0202/1569] Hogback Mission

---
 common/data/drops.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 404b5862e..40caab04a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -673,7 +673,7 @@ window.drops = {
             thumb: 341,
             global: true,
             condition: 'You may only bring QCK units for 15 and 30 Stamina',
-            challenge: 'Low Teamcost, fast Clear and perfect Taps',
+            challenge: 'Low Teamcost, Fast Clear and Perfect Taps',
             challengeData: [['200,000 Points','1x Red Elder'],['400,000 Points','1x HP Cotton Candy'],['700,000 Points','3x Rainbow Gems']],
             Expert: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ],
             Elite: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ]
@@ -684,6 +684,8 @@ window.drops = {
             thumb: 386,
             global: true,
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
+			challenge: 'Low Teamcost, Fast Clear and Perfect Taps',
+            challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Damage Reduction Forbidden Tome']],
             Expert: [ 385, 387, -388, -335, -314, -36, -16, -11 ],
             Elite: [ 385, 387, -388, -335, -314, -36, -16, -11 ]
         },

From da3455ff74a3f11edc0c15391553d9a7a77b55b3 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 23 Mar 2016 20:46:09 +0100
Subject: [PATCH 0203/1569] Added Home to Link Bar

---
 common/css/links.css    | 7 +++++++
 common/views/links.html | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/common/css/links.css b/common/css/links.css
index f1e6bac19..3f44e42fb 100644
--- a/common/css/links.css
+++ b/common/css/links.css
@@ -167,12 +167,19 @@
     transform: translateX(-15em);
 }
 
+#links-button.active .rotater:nth-child(6) > a {
+    -webkit-transform: translateX(-18em);
+    -ms-transform: translateX(-18em);
+    transform: translateX(-18em);
+}
+
 #link-damage > .btn { background: #85C1F5; }
 #link-characters > .btn { background: #7FCA9F; }
 #link-drops > .btn { background: #F4BA70; }
 #link-tally > .btn { background: #E96D63; }
 #link-report > .btn { background: orchid; }
 #link-slots > .btn { background: #99cc66; }
+#links-home > .btn { background: #939393; }
 
 .tip { color: black; }
 
diff --git a/common/views/links.html b/common/views/links.html
index a7e137425..1c4a9ef7d 100644
--- a/common/views/links.html
+++ b/common/views/links.html
@@ -5,6 +5,13 @@
     </div>
 
     <div class="icons">
+        
+        <div class="rotater" id="link-home" title="Home">
+            <a class="btn btn-icon" href="/">
+                <i class="fa fa-home"></i>
+            </a>
+            <a class="tip">Front Page</a>
+        </div>
 
         <div class="rotater" id="link-report" title="Bug report">
             <a class="btn btn-icon" target="_blank"

From 41ef61fd36702982d94637a3c25145421f20d819 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 23 Mar 2016 21:11:54 +0100
Subject: [PATCH 0204/1569] GW Links

>_>
---
 common/data/gw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index 8ab97864d..ea866b35d 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751];
\ No newline at end of file

From ee2d38ed5759f9de209809280cdffc34d0a4e27f Mon Sep 17 00:00:00 2001
From: Hibashira <maximilian.stief@t-online.de>
Date: Wed, 23 Mar 2016 23:32:40 +0100
Subject: [PATCH 0205/1569] reformating... noone can read this...

---
 common/js/utils.js | 428 ++++++++++++++++++++++++---------------------
 1 file changed, 232 insertions(+), 196 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 3326140d6..cb477c71c 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -1,196 +1,232 @@
-(function() {
-
-var FODDER_REGEX = new RegExp('(' + [
-    'Group', 'Ensign Navy HQ', 'Armed \\w+ Unit', '[BM]illions Baroque', 'Eneru\'s Elect',
-    'Skypiea (Guard|Enforcer)', 'Shandian',
-    '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
-    'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-    '(Soldier|General) Zombie.*Shadow', 'Wild Zombie','Street Punk'
-].join(')|(') + ')','i');
-
-var utils = { };
-
-var fullNames = null, reverseEvoMap = null;
-
-/* * * * * Unit control * * * * */
-
-var parseUnit = function(element,n) {
-    if (element.length === 0) return [ ];
-    if (element[15] && element[15].constructor != Array) element[15] = [ element[15], element[15], element[15] ];
-    var result = {
-        name    : element[0]  , type     : element[1]  ,
-        class   : element[2]  , stars    : element[3]  ,
-        cost    : element[4]  , combo    : element[5]  ,
-        slots   : element[6]  , maxLevel : element[7]  ,
-        maxEXP  : element[8]  , minHP    : element[9]  ,
-        minATK  : element[10] , minRCV   : element[11] ,
-        maxHP   : element[12] , maxATK   : element[13] ,
-        maxRCV  : element[14] , growth   : {
-            hp  : element[15] ? element[15][0] : 0,
-            atk : element[15] ? element[15][1] : 0,
-            rcv : element[15] ? element[15][2] : 0
-        },
-        number: n
-    };
-    if (element.indexOf(null) != -1) result.incomplete = true;
-    if (result.combo === null || result.combo === 0) result.preview = true;
-    return result;
-};
-
-utils.parseUnits = function(skipIncomplete) {
-    if (skipIncomplete) {
-        window.units = window.units.map(function(x,n) {
-            if (x.indexOf(null) == -1) return x;
-            var viable = x[9] && x[10] && x[11] && x[12] && x[13] && x[14];
-            return viable ? x : [ ];
-
-        });
-    }
-    window.units = window.units.map(parseUnit);
-};
-
-utils.getFullUnitName = function(id) {
-    if (fullNames === null) {
-        fullNames = units.map(function(x,n) {
-            if (!x.name) return null;
-            return x.name + (window.aliases[n + 1] ? ' ' + window.aliases[n + 1].join(', ') : '');
-        });
-    }
-    return fullNames[id - 1];
-};
-
-/* * * * * Thumbnail control * * * * */
-
-utils.getThumbnailUrl = function(n) {
-    if (n === null || n === undefined || (window.units && window.units[n-1].incomplete))
-        return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
-    var id = ('0000' + n).slice(-4).replace(/(057[54])/,'0$1'); // missing aokiji image
-    if(id=='0742')
-        return 'http://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
-    return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
-};
-
-utils.getBigThumbnailUrl = function(n) {
-    if (window.units[n-1].incomplete)
-        return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
-    var id = ('0000' + n).slice(-4).replace(/(057[54])/,'0$1'); // missing aokiji image
-    return 'http://onepiece-treasurecruise.com/wp-content/uploads/c' + id + '.png';
-};
-
-utils.getThumbnailTitle = function(arg) {
-    if (arg === null || arg === undefined) return null;
-    if (arg.constructor == Object) {
-        return [ arg.name, 'HP: ' + arg.hp, 'ATK: ' + arg.atk, 'RCV: ' + arg.rcv, 'CMB: ' + arg.cmb ].join('\n');
-    }
-    var unit = (arg.constructor == Object ? arg : units[arg]);
-    return [ unit.name, 'HP: ' + unit.maxHP, 'ATK: ' + unit.maxATK, 'RCV: ' + unit.maxRCV, 'CMB: ' + unit.combo, 'Cost: ' + unit.cost ].join('\n');
-};
-
-utils.isClickOnOrb = function(e,target) {
-    var x = e.offsetX, y = e.offsetY;
-    var distance = Math.sqrt(Math.pow(x-20,2)+Math.pow(y-21,2));
-    return distance < 13;
-};
-
-/* * * * * Misc functions * * * * */
-
-/* given an array of arrays, generates the cartesian product of
- * all the arrays contained within the root array
- * eg f([[1],[2,3],[4,5,6]]) -> [[1,2,4],[1,2,5],[1,2,6],[1,3,4],[1,3,5],[1,3,6]] */
-utils.arrayProduct = function(data) {
-    var result = data.reduce(function(prev,next) {
-        if (next.length === 0) return prev;
-        return next.map(function(n) {
-            return prev.map(function(p) {
-                return p.concat([ n ]);
-            });
-        }).reduce(function(prev,next) { return prev.concat(next); },[ ]);
-    },[ [ ] ]);
-    return result.filter(function(r) { return r.length > 0; });
-};
-
-utils.getOppositeType = function(type) {
-    if (!type) return null;
-    type = type.toUpperCase();
-    if (type == 'STR') return 'QCK';
-    if (type == 'QCK') return 'DEX';
-    if (type == 'DEX') return 'STR';
-    if (type == 'PSY') return 'INT';
-    return 'PSY';
-};
-
-/* * * * * Searching/filtering * * * * */
-
-utils.getRegex = function(query) {
-    try { return new RegExp(query,'i'); }
-    catch (e) { return new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'), 'i'); }
-};
-
-utils.generateSearchParameters = function(query) {
-    if (!query || query.trim().length < 2) return null;
-    query = query.toLowerCase().trim();
-    var result = { matchers: { }, ranges: { }, query: [ ] };
-    var ranges = { }, params = [ 'hp', 'atk', 'stars', 'cost', 'growth', 'rcv', 'id', 'slots', 'combo', 'exp', 'minCD', 'maxCD' ];
-    var regex = new RegExp('^((type|class):(\\w+\\s{0,1}\\w+)|(' + params.join('|') + ')(>|<|>=|<=|=)([\\d.]+))$', 'i');
-    var tokens = query.replace(/\s+/g,' ').split(' ').filter(function(x) { return x.length > 0; });
-    tokens.forEach(function(x) {
-        x = x.replace("_", ' ');
-        var temp = x.match(regex);
-        if (!temp) // if it couldn't be parsed, treat it as string
-            result.query.push(x);
-        else if (temp[4] !== undefined) { // numeric operator
-            var left = temp[4], op = temp[5], right = parseFloat(temp[6],10);
-            if (left == 'exp') left = 'maxEXP';
-            if (!result.ranges.hasOwnProperty(left)) result.ranges[left] = [ 0, Infinity ];
-            if (op == '=') {
-                result.ranges[left][0] = right;
-                result.ranges[left][1] = right;
-            }
-            else if (op == '<')  result.ranges[left][1] = Math.min(result.ranges[left][1],right-1);
-            else if (op == '<=') result.ranges[left][1] = Math.min(result.ranges[left][1],right);
-            else if (op == '>')  result.ranges[left][0] = Math.max(result.ranges[left][0],right+1);
-            else if (op == '>=') result.ranges[left][0] = Math.max(result.ranges[left][0],right);
-        } else // matcher
-            result.matchers[temp[2]] = new RegExp(temp[3],'i');
-    });
-    if (result.query.length > 0) result.query = utils.getRegex(result.query.join(' '));
-    else result.query = null;
-    return result;
-};
-
-utils.isFodder = function(unit) {
-    return (unit.stars < 2 && !utils.isEvolverBooster(unit)) || FODDER_REGEX.test(unit.name);
-};
-
-utils.isEvolverBooster = function(unit) {
-    return /Evolver|Booster/i.test(unit.class);
-};
-
-utils.searchBaseForms = function(id) {
-    if (!reverseEvoMap) generateReverseEvoMap();
-    if (!reverseEvoMap[id]) return null;
-    return reverseEvoMap[id];
-};
-
-var updateEvoMap = function(from, to, via) {
-    if (!reverseEvoMap[to]) reverseEvoMap[to] = { };
-    if (!reverseEvoMap[to][from]) reverseEvoMap[to][from] = [ ];
-    reverseEvoMap[to][from].push(via);
-};
-
-var generateReverseEvoMap = function() {
-    reverseEvoMap = { };
-    for (var evo in evolutions) {
-        var from = parseInt(evo, 10);
-        if (evolutions[evo].evolution.constructor != Array)
-            updateEvoMap(from, evolutions[evo].evolution, evolutions[evo].evolvers);
-        else for (var i=0;i<evolutions[evo].evolution.length;++i)
-            updateEvoMap(from, evolutions[evo].evolution[i], evolutions[evo].evolvers[i]);
-    }
-};
-
-/* * * * * Body * * * * */
-
-window.Utils = utils;
-
-})();
+(function () {
+
+    var FODDER_REGEX = new RegExp('(' + [
+        'Group', 'Ensign Navy HQ', 'Armed \\w+ Unit', '[BM]illions Baroque', 'Eneru\'s Elect',
+        'Skypiea (Guard|Enforcer)', 'Shandian',
+        '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
+        'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk'
+    ].join(')|(') + ')', 'i');
+
+    var utils = {};
+
+    var fullNames = null, reverseEvoMap = null;
+
+    /* * * * * Unit control * * * * */
+
+    var parseUnit = function (element, n) {
+        if (element.length === 0)
+            return [];
+        if (element[15] && element[15].constructor != Array)
+            element[15] = [element[15], element[15], element[15]];
+        var result = {
+            name: element[0], type: element[1],
+            class: element[2], stars: element[3],
+            cost: element[4], combo: element[5],
+            slots: element[6], maxLevel: element[7],
+            maxEXP: element[8], minHP: element[9],
+            minATK: element[10], minRCV: element[11],
+            maxHP: element[12], maxATK: element[13],
+            maxRCV: element[14], growth: {
+                hp: element[15] ? element[15][0] : 0,
+                atk: element[15] ? element[15][1] : 0,
+                rcv: element[15] ? element[15][2] : 0
+            },
+            number: n
+        };
+        if (element.indexOf(null) != -1)
+            result.incomplete = true;
+        if (result.combo === null || result.combo === 0)
+            result.preview = true;
+        return result;
+    };
+
+    utils.parseUnits = function (skipIncomplete) {
+        if (skipIncomplete) {
+            window.units = window.units.map(function (x, n) {
+                if (x.indexOf(null) == -1)
+                    return x;
+                var viable = x[9] && x[10] && x[11] && x[12] && x[13] && x[14];
+                return viable ? x : [];
+
+            });
+        }
+        window.units = window.units.map(parseUnit);
+    };
+
+    utils.getFullUnitName = function (id) {
+        if (fullNames === null) {
+            fullNames = units.map(function (x, n) {
+                if (!x.name)
+                    return null;
+                return x.name + (window.aliases[n + 1] ? ' ' + window.aliases[n + 1].join(', ') : '');
+            });
+        }
+        return fullNames[id - 1];
+    };
+
+    /* * * * * Thumbnail control * * * * */
+
+    utils.getThumbnailUrl = function (n) {
+        if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
+            return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+        var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
+        if (id == '0742')
+            return 'http://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
+        return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
+    };
+
+    utils.getBigThumbnailUrl = function (n) {
+        if (window.units[n - 1].incomplete)
+            return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+        var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
+        return 'http://onepiece-treasurecruise.com/wp-content/uploads/c' + id + '.png';
+    };
+
+    utils.getThumbnailTitle = function (arg) {
+        if (arg === null || arg === undefined)
+            return null;
+        if (arg.constructor == Object) {
+            return [arg.name, 'HP: ' + arg.hp, 'ATK: ' + arg.atk, 'RCV: ' + arg.rcv, 'CMB: ' + arg.cmb].join('\n');
+        }
+        var unit = (arg.constructor == Object ? arg : units[arg]);
+        return [unit.name, 'HP: ' + unit.maxHP, 'ATK: ' + unit.maxATK, 'RCV: ' + unit.maxRCV, 'CMB: ' + unit.combo, 'Cost: ' + unit.cost].join('\n');
+    };
+
+    utils.isClickOnOrb = function (e, target) {
+        var x = e.offsetX, y = e.offsetY;
+        var distance = Math.sqrt(Math.pow(x - 20, 2) + Math.pow(y - 21, 2));
+        return distance < 13;
+    };
+
+    /* * * * * Misc functions * * * * */
+
+    /* given an array of arrays, generates the cartesian product of
+     * all the arrays contained within the root array
+     * eg f([[1],[2,3],[4,5,6]]) -> [[1,2,4],[1,2,5],[1,2,6],[1,3,4],[1,3,5],[1,3,6]] */
+    utils.arrayProduct = function (data) {
+        var result = data.reduce(function (prev, next) {
+            if (next.length === 0)
+                return prev;
+            return next.map(function (n) {
+                return prev.map(function (p) {
+                    return p.concat([n]);
+                });
+            }).reduce(function (prev, next) {
+                return prev.concat(next);
+            }, []);
+        }, [[]]);
+        return result.filter(function (r) {
+            return r.length > 0;
+        });
+    };
+
+    utils.getOppositeType = function (type) {
+        if (!type)
+            return null;
+        type = type.toUpperCase();
+        if (type == 'STR')
+            return 'QCK';
+        if (type == 'QCK')
+            return 'DEX';
+        if (type == 'DEX')
+            return 'STR';
+        if (type == 'PSY')
+            return 'INT';
+        return 'PSY';
+    };
+
+    /* * * * * Searching/filtering * * * * */
+
+    utils.getRegex = function (query) {
+        try {
+            return new RegExp(query, 'i');
+        } catch (e) {
+            return new RegExp(query.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&'), 'i');
+        }
+    };
+
+    utils.generateSearchParameters = function (query) {
+        if (!query || query.trim().length < 2)
+            return null;
+        query = query.toLowerCase().trim();
+        var result = {matchers: {}, ranges: {}, query: []};
+        var ranges = {}, params = ['hp', 'atk', 'stars', 'cost', 'growth', 'rcv', 'id', 'slots', 'combo', 'exp', 'minCD', 'maxCD'];
+        var regex = new RegExp('^((type|class):(\\w+\\s{0,1}\\w+)|(' + params.join('|') + ')(>|<|>=|<=|=)([\\d.]+))$', 'i');
+        var tokens = query.replace(/\s+/g, ' ').split(' ').filter(function (x) {
+            return x.length > 0;
+        });
+        tokens.forEach(function (x) {
+            x = x.replace("_", ' ');
+            var temp = x.match(regex);
+            if (!temp) // if it couldn't be parsed, treat it as string
+                result.query.push(x);
+            else if (temp[4] !== undefined) { // numeric operator
+                var parameter = temp[4], op = temp[5], value = parseFloat(temp[6], 10);
+                if (parameter === 'exp')
+                    parameter = 'maxEXP';
+                if (!result.ranges.hasOwnProperty(parameter))
+                    result.ranges[parameter] = [0, Infinity];
+                if (op === '=') {
+                    result.ranges[parameter][0] = value;
+                    result.ranges[parameter][1] = value;
+                } else if (op === '<') {
+                    result.ranges[parameter][1] = Math.min(result.ranges[parameter][1], value - 1);
+                } else if (op === '<=') {
+                    result.ranges[parameter][1] = Math.min(result.ranges[parameter][1], value);
+                } else if (op === '>') {
+                    result.ranges[parameter][0] = Math.max(result.ranges[parameter][0], value + 1);
+                } else if (op === '>=') {
+                    result.ranges[parameter][0] = Math.max(result.ranges[parameter][0], value);
+                }
+            } else // matcher
+                result.matchers[temp[2]] = new RegExp(temp[3], 'i');
+        });
+        if (result.query.length > 0)
+            result.query = utils.getRegex(result.query.join(' '));
+        else
+            result.query = null;
+        return result;
+    };
+
+    utils.isFodder = function (unit) {
+        return (unit.stars < 2 && !utils.isEvolverBooster(unit)) || FODDER_REGEX.test(unit.name);
+    };
+
+    utils.isEvolverBooster = function (unit) {
+        return /Evolver|Booster/i.test(unit.class);
+    };
+
+    utils.searchBaseForms = function (id) {
+        if (!reverseEvoMap)
+            generateReverseEvoMap();
+        if (!reverseEvoMap[id])
+            return null;
+        return reverseEvoMap[id];
+    };
+
+    var updateEvoMap = function (from, to, via) {
+        if (!reverseEvoMap[to])
+            reverseEvoMap[to] = {};
+        if (!reverseEvoMap[to][from])
+            reverseEvoMap[to][from] = [];
+        reverseEvoMap[to][from].push(via);
+    };
+
+    var generateReverseEvoMap = function () {
+        reverseEvoMap = {};
+        for (var evo in evolutions) {
+            var from = parseInt(evo, 10);
+            if (evolutions[evo].evolution.constructor != Array)
+                updateEvoMap(from, evolutions[evo].evolution, evolutions[evo].evolvers);
+            else
+                for (var i = 0; i < evolutions[evo].evolution.length; ++i)
+                    updateEvoMap(from, evolutions[evo].evolution[i], evolutions[evo].evolvers[i]);
+        }
+    };
+
+    /* * * * * Body * * * * */
+
+    window.Utils = utils;
+
+})();

From d2d455d8c3c4dda9a5823cf086f45ec0b0c0b6e4 Mon Sep 17 00:00:00 2001
From: Hibashira <maximilian.stief@t-online.de>
Date: Wed, 23 Mar 2016 23:40:49 +0100
Subject: [PATCH 0206/1569] changed the method that parses searchquery
 parameters. the parser is now able to deal with negative numeric values. this
 also fixes the bug where e.g. rcv<0 returned an empty result.

---
 common/js/utils.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index cb477c71c..49a50afcc 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -152,7 +152,7 @@
         query = query.toLowerCase().trim();
         var result = {matchers: {}, ranges: {}, query: []};
         var ranges = {}, params = ['hp', 'atk', 'stars', 'cost', 'growth', 'rcv', 'id', 'slots', 'combo', 'exp', 'minCD', 'maxCD'];
-        var regex = new RegExp('^((type|class):(\\w+\\s{0,1}\\w+)|(' + params.join('|') + ')(>|<|>=|<=|=)([\\d.]+))$', 'i');
+        var regex = new RegExp('^((type|class):(\\w+\\s{0,1}\\w+)|(' + params.join('|') + ')(>|<|>=|<=|=)([-?\\d.]+))$', 'i');
         var tokens = query.replace(/\s+/g, ' ').split(' ').filter(function (x) {
             return x.length > 0;
         });
@@ -162,11 +162,18 @@
             if (!temp) // if it couldn't be parsed, treat it as string
                 result.query.push(x);
             else if (temp[4] !== undefined) { // numeric operator
-                var parameter = temp[4], op = temp[5], value = parseFloat(temp[6], 10);
+                var parameter = temp[4],
+                        op = temp[5],
+                        value = parseFloat(temp[6], 10);
                 if (parameter === 'exp')
                     parameter = 'maxEXP';
-                if (!result.ranges.hasOwnProperty(parameter))
-                    result.ranges[parameter] = [0, Infinity];
+                if (!result.ranges.hasOwnProperty(parameter)) {
+                    if (op === '>' || op === '>=') {
+                        result.ranges[parameter] = [0, Number.POSITIVE_INFINITY];
+                    } else if (op === '<' || op === '<=') {
+                        result.ranges[parameter] = [Number.NEGATIVE_INFINITY, 0];
+                    }
+                }
                 if (op === '=') {
                     result.ranges[parameter][0] = value;
                     result.ranges[parameter][1] = value;

From 831d7c5b8da9adde1a37f4deff858751750f1afe Mon Sep 17 00:00:00 2001
From: Hibashira <maximilian.stief@t-online.de>
Date: Wed, 23 Mar 2016 23:55:24 +0100
Subject: [PATCH 0207/1569] bugfixes for: - = operator - range goes through 0 
 e.g.:rcv>=-501 or rcv<501

---
 common/js/utils.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 49a50afcc..ef0318767 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -172,19 +172,21 @@
                         result.ranges[parameter] = [0, Number.POSITIVE_INFINITY];
                     } else if (op === '<' || op === '<=') {
                         result.ranges[parameter] = [Number.NEGATIVE_INFINITY, 0];
+                    }else{
+                         result.ranges[parameter] = [Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY];
                     }
                 }
                 if (op === '=') {
                     result.ranges[parameter][0] = value;
                     result.ranges[parameter][1] = value;
                 } else if (op === '<') {
-                    result.ranges[parameter][1] = Math.min(result.ranges[parameter][1], value - 1);
+                    result.ranges[parameter][1] =  value - 1;
                 } else if (op === '<=') {
-                    result.ranges[parameter][1] = Math.min(result.ranges[parameter][1], value);
+                    result.ranges[parameter][1] = value;
                 } else if (op === '>') {
-                    result.ranges[parameter][0] = Math.max(result.ranges[parameter][0], value + 1);
+                    result.ranges[parameter][0] =  value + 1;
                 } else if (op === '>=') {
-                    result.ranges[parameter][0] = Math.max(result.ranges[parameter][0], value);
+                    result.ranges[parameter][0] =  value;
                 }
             } else // matcher
                 result.matchers[temp[2]] = new RegExp(temp[3], 'i');

From 15d78d7cf3f78a5d005ce6ee790c252dd1086690 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 25 Mar 2016 14:41:25 +0100
Subject: [PATCH 0208/1569] Unit Previews

---
 common/data/units.js | 22 +++++++++++++++++++++-
 index.html           | 12 +++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index b28e7386a..14ee5b0dc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -979,5 +979,25 @@ window.units = [
 	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
-	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ]
+	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
+    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [ "Unknown Unit #1","INT",["Free Spirit","Tough"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #1 Evolution","INT",["Free Spirit","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #2","QCK",["Shooter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #2 Evolution","QCK",["Shooter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #3","PSY",["Fighter","Knowledge"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #3 Evolution","PSY",["Fighter","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #4","DEX",["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #4 Evolution","DEX",["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #5","STR",["Ambition","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #5 Evolution","STR",["Ambition","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #6","DEX",["Free Spirit","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Unit #6 Evolution","DEX",["Free Spirit","Knowledge"], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
 ];
diff --git a/index.html b/index.html
index 8b112fe52..cfca0a451 100644
--- a/index.html
+++ b/index.html
@@ -52,14 +52,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>23/03/2016</p>
+            <p>25/03/2016</p>
             <br>
             <ul>
-                <li>Added Kizaru</li>
-                <li>Regarding his Special:</li>
-                <li>Has been fixed and should work from now on</li>
+                <li>Can now search for negativ RCV</li>
                 <br>
-                <li>Izo/Blamenco/Namule finished</li>
+                <li>And we hit Unit #1000</li>
+                <li>Yay~~~~</li>
+                <br>
+                <li>So many new Units</li>
+                <li>So little we know about them</li>
                 <br>
                 <li>Slot Planner can now </li>
                 <li>Import the current Calculator Team</li>

From 15ce2d3a00cfd8d74e7e8deeddcc7f3dffc79744 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 27 Mar 2016 01:48:30 -0500
Subject: [PATCH 0209/1569] Update Info Corazon

Names/Violet Special
---
 common/data/details.js | 13 ++++++++++++-
 common/data/units.js   | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index bceb3fe1b..da747eed0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4608,6 +4608,17 @@ window.details = {
         specialName: "Martial Art Diving Fist",
         special: "Boosts own ATK by 1.75x for 1 turn and deals 800 fixed damage to one enemy",
         specialNotes: "#{fixed}"
-    }
+    },
+	994:{
+		special: "Reduce special cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
+		specialName: "Peeping Mind",
+		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
+	},
+	995:{
+		special: "Reduce special cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
+		specialName: "Peeping Mind",
+		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
+	}
+
 
 };
diff --git a/common/data/units.js b/common/data/units.js
index 14ee5b0dc..f479e3645 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -988,16 +988,16 @@ window.units = [
     [],
     [],
     [],
-    [ "Unknown Unit #1","INT",["Free Spirit","Tough"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #1 Evolution","INT",["Free Spirit","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #2","QCK",["Shooter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #2 Evolution","QCK",["Shooter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #3","PSY",["Fighter","Knowledge"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #3 Evolution","PSY",["Fighter","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #4","DEX",["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #4 Evolution","DEX",["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #5","STR",["Ambition","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #5 Evolution","STR",["Ambition","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #6","DEX",["Free Spirit","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Unit #6 Evolution","DEX",["Free Spirit","Knowledge"], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Machvise Evolution","INT",["Free Spirit","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gladius Evolution","QCK",["Shooter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Violet Evolution","PSY",["Fighter","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dellinger Evolution","DEX",["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Diamante","STR",["Ambition","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Diamante Evolution","STR",["Ambition","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Corazon","DEX",["Free Spirit","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Corazon Evolution","DEX",["Free Spirit","Knowledge"], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
 ];

From 9f232d45c4c89b9fb7b66216613f57e67aedb5cb Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 27 Mar 2016 05:07:09 -0500
Subject: [PATCH 0210/1569] Names

& Families
---
 common/data/families.js | 22 +++++++++++++++++++++-
 common/data/units.js    | 12 ++++++------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 62ed6cf24..ac85667a7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -979,5 +979,25 @@ window.families = [
     "Kizaru",
     "Izo",
     "Blamenco",
-    "Namule"
+    "Namule",
+	"Vista",
+	"Vista",
+	"Paulie",
+	null,
+	null,
+	null,
+	null,
+	null,
+	"Machvise",
+	"Machvise",
+	"Gladius",
+	"Gladius",
+	"Violet",
+	"Violet",
+	"Dellinger",
+	"Dellinger",
+	"Diamante",
+	"Diamante",
+	"Corazon",
+	"Corazon"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f479e3645..6cada13b7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -989,15 +989,15 @@ window.units = [
     [],
     [],
     [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Machvise Evolution","INT",["Free Spirit","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gladius Evolution","QCK",["Shooter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Violet Evolution","PSY",["Fighter","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dellinger Evolution","DEX",["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Diamante","STR",["Ambition","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Diamante Evolution","STR",["Ambition","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Corazon","DEX",["Free Spirit","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Corazon Evolution","DEX",["Free Spirit","Knowledge"], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
 ];

From 44b8ad7e5a61787192f9bf58f33d8f07964e5575 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 28 Mar 2016 12:11:22 +0200
Subject: [PATCH 0211/1569] Update

---
 common/data/cooldowns.js | 10 +++++-----
 common/data/details.js   | 14 +++++++++++---
 index.html               |  7 ++-----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index bd4275a38..751a87681 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -956,11 +956,11 @@ window.cooldowns = [
 	16,
 	20,
 	20,
-	18,
-	18,
-	22,
-	16,
-	16,
+	[ 18, 10 ],
+	[ 18, 10 ],
+	[ 22, 14 ],
+	[ 16, 8 ],
+	[ 16, 8 ],
 	23,
 	23,
 	23,
diff --git a/common/data/details.js b/common/data/details.js
index da747eed0..5afaf530d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3983,13 +3983,13 @@ window.details = {
 	877: {
 		captain: "Boosts amount of beli received by 2x",
 		specialName: "Heaven's Do Art",
-		special: "Reduces any damage received above 2,000 HP by 88% for 1 turn",
+		special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
 		specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
 	},
 	878: {
 		captain: "Boosts ATK of all characters by 1.5x, boosts amount of beli received by 2x",
 		specialName: "Heaven's Do Art",
-		special: "Reduces any damage received above 2,000 HP by 88% for 1 turn",
+		special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
 		specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
 	},
 	879: {
@@ -4609,7 +4609,15 @@ window.details = {
         special: "Boosts own ATK by 1.75x for 1 turn and deals 800 fixed damage to one enemy",
         specialNotes: "#{fixed}"
     },
-	994:{
+    990: {
+        specialName: "10,000 Ton Vise of Hell",
+        special: "Changes [RCV] orbs into matching orbs"
+    },
+    991: {
+        specialName: "10,000 Ton Vise of Hell",
+        special: "Changes [RCV] orbs into matching orbs"
+    },
+	994: {
 		special: "Reduce special cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
diff --git a/index.html b/index.html
index cfca0a451..3db5bbbf0 100644
--- a/index.html
+++ b/index.html
@@ -52,16 +52,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>25/03/2016</p>
+            <p>28/03/2016</p>
             <br>
             <ul>
                 <li>Can now search for negativ RCV</li>
                 <br>
-                <li>And we hit Unit #1000</li>
-                <li>Yay~~~~</li>
-                <br>
                 <li>So many new Units</li>
-                <li>So little we know about them</li>
+                <li>Machvise Special added</li>
                 <br>
                 <li>Slot Planner can now </li>
                 <li>Import the current Calculator Team</li>

From 5d5f5c22e55b97174af0beff8f2a59277abb6a55 Mon Sep 17 00:00:00 2001
From: Christoph Gebendorfer <gebendorfer@icewave.org>
Date: Mon, 28 Mar 2016 19:15:06 +0200
Subject: [PATCH 0212/1569] probability calculator

---
 index.css                            |   1 +
 index.html                           |  13 +-
 probability/index.css                | 709 +++++++++++++++++++++++++++
 probability/index.html               |  77 +++
 probability/js/app.js                |  64 +++
 probability/js/controllers.js        | 251 ++++++++++
 probability/js/directives.js         | 136 +++++
 probability/js/socketprobability.js  |  85 ++++
 probability/js/specialprobability.js |  67 +++
 probability/js/states.js             |  43 ++
 probability/views/main.html          |  83 ++++
 probability/views/picker.html        |  38 ++
 probability/views/popup/reset.html   |  20 +
 probability/views/wheel.html         |  22 +
 14 files changed, 1602 insertions(+), 7 deletions(-)
 create mode 100644 probability/index.css
 create mode 100644 probability/index.html
 create mode 100644 probability/js/app.js
 create mode 100644 probability/js/controllers.js
 create mode 100644 probability/js/directives.js
 create mode 100644 probability/js/socketprobability.js
 create mode 100644 probability/js/specialprobability.js
 create mode 100644 probability/js/states.js
 create mode 100644 probability/views/main.html
 create mode 100644 probability/views/picker.html
 create mode 100644 probability/views/popup/reset.html
 create mode 100644 probability/views/wheel.html

diff --git a/index.css b/index.css
index 19e14481c..65655cdde 100644
--- a/index.css
+++ b/index.css
@@ -81,6 +81,7 @@ body {
 .red    { background-color: #E96D63; }
 .purple { background-color: #DA70D6; }
 .yellow { background-color: #F4BA70; }
+.pink   { background-color: #DEA5A4; }
 
 .green:hover  { background-color: #6EB98E; }
 .blue:hover   { background-color: #74B0E4; }
diff --git a/index.html b/index.html
index cfca0a451..0088b1cc5 100644
--- a/index.html
+++ b/index.html
@@ -47,21 +47,20 @@
             <a class="animated zoomInLeft button yellow" href="drops">Drop Table</a>
             <a class="animated zoomInRight button red" href="mats">Evolution Helper</a>
             <a class="animated zoomInLeft button purple" href="slots">Slot Planner</a>
+			<a class="animated zoomInRight button pink" href="probability">Probability Calculator</a>
 
         </div> 
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>25/03/2016</p>
+            <p>23/03/2016</p>
             <br>
             <ul>
-                <li>Can now search for negativ RCV</li>
+                <li>Added Kizaru</li>
+                <li>Regarding his Special:</li>
+                <li>Has been fixed and should work from now on</li>
                 <br>
-                <li>And we hit Unit #1000</li>
-                <li>Yay~~~~</li>
-                <br>
-                <li>So many new Units</li>
-                <li>So little we know about them</li>
+                <li>Izo/Blamenco/Namule finished</li>
                 <br>
                 <li>Slot Planner can now </li>
                 <li>Import the current Calculator Team</li>
diff --git a/probability/index.css b/probability/index.css
new file mode 100644
index 000000000..ee47599a6
--- /dev/null
+++ b/probability/index.css
@@ -0,0 +1,709 @@
+/********
+ * MAIN *
+ ********/
+
+html, body, body > [ui-view] {
+    height: 100%;
+    cursor: default !important;
+}
+
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+  display: none !important;
+}
+
+#outer-container, #container {
+    width: 100%;
+    height: 100%;
+}
+
+#outer-container {
+    display: table;
+}
+
+#container {
+    vertical-align: middle;
+    text-align: center;
+}
+
+#content {
+    display: inline-block;
+}
+
+#calculation-area {
+	padding-bottom: 10px;
+}
+
+#settings > label > input {
+	position: relative;
+	right: 1px;
+	top: 2px;
+}
+
+#special-sheet {
+	margin-left: auto;
+	margin-right: auto;
+	left: 0;
+	right: 0;
+}
+
+p {
+	margin: 0px;
+}
+
+.small-container {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	border-bottom: 1px solid #eee;
+	width: 408px;
+	margin: 0 auto;
+}
+
+.loose-container {
+	padding-top: 10px;
+	padding-bottom: 10px;
+	border-bottom: 1px solid #eee;
+}
+
+
+.page-header {
+	width: 408px;
+	margin-left: auto;
+	margin-right: auto;
+	margin-bottom: 10px;
+}
+
+.result {
+	font-weight: 30;
+	font-size: 30px;
+}
+
+.slots {
+    display: inline-block;
+}
+
+.unit {
+    width: 100px;
+    height: 100px;
+    border: 1px solid black;
+    cursor: pointer;
+    background-size: 100px 100px;
+    background-position: -1px -1px;
+	margin: 0 auto;
+}
+
+.unit:hover {
+    border-color: red;
+}
+
+.unit.empty {
+    border-style: dashed !important;
+    opacity: 0.5;
+}
+
+.slot {
+    display: inline-block;
+    cursor: pointer;
+    position: relative;
+}
+
+.slot:not(#add):hover {
+    outline: 1px solid red;
+}
+
+.slot.medium {
+    width: 80px;
+    height: 80px;
+    background-size: 80px 80px;
+    margin: 2px;
+}
+
+.slot.small {
+    width: 40px;
+    height: 40px;
+    background-size: 40px 40px;
+    margin: 1px;
+}
+
+.number-field {
+	width: 60px;
+}
+
+.unitContainer, .ghostContainer {
+    width: 100%;
+    top: 27px;
+    left: -1px;
+	padding-bottom: 10px;
+}
+
+.ghoster .unitContainer {
+    z-index: 201 !important;
+}
+
+.ghosted .unitContainer {
+    display: none;
+}
+
+slot-wheel {
+    position: relative;
+	display: inline-block;
+	padding-left: 1px;
+	padding-right: 1px;
+}
+
+slot-wheel > .ghoster {
+    z-index: 300;
+}
+
+#removeZone {
+    position: fixed;
+    right: 5px;
+    top: 5px;
+    border-color: red;
+    opacity: 1;
+    background-position: 10px 10px;
+    font-size: 3em;
+    line-height: 1.5em;
+    color: salmon;
+    text-align: center;
+}
+
+#urlContainer {
+    margin-top: 10px;
+}
+
+#urlContainer {
+    position: relative;
+    top: 1px;
+    height: 0;
+    white-space: nowrap;
+    overflow: hidden;
+    transition: height 0.1s linear;
+    -moz-transition: height 0.1s linear;
+}
+
+#urlContainer.visible {
+    height: 37px;
+}
+
+#urlContainer > button {
+    width: 10%;
+    margin-right: 5px;
+    padding: 3px 6px;
+}
+
+#urlContainer > input {
+    width: 100%;
+}
+
+#transient {
+    padding: 5px;
+    margin: 15px auto 0 auto;
+    cursor: pointer;
+}
+
+#transient:hover {
+    background-color: #FF9E9E;
+    border-color: #EC92A0;
+}
+
+#transient > span {
+    text-decoration: underline;
+    cursor: help;
+}
+
+#transient-explanation {
+    padding: 10px;
+}
+
+.quick-fill {
+    width: 62px;
+    height: 21px;
+    margin: 2px 0 2px 0;
+    outline: 1px solid #777;
+    text-align: center;
+    cursor: pointer;
+    visibility: hidden;
+}
+
+.quick-fill.visible {
+    visibility: visible;
+}
+
+.quick-fill:hover {
+    background: #ddd;
+}
+
+.label.label-danger {
+    display: inline-block;
+    white-space: nowrap;
+}
+
+#canvasContainer {
+    text-align: center;
+}
+
+canvas {
+    border: 1px solid black;
+}
+
+/**********
+ * COLORS *
+ **********/
+
+.color0 { background: #ff6666; }
+.color1 { background: #ff9966; }
+.color2 { background: #ffcc33; }
+.color3 { background: #ffff99; }
+.color4 { background: #ccff99; }
+.color5 { background: #99cc66; }
+.color6 { background: #99cccc; }
+.color7 { background: #0099ff; }
+.color8 { background: #cc99ff; }
+.color9 { background: #cc55cc; }
+
+/*************
+ * ABILITIES *
+ *************/
+
+#slotContainer td:nth-child(3) {
+    width: 100%;
+}
+
+#slotContainer input {
+    width: 50px;
+}
+
+.ability-button {
+    width: 62px;
+    height: 43px;
+    margin: 2px 0 2px 0;
+    position: relative;
+    vertical-align: top;
+}
+
+.inner-backdrop {
+    position: absolute;
+    top: -1px;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 99;
+    background: rgba(255,255,255,0.85);
+}
+
+.busy .ability-button:not(.active) {
+    pointer-events: none;
+    z-index: 1;
+}
+
+.ability-button.active {
+    z-index: 101;
+}
+
+.ability-button:not(.active) .abilitySlot {
+    display: none;
+}
+
+.ability-button .btn, .abilitySlot {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    padding: 0;
+}
+
+.slot-container {
+    position: relative;
+}
+
+.slot-frame {
+    position: absolute;
+    left: 10px;
+    width: 43px;
+    height: 43px;
+    background-position: -320px 0px;
+    background-size: 363px 43px;
+    background-image: url('../res/abilities.png') !important;
+}
+
+.ability-button .trigger {
+    z-index: 100;
+    cursor: pointer;
+    position: relative;
+    top: 5px;
+}
+
+.active:not(#links-button) .trigger {
+    background: salmon !important;
+    z-index: 102;
+}
+
+.abilitySlot {
+    position: absolute;
+    top: 3px;
+    left: 16px;
+    z-index: 1;
+}
+
+.ability {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    cursor: pointer;
+    box-shadow: inset 0 0 1pt 1pt black, 0 0 1pt 1pt white;
+    -webkit-box-shadow: inset 0 0 1pt 1pt black, 0 0 1pt 1pt white;
+    -moz-box-shadow: inset 0 0 1pt 1pt black, 0 0 1pt 1pt white;
+}
+
+.ability:hover {
+    box-shadow: inset 0 0 1pt 1pt black, 0 0 1pt 1pt red;
+    -webkit-box-shadow: inset 0 0 1pt 1pt black, 0 0 1pt 1pt red;
+    -moz-box-shadow: inset 0 0 1pt 1pt black, 0 0 1pt 1pt red;
+}
+
+#ability-table td {
+    vertical-align: middle;
+}
+
+#ability-table td:first-child {
+    width: 0%;
+}
+
+#ability-table td:last-child {
+    width: 100%;
+}
+
+#ability-table .next {
+    color: rgb(100,100,100);
+}
+
+#ability-table .inactive {
+    color: red;
+    font-weight: bold;
+}
+
+.abilityLevel {
+    position: absolute;
+    bottom: 1px;
+    right: 3px;
+    font-size: 11px;
+    font-weight: bold;
+    color: white;
+    text-shadow: 0 0 1px black, -1px 0 1px black, 1px 0 1px black, 0 1px 1px black, 0 -1px 1px black;
+    cursor: pointer;
+}
+
+/***************
+ * POSITIONING *
+ ***************/
+
+.abilitySlot:nth-child(1) {
+    -webkit-transform: rotate(0);
+    transform: rotate(0);
+}
+
+.abilitySlot:nth-child(1) > .ability {
+    transform: translateY(-4em);
+    -webkit-transform: translateY(-4em);
+}
+
+.abilitySlot:nth-child(1) > .ability, tr:nth-child(1) td > .ability {
+    background-position: 0 -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(2) {
+    -webkit-transform: rotate(36deg);
+    transform: rotate(36deg);
+}
+
+.abilitySlot:nth-child(2) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-36deg);
+    transform: translateY(-4em) rotate(-36deg);
+}
+
+.abilitySlot:nth-child(2) > .ability, tr:nth-child(2) td > .ability {
+    background-position: -32px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(3) {
+    -webkit-transform: rotate(72deg);
+    transform: rotate(72deg);
+}
+
+.abilitySlot:nth-child(3) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-72deg);
+    transform: translateY(-4em) rotate(-72deg);
+}
+
+.abilitySlot:nth-child(3) > .ability, tr:nth-child(3) td > .ability {
+    background-position: -64px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(4) {
+    -webkit-transform: rotate(108deg);
+    transform: rotate(108deg);
+}
+
+.abilitySlot:nth-child(4) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-108deg);
+    transform: translateY(-4em) rotate(-108deg);
+}
+
+.abilitySlot:nth-child(4) > .ability, tr:nth-child(4) td > .ability {
+    background-position: -96px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(5) {
+    -webkit-transform: rotate(144deg);
+    transform: rotate(144deg);
+}
+
+.abilitySlot:nth-child(5) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-144deg);
+    transform: translateY(-4em) rotate(-144deg);
+}
+
+.abilitySlot:nth-child(5) > .ability, tr:nth-child(5) td > .ability {
+    background-position: -128px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(6) {
+    -webkit-transform: rotate(180deg);
+    transform: rotate(180deg);
+}
+
+.abilitySlot:nth-child(6) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-180deg);
+    transform: translateY(-4em) rotate(-180deg);
+}
+
+.abilitySlot:nth-child(6) > .ability, tr:nth-child(6) td > .ability {
+    background-position: -160px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(7) {
+    -webkit-transform: rotate(216deg);
+    transform: rotate(216deg);
+}
+
+.abilitySlot:nth-child(7) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-216deg);
+    transform: translateY(-4em) rotate(-216deg);
+}
+
+.abilitySlot:nth-child(7) > .ability, tr:nth-child(7) td > .ability {
+    background-position: -192px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(8) {
+    -webkit-transform: rotate(252deg);
+    transform: rotate(252deg);
+}
+
+.abilitySlot:nth-child(8) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-252deg);
+    transform: translateY(-4em) rotate(-252deg);
+}
+
+.abilitySlot:nth-child(8) > .ability, tr:nth-child(8) td > .ability {
+    background-position: -224px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(9) {
+    -webkit-transform: rotate(288deg);
+    transform: rotate(288deg);
+}
+
+.abilitySlot:nth-child(9) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-288deg);
+    transform: translateY(-4em) rotate(-288deg);
+}
+
+.abilitySlot:nth-child(9) > .ability, tr:nth-child(9) td > .ability {
+    background-position: -256px -7px;
+    background-size: 363px 43px;
+}
+
+.abilitySlot:nth-child(10) {
+    -webkit-transform: rotate(324deg);
+    transform: rotate(324deg);
+}
+
+.abilitySlot:nth-child(10) > .ability {
+    -webkit-transform: translateY(-4em) rotate(-324deg);
+    transform: translateY(-4em) rotate(-324deg);
+}
+
+.abilitySlot:nth-child(10) > .ability, tr:nth-child(10) td > .ability {
+    background-position: -288px -7px;
+    background-size: 363px 43px;
+}
+
+.ability-button:not(.active) .abilityBackground {
+    display: none;
+}
+
+/**********
+ * POPUPS *
+ **********/
+
+.popup {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    display: table;
+    z-index: 300;
+    top: 0;
+    left: 0;
+}
+
+.popup:not(.visible) {
+    display: none;
+}
+
+.backdrop {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,0.65);
+    z-index: 300;
+}
+
+.inner-container {
+    position: relative;
+    display: table-cell;
+    width: 100%;
+    height: 100%;
+    vertical-align: middle;
+    z-index: 301;
+}
+
+.custom-modal {
+    position: relative;
+    z-index: 301;
+    width: 705px;
+    margin: auto;
+}
+
+.modal-dialog {
+    width: 705px;
+}
+
+.modal-content {
+    border-radius: 0;
+}
+
+.modal-header {
+    background-color: #428bca;
+    color: white;
+}
+
+.modal-header a {
+    color: white;
+}
+
+.modal-footer {
+    background-color: rgb(235,235,235);
+}
+
+.animated {
+    animation-duration: 0.2s;
+    -webkit-animation-duration: 0.2s;
+}
+
+.modal-filter {
+    width: 100%;
+}
+
+.modal-div:not(.slim) {
+    height: 340px;
+    overflow: auto;
+}
+
+.modal-div.tiny {
+    height: 42px;
+};
+
+.modal-div td {
+    padding-left: 5px;
+}
+
+.modal-div table {
+    width: 100%;
+}
+
+.modal-div th {
+    padding: 10px 0 10px 0;
+}
+
+.modal-div .to-the-right {
+    text-align: right;
+}
+
+.modal-div.padded {
+    padding: 10px;
+}
+
+#recent > span {
+    border-bottom: 1px solid black;
+    display: block;
+}
+
+#recentUnits {
+    height: 42px;
+    margin-top: 5px;
+}
+
+#saveSlot .alert-danger {
+    margin-bottom: 0;
+}
+
+#saveSlot .padded {
+    padding-bottom: 0;
+}
+
+#loadSlot .modal-div {
+    padding-top: 10px;
+}
+
+#loadSlot tr:hover {
+    background: #ddd;
+    cursor: pointer;
+}
+
+#loadSlot td > div {
+    vertical-align: middle;
+}
+
+#loadSlot td:first-child {
+    padding-left: 5px;
+}
+
+#summary .label {
+    font-size: 85%;
+}
+
+/***************
+ * BACKGROUNDS *
+ ***************/
+
+.abilityBackground {
+    width: 160px;
+    height: 165px;
+    -webkit-transform: translate(-48px, -95px);
+    transform: translate(-48px, -95px);
+    background-image: url('../res/wheel.png');
+}
+
+.ability, .slotsBackground {
+    background-image: url('../res/abilities.png') !important;
+}
diff --git a/probability/index.html b/probability/index.html
new file mode 100644
index 000000000..f8548d6f0
--- /dev/null
+++ b/probability/index.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<html lang="en" ng-app="optc">
+
+    <head>
+
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=yes, user-scalable=1">
+        <meta name="description" itemprop="description" content="One Piece Treasure Cruise Probability Calculator">
+
+        <title>One Piece Treasure Cruise Probability Calculator</title>
+
+        <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/animate.css" />
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/bootstrap.min.css" />
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/bootstrap-dialog.min.css" />
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/font-awesome.min.css" />
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/ngDialog.min.css" />
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/ngDialog-theme-default.min.css" />
+
+        <link rel="stylesheet" type="text/css" href="../common/css/links.css" />
+
+        <link rel="stylesheet" type="text/css" href="index.css" />
+
+        <script src="../common/libs/js/es5-shim.min.js"></script>
+        <script src="../common/libs/js/jquery.min.js"></script>
+        <script src="../common/libs/js/angular.min.js"></script>
+        <script src="../common/libs/js/angular-ui-router.min.js"></script>
+        <script src="../common/libs/js/bootstrap.min.js"></script>
+        <script src="../common/libs/js/jquery.noty.packaged.min.js"></script>
+
+        <script src="../common/libs/js/interact.min.js"></script>
+        <script src="../common/libs/js/jquery.longpress.js"></script>
+        <script src="../common/libs/js/ui-bootstrap-tpls.min.js"></script>
+        <script src="../common/libs/js/ngDialog.min.js"></script>
+
+        <script src="../common/data/units.js"></script>
+        <script src="../common/data/aliases.js"></script>
+        <script src="../common/data/abilities.js"></script>
+
+        <script src="../common/js/utils.js"></script>
+
+        <script src="js/app.js"></script>
+        <script src="js/states.js"></script>
+        <script src="js/controllers.js"></script>
+        <script src="js/directives.js"></script>
+
+        <script src="../common/js/directives.js"></script>
+        <script src="../common/js/services.js"></script>
+        <script src="../common/js/dragger.js"></script>
+        <!--<script src="../common/js/error.js"></script>-->
+        <script src="../common/js/dismissal.js"></script>
+
+        <script>
+          (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-73715806-1', 'auto');
+          ga('send', 'pageview', '/slots');
+        </script>
+
+    </head>
+
+    <body>
+
+        <div ui-view ng-cloak></div>
+
+        <div class="popup" ui-view="popup" ng-class="{ visible: isPopupVisible }"></div>
+
+        <error-report></error-report>
+        <link-button exclude="slots"></link-button>
+
+    </body>
+
+</html>
diff --git a/probability/js/app.js b/probability/js/app.js
new file mode 100644
index 000000000..dd1f9e07a
--- /dev/null
+++ b/probability/js/app.js
@@ -0,0 +1,64 @@
+(function() {
+
+var app = angular.module('optc', [ 'ui.router', 'ui.bootstrap', 'ngDialog' ]);
+
+Utils.parseUnits(false);
+
+/******************
+ * STATE HANDLING *
+ ******************/
+
+app.run(function($rootScope, $state) {
+        $rootScope.$on('$stateChangeSuccess',function(e) {
+            var state = $state.current.name;
+            $rootScope.isPopupVisible = (state != 'main');
+        });
+    });
+	
+app.factory("SpecialProbability",['$q',function($q){
+	
+    return {
+        compute : function(data){
+			var worker = new Worker('js/specialprobability.js');
+			var defer = $q.defer();
+			worker.addEventListener('message', function(e) {
+				//console.log('Worker said: ', e.data);
+				defer.notify(e.data);
+				if (e.data.finished == true) {
+					defer.resolve(e.data);
+					worker.terminate();
+				} 
+			}, false);
+	
+            worker.postMessage(data); // Send data to our worker. 
+            return defer.promise;
+        }
+    };
+
+}]);
+
+
+app.factory("SocketProbability",['$q',function($q){
+	
+    return {
+        compute : function(data){
+			var worker = new Worker('js/socketprobability.js');
+			var defer = $q.defer();
+			worker.addEventListener('message', function(e) {
+				//console.log('Worker said: ', e.data);
+				defer.notify(e.data);
+				if (e.data.finished == true) {
+					defer.resolve(e.data);
+					worker.terminate();
+				}
+			}, false);
+	
+            worker.postMessage(data); // Send data to our worker. 
+            return defer.promise;
+        }
+    };
+
+}]);
+	
+})();
+
diff --git a/probability/js/controllers.js b/probability/js/controllers.js
new file mode 100644
index 000000000..1e667d9b1
--- /dev/null
+++ b/probability/js/controllers.js
@@ -0,0 +1,251 @@
+/* jshint loopfunc: true */
+
+(function() {
+
+var controllers = { };
+
+/************
+ * MainCtrl *
+ ************/
+
+controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$controller', '$timeout', '$window', 'SpecialProbability', 'SocketProbability', function($scope, $rootScope, $state, $stateParams, $controller, $timeout, $window, SpecialProbability, SocketProbability) { 
+
+    $rootScope.character = null;
+    $rootScope.options = { transient: false };
+	
+    $scope.skillups = null;
+    $scope.copies = null;
+	$scope.slots = null;
+	$scope.specialEvent = false;
+	
+	$scope.specialProbabilityProgress = 0;
+	$scope.specialProbabilityProgressBar = null;
+	$scope.specialProbabilityResult = 0;
+	$scope.specialProbabilityColor = null;
+	$scope.isSpecialReady = true;
+	// calculate Special Up
+	$scope.calculateSpecialUp = function() {
+		if ($scope.copies == null || $scope.skillups == null) {
+			window.alert("Please enter your amount of copies and the amount of skillups needed");
+			return;
+		}
+		$scope.isSpecialReady = false;
+		var data = {copies: $scope.copies, skillups: $scope.skillups, special_event: $scope.specialEvent};
+		SpecialProbability.compute(data).then(
+			function(data) {
+				if (data.finished == true) {
+					if (data.result >= 0.6) {
+						$scope.specialProbabilityColor = "green";
+					} else if (data.result >= 0.3) {
+						$scope.specialProbabilityColor = "orange";
+					} else {
+						$scope.specialProbabilityColor = "red";
+					}
+					$scope.specialProbabilityResult = (data.result * 100).toFixed(1);
+					$scope.specialProbabilityProgressBar = "Complete";
+					$scope.isSpecialReady = true;
+				} 
+			}, 
+			null, 
+			function(data) {
+				$scope.specialProbabilityProgress = data.progress;
+				$scope.specialProbabilityProgressBar = data.progress + "%";
+			}
+		);
+	};
+	
+	$scope.socketProbabilityProgress = 0;
+	$scope.socketProbabilityProgressBar = null;
+	$scope.socketProbabilityResult = 0;
+	$scope.socketProbabilityColor = null;
+	$scope.isSocketReady = true;
+	// calculate Socket Up
+	$scope.calculateSocketUp = function() {
+		if ($scope.copies == null || $scope.character == null) {
+			window.alert("Please enter your amount of copies and pick the character you want to socket");
+			return;
+		}
+		$scope.isSocketReady = false;
+		// create slot array
+		var slots = Array.apply(null, Array($scope.slots)).map(function (x) { return 0; });;
+		for (i = 0; i < $scope.character.slots.length; ++i) {
+			console.log($scope.character.slots[i]);
+			var obj = $scope.character.slots[i];
+			if (obj != null) {
+				slots[i] = obj.level;
+			} else {
+				slots[i] = 0;
+			}
+		}
+		var data = {copies: $scope.copies, slots: slots};
+		SocketProbability.compute(data).then(
+			function(data) {
+				if (data.finished == true) {
+					if (data.result >= 0.6) {
+						$scope.socketProbabilityColor = "green";
+					} else if (data.result >= 0.3) {
+						$scope.socketProbabilityColor = "orange";
+					} else {
+						$scope.socketProbabilityColor = "red";
+					}
+					$scope.socketProbabilityResult = (data.result * 100).toFixed(1);
+					$scope.socketProbabilityProgressBar = "Complete";
+					$scope.isSocketReady = true;
+				} 
+			}, 
+			null, 
+			function(data) {
+				$scope.socketProbabilityProgress = data.progress;
+				$scope.socketProbabilityProgressBar = data.progress + "%";
+			}
+		);
+	};
+	
+    $rootScope.changeUnit = function(unit, uid) {
+        $scope.character = { uid: uid, slots: [ ] };
+		$scope.slots = $scope.slotCount(uid);
+    };
+
+    $scope.range = function(min, max) {
+        var result = new Array(max - min);
+        for (var i=0;i<result.length;++i) result[i] = min + i;
+        return result;
+    };
+
+    $scope.slotCount = function(uid) {
+        if (!uid) return 0;
+        return units[uid - 1].slots;
+    };
+
+    $scope.onRemove = function(i) {
+        $rootScope.character = null;
+        if (!$rootScope.$$phase) $rootScope.$apply();
+    };
+
+    $scope.generateURL = function() {
+
+        var result, character = $rootScope.character;
+
+        // team
+        var tokens = [ ];
+		var unit = character;
+		if (!unit || !unit.uid) tokens.push('!');
+		else {
+			var temp = unit.slots
+				.filter(function(x) { return x; })
+				.map(function(x) { return x.id + '' + x.level; })
+				.join('');
+			tokens.push(unit.uid + ':' + temp);
+		}
+        
+
+        result = '#/transfer/S' + tokens.join(',') + 'P';
+        $scope.url = window.location.href.match(/^(.+?)#/)[1] + result;
+
+        $timeout(function() {
+            $('#urlContainer > input').select();
+        });
+
+    };
+
+    var notifications = { };
+
+    $rootScope.notify = function(data) {
+        data = jQuery.extend({ type: 'information' },data);
+        if (data.name && notifications[data[name]]) notifications[data[name]].close(); 
+        var notification = noty(jQuery.extend({ timeout: 2500, layout: 'topRight', theme: 'relax' }, data));
+        if (data.name) notifications[data[name]] = notification;
+        return notification;
+
+    };
+    
+	$controller('StorageCtrl', { $scope: $scope });
+    $controller('DismissalCtrl');
+
+}];
+
+/**************
+ * PickerCtrl *
+ **************/
+
+controllers.PickerCtrl = function($scope, $state, $stateParams, $storage) { 
+
+    /* * * * * Scope variables * * * * */
+
+    $scope.units = [ ];
+    $scope.query = '';
+	$scope.recents = $storage.get('slotRecentUnits', [ ]);
+
+    $scope.isMats = $stateParams.mats;
+
+    $scope.$watch('query',function() { populateList(); },true);
+
+    /* * * * * Scope functions * * * * */
+
+    $scope.pickUnit = function(unitNumber) {
+        $scope.changeUnit($stateParams.unit, unitNumber + 1);
+		updateRecent(unitNumber);
+        $state.go('^');
+    };
+
+    /* * * * * List generation * * * * */
+
+    var populateList = function() {
+        $scope.units = [ ];
+        var result, parameters = Utils.generateSearchParameters($scope.query);
+        if (parameters === null) return;
+        result = window.units.filter(function(x) { return x !== null && x !== undefined && x.hasOwnProperty('number'); });
+        // filter by query
+        if (parameters.query) {
+            result = result.filter(function(unit) {
+                return parameters.query.test(Utils.getFullUnitName(unit.number + 1));
+            });
+        }
+        $scope.units = result;
+    };
+
+	var updateRecent = function(unitNumber) {
+        var recentUnits = JSON.parse(JSON.stringify($scope.recents));
+        var n = recentUnits.indexOf(unitNumber);
+        if (n < 0) recentUnits.unshift(unitNumber);
+        else recentUnits = recentUnits.splice(n,1).concat(recentUnits);
+        recentUnits = recentUnits.slice(0,16);
+		$storage.set('slotRecentUnits', recentUnits);
+    };
+
+};
+
+/***************
+ * StorageCtrl *
+ ***************/
+
+controllers.StorageCtrl = function($scope, $rootScope, $storage) {
+    var character = $storage.get('slotCharacter', null);
+    if (character === null) {
+		character = $rootScope.character;
+	} else {
+		$rootScope.character = character;
+	}
+};
+
+
+/*************
+ * ResetCtrl *
+ *************/
+
+controllers.ResetCtrl = function($scope, $rootScope, $state) {
+    $scope.resetStorage = function() {
+        $rootScope.character = null;
+        $state.go('^');
+    };
+};
+
+/******************
+ * Initialization *
+ ******************/
+
+for (var controller in controllers)
+    angular.module('optc')
+        .controller(controller, controllers[controller]);
+
+})();
diff --git a/probability/js/directives.js b/probability/js/directives.js
new file mode 100644
index 000000000..ad76133fb
--- /dev/null
+++ b/probability/js/directives.js
@@ -0,0 +1,136 @@
+/* jshint eqnull: true */
+
+(function() {
+
+var app = angular.module('optc');
+
+var directives = { };
+
+/**********************
+ * Element directives *
+ **********************/
+
+directives.slotWheel = function() {
+    return {
+        restrict: 'E',
+        templateUrl: 'views/wheel.html',
+        link: function(scope, element, attrs) {
+
+            element.find('.trigger').click(function() {
+                var isActive = element.hasClass('active');
+                if (isActive) {
+					scope.character.slots[scope.slotNumber] = null;
+				}
+                element.find('.ability-button').toggleClass('active');
+                element.toggleClass('active'); 
+                if (!scope.$$phase) {
+					scope.$apply();
+				}
+            });
+
+            scope.isUsed = function(id) {
+                return scope.character.slots.some(function(x,p) {
+                    return x && p != scope.slotNumber && x.id == id;
+                });
+            };
+
+            scope.pickAbility = function(e,id) {
+                var slots = scope.character.slots;
+                if (!slots[scope.slotNumber] || slots[scope.slotNumber].id != id) {
+                    slots[scope.slotNumber] = { id: id, level: 5 };
+				}
+                element.find('.ability-button').toggleClass('active');
+                element.toggleClass('active'); 
+                if (!scope.$$phase) scope.$apply();
+            };
+
+            scope.pickLevel = function(e) {
+                var n;
+                if (e.which == 2 || e.ctrlKey || e.metaKey) {
+					n = 5;
+				} else {
+					n = parseInt(prompt('Ability level:'), 10);
+				} 
+                if (isNaN(n) || n < 0 || n > 5) {
+					return;
+				}
+                scope.character.slots[scope.slotNumber].level = n;
+            };
+
+        }
+    };
+};
+
+/************************
+ * Attribute directives *
+ ************************/
+
+directives.decorateSlot = function() {
+    return {
+        restrict: 'A',
+        scope: { uid: '=' },
+        link: function(scope, element, attrs) {
+            var update = function(uid) {
+                if (!uid) element[0].style.backgroundImage = null;
+                else {
+                    var url = Utils.getThumbnailUrl(scope.uid);
+                    element[0].style.backgroundImage = 'url(' + url + ')';
+                }
+            };
+            scope.$watch('uid', update);
+        }
+    };
+};
+
+directives.attachPicker = function() {
+    return {
+        restrict: 'A',
+        scope: true,
+        controller: function($scope, $state) { $scope.$state = $state; },
+        link: function(scope, element, attrs) {
+            element.longpress(function() { },function(e) {
+                if (e.which != 1 || e.ctrlKey || e.metaKey || e.altKey || e.shiftKey) return;
+                if (!$(e.target).hasClass('unit')) return;
+                if ($(this).hasClass('slide') || $(this).hasClass('dragging')) return;
+                scope.$state.go('.pick',{ unit: scope.unitNumber });
+            });
+        }
+    };
+};
+
+directives.autoFocus = function($timeout) {
+	return {
+		restrict: 'A',
+		link: function(scope, element, attrs) {
+			$timeout(function(){ element[0].focus(); });
+		}
+	};
+};
+
+directives.addAbility = function() {
+    return {
+        restrict: 'A',
+        link: function(scope, element, attrs) {
+
+            scope.$watch('character.slots[slotNumber]',function(slot) {
+                element.removeClass('slotsBackground');
+                element.parent().parent().removeClass('color0 color1 color2 color3 color4 color5 color6 color7 color8 color9');
+                if (!slot || slot.id === undefined) return;
+                element.addClass('slotsBackground');
+                element.css('background-position', (-32*slot.id-1) + 'px -7px');
+                element.css('background-size', '363px 43px');
+                element.parent().parent().addClass('color' + slot.id);
+            },true);
+
+        }
+    };
+};
+
+/******************
+ * Initialization *
+ ******************/
+
+for (var directive in directives)
+    app.directive(directive, directives[directive]);
+
+})();
diff --git a/probability/js/socketprobability.js b/probability/js/socketprobability.js
new file mode 100644
index 000000000..7f0479116
--- /dev/null
+++ b/probability/js/socketprobability.js
@@ -0,0 +1,85 @@
+onmessage = function(e) {
+
+	var copies = parseInt(e.data.copies);
+	var slots = e.data.slots;
+	var temp = slots.slice(0);
+
+	console.log(slots);
+	
+	var approximationLimit = 500000;
+	var domain = 10;
+	var max_sockets = 5;
+	 //Array.apply(null, Array(slots)).map(function (x) { return 0; }); // intialize [0, ... , 0] length = #slots
+	var successful = 0;
+	var draw_result = 0;
+	var maxed = true;
+	
+	var socketProgress = 0;
+	var data = null;
+	
+	for (var i = 0; i < approximationLimit; i++) {
+		for (var j = 0; j < copies; j++) {
+			do {
+				draw_result = draw(0, domain - 1);
+				
+				// if socket is a socket we don't need
+				if (draw_result >= slots.length) {
+					break;
+				}
+				
+				// check if pulled socket is already maxed
+				if (slots[draw_result] < max_sockets) {
+					slots[draw_result]++;
+					break;
+				} 
+				
+				// we get here if socket pulled is already maxed and we pull again without subtracting the copy count (lazy solution)
+			} while (true);
+			
+		}
+		// check if all slots were maxed
+		for (var k = 0; k < slots.length; k++) {
+			if (slots[k] < max_sockets) {
+				maxed = false;
+				break;
+			}
+		}
+		
+		if (maxed == true) {
+			successful++;
+		}
+		// reset all variables
+		slots = temp.slice(0);
+		maxed = true;
+		drawResult = 0;
+		
+		if (i % 5000 == 0) {
+			//console.log(i);
+			
+			socketProgress = Math.round(i / approximationLimit * 100);
+			data = 
+			{
+				finished: false,
+				progress: socketProgress
+				
+			};
+			postMessage(data);
+	
+		}
+	}
+	//console.log("successful: " + successful);
+	//console.log(approximationLimit);
+	var prob = successful / approximationLimit;
+	data = 
+	{
+		finished: true,
+		result: prob,
+		progress: 100
+	};
+	postMessage(data);
+	
+}
+
+function draw(min, max) {
+	return Math.floor(Math.random() * (max - min + 1) + min);
+}
\ No newline at end of file
diff --git a/probability/js/specialprobability.js b/probability/js/specialprobability.js
new file mode 100644
index 000000000..8b3f29b5f
--- /dev/null
+++ b/probability/js/specialprobability.js
@@ -0,0 +1,67 @@
+onmessage = function(e) {
+
+	var copies = parseInt(e.data.copies);
+	var skillups = parseInt(e.data.skillups);
+	
+	var probability = 0.125;
+	// if special event selected probability is doubled
+	if (e.data.special_event == true) {
+		probability *= 2;
+	}
+	
+	var prob = 0;
+	var result = 0;
+	
+	var socketProgress = 0;
+	var data = null;
+	
+	for (var i = skillups; i < copies; i++) {
+		result = binomial(copies, i, probability);
+		prob += result;
+		
+		socketProgress = Math.round(i / copies * 100);
+		
+		data = 
+		{
+			finished: false,
+			progress: socketProgress
+			
+		};
+		postMessage(data);
+		
+	}
+	
+	data = 
+	{
+		finished: true,
+		result: prob,
+		progress: 100
+	};
+	postMessage(data);
+}
+
+function binomial(copies, skillups, probability) {
+	return coefficient(copies, skillups) * Math.pow(probability, skillups)
+			* Math.pow((1 - probability), copies - skillups);
+}
+
+function coefficient(n, k) {
+	if (k == 0) {
+		return 1;
+	} else if (k > n || k < 0 || n < 0) {
+		return 0;
+	} else {
+		var denominator = facculty(n, n - k + 1);
+		var counter = facculty(k, 1);
+
+		return denominator / counter;
+	}
+}
+
+function facculty(start, end) {
+	if (start > end) {
+		return start * facculty(start - 1, end);
+	} else {
+		return end;
+	}
+}
\ No newline at end of file
diff --git a/probability/js/states.js b/probability/js/states.js
new file mode 100644
index 000000000..4e055abc0
--- /dev/null
+++ b/probability/js/states.js
@@ -0,0 +1,43 @@
+(function() {
+
+angular.module('optc').config(function($stateProvider, $urlRouterProvider) {
+
+    $urlRouterProvider.otherwise('/');
+
+    $stateProvider
+
+        .state('main',{
+            url: '^/',
+            views: {
+                '': {
+                    templateUrl: 'views/main.html',
+                    controller: 'MainCtrl',
+                }
+            }
+        })
+
+        .state('main.pick',{
+            views: {
+                'popup@': {
+                    templateUrl: 'views/picker.html',
+                    controller: 'PickerCtrl'
+                }
+            },
+            params: { unit: 0 }
+        })
+         
+         
+        .state('main.reset',{
+            views: {
+                'popup@': {
+                    templateUrl: 'views/popup/reset.html',
+                    controller: 'ResetCtrl'
+                }
+            }
+        })
+         
+
+
+});
+
+})();
diff --git a/probability/views/main.html b/probability/views/main.html
new file mode 100644
index 000000000..e370153dc
--- /dev/null
+++ b/probability/views/main.html
@@ -0,0 +1,83 @@
+<div id="outer-container">
+    <div id="container">
+        <div id="content">
+				<h1 class="page-header">
+					Probability Calculator
+				</h1>
+            <div >
+                <div class="small-container" attach-picker>
+
+                    <div class="unitContainer">
+
+                        <div class="unit" decorate-slot uid="character.uid"
+                            ng-class="{ empty: !character || !character.uid }"></div>
+
+                    </div>
+
+                    <div class="slots">
+
+                        <slot-wheel ng-repeat="slotNumber in range(0, slotCount(character.uid))">
+                        </slot-wheel>
+
+                    </div>
+
+                </div>
+            </div>
+			
+			<div id="calculation-area">
+				
+				<div class="small-container">
+					Copies/Books: <input type="text" class="number-field" ng-model="copies" placeholder="e.g. 65" auto-focus
+						ng-change="changeBaseValues()" id="copies">
+					Skillups: <input type="text" class="number-field" ng-model="skillups" placeholder="e.g. 10" auto-focus
+						ng-change="changeBaseValues()" id="skillups">
+					<label><input type="checkbox" ng-model="specialEvent" ng-change="changeBaseValues()">SpecialUp Event</label>
+					
+				</div>
+				
+				<div class="small-container">
+					<p>  
+					Probability to get {{skillups}} skillups with {{copies}} copies/books:<br>
+					<label ng-attr-style="color: {{specialProbabilityColor}}" class="result">{{specialProbabilityResult}}%</label>
+					</p>
+					<uib-progressbar animate="false" value="specialProbabilityProgress" type="success"><b>{{specialProbabilityProgressBar}}</b></uib-progressbar>
+					<button ng-click="!isSpecialReady||calculateSpecialUp()">Calculate</button>
+				</div>
+
+				<div class="small-container">
+					<p>  
+					Probability to max above slots with {{copies}} copies/books: <br>
+					<label ng-attr-style="color: {{socketProbabilityColor}}" class="result">{{socketProbabilityResult}}% </label>
+					</p>
+					<uib-progressbar animate="false" value="socketProbabilityProgress" type="success"><b>{{socketProbabilityProgressBar}}</b></uib-progressbar>
+					<button ng-click="!isSocketReady||calculateSocketUp()">Calculate</button>
+				</div>
+
+				
+
+			</div>
+
+            <div id="urlContainer" ng-class="{ visible: url }">
+                <input ng-model="url"></input>
+            </div>
+
+            <div id="buttonContainer">
+
+                <button class="btn btn-danger" ui-sref="main.reset" ng-disabled="!character"  uib-tooltip="Reset" tooltip-append-to-body="true">
+                    <i class="fa fa-eraser"></i>
+                </button>
+
+                <button class="btn btn-success" ng-click="generateURL()" ng-disabled="!character"  uib-tooltip="Export URL" tooltip-append-to-body="true">
+                    <i class="fa fa-exchange"></i>
+                </button>
+
+            </div>
+
+            <div id="transient" class="alert alert-danger" ng-show="options.transient" ng-click="options.transient = false"  uib-tooltip="Save" tooltip-append-to-body="true">
+                <i class="fa fa-lock"></i>
+                Transient mode enabled. Click to disable.
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/probability/views/picker.html b/probability/views/picker.html
new file mode 100644
index 000000000..4ed7ce275
--- /dev/null
+++ b/probability/views/picker.html
@@ -0,0 +1,38 @@
+<div class="backdrop" ui-sref="^"></div>
+
+<div class="inner-container" go-back>
+
+    <div class="custom-modal">
+        <div id="picker" class="modal-dialog">
+            <div class="modal-content animated fadeInDown">
+                <div class="modal-header">Pick a Unit</div>
+                <div class="modal-body">
+
+                    <input type="text" id="picker" placeholder="type to filter"
+                        ng-model="query" ng-model-options="{ debounce: 500 }" auto-focus class="modal-filter">
+
+                    <div id="pickerUnits" class="modal-div">
+                        <div class="slot medium" ng-repeat="unit in units" ng-click="pickUnit(unit.number)"
+                            decorate-slot="static" uid="unit.number + 1" flag="true">
+                        </div> 
+                    </div>
+
+                    <div id="recent">
+                        <span>Recently picked</span>
+                        <div id="recentUnits">
+                            <div class="slot small" ng-repeat="unit in recents" ng-click="pickUnit(unit)"
+                                decorate-slot uid="unit + 1" flag="true">
+                            </div> 
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-default" ui-sref="^">Cancel</button> 
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+</div>
diff --git a/probability/views/popup/reset.html b/probability/views/popup/reset.html
new file mode 100644
index 000000000..194dd7de7
--- /dev/null
+++ b/probability/views/popup/reset.html
@@ -0,0 +1,20 @@
+<div class="backdrop" ui-sref="^"></div>
+
+<div class="inner-container" go-back>
+
+    <div class="custom-modal">
+        <div id="picker" class="modal-dialog">
+            <div class="modal-content animated fadeInDown">
+                <div class="modal-header">Reset</div>
+                <div class="modal-body slim">
+                    Are you sure? It won't be pretty.
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-default" ng-click="resetStorage()">Yep</button> 
+                    <button class="btn btn-primary" ui-sref="^">Nope</button> 
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>
diff --git a/probability/views/wheel.html b/probability/views/wheel.html
new file mode 100644
index 000000000..2b81018a9
--- /dev/null
+++ b/probability/views/wheel.html
@@ -0,0 +1,22 @@
+<div class="menu ability-button">
+
+    <div class="slot-container">
+        <div class="slot-frame"></div>
+        <div class="btn trigger" add-ability></div>
+    </div>
+
+    <div class="icons">
+
+        <div class="abilitySlot" ng-repeat="k in range(0,10)">
+            <div class="ability" ng-if="!isUsed(k)" ng-click="pickAbility($event,k)"></div>
+        </div>
+
+        <div class="abilityBackground"></div>
+
+        <div class="abilityLevel" ng-show="character.slots[slotNumber]" ng-click="pickLevel($event)">
+            {{character.slots[slotNumber].level}}
+        </div>
+
+    </div>
+
+</div>

From 836c322bf8dc6563bfb120d1f5cdc3645e21f0d2 Mon Sep 17 00:00:00 2001
From: Christoph Gebendorfer <gebendorfer@icewave.org>
Date: Mon, 28 Mar 2016 19:23:59 +0200
Subject: [PATCH 0213/1569] Update index.html

---
 index.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 0088b1cc5..9db07e37c 100644
--- a/index.html
+++ b/index.html
@@ -53,14 +53,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>23/03/2016</p>
+            <p>25/03/2016</p>
             <br>
             <ul>
-                <li>Added Kizaru</li>
-                <li>Regarding his Special:</li>
-                <li>Has been fixed and should work from now on</li>
+                <li>Can now search for negativ RCV</li>
                 <br>
-                <li>Izo/Blamenco/Namule finished</li>
+                <li>And we hit Unit #1000</li>
+                <li>Yay~~~~</li>
+                <br>
+                <li>So many new Units</li>
+                <li>So little we know about them</li>
                 <br>
                 <li>Slot Planner can now </li>
                 <li>Import the current Calculator Team</li>

From 0d99a4e6b1eb33460c264f0a8f35344477142251 Mon Sep 17 00:00:00 2001
From: Christoph Gebendorfer <gebendorfer@icewave.org>
Date: Mon, 28 Mar 2016 19:32:02 +0200
Subject: [PATCH 0214/1569] pink hover added

---
 index.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.css b/index.css
index 65655cdde..a83eda56b 100644
--- a/index.css
+++ b/index.css
@@ -88,3 +88,4 @@ body {
 .red:hover    { background-color: #D85C52; }
 .purple:hover { background-color: #C96995; }
 .yellow:hover { background-color: #E3A969; }
+.pink:hover   { background-color: #A57777; }

From cb891e096a7989591d9c03f4c6136fed0a2ccfa5 Mon Sep 17 00:00:00 2001
From: Christoph Gebendorfer <gebendorfer@icewave.org>
Date: Mon, 28 Mar 2016 19:32:22 +0200
Subject: [PATCH 0215/1569] format

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 9db07e37c..12fe00417 100644
--- a/index.html
+++ b/index.html
@@ -47,7 +47,7 @@
             <a class="animated zoomInLeft button yellow" href="drops">Drop Table</a>
             <a class="animated zoomInRight button red" href="mats">Evolution Helper</a>
             <a class="animated zoomInLeft button purple" href="slots">Slot Planner</a>
-			<a class="animated zoomInRight button pink" href="probability">Probability Calculator</a>
+	    <a class="animated zoomInRight button pink" href="probability">Probability Calculator</a>
 
         </div> 
         <div class="animated zoomIn blue" id="changelog">

From c372c98583837453448d0ad9ac504abd8f201ead Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 28 Mar 2016 12:54:09 -0500
Subject: [PATCH 0216/1569] Special Cooldown Reducer added

new filter for Specials
---
 common/data/details.js  |  4 ++--
 common/data/matchers.js | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 5afaf530d..c3a54d419 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4618,12 +4618,12 @@ window.details = {
         special: "Changes [RCV] orbs into matching orbs"
     },
 	994: {
-		special: "Reduce special cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
+		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
 	},
 	995:{
-		special: "Reduce special cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
+		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
 	}
diff --git a/common/data/matchers.js b/common/data/matchers.js
index d1bc6f03d..e5c0378fc 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -290,19 +290,19 @@ window.matchers = [
     {
         name: 'Bind reducers',
         target: 'special',
-        matcher: /reduces.+bind.+duration/i,
+        matcher: /reduces.+bind.+duration/i
     },
 
     {
         name: 'Despair reducers',
         target: 'special',
-        matcher: /reduces.+despair.+duration/i,
+        matcher: /reduces.+despair.+duration/i
     },
 
     {
         name: 'Block orb removers',
         target: 'special',
-        matcher: /(empties.+with \[BLOCK\]|changes.+\[BLOCK\].+into|including.+\[BLOCK\])/i,
+        matcher: /(empties.+with \[BLOCK\]|changes.+\[BLOCK\].+into|including.+\[BLOCK\])/i
     },
 
     {
@@ -339,6 +339,12 @@ window.matchers = [
         name: 'Zombies',
         target: 'special',
         matcher: /Protects from defeat/i
-    }
+    },
+	
+	{
+		name: 'Special Cooldown Reducer',
+		target: 'special',
+		matcher: /reduces special cooldown/i
+	}
 
 ];

From 2638fe7c08dcdf473d04aeb82f0184cd8a47ea05 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 28 Mar 2016 16:54:51 -0500
Subject: [PATCH 0217/1569] Clarification

Clearing up how Probability works.
---
 probability/js/directives.js | 2 +-
 probability/views/main.html  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/probability/js/directives.js b/probability/js/directives.js
index ad76133fb..7b849ee80 100644
--- a/probability/js/directives.js
+++ b/probability/js/directives.js
@@ -37,7 +37,7 @@ directives.slotWheel = function() {
             scope.pickAbility = function(e,id) {
                 var slots = scope.character.slots;
                 if (!slots[scope.slotNumber] || slots[scope.slotNumber].id != id) {
-                    slots[scope.slotNumber] = { id: id, level: 5 };
+                    slots[scope.slotNumber] = { id: id, level: 1 };
 				}
                 element.find('.ability-button').toggleClass('active');
                 element.toggleClass('active'); 
diff --git a/probability/views/main.html b/probability/views/main.html
index e370153dc..5fc9f89cf 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -46,7 +46,9 @@ <h1 class="page-header">
 
 				<div class="small-container">
 					<p>  
-					Probability to max above slots with {{copies}} copies/books: <br>
+					Probability to max above Powers with {{copies}} copies: <br>
+					Note: Slots chosen above are how many you CURRENTLY have on the character <br>
+					To change how many of a type you have, click on the number <br>
 					<label ng-attr-style="color: {{socketProbabilityColor}}" class="result">{{socketProbabilityResult}}% </label>
 					</p>
 					<uib-progressbar animate="false" value="socketProbabilityProgress" type="success"><b>{{socketProbabilityProgressBar}}</b></uib-progressbar>

From 87e35623472be3fc785fab992ad65241a88281ec Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 28 Mar 2016 17:00:25 -0500
Subject: [PATCH 0218/1569] More small fixes

just text
---
 index.html                  | 6 +++---
 probability/views/main.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 261e32b1c..b37aff7cc 100644
--- a/index.html
+++ b/index.html
@@ -56,10 +56,10 @@
             <p>28/03/2016</p>
             <br>
             <ul>
-                <li>Can now search for negativ RCV</li>
+                <li>New Probability Calculator</li>
                 <br>
-                <li>So many new Units</li>
-                <li>Machvise Special added</li>
+                <li>Still Under Beta Testing</li>
+                <li>Please Report Bugs</li>
                 <br>
                 <li>Slot Planner can now </li>
                 <li>Import the current Calculator Team</li>
diff --git a/probability/views/main.html b/probability/views/main.html
index 5fc9f89cf..a931fdb20 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -47,7 +47,7 @@ <h1 class="page-header">
 				<div class="small-container">
 					<p>  
 					Probability to max above Powers with {{copies}} copies: <br>
-					Note: Slots chosen above are how many you CURRENTLY have on the character <br>
+					Note: Slots chosen above are how many you CURRENTLY have <br>
 					To change how many of a type you have, click on the number <br>
 					<label ng-attr-style="color: {{socketProbabilityColor}}" class="result">{{socketProbabilityResult}}% </label>
 					</p>

From 6e6061a70f639f458ed4c66e288b1f5cdec5167a Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 29 Mar 2016 01:37:15 +0200
Subject: [PATCH 0219/1569] Improved Prob Integration

Also some quick sanity checking + instructions
---
 common/css/links.css                     |  7 +++++
 common/views/links.html                  |  7 +++++
 damage/views/content.html                |  2 +-
 index.html                               |  4 +--
 probability/index.html                   |  2 +-
 probability/js/controllers.js            | 14 +++++++--
 probability/js/specialprobability.js     |  4 ++-
 probability/js/states.js                 | 10 ++++++
 probability/views/main.html              |  6 +++-
 probability/views/popup/instruction.html | 39 ++++++++++++++++++++++++
 10 files changed, 87 insertions(+), 8 deletions(-)
 create mode 100644 probability/views/popup/instruction.html

diff --git a/common/css/links.css b/common/css/links.css
index 3f44e42fb..341e4dfa8 100644
--- a/common/css/links.css
+++ b/common/css/links.css
@@ -173,6 +173,12 @@
     transform: translateX(-18em);
 }
 
+#links-button.active .rotater:nth-child(7) > a {
+    -webkit-transform: translateX(-21em);
+    -ms-transform: translateX(-21em);
+    transform: translateX(-21em);
+}
+
 #link-damage > .btn { background: #85C1F5; }
 #link-characters > .btn { background: #7FCA9F; }
 #link-drops > .btn { background: #F4BA70; }
@@ -180,6 +186,7 @@
 #link-report > .btn { background: orchid; }
 #link-slots > .btn { background: #99cc66; }
 #links-home > .btn { background: #939393; }
+#link-prob > .btn { background: #DEA5A4; }
 
 .tip { color: black; }
 
diff --git a/common/views/links.html b/common/views/links.html
index 1c4a9ef7d..2dd0a21b1 100644
--- a/common/views/links.html
+++ b/common/views/links.html
@@ -20,6 +20,13 @@
             </a>
             <a class="tip">Bug report</a>
         </div>
+        
+        <div class="rotater" id="link-prob" title="Probability" ng-if="exclude != 'prob'">
+            <a class="btn btn-icon" href="../probability">
+                <i class="fa fa-arrow-up"></i>
+            </a>
+            <a class="tip">Probabilities</a>
+        </div>
 
         <div class="rotater" id="link-drops" title="Drop table" ng-if="exclude != 'drops'">
             <a class="btn btn-icon" target="_blank" href="../drops">
diff --git a/damage/views/content.html b/damage/views/content.html
index 005c08274..9f340f0c5 100644
--- a/damage/views/content.html
+++ b/damage/views/content.html
@@ -33,7 +33,7 @@
                 uib-tooltip="Export Image" tooltip-append-to-body="true">
             <i class="fa fa-picture-o"></i>
         </button>
-        <button type="button" class="btn" ui-sref=".instruction" title="Instructions"
+        <button type="button" class="btn" ui-sref="main.instruction" title="Instructions"
                 uib-tooltip="Instructions" tooltip-append-to-body="true">
             <i class="fa fa-question-circle"></i>
         </button>
diff --git a/index.html b/index.html
index 261e32b1c..cfdf0ed37 100644
--- a/index.html
+++ b/index.html
@@ -61,8 +61,8 @@
                 <li>So many new Units</li>
                 <li>Machvise Special added</li>
                 <br>
-                <li>Slot Planner can now </li>
-                <li>Import the current Calculator Team</li>
+                <li>Added a Probability Calculator</li>
+                <li>This is a WIP, so things may go wrong</li>
             </ul>
         </div>
     </body>
diff --git a/probability/index.html b/probability/index.html
index f8548d6f0..76c49794d 100644
--- a/probability/index.html
+++ b/probability/index.html
@@ -70,7 +70,7 @@
         <div class="popup" ui-view="popup" ng-class="{ visible: isPopupVisible }"></div>
 
         <error-report></error-report>
-        <link-button exclude="slots"></link-button>
+        <link-button exclude="prob"></link-button>
 
     </body>
 
diff --git a/probability/js/controllers.js b/probability/js/controllers.js
index 1e667d9b1..99e953669 100644
--- a/probability/js/controllers.js
+++ b/probability/js/controllers.js
@@ -33,6 +33,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 		var data = {copies: $scope.copies, skillups: $scope.skillups, special_event: $scope.specialEvent};
 		SpecialProbability.compute(data).then(
 			function(data) {
+                console.log(data);
 				if (data.finished == true) {
 					if (data.result >= 0.6) {
 						$scope.specialProbabilityColor = "green";
@@ -41,7 +42,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 					} else {
 						$scope.specialProbabilityColor = "red";
 					}
-					$scope.specialProbabilityResult = (data.result * 100).toFixed(1);
+					$scope.specialProbabilityResult = Math.min((data.result * 100),99.9).toFixed(1);
 					$scope.specialProbabilityProgressBar = "Complete";
 					$scope.isSpecialReady = true;
 				} 
@@ -88,7 +89,8 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 					} else {
 						$scope.socketProbabilityColor = "red";
 					}
-					$scope.socketProbabilityResult = (data.result * 100).toFixed(1);
+					$scope.socketProbabilityResult = Math.min((data.result * 100),99.9).toFixed(1);
+                    console.log($scope.socketProbabilityResult);
 					$scope.socketProbabilityProgressBar = "Complete";
 					$scope.isSocketReady = true;
 				} 
@@ -239,6 +241,14 @@ controllers.ResetCtrl = function($scope, $rootScope, $state) {
         $state.go('^');
     };
 };
+    
+/*******************
+ * InstructionCtrl *
+ ******************/
+
+controllers.InstructionCtrl = function() {
+    //Do nothing
+};
 
 /******************
  * Initialization *
diff --git a/probability/js/specialprobability.js b/probability/js/specialprobability.js
index 8b3f29b5f..d63a93ef5 100644
--- a/probability/js/specialprobability.js
+++ b/probability/js/specialprobability.js
@@ -20,7 +20,7 @@ onmessage = function(e) {
 		prob += result;
 		
 		socketProgress = Math.round(i / copies * 100);
-		
+         
 		data = 
 		{
 			finished: false,
@@ -31,6 +31,8 @@ onmessage = function(e) {
 		
 	}
 	
+    if (isNaN(prob) || !isFinite(prob))
+        prob = 0.999;
 	data = 
 	{
 		finished: true,
diff --git a/probability/js/states.js b/probability/js/states.js
index 4e055abc0..271ff4137 100644
--- a/probability/js/states.js
+++ b/probability/js/states.js
@@ -35,6 +35,16 @@ angular.module('optc').config(function($stateProvider, $urlRouterProvider) {
                 }
             }
         })
+    
+        .state('main.instruction',{
+                    url: 'instruction',
+                    views: {
+                        'popup@': {
+                            templateUrl: 'views/popup/instruction.html',
+                            controller: 'InstructionCtrl'
+                        }
+                    }
+                })
          
 
 
diff --git a/probability/views/main.html b/probability/views/main.html
index e370153dc..202385c4b 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -31,7 +31,7 @@ <h1 class="page-header">
 						ng-change="changeBaseValues()" id="copies">
 					Skillups: <input type="text" class="number-field" ng-model="skillups" placeholder="e.g. 10" auto-focus
 						ng-change="changeBaseValues()" id="skillups">
-					<label><input type="checkbox" ng-model="specialEvent" ng-change="changeBaseValues()">SpecialUp Event</label>
+					<label><input type="checkbox" ng-model="specialEvent" ng-change="changeBaseValues()">Special x2 Event</label>
 					
 				</div>
 				
@@ -70,6 +70,10 @@ <h1 class="page-header">
                 <button class="btn btn-success" ng-click="generateURL()" ng-disabled="!character"  uib-tooltip="Export URL" tooltip-append-to-body="true">
                     <i class="fa fa-exchange"></i>
                 </button>
+                
+                <button type="button" class="btn" ui-sref="main.instruction" title="Instructions" uib-tooltip="Instructions" tooltip-append-to-body="true">
+                    <i class="fa fa-question-circle"></i>
+                </button>
 
             </div>
 
diff --git a/probability/views/popup/instruction.html b/probability/views/popup/instruction.html
new file mode 100644
index 000000000..691dd8a3a
--- /dev/null
+++ b/probability/views/popup/instruction.html
@@ -0,0 +1,39 @@
+<div class="backdrop" ui-sref="^"></div>
+
+<div class="inner-container" go-back>
+
+    <div class="custom-modal">
+        <div id="picker" class="modal-dialog">
+            <div class="modal-content animated fadeInDown">
+                <div class="modal-header">Instructions</div>
+                    <div class="modal-body slim">
+                        <div id="instructions">
+                            How to use this Calculator:
+                            <br>
+                            <ol>
+                                <li>Select the Unit you want to Skill up/Socket</li>
+                                <li>Enter whatever Sockets you already have on that Unit</li>
+                                <ul>
+                                    <li>Click on a Socket to change its level</li>
+                                </ul>
+                                <li>Enter the Amount of Books/Duplicates you have of that Unit</li>
+                                <li>Enter the Amount of Skill Ups you need</li>
+                                <ul>
+                                    <li>If you want to calculate the chance during a Special Level Chance Up Event,<br> check the box for it</li>
+                                </ul>
+                                <li>Click Calculate for whichever Number you want to calculate</li>
+                                <li>Go and cry in a corner because the chance is way too low</li>
+                            </ol>
+
+                       
+                           <b>Disclaimer:</b><br><tt>This is only Probability Calculation with averages collected by the comunity. <br>Don't come crying to us when you didn't farm enough mihawks because the calculation put you close to 100% <br>You should also look up how probabilites work if you want to blame us</tt>
+                        </div>
+                    </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary" ui-sref="^">Go Back</button> 
+                </div>
+            </div>
+        </div>
+    </div>
+
+</div>

From 3ffd7fb347075647451f0843ce2cc41a6c7b5540 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 29 Mar 2016 10:23:14 +0200
Subject: [PATCH 0220/1569] Kid Law Update

Only missing min stats and exp iirc
---
 common/data/details.js    | 12 ++++++++++++
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 ++--
 common/data/specials.js   | 24 ++++++++++++++++++++++++
 common/data/units.js      |  4 ++--
 common/data/zombies.js    |  8 ++++++++
 index.html                |  4 ++--
 probability/index.html    |  2 +-
 8 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c3a54d419..4b2fc5798 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3698,6 +3698,18 @@ window.details = {
 		specialName: "Poison of the Ancient Knight",
 		special: "Boosts ATK against poisoned enemies by 1.05x for 999 turns"
 	},
+    828: {
+        specialName: "Surprise Stab",
+        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Ambition characters by 1.75x for 1 turns if used below 20% HP",
+        captain: "Protects from defeat as long as HP is above 50%",
+		captainNotes: "#{zombie}" 
+    },
+    829: {
+        specialName: "Surprise Stab",
+        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Ambition characters by 1.75x for 1 turns if used below 20% HP",
+        captain: "Protects from defeat as long as HP is above 30%",
+		captainNotes: "#{zombie}" 
+    },
 	830: {
 		captain: "Boosts ATK of Knowledge and Striker characters by 1.75x, deals 2 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
 		specialName: "Karma Conviction",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 35e6d4252..495b8c482 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1259,6 +1259,10 @@ window.evolutions = {
 		evolution: [ 816, 894 ],
 		evolvers: [ [ 117, 88, 94, 304, 104 ], [ 117, 88, 94, 99, 104 ] ]
 	},
+    828: {
+        evolution: 829,
+        evolvers: [ 115, 116, 117, 118 ]
+    },
 	830: {
 		evolution: 831,
 		evolvers: [ 118, 86, 94, 302, 102 ]
diff --git a/common/data/families.js b/common/data/families.js
index ac85667a7..7624cc09c 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -826,8 +826,8 @@ window.families = [
 	"General Zombie",
 	"General Zombie",
 	"General Zombie",
-	null,
-	null,
+	"Trafalgar Law",
+	"Trafalgar Law",
 	"Basil Hawkins",
 	"Basil Hawkins",
 	"Wyper",
diff --git a/common/data/specials.js b/common/data/specials.js
index de5781c7c..23e0fc19e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -720,6 +720,30 @@ window.specials = {
 		type: "condition",
 		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
 	},
+    828: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Ambition") ? window.specials[828].multiplier : 1; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (p.percHP < 20 ? 1.75 : 1);
+			window.specials[828].multiplier = n;
+			p.scope.notify({
+				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+				name: '828warning'
+			});
+		}  
+    },
+    829: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Ambition") ? window.specials[829].multiplier : 1; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (p.percHP < 20 ? 1.75 : 1);
+			window.specials[829].multiplier = n;
+			p.scope.notify({
+				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+				name: '829warning'
+			});
+		}
+    },
 	832: {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
 		type: "class"
diff --git a/common/data/units.js b/common/data/units.js
index 6cada13b7..b6375cea1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -826,8 +826,8 @@ window.units = [
 	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
 	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	[],
-	[],
+	["Kid Law","QCK",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, null, null, null, 455, 497, 222, null],
+	["Kid Law Evolution","QCK",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, null, null, null, 696, 762, 390, null],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index db6f1b31e..666a0cc51 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -179,6 +179,14 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    828: { //Kid Law
+        type: 'zombie',
+        treshold: 0.5
+    },
+    829: { //Kid Law Evolution
+        type: 'zombie',
+        treshold: 0.3
+    },
     841: { // Monet
         type: 'healer',
         multiplier: 3
diff --git a/index.html b/index.html
index 361693763..e2f7b5e34 100644
--- a/index.html
+++ b/index.html
@@ -61,8 +61,8 @@
                 <li>Still Under Beta Testing</li>
                 <li>Please Report Bugs</li>
                 <br>
-                <li>Added a Probability Calculator</li>
-                <li>This is a WIP, so things may go wrong</li>
+                <li>Added Kid Law</li>
+                <li>He is #828 and #829</li>
             </ul>
         </div>
     </body>
diff --git a/probability/index.html b/probability/index.html
index 76c49794d..af492fad8 100644
--- a/probability/index.html
+++ b/probability/index.html
@@ -58,7 +58,7 @@
           })
           (window,document,'script','//www.google-analytics.com/analytics.js','ga');
           ga('create', 'UA-73715806-1', 'auto');
-          ga('send', 'pageview', '/slots');
+          ga('send', 'pageview', '/probability');
         </script>
 
     </head>

From 3314c118339645d4f5be90ad68d5421129d4151d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 29 Mar 2016 09:27:33 -0500
Subject: [PATCH 0221/1569] Gladius

special added
---
 common/data/details.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 4b2fc5798..ab38246ea 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4629,6 +4629,14 @@ window.details = {
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
     },
+	992: {
+		special: "Cuts the current HP of each enemy by __% and changes own orb into [QCK]",
+		specialName: "Punc Rock Fest"
+	},
+	993: {
+		special: "Cuts the current HP of each enemy by __% and changes own orb into [QCK]",
+		specialName: "Punc Rock Fest"
+	},
 	994: {
 		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",

From 08ae6c9655fc4f4f415e1407913b19092a253151 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 29 Mar 2016 10:12:23 -0500
Subject: [PATCH 0222/1569] Kid Law

PSY not QCK
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index b6375cea1..1a2c3f33e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -826,8 +826,8 @@ window.units = [
 	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
 	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	["Kid Law","QCK",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, null, null, null, 455, 497, 222, null],
-	["Kid Law Evolution","QCK",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, null, null, null, 696, 762, 390, null],
+	["Kid Law","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, null, null, null, 455, 497, 222, null],
+	["Kid Law Evolution","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, null, null, null, 696, 762, 390, null],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],

From a368430917e694bc4899214605036c751155ba51 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 29 Mar 2016 18:54:28 +0200
Subject: [PATCH 0223/1569] Added more Graphs

+ Calc Units start at lvl 99
---
 characters/css/index.css      |   4 ++
 characters/js/controllers.js  | 132 ++++++++++++++++++++++++++++++++++
 characters/views/details.html |  12 ++++
 damage/js/controllers.js      |   2 +-
 index.html                    |   8 ++-
 5 files changed, 156 insertions(+), 2 deletions(-)

diff --git a/characters/css/index.css b/characters/css/index.css
index 8cc1bc777..0132b6ad0 100644
--- a/characters/css/index.css
+++ b/characters/css/index.css
@@ -842,6 +842,10 @@ unit > a:hover, .clickable:hover {
     height: 320px;
 }
 
+.chart-line {
+    height: 338px !important;
+}
+
 /*******************
  * SLOT THUMBNAILS *
  *******************/
diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index b6b385848..844d1a55b 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -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);
@@ -199,14 +202,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();
     });
diff --git a/characters/views/details.html b/characters/views/details.html
index b502656cd..a3fe0fee9 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -121,6 +121,18 @@ <h3 class="page-header" ng-hide="hidden.stats">Stats</h3>
                             <canvas id="radar-chart" class="chart chart-radar" chart-data="radar.data"
                                 chart-labels="radar.labels" chart-options="radar.options"></canvas>
                         </uib-tab>
+                        <uib-tab heading="HP Growth" ng-if="!unit.incomplete">
+                            <canvas id="line-chart" class="chart chart-line" chart-data="radarHP.data" chart-series="radarHP.series"
+                                chart-labels="radarHP.labels"></canvas>
+                        </uib-tab>
+                        <uib-tab heading="ATK Growth" ng-if="!unit.incomplete">
+                            <canvas id="line-chart" class="chart chart-line" chart-data="radarATK.data" chart-series="radarATK.series"
+                                chart-labels="radarATK.labels"></canvas>
+                        </uib-tab>
+                        <uib-tab heading="RCV Growth" ng-if="!unit.incomplete">
+                            <canvas id="line-chart" class="chart chart-line" chart-data="radarRCV.data" chart-series="radarRCV.series"
+                                chart-labels="radarRCV.labels"></canvas>
+                        </uib-tab>
                     </uib-tabset>
 
                     <!-- Abilities (non-comparison) -->
diff --git a/damage/js/controllers.js b/damage/js/controllers.js
index 78e989570..78db80093 100644
--- a/damage/js/controllers.js
+++ b/damage/js/controllers.js
@@ -44,7 +44,7 @@ controllers.PickerCtrl = function($scope, $state, $stateParams, $storage) {
     $scope.pickUnit = function(unitNumber) {
         $scope.resetSlot($stateParams.slot);
         $scope.data.team[$stateParams.slot].unit = units[unitNumber];
-        $scope.data.team[$stateParams.slot].level = 1;
+        $scope.data.team[$stateParams.slot].level = $scope.data.team[$stateParams.slot].unit.maxLevel;
         $scope.slotChanged($stateParams.slot);
         updateRecent(unitNumber);
         // captain warning
diff --git a/index.html b/index.html
index e2f7b5e34..6cc3e3b4b 100644
--- a/index.html
+++ b/index.html
@@ -53,7 +53,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>28/03/2016</p>
+            <p>29/03/2016</p>
             <br>
             <ul>
                 <li>New Probability Calculator</li>
@@ -63,6 +63,12 @@
                 <br>
                 <li>Added Kid Law</li>
                 <li>He is #828 and #829</li>
+                <br>
+                <li>Added Line Graphs for Stat Growth</li>
+                <li>Useful for Unit Comparisons</li>
+                <br>
+                <li>Calculator Units now Start at level 99</li>
+                <li>Who calculates with level 1s anyways?</li>
             </ul>
         </div>
     </body>

From 96537b606c24117769ce525d660eb71cef3a67a9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 29 Mar 2016 15:44:56 -0500
Subject: [PATCH 0224/1569] Kid Law

names
---
 common/data/aliases.js | 4 ++--
 common/data/units.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0c0144566..279cb82f4 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -826,8 +826,8 @@ window.aliases = {
     825: ['ジェネラルゾンビ　怪力の影',''],
     826: ['ジェネラルゾンビ　奇技の影',''],
     827: ['ジェネラルゾンビ　疾速の影',''],
-    828: ['？？？',''],
-    829: ['？？？',''],
+    828: ['？？？','','Kid Law','Young Law'],
+    829: ['？？？','','Kid Law','Young Law'],
     830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
     831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
     832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia' ],
diff --git a/common/data/units.js b/common/data/units.js
index 1a2c3f33e..ce5f0d26c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -826,8 +826,8 @@ window.units = [
 	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
 	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	["Kid Law","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, null, null, null, 455, 497, 222, null],
-	["Kid Law Evolution","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, null, null, null, 696, 762, 390, null],
+	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, null, null, null, 455, 497, 222, null],
+	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, null, null, null, 696, 762, 390, null],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],

From e536d016bec0dd78629d7b6bdbc582bc5bfc9c43 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 30 Mar 2016 09:47:29 +0200
Subject: [PATCH 0225/1569] Colo Update

---
 common/data/details.js    | 21 ++++++++++++++++++++-
 common/data/evolutions.js |  4 ++++
 common/data/units.js      |  6 +++---
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index ab38246ea..7f38035f9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4621,6 +4621,19 @@ window.details = {
         special: "Boosts own ATK by 1.75x for 1 turn and deals 800 fixed damage to one enemy",
         specialNotes: "#{fixed}"
     },
+    982: {
+        captain: "Boosts ATK of Slasher characters by 2x",
+        special: "Deals 25x character's ATK to one enemy, changes bottom row into matching orbs"
+    },
+    983: {
+        captain: "Boosts ATK of Slasher characters by 2.25x, makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters",
+        captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+        special: "Deals 25x character's ATK to one enemy, changes bottom row into matching orbs"
+    },
+    984: {
+        captain: "Boosts ATK of Striker characters by 2.25x",
+        special: "Delays all enemies for 1 turn, Locks all orbs for 1 turn"
+    },
     990: {
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
@@ -4646,7 +4659,13 @@ window.details = {
 		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
-	}
+	},
+    996: {
+        special: "For Tough characters, changes Bad orbs to Matching orbs."
+    },
+    997: {
+        special: "For Tough characters, changes Bad orbs to Matching orbs."
+    }
 
 
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 495b8c482..24569ecd7 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1462,5 +1462,9 @@ window.evolutions = {
     977: {
         evolution: 978,
         evolvers: [ 118, 85, 266, 301, 101 ]
+    },
+    982: {
+        evolution: 983,
+        evolvers: [ 118, 85, 94, 301, 101]
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index ce5f0d26c..6a75a5607 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -980,9 +980,9 @@ window.units = [
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
 	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
-    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, null, 1534, 634, 98, null, null, null, null ],
+    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, null, null, null, null, null, null, null ],
     [],
     [],
     [],

From 9dfc998a7bbac80e710db0f4b04cd571a5a92ac3 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 30 Mar 2016 09:48:28 +0200
Subject: [PATCH 0226/1569] Client forgot to pick up 2 more files

>_>
---
 common/data/captains.js | 9 +++++++++
 index.html              | 5 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 068cadb22..6ba4f9252 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2350,5 +2350,14 @@ window.captains = {
     981: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Tough") ? 2 : 1; },
         rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Tough") ? 0.1 : 1; }
+    },
+    982: {
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1}
+    },
+    983: {
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2.25  : 1}
+    },
+    984: {
+        atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1}
     }
 };
\ No newline at end of file
diff --git a/index.html b/index.html
index 6cc3e3b4b..edd4e37e8 100644
--- a/index.html
+++ b/index.html
@@ -53,7 +53,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>29/03/2016</p>
+            <p>30/03/2016</p>
             <br>
             <ul>
                 <li>New Probability Calculator</li>
@@ -61,8 +61,7 @@
                 <li>Still Under Beta Testing</li>
                 <li>Please Report Bugs</li>
                 <br>
-                <li>Added Kid Law</li>
-                <li>He is #828 and #829</li>
+                <li>Updated Colo Vista/Paulie</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>
                 <li>Useful for Unit Comparisons</li>

From b26a2377a0b55156e3ff10d6f5042f3d9a1c4e18 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 30 Mar 2016 09:16:37 -0500
Subject: [PATCH 0227/1569] stats for paulie/vista

just paulie max EXP
---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 6a75a5607..2ebe20e86 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -980,9 +980,9 @@ window.units = [
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
 	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
-    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, null, 1534, 634, 98, null, null, null, null ],
-    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
+    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
+    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, 1 ],
     [],
     [],
     [],

From b68657515d9721b52d92eaec9dbef957e0825ae9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 30 Mar 2016 13:19:00 -0500
Subject: [PATCH 0228/1569] Vista/Paulie specials

---
 common/data/cooldowns.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 751a87681..dda1a44cd 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -979,5 +979,8 @@ window.cooldowns = [
     null,
     [ 25, 18 ],
     [ 15, 7 ],
-    [ 16, 8 ]
+    [ 16, 8 ],
+	[ 22, 12 ],
+	[ 22, 12 ],
+	[ 22, 14 ]
 ];

From 9cb00bc9d131e223ea24f1be9b9d8abcce4534bf Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 30 Mar 2016 20:45:21 +0200
Subject: [PATCH 0229/1569] Transfer now always takes Defense

+ Disabled Vista Completion cuz no pics yet
---
 common/data/units.js  | 6 +++---
 damage/js/transfer.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 2ebe20e86..838405a64 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -980,9 +980,9 @@ window.units = [
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
 	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
-    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
-    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
-    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, 1 ],
+    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
+    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, null ],
+    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, null ],
     [],
     [],
     [],
diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index deafb7288..13a991df0 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -187,9 +187,9 @@ var ExportCtrl = function($scope) {
         result = '#/transfer/D' + tokens.join(',') + 'C';
 
         // others
-        
         result += data.ship[0] + ',' + data.ship[1] + 'B';
-        result += (data.defense && data.defense.constructor == Number ? data.defense : 0) + 'D';
+        //result += (data.defense && data.defense.constructor == Number ? data.defense : 0) + 'D';
+        result += data.defense + 'D';
         result += ($scope.data.effect ? window.effects[$scope.data.effect].id : 0) + 'E';
         result += parseInt(team.map(function(x) { return ({ '2': 1, '0.5': 2, 'g': 3, '1': 0 }['' + x.orb] || 0); }).join(''),4) + 'Q';
         result += parseInt(team.map(function(x) { return x.lock; }).join(''),3) + 'L';

From c820019683811ee396d2b92aa5c6ef6545608891 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 30 Mar 2016 19:47:58 -0500
Subject: [PATCH 0230/1569] Global flag

Zeff global
---
 common/data/drops.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 40caab04a..cbbb64e5a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -815,6 +815,7 @@ window.drops = {
         {
             name: 'Raging Cook! Red Leg Zeff',
             thumb: 607,
+			global: true,
             condition: 'You cannot use any two units that are the same',
             Expert: [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ],
             Elite: [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]

From 438ffe27b71e6dca1633aee6ae04c2c98fa4b2ef Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 31 Mar 2016 13:38:24 +0200
Subject: [PATCH 0231/1569] Multi Updates

Fakehats
Global/RR Flags
New RR Evolutions
Fake Raids
Diamante Special
---
 common/data/details.js    |  8 ++++++++
 common/data/drops.js      |  8 +++++++-
 common/data/evolutions.js | 24 ++++++++++++++++++++++++
 common/data/flags.js      | 18 +++++++++++++++++-
 common/data/units.js      | 10 +++++-----
 index.html                |  8 +++-----
 6 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 7f38035f9..b3190c864 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4665,6 +4665,14 @@ window.details = {
     },
     997: {
         special: "For Tough characters, changes Bad orbs to Matching orbs."
+    },
+    998: {
+        specialName: "Hira Release: Death Enjambre",
+        special: "Delays all enemies for ? turns, deals severe typeless damage for multiple turns"
+    },
+    999: {
+        specialName: "Hira Release: Death Enjambre",
+        special: "Delays all enemies for ? turns, deals severe typeless damage for multiple turns"
     }
 
 
diff --git a/common/data/drops.js b/common/data/drops.js
index cbbb64e5a..7b834b69c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1132,9 +1132,15 @@ window.drops = {
 		
 		{
 			name: 'Clash!! Kizaru',
+            thumb: 978,
 			Ultimate: [ 977 ],
 			Master: [ 977 ]
-		}
+		},
+        
+        {
+            name: 'Clash!? Fake Straw Hat Pirates',
+            Ultimate: [ 985, 986, 987, 988, 989]
+        }
 
     ],
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 24569ecd7..8fb5315d2 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1466,5 +1466,29 @@ window.evolutions = {
     982: {
         evolution: 983,
         evolvers: [ 118, 85, 94, 301, 101]
+    },
+    990: {
+        evolution: 991,
+        evolvers: []
+    },
+    992: {
+        evolution: 993,
+        evolvers: []
+    },
+    994: {
+        evolution: 995,
+        evolvers: []
+    },
+    996: {
+        evolution: 997,
+        evolvers: []
+    },
+    998: {
+        evolution: 999,
+        evolvers: []
+    },
+    1000: {
+        evolution: 1001,
+        evolvers: []
     }
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index cc1130cae..60a95c828 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -592,6 +592,10 @@ window.flags = {
 	603: { global: 1 },
 	604: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	605: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    606: { global: 1 },
+    607: { global: 1 },
+    608: { global: 1 },
+    609: { global: 1 },
 	610: { global: 1 },
 	611: { global: 1 },
 	612: { rr: 1, rro: 1, lrr: 1, global: 1 },
@@ -768,5 +772,17 @@ window.flags = {
 	944: { rr: 1, rro: 1, lrr: 1 },
 	945: { rr: 1, rro: 1, lrr: 1 },
 	975: { rr: 1, rro: 1, lrr: 1 },
-	976: { rr: 1, rro: 1, lrr: 1 }
+	976: { rr: 1, rro: 1, lrr: 1 },
+    990: { rr: 1, rro: 1 },
+    991: { rr: 1, rro: 1 },
+    992: { rr: 1, rro: 1 },
+    993: { rr: 1, rro: 1 },
+    994: { rr: 1, rro: 1 },
+    995: { rr: 1, rro: 1 },
+    996: { rr: 1, rro: 1 },
+    997: { rr: 1, rro: 1 },
+    998: { rr: 1, rro: 1 },
+    999: { rr: 1, rro: 1 },
+    1000: { rr: 1, rro: 1 },
+    1001: { rr: 1, rro: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 838405a64..2edef6527 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -983,11 +983,11 @@ window.units = [
     [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
     [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, null ],
     [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, null ],
-    [],
-    [],
-    [],
-    [],
-    [],
+    [ "Fake Strawhat #1","STR","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
+    ["Fake Strawhat #2","INT","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
+    ["Fake Strawhat #3","DEX","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
+    ["Fake Strawhat #4","PSY","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
+    ["Fake Strawhat #5","STR",["Ambition","Shooter"],4,15,null,null,null,null,null,null,null,null,null,null,null],
     [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/index.html b/index.html
index edd4e37e8..76abb129f 100644
--- a/index.html
+++ b/index.html
@@ -53,7 +53,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>30/03/2016</p>
+            <p>31/03/2016</p>
             <br>
             <ul>
                 <li>New Probability Calculator</li>
@@ -61,13 +61,11 @@
                 <li>Still Under Beta Testing</li>
                 <li>Please Report Bugs</li>
                 <br>
-                <li>Updated Colo Vista/Paulie</li>
+                <li>Fake Strawhats added</li>
+                <li>... Thanks Bandai?</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>
                 <li>Useful for Unit Comparisons</li>
-                <br>
-                <li>Calculator Units now Start at level 99</li>
-                <li>Who calculates with level 1s anyways?</li>
             </ul>
         </div>
     </body>

From 6906bc6a365c4363bae96b9ee50fad05a921aa2d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 31 Mar 2016 15:04:28 -0500
Subject: [PATCH 0232/1569] Macro Name

changed, alias added
---
 common/data/aliases.js | 1 -
 common/data/units.js   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 279cb82f4..7d339eb71 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -953,7 +953,6 @@ window.aliases = {
     952: ['ベン・ベックマン',''],
     953: ['ベン・ベックマン 赤髪海賊団',''],
 	954: ['ギャロ',''],
-    955: ['マクロ',''],
     956: ['タンスイ',''],
     957: ['早業のガンマン 青のボディガード',''],
     958: ['計略のガンマン 黒のボディガード',''],
diff --git a/common/data/units.js b/common/data/units.js
index 2edef6527..7a6384a76 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -953,7 +953,7 @@ window.units = [
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, 136167, 131, 98, 25, 935, 375, 163, 1],
  	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, 1778330, 867, 329, 122, 1403, 800, 229, 1],
 	[ "Gyaro", "QCK", [ "Slasher", "Tough" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
-	[ "Makuro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
+	[ "Macro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
 	[ "Tansui", "INT", [ "Fighter", "Tough" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
 	[ "Agile Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
 	[ "Tricky Gunman, Black Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],

From 6901fb3715caf94357c75b55ca0bf901b0dc6151 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 31 Mar 2016 15:17:01 -0500
Subject: [PATCH 0233/1569] Again

didn't push
---
 common/data/aliases.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7d339eb71..2440b9f44 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -953,6 +953,7 @@ window.aliases = {
     952: ['ベン・ベックマン',''],
     953: ['ベン・ベックマン 赤髪海賊団',''],
 	954: ['ギャロ',''],
+    955: ['マクロ','','Makuro'],
     956: ['タンスイ',''],
     957: ['早業のガンマン 青のボディガード',''],
     958: ['計略のガンマン 黒のボディガード',''],

From 598924bc3fa65e9fb2381607654a5c28fb0b99ef Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 1 Apr 2016 00:42:45 -0500
Subject: [PATCH 0234/1569] All The units

ALL OF THEM
---
 common/data/cooldowns.js | 19 ++++++++-
 common/data/details.js   | 87 +++++++++++++++++++++++++++++++++++-----
 common/data/units.js     | 38 +++++++++---------
 3 files changed, 114 insertions(+), 30 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index dda1a44cd..615f0642e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -982,5 +982,22 @@ window.cooldowns = [
     [ 16, 8 ],
 	[ 22, 12 ],
 	[ 22, 12 ],
-	[ 22, 14 ]
+	[ 22, 14 ],
+	null,
+    null,
+	null,
+    null,
+	19,
+	15,
+	15,
+	20,
+	20,
+	null, //Violet
+	null, //Violet
+	null, //Dellinger 
+	null, //Dellinger 
+	23,
+	23,
+	23,
+	23
 ];
diff --git a/common/data/details.js b/common/data/details.js
index b3190c864..aafc3b08b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4634,46 +4634,113 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2.25x",
         special: "Delays all enemies for 1 turn, Locks all orbs for 1 turn"
     },
+	989:{
+		captain: "Boosts ATK of characters with cost above 20 and below 30 by 2.5x",
+		special: "Changes the orbs in the left column into [G], [QCK] and [DEX], the orbs in the right column into [STR], [PSY] and [INT]",
+		specialName: "Bluff Piracy"
+	}
     990: {
+		captain: "Boosts ATK of Freedom characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
     },
     991: {
+		captain: "Boosts ATK of Freedom characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
     },
 	992: {
-		special: "Cuts the current HP of each enemy by __% and changes own orb into [QCK]",
+		captain: "Boosts ATK of [QCK] characters by 2x",
+		special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
 		specialName: "Punc Rock Fest"
 	},
 	993: {
-		special: "Cuts the current HP of each enemy by __% and changes own orb into [QCK]",
+		captain: "Boosts ATK of [QCK] characters by 2.5x",
+		special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
 		specialName: "Punc Rock Fest"
 	},
 	994: {
+		captain: "Boosts amount of beli received by 2x",
 		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
-		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
+		special: [
+			{
+				"description": "Reduces Special Cooldown of Knowledge and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"cooldown": 13
+			},
+			{
+				"description": "Reduces Special Cooldown of Knowledge and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"cooldown": 20
+			}
+		],
+		specialNotes: "#{stages}"
 	},
 	995:{
+		captain: "Boosts amount of beli received by 3x",
 		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
-		specialNotes: "Shows enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death'",
+		special: [
+			{
+				"description": "Reduces Special Cooldown of Knowledge and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"cooldown": 13
+			},
+			{
+				"description": "Reduces Special Cooldown of Knowledge and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"cooldown": 20
+			}
+		],
+		specialNotes: "#{stages}"
 	},
     996: {
-        special: "For Tough characters, changes Bad orbs to Matching orbs."
+        captain: "Boosts ATK of Tough characters by 2x",
+        special: [
+			{
+				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching.",
+				"cooldown": 11
+			},
+			{
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching.",
+				"cooldown": 20
+			}
+		],
+		specialNotes: "#{stages}"
     },
     997: {
-        special: "For Tough characters, changes Bad orbs to Matching orbs."
+		captain: "Boosts ATK of Tough characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Tough characters",
+		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
+        special: [
+			{
+				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching.",
+				"cooldown": 11
+			},
+			{
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching.",
+				"cooldown": 20
+			}
+		],
+		specialNotes: "#{stages}"
     },
     998: {
+		captain: "Boosts ATK of Ambition characters by 2x and reduces cooldown of all specials by 1 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
-        special: "Delays all enemies for ? turns, deals severe typeless damage for multiple turns"
+        special: "Delays all enemies for 2 turns, deals severe typeless damage to all enemies at the end of the turn for 5 turns"
     },
     999: {
+		captain: "Boosts ATK of Ambition characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
-        special: "Delays all enemies for ? turns, deals severe typeless damage for multiple turns"
-    }
-
+        special: "Delays all enemies for 2 turns, deals severe typeless damage to all enemies at the end of the turn for 5 turns"
+    },
+	1000:{
+		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
+		captainNotes: "#{captainProportional : higher : 0 + 2 * (remaining HP) / (total HP) : 2 : 0 }",
+		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
+		specialName: "Love Sacrifice"
+	},
+	1001:{
+		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
+		captainNotes: "#{captainProportional : higher : 0 + 2 * (remaining HP) / (total HP) : 2 : 0 }",
+		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
+		specialName: "Love Sacrifice"
+	}
 
 };
diff --git a/common/data/units.js b/common/data/units.js
index 7a6384a76..b32dbf2a4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -826,8 +826,8 @@ window.units = [
 	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
 	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, null, null, null, 455, 497, 222, null],
-	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, null, null, null, 696, 762, 390, null],
+	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, 442, 60, 0, 455, 497, 222, null],
+	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, 442, 424, 149, 696, 762, 390, null],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
@@ -983,21 +983,21 @@ window.units = [
     [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
     [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, null ],
     [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, null ],
-    [ "Fake Strawhat #1","STR","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
-    ["Fake Strawhat #2","INT","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
-    ["Fake Strawhat #3","DEX","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
-    ["Fake Strawhat #4","PSY","Ambition",3,5,null,null,null,null,null,null,null,null,null,null,null],
-    ["Fake Strawhat #5","STR",["Ambition","Shooter"],4,15,null,null,null,null,null,null,null,null,null,null,null],
-    [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Diamante","STR",["Ambition","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Corazon","DEX",["Free Spirit","Knowledge"], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, null, 94, 33, 15, null,null,null,null],
+    [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, null, 79, 21, 28, null,null,null,null],
+    [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, null, 44, 34, 21,null,null,null,null],
+    [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, null, 103, 23, 18,null,null,null,null],
+    [ "Imposter Strawhats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, null, 561, 330, 36, 1288, 604, 110, null],
+    [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, null, 203, 127, 34, 1589, 716, 105, null ],
+    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
+    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, null, null, null, null ],
+    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, null, 1000, 767, 101, 2375, 1371, 271, null ],
+    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, null, 147, 48, 77, null, null, null, null ],
+    [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],
+    [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, null, 91, 147, 51, 999, 755, 192, null ],
+    [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, null, 933, 692, 143, 2087, 1362, 324, null ],
+    [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, null, null, null, null ],
+    [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
+    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
+    [ "Donquixote Rocinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ]
 ];

From 5639c504369e7ae8d73501a75ac8b396bcbf6b7f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 1 Apr 2016 00:45:18 -0500
Subject: [PATCH 0235/1569] Fuck Commas

They're the worst
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index aafc3b08b..dd765c861 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4638,7 +4638,7 @@ window.details = {
 		captain: "Boosts ATK of characters with cost above 20 and below 30 by 2.5x",
 		special: "Changes the orbs in the left column into [G], [QCK] and [DEX], the orbs in the right column into [STR], [PSY] and [INT]",
 		specialName: "Bluff Piracy"
-	}
+	},
     990: {
 		captain: "Boosts ATK of Freedom characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "10,000 Ton Vise of Hell",

From 30fa47db7c4818e22fc123299da87a9f946a093e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 1 Apr 2016 00:50:37 -0500
Subject: [PATCH 0236/1569] More stats

and corazon fix
---
 common/data/details.js | 4 ++--
 common/data/units.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index dd765c861..ba8bd0961 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4732,13 +4732,13 @@ window.details = {
     },
 	1000:{
 		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
-		captainNotes: "#{captainProportional : higher : 0 + 2 * (remaining HP) / (total HP) : 2 : 0 }",
+		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
 		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
 		specialName: "Love Sacrifice"
 	},
 	1001:{
 		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
-		captainNotes: "#{captainProportional : higher : 0 + 2 * (remaining HP) / (total HP) : 2 : 0 }",
+		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
 		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
 		specialName: "Love Sacrifice"
 	}
diff --git a/common/data/units.js b/common/data/units.js
index b32dbf2a4..9966a4c77 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -992,7 +992,7 @@ window.units = [
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, null, null, null, null ],
     [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, null, 1000, 767, 101, 2375, 1371, 271, null ],
-    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, null, 147, 48, 77, null, null, null, null ],
+    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, null, 147, 48, 77, 1157, 451, 274, null ],
     [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],
     [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, null, 91, 147, 51, 999, 755, 192, null ],
     [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, null, 933, 692, 143, 2087, 1362, 324, null ],

From 828322ce86ea088386965755be965f787df8f268 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 1 Apr 2016 01:03:50 -0500
Subject: [PATCH 0237/1569] Dellinger Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 9966a4c77..ee6dfecae 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -996,7 +996,7 @@ window.units = [
     [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],
     [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, null, 91, 147, 51, 999, 755, 192, null ],
     [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, null, 933, 692, 143, 2087, 1362, 324, null ],
-    [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, null, null, null, null ],
+    [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, 1500, 866, 90, null ],
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
     [ "Donquixote Rocinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ]

From 18fab12cddd38c0ec5ba5a8db20b2e5b153919c8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 1 Apr 2016 01:06:44 -0500
Subject: [PATCH 0238/1569] fix

freedom fix
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index ba8bd0961..f8d430454 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4640,12 +4640,12 @@ window.details = {
 		specialName: "Bluff Piracy"
 	},
     990: {
-		captain: "Boosts ATK of Freedom characters by 2.5x if HP is above 99% at the start of the turn",
+		captain: "Boosts ATK of Free Spirit characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
     },
     991: {
-		captain: "Boosts ATK of Freedom characters by 2.75x if HP is above 99% at the start of the turn",
+		captain: "Boosts ATK of Free Spirit characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
     },

From 2b8dbb281cc5ace9198360b573542ae2ab0abaad Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 1 Apr 2016 14:02:04 +0200
Subject: [PATCH 0239/1569] Fakehats Complete

Raids now correctly display Manuals if showManual is true in drops.js
---
 characters/js/utils.js  |  2 +-
 common/data/captains.js |  3 +++
 common/data/details.js  | 12 ++++++++++++
 common/data/drops.js    |  7 +++++--
 common/data/events.js   | 10 ++++++++++
 common/data/units.js    | 10 +++++-----
 drops/index.html        |  4 ++--
 drops/index.js          |  2 +-
 index.html              |  2 +-
 9 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/characters/js/utils.js b/characters/js/utils.js
index 3d2a1df3a..dea9aab2f 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -102,7 +102,7 @@ CharUtils.searchDropLocations = function(id) {
         for (var island=0;island<window.drops[type].length;++island) {
             var temp = [ ];
             for (var stage in window.drops[type][island]) {
-                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge' || stage == 'challengeData') continue;
+                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge' || stage == 'challengeData' || stage == 'showManual') continue;
                 if (window.drops[type][island][stage].indexOf(id) != -1)
                     temp.push(stage);
             }
diff --git a/common/data/captains.js b/common/data/captains.js
index 6ba4f9252..e7b3cfda2 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2359,5 +2359,8 @@ window.captains = {
     },
     984: {
         atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1}
+    },
+    989: {
+        atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index f8d430454..6649d407b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4633,6 +4633,18 @@ window.details = {
     984: {
         captain: "Boosts ATK of Striker characters by 2.25x",
         special: "Delays all enemies for 1 turn, Locks all orbs for 1 turn"
+    },
+    985:{
+      captainNotes: "Acts as a Daimyo Turtle and thus gives 15k EXP"  
+    },
+    986:{
+      captainNotes: "Acts as a Daimyo Turtle and thus gives 15k EXP"  
+    },
+    987:{
+      captainNotes: "Acts as a Daimyo Turtle and thus gives 15k EXP"  
+    },
+    988:{
+      captainNotes: "Acts as a Daimyo Turtle and thus gives 15k EXP"  
     },
 	989:{
 		captain: "Boosts ATK of characters with cost above 20 and below 30 by 2.5x",
diff --git a/common/data/drops.js b/common/data/drops.js
index 7b834b69c..d9706d784 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1060,7 +1060,8 @@ window.drops = {
         {
             name: 'Clash!? Usopp\'n',
             thumb: 518,
-            'Ultimate': [ 517 ]
+            showManual: true,
+            'Ultimate': [ 517, -15, -16, -223 ]
         },
 
         {
@@ -1139,7 +1140,9 @@ window.drops = {
         
         {
             name: 'Clash!? Fake Straw Hat Pirates',
-            Ultimate: [ 985, 986, 987, 988, 989]
+            showManual: true,
+            thumb: 989,
+            Ultimate: [ 985, 986, 987, 988, -989, -15, -556, -528, -520, -20]
         }
 
     ],
diff --git a/common/data/events.js b/common/data/events.js
index 385c048ce..20c79c819 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -18,5 +18,15 @@ window.events = {
             if (--$scope.options.gOrbsEnabled === 0)
                 $scope.notify({ text: 'Disabling [G] orbs support.' });
         }
+    },
+    989: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index ee6dfecae..d6e260fdf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -983,11 +983,11 @@ window.units = [
     [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
     [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, null ],
     [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, null ],
-    [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, null, 94, 33, 15, null,null,null,null],
-    [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, null, 79, 21, 28, null,null,null,null],
-    [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, null, 44, 34, 21,null,null,null,null],
-    [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, null, 103, 23, 18,null,null,null,null],
-    [ "Imposter Strawhats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, null, 561, 330, 36, 1288, 604, 110, null],
+    [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, 17456, 94, 33, 15, 571, 280, 77, 1],
+    [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
+    [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
+    [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
+    [ "Imposter Strawhats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
     [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, null, 203, 127, 34, 1589, 716, 105, null ],
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, null, null, null, null ],
diff --git a/drops/index.html b/drops/index.html
index 1dacc43be..567ef80cf 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -90,7 +90,7 @@ <h3>
                 </tbody>
                 <tbody>
                     <tr ng-repeat="(stage,data) in island"
-                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion' && stage != 'challengeData'">
+                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion' && stage != 'challengeData' && stage != 'showManual'">
                         <td>
                             {{type == 'Story Island'&& stage!='Completion Units' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
                         </td>
@@ -101,7 +101,7 @@ <h3>
                                 uib-tooltip="{{getTooltipText(uid)}}"
                                 tooltip-placement="bottom" tooltip-trigger="mouseenter"
                                 tooltip-enable="{{isTooltipEnabled(uid)}}" tooltip-append-to-body="true"></a>
-                            <h4 ng-if="type == 'Fortnight'">Manuals:</h4>
+                            <h4 ng-if="type == 'Fortnight' || island.showManual">Manuals:</h4>
                             <a ng-repeat="uid in data | smartSort:'true'" ng-if="uid < 0"
                                 decorate-slot uid="-uid" class="slot small"
                                 href="../characters/#/view/{{-uid}}" target="_blank"
diff --git a/drops/index.js b/drops/index.js
index 7f8d6a3e9..b5fe2c8af 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -68,7 +68,7 @@ app.directive('type',function() {
 app.directive('island',function() {
     return {
         restrict: 'E',
-        scope: { island: '=', data: '=', type: '=', hiddenUnits: '=', condition: '=', challenge: '=', completion: '=' },
+        scope: { island: '=', data: '=', type: '=', hiddenUnits: '=', condition: '=', challenge: '=', completion: '=', showManual: '=' },
         replace: true,
         templateUrl: 'island.html',
         link: function(scope, element, attrs) {
diff --git a/index.html b/index.html
index 76abb129f..712dfb607 100644
--- a/index.html
+++ b/index.html
@@ -61,7 +61,7 @@
                 <li>Still Under Beta Testing</li>
                 <li>Please Report Bugs</li>
                 <br>
-                <li>Fake Strawhats added</li>
+                <li>Fake Strawhats completed</li>
                 <li>... Thanks Bandai?</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>

From c4aa501a5108f15f714bffe3d4c47d88fcceeb2c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 1 Apr 2016 18:36:48 +0200
Subject: [PATCH 0240/1569] Updates

---
 common/data/aliases.js    | 22 +++++++++++++++++++++-
 common/data/drops.js      |  4 ++--
 common/data/evolutions.js |  6 +++---
 common/data/units.js      |  4 ++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2440b9f44..c84d223c5 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -979,5 +979,25 @@ window.aliases = {
     978: ['黄猿　光人間',''],
     979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
     980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
-    981: ['ナミュール 白ひげ海賊団８番隊隊長','']
+    981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
+    982: ['',''],
+    983: ['',''],
+    984: ['',''],
+    985: ['',''],
+    986: ['',''],
+    987: ['',''],
+    988: ['',''],
+    989: ['',''],
+    990: ['',''],
+    991: ['',''],
+    992: ['',''],
+    993: ['',''],
+    994: ['',''],
+    995: ['',''],
+    996: ['',''],
+    997: ['',''],
+    998: ['',''],
+    999: ['',''],
+    1000: ['','','Rocinante'],
+    1001: ['','','Rocinante']
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index d9706d784..b87ad93d4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1139,10 +1139,10 @@ window.drops = {
 		},
         
         {
-            name: 'Clash!? Fake Straw Hat Pirates',
+            name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
             thumb: 989,
-            Ultimate: [ 985, 986, 987, 988, -989, -15, -556, -528, -520, -20]
+            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -556, -528, -520, -554, -558, -20]
         }
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8fb5315d2..4be2d738e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1469,7 +1469,7 @@ window.evolutions = {
     },
     990: {
         evolution: 991,
-        evolvers: []
+        evolvers: [ 99, 304, 304, 104, 104]
     },
     992: {
         evolution: 993,
@@ -1481,11 +1481,11 @@ window.evolutions = {
     },
     996: {
         evolution: 997,
-        evolvers: []
+        evolvers: [ 80, 86, 266, 302, 102]
     },
     998: {
         evolution: 999,
-        evolvers: []
+        evolvers: [ 118, 83, 84, 95, 100]
     },
     1000: {
         evolution: 1001,
diff --git a/common/data/units.js b/common/data/units.js
index d6e260fdf..1552a5332 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -987,7 +987,7 @@ window.units = [
     [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
     [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
     [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
-    [ "Imposter Strawhats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
+    [ "Imposter Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
     [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, null, 203, 127, 34, 1589, 716, 105, null ],
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, null, null, null, null ],
@@ -999,5 +999,5 @@ window.units = [
     [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, 1500, 866, 90, null ],
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
-    [ "Donquixote Rocinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ]
+    [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ]
 ];

From 2a5aa661b202bb44ae6e5fff040f7799c8886326 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 1 Apr 2016 19:01:04 +0200
Subject: [PATCH 0241/1569] Evo + GW

---
 common/data/evolutions.js | 18 +++++++++++-------
 common/data/gw.js         |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4be2d738e..8a612168c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1465,30 +1465,34 @@ window.evolutions = {
     },
     982: {
         evolution: 983,
-        evolvers: [ 118, 85, 94, 301, 101]
+        evolvers: [ 118, 85, 94, 301, 101 ]
+    },
+    985: {
+        evolution: 989,
+        evolvers: [ 986, 987, 988 ]
     },
     990: {
         evolution: 991,
-        evolvers: [ 99, 304, 304, 104, 104]
+        evolvers: [ 99, 304, 304, 104, 104 ]
     },
     992: {
         evolution: 993,
-        evolvers: []
+        evolvers: [ 118, 83, 85, 96, 101 ]
     },
     994: {
         evolution: 995,
-        evolvers: []
+        evolvers: [ 118, 87, 94, 303, 103 ]
     },
     996: {
         evolution: 997,
-        evolvers: [ 80, 86, 266, 302, 102]
+        evolvers: [ 80, 86, 266, 302, 102 ]
     },
     998: {
         evolution: 999,
-        evolvers: [ 118, 83, 84, 95, 100]
+        evolvers: [ 118, 83, 84, 95, 100 ]
     },
     1000: {
         evolution: 1001,
-        evolvers: []
+        evolvers: [ 118, 86, 266, 302, 267 ]
     }
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index ea866b35d..36ce90f18 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850];
\ No newline at end of file

From 6ce4f3abf99f0506ca61a1f73d4439b15ca4e966 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 1 Apr 2016 19:03:48 +0200
Subject: [PATCH 0242/1569] Law GW

---
 common/data/gw.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index 36ce90f18..daf44fc90 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,null,null,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850];
\ No newline at end of file

From 7e87c86073b6061ff9c7126dbcb669b0fefd6da7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 2 Apr 2016 10:21:14 +0200
Subject: [PATCH 0243/1569] Updates

Also added a belated Easter Egg
---
 characters/css/index.css   | 11 +++++++++++
 common/data/cooldowns.js   |  2 +-
 common/data/drops.js       |  2 +-
 common/data/units.js       |  4 ++--
 common/js/nonSuspicious.js | 39 ++++++++++++++++++++++++++++++++++++++
 index.css                  | 23 ++++++++++++++++++++++
 index.html                 |  6 +++++-
 7 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 common/js/nonSuspicious.js

diff --git a/characters/css/index.css b/characters/css/index.css
index 0132b6ad0..8d391cd7a 100644
--- 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');
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 615f0642e..8459e100c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -987,7 +987,7 @@ window.cooldowns = [
     null,
 	null,
     null,
-	19,
+	[ 19, 12 ],
 	15,
 	15,
 	20,
diff --git a/common/data/drops.js b/common/data/drops.js
index b87ad93d4..ff5b02889 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1142,7 +1142,7 @@ window.drops = {
             name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
             thumb: 989,
-            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -556, -528, -520, -554, -558, -20]
+            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -556, -528, -520, -554, -558, -20, -217, -709]
         }
 
     ],
diff --git a/common/data/units.js b/common/data/units.js
index 1552a5332..458971a9d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -973,8 +973,8 @@ window.units = [
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
-	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, null, 210, 86, 100, 610, 286, 273, null],
-	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, null, 556, 240, 241, null, null, null, null],
+	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
+	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
 	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
 	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
new file mode 100644
index 000000000..0650804df
--- /dev/null
+++ b/common/js/nonSuspicious.js
@@ -0,0 +1,39 @@
+var pressed = [], konami = "38,38,40,40,37,39,37,39,66,65";
+
+function hideChopper() {
+    $("#Chopper").remove();
+    $("#hide").remove();
+    $("#overlay").remove();
+}
+
+$(document).keydown(function(e) {
+
+  pressed.push( e.keyCode );
+
+  if (pressed.toString().indexOf(konami)>=0) {
+
+    $(document).unbind('keydown',arguments.callee);
+    
+    // Add a Spinning Chopperman to the index Page
+    var kon = document.createElement("img");
+    kon.src = "http://i.imgur.com/gKxW9cm.png";
+    kon.alt = "Chopperman";
+    kon.id = "Chopper";
+    
+    var overlay = document.createElement("div");
+    overlay.className = "overlay";
+      
+    var hide = document.createElement("div");
+    hide.className = "hide";
+    hide.id = "hide";
+    
+    document.getElementById("empty").appendChild(overlay);
+    document.getElementById("empty").appendChild(hide);
+    document.getElementById("hide").appendChild(kon);
+    //Add an onCLick Event to disable him again
+    var chopper = document.getElementById("Chopper");
+    chopper.addEventListener("click", hideChopper, false);
+  
+  }
+
+});
\ No newline at end of file
diff --git a/index.css b/index.css
index a83eda56b..d495d60db 100644
--- a/index.css
+++ b/index.css
@@ -89,3 +89,26 @@ body {
 .purple:hover { background-color: #C96995; }
 .yellow:hover { background-color: #E3A969; }
 .pink:hover   { background-color: #A57777; }
+
+.overlay {
+    position: absolute;
+    height: 100%;
+    width: 100%;
+    display: table;
+    z-index: 100;
+}
+
+.hide {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0,0,0,0.65);
+    z-index: 100;
+}
+
+#hide > img {
+    margin-top: 15%;
+    animation: fa-spin 3s infinite linear;
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index 712dfb607..d58573463 100644
--- a/index.html
+++ b/index.html
@@ -23,6 +23,8 @@
         <link rel="stylesheet" type="text/css" href="common/libs/css/font-awesome.min.css" />
         <link rel="stylesheet" type="text/css" href="index.css" />
         <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+        <script src="common/libs/js/jquery.min.js"></script>
+        <script src="common/js/nonSuspicious.js"></script>
         <meta name="viewport" content="initial-scale=1, user-scalable=no, user-scalable=0">
 
 <!-- Google Analytics -->
@@ -40,8 +42,8 @@
     </head>
 
     <body>
+       
         <div id="container">
-
             <a class="animated zoomInLeft button blue" href="damage">Damage Calculator</a>
             <a class="animated zoomInRight button green" href="characters">Character Table</a>
             <a class="animated zoomInLeft button yellow" href="drops">Drop Table</a>
@@ -50,6 +52,8 @@
 	    <a class="animated zoomInRight button pink" href="probability">Probability Calculator</a>
 
         </div> 
+        <div id="empty">
+        </div>
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 

From d9f5c2be7bae3d3fe510b9739b962950f52e8ca7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 2 Apr 2016 11:17:05 +0200
Subject: [PATCH 0244/1569] Hotfix

---
 common/data/details.js     | 4 ++--
 common/js/nonSuspicious.js | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6649d407b..7f539c50f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4735,12 +4735,12 @@ window.details = {
     998: {
 		captain: "Boosts ATK of Ambition characters by 2x and reduces cooldown of all specials by 1 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
-        special: "Delays all enemies for 2 turns, deals severe typeless damage to all enemies at the end of the turn for 5 turns"
+        special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
     999: {
 		captain: "Boosts ATK of Ambition characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
-        special: "Delays all enemies for 2 turns, deals severe typeless damage to all enemies at the end of the turn for 5 turns"
+        special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
 	1000:{
 		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 0650804df..575cbcc01 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -16,7 +16,10 @@ $(document).keydown(function(e) {
     
     // Add a Spinning Chopperman to the index Page
     var kon = document.createElement("img");
-    kon.src = "http://i.imgur.com/gKxW9cm.png";
+    //Chopperman
+    //kon.src = "http://i.imgur.com/gKxW9cm.png";
+    //Fat Usoppp
+    kon.src = "http://i.imgur.com/zy5IoXu.png";
     kon.alt = "Chopperman";
     kon.id = "Chopper";
     

From d721dc976a9b71183afdd7e7c2f3137d3557925c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 3 Apr 2016 08:52:52 +0200
Subject: [PATCH 0245/1569] Rosinante Captains

---
 common/data/captains.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index e7b3cfda2..982ab97c8 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2362,5 +2362,35 @@ window.captains = {
     },
     989: {
         atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; }
+    },
+    990: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    991: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
+    992: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1 ; }
+    },
+    993: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1 ; }
+    },
+    996: {
+         atk: function(p) {return p.unit.class.has("Tough") ? 2  : 1; }
+    },
+    997: {
+         atk: function(p) {return p.unit.class.has("Tough") ? 2.25  : 1; }
+    },
+    998: {
+         atk: function(p) {return p.unit.class.has("Ambition") ? 2  : 1; }
+    },
+    999: {
+         atk: function(p) {return p.unit.class.has("Ambition") ? 2.25  : 1; }
+    },
+    1000: {
+        atk: function(p) { return  2  * p.percHP / 100; }
+    },
+    1001: {
+        atk: function(p) { return  2  * p.percHP / 100; }
     }
 };
\ No newline at end of file

From f965c3f9d3794e736e30628bfdeb588499d2de68 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 3 Apr 2016 20:03:00 +0200
Subject: [PATCH 0246/1569] Fakehat Fix

---
 common/data/captains.js | 3 ++-
 common/data/details.js  | 2 +-
 common/data/units.js    | 2 +-
 index.html              | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 982ab97c8..2bf557973 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2361,7 +2361,8 @@ window.captains = {
         atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1}
     },
     989: {
-        atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; },
+        hp: function(p) { return 0.1 ; }
     },
     990: {
         atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.5 : 1; }
diff --git a/common/data/details.js b/common/data/details.js
index 7f539c50f..346435020 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4647,7 +4647,7 @@ window.details = {
       captainNotes: "Acts as a Daimyo Turtle and thus gives 15k EXP"  
     },
 	989:{
-		captain: "Boosts ATK of characters with cost above 20 and below 30 by 2.5x",
+		captain: "Boosts ATK of characters with cost above 20 and below 30 by 2.5x, but reduces the HP of every character by 90%",
 		special: "Changes the orbs in the left column into [G], [QCK] and [DEX], the orbs in the right column into [STR], [PSY] and [INT]",
 		specialName: "Bluff Piracy"
 	},
diff --git a/common/data/units.js b/common/data/units.js
index 458971a9d..478b2c3ff 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -987,7 +987,7 @@ window.units = [
     [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
     [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
     [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
-    [ "Imposter Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
+    [ "Impostor Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
     [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, null, 203, 127, 34, 1589, 716, 105, null ],
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, null, null, null, null ],
diff --git a/index.html b/index.html
index d58573463..94d1555a8 100644
--- a/index.html
+++ b/index.html
@@ -57,7 +57,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>31/03/2016</p>
+            <p>03/04/2016</p>
             <br>
             <ul>
                 <li>New Probability Calculator</li>
@@ -66,7 +66,7 @@
                 <li>Please Report Bugs</li>
                 <br>
                 <li>Fake Strawhats completed</li>
-                <li>... Thanks Bandai?</li>
+                <li>Now with correct Captain</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>
                 <li>Useful for Unit Comparisons</li>

From 39b8d0a736a5e81e65886c247ea626ede96371b0 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 3 Apr 2016 20:25:48 +0200
Subject: [PATCH 0247/1569] DD matchers

---
 common/data/matchers.js | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/common/data/matchers.js b/common/data/matchers.js
index e5c0378fc..0323d9d1d 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -116,6 +116,12 @@ window.matchers = [
         target: 'captain',
         matcher: /Protects from defeat/i
     },
+    
+    {
+        name: 'End of Turn Damage Dealer',
+        target: 'captain',
+        matcher: /deals.+end of each turn/i
+    },
 
     /* * * * * Specials * * * * */
 
@@ -345,6 +351,18 @@ window.matchers = [
 		name: 'Special Cooldown Reducer',
 		target: 'special',
 		matcher: /reduces special cooldown/i
-	}
+	},
+    
+    {
+        name: 'Single Target Damage Dealer',
+        target: 'special',
+        matcher: /deals.+one enemy/i
+    },
+    
+    {
+        name: 'Multi Target Damage Dealer',
+        target: 'special',
+        matcher: /deals.+all enemies/i
+    }
 
 ];

From ba9ab0a946a508c50d708206a37507637b315d3f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 3 Apr 2016 21:58:44 +0200
Subject: [PATCH 0248/1569] Colo Franky Stage + Better Matcher

---
 common/data/effects.js  | 8 ++++++++
 common/data/matchers.js | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index e7a661336..dfc366dee 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -214,6 +214,14 @@ window.effects = {
         thumb: 880,
         id: 24, // don't change this
         gOrbsEnabled: true
+    },
+    
+    'Colosseum Franky': {
+        description: 'Activates [G] orb Support, boosts Orbs by 1.5x',
+        thumb: 560,
+        id: 25,
+        orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); },
+        gOrbsEnabled: true
     }
 
 };
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 0323d9d1d..ded809302 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -356,13 +356,13 @@ window.matchers = [
     {
         name: 'Single Target Damage Dealer',
         target: 'special',
-        matcher: /deals.+one enemy/i
+        matcher: /deals.+to one enemy/i
     },
     
     {
         name: 'Multi Target Damage Dealer',
         target: 'special',
-        matcher: /deals.+all enemies/i
+        matcher: /deals.+to all enemies/i
     }
 
 ];

From a6e8e02162e1fb498d7be815eea6061f1e0641ed Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 09:33:43 -0500
Subject: [PATCH 0249/1569] New Bepo Fortnight

unit prototypes
---
 common/data/drops.js      |  1 +
 common/data/evolutions.js | 12 ++++++++++--
 common/data/units.js      |  7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index ff5b02889..b7e3626b7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1061,6 +1061,7 @@ window.drops = {
             name: 'Clash!? Usopp\'n',
             thumb: 518,
             showManual: true,
+			global: true,
             'Ultimate': [ 517, -15, -16, -223 ]
         },
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8a612168c..1aeb4e9a1 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1457,7 +1457,7 @@ window.evolutions = {
 	},
     975: {
         evolution: 976,
-        evolvers: []
+        evolvers: [ 117, 80, 91, 97 ]
     },
     977: {
         evolution: 978,
@@ -1494,5 +1494,13 @@ window.evolutions = {
     1000: {
         evolution: 1001,
         evolvers: [ 118, 86, 266, 302, 267 ]
-    }
+    },
+	1002: {
+		evolution: 1003,
+		evolvers: []
+	},
+	1005: {
+		evolution: 1006,
+		evolvers: []
+	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 478b2c3ff..fcfb648af 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -999,5 +999,10 @@ window.units = [
     [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, 1500, 866, 90, null ],
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
-    [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ]
+    [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
+	[ "New Bepo", "STR", ["Figher", "Tough"], 3, 12, null, null, null, null, null, null, null, null, null, null],
+	[ "New Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, null, null, null, null, null, null, null, null, null, null],
+	[ "Unknown Unit", "QCK", ["Figher", "Free Spirit"], 4, 15, null, null, null, null, null, null, null, null, null, null],
+	[ "Unknown Unit", "STR", ["Tough", "Fighter"], 3, 12, null, null, null, null, null, null, null, null, null, null],
+	[ "Unknown Unit", "STR", ["Tough", "Fighter"], 4, 20, null, null, null, null, null, null, null, null, null, null]
 ];

From 2517bd8f5a0d372bda219fe31bef819b1234a8b2 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 12:37:22 -0500
Subject: [PATCH 0250/1569] gladius

max stats 4*
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index fcfb648af..87d2255d5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -990,7 +990,7 @@ window.units = [
     [ "Impostor Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
     [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, null, 203, 127, 34, 1589, 716, 105, null ],
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
-    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, null, null, null, null ],
+    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, 1079, 813, 154, null ],
     [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, null, 1000, 767, 101, 2375, 1371, 271, null ],
     [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, null, 147, 48, 77, 1157, 451, 274, null ],
     [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],

From b81c12f377ba46bdffaf89eae3e264895495200e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 12:50:02 -0500
Subject: [PATCH 0251/1569] Hearts Pirartes Island

prototype made
---
 common/data/drops.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index b7e3626b7..815dd225e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -996,6 +996,13 @@ window.drops = {
 			condition: "You can only bring INT units",
 			Expert: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ],
 			Elite: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
+		},
+		
+		{
+			name: "Find! Heart Pirates",
+			condition: "You can only bring QCK units",
+			Expert: [ 1002, 1004, 1005 ],
+			Elite: [ 1002, 1004, 1005 ]
 		}
 
     ],

From 601afc9294bf810afb67c8f1c1275ec92f573c37 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 13:06:04 -0500
Subject: [PATCH 0252/1569] name

changed
---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 815dd225e..c01d75a9c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -999,7 +999,7 @@ window.drops = {
 		},
 		
 		{
-			name: "Find! Heart Pirates",
+			name: "Let's Find Our Captain! Heart Pirates!",
 			condition: "You can only bring QCK units",
 			Expert: [ 1002, 1004, 1005 ],
 			Elite: [ 1002, 1004, 1005 ]

From ed2df3eac9c0f75f27b66db313d0aba7f419b71a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 13:59:22 -0500
Subject: [PATCH 0253/1569] names

updated
---
 common/data/details.js | 5 +++++
 common/data/units.js   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 346435020..34c03f513 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4623,15 +4623,18 @@ window.details = {
     },
     982: {
         captain: "Boosts ATK of Slasher characters by 2x",
+		specialName: "Flower Sword Straight Cut",
         special: "Deals 25x character's ATK to one enemy, changes bottom row into matching orbs"
     },
     983: {
         captain: "Boosts ATK of Slasher characters by 2.25x, makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters",
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+		specialName: "Flower Sword Straight Cut",
         special: "Deals 25x character's ATK to one enemy, changes bottom row into matching orbs"
     },
     984: {
         captain: "Boosts ATK of Striker characters by 2.25x",
+		specialName: "Shrouds and Rattling Knot",
         special: "Delays all enemies for 1 turn, Locks all orbs for 1 turn"
     },
     985:{
@@ -4715,6 +4718,7 @@ window.details = {
 				"cooldown": 20
 			}
 		],
+		specialName: "Decapitation High Heel",
 		specialNotes: "#{stages}"
     },
     997: {
@@ -4730,6 +4734,7 @@ window.details = {
 				"cooldown": 20
 			}
 		],
+		specialName: "Decapitation High Heel",
 		specialNotes: "#{stages}"
     },
     998: {
diff --git a/common/data/units.js b/common/data/units.js
index 87d2255d5..7a135e816 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -980,9 +980,9 @@ window.units = [
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
 	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
-    [ "Colosseum Vista","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
-    [ "Colosseum Vista Evolution","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, null ],
-    [ "Colosseum Paulie","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, null ],
+    [ "Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
+    [ "Flower Sword Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, null ],
+    [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, null ],
     [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, 17456, 94, 33, 15, 571, 280, 77, 1],
     [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
     [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],

From 13656d9d7e64d3d234aaa906bbb2dec1ee4c66a4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 16:42:49 -0500
Subject: [PATCH 0254/1569] aliases

corazon/rosinate
---
 common/data/aliases.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c84d223c5..804acef1a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -998,6 +998,6 @@ window.aliases = {
     997: ['',''],
     998: ['',''],
     999: ['',''],
-    1000: ['','','Rocinante'],
-    1001: ['','','Rocinante']
+    1000: ['','','Rocinante','Rosinante'],
+    1001: ['','','Rocinante','Corazon']
 };

From f7c6930dea7b92d0c8c3b182a9d8d6ca4c2a3f15 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 16:45:28 -0500
Subject: [PATCH 0255/1569] families & Aliases

added for new units (temp)
---
 common/data/aliases.js  | 7 ++++++-
 common/data/families.js | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 804acef1a..6bd4d3298 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -999,5 +999,10 @@ window.aliases = {
     998: ['',''],
     999: ['',''],
     1000: ['','','Rocinante','Rosinante'],
-    1001: ['','','Rocinante','Corazon']
+    1001: ['','','Rocinante','Corazon'],
+	1002: ['',''],
+	1003: ['',''],
+	1004: ['',''],
+	1005: ['',''],
+	1006: ['','']
 };
diff --git a/common/data/families.js b/common/data/families.js
index 7624cc09c..6a87a061a 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -999,5 +999,10 @@ window.families = [
 	"Diamante",
 	"Diamante",
 	"Corazon",
-	"Corazon"
+	"Corazon",
+	"Bepo",
+	"Bepo",
+	null,
+	null,
+	null
 ];
\ No newline at end of file

From 5c22c3ea096c2b5314715cd17a4bf30d3be86400 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 23:07:44 -0500
Subject: [PATCH 0256/1569] Bepo Fortnight Units

updated need MAX
---
 common/data/cooldowns.js  |  7 ++++++-
 common/data/details.js    | 30 +++++++++++++++++++++++++++---
 common/data/evolutions.js |  4 ++--
 common/data/units.js      | 10 +++++-----
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8459e100c..821805a33 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -999,5 +999,10 @@ window.cooldowns = [
 	23,
 	23,
 	23,
-	23
+	23,
+	20,
+	20,
+	20,
+	15,
+	15
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 34c03f513..ba80a5a4e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4747,17 +4747,41 @@ window.details = {
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
-	1000:{
+	1000: {
 		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
 		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
 		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
 		specialName: "Love Sacrifice"
 	},
-	1001:{
+	1001: {
 		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
 		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
 		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
 		specialName: "Love Sacrifice"
 	}
-
+	1002: {
+		captain: "Boosts ATK of Fighter characters by 1.5x",
+		special: "Reduces Paralysis duration by 2 turns",
+		specialName: "Bepo Special"
+	},
+	1003: {
+		captain: "Boosts ATK of Fighter characters by 1.5x",
+		special: "Reduces Paralysis duration by 2 turns",
+		specialName: "Bepo Special"
+	},
+	1004: {
+		captain: "Boosts RCV of all characters by 1.5x",
+		specialName: "Sachi & Penguin Special",
+		special: "Changes the orbs in the left column into [RCV] orbs"
+	},
+	1005: {
+		captain: "Boosts ATK of Tough characters by 1.5x",
+		specialName: "Jean Bart Special",
+		special: "Boosts own ATK by 1.75x for 1 turn"
+	},
+	1006: {
+		captain: "Boosts ATK and HP of Tough characters by 1.5x",
+		specialName: "Jean Bart Special",
+		special: "Boosts own ATK by 1.75x for 1 turn"
+	}
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 1aeb4e9a1..0cac5e1f0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1497,10 +1497,10 @@ window.evolutions = {
     },
 	1002: {
 		evolution: 1003,
-		evolvers: []
+		evolvers: [ 117, 78, 84, 95, 100 ]
 	},
 	1005: {
 		evolution: 1006,
-		evolvers: []
+		evolvers: [ 116, 84, 89, 95, 100 ]
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 7a135e816..cf7f88638 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1000,9 +1000,9 @@ window.units = [
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
-	[ "New Bepo", "STR", ["Figher", "Tough"], 3, 12, null, null, null, null, null, null, null, null, null, null],
-	[ "New Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, null, null, null, null, null, null, null, null, null, null],
-	[ "Unknown Unit", "QCK", ["Figher", "Free Spirit"], 4, 15, null, null, null, null, null, null, null, null, null, null],
-	[ "Unknown Unit", "STR", ["Tough", "Fighter"], 3, 12, null, null, null, null, null, null, null, null, null, null],
-	[ "Unknown Unit", "STR", ["Tough", "Fighter"], 4, 20, null, null, null, null, null, null, null, null, null, null]
+	[ "New Bepo", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, null, 96, 53, 46, null, null, null, null],
+	[ "New Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, null, 921, 461, 162, null, null, null, null],
+	[ "Sachi & Penguin", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, null, 92, 37, 36, null, null, null, null],
+	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, null, 194, 55, 13, null, null, null, null],
+	[ "Jean Bart Evolved", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, null, 1337, 488, 44, null, null, null, null]
 ];

From 8680dd3b03d488738df0d1db4848bdc786b4189e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 23:09:13 -0500
Subject: [PATCH 0257/1569] Commas

Always commas
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index ba80a5a4e..93e9eff45 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4758,7 +4758,7 @@ window.details = {
 		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
 		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
 		specialName: "Love Sacrifice"
-	}
+	},
 	1002: {
 		captain: "Boosts ATK of Fighter characters by 1.5x",
 		special: "Reduces Paralysis duration by 2 turns",

From 91d58d987afee26b1ac924bb6028f7fbb7eccdad Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 23:21:39 -0500
Subject: [PATCH 0258/1569] More updates

still need max stats
---
 common/data/captains.js | 18 +++++++++++++++++-
 common/data/details.js  | 18 ++++++++++--------
 common/data/matchers.js | 14 ++++++++++----
 common/data/specials.js | 10 +++++++++-
 common/data/units.js    |  8 ++++----
 5 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 2bf557973..a124d39ce 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2393,5 +2393,21 @@ window.captains = {
     },
     1001: {
         atk: function(p) { return  2  * p.percHP / 100; }
-    }
+    },
+	1002: {
+		atk: function(p) {return p.unit.class.has("Fighter") ? 1.5 : 1; }
+	},
+	1003: {
+		atk: function(p) {return p.unit.class.has("Fighter") ? 2 : 1; }
+	},
+	1004: {
+		rcv: function(p) { return 1.5; }
+	},
+	1005: {
+		atk: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; }
+	},
+	1006: {
+		atk: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; },
+		hp: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; }
+	},
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index 93e9eff45..b75044062 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4761,27 +4761,29 @@ window.details = {
 	},
 	1002: {
 		captain: "Boosts ATK of Fighter characters by 1.5x",
-		special: "Reduces Paralysis duration by 2 turns",
-		specialName: "Bepo Special"
+		special: "Reduces Numbness duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
+		specialName: "Bepo's Ultimate Fist!!",
+		specialNotes: "Numbness causes that unit to have a chance of not attacking and breaking chain"
 	},
 	1003: {
-		captain: "Boosts ATK of Fighter characters by 1.5x",
-		special: "Reduces Paralysis duration by 2 turns",
-		specialName: "Bepo Special"
+		captain: "Boosts ATK of Fighter characters by 2x",
+		special: "Reduces Numbness duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
+		specialName: "Bepo's Ultimate Fist!!"
+		specialNotes: "Numbness causes that unit to have a chance of not attacking and breaking chain"
 	},
 	1004: {
 		captain: "Boosts RCV of all characters by 1.5x",
-		specialName: "Sachi & Penguin Special",
+		specialName: "Hilarious Combination",
 		special: "Changes the orbs in the left column into [RCV] orbs"
 	},
 	1005: {
 		captain: "Boosts ATK of Tough characters by 1.5x",
-		specialName: "Jean Bart Special",
+		specialName: "Rush to Freedom",
 		special: "Boosts own ATK by 1.75x for 1 turn"
 	},
 	1006: {
 		captain: "Boosts ATK and HP of Tough characters by 1.5x",
-		specialName: "Jean Bart Special",
+		specialName: "Rush to Freedom",
 		special: "Boosts own ATK by 1.75x for 1 turn"
 	}
 };
diff --git a/common/data/matchers.js b/common/data/matchers.js
index ded809302..8b4e82ada 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -348,21 +348,27 @@ window.matchers = [
     },
 	
 	{
-		name: 'Special Cooldown Reducer',
+		name: 'Special cooldown reducer',
 		target: 'special',
 		matcher: /reduces special cooldown/i
 	},
     
     {
-        name: 'Single Target Damage Dealer',
+        name: 'Single target damage dealer',
         target: 'special',
         matcher: /deals.+to one enemy/i
     },
     
     {
-        name: 'Multi Target Damage Dealer',
+        name: 'Multi target damage dealer',
         target: 'special',
         matcher: /deals.+to all enemies/i
-    }
+    },
+	
+	{
+		name: 'Numbness reducers',
+        target: 'special',
+        matcher: /reduces.+numbness.+duration/i
+	}
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index 23e0fc19e..c9e2b6ec6 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1170,5 +1170,13 @@ window.specials = {
     981: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
 		type: "type"
-    }
+    },
+	1005: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+		type: "type"
+	},
+	1006: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+		type: "type"
+	},
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index cf7f88638..45b8549a8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1000,9 +1000,9 @@ window.units = [
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
-	[ "New Bepo", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, null, 96, 53, 46, null, null, null, null],
-	[ "New Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, null, 921, 461, 162, null, null, null, null],
-	[ "Sachi & Penguin", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, null, 92, 37, 36, null, null, null, null],
+	[ "Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, null, 96, 53, 46, null, null, null, null],
+	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, null, 921, 461, 162, null, null, null, null],
+	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, null, 92, 37, 36, null, null, null, null],
 	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, null, 194, 55, 13, null, null, null, null],
-	[ "Jean Bart Evolved", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, null, 1337, 488, 44, null, null, null, null]
+	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, null, 1337, 488, 44, null, null, null, null]
 ];

From 228ca22fc76a93a6e2b6966668d4914105290f37 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Apr 2016 23:22:39 -0500
Subject: [PATCH 0259/1569] Commas

I'm very good at missing commas
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index b75044062..9c5cad022 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4768,7 +4768,7 @@ window.details = {
 	1003: {
 		captain: "Boosts ATK of Fighter characters by 2x",
 		special: "Reduces Numbness duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
-		specialName: "Bepo's Ultimate Fist!!"
+		specialName: "Bepo's Ultimate Fist!!",
 		specialNotes: "Numbness causes that unit to have a chance of not attacking and breaking chain"
 	},
 	1004: {

From c227cbfeaf97716e7ed256b9367cf176aa342336 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 5 Apr 2016 09:50:06 +0200
Subject: [PATCH 0260/1569] Heart Pirates Complete

---
 common/data/drops.js |  5 +++--
 common/data/gw.js    |  2 +-
 common/data/units.js | 10 +++++-----
 index.html           |  3 +--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index c01d75a9c..0d2170120 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1001,8 +1001,9 @@ window.drops = {
 		{
 			name: "Let's Find Our Captain! Heart Pirates!",
 			condition: "You can only bring QCK units",
-			Expert: [ 1002, 1004, 1005 ],
-			Elite: [ 1002, 1004, 1005 ]
+            thumb: 1003,
+			Expert: [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ],
+			Elite: [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ]
 		}
 
     ],
diff --git a/common/data/gw.js b/common/data/gw.js
index daf44fc90..15e340518 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 45b8549a8..4c4045037 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1000,9 +1000,9 @@ window.units = [
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
-	[ "Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, null, 96, 53, 46, null, null, null, null],
-	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, null, 921, 461, 162, null, null, null, null],
-	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, null, 92, 37, 36, null, null, null, null],
-	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, null, 194, 55, 13, null, null, null, null],
-	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, null, 1337, 488, 44, null, null, null, null]
+	[ "Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
+	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
+	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
+	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
+	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1]
 ];
diff --git a/index.html b/index.html
index 94d1555a8..516d587e5 100644
--- a/index.html
+++ b/index.html
@@ -65,8 +65,7 @@
                 <li>Still Under Beta Testing</li>
                 <li>Please Report Bugs</li>
                 <br>
-                <li>Fake Strawhats completed</li>
-                <li>Now with correct Captain</li>
+                <li>Heart Pirates completed</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>
                 <li>Useful for Unit Comparisons</li>

From 3ee3ede2099ae0012626ed99731b59cd089a7940 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 5 Apr 2016 09:45:32 -0500
Subject: [PATCH 0261/1569] aliases & cooldowns

---
 common/data/aliases.js   |  2 +-
 common/data/cooldowns.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6bd4d3298..acc033d21 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -735,7 +735,7 @@ window.aliases = {
     734: ['クマドリ サイファーポールNo.9',''],
     735: ['クマドリ　六式 サイファーポールNo.9',''],
     736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）',''],
-    737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）',''],
+    737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）','','rob lucci'],
     738: ['スパンダム',''],
     739: ['フランキー 麦わらの一味',''],
     740: ['ネロ',''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 821805a33..55a8f6063 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1000,9 +1000,9 @@ window.cooldowns = [
 	23,
 	23,
 	23,
-	20,
-	20,
-	20,
-	15,
-	15
+	[ 20, 12 ],
+	[ 20, 12 ],
+	[ 20, 10 ],
+	[ 15, 7 ],
+	[ 15, 7 ]
 ];

From ffb73e6bd7b2bdcc2fa5025ae23e5820637495d6 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 6 Apr 2016 15:30:11 +0200
Subject: [PATCH 0262/1569] Quick Update

---
 common/data/cooldowns.js | 4 ++--
 common/data/flags.js     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 55a8f6063..0b872bf6b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -745,8 +745,8 @@ window.cooldowns = [
 	[ 18, 15 ],
 	[ 18, 15 ],
 	[ 20, 20 ],
-	25,
-	25,
+	[ 25, 15 ],
+	[ 25, 15 ],
 	[ 23, 16 ],
 	[ 23, 16 ],
 	[ 21, 14 ],
diff --git a/common/data/flags.js b/common/data/flags.js
index 60a95c828..01a1cfc51 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -509,6 +509,8 @@ window.flags = {
 	512: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
 	513: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
 	514: { rr: 1, rro: 1, lrr: 1 },
+    517: { global: 1 },
+    518: { global: 1 },
 	519: { rr: 1, rro: 1 },
 	520: { rr: 1, rro: 1 },
 	521: { rr: 1, rro: 1 },

From 03f509272b0ae5edd836ffe853319b95afe25197 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 6 Apr 2016 09:38:44 -0500
Subject: [PATCH 0263/1569] Gan Fall Mission

updated
---
 common/data/drops.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 0d2170120..b89b9a5d3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -625,7 +625,7 @@ window.drops = {
             name: 'Smoker\'s Great Pursuit',
             thumb: 268,
             global: true,
-            challenge: 'Total Damage dealt to enemies',
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems, 1x Forbidden Tome']],
             Expert: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ],
             Elite: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
@@ -723,7 +723,7 @@ window.drops = {
             thumb: 424,
             global: true,
             condition: 'You can only get STR, DEX, INT and PSY Orbs',
-            challenge: 'Total Damage dealt to enemies',
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['500,000 Damage','1x Black Elder'],['1,500,000 Damage','1x ATK Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
             Expert: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ],
             Elite: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ]
@@ -859,6 +859,8 @@ window.drops = {
             name: "Knight of the Sky Gan Fall",
             thumb: 713,
             condition: 'Every class but Free Spirit is weakend',
+			challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
             Expert: [ 712, 714, 715, -716, -546, -541, -520 ],
             Elite: [ 712, 714, 715, -716, -546, -541, -520 ]
         },

From 34022c42de1ecb68fb5a91a49184421cd42f32ee Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 6 Apr 2016 17:36:11 +0200
Subject: [PATCH 0264/1569] Knowledge to Cerebral

So long old friend
---
 characters/js/directives.js   |   4 +-
 characters/views/sidebar.html |   2 +-
 common/data/captains.js       |  80 ++++-----
 common/data/details.js        |  82 ++++-----
 common/data/drops.js          |   2 +-
 common/data/flags.js          |   2 +-
 common/data/matchers.js       |   4 +-
 common/data/specials.js       |  16 +-
 common/data/units.js          | 328 +++++++++++++++++-----------------
 index.html                    |   6 +-
 10 files changed, 264 insertions(+), 262 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index c57389f9c..518d300d0 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -116,7 +116,7 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
                     'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
@@ -138,7 +138,7 @@ directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classSpecial == \'%s\' }" ' +
                     'ng-click="onSpecialClick($event,\'%s\')">%s</span>';
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 6536ed5d1..0e0dffd35 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -9,7 +9,7 @@
 
 <div class="filter-container">
     <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ]"
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ]"
         class="filter width-6 class" ng-click="onClassClick($event,class)"
         ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
 </div>
diff --git a/common/data/captains.js b/common/data/captains.js
index a124d39ce..c9c1f0b71 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1476,12 +1476,12 @@ window.captains = {
 	},
 	719: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+			return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
 		}
 	},
 	720: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+			return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
 		}
 	},
 	721: {
@@ -1568,12 +1568,12 @@ window.captains = {
 		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
 	},
 	751: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	752: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2.25 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	753: {
 		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
@@ -1631,7 +1631,7 @@ window.captains = {
 		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
 	},
 	771: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
 	},
 	772: {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
@@ -1640,8 +1640,8 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	775: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	776: {
 		atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
@@ -1673,8 +1673,8 @@ window.captains = {
 		rcv: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; }
 	},
 	793: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	794: {
 		atk: function(p) {
@@ -1687,10 +1687,10 @@ window.captains = {
 		}
 	},
 	796: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	797: {
-		atk: function(p) { return p.unit.class.has("Knowledge") || p.unit.class.has("Tough") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Tough") ? 2 : 1; }
 	},
 	798: {
 		hitAtk: function(p) {
@@ -1719,12 +1719,12 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
 	},
 	807: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	808: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	809: {
 		atk: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; },
@@ -1780,12 +1780,12 @@ window.captains = {
 	},
 	830: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.75 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.75 : 1;
 		}
 	},
 	831: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 2 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 2 : 1;
 		}
 	},
 	832: {
@@ -1803,12 +1803,12 @@ window.captains = {
 		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
 	},
 	835: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+		hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	836: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+		hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	837: {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 2 : 1; }
@@ -1857,7 +1857,7 @@ window.captains = {
 	},
 	850: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.5 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
 		}
 	},
 	851: {
@@ -1902,7 +1902,7 @@ window.captains = {
 		hp: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	866: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	867: {
 		hit: function(n) { return n > 11 ? 1.5 : 1; }
@@ -1940,12 +1940,12 @@ window.captains = {
 	},
 	875: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") || p.unit.class.has("Ambition") ? 2 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2 : 1;
 		}
 	},
 	876: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") || p.unit.class.has("Ambition") ? 2.25 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2.25 : 1;
 		}
 	},
 	878: {
@@ -2027,15 +2027,15 @@ window.captains = {
 	},
 	897: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") || p.unit.class.has("Ambition") ? 2 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2 : 1;
 		}
 	},
 	898: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.5 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
 		},
 		hp: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.5 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
 		}
 	},
 	899: {
@@ -2067,12 +2067,12 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.75 : 1; }
 	},
 	907: {
-		atk: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; }
 	},
 	908: {
-		atk: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 2.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 1.75 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 2.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
 	},
 	909: {
 		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
@@ -2097,12 +2097,12 @@ window.captains = {
 		atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1.2); }
 	},
 	915: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
 	},
 	916: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.75 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
 	},
 	917: {
 		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -2203,10 +2203,10 @@ window.captains = {
 		hp: function(p) { return 1.25; }
 	},
 	938: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	939: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	940: {
 		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
diff --git a/common/data/details.js b/common/data/details.js
index 9c5cad022..e45c93a07 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3136,17 +3136,17 @@ window.details = {
 		captainNotes: "A hit below Good or a Miss will boost the ATK of the next unit by 2x, a Good hit by 2.25x, a Great hit by 2.5x and a Perfect hit by 2.75x. This bonus is applied only to Slasher characters."
 	},
 	719: {
-		special: "Boosts ATK of Knowledge characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
+		special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
 		specialName: "Sables: Pesado",
-		captain: "Boosts ATK of Knowledge characters proportionally to the crew's current HP",
+		captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
 		captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
 	},
 	720: {
-		special: "Boosts ATK of Knowledge characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
+		special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
 		specialName: "Sables: Pesado",
-		captain: "Boosts ATK of Knowledge characters proportionally to the crew's current HP",
+		captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
 		captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
 	},
 	721: {
@@ -3310,12 +3310,12 @@ window.details = {
 	751: {
 		special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
 		specialName: "Sheep Cloud Tidal Wave",
-		captain: "Boosts ATK and RCV of Knowledge characters by 1.5x"
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
 	},
 	752: {
 		special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
 		specialName: "Sheep Cloud Tidal Wave",
-		captain: "Boosts ATK of Knowledge characters by 2.25x and their RCV by 1.5x"
+		captain: "Boosts ATK of Cerebral characters by 2.25x and their RCV by 1.5x"
 	},
 	753: {
 		special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
@@ -3414,9 +3414,9 @@ window.details = {
 		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of STR characters by 2x"
 	},
 	771: {
-		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of Knowledge characters by 1.75x for 1 turn",
+		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of Cerebral characters by 1.75x for 1 turn",
 		specialName: "Moonwalk: Air Walking",
-		captain: "Boosts ATK of Knowledge characters by 2.5x"
+		captain: "Boosts ATK of Cerebral characters by 2.5x"
 	},
 	772: {
 		special: "Cuts the current HP of each enemy by 10%, changes [PSY] and [INT] orbs into [DEX] orbs",
@@ -3438,7 +3438,7 @@ window.details = {
 		special: "Deals several times the character's ATK in PSY damage to one enemy",
 		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Angry Headbutt",
-		captain: "Boosts ATK and HP of Knowledge characters by 1.5x"
+		captain: "Boosts ATK and HP of Cerebral characters by 1.5x"
 	},
 	776: {
 		specialName: "Boisterous Lucky Shot!!",
@@ -3527,7 +3527,7 @@ window.details = {
 	793: {
 		special: "Randomly changes all orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, switches orbs between slots twice, locks all orbs for 1 turn",
 		specialName: "The Entushiasm to Keep Skilled Workers in Line",
-		captain: "Boosts ATK and RCV of Knowledge characters by 1.5x"
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
 	},
 	794: {
 		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
@@ -3546,12 +3546,12 @@ window.details = {
 	796: {
 		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
 		specialName: "Peto-Peto Fruit, The Greatest Power",
-		captain: "Boosts ATK of Knowledge characters by 2x"
+		captain: "Boosts ATK of Cerebral characters by 2x"
 	},
 	797: {
 		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
 		specialName: "Peto-Peto Fruit, The Greatest Power",
-		captain: "Boosts ATK of Knowledge and Tough characters by 2x"
+		captain: "Boosts ATK of Cerebral and Tough characters by 2x"
 	},
 	798: {
 		special: "Removes poison, following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Fighter characters by 1.75x in the following turn",
@@ -3601,12 +3601,12 @@ window.details = {
 		specialNotes: "#{orb : 1.75x}"
 	},
 	807: {
-		captain: "Boosts ATK and RCV of Knowledge characters by 1.5x",
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
 		specialName: "Thunder Charge: Swing Arm",
 		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	808: {
-		captain: "Boosts ATK and RCV of Knowledge characters by 1.5x, recovers 2x character's RCV in HP at the end of each turn",
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x, recovers 2x character's RCV in HP at the end of each turn",
 		specialName: "Thunder Charge: Swing Arm",
 		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
@@ -3711,12 +3711,12 @@ window.details = {
 		captainNotes: "#{zombie}" 
     },
 	830: {
-		captain: "Boosts ATK of Knowledge and Striker characters by 1.75x, deals 2 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
+		captain: "Boosts ATK of Cerebral and Striker characters by 1.75x, deals 2 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
 		specialName: "Karma Conviction",
 		special: "Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [DEX] orbs, changes the orbs in the bottom row into [QCK] orbs"
 	},
 	831: {
-		captain: "Boosts ATK of Knowledge and Striker characters by 2x, deals 5 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
+		captain: "Boosts ATK of Cerebral and Striker characters by 2x, deals 5 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
 		specialName: "Karma Conviction",
 		special: "Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [DEX] orbs, changes the orbs in the bottom row into [QCK] orbs"
 	},
@@ -3738,13 +3738,13 @@ window.details = {
 		special: "Changes own orb into [QCK] and the captain's orb into [PSY]"
 	},
 	835: {
-		captain: "Boosts ATK and HP of Knowledge characters by 2x",
+		captain: "Boosts ATK and HP of Cerebral characters by 2x",
 		specialName: "Thrust Pad Cannon",
 		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{orb : 1.75x}"
 	},
 	836: {
-		captain: "Boosts ATK and HP of Knowledge characters by 2x, deals 5 times the damage received in the previous turn in STR damage to all enemies at the end of each turn",
+		captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in STR damage to all enemies at the end of each turn",
 		specialName: "Thrust Pad Cannon",
 		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{orb : 1.75x}"
@@ -3818,7 +3818,7 @@ window.details = {
 		special: "Deals 5 hits of random STR damage to random enemies, reduces the defense of all enemies by 50% for 2 turns"
 	},
 	850: {
-		captain: "Boosts ATK of Striker and Knowledge characters by 1.5x",
+		captain: "Boosts ATK of Striker and Cerebral characters by 1.5x",
 		specialName: "First-class Assistant of the Passionate Worker",
 		special: "Changes the top right orb into [DEX], the middle right orb into [STR] and the bottom right orb into [QCK], seals himself for 3 turns"
 	},
@@ -3901,9 +3901,9 @@ window.details = {
 		special: "Locks the chain multiplier at 2.5x for 2 turns, delays all enemies for 1 turn"
 	},
 	866: {
-		captain: "Boosts ATK of Knowledge characters by 2x",
+		captain: "Boosts ATK of Cerebral characters by 2x",
 		specialName: "Cien Fleur Wing: The Storm",
-		special: "Boosts ATK of Slasher and Knowledge characters by 1.3x for 2 turns, reduces Bind duration by 2 turns"
+		special: "Boosts ATK of Slasher and Cerebral characters by 1.3x for 2 turns, reduces Bind duration by 2 turns"
 	},
 	867: {
 		captain: "Boosts ATK of all characters by 1.5x after the 12th hit in the chain",
@@ -3982,12 +3982,12 @@ window.details = {
 		specialNotes: "#{orb: 1.5x or 1.75x} #{stages}"
 	},
 	875: {
-		captain: "Boosts ATK of Knowledge and Ambition characters by 2x",
+		captain: "Boosts ATK of Cerebral and Ambition characters by 2x",
 		specialName: "Beto Launcher",
 		special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
 	},
 	876: {
-		captain: "Boosts ATK of Knowledge and Ambition characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Knowledge and Ambition characters",
+		captain: "Boosts ATK of Cerebral and Ambition characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Cerebral and Ambition characters",
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
 		specialName: "Beto Launcher",
 		special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
@@ -4098,12 +4098,12 @@ window.details = {
 		special: "Recovers 6x character's RCV in HP at the end of each turn for 3 turns"
 	},
 	897: {
-		captain: "Boosts ATK of Knowledge and Ambition characters by 2x",
+		captain: "Boosts ATK of Cerebral and Ambition characters by 2x",
 		specialName: "Ground Death: Thirst",
 		special: "Changes own orb into [STR], randomizes all other orbs, cuts the current HP of all enemies by 10%"
 	},
 	898: {
-		captain: "Boosts ATK and HP of Striker and Knowledge characters by 1.5x",
+		captain: "Boosts ATK and HP of Striker and Cerebral characters by 1.5x",
 		specialName: "Championship Fight: Little Garden Three",
 		special: "Deals 10x character's ATK in QCK damage to all enemies, changes adjacent orbs into [G] orbs",
 		specialNotes: "#{gOrbs}"
@@ -4182,12 +4182,12 @@ window.details = {
 	907: {
 		specialName: "Cien Fleur: Big Tree",
 		special: "Delays all enemies for 1 turn, locks all orbs for 1 turn, deals 5,000 fixed damage to all enemies, reduces crew's HP to 1",
-		captain: "Boosts ATK and RCV of Knowledge characters by 1.5x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x if HP is below 30% at the start of the turn"
 	},
 	908: {
 		specialName: "Cien Fleur: Big Tree",
 		special: "Delays all enemies for 1 turn, locks all orbs for 1 turn, deals 5,000 fixed damage to all enemies, reduces crew's HP to 1",
-		captain: "Boosts ATK of Knowledge characters by 2.5x and their RCV by 1.75x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of Cerebral characters by 2.5x and their RCV by 1.75x if HP is below 30% at the start of the turn"
 	},
 	909: {
 		captain: "Boosts ATK and RCV of PSY characters by 1.5x",
@@ -4241,14 +4241,14 @@ window.details = {
 		special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes opposite orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
 	},
 	915: {
-		captain: "Boosts ATK and RCV of Knowledge characters by 1.2x",
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
 		specialName: "Feeling of Mutual Love",
-		special: "Boosts ATK and RCV of Knowledge characters by 1.5x for 1 turn"
+		special: "Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn"
 	},
 	916: {
-		captain: "Boosts ATK and RCV of Knowledge characters by 1.75x",
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
 		specialName: "Feeling of Mutual Love",
-		special: "Boosts ATK and RCV of Knowledge characters by 1.5x for 1 turn"
+		special: "Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn"
 	},
 	917: {
 		captain: "Boosts ATK of Shooter characters by 1.5x",
@@ -4383,14 +4383,14 @@ window.details = {
 		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	938: {
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Knowledge characters by 1.5x",
+		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Cerebral characters by 1.5x",
 		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely. For Striker and Knowledge characters, changes Bad orbs to Matching"
+		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs to Matching"
 	},
 	939: {
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Knowledge characters by 2x",
+		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
 		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely. For Striker and Knowledge characters, changes Bad orbs to Matching"
+		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs to Matching"
 	},
 	940: {
 		captain: "Boosts ATK and HP of [DEX] Characters by 1.5x",
@@ -4676,15 +4676,15 @@ window.details = {
 	},
 	994: {
 		captain: "Boosts amount of beli received by 2x",
-		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
+		special: "Reduces Special Cooldown of Cerebral and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Knowledge and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 13
 			},
 			{
-				"description": "Reduces Special Cooldown of Knowledge and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 20
 			}
 		],
@@ -4692,15 +4692,15 @@ window.details = {
 	},
 	995:{
 		captain: "Boosts amount of beli received by 3x",
-		special: "Reduces Special Cooldown of Knowledge and Fighter Units, and shows the stats of enemies",
+		special: "Reduces Special Cooldown of Cerebral and Fighter Units, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Knowledge and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 13
 			},
 			{
-				"description": "Reduces Special Cooldown of Knowledge and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 20
 			}
 		],
diff --git a/common/data/drops.js b/common/data/drops.js
index b89b9a5d3..07bd52b77 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -922,7 +922,7 @@ window.drops = {
         {
             name: "Nami and Lola's Great Proposal Plan",
             thumb: 808,
-            condition: 'You can only bring Slasher and Knowledge units. (No Evolution/Booster)',
+            condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
             Expert: [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ],
             Elite: [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index 01a1cfc51..1e48c1527 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -508,7 +508,7 @@ window.flags = {
 	511: { global: 1 },
 	512: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
 	513: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
-	514: { rr: 1, rro: 1, lrr: 1 },
+	514: { special: 1 },
     517: { global: 1 },
     518: { global: 1 },
 	519: { rr: 1, rro: 1 },
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 8b4e82ada..5f86786c3 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -11,7 +11,7 @@ window.matchers = [
     {
         name: 'Class-boosting captains',
         target: 'captain',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Knowledge|Tough|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Tough|Ambition)/i
     },
 
     {
@@ -134,7 +134,7 @@ window.matchers = [
     {
         name: 'Class-boosting specials',
         target: 'special',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Knowledge|Tough|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Tough|Ambition)/i
     },
 
     {
diff --git a/common/data/specials.js b/common/data/specials.js
index c9e2b6ec6..03075c427 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -531,7 +531,7 @@ window.specials = {
 		type: "class"
 	},
 	719: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? window.specials[719].multiplier : 1; },
+		atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[719].multiplier : 1; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (p.percHP <= 30 ? 2 : 1.5);
@@ -543,7 +543,7 @@ window.specials = {
 		}
 	},
 	720: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? window.specials[720].multiplier : 1; },
+		atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[720].multiplier : 1; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (p.percHP <= 30 ? 2 : 1.5);
@@ -615,7 +615,7 @@ window.specials = {
 		warning: "Selected special (%name%) assumes that the enemy has been delayed."
 	},
 	771: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.75 : 1; },
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
 		type: "type"
 	},
 	780: {
@@ -860,7 +860,7 @@ window.specials = {
 	},
 	866: {
 		atk: function(p) {
-			return p.unit.class.has("Slasher") || p.unit.class.has("Knowledge") ? 1.3 : 1;
+			return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1;
 		},
 		type: "class"
 	},
@@ -1050,13 +1050,13 @@ window.specials = {
 		}
 	},
 	915: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
 		type: "class"
 	},
 	916: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
 		type: "class"
 	},
     921: {
diff --git a/common/data/units.js b/common/data/units.js
index 4c4045037..36819cb35 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -8,9 +8,9 @@ window.units = [
 	[ "Roronoa Zoro Pound Phoenix", "DEX", [ "Slasher", "Ambition" ], 4, 9, 4, 2, 50, 392109, 462, 258, 37, 1216, 694, 106, 1 ],
 	[ "Roronoa Zoro Ashura Ichibugin", "DEX", [ "Slasher", "Ambition" ], 5, 15, 9, 3, 99, 3000000, 724, 667, 39, 2232, 1332, 144, 1 ],
 	[ "Nami", "INT", "Striker", 3, 4, 4, 0, 20, 26184, 72, 51, 32, 366, 201, 89, 0.7 ],
-	[ "Nami Tornado Tempo", "INT", [ "Striker", "Knowledge" ], 4, 7, 5, 2, 35, 136167, 336, 192, 62, 783, 453, 160, 1 ],
-	[ "Nami Mirage Tempo", "INT", [ "Striker", "Knowledge" ], 4, 9, 5, 2, 50, 392109, 348, 201, 75, 840, 543, 219, 1 ],
-	[ "Nami Thunderbolt Tempo", "INT", [ "Striker", "Knowledge" ], 5, 15, 4, 3, 99, 3000000, 494, 437, 154, 1262, 1088, 387, 1 ],
+	[ "Nami Tornado Tempo", "INT", [ "Striker", "Cerebral" ], 4, 7, 5, 2, 35, 136167, 336, 192, 62, 783, 453, 160, 1 ],
+	[ "Nami Mirage Tempo", "INT", [ "Striker", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 348, 201, 75, 840, 543, 219, 1 ],
+	[ "Nami Thunderbolt Tempo", "INT", [ "Striker", "Cerebral" ], 5, 15, 4, 3, 99, 3000000, 494, 437, 154, 1262, 1088, 387, 1 ],
 	[ "Usopp", "PSY", "Shooter", 3, 4, 5, 0, 20, 26184, 50, 32, 42, 322, 127, 121, 0.7 ],
 	[ "Usopp Tabasco Star", "PSY", "Shooter", 4, 7, 6, 2, 35, 136167, 286, 148, 85, 627, 240, 257, 1 ],
 	[ "Usopp Golden Pound", "PSY", "Shooter", 4, 9, 6, 2, 50, 392109, 444, 237, 47, 1080, 648, 144, 1 ],
@@ -21,7 +21,7 @@ window.units = [
 	[ "Sanji Diable Jambe Flambe", "QCK", [ "Fighter", "Tough" ], 5, 15, 4, 3, 99, 3000000, 406, 418, 175, 2206, 1030, 249, 1 ],
 	[ "Tony Tony Chopper", "PSY", "Fighter", 3, 4, 5, 0, 20, 26184, 52, 40, 39, 294, 144, 120, 1 ],
 	[ "Tony Tony Chopper Heavy Point", "PSY", [ "Fighter", "Free Spirit" ], 4, 9, 5, 2, 50, 392109, 306, 213, 78, 754, 622, 207, 1 ],
-	[ "Tony Tony Chopper Brain Point", "INT", [ "Fighter", "Knowledge" ], 4, 9, 5, 2, 50, 392109, 258, 198, 91, 520, 454, 302, 1 ],
+	[ "Tony Tony Chopper Brain Point", "INT", [ "Fighter", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 258, 198, 91, 520, 454, 302, 1 ],
 	[ "Tony Tony Chopper Arm Point", "STR", [ "Fighter", "Tough" ], 4, 9, 4, 2, 50, 392109, 356, 260, 54, 868, 820, 122, 1 ],
 	[ "Tony Tony Chopper Horn Point", "QCK", "Fighter", 4, 9, 6, 2, 50, 392109, 414, 306, 29, 958, 856, 95, 1 ],
 	[ "Tony Tony Chopper Guard Point", "DEX", [ "Fighter", "Tough" ], 4, 9, 6, 2, 50, 392109, 394, 178, 75, 1320, 408, 184, 1 ],
@@ -43,8 +43,8 @@ window.units = [
 	[ "Butchie", "STR", [ "Slasher", "Tough" ], 2, 9, 6, 0, 50, 261406, 132, 117, 19, 872, 530, 98, 1 ],
 	[ "One-Two Django", "DEX", "Slasher", 2, 8, 5, 0, 35, 90778, 118, 64, 39, 556, 271, 139, 1 ],
 	[ "Dancing Django", "DEX", "Slasher", 3, 11, 5, 2, 70, 1066998, 476, 218, 98, 1155, 555, 228, 1 ],
-	[ "Captain Kuro", "QCK", [ "Slasher", "Knowledge" ], 3, 10, 7, 0, 70, 1066998, 144, 111, 31, 1102, 640, 151, 1 ],
-	[ "Kuro of a Hundred Plans", "QCK", [ "Slasher", "Knowledge" ], 4, 15, 8, 2, 99, 3000000, 978, 558, 122, 2074, 1057, 282, 1 ],
+	[ "Captain Kuro", "QCK", [ "Slasher", "Cerebral" ], 3, 10, 7, 0, 70, 1066998, 144, 111, 31, 1102, 640, 151, 1 ],
+	[ "Kuro of a Hundred Plans", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 8, 2, 99, 3000000, 978, 558, 122, 2074, 1057, 282, 1 ],
 	[ "Yosaku", "STR", "Slasher", 2, 5, 6, 1, 40, 134812, 100, 43, 19, 439, 439, 99, 1.5 ],
 	[ "Johnny", "QCK", "Slasher", 2, 7, 6, 1, 40, 134812, 100, 42, 20, 421, 421, 108, 1.5 ],
 	[ "Iron Fist Fullbody", "STR", "Fighter", 2, 3, 6, 0, 15, 7532, 103, 100, 49, 153, 160, 84, 0.7 ],
@@ -57,7 +57,7 @@ window.units = [
 	[ "Fire Pearl", "STR", [ "Striker", "Tough" ], 3, 11, 4, 1, 70, 1066998, 820, 226, 38, 1904, 656, 129, 1 ],
 	[ "Don Krieg", "INT", [ "Shooter", "Ambition" ], 3, 10, 6, 0, 50, 392109, 214, 97, 24, 1454, 632, 95, 1 ],
 	[ "Don Krieg Poison Gas Bomb MH5", "INT", [ "Shooter", "Ambition" ], 4, 15, 4, 2, 99, 3000000, 1276, 553, 74, 2734, 1057, 172, 1 ],
-	[ "Nezumi", "INT", [ "Shooter", "Knowledge" ], 2, 6, 6, 0, 30, 28779, 55, 55, 55, 150, 130, 204, 0.7 ],
+	[ "Nezumi", "INT", [ "Shooter", "Cerebral" ], 2, 6, 6, 0, 30, 28779, 55, 55, 55, 150, 130, 204, 0.7 ],
 	[ "Momoo", "STR", "Fighter", 3, 18, 4, 0, 50, 392109, 600, 400, 120, 1000, 500, 150, 1.5 ],
 	[ "Choo", "INT", [ "Shooter", "Tough" ], 3, 9, 5, 1, 50, 392109, 110, 71, 49, 768, 492, 256, 1 ],
 	[ "Kuroobi", "STR", [ "Fighter", "Tough" ], 3, 9, 4, 1, 50, 392109, 160, 157, 10, 1200, 759, 76, 1 ],
@@ -65,8 +65,8 @@ window.units = [
 	[ "Six-Sword Hachi", "DEX", [ "Slasher", "Tough" ], 4, 11, 8, 2, 70, 1066998, 542, 338, 88, 986, 638, 288, 1 ],
 	[ "Arlong", "STR", [ "Slasher", "Tough" ], 3, 10, 5, 0, 50, 392109, 104, 152, 24, 936, 930, 82, 1 ],
 	[ "Enraged Arlong Shark On Tooth", "STR", [ "Slasher", "Tough" ], 4, 15, 4, 1, 99, 3000000, 832, 832, 55, 1974, 1491, 154, 1 ],
-	[ "Tashigi", "QCK", [ "Slasher", "Knowledge" ], 3, 9, 5, 1, 50, 392109, 102, 102, 41, 690, 483, 272, 1 ],
-	[ "Tashigi Navy HQ Ensign", "QCK", [ "Slasher", "Knowledge" ], 4, 15, 5, 2, 99, 3000000, 632, 431, 222, 1434, 921, 434, 1.5 ],
+	[ "Tashigi", "QCK", [ "Slasher", "Cerebral" ], 3, 9, 5, 1, 50, 392109, 102, 102, 41, 690, 483, 272, 1 ],
+	[ "Tashigi Navy HQ Ensign", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 99, 3000000, 632, 431, 222, 1434, 921, 434, 1.5 ],
 	[ "Smoker", "DEX", [ "Striker", "Ambition" ], 3, 9, 5, 1, 50, 392109, 110, 113, 36, 944, 575, 199, 1 ],
 	[ "Smoker the White Hunter", "DEX", [ "Striker", "Ambition" ], 4, 15, 5, 2, 99, 3000000, 872, 515, 154, 1736, 1070, 334, 1.5 ],
 	[ "Miss Wednesday", "PSY", "Slasher", 3, 9, 5, 0, 35, 136167, 22, 10, 74, 190, 127, 216, 0.7 ],
@@ -74,8 +74,8 @@ window.units = [
 	[ "Princess Vivi", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 4000000, 602, 414, 280, 908, 747, 477, 1.5 ],
 	[ "Portgas D. Ace", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 70, 1066998, 252, 144, 40, 1802, 545, 199, 1.5 ],
 	[ "Portgas D. Ace Flame Mirror", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 6, 4, 99, 4000000, 1728, 501, 140, 2886, 1020, 279, 1.5 ],
-	[ "Shanks", "PSY", [ "Slasher", "Knowledge" ], 4, 13, 5, 3, 70, 1066998, 186, 159, 46, 1010, 725, 271, 1.5 ],
-	[ "Red-Haired Shanks", "PSY", [ "Slasher", "Knowledge" ], 5, 20, 4, 4, 99, 4000000, 898, 670, 222, 2118, 990, 417, 1 ],
+	[ "Shanks", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 5, 3, 70, 1066998, 186, 159, 46, 1010, 725, 271, 1.5 ],
+	[ "Red-Haired Shanks", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 4, 4, 99, 4000000, 898, 670, 222, 2118, 990, 417, 1 ],
 	[ "Red Robber Penguin", "STR", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
 	[ "Blue Robber Penguin", "QCK", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
 	[ "Green Robber Penguin", "DEX", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
@@ -201,14 +201,14 @@ window.units = [
 	[ "Mr. 5 Breeze Breath Bomb", "STR", "Shooter", 4, 15, 5, 2, 70, 1066998, 688, 520, 92, 1120, 943, 180, 1 ],
 	[ "Miss Valentine", "QCK", "Fighter", 3, 11, 5, 1, 35, 136167, 120, 114, 34, 860, 488, 144, 1 ],
 	[ "Miss Valentine 10,000 Kilo Guillotine", "QCK", "Fighter", 4, 15, 5, 2, 70, 1066998, 804, 426, 104, 1324, 787, 198, 1 ],
-	[ "Mr. 3", "INT", [ "Slasher", "Knowledge" ], 3, 11, 4, 1, 35, 136167, 196, 100, 26, 926, 515, 120, 1 ],
-	[ "Mr. 3 Extra Special Candelabra", "INT", [ "Slasher", "Knowledge" ], 4, 15, 4, 2, 70, 1066998, 600, 449, 120, 1394, 818, 176, 1 ],
+	[ "Mr. 3", "INT", [ "Slasher", "Cerebral" ], 3, 11, 4, 1, 35, 136167, 196, 100, 26, 926, 515, 120, 1 ],
+	[ "Mr. 3 Extra Special Candelabra", "INT", [ "Slasher", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 600, 449, 120, 1394, 818, 176, 1 ],
 	[ "Miss Goldenweek", "DEX", [ "Striker", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 51, 51, 81, 301, 301, 305, 1 ],
 	[ "Miss Goldenweek Colors Trap: Calming Green", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 5, 2, 70, 1066998, 264, 264, 268, 412, 390, 530, 1 ],
 	[ "Mr. 2 Bon Clay", "PSY", [ "Fighter", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 94, 93, 46, 690, 403, 201, 1 ],
 	[ "Mr. 2 Bon Clay Bombardier Arabesque", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 599, 348, 169, 935, 709, 302, 1 ],
-	[ "Miss All Sunday Baroque Works VP", "INT", [ "Fighter", "Knowledge" ], 4, 15, 6, 1, 50, 392109, 368, 128, 96, 772, 478, 252, 0.7 ],
-	[ "Nico Robin", "INT", [ "Fighter", "Knowledge" ], 5, 20, 6, 2, 99, 3000000, 736, 430, 214, 1865, 1055, 338, 1 ],
+	[ "Miss All Sunday Baroque Works VP", "INT", [ "Fighter", "Cerebral" ], 4, 15, 6, 1, 50, 392109, 368, 128, 96, 772, 478, 252, 0.7 ],
+	[ "Nico Robin", "INT", [ "Fighter", "Cerebral" ], 5, 20, 6, 2, 99, 3000000, 736, 430, 214, 1865, 1055, 338, 1 ],
 	[ "Mr. 9", "QCK", "Striker", 2, 10, 5, 0, 35, 90778, 106, 88, 33, 490, 313, 136, 0.7 ],
 	[ "Mr. 9 Hot Blooded Bat", "QCK", "Striker", 3, 13, 5, 3, 70, 1066998, 408, 249, 99, 1011, 590, 240, 0.7 ],
 	[ "Laboon", "STR", [ "Fighter", "Tough" ], 3, 18, 5, 1, 50, 392109, 650, 300, 150, 1100, 500, 200, 1 ],
@@ -218,21 +218,21 @@ window.units = [
 	[ "Monkey D. Luffy Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
 	[ "Roronoa Zoro Streaming Wolf Swords", "DEX", [ "Slasher", "Ambition" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
 	[ "Roronoa Zoro Lion's Song", "DEX", [ "Slasher", "Ambition" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
-	[ "Nami Fine Tempo", "INT", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
-	[ "Nami Happiness Punch", "INT", [ "Striker", "Knowledge" ], 5, 22, 4, 3, 99, 4000000, 1044, 377, 94, 1990, 949, 168, 1 ],
+	[ "Nami Fine Tempo", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
+	[ "Nami Happiness Punch", "INT", [ "Striker", "Cerebral" ], 5, 22, 4, 3, 99, 4000000, 1044, 377, 94, 1990, 949, 168, 1 ],
 	[ "Usopp Usopp Hammer", "PSY", "Striker", 3, 12, 5, 1, 35, 136167, 188, 101, 40, 778, 388, 191, 1 ],
 	[ "Usopp Impact", "PSY", "Shooter", 4, 18, 6, 2, 70, 1066998, 733, 361, 97, 1185, 669, 265, 1 ],
-	[ "Mr. Prince Mutton Shot", "QCK", [ "Fighter", "Knowledge" ], 3, 12, 4, 1, 35, 136167, 276, 108, 32, 1144, 457, 107, 1 ],
-	[ "Mr. Prince Veau Shot", "QCK", [ "Fighter", "Knowledge" ], 4, 18, 5, 2, 70, 1066998, 1101, 422, 93, 1600, 792, 161, 1 ],
+	[ "Mr. Prince Mutton Shot", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 4, 1, 35, 136167, 276, 108, 32, 1144, 457, 107, 1 ],
+	[ "Mr. Prince Veau Shot", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 5, 2, 70, 1066998, 1101, 422, 93, 1600, 792, 161, 1 ],
 	[ "Dracule Mihawk", "DEX", "Slasher", 4, 30, 4, 1, 70, 1066998, 324, 201, 1, 1998, 814, 7, 1 ],
 	[ "Hawk Eyes Mihawk", "DEX", "Slasher", 5, 50, 4, 1, 99, 5000000, 1916, 782, 5, 3760, 1285, 15, 1 ],
 	[ "Escapee Morgan", "STR", [ "Slasher", "Ambition" ], 3, 17, 5, 1, 70, 711332, 1427, 699, 27, 1600, 1000, 35, 1 ],
 	[ "Double Crosser Django", "PSY", [ "Slasher", "Free Spirit" ], 3, 11, 5, 1, 70, 1066998, 446, 219, 103, 930, 665, 230, 1 ],
 	[ "Double Ironfist Fullbody", "STR", [ "Fighter", "Free Spirit" ], 3, 11, 6, 1, 70, 1066998, 150, 150, 80, 890, 809, 187, 1 ],
-	[ "Hina", "QCK", [ "Fighter", "Knowledge" ], 3, 12, 5, 1, 50, 392109, 154, 73, 42, 1176, 495, 187, 1 ],
-	[ "Black Cage Hina", "QCK", [ "Fighter", "Knowledge" ], 4, 18, 4, 2, 99, 3000000, 1088, 422, 149, 2270, 905, 300, 1 ],
-	[ "Mr. 8", "PSY", [ "Shooter", "Knowledge" ], 2, 10, 5, 0, 35, 90778, 178, 55, 32, 530, 248, 151, 1 ],
-	[ "Mr. 8 Igarappapa", "PSY", [ "Shooter", "Knowledge" ], 3, 13, 5, 1, 70, 1066998, 500, 186, 120, 1286, 433, 230, 1 ],
+	[ "Hina", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 154, 73, 42, 1176, 495, 187, 1 ],
+	[ "Black Cage Hina", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 4, 2, 99, 3000000, 1088, 422, 149, 2270, 905, 300, 1 ],
+	[ "Mr. 8", "PSY", [ "Shooter", "Cerebral" ], 2, 10, 5, 0, 35, 90778, 178, 55, 32, 530, 248, 151, 1 ],
+	[ "Mr. 8 Igarappapa", "PSY", [ "Shooter", "Cerebral" ], 3, 13, 5, 1, 70, 1066998, 500, 186, 120, 1286, 433, 230, 1 ],
 	[ "Miss Monday", "STR", [ "Fighter", "Tough" ], 2, 10, 4, 0, 35, 90778, 66, 126, 27, 350, 500, 97, 1 ],
 	[ "Miss Monday Superhuman Brass Knuckles", "STR", [ "Fighter", "Tough" ], 3, 13, 4, 1, 70, 1066998, 270, 422, 71, 506, 1005, 186, 1 ],
 	[ "Knuckle Millions Baroque Works", "STR", "Fighter", 2, 5, 6, 0, 25, 33626, 185, 89, 21, 532, 352, 50, 1 ],
@@ -254,8 +254,8 @@ window.units = [
 	[ "Diamond Jozu", "QCK", [ "Fighter", "Tough" ], 5, 28, 4, 4, 99, 4000000, 1748, 524, 69, 3300, 987, 231, 1 ],
 	[ "Vista", "INT", [ "Slasher", "Tough" ], 4, 18, 5, 3, 50, 392109, 290, 206, 15, 1388, 806, 100, 1 ],
 	[ "Flower Sword Vista", "INT", [ "Slasher", "Tough" ], 5, 28, 5, 4, 99, 4000000, 1314, 732, 72, 2840, 1325, 185, 1 ],
-	[ "Izo", "DEX", [ "Shooter", "Knowledge" ], 4, 18, 4, 3, 50, 392109, 232, 130, 50, 1300, 634, 172, 1 ],
-	[ "Flintlock Pistols Izo", "DEX", [ "Shooter", "Knowledge" ], 5, 28, 5, 4, 99, 4000000, 1224, 585, 136, 2550, 1068, 319, 1 ],
+	[ "Izo", "DEX", [ "Shooter", "Cerebral" ], 4, 18, 4, 3, 50, 392109, 232, 130, 50, 1300, 634, 172, 1 ],
+	[ "Flintlock Pistols Izo", "DEX", [ "Shooter", "Cerebral" ], 5, 28, 5, 4, 99, 4000000, 1224, 585, 136, 2550, 1068, 319, 1 ],
 	[ "Blamenco", "STR", [ "Striker", "Free Spirit" ], 4, 18, 4, 3, 50, 392109, 204, 192, 34, 1150, 775, 150, 1 ],
 	[ "Blamenco the Mallet", "STR", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 1086, 726, 112, 2488, 1252, 268, 1 ],
 	[ "Edward Newgate", "STR", [ "Striker", "Tough" ], 5, 40, 4, 4, 70, 1422664, 1338, 522, 80, 3220, 1060, 156, 1 ],
@@ -294,9 +294,9 @@ window.units = [
 	[ "Triceratops", "QCK", "Fighter", 2, 25, 4, 0, 50, 392109, 500, 200, 50, 965, 700, 50, 1.5 ],
 	[ "Rex", "STR", "Fighter", 2, 25, 4, 0, 50, 392109, 300, 300, 50, 520, 900, 50, 1.5 ],
 	[ "Brontosaurus", "DEX", "Fighter", 2, 25, 4, 0, 50, 392109, 400, 250, 50, 755, 755, 50, 1.5 ],
-	[ "Tsuru", "INT", [ "Shooter", "Knowledge" ], 3, 12, 4, 2, 50, 392109, 140, 26, 60, 880, 400, 266, 1 ],
-	[ "Great Advisor Tsuru", "INT", [ "Shooter", "Knowledge" ], 4, 18, 6, 3, 99, 4000000, 808, 337, 224, 1151, 1210, 366, 1 ],
-	[ "Momonga", "PSY", [ "Slasher", "Knowledge" ], 3, 11, 5, 2, 70, 1066998, 420, 398, 98, 632, 815, 255, 1 ],
+	[ "Tsuru", "INT", [ "Shooter", "Cerebral" ], 3, 12, 4, 2, 50, 392109, 140, 26, 60, 880, 400, 266, 1 ],
+	[ "Great Advisor Tsuru", "INT", [ "Shooter", "Cerebral" ], 4, 18, 6, 3, 99, 4000000, 808, 337, 224, 1151, 1210, 366, 1 ],
+	[ "Momonga", "PSY", [ "Slasher", "Cerebral" ], 3, 11, 5, 2, 70, 1066998, 420, 398, 98, 632, 815, 255, 1 ],
 	[ "Onigumo", "DEX", [ "Slasher", "Ambition" ], 3, 11, 8, 2, 70, 1066998, 482, 434, 63, 944, 920, 131, 1 ],
 	[ "Red Plated Lobster", "STR", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
 	[ "Blue Plated Lobster", "QCK", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
@@ -307,16 +307,16 @@ window.units = [
 	[ "Garp the Fist", "PSY", [ "Fighter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1377, 685, 105, 2852, 1220, 225, 1 ],
 	[ "Trafalgar Law", "DEX", [ "Slasher", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 104, 125, 73, 876, 702, 238, 1 ],
 	[ "Trafalgar Law ROOM", "DEX", [ "Slasher", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
-	[ "Basil Hawkins", "INT", [ "Slasher", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 200, 200, 7, 1165, 750, 127, 1 ],
-	[ "Basil Hawkins the Magician", "INT", [ "Striker", "Knowledge" ], 5, 28, 6, 4, 99, 4000000, 1095, 717, 85, 2480, 1295, 255, 1 ],
-	[ "Killer", "QCK", [ "Striker", "Knowledge" ], 4, 18, 6, 3, 70, 1066998, 180, 250, 0, 1228, 895, -50, 1 ],
-	[ "Massacre Soldier Killer", "QCK", [ "Striker", "Knowledge" ], 5, 28, 4, 4, 99, 4000000, 1120, 811, 0, 2570, 1449, -200, 1 ],
+	[ "Basil Hawkins", "INT", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 200, 200, 7, 1165, 750, 127, 1 ],
+	[ "Basil Hawkins the Magician", "INT", [ "Striker", "Cerebral" ], 5, 28, 6, 4, 99, 4000000, 1095, 717, 85, 2480, 1295, 255, 1 ],
+	[ "Killer", "QCK", [ "Striker", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 180, 250, 0, 1228, 895, -50, 1 ],
+	[ "Massacre Soldier Killer", "QCK", [ "Striker", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1120, 811, 0, 2570, 1449, -200, 1 ],
 	[ "Urouge", "PSY", [ "Striker", "Tough" ], 4, 18, 4, 3, 70, 1066998, 108, 108, 35, 1290, 798, 108, 1 ],
 	[ "Mad Monk Urouge", "PSY", [ "Striker", "Tough" ], 5, 28, 5, 4, 99, 4000000, 1202, 730, 75, 2071, 1343, 200, 1 ],
 	[ "Bepo", "STR", [ "Fighter", "Tough" ], 4, 18, 4, 3, 70, 1066998, 120, 105, 80, 820, 690, 246, 1 ],
 	[ "Bepo the Martial Artist", "STR", [ "Fighter", "Tough" ], 5, 28, 6, 4, 99, 4000000, 755, 640, 198, 1880, 1200, 405, 1 ],
-	[ "Kalifa", "DEX", [ "Fighter", "Knowledge" ], 3, 12, 5, 1, 50, 392109, 116, 65, 51, 850, 540, 227, 1 ],
-	[ "Beautiful Secretary Kalifa", "DEX", [ "Fighter", "Knowledge" ], 4, 18, 6, 2, 99, 3000000, 788, 488, 177, 1728, 963, 378, 1 ],
+	[ "Kalifa", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 116, 65, 51, 850, 540, 227, 1 ],
+	[ "Beautiful Secretary Kalifa", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 6, 2, 99, 3000000, 788, 488, 177, 1728, 963, 378, 1 ],
 	[ "Paulie", "DEX", "Striker", 3, 12, 5, 1, 50, 392109, 162, 102, 31, 882, 705, 166, 1 ],
 	[ "Paulie Dock One Foreman/Mast Specialist", "DEX", "Striker", 4, 18, 4, 2, 99, 3000000, 812, 617, 130, 2300, 1070, 231, 1 ],
 	[ "Rob Lucci", "QCK", [ "Slasher", "Tough" ], 3, 12, 4, 1, 50, 392109, 132, 126, 28, 1192, 721, 106, 1 ],
@@ -326,12 +326,12 @@ window.units = [
 	[ "Lulu", "QCK", "Shooter", 3, 12, 6, 2, 70, 1066998, 290, 168, 88, 985, 682, 223, 1 ],
 	[ "Wapol", "STR", [ "Fighter", "Free Spirit" ], 3, 8, 4, 1, 50, 392109, 330, 128, 20, 1440, 488, 98, 1 ],
 	[ "Wapol House", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 4, 2, 99, 3000000, 1390, 423, 77, 2940, 835, 142, [ 1, 1, 0.7 ] ],
-	[ "Dalton", "QCK", [ "Slasher", "Knowledge" ], 3, 7, 5, 1, 35, 90778, 192, 110, 45, 751, 390, 140, 0.7 ],
-	[ "Dalton Bison", "QCK", [ "Slasher", "Knowledge" ], 4, 11, 4, 2, 70, 1066998, 690, 322, 102, 1155, 620, 290, 0.7 ],
+	[ "Dalton", "QCK", [ "Slasher", "Cerebral" ], 3, 7, 5, 1, 35, 90778, 192, 110, 45, 751, 390, 140, 0.7 ],
+	[ "Dalton Bison", "QCK", [ "Slasher", "Cerebral" ], 4, 11, 4, 2, 70, 1066998, 690, 322, 102, 1155, 620, 290, 0.7 ],
 	[ "Chess", "DEX", "Shooter", 3, 7, 6, 0, 35, 90778, 186, 90, 31, 668, 296, 121, 1 ],
 	[ "Kuromarimo", "DEX", "Striker", 3, 7, 5, 0, 35, 90778, 72, 144, 24, 366, 488, 108, 1 ],
 	[ "Chessmarimo", "DEX", "Striker", 4, 11, 7, 2, 70, 1066998, 525, 396, 145, 1290, 840, 185, 1 ],
-	[ "Dr. Kureha", "PSY", [ "Slasher", "Knowledge" ], 3, 20, 5, 2, 50, 392109, 35, 32, 88, 200, 200, 510, 1.5 ],
+	[ "Dr. Kureha", "PSY", [ "Slasher", "Cerebral" ], 3, 20, 5, 2, 50, 392109, 35, 32, 88, 200, 200, 510, 1.5 ],
 	[ "Lapin", "INT", "Fighter", 2, 15, 5, 0, 35, 90778, 200, 200, 25, 550, 550, 53, 1.5 ],
 	[ "Lapin Adult", "INT", [ "Fighter", "Tough" ], 3, 20, 4, 2, 70, 1066998, 380, 480, 38, 1100, 950, 100, 1.5 ],
 	[ "Franky", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 128, 128, 28, 1220, 680, 112, 1 ],
@@ -352,8 +352,8 @@ window.units = [
 	[ "Amethyst Jeweled Porc", "INT", "Booster", 3, 5, 4, 0, 1, 0, 159, 108, 21, 159, 108, 21, 1 ],
 	[ "Zephyr", "INT", [ "Shooter", "Tough" ], 4, 30, 7, 1, 70, 1066998, 320, 133, 4, 1588, 699, 29, 1 ],
 	[ "Zephyr NEO Navy Commander", "INT", [ "Shooter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
-	[ "Ain", "QCK", [ "Shooter", "Knowledge" ], 3, 8, 6, 1, 35, 136167, 96, 87, 47, 688, 421, 195, 1 ],
-	[ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Knowledge" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
+	[ "Ain", "QCK", [ "Shooter", "Cerebral" ], 3, 8, 6, 1, 35, 136167, 96, 87, 47, 688, 421, 195, 1 ],
+	[ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Cerebral" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
 	[ "Eustass Kid", "STR", [ "Striker", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
 	[ "Captain Kid", "STR", [ "Striker", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
 	[ "Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
@@ -364,8 +364,8 @@ window.units = [
 	[ "Big Eater Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1248, 401, 158, 3000, 720, 400, 1 ],
 	[ "Capone Bege", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 199, 102, 34, 1050, 755, 153, 1 ],
 	[ "Capone Gang Bege", "QCK", [ "Shooter", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 893, 682, 110, 2122, 1323, 313, 1 ],
-	[ "Silvers Rayleigh", "INT", [ "Fighter", "Knowledge" ], 5, 30, 4, 3, 70, 1066998, 488, 302, 168, 1518, 826, 309, 1 ],
-	[ "Dark King Rayleigh", "INT", [ "Fighter", "Knowledge" ], 6, 55, 4, 4, 99, 5000000, 1462, 777, 277, 3001, 1300, 500, 1 ],
+	[ "Silvers Rayleigh", "INT", [ "Fighter", "Cerebral" ], 5, 30, 4, 3, 70, 1066998, 488, 302, 168, 1518, 826, 309, 1 ],
+	[ "Dark King Rayleigh", "INT", [ "Fighter", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1462, 777, 277, 3001, 1300, 500, 1 ],
 	[ "Giant Slasher Red Pirates", "STR", "Slasher", 2, 8, 6, 0, 30, 57558, 297, 163, 41, 579, 363, 41, 1.5 ],
 	[ "Giant Shooter Blue Pirates", "QCK", "Shooter", 2, 8, 4, 0, 30, 57558, 350, 129, 53, 619, 303, 68, 1.5 ],
 	[ "Giant Warrior Green Pirates", "DEX", "Striker", 2, 8, 4, 0, 30, 57558, 313, 155, 55, 561, 340, 77, 1.5 ],
@@ -381,10 +381,10 @@ window.units = [
 	[ "Kung Fu Dugong Faithful Apprentice", "STR", "Fighter", 4, 11, 8, 3, 50, 392109, 25, 305, 55, 75, 825, 225, 0.7 ],
 	[ "Banana Gator", "QCK", "Fighter", 3, 10, 4, 0, 50, 392109, 552, 334, 80, 922, 534, 155, 1 ],
 	[ "Sandora Dragon", "DEX", "Fighter", 3, 10, 4, 0, 50, 392109, 511, 285, 120, 811, 485, 190, 1 ],
-	[ "Mr. 0 Baroque Works CEO", "INT", [ "Striker", "Knowledge" ], 3, 10, 5, 2, 50, 392109, 194, 110, 23, 1088, 659, 147, 1.5 ],
-	[ "Sir Crocodile", "INT", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 99, 3000000, 995, 582, 112, 2210, 1220, 208, 1.5 ],
-	[ "Hogback", "INT", [ "Fighter", "Knowledge" ], 3, 12, 6, 1, 50, 392109, 210, 72, 33, 1251, 595, 118, 1 ],
-	[ "Doctor Hogback", "INT", [ "Fighter", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 1180, 550, 72, 2741, 945, 189, 1 ],
+	[ "Mr. 0 Baroque Works CEO", "INT", [ "Striker", "Cerebral" ], 3, 10, 5, 2, 50, 392109, 194, 110, 23, 1088, 659, 147, 1.5 ],
+	[ "Sir Crocodile", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 99, 3000000, 995, 582, 112, 2210, 1220, 208, 1.5 ],
+	[ "Hogback", "INT", [ "Fighter", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 210, 72, 33, 1251, 595, 118, 1 ],
+	[ "Doctor Hogback", "INT", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1180, 550, 72, 2741, 945, 189, 1 ],
 	[ "Cindry", "PSY", "Shooter", 3, 12, 5, 1, 50, 392109, 76, 58, 60, 806, 458, 259, 0.7 ],
 	[ "Victoria Cindry", "PSY", "Shooter", 4, 20, 4, 2, 99, 3000000, 622, 398, 231, 1402, 661, 478, 0.7 ],
 	[ "Emporio Ivankov", "QCK", [ "Fighter", "Free Spirit" ], 4, 30, 4, 3, 70, 1066998, 302, 125, 53, 1682, 512, 161, 1 ],
@@ -397,16 +397,16 @@ window.units = [
 	[ "Miss Merry Christmas Human Mole", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 910, 348, 113, 1401, 690, 233, 1 ],
 	[ "Mr. 4", "STR", [ "Shooter", "Tough" ], 3, 11, 4, 1, 35, 136167, 250, 110, 14, 1046, 590, 80, 1 ],
 	[ "Mr. 4 and Lassoo the Dog-Gun", "STR", [ "Shooter", "Tough" ], 4, 15, 6, 2, 70, 1066998, 980, 522, 43, 1606, 910, 110, 1 ],
-	[ "Miss Doublefinger", "DEX", [ "Striker", "Knowledge" ], 3, 11, 8, 1, 35, 136167, 115, 87, 44, 770, 501, 158, 1 ],
-	[ "Miss Doublefinger Human Spike", "DEX", [ "Striker", "Knowledge" ], 4, 15, 4, 2, 70, 1066998, 720, 435, 120, 1081, 701, 288, 1 ],
-	[ "Mr. 1", "STR", [ "Slasher", "Knowledge" ], 3, 11, 4, 1, 35, 136167, 255, 156, 1, 1152, 744, 10, 1 ],
-	[ "Mr. 1 Human Sword", "STR", [ "Slasher", "Knowledge" ], 4, 15, 5, 2, 70, 1066998, 1021, 652, 2, 1880, 1042, 15, 1 ],
+	[ "Miss Doublefinger", "DEX", [ "Striker", "Cerebral" ], 3, 11, 8, 1, 35, 136167, 115, 87, 44, 770, 501, 158, 1 ],
+	[ "Miss Doublefinger Human Spike", "DEX", [ "Striker", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 720, 435, 120, 1081, 701, 288, 1 ],
+	[ "Mr. 1", "STR", [ "Slasher", "Cerebral" ], 3, 11, 4, 1, 35, 136167, 255, 156, 1, 1152, 744, 10, 1 ],
+	[ "Mr. 1 Human Sword", "STR", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 1021, 652, 2, 1880, 1042, 15, 1 ],
 	[ "Rebecca", "QCK", "Slasher", 4, 14, 5, 2, 70, 1422664, 242, 115, 108, 1525, 707, 345, 1 ],
 	[ "Absalom", "STR", [ "Shooter", "Tough" ], 3, 12, 6, 1, 50, 392109, 158, 93, 35, 1330, 602, 126, 1 ],
 	[ "Absalom of the Graveyard", "STR", [ "Shooter", "Tough" ], 4, 20, 7, 2, 99, 3000000, 1271, 545, 77, 2601, 1008, 192, 1 ],
 	[ "General Zombie", "INT", "Fighter", 3, 12, 5, 1, 70, 1066998, 920, 352, 0, 2610, 605, 0, 1 ],
 	[ "Jigoro of the Wind", "DEX", "Slasher", 3, 9, 6, 1, 50, 392109, 426, 258, 37, 1348, 744, 0, 1 ],
-	[ "Sir Crocodile Warlord of the Sea", "INT", [ "Slasher", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 1088, 659, 147, 2980, 1380, 150, 1 ],
+	[ "Sir Crocodile Warlord of the Sea", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1088, 659, 147, 2980, 1380, 150, 1 ],
 	[ "Jimbe", "QCK", [ "Fighter", "Tough" ], 4, 15, 4, 3, 70, 1066998, 266, 101, 35, 1590, 660, 118, 1 ],
 	[ "Jimbe Warlord of the Sea", "QCK", [ "Fighter", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
 	[ "Bartholomew Kuma", "STR", [ "Shooter", "Tough" ], 4, 15, 4, 3, 70, 1066998, 290, 110, 33, 1525, 692, 118, 1 ],
@@ -420,7 +420,7 @@ window.units = [
 	[ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Tough" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
 	[ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
 	[ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Ambition" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
-	[ "Nami Mirage Tempo: The Heavens", "INT", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 99, 2000000, 348, 201, 75, 1260, 988, 361, 1 ],
+	[ "Nami Mirage Tempo: The Heavens", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 348, 201, 75, 1260, 988, 361, 1 ],
 	[ "Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 220, 43, 45, 1190, 430, 208, 1 ],
 	[ "Humming Swordsman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1138, 368, 162, 2108, 980, 332, 1 ],
 	[ "Ryuma", "PSY", "Slasher", 4, 18, 5, 2, 99, 3000000, 1138, 368, 162, 2005, 1088, 162, 1 ],
@@ -446,8 +446,8 @@ window.units = [
 	[ "Captain Karoo and the Supersonic Duck Squadron", "PSY", "Striker", 4, 18, 7, 2, 99, 3000000, 378, 383, 138, 1412, 702, 461, 1.5 ],
 	[ "Marshall D. Teach", "STR", [ "Shooter", "Ambition" ], 4, 30, 6, 1, 70, 1066998, 235, 166, 30, 1402, 790, 23, 1 ],
 	[ "Blackbeard", "STR", [ "Shooter", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1338, 744, 18, 3140, 1418, 83, 1 ],
-	[ "Thatch", "QCK", [ "Slasher", "Knowledge" ], 4, 18, 5, 3, 50, 522812, 208, 103, 63, 1246, 626, 188, 1 ],
-	[ "Twin-Blade Thatch", "QCK", [ "Slasher", "Knowledge" ], 5, 28, 4, 4, 99, 4000000, 1184, 575, 146, 2505, 1190, 302, 1 ],
+	[ "Thatch", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 5, 3, 50, 522812, 208, 103, 63, 1246, 626, 188, 1 ],
+	[ "Twin-Blade Thatch", "QCK", [ "Slasher", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1184, 575, 146, 2505, 1190, 302, 1 ],
 	[ "Namule", "DEX", [ "Fighter", "Tough" ], 4, 18, 4, 3, 50, 522812, 155, 133, 40, 1081, 822, 142, 1 ],
 	[ "One-Hit Namule", "DEX", [ "Fighter", "Tough" ], 5, 28, 4, 4, 99, 4000000, 999, 755, 117, 2398, 1303, 262, 1 ],
 	[ "Rakuyo", "PSY", [ "Striker", "Ambition" ], 4, 18, 4, 3, 50, 522812, 161, 122, 65, 1000, 733, 193, 1 ],
@@ -456,12 +456,12 @@ window.units = [
 	[ "Fossa the Blazing Katana", "STR", [ "Slasher", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 1059, 788, 95, 2454, 1388, 228, 1 ],
 	[ "Curiel", "INT", [ "Shooter", "Ambition" ], 4, 18, 6, 3, 50, 522812, 202, 153, 48, 1159, 818, 134, 1 ],
 	[ "Heavy Specialist Curiel", "INT", [ "Shooter", "Ambition" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
-	[ "Sengoku", "PSY", [ "Fighter", "Knowledge" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
-	[ "Sengoku the Buddha", "PSY", [ "Fighter", "Knowledge" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
-	[ "Criminal Galdino Mr. 3", "PSY", [ "Slasher", "Knowledge" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
+	[ "Sengoku", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
+	[ "Sengoku the Buddha", "PSY", [ "Fighter", "Cerebral" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
+	[ "Criminal Galdino Mr. 3", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
 	[ "Escapee Bentham Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
 	[ "Prison Break Expert Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
-	[ "Satori", "PSY", [ "Shooter", "Knowledge" ], 4, 15, 4, 2, 70, 1066998, 479, 190, 158, 1422, 576, 272, 1 ],
+	[ "Satori", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 479, 190, 158, 1422, 576, 272, 1 ],
 	[ "Shura", "INT", "Striker", 4, 15, 4, 2, 70, 1066998, 330, 420, 93, 1030, 1002, 175, 1 ],
 	[ "Gedatsu", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 622, 378, 53, 2020, 703, 108, 1 ],
 	[ "Braham", "DEX", [ "Shooter", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 374, 283, 96, 1202, 684, 202, 1 ],
@@ -499,47 +499,47 @@ window.units = [
 	[ "Portgas D. Ace Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "QCK", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 571, 295, 200, 1072, 559, 385, 0.7 ],
 	[ "Bellmere", "DEX", "Shooter", 3, 9, 5, 1, 35, 136167, 60, 39, 68, 426, 291, 283, 1 ],
 	[ "Bellmere Nami and Nojiko's Mother", "DEX", "Shooter", 4, 15, 4, 2, 70, 1066998, 377, 249, 240, 810, 483, 400, 1 ],
-	[ "Kaya", "PSY", [ "Shooter", "Knowledge" ], 3, 9, 6, 1, 35, 136167, 115, 50, 72, 370, 180, 330, 1.5 ],
-	[ "Kaya A Rich Young Girl from Syrup Village", "PSY", [ "Shooter", "Knowledge" ], 4, 15, 5, 2, 70, 1066998, 331, 151, 275, 405, 250, 550, 1.5 ],
+	[ "Kaya", "PSY", [ "Shooter", "Cerebral" ], 3, 9, 6, 1, 35, 136167, 115, 50, 72, 370, 180, 330, 1.5 ],
+	[ "Kaya A Rich Young Girl from Syrup Village", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 331, 151, 275, 405, 250, 550, 1.5 ],
 	[ "Hotori and Kotori", "INT", "Fighter", 3, 9, 6, 1, 35, 136167, 242, 74, 27, 1055, 455, 122, 1 ],
 	[ "Hotori and Kotori Skypiea Vice Head Enforcers", "INT", "Fighter", 4, 15, 4, 2, 70, 1066998, 989, 385, 92, 1959, 601, 151, 1 ],
 	[ "Pell", "QCK", [ "Slasher", "Tough" ], 3, 9, 6, 1, 35, 136167, 175, 70, 40, 1000, 427, 142, 1 ],
 	[ "Pell The Guardian Falcon of Alabasta", "QCK", [ "Slasher", "Tough" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
 	[ "Chaka", "STR", [ "Slasher", "Tough" ], 3, 9, 5, 1, 35, 136167, 173, 120, 21, 822, 615, 109, 1 ],
 	[ "Chaka The Guardian Jackal of Alabasta", "STR", [ "Slasher", "Tough" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
-	[ "Sir Crocodile, the Strongest Prisoner Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Knowledge" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
-	[ "Sir Crocodile, the Strongest Prisoner Ex-Warlord", "QCK", [ "Striker", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
-	[ "Daz Bones, Convict Mr. 1", "INT", [ "Slasher", "Knowledge" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
+	[ "Sir Crocodile, the Strongest Prisoner Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
+	[ "Sir Crocodile, the Strongest Prisoner Ex-Warlord", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
+	[ "Daz Bones, Convict Mr. 1", "INT", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
 	[ "Sabo Mt. Corvo's Brothers 3", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 5, 2, 35, 90778, 32, 32, 32, 522, 288, 286, 0.7 ],
 	[ "Sabo Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "PSY", [ "Striker", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 440, 233, 242, 951, 460, 450, 0.7 ],
-	[ "Nico Robin Tropical", "INT", [ "Fighter", "Knowledge" ], 4, 15, 6, 2, 99, 2000000, 368, 128, 96, 1910, 715, 292, 1 ],
-	[ "Heracles'n", "PSY", [ "Shooter", "Knowledge" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
-	[ "Heracles'n the Hero of the Forest", "PSY", [ "Shooter", "Knowledge" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
+	[ "Nico Robin Tropical", "INT", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 99, 2000000, 368, 128, 96, 1910, 715, 292, 1 ],
+	[ "Heracles'n", "PSY", [ "Shooter", "Cerebral" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
+	[ "Heracles'n the Hero of the Forest", "PSY", [ "Shooter", "Cerebral" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
 	[ "Usopp'n", "PSY", "Shooter", 4, 10, 5, 1, 50, 261406, 444, 237, 47, 1080, 648, 144, 1 ],
 	[ "Usopp'n, Pupil of Heracles'n", "PSY", [ "Shooter", "Tough" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
 	[ "Monkey D. Luffy, Merveille's Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
 	[ "Monkey D. Luffy, Straw Hat Pirates' Attack", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
 	[ "Sanji, Merveille's Adventurer", "INT", [ "Fighter", "Tough" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
 	[ "Sanji, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Tough" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
-	[ "Nami, Merveille's Adventurer", "QCK", [ "Striker", "Knowledge" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
-	[ "Nami and Billy the Thunder Bird", "QCK", [ "Striker", "Knowledge" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
+	[ "Nami, Merveille's Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
+	[ "Nami and Billy the Thunder Bird", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
 	[ "Brook, Merveille's Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
 	[ "Brook, Straw Hat Pirates' Attack", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
-	[ "Chopper, Merveille's Adventurer", "DEX", [ "Shooter", "Knowledge" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
-	[ "Chopper, Straw Hat Pirates' Attack", "DEX", [ "Shooter", "Knowledge" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
-	[ "Shanks Black Clad Redhead", "PSY", [ "Slasher", "Knowledge" ], 5, 30, 4, 4, 70, 1066998, 478, 285, 185, 1650, 780, 291, 1 ],
-	[ "Shanks Black Clad Emperor", "PSY", [ "Slasher", "Knowledge" ], 6, 55, 5, 5, 99, 5000000, 1537, 736, 261, 3140, 1400, 418, 1 ],
-	[ "Nico Robin Cherry Blossoms Falling", "DEX", [ "Fighter", "Knowledge" ], 4, 11, 4, 2, 50, 392109, 171, 55, 65, 976, 328, 252, 1 ],
-	[ "Nico Robin Cherry Blossoms in Full Bloom", "DEX", [ "Fighter", "Knowledge" ], 5, 19, 6, 3, 99, 3000000, 913, 271, 209, 1925, 747, 384, 1 ],
+	[ "Chopper, Merveille's Adventurer", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
+	[ "Chopper, Straw Hat Pirates' Attack", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
+	[ "Shanks Black Clad Redhead", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 478, 285, 185, 1650, 780, 291, 1 ],
+	[ "Shanks Black Clad Emperor", "PSY", [ "Slasher", "Cerebral" ], 6, 55, 5, 5, 99, 5000000, 1537, 736, 261, 3140, 1400, 418, 1 ],
+	[ "Nico Robin Cherry Blossoms Falling", "DEX", [ "Fighter", "Cerebral" ], 4, 11, 4, 2, 50, 392109, 171, 55, 65, 976, 328, 252, 1 ],
+	[ "Nico Robin Cherry Blossoms in Full Bloom", "DEX", [ "Fighter", "Cerebral" ], 5, 19, 6, 3, 99, 3000000, 913, 271, 209, 1925, 747, 384, 1 ],
 	[ "Brook Cherry Blossom Hair", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 5, 2, 50, 392109, 211, 108, 40, 1267, 448, 163, 1 ],
 	[ "Brook Cherry Blossom Melody", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 1199, 379, 131, 2311, 885, 281, 1 ],
-	[ "Nami Blossom Cloud", "DEX", [ "Shooter", "Knowledge" ], 4, 12, 5, 2, 50, 392109, 127, 53, 73, 812, 303, 287, 1 ],
-	[ "Nami Blossom Climate", "DEX", [ "Shooter", "Knowledge" ], 5, 20, 4, 3, 99, 3000000, 750, 247, 241, 1783, 670, 445, 1 ],
-	[ "Domino", "PSY", [ "Fighter", "Knowledge" ], 3, 13, 4, 1, 50, 392109, 32, 20, 80, 713, 366, 318, 1 ],
-	[ "Domino, Impel Down's Head Jailer", "PSY", [ "Fighter", "Knowledge" ], 4, 20, 5, 2, 99, 3000000, 634, 301, 265, 1800, 694, 449, 1 ],
+	[ "Nami Blossom Cloud", "DEX", [ "Shooter", "Cerebral" ], 4, 12, 5, 2, 50, 392109, 127, 53, 73, 812, 303, 287, 1 ],
+	[ "Nami Blossom Climate", "DEX", [ "Shooter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 750, 247, 241, 1783, 670, 445, 1 ],
+	[ "Domino", "PSY", [ "Fighter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 32, 20, 80, 713, 366, 318, 1 ],
+	[ "Domino, Impel Down's Head Jailer", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 2, 99, 3000000, 634, 301, 265, 1800, 694, 449, 1 ],
 	[ "Minorhinoceros", "STR", [ "Striker", "Tough" ], 3, 30, 6, 0, 70, 1066998, 1055, 655, 0, 2122, 815, -250, 1 ],
 	[ "Basilisk", "DEX", [ "Fighter", "Tough" ], 3, 12, 4, 1, 70, 1066998, 612, 289, 31, 1525, 644, 128, 1 ],
-	[ "Ohm", "STR", [ "Slasher", "Knowledge" ], 4, 16, 4, 2, 70, 1066998, 770, 480, -600, 2200, 1050, -600, 1 ],
+	[ "Ohm", "STR", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 770, 480, -600, 2200, 1050, -600, 1 ],
 	[ "Nola Giant Snake", "PSY", [ "Fighter", "Tough" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
 	[ "Wyper", "DEX", [ "Shooter", "Free Spirit" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
 	[ "Wyper Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
@@ -555,8 +555,8 @@ window.units = [
 	[ "Roronoa Zoro, Straw Hat Pirates' Attack", "DEX", [ "Slasher", "Ambition" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
 	[ "Usopp, Merveille's Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
 	[ "Usopp, Straw Hat Pirates' Attack", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
-	[ "Nico Robin, Merveille's Adventurer", "INT", [ "Fighter", "Knowledge" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
-	[ "Nico Robin, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Knowledge" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
+	[ "Nico Robin, Merveille's Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
+	[ "Nico Robin, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
 	[ "Franky, Merveille's Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
 	[ "Franky, Straw Hat Pirates' Attack", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
 	[ "Portgas D. Ace Black Clad Flame Fist", "DEX", [ "Shooter", "Free Spirit" ], 5, 30, 6, 4, 70, 1066998, 515, 264, 152, 1922, 758, 253, 1 ],
@@ -571,10 +571,10 @@ window.units = [
 	[ "Monkey D. Luffy Davy Back Fight: Afro", "STR", [ "Fighter", "Tough" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
 	[ "Monkey D. Luffy Davy Back Fight: Combat", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
 	[ "Usopp Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
-	[ "Tony Tony Chopper Davy Back Fight: Mask", "PSY", [ "Fighter", "Knowledge" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
+	[ "Tony Tony Chopper Davy Back Fight: Mask", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
 	[ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
 	[ "Aokiji, Ice Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
-	[ "Tea Time Nami", "INT", [ "Striker", "Knowledge" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
+	[ "Tea Time Nami", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
 	[ "Monkey D. Luffy Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
 	[ "Monkey D. Luffy Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
 	[ "Roronoa Zoro Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Ambition" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
@@ -583,10 +583,10 @@ window.units = [
 	[ "Kamakiri", "QCK", [ "Striker", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 195, 84, 30, 1669, 691, 101, 0.7 ],
 	[ "Raki", "INT", "Shooter", 4, 18, 4, 2, 99, 3000000, 158, 55, 51, 1544, 668, 460, 0.7 ],
 	[ "Aisa", "PSY", "Fighter", 3, 11, 5, 2, 50, 392109, 32, 15, 80, 223, 109, 475, 0.7 ],
-	[ "Nojiko", "PSY", [ "Striker", "Knowledge" ], 3, 9, 5, 1, 35, 136167, 125, 57, 60, 398, 277, 293, 1 ],
-	[ "Nojiko Nami's Sister", "PSY", [ "Fighter", "Knowledge" ], 4, 15, 6, 2, 70, 1066998, 330, 233, 253, 709, 382, 438, 1 ],
-	[ "Crocus", "INT", [ "Striker", "Knowledge" ], 3, 9, 4, 1, 35, 136167, 202, 60, 41, 886, 301, 203, 1 ],
-	[ "Crocus, Twin Cape's Lighthouse Keeper", "INT", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 70, 1066998, 820, 249, 160, 1224, 509, 320, 1 ],
+	[ "Nojiko", "PSY", [ "Striker", "Cerebral" ], 3, 9, 5, 1, 35, 136167, 125, 57, 60, 398, 277, 293, 1 ],
+	[ "Nojiko Nami's Sister", "PSY", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 70, 1066998, 330, 233, 253, 709, 382, 438, 1 ],
+	[ "Crocus", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 1, 35, 136167, 202, 60, 41, 886, 301, 203, 1 ],
+	[ "Crocus, Twin Cape's Lighthouse Keeper", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 820, 249, 160, 1224, 509, 320, 1 ],
 	[ "Koza", "QCK", "Slasher", 3, 9, 5, 1, 35, 136167, 179, 69, 33, 939, 423, 158, 1 ],
 	[ "Koza Rebel Leader", "QCK", "Slasher", 4, 15, 4, 2, 70, 1066998, 872, 375, 114, 1440, 681, 225, 1 ],
 	[ "Crimson Hime Turtle", "STR", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
@@ -648,8 +648,8 @@ window.units = [
 	[ "Little Oars Jr. Charging!", "STR", [ "Shooter", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
 	[ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Tough" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
 	[ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
-	[ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Knowledge" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
-	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Knowledge" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
+	[ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Cerebral" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
+	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
 	[ "Iron Mask Duval", "DEX", [ "Shooter", "Ambition" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
 	[ "Duval, Head of the Flying Fish Riders", "DEX", [ "Shooter", "Ambition" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
 	[ "Duval, Head of the Rosy Life Riders", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
@@ -660,7 +660,7 @@ window.units = [
 	[ "Monkey D. Luffy Swim Ring", "QCK", "Fighter", 4, 15, 6, 2, 99, 2000000, 144, 69, 31, 2232, 933, 242, 1 ],
 	[ "Usopp Voyage Log: Straw Hat Pirates", "QCK", "Striker", 4, 12, 6, 2, 50, 392109, 155, 67, 47, 1085, 513, 235, 0.7 ],
 	[ "Usopp Voyage Dream: Brave Sea Warrior", "QCK", "Striker", 5, 20, 4, 3, 99, 3000000, 1024, 468, 185, 2012, 938, 344, 0.7 ],
-	[ "Nami Holiday", "PSY", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 99, 2000000, 70, 30, 100, 1334, 673, 396, 0.7 ],
+	[ "Nami Holiday", "PSY", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 70, 30, 100, 1334, 673, 396, 0.7 ],
 	[ "Nefertari Vivi, Princess of the Alabasta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 6, 1, 35, 136167, 11, 11, 11, 285, 104, 225, 1 ],
 	[ "Nefertari Vivi, Vice-Leader of the Suna Suna Clan", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 243, 51, 187, 593, 269, 488, 1 ],
 	[ "Koza, Alabasta Citizen", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 53, 53, 3, 503, 274, 151, 1 ],
@@ -674,21 +674,21 @@ window.units = [
 	[ "Hack the Revolutionary", "STR", [ "Fighter", "Tough" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
 	[ "Emporio Ivankov, Newkama Kenpo Instructor", "INT", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
 	[ "Emporio Ivankov the Revolutionary", "INT", [ "Free Spirit", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
-	[ "Inazuma", "QCK", [ "Slasher", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 179, 58, 47, 1300, 449, 232, 1.5 ],
-	[ "Inazuma the Revolutionary", "QCK", [ "Slasher", "Knowledge" ], 5, 29, 6, 4, 99, 4000000, 1244, 400, 199, 2559, 833, 380, 1.5 ],
-	[ "Nico Robin Voyage Log: Straw Hat Pirates", "PSY", [ "Fighter", "Knowledge" ], 4, 12, 6, 2, 50, 392109, 155, 62, 58, 1032, 484, 262, 1 ],
-	[ "Nico Robin Voyage Dream: 100-Year Void", "PSY", [ "Fighter", "Knowledge" ], 5, 20, 6, 3, 99, 3000000, 970, 423, 220, 1924, 857, 390, 1 ],
-	[ "Ice Cream Loving Nami", "DEX", [ "Striker", "Knowledge" ], 4, 12, 6, 1, 50, 392109, 141, 43, 53, 966, 422, 242, 1 ],
-	[ "Lemon Ice Cream Loving Nami", "DEX", [ "Striker", "Knowledge" ], 5, 20, 4, 2, 99, 3000000, 900, 366, 200, 1802, 768, 402, 1 ],
-	[ "Ice Cream Loving Robin", "PSY", [ "Fighter", "Knowledge" ], 4, 12, 6, 1, 50, 392109, 147, 61, 46, 988, 491, 218, 0.7 ],
-	[ "Chocolate Ice Cream Loving Robin", "PSY", [ "Fighter", "Knowledge" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
+	[ "Inazuma", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 179, 58, 47, 1300, 449, 232, 1.5 ],
+	[ "Inazuma the Revolutionary", "QCK", [ "Slasher", "Cerebral" ], 5, 29, 6, 4, 99, 4000000, 1244, 400, 199, 2559, 833, 380, 1.5 ],
+	[ "Nico Robin Voyage Log: Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 2, 50, 392109, 155, 62, 58, 1032, 484, 262, 1 ],
+	[ "Nico Robin Voyage Dream: 100-Year Void", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 6, 3, 99, 3000000, 970, 423, 220, 1924, 857, 390, 1 ],
+	[ "Ice Cream Loving Nami", "DEX", [ "Striker", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 141, 43, 53, 966, 422, 242, 1 ],
+	[ "Lemon Ice Cream Loving Nami", "DEX", [ "Striker", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 900, 366, 200, 1802, 768, 402, 1 ],
+	[ "Ice Cream Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 147, 61, 46, 988, 491, 218, 0.7 ],
+	[ "Chocolate Ice Cream Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
 	[ "Ice Cream Loving Perona", "INT", [ "Shooter", "Ambition" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
 	[ "Strawberry Ice Cream Loving Perona", "INT", [ "Shooter", "Ambition" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
 	[ "Vivi's Breather", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 4, 2, 70, 1066998, 102, 37, 91, 1028, 497, 343, 1 ],
 	[ "Calgara", "STR", [ "Free Spirit", "Striker" ], 3, 12, 6, 1, 50, 392109, 94, 115, 0, 1203, 692, 0, 1 ],
 	[ "Calgara, the Great Warrior of Shandia", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
-	[ "Montblanc Noland", "INT", [ "Slasher", "Knowledge" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
-	[ "Montblanc Noland, Explorer and Admiral of the Lvneel Kingdom", "INT", [ "Slasher", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
+	[ "Montblanc Noland", "INT", [ "Slasher", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
+	[ "Montblanc Noland, Explorer and Admiral of the Lvneel Kingdom", "INT", [ "Slasher", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
 	[ "Naginata Corporal Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
 	[ "Rifle Corporal Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
 	[ "Saber Corporal Navy HQ", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 51, 34, 22, 466, 330, 111, 1 ],
@@ -706,8 +706,8 @@ window.units = [
 	[ "Three-Headed Baskerville", "DEX", "Slasher", 3, 13, 4, 3, 70, 1066998, 102, 78, 38, 1109, 595, 232, 1 ],
 	[ "Blueno, Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
 	[ "Blueno: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
-	[ "Nico Robin, Devil Child", "PSY", [ "Fighter", "Knowledge" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
-	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Knowledge" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
+	[ "Nico Robin, Devil Child", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
+	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
 	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
 	[ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],
 	[ "Gan Fall", "QCK", "Striker", 3, 12, 6, 1, 50, 392109, 80, 40, 48, 930, 452, 185, 1.5 ],
@@ -717,17 +717,17 @@ window.units = [
 	[ "Konis, Skypiean Maiden", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
 	[ "Dracule Mihawk Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
 	[ "Dracule Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
-	[ "Sir Crocodile Logia Warlord of the Sea", "DEX", [ "Knowledge", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
-	[ "Sir Crocodile Logia Former Warlord of the Sea", "DEX", [ "Knowledge", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
+	[ "Sir Crocodile Logia Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
+	[ "Sir Crocodile Logia Former Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
 	[ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
 	[ "Jerry, Cipher Pol No.6", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
-	[ "T-Bone", "PSY", [ "Slasher", "Knowledge" ], 3, 12, 6, 1, 50, 392109, 99, 78, 42, 958, 542, 162, 1 ],
-	[ "Ship Cutter T-Bone, Navy HQ Captain", "PSY", [ "Slasher", "Knowledge" ], 4, 20, 4, 3, 99, 3000000, 900, 493, 133, 1700, 1100, 300, 1 ],
+	[ "T-Bone", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 99, 78, 42, 958, 542, 162, 1 ],
+	[ "Ship Cutter T-Bone, Navy HQ Captain", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 900, 493, 133, 1700, 1100, 300, 1 ],
 	[ "Nefertari Vivi Voyage Log: Princess of Alabasta", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 98, 51, 62, 855, 424, 288, 1 ],
 	[ "Nefertari Vivi Voyage Dream: Queen of the Pirates", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 800, 371, 258, 1591, 777, 474, 1 ],
 	[ "Monkey D. Luffy Gum-Gum Gatling", "DEX", [ "Free Spirit", "Fighter" ], 4, 15, 8, 3, 99, 2000000, 212, 100, 46, 1777, 795, 270, 0.7 ],
-	[ "Kalifa, Cipher Pol No.9", "DEX", [ "Fighter", "Knowledge" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
-	[ "Kalifa Rokushiki, Cipher Pol No.9", "DEX", [ "Fighter", "Knowledge" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
+	[ "Kalifa, Cipher Pol No.9", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
+	[ "Kalifa Rokushiki, Cipher Pol No.9", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
 	[ "Jabra, Cipher Pol No.9", "INT", [ "Fighter", "Tough" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
 	[ "Jabra Rokushiki, Cipher Pol No.9", "INT", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1272, 521, -200, 2720, 1250, -200, 1 ],
 	[ "Fukuro, Cipher Pol No.9", "STR", [ "Fighter", "Tough" ], 3, 9, 4, 2, 35, 136167, 114, 52, 30, 1123, 408, 122, 1 ],
@@ -749,8 +749,8 @@ window.units = [
 	[ "Rob Lucci, CP9's Strongest Generation", "STR", [ "Tough", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
 	[ "Kaku, CP9's Dark Justice", "DEX", [ "Slasher", "Tough" ], 4, 17, 6, 3, 70, 1066998, 151, 132, 28, 1183, 713, 178, 1 ],
 	[ "Kaku, CP9's Strongest Generation", "DEX", [ "Slasher", "Tough" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
-	[ "Kalifa, CP9's Dark Justice", "QCK", [ "Knowledge", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
-	[ "Kalifa, CP9's Strongest Generation", "QCK", [ "Knowledge", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
+	[ "Kalifa, CP9's Dark Justice", "QCK", [ "Cerebral", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
+	[ "Kalifa, CP9's Strongest Generation", "QCK", [ "Cerebral", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
 	[ "Jabra, CP9's Dark Justice", "QCK", [ "Tough", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
 	[ "Jabra, CP9's Strongest Generation", "QCK", [ "Tough", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
 	[ "Blueno, CP9's Dark Justice", "INT", [ "Tough", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
@@ -762,56 +762,56 @@ window.units = [
 	[ "Monkey D. Luffy Halloween Monster", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
 	[ "Usopp Lying Wolf", "PSY", "Shooter", 4, 20, 5, 3, 99, 3000000, 51, 23, 46, 1444, 673, 400, 1 ],
 	[ "Franky Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
-	[ "Nami Jackie 'o Lantern", "QCK", [ "Striker", "Knowledge" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
-	[ "Tony Tony Chopper Lil' Vampire", "INT", [ "Fighter", "Knowledge" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
+	[ "Nami Jackie 'o Lantern", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
+	[ "Tony Tony Chopper Lil' Vampire", "INT", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
 	[ "Roronoa Zoro Jack the Ripper", "QCK", [ "Slasher", "Ambition" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
-	[ "Nico Robin Devil Girl", "DEX", [ "Fighter", "Knowledge" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
+	[ "Nico Robin Devil Girl", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
 	[ "Sanji Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
 	[ "Brook Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
 	[ "Dalmatian, Navy HQ Vice Admiral", "STR", [ "Fighter", "Tough" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
-	[ "Momonga, Navy HQ Vice Admiral", "PSY", [ "Knowledge", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
+	[ "Momonga, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
 	[ "Onigumo, Navy HQ Vice Admiral", "DEX", [ "Slasher", "Ambition" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
 	[ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
 	[ "Very Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
-	[ "Strawberry, Navy HQ Vice Admiral", "PSY", [ "Knowledge", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
+	[ "Strawberry, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
 	[ "Lucky Roo", "PSY", [ "Shooter", "Free Spirit" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
 	[ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
 	[ "Rebecca, Prisoner Gladiator", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
 	[ "Rebecca, Colosseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
 	[ "Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
 	[ "Mad Monk Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1512, 755, 83, 2824, 1324, 203, 1.5 ],
-	[ "Tashigi: Flower of Justice", "INT", [ "Slasher", "Knowledge" ], 4, 13, 5, 2, 50, 392109, 132, 65, 49, 999, 495, 205, 1 ],
-	[ "Tashigi Marine Officer: Flower of Justice", "INT", [ "Slasher", "Knowledge" ], 5, 20, 5, 3, 99, 3000000, 932, 428, 164, 1804, 890, 378, 1 ],
-	[ "Gen-san", "STR", [ "Slasher", "Knowledge" ], 3, 9, 5, 2, 35, 136167, 211, 45, 33, 930, 288, 190, 1 ],
-	[ "Genzo, Cocoyasi Village Resident", "STR", [ "Slasher", "Knowledge" ], 4, 15, 4, 3, 70, 1066998, 879, 242, 143, 1324, 501, 299, 1 ],
+	[ "Tashigi: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 132, 65, 49, 999, 495, 205, 1 ],
+	[ "Tashigi Marine Officer: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 932, 428, 164, 1804, 890, 378, 1 ],
+	[ "Gen-san", "STR", [ "Slasher", "Cerebral" ], 3, 9, 5, 2, 35, 136167, 211, 45, 33, 930, 288, 190, 1 ],
+	[ "Genzo, Cocoyasi Village Resident", "STR", [ "Slasher", "Cerebral" ], 4, 15, 4, 3, 70, 1066998, 879, 242, 143, 1324, 501, 299, 1 ],
 	[ "Dr. Hiluluk", "PSY", [ "Shooter", "Free Spirit" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
 	[ "Dr. Hiluluk, Quack Doctor", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
 	[ "Kuina", "DEX", "Striker", 3, 9, 6, 2, 35, 136167, 54, 41, 70, 503, 264, 251, 1 ],
 	[ "Kuina, Shimotsuki Village's Girl Swordsman", "DEX", [ "Slasher", "Ambition" ], 4, 15, 5, 3, 70, 1066998, 448, 220, 213, 917, 582, 338, 1 ],
 	[ "Tamanegi, Piiman & Ninjin", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
 	[ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
-	[ "Iceburg", "INT", [ "Shooter", "Knowledge" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
-	[ "Iceburg, Mayor of W7 and President of Galley-La Company", "INT", [ "Shooter", "Knowledge" ], 4, 16, 4, 3, 70, 1066998, 723, 343, 122, 1401, 702, 224, 1 ],
+	[ "Iceburg", "INT", [ "Shooter", "Cerebral" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
+	[ "Iceburg, Mayor of W7 and President of Galley-La Company", "INT", [ "Shooter", "Cerebral" ], 4, 16, 4, 3, 70, 1066998, 723, 343, 122, 1401, 702, 224, 1 ],
 	[ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Tough" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
 	[ "Nightmare Luffy Warrior of Hope", "INT", [ "Fighter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1331, 711, 0, 3020, 1520, 0, 1.5 ],
-	[ "Breed", "INT", "Knowledge", 3, 13, 6, 1, 50, 392109, 59, 25, 59, 867, 418, 275, 1.5 ],
-	[ "Breed, User of the Peto-Peto Fruit", "INT", [ "Knowledge", "Tough" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
+	[ "Breed", "INT", "Cerebral", 3, 13, 6, 1, 50, 392109, 59, 25, 59, 867, 418, 275, 1.5 ],
+	[ "Breed, User of the Peto-Peto Fruit", "INT", [ "Cerebral", "Tough" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
 	[ "Kung Fu Dugong, Sea Animal Pirates", "PSY", [ "Fighter", "Tough" ], 4, 18, 5, 2, 70, 1778330, 50, 355, 95, 450, 1115, 225, 1.5 ],
 	[ "Sea Lapin, Sea Animal Pirates", "QCK", [ "Fighter", "Tough" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
 	[ "Octopus Boxer, Sea Animal Pirates", "STR", [ "Fighter", "Tough" ], 3, 15, 8, 1, 70, 711332, 99, 91, 2, 1563, 846, 93, 1 ],
 	[ "Mr. 2 Bon Clay Voyage Log: B.W.", "PSY", [ "Fighter", "Free Spirit" ], 4, 13, 5, 2, 50, 392109, 109, 57, 32, 1033, 513, 212, 1 ],
 	[ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
-	[ "Hina, Navy HQ Captain", "DEX", [ "Fighter", "Knowledge" ], 4, 18, 5, 1, 50, 392109, 188, 128, 48, 977, 544, 191, 1 ],
-	[ "Black Cage Hina, Navy HQ Captain", "DEX", [ "Fighter", "Knowledge" ], 5, 30, 5, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1 ],
+	[ "Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 5, 1, 50, 392109, 188, 128, 48, 977, 544, 191, 1 ],
+	[ "Black Cage Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 5, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1 ],
 	[ "Smoker, Navy HQ Captain", "INT", [ "Striker", "Ambition" ], 4, 25, 6, 2, 70, 1066998, 710, 309, 44, 1600, 703, 146, 1.5 ],
 	[ "Smoker the White Hunter, Navy HQ Captain", "INT", [ "Striker", "Ambition" ], 5, 40, 5, 3, 99, 4000000, 1549, 640, 112, 2727, 1289, 234, 1.5 ],
-	[ "Pure White Angel Wedding Nami", "PSY", [ "Striker", "Knowledge" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
-	[ "Pure White Goddess Wedding Nami", "PSY", [ "Striker", "Knowledge" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
+	[ "Pure White Angel Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
+	[ "Pure White Goddess Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
 	[ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Tough" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
 	[ "Courting Lola, Thriller Bark Bride", "STR", [ "Slasher", "Tough" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
 	[ "Risky Brothers", "DEX", [ "Slasher", "Free Spirit" ], 3, 9, 4, 2, 50, 392109, 30, 15, 40, 707, 368, 287, 1 ],
 	[ "Cerberus", "QCK", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
-	[ "Tararan", "INT", [ "Knowledge", "Tough" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
+	[ "Tararan", "INT", [ "Cerebral", "Tough" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
 	[ "Bear-Skin Rug", "DEX", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
 	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Free Spirit", "Ambition" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
 	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Free Spirit", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
@@ -828,19 +828,19 @@ window.units = [
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
 	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, 442, 60, 0, 455, 497, 222, null],
 	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, 442, 424, 149, 696, 762, 390, null],
-	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
-	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Knowledge", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
+	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
+	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
 	[ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
 	[ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
-	[ "Tyrant Bartholomew Kuma", "STR", [ "Knowledge", "Tough" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
-	[ "Tyrant Bartholomew Kuma, Government's Human Weapon", "STR", [ "Knowledge", "Tough" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
-	[ "Caesar Clown", "DEX", [ "Ambition", "Knowledge" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
-	[ "Master Caesar", "DEX", [ "Ambition", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
+	[ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Tough" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
+	[ "Tyrant Bartholomew Kuma, Government's Human Weapon", "STR", [ "Cerebral", "Tough" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
+	[ "Caesar Clown", "DEX", [ "Ambition", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
+	[ "Master Caesar", "DEX", [ "Ambition", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
 	[ "Vergo", "INT", [ "Striker", "Tough" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
 	[ "Vergo, Donquixote Pirates", "INT", [ "Striker", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1464, 730, 60, 3003, 1410, 140, 1 ],
-	[ "Monet", "PSY", [ "Free Spirit", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
-	[ "Monet, Donquixote Pirates", "PSY", [ "Free Spirit", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 1020, 540, 199, 2131, 1001, 433, 1 ],
+	[ "Monet", "PSY", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
+	[ "Monet, Donquixote Pirates", "PSY", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1020, 540, 199, 2131, 1001, 433, 1 ],
 	[ "Baby 5", "STR", [ "Shooter", "Striker" ], 4, 18, 5, 3, 70, 1066998, 114, 142, 53, 892, 743, 230, 1 ],
 	[ "Baby 5, Donquixote Pirates", "STR", [ "Shooter", "Striker" ], 5, 30, 6, 4, 99, 4000000, 850, 692, 185, 1929, 1352, 349, 1 ],
 	[ "Buffalo", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 9, 3, 70, 1066998, 96, 96, 49, 1111, 666, 196, 1 ],
@@ -848,7 +848,7 @@ window.units = [
 	[ "Tom, Tom's Workers", "DEX", [ "Fighter", "Tough" ], 3, 12, 6, 1, 50, 392109, 159, 95, 30, 1103, 614, 141, 1 ],
 	[ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
 	[ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Ambition" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
-	[ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Knowledge" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
+	[ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
 	[ "Tin-Plate Wapol", "STR", [ "Shooter", "Ambition" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
 	[ "Slim-up Wapol", "QCK", [ "Shooter", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
 	[ "Robson", "PSY", [ "Fighter", "Tough" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
@@ -861,20 +861,20 @@ window.units = [
 	[ "War Hero Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Ambition" ], 5, 30, 4, 3, 99, 3000000, 1121, 500, 104, 2239, 1048, 261, 1 ],
 	[ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
 	[ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
-	[ "Snowy World Nami", "QCK", [ "Striker", "Knowledge" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
+	[ "Snowy World Nami", "QCK", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
 	[ "Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
 	[ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
-	[ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Knowledge", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
+	[ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Cerebral", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
 	[ "Usopp Tabasco Star: The Storm", "DEX", "Shooter", 4, 15, 7, 2, 99, 2000000, 258, 152, 94, 1866, 704, 343, 1 ],
-	[ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Tough", "Knowledge" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
-	[ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Ambition", "Knowledge" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
-	[ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Ambition", "Knowledge" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
-	[ "Sugar", "QCK", [ "Free Spirit", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
-	[ "Sugar, Donquixote Pirates", "QCK", [ "Free Spirit", "Knowledge" ], 5, 30, 5, 4, 99, 4000000, 896, 342, 274, 1905, 790, 532, 1 ],
+	[ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Tough", "Cerebral" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
+	[ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Ambition", "Cerebral" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
+	[ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Ambition", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
+	[ "Sugar", "QCK", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
+	[ "Sugar, Donquixote Pirates", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 896, 342, 274, 1905, 790, 532, 1 ],
 	[ "Señor Pink", "PSY", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 292, 103, 24, 1524, 657, 142, 1 ],
 	[ "Señor Pink, Donquixote Pirates", "PSY", [ "Free Spirit", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1478, 600, 100, 2800, 1242, 241, 1 ],
-	[ "Trebol", "INT", [ "Knowledge", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
-	[ "Trebol, Donquixote Pirates", "INT", [ "Knowledge", "Ambition" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
+	[ "Trebol", "INT", [ "Cerebral", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
+	[ "Trebol, Donquixote Pirates", "INT", [ "Cerebral", "Ambition" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
 	[ "Jora", "DEX", [ "Free Spirit", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
 	[ "Jora, Donquixote Pirates", "DEX", [ "Free Spirit", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
 	[ "Lao-G", "STR", [ "Fighter", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
@@ -884,19 +884,19 @@ window.units = [
 	[ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Tough" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
 	[ "Dorry the Blue Ogre", "INT", [ "Slasher", "Tough" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
 	[ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
-	[ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Knowledge" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
+	[ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Cerebral" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
 	[ "Buggy, Cheerfully Crazy", "QCK", [ "Ambition", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
 	[ "Hollow Hollow Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
 	[ "Perona, Thriller Bark's Mysterious Four", "DEX", [ "Shooter", "Ambition" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
 	[ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Ambition" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
-	[ "Doctor Hogback, Thriller Bark's Mysterious Four", "INT", [ "Fighter", "Knowledge" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
+	[ "Doctor Hogback, Thriller Bark's Mysterious Four", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
 	[ "Absalom of the Graveyard, Thriller Bark's Mysterious Four", "STR", [ "Shooter", "Tough" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
 	[ "Oars, Special Zombie", "STR", [ "Fighter", "Tough" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
 	[ "Gecko Moria, Shadow's Asgard", "INT", [ "Ambition", "Tough" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
 	[ "Brook, Gentleman Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
 	[ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
-	[ "Sir Crocodile, Sand General", "STR", [ "Knowledge", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
-	[ "Mr. 3, Makeshift Musician", "QCK", [ "Striker", "Knowledge" ], 4, 17, 4, 2, 99, 2000000, 24, 14, 33, 1703, 622, 312, 1.5 ],
+	[ "Sir Crocodile, Sand General", "STR", [ "Cerebral", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
+	[ "Mr. 3, Makeshift Musician", "QCK", [ "Striker", "Cerebral" ], 4, 17, 4, 2, 99, 2000000, 24, 14, 33, 1703, 622, 312, 1.5 ],
 	[ "Mr. 2 Bon Clay, Dubious Samurai", "INT", [ "Fighter", "Free Spirit" ], 4, 17, 4, 2, 99, 2000000, 42, 20, 22, 1810, 804, 235, 1.5 ],
 	[ "Fresh Franky, Health Comes First", "DEX", [ "Shooter", "Free Spirit" ], 4, 25, 6, 2, 70, 1066998, 659, 244, 85, 1330, 659, 211, 1 ],
 	[ "Cyborg Franky", "DEX", [ "Shooter", "Free Spirit" ], 5, 40, 8, 3, 99, 4000000, 1269, 618, 167, 2515, 1172, 323, 1 ],
@@ -905,16 +905,16 @@ window.units = [
 	[ "Yokozuna", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
 	[ "Roronoa Zoro, the Swordsman Who Wanders Kuraigana Island", "STR", [ "Slasher", "Ambition" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
 	[ "Roronoa Zoro, Pupil of the World's Strongest Swordsman", "STR", [ "Slasher", "Ambition" ], 5, 30, 5, 4, 99, 4000000, 1403, 687, 67, 2830, 1390, 190, 1 ],
-	[ "Nico Robin, Tequila Wolf Inmate", "INT", [ "Knowledge", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 131, 91, 43, 1021, 679, 217, 1 ],
-	[ "Nico Robin, Light of the Revolution", "INT", [ "Knowledge", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
-	[ "Tony Tony Chopper, Torino Kingdom's Peace Mediator", "PSY", [ "Fighter", "Knowledge" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
-	[ "Chopper Mask, the Hero Who Protects the World", "PSY", [ "Fighter", "Knowledge" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
+	[ "Nico Robin, Tequila Wolf Inmate", "INT", [ "Cerebral", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 131, 91, 43, 1021, 679, 217, 1 ],
+	[ "Nico Robin, Light of the Revolution", "INT", [ "Cerebral", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
+	[ "Tony Tony Chopper, Torino Kingdom's Peace Mediator", "PSY", [ "Fighter", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
+	[ "Chopper Mask, the Hero Who Protects the World", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
 	[ "Sanji, Kamabakka Queendom Fugitive", "DEX", [ "Tough", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
 	[ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Tough", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
 	[ "Brook, Harahetternia's Demon Lord", "QCK", [ "Free Spirit", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
 	[ "Brook, BONE to be Wild!!!", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
-	[ "Nico Robin, Bride of Ohara", "QCK", [ "Knowledge", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
-	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Knowledge", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
+	[ "Nico Robin, Bride of Ohara", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
+	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Cerebral", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
 	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 1 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
@@ -928,7 +928,7 @@ window.units = [
 	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
 	[ "Hannyabal", "DEX", ["Ambition", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
 	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Ambition", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
-	[ "Saldeath", "INT", [ "Striker", "Knowledge" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
+	[ "Saldeath", "INT", [ "Striker", "Cerebral" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	[ "Blugori", "DEX", [ "Tough", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	[ "Pica", "PSY", [ "Tough","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	[ "Pica, Donquixote Pirates", "PSY", [ "Tough", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
@@ -936,8 +936,8 @@ window.units = [
 	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
 	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
 	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
-	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Knowledge" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
-	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Knowledge" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
+	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
+	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
 	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
 	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
 	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
@@ -947,7 +947,7 @@ window.units = [
 	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
 	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
 	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
-	[ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Knowledge" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
+	[ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
 	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, 1066998, 606, 313, 54, 1496, 744, 152, 1],
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1431, 690, 110, 2599, 1271, 271, 1],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, 136167, 131, 98, 25, 935, 375, 163, 1],
@@ -977,7 +977,7 @@ window.units = [
 	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
 	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
 	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
-	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
+	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
 	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
     [ "Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
@@ -992,14 +992,14 @@ window.units = [
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, 1079, 813, 154, null ],
     [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, null, 1000, 767, 101, 2375, 1371, 271, null ],
-    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, null, 147, 48, 77, 1157, 451, 274, null ],
-    [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],
+    [ "Violet","PSY",["Fighter","Cerebral"], 4, 18, 5, 3, 70, null, 147, 48, 77, 1157, 451, 274, null ],
+    [ "Violet, Donquixote Pirates","PSY",["Fighter","Cerebral"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],
     [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, null, 91, 147, 51, 999, 755, 192, null ],
     [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, null, 933, 692, 143, 2087, 1362, 324, null ],
     [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, 1500, 866, 90, null ],
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
-    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
-    [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
+    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
+    [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
 	[ "Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
 	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
 	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
diff --git a/index.html b/index.html
index 516d587e5..83c2d52d1 100644
--- a/index.html
+++ b/index.html
@@ -57,10 +57,12 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>03/04/2016</p>
+            <p>06/04/2016</p>
             <br>
             <ul>
-                <li>New Probability Calculator</li>
+                <li>Knowledge is dead</li>
+                <li>Long live Cerebral</li>
+                <li>If this broke something please report it</li>
                 <br>
                 <li>Still Under Beta Testing</li>
                 <li>Please Report Bugs</li>

From d5c08c7f47b6f3f037764444182f027649bad8be Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 6 Apr 2016 12:57:28 -0500
Subject: [PATCH 0265/1569] Official numbers/images

Only Kid Law missing now
---
 common/data/units.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 4c4045037..1e90b1f41 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -980,26 +980,26 @@ window.units = [
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Knowledge"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
 	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
-    [ "Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, null ],
-    [ "Flower Sword Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, null ],
-    [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, null, 321, 132, 30, 2404, 1024, 243, null ],
+    [ "Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
+    [ "Flower Sword Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
+    [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, 3000000, 321, 132, 30, 2404, 1024, 243, 1 ],
     [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, 17456, 94, 33, 15, 571, 280, 77, 1],
     [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
     [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
     [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
     [ "Impostor Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
-    [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, null, 203, 127, 34, 1589, 716, 105, null ],
-    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
-    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, 1079, 813, 154, null ],
-    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, null, 1000, 767, 101, 2375, 1371, 271, null ],
-    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, null, 147, 48, 77, 1157, 451, 274, null ],
-    [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],
-    [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, null, 91, 147, 51, 999, 755, 192, null ],
-    [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, null, 933, 692, 143, 2087, 1362, 324, null ],
-    [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, 1500, 866, 90, null ],
-    [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
-    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
-    [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
+    [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, 1066998, 203, 127, 34, 1589, 716, 105, 1 ],
+    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, 4000000, 1523, 643, 49, 2882, 1280, 217, 1 ],
+    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, 1066998, 102, 161, 32, 1079, 813, 154, 1 ],
+    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, 4000000, 1000, 767, 101, 2375, 1371, 271, 1 ],
+    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, 1066998, 147, 48, 77, 1157, 451, 274, 1 ],
+    [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, 4000000, 1095, 400, 220, 2217, 813, 483, 1 ],
+    [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, 1066998, 91, 147, 51, 999, 755, 192, 1 ],
+    [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, 4000000, 933, 692, 143, 2087, 1362, 324, 1 ],
+    [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, 1066998, 698, 452, 48, 1500, 866, 90, 1 ],
+    [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, 4000000, 1443, 812, 50, 2840, 1421, 174, 1 ],
+    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
+    [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
 	[ "Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
 	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
 	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],

From d07b9ca2cb9839c93b08a9d7b2b6467145f67e12 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 6 Apr 2016 13:19:00 -0500
Subject: [PATCH 0266/1569] Knowledge fix

Cerebral
---
 common/data/units.js | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index d3fe192d7..a246dadf4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -988,33 +988,18 @@ window.units = [
     [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
     [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
     [ "Impostor Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
-<<<<<<< HEAD
     [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, 1066998, 203, 127, 34, 1589, 716, 105, 1 ],
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, 4000000, 1523, 643, 49, 2882, 1280, 217, 1 ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, 1066998, 102, 161, 32, 1079, 813, 154, 1 ],
     [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, 4000000, 1000, 767, 101, 2375, 1371, 271, 1 ],
-    [ "Violet","PSY",["Fighter","Knowledge"], 4, 18, 5, 3, 70, 1066998, 147, 48, 77, 1157, 451, 274, 1 ],
-    [ "Violet, Donquixote Pirates","PSY",["Fighter","Knowledge"], 5, 30, 4, 4, 99, 4000000, 1095, 400, 220, 2217, 813, 483, 1 ],
+    [ "Violet","PSY",["Fighter","Cerebral"], 4, 18, 5, 3, 70, 1066998, 147, 48, 77, 1157, 451, 274, 1 ],
+    [ "Violet, Donquixote Pirates","PSY",["Fighter","Cerebral"], 5, 30, 4, 4, 99, 4000000, 1095, 400, 220, 2217, 813, 483, 1 ],
     [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, 1066998, 91, 147, 51, 999, 755, 192, 1 ],
     [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, 4000000, 933, 692, 143, 2087, 1362, 324, 1 ],
     [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, 1066998, 698, 452, 48, 1500, 866, 90, 1 ],
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, 4000000, 1443, 812, 50, 2840, 1421, 174, 1 ],
-    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Knowledge"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
-    [ "Donquixote Rosinante","DEX",["Free Spirit","Knowledge"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
-=======
-    [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, null, 203, 127, 34, 1589, 716, 105, null ],
-    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, null, 1523, 643, 49, null, null, null, null ],
-    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, null, 102, 161, 32, 1079, 813, 154, null ],
-    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, null, 1000, 767, 101, 2375, 1371, 271, null ],
-    [ "Violet","PSY",["Fighter","Cerebral"], 4, 18, 5, 3, 70, null, 147, 48, 77, 1157, 451, 274, null ],
-    [ "Violet, Donquixote Pirates","PSY",["Fighter","Cerebral"], 5, 30, 4, 4, 99, null, 1095, 400, 220, 2217, 813, 483, null ],
-    [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, null, 91, 147, 51, 999, 755, 192, null ],
-    [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, null, 933, 692, 143, 2087, 1362, 324, null ],
-    [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, null, 698, 452, 48, 1500, 866, 90, null ],
-    [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, null, 1443, 812, 50, 2840, 1421, 174, null ],
-    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, null, 406, 196, 155, 1503, 694, 320, null ],
-    [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, null, 1428, 628, 272, 2746, 1222, 555, null ],
->>>>>>> origin/master
+    [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
+    [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
 	[ "Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
 	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
 	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],

From 198ccd0fde1bb49bf1d9d0855dd60cf8bd36d9b1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 6 Apr 2016 13:22:07 -0500
Subject: [PATCH 0267/1569] Knowledge Fix

Sidebar changed to Cerebral
---
 characters/js/directives.js   | 4 ++--
 characters/views/sidebar.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index c57389f9c..518d300d0 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -116,7 +116,7 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
                     'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
@@ -138,7 +138,7 @@ directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classSpecial == \'%s\' }" ' +
                     'ng-click="onSpecialClick($event,\'%s\')">%s</span>';
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 6536ed5d1..0e0dffd35 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -9,7 +9,7 @@
 
 <div class="filter-container">
     <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Knowledge', 'Tough', 'Ambition' ]"
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ]"
         class="filter width-6 class" ng-click="onClassClick($event,class)"
         ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
 </div>

From d17503e01b172da115fb2410c7c36fa717449e64 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 6 Apr 2016 15:27:09 -0500
Subject: [PATCH 0268/1569] Knowledge Fix

Cerebral now
---
 common/data/captains.js | 80 ++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a124d39ce..c9c1f0b71 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1476,12 +1476,12 @@ window.captains = {
 	},
 	719: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+			return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
 		}
 	},
 	720: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+			return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
 		}
 	},
 	721: {
@@ -1568,12 +1568,12 @@ window.captains = {
 		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
 	},
 	751: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	752: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2.25 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	753: {
 		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
@@ -1631,7 +1631,7 @@ window.captains = {
 		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
 	},
 	771: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
 	},
 	772: {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
@@ -1640,8 +1640,8 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	775: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	776: {
 		atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
@@ -1673,8 +1673,8 @@ window.captains = {
 		rcv: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; }
 	},
 	793: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	794: {
 		atk: function(p) {
@@ -1687,10 +1687,10 @@ window.captains = {
 		}
 	},
 	796: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	797: {
-		atk: function(p) { return p.unit.class.has("Knowledge") || p.unit.class.has("Tough") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Tough") ? 2 : 1; }
 	},
 	798: {
 		hitAtk: function(p) {
@@ -1719,12 +1719,12 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
 	},
 	807: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	808: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	809: {
 		atk: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; },
@@ -1780,12 +1780,12 @@ window.captains = {
 	},
 	830: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.75 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.75 : 1;
 		}
 	},
 	831: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 2 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 2 : 1;
 		}
 	},
 	832: {
@@ -1803,12 +1803,12 @@ window.captains = {
 		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
 	},
 	835: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+		hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	836: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+		hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	837: {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 2 : 1; }
@@ -1857,7 +1857,7 @@ window.captains = {
 	},
 	850: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.5 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
 		}
 	},
 	851: {
@@ -1902,7 +1902,7 @@ window.captains = {
 		hp: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
 	},
 	866: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	867: {
 		hit: function(n) { return n > 11 ? 1.5 : 1; }
@@ -1940,12 +1940,12 @@ window.captains = {
 	},
 	875: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") || p.unit.class.has("Ambition") ? 2 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2 : 1;
 		}
 	},
 	876: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") || p.unit.class.has("Ambition") ? 2.25 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2.25 : 1;
 		}
 	},
 	878: {
@@ -2027,15 +2027,15 @@ window.captains = {
 	},
 	897: {
 		atk: function(p) {
-			return p.unit.class.has("Knowledge") || p.unit.class.has("Ambition") ? 2 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2 : 1;
 		}
 	},
 	898: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.5 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
 		},
 		hp: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Knowledge") ? 1.5 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
 		}
 	},
 	899: {
@@ -2067,12 +2067,12 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.75 : 1; }
 	},
 	907: {
-		atk: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; }
 	},
 	908: {
-		atk: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 2.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") && p.percHP <= 30 ? 1.75 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 2.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
 	},
 	909: {
 		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
@@ -2097,12 +2097,12 @@ window.captains = {
 		atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1.2); }
 	},
 	915: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
 	},
 	916: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.class.has("Knowledge") ? 1.75 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
 	},
 	917: {
 		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -2203,10 +2203,10 @@ window.captains = {
 		hp: function(p) { return 1.25; }
 	},
 	938: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	939: {
-		atk: function(p) { return p.unit.class.has("Knowledge") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	940: {
 		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },

From 4983d71d3a637358bcc037ade60b8a263425b85b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 7 Apr 2016 13:15:12 -0500
Subject: [PATCH 0269/1569] Gan Fall Updates

condition/books
---
 common/data/drops.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 07bd52b77..4fbf7bdfa 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -858,11 +858,11 @@ window.drops = {
         {
             name: "Knight of the Sky Gan Fall",
             thumb: 713,
-            condition: 'Every class but Free Spirit is weakend',
+            condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
 			challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
-            Expert: [ 712, 714, 715, -716, -546, -541, -520 ],
-            Elite: [ 712, 714, 715, -716, -546, -541, -520 ]
+            Expert: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363 ],
+            Elite: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363 ]
         },
 
         {

From 470fa40f0d0bec28b7f5e6cc252e1c176036d533 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 7 Apr 2016 21:06:21 +0200
Subject: [PATCH 0270/1569] Mr3 Gan Fall

---
 common/data/drops.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 4fbf7bdfa..06eb2b7d9 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -861,8 +861,8 @@ window.drops = {
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
 			challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
-            Expert: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363 ],
-            Elite: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363 ]
+            Expert: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ],
+            Elite: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ]
         },
 
         {

From badec0467158341ad914ac4ee56826bce4af4dd4 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 9 Apr 2016 11:06:59 +0200
Subject: [PATCH 0271/1569] Farmable Socket Filter

Implements #32
---
 characters/js/table.js        |  4 ++++
 characters/js/utils.js        | 14 ++++++++++++++
 characters/views/sidebar.html |  2 ++
 common/data/drops.js          |  2 +-
 common/data/families.js       |  4 ++--
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index a2c61f581..823639f14 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -68,6 +68,8 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
         if (!tableData.parameters) return true;
         var id = parseInt(data[0],10), unit = window.units[id - 1];
         var flags = window.flags[unit.number + 1] || { };
+        var farmableSocket = CharUtils.hasFarmableSocket(unit.number);
+        
         /* * * * * Query filters * * * * */
         // filter by matchers
         for (var matcher in tableData.parameters.matchers) {
@@ -157,6 +159,8 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
         }
         // filter by rr pool
         if ((filters.rr === 'Not in RR pool' && flags.rr) || (filters.rr === 'In RR pool' && !flags.rr)) return false;
+        //filter by farmable Sockets
+        if ((filters.socket === 'No Farmable Sockets' && farmableSocket) || (filters.socket === 'Farmable Sockets' && !farmableSocket)) return false;
         // filter by active matchers
         if (filters.custom.length > 0 && !window.details.hasOwnProperty(id)) return false;
         for (var i=0;i<filters.custom.length;++i) {
diff --git a/characters/js/utils.js b/characters/js/utils.js
index dea9aab2f..8410e6116 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -264,6 +264,20 @@ CharUtils.isClassBooster = function(target, id, clazz) {
     classCache[target][clazz][id] = result;
     return result;
 };
+    
+CharUtils.hasFarmableSocket = function(id) {
+    var farmableSocket = false;
+    var ownFamily = window.families[id];
+    
+    window.families.forEach(function(family,n){
+       if (ownFamily == family) {
+           var famId = n+1;
+           if(CharUtils.isFarmable(famId) || CharUtils.isFarmable(Utils.searchBaseForms(famId))) farmableSocket = true;
+       }
+    });
+    
+    return farmableSocket;
+}
 
 /******************
  * Initialization *
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 0e0dffd35..db61d78f9 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -37,6 +37,8 @@
         ng-class="{ active: filters.server == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
     <span ng-repeat="type in [ 'In RR pool', 'Not in RR pool' ]" class="filter width-6 drop" ng-model="filters.rr"
         ng-class="{ active: filters.rr == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+    <span ng-repeat="type in [ 'Farmable Sockets', 'No Farmable Sockets' ]" class="filter width-6 drop" ng-model="filters.socket"
+        ng-class="{ active: filters.socket == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
 </div>
 
 <div class="filter-container conditional" ng-show="filters.drop == 'Farmable'">
diff --git a/common/data/drops.js b/common/data/drops.js
index 06eb2b7d9..07f39f34b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1183,7 +1183,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982 ]
         }
 
    ]
diff --git a/common/data/families.js b/common/data/families.js
index 6a87a061a..b93ad6611 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -948,8 +948,8 @@ window.families = [
 	"Fossa",
 	"Curiel",
 	"Thatch",
-	"Ace",
-	"Ace",
+	"Portgas D. Ace",
+	"Portgas D. Ace",
 	"Beckman",
 	"Beckman",
 	"Gyaro",

From 3de713abaed68693b7faa179279fbf60ba3ce0ec Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 10 Apr 2016 04:14:46 -0500
Subject: [PATCH 0272/1569] Dex Perona fix

RIP dream team
---
 common/data/captains.js | 4 ++--
 common/data/details.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c9c1f0b71..ec4e42d1f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -738,10 +738,10 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	437: {
-		rcv: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
+		rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
 	},
 	438: {
-		rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
+		rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 5 : 1; }
 	},
 	444: {
 		atk: function(p) {
diff --git a/common/data/details.js b/common/data/details.js
index e45c93a07..940374860 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1755,13 +1755,13 @@ window.details = {
 		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, deals 1,000 fixed damage to all enemies at the end of the following turn",
 		specialName: "Negative Horo \"Sweet\"",
 		specialNotes: "#{fixed}",
-		captain: "Boosts RCV of all characters by 3x if HP is below 30% at the start of the turn"
+		captain: "Boosts RCV of [DEX] characters by 3x if HP is below 30% at the start of the turn"
 	},
 	438: {
 		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, deals 1,000 fixed damage to all enemies at the end of the following turn",
 		specialName: "Negative Horo \"Sweet\"",
 		specialNotes: "#{fixed}",
-		captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
+		captain: "Boosts RCV of [DEX] characters by 5x if HP is below 30% at the start of the turn"
 	},
 	439: {
 		special: "Changes adjacent orbs into [RCV] and randomizes every other orb",

From d6860ba3cf117b4f13c132eb844241cdcd7ecdb4 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 11 Apr 2016 10:45:17 +0200
Subject: [PATCH 0273/1569] Kizaru Fix

Which shouldn't have needed a fix but regex
---
 common/data/details.js | 4 ++--
 index.html             | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 940374860..aecefd50d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4574,7 +4574,7 @@ window.details = {
 		specialNotes: "#{zombie}"
 	},
 	977:{
-		captain: "Boosts ATK of Shooter Characters by 2x",
+		captain: "Boosts ATK of Shooter characters by 2x",
 		specialName: "Yata no Kagami (Sacred Mirror)",
 		special: [
 			{
@@ -4589,7 +4589,7 @@ window.details = {
 		specialNotes: "#{stages}"
 	},
 	978:{
-		captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight, boosts ATK of Shooter Characters by 2.25x and Health by 1.5x",
+		captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.25x and boosts HP of Shooter characters by 1.5x",
 		specialName: "Yata no Kagami (Sacred Mirror)",
 		special: [
 			{
diff --git a/index.html b/index.html
index 83c2d52d1..7f2ee375d 100644
--- a/index.html
+++ b/index.html
@@ -57,15 +57,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>06/04/2016</p>
+            <p>11/04/2016</p>
             <br>
             <ul>
+                <li>Slow Updates Edition</li>
+                <br>
                 <li>Knowledge is dead</li>
                 <li>Long live Cerebral</li>
                 <li>If this broke something please report it</li>
                 <br>
-                <li>Still Under Beta Testing</li>
-                <li>Please Report Bugs</li>
+                <li>Added Filter for Farmable Sockets</li>
                 <br>
                 <li>Heart Pirates completed</li>
                 <br>

From 1a116871e95951b2d1d39d306732796fbf3e435e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 11 Apr 2016 10:47:34 +0200
Subject: [PATCH 0274/1569] Update for Farmable Sockets

---
 characters/js/utils.js | 4 ++++
 index.html             | 1 +
 2 files changed, 5 insertions(+)

diff --git a/characters/js/utils.js b/characters/js/utils.js
index 8410e6116..6c622ec6d 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -269,6 +269,10 @@ CharUtils.hasFarmableSocket = function(id) {
     var farmableSocket = false;
     var ownFamily = window.families[id];
     
+    //return false if unit has no Sockets?
+    var unit = window.units[id];
+    if (unit.slots<1) return farmableSocket;
+    
     window.families.forEach(function(family,n){
        if (ownFamily == family) {
            var famId = n+1;
diff --git a/index.html b/index.html
index 7f2ee375d..89cd28676 100644
--- a/index.html
+++ b/index.html
@@ -67,6 +67,7 @@
                 <li>If this broke something please report it</li>
                 <br>
                 <li>Added Filter for Farmable Sockets</li>
+                <li>Now only shows Chars with Sockets >_></li>
                 <br>
                 <li>Heart Pirates completed</li>
                 <br>

From 331d6a2095298555b5abf8bf3480d1b6ea4c9142 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 11 Apr 2016 15:27:59 +0200
Subject: [PATCH 0275/1569] Monet Preview

---
 common/data/units.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index a246dadf4..994524be5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1004,5 +1004,9 @@ window.units = [
 	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
 	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
 	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
-	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1]
+	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
+    [ "Monet","QCK",["Free Spirit","Cerebral"], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Monet Evolution","QCK",["Free Spirit","Cerebral"], 5, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];
+// [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
+// or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file

From b6e69bc0b8fbf2053aa5a6bf09fb6d72f3686566 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 11 Apr 2016 09:31:20 -0500
Subject: [PATCH 0276/1569] domino/sadie conditions

updated wording
---
 common/data/drops.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 07f39f34b..a80d048ab 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -768,7 +768,7 @@ window.drops = {
         {
             name: 'Jailer Domino\' Special Guard',
             thumb: 538,
-            condition: 'Striker, Slasher and Fighter are weakend',
+            condition: '30: Non-Shooter, Evolver, or Booster class characters are weakend; 15: Fighter and Slasher class characters are weakened',
             Expert: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ],
             Elite: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ]
         },
@@ -777,7 +777,7 @@ window.drops = {
             name: 'Chief Jailer Sadie: Cruel and Unusual',
             thumb: 550,
 			global: true,
-            condition: 'Shooter, Striker and Fighter are weakend',
+            condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
             Expert: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ],
             Elite: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
         },

From b4a22aca531bb09de9eaa08c5ac0f31e540ed896 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 12 Apr 2016 10:03:18 -0500
Subject: [PATCH 0277/1569] Sakura Monet

updated
---
 common/data/aliases.js  |  4 +++-
 common/data/captains.js |  6 ++++++
 common/data/details.js  | 10 ++++++++++
 common/data/flags.js    |  4 +++-
 common/data/units.js    |  8 ++++----
 common/data/zombies.js  |  4 ++++
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index acc033d21..4d79dc111 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1004,5 +1004,7 @@ window.aliases = {
 	1003: ['',''],
 	1004: ['',''],
 	1005: ['',''],
-	1006: ['','']
+	1006: ['',''],
+	1007: ['','','Sakura Monet'],
+	1008: ['','','Sakura Monet']
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ec4e42d1f..6ca580a01 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2410,4 +2410,10 @@ window.captains = {
 		atk: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; },
 		hp: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; }
 	},
+	1007: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+	},
+	1008: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 2 : 1; }
+	}
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index aecefd50d..775ff3d4d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4785,5 +4785,15 @@ window.details = {
 		captain: "Boosts ATK and HP of Tough characters by 1.5x",
 		specialName: "Rush to Freedom",
 		special: "Boosts own ATK by 1.75x for 1 turn"
+	},
+	1007: {
+		captain: "Boosts ATK of Cerebral and Free Spirit characters by 1.5x",
+		specialName: "Cherry Blossom Storm: Spring Pattern",
+		special: "Changes adjacent orbs into [RCV] and recovers 3,000 HP"
+	},
+	1008: {
+		captain: "Boosts ATK of Cerebral and Free Spirit characters by 2x. Recovers 3x character's RCV in HP at the end of each turn",
+		specialName: "Cherry Blossom Storm: Spring Pattern",
+		special: "Changes adjacent orbs into [RCV] and recovers 3,000 HP"
 	}
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 1e48c1527..654bab4d8 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -786,5 +786,7 @@ window.flags = {
     998: { rr: 1, rro: 1 },
     999: { rr: 1, rro: 1 },
     1000: { rr: 1, rro: 1 },
-    1001: { rr: 1, rro: 1 }
+    1001: { rr: 1, rro: 1 },
+	1007: { rr: 1, rro: 1, lrr: 1 },
+    1008: { rr: 1, rro: 1, lrr: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 994524be5..6fd84c0ad 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -826,8 +826,8 @@ window.units = [
 	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
 	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, null, 442, 60, 0, 455, 497, 222, null],
-	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, null, 442, 424, 149, 696, 762, 390, null],
+	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
+	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
@@ -1005,8 +1005,8 @@ window.units = [
 	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
 	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
-    [ "Monet","QCK",["Free Spirit","Cerebral"], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Monet Evolution","QCK",["Free Spirit","Cerebral"], 5, 20, null, null, null, null, null, null, null, null, null, null, null]
+    [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
+    [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 666a0cc51..cb8ba922e 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -218,5 +218,9 @@ window.zombies = {
 	965: {//Saint Charloss
 		type: 'healer',
 		amount: 500 
+	},
+	1008: {//Sakura Monet
+		type: 'healer',
+        multiplier: 3
 	}
 };

From 78e01a8b901f9c49221056574ffeb50d5d9b6d01 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 12 Apr 2016 10:13:46 -0500
Subject: [PATCH 0278/1569] Monet

evolvers and cd
---
 common/data/cooldowns.js  | 8 +++++---
 common/data/evolutions.js | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0b872bf6b..cb95d0040 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -869,8 +869,8 @@ window.cooldowns = [
 	[ 24, 14 ],
 	20,
 	20,
-	16,
-	16,
+	[ 16, 10 ],
+	[ 16, 10 ],
 	[ 19, 14 ],
 	[ 19, 14 ],
 	21,
@@ -1004,5 +1004,7 @@ window.cooldowns = [
 	[ 20, 12 ],
 	[ 20, 10 ],
 	[ 15, 7 ],
-	[ 15, 7 ]
+	[ 15, 7 ],
+	[ 13, 13 ],
+	[ 13, 13 ]
 ];
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0cac5e1f0..67c355c39 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1502,5 +1502,9 @@ window.evolutions = {
 	1005: {
 		evolution: 1006,
 		evolvers: [ 116, 84, 89, 95, 100 ]
+	},
+	1007: {
+		evolution: 1008,
+		evolvers: [ 117, 85, 87, 96, 98 ]
 	}
 };

From cff8d431b0ff3c68299c2750a6327f1de2c4fbd3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 13 Apr 2016 14:32:53 -0500
Subject: [PATCH 0279/1569] New Promo Luffy added

---
 common/data/aliases.js   | 3 ++-
 common/data/captains.js  | 7 +++++++
 common/data/cooldowns.js | 3 ++-
 common/data/details.js   | 7 +++++++
 common/data/families.js  | 9 ++++++---
 common/data/units.js     | 3 ++-
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 4d79dc111..039141f34 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1006,5 +1006,6 @@ window.aliases = {
 	1005: ['',''],
 	1006: ['',''],
 	1007: ['','','Sakura Monet'],
-	1008: ['','','Sakura Monet']
+	1008: ['','','Sakura Monet'],
+	1009: ['','', 'Afro Luffy', 'Afroluffy' ],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 6ca580a01..880f723a2 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2415,5 +2415,12 @@ window.captains = {
 	},
 	1008: {
 		atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 2 : 1; }
+	},
+	1009: {
+		atk: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
+				p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
+				1;
+		}
 	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index cb95d0040..19ff810ba 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1006,5 +1006,6 @@ window.cooldowns = [
 	[ 15, 7 ],
 	[ 15, 7 ],
 	[ 13, 13 ],
-	[ 13, 13 ]
+	[ 13, 13 ],
+	[ 25, 14 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 775ff3d4d..814ebbfa1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4795,5 +4795,12 @@ window.details = {
 		captain: "Boosts ATK of Cerebral and Free Spirit characters by 2x. Recovers 3x character's RCV in HP at the end of each turn",
 		specialName: "Cherry Blossom Storm: Spring Pattern",
 		special: "Changes adjacent orbs into [RCV] and recovers 3,000 HP"
+	},
+	1009: {
+		special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
+		specialName: "Gum-Gum Flail",
+		captain: "Boosts ATK of [STR] and Fighter characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight",
+		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus.",
+		specialNotes: "This Luffy is from a code from Pre-ordering One Piece Kizuna Boost Card Battle"
 	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index b93ad6611..eff4335ae 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1002,7 +1002,10 @@ window.families = [
 	"Corazon",
 	"Bepo",
 	"Bepo",
-	null,
-	null,
-	null
+	"Sachi and Penguin",
+	"Jean Bart",
+	"Jean Bart",
+	"Monet",
+	"Monet",
+	"Monkey D. Luffy"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 6fd84c0ad..71b4aacfb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1006,7 +1006,8 @@ window.units = [
 	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
-    [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null]
+    [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
+	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, null, 465, 232, 36, null, null, null, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file

From 93e61b6206b40caa46620965a14c66285ca780c8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 13 Apr 2016 14:49:14 -0500
Subject: [PATCH 0280/1569] Afro Luffy

max attack/HP added, need RCV
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 71b4aacfb..dc9789709 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1007,7 +1007,7 @@ window.units = [
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
-	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, null, 465, 232, 36, null, null, null, null]
+	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, null, 465, 232, 36, 618, 327, null, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file

From aa3fdf2097de4ab8d877c38f6b0de54ad0c70a24 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 13 Apr 2016 15:08:30 -0500
Subject: [PATCH 0281/1569] New Afro Luffy Updated

all stats
---
 common/data/details.js | 3 +--
 common/data/flags.js   | 3 ++-
 common/data/units.js   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 814ebbfa1..f00b26095 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4800,7 +4800,6 @@ window.details = {
 		special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
 		specialName: "Gum-Gum Flail",
 		captain: "Boosts ATK of [STR] and Fighter characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight",
-		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus.",
-		specialNotes: "This Luffy is from a code from Pre-ordering One Piece Kizuna Boost Card Battle"
+		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
 	}
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 654bab4d8..79e60e9a0 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -788,5 +788,6 @@ window.flags = {
     1000: { rr: 1, rro: 1 },
     1001: { rr: 1, rro: 1 },
 	1007: { rr: 1, rro: 1, lrr: 1 },
-    1008: { rr: 1, rro: 1, lrr: 1 }
+    1008: { rr: 1, rro: 1, lrr: 1 },
+	1009: { promo: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index dc9789709..57f9500bb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1007,7 +1007,7 @@ window.units = [
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
-	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, null, 465, 232, 36, 618, 327, null, null]
+	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file

From 5501d1d8f1792e7c27c7783fbfaeac8a10d6b793 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 14 Apr 2016 16:44:49 +0200
Subject: [PATCH 0282/1569] Updated Global Flags

---
 common/data/drops.js |  2 ++
 common/data/flags.js | 16 ++++++++++++++++
 index.html           |  6 +-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index a80d048ab..9cff8e007 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -402,6 +402,7 @@ window.drops = {
             name: "Enies Lobby: Tower of Justice - Gates of Justice",
             shortName: "Enies Lobby 2",
             thumb: 737,
+            global: true,
             completion: 'Ship: Thousand Sunny - 5x Rainbow Gems',
             "Completion Units": [739],
             "01": [ 110 ],
@@ -768,6 +769,7 @@ window.drops = {
         {
             name: 'Jailer Domino\' Special Guard',
             thumb: 538,
+            global: true,
             condition: '30: Non-Shooter, Evolver, or Booster class characters are weakend; 15: Fighter and Slasher class characters are weakened',
             Expert: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ],
             Elite: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ]
diff --git a/common/data/flags.js b/common/data/flags.js
index 79e60e9a0..9d366f041 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -529,6 +529,10 @@ window.flags = {
 	534: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	535: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	536: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    537: { global: 1 },
+    538: { global: 1 },
+    539: { global: 1 },
+    540: { global: 1 },
 	541: { global: 1 },
 	542: { global: 1 },
 	543: { global: 1 },
@@ -678,6 +682,18 @@ window.flags = {
 	725: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	726: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	727: { special: 1 },
+    728: { global: 1 },
+    729: { global: 1 },
+    730: { global: 1 },
+    731: { global: 1 },
+    732: { global: 1 },
+    733: { global: 1 },
+    734: { global: 1 },
+    735: { global: 1 },
+    736: { global: 1 },
+    737: { global: 1 },
+    738: { global: 1 },
+    739: { global: 1 },
 	744: { rr: 1, rro: 1, lrr: 1 },
 	745: { rr: 1, rro: 1, lrr: 1 },
 	746: { promo: 1 },
diff --git a/index.html b/index.html
index 89cd28676..551061800 100644
--- a/index.html
+++ b/index.html
@@ -64,12 +64,8 @@
                 <br>
                 <li>Knowledge is dead</li>
                 <li>Long live Cerebral</li>
-                <li>If this broke something please report it</li>
                 <br>
-                <li>Added Filter for Farmable Sockets</li>
-                <li>Now only shows Chars with Sockets >_></li>
-                <br>
-                <li>Heart Pirates completed</li>
+                <li>Updated Global Flags</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>
                 <li>Useful for Unit Comparisons</li>

From d4f07182ddeecc7bc890aa1280a494f96e66f38a Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 15 Apr 2016 14:56:22 +0200
Subject: [PATCH 0283/1569] Colo + Wyper Fix

---
 common/data/captains.js   |  4 ++--
 common/data/drops.js      |  6 +++---
 common/data/evolutions.js |  6 +++++-
 common/data/families.js   | 12 +++++++++++-
 common/data/gw.js         |  2 +-
 common/data/units.js      | 12 +++++++++++-
 index.html                |  3 ++-
 7 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 880f723a2..1dc9b2767 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -991,12 +991,12 @@ window.captains = {
 	543: {
 		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
 		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return 0; }
+		rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
 	},
 	544: {
 		atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
 		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return 0; }
+		rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
 	},
 	545: {
 		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
diff --git a/common/data/drops.js b/common/data/drops.js
index 9cff8e007..d00a69c2a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1183,9 +1183,9 @@ window.drops = {
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1015 ]
         }
 
    ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 67c355c39..a493642fd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1506,5 +1506,9 @@ window.evolutions = {
 	1007: {
 		evolution: 1008,
 		evolvers: [ 117, 85, 87, 96, 98 ]
-	}
+	},
+    1015: {
+        evolution: 1016,
+        evolvers: []
+    }
 };
diff --git a/common/data/families.js b/common/data/families.js
index eff4335ae..aac8f8efa 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1007,5 +1007,15 @@ window.families = [
 	"Jean Bart",
 	"Monet",
 	"Monet",
-	"Monkey D. Luffy"
+	"Monkey D. Luffy",
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Capone Bege",
+    "Capone Bege",
+    null,
+    null,
+    "Kaku"
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 15e340518..c6913bc21 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,null,null,null,null,null];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 57f9500bb..9c99f0221 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1007,7 +1007,17 @@ window.units = [
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
-	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null]
+	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null],
+    [],
+    [],
+    [],
+    [],
+    [],
+	[ "Colosseum Capone", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Capone Evolution", "INT", ["Shooter","Ambition"], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Unkown", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Unkown Evolution", "PSY", ["Slasher","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Kaku", "DEX", "Slasher", 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file
diff --git a/index.html b/index.html
index 551061800..fd67cb43e 100644
--- a/index.html
+++ b/index.html
@@ -65,7 +65,8 @@
                 <li>Knowledge is dead</li>
                 <li>Long live Cerebral</li>
                 <br>
-                <li>Updated Global Flags</li>
+                <li>Added Colosseum Previews</li>
+                <li>Fixed Story Wyper Captain</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>
                 <li>Useful for Unit Comparisons</li>

From 3bb2c030017cf1a0d835342307cf97e5f98c51ca Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 18 Apr 2016 22:01:16 +0200
Subject: [PATCH 0284/1569] Film Gold Previews

---
 common/data/drops.js      |  6 ++++++
 common/data/evolutions.js |  5 +++++
 common/data/families.js   | 16 ++++++++--------
 common/data/units.js      | 16 ++++++++--------
 index.html                |  4 ++--
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index d00a69c2a..70a5ff035 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1008,6 +1008,12 @@ window.drops = {
             thumb: 1003,
 			Expert: [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ],
 			Elite: [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ]
+		},
+        
+        {
+			name: "Film Gold Fortnight",
+			Expert: [ 1010, 1012, 1013, 1014 ],
+			Elite: [ 1010, 1012, 1013, 1014 ]
 		}
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a493642fd..44fa7567a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1507,6 +1507,11 @@ window.evolutions = {
 		evolution: 1008,
 		evolvers: [ 117, 85, 87, 96, 98 ]
 	},
+    
+    1010: {
+        evolution: 1011,
+        evolvers: []
+    },
     1015: {
         evolution: 1016,
         evolvers: []
diff --git a/common/data/families.js b/common/data/families.js
index aac8f8efa..c95faf5c6 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1008,14 +1008,14 @@ window.families = [
 	"Monet",
 	"Monet",
 	"Monkey D. Luffy",
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Count Butler",
+    "Count Butler",
+    "President Heaby",
+    "General Hotdog",
+    "Tony Tony Chopper",
     "Capone Bege",
     "Capone Bege",
-    null,
-    null,
-    "Kaku"
+    "Brownbeard",
+    "Brownbeard",
+    "Lulu"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 9c99f0221..573f05124 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1008,16 +1008,16 @@ window.units = [
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
 	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null],
-    [],
-    [],
-    [],
-    [],
-    [],
+    [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Count Butler Evolution", "INT", ["Ambition","Cerebral"], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Chopper", "PSY", ["Fighter","Tough"], 4, 16, null, null, null, null, null, null, null, null, null, null, null ],
 	[ "Colosseum Capone", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Capone Evolution", "INT", ["Shooter","Ambition"], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Unkown", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Unkown Evolution", "PSY", ["Slasher","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Kaku", "DEX", "Slasher", 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Colosseum Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Brownbeard Evolution", "PSY", ["Slasher","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Lulu", "DEX", "Slasher", 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file
diff --git a/index.html b/index.html
index fd67cb43e..87238e93c 100644
--- a/index.html
+++ b/index.html
@@ -57,7 +57,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>11/04/2016</p>
+            <p>18/04/2016</p>
             <br>
             <ul>
                 <li>Slow Updates Edition</li>
@@ -65,7 +65,7 @@
                 <li>Knowledge is dead</li>
                 <li>Long live Cerebral</li>
                 <br>
-                <li>Added Colosseum Previews</li>
+                <li>Added Film Gold Previews</li>
                 <li>Fixed Story Wyper Captain</li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>

From b4157984f436a1f75890f2b99a2ed17109e490d0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 00:07:40 -0500
Subject: [PATCH 0285/1569] new Count Butler Fortnight

units updated
---
 common/data/captains.js  | 13 +++++++++++++
 common/data/cooldowns.js |  7 ++++++-
 common/data/details.js   | 24 ++++++++++++++++++++++++
 common/data/units.js     | 10 +++++-----
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1dc9b2767..c485e11e1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2422,5 +2422,18 @@ window.captains = {
 				p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
 				1;
 		}
+	},
+	1010:{
+		atk: function(p) {return p.unit.class.has("Ambition") ? 1.5 : 1; }
+	},
+	1011:{
+		atk: function(p) {
+			return p.unit.class.has("Ambition") && p.unit.class.has("Tough") ? 2.625 :
+				if (p.unit.class.has("Ambition")){
+					return 1.75;
+				} else if (p.unit.class.has("Tough")){
+					return 1.5;
+				} :	1;
+		}
 	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 19ff810ba..d4af0c07a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1007,5 +1007,10 @@ window.cooldowns = [
 	[ 15, 7 ],
 	[ 13, 13 ],
 	[ 13, 13 ],
-	[ 25, 14 ]
+	[ 25, 14 ],
+	23,
+	23,
+	19,
+	19,
+	16
 ];
diff --git a/common/data/details.js b/common/data/details.js
index f00b26095..aee95218b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4801,5 +4801,29 @@ window.details = {
 		specialName: "Gum-Gum Flail",
 		captain: "Boosts ATK of [STR] and Fighter characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight",
 		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
+	},
+	1010:{
+		captain: "Boosts ATK of Ambition characters by 1.5x",
+		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals [INT] damage to one enemy",
+		specialName: "Evil Beast Horn Pierce"
+	},
+	1011:{
+		captain: "Boosts ATK of Ambition characters by 1.75x, and boosts ATK of Tough characters by 1.5x",
+		captainNotes: "The bonus is cumulative. Ambition Tough characters get a 2.625x bonus.",
+		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals [INT] damage to one enemy",
+		specialName: "Evil Beast Horn Pierce"
+	},
+	1012: {
+		special: "Changes the orbs in the left column into [RCV], [QCK] and [DEX], binds himself for 2 turns",
+		specialName "Phantom Snake Sword"
+	},
+	1013: {
+		special: "Boosts ATK against delayed enemies by 1.2x for 1 turns",
+		specialName "Iron Chain of Bondage"
+	},
+	1014: {
+		special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
+		specialName "Rouse the Scapegoat",
+		captain: "Boosts ATK of Tough characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 573f05124..85084fec1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1008,11 +1008,11 @@ window.units = [
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
 	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null],
-    [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Count Butler Evolution", "INT", ["Ambition","Cerebral"], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Chopper", "PSY", ["Fighter","Tough"], 4, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, null, 103, 25, 41, 1172, 377, 220, null ],
+    [ "Count Butler Evolution", "INT", ["Ambition","Cerebral"], 4, 20, 5, 2, 99, null, 1175, 606, 50, 2152, 1100, 220, null ],
+    [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, null, 118, 78, 32, null, null, null, null ],
+    [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, null, 105, 86, 24, null, null, null, null ],
+    [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, null, 63, 40, 44, null, null, null, null ],
 	[ "Colosseum Capone", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Capone Evolution", "INT", ["Shooter","Ambition"], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],

From 6a82ce645d525b74cdd67f129b43fe14c1b68d57 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 00:10:45 -0500
Subject: [PATCH 0286/1569] fix commit

missed
---
 common/data/aliases.js | 10 ++++++++++
 common/data/details.js |  8 ++++----
 common/data/zombies.js |  4 ++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 039141f34..66eb89f52 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1008,4 +1008,14 @@ window.aliases = {
 	1007: ['','','Sakura Monet'],
 	1008: ['','','Sakura Monet'],
 	1009: ['','', 'Afro Luffy', 'Afroluffy' ],
+	1010: ['',''],
+	1011: ['',''],
+	1012: ['',''],
+	1013: ['',''],
+	1014: ['',''],
+	1015: ['',''],
+	1016: ['',''],
+	1017: ['',''],
+	1018: ['',''],
+	1019: ['','']
 };
diff --git a/common/data/details.js b/common/data/details.js
index aee95218b..f5623a9d9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4814,12 +4814,12 @@ window.details = {
 		specialName: "Evil Beast Horn Pierce"
 	},
 	1012: {
-		special: "Changes the orbs in the left column into [RCV], [QCK] and [DEX], binds himself for 2 turns",
-		specialName "Phantom Snake Sword"
+		specialName "Phantom Snake Sword",
+		special: "Changes the orbs in the left column into [RCV], [QCK] and [DEX], binds himself for 2 turns"
 	},
 	1013: {
-		special: "Boosts ATK against delayed enemies by 1.2x for 1 turns",
-		specialName "Iron Chain of Bondage"
+		specialName "Iron Chain of Bondage",
+		special: "Boosts ATK against delayed enemies by 1.2x for 1 turns"
 	},
 	1014: {
 		special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
diff --git a/common/data/zombies.js b/common/data/zombies.js
index cb8ba922e..61d557402 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -222,5 +222,9 @@ window.zombies = {
 	1008: {//Sakura Monet
 		type: 'healer',
         multiplier: 3
+	},
+	1014: {//Tony Tony Chopper, Animal King
+		type: 'healer',
+        multiplier: 2
 	}
 };

From 879d0c44c89094e6292489beaf480368e54543b8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 00:13:27 -0500
Subject: [PATCH 0287/1569] colon this time

missing
---
 common/data/details.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f5623a9d9..5d0f4ac0d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4814,16 +4814,16 @@ window.details = {
 		specialName: "Evil Beast Horn Pierce"
 	},
 	1012: {
-		specialName "Phantom Snake Sword",
+		specialName: "Phantom Snake Sword",
 		special: "Changes the orbs in the left column into [RCV], [QCK] and [DEX], binds himself for 2 turns"
 	},
 	1013: {
-		specialName "Iron Chain of Bondage",
+		specialName: "Iron Chain of Bondage",
 		special: "Boosts ATK against delayed enemies by 1.2x for 1 turns"
 	},
 	1014: {
 		special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
-		specialName "Rouse the Scapegoat",
+		specialName: "Rouse the Scapegoat",
 		captain: "Boosts ATK of Tough characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
 	}
 };

From 0fe660f6d759b70c583364222d5ec77dea5bd098 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 00:15:39 -0500
Subject: [PATCH 0288/1569] ugly

but it works
---
 common/data/captains.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c485e11e1..ea0b94607 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2428,12 +2428,13 @@ window.captains = {
 	},
 	1011:{
 		atk: function(p) {
-			return p.unit.class.has("Ambition") && p.unit.class.has("Tough") ? 2.625 :
-				if (p.unit.class.has("Ambition")){
+			if (p.unit.class.has("Ambition") && p.unit.class.has("Tough")){
+				return 2.625;
+			} else if (p.unit.class.has("Ambition")){
 					return 1.75;
 				} else if (p.unit.class.has("Tough")){
 					return 1.5;
-				} :	1;
+				} return 1;
 		}
 	}
 };
\ No newline at end of file

From 30dd2daccd677655e39562e3dcde559edfcb05a3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 00:25:00 -0500
Subject: [PATCH 0289/1569] Specials & Captains

all updated
---
 common/data/captains.js |  3 +++
 common/data/specials.js | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index ea0b94607..f661ec21a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2436,5 +2436,8 @@ window.captains = {
 					return 1.5;
 				} return 1;
 		}
+	},
+	1014:{
+		atk: function(p) {return p.unit.class.has("Tough") ? 2 : 1; }
 	}
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 03075c427..58134ab3e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1179,4 +1179,17 @@ window.specials = {
 		atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
 		type: "type"
 	},
+	1010: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
+		type: "type"
+	},
+	1011: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
+		type: "type"
+	},
+	1013: {
+		atk: function(p) { return 1.2; },
+		type: "condition",
+		warning: "Selected special (%name%) assumes that the enemy has been delayed."
+	}
 };
\ No newline at end of file

From 4832e6b42e53a4187c6487b4ec4cd3cab7a8e7fd Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 00:30:31 -0500
Subject: [PATCH 0290/1569] Count Butler's type

changes on evo
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 85084fec1..f79324af6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1009,7 +1009,7 @@ window.units = [
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
 	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null],
     [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, null, 103, 25, 41, 1172, 377, 220, null ],
-    [ "Count Butler Evolution", "INT", ["Ambition","Cerebral"], 4, 20, 5, 2, 99, null, 1175, 606, 50, 2152, 1100, 220, null ],
+    [ "Count Butler Evolution", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, null, 1175, 606, 50, 2152, 1100, 220, null ],
     [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, null, 118, 78, 32, null, null, null, null ],
     [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, null, 105, 86, 24, null, null, null, null ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, null, 63, 40, 44, null, null, null, null ],

From 9dbe8a21281881b68a6cb032a3bc8687cbe526de Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 11:55:12 -0500
Subject: [PATCH 0291/1569] Count Butler updates

aliases, cooldowns, etc.
---
 common/data/aliases.js   | 66 ++++++++++++++++++++--------------------
 common/data/cooldowns.js |  6 ++--
 common/data/details.js   | 12 ++++----
 common/data/drops.js     |  6 ++--
 common/data/units.js     | 10 +++---
 index.html               | 12 ++++----
 6 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 66eb89f52..bcc3c86a8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -973,46 +973,46 @@ window.aliases = {
     972: ['パシフィスタ　ＰＸ－５',''],
     973: ['戦桃丸','','Sentoumaru'],
     974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
-    975: ['？？？','','Kid Smoker'],
-    976: ['？？？','','Kid Smoker'],
+    975: ['スモーカー あらくれの一匹オオカミ','','Kid Smoker'],
+    976: ['スモーカー 孤高の一匹オオカミ','','Kid Smoker'],
     977: ['黄猿',''],
     978: ['黄猿　光人間',''],
     979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
     980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
     981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
-    982: ['',''],
-    983: ['',''],
-    984: ['',''],
-    985: ['',''],
-    986: ['',''],
-    987: ['',''],
-    988: ['',''],
-    989: ['',''],
-    990: ['',''],
-    991: ['',''],
-    992: ['',''],
-    993: ['',''],
-    994: ['',''],
-    995: ['',''],
-    996: ['',''],
-    997: ['',''],
-    998: ['',''],
-    999: ['',''],
-    1000: ['','','Rocinante','Rosinante'],
-    1001: ['','','Rocinante','Corazon'],
-	1002: ['',''],
-	1003: ['',''],
-	1004: ['',''],
-	1005: ['',''],
-	1006: ['',''],
+    982: ['ビスタ 白ひげ海賊団５番隊隊長',''],
+    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長',''],
+    984: ['パウリー ガレーラカンパニー１番ドック職長',''],
+    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味',''],
+    986: ['ココア＆のらギツネ ニセ麦わらの一味',''],
+    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味',''],
+    988: ['マウンブルテン＆トルコ ニセ麦わらの一味',''],
+    989: ['ニセ麦わらの一味',''],
+    990: ['マッハ・バイス',''],
+    991: ['マッハ・バイス ドンキホーテ海賊団',''],
+    992: ['グラディウス',''],
+    993: ['グラディウス ドンキホーテ海賊団',''],
+    994: ['ヴァイオレット',''],
+    995: ['ヴァイオレット ドンキホーテ海賊団',''],
+    996: ['デリンジャー',''],
+    997: ['デリンジャー ドンキホーテ海賊団',''],
+    998: ['ディアマンテ',''],
+    999: ['ディアマンテ ドンキホーテ海賊団',''],
+    1000: ['コラソン ドンキホーテ海賊団','','Rocinante','Rosinante'],
+    1001: ['ドンキホーテ・ロシナンテ','','Rocinante','Corazon'],
+	1002: ['ベポ ハートの海賊団',''],
+	1003: ['武闘家のベポ ハートの海賊団',''],
+	1004: ['シャチ＆ペンギン ハートの海賊団',''],
+	1005: ['ジャンバール',''],
+	1006: ['ジャンバール ハートの海賊団',''],
 	1007: ['','','Sakura Monet'],
 	1008: ['','','Sakura Monet'],
-	1009: ['','', 'Afro Luffy', 'Afroluffy' ],
-	1010: ['',''],
-	1011: ['',''],
-	1012: ['',''],
-	1013: ['',''],
-	1014: ['',''],
+	1009: ['キズナBOOOOSTルフィ','', 'Afro Luffy', 'Afroluffy' ],
+	1010: ['バトラー伯爵',''],
+	1011: ['バトラー伯爵（王なる力）',''],
+	1012: ['ヘビー総裁',''],
+	1013: ['ホットドッグ将軍',''],
+	1014: ['トニートニー・チョッパー 動物王',''],
 	1015: ['',''],
 	1016: ['',''],
 	1017: ['',''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d4af0c07a..aac560fed 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -737,7 +737,7 @@ window.cooldowns = [
 	[ 25, 18 ],
 	[ 18, 12 ],
 	[ 35, 20 ],
-	20,
+	[ 20, 14 ],
 	[ 23, 15 ],
 	[ 23, 15 ],
 	[ 20, 12 ],
@@ -877,8 +877,8 @@ window.cooldowns = [
 	21,
 	[ 21, 15 ],
 	[ 21, 15 ],
-	25,
-	25,
+	[ 25, 18 ],
+	[ 25, 18 ],
 	[ 22, 10 ],
 	[ 22, 10 ],
 	[ 29, 19 ],
diff --git a/common/data/details.js b/common/data/details.js
index 5d0f4ac0d..af2989563 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4804,26 +4804,26 @@ window.details = {
 	},
 	1010:{
 		captain: "Boosts ATK of Ambition characters by 1.5x",
-		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals [INT] damage to one enemy",
-		specialName: "Evil Beast Horn Pierce"
+		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
+		specialName: "Evil Beast's Horn Pierce"
 	},
 	1011:{
 		captain: "Boosts ATK of Ambition characters by 1.75x, and boosts ATK of Tough characters by 1.5x",
 		captainNotes: "The bonus is cumulative. Ambition Tough characters get a 2.625x bonus.",
-		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals [INT] damage to one enemy",
-		specialName: "Evil Beast Horn Pierce"
+		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
+		specialName: "Evil Beast's Horn Pierce"
 	},
 	1012: {
 		specialName: "Phantom Snake Sword",
 		special: "Changes the orbs in the left column into [RCV], [QCK] and [DEX], binds himself for 2 turns"
 	},
 	1013: {
-		specialName: "Iron Chain of Bondage",
+		specialName: "Binding Iron Chain",
 		special: "Boosts ATK against delayed enemies by 1.2x for 1 turns"
 	},
 	1014: {
 		special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
-		specialName: "Rouse the Scapegoat",
+		specialName: "Scapegoat Substitute",
 		captain: "Boosts ATK of Tough characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
 	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 70a5ff035..bd735c262 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1011,9 +1011,9 @@ window.drops = {
 		},
         
         {
-			name: "Film Gold Fortnight",
-			Expert: [ 1010, 1012, 1013, 1014 ],
-			Elite: [ 1010, 1012, 1013, 1014 ]
+			name: "Rare Animal Island's Count Butler",
+			Expert: [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ],
+			Elite: [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
 		}
 
     ],
diff --git a/common/data/units.js b/common/data/units.js
index f79324af6..fcd0682aa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1008,11 +1008,11 @@ window.units = [
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
 	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null],
-    [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, null, 103, 25, 41, 1172, 377, 220, null ],
-    [ "Count Butler Evolution", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, null, 1175, 606, 50, 2152, 1100, 220, null ],
-    [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, null, 118, 78, 32, null, null, null, null ],
-    [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, null, 105, 86, 24, null, null, null, null ],
-    [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, null, 63, 40, 44, null, null, null, null ],
+    [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
+    [ "Count Butler Evolution", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
+    [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
+    [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
+    [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
 	[ "Colosseum Capone", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Capone Evolution", "INT", ["Shooter","Ambition"], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
diff --git a/index.html b/index.html
index 87238e93c..e826bd40e 100644
--- a/index.html
+++ b/index.html
@@ -57,16 +57,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>18/04/2016</p>
+            <p>19/04/2016</p>
             <br>
             <ul>
-                <li>Slow Updates Edition</li>
+                <li>Count Butler Update</li>
                 <br>
-                <li>Knowledge is dead</li>
-                <li>Long live Cerebral</li>
+                <li>All Count Butler fortnight</li>
+                <li>Units with stats added</li>
                 <br>
-                <li>Added Film Gold Previews</li>
-                <li>Fixed Story Wyper Captain</li>
+                <li>Japanese Aliases Updated</li>
+                <li>Love, Zeenigami & XFTS<li>
                 <br>
                 <li>Added Line Graphs for Stat Growth</li>
                 <li>Useful for Unit Comparisons</li>

From 501643ea9ea422324e0bf7a0d03e522e11aa64bc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 11:55:49 -0500
Subject: [PATCH 0292/1569] Boost Luffy

forgot his icon is out
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index fcd0682aa..dfbfadf61 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1007,7 +1007,7 @@ window.units = [
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
-	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, null],
+	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
     [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
     [ "Count Butler Evolution", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
     [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],

From 3fe7344e42f8537fa071bf8067381f5df0d82b2c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 12:02:15 -0500
Subject: [PATCH 0293/1569] conditions

added "None" as a condition
---
 common/data/drops.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index bd735c262..10bfa98be 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -558,6 +558,7 @@ window.drops = {
             name: 'Buggy\'s Counterattack!!',
             thumb: 39,
             global: true,
+			condition: "None",
             Expert: [ 36, 37, 38, 99, 109, 114, -4 ],
             Elite: [ 36, 37, 38, 99, 109, 114, -3 ]
         },
@@ -566,6 +567,7 @@ window.drops = {
             name: 'Alvida\'s Romance',
             thumb: 30,
             global: true,
+			condition: "None",
             Expert: [ 28, 29, 31, 40, 84, 95, 110, 117, -30, -21, -8 ],
             Elite: [ 28, 29, 31, 40, 95, 105, 110, -21, -7 ]
         },
@@ -574,6 +576,7 @@ window.drops = {
             name: 'Kuro\'s Master Plan',
             thumb: 46,
             global: true,
+			condition: "None",
             Expert: [ 41, 42, 43, 45, -16 ],
             Elite: [ 41, 42, 43, 45, 96, 106, 111, -15 ]
         },
@@ -582,6 +585,7 @@ window.drops = {
             name: 'Arlong: Empire Rising',
             thumb: 66,
             global: true,
+			condition: "None",
             Expert: [ 61, 62, 63, 65, 89, 95, 105, 110, -12, -66 ],
             Elite: [ 61, 62, 63, 65, 95, 105, 110, -11 ]
         },
@@ -590,6 +594,7 @@ window.drops = {
             name: 'Krieg\'s Assault!',
             thumb: 58,
             global: true,
+			condition: "None",
             Expert: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20 ],
             Elite: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20, -19 ]
         },
@@ -598,6 +603,7 @@ window.drops = {
             name: 'Escaped! Morgan',
             thumb: 228,
             global: true,
+			condition: "None",
             Expert: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
             Elite: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
         },
@@ -606,6 +612,7 @@ window.drops = {
             name: 'Hina\'s Resort Getaway',
             thumb: 232,
             global: true,
+			condition: "None",
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','Blue Elder'],['450,000','ATK Cotton Candy'],['750,000','3x Rainbow Gems']],
             Expert: [ 43, 49, 79, 85, 96, 106, 231, -230, -229, -221, -208, -62, -54 ],
@@ -616,6 +623,7 @@ window.drops = {
             name: 'Cobymeppo\'s Proving Ground!',
             thumb: 263,
             global: true,
+			condition: "None",
             challenge:'Total number of hits above 50,000',
             challengeData: [['5 Times','1x Yellow Elder'],['15 Times','1x ATK Cotton Candy'],['25 Times','3x Rainbow Gems']],
             Expert: [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ],
@@ -626,6 +634,7 @@ window.drops = {
             name: 'Smoker\'s Great Pursuit',
             thumb: 268,
             global: true,
+			condition: "None",
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems, 1x Forbidden Tome']],
             Expert: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ],
@@ -636,6 +645,7 @@ window.drops = {
             name: 'Tsuru\'s Morning Stroll',
             thumb: 297,
             global: true,
+			condition: "None",
             Expert: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -217, -202, -200, -199 ],
             Elite: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -202, -200 ]
         },
@@ -715,6 +725,7 @@ window.drops = {
             name: 'Rising Sun, Rising Fortunes',
             thumb: 420,
             global: true,
+			condition: "None",
             Expert: [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8 ],
             Elite: [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8 ]
         },
@@ -886,6 +897,7 @@ window.drops = {
         {
             name: "Twilight Party DEAD or TREAT!!",
             thumb: 761,
+			condition: "None",
             Expert: [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ],
             Elite: [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ]
         },
@@ -894,6 +906,7 @@ window.drops = {
             name: "Twilight Party DEAD or TREAT!! (Global)",
             thumb: 763,
             global: true,
+			condition: "None",
             Expert: [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ],
             Elite: [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
         },
@@ -901,6 +914,7 @@ window.drops = {
         {
             name: "Midnight Party DEAD or TREAT!!",
             thumb: 766,
+			condition: "None",
             Expert: [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ],
             Elite: [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ]
         },
@@ -909,6 +923,7 @@ window.drops = {
             name: "Midnight Party DEAD or TREAT!! (Global)",
             thumb: 768,
             global: true,
+			condition: "None",
             Expert: [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ],
             Elite: [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
         },
@@ -950,6 +965,7 @@ window.drops = {
         {
             name: "Lightning Speed! Strawhat Crew's Surprise Visit",
             thumb: 866,
+			condition: "None",
             Expert: [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ],
             Elite: [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ]
         },
@@ -1012,6 +1028,8 @@ window.drops = {
         
         {
 			name: "Rare Animal Island's Count Butler",
+			thumb: 1011,
+			condition: "None",
 			Expert: [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ],
 			Elite: [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
 		}

From a1b4afbe7a56d021b45ea28f751ebf610c4bb996 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Apr 2016 16:16:51 -0500
Subject: [PATCH 0294/1569] Butler Cooldown

14
---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index aac560fed..04c470923 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1008,8 +1008,8 @@ window.cooldowns = [
 	[ 13, 13 ],
 	[ 13, 13 ],
 	[ 25, 14 ],
-	23,
-	23,
+	[ 23, 14 ],
+	[ 23, 14 ],
 	19,
 	19,
 	16

From 684b21cd4df14fc6ac5bbf77c6b915ee377111ed Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 20 Apr 2016 00:59:13 -0500
Subject: [PATCH 0295/1569] captains/specials

of colo units. need stats
---
 common/data/details.js | 27 +++++++++++++++++++++++++++
 common/data/units.js   |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index af2989563..a3ec91856 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4825,5 +4825,32 @@ window.details = {
 		special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
 		specialName: "Scapegoat Substitute",
 		captain: "Boosts ATK of Tough characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
+	},
+	1015: {
+		captain: "Boosts ATK of [INT] characters by 2.75x if they have a matching orb",
+		special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
+		specialName: ".44 Caliber Cannon"
+	},
+	1016: {
+		captain: "Boosts ATK of [INT] characters by 3x if they have a matching orb, by 1.5x otherwise",
+		special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
+		specialName: ".44 Caliber Cannon"
+	},
+	1017: {
+		captain: "Boosts HP of Slasher characters by 1.5x",
+		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
+		specialName: "Brownbeard Special",
+		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
+	},
+	1018: {
+		captain: "Boosts HP of Slasher characters by 1.5x",
+		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
+		specialName: "Brownbeard Special",
+		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
+	},
+	1019: {
+		captain: "Reduces damage received from [QCK] enemies by 50%",
+		special: "Switches orbs between slots 2 times and deals 2000 fixed damage to one enemy",
+		specialName: "Lulu Special"
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index dfbfadf61..ede2bceb5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1014,7 +1014,7 @@ window.units = [
     [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
 	[ "Colosseum Capone", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Capone Evolution", "INT", ["Shooter","Ambition"], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Colosseum Capone Evolution", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, null, 900, 688, 197, null, null, null, null],
 	[ "Colosseum Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Brownbeard Evolution", "PSY", ["Slasher","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
 	[ "Colosseum Lulu", "DEX", "Slasher", 4, 20, null, null, null, null, null, null, null, null, null, null, null]

From 702a0c36ded735902ca000f851ac5b551aa28d5c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 20 Apr 2016 12:17:36 -0500
Subject: [PATCH 0296/1569] names & missions

colo names, carue/croc missions
---
 common/data/cooldowns.js |  5 +++++
 common/data/details.js   | 12 ++++++------
 common/data/drops.js     |  4 ++++
 common/data/units.js     | 14 +++++++-------
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 04c470923..32f62989d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1012,5 +1012,10 @@ window.cooldowns = [
 	[ 23, 14 ],
 	19,
 	19,
+	16,
+	[ 24, 12 ],
+	[ 24, 12 ],
+	26,
+	26,
 	16
 ];
diff --git a/common/data/details.js b/common/data/details.js
index a3ec91856..8286569e2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4829,28 +4829,28 @@ window.details = {
 	1015: {
 		captain: "Boosts ATK of [INT] characters by 2.75x if they have a matching orb",
 		special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
-		specialName: ".44 Caliber Cannon"
+		specialName: "Hollow Eye Killing Shot"
 	},
 	1016: {
 		captain: "Boosts ATK of [INT] characters by 3x if they have a matching orb, by 1.5x otherwise",
 		special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
-		specialName: ".44 Caliber Cannon"
+		specialName: "Hollow Eye Killing Shot"
 	},
 	1017: {
 		captain: "Boosts HP of Slasher characters by 1.5x",
 		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
-		specialName: "Brownbeard Special",
+		specialName: "Ravaging Cutlass Dance",
 		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
 	},
 	1018: {
-		captain: "Boosts HP of Slasher characters by 1.5x",
+		captain: "Boosts ATK of Slasher characters by 1.5x and their HP by 2x",
 		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
-		specialName: "Brownbeard Special",
+		specialName: "Ravaging Cutlass Dance",
 		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
 	},
 	1019: {
 		captain: "Reduces damage received from [QCK] enemies by 50%",
 		special: "Switches orbs between slots 2 times and deals 2000 fixed damage to one enemy",
-		specialName: "Lulu Special"
+		specialName: "Blacksmithing Measurement: Double Slash"
 	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 10bfa98be..b497511c3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -755,6 +755,8 @@ window.drops = {
             thumb: 445,
             global: true,
             condition: 'Higher Chance of Food orbs',
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challengeData: [['450,000 Damage','1x Yellow Elder'],['1,250,000 Damage','1x RCV Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
             Expert: [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ],
             Elite: [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
         },
@@ -773,6 +775,8 @@ window.drops = {
             thumb: 510,
             global: true,
             condition: 'Shooters, Fighter and Slashers are weakend',
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x CDR Forbidden Tome, 2x Rainbow Gems']],
             Expert: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ],
             Elite: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]
         },
diff --git a/common/data/units.js b/common/data/units.js
index ede2bceb5..31a70b8ff 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -615,7 +615,7 @@ window.units = [
 	[ "Zambai", "PSY", "Shooter", 3, 16, 4, 2, 70, 1066998, 230, 90, 48, 1580, 702, 168, 1 ],
 	[ "Demolisher Axeman", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
 	[ "Demolisher Spearman", "STR", [ "Striker", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
-	[ "Demolisher G\0unner", "STR", [ "Shooter", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
+	[ "Demolisher Gunner", "STR", [ "Shooter", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
 	[ "Street Punk: Brawler Red Bounty Hunter", "STR", "Fighter", 3, 13, 6, 1, 60, 674274, 102, 85, 28, 1158, 790, 90, 1 ],
 	[ "Street Punk: Brawler Green Bounty Hunter", "DEX", "Fighter", 3, 13, 6, 1, 60, 674274, 108, 75, 32, 1175, 754, 102, 1 ],
 	[ "Street Punk: Blade Blue Bounty Hunter", "QCK", "Slasher", 3, 13, 5, 1, 60, 674274, 153, 66, 40, 1215, 653, 128, 1 ],
@@ -1009,15 +1009,15 @@ window.units = [
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
 	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
     [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
-    [ "Count Butler Evolution", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
+    [ "Count Butler (Ruling Power)", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
     [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
     [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
-	[ "Colosseum Capone", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Capone Evolution", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, null, 900, 688, 197, null, null, null, null],
-	[ "Colosseum Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Brownbeard Evolution", "PSY", ["Slasher","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Colosseum Lulu", "DEX", "Slasher", 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, null, 900, 688, 197, 1903, 1361, 379, null],
+	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, null, null, null, null, null, null, null, null, null, null, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file

From 34b727fb5cfbed74badf67bb9843aa157be42956 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 20 Apr 2016 12:39:43 -0500
Subject: [PATCH 0297/1569] min unit stats

colo units
---
 common/data/details.js | 4 ++--
 common/data/units.js   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8286569e2..1ba2ae1fa 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4840,13 +4840,13 @@ window.details = {
 		captain: "Boosts HP of Slasher characters by 1.5x",
 		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
 		specialName: "Ravaging Cutlass Dance",
-		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
+		specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
 	},
 	1018: {
 		captain: "Boosts ATK of Slasher characters by 1.5x and their HP by 2x",
 		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
 		specialName: "Ravaging Cutlass Dance",
-		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
+		specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
 	},
 	1019: {
 		captain: "Reduces damage received from [QCK] enemies by 50%",
diff --git a/common/data/units.js b/common/data/units.js
index 31a70b8ff..e3b0e6fef 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1013,11 +1013,11 @@ window.units = [
     [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
     [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
-	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, 4, 2, 70, null, 494, 313, 80, null, null, null, null],
 	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, null, 900, 688, 197, 1903, 1361, 379, null],
-	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, null, null, null, null, null, null, null, null, null, null, null]
+	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, null, 230, 101, 33, null, null, null, null],
+	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, null, 1127, 444, 90, null, null, null, null],
+	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, null, null, null, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file

From a7cde92cfd160c9dca49ffde18238f7986166719 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 20 Apr 2016 15:38:17 -0500
Subject: [PATCH 0298/1569] cooldowns

---
 common/data/cooldowns.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 32f62989d..04cf078b1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1010,9 +1010,9 @@ window.cooldowns = [
 	[ 25, 14 ],
 	[ 23, 14 ],
 	[ 23, 14 ],
-	19,
-	19,
-	16,
+	[ 19, 10 ],
+	[ 19, 10 ],
+	[ 16, 6 ],
 	[ 24, 12 ],
 	[ 24, 12 ],
 	26,

From 18dc11d1328b4e29f9e030f44a32481032ffeb1c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 20 Apr 2016 22:19:35 -0500
Subject: [PATCH 0299/1569] update croc condition

wording + 15 stamina
---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index b497511c3..745962602 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -774,7 +774,7 @@ window.drops = {
             name: 'Crocodile: Life on the Inside',
             thumb: 510,
             global: true,
-            condition: 'Shooters, Fighter and Slashers are weakend',
+            condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x CDR Forbidden Tome, 2x Rainbow Gems']],
             Expert: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ],

From 6d63ca7a8ef50ffbbe3c4929a6a879f33cbd2149 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 20 Apr 2016 22:34:36 -0500
Subject: [PATCH 0300/1569] croc mission

updated
---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 745962602..325af78f4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -775,7 +775,7 @@ window.drops = {
             thumb: 510,
             global: true,
             condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened',
-            challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x CDR Forbidden Tome, 2x Rainbow Gems']],
             Expert: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ],
             Elite: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]

From 3324709c13ca4029fc38a30d17bcd1a0c3d17646 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Apr 2016 02:17:41 -0500
Subject: [PATCH 0301/1569] added note

that says multi-class aren't affected.
---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 325af78f4..dcb59ed15 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -774,7 +774,7 @@ window.drops = {
             name: 'Crocodile: Life on the Inside',
             thumb: 510,
             global: true,
-            condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened',
+            condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened (Note: Multi-class characters such as Fighter / Slasher are not affected)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x CDR Forbidden Tome, 2x Rainbow Gems']],
             Expert: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ],

From 1084e00c125947ffeaf858b7fae7914022424086 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Apr 2016 13:01:45 -0500
Subject: [PATCH 0302/1569] test

works, right?
---
 common/data/drops.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index dcb59ed15..c53c0c050 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -473,8 +473,8 @@ window.drops = {
             "08": [ 114, 163, 164, 957, 958, 959, 960, 961, 962, 963 ],
             "09": [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 965, 967 ],
             "10": [ 95, 97, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 966 ],
-            "11": [],
-            "12": [],
+            "11": [ ],
+            "12": [ ],
             "13": [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
             "14": [ 111, 112, 113, 114, 185, 186, 187, 691, 693, 695, 968, 969, 970, 972, 973 ]
         }
@@ -604,10 +604,9 @@ window.drops = {
             thumb: 228,
             global: true,
 			condition: "None",
-            Expert: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
-            Elite: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
+            All Difficulties: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
         },
-
+		
         {
             name: 'Hina\'s Resort Getaway',
             thumb: 232,

From f4b9a4fac2a58d2112898e8685930ded304b7584 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Apr 2016 13:03:07 -0500
Subject: [PATCH 0303/1569] Nope

Do it the hard way.
---
 common/data/drops.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index c53c0c050..3091229a4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -604,9 +604,10 @@ window.drops = {
             thumb: 228,
             global: true,
 			condition: "None",
-            All Difficulties: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
+            Expert: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
+            Elite: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
         },
-		
+
         {
             name: 'Hina\'s Resort Getaway',
             thumb: 232,

From 53411e29487a268bf0ab271bb85e0da86de971b9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Apr 2016 13:07:50 -0500
Subject: [PATCH 0304/1569] test2

---
 common/data/drops.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 3091229a4..8c90e4406 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -605,7 +605,8 @@ window.drops = {
             global: true,
 			condition: "None",
             Expert: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
-            Elite: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
+            Elite: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
+			"All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
         },
 
         {

From 381a21ef933063f3f094dd45dc46da0d6d182c92 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Apr 2016 13:15:24 -0500
Subject: [PATCH 0305/1569] Drops page Update

"All Difficulties" and Colo units
---
 common/data/drops.js | 137 +++++++++++++++----------------------------
 index.html           |  11 ++--
 2 files changed, 52 insertions(+), 96 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 8c90e4406..7006ef376 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -604,8 +604,6 @@ window.drops = {
             thumb: 228,
             global: true,
 			condition: "None",
-            Expert: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
-            Elite: [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ],
 			"All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
         },
 
@@ -627,8 +625,7 @@ window.drops = {
 			condition: "None",
             challenge:'Total number of hits above 50,000',
             challengeData: [['5 Times','1x Yellow Elder'],['15 Times','1x ATK Cotton Candy'],['25 Times','3x Rainbow Gems']],
-            Expert: [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ],
-            Elite: [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ]
+            "All Difficulties": [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ]
         },
 
         {
@@ -638,8 +635,7 @@ window.drops = {
 			condition: "None",
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems, 1x Forbidden Tome']],
-            Expert: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ],
-            Elite: [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
+            "All Difficulties": [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
         },
 
         {
@@ -656,8 +652,7 @@ window.drops = {
             thumb: 318,
             global: true,
             condition: 'You may only bring STR units into this island',
-            Expert: [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ],
-            Elite: [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ]
+            "All Difficulties": [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ]
         },
 
         {
@@ -665,8 +660,7 @@ window.drops = {
             thumb: 322,
             global: true,
             condition: 'You may only bring DEX units for 15 and 30 Stamina',
-            Expert: [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ],
-            Elite: [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ]
+            "All Difficulties": [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ]
         },
 
         {
@@ -687,8 +681,7 @@ window.drops = {
             condition: 'You may only bring QCK units for 15 and 30 Stamina',
             challenge: 'Low Teamcost, Fast Clear and Perfect Taps',
             challengeData: [['200,000 Points','1x Red Elder'],['400,000 Points','1x HP Cotton Candy'],['700,000 Points','3x Rainbow Gems']],
-            Expert: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ],
-            Elite: [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ]
+            "All Difficulties": [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ]
         },
 
         {
@@ -698,8 +691,7 @@ window.drops = {
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
 			challenge: 'Low Teamcost, Fast Clear and Perfect Taps',
             challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Damage Reduction Forbidden Tome']],
-            Expert: [ 385, 387, -388, -335, -314, -36, -16, -11 ],
-            Elite: [ 385, 387, -388, -335, -314, -36, -16, -11 ]
+            "All Difficulties": [ 385, 387, -388, -335, -314, -36, -16, -11 ]
         },
 
         {
@@ -709,8 +701,7 @@ window.drops = {
             condition: 'You can only get STR, QCK, INT and Food Orbs',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['3 Times','1x Green Elder'],['12 Times','1x RCV Cotton Candy'],['25 Times','3x Rainbow Gems']],
-            Expert: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ],
-            Elite: [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ]
+            "All Difficulties": [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ]
         },
 
         {
@@ -718,8 +709,7 @@ window.drops = {
             thumb: 405,
             global: true,
             condition: 'You can only get QCK, DEX, PSY and Food Orbs',
-            Expert: [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20 ],
-            Elite: [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20 ]
+            "All Difficulties": [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20 ]
         },
 
         {
@@ -727,8 +717,7 @@ window.drops = {
             thumb: 420,
             global: true,
 			condition: "None",
-            Expert: [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8 ],
-            Elite: [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8 ]
+            "All Difficulties": [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8 ]
         },
 
         {
@@ -738,8 +727,7 @@ window.drops = {
             condition: 'You can only get STR, DEX, INT and PSY Orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['500,000 Damage','1x Black Elder'],['1,500,000 Damage','1x ATK Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
-            Expert: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ],
-            Elite: [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ]
+            "All Difficulties": [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ]
         },
 
         {
@@ -747,8 +735,7 @@ window.drops = {
             thumb: 436,
             global: true,
             condition: 'Each non-Okama in your Team will take 60 Damage each turn',
-            Expert: [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ],
-            Elite: [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ]
+            "All Difficulties": [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ]
         },
 
         {
@@ -758,8 +745,7 @@ window.drops = {
             condition: 'Higher Chance of Food orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['450,000 Damage','1x Yellow Elder'],['1,250,000 Damage','1x RCV Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
-            Expert: [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ],
-            Elite: [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
+            "All Difficulties": [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
         },
 
         {
@@ -767,8 +753,7 @@ window.drops = {
             thumb: 462,
             global: true,
             condition: 'Striker, Shooter and Slashers are weakend.',
-            Expert: [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ],
-            Elite: [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
+            "All Difficulties": [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
         },
 
         {
@@ -778,8 +763,7 @@ window.drops = {
             condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened (Note: Multi-class characters such as Fighter / Slasher are not affected)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x CDR Forbidden Tome, 2x Rainbow Gems']],
-            Expert: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ],
-            Elite: [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]
+            "All Difficulties": [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]
         },
 
         {
@@ -787,8 +771,7 @@ window.drops = {
             thumb: 538,
             global: true,
             condition: '30: Non-Shooter, Evolver, or Booster class characters are weakend; 15: Fighter and Slasher class characters are weakened',
-            Expert: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ],
-            Elite: [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ]
+            "All Difficulties": [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ]
         },
 
         {
@@ -796,8 +779,7 @@ window.drops = {
             thumb: 550,
 			global: true,
             condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
-            Expert: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ],
-            Elite: [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
+            "All Difficulties": [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
         },
 
         {
@@ -806,8 +788,7 @@ window.drops = {
             global: true,
             challenge: 'Total number of hits over 50,000',
             challengeData: [['3 Times','1x Red Elder'],['12 Times','1x RCV Cotton Candy'],['34 Times','3x Rainbow Gems & 1x Forbidden Tome']],
-            Expert: [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ],
-            Elite: [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ]
+            "All Difficulties": [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ]
         },
 
         {
@@ -817,8 +798,7 @@ window.drops = {
             condition: 'All Units considered from the “Sea” will lose 20% to all stats',
 			challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Black Elder'],['16 Times','1x ATK Cotton Candy'],['38 Times','3x Rainbow Gems']],
-            Expert: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ],
-            Elite: [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
+            "All Difficulties": [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
         },
 
         {
@@ -835,8 +815,7 @@ window.drops = {
             thumb: 607,
 			global: true,
             condition: 'You cannot use any two units that are the same',
-            Expert: [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ],
-            Elite: [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]
+            "All Difficulties": [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]
         },
 
         {
@@ -845,32 +824,28 @@ window.drops = {
             condition: 'No Units above the cost of 49 is allowed',
 			challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, 1x Orb Matching Forbidden Tome']],
-            Expert: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ],
-            Elite: [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
+            "All Difficulties": [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
         },
 
         {
             name: 'Invasion! Pirate Arlong\'s Crew!!',
             thumb: 656,
             condition: 'You can only get STR, QCK, DEX, PSY and INT orbs',
-            Expert: [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ],
-            Elite: [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
+            "All Difficulties": [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
         },
 
         {
             name: 'Fight! Suna Suna Clan!!',
             thumb: 664,
             condition: 'Heatwave causes damage every 2 turns',
-            Expert: [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ],
-            Elite: [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ]
+            "All Difficulties": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ]
         },
 
         {
             name: 'Guidance from the Sound of a Bell! Calgara and Noland!',
             thumb: 688,
             condition: 'Bomb orbs appear',
-            Expert: [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ],
-            Elite: [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ],
+            "All Difficulties": [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ]
         },
 
         {
@@ -879,32 +854,28 @@ window.drops = {
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
 			challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
-            Expert: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ],
-            Elite: [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ]
+            "All Difficulties": [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ]
         },
 
         {
             name: "T-Bone's Absolute Justice",
             thumb: 724,
             condition: 'You can only bring INT, PSY and QCK units',
-            Expert: [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ],
-            Elite: [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ]
+            "All Difficulties": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ]
         },
 
         {
             name: "Explosive! Wanze's Ramen Kenpo!!",
             thumb: 743,
             condition: 'You can only bring STR, QCK and DEX units',
-            Expert: [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ],
-            Elite: [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ]
+            "All Difficulties": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ]
         },
 
         {
             name: "Twilight Party DEAD or TREAT!!",
             thumb: 761,
 			condition: "None",
-            Expert: [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ],
-            Elite: [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ]
+            "All Difficulties": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ]
         },
 
         {
@@ -912,16 +883,14 @@ window.drops = {
             thumb: 763,
             global: true,
 			condition: "None",
-            Expert: [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ],
-            Elite: [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
+            "All Difficulties": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
         },
 
         {
             name: "Midnight Party DEAD or TREAT!!",
             thumb: 766,
 			condition: "None",
-            Expert: [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ],
-            Elite: [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ]
+            "All Difficulties": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ]
         },
 
         {
@@ -929,24 +898,21 @@ window.drops = {
             thumb: 768,
             global: true,
 			condition: "None",
-            Expert: [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ],
-            Elite: [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
+            "All Difficulties": [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
         },
 
         {
             name: "Evil Manager Breed's Marine Circus!",
             thumb: 797,
             condition: 'You can only bring Fighter and Tough units',
-            Expert: [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ],
-            Elite: [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ]
+            "All Difficulties": [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ]
         },
 
         {
             name: "Nami and Lola's Great Proposal Plan",
             thumb: 808,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
-            Expert: [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ],
-            Elite: [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ]
+            "All Difficulties": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ]
         },
 
         {
@@ -955,88 +921,77 @@ window.drops = {
             condition: 'You can only bring Impact and Free Spirit units. (No Evo/Boosters)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
-            Expert: [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ],
-            Elite: [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ]
+            "All Difficulties": [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ]
         },
 
         {
             name: "Wapol's Counterattack",
             thumb: 852,
             condition: 'You can only bring Shooter and Ambition units',
-            Expert: [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ],
-            Elite: [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
+            "All Difficulties": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
         },
 
         {
             name: "Lightning Speed! Strawhat Crew's Surprise Visit",
             thumb: 866,
 			condition: "None",
-            Expert: [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ],
-            Elite: [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ]
+            "All Difficulties": [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ]
         },
 
         {
             name: "Riverside Banquet! Enter the Crazy Ones!",
             thumb: 885,
             condition: 'Highly increased chance of TND, Bomb, and G orbs',
-            Expert: [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416 ],
-            Elite: [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416 ]
+            "All Difficulties": [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416 ]
         },
 
         {
             name: "Mountaintop Banquet! Enter the Generals!",
             thumb: 897,
             condition: 'Only STR/DEX/QCK/PSY/INT orbs will appear',
-            Expert: [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464 ],
-            Elite: [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464 ]
+            "All Difficulties": [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464 ]
         },
 
         {
             name: "Men are Forbidden!? The Secret Flower Garden",
             thumb: 918,
             condition: 'You can only bring DEX units',
-            Expert: [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ],
-            Elite: [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ]
+            "All Difficulties": [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ]
         },
 		
 		{
             name: "Hannyabal's Great Ambition",
             thumb: 929,
             condition: 'You can only bring STR units',
-            Expert: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ],
-            Elite: [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
+            "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
         },
 		
         {
             name: "Encounter! Whitebeard Pirates",
             thumb: 946,
             condition: "You can only bring PSY units",
-            Expert: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738],
-            Elite: [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738]
+            "All Difficulties": [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738]
         },
 		
 		{
 			name: "Clash! Whitebeard Pirates",
             thumb: 979,
 			condition: "You can only bring INT units",
-			Expert: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ],
-			Elite: [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
+			"All Difficulties": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
 		},
 		
 		{
 			name: "Let's Find Our Captain! Heart Pirates!",
 			condition: "You can only bring QCK units",
             thumb: 1003,
-			Expert: [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ],
-			Elite: [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ]
+			"All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ]
 		},
         
         {
 			name: "Rare Animal Island's Count Butler",
 			thumb: 1011,
 			condition: "None",
-			Expert: [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ],
-			Elite: [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
+			"All Difficulties": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
 		}
 
     ],
@@ -1212,9 +1167,9 @@ window.drops = {
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1015 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015 ]
         }
 
    ]
diff --git a/index.html b/index.html
index e826bd40e..01647da81 100644
--- a/index.html
+++ b/index.html
@@ -57,19 +57,20 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>19/04/2016</p>
+            <p>21/04/2016</p>
             <br>
             <ul>
-                <li>Count Butler Update</li>
+                <li>Drops Page Update</li>
+				<br>
+                <li>Colosseum Units flagged properly</li>
+                <li>"All Difficulties" if drops are the same</li>
                 <br>
                 <li>All Count Butler fortnight</li>
                 <li>Units with stats added</li>
                 <br>
                 <li>Japanese Aliases Updated</li>
                 <li>Love, Zeenigami & XFTS<li>
-                <br>
-                <li>Added Line Graphs for Stat Growth</li>
-                <li>Useful for Unit Comparisons</li>
+
             </ul>
         </div>
     </body>

From 8f653103e5bdd561c075b20b78a19df7f512e247 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Apr 2016 14:29:42 -0500
Subject: [PATCH 0306/1569] Croc global

flag fixed
---
 common/data/flags.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 9d366f041..cec0f7cf1 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -677,8 +677,8 @@ window.flags = {
 	711: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	717: { rr: 1, rro: 1, global: 1 },
 	718: { rr: 1, rro: 1, global: 1 },
-	719: { rr: 1, rro: 1 },
-	720: { rr: 1, rro: 1 },
+	719: { rr: 1, rro: 1, global: 1 },
+	720: { rr: 1, rro: 1, global: 1 },
 	725: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	726: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	727: { special: 1 },

From 1dbbbc78571935bd59c99ddf28cdd85d850906b9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Apr 2016 14:30:49 -0500
Subject: [PATCH 0307/1569] Corazon flag fix

proportianally
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 1ba2ae1fa..d3faf88e6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4748,13 +4748,13 @@ window.details = {
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
 	1000: {
-		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
+		captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
 		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
 		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
 		specialName: "Love Sacrifice"
 	},
 	1001: {
-		captain: "Boosts ATK of all characters proportional to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
+		captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
 		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
 		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
 		specialName: "Love Sacrifice"

From 89b735bb3c07ec9f7edf3bcedf6b8e99ae6e4dd5 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 22 Apr 2016 14:35:56 -0500
Subject: [PATCH 0308/1569] max stats/cds

of colo units
---
 common/data/cooldowns.js | 6 +++---
 common/data/units.js     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 04cf078b1..3426f2ccc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1015,7 +1015,7 @@ window.cooldowns = [
 	[ 16, 6 ],
 	[ 24, 12 ],
 	[ 24, 12 ],
-	26,
-	26,
-	16
+	[ 26, 14 ],
+	[ 26, 14 ],
+	[ 16, 12]
 ];
diff --git a/common/data/units.js b/common/data/units.js
index e3b0e6fef..de68195e7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1016,8 +1016,8 @@ window.units = [
 	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, 4, 2, 70, null, 494, 313, 80, null, null, null, null],
 	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, null, 900, 688, 197, 1903, 1361, 379, null],
 	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, null, 230, 101, 33, null, null, null, null],
-	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, null, 1127, 444, 90, null, null, null, null],
-	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, null, null, null, null]
+	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, null, 1127, 444, 90, 2500, 1000, 220, null],
+	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file

From e91748ad9b2c643a1adf056be9996695c3b10cf5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 23 Apr 2016 12:09:59 +0200
Subject: [PATCH 0309/1569] Added Red Force

Also made Probability Sockets clearer
---
 common/data/ships.js        | 14 +++++++++++++-
 index.html                  |  6 +++---
 probability/views/main.html |  3 ++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 02407ac18..123a534e4 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -202,6 +202,18 @@ window.ships = [
         hp: function(p) {
             return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.1, 1.2 ][p.boatLevel - 1] : 1;
         }
-    }
+    },
+    
+    { // 16
+        name: 'Red Force',
+        thumb: null,
+        description: 'Boosts ATK of Cerebral characters by 1.5x and their HP by 1.5x, Increased Orb Rate for Cerebral characters.',
+        atk: function(p) {
+            return  !p.unit.class.has('Cerebral') ? 1 : [ 1.0, 1.0, 1.0, 1.0, 1.2, 1.2, 1.2, 1.2, 1.2, 1.5 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return !p.unit.class.has('Cerebral') ? 1 : [ 1.0, 1.0, 1.0, 1.0, 1.2, 1.2, 1.2, 1.2, 1.2, 1.5 ][p.boatLevel - 1];
+        }
+    },
 
 ];
diff --git a/index.html b/index.html
index 01647da81..544f4f391 100644
--- a/index.html
+++ b/index.html
@@ -65,11 +65,11 @@
                 <li>Colosseum Units flagged properly</li>
                 <li>"All Difficulties" if drops are the same</li>
                 <br>
-                <li>All Count Butler fortnight</li>
-                <li>Units with stats added</li>
+                <li>Added Shanks Ship (Red Force)</li>
+                <li>Lvl 10 is confirmed, rest is assumed</li>
                 <br>
                 <li>Japanese Aliases Updated</li>
-                <li>Love, Zeenigami & XFTS<li>
+                <li>Love, Zeenigami & XFTS & Mondfischer<li>
 
             </ul>
         </div>
diff --git a/probability/views/main.html b/probability/views/main.html
index 81617b8e9..a4e662fe7 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -13,7 +13,8 @@ <h1 class="page-header">
                             ng-class="{ empty: !character || !character.uid }"></div>
 
                     </div>
-
+                    <p ng-if="slotCount(character.uid)">Select which Sockets your Unit already has.</p>
+                    <p ng-if="!slotCount(character.uid)">This Unit has no Sockets.</p>
                     <div class="slots">
 
                         <slot-wheel ng-repeat="slotNumber in range(0, slotCount(character.uid))">

From 399fbcb26666dc134b6203cddde33948ff2b6c3c Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Sun, 24 Apr 2016 12:51:25 +0800
Subject: [PATCH 0310/1569] Update units.js

Keimi to Camie fix
---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index de68195e7..5870c3fca 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -632,8 +632,8 @@ window.units = [
 	[ "Kaku: Six Powers Cipher Pol No. 9", "QCK", [ "Slasher", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1144, 577, 93, 2523, 1000, 196, 1 ],
 	[ "Rob Lucci Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 3, 12, 4, 2, 50, 392109, 121, 153, 20, 1121, 792, 64, 1 ],
 	[ "Rob Lucci: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 4, 20, 6, 3, 99, 3000000, 1064, 743, 51, 2284, 1289, 134, 1 ],
-	[ "Keimi", "QCK", "Fighter", 3, 12, 4, 1, 50, 392109, 90, 23, 62, 960, 352, 273, [ 0.7, 1, 0.7 ] ],
-	[ "Keimi, Takoyaki Stand Assistant", "QCK", "Fighter", 4, 18, 5, 2, 99, 3000000, 900, 295, 231, 1731, 698, 455, 0.7 ],
+	[ "Camie", "QCK", "Fighter", 3, 12, 4, 1, 50, 392109, 90, 23, 62, 960, 352, 273, [ 0.7, 1, 0.7 ] ],
+	[ "Camie, Takoyaki Stand Assistant", "QCK", "Fighter", 4, 18, 5, 2, 99, 3000000, 900, 295, 231, 1731, 698, 455, 0.7 ],
 	[ "Pappug", "INT", "Fighter", 3, 12, 5, 1, 50, 392109, 77, 30, 77, 895, 505, 214, 0.7 ],
 	[ "Hatchan, Takoyaki Stand Owner", "PSY", [ "Slasher", "Tough" ], 3, 16, 6, 2, 99, 3000000, 134, 88, 41, 1788, 888, 187, 0.7 ],
 	[ "Doma", "QCK", "Slasher", 4, 18, 4, 3, 70, 1066998, 89, 144, 43, 1098, 733, 187, 0.7 ],
@@ -1020,4 +1020,4 @@ window.units = [
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
-// or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
\ No newline at end of file
+// or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]

From 2ef64f1b878d4457165b317713fdb39543ca3413 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 24 Apr 2016 20:04:58 +0200
Subject: [PATCH 0311/1569] Bunch of Bugfixes

---
 common/data/captains.js | 15 ++++++++++++++-
 common/data/details.js  |  9 +++++----
 common/data/drops.js    |  2 +-
 common/data/flags.js    |  4 ++--
 common/data/ships.js    |  4 ++--
 common/data/specials.js | 30 +++++++++++++++++++++++-------
 common/data/units.js    | 11 +++++++----
 index.html              |  8 +++++---
 8 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index f661ec21a..5363bdfdc 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2439,5 +2439,18 @@ window.captains = {
 	},
 	1014:{
 		atk: function(p) {return p.unit.class.has("Tough") ? 2 : 1; }
-	}
+	},
+    1015: {
+        atk: function(p) { return !p.unit.type == "INT" ? 1 : (p.orb == 2.0 ? 2.75 : 1); }
+    },
+    1016: {
+        atk: function(p) { return !p.unit.type == "INT" ? 1 : (p.orb == 2.0 ? 3 : 1.5); }
+    },
+    1017: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1018: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    }
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index d3faf88e6..704bf0055 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1853,7 +1853,7 @@ window.details = {
 		special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
 		specialName: "Zen Shockwave",
 		specialNotes: "#{random : 30,000 : 150,000}",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts own ATK and ATK of characters with cost 20 or less by 3x",
+		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x as well as himself",
 		captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku units in the team are included in the bonus."
 	},
 	460: {
@@ -2852,13 +2852,13 @@ window.details = {
 		captain: "Boosts ATK of PSY characters by 2x"
 	},
 	663: {
-		special: "Deals several times the character's ATK in PSY damage to one enemy, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
+		special: "Deals PSY damage to one enemy according to HP, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
 		specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the lower the HP is. The formula used is 80000 * (1 - (current HP) / (total HP))",
 		specialName: "Vivi's Important Security Guard",
 		captain: "Recovers 2x character's RCV in HP at the end of each turn"
 	},
 	664: {
-		special: "Deals several times the character's ATK in PSY damage to one enemy, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
+		special: "Deals PSY damage to one enemy according to HP, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
 		specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the lower the HP is. The formula used is 80000 * (1 - (current HP) / (total HP))",
 		specialName: "Vivi's Important Security Guard",
 		captain: "Recovers 3x character's RCV in HP at the end of each turn"
@@ -4851,6 +4851,7 @@ window.details = {
 	1019: {
 		captain: "Reduces damage received from [QCK] enemies by 50%",
 		special: "Switches orbs between slots 2 times and deals 2000 fixed damage to one enemy",
-		specialName: "Blacksmithing Measurement: Double Slash"
+		specialName: "Blacksmithing Measurement: Double Slash",
+        specialNotes: "#{fixed}"
 	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 7006ef376..e67e9e78c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -745,7 +745,7 @@ window.drops = {
             condition: 'Higher Chance of Food orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['450,000 Damage','1x Yellow Elder'],['1,250,000 Damage','1x RCV Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
-            "All Difficulties": [ 290, 293, 294, 295, 334, 379, 381, 382, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
+            "All Difficulties": [ 290, 293, 294, 295, 334, 379, 381, 382, 429, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
         },
 
         {
diff --git a/common/data/flags.js b/common/data/flags.js
index cec0f7cf1..d5878fb36 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -491,8 +491,8 @@ window.flags = {
 	494: { global: 1 },
 	495: { global: 1 },
 	496: { global: 1 },
-	497: { global: 1, rr: 1, rro: 1 },
-	498: { global: 1, rr: 1, rro: 1 },
+	497: { global: 1, rr: 1, rro: 1, lrr: 1 },
+	498: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	499: { global: 1, rr: 1, rro: 1 },
 	500: { global: 1, rr: 1, rro: 1 },
 	501: { global: 1, rr: 1, rro: 1 },
diff --git a/common/data/ships.js b/common/data/ships.js
index 123a534e4..464dc015b 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -77,9 +77,9 @@ window.ships = [
     { // 5
         name: 'Miss Love Duck',
         thumb: 'ship_0006_c.png',
-        description: 'Reduces damage received by 10%, boosts ATK of each character by 100 units',
+        description: 'Reduces damage received by 10%, boosts ATK of Striker characters by 100 units',
         atkStatic: function(p) {
-            return p.boatLevel < 7 ? 0 : [ 50, 50, 50, 100 ][p.boatLevel - 7];
+            return !p.unit.class.has('Striker') ? 0 : [ 0, 0, 0, 0, 0, 0, 50, 50, 50, 100 ][p.boatLevel -1];
         }
     },
 
diff --git a/common/data/specials.js b/common/data/specials.js
index 58134ab3e..303454d7e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -786,14 +786,14 @@ window.specials = {
 	},
 	843: {
 		atk: function(p) {
-			if (window.specials[843].stage) return p.unit.class.has("Shooter") ? 1.5 : 1;
+			if (window.specials[843].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
 			else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
 		},
 		type: "class",
 		onActivation: function(p) {
-			window.specials[843].multiplier = !window.specials[843].multiplier;
+			window.specials[843].first = !window.specials[843].first;
 			p.scope.notify({
-				text: (window.specials[843].multiplier ?
+				text: (window.specials[843].first ?
 					'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
 					'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
 				name: '843warning'
@@ -802,14 +802,14 @@ window.specials = {
 	},
 	844: {
 		atk: function(p) {
-			if (window.specials[844].stage) return p.unit.class.has("Shooter") ? 1.5 : 1;
+			if (window.specials[844].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
 			else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
 		},
 		type: "class",
 		onActivation: function(p) {
-			window.specials[844].multiplier = !window.specials[844].multiplier;
+			window.specials[844].first = !window.specials[844].first;
 			p.scope.notify({
-				text: (window.specials[844].multiplier ?
+				text: (window.specials[844].first ?
 					'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
 					'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
 				name: '844warning'
@@ -1191,5 +1191,21 @@ window.specials = {
 		atk: function(p) { return 1.2; },
 		type: "condition",
 		warning: "Selected special (%name%) assumes that the enemy has been delayed."
-	}
+	},
+    1015: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+		type: "type"
+    },
+    1016: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+		type: "type"
+    },
+    1017: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
+        type: "class"
+    },
+    1018: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
+        type: "class"
+    }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 5870c3fca..7658f2017 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1000,9 +1000,9 @@ window.units = [
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, 4000000, 1443, 812, 50, 2840, 1421, 174, 1 ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
-	[ "Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
-	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Figher", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
-	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Figher", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
+	[ "Bepo, Heart Pirates", "STR", ["Fighter", "Tough"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
+	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Fighter", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
+	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Fighter", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
 	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
@@ -1017,7 +1017,10 @@ window.units = [
 	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, null, 900, 688, 197, 1903, 1361, 379, null],
 	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, null, 230, 101, 33, null, null, null, null],
 	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, null, 1127, 444, 90, 2500, 1000, 220, null],
-	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null]
+	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null],
+    [],
+    [],
+    [ " Luffy: Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, null, null, null, null, null, null, null, null, null, null, null]
 ];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
diff --git a/index.html b/index.html
index 544f4f391..24274ab6e 100644
--- a/index.html
+++ b/index.html
@@ -57,11 +57,9 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>21/04/2016</p>
+            <p>24/04/2016</p>
             <br>
             <ul>
-                <li>Drops Page Update</li>
-				<br>
                 <li>Colosseum Units flagged properly</li>
                 <li>"All Difficulties" if drops are the same</li>
                 <br>
@@ -69,6 +67,10 @@
                 <li>Lvl 10 is confirmed, rest is assumed</li>
                 <br>
                 <li>Japanese Aliases Updated</li>
+                <br>
+                <li>Many Bugfixes</li>
+                <li>Haven't gotten around to all of them though</li>
+                <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
 
             </ul>

From 15e082142ef4efa1b400fd82694f077102062881 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 25 Apr 2016 10:19:11 -0500
Subject: [PATCH 0312/1569] New Luffy & Unit Prototypes

Sugo Hype!
---
 common/data/aliases.js    | 22 +++++++++++++++++++---
 common/data/cooldowns.js  | 18 +++++++++++++++++-
 common/data/details.js    |  5 +++++
 common/data/drops.js      |  5 ++++-
 common/data/evolutions.js | 31 +++++++++++++++++++++++++++++--
 common/data/families.js   | 19 ++++++++++++++++++-
 common/data/units.js      | 20 ++++++++++++++++----
 7 files changed, 108 insertions(+), 12 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index bcc3c86a8..d08a51349 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -632,8 +632,8 @@ window.aliases = {
     631: ['カク 六式 サイファーポールNo.9',''],
     632: ['ロブ・ルッチ サイファーポールNo.9',''],
     633: ['ロブ・ルッチ 六式 サイファーポールNo.9',''],
-    634: ['ケイミー',''],
-    635: ['ケイミー タコ焼き屋店員',''],
+    634: ['ケイミー','','Keimi'],
+    635: ['ケイミー タコ焼き屋店員','','Keimi, Takoyaki Stand Assistant'],
     636: ['パッパグ',''],
     637: ['はっちゃん タコ焼き屋店主','', 'Hachi, Takoyaki Stand Owner' ],
     638: ['ドーマ',''],
@@ -1017,5 +1017,21 @@ window.aliases = {
 	1016: ['',''],
 	1017: ['',''],
 	1018: ['',''],
-	1019: ['','']
+	1019: ['',''],
+	1020: ['','','Sakura Sugar'],
+	1021: ['','','Sakura Sugar'],
+	1022: ['','','Anniversary Luffy'],
+	1023: ['',''],
+	1024: ['',''],
+	1025: ['',''],
+	1026: ['',''],
+	1027: ['',''],
+	1028: ['',''],
+	1029: ['',''],
+	1030: ['',''],
+	1031: ['',''],
+	1032: ['',''],
+	1033: ['',''],
+	1034: ['',''],
+	1035: ['','']
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3426f2ccc..ce2f9e201 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1017,5 +1017,21 @@ window.cooldowns = [
 	[ 24, 12 ],
 	[ 26, 14 ],
 	[ 26, 14 ],
-	[ 16, 12]
+	[ 16, 12],
+	null,
+	null,
+	[ 15, 15 ],
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 704bf0055..a348582f0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4853,5 +4853,10 @@ window.details = {
 		special: "Switches orbs between slots 2 times and deals 2000 fixed damage to one enemy",
 		specialName: "Blacksmithing Measurement: Double Slash",
         specialNotes: "#{fixed}"
+	},
+	1022:{
+		captain: "Boosts ATK of all characters by 2x and boosts amount of beli received by 1.2x",
+		special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
+		specialName: "Gum-Gum Gigant Rifle: New Star"
 	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index e67e9e78c..9909f8a91 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1161,7 +1161,10 @@ window.drops = {
         {
             name: 'Girls of Summer Paradise',
             thumb: 683,
-            Expert: [ 659, 680, 682, 684, 686 ]
+            challenge: 'Total number of hits over 30,000',
+            challengeData: [['10 Times','Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems']],
+            Expert: [ 659, 680, 682, 684, 686 ],
+			"Completion Units": [686]
         },
 
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 44fa7567a..864de01d1 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1507,7 +1507,6 @@ window.evolutions = {
 		evolution: 1008,
 		evolvers: [ 117, 85, 87, 96, 98 ]
 	},
-    
     1010: {
         evolution: 1011,
         evolvers: []
@@ -1515,5 +1514,33 @@ window.evolutions = {
     1015: {
         evolution: 1016,
         evolvers: []
-    }
+    },
+	1020: {
+		evolution: 1021,
+        evolvers: []
+	},
+	1024: {
+		evolution: 1025,
+        evolvers: []
+	},
+	1026: {
+		evolution: 1027,
+        evolvers: []
+	},
+	1028: {
+		evolution: 1029,
+        evolvers: []
+	},
+	1030: {
+		evolution: 1031,
+        evolvers: []
+	},
+	1032: {
+		evolution: 1033,
+        evolvers: []
+	},
+	1034: {
+		evolution: 1035,
+        evolvers: []
+	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index c95faf5c6..3d3dc0ddf 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1017,5 +1017,22 @@ window.families = [
     "Capone Bege",
     "Brownbeard",
     "Brownbeard",
-    "Lulu"
+    "Lulu",
+	"Sugar",
+	"Sugar",
+	"Monkey D. Luffy",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
+	"",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 7658f2017..3d62cdee8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1018,9 +1018,21 @@ window.units = [
 	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, null, 230, 101, 33, null, null, null, null],
 	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, null, 1127, 444, 90, 2500, 1000, 220, null],
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null],
-    [],
-    [],
-    [ " Luffy: Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, null, null, null, null, null, null, null, null, null, null, null]
-];
+    [ "Sakura Sugar", "INT", ["Shooter","Cerebral"], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Sakura Sugar Evolution", "INT", ["Shooter","Cerebral"], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
+	[],
+    [ "Unknown Unit #1", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #1 Evolution", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #2", "QCK", ["Fighter","Free Spirit"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #2 Evolution", "QCK", ["Fighter","Free Spirit"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #3", "DEX", ["Fighter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #3 Evolution", "DEX", ["Fighter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #4", "PSY", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #4 Evolution", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #5", "STR", ["Slasher","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Unit #5 Evolution", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Legend #6", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Unknown Legend #6 Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
+	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]

From 900aaabad577efdb586be234ec2f32d691ce403c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 25 Apr 2016 10:19:27 -0500
Subject: [PATCH 0313/1569] lost in commit

---
 common/data/units.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/units.js b/common/data/units.js
index 3d62cdee8..bebcff594 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1020,6 +1020,7 @@ window.units = [
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null],
     [ "Sakura Sugar", "INT", ["Shooter","Cerebral"], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
     [ "Sakura Sugar Evolution", "INT", ["Shooter","Cerebral"], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, null, null, null, 2000, 1000, 300, null],
 	[],
     [ "Unknown Unit #1", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
     [ "Unknown Unit #1 Evolution", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],

From 81990ade466dbd40b4e86aaee8ed392fb55685b0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 25 Apr 2016 10:31:08 -0500
Subject: [PATCH 0314/1569] Evo's and stats

small updates
---
 common/data/drops.js      | 2 +-
 common/data/evolutions.js | 4 ++--
 common/data/units.js      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9909f8a91..90792d247 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1163,7 +1163,7 @@ window.drops = {
             thumb: 683,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['10 Times','Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems']],
-            Expert: [ 659, 680, 682, 684, 686 ],
+            Expert: [ 659, 680, 682, 684 ],
 			"Completion Units": [686]
         },
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 864de01d1..17f6fdde4 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1509,11 +1509,11 @@ window.evolutions = {
 	},
     1010: {
         evolution: 1011,
-        evolvers: []
+        evolvers: [ 116, 82, 88, 93, 104 ]
     },
     1015: {
         evolution: 1016,
-        evolvers: []
+        evolvers: [ 82, 266, 88, 304, 104 ]
     },
 	1020: {
 		evolution: 1021,
diff --git a/common/data/units.js b/common/data/units.js
index bebcff594..dc742fe26 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1020,7 +1020,7 @@ window.units = [
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null],
     [ "Sakura Sugar", "INT", ["Shooter","Cerebral"], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
     [ "Sakura Sugar Evolution", "INT", ["Shooter","Cerebral"], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, null, null, null, 2000, 1000, 300, null],
+    [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
     [ "Unknown Unit #1", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
     [ "Unknown Unit #1 Evolution", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],

From e8574004fd96962042db4065d0a4df32dd4e811b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 25 Apr 2016 11:56:49 -0500
Subject: [PATCH 0315/1569] Red Force data updated

should all be correct based off video
---
 common/data/ships.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 464dc015b..34b521a87 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -207,12 +207,12 @@ window.ships = [
     { // 16
         name: 'Red Force',
         thumb: null,
-        description: 'Boosts ATK of Cerebral characters by 1.5x and their HP by 1.5x, Increased Orb Rate for Cerebral characters.',
+        description: 'Boosts ATK of Cerebral characters by 1.5x and their HP by 1.35x, Increased Orb Rate for Cerebral characters.',
         atk: function(p) {
-            return  !p.unit.class.has('Cerebral') ? 1 : [ 1.0, 1.0, 1.0, 1.0, 1.2, 1.2, 1.2, 1.2, 1.2, 1.5 ][p.boatLevel - 1];
+            return  !p.unit.class.has('Cerebral') ? 1 : [ 1.0, 1.2, 1.2, 1.2, 1.25, 1.3, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !p.unit.class.has('Cerebral') ? 1 : [ 1.0, 1.0, 1.0, 1.0, 1.2, 1.2, 1.2, 1.2, 1.2, 1.5 ][p.boatLevel - 1];
+            return !p.unit.class.has('Cerebral') ? 1 : [ 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.35 ][p.boatLevel - 1];
         }
     },
 

From bca81ff19eb837e2a53c35d9a5c10ff3a6101a70 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 25 Apr 2016 19:25:19 +0200
Subject: [PATCH 0316/1569] Karoo into Vivi Family

Absolute hackjob, but as long as we only have one case I don't see the
need to overhaul the whole family system
---
 characters/js/controllers.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index 844d1a55b..edbca1256 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -142,6 +142,17 @@ 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}
+                    });
+                }
+            }
         });
     }
 

From 191e0a12225a62f9b1cd906eef4adcca3b108f62 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 25 Apr 2016 15:03:53 -0500
Subject: [PATCH 0317/1569] Aliases added

punctuation for mr. units
---
 common/data/aliases.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d08a51349..a34c9de0f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -209,8 +209,8 @@ window.aliases = {
     208: ['Mr.2・ボン・クレー  爆撃白鳥アラベスク(ボンバルディエ)','', 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
     209: ['ミス・オールサンデー バロックワークス副社長','', 'Nico Robin' ],
     210: ['ニコ・ロビン',''],
-    211: ['Mr.9',''],
-    212: ['Mr.9 （熱血ナイン根性バット）',''],
+    211: ['Mr.9','','Mr 9'],
+    212: ['Mr.9 （熱血ナイン根性バット）','','Mr 9 Hot Blooded Bat'],
     213: ['ラブーン',''],
     214: ['ラブーン(ルフィ落書き)',''],
     215: ['大王イカ',''],
@@ -222,8 +222,8 @@ window.aliases = {
     221: ['ナミ（幸せパンチ）','', 'Towel Nami' ],
     222: ['ウソップ（ウソップハンマー）',''],
     223: ['ウソップ（衝撃（インパクト））',''],
-    224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji' ],
-    225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji' ],
+    224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji', 'Mr Prince Mutton Shot'],
+    225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji', 'Mr Prince Veau Shot' ],
     226: ['ジュラキュール・ミホーク',''],
     227: ['鷹の目のミホーク',''],
     228: ['脱獄モーガン',''],
@@ -231,8 +231,8 @@ window.aliases = {
     230: ['両鉄拳のフルボディ',''],
     231: ['ヒナ',''],
     232: ['黒檻のヒナ',''],
-    233: ['Mr.8',''],
-    234: ['Mr.8 イガラッパッパ',''],
+    233: ['Mr.8','','mr 8'],
+    234: ['Mr.8 イガラッパッパ','','mr 8'],
     235: ['ミス・マンデー',''],
     236: ['ミス・マンデー カ・イ・リ・キ メリケン',''],
     237: ['ナックルミリオンズ バロックワークス',''],
@@ -288,7 +288,7 @@ window.aliases = {
     287: ['狙撃隊　武装隊員 イエローパイレーツ',''],
     288: ['狙撃隊　武装隊員 ブラックパイレーツ',''],
     289: ['砲撃手　敏腕',''],
-    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）',''],
+    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）','','mr 13 and ms friday the unluckies'],
     291: ['ドリー',''],
     292: ['ブロギー',''],
     293: ['トリケラトプス',''],
@@ -381,8 +381,8 @@ window.aliases = {
     380: ['クンフージュゴン 兄弟弟子',''],
     381: ['バナナワニ',''],
     382: ['サンドラ大トカゲ',''],
-    383: ['Mr.0 バロックワークス社長','', 'Crocodile' ],
-    384: ['サー・クロコダイル','', 'Strikerdile', 'Impactdile' ],
+    383: ['Mr.0 バロックワークス社長','', 'Crocodile', 'mr 0' ],
+    384: ['サー・クロコダイル','', 'Strikerdile', 'Impactdile', 'mr 0','mr. 0' ],
     385: ['ホグバック',''],
     386: ['ドクトル・ホグバック',''],
     387: ['シンドリーちゃん',''],
@@ -395,12 +395,12 @@ window.aliases = {
     394: ['犬ッペ','', 'Inuppe' ],
     395: ['ミス・メリークリスマス',''],
     396: ['ミス・メリークリスマス モグラ人間',''],
-    397: ['Mr.4',''],
-    398: ['Mr.4と犬銃ラッスー',''],
+    397: ['Mr.4','','Mr 4'],
+    398: ['Mr.4と犬銃ラッスー','','Mr 4 and Lassoo the Dog-Gun'],
     399: ['ミス・ダブルフィンガー',''],
     400: ['ミス・ダブルフィンガー 棘（とげ）人間',''],
-    401: ['Mr.1',''],
-    402: ['Mr.1 全身刃物人間',''],
+    401: ['Mr.1','','mr 1','daz bones'],
+    402: ['Mr.1 全身刃物人間','','mr 1','daz bones'],
     403: ['レベッカ',''],
     404: ['アブサロム',''],
     405: ['墓場のアブサロム',''],
@@ -507,9 +507,9 @@ window.aliases = {
     506: ['ペル アラバスタの守護神ファルコン',''],
     507: ['チャカ',''],
     508: ['チャカ アラバスタの守護神ジャッカル',''],
-    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長',''],
-    510: ['最強の囚人サー・クロコダイル 元王下七武海',''],
-    511: ['服役囚ダズ・ボーネス Mr.1',''],
+    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長','','mr 0', 'Mr. 0','crocodile'],
+    510: ['最強の囚人サー・クロコダイル 元王下七武海','','mr 0','mr. 0'],
+    511: ['服役囚ダズ・ボーネス Mr.1','','mr 1','daz bones'],
     512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
     513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
     514: ['ニコ・ロビン トロピカル',''],
@@ -799,8 +799,8 @@ window.aliases = {
     798: ['クンフージュゴン 海獣海賊団',''],
     799: ['シーラパーン 海獣海賊団','', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
     800: ['たこボクサー 海獣海賊団',''],
-    801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay' ],
-    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay' ],
+    801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','mr 2' ],
+    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
     803: ['ヒナ 海軍本部大佐',''],
     804: ['黒檻のヒナ 海軍本部大佐',''],
     805: ['スモーカー 海軍本部大佐',''],
@@ -832,7 +832,7 @@ window.aliases = {
     831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
     832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia' ],
     833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia' ],
-    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ',''],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'mr 7 and miss fathers day'],
     835: ['暴君バーソロミュー・くま',''],
     836: ['暴君バーソロミュー・くま 政府の人間兵器',''],
     837: ['シーザー・クラウン',''],
@@ -884,7 +884,7 @@ window.aliases = {
     883: ['ドリー 巨兵海賊団',''],
     884: ['青鬼のドリー',''],
     885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
-    886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1' ],
+    886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
     887: ['バギー 陽気なかぶき者','', 'Kimono Buggy' ],
     888: ['ホロホロゴースト',''],
     889: ['ペローナ スリラーバークの怪人',''],

From 90540c5aedc1583aedd6747105e84d4c0eb76d0d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 25 Apr 2016 15:53:29 -0500
Subject: [PATCH 0318/1569] instructions/patch notes

---
 damage/views/popup/instruction.html |  1 +
 index.html                          | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/damage/views/popup/instruction.html b/damage/views/popup/instruction.html
index 3c4c14669..3a54c195e 100644
--- a/damage/views/popup/instruction.html
+++ b/damage/views/popup/instruction.html
@@ -17,6 +17,7 @@
                         <li><tt>CTRL</tt>: Changes Miss > Below Good > Good > Great > Perfect</li>
                         <li><tt>SHIFT</tt>: Changes Opponent's Type (For individual targets)</li>
                         <li><tt>Drag &amp; Drop</tt>: Changes Attack Order</li>
+						<li><tt>Double Click on Background:</tt>: Enable/Disable Dark Mode</li>
                     </ul>
                     <br>
                     <b>Units Window: (Center area)</b>
diff --git a/index.html b/index.html
index 24274ab6e..8dddf5a66 100644
--- a/index.html
+++ b/index.html
@@ -57,19 +57,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>24/04/2016</p>
+            <p>25/04/2016</p>
             <br>
             <ul>
-                <li>Colosseum Units flagged properly</li>
-                <li>"All Difficulties" if drops are the same</li>
-                <br>
-                <li>Added Shanks Ship (Red Force)</li>
-                <li>Lvl 10 is confirmed, rest is assumed</li>
+                <li>New Sugofest Units!</li>
+                <li>Prototypes added, will update</li>
+				<li> upon character release on 5/1</li>
                 <br>
-                <li>Japanese Aliases Updated</li>
+                <li>Small improvements to search functions</li>
                 <br>
-                <li>Many Bugfixes</li>
-                <li>Haven't gotten around to all of them though</li>
+                <li>Colosseum Units flagged properly</li>
+                <li>"All Difficulties" if drops are the same</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
 

From 2a41fcabdc9cd70bb898c3ae971f0f2952c1745b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 25 Apr 2016 22:52:03 -0500
Subject: [PATCH 0319/1569] Sugo Unit Names

---
 common/data/units.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index dc742fe26..cd6fdafd8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1022,18 +1022,18 @@ window.units = [
     [ "Sakura Sugar Evolution", "INT", ["Shooter","Cerebral"], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
-    [ "Unknown Unit #1", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #1 Evolution", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #2", "QCK", ["Fighter","Free Spirit"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #2 Evolution", "QCK", ["Fighter","Free Spirit"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #3", "DEX", ["Fighter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #3 Evolution", "DEX", ["Fighter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #4", "PSY", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #4 Evolution", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #5", "STR", ["Slasher","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Unit #5 Evolution", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Legend #6", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Unknown Legend #6 Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
+    [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Don Chinjao, the Drill", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Blue Gilly Evolution", "QCK", ["Fighter","Free Spirit"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Funk Brothers Evolution", "DEX", ["Fighter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Hajrudin Evolution", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Abdullah and Jeet Evolution", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Bartoloemo", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Bartoloemo Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
 	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]

From 3df9e8ece3a1e51730e036b7eefaed7b3135bb76 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 26 Apr 2016 03:55:08 -0500
Subject: [PATCH 0320/1569] Don Chinjao & Names

---
 common/data/aliases.js  |  4 ++--
 common/data/details.js  | 10 ++++++++++
 common/data/families.js | 25 ++++++++++++-------------
 common/data/units.js    | 10 +++++-----
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index a34c9de0f..a92c2cb66 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1030,8 +1030,8 @@ window.aliases = {
 	1029: ['',''],
 	1030: ['',''],
 	1031: ['',''],
-	1032: ['',''],
-	1033: ['',''],
+	1032: ['','','Abdullah and Jeet'],
+	1033: ['','','Abdullah and Jeet, Former Bounty Hunters'],
 	1034: ['',''],
 	1035: ['','']
 };
diff --git a/common/data/details.js b/common/data/details.js
index a348582f0..6d9b64972 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4858,5 +4858,15 @@ window.details = {
 		captain: "Boosts ATK of all characters by 2x and boosts amount of beli received by 1.2x",
 		special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
 		specialName: "Gum-Gum Gigant Rifle: New Star"
+	},
+	1024{
+		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
+		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
+		specialName: "Eight-Impact Fist! Blow of Resentment"
+	},
+	1025{
+		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
+		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
+		specialName: "Eight-Impact Fist! Blow of Resentment"
 	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index 3d3dc0ddf..0b0ee2a4c 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1022,17 +1022,16 @@ window.families = [
 	"Sugar",
 	"Monkey D. Luffy",
 	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
+	"Don Chinjao",
+	"Don Chinjao",
+	"Blue Gilly",
+	"Blue Gilly",
+	"Funk Brothers",
+	"Funk Brothers",
+	"Hajrudin",
+	"Hajrudin",
+	"Abdullah and Jeet",
+	"Abdullah and Jeet",
+	"Bartomoleo",
+	"Bartomoleo"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index cd6fdafd8..959f29812 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1023,15 +1023,15 @@ window.units = [
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
     [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Don Chinjao, the Drill", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Blue Gilly Evolution", "QCK", ["Fighter","Free Spirit"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Blue GIlly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Funk Brothers Evolution", "DEX", ["Fighter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", ["Fighter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Hajrudin Evolution", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Abdullah and Jeet Evolution", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Bartoloemo", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Bartoloemo Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
 	];

From 646ae6774a30ffaa7bfb02ab961c114df7fbfdc6 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 26 Apr 2016 03:59:15 -0500
Subject: [PATCH 0321/1569] colons

---
 common/data/details.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6d9b64972..57317e5da 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4854,17 +4854,17 @@ window.details = {
 		specialName: "Blacksmithing Measurement: Double Slash",
         specialNotes: "#{fixed}"
 	},
-	1022:{
+	1022: {
 		captain: "Boosts ATK of all characters by 2x and boosts amount of beli received by 1.2x",
 		special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
 		specialName: "Gum-Gum Gigant Rifle: New Star"
 	},
-	1024{
+	1024: {
 		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
 		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
-	1025{
+	1025: {
 		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
 		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
 		specialName: "Eight-Impact Fist! Blow of Resentment"

From e0876440a9821a6f0c45c6054c58db167e1a8814 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 26 Apr 2016 14:34:08 +0200
Subject: [PATCH 0322/1569] Sakura Sugar

---
 common/data/aliases.js    | 28 ++++++++++++++--------------
 common/data/captains.js   |  8 ++++++++
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 12 ++++++++++++
 common/data/evolutions.js |  2 +-
 common/data/matchers.js   | 18 ++++++------------
 common/data/units.js      | 18 +++++++++---------
 index.html                |  8 ++++----
 8 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index a92c2cb66..b08394d6c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -288,7 +288,7 @@ window.aliases = {
     287: ['狙撃隊　武装隊員 イエローパイレーツ',''],
     288: ['狙撃隊　武装隊員 ブラックパイレーツ',''],
     289: ['砲撃手　敏腕',''],
-    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）','','mr 13 and ms friday the unluckies'],
+    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）','','Mr 13 and Ms Friday the Unluckies'],
     291: ['ドリー',''],
     292: ['ブロギー',''],
     293: ['トリケラトプス',''],
@@ -381,8 +381,8 @@ window.aliases = {
     380: ['クンフージュゴン 兄弟弟子',''],
     381: ['バナナワニ',''],
     382: ['サンドラ大トカゲ',''],
-    383: ['Mr.0 バロックワークス社長','', 'Crocodile', 'mr 0' ],
-    384: ['サー・クロコダイル','', 'Strikerdile', 'Impactdile', 'mr 0','mr. 0' ],
+    383: ['Mr.0 バロックワークス社長','', 'Crocodile', 'Mr 0' ],
+    384: ['サー・クロコダイル','', 'Strikerdile', 'Impactdile', 'Mr 0','Mr. 0' ],
     385: ['ホグバック',''],
     386: ['ドクトル・ホグバック',''],
     387: ['シンドリーちゃん',''],
@@ -399,8 +399,8 @@ window.aliases = {
     398: ['Mr.4と犬銃ラッスー','','Mr 4 and Lassoo the Dog-Gun'],
     399: ['ミス・ダブルフィンガー',''],
     400: ['ミス・ダブルフィンガー 棘（とげ）人間',''],
-    401: ['Mr.1','','mr 1','daz bones'],
-    402: ['Mr.1 全身刃物人間','','mr 1','daz bones'],
+    401: ['Mr.1','','mr 1','Daz Bones'],
+    402: ['Mr.1 全身刃物人間','','Mr 1','Daz Bones'],
     403: ['レベッカ',''],
     404: ['アブサロム',''],
     405: ['墓場のアブサロム',''],
@@ -507,9 +507,9 @@ window.aliases = {
     506: ['ペル アラバスタの守護神ファルコン',''],
     507: ['チャカ',''],
     508: ['チャカ アラバスタの守護神ジャッカル',''],
-    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長','','mr 0', 'Mr. 0','crocodile'],
-    510: ['最強の囚人サー・クロコダイル 元王下七武海','','mr 0','mr. 0'],
-    511: ['服役囚ダズ・ボーネス Mr.1','','mr 1','daz bones'],
+    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長','','Mr 0', 'Mr. 0','Crocodile'],
+    510: ['最強の囚人サー・クロコダイル 元王下七武海','','Mr 0','Mr. 0'],
+    511: ['服役囚ダズ・ボーネス Mr.1','','Mr 1','Daz Bones'],
     512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
     513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
     514: ['ニコ・ロビン トロピカル',''],
@@ -832,7 +832,7 @@ window.aliases = {
     831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
     832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia' ],
     833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia' ],
-    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'mr 7 and miss fathers day'],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day'],
     835: ['暴君バーソロミュー・くま',''],
     836: ['暴君バーソロミュー・くま 政府の人間兵器',''],
     837: ['シーザー・クラウン',''],
@@ -1013,11 +1013,11 @@ window.aliases = {
 	1012: ['ヘビー総裁',''],
 	1013: ['ホットドッグ将軍',''],
 	1014: ['トニートニー・チョッパー 動物王',''],
-	1015: ['',''],
-	1016: ['',''],
-	1017: ['',''],
-	1018: ['',''],
-	1019: ['',''],
+	1015: ['カポネ・ベッジ ファイアタンク海賊団船長',''],
+	1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長',''],
+	1017: ['茶ひげ',''],
+	1018: ['茶ひげ ワニのケンタウロス',''],
+	1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長',''],
 	1020: ['','','Sakura Sugar'],
 	1021: ['','','Sakura Sugar'],
 	1022: ['','','Anniversary Luffy'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 5363bdfdc..6d1fdf76e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2452,5 +2452,13 @@ window.captains = {
     1018: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1020: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1021: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ce2f9e201..2dcd1bd19 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1018,8 +1018,8 @@ window.cooldowns = [
 	[ 26, 14 ],
 	[ 26, 14 ],
 	[ 16, 12],
-	null,
-	null,
+	[ 13, 13],
+	[ 13, 13],
 	[ 15, 15 ],
 	null,
 	null,
diff --git a/common/data/details.js b/common/data/details.js
index 57317e5da..aa4c95ecd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4854,6 +4854,18 @@ window.details = {
 		specialName: "Blacksmithing Measurement: Double Slash",
         specialNotes: "#{fixed}"
 	},
+    1020: {
+        captain: "Boosts ATK and RCV of Shooter and Cerebral characters by 1.5x.",
+        captainNotes: "This effect does not stack for units that have both classes.",
+        specialName: "Sweet Fruit Trap",
+        special: "Recovers 9x characters RCV in HP. Changes captain's orb into Matching orb"
+    },
+    1021: {
+        captain: "Boosts ATK and RCV of Shooter and Cerebral characters by 1.75x.",
+        captainNotes: "This effect does not stack for units that have both classes.",
+        specialName: "Sweet Fruit Trap",
+        special: "Recovers 9x characters RCV in HP. Changes captain's orb into Matching orb"
+    },
 	1022: {
 		captain: "Boosts ATK of all characters by 2x and boosts amount of beli received by 1.2x",
 		special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 17f6fdde4..b7c26f1e3 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1517,7 +1517,7 @@ window.evolutions = {
     },
 	1020: {
 		evolution: 1021,
-        evolvers: []
+        evolvers: [ 117, 85, 88, 96, 99 ]
 	},
 	1024: {
 		evolution: 1025,
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 5f86786c3..1a709be2d 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -232,6 +232,12 @@ window.matchers = [
         target: 'special',
         matcher: /delays/i
     },
+    
+    {
+        name: 'Single-target damage dealer',
+        target: 'special',
+        matcher: /deals.+to one enemy/i
+    },
 
     {
         name: 'Multi-target damage dealers',
@@ -352,18 +358,6 @@ window.matchers = [
 		target: 'special',
 		matcher: /reduces special cooldown/i
 	},
-    
-    {
-        name: 'Single target damage dealer',
-        target: 'special',
-        matcher: /deals.+to one enemy/i
-    },
-    
-    {
-        name: 'Multi target damage dealer',
-        target: 'special',
-        matcher: /deals.+to all enemies/i
-    },
 	
 	{
 		name: 'Numbness reducers',
diff --git a/common/data/units.js b/common/data/units.js
index 959f29812..9f69baf9f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1005,21 +1005,21 @@ window.units = [
 	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Fighter", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
 	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
 	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
-    [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, null, 67, 37, 55, 884, 428, 204, null],
-    [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, null, 831, 366, 162, 1660, 869, 384, null],
+    [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, 392109, 67, 37, 55, 884, 428, 204, 1],
+    [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, 3000000, 831, 366, 162, 1660, 869, 384, 1],
 	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
     [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
     [ "Count Butler (Ruling Power)", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
     [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
     [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
-	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, 4, 2, 70, null, 494, 313, 80, null, null, null, null],
-	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, null, 900, 688, 197, 1903, 1361, 379, null],
-	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, null, 230, 101, 33, null, null, null, null],
-	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, null, 1127, 444, 90, 2500, 1000, 220, null],
-	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, null, 155, 93, 40, 1184, 720, 280, null],
-    [ "Sakura Sugar", "INT", ["Shooter","Cerebral"], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Sakura Sugar Evolution", "INT", ["Shooter","Cerebral"], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
+	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
+	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
+	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
+	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
+	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
+    [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, null, null, null, null, 799, 355, 249, null],
+    [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
     [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
diff --git a/index.html b/index.html
index 8dddf5a66..f7a4a1f85 100644
--- a/index.html
+++ b/index.html
@@ -57,17 +57,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>25/04/2016</p>
+            <p>26/04/2016</p>
             <br>
             <ul>
                 <li>New Sugofest Units!</li>
                 <li>Prototypes added, will update</li>
-				<li> upon character release on 5/1</li>
+				<li>Upon character release on 5/1</li>
                 <br>
                 <li>Small improvements to search functions</li>
                 <br>
-                <li>Colosseum Units flagged properly</li>
-                <li>"All Difficulties" if drops are the same</li>
+                <li>Sakura Sugar almost complete</li>
+                <li>Few new Images added</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
 

From 1e5c097ee7634ff7ad7b16bc20c9dd23afaaa8e4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 26 Apr 2016 11:20:05 -0500
Subject: [PATCH 0323/1569] Tansui & Robson bugs

specials.js wrong
---
 common/data/specials.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 303454d7e..8d4a88a77 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -830,7 +830,7 @@ window.specials = {
 		def: function() { return 0.5; }
 	},
 	853: {
-		atk: function(p) { return p.unit.class("Tough") || p.unit.class.has("Fighter") ? 1.2 : 1; },
+		atk: function(p) { return p.unit.class.has("Tough") || p.unit.class.has("Fighter") ? 1.2 : 1; },
 		type: "class"
 	},
 	857: {
@@ -1119,7 +1119,8 @@ window.specials = {
 		type: "condition"
 	},
 	956: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.2 : 1; }
+		atk: function(p) { return p.unit.class.has("Tough") ? 1.2 : 1; },
+		type: "class"
 	},
 	961: {
 		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }

From 8e227b9cad48c9a98b58e3b07304dfa125245aaf Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 26 Apr 2016 23:36:50 -0500
Subject: [PATCH 0324/1569] Sugo updates

---
 common/data/details.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index aa4c95ecd..5af341667 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4710,11 +4710,11 @@ window.details = {
         captain: "Boosts ATK of Tough characters by 2x",
         special: [
 			{
-				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching.",
+				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching orbs.",
 				"cooldown": 11
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching.",
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching orbs.",
 				"cooldown": 20
 			}
 		],
@@ -4726,11 +4726,11 @@ window.details = {
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         special: [
 			{
-				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching.",
+				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching orbs.",
 				"cooldown": 11
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching.",
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching orbs.",
 				"cooldown": 20
 			}
 		],
@@ -4880,5 +4880,13 @@ window.details = {
 		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
 		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
+	},
+	1026: {
+		specialName: "Shooting Moon",
+		special: "Changes both Captain orbs into Matching orbs, and switches orbs between slots three times"
+	},
+	1027: {
+		specialName: "Shooting Moon",
+		special: "Changes both Captain orbs into Matching orbs, and switches orbs between slots three times"
 	}
 };

From 1aa29b229b6ec97bea162ce21db7a8ac7b541065 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 26 Apr 2016 23:39:25 -0500
Subject: [PATCH 0325/1569] Pica consistency

like a rock
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 5af341667..da08d653d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4333,11 +4333,11 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 10%",
+				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts enemy HP by 20%",
+				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 31, 17 ]
 			}
 		],

From 8df5e927bb41f9b2ce133648f7413498f7c6c904 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 27 Apr 2016 10:14:34 -0500
Subject: [PATCH 0326/1569] global flags & small fixes

perona reworded
---
 common/data/details.js | 10 +++++-----
 common/data/drops.js   |  3 ++-
 common/data/flags.js   |  4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index da08d653d..407d154bf 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1510,15 +1510,15 @@ window.details = {
 		captain: "Boosts ATK by 2.75x following a chain of DEX > INT > QCK attacks no lower than Good"
 	},
 	391: {
-		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, deals 1,000 fixed damage to all enemies at the end of the following turn",
+		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
 		specialName: "Negative Hollow",
-		specialNotes: "#{fixed}",
+		specialNotes: "#{poison}",
 		captain: "Boosts RCV of DEX characters by 1.5x"
 	},
 	392: {
-		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, deals 1,000 fixed damage to all enemies at the end of the following turn",
+		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
 		specialName: "Negative Hollow",
-		specialNotes: "#{fixed}",
+		specialNotes: "#{poison}",
 		captain: "Boosts RCV of DEX characters by 2x"
 	},
 	393: {
@@ -4887,6 +4887,6 @@ window.details = {
 	},
 	1027: {
 		specialName: "Shooting Moon",
-		special: "Changes both Captain orbs into Matching orbs, and switches orbs between slots three times"
+		special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
 	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 90792d247..f51e11d6e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -819,8 +819,9 @@ window.drops = {
         },
 
         {
-            name: 'Keimi and Hachi\'s Takoyaki Shop!',
+            name: 'Camie and Hachi\'s Takoyaki Shop!',
             thumb: 635,
+			global: true,
             condition: 'No Units above the cost of 49 is allowed',
 			challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, 1x Orb Matching Forbidden Tome']],
diff --git a/common/data/flags.js b/common/data/flags.js
index d5878fb36..b4cfa2262 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -626,6 +626,10 @@ window.flags = {
 	631: { global: 1 },
 	632: { global: 1 },
 	633: { global: 1 },
+	634: { global: 1 },
+	635: { global: 1 },
+	636: { global: 1 },
+	637: { global: 1 },
 	638: { rr: 1, rro: 1, global: 1 },
 	639: { rr: 1, rro: 1, global: 1 },
 	640: { rr: 1, rro: 1, global: 1 },

From 66ea1c24412bdfbc6da4468ef888eb02352b9e62 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 27 Apr 2016 13:36:27 -0500
Subject: [PATCH 0327/1569] typo

bartolomeo
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 9f69baf9f..98c5e55c3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1032,8 +1032,8 @@ window.units = [
     [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Bartoloemo", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Bartoloemo Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
+    [ "bartolomeo", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "bartolomeo Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
 	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]

From 18c3147bdc07f38af052b129c95ab63d5d061564 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 28 Apr 2016 21:11:53 +0200
Subject: [PATCH 0328/1569] Barto Fix + Funk Special

---
 common/data/details.js | 15 +++++++++++++--
 common/data/units.js   |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 407d154bf..1ced9bb57 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4883,10 +4883,21 @@ window.details = {
 	},
 	1026: {
 		specialName: "Shooting Moon",
-		special: "Changes both Captain orbs into Matching orbs, and switches orbs between slots three times"
+		special: "Changes Captain orb into Matching orbs, and switches orbs between slots three times"
 	},
 	1027: {
 		specialName: "Shooting Moon",
 		special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
-	}
+	},
+    1028: {
+        specialName: "Rah-Rah-Rah Rampage",
+        special: "Deals random damage to all enemies, boost ATK past a certain number of hits for multiple turns.",
+        specialNotes: "Buffalo's Captain as a Special essentially"
+    
+    },
+    1029: {
+        specialName: "Rah-Rah-Rah Rampage",
+        special: "Deals random damage to all enemies, boost ATK past a certain number of hits for multiple turns.",
+        specialNotes: "Buffalo's Captain as a Special essentially"
+    }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 98c5e55c3..77c103baa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1032,8 +1032,8 @@ window.units = [
     [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
     [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "bartolomeo", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "bartolomeo Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
+    [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Bartolomeo Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
 	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]

From 3a3b74b52b32c5b681bc568a1a2eafe3f265adac Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 29 Apr 2016 11:12:58 +0200
Subject: [PATCH 0329/1569] Hajrudin Special + Drop Page regex improvements

---
 common/data/details.js | 10 ++++++++++
 common/data/drops.js   |  9 ++++++++-
 drops/index.js         |  4 ++--
 index.html             |  3 ++-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 1ced9bb57..f6d3cc4bb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4899,5 +4899,15 @@ window.details = {
         specialName: "Rah-Rah-Rah Rampage",
         special: "Deals random damage to all enemies, boost ATK past a certain number of hits for multiple turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
+    },
+    1030: {
+        specialName: "Hero's Gungnir",
+        special: "Reduces crew's HP to 1, deals damage to one enemy depending on the amount of HP removed. Boosts ATK.",
+        specialNotes: "We do not know the ATK boost or the Damage just yet. Will be added when the unit releases."
+    },
+    1031: {
+        specialName: "Hero's Gungnir",
+        special: "Reduces crew's HP to 1, deals damage to one enemy depending on the amount of HP removed. Boosts ATK.",
+        specialNotes: "We do not know the ATK boost or the Damage just yet. Will be added when the unit releases."
     }
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index f51e11d6e..89ee6a66e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -993,7 +993,14 @@ window.drops = {
 			thumb: 1011,
 			condition: "None",
 			"All Difficulties": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
-		}
+		},
+        
+        {
+            name: "Temptation!? The Queen of Kamabakka Queendom!",
+            thumb: null,
+            condition: "None so far",
+            "All Dificulties": [ -874, -876, -878, -554, -813, -814, -566]
+        }
 
     ],
 
diff --git a/drops/index.js b/drops/index.js
index b5fe2c8af..c323951f9 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -37,7 +37,7 @@ app.controller('MainCtrl',function($scope, $rootScope, $timeout, $controller) {
 
     //Use URI for one time search
     if(searchQuery!=""){
-        $scope.query = Utils.getRegex(decodeURI(searchQuery.replace(/Adrift!?|%20Fortnight|%20Raid/g,"")));
+        $scope.query = Utils.getRegex(decodeURI(searchQuery.replace(/!\?%20The%20Secret%20Flower%20Garden|Temptation!\?%20|Clash!(!|\?)%20|Adrift!?|%20Fortnight|%20Raid/g,"")));
     }
     
     $controller('DismissalCtrl');
@@ -249,5 +249,5 @@ function updateTimes(){
 }
 window.onload = function() {
     //Also add the URI Search into the Search Bar
-    document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/Adrift!?|%20Fortnight|%20Raid/g,""));
+    document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/!\?%20The%20Secret%20Flower%20Garden|Temptation!\?%20|Clash!(!|\?)%20|Adrift!?|%20Fortnight|%20Raid/g,""));
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index f7a4a1f85..5642ee9c5 100644
--- a/index.html
+++ b/index.html
@@ -57,7 +57,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>26/04/2016</p>
+            <p>29/04/2016</p>
             <br>
             <ul>
                 <li>New Sugofest Units!</li>
@@ -65,6 +65,7 @@
 				<li>Upon character release on 5/1</li>
                 <br>
                 <li>Small improvements to search functions</li>
+                <li>Link to drop page should now work for everything</li>
                 <br>
                 <li>Sakura Sugar almost complete</li>
                 <li>Few new Images added</li>

From 6b8047acb62065f5a94937f6e635b232cf8b3a91 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 29 Apr 2016 11:21:30 +0200
Subject: [PATCH 0330/1569] More regex improvement

Why not just escape the additional questionmark?
---
 drops/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drops/index.js b/drops/index.js
index c323951f9..0d0ac298d 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -37,7 +37,7 @@ app.controller('MainCtrl',function($scope, $rootScope, $timeout, $controller) {
 
     //Use URI for one time search
     if(searchQuery!=""){
-        $scope.query = Utils.getRegex(decodeURI(searchQuery.replace(/!\?%20The%20Secret%20Flower%20Garden|Temptation!\?%20|Clash!(!|\?)%20|Adrift!?|%20Fortnight|%20Raid/g,"")));
+        $scope.query = Utils.getRegex(decodeURI(searchQuery.replace(/%20Fortnight|%20Raid/g,"").replace(/\?/,"\\?")));
     }
     
     $controller('DismissalCtrl');
@@ -249,5 +249,5 @@ function updateTimes(){
 }
 window.onload = function() {
     //Also add the URI Search into the Search Bar
-    document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/!\?%20The%20Secret%20Flower%20Garden|Temptation!\?%20|Clash!(!|\?)%20|Adrift!?|%20Fortnight|%20Raid/g,""));
+    document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/%20Fortnight|%20Raid/g,"").replace(/\?/,"\\?"));
 }
\ No newline at end of file

From c2dc542b812c6f24d07435d8fcf05844c803aa18 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 29 Apr 2016 09:44:14 -0500
Subject: [PATCH 0331/1569] cooldowns

updated
---
 common/data/cooldowns.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 2dcd1bd19..c62c3960a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -826,8 +826,8 @@ window.cooldowns = [
 	[ 20, 12 ],
 	[ 16, 9 ],
 	[ 25, 18 ],
-	null,
-	null,
+	[ 10, 10 ],
+	[ 10, 10 ],
 	[ 24, 12 ],
 	[ 24, 12 ],
 	[ 28, 18 ],
@@ -962,10 +962,10 @@ window.cooldowns = [
 	[ 16, 8 ],
 	[ 16, 8 ],
 	23,
-	23,
-	23,
+	[ 23, 17 ],
+	[ 23, 17 ],
 	25,
-	21,
+	[ 21, 15 ],
 	[ 28, 20 ],
 	[ 28, 20 ],
 	[ 28, 20 ],
@@ -988,8 +988,8 @@ window.cooldowns = [
 	null,
     null,
 	[ 19, 12 ],
-	15,
-	15,
+	[ 15, 9 ],
+	[ 15, 9 ],
 	20,
 	20,
 	null, //Violet

From d3b901e6245298b6f7689a22cdf12f4708fdbebd Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sat, 30 Apr 2016 03:38:13 -0500
Subject: [PATCH 0332/1569] Abdullah & Jeet

special
---
 common/data/details.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f6d3cc4bb..98b026c5c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3740,13 +3740,13 @@ window.details = {
 	835: {
 		captain: "Boosts ATK and HP of Cerebral characters by 2x",
 		specialName: "Thrust Pad Cannon",
-		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
+		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{orb : 1.75x}"
 	},
 	836: {
 		captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in STR damage to all enemies at the end of each turn",
 		specialName: "Thrust Pad Cannon",
-		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
+		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{orb : 1.75x}"
 	},
 	837: {
@@ -4909,5 +4909,15 @@ window.details = {
         specialName: "Hero's Gungnir",
         special: "Reduces crew's HP to 1, deals damage to one enemy depending on the amount of HP removed. Boosts ATK.",
         specialNotes: "We do not know the ATK boost or the Damage just yet. Will be added when the unit releases."
-    }
+    },
+	1032: {
+		special: "Reduces Special Cooldown of Shooters and Strikers by 1 turn. For Shooters and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+		specialName: "Surprise Pincer Attack",
+		specialNotes: "Rough translation, a proper translation will be put in once characters are released"
+	},
+	1033: {
+		special: "Reduces Special Cooldown of Shooters and Strikers by 1 turn. For Shooters and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+		specialName: "Surprise Pincer Attack",
+		specialNotes: "Rough translation, a proper translation will be put in once characters are released"
+	}
 };

From e629aac0ab933c0f602c58f1eea410c04a350e76 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 1 May 2016 04:54:12 -0500
Subject: [PATCH 0333/1569] New Sugo units!

level 1 stats & captains (XFTS help verify)
---
 common/data/cooldowns.js | 24 ++++++++++++------------
 common/data/details.js   | 35 +++++++++++++++++++++++++++++------
 common/data/units.js     | 24 ++++++++++++------------
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c62c3960a..a9feeb15f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1022,16 +1022,16 @@ window.cooldowns = [
 	[ 13, 13],
 	[ 15, 15 ],
 	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null
+	19,
+	19,
+	18,
+	18,
+	18,
+	18,
+	23,
+	23,
+	11,
+	11,
+	23,
+	23
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 98b026c5c..d819ddcaf 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4872,52 +4872,75 @@ window.details = {
 		specialName: "Gum-Gum Gigant Rifle: New Star"
 	},
 	1024: {
+		captain: "Boosts ATK of Tough characters by 2x",
 		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
 		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
 	1025: {
+		captain: "Boosts ATK of Tough and Striker characters by 2x",
 		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
 		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
 	1026: {
+		captain: "Boosts ATK and RCV of Fighters by 2x",
 		specialName: "Shooting Moon",
-		special: "Changes Captain orb into Matching orbs, and switches orbs between slots three times"
+		special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
 	},
 	1027: {
+		captain: "Boosts ATK and RCV of Fighters by 2x",
 		specialName: "Shooting Moon",
 		special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
 	},
     1028: {
+		captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain",
         specialName: "Rah-Rah-Rah Rampage",
-        special: "Deals random damage to all enemies, boost ATK past a certain number of hits for multiple turns.",
+        special: "Deals random damage to all enemies, boost ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
-    
     },
     1029: {
+		captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain",
         specialName: "Rah-Rah-Rah Rampage",
-        special: "Deals random damage to all enemies, boost ATK past a certain number of hits for multiple turns.",
+        special: "Deals random damage to all enemies, boost ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
     },
     1030: {
+		captain: "Boosts ATK of Tough characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
         special: "Reduces crew's HP to 1, deals damage to one enemy depending on the amount of HP removed. Boosts ATK.",
         specialNotes: "We do not know the ATK boost or the Damage just yet. Will be added when the unit releases."
     },
     1031: {
+		captain: "Boosts ATK of Tough characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
         special: "Reduces crew's HP to 1, deals damage to one enemy depending on the amount of HP removed. Boosts ATK.",
         specialNotes: "We do not know the ATK boost or the Damage just yet. Will be added when the unit releases."
     },
 	1032: {
-		special: "Reduces Special Cooldown of Shooters and Strikers by 1 turn. For Shooters and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+		captain: "Reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight and...",
+		special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
 		specialName: "Surprise Pincer Attack",
 		specialNotes: "Rough translation, a proper translation will be put in once characters are released"
 	},
 	1033: {
-		special: "Reduces Special Cooldown of Shooters and Strikers by 1 turn. For Shooters and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+		captain: "Reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight and...",
+		special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
 		specialName: "Surprise Pincer Attack",
 		specialNotes: "Rough translation, a proper translation will be put in once characters are released"
+	},
+	1034: {
+		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartoloemo, reduces damage received by 30% for that turn.",
+		captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
+		special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
+		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
+		specialName: "Bari Bari No Pistol"
+	},
+	1035: {
+		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartoloemo, reduces damage received by 30% for that turn.",
+		captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
+		special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
+		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
+		specialName: "Bari Bari No Pistol"
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 77c103baa..729ea3e3f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1022,18 +1022,18 @@ window.units = [
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
-    [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Blue GIlly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", ["Fighter","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Bartolomeo Evolution", "STR", ["Striker","Ambition"], 6, 55, null, null, null, null, null, null, null, null, null, null, null]
+    [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, 6, 3, 70, null, 226, 187, 17, null, null, null, null],
+    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1433, 746, 68, null, null, null, null],
+    [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, 6, 3, 70, null, 197, 138, 37, null, null, null, null],
+    [ "Blue GIlly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, 7, 4, 99, null, 1253, 630, 129, null, null, null, null],
+    [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, 5, 3, 70, null, 60, 172, 44, null, null, null, null],
+    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", ["Fighter","Ambition"], 5, 30, 8, 4, 99, null, 1500, 824, 77, 2920, 1250, 226, null],
+    [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, 5, 3, 70, null, 201, 177, 38, null, null, null, null],
+    [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1337, 740, 57, null, null, null, null],
+    [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, 6, 3, 70, null, 143, 143, 52, null, null, null, null],
+    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, null, null, 99, null, null, null, null, null, null, null, null],
+    [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, null, null, null, null],
+    [ "Bartolomeo Evolution", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null]
 	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]

From 3a7b91ff67b31f7444f2c81d819a0f6b1b8a2690 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 1 May 2016 04:59:09 -0500
Subject: [PATCH 0334/1569] Stats

Just need MAX stats now
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 729ea3e3f..99cbcd512 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1031,7 +1031,7 @@ window.units = [
     [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, 5, 3, 70, null, 201, 177, 38, null, null, null, null],
     [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1337, 740, 57, null, null, null, null],
     [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, 6, 3, 70, null, 143, 143, 52, null, null, null, null],
-    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, null, null, 99, null, null, null, null, null, null, null, null],
+    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, 6, 4, 99, null, 920, 673, 156, null, null, null, null],
     [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, null, null, null, null],
     [ "Bartolomeo Evolution", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null]
 	];

From 66ff309d7c1145d3e75398f4c5aab541ee52978c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 1 May 2016 05:22:35 -0500
Subject: [PATCH 0335/1569] Blue Gilly cooldown

updated
---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a9feeb15f..916c7866a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1024,8 +1024,8 @@ window.cooldowns = [
 	null,
 	19,
 	19,
-	18,
-	18,
+	11,
+	11,
 	18,
 	18,
 	23,

From 0fd2d7f1a418f00751571d5830448067efcb2086 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 1 May 2016 13:29:19 +0200
Subject: [PATCH 0336/1569] Specials and Captains

---
 common/data/captains.js | 38 ++++++++++++++++++++++++++++++++++++++
 common/data/details.js  | 36 ++++++++++++++++--------------------
 common/data/specials.js | 36 ++++++++++++++++++++++++++++++++++++
 common/data/units.js    |  8 ++++----
 index.html              | 11 ++++++-----
 5 files changed, 100 insertions(+), 29 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 6d1fdf76e..a74d19ab1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2460,5 +2460,43 @@ window.captains = {
     1021: {
         atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
         rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1022: {
+        atk: function(p) { return 2; }
+    },
+    1024: {
+        atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
+    },
+    1025: {
+        atk: function(p) { return p.unit.class.has("Tough") || p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1026: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    1027: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    1028: {
+        hit: function(n) { return n > 21 ? 2.5 : 1; }
+    },
+    1029: {
+        hit: function(n) {
+			return n > 36 ? 3.5 :
+				n > 21 ? 2.5 : 1;
+		}
+    },
+    1030: {
+        atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    1031: {
+        atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
+    1032: {
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1033: {
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index d819ddcaf..3db031f26 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4873,18 +4873,18 @@ window.details = {
 	},
 	1024: {
 		captain: "Boosts ATK of Tough characters by 2x",
-		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
-		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
+		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
+		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
 	1025: {
 		captain: "Boosts ATK of Tough and Striker characters by 2x",
-		special: "Amplifies the effect of orbs by a large amount for a variable number of turns proportionally to the crew's current HP",
-		specialNotes: "We don't currently know how large the boost is nor do we know how many turns he boosts by. Lower HP = Longer Boost",
+		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
+		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
 	1026: {
-		captain: "Boosts ATK and RCV of Fighters by 2x",
+		captain: "Boosts ATK and RCV of Fighters by 1.5x",
 		specialName: "Shooting Moon",
 		special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
 	},
@@ -4900,7 +4900,7 @@ window.details = {
         specialNotes: "Buffalo's Captain as a Special essentially"
     },
     1029: {
-		captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain",
+		captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain and by 3.5x after the 36th hit",
         specialName: "Rah-Rah-Rah Rampage",
         special: "Deals random damage to all enemies, boost ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
@@ -4908,39 +4908,35 @@ window.details = {
     1030: {
 		captain: "Boosts ATK of Tough characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
-        special: "Reduces crew's HP to 1, deals damage to one enemy depending on the amount of HP removed. Boosts ATK.",
-        specialNotes: "We do not know the ATK boost or the Damage just yet. Will be added when the unit releases."
+        special: "Reduces crew's HP to 1, deals 10x the removed HP as damage to one enemy. Boosts own ATK by 2.25x for 1 turn."
     },
     1031: {
 		captain: "Boosts ATK of Tough characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
-        special: "Reduces crew's HP to 1, deals damage to one enemy depending on the amount of HP removed. Boosts ATK.",
-        specialNotes: "We do not know the ATK boost or the Damage just yet. Will be added when the unit releases."
+        special: "Reduces crew's HP to 1, deals 10x the removed HP as damage to one enemy. Boosts own ATK by 2.25x for 1 turn."
     },
 	1032: {
-		captain: "Reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight and...",
+		captain: "Boosts ATK of Striker and Slasher characters by 1.5x and reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight",
 		special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
-		specialName: "Surprise Pincer Attack",
-		specialNotes: "Rough translation, a proper translation will be put in once characters are released"
+		specialName: "Surprise Pincer Attack"
 	},
 	1033: {
-		captain: "Reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight and...",
+		captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turn at the start of the fight",
 		special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
-		specialName: "Surprise Pincer Attack",
-		specialNotes: "Rough translation, a proper translation will be put in once characters are released"
+		specialName: "Surprise Pincer Attack"
 	},
 	1034: {
-		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartoloemo, reduces damage received by 30% for that turn.",
+		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
 		captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
 		special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
-		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
+		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
 		specialName: "Bari Bari No Pistol"
 	},
 	1035: {
-		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartoloemo, reduces damage received by 30% for that turn.",
+		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
 		captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
 		special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
-		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
+		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
 		specialName: "Bari Bari No Pistol"
 	}
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 8d4a88a77..657a45799 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1208,5 +1208,41 @@ window.specials = {
     1018: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
         type: "class"
+    },
+    1024: {
+        orb: function(p) {
+            if(p.percHP >= 70.0){
+                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25);
+            }else if(p.percHP >= 30.0){
+                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
+            }else{
+                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+            }
+        }
+    },
+    1025: {
+        orb: function(p) {
+            if(p.percHP >= 70.0){
+                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25);
+            }else if(p.percHP >= 30.0){
+                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
+            }else{
+                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+            }
+        }
+    },
+    1028: {
+        //TODO
+       hit: function(n) { return n > 30 ? 1.75 : 1; } 
+    },
+    1029: {
+        //TODO
+       hit: function(n) { return n > 30 ? 1.75 : 1; } 
+    },
+    1030: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; }
+    },
+    1031: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 99cbcd512..069c53173 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1023,17 +1023,17 @@ window.units = [
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
     [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, 6, 3, 70, null, 226, 187, 17, null, null, null, null],
-    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1433, 746, 68, null, null, null, null],
+    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null],
     [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, 6, 3, 70, null, 197, 138, 37, null, null, null, null],
-    [ "Blue GIlly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, 7, 4, 99, null, 1253, 630, 129, null, null, null, null],
+    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, 7, 4, 99, null, 1253, 630, 129, null, null, null, null],
     [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, 5, 3, 70, null, 60, 172, 44, null, null, null, null],
     [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", ["Fighter","Ambition"], 5, 30, 8, 4, 99, null, 1500, 824, 77, 2920, 1250, 226, null],
     [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, 5, 3, 70, null, 201, 177, 38, null, null, null, null],
-    [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1337, 740, 57, null, null, null, null],
+    [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1337, 740, 57, 2700, 1402, 205, null],
     [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, 6, 3, 70, null, 143, 143, 52, null, null, null, null],
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, 6, 4, 99, null, 920, 673, 156, null, null, null, null],
     [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, null, null, null, null],
-    [ "Bartolomeo Evolution", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null]
+    [ "Bartolomeo the Cannibal", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null]
 	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
diff --git a/index.html b/index.html
index 5642ee9c5..c30981246 100644
--- a/index.html
+++ b/index.html
@@ -57,15 +57,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>29/04/2016</p>
+            <p>01/05/2016</p>
             <br>
             <ul>
                 <li>New Sugofest Units!</li>
-                <li>Prototypes added, will update</li>
-				<li>Upon character release on 5/1</li>
+                <li>Captains and Specials should be complete</li>
+                <li>Stats will be added over the next days as usual</li>
                 <br>
-                <li>Small improvements to search functions</li>
-                <li>Link to drop page should now work for everything</li>
+                <li>Bartolomeo Captain and Funk Brothers Special</li>
+                <li>Need more work to be implemented</li>
+                <li>into the calculator</li>
                 <br>
                 <li>Sakura Sugar almost complete</li>
                 <li>Few new Images added</li>

From 3ebae3e3c5eb8ae3e3abcc60dc4655933ebdec31 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 2 May 2016 09:33:43 -0500
Subject: [PATCH 0337/1569] perona/sanji fix

wording to change flags
---
 common/data/details.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3db031f26..459e9279e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1512,13 +1512,13 @@ window.details = {
 	391: {
 		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
 		specialName: "Negative Hollow",
-		specialNotes: "#{poison}",
+		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
 		captain: "Boosts RCV of DEX characters by 1.5x"
 	},
 	392: {
 		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
 		specialName: "Negative Hollow",
-		specialNotes: "#{poison}",
+		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
 		captain: "Boosts RCV of DEX characters by 2x"
 	},
 	393: {
@@ -1752,15 +1752,15 @@ window.details = {
 		captain: "Boosts ATK by 2.25x following a chain of INT > PSY > QCK attacks no lower than Good"
 	},
 	437: {
-		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, deals 1,000 fixed damage to all enemies at the end of the following turn",
+		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
 		specialName: "Negative Horo \"Sweet\"",
-		specialNotes: "#{fixed}",
+		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
 		captain: "Boosts RCV of [DEX] characters by 3x if HP is below 30% at the start of the turn"
 	},
 	438: {
-		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, deals 1,000 fixed damage to all enemies at the end of the following turn",
+		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
 		specialName: "Negative Horo \"Sweet\"",
-		specialNotes: "#{fixed}",
+		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
 		captain: "Boosts RCV of [DEX] characters by 5x if HP is below 30% at the start of the turn"
 	},
 	439: {
@@ -4227,7 +4227,7 @@ window.details = {
 				"cooldown": 25
 			}
 		],
-		captain: "Boosts ATK of Tough characters by 2.25x, their HP by 1.5x, recovers 2x character's RCV in HP at the end of each turn",
+		captain: "Boosts ATK of Tough characters by 2.25x, and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
 		specialNotes: "#{stages}"
 	},
 	913: {

From f298b2645d94b3c7a405a9c5c681450f837a4782 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 2 May 2016 10:47:21 -0500
Subject: [PATCH 0338/1569] Chinjao

changes classes
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 069c53173..ca9846f4d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1023,7 +1023,7 @@ window.units = [
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
     [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, 6, 3, 70, null, 226, 187, 17, null, null, null, null],
-    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null],
+    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Striker"], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null],
     [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, 6, 3, 70, null, 197, 138, 37, null, null, null, null],
     [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, 7, 4, 99, null, 1253, 630, 129, null, null, null, null],
     [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, 5, 3, 70, null, 60, 172, 44, null, null, null, null],

From 62eef552f8def8da5e49d348a43b27cf0e88888e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 2 May 2016 18:46:23 +0200
Subject: [PATCH 0339/1569] New Kama Units + New Unit Changelog

Check out nonSuspicious.js to change which Units are displayed
---
 common/data/drops.js       |  4 ++--
 common/data/evolutions.js  | 10 +++++++++-
 common/data/families.js    |  6 +++++-
 common/data/units.js       |  6 +++++-
 common/js/nonSuspicious.js | 20 +++++++++++++++++++-
 index.css                  | 17 ++++++++++++++++-
 index.html                 | 13 ++++++++++++-
 7 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 89ee6a66e..2050be92b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -998,8 +998,8 @@ window.drops = {
         {
             name: "Temptation!? The Queen of Kamabakka Queendom!",
             thumb: null,
-            condition: "None so far",
-            "All Dificulties": [ -874, -876, -878, -554, -813, -814, -566]
+            condition: "Only DEX/RCV/TND orbs will appear",
+            "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566]
         }
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b7c26f1e3..678d4b04c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1542,5 +1542,13 @@ window.evolutions = {
 	1034: {
 		evolution: 1035,
         evolvers: []
-	}
+	},
+    1036: {
+        evolution: 1037,
+        evolvers: []
+    },
+    1038: {
+        evolution: 1039,
+        evolvers: []
+    }
 };
diff --git a/common/data/families.js b/common/data/families.js
index 0b0ee2a4c..f382416de 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1033,5 +1033,9 @@ window.families = [
 	"Abdullah and Jeet",
 	"Abdullah and Jeet",
 	"Bartomoleo",
-	"Bartomoleo"
+	"Bartomoleo",
+    "Emporio Ivankov",
+    "Emporio Ivankov",
+    "Inazuma",
+    "Inazuma"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index ca9846f4d..b01ef52b7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1033,7 +1033,11 @@ window.units = [
     [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, 6, 3, 70, null, 143, 143, 52, null, null, null, null],
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, 6, 4, 99, null, 920, 673, 156, null, null, null, null],
     [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, null, null, null, null],
-    [ "Bartolomeo the Cannibal", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null]
+    [ "Bartolomeo the Cannibal", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null],
+    [ "New Ivankov", "QCK", ["Free Spirit","Fighter"], 3, 12, null, null, null, null, null, null, null, null, null, null, null],
+    [ "New Ivankov Evolution", "QCK", ["Free Spirit","Fighter"], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
+    [ "New Inazuma", "DEX", ["Free Spirit","Fighter"], 3, 7, null, null, null, null, null, null, null, null, null, null, null],
+    [ "New Inazuma", "DEX", ["Free Spirit","Fighter"], 4, 15, null, null, null, null, null, null, null, null, null, null, null]
 	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 575cbcc01..1154f81a1 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -39,4 +39,22 @@ $(document).keydown(function(e) {
   
   }
 
-});
\ No newline at end of file
+});
+
+window.onload = function() {
+    
+    //Add new Units with Pics here so they show up in the Updates
+    /// Units are about the Max you can add, otherwise you would need to implement another tr for them
+    var newUnits = [ 1011, 1012, 1013, 1014, 1016, 1018, 1019 ];
+
+    for (var i = 0, len = newUnits.length; i < len; i++) {
+        var unit = document.createElement("a");
+        unit.href = "/characters/#/view/"+newUnits[i];
+        unit.className = "slot small";
+        unit.target = "_blank";
+        unit.title = window.units[newUnits[i]-1][0];
+        unit.style = "background-image: url("+Utils.getThumbnailUrl(newUnits[i])+");";
+        
+        document.getElementById("newUnits").appendChild(unit);
+    }
+}
\ No newline at end of file
diff --git a/index.css b/index.css
index d495d60db..0914ea6c4 100644
--- a/index.css
+++ b/index.css
@@ -29,7 +29,7 @@ body {
     float: right;
     bottom: 10;
     right: 10;
-    z-index: -1;
+/*    z-index: -1;*/
 }
 
 #changelog > p {
@@ -111,4 +111,19 @@ body {
 #hide > img {
     margin-top: 15%;
     animation: fa-spin 3s infinite linear;
+}
+
+.slot {
+    display: inline-block;
+}
+
+.slot:hover {
+    outline: 1px solid red;
+}
+
+.slot.small {
+    width: 40px;
+    height: 40px;
+    background-size: 40px 40px;
+    margin: 1px;
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index c30981246..a0f6a7305 100644
--- a/index.html
+++ b/index.html
@@ -24,6 +24,8 @@
         <link rel="stylesheet" type="text/css" href="index.css" />
         <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
         <script src="common/libs/js/jquery.min.js"></script>
+        <script src="common/data/units.js"></script>
+        <script src="common/js/utils.js"></script>
         <script src="common/js/nonSuspicious.js"></script>
         <meta name="viewport" content="initial-scale=1, user-scalable=no, user-scalable=0">
 
@@ -72,8 +74,17 @@
                 <li>Few new Images added</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
-
+                <br>
             </ul>
+            <table id="table">
+                   <p>Recently Completed:</p>
+                    <tbody>
+                        <tr>
+                            <td id="newUnits">
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
         </div>
     </body>
 

From bb2875a136ecdf32e0e2cd3134f0b2d10e0ff4f9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 2 May 2016 12:36:11 -0500
Subject: [PATCH 0340/1569] evolvers

some of them. Brownbeard added
---
 common/data/evolutions.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 678d4b04c..45e534131 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1515,6 +1515,10 @@ window.evolutions = {
         evolution: 1016,
         evolvers: [ 82, 266, 88, 304, 104 ]
     },
+	1017: {
+		evolution: 1018,
+        evolvers: [ 117, 81, 87, 98, 103 ]
+	}
 	1020: {
 		evolution: 1021,
         evolvers: [ 117, 85, 88, 96, 99 ]
@@ -1529,11 +1533,11 @@ window.evolutions = {
 	},
 	1028: {
 		evolution: 1029,
-        evolvers: []
+        evolvers: [ 118, 84, 86, 100, 102 ]
 	},
 	1030: {
 		evolution: 1031,
-        evolvers: []
+        evolvers: [ 83, 87, 98, 303, 103 ]
 	},
 	1032: {
 		evolution: 1033,
@@ -1549,6 +1553,6 @@ window.evolutions = {
     },
     1038: {
         evolution: 1039,
-        evolvers: []
+        evolvers: [ 118, 84, 266, 300, 267 ]
     }
 };

From 4752cccbba7142cab61506b8c62deb576fe3dedd Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 2 May 2016 12:38:03 -0500
Subject: [PATCH 0341/1569] comma

,
---
 common/data/evolutions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 45e534131..2b75e7cf2 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1518,7 +1518,7 @@ window.evolutions = {
 	1017: {
 		evolution: 1018,
         evolvers: [ 117, 81, 87, 98, 103 ]
-	}
+	},
 	1020: {
 		evolution: 1021,
         evolvers: [ 117, 85, 88, 96, 99 ]

From 67919f810f1b2ec15a6f20adef70b1d1743dc992 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 2 May 2016 16:50:35 -0500
Subject: [PATCH 0342/1569] stats

need evos
---
 common/data/units.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index b01ef52b7..7e887426c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1022,17 +1022,17 @@ window.units = [
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
-    [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, 6, 3, 70, null, 226, 187, 17, null, null, null, null],
+    [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, 6, 3, 70, null, 226, 187, 17, 1505, 808, 100, null],
     [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Striker"], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null],
-    [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, 6, 3, 70, null, 197, 138, 37, null, null, null, null],
-    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, 7, 4, 99, null, 1253, 630, 129, null, null, null, null],
-    [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, 5, 3, 70, null, 60, 172, 44, null, null, null, null],
+    [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, 6, 3, 70, null, 197, 138, 37, 1329, 688, 160, null],
+    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, 7, 4, 99, null, 1253, 630, 129, 2555, 1300, 279, null],
+    [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, 5, 3, 70, null, 60, 172, 44, 937, 824, 109, null],
     [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", ["Fighter","Ambition"], 5, 30, 8, 4, 99, null, 1500, 824, 77, 2920, 1250, 226, null],
-    [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, 5, 3, 70, null, 201, 177, 38, null, null, null, null],
+    [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, 5, 3, 70, null, 201, 177, 38, 1403, 795, 116, null],
     [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1337, 740, 57, 2700, 1402, 205, null],
-    [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, 6, 3, 70, null, 143, 143, 52, null, null, null, null],
-    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, 6, 4, 99, null, 920, 673, 156, null, null, null, null],
-    [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, null, null, null, null],
+    [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, 6, 3, 70, null, 143, 143, 52, 969, 722, 206, null],
+    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, 6, 4, 99, null, 920, 673, 156, 1970, 1346, 344, null],
+    [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null],
     [ "Bartolomeo the Cannibal", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null],
     [ "New Ivankov", "QCK", ["Free Spirit","Fighter"], 3, 12, null, null, null, null, null, null, null, null, null, null, null],
     [ "New Ivankov Evolution", "QCK", ["Free Spirit","Fighter"], 4, 20, null, null, null, null, null, null, null, null, null, null, null],

From 84f08171a9641a0c8b381763c0de13607a3765c5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 3 May 2016 11:31:05 +0200
Subject: [PATCH 0343/1569] Ivankov + Inazuma

---
 common/data/captains.js   | 21 ++++++++++++++++++++-
 common/data/details.js    | 25 +++++++++++++++++++++++--
 common/data/events.js     | 20 ++++++++++++++++++++
 common/data/evolutions.js |  4 ++--
 common/data/units.js      |  8 ++++----
 index.html                | 11 +++++++----
 6 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a74d19ab1..f0e5bc7ca 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2468,7 +2468,8 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
     },
     1025: {
-        atk: function(p) { return p.unit.class.has("Tough") || p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1026: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -2498,5 +2499,23 @@ window.captains = {
     },
     1033: {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
+    },
+    1036: {
+		hitAtk: function(p) {
+			return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+    1037: {
+		hitAtk: function(p) {
+			return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+    1038: {
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    1039: {
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index 459e9279e..693bb9e88 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4878,7 +4878,8 @@ window.details = {
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
 	1025: {
-		captain: "Boosts ATK of Tough and Striker characters by 2x",
+		captain: "Boosts ATK of Tough characters by 2x and boosts the HP of Striker characters by 2x",
+        captainNotes: "A character with both classes will get both boosts",
 		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
 		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
@@ -4938,5 +4939,25 @@ window.details = {
 		special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
 		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
 		specialName: "Bari Bari No Pistol"
-	}
+	},
+    1036: {
+        captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
+        special: "Deals 13x ATK in QCK Damage to one Enemy, Changes Orbs depending on the current HP",
+        specialNotes: "HP>99%: Middle Left and Bottom Left Orbs to matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
+    },
+    1037: {
+        captain: "Boosts ATK of Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
+        special: "Deals 13x ATK in QCK Damage to one Enemy, Changes Orbs depending on the current HP",
+        specialNotes: "HP>99%: Middle Left and Bottom Left Orbs to matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
+    },
+    1038: {
+        captain: "Boosts ATK and RCV of [DEX] and [QCK] units by 1.2x",
+        special: "Switch orbs between slots once, recover a small amount of health",
+        specialNotes: "The Heal amount will be updated once we figure it out"
+    },
+    1039: {
+        captain: "Boosts ATK and RCV of [DEX] and [QCK] units by 1.5x",
+        special: "Switch orbs between slots once, recover a small amount of health",
+        specialNotes: "The Heal amount will be updated once we figure it out"
+    }
 };
diff --git a/common/data/events.js b/common/data/events.js
index 20c79c819..167407e76 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -28,5 +28,25 @@ window.events = {
             if (--$scope.options.gOrbsEnabled === 0)
                 $scope.notify({ text: 'Disabling [G] orbs support.' });
         }
+    },
+    1036: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1037: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
     }
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 2b75e7cf2..1ae4b79d1 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1549,10 +1549,10 @@ window.evolutions = {
 	},
     1036: {
         evolution: 1037,
-        evolvers: []
+        evolvers: [ 117, 79, 85, 96, 101]
     },
     1038: {
         evolution: 1039,
-        evolvers: [ 118, 84, 266, 300, 267 ]
+        evolvers: [ 90, 91, 96, 97 ]
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 7e887426c..557c6c9af 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1034,10 +1034,10 @@ window.units = [
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, 6, 4, 99, null, 920, 673, 156, 1970, 1346, 344, null],
     [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null],
     [ "Bartolomeo the Cannibal", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null],
-    [ "New Ivankov", "QCK", ["Free Spirit","Fighter"], 3, 12, null, null, null, null, null, null, null, null, null, null, null],
-    [ "New Ivankov Evolution", "QCK", ["Free Spirit","Fighter"], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
-    [ "New Inazuma", "DEX", ["Free Spirit","Fighter"], 3, 7, null, null, null, null, null, null, null, null, null, null, null],
-    [ "New Inazuma", "DEX", ["Free Spirit","Fighter"], 4, 15, null, null, null, null, null, null, null, null, null, null, null]
+    [ "New Ivankov", "QCK", ["Free Spirit","Fighter"], 3, 12, null, null, null, null, 161, 39, 39, null, null, null, null],
+    [ "New Ivankov Evolution", "QCK", ["Free Spirit","Fighter"], 4, 20, null, null, 99, null, null, null, null, null, null, null, null],
+    [ "New Inazuma", "DEX", ["Free Spirit","Fighter"], 3, 7, 6, null, null, null, 39, 22, 30, 797, 321, 149, null],
+    [ "New Inazuma Evolution", "DEX", ["Free Spirit","Fighter"], 4, 15, 4, 2, 99, null, 730, 267, 100, null, null, null, null]
 	];
 // [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
diff --git a/index.html b/index.html
index a0f6a7305..80768bc79 100644
--- a/index.html
+++ b/index.html
@@ -59,19 +59,22 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>01/05/2016</p>
+            <p>03/05/2016</p>
             <br>
             <ul>
                 <li>New Sugofest Units!</li>
                 <li>Captains and Specials should be complete</li>
-                <li>Stats will be added over the next days as usual</li>
                 <br>
                 <li>Bartolomeo Captain and Funk Brothers Special</li>
                 <li>Need more work to be implemented</li>
                 <li>into the calculator</li>
                 <br>
-                <li>Sakura Sugar almost complete</li>
-                <li>Few new Images added</li>
+                <li>Added the List down there</li>
+                <li>It will show the most recent Chars</li>
+                <li>that have been completed</li>
+                <br>
+                <li>Fixed 5* Chinjao Captain</li>
+                <li>Inazuma/Ivankov Specials/Captains added</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From f857a447cef22fce96e99c5c8e7abec4acc91c57 Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Tue, 3 May 2016 18:13:50 +0800
Subject: [PATCH 0344/1569] Update cooldowns.js

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 916c7866a..0dceebe43 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1017,7 +1017,7 @@ window.cooldowns = [
 	[ 24, 12 ],
 	[ 26, 14 ],
 	[ 26, 14 ],
-	[ 16, 12],
+	[ 16, 6],
 	[ 13, 13],
 	[ 13, 13],
 	[ 15, 15 ],

From 69a6ebb06b13fff81d23ec33e324fc8b4492fab1 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 3 May 2016 14:44:14 +0200
Subject: [PATCH 0345/1569] Translations for Iva/Inazuma

---
 common/data/details.js | 10 ++++++----
 common/data/units.js   | 36 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 693bb9e88..330528a9e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4943,21 +4943,23 @@ window.details = {
     1036: {
         captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
         special: "Deals 13x ATK in QCK Damage to one Enemy, Changes Orbs depending on the current HP",
+        specialName: "Kenpo: Kick Thrust Drop",
         specialNotes: "HP>99%: Middle Left and Bottom Left Orbs to matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
     },
     1037: {
         captain: "Boosts ATK of Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
         special: "Deals 13x ATK in QCK Damage to one Enemy, Changes Orbs depending on the current HP",
+        specialName: "Kenpo: Kick Thrust Drop",
         specialNotes: "HP>99%: Middle Left and Bottom Left Orbs to matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
     },
     1038: {
         captain: "Boosts ATK and RCV of [DEX] and [QCK] units by 1.2x",
-        special: "Switch orbs between slots once, recover a small amount of health",
-        specialNotes: "The Heal amount will be updated once we figure it out"
+        special: "Switches orbs between slots once, recovers 0.3x character's RCV in HP",
+        specialName: "Great Scissors"
     },
     1039: {
         captain: "Boosts ATK and RCV of [DEX] and [QCK] units by 1.5x",
-        special: "Switch orbs between slots once, recover a small amount of health",
-        specialNotes: "The Heal amount will be updated once we figure it out"
+        special: "Switches orbs between slots once, recovers 0.3x character's RCV in HP",
+        specialName: "Great Scissors"
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 557c6c9af..8b7e77d06 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1022,22 +1022,22 @@ window.units = [
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
-    [ "Don Chinjao", "INT", ["Tough","Fighter"], 4, 18, 6, 3, 70, null, 226, 187, 17, 1505, 808, 100, null],
-    [ "Don Chinjao, Flower Country Gang", "INT", ["Tough","Striker"], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null],
-    [ "Blue Gilly", "QCK", ["Fighter","Free Spirit"], 4, 18, 6, 3, 70, null, 197, 138, 37, 1329, 688, 160, null],
-    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", ["Fighter","Free Spirit"], 5, 30, 7, 4, 99, null, 1253, 630, 129, 2555, 1300, 279, null],
-    [ "Funk Brothers", "DEX", ["Fighter","Ambition"], 4, 18, 5, 3, 70, null, 60, 172, 44, 937, 824, 109, null],
-    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", ["Fighter","Ambition"], 5, 30, 8, 4, 99, null, 1500, 824, 77, 2920, 1250, 226, null],
-    [ "Hajrudin", "PSY", ["Tough","Fighter"], 4, 18, 5, 3, 70, null, 201, 177, 38, 1403, 795, 116, null],
-    [ "Hajrudin, Pirate Mercenary", "PSY", ["Tough","Fighter"], 5, 30, 4, 4, 99, null, 1337, 740, 57, 2700, 1402, 205, null],
-    [ "Abdullah and Jeet", "STR", ["Slasher","Striker"], 4, 18, 6, 3, 70, null, 143, 143, 52, 969, 722, 206, null],
-    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", ["Slasher","Striker"], 5, 30, 6, 4, 99, null, 920, 673, 156, 1970, 1346, 344, null],
-    [ "Bartolomeo", "STR", ["Striker","Ambition"], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null],
-    [ "Bartolomeo the Cannibal", "STR", ["Striker","Ambition"], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null],
-    [ "New Ivankov", "QCK", ["Free Spirit","Fighter"], 3, 12, null, null, null, null, 161, 39, 39, null, null, null, null],
-    [ "New Ivankov Evolution", "QCK", ["Free Spirit","Fighter"], 4, 20, null, null, 99, null, null, null, null, null, null, null, null],
-    [ "New Inazuma", "DEX", ["Free Spirit","Fighter"], 3, 7, 6, null, null, null, 39, 22, 30, 797, 321, 149, null],
-    [ "New Inazuma Evolution", "DEX", ["Free Spirit","Fighter"], 4, 15, 4, 2, 99, null, 730, 267, 100, null, null, null, null]
+    [ "Don Chinjao", "INT", [ "Tough","Fighter" ], 4, 18, 6, 3, 70, null, 226, 187, 17, 1505, 808, 100, null ],
+    [ "Don Chinjao, Flower Country Gang", "INT", [ "Tough","Striker" ], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null ],
+    [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, null, 197, 138, 37, 1329, 688, 160, null ],
+    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, null, 1253, 630, 129, 2555, 1300, 279, null ],
+    [ "Funk Brothers", "DEX", [ "Fighter","Ambition" ], 4, 18, 5, 3, 70, null, 60, 172, 44, 937, 824, 109, null ],
+    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Ambition" ], 5, 30, 8, 4, 99, null, 1500, 824, 77, 2920, 1250, 226, null ],
+    [ "Hajrudin", "PSY", [ "Tough","Fighter" ], 4, 18, 5, 3, 70, null, 201, 177, 38, 1403, 795, 116, null ],
+    [ "Hajrudin, Pirate Mercenary", "PSY", [ "Tough","Fighter" ], 5, 30, 4, 4, 99, null, 1337, 740, 57, 2700, 1402, 205, null ],
+    [ "Abdullah and Jeet", "STR", [ "Slasher","Striker" ], 4, 18, 6, 3, 70, null, 143, 143, 52, 969, 722, 206, null ],
+    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", [ "Slasher","Striker" ], 5, 30, 6, 4, 99, null, 920, 673, 156, 1970, 1346, 344, null ],
+    [ "Bartolomeo", "STR", [ "Striker","Ambition" ], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null ],
+    [ "Bartolomeo the Cannibal", "STR", [ "Striker","Ambition" ], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null ],
+    [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, null, null, null, null, 161, 39, 39, null, null, null, null ],
+    [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, null, null, 99, null, null, null, null, null, null, null, null ],
+    [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, null, null, null, 39, 22, 30, 797, 321, 149, null ],
+    [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, null, 730, 267, 100, null, null, null, null ]
 	];
-// [ "Name", "Type", ["Class1","Class2"], null, null, null, null, null, null, null, null, null, null, null, null, null]
-// or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null]
+// [ "Name", "Type", [ "Class1","Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
+// or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From c6080b3e8620378baf23fbf5240634897405051d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 3 May 2016 15:14:12 +0200
Subject: [PATCH 0346/1569] Cooldowns

---
 common/data/cooldowns.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0dceebe43..f07f04c70 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -811,8 +811,8 @@ window.cooldowns = [
 	[ 25, 13 ],
 	[ 20, 6 ],
 	[ 20, 13 ],
-	17,
-	18,
+	[ 17, 10 ],
+	[ 18, 11 ],
 	[ 22, 16 ],
 	[ 22, 16 ],
 	[ 15, 7 ],
@@ -873,8 +873,8 @@ window.cooldowns = [
 	[ 16, 10 ],
 	[ 19, 14 ],
 	[ 19, 14 ],
-	21,
-	21,
+	[ 21, 15 ],
+	[ 21, 15 ],
 	[ 21, 15 ],
 	[ 21, 15 ],
 	[ 25, 18 ],
@@ -1033,5 +1033,9 @@ window.cooldowns = [
 	11,
 	11,
 	23,
-	23
+	23,
+    [ 23, 15 ],
+    [ 23, 15 ],
+    [ 11, 3 ],
+    [ 11, 3 ]
 ];

From 5410109c2a5de1a67eac9a2c1e6e2ecb47d389f1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 3 May 2016 10:00:15 -0500
Subject: [PATCH 0347/1569] New Ranking

Kimono pt 2
---
 common/data/drops.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 2050be92b..ae3f0c1cc 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -936,6 +936,8 @@ window.drops = {
             name: "Lightning Speed! Strawhat Crew's Surprise Visit",
             thumb: 866,
 			condition: "None",
+            challenge:'Total number of hits above 50,000',
+            challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Anti-Silence Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ]
         },
 

From 7d273ccb98a0bbf0a101c8609494c4d3d874902d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 3 May 2016 10:23:05 -0500
Subject: [PATCH 0348/1569] Powerhouse

RIP Tough
---
 characters/js/directives.js   |   4 +-
 characters/views/sidebar.html |   2 +-
 common/data/captains.js       |  96 ++++----
 common/data/details.js        | 108 ++++-----
 common/data/drops.js          |   2 +-
 common/data/matchers.js       |   4 +-
 common/data/specials.js       |  26 +--
 common/data/tandems.js        |   2 +-
 common/data/units.js          | 404 +++++++++++++++++-----------------
 index.html                    |  10 +-
 10 files changed, 327 insertions(+), 331 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 518d300d0..e35e383cc 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -116,7 +116,7 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
                     'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
@@ -138,7 +138,7 @@ directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Ambition' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classSpecial == \'%s\' }" ' +
                     'ng-click="onSpecialClick($event,\'%s\')">%s</span>';
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index db61d78f9..e8bfec61a 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -9,7 +9,7 @@
 
 <div class="filter-container">
     <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Tough', 'Ambition' ]"
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Ambition' ]"
         class="filter width-6 class" ng-click="onClassClick($event,class)"
         ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
 </div>
diff --git a/common/data/captains.js b/common/data/captains.js
index f0e5bc7ca..20b273f09 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1554,11 +1554,11 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
 	},
 	747: {
-		atk: function(p) { return !p.unit.class.has("Tough") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
+		atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
 		rcv: function(p) { return 0; }
 	},
 	748: {
-		atk: function(p) { return !p.unit.class.has("Tough") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
+		atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
 		rcv: function(p) { return 0; }
 	},
 	749: {
@@ -1576,10 +1576,10 @@ window.captains = {
 		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	753: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
 	},
 	754: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
 	},
 	755: {
 		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
@@ -1678,19 +1678,19 @@ window.captains = {
 	},
 	794: {
 		atk: function(p) {
-			return p.unit.class.has("Tough") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+			return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
 		}
 	},
 	795: {
 		atk: function(p) {
-			return p.unit.class.has("Tough") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
+			return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
 		}
 	},
 	796: {
 		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	797: {
-		atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Tough") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Powerhouse") ? 2 : 1; }
 	},
 	798: {
 		hitAtk: function(p) {
@@ -1727,12 +1727,12 @@ window.captains = {
 		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
 	},
 	809: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	810: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	815: {
 		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
@@ -1972,12 +1972,12 @@ window.captains = {
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	883: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 1.25 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
 	},
 	884: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	885: {
 		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
@@ -1997,15 +1997,15 @@ window.captains = {
 		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
 	},
 	891: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	892: {
 		chainModifier: function(p) { return 2; }
 	},
 	893: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Tough")) return 1;
+			if (!p.unit.class.has("Powerhouse")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
 				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1;
 		},
@@ -2053,12 +2053,12 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2.75 : 1; }
 	},
 	902: {
-		atk: function(p) { return p.class.has("Tough") ? 1.25 : 1; },
-		hp: function(p) { return p.class.has("Tough") ? 1.25 : 1; }
+		atk: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; },
+		hp: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; }
 	},
 	903: {
-		atk: function(p) { return p.class.has("Tough") ? 1.25 : 1; },
-		hp: function(p) { return p.class.has("Tough") ? 1.25 : 1; }
+		atk: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; },
+		hp: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; }
 	},
 	905: {
 		atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.5 : 1; }
@@ -2083,12 +2083,12 @@ window.captains = {
 		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
 	},
 	911: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	912: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	913: {
 		atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1); }
@@ -2137,10 +2137,10 @@ window.captains = {
 		}
 	},
 	925: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
 	},
 	926: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
 	},
 	927: {
 		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
@@ -2168,12 +2168,12 @@ window.captains = {
 		chainModifier: function(p) { return 2; }
 	},
 	932: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	933: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	934: {
 		atk: function(p) {
@@ -2322,10 +2322,10 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
 	},
 	973: {
-		atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2 : 1; }
 	},
 	974: {
-		atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
 	},
 	976: {
 		atk: function(p) {
@@ -2348,8 +2348,8 @@ window.captains = {
         rcv: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" ? 1.2 : 1; }
     },
     981: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Tough") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Tough") ? 0.1 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 0.1 : 1; }
     },
     982: {
         atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1}
@@ -2377,10 +2377,10 @@ window.captains = {
         atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1 ; }
     },
     996: {
-         atk: function(p) {return p.unit.class.has("Tough") ? 2  : 1; }
+         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2  : 1; }
     },
     997: {
-         atk: function(p) {return p.unit.class.has("Tough") ? 2.25  : 1; }
+         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2.25  : 1; }
     },
     998: {
          atk: function(p) {return p.unit.class.has("Ambition") ? 2  : 1; }
@@ -2404,11 +2404,11 @@ window.captains = {
 		rcv: function(p) { return 1.5; }
 	},
 	1005: {
-		atk: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	1006: {
-		atk: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; },
-		hp: function(p) {return p.unit.class.has("Tough") ? 1.5 : 1; }
+		atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+		hp: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
 	},
 	1007: {
 		atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
@@ -2428,17 +2428,17 @@ window.captains = {
 	},
 	1011:{
 		atk: function(p) {
-			if (p.unit.class.has("Ambition") && p.unit.class.has("Tough")){
+			if (p.unit.class.has("Ambition") && p.unit.class.has("Powerhouse")){
 				return 2.625;
 			} else if (p.unit.class.has("Ambition")){
 					return 1.75;
-				} else if (p.unit.class.has("Tough")){
+				} else if (p.unit.class.has("Powerhouse")){
 					return 1.5;
 				} return 1;
 		}
 	},
 	1014:{
-		atk: function(p) {return p.unit.class.has("Tough") ? 2 : 1; }
+		atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
 	},
     1015: {
         atk: function(p) { return !p.unit.type == "INT" ? 1 : (p.orb == 2.0 ? 2.75 : 1); }
@@ -2465,10 +2465,10 @@ window.captains = {
         atk: function(p) { return 2; }
     },
     1024: {
-        atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1025: {
-        atk: function(p) { return p.unit.class.has("Tough") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1026: {
@@ -2489,10 +2489,10 @@ window.captains = {
 		}
     },
     1030: {
-        atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
     },
     1031: {
-        atk: function(p) { return p.unit.class.has("Tough") && p.percHP >= 99.0 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.75 : 1; }
     },
     1032: {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
diff --git a/common/data/details.js b/common/data/details.js
index 330528a9e..64b63b2ff 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3288,12 +3288,12 @@ window.details = {
 	747: {
 		special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
 		specialName: "Rokuougan",
-		captain: "Boosts ATK of Tough characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+		captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
 	},
 	748: {
 		special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
 		specialName: "Rokuougan",
-		captain: "Boosts ATK of Tough characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+		captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
 	},
 	749: {
 		special: "Deals random DEX damage to all enemies, randomizes all orbs",
@@ -3321,21 +3321,21 @@ window.details = {
 		special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{orb : 1.75x}",
 		specialName: "Moonlight Ten Finger Pistol",
-		captain: "Boosts ATK of Tough characters by 2x"
+		captain: "Boosts ATK of Powerhouse characters by 2x"
 	},
 	754: {
 		special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{orb : 1.75x}",
 		specialName: "Moonlight Ten Finger Pistol",
-		captain: "Boosts ATK of Tough characters by 2.5x"
+		captain: "Boosts ATK of Powerhouse characters by 2.5x"
 	},
 	755: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Tough characters by 1.75x for 1 turn",
+		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
 		specialName: "Tekkai - Rin",
 		captain: "Boosts ATK of INT characters by 1.5x, reduces damage received from PSY enemies by 20%"
 	},
 	756: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Tough characters by 1.75x for 1 turn",
+		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
 		specialName: "Tekkai - Rin",
 		captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%"
 	},
@@ -3533,15 +3533,15 @@ window.details = {
 		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 10}",
 		specialName: "Gum-Gum Storm",
-		captain: "Boosts ATK of Tough characters by 3x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Tough units."
+		captain: "Boosts ATK of Powerhouse characters by 3x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
+		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse units."
 	},
 	795: {
 		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 10}",
 		specialName: "Gum-Gum Storm",
-		captain: "Boosts ATK of Tough characters by 3.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Tough units."
+		captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
+		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse units."
 	},
 	796: {
 		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
@@ -3551,7 +3551,7 @@ window.details = {
 	797: {
 		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
 		specialName: "Peto-Peto Fruit, The Greatest Power",
-		captain: "Boosts ATK of Cerebral and Tough characters by 2x"
+		captain: "Boosts ATK of Cerebral and Powerhouse characters by 2x"
 	},
 	798: {
 		special: "Removes poison, following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Fighter characters by 1.75x in the following turn",
@@ -3611,13 +3611,13 @@ window.details = {
 		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	809: {
-		captain: "Boosts ATK and RCV of Tough characters by 1.5x",
+		captain: "Boosts ATK and RCV of Powerhouse characters by 1.5x",
 		specialName: "Lola's Attack Chance",
 		special: "Reduces the defense of all enemies by 80% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
 		specialNotes: "#{orb : 1.5x}"
 	},
 	810: {
-		captain: "Boosts ATK of Tough characters by 2x and their RCV by 1.5x, reduces crew's current HP by 10% at the end of each turn",
+		captain: "Boosts ATK of Powerhouse characters by 2x and their RCV by 1.5x, reduces crew's current HP by 10% at the end of each turn",
 		specialName: "Lola's Attack Chance",
 		special: "Reduces the defense of all enemies by 80% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
 		specialNotes: "#{orb : 1.5x}"
@@ -3834,7 +3834,7 @@ window.details = {
 	},
 	853: {
 		specialName: "Robson: Serious Mode",
-		special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Tough and Fighters characters by 1.2x for 3 turns"
+		special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Powerhouse and Fighters characters by 1.2x for 3 turns"
 	},
 	854: {
 		captain: "Boosts ATK of DEX chracters by 1.5x, reduces damage received by 10%",
@@ -4027,14 +4027,14 @@ window.details = {
 		special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
 	},
 	883: {
-		captain: "Boosts ATK and HP of Tough characters by 1.25x",
+		captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
 		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Tough characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Tough characters by 2x instead."
+		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
 	},
 	884: {
-		captain: "Boosts ATK and HP of Tough characters by 1.5x",
+		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
 		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Tough characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Tough characters by 2x instead."
+		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
 	},
 	885: {
 		captain: "Boosts ATK of Fighter characters by 2x, reduces damage received by 10%",
@@ -4067,9 +4067,9 @@ window.details = {
 		special: "Changes [STR] orbs into [DEX] orbs, deals 10x character's ATK in DEX damage to all enemies"
 	},
 	891: {
-		captain: "Boosts ATK and RCV of Tough characters by 1.75x",
+		captain: "Boosts ATK and RCV of Powerhouse characters by 1.75x",
 		specialName: "Resurrection of the Dead",
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Tough characters by 1.25x for 1 turn",
+		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.25x for 1 turn",
 		},
 	892: {
 		captain: "Boosts chain multiplier by 2x",
@@ -4077,7 +4077,7 @@ window.details = {
 		special: "Switches orbs between slots three times"
 	},
 	893: {
-		captain: "Boosts ATK of Tough characters by 3x after scoring 3 Perfects in a row",
+		captain: "Boosts ATK of Powerhouse characters by 3x after scoring 3 Perfects in a row",
 		specialName: "Oars Ball",
 		special: "Reduces damage received by 50% for 1 turn, deals 30x character's ATK in STR damage to all enemies"
 	},
@@ -4126,14 +4126,14 @@ window.details = {
 		specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
 	},
 	902: {
-		captain: "Boosts ATK and HP of Tough characters by 1.25x",
+		captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
 		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Tough characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Tough characters by 2x instead."
+		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
 	},
 	903: {
-		captain: "Boosts ATK and HP of Tough characters by 1.5x",
+		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
 		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Tough characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Tough characters by 2x instead."
+		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
 	},
 	904: {
 		captain: "Protects from defeat as long as HP is above 50%",
@@ -4204,30 +4204,30 @@ window.details = {
 		specialName: "Diable Jambe: Premier Hachis",
 		special: [
 			{
-				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Tough characters by 1.2x for 1 turn",
+				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
 				"cooldown": 15
 			},
 			{
-				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Tough characters by 2x for 1 turn",
+				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
 				"cooldown": 25
 			}
 		],
-		captain: "Boosts ATK and HP of Tough characters by 1.5x",
+		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
 		specialNotes: "#{stages}"
 	},
 	912: {
 		specialName: "Diable Jambe: Premier Hachis",
 		special: [
 			{
-				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Tough characters by 1.2x for 1 turn",
+				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
 				"cooldown": 15
 			},
 			{
-				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Tough characters by 2x for 1 turn",
+				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
 				"cooldown": 25
 			}
 		],
-		captain: "Boosts ATK of Tough characters by 2.25x, and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
+		captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
 		specialNotes: "#{stages}"
 	},
 	913: {
@@ -4295,12 +4295,12 @@ window.details = {
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	925: {
-		captain: "Boosts ATK of Tough characters by 2x",
+		captain: "Boosts ATK of Powerhouse characters by 2x",
 		specialName: "Let's go, Jailer Beasts!",
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	926: {
-		captain: "Boosts ATK of Tough characters by 2.5x",
+		captain: "Boosts ATK of Powerhouse characters by 2.5x",
 		specialName: "Let's go, Jailer Beasts!",
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
@@ -4329,11 +4329,11 @@ window.details = {
 		special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
 	},
 	932: {
-		captain: "Boosts ATK of Tough Characters by 1.5x, and their HP by 1.5x",
+		captain: "Boosts ATK of Powerhouse Characters by 1.5x, and their HP by 1.5x",
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
+				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
@@ -4344,11 +4344,11 @@ window.details = {
 		specialNotes: "#{stages}"	
 		},
 	933: {
-		captain: "Boosts ATK of Tough Characters by 2.25x, and their HP by 1.5x",
+		captain: "Boosts ATK of Powerhouse Characters by 2.25x, and their HP by 1.5x",
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Tough characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
+				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
@@ -4479,7 +4479,7 @@ window.details = {
 	956:{
 		captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
 		specialName: "Fishman karate! I'll Finish You",
-		special: "Boosts ATK of Tough characters by 1.2x for 2 turns"
+		special: "Boosts ATK of Powerhouse characters by 1.2x for 2 turns"
 	},
 	957:{
 		specialName: "First Aid",
@@ -4552,12 +4552,12 @@ window.details = {
 		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
 	},
 	973:{
-		captain: "Boosts ATK of Tough Characters by 2x if HP is above 99% at the start of the turn",
+		captain: "Boosts ATK of Powerhouse Characters by 2x if HP is above 99% at the start of the turn",
 		specialName: "Sentoumaru Special",
 		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
 	},
 	974:{
-		captain: "Boosts ATK of Tough Characters by 2.5x if HP is above 99% at the start of the turn",
+		captain: "Boosts ATK of Powerhouse Characters by 2.5x if HP is above 99% at the start of the turn",
 		specialName: "Sentoumaru Special",
 		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
 	},
@@ -4615,7 +4615,7 @@ window.details = {
         special: "Changes own orb into [DEX] and randomizes every other orb"
     },
     981: {
-        captain: "Boosts ATK of Fighters and Tough characters by 2x and sharply reduces their RCV",
+        captain: "Boosts ATK of Fighters and Powerhouse characters by 2x and sharply reduces their RCV",
         captainNotes: "The RCV Reduction is around 90%",
         specialName: "Martial Art Diving Fist",
         special: "Boosts own ATK by 1.75x for 1 turn and deals 800 fixed damage to one enemy",
@@ -4707,10 +4707,10 @@ window.details = {
 		specialNotes: "#{stages}"
 	},
     996: {
-        captain: "Boosts ATK of Tough characters by 2x",
+        captain: "Boosts ATK of Powerhouse characters by 2x",
         special: [
 			{
-				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching orbs.",
+				"description": "For Powerhouse characters, changes [EMPTY] and Bad orbs to Matching orbs.",
 				"cooldown": 11
 			},
 			{
@@ -4722,11 +4722,11 @@ window.details = {
 		specialNotes: "#{stages}"
     },
     997: {
-		captain: "Boosts ATK of Tough characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Tough characters",
+		captain: "Boosts ATK of Powerhouse characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Powerhouse characters",
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         special: [
 			{
-				"description": "For Tough characters, changes [EMPTY] and Bad orbs to Matching orbs.",
+				"description": "For Powerhouse characters, changes [EMPTY] and Bad orbs to Matching orbs.",
 				"cooldown": 11
 			},
 			{
@@ -4777,12 +4777,12 @@ window.details = {
 		special: "Changes the orbs in the left column into [RCV] orbs"
 	},
 	1005: {
-		captain: "Boosts ATK of Tough characters by 1.5x",
+		captain: "Boosts ATK of Powerhouse characters by 1.5x",
 		specialName: "Rush to Freedom",
 		special: "Boosts own ATK by 1.75x for 1 turn"
 	},
 	1006: {
-		captain: "Boosts ATK and HP of Tough characters by 1.5x",
+		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
 		specialName: "Rush to Freedom",
 		special: "Boosts own ATK by 1.75x for 1 turn"
 	},
@@ -4808,8 +4808,8 @@ window.details = {
 		specialName: "Evil Beast's Horn Pierce"
 	},
 	1011:{
-		captain: "Boosts ATK of Ambition characters by 1.75x, and boosts ATK of Tough characters by 1.5x",
-		captainNotes: "The bonus is cumulative. Ambition Tough characters get a 2.625x bonus.",
+		captain: "Boosts ATK of Ambition characters by 1.75x, and boosts ATK of Powerhouse characters by 1.5x",
+		captainNotes: "The bonus is cumulative. Ambition Powerhouse characters get a 2.625x bonus.",
 		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
 		specialName: "Evil Beast's Horn Pierce"
 	},
@@ -4824,7 +4824,7 @@ window.details = {
 	1014: {
 		special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
 		specialName: "Scapegoat Substitute",
-		captain: "Boosts ATK of Tough characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
+		captain: "Boosts ATK of Powerhouse characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
 	},
 	1015: {
 		captain: "Boosts ATK of [INT] characters by 2.75x if they have a matching orb",
@@ -4872,13 +4872,13 @@ window.details = {
 		specialName: "Gum-Gum Gigant Rifle: New Star"
 	},
 	1024: {
-		captain: "Boosts ATK of Tough characters by 2x",
+		captain: "Boosts ATK of Powerhouse characters by 2x",
 		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
 		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
 	1025: {
-		captain: "Boosts ATK of Tough characters by 2x and boosts the HP of Striker characters by 2x",
+		captain: "Boosts ATK of Powerhouse characters by 2x and boosts the HP of Striker characters by 2x",
         captainNotes: "A character with both classes will get both boosts",
 		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
 		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
@@ -4907,12 +4907,12 @@ window.details = {
         specialNotes: "Buffalo's Captain as a Special essentially"
     },
     1030: {
-		captain: "Boosts ATK of Tough characters by 2.5x if HP is above 99% at the start of the turn",
+		captain: "Boosts ATK of Powerhouse characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
         special: "Reduces crew's HP to 1, deals 10x the removed HP as damage to one enemy. Boosts own ATK by 2.25x for 1 turn."
     },
     1031: {
-		captain: "Boosts ATK of Tough characters by 2.75x if HP is above 99% at the start of the turn",
+		captain: "Boosts ATK of Powerhouse characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
         special: "Reduces crew's HP to 1, deals 10x the removed HP as damage to one enemy. Boosts own ATK by 2.25x for 1 turn."
     },
diff --git a/common/data/drops.js b/common/data/drops.js
index ae3f0c1cc..720fd866b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -905,7 +905,7 @@ window.drops = {
         {
             name: "Evil Manager Breed's Marine Circus!",
             thumb: 797,
-            condition: 'You can only bring Fighter and Tough units',
+            condition: 'You can only bring Fighter and Powerhouse units',
             "All Difficulties": [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ]
         },
 
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 1a709be2d..8f6002c93 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -11,7 +11,7 @@ window.matchers = [
     {
         name: 'Class-boosting captains',
         target: 'captain',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Tough|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Ambition)/i
     },
 
     {
@@ -134,7 +134,7 @@ window.matchers = [
     {
         name: 'Class-boosting specials',
         target: 'special',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Tough|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Ambition)/i
     },
 
     {
diff --git a/common/data/specials.js b/common/data/specials.js
index 657a45799..ee20c9fe3 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -594,11 +594,11 @@ window.specials = {
 		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
 	},
 	755: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.75 : 1; },
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
 		type: "class"
 	},
 	756: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.75 : 1; },
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
 		type: "class"
 	},
 	761: {
@@ -830,7 +830,7 @@ window.specials = {
 		def: function() { return 0.5; }
 	},
 	853: {
-		atk: function(p) { return p.unit.class.has("Tough") || p.unit.class.has("Fighter") ? 1.2 : 1; },
+		atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; },
 		type: "class"
 	},
 	857: {
@@ -917,7 +917,7 @@ window.specials = {
 		type: "class"
 	},
 	883: {
-		atk: function(p) { return !p.unit.class.has('Tough') ? 1 : window.specials[883].multiplier; },
+		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[883].multiplier; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[883].multiplier == 1.5 ? 1 : 0);
@@ -929,7 +929,7 @@ window.specials = {
 		}
 	},
 	884: {
-		atk: function(p) { return !p.unit.class.has('Tough') ? 1 : window.specials[884].multiplier; },
+		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[884].multiplier; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[884].multiplier == 1.5 ? 1 : 0);
@@ -952,11 +952,11 @@ window.specials = {
 		def: function(p) { return 0.2; }
 	},
 	891: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.25 : 1; },
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
 		type: "class"
 	},
 	902: {
-		atk: function(p) { return !p.unit.class.has('Tough') ? 1 : window.specials[902].multiplier; },
+		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[902].multiplier; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[902].multiplier == 1.5 ? 1 : 0);
@@ -968,7 +968,7 @@ window.specials = {
 		}
 	},
 	903: {
-		atk: function(p) { return !p.unit.class.has('Tough') ? 1 : window.specials[903].multiplier; },
+		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[903].multiplier; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[903].multiplier == 1.5 ? 1 : 0);
@@ -1021,8 +1021,8 @@ window.specials = {
 	},
 	911: {
 		atk: function(p) {
-			if (!window.specials[911].stage) return p.unit.class.has("Tough") ? 1.2 : 1;
-			if (window.specials[911].stage == 1) return p.unit.class.has("Tough") ? 2 : 1;
+			if (!window.specials[911].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
+			if (window.specials[911].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
 		},
 		type: "class",
 		stage: -1,
@@ -1036,8 +1036,8 @@ window.specials = {
 	},
 	912: {
 		atk: function(p) {
-			if (!window.specials[912].stage) return p.unit.class.has("Tough") ? 1.2 : 1;
-			if (window.specials[912].stage == 1) return p.unit.class.has("Tough") ? 2 : 1;
+			if (!window.specials[912].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
+			if (window.specials[912].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
 		},
 		type: "class",
 		stage: -1,
@@ -1119,7 +1119,7 @@ window.specials = {
 		type: "condition"
 	},
 	956: {
-		atk: function(p) { return p.unit.class.has("Tough") ? 1.2 : 1; },
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
 		type: "class"
 	},
 	961: {
diff --git a/common/data/tandems.js b/common/data/tandems.js
index 5c3deff09..b61defaa1 100644
--- a/common/data/tandems.js
+++ b/common/data/tandems.js
@@ -316,7 +316,7 @@ window.tandems = [
     },
     {
         "name": "Giant Pirates' Charge",
-        "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Tough characters by 1.4x until the end of the current turn",
+        "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Powerhouse characters by 1.4x until the end of the current turn",
         "units": [ 884, 903 ]
     },
 	{
diff --git a/common/data/units.js b/common/data/units.js
index 8b7e77d06..7ae3ea49f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -16,18 +16,18 @@ window.units = [
 	[ "Usopp Golden Pound", "PSY", "Shooter", 4, 9, 6, 2, 50, 392109, 444, 237, 47, 1080, 648, 144, 1 ],
 	[ "Sogeking", "PSY", "Shooter", 5, 15, 7, 3, 99, 3000000, 638, 260, 189, 1506, 690, 479, 1 ],
 	[ "Sanji", "QCK", "Fighter", 3, 4, 6, 0, 20, 26184, 136, 64, 17, 506, 218, 60, 1 ],
-	[ "Sanji Plastic Surgery Shot", "QCK", [ "Fighter", "Tough" ], 4, 7, 5, 2, 35, 136167, 486, 207, 32, 907, 496, 125, 1 ],
-	[ "Chef Sanji Hot Rock Stew", "QCK", [ "Fighter", "Tough" ], 4, 9, 4, 2, 50, 392109, 494, 191, 54, 986, 500, 209, 1 ],
-	[ "Sanji Diable Jambe Flambe", "QCK", [ "Fighter", "Tough" ], 5, 15, 4, 3, 99, 3000000, 406, 418, 175, 2206, 1030, 249, 1 ],
+	[ "Sanji Plastic Surgery Shot", "QCK", [ "Fighter", "Powerhouse" ], 4, 7, 5, 2, 35, 136167, 486, 207, 32, 907, 496, 125, 1 ],
+	[ "Chef Sanji Hot Rock Stew", "QCK", [ "Fighter", "Powerhouse" ], 4, 9, 4, 2, 50, 392109, 494, 191, 54, 986, 500, 209, 1 ],
+	[ "Sanji Diable Jambe Flambe", "QCK", [ "Fighter", "Powerhouse" ], 5, 15, 4, 3, 99, 3000000, 406, 418, 175, 2206, 1030, 249, 1 ],
 	[ "Tony Tony Chopper", "PSY", "Fighter", 3, 4, 5, 0, 20, 26184, 52, 40, 39, 294, 144, 120, 1 ],
 	[ "Tony Tony Chopper Heavy Point", "PSY", [ "Fighter", "Free Spirit" ], 4, 9, 5, 2, 50, 392109, 306, 213, 78, 754, 622, 207, 1 ],
 	[ "Tony Tony Chopper Brain Point", "INT", [ "Fighter", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 258, 198, 91, 520, 454, 302, 1 ],
-	[ "Tony Tony Chopper Arm Point", "STR", [ "Fighter", "Tough" ], 4, 9, 4, 2, 50, 392109, 356, 260, 54, 868, 820, 122, 1 ],
+	[ "Tony Tony Chopper Arm Point", "STR", [ "Fighter", "Powerhouse" ], 4, 9, 4, 2, 50, 392109, 356, 260, 54, 868, 820, 122, 1 ],
 	[ "Tony Tony Chopper Horn Point", "QCK", "Fighter", 4, 9, 6, 2, 50, 392109, 414, 306, 29, 958, 856, 95, 1 ],
-	[ "Tony Tony Chopper Guard Point", "DEX", [ "Fighter", "Tough" ], 4, 9, 6, 2, 50, 392109, 394, 178, 75, 1320, 408, 184, 1 ],
+	[ "Tony Tony Chopper Guard Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 9, 6, 2, 50, 392109, 394, 178, 75, 1320, 408, 184, 1 ],
 	[ "Higuma", "QCK", "Slasher", 2, 8, 5, 0, 35, 45389, 132, 87, 29, 692, 323, 99, 1 ],
 	[ "Master of the Near Sea", "STR", "Fighter", 2, 20, 5, 0, 35, 90778, 500, 350, 80, 550, 400, 100, 1.5 ],
-	[ "Iron-Mace Alvida", "STR", [ "Striker", "Tough" ], 3, 10, 5, 0, 50, 392109, 184, 154, 5, 1412, 755, 61, 1 ],
+	[ "Iron-Mace Alvida", "STR", [ "Striker", "Powerhouse" ], 3, 10, 5, 0, 50, 392109, 184, 154, 5, 1412, 755, 61, 1 ],
 	[ "Iron-Mace Alvida Smooth-Smooth Fruit", "STR", [ "Striker", "Free Spirit" ], 4, 15, 6, 1, 99, 3000000, 766, 625, 135, 1668, 999, 369, 1 ],
 	[ "Coby", "PSY", "Fighter", 2, 4, 5, 0, 25, 50439, 70, 25, 32, 166, 70, 120, 1 ],
 	[ "Cabin Boy Coby", "PSY", [ "Fighter", "Ambition" ], 3, 9, 5, 3, 50, 392109, 130, 49, 100, 524, 155, 216, 1 ],
@@ -40,7 +40,7 @@ window.units = [
 	[ "Buggy the Clown", "INT", [ "Slasher", "Ambition" ], 4, 11, 5, 2, 70, 1066998, 714, 342, 58, 1666, 757, 135, 1 ],
 	[ "Gaimon", "PSY", "Shooter", 2, 3, 6, 0, 50, 261406, 133, 5, 14, 1303, 85, 121, 1.5 ],
 	[ "Siam", "INT", "Slasher", 2, 9, 6, 0, 50, 261406, 112, 112, 24, 724, 499, 133, 1 ],
-	[ "Butchie", "STR", [ "Slasher", "Tough" ], 2, 9, 6, 0, 50, 261406, 132, 117, 19, 872, 530, 98, 1 ],
+	[ "Butchie", "STR", [ "Slasher", "Powerhouse" ], 2, 9, 6, 0, 50, 261406, 132, 117, 19, 872, 530, 98, 1 ],
 	[ "One-Two Django", "DEX", "Slasher", 2, 8, 5, 0, 35, 90778, 118, 64, 39, 556, 271, 139, 1 ],
 	[ "Dancing Django", "DEX", "Slasher", 3, 11, 5, 2, 70, 1066998, 476, 218, 98, 1155, 555, 228, 1 ],
 	[ "Captain Kuro", "QCK", [ "Slasher", "Cerebral" ], 3, 10, 7, 0, 70, 1066998, 144, 111, 31, 1102, 640, 151, 1 ],
@@ -53,18 +53,18 @@ window.units = [
 	[ "Chef Zeff", "DEX", "Fighter", 3, 10, 5, 1, 50, 392109, 142, 118, 29, 908, 698, 164, 1.5 ],
 	[ "Gin", "QCK", "Shooter", 2, 8, 5, 0, 35, 90778, 148, 94, 24, 618, 363, 98, 1 ],
 	[ "Gin the Man-Demon", "QCK", "Striker", 3, 11, 6, 1, 70, 1066998, 558, 300, 57, 1152, 792, 209, 1 ],
-	[ "Pearl", "STR", [ "Striker", "Tough" ], 2, 8, 5, 0, 35, 90778, 198, 84, 19, 956, 296, 64, 1 ],
-	[ "Fire Pearl", "STR", [ "Striker", "Tough" ], 3, 11, 4, 1, 70, 1066998, 820, 226, 38, 1904, 656, 129, 1 ],
+	[ "Pearl", "STR", [ "Striker", "Powerhouse" ], 2, 8, 5, 0, 35, 90778, 198, 84, 19, 956, 296, 64, 1 ],
+	[ "Fire Pearl", "STR", [ "Striker", "Powerhouse" ], 3, 11, 4, 1, 70, 1066998, 820, 226, 38, 1904, 656, 129, 1 ],
 	[ "Don Krieg", "INT", [ "Shooter", "Ambition" ], 3, 10, 6, 0, 50, 392109, 214, 97, 24, 1454, 632, 95, 1 ],
 	[ "Don Krieg Poison Gas Bomb MH5", "INT", [ "Shooter", "Ambition" ], 4, 15, 4, 2, 99, 3000000, 1276, 553, 74, 2734, 1057, 172, 1 ],
 	[ "Nezumi", "INT", [ "Shooter", "Cerebral" ], 2, 6, 6, 0, 30, 28779, 55, 55, 55, 150, 130, 204, 0.7 ],
 	[ "Momoo", "STR", "Fighter", 3, 18, 4, 0, 50, 392109, 600, 400, 120, 1000, 500, 150, 1.5 ],
-	[ "Choo", "INT", [ "Shooter", "Tough" ], 3, 9, 5, 1, 50, 392109, 110, 71, 49, 768, 492, 256, 1 ],
-	[ "Kuroobi", "STR", [ "Fighter", "Tough" ], 3, 9, 4, 1, 50, 392109, 160, 157, 10, 1200, 759, 76, 1 ],
-	[ "Hatchan", "DEX", [ "Slasher", "Tough" ], 3, 8, 8, 1, 35, 136167, 88, 88, 47, 588, 387, 143, 1 ],
-	[ "Six-Sword Hachi", "DEX", [ "Slasher", "Tough" ], 4, 11, 8, 2, 70, 1066998, 542, 338, 88, 986, 638, 288, 1 ],
-	[ "Arlong", "STR", [ "Slasher", "Tough" ], 3, 10, 5, 0, 50, 392109, 104, 152, 24, 936, 930, 82, 1 ],
-	[ "Enraged Arlong Shark On Tooth", "STR", [ "Slasher", "Tough" ], 4, 15, 4, 1, 99, 3000000, 832, 832, 55, 1974, 1491, 154, 1 ],
+	[ "Choo", "INT", [ "Shooter", "Powerhouse" ], 3, 9, 5, 1, 50, 392109, 110, 71, 49, 768, 492, 256, 1 ],
+	[ "Kuroobi", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 1, 50, 392109, 160, 157, 10, 1200, 759, 76, 1 ],
+	[ "Hatchan", "DEX", [ "Slasher", "Powerhouse" ], 3, 8, 8, 1, 35, 136167, 88, 88, 47, 588, 387, 143, 1 ],
+	[ "Six-Sword Hachi", "DEX", [ "Slasher", "Powerhouse" ], 4, 11, 8, 2, 70, 1066998, 542, 338, 88, 986, 638, 288, 1 ],
+	[ "Arlong", "STR", [ "Slasher", "Powerhouse" ], 3, 10, 5, 0, 50, 392109, 104, 152, 24, 936, 930, 82, 1 ],
+	[ "Enraged Arlong Shark On Tooth", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 1, 99, 3000000, 832, 832, 55, 1974, 1491, 154, 1 ],
 	[ "Tashigi", "QCK", [ "Slasher", "Cerebral" ], 3, 9, 5, 1, 50, 392109, 102, 102, 41, 690, 483, 272, 1 ],
 	[ "Tashigi Navy HQ Ensign", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 99, 3000000, 632, 431, 222, 1434, 921, 434, 1.5 ],
 	[ "Smoker", "DEX", [ "Striker", "Ambition" ], 3, 9, 5, 1, 50, 392109, 110, 113, 36, 944, 575, 199, 1 ],
@@ -211,8 +211,8 @@ window.units = [
 	[ "Nico Robin", "INT", [ "Fighter", "Cerebral" ], 5, 20, 6, 2, 99, 3000000, 736, 430, 214, 1865, 1055, 338, 1 ],
 	[ "Mr. 9", "QCK", "Striker", 2, 10, 5, 0, 35, 90778, 106, 88, 33, 490, 313, 136, 0.7 ],
 	[ "Mr. 9 Hot Blooded Bat", "QCK", "Striker", 3, 13, 5, 3, 70, 1066998, 408, 249, 99, 1011, 590, 240, 0.7 ],
-	[ "Laboon", "STR", [ "Fighter", "Tough" ], 3, 18, 5, 1, 50, 392109, 650, 300, 150, 1100, 500, 200, 1 ],
-	[ "Laboon (Luffy's drawing)", "STR", [ "Fighter", "Tough" ], 4, 22, 5, 2, 99, 3000000, 1000, 400, 160, 2500, 850, 250, 1 ],
+	[ "Laboon", "STR", [ "Fighter", "Powerhouse" ], 3, 18, 5, 1, 50, 392109, 650, 300, 150, 1100, 500, 200, 1 ],
+	[ "Laboon (Luffy's drawing)", "STR", [ "Fighter", "Powerhouse" ], 4, 22, 5, 2, 99, 3000000, 1000, 400, 160, 2500, 850, 250, 1 ],
 	[ "Neptunian Squid", "DEX", "Striker", 3, 18, 8, 1, 50, 392109, 600, 280, 130, 900, 480, 180, 1.5 ],
 	[ "Monkey D. Luffy Gum-Gum Balloon", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
 	[ "Monkey D. Luffy Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
@@ -233,8 +233,8 @@ window.units = [
 	[ "Black Cage Hina", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 4, 2, 99, 3000000, 1088, 422, 149, 2270, 905, 300, 1 ],
 	[ "Mr. 8", "PSY", [ "Shooter", "Cerebral" ], 2, 10, 5, 0, 35, 90778, 178, 55, 32, 530, 248, 151, 1 ],
 	[ "Mr. 8 Igarappapa", "PSY", [ "Shooter", "Cerebral" ], 3, 13, 5, 1, 70, 1066998, 500, 186, 120, 1286, 433, 230, 1 ],
-	[ "Miss Monday", "STR", [ "Fighter", "Tough" ], 2, 10, 4, 0, 35, 90778, 66, 126, 27, 350, 500, 97, 1 ],
-	[ "Miss Monday Superhuman Brass Knuckles", "STR", [ "Fighter", "Tough" ], 3, 13, 4, 1, 70, 1066998, 270, 422, 71, 506, 1005, 186, 1 ],
+	[ "Miss Monday", "STR", [ "Fighter", "Powerhouse" ], 2, 10, 4, 0, 35, 90778, 66, 126, 27, 350, 500, 97, 1 ],
+	[ "Miss Monday Superhuman Brass Knuckles", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 270, 422, 71, 506, 1005, 186, 1 ],
 	[ "Knuckle Millions Baroque Works", "STR", "Fighter", 2, 5, 6, 0, 25, 33626, 185, 89, 21, 532, 352, 50, 1 ],
 	[ "Saber Millions Baroque Works", "DEX", "Slasher", 2, 5, 6, 0, 25, 33626, 161, 77, 29, 486, 294, 77, 1 ],
 	[ "Polearm Millions Baroque Works", "QCK", "Striker", 2, 5, 6, 0, 25, 33626, 197, 74, 24, 620, 278, 60, 1 ],
@@ -247,19 +247,19 @@ window.units = [
 	[ "Bazooka Billions Baroque Works", "INT", "Shooter", 3, 9, 4, 1, 50, 261406, 550, 319, 12, 1020, 655, 32, 1 ],
 	[ "Chopper Man", "PSY", "Fighter", 4, 10, 6, 5, 50, 130703, 250, 250, 125, 500, 500, 250, 1 ],
 	[ "Tony Tony Chopper Pre-Rampage", "STR", "Fighter", 4, 30, 6, 1, 70, 1066998, 280, 180, 300, 1808, 851, 0, 1 ],
-	[ "Tony Tony Chopper Post-Rampage", "STR", [ "Fighter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1808, 851, -350, 3660, 1500, -900, 1 ],
-	[ "Marco", "PSY", [ "Fighter", "Tough" ], 4, 18, 6, 3, 50, 392109, 172, 125, 64, 1030, 676, 220, 1 ],
-	[ "Marco the Phoenix", "PSY", [ "Fighter", "Tough" ], 5, 28, 4, 4, 99, 4000000, 951, 618, 180, 2258, 1100, 390, 1 ],
-	[ "Jozu", "QCK", [ "Fighter", "Tough" ], 4, 18, 4, 3, 50, 392109, 412, 109, 27, 1820, 596, 98, 1 ],
-	[ "Diamond Jozu", "QCK", [ "Fighter", "Tough" ], 5, 28, 4, 4, 99, 4000000, 1748, 524, 69, 3300, 987, 231, 1 ],
-	[ "Vista", "INT", [ "Slasher", "Tough" ], 4, 18, 5, 3, 50, 392109, 290, 206, 15, 1388, 806, 100, 1 ],
-	[ "Flower Sword Vista", "INT", [ "Slasher", "Tough" ], 5, 28, 5, 4, 99, 4000000, 1314, 732, 72, 2840, 1325, 185, 1 ],
+	[ "Tony Tony Chopper Post-Rampage", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1808, 851, -350, 3660, 1500, -900, 1 ],
+	[ "Marco", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 6, 3, 50, 392109, 172, 125, 64, 1030, 676, 220, 1 ],
+	[ "Marco the Phoenix", "PSY", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 951, 618, 180, 2258, 1100, 390, 1 ],
+	[ "Jozu", "QCK", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 50, 392109, 412, 109, 27, 1820, 596, 98, 1 ],
+	[ "Diamond Jozu", "QCK", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 1748, 524, 69, 3300, 987, 231, 1 ],
+	[ "Vista", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 5, 3, 50, 392109, 290, 206, 15, 1388, 806, 100, 1 ],
+	[ "Flower Sword Vista", "INT", [ "Slasher", "Powerhouse" ], 5, 28, 5, 4, 99, 4000000, 1314, 732, 72, 2840, 1325, 185, 1 ],
 	[ "Izo", "DEX", [ "Shooter", "Cerebral" ], 4, 18, 4, 3, 50, 392109, 232, 130, 50, 1300, 634, 172, 1 ],
 	[ "Flintlock Pistols Izo", "DEX", [ "Shooter", "Cerebral" ], 5, 28, 5, 4, 99, 4000000, 1224, 585, 136, 2550, 1068, 319, 1 ],
 	[ "Blamenco", "STR", [ "Striker", "Free Spirit" ], 4, 18, 4, 3, 50, 392109, 204, 192, 34, 1150, 775, 150, 1 ],
 	[ "Blamenco the Mallet", "STR", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 1086, 726, 112, 2488, 1252, 268, 1 ],
-	[ "Edward Newgate", "STR", [ "Striker", "Tough" ], 5, 40, 4, 4, 70, 1422664, 1338, 522, 80, 3220, 1060, 156, 1 ],
-	[ "Whitebeard", "STR", [ "Striker", "Tough" ], 6, 55, 4, 5, 99, 5000000, 3148, 978, 110, 3900, 1360, 235, 1 ],
+	[ "Edward Newgate", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 4, 70, 1422664, 1338, 522, 80, 3220, 1060, 156, 1 ],
+	[ "Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 3148, 978, 110, 3900, 1360, 235, 1 ],
 	[ "Training Coby", "PSY", [ "Striker", "Ambition" ], 3, 12, 5, 1, 50, 261406, 90, 81, 55, 780, 514, 218, 0.7 ],
 	[ "Petty Officer Coby", "PSY", [ "Fighter", "Ambition" ], 4, 18, 6, 2, 99, 3000000, 701, 485, 191, 1926, 984, 340, 1 ],
 	[ "Training Helmeppo", "INT", [ "Striker", "Ambition" ], 3, 12, 5, 1, 50, 261406, 108, 93, 43, 890, 605, 185, 0.7 ],
@@ -289,8 +289,8 @@ window.units = [
 	[ "Armed Shooter Unit Black Pirates", "INT", "Shooter", 3, 12, 5, 1, 60, 449516, 280, 137, 174, 500, 400, 297, 0.7 ],
 	[ "Skilled Gunner", "INT", "Shooter", 3, 15, 5, 2, 70, 711332, 1280, 500, 20, 1550, 850, 40, 0.7 ],
 	[ "Mr. 13 & Ms. Friday The Unluckies", "INT", "Shooter", 3, 13, 7, 3, 50, 392109, 44, 44, 44, 596, 893, 130, 0.7 ],
-	[ "Dorry", "PSY", [ "Slasher", "Tough" ], 4, 25, 4, 2, 70, 1422664, 450, 370, 102, 1662, 783, 153, 1.5 ],
-	[ "Broggy", "INT", [ "Slasher", "Tough" ], 4, 25, 4, 2, 70, 1422664, 440, 411, 88, 1634, 875, 117, 1.5 ],
+	[ "Dorry", "PSY", [ "Slasher", "Powerhouse" ], 4, 25, 4, 2, 70, 1422664, 450, 370, 102, 1662, 783, 153, 1.5 ],
+	[ "Broggy", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 2, 70, 1422664, 440, 411, 88, 1634, 875, 117, 1.5 ],
 	[ "Triceratops", "QCK", "Fighter", 2, 25, 4, 0, 50, 392109, 500, 200, 50, 965, 700, 50, 1.5 ],
 	[ "Rex", "STR", "Fighter", 2, 25, 4, 0, 50, 392109, 300, 300, 50, 520, 900, 50, 1.5 ],
 	[ "Brontosaurus", "DEX", "Fighter", 2, 25, 4, 0, 50, 392109, 400, 250, 50, 755, 755, 50, 1.5 ],
@@ -303,24 +303,24 @@ window.units = [
 	[ "Green Plated Lobster", "DEX", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
 	[ "Yellow Plated Lobster", "PSY", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
 	[ "Black Plated Lobster", "INT", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
-	[ "Monkey D. Garp", "PSY", [ "Fighter", "Tough" ], 4, 30, 4, 1, 70, 1066998, 280, 145, 50, 1442, 722, 131, 1 ],
-	[ "Garp the Fist", "PSY", [ "Fighter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1377, 685, 105, 2852, 1220, 225, 1 ],
+	[ "Monkey D. Garp", "PSY", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 280, 145, 50, 1442, 722, 131, 1 ],
+	[ "Garp the Fist", "PSY", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1377, 685, 105, 2852, 1220, 225, 1 ],
 	[ "Trafalgar Law", "DEX", [ "Slasher", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 104, 125, 73, 876, 702, 238, 1 ],
 	[ "Trafalgar Law ROOM", "DEX", [ "Slasher", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
 	[ "Basil Hawkins", "INT", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 200, 200, 7, 1165, 750, 127, 1 ],
 	[ "Basil Hawkins the Magician", "INT", [ "Striker", "Cerebral" ], 5, 28, 6, 4, 99, 4000000, 1095, 717, 85, 2480, 1295, 255, 1 ],
 	[ "Killer", "QCK", [ "Striker", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 180, 250, 0, 1228, 895, -50, 1 ],
 	[ "Massacre Soldier Killer", "QCK", [ "Striker", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1120, 811, 0, 2570, 1449, -200, 1 ],
-	[ "Urouge", "PSY", [ "Striker", "Tough" ], 4, 18, 4, 3, 70, 1066998, 108, 108, 35, 1290, 798, 108, 1 ],
-	[ "Mad Monk Urouge", "PSY", [ "Striker", "Tough" ], 5, 28, 5, 4, 99, 4000000, 1202, 730, 75, 2071, 1343, 200, 1 ],
-	[ "Bepo", "STR", [ "Fighter", "Tough" ], 4, 18, 4, 3, 70, 1066998, 120, 105, 80, 820, 690, 246, 1 ],
-	[ "Bepo the Martial Artist", "STR", [ "Fighter", "Tough" ], 5, 28, 6, 4, 99, 4000000, 755, 640, 198, 1880, 1200, 405, 1 ],
+	[ "Urouge", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 108, 108, 35, 1290, 798, 108, 1 ],
+	[ "Mad Monk Urouge", "PSY", [ "Striker", "Powerhouse" ], 5, 28, 5, 4, 99, 4000000, 1202, 730, 75, 2071, 1343, 200, 1 ],
+	[ "Bepo", "STR", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 120, 105, 80, 820, 690, 246, 1 ],
+	[ "Bepo the Martial Artist", "STR", [ "Fighter", "Powerhouse" ], 5, 28, 6, 4, 99, 4000000, 755, 640, 198, 1880, 1200, 405, 1 ],
 	[ "Kalifa", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 116, 65, 51, 850, 540, 227, 1 ],
 	[ "Beautiful Secretary Kalifa", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 6, 2, 99, 3000000, 788, 488, 177, 1728, 963, 378, 1 ],
 	[ "Paulie", "DEX", "Striker", 3, 12, 5, 1, 50, 392109, 162, 102, 31, 882, 705, 166, 1 ],
 	[ "Paulie Dock One Foreman/Mast Specialist", "DEX", "Striker", 4, 18, 4, 2, 99, 3000000, 812, 617, 130, 2300, 1070, 231, 1 ],
-	[ "Rob Lucci", "QCK", [ "Slasher", "Tough" ], 3, 12, 4, 1, 50, 392109, 132, 126, 28, 1192, 721, 106, 1 ],
-	[ "Rob Lucci Dock One Sawyer, Treenail Specialist", "QCK", [ "Slasher", "Tough" ], 4, 18, 6, 2, 99, 3000000, 1107, 654, 69, 2220, 1203, 177, 1 ],
+	[ "Rob Lucci", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 4, 1, 50, 392109, 132, 126, 28, 1192, 721, 106, 1 ],
+	[ "Rob Lucci Dock One Sawyer, Treenail Specialist", "QCK", [ "Slasher", "Powerhouse" ], 4, 18, 6, 2, 99, 3000000, 1107, 654, 69, 2220, 1203, 177, 1 ],
 	[ "Kaku", "QCK", "Striker", 3, 12, 5, 1, 50, 392109, 172, 79, 37, 1233, 635, 131, 0.7 ],
 	[ "Kaku Dock One Carpentry Specialist", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 4, 2, 99, 3000000, 1132, 552, 98, 2517, 988, 213, 0.7 ],
 	[ "Lulu", "QCK", "Shooter", 3, 12, 6, 2, 70, 1066998, 290, 168, 88, 985, 682, 223, 1 ],
@@ -333,13 +333,13 @@ window.units = [
 	[ "Chessmarimo", "DEX", "Striker", 4, 11, 7, 2, 70, 1066998, 525, 396, 145, 1290, 840, 185, 1 ],
 	[ "Dr. Kureha", "PSY", [ "Slasher", "Cerebral" ], 3, 20, 5, 2, 50, 392109, 35, 32, 88, 200, 200, 510, 1.5 ],
 	[ "Lapin", "INT", "Fighter", 2, 15, 5, 0, 35, 90778, 200, 200, 25, 550, 550, 53, 1.5 ],
-	[ "Lapin Adult", "INT", [ "Fighter", "Tough" ], 3, 20, 4, 2, 70, 1066998, 380, 480, 38, 1100, 950, 100, 1.5 ],
+	[ "Lapin Adult", "INT", [ "Fighter", "Powerhouse" ], 3, 20, 4, 2, 70, 1066998, 380, 480, 38, 1100, 950, 100, 1.5 ],
 	[ "Franky", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 128, 128, 28, 1220, 680, 112, 1 ],
 	[ "Dismantler Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 3000000, 1138, 637, 71, 2453, 1032, 198, 1 ],
 	[ "Kiwi", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 777, 444, 265, 1 ],
 	[ "Mozu", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 555, 555, 265, 1 ],
-	[ "Kraken Surume", "STR", [ "Striker", "Tough" ], 3, 12, 6, 1, 50, 392109, 99, 99, 188, 1440, 685, 133, 1 ],
-	[ "Kraken Monster of the North", "STR", [ "Striker", "Tough" ], 4, 20, 8, 2, 99, 3000000, 1355, 602, 118, 2700, 1111, 33, 1 ],
+	[ "Kraken Surume", "STR", [ "Striker", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 99, 99, 188, 1440, 685, 133, 1 ],
+	[ "Kraken Monster of the North", "STR", [ "Striker", "Powerhouse" ], 4, 20, 8, 2, 99, 3000000, 1355, 602, 118, 2700, 1111, 33, 1 ],
 	[ "Red Jeweled Porc", "STR", "Booster", 2, 2, 4, 0, 10, 2330, 45, 27, 7, 129, 77, 15, 1 ],
 	[ "Blue Jeweled Porc", "QCK", "Booster", 2, 2, 4, 0, 10, 2330, 49, 21, 9, 145, 65, 19, 1 ],
 	[ "Green Jeweled Porc", "DEX", "Booster", 2, 2, 4, 0, 10, 2330, 47, 25, 8, 133, 72, 17, 1 ],
@@ -350,16 +350,16 @@ window.units = [
 	[ "Emerald Jeweled Porc", "DEX", "Booster", 3, 5, 4, 0, 1, 0, 173, 92, 24, 173, 92, 24, 1 ],
 	[ "Topaz Jeweled Porc", "PSY", "Booster", 3, 5, 4, 0, 1, 0, 160, 78, 35, 160, 78, 35, 1 ],
 	[ "Amethyst Jeweled Porc", "INT", "Booster", 3, 5, 4, 0, 1, 0, 159, 108, 21, 159, 108, 21, 1 ],
-	[ "Zephyr", "INT", [ "Shooter", "Tough" ], 4, 30, 7, 1, 70, 1066998, 320, 133, 4, 1588, 699, 29, 1 ],
-	[ "Zephyr NEO Navy Commander", "INT", [ "Shooter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
+	[ "Zephyr", "INT", [ "Shooter", "Powerhouse" ], 4, 30, 7, 1, 70, 1066998, 320, 133, 4, 1588, 699, 29, 1 ],
+	[ "Zephyr NEO Navy Commander", "INT", [ "Shooter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
 	[ "Ain", "QCK", [ "Shooter", "Cerebral" ], 3, 8, 6, 1, 35, 136167, 96, 87, 47, 688, 421, 195, 1 ],
 	[ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Cerebral" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
 	[ "Eustass Kid", "STR", [ "Striker", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
 	[ "Captain Kid", "STR", [ "Striker", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
 	[ "Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
 	[ "Roar of the Sea Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1085, 580, 144, 2801, 1111, 300, 1 ],
-	[ "X Drake", "INT", [ "Striker", "Tough" ], 4, 18, 5, 3, 70, 1066998, 242, 112, 32, 1515, 688, 88, 1 ],
-	[ "Red Flag X Drake", "INT", [ "Fighter", "Tough" ], 5, 28, 6, 4, 99, 4000000, 1432, 611, 57, 3580, 1098, 132, 1 ],
+	[ "X Drake", "INT", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 242, 112, 32, 1515, 688, 88, 1 ],
+	[ "Red Flag X Drake", "INT", [ "Fighter", "Powerhouse" ], 5, 28, 6, 4, 99, 4000000, 1432, 611, 57, 3580, 1098, 132, 1 ],
 	[ "Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 277, 80, 44, 1370, 440, 220, 1 ],
 	[ "Big Eater Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1248, 401, 158, 3000, 720, 400, 1 ],
 	[ "Capone Bege", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 199, 102, 34, 1050, 755, 153, 1 ],
@@ -391,33 +391,33 @@ window.units = [
 	[ "Emporio Ivankov Queen of Kamabakka Queendom", "QCK", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1642, 470, 132, 3030, 1155, 290, 1 ],
 	[ "Perona", "DEX", [ "Shooter", "Ambition" ], 3, 10, 4, 1, 50, 392109, 134, 44, 55, 944, 422, 222, 1 ],
 	[ "Ghost Princess Perona", "DEX", [ "Shooter", "Ambition" ], 4, 18, 4, 2, 99, 3000000, 887, 377, 198, 1598, 791, 430, 1 ],
-	[ "Kumacy", "STR", [ "Fighter", "Tough" ], 3, 11, 6, 1, 70, 1066998, 500, 255, 0, 1660, 904, 0, 1 ],
+	[ "Kumacy", "STR", [ "Fighter", "Powerhouse" ], 3, 11, 6, 1, 70, 1066998, 500, 255, 0, 1660, 904, 0, 1 ],
 	[ "Dog Penguin", "QCK", "Fighter", 3, 11, 4, 1, 50, 392109, 986, 500, 54, 1420, 722, 0, 1 ],
 	[ "Miss Merry Christmas", "QCK", "Fighter", 3, 11, 5, 1, 35, 136167, 220, 51, 42, 980, 422, 147, 1 ],
 	[ "Miss Merry Christmas Human Mole", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 910, 348, 113, 1401, 690, 233, 1 ],
-	[ "Mr. 4", "STR", [ "Shooter", "Tough" ], 3, 11, 4, 1, 35, 136167, 250, 110, 14, 1046, 590, 80, 1 ],
-	[ "Mr. 4 and Lassoo the Dog-Gun", "STR", [ "Shooter", "Tough" ], 4, 15, 6, 2, 70, 1066998, 980, 522, 43, 1606, 910, 110, 1 ],
+	[ "Mr. 4", "STR", [ "Shooter", "Powerhouse" ], 3, 11, 4, 1, 35, 136167, 250, 110, 14, 1046, 590, 80, 1 ],
+	[ "Mr. 4 and Lassoo the Dog-Gun", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 6, 2, 70, 1066998, 980, 522, 43, 1606, 910, 110, 1 ],
 	[ "Miss Doublefinger", "DEX", [ "Striker", "Cerebral" ], 3, 11, 8, 1, 35, 136167, 115, 87, 44, 770, 501, 158, 1 ],
 	[ "Miss Doublefinger Human Spike", "DEX", [ "Striker", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 720, 435, 120, 1081, 701, 288, 1 ],
 	[ "Mr. 1", "STR", [ "Slasher", "Cerebral" ], 3, 11, 4, 1, 35, 136167, 255, 156, 1, 1152, 744, 10, 1 ],
 	[ "Mr. 1 Human Sword", "STR", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 1021, 652, 2, 1880, 1042, 15, 1 ],
 	[ "Rebecca", "QCK", "Slasher", 4, 14, 5, 2, 70, 1422664, 242, 115, 108, 1525, 707, 345, 1 ],
-	[ "Absalom", "STR", [ "Shooter", "Tough" ], 3, 12, 6, 1, 50, 392109, 158, 93, 35, 1330, 602, 126, 1 ],
-	[ "Absalom of the Graveyard", "STR", [ "Shooter", "Tough" ], 4, 20, 7, 2, 99, 3000000, 1271, 545, 77, 2601, 1008, 192, 1 ],
+	[ "Absalom", "STR", [ "Shooter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 158, 93, 35, 1330, 602, 126, 1 ],
+	[ "Absalom of the Graveyard", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 7, 2, 99, 3000000, 1271, 545, 77, 2601, 1008, 192, 1 ],
 	[ "General Zombie", "INT", "Fighter", 3, 12, 5, 1, 70, 1066998, 920, 352, 0, 2610, 605, 0, 1 ],
 	[ "Jigoro of the Wind", "DEX", "Slasher", 3, 9, 6, 1, 50, 392109, 426, 258, 37, 1348, 744, 0, 1 ],
 	[ "Sir Crocodile Warlord of the Sea", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1088, 659, 147, 2980, 1380, 150, 1 ],
-	[ "Jimbe", "QCK", [ "Fighter", "Tough" ], 4, 15, 4, 3, 70, 1066998, 266, 101, 35, 1590, 660, 118, 1 ],
-	[ "Jimbe Warlord of the Sea", "QCK", [ "Fighter", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
-	[ "Bartholomew Kuma", "STR", [ "Shooter", "Tough" ], 4, 15, 4, 3, 70, 1066998, 290, 110, 33, 1525, 692, 118, 1 ],
-	[ "Bartholomew Kuma Warlord of the Sea", "STR", [ "Shooter", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1445, 644, 82, 2734, 1205, 262, 1 ],
+	[ "Jimbe", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 266, 101, 35, 1590, 660, 118, 1 ],
+	[ "Jimbe Warlord of the Sea", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
+	[ "Bartholomew Kuma", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 290, 110, 33, 1525, 692, 118, 1 ],
+	[ "Bartholomew Kuma Warlord of the Sea", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1445, 644, 82, 2734, 1205, 262, 1 ],
 	[ "Gecko Moria", "INT", [ "Striker", "Ambition" ], 4, 15, 4, 3, 70, 1066998, 355, 102, 15, 1928, 677, 33, 1 ],
 	[ "Gecko Moria Warlord of the Sea", "INT", [ "Striker", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 1845, 612, 33, 3900, 1120, 118, 1 ],
 	[ "Boa Hancock", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 416, 251, 197, 1595, 859, 340, 1 ],
 	[ "Boa Hancock Warlord of the Sea", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1512, 782, 301, 2860, 1320, 515, 1 ],
 	[ "Donquixote Doflamingo", "DEX", [ "Slasher", "Ambition" ], 4, 30, 4, 1, 70, 1066998, 200, 186, 30, 1061, 790, 145, 1 ],
 	[ "Donquixote Doflamingo Warlord of the Sea", "DEX", [ "Slasher", "Ambition" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
-	[ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Tough" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
+	[ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Powerhouse" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
 	[ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
 	[ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Ambition" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
 	[ "Nami Mirage Tempo: The Heavens", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 348, 201, 75, 1260, 988, 361, 1 ],
@@ -448,8 +448,8 @@ window.units = [
 	[ "Blackbeard", "STR", [ "Shooter", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1338, 744, 18, 3140, 1418, 83, 1 ],
 	[ "Thatch", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 5, 3, 50, 522812, 208, 103, 63, 1246, 626, 188, 1 ],
 	[ "Twin-Blade Thatch", "QCK", [ "Slasher", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1184, 575, 146, 2505, 1190, 302, 1 ],
-	[ "Namule", "DEX", [ "Fighter", "Tough" ], 4, 18, 4, 3, 50, 522812, 155, 133, 40, 1081, 822, 142, 1 ],
-	[ "One-Hit Namule", "DEX", [ "Fighter", "Tough" ], 5, 28, 4, 4, 99, 4000000, 999, 755, 117, 2398, 1303, 262, 1 ],
+	[ "Namule", "DEX", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 50, 522812, 155, 133, 40, 1081, 822, 142, 1 ],
+	[ "One-Hit Namule", "DEX", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 999, 755, 117, 2398, 1303, 262, 1 ],
 	[ "Rakuyo", "PSY", [ "Striker", "Ambition" ], 4, 18, 4, 3, 50, 522812, 161, 122, 65, 1000, 733, 193, 1 ],
 	[ "Morning Star Rakuyo", "PSY", [ "Striker", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 945, 681, 122, 2001, 1320, 337, 1 ],
 	[ "Fossa", "STR", [ "Slasher", "Ambition" ], 4, 18, 4, 3, 50, 522812, 150, 160, 34, 1120, 831, 132, 1 ],
@@ -503,10 +503,10 @@ window.units = [
 	[ "Kaya A Rich Young Girl from Syrup Village", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 331, 151, 275, 405, 250, 550, 1.5 ],
 	[ "Hotori and Kotori", "INT", "Fighter", 3, 9, 6, 1, 35, 136167, 242, 74, 27, 1055, 455, 122, 1 ],
 	[ "Hotori and Kotori Skypiea Vice Head Enforcers", "INT", "Fighter", 4, 15, 4, 2, 70, 1066998, 989, 385, 92, 1959, 601, 151, 1 ],
-	[ "Pell", "QCK", [ "Slasher", "Tough" ], 3, 9, 6, 1, 35, 136167, 175, 70, 40, 1000, 427, 142, 1 ],
-	[ "Pell The Guardian Falcon of Alabasta", "QCK", [ "Slasher", "Tough" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
-	[ "Chaka", "STR", [ "Slasher", "Tough" ], 3, 9, 5, 1, 35, 136167, 173, 120, 21, 822, 615, 109, 1 ],
-	[ "Chaka The Guardian Jackal of Alabasta", "STR", [ "Slasher", "Tough" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
+	[ "Pell", "QCK", [ "Slasher", "Powerhouse" ], 3, 9, 6, 1, 35, 136167, 175, 70, 40, 1000, 427, 142, 1 ],
+	[ "Pell The Guardian Falcon of Alabasta", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
+	[ "Chaka", "STR", [ "Slasher", "Powerhouse" ], 3, 9, 5, 1, 35, 136167, 173, 120, 21, 822, 615, 109, 1 ],
+	[ "Chaka The Guardian Jackal of Alabasta", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
 	[ "Sir Crocodile, the Strongest Prisoner Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
 	[ "Sir Crocodile, the Strongest Prisoner Ex-Warlord", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
 	[ "Daz Bones, Convict Mr. 1", "INT", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
@@ -516,11 +516,11 @@ window.units = [
 	[ "Heracles'n", "PSY", [ "Shooter", "Cerebral" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
 	[ "Heracles'n the Hero of the Forest", "PSY", [ "Shooter", "Cerebral" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
 	[ "Usopp'n", "PSY", "Shooter", 4, 10, 5, 1, 50, 261406, 444, 237, 47, 1080, 648, 144, 1 ],
-	[ "Usopp'n, Pupil of Heracles'n", "PSY", [ "Shooter", "Tough" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
+	[ "Usopp'n, Pupil of Heracles'n", "PSY", [ "Shooter", "Powerhouse" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
 	[ "Monkey D. Luffy, Merveille's Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
 	[ "Monkey D. Luffy, Straw Hat Pirates' Attack", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
-	[ "Sanji, Merveille's Adventurer", "INT", [ "Fighter", "Tough" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
-	[ "Sanji, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Tough" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
+	[ "Sanji, Merveille's Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
+	[ "Sanji, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
 	[ "Nami, Merveille's Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
 	[ "Nami and Billy the Thunder Bird", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
 	[ "Brook, Merveille's Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
@@ -537,10 +537,10 @@ window.units = [
 	[ "Nami Blossom Climate", "DEX", [ "Shooter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 750, 247, 241, 1783, 670, 445, 1 ],
 	[ "Domino", "PSY", [ "Fighter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 32, 20, 80, 713, 366, 318, 1 ],
 	[ "Domino, Impel Down's Head Jailer", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 2, 99, 3000000, 634, 301, 265, 1800, 694, 449, 1 ],
-	[ "Minorhinoceros", "STR", [ "Striker", "Tough" ], 3, 30, 6, 0, 70, 1066998, 1055, 655, 0, 2122, 815, -250, 1 ],
-	[ "Basilisk", "DEX", [ "Fighter", "Tough" ], 3, 12, 4, 1, 70, 1066998, 612, 289, 31, 1525, 644, 128, 1 ],
+	[ "Minorhinoceros", "STR", [ "Striker", "Powerhouse" ], 3, 30, 6, 0, 70, 1066998, 1055, 655, 0, 2122, 815, -250, 1 ],
+	[ "Basilisk", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 4, 1, 70, 1066998, 612, 289, 31, 1525, 644, 128, 1 ],
 	[ "Ohm", "STR", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 770, 480, -600, 2200, 1050, -600, 1 ],
-	[ "Nola Giant Snake", "PSY", [ "Fighter", "Tough" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
+	[ "Nola Giant Snake", "PSY", [ "Fighter", "Powerhouse" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
 	[ "Wyper", "DEX", [ "Shooter", "Free Spirit" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
 	[ "Wyper Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
 	[ "Eneru", "PSY", [ "Shooter", "Ambition" ], 3, 12, 4, 2, 50, 392109, 177, 141, 58, 951, 615, 185, 1 ],
@@ -549,8 +549,8 @@ window.units = [
 	[ "Monkey D. Luffy Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
 	[ "Sadie", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
 	[ "Sadie, Impel Down Chief Jailer", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
-	[ "Minokoala", "STR", [ "Fighter", "Tough" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
-	[ "Manticore", "QCK", [ "Fighter", "Tough" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
+	[ "Minokoala", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
+	[ "Manticore", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
 	[ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Ambition" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
 	[ "Roronoa Zoro, Straw Hat Pirates' Attack", "DEX", [ "Slasher", "Ambition" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
 	[ "Usopp, Merveille's Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
@@ -563,13 +563,13 @@ window.units = [
 	[ "Portgas D. Ace Black Clad Whitebeard 2nd Div. Commander", "DEX", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1877, 702, 214, 3818, 1352, 321, 1 ],
 	[ "Porche", "PSY", "Shooter", 3, 10, 6, 1, 50, 392109, 33, 29, 58, 536, 338, 300, 1 ],
 	[ "Capote", "QCK", "Striker", 3, 10, 5, 1, 50, 392109, 124, 48, 36, 1188, 482, 139, 1 ],
-	[ "Hamburg", "DEX", [ "Striker", "Tough" ], 3, 10, 5, 1, 50, 392109, 103, 58, 32, 1024, 620, 122, 1 ],
-	[ "Pickles", "QCK", [ "Fighter", "Tough" ], 3, 10, 4, 1, 50, 392109, 130, 51, 25, 1202, 603, 98, 1 ],
-	[ "Big Bun", "STR", [ "Slasher", "Tough" ], 3, 15, 6, 1, 70, 1066998, 180, 105, 2, 1895, 850, 3, 1 ],
+	[ "Hamburg", "DEX", [ "Striker", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 103, 58, 32, 1024, 620, 122, 1 ],
+	[ "Pickles", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 4, 1, 50, 392109, 130, 51, 25, 1202, 603, 98, 1 ],
+	[ "Big Bun", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 180, 105, 2, 1895, 850, 3, 1 ],
 	[ "Foxy", "INT", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 106, 51, 30, 788, 433, 175, 1 ],
 	[ "The Silver Fox Foxy", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 725, 373, 144, 1212, 698, 266, 1 ],
-	[ "Monkey D. Luffy Davy Back Fight: Afro", "STR", [ "Fighter", "Tough" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
-	[ "Monkey D. Luffy Davy Back Fight: Combat", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
+	[ "Monkey D. Luffy Davy Back Fight: Afro", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
+	[ "Monkey D. Luffy Davy Back Fight: Combat", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
 	[ "Usopp Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
 	[ "Tony Tony Chopper Davy Back Fight: Mask", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
 	[ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
@@ -594,18 +594,18 @@ window.units = [
 	[ "Jade Hime Turtle", "DEX", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
 	[ "Amber Hime Turtle", "PSY", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
 	[ "Onyx Hime Turtle", "INT", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
-	[ "Tony Tony Chopper Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Tough" ], 4, 12, 4, 2, 50, 392109, 220, 95, 46, 1324, 589, 186, 0.7 ],
-	[ "Tony Tony Chopper Voyage Dream: Great Doctor", "STR", [ "Fighter", "Tough" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
+	[ "Tony Tony Chopper Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 220, 95, 46, 1324, 589, 186, 0.7 ],
+	[ "Tony Tony Chopper Voyage Dream: Great Doctor", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
 	[ "Buggy the Pirate Apprentice", "INT", [ "Slasher", "Ambition" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
 	[ "Buggy, Roger Pirates", "INT", [ "Slasher", "Ambition" ], 4, 19, 5, 2, 99, 3000000, 813, 358, 123, 1602, 709, 290, 1 ],
 	[ "Shanks the Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
 	[ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Free Spirit" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
 	[ "Eneru 200,000,000 Volt Amaru", "QCK", [ "Striker", "Ambition" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
 	[ "Eneru, Lightning Incarnate 200,000,000 Volt Amaru", "QCK", [ "Striker", "Ambition" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
-	[ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Tough" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
-	[ "Sanji Voyage Dream: All Blue", "DEX", [ "Fighter", "Tough" ], 5, 20, 6, 3, 99, 3000000, 1413, 577, 100, 2350, 1052, 208, 0.7 ],
-	[ "Zeff the Pirate", "DEX", [ "Fighter", "Tough" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
-	[ "Red Leg Zeff, Captain of the Cook Pirates", "DEX", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 1152, 599, 81, 2000, 1088, 258, 1 ],
+	[ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
+	[ "Sanji Voyage Dream: All Blue", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1413, 577, 100, 2350, 1052, 208, 0.7 ],
+	[ "Zeff the Pirate", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
+	[ "Red Leg Zeff, Captain of the Cook Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1152, 599, 81, 2000, 1088, 258, 1 ],
 	[ "Thug Patty", "STR", "Shooter", 3, 10, 4, 1, 50, 522812, 155, 120, 25, 1080, 648, 132, 0.7 ],
 	[ "Thug Carne", "QCK", "Slasher", 3, 10, 6, 1, 50, 522812, 153, 91, 35, 1054, 571, 162, 0.7 ],
 	[ "Hiking Bear", "INT", "Fighter", 2, 7, 5, 0, 35, 90778, 129, 32, 8, 1410, 225, 30, 0.7 ],
@@ -613,9 +613,9 @@ window.units = [
 	[ "Brook Voyage Log: Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 208, 99, 29, 1326, 603, 168, 0.7 ],
 	[ "Brook Voyage Dream: Promised Meeting", "DEX", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1276, 560, 132, 2117, 1009, 279, 0.7 ],
 	[ "Zambai", "PSY", "Shooter", 3, 16, 4, 2, 70, 1066998, 230, 90, 48, 1580, 702, 168, 1 ],
-	[ "Demolisher Axeman", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
-	[ "Demolisher Spearman", "STR", [ "Striker", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
-	[ "Demolisher Gunner", "STR", [ "Shooter", "Tough" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
+	[ "Demolisher Axeman", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
+	[ "Demolisher Spearman", "STR", [ "Striker", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
+	[ "Demolisher Gunner", "STR", [ "Shooter", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
 	[ "Street Punk: Brawler Red Bounty Hunter", "STR", "Fighter", 3, 13, 6, 1, 60, 674274, 102, 85, 28, 1158, 790, 90, 1 ],
 	[ "Street Punk: Brawler Green Bounty Hunter", "DEX", "Fighter", 3, 13, 6, 1, 60, 674274, 108, 75, 32, 1175, 754, 102, 1 ],
 	[ "Street Punk: Blade Blue Bounty Hunter", "QCK", "Slasher", 3, 13, 5, 1, 60, 674274, 153, 66, 40, 1215, 653, 128, 1 ],
@@ -626,37 +626,37 @@ window.units = [
 	[ "Street Punk: Nails Black Bounty Hunter", "INT", "Striker", 3, 13, 4, 1, 60, 674274, 71, 108, 29, 877, 890, 107, 1 ],
 	[ "Street Punk: Gatling Black Bounty Hunter", "INT", "Shooter", 3, 13, 6, 1, 60, 674274, 133, 90, 3, 1556, 765, 15, 1 ],
 	[ "Street Punk: Gatling Blue Bounty Hunter", "QCK", "Shooter", 3, 13, 6, 1, 60, 674274, 150, 84, 5, 1602, 745, 16, 1 ],
-	[ "Tilestone", "STR", [ "Shooter", "Tough" ], 3, 12, 4, 2, 70, 1066998, 153, 98, 30, 1521, 800, 101, 1 ],
+	[ "Tilestone", "STR", [ "Shooter", "Powerhouse" ], 3, 12, 4, 2, 70, 1066998, 153, 98, 30, 1521, 800, 101, 1 ],
 	[ "Franky Franky Family", "INT", "Fighter", 3, 17, 5, 2, 70, 1066998, 203, 103, 23, 1712, 831, 85, 1 ],
-	[ "Kaku Cipher Pol No. 9", "QCK", [ "Slasher", "Tough" ], 3, 12, 5, 2, 50, 392109, 175, 80, 36, 1224, 643, 120, 1 ],
-	[ "Kaku: Six Powers Cipher Pol No. 9", "QCK", [ "Slasher", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1144, 577, 93, 2523, 1000, 196, 1 ],
-	[ "Rob Lucci Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 3, 12, 4, 2, 50, 392109, 121, 153, 20, 1121, 792, 64, 1 ],
-	[ "Rob Lucci: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 4, 20, 6, 3, 99, 3000000, 1064, 743, 51, 2284, 1289, 134, 1 ],
+	[ "Kaku Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 175, 80, 36, 1224, 643, 120, 1 ],
+	[ "Kaku: Six Powers Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1144, 577, 93, 2523, 1000, 196, 1 ],
+	[ "Rob Lucci Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 121, 153, 20, 1121, 792, 64, 1 ],
+	[ "Rob Lucci: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 1064, 743, 51, 2284, 1289, 134, 1 ],
 	[ "Camie", "QCK", "Fighter", 3, 12, 4, 1, 50, 392109, 90, 23, 62, 960, 352, 273, [ 0.7, 1, 0.7 ] ],
 	[ "Camie, Takoyaki Stand Assistant", "QCK", "Fighter", 4, 18, 5, 2, 99, 3000000, 900, 295, 231, 1731, 698, 455, 0.7 ],
 	[ "Pappug", "INT", "Fighter", 3, 12, 5, 1, 50, 392109, 77, 30, 77, 895, 505, 214, 0.7 ],
-	[ "Hatchan, Takoyaki Stand Owner", "PSY", [ "Slasher", "Tough" ], 3, 16, 6, 2, 99, 3000000, 134, 88, 41, 1788, 888, 187, 0.7 ],
+	[ "Hatchan, Takoyaki Stand Owner", "PSY", [ "Slasher", "Powerhouse" ], 3, 16, 6, 2, 99, 3000000, 134, 88, 41, 1788, 888, 187, 0.7 ],
 	[ "Doma", "QCK", "Slasher", 4, 18, 4, 3, 70, 1066998, 89, 144, 43, 1098, 733, 187, 0.7 ],
 	[ "Bohemian Knight Doma", "QCK", "Slasher", 5, 29, 4, 4, 99, 4000000, 1020, 695, 150, 2134, 1268, 328, 0.7 ],
 	[ "DeCalvan Brothers", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 240, 89, 28, 1880, 668, 73, 0.7 ],
 	[ "DeCalvan Brothers Brothers' Bond", "DEX", "Fighter", 5, 29, 5, 4, 99, 4000000, 1824, 602, 50, 3330, 1183, 158, 0.7 ],
-	[ "Squard", "PSY", [ "Striker", "Tough" ], 4, 18, 5, 3, 70, 1066998, 198, 190, 0, 1351, 810, 0, 0.7 ],
-	[ "Maelstrom Spider Squard", "PSY", [ "Striker", "Tough" ], 5, 29, 5, 4, 99, 4000000, 960, 755, -1, 2755, 1434, -150, 0.7 ],
+	[ "Squard", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 198, 190, 0, 1351, 810, 0, 0.7 ],
+	[ "Maelstrom Spider Squard", "PSY", [ "Striker", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 960, 755, -1, 2755, 1434, -150, 0.7 ],
 	[ "Whitey Bay", "INT", [ "Slasher", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 109, 93, 44, 1140, 600, 223, 0.7 ],
 	[ "Ice Witch Whitey Bay", "INT", [ "Slasher", "Ambition" ], 5, 29, 5, 4, 99, 4000000, 1094, 561, 171, 2278, 993, 399, 0.7 ],
-	[ "Little Oars Jr.", "STR", [ "Shooter", "Tough" ], 4, 20, 6, 3, 70, 1066998, 251, 166, 1, 1900, 734, 3, 0.7 ],
-	[ "Little Oars Jr. Charging!", "STR", [ "Shooter", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
-	[ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Tough" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
-	[ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
+	[ "Little Oars Jr.", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 6, 3, 70, 1066998, 251, 166, 1, 1900, 734, 3, 0.7 ],
+	[ "Little Oars Jr. Charging!", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
+	[ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
+	[ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
 	[ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Cerebral" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
 	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
 	[ "Iron Mask Duval", "DEX", [ "Shooter", "Ambition" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
 	[ "Duval, Head of the Flying Fish Riders", "DEX", [ "Shooter", "Ambition" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
 	[ "Duval, Head of the Rosy Life Riders", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
-	[ "Pirate Arlong", "STR", [ "Slasher", "Tough" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
-	[ "Arlong, Sun Pirates", "STR", [ "Slasher", "Tough" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
-	[ "Kuroobi, Sun Pirates", "STR", [ "Fighter", "Tough" ], 3, 10, 6, 1, 50, 392109, 160, 103, 9, 1233, 744, 70, 1 ],
-	[ "Choo, Sun Pirates", "INT", [ "Shooter", "Tough" ], 3, 10, 5, 1, 50, 392109, 75, 72, 22, 1002, 552, 178, 1 ],
+	[ "Pirate Arlong", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
+	[ "Arlong, Sun Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
+	[ "Kuroobi, Sun Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 50, 392109, 160, 103, 9, 1233, 744, 70, 1 ],
+	[ "Choo, Sun Pirates", "INT", [ "Shooter", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 75, 72, 22, 1002, 552, 178, 1 ],
 	[ "Monkey D. Luffy Swim Ring", "QCK", "Fighter", 4, 15, 6, 2, 99, 2000000, 144, 69, 31, 2232, 933, 242, 1 ],
 	[ "Usopp Voyage Log: Straw Hat Pirates", "QCK", "Striker", 4, 12, 6, 2, 50, 392109, 155, 67, 47, 1085, 513, 235, 0.7 ],
 	[ "Usopp Voyage Dream: Brave Sea Warrior", "QCK", "Striker", 5, 20, 4, 3, 99, 3000000, 1024, 468, 185, 2012, 938, 344, 0.7 ],
@@ -670,8 +670,8 @@ window.units = [
 	[ "Sabo the Revolutionary", "PSY", [ "Free Spirit", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1440, 752, 252, 2985, 1422, 451, 1.5 ],
 	[ "Koala", "DEX", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 94, 122, 48, 996, 644, 226, 1.5 ],
 	[ "Koala the Revolutionary", "DEX", [ "Fighter", "Free Spirit" ], 5, 29, 4, 4, 99, 4000000, 931, 600, 185, 1934, 1212, 392, 1.5 ],
-	[ "Hack", "STR", [ "Fighter", "Tough" ], 4, 18, 4, 3, 70, 1066998, 188, 136, 21, 1241, 721, 151, 1.5 ],
-	[ "Hack the Revolutionary", "STR", [ "Fighter", "Tough" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
+	[ "Hack", "STR", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 188, 136, 21, 1241, 721, 151, 1.5 ],
+	[ "Hack the Revolutionary", "STR", [ "Fighter", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
 	[ "Emporio Ivankov, Newkama Kenpo Instructor", "INT", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
 	[ "Emporio Ivankov the Revolutionary", "INT", [ "Free Spirit", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
 	[ "Inazuma", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 179, 58, 47, 1300, 449, 232, 1.5 ],
@@ -699,13 +699,13 @@ window.units = [
 	[ "Saber Major Navy HQ", "PSY", "Slasher", 3, 13, 6, 1, 70, 1066998, 411, 275, 86, 989, 737, 208, 1 ],
 	[ "Bazooka Major Navy HQ", "STR", "Shooter", 3, 13, 6, 1, 70, 1066998, 547, 362, 44, 1301, 833, 117, 1 ],
 	[ "Knuckle Major Navy HQ", "INT", "Fighter", 3, 13, 5, 1, 70, 1066998, 462, 351, 49, 1244, 876, 112, 1 ],
-	[ "Oimo", "PSY", [ "Striker", "Tough" ], 3, 25, 5, 2, 70, 1778330, 452, 223, 23, 1602, 742, 98, 1 ],
-	[ "Kashii", "INT", [ "Slasher", "Tough" ], 3, 25, 6, 2, 70, 1778330, 426, 242, 21, 1551, 798, 87, 1 ],
+	[ "Oimo", "PSY", [ "Striker", "Powerhouse" ], 3, 25, 5, 2, 70, 1778330, 452, 223, 23, 1602, 742, 98, 1 ],
+	[ "Kashii", "INT", [ "Slasher", "Powerhouse" ], 3, 25, 6, 2, 70, 1778330, 426, 242, 21, 1551, 798, 87, 1 ],
 	[ "Watchdog Unit of the Law", "QCK", "Slasher", 3, 13, 4, 1, 70, 1066998, 122, 43, 40, 1211, 488, 251, 1 ],
 	[ "Righteous Juror", "STR", "Striker", 3, 13, 4, 1, 70, 1066998, 108, 129, 34, 990, 900, 144, 1 ],
 	[ "Three-Headed Baskerville", "DEX", "Slasher", 3, 13, 4, 3, 70, 1066998, 102, 78, 38, 1109, 595, 232, 1 ],
-	[ "Blueno, Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
-	[ "Blueno: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
+	[ "Blueno, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
+	[ "Blueno: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
 	[ "Nico Robin, Devil Child", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
 	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
 	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
@@ -728,14 +728,14 @@ window.units = [
 	[ "Monkey D. Luffy Gum-Gum Gatling", "DEX", [ "Free Spirit", "Fighter" ], 4, 15, 8, 3, 99, 2000000, 212, 100, 46, 1777, 795, 270, 0.7 ],
 	[ "Kalifa, Cipher Pol No.9", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
 	[ "Kalifa Rokushiki, Cipher Pol No.9", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
-	[ "Jabra, Cipher Pol No.9", "INT", [ "Fighter", "Tough" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
-	[ "Jabra Rokushiki, Cipher Pol No.9", "INT", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1272, 521, -200, 2720, 1250, -200, 1 ],
-	[ "Fukuro, Cipher Pol No.9", "STR", [ "Fighter", "Tough" ], 3, 9, 4, 2, 35, 136167, 114, 52, 30, 1123, 408, 122, 1 ],
-	[ "Fukuro Rokushiki, Cipher Pol No.9", "STR", [ "Fighter", "Tough" ], 4, 15, 6, 3, 70, 1066998, 1077, 362, 97, 1850, 690, 177, 1 ],
-	[ "Kumadori, Cipher Pol No.9", "PSY", [ "Striker", "Tough" ], 3, 9, 5, 2, 35, 136167, 102, 60, 29, 1055, 442, 119, 1 ],
-	[ "Kumadori Rokushiki, Cipher Pol No.9", "PSY", [ "Striker", "Tough" ], 4, 15, 4, 3, 70, 1066998, 1000, 398, 88, 1792, 755, 165, 1 ],
-	[ "Kaku Human-Beast, Ox-Ox Fruit Model: Giraffe", "STR", [ "Slasher", "Tough" ], 4, 20, 6, 3, 99, 4000000, 1220, 692, 43, 2526, 1200, 114, 1 ],
-	[ "Lucci Human-Beast, Cat-Cat Fruit Model: Leopard", "QCK", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
+	[ "Jabra, Cipher Pol No.9", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
+	[ "Jabra Rokushiki, Cipher Pol No.9", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1272, 521, -200, 2720, 1250, -200, 1 ],
+	[ "Fukuro, Cipher Pol No.9", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 2, 35, 136167, 114, 52, 30, 1123, 408, 122, 1 ],
+	[ "Fukuro Rokushiki, Cipher Pol No.9", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 70, 1066998, 1077, 362, 97, 1850, 690, 177, 1 ],
+	[ "Kumadori, Cipher Pol No.9", "PSY", [ "Striker", "Powerhouse" ], 3, 9, 5, 2, 35, 136167, 102, 60, 29, 1055, 442, 119, 1 ],
+	[ "Kumadori Rokushiki, Cipher Pol No.9", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 1000, 398, 88, 1792, 755, 165, 1 ],
+	[ "Kaku Human-Beast, Ox-Ox Fruit Model: Giraffe", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 6, 3, 99, 4000000, 1220, 692, 43, 2526, 1200, 114, 1 ],
+	[ "Lucci Human-Beast, Cat-Cat Fruit Model: Leopard", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
 	[ "Spandam", "INT", "Slasher", 4, 7, 5, 1, 35, 136167, 52, 25, 25, 258, 196, 89, 1 ],
 	[ "Franky, Straw Hat Pirates", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1623, 765, 70, 2505, 1149, 130, 1 ],
 	[ "Nero", "QCK", [ "Shooter", "Ambition" ], 3, 9, 6, 1, 35, 136167, 59, 112, 20, 324, 543, 83, 0.7 ],
@@ -745,20 +745,20 @@ window.units = [
 	[ "Portgas D. Ace, Record of the Voyage - Whitebeard Pirates", "QCK", [ "Free Spirit", "Fighter" ], 4, 12, 5, 2, 50, 392109, 141, 71, 36, 1121, 585, 189, 1.5 ],
 	[ "Portgas D. Ace Voyage Dream: Pirate Summit", "QCK", [ "Free Spirit", "Fighter" ], 5, 20, 4, 3, 99, 4000000, 1063, 524, 140, 2181, 1100, 258, 1.5 ],
 	[ "Megalo and Princess Shirahoshi", "QCK", "Fighter", 4, 15, 4, 3, 70, 1066998, 1251, 271, 150, 2001, 600, 241, 1 ],
-	[ "Rob Lucci, CP9's Dark Justice", "STR", [ "Tough", "Fighter" ], 5, 30, 4, 4, 70, 1066998, 496, 300, 89, 1656, 800, 245, 1.5 ],
-	[ "Rob Lucci, CP9's Strongest Generation", "STR", [ "Tough", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
-	[ "Kaku, CP9's Dark Justice", "DEX", [ "Slasher", "Tough" ], 4, 17, 6, 3, 70, 1066998, 151, 132, 28, 1183, 713, 178, 1 ],
-	[ "Kaku, CP9's Strongest Generation", "DEX", [ "Slasher", "Tough" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
+	[ "Rob Lucci, CP9's Dark Justice", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 70, 1066998, 496, 300, 89, 1656, 800, 245, 1.5 ],
+	[ "Rob Lucci, CP9's Strongest Generation", "STR", [ "Powerhouse", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
+	[ "Kaku, CP9's Dark Justice", "DEX", [ "Slasher", "Powerhouse" ], 4, 17, 6, 3, 70, 1066998, 151, 132, 28, 1183, 713, 178, 1 ],
+	[ "Kaku, CP9's Strongest Generation", "DEX", [ "Slasher", "Powerhouse" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
 	[ "Kalifa, CP9's Dark Justice", "QCK", [ "Cerebral", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
 	[ "Kalifa, CP9's Strongest Generation", "QCK", [ "Cerebral", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
-	[ "Jabra, CP9's Dark Justice", "QCK", [ "Tough", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
-	[ "Jabra, CP9's Strongest Generation", "QCK", [ "Tough", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
-	[ "Blueno, CP9's Dark Justice", "INT", [ "Tough", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
-	[ "Blueno, CP9's Strongest Generation", "INT", [ "Tough", "Free Spirit" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
-	[ "Fukuro, CP9's Dark Justice", "PSY", [ "Tough", "Fighter" ], 4, 16, 4, 3, 70, 1066998, 151, 97, 46, 1140, 651, 203, 1 ],
-	[ "Fukuro, CP9's Strongest Generation", "PSY", [ "Tough", "Fighter" ], 5, 26, 8, 4, 99, 4000000, 1093, 603, 165, 2415, 1051, 353, 1 ],
-	[ "Kumadori, CP9's Dark Justice", "STR", [ "Tough", "Striker" ], 4, 16, 4, 3, 70, 1066998, 162, 89, 47, 1167, 612, 212, 1 ],
-	[ "Kumadori, CP9's Strongest Generation", "STR", [ "Tough", "Striker" ], 5, 26, 7, 4, 99, 4000000, 1110, 560, 170, 2479, 1018, 355, 1 ],
+	[ "Jabra, CP9's Dark Justice", "QCK", [ "Powerhouse", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
+	[ "Jabra, CP9's Strongest Generation", "QCK", [ "Powerhouse", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
+	[ "Blueno, CP9's Dark Justice", "INT", [ "Powerhouse", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
+	[ "Blueno, CP9's Strongest Generation", "INT", [ "Powerhouse", "Free Spirit" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
+	[ "Fukuro, CP9's Dark Justice", "PSY", [ "Powerhouse", "Fighter" ], 4, 16, 4, 3, 70, 1066998, 151, 97, 46, 1140, 651, 203, 1 ],
+	[ "Fukuro, CP9's Strongest Generation", "PSY", [ "Powerhouse", "Fighter" ], 5, 26, 8, 4, 99, 4000000, 1093, 603, 165, 2415, 1051, 353, 1 ],
+	[ "Kumadori, CP9's Dark Justice", "STR", [ "Powerhouse", "Striker" ], 4, 16, 4, 3, 70, 1066998, 162, 89, 47, 1167, 612, 212, 1 ],
+	[ "Kumadori, CP9's Strongest Generation", "STR", [ "Powerhouse", "Striker" ], 5, 26, 7, 4, 99, 4000000, 1110, 560, 170, 2479, 1018, 355, 1 ],
 	[ "Monkey D. Luffy Halloween Monster", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
 	[ "Usopp Lying Wolf", "PSY", "Shooter", 4, 20, 5, 3, 99, 3000000, 51, 23, 46, 1444, 673, 400, 1 ],
 	[ "Franky Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
@@ -768,7 +768,7 @@ window.units = [
 	[ "Nico Robin Devil Girl", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
 	[ "Sanji Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
 	[ "Brook Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
-	[ "Dalmatian, Navy HQ Vice Admiral", "STR", [ "Fighter", "Tough" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
+	[ "Dalmatian, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
 	[ "Momonga, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
 	[ "Onigumo, Navy HQ Vice Admiral", "DEX", [ "Slasher", "Ambition" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
 	[ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
@@ -792,13 +792,13 @@ window.units = [
 	[ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
 	[ "Iceburg", "INT", [ "Shooter", "Cerebral" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
 	[ "Iceburg, Mayor of W7 and President of Galley-La Company", "INT", [ "Shooter", "Cerebral" ], 4, 16, 4, 3, 70, 1066998, 723, 343, 122, 1401, 702, 224, 1 ],
-	[ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Tough" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
-	[ "Nightmare Luffy Warrior of Hope", "INT", [ "Fighter", "Tough" ], 5, 50, 4, 2, 99, 5000000, 1331, 711, 0, 3020, 1520, 0, 1.5 ],
+	[ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
+	[ "Nightmare Luffy Warrior of Hope", "INT", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1331, 711, 0, 3020, 1520, 0, 1.5 ],
 	[ "Breed", "INT", "Cerebral", 3, 13, 6, 1, 50, 392109, 59, 25, 59, 867, 418, 275, 1.5 ],
-	[ "Breed, User of the Peto-Peto Fruit", "INT", [ "Cerebral", "Tough" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
-	[ "Kung Fu Dugong, Sea Animal Pirates", "PSY", [ "Fighter", "Tough" ], 4, 18, 5, 2, 70, 1778330, 50, 355, 95, 450, 1115, 225, 1.5 ],
-	[ "Sea Lapin, Sea Animal Pirates", "QCK", [ "Fighter", "Tough" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
-	[ "Octopus Boxer, Sea Animal Pirates", "STR", [ "Fighter", "Tough" ], 3, 15, 8, 1, 70, 711332, 99, 91, 2, 1563, 846, 93, 1 ],
+	[ "Breed, User of the Peto-Peto Fruit", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
+	[ "Kung Fu Dugong, Sea Animal Pirates", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 2, 70, 1778330, 50, 355, 95, 450, 1115, 225, 1.5 ],
+	[ "Sea Lapin, Sea Animal Pirates", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
+	[ "Octopus Boxer, Sea Animal Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 15, 8, 1, 70, 711332, 99, 91, 2, 1563, 846, 93, 1 ],
 	[ "Mr. 2 Bon Clay Voyage Log: B.W.", "PSY", [ "Fighter", "Free Spirit" ], 4, 13, 5, 2, 50, 392109, 109, 57, 32, 1033, 513, 212, 1 ],
 	[ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
 	[ "Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 5, 1, 50, 392109, 188, 128, 48, 977, 544, 191, 1 ],
@@ -807,12 +807,12 @@ window.units = [
 	[ "Smoker the White Hunter, Navy HQ Captain", "INT", [ "Striker", "Ambition" ], 5, 40, 5, 3, 99, 4000000, 1549, 640, 112, 2727, 1289, 234, 1.5 ],
 	[ "Pure White Angel Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
 	[ "Pure White Goddess Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
-	[ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Tough" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
-	[ "Courting Lola, Thriller Bark Bride", "STR", [ "Slasher", "Tough" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
+	[ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
+	[ "Courting Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
 	[ "Risky Brothers", "DEX", [ "Slasher", "Free Spirit" ], 3, 9, 4, 2, 50, 392109, 30, 15, 40, 707, 368, 287, 1 ],
-	[ "Cerberus", "QCK", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
-	[ "Tararan", "INT", [ "Cerebral", "Tough" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
-	[ "Bear-Skin Rug", "DEX", [ "Fighter", "Tough" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
+	[ "Cerberus", "QCK", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
+	[ "Tararan", "INT", [ "Cerebral", "Powerhouse" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
+	[ "Bear-Skin Rug", "DEX", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
 	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Free Spirit", "Ambition" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
 	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Free Spirit", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
 	[ "Soldier Zombie Boastful Shadow", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
@@ -820,12 +820,12 @@ window.units = [
 	[ "Soldier Zombie Vile Shadow", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],
 	[ "Soldier Zombie Hateful Shadow", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 71, 40, 92, 903, 648, 29, 1 ],
 	[ "Soldier Zombie Proud Shadow", "PSY", "Fighter", 2, 7, 6, 0, 35, 90778, 70, 24, 92, 887, 551, 72, 1 ],
-	[ "Tricky Wild Zombie", "DEX", "Tough", 3, 12, 4, 1, 50, 392109, 75, 74, 132, 899, 720, 71, 1 ],
-	[ "Brainy Wild Zombie", "INT", "Tough", 3, 12, 4, 1, 50, 392109, 71, 86, 132, 823, 771, 65, 1 ],
-	[ "Hearty Wild Zombie", "PSY", "Tough", 3, 12, 4, 1, 50, 392109, 70, 70, 132, 801, 700, 94, 1 ],
-	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
-	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
-	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Tough" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
+	[ "Tricky Wild Zombie", "DEX", "Powerhouse", 3, 12, 4, 1, 50, 392109, 75, 74, 132, 899, 720, 71, 1 ],
+	[ "Brainy Wild Zombie", "INT", "Powerhouse", 3, 12, 4, 1, 50, 392109, 71, 86, 132, 823, 771, 65, 1 ],
+	[ "Hearty Wild Zombie", "PSY", "Powerhouse", 3, 12, 4, 1, 50, 392109, 70, 70, 132, 801, 700, 94, 1 ],
+	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
+	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
+	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
 	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
 	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
@@ -833,26 +833,26 @@ window.units = [
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
 	[ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
 	[ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
-	[ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Tough" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
-	[ "Tyrant Bartholomew Kuma, Government's Human Weapon", "STR", [ "Cerebral", "Tough" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
+	[ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
+	[ "Tyrant Bartholomew Kuma, Government's Human Weapon", "STR", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
 	[ "Caesar Clown", "DEX", [ "Ambition", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
 	[ "Master Caesar", "DEX", [ "Ambition", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
-	[ "Vergo", "INT", [ "Striker", "Tough" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
-	[ "Vergo, Donquixote Pirates", "INT", [ "Striker", "Tough" ], 5, 30, 4, 4, 99, 4000000, 1464, 730, 60, 3003, 1410, 140, 1 ],
+	[ "Vergo", "INT", [ "Striker", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
+	[ "Vergo, Donquixote Pirates", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1464, 730, 60, 3003, 1410, 140, 1 ],
 	[ "Monet", "PSY", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
 	[ "Monet, Donquixote Pirates", "PSY", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1020, 540, 199, 2131, 1001, 433, 1 ],
 	[ "Baby 5", "STR", [ "Shooter", "Striker" ], 4, 18, 5, 3, 70, 1066998, 114, 142, 53, 892, 743, 230, 1 ],
 	[ "Baby 5, Donquixote Pirates", "STR", [ "Shooter", "Striker" ], 5, 30, 6, 4, 99, 4000000, 850, 692, 185, 1929, 1352, 349, 1 ],
 	[ "Buffalo", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 9, 3, 70, 1066998, 96, 96, 49, 1111, 666, 196, 1 ],
 	[ "Buffalo, Donquixote Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 30, 10, 4, 99, 4000000, 1050, 600, 173, 2769, 1096, 296, 1 ],
-	[ "Tom, Tom's Workers", "DEX", [ "Fighter", "Tough" ], 3, 12, 6, 1, 50, 392109, 159, 95, 30, 1103, 614, 141, 1 ],
-	[ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
+	[ "Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 95, 30, 1103, 614, 141, 1 ],
+	[ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
 	[ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Ambition" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
 	[ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
 	[ "Tin-Plate Wapol", "STR", [ "Shooter", "Ambition" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
 	[ "Slim-up Wapol", "QCK", [ "Shooter", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
-	[ "Robson", "PSY", [ "Fighter", "Tough" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
-	[ "Chopper Playing in the Snow", "DEX", [ "Fighter", "Tough" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
+	[ "Robson", "PSY", [ "Fighter", "Powerhouse" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
+	[ "Chopper Playing in the Snow", "DEX", [ "Fighter", "Powerhouse" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
 	[ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
 	[ "Trafalgar Law Holy Night Nobleman", "DEX", [ "Slasher", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 945, 460, 151, 2003, 1030, 313, 1 ],
 	[ "Jewelry Bonney Ravenous Spoiled Santa", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 5, 3, 50, 392109, 190, 50, 54, 1003, 403, 213, 1 ],
@@ -866,7 +866,7 @@ window.units = [
 	[ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
 	[ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Cerebral", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
 	[ "Usopp Tabasco Star: The Storm", "DEX", "Shooter", 4, 15, 7, 2, 99, 2000000, 258, 152, 94, 1866, 704, 343, 1 ],
-	[ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Tough", "Cerebral" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
+	[ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
 	[ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Ambition", "Cerebral" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
 	[ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Ambition", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
 	[ "Sugar", "QCK", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
@@ -881,18 +881,18 @@ window.units = [
 	[ "Lao-G, Donquixote Pirates", "STR", [ "Fighter", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
 	[ "Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, 5, 2, 70, 1066998, 646, 261, 83, 1247, 693, 220, 1 ],
 	[ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
-	[ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Tough" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
-	[ "Dorry the Blue Ogre", "INT", [ "Slasher", "Tough" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
-	[ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
+	[ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
+	[ "Dorry the Blue Ogre", "INT", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
+	[ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
 	[ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Cerebral" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
 	[ "Buggy, Cheerfully Crazy", "QCK", [ "Ambition", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
 	[ "Hollow Hollow Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
 	[ "Perona, Thriller Bark's Mysterious Four", "DEX", [ "Shooter", "Ambition" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
 	[ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Ambition" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
 	[ "Doctor Hogback, Thriller Bark's Mysterious Four", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
-	[ "Absalom of the Graveyard, Thriller Bark's Mysterious Four", "STR", [ "Shooter", "Tough" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
-	[ "Oars, Special Zombie", "STR", [ "Fighter", "Tough" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
-	[ "Gecko Moria, Shadow's Asgard", "INT", [ "Ambition", "Tough" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
+	[ "Absalom of the Graveyard, Thriller Bark's Mysterious Four", "STR", [ "Shooter", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
+	[ "Oars, Special Zombie", "STR", [ "Fighter", "Powerhouse" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
+	[ "Gecko Moria, Shadow's Asgard", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
 	[ "Brook, Gentleman Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
 	[ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
 	[ "Sir Crocodile, Sand General", "STR", [ "Cerebral", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
@@ -900,17 +900,17 @@ window.units = [
 	[ "Mr. 2 Bon Clay, Dubious Samurai", "INT", [ "Fighter", "Free Spirit" ], 4, 17, 4, 2, 99, 2000000, 42, 20, 22, 1810, 804, 235, 1.5 ],
 	[ "Fresh Franky, Health Comes First", "DEX", [ "Shooter", "Free Spirit" ], 4, 25, 6, 2, 70, 1066998, 659, 244, 85, 1330, 659, 211, 1 ],
 	[ "Cyborg Franky", "DEX", [ "Shooter", "Free Spirit" ], 5, 40, 8, 3, 99, 4000000, 1269, 618, 167, 2515, 1172, 323, 1 ],
-	[ "Broggy, Giant Warrior Pirates", "PSY", [ "Slasher", "Tough" ], 4, 18, 5, 1, 50, 392109, 261, 120, 20, 1354, 539, 90, 1 ],
-	[ "Broggy the Red Ogre", "PSY", [ "Slasher", "Tough" ], 5, 30, 4, 3, 99, 3000000, 1292, 463, 64, 2460, 1090, 156, 1 ],
-	[ "Yokozuna", "STR", [ "Fighter", "Tough" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
+	[ "Broggy, Giant Warrior Pirates", "PSY", [ "Slasher", "Powerhouse" ], 4, 18, 5, 1, 50, 392109, 261, 120, 20, 1354, 539, 90, 1 ],
+	[ "Broggy the Red Ogre", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1292, 463, 64, 2460, 1090, 156, 1 ],
+	[ "Yokozuna", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
 	[ "Roronoa Zoro, the Swordsman Who Wanders Kuraigana Island", "STR", [ "Slasher", "Ambition" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
 	[ "Roronoa Zoro, Pupil of the World's Strongest Swordsman", "STR", [ "Slasher", "Ambition" ], 5, 30, 5, 4, 99, 4000000, 1403, 687, 67, 2830, 1390, 190, 1 ],
 	[ "Nico Robin, Tequila Wolf Inmate", "INT", [ "Cerebral", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 131, 91, 43, 1021, 679, 217, 1 ],
 	[ "Nico Robin, Light of the Revolution", "INT", [ "Cerebral", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
 	[ "Tony Tony Chopper, Torino Kingdom's Peace Mediator", "PSY", [ "Fighter", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
 	[ "Chopper Mask, the Hero Who Protects the World", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
-	[ "Sanji, Kamabakka Queendom Fugitive", "DEX", [ "Tough", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
-	[ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Tough", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
+	[ "Sanji, Kamabakka Queendom Fugitive", "DEX", [ "Powerhouse", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
+	[ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
 	[ "Brook, Harahetternia's Demon Lord", "QCK", [ "Free Spirit", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
 	[ "Brook, BONE to be Wild!!!", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
 	[ "Nico Robin, Bride of Ohara", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
@@ -918,7 +918,7 @@ window.units = [
 	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
 	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 1 ],
 	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
-	[ "Sweet Pea", "STR", [ "Tough", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
+	[ "Sweet Pea", "STR", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
 	[ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter", "Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
 	[ "Empress in Love Hancock, Wedding", "INT", [ "Shooter", "Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
 	[ "South Blue's Captain Kid", "STR", [ "Striker", "Ambition" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
@@ -929,11 +929,11 @@ window.units = [
 	[ "Hannyabal", "DEX", ["Ambition", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
 	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Ambition", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	[ "Saldeath", "INT", [ "Striker", "Cerebral" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
-	[ "Blugori", "DEX", [ "Tough", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	[ "Pica", "PSY", [ "Tough","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
-	[ "Pica, Donquixote Pirates", "PSY", [ "Tough", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Tough" ], 5, 30, 5, 4, 70, 106699, 572, 268, 102, 1841, 797, 229, 1],
-	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Tough" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
+	[ "Blugori", "DEX", [ "Powerhouse", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
+	[ "Pica", "PSY", [ "Powerhouse","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
+	[ "Pica, Donquixote Pirates", "PSY", [ "Powerhouse", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
+	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 106699, 572, 268, 102, 1841, 797, 229, 1],
+	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
 	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
 	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
 	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
@@ -944,17 +944,17 @@ window.units = [
 	[ "Cyborg Franky, Sacred Beast of Baldimore", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
 	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, 392109, 59, 34, 47, 814, 392, 223, 1],
 	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, 3000000, 740, 333, 172, 1787, 787, 390, 1],
-	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Tough" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
-	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Tough" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
-	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Tough" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
+	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
+	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
+	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Powerhouse" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
 	[ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
 	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, 1066998, 606, 313, 54, 1496, 744, 152, 1],
 	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1431, 690, 110, 2599, 1271, 271, 1],
 	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, 136167, 131, 98, 25, 935, 375, 163, 1],
  	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, 1778330, 867, 329, 122, 1403, 800, 229, 1],
-	[ "Gyaro", "QCK", [ "Slasher", "Tough" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
-	[ "Macro", "PSY", [ "Shooter", "Tough" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
-	[ "Tansui", "INT", [ "Fighter", "Tough" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
+	[ "Gyaro", "QCK", [ "Slasher", "Powerhouse" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
+	[ "Macro", "PSY", [ "Shooter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
+	[ "Tansui", "INT", [ "Fighter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
 	[ "Agile Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
 	[ "Tricky Gunman, Black Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
 	[ "Fine Gunman, Green Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
@@ -966,70 +966,70 @@ window.units = [
 	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
 	[ "Super Rookie Eustass Kid", "QCK", [ "Ambition", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
 	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
-	[ "Pacifista PX-1", "DEX", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-2", "PSY", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-3", "QCK", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-4", "STR", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-5", "INT", [ "Shooter", "Tough" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Sentomaru", "PSY", [ "Fighter", "Tough" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
-	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Tough" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
+	[ "Pacifista PX-1", "DEX", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-2", "PSY", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-3", "QCK", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-4", "STR", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Pacifista PX-5", "INT", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+	[ "Sentomaru", "PSY", [ "Fighter", "Powerhouse" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
+	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
 	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
 	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
 	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
 	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
 	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
 	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
-	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Tough"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
-    [ "Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
-    [ "Flower Sword Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Tough"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
-    [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Tough"], 4, 30, 6, 2, 99, 3000000, 321, 132, 30, 2404, 1024, 243, 1 ],
+	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Powerhouse"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
+    [ "Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Powerhouse"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
+    [ "Flower Sword Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Powerhouse"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
+    [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Powerhouse"], 4, 30, 6, 2, 99, 3000000, 321, 132, 30, 2404, 1024, 243, 1 ],
     [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, 17456, 94, 33, 15, 571, 280, 77, 1],
     [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
     [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
     [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
     [ "Impostor Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
-    [ "Machvise","INT",["Free Spirit","Tough"], 4, 18, 4, 3, 70, 1066998, 203, 127, 34, 1589, 716, 105, 1 ],
-    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Tough"], 5, 30, 4, 4, 99, 4000000, 1523, 643, 49, 2882, 1280, 217, 1 ],
+    [ "Machvise","INT",["Free Spirit","Powerhouse"], 4, 18, 4, 3, 70, 1066998, 203, 127, 34, 1589, 716, 105, 1 ],
+    [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Powerhouse"], 5, 30, 4, 4, 99, 4000000, 1523, 643, 49, 2882, 1280, 217, 1 ],
     [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, 1066998, 102, 161, 32, 1079, 813, 154, 1 ],
     [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, 4000000, 1000, 767, 101, 2375, 1371, 271, 1 ],
     [ "Violet","PSY",["Fighter","Cerebral"], 4, 18, 5, 3, 70, 1066998, 147, 48, 77, 1157, 451, 274, 1 ],
     [ "Violet, Donquixote Pirates","PSY",["Fighter","Cerebral"], 5, 30, 4, 4, 99, 4000000, 1095, 400, 220, 2217, 813, 483, 1 ],
-    [ "Dellinger","DEX",["Tough","Fighter"], 4, 18, 6, 3, 70, 1066998, 91, 147, 51, 999, 755, 192, 1 ],
-    [ "Dellinger, Donquixote Pirates","DEX",["Tough","Fighter"], 5, 30, 4, 4, 99, 4000000, 933, 692, 143, 2087, 1362, 324, 1 ],
+    [ "Dellinger","DEX",["Powerhouse","Fighter"], 4, 18, 6, 3, 70, 1066998, 91, 147, 51, 999, 755, 192, 1 ],
+    [ "Dellinger, Donquixote Pirates","DEX",["Powerhouse","Fighter"], 5, 30, 4, 4, 99, 4000000, 933, 692, 143, 2087, 1362, 324, 1 ],
     [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, 1066998, 698, 452, 48, 1500, 866, 90, 1 ],
     [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, 4000000, 1443, 812, 50, 2840, 1421, 174, 1 ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
-	[ "Bepo, Heart Pirates", "STR", ["Fighter", "Tough"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
-	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Fighter", "Tough"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
+	[ "Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
+	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
 	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Fighter", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
-	[ "Jean Bart", "STR", ["Tough", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
-	[ "Jean Bart, Heart Pirates", "STR", ["Tough", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
+	[ "Jean Bart", "STR", ["Powerhouse", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
+	[ "Jean Bart, Heart Pirates", "STR", ["Powerhouse", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, 392109, 67, 37, 55, 884, 428, 204, 1],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, 3000000, 831, 366, 162, 1660, 869, 384, 1],
-	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Tough"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
+	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Powerhouse"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
     [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
-    [ "Count Butler (Ruling Power)", "INT", ["Ambition","Tough"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
+    [ "Count Butler (Ruling Power)", "INT", ["Ambition","Powerhouse"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
     [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
     [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
-    [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Tough"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
+    [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Powerhouse"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
 	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
 	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
 	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
-	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Tough"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
+	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Powerhouse"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
     [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, null, null, null, null, 799, 355, 249, null],
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
 	[],
-    [ "Don Chinjao", "INT", [ "Tough","Fighter" ], 4, 18, 6, 3, 70, null, 226, 187, 17, 1505, 808, 100, null ],
-    [ "Don Chinjao, Flower Country Gang", "INT", [ "Tough","Striker" ], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null ],
+    [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, null, 226, 187, 17, 1505, 808, 100, null ],
+    [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, null, 197, 138, 37, 1329, 688, 160, null ],
     [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, null, 1253, 630, 129, 2555, 1300, 279, null ],
     [ "Funk Brothers", "DEX", [ "Fighter","Ambition" ], 4, 18, 5, 3, 70, null, 60, 172, 44, 937, 824, 109, null ],
     [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Ambition" ], 5, 30, 8, 4, 99, null, 1500, 824, 77, 2920, 1250, 226, null ],
-    [ "Hajrudin", "PSY", [ "Tough","Fighter" ], 4, 18, 5, 3, 70, null, 201, 177, 38, 1403, 795, 116, null ],
-    [ "Hajrudin, Pirate Mercenary", "PSY", [ "Tough","Fighter" ], 5, 30, 4, 4, 99, null, 1337, 740, 57, 2700, 1402, 205, null ],
+    [ "Hajrudin", "PSY", [ "Powerhouse","Fighter" ], 4, 18, 5, 3, 70, null, 201, 177, 38, 1403, 795, 116, null ],
+    [ "Hajrudin, Pirate Mercenary", "PSY", [ "Powerhouse","Fighter" ], 5, 30, 4, 4, 99, null, 1337, 740, 57, 2700, 1402, 205, null ],
     [ "Abdullah and Jeet", "STR", [ "Slasher","Striker" ], 4, 18, 6, 3, 70, null, 143, 143, 52, 969, 722, 206, null ],
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", [ "Slasher","Striker" ], 5, 30, 6, 4, 99, null, 920, 673, 156, 1970, 1346, 344, null ],
     [ "Bartolomeo", "STR", [ "Striker","Ambition" ], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null ],
diff --git a/index.html b/index.html
index 80768bc79..a66abe301 100644
--- a/index.html
+++ b/index.html
@@ -62,6 +62,9 @@
             <p>03/05/2016</p>
             <br>
             <ul>
+                <li>RIP Tough</li>
+                <li>Long live Powerhouse!</li>
+                <br>
                 <li>New Sugofest Units!</li>
                 <li>Captains and Specials should be complete</li>
                 <br>
@@ -69,13 +72,6 @@
                 <li>Need more work to be implemented</li>
                 <li>into the calculator</li>
                 <br>
-                <li>Added the List down there</li>
-                <li>It will show the most recent Chars</li>
-                <li>that have been completed</li>
-                <br>
-                <li>Fixed 5* Chinjao Captain</li>
-                <li>Inazuma/Ivankov Specials/Captains added</li>
-                <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>
             </ul>

From 43d16995894db0c731aa42c65468ecc54ffda226 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 3 May 2016 13:22:24 -0500
Subject: [PATCH 0349/1569] Stats

Females
---
 common/data/units.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 7ae3ea49f..f84a87945 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -826,8 +826,8 @@ window.units = [
 	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
 	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	["Trafalgar Law, the Boy from the White City","PSY",["Slasher","Ambition"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
-	["Trafalgar Law, the Boy Saved by Fate","PSY",["Slasher","Ambition"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
+	["Trafalgar Law, the Boy from the White City", "PSY", ["Slasher", "Ambition"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
+	["Trafalgar Law, the Boy Saved by Fate", "PSY", ["Slasher", "Ambition"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
@@ -973,15 +973,15 @@ window.units = [
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Powerhouse" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
-	[ "Smoker, Wild Lone Wolf","DEX",["Striker","Ambition"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
-	[ "Smoker, Solitary Lone Wolf","DEX",["Striker","Ambition"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
-	[ "Kizaru","QCK",["Shooter","Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
-	[ "Kizaru, Light Human","QCK",["Shooter","Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
-	[ "Izo Whitebeard 16th Div. Commander","PSY",["Shooter","Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
-	[ "Blamenco Whitebeard 6th Div. Commander","DEX",["Striker","Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
-	[ "Namule Whitebeard 8th Div. Commander","PSY",["Fighter","Powerhouse"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
-    [ "Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Powerhouse"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
-    [ "Flower Sword Vista Whitebeard 5th Div. Commander","QCK",["Slasher","Powerhouse"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
+	[ "Smoker, Wild Lone Wolf", "DEX", ["Striker", "Ambition"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
+	[ "Smoker, Solitary Lone Wolf", "DEX", ["Striker", "Ambition"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
+	[ "Kizaru", "QCK", ["Shooter", "Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
+	[ "Kizaru, Light Human", "QCK", ["Shooter", "Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
+	[ "Izo Whitebeard 16th Div. Commander", "PSY", ["Shooter", "Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
+	[ "Blamenco Whitebeard 6th Div. Commander", "DEX", ["Striker", "Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
+	[ "Namule Whitebeard 8th Div. Commander", "PSY", ["Fighter", "Powerhouse"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
+    [ "Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
+    [ "Flower Sword Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
     [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Powerhouse"], 4, 30, 6, 2, 99, 3000000, 321, 132, 30, 2404, 1024, 243, 1 ],
     [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, 17456, 94, 33, 15, 571, 280, 77, 1],
     [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
@@ -1035,8 +1035,8 @@ window.units = [
     [ "Bartolomeo", "STR", [ "Striker","Ambition" ], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null ],
     [ "Bartolomeo the Cannibal", "STR", [ "Striker","Ambition" ], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null ],
     [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, null, null, null, null, 161, 39, 39, null, null, null, null ],
-    [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, null, null, 99, null, null, null, null, null, null, null, null ],
-    [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, null, null, null, 39, 22, 30, 797, 321, 149, null ],
+    [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, null, 1120, 443, 141, null, null, null, null ],
+    [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, null, 39, 22, 30, 797, 321, 149, null ],
     [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, null, 730, 267, 100, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1","Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From e81a63e79e282ca383e69463b298a69a485082bf Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 4 May 2016 14:18:46 +0200
Subject: [PATCH 0350/1569] CP9 Global

---
 common/data/flags.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index b4cfa2262..f160859f1 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -701,20 +701,20 @@ window.flags = {
 	744: { rr: 1, rro: 1, lrr: 1 },
 	745: { rr: 1, rro: 1, lrr: 1 },
 	746: { promo: 1 },
-	747: { rr: 1, rro: 1 },
-	748: { rr: 1, rro: 1 },
-	749: { rr: 1, rro: 1 },
-	750: { rr: 1, rro: 1 },
-	751: { rr: 1, rro: 1 },
-	752: { rr: 1, rro: 1 },
-	753: { rr: 1, rro: 1 },
-	754: { rr: 1, rro: 1 },
-	755: { rr: 1, rro: 1 },
-	756: { rr: 1, rro: 1 },
-	757: { rr: 1, rro: 1 },
-	758: { rr: 1, rro: 1 },
-	759: { rr: 1, rro: 1 },
-	760: { rr: 1, rro: 1 },
+	747: { rr: 1, rro: 1, global: 1 },
+	748: { rr: 1, rro: 1, global: 1 },
+	749: { rr: 1, rro: 1, global: 1 },
+	750: { rr: 1, rro: 1, global: 1 },
+	751: { rr: 1, rro: 1, global: 1 },
+	752: { rr: 1, rro: 1, global: 1 },
+	753: { rr: 1, rro: 1, global: 1 },
+	754: { rr: 1, rro: 1, global: 1 },
+	755: { rr: 1, rro: 1, global: 1 },
+	756: { rr: 1, rro: 1, global: 1 },
+	757: { rr: 1, rro: 1, global: 1 },
+	758: { rr: 1, rro: 1, global: 1 },
+	759: { rr: 1, rro: 1, global: 1 },
+	760: { rr: 1, rro: 1, global: 1 },
 	761: { global: 1 },
 	762: { global: 1 },
 	763: { global: 1 },

From 69541d5abf45b29dc9482d65569452153257b957 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 4 May 2016 21:25:00 +0200
Subject: [PATCH 0351/1569] Update details.js

Pica First Stage Special only cuts by 10%
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 64b63b2ff..5d87485f3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4333,7 +4333,7 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
+				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
@@ -4348,7 +4348,7 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
+				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
 				"cooldown": [ 25, 11 ]
 			},
 			{

From aa4a9819ad3587b465bf1aead6239ee822794e40 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 5 May 2016 15:02:48 -0500
Subject: [PATCH 0352/1569] flats & Ivankov

stats, updated flags
---
 common/data/flags.js | 17 ++++++++++++++++-
 common/data/units.js |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index f160859f1..fe907da2d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -809,5 +809,20 @@ window.flags = {
     1001: { rr: 1, rro: 1 },
 	1007: { rr: 1, rro: 1, lrr: 1 },
     1008: { rr: 1, rro: 1, lrr: 1 },
-	1009: { promo: 1 }
+	1009: { promo: 1 },
+	1020: { rr: 1, rro: 1, lrr: 1 },
+    1021: { rr: 1, rro: 1, lrr: 1 },
+    1022: { promo: 1 },
+    1024: { rr: 1, rro: 1 },
+    1025: { rr: 1, rro: 1 },
+    1026: { rr: 1, rro: 1 },
+    1027: { rr: 1, rro: 1 },
+    1028: { rr: 1, rro: 1 },
+    1029: { rr: 1, rro: 1 },
+    1030: { rr: 1, rro: 1 },
+    1031: { rr: 1, rro: 1 },
+    1032: { rr: 1, rro: 1 },
+    1033: { rr: 1, rro: 1 },
+    1034: { rr: 1, rro: 1 },
+    1035: { rr: 1, rro: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f84a87945..f3e72433e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1034,7 +1034,7 @@ window.units = [
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", [ "Slasher","Striker" ], 5, 30, 6, 4, 99, null, 920, 673, 156, 1970, 1346, 344, null ],
     [ "Bartolomeo", "STR", [ "Striker","Ambition" ], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null ],
     [ "Bartolomeo the Cannibal", "STR", [ "Striker","Ambition" ], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null ],
-    [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, null, null, null, null, 161, 39, 39, null, null, null, null ],
+    [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, 5, 1, 50, null, 161, 39, 39, 1198, 492, 202, null ],
     [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, null, 1120, 443, 141, null, null, null, null ],
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, null, 39, 22, 30, 797, 321, 149, null ],
     [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, null, 730, 267, 100, null, null, null, null ]

From ddd223ba5a8da1d7cfbc9409b7d6f130d7e8ae1e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 6 May 2016 10:30:29 +0200
Subject: [PATCH 0353/1569] Images Push

---
 common/data/aliases.js     | 36 ++++++++++++++++++++----------------
 common/data/drops.js       |  2 +-
 common/data/gw.js          |  2 +-
 common/data/units.js       | 34 +++++++++++++++++-----------------
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  6 ++++--
 6 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b08394d6c..dd8a39a68 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1018,20 +1018,24 @@ window.aliases = {
 	1017: ['茶ひげ',''],
 	1018: ['茶ひげ ワニのケンタウロス',''],
 	1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長',''],
-	1020: ['','','Sakura Sugar'],
-	1021: ['','','Sakura Sugar'],
-	1022: ['','','Anniversary Luffy'],
-	1023: ['',''],
-	1024: ['',''],
-	1025: ['',''],
-	1026: ['',''],
-	1027: ['',''],
-	1028: ['',''],
-	1029: ['',''],
-	1030: ['',''],
-	1031: ['',''],
-	1032: ['','','Abdullah and Jeet'],
-	1033: ['','','Abdullah and Jeet, Former Bounty Hunters'],
-	1034: ['',''],
-	1035: ['','']
+	1020: ['？？？','','Sakura Sugar'],
+	1021: ['？？？','','Sakura Sugar'],
+	1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
+	1023: ['？？？',''],
+	1024: ['首領・チンジャオ',''],
+	1025: ['首領・チンジャオ 花ノ国のギャング',''],
+	1026: ['ブルーギリー',''],
+	1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）',''],
+	1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ',''],
+	1029: ['ファンク兄弟 モガロ王国の殺し屋',''],
+	1030: ['ハイルディン',''],
+	1031: ['ハイルディン 海賊傭兵',''],
+	1032: ['アブドーラ＆ジェット','','Abdullah and Jeet'],
+	1033: ['アブドーラ＆ジェット 元賞金稼ぎ','','Abdullah and Jeet, Former Bounty Hunters'],
+	1034: ['バルトロメオ',''],
+	1035: ['人食いのバルトロメオ',''],
+    1036: ['エンポリオ・イワンコフ 秘密の花園の女王',''],
+    1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
+    1038: ['イナズマ 秘密の花園の乙女',''],
+    1039: ['イナズマ 変革を画策する乙女','']
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 720fd866b..9f6b0fb0a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -999,7 +999,7 @@ window.drops = {
         
         {
             name: "Temptation!? The Queen of Kamabakka Queendom!",
-            thumb: null,
+            thumb: 1037,
             condition: "Only DEX/RCV/TND orbs will appear",
             "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566]
         }
diff --git a/common/data/gw.js b/common/data/gw.js
index c6913bc21..52b4a6f70 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,null,null,null,null,null];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,27634,27634,27635,27636,27637,27620,27620,27622,27622,27624,28647,28647,28650,null,28723,28723,28761,28761,28759,28759,28756,28756,28754,28754,28771,28771,29445,29445,29446,29446];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f3e72433e..1909519d0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1020,24 +1020,24 @@ window.units = [
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
     [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, null, null, null, null, 799, 355, 249, null],
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
-    [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, null, 200, 56, 55, 2000, 1000, 300, null],
+    [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
 	[],
-    [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, null, 226, 187, 17, 1505, 808, 100, null ],
-    [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, null, 1433, 746, 68, 2818, 1424, 185, null ],
-    [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, null, 197, 138, 37, 1329, 688, 160, null ],
-    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, null, 1253, 630, 129, 2555, 1300, 279, null ],
-    [ "Funk Brothers", "DEX", [ "Fighter","Ambition" ], 4, 18, 5, 3, 70, null, 60, 172, 44, 937, 824, 109, null ],
-    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Ambition" ], 5, 30, 8, 4, 99, null, 1500, 824, 77, 2920, 1250, 226, null ],
-    [ "Hajrudin", "PSY", [ "Powerhouse","Fighter" ], 4, 18, 5, 3, 70, null, 201, 177, 38, 1403, 795, 116, null ],
-    [ "Hajrudin, Pirate Mercenary", "PSY", [ "Powerhouse","Fighter" ], 5, 30, 4, 4, 99, null, 1337, 740, 57, 2700, 1402, 205, null ],
-    [ "Abdullah and Jeet", "STR", [ "Slasher","Striker" ], 4, 18, 6, 3, 70, null, 143, 143, 52, 969, 722, 206, null ],
-    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", [ "Slasher","Striker" ], 5, 30, 6, 4, 99, null, 920, 673, 156, 1970, 1346, 344, null ],
-    [ "Bartolomeo", "STR", [ "Striker","Ambition" ], 5, 30, 4, 4, 70, null, 403, 278, 58, 1623, 813, 232, null ],
-    [ "Bartolomeo the Cannibal", "STR", [ "Striker","Ambition" ], 6, 55, 4, 5, 99, null, 1550, 769, 181, 3505, 1431, 341, null ],
-    [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, 5, 1, 50, null, 161, 39, 39, 1198, 492, 202, null ],
-    [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, null, 1120, 443, 141, null, null, null, null ],
-    [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, null, 39, 22, 30, 797, 321, 149, null ],
-    [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, null, 730, 267, 100, null, null, null, null ]
+    [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
+    [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
+    [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
+    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 5000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
+    [ "Funk Brothers", "DEX", [ "Fighter","Ambition" ], 4, 18, 5, 3, 70, 1066998, 60, 172, 44, 937, 824, 109, 1 ],
+    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Ambition" ], 5, 30, 8, 4, 99, 4000000, 1500, 824, 77, 2920, 1251, 226, 1 ],
+    [ "Hajrudin", "PSY", [ "Powerhouse","Fighter" ], 4, 18, 5, 3, 70, 1066998, 201, 177, 38, 1403, 795, 116, 1 ],
+    [ "Hajrudin, Pirate Mercenary", "PSY", [ "Powerhouse","Fighter" ], 5, 30, 4, 4, 99, 4000000, 1337, 740, 57, 2700, 1402, 205, 1 ],
+    [ "Abdullah and Jeet", "STR", [ "Slasher","Striker" ], 4, 18, 6, 3, 70, 1066998, 143, 143, 52, 1003, 722, 208, 1 ],
+    [ "Abdullah and Jeet, Former Bounty Hunters", "STR", [ "Slasher","Striker" ], 5, 30, 6, 4, 99, 4000000, 920, 673, 156, 1970, 1345, 343, 1 ],
+    [ "Bartolomeo", "STR", [ "Striker","Ambition" ], 5, 30, 4, 4, 70, 1066998, 403, 278, 58, 1623, 813, 232, 1 ],
+    [ "Bartolomeo the Cannibal", "STR", [ "Striker","Ambition" ], 6, 55, 4, 5, 99, 5000000, 1550, 769, 181, 3505, 1431, 341, 1 ],
+    [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, 5, 1, 50, 392109, 161, 39, 39, 1198, 492, 202, 1 ],
+    [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, 3000000, 1120, 443, 141, 2007, 906, 322, 1 ],
+    [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
+    [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ]
 	];
 // [ "Name", "Type", [ "Class1","Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 1154f81a1..764922314 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     /// Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1011, 1012, 1013, 1014, 1016, 1018, 1019 ];
+    var newUnits = [ 1025, 1027, 1029, 1031, 1033, 1035, 1037, 1039 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index a66abe301..d5378e507 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>03/05/2016</p>
+            <p>06/05/2016</p>
             <br>
             <ul>
                 <li>RIP Tough</li>
                 <li>Long live Powerhouse!</li>
                 <br>
                 <li>New Sugofest Units!</li>
-                <li>Captains and Specials should be complete</li>
+                <li>Now Complete</li>
+                <br>
+                <li>GW Links now Up to date</li>
                 <br>
                 <li>Bartolomeo Captain and Funk Brothers Special</li>
                 <li>Need more work to be implemented</li>

From df2b0c974e01a115bbab964fbb30b729de205e51 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 6 May 2016 14:18:41 +0200
Subject: [PATCH 0354/1569] Colo Preview

---
 common/data/drops.js | 2 +-
 common/data/units.js | 8 ++++++--
 index.html           | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9f6b0fb0a..4f1179cb4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1182,7 +1182,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042 ]
         }
 
    ]
diff --git a/common/data/units.js b/common/data/units.js
index 1909519d0..fec50bfd1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1037,7 +1037,11 @@ window.units = [
     [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, 5, 1, 50, 392109, 161, 39, 39, 1198, 492, 202, 1 ],
     [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, 3000000, 1120, 443, 141, 2007, 906, 322, 1 ],
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
-    [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ]
+    [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ],
+    [ "Colosseum Jozu", "STR", [ "Fighter", "Powerhouse" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Jozu Evolution", "STR", [ "Fighter", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Killer", "DEX", [ "Striker", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Killer Evolution", "DEX", [ "Striker", "Slasher" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ]
 	];
-// [ "Name", "Type", [ "Class1","Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
+// [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index d5378e507..16dce8b7d 100644
--- a/index.html
+++ b/index.html
@@ -68,7 +68,7 @@
                 <li>New Sugofest Units!</li>
                 <li>Now Complete</li>
                 <br>
-                <li>GW Links now Up to date</li>
+                <li>New Colosseum Previews</li>
                 <br>
                 <li>Bartolomeo Captain and Funk Brothers Special</li>
                 <li>Need more work to be implemented</li>

From 6196aebc11ab1795efe41f6f756ae8e3eeb093ab Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 8 May 2016 17:28:16 +0200
Subject: [PATCH 0355/1569] Fix Hajrudin

---
 common/data/specials.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index ee20c9fe3..de4aef03e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1240,9 +1240,11 @@ window.specials = {
        hit: function(n) { return n > 30 ? 1.75 : 1; } 
     },
     1030: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; }
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+		type: "type"
     },
     1031: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; }
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+		type: "type"
     }
 };
\ No newline at end of file

From eab438c5ca5f5a27ce54361807d68a04cc1ec086 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 9 May 2016 14:26:37 -0500
Subject: [PATCH 0356/1569] Barto Damage

Still far from done, just got a count of each unit type in cruncher.js
---
 common/data/captains.js |  8 +++++++-
 damage/js/cruncher.js   | 13 +++++++++++++
 damage/js/utils.js      |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 20b273f09..ce1b11e85 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1,6 +1,6 @@
 window.captains = {
 	2: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+		atk: function(p){ return p.unit.type == "STR" ? 1.5 : 1; }
 	},
 	3: {
 		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
@@ -2500,6 +2500,12 @@ window.captains = {
     1033: {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
     },
+    1034: {
+         atk: function(p) { return 2.75; }
+    },
+    1035: {
+         atk: function(p) { return 2.75; }
+    },
     1036: {
 		hitAtk: function(p) {
 			return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 8f4ad09b0..e06154033 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -101,6 +101,10 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         ['STR','QCK','DEX','PSY','INT'].forEach(function(type) {
             result[type] = crunchForType(type);
         });
+        var classArray = ['Fighter', 'Slasher', 'Free Spirit', 'Powerhouse', 'Shooter', 'Striker', 'Cerebral', 'Ambition'];
+        for (var i = 0, j = classArray.length; i < j; i++) {
+            result[classArray[i]] = 0;
+        }
         result.team = getTeamDetails();
         var hpMax = 0, rcvTotal = 0;
         team.forEach(function(x,n) {
@@ -117,7 +121,16 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             rcv *= getShipBonus('rcv',false,x.unit,n);
             rcv *= getEffectBonus('rcv',x.unit);
             rcvTotal += Math.floor(applyCaptainEffectsAndSpecialsToRCV(n,rcv));
+            //Counting how many of each class on a team
+            //If unit has only one class
+            if(x.unit.class[2]){
+                result[x.unit.class]++;
+            }else{//if unit has 2 classes
+                result[x.unit.class[0]]++;
+                result[x.unit.class[1]]++;
+            }
         });
+//window.alert("Fighter: " + result[classArray[0]] + " Slasher: " + result[classArray[1]] + " Free Spirit: " + result[classArray[2]] + " Powerhouse: " + result[classArray[3]] + " Shooter: " + result[classArray[4]] + " Striker: " + result[classArray[5]] + " Cerebral: " + result[classArray[6]] + " Ambition: " + result[classArray[7]]);
         result.rcv = Math.max(0,rcvTotal);
         var cost = team.slice(1,6).reduce(function(prev,next) { return prev + (!next.unit ? 0 : next.unit.cost); },0);
         result.cost = { cost: cost, level: Math.max(1,Math.floor(cost / 2) * 2 - 18) };
diff --git a/damage/js/utils.js b/damage/js/utils.js
index ac8a53866..b8e3649cf 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -31,7 +31,7 @@ window.CrunchUtils.okamaSort = function(array, data) {
     if (temp.length != data.length) return null;
     else return [ temp.concat(that) ];
 };
-
+    
 window.CrunchUtils.mihawkSort = function(array) {
     var result = [ ];
     // atk-based

From 2279560550addf07a46bce76e8fef7cff23db531 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 9 May 2016 14:29:26 -0500
Subject: [PATCH 0357/1569] Barto

Strikers
---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index ce1b11e85..7e15b16f0 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2501,10 +2501,10 @@ window.captains = {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
     },
     1034: {
-         atk: function(p) { return 2.75; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.75 : 1; }
     },
     1035: {
-         atk: function(p) { return 2.75; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.75 : 1; }
     },
     1036: {
 		hitAtk: function(p) {

From 0390499c1043b49c964a5b7cded52e07359c73fa Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 11 May 2016 14:25:31 +0200
Subject: [PATCH 0358/1569] New Colo Units Push

---
 common/data/captains.js   | 16 ++++++++++++++++
 common/data/cooldowns.js  |  6 +++++-
 common/data/details.js    | 22 ++++++++++++++++++++++
 common/data/evolutions.js | 12 ++++++++++++
 common/data/families.js   |  8 ++++++--
 common/data/specials.js   |  8 ++++++++
 common/data/units.js      | 12 +++++++-----
 index.html                | 16 ++++++----------
 8 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 7e15b16f0..435c98bc1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2523,5 +2523,21 @@ window.captains = {
     },
     1039: {
         atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    1040: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    1041: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    1042: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2 : 1;},
+        rcv: function(p) { return 0; }
+    },
+    1043: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (p.orb == 2.0 ? 2.75 : 2) : 1;},
+        rcv: function(p) { return 0; }
     }
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f07f04c70..f7b43a249 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1037,5 +1037,9 @@ window.cooldowns = [
     [ 23, 15 ],
     [ 23, 15 ],
     [ 11, 3 ],
-    [ 11, 3 ]
+    [ 11, 3 ],
+    29,
+    29,
+    18,
+    18
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 5d87485f3..0cdadb580 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4961,5 +4961,27 @@ window.details = {
         captain: "Boosts ATK and RCV of [DEX] and [QCK] units by 1.5x",
         special: "Switches orbs between slots once, recovers 0.3x character's RCV in HP",
         specialName: "Great Scissors"
+    },
+    1040: {
+        captain: "Boosts ATK and HP of [STR] units by 1.5x",
+        special: "Deals severe random STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
+        specialName: "Ice Throw",
+        specialNotes: "Random Damage Ranges will be added as a Note when we find it."
+    },
+    1041: {
+        captain: "Boosts ATK and HP of [STR] units by 2x",
+        special: "Deals severe random STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
+        specialName: "Ice Throw",
+        specialNotes: "Random Damage Ranges will be added as a Note when we find it."
+    },
+    1042: {
+        captain: "Boosts ATK of Striker and Slasher characters by 2x, reduces crew's RCV to 0.",
+        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers to matching orbs, cuts the current HP of one enemy by 7%",
+        specialName: "Hitting Size"
+    },
+    1043: {
+        captain: "Boosts ATK of Striker and Slasher characters by 2.75x if they have a matching Orb, by 2x otherwise, reduces crew's RCV to 0.",
+        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers to matching orbs, cuts the current HP of one enemy by 7%",
+        specialName: "Hitting Size"
     }
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 1ae4b79d1..7a88cb005 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1554,5 +1554,17 @@ window.evolutions = {
     1038: {
         evolution: 1039,
         evolvers: [ 90, 91, 96, 97 ]
+    },
+    1040: {
+        evolution: 1041,
+        evolvers: []
+    },
+    1042: {
+        evolution: 1043,
+        evolvers: [ 118, 86, 97, 302, 102 ]
+    },
+    1044: {
+        evolution: 1045,
+        evolvers: []
     }
 };
diff --git a/common/data/families.js b/common/data/families.js
index f382416de..0d7c43700 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1021,7 +1021,7 @@ window.families = [
 	"Sugar",
 	"Sugar",
 	"Monkey D. Luffy",
-	"",
+	"Portgas D. Ace",
 	"Don Chinjao",
 	"Don Chinjao",
 	"Blue Gilly",
@@ -1037,5 +1037,9 @@ window.families = [
     "Emporio Ivankov",
     "Emporio Ivankov",
     "Inazuma",
-    "Inazuma"
+    "Inazuma",
+    "Jozu",
+    "Jozu",
+    "Killer",
+    "Killer"
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index de4aef03e..3b7b01101 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1246,5 +1246,13 @@ window.specials = {
     1031: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
 		type: "type"
+    },
+    1040: {
+        atk: function(p) { return p.percHP < 30.0 ? 1.5 : 1; },
+		type: "type"
+    },
+    1041: {
+        atk: function(p) { return p.percHP < 30.0 ? 1.5 : 1; },
+		type: "type"
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index fec50bfd1..d29cea0a0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1021,7 +1021,7 @@ window.units = [
     [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, null, null, null, null, 799, 355, 249, null],
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
-	[],
+	[ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
     [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
@@ -1038,10 +1038,12 @@ window.units = [
     [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, 3000000, 1120, 443, 141, 2007, 906, 322, 1 ],
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
     [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ],
-    [ "Colosseum Jozu", "STR", [ "Fighter", "Powerhouse" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Jozu Evolution", "STR", [ "Fighter", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Killer", "DEX", [ "Striker", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Killer Evolution", "DEX", [ "Striker", "Slasher" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 4, 25, 6, 2, 70, null, null, null, null, null, null, null, null ],
+    [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, null, 1392, 640, 120, null, null, null, null ],
+    [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, null, null, null, null, null, null, null, null ],
+    [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, null, null, null, null, null, null, null, null ],
+    [ "Legend Law", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Legend Law Evolution", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 16dce8b7d..0616d790e 100644
--- a/index.html
+++ b/index.html
@@ -59,20 +59,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>06/05/2016</p>
+            <p>11/05/2016</p>
             <br>
             <ul>
-                <li>RIP Tough</li>
-                <li>Long live Powerhouse!</li>
+                <li>Legend Law Hype!</li>
                 <br>
-                <li>New Sugofest Units!</li>
-                <li>Now Complete</li>
+                <li>New Colosseum Units Updated</li>
+                <li>Only need stats now</li>
                 <br>
-                <li>New Colosseum Previews</li>
-                <br>
-                <li>Bartolomeo Captain and Funk Brothers Special</li>
-                <li>Need more work to be implemented</li>
-                <li>into the calculator</li>
+                <li>Barolomeo now Boosts by Max until we fix his Captain</li>
+                <li>Funk Brothers Special still not implemented</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From bac92eb309436bfe6ba353a35ecbd0a495d97b19 Mon Sep 17 00:00:00 2001
From: lextic <dryges@gmail.com>
Date: Wed, 11 May 2016 14:44:49 +0100
Subject: [PATCH 0359/1569] support for special hit barriers + new effects from
 the new colosseum

---
 common/data/effects.js | 18 +++++++++++++++++-
 damage/js/cruncher.js  | 18 ++++++++++++------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index dfc366dee..337e91c17 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 25
+    // last ID used: 27
 
     'Baroque Works (pre-v4.0)': {
         description: 'Stats of non-Fighter units reduced by 90%',
@@ -222,6 +222,22 @@ window.effects = {
         id: 25,
         orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); },
         gOrbsEnabled: true
+    },
+    
+    'Colosseum Kid': {
+        description: 'Perfect hit barrier (2 hits)',
+        thumb: 966,
+        id: 26,
+        comboShield: 2,
+        comboType: 'Perfect'
+    },
+    
+    'Colosseum Fukuro': {
+        description: 'Perfect hit barrier (3 hits)',
+        thumb: 758,
+        id: 27,
+        comboShield: 3,
+        comboType: 'Perfect'
     }
 
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index e06154033..18f59151b 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -321,22 +321,27 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // apply hits
         for (var i=0;i<combo;++i) {
             ++result.hits;
-            // apply combo shield if active
-            if (mapEffect.shieldLeft > 0) {
-                --mapEffect.shieldLeft;
-                continue;
-            }
             lastAtk = unitAtk;
             // apply hit-based captain effects if any
             cptsWith.hitMultipliers.forEach(function(x) { lastAtk *= x.hit(result.hits); });
             // apply defense
             lastHit = lastAtk / unit.combo;
             lastHit = Math.ceil(Math.max(1, lastHit - currentDefense));
+            // apply combo shield if active
+            if (mapEffect.shieldLeft > 0) {
+                if (!mapEffect.comboType) {
+                    --mapEffect.shieldLeft;
+                }
+                continue;
+            }
             // add hit to current total
             result.result += lastHit;
         }
+        if (mapEffect.comboType == hitModifier && mapEffect.shieldLeft > 0) {
+            --mapEffect.shieldLeft;
+        }
         // apply hit bonus
-        if (bonusDamageBase > 0) {
+        if (bonusDamageBase > 0 && mapEffect.shieldLeft == 0) {
             if (lastHit > 1) result.result += Math.ceil(lastAtk * 0.9 * bonusDamageBase);
             else result.result += Math.max(0,Math.ceil(lastAtk * (0.9 * bonusDamageBase + 1 / unit.combo)) - currentDefense);
         }
@@ -601,6 +606,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (data.orb) enabledSpecials.push({ orb: data.orb, permanent: true, sourceSlot: -1 });
             if (data.chainLimiter) mapEffect.chainLimiter = data.chainLimiter;
             if (data.comboShield) mapEffect.comboShield = data.comboShield;
+            if (data.comboType) mapEffect.comboType = data.comboType;
             if (data.damage) mapEffect.damage = data.damage;
         }
         // team

From 1cdb124797c99ce7b3d58ab8fb1e947fcf449d18 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 12 May 2016 09:20:35 +0200
Subject: [PATCH 0360/1569] Free Ace + Legend Law almost complete

---
 common/data/captains.js    | 17 +++++++++++++++++
 common/data/cooldowns.js   |  2 +-
 common/data/details.js     | 35 +++++++++++++++++++++++++++++++++++
 common/data/drops.js       |  7 +++++++
 common/data/evolutions.js  |  2 +-
 common/data/flags.js       |  4 +++-
 common/data/specials.js    |  4 ++++
 common/data/units.js       |  6 +++---
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  5 +++--
 10 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 435c98bc1..f101cf0c2 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2464,6 +2464,9 @@ window.captains = {
     1022: {
         atk: function(p) { return 2; }
     },
+    1023: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+    },
     1024: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
@@ -2539,5 +2542,19 @@ window.captains = {
     1043: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (p.orb == 2.0 ? 2.75 : 2) : 1;},
         rcv: function(p) { return 0; }
+    },
+    1044: {
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
+			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1045: {
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
+			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     }
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f7b43a249..55ba42f0f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1021,7 +1021,7 @@ window.cooldowns = [
 	[ 13, 13],
 	[ 13, 13],
 	[ 15, 15 ],
-	null,
+	[ 17, 17 ],
 	19,
 	19,
 	11,
diff --git a/common/data/details.js b/common/data/details.js
index 0cdadb580..862e8e1f8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4871,6 +4871,11 @@ window.details = {
 		special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
 		specialName: "Gum-Gum Gigant Rifle: New Star"
 	},
+    1023: {
+        captain: "Boosts ATK of Free Spirit characters by 2.25x",
+        special: "Deals 13x characters ATK in INT damage to all enemies, boosts atk of Free Spirit characters by 1.75x for one turn.",
+        specialName: "Flame Mirror: Dawn"
+    },
 	1024: {
 		captain: "Boosts ATK of Powerhouse characters by 2x",
 		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
@@ -4983,5 +4988,35 @@ window.details = {
         captain: "Boosts ATK of Striker and Slasher characters by 2.75x if they have a matching Orb, by 2x otherwise, reduces crew's RCV to 0.",
         special: "Changes [STR] and [QCK] orbs on Strikers and Slashers to matching orbs, cuts the current HP of one enemy by 7%",
         specialName: "Hitting Size"
+    },
+    1044: {
+        captain: "Boosts ATK of Slaher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
+        specialName: "Gamma Knife",
+        special: [
+			{
+				"description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+				"cooldown": 18
+			},
+			{
+				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+				"cooldown": 25
+			}
+		],
+		specialNotes: "#{stages}"
+    },
+    1045: {
+        captain: "Boosts ATK of Slaher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
+        specialName: "Gamma Knife",
+        special: [
+			{
+				"description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+				"cooldown": 18
+			},
+			{
+				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+				"cooldown": 25
+			}
+		],
+		specialNotes: "#{stages}"
     }
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 4f1179cb4..092208baa 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1176,6 +1176,13 @@ window.drops = {
             Expert: [ 659, 680, 682, 684 ],
 			"Completion Units": [686]
         },
+        
+        {
+            name: '2nd Anniversary Celebration! Duel! Ace',
+            thumb: 1023,
+            Expert: [ 1023 ],
+            Master: [ 1023 ]
+        },
 
         {
             name: 'Colosseum',
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7a88cb005..ea55c29e3 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1565,6 +1565,6 @@ window.evolutions = {
     },
     1044: {
         evolution: 1045,
-        evolvers: []
+        evolvers: [ 118, 87, 266, 303, 267 ]
     }
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index fe907da2d..462bf9983 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -824,5 +824,7 @@ window.flags = {
     1032: { rr: 1, rro: 1 },
     1033: { rr: 1, rro: 1 },
     1034: { rr: 1, rro: 1 },
-    1035: { rr: 1, rro: 1 }
+    1035: { rr: 1, rro: 1 },
+    1044: { rr: 1, rro: 1 },
+    1045: { rr: 1, rro: 1 }
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 3b7b01101..418670084 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1209,6 +1209,10 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
         type: "class"
     },
+    1023: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1},
+        type: "class"
+    },
     1024: {
         orb: function(p) {
             if(p.percHP >= 70.0){
diff --git a/common/data/units.js b/common/data/units.js
index d29cea0a0..7025b18a2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1021,7 +1021,7 @@ window.units = [
     [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, null, null, null, null, 799, 355, 249, null],
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
-	[ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 1310, 221, 1773, 1310, 221, 1 ],
     [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
     [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
@@ -1042,8 +1042,8 @@ window.units = [
     [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, null, 1392, 640, 120, null, null, null, null ],
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, null, null, null, null, null, null, null, null ],
     [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, null, null, null, null, null, null, null, null ],
-    [ "Legend Law", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Legend Law Evolution", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, null, null, null, null ],
+    [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 764922314..81024dad7 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     /// Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1025, 1027, 1029, 1031, 1033, 1035, 1037, 1039 ];
+    var newUnits = [ 1025, 1027, 1029, 1031, 1033, 1035, 1023 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 0616d790e..43739c222 100644
--- a/index.html
+++ b/index.html
@@ -63,9 +63,10 @@
             <br>
             <ul>
                 <li>Legend Law Hype!</li>
+                <li>Complete exept for a few Stats</li>
+                <li>Evolved Version already works in the Calculator</li>
                 <br>
-                <li>New Colosseum Units Updated</li>
-                <li>Only need stats now</li>
+                <li>New Ace completed</li>
                 <br>
                 <li>Barolomeo now Boosts by Max until we fix his Captain</li>
                 <li>Funk Brothers Special still not implemented</li>

From 87b1830683c2cb93a0c817fe3a548ee7d0eeaa8f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 12 May 2016 09:57:32 +0200
Subject: [PATCH 0361/1569] 5* Law Max Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 7025b18a2..1bf18bda2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1042,7 +1042,7 @@ window.units = [
     [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, null, 1392, 640, 120, null, null, null, null ],
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, null, null, null, null, null, null, null, null ],
     [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, null, null, null, null, null, null, null, null ],
-    [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, null, null, null, null ],
+    [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, 1378, 813, 297, null ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 63ba97d1dfcd9ff58ebd91bfa179a5a04d5c22ba Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 12 May 2016 10:56:50 +0200
Subject: [PATCH 0362/1569] New Sunny + Typo

---
 common/data/details.js | 4 ++--
 common/data/ships.js   | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 862e8e1f8..e7ff2d65f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4990,7 +4990,7 @@ window.details = {
         specialName: "Hitting Size"
     },
     1044: {
-        captain: "Boosts ATK of Slaher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
+        captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
         specialName: "Gamma Knife",
         special: [
 			{
@@ -5005,7 +5005,7 @@ window.details = {
 		specialNotes: "#{stages}"
     },
     1045: {
-        captain: "Boosts ATK of Slaher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
+        captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
         specialName: "Gamma Knife",
         special: [
 			{
diff --git a/common/data/ships.js b/common/data/ships.js
index 34b521a87..f1fd7a8b5 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -215,5 +215,12 @@ window.ships = [
             return !p.unit.class.has('Cerebral') ? 1 : [ 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.35 ][p.boatLevel - 1];
         }
     },
+    
+    { // 17
+        name: '2nd Anniversary Thousand Sunny',
+        thumb: null,
+        description: 'Boosts ATK by 1.5x. At the beggining of the stage all specials are charged already.',
+        atk: function(p) { return 1.5; },
+    }
 
 ];

From a629f1760a23d2800f2af6e085bc2ec18fb3dcfb Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 12 May 2016 11:30:33 +0200
Subject: [PATCH 0363/1569] New Colo Complete

---
 common/data/units.js       | 8 ++++----
 common/js/nonSuspicious.js | 2 +-
 index.html                 | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 1bf18bda2..64fb98466 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1038,10 +1038,10 @@ window.units = [
     [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, 3000000, 1120, 443, 141, 2007, 906, 322, 1 ],
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
     [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ],
-    [ "Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 4, 25, 6, 2, 70, null, null, null, null, null, null, null, null ],
-    [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, null, 1392, 640, 120, null, null, null, null ],
-    [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, null, null, null, null, null, null, null, null ],
-    [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, null, null, null, null, null, null, null, null ],
+    [ "Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 4, 25, 6, 2, 70, 1066998, 626, 252, 60, 1464, 700, 169, 1 ],
+    [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
+    [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, 1066998, 455, 310, 36, 949, 797, 113, 1 ],
+    [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, 1378, 813, 297, null ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ]
 	];
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 81024dad7..f93899836 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     /// Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1025, 1027, 1029, 1031, 1033, 1035, 1023 ];
+    var newUnits = [ 1027, 1029, 1031, 1033, 1035, 1023, 1041, 1043 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 43739c222..8230e168a 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>11/05/2016</p>
+            <p>12/05/2016</p>
             <br>
             <ul>
                 <li>Legend Law Hype!</li>
@@ -67,6 +67,7 @@
                 <li>Evolved Version already works in the Calculator</li>
                 <br>
                 <li>New Ace completed</li>
+                <li>New Colo Units Completed</li>
                 <br>
                 <li>Barolomeo now Boosts by Max until we fix his Captain</li>
                 <li>Funk Brothers Special still not implemented</li>

From f3b1cb378797d82e528171e6848c0e6520712476 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 12 May 2016 18:00:20 +0200
Subject: [PATCH 0364/1569] Ace Fix + CDs

---
 common/data/cooldowns.js | 8 ++++----
 common/data/units.js     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 55ba42f0f..9ab60fbbc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1038,8 +1038,8 @@ window.cooldowns = [
     [ 23, 15 ],
     [ 11, 3 ],
     [ 11, 3 ],
-    29,
-    29,
-    18,
-    18
+    [ 29, 18 ],
+    [ 29, 18 ],
+    [ 18, 8 ],
+    [ 18, 8 ]
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 64fb98466..2d128846f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1021,7 +1021,7 @@ window.units = [
     [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, null, null, null, null, 799, 355, 249, null],
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
-	[ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 1310, 221, 1773, 1310, 221, 1 ],
+	[ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 98, 41, 1773, 1310, 221, 1.5 ],
     [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
     [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],

From 2ab831e84b5e65cd91fca33d963b98f69f1bec0b Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 13 May 2016 09:20:46 +0200
Subject: [PATCH 0365/1569] Olvia FN Push

---
 common/data/cooldowns.js | 4 ++--
 common/data/drops.js     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9ab60fbbc..ce6bf2ccd 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -905,8 +905,8 @@ window.cooldowns = [
 	[ 23, 14 ],
 	24,
 	24,
-	15,
-	15,
+	[ 15, 9 ],
+	[ 15, 9 ],
 	[ 20, 15 ],
 	[ 20, 15 ],
 	25,
diff --git a/common/data/drops.js b/common/data/drops.js
index 092208baa..2b472d898 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1002,6 +1002,12 @@ window.drops = {
             thumb: 1037,
             condition: "Only DEX/RCV/TND orbs will appear",
             "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566]
+        },
+        {
+            name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
+            thumb: null,
+            condition: "None so far",
+            "All Difficulties": [ -556, -567, -586, -614, -816, -870, -872, -908]
         }
 
     ],

From 48c79ee485617b2a738fea501f82b3f8e0f145e6 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 13 May 2016 12:39:07 +0200
Subject: [PATCH 0366/1569] Raid Sabo Initial Push

---
 common/data/drops.js      | 8 ++++++++
 common/data/evolutions.js | 4 ++++
 common/data/units.js      | 4 +++-
 index.html                | 6 ++----
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 2b472d898..fac931652 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1156,6 +1156,14 @@ window.drops = {
             showManual: true,
             thumb: 989,
             Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -556, -528, -520, -554, -558, -20, -217, -709]
+        },
+        
+        {
+            name: 'Sabo Raid',
+            thumb: null,
+            Ultimate: [ 1046 ],
+            Master: [ 1046 ],
+            Expert: [ 1046 ]
         }
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ea55c29e3..619cccfbb 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1566,5 +1566,9 @@ window.evolutions = {
     1044: {
         evolution: 1045,
         evolvers: [ 118, 87, 266, 303, 267 ]
+    },
+    1046: {
+        evolution: 1047,
+        evolvers: []
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 2d128846f..d50f4adbc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1043,7 +1043,9 @@ window.units = [
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, 1066998, 455, 310, 36, 949, 797, 113, 1 ],
     [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, 1378, 813, 297, null ],
-    [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ]
+    [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ],
+    [ "Raid Sabo", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Sabo Evolution", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 8230e168a..ac8594c9c 100644
--- a/index.html
+++ b/index.html
@@ -59,12 +59,10 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>12/05/2016</p>
+            <p>13/05/2016</p>
             <br>
             <ul>
-                <li>Legend Law Hype!</li>
-                <li>Complete exept for a few Stats</li>
-                <li>Evolved Version already works in the Calculator</li>
+                <li>Raid Sabo Hype</li>
                 <br>
                 <li>New Ace completed</li>
                 <li>New Colo Units Completed</li>

From 6ffc40c109815434721e924ceabec3fe6bf45bba Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 14 May 2016 21:44:14 +0200
Subject: [PATCH 0367/1569] Stuff

Workaround for Vio showing as a Def Reducer
Colo Killer ATK Reduction
---
 common/data/details.js |  8 ++++----
 common/data/effects.js | 11 +++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e7ff2d65f..c181cbb40 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4680,11 +4680,11 @@ window.details = {
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 13
 			},
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 20
 			}
 		],
@@ -4696,11 +4696,11 @@ window.details = {
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 13
 			},
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
 				"cooldown": 20
 			}
 		],
diff --git a/common/data/effects.js b/common/data/effects.js
index dfc366dee..0085b6645 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -219,9 +219,16 @@ window.effects = {
     'Colosseum Franky': {
         description: 'Activates [G] orb Support, boosts Orbs by 1.5x',
         thumb: 560,
-        id: 25,
+        id: 25, // don't change this
         orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); },
         gOrbsEnabled: true
-    }
+    },
+
+    'Colosseum Killer': {
+        description: 'ATK of all units reduced by 95%',
+        thumb: 1043,
+        id: 26, // don't change this
+        atk: function(p) { return 0.05; }
+    },
 
 };

From fb53942abeaf3bdcdb85e229b858a86035a4c3d2 Mon Sep 17 00:00:00 2001
From: lextic <dryges@gmail.com>
Date: Sat, 14 May 2016 23:18:50 +0100
Subject: [PATCH 0368/1569] added new effect

---
 common/data/effects.js | 10 +++++++++-
 damage/js/cruncher.js  |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 337e91c17..fbca6c453 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 27
+    // last ID used: 28
 
     'Baroque Works (pre-v4.0)': {
         description: 'Stats of non-Fighter units reduced by 90%',
@@ -238,6 +238,14 @@ window.effects = {
         id: 27,
         comboShield: 3,
         comboType: 'Perfect'
+    },
+    
+    'Colosseum Cricket': {
+        description: 'Fixed threshold barrier (200,000)',
+        thumb: 428,
+        id: 28,
+        barrierThreshold: 200000,
+        barrierReduction: 0.99
     }
 
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 18f59151b..a685b34bf 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -345,6 +345,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (lastHit > 1) result.result += Math.ceil(lastAtk * 0.9 * bonusDamageBase);
             else result.result += Math.max(0,Math.ceil(lastAtk * (0.9 * bonusDamageBase + 1 / unit.combo)) - currentDefense);
         }
+        // apply fixed threshold barrier if active
+        if (mapEffect.barrierThreshold && result.result > mapEffect.barrierThreshold) {
+            result.result = mapEffect.barrierThreshold +
+                Math.floor((result.result - mapEffect.barrierThreshold) * (1 - mapEffect.barrierReduction));
+        }
         return result;
     };
 
@@ -608,6 +613,10 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (data.comboShield) mapEffect.comboShield = data.comboShield;
             if (data.comboType) mapEffect.comboType = data.comboType;
             if (data.damage) mapEffect.damage = data.damage;
+            if (data.barrierThreshold) {
+                mapEffect.barrierThreshold = data.barrierThreshold;
+                mapEffect.barrierReduction = data.barrierReduction;
+            }
         }
         // team
         team = $scope.data.team.map(function(x,n) {

From e7df340bb9f74040ecd1ba375ad7b667f2f6ca28 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 15 May 2016 11:13:21 +0200
Subject: [PATCH 0369/1569] Prepare for Merge

---
 common/data/effects.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index fbca6c453..988c2fa20 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 28
+    // last ID used: 29
 
     'Baroque Works (pre-v4.0)': {
         description: 'Stats of non-Fighter units reduced by 90%',
@@ -219,15 +219,22 @@ window.effects = {
     'Colosseum Franky': {
         description: 'Activates [G] orb Support, boosts Orbs by 1.5x',
         thumb: 560,
-        id: 25,
+        id: 25, // don't change this
         orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); },
         gOrbsEnabled: true
     },
+
+    'Colosseum Killer': {
+        description: 'ATK of all units reduced by 95%',
+        thumb: 1043,
+        id: 26, // don't change this
+        atk: function(p) { return 0.05; }
+    },
     
     'Colosseum Kid': {
         description: 'Perfect hit barrier (2 hits)',
         thumb: 966,
-        id: 26,
+        id: 27,
         comboShield: 2,
         comboType: 'Perfect'
     },
@@ -235,7 +242,7 @@ window.effects = {
     'Colosseum Fukuro': {
         description: 'Perfect hit barrier (3 hits)',
         thumb: 758,
-        id: 27,
+        id: 28,
         comboShield: 3,
         comboType: 'Perfect'
     },
@@ -243,7 +250,7 @@ window.effects = {
     'Colosseum Cricket': {
         description: 'Fixed threshold barrier (200,000)',
         thumb: 428,
-        id: 28,
+        id: 29,
         barrierThreshold: 200000,
         barrierReduction: 0.99
     }

From e769a321e442a8291697becaa8a766ea8f3490af Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 15 May 2016 11:53:47 +0200
Subject: [PATCH 0370/1569] Raid Sabo Complete

Well exept for the random damage.
---
 common/data/captains.js    | 14 +++++++++++++-
 common/data/cooldowns.js   |  6 +++++-
 common/data/details.js     | 12 ++++++++++++
 common/data/drops.js       |  4 ++--
 common/data/evolutions.js  |  2 +-
 common/data/families.js    |  6 +++++-
 common/data/gw.js          |  2 +-
 common/data/units.js       |  4 ++--
 common/js/nonSuspicious.js |  2 +-
 index.html                 | 12 +++++-------
 10 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index f101cf0c2..1aa32204e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2556,5 +2556,17 @@ window.captains = {
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    }
+    },
+    1046: {
+		hitAtk: function(p) {
+			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+		},
+		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+    1047: {
+		hitAtk: function(p) {
+			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+		},
+		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ce6bf2ccd..b48e44976 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1041,5 +1041,9 @@ window.cooldowns = [
     [ 29, 18 ],
     [ 29, 18 ],
     [ 18, 8 ],
-    [ 18, 8 ]
+    [ 18, 8 ],
+    null,
+    null,
+    [ 30, 14 ],
+    [ 30, 14 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index c181cbb40..34248208e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5018,5 +5018,17 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}"
+    },
+    1046: {
+        captain: "Boosts ATK of Freedom Units by 3.5x following a chain of Good > Great > Perfect hits",
+        specialName: "Dragon Claw Fist: Dragon's Breath",
+        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage",
+        specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
+    },
+    1047: {
+        captain: "Boosts ATK of Freedom Units by 3.5x following a chain of Good > Great > Perfect hits",
+        specialName: "Dragon Claw Fist: Dragon's Breath",
+        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage",
+        specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
     }
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index fac931652..9ec476182 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1159,8 +1159,8 @@ window.drops = {
         },
         
         {
-            name: 'Sabo Raid',
-            thumb: null,
+            name: 'Clash!! Sabo',
+            thumb: 1047,
             Ultimate: [ 1046 ],
             Master: [ 1046 ],
             Expert: [ 1046 ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 619cccfbb..cff266142 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1569,6 +1569,6 @@ window.evolutions = {
     },
     1046: {
         evolution: 1047,
-        evolvers: []
+        evolvers: [ 118, 86, 266, 302, 102 ]
     }
 };
diff --git a/common/data/families.js b/common/data/families.js
index 0d7c43700..f431fcc4d 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1041,5 +1041,9 @@ window.families = [
     "Jozu",
     "Jozu",
     "Killer",
-    "Killer"
+    "Killer",
+    "Trafalgar Law",
+    "Trafalgar Law",
+    "Sabo",
+    "Sabo"
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 52b4a6f70..545ab07fb 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,27634,27634,27635,27636,27637,27620,27620,27622,27622,27624,28647,28647,28650,null,28723,28723,28761,28761,28759,28759,28756,28756,28754,28754,28771,28771,29445,29445,29446,29446];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,27634,27634,27635,27636,27637,27620,27620,27622,27622,27624,28647,28647,28650,null,28723,28723,28761,28761,28759,28759,28756,28756,28754,28754,28771,28771,29445,29445,29446,29446,29621,29621,29622,29622,29651,29651,29787,29787];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index d50f4adbc..b5e0ae6af 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1044,8 +1044,8 @@ window.units = [
     [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, 1378, 813, 297, null ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ],
-    [ "Raid Sabo", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Raid Sabo Evolution", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
+    [ "Sabo, Revolutionary Army Chief of Staff", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1228, 602, 142, 2484, 1325, 340, 1 ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index f93899836..d6d1c08a6 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     /// Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1027, 1029, 1031, 1033, 1035, 1023, 1041, 1043 ];
+    var newUnits = [ 1031, 1033, 1035, 1023, 1041, 1043, 1047 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index ac8594c9c..1521b0730 100644
--- a/index.html
+++ b/index.html
@@ -59,16 +59,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>13/05/2016</p>
+            <p>15/05/2016</p>
             <br>
             <ul>
-                <li>Raid Sabo Hype</li>
+                <li>Raid Sabo Complete</li>
                 <br>
-                <li>New Ace completed</li>
-                <li>New Colo Units Completed</li>
-                <br>
-                <li>Barolomeo now Boosts by Max until we fix his Captain</li>
-                <li>Funk Brothers Special still not implemented</li>
+                <li>Perfect Shields can now be found</li>
+                <li>in the Map Category of the Calculator</li>
+                <li>Big Thanks to lextic for that</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From b29944595579b94f4d4af485517fb73676a2be95 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 15 May 2016 12:40:21 +0200
Subject: [PATCH 0371/1569] Quickfix 4* Sabo

2.75 instead of 3.5
---
 common/data/captains.js | 2 +-
 common/data/details.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1aa32204e..8acbe4257 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2559,7 +2559,7 @@ window.captains = {
     },
     1046: {
 		hitAtk: function(p) {
-			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
 		},
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
diff --git a/common/data/details.js b/common/data/details.js
index 34248208e..6cf4a2c74 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5020,7 +5020,7 @@ window.details = {
 		specialNotes: "#{stages}"
     },
     1046: {
-        captain: "Boosts ATK of Freedom Units by 3.5x following a chain of Good > Great > Perfect hits",
+        captain: "Boosts ATK of Freedom Units by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage",
         specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"

From 6f58f95521882a5f7977e1c69e172f506a00368f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 15 May 2016 17:54:07 +0200
Subject: [PATCH 0372/1569] Sabo Special

Now works
---
 common/data/details.js  |  4 ++--
 common/data/specials.js |  6 ++++++
 damage/js/cruncher.js   | 35 ++++++++++++++++++++++++++++++++++-
 damage/js/main.js       | 10 ++++++++++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6cf4a2c74..98d270cf7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5022,13 +5022,13 @@ window.details = {
     1046: {
         captain: "Boosts ATK of Freedom Units by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage",
+        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
     },
     1047: {
         captain: "Boosts ATK of Freedom Units by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage",
+        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
     }
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 418670084..4af7e5d60 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1258,5 +1258,11 @@ window.specials = {
     1041: {
         atk: function(p) { return p.percHP < 30.0 ? 1.5 : 1; },
 		type: "type"
+    },
+    1046: {
+        staticMult: function(p) { return 55; }
+    },
+    1047: {
+        staticMult: function(p) { return 55; }
     }
 };
\ No newline at end of file
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index a685b34bf..5401bf5cc 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -244,8 +244,35 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         var result = applySpecialMultipliersAndCaptainEffects(damage,hitModifiers,noSorting);
         // apply chain and bonus multipliers
         result = applyChainAndBonusMultipliers(result,hitModifiers);
-        if (mapEffect.damage) result.result = applyEffectDamage(result.result, mapEffect.damage);
+        if (mapEffect.damage) result.result = applyEffectDamage(result.result, mapEffect.damage);        
+        
+        //Specials that add multiplier damage
+        //Very Specific for Raid Sabo for now
+        var conditionalMultiplier = 1.0;
+        if(!(staticMultiplier.length > 1)){
+            //Check if conditional Boosts are activated since they raise 
+            for (var j=0;j<enabledSpecials.length;++j) {
+                if  (enabledSpecials[j].type=='condition'){
+                    conditionalMultiplier = enabledSpecials[j].atk();
+                }
+            }
+            //Add the static extra Damage to each attacking member
+            for (var j=0;j<enabledSpecials.length;++j) {
+                if (enabledSpecials[j].hasOwnProperty('staticMult')){
+                    var slot = enabledSpecials[j].sourceSlot-1;
+                    var baseDamage = getStatOfUnit(team[slot+1],'atk');
+                    var mult = enabledSpecials[j].staticMult();
+                    var staticDamage = Math.ceil(baseDamage*mult*conditionalMultiplier);
+                    for(var i=0; i<result.result.length;i++){ 
+                        if((hitModifiers[i]=="Great")||(hitModifiers[i]=="Good")||(hitModifiers[i]=="Perfect")){
+                            result.result[i].damage += staticDamage;
+                        }
+                    }
+                }
+            }
+        }
         var overallDamage = result.result.reduce(function(prev,x) { return prev + x.damage; },0);
+        
         return { damage: result.result, overall: overallDamage,
             hitModifiers: hitModifiers, chainMultipliers: result.chainMultipliers };
     };
@@ -255,11 +282,13 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // check damage from default order (or custom order) first, we'll use it as a base for comparison
         var temp = JSON.parse(JSON.stringify(damage));
         var currentResult = getOverallDamage(temp,hitModifiers[0],noSorting);
+        
         for (var i=1;i<hitModifiers.length;++i) {
             var newDamage = JSON.parse(JSON.stringify(damage));
             var newResult = getOverallDamage(newDamage,hitModifiers[i],noSorting);
             if (newResult.overall > currentResult.overall) currentResult = newResult;
         }
+        
         return currentResult;
     };
 
@@ -576,6 +605,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         var result = { type: [ ], class: [ ], orb: [ ], condition: [ ] };
         chainSpecials = [ ];
         chainAddition = [ ];
+        staticMultiplier = [ ];
         enabledSpecials.forEach(function(data) {
             if (data === null) return;
             // notice specials with both atk and atkStatic defined are not supported right now
@@ -587,6 +617,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 chainSpecials.push({ sourceSlot: data.sourceSlot, chain: data.chain, chainLimiter: data.chainLimiter || function() { return Infinity; } });
             if (data.hasOwnProperty('chainAddition'))
                 chainAddition.push({chainAddition: data.chainAddition || function(){ return 0.0;} });
+            if (data.hasOwnProperty('staticMult'))
+                staticMultiplier.push({staticMultiplier: "Yes" });
         });
         specialsCombinations = Utils.arrayProduct([ result.type.concat(result.class), result.condition, result.orb ]);
         if (chainSpecials.length === 0) chainSpecials.push({
@@ -673,6 +705,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // compute special combinations
         computeSpecialsCombinations();
         $scope.conflictingSpecials = (specialsCombinations.length > 1 || chainSpecials.length > 1 || chainAddition.length > 1);
+        $scope.conflictingMultipliers = ( staticMultiplier.length > 1 )
         // get ship bonus
         shipBonus = jQuery.extend({ bonus: window.ships[$scope.data.ship[0]] },{ level: $scope.data.ship[1] });
     };
diff --git a/damage/js/main.js b/damage/js/main.js
index f0c94ca03..fd76e600c 100644
--- a/damage/js/main.js
+++ b/damage/js/main.js
@@ -36,6 +36,16 @@ var MainCtrl = function($scope, $rootScope, $controller, $filter, $storage) {
             });
         }
     });
+    
+    $scope.$watch('conflictingMultipliers',function(value) {
+        if (value) {
+            $scope.notify({
+                text: 'Only one Static Attack Multiplier may be active at a time,'+
+                        'please check yourself which combination is better.',
+                type: 'error'
+            });
+        }
+    });
 
     var zombieNoty = null;
     $scope.$watch('numbers.zombie',function(zombie) {

From 12571605163775dc0ce0505edee1784045508222 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 15 May 2016 19:59:44 +0200
Subject: [PATCH 0373/1569] Typo

Global translations man
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 98d270cf7..67f7b7357 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5020,13 +5020,13 @@ window.details = {
 		specialNotes: "#{stages}"
     },
     1046: {
-        captain: "Boosts ATK of Freedom Units by 2.75x following a chain of Good > Great > Perfect hits",
+        captain: "Boosts ATK of Free Spirit Units by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
     },
     1047: {
-        captain: "Boosts ATK of Freedom Units by 3.5x following a chain of Good > Great > Perfect hits",
+        captain: "Boosts ATK of Free Spirit Units by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"

From b4ea801a65b682a294161bd95b3c9314c59b48c0 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 15 May 2016 22:33:29 +0200
Subject: [PATCH 0374/1569] Typo

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index b5e0ae6af..29dabb484 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1041,7 +1041,7 @@ window.units = [
     [ "Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 4, 25, 6, 2, 70, 1066998, 626, 252, 60, 1464, 700, 169, 1 ],
     [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, 1066998, 455, 310, 36, 949, 797, 113, 1 ],
-    [ "\"Massacre Soldier\" Killer, Kid PIrates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
+    [ "\"Massacre Soldier\" Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, 1378, 813, 297, null ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],

From 7a481a5c679fa080c02042d217512aa6a8ba0f6d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 16 May 2016 00:08:10 +0200
Subject: [PATCH 0375/1569] Dellinger Special Correction

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 67f7b7357..02a2981e9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4710,11 +4710,11 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2x",
         special: [
 			{
-				"description": "For Powerhouse characters, changes [EMPTY] and Bad orbs to Matching orbs.",
+				"description": "For Powerhouse characters, changes Bad orbs to Matching orbs.",
 				"cooldown": 11
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching orbs.",
+				"description": "For all characters, changes Bad orbs to Matching orbs.",
 				"cooldown": 20
 			}
 		],
@@ -4726,11 +4726,11 @@ window.details = {
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         special: [
 			{
-				"description": "For Powerhouse characters, changes [EMPTY] and Bad orbs to Matching orbs.",
+				"description": "For Powerhouse characters, changes Bad orbs to Matching orbs.",
 				"cooldown": 11
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching orbs.",
+				"description": "For all characters, changes Bad orbs to Matching orbs.",
 				"cooldown": 20
 			}
 		],

From 256ede593c3630489aab0837299ea1da7818d6d6 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 16 May 2016 11:47:03 +0200
Subject: [PATCH 0376/1569] Nico Olvia FN + Candy for Sabo Special

---
 common/data/drops.js      | 4 ++--
 common/data/evolutions.js | 8 ++++++++
 common/data/families.js   | 7 ++++++-
 common/data/units.js      | 7 ++++++-
 damage/js/cruncher.js     | 7 ++++---
 index.html                | 4 +++-
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9ec476182..9733c01c8 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1006,8 +1006,8 @@ window.drops = {
         {
             name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
             thumb: null,
-            condition: "None so far",
-            "All Difficulties": [ -556, -567, -586, -614, -816, -870, -872, -908]
+            condition: "Only TND/RCV/INT orbs will appear",
+            "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908]
         }
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index cff266142..7af027fc6 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1570,5 +1570,13 @@ window.evolutions = {
     1046: {
         evolution: 1047,
         evolvers: [ 118, 86, 266, 302, 102 ]
+    },
+    1048: {
+        evolution: 1049,
+        evolvers: []
+    },
+    1050: {
+        evolution: 1051,
+        evolvers: []
     }
 };
diff --git a/common/data/families.js b/common/data/families.js
index f431fcc4d..285db18e7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1045,5 +1045,10 @@ window.families = [
     "Trafalgar Law",
     "Trafalgar Law",
     "Sabo",
-    "Sabo"
+    "Sabo",
+    "Nico Olvia",
+    "Nico Olvia",
+    "Saul",
+    "Saul",
+    "Nico Robin"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 29dabb484..425d78495 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1045,7 +1045,12 @@ window.units = [
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, 1378, 813, 297, null ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
-    [ "Sabo, Revolutionary Army Chief of Staff", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1228, 602, 142, 2484, 1325, 340, 1 ]
+    [ "Sabo, Revolutionary Army Chief of Staff", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1228, 602, 142, 2484, 1325, 340, 1 ],
+    [ "Nico Olvia", "PSY", [ "Shooter", "Cerebral" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Olvia Evolution", "PSY", [ "Shooter", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Saul Evolution", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kid Robin", "QCK", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 5401bf5cc..4157bb712 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -259,10 +259,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             //Add the static extra Damage to each attacking member
             for (var j=0;j<enabledSpecials.length;++j) {
                 if (enabledSpecials[j].hasOwnProperty('staticMult')){
-                    var slot = enabledSpecials[j].sourceSlot-1;
-                    var baseDamage = getStatOfUnit(team[slot+1],'atk');
+                    var slot = enabledSpecials[j].sourceSlot;
+                    var baseDamage = getStatOfUnit(team[slot],'atk');
+                    var atkCandies = team[slot].candies.atk * 2;
                     var mult = enabledSpecials[j].staticMult();
-                    var staticDamage = Math.ceil(baseDamage*mult*conditionalMultiplier);
+                    var staticDamage = Math.ceil((baseDamage+atkCandies)*mult*conditionalMultiplier);
                     for(var i=0; i<result.result.length;i++){ 
                         if((hitModifiers[i]=="Great")||(hitModifiers[i]=="Good")||(hitModifiers[i]=="Perfect")){
                             result.result[i].damage += staticDamage;
diff --git a/index.html b/index.html
index 1521b0730..7c0bac3b6 100644
--- a/index.html
+++ b/index.html
@@ -59,11 +59,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>15/05/2016</p>
+            <p>16/05/2016</p>
             <br>
             <ul>
                 <li>Raid Sabo Complete</li>
                 <br>
+                <li>Added Nico Olvia FN Previews</li>
+                <br>
                 <li>Perfect Shields can now be found</li>
                 <li>in the Map Category of the Calculator</li>
                 <li>Big Thanks to lextic for that</li>

From 8c740cf926bc8d5a4d927091378b89e20b9424bf Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 16 May 2016 19:15:42 +0200
Subject: [PATCH 0377/1569] Fix for conditional Boosts for def reducers

---
 damage/js/cruncher.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 4157bb712..30b2adabe 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -249,20 +249,25 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         //Specials that add multiplier damage
         //Very Specific for Raid Sabo for now
         var conditionalMultiplier = 1.0;
+        //Since we need this for defense down, and defense down gets saved for all slots we just go with slot 0
+        var params = getParameters(0);
         if(!(staticMultiplier.length > 1)){
             //Check if conditional Boosts are activated since they raise 
-            for (var j=0;j<enabledSpecials.length;++j) {
-                if  (enabledSpecials[j].type=='condition'){
-                    conditionalMultiplier = enabledSpecials[j].atk();
+            for (var x=0;x<enabledSpecials.length;++x) {
+                if  (enabledSpecials[x].type=='condition'){
+                    var thisMult = enabledSpecials[x].atk(params);
+                    if(thisMult>conditionalMultiplier){
+                        conditionalMultiplier = thisMult;
+                    }
                 }
             }
             //Add the static extra Damage to each attacking member
-            for (var j=0;j<enabledSpecials.length;++j) {
-                if (enabledSpecials[j].hasOwnProperty('staticMult')){
-                    var slot = enabledSpecials[j].sourceSlot;
+            for (var y=0;y<enabledSpecials.length;++y) {
+                if (enabledSpecials[y].hasOwnProperty('staticMult')){
+                    var slot = enabledSpecials[y].sourceSlot;
                     var baseDamage = getStatOfUnit(team[slot],'atk');
                     var atkCandies = team[slot].candies.atk * 2;
-                    var mult = enabledSpecials[j].staticMult();
+                    var mult = enabledSpecials[y].staticMult();
                     var staticDamage = Math.ceil((baseDamage+atkCandies)*mult*conditionalMultiplier);
                     for(var i=0; i<result.result.length;i++){ 
                         if((hitModifiers[i]=="Great")||(hitModifiers[i]=="Good")||(hitModifiers[i]=="Perfect")){

From b3eaad76f322b477fa80a1422eefa6bcc5c9a277 Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Tue, 17 May 2016 01:27:36 +0800
Subject: [PATCH 0378/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 30b2adabe..7f3de3b8b 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -130,7 +130,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 result[x.unit.class[1]]++;
             }
         });
-//window.alert("Fighter: " + result[classArray[0]] + " Slasher: " + result[classArray[1]] + " Free Spirit: " + result[classArray[2]] + " Powerhouse: " + result[classArray[3]] + " Shooter: " + result[classArray[4]] + " Striker: " + result[classArray[5]] + " Cerebral: " + result[classArray[6]] + " Ambition: " + result[classArray[7]]);
+window.alert("Fighter: " + result[classArray[0]] + " Slasher: " + result[classArray[1]] + " Free Spirit: " + result[classArray[2]] + " Powerhouse: " + result[classArray[3]] + " Shooter: " + result[classArray[4]] + " Striker: " + result[classArray[5]] + " Cerebral: " + result[classArray[6]] + " Ambition: " + result[classArray[7]]);
         result.rcv = Math.max(0,rcvTotal);
         var cost = team.slice(1,6).reduce(function(prev,next) { return prev + (!next.unit ? 0 : next.unit.cost); },0);
         result.cost = { cost: cost, level: Math.max(1,Math.floor(cost / 2) * 2 - 18) };

From f92328f9bb22b857885608d2690a2bb0c1a4edb5 Mon Sep 17 00:00:00 2001
From: architdate <architdate@gmail.com>
Date: Tue, 17 May 2016 01:28:55 +0800
Subject: [PATCH 0379/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 7f3de3b8b..30b2adabe 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -130,7 +130,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 result[x.unit.class[1]]++;
             }
         });
-window.alert("Fighter: " + result[classArray[0]] + " Slasher: " + result[classArray[1]] + " Free Spirit: " + result[classArray[2]] + " Powerhouse: " + result[classArray[3]] + " Shooter: " + result[classArray[4]] + " Striker: " + result[classArray[5]] + " Cerebral: " + result[classArray[6]] + " Ambition: " + result[classArray[7]]);
+//window.alert("Fighter: " + result[classArray[0]] + " Slasher: " + result[classArray[1]] + " Free Spirit: " + result[classArray[2]] + " Powerhouse: " + result[classArray[3]] + " Shooter: " + result[classArray[4]] + " Striker: " + result[classArray[5]] + " Cerebral: " + result[classArray[6]] + " Ambition: " + result[classArray[7]]);
         result.rcv = Math.max(0,rcvTotal);
         var cost = team.slice(1,6).reduce(function(prev,next) { return prev + (!next.unit ? 0 : next.unit.cost); },0);
         result.cost = { cost: cost, level: Math.max(1,Math.floor(cost / 2) * 2 - 18) };

From f8501613ed641e74f0608cd19012a0454a2a31c6 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 16 May 2016 20:27:31 +0200
Subject: [PATCH 0380/1569] Batolomeo Captain Implemented

---
 common/data/captains.js |  4 ++--
 damage/js/cruncher.js   | 46 ++++++++++++++++++++++++-----------------
 index.html              |  6 +++---
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 8acbe4257..b3a4c0d76 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2504,10 +2504,10 @@ window.captains = {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
     },
     1034: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
     },
     1035: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
     },
     1036: {
 		hitAtk: function(p) {
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 30b2adabe..365e98045 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -101,10 +101,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         ['STR','QCK','DEX','PSY','INT'].forEach(function(type) {
             result[type] = crunchForType(type);
         });
-        var classArray = ['Fighter', 'Slasher', 'Free Spirit', 'Powerhouse', 'Shooter', 'Striker', 'Cerebral', 'Ambition'];
-        for (var i = 0, j = classArray.length; i < j; i++) {
-            result[classArray[i]] = 0;
-        }
         result.team = getTeamDetails();
         var hpMax = 0, rcvTotal = 0;
         team.forEach(function(x,n) {
@@ -121,16 +117,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             rcv *= getShipBonus('rcv',false,x.unit,n);
             rcv *= getEffectBonus('rcv',x.unit);
             rcvTotal += Math.floor(applyCaptainEffectsAndSpecialsToRCV(n,rcv));
-            //Counting how many of each class on a team
-            //If unit has only one class
-            if(x.unit.class[2]){
-                result[x.unit.class]++;
-            }else{//if unit has 2 classes
-                result[x.unit.class[0]]++;
-                result[x.unit.class[1]]++;
-            }
         });
-//window.alert("Fighter: " + result[classArray[0]] + " Slasher: " + result[classArray[1]] + " Free Spirit: " + result[classArray[2]] + " Powerhouse: " + result[classArray[3]] + " Shooter: " + result[classArray[4]] + " Striker: " + result[classArray[5]] + " Cerebral: " + result[classArray[6]] + " Ambition: " + result[classArray[7]]);
         result.rcv = Math.max(0,rcvTotal);
         var cost = team.slice(1,6).reduce(function(prev,next) { return prev + (!next.unit ? 0 : next.unit.cost); },0);
         result.cost = { cost: cost, level: Math.max(1,Math.floor(cost / 2) * 2 - 18) };
@@ -249,9 +236,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         //Specials that add multiplier damage
         //Very Specific for Raid Sabo for now
         var conditionalMultiplier = 1.0;
-        //Since we need this for defense down, and defense down gets saved for all slots we just go with slot 0
-        var params = getParameters(0);
-        if(!(staticMultiplier.length > 1)){
+        if(staticMultiplier.length == 1){
+            //Since we need this for defense down, and defense down gets saved for all slots we just go with slot 0
+            var params = getParameters(0);
             //Check if conditional Boosts are activated since they raise 
             for (var x=0;x<enabledSpecials.length;++x) {
                 if  (enabledSpecials[x].type=='condition'){
@@ -267,7 +254,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     var slot = enabledSpecials[y].sourceSlot;
                     var baseDamage = getStatOfUnit(team[slot],'atk');
                     var atkCandies = team[slot].candies.atk * 2;
-                    var mult = enabledSpecials[y].staticMult();
+                    var mult = enabledSpecials[y].staticMult(params);
                     var staticDamage = Math.ceil((baseDamage+atkCandies)*mult*conditionalMultiplier);
                     for(var i=0; i<result.result.length;i++){ 
                         if((hitModifiers[i]=="Great")||(hitModifiers[i]=="Good")||(hitModifiers[i]=="Perfect")){
@@ -715,7 +702,27 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // get ship bonus
         shipBonus = jQuery.extend({ bonus: window.ships[$scope.data.ship[0]] },{ level: $scope.data.ship[1] });
     };
-
+    
+    //Returns an Object with a counter of classes in the current Team
+    //Used for Bartolomeos Captain ability so far
+    var classCounter = function() {
+        var classes = {};
+        var classArray = ['Fighter', 'Slasher', 'Free Spirit', 'Powerhouse', 'Shooter', 'Striker', 'Cerebral', 'Ambition'];
+        for (var i = 0, j = classArray.length; i < j; i++) {
+            classes[classArray[i]] = 0;
+        }
+        for(var z=0;z<team.length;z++){
+            if(team[z].unit){
+                if(team[z].unit.class.length==2){
+                    classes[team[z].unit.class[0]]++;
+                    classes[team[z].unit.class[1]]++; 
+                }else if(team[z].unit.class.length==1){
+                    classes[team[z].unit.class]++;
+                }
+            }
+        }
+        return classes;
+    };
 
     var getParameters = function(slotNumber, chainPosition) {
         return {
@@ -729,7 +736,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             scope: $scope,
             slot: slotNumber,
             turnCounter: $scope.tdata.turnCounter.value,
-            chainPosition: chainPosition
+            chainPosition: chainPosition,
+            classCount: classCounter()
         };
     };
 
diff --git a/index.html b/index.html
index 7c0bac3b6..12df61998 100644
--- a/index.html
+++ b/index.html
@@ -66,9 +66,9 @@
                 <br>
                 <li>Added Nico Olvia FN Previews</li>
                 <br>
-                <li>Perfect Shields can now be found</li>
-                <li>in the Map Category of the Calculator</li>
-                <li>Big Thanks to lextic for that</li>
+                <li>Implemented Bartolomeos Captain Ability</li>
+                <li>Fixed Raid Sbao Special</li>
+                <li>For Real this Time</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 081768e3198e7ed4299d4d80712403410ed94f88 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 16 May 2016 20:54:15 +0200
Subject: [PATCH 0381/1569] Law + Sakura Sugar Complete

---
 common/data/units.js       | 8 ++++----
 common/js/nonSuspicious.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 425d78495..6b82f6291 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1018,8 +1018,8 @@ window.units = [
 	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
 	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Powerhouse"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
-    [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, null, null, null, null, 799, 355, 249, null],
-    [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, null, 731, 300, 198, 1621, 717, 442, null],
+    [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, 392109, 41, 24, 64, 799, 355, 249, 1],
+    [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, 3000000, 731, 300, 198, 1621, 717, 442, 1],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
 	[ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 98, 41, 1773, 1310, 221, 1.5 ],
     [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
@@ -1042,8 +1042,8 @@ window.units = [
     [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, 1066998, 455, 310, 36, 949, 797, 113, 1 ],
     [ "\"Massacre Soldier\" Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
-    [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, null, 549, 341, 138, 1378, 813, 297, null ],
-    [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, null, 1302, 747, 241, 2790, 1484, 470, null ],
+    [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 549, 341, 138, 1378, 813, 297, 1 ],
+    [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, 5000000, 1302, 747, 241, 2790, 1484, 470, 1 ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
     [ "Sabo, Revolutionary Army Chief of Staff", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1228, 602, 142, 2484, 1325, 340, 1 ],
     [ "Nico Olvia", "PSY", [ "Shooter", "Cerebral" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index d6d1c08a6..bbf8a07a0 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     /// Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1031, 1033, 1035, 1023, 1041, 1043, 1047 ];
+    var newUnits = [ 1035, 1023, 1041, 1043, 1047, 1021, 1045 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");

From 06ad62d8e8c94762a305001623acb50e616c945d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 17 May 2016 00:56:53 -0500
Subject: [PATCH 0382/1569] Some stats for Nico Olvia

still missing lots of stuff
---
 common/data/details.js | 30 ++++++++++++++++++++++++++++--
 common/data/units.js   |  4 ++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 02a2981e9..b3d457f35 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4441,7 +4441,7 @@ window.details = {
 	949: {
 		captain: "Boosts ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
 		specialName: "Ties with Ace",
-		special: "Reduces Silence by 3 turns, and recovers 4,000 HP",
+		special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
 	},
 	950: {
@@ -5030,5 +5030,31 @@ window.details = {
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
-    }
+    },
+	1048: {
+		captain: "Boosts ATK and RCV of [PSY] Units by 1.2x",
+		special: "Reduces Numbness duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
+		specialName: "Mother's Wish to Fight The World"		
+	},
+	1049: {
+		captain: "Boosts ATK and RCV of [PSY] Units by 1.5x",
+		special: "Reduces Numbness duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
+		specialName: "Mother's Wish to Fight The World"		
+	},
+	1050: {
+		captain: "Boosts ATK of [PSY] Units by 1.5x",
+		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
+		specialName: "Saul's Laughter: Dereshishishi"
+	},
+	1051: {
+		captain: "Boosts ATK of [PSY] Units by 1.5x",
+		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
+		specialName: "Saul's Laughter: Dereshishishi"
+	},
+	1052: {
+		captain: "Recovers 1,000 HP at the end of each turn",
+		special: "Reduces Silence duration by 2 turns",
+		specialName: "Young Robin Special",
+		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index 6b82f6291..997f3f4fe 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1046,9 +1046,9 @@ window.units = [
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, 5000000, 1302, 747, 241, 2790, 1484, 470, 1 ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
     [ "Sabo, Revolutionary Army Chief of Staff", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1228, 602, 142, 2484, 1325, 340, 1 ],
-    [ "Nico Olvia", "PSY", [ "Shooter", "Cerebral" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Olvia", "PSY", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 50, null, 77, 29, 59, 883, 404, 274, null ],
     [ "Nico Olvia Evolution", "PSY", [ "Shooter", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, null, 173, 56, 29, null, null, null, null ],
     [ "Saul Evolution", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kid Robin", "QCK", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ]
 	];

From 5301bbf9528be61a7c724a1d8291c98b4020309c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 17 May 2016 10:48:33 +0200
Subject: [PATCH 0383/1569] Olvia FN Completed

---
 common/data/captains.js    | 17 ++++++++++++++++-
 common/data/cooldowns.js   | 11 ++++++++---
 common/data/details.js     | 13 +++++++------
 common/data/drops.js       |  2 +-
 common/data/units.js       | 10 +++++-----
 common/data/zombies.js     |  6 +++++-
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  2 +-
 8 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index b3a4c0d76..4fcd1561f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2568,5 +2568,20 @@ window.captains = {
 			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
 		},
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	}
+	},
+    1048: {
+        atk: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; }
+    },
+    1049: {
+        atk: function(p) { return p.unit.type == 'PSY' ? (p.percHP >= 30.0 ? 1.5 : 2.25) : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; }
+    },
+    1050: {
+        atk: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; }
+    },
+    1051: {
+        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
+    }
+    
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b48e44976..0d626f4f4 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -867,8 +867,8 @@ window.cooldowns = [
 	[ 24, 14 ],
 	[ 24, 14 ],
 	[ 24, 14 ],
-	20,
-	20,
+	[ 20, 12 ],
+	[ 20, 12 ],
 	[ 16, 10 ],
 	[ 16, 10 ],
 	[ 19, 14 ],
@@ -1045,5 +1045,10 @@ window.cooldowns = [
     null,
     null,
     [ 30, 14 ],
-    [ 30, 14 ]
+    [ 30, 14 ],
+    [ 22, 15 ],
+    [ 22, 15 ],
+    [ 23, 15 ],
+    [ 23, 15 ],
+    [ 14, 8 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index b3d457f35..706639402 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5037,24 +5037,25 @@ window.details = {
 		specialName: "Mother's Wish to Fight The World"		
 	},
 	1049: {
-		captain: "Boosts ATK and RCV of [PSY] Units by 1.5x",
+		captain: "Boosts ATK and RCV of [PSY] Units by 1.5x, when HP is low the ATK multiplier becomes 2.25x",
+        captainNotes: "The low HP threshold is estimated to be 30%",
 		special: "Reduces Numbness duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
 		specialName: "Mother's Wish to Fight The World"		
 	},
 	1050: {
 		captain: "Boosts ATK of [PSY] Units by 1.5x",
 		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
-		specialName: "Saul's Laughter: Dereshishishi"
+		specialName: "Dereshishishi Towards Hope"
 	},
 	1051: {
-		captain: "Boosts ATK of [PSY] Units by 1.5x",
+		captain: "Boosts ATK of [PSY] Units by 2x",
 		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
-		specialName: "Saul's Laughter: Dereshishishi"
+		specialName: "Dereshishishi Towards Hope"
 	},
 	1052: {
 		captain: "Recovers 1,000 HP at the end of each turn",
 		special: "Reduces Silence duration by 2 turns",
-		specialName: "Young Robin Special",
+		specialName: "Knowledge the World is Afraid of",
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
-	},
+	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 9733c01c8..5255369de 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1005,7 +1005,7 @@ window.drops = {
         },
         {
             name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
-            thumb: null,
+            thumb: 1049,
             condition: "Only TND/RCV/INT orbs will appear",
             "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908]
         }
diff --git a/common/data/units.js b/common/data/units.js
index 997f3f4fe..8238bbef9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1046,11 +1046,11 @@ window.units = [
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, 5000000, 1302, 747, 241, 2790, 1484, 470, 1 ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
     [ "Sabo, Revolutionary Army Chief of Staff", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1228, 602, 142, 2484, 1325, 340, 1 ],
-    [ "Nico Olvia", "PSY", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 50, null, 77, 29, 59, 883, 404, 274, null ],
-    [ "Nico Olvia Evolution", "PSY", [ "Shooter", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, null, 173, 56, 29, null, null, null, null ],
-    [ "Saul Evolution", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kid Robin", "QCK", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Nico Olvia", "PSY", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 77, 29, 59, 883, 404, 274, 1 ],
+    [ "Nico Olvia, Arcaheologist of Ohara", "PSY", [ "Shooter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 800, 339, 223, 1602, 713, 461, 1 ],
+    [ "Jaguar D. Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 173, 56, 29, 1353, 514, 157, 1 ],
+    [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
+    [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 61d557402..0e67036af 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -226,5 +226,9 @@ window.zombies = {
 	1014: {//Tony Tony Chopper, Animal King
 		type: 'healer',
         multiplier: 2
-	}
+	},
+    1052: {//Kid Robin
+        type: 'healer',
+        amount: 1000
+    }
 };
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index bbf8a07a0..e128cd728 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     /// Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1035, 1023, 1041, 1043, 1047, 1021, 1045 ];
+    var newUnits = [ 1043, 1047, 1021, 1045, 1049, 1051, 1052 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 12df61998..7f0166ef7 100644
--- a/index.html
+++ b/index.html
@@ -64,7 +64,7 @@
             <ul>
                 <li>Raid Sabo Complete</li>
                 <br>
-                <li>Added Nico Olvia FN Previews</li>
+                <li>Nico Olvia FN Complete</li>
                 <br>
                 <li>Implemented Bartolomeos Captain Ability</li>
                 <li>Fixed Raid Sbao Special</li>

From c689d72ee8f6f502333d0e7b182ee4e8add3b92c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 17 May 2016 11:01:18 +0200
Subject: [PATCH 0384/1569] Dofla CD Correction

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0d626f4f4..61c06bf97 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -867,8 +867,8 @@ window.cooldowns = [
 	[ 24, 14 ],
 	[ 24, 14 ],
 	[ 24, 14 ],
-	[ 20, 12 ],
-	[ 20, 12 ],
+	[ 20, 15 ],
+	[ 20, 15 ],
 	[ 16, 10 ],
 	[ 16, 10 ],
 	[ 19, 14 ],

From e9337c6abe3d002a8d258b2f6b2024408270dfad Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 17 May 2016 12:28:30 +0200
Subject: [PATCH 0385/1569] Big Bun Special

---
 common/data/details.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 706639402..037f8a97e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2397,7 +2397,6 @@ window.details = {
 		specialName: "Wipeout Tackle"
 	},
 	567: {
-		special: "Reduces Bind and Despair duration by 1 turn, deals STR damage to all enemies",
 		specialName: "Mudfish Coaster"
 	},
 	568: {

From 0eb4d0f1bae19103f1bc6e718ec74b80fc9450ac Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 18 May 2016 14:19:27 +0200
Subject: [PATCH 0386/1569] Challenges + Big Bun Special + Evolvers

---
 common/data/details.js    | 1 +
 common/data/drops.js      | 8 ++++++--
 common/data/evolutions.js | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 037f8a97e..34cc07be8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2397,6 +2397,7 @@ window.details = {
 		specialName: "Wipeout Tackle"
 	},
 	567: {
+		special: "Reduces Bind and Despair duration by 1 turn, deals 15x the character's ATK as STR damage to all enemies",
 		specialName: "Mudfish Coaster"
 	},
 	568: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 5255369de..f1bd68e2d 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -731,9 +731,11 @@ window.drops = {
         },
 
         {
-            name: 'Little Ms. Candy the Maiden-Hearted!',
+            name: 'Maiden in Love - First Sight',
             thumb: 436,
             global: true,
+            challenge: 'Damage dealt in a single Round',
+            challengeData: [['350,000','1x Black Elder'], ['900,000','1x HP Cotton Candy'], ['2,000,000','3x Rainbow Gems']],
             condition: 'Each non-Okama in your Team will take 60 Damage each turn',
             "All Difficulties": [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ]
         },
@@ -829,7 +831,7 @@ window.drops = {
         },
 
         {
-            name: 'Invasion! Pirate Arlong\'s Crew!!',
+            name: 'Shark Attack! Arlong Pirates',
             thumb: 656,
             condition: 'You can only get STR, QCK, DEX, PSY and INT orbs',
             "All Difficulties": [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
@@ -906,6 +908,8 @@ window.drops = {
             name: "Evil Manager Breed's Marine Circus!",
             thumb: 797,
             condition: 'You can only bring Fighter and Powerhouse units',
+            challenge: 'High Score calculated with Crew Cost and Turns Taken',
+            challengeData: [['100,000','1x Purple Elder'],['400,000','1x RCV Candy, 1x Rainbow Gem'],['750,000','1x Auto-Heal Skullbook, 2x Rainbow Gem']],
             "All Difficulties": [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ]
         },
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7af027fc6..98bd0ab83 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1573,10 +1573,10 @@ window.evolutions = {
     },
     1048: {
         evolution: 1049,
-        evolvers: []
+        evolvers: [ 117, 81, 81, 87, 103 ]
     },
     1050: {
         evolution: 1051,
-        evolvers: []
+        evolvers: [ 117, 92, 92, 98, 103 ]
     }
 };

From fb18af6cb4c99e4f99c0b58ed12d5c200e127777 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 19 May 2016 12:30:25 +0200
Subject: [PATCH 0387/1569] Evolutions + Damage Ranges

---
 common/data/details.js    | 12 ++++++------
 common/data/evolutions.js | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 34cc07be8..835f1dd2f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3298,12 +3298,14 @@ window.details = {
 	749: {
 		special: "Deals random DEX damage to all enemies, randomizes all orbs",
 		specialName: "Rankyaku - Amane Dachi",
+        specialNotes: "The random damage is between 10,000 and 90,000",
 		captain: "Boosts ATK of DEX characters by 1.5x, boosts damage of DEX specials by 1.5x",
 		captainNotes: "#{noFixedPerc}"
 	},
 	750: {
 		special: "Deals random DEX damage to all enemies, randomizes all orbs",
 		specialName: "Rankyaku - Amane Dachi",
+        specialNotes: "The random damage is between 10,000 and 90,000",
 		captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
 		captainNotes: "#{noFixedPerc}"
 	},
@@ -4969,15 +4971,13 @@ window.details = {
     },
     1040: {
         captain: "Boosts ATK and HP of [STR] units by 1.5x",
-        special: "Deals severe random STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
-        specialName: "Ice Throw",
-        specialNotes: "Random Damage Ranges will be added as a Note when we find it."
+        special: "Deals 30x the character's ATK as STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
+        specialName: "Ice Throw"
     },
     1041: {
         captain: "Boosts ATK and HP of [STR] units by 2x",
-        special: "Deals severe random STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
-        specialName: "Ice Throw",
-        specialNotes: "Random Damage Ranges will be added as a Note when we find it."
+        special: "Deals 30x the character's ATK as STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
+        specialName: "Ice Throw"
     },
     1042: {
         captain: "Boosts ATK of Striker and Slasher characters by 2x, reduces crew's RCV to 0.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 98bd0ab83..892c92538 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1525,11 +1525,11 @@ window.evolutions = {
 	},
 	1024: {
 		evolution: 1025,
-        evolvers: []
+        evolvers: [ 88, 266, 94, 100, 104 ]
 	},
 	1026: {
 		evolution: 1027,
-        evolvers: []
+        evolvers: [ 85, 96, 301, 301, 101 ]
 	},
 	1028: {
 		evolution: 1029,
@@ -1541,11 +1541,11 @@ window.evolutions = {
 	},
 	1032: {
 		evolution: 1033,
-        evolvers: []
+        evolvers: [ 118, 84, 87, 300, 303 ]
 	},
 	1034: {
 		evolution: 1035,
-        evolvers: []
+        evolvers: [ 118, 84, 266, 300, 267]
 	},
     1036: {
         evolution: 1037,
@@ -1557,7 +1557,7 @@ window.evolutions = {
     },
     1040: {
         evolution: 1041,
-        evolvers: []
+        evolvers: [ 118, 83, 84, 95, 300 ]
     },
     1042: {
         evolution: 1043,

From 44e725db909a29f837d1693ef585fe1a451f3231 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 19 May 2016 10:15:18 -0500
Subject: [PATCH 0388/1569] quest fixes

just small text changes
---
 common/data/drops.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index f1bd68e2d..021c776fd 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -679,7 +679,7 @@ window.drops = {
             thumb: 341,
             global: true,
             condition: 'You may only bring QCK units for 15 and 30 Stamina',
-            challenge: 'Low Teamcost, Fast Clear and Perfect Taps',
+            challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['200,000 Points','1x Red Elder'],['400,000 Points','1x HP Cotton Candy'],['700,000 Points','3x Rainbow Gems']],
             "All Difficulties": [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ]
         },
@@ -689,7 +689,7 @@ window.drops = {
             thumb: 386,
             global: true,
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
-			challenge: 'Low Teamcost, Fast Clear and Perfect Taps',
+			challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Damage Reduction Forbidden Tome']],
             "All Difficulties": [ 385, 387, -388, -335, -314, -36, -16, -11 ]
         },
@@ -908,7 +908,7 @@ window.drops = {
             name: "Evil Manager Breed's Marine Circus!",
             thumb: 797,
             condition: 'You can only bring Fighter and Powerhouse units',
-            challenge: 'High Score calculated with Crew Cost and Turns Taken',
+            challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['100,000','1x Purple Elder'],['400,000','1x RCV Candy, 1x Rainbow Gem'],['750,000','1x Auto-Heal Skullbook, 2x Rainbow Gem']],
             "All Difficulties": [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ]
         },

From 83c9b959a55166acafa14f84b64bb7fe74b0d10c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 23 May 2016 09:49:19 +0200
Subject: [PATCH 0389/1569] Hina Preview + Fixes

Also incremented DB version due to ship change
---
 common/data/details.js    | 16 ++++++++--------
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 +++-
 common/data/gw.js         |  2 +-
 common/data/ships.js      |  4 ++--
 common/data/units.js      |  4 +++-
 common/data/version.js    |  2 +-
 common/js/directives.js   |  2 +-
 index.html                | 10 +++++-----
 9 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 835f1dd2f..eedc8d791 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3533,14 +3533,14 @@ window.details = {
 	},
 	794: {
 		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 10}",
+		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
 		specialName: "Gum-Gum Storm",
 		captain: "Boosts ATK of Powerhouse characters by 3x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
 		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse units."
 	},
 	795: {
 		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 10}",
+		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
 		specialName: "Gum-Gum Storm",
 		captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
 		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse units."
@@ -4682,11 +4682,11 @@ window.details = {
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": 13
 			},
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": 20
 			}
 		],
@@ -4698,11 +4698,11 @@ window.details = {
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": 13
 			},
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, De\fense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns?', and 'Effect after Death?'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": 20
 			}
 		],
@@ -4880,14 +4880,14 @@ window.details = {
     },
 	1024: {
 		captain: "Boosts ATK of Powerhouse characters by 2x",
-		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
+		special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
 		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
 	1025: {
 		captain: "Boosts ATK of Powerhouse characters by 2x and boosts the HP of Striker characters by 2x",
         captainNotes: "A character with both classes will get both boosts",
-		special: "Boosts orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
+		special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
 		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
 		specialName: "Eight-Impact Fist! Blow of Resentment"
 	},
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 892c92538..b3be3c89e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1578,5 +1578,9 @@ window.evolutions = {
     1050: {
         evolution: 1051,
         evolvers: [ 117, 92, 92, 98, 103 ]
+    },
+    1053: {
+        evolution: 1054,
+        evolvers: []
     }
 };
diff --git a/common/data/families.js b/common/data/families.js
index 285db18e7..ff3299c9d 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1050,5 +1050,7 @@ window.families = [
     "Nico Olvia",
     "Saul",
     "Saul",
-    "Nico Robin"
+    "Nico Robin",
+    "Hina",
+    "Hina"
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 545ab07fb..028075107 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,27634,27634,27635,27636,27637,27620,27620,27622,27622,27624,28647,28647,28650,null,28723,28723,28761,28761,28759,28759,28756,28756,28754,28754,28771,28771,29445,29445,29446,29446,29621,29621,29622,29622,29651,29651,29787,29787];
\ No newline at end of file
+window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,27634,27634,27635,27636,27637,27620,27620,27622,27622,27624,28647,28647,28650,null,28723,28723,28761,28761,28759,28759,28756,28756,28754,28754,28771,28771,29445,29445,29446,29446,29621,29621,29622,29622,29651,29651,29787,29787,29915,29915,29916,29916,29917];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index f1fd7a8b5..a7593725b 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -219,8 +219,8 @@ window.ships = [
     { // 17
         name: '2nd Anniversary Thousand Sunny',
         thumb: null,
-        description: 'Boosts ATK by 1.5x. At the beggining of the stage all specials are charged already.',
-        atk: function(p) { return 1.5; },
+        description: 'Boosts ATK by 1.2x.',
+        atk: function(p) { return 1.2; },
     }
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 8238bbef9..674b56c6b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1050,7 +1050,9 @@ window.units = [
     [ "Nico Olvia, Arcaheologist of Ohara", "PSY", [ "Shooter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 800, 339, 223, 1602, 713, 461, 1 ],
     [ "Jaguar D. Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 173, 56, 29, 1353, 514, 157, 1 ],
     [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
-    [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ]
+    [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ],
+    [ "Kid Hina", "QCK", [ "Striker", "Cerebral" ], 4, 10, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kid Hina Evolution", "QCK", [ "Striker", "Cerebral" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/version.js b/common/data/version.js
index 163593770..3eb7ab903 100644
--- a/common/data/version.js
+++ b/common/data/version.js
@@ -1 +1 @@
-window.dbVersion = 35;
+window.dbVersion = 36;
diff --git a/common/js/directives.js b/common/js/directives.js
index 84cdf5e16..5c59fe7a5 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -12,7 +12,7 @@ var notes = {
     orb: "Orb amplification only affects matching and opposite orbs and works both ways: " +
         "matching orbs will deal #1 more damage and opposite orbs will deal #1 less damage.",
     poison: "Poison deals 0.5x character's ATK in fixed damage at the end of each turn.",
-    random: "Estimated random damage range: between #1 HP and #2 HP.",
+    random: "Estimated random damage range: between #1 HP and #2 HP #3.",
     randomHits: "The target of each of the #1 hits is chosen randomly.",
     specialProportional: "The exact multiplier used to compute the damage is proportional to the " +
         "crew's remaining HP and is higher the #1 the HP is. The multiplier is calculated as: #2.",
diff --git a/index.html b/index.html
index 7f0166ef7..33843ee7a 100644
--- a/index.html
+++ b/index.html
@@ -59,16 +59,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>16/05/2016</p>
+            <p>23/05/2016</p>
             <br>
             <ul>
                 <li>Raid Sabo Complete</li>
                 <br>
-                <li>Nico Olvia FN Complete</li>
+                <li>Kid Hina Preview added</li>
                 <br>
-                <li>Implemented Bartolomeos Captain Ability</li>
-                <li>Fixed Raid Sbao Special</li>
-                <li>For Real this Time</li>
+                <li>2nd Anniversary Sunny nerfed</li>
+                <br>
+                <li>Nightmare Luffy Random Range added</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 0d7034dfcf65f29b85234c904d5ce87969ca2612 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 24 May 2016 14:08:12 +0200
Subject: [PATCH 0390/1569] Kid Hina Update

---
 common/data/cooldowns.js  |  4 +++-
 common/data/details.js    | 12 +++++++++++-
 common/data/evolutions.js |  2 +-
 common/data/units.js      |  4 ++--
 index.html                |  4 ++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 61c06bf97..b2246a437 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1050,5 +1050,7 @@ window.cooldowns = [
     [ 22, 15 ],
     [ 23, 15 ],
     [ 23, 15 ],
-    [ 14, 8 ]
+    [ 14, 8 ],
+    [ 13, 13 ],
+    [ 13, 13 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index eedc8d791..41bb94434 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5057,5 +5057,15 @@ window.details = {
 		special: "Reduces Silence duration by 2 turns",
 		specialName: "Knowledge the World is Afraid of",
 		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
-	}
+	},
+    1053: {
+        captain: "Boosts RCV of Cerebral characters by 1.5x",
+        special: "Reduces Numbness and Despair duration by 3 turns, removes Blindness",
+        specialName: "Precocious Provocation"
+    },
+    1054: {
+        captain: "Boosts RCV of Cerebral characters by 2x",
+        special: "Reduces Numbness and Despair duration by 3 turns, removes Blindness",
+        specialName: "Precocious Provocation"
+    }
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b3be3c89e..ee57a7fac 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1581,6 +1581,6 @@ window.evolutions = {
     },
     1053: {
         evolution: 1054,
-        evolvers: []
+        evolvers: [ 117, 79, 90, 96 ]
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 674b56c6b..cf542833c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1051,8 +1051,8 @@ window.units = [
     [ "Jaguar D. Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 173, 56, 29, 1353, 514, 157, 1 ],
     [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
     [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ],
-    [ "Kid Hina", "QCK", [ "Striker", "Cerebral" ], 4, 10, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kid Hina Evolution", "QCK", [ "Striker", "Cerebral" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Hina, Graceful Honor Student", "QCK", [ "Striker", "Cerebral" ], 4, 10, 5, 3, 35, null, null, null, null, 511, 220, 257, null ],
+    [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, null, 501, 198, 259, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 33843ee7a..21a9f0c66 100644
--- a/index.html
+++ b/index.html
@@ -59,12 +59,12 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>23/05/2016</p>
+            <p>24/05/2016</p>
             <br>
             <ul>
                 <li>Raid Sabo Complete</li>
                 <br>
-                <li>Kid Hina Preview added</li>
+                <li>Kid Hina Preview updated</li>
                 <br>
                 <li>2nd Anniversary Sunny nerfed</li>
                 <br>

From 3b5a0f4b14c0b4055154dd2360f13a310b7956f8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 24 May 2016 15:19:42 -0500
Subject: [PATCH 0391/1569] Sabo Map Effect & Flags

Sabo Map Effect now working
---
 common/data/effects.js | 7 +++++++
 common/data/flags.js   | 6 +++++-
 damage/js/cruncher.js  | 4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 988c2fa20..43dddf825 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -253,6 +253,13 @@ window.effects = {
         id: 29,
         barrierThreshold: 200000,
         barrierReduction: 0.99
+    },
+    
+    'Sabo Raid Boss': {
+        description: 'Reduces Chain By Half',
+        thumb: 1047,
+        id: 30,
+        chainModifier: function(p) { return 0.5; }
     }
 
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 462bf9983..1e0e7ac5f 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -738,6 +738,8 @@ window.flags = {
 	793: { rr: 1, rro: 1 },
 	801: { rr: 1, rro: 1, lrr: 1 },
 	802: { rr: 1, rro: 1, lrr: 1 },
+    828: { rr: 1, rro: 1, lrr: 1 },
+	829: { rr: 1, rro: 1, lrr: 1 },
 	837: { rr: 1, rro: 1 },
 	838: { rr: 1, rro: 1 },
 	839: { rr: 1, rro: 1 },
@@ -826,5 +828,7 @@ window.flags = {
     1034: { rr: 1, rro: 1 },
     1035: { rr: 1, rro: 1 },
     1044: { rr: 1, rro: 1 },
-    1045: { rr: 1, rro: 1 }
+    1045: { rr: 1, rro: 1 },
+    1053: { rr: 1, rro: 1, lrr: 1 },
+    1054: { rr: 1, rro: 1, lrr: 1 }  
 };
\ No newline at end of file
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 365e98045..f33525ff8 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -486,6 +486,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 var chainModifier = cptsWith.chainModifiers.reduce(function(prev,next) {
                     return prev * next.chainModifier(getParameters(x.position, n));
                 },1);
+                //Computing Chain Modifier from map effects
+                if (mapEffect.hasOwnProperty('chainModifier'))
+                    chainModifier = Math.min(mapEffect.chainModifier(params[n]), chainModifier);
                 var chainMultiplier = getChainMultiplier(special.chain(params[n]), modifiers.slice(0,n), chainModifier);
                 //Add flat Multiplier Bonuses if they exist
                 if(addition>0.0)
@@ -634,6 +637,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         if ($scope.data.effect) {
             var data = effects[$scope.data.effect];
             if (data.orb) enabledSpecials.push({ orb: data.orb, permanent: true, sourceSlot: -1 });
+            if (data.chainModifier) mapEffect.chainModifier = data.chainModifier;
             if (data.chainLimiter) mapEffect.chainLimiter = data.chainLimiter;
             if (data.comboShield) mapEffect.comboShield = data.comboShield;
             if (data.comboType) mapEffect.comboType = data.comboType;

From 1439135f2f6cf5582e0bfa2776af01b423050a8c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 26 May 2016 03:13:26 -0500
Subject: [PATCH 0392/1569] Stats for all units

need MAX
---
 common/data/details.js | 73 ++++++++++++++++++++++++++++++++++++++++++
 common/data/units.js   | 16 ++++++++-
 2 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 41bb94434..843600949 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5067,5 +5067,78 @@ window.details = {
         captain: "Boosts RCV of Cerebral characters by 2x",
         special: "Reduces Numbness and Despair duration by 3 turns, removes Blindness",
         specialName: "Precocious Provocation"
+    },
+	1055: {
+        special: "Deals 20x character's ATK in [DEX] damage to one enemy. boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
+        specialName: "Sandersonia Special"
+    },
+	1056: {
+        captain: "Boosts ATK of Powerhouse characters by 2x and their RCV by 1.25x",
+        special: "Deals 20x character's ATK in [DEX] damage to one enemy. boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
+        specialName: "Sandersonia Special"
+    },
+	1057: {
+		special: "Strongly poisons one enemy",
+		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        specialName: "Marigold Special"
+    },
+	1058: {
+        captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.25x",
+		special: "Strongly poisons one enemy",
+		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        specialName: "Marigold Special"
+    },
+	1059: {
+        captain: "Boosts ATK and RCV of Shooter characters by 1.2x",
+        special: "Deals 5,000 fixed damage to one enemy. Amplifies the effect of orbs by 1.5x for 1 turn",
+		specialNotes: "#{orb : 1.5x}",
+        specialName: "Marguerite Special"
+    },
+	1060: {
+        captain: "Boosts ATK and RCV of Shooter characters by 1.5x",
+        special: "Deals 5,000 fixed damage to one enemy. Amplifies the effect of orbs by 1.5x for 1 turn",
+		specialNotes: "#{orb : 1.5x}",
+        specialName: "Marguerite Special"
+    },
+	1061: {
+        captain: "Boosts ATK of Shooter characters by 2x",
+		special: "Locks the chain multiplier at 2x for 2 turns"
+        specialName: "Kikyo Special"
+    },
+	1062: {
+        captain: "Boosts ATK of Cerebral characters by 2x and Recovers 2x character's RCV in HP at the end of each turn",
+        special: "Recovers 13x character's RCV in HP",
+        specialName: "Glorisa Special"
+    },
+	1063: {
+        captain: "Boosts ATK and HP of Shooter characters by 1.2x",
+        special: "Boosts ATK of Shooter characters by 1.3x for 1 turn",
+        specialName: "STR Kuja Archer Special"
+    },
+	1064: {
+        captain: "Boosts ATK and HP of [INT] characters by 1.2x",
+        special: "Recovers 3x character's RCV in HP at the end of each turn for 5 turns",
+        specialName: "INT Kuja Archer Special"
+    },
+	1065: {
+        captain: "Boosts ATK of Slasher characters by 1.5x",
+		special: "Amplifies the effect of orbs by 1.25x for 1 turn",
+		specialNotes: "#{orb : 1.25x}",
+        specialName: "INT Kuja Swordswoman Special"
+    },
+	1066: {
+        captain: "Boosts ATK and HP of [PSY] characters by 1.2x",
+        special: "Adds .1x to Chain multiplier for 1 turn",
+        specialName: "INT Kuja Swordswoman Special"
+    },
+	1067: {
+        captain: "Boosts ATK of Fighter characters by 1.5x",
+        special: "Boosts own ATK by 1.5x for 1 turn",
+        specialName: "DEX Kuja Fighter Special"
+    },
+	1068: {
+        captain: "Boosts chain multiplier by 1.5x",
+        special: "Changes own orb into [QCK]",
+        specialName: "QCK Kuja Fighter Special"
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index cf542833c..c43343878 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1052,7 +1052,21 @@ window.units = [
     [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
     [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ],
     [ "Hina, Graceful Honor Student", "QCK", [ "Striker", "Cerebral" ], 4, 10, 5, 3, 35, null, null, null, null, 511, 220, 257, null ],
-    [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, null, 501, 198, 259, null, null, null, null ]
+    [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, null, 501, 198, 259, null, null, null, null ],
+    [ "Boa Sandersonia", "DEX", [ "Striker" ], 3, 12, 6, 1, 50, null, 249, 72, 47, null, null, null, null ],
+    [ "Kuja Pirates, Boa Sandersonia", "DEX", [ "Striker", "Powerhouse" ], 4, 20, 4, 3, 99, null, 1043, 442, 137, null, null, null, null ],
+    [ "Boa Marigold", "STR", [ "Striker" ], 3, 12, 5, 1, 50, null, 183, 40, 31, null, null, null, null ],
+    [ "Kuja Pirates, Boa Marigold", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, null, 1003, 470, 110, null, null, null, null ],
+    [ "Story Marguerite", "PSY", [ "Shooter" ], 3, 9, 4, 1, 35, null, 136, 72, 62, null, null, null, null ],
+    [ "Kuja Pirates, Marguerite", "PSY", [ "Shooter" ], 4, 15, 5, 2, 70, null, 642, 339, 143, null, null, null, null ],
+    [ "Kikyo", "QCK", [ "Shooter" ], 4, 14, 5, 2, 70, null, 132, 94, 56, null, null, null, null ],
+    [ "Gloriosa", "INT", [ "Cerebral", "Fighter" ], 3, 14, 4, 2, 60, null, 586, 351, 79, null, null, null, null ],
+    [ "Kuja Warrior, Red Archer", "STR", [ "Shooter" ], 3, 10, 5, 1, 60, null, 62, 31, 40, null, null, null, null ],
+    [ "Kuja Warrior, Black Archer", "INT", [ "Shooter" ], 3, 10, 5, 1, 60, null, 58, 28, 44, null, null, null, null ],
+    [ "Kuja Warrior, Black Swordswoman", "INT", [ "Slasher" ], 3, 10, 4, 1, 60, null, 65, 98, 25, null, null, null, null ],
+    [ "Kuja Warrior, Yellow Swordswoman", "PSY", [ "Slasher" ], 3, 10, 4, 1, 60, null, 63, 90, 30, null, null, null, null ],
+    [ "Kuja Warrior, Green Fighter", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, null, 120, 50, 26, null, null, null, null ],
+    [ "Kuja Warrior, Blue Fighter ", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, null, 128, 47, 24, null, null, null, null ],
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From f794d2e89f49f0e15640ac52450ccb856bdc332e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 26 May 2016 03:14:55 -0500
Subject: [PATCH 0393/1569] ,

,
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 843600949..22923d60e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5102,7 +5102,7 @@ window.details = {
     },
 	1061: {
         captain: "Boosts ATK of Shooter characters by 2x",
-		special: "Locks the chain multiplier at 2x for 2 turns"
+		special: "Locks the chain multiplier at 2x for 2 turns",
         specialName: "Kikyo Special"
     },
 	1062: {

From 428d6bf99bb51c1f7f05d658d8cc4215fc37f5d6 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 26 May 2016 03:26:29 -0500
Subject: [PATCH 0394/1569] Drops, CD & More!

all done!
---
 common/data/cooldowns.js | 16 +++++++++++++++-
 common/data/details.js   |  4 ++--
 common/data/drops.js     | 18 ++++++++++++++++++
 common/data/flags.js     |  5 +++++
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b2246a437..001fd0eac 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1052,5 +1052,19 @@ window.cooldowns = [
     [ 23, 15 ],
     [ 14, 8 ],
     [ 13, 13 ],
-    [ 13, 13 ]
+    [ 13, 13 ],
+	21,
+	21,
+	17,
+	17,
+	15,
+	15,
+	10,
+	21,
+	20,
+	28,
+	16,
+	13,
+	16,
+	16
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 22923d60e..10a5da4af 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5069,12 +5069,12 @@ window.details = {
         specialName: "Precocious Provocation"
     },
 	1055: {
-        special: "Deals 20x character's ATK in [DEX] damage to one enemy. boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
+        special: "Deals 20x character's ATK in [DEX] damage to one enemy. Boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
         specialName: "Sandersonia Special"
     },
 	1056: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their RCV by 1.25x",
-        special: "Deals 20x character's ATK in [DEX] damage to one enemy. boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
+        special: "Deals 20x character's ATK in [DEX] damage to one enemy. Boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
         specialName: "Sandersonia Special"
     },
 	1057: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 021c776fd..b5b249b1e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -477,6 +477,22 @@ window.drops = {
             "12": [ ],
             "13": [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
             "14": [ 111, 112, 113, 114, 185, 186, 187, 691, 693, 695, 968, 969, 970, 972, 973 ]
+        },
+		
+		{
+            name: "Amazon Lily",
+            shortName: "Amazon Lily",
+            thumb: 917,
+            completion: '5x Rainbow Gems',
+            "01": [ ],
+            "02": [ 1059 ],
+            "03": [ 1061 ],
+            "04": [ 1062 ],
+            "05": [ 1062 ],
+            "06": [ ],
+            "07": [ ],
+            "08": [ 1055, 1057 ],
+            "09": [ 1055, 1057 ]
         }
         
     ],
@@ -833,6 +849,7 @@ window.drops = {
         {
             name: 'Shark Attack! Arlong Pirates',
             thumb: 656,
+			global: true,
             condition: 'You can only get STR, QCK, DEX, PSY and INT orbs',
             "All Difficulties": [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
         },
@@ -840,6 +857,7 @@ window.drops = {
         {
             name: 'Fight! Suna Suna Clan!!',
             thumb: 664,
+			global: true,
             condition: 'Heatwave causes damage every 2 turns',
             "All Difficulties": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index 1e0e7ac5f..e4487881c 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -646,6 +646,11 @@ window.flags = {
 	651: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	660: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	661: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	663: { global: 1 },
+	664: { global: 1 },
+	665: { global: 1 },
+	666: { global: 1 },
+	667: { global: 1 },
 	668: { rr: 1, rro: 1, global: 1 },
 	669: { rr: 1, rro: 1, global: 1 },
 	670: { rr: 1, rro: 1, global: 1 },

From 83f06c9866fedc206b85f2baf0ad9818f5d2c316 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 26 May 2016 03:29:32 -0500
Subject: [PATCH 0395/1569] home page

updated
---
 index.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 21a9f0c66..12067a43e 100644
--- a/index.html
+++ b/index.html
@@ -62,14 +62,16 @@
             <p>24/05/2016</p>
             <br>
             <ul>
+				<li>Amazon Lily Units added</li>
+				<li>Still looking for MAX stats,</li>
+				<li>Please send to Zeenigami</li>
+                <br>
                 <li>Raid Sabo Complete</li>
                 <br>
                 <li>Kid Hina Preview updated</li>
                 <br>
                 <li>2nd Anniversary Sunny nerfed</li>
                 <br>
-                <li>Nightmare Luffy Random Range added</li>
-                <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>
             </ul>

From 748b8d449546ee2fe9b6e354bf2c2a186c662695 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 26 May 2016 10:19:09 -0500
Subject: [PATCH 0396/1569] Everything

New unit details, all of it
---
 common/data/captains.js   | 46 +++++++++++++++++++++++++++++++++++++--
 common/data/details.js    | 30 ++++++++++++-------------
 common/data/evolutions.js | 14 +++++++++++-
 common/data/families.js   | 16 +++++++++++++-
 common/data/specials.js   | 36 +++++++++++++++++++++++++++++-
 common/data/tandems.js    |  7 +++++-
 common/data/units.js      | 30 ++++++++++++-------------
 common/data/zombies.js    |  4 ++++
 index.html                |  2 --
 9 files changed, 147 insertions(+), 38 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 4fcd1561f..916d3d409 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2582,6 +2582,48 @@ window.captains = {
     },
     1051: {
         atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
-    }
-    
+    },
+    1056:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
+        rcv: function(p) { return 1.25; }
+    },
+    1058:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
+        hp: function(p) { return 1.25; }
+    },
+    1059:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;},
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
+    },
+    1060:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1;},
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1;}
+    },
+    1061:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1;}
+    },
+    1062:{
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1;}
+    },
+    1063:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;},
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
+    },
+    1064: {
+        atk: function(p) { return p.unit.type == 'INT' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == 'INT' ? 1.2 : 1; }
+    },
+    1065:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
+    },
+    1066: {
+        atk: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; }
+    },
+    1067:{
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1;}
+    },
+    1068: {
+		chainModifier: function(p) { return 1.5; }
+	}
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index 10a5da4af..5e0398f27 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5070,75 +5070,75 @@ window.details = {
     },
 	1055: {
         special: "Deals 20x character's ATK in [DEX] damage to one enemy. Boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
-        specialName: "Sandersonia Special"
+        specialName: "Snake Press"
     },
 	1056: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their RCV by 1.25x",
         special: "Deals 20x character's ATK in [DEX] damage to one enemy. Boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
-        specialName: "Sandersonia Special"
+        specialName: "Snake Press"
     },
 	1057: {
 		special: "Strongly poisons one enemy",
 		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
-        specialName: "Marigold Special"
+        specialName: "Deadly Poisonous Corrosive Liquid"
     },
 	1058: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.25x",
 		special: "Strongly poisons one enemy",
 		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
-        specialName: "Marigold Special"
+        specialName: "Deadly Poisonous Corrosive Liquid"
     },
 	1059: {
         captain: "Boosts ATK and RCV of Shooter characters by 1.2x",
         special: "Deals 5,000 fixed damage to one enemy. Amplifies the effect of orbs by 1.5x for 1 turn",
 		specialNotes: "#{orb : 1.5x}",
-        specialName: "Marguerite Special"
+        specialName: "Strong Bow of Rejection"
     },
 	1060: {
         captain: "Boosts ATK and RCV of Shooter characters by 1.5x",
         special: "Deals 5,000 fixed damage to one enemy. Amplifies the effect of orbs by 1.5x for 1 turn",
 		specialNotes: "#{orb : 1.5x}",
-        specialName: "Marguerite Special"
+        specialName: "Strong Bow of Rejection"
     },
 	1061: {
         captain: "Boosts ATK of Shooter characters by 2x",
 		special: "Locks the chain multiplier at 2x for 2 turns",
-        specialName: "Kikyo Special"
+        specialName: "Instructions to the Warriors"
     },
 	1062: {
         captain: "Boosts ATK of Cerebral characters by 2x and Recovers 2x character's RCV in HP at the end of each turn",
         special: "Recovers 13x character's RCV in HP",
-        specialName: "Glorisa Special"
+        specialName: "Timeless Art of Self-Defense"
     },
 	1063: {
         captain: "Boosts ATK and HP of Shooter characters by 1.2x",
         special: "Boosts ATK of Shooter characters by 1.3x for 1 turn",
-        specialName: "STR Kuja Archer Special"
+        specialName: "Shooting Power Light"
     },
 	1064: {
         captain: "Boosts ATK and HP of [INT] characters by 1.2x",
         special: "Recovers 3x character's RCV in HP at the end of each turn for 5 turns",
-        specialName: "INT Kuja Archer Special"
+        specialName: "Auto Repair"
     },
 	1065: {
         captain: "Boosts ATK of Slasher characters by 1.5x",
 		special: "Amplifies the effect of orbs by 1.25x for 1 turn",
 		specialNotes: "#{orb : 1.25x}",
-        specialName: "INT Kuja Swordswoman Special"
+        specialName: "Slot Power Light"
     },
 	1066: {
         captain: "Boosts ATK and HP of [PSY] characters by 1.2x",
         special: "Adds .1x to Chain multiplier for 1 turn",
-        specialName: "INT Kuja Swordswoman Special"
+        specialName: "Chain Plus Light"
     },
 	1067: {
         captain: "Boosts ATK of Fighter characters by 1.5x",
         special: "Boosts own ATK by 1.5x for 1 turn",
-        specialName: "DEX Kuja Fighter Special"
+        specialName: "Attack Boost Light"
     },
 	1068: {
         captain: "Boosts chain multiplier by 1.5x",
-        special: "Changes own orb into [QCK]",
-        specialName: "QCK Kuja Fighter Special"
+        special: "Changes captain's orb into [QCK]",
+        specialName: "Captain Slot Change QCK"
     }
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ee57a7fac..088a474b7 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1582,5 +1582,17 @@ window.evolutions = {
     1053: {
         evolution: 1054,
         evolvers: [ 117, 79, 90, 96 ]
-    }
+    },
+    1055: {
+        evolution: 1056,
+        evolvers: [ 117, 80, 86, 97, 102 ]
+    },
+    1057: {
+        evolution: 1058,
+        evolvers: [ 117, 78, 84, 95, 100 ]
+    },
+    1059: {
+        evolution: 1060,
+        evolvers: [ 116, 92, 98, 303 ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index ff3299c9d..8c9f11c24 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1052,5 +1052,19 @@ window.families = [
     "Saul",
     "Nico Robin",
     "Hina",
-    "Hina"
+    "Hina",
+    "Boa Sandersonia",
+    "Boa Sandersonia",
+    "Boa Marigold",
+    "Boa Marigold",
+    "Marguerite",
+    "Marguerite",
+    "Kikyo",
+    "Gloriosa",
+    "Destructive Female Archer, Kuja Warriors",
+    "Scheming Female Archer, Kuja Warriors",
+    "Smart Swordswoman, Kuja Warriors",
+    "Bright Swordswoman, Kuja Warriors",
+    "Skilled Female Fighter, Kuja Warriors",
+    "Nimble Female Fighter, Kuja Warriors"
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 4af7e5d60..30736a157 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1264,5 +1264,39 @@ window.specials = {
     },
     1047: {
         staticMult: function(p) { return 55; }
-    }
+    },
+    1055: {
+		atk: function(p) { return 1.4; },
+		type: "condition",
+		warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
+	},
+    1056: {
+		atk: function(p) { return 1.4; },
+		type: "condition",
+		warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
+	},
+    1059: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1060: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1061: {
+		chain: function(p) { return 2; },
+		chainLimiter: function(p) { return p.chainPosition > 0 ? 2 : 1.0; }
+	},
+    1063: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1},
+        type: "class"
+    },
+    1065: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    1066: {
+        chainAddition: function(p){ return 0.1;}
+    },
+    1067: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+		type: "type"
+	},
 };
\ No newline at end of file
diff --git a/common/data/tandems.js b/common/data/tandems.js
index b61defaa1..874c573c3 100644
--- a/common/data/tandems.js
+++ b/common/data/tandems.js
@@ -323,5 +323,10 @@ window.tandems = [
 		"name": "Kidnapping Trio Rampage",
 		"desc": "Deals 3,000 fixed damage to all enemies",
 		"units": [ 954, 955, 956 ]
-	}
+	},
+    {
+        "name": "Snake Pit Dance",
+        "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Tough characters by 1.3x until the end of the current turn",
+        "units": [ 1056, 1058 ]
+    },
 ];
diff --git a/common/data/units.js b/common/data/units.js
index c43343878..9e1723b6c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1052,21 +1052,21 @@ window.units = [
     [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
     [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ],
     [ "Hina, Graceful Honor Student", "QCK", [ "Striker", "Cerebral" ], 4, 10, 5, 3, 35, null, null, null, null, 511, 220, 257, null ],
-    [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, null, 501, 198, 259, null, null, null, null ],
-    [ "Boa Sandersonia", "DEX", [ "Striker" ], 3, 12, 6, 1, 50, null, 249, 72, 47, null, null, null, null ],
-    [ "Kuja Pirates, Boa Sandersonia", "DEX", [ "Striker", "Powerhouse" ], 4, 20, 4, 3, 99, null, 1043, 442, 137, null, null, null, null ],
-    [ "Boa Marigold", "STR", [ "Striker" ], 3, 12, 5, 1, 50, null, 183, 40, 31, null, null, null, null ],
-    [ "Kuja Pirates, Boa Marigold", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, null, 1003, 470, 110, null, null, null, null ],
-    [ "Story Marguerite", "PSY", [ "Shooter" ], 3, 9, 4, 1, 35, null, 136, 72, 62, null, null, null, null ],
-    [ "Kuja Pirates, Marguerite", "PSY", [ "Shooter" ], 4, 15, 5, 2, 70, null, 642, 339, 143, null, null, null, null ],
-    [ "Kikyo", "QCK", [ "Shooter" ], 4, 14, 5, 2, 70, null, 132, 94, 56, null, null, null, null ],
-    [ "Gloriosa", "INT", [ "Cerebral", "Fighter" ], 3, 14, 4, 2, 60, null, 586, 351, 79, null, null, null, null ],
-    [ "Kuja Warrior, Red Archer", "STR", [ "Shooter" ], 3, 10, 5, 1, 60, null, 62, 31, 40, null, null, null, null ],
-    [ "Kuja Warrior, Black Archer", "INT", [ "Shooter" ], 3, 10, 5, 1, 60, null, 58, 28, 44, null, null, null, null ],
-    [ "Kuja Warrior, Black Swordswoman", "INT", [ "Slasher" ], 3, 10, 4, 1, 60, null, 65, 98, 25, null, null, null, null ],
-    [ "Kuja Warrior, Yellow Swordswoman", "PSY", [ "Slasher" ], 3, 10, 4, 1, 60, null, 63, 90, 30, null, null, null, null ],
-    [ "Kuja Warrior, Green Fighter", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, null, 120, 50, 26, null, null, null, null ],
-    [ "Kuja Warrior, Blue Fighter ", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, null, 128, 47, 24, null, null, null, null ],
+    [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, null, 501, 198, 259, 1044, 500, 414, null ],
+    [ "Boa Sandersonia", "DEX", [ "Fighter" ], 3, 12, 6, 1, 50, 392109, 249, 72, 47, 1040, 500, 176, 1 ],
+    [ "Boa Sandersonia, Kuja Pirates", "DEX", [ "Striker", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1043, 442, 137, 1772, 905, 318, 1 ],
+    [ "Boa Marigold", "STR", [ "Striker" ], 3, 12, 5, 1, 50, 392109, 183, 40, 31, 1062, 517, 158, 1 ],
+    [ "Boa Marigold, Kuja Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1003, 470, 110, 1892, 947, 284, 1 ],
+    [ "Marguerite, Female Warrior", "PSY", [ "Shooter" ], 3, 9, 4, 1, 35, 136167, 136, 72, 62, 699, 401, 189, 1 ],
+    [ "Marguerite, Kuja Warriors", "PSY", [ "Shooter" ], 4, 15, 5, 2, 70, 1066998, 642, 339, 143, 1003, 713, 301, 1 ],
+    [ "Kikyo", "QCK", [ "Shooter" ], 4, 14, 5, 2, 70, 1066998, 132, 94, 56, 999, 741, 262, 1 ],
+    [ "Gloriosa", "INT", [ "Cerebral", "Fighter" ], 3, 14, 4, 2, 60, 674274, 586, 351, 79, 612, 378, 400, 1 ],
+    [ "Destructive Female Archer, Kuja Warriors", "STR", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 62, 31, 40, 933, 574, 252, 1 ],
+    [ "Scheming Female Archer, Kuja Warriors", "INT", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 58, 28, 44, 901, 549, 266, 1 ],
+    [ "Smart Swordswoman, Kuja Warriors", "INT", [ "Slasher" ], 3, 10, 4, 1, 60, 674274, 65, 98, 25, 787, 880, 174, 1 ],
+    [ "Bright Swordswoman, Kuja Warriors", "PSY", [ "Slasher" ], 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
+    [ "Skilled Female Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
+    [ "Nimble Female Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 0e67036af..4256b1af7 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -230,5 +230,9 @@ window.zombies = {
     1052: {//Kid Robin
         type: 'healer',
         amount: 1000
+    },
+    1062: {//Gloriosa
+        type: 'healer',
+        multiplier: 2
     }
 };
diff --git a/index.html b/index.html
index 12067a43e..4e0ebd4c4 100644
--- a/index.html
+++ b/index.html
@@ -63,8 +63,6 @@
             <br>
             <ul>
 				<li>Amazon Lily Units added</li>
-				<li>Still looking for MAX stats,</li>
-				<li>Please send to Zeenigami</li>
                 <br>
                 <li>Raid Sabo Complete</li>
                 <br>

From 513d4402ed1e735f2a331456161310626b8849ee Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 26 May 2016 14:07:57 -0500
Subject: [PATCH 0397/1569] changed thumb

for Amazon Lily
---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index b5b249b1e..e787c7dab 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -482,7 +482,7 @@ window.drops = {
 		{
             name: "Amazon Lily",
             shortName: "Amazon Lily",
-            thumb: 917,
+            thumb: 1056,
             completion: '5x Rainbow Gems',
             "01": [ ],
             "02": [ 1059 ],

From b87d26fc84ac0f49ae0800f1e4100687e8b51bd1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 26 May 2016 16:03:20 -0500
Subject: [PATCH 0398/1569] Herc Global

flagged
---
 common/data/flags.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/flags.js b/common/data/flags.js
index e4487881c..cbe62e235 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -509,6 +509,8 @@ window.flags = {
 	512: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
 	513: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
 	514: { special: 1 },
+    515: { global: 1 },
+    516: { global: 1 },
     517: { global: 1 },
     518: { global: 1 },
 	519: { rr: 1, rro: 1 },

From 9b16c1f27d6034845c5a4e61f84041a1cd3fd258 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 27 May 2016 13:01:16 -0500
Subject: [PATCH 0399/1569] Unit Prototypes, flags, and drops

woo!
---
 common/data/drops.js | 28 ++++++++++++++++++----------
 common/data/units.js | 27 +++++++++++++++++++++++++--
 common/js/utils.js   |  2 +-
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index e787c7dab..414c0fbc9 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -484,15 +484,15 @@ window.drops = {
             shortName: "Amazon Lily",
             thumb: 1056,
             completion: '5x Rainbow Gems',
-            "01": [ ],
-            "02": [ 1059 ],
-            "03": [ 1061 ],
-            "04": [ 1062 ],
-            "05": [ 1062 ],
-            "06": [ ],
-            "07": [ ],
-            "08": [ 1055, 1057 ],
-            "09": [ 1055, 1057 ]
+            "01": [ 919, 301, 300 ],
+            "02": [ 1059, 301, 303 ],
+            "03": [ 1068, 1067, 302 ],
+            "04": [ 1062, 1066, 1065, 88, 87 ],
+            "05": [ 1061, 1062, 86, 84 ],
+            "06": [ 1063, 1064, 1065, 1066, 1067, 1068, 110, 112 ],
+            "07": [ 1067, 1068, 88 ],
+            "08": [ 1055, 1057, 111, 113 ],
+            "09": [ 1055, 1057, 110, 112 ]
         }
         
     ],
@@ -1025,11 +1025,19 @@ window.drops = {
             condition: "Only DEX/RCV/TND orbs will appear",
             "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566]
         },
+        
         {
             name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
             thumb: 1049,
             condition: "Only TND/RCV/INT orbs will appear",
             "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908]
+        },
+        
+        {
+            name: "Pirate Ship Competition! \"Dead End\" Opens!",
+            thumb: null,
+            condition: "???",
+            "All Difficulties": [ -562, -906, -914, -645, -890, -587, -629, -888]
         }
 
     ],
@@ -1225,7 +1233,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1090 ]
         }
 
    ]
diff --git a/common/data/units.js b/common/data/units.js
index 9e1723b6c..164a33321 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1063,10 +1063,33 @@ window.units = [
     [ "Gloriosa", "INT", [ "Cerebral", "Fighter" ], 3, 14, 4, 2, 60, 674274, 586, 351, 79, 612, 378, 400, 1 ],
     [ "Destructive Female Archer, Kuja Warriors", "STR", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 62, 31, 40, 933, 574, 252, 1 ],
     [ "Scheming Female Archer, Kuja Warriors", "INT", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 58, 28, 44, 901, 549, 266, 1 ],
-    [ "Smart Swordswoman, Kuja Warriors", "INT", [ "Slasher" ], 3, 10, 4, 1, 60, 674274, 65, 98, 25, 787, 880, 174, 1 ],
-    [ "Bright Swordswoman, Kuja Warriors", "PSY", [ "Slasher" ], 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
+    [ "Smart Swordswoman, Kuja Warriors", "INT", "Slasher", 3, 10, 4, 1, 60, 674274, 65, 98, 25, 787, 880, 174, 1 ],
+    [ "Bright Swordswoman, Kuja Warriors", "PSY", "Slasher", 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
     [ "Skilled Female Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
     [ "Nimble Female Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [ "Unknown Character", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "QCK", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "PSY", "Striker", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora?", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora?", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum X Drake", "INT", [ "Cerebral", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum X Drake", "INT", [ "Cerebral", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/utils.js b/common/js/utils.js
index ef0318767..30dff8669 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@
         'Skypiea (Guard|Enforcer)', 'Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk'
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors'
     ].join(')|(') + ')', 'i');
 
     var utils = {};

From f76161dc88be57fc62c03cd5a3ffafc5630adc45 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 27 May 2016 13:17:14 -0500
Subject: [PATCH 0400/1569] unit names, fuji 6*

---
 common/data/units.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 164a33321..3f224ce9a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1072,18 +1072,18 @@ window.units = [
     [],
     [],
     [],
-    [ "Unknown Character", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "QCK", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "PSY", "Striker", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora?", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora?", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 1", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 1", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 2", "QCK", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 2", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 3", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 3", "PSY", "Striker", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 4", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 4", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 5", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Sugo Character 5", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora?", "Type", [ "Class1", "Class2" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora?", "Type", [ "Class1", "Class2" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],

From 86896d2ba46ef02adfcae3003857983a09e76dd5 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sat, 28 May 2016 01:53:07 -0500
Subject: [PATCH 0401/1569] New Unit Prototypes

and sugo previews
---
 common/data/details.js | 125 ++++++++++++++++++++++++++++++++++++++++-
 common/data/flags.js   |  16 +++++-
 common/data/units.js   |  24 ++++----
 index.html             |  11 ++--
 4 files changed, 157 insertions(+), 19 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 5e0398f27..7d9a8d5d2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5140,5 +5140,128 @@ window.details = {
         captain: "Boosts chain multiplier by 1.5x",
         special: "Changes captain's orb into [QCK]",
         specialName: "Captain Slot Change QCK"
-    }
+    },
+	1074: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "King Riku Special"
+	},
+	1075: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "King Riku Special"
+	},
+	1076:{
+		captain: "Unknown",
+		special: [
+			{
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown percent",
+			},
+			{
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown percent",
+			}
+		],
+		specialNotes: "#{stages}",
+        specialName: "Leo Special"
+	},
+	1077:{
+		captain: "Unknown",
+		special: [
+			{
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown percent",
+			},
+			{
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown larger percent",
+			}
+		],
+		specialNotes: "#{stages}",
+        specialName: "Leo Special"
+	},
+	1078: {
+		captain: "Unknown",
+		special: [
+			{
+				"description": "Recovers an unknown amount and removes some negative effects.",
+			},
+			{
+				"description": "Recovers an unknown amount and removes some negative effects. (Stronger somehow)",
+			}
+		],
+		specialNotes: "#{stages}",
+		specialName: "Mansherry Special"
+	},
+	1079: {
+		captain: "Unknown",
+		special: [
+			{
+				"description": "Recovers an unknown amount and removes some negative effects.",
+			},
+			{
+				"description": "Recovers an unknown amount and removes some negative effects. (Stronger somehow)",
+			}
+		],
+		specialNotes: "#{stages}",
+		specialName: "Mansherry Special"
+	},
+	1080: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Kyros Special"
+	},
+	1081: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Kyros Special"
+	},
+	1082: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Don Sai Special"
+	},
+	1083: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Don Sai Special"
+	},
+	1084: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Fujitora Special"
+	},
+	1085: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Fujitora Special"
+	},
+	1086: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Colosseum Musshuru Special"
+	},
+	1087: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Colosseum Musshuru Special"
+	},
+	1088: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Colosseum Saga Special"
+	},
+	1089: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Colosseum Saga Special"
+	},
+	1090: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Colosseum X Drake Special"
+	},
+	1091: {
+		captain: "Unknown",
+		special: "Unknown",
+		specialName: "Colosseum X Drake Special"
+	}
+	
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index cbe62e235..f8a6a37db 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -837,5 +837,19 @@ window.flags = {
     1044: { rr: 1, rro: 1 },
     1045: { rr: 1, rro: 1 },
     1053: { rr: 1, rro: 1, lrr: 1 },
-    1054: { rr: 1, rro: 1, lrr: 1 }  
+    1054: { rr: 1, rro: 1, lrr: 1 },
+	1074: { rr: 1, rro: 1 },
+    1075: { rr: 1, rro: 1 },
+    1076: { rr: 1, rro: 1 },
+    1077: { rr: 1, rro: 1 },
+    1078: { rr: 1, rro: 1 },
+    1079: { rr: 1, rro: 1 },
+    1080: { rr: 1, rro: 1 },
+    1081: { rr: 1, rro: 1 },
+    1082: { rr: 1, rro: 1 },
+    1083: { rr: 1, rro: 1 },
+    1084: { rr: 1, rro: 1 },
+    1085: { rr: 1, rro: 1 },
+    1086: { rr: 1, rro: 1 },
+    1087: { rr: 1, rro: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 3f224ce9a..d28526b7b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1072,18 +1072,18 @@ window.units = [
     [],
     [],
     [],
-    [ "Unknown Sugo Character 1", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 1", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 2", "QCK", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 2", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 3", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 3", "PSY", "Striker", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 4", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 4", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 5", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Sugo Character 5", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora?", "Type", [ "Class1", "Class2" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora?", "Type", [ "Class1", "Class2" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Riku Dold III", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Riku Dold III, King of Dressrosa", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Leo, Tonta Corps leader", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Princess Mansherry", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Princess Mansherry, of the Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kyros, Colosseum Gladiator", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Don Sai of the Chinjao Family", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora", "INT", [ "Class1", "Class2" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora, Marine Admiral", "INT", [ "Class1", "Class2" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/index.html b/index.html
index 4e0ebd4c4..e75988145 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,15 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>24/05/2016</p>
+            <p>28/05/2016</p>
             <br>
             <ul>
-				<li>Amazon Lily Units added</li>
+				<li>Fujitora Sugofest Units Added!</li>
+				<li>(Just previews and limited</li>
+				<li>translations. Full Details will</li>
+				<li>not come until Sugofest does.)</li>
                 <br>
-                <li>Raid Sabo Complete</li>
-                <br>
-                <li>Kid Hina Preview updated</li>
+                <li>Amazon Lily Units added</li>
                 <br>
                 <li>2nd Anniversary Sunny nerfed</li>
                 <br>

From 3873120b51e6435a3e5b5dae234292ce6d39a69f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sat, 28 May 2016 02:01:45 -0500
Subject: [PATCH 0402/1569] x drake fix

PSY
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index d28526b7b..12bfaadc4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1088,8 +1088,8 @@ window.units = [
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum X Drake", "INT", [ "Cerebral", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum X Drake", "INT", [ "Cerebral", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 9f1465cc6e70eea302b5cb46b64f7eb8b077e4c1 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 30 May 2016 09:45:01 +0200
Subject: [PATCH 0403/1569] Sugo Updates

---
 common/data/cooldowns.js   |  8 ++++----
 common/data/details.js     | 28 ++++++++++++++--------------
 common/data/evolutions.js  | 36 ++++++++++++++++++++++++++++++++++++
 common/data/units.js       | 14 +++++++-------
 common/js/nonSuspicious.js |  4 ++--
 index.html                 |  6 ++----
 6 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 001fd0eac..38ecc794a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -890,7 +890,7 @@ window.cooldowns = [
 	[ 20, 12 ],
 	[ 20, 12 ],
 	18,
-	14,
+	[ 14, 8 ],
 	[ 28, 22 ],
 	[ 25, 18 ],
 	21,
@@ -964,7 +964,7 @@ window.cooldowns = [
 	23,
 	[ 23, 17 ],
 	[ 23, 17 ],
-	25,
+	[ 25, 18 ],
 	[ 21, 15 ],
 	[ 28, 20 ],
 	[ 28, 20 ],
@@ -990,8 +990,8 @@ window.cooldowns = [
 	[ 19, 12 ],
 	[ 15, 9 ],
 	[ 15, 9 ],
-	20,
-	20,
+	[ 20, 15 ],
+	[ 20, 15 ],
 	null, //Violet
 	null, //Violet
 	null, //Dellinger 
diff --git a/common/data/details.js b/common/data/details.js
index 7d9a8d5d2..752783113 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5143,13 +5143,13 @@ window.details = {
     },
 	1074: {
 		captain: "Unknown",
-		special: "Unknown",
-		specialName: "King Riku Special"
+		special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
+		specialName: "Tenacious Sword of Destruction"
 	},
 	1075: {
 		captain: "Unknown",
-		special: "Unknown",
-		specialName: "King Riku Special"
+		special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
+		specialName: "Tenacious Sword of Destruction"
 	},
 	1076:{
 		captain: "Unknown",
@@ -5162,7 +5162,7 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}",
-        specialName: "Leo Special"
+        specialName: "Haute Couture: Patchwork"
 	},
 	1077:{
 		captain: "Unknown",
@@ -5175,7 +5175,7 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}",
-        specialName: "Leo Special"
+        specialName: "Haute Couture: Patchwork"
 	},
 	1078: {
 		captain: "Unknown",
@@ -5188,7 +5188,7 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}",
-		specialName: "Mansherry Special"
+		specialName: "Chiyupopo"
 	},
 	1079: {
 		captain: "Unknown",
@@ -5201,26 +5201,26 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}",
-		specialName: "Mansherry Special"
+		specialName: "Chiyupopo"
 	},
 	1080: {
 		captain: "Unknown",
-		special: "Unknown",
-		specialName: "Kyros Special"
+		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and bossts own ATK",
+		specialName: "Trueno Bastardo"
 	},
 	1081: {
 		captain: "Unknown",
-		special: "Unknown",
-		specialName: "Kyros Special"
+		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and bossts own ATK",
+		specialName: "Trueno Bastardo"
 	},
 	1082: {
 		captain: "Unknown",
-		special: "Unknown",
+		special: "Deals severe damage to all enemies, if at low health boosts ATK of Striker and Fighter characters",
 		specialName: "Don Sai Special"
 	},
 	1083: {
 		captain: "Unknown",
-		special: "Unknown",
+		special: "Deals severe damage to all enemies, if at low health boosts ATK of Striker and Fighter characters",
 		specialName: "Don Sai Special"
 	},
 	1084: {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 088a474b7..4f9e29be3 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1595,4 +1595,40 @@ window.evolutions = {
         evolution: 1060,
         evolvers: [ 116, 92, 98, 303 ]
     },
+    1074: {
+        evolution: 1075,
+        evolvers: []
+    },
+    1076: {
+        evolution: 1077,
+        evolvers: []
+    },
+    1078: {
+        evolution: 1079,
+        evolvers: []
+    },
+    1080: {
+        evolution: 1081,
+        evolvers: []
+    },
+    1082: {
+        evolution: 1083,
+        evolvers: []
+    },
+    1084: {
+        evolution: 1085,
+        evolvers: []
+    },
+    1086: {
+        evolution: 1087,
+        evolvers: []
+    },
+    1088: {
+        evolution: 1089,
+        evolvers: []
+    },
+    1090: {
+        evolution: 1091,
+        evolvers: []
+    }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 12bfaadc4..e1c904f2b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1072,16 +1072,16 @@ window.units = [
     [],
     [],
     [],
-    [ "Riku Dold III", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Riku Dold III, King of Dressrosa", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Leo, Tonta Corps leader", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Princess Mansherry", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Princess Mansherry, of the Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mansherry", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kyros, Colosseum Gladiator", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Don Sai of the Chinjao Family", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fujitora", "INT", [ "Class1", "Class2" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fujitora, Marine Admiral", "INT", [ "Class1", "Class2" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index e128cd728..2ec4d3bdc 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -44,8 +44,8 @@ $(document).keydown(function(e) {
 window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
-    /// Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1043, 1047, 1021, 1045, 1049, 1051, 1052 ];
+    //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
+    var newUnits = [ 1051, 1052, 1056, 1058, 1060, 1061, 1062 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index e75988145..e2abdb146 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>28/05/2016</p>
+            <p>30/05/2016</p>
             <br>
             <ul>
 				<li>Fujitora Sugofest Units Added!</li>
@@ -67,9 +67,7 @@
 				<li>translations. Full Details will</li>
 				<li>not come until Sugofest does.)</li>
                 <br>
-                <li>Amazon Lily Units added</li>
-                <br>
-                <li>2nd Anniversary Sunny nerfed</li>
+                <li>Amazon Lily Units Completed</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 61d42414503d862e5591d5172bf298bcb2a2be5d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 30 May 2016 10:48:34 +0200
Subject: [PATCH 0404/1569] Fix for null in DMG export Bug

Sometimes 0 Defense was parsed as null which broke the export. Should be
fixed now
Also fixed LLaws Stage 2 DMG
---
 common/data/details.js | 4 ++--
 damage/js/transfer.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 752783113..29f171496 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4998,7 +4998,7 @@ window.details = {
 				"cooldown": 18
 			},
 			{
-				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
 				"cooldown": 25
 			}
 		],
@@ -5013,7 +5013,7 @@ window.details = {
 				"cooldown": 18
 			},
 			{
-				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
 				"cooldown": 25
 			}
 		],
diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index 13a991df0..98e6cb632 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -188,8 +188,8 @@ var ExportCtrl = function($scope) {
 
         // others
         result += data.ship[0] + ',' + data.ship[1] + 'B';
-        //result += (data.defense && data.defense.constructor == Number ? data.defense : 0) + 'D';
-        result += data.defense + 'D';
+        result += (data.defense && data.defense.constructor == Number ? data.defense : parseInt(data.defense)) + 'D';
+        //result += (data.defense != 0 ) + 'D';
         result += ($scope.data.effect ? window.effects[$scope.data.effect].id : 0) + 'E';
         result += parseInt(team.map(function(x) { return ({ '2': 1, '0.5': 2, 'g': 3, '1': 0 }['' + x.orb] || 0); }).join(''),4) + 'Q';
         result += parseInt(team.map(function(x) { return x.lock; }).join(''),3) + 'L';

From 0e00128c6823e91fcc7501369af31d00ed69fb89 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 30 May 2016 16:31:38 -0500
Subject: [PATCH 0405/1569] Fujitora is OP

---
 common/data/cooldowns.js | 25 ++++++++++++++++++++++++-
 common/data/details.js   | 18 ++++++++++--------
 common/data/units.js     |  4 ++--
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 38ecc794a..e6f07203f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1066,5 +1066,28 @@ window.cooldowns = [
 	16,
 	13,
 	16,
-	16
+	16,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	24,
+	24,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 29f171496..f9c4ccb9c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5205,12 +5205,12 @@ window.details = {
 	},
 	1080: {
 		captain: "Unknown",
-		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and bossts own ATK",
+		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and boosts own ATK",
 		specialName: "Trueno Bastardo"
 	},
 	1081: {
 		captain: "Unknown",
-		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and bossts own ATK",
+		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and boosts own ATK",
 		specialName: "Trueno Bastardo"
 	},
 	1082: {
@@ -5224,14 +5224,16 @@ window.details = {
 		specialName: "Don Sai Special"
 	},
 	1084: {
-		captain: "Unknown",
-		special: "Unknown",
-		specialName: "Fujitora Special"
+		captain: "Boosts HP of Ambition characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Ambition characters",
+		special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
+		specialNote: "Does not stack with other 'end of turn damage' abilities",
+		specialName: "Gravito: Heavens Fall"
 	},
 	1085: {
-		captain: "Unknown",
-		special: "Unknown",
-		specialName: "Fujitora Special"
+		captain: "Boosts HP of Ambition characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Ambition characters",
+		special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
+		specialNote: "Does not stack with other 'end of turn damage' abilities",
+		specialName: "Gravito: Heavens Fall"
 	},
 	1086: {
 		captain: "Unknown",
diff --git a/common/data/units.js b/common/data/units.js
index e1c904f2b..8472d6f03 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1082,8 +1082,8 @@ window.units = [
     [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora", "INT", [ "Class1", "Class2" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora, Marine Admiral", "INT", [ "Class1", "Class2" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, null, 4, 70, null, 430, 250, 77, 1890, 754, 204, null ],
+    [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, null, 5, 99, null, 1820, 700, 201, 3809, 1380, 325, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],

From f8f12d59dc81b488faecbe6cd8bc422dac33395b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 May 2016 00:52:44 -0500
Subject: [PATCH 0406/1569] Fujitora Sugofest Units & Dead End

updated
---
 common/data/cooldowns.js | 30 ++++++-------
 common/data/details.js   | 91 +++++++++++++++++++++++++++++-----------
 common/data/families.js  | 25 ++++++++++-
 common/data/flags.js     |  4 +-
 common/data/units.js     | 32 +++++++-------
 5 files changed, 123 insertions(+), 59 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e6f07203f..b92f7a745 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1067,21 +1067,21 @@ window.cooldowns = [
 	13,
 	16,
 	16,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
+	13,
+	13,
+	26,
+	26,
+	15,
+	17,
+	17,
+	null, //Leo
+	null, //Leo
+	null, //Mansherry
+	null, //Mansherry
+	18,
+	18,
+	23,
+	23,
 	24,
 	24,
 	null,
diff --git a/common/data/details.js b/common/data/details.js
index f9c4ccb9c..dbd3c919a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5140,87 +5140,130 @@ window.details = {
         captain: "Boosts chain multiplier by 1.5x",
         special: "Changes captain's orb into [QCK]",
         specialName: "Captain Slot Change QCK"
+    },
+	1069: {
+        captain: "Boosts ATK of Ambition characters by 1.5x",
+        special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
+        specialName: "Shuraiya Special"
+    },
+	1070: {
+        captain: "Boosts ATK of Ambition characters by 2.25x",
+        special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
+        specialName: "Shuraiya Special"
+    },
+	1071: {
+        captain: "Boosts ATK of characters with cost 20 or less by 1.5x",
+        special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
+        specialName: "Gasparde Special"
+    },
+	1072: {
+        captain: "Boosts ATK of characters with cost 30 or less by 2x and boosts the HP of Powerhouse characters by 1.2x",
+        special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
+        specialName: "Gasparde Special"
+    },
+	1073: {
+        captain: "Boosts ATK of Slasher characters by 1.5x",
+        special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
+        specialName: "Needless Special"
     },
 	1074: {
-		captain: "Unknown",
+		captain: "Boosts ATK of [INT] characters by 2x",
 		special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
 		specialName: "Tenacious Sword of Destruction"
 	},
 	1075: {
-		captain: "Unknown",
+		captain: "Boosts ATK and HP of [INT] characters by 2x",
 		special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
 		specialName: "Tenacious Sword of Destruction"
 	},
 	1076:{
-		captain: "Unknown",
+		captain: "Boosts ATK of Striker and Free Spirit characters by 1.75x",
 		special: [
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown percent",
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 10%",
+				"cooldown": 16
 			},
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown percent",
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20%",
+				"cooldown": 20
 			}
 		],
 		specialNotes: "#{stages}",
         specialName: "Haute Couture: Patchwork"
 	},
 	1077:{
-		captain: "Unknown",
+		captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their HP by 1.5x",
 		special: [
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown percent",
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 10%",
+				"cooldown": 16
 			},
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by unknown larger percent",
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20%",
+				"cooldown": 20
 			}
 		],
 		specialNotes: "#{stages}",
         specialName: "Haute Couture: Patchwork"
 	},
 	1078: {
-		captain: "Unknown",
+		captain: "Recovers 3x character's RCV in HP at the end of each turn",
 		special: [
 			{
-				"description": "Recovers an unknown amount and removes some negative effects.",
+				"description": "Recovers 6x character's RCV in HP. Removes Numbness",
+				"cooldown": 14
 			},
 			{
-				"description": "Recovers an unknown amount and removes some negative effects. (Stronger somehow)",
-			}
+				"description": "Recovers 15x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"cooldown": 19
+			},
+			{
+				"description": "Recovers 50x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"cooldown": 24
+			},
 		],
 		specialNotes: "#{stages}",
 		specialName: "Chiyupopo"
 	},
 	1079: {
-		captain: "Unknown",
+		captain: "Recovers 4x character's RCV in HP at the end of each turn",
 		special: [
 			{
-				"description": "Recovers an unknown amount and removes some negative effects.",
+				"description": "Recovers 6x character's RCV in HP. Removes Numbness",
+				"cooldown": 14
 			},
 			{
-				"description": "Recovers an unknown amount and removes some negative effects. (Stronger somehow)",
-			}
+				"description": "Recovers 15x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"cooldown": 19
+			},
+			{
+				"description": "Recovers 50x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"cooldown": 24
+			},
 		],
 		specialNotes: "#{stages}",
 		specialName: "Chiyupopo"
 	},
 	1080: {
-		captain: "Unknown",
-		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and boosts own ATK",
+		captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
+		special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
 		specialName: "Trueno Bastardo"
 	},
 	1081: {
-		captain: "Unknown",
-		special: "Deals unknown damage to one enemy, changes own orb to [DEX] and boosts own ATK",
+		captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
+		special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
 		specialName: "Trueno Bastardo"
 	},
 	1082: {
-		captain: "Unknown",
-		special: "Deals severe damage to all enemies, if at low health boosts ATK of Striker and Fighter characters",
+		captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
+		special: "Deals severe [STR] damage to all enemies. Boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+		specialNotes: "Below 30% -> __ boost, between 30% and 70% -> __, above 70% -> __",
 		specialName: "Don Sai Special"
 	},
 	1083: {
-		captain: "Unknown",
-		special: "Deals severe damage to all enemies, if at low health boosts ATK of Striker and Fighter characters",
+		captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
+		special: "Deals severe [STR] damage to all enemies. Boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+		specialNotes: "Below 30% -> __ boost, between 30% and 70% -> __, above 70% -> __",
 		specialName: "Don Sai Special"
 	},
 	1084: {
diff --git a/common/data/families.js b/common/data/families.js
index 8c9f11c24..08b28b4ec 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1066,5 +1066,28 @@ window.families = [
     "Smart Swordswoman, Kuja Warriors",
     "Bright Swordswoman, Kuja Warriors",
     "Skilled Female Fighter, Kuja Warriors",
-    "Nimble Female Fighter, Kuja Warriors"
+    "Nimble Female Fighter, Kuja Warriors",
+	"Shuraiya",
+	"Shuraiya",
+	"Gasparde",
+	"Gasparde",
+	"Needless",
+	"Ricky",
+	"Ricky",
+	"Leo",
+	"Leo",
+	"Mansherry",
+	"Mansherry",
+	"Kyros",
+	"Kyros",
+	"Don Sai",
+	"Don Sai",
+	"Fujitora",
+	"Fujitora",
+	"Musshuru",
+	"Musshuru"
+	"Saga",
+	"Saga",
+	"X Drake",
+	"X Drake"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index f8a6a37db..ee4525c02 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -849,7 +849,5 @@ window.flags = {
     1082: { rr: 1, rro: 1 },
     1083: { rr: 1, rro: 1 },
     1084: { rr: 1, rro: 1 },
-    1085: { rr: 1, rro: 1 },
-    1086: { rr: 1, rro: 1 },
-    1087: { rr: 1, rro: 1 }
+    1085: { rr: 1, rro: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 8472d6f03..aab2bf0b3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1067,23 +1067,23 @@ window.units = [
     [ "Bright Swordswoman, Kuja Warriors", "PSY", "Slasher", 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
     [ "Skilled Female Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
     [ "Nimble Female Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
-    [],
-    [],
-    [],
-    [],
-    [],
-    [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shuraiya", "DEX", [ "Fighter", "Ambition" ], 3, 9, 5, 2, 35, null, 402, 190, 65, null, null, null, null ],
+    [ "Shuraiya Evolution", "DEX", [ "Fighter", "Ambition" ], 4, 15, 4, 2, 70, null, 812, 358, 80, null, null, null, null ],
+    [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, null, 129, 67, 18, null, null, null, null ],
+    [ "Gasparde Evolved", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, null, 1437, 516, 63, null, null, null, null ],
+    [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, null, 88, 120, 37, null, null, null, null ],
+    [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, null, 207, 102, 62, null, null, null, null ],
     [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Mansherry", "PSY", "Striker", 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, null, 4, 70, null, 430, 250, 77, 1890, 754, 204, null ],
-    [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, null, 5, 99, null, 1820, 700, 201, 3809, 1380, 325, null ],
+    [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, null, 131, 142, 54, null, null, null, null ],
+    [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, null, 918, 637, 177, null, null, null, null ],
+    [ "Mansherry", "PSY", "Striker", 4, 18, 6, 3, 70, null, 100, 94, 86, null, null, null, null ],
+    [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, null, 642, 371, 260, 1510, 642, 557, null ],
+    [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 4, 3, 70, null, 192, 152, 43, null, null, null, null ],
+    [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, null, 1042, 657, 143, null, null, null, null ],
+    [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, null, 130, 130, 31, null, null, null, null ],
+    [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, null, 1231, 631, 87, null, null, null, null ],
+    [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 4, 70, null, 430, 250, 77, 1890, 754, 204, null ],
+    [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, 4, 5, 99, null, 1820, 700, 201, 3809, 1380, 325, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],

From 40beabb87ba1954322a695e44c5ff1462def5283 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 May 2016 00:54:34 -0500
Subject: [PATCH 0407/1569] ,

,
---
 common/data/families.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/families.js b/common/data/families.js
index 08b28b4ec..85a9e7cf8 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1085,7 +1085,7 @@ window.families = [
 	"Fujitora",
 	"Fujitora",
 	"Musshuru",
-	"Musshuru"
+	"Musshuru",
 	"Saga",
 	"Saga",
 	"X Drake",

From 08a07bb44a692a2625d74802783d914a85ac7641 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 May 2016 01:02:15 -0500
Subject: [PATCH 0408/1569] More stats

and drops page
---
 common/data/drops.js | 6 +++---
 common/data/units.js | 4 ++--
 index.html           | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 414c0fbc9..7e9c28896 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1035,9 +1035,9 @@ window.drops = {
         
         {
             name: "Pirate Ship Competition! \"Dead End\" Opens!",
-            thumb: null,
-            condition: "???",
-            "All Difficulties": [ -562, -906, -914, -645, -890, -587, -629, -888]
+            thumb: 1072,
+            condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 80%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 1.6x",
+            "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888]
         }
 
     ],
diff --git a/common/data/units.js b/common/data/units.js
index aab2bf0b3..4e4df09bd 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1051,7 +1051,7 @@ window.units = [
     [ "Jaguar D. Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 173, 56, 29, 1353, 514, 157, 1 ],
     [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
     [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ],
-    [ "Hina, Graceful Honor Student", "QCK", [ "Striker", "Cerebral" ], 4, 10, 5, 3, 35, null, null, null, null, 511, 220, 257, null ],
+    [ "Hina, Graceful Honor Student", "QCK", [ "Striker", "Cerebral" ], 4, 10, 5, 3, 35, null, 85, 27, 55, 511, 220, 257, null ],
     [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, null, 501, 198, 259, 1044, 500, 414, null ],
     [ "Boa Sandersonia", "DEX", [ "Fighter" ], 3, 12, 6, 1, 50, 392109, 249, 72, 47, 1040, 500, 176, 1 ],
     [ "Boa Sandersonia, Kuja Pirates", "DEX", [ "Striker", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1043, 442, 137, 1772, 905, 318, 1 ],
@@ -1073,7 +1073,7 @@ window.units = [
     [ "Gasparde Evolved", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, null, 1437, 516, 63, null, null, null, null ],
     [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, null, 88, 120, 37, null, null, null, null ],
     [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, null, 207, 102, 62, null, null, null, null ],
-    [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, null, 1102, 467, 199, null, null, null, null ],
     [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, null, 131, 142, 54, null, null, null, null ],
     [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, null, 918, 637, 177, null, null, null, null ],
     [ "Mansherry", "PSY", "Striker", 4, 18, 6, 3, 70, null, 100, 94, 86, null, null, null, null ],
diff --git a/index.html b/index.html
index e2abdb146..d6be86cf3 100644
--- a/index.html
+++ b/index.html
@@ -59,15 +59,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>30/05/2016</p>
+            <p>31/05/2016</p>
             <br>
             <ul>
 				<li>Fujitora Sugofest Units Added!</li>
-				<li>(Just previews and limited</li>
-				<li>translations. Full Details will</li>
-				<li>not come until Sugofest does.)</li>
+				<li>Waiting on official images</li>
+				<li>& MAX stats</li>
                 <br>
-                <li>Amazon Lily Units Completed</li>
+                <li>Dead End Fortnight Units Added</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From d22d9d81df410b987c858a54a3c55fea1922424d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 May 2016 01:49:53 -0500
Subject: [PATCH 0409/1569] Needless fix

wrong special
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index dbd3c919a..46868f82a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5163,7 +5163,7 @@ window.details = {
     },
 	1073: {
         captain: "Boosts ATK of Slasher characters by 1.5x",
-        special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
+        special: "Deals 5x ATK in [QCK] damage to all enemies and randomizes all orbs",
         specialName: "Needless Special"
     },
 	1074: {

From 8ae23b30b6f255abc666d5eb05aa9775fbf586b1 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 31 May 2016 12:14:59 +0200
Subject: [PATCH 0410/1569] Bugixes + New Mapeffect

---
 common/data/aliases.js   | 54 +++++++++++++++++++++++++++++++++++++++-
 common/data/cooldowns.js | 12 ++++-----
 common/data/details.js   |  4 +--
 common/data/effects.js   | 12 ++++++++-
 index.html               |  1 +
 5 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index dd8a39a68..97341e1f3 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1037,5 +1037,57 @@ window.aliases = {
     1036: ['エンポリオ・イワンコフ 秘密の花園の女王',''],
     1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
     1038: ['イナズマ 秘密の花園の乙女',''],
-    1039: ['イナズマ 変革を画策する乙女','']
+    1039: ['イナズマ 変革を画策する乙女',''],
+    1040: [ '', '' ],
+    1041: [ '', '' ],
+    1042: [ '', '' ],
+    1043: [ '', '' ],
+    1044: [ '', '' ],
+    1045: [ '', '' ],
+    1046: [ '', '' ],
+    1047: [ '', '' ],
+    1048: [ '', '' ],
+    1049: [ '', '' ],
+    1050: [ '', '' ],
+    1051: [ '', '' ],
+    1052: [ '', '' ],
+    1053: [ '', '' ],
+    1054: [ '', '' ],
+    1055: [ '', '' ],
+    1056: [ '', '' ],
+    1057: [ '', '' ],
+    1058: [ '', '' ],
+    1059: [ '', '' ],
+    1060: [ '', '' ],
+    1061: [ '', '' ],
+    1062: [ '', '' ],
+    1063: [ '', '' ],
+    1064: [ '', '' ],
+    1065: [ '', '' ],
+    1066: [ '', '' ],
+    1067: [ '', '' ],
+    1068: [ '', '' ],
+    1069: [ '', '', 'Shovel Guy' ],
+    1070: [ '', '', 'Shovel Guy' ],
+    1071: [ '', '' ],
+    1072: [ '', '' ],
+    1073: [ '', '' ],
+    1074: [ '', '' ],
+    1075: [ '', '' ],
+    1076: [ '', '' ],
+    1077: [ '', '' ],
+    1078: [ '', '' ],
+    1079: [ '', '' ],
+    1080: [ '', '' ],
+    1081: [ '', '' ],
+    1082: [ '', '' ],
+    1083: [ '', '' ],
+    1084: [ '', '' ],
+    1085: [ '', '' ],
+    1086: [ '', '' ],
+    1087: [ '', '' ],
+    1088: [ '', '' ],
+    1089: [ '', '' ],
+    1090: [ '', '' ],
+    1091: [ '', '' ]
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b92f7a745..240896454 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -903,8 +903,8 @@ window.cooldowns = [
 	[ 29, 19 ],
 	[ 29, 19 ],
 	[ 23, 14 ],
-	24,
-	24,
+	[ 24, 18 ],
+	[ 24, 18 ],
 	[ 15, 9 ],
 	[ 15, 9 ],
 	[ 20, 15 ],
@@ -930,8 +930,8 @@ window.cooldowns = [
 	[ 21, 12 ],
 	[ 16, 11 ],
 	[ 30, 17 ],
-	null, //Pica has Stages - Look into details
-	null, //Pica has Stages - Look into details
+	[ 31, 17 ],
+	[ 31, 17 ],
     19,
     19,
     19,
@@ -975,8 +975,8 @@ window.cooldowns = [
 	22,
 	[ 15, 15 ],
 	[ 15, 15 ],
-    null,
-    null,
+    [ 25, 11 ],
+    [ 25, 11 ],
     [ 25, 18 ],
     [ 15, 7 ],
     [ 16, 8 ],
diff --git a/common/data/details.js b/common/data/details.js
index 46868f82a..8f7514347 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4581,11 +4581,11 @@ window.details = {
 		special: [
 			{
 				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
-				"cooldown": 19
+				"cooldown": [ 19, 5 ]
 			},
 			{
 				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
-				"cooldown": 25
+				"cooldown": [ 25, 11 ]
 			}
 		],
 		specialNotes: "#{stages}"
diff --git a/common/data/effects.js b/common/data/effects.js
index 43dddf825..db46e069e 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,8 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 29
+    // last ID used: 31
+    // Use p.type instead of p.unit.type here
 
     'Baroque Works (pre-v4.0)': {
         description: 'Stats of non-Fighter units reduced by 90%',
@@ -260,6 +261,15 @@ window.effects = {
         thumb: 1047,
         id: 30,
         chainModifier: function(p) { return 0.5; }
+    },
+    
+    'Pirate Ship Competition! \"Dead End\" Opens!': {
+        description: 'STR/DEX/QCK ATK 1.6x and HP 0.2x. INT/PSY ATK 0.2x and HP 1.6x',
+        thumb: null,
+        id: 31,
+        atk: function(p) { console.log(p); return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 0.2; },
+        hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 0.2 : 1.6; }
+        
     }
 
 };
diff --git a/index.html b/index.html
index d6be86cf3..b403e8ea9 100644
--- a/index.html
+++ b/index.html
@@ -67,6 +67,7 @@
 				<li>& MAX stats</li>
                 <br>
                 <li>Dead End Fortnight Units Added</li>
+                <li>Also added it's Map Effect to the Calc</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 90f5fde21a5b9dfe7f7a60e5781ed84b9e3c49ba Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 31 May 2016 14:25:19 +0200
Subject: [PATCH 0411/1569] Heracles'n Global Flag

---
 common/data/drops.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 7e9c28896..3e09f82b0 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1110,6 +1110,7 @@ window.drops = {
         {
             name: 'Clash!! Heracles\'n',
             thumb: 516,
+            global: true,
             Master: [ 87, 97, 113, 117, 118, 294, 295, 303, 429, 515 ],
             Expert: [ 87, 98, 113, 117, 293, 295, 429, 379, 515 ]
         },

From 6970c17f006a22a8368362c41f0cae40a37ecd08 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 31 May 2016 15:58:27 +0200
Subject: [PATCH 0412/1569] Condition Fix

---
 common/data/drops.js   | 2 +-
 common/data/effects.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 3e09f82b0..04a9780a2 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1036,7 +1036,7 @@ window.drops = {
         {
             name: "Pirate Ship Competition! \"Dead End\" Opens!",
             thumb: 1072,
-            condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 80%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 1.6x",
+            condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
             "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888]
         }
 
diff --git a/common/data/effects.js b/common/data/effects.js
index db46e069e..8b1845fe0 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -264,11 +264,11 @@ window.effects = {
     },
     
     'Pirate Ship Competition! \"Dead End\" Opens!': {
-        description: 'STR/DEX/QCK ATK 1.6x and HP 0.2x. INT/PSY ATK 0.2x and HP 1.6x',
+        description: 'STR/DEX/QCK ATK 1.6x and HP 0.1x. INT/PSY ATK 0.2x and HP 2x',
         thumb: null,
         id: 31,
         atk: function(p) { console.log(p); return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 0.2; },
-        hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 0.2 : 1.6; }
+        hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 0.1 : 2.0; }
         
     }
 

From 5fd5a2c6723bc2ef624b003a62666140a0c1932a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 May 2016 15:10:10 -0500
Subject: [PATCH 0413/1569] Damage calculator

still need stats
---
 common/data/captains.js | 54 +++++++++++++++++++++++++++++++++++++++++
 common/data/details.js  | 10 ++++----
 common/data/specials.js | 38 +++++++++++++++++++++++++++++
 common/data/units.js    |  6 ++---
 4 files changed, 100 insertions(+), 8 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 916d3d409..961aaee9e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2625,5 +2625,59 @@ window.captains = {
     },
     1068: {
 		chainModifier: function(p) { return 1.5; }
+	},
+    1069:{
+        atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;}
+    },
+    1070:{
+        atk: function(p) { return p.unit.class.has("Ambition") ? 2.25 : 1;}
+    },
+    1071: {
+		atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
+	},
+    1072: {
+		atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1;}
+	},
+    1073:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
+    },
+    1074: {
+        atk: function(p) { return p.unit.type == 'INT' ? 2 : 1; }
+    },
+    1075: {
+        atk: function(p) { return p.unit.type == 'INT' ? 2 : 1; },
+        hp: function(p) { return p.unit.type == 'INT' ? 2 : 1; }
+    },
+    1076: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+    },
+    1077: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1080: {
+		atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+	},
+    1081: {
+		atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+	},
+    1082: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
+    1083: {
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Striker") && !p.unit.class.has("Fighter")) return 1;
+			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1.5;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1084: {
+		atk: function(p) { return !p.unit.class.has("Ambition") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+	},
+    1085: {
+		atk: function(p) { return !p.unit.class.has("Ambition") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
 	}
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index 8f7514347..dab829bda 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5144,27 +5144,27 @@ window.details = {
 	1069: {
         captain: "Boosts ATK of Ambition characters by 1.5x",
         special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
-        specialName: "Shuraiya Special"
+        specialName: "Fighting Method of the Pirate Executioner"
     },
 	1070: {
         captain: "Boosts ATK of Ambition characters by 2.25x",
         special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
-        specialName: "Shuraiya Special"
+        specialName: "Fighting Method of the Pirate Executioner"
     },
 	1071: {
         captain: "Boosts ATK of characters with cost 20 or less by 1.5x",
         special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
-        specialName: "Gasparde Special"
+        specialName: "Emerald Porcupine Robe"
     },
 	1072: {
         captain: "Boosts ATK of characters with cost 30 or less by 2x and boosts the HP of Powerhouse characters by 1.2x",
         special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
-        specialName: "Gasparde Special"
+        specialName: "Emerald Porcupine Robe"
     },
 	1073: {
         captain: "Boosts ATK of Slasher characters by 1.5x",
         special: "Deals 5x ATK in [QCK] damage to all enemies and randomizes all orbs",
-        specialName: "Needless Special"
+        specialName: "Drilling Hooks"
     },
 	1074: {
 		captain: "Boosts ATK of [INT] characters by 2x",
diff --git a/common/data/specials.js b/common/data/specials.js
index 30736a157..36029d45b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1299,4 +1299,42 @@ window.specials = {
 		atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
 		type: "type"
 	},
+    1071: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
+        type: "class"
+    },
+    1072: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
+        type: "class"
+    },
+    1080: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+		type: "type"
+	},
+    1081: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+		type: "type"
+	},
+    1082: {
+        orb: function(p) {
+            if(p.percHP >= 70.0){
+                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
+            }else if(p.percHP >= 20.0){
+                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.5 : 1;
+            }else{
+                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
+            }
+        }
+    },
+    1083: {
+        orb: function(p) {
+            if(p.percHP >= 70.0){
+                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
+            }else if(p.percHP >= 20.0){
+                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.5 : 1;
+            }else{
+                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
+            }
+        }
+    }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 4e4df09bd..3032af54a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1067,10 +1067,10 @@ window.units = [
     [ "Bright Swordswoman, Kuja Warriors", "PSY", "Slasher", 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
     [ "Skilled Female Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
     [ "Nimble Female Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
-    [ "Shuraiya", "DEX", [ "Fighter", "Ambition" ], 3, 9, 5, 2, 35, null, 402, 190, 65, null, null, null, null ],
-    [ "Shuraiya Evolution", "DEX", [ "Fighter", "Ambition" ], 4, 15, 4, 2, 70, null, 812, 358, 80, null, null, null, null ],
+    [ "Shuraiya Bascùd", "DEX", [ "Fighter", "Ambition" ], 3, 9, 5, 2, 35, null, 402, 190, 65, null, null, null, null ],
+    [ "Shuraiya Bascùd, Pirate Executioner", "DEX", [ "Fighter", "Ambition" ], 4, 15, 4, 2, 70, null, 812, 358, 80, null, null, null, null ],
     [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, null, 129, 67, 18, null, null, null, null ],
-    [ "Gasparde Evolved", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, null, 1437, 516, 63, null, null, null, null ],
+    [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, null, 1437, 516, 63, null, null, null, null ],
     [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, null, 88, 120, 37, null, null, null, null ],
     [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, null, 207, 102, 62, null, null, null, null ],
     [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, null, 1102, 467, 199, null, null, null, null ],

From c4bcf07fe294530a1ae568a29cdcba201fb0a88a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 1 Jun 2016 02:41:51 -0500
Subject: [PATCH 0414/1569] Colosseum!

new units
---
 common/data/details.js | 27 +++++++++++++++------------
 common/data/units.js   | 24 ++++++++++++------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index dab829bda..b67dd1173 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5279,33 +5279,36 @@ window.details = {
 		specialName: "Gravito: Heavens Fall"
 	},
 	1086: {
-		captain: "Unknown",
-		special: "Unknown",
+		captain: "Boosts ATK and RCV of Ambition characters by 1.5x",
+		specialNotes: "#{orb : 1.5x}",
+		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
 		specialName: "Colosseum Musshuru Special"
 	},
 	1087: {
-		captain: "Unknown",
-		special: "Unknown",
+		captain: "Boosts ATK and RCV of Ambition characters by 1.5x",
+		specialNotes: "#{orb : 1.5x}",
+		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
 		specialName: "Colosseum Musshuru Special"
 	},
 	1088: {
-		captain: "Unknown",
-		special: "Unknown",
+		captain: "Boosts ATK of Slasher characters by 2x",
+		special: "Greatly reduces crew's HP, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
 		specialName: "Colosseum Saga Special"
 	},
 	1089: {
-		captain: "Unknown",
-		special: "Unknown",
+		captain: "Boosts ATK of Slasher characters by 2x and the HP of Ambition characters by 1.75x",
+		captainNotes: "Slasher + Ambition characters gain ATK AND HP",
+		special: "Greatly reduces crew's HP, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
 		specialName: "Colosseum Saga Special"
 	},
 	1090: {
-		captain: "Unknown",
-		special: "Unknown",
+		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
+		special: "Deals severe [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
 		specialName: "Colosseum X Drake Special"
 	},
 	1091: {
-		captain: "Unknown",
-		special: "Unknown",
+		captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
+		special: "Deals severe [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
 		specialName: "Colosseum X Drake Special"
 	}
 	
diff --git a/common/data/units.js b/common/data/units.js
index 3032af54a..08060dc88 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1067,11 +1067,11 @@ window.units = [
     [ "Bright Swordswoman, Kuja Warriors", "PSY", "Slasher", 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
     [ "Skilled Female Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
     [ "Nimble Female Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
-    [ "Shuraiya Bascùd", "DEX", [ "Fighter", "Ambition" ], 3, 9, 5, 2, 35, null, 402, 190, 65, null, null, null, null ],
-    [ "Shuraiya Bascùd, Pirate Executioner", "DEX", [ "Fighter", "Ambition" ], 4, 15, 4, 2, 70, null, 812, 358, 80, null, null, null, null ],
-    [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, null, 129, 67, 18, null, null, null, null ],
-    [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, null, 1437, 516, 63, null, null, null, null ],
-    [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, null, 88, 120, 37, null, null, null, null ],
+    [ "Shuraiya Bascùd", "DEX", [ "Fighter", "Ambition" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
+    [ "Shuraiya Bascùd, Pirate Executioner", "DEX", [ "Fighter", "Ambition" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
+    [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, 392109, 129, 67, 18, 1494, 571, 101, 1 ],
+    [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
+    [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
     [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, null, 207, 102, 62, null, null, null, null ],
     [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, null, 1102, 467, 199, null, null, null, null ],
     [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, null, 131, 142, 54, null, null, null, null ],
@@ -1082,14 +1082,14 @@ window.units = [
     [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, null, 1042, 657, 143, null, null, null, null ],
     [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, null, 130, 130, 31, null, null, null, null ],
     [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, null, 1231, 631, 87, null, null, null, null ],
-    [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 4, 70, null, 430, 250, 77, 1890, 754, 204, null ],
-    [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, 4, 5, 99, null, 1820, 700, 201, 3809, 1380, 325, null ],
-    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
+    [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
+    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, null, null, null, null ],
+    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
+    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From a80d5479c50a5bb55f3e95f1c2e0a5f9856214bd Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 1 Jun 2016 10:29:13 -0500
Subject: [PATCH 0415/1569] details & calculator

added
---
 common/data/captains.js  | 23 ++++++++++++++++++++++-
 common/data/cooldowns.js | 22 +++++++++++-----------
 common/data/details.js   | 22 +++++++++++-----------
 common/data/drops.js     |  2 ++
 common/data/specials.js  | 14 ++++++++++++++
 common/data/units.js     |  4 ++--
 index.html               |  2 +-
 7 files changed, 63 insertions(+), 26 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 961aaee9e..0a8317a8f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2679,5 +2679,26 @@ window.captains = {
     1085: {
 		atk: function(p) { return !p.unit.class.has("Ambition") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
 		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
-	}
+	},
+    1086:{
+        atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;},
+        rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;}
+    },
+    1087:{
+        atk: function(p) { return p.unit.class.has("Ambition") ? 2 : 1;},
+        rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;}
+    },
+    1088:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;}
+    },
+    1089:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;},
+        hp: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1;}
+    },
+    1090: {
+		atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
+	},
+    1091: {
+		atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
+	},
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 240896454..25f8d62e1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1067,11 +1067,11 @@ window.cooldowns = [
 	13,
 	16,
 	16,
-	13,
-	13,
-	26,
-	26,
-	15,
+	[ 13, 8 ],
+	[ 13, 8 ],
+	[ 26, 18 ],
+	[ 26, 18 ],
+	[ 15, 6 ],
 	17,
 	17,
 	null, //Leo
@@ -1084,10 +1084,10 @@ window.cooldowns = [
 	23,
 	24,
 	24,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null
+	[ 20, 10 ],
+	[ 20, 10 ],
+	[ 20, 10 ],
+	[ 20, 10 ],
+	[ 25, 12 ],
+	[ 25, 12 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index b67dd1173..fe883218e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5257,13 +5257,13 @@ window.details = {
 	1082: {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
 		special: "Deals severe [STR] damage to all enemies. Boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
-		specialNotes: "Below 30% -> __ boost, between 30% and 70% -> __, above 70% -> __",
+		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
 		specialName: "Don Sai Special"
 	},
 	1083: {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
 		special: "Deals severe [STR] damage to all enemies. Boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
-		specialNotes: "Below 30% -> __ boost, between 30% and 70% -> __, above 70% -> __",
+		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
 		specialName: "Don Sai Special"
 	},
 	1084: {
@@ -5282,34 +5282,34 @@ window.details = {
 		captain: "Boosts ATK and RCV of Ambition characters by 1.5x",
 		specialNotes: "#{orb : 1.5x}",
 		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialName: "Colosseum Musshuru Special"
+		specialName: "Lot Stiffen"
 	},
 	1087: {
-		captain: "Boosts ATK and RCV of Ambition characters by 1.5x",
+		captain: "Boosts ATK of Ambition characters by 2x and their RCV by 1.5x",
 		specialNotes: "#{orb : 1.5x}",
 		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialName: "Colosseum Musshuru Special"
+		specialName: "Lot Stiffen"
 	},
 	1088: {
 		captain: "Boosts ATK of Slasher characters by 2x",
-		special: "Greatly reduces crew's HP, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
-		specialName: "Colosseum Saga Special"
+		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
+		specialName: "Seven Stars Sword of Darkness"
 	},
 	1089: {
 		captain: "Boosts ATK of Slasher characters by 2x and the HP of Ambition characters by 1.75x",
 		captainNotes: "Slasher + Ambition characters gain ATK AND HP",
-		special: "Greatly reduces crew's HP, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
-		specialName: "Colosseum Saga Special"
+		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
+		specialName: "Seven Stars Sword of Darkness"
 	},
 	1090: {
 		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
 		special: "Deals severe [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
-		specialName: "Colosseum X Drake Special"
+		specialName: "Double Edge of Revolt"
 	},
 	1091: {
 		captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
 		special: "Deals severe [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
-		specialName: "Colosseum X Drake Special"
+		specialName: "Double Edge of Revolt"
 	}
 	
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 04a9780a2..0e010de22 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -789,6 +789,8 @@ window.drops = {
             thumb: 538,
             global: true,
             condition: '30: Non-Shooter, Evolver, or Booster class characters are weakend; 15: Fighter and Slasher class characters are weakened',
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challengeData: [['600,000 Damage','1x Yellow Elder'],['2,000,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['5,000,000 Damage','1x Matching Orb Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ]
         },
 
diff --git a/common/data/specials.js b/common/data/specials.js
index 36029d45b..ae048d6df 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1336,5 +1336,19 @@ window.specials = {
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
             }
         }
+    },
+    1086: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1087: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1088: {
+        atk: function(p) { return p.unit.class.has("Slasher" || "Ambition") ? 1.5 : 1},
+        type: "class"
+    },
+    1089: {
+        atk: function(p) { return p.unit.class.has("Slasher" || "Ambition") ? 1.5 : 1},
+        type: "class"
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 08060dc88..e6c1a1a47 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1085,11 +1085,11 @@ window.units = [
     [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
     [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
-    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, 667, 472, 131, null, null, null, null, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, null, null, null, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
-    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, null, null, null, null ]
+    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index b403e8ea9..8e2ca8ffc 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>31/05/2016</p>
+            <p>1/06/2016</p>
             <br>
             <ul>
 				<li>Fujitora Sugofest Units Added!</li>

From 5a3288c6e54709d97bd2a26facd51475bf9a9c0d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 1 Jun 2016 10:31:44 -0500
Subject: [PATCH 0416/1569] Thriller Bark Global

flagged
---
 common/data/drops.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 0e010de22..14b0f35d6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -425,6 +425,7 @@ window.drops = {
             name: "Thriller Bark: Mouth Gate - Hogback's Residence",
             shortName: "Thriller Bark 1",
             thumb: 816,
+            global: true,
             completion: '5x Rainbow Gems',
             "01": [ 89, 90, 91, 387, 817, 818, 819, 820, 821 ],
             "02": [ 89, 90, 91, 92, 93, 812, 817, 818, 819, 820, 821 ],

From 5b9678e292fb5a532a60f78bddf58fe927261496 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 1 Jun 2016 14:15:11 -0500
Subject: [PATCH 0417/1569] Don Sai Turns

2
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fe883218e..12b0f476c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5256,13 +5256,13 @@ window.details = {
 	},
 	1082: {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
-		special: "Deals severe [STR] damage to all enemies. Boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+		special: "Deals severe [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
 		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
 		specialName: "Don Sai Special"
 	},
 	1083: {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
-		special: "Deals severe [STR] damage to all enemies. Boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+		special: "Deals severe [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
 		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
 		specialName: "Don Sai Special"
 	},

From 4a0d58927ab4fe45b3995b81b427990b1becc7c8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 1 Jun 2016 14:17:40 -0500
Subject: [PATCH 0418/1569] Leo Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index e6c1a1a47..5cf44c529 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1074,7 +1074,7 @@ window.units = [
     [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
     [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, null, 207, 102, 62, null, null, null, null ],
     [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, null, 1102, 467, 199, null, null, null, null ],
-    [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, null, 131, 142, 54, null, null, null, null ],
+    [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, null, 131, 142, 54, 989, 700, 222, null ],
     [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, null, 918, 637, 177, null, null, null, null ],
     [ "Mansherry", "PSY", "Striker", 4, 18, 6, 3, 70, null, 100, 94, 86, null, null, null, null ],
     [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, null, 642, 371, 260, 1510, 642, 557, null ],

From 05cb95964f803de96fa3cdf0dde8d85c430cd802 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 1 Jun 2016 22:42:18 +0200
Subject: [PATCH 0419/1569] Units Completed

Still missing Colo Units
---
 common/data/evolutions.js  | 20 ++++++++++++++------
 common/data/units.js       | 22 +++++++++++-----------
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  6 ++----
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4f9e29be3..905453d4f 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1595,29 +1595,37 @@ window.evolutions = {
         evolution: 1060,
         evolvers: [ 116, 92, 98, 303 ]
     },
+    1069: {
+        evolution: 1070,
+        evolvers: [ 116, 80, 86, 91 ]
+    },
+    1071: {
+        evolution: 1072,
+        evolvers: [ 117, 78, 84, 95, 100 ]
+    },
     1074: {
         evolution: 1075,
-        evolvers: []
+        evolvers: [ 118, 94, 99, 304, 104 ]
     },
     1076: {
         evolution: 1077,
-        evolvers: []
+        evolvers: [ 118, 83, 85, 96, 101 ]
     },
     1078: {
         evolution: 1079,
-        evolvers: []
+        evolvers: [ 83, 87, 87, 303, 103 ]
     },
     1080: {
         evolution: 1081,
-        evolvers: []
+        evolvers: [ 86, 266, 97, 302, 102 ]
     },
     1082: {
         evolution: 1083,
-        evolvers: []
+        evolvers: [ 118, 83, 84, 300, 100 ]
     },
     1084: {
         evolution: 1085,
-        evolvers: []
+        evolvers: [ 118, 88, 266, 304, 267 ]
     },
     1086: {
         evolution: 1087,
diff --git a/common/data/units.js b/common/data/units.js
index 5cf44c529..0479638ad 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -932,7 +932,7 @@ window.units = [
 	[ "Blugori", "DEX", [ "Powerhouse", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
 	[ "Pica", "PSY", [ "Powerhouse","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
 	[ "Pica, Donquixote Pirates", "PSY", [ "Powerhouse", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 106699, 572, 268, 102, 1841, 797, 229, 1],
+	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 1066998, 572, 268, 102, 1841, 797, 229, 1],
 	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
 	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
 	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
@@ -1072,16 +1072,16 @@ window.units = [
     [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, 392109, 129, 67, 18, 1494, 571, 101, 1 ],
     [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
     [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
-    [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, null, 207, 102, 62, null, null, null, null ],
-    [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, null, 1102, 467, 199, null, null, null, null ],
-    [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, null, 131, 142, 54, 989, 700, 222, null ],
-    [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, null, 918, 637, 177, null, null, null, null ],
-    [ "Mansherry", "PSY", "Striker", 4, 18, 6, 3, 70, null, 100, 94, 86, null, null, null, null ],
-    [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, null, 642, 371, 260, 1510, 642, 557, null ],
-    [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 4, 3, 70, null, 192, 152, 43, null, null, null, null ],
-    [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, null, 1042, 657, 143, null, null, null, null ],
-    [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, null, 130, 130, 31, null, null, null, null ],
-    [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, null, 1231, 631, 87, null, null, null, null ],
+    [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, 1066998, 207, 102, 62, 1177, 524, 246, 1 ],
+    [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1102, 467, 199, 2689, 900, 395, 1 ],
+    [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 131, 142, 54, 979, 700, 222, 1 ],
+    [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 918, 637, 177, 1934, 1351, 371, 1 ],
+    [ "Mansherry", "PSY", "Striker", 4, 18, 6, 3, 70, 1066998, 100, 94, 86, 717, 416, 307, 1 ],
+    [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 642, 371, 260, 1510, 642, 557, 1 ],
+    [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 192, 152, 43, 1106, 713, 189, 1 ],
+    [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1042, 657, 143, 2377, 1373, 290, 1 ],
+    [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 130, 130, 31, 1300, 673, 130, 1 ],
+    [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1231, 631, 87, 3013, 1300, 202, 1 ],
     [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
     [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
     [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 2ec4d3bdc..77a0ab690 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1051, 1052, 1056, 1058, 1060, 1061, 1062 ];
+    var newUnits = [ 1070, 1072, 1075, 1077, 1079, 1081, 1083, 1085 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 8e2ca8ffc..02329fbd6 100644
--- a/index.html
+++ b/index.html
@@ -62,11 +62,9 @@
             <p>1/06/2016</p>
             <br>
             <ul>
-				<li>Fujitora Sugofest Units Added!</li>
-				<li>Waiting on official images</li>
-				<li>& MAX stats</li>
+				<li>Fujitora Sugofest Units Completed!</li>
                 <br>
-                <li>Dead End Fortnight Units Added</li>
+                <li>Dead End Fortnight Units Completed</li>
                 <li>Also added it's Map Effect to the Calc</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>

From d7435065940de4fa6ddc5c07802ded2f7f0388ce Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 2 Jun 2016 12:01:08 +0200
Subject: [PATCH 0420/1569] Fix Sai Special

---
 common/data/specials.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index ae048d6df..dbd0c0314 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1316,7 +1316,7 @@ window.specials = {
 		type: "type"
 	},
     1082: {
-        orb: function(p) {
+        atk: function(p) {
             if(p.percHP >= 70.0){
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
             }else if(p.percHP >= 20.0){
@@ -1324,10 +1324,11 @@ window.specials = {
             }else{
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
             }
-        }
+        },
+        type: "class"
     },
     1083: {
-        orb: function(p) {
+        atk: function(p) {
             if(p.percHP >= 70.0){
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
             }else if(p.percHP >= 20.0){
@@ -1335,7 +1336,8 @@ window.specials = {
             }else{
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
             }
-        }
+        },
+        type: "class"
     },
     1086: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }

From 42f811e8e7e70469a239b5e69f7d85abca63c351 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 3 Jun 2016 12:19:14 -0500
Subject: [PATCH 0421/1569] Bye Ambition

Hello Driven
---
 characters/js/directives.js   |   4 +-
 characters/views/sidebar.html |   2 +-
 common/data/captains.js       |  86 +++++------
 common/data/details.js        |  96 ++++++------
 common/data/drops.js          |   4 +-
 common/data/matchers.js       |   4 +-
 common/data/specials.js       |  26 ++--
 common/data/units.js          | 270 +++++++++++++++++-----------------
 index.html                    |   4 +-
 9 files changed, 248 insertions(+), 248 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index e35e383cc..ab7fcc927 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -116,7 +116,7 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
                     'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
@@ -138,7 +138,7 @@ directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
         link: function(scope, element, attrs) {
             if (scope.n !== TARGET) return;
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
-            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Ambition' ];
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven' ];
             classes.forEach(function(x,n) {
                 var template = '<span class="filter subclass %c" ng-class="{ active: filters.classSpecial == \'%s\' }" ' +
                     'ng-click="onSpecialClick($event,\'%s\')">%s</span>';
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index e8bfec61a..1d3743511 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -9,7 +9,7 @@
 
 <div class="filter-container">
     <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Ambition' ]"
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven' ]"
         class="filter width-6 class" ng-click="onClassClick($event,class)"
         ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
 </div>
diff --git a/common/data/captains.js b/common/data/captains.js
index 0a8317a8f..c46cbdb03 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1811,10 +1811,10 @@ window.captains = {
 		hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
 	},
 	837: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
 	},
 	838: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 2.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
 	},
 	839: {
 		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -1861,10 +1861,10 @@ window.captains = {
 		}
 	},
 	851: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
 	},
 	852: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
 	},
 	854: {
 		atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
@@ -1883,10 +1883,10 @@ window.captains = {
 		rcv: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
 	},
 	859: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
 	},
 	860: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 2 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
 	},
 	862: {
 		atk: function(p) { return p.unit.type == 'QCK' ? 2 : 1; }
@@ -1912,14 +1912,14 @@ window.captains = {
 	},
 	869: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Ambition")) return 1;
+			if (!p.unit.class.has("Driven")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	870: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Ambition")) return 1;
+			if (!p.unit.class.has("Driven")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
@@ -1940,12 +1940,12 @@ window.captains = {
 	},
 	875: {
 		atk: function(p) {
-			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
 		}
 	},
 	876: {
 		atk: function(p) {
-			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2.25 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.25 : 1;
 		}
 	},
 	878: {
@@ -1986,7 +1986,7 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
 	},
 	887: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
 	},
 	889: {
 		atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
@@ -2013,7 +2013,7 @@ window.captains = {
 	},
 	894: {
 		hitAtk: function(p) {
-			if (!p.unit.class.has("Ambition")) return 1;
+			if (!p.unit.class.has("Driven")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
 				.subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
 		},
@@ -2027,7 +2027,7 @@ window.captains = {
 	},
 	897: {
 		atk: function(p) {
-			return p.unit.class.has("Cerebral") || p.unit.class.has("Ambition") ? 2 : 1;
+			return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
 		}
 	},
 	898: {
@@ -2121,18 +2121,18 @@ window.captains = {
 	923: {
 		atk: function(p) {
             if(p.percHP<30){ 
-                return p.unit.class.has("Ambition") ? 2.5 : 1;
+                return p.unit.class.has("Driven") ? 2.5 : 1;
             } else {
-                return p.unit.class.has("Ambition") ? 2 : 1;
+                return p.unit.class.has("Driven") ? 2 : 1;
             }	
 		}
 	},
 	924: {
 		atk: function(p) {
 			if(p.percHP<30){
-                return p.unit.class.has("Ambition") ? 2.75 : 1;
+                return p.unit.class.has("Driven") ? 2.75 : 1;
             } else {
-                return p.unit.class.has("Ambition") ? 2 : 1;
+                return p.unit.class.has("Driven") ? 2 : 1;
             }
 		}
 	},
@@ -2143,13 +2143,13 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
 	},
 	927: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+		hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
 	},
 	928: {
 		atk: function(p) {
 			if(p.percHP<30){
-                return p.unit.class.has("Ambition") ? 1.75 : 1;
+                return p.unit.class.has("Driven") ? 1.75 : 1;
             } else {
                 return p.unit.class.has("Striker") ? 1.75 : 1;
             }
@@ -2158,7 +2158,7 @@ window.captains = {
 	929: {
 		atk: function(p) {
 			if(p.percHP<30){
-                return p.unit.class.has("Ambition") ? 2.25 : 1;
+                return p.unit.class.has("Driven") ? 2.25 : 1;
             } else {
                 return p.unit.class.has("Striker") ? 2.25 : 1;
             }
@@ -2225,12 +2225,12 @@ window.captains = {
 		hp: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
 	},
 	944: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.2 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; }
 	},
 	945: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+		rcv: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
 	},
 	946: {
 		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
@@ -2316,7 +2316,7 @@ window.captains = {
 		}
 	},
 	966: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 2.25 : 1; }
+		atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
 	},
 	967: {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
@@ -2329,7 +2329,7 @@ window.captains = {
 	},
 	976: {
 		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Ambition") ? 2 : 1;
+			return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1;
 		}
 	},
     977: {
@@ -2383,10 +2383,10 @@ window.captains = {
          atk: function(p) {return p.unit.class.has("Powerhouse") ? 2.25  : 1; }
     },
     998: {
-         atk: function(p) {return p.unit.class.has("Ambition") ? 2  : 1; }
+         atk: function(p) {return p.unit.class.has("Driven") ? 2  : 1; }
     },
     999: {
-         atk: function(p) {return p.unit.class.has("Ambition") ? 2.25  : 1; }
+         atk: function(p) {return p.unit.class.has("Driven") ? 2.25  : 1; }
     },
     1000: {
         atk: function(p) { return  2  * p.percHP / 100; }
@@ -2424,13 +2424,13 @@ window.captains = {
 		}
 	},
 	1010:{
-		atk: function(p) {return p.unit.class.has("Ambition") ? 1.5 : 1; }
+		atk: function(p) {return p.unit.class.has("Driven") ? 1.5 : 1; }
 	},
 	1011:{
 		atk: function(p) {
-			if (p.unit.class.has("Ambition") && p.unit.class.has("Powerhouse")){
+			if (p.unit.class.has("Driven") && p.unit.class.has("Powerhouse")){
 				return 2.625;
-			} else if (p.unit.class.has("Ambition")){
+			} else if (p.unit.class.has("Driven")){
 					return 1.75;
 				} else if (p.unit.class.has("Powerhouse")){
 					return 1.5;
@@ -2627,10 +2627,10 @@ window.captains = {
 		chainModifier: function(p) { return 1.5; }
 	},
     1069:{
-        atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;}
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
     },
     1070:{
-        atk: function(p) { return p.unit.class.has("Ambition") ? 2.25 : 1;}
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1;}
     },
     1071: {
 		atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
@@ -2673,27 +2673,27 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1084: {
-		atk: function(p) { return !p.unit.class.has("Ambition") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
-		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+		atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+		hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
 	},
     1085: {
-		atk: function(p) { return !p.unit.class.has("Ambition") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
-		hp: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; }
+		atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+		hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
 	},
     1086:{
-        atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;},
-        rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;}
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;},
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
     },
     1087:{
-        atk: function(p) { return p.unit.class.has("Ambition") ? 2 : 1;},
-        rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1;}
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1;},
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
     },
     1088:{
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;}
     },
     1089:{
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;},
-        hp: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1;}
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1;}
     },
     1090: {
 		atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
diff --git a/common/data/details.js b/common/data/details.js
index 12b0f476c..4df622b6b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3702,13 +3702,13 @@ window.details = {
 	},
     828: {
         specialName: "Surprise Stab",
-        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Ambition characters by 1.75x for 1 turns if used below 20% HP",
+        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turns if used below 20% HP",
         captain: "Protects from defeat as long as HP is above 50%",
 		captainNotes: "#{zombie}" 
     },
     829: {
         specialName: "Surprise Stab",
-        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Ambition characters by 1.75x for 1 turns if used below 20% HP",
+        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turns if used below 20% HP",
         captain: "Protects from defeat as long as HP is above 30%",
 		captainNotes: "#{zombie}" 
     },
@@ -3752,15 +3752,15 @@ window.details = {
 		specialNotes: "#{orb : 1.75x}"
 	},
 	837: {
-		captain: "Boosts ATK of Ambition characters by 2x",
+		captain: "Boosts ATK of Driven characters by 2x",
 		specialName: "Gas Robe",
-		special: "Poisons all enemies, boosts ATK of Ambition characters by 1.75x for 2 turns",
+		special: "Poisons all enemies, boosts ATK of Driven characters by 1.75x for 2 turns",
 		specialNotes: "#{poison}"
 	},
 	838: {
-		captain: "Boosts ATK of Ambition characters by 2.5x",
+		captain: "Boosts ATK of Driven characters by 2.5x",
 		specialName: "Gas Robe",
-		special: "Poisons all enemies, boosts ATK of Ambition characters by 1.75x for 2 turns"
+		special: "Poisons all enemies, boosts ATK of Driven characters by 1.75x for 2 turns"
 	},
 	839: {
 		captain: "Boosts ATK of Striker characters by 2x",
@@ -3825,12 +3825,12 @@ window.details = {
 		special: "Changes the top right orb into [DEX], the middle right orb into [STR] and the bottom right orb into [QCK], seals himself for 3 turns"
 	},
 	851: {
-		captain: "Boosts ATK of Ambition characters by 1.5x",
+		captain: "Boosts ATK of Driven characters by 1.5x",
 		specialName: "Snow Country Speciality: Snow Powder Makeup",
 		special: "Deals 20x character's ATK in character's type damage to one enemy, locks all orbs for 1 turn"
 	},
 	852: {
-		captain: "Boosts ATK of Ambition characters by 2x",
+		captain: "Boosts ATK of Driven characters by 2x",
 		specialName: "Snow Country Speciality: Snow Powder Makeup",
 		special: "Deals 20x character's ATK in character's type damage to one enemy, locks all orbs for 1 turn"
 	},
@@ -3864,13 +3864,13 @@ window.details = {
 		special: "Changes adjacent orbs into [RCV] orbs, boosts RCV of PSY characters by 1.5x for 1 turn"
 	},
 	859: {
-		captain: "Boosts ATK of Ambition characters by 1.5x, reduces damage received up to 10% depending on the crew's current HP",
+		captain: "Boosts ATK of Driven characters by 1.5x, reduces damage received up to 10% depending on the crew's current HP",
 		specialName: "Pleading at the Risk of One's Life",
 		special: "Changes adjacent orbs into [RCV] orbs; if the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
 		specialNotes: "#{zombie}"
 	},
 	860: {
-		captain: "Boosts ATK of Ambition characters by 2x, reduces damage received up to 30% depending on the crew's current HP",
+		captain: "Boosts ATK of Driven characters by 2x, reduces damage received up to 30% depending on the crew's current HP",
 		specialName: "Pleading at the Risk of One's Life",
 		special: "Changes adjacent orbs into [RCV] orbs; if the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
 		specialNotes: "#{zombie}"
@@ -3918,13 +3918,13 @@ window.details = {
 		special: "Deals 15x character's ATK in STR damage to one enemy, reduces Bind duration by 3 turns"
 	},
 	869: {
-		captain: "Boosts ATK of Ambition characters by 3x until the first hit other than Perfect",
+		captain: "Boosts ATK of Driven characters by 3x until the first hit other than Perfect",
 		specialName: "Black Knight",
 		special: "Changes adjacent orbs into matching orbs, amplifies the effect of orbs by 2x for 1 turn",
 		specialNotes: "#{orb : 2x}"
 	},
 	870: {
-		captain: "Boosts ATK of Ambition characters by 3x until the first hit other than Perfect",
+		captain: "Boosts ATK of Driven characters by 3x until the first hit other than Perfect",
 		specialName: "Black Knight",
 		special: "Changes adjacent orbs into matching orbs, amplifies the effect of orbs by 2x for 1 turn",
 		specialNotes: "#{orb : 2x}"
@@ -3984,12 +3984,12 @@ window.details = {
 		specialNotes: "#{orb: 1.5x or 1.75x} #{stages}"
 	},
 	875: {
-		captain: "Boosts ATK of Cerebral and Ambition characters by 2x",
+		captain: "Boosts ATK of Cerebral and Driven characters by 2x",
 		specialName: "Beto Launcher",
 		special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
 	},
 	876: {
-		captain: "Boosts ATK of Cerebral and Ambition characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Cerebral and Ambition characters",
+		captain: "Boosts ATK of Cerebral and Driven characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Cerebral and Driven characters",
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
 		specialName: "Beto Launcher",
 		special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
@@ -4049,7 +4049,7 @@ window.details = {
 		special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Slasher characters by 1.5x for 1 turn if HP is below 30% when the special is activated"
 	},
 	887: {
-		captain: "Boosts ATK of Ambition characters by 1.5x, boosts amount of beli received by 1.2x",
+		captain: "Boosts ATK of Driven characters by 1.5x, boosts amount of beli received by 1.2x",
 		specialName: "Special Muggy Ball: Flashy",
 		special: "Reduces the defense of all enemies by 80% for 1 turn, deals 15x character's ATK in QCK damage to all enemies"
 	},
@@ -4084,7 +4084,7 @@ window.details = {
 		special: "Reduces damage received by 50% for 1 turn, deals 30x character's ATK in STR damage to all enemies"
 	},
 	894: {
-		captain: "Boosts ATK of Ambition characters by 3x following a chain of Good > Great > Perfect hits",
+		captain: "Boosts ATK of Driven characters by 3x following a chain of Good > Great > Perfect hits",
 		specialName: "Brick Bat: Black Box",
 		special: "Empties all slots with [INT] orbs, deals several times the character's ATK in INT damage to one enemy",
 		specialNotes: "The exact multiplier used is chosen based on the number of [INT] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [INT] orb."
@@ -4100,7 +4100,7 @@ window.details = {
 		special: "Recovers 6x character's RCV in HP at the end of each turn for 3 turns"
 	},
 	897: {
-		captain: "Boosts ATK of Cerebral and Ambition characters by 2x",
+		captain: "Boosts ATK of Cerebral and Driven characters by 2x",
 		specialName: "Ground Death: Thirst",
 		special: "Changes own orb into [STR], randomizes all other orbs, cuts the current HP of all enemies by 10%"
 	},
@@ -4283,14 +4283,14 @@ window.details = {
 		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
 	},
 	923: {
-		captain: "Boosts ATK of Ambition characters by 2x or by 2.5x",
+		captain: "Boosts ATK of Driven characters by 2x or by 2.5x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
 		specialName: "Repel: Weapons Reflect",
 		special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
 	924: {
-		captain: "Boosts ATK of Ambition characters by 2x or by 2.75x",
+		captain: "Boosts ATK of Driven characters by 2x or by 2.75x",
 		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
 		specialName: "Repel: Weapons Reflect",
 		special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
@@ -4307,17 +4307,17 @@ window.details = {
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	927: {
-		captain: "Boosts ATK and HP of Ambition Units by 1.5x",
+		captain: "Boosts ATK and HP of Driven Units by 1.5x",
 		specialName: "Unwavering Hammer of Justice",
-		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Ambition characters by 1.2x for 3 turns"
+		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
 	},
 	928: {
-		captain: "Boosts ATK of Ambition Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
+		captain: "Boosts ATK of Driven Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
 		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
 		specialName: "Hell Wisdom Rush"
 	},
 	929: {
-		captain: "Boosts ATK of Ambition Characters by 2.25x while above 30% HP and boosts ATK of Striker Characters by 2.25x while below 30% HP",
+		captain: "Boosts ATK of Driven Characters by 2.25x while above 30% HP and boosts ATK of Striker Characters by 2.25x while below 30% HP",
 		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
 		specialName: "Hell Wisdom Rush"
 	},
@@ -4335,7 +4335,7 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
+				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
@@ -4350,7 +4350,7 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Ambition and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
+				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
@@ -4415,14 +4415,14 @@ window.details = {
 		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
 	},
 	944: {
-		captain: "Boosts ATK and RCV of Ambition Characters by 1.2x",
+		captain: "Boosts ATK and RCV of Driven Characters by 1.2x",
 		specialName: "Spiritual Bouquet",
-		special: "Boosts ATK and RCV of Ambition Characters by 1.5x for 1 turn"
+		special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
 	},
 	945: {
-		captain: "Boosts ATK and RCV of Ambition Characters by 1.75x",
+		captain: "Boosts ATK and RCV of Driven Characters by 1.75x",
 		specialName: "Spiritual Bouquet",
-		special: "Boosts ATK and RCV of Ambition Characters by 1.5x for 1 turn"
+		special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
 	},
 	946: {
 		specialName: "Lock-on Iron Ball",
@@ -4523,7 +4523,7 @@ window.details = {
 		special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
 	},
 	966:{
-		captain: "Boosts ATK of Ambition Characters by 2.25x",
+		captain: "Boosts ATK of Driven Characters by 2.25x",
 		specialName: "Kid Special",
 		special: "Empties slots with [QCK] orbs, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: 0 orbs - Can't activate; 1 orb - 14x ATK; 2 orbs - 21x ATK; 3 orbs - 35x ATK; 4 orbs - 49x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
@@ -4566,13 +4566,13 @@ window.details = {
 	975:{
 		captain: "Reduces damage received by 10%",
 		specialName: "A Threat That Puts Adults to Shame",
-		special: "Boosts the ATK of Striker and Ambition Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+		special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
 		specialNotes: "#{zombie}"
 	},
 	976:{
-		captain: "Boosts ATK of Ambition Characters by 2x. Reduces damage received by 10%",
+		captain: "Boosts ATK of Driven Characters by 2x. Reduces damage received by 10%",
 		specialName: "A Threat That Puts Adults to Shame",
-		special: "Boosts the ATK of Striker and Ambition Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+		special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
 		specialNotes: "#{zombie}"
 	},
 	977:{
@@ -4740,12 +4740,12 @@ window.details = {
 		specialNotes: "#{stages}"
     },
     998: {
-		captain: "Boosts ATK of Ambition characters by 2x and reduces cooldown of all specials by 1 turns at the start of the fight",
+		captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
     999: {
-		captain: "Boosts ATK of Ambition characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
+		captain: "Boosts ATK of Driven characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
@@ -4805,13 +4805,13 @@ window.details = {
 		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
 	},
 	1010:{
-		captain: "Boosts ATK of Ambition characters by 1.5x",
+		captain: "Boosts ATK of Driven characters by 1.5x",
 		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
 		specialName: "Evil Beast's Horn Pierce"
 	},
 	1011:{
-		captain: "Boosts ATK of Ambition characters by 1.75x, and boosts ATK of Powerhouse characters by 1.5x",
-		captainNotes: "The bonus is cumulative. Ambition Powerhouse characters get a 2.625x bonus.",
+		captain: "Boosts ATK of Driven characters by 1.75x, and boosts ATK of Powerhouse characters by 1.5x",
+		captainNotes: "The bonus is cumulative. Driven Powerhouse characters get a 2.625x bonus.",
 		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
 		specialName: "Evil Beast's Horn Pierce"
 	},
@@ -5142,12 +5142,12 @@ window.details = {
         specialName: "Captain Slot Change QCK"
     },
 	1069: {
-        captain: "Boosts ATK of Ambition characters by 1.5x",
+        captain: "Boosts ATK of Driven characters by 1.5x",
         special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
         specialName: "Fighting Method of the Pirate Executioner"
     },
 	1070: {
-        captain: "Boosts ATK of Ambition characters by 2.25x",
+        captain: "Boosts ATK of Driven characters by 2.25x",
         special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
         specialName: "Fighting Method of the Pirate Executioner"
     },
@@ -5267,38 +5267,38 @@ window.details = {
 		specialName: "Don Sai Special"
 	},
 	1084: {
-		captain: "Boosts HP of Ambition characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Ambition characters",
+		captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
 		special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
 		specialNote: "Does not stack with other 'end of turn damage' abilities",
 		specialName: "Gravito: Heavens Fall"
 	},
 	1085: {
-		captain: "Boosts HP of Ambition characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Ambition characters",
+		captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
 		special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
 		specialNote: "Does not stack with other 'end of turn damage' abilities",
 		specialName: "Gravito: Heavens Fall"
 	},
 	1086: {
-		captain: "Boosts ATK and RCV of Ambition characters by 1.5x",
+		captain: "Boosts ATK and RCV of Driven characters by 1.5x",
 		specialNotes: "#{orb : 1.5x}",
 		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
 		specialName: "Lot Stiffen"
 	},
 	1087: {
-		captain: "Boosts ATK of Ambition characters by 2x and their RCV by 1.5x",
+		captain: "Boosts ATK of Driven characters by 2x and their RCV by 1.5x",
 		specialNotes: "#{orb : 1.5x}",
 		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
 		specialName: "Lot Stiffen"
 	},
 	1088: {
 		captain: "Boosts ATK of Slasher characters by 2x",
-		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
+		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
 		specialName: "Seven Stars Sword of Darkness"
 	},
 	1089: {
-		captain: "Boosts ATK of Slasher characters by 2x and the HP of Ambition characters by 1.75x",
-		captainNotes: "Slasher + Ambition characters gain ATK AND HP",
-		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Ambition units by 1.5x for 1 turn.",
+		captain: "Boosts ATK of Slasher characters by 2x and the HP of Driven characters by 1.75x",
+		captainNotes: "Slasher + Driven characters gain ATK AND HP",
+		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
 		specialName: "Seven Stars Sword of Darkness"
 	},
 	1090: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 14b0f35d6..4f6baff80 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -953,7 +953,7 @@ window.drops = {
         {
             name: "Wapol's Counterattack",
             thumb: 852,
-            condition: 'You can only bring Shooter and Ambition units',
+            condition: 'You can only bring Shooter and Driven units',
             "All Difficulties": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
         },
 
@@ -988,7 +988,7 @@ window.drops = {
         },
 		
 		{
-            name: "Hannyabal's Great Ambition",
+            name: "Hannyabal's Great Driven",
             thumb: 929,
             condition: 'You can only bring STR units',
             "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 8f6002c93..ee4b80595 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -11,7 +11,7 @@ window.matchers = [
     {
         name: 'Class-boosting captains',
         target: 'captain',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Driven)/i
     },
 
     {
@@ -134,7 +134,7 @@ window.matchers = [
     {
         name: 'Class-boosting specials',
         target: 'special',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Ambition)/i
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Driven)/i
     },
 
     {
diff --git a/common/data/specials.js b/common/data/specials.js
index dbd0c0314..02dab523f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -721,7 +721,7 @@ window.specials = {
 		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
 	},
     828: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Ambition") ? window.specials[828].multiplier : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[828].multiplier : 1; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (p.percHP < 20 ? 1.75 : 1);
@@ -733,7 +733,7 @@ window.specials = {
 		}  
     },
     829: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Ambition") ? window.specials[829].multiplier : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[829].multiplier : 1; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (p.percHP < 20 ? 1.75 : 1);
@@ -759,11 +759,11 @@ window.specials = {
 		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
 	},
 	837: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; },
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
 		type: "class"
 	},
 	838: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.75 : 1; },
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
 		type: "class"
 	},
 	839: {
@@ -1075,7 +1075,7 @@ window.specials = {
     },
 	927: {
         atk: function(p) {
-			return p.unit.class.has("Slasher") || p.unit.class.has("Ambition") ? 1.2 : 1;
+			return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.2 : 1;
 		},
 		type: "class"
     },
@@ -1098,13 +1098,13 @@ window.specials = {
 		type: "type"
     },
 	944: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
 		type: "class"
     },
 	945: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Ambition") ? 1.5 : 1; },
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
 		type: "class"
     },
 	947: {
@@ -1153,12 +1153,12 @@ window.specials = {
 		}
 	},
 	975: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.3 : 1; },
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
 		atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
 		type: "class"
     },
 	976: {
-		atk: function(p) { return p.unit.class.has("Ambition") ? 1.3 : 1; },
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
 		atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
 		type: "class"
     },
@@ -1346,11 +1346,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
     },
     1088: {
-        atk: function(p) { return p.unit.class.has("Slasher" || "Ambition") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher" || "Driven") ? 1.5 : 1},
         type: "class"
     },
     1089: {
-        atk: function(p) { return p.unit.class.has("Slasher" || "Ambition") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher" || "Driven") ? 1.5 : 1},
         type: "class"
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 0479638ad..c1e47f2b7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -4,9 +4,9 @@ window.units = [
 	[ "Monkey D. Luffy Gum-Gum Bazooka", "STR", "Fighter", 4, 7, 6, 2, 35, 136167, 404, 227, 39, 975, 522, 105, 1 ],
 	[ "Monkey D. Luffy Gear 2", "STR", [ "Fighter", "Free Spirit" ], 5, 15, 8, 3, 99, 3000000, 902, 473, 74, 1772, 1313, 227, 1 ],
 	[ "Roronoa Zoro", "DEX", "Slasher", 3, 4, 6, 0, 20, 26184, 126, 75, 15, 488, 239, 56, 0.7 ],
-	[ "Roronoa Zoro Three Thousand Worlds", "DEX", [ "Slasher", "Ambition" ], 4, 7, 6, 2, 35, 136167, 426, 222, 37, 899, 515, 120, 1 ],
-	[ "Roronoa Zoro Pound Phoenix", "DEX", [ "Slasher", "Ambition" ], 4, 9, 4, 2, 50, 392109, 462, 258, 37, 1216, 694, 106, 1 ],
-	[ "Roronoa Zoro Ashura Ichibugin", "DEX", [ "Slasher", "Ambition" ], 5, 15, 9, 3, 99, 3000000, 724, 667, 39, 2232, 1332, 144, 1 ],
+	[ "Roronoa Zoro Three Thousand Worlds", "DEX", [ "Slasher", "Driven" ], 4, 7, 6, 2, 35, 136167, 426, 222, 37, 899, 515, 120, 1 ],
+	[ "Roronoa Zoro Pound Phoenix", "DEX", [ "Slasher", "Driven" ], 4, 9, 4, 2, 50, 392109, 462, 258, 37, 1216, 694, 106, 1 ],
+	[ "Roronoa Zoro Ashura Ichibugin", "DEX", [ "Slasher", "Driven" ], 5, 15, 9, 3, 99, 3000000, 724, 667, 39, 2232, 1332, 144, 1 ],
 	[ "Nami", "INT", "Striker", 3, 4, 4, 0, 20, 26184, 72, 51, 32, 366, 201, 89, 0.7 ],
 	[ "Nami Tornado Tempo", "INT", [ "Striker", "Cerebral" ], 4, 7, 5, 2, 35, 136167, 336, 192, 62, 783, 453, 160, 1 ],
 	[ "Nami Mirage Tempo", "INT", [ "Striker", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 348, 201, 75, 840, 543, 219, 1 ],
@@ -30,14 +30,14 @@ window.units = [
 	[ "Iron-Mace Alvida", "STR", [ "Striker", "Powerhouse" ], 3, 10, 5, 0, 50, 392109, 184, 154, 5, 1412, 755, 61, 1 ],
 	[ "Iron-Mace Alvida Smooth-Smooth Fruit", "STR", [ "Striker", "Free Spirit" ], 4, 15, 6, 1, 99, 3000000, 766, 625, 135, 1668, 999, 369, 1 ],
 	[ "Coby", "PSY", "Fighter", 2, 4, 5, 0, 25, 50439, 70, 25, 32, 166, 70, 120, 1 ],
-	[ "Cabin Boy Coby", "PSY", [ "Fighter", "Ambition" ], 3, 9, 5, 3, 50, 392109, 130, 49, 100, 524, 155, 216, 1 ],
+	[ "Cabin Boy Coby", "PSY", [ "Fighter", "Driven" ], 3, 9, 5, 3, 50, 392109, 130, 49, 100, 524, 155, 216, 1 ],
 	[ "Helmeppo", "INT", "Shooter", 2, 4, 5, 0, 25, 50439, 62, 62, 21, 308, 242, 39, 1 ],
-	[ "Cabin Boy Helmeppo", "INT", [ "Fighter", "Ambition" ], 3, 8, 5, 3, 50, 392109, 234, 210, 29, 770, 485, 130, 1 ],
-	[ "Axe-Hand Morgan", "STR", [ "Slasher", "Ambition" ], 2, 9, 5, 0, 50, 261406, 133, 100, 5, 1554, 747, 35, 1 ],
-	[ "Mohji & Richie", "PSY", [ "Fighter", "Ambition" ], 2, 9, 6, 1, 50, 261406, 150, 135, 10, 1072, 559, 55, 1 ],
-	[ "Cabaji the Acrobat", "DEX", [ "Slasher", "Ambition" ], 2, 9, 6, 1, 50, 261406, 134, 77, 32, 824, 458, 130, 1 ],
-	[ "Buggy", "INT", [ "Slasher", "Ambition" ], 3, 8, 5, 0, 35, 136167, 200, 107, 22, 818, 446, 85, 1 ],
-	[ "Buggy the Clown", "INT", [ "Slasher", "Ambition" ], 4, 11, 5, 2, 70, 1066998, 714, 342, 58, 1666, 757, 135, 1 ],
+	[ "Cabin Boy Helmeppo", "INT", [ "Fighter", "Driven" ], 3, 8, 5, 3, 50, 392109, 234, 210, 29, 770, 485, 130, 1 ],
+	[ "Axe-Hand Morgan", "STR", [ "Slasher", "Driven" ], 2, 9, 5, 0, 50, 261406, 133, 100, 5, 1554, 747, 35, 1 ],
+	[ "Mohji & Richie", "PSY", [ "Fighter", "Driven" ], 2, 9, 6, 1, 50, 261406, 150, 135, 10, 1072, 559, 55, 1 ],
+	[ "Cabaji the Acrobat", "DEX", [ "Slasher", "Driven" ], 2, 9, 6, 1, 50, 261406, 134, 77, 32, 824, 458, 130, 1 ],
+	[ "Buggy", "INT", [ "Slasher", "Driven" ], 3, 8, 5, 0, 35, 136167, 200, 107, 22, 818, 446, 85, 1 ],
+	[ "Buggy the Clown", "INT", [ "Slasher", "Driven" ], 4, 11, 5, 2, 70, 1066998, 714, 342, 58, 1666, 757, 135, 1 ],
 	[ "Gaimon", "PSY", "Shooter", 2, 3, 6, 0, 50, 261406, 133, 5, 14, 1303, 85, 121, 1.5 ],
 	[ "Siam", "INT", "Slasher", 2, 9, 6, 0, 50, 261406, 112, 112, 24, 724, 499, 133, 1 ],
 	[ "Butchie", "STR", [ "Slasher", "Powerhouse" ], 2, 9, 6, 0, 50, 261406, 132, 117, 19, 872, 530, 98, 1 ],
@@ -55,8 +55,8 @@ window.units = [
 	[ "Gin the Man-Demon", "QCK", "Striker", 3, 11, 6, 1, 70, 1066998, 558, 300, 57, 1152, 792, 209, 1 ],
 	[ "Pearl", "STR", [ "Striker", "Powerhouse" ], 2, 8, 5, 0, 35, 90778, 198, 84, 19, 956, 296, 64, 1 ],
 	[ "Fire Pearl", "STR", [ "Striker", "Powerhouse" ], 3, 11, 4, 1, 70, 1066998, 820, 226, 38, 1904, 656, 129, 1 ],
-	[ "Don Krieg", "INT", [ "Shooter", "Ambition" ], 3, 10, 6, 0, 50, 392109, 214, 97, 24, 1454, 632, 95, 1 ],
-	[ "Don Krieg Poison Gas Bomb MH5", "INT", [ "Shooter", "Ambition" ], 4, 15, 4, 2, 99, 3000000, 1276, 553, 74, 2734, 1057, 172, 1 ],
+	[ "Don Krieg", "INT", [ "Shooter", "Driven" ], 3, 10, 6, 0, 50, 392109, 214, 97, 24, 1454, 632, 95, 1 ],
+	[ "Don Krieg Poison Gas Bomb MH5", "INT", [ "Shooter", "Driven" ], 4, 15, 4, 2, 99, 3000000, 1276, 553, 74, 2734, 1057, 172, 1 ],
 	[ "Nezumi", "INT", [ "Shooter", "Cerebral" ], 2, 6, 6, 0, 30, 28779, 55, 55, 55, 150, 130, 204, 0.7 ],
 	[ "Momoo", "STR", "Fighter", 3, 18, 4, 0, 50, 392109, 600, 400, 120, 1000, 500, 150, 1.5 ],
 	[ "Choo", "INT", [ "Shooter", "Powerhouse" ], 3, 9, 5, 1, 50, 392109, 110, 71, 49, 768, 492, 256, 1 ],
@@ -67,8 +67,8 @@ window.units = [
 	[ "Enraged Arlong Shark On Tooth", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 1, 99, 3000000, 832, 832, 55, 1974, 1491, 154, 1 ],
 	[ "Tashigi", "QCK", [ "Slasher", "Cerebral" ], 3, 9, 5, 1, 50, 392109, 102, 102, 41, 690, 483, 272, 1 ],
 	[ "Tashigi Navy HQ Ensign", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 99, 3000000, 632, 431, 222, 1434, 921, 434, 1.5 ],
-	[ "Smoker", "DEX", [ "Striker", "Ambition" ], 3, 9, 5, 1, 50, 392109, 110, 113, 36, 944, 575, 199, 1 ],
-	[ "Smoker the White Hunter", "DEX", [ "Striker", "Ambition" ], 4, 15, 5, 2, 99, 3000000, 872, 515, 154, 1736, 1070, 334, 1.5 ],
+	[ "Smoker", "DEX", [ "Striker", "Driven" ], 3, 9, 5, 1, 50, 392109, 110, 113, 36, 944, 575, 199, 1 ],
+	[ "Smoker the White Hunter", "DEX", [ "Striker", "Driven" ], 4, 15, 5, 2, 99, 3000000, 872, 515, 154, 1736, 1070, 334, 1.5 ],
 	[ "Miss Wednesday", "PSY", "Slasher", 3, 9, 5, 0, 35, 136167, 22, 10, 74, 190, 127, 216, 0.7 ],
 	[ "Nefertari Vivi", "PSY", "Slasher", 4, 13, 5, 1, 70, 1066998, 138, 102, 183, 682, 454, 350, 1 ],
 	[ "Princess Vivi", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 4000000, 602, 414, 280, 908, 747, 477, 1.5 ],
@@ -216,8 +216,8 @@ window.units = [
 	[ "Neptunian Squid", "DEX", "Striker", 3, 18, 8, 1, 50, 392109, 600, 280, 130, 900, 480, 180, 1.5 ],
 	[ "Monkey D. Luffy Gum-Gum Balloon", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
 	[ "Monkey D. Luffy Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
-	[ "Roronoa Zoro Streaming Wolf Swords", "DEX", [ "Slasher", "Ambition" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
-	[ "Roronoa Zoro Lion's Song", "DEX", [ "Slasher", "Ambition" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
+	[ "Roronoa Zoro Streaming Wolf Swords", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
+	[ "Roronoa Zoro Lion's Song", "DEX", [ "Slasher", "Driven" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
 	[ "Nami Fine Tempo", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
 	[ "Nami Happiness Punch", "INT", [ "Striker", "Cerebral" ], 5, 22, 4, 3, 99, 4000000, 1044, 377, 94, 1990, 949, 168, 1 ],
 	[ "Usopp Usopp Hammer", "PSY", "Striker", 3, 12, 5, 1, 35, 136167, 188, 101, 40, 778, 388, 191, 1 ],
@@ -226,7 +226,7 @@ window.units = [
 	[ "Mr. Prince Veau Shot", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 5, 2, 70, 1066998, 1101, 422, 93, 1600, 792, 161, 1 ],
 	[ "Dracule Mihawk", "DEX", "Slasher", 4, 30, 4, 1, 70, 1066998, 324, 201, 1, 1998, 814, 7, 1 ],
 	[ "Hawk Eyes Mihawk", "DEX", "Slasher", 5, 50, 4, 1, 99, 5000000, 1916, 782, 5, 3760, 1285, 15, 1 ],
-	[ "Escapee Morgan", "STR", [ "Slasher", "Ambition" ], 3, 17, 5, 1, 70, 711332, 1427, 699, 27, 1600, 1000, 35, 1 ],
+	[ "Escapee Morgan", "STR", [ "Slasher", "Driven" ], 3, 17, 5, 1, 70, 711332, 1427, 699, 27, 1600, 1000, 35, 1 ],
 	[ "Double Crosser Django", "PSY", [ "Slasher", "Free Spirit" ], 3, 11, 5, 1, 70, 1066998, 446, 219, 103, 930, 665, 230, 1 ],
 	[ "Double Ironfist Fullbody", "STR", [ "Fighter", "Free Spirit" ], 3, 11, 6, 1, 70, 1066998, 150, 150, 80, 890, 809, 187, 1 ],
 	[ "Hina", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 154, 73, 42, 1176, 495, 187, 1 ],
@@ -260,13 +260,13 @@ window.units = [
 	[ "Blamenco the Mallet", "STR", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 1086, 726, 112, 2488, 1252, 268, 1 ],
 	[ "Edward Newgate", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 4, 70, 1422664, 1338, 522, 80, 3220, 1060, 156, 1 ],
 	[ "Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 3148, 978, 110, 3900, 1360, 235, 1 ],
-	[ "Training Coby", "PSY", [ "Striker", "Ambition" ], 3, 12, 5, 1, 50, 261406, 90, 81, 55, 780, 514, 218, 0.7 ],
-	[ "Petty Officer Coby", "PSY", [ "Fighter", "Ambition" ], 4, 18, 6, 2, 99, 3000000, 701, 485, 191, 1926, 984, 340, 1 ],
-	[ "Training Helmeppo", "INT", [ "Striker", "Ambition" ], 3, 12, 5, 1, 50, 261406, 108, 93, 43, 890, 605, 185, 0.7 ],
-	[ "Sergeant Helmeppo", "INT", [ "Slasher", "Ambition" ], 4, 18, 5, 2, 99, 3000000, 807, 555, 150, 1998, 1060, 260, 1 ],
+	[ "Training Coby", "PSY", [ "Striker", "Driven" ], 3, 12, 5, 1, 50, 261406, 90, 81, 55, 780, 514, 218, 0.7 ],
+	[ "Petty Officer Coby", "PSY", [ "Fighter", "Driven" ], 4, 18, 6, 2, 99, 3000000, 701, 485, 191, 1926, 984, 340, 1 ],
+	[ "Training Helmeppo", "INT", [ "Striker", "Driven" ], 3, 12, 5, 1, 50, 261406, 108, 93, 43, 890, 605, 185, 0.7 ],
+	[ "Sergeant Helmeppo", "INT", [ "Slasher", "Driven" ], 4, 18, 5, 2, 99, 3000000, 807, 555, 150, 1998, 1060, 260, 1 ],
 	[ "Rainbow Pirate Penguin", "INT", "Evolver", 4, 6, 6, 0, 1, 0, 200, 100, 300, 200, 100, 300, 1 ],
 	[ "Rainbow Striped Dragon", "INT", "Evolver", 4, 20, 4, 0, 1, 0, 1500, 800, 100, 1500, 800, 100, 1 ],
-	[ "White Chase Smoker", "DEX", [ "Striker", "Ambition" ], 5, 20, 5, 3, 99, 2000000, 1644, 1012, 298, 2215, 1282, 338, 1.5 ],
+	[ "White Chase Smoker", "DEX", [ "Striker", "Driven" ], 5, 20, 5, 3, 99, 2000000, 1644, 1012, 298, 2215, 1282, 338, 1.5 ],
 	[ "Armed Fighter Unit Red Pirates", "STR", "Fighter", 3, 12, 5, 1, 60, 449516, 644, 388, 19, 1055, 781, 33, 0.7 ],
 	[ "Armed Fighter Unit Blue Pirates", "QCK", "Fighter", 3, 12, 5, 1, 60, 449516, 679, 369, 21, 1106, 750, 36, 0.7 ],
 	[ "Armed Fighter Unit Green Pirates", "DEX", "Fighter", 3, 12, 5, 1, 60, 449516, 663, 380, 22, 1082, 770, 34, 0.7 ],
@@ -297,7 +297,7 @@ window.units = [
 	[ "Tsuru", "INT", [ "Shooter", "Cerebral" ], 3, 12, 4, 2, 50, 392109, 140, 26, 60, 880, 400, 266, 1 ],
 	[ "Great Advisor Tsuru", "INT", [ "Shooter", "Cerebral" ], 4, 18, 6, 3, 99, 4000000, 808, 337, 224, 1151, 1210, 366, 1 ],
 	[ "Momonga", "PSY", [ "Slasher", "Cerebral" ], 3, 11, 5, 2, 70, 1066998, 420, 398, 98, 632, 815, 255, 1 ],
-	[ "Onigumo", "DEX", [ "Slasher", "Ambition" ], 3, 11, 8, 2, 70, 1066998, 482, 434, 63, 944, 920, 131, 1 ],
+	[ "Onigumo", "DEX", [ "Slasher", "Driven" ], 3, 11, 8, 2, 70, 1066998, 482, 434, 63, 944, 920, 131, 1 ],
 	[ "Red Plated Lobster", "STR", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
 	[ "Blue Plated Lobster", "QCK", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
 	[ "Green Plated Lobster", "DEX", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
@@ -354,8 +354,8 @@ window.units = [
 	[ "Zephyr NEO Navy Commander", "INT", [ "Shooter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
 	[ "Ain", "QCK", [ "Shooter", "Cerebral" ], 3, 8, 6, 1, 35, 136167, 96, 87, 47, 688, 421, 195, 1 ],
 	[ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Cerebral" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
-	[ "Eustass Kid", "STR", [ "Striker", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
-	[ "Captain Kid", "STR", [ "Striker", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
+	[ "Eustass Kid", "STR", [ "Striker", "Driven" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
+	[ "Captain Kid", "STR", [ "Striker", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
 	[ "Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
 	[ "Roar of the Sea Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1085, 580, 144, 2801, 1111, 300, 1 ],
 	[ "X Drake", "INT", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 242, 112, 32, 1515, 688, 88, 1 ],
@@ -389,8 +389,8 @@ window.units = [
 	[ "Victoria Cindry", "PSY", "Shooter", 4, 20, 4, 2, 99, 3000000, 622, 398, 231, 1402, 661, 478, 0.7 ],
 	[ "Emporio Ivankov", "QCK", [ "Fighter", "Free Spirit" ], 4, 30, 4, 3, 70, 1066998, 302, 125, 53, 1682, 512, 161, 1 ],
 	[ "Emporio Ivankov Queen of Kamabakka Queendom", "QCK", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1642, 470, 132, 3030, 1155, 290, 1 ],
-	[ "Perona", "DEX", [ "Shooter", "Ambition" ], 3, 10, 4, 1, 50, 392109, 134, 44, 55, 944, 422, 222, 1 ],
-	[ "Ghost Princess Perona", "DEX", [ "Shooter", "Ambition" ], 4, 18, 4, 2, 99, 3000000, 887, 377, 198, 1598, 791, 430, 1 ],
+	[ "Perona", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 50, 392109, 134, 44, 55, 944, 422, 222, 1 ],
+	[ "Ghost Princess Perona", "DEX", [ "Shooter", "Driven" ], 4, 18, 4, 2, 99, 3000000, 887, 377, 198, 1598, 791, 430, 1 ],
 	[ "Kumacy", "STR", [ "Fighter", "Powerhouse" ], 3, 11, 6, 1, 70, 1066998, 500, 255, 0, 1660, 904, 0, 1 ],
 	[ "Dog Penguin", "QCK", "Fighter", 3, 11, 4, 1, 50, 392109, 986, 500, 54, 1420, 722, 0, 1 ],
 	[ "Miss Merry Christmas", "QCK", "Fighter", 3, 11, 5, 1, 35, 136167, 220, 51, 42, 980, 422, 147, 1 ],
@@ -411,15 +411,15 @@ window.units = [
 	[ "Jimbe Warlord of the Sea", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
 	[ "Bartholomew Kuma", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 290, 110, 33, 1525, 692, 118, 1 ],
 	[ "Bartholomew Kuma Warlord of the Sea", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1445, 644, 82, 2734, 1205, 262, 1 ],
-	[ "Gecko Moria", "INT", [ "Striker", "Ambition" ], 4, 15, 4, 3, 70, 1066998, 355, 102, 15, 1928, 677, 33, 1 ],
-	[ "Gecko Moria Warlord of the Sea", "INT", [ "Striker", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 1845, 612, 33, 3900, 1120, 118, 1 ],
+	[ "Gecko Moria", "INT", [ "Striker", "Driven" ], 4, 15, 4, 3, 70, 1066998, 355, 102, 15, 1928, 677, 33, 1 ],
+	[ "Gecko Moria Warlord of the Sea", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1845, 612, 33, 3900, 1120, 118, 1 ],
 	[ "Boa Hancock", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 416, 251, 197, 1595, 859, 340, 1 ],
 	[ "Boa Hancock Warlord of the Sea", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1512, 782, 301, 2860, 1320, 515, 1 ],
-	[ "Donquixote Doflamingo", "DEX", [ "Slasher", "Ambition" ], 4, 30, 4, 1, 70, 1066998, 200, 186, 30, 1061, 790, 145, 1 ],
-	[ "Donquixote Doflamingo Warlord of the Sea", "DEX", [ "Slasher", "Ambition" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
+	[ "Donquixote Doflamingo", "DEX", [ "Slasher", "Driven" ], 4, 30, 4, 1, 70, 1066998, 200, 186, 30, 1061, 790, 145, 1 ],
+	[ "Donquixote Doflamingo Warlord of the Sea", "DEX", [ "Slasher", "Driven" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
 	[ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Powerhouse" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
 	[ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
-	[ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Ambition" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
+	[ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Driven" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
 	[ "Nami Mirage Tempo: The Heavens", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 348, 201, 75, 1260, 988, 361, 1 ],
 	[ "Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 220, 43, 45, 1190, 430, 208, 1 ],
 	[ "Humming Swordsman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1138, 368, 162, 2108, 980, 332, 1 ],
@@ -428,15 +428,15 @@ window.units = [
 	[ "Shoujou", "DEX", "Shooter", 3, 10, 4, 1, 50, 392109, 655, 132, 23, 1334, 401, 144, 1 ],
 	[ "Montblanc Cricket", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 488, 145, 54, 1050, 525, 155, 1.5 ],
 	[ "South Bird and Forest Residents", "DEX", "Fighter", 3, 8, 6, 1, 50, 261406, 752, 383, 121, 929, 423, 161, 1.5 ],
-	[ "Bellamy", "DEX", [ "Fighter", "Ambition" ], 3, 10, 4, 1, 35, 136167, 131, 152, 24, 769, 692, 89, 1 ],
-	[ "Bellamy the Hyena", "DEX", [ "Fighter", "Ambition" ], 4, 15, 6, 2, 70, 1066998, 726, 600, 67, 1072, 986, 170, 1 ],
+	[ "Bellamy", "DEX", [ "Fighter", "Driven" ], 3, 10, 4, 1, 35, 136167, 131, 152, 24, 769, 692, 89, 1 ],
+	[ "Bellamy the Hyena", "DEX", [ "Fighter", "Driven" ], 4, 15, 6, 2, 70, 1066998, 726, 600, 67, 1072, 986, 170, 1 ],
 	[ "Sarquiss", "QCK", "Slasher", 3, 10, 5, 1, 50, 392109, 220, 92, 22, 1440, 424, 68, 1 ],
 	[ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 70, 1422664, 881, 422, 155, 1485, 700, 198, 1.5 ],
 	[ "Caroline", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 6, 2, 99, 3000000, 772, 389, 177, 1890, 915, 300, [ 1.5, 1.5, 0.7 ] ],
 	[ "Sanji Kamabakka Queendom Traditional Fighting Style", "QCK", "Fighter", 3, 10, 4, 2, 50, 392109, 221, 58, 29, 1229, 622, 130, [ 0.7, 0.7, 1.5 ] ],
 	[ "Sanji Candy", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1155, 545, 76, 1802, 951, 357, [ 0.7, 0.7, 1.5 ] ],
-	[ "Perona - Sweets", "DEX", [ "Shooter", "Ambition" ], 4, 11, 4, 2, 50, 392109, 168, 98, 58, 928, 412, 231, 1.5 ],
-	[ "Ghost Princess Perona - Sweets", "DEX", [ "Shooter", "Ambition" ], 5, 20, 4, 3, 99, 3000000, 856, 359, 186, 1568, 741, 466, 1.5 ],
+	[ "Perona - Sweets", "DEX", [ "Shooter", "Driven" ], 4, 11, 4, 2, 50, 392109, 168, 98, 58, 928, 412, 231, 1.5 ],
+	[ "Ghost Princess Perona - Sweets", "DEX", [ "Shooter", "Driven" ], 5, 20, 4, 3, 99, 3000000, 856, 359, 186, 1568, 741, 466, 1.5 ],
 	[ "Nefertari Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 4, 11, 5, 2, 50, 392109, 138, 102, 183, 889, 358, 256, 1.5 ],
 	[ "Princess Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 844, 297, 213, 1440, 683, 322, 1.5 ],
 	[ "Cowboy and Bourbon Jr. Supersonic Duck Squadron", "QCK", "Evolver", 3, 9, 5, 0, 35, 90778, 150, 80, 35, 755, 334, 155, 1 ],
@@ -444,18 +444,18 @@ window.units = [
 	[ "Centaur and Hikoichi Supersonic Duck Squadron", "STR", "Evolver", 3, 9, 5, 0, 35, 90778, 102, 119, 30, 693, 383, 149, 1 ],
 	[ "Karoo", "PSY", "Striker", 3, 6, 4, 1, 20, 26184, 178, 86, 40, 229, 155, 100, 1 ],
 	[ "Captain Karoo and the Supersonic Duck Squadron", "PSY", "Striker", 4, 18, 7, 2, 99, 3000000, 378, 383, 138, 1412, 702, 461, 1.5 ],
-	[ "Marshall D. Teach", "STR", [ "Shooter", "Ambition" ], 4, 30, 6, 1, 70, 1066998, 235, 166, 30, 1402, 790, 23, 1 ],
-	[ "Blackbeard", "STR", [ "Shooter", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1338, 744, 18, 3140, 1418, 83, 1 ],
+	[ "Marshall D. Teach", "STR", [ "Shooter", "Driven" ], 4, 30, 6, 1, 70, 1066998, 235, 166, 30, 1402, 790, 23, 1 ],
+	[ "Blackbeard", "STR", [ "Shooter", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1338, 744, 18, 3140, 1418, 83, 1 ],
 	[ "Thatch", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 5, 3, 50, 522812, 208, 103, 63, 1246, 626, 188, 1 ],
 	[ "Twin-Blade Thatch", "QCK", [ "Slasher", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1184, 575, 146, 2505, 1190, 302, 1 ],
 	[ "Namule", "DEX", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 50, 522812, 155, 133, 40, 1081, 822, 142, 1 ],
 	[ "One-Hit Namule", "DEX", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 999, 755, 117, 2398, 1303, 262, 1 ],
-	[ "Rakuyo", "PSY", [ "Striker", "Ambition" ], 4, 18, 4, 3, 50, 522812, 161, 122, 65, 1000, 733, 193, 1 ],
-	[ "Morning Star Rakuyo", "PSY", [ "Striker", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 945, 681, 122, 2001, 1320, 337, 1 ],
-	[ "Fossa", "STR", [ "Slasher", "Ambition" ], 4, 18, 4, 3, 50, 522812, 150, 160, 34, 1120, 831, 132, 1 ],
-	[ "Fossa the Blazing Katana", "STR", [ "Slasher", "Ambition" ], 5, 28, 4, 4, 99, 4000000, 1059, 788, 95, 2454, 1388, 228, 1 ],
-	[ "Curiel", "INT", [ "Shooter", "Ambition" ], 4, 18, 6, 3, 50, 522812, 202, 153, 48, 1159, 818, 134, 1 ],
-	[ "Heavy Specialist Curiel", "INT", [ "Shooter", "Ambition" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
+	[ "Rakuyo", "PSY", [ "Striker", "Driven" ], 4, 18, 4, 3, 50, 522812, 161, 122, 65, 1000, 733, 193, 1 ],
+	[ "Morning Star Rakuyo", "PSY", [ "Striker", "Driven" ], 5, 28, 4, 4, 99, 4000000, 945, 681, 122, 2001, 1320, 337, 1 ],
+	[ "Fossa", "STR", [ "Slasher", "Driven" ], 4, 18, 4, 3, 50, 522812, 150, 160, 34, 1120, 831, 132, 1 ],
+	[ "Fossa the Blazing Katana", "STR", [ "Slasher", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1059, 788, 95, 2454, 1388, 228, 1 ],
+	[ "Curiel", "INT", [ "Shooter", "Driven" ], 4, 18, 6, 3, 50, 522812, 202, 153, 48, 1159, 818, 134, 1 ],
+	[ "Heavy Specialist Curiel", "INT", [ "Shooter", "Driven" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
 	[ "Sengoku", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
 	[ "Sengoku the Buddha", "PSY", [ "Fighter", "Cerebral" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
 	[ "Criminal Galdino Mr. 3", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
@@ -543,16 +543,16 @@ window.units = [
 	[ "Nola Giant Snake", "PSY", [ "Fighter", "Powerhouse" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
 	[ "Wyper", "DEX", [ "Shooter", "Free Spirit" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
 	[ "Wyper Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
-	[ "Eneru", "PSY", [ "Shooter", "Ambition" ], 3, 12, 4, 2, 50, 392109, 177, 141, 58, 951, 615, 185, 1 ],
-	[ "Kami Eneru", "PSY", [ "Shooter", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
+	[ "Eneru", "PSY", [ "Shooter", "Driven" ], 3, 12, 4, 2, 50, 392109, 177, 141, 58, 951, 615, 185, 1 ],
+	[ "Kami Eneru", "PSY", [ "Shooter", "Driven" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
 	[ "Monkey D. Luffy Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
 	[ "Monkey D. Luffy Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
 	[ "Sadie", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
 	[ "Sadie, Impel Down Chief Jailer", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
 	[ "Minokoala", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
 	[ "Manticore", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
-	[ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Ambition" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
-	[ "Roronoa Zoro, Straw Hat Pirates' Attack", "DEX", [ "Slasher", "Ambition" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
+	[ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
+	[ "Roronoa Zoro, Straw Hat Pirates' Attack", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
 	[ "Usopp, Merveille's Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
 	[ "Usopp, Straw Hat Pirates' Attack", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
 	[ "Nico Robin, Merveille's Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
@@ -577,8 +577,8 @@ window.units = [
 	[ "Tea Time Nami", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
 	[ "Monkey D. Luffy Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
 	[ "Monkey D. Luffy Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
-	[ "Roronoa Zoro Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Ambition" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
-	[ "Roronoa Zoro Voyage Dream: Master Swordsman", "QCK", [ "Slasher", "Ambition" ], 5, 20, 4, 3, 99, 3000000, 1329, 777, 90, 2250, 1118, 201, 1 ],
+	[ "Roronoa Zoro Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Driven" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
+	[ "Roronoa Zoro Voyage Dream: Master Swordsman", "QCK", [ "Slasher", "Driven" ], 5, 20, 4, 3, 99, 3000000, 1329, 777, 90, 2250, 1118, 201, 1 ],
 	[ "Genbou", "STR", [ "Shooter", "Free Spirit" ], 3, 15, 4, 1, 70, 1066998, 271, 91, 15, 1855, 711, 54, 0.7 ],
 	[ "Kamakiri", "QCK", [ "Striker", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 195, 84, 30, 1669, 691, 101, 0.7 ],
 	[ "Raki", "INT", "Shooter", 4, 18, 4, 2, 99, 3000000, 158, 55, 51, 1544, 668, 460, 0.7 ],
@@ -596,12 +596,12 @@ window.units = [
 	[ "Onyx Hime Turtle", "INT", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
 	[ "Tony Tony Chopper Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 220, 95, 46, 1324, 589, 186, 0.7 ],
 	[ "Tony Tony Chopper Voyage Dream: Great Doctor", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
-	[ "Buggy the Pirate Apprentice", "INT", [ "Slasher", "Ambition" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
-	[ "Buggy, Roger Pirates", "INT", [ "Slasher", "Ambition" ], 4, 19, 5, 2, 99, 3000000, 813, 358, 123, 1602, 709, 290, 1 ],
+	[ "Buggy the Pirate Apprentice", "INT", [ "Slasher", "Driven" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
+	[ "Buggy, Roger Pirates", "INT", [ "Slasher", "Driven" ], 4, 19, 5, 2, 99, 3000000, 813, 358, 123, 1602, 709, 290, 1 ],
 	[ "Shanks the Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
 	[ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Free Spirit" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
-	[ "Eneru 200,000,000 Volt Amaru", "QCK", [ "Striker", "Ambition" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
-	[ "Eneru, Lightning Incarnate 200,000,000 Volt Amaru", "QCK", [ "Striker", "Ambition" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
+	[ "Eneru 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
+	[ "Eneru, Lightning Incarnate 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
 	[ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
 	[ "Sanji Voyage Dream: All Blue", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1413, 577, 100, 2350, 1052, 208, 0.7 ],
 	[ "Zeff the Pirate", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
@@ -642,16 +642,16 @@ window.units = [
 	[ "DeCalvan Brothers Brothers' Bond", "DEX", "Fighter", 5, 29, 5, 4, 99, 4000000, 1824, 602, 50, 3330, 1183, 158, 0.7 ],
 	[ "Squard", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 198, 190, 0, 1351, 810, 0, 0.7 ],
 	[ "Maelstrom Spider Squard", "PSY", [ "Striker", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 960, 755, -1, 2755, 1434, -150, 0.7 ],
-	[ "Whitey Bay", "INT", [ "Slasher", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 109, 93, 44, 1140, 600, 223, 0.7 ],
-	[ "Ice Witch Whitey Bay", "INT", [ "Slasher", "Ambition" ], 5, 29, 5, 4, 99, 4000000, 1094, 561, 171, 2278, 993, 399, 0.7 ],
+	[ "Whitey Bay", "INT", [ "Slasher", "Driven" ], 4, 18, 5, 3, 70, 1066998, 109, 93, 44, 1140, 600, 223, 0.7 ],
+	[ "Ice Witch Whitey Bay", "INT", [ "Slasher", "Driven" ], 5, 29, 5, 4, 99, 4000000, 1094, 561, 171, 2278, 993, 399, 0.7 ],
 	[ "Little Oars Jr.", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 6, 3, 70, 1066998, 251, 166, 1, 1900, 734, 3, 0.7 ],
 	[ "Little Oars Jr. Charging!", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
 	[ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
 	[ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
 	[ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Cerebral" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
 	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
-	[ "Iron Mask Duval", "DEX", [ "Shooter", "Ambition" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
-	[ "Duval, Head of the Flying Fish Riders", "DEX", [ "Shooter", "Ambition" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
+	[ "Iron Mask Duval", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
+	[ "Duval, Head of the Flying Fish Riders", "DEX", [ "Shooter", "Driven" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
 	[ "Duval, Head of the Rosy Life Riders", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
 	[ "Pirate Arlong", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
 	[ "Arlong, Sun Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
@@ -682,8 +682,8 @@ window.units = [
 	[ "Lemon Ice Cream Loving Nami", "DEX", [ "Striker", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 900, 366, 200, 1802, 768, 402, 1 ],
 	[ "Ice Cream Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 147, 61, 46, 988, 491, 218, 0.7 ],
 	[ "Chocolate Ice Cream Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
-	[ "Ice Cream Loving Perona", "INT", [ "Shooter", "Ambition" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
-	[ "Strawberry Ice Cream Loving Perona", "INT", [ "Shooter", "Ambition" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
+	[ "Ice Cream Loving Perona", "INT", [ "Shooter", "Driven" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
+	[ "Strawberry Ice Cream Loving Perona", "INT", [ "Shooter", "Driven" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
 	[ "Vivi's Breather", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 4, 2, 70, 1066998, 102, 37, 91, 1028, 497, 343, 1 ],
 	[ "Calgara", "STR", [ "Free Spirit", "Striker" ], 3, 12, 6, 1, 50, 392109, 94, 115, 0, 1203, 692, 0, 1 ],
 	[ "Calgara, the Great Warrior of Shandia", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
@@ -738,8 +738,8 @@ window.units = [
 	[ "Lucci Human-Beast, Cat-Cat Fruit Model: Leopard", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
 	[ "Spandam", "INT", "Slasher", 4, 7, 5, 1, 35, 136167, 52, 25, 25, 258, 196, 89, 1 ],
 	[ "Franky, Straw Hat Pirates", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1623, 765, 70, 2505, 1149, 130, 1 ],
-	[ "Nero", "QCK", [ "Shooter", "Ambition" ], 3, 9, 6, 1, 35, 136167, 59, 112, 20, 324, 543, 83, 0.7 ],
-	[ "Nero, Cipher Pol No.9", "QCK", [ "Shooter", "Ambition" ], 4, 15, 5, 2, 70, 1066998, 277, 489, 51, 755, 1050, 145, 0.7 ],
+	[ "Nero", "QCK", [ "Shooter", "Driven" ], 3, 9, 6, 1, 35, 136167, 59, 112, 20, 324, 543, 83, 0.7 ],
+	[ "Nero, Cipher Pol No.9", "QCK", [ "Shooter", "Driven" ], 4, 15, 5, 2, 70, 1066998, 277, 489, 51, 755, 1050, 145, 0.7 ],
 	[ "Wanze", "DEX", "Free Spirit", 3, 11, 4, 1, 50, 392109, 202, 44, 40, 1124, 367, 212, 1 ],
 	[ "Wanze, Cipher Pol No.7", "DEX", "Free Spirit", 4, 18, 5, 2, 99, 3000000, 1059, 312, 170, 2051, 674, 363, 1 ],
 	[ "Portgas D. Ace, Record of the Voyage - Whitebeard Pirates", "QCK", [ "Free Spirit", "Fighter" ], 4, 12, 5, 2, 50, 392109, 141, 71, 36, 1121, 585, 189, 1.5 ],
@@ -764,13 +764,13 @@ window.units = [
 	[ "Franky Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
 	[ "Nami Jackie 'o Lantern", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
 	[ "Tony Tony Chopper Lil' Vampire", "INT", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
-	[ "Roronoa Zoro Jack the Ripper", "QCK", [ "Slasher", "Ambition" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
+	[ "Roronoa Zoro Jack the Ripper", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
 	[ "Nico Robin Devil Girl", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
 	[ "Sanji Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
 	[ "Brook Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
 	[ "Dalmatian, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
 	[ "Momonga, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
-	[ "Onigumo, Navy HQ Vice Admiral", "DEX", [ "Slasher", "Ambition" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
+	[ "Onigumo, Navy HQ Vice Admiral", "DEX", [ "Slasher", "Driven" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
 	[ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
 	[ "Very Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
 	[ "Strawberry, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
@@ -787,7 +787,7 @@ window.units = [
 	[ "Dr. Hiluluk", "PSY", [ "Shooter", "Free Spirit" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
 	[ "Dr. Hiluluk, Quack Doctor", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
 	[ "Kuina", "DEX", "Striker", 3, 9, 6, 2, 35, 136167, 54, 41, 70, 503, 264, 251, 1 ],
-	[ "Kuina, Shimotsuki Village's Girl Swordsman", "DEX", [ "Slasher", "Ambition" ], 4, 15, 5, 3, 70, 1066998, 448, 220, 213, 917, 582, 338, 1 ],
+	[ "Kuina, Shimotsuki Village's Girl Swordsman", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 3, 70, 1066998, 448, 220, 213, 917, 582, 338, 1 ],
 	[ "Tamanegi, Piiman & Ninjin", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
 	[ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
 	[ "Iceburg", "INT", [ "Shooter", "Cerebral" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
@@ -803,8 +803,8 @@ window.units = [
 	[ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
 	[ "Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 5, 1, 50, 392109, 188, 128, 48, 977, 544, 191, 1 ],
 	[ "Black Cage Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 5, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1 ],
-	[ "Smoker, Navy HQ Captain", "INT", [ "Striker", "Ambition" ], 4, 25, 6, 2, 70, 1066998, 710, 309, 44, 1600, 703, 146, 1.5 ],
-	[ "Smoker the White Hunter, Navy HQ Captain", "INT", [ "Striker", "Ambition" ], 5, 40, 5, 3, 99, 4000000, 1549, 640, 112, 2727, 1289, 234, 1.5 ],
+	[ "Smoker, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 4, 25, 6, 2, 70, 1066998, 710, 309, 44, 1600, 703, 146, 1.5 ],
+	[ "Smoker the White Hunter, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 5, 40, 5, 3, 99, 4000000, 1549, 640, 112, 2727, 1289, 234, 1.5 ],
 	[ "Pure White Angel Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
 	[ "Pure White Goddess Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
 	[ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
@@ -813,8 +813,8 @@ window.units = [
 	[ "Cerberus", "QCK", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
 	[ "Tararan", "INT", [ "Cerebral", "Powerhouse" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
 	[ "Bear-Skin Rug", "DEX", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
-	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Free Spirit", "Ambition" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
-	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Free Spirit", "Ambition" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
+	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Free Spirit", "Driven" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
+	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Free Spirit", "Driven" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
 	[ "Soldier Zombie Boastful Shadow", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
 	[ "Soldier Zombie Quick Shadow", "QCK", "Fighter", 2, 7, 6, 0, 35, 90778, 77, 30, 92, 944, 590, 43, 1 ],
 	[ "Soldier Zombie Vile Shadow", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],
@@ -826,17 +826,17 @@ window.units = [
 	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
 	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
 	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	["Trafalgar Law, the Boy from the White City", "PSY", ["Slasher", "Ambition"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
-	["Trafalgar Law, the Boy Saved by Fate", "PSY", ["Slasher", "Ambition"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
+	["Trafalgar Law, the Boy from the White City", "PSY", ["Slasher", "Driven"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
+	["Trafalgar Law, the Boy Saved by Fate", "PSY", ["Slasher", "Driven"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
 	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
 	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
 	[ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
-	[ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
+	[ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Driven" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
 	[ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
 	[ "Tyrant Bartholomew Kuma, Government's Human Weapon", "STR", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
-	[ "Caesar Clown", "DEX", [ "Ambition", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
-	[ "Master Caesar", "DEX", [ "Ambition", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
+	[ "Caesar Clown", "DEX", [ "Driven", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
+	[ "Master Caesar", "DEX", [ "Driven", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
 	[ "Vergo", "INT", [ "Striker", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
 	[ "Vergo, Donquixote Pirates", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1464, 730, 60, 3003, 1410, 140, 1 ],
 	[ "Monet", "PSY", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
@@ -847,18 +847,18 @@ window.units = [
 	[ "Buffalo, Donquixote Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 30, 10, 4, 99, 4000000, 1050, 600, 173, 2769, 1096, 296, 1 ],
 	[ "Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 95, 30, 1103, 614, 141, 1 ],
 	[ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
-	[ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Ambition" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
+	[ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
 	[ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
-	[ "Tin-Plate Wapol", "STR", [ "Shooter", "Ambition" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
-	[ "Slim-up Wapol", "QCK", [ "Shooter", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
+	[ "Tin-Plate Wapol", "STR", [ "Shooter", "Driven" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
+	[ "Slim-up Wapol", "QCK", [ "Shooter", "Driven" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
 	[ "Robson", "PSY", [ "Fighter", "Powerhouse" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
 	[ "Chopper Playing in the Snow", "DEX", [ "Fighter", "Powerhouse" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
 	[ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
 	[ "Trafalgar Law Holy Night Nobleman", "DEX", [ "Slasher", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 945, 460, 151, 2003, 1030, 313, 1 ],
 	[ "Jewelry Bonney Ravenous Spoiled Santa", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 5, 3, 50, 392109, 190, 50, 54, 1003, 403, 213, 1 ],
 	[ "Jewelry Bonney Ravenous Greedy Santa", "PSY", [ "Fighter", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 848, 354, 178, 2380, 769, 338, 1 ],
-	[ "Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Ambition" ], 4, 18, 5, 2, 50, 392109, 267, 98, 27, 1193, 561, 158, 1 ],
-	[ "War Hero Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Ambition" ], 5, 30, 4, 3, 99, 3000000, 1121, 500, 104, 2239, 1048, 261, 1 ],
+	[ "Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 18, 5, 2, 50, 392109, 267, 98, 27, 1193, 561, 158, 1 ],
+	[ "War Hero Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 3, 99, 3000000, 1121, 500, 104, 2239, 1048, 261, 1 ],
 	[ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
 	[ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
 	[ "Snowy World Nami", "QCK", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
@@ -867,35 +867,35 @@ window.units = [
 	[ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Cerebral", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
 	[ "Usopp Tabasco Star: The Storm", "DEX", "Shooter", 4, 15, 7, 2, 99, 2000000, 258, 152, 94, 1866, 704, 343, 1 ],
 	[ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
-	[ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Ambition", "Cerebral" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
-	[ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Ambition", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
+	[ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Driven", "Cerebral" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
+	[ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Driven", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
 	[ "Sugar", "QCK", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
 	[ "Sugar, Donquixote Pirates", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 896, 342, 274, 1905, 790, 532, 1 ],
 	[ "Señor Pink", "PSY", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 292, 103, 24, 1524, 657, 142, 1 ],
 	[ "Señor Pink, Donquixote Pirates", "PSY", [ "Free Spirit", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1478, 600, 100, 2800, 1242, 241, 1 ],
-	[ "Trebol", "INT", [ "Cerebral", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
-	[ "Trebol, Donquixote Pirates", "INT", [ "Cerebral", "Ambition" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
-	[ "Jora", "DEX", [ "Free Spirit", "Ambition" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
-	[ "Jora, Donquixote Pirates", "DEX", [ "Free Spirit", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
-	[ "Lao-G", "STR", [ "Fighter", "Ambition" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
-	[ "Lao-G, Donquixote Pirates", "STR", [ "Fighter", "Ambition" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
+	[ "Trebol", "INT", [ "Cerebral", "Driven" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
+	[ "Trebol, Donquixote Pirates", "INT", [ "Cerebral", "Driven" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
+	[ "Jora", "DEX", [ "Free Spirit", "Driven" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
+	[ "Jora, Donquixote Pirates", "DEX", [ "Free Spirit", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
+	[ "Lao-G", "STR", [ "Fighter", "Driven" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
+	[ "Lao-G, Donquixote Pirates", "STR", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
 	[ "Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, 5, 2, 70, 1066998, 646, 261, 83, 1247, 693, 220, 1 ],
 	[ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
 	[ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
 	[ "Dorry the Blue Ogre", "INT", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
 	[ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
 	[ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Cerebral" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
-	[ "Buggy, Cheerfully Crazy", "QCK", [ "Ambition", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
+	[ "Buggy, Cheerfully Crazy", "QCK", [ "Driven", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
 	[ "Hollow Hollow Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
-	[ "Perona, Thriller Bark's Mysterious Four", "DEX", [ "Shooter", "Ambition" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
-	[ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Ambition" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
+	[ "Perona, Thriller Bark's Mysterious Four", "DEX", [ "Shooter", "Driven" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
+	[ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Driven" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
 	[ "Doctor Hogback, Thriller Bark's Mysterious Four", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
 	[ "Absalom of the Graveyard, Thriller Bark's Mysterious Four", "STR", [ "Shooter", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
 	[ "Oars, Special Zombie", "STR", [ "Fighter", "Powerhouse" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
-	[ "Gecko Moria, Shadow's Asgard", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
+	[ "Gecko Moria, Shadow's Asgard", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
 	[ "Brook, Gentleman Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
 	[ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
-	[ "Sir Crocodile, Sand General", "STR", [ "Cerebral", "Ambition" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
+	[ "Sir Crocodile, Sand General", "STR", [ "Cerebral", "Driven" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
 	[ "Mr. 3, Makeshift Musician", "QCK", [ "Striker", "Cerebral" ], 4, 17, 4, 2, 99, 2000000, 24, 14, 33, 1703, 622, 312, 1.5 ],
 	[ "Mr. 2 Bon Clay, Dubious Samurai", "INT", [ "Fighter", "Free Spirit" ], 4, 17, 4, 2, 99, 2000000, 42, 20, 22, 1810, 804, 235, 1.5 ],
 	[ "Fresh Franky, Health Comes First", "DEX", [ "Shooter", "Free Spirit" ], 4, 25, 6, 2, 70, 1066998, 659, 244, 85, 1330, 659, 211, 1 ],
@@ -903,8 +903,8 @@ window.units = [
 	[ "Broggy, Giant Warrior Pirates", "PSY", [ "Slasher", "Powerhouse" ], 4, 18, 5, 1, 50, 392109, 261, 120, 20, 1354, 539, 90, 1 ],
 	[ "Broggy the Red Ogre", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1292, 463, 64, 2460, 1090, 156, 1 ],
 	[ "Yokozuna", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
-	[ "Roronoa Zoro, the Swordsman Who Wanders Kuraigana Island", "STR", [ "Slasher", "Ambition" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
-	[ "Roronoa Zoro, Pupil of the World's Strongest Swordsman", "STR", [ "Slasher", "Ambition" ], 5, 30, 5, 4, 99, 4000000, 1403, 687, 67, 2830, 1390, 190, 1 ],
+	[ "Roronoa Zoro, the Swordsman Who Wanders Kuraigana Island", "STR", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
+	[ "Roronoa Zoro, Pupil of the World's Strongest Swordsman", "STR", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1403, 687, 67, 2830, 1390, 190, 1 ],
 	[ "Nico Robin, Tequila Wolf Inmate", "INT", [ "Cerebral", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 131, 91, 43, 1021, 679, 217, 1 ],
 	[ "Nico Robin, Light of the Revolution", "INT", [ "Cerebral", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
 	[ "Tony Tony Chopper, Torino Kingdom's Peace Mediator", "PSY", [ "Fighter", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
@@ -921,17 +921,17 @@ window.units = [
 	[ "Sweet Pea", "STR", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
 	[ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter", "Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
 	[ "Empress in Love Hancock, Wedding", "INT", [ "Shooter", "Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
-	[ "South Blue's Captain Kid", "STR", [ "Striker", "Ambition" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
-	[ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker", "Ambition" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
+	[ "South Blue's Captain Kid", "STR", [ "Striker", "Driven" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
+	[ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
 	[ "Chief Guard Sadie-chan", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
 	[ "Chief Guard Sadie-chan, Commander of the Jailer Beasts", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
-	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Ambition" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
-	[ "Hannyabal", "DEX", ["Ambition", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
-	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Ambition", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
+	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Driven" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
+	[ "Hannyabal", "DEX", ["Driven", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
+	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Driven", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
 	[ "Saldeath", "INT", [ "Striker", "Cerebral" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
 	[ "Blugori", "DEX", [ "Powerhouse", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	[ "Pica", "PSY", [ "Powerhouse","Ambition" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
-	[ "Pica, Donquixote Pirates", "PSY", [ "Powerhouse", "Ambition" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
+	[ "Pica", "PSY", [ "Powerhouse","Driven" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
+	[ "Pica, Donquixote Pirates", "PSY", [ "Powerhouse", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
 	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 1066998, 572, 268, 102, 1841, 797, 229, 1],
 	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
 	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
@@ -942,8 +942,8 @@ window.units = [
 	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
 	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
 	[ "Cyborg Franky, Sacred Beast of Baldimore", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
-	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Ambition" ], 4, 13, 4, 2, 50, 392109, 59, 34, 47, 814, 392, 223, 1],
-	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Ambition" ], 5, 20, 5, 3, 99, 3000000, 740, 333, 172, 1787, 787, 390, 1],
+	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Driven" ], 4, 13, 4, 2, 50, 392109, 59, 34, 47, 814, 392, 223, 1],
+	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Driven" ], 5, 20, 5, 3, 99, 3000000, 740, 333, 172, 1787, 787, 390, 1],
 	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
 	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
 	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Powerhouse" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
@@ -964,7 +964,7 @@ window.units = [
 	[ "Saint Charloss", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
 	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, 1000000, 6, 334, -600, 30, 601, -500, 1],
 	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
-	[ "Super Rookie Eustass Kid", "QCK", [ "Ambition", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
+	[ "Super Rookie Eustass Kid", "QCK", [ "Driven", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
 	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
 	[ "Pacifista PX-1", "DEX", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-2", "PSY", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
@@ -973,8 +973,8 @@ window.units = [
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Powerhouse" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
 	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
-	[ "Smoker, Wild Lone Wolf", "DEX", ["Striker", "Ambition"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
-	[ "Smoker, Solitary Lone Wolf", "DEX", ["Striker", "Ambition"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
+	[ "Smoker, Wild Lone Wolf", "DEX", ["Striker", "Driven"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
+	[ "Smoker, Solitary Lone Wolf", "DEX", ["Striker", "Driven"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
 	[ "Kizaru", "QCK", ["Shooter", "Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
 	[ "Kizaru, Light Human", "QCK", ["Shooter", "Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
 	[ "Izo Whitebeard 16th Div. Commander", "PSY", ["Shooter", "Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
@@ -983,21 +983,21 @@ window.units = [
     [ "Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
     [ "Flower Sword Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
     [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Powerhouse"], 4, 30, 6, 2, 99, 3000000, 321, 132, 30, 2404, 1024, 243, 1 ],
-    [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Ambition", 3, 5, 6, 0, 20, 17456, 94, 33, 15, 571, 280, 77, 1],
-    [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Ambition", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
-    [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Ambition", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
-    [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Ambition", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
-    [ "Impostor Straw Hats","STR",["Ambition","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
+    [ "Demalo Black  & Chocolat, Impostor Straw Hat Pirates","STR","Driven", 3, 5, 6, 0, 20, 17456, 94, 33, 15, 571, 280, 77, 1],
+    [ "Cocoa & Nora Gitsune, Impostor Straw Hat Pirates","INT","Driven", 3, 5, 6, 0, 20, 17456, 79, 21, 28, 489, 224, 110, 1],
+    [ "Manjaro & Drip, Impostor Straw Hat Pirates","DEX","Driven", 3, 5, 6, 0, 20, 17456, 44, 34, 21, 387, 308, 97, 1],
+    [ "Mounblutain & Turco, Impostor Straw Hat Pirates","PSY","Driven", 3, 5, 6, 0, 20, 17456, 103, 23, 18, 612, 258 , 79, 1],
+    [ "Impostor Straw Hats","STR",["Driven","Shooter"], 4, 15, 8, 3, 50, 653515, 561, 330, 36, 1288, 604, 110, 1],
     [ "Machvise","INT",["Free Spirit","Powerhouse"], 4, 18, 4, 3, 70, 1066998, 203, 127, 34, 1589, 716, 105, 1 ],
     [ "Machvise, Donquixote Pirates","INT",["Free Spirit","Powerhouse"], 5, 30, 4, 4, 99, 4000000, 1523, 643, 49, 2882, 1280, 217, 1 ],
-    [ "Gladius","QCK",["Shooter","Ambition"], 4, 18, 6, 3, 70, 1066998, 102, 161, 32, 1079, 813, 154, 1 ],
-    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Ambition"], 5, 30, 4, 4, 99, 4000000, 1000, 767, 101, 2375, 1371, 271, 1 ],
+    [ "Gladius","QCK",["Shooter","Driven"], 4, 18, 6, 3, 70, 1066998, 102, 161, 32, 1079, 813, 154, 1 ],
+    [ "Gladius, Donquixote Pirates","QCK",["Shooter","Driven"], 5, 30, 4, 4, 99, 4000000, 1000, 767, 101, 2375, 1371, 271, 1 ],
     [ "Violet","PSY",["Fighter","Cerebral"], 4, 18, 5, 3, 70, 1066998, 147, 48, 77, 1157, 451, 274, 1 ],
     [ "Violet, Donquixote Pirates","PSY",["Fighter","Cerebral"], 5, 30, 4, 4, 99, 4000000, 1095, 400, 220, 2217, 813, 483, 1 ],
     [ "Dellinger","DEX",["Powerhouse","Fighter"], 4, 18, 6, 3, 70, 1066998, 91, 147, 51, 999, 755, 192, 1 ],
     [ "Dellinger, Donquixote Pirates","DEX",["Powerhouse","Fighter"], 5, 30, 4, 4, 99, 4000000, 933, 692, 143, 2087, 1362, 324, 1 ],
-    [ "Diamante","STR",["Ambition","Striker"], 4, 18, 6, 3, 70, 1066998, 698, 452, 48, 1500, 866, 90, 1 ],
-    [ "Diamante, Donquixote Pirates","STR",["Ambition","Striker"], 5, 30, 5, 4, 99, 4000000, 1443, 812, 50, 2840, 1421, 174, 1 ],
+    [ "Diamante","STR",["Driven","Striker"], 4, 18, 6, 3, 70, 1066998, 698, 452, 48, 1500, 866, 90, 1 ],
+    [ "Diamante, Donquixote Pirates","STR",["Driven","Striker"], 5, 30, 5, 4, 99, 4000000, 1443, 812, 50, 2840, 1421, 174, 1 ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
 	[ "Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
@@ -1008,14 +1008,14 @@ window.units = [
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, 392109, 67, 37, 55, 884, 428, 204, 1],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, 3000000, 831, 366, 162, 1660, 869, 384, 1],
 	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Powerhouse"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
-    [ "Count Butler", "INT", ["Ambition","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
-    [ "Count Butler (Ruling Power)", "INT", ["Ambition","Powerhouse"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
-    [ "President Heaby", "QCK", ["Slasher","Ambition"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
-    [ "General Hotdog", "DEX", ["Fighter","Ambition"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
+    [ "Count Butler", "INT", ["Driven","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
+    [ "Count Butler (Ruling Power)", "INT", ["Driven","Powerhouse"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
+    [ "President Heaby", "QCK", ["Slasher","Driven"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
+    [ "General Hotdog", "DEX", ["Fighter","Driven"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Powerhouse"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
-	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
-	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Ambition"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
-	[ "Brownbeard", "PSY", ["Slasher","Ambition"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
+	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
+	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
+	[ "Brownbeard", "PSY", ["Slasher","Driven"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
 	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Powerhouse"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
 	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
     [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, 392109, 41, 24, 64, 799, 355, 249, 1],
@@ -1026,14 +1026,14 @@ window.units = [
     [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
     [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 5000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
-    [ "Funk Brothers", "DEX", [ "Fighter","Ambition" ], 4, 18, 5, 3, 70, 1066998, 60, 172, 44, 937, 824, 109, 1 ],
-    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Ambition" ], 5, 30, 8, 4, 99, 4000000, 1500, 824, 77, 2920, 1251, 226, 1 ],
+    [ "Funk Brothers", "DEX", [ "Fighter","Driven" ], 4, 18, 5, 3, 70, 1066998, 60, 172, 44, 937, 824, 109, 1 ],
+    [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Driven" ], 5, 30, 8, 4, 99, 4000000, 1500, 824, 77, 2920, 1251, 226, 1 ],
     [ "Hajrudin", "PSY", [ "Powerhouse","Fighter" ], 4, 18, 5, 3, 70, 1066998, 201, 177, 38, 1403, 795, 116, 1 ],
     [ "Hajrudin, Pirate Mercenary", "PSY", [ "Powerhouse","Fighter" ], 5, 30, 4, 4, 99, 4000000, 1337, 740, 57, 2700, 1402, 205, 1 ],
     [ "Abdullah and Jeet", "STR", [ "Slasher","Striker" ], 4, 18, 6, 3, 70, 1066998, 143, 143, 52, 1003, 722, 208, 1 ],
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", [ "Slasher","Striker" ], 5, 30, 6, 4, 99, 4000000, 920, 673, 156, 1970, 1345, 343, 1 ],
-    [ "Bartolomeo", "STR", [ "Striker","Ambition" ], 5, 30, 4, 4, 70, 1066998, 403, 278, 58, 1623, 813, 232, 1 ],
-    [ "Bartolomeo the Cannibal", "STR", [ "Striker","Ambition" ], 6, 55, 4, 5, 99, 5000000, 1550, 769, 181, 3505, 1431, 341, 1 ],
+    [ "Bartolomeo", "STR", [ "Striker","Driven" ], 5, 30, 4, 4, 70, 1066998, 403, 278, 58, 1623, 813, 232, 1 ],
+    [ "Bartolomeo the Cannibal", "STR", [ "Striker","Driven" ], 6, 55, 4, 5, 99, 5000000, 1550, 769, 181, 3505, 1431, 341, 1 ],
     [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, 5, 1, 50, 392109, 161, 39, 39, 1198, 492, 202, 1 ],
     [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, 3000000, 1120, 443, 141, 2007, 906, 322, 1 ],
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
@@ -1067,11 +1067,11 @@ window.units = [
     [ "Bright Swordswoman, Kuja Warriors", "PSY", "Slasher", 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
     [ "Skilled Female Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
     [ "Nimble Female Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
-    [ "Shuraiya Bascùd", "DEX", [ "Fighter", "Ambition" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
-    [ "Shuraiya Bascùd, Pirate Executioner", "DEX", [ "Fighter", "Ambition" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
+    [ "Shuraiya Bascùd", "DEX", [ "Fighter", "Driven" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
+    [ "Shuraiya Bascùd, Pirate Executioner", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
     [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, 392109, 129, 67, 18, 1494, 571, 101, 1 ],
     [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
-    [ "Needless", "QCK", [ "Slasher", "Ambition" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
+    [ "Needless", "QCK", [ "Slasher", "Driven" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
     [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, 1066998, 207, 102, 62, 1177, 524, 246, 1 ],
     [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1102, 467, 199, 2689, 900, 395, 1 ],
     [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 131, 142, 54, 979, 700, 222, 1 ],
@@ -1082,12 +1082,12 @@ window.units = [
     [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1042, 657, 143, 2377, 1373, 290, 1 ],
     [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 130, 130, 31, 1300, 673, 130, 1 ],
     [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1231, 631, 87, 3013, 1300, 202, 1 ],
-    [ "Fujitora", "INT", [ "Ambition", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
-    [ "Fujitora, Marine Admiral", "INT", [ "Ambition", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
-    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
-    [ "Colosseum Musshuru", "INT", [ "Ambition", "Fighter" ], 4, 26, 667, 472, 131, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Ambition" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, null, null, null, null ],
+    [ "Fujitora", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
+    [ "Fujitora, Marine Admiral", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
+    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
+    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 4, 26, 667, 472, 131, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, null, null, null, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ]
 	];
diff --git a/index.html b/index.html
index 02329fbd6..8d202a108 100644
--- a/index.html
+++ b/index.html
@@ -62,11 +62,11 @@
             <p>1/06/2016</p>
             <br>
             <ul>
+				<li>Ambition is dead! Long live Driven!</li>
+                <br>
 				<li>Fujitora Sugofest Units Completed!</li>
                 <br>
                 <li>Dead End Fortnight Units Completed</li>
-                <li>Also added it's Map Effect to the Calc</li>
-                <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>
             </ul>

From 2af00c3ae1d422d5da46c9f28006f39e17b8d6b8 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 4 Jun 2016 20:09:02 +0200
Subject: [PATCH 0422/1569] Fixes

---
 common/data/cooldowns.js | 4 ++--
 common/data/units.js     | 4 ++--
 index.html               | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 25f8d62e1..9313b4a89 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1067,8 +1067,8 @@ window.cooldowns = [
 	13,
 	16,
 	16,
-	[ 13, 8 ],
-	[ 13, 8 ],
+	[ 13, 6 ],
+	[ 13, 6 ],
 	[ 26, 18 ],
 	[ 26, 18 ],
 	[ 15, 6 ],
diff --git a/common/data/units.js b/common/data/units.js
index c1e47f2b7..4e8d68cfb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1085,9 +1085,9 @@ window.units = [
     [ "Fujitora", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
     [ "Fujitora, Marine Admiral", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
     [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
-    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 4, 26, 667, 472, 131, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 4, 26, 4, 3, 99, null, 667, 472, 131, 1419, 1142, 302, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, null, null, null, null ],
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ]
 	];
diff --git a/index.html b/index.html
index 8d202a108..af527d975 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,15 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>1/06/2016</p>
+            <p>04/06/2016</p>
             <br>
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
                 <br>
 				<li>Fujitora Sugofest Units Completed!</li>
                 <br>
-                <li>Dead End Fortnight Units Completed</li>
+                <li>Updated Colo Units</li>
+                <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>
             </ul>

From b5c6b3e6ee7cd4bd056ea7ca818064a1e7803259 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 7 Jun 2016 10:39:23 +0200
Subject: [PATCH 0423/1569] Kid Rebecca

---
 common/data/details.js    | 17 +++++++++++++----
 common/data/drops.js      |  2 +-
 common/data/evolutions.js |  4 ++++
 common/data/matchers.js   |  2 +-
 common/data/units.js      |  6 ++++--
 index.html                |  4 ++--
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 4df622b6b..f688971d1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5023,13 +5023,13 @@ window.details = {
         captain: "Boosts ATK of Free Spirit Units by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
-        specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
+        specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1047: {
         captain: "Boosts ATK of Free Spirit Units by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
-        specialNotes: "The random Damage will get added soon. <br> The Max amount of Bonus damage you can do is 1,325×55×6×2=874,500"
+        specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
 	1048: {
 		captain: "Boosts ATK and RCV of [PSY] Units by 1.2x",
@@ -5310,6 +5310,15 @@ window.details = {
 		captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
 		special: "Deals severe [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
 		specialName: "Double Edge of Revolt"
-	}
-	
+	},
+    1092: {
+        captain: "Boosts RCV of all characters depending on the current Health.",
+        captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 1.5x",
+        special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP"
+    },
+	1092: {
+        captain: "Boosts RCV of all characters depending on the current Health.",
+        captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is ?x",
+        special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP"
+    }
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 4f6baff80..24d7829ea 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -988,7 +988,7 @@ window.drops = {
         },
 		
 		{
-            name: "Hannyabal's Great Driven",
+            name: "Hannyabal's Great Ambition",
             thumb: 929,
             condition: 'You can only bring STR units',
             "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 905453d4f..4bcb08488 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1638,5 +1638,9 @@ window.evolutions = {
     1090: {
         evolution: 1091,
         evolvers: []
+    },
+    1092: {
+        evolution: 1093,
+        evolvers: [ 115, 116, 117, 81 ]
     }
 };
diff --git a/common/data/matchers.js b/common/data/matchers.js
index ee4b80595..56c4798a0 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -188,7 +188,7 @@ window.matchers = [
     {
         name: 'Orb controllers',
         target: 'special',
-        matcher: /(Changes.+orbs)/i
+        matcher: /(Changes.+(orb|orbs))/i
     },
 
     {
diff --git a/common/data/units.js b/common/data/units.js
index 4e8d68cfb..ed1fc57ee 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1085,11 +1085,13 @@ window.units = [
     [ "Fujitora", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
     [ "Fujitora, Marine Admiral", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
     [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
-    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 4, 26, 4, 3, 99, null, 667, 472, 131, 1419, 1142, 302, null ],
+    [ "Colosseum Musshuru", "INT", [ "Driven", "Striker" ], 4, 26, 4, 3, 99, null, 667, 472, 131, 1419, 1142, 302, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
-    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ]
+    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ],
+    [ "Kid Rebecca", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
+    [ "Kid Rebecca Evolution", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index af527d975..be927133e 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>04/06/2016</p>
+            <p>07/06/2016</p>
             <br>
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
                 <br>
 				<li>Fujitora Sugofest Units Completed!</li>
                 <br>
-                <li>Updated Colo Units</li>
+                <li>Added Kid Rebecca + Bugfixes</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 0eca8cd6ffb81a21413de59f9a3073ccf8c62bab Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 7 Jun 2016 10:43:07 +0200
Subject: [PATCH 0424/1569] Gasparde Class Fix

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index ed1fc57ee..b9dd5b4f0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1070,7 +1070,7 @@ window.units = [
     [ "Shuraiya Bascùd", "DEX", [ "Fighter", "Driven" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
     [ "Shuraiya Bascùd, Pirate Executioner", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
     [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, 392109, 129, 67, 18, 1494, 571, 101, 1 ],
-    [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
+    [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Striker" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
     [ "Needless", "QCK", [ "Slasher", "Driven" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
     [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, 1066998, 207, 102, 62, 1177, 524, 246, 1 ],
     [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1102, 467, 199, 2689, 900, 395, 1 ],

From 6a77ed8d31b0536414c7552061fe28b04ecd14ee Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 7 Jun 2016 10:50:17 +0200
Subject: [PATCH 0425/1569] More Fixes

---
 common/data/drops.js    | 2 +-
 common/data/flags.js    | 4 ++++
 common/data/specials.js | 3 +++
 common/data/units.js    | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 24d7829ea..cecb84d98 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1040,7 +1040,7 @@ window.drops = {
             name: "Pirate Ship Competition! \"Dead End\" Opens!",
             thumb: 1072,
             condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
-            "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888]
+            "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888, -1070]
         }
 
     ],
diff --git a/common/data/flags.js b/common/data/flags.js
index ee4525c02..6e9064740 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -646,6 +646,10 @@ window.flags = {
 	649: { rr: 1, rro: 1, global: 1 },
 	650: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	651: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    655: { global: 1},
+    656: { global: 1},
+    657: { global: 1},
+    658: { global: 1},
 	660: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	661: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	663: { global: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index 02dab523f..561a65950 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -299,6 +299,9 @@ window.specials = {
 		atk: function(p) { return p.defenseDown ? 1.3 : 1; },
 		type: "condition"
 	},
+    552: {
+		def: function(p) { return 0; }
+	},
 	559: {
 		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
 	},
diff --git a/common/data/units.js b/common/data/units.js
index b9dd5b4f0..165a1a5bf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1025,7 +1025,7 @@ window.units = [
     [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
     [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
-    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 5000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
+    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 4000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
     [ "Funk Brothers", "DEX", [ "Fighter","Driven" ], 4, 18, 5, 3, 70, 1066998, 60, 172, 44, 937, 824, 109, 1 ],
     [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Driven" ], 5, 30, 8, 4, 99, 4000000, 1500, 824, 77, 2920, 1251, 226, 1 ],
     [ "Hajrudin", "PSY", [ "Powerhouse","Fighter" ], 4, 18, 5, 3, 70, 1066998, 201, 177, 38, 1403, 795, 116, 1 ],

From 48a08cf5f08c98c69c91f7f44636e7038307ef94 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 7 Jun 2016 11:04:35 +0200
Subject: [PATCH 0426/1569] Global Version Fortnights

---
 common/data/drops.js | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index cecb84d98..83c6fed7a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -858,18 +858,20 @@ window.drops = {
         },
 
         {
-            name: 'Fight! Suna Suna Clan!!',
+            name: 'Fight! Sand-Sand Band!!',
             thumb: 664,
-			global: true,
+            global: true,
             condition: 'Heatwave causes damage every 2 turns',
-            "All Difficulties": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ]
+            "Japan": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ],
+            "Global": [ 663, 665, 667, -667, -639, -508, -506, -459, -378, -221, -73 ]
         },
 
         {
-            name: 'Guidance from the Sound of a Bell! Calgara and Noland!',
+            name: 'Led by the Light of Shandora! Calgara & Noland!',
             thumb: 688,
             condition: 'Bomb orbs appear',
-            "All Difficulties": [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ]
+            "Japan": [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ],
+            "Global": [ 687, 689, -542, -645, -647, -429, -428, -401, -365, -218 ]
         },
 
         {
@@ -898,31 +900,19 @@ window.drops = {
         {
             name: "Twilight Party DEAD or TREAT!!",
             thumb: 761,
-			condition: "None",
-            "All Difficulties": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ]
-        },
-
-        {
-            name: "Twilight Party DEAD or TREAT!! (Global)",
-            thumb: 763,
             global: true,
 			condition: "None",
-            "All Difficulties": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
+            "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ],
+            "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
         },
 
         {
             name: "Midnight Party DEAD or TREAT!!",
             thumb: 766,
-			condition: "None",
-            "All Difficulties": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ]
-        },
-
-        {
-            name: "Midnight Party DEAD or TREAT!! (Global)",
-            thumb: 768,
             global: true,
 			condition: "None",
-            "All Difficulties": [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
+            "Japan": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ],
+            "Global": [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
         },
 
         {

From 18897891eb0d47b85a85290d5edbbc152a9bca9d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 7 Jun 2016 20:27:52 +0200
Subject: [PATCH 0427/1569] New Map Effects

---
 common/data/effects.js | 38 ++++++++++++++++++++++++++++++++++++++
 damage/js/cruncher.js  | 12 ++++++++++++
 index.html             |  2 +-
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 8b1845fe0..e736ca5f6 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -270,6 +270,44 @@ window.effects = {
         atk: function(p) { console.log(p); return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 0.2; },
         hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 0.1 : 2.0; }
         
+    },
+    
+    '3-hit Good Barrier': {
+        description: 'You need to hit 3 Goods before you do any Damage',
+        thumb: null,
+        id: 32,
+        comboShield: 3,
+        comboType: 'Good'
+    },
+    
+    '3-hit Great Barrier': {
+        description: 'You need to hit 3 Greats before you do any Damage',
+        thumb: null,
+        id: 33,
+        comboShield: 3,
+        comboType: 'Great'
+    },
+    
+    '10-Hit Hit Barrier': {
+        description: 'You will only do damage once the combo meter reaches 10 hits',
+        thumb: null,
+        id: 34,
+        comboShield: 10
+    },
+    
+    '1.25x Orb Boost': {
+        description: 'Used by Christmas Law in Saga Colosseum',
+        thumb: 856,
+        id: 35,
+        orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); }
+    },
+    
+    '700k Damage Treshold Barrier': {
+        description: 'Used by Saga. You cannot do more that 700k damage in one hit',
+        thumb: null,
+        id: 36,
+        barrierThreshold: 700000,
+        barrierReduction: 0.99
     }
 
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index f33525ff8..07f11f6db 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -585,6 +585,18 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     result.push(JSON.parse(JSON.stringify(captains[i].hitModifiers)));
             }
         }
+        // Auto sorting for Hit Barriers
+        if (mapEffect.comboType){
+            var mapComboArray = []
+            for(var cmb=0;cmb<mapEffect.comboShield;cmb++){
+                mapComboArray.push(mapEffect.comboType);
+            }
+            var cmbLeft = 6-mapEffect.comboShield;
+            for(var cmb=0;cmb<cmbLeft;cmb++){
+                mapComboArray.push("Perfect");
+            }
+            result.push(mapComboArray);
+        }
         return result;
     };
 
diff --git a/index.html b/index.html
index be927133e..074328b37 100644
--- a/index.html
+++ b/index.html
@@ -66,7 +66,7 @@
                 <br>
 				<li>Fujitora Sugofest Units Completed!</li>
                 <br>
-                <li>Added Kid Rebecca + Bugfixes</li>
+                <li>Added a few new Map Effects</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 56dc375df47e1969c7dd20197ba6cc467a626ce7 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 10 Jun 2016 09:27:04 -0500
Subject: [PATCH 0428/1569] new island placeholder & fixes

---
 common/data/details.js  |  4 ++--
 common/data/drops.js    | 11 ++++++++++-
 common/data/families.js |  4 +++-
 common/data/flags.js    |  4 ++++
 common/data/units.js    |  2 +-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f688971d1..9020d27c3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5318,7 +5318,7 @@ window.details = {
     },
 	1092: {
         captain: "Boosts RCV of all characters depending on the current Health.",
-        captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is ?x",
-        special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP"
+        captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 2x",
+        special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
     }
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 83c6fed7a..b95b4a196 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -772,6 +772,8 @@ window.drops = {
             thumb: 462,
             global: true,
             condition: 'Striker, Shooter and Slashers are weakend.',
+            challenge: 'Damage dealt in a single Round',
+            challengeData: [['???','1x ??? Elder'], ['???','1x ?? Cotton Candy'], ['???','3x Rainbow Gems']],
             "All Difficulties": [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
         },
 
@@ -869,6 +871,7 @@ window.drops = {
         {
             name: 'Led by the Light of Shandora! Calgara & Noland!',
             thumb: 688,
+            global: true,
             condition: 'Bomb orbs appear',
             "Japan": [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ],
             "Global": [ 687, 689, -542, -645, -647, -429, -428, -401, -365, -218 ]
@@ -1031,7 +1034,13 @@ window.drops = {
             thumb: 1072,
             condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
             "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888, -1070]
-        }
+        },
+        
+        {
+            name: "Dr. Indigo & Scarlet!",
+            condition: "???",
+            "All Difficulties": [ -912, -1014, -647, -894, -590, -524, -611]
+        },
 
     ],
 
diff --git a/common/data/families.js b/common/data/families.js
index 85a9e7cf8..217805d86 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1089,5 +1089,7 @@ window.families = [
 	"Saga",
 	"Saga",
 	"X Drake",
-	"X Drake"
+	"X Drake",
+    "Rebecca",
+    "Rebecca"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 6e9064740..bed73312c 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -669,6 +669,10 @@ window.flags = {
 	677: { rr: 1, rro: 1, global: 1 },
 	678: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	679: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    687: { global: 1 },
+    688: { global: 1 },
+    689: { global: 1 },
+    690: { global: 1 },
 	691: { global: 1 },
 	692: { global: 1 },
 	693: { global: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 165a1a5bf..5c2d85639 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1084,7 +1084,7 @@ window.units = [
     [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1231, 631, 87, 3013, 1300, 202, 1 ],
     [ "Fujitora", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
     [ "Fujitora, Marine Admiral", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
-    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, null, 128, 127, 40, null, null, null, null ],
+    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, null, 103, 110, 34, 729, 530, 189, null ],
     [ "Colosseum Musshuru", "INT", [ "Driven", "Striker" ], 4, 26, 4, 3, 99, null, 667, 472, 131, 1419, 1142, 302, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, null ],

From d77a3b60fbed8b0456cce50b2aede7e6e642d839 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 10 Jun 2016 09:57:14 -0500
Subject: [PATCH 0429/1569] Sun Pirates Ship

Still need stat reduction and implement Barto style ability
---
 common/data/ships.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index a7593725b..87c108170 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -221,6 +221,19 @@ window.ships = [
         thumb: null,
         description: 'Boosts ATK by 1.2x.',
         atk: function(p) { return 1.2; },
-    }
+    }, 
+    
+        name: 'Sun Pirates Ship',
+        thumb: null,
+        description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units. (ATK/HP Boost will assume you\'re using 6 Fighters for now.) ',
+        atk: function(p) {
+            return !p.unit.class.has('Fighter') ? 1 :
+                [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return !p.unit.class.has('Fighter') ? 1 :
+                [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
+        }
+    }, 
 
 ];

From fcc0a6fd587250ec94ab61efd8a340ae0aa027d0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 10 Jun 2016 10:05:28 -0500
Subject: [PATCH 0430/1569] Sun Pirates

1% for non fighters?
---
 common/data/ships.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 87c108170..1ea51a81c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -223,15 +223,16 @@ window.ships = [
         atk: function(p) { return 1.2; },
     }, 
     
+    { // 18
         name: 'Sun Pirates Ship',
         thumb: null,
         description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units. (ATK/HP Boost will assume you\'re using 6 Fighters for now.) ',
         atk: function(p) {
-            return !p.unit.class.has('Fighter') ? 1 :
+            return !p.unit.class.has('Fighter') ? .01 :
                 [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !p.unit.class.has('Fighter') ? 1 :
+            return !p.unit.class.has('Fighter') ? .01 :
                 [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
         }
     }, 

From b1e73a691ee9b8203c12815ec4ea975b0044389f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 10 Jun 2016 10:09:29 -0500
Subject: [PATCH 0431/1569] Sun Pirates Ship

maybe 5%?
---
 common/data/ships.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 1ea51a81c..560305b65 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -228,11 +228,11 @@ window.ships = [
         thumb: null,
         description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units. (ATK/HP Boost will assume you\'re using 6 Fighters for now.) ',
         atk: function(p) {
-            return !p.unit.class.has('Fighter') ? .01 :
+            return !p.unit.class.has('Fighter') ? .05 :
                 [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !p.unit.class.has('Fighter') ? .01 :
+            return !p.unit.class.has('Fighter') ? .05 :
                 [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
         }
     }, 

From 97cc978517d6c78535aaf42ca2fa689a5c79ec43 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 10 Jun 2016 18:10:01 +0200
Subject: [PATCH 0432/1569] Manual Fix

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index b95b4a196..e328458f6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1039,7 +1039,7 @@ window.drops = {
         {
             name: "Dr. Indigo & Scarlet!",
             condition: "???",
-            "All Difficulties": [ -912, -1014, -647, -894, -590, -524, -611]
+            "All Difficulties": [ -912, -1014, -647, -891, -590, -524, -611]
         },
 
     ],

From c3749eaf06b5bd3237ea58c95ff0317e00a42514 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 12 Jun 2016 11:09:04 +0200
Subject: [PATCH 0433/1569] Prison Croc Fix

---
 common/data/details.js | 2 +-
 index.html             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9020d27c3..15a63918e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2093,7 +2093,7 @@ window.details = {
 		special: "Poisons all enemies, boosts ATK of Striker characters by 1.5x for 1 turn",
 		specialNotes: "#{poison}",
 		specialName: "Merciless Ploy: Poison Needle",
-		captain: "Boosts ATK of Striker characters by 1.5x"
+		captain: "Boosts ATK of Striker characters by 2x"
 	},
 	510: {
 		special: "Poisons all enemies, boosts ATK of Striker characters by 1.5x for 1 turn",
diff --git a/index.html b/index.html
index 074328b37..4a3257758 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>07/06/2016</p>
+            <p>11/06/2016</p>
             <br>
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
                 <br>
 				<li>Fujitora Sugofest Units Completed!</li>
                 <br>
-                <li>Added a few new Map Effects</li>
+                <li>Fixed 3* Prison Croc Captain</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From e87f272240db89d5b573eb454338426cc5a262db Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 12 Jun 2016 18:22:38 -0500
Subject: [PATCH 0434/1569] Colo Saga

max 3* stats
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 5c2d85639..2dc735dc0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1086,7 +1086,7 @@ window.units = [
     [ "Fujitora, Marine Admiral", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
     [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, null, 103, 110, 34, 729, 530, 189, null ],
     [ "Colosseum Musshuru", "INT", [ "Driven", "Striker" ], 4, 26, 4, 3, 99, null, 667, 472, 131, 1419, 1142, 302, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, null, null, null, null ],
+    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, 977, 551, 141, null ],
     [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ],

From 34dc020ebc30dd7286aa87ea8d762b32461b788c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 13 Jun 2016 10:16:40 +0200
Subject: [PATCH 0435/1569] FN Preview

And RCV Special Matcher
---
 common/data/details.js    | 2 +-
 common/data/drops.js      | 4 ++--
 common/data/evolutions.js | 8 ++++++++
 common/data/families.js   | 7 ++++++-
 common/data/matchers.js   | 6 ++++++
 common/data/units.js      | 7 ++++++-
 index.html                | 6 +++---
 7 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 15a63918e..24eef6d22 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5316,7 +5316,7 @@ window.details = {
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 1.5x",
         special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP"
     },
-	1092: {
+	1093: {
         captain: "Boosts RCV of all characters depending on the current Health.",
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 2x",
         special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
diff --git a/common/data/drops.js b/common/data/drops.js
index e328458f6..a69ee88d1 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1038,8 +1038,8 @@ window.drops = {
         
         {
             name: "Dr. Indigo & Scarlet!",
-            condition: "???",
-            "All Difficulties": [ -912, -1014, -647, -891, -590, -524, -611]
+            condition: "Boosts Fighters/Slashers HP by ?x, Driven/Powerhouse ATK by ?x, Lowers Stiker/Shooter/Free Spirit/Cerebral HP and ATK by ?x",
+            "All Difficulties": [ 1094, 1096, 1098, -912, -1014, -647, -891, -590, -524, -611]
         },
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4bcb08488..6c1195a06 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1642,5 +1642,13 @@ window.evolutions = {
     1092: {
         evolution: 1093,
         evolvers: [ 115, 116, 117, 81 ]
+    },
+    1094: {
+        evolution: 1095,
+        evolvers: []
+    },
+    1096: {
+        evolution: 1097,
+        evolvers: []
     }
 };
diff --git a/common/data/families.js b/common/data/families.js
index 217805d86..868aabd64 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1091,5 +1091,10 @@ window.families = [
 	"X Drake",
 	"X Drake",
     "Rebecca",
-    "Rebecca"
+    "Rebecca",
+    "Dr. Indigo",
+    "Dr. Indigo",
+    "Scarlet",
+    "Scarlet",
+    "Billy",
 ];
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 56c4798a0..95e6b80cf 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -166,6 +166,12 @@ window.matchers = [
         target: 'special',
         matcher: /(Following the activation.+boosts.+ATK|If during that turn.+boosts.+ATK)/i
     },
+    
+    {
+        name: 'RCV boosters',
+        target: 'special',
+        matcher: /Boosts RCV/i
+    },
 
     {
         name: 'Orb lockers',
diff --git a/common/data/units.js b/common/data/units.js
index 2dc735dc0..796b10838 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1091,7 +1091,12 @@ window.units = [
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ],
     [ "Kid Rebecca", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
-    [ "Kid Rebecca Evolution", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ]
+    [ "Kid Rebecca Evolution", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ],
+    [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dr. Indigo Evolution", "DEX", [ "Cerebral", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Scarlet Evolution", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Billy the Thunder Bird", "INT", [ "Shooter", "Powerhouse" ], 3, 10, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 4a3257758..c87e8aff8 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>11/06/2016</p>
+            <p>13/06/2016</p>
             <br>
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
                 <br>
-				<li>Fujitora Sugofest Units Completed!</li>
+				<li>Added New Fortnight Previews</li>
                 <br>
-                <li>Fixed 3* Prison Croc Captain</li>
+                <li>Added RCV Boosting Special Filter</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 19a01552a63d5af388114b79735e7ea039638ae1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 14 Jun 2016 03:36:50 -0500
Subject: [PATCH 0436/1569] New Fortnight characters

everything
---
 common/data/captains.js  |  6 ++++++
 common/data/cooldowns.js | 13 +++++++++----
 common/data/details.js   | 41 +++++++++++++++++++++++++++++++++-------
 common/data/drops.js     |  5 +++--
 common/data/effects.js   |  8 ++++++++
 common/data/units.js     |  8 ++++----
 6 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c46cbdb03..aab2dc167 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2701,4 +2701,10 @@ window.captains = {
     1091: {
 		atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
 	},
+	1092: {
+		rcv: function(p) { return 1 + .5 * ((100 - p.percHP) / 100); }
+	},
+	1093: {
+		rcv: function(p) { return 1 + 1 * ((100 - p.percHP) / 100);	}
+	}
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9313b4a89..4486a714d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -889,7 +889,7 @@ window.cooldowns = [
 	[ 25, 15 ],
 	[ 20, 12 ],
 	[ 20, 12 ],
-	18,
+	[ 18, 10 ],
 	[ 14, 8 ],
 	[ 28, 22 ],
 	[ 25, 18 ],
@@ -909,8 +909,8 @@ window.cooldowns = [
 	[ 15, 9 ],
 	[ 20, 15 ],
 	[ 20, 15 ],
-	25,
-	25,
+	[ 25, 18 ],
+	[ 25, 18 ],
 	[ 16, 10 ],
 	[ 16, 10 ],
 	[ 13, 13 ],
@@ -1089,5 +1089,10 @@ window.cooldowns = [
 	[ 20, 10 ],
 	[ 20, 10 ],
 	[ 25, 12 ],
-	[ 25, 12 ]
+	[ 25, 12 ],
+	24,
+	24,
+	20,
+	20,
+	[ 13, 8 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 24eef6d22..0a1193dd8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5256,13 +5256,13 @@ window.details = {
 	},
 	1082: {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
-		special: "Deals severe [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+		special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
 		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
 		specialName: "Don Sai Special"
 	},
 	1083: {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
-		special: "Deals severe [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+		special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
 		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
 		specialName: "Don Sai Special"
 	},
@@ -5292,33 +5292,60 @@ window.details = {
 	},
 	1088: {
 		captain: "Boosts ATK of Slasher characters by 2x",
-		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
+		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
 		specialName: "Seven Stars Sword of Darkness"
 	},
 	1089: {
 		captain: "Boosts ATK of Slasher characters by 2x and the HP of Driven characters by 1.75x",
 		captainNotes: "Slasher + Driven characters gain ATK AND HP",
-		special: "Reduces crew's HP by 70%, deals severe [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
+		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
 		specialName: "Seven Stars Sword of Darkness"
 	},
 	1090: {
 		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
-		special: "Deals severe [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
+		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
 		specialName: "Double Edge of Revolt"
 	},
 	1091: {
 		captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
-		special: "Deals severe [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
+		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
 		specialName: "Double Edge of Revolt"
 	},
     1092: {
         captain: "Boosts RCV of all characters depending on the current Health.",
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 1.5x",
-        special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP"
+        special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
+		specialName: "Kid Rebecca Specail"
     },
 	1093: {
         captain: "Boosts RCV of all characters depending on the current Health.",
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 2x",
         special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
+		specialName: "Kid Rebecca Specail"
+    },
+	1094: {
+        captain: "Boosts ATK of Cerebral characters by 2x.",
+        special: "Reduces crew's current HP by 80%, deals 6x the removed HP as damage to all enemies. Reduces damage received by 80% for 1 turn.",
+		specialName: "Dr. Indigo Special"
+    },
+	1095: {
+        captain: "Boosts ATK of Cerebral characters by 2x.",
+        special: "Reduces crew's current HP by 80%, deals 6x the removed HP as damage to all enemies. Reduces damage received by 80% for 1 turn.",
+		specialName: "Dr. Indigo Special"
+    },
+	1096: {
+        captain: "Boosts ATK of Powerhouse characters by 3x after the 5th Perfect.",
+        special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
+		specialName: "Scarlet Special"
+    },
+	1097: {
+        captain: "Boosts ATK of Powerhouse characters by 3x after the 5th Perfect.",
+        special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
+		specialName: "Scarlet Special"
+    },
+	1098: {
+        captain: "Boosts chain multiplier by 2x",
+        special: "Randomizes all orbs including [BLOCK] orbs and switches orbs between slots once.",
+		specialName: "Bill the Thunder Bird Special"
     }
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index a69ee88d1..5b48a726b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1038,8 +1038,9 @@ window.drops = {
         
         {
             name: "Dr. Indigo & Scarlet!",
-            condition: "Boosts Fighters/Slashers HP by ?x, Driven/Powerhouse ATK by ?x, Lowers Stiker/Shooter/Free Spirit/Cerebral HP and ATK by ?x",
-            "All Difficulties": [ 1094, 1096, 1098, -912, -1014, -647, -891, -590, -524, -611]
+			thumb: 1095,
+            condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
+            "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -524, -611, -893, -1098]
         },
 
     ],
diff --git a/common/data/effects.js b/common/data/effects.js
index e736ca5f6..fbbd50387 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -308,6 +308,14 @@ window.effects = {
         id: 36,
         barrierThreshold: 700000,
         barrierReduction: 0.99
+    },
+	
+	'Dr. Indigo & Scarlet! Fortnight': {
+        description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
+        thumb: null,
+        id: 37,
+        atk: function(p) { return p.class.has('Driven') && p.class.has('Powerhouse') ? 4 : ( p.class.has('Driven') || p.class.has('Powerhouse') ? 2 : 0.5;) },
+        hp: function(p) { return p.class.has('Slasher') && p.class.has('Fighter') ? 4 : ( p.class.has('Slasher') || p.class.has('Fighter') ? 2 : 0.5;) }
     }
 
 };
diff --git a/common/data/units.js b/common/data/units.js
index 796b10838..5a4671881 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1092,11 +1092,11 @@ window.units = [
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ],
     [ "Kid Rebecca", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
     [ "Kid Rebecca Evolution", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ],
-    [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, null, 66, 36, 41, null, null, null, null ],
     [ "Dr. Indigo Evolution", "DEX", [ "Cerebral", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Scarlet Evolution", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Billy the Thunder Bird", "INT", [ "Shooter", "Powerhouse" ], 3, 10, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, null, 121, 47, 5, null, null, null, null ],
+    [ "Scarlet Evolution", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, null, null, 1271, 467, 30, null, null, null, null ],
+    [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, null, 54, 99, 40, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 03ec4fbf4d9132f531dda62db464952e92aa4616 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 14 Jun 2016 03:42:04 -0500
Subject: [PATCH 0437/1569] oops

map condition wrong. Will fix later.
---
 common/data/cooldowns.js | 4 ++--
 common/data/drops.js     | 2 +-
 common/data/effects.js   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 4486a714d..387366f0b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1092,7 +1092,7 @@ window.cooldowns = [
 	[ 25, 12 ],
 	24,
 	24,
-	20,
-	20,
+	[ 20, 11 ],
+	[ 20, 11 ],
 	[ 13, 8 ]
 ];
diff --git a/common/data/drops.js b/common/data/drops.js
index 5b48a726b..aedf53872 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1040,7 +1040,7 @@ window.drops = {
             name: "Dr. Indigo & Scarlet!",
 			thumb: 1095,
             condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
-            "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -524, -611, -893, -1098]
+            "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
         },
 
     ],
diff --git a/common/data/effects.js b/common/data/effects.js
index fbbd50387..8d5ef8580 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -309,13 +309,13 @@ window.effects = {
         barrierThreshold: 700000,
         barrierReduction: 0.99
     },
-	
+	/*
 	'Dr. Indigo & Scarlet! Fortnight': {
         description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
         thumb: null,
         id: 37,
         atk: function(p) { return p.class.has('Driven') && p.class.has('Powerhouse') ? 4 : ( p.class.has('Driven') || p.class.has('Powerhouse') ? 2 : 0.5;) },
         hp: function(p) { return p.class.has('Slasher') && p.class.has('Fighter') ? 4 : ( p.class.has('Slasher') || p.class.has('Fighter') ? 2 : 0.5;) }
-    }
+    }*/
 
 };

From eea4d9af9178cd86c5aa90d0f90b3bb26bb2b97a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 14 Jun 2016 03:47:50 -0500
Subject: [PATCH 0438/1569] Rebecca cd

---
 common/data/cooldowns.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 387366f0b..32b6ee34b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1090,6 +1090,8 @@ window.cooldowns = [
 	[ 20, 10 ],
 	[ 25, 12 ],
 	[ 25, 12 ],
+	[ 13, 13 ],
+	[ 13, 13 ],
 	24,
 	24,
 	[ 20, 11 ],

From d72fca41ee50fc4234c83b33b980b793c31f5ed1 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 14 Jun 2016 14:06:15 +0200
Subject: [PATCH 0439/1569] New FN Map Effect

---
 common/data/effects.js | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 8d5ef8580..981c93f30 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -309,13 +309,36 @@ window.effects = {
         barrierThreshold: 700000,
         barrierReduction: 0.99
     },
-	/*
+    
 	'Dr. Indigo & Scarlet! Fortnight': {
         description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
         thumb: null,
         id: 37,
-        atk: function(p) { return p.class.has('Driven') && p.class.has('Powerhouse') ? 4 : ( p.class.has('Driven') || p.class.has('Powerhouse') ? 2 : 0.5;) },
-        hp: function(p) { return p.class.has('Slasher') && p.class.has('Fighter') ? 4 : ( p.class.has('Slasher') || p.class.has('Fighter') ? 2 : 0.5;) }
-    }*/
+        atk: function(p) { 
+                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
+                            if(p.class.has('Driven')) { boost1 = 2.0}
+                            if(p.class.has('Powerhouse')) { boost2 = 2.0}
+                            if(!(p.class.has('Driven')&&p.class.has('Powerhouse')) && p.class.constructor === Array){
+                            if(!p.class.has('Driven')){ boost3 = 0.5}
+                            if(!p.class.has('Powerhouse')){ boost4 = 0.5}}
+                            if(p.class.constructor === String){
+                                if(!(p.class.has('Driven') || p.class.has('Powerhouse'))){ boost5 = 0.5}
+                            }
+                            console.log("1:" +boost1 + " 2: "+boost2+" 3: "+boost3+" 4: "+boost4);
+                            return 1*boost1*boost2*boost3*boost4*boost5; 
+                        },
+        hp: function(p) {
+                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
+                            if(p.class.has('Fighter')) { boost1 = 2.0}
+                            if(p.class.has('Slasher')) { boost2 = 2.0}
+                            if(!(p.class.has('Fighter')&&p.class.has('Slasher')) && p.class.constructor === Array){
+                            if(!p.class.has('Fighter')){ boost3 = 0.5}
+                            if(!p.class.has('Slasher')){ boost4 = 0.5}}
+                            if(p.class.constructor === String){
+                                if(!(p.class.has('Fighter') || p.class.has('Slasher'))){ boost5 = 0.5}
+                            }
+                            return 1*boost1*boost2*boost3*boost4*boost5;
+                        }
+    }
 
-};
+};
\ No newline at end of file

From 4020abd68ba43fa477fcff87306edec80fdb294f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 14 Jun 2016 17:10:39 +0200
Subject: [PATCH 0440/1569] Captains + Names

---
 common/data/captains.js | 23 ++++++++++++++++++++++-
 common/data/details.js  | 12 ++++++------
 common/data/specials.js |  8 ++++++++
 common/data/units.js    |  6 +++---
 index.html              |  5 +++--
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index aab2dc167..0fe9cb8c0 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2706,5 +2706,26 @@ window.captains = {
 	},
 	1093: {
 		rcv: function(p) { return 1 + 1 * ((100 - p.percHP) / 100);	}
-	}
+	},
+    1094: {
+        atk: function(p) { return p.class.has('Cerebral') ? 2.0 : 1.0; }
+    },
+    1095: {
+        atk: function(p) { return p.class.has('Cerebral') ? 2.0 : 1.0; }
+    },
+    1096: {
+        hitAtk: function(p) {
+			return !(p.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1097: {
+        hitAtk: function(p) {
+			return !(p.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1098: {
+        chainModifier: function(p) { return 2; }
+    }
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index 0a1193dd8..caf3c615c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5326,26 +5326,26 @@ window.details = {
 	1094: {
         captain: "Boosts ATK of Cerebral characters by 2x.",
         special: "Reduces crew's current HP by 80%, deals 6x the removed HP as damage to all enemies. Reduces damage received by 80% for 1 turn.",
-		specialName: "Dr. Indigo Special"
+		specialName: "Mass Juggling"
     },
 	1095: {
         captain: "Boosts ATK of Cerebral characters by 2x.",
         special: "Reduces crew's current HP by 80%, deals 6x the removed HP as damage to all enemies. Reduces damage received by 80% for 1 turn.",
-		specialName: "Dr. Indigo Special"
+		specialName: "Mass Juggling"
     },
 	1096: {
         captain: "Boosts ATK of Powerhouse characters by 3x after the 5th Perfect.",
         special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
-		specialName: "Scarlet Special"
+		specialName: "Crash Drumming"
     },
 	1097: {
-        captain: "Boosts ATK of Powerhouse characters by 3x after the 5th Perfect.",
+        captain: "Boosts ATK of Powerhouse characters by 3.5x after the 5th Perfect.",
         special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
-		specialName: "Scarlet Special"
+		specialName: "Crash Drumming"
     },
 	1098: {
         captain: "Boosts chain multiplier by 2x",
         special: "Randomizes all orbs including [BLOCK] orbs and switches orbs between slots once.",
-		specialName: "Bill the Thunder Bird Special"
+		specialName: "Mutation-Induced Thunder"
     }
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 561a65950..6a4b7c89b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1355,5 +1355,13 @@ window.specials = {
     1089: {
         atk: function(p) { return p.unit.class.has("Slasher" || "Driven") ? 1.5 : 1},
         type: "class"
+    },
+    1096: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+		type: "type"
+    },
+    1097: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+		type: "type"
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 5a4671881..a6079ef8d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1093,9 +1093,9 @@ window.units = [
     [ "Kid Rebecca", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
     [ "Kid Rebecca Evolution", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ],
     [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, null, 66, 36, 41, null, null, null, null ],
-    [ "Dr. Indigo Evolution", "DEX", [ "Cerebral", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, null, 121, 47, 5, null, null, null, null ],
-    [ "Scarlet Evolution", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, null, null, 1271, 467, 30, null, null, null, null ],
+    [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, null, 121, 47, 5, null, null, null, null ],
+    [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, null, null, 1271, 467, 30, null, null, null, null ],
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, null, 54, 99, 40, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index c87e8aff8..bd291cb88 100644
--- a/index.html
+++ b/index.html
@@ -59,12 +59,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>13/06/2016</p>
+            <p>14/06/2016</p>
             <br>
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
                 <br>
-				<li>Added New Fortnight Previews</li>
+				<li>Updated New Fortnight Previews</li>
+                <li>and added COndition to Map Effects</li>
                 <br>
                 <li>Added RCV Boosting Special Filter</li>
                 <br>

From 50783188fcf38ba9698d22ee8a1b4af61e247291 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 14 Jun 2016 12:30:23 -0500
Subject: [PATCH 0441/1569] Indigo stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index a6079ef8d..9099d119b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1092,8 +1092,8 @@ window.units = [
     [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ],
     [ "Kid Rebecca", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
     [ "Kid Rebecca Evolution", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ],
-    [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, null, 66, 36, 41, null, null, null, null ],
-    [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, null, 66, 36, 41, 965, 497, 209, null ],
+    [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 2, 99, null, 903, 432, 163, null, null, null, null ],
     [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, null, 121, 47, 5, null, null, null, null ],
     [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, null, null, 1271, 467, 30, null, null, null, null ],
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, null, 54, 99, 40, null, null, null, null ]

From 12a8fae20e3b05f5522560b61cd0375c2268fb69 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 15 Jun 2016 10:32:00 +0200
Subject: [PATCH 0442/1569] New Units Complete

---
 common/data/captains.js    |  4 ++--
 common/data/details.js     |  4 ++--
 common/data/units.js       | 30 +++++++++++++++---------------
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  4 ++--
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 0fe9cb8c0..af01aebf7 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2715,13 +2715,13 @@ window.captains = {
     },
     1096: {
         hitAtk: function(p) {
-			return !(p.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+			return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1097: {
         hitAtk: function(p) {
-			return !(p.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
+			return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
diff --git a/common/data/details.js b/common/data/details.js
index caf3c615c..39fd31da4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5315,13 +5315,13 @@ window.details = {
         captain: "Boosts RCV of all characters depending on the current Health.",
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 1.5x",
         special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
-		specialName: "Kid Rebecca Specail"
+		specialName: "Present After the Rain"
     },
 	1093: {
         captain: "Boosts RCV of all characters depending on the current Health.",
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 2x",
         special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
-		specialName: "Kid Rebecca Specail"
+		specialName: "Present After the Rain"
     },
 	1094: {
         captain: "Boosts ATK of Cerebral characters by 2x.",
diff --git a/common/data/units.js b/common/data/units.js
index 9099d119b..74b992118 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1051,8 +1051,8 @@ window.units = [
     [ "Jaguar D. Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 173, 56, 29, 1353, 514, 157, 1 ],
     [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
     [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ],
-    [ "Hina, Graceful Honor Student", "QCK", [ "Striker", "Cerebral" ], 4, 10, 5, 3, 35, null, 85, 27, 55, 511, 220, 257, null ],
-    [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, null, 501, 198, 259, 1044, 500, 414, null ],
+    [ "Hina, Graceful Honor Student", "QCK", [ "Striker", "Cerebral" ], 4, 10, 5, 3, 35, 90778, 85, 27, 55, 511, 220, 257, 1 ],
+    [ "Hina, Polite Honor Student", "QCK", [ "Striker", "Cerebral" ], 5, 18, 5, 3, 70, 1066998, 501, 198, 259, 1044, 500, 414, 1 ],
     [ "Boa Sandersonia", "DEX", [ "Fighter" ], 3, 12, 6, 1, 50, 392109, 249, 72, 47, 1040, 500, 176, 1 ],
     [ "Boa Sandersonia, Kuja Pirates", "DEX", [ "Striker", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1043, 442, 137, 1772, 905, 318, 1 ],
     [ "Boa Marigold", "STR", [ "Striker" ], 3, 12, 5, 1, 50, 392109, 183, 40, 31, 1062, 517, 158, 1 ],
@@ -1084,19 +1084,19 @@ window.units = [
     [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1231, 631, 87, 3013, 1300, 202, 1 ],
     [ "Fujitora", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
     [ "Fujitora, Marine Admiral", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
-    [ "Colosseum Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, null, 103, 110, 34, 729, 530, 189, null ],
-    [ "Colosseum Musshuru", "INT", [ "Driven", "Striker" ], 4, 26, 4, 3, 99, null, 667, 472, 131, 1419, 1142, 302, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 177, 132, 25, 977, 551, 141, null ],
-    [ "Colosseum Saga", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, null ],
-    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 708, 315, 77, null, null, null, null ],
-    [ "Colosseum X Drake", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, null, 1297, 631, 130, 2599, 1230, 300, null ],
-    [ "Kid Rebecca", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
-    [ "Kid Rebecca Evolution", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ],
-    [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, null, 66, 36, 41, 965, 497, 209, null ],
-    [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 2, 99, null, 903, 432, 163, null, null, null, null ],
-    [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, null, 121, 47, 5, null, null, null, null ],
-    [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, null, null, 1271, 467, 30, null, null, null, null ],
-    [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, null, 54, 99, 40, null, null, null, null ]
+    [ "Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, 392109, 103, 110, 34, 729, 530, 189, 1 ],
+    [ "Musshuru, Poison Spore Human", "INT", [ "Driven", "Striker" ], 4, 26, 4, 3, 99, 3000000, 667, 472, 131, 1419, 1142, 302, 1 ],
+    [ "Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 143, 115, 21, 977, 551, 141, 1 ],
+    [ "Saga, Cursed Holy Sword", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, 1 ],
+    [ "X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 545, 220, 52, 1353, 693, 179, 1 ],
+    [ "\"Red Flag\" X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
+    [ "Rebecca, Parasol Rhytm", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
+    [ "Rebecca, Rainbow Melody", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ],
+    [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, 392109, 66, 36, 41, 965, 497, 209, 1 ],
+    [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 2, 99, 3000000, 903, 432, 163, 1796, 911, 352, 1 ],
+    [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 121, 47, 5, 1323, 520, 59, 1 ],
+    [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1271, 467, 30, 2302, 980, 92, 1 ],
+    [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 77a0ab690..2cb9fe462 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1070, 1072, 1075, 1077, 1079, 1081, 1083, 1085 ];
+    var newUnits = [ 1054, 1087, 1089, 1091, 1095, 1097, 1098 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index bd291cb88..4e6677edb 100644
--- a/index.html
+++ b/index.html
@@ -64,8 +64,8 @@
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
                 <br>
-				<li>Updated New Fortnight Previews</li>
-                <li>and added COndition to Map Effects</li>
+				<li>Completed New Fortnight/Colosseum Units</li>
+                <li>and added Condition to Map Effects</li>
                 <br>
                 <li>Added RCV Boosting Special Filter</li>
                 <br>

From 0fe516aff70d8ddaa98fd3d459d5f40ce30a270f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 17 Jun 2016 10:23:11 +0200
Subject: [PATCH 0443/1569] Global Stuff

---
 common/data/drops.js |  5 +++--
 common/data/flags.js | 36 ++++++++++++++++++++++++++----------
 index.html           |  5 +++--
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index aedf53872..f84958786 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -878,12 +878,13 @@ window.drops = {
         },
 
         {
-            name: "Knight of the Sky Gan Fall",
+            name: "Sky Night Ganfor",
             thumb: 713,
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
 			challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ]
+            "Japan": [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ],
+            "Global": [ 712, 714, 715, -716, -643, -546, -541, -400, -202, -363, -204 ]
         },
 
         {
diff --git a/common/data/flags.js b/common/data/flags.js
index bed73312c..64d3094fb 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -753,18 +753,34 @@ window.flags = {
 	793: { rr: 1, rro: 1 },
 	801: { rr: 1, rro: 1, lrr: 1 },
 	802: { rr: 1, rro: 1, lrr: 1 },
+    812: { global: 1 },
+    813: { global: 1 },
+    814: { global: 1 },
+    815: { global: 1 },
+    816: { global: 1 },
+    817: { global: 1 },
+    818: { global: 1 },
+    819: { global: 1 },
+    820: { global: 1 },
+    821: { global: 1 },
+    822: { global: 1 },
+    823: { global: 1 },
+    824: { global: 1 },
+    825: { global: 1 },
+    826: { global: 1 },
+    827: { global: 1 },
     828: { rr: 1, rro: 1, lrr: 1 },
 	829: { rr: 1, rro: 1, lrr: 1 },
-	837: { rr: 1, rro: 1 },
-	838: { rr: 1, rro: 1 },
-	839: { rr: 1, rro: 1 },
-	840: { rr: 1, rro: 1 },
-	841: { rr: 1, rro: 1 },
-	842: { rr: 1, rro: 1 },
-	843: { rr: 1, rro: 1 },
-	844: { rr: 1, rro: 1 },
-	845: { rr: 1, rro: 1 },
-	846: { rr: 1, rro: 1 },
+	837: { rr: 1, rro: 1, global: 1 },
+	838: { rr: 1, rro: 1, global: 1 },
+	839: { rr: 1, rro: 1, global: 1 },
+	840: { rr: 1, rro: 1, global: 1 },
+	841: { rr: 1, rro: 1, global: 1 },
+	842: { rr: 1, rro: 1, global: 1 },
+	843: { rr: 1, rro: 1, global: 1 },
+	844: { rr: 1, rro: 1, global: 1 },
+	845: { rr: 1, rro: 1, global: 1 },
+	846: { rr: 1, rro: 1, global: 1 },
 	855: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	856: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	857: { rr: 1, rro: 1, lrr: 1, global: 1 },
diff --git a/index.html b/index.html
index 4e6677edb..67e2e91e7 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>14/06/2016</p>
+            <p>17/06/2016</p>
             <br>
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
@@ -67,7 +67,8 @@
 				<li>Completed New Fortnight/Colosseum Units</li>
                 <li>and added Condition to Map Effects</li>
                 <br>
-                <li>Added RCV Boosting Special Filter</li>
+                <li>Updated Global Flags</li>
+                <li>And Global Gan Fall (Ganfor) Drops</li>
                 <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>

From 895b3bbc35fa55ed52529a5f2dcbbf4fc0ed562e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 17 Jun 2016 13:11:22 +0200
Subject: [PATCH 0444/1569] New Colo Previews

---
 common/data/drops.js      |  2 +-
 common/data/evolutions.js | 14 +++++++++++++-
 common/data/families.js   |  8 ++++++++
 common/data/units.js      | 10 +++++++++-
 index.html                |  3 +--
 5 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index f84958786..a3b5bf3ed 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1238,7 +1238,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1090 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1090, 1101, 1103, 1105 ]
         }
 
    ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 6c1195a06..6d9b2f611 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1650,5 +1650,17 @@ window.evolutions = {
     1096: {
         evolution: 1097,
         evolvers: []
-    }
+    },
+    1101: {
+        evolution: 1102,
+        evolvers: []
+    },
+    1103: {
+        evolution: 1104,
+        evolvers: []
+    },
+    1105: {
+        evolution: 1106,
+        evolvers: []
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 868aabd64..f9119b580 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1097,4 +1097,12 @@ window.families = [
     "Scarlet",
     "Scarlet",
     "Billy",
+    null,
+    null,
+    "Zephyr",
+    "Zephyr",
+    "Ain",
+    "Ain",
+    "Binz",
+    "Binz"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 74b992118..e07db1b9f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1096,7 +1096,15 @@ window.units = [
     [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 2, 99, 3000000, 903, 432, 163, 1796, 911, 352, 1 ],
     [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 121, 47, 5, 1323, 520, 59, 1 ],
     [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1271, 467, 30, 2302, 980, 92, 1 ],
-    [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ]
+    [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
+    [],
+    [],
+    [ "Colosseum Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Zephyr Evolution", "STR", [ "Fighter", "Driven" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Ain", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Ain Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Binz", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 67e2e91e7..2f0464571 100644
--- a/index.html
+++ b/index.html
@@ -64,8 +64,7 @@
             <ul>
 				<li>Ambition is dead! Long live Driven!</li>
                 <br>
-				<li>Completed New Fortnight/Colosseum Units</li>
-                <li>and added Condition to Map Effects</li>
+				<li>Added New Colosseum Previews</li>
                 <br>
                 <li>Updated Global Flags</li>
                 <li>And Global Gan Fall (Ganfor) Drops</li>

From e38b30c6dc1626235824438f5a8fffb5a1d6cdf7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 17 Jun 2016 22:15:06 +0200
Subject: [PATCH 0445/1569] Raid Sabo Special gets reduced by Defense

Should be the fix for #35
---
 damage/js/cruncher.js | 74 +++++++++++++++++++++++++------------------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 07f11f6db..00b2a947f 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -233,37 +233,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         result = applyChainAndBonusMultipliers(result,hitModifiers);
         if (mapEffect.damage) result.result = applyEffectDamage(result.result, mapEffect.damage);        
         
-        //Specials that add multiplier damage
-        //Very Specific for Raid Sabo for now
-        var conditionalMultiplier = 1.0;
-        if(staticMultiplier.length == 1){
-            //Since we need this for defense down, and defense down gets saved for all slots we just go with slot 0
-            var params = getParameters(0);
-            //Check if conditional Boosts are activated since they raise 
-            for (var x=0;x<enabledSpecials.length;++x) {
-                if  (enabledSpecials[x].type=='condition'){
-                    var thisMult = enabledSpecials[x].atk(params);
-                    if(thisMult>conditionalMultiplier){
-                        conditionalMultiplier = thisMult;
-                    }
-                }
-            }
-            //Add the static extra Damage to each attacking member
-            for (var y=0;y<enabledSpecials.length;++y) {
-                if (enabledSpecials[y].hasOwnProperty('staticMult')){
-                    var slot = enabledSpecials[y].sourceSlot;
-                    var baseDamage = getStatOfUnit(team[slot],'atk');
-                    var atkCandies = team[slot].candies.atk * 2;
-                    var mult = enabledSpecials[y].staticMult(params);
-                    var staticDamage = Math.ceil((baseDamage+atkCandies)*mult*conditionalMultiplier);
-                    for(var i=0; i<result.result.length;i++){ 
-                        if((hitModifiers[i]=="Great")||(hitModifiers[i]=="Good")||(hitModifiers[i]=="Perfect")){
-                            result.result[i].damage += staticDamage;
-                        }
-                    }
-                }
-            }
-        }
         var overallDamage = result.result.reduce(function(prev,x) { return prev + x.damage; },0);
         
         return { damage: result.result, overall: overallDamage,
@@ -367,6 +336,14 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (lastHit > 1) result.result += Math.ceil(lastAtk * 0.9 * bonusDamageBase);
             else result.result += Math.max(0,Math.ceil(lastAtk * (0.9 * bonusDamageBase + 1 / unit.combo)) - currentDefense);
         }
+        
+        //Apply Static Bonus Damage From Specials
+        var staticBonusDamage = computeFlatBonusDamage(hitModifier);
+        if (bonusDamageBase > 0 && mapEffect.shieldLeft == 0) {
+            if (lastHit > 1) result.result += staticBonusDamage;
+            else if((staticBonusDamage - currentDefense)>0) result.result += (staticBonusDamage - currentDefense);
+        }
+        
         // apply fixed threshold barrier if active
         if (mapEffect.barrierThreshold && result.result > mapEffect.barrierThreshold) {
             result.result = mapEffect.barrierThreshold +
@@ -634,6 +611,41 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             chainLimiter: function() { return Infinity; }
         });
     };
+    
+    var computeFlatBonusDamage = function(hitModifier) {
+        
+        var resultDamage = 0;
+        //Specials that add multiplier damage
+        //Very Specific for Raid Sabo for now
+        var conditionalMultiplier = 1.0;
+        if(staticMultiplier.length == 1){
+            //Since we need this for defense down, and defense down gets saved for all slots we just go with slot 0
+            var params = getParameters(0);
+            //Check if conditional Boosts are activated since they raise 
+            for (var x=0;x<enabledSpecials.length;++x) {
+                if  (enabledSpecials[x].type=='condition'){
+                    var thisMult = enabledSpecials[x].atk(params);
+                    if(thisMult>conditionalMultiplier){
+                        conditionalMultiplier = thisMult;
+                    }
+                }
+            }
+            //Add the static extra Damage to each attacking member
+            for (var y=0;y<enabledSpecials.length;++y) {
+                if (enabledSpecials[y].hasOwnProperty('staticMult')){
+                    var slot = enabledSpecials[y].sourceSlot;
+                    var baseDamage = getStatOfUnit(team[slot],'atk');
+                    var atkCandies = team[slot].candies.atk * 2;
+                    var mult = enabledSpecials[y].staticMult(params);
+                    var staticDamage = Math.ceil((baseDamage+atkCandies)*mult*conditionalMultiplier);
+                    if((hitModifier == 'Great')||(hitModifier == 'Good')||(hitModifier == 'Perfect')){
+                        resultDamage += staticDamage;
+                    } 
+                }
+            }
+        }  
+        return resultDamage;
+    };
 
     /* * * * * * Utility functions * * * * */
 

From b54a41668d67d4b5882e95636ddbc026bbf2280f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 17 Jun 2016 22:37:44 +0200
Subject: [PATCH 0446/1569] Small Improvement

---
 damage/js/cruncher.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 00b2a947f..3d04c0228 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -339,9 +339,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         
         //Apply Static Bonus Damage From Specials
         var staticBonusDamage = computeFlatBonusDamage(hitModifier);
-        if (bonusDamageBase > 0 && mapEffect.shieldLeft == 0) {
-            if (lastHit > 1) result.result += staticBonusDamage;
-            else if((staticBonusDamage - currentDefense)>0) result.result += (staticBonusDamage - currentDefense);
+        if ((staticBonusDamage > 0) && ((staticBonusDamage - currentDefense)>0)) {
+            result.result += (staticBonusDamage - currentDefense);
         }
         
         // apply fixed threshold barrier if active

From abfb482d21884f722bc634ccb9b8a7cc4f8cf5cf Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 19 Jun 2016 14:28:21 +0200
Subject: [PATCH 0447/1569] Evolutions

---
 common/data/evolutions.js | 10 +++++-----
 common/data/specials.js   |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 6d9b2f611..724ea1080 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1629,15 +1629,15 @@ window.evolutions = {
     },
     1086: {
         evolution: 1087,
-        evolvers: []
+        evolvers: [ 117, 88, 99, 304, 104 ]
     },
     1088: {
         evolution: 1089,
-        evolvers: []
+        evolvers: [ 117, 85, 96, 301, 101 ]
     },
     1090: {
         evolution: 1091,
-        evolvers: []
+        evolvers: [ 118, 83, 89, 303, 103 ]
     },
     1092: {
         evolution: 1093,
@@ -1645,11 +1645,11 @@ window.evolutions = {
     },
     1094: {
         evolution: 1095,
-        evolvers: []
+        evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1096: {
         evolution: 1097,
-        evolvers: []
+        evolvers: [ 117, 82, 82, 99, 104]
     },
     1101: {
         evolution: 1102,
diff --git a/common/data/specials.js b/common/data/specials.js
index 6a4b7c89b..055d4f5c8 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1240,11 +1240,13 @@ window.specials = {
     },
     1028: {
         //TODO
-       hit: function(n) { return n > 30 ? 1.75 : 1; } 
+        hit: function(n) { return n > 30 ? 1.75 : 1; },
+        type: "condition"
     },
     1029: {
         //TODO
-       hit: function(n) { return n > 30 ? 1.75 : 1; } 
+        hit: function(n) { return n > 30 ? 1.75 : 1; },
+        type: "condition"
     },
     1030: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },

From ffcefa1850a1e7f086776e18e3def9320a618cfe Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 20 Jun 2016 12:11:09 -0500
Subject: [PATCH 0448/1569] Probability Calculator & Coby

---
 common/data/families.js              | 4 +++-
 common/data/flags.js                 | 4 +++-
 common/data/units.js                 | 4 +++-
 index.html                           | 5 +++--
 probability/js/controllers.js        | 3 ++-
 probability/js/specialprobability.js | 4 ++++
 probability/views/main.html          | 5 ++++-
 7 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index f9119b580..647029dd9 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1104,5 +1104,7 @@ window.families = [
     "Ain",
     "Ain",
     "Binz",
-    "Binz"
+    "Binz",
+    "Coby",
+    "Coby"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 64d3094fb..d998ef66c 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -873,5 +873,7 @@ window.flags = {
     1082: { rr: 1, rro: 1 },
     1083: { rr: 1, rro: 1 },
     1084: { rr: 1, rro: 1 },
-    1085: { rr: 1, rro: 1 }
+    1085: { rr: 1, rro: 1 },
+    1107: { rr: 1, rro: 1, lrr: 1 },
+    1108: { rr: 1, rro: 1, lrr: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index e07db1b9f..2b6bba552 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1104,7 +1104,9 @@ window.units = [
     [ "Colosseum Ain", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Ain Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Binz", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Secret Coby", "DEX", [ "Fighter", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Secret Coby Evolution", "DEX", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 2f0464571..f8ea5928e 100644
--- a/index.html
+++ b/index.html
@@ -59,12 +59,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>17/06/2016</p>
+            <p>20/06/2016</p>
             <br>
             <ul>
-				<li>Ambition is dead! Long live Driven!</li>
+				<li>Probability Calculator updated for JPN</li>
                 <br>
 				<li>Added New Colosseum Previews</li>
+                <li>And Secret Coby Preview</li>
                 <br>
                 <li>Updated Global Flags</li>
                 <li>And Global Gan Fall (Ganfor) Drops</li>
diff --git a/probability/js/controllers.js b/probability/js/controllers.js
index 99e953669..5c50d2282 100644
--- a/probability/js/controllers.js
+++ b/probability/js/controllers.js
@@ -17,6 +17,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
     $scope.copies = null;
 	$scope.slots = null;
 	$scope.specialEvent = false;
+    $scope.jpnVersion = false;
 	
 	$scope.specialProbabilityProgress = 0;
 	$scope.specialProbabilityProgressBar = null;
@@ -30,7 +31,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 			return;
 		}
 		$scope.isSpecialReady = false;
-		var data = {copies: $scope.copies, skillups: $scope.skillups, special_event: $scope.specialEvent};
+		var data = {copies: $scope.copies, skillups: $scope.skillups, special_event: $scope.specialEvent, jpn_server: $scope.jpnVersion};
 		SpecialProbability.compute(data).then(
 			function(data) {
                 console.log(data);
diff --git a/probability/js/specialprobability.js b/probability/js/specialprobability.js
index d63a93ef5..68745bb6a 100644
--- a/probability/js/specialprobability.js
+++ b/probability/js/specialprobability.js
@@ -4,10 +4,14 @@ onmessage = function(e) {
 	var skillups = parseInt(e.data.skillups);
 	
 	var probability = 0.125;
+    if (e.data.jpn_server == true) {
+		probability = .2;
+	}
 	// if special event selected probability is doubled
 	if (e.data.special_event == true) {
 		probability *= 2;
 	}
+    
 	
 	var prob = 0;
 	var result = 0;
diff --git a/probability/views/main.html b/probability/views/main.html
index a4e662fe7..cd8a62fe8 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -28,11 +28,14 @@ <h1 class="page-header">
 			<div id="calculation-area">
 				
 				<div class="small-container">
+                    <label><input type="checkbox" ng-model="specialEvent" ng-change="changeBaseValues()">Special x2 Event </label>
+                    &nbsp; &nbsp;
+                    <label><input type="checkbox" ng-model="jpnVersion" ng-change="changeBaseValues()">Japanese Version</label>
+                    <p></p>
 					Copies/Books: <input type="text" class="number-field" ng-model="copies" placeholder="e.g. 65" auto-focus
 						ng-change="changeBaseValues()" id="copies">
 					Skillups: <input type="text" class="number-field" ng-model="skillups" placeholder="e.g. 10" auto-focus
 						ng-change="changeBaseValues()" id="skillups">
-					<label><input type="checkbox" ng-model="specialEvent" ng-change="changeBaseValues()">Special x2 Event</label>
 					
 				</div>
 				

From 4fda8d099c49640d3e859f03404657fb1cd371f5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 21 Jun 2016 11:53:47 +0200
Subject: [PATCH 0449/1569] Coby Update + Lots of Bug fixes

---
 common/data/cooldowns.js            | 12 +++++++-----
 common/data/details.js              | 22 ++++++++++++++++------
 common/data/drops.js                |  9 ++++++---
 common/data/effects.js              |  3 +--
 common/data/evolutions.js           |  4 ++++
 common/data/specials.js             |  4 ++--
 common/data/units.js                | 12 +++++-------
 common/js/nonSuspicious.js          |  2 +-
 index.html                          |  5 ++++-
 probability/js/controllers.js       |  5 ++---
 probability/js/socketprobability.js |  1 -
 11 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 32b6ee34b..10d939e76 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1074,12 +1074,12 @@ window.cooldowns = [
 	[ 15, 6 ],
 	17,
 	17,
-	null, //Leo
-	null, //Leo
+	[ 20, 16 ], //Leo
+	[ 20, 16 ], //Leo
 	null, //Mansherry
 	null, //Mansherry
-	18,
-	18,
+	[ 18, 12 ],
+	[ 18, 12 ],
 	23,
 	23,
 	24,
@@ -1096,5 +1096,7 @@ window.cooldowns = [
 	24,
 	[ 20, 11 ],
 	[ 20, 11 ],
-	[ 13, 8 ]
+	[ 13, 8 ],
+    [ 11, 11 ],
+    [ 11, 11 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 39fd31da4..850aa3c49 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3630,7 +3630,7 @@ window.details = {
 	},
 	812: {
 		specialName: "Hell Howl",
-		special: "Sharply decreases the defense of all enemies for 1 turn"
+		special: "Sharply reduces the defense of all enemies for 1 turn"
 	},
 	813: {
 		specialName: "Sticky Spider Net",
@@ -5181,11 +5181,11 @@ window.details = {
 		special: [
 			{
 				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 10%",
-				"cooldown": 16
+				"cooldown": [ 16, 12]
 			},
 			{
 				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20%",
-				"cooldown": 20
+				"cooldown": [ 20, 16 ]
 			}
 		],
 		specialNotes: "#{stages}",
@@ -5196,11 +5196,11 @@ window.details = {
 		special: [
 			{
 				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 10%",
-				"cooldown": 16
+				"cooldown": [ 16, 12]
 			},
 			{
 				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20%",
-				"cooldown": 20
+				"cooldown": [ 20, 16 ]
 			}
 		],
 		specialNotes: "#{stages}",
@@ -5296,7 +5296,7 @@ window.details = {
 		specialName: "Seven Stars Sword of Darkness"
 	},
 	1089: {
-		captain: "Boosts ATK of Slasher characters by 2x and the HP of Driven characters by 1.75x",
+		captain: "Boosts ATK of Slasher characters by 2x and boosts HP of Driven characters by 1.75x",
 		captainNotes: "Slasher + Driven characters gain ATK AND HP",
 		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
 		specialName: "Seven Stars Sword of Darkness"
@@ -5347,5 +5347,15 @@ window.details = {
         captain: "Boosts chain multiplier by 2x",
         special: "Randomizes all orbs including [BLOCK] orbs and switches orbs between slots once.",
 		specialName: "Mutation-Induced Thunder"
+    },
+    1099: {
+        captain: "Boosts ATK of Fighter characters by 2x",
+        special: "Changes Bad orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
+        specialName: "\"To the End of the Clouds\""
+    },
+    1100: {
+        captain: "Boosts ATK of Fighter characters by 2.25x and their RCV by 1.2x",
+        special: "Changes Bad orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
+        specialName: "\"To the End of the Clouds\""
     }
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index a3b5bf3ed..2647cc99e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -873,8 +873,8 @@ window.drops = {
             thumb: 688,
             global: true,
             condition: 'Bomb orbs appear',
-            "Japan": [ 687, 689, -542, -524, -528, -429, -428, -401, -365, -218 ],
-            "Global": [ 687, 689, -542, -645, -647, -429, -428, -401, -365, -218 ]
+            "Japan": [ 687, 689, -542, -524, -528, -429, -428, -402, -365, -218 ],
+            "Global": [ 687, 689, -542, -645, -647, -429, -428, -402, -365, -218 ]
         },
 
         {
@@ -1238,7 +1238,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1090, 1101, 1103, 1105 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105 ]
         }
 
    ]
@@ -1254,10 +1254,13 @@ var bonuses = [
     { type: 'drop'    , x: 6 , y: 8  },
     { type: 'drop'    , x: 6 , y: 15 },
     { type: 'drop'    , x: 6 , y: 22 },
+    { type: 'drop'    , x: 0 , y: 24 },
+    { type: 'drop'    , x: 5 , y: 24 },
     { type: 'beli'    , x: 6 , y: 3  },
     { type: 'beli'    , x: 1 , y: 4  },
     { type: 'beli'    , x: 6 , y: 10 },
     { type: 'beli'    , x: 6 , y: 17 },
+    { type: 'beli'    , x: 6 , y: 24 },
     { type: 'exp'     , x: 2 , y: 2  },
     { type: 'exp'     , x: 6 , y: 2  },
     { type: 'exp'     , x: 5 , y: 5, stop: 5 },
diff --git a/common/data/effects.js b/common/data/effects.js
index 981c93f30..6275db009 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -267,7 +267,7 @@ window.effects = {
         description: 'STR/DEX/QCK ATK 1.6x and HP 0.1x. INT/PSY ATK 0.2x and HP 2x',
         thumb: null,
         id: 31,
-        atk: function(p) { console.log(p); return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 0.2; },
+        atk: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 0.2; },
         hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 0.1 : 2.0; }
         
     },
@@ -324,7 +324,6 @@ window.effects = {
                             if(p.class.constructor === String){
                                 if(!(p.class.has('Driven') || p.class.has('Powerhouse'))){ boost5 = 0.5}
                             }
-                            console.log("1:" +boost1 + " 2: "+boost2+" 3: "+boost3+" 4: "+boost4);
                             return 1*boost1*boost2*boost3*boost4*boost5; 
                         },
         hp: function(p) {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 724ea1080..880c6264a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1651,6 +1651,10 @@ window.evolutions = {
         evolution: 1097,
         evolvers: [ 117, 82, 82, 99, 104]
     },
+    1099: {
+        evolution: 1100,
+        evolvers: [ 117, 91, 92, 97, 98 ]
+    },
     1101: {
         evolution: 1102,
         evolvers: []
diff --git a/common/data/specials.js b/common/data/specials.js
index 055d4f5c8..8aa15507a 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1324,7 +1324,7 @@ window.specials = {
         atk: function(p) {
             if(p.percHP >= 70.0){
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
-            }else if(p.percHP >= 20.0){
+            }else if(p.percHP >= 30.0){
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.5 : 1;
             }else{
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
@@ -1336,7 +1336,7 @@ window.specials = {
         atk: function(p) {
             if(p.percHP >= 70.0){
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
-            }else if(p.percHP >= 20.0){
+            }else if(p.percHP >= 30.0){
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.5 : 1;
             }else{
                 return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
diff --git a/common/data/units.js b/common/data/units.js
index 2b6bba552..e1a3dfae7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1090,23 +1090,21 @@ window.units = [
     [ "Saga, Cursed Holy Sword", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, 1 ],
     [ "X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 545, 220, 52, 1353, 693, 179, 1 ],
     [ "\"Red Flag\" X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
-    [ "Rebecca, Parasol Rhytm", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, null, 462, 130, 328, null, null, null, null ],
-    [ "Rebecca, Rainbow Melody", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, null, 400, 93, 262, null, null, null, null ],
+    [ "Rebecca, Parasol Rhytm", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, 90778, 59, 14, 79, 462, 130, 328, 1 ],
+    [ "Rebecca, Rainbow Melody", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, 1066998, 400, 93, 262, 896, 300, 505, 1 ],
     [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, 392109, 66, 36, 41, 965, 497, 209, 1 ],
     [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 2, 99, 3000000, 903, 432, 163, 1796, 911, 352, 1 ],
     [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 121, 47, 5, 1323, 520, 59, 1 ],
     [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1271, 467, 30, 2302, 980, 92, 1 ],
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
-    [],
-    [],
+    [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, null, null, null, 151, 84, 57, null ],
+    [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 897, 429, 134, null, null, null, null ],
     [ "Colosseum Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Zephyr Evolution", "STR", [ "Fighter", "Driven" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Ain", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Ain Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Colosseum Binz", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Secret Coby", "DEX", [ "Fighter", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Secret Coby Evolution", "DEX", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 2cb9fe462..cb68a76e2 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1054, 1087, 1089, 1091, 1095, 1097, 1098 ];
+    var newUnits = [ 1087, 1089, 1091, 1095, 1097, 1098, 1093 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index f8ea5928e..669acdba1 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>20/06/2016</p>
+            <p>21/06/2016</p>
             <br>
             <ul>
 				<li>Probability Calculator updated for JPN</li>
@@ -67,6 +67,9 @@
 				<li>Added New Colosseum Previews</li>
                 <li>And Secret Coby Preview</li>
                 <br>
+                <li>Fixed Drop Bonus for Amazon Lily</li>
+                <li>Loads of other Fixes</li>
+                <br>
                 <li>Updated Global Flags</li>
                 <li>And Global Gan Fall (Ganfor) Drops</li>
                 <br>
diff --git a/probability/js/controllers.js b/probability/js/controllers.js
index 5c50d2282..23e2492f5 100644
--- a/probability/js/controllers.js
+++ b/probability/js/controllers.js
@@ -34,7 +34,6 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 		var data = {copies: $scope.copies, skillups: $scope.skillups, special_event: $scope.specialEvent, jpn_server: $scope.jpnVersion};
 		SpecialProbability.compute(data).then(
 			function(data) {
-                console.log(data);
 				if (data.finished == true) {
 					if (data.result >= 0.6) {
 						$scope.specialProbabilityColor = "green";
@@ -71,7 +70,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 		// create slot array
 		var slots = Array.apply(null, Array($scope.slots)).map(function (x) { return 0; });;
 		for (i = 0; i < $scope.character.slots.length; ++i) {
-			console.log($scope.character.slots[i]);
+			//console.log($scope.character.slots[i]);
 			var obj = $scope.character.slots[i];
 			if (obj != null) {
 				slots[i] = obj.level;
@@ -91,7 +90,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 						$scope.socketProbabilityColor = "red";
 					}
 					$scope.socketProbabilityResult = Math.min((data.result * 100),99.9).toFixed(1);
-                    console.log($scope.socketProbabilityResult);
+                    //console.log($scope.socketProbabilityResult);
 					$scope.socketProbabilityProgressBar = "Complete";
 					$scope.isSocketReady = true;
 				} 
diff --git a/probability/js/socketprobability.js b/probability/js/socketprobability.js
index 7f0479116..0eabb105f 100644
--- a/probability/js/socketprobability.js
+++ b/probability/js/socketprobability.js
@@ -4,7 +4,6 @@ onmessage = function(e) {
 	var slots = e.data.slots;
 	var temp = slots.slice(0);
 
-	console.log(slots);
 	
 	var approximationLimit = 500000;
 	var domain = 10;

From 9c5a10291a8a746bb280eeef3fa396266f2c4bb8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 22 Jun 2016 03:08:17 -0500
Subject: [PATCH 0450/1569] Colo Unit Stats

---
 common/data/cooldowns.js | 10 ++++++-
 common/data/details.js   | 60 +++++++++++++++++++++++++++++++++++++++-
 common/data/families.js  |  8 ++----
 common/data/units.js     | 11 ++++----
 4 files changed, 77 insertions(+), 12 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 10d939e76..fd34f636b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1098,5 +1098,13 @@ window.cooldowns = [
 	[ 20, 11 ],
 	[ 13, 8 ],
     [ 11, 11 ],
-    [ 11, 11 ]
+    [ 11, 11 ],
+	null,
+	null,
+	30,
+	30,
+	null,//Ain
+	null,//Ain
+	23,
+	23
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 850aa3c49..c0084d778 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5357,5 +5357,63 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.25x and their RCV by 1.2x",
         special: "Changes Bad orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
         specialName: "\"To the End of the Clouds\""
-    }
+    },
+	1101: {
+        captain: "Boosts ATK of all characters by 2.25x until the first hit other than Perfect. Reduces crew's current HP at the end of each turn",
+        special: "Reduces crew's current HP by 80%, deals 10x the amount of HP subtracted in typeless damage to one enemy. Boosts ATK of [STR] and [INT] characters by 1.75x for 1 turn",
+        specialName: "Colosseum Zephyr Special"
+    },
+	1102: {
+        captain: "Boosts ATK of all characters by 2.75x until the first hit other than Perfect. Reduces crew's current HP at the end of each turn",
+        special: "Reduces crew's current HP by 80%, deals 10x the amount of HP subtracted in typeless damage to one enemy. Boosts ATK of [STR] and [INT] characters by 1.75x for 1 turn",
+        specialName: "Colosseum Zephyr Special"
+    },
+	1103: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+        		special: [
+			{
+				"description": "Recovers 12% of crew's MAX HP",
+				"cooldown": 21
+			},
+			{
+				"description": "Recovers 24% of crew's MAX HP",
+				"cooldown": 24
+			},
+			{
+				"description": "Recovers 36% of crew's MAX HP",
+				"cooldown": 27
+			},
+		],
+		specialNotes: "#{stages}",
+        specialName: "Colosseum Ain Special"
+    },
+	1104: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
+        		special: [
+			{
+				"description": "Recovers 12% of crew's MAX HP",
+				"cooldown": 21
+			},
+			{
+				"description": "Recovers 24% of crew's MAX HP",
+				"cooldown": 24
+			},
+			{
+				"description": "Recovers 36% of crew's MAX HP",
+				"cooldown": 27
+			},
+		],
+		specialNotes: "#{stages}",
+        specialName: "Colosseum Ain Special"
+    },
+	1105: {
+        captain: "Boosts ATK of Striker and Free Spirit characters by 1.5x, deals 2x character's ATK in [STR] damage to all enemies at the end of each turn",
+        special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
+        specialName: "Colosseum Binz Special"
+    },
+	1106: {
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2x, deals 2x character's ATK in [STR] damage to all enemies at the end of each turn",
+        special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
+        specialName: "Colosseum Binz Special"
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 647029dd9..e11f9246b 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1097,14 +1097,12 @@ window.families = [
     "Scarlet",
     "Scarlet",
     "Billy",
-    null,
-    null,
+    "Coby",
+    "Coby",
     "Zephyr",
     "Zephyr",
     "Ain",
     "Ain",
     "Binz",
-    "Binz",
-    "Coby",
-    "Coby"
+    "Binz"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index e1a3dfae7..d68241e7a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1099,12 +1099,13 @@ window.units = [
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
     [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, null, null, null, 151, 84, 57, null ],
     [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 897, 429, 134, null, null, null, null ],
-    [ "Colosseum Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Zephyr Evolution", "STR", [ "Fighter", "Driven" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Ain", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Ain Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Colosseum Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, null, null, null, null, 1384, 822, 0, null ],
+    [ "Colosseum Zephyr Evolution", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, null, 1318, 749, 0, null, null, null, null ],
+    [ "Colosseum Ain", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, null ],
+    [ "Colosseum Ain Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, null, null, null, null ],
     [ "Colosseum Binz", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
+// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, PictureOnline ]

From 01fc0916f8f4aea1861bd844671b076496140c77 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 22 Jun 2016 13:06:15 -0500
Subject: [PATCH 0451/1569] Colo Units Updated

More
---
 common/data/captains.js  | 33 +++++++++++++++++++++++++++++++++
 common/data/cooldowns.js |  8 ++++----
 common/data/details.js   | 18 +++++++++---------
 common/data/specials.js  | 22 +++++++++++++++++++++-
 common/data/units.js     | 12 ++++++------
 5 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index af01aebf7..2d93ab7b3 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2727,5 +2727,38 @@ window.captains = {
     },
     1098: {
         chainModifier: function(p) { return 2; }
+    },
+    1099: {
+        atk: function(p) { return p.class.has('Fighter') ? 2.0 : 1.0; }
+    },
+    1100: {
+        atk: function(p) { return p.class.has('Fighter') ? 2.25 : 1.0; },
+        rcv: function(p) { return p.class.has('Fighter') ? 1.2 : 1.0; }
+    },
+    1101: {
+		hitAtk: function(p) {
+			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.25 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+    1102: {
+		hitAtk: function(p) {
+			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+    1103: {
+        atk: function(p) { return p.class.has('Cerebral') ? 1.5 : 1.0; },
+        rcv: function(p) { return p.class.has('Cerebral') ? 1.5 : 1.0; }
+    },
+    1104: {
+        atk: function(p) { return p.class.has('Cerebral') ? 1.75 : 1.0; },
+        rcv: function(p) { return p.class.has('Cerebral') ? 1.75 : 1.0; }
+    },
+    1105: {
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1106: {
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fd34f636b..2b248e84e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1101,10 +1101,10 @@ window.cooldowns = [
     [ 11, 11 ],
 	null,
 	null,
-	30,
-	30,
+	[ 30, 15 ],
+	[ 30, 15 ],
 	null,//Ain
 	null,//Ain
-	23,
-	23
+	[ 23, 12 ],
+    [ 23, 12 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index c0084d778..35af4772c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5359,14 +5359,14 @@ window.details = {
         specialName: "\"To the End of the Clouds\""
     },
 	1101: {
-        captain: "Boosts ATK of all characters by 2.25x until the first hit other than Perfect. Reduces crew's current HP at the end of each turn",
+        captain: "Boosts ATK of all characters by 2.25x until the first hit other than Perfect. Reduces crew's current HP by 10% at the end of each turn",
         special: "Reduces crew's current HP by 80%, deals 10x the amount of HP subtracted in typeless damage to one enemy. Boosts ATK of [STR] and [INT] characters by 1.75x for 1 turn",
-        specialName: "Colosseum Zephyr Special"
+        specialName: "Black Arm's Last Impact"
     },
 	1102: {
-        captain: "Boosts ATK of all characters by 2.75x until the first hit other than Perfect. Reduces crew's current HP at the end of each turn",
+        captain: "Boosts ATK of all characters by 2.75x until the first hit other than Perfect. Reduces crew's current HP by 10% at the end of each turn",
         special: "Reduces crew's current HP by 80%, deals 10x the amount of HP subtracted in typeless damage to one enemy. Boosts ATK of [STR] and [INT] characters by 1.75x for 1 turn",
-        specialName: "Colosseum Zephyr Special"
+        specialName: "Black Arm's Last Impact"
     },
 	1103: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
@@ -5385,7 +5385,7 @@ window.details = {
 			},
 		],
 		specialNotes: "#{stages}",
-        specialName: "Colosseum Ain Special"
+        specialName: "Return Return Fruit"
     },
 	1104: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
@@ -5404,16 +5404,16 @@ window.details = {
 			},
 		],
 		specialNotes: "#{stages}",
-        specialName: "Colosseum Ain Special"
+        specialName: "Return Return Fruit"
     },
 	1105: {
         captain: "Boosts ATK of Striker and Free Spirit characters by 1.5x, deals 2x character's ATK in [STR] damage to all enemies at the end of each turn",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
-        specialName: "Colosseum Binz Special"
+        specialName: "Mosa Mosa Dance"
     },
 	1106: {
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x, deals 2x character's ATK in [STR] damage to all enemies at the end of each turn",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
-        specialName: "Colosseum Binz Special"
-    },
+        specialName: "Mosa Mosa Dance"
+    }
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 8aa15507a..9d51af398 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1365,5 +1365,25 @@ window.specials = {
     1097: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
 		type: "type"
-    }
+    },
+    1099: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1100: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1101: {
+		atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
+		type: "type"
+    },
+    1102: {
+		atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
+		type: "type"
+    },
+    1105: {
+        chainAddition: function(p){ return 0.2;}
+    },
+    1105: {
+        chainAddition: function(p){ return 0.2;}
+    },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index d68241e7a..91530ff8d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1099,12 +1099,12 @@ window.units = [
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
     [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, null, null, null, 151, 84, 57, null ],
     [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 897, 429, 134, null, null, null, null ],
-    [ "Colosseum Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, null, null, null, null, 1384, 822, 0, null ],
-    [ "Colosseum Zephyr Evolution", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, null, 1318, 749, 0, null, null, null, null ],
-    [ "Colosseum Ain", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, null ],
-    [ "Colosseum Ain Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, null, null, null, null ],
-    [ "Colosseum Binz", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Colosseum Binz Evolution", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, null, null, null, null ]
+    [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, null, 545, 404, 0, 1384, 822, 0, null ],
+    [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, null, 1318, 749, 0, null, null, null, null ],
+    [ "Ain, NEO Marines", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, null ],
+    [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, null, null, null, null ],
+    [ "Binz, NEO Marines", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 80ea2e4546990548bb7e44d7abc7022beaa14c70 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 23 Jun 2016 09:30:00 -0500
Subject: [PATCH 0452/1569] shiki preview

and small changes
---
 common/data/aliases.js  |  4 ++--
 common/data/captains.js |  2 +-
 common/data/details.js  | 16 ++++++++--------
 common/data/effects.js  | 10 +++++++++-
 common/data/units.js    |  8 +++++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 97341e1f3..3faecf15b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -710,8 +710,8 @@ window.aliases = {
     709: ['ニコ・ロビン 麦わらの一味',''],
     710: ['フランキー 航海の記録・麦わらの一味','', 'Log Franky' ],
     711: ['フランキー 航海の夢「海の果てを旅する船」','', 'Log Franky' ],
-    712: ['ガン・フォール',''],
-    713: ['ガン・フォール 空の騎士',''],
+    712: ['ガン・フォール','','Gan Fall'],
+    713: ['ガン・フォール 空の騎士','','Gan Fall the Knight of the Sky'],
     714: ['ピエール',''],
     715: ['コニス',''],
     716: ['コニス スカイピアの少女',''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 2d93ab7b3..b44473b25 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1,6 +1,6 @@
 window.captains = {
 	2: {
-		atk: function(p){ return p.unit.type == "STR" ? 1.5 : 1; }
+		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
 	},
 	3: {
 		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
diff --git a/common/data/details.js b/common/data/details.js
index 35af4772c..9ee625223 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5370,18 +5370,18 @@ window.details = {
     },
 	1103: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
-        		special: [
+        special: [
 			{
 				"description": "Recovers 12% of crew's MAX HP",
-				"cooldown": 21
+				"cooldown": [ 21, 11 ]
 			},
 			{
 				"description": "Recovers 24% of crew's MAX HP",
-				"cooldown": 24
+				"cooldown": [ 24, 14 ]
 			},
 			{
 				"description": "Recovers 36% of crew's MAX HP",
-				"cooldown": 27
+				"cooldown": [ 27, 17 ]
 			},
 		],
 		specialNotes: "#{stages}",
@@ -5389,18 +5389,18 @@ window.details = {
     },
 	1104: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
-        		special: [
+        special: [
 			{
 				"description": "Recovers 12% of crew's MAX HP",
-				"cooldown": 21
+				"cooldown": [ 21, 11 ]
 			},
 			{
 				"description": "Recovers 24% of crew's MAX HP",
-				"cooldown": 24
+				"cooldown": [ 24, 14 ]
 			},
 			{
 				"description": "Recovers 36% of crew's MAX HP",
-				"cooldown": 27
+				"cooldown": [ 27, 17 ]
 			},
 		],
 		specialNotes: "#{stages}",
diff --git a/common/data/effects.js b/common/data/effects.js
index 6275db009..6ec971244 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -338,6 +338,14 @@ window.effects = {
                             }
                             return 1*boost1*boost2*boost3*boost4*boost5;
                         }
-    }
+    },
+    
+    'Colosseum Tashigi': {
+        description: '25 hit barrier and 2x chain limit',
+        thumb: null,
+        id: 38,
+        comboShield: 25,
+        chainLimiter: function() { return 2.0; }
+    },
 
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 91530ff8d..7039bc5bb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -710,8 +710,8 @@ window.units = [
 	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
 	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
 	[ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],
-	[ "Gan Fall", "QCK", "Striker", 3, 12, 6, 1, 50, 392109, 80, 40, 48, 930, 452, 185, 1.5 ],
-	[ "Gan Fall the Knight of the Sky", "QCK", "Striker", 4, 20, 4, 2, 99, 3000000, 884, 401, 151, 1704, 1202, 300, 1.5 ],
+	[ "Ganfor", "QCK", "Striker", 3, 12, 6, 1, 50, 392109, 80, 40, 48, 930, 452, 185, 1.5 ],
+	[ "Sky Knight Ganfor", "QCK", "Striker", 4, 20, 4, 2, 99, 3000000, 884, 401, 151, 1704, 1202, 300, 1.5 ],
 	[ "Pierre", "DEX", "Fighter", 3, 12, 4, 1, 50, 392109, 69, 32, 38, 920, 480, 182, 1 ],
 	[ "Konis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
 	[ "Konis, Skypiean Maiden", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
@@ -1104,7 +1104,9 @@ window.units = [
     [ "Ain, NEO Marines", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, null ],
     [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, null, null, null, null ],
     [ "Binz, NEO Marines", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, null, null, null, null ]
+    [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, null, null, null, null ],
+    [ "Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shiki Evolved", "STR", [ "Driven", "Slasher" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From dbc99f8287f5ad16f981725e24680bd390951f26 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 23 Jun 2016 13:21:31 -0500
Subject: [PATCH 0453/1569] max stats

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 7039bc5bb..a3d1f39dd 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1100,11 +1100,11 @@ window.units = [
     [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, null, null, null, 151, 84, 57, null ],
     [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 897, 429, 134, null, null, null, null ],
     [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, null, 545, 404, 0, 1384, 822, 0, null ],
-    [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, null, 1318, 749, 0, null, null, null, null ],
+    [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, null, 1318, 749, 0, 2620, 1500, 0, null ],
     [ "Ain, NEO Marines", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, null ],
-    [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, null, null, null, null ],
+    [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, 1986, 870, 357, null ],
     [ "Binz, NEO Marines", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, null, null, null, null ],
+    [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, 2107, 1042, 280, null ],
     [ "Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Shiki Evolved", "STR", [ "Driven", "Slasher" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ]
 	];

From d52999bc4116f13c9d6a63f1f1ea274fe6372074 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 24 Jun 2016 00:20:58 -0500
Subject: [PATCH 0454/1569] Shiki

updated
---
 common/data/cooldowns.js |  4 +++-
 common/data/details.js   | 12 +++++++++++-
 common/data/families.js  |  4 +++-
 common/data/flags.js     |  3 +++
 common/data/units.js     |  4 ++--
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 2b248e84e..1bef3e755 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1106,5 +1106,7 @@ window.cooldowns = [
 	null,//Ain
 	null,//Ain
 	[ 23, 12 ],
-    [ 23, 12 ]
+    [ 23, 12 ],
+	30,
+	30
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 9ee625223..cef8481b4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5415,5 +5415,15 @@ window.details = {
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x, deals 2x character's ATK in [STR] damage to all enemies at the end of each turn",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
         specialName: "Mosa Mosa Dance"
-    }
+    },
+	1107: {
+		captain: "Boosts ATK and HP of Driven characters by 1.5x",
+        special: "Deals severe Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        specialName: "Shiki Special"
+	},
+	1108: {
+		captain: "Boosts ATK and HP of Driven characters by 2x",
+        special: "Deals severe Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        specialName: "Shiki Special"
+	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index e11f9246b..adbb86a3f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1104,5 +1104,7 @@ window.families = [
     "Ain",
     "Ain",
     "Binz",
-    "Binz"
+    "Binz",
+	"Shiki",
+	"Shiki"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index d998ef66c..899f21c5c 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -646,6 +646,9 @@ window.flags = {
 	649: { rr: 1, rro: 1, global: 1 },
 	650: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	651: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	652: { global: 1 },
+	653: { global: 1 },
+	654: { global: 1 },
     655: { global: 1},
     656: { global: 1},
     657: { global: 1},
diff --git a/common/data/units.js b/common/data/units.js
index a3d1f39dd..b8f4dd487 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1105,8 +1105,8 @@ window.units = [
     [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, 1986, 870, 357, null ],
     [ "Binz, NEO Marines", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, 2107, 1042, 280, null ],
-    [ "Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Shiki Evolved", "STR", [ "Driven", "Slasher" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, null, 244, 164, 39, null, null, null, null ],
+    [ "Shiki Evolved", "STR", [ "Driven", "Slasher" ], 5, 50, null, 3, 99, null, null, null, null, 2424, 1407, 292, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From f0356db815980a6648457c0fdaec689099a9e5f0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 24 Jun 2016 01:06:50 -0500
Subject: [PATCH 0455/1569] wrong flags

---
 common/data/flags.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 899f21c5c..bed8ff976 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -877,6 +877,6 @@ window.flags = {
     1083: { rr: 1, rro: 1 },
     1084: { rr: 1, rro: 1 },
     1085: { rr: 1, rro: 1 },
-    1107: { rr: 1, rro: 1, lrr: 1 },
-    1108: { rr: 1, rro: 1, lrr: 1 }
+    1099: { rr: 1, rro: 1, lrr: 1 },
+    1100: { rr: 1, rro: 1, lrr: 1 }
 };
\ No newline at end of file

From 05ee0c15f8e18d4c6a391c0458675721a31c2773 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 24 Jun 2016 01:16:16 -0500
Subject: [PATCH 0456/1569] cooldowns

---
 common/data/cooldowns.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1bef3e755..f2985b638 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1099,8 +1099,6 @@ window.cooldowns = [
 	[ 13, 8 ],
     [ 11, 11 ],
     [ 11, 11 ],
-	null,
-	null,
 	[ 30, 15 ],
 	[ 30, 15 ],
 	null,//Ain

From 906c87ad25f2d1dd77e380847ec174f85b5d62cf Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 24 Jun 2016 12:33:55 +0200
Subject: [PATCH 0457/1569] Colo/Raid Complete, new SW Replacements

---
 common/data/aliases.js     | 92 +++++++++++++++++++++++++-------------
 common/data/captains.js    |  8 ++++
 common/data/cooldowns.js   |  8 ++--
 common/data/details.js     | 48 +++++++++++++++++---
 common/data/drops.js       |  8 +++-
 common/data/evolutions.js  | 26 ++++++++---
 common/data/specials.js    |  8 ++++
 common/data/units.js       | 27 +++++++----
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  6 +--
 10 files changed, 172 insertions(+), 61 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 3faecf15b..b4c8a87aa 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1038,37 +1038,37 @@ window.aliases = {
     1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
     1038: ['イナズマ 秘密の花園の乙女',''],
     1039: ['イナズマ 変革を画策する乙女',''],
-    1040: [ '', '' ],
-    1041: [ '', '' ],
-    1042: [ '', '' ],
-    1043: [ '', '' ],
-    1044: [ '', '' ],
-    1045: [ '', '' ],
-    1046: [ '', '' ],
-    1047: [ '', '' ],
-    1048: [ '', '' ],
-    1049: [ '', '' ],
-    1050: [ '', '' ],
-    1051: [ '', '' ],
-    1052: [ '', '' ],
-    1053: [ '', '' ],
-    1054: [ '', '' ],
-    1055: [ '', '' ],
-    1056: [ '', '' ],
-    1057: [ '', '' ],
-    1058: [ '', '' ],
-    1059: [ '', '' ],
-    1060: [ '', '' ],
-    1061: [ '', '' ],
-    1062: [ '', '' ],
-    1063: [ '', '' ],
-    1064: [ '', '' ],
-    1065: [ '', '' ],
-    1066: [ '', '' ],
-    1067: [ '', '' ],
-    1068: [ '', '' ],
-    1069: [ '', '', 'Shovel Guy' ],
-    1070: [ '', '', 'Shovel Guy' ],
+    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '' ],
+    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '' ],
+    1042: [ 'キラー キッド海賊団', '' ],
+    1043: [ '“殺戮武人”キラー キッド海賊団', '' ],
+    1044: [ 'トラファルガー・ロー 最悪の世代', '' ],
+    1045: [ 'トラファルガー・ロー 王下七武海', '' ],
+    1046: [ 'サボ 竜の爪', '' ],
+    1047: [ 'サボ 革命軍参謀総長', '' ],
+    1048: [ 'ニコ・オルビア', '' ],
+    1049: [ 'ニコ・オルビア オハラの考古学者', '' ],
+    1050: [ 'ハグワール・D・サウロ', '' ],
+    1051: [ 'ハグワール・D・サウロ 海軍本部中将', '' ],
+    1052: [ 'ニコ・ロビン オハラの少女', '' ],
+    1053: [ 'ヒナ おしとやかな優等生', '' ],
+    1054: [ 'ヒナ れいぎ正しい優等生', '' ],
+    1055: [ 'ボア・サンダーソニア', '' ],
+    1056: [ 'ボア・サンダーソニア 九蛇海賊団', '' ],
+    1057: [ 'ボア・マリーゴールド', '' ],
+    1058: [ 'ボア・マリーゴールド 九蛇海賊団', '' ],
+    1059: [ 'マーガレット 女戦士', '' ],
+    1060: [ 'マーガレット 九蛇の戦士', '' ],
+    1061: [ 'キキョウ', '' ],
+    1062: [ 'グロリオーサ', '' ],
+    1063: [ '破壊の女射手 九蛇の戦士', '' ],
+    1064: [ '謀略の女射手 九蛇の戦士', '' ],
+    1065: [ 'かしこい女剣士 九蛇の戦士', '' ],
+    1066: [ 'あかるい女剣士 九蛇の戦士', '' ],
+    1067: [ '熟練女格闘士 九蛇の戦士', '' ],
+    1068: [ '敏捷女格闘士 九蛇の戦士', '' ],
+    1069: [ 'シュライヤ・バスクード', '', 'Shovel Guy' ],
+    1070: [ 'シュライヤ・バスクード 海賊処刑人', '', 'Shovel Guy' ],
     1071: [ '', '' ],
     1072: [ '', '' ],
     1073: [ '', '' ],
@@ -1089,5 +1089,33 @@ window.aliases = {
     1088: [ '', '' ],
     1089: [ '', '' ],
     1090: [ '', '' ],
-    1091: [ '', '' ]
+    1091: [ '', '' ],
+    1092: [ '', '' ],
+    1093: [ '', '' ],
+    1094: [ '', '' ],
+    1095: [ '', '' ],
+    1096: [ '', '' ],
+    1097: [ '', '' ],
+    1098: [ '', '' ],
+    1099: [ '', '' ],
+    1100: [ '', '' ],
+    1101: [ '', '' ],
+    1102: [ '', '' ],
+    1103: [ '', '' ],
+    1104: [ '', '' ],
+    1105: [ '', '' ],
+    1106: [ '', '' ],
+    1107: [ '', '' ],
+    1108: [ '', '' ],
+    1109: [ '', '' ],
+    1110: [ '', '' ],
+    1111: [ '', '' ],
+    1112: [ '', '' ],
+    1113: [ '', '' ],
+    1114: [ '', '' ],
+    1115: [ '', '' ],
+    1116: [ '', '' ],
+    1117: [ '', '' ],
+    1118: [ '', '' ],
+    1119: [ '', '' ]
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index b44473b25..7560c6375 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2760,5 +2760,13 @@ window.captains = {
     },
     1106: {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1107: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    1108: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     }
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f2985b638..a90368b32 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1101,10 +1101,10 @@ window.cooldowns = [
     [ 11, 11 ],
 	[ 30, 15 ],
 	[ 30, 15 ],
-	null,//Ain
-	null,//Ain
+	[ 27, 17],//Ain
+	[ 27, 17],//Ain
 	[ 23, 12 ],
     [ 23, 12 ],
-	30,
-	30
+	[ 30, 15 ],
+	[ 30, 15 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index cef8481b4..c31ed9ba8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2147,13 +2147,13 @@ window.details = {
 	},
 	519: {
 		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
-		specialName: "Gum-Gum Gigant Thunder Axe",
+		specialName: "Gum-Gum Gigant Thor Axe",
 		specialNotes: "#{fixed}",
 		captain: "Boosts ATK of STR characters by 2x"
 	},
 	520: {
 		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
-		specialName: "Gum-Gum Gigant Thunder Axe",
+		specialName: "Gum-Gum Gigant Thor Axe",
 		specialNotes: "#{fixed}",
 		captain: "Boosts ATK of STR characters by 2.5x"
 	},
@@ -5418,12 +5418,48 @@ window.details = {
     },
 	1107: {
 		captain: "Boosts ATK and HP of Driven characters by 1.5x",
-        special: "Deals severe Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
-        specialName: "Shiki Special"
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        specialName: "Lion's Threat: Imperial Earth Bind"
 	},
 	1108: {
 		captain: "Boosts ATK and HP of Driven characters by 2x",
-        special: "Deals severe Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
-        specialName: "Shiki Special"
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        specialName: "Lion's Threat: Imperial Earth Bind"
+	},
+    1114: {
+		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
+		specialName: "Gum-Gum Gigant Axe",
+		specialNotes: "#{fixed}",
+		captain: "Boosts ATK of STR characters by 2x"
+	},
+	1115: {
+		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
+		specialName: "Gum-Gum Gigant Axe",
+		specialNotes: "#{fixed}",
+		captain: "Boosts ATK of STR characters by 2.5x"
+	},
+	1116: {
+		special: "Deals several times the character's ATK in INT damage to all enemies",
+		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
+		specialName: "Diable Jambe: Concassé",
+		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+	},
+	1117: {
+		special: "Deals several times the character's ATK in INT damage to all enemies",
+		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
+		specialName: "Diable Jambe: Concassé",
+		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+	},
+	1118: {
+		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
+		specialName: "10,000-Carat Smile",
+		specialNotes: "#{zombie}",
+		captain: "Boosts ATK and RCV of Striker characters by 1.5x"
+	},
+	1119: {
+		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
+		specialName: "10,000-Carat Smile",
+		specialNotes: "#{zombie}",
+		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x"
 	}
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 2647cc99e..12ab4e40c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1043,7 +1043,13 @@ window.drops = {
             condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
         },
-
+        
+        {
+            name: "Robin and Nami's Secret Undercover Investigation",
+            thumb: null,
+            condition: "None so far",
+            "All Difficulties": [ -23, -628, -639, -641, -892, -937, -939, -941 ]
+        }
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 880c6264a..0e5e3bbc0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1637,7 +1637,7 @@ window.evolutions = {
     },
     1090: {
         evolution: 1091,
-        evolvers: [ 118, 83, 89, 303, 103 ]
+        evolvers: [ 118, 83, 87, 303, 103 ]
     },
     1092: {
         evolution: 1093,
@@ -1656,15 +1656,31 @@ window.evolutions = {
         evolvers: [ 117, 91, 92, 97, 98 ]
     },
     1101: {
-        evolution: 1102,
-        evolvers: []
+        evolution: [1102, 1102],
+        evolvers: [ [118, 266, 300, 100, 104 ], [ 1103, 1105 ]]
     },
     1103: {
         evolution: 1104,
-        evolvers: []
+        evolvers: [ 117, 82, 88, 304, 104 ]
     },
     1105: {
         evolution: 1106,
-        evolvers: []
+        evolvers: [ 117, 80, 86, 97, 302 ]
     },
+    1107: {
+        evolution: 1108,
+        evolvers: [ 118, 84, 266, 300, 100 ]
+    },
+    1114: {
+		evolution: 1115,
+		evolvers: [ 118, 84, 95, 94, 100 ]
+	},
+	1116: {
+		evolution: 1117,
+		evolvers: [ 118, 83, 88, 94, 104 ]
+	},
+	1118: {
+		evolution: 1119,
+		evolvers: [ 118, 85, 96, 301, 101 ]
+	}
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 9d51af398..a6e8b1fe8 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1386,4 +1386,12 @@ window.specials = {
     1105: {
         chainAddition: function(p){ return 0.2;}
     },
+    1107: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
+    },
+    1108: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
+    }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b8f4dd487..9a639e519 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1099,14 +1099,25 @@ window.units = [
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
     [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, null, null, null, 151, 84, 57, null ],
     [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 897, 429, 134, null, null, null, null ],
-    [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, null, 545, 404, 0, 1384, 822, 0, null ],
-    [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, null, 1318, 749, 0, 2620, 1500, 0, null ],
-    [ "Ain, NEO Marines", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, null ],
-    [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, 1986, 870, 357, null ],
-    [ "Binz, NEO Marines", "DEX", [ "Striker", "Free Spirit" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1091, 484, 115, 2107, 1042, 280, null ],
-    [ "Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, null, 244, 164, 39, null, null, null, null ],
-    [ "Shiki Evolved", "STR", [ "Driven", "Slasher" ], 5, 50, null, 3, 99, null, null, null, null, 2424, 1407, 292, null ]
+    [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, 1066998, 545, 404, 0, 1384, 822, 0, 1 ],
+    [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1318, 749, 0, 2620, 1500, 0, 1 ],
+    [ "Ain, NEO Marines", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, 1 ],
+    [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, 1986, 870, 357, 1 ],
+    [ "Binz, NEO Marines", "DEX", [ "Striker", "Free Spirit" ], 4, 18, 4, 2, 50, 392109, 220, 122, 32, 1164, 541, 167, 1 ],
+    [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1091, 484, 115, 2107, 1042, 280, 1 ],
+    [ "Golden Lion Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, 1066998, 244, 164, 39, 1274, 709, 177, 1 ],
+    [ "Golden Lion Shiki, Golden Lion Pirates", "STR", [ "Driven", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1218, 638, 138, 2424, 1407, 292, 1 ],
+    [],
+    [],
+    [],
+    [],
+    [],
+    [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, null ],
+	[ "Monkey D. Luffy, Loyal Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, null ],
+	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, null ],
+	[ "Sanji, Loyal Strawhat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, null ],
+	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, null ],
+	[ "Sanji, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index cb68a76e2..5cf59a841 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1087, 1089, 1091, 1095, 1097, 1098, 1093 ];
+    var newUnits = [ 1097, 1093, 1102, 1104, 1106, 1108 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 669acdba1..93498fc41 100644
--- a/index.html
+++ b/index.html
@@ -64,11 +64,9 @@
             <ul>
 				<li>Probability Calculator updated for JPN</li>
                 <br>
-				<li>Added New Colosseum Previews</li>
-                <li>And Secret Coby Preview</li>
+				<li>Completed new Colo/Raid Units</li>
                 <br>
-                <li>Fixed Drop Bonus for Amazon Lily</li>
-                <li>Loads of other Fixes</li>
+                <li>Added First SW Replacement Units</li>
                 <br>
                 <li>Updated Global Flags</li>
                 <li>And Global Gan Fall (Ganfor) Drops</li>

From ad01578a759fc7857e234f46b7cd15f4029a6256 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 24 Jun 2016 12:46:49 +0200
Subject: [PATCH 0458/1569] SW Replacement CD/Families

---
 common/data/cooldowns.js | 13 ++++++++++++-
 common/data/families.js  | 13 ++++++++++++-
 common/data/units.js     |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a90368b32..a35f32eb6 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1106,5 +1106,16 @@ window.cooldowns = [
 	[ 23, 12 ],
     [ 23, 12 ],
 	[ 30, 15 ],
-	[ 30, 15 ]
+	[ 30, 15 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 25, 18 ],
+	[ 25, 18 ],
+	[ 23, 17 ],
+	[ 23, 17 ],
+	[ 23, 16 ],
+	[ 23, 16 ]
 ];
diff --git a/common/data/families.js b/common/data/families.js
index adbb86a3f..8a917b1cc 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1106,5 +1106,16 @@ window.families = [
     "Binz",
     "Binz",
 	"Shiki",
-	"Shiki"
+	"Shiki",
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Sanji",
+    "Sanji",
+    "Nami",
+    "Nami"
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 9a639e519..8bf6e908a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1117,7 +1117,7 @@ window.units = [
 	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, null ],
 	[ "Sanji, Loyal Strawhat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, null ],
 	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, null ],
-	[ "Sanji, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ]
+	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 8fed1a3380250dfb58779552771ca492c7e776dd Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 24 Jun 2016 13:06:37 +0200
Subject: [PATCH 0459/1569] Sugofest Preview

---
 common/data/evolutions.js | 26 +++++++++++++++++++++++++-
 common/data/units.js      | 16 +++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0e5e3bbc0..7b9b4dc09 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1682,5 +1682,29 @@ window.evolutions = {
 	1118: {
 		evolution: 1119,
 		evolvers: [ 118, 85, 96, 301, 101 ]
-	}
+	},
+    1122: {
+        evolution: 1123,
+        evolvers: []
+    },
+    1124: {
+        evolution: 1125,
+        evolvers: []
+    },
+    1126: {
+        evolution: 1127,
+        evolvers: []
+    },
+    1128: {
+        evolution: 1129,
+        evolvers: []
+    },
+    1130: {
+        evolution: 1131,
+        evolvers: []
+    },
+    1132: {
+        evolution: 1133,
+        evolvers: []
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 8bf6e908a..6a262055e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1117,7 +1117,21 @@ window.units = [
 	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, null ],
 	[ "Sanji, Loyal Strawhat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, null ],
 	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, null ],
-	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ]
+	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ],
+    [],
+    [],
+    [ "Unknown Legend", "QCK", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Legend Evolution", "QCK", [ "Slasher", "Driven" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "PSY", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character Evolution", "PSY", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "DEX", [ "Powerhouse", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character Evolution", "DEX", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "INT", [ "Slasher", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character Evolution", "INT", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "STR", [ "Powerhouse", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character Evolution", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character", "QCK", [ "Shooter", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Character Evolution", "QCK", [ "Shooter", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 6aef908f43ad8daf595cb77b9130f8ea4f920289 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 25 Jun 2016 23:57:34 +0200
Subject: [PATCH 0460/1569] Global Time

---
 drops/index.js | 3 ++-
 index.html     | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drops/index.js b/drops/index.js
index 0d0ac298d..ab178b2bc 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -238,7 +238,8 @@ mytime=setTimeout('updateTimes()',refresh)
 }
 
 function updateTimes(){
-    document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('America/Los_Angeles').format('H:mm:ss')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('H:mm:ss')+"</b>";
+    //Japan can also be Etc/GMT-9
+    document.getElementById("times").innerHTML = "Global: <b>"+moment().tz('Etc/GMT+8').format('H:mm:ss')+"</b> | Japan: <b>"+moment().tz('Asia/Tokyo').format('H:mm:ss')+"</b>";
     
     if(moment().tz('Asia/Tokyo').format('H')>12 && moment().tz('Asia/Tokyo').format('H')<23){
         document.getElementById("timesNote").innerHTML = "The Bonuses in the Japanese Version only last from 12:00 till 23:00<br><b>Japan Bonuses are currently active<b>";
diff --git a/index.html b/index.html
index 93498fc41..c8f7fbeb3 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>21/06/2016</p>
+            <p>25/06/2016</p>
             <br>
             <ul>
 				<li>Probability Calculator updated for JPN</li>
@@ -68,6 +68,8 @@
                 <br>
                 <li>Added First SW Replacement Units</li>
                 <br>
+                <li>Fixed Global Time</li>
+                <br>
                 <li>Updated Global Flags</li>
                 <li>And Global Gan Fall (Ganfor) Drops</li>
                 <br>

From 26715772432a73fcb226434f06a197e382f8aa5c Mon Sep 17 00:00:00 2001
From: lextic <dryges@gmail.com>
Date: Sun, 26 Jun 2016 10:11:00 +0100
Subject: [PATCH 0461/1569] fix for captains with 'hitModifiers' property

---
 common/data/captains.js | 23 ++++++++++++++++++++---
 damage/js/utils.js      | 26 ++++++++++++++++++++------
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 7560c6375..9555b712c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1457,7 +1457,7 @@ window.captains = {
 		rcv: function(p) { return p.percHP <= 30 ? 5 : 1; }
 	},
 	717: {
-		damageSorter: function(d) { return CrunchUtils.mihawkSort(d); },
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has('Slasher')) return 1;
 			var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
@@ -1466,7 +1466,7 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	718: {
-		damageSorter: function(d) { return CrunchUtils.mihawkSort(d); },
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has('Slasher')) return 1;
 			var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
@@ -1911,6 +1911,7 @@ window.captains = {
 		atk: function(p) { return 1.2; }
 	},
 	869: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Driven")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
@@ -1918,6 +1919,7 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	870: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Driven")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
@@ -1958,6 +1960,7 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
 	},
 	881: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Shooter", "Free Spirit" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2 : 1;
@@ -1965,6 +1968,7 @@ window.captains = {
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	882: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter", "Free Spirit" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
@@ -2004,6 +2008,7 @@ window.captains = {
 		chainModifier: function(p) { return 2; }
 	},
 	893: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Powerhouse")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
@@ -2012,6 +2017,7 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	894: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Driven")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
@@ -2246,6 +2252,7 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
 	},
 	950: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
@@ -2254,6 +2261,7 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
 	951: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
 		hitAtk: function(p) {
 			if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition)
@@ -2510,12 +2518,14 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
     },
     1036: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Free Spirit" ]); },
 		hitAtk: function(p) {
 			return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
     1037: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
 		hitAtk: function(p) {
 			return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
 		},
@@ -2544,6 +2554,7 @@ window.captains = {
         rcv: function(p) { return 0; }
     },
     1044: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
@@ -2551,6 +2562,7 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1045: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
@@ -2558,12 +2570,14 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1046: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
 		hitAtk: function(p) {
 			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
 		},
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
     1047: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
 		hitAtk: function(p) {
 			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
 		},
@@ -2666,6 +2680,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1083: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Striker", "Fighter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Striker") && !p.unit.class.has("Fighter")) return 1;
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1.5;
@@ -2714,12 +2729,14 @@ window.captains = {
         atk: function(p) { return p.class.has('Cerebral') ? 2.0 : 1.0; }
     },
     1096: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
         hitAtk: function(p) {
 			return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1097: {
+		damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Powerhouse" ]); },
         hitAtk: function(p) {
 			return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
 		},
@@ -2769,4 +2786,4 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     }
-};
\ No newline at end of file
+};
diff --git a/damage/js/utils.js b/damage/js/utils.js
index b8e3649cf..04f85e8bc 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -32,22 +32,36 @@ window.CrunchUtils.okamaSort = function(array, data) {
     else return [ temp.concat(that) ];
 };
     
-window.CrunchUtils.mihawkSort = function(array) {
+/* Sorts by class (units not belonging to the specified class(es) at the
+ * beginning), then by ATK. classMultiplier is the multiplier units belonging
+ * to the specified class(es) receive. */
+window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
     var result = [ ];
+    function isUnitAMatch(unit) {
+        for (var n = 0;n<classes.length;n++) {
+            if (unit.class.has(classes[n])) {
+                return true;
+            }
+        }
+        return false;
+    }
     // atk-based
     var temp = array.map(function(x) {
         var multiplier = x.multipliers.reduce(function(prev,next) { return prev * next[0]; },1);
-        return [ x.base * multiplier * (x.unit.unit.class.has("Slasher") ? 2.75 : 1), x ];
+        return [ x.base * multiplier * (isUnitAMatch(x.unit.unit) ? classMultiplier : 1), x ];
     });
     temp.sort(function(x,y) { return x[0] - y[0]; });
     result.push(temp.map(function(x) { return x[1]; }));
     // class-based
-    var nonSlashers = [ ], slashers = [ ];
+    var beginning = [ ], end = [ ];
     array.forEach(function(x) {
-        if (x.unit.unit.class.has("Slasher")) slashers.push(x);
-        else nonSlashers.push(x);
+        if (isUnitAMatch(x.unit.unit)) {
+            end.push(x);
+        } else {
+            beginning.push(x);
+        }
     });
-    result.push(nonSlashers.concat(slashers));
+    result.push(beginning.concat(end));
     // return result
     return result;
 };

From b6853c9db98c36dcdf39b0e798b887d4a40403ad Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 26 Jun 2016 12:02:24 +0200
Subject: [PATCH 0462/1569] Changelog

---
 index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index c8f7fbeb3..dad0343f9 100644
--- a/index.html
+++ b/index.html
@@ -68,7 +68,8 @@
                 <br>
                 <li>Added First SW Replacement Units</li>
                 <br>
-                <li>Fixed Global Time</li>
+                <li>Fixed Timing Captains Order</li>
+                <li>Huge thanks to lextic</li>
                 <br>
                 <li>Updated Global Flags</li>
                 <li>And Global Gan Fall (Ganfor) Drops</li>

From 59fa80a5ca7bd45cdaad6ea42928f41195e61849 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 26 Jun 2016 19:09:09 +0200
Subject: [PATCH 0463/1569] Pica Tag Improvement

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c31ed9ba8..aaefffe6b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4335,11 +4335,11 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
+				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
+				"description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 31, 17 ]
 			}
 		],
@@ -4350,11 +4350,11 @@ window.details = {
 		specialName: "Rock Domination Wall",
 		special: [
 			{
-				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 10%",
+				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
 				"cooldown": [ 25, 11 ]
 			},
 			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs to Matching. Cuts the current HP of all enemies by 20%",
+				"description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 31, 17 ]
 			}
 		],

From 6b57c9bd9edaee6f47c86986278d22d92c5c3004 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 26 Jun 2016 20:08:10 +0200
Subject: [PATCH 0464/1569] Beneficial Captain + More Orb matching

---
 characters/css/index.css    |  3 ++-
 characters/js/directives.js |  2 +-
 common/data/details.js      |  2 +-
 common/data/matchers.js     |  6 ++++++
 index.css                   | 36 ++++++++++++++++++++++++++++++++++++
 index.html                  | 14 ++++++--------
 6 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/characters/css/index.css b/characters/css/index.css
index 8d391cd7a..f7480dfee 100644
--- a/characters/css/index.css
+++ b/characters/css/index.css
@@ -134,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; }
@@ -326,7 +327,7 @@ input[type="text"] {
 }
 
 #controllers > span:not(.separator) {
-    width: 14.28%;
+    width: 9.09090909%;
     display: inline-block;
     padding: 2px 0;
     cursor: pointer;
diff --git a/characters/js/directives.js b/characters/js/directives.js
index ab7fcc927..e01d0132a 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -163,7 +163,7 @@ directives.addOrbOptions = function($timeout, $compile, MATCHER_IDS) {
             var filter = $('<div id="controllers" ng-class="{ enabled: filters.custom[' + TARGET + '] }">' +
                     '<span class="separator">&darr;</span></div>');
             var separator = filter.find('.separator');
-            [ 'STR', 'DEX', 'QCK', 'PSY', 'INT', 'RCV', 'TND' ].forEach(function(type) {
+            [ 'STR', 'DEX', 'QCK', 'PSY', 'INT', 'RCV', 'TND', 'BLOCK', 'EMPTY', 'BOMB', 'G' ].forEach(function(type) {
                 var template = '<span class="filter orb %s" ng-class="{ active: filters.%f.indexOf(\'%s\') > -1 }" ' +
                     'ng-model="filters.%f" ng-click="onOrbClick($event,\'%s\')">%S</span>';
                 separator.before($(template.replace(/%s/g,type).replace(/%S/g,type[0]).replace(/%f/g,'ctrlFrom')));
diff --git a/common/data/details.js b/common/data/details.js
index aaefffe6b..7ae80e723 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4199,7 +4199,7 @@ window.details = {
 	910: {
 		specialName: "Hero of Justice! Chopper Mask!!",
 		special: "Recovers 5,000 HP, boosts ATK of PSY characters by 1.5x for 2 turns",
-		captain: "Boosts ATK of PSY characters by 2x, their RCV by 1.5x, makes [INT] orbs \"beneficial\" to PSY characters",
+		captain: "Boosts ATK of PSY characters by 2x, their RCV by 1.5x, makes INT orbs \"beneficial\" to PSY characters",
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs."
 	},
 	911: {
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 95e6b80cf..407010299 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -80,6 +80,12 @@ window.matchers = [
         target: 'captain',
         matcher: /(after scoring|following a chain)/i
     },
+    
+    {
+        name: '"Beneficial" Orb captains',
+        target: 'captain',
+        matcher: /Makes ((STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\])|((STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\]) and (STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\]))) orbs "beneficial"/i
+    },
 
     {
         name: 'Chain multipliers',
diff --git a/index.css b/index.css
index 0914ea6c4..8439c709d 100644
--- a/index.css
+++ b/index.css
@@ -1,4 +1,15 @@
 
+@font-face {
+	font-family: 'icomoon';
+	src:url('../../res/icomoon.eot?xewvs9');
+	src:url('../../res/icomoon.eot?xewvs9#iefix') format('embedded-opentype'),
+		url('../../res/icomoon.ttf?xewvs9') format('truetype'),
+		url('../../res/icomoon.woff?xewvs9') format('woff'),
+		url('../../res/icomoon.svg?xewvs9#icomoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
 * {
      -moz-box-sizing: border-box;
      -o-box-sizing: border-box;
@@ -126,4 +137,29 @@ body {
     height: 40px;
     background-size: 40px 40px;
     margin: 1px;
+}
+
+.STR   { background: salmon; }
+.QCK   { background: lightskyblue; }
+.DEX   { background: lightgreen; }
+.PSY   { background: gold; }
+.INT   { background: orchid; }
+.RCV   { background: sandybrown; }
+.TND   { background: peru; }
+.BLOCK { background: darkslateblue; }
+.BOMB  { background: maroon; }
+.G     { background: orange; }
+.EMPTY { background: #777; }
+
+.block-icon:before {
+    font-style: normal;
+    font-weight: normal;
+    font-family: icomoon;
+    font-size: 11px;
+    position: relative;
+    top: 1px;
+}
+
+.block-icon:before {
+    content: "\e902";
 }
\ No newline at end of file
diff --git a/index.html b/index.html
index dad0343f9..79ffe8d3a 100644
--- a/index.html
+++ b/index.html
@@ -19,6 +19,8 @@
 
     <head>
         <title>OPTC Database</title>
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/font-awesome.min.css">
+        <link rel="stylesheet" type="text/css" href="../common/libs/css/datatables.min.css">
         <link rel="stylesheet" type="text/css" href="common/libs/css/animate.css" />
         <link rel="stylesheet" type="text/css" href="common/libs/css/font-awesome.min.css" />
         <link rel="stylesheet" type="text/css" href="index.css" />
@@ -59,21 +61,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>25/06/2016</p>
+            <p>26/06/2016</p>
             <br>
             <ul>
-				<li>Probability Calculator updated for JPN</li>
+				<li>Added <span class="badge BOMB"><i class="fa fa-bomb"></i> BOMB</span> <span class="badge BLOCK"><i class="block-icon"></i> BLOCK</span> <span class="badge EMPTY"><i class="fa fa-circle-o"></i> EMPTY</span> and</li>
+                <li><span class="badge G">G</span> orbs to the Special Filter</li>
                 <br>
-				<li>Completed new Colo/Raid Units</li>
-                <br>
-                <li>Added First SW Replacement Units</li>
+                <li>Added "Beneficial" Orb Captain Filter</li>
                 <br>
                 <li>Fixed Timing Captains Order</li>
                 <li>Huge thanks to lextic</li>
                 <br>
-                <li>Updated Global Flags</li>
-                <li>And Global Gan Fall (Ganfor) Drops</li>
-                <br>
                 <li>Love, Zeenigami & XFTS & Mondfischer<li>
                 <br>
             </ul>

From f768fbe6f36ae8c30087e7137f5dfc392d30cc2f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 27 Jun 2016 00:51:09 -0500
Subject: [PATCH 0465/1569] New Sugo Units JPN

---
 common/data/aliases.js   |  4 +--
 common/data/captains.js  | 28 ++++++++++++++++++-
 common/data/cooldowns.js |  4 ++-
 common/data/details.js   | 58 +++++++++++++++++++++++++++++++++++++++-
 common/data/families.js  | 16 ++++++++++-
 common/data/flags.js     | 46 ++++++++++++++++++++++---------
 common/data/units.js     | 28 +++++++++----------
 7 files changed, 151 insertions(+), 33 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b4c8a87aa..c7913caa3 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -710,8 +710,8 @@ window.aliases = {
     709: ['ニコ・ロビン 麦わらの一味',''],
     710: ['フランキー 航海の記録・麦わらの一味','', 'Log Franky' ],
     711: ['フランキー 航海の夢「海の果てを旅する船」','', 'Log Franky' ],
-    712: ['ガン・フォール','','Gan Fall'],
-    713: ['ガン・フォール 空の騎士','','Gan Fall the Knight of the Sky'],
+    712: ['ガン・フォール','','Gan Fall','ganfall'],
+    713: ['ガン・フォール 空の騎士','','Gan Fall the Knight of the Sky','ganfall'],
     714: ['ピエール',''],
     715: ['コニス',''],
     716: ['コニス スカイピアの少女',''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 9555b712c..5a37d29d9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2785,5 +2785,31 @@ window.captains = {
     1108: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-    }
+    },
+	1114: {
+		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+	},
+	1115: {
+		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+	},
+	1118: {
+		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+	},
+	1119: {
+		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+	},
+	1120: {
+		hitAtk: function(p) {
+			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+		},
+		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+	1121: {
+		hitAtk: function(p) {
+			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+		},
+		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+	}
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a35f32eb6..c8acc281c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1117,5 +1117,7 @@ window.cooldowns = [
 	[ 23, 17 ],
 	[ 23, 17 ],
 	[ 23, 16 ],
-	[ 23, 16 ]
+	[ 23, 16 ],
+	[ 23, 17 ],
+	[ 23, 17 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 7ae80e723..3ee1f48c1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5461,5 +5461,61 @@ window.details = {
 		specialName: "10,000-Carat Smile",
 		specialNotes: "#{zombie}",
 		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x"
-	}
+	},
+	1120: {
+		special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
+		specialName: "Gum-Gum JET Gatling",
+		specialNotes: "#{random : 70,000 : 200,000}",
+		captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
+	},
+	1121: {
+		special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
+		specialName: "Gum-Gum JET Gatling",
+		specialNotes: "#{random : 70,000 : 200,000}",
+		captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
+	},
+	1128: {
+		special: "Reduces Numbness and Despair by (Large number) of turns. Cuts the current HP of one enemy by ??%",
+		specialName: "Tactician's Savage Cut"
+	},
+	1129: {
+		special: "Reduces Numbness and Despair by (Large number) of turns. Cuts the current HP of one enemy by ??%",
+		specialName: "Tactician's Savage Cut"
+	},
+	1130: {
+		special: [
+			{
+				"description": "Deals severe typeless damage to all enemies",
+				"cooldown": null
+			},
+			{
+				"description": "Deals (Larger) severe typeless damage to all enemies",
+				"cooldown": null
+			},
+			{
+				"description": "Deals (Largest) severe typeless damage to all enemies",
+				"cooldown": null
+			},
+		],
+		specialNotes: "#{stages}",
+		specialName: "King Punch"
+	},
+	1131: {
+		special: [
+			{
+				"description": "Deals severe typeless damage to all enemies",
+				"cooldown": null
+			},
+			{
+				"description": "Deals (Larger) severe typeless damage to all enemies",
+				"cooldown": null
+			},
+			{
+				"description": "Deals (Largest) severe typeless damage to all enemies",
+				"cooldown": null
+			},
+		],
+		specialNotes: "#{stages}",
+		specialName: "King Punch"
+	},
 };
diff --git a/common/data/families.js b/common/data/families.js
index 8a917b1cc..6c8b69476 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1117,5 +1117,19 @@ window.families = [
     "Sanji",
     "Sanji",
     "Nami",
-    "Nami"
+    "Nami",
+	"Monkey D. Luffy",
+    "Monkey D. Luffy",
+	"Cavendish",
+	"Cavendish",
+	"Suleiman",
+	"Suleiman",
+	"Orlumbus",
+	"Orlumbus",
+	"Dagama",
+	"Dagama",
+	"Elizabello",
+	"Elizabello",
+	"Ideo",
+	"Ideo"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index bed8ff976..3f9f96de5 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -789,18 +789,18 @@ window.flags = {
 	857: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	858: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	863: { special: 1 },
-	869: { rr: 1, rro: 1 },
-	870: { rr: 1, rro: 1 },
-	871: { rr: 1, rro: 1 },
-	872: { rr: 1, rro: 1 },
-	873: { rr: 1, rro: 1 },
-	874: { rr: 1, rro: 1 },
-	875: { rr: 1, rro: 1 },
-	876: { rr: 1, rro: 1 },
-	877: { rr: 1, rro: 1 },
-	878: { rr: 1, rro: 1 },
-	879: { rr: 1, rro: 1 },
-	880: { rr: 1, rro: 1 },
+	869: { rr: 1, rro: 1, global: 1 },
+	870: { rr: 1, rro: 1, global: 1 },
+	871: { rr: 1, rro: 1, global: 1 },
+	872: { rr: 1, rro: 1, global: 1 },
+	873: { rr: 1, rro: 1, global: 1 },
+	874: { rr: 1, rro: 1, global: 1 },
+	875: { rr: 1, rro: 1, global: 1 },
+	876: { rr: 1, rro: 1, global: 1 },
+	877: { rr: 1, rro: 1, global: 1 },
+	878: { rr: 1, rro: 1, global: 1 },
+	879: { rr: 1, rro: 1, global: 1 },
+	880: { rr: 1, rro: 1, global: 1 },
 	895: { special: 1 },
 	896: { special: 1 },
 	905: { rr: 1, rro: 1 },
@@ -878,5 +878,25 @@ window.flags = {
     1084: { rr: 1, rro: 1 },
     1085: { rr: 1, rro: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
-    1100: { rr: 1, rro: 1, lrr: 1 }
+    1100: { rr: 1, rro: 1, lrr: 1 },
+	1114: { rr: 1, rro: 1 },
+    1115: { rr: 1, rro: 1 },
+    1116: { rr: 1, rro: 1 },
+    1117: { rr: 1, rro: 1 },
+    1118: { rr: 1, rro: 1 },
+    1119: { rr: 1, rro: 1 },
+    1120: { rr: 1, rro: 1 },
+    1121: { rr: 1, rro: 1 },
+    1122: { rr: 1, rro: 1 },
+    1123: { rr: 1, rro: 1 },
+    1124: { rr: 1, rro: 1 },
+    1125: { rr: 1, rro: 1 },
+	1126: { rr: 1, rro: 1 },
+    1127: { rr: 1, rro: 1 },
+    1128: { rr: 1, rro: 1 },
+    1129: { rr: 1, rro: 1 },
+    1130: { rr: 1, rro: 1 },
+    1131: { rr: 1, rro: 1 },
+    1132: { rr: 1, rro: 1 },
+    1133: { rr: 1, rro: 1 }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 6a262055e..a91582946 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1118,20 +1118,20 @@ window.units = [
 	[ "Sanji, Loyal Strawhat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, null ],
 	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, null ],
 	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ],
-    [],
-    [],
-    [ "Unknown Legend", "QCK", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Legend Evolution", "QCK", [ "Slasher", "Driven" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "PSY", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character Evolution", "PSY", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "DEX", [ "Powerhouse", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character Evolution", "DEX", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "INT", [ "Slasher", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character Evolution", "INT", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "STR", [ "Powerhouse", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character Evolution", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character", "QCK", [ "Shooter", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Character Evolution", "QCK", [ "Shooter", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Monkey D. Luffy Wakes of the Endless Dream, Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, null ],
+	[ "Monkey D. Luffy NEW", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, null ],
+    [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 060014ca86d2ee02fb6f3cc17ac15c4e1b428650 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 27 Jun 2016 13:29:55 +0200
Subject: [PATCH 0466/1569] Fixes

---
 common/data/captains.js | 2 +-
 common/data/details.js  | 2 +-
 common/data/drops.js    | 2 --
 index.html              | 6 ++----
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 5a37d29d9..469ae6b30 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -667,7 +667,7 @@ window.captains = {
 		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
 	},
 	424: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+		atk: function(p) { return 1.5; }
 	},
 	425: {
 		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
diff --git a/common/data/details.js b/common/data/details.js
index 3ee1f48c1..408c6a588 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1686,7 +1686,7 @@ window.details = {
 	424: {
 		special: "Recovers 4,343 HP, reduces the defense of all enemies by 50% for 2 turns",
 		specialName: "Lullaby Parry",
-		captain: "Protects from defeat as long as HP is above 70%",
+		captain: "Boosts ATK of the whole crew by 1.5x and protects from defeat as long as HP is above 70%",
 		captainNotes: "#{zombie}"
 	},
 	425: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 12ab4e40c..0aa93bfe8 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1260,8 +1260,6 @@ var bonuses = [
     { type: 'drop'    , x: 6 , y: 8  },
     { type: 'drop'    , x: 6 , y: 15 },
     { type: 'drop'    , x: 6 , y: 22 },
-    { type: 'drop'    , x: 0 , y: 24 },
-    { type: 'drop'    , x: 5 , y: 24 },
     { type: 'beli'    , x: 6 , y: 3  },
     { type: 'beli'    , x: 1 , y: 4  },
     { type: 'beli'    , x: 6 , y: 10 },
diff --git a/index.html b/index.html
index 79ffe8d3a..ae8275387 100644
--- a/index.html
+++ b/index.html
@@ -19,8 +19,6 @@
 
     <head>
         <title>OPTC Database</title>
-        <link rel="stylesheet" type="text/css" href="../common/libs/css/font-awesome.min.css">
-        <link rel="stylesheet" type="text/css" href="../common/libs/css/datatables.min.css">
         <link rel="stylesheet" type="text/css" href="common/libs/css/animate.css" />
         <link rel="stylesheet" type="text/css" href="common/libs/css/font-awesome.min.css" />
         <link rel="stylesheet" type="text/css" href="index.css" />
@@ -64,8 +62,8 @@
             <p>26/06/2016</p>
             <br>
             <ul>
-				<li>Added <span class="badge BOMB"><i class="fa fa-bomb"></i> BOMB</span> <span class="badge BLOCK"><i class="block-icon"></i> BLOCK</span> <span class="badge EMPTY"><i class="fa fa-circle-o"></i> EMPTY</span> and</li>
-                <li><span class="badge G">G</span> orbs to the Special Filter</li>
+                <li>Added BOMB, BLOCK, EMPTY and G </li>
+                <li>orbs to the Special Filter</li>
                 <br>
                 <li>Added "Beneficial" Orb Captain Filter</li>
                 <br>

From fa85105990671ebe9bbf759aec64e58cb95cae8b Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 27 Jun 2016 13:58:06 +0200
Subject: [PATCH 0467/1569] New FN Preview / Condition

---
 common/data/details.js    |  3 +++
 common/data/drops.js      |  4 ++--
 common/data/effects.js    | 34 ++++++++++++++++++++++++++++++++--
 common/data/evolutions.js |  8 ++++++++
 common/data/families.js   | 10 +++++-----
 common/data/units.js      | 10 +++++-----
 index.html                |  6 +++++-
 7 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 408c6a588..8b2fa0667 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5426,6 +5426,9 @@ window.details = {
         special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
 	},
+    1113: {
+        specialName: "Fury of the Little Monster: \"This is War!!!\""  
+    },
     1114: {
 		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
 		specialName: "Gum-Gum Gigant Axe",
diff --git a/common/data/drops.js b/common/data/drops.js
index 0aa93bfe8..2fd810a50 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1047,8 +1047,8 @@ window.drops = {
         {
             name: "Robin and Nami's Secret Undercover Investigation",
             thumb: null,
-            condition: "None so far",
-            "All Difficulties": [ -23, -628, -639, -641, -892, -937, -939, -941 ]
+            condition: "Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
+            "All Difficulties": [ 1109, 1111, 1113, -23, -628, -639, -641, -892, -937, -939, -941 ]
         }
     ],
 
diff --git a/common/data/effects.js b/common/data/effects.js
index 6ec971244..6d85a0cd6 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 31
+    // last ID used: 39
     // Use p.type instead of p.unit.type here
 
     'Baroque Works (pre-v4.0)': {
@@ -312,7 +312,7 @@ window.effects = {
     
 	'Dr. Indigo & Scarlet! Fortnight': {
         description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
-        thumb: null,
+        thumb: 1095,
         id: 37,
         atk: function(p) { 
                             var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
@@ -347,5 +347,35 @@ window.effects = {
         comboShield: 25,
         chainLimiter: function() { return 2.0; }
     },
+    
+    'Robin and Nami\'s Secret Undercover Investigation': {
+        description: 'Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP.',
+        thumb: null,
+        id: 39,
+        atk: function(p) { 
+                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
+                            if(p.class.has('Cerebral')) { boost1 = 2.0}
+                            if(p.class.has('Free Spirit')) { boost2 = 2.0}
+                            if(!(p.class.has('Cerebral')&&p.class.has('Free Spirit')) && p.class.constructor === Array){
+                            if(!p.class.has('Cerebreal')){ boost3 = 0.5}
+                            if(!p.class.has('Free Spirit')){ boost4 = 0.5}}
+                            if(p.class.constructor === String){
+                                if(!(p.class.has('Cerebral') || p.class.has('Free Spirit'))){ boost5 = 0.5}
+                            }
+                            return 1*boost1*boost2*boost3*boost4*boost5; 
+                        },
+        hp: function(p) {
+                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
+                            if(p.class.has('Striker')) { boost1 = 2.0}
+                            if(p.class.has('Shooter')) { boost2 = 2.0}
+                            if(!(p.class.has('Striker')&&p.class.has('Shooter')) && p.class.constructor === Array){
+                            if(!p.class.has('Striker')){ boost3 = 0.5}
+                            if(!p.class.has('Shooter')){ boost4 = 0.5}}
+                            if(p.class.constructor === String){
+                                if(!(p.class.has('Striker') || p.class.has('Shooter'))){ boost5 = 0.5}
+                            }
+                            return 1*boost1*boost2*boost3*boost4*boost5;
+                        }
+    },
 
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7b9b4dc09..7d6394836 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1671,6 +1671,14 @@ window.evolutions = {
         evolution: 1108,
         evolvers: [ 118, 84, 266, 300, 100 ]
     },
+    1109: {
+        evolution: 1110,
+        evolvers: []
+    },
+    1111: {
+        evolution: 1112,
+        evolvers: []
+    },
     1114: {
 		evolution: 1115,
 		evolvers: [ 118, 84, 95, 94, 100 ]
diff --git a/common/data/families.js b/common/data/families.js
index 6c8b69476..67de383af 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1107,11 +1107,11 @@ window.families = [
     "Binz",
 	"Shiki",
 	"Shiki",
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Nami",
+    "Nami",
+    "Nico Robin",
+    "Nico Robin",
+    "Tony Tony Chopper",
     "Monkey D. Luffy",
     "Monkey D. Luffy",
     "Sanji",
diff --git a/common/data/units.js b/common/data/units.js
index a91582946..c97a08412 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1107,11 +1107,11 @@ window.units = [
     [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1091, 484, 115, 2107, 1042, 280, 1 ],
     [ "Golden Lion Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, 1066998, 244, 164, 39, 1274, 709, 177, 1 ],
     [ "Golden Lion Shiki, Golden Lion Pirates", "STR", [ "Driven", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1218, 638, 138, 2424, 1407, 292, 1 ],
-    [],
-    [],
-    [],
-    [],
-    [],
+    [ "Lil' Nami", "PSY", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lil' Nami", "PSY", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Stripper Robin", "QCK", [ "Cerebral", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Stripper Robin", "QCK", [ "Cerebral", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, null ],
 	[ "Monkey D. Luffy, Loyal Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, null ],
 	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, null ],
diff --git a/index.html b/index.html
index ae8275387..1bbb52202 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>26/06/2016</p>
+            <p>27/06/2016</p>
             <br>
             <ul>
                 <li>Added BOMB, BLOCK, EMPTY and G </li>
@@ -67,6 +67,10 @@
                 <br>
                 <li>Added "Beneficial" Orb Captain Filter</li>
                 <br>
+                <li>Added new FN Previews</li>
+                <li>And new Condition to Calculator</li>
+                <li>Values MIGHT change for this</li>
+                <br>
                 <li>Fixed Timing Captains Order</li>
                 <li>Huge thanks to lextic</li>
                 <br>

From 8d0c197008b182ac5566e060b7486f8972121d06 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 27 Jun 2016 22:18:58 +0200
Subject: [PATCH 0468/1569] Effect Fix

---
 common/data/effects.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 6d85a0cd6..bcfdc1206 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -357,11 +357,12 @@ window.effects = {
                             if(p.class.has('Cerebral')) { boost1 = 2.0}
                             if(p.class.has('Free Spirit')) { boost2 = 2.0}
                             if(!(p.class.has('Cerebral')&&p.class.has('Free Spirit')) && p.class.constructor === Array){
-                            if(!p.class.has('Cerebreal')){ boost3 = 0.5}
+                            if(!p.class.has('Cerebral')){ boost3 = 0.5}
                             if(!p.class.has('Free Spirit')){ boost4 = 0.5}}
                             if(p.class.constructor === String){
                                 if(!(p.class.has('Cerebral') || p.class.has('Free Spirit'))){ boost5 = 0.5}
                             }
+                            //console.log(boost1+" "+boost2+" "+boost3+" "+boost4+" "+boost5)
                             return 1*boost1*boost2*boost3*boost4*boost5; 
                         },
         hp: function(p) {

From 656b5e8be29175d68a9c39130f4d2fcb6a612b74 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 28 Jun 2016 10:25:56 +0200
Subject: [PATCH 0469/1569] FN Updates

---
 common/data/captains.js  | 11 +++++++++++
 common/data/cooldowns.js |  8 ++++----
 common/data/details.js   | 22 ++++++++++++++++++++++
 common/data/specials.js  | 10 ++++++++++
 common/data/units.js     |  8 ++++----
 5 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 469ae6b30..c1ba38464 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2785,6 +2785,17 @@ window.captains = {
     1108: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    1111: {
+        atk: function(p) { return p.class.has("Cerebral") ? 1.25 : 1; },
+        rcv: function(p) { return p.class.has("Cerebral") ? 1.25 : 1; }  
+    },
+    1112: {
+        atk: function(p) { return p.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1113: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }  
     },
 	1114: {
 		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c8acc281c..97dd9d1ca 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -936,8 +936,8 @@ window.cooldowns = [
     19,
     19,
     19,
-    24,
-    24,
+    [ 24, 17 ],
+    [ 24, 17 ],
     [ 21, 15 ],
     [ 21, 15 ],
     15,
@@ -1109,8 +1109,8 @@ window.cooldowns = [
 	[ 30, 15 ],
     null,
     null,
-    null,
-    null,
+    [ 22, 15 ],
+    [ 22, 15 ],
     null,
     [ 25, 18 ],
 	[ 25, 18 ],
diff --git a/common/data/details.js b/common/data/details.js
index 8b2fa0667..560d17e48 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5426,7 +5426,29 @@ window.details = {
         special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
 	},
+    1109: {
+        captain: "Boosts amount of Beli received by 1.5x",
+        special: "Changes [BLOCK] orbs into [PSY] orbs for [PSY] characters",
+        specialName: "Cat Burglar's Undercover Investigation"
+    },
+    1110: {
+        captain: "Boosts amount of Beli received by 1.5x",
+        special: "Changes [BLOCK] orbs into [PSY] orbs for [PSY] characters",
+        specialName: "Cat Burglar's Undercover Investigation"
+    },
+    1111: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.25x",
+        special: "Amplifies the effect of orbs by 1.25x for 3 turns, recovers 7x character's RCV at the end of the turn for 3 turns.",
+        specialName: "Impish Sultry Dance"
+    },
+    1112: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+        special: "Amplifies the effect of orbs by 1.25x for 3 turns, recovers 7x character's RCV at the end of the turn for 3 turns.",
+        specialName: "Impish Sultry Dance"
+    },
     1113: {
+        captain: "Boosts ATK of [INT] units by 2x",
+        special: "Boosts ATK of all characters by 1.2x for 1 turn",
         specialName: "Fury of the Little Monster: \"This is War!!!\""  
     },
     1114: {
diff --git a/common/data/specials.js b/common/data/specials.js
index a6e8b1fe8..2222fd179 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1393,5 +1393,15 @@ window.specials = {
     1108: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
         type: "class"
+    },
+    1111: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    1112: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    1113: {
+        atk: function(p) { return 1.2; },
+        type: "type"
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index c97a08412..e3479e4f4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1107,10 +1107,10 @@ window.units = [
     [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1091, 484, 115, 2107, 1042, 280, 1 ],
     [ "Golden Lion Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, 1066998, 244, 164, 39, 1274, 709, 177, 1 ],
     [ "Golden Lion Shiki, Golden Lion Pirates", "STR", [ "Driven", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1218, 638, 138, 2424, 1407, 292, 1 ],
-    [ "Lil' Nami", "PSY", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nami, Rejuvenated Navigator", "PSY", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lil' Nami", "PSY", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Stripper Robin", "QCK", [ "Cerebral", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Stripper Robin", "QCK", [ "Cerebral", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin, Rejuvanted Archaeologist", "QCK", [ "Cerebral", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, null, 921, 468, 119, 1789, 941, 346, null ],
     [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, null ],
 	[ "Monkey D. Luffy, Loyal Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, null ],
@@ -1135,4 +1135,4 @@ window.units = [
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
-// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, PictureOnline ]
+// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ]

From be4bcf4fc58abdecfb0e5f660c96f69e889f7962 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 28 Jun 2016 10:28:33 +0200
Subject: [PATCH 0470/1569] Shiki Raid

---
 common/data/drops.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 2fd810a50..663f7a4f6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1205,6 +1205,14 @@ window.drops = {
             Ultimate: [ 1046 ],
             Master: [ 1046 ],
             Expert: [ 1046 ]
+        },
+        
+        {
+            name: 'Clash!! Shiki',
+            thumb: 1108,
+            Ultimate: [ 1107 ],
+            Master: [ 1107 ],
+            Expert: [ 1107 ]
         }
 
     ],

From 842e7660556527f1b17435a3cccf259b40f11cf8 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 28 Jun 2016 14:27:41 +0200
Subject: [PATCH 0471/1569] Nami Update

---
 common/data/captains.js  | 11 +++++++----
 common/data/cooldowns.js |  6 +++---
 common/data/details.js   |  2 +-
 common/data/units.js     |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c1ba38464..966873d5e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2786,13 +2786,16 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
+    1110: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; }  
+    },
     1111: {
-        atk: function(p) { return p.class.has("Cerebral") ? 1.25 : 1; },
-        rcv: function(p) { return p.class.has("Cerebral") ? 1.25 : 1; }  
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; }  
     },
     1112: {
-        atk: function(p) { return p.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.class.has("Cerebral") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1113: {
         atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }  
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 97dd9d1ca..0e7a54941 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1107,11 +1107,11 @@ window.cooldowns = [
     [ 23, 12 ],
 	[ 30, 15 ],
 	[ 30, 15 ],
-    null,
-    null,
+    13,
+    13,
     [ 22, 15 ],
     [ 22, 15 ],
-    null,
+    [ 12, 7 ],
     [ 25, 18 ],
 	[ 25, 18 ],
 	[ 23, 17 ],
diff --git a/common/data/details.js b/common/data/details.js
index 560d17e48..360a6b152 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5432,7 +5432,7 @@ window.details = {
         specialName: "Cat Burglar's Undercover Investigation"
     },
     1110: {
-        captain: "Boosts amount of Beli received by 1.5x",
+        captain: "Boosts ATK and RCV of [PSY] characters by 1.25x and the amount of Beli received by 1.5x",
         special: "Changes [BLOCK] orbs into [PSY] orbs for [PSY] characters",
         specialName: "Cat Burglar's Undercover Investigation"
     },
diff --git a/common/data/units.js b/common/data/units.js
index e3479e4f4..05525c2d8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1108,7 +1108,7 @@ window.units = [
     [ "Golden Lion Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, 1066998, 244, 164, 39, 1274, 709, 177, 1 ],
     [ "Golden Lion Shiki, Golden Lion Pirates", "STR", [ "Driven", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1218, 638, 138, 2424, 1407, 292, 1 ],
     [ "Nami, Rejuvenated Navigator", "PSY", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lil' Nami", "PSY", [ "Cerebral", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nami, Playful Bar Idol", "PSY", [ "Cerebral", "Striker" ], 4, 18, 4, 3, 99, null, 718, 322, 220, null, null, null, null ],
     [ "Nico Robin, Rejuvanted Archaeologist", "QCK", [ "Cerebral", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, null, 921, 468, 119, 1789, 941, 346, null ],
     [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],

From d83910bf3706f51b711ff3cb22e8fcc0fe69f301 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 28 Jun 2016 13:42:40 -0500
Subject: [PATCH 0472/1569] fixes

cooldown cora fix
---
 common/data/captains.js  | 4 ++--
 common/data/cooldowns.js | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 966873d5e..430666934 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2397,10 +2397,10 @@ window.captains = {
          atk: function(p) {return p.unit.class.has("Driven") ? 2.25  : 1; }
     },
     1000: {
-        atk: function(p) { return  2  * p.percHP / 100; }
+        atk: function(p) { return  1 + p.percHP / 100; }
     },
     1001: {
-        atk: function(p) { return  2  * p.percHP / 100; }
+        atk: function(p) { return  1 + p.percHP / 100; }
     },
 	1002: {
 		atk: function(p) {return p.unit.class.has("Fighter") ? 1.5 : 1; }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0e7a54941..83f22a8cd 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -934,8 +934,8 @@ window.cooldowns = [
 	[ 31, 17 ],
     19,
     19,
-    19,
-    19,
+    [ 19, 14 ],
+    [ 19, 14 ],
     [ 24, 17 ],
     [ 24, 17 ],
     [ 21, 15 ],
@@ -1107,8 +1107,8 @@ window.cooldowns = [
     [ 23, 12 ],
 	[ 30, 15 ],
 	[ 30, 15 ],
-    13,
-    13,
+    [ 13, 6 ],
+    [ 13, 6 ],
     [ 22, 15 ],
     [ 22, 15 ],
     [ 12, 7 ],

From 0dee431feb87d2f9ebf56c0a83a2beffca2c635d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 29 Jun 2016 03:30:38 -0500
Subject: [PATCH 0473/1569] Cavendish HYPE

---
 common/data/aliases.js |  6 +++++-
 common/data/details.js | 18 ++++++++++++++++++
 common/data/flags.js   |  5 +++++
 common/data/units.js   | 14 +++++++-------
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c7913caa3..d74d9b9d0 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1117,5 +1117,9 @@ window.aliases = {
     1116: [ '', '' ],
     1117: [ '', '' ],
     1118: [ '', '' ],
-    1119: [ '', '' ]
+    1119: [ '', '' ],
+	1120: [ '', '' ],
+    1121: [ '', '' ],
+    1122: [ '', '','Hakuba','cabbage' ],
+    1123: [ '', '','Hakuba','cabbage' ],
 };
diff --git a/common/data/details.js b/common/data/details.js
index 360a6b152..6db1d560d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5499,6 +5499,24 @@ window.details = {
 		specialNotes: "#{random : 70,000 : 200,000}",
 		captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
 	},
+	1122: {
+		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
+		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
+		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks all orbs for 2 turns, and changes own orb to [QCK].",
+		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavndish who uses his Special. He may empty all other orb slots.",
+		specialName: "Sickle Weasel of Rommel"
+	},
+	1123: {
+		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
+		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
+		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks all orbs for 2 turns, and changes own orb to [QCK].",
+		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavndish who uses his Special. He may empty all other orb slots.",
+		specialName: "Sickle Weasel of Rommel"
+	},
+	1126: {
+		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
+		specialName: "Orlumbus Special"
+	},
 	1128: {
 		special: "Reduces Numbness and Despair by (Large number) of turns. Cuts the current HP of one enemy by ??%",
 		specialName: "Tactician's Savage Cut"
diff --git a/common/data/flags.js b/common/data/flags.js
index 3f9f96de5..19dd8aa3f 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -697,6 +697,11 @@ window.flags = {
 	709: { global: 1 },
 	710: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	711: { global: 1, rr: 1, rro: 1, lrr: 1 },
+	712: { global: 1 },
+	713: { global: 1 },
+	714: { global: 1 },
+	715: { global: 1 },
+	716: { global: 1 },
 	717: { rr: 1, rro: 1, global: 1 },
 	718: { rr: 1, rro: 1, global: 1 },
 	719: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 05525c2d8..7589aaa70 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1107,11 +1107,11 @@ window.units = [
     [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1091, 484, 115, 2107, 1042, 280, 1 ],
     [ "Golden Lion Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, 1066998, 244, 164, 39, 1274, 709, 177, 1 ],
     [ "Golden Lion Shiki, Golden Lion Pirates", "STR", [ "Driven", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1218, 638, 138, 2424, 1407, 292, 1 ],
-    [ "Nami, Rejuvenated Navigator", "PSY", [ "Cerebral", "Fighter" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Nami, Playful Bar Idol", "PSY", [ "Cerebral", "Striker" ], 4, 18, 4, 3, 99, null, 718, 322, 220, null, null, null, null ],
-    [ "Nico Robin, Rejuvanted Archaeologist", "QCK", [ "Cerebral", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, null, 921, 468, 119, 1789, 941, 346, null ],
-    [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nami, Rejuvenated Navigator", "PSY", [ "Cerebral", "Fighter" ], 3, 9, 5, 2, 50, 392109, 46, 27, 39, 770, 389, 266, 1 ],
+    [ "Nami, Playful Bar Idol", "PSY", [ "Cerebral", "Striker" ], 4, 18, 4, 3, 99, 3000000, 718, 322, 220, 1505, 707, 426, 1 ],
+    [ "Nico Robin, Rejuvanted Archaeologist", "QCK", [ "Cerebral", "Fighter" ], 3, 12, 6, 2, 50, 392109, 95, 39, 24, 992, 524, 162, 1 ],
+    [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 921, 468, 119, 1789, 941, 346, 1 ],
+    [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 2, 50, 392109, 67, 55, 49, 524, 506, 300, 1 ],
     [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, null ],
 	[ "Monkey D. Luffy, Loyal Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, null ],
 	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, null ],
@@ -1120,8 +1120,8 @@ window.units = [
 	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ],
     [ "Monkey D. Luffy Wakes of the Endless Dream, Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, null ],
 	[ "Monkey D. Luffy NEW", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, null ],
-    [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, null, 4, 70, null, 504, 277, 148, 1603, 808, 287, null ],
+    [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, null, 5, 99, null, 1541, 749, 231, 2970, 1460, 438, null ],
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],

From 5ce37c1662de3c0729ad89535f18f333f46d0d5e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 29 Jun 2016 03:33:59 -0500
Subject: [PATCH 0474/1569] spelling

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6db1d560d..023908fe1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5503,14 +5503,14 @@ window.details = {
 		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
 		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
 		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks all orbs for 2 turns, and changes own orb to [QCK].",
-		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavndish who uses his Special. He may empty all other orb slots.",
+		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special. He may empty all other orb slots.",
 		specialName: "Sickle Weasel of Rommel"
 	},
 	1123: {
 		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
 		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
 		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks all orbs for 2 turns, and changes own orb to [QCK].",
-		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavndish who uses his Special. He may empty all other orb slots.",
+		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special. He may empty all other orb slots.",
 		specialName: "Sickle Weasel of Rommel"
 	},
 	1126: {

From 868a5c4abfe36c04cee49ceccb9f88c640bbf44e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 30 Jun 2016 00:44:21 -0500
Subject: [PATCH 0475/1569] New Sugo Units

---
 common/data/cooldowns.js | 14 +++++++-
 common/data/details.js   | 69 ++++++++++++++++++++++++++++++----------
 common/data/units.js     | 26 +++++++--------
 3 files changed, 79 insertions(+), 30 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 83f22a8cd..41653d22d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1119,5 +1119,17 @@ window.cooldowns = [
 	[ 23, 16 ],
 	[ 23, 16 ],
 	[ 23, 17 ],
-	[ 23, 17 ]
+	[ 23, 17 ],
+	20,
+	20,
+	20,
+	20,
+	20,
+	20,
+	20,
+	20,
+	null,//Elizabello
+	null,//Elizabello
+	null,//Ideo
+	null,//Ideo
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 023908fe1..71a3224b1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5513,52 +5513,89 @@ window.details = {
 		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special. He may empty all other orb slots.",
 		specialName: "Sickle Weasel of Rommel"
 	},
+	1124: {
+		captain: "Boosts ATK of Slashers characters by 3x, reduces his own ATK multiplier by 0.1x at the end of each turn",
+		captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher units.",
+		special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
+	},
+	1125: {
+		captain: "Boosts ATK of Slashers characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
+		captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher units.",
+		special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
+	},
 	1126: {
+		captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
+		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
+		specialName: "Orlumbus Special"
+	},
+	1127: {
+		captain: "Boosts ATK and HP of [DEX] characters by 2x",
 		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
 		specialName: "Orlumbus Special"
 	},
 	1128: {
-		special: "Reduces Numbness and Despair by (Large number) of turns. Cuts the current HP of one enemy by ??%",
+		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 1.75x",
+		special: "Reduces Numbness and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
 		specialName: "Tactician's Savage Cut"
 	},
 	1129: {
-		special: "Reduces Numbness and Despair by (Large number) of turns. Cuts the current HP of one enemy by ??%",
+		captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of all characters by 2x",
+		special: "Reduces Numbness and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
 		specialName: "Tactician's Savage Cut"
 	},
 	1130: {
+		captain: "Boosts ATK and HP of Fighter and Tough characters by 1.5x",
 		special: [
 			{
-				"description": "Deals severe typeless damage to all enemies",
-				"cooldown": null
+				"description": "Deals 7x character's ATK in typeless damage to all enemies",
+				"cooldown": 12
 			},
 			{
-				"description": "Deals (Larger) severe typeless damage to all enemies",
-				"cooldown": null
+				"description": "Deals 15x character's ATK in typeless damage to all enemies",
+				"cooldown": 20
 			},
 			{
-				"description": "Deals (Largest) severe typeless damage to all enemies",
-				"cooldown": null
+				"description": "Deals 25x character's ATK in typeless damage to all enemies",
+				"cooldown": 26
 			},
 		],
-		specialNotes: "#{stages}",
+		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
 		specialName: "King Punch"
 	},
 	1131: {
+		captain: "Boosts ATK and HP of Fighter and Tough characters by 2x",
 		special: [
 			{
-				"description": "Deals severe typeless damage to all enemies",
-				"cooldown": null
+				"description": "Deals 7x character's ATK in typeless damage to all enemies",
+				"cooldown": 12
 			},
 			{
-				"description": "Deals (Larger) severe typeless damage to all enemies",
-				"cooldown": null
+				"description": "Deals 15x character's ATK in typeless damage to all enemies",
+				"cooldown": 20
 			},
 			{
-				"description": "Deals (Largest) severe typeless damage to all enemies",
-				"cooldown": null
+				"description": "Deals 25x character's ATK in typeless damage to all enemies",
+				"cooldown": 26
 			},
+		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
+		specialName: "King Punch"
 		],
-		specialNotes: "#{stages}",
+		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
 		specialName: "King Punch"
 	},
+	1132: {
+		captain: "Boosts ATK and HP of Fighter characters by 1.5x",
+		special: [
+			{
+				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
+				"cooldown": 18
+			},
+			{
+				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
+				"cooldown": 23
+			}
+		],
+		specialNotes: "#{stages}",
+		specialName: "Ideo Special"
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index 7589aaa70..5bf8056af 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1097,7 +1097,7 @@ window.units = [
     [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 121, 47, 5, 1323, 520, 59, 1 ],
     [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1271, 467, 30, 2302, 980, 92, 1 ],
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
-    [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, null, null, null, 151, 84, 57, null ],
+    [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, 79, 50, 47, 151, 84, 57, null ],
     [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 897, 429, 134, null, null, null, null ],
     [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, 1066998, 545, 404, 0, 1384, 822, 0, 1 ],
     [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1318, 749, 0, 2620, 1500, 0, 1 ],
@@ -1120,18 +1120,18 @@ window.units = [
 	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ],
     [ "Monkey D. Luffy Wakes of the Endless Dream, Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, null ],
 	[ "Monkey D. Luffy NEW", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, null ],
-    [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, null, 4, 70, null, 504, 277, 148, 1603, 808, 287, null ],
-    [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, null, 5, 99, null, 1541, 749, 231, 2970, 1460, 438, null ],
-    [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, null, 504, 277, 148, 1603, 808, 287, null ],
+    [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, null, 1541, 749, 231, 2970, 1460, 438, null ],
+    [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, null, 102, 151, 34, null, null, null, null ],
+    [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 7, 4, 99, null, 903, 713, 144, null, null, null, null ],
+    [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, 4, 3, 70, null, 201, 102, 22, null, null, null, null ],
+    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, null, 1389, 584, 103, null, null, null, null ],
+    [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, null, 177, 52, 31, null, null, null, null ],
+    [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, null, 1255, 490, 150, null, null, null, null ],
+    [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, 5, 3, 70, null, 123, 157, 20, null, null, null, null ],
+    [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, null, 1070, 724, 131, null, null, null, null ],
+    [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, null, 151, 120, 29, null, null, null, null ],
+    [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, null, 1171, 603, 123, null, null, null, null ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 010aea1e72d7cb0dc87e75f5623c6b7f51db59e3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 30 Jun 2016 00:46:17 -0500
Subject: [PATCH 0476/1569] Oops

---
 common/data/details.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 71a3224b1..acc979db9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5577,8 +5577,6 @@ window.details = {
 				"description": "Deals 25x character's ATK in typeless damage to all enemies",
 				"cooldown": 26
 			},
-		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
-		specialName: "King Punch"
 		],
 		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
 		specialName: "King Punch"

From 7be267da70cfd1b6b109f4702755ac61afc379aa Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 30 Jun 2016 00:49:50 -0500
Subject: [PATCH 0477/1569] new sugo units

---
 common/data/details.js | 17 ++++++++++++++++-
 common/data/units.js   |  2 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index acc979db9..964a14bda 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5563,7 +5563,7 @@ window.details = {
 		specialName: "King Punch"
 	},
 	1131: {
-		captain: "Boosts ATK and HP of Fighter and Tough characters by 2x",
+		captain: "Boosts ATK and HP of Fighter and Tough characters by 1.5x",
 		special: [
 			{
 				"description": "Deals 7x character's ATK in typeless damage to all enemies",
@@ -5596,4 +5596,19 @@ window.details = {
 		specialNotes: "#{stages}",
 		specialName: "Ideo Special"
 	},
+	1133: {
+		captain: "Boosts ATK and HP of Fighter characters by 1.5x",
+		special: [
+			{
+				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
+				"cooldown": 18
+			},
+			{
+				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
+				"cooldown": 23
+			}
+		],
+		specialNotes: "#{stages}",
+		specialName: "Ideo Special"
+	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 5bf8056af..8f6b3a6e8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1119,7 +1119,7 @@ window.units = [
 	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, null ],
 	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ],
     [ "Monkey D. Luffy Wakes of the Endless Dream, Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, null ],
-	[ "Monkey D. Luffy NEW", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, null ],
+	[ "Monkey D. Luffy Oath of the Great Pirate Era: \"King of Pirates\"", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, null ],
     [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, null, 504, 277, 148, 1603, 808, 287, null ],
     [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, null, 1541, 749, 231, 2970, 1460, 438, null ],
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, null, 102, 151, 34, null, null, null, null ],

From 2b787831c84cdfebaa85d6418d8a1ca9fef9ca24 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 1 Jul 2016 11:49:28 -0500
Subject: [PATCH 0478/1569] more sugo unit stuffs

---
 common/data/captains.js  | 42 +++++++++++++++++++++++++++++++++++++++-
 common/data/cooldowns.js |  8 ++++----
 common/data/details.js   | 34 ++++++++++++++++----------------
 common/data/units.js     |  6 +++---
 common/data/zombies.js   |  4 ++++
 5 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 430666934..4cec365f7 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2825,5 +2825,45 @@ window.captains = {
 			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
 		},
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	}
+	},
+    1124: {
+		atk: function(p) {
+			return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+		}
+	},
+	1125: {
+		atk: function(p) {
+			return p.unit.class.has("Slasher") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
+		}
+	},
+    1126: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    1127: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    1128: {
+        atk: function(p) { return 1.75; }
+    },
+    1129: {
+        atk: function(p) { return 2; }
+    },
+    1130: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1131: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1132: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    1133: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    }
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 41653d22d..99e44f378 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1124,10 +1124,10 @@ window.cooldowns = [
 	20,
 	20,
 	20,
-	20,
-	20,
-	20,
-	20,
+	[ 20, 14 ],
+    [ 20, 14 ],
+	[ 20, 15 ],
+	[ 20, 15 ],
 	null,//Elizabello
 	null,//Elizabello
 	null,//Ideo
diff --git a/common/data/details.js b/common/data/details.js
index 964a14bda..d5036ac2f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5520,7 +5520,7 @@ window.details = {
 	},
 	1125: {
 		captain: "Boosts ATK of Slashers characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher units.",
+		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher units.",
 		special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
 	},
 	1126: {
@@ -5529,7 +5529,7 @@ window.details = {
 		specialName: "Orlumbus Special"
 	},
 	1127: {
-		captain: "Boosts ATK and HP of [DEX] characters by 2x",
+		captain: "Boosts ATK of [DEX] characters by 2.25x and their HP by 1.5x",
 		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
 		specialName: "Orlumbus Special"
 	},
@@ -5544,38 +5544,38 @@ window.details = {
 		specialName: "Tactician's Savage Cut"
 	},
 	1130: {
-		captain: "Boosts ATK and HP of Fighter and Tough characters by 1.5x",
+		captain: "Boosts ATK and HP of Fighter and Powerhouse characters by 1.5x",
 		special: [
 			{
 				"description": "Deals 7x character's ATK in typeless damage to all enemies",
-				"cooldown": 12
+				"cooldown": [ 12, 6 ]
 			},
 			{
 				"description": "Deals 15x character's ATK in typeless damage to all enemies",
-				"cooldown": 20
+				"cooldown": [ 20, 14 ]
 			},
 			{
 				"description": "Deals 25x character's ATK in typeless damage to all enemies",
-				"cooldown": 26
+				"cooldown": [ 26, 20 ]
 			},
 		],
 		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
 		specialName: "King Punch"
 	},
 	1131: {
-		captain: "Boosts ATK and HP of Fighter and Tough characters by 1.5x",
+		captain: "Boosts ATK and HP of Fighter and Powerhouse characters by 1.5x",
 		special: [
 			{
 				"description": "Deals 7x character's ATK in typeless damage to all enemies",
-				"cooldown": 12
+				"cooldown": [ 12, 6 ]
 			},
 			{
 				"description": "Deals 15x character's ATK in typeless damage to all enemies",
-				"cooldown": 20
+				"cooldown": [ 20, 14 ]
 			},
 			{
 				"description": "Deals 25x character's ATK in typeless damage to all enemies",
-				"cooldown": 26
+				"cooldown": [ 26, 20 ]
 			},
 		],
 		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
@@ -5586,26 +5586,26 @@ window.details = {
 		special: [
 			{
 				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
-				"cooldown": 18
+				"cooldown": [ 18, 12 ]
 			},
 			{
-				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
-				"cooldown": 23
+				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.75x for 1 turn",
+				"cooldown": [ 23, 17 ]
 			}
 		],
 		specialNotes: "#{stages}",
 		specialName: "Ideo Special"
 	},
 	1133: {
-		captain: "Boosts ATK and HP of Fighter characters by 1.5x",
+		captain: "Boosts ATK of Fighter characters by 2.25x and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
 		special: [
 			{
 				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
-				"cooldown": 18
+				"cooldown": [ 18, 12 ]
 			},
 			{
-				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
-				"cooldown": 23
+				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.75x for 1 turn",
+				"cooldown": [ 23, 17 ]
 			}
 		],
 		specialNotes: "#{stages}",
diff --git a/common/data/units.js b/common/data/units.js
index 8f6b3a6e8..3371ec0e0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1124,12 +1124,12 @@ window.units = [
     [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, null, 1541, 749, 231, 2970, 1460, 438, null ],
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, null, 102, 151, 34, null, null, null, null ],
     [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 7, 4, 99, null, 903, 713, 144, null, null, null, null ],
-    [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, 4, 3, 70, null, 201, 102, 22, null, null, null, null ],
-    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, null, 1389, 584, 103, null, null, null, null ],
+    [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, 4, 3, 70, null, 201, 102, 22, 1461, 668, 152, null ],
+    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, null, 1389, 584, 103, 3065, 1188, 231, null ],
     [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, null, 177, 52, 31, null, null, null, null ],
     [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, null, 1255, 490, 150, null, null, null, null ],
     [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, 5, 3, 70, null, 123, 157, 20, null, null, null, null ],
-    [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, null, 1070, 724, 131, null, null, null, null ],
+    [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, null, 1070, 724, 131, 2152, 1400, 303, null ],
     [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, null, 151, 120, 29, null, null, null, null ],
     [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, null, 1171, 603, 123, null, null, null, null ]
 	];
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 4256b1af7..2d23d76ae 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -234,5 +234,9 @@ window.zombies = {
     1062: {//Gloriosa
         type: 'healer',
         multiplier: 2
+    },
+    1133: {
+        type: 'healer',
+        multiplier: 2
     }
 };

From 462ad93979ac8ee158e47d090b7ade2b19fefda7 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 3 Jul 2016 13:45:19 +0200
Subject: [PATCH 0479/1569] Orb Matching Filter

---
 common/data/details.js  | 8 ++++----
 common/data/matchers.js | 9 ++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index d5036ac2f..3ac9109c0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4363,13 +4363,13 @@ window.details = {
 	934: {
 		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
+		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	935: {
 		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Change all Fighter Character orbs to Matching",
+		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs to Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	936: {
@@ -4626,13 +4626,13 @@ window.details = {
     982: {
         captain: "Boosts ATK of Slasher characters by 2x",
 		specialName: "Flower Sword Straight Cut",
-        special: "Deals 25x character's ATK to one enemy, changes bottom row into matching orbs"
+        special: "Deals 25x character's ATK to one enemy, changes bottom row orbs into matching orbs"
     },
     983: {
         captain: "Boosts ATK of Slasher characters by 2.25x, makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters",
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
 		specialName: "Flower Sword Straight Cut",
-        special: "Deals 25x character's ATK to one enemy, changes bottom row into matching orbs"
+        special: "Deals 25x character's ATK to one enemy, changes bottom row orbs into matching orbs"
     },
     984: {
         captain: "Boosts ATK of Striker characters by 2.25x",
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 407010299..c10c66cbb 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -206,7 +206,7 @@ window.matchers = [
     {
         name: 'Full-board orb controllers',
         target: 'special',
-        matcher: /(Changes[^,]+all orbs|Changes the orbs in|Changes[^,]*every other orb)/i
+        matcher: /(Changes.+(orb|orbs)).+Matching/i
     },
 
     {
@@ -226,6 +226,13 @@ window.matchers = [
         target: 'special',
         matcher: /switches orbs/i
     },
+    
+    {
+        name: 'Orb matcher',
+        target: 'special',
+        matcher: /(Changes.+(orb|orbs))[^,]+Matching/i,
+        include: [ 1036, 1037 ]
+    },
 
     {
         name: 'Slot emptiers',

From 402d4891a51a1473c5694b6439f3669df099892e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 4 Jul 2016 12:08:38 -0500
Subject: [PATCH 0480/1569] specials fixes

text
---
 common/data/details.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3ac9109c0..9bcd4d8ad 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5502,15 +5502,15 @@ window.details = {
 	1122: {
 		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
 		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks all orbs for 2 turns, and changes own orb to [QCK].",
-		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special. He may empty all other orb slots.",
+		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
 		specialName: "Sickle Weasel of Rommel"
 	},
 	1123: {
 		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
 		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks all orbs for 2 turns, and changes own orb to [QCK].",
-		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special. He may empty all other orb slots.",
+		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
 		specialName: "Sickle Weasel of Rommel"
 	},
 	1124: {
@@ -5604,7 +5604,7 @@ window.details = {
 				"cooldown": [ 18, 12 ]
 			},
 			{
-				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.75x for 1 turn",
+				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter and Shooter characters by 1.75x for 1 turn",
 				"cooldown": [ 23, 17 ]
 			}
 		],

From b70857cf895d0ca5de91b916a26b1e09719fac97 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Wed, 6 Jul 2016 11:20:47 +0200
Subject: [PATCH 0481/1569] Fixed Sun Pirate Ship

---
 common/data/ships.js  | 6 +++---
 damage/js/cruncher.js | 4 ++--
 index.html            | 6 ++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 560305b65..24cfa061f 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -226,14 +226,14 @@ window.ships = [
     { // 18
         name: 'Sun Pirates Ship',
         thumb: null,
-        description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units. (ATK/HP Boost will assume you\'re using 6 Fighters for now.) ',
+        description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units.',
         atk: function(p) {
             return !p.unit.class.has('Fighter') ? .05 :
-                [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
+                [ p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.01 : p.classCount.Fighter == 3 ? 1.02 : p.classCount.Fighter == 4 ? 1.03 : p.classCount.Fighter == 5 ? 1.04 : p.classCount.Fighter == 6 ? 1.05 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.04 : p.classCount.Fighter == 5 ? 1.05 : p.classCount.Fighter == 6 ? 1.1 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.05 : p.classCount.Fighter == 5 ? 1.1 : p.classCount.Fighter == 6 ? 1.15 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.05 : p.classCount.Fighter == 4 ? 1.1 : p.classCount.Fighter == 5 ? 1.15 : p.classCount.Fighter == 6 ? 1.2 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.25 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.3 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.25 : p.classCount.Fighter == 6 ? 1.35 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.4 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.45 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.2 : p.classCount.Fighter == 4 ? 1.3 : p.classCount.Fighter == 5 ? 1.4 : p.classCount.Fighter == 6 ? 1.5 : 0][p.boatLevel - 1];
         },
         hp: function(p) {
             return !p.unit.class.has('Fighter') ? .05 :
-                [ 1.05, 1.1, 1.15, 1.2, 1.25, 1.3, 1.35, 1.45, 1.45, 1.5 ][p.boatLevel - 1];
+                [ p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.01 : p.classCount.Fighter == 3 ? 1.02 : p.classCount.Fighter == 4 ? 1.03 : p.classCount.Fighter == 5 ? 1.04 : p.classCount.Fighter == 6 ? 1.05 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.04 : p.classCount.Fighter == 5 ? 1.05 : p.classCount.Fighter == 6 ? 1.1 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.05 : p.classCount.Fighter == 5 ? 1.1 : p.classCount.Fighter == 6 ? 1.15 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.05 : p.classCount.Fighter == 4 ? 1.1 : p.classCount.Fighter == 5 ? 1.15 : p.classCount.Fighter == 6 ? 1.2 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.25 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.3 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.25 : p.classCount.Fighter == 6 ? 1.35 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.4 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.45 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.2 : p.classCount.Fighter == 4 ? 1.3 : p.classCount.Fighter == 5 ? 1.4 : p.classCount.Fighter == 6 ? 1.5 : 0][p.boatLevel - 1];
         }
     }, 
 
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 3d04c0228..04c38717d 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -369,8 +369,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (key.indexOf(type) !== 0) continue;
             var isStatic = (key.indexOf('Static') !== -1);
             if (isStatic != static) continue;
-            if (static) result += shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot });
-            else result *= shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot });
+            if (static) result += shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot, classCount: classCounter() });
+            else result *= shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot, classCount: classCounter()  });
         }
         return result;
     };
diff --git a/index.html b/index.html
index 1bbb52202..8046cd90c 100644
--- a/index.html
+++ b/index.html
@@ -59,7 +59,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>27/06/2016</p>
+            <p>06/07/2016</p>
             <br>
             <ul>
                 <li>Added BOMB, BLOCK, EMPTY and G </li>
@@ -67,9 +67,7 @@
                 <br>
                 <li>Added "Beneficial" Orb Captain Filter</li>
                 <br>
-                <li>Added new FN Previews</li>
-                <li>And new Condition to Calculator</li>
-                <li>Values MIGHT change for this</li>
+                <li>Fixed Sun Pirate Ship</li>
                 <br>
                 <li>Fixed Timing Captains Order</li>
                 <li>Huge thanks to lextic</li>

From a922c6ef6b5ecad1592a75372189e7bcbd2514ef Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 6 Jul 2016 08:48:29 -0500
Subject: [PATCH 0482/1569] details complete

of all units
---
 common/data/details.js | 20 +++++++++----------
 common/data/units.js   | 44 +++++++++++++++++++++---------------------
 index.html             |  6 +++---
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9bcd4d8ad..88fb832b1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5372,15 +5372,15 @@ window.details = {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: [
 			{
-				"description": "Recovers 12% of crew's MAX HP",
+				"description": "Recovers 12% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
 				"cooldown": [ 21, 11 ]
 			},
 			{
-				"description": "Recovers 24% of crew's MAX HP",
+				"description": "Recovers 24% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
 				"cooldown": [ 24, 14 ]
 			},
 			{
-				"description": "Recovers 36% of crew's MAX HP",
+				"description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
 				"cooldown": [ 27, 17 ]
 			},
 		],
@@ -5391,15 +5391,15 @@ window.details = {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
         special: [
 			{
-				"description": "Recovers 12% of crew's MAX HP",
+				"description": "Recovers 12% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
 				"cooldown": [ 21, 11 ]
 			},
 			{
-				"description": "Recovers 24% of crew's MAX HP",
+				"description": "Recovers 24% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
 				"cooldown": [ 24, 14 ]
 			},
 			{
-				"description": "Recovers 36% of crew's MAX HP",
+				"description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
 				"cooldown": [ 27, 17 ]
 			},
 		],
@@ -5526,12 +5526,12 @@ window.details = {
 	1126: {
 		captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
 		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
-		specialName: "Orlumbus Special"
+		specialName: "Admiral Killer Bowling"
 	},
 	1127: {
 		captain: "Boosts ATK of [DEX] characters by 2.25x and their HP by 1.5x",
 		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
-		specialName: "Orlumbus Special"
+		specialName: "Admiral Killer Bowling"
 	},
 	1128: {
 		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 1.75x",
@@ -5594,7 +5594,7 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}",
-		specialName: "Ideo Special"
+		specialName: "Destruction Cannon"
 	},
 	1133: {
 		captain: "Boosts ATK of Fighter characters by 2.25x and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
@@ -5609,6 +5609,6 @@ window.details = {
 			}
 		],
 		specialNotes: "#{stages}",
-		specialName: "Ideo Special"
+		specialName: "Destruction Cannon"
 	}
 };
diff --git a/common/data/units.js b/common/data/units.js
index 3371ec0e0..8a26e8017 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1097,8 +1097,8 @@ window.units = [
     [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 121, 47, 5, 1323, 520, 59, 1 ],
     [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1271, 467, 30, 2302, 980, 92, 1 ],
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
-    [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, null, 79, 50, 47, 151, 84, 57, null ],
-    [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 897, 429, 134, null, null, null, null ],
+    [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, 392109, 79, 50, 47, 151, 84, 57, 1 ],
+    [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 897, 429, 134, 1946, 995, 344, 1 ],
     [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, 1066998, 545, 404, 0, 1384, 822, 0, 1 ],
     [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1318, 749, 0, 2620, 1500, 0, 1 ],
     [ "Ain, NEO Marines", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 2, 50, 392109, 197, 101, 54, 1078, 492, 217, 1 ],
@@ -1112,26 +1112,26 @@ window.units = [
     [ "Nico Robin, Rejuvanted Archaeologist", "QCK", [ "Cerebral", "Fighter" ], 3, 12, 6, 2, 50, 392109, 95, 39, 24, 992, 524, 162, 1 ],
     [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 921, 468, 119, 1789, 941, 346, 1 ],
     [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 2, 50, 392109, 67, 55, 49, 524, 506, 300, 1 ],
-    [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, null ],
-	[ "Monkey D. Luffy, Loyal Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, null ],
-	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, null ],
-	[ "Sanji, Loyal Strawhat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, null ],
-	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, null ],
-	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, null ],
-    [ "Monkey D. Luffy Wakes of the Endless Dream, Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, null ],
-	[ "Monkey D. Luffy Oath of the Great Pirate Era: \"King of Pirates\"", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, null ],
-    [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, null, 504, 277, 148, 1603, 808, 287, null ],
-    [ "Cavendish Evolved", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, null, 1541, 749, 231, 2970, 1460, 438, null ],
-    [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, null, 102, 151, 34, null, null, null, null ],
-    [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 7, 4, 99, null, 903, 713, 144, null, null, null, null ],
-    [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, 4, 3, 70, null, 201, 102, 22, 1461, 668, 152, null ],
-    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, null, 1389, 584, 103, 3065, 1188, 231, null ],
-    [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, null, 177, 52, 31, null, null, null, null ],
-    [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, null, 1255, 490, 150, null, null, null, null ],
-    [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, 5, 3, 70, null, 123, 157, 20, null, null, null, null ],
-    [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, null, 1070, 724, 131, 2152, 1400, 303, null ],
-    [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, null, 151, 120, 29, null, null, null, null ],
-    [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, null, 1171, 603, 123, null, null, null, null ]
+    [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
+	[ "Monkey D. Luffy, Loyal Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
+	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
+	[ "Sanji, Loyal Strawhat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
+	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
+	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
+    [ "Monkey D. Luffy Wakes of the Endless Dream, Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
+	[ "Monkey D. Luffy Oath of the Great Pirate Era: \"King of Pirates\"", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
+    [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, 1066998, 504, 277, 148, 1603, 808, 287, 1 ],
+    [ "Cavendish of Hakuba", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, 5000000, 1541, 749, 231, 2970, 1460, 438, 1 ],
+    [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 102, 151, 34, 981, 780, 201, 1 ],
+    [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 7, 4, 99, 4000000, 903, 713, 144, 2000, 1410, 336, 1 ],
+    [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, 4, 3, 70, 1066998, 201, 102, 22, 1461, 668, 152, 1 ],
+    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1389, 584, 103, 3065, 1188, 231, 1 ],
+    [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 177, 52, 31, 1332, 554, 213, 1 ],
+    [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1255, 490, 150, 2940, 978, 320, 1 ],
+    [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 123, 157, 20, 1137, 800, 177, 1 ],
+    [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1070, 724, 131, 2152, 1400, 303, 1 ],
+    [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 151, 120, 29, 1230, 679, 180, 1 ],
+    [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, 4000000, 1171, 603, 123, 2404, 1318, 294, 1 ]
 	];
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 8046cd90c..3634b1df5 100644
--- a/index.html
+++ b/index.html
@@ -62,17 +62,17 @@
             <p>06/07/2016</p>
             <br>
             <ul>
+                <li>ALL units are now complete!</li>
+                <br>
                 <li>Added BOMB, BLOCK, EMPTY and G </li>
                 <li>orbs to the Special Filter</li>
                 <br>
                 <li>Added "Beneficial" Orb Captain Filter</li>
                 <br>
-                <li>Fixed Sun Pirate Ship</li>
-                <br>
                 <li>Fixed Timing Captains Order</li>
                 <li>Huge thanks to lextic</li>
                 <br>
-                <li>Love, Zeenigami & XFTS & Mondfischer<li>
+                <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>
             <table id="table">

From 8e95ef886324061a422a967db0ed0b2c5d0c9ad6 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 6 Jul 2016 08:53:58 -0500
Subject: [PATCH 0483/1569] Elizabello

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 88fb832b1..d4752674d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5559,7 +5559,7 @@ window.details = {
 				"cooldown": [ 26, 20 ]
 			},
 		],
-		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
+		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500xx character's ATK to all enemies.",
 		specialName: "King Punch"
 	},
 	1131: {
@@ -5578,7 +5578,7 @@ window.details = {
 				"cooldown": [ 26, 20 ]
 			},
 		],
-		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 487.25x character's ATK to all enemies.",
+		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.",
 		specialName: "King Punch"
 	},
 	1132: {

From 6d96f4ceb1d576444b90f56b1a29f2f38a4e1a77 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 7 Jul 2016 09:42:15 +0200
Subject: [PATCH 0484/1569] Cavendish/Ideo Special

---
 common/data/specials.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 2222fd179..9f3bb1c97 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1403,5 +1403,39 @@ window.specials = {
     1113: {
         atk: function(p) { return 1.2; },
         type: "type"
+    },
+    1122: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+    },
+    1123: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+    },
+    1132: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? window.specials[1132].multiplier : 1; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (window.specials[1132].multiplier == 1.5 ? 1 : 0);
+			window.specials[1132].multiplier = [1.5, 1.75][n];
+			p.scope.notify({
+				text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+				name: '1133warning'
+			});
+		}
+    },
+    1133: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? window.specials[1133].multiplier : 1; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (window.specials[1133].multiplier == 1.5 ? 1 : 0);
+			window.specials[1133].multiplier = [1.5, 1.75][n];
+			p.scope.notify({
+				text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+				name: '1133warning'
+			});
+		}
     }
 };
\ No newline at end of file

From a84f7204dc6eac4a28f4944e5a1f47f6a2b2a4c8 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 7 Jul 2016 09:46:40 +0200
Subject: [PATCH 0485/1569] Cavendish Special (Minus Self Boost)

---
 common/data/captains.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index 4cec365f7..cef5a291f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2826,6 +2826,12 @@ window.captains = {
 		},
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
+    1122: {
+      atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
+    },
+    1123: {
+      atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
+    },
     1124: {
 		atk: function(p) {
 			return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;

From 577109c9811226ed2a076ddac897cafdf37efbe1 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 7 Jul 2016 12:05:03 +0200
Subject: [PATCH 0486/1569] Cavendish Captain Done

sourceSlot now Suplied for ATK captain abilities
---
 common/data/captains.js    |  5 +++--
 common/data/evolutions.js  | 16 ++++++++++------
 common/data/specials.js    |  6 ++++++
 common/js/nonSuspicious.js |  2 +-
 damage/js/cruncher.js      |  9 +++++----
 index.html                 |  6 +++---
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index cef5a291f..bcf20f62f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2827,10 +2827,11 @@ window.captains = {
 		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
     1122: {
-      atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1;
+        }  
     },
     1123: {
-      atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
     },
     1124: {
 		atk: function(p) {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7d6394836..6aa39f2ce 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1691,28 +1691,32 @@ window.evolutions = {
 		evolution: 1119,
 		evolvers: [ 118, 85, 96, 301, 101 ]
 	},
+    1120: {
+        evolution: 1121,
+        evolvers: [ 118, 266, 95, 300, 267 ]
+    },
     1122: {
         evolution: 1123,
-        evolvers: []
+        evolvers: [ 118, 85, 266, 301, 267 ]
     },
     1124: {
         evolution: 1125,
-        evolvers: []
+        evolvers: [ 118, 83, 87, 98, 303 ]
     },
     1126: {
         evolution: 1127,
-        evolvers: []
+        evolvers: [ 83, 86, 97, 302, 102 ]
     },
     1128: {
         evolution: 1129,
-        evolvers: []
+        evolvers: [ 118, 94, 99, 304, 104 ]
     },
     1130: {
         evolution: 1131,
-        evolvers: []
+        evolvers: [ 84, 94, 95, 300, 100 ]
     },
     1132: {
         evolution: 1133,
-        evolvers: []
+        evolvers: [ 118, 83, 88, 304, 104 ]
     },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 9f3bb1c97..5d919144d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1404,6 +1404,12 @@ window.specials = {
         atk: function(p) { return 1.2; },
         type: "type"
     },
+    1114: {
+        atk: function(p) { return p.class.type == "STR" ? 2 : 1; }  
+    },
+    1115: {
+        atk: function(p) { return p.class.type == "STR" ? 2 : 1; }  
+    },
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type",
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 5cf59a841..151d4e6a9 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1097, 1093, 1102, 1104, 1106, 1108 ];
+    var newUnits = [ 1123, 1125, 1127, 1129, 1131, 1133 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 04c38717d..cb50ff269 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -190,7 +190,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (enabledEffects[i].hasOwnProperty('atkStatic'))
                 result = applyCaptainEffectsToDamage(result,enabledEffects[i].atkStatic,null,true);
             if (enabledEffects[i].hasOwnProperty('atk'))
-                result = applyCaptainEffectsToDamage(result,enabledEffects[i].atk,null,false);
+                result = applyCaptainEffectsToDamage(result,enabledEffects[i].atk,null,false,enabledEffects[i].sourceSlot);
         }
         // if the user has specified a custom order, sort by that
         if ($scope.tdata.orderOverride.hasOwnProperty(type)) {
@@ -405,12 +405,12 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
 
     /* * * * * Captain effects/specials * * * * */
 
-    var applyCaptainEffectsToDamage = function(damage,func,modifiers,isStatic) {
+    var applyCaptainEffectsToDamage = function(damage,func,modifiers,isStatic,sourceSlot) {
         return damage.map(function(x,n) {
-            var params = jQuery.extend({ damage: damage, modifiers: modifiers },getParameters(x.position, n));
+            var params = jQuery.extend({ damage: damage, modifiers: modifiers, sourceSlot: sourceSlot },getParameters(x.position, n));
             if (isStatic) x.base += func(params);
             else x.multipliers.push([ func(params), 'captain effect' ]);
-            return { unit: x.unit, orb: x.orb, base: x.base, multipliers: x.multipliers, position: x.position };
+            return { unit: x.unit, orb: x.orb, base: x.base, multipliers: x.multipliers, position: x.position, sourceSlot: sourceSlot };
         });
     };
 
@@ -711,6 +711,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     delete effect[func];
                 }
             }
+            effect.sourceSlot = i;
             enabledEffects.push(effect);
         }
         // find non-static captain effects
diff --git a/index.html b/index.html
index 3634b1df5..8e385eae3 100644
--- a/index.html
+++ b/index.html
@@ -59,13 +59,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>06/07/2016</p>
+            <p>07/07/2016</p>
             <br>
             <ul>
                 <li>ALL units are now complete!</li>
                 <br>
-                <li>Added BOMB, BLOCK, EMPTY and G </li>
-                <li>orbs to the Special Filter</li>
+                <li>Fixed Cavendish Captain/Special</li>
+                <li>Added missing Specials</li>
                 <br>
                 <li>Added "Beneficial" Orb Captain Filter</li>
                 <br>

From 6fea5b8a5048b037a4e23a4347286c1822353de5 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 11 Jul 2016 16:30:43 -0500
Subject: [PATCH 0487/1569] global flags

---
 common/data/flags.js | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 19dd8aa3f..6713222f4 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -706,6 +706,10 @@ window.flags = {
 	718: { rr: 1, rro: 1, global: 1 },
 	719: { rr: 1, rro: 1, global: 1 },
 	720: { rr: 1, rro: 1, global: 1 },
+    721: { global: 1 },
+	722: { global: 1 },
+    723: { global: 1 },
+	724: { global: 1 },
 	725: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	726: { global: 1, rr: 1, rro: 1, lrr: 1 },
 	727: { special: 1 },
@@ -836,23 +840,23 @@ window.flags = {
 	945: { rr: 1, rro: 1, lrr: 1 },
 	975: { rr: 1, rro: 1, lrr: 1 },
 	976: { rr: 1, rro: 1, lrr: 1 },
-    990: { rr: 1, rro: 1 },
-    991: { rr: 1, rro: 1 },
-    992: { rr: 1, rro: 1 },
-    993: { rr: 1, rro: 1 },
-    994: { rr: 1, rro: 1 },
-    995: { rr: 1, rro: 1 },
-    996: { rr: 1, rro: 1 },
-    997: { rr: 1, rro: 1 },
-    998: { rr: 1, rro: 1 },
-    999: { rr: 1, rro: 1 },
-    1000: { rr: 1, rro: 1 },
-    1001: { rr: 1, rro: 1 },
+    990: { rr: 1, rro: 1, global: 1 },
+    991: { rr: 1, rro: 1, global: 1 },
+    992: { rr: 1, rro: 1, global: 1 },
+    993: { rr: 1, rro: 1, global: 1 },
+    994: { rr: 1, rro: 1, global: 1 },
+    995: { rr: 1, rro: 1, global: 1 },
+    996: { rr: 1, rro: 1, global: 1 },
+    997: { rr: 1, rro: 1, global: 1 },
+    998: { rr: 1, rro: 1, global: 1 },
+    999: { rr: 1, rro: 1, global: 1 },
+    1000: { rr: 1, rro: 1, global: 1 },
+    1001: { rr: 1, rro: 1, global: 1 },
 	1007: { rr: 1, rro: 1, lrr: 1 },
     1008: { rr: 1, rro: 1, lrr: 1 },
 	1009: { promo: 1 },
-	1020: { rr: 1, rro: 1, lrr: 1 },
-    1021: { rr: 1, rro: 1, lrr: 1 },
+	1020: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1021: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1022: { promo: 1 },
     1024: { rr: 1, rro: 1 },
     1025: { rr: 1, rro: 1 },

From bf038c5d37b83ed0e40074786d3b3edbeabaaa61 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 12 Jul 2016 02:19:27 -0500
Subject: [PATCH 0488/1569] New fortnight units

no bugs fingers crossed
---
 common/data/cooldowns.js | 10 ++++++++--
 common/data/details.js   | 40 +++++++++++++++++++++++++++++++++++-----
 common/data/units.js     | 15 ++++++++++++++-
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 99e44f378..e58dea945 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -932,8 +932,8 @@ window.cooldowns = [
 	[ 30, 17 ],
 	[ 31, 17 ],
 	[ 31, 17 ],
-    19,
-    19,
+    [ 19, 14 ],
+    [ 19, 14 ],
     [ 19, 14 ],
     [ 19, 14 ],
     [ 24, 17 ],
@@ -1132,4 +1132,10 @@ window.cooldowns = [
 	null,//Elizabello
 	null,//Ideo
 	null,//Ideo
+	[ 6, 6 ],
+	[ 6, 6 ],
+	16,
+	[ 18 , 11 ],
+	19,
+	[ 15, 8 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index d4752674d..174c50ac1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4683,11 +4683,11 @@ window.details = {
 		special: [
 			{
 				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": 13
+				"cooldown": [ 13, 7 ]
 			},
 			{
 				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": 20
+				"cooldown": [ 20, 14 ]
 			}
 		],
 		specialNotes: "#{stages}"
@@ -4699,11 +4699,11 @@ window.details = {
 		special: [
 			{
 				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": 13
+				"cooldown": [ 13, 7 ]
 			},
 			{
 				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": 20
+				"cooldown": [ 20, 14 ]
 			}
 		],
 		specialNotes: "#{stages}"
@@ -5610,5 +5610,35 @@ window.details = {
 		],
 		specialNotes: "#{stages}",
 		specialName: "Destruction Cannon"
-	}
+	},
+	1134: {
+		captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.2x",
+		special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
+		specialName: "Young Tashigi Special",
+	},
+	1135: {
+		captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.5x",
+		special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
+		specialName: "Young Tashigi Special",
+	},
+	1136: {
+		captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
+		special: "For [QCK] characters, changes [TND] and [RCV] orbs into [QCK] orbs",
+		specialName: "Fukuro Special"
+	},
+	1137: {
+		captain: "Boosts ATK of Powerhouse characters by 2.25x",
+		special: "Deals 13x character's ATK in [STR] damage to one enemy. For Free Spirit characters, amplifies the effects of orbs by 1.5x for 2 turns",
+		specialName: "Jabra Special",
+	},
+	1138: {
+		captain: "Reduces damage received by 25%",
+		special: "Reduces damage received by 60%, and boosts ATK of Powerhouse and Fighter characters by 1.3x for 1 turn",
+		specialName: "Blueno Special"
+	},
+	1139: {
+		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
+		special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
+		specialName: "Kumadori Special"
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index 8a26e8017..9011baaa3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1131,8 +1131,21 @@ window.units = [
     [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 123, 157, 20, 1137, 800, 177, 1 ],
     [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1070, 724, 131, 2152, 1400, 303, 1 ],
     [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 151, 120, 29, 1230, 679, 180, 1 ],
-    [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, 4000000, 1171, 603, 123, 2404, 1318, 294, 1 ]
+    [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, 4000000, 1171, 603, 123, 2404, 1318, 294, 1 ],
+	[ "Young Tashigi", "INT", [ "Striker", "Cerebral" ], 4, 10, 6, 3, 35, null, 204, 71, 108, null, null, null, null ],
+    [ "Young Tashigi", "INT", [ "Striker", "Cerebral" ], 5, 18, 4, 3, 70, null, 1088, 483, 418, null, null, null, null ],
+	[ "Fukuro, Secret Intelligence Agency CP9", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 8, 2, 99, null, 73, 32, 38, null, null, null, null ],
+	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, null, 76, 59, 29, null, null, null, null ],
+	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, null, 99, 30, 19, null, null, null, null ],
+	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, null, 84, 35, 32, null, null, null, null ],
+	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 25, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 40, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Nurse Foxy", "STR", [ "Free Spirit", "Fighter" ], 16, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 26, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Porche", "PSY", [ "Shooter", "Striker" ], 10, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Porche Evolved", "PSY", [ "Shooter", "Slasher" ], 20, null, null, null, null, null, null, null, null, null, null, null, null ],
 	];
+	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ]

From fa568d9909c15b811a90dc08578cb06074c39493 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 12 Jul 2016 02:26:04 -0500
Subject: [PATCH 0489/1569] fortnight island up

---
 common/data/aliases.js |  4 ++--
 common/data/drops.js   | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d74d9b9d0..d35a9bc8d 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -640,8 +640,8 @@ window.aliases = {
     639: ['遊騎士ドーマ',''],
     640: ['ディカルバン兄弟',''],
     641: ['絆のディカルバン兄弟',''],
-    642: ['スクアード',''],
-    643: ['大渦蜘蛛スクアード',''],
+    642: ['スクアード','','Squardo'],
+    643: ['大渦蜘蛛スクアード','','Maelstrom Spider Squardo'],
     644: ['ホワイティベイ',''],
     645: ['氷の魔女ホワイティベイ',''],
     646: ['リトルオーズJr.',''],
diff --git a/common/data/drops.js b/common/data/drops.js
index 663f7a4f6..608207e4b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1046,10 +1046,18 @@ window.drops = {
         
         {
             name: "Robin and Nami's Secret Undercover Investigation",
-            thumb: null,
+            thumb: 1112,
             condition: "Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             "All Difficulties": [ 1109, 1111, 1113, -23, -628, -639, -641, -892, -937, -939, -941 ]
-        }
+        },
+		
+		{
+            name: "Behind the Scenes Intelligency Agency, CP9",
+            thumb: null,
+            condition: "Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear",
+            "All Difficulties": [ 1136, 1137, 1138, 1139, -935, -643, -673, -894, -943, -995, -615, -705, -704 ]
+        },
+		
     ],
 
             

From 7abf28809e60f2d121ba0fe3d76429a0c5e59fad Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 12 Jul 2016 10:24:30 -0500
Subject: [PATCH 0490/1569] Captains & Specials

Still missing boosting Free Spirit orbs
---
 common/data/captains.js | 25 ++++++++++++++++++++++---
 common/data/details.js  |  2 +-
 common/data/specials.js |  4 ++++
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index bcf20f62f..e4adc4e01 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2862,8 +2862,8 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1131: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return 2; }
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -2872,5 +2872,24 @@ window.captains = {
     1133: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    }
+    },
+    1134: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.2 : 1; }
+    },
+    1135: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1136: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    1137: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+    },
+    1139: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 174c50ac1..8cc657815 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5563,7 +5563,7 @@ window.details = {
 		specialName: "King Punch"
 	},
 	1131: {
-		captain: "Boosts ATK and HP of Fighter and Powerhouse characters by 1.5x",
+		captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x, and HP of all characters by 2x",
 		special: [
 			{
 				"description": "Deals 7x character's ATK in typeless damage to all enemies",
diff --git a/common/data/specials.js b/common/data/specials.js
index 5d919144d..dec1b50a5 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1443,5 +1443,9 @@ window.specials = {
 				name: '1133warning'
 			});
 		}
+    },
+    1138: {
+        atk: function(p) { return p.unit.class.has("Powerhouse" || "Fighter") ? 1.3 : 1},
+        type: "class"
     }
 };
\ No newline at end of file

From ed042301dd676dbc291036924255784997828ed2 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 13 Jul 2016 05:58:34 -0500
Subject: [PATCH 0491/1569] Sadie Fix

---
 common/data/drops.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 608207e4b..acca5ebb1 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -801,7 +801,9 @@ window.drops = {
             name: 'Chief Jailer Sadie: Cruel and Unusual',
             thumb: 550,
 			global: true,
-            condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
+            condition: '30: Non-Slasher, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
+			challenge: 'High Score calculated with Clear Speed and Crew Cost. (Crew cost can basically be ignored)',
+            challengeData: [['60,000 Points','1x Black Elder'],['160,000 Points','1x ATK Cotton Candy'],['300,000 Points','3x Rainbow Gems']],
             "All Difficulties": [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
         },
 

From 6cdf3fa4b462034af92a4186f567d02f4308a494 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 14 Jul 2016 12:12:12 -0500
Subject: [PATCH 0492/1569] Huge Units Updates

a start
---
 common/data/cooldowns.js | 20 ++++++++++++++++++++
 common/data/units.js     | 34 ++++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e58dea945..6249e400f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1138,4 +1138,24 @@ window.cooldowns = [
 	[ 18 , 11 ],
 	19,
 	[ 15, 8 ],
+    [ 30, 16 ],
+    [ 30, 16 ],
+    [ 24, 12 ],
+    [ 24, 12 ],
+    [ 22, 12 ],
+    [ 22, 12 ],
+    18,
+    15,
+    20,
+    20,
+    15,
+    25,
+    19,
+    25,
+    21,
+    10,
+    23,
+    23,
+    21,
+    21
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 9011baaa3..b0adfb0ce 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1134,16 +1134,30 @@ window.units = [
     [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, 4000000, 1171, 603, 123, 2404, 1318, 294, 1 ],
 	[ "Young Tashigi", "INT", [ "Striker", "Cerebral" ], 4, 10, 6, 3, 35, null, 204, 71, 108, null, null, null, null ],
     [ "Young Tashigi", "INT", [ "Striker", "Cerebral" ], 5, 18, 4, 3, 70, null, 1088, 483, 418, null, null, null, null ],
-	[ "Fukuro, Secret Intelligence Agency CP9", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 8, 2, 99, null, 73, 32, 38, null, null, null, null ],
-	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, null, 76, 59, 29, null, null, null, null ],
-	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, null, 99, 30, 19, null, null, null, null ],
-	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, null, 84, 35, 32, null, null, null, null ],
-	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 25, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 40, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Nurse Foxy", "STR", [ "Free Spirit", "Fighter" ], 16, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 26, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Porche", "PSY", [ "Shooter", "Striker" ], 10, null, null, null, null, null, null, null, null, null, null, null, null ],
-	[ "Porche Evolved", "PSY", [ "Shooter", "Slasher" ], 20, null, null, null, null, null, null, null, null, null, null, null, null ],
+	[ "Fukuro, Secret Intelligence Agency CP9", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 8, 2, 99, 2000000, 73, 32, 38, 1462, 730, 342, 1 ],
+	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
+	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
+	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
+	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, null, 689, 223, 31, null, null, null, null ],
+	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 2237, 925, 155, null ],
+	[ "Dying Colosseum Foxy", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, null, 165, 94, 44, 949, 503, 162, null ],
+	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, null, 867, 424, 120, 1877, 942, 313, null ],
+	[ "Porche", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, null, 129, 62, 40, null, null, null, null ],
+	[ "Porche Evolved", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, null, 591, 314, 121, null, null, null, null ],
+    [ "Red Uniformed Guard", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 40, 21, 30, null, null, null, null ],
+    [ "Green Uniformed Guard", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 52, 20, 31, null, null, null, null ],
+    [ "Blue Uniformed Guard", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 54, 19, 31, null, null, null, null ],
+    [ "Black Jailer", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 55, 39, 20, null, null, null, null ],
+    [ "Yellow Jailer", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 92, 33, 22, null, null, null, null ],
+    [ "Minotaur", "PSY", [ "Striker", "Powerhouse" ], 3, 30, 5, 1, 70, null, 549, 237, -400, null, null, null, null ],
+    [ "Minozebra", "INT", [ "Striker", "Powerhouse" ], 3, 30, 6, 1, 70, null, 563, 229, -200, null, null, null, null ],
+    [ "Sphinx", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 4, 1, 70, null, 622, 339, -300, null, null, null, null ],
+    [ "Story Saldeath", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, null, 163, 131, 57, null, null, null, null ],
+    [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, null, 36, 31, 21, null, null, null, null ],
+    [ "Story Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, null, 70, 31, 29, null, null, null, null ],
+    [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, null, 749, 352, 100, null, null, null, null ],
+    [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, null, 154, 56, -250, 1093, 470, -250, null ],
+    [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, null, 1014, 470, -250, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From ff36f2bb261b2cce45ef4cec800374f9d8d2ab6f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 14 Jul 2016 13:10:58 -0500
Subject: [PATCH 0493/1569] Families, Aliases, etc

---
 common/data/aliases.js  | 142 +++++++++++++++++++++++++---------------
 common/data/families.js |  29 +++++++-
 common/data/units.js    |   2 +-
 3 files changed, 118 insertions(+), 55 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d35a9bc8d..1744198b2 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1069,57 +1069,93 @@ window.aliases = {
     1068: [ '敏捷女格闘士 九蛇の戦士', '' ],
     1069: [ 'シュライヤ・バスクード', '', 'Shovel Guy' ],
     1070: [ 'シュライヤ・バスクード 海賊処刑人', '', 'Shovel Guy' ],
-    1071: [ '', '' ],
-    1072: [ '', '' ],
-    1073: [ '', '' ],
-    1074: [ '', '' ],
-    1075: [ '', '' ],
-    1076: [ '', '' ],
-    1077: [ '', '' ],
-    1078: [ '', '' ],
-    1079: [ '', '' ],
-    1080: [ '', '' ],
-    1081: [ '', '' ],
-    1082: [ '', '' ],
-    1083: [ '', '' ],
-    1084: [ '', '' ],
-    1085: [ '', '' ],
-    1086: [ '', '' ],
-    1087: [ '', '' ],
-    1088: [ '', '' ],
-    1089: [ '', '' ],
-    1090: [ '', '' ],
-    1091: [ '', '' ],
-    1092: [ '', '' ],
-    1093: [ '', '' ],
-    1094: [ '', '' ],
-    1095: [ '', '' ],
-    1096: [ '', '' ],
-    1097: [ '', '' ],
-    1098: [ '', '' ],
-    1099: [ '', '' ],
-    1100: [ '', '' ],
-    1101: [ '', '' ],
-    1102: [ '', '' ],
-    1103: [ '', '' ],
-    1104: [ '', '' ],
-    1105: [ '', '' ],
-    1106: [ '', '' ],
-    1107: [ '', '' ],
-    1108: [ '', '' ],
-    1109: [ '', '' ],
-    1110: [ '', '' ],
-    1111: [ '', '' ],
-    1112: [ '', '' ],
-    1113: [ '', '' ],
-    1114: [ '', '' ],
-    1115: [ '', '' ],
-    1116: [ '', '' ],
-    1117: [ '', '' ],
-    1118: [ '', '' ],
-    1119: [ '', '' ],
-	1120: [ '', '' ],
-    1121: [ '', '' ],
-    1122: [ '', '','Hakuba','cabbage' ],
-    1123: [ '', '','Hakuba','cabbage' ],
+    1071: [ 'ガスパーデ', '' ],
+    1072: [ 'ガスパーデ ガスパーデ海賊団', '' ],
+    1073: [ 'ニードルス', '' ],
+    1074: [ 'リッキー', '' ],
+    1075: [ 'リッキー 謎の剣闘士', '' ],
+    1076: [ 'レオ', '' ],
+    1077: [ 'レオ トンタッタ族戦士長', '' ],
+    1078: [ 'マンシェリー', '' ],
+    1079: [ 'マンシェリー トンタッタ族王女', '' ],
+    1080: [ 'キュロス', '' ],
+    1081: [ 'キュロス 元リク王軍軍隊長', '' ],
+    1082: [ '首領・サイ', '' ],
+    1083: [ '首領・サイ 花ノ国のギャング', '' ],
+    1084: [ '藤虎', '' ],
+    1085: [ 'イッショウ', '' ],
+    1086: [ 'ムッシュール', '' ],
+    1087: [ 'ムッシュール 毒胞子人間', '' ],
+    1088: [ 'サガ', '' ],
+    1089: [ 'サガ 呪われた聖剣', '' ],
+    1090: [ 'X・ドレーク ドレーク海賊団', '' ],
+    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '' ],
+    1092: [ 'レベッカ パラソルのリズム', '' ],
+    1093: [ 'レベッカ 虹のメロディ', '' ],
+    1094: [ 'Dr.インディゴ', '' ],
+    1095: [ 'Dr.インディゴ 金獅子海賊団', '' ],
+    1096: [ 'スカーレット隊長', '' ],
+    1097: [ 'スカーレット隊長 金獅子海賊団', '' ],
+    1098: [ '雷鳥ビリー', '' ],
+    1099: [ 'コビー 雨の中の曹長', '' ],
+    1100: [ 'コビー 露にきらめく曹長', '' ],
+    1101: [ '黒腕のゼファー', '' ],
+    1102: [ '黒腕のゼファー 元海軍本部大将', '' ],
+    1103: [ 'アイン ＮＥＯ海軍', '' ],
+    1104: [ 'アイン ゼファー最後の教え子', '' ],
+    1105: [ 'ビンズ ＮＥＯ海軍', '' ],
+    1106: [ 'ビンズ ゼファー最後の教え子', '' ],
+    1107: [ '金獅子のシキ', '' ],
+    1108: [ '金獅子のシキ 金獅子海賊団', '' ],
+    1109: [ 'ナミ 若返った航海士', '' ],
+    1110: [ 'ナミ 酒場のお茶目なアイドル', '' ],
+    1111: [ 'ニコ・ロビン 若返った考古学者', '' ],
+    1112: [ 'ニコ・ロビン 酒場の可憐な踊り娘', '' ],
+    1113: [ 'チョッパー 若返った船医', '' ],
+    1114: [ 'モンキー・D・ルフィ 夢を追い求める冒険者', '' ],
+    1115: [ 'モンキー・D・ルフィ 信念に生きる麦わらの一味', '' ],
+    1116: [ 'サンジ 夢を追い求める冒険者', '' ],
+    1117: [ 'サンジ 信念に生きる麦わらの一味', '' ],
+    1118: [ 'ナミ 夢を追い求める冒険者', '' ],
+    1119: [ 'ナミ 信念に生きる麦わらの一味', '' ],
+	1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '' ],
+    1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '' ],
+    1122: [ 'キャベンディッシュ', '','Hakuba','cabbage' ],
+    1123: [ '白馬のキャベンディッシュ', '','Hakuba','cabbage' ],
+    1124: ['スレイマン',''],
+    1125: ['首はねスレイマン',''],
+    1126: ['オオロンブス',''],
+    1127: ['オオロンブス 殺戮支配者',''],
+    1128: ['ダガマ',''],
+    1129: ['ダガマ プロデンス王国軍師',''],
+    1130: ['エリザベローII世',''],
+    1131: ['エリザベローII世 プロデンス王国国王',''],
+    1132: ['イデオ',''],
+    1133: ['イデオ 破壊砲',''],
+    1134: ['',''],
+    1135: ['',''],
+    1136: ['フクロウ 世界政府直下暗躍諜報機関',''],
+    1137: ['ジャブラ 世界政府直下暗躍諜報機関',''],
+    1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
+    1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
+    1140: ['',''],
+    1141: ['',''],
+    1142: ['',''],
+    1143: ['',''],
+    1144: ['',''],
+    1145: ['',''],
+    1146: ['',''],
+    1147: ['',''],
+    1148: ['',''],
+    1149: ['',''],
+    1150: ['',''],
+    1151: ['',''],
+    1152: ['',''],
+    1153: ['',''],
+    1154: ['',''],
+    1155: ['',''],
+    1156: ['',''],
+    1157: ['',''],
+    1158: ['',''],
+    1159: ['',''],
 };
diff --git a/common/data/families.js b/common/data/families.js
index 67de383af..60b6febba 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1131,5 +1131,32 @@ window.families = [
 	"Elizabello",
 	"Elizabello",
 	"Ideo",
-	"Ideo"
+	"Ideo",
+    "Tashigi",
+    "Tashigi",
+    "Fukuro",
+    "Jabra",
+    "Blueno",
+    "Kumadori",
+    "Moria",
+    "Moria",
+    "Foxy",
+    "Foxy",
+    "Porche",
+    "Porche",
+    "Red Uniformed Guard",
+    "Green Uniformed Guard",
+    "Blue Uniformed Guard",
+    "Black Jailer",
+    "Yellow jailer",
+    "Minotaur",
+    "Minozebra",
+    "Sphinx",
+    "Saldeath",
+    null,
+    "Hannyabal",
+    "Hannyabal",
+    "Magellan",
+    "Magellan"
+
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b0adfb0ce..c5811033e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1154,7 +1154,7 @@ window.units = [
     [ "Sphinx", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 4, 1, 70, null, 622, 339, -300, null, null, null, null ],
     [ "Story Saldeath", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, null, 163, 131, 57, null, null, null, null ],
     [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, null, 36, 31, 21, null, null, null, null ],
-    [ "Story Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, null, 70, 31, 29, null, null, null, null ],
+    [ "Story Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, null, 70, 31, 29, 824, 412, 128, null ],
     [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, null, 749, 352, 100, null, null, null, null ],
     [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, null, 154, 56, -250, 1093, 470, -250, null ],
     [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, null, 1014, 470, -250, null, null, null, null ],

From a3c4b7a4d6476830c79a854ee780de0124863180 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 18 Jul 2016 15:51:56 +0200
Subject: [PATCH 0494/1569] Bugged Captains Fixed

Fixes #38
---
 common/data/captains.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index e4adc4e01..db00d361e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2059,12 +2059,12 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2.75 : 1; }
 	},
 	902: {
-		atk: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; },
-		hp: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
 	},
 	903: {
-		atk: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; },
-		hp: function(p) { return p.class.has("Powerhouse") ? 1.25 : 1; }
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
 	},
 	905: {
 		atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.5 : 1; }
@@ -2723,10 +2723,10 @@ window.captains = {
 		rcv: function(p) { return 1 + 1 * ((100 - p.percHP) / 100);	}
 	},
     1094: {
-        atk: function(p) { return p.class.has('Cerebral') ? 2.0 : 1.0; }
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
     },
     1095: {
-        atk: function(p) { return p.class.has('Cerebral') ? 2.0 : 1.0; }
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
     },
     1096: {
 		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
@@ -2746,11 +2746,11 @@ window.captains = {
         chainModifier: function(p) { return 2; }
     },
     1099: {
-        atk: function(p) { return p.class.has('Fighter') ? 2.0 : 1.0; }
+        atk: function(p) { return p.unit.class.has('Fighter') ? 2.0 : 1.0; }
     },
     1100: {
-        atk: function(p) { return p.class.has('Fighter') ? 2.25 : 1.0; },
-        rcv: function(p) { return p.class.has('Fighter') ? 1.2 : 1.0; }
+        atk: function(p) { return p.unit.class.has('Fighter') ? 2.25 : 1.0; },
+        rcv: function(p) { return p.unit.class.has('Fighter') ? 1.2 : 1.0; }
     },
     1101: {
 		hitAtk: function(p) {
@@ -2765,12 +2765,12 @@ window.captains = {
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
     1103: {
-        atk: function(p) { return p.class.has('Cerebral') ? 1.5 : 1.0; },
-        rcv: function(p) { return p.class.has('Cerebral') ? 1.5 : 1.0; }
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; },
+        rcv: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; }
     },
     1104: {
-        atk: function(p) { return p.class.has('Cerebral') ? 1.75 : 1.0; },
-        rcv: function(p) { return p.class.has('Cerebral') ? 1.75 : 1.0; }
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 1.75 : 1.0; },
+        rcv: function(p) { return p.unit.class.has('Cerebral') ? 1.75 : 1.0; }
     },
     1105: {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }

From ea7a6be18538d46a25c87c50d450e6ad25036adb Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Jul 2016 04:07:37 -0500
Subject: [PATCH 0495/1569] Huge data dump

---
 common/data/cooldowns.js |   2 +-
 common/data/details.js   | 103 ++++++++++++++++++++++++++++++++++++++-
 common/data/drops.js     |  27 +++++++++-
 common/data/flags.js     |   6 +++
 common/data/units.js     |  14 +++---
 5 files changed, 141 insertions(+), 11 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6249e400f..5bd741f53 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1153,7 +1153,7 @@ window.cooldowns = [
     19,
     25,
     21,
-    10,
+    [ 10, 4 ],
     23,
     23,
     21,
diff --git a/common/data/details.js b/common/data/details.js
index 8cc657815..79ec7b897 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3773,12 +3773,12 @@ window.details = {
 		special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy"
 	},
 	841: {
-		captain: "Recovers 3x character's RCV in HP at the end of each turns, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
+		captain: "Recovers 3x character's RCV in HP at the end of each turn, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
 		specialName: "Snow Rabbit",
 		special: "Delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.25x for 2 turns"
 	},
 	842: {
-		captain: "Recovers 5x character's RCV in HP at the end of each turns, deals 5x character's ATK in PSY damage to all enemies at the end of each turn",
+		captain: "Recovers 5x character's RCV in HP at the end of each turn, deals 5x character's ATK in PSY damage to all enemies at the end of each turn",
 		specialName: "Snow Rabbit",
 		special: "Delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.25x for 2 turns"
 	},
@@ -5641,4 +5641,103 @@ window.details = {
 		special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
 		specialName: "Kumadori Special"
 	},
+	1140: {
+		captain: "Boosts ATK of Driven characters by 2x",
+		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
+		specialName: "Colosseum Moria Special"
+	},
+	1141: {
+		captain: "Boosts ATK of Driven characters by 2.25x, recovers 3x character's RCV in HP at the end of each turn",
+		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
+		specialName: "Colosseum Moria Special"
+	},
+	1142: {
+		captain: "Boosts ATK of Free Spirit characters by 1.5x",
+		special: "Deals 10 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
+		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
+		specialName: "Colosseum Foxy Special"
+	},
+	1143: {
+		captain: "Boosts ATK of Free Spirit characters by 2x. Reduces cooldown of Free Spirit characters by 2 turns at the start of the fight",
+		special: "Deals 10 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
+		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
+		specialName: "Colosseum Foxy Special"
+	},
+	1144: {
+		captain: "Boosts ATK of Cerebral characters by 1.75x",
+		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
+		specialName: "Colosseum Porche Special"
+	},
+	1145: {
+		captain: "Boosts ATK of Cerebral characters by 1.75x and their RCV by 1.5x",
+		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
+		specialName: "Colosseum Porche Special"
+	},
+	1146:{
+		specialName: "Bind Purge",
+		special: "Reduces Bind duration by 2 turns"
+	},
+	1147:{
+		specialName: "Shock Recovery - Light",
+		special: "Reduces Numbness by 1 turn"
+	},
+	1148:{
+		special: "Recovers 7x character's RCV in HP",
+		specialName: "Moderate Healing",
+	},
+	1149:{
+		special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
+		specialNotes: "#{poison}",
+		specialName: "Poison Attack",
+	},
+	1150:{
+		special: "Changes Captain orb into Matching orb",
+		specialName: "Captain Orb Change",
+	},
+	1151: {
+		special: "Cuts the current HP of one enemy by 10%",
+		specialName: "Minotaur Special"
+	},
+	1152: {
+		special: "Deals 7 hits of random [INT] damage to random enemies. ______ (Incomplete translation)",
+		specialNotes: "#{randomHits : 7}",
+		specialName: "Minozebra Special",
+	},
+	1153: {
+		special: "Reduces the defense of all enemies by 100% and boosts ATK of Powerhouse characters by 1.25x for 1 turn",
+		specialName: "Sphinx Special"
+	},
+	1154: {
+		captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.3x",
+		special: "Reduces crew's current HP by 30%. Boosts ATK of Powerhouse characters by 1.5x",
+		specialName: "Saldeath Special",
+	},
+	1155: {
+		special: "Deals 7x character's ATK in QCK damage to all enemies",
+		specialName: "Army Wolf Special"
+	},
+	1156: {
+		captain: "Boosts ATK of Driven characters by 1.2x if HP is above 50% at the start of the turn",
+		special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
+		specialName: "Story Hannyabal Special",
+		specialNotes: "#{zombie}",
+	},
+	1157: {
+		captain: "Boosts ATK of Driven and Striker characters by 1.75x if HP is above 50% at the start of the turn",
+		special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
+		specialName: "Story Hannyabal Special",
+		specialNotes: "#{zombie}",
+	},
+	1158: {
+		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
+		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
+		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
+		specialName: "Magellan Special"
+	},
+	1159: {
+		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
+		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
+		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
+		specialName: "Magellan Special"
+	},
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index acca5ebb1..35707c2b1 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -494,7 +494,30 @@ window.drops = {
             "07": [ 1067, 1068, 88 ],
             "08": [ 1055, 1057, 111, 113 ],
             "09": [ 1055, 1057, 110, 112 ]
-        }
+        },
+		
+		{
+            name: "Impel Down",
+            shortName: "Impel Down",
+            thumb: null,
+            completion: '5x Rainbow Gems',
+            "01": [ 931 ],
+            "02": [ 540, 931 ],
+            "03": [ 1153, 931 ],
+            "04": [ 1154, 931 ],
+            "05": [ 1151, 931 ],
+            "06": [ 1158 ],
+            "07": [ 1155, 931 ],
+            "08": [  ],
+            "09": [  ],
+			"10": [  ],
+			"11": [ 551, 539, 1151, 1152, 931, 552 ],
+			"12": [ 1156, 549 ],
+			"13": [  ],
+			"14": [ 1152 ],
+			"15": [  ],
+			"16": [ 1158 ],
+        },
         
     ],
 
@@ -892,6 +915,7 @@ window.drops = {
         {
             name: "T-Bone's Absolute Justice",
             thumb: 724,
+			global: true,
             condition: 'You can only bring INT, PSY and QCK units',
             "All Difficulties": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ]
         },
@@ -899,6 +923,7 @@ window.drops = {
         {
             name: "Explosive! Wanze's Ramen Kenpo!!",
             thumb: 743,
+			global: true,
             condition: 'You can only bring STR, QCK and DEX units',
             "All Difficulties": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index 6713222f4..19b68ccda 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -725,6 +725,10 @@ window.flags = {
     737: { global: 1 },
     738: { global: 1 },
     739: { global: 1 },
+	740: { global: 1 },
+	741: { global: 1 },
+	742: { global: 1 },
+	743: { global: 1 },
 	744: { rr: 1, rro: 1, lrr: 1 },
 	745: { rr: 1, rro: 1, lrr: 1 },
 	746: { promo: 1 },
@@ -886,6 +890,8 @@ window.flags = {
     1083: { rr: 1, rro: 1 },
     1084: { rr: 1, rro: 1 },
     1085: { rr: 1, rro: 1 },
+	1092: { rr: 1, rro: 1, lrr: 1 },
+	1093: { rr: 1, rro: 1, lrr: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
     1100: { rr: 1, rro: 1, lrr: 1 },
 	1114: { rr: 1, rro: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index c5811033e..f93a887c7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1138,22 +1138,22 @@ window.units = [
 	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
 	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
 	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
-	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, null, 689, 223, 31, null, null, null, null ],
+	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, null, 689, 223, 31, 1505, 700, 112, null ],
 	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 2237, 925, 155, null ],
 	[ "Dying Colosseum Foxy", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, null, 165, 94, 44, 949, 503, 162, null ],
 	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, null, 867, 424, 120, 1877, 942, 313, null ],
 	[ "Porche", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, null, 129, 62, 40, null, null, null, null ],
 	[ "Porche Evolved", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, null, 591, 314, 121, null, null, null, null ],
-    [ "Red Uniformed Guard", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 40, 21, 30, null, null, null, null ],
-    [ "Green Uniformed Guard", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 52, 20, 31, null, null, null, null ],
-    [ "Blue Uniformed Guard", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 54, 19, 31, null, null, null, null ],
-    [ "Black Jailer", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 55, 39, 20, null, null, null, null ],
-    [ "Yellow Jailer", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 92, 33, 22, null, null, null, null ],
+    [ "Red Uniformed Guard", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 40, 21, 30, 858, 663, 242, null ],
+    [ "Green Uniformed Guard", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 52, 20, 31, 894, 640, 246, null ],
+    [ "Blue Uniformed Guard", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 54, 19, 31, 877, 651, 244, null ],
+    [ "Black Jailer", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 55, 39, 20, 994, 727, 177, null ],
+    [ "Yellow Jailer", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 92, 33, 22, 1003, 691, 192, null ],
     [ "Minotaur", "PSY", [ "Striker", "Powerhouse" ], 3, 30, 5, 1, 70, null, 549, 237, -400, null, null, null, null ],
     [ "Minozebra", "INT", [ "Striker", "Powerhouse" ], 3, 30, 6, 1, 70, null, 563, 229, -200, null, null, null, null ],
     [ "Sphinx", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 4, 1, 70, null, 622, 339, -300, null, null, null, null ],
     [ "Story Saldeath", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, null, 163, 131, 57, null, null, null, null ],
-    [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, null, 36, 31, 21, null, null, null, null ],
+    [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, 261406, 36, 31, 21, 794, 585, 173, null ],
     [ "Story Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, null, 70, 31, 29, 824, 412, 128, null ],
     [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, null, 749, 352, 100, null, null, null, null ],
     [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, null, 154, 56, -250, 1093, 470, -250, null ],

From 36d081e482584c493f14bc22e494d60ba356b7b2 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Jul 2016 04:12:12 -0500
Subject: [PATCH 0496/1569] small fixes

---
 common/data/units.js | 2 +-
 index.html           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index f93a887c7..f7ad7468d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1139,7 +1139,7 @@ window.units = [
 	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
 	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
 	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, null, 689, 223, 31, 1505, 700, 112, null ],
-	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 2237, 925, 155, null ],
+	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, null ],
 	[ "Dying Colosseum Foxy", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, null, 165, 94, 44, 949, 503, 162, null ],
 	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, null, 867, 424, 120, 1877, 942, 313, null ],
 	[ "Porche", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, null, 129, 62, 40, null, null, null, null ],
diff --git a/index.html b/index.html
index 8e385eae3..f936b095a 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@
             <p>07/07/2016</p>
             <br>
             <ul>
-                <li>ALL units are now complete!</li>
+                <li>Translations for Impel Down Units!</li>
                 <br>
                 <li>Fixed Cavendish Captain/Special</li>
                 <li>Added missing Specials</li>

From e113e84a06dbcf336e5d8375a85b028766a1aac6 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Jul 2016 04:26:36 -0500
Subject: [PATCH 0497/1569] minozebra change

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 79ec7b897..e7334a2db 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5699,8 +5699,8 @@ window.details = {
 		specialName: "Minotaur Special"
 	},
 	1152: {
-		special: "Deals 7 hits of random [INT] damage to random enemies. ______ (Incomplete translation)",
-		specialNotes: "#{randomHits : 7}",
+		special: "Deals 3 hits of 7x character's ATK in [INT] damage to random enemies.",
+		specialNotes: "#{randomHits : 3}",
 		specialName: "Minozebra Special",
 	},
 	1153: {

From bcb9ff8d190cfeb605ea99c86107fbb68e2c33b9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Jul 2016 12:51:25 -0500
Subject: [PATCH 0498/1569] fixes & thumb

---
 common/data/details.js | 16 ++++++++--------
 common/data/drops.js   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e7334a2db..c7ece1558 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4207,11 +4207,11 @@ window.details = {
 		special: [
 			{
 				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
-				"cooldown": 15
+				"cooldown": [ 15, 7 ]
 			},
 			{
 				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
-				"cooldown": 25
+				"cooldown": [ 25, 18 ]
 			}
 		],
 		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
@@ -4222,11 +4222,11 @@ window.details = {
 		special: [
 			{
 				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
-				"cooldown": 15
+				"cooldown": [ 15, 7 ]
 			},
 			{
 				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
-				"cooldown": 25
+				"cooldown": [ 25, 18 ]
 			}
 		],
 		captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
@@ -5653,14 +5653,14 @@ window.details = {
 	},
 	1142: {
 		captain: "Boosts ATK of Free Spirit characters by 1.5x",
-		special: "Deals 10 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
+		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
+		specialNotes: "#{randomHits : 15}",
 		specialName: "Colosseum Foxy Special"
 	},
 	1143: {
 		captain: "Boosts ATK of Free Spirit characters by 2x. Reduces cooldown of Free Spirit characters by 2 turns at the start of the fight",
-		special: "Deals 10 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
+		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
+		specialNotes: "#{randomHits : 15},
 		specialName: "Colosseum Foxy Special"
 	},
 	1144: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 35707c2b1..9a27ba2c0 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1080,7 +1080,7 @@ window.drops = {
 		
 		{
             name: "Behind the Scenes Intelligency Agency, CP9",
-            thumb: null,
+            thumb: 1137,
             condition: "Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear",
             "All Difficulties": [ 1136, 1137, 1138, 1139, -935, -643, -673, -894, -943, -995, -615, -705, -704 ]
         },

From 0c738ecd53506b3a26b3242b42f214f0bdbc6cfb Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Jul 2016 13:20:39 -0500
Subject: [PATCH 0499/1569] quote

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index c7ece1558..c9683a050 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5660,7 +5660,7 @@ window.details = {
 	1143: {
 		captain: "Boosts ATK of Free Spirit characters by 2x. Reduces cooldown of Free Spirit characters by 2 turns at the start of the fight",
 		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 15},
+		specialNotes: "#{randomHits : 15}",
 		specialName: "Colosseum Foxy Special"
 	},
 	1144: {

From 86d1f54ee199e814031aa5fe9d649fcc4781fc06 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Jul 2016 14:00:20 -0500
Subject: [PATCH 0500/1569] Sailor Abilities adding

---
 characters/js/controllers.js        |  1 +
 characters/js/directives.js         | 34 +++++++++++++++++++++++++++++
 characters/views/details.html       | 30 +++++++++++++++++++++++++
 common/data/details.js              |  6 +++--
 damage/views/fragments/popover.html |  9 ++++++++
 index.html                          |  7 +++---
 6 files changed, 82 insertions(+), 5 deletions(-)

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index edbca1256..25daf3791 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -179,6 +179,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);
 
diff --git a/characters/js/directives.js b/characters/js/directives.js
index e01d0132a..bccd1c431 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -130,6 +130,30 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
         }
     };
 };
+    
+directives.addSailorOptions = function($timeout, $compile, MATCHER_IDS) {
+    //TO DO ONCE WE FIND OUT WHAT SAILOR ABILITIES DO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    /*
+    var TARGET = MATCHER_IDS['captain.ClassBoostingCaptains'];
+    return {
+        restrict: 'A',
+        link: function(scope, element, attrs) {
+            if (scope.n !== TARGET) return;
+            var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
+            var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven' ];
+            classes.forEach(function(x,n) {
+                var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
+                    'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
+                filter.append($(template.replace(/%s/g,x).replace(/%c/,'width-6')));
+            });
+            element.after(filter);
+            $compile(filter)(scope);
+            scope.onCaptainClick = function(e,type) {
+                scope.filters.classCaptain = (scope.filters.classCaptain == type ? null : type);
+            };
+        }
+    };*/
+};
 
 directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
     var TARGET = MATCHER_IDS['special.ClassBoostingSpecials'];
@@ -261,6 +285,8 @@ directives.compare = function() {
                 scope.compareCooldown = window.cooldowns[suggestion];
                 scope.isCompareCaptainHybrid = (scope.compareDetails && scope.compareDetails.captain &&
                     scope.compareDetails.captain.global);
+                scope.isCompareSailorHybrid = (scope.compareDetails && scope.compareDetails.sailor &&
+                    scope.compareDetails.sailor.global);
                 scope.isCompareSpecialHybrid = (scope.compareDetails && scope.compareDetails.special &&
                     scope.compareDetails.special.global);
                 scope.isCompareSpecialStaged = (scope.compareDetails && scope.compareDetails.special &&
@@ -357,6 +383,14 @@ directives.addTags = function($stateParams, $rootScope) {
                     name = name.replace(/iing/,'ying');
                     element.append($('<span class="tag captain">' + name + '</div>'));
                 }
+                // sailor effects
+                if (matcher.target == 'sailor' && matcher.matcher.test(data.sailor)) {
+                    name = matcher.name;
+                    if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
+                    else name = name.replace(/s$/,'');
+                    name = name.replace(/iing/,'ying');
+                    element.append($('<span class="tag sailor">' + name + '</div>'));
+                }
                 // specials
                 if (matcher.target.indexOf('special') === 0 && matcher.matcher.test(data[matcher.target])) {
                     name = matcher.name;
diff --git a/characters/views/details.html b/characters/views/details.html
index a3fe0fee9..898961a20 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -157,6 +157,21 @@ <h3 class="page-header" ng-hide="hidden.abilities">Abilities</h3>
                                         <span class="notes" ng-if="details.captainNotes" ng-bind-html="details.captainNotes | notes | decorate"></span>
                                     </td>
                                 </tr>
+                                <tr>
+                                    <td>Sailor Ability</td>
+                                    <td>
+                                        <!-- same sailor ability -->
+                                        <div ng-if="!isSailorHybrid" ng-bind-html="details.sailor | decorate"></div>
+                                        <!-- different sailor abilities -->
+                                        <div ng-if="isSailorHybrid">
+                                            <span class="badge badge-japan">Japan</span>
+                                            <div ng-bind-html="details.sailor.japan | decorate"></div>
+                                            <span class="badge badge-global">Global</span>
+                                            <div ng-bind-html="details.sailor.global | decorate"></div>
+                                        </div>
+                                        <span class="notes" ng-if="details.sailorNotes" ng-bind-html="details.sailorNotes | notes | decorate"></span>
+                                    </td>
+                                </tr>
                                 <tr>
                                     <td>Special</td>
                                     <td>
@@ -214,6 +229,21 @@ <h3 class="page-header" ng-if="compare" ng-hide="hidden.abilities">Abilities (co
                                         <span class="notes" ng-if="compareDetails.captainNotes" ng-bind-html="compareDetails.captainNotes | notes | decorate"></span>
                                     </td>
                                 </tr>
+                                <tr>
+                                    <td>Sailor Ability</td>
+                                    <td>
+                                        <!-- same sailor ability -->
+                                        <div ng-if="!isCompareSailorHybrid" ng-bind-html="compareDetails.sailor | decorate"></div>
+                                        <!-- different sailor abilities -->
+                                        <div ng-if="isCompareSailorHybrid">
+                                            <span class="badge badge-japan">Japan</span>
+                                            <div ng-bind-html="compareDetails.sailor.japan | decorate"></div>
+                                            <span class="badge badge-global">Global</span>
+                                            <div ng-bind-html="compareDetails.sailor.global | decorate"></div>
+                                        </div>
+                                        <span class="notes" ng-if="compareDetails.sailorNotes" ng-bind-html="compareDetails.sailorNotes | notes | decorate"></span>
+                                    </td>
+                                </tr>
                                 <tr>
                                     <td>Special</td>
                                     <td>
diff --git a/common/data/details.js b/common/data/details.js
index c9683a050..6cd1d4b0a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1,12 +1,14 @@
 window.details = {
 	1: {
 		special: "Deals 5x character's ATK in STR damage to one enemy",
-		specialName: "Spinning Gum Punch"
+		specialName: "Spinning Gum Punch",
+        sailorAbility: "This is a test"
 	},
 	2: {
 		special: "Deals 7x character's ATK in STR damage to one enemy",
 		specialName: "Gum-Gum Pistol",
-		captain: "Boosts ATK of STR characters by 1.5x"
+		captain: "Boosts ATK of STR characters by 1.5x",
+        sailorAbility: "This is a DIFFERENT test"
 	},
 	3: {
 		special: "Deals 15x character's ATK in STR damage to one enemy",
diff --git a/damage/views/fragments/popover.html b/damage/views/fragments/popover.html
index d60ab091e..91b9ae7ec 100644
--- a/damage/views/fragments/popover.html
+++ b/damage/views/fragments/popover.html
@@ -53,6 +53,15 @@
                     <span class="notes" ng-if="details.captainNotes" ng-bind-html="details.captainNotes | notes | decorate"></span>
                 </td>
             </tr>
+            <tr class="header" ng-if="slot < 2">
+                <td colspan="5">Sailor Ability</td>
+            </tr>
+            <tr ng-if="slot < 2">
+                <td colspan="5">
+                    <div ng-bind-html="details.sailor | decorate"></div>
+                    <span class="notes" ng-if="details.sailorNotes" ng-bind-html="details.sailorNotes | notes | decorate"></span>
+                </td>
+            </tr>
             <tr class="header">
                 <td colspan="5">Special</td>
             </tr>
diff --git a/index.html b/index.html
index f936b095a..785f40a7c 100644
--- a/index.html
+++ b/index.html
@@ -59,16 +59,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>07/07/2016</p>
+            <p>07/19/2016</p>
             <br>
             <ul>
+                <li>Sailor Abilities Preparations Begin!</li>
+                <li>Going to be a HUGE update soon!</li>
+                <br>
                 <li>Translations for Impel Down Units!</li>
                 <br>
                 <li>Fixed Cavendish Captain/Special</li>
                 <li>Added missing Specials</li>
                 <br>
-                <li>Added "Beneficial" Orb Captain Filter</li>
-                <br>
                 <li>Fixed Timing Captains Order</li>
                 <li>Huge thanks to lextic</li>
                 <br>

From 8cf94a232dea7b6a8717a49f2dc030c9ccfad5dc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 19 Jul 2016 14:03:24 -0500
Subject: [PATCH 0501/1569] Sailor Ability ready!

sailor: "blablabla"
---
 common/data/details.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6cd1d4b0a..c9683a050 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1,14 +1,12 @@
 window.details = {
 	1: {
 		special: "Deals 5x character's ATK in STR damage to one enemy",
-		specialName: "Spinning Gum Punch",
-        sailorAbility: "This is a test"
+		specialName: "Spinning Gum Punch"
 	},
 	2: {
 		special: "Deals 7x character's ATK in STR damage to one enemy",
 		specialName: "Gum-Gum Pistol",
-		captain: "Boosts ATK of STR characters by 1.5x",
-        sailorAbility: "This is a DIFFERENT test"
+		captain: "Boosts ATK of STR characters by 1.5x"
 	},
 	3: {
 		special: "Deals 15x character's ATK in STR damage to one enemy",

From 30d3d2f2b05428f9a6e50a1cdd21dcd573d2ceca Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 21 Jul 2016 14:54:53 +0200
Subject: [PATCH 0502/1569] Sailor and other Updates

---
 characters/js/index.js        |   2 +-
 characters/views/sidebar.html |   7 ++
 common/data/captains.js       |  37 ++++++++-
 common/data/details.js        | 144 +++++++++++++++++++++++-----------
 common/data/drops.js          |   5 +-
 common/data/evolutions.js     |  24 ++++++
 common/data/matchers.js       |  28 ++++++-
 common/data/specials.js       |   9 +++
 common/data/units.js          |  40 +++++-----
 common/data/zombies.js        |   4 +
 index.html                    |  14 ++--
 11 files changed, 236 insertions(+), 78 deletions(-)

diff --git a/characters/js/index.js b/characters/js/index.js
index d4048341f..61a15c11b 100644
--- a/characters/js/index.js
+++ b/characters/js/index.js
@@ -12,7 +12,7 @@ Utils.parseUnits(false);
 
 var reverseMatcherMap = { };
 for (var i=0;i<window.matchers.length;++i) {
-    var data = window.matchers[i], type = (data.target == 'captain' ? 'captain' : 'special');
+    var data = window.matchers[i], type = (data.target == 'captain' ? 'captain' : data.target == 'special' ? 'special' : 'sailor');
     var name = data.name.replace(/-/g,' ').replace(/\s(.)/g,function(x,y) { return y.toUpperCase(); });
     reverseMatcherMap[type + '.' + name] = i;
 }
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 1d3743511..93206909b 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -97,6 +97,13 @@
         ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
 </div>
 
+<div class="filter-container">
+    <span class="filter-header">Sailor filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('sailor') == 0"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
 <div class="filter-container" ng-if="showLogFilters">
     <span class="filter-header">Character Log filters</span>
     <span class="filter width-12 custom" ng-model="filters.noLog" ng-class="{ active: filters.noLog }"
diff --git a/common/data/captains.js b/common/data/captains.js
index db00d361e..4a5782890 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -6,7 +6,7 @@ window.captains = {
 		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
 	},
 	4: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+		atk: function(p) { return p.unit.type == "STR" ? 2 : 1.5; }
 	},
 	5: {
 		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
@@ -2892,4 +2892,39 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
+    1140: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    1141: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+    },
+    1142: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1143: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1144: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1145: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1154: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; }
+    },
+    1156: {
+        atk: function(p) { return ( p.unit.class.has("Driven") || p.unit.class.has("Striker") ) && p.percHP >= 50.0 ? 1.2 : 1; }
+    },
+    1157: {
+        atk: function(p) { return ( p.unit.class.has("Driven") || p.unit.class.has("Striker") )  && p.percHP >= 50.0 ? 1.75 : 1; }
+    },
+    1158: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+    },
+    1159: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+    }
 };
diff --git a/common/data/details.js b/common/data/details.js
index c9683a050..a704681f3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -14,9 +14,13 @@ window.details = {
 		captain: "Boosts ATK of STR characters by 1.5x"
 	},
 	4: {
+        captain: {
+			"global": "Boosts ATK of STR characters by 2x",
+			"japan": "Boosts ATK of STR characters by 2x, and ATK of all others by 1.5x"
+		},
+        captainNotes: "The calculator will use the JPN captain",
 		special: "Deals 25x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Twin Jet Pistol",
-		captain: "Boosts ATK of STR characters by 2x"
+		specialName: "Gum-Gum Twin Jet Pistol"
 	},
 	5: {
 		special: "Deals 7x character's ATK in DEX damage to one enemy",
@@ -1170,13 +1174,15 @@ window.details = {
 		special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
 		specialName: "Massacre Soldier",
 		specialNotes: "#{fixed}",
-		captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row"
+		captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
+        sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
 	},
 	312: {
 		special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
 		specialName: "Massacre Soldier",
 		specialNotes: "#{fixed}",
-		captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row"
+		captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
+        sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
 	},
 	313: {
 		special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
@@ -1191,12 +1197,14 @@ window.details = {
 	315: {
 		special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
 		specialName: "Aye Aye, Captain!",
-		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x"
+		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
+        sailor: "Reduces numbess for 2 turns for himself"
 	},
 	316: {
 		special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
 		specialName: "Aye Aye, Captain!",
-		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x"
+		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
+        sailor: "Reduces numbess for 2 turns for himself"
 	},
 	317: {
 		special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
@@ -1360,13 +1368,15 @@ window.details = {
 		special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
 		specialName: "Prehistoric Power",
 		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
+        sailor: "Boosts HP of Powerhouse Units by 100"
 	},
 	361: {
 		special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
 		specialName: "Prehistoric Power",
 		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
+        sailor: "Boosts HP of Powerhouse Units by 100"
 	},
 	362: {
 		special: "For 2 turns, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
@@ -1381,12 +1391,14 @@ window.details = {
 	364: {
 		special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
 		specialName: "Gang Fortress",
-		captain: "Boosts ATK and RCV of QCK characters by 2x"
+		captain: "Boosts ATK and RCV of QCK characters by 2x",
+        sailor: "Boosts RCV of Crew by 10"
 	},
 	365: {
 		special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
 		specialName: "Gang Fortress",
-		captain: "Boosts ATK and RCV of QCK characters by 2x"
+		captain: "Boosts ATK and RCV of QCK characters by 2x",
+        sailor: "Boosts RCV of Crew by 10"
 	},
 	366: {
 		special: "Deals 20x character's ATK in INT damage to all enemies, reduces Bind duration by 5 turns",
@@ -1804,12 +1816,14 @@ window.details = {
 	450: {
 		special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
 		specialName: "Number Eight's One Hit",
-		captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x"
+		captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
+        sailor: "Boosts ATK of Fighter characters by 20"
 	},
 	451: {
 		special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
 		specialName: "Number Eight's One Hit",
-		captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x"
+		captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
+        sailor: "Boosts ATK of Fighter characters by 20"
 	},
 	452: {
 		special: "Changes own orb and the captain's orb into [PSY]",
@@ -1836,12 +1850,14 @@ window.details = {
 	456: {
 		special: "Randomly changes the orbs in the middle row into either [STR] or [DEX] orbs, the orbs in the lower row into either [PSY] or [INT] orbs, switches orbs between slots once",
 		specialName: "Double Cannon",
-		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x"
+		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit"
 	},
 	457: {
 		special: "Randomly changes the orbs in the middle row into either [STR] or [DEX] orbs, the orbs in the lower row into either [PSY] or [INT] orbs, switches orbs between slots once",
 		specialName: "Double Cannon",
-		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x"
+		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit"
 	},
 	458: {
 		special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
@@ -2161,45 +2177,53 @@ window.details = {
 		special: "Deals several times the character's ATK in INT damage to all enemies",
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe - Venaison Shot",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+        sailor: "Reduces Numbnesss by 3 turns for self"
 	},
 	522: {
 		special: "Deals several times the character's ATK in INT damage to all enemies",
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe - Venaison Shot",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+        sailor: "Reduces Numbnesss by 3 turns for self"
 	},
 	523: {
 		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
 		specialName: "Billy's Electrical Discharge",
 		specialNotes: "#{zombie}",
-		captain: "Boosts ATK and RCV of Striker characters by 1.5x"
+		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
 	},
 	524: {
 		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
 		specialName: "Billy's Electrical Discharge",
 		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x"
+		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
 	},
 	525: {
 		special: "Deals random PSY damage to all enemies, randomizes all orbs",
 		specialName: "Three-Verse Humming: Arrow-Notch Slash",
-		captain: "Boosts ATK of PSY characters by 2x"
+		captain: "Boosts ATK of PSY characters by 2x",
+        sailor: "Boosts RCV of PSY Characters by 15"
 	},
 	526: {
 		special: "Deals random PSY damage to all enemies, randomizes all orbs",
 		specialName: "Three-Verse Humming: Arrow-Notch Slash",
-		captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%"
+		captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
+        sailor: "Boosts RCV of PSY Characters by 15"
 	},
 	527: {
 		special: "Removes poison, recovers 15x character's RCV in HP",
 		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
-		captain: "Boosts ATK and RCV of DEX characters by 1.5x"
+		captain: "Boosts ATK and RCV of DEX characters by 1.5x",
+        sailor: "When HP is below x%, boosts own RCV by 50"
 	},
 	528: {
 		special: "Removes poison, recovers 15x character's RCV in HP",
 		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
-		captain: "Boosts ATK and RCV of DEX characters by 2x"
+		captain: "Boosts ATK and RCV of DEX characters by 2x",
+        sailor: "When HP is below x%, boosts own RCV by 50"
 	},
 	529: {
 		special: "Deals 35x character's ATK in PSY damage to all enemies, reduces the defense of all enemies by 100% for 2 turns",
@@ -2329,45 +2353,53 @@ window.details = {
 		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
 		specialName: "Ashura Ugui",
 		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
+        sailor: "Boosts ATK of Slasher Characters by 20"
 	},
 	554: {
 		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
 		specialName: "Ashura Ugui",
 		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
+        sailor: "Boosts ATK of Slasher Characters by 20"
 	},
 	555: {
 		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
 		specialName: "Heavenly Dragon Star",
-		captain: "Boosts ATK of Shooter characters by 2x"
+		captain: "Boosts ATK of Shooter characters by 2x",
+        sailor: "Boosts RCV of Shooter Characters by 10"
 	},
 	556: {
 		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
 		specialName: "Heavenly Dragon Star",
-		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x"
+		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+        sailor: "Boosts RCV of Shooter Characters by 10"
 	},
 	557: {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
-		captain: "Boosts ATK and RCV of INT characters by 1.5x"
+		captain: "Boosts ATK and RCV of INT characters by 1.5x",
+        sailor: "Reduces blindness by 3 turn"
 	},
 	558: {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
-		captain: "Boosts ATK and RCV of INT characters by 2x"
+		captain: "Boosts ATK and RCV of INT characters by 2x",
+        sailor: "Reduces blindness by 3 turn"
 	},
 	559: {
 		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
 		specialNotes: "#{orb : 1.5x}",
 		specialName: "Roar! Zarley Davison",
-		captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn"
+		captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+        sailor: "Boosts ATK of Shooter Characters by 20"
 	},
 	560: {
 		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
 		specialNotes: "#{orb : 1.5x}",
 		specialName: "Roar! Zarley Davison",
-		captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn"
+		captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+        sailor: "Boosts ATK of Shooter Characters by 20"
 	},
 	561: {
 		special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
@@ -2719,56 +2751,68 @@ window.details = {
 	638: {
 		special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
 		specialName: "Bohemian Reverse Slash",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x"
+		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
+        sailor: "Restores his own special by 1 turn when it is rewinded",
+        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
 	639: {
 		special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
 		specialName: "Bohemian Reverse Slash",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x"
+		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
+        sailor: "Restores his own special by 1 turn when it is rewinded",
+        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
 	640: {
 		special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
 		specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Pirate Brothers: Twin Strike",
-		captain: "Boosts ATK of Fighter characters by 2x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn"
+		captain: "Boosts ATK of Fighter characters by 2x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
+        sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
 	},
 	641: {
 		special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
 		specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Pirate Brothers: Twin Strike",
-		captain: "Boosts ATK of Fighter characters by 2.25x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn"
+		captain: "Boosts ATK of Fighter characters by 2.25x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
+        sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
 	},
 	642: {
 		special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{fixed} #{orb : 1.75x}",
 		specialName: "Raging Greatsword",
-		captain: "Boosts ATK of PSY characters by 2.5x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of PSY characters by 2.5x if HP is below 30% at the start of the turn",
+        sailor: "Recovers 2 turns of numbness on self"
 	},
 	643: {
 		special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{fixed} #{orb : 1.75x}",
 		specialName: "Raging Greatsword",
-		captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
+        sailor: "Recovers 2 turns of numbness on self"
 	},
 	644: {
 		special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
 		specialName: "Witch's Icebreaker",
-		captain: "Boosts ATK of INT characters by 2x"
+		captain: "Boosts ATK of INT characters by 2x",
+        sailor: "Boosts ATK and RCV of INT characters by 20"
 	},
 	645: {
 		special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
 		specialName: "Witch's Icebreaker",
-		captain: "Boosts ATK of INT characters by 2.5x"
+		captain: "Boosts ATK of INT characters by 2.5x",
+        sailor: "Boosts ATK and RCV of INT characters by 20"
 	},
 	646: {
 		special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
 		specialName: "Vanguard Breaker",
-		captain: "Boosts ATK of Shooter characters by 2.5x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of Shooter characters by 2.5x if HP is below 30% at the start of the turn",
+        sailor: "Boosts ATK of STR characters by 30"
 	},
 	647: {
 		special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
 		specialName: "Vanguard Breaker",
-		captain: "Boosts ATK of Shooter characters by 2.75x if HP is below 30% at the start of the turn"
+		captain: "Boosts ATK of Shooter characters by 2.75x if HP is below 30% at the start of the turn",
+        sailor: "Boosts ATK of STR characters by 30"
 	},
 	648: {
 		special: "Recovers 100x character's RCV in HP, amplifies the effect of orbs by 1.5x for 2 turns",
@@ -4690,7 +4734,9 @@ window.details = {
 				"cooldown": [ 20, 14 ]
 			}
 		],
-		specialNotes: "#{stages}"
+		specialNotes: "#{stages}",
+        sailor: "Restores her own special by 1 turn when it is rewinded",
+        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
 	995:{
 		captain: "Boosts amount of beli received by 3x",
@@ -4706,7 +4752,9 @@ window.details = {
 				"cooldown": [ 20, 14 ]
 			}
 		],
-		specialNotes: "#{stages}"
+		specialNotes: "#{stages}",
+        sailor: "Restores her own special by 1 turn when it is rewinded",
+        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
@@ -5467,25 +5515,29 @@ window.details = {
 		special: "Deals several times the character's ATK in INT damage to all enemies",
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe: Concassé",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+        sailor: "Reduces Numbnesss by 3 turns for self"
 	},
 	1117: {
 		special: "Deals several times the character's ATK in INT damage to all enemies",
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe: Concassé",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+        sailor: "Reduces Numbnesss by 3 turns for self"
 	},
 	1118: {
 		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
 		specialName: "10,000-Carat Smile",
 		specialNotes: "#{zombie}",
-		captain: "Boosts ATK and RCV of Striker characters by 1.5x"
+		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
 	},
 	1119: {
 		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
 		specialName: "10,000-Carat Smile",
 		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x"
+		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
 	},
 	1120: {
 		special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
diff --git a/common/data/drops.js b/common/data/drops.js
index 9a27ba2c0..f5cba31e9 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -925,7 +925,8 @@ window.drops = {
             thumb: 743,
 			global: true,
             condition: 'You can only bring STR, QCK and DEX units',
-            "All Difficulties": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ]
+            "Japan": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ],
+            "Global": [ 740, 742, -670, -673, -586, -567, -566, -412, -225, -18 ]
         },
 
         {
@@ -1287,7 +1288,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144 ]
         }
 
    ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 6aa39f2ce..01e2bba5c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1719,4 +1719,28 @@ window.evolutions = {
         evolution: 1133,
         evolvers: [ 118, 83, 88, 304, 104 ]
     },
+    1134: {
+        evolution: 1135,
+        evolvers: [  ]
+    },
+    1140: {
+        evolution: 1141,
+        evolvers: [ 118, 83, 86, 88, 102 ]
+    },
+    1142: {
+        evolution: 1143,
+        evolvers: [ 117, 95, 99, 300, 304 ]
+    },
+    1144: {
+        evolution: 1145,
+        evolvers: [ 116, 117, 87, 98 ]
+    },
+    1156: {
+        evolution: 1157,
+        evolvers: [ 117, 81, 87, 92, 98 ]
+    },
+    1158: {
+        evolution: 1159,
+        evolvers: [ 118, 78, 82, 95, 304 ]
+    }
 };
diff --git a/common/data/matchers.js b/common/data/matchers.js
index c10c66cbb..5622b9ade 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -382,6 +382,32 @@ window.matchers = [
 		name: 'Numbness reducers',
         target: 'special',
         matcher: /reduces.+numbness.+duration/i
-	}
+	},
+    
+    /* * * * * Sailor * * * * */
+    
+    {
+        name: 'Has Sailor Ability',
+        target: 'sailor',
+        matcher: /\S/i
+    },
+    
+    {
+        name: 'Type-boosting sailors',
+        target: 'sailor',
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(STR|DEX|QCK|PSY|INT)\b/i
+    },
+    
+    {
+        name: 'Class-boosting sailors',
+        target: 'sailor',
+        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Driven)/i
+    },
+    
+    {
+        name: '"Beneficial" Orb sailors',
+        target: 'sailor',
+        matcher: /Makes (\[STR\]|\[DEX\]|\[QCK\]|\[PSY\]|\[INT\]|\[RCV\]|\[TND\]) orbs "beneficial"/i
+    },
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index dec1b50a5..8054a1f0a 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1447,5 +1447,14 @@ window.specials = {
     1138: {
         atk: function(p) { return p.unit.class.has("Powerhouse" || "Fighter") ? 1.3 : 1},
         type: "class"
+    },
+    1153: {
+        def: function(p) { return 0; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1},
+        type: "class" 
+    },
+    1154: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
+        type: "class"
     }
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f7ad7468d..61ff58695 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1138,26 +1138,26 @@ window.units = [
 	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
 	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
 	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
-	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, null, 689, 223, 31, 1505, 700, 112, null ],
-	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, null ],
-	[ "Dying Colosseum Foxy", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, null, 165, 94, 44, 949, 503, 162, null ],
-	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, null, 867, 424, 120, 1877, 942, 313, null ],
-	[ "Porche", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, null, 129, 62, 40, null, null, null, null ],
-	[ "Porche Evolved", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, null, 591, 314, 121, null, null, null, null ],
-    [ "Red Uniformed Guard", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 40, 21, 30, 858, 663, 242, null ],
-    [ "Green Uniformed Guard", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 52, 20, 31, 894, 640, 246, null ],
-    [ "Blue Uniformed Guard", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, null, 54, 19, 31, 877, 651, 244, null ],
-    [ "Black Jailer", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 55, 39, 20, 994, 727, 177, null ],
-    [ "Yellow Jailer", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, null, 92, 33, 22, 1003, 691, 192, null ],
-    [ "Minotaur", "PSY", [ "Striker", "Powerhouse" ], 3, 30, 5, 1, 70, null, 549, 237, -400, null, null, null, null ],
-    [ "Minozebra", "INT", [ "Striker", "Powerhouse" ], 3, 30, 6, 1, 70, null, 563, 229, -200, null, null, null, null ],
-    [ "Sphinx", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 4, 1, 70, null, 622, 339, -300, null, null, null, null ],
-    [ "Story Saldeath", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, null, 163, 131, 57, null, null, null, null ],
-    [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, 261406, 36, 31, 21, 794, 585, 173, null ],
-    [ "Story Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, null, 70, 31, 29, 824, 412, 128, null ],
-    [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, null, 749, 352, 100, null, null, null, null ],
-    [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, null, 154, 56, -250, 1093, 470, -250, null ],
-    [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, null, 1014, 470, -250, null, null, null, null ],
+	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, 1066998, 689, 223, 31, 1505, 700, 112, 1 ],
+	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, 1 ],
+	[ "Dying Colosseum Foxy", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, 392109, 165, 94, 44, 949, 503, 162, 1 ],
+	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 867, 424, 120, 1877, 942, 313, 1 ],
+	[ "Porche", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, 136167, 129, 62, 40, 658, 372, 170, 1 ],
+	[ "Porche Evolved", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, 1066998, 591, 314, 121, 1103, 656, 330, 1 ],
+    [ "Red Uniformed Guard", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 40, 21, 30, 858, 663, 242, 1 ],
+    [ "Green Uniformed Guard", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 52, 20, 31, 894, 640, 246, 1 ],
+    [ "Blue Uniformed Guard", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 54, 19, 31, 877, 651, 244, 1 ],
+    [ "Black Jailer", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 55, 39, 20, 994, 727, 177, 1 ],
+    [ "Yellow Jailer", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 92, 33, 22, 1003, 691, 192, 1 ],
+    [ "Minotaur", "PSY", [ "Striker", "Powerhouse" ], 3, 30, 5, 1, 70, 1066998, 549, 237, -400, 2225, 885, -400, 1 ],
+    [ "Minozebra", "INT", [ "Striker", "Powerhouse" ], 3, 30, 6, 1, 70, 1066998, 563, 229, -200, 2050, 835, -200, 1 ],
+    [ "Sphinx", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 4, 1, 70, 1066998, 622, 339, -300, 2455, 905, -300, 1 ],
+    [ "Story Saldeath", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 163, 131, 57, 912, 686, 309, 1 ],
+    [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, 261406, 36, 31, 21, 794, 585, 173, 1 ],
+    [ "Story Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, 136167, 70, 31, 29, 824, 412, 128, 1 ],
+    [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
+    [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
+    [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 2d23d76ae..bf2670406 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -238,5 +238,9 @@ window.zombies = {
     1133: {
         type: 'healer',
         multiplier: 2
+    },
+    1141: {//Story Moira
+        type: 'healer',
+        multiplier: 3
     }
 };
diff --git a/index.html b/index.html
index 785f40a7c..fd411e37d 100644
--- a/index.html
+++ b/index.html
@@ -59,19 +59,19 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>07/19/2016</p>
+            <p>21/07/2016</p>
             <br>
             <ul>
                 <li>Sailor Abilities Preparations Begin!</li>
                 <li>Going to be a HUGE update soon!</li>
                 <br>
-                <li>Translations for Impel Down Units!</li>
+                <li>Added the first Sailor Abilities</li>
+                <li>Also added a few Filters for Sailors</li>
+                <li>At the bottom of the list</li>
+                <li>Integration into the Calculator</li>
+                <li>Will come at a later Point</li>
                 <br>
-                <li>Fixed Cavendish Captain/Special</li>
-                <li>Added missing Specials</li>
-                <br>
-                <li>Fixed Timing Captains Order</li>
-                <li>Huge thanks to lextic</li>
+                <li>Updated the newest Units</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From 4d72c077454868d6130ca00bd9f39f3593bb710f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 21 Jul 2016 15:07:41 +0200
Subject: [PATCH 0503/1569] Families

>_>
---
 common/data/families.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 60b6febba..de359acc6 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1138,8 +1138,8 @@ window.families = [
     "Jabra",
     "Blueno",
     "Kumadori",
-    "Moria",
-    "Moria",
+    "Gecko Moria",
+    "Gecko Moria",
     "Foxy",
     "Foxy",
     "Porche",

From f83955acd35f1c95d9d7134070a1021c531c898c Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 21 Jul 2016 15:12:56 +0200
Subject: [PATCH 0504/1569] Quickfix for Calc popover

Was only shown if unit was not a captain
---
 damage/views/fragments/popover.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/views/fragments/popover.html b/damage/views/fragments/popover.html
index 91b9ae7ec..2ffb7212e 100644
--- a/damage/views/fragments/popover.html
+++ b/damage/views/fragments/popover.html
@@ -53,10 +53,10 @@
                     <span class="notes" ng-if="details.captainNotes" ng-bind-html="details.captainNotes | notes | decorate"></span>
                 </td>
             </tr>
-            <tr class="header" ng-if="slot < 2">
+            <tr class="header">
                 <td colspan="5">Sailor Ability</td>
             </tr>
-            <tr ng-if="slot < 2">
+            <tr>
                 <td colspan="5">
                     <div ng-bind-html="details.sailor | decorate"></div>
                     <span class="notes" ng-if="details.sailorNotes" ng-bind-html="details.sailorNotes | notes | decorate"></span>

From 6fdc4a0266a7e62f5f060b6d104acbcbdafd40c3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 21 Jul 2016 13:18:47 -0500
Subject: [PATCH 0505/1569] Oars

need 4* max
---
 common/data/aliases.js   |  2 ++
 common/data/captains.js  |  8 +++++++-
 common/data/cooldowns.js | 22 +++++++++++++++++++++-
 common/data/details.js   | 12 ++++++++++++
 common/data/units.js     | 21 +++++++++++++++++++++
 5 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1744198b2..827aa6ec4 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1158,4 +1158,6 @@ window.aliases = {
     1157: ['',''],
     1158: ['',''],
     1159: ['',''],
+    1178: ['','','Oz'],
+    1179: ['','','Oz'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 4a5782890..95012d078 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2926,5 +2926,11 @@ window.captains = {
     },
     1159: {
         atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.25 : 1; }
-    }
+    },
+    1178: {
+        atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    1179: {
+        atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5bd741f53..fc34a9a3f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1157,5 +1157,25 @@ window.cooldowns = [
     23,
     23,
     21,
-    21
+    21,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 17, 17 ],
+    [ 17, 17 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index a704681f3..9c95c6b7c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5792,4 +5792,16 @@ window.details = {
 		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
 		specialName: "Magellan Special"
 	},
+    1178: {
+        captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
+        special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
+		specialName: "Oars, The Devil Special",
+		specialNotes: "#{random : 30,000 : 150,000}",
+    },
+    1179: {
+        captain: "Boosts ATK of [STR] characters by 2.75x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
+        special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
+		specialName: "Oars, The Devil Special",
+		specialNotes: "#{random : 30,000 : 150,000}",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 61ff58695..4d74bad55 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1158,6 +1158,27 @@ window.units = [
     [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
     [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
     [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, null, 902, 473, 74, null, null, null, null ],
+    [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, null, 1920, 977, -444, 4400, 1402, -444, null ],
+    
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From d049ec6776ab70f23e543c7599696274ca0ec3d0 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 22 Jul 2016 10:38:10 +0200
Subject: [PATCH 0506/1569] Wrong Koala Books

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index f5cba31e9..f11501152 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -926,7 +926,7 @@ window.drops = {
 			global: true,
             condition: 'You can only bring STR, QCK and DEX units',
             "Japan": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ],
-            "Global": [ 740, 742, -670, -673, -586, -567, -566, -412, -225, -18 ]
+            "Global": [ 740, 742, -671, -673, -586, -567, -566, -412, -225, -18 ]
         },
 
         {

From ad350f59b87686ecc9f52112fbeab0cffbdadb67 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 22 Jul 2016 13:54:35 -0500
Subject: [PATCH 0507/1569] Gran Tesoro Fortnight & Raid Prep

---
 common/data/aliases.js  | 18 ++++++++++++++++++
 common/data/details.js  | 20 ++++++++++++++++++++
 common/data/drops.js    | 18 +++++++++++++++++-
 common/data/families.js | 23 +++++++++++++++++++++--
 common/data/units.js    |  8 ++++----
 5 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 827aa6ec4..0736ffba4 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1158,6 +1158,24 @@ window.aliases = {
     1157: ['',''],
     1158: ['',''],
     1159: ['',''],
+    1160: ['',''],
+    1161: ['',''],
+    1162: ['',''],
+    1163: ['',''],
+    1164: ['',''],
+    1165: ['',''],
+    1166: ['',''],
+    1167: ['',''],
+    1168: ['',''],
+    1169: ['',''],
+    1170: ['',''],
+    1171: ['',''],
+    1172: ['',''],
+    1173: ['',''],
+    1174: ['',''],
+    1175: ['',''],
+    1176: ['',''],
+    1177: ['',''],
     1178: ['','','Oz'],
     1179: ['','','Oz'],
 };
diff --git a/common/data/details.js b/common/data/details.js
index 9c95c6b7c..2b4d9400e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5786,6 +5786,26 @@ window.details = {
 		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
 		specialName: "Magellan Special"
 	},
+    1162: {//Tesoro
+        captain: "Under Investigation",
+        special: "Under Investigation",
+        specialName: "Tesoro Special",
+    },
+    1163: {//Tesoro Evolved
+        captain: "Under Investigation",
+        special: "Under Investigation",
+        specialName: "Tesoro Special",
+    },
+    1164: {//Carina
+        captain: "Under Investigation",
+        special: "Under Investigation",
+        specialName: "Carina Special",
+    },
+    1165: {//Carina Evolved
+        captain: "Under Investigation",
+        special: "Under Investigation",
+        specialName: "Carina Special",
+    },
 	1159: {
 		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
 		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
diff --git a/common/data/drops.js b/common/data/drops.js
index f11501152..a06b5e935 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1085,6 +1085,13 @@ window.drops = {
             condition: "Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear",
             "All Difficulties": [ 1136, 1137, 1138, 1139, -935, -643, -673, -894, -943, -995, -615, -705, -704 ]
         },
+        
+        {
+            name: "Welcome To The Gran Tesoro!",
+            thumb: null,
+            condition: "Unknown",
+            "All Difficulties": [ -578, -999, -991, -993, -675, -508, -616, -703 ]
+        },
 		
     ],
 
@@ -1188,6 +1195,7 @@ window.drops = {
         {
             name: 'Clash!! Buster Call',
             thumb: 771,
+            global: true,
             Master: [ 110, 111, 112, 113, 114, 770, 771, 772, 773, 774, 775 ],
             Expert: [ 110, 111, 112, 113, 114, 770, 771, 772, 773, 774, 775 ]
         },
@@ -1249,7 +1257,15 @@ window.drops = {
             Ultimate: [ 1107 ],
             Master: [ 1107 ],
             Expert: [ 1107 ]
-        }
+        },
+        
+        {
+            name: 'Clash!! Tesoro',
+            thumb: 1163,
+            Ultimate: [ 1162, 1164 ],
+            Master: [ 1162, 1164 ],
+            Expert: [ 1162, 1164 ]
+        },
 
     ],
 
diff --git a/common/data/families.js b/common/data/families.js
index de359acc6..4e1975a11 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1157,6 +1157,25 @@ window.families = [
     "Hannyabal",
     "Hannyabal",
     "Magellan",
-    "Magellan"
-
+    "Magellan",
+    null,
+    null,
+    "Tesoro",
+    "Tesoro",
+    "Carina",
+    "Carina",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Oars",
+    "Oars",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 4d74bad55..55784647e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1160,10 +1160,10 @@ window.units = [
     [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tesoro", "PSY", [ "Cerebral", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, null, null, 99, 5000000, null, null, null, null, null, null, null ],
+    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c6a5b3f34980880adbac40f75da2a2d02034c869 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 22 Jul 2016 14:20:03 -0500
Subject: [PATCH 0508/1569] Sailor Ability

tag no longer shows up for all units
---
 characters/js/directives.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index bccd1c431..a3e2a16ee 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -384,11 +384,11 @@ directives.addTags = function($stateParams, $rootScope) {
                     element.append($('<span class="tag captain">' + name + '</div>'));
                 }
                 // sailor effects
-                if (matcher.target == 'sailor' && matcher.matcher.test(data.sailor)) {
+                if (matcher.target.indexOf('sailor') === 0 && matcher.matcher.test(data[matcher.target]) && data[matcher.target].length>3) {
                     name = matcher.name;
-                    if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
+                    /*if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
                     else name = name.replace(/s$/,'');
-                    name = name.replace(/iing/,'ying');
+                    name = name.replace(/iing/,'ying');*/
                     element.append($('<span class="tag sailor">' + name + '</div>'));
                 }
                 // specials

From 7dcf291d997f9e07415541b599ea199da17d7fe4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 22 Jul 2016 23:37:27 -0500
Subject: [PATCH 0509/1569] Gild Tesoro Raid

---
 common/data/cooldowns.js |  8 ++++----
 common/data/details.js   | 24 ++++++++++++------------
 common/data/units.js     |  8 ++++----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fc34a9a3f..ff42e6f4b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1160,10 +1160,10 @@ window.cooldowns = [
     21,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
+    25,
+    25,
+    17,
+    17,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 2b4d9400e..d591937a1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4726,11 +4726,11 @@ window.details = {
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": [ 13, 7 ]
 			},
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": [ 20, 14 ]
 			}
 		],
@@ -4744,11 +4744,11 @@ window.details = {
 		specialName: "Peeping Mind",
 		special: [
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": [ 13, 7 ]
 			},
 			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defence, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
 				"cooldown": [ 20, 14 ]
 			}
 		],
@@ -5787,23 +5787,23 @@ window.details = {
 		specialName: "Magellan Special"
 	},
     1162: {//Tesoro
-        captain: "Under Investigation",
-        special: "Under Investigation",
+        captain: "Boosts ATK of [PSY] units by 1.75x and boosts amount of Beli received by 1.5x",
+        special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
         specialName: "Tesoro Special",
     },
     1163: {//Tesoro Evolved
-        captain: "Under Investigation",
-        special: "Under Investigation",
+        captain: "Unit Not Yet Available",
+        special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
         specialName: "Tesoro Special",
     },
     1164: {//Carina
-        captain: "Under Investigation",
-        special: "Under Investigation",
+        captain: "Boosts RCV of all characters by 1.2x",
+        special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
         specialName: "Carina Special",
     },
     1165: {//Carina Evolved
-        captain: "Under Investigation",
-        special: "Under Investigation",
+        captain: "Boosts RCV of all characters by 1.5x",
+        special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
         specialName: "Carina Special",
     },
 	1159: {
diff --git a/common/data/units.js b/common/data/units.js
index 55784647e..c9dabf2ff 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1160,10 +1160,10 @@ window.units = [
     [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tesoro", "PSY", [ "Cerebral", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, null, null, 99, 5000000, null, null, null, null, null, null, null ],
-    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, null, 187, 156, 56, 1756, 1094, 268, null ],
+    [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
+    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, null, 98, 54, 58, null, null, null, null ],
+    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, null, 597, 321, 132, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 601b2828766cc5ba35f20b74ab2aa4026fb0469b Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 22 Jul 2016 20:35:52 +0200
Subject: [PATCH 0510/1569] Revert Popover change

Actually made sense
---
 damage/views/fragments/popover.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/views/fragments/popover.html b/damage/views/fragments/popover.html
index 2ffb7212e..91b9ae7ec 100644
--- a/damage/views/fragments/popover.html
+++ b/damage/views/fragments/popover.html
@@ -53,10 +53,10 @@
                     <span class="notes" ng-if="details.captainNotes" ng-bind-html="details.captainNotes | notes | decorate"></span>
                 </td>
             </tr>
-            <tr class="header">
+            <tr class="header" ng-if="slot < 2">
                 <td colspan="5">Sailor Ability</td>
             </tr>
-            <tr>
+            <tr ng-if="slot < 2">
                 <td colspan="5">
                     <div ng-bind-html="details.sailor | decorate"></div>
                     <span class="notes" ng-if="details.sailorNotes" ng-bind-html="details.sailorNotes | notes | decorate"></span>

From 1e78708f903d0878528650b184da88bf28112b3f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 24 Jul 2016 14:56:29 +0200
Subject: [PATCH 0511/1569] Quickfixes

---
 common/data/drops.js      |  4 ++--
 common/data/evolutions.js | 12 ++++++++++++
 common/data/specials.js   |  6 ++++--
 common/data/units.js      |  6 +++---
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index a06b5e935..8d8e9f362 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1188,6 +1188,7 @@ window.drops = {
         {
             name: 'Clash!! Duval',
             thumb: 654,
+            global: true,
             Master: [ 112, 118, 302, 652 ],
             Expert: [ 86, 97, 112, 652 ]
         },
@@ -1261,8 +1262,7 @@ window.drops = {
         
         {
             name: 'Clash!! Tesoro',
-            thumb: 1163,
-            Ultimate: [ 1162, 1164 ],
+            thumb: 1162, //Change to evolved Tereso once he arrives
             Master: [ 1162, 1164 ],
             Expert: [ 1162, 1164 ]
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 01e2bba5c..4140a8cf0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1742,5 +1742,17 @@ window.evolutions = {
     1158: {
         evolution: 1159,
         evolvers: [ 118, 78, 82, 95, 304 ]
+    },
+    1162: {
+        evolution: 1163,
+        evolvers: []
+    },
+    1164: {
+        evolution: 1165,
+        evolvers: [ 116, 117, 80, 86 ]
+    },
+    1178: {
+        evolution: 1179,
+        evolvers: []
     }
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 8054a1f0a..23ff1d2ec 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1405,10 +1405,12 @@ window.specials = {
         type: "type"
     },
     1114: {
-        atk: function(p) { return p.class.type == "STR" ? 2 : 1; }  
+        atk: function(p) { return p.class.type == "STR" ? 2 : 1; },
+        type: "type"  
     },
     1115: {
-        atk: function(p) { return p.class.type == "STR" ? 2 : 1; }  
+        atk: function(p) { return p.class.type == "STR" ? 2 : 1; },
+        type: "type" 
     },
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
diff --git a/common/data/units.js b/common/data/units.js
index c9dabf2ff..c5d27cf7c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1160,10 +1160,10 @@ window.units = [
     [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, null, 187, 156, 56, 1756, 1094, 268, null ],
+    [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
     [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
-    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, null, 98, 54, 58, null, null, null, null ],
-    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, null, 597, 321, 132, null, null, null, null ],
+    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],
+    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, 1066998, 597, 321, 132, 1074, 719, 306, 1 ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 8548cf782577b490d530298168bf98cf9aa71757 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 24 Jul 2016 19:42:19 +0200
Subject: [PATCH 0512/1569] Summer Koala

---
 common/data/captains.js   |  8 ++++++++
 common/data/details.js    | 20 ++++++++++++++------
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 ++--
 common/data/units.js      |  4 ++--
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 95012d078..e9aaf12c6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2927,6 +2927,14 @@ window.captains = {
     1159: {
         atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.25 : 1; }
     },
+    1160: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },  
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
+    },
+    1161: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },  
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
+    },
     1178: {
         atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2 : 1; }
     },
diff --git a/common/data/details.js b/common/data/details.js
index d591937a1..1595adeea 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5786,6 +5786,20 @@ window.details = {
 		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
 		specialName: "Magellan Special"
 	},
+    1159: {
+		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
+		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
+		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
+		specialName: "Magellan Special"
+	},
+    1160: {
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
+        special: "Completely removes lock from captain, reduces lock of other units by 3 and recovers 2k HP"
+    },
+    1161: {
+        captain: "Boosts ATK of Free Spirit characters by 2x and their RCV by 1.5x",
+        special: "Completely removes lock from captain, reduces lock of other units by 3 and recovers 2k HP"
+    },
     1162: {//Tesoro
         captain: "Boosts ATK of [PSY] units by 1.75x and boosts amount of Beli received by 1.5x",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
@@ -5806,12 +5820,6 @@ window.details = {
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
         specialName: "Carina Special",
     },
-	1159: {
-		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
-		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
-		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
-		specialName: "Magellan Special"
-	},
     1178: {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4140a8cf0..f53ff27b6 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1743,6 +1743,10 @@ window.evolutions = {
         evolution: 1159,
         evolvers: [ 118, 78, 82, 95, 304 ]
     },
+    1160: {
+        evolution: 1161,
+        evolvers: []
+    },
     1162: {
         evolution: 1163,
         evolvers: []
diff --git a/common/data/families.js b/common/data/families.js
index 4e1975a11..99d858b0e 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1158,8 +1158,8 @@ window.families = [
     "Hannyabal",
     "Magellan",
     "Magellan",
-    null,
-    null,
+    "Koala",
+    "Koala",
     "Tesoro",
     "Tesoro",
     "Carina",
diff --git a/common/data/units.js b/common/data/units.js
index c5d27cf7c..bbbcf4b6e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1158,8 +1158,8 @@ window.units = [
     [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
     [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
     [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Summer Koala", "QCK", [ "Class1", "Class2" ], 4, 13, 6, 2, 50, null, 133, 79, 37, null, null, null, null ],
+    [ "Summer Koala Evolution", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 902, 412, 123, null, null, null, null ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
     [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
     [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],

From 1192b9f6a2db7cd26ac5aa0acca7085228151460 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 24 Jul 2016 19:45:59 +0200
Subject: [PATCH 0513/1569] Copy and Paste next time

---
 common/data/specials.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 23ff1d2ec..146060326 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1405,12 +1405,12 @@ window.specials = {
         type: "type"
     },
     1114: {
-        atk: function(p) { return p.class.type == "STR" ? 2 : 1; },
-        type: "type"  
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+		type: "type" 
     },
     1115: {
-        atk: function(p) { return p.class.type == "STR" ? 2 : 1; },
-        type: "type" 
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+		type: "type" 
     },
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },

From 90b2495f9130a53da8a1ec8288b85dabbb961ff7 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 27 Jul 2016 14:04:46 -0500
Subject: [PATCH 0514/1569] All units in, working on translations

---
 common/data/aliases.js    | 62 +++++++++++++++++++--------------------
 common/data/cooldowns.js  | 24 +++++++--------
 common/data/details.js    | 55 +++++++++++++++++++++++++++-------
 common/data/evolutions.js | 18 ++++++++++--
 common/data/families.js   | 12 ++++----
 common/data/units.js      | 32 +++++++++++++-------
 6 files changed, 131 insertions(+), 72 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0736ffba4..c96f99107 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1132,44 +1132,44 @@ window.aliases = {
     1131: ['エリザベローII世 プロデンス王国国王',''],
     1132: ['イデオ',''],
     1133: ['イデオ 破壊砲',''],
-    1134: ['',''],
-    1135: ['',''],
+    1134: ['たしぎ がむしゃらな剣道少女','','Young Tashigi', 'Kid Tashigi'],
+    1135: ['たしぎ 夢見る剣道少女','','Young Tashigi', 'Kid Tashigi'],
     1136: ['フクロウ 世界政府直下暗躍諜報機関',''],
     1137: ['ジャブラ 世界政府直下暗躍諜報機関',''],
     1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
     1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
-    1140: ['',''],
-    1141: ['',''],
-    1142: ['',''],
-    1143: ['',''],
-    1144: ['',''],
-    1145: ['',''],
-    1146: ['',''],
-    1147: ['',''],
-    1148: ['',''],
-    1149: ['',''],
-    1150: ['',''],
-    1151: ['',''],
-    1152: ['',''],
-    1153: ['',''],
-    1154: ['',''],
-    1155: ['',''],
-    1156: ['',''],
-    1157: ['',''],
-    1158: ['',''],
-    1159: ['',''],
+    1140: ['ゲッコー・モリア 魔の三角地帯の主',''],
+    1141: ['ゲッコー・モリア 魔の三角地帯の支配者',''],
+    1142: ['フォクシー ドーナツレースの邪魔者',''],
+    1143: ['フォクシー コンバットの卑怯者',''],
+    1144: ['ポルチェ お花チアリーダーズ',''],
+    1145: ['ポルチェ キューティバトンの使い手',''],
+    1146: ['制圧の制服看守',''],
+    1147: ['火急の制服看守',''],
+    1148: ['包囲の制服看守',''],
+    1149: ['理論派獄卒',''],
+    1150: ['行動派獄卒',''],
+    1151: ['ミノタウロス',''],
+    1152: ['ミノゼブラ',''],
+    1153: ['スフィンクス',''],
+    1154: ['サルデス 牢番長',''],
+    1155: ['軍隊ウルフ',''],
+    1156: ['ハンニャバル副署長',''],
+    1157: ['ハンニャバル副署長 海底監獄インペルダウン',''],
+    1158: ['マゼラン署長',''],
+    1159: ['マゼラン署長 海底監獄インペルダウン',''],
     1160: ['',''],
     1161: ['',''],
-    1162: ['',''],
+    1162: ['ギルド・テゾーロ',''],
     1163: ['',''],
-    1164: ['',''],
-    1165: ['',''],
-    1166: ['',''],
-    1167: ['',''],
-    1168: ['',''],
-    1169: ['',''],
-    1170: ['',''],
-    1171: ['',''],
+    1164: ['カリーナ',''],
+    1165: ['カリーナ 黄金船の歌姫',''],
+    1166: ['バカラ',''],
+    1167: ['バカラ 黄金船のコンシェルジュ',''],
+    1168: ['ダイス',''],
+    1169: ['ダイス 黄金船のディーラー',''],
+    1170: ['タナカさん',''],
+    1171: ['タナカさん 黄金船の警備担当',''],
     1172: ['',''],
     1173: ['',''],
     1174: ['',''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ff42e6f4b..419b5b7f3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -909,8 +909,8 @@ window.cooldowns = [
 	[ 15, 9 ],
 	[ 20, 15 ],
 	[ 20, 15 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
+	[ 25, 18 ], // 3d2y Sanji
+	[ 25, 18 ], // 3d2y Sanji
 	[ 16, 10 ],
 	[ 16, 10 ],
 	[ 13, 13 ],
@@ -1160,16 +1160,16 @@ window.cooldowns = [
     21,
     null,
     null,
-    25,
-    25,
-    17,
-    17,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    [ 25, 14 ],
+    [ 25, 14 ],
+    [ 17, 10 ],
+    [ 17, 10 ],
+    [ 14, 8 ],
+    [ 14, 8 ],
+    [ 24, 18 ],
+    [ 24, 18 ],
+    [ 19, 9 ],
+    [ 19, 9 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 1595adeea..6ed44fb27 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4099,7 +4099,7 @@ window.details = {
 	},
 	888: {
 		specialName: "Negative Ghost",
-		special: "Slightly reduces the ATK of all enemies for 3 turns",
+		special: "Slightly reduces the ATK of all enemies by 10% for 3 turns",
 		specialNotes: "The reduction does not apply to damage from specials"
 	},
 	889: {
@@ -4251,7 +4251,7 @@ window.details = {
 		special: [
 			{
 				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
-				"cooldown": [ 15, 7 ]
+				"cooldown": [ 15, 8 ]
 			},
 			{
 				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
@@ -4266,7 +4266,7 @@ window.details = {
 		special: [
 			{
 				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
-				"cooldown": [ 15, 7 ]
+				"cooldown": [ 15, 8 ]
 			},
 			{
 				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
@@ -5666,27 +5666,27 @@ window.details = {
 	1134: {
 		captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.2x",
 		special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-		specialName: "Young Tashigi Special",
+		specialName: "Non-Negotiable Quest",
 	},
 	1135: {
 		captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.5x",
 		special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-		specialName: "Young Tashigi Special",
+		specialName: "Non-Negotiable Quest",
 	},
-	1136: {
+	1136: { //Fortnight Fukuro
 		captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
 		special: "For [QCK] characters, changes [TND] and [RCV] orbs into [QCK] orbs",
-		specialName: "Fukuro Special"
+		specialName: "Stern Beast Secret Technique: 'Owl Thrasher'"
 	},
-	1137: {
+	1137: { //Fortnight Jabra
 		captain: "Boosts ATK of Powerhouse characters by 2.25x",
 		special: "Deals 13x character's ATK in [STR] damage to one enemy. For Free Spirit characters, amplifies the effects of orbs by 1.5x for 2 turns",
-		specialName: "Jabra Special",
+		specialName: "Fatal Sneak Attack",
 	},
 	1138: {
 		captain: "Reduces damage received by 25%",
 		special: "Reduces damage received by 60%, and boosts ATK of Powerhouse and Fighter characters by 1.3x for 1 turn",
-		specialName: "Blueno Special"
+		specialName: "Iron Mass: Ring Sneak Attack"
 	},
 	1139: {
 		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
@@ -5820,6 +5820,41 @@ window.details = {
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
         specialName: "Carina Special",
     },
+    1166: {//Baccarat
+        captain: "Gives chance of duplicating a drop upon completion of the island.",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with double Baccarat, giving you two chances of getting an extra drop.",
+        special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
+        specialName: "Real Rakiraki",
+    },
+    1167: {//Baccarat Evolved
+        captain: "Boosts ATK of all characters by 1.2x. Gives chance of duplicating a drop upon completion of the island.",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with double Baccarat, giving you two chances of getting an extra drop.",
+        special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
+        specialName: "Real Rakiraki",
+    },
+    1168: {//Dice
+        captain: "Boosts ATK of [STR] characters by 2x if HP is below 30% at the start of the turn",
+        special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
+		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
+        specialName: "Delt Trump Card",
+    },
+    1169: {//Dice Evolved
+        captain: "Boosts ATK of [STR] characters proportionally to the crew's current HP",
+		captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}",
+        special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
+		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
+        specialName: "Delt Trump Card",
+    },
+    1170: {//Tanaka
+        captain: "Boosts ATK of [QCK] characters by 1.5x",
+        special: "Reduces Bind and Despair duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
+		specialName: "Nuke Nuke no Mi",
+    },
+    1171: {//Tanaka Evolved
+        captain: "Boosts ATK of [QCK] characters by 2x",
+        special: "Reduces Bind and Despair duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
+		specialName: "Nuke Nuke no Mi",
+    },
     1178: {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f53ff27b6..0ce0d632c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1673,11 +1673,11 @@ window.evolutions = {
     },
     1109: {
         evolution: 1110,
-        evolvers: []
+        evolvers: [ 116, 117, 81, 87, 98 ]
     },
     1111: {
         evolution: 1112,
-        evolvers: []
+        evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1114: {
 		evolution: 1115,
@@ -1721,7 +1721,7 @@ window.evolutions = {
     },
     1134: {
         evolution: 1135,
-        evolvers: [  ]
+        evolvers: [ 117, 82, 93, 99 ]
     },
     1140: {
         evolution: 1141,
@@ -1755,6 +1755,18 @@ window.evolutions = {
         evolution: 1165,
         evolvers: [ 116, 117, 80, 86 ]
     },
+    1166: {
+        evolution: 1167,
+        evolvers: [ 117, 88, 99 ]
+    },
+    1168: {
+        evolution: 1169,
+        evolvers: [ 117, 84, 95 ]
+    },
+    1170: {
+        evolution: 1171,
+        evolvers: [ 116, 117, 85 ]
+    },
     1178: {
         evolution: 1179,
         evolvers: []
diff --git a/common/data/families.js b/common/data/families.js
index 99d858b0e..63b3b93ff 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1164,12 +1164,12 @@ window.families = [
     "Tesoro",
     "Carina",
     "Carina",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Baccarat",
+    "Baccarat",
+    "Dice",
+    "Dice",
+    "Tanaka",
+    "Tanaka",,
     null,
     null,
     null,
diff --git a/common/data/units.js b/common/data/units.js
index bbbcf4b6e..d23ebb781 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1132,8 +1132,8 @@ window.units = [
     [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1070, 724, 131, 2152, 1400, 303, 1 ],
     [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 151, 120, 29, 1230, 679, 180, 1 ],
     [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, 4000000, 1171, 603, 123, 2404, 1318, 294, 1 ],
-	[ "Young Tashigi", "INT", [ "Striker", "Cerebral" ], 4, 10, 6, 3, 35, null, 204, 71, 108, null, null, null, null ],
-    [ "Young Tashigi", "INT", [ "Striker", "Cerebral" ], 5, 18, 4, 3, 70, null, 1088, 483, 418, null, null, null, null ],
+	[ "Tashigi, Brash Kendo Girl", "INT", [ "Striker", "Cerebral" ], 4, 10, 6, 3, 35, 90778, 91, 25, 56, 600, 232, 291, 1 ],
+    [ "Tashigi, Dream Kendo Girl", "INT", [ "Striker", "Cerebral" ], 5, 18, 4, 3, 70, 1066998, 523, 177, 252, 1088, 483, 418, 1 ],
 	[ "Fukuro, Secret Intelligence Agency CP9", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 8, 2, 99, 2000000, 73, 32, 38, 1462, 730, 342, 1 ],
 	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
 	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
@@ -1163,13 +1163,13 @@ window.units = [
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
     [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
     [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],
-    [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, 1066998, 597, 321, 132, 1074, 719, 306, 1 ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Carina, Diva of Gran Tesoro", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, 1066998, 597, 321, 132, 1074, 719, 306, 1 ],
+    [ "Baccarat", "INT", [ "Fighter", "Striker" ], 3, 12, 5, 2, 50, 392109, 44, 31, 123, 888, 444, 222, 1 ],
+    [ "Baccarat, Concierge of Gran Tesoro", "INT", [ "Fighter", "Striker" ], 4, 20, 4, 2, 99, 3000000, 777, 333, 222, 1552, 777, 456, 1 ],
+    [ "Dice", "STR", [ "Free Spirit", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 84, 58, -500, 1624, 484, -500, 1 ],
+    [ "Dice, Dealer of Gran Tesoro", "STR", [ "Free Spirit", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1493, 410, -500, 3035, 1005, -500, 1 ],
+    [ "Mr. Tanaka", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, 5, 2, 50, 392109, 54, 62, 32, 924, 528, 188, 1 ],
+    [ "Tanaka, Security Guard of Gran Tesoro", "QCK", [ "Shooter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 849, 449, 131, 1706, 1089, 305, 1 ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1178,7 +1178,19 @@ window.units = [
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, null, 902, 473, 74, null, null, null, null ],
     [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, null, 1920, 977, -444, 4400, 1402, -444, null ],
-    
+    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 1 (Blenheim?)", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 1 Evolved (Blenheim?)", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 2 (Kingdew?)", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 2 Evolved (Kingdew?)", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 3 (Haruta?)", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 3 Evolved (Haruta?)", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 4 (Atmos?)", "STR", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 4 Evolved (Atmos?)", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 5 (Speed Jiru?)", "QCK", [ "Striker", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugofest Unit 5 Evolved (Speed Jiru?)", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6* Aokiji", "QCK", [ "Striker", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6* Aokiji Evolved", "QCK", [ "Striker", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 43b5ee65724c24f2221d934462b91d6deca6563b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 27 Jul 2016 15:21:03 -0500
Subject: [PATCH 0515/1569] Proper names & Translations

Because I'm that good
---
 common/data/aliases.js | 12 +++---
 common/data/details.js | 86 +++++++++++++++++++++---------------------
 common/data/units.js   | 28 +++++++-------
 index.html             |  6 +--
 4 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c96f99107..3feb67722 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1138,12 +1138,12 @@ window.aliases = {
     1137: ['ジャブラ 世界政府直下暗躍諜報機関',''],
     1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
     1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
-    1140: ['ゲッコー・モリア 魔の三角地帯の主',''],
-    1141: ['ゲッコー・モリア 魔の三角地帯の支配者',''],
-    1142: ['フォクシー ドーナツレースの邪魔者',''],
-    1143: ['フォクシー コンバットの卑怯者',''],
-    1144: ['ポルチェ お花チアリーダーズ',''],
-    1145: ['ポルチェ キューティバトンの使い手',''],
+    1140: ['ゲッコー・モリア 魔の三角地帯の主','','Colosseum Gecko Moria'],
+    1141: ['ゲッコー・モリア 魔の三角地帯の支配者','','Colosseum Gecko Moria'],
+    1142: ['フォクシー ドーナツレースの邪魔者','','Colosseum Foxy','Dying Foxy'],
+    1143: ['フォクシー コンバットの卑怯者','','Colosseum Foxy','Nurse Foxy'],
+    1144: ['ポルチェ お花チアリーダーズ','','Colosseum Porche'],
+    1145: ['ポルチェ キューティバトンの使い手','','Colosseum Porche'],
     1146: ['制圧の制服看守',''],
     1147: ['火急の制服看守',''],
     1148: ['包囲の制服看守',''],
diff --git a/common/data/details.js b/common/data/details.js
index 6ed44fb27..55c6e36df 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4568,7 +4568,7 @@ window.details = {
 	},
 	966:{
 		captain: "Boosts ATK of Driven Characters by 2.25x",
-		specialName: "Kid Special",
+		specialName: "Repel",
 		special: "Empties slots with [QCK] orbs, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
 		specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: 0 orbs - Can't activate; 1 orb - 14x ATK; 2 orbs - 21x ATK; 3 orbs - 35x ATK; 4 orbs - 49x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
 	},
@@ -4599,12 +4599,12 @@ window.details = {
 	},
 	973:{
 		captain: "Boosts ATK of Powerhouse Characters by 2x if HP is above 99% at the start of the turn",
-		specialName: "Sentoumaru Special",
+		specialName: "Ironclad Thrust: Dwarf Guard of the World",
 		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
 	},
 	974:{
 		captain: "Boosts ATK of Powerhouse Characters by 2.5x if HP is above 99% at the start of the turn",
-		specialName: "Sentoumaru Special",
+		specialName: "Ironclad Thrust: Dwarf Guard of the World",
 		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
 	},
 	975:{
@@ -5306,13 +5306,13 @@ window.details = {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
 		special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
 		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
-		specialName: "Don Sai Special"
+		specialName: "Drill Dragon: Drill Nail"
 	},
 	1083: {
 		captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
 		special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
 		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
-		specialName: "Don Sai Special"
+		specialName: "Drill Dragon: Drill Nail"
 	},
 	1084: {
 		captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
@@ -5676,7 +5676,7 @@ window.details = {
 	1136: { //Fortnight Fukuro
 		captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
 		special: "For [QCK] characters, changes [TND] and [RCV] orbs into [QCK] orbs",
-		specialName: "Stern Beast Secret Technique: 'Owl Thrasher'"
+		specialName: "Stern Beast: Secret Technique: 'Owl Thrasher' Sneak Attack"
 	},
 	1137: { //Fortnight Jabra
 		captain: "Boosts ATK of Powerhouse characters by 2.25x",
@@ -5691,52 +5691,52 @@ window.details = {
 	1139: {
 		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
 		special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
-		specialName: "Kumadori Special"
+		specialName: "Lack of Pure Chi: Lion Finger Gun Sneak Attack"
 	},
-	1140: {
+	1140: {// Colosseum Moriah
 		captain: "Boosts ATK of Driven characters by 2x",
 		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
-		specialName: "Colosseum Moria Special"
+		specialName: "Horn Blade Shadow"
 	},
-	1141: {
+	1141: {// Colosseum Moriah
 		captain: "Boosts ATK of Driven characters by 2.25x, recovers 3x character's RCV in HP at the end of each turn",
 		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
-		specialName: "Colosseum Moria Special"
+		specialName: "Horn Blade Shadow"
 	},
-	1142: {
+	1142: {// Colosseum Foxy
 		captain: "Boosts ATK of Free Spirit characters by 1.5x",
 		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 15}",
-		specialName: "Colosseum Foxy Special"
+		specialName: "Gorilla Punch: Golden Strike"
 	},
-	1143: {
+	1143: {// Colosseum Foxy
 		captain: "Boosts ATK of Free Spirit characters by 2x. Reduces cooldown of Free Spirit characters by 2 turns at the start of the fight",
 		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 15}",
-		specialName: "Colosseum Foxy Special"
+		specialName: "Gorilla Punch: Golden Strike"
 	},
-	1144: {
+	1144: {// Colosseum Porche
 		captain: "Boosts ATK of Cerebral characters by 1.75x",
 		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
-		specialName: "Colosseum Porche Special"
+		specialName: "Cutie Baton: Flower Shuriken"
 	},
-	1145: {
+	1145: {// Colosseum Porche
 		captain: "Boosts ATK of Cerebral characters by 1.75x and their RCV by 1.5x",
 		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
-		specialName: "Colosseum Porche Special"
+		specialName: "Cutie Baton: Flower Shuriken"
 	},
 	1146:{
 		specialName: "Bind Purge",
 		special: "Reduces Bind duration by 2 turns"
 	},
 	1147:{
-		specialName: "Shock Recovery - Light",
-		special: "Reduces Numbness by 1 turn"
-	},
-	1148:{
 		special: "Recovers 7x character's RCV in HP",
 		specialName: "Moderate Healing",
 	},
+    1148:{
+		specialName: "Numbness Recovery - Light",
+		special: "Reduces Numbness by 1 turn"
+	},
 	1149:{
 		special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
 		specialNotes: "#{poison}",
@@ -5746,51 +5746,51 @@ window.details = {
 		special: "Changes Captain orb into Matching orb",
 		specialName: "Captain Orb Change",
 	},
-	1151: {
+	1151: {//Minotaur
 		special: "Cuts the current HP of one enemy by 10%",
-		specialName: "Minotaur Special"
+		specialName: "Tough Jailer Beast: Spiked Club"
 	},
 	1152: {
 		special: "Deals 3 hits of 7x character's ATK in [INT] damage to random enemies.",
 		specialNotes: "#{randomHits : 3}",
-		specialName: "Minozebra Special",
+		specialName: "Shy Jailer Beast: Spiked Mace",
 	},
 	1153: {
 		special: "Reduces the defense of all enemies by 100% and boosts ATK of Powerhouse characters by 1.25x for 1 turn",
-		specialName: "Sphinx Special"
+		specialName: "Demon Lord's Roar"
 	},
 	1154: {
 		captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.3x",
 		special: "Reduces crew's current HP by 30%. Boosts ATK of Powerhouse characters by 1.5x",
-		specialName: "Saldeath Special",
+		specialName: "Leader of the Jailers",
 	},
 	1155: {
 		special: "Deals 7x character's ATK in QCK damage to all enemies",
-		specialName: "Army Wolf Special"
+		specialName: "Monsterous Appetite"
 	},
 	1156: {
 		captain: "Boosts ATK of Driven characters by 1.2x if HP is above 50% at the start of the turn",
 		special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Story Hannyabal Special",
+		specialName: "Abyss Road",
 		specialNotes: "#{zombie}",
 	},
 	1157: {
 		captain: "Boosts ATK of Driven and Striker characters by 1.75x if HP is above 50% at the start of the turn",
 		special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Story Hannyabal Special",
+		specialName: "Abyss Road",
 		specialNotes: "#{zombie}",
 	},
 	1158: {
 		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
 		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
 		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
-		specialName: "Magellan Special"
+		specialName: "Poison Puffer Fish"
 	},
     1159: {
 		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
 		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
 		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
-		specialName: "Magellan Special"
+		specialName: "Poison Puffer Fish"
 	},
     1160: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
@@ -5803,57 +5803,57 @@ window.details = {
     1162: {//Tesoro
         captain: "Boosts ATK of [PSY] units by 1.75x and boosts amount of Beli received by 1.5x",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
-        specialName: "Tesoro Special",
+        specialName: "Gold-Gold Fruit",
     },
     1163: {//Tesoro Evolved
         captain: "Unit Not Yet Available",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
-        specialName: "Tesoro Special",
+        specialName: "Gold-Gold Fruit",
     },
     1164: {//Carina
         captain: "Boosts RCV of all characters by 1.2x",
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
-        specialName: "Carina Special",
+        specialName: "Sexy Diva",
     },
     1165: {//Carina Evolved
         captain: "Boosts RCV of all characters by 1.5x",
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
-        specialName: "Carina Special",
+        specialName: "Sexy Diva",
     },
     1166: {//Baccarat
         captain: "Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with double Baccarat, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
-        specialName: "Real Rakiraki",
+        specialName: "Lucky-Lucky Fruit",
     },
     1167: {//Baccarat Evolved
         captain: "Boosts ATK of all characters by 1.2x. Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with double Baccarat, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
-        specialName: "Real Rakiraki",
+        specialName: "Lucky-Lucky Fruit",
     },
     1168: {//Dice
         captain: "Boosts ATK of [STR] characters by 2x if HP is below 30% at the start of the turn",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
 		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
-        specialName: "Delt Trump Card",
+        specialName: "Trump Card Dealer",
     },
     1169: {//Dice Evolved
         captain: "Boosts ATK of [STR] characters proportionally to the crew's current HP",
 		captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
 		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
-        specialName: "Delt Trump Card",
+        specialName: "Trump Card Dealer",
     },
     1170: {//Tanaka
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Reduces Bind and Despair duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-		specialName: "Nuke Nuke no Mi",
+		specialName: "Escape-Escape Fruit",
     },
     1171: {//Tanaka Evolved
         captain: "Boosts ATK of [QCK] characters by 2x",
         special: "Reduces Bind and Despair duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-		specialName: "Nuke Nuke no Mi",
+		specialName: "Escape-Escape Fruit",
     },
     1178: {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
diff --git a/common/data/units.js b/common/data/units.js
index d23ebb781..4f792ace1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1138,26 +1138,26 @@ window.units = [
 	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
 	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
 	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
-	[ "Colosseum Moria", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, 1066998, 689, 223, 31, 1505, 700, 112, 1 ],
-	[ "Colosseum Moria Evolved", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, 1 ],
-	[ "Dying Colosseum Foxy", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, 392109, 165, 94, 44, 949, 503, 162, 1 ],
-	[ "Nurse Foxy Evolved", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 867, 424, 120, 1877, 942, 313, 1 ],
-	[ "Porche", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, 136167, 129, 62, 40, 658, 372, 170, 1 ],
-	[ "Porche Evolved", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, 1066998, 591, 314, 121, 1103, 656, 330, 1 ],
-    [ "Red Uniformed Guard", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 40, 21, 30, 858, 663, 242, 1 ],
-    [ "Green Uniformed Guard", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 52, 20, 31, 894, 640, 246, 1 ],
-    [ "Blue Uniformed Guard", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 54, 19, 31, 877, 651, 244, 1 ],
+	[ "Gekko Moriah, Lord of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, 1066998, 689, 223, 31, 1505, 700, 112, 1 ],
+	[ "Gekko Moriah, Ruler of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, 1 ],
+	[ "Foxy, Nuisance of Donut Race", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, 392109, 165, 94, 44, 949, 503, 162, 1 ],
+	[ "Foxy, Cowardly Fighter", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 867, 424, 120, 1877, 942, 313, 1 ],
+	[ "Porche, Flower Cheerleader", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, 136167, 129, 62, 40, 658, 372, 170, 1 ],
+	[ "Porche, Cutie Baton", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, 1066998, 591, 314, 121, 1103, 656, 330, 1 ],
+    [ "Suppresion Uniformed Jailer", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 40, 21, 30, 858, 663, 242, 1 ],
+    [ "Urgent Uniformed Jailer", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 52, 20, 31, 894, 640, 246, 1 ],
+    [ "Siege Uniformed Jailer", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 54, 19, 31, 877, 651, 244, 1 ],
     [ "Black Jailer", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 55, 39, 20, 994, 727, 177, 1 ],
     [ "Yellow Jailer", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 92, 33, 22, 1003, 691, 192, 1 ],
     [ "Minotaur", "PSY", [ "Striker", "Powerhouse" ], 3, 30, 5, 1, 70, 1066998, 549, 237, -400, 2225, 885, -400, 1 ],
     [ "Minozebra", "INT", [ "Striker", "Powerhouse" ], 3, 30, 6, 1, 70, 1066998, 563, 229, -200, 2050, 835, -200, 1 ],
     [ "Sphinx", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 4, 1, 70, 1066998, 622, 339, -300, 2455, 905, -300, 1 ],
-    [ "Story Saldeath", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 163, 131, 57, 912, 686, 309, 1 ],
+    [ "Saldeath, Chief Guard", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 163, 131, 57, 912, 686, 309, 1 ],
     [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, 261406, 36, 31, 21, 794, 585, 173, 1 ],
-    [ "Story Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, 136167, 70, 31, 29, 824, 412, 128, 1 ],
-    [ "Story Hannyabal Evolved", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
-    [ "Story Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
-    [ "Story Magellan Evolved", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
+    [ "Hannyabal, Vice Warden", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, 136167, 70, 31, 29, 824, 412, 128, 1 ],
+    [ "Hannyabal, Vice Warden of the Underwater Prison Impel Down", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
+    [ "Magellan, Chief Warden", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
+    [ "Magellan, Chief Warden of the Underwater Prison Impel Down", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
     [ "Summer Koala", "QCK", [ "Class1", "Class2" ], 4, 13, 6, 2, 50, null, 133, 79, 37, null, null, null, null ],
     [ "Summer Koala Evolution", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 902, 412, 123, null, null, null, null ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
diff --git a/index.html b/index.html
index fd411e37d..4294f5e4d 100644
--- a/index.html
+++ b/index.html
@@ -59,11 +59,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>21/07/2016</p>
+            <p>27/07/2016</p>
             <br>
             <ul>
-                <li>Sailor Abilities Preparations Begin!</li>
-                <li>Going to be a HUGE update soon!</li>
+                <li>New Units Added!</li>
+                <li>Previews for new Sugo Units</li>
                 <br>
                 <li>Added the first Sailor Abilities</li>
                 <li>Also added a few Filters for Sailors</li>

From bec42b36bc7c08cf62b5511c3d58bb3de003316b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 27 Jul 2016 16:15:42 -0500
Subject: [PATCH 0516/1569] Flags, fixes, and whatnot

---
 common/data/cooldowns.js    | 12 ++++++------
 common/data/details.js      |  4 ++--
 common/data/drops.js        | 13 +++++++++----
 common/data/flags.js        | 13 +++++++++++++
 common/data/units.js        |  1 -
 probability/views/main.html |  3 ++-
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 419b5b7f3..814f3b9ed 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -996,8 +996,8 @@ window.cooldowns = [
 	null, //Violet
 	null, //Dellinger 
 	null, //Dellinger 
-	23,
-	23,
+	[ 23, 17 ],
+	[ 23, 17 ],
 	23,
 	23,
 	[ 20, 12 ],
@@ -1080,8 +1080,8 @@ window.cooldowns = [
 	null, //Mansherry
 	[ 18, 12 ],
 	[ 18, 12 ],
-	23,
-	23,
+	[ 23, 17 ],
+	[ 23, 17 ],
 	24,
 	24,
 	[ 20, 10 ],
@@ -1158,8 +1158,8 @@ window.cooldowns = [
     23,
     21,
     21,
-    null,
-    null,
+    [ 13, 13 ],
+    [ 13, 13 ],
     [ 25, 14 ],
     [ 25, 14 ],
     [ 17, 10 ],
diff --git a/common/data/details.js b/common/data/details.js
index 55c6e36df..8e09142a3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5455,12 +5455,12 @@ window.details = {
         specialName: "Return Return Fruit"
     },
 	1105: {
-        captain: "Boosts ATK of Striker and Free Spirit characters by 1.5x, deals 2x character's ATK in [STR] damage to all enemies at the end of each turn",
+        captain: "Boosts ATK of Striker and Free Spirit characters by 1.5x, deals 2x character's ATK in typeless damage to all enemies at the end of each turn",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
         specialName: "Mosa Mosa Dance"
     },
 	1106: {
-        captain: "Boosts ATK of Striker and Free Spirit characters by 2x, deals 2x character's ATK in [STR] damage to all enemies at the end of each turn",
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2x, deals 2x character's ATK in typeless damage to all enemies at the end of each turn",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
         specialName: "Mosa Mosa Dance"
     },
diff --git a/common/data/drops.js b/common/data/drops.js
index 8d8e9f362..c13c5d1ac 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -444,7 +444,9 @@ window.drops = {
             name: "Thriller Bark: Moria's Mast Mansion",
             shortName: "Thriller Bark 2",
             thumb: 894,
+            global: true,
             completion: '5x Rainbow Gems',
+            "Completion Units": [895],
             "01": [ 817, 818, 819, 888 ],
             "02": [ 393, 888, 889 ],
             "03": [ 425 ],
@@ -499,7 +501,7 @@ window.drops = {
 		{
             name: "Impel Down",
             shortName: "Impel Down",
-            thumb: null,
+            thumb: 1159,
             completion: '5x Rainbow Gems',
             "01": [ 931 ],
             "02": [ 540, 931 ],
@@ -905,6 +907,7 @@ window.drops = {
         {
             name: "Sky Night Ganfor",
             thumb: 713,
+            global: true,
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
 			challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
@@ -976,6 +979,8 @@ window.drops = {
             name: "Wapol's Counterattack",
             thumb: 852,
             condition: 'You can only bring Shooter and Driven units',
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challengeData: [['??? Damage','1x ??? Elder'],['??? Damage','1x ??? Cotton Candy, 1x Rainbow Gem'],['??? Damage','2x Rainbow Gems, 1x ??? Forbidden Tome']],
             "All Difficulties": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
         },
 
@@ -1088,9 +1093,9 @@ window.drops = {
         
         {
             name: "Welcome To The Gran Tesoro!",
-            thumb: null,
-            condition: "Unknown",
-            "All Difficulties": [ -578, -999, -991, -993, -675, -508, -616, -703 ]
+            thumb: 1167,
+            condition: "None",
+            "All Difficulties": [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703 ]
         },
 		
     ],
diff --git a/common/data/flags.js b/common/data/flags.js
index 19b68ccda..b12e74e30 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -755,6 +755,12 @@ window.flags = {
 	767: { global: 1 },
 	768: { global: 1 },
 	769: { global: 1 },
+    770: { global: 1 },
+    771: { global: 1 },
+    772: { global: 1 },
+    773: { global: 1 },
+    774: { global: 1 },
+    775: { global: 1 },
 	782: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	783: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	784: { rr: 1, rro: 1 },
@@ -814,6 +820,13 @@ window.flags = {
 	878: { rr: 1, rro: 1, global: 1 },
 	879: { rr: 1, rro: 1, global: 1 },
 	880: { rr: 1, rro: 1, global: 1 },
+    888: { global: 1 },
+    889: { global: 1 },
+    890: { global: 1 },
+    891: { global: 1 },
+    892: { global: 1 },
+    893: { global: 1 },
+    894: { global: 1 },
 	895: { special: 1 },
 	896: { special: 1 },
 	905: { rr: 1, rro: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 4f792ace1..45fa08c2d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1158,7 +1158,6 @@ window.units = [
     [ "Hannyabal, Vice Warden of the Underwater Prison Impel Down", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
     [ "Magellan, Chief Warden", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
     [ "Magellan, Chief Warden of the Underwater Prison Impel Down", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
-    [ "Summer Koala", "QCK", [ "Class1", "Class2" ], 4, 13, 6, 2, 50, null, 133, 79, 37, null, null, null, null ],
     [ "Summer Koala Evolution", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 902, 412, 123, null, null, null, null ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
     [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
diff --git a/probability/views/main.html b/probability/views/main.html
index cd8a62fe8..d0cd2f118 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -34,7 +34,8 @@ <h1 class="page-header">
                     <p></p>
 					Copies/Books: <input type="text" class="number-field" ng-model="copies" placeholder="e.g. 65" auto-focus
 						ng-change="changeBaseValues()" id="copies">
-					Skillups: <input type="text" class="number-field" ng-model="skillups" placeholder="e.g. 10" auto-focus
+                    <p></p>
+					Number of Skill-Ups You Need: <input type="text" class="number-field" ng-model="skillups" placeholder="e.g. 10" auto-focus
 						ng-change="changeBaseValues()" id="skillups">
 					
 				</div>

From 52a853314e8bca22918044c03032e62f147da05c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 27 Jul 2016 16:16:00 -0500
Subject: [PATCH 0517/1569] Summer Koala fix

---
 common/data/units.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/units.js b/common/data/units.js
index 45fa08c2d..51cc50064 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1158,6 +1158,7 @@ window.units = [
     [ "Hannyabal, Vice Warden of the Underwater Prison Impel Down", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
     [ "Magellan, Chief Warden", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
     [ "Magellan, Chief Warden of the Underwater Prison Impel Down", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
+    [ "Summer Koala", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 2, 50, null, 133, 79, 37, 994, 479, 187, null ],
     [ "Summer Koala Evolution", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 902, 412, 123, null, null, null, null ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
     [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],

From d3df88b599c26fb105b7cebd881fb45f66b47600 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 27 Jul 2016 16:50:56 -0500
Subject: [PATCH 0518/1569] berry good

---
 common/data/aliases.js | 2 +-
 common/data/units.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 3feb67722..51c3fa5c4 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -772,7 +772,7 @@ window.aliases = {
     771: ['モモンガ 海軍本部中将',''],
     772: ['オニグモ 海軍本部中将',''],
     773: ['シュウ',''],
-    774: ['ベリーグッド',''],
+    774: ['ベリーグッド','','Very Good'],
     775: ['ストロベリー 海軍本部中将',''],
     776: ['ラッキー・ルウ',''],
     777: ['ラッキー・ルウ 赤髪海賊団',''],
diff --git a/common/data/units.js b/common/data/units.js
index 51cc50064..8f1e7c166 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -772,7 +772,7 @@ window.units = [
 	[ "Momonga, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
 	[ "Onigumo, Navy HQ Vice Admiral", "DEX", [ "Slasher", "Driven" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
 	[ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
-	[ "Very Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
+	[ "Berry Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
 	[ "Strawberry, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
 	[ "Lucky Roo", "PSY", [ "Shooter", "Free Spirit" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
 	[ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],

From c33c3ed3e6728f24b9c15299ea0176eafff4d820 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 28 Jul 2016 15:49:36 -0500
Subject: [PATCH 0519/1569] Wapol Mission

---
 common/data/drops.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index c13c5d1ac..8b39ccbf2 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -978,9 +978,9 @@ window.drops = {
         {
             name: "Wapol's Counterattack",
             thumb: 852,
-            condition: 'You can only bring Shooter and Driven units',
+            condition: 'You can only bring Shooter and Driven units. (No Evo/Boosters)',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
-            challengeData: [['??? Damage','1x ??? Elder'],['??? Damage','1x ??? Cotton Candy, 1x Rainbow Gem'],['??? Damage','2x Rainbow Gems, 1x ??? Forbidden Tome']],
+            challengeData: [['400,000 Damage','1x QCK Elder Turtle'],['1,400,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['4,000,000 Damage','2x Rainbow Gems, 1x Despair Forbidden Tome']],
             "All Difficulties": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
         },
 

From b0b8d7bb27ac8d6e6d3423a6c1aa91e56274dc17 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 29 Jul 2016 12:42:21 -0500
Subject: [PATCH 0520/1569] New Sugofest Units

Details
---
 common/data/aliases.js    |  16 ++--
 common/data/details.js    | 158 +++++++++++++++++++++++++++++++++++---
 common/data/evolutions.js |  14 +++-
 common/data/units.js      |  46 +++++------
 4 files changed, 192 insertions(+), 42 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 51c3fa5c4..7f82e5d10 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1170,12 +1170,12 @@ window.aliases = {
     1169: ['ダイス 黄金船のディーラー',''],
     1170: ['タナカさん',''],
     1171: ['タナカさん 黄金船の警備担当',''],
-    1172: ['',''],
-    1173: ['',''],
-    1174: ['',''],
-    1175: ['',''],
-    1176: ['',''],
-    1177: ['',''],
-    1178: ['','','Oz'],
-    1179: ['','','Oz'],
+    1172: ['ブルック 夢を追い求める冒険者',''],
+    1173: ['ブルック 信念に生きる麦わらの一味',''],
+    1174: ['ロロノア・ゾロ 夢を追い求める冒険者',''],
+    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味',''],
+    1176: ['チョッパー 夢を追い求める冒険者',''],
+    1177: ['チョッパー 信念に生きる麦わらの一味',''],
+    1178: ['オーズ','','Oz'],
+    1179: ['魔人オーズ','','Oz'],
 };
diff --git a/common/data/details.js b/common/data/details.js
index 8e09142a3..d5b3dd6f8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2753,14 +2753,14 @@ window.details = {
 		specialName: "Bohemian Reverse Slash",
 		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
 	},
 	639: {
 		special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
 		specialName: "Bohemian Reverse Slash",
 		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
 	},
 	640: {
 		special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
@@ -4736,7 +4736,7 @@ window.details = {
 		],
 		specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
 	},
 	995:{
 		captain: "Boosts amount of beli received by 3x",
@@ -4754,7 +4754,7 @@ window.details = {
 		],
 		specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
 	},
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
@@ -5822,13 +5822,13 @@ window.details = {
     },
     1166: {//Baccarat
         captain: "Gives chance of duplicating a drop upon completion of the island.",
-        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with double Baccarat, giving you two chances of getting an extra drop.",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
         specialName: "Lucky-Lucky Fruit",
     },
     1167: {//Baccarat Evolved
         captain: "Boosts ATK of all characters by 1.2x. Gives chance of duplicating a drop upon completion of the island.",
-        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with double Baccarat, giving you two chances of getting an extra drop.",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
         specialName: "Lucky-Lucky Fruit",
     },
@@ -5847,24 +5847,162 @@ window.details = {
     },
     1170: {//Tanaka
         captain: "Boosts ATK of [QCK] characters by 1.5x",
-        special: "Reduces Bind and Despair duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
+        special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
 		specialName: "Escape-Escape Fruit",
     },
     1171: {//Tanaka Evolved
         captain: "Boosts ATK of [QCK] characters by 2x",
-        special: "Reduces Bind and Despair duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
+        special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
 		specialName: "Escape-Escape Fruit",
     },
+    1172: {
+		special: "Deals random PSY damage to all enemies, randomizes all orbs",
+		specialName: "Three-Verse Humming: Arrow-Notch Slash",
+		captain: "Boosts ATK of PSY characters by 2x",
+        sailor: "Boosts RCV of PSY Characters by 15"
+	},
+	1173: {
+		special: "Deals random PSY damage to all enemies, randomizes all orbs",
+		specialName: "Three-Verse Humming: Arrow-Notch Slash",
+		captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
+        sailor: "Boosts RCV of PSY Characters by 15"
+	},
+    1174: {
+		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
+		specialName: "Ashura Ugui",
+		specialNotes: "#{fixed}",
+		captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
+        sailor: "Boosts ATK of Slasher Characters by 20"
+	},
+	1175: {
+		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
+		specialName: "Ashura Ugui",
+		specialNotes: "#{fixed}",
+		captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
+        sailor: "Boosts ATK of Slasher Characters by 20"
+	},
+    1176: {
+		special: "Removes poison, recovers 15x character's RCV in HP",
+		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
+		captain: "Boosts ATK and RCV of DEX characters by 1.5x",
+        sailor: "When HP is below x%, boosts own RCV by 50"
+	},
+	1177: {
+		special: "Removes poison, recovers 15x character's RCV in HP",
+		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
+		captain: "Boosts ATK and RCV of DEX characters by 2x",
+        sailor: "When HP is below x%, boosts own RCV by 50"
+	},
     1178: {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
-		specialName: "Oars, The Devil Special",
+		specialName: "Not Rubber Gum-Gum Jet Gatling",
 		specialNotes: "#{random : 30,000 : 150,000}",
     },
     1179: {
         captain: "Boosts ATK of [STR] characters by 2.75x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
-		specialName: "Oars, The Devil Special",
+		specialName: "Not Rubber Gum-Gum Jet Gatling",
 		specialNotes: "#{random : 30,000 : 150,000}",
     },
+    1181: {
+        captain: "Boosts ATK of [DEX] characters by 2.5x",
+        special: "Deals 15x character's ATK in [DEX] damage to all enemies. Makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters for 3 turns",
+        specialName: "Blenheim Special",
+        sailor: "Makes [STR] orbs \"beneficial\" for this unit"
+    },
+    1182: {
+        captain: "Boosts ATK of [DEX] characters by 2.5x",
+        special: "Deals 15x character's ATK in [DEX] damage to all enemies. Makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters for 3 turns",
+        specialName: "Blenheim Special",
+        sailor: "Makes [STR] orbs \"beneficial\" for this unit"
+    },
+    1183: {
+        captain: "Boosts ATK of [PSY] characters by 2.5x",
+        special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
+		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [PSY] orb.",
+        specialName: "Kingdew Special",
+        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
+    },
+    1184: {
+        captain: "Boosts ATK of [PSY] characters by 2.5x",
+        special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
+		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [PSY] orb.",
+        specialName: "Kingdew Special",
+        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
+    },
+    1185: {
+        captain: "Boosts ATK of Slasher and Cerebral units by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        special: [
+			{
+				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
+				"cooldown": null,
+			},
+			{
+				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
+				"cooldown": null,
+			}
+		],
+        specialName: "Haruta Special",
+        sailor: "Restores his own special by 1 turn when it is rewinded",
+        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+    },
+    1186: {
+        captain: "Boosts ATK of Slasher and Cerebral units by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        special: [
+			{
+				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
+				"cooldown": null,
+			},
+			{
+				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
+				"cooldown": null,
+			}
+		],
+        specialName: "Haruta Special",
+        sailor: "Restores his own special by 1 turn when it is rewinded",
+        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+    },
+    1187: {
+        captain: "Boosts ATK of [STR] characters by 2.5x",
+        special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
+		specialNotes: "#{randomHits : 7}<br>#{random : ??? : ??? : for each hit}",
+        specialName: "Atmos Special",
+        sailor: "Boosts ATK, HP, and RCV of all characters by 20"
+    },
+    1188: {
+        captain: "Boosts ATK of [STR] characters by 2.5x",
+        special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
+		specialNotes: "#{randomHits : 7}<br>#{random : ??? : ??? : for each hit}",
+        specialName: "Atmos Special",
+        sailor: "Boosts ATK, HP, and RCV of all characters by 20"
+    },
+    1189: {
+        captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
+		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+        special: "Reduces enemy Barrier timers by 1 turn",
+        specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
+        specialName: "Speed Jiru Special",
+        sailor: "Boosts ATK of [QCK] characters by 40"
+    },
+    1190: {
+        captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
+		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+        special: "Reduces enemy Barrier timers by 1 turn",
+        specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
+        specialName: "Speed Jiru Special",
+        sailor: "Boosts ATK of [QCK] characters by 40"
+    },
+    1191: {
+        captain: "Boosts ATK of all characters by 2x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
+        special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
+        specialName: "Aokiji Special",
+    },
+    1192: {
+        captain: "Boosts ATK of all characters by 2x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
+        special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
+        specialName: "Aokiji Special",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0ce0d632c..ef3a96570 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1767,8 +1767,20 @@ window.evolutions = {
         evolution: 1171,
         evolvers: [ 116, 117, 85 ]
     },
+    1172: {
+        evolution: 1173,
+        evolvers: [ 118, 92, 94, 98, 303 ]
+    },
+    1174: {
+        evolution: 1175,
+        evolvers: [ 118, 83, 97, 302, 102 ]
+    },
+    1176: {
+        evolution: 1177,
+        evolvers: [ 118, 86, 266, 97, 302 ]
+    },
     1178: {
         evolution: 1179,
-        evolvers: []
+        evolvers: [ 118, 84, 95, 300, 100 ]
     }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 8f1e7c166..58815fc03 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1113,12 +1113,12 @@ window.units = [
     [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 921, 468, 119, 1789, 941, 346, 1 ],
     [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 2, 50, 392109, 67, 55, 49, 524, 506, 300, 1 ],
     [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
-	[ "Monkey D. Luffy, Loyal Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
+	[ "Monkey D. Luffy, Loyal Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
 	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
-	[ "Sanji, Loyal Strawhat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
+	[ "Sanji, Loyal Straw Hat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
 	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
-	[ "Nami, Loyal Strawhat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
-    [ "Monkey D. Luffy Wakes of the Endless Dream, Strawhat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
+	[ "Nami, Loyal Straw Hat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
+    [ "Monkey D. Luffy Wakes of the Endless Dream, Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
 	[ "Monkey D. Luffy Oath of the Great Pirate Era: \"King of Pirates\"", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
     [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, 1066998, 504, 277, 148, 1603, 808, 287, 1 ],
     [ "Cavendish of Hakuba", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, 5000000, 1541, 749, 231, 2970, 1460, 438, 1 ],
@@ -1170,27 +1170,27 @@ window.units = [
     [ "Dice, Dealer of Gran Tesoro", "STR", [ "Free Spirit", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1493, 410, -500, 3035, 1005, -500, 1 ],
     [ "Mr. Tanaka", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, 5, 2, 50, 392109, 54, 62, 32, 924, 528, 188, 1 ],
     [ "Tanaka, Security Guard of Gran Tesoro", "QCK", [ "Shooter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 849, 449, 131, 1706, 1089, 305, 1 ],
+    [ "Brook, Dream-Pursuing Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
+    [ "Brook, Loyal Straw Hat Crew", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
+    [ "Zoro, Dream-Pursuing Adventurer", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
+    [ "Zoro, Loyal Straw Hat Crew", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
+    [ "Chopper, Dream-Pursuing Adventurer", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
+    [ "Chopper, Loyal Straw Hat Crew", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
+    [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 902, 473, 74, 2018, 1028, -444, 1 ],
+    [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 4000000, 1920, 977, -444, 4400, 1402, -444, 1 ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, null, 902, 473, 74, null, null, null, null ],
-    [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, null, 1920, 977, -444, 4400, 1402, -444, null ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 1 (Blenheim?)", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 1 Evolved (Blenheim?)", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 2 (Kingdew?)", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 2 Evolved (Kingdew?)", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 3 (Haruta?)", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 3 Evolved (Haruta?)", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 4 (Atmos?)", "STR", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 4 Evolved (Atmos?)", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 5 (Speed Jiru?)", "QCK", [ "Striker", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugofest Unit 5 Evolved (Speed Jiru?)", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Blenheim", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Blenheim Evolution", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kingdew", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kingdew Evolution", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Haruta", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Haruta Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Atmos", "STR", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Atmos Evolution", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Speed Jiru Evolution", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "6* Aokiji", "QCK", [ "Striker", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6* Aokiji Evolved", "QCK", [ "Striker", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6* Aokiji Evolution", "QCK", [ "Striker", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 21a40b0494210619d1c2b0ef009e65b8f00f9377 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 29 Jul 2016 12:51:40 -0500
Subject: [PATCH 0521/1569] More stuff

just flags
---
 common/data/evolutions.js | 26 +++++++++++++++++++++++++-
 common/data/families.js   | 13 +++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ef3a96570..a9730fca5 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1782,5 +1782,29 @@ window.evolutions = {
     1178: {
         evolution: 1179,
         evolvers: [ 118, 84, 95, 300, 100 ]
-    }
+    },
+    1181: {
+        evolution: 1182,
+        evolvers: [  ]
+    },
+    1183: {
+        evolution: 1184,
+        evolvers: [  ]
+    },
+    1185: {
+        evolution: 1186,
+        evolvers: [  ]
+    },
+    1187: {
+        evolution: 1188,
+        evolvers: [  ]
+    },
+    1189: {
+        evolution: 1190,
+        evolvers: [  ]
+    },
+    1191: {
+        evolution: 1192,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 63b3b93ff..3ee21c437 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1178,4 +1178,17 @@ window.families = [
     null,
     "Oars",
     "Oars",
+    null,
+    "Blenheim",
+    "Blenheim",
+    "Kingdew",
+    "Kingdew",
+    "Haruta",
+    "Haruta",
+    "Atmos",
+    "Atmos",
+    "Speed Jiru",
+    "Speed Jiru",
+    "Aokiji",
+    "Aokiji",
 ];
\ No newline at end of file

From 11c59d99a196e1175e719d0768f1cb5add2ab5a0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 29 Jul 2016 15:39:33 -0500
Subject: [PATCH 0522/1569] detail change

---
 common/data/details.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index d5b3dd6f8..a044a3eba 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2753,14 +2753,14 @@ window.details = {
 		specialName: "Bohemian Reverse Slash",
 		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
 	639: {
 		special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
 		specialName: "Bohemian Reverse Slash",
 		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
 	640: {
 		special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
@@ -4736,7 +4736,7 @@ window.details = {
 		],
 		specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
 	995:{
 		captain: "Boosts amount of beli received by 3x",
@@ -4754,7 +4754,7 @@ window.details = {
 		],
 		specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
 	},
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
@@ -5946,7 +5946,7 @@ window.details = {
 		],
         specialName: "Haruta Special",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
     },
     1186: {
         captain: "Boosts ATK of Slasher and Cerebral units by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
@@ -5963,7 +5963,7 @@ window.details = {
 		],
         specialName: "Haruta Special",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some Units can decrease your cooldown by 1/2 Turns, this Sailor Ability decreases that by an additional 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
     },
     1187: {
         captain: "Boosts ATK of [STR] characters by 2.5x",

From b04ff697deb2b1c935147ba43ffe532b72be2e64 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 29 Jul 2016 17:08:41 -0500
Subject: [PATCH 0523/1569] Aokiji Special Name

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index a044a3eba..d1240150c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5998,11 +5998,11 @@ window.details = {
     1191: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
-        specialName: "Aokiji Special",
+        specialName: "Ice Age",
     },
     1192: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
-        specialName: "Aokiji Special",
+        specialName: "Ice Age",
     },
 };

From 7dd148286a9c283ade0d40061e4f1c4afbbcf4d4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 29 Jul 2016 23:51:48 -0500
Subject: [PATCH 0524/1569] Aokiji In Database

---
 common/data/captains.js  | 10 ++++++++++
 common/data/cooldowns.js | 13 +++++++++++++
 common/data/units.js     |  4 ++--
 damage/js/cruncher.js    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index e9aaf12c6..ef9e431d9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2941,4 +2941,14 @@ window.captains = {
     1179: {
         atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
     },
+	1191: {
+        atk: function(p) {
+			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
+		}
+	},
+	1192: {
+        atk: function(p) {
+			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
+		}
+	},
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 814f3b9ed..07773b035 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1178,4 +1178,17 @@ window.cooldowns = [
     null,
     [ 17, 17 ],
     [ 17, 17 ],
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	19,
+	19,
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 58815fc03..ac959b534 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1189,8 +1189,8 @@ window.units = [
     [ "Atmos Evolution", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Speed Jiru Evolution", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6* Aokiji", "QCK", [ "Striker", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6* Aokiji Evolution", "QCK", [ "Striker", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6* Aokiji", "QCK", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, null ],
+    [ "6* Aokiji Evolution", "QCK", [ "Striker", "Shooter" ], 6, 55, null, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index cb50ff269..bfd1c30c5 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -689,7 +689,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));
             }
             // activate turn counter if necessary
-            if (n < 2 && (id == 794 || id == 795))
+            if (n < 2 && (id == 794 || id == 795 || id == 1191 || id == 1192))
                 $scope.tdata.turnCounter.enabled = true;
         });
         if (conflictWarning) 

From 7ae66dd19f3dc15b383855270ddfd94a92ad8a70 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 29 Jul 2016 23:54:56 -0500
Subject: [PATCH 0525/1569] Temporary Combo Hits

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index ac959b534..d5e65d0fb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1189,8 +1189,8 @@ window.units = [
     [ "Atmos Evolution", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Speed Jiru Evolution", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6* Aokiji", "QCK", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, null ],
-    [ "6* Aokiji Evolution", "QCK", [ "Striker", "Shooter" ], 6, 55, null, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, null ],
+    [ "6* Aokiji", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, null ],
+    [ "6* Aokiji Evolution", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From fd817e0d2df49e1b48d0a8a929a0b5097a868a11 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sat, 30 Jul 2016 00:04:31 -0500
Subject: [PATCH 0526/1569] fixes

---
 common/data/captains.js | 3 ++-
 common/data/details.js  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index ef9e431d9..47a80a58c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2668,7 +2668,7 @@ window.captains = {
     },
     1077: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1080: {
 		atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
@@ -2950,5 +2950,6 @@ window.captains = {
         atk: function(p) {
 			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
 		}
+		hp: function(p) { return 1.25; }
 	},
 };
diff --git a/common/data/details.js b/common/data/details.js
index d1240150c..44926a3b2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5240,7 +5240,7 @@ window.details = {
         specialName: "Haute Couture: Patchwork"
 	},
 	1077:{
-		captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their HP by 1.5x",
+		captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their RCV by 1.5x",
 		special: [
 			{
 				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 10%",

From 032f852e87fdaeca4f947e9c254e394219fe7b80 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sat, 30 Jul 2016 01:13:02 -0500
Subject: [PATCH 0527/1569] ,

,
---
 common/data/captains.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 47a80a58c..ed74c613c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2944,12 +2944,13 @@ window.captains = {
 	1191: {
         atk: function(p) {
 			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
-		}
+		},
+		hp: function(p) { return 1.25; }
 	},
 	1192: {
         atk: function(p) {
 			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
-		}
+		},
 		hp: function(p) { return 1.25; }
 	},
 };

From 85310ede889adbb7165a985dd08aaaf65528019b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 1 Aug 2016 11:37:20 -0500
Subject: [PATCH 0528/1569] All New Units Finished

Calculator and all
---
 common/data/aliases.js    | 13 +++++++
 common/data/captains.js   | 76 +++++++++++++++++++++++++++++++++++++++
 common/data/cooldowns.js  | 20 +++++------
 common/data/details.js    | 44 ++++++++++++-----------
 common/data/evolutions.js | 12 +++----
 common/data/specials.js   | 34 +++++++++++++++++-
 common/data/units.js      | 26 +++++++-------
 index.html                |  1 -
 8 files changed, 175 insertions(+), 51 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7f82e5d10..1c535763e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1178,4 +1178,17 @@ window.aliases = {
     1177: ['チョッパー 信念に生きる麦わらの一味',''],
     1178: ['オーズ','','Oz'],
     1179: ['魔人オーズ','','Oz'],
+    1180: ['',''],
+    1181: ['ブレンハイム',''],
+    1182: ['カトラスのブレンハイム',''],
+    1183: ['キングデュー',''],
+    1184: ['双拳ガントレットのキングデュー',''],
+    1185: ['ハルタ',''],
+    1186: ['疾風の小剣士ハルタ',''],
+    1187: ['アトモス',''],
+    1188: ['水牛のアトモス',''],
+    1189: ['スピード・ジル',''],
+    1190: ['シールドランスのスピード・ジル',''],
+    1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
+    1192: ['クザン','','Aokiji'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ed74c613c..cf0f8eeb9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2935,12 +2935,88 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },  
         rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
     },
+    1162: {
+		atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+	},
+    1164: {
+		rcv: function(p) { return 1.2; }
+	},
+    1165: {
+		rcv: function(p) { return 1.5; }
+	},
+    1167: {
+		atk: function(p) { return 1.2; }
+	},
+    1168: {
+		atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2 : 1; }
+	},
+    1169: {
+		atk: function(p) {
+			return p.unit.type == "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+		}
+	},
+    1170: {
+		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+	},
+    1171: {
+		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+	},
+    1172: {
+		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+	},
+	1173: {
+		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+	},
+    1174: {
+		atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+	},
+	1175: {
+		atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+	},
+    1176: {
+		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+	},
+	1177: {
+		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+		rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+	},
     1178: {
         atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2 : 1; }
     },
     1179: {
         atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
     },
+    1181: {
+		atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+	},
+    1182: {
+		atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+	},
+    1183: {
+		atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+	},
+    1184: {
+		atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+	},
+    1185: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1186: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1187: {
+		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+	},
+    1188: {
+		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+	},
+    1184: {
+		atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+	},
+    1184: {
+		atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+	},
 	1191: {
         atk: function(p) {
 			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 07773b035..b634af617 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1179,16 +1179,16 @@ window.cooldowns = [
     [ 17, 17 ],
     [ 17, 17 ],
 	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
+	19,
+	19,
+	23,
+	23,
+	null,// Haruta
+	null,// Haruta
+	23,
+	23,
+	11,
+	11,
 	19,
 	19,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 44926a3b2..9ce12f498 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5794,11 +5794,15 @@ window.details = {
 	},
     1160: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
-        special: "Completely removes lock from captain, reduces lock of other units by 3 and recovers 2k HP"
+        special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
+		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialName: "Summer Koala Special"
     },
     1161: {
         captain: "Boosts ATK of Free Spirit characters by 2x and their RCV by 1.5x",
-        special: "Completely removes lock from captain, reduces lock of other units by 3 and recovers 2k HP"
+        special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
+		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialName: "Summer Koala Special"
     },
     1162: {//Tesoro
         captain: "Boosts ATK of [PSY] units by 1.75x and boosts amount of Beli received by 1.5x",
@@ -5905,30 +5909,30 @@ window.details = {
 		specialName: "Not Rubber Gum-Gum Jet Gatling",
 		specialNotes: "#{random : 30,000 : 150,000}",
     },
-    1181: {
+    1181: { //Blenheim
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Deals 15x character's ATK in [DEX] damage to all enemies. Makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters for 3 turns",
-        specialName: "Blenheim Special",
+        specialName: "Anger of the Ki Sword",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit"
     },
-    1182: {
+    1182: { //Blenheim
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Deals 15x character's ATK in [DEX] damage to all enemies. Makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters for 3 turns",
-        specialName: "Blenheim Special",
+        specialName: "Anger of the Ki Sword",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit"
     },
     1183: {
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [PSY] orb.",
-        specialName: "Kingdew Special",
+		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
+        specialName: "Brass Knuckle Destruction",
         sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
     },
     1184: {
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [PSY] orb.",
-        specialName: "Kingdew Special",
+		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
+        specialName: "Brass Knuckle Destruction",
         sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
     },
     1185: {
@@ -5937,14 +5941,14 @@ window.details = {
         special: [
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
-				"cooldown": null,
+				"cooldown": 8,
 			},
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
-				"cooldown": null,
+				"cooldown": 17,
 			}
 		],
-        specialName: "Haruta Special",
+        specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
     },
@@ -5954,14 +5958,14 @@ window.details = {
         special: [
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
-				"cooldown": null,
+				"cooldown": 8,
 			},
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
-				"cooldown": null,
+				"cooldown": 17,
 			}
 		],
-        specialName: "Haruta Special",
+        specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
     },
@@ -5969,14 +5973,14 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2.5x",
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
 		specialNotes: "#{randomHits : 7}<br>#{random : ??? : ??? : for each hit}",
-        specialName: "Atmos Special",
+        specialName: "Advancing Continuous Sword Attack",
         sailor: "Boosts ATK, HP, and RCV of all characters by 20"
     },
     1188: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
 		specialNotes: "#{randomHits : 7}<br>#{random : ??? : ??? : for each hit}",
-        specialName: "Atmos Special",
+        specialName: "Advancing Continuous Sword Attack",
         sailor: "Boosts ATK, HP, and RCV of all characters by 20"
     },
     1189: {
@@ -5984,7 +5988,7 @@ window.details = {
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
         special: "Reduces enemy Barrier timers by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
-        specialName: "Speed Jiru Special",
+        specialName: "Break Bullet",
         sailor: "Boosts ATK of [QCK] characters by 40"
     },
     1190: {
@@ -5992,7 +5996,7 @@ window.details = {
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
         special: "Reduces enemy Barrier timers by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
-        specialName: "Speed Jiru Special",
+        specialName: "Break Bullet",
         sailor: "Boosts ATK of [QCK] characters by 40"
     },
     1191: {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a9730fca5..b724216c7 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1785,26 +1785,26 @@ window.evolutions = {
     },
     1181: {
         evolution: 1182,
-        evolvers: [  ]
+        evolvers: [ 118, 83, 86, 97, 102 ]
     },
     1183: {
         evolution: 1184,
-        evolvers: [  ]
+        evolvers: [ 87, 94, 98, 303, 103 ]
     },
     1185: {
         evolution: 1186,
-        evolvers: [  ]
+        evolvers: [ 118, 88, 99, 99, 104 ]
     },
     1187: {
         evolution: 1188,
-        evolvers: [  ]
+        evolvers: [ 83, 84, 95, 300, 300 ]
     },
     1189: {
         evolution: 1190,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 94, 96, 96 ]
     },
     1191: {
         evolution: 1192,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 301, 101, 267 ]
     },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 146060326..5e07935aa 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1458,5 +1458,37 @@ window.specials = {
     1154: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
         type: "class"
-    }
+    },
+    1164: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+		rcv: function(p) { return 1.5; }
+	},
+    1165: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+		rcv: function(p) { return 1.5; }
+	},
+    1168: {
+		atk: function(p) { return p.unit.type == "STR" ? window.specials[1168].multiplier : 1; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (p.percHP <= 30 ? 1.75 : 1.1);
+			window.specials[1168].multiplier = n;
+			p.scope.notify({
+				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+				name: '1168warning'
+			});
+		}
+	},
+    1169: {
+		atk: function(p) { return p.unit.type == "STR" ? window.specials[1169].multiplier : 1; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (p.percHP <= 30 ? 1.75 : 1.1);
+			window.specials[1169].multiplier = n;
+			p.scope.notify({
+				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+				name: '1169warning'
+			});
+		}
+	},
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index d5e65d0fb..e525a9b93 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1159,7 +1159,7 @@ window.units = [
     [ "Magellan, Chief Warden", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
     [ "Magellan, Chief Warden of the Underwater Prison Impel Down", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
     [ "Summer Koala", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 2, 50, null, 133, 79, 37, 994, 479, 187, null ],
-    [ "Summer Koala Evolution", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 902, 412, 123, null, null, null, null ],
+    [ "Summer Koala Evolution", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 902, 412, 123, 1822, 984, 359, null ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
     [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
     [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],
@@ -1179,18 +1179,18 @@ window.units = [
     [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 902, 473, 74, 2018, 1028, -444, 1 ],
     [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 4000000, 1920, 977, -444, 4400, 1402, -444, 1 ],
     [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Blenheim", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Blenheim Evolution", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kingdew", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kingdew Evolution", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Haruta", "INT", [ "Slasher", "Cerebral" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Haruta Evolution", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Atmos", "STR", [ "Slasher", "Powerhouse" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Atmos Evolution", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Speed Jiru Evolution", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6* Aokiji", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, null ],
-    [ "6* Aokiji Evolution", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, null ],
+    [ "Blenheim", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 206, 106, 19, 1051, 624, 95, 1 ],
+    [ "Blenheim, The Cutlass", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 6, 4, 99, 4000000, 949, 512, 44, 2643, 1355, 224, 1 ],
+    [ "Kingdew", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 232, 94, 38, 1123, 522, 161, 1 ],
+    [ "Kingdew, Twin Fist Gauntlets", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1031, 432, 113, 2670, 1180, 308, 1 ],
+    [ "Haruta", "INT", [ "Slasher", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 132, 103, 34, 920, 583, 177, 1 ],
+    [ "Haruta, Gale Small Swordsman", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 833, 490, 123, 2025, 1309, 372, 1 ],
+    [ "Atmos", "STR", [ "Slasher", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 255, 99, 13, 1242, 534, 89, 1 ],
+    [ "Atmos, The Water Buffalo", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1159, 440, 41, 3552, 1238, 132, 1 ],
+    [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, 6, 3, 70, 1066998, 242, 86, 30, 1198, 500, 148, 1 ],
+    [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
+    [ "Blue Pheasant, Fleet Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
+    [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 4294f5e4d..c1bbdeb9f 100644
--- a/index.html
+++ b/index.html
@@ -63,7 +63,6 @@
             <br>
             <ul>
                 <li>New Units Added!</li>
-                <li>Previews for new Sugo Units</li>
                 <br>
                 <li>Added the first Sailor Abilities</li>
                 <li>Also added a few Filters for Sailors</li>

From c367c39af270463af70dd2c75fd5160941ed1d23 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 1 Aug 2016 11:41:28 -0500
Subject: [PATCH 0529/1569] Global Flags

---
 common/data/drops.js   | 1 +
 common/data/effects.js | 6 +++---
 common/data/flags.js   | 9 +++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 8b39ccbf2..ac93d7461 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -953,6 +953,7 @@ window.drops = {
         {
             name: "Evil Manager Breed's Marine Circus!",
             thumb: 797,
+            global: true,
             condition: 'You can only bring Fighter and Powerhouse units',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['100,000','1x Purple Elder'],['400,000','1x RCV Candy, 1x Rainbow Gem'],['750,000','1x Auto-Heal Skullbook, 2x Rainbow Gem']],
diff --git a/common/data/effects.js b/common/data/effects.js
index bcfdc1206..730809eff 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -265,7 +265,7 @@ window.effects = {
     
     'Pirate Ship Competition! \"Dead End\" Opens!': {
         description: 'STR/DEX/QCK ATK 1.6x and HP 0.1x. INT/PSY ATK 0.2x and HP 2x',
-        thumb: null,
+        thumb: 1072,
         id: 31,
         atk: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 0.2; },
         hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 0.1 : 2.0; }
@@ -304,7 +304,7 @@ window.effects = {
     
     '700k Damage Treshold Barrier': {
         description: 'Used by Saga. You cannot do more that 700k damage in one hit',
-        thumb: null,
+        thumb: 1089,
         id: 36,
         barrierThreshold: 700000,
         barrierReduction: 0.99
@@ -350,7 +350,7 @@ window.effects = {
     
     'Robin and Nami\'s Secret Undercover Investigation': {
         description: 'Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP.',
-        thumb: null,
+        thumb: 1112,
         id: 39,
         atk: function(p) { 
                             var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
diff --git a/common/data/flags.js b/common/data/flags.js
index b12e74e30..97e4fef8f 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -773,6 +773,11 @@ window.flags = {
 	791: { rr: 1, rro: 1 },
 	792: { rr: 1, rro: 1 },
 	793: { rr: 1, rro: 1 },
+    796: { global: 1 },
+    797: { global: 1 },
+    798: { global: 1 },
+    799: { global: 1 },
+    800: { global: 1 },
 	801: { rr: 1, rro: 1, lrr: 1 },
 	802: { rr: 1, rro: 1, lrr: 1 },
     812: { global: 1 },
@@ -827,8 +832,8 @@ window.flags = {
     892: { global: 1 },
     893: { global: 1 },
     894: { global: 1 },
-	895: { special: 1 },
-	896: { special: 1 },
+	895: { special: 1, global: 1 },
+	896: { special: 1, global: 1 },
 	905: { rr: 1, rro: 1 },
 	906: { rr: 1, rro: 1 },
 	907: { rr: 1, rro: 1 },

From a84dd3888f69c1a9c78b1baffd948d8acf67a78f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 1 Aug 2016 16:50:48 -0500
Subject: [PATCH 0530/1569] Corazon fix

---
 common/data/cooldowns.js | 4 ++--
 common/data/units.js     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b634af617..aa0f3985a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -998,8 +998,8 @@ window.cooldowns = [
 	null, //Dellinger 
 	[ 23, 17 ],
 	[ 23, 17 ],
-	23,
-	23,
+	[ 23, 17 ],
+	[ 23, 17 ],
 	[ 20, 12 ],
 	[ 20, 12 ],
 	[ 20, 10 ],
diff --git a/common/data/units.js b/common/data/units.js
index e525a9b93..16d190a6a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1191,6 +1191,8 @@ window.units = [
     [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
     [ "Blue Pheasant, Fleet Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
+    [ "Summertime Hancock", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Summertime Hancock Evolved", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 4fee2adb2684faaf0abc002bea61d5ea772552a4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 2 Aug 2016 16:31:39 -0500
Subject: [PATCH 0531/1569] Summer Hancock

---
 common/data/captains.js  |  6 ++++++
 common/data/cooldowns.js |  2 ++
 common/data/details.js   | 18 ++++++++++++++----
 common/data/families.js  |  4 +++-
 common/data/specials.js  |  8 ++++++++
 common/data/units.js     |  4 ++--
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index cf0f8eeb9..3e9daaddd 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3029,4 +3029,10 @@ window.captains = {
 		},
 		hp: function(p) { return 1.25; }
 	},
+    1193: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+	},
+    1194: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+	},
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index aa0f3985a..8bc8124e3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1191,4 +1191,6 @@ window.cooldowns = [
 	11,
 	19,
 	19,
+    [ 15, 15 ],
+    [ 15, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 9ce12f498..3d85a3b75 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5941,11 +5941,11 @@ window.details = {
         special: [
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
-				"cooldown": 8,
+				"cooldown": [ 8, 3 ],
 			},
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
-				"cooldown": 17,
+				"cooldown": [ 17, 12 ],
 			}
 		],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
@@ -5958,11 +5958,11 @@ window.details = {
         special: [
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
-				"cooldown": 8,
+				"cooldown": [ 8, 3 ],
 			},
 			{
 				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
-				"cooldown": 17,
+				"cooldown": [ 17, 12 ],
 			}
 		],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
@@ -6009,4 +6009,14 @@ window.details = {
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
         specialName: "Ice Age",
     },
+    1193: {
+        captain: "Boosts ATK of Free Spirit characters by 2x",
+        special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
+        specialName: "Sweet Style Petrification",
+    },
+    1194: {
+        captain: "Boosts ATK of Free Spirit characters by 2.5x",
+        special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
+        specialName: "Sweet Style Petrification",
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 3ee21c437..c1b8c8d53 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1169,7 +1169,7 @@ window.families = [
     "Dice",
     "Dice",
     "Tanaka",
-    "Tanaka",,
+    "Tanaka",
     null,
     null,
     null,
@@ -1191,4 +1191,6 @@ window.families = [
     "Speed Jiru",
     "Aokiji",
     "Aokiji",
+    "Boa Hancock",
+    "Boa Hancock",
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 5e07935aa..7b32aaef4 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1491,4 +1491,12 @@ window.specials = {
 			});
 		}
 	},
+    1193: {
+		chain: function(p) { return 2.5; },
+		chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+	},
+	1194: {
+		chain: function(p) { return 2.5; },
+		chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+	},
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 16d190a6a..9b1e09004 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1191,8 +1191,8 @@ window.units = [
     [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
     [ "Blue Pheasant, Fleet Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
-    [ "Summertime Hancock", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Summertime Hancock Evolved", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, null, 181, 132, 47, 945, 539, 181, null ],
+    [ "Boa Hancock, Maiden Drowned in Love", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 863, 448, 144, 1724, 1132, 326, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From c5d16b35935a2b7ffa6b920bed8b4e3b0d53436e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 2 Aug 2016 16:39:22 -0500
Subject: [PATCH 0532/1569] Rare recruit flags

---
 common/data/flags.js | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 97e4fef8f..1e49615f7 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -931,5 +931,27 @@ window.flags = {
     1130: { rr: 1, rro: 1 },
     1131: { rr: 1, rro: 1 },
     1132: { rr: 1, rro: 1 },
-    1133: { rr: 1, rro: 1 }
+    1133: { rr: 1, rro: 1 },
+    1160: { rr: 1, rro: 1, lrr: 1 },
+    1161: { rr: 1, rro: 1, lrr: 1 },
+    1172: { rr: 1, rro: 1 },
+    1173: { rr: 1, rro: 1 },
+    1174: { rr: 1, rro: 1 },
+    1175: { rr: 1, rro: 1 },
+    1176: { rr: 1, rro: 1 },
+    1177: { rr: 1, rro: 1 },
+    1181: { rr: 1, rro: 1 },
+    1182: { rr: 1, rro: 1 },
+    1183: { rr: 1, rro: 1 },
+    1184: { rr: 1, rro: 1 },
+    1185: { rr: 1, rro: 1 },
+    1186: { rr: 1, rro: 1 },
+    1187: { rr: 1, rro: 1 },
+    1188: { rr: 1, rro: 1 },
+    1189: { rr: 1, rro: 1 },
+    1190: { rr: 1, rro: 1 },
+    1191: { rr: 1, rro: 1 },
+    1192: { rr: 1, rro: 1 },
+    1193: { rr: 1, rro: 1, lrr: 1 },
+    1194: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file

From 8e900c8d99607e26d8cecc5d5ac9dee2d0d2efe3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 3 Aug 2016 04:02:52 -0500
Subject: [PATCH 0533/1569] Colo Units

---
 common/data/aliases.js   |  9 +++++++--
 common/data/captains.js  |  9 +++++++++
 common/data/cooldowns.js |  3 +++
 common/data/details.js   | 27 +++++++++++++++++++++------
 common/data/families.js  |  3 +++
 common/data/specials.js  |  8 ++++++++
 common/data/units.js     | 11 +++++++----
 common/data/zombies.js   | 10 +++++++++-
 8 files changed, 67 insertions(+), 13 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1c535763e..b96eb62bd 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1158,8 +1158,8 @@ window.aliases = {
     1157: ['ハンニャバル副署長 海底監獄インペルダウン',''],
     1158: ['マゼラン署長',''],
     1159: ['マゼラン署長 海底監獄インペルダウン',''],
-    1160: ['',''],
-    1161: ['',''],
+    1160: ['コアラ ビーチの天使',''],
+    1161: ['コアラ 楽園の女神',''],
     1162: ['ギルド・テゾーロ',''],
     1163: ['',''],
     1164: ['カリーナ',''],
@@ -1191,4 +1191,9 @@ window.aliases = {
     1190: ['シールドランスのスピード・ジル',''],
     1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
     1192: ['クザン','','Aokiji'],
+	1193: ['',''],
+	1194: ['',''],
+	1195: ['',''],
+	1196: ['',''],
+	1197: ['',''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 3e9daaddd..3afb8a458 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3035,4 +3035,13 @@ window.captains = {
     1194: {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
 	},
+	1195: {
+		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+	},
+    1196: {
+		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+	},
+	1197: {
+		atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (p.orb == 2.0 ? 2.5 : 1) : 1; }
+	},
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8bc8124e3..975b25e65 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1193,4 +1193,7 @@ window.cooldowns = [
 	19,
     [ 15, 15 ],
     [ 15, 15 ],
+	29,
+	29,
+	[ 17, 7 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 3d85a3b75..62fc52344 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5940,11 +5940,11 @@ window.details = {
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
 			{
-				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
+				"description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
 				"cooldown": [ 8, 3 ],
 			},
 			{
-				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
+				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
 				"cooldown": [ 17, 12 ],
 			}
 		],
@@ -5957,11 +5957,11 @@ window.details = {
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
 			{
-				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
+				"description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
 				"cooldown": [ 8, 3 ],
 			},
 			{
-				"description": "Deals [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 2 turns",
+				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
 				"cooldown": [ 17, 12 ],
 			}
 		],
@@ -5972,14 +5972,14 @@ window.details = {
     1187: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
-		specialNotes: "#{randomHits : 7}<br>#{random : ??? : ??? : for each hit}",
+		specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
         specialName: "Advancing Continuous Sword Attack",
         sailor: "Boosts ATK, HP, and RCV of all characters by 20"
     },
     1188: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
-		specialNotes: "#{randomHits : 7}<br>#{random : ??? : ??? : for each hit}",
+		specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
         specialName: "Advancing Continuous Sword Attack",
         sailor: "Boosts ATK, HP, and RCV of all characters by 20"
     },
@@ -6019,4 +6019,19 @@ window.details = {
         special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Sweet Style Petrification",
     },
+	1195: {
+		captain: "Boosts ATK of Striker characters by 1.75x. Recovers 2x character's RCV in HP at the end of each turn",
+		special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
+		specialName: "Split Air Hole",
+	},
+	1196: {
+		captain: "Boosts ATK of Striker characters by 2x. Recovers 5x character's RCV in HP at the end of each turn",
+		special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
+		specialName: "Split Air Hole",
+	},
+	1197: {
+		captain: "Boosts ATK of Cerebral and Powerhouse characters by 2.5x if they have a matching orb, by 1x otherwise, reduces crew's RCV to 0",
+        special: "For Cerebral and Powerhouse characters, changes all orbs including [BLOCK] orbs to Badly Matching. Deals [INT] damage to all enemies",
+        specialName: "Investigator of Sorrow",
+	}
 };
diff --git a/common/data/families.js b/common/data/families.js
index c1b8c8d53..d31192957 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1193,4 +1193,7 @@ window.families = [
     "Aokiji",
     "Boa Hancock",
     "Boa Hancock",
+	"Gan Fall",
+	"Gan Fall",
+	"Ohm",
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 7b32aaef4..de7d6021c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1499,4 +1499,12 @@ window.specials = {
 		chain: function(p) { return 2.5; },
 		chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
 	},
+	1195: {
+		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+		type: "class"
+	},
+	1196: {
+		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+		type: "class"
+	},
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 9b1e09004..6f36907b1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1158,8 +1158,8 @@ window.units = [
     [ "Hannyabal, Vice Warden of the Underwater Prison Impel Down", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
     [ "Magellan, Chief Warden", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
     [ "Magellan, Chief Warden of the Underwater Prison Impel Down", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
-    [ "Summer Koala", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 2, 50, null, 133, 79, 37, 994, 479, 187, null ],
-    [ "Summer Koala Evolution", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 902, 412, 123, 1822, 984, 359, null ],
+    [ "Koala, Beach Angel", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 133, 79, 37, 994, 479, 187, 1 ],
+    [ "Koala, Goddess of Paradise", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 902, 412, 123, 1822, 984, 359, 1 ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
     [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
     [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],
@@ -1178,7 +1178,7 @@ window.units = [
     [ "Chopper, Loyal Straw Hat Crew", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
     [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 902, 473, 74, 2018, 1028, -444, 1 ],
     [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 4000000, 1920, 977, -444, 4400, 1402, -444, 1 ],
-    [ null, "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rainbow Armored Crab", "INT", "Evolver", null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Blenheim", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 206, 106, 19, 1051, 624, 95, 1 ],
     [ "Blenheim, The Cutlass", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 6, 4, 99, 4000000, 949, 512, 44, 2643, 1355, 224, 1 ],
     [ "Kingdew", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 232, 94, 38, 1123, 522, 161, 1 ],
@@ -1189,10 +1189,13 @@ window.units = [
     [ "Atmos, The Water Buffalo", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1159, 440, 41, 3552, 1238, 132, 1 ],
     [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, 6, 3, 70, 1066998, 242, 86, 30, 1198, 500, 148, 1 ],
     [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
-    [ "Blue Pheasant, Fleet Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
+    [ "Blue Pheasant, Marine Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
     [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, null, 181, 132, 47, 945, 539, 181, null ],
     [ "Boa Hancock, Maiden Drowned in Love", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 863, 448, 144, 1724, 1132, 326, null ],
+	[ "Ganfor, Former God of Skypiea", "PSY", "Striker", 4, 18, 6, 2, 50, null, 222, 122, 22, 1122, 622, 122, null ],
+	[ "Ganfor, God of Skypiea", "PSY", "Striker", 5, 30, 4, 3, 99, null, 1111, 611, 111, 2122, 1222, 222, null ],
+	[ "Ohm, Sky Breeder", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 6, 3, 70, null, 197, 169, -200, 1710, 1170, -150, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index bf2670406..865e0d24e 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -242,5 +242,13 @@ window.zombies = {
     1141: {//Story Moira
         type: 'healer',
         multiplier: 3
-    }
+    },
+	1195: {//Colo Ganfor
+		type: 'healer',
+        multiplier: 2
+	},
+	1196: {//Colo Ganfor
+		type: 'healer',
+        multiplier: 5
+	},
 };

From 0aaba5f5a76783697b3876d26e7a103ec2387e13 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 4 Aug 2016 07:39:44 +0200
Subject: [PATCH 0534/1569] New Captains/Aliases, Popover Fixed,

---
 characters/js/directives.js         |  2 +-
 common/data/aliases.js              |  4 ++--
 common/data/captains.js             | 18 ++++++++++++++++++
 damage/views/fragments/popover.html |  4 ++--
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index a3e2a16ee..5fa814a8b 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -384,7 +384,7 @@ directives.addTags = function($stateParams, $rootScope) {
                     element.append($('<span class="tag captain">' + name + '</div>'));
                 }
                 // sailor effects
-                if (matcher.target.indexOf('sailor') === 0 && matcher.matcher.test(data[matcher.target]) && data[matcher.target].length>3) {
+                if (matcher.target.indexOf('sailor') === 0 && matcher.matcher.test(data[matcher.target]) && !(data[matcher.target] === undefined)) {
                     name = matcher.name;
                     /*if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
                     else name = name.replace(/s$/,'');
diff --git a/common/data/aliases.js b/common/data/aliases.js
index b96eb62bd..0114587b3 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -572,8 +572,8 @@ window.aliases = {
     571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット','', 'Afro Luffy', 'Afroluffy' ],
     572: ['ウソップ デービーバックファイト・セコンド',''],
     573: ['トニートニー・チョッパー デービーバックファイト・マスク',''],
-    574: ['青キジ',''],
-    575: ['青キジ　氷結人間',''],
+    574: ['青キジ','',"Kuzan"],
+    575: ['青キジ　氷結人間','',"Kuzan"],
     576: ['ナミのティータイム',''],
     577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy' ],
     578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy' ],
diff --git a/common/data/captains.js b/common/data/captains.js
index 3afb8a458..2d48865bb 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3017,6 +3017,24 @@ window.captains = {
     1184: {
 		atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
 	},
+    1185: {
+        atk: function(p) { return p.unit.class.has("Slasher")  || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1186: {
+        atk: function(p) { return p.unit.class.has("Slasher")  || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1187: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+    },
+    1188: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+    },
+    1189: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+    },
+    1190: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+    },
 	1191: {
         atk: function(p) {
 			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
diff --git a/damage/views/fragments/popover.html b/damage/views/fragments/popover.html
index 91b9ae7ec..b2f2a40ac 100644
--- a/damage/views/fragments/popover.html
+++ b/damage/views/fragments/popover.html
@@ -53,10 +53,10 @@
                     <span class="notes" ng-if="details.captainNotes" ng-bind-html="details.captainNotes | notes | decorate"></span>
                 </td>
             </tr>
-            <tr class="header" ng-if="slot < 2">
+            <tr class="header" ng-if="slot > 2">
                 <td colspan="5">Sailor Ability</td>
             </tr>
-            <tr ng-if="slot < 2">
+            <tr ng-if="slot > 2">
                 <td colspan="5">
                     <div ng-bind-html="details.sailor | decorate"></div>
                     <span class="notes" ng-if="details.sailorNotes" ng-bind-html="details.sailorNotes | notes | decorate"></span>

From c2c23c749341b38b2c787809cade042cb4274f61 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Thu, 4 Aug 2016 17:17:46 +0200
Subject: [PATCH 0535/1569] Popover once again

---
 damage/views/fragments/popover.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/views/fragments/popover.html b/damage/views/fragments/popover.html
index b2f2a40ac..c4783f7df 100644
--- a/damage/views/fragments/popover.html
+++ b/damage/views/fragments/popover.html
@@ -53,10 +53,10 @@
                     <span class="notes" ng-if="details.captainNotes" ng-bind-html="details.captainNotes | notes | decorate"></span>
                 </td>
             </tr>
-            <tr class="header" ng-if="slot > 2">
+            <tr class="header" ng-if="slot > 1">
                 <td colspan="5">Sailor Ability</td>
             </tr>
-            <tr ng-if="slot > 2">
+            <tr ng-if="slot > 1">
                 <td colspan="5">
                     <div ng-bind-html="details.sailor | decorate"></div>
                     <span class="notes" ng-if="details.sailorNotes" ng-bind-html="details.sailorNotes | notes | decorate"></span>

From 0efac7e6dae382d8f48bb07d639aff6a056793bb Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 5 Aug 2016 07:13:59 +0200
Subject: [PATCH 0536/1569] Add Old Fullboard, new Matcher

---
 common/data/matchers.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/data/matchers.js b/common/data/matchers.js
index 5622b9ade..dc0e9f193 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -202,9 +202,15 @@ window.matchers = [
         target: 'special',
         matcher: /(Changes.+(orb|orbs))/i
     },
+    
+    {
+    	name: 'Full-board orb controllers',
+    	target: 'special',
+    	matcher: /(Changes[^,]+all orbs|Changes the orbs in|Changes[^,]*every other orb)/i
+    },
 
     {
-        name: 'Full-board orb controllers',
+        name: 'Orb Matcher',
         target: 'special',
         matcher: /(Changes.+(orb|orbs)).+Matching/i
     },

From a703b7559429bab8a6fe116094c2969a876309ab Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 5 Aug 2016 07:48:30 +0200
Subject: [PATCH 0537/1569] Initial Dofla Ship

Still needs the Special
---
 common/data/ships.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 24cfa061f..eb7253728 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -235,6 +235,14 @@ window.ships = [
             return !p.unit.class.has('Fighter') ? .05 :
                 [ p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.01 : p.classCount.Fighter == 3 ? 1.02 : p.classCount.Fighter == 4 ? 1.03 : p.classCount.Fighter == 5 ? 1.04 : p.classCount.Fighter == 6 ? 1.05 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.04 : p.classCount.Fighter == 5 ? 1.05 : p.classCount.Fighter == 6 ? 1.1 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.05 : p.classCount.Fighter == 5 ? 1.1 : p.classCount.Fighter == 6 ? 1.15 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.05 : p.classCount.Fighter == 4 ? 1.1 : p.classCount.Fighter == 5 ? 1.15 : p.classCount.Fighter == 6 ? 1.2 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.25 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.3 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.25 : p.classCount.Fighter == 6 ? 1.35 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.4 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.45 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.2 : p.classCount.Fighter == 4 ? 1.3 : p.classCount.Fighter == 5 ? 1.4 : p.classCount.Fighter == 6 ? 1.5 : 0][p.boatLevel - 1];
         }
-    }, 
+    },
+    
+    {
+        name: "Doflamingo Ship",
+        thumb: null,
+        description: 'Boosts ATK of Ambition Characters by 1.5x and their HP by 1.35x. Special: Makes Perfects easier to Hit, Adds 0.2 to Chain  (cooldown: 15 Turns)',
+        atk: function(p) { return !p.unit.class.has('Ambition') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
+        hp: function(p) { return !p.unit.class.has('Ambition') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
+    }
 
 ];

From 9f383dc4f22877e699bb9021491a12cefec81768 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 5 Aug 2016 12:41:44 -0500
Subject: [PATCH 0538/1569] New Summer Units

---
 common/data/aliases.js    |  4 ++++
 common/data/cooldowns.js  |  4 ++++
 common/data/evolutions.js | 16 ++++++++++++++++
 common/data/families.js   |  4 ++++
 common/data/units.js      |  4 ++++
 5 files changed, 32 insertions(+)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0114587b3..9745fa15b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1196,4 +1196,8 @@ window.aliases = {
 	1195: ['',''],
 	1196: ['',''],
 	1197: ['',''],
+    1198: ['',''],
+	1199: ['',''],
+	1200: ['',''],
+	1201: ['',''],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 975b25e65..92f771487 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1196,4 +1196,8 @@ window.cooldowns = [
 	29,
 	29,
 	[ 17, 7 ],
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b724216c7..51bb134cd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1807,4 +1807,20 @@ window.evolutions = {
         evolution: 1192,
         evolvers: [ 118, 266, 301, 101, 267 ]
     },
+    1193: {
+        evolution: 1194,
+        evolvers: [  ]
+    },
+    1195: {
+        evolution: 1196,
+        evolvers: [  ]
+    },
+    1198: {
+        evolution: 1199,
+        evolvers: [  ]
+    },
+    1200: {
+        evolution: 1201,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index d31192957..7b554b03a 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1196,4 +1196,8 @@ window.families = [
 	"Gan Fall",
 	"Gan Fall",
 	"Ohm",
+    "Jewelry Bonney",
+	"Jewelry Bonney",
+    "Violet",
+	"Violet",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 6f36907b1..b7909ac23 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1196,6 +1196,10 @@ window.units = [
 	[ "Ganfor, Former God of Skypiea", "PSY", "Striker", 4, 18, 6, 2, 50, null, 222, 122, 22, 1122, 622, 122, null ],
 	[ "Ganfor, God of Skypiea", "PSY", "Striker", 5, 30, 4, 3, 99, null, 1111, 611, 111, 2122, 1222, 222, null ],
 	[ "Ohm, Sky Breeder", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 6, 3, 70, null, 197, 169, -200, 1710, 1170, -150, null ],
+    [ "Summertime Jewelry Bonney", "STR", [ "Fighter", "Free Spirit" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Summertime Jewelry Bonney Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Summertime Violet", "QCK", [ "Fighter", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Summertime Violet Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 0ce59e27192c6b246ae8b0d15b91b3a204ed828e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 5 Aug 2016 20:31:04 +0200
Subject: [PATCH 0539/1569] Driven

Can't we just pick one and be done?
---
 common/data/ships.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index eb7253728..6189ac828 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -240,9 +240,9 @@ window.ships = [
     {
         name: "Doflamingo Ship",
         thumb: null,
-        description: 'Boosts ATK of Ambition Characters by 1.5x and their HP by 1.35x. Special: Makes Perfects easier to Hit, Adds 0.2 to Chain  (cooldown: 15 Turns)',
-        atk: function(p) { return !p.unit.class.has('Ambition') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
-        hp: function(p) { return !p.unit.class.has('Ambition') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
+        description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Special: Makes Perfects easier to Hit, Adds 0.2 to Chain  (cooldown: 15 Turns)',
+        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
+        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
     }
 
 ];

From 54a7b1973d53c8dea6565d12cf4f2fdadc60764a Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 6 Aug 2016 11:03:05 +0200
Subject: [PATCH 0540/1569] STR Jabra Special

---
 common/data/specials.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index de7d6021c..f0cec10ba 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1446,6 +1446,9 @@ window.specials = {
 			});
 		}
     },
+    1137: {
+    	orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+    },
     1138: {
         atk: function(p) { return p.unit.class.has("Powerhouse" || "Fighter") ? 1.3 : 1},
         type: "class"
@@ -1507,4 +1510,4 @@ window.specials = {
 		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
 		type: "class"
 	},
-};
\ No newline at end of file
+};

From 35f5ce56f177212e03fb7ff48df33eba099e5dee Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 8 Aug 2016 12:29:20 -0500
Subject: [PATCH 0541/1569] Summer Bonney

---
 common/data/captains.js  |  8 ++++++++
 common/data/cooldowns.js |  4 ++--
 common/data/details.js   | 14 +++++++++++++-
 common/data/units.js     |  4 ++--
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 2d48865bb..4e95cc1de 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3062,4 +3062,12 @@ window.captains = {
 	1197: {
 		atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (p.orb == 2.0 ? 2.5 : 1) : 1; }
 	},
+    1198: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+	},
+    1199: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+	},
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 92f771487..e2ac8e2ec 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1196,8 +1196,8 @@ window.cooldowns = [
 	29,
 	29,
 	[ 17, 7 ],
-    null,
-    null,
+    [ 18, 10 ],
+    [ 18, 10 ],
     null,
     null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 62fc52344..3ef9c93de 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6033,5 +6033,17 @@ window.details = {
 		captain: "Boosts ATK of Cerebral and Powerhouse characters by 2.5x if they have a matching orb, by 1x otherwise, reduces crew's RCV to 0",
         special: "For Cerebral and Powerhouse characters, changes all orbs including [BLOCK] orbs to Badly Matching. Deals [INT] damage to all enemies",
         specialName: "Investigator of Sorrow",
-	}
+	},
+    1198: {
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
+        special: "Empties all slots with [RCV] orbs, recover a percentage of MAX HP based on the number of [RCV] orbs emptied",
+		specialNotes: "The exact percentage healed is chosen based on the number of [RCV] orbs consumed: 1 orb will give a ??? multiplier, 2 orbs ???, 3 orbs ???, 4 orbs ???, 5 orbs ???, 6 orbs 20%. It's not possible to activate the special without consuming at least one [RCV] orb.",
+        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
+    },
+    1199: {
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
+        special: "Empties all slots with [RCV] orbs, recover a percentage of MAX HP based on the number of [RCV] orbs emptied",
+		specialNotes: "The exact percentage healed is chosen based on the number of [RCV] orbs consumed: 1 orb will give a ??? multiplier, 2 orbs ???, 3 orbs ???, 4 orbs ???, 5 orbs ???, 6 orbs 20%. It's not possible to activate the special without consuming at least one [RCV] orb.",
+        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index b7909ac23..80391e238 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1196,8 +1196,8 @@ window.units = [
 	[ "Ganfor, Former God of Skypiea", "PSY", "Striker", 4, 18, 6, 2, 50, null, 222, 122, 22, 1122, 622, 122, null ],
 	[ "Ganfor, God of Skypiea", "PSY", "Striker", 5, 30, 4, 3, 99, null, 1111, 611, 111, 2122, 1222, 222, null ],
 	[ "Ohm, Sky Breeder", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 6, 3, 70, null, 197, 169, -200, 1710, 1170, -150, null ],
-    [ "Summertime Jewelry Bonney", "STR", [ "Fighter", "Free Spirit" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Summertime Jewelry Bonney Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jewelry Bonney, Daughter of Summer", "STR", [ "Fighter", "Free Spirit" ], 4, 12, 6, 1, 50, null, 388, 212, 86, null, null, null, null ],
+    [ "Jewelry Bonney, Daughter of Summer Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 20, 4, 2, 99, null, 929, 500, 149, 2000, 989, 301, null ],
     [ "Summertime Violet", "QCK", [ "Fighter", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Summertime Violet Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
 	];

From d7fc81cdb057fb42e7ad0e3748d4f38f673577e9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 12 Aug 2016 15:07:57 +0200
Subject: [PATCH 0542/1569] Newest FN Units + Flags

---
 common/data/captains.js   | 17 ++++++++++++++
 common/data/details.js    | 24 ++++++++++++++++++++
 common/data/evolutions.js | 12 ++++++++--
 common/data/families.js   |  5 ++++
 common/data/flags.js      | 48 +++++++++++++++++++--------------------
 common/data/units.js      | 15 ++++++++----
 index.html                | 10 ++------
 7 files changed, 92 insertions(+), 39 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 4e95cc1de..1d27ee6e5 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3070,4 +3070,21 @@ window.captains = {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
 		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
 	},
+    1202: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1203: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+    },
+    1204: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
+    1205: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1206: {
+        hp: function(p) { return 1.3; }
+    }
 };
diff --git a/common/data/details.js b/common/data/details.js
index 3ef9c93de..fc0fd7d33 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6046,4 +6046,28 @@ window.details = {
 		specialNotes: "The exact percentage healed is chosen based on the number of [RCV] orbs consumed: 1 orb will give a ??? multiplier, 2 orbs ???, 3 orbs ???, 4 orbs ???, 5 orbs ???, 6 orbs 20%. It's not possible to activate the special without consuming at least one [RCV] orb.",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
+    1202: {
+        captain: "Boosts ATK of Free Spirit characters by 1.5x",
+        specialName: "Session of Pirates",
+        special: "Changes [PSY] orbs on Free Spirit characters into matching orbs"
+    },
+    1203: {
+        captain: "Boosts ATK of Free Spirit characters by 2.25x",
+        specialName: "Session of Pirates",
+        special: "Changes [PSY] orbs on Free Spirit characters into matching orbs"
+    },
+    1204: {
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x",
+        specialName: "Awakening Tune Power",
+        special: "Deals 500 damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
+    },
+    1205: {
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
+        specialName: "Awakening Tune Power",
+        special: "Deals 500 damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
+    },
+    1206: {
+        captain: "Boosts HP by 1.3x",
+        specialName: "Chorus echoing in the sea"
+    }
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 51bb134cd..c6f97c35a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1813,14 +1813,22 @@ window.evolutions = {
     },
     1195: {
         evolution: 1196,
-        evolvers: [  ]
+        evolvers: [ 117, 81, 87, 303, 103 ]
     },
     1198: {
         evolution: 1199,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 84, 95, 300 ]
     },
     1200: {
         evolution: 1201,
         evolvers: [  ]
     },
+    1202: {
+        evolution: 1203,
+        evolvers: [ 117, 81, 87, 98, 103 ]
+    },
+    1204: {
+        evolution: 1205,
+        evolvers: [ 116, 117, 90, 96, 101 ]
+    }
 };
diff --git a/common/data/families.js b/common/data/families.js
index 7b554b03a..05c4e4add 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1200,4 +1200,9 @@ window.families = [
 	"Jewelry Bonney",
     "Violet",
 	"Violet",
+    "Yoki",
+    "Yoki",
+    "Brook",
+    "Brook",
+    "Laboon"
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 1e49615f7..0560d0f98 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -880,34 +880,34 @@ window.flags = {
 	1020: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1021: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1022: { promo: 1 },
-    1024: { rr: 1, rro: 1 },
-    1025: { rr: 1, rro: 1 },
-    1026: { rr: 1, rro: 1 },
-    1027: { rr: 1, rro: 1 },
-    1028: { rr: 1, rro: 1 },
-    1029: { rr: 1, rro: 1 },
-    1030: { rr: 1, rro: 1 },
-    1031: { rr: 1, rro: 1 },
-    1032: { rr: 1, rro: 1 },
-    1033: { rr: 1, rro: 1 },
-    1034: { rr: 1, rro: 1 },
-    1035: { rr: 1, rro: 1 },
+    1024: { rr: 1, rro: 1, global: 1 },
+    1025: { rr: 1, rro: 1, global: 1 },
+    1026: { rr: 1, rro: 1, global: 1 },
+    1027: { rr: 1, rro: 1, global: 1 },
+    1028: { rr: 1, rro: 1, global: 1 },
+    1029: { rr: 1, rro: 1, global: 1 },
+    1030: { rr: 1, rro: 1, global: 1 },
+    1031: { rr: 1, rro: 1, global: 1 },
+    1032: { rr: 1, rro: 1, global: 1 },
+    1033: { rr: 1, rro: 1, global: 1 },
+    1034: { rr: 1, rro: 1, global: 1 },
+    1035: { rr: 1, rro: 1, global: 1 },
     1044: { rr: 1, rro: 1 },
     1045: { rr: 1, rro: 1 },
     1053: { rr: 1, rro: 1, lrr: 1 },
     1054: { rr: 1, rro: 1, lrr: 1 },
-	1074: { rr: 1, rro: 1 },
-    1075: { rr: 1, rro: 1 },
-    1076: { rr: 1, rro: 1 },
-    1077: { rr: 1, rro: 1 },
-    1078: { rr: 1, rro: 1 },
-    1079: { rr: 1, rro: 1 },
-    1080: { rr: 1, rro: 1 },
-    1081: { rr: 1, rro: 1 },
-    1082: { rr: 1, rro: 1 },
-    1083: { rr: 1, rro: 1 },
-    1084: { rr: 1, rro: 1 },
-    1085: { rr: 1, rro: 1 },
+	1074: { rr: 1, rro: 1, global: 1 },
+    1075: { rr: 1, rro: 1, global: 1 },
+    1076: { rr: 1, rro: 1, global: 1 },
+    1077: { rr: 1, rro: 1, global: 1 },
+    1078: { rr: 1, rro: 1, global: 1 },
+    1079: { rr: 1, rro: 1, global: 1 },
+    1080: { rr: 1, rro: 1, global: 1 },
+    1081: { rr: 1, rro: 1, global: 1 },
+    1082: { rr: 1, rro: 1, global: 1 },
+    1083: { rr: 1, rro: 1, global: 1 },
+    1084: { rr: 1, rro: 1, global: 1 },
+    1085: { rr: 1, rro: 1, global: 1 },
 	1092: { rr: 1, rro: 1, lrr: 1 },
 	1093: { rr: 1, rro: 1, lrr: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 80391e238..234b69959 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1193,13 +1193,18 @@ window.units = [
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
     [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, null, 181, 132, 47, 945, 539, 181, null ],
     [ "Boa Hancock, Maiden Drowned in Love", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 863, 448, 144, 1724, 1132, 326, null ],
-	[ "Ganfor, Former God of Skypiea", "PSY", "Striker", 4, 18, 6, 2, 50, null, 222, 122, 22, 1122, 622, 122, null ],
-	[ "Ganfor, God of Skypiea", "PSY", "Striker", 5, 30, 4, 3, 99, null, 1111, 611, 111, 2122, 1222, 222, null ],
-	[ "Ohm, Sky Breeder", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 6, 3, 70, null, 197, 169, -200, 1710, 1170, -150, null ],
-    [ "Jewelry Bonney, Daughter of Summer", "STR", [ "Fighter", "Free Spirit" ], 4, 12, 6, 1, 50, null, 388, 212, 86, null, null, null, null ],
-    [ "Jewelry Bonney, Daughter of Summer Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 20, 4, 2, 99, null, 929, 500, 149, 2000, 989, 301, null ],
+    [ "Ganfor, Former God of Skypiea", "PSY", "Striker", 4, 18, 6, 2, 50, 392109, 222, 122, 22, 1122, 622, 122, 1 ],
+    [ "Ganfor, God of Skypiea", "PSY", "Striker", 5, 30, 4, 3, 99, 3000000, 1111, 611, 111, 2122, 1222, 222, 1 ],
+    [ "Ohm, Sky Breeder", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 6, 3, 70, 1778330, 197, 169, -200, 1710, 1170, -150, 1 ],
+    [ "Jewelry Bonney, Daughter of Summer", "STR", [ "Fighter", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 388, 212, 86, 1006, 559, 194, 1 ],
+    [ "Jewelry Bonney, Daughter of Summer Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 20, 4, 2, 99, 3000000, 929, 500, 149, 2000, 989, 301, 1 ],
     [ "Summertime Violet", "QCK", [ "Fighter", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Summertime Violet Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Yoki", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 102, 91, 36, 902, 584, 201, 1 ],
+    [ "Calico Yoki", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 840, 516, 170, 1583, 1153, 315, 1 ],
+    [ "Rumba Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
+    [ "Rumba Pirates Captain Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
+    [ "Rumba Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ]
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index c1bbdeb9f..d9a2f088d 100644
--- a/index.html
+++ b/index.html
@@ -59,16 +59,10 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>27/07/2016</p>
+            <p>12/08/2016</p>
             <br>
             <ul>
-                <li>New Units Added!</li>
-                <br>
-                <li>Added the first Sailor Abilities</li>
-                <li>Also added a few Filters for Sailors</li>
-                <li>At the bottom of the list</li>
-                <li>Integration into the Calculator</li>
-                <li>Will come at a later Point</li>
+                <li>Still alive</li>
                 <br>
                 <li>Updated the newest Units</li>
                 <br>

From 6f99fecc5afc26886a26e4fba4fe810c29a955c9 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 12 Aug 2016 15:11:48 -0500
Subject: [PATCH 0543/1569] Unit updates

+ metadata tags for OPTC
---
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 18 ++++++++----------
 common/data/evolutions.js |  4 ++--
 common/data/units.js      | 14 +++++++-------
 index.html                |  3 +++
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e2ac8e2ec..d8da72cea 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1082,8 +1082,8 @@ window.cooldowns = [
 	[ 18, 12 ],
 	[ 23, 17 ],
 	[ 23, 17 ],
-	24,
-	24,
+	[ 24, 17 ],
+	[ 24, 17 ],
 	[ 20, 10 ],
 	[ 20, 10 ],
 	[ 20, 10 ],
diff --git a/common/data/details.js b/common/data/details.js
index fc0fd7d33..cbee96614 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5228,11 +5228,11 @@ window.details = {
 		captain: "Boosts ATK of Striker and Free Spirit characters by 1.75x",
 		special: [
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 10%",
-				"cooldown": [ 16, 12]
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
+				"cooldown": [ 16, 12 ]
 			},
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20%",
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 20, 16 ]
 			}
 		],
@@ -5243,11 +5243,11 @@ window.details = {
 		captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their RCV by 1.5x",
 		special: [
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 10%",
-				"cooldown": [ 16, 12]
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
+				"cooldown": [ 16, 12 ]
 			},
 			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20%",
+				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 20%",
 				"cooldown": [ 20, 16 ]
 			}
 		],
@@ -6036,14 +6036,12 @@ window.details = {
 	},
     1198: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
-        special: "Empties all slots with [RCV] orbs, recover a percentage of MAX HP based on the number of [RCV] orbs emptied",
-		specialNotes: "The exact percentage healed is chosen based on the number of [RCV] orbs consumed: 1 orb will give a ??? multiplier, 2 orbs ???, 3 orbs ???, 4 orbs ???, 5 orbs ???, 6 orbs 20%. It's not possible to activate the special without consuming at least one [RCV] orb.",
+        special: "Empties all slots with [RCV] orbs, recover 20% of MAX HP",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1199: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
-        special: "Empties all slots with [RCV] orbs, recover a percentage of MAX HP based on the number of [RCV] orbs emptied",
-		specialNotes: "The exact percentage healed is chosen based on the number of [RCV] orbs consumed: 1 orb will give a ??? multiplier, 2 orbs ???, 3 orbs ???, 4 orbs ???, 5 orbs ???, 6 orbs 20%. It's not possible to activate the special without consuming at least one [RCV] orb.",
+        special: "Empties all slots with [RCV] orbs, recover 20% of MAX HP",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1202: {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index c6f97c35a..257dfd6c4 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1745,11 +1745,11 @@ window.evolutions = {
     },
     1160: {
         evolution: 1161,
-        evolvers: []
+        evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1162: {
         evolution: 1163,
-        evolvers: []
+        evolvers: [ 118, 1180 ]
     },
     1164: {
         evolution: 1165,
diff --git a/common/data/units.js b/common/data/units.js
index 234b69959..0b1ac44a0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1161,7 +1161,7 @@ window.units = [
     [ "Koala, Beach Angel", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 133, 79, 37, 994, 479, 187, 1 ],
     [ "Koala, Goddess of Paradise", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 902, 412, 123, 1822, 984, 359, 1 ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
-    [ "Gild Tesoro Evolved", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, null, null, null, null ],
+    [ "Gild Tesoro, Casino King of Gran Tesoro", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, 2256, 1300, 306, 1 ],
     [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],
     [ "Carina, Diva of Gran Tesoro", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, 1066998, 597, 321, 132, 1074, 719, 306, 1 ],
     [ "Baccarat", "INT", [ "Fighter", "Striker" ], 3, 12, 5, 2, 50, 392109, 44, 31, 123, 888, 444, 222, 1 ],
@@ -1178,7 +1178,7 @@ window.units = [
     [ "Chopper, Loyal Straw Hat Crew", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
     [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 902, 473, 74, 2018, 1028, -444, 1 ],
     [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 4000000, 1920, 977, -444, 4400, 1402, -444, 1 ],
-    [ "Rainbow Armored Crab", "INT", "Evolver", null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rainbow Armored Crab", "INT", "Evolver", 3, 4, 5, 0, 1, 0, 30, 500, 0, 30, 500, 0, 1 ],
     [ "Blenheim", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 206, 106, 19, 1051, 624, 95, 1 ],
     [ "Blenheim, The Cutlass", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 6, 4, 99, 4000000, 949, 512, 44, 2643, 1355, 224, 1 ],
     [ "Kingdew", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 232, 94, 38, 1123, 522, 161, 1 ],
@@ -1196,15 +1196,15 @@ window.units = [
     [ "Ganfor, Former God of Skypiea", "PSY", "Striker", 4, 18, 6, 2, 50, 392109, 222, 122, 22, 1122, 622, 122, 1 ],
     [ "Ganfor, God of Skypiea", "PSY", "Striker", 5, 30, 4, 3, 99, 3000000, 1111, 611, 111, 2122, 1222, 222, 1 ],
     [ "Ohm, Sky Breeder", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 6, 3, 70, 1778330, 197, 169, -200, 1710, 1170, -150, 1 ],
-    [ "Jewelry Bonney, Daughter of Summer", "STR", [ "Fighter", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 388, 212, 86, 1006, 559, 194, 1 ],
-    [ "Jewelry Bonney, Daughter of Summer Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 20, 4, 2, 99, 3000000, 929, 500, 149, 2000, 989, 301, 1 ],
+    [ "Jewelry Bonney, Splashing Sapphire", "STR", [ "Fighter", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 388, 212, 86, 1006, 559, 194, 1 ],
+    [ "Jewelry Bonney, Pearl White Gleam", "STR", [ "Fighter", "Free Spirit" ], 5, 20, 4, 2, 99, 3000000, 929, 500, 149, 2000, 989, 301, 1 ],
     [ "Summertime Violet", "QCK", [ "Fighter", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Summertime Violet Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Yoki", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 102, 91, 36, 902, 584, 201, 1 ],
     [ "Calico Yoki", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 840, 516, 170, 1583, 1153, 315, 1 ],
-    [ "Rumba Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
-    [ "Rumba Pirates Captain Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
-    [ "Rumba Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ]
+    [ "Rumbar Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
+    [ "Rumbar Pirates Captain Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
+    [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ]
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index d9a2f088d..b57d24fe6 100644
--- a/index.html
+++ b/index.html
@@ -28,6 +28,9 @@
         <script src="common/js/utils.js"></script>
         <script src="common/js/nonSuspicious.js"></script>
         <meta name="viewport" content="initial-scale=1, user-scalable=no, user-scalable=0">
+        <meta name="author" content="Zeenigami and Mondfischer">
+        <meta name="keywords" content="OPTC, One Piece Treasure Cruise, Database, Calculator, Guides, Help">
+        <meta name="description" content="Fan run database for One Piece Treasure Cruise. Includes a character database with all unit captain abilities, descriptions, sailor abilities, and special abilities. Also includes a damage calculator that accurately helps you find out how much damage your team will deal.">
 
 <!-- Google Analytics -->
 <script>

From 876986d6d3f14f08da3fd665eb4edabee8958973 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 13 Aug 2016 09:12:29 +0200
Subject: [PATCH 0544/1569] Tesoro + Flags + Abbreviations

---
 common/data/aliases.js  | 74 ++++++++++++++++++++---------------------
 common/data/captains.js |  3 ++
 common/data/details.js  |  7 ++--
 common/data/flags.js    | 28 ++++++++--------
 common/data/units.js    |  6 ++--
 index.html              |  8 +++--
 6 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9745fa15b..c426de53a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -103,11 +103,11 @@ window.aliases = {
     102: ['赤しま番竜','Dragon rayé vert'],
     103: ['赤しま番竜','Dragon rayé jaune'],
     104: ['赤しま番竜','Dragon rayé noir'],
-    105: ['赤タカラガメ','Tortue-trésor rouge'],
-    106: ['赤タカラガメ','Tortue-trésor bleue'],
-    107: ['赤タカラガメ','Tortue-trésor verte'],
-    108: ['赤タカラガメ','Tortue-trésor jaune'],
-    109: ['赤タカラガメ','Tortue-trésor noire'],
+    105: ['赤タカラガメ','Tortue-trésor rouge','Baby Turtle'],
+    106: ['赤タカラガメ','Tortue-trésor bleue','Baby Turtle'],
+    107: ['赤タカラガメ','Tortue-trésor verte','Baby Turtle'],
+    108: ['赤タカラガメ','Tortue-trésor jaune','Baby Turtle'],
+    109: ['赤タカラガメ','Tortue-trésor noire','Baby Turtle'],
     110: ['赤ダイミョウガメ','Tortue noble rouge'],
     111: ['赤ダイミョウガメ','Tortue noble bleue'],
     112: ['赤ダイミョウガメ','Tortue noble verte'],
@@ -217,15 +217,15 @@ window.aliases = {
     216: ['モンキー・D・ルフィ（ゴムゴムの風船）',''],
     217: ['モンキー・D・ルフィ（ギア３）','', 'Mistake', 'G3','Gear 3' ],
     218: ['ゾロ_刀狼流し（とうろうながし）',''],
-    219: ['ロロノア・ゾロ_獅子歌歌（ししソンソン）',''],
+    219: ['ロロノア・ゾロ_獅子歌歌（ししソンソン）','','LS Zoro'],
     220: ['ナミ（ファイン=テンポ）',''],
-    221: ['ナミ（幸せパンチ）','', 'Towel Nami' ],
+    221: ['ナミ（幸せパンチ）','', 'Towel Nami','TNami' ],
     222: ['ウソップ（ウソップハンマー）',''],
     223: ['ウソップ（衝撃（インパクト））',''],
     224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji', 'Mr Prince Mutton Shot'],
     225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji', 'Mr Prince Veau Shot' ],
-    226: ['ジュラキュール・ミホーク',''],
-    227: ['鷹の目のミホーク',''],
+    226: ['ジュラキュール・ミホーク','','Raidhawk'],
+    227: ['鷹の目のミホーク','','Raidhawk'],
     228: ['脱獄モーガン',''],
     229: ['寝返りのジャンゴ',''],
     230: ['両鉄拳のフルボディ',''],
@@ -266,7 +266,7 @@ window.aliases = {
     265: ['軍曹ヘルメッポ',''],
     266: ['虹海賊ペンギン',''],
     267: ['虹しま番竜',''],
-    268: ['白猟のスモーカー ビローアバイク',''],
+    268: ['白猟のスモーカー ビローアバイク','','WC Smoker'],
     269: ['格闘隊　武装隊員 レッドパイレーツ',''],
     270: ['格闘隊　武装隊員 ブルーパイレーツ',''],
     271: ['格闘隊　武装隊員 グリーンパイレーツ',''],
@@ -340,16 +340,16 @@ window.aliases = {
     339: ['モズ',''],
     340: ['クラーケン スルメ',''],
     341: ['クラーケン 北極の怪物',''],
-    342: ['赤パワース豚（トーン）','','pig','pork'],
-    343: ['青パワース豚（トーン）','','pig','pork'],
-    344: ['緑パワース豚（トーン）','','pig','pork'],
-    345: ['黄パワース豚（トーン）','','pig','pork'],
-    346: ['黒パワース豚（トーン）','','pig','pork'],
-    347: ['ルビーパワース豚（トーン）','','pig','pork'],
-    348: ['サファイアパワース豚（トーン）','','pig','pork'],
-    349: ['エメラルドパワース豚（トーン）','','pig','pork'],
-    350: ['トパーズパワース豚（トーン）','','pig','pork'],
-    351: ['アメジストパワース豚（トーン）','','pig','pork'],
+    342: ['赤パワース豚（トーン）','','Pig','Pork'],
+    343: ['青パワース豚（トーン）','','Pig','Pork'],
+    344: ['緑パワース豚（トーン）','','Pig','Pork'],
+    345: ['黄パワース豚（トーン）','','Pig','Pork'],
+    346: ['黒パワース豚（トーン）','','Pig','Pork'],
+    347: ['ルビーパワース豚（トーン）','','Pig','Pork'],
+    348: ['サファイアパワース豚（トーン）','','Pig','Pork'],
+    349: ['エメラルドパワース豚（トーン）','','Pig','Pork'],
+    350: ['トパーズパワース豚（トーン）','','Pig','Pork'],
+    351: ['アメジストパワース豚（トーン）','','Pig','Pork'],
     352: ['ゼファー',''],
     353: ['ゼファー NEO海軍総帥',''],
     354: ['アイン',''],
@@ -507,8 +507,8 @@ window.aliases = {
     506: ['ペル アラバスタの守護神ファルコン',''],
     507: ['チャカ',''],
     508: ['チャカ アラバスタの守護神ジャッカル',''],
-    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長','','Mr 0', 'Mr. 0','Crocodile'],
-    510: ['最強の囚人サー・クロコダイル 元王下七武海','','Mr 0','Mr. 0'],
+    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長','','Mr 0', 'Mr. 0','Crocodile','Prisondile'],
+    510: ['最強の囚人サー・クロコダイル 元王下七武海','','Mr 0','Mr. 0','Prisondile'],
     511: ['服役囚ダズ・ボーネス Mr.1','','Mr 1','Daz Bones'],
     512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
     513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
@@ -575,8 +575,8 @@ window.aliases = {
     574: ['青キジ','',"Kuzan"],
     575: ['青キジ　氷結人間','',"Kuzan"],
     576: ['ナミのティータイム',''],
-    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy' ],
-    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy' ],
+    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy' ],
+    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy' ],
     579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro' ],
     580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro' ],
     581: ['ゲンボウ',''],
@@ -646,8 +646,8 @@ window.aliases = {
     645: ['氷の魔女ホワイティベイ',''],
     646: ['リトルオーズJr.',''],
     647: ['猛攻のリトルオーズJr.',''],
-    648: ['マルコ 白ひげ海賊団１番隊隊長',''],
-    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長',''],
+    648: ['マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
+    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
     650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami' ],
     651: ['ナミ 航海の夢「世界地図」','', 'Log Nami' ],
     652: ['鉄仮面のデュバル',''],
@@ -672,8 +672,8 @@ window.aliases = {
     671: ['コアラ 革命軍',''],
     672: ['ハック',''],
     673: ['ハック 革命軍',''],
-    674: ['エンポリオ・イワンコフ ニューカマー拳法　師範',''],
-    675: ['エンポリオ・イワンコフ 革命軍',''],
+    674: ['エンポリオ・イワンコフ ニューカマー拳法　師範','','INTvankov'],
+    675: ['エンポリオ・イワンコフ 革命軍','','INTvankov'],
     676: ['イナズマ',''],
     677: ['イナズマ 革命軍',''],
     678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin' ],
@@ -715,8 +715,8 @@ window.aliases = {
     714: ['ピエール',''],
     715: ['コニス',''],
     716: ['コニス スカイピアの少女',''],
-    717: ['ジュラキュール・ミホーク 王下七武海',''],
-    718: ['鷹の目のミホーク 世界最強の剣士',''],
+    717: ['ジュラキュール・ミホーク 王下七武海','','INThawk'],
+    718: ['鷹の目のミホーク 世界最強の剣士','','INThawk'],
     719: ['サー・クロコダイル　ロギア 王下七武海',''],
     720: ['サー・クロコダイル　ロギア 元王下七武海',''],
     721: ['ジェリー',''],
@@ -734,7 +734,7 @@ window.aliases = {
     733: ['フクロウ　六式 サイファーポールNo.9',''],
     734: ['クマドリ サイファーポールNo.9',''],
     735: ['クマドリ　六式 サイファーポールNo.9',''],
-    736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）',''],
+    736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）','','Box Kaku'],
     737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）','','rob lucci'],
     738: ['スパンダム',''],
     739: ['フランキー 麦わらの一味',''],
@@ -853,8 +853,8 @@ window.aliases = {
     852: ['スリムアップワポル',''],
     853: ['ロブソン',''],
     854: ['チョッパーの雪遊び',''],
-    855: ['トラファルガー・ロー 聖夜の紳士','','Supernova'],
-    856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova'],
+    855: ['トラファルガー・ロー 聖夜の紳士','','Supernova','Christmas Law','CLaw'],
+    856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova','Christmas Law','CLaw'],
     857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova'],
     858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ','','Supernova'],
     859: ['コビー 海軍本部曹長',''],
@@ -932,8 +932,8 @@ window.aliases = {
     931: ['ブルゴリ ','','Blue Gorilla'],
     932: ['ピーカ',''],
     933: ['ピーカ ドンキホーテ海賊団',''],
-    934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei'],
-    935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei'],
+    934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
+    935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
     936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者','','Timeskip Luffy','3D2Y Luffy'],
     937: ['モンキー・Ｄ・ルフィ 仲間との誓い『３Ｄ２Ｙ』','','Timeskip Luffy','3D2Y Luffy'],
     938: ['ナミ 天候の科学の探求者','','Timeskip Nami','3D2Y Nami'],
@@ -1042,8 +1042,8 @@ window.aliases = {
     1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '' ],
     1042: [ 'キラー キッド海賊団', '' ],
     1043: [ '“殺戮武人”キラー キッド海賊団', '' ],
-    1044: [ 'トラファルガー・ロー 最悪の世代', '' ],
-    1045: [ 'トラファルガー・ロー 王下七武海', '' ],
+    1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
+    1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
     1046: [ 'サボ 竜の爪', '' ],
     1047: [ 'サボ 革命軍参謀総長', '' ],
     1048: [ 'ニコ・オルビア', '' ],
diff --git a/common/data/captains.js b/common/data/captains.js
index 1d27ee6e5..a2478c62a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2938,6 +2938,9 @@ window.captains = {
     1162: {
 		atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
 	},
+    1163: {
+        atk: function(p) { return (p.unit.type == "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type == "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type == "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
+    },
     1164: {
 		rcv: function(p) { return 1.2; }
 	},
diff --git a/common/data/details.js b/common/data/details.js
index cbee96614..8982db97b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5810,7 +5810,8 @@ window.details = {
         specialName: "Gold-Gold Fruit",
     },
     1163: {//Tesoro Evolved
-        captain: "Unit Not Yet Available",
+        captain: "Boosts ATK of PSY units by 1.75x. Also boosts ATK of Driven and Cerebral units by 1.5x. Boosts amount of Beli received by 2x",
+        captainNotes: "The two Boosts stack with each other so a PSY Driven or a PSY Cerebral Unit will be boosted by 2.625",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
         specialName: "Gold-Gold Fruit",
     },
@@ -6066,6 +6067,8 @@ window.details = {
     },
     1206: {
         captain: "Boosts HP by 1.3x",
-        specialName: "Chorus echoing in the sea"
+        specialName: "Chorus echoing in the sea",
+        special: "Prevents death for one turn",
+        specialNotes: "HP Requirement noy yet known"
     }
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 0560d0f98..20746e4d0 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -834,16 +834,16 @@ window.flags = {
     894: { global: 1 },
 	895: { special: 1, global: 1 },
 	896: { special: 1, global: 1 },
-	905: { rr: 1, rro: 1 },
-	906: { rr: 1, rro: 1 },
-	907: { rr: 1, rro: 1 },
-	908: { rr: 1, rro: 1 },
-	909: { rr: 1, rro: 1 },
-	910: { rr: 1, rro: 1 },
-	911: { rr: 1, rro: 1 },
-	912: { rr: 1, rro: 1 },
-	913: { rr: 1, rro: 1 },
-	914: { rr: 1, rro: 1 },
+	905: { rr: 1, rro: 1, global: 1 },
+	906: { rr: 1, rro: 1, global: 1 },
+	907: { rr: 1, rro: 1, global: 1 },
+	908: { rr: 1, rro: 1, global: 1 },
+	909: { rr: 1, rro: 1, global: 1 },
+	910: { rr: 1, rro: 1, global: 1 },
+	911: { rr: 1, rro: 1, global: 1 },
+	912: { rr: 1, rro: 1, global: 1 },
+	913: { rr: 1, rro: 1, global: 1 },
+	914: { rr: 1, rro: 1, global: 1 },
 	915: { rr: 1, rro: 1, lrr: 1 },
 	916: { rr: 1, rro: 1, lrr: 1 },
     921: { rr: 1, rro: 1, lrr: 1 },
@@ -877,8 +877,8 @@ window.flags = {
 	1007: { rr: 1, rro: 1, lrr: 1 },
     1008: { rr: 1, rro: 1, lrr: 1 },
 	1009: { promo: 1 },
-	1020: { rr: 1, rro: 1, lrr: 1, global: 1 },
-    1021: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	1020: { rr: 1, rro: 1, lrr: 1 },
+    1021: { rr: 1, rro: 1, lrr: 1 },
     1022: { promo: 1 },
     1024: { rr: 1, rro: 1, global: 1 },
     1025: { rr: 1, rro: 1, global: 1 },
@@ -918,8 +918,8 @@ window.flags = {
     1117: { rr: 1, rro: 1 },
     1118: { rr: 1, rro: 1 },
     1119: { rr: 1, rro: 1 },
-    1120: { rr: 1, rro: 1 },
-    1121: { rr: 1, rro: 1 },
+    1120: { rr: 1, rro: 1, global: 1 },
+    1121: { rr: 1, rro: 1, global: 1 },
     1122: { rr: 1, rro: 1 },
     1123: { rr: 1, rro: 1 },
     1124: { rr: 1, rro: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 0b1ac44a0..3ab98a1f6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1200,10 +1200,10 @@ window.units = [
     [ "Jewelry Bonney, Pearl White Gleam", "STR", [ "Fighter", "Free Spirit" ], 5, 20, 4, 2, 99, 3000000, 929, 500, 149, 2000, 989, 301, 1 ],
     [ "Summertime Violet", "QCK", [ "Fighter", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Summertime Violet Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Yoki", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 102, 91, 36, 902, 584, 201, 1 ],
-    [ "Calico Yoki", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 840, 516, 170, 1583, 1153, 315, 1 ],
+    [ "Yorki", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 102, 91, 36, 902, 584, 201, 1 ],
+    [ "Calico Yorki", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 840, 516, 170, 1583, 1153, 315, 1 ],
     [ "Rumbar Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
-    [ "Rumbar Pirates Captain Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
+    [ "Rumba Pirates Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
     [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ]
 	];
 	
diff --git a/index.html b/index.html
index b57d24fe6..9292ad498 100644
--- a/index.html
+++ b/index.html
@@ -62,12 +62,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>12/08/2016</p>
+            <p>13/08/2016</p>
             <br>
             <ul>
-                <li>Still alive</li>
+                <li>Finished Tesoro</li>
                 <br>
-                <li>Updated the newest Units</li>
+                <li>Added a few Char Abbreviations</li>
+                <br>
+                <li>Finished the Global Tags</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From a5eecdb8d2e852463a2b0ec64e8844380ee9ba66 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 13 Aug 2016 09:21:12 +0200
Subject: [PATCH 0545/1569] Oars Challenge + New Crab drop

---
 common/data/drops.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index ac93d7461..0abd762e3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1270,7 +1270,7 @@ window.drops = {
             name: 'Clash!! Tesoro',
             thumb: 1162, //Change to evolved Tereso once he arrives
             Master: [ 1162, 1164 ],
-            Expert: [ 1162, 1164 ]
+            Ultimate: [ 1162, 1164, 1180 ]
         },
 
     ],
@@ -1286,6 +1286,8 @@ window.drops = {
         {
             name: 'Battle Royal! Oars',
             thumb: 893,
+            challenge:'Total number of hits above 50,000',
+            challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Anti-Bind Forbidden Tome, 2x Rainbow Gems']],
             'Master': [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -15, -8 ]
         },
 

From d30800dcc43b40409b85db20b06a5214bbd5fcf9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 13 Aug 2016 09:53:53 +0200
Subject: [PATCH 0546/1569] Laboon Correction

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8982db97b..053c41e77 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6068,7 +6068,7 @@ window.details = {
     1206: {
         captain: "Boosts HP by 1.3x",
         specialName: "Chorus echoing in the sea",
-        special: "Prevents death for one turn",
-        specialNotes: "HP Requirement noy yet known"
+        special: "Protects from defeat as long as HP is above 50%",
+        specialNotes: "#{zombie}"
     }
 };

From 31ee61dcba171404d4a533f7cb6c9cddd5fe2145 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 13 Aug 2016 17:48:17 +0200
Subject: [PATCH 0547/1569] Global Drop Versions

---
 common/data/drops.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 0abd762e3..ea9aced3f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -920,7 +920,8 @@ window.drops = {
             thumb: 724,
 			global: true,
             condition: 'You can only bring INT, PSY and QCK units',
-            "All Difficulties": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ]
+            "Japan": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ],
+            "Global": [ 721, 723, -590, -564, -563, -530, -641, -384, -361, -219 ]
         },
 
         {
@@ -957,7 +958,8 @@ window.drops = {
             condition: 'You can only bring Fighter and Powerhouse units',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['100,000','1x Purple Elder'],['400,000','1x RCV Candy, 1x Rainbow Gem'],['750,000','1x Auto-Heal Skullbook, 2x Rainbow Gem']],
-            "All Difficulties": [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ]
+            "Japan": [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ],
+            "Global": [ 796, 798, 799, 800, -800, -677, -628, -562, -414, -432, -380, -75 ]
         },
 
         {

From 4693a393a36171d4099026db361ed7f6dbea675d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 14 Aug 2016 01:18:29 +0200
Subject: [PATCH 0548/1569] Binz Special

---
 common/data/specials.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index f0cec10ba..ce7bfff21 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1383,7 +1383,7 @@ window.specials = {
     1105: {
         chainAddition: function(p){ return 0.2;}
     },
-    1105: {
+    1106: {
         chainAddition: function(p){ return 0.2;}
     },
     1107: {

From 704ef6732be7e2864e40d187d3c81769a1fba3aa Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 15 Aug 2016 22:23:19 +0200
Subject: [PATCH 0549/1569] Eval to HP Input

---
 damage/js/directives.js | 1 +
 index.html              | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index e079ab744..31769c3f1 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -434,6 +434,7 @@ directives.hpBar = function() {
                 if (!hp) return;
                 hp = hp.trim();
                 if (/%$/.test(hp)) perc = true;
+                if(!perc) hp = eval(hp); //Enable User Input to be calculated
                 hp = parseFloat(hp, 10);
                 if (!perc) hp = Math.floor(hp);
                 if (isNaN(hp)) return;
diff --git a/index.html b/index.html
index 9292ad498..df230a329 100644
--- a/index.html
+++ b/index.html
@@ -62,10 +62,13 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>13/08/2016</p>
+            <p>15/08/2016</p>
             <br>
             <ul>
-                <li>Finished Tesoro</li>
+                <li>Added Evaluation to the HP Input</li>
+                <li>of the Calculator, so you can now </li>
+                <li>enter Stuff like 300-200 or 250*4.3</li>
+                <li>(Uses decimal point)</li>
                 <br>
                 <li>Added a few Char Abbreviations</li>
                 <br>

From 36fe61d6fd382c8398a7c4ed79022c1489d594b6 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Aug 2016 14:47:30 -0500
Subject: [PATCH 0550/1569] summer units updates

---
 common/data/aliases.js    | 289 ++++++++++++++++++++------------------
 common/data/cooldowns.js  |  31 ++--
 common/data/details.js    |  52 ++++++-
 common/data/evolutions.js |  18 ++-
 common/data/families.js   |  10 +-
 common/data/units.js      |  18 ++-
 index.html                |  12 +-
 7 files changed, 268 insertions(+), 162 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c426de53a..54c4257ed 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -246,8 +246,8 @@ window.aliases = {
     245: ['ピストルビリオンズ バロックワークス',''],
     246: ['バズーカビリオンズ バロックワークス',''],  
     247: ['チョッパーマン','', 'Chopperman', 'Chopper Man' ],
-    248: ['トニートニー・チョッパー 暴走前','', 'Monster Chopper' ],
-    249: ['トニートニー・チョッパー 暴走後','', 'Monster Chopper' ],
+    248: ['トニートニー・チョッパー 暴走前','', 'Raid Monster Chopper' ],
+    249: ['トニートニー・チョッパー 暴走後','', 'Raid Monster Chopper' ],
     250: ['マルコ',''],
     251: ['不死鳥マルコ',''],
     252: ['ジョズ',''],
@@ -303,8 +303,8 @@ window.aliases = {
     302: ['緑アーマーロブスター',''],
     303: ['黄アーマーロブスター',''],
     304: ['黒アーマーロブスター',''],
-    305: ['モンキー・D・ガープ',''],
-    306: ['ゲンコツのガープ',''],
+    305: ['モンキー・D・ガープ','','Raid'],
+    306: ['ゲンコツのガープ','','Raid'],
     307: ['トラファルガー・ロー','','Supernova'],
     308: ['トラファルガー・ロー ROOMバジル・ホーキンス','','Supernova'],
     309: ['バジル・ホーキンス','','Supernova'],
@@ -350,10 +350,10 @@ window.aliases = {
     349: ['エメラルドパワース豚（トーン）','','Pig','Pork'],
     350: ['トパーズパワース豚（トーン）','','Pig','Pork'],
     351: ['アメジストパワース豚（トーン）','','Pig','Pork'],
-    352: ['ゼファー',''],
-    353: ['ゼファー NEO海軍総帥',''],
-    354: ['アイン',''],
-    355: ['アイン NEO海軍バイス・アドミラル',''],
+    352: ['ゼファー','','Raid'],
+    353: ['ゼファー NEO海軍総帥','','Raid'],
+    354: ['アイン','','Raid'],
+    355: ['アイン NEO海軍バイス・アドミラル','','Raid'],
     356: ['ユースタス・キッド','','Supernova'],
     357: ['キャプテン・キッド','','Supernova'],
     358: ['スクラッチメン・アプー','','Supernova'],
@@ -387,8 +387,8 @@ window.aliases = {
     386: ['ドクトル・ホグバック',''],
     387: ['シンドリーちゃん',''],
     388: ['ビクトリア・シンドリー',''],
-    389: ['エンポリオ・イワンコフ',''],
-    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】',''],
+    389: ['エンポリオ・イワンコフ','','Raid'],
+    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】','','Raid'],
     391: ['ペローナ',''],
     392: ['ペローナ ゴーストプリンセス',''],
     393: ['クマシー','', 'Kumashi' ],
@@ -415,8 +415,8 @@ window.aliases = {
     414: ['ゲッコー・モリア 王下七武海','', 'Gekko Moriah Warlord of the Sea'],
     415: ['ボア・ハンコック',''],
     416: ['ボア・ハンコック 王下七武海',''],
-    417: ['ドンキホーテ・ドフラミンゴ','', 'Doffy' ],
-    418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Doffy' ],
+    417: ['ドンキホーテ・ドフラミンゴ','', 'Raid Doffy' ],
+    418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Raid Doffy' ],
     419: ['サンジ 整形ショット(パラージュショット)　“嵐”','', 'Kimono Sanji' ],
     420: ['モンキー・D・ルフィ ゴムゴムのバズーカ“覇”','', 'Kimono Luffy' ],
     421: ['ロロノア・ゾロ 三・千・世・界“斬”','', 'Kimono Zoro' ],
@@ -444,8 +444,8 @@ window.aliases = {
     443: ['ケンタロウスとヒコイチ 超カルガモ部隊',''],
     444: ['カルー','', 'Carue', 'Karue' ],
     445: ['カルー隊長と超カルガモ部隊','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
-    446: ['マーシャル・Ｄ・ティーチ','', 'Blackbeard' ],
-    447: ['黒ひげ',''],
+    446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard' ],
+    447: ['黒ひげ','','Raid'],
     448: ['サッチ',''],
     449: ['双剣のサッチ',''],
     450: ['ナミュール','', 'Namur' ],
@@ -513,10 +513,10 @@ window.aliases = {
     512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
     513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
     514: ['ニコ・ロビン トロピカル',''],
-    515: ['ヘラクレスン',''],
-    516: ['ヘラクレスン 森の勇者',''],
-    517: ['ウソップン','', 'Usoppun' ],
-    518: ['ウソップン ヘラクレスンの生徒','', 'Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
+    515: ['ヘラクレスン','','Raid'],
+    516: ['ヘラクレスン 森の勇者','','Raid'],
+    517: ['ウソップン','', 'Raid Usoppun' ],
+    518: ['ウソップン ヘラクレスンの生徒','', 'Raid Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
     519: ['モンキー・Ｄ・ルフィ メルヴィユの冒険者','', 'Strong World Luffy', 'SW Luffy' ],
     520: ['モンキー・Ｄ・ルフィ 特攻の麦わらの一味','', 'Strong World Luffy', 'SW Luffy' ],
     521: ['サンジ メルヴィユの冒険者','', 'Strong World Sanji', 'SW Sanji' ],
@@ -572,8 +572,8 @@ window.aliases = {
     571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット','', 'Afro Luffy', 'Afroluffy' ],
     572: ['ウソップ デービーバックファイト・セコンド',''],
     573: ['トニートニー・チョッパー デービーバックファイト・マスク',''],
-    574: ['青キジ','',"Kuzan"],
-    575: ['青キジ　氷結人間','',"Kuzan"],
+    574: ['青キジ','','Raid Kuzan' ],
+    575: ['青キジ　氷結人間','','Raid Kuzan' ],
     576: ['ナミのティータイム',''],
     577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy' ],
     578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy' ],
@@ -600,8 +600,8 @@ window.aliases = {
     599: ['バギー ロジャー海賊団','','Young Buggy'],
     600: ['シャンクス 海賊見習い','','Young Shanks'],
     601: ['シャンクス ロジャー海賊団','','Young Shanks'],
-    602: ['エネル ２億Ｖ　雷神','', 'Enel, 200 Million Volt Thunder God' ],
-    603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Enel the Lightning Human, 200 Million Volt Thunder God' ],
+    602: ['エネル ２億Ｖ　雷神','', 'Raid Enel, 200 Million Volt Thunder God' ],
+    603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God' ],
     604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji' ],
     605: ['サンジ 航海の夢「オールブルー」','', 'Log Sanji' ],
     606: ['海賊ゼフ',''],
@@ -650,14 +650,14 @@ window.aliases = {
     649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
     650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami' ],
     651: ['ナミ 航海の夢「世界地図」','', 'Log Nami' ],
-    652: ['鉄仮面のデュバル',''],
-    653: ['デュバル トビウオライダーズ ヘッド',''],
-    654: ['デュバル 人生バラ色ライダーズ ヘッド',''],
+    652: ['鉄仮面のデュバル','','Raid'],
+    653: ['デュバル トビウオライダーズ ヘッド','','Raid'],
+    654: ['デュバル 人生バラ色ライダーズ ヘッド','','Raid'],
     655: ['海賊アーロン','','Young Arlong'],
     656: ['アーロン タイヨウの海賊団','','Young Arlong'],
     657: ['クロオビ タイヨウの海賊団','','Young Kuroobi'],
     658: ['チュウ タイヨウの海賊団','','Young Choo'],
-    659: ['モンキー・D・ルフィ うきわ',''],
+    659: ['モンキー・D・ルフィ うきわ','','Summertime Luffy'],
     660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp' ],
     661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp' ],
     662: ['ナミ バカンス',''],
@@ -678,12 +678,12 @@ window.aliases = {
     677: ['イナズマ 革命軍',''],
     678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin' ],
     679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」','', 'Log Robin' ],
-    680: ['アイス大好きナミ',''],
-    681: ['アイス大好きナミ レモンアイス',''],
-    682: ['アイス大好きロビン',''],
-    683: ['アイス大好きロビン チョコアイス',''],
-    684: ['アイス大好きペローナ',''],
-    685: ['アイス大好きペローナ ストロベリーアイス',''],
+    680: ['アイス大好きナミ','','Summertime Nami'],
+    681: ['アイス大好きナミ レモンアイス','','Summertime Nami'],
+    682: ['アイス大好きロビン','','Summertime Robin'],
+    683: ['アイス大好きロビン チョコアイス','','Summertime Robin'],
+    684: ['アイス大好きペローナ','','Summertime Perona'],
+    685: ['アイス大好きペローナ ストロベリーアイス','','Summertime Perona'],
     686: ['ビビのひとやすみ',''],
     687: ['カルガラ',''],
     688: ['カルガラ シャンディアの大戦士',''],
@@ -768,18 +768,18 @@ window.aliases = {
     767: ['ニコ・ロビン セクシーデビル','', 'Halloween Robin' ],
     768: ['サンジ ゴーストナイト','', 'Halloween Sanji' ],
     769: ['ブルック こわがりスケルトン','', 'Halloween Brook' ],
-    770: ['ダルメシアン 海軍本部中将',''],
-    771: ['モモンガ 海軍本部中将',''],
-    772: ['オニグモ 海軍本部中将',''],
-    773: ['シュウ',''],
-    774: ['ベリーグッド','','Very Good'],
-    775: ['ストロベリー 海軍本部中将',''],
-    776: ['ラッキー・ルウ',''],
-    777: ['ラッキー・ルウ 赤髪海賊団',''],
-    778: ['レベッカ 囚人剣闘士',''],
-    779: ['レベッカ コロシアム専属剣闘士',''],
-    780: ['ウルージ 破戒僧海賊団船長','','Supernova'],
-    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova'],
+    770: ['ダルメシアン 海軍本部中将','','Raid'],
+    771: ['モモンガ 海軍本部中将','','Raid'],
+    772: ['オニグモ 海軍本部中将','','Raid'],
+    773: ['シュウ','','Raid'],
+    774: ['ベリーグッド','','Very Good','Raid'],
+    775: ['ストロベリー 海軍本部中将','','Raid'],
+    776: ['ラッキー・ルウ','','Colosseum'],
+    777: ['ラッキー・ルウ 赤髪海賊団','','Colosseum'],
+    778: ['レベッカ 囚人剣闘士','','Colosseum'],
+    779: ['レベッカ コロシアム専属剣闘士','','Colosseum'],
+    780: ['ウルージ 破戒僧海賊団船長','','Supernova','Colosseum'],
+    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova','Colosseum'],
     782: ['たしぎ 正義の華','', 'Kimono Tashigi' ],
     783: ['たしぎ 海軍本部少尉・正義の華','', 'Kimono Tashigi' ],
     784: ['ゲンさん',''],
@@ -792,8 +792,8 @@ window.aliases = {
     791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団','', 'Usopp Pirates' ],
     792: ['アイスバーグ','', 'Iceberg' ],
     793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
-    794: ['モンキー・D・ルフィ 希望の星',''],
-    795: ['ナイトメア・ルフィ 希望の戦士',''],
+    794: ['モンキー・D・ルフィ 希望の星','','Raid'],
+    795: ['ナイトメア・ルフィ 希望の戦士','','Raid'],
     796: ['ブリード',''],
     797: ['ブリード ペトペトの実の能力者',''],
     798: ['クンフージュゴン 海獣海賊団',''],
@@ -801,12 +801,12 @@ window.aliases = {
     800: ['たこボクサー 海獣海賊団',''],
     801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','mr 2' ],
     802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
-    803: ['ヒナ 海軍本部大佐',''],
-    804: ['黒檻のヒナ 海軍本部大佐',''],
-    805: ['スモーカー 海軍本部大佐',''],
-    806: ['白猟のスモーカー 海軍本部大佐',''],
-    807: ['純白の天使ナミ ウエディング',''],
-    808: ['純白の女神ナミ ウエディング',''],
+    803: ['ヒナ 海軍本部大佐','','Colosseum'],
+    804: ['黒檻のヒナ 海軍本部大佐','','Colosseum'],
+    805: ['スモーカー 海軍本部大佐','','Colosseum'],
+    806: ['白猟のスモーカー 海軍本部大佐','','Colosseum'],
+    807: ['純白の天使ナミ ウエディング','','Bridal Nami'],
+    808: ['純白の女神ナミ ウエディング','','Bridal Nami'],
     809: ['ローラ スリラーバークの花嫁',''],
     810: ['求愛のローラ スリラーバークの花嫁',''],
     811: ['リスキー兄弟',''],
@@ -828,13 +828,13 @@ window.aliases = {
     827: ['ジェネラルゾンビ　疾速の影',''],
     828: ['？？？','','Kid Law','Young Law'],
     829: ['？？？','','Kid Law','Young Law'],
-    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
-    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova'],
-    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia' ],
-    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia' ],
-    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day'],
-    835: ['暴君バーソロミュー・くま',''],
-    836: ['暴君バーソロミュー・くま 政府の人間兵器',''],
+    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Colosseum'],
+    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Colosseum'],
+    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Colosseum' ],
+    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Colosseum' ],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day','Colosseum'],
+    835: ['暴君バーソロミュー・くま','','Raid'],
+    836: ['暴君バーソロミュー・くま 政府の人間兵器','','Raid'],
     837: ['シーザー・クラウン',''],
     838: ['Ｍ（マスター）・シーザー',''],
     839: ['ヴェルゴ',''],
@@ -857,13 +857,13 @@ window.aliases = {
     856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova','Christmas Law','CLaw'],
     857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova'],
     858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ','','Supernova'],
-    859: ['コビー 海軍本部曹長',''],
-    860: ['戦火の勇士コビー 海軍本部曹長',''],
-    861: ['レディー・アルビダ うるわしき美女',''],
-    862: ['レディー・アルビダ 絶世の美女',''],
+    859: ['コビー 海軍本部曹長','','Colosseum'],
+    860: ['戦火の勇士コビー 海軍本部曹長','','Colosseum'],
+    861: ['レディー・アルビダ うるわしき美女','','Colosseum'],
+    862: ['レディー・アルビダ 絶世の美女','','Colosseum'],
     863: ['銀世界のナミ',''],
-    864: ['ボア・ハンコック 九蛇海賊団船長',''],
-    865: ['女帝ボア・ハンコック 九蛇海賊団船長',''],
+    864: ['ボア・ハンコック 九蛇海賊団船長','','Raid'],
+    865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid'],
     866: ['ニコ・ロビン 百花繚乱 ウイング“華”','', 'Kimono Robin' ],
     867: ['ウソップ タバスコ星“撃”','', 'Kimono Usopp' ],
     868: ['トニートニー・チョッパー 重量ゴング“獣”','', 'Kimono Chopper' ],
@@ -879,10 +879,10 @@ window.aliases = {
     878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates' ],
     879: ['ラオＧ',''],
     880: ['ラオＧ ドンキホーテ海賊団',''],
-    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova'],
-    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova'],
-    883: ['ドリー 巨兵海賊団',''],
-    884: ['青鬼のドリー',''],
+    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova','Colosseum'],
+    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova','Colosseum'],
+    883: ['ドリー 巨兵海賊団','','Colosseum'],
+    884: ['青鬼のドリー','','Colosseum'],
     885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
     886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
     887: ['バギー 陽気なかぶき者','', 'Kimono Buggy' ],
@@ -898,11 +898,11 @@ window.aliases = {
     897: ['サー・クロコダイル 砂の武将','', 'Kimono Crocodile' ],
     898: ['Mr.3 姑息な楽士','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
     899: ['Mr.2・ボン・クレー あやふやな侍','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
-    900: ['フレッシュ・フランキー 健康第一',''],
-    901: ['鉄人（サイボーグ）フランキー',''],
-    902: ['ブロギー 巨兵海賊団',''],
-    903: ['赤鬼のブロギー',''],
-    904: ['ヨコヅナ',''],
+    900: ['フレッシュ・フランキー 健康第一','','Colosseum'],
+    901: ['鉄人（サイボーグ）フランキー','','Colosseum'],
+    902: ['ブロギー 巨兵海賊団','','Colosseum'],
+    903: ['赤鬼のブロギー','','Colosseum'],
+    904: ['ヨコヅナ','','Colosseum'],
     905: ['ロロノア・ゾロ クライガナ島をさすらう剣士','','3D2Y Zoro','Timeskip Zoro'],
     906: ['ロロノア・ゾロ 世界最強剣士の門弟','','3D2Y Zoro','Timeskip Zoro'],
     907: ['ニコ・ロビン テキーラウルフの収監者','','3D2Y Robin','Timeskip Robin'],
@@ -921,17 +921,17 @@ window.aliases = {
     920: ['スイトピー',''],
     921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
     922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
-    923: ['南の海のキャプテン・キッド',''],
-    924: ['キャプテン・キッド キッド海賊団船長',''],
-    925: ['獄卒長サディちゃん',''],
-    926: ['獄卒長サディちゃん 獄卒獣の指揮官',''],
-    927: ['ドーベルマン 海軍本部中将',''],
+    923: ['南の海のキャプテン・キッド','','Colosseum'],
+    924: ['キャプテン・キッド キッド海賊団船長','','Colosseum'],
+    925: ['獄卒長サディちゃん','','Colosseum'],
+    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Colosseum'],
+    927: ['ドーベルマン 海軍本部中将','','Colosseum'],
 	928: ['ハンニャバル','','Hannibal'],
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
     931: ['ブルゴリ ','','Blue Gorilla'],
-    932: ['ピーカ',''],
-    933: ['ピーカ ドンキホーテ海賊団',''],
+    932: ['ピーカ','','Raid'],
+    933: ['ピーカ ドンキホーテ海賊団','','Raid'],
     934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
     935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
     936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者','','Timeskip Luffy','3D2Y Luffy'],
@@ -975,19 +975,19 @@ window.aliases = {
     974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
     975: ['スモーカー あらくれの一匹オオカミ','','Kid Smoker'],
     976: ['スモーカー 孤高の一匹オオカミ','','Kid Smoker'],
-    977: ['黄猿',''],
-    978: ['黄猿　光人間',''],
+    977: ['黄猿','','Raid'],
+    978: ['黄猿　光人間','','Raid'],
     979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
     980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
     981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
-    982: ['ビスタ 白ひげ海賊団５番隊隊長',''],
-    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長',''],
-    984: ['パウリー ガレーラカンパニー１番ドック職長',''],
-    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味',''],
-    986: ['ココア＆のらギツネ ニセ麦わらの一味',''],
-    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味',''],
-    988: ['マウンブルテン＆トルコ ニセ麦わらの一味',''],
-    989: ['ニセ麦わらの一味',''],
+    982: ['ビスタ 白ひげ海賊団５番隊隊長','','Colosseum'],
+    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Colosseum'],
+    984: ['パウリー ガレーラカンパニー１番ドック職長','','Colosseum'],
+    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味','','Raid'],
+    986: ['ココア＆のらギツネ ニセ麦わらの一味','','Raid'],
+    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid'],
+    988: ['マウンブルテン＆トルコ ニセ麦わらの一味','','Raid'],
+    989: ['ニセ麦わらの一味','','Raid'],
     990: ['マッハ・バイス',''],
     991: ['マッハ・バイス ドンキホーテ海賊団',''],
     992: ['グラディウス',''],
@@ -1013,11 +1013,11 @@ window.aliases = {
 	1012: ['ヘビー総裁',''],
 	1013: ['ホットドッグ将軍',''],
 	1014: ['トニートニー・チョッパー 動物王',''],
-	1015: ['カポネ・ベッジ ファイアタンク海賊団船長',''],
-	1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長',''],
-	1017: ['茶ひげ',''],
-	1018: ['茶ひげ ワニのケンタウロス',''],
-	1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長',''],
+	1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Colosseum'],
+	1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Colosseum'],
+	1017: ['茶ひげ','','Colosseum'],
+	1018: ['茶ひげ ワニのケンタウロス','','Colosseum'],
+	1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Colosseum'],
 	1020: ['？？？','','Sakura Sugar'],
 	1021: ['？？？','','Sakura Sugar'],
 	1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
@@ -1038,21 +1038,21 @@ window.aliases = {
     1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
     1038: ['イナズマ 秘密の花園の乙女',''],
     1039: ['イナズマ 変革を画策する乙女',''],
-    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '' ],
-    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '' ],
-    1042: [ 'キラー キッド海賊団', '' ],
-    1043: [ '“殺戮武人”キラー キッド海賊団', '' ],
+    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '','Colosseum' ],
+    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Colosseum' ],
+    1042: [ 'キラー キッド海賊団', '','Colosseum' ],
+    1043: [ '“殺戮武人”キラー キッド海賊団', '','Colosseum' ],
     1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
     1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
-    1046: [ 'サボ 竜の爪', '' ],
-    1047: [ 'サボ 革命軍参謀総長', '' ],
+    1046: [ 'サボ 竜の爪', '','Raid' ],
+    1047: [ 'サボ 革命軍参謀総長', '','Raid' ],
     1048: [ 'ニコ・オルビア', '' ],
     1049: [ 'ニコ・オルビア オハラの考古学者', '' ],
     1050: [ 'ハグワール・D・サウロ', '' ],
     1051: [ 'ハグワール・D・サウロ 海軍本部中将', '' ],
     1052: [ 'ニコ・ロビン オハラの少女', '' ],
-    1053: [ 'ヒナ おしとやかな優等生', '' ],
-    1054: [ 'ヒナ れいぎ正しい優等生', '' ],
+    1053: [ 'ヒナ おしとやかな優等生', '', 'Kid Hina' ],
+    1054: [ 'ヒナ れいぎ正しい優等生', '', 'Kid Hina' ],
     1055: [ 'ボア・サンダーソニア', '' ],
     1056: [ 'ボア・サンダーソニア 九蛇海賊団', '' ],
     1057: [ 'ボア・マリーゴールド', '' ],
@@ -1072,8 +1072,8 @@ window.aliases = {
     1071: [ 'ガスパーデ', '' ],
     1072: [ 'ガスパーデ ガスパーデ海賊団', '' ],
     1073: [ 'ニードルス', '' ],
-    1074: [ 'リッキー', '' ],
-    1075: [ 'リッキー 謎の剣闘士', '' ],
+    1074: [ 'リッキー', '', 'King Riku' ],
+    1075: [ 'リッキー 謎の剣闘士', '', 'King Riku' ],
     1076: [ 'レオ', '' ],
     1077: [ 'レオ トンタッタ族戦士長', '' ],
     1078: [ 'マンシェリー', '' ],
@@ -1084,14 +1084,14 @@ window.aliases = {
     1083: [ '首領・サイ 花ノ国のギャング', '' ],
     1084: [ '藤虎', '' ],
     1085: [ 'イッショウ', '' ],
-    1086: [ 'ムッシュール', '' ],
-    1087: [ 'ムッシュール 毒胞子人間', '' ],
-    1088: [ 'サガ', '' ],
-    1089: [ 'サガ 呪われた聖剣', '' ],
-    1090: [ 'X・ドレーク ドレーク海賊団', '' ],
-    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '' ],
-    1092: [ 'レベッカ パラソルのリズム', '' ],
-    1093: [ 'レベッカ 虹のメロディ', '' ],
+    1086: [ 'ムッシュール', '','Colosseum' ],
+    1087: [ 'ムッシュール 毒胞子人間', '','Colosseum' ],
+    1088: [ 'サガ', '','Colosseum' ],
+    1089: [ 'サガ 呪われた聖剣', '','Colosseum' ],
+    1090: [ 'X・ドレーク ドレーク海賊団', '','Colosseum' ],
+    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '','Colosseum' ],
+    1092: [ 'レベッカ パラソルのリズム', '','Kid Rebecca' ],
+    1093: [ 'レベッカ 虹のメロディ', '','Kid Rebecca' ],
     1094: [ 'Dr.インディゴ', '' ],
     1095: [ 'Dr.インディゴ 金獅子海賊団', '' ],
     1096: [ 'スカーレット隊長', '' ],
@@ -1099,14 +1099,14 @@ window.aliases = {
     1098: [ '雷鳥ビリー', '' ],
     1099: [ 'コビー 雨の中の曹長', '' ],
     1100: [ 'コビー 露にきらめく曹長', '' ],
-    1101: [ '黒腕のゼファー', '' ],
-    1102: [ '黒腕のゼファー 元海軍本部大将', '' ],
-    1103: [ 'アイン ＮＥＯ海軍', '' ],
-    1104: [ 'アイン ゼファー最後の教え子', '' ],
-    1105: [ 'ビンズ ＮＥＯ海軍', '' ],
-    1106: [ 'ビンズ ゼファー最後の教え子', '' ],
-    1107: [ '金獅子のシキ', '' ],
-    1108: [ '金獅子のシキ 金獅子海賊団', '' ],
+    1101: [ '黒腕のゼファー', '','Colosseum' ],
+    1102: [ '黒腕のゼファー 元海軍本部大将', '','Colosseum' ],
+    1103: [ 'アイン ＮＥＯ海軍', '','Colosseum' ],
+    1104: [ 'アイン ゼファー最後の教え子', '','Colosseum' ],
+    1105: [ 'ビンズ ＮＥＯ海軍', '','Colosseum' ],
+    1106: [ 'ビンズ ゼファー最後の教え子', '','Colosseum' ],
+    1107: [ '金獅子のシキ', '','Raid' ],
+    1108: [ '金獅子のシキ 金獅子海賊団', '','Raid' ],
     1109: [ 'ナミ 若返った航海士', '' ],
     1110: [ 'ナミ 酒場のお茶目なアイドル', '' ],
     1111: [ 'ニコ・ロビン 若返った考古学者', '' ],
@@ -1158,12 +1158,12 @@ window.aliases = {
     1157: ['ハンニャバル副署長 海底監獄インペルダウン',''],
     1158: ['マゼラン署長',''],
     1159: ['マゼラン署長 海底監獄インペルダウン',''],
-    1160: ['コアラ ビーチの天使',''],
-    1161: ['コアラ 楽園の女神',''],
-    1162: ['ギルド・テゾーロ',''],
-    1163: ['',''],
-    1164: ['カリーナ',''],
-    1165: ['カリーナ 黄金船の歌姫',''],
+    1160: ['コアラ ビーチの天使','','Summertime Koala'],
+    1161: ['コアラ 楽園の女神','','Summertime Koala'],
+    1162: ['ギルド・テゾーロ','','Raid'],
+    1163: ['ギルド・テゾーロ 黄金船のカジノ王','','Raid'],
+    1164: ['カリーナ','','Raid'],
+    1165: ['カリーナ 黄金船の歌姫','','Raid'],
     1166: ['バカラ',''],
     1167: ['バカラ 黄金船のコンシェルジュ',''],
     1168: ['ダイス',''],
@@ -1178,7 +1178,7 @@ window.aliases = {
     1177: ['チョッパー 信念に生きる麦わらの一味',''],
     1178: ['オーズ','','Oz'],
     1179: ['魔人オーズ','','Oz'],
-    1180: ['',''],
+    1180: ['虹ヨロイガニ',''],
     1181: ['ブレンハイム',''],
     1182: ['カトラスのブレンハイム',''],
     1183: ['キングデュー',''],
@@ -1191,13 +1191,26 @@ window.aliases = {
     1190: ['シールドランスのスピード・ジル',''],
     1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
     1192: ['クザン','','Aokiji'],
-	1193: ['',''],
-	1194: ['',''],
-	1195: ['',''],
-	1196: ['',''],
-	1197: ['',''],
-    1198: ['',''],
-	1199: ['',''],
-	1200: ['',''],
-	1201: ['',''],
+	1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
+	1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
+	1195: ['ガン・フォール 先代“神”','','Colosseum Gan Fall'],
+	1196: ['ガン・フォール スカイピアの神','','Colosseum Gan Fall'],
+	1197: ['スカイブリーダー・オーム','','Colosseum Ohm'],
+    1198: ['ジュエリー・ボニー 弾けるサファイア','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
+	1199: ['ジュエリー・ボニー パールホワイトの煌き','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
+	1200: ['ヴァイオレット 挑発のバカンス','','Summertime Viola','Swimsuit Viola'],
+	1201: ['ヴァイオレット 紅潮のバカンス','','Summertime Viola','Swimsuit Viola'],
+    1202: ['ヨーキ',''],
+	1203: ['キャラコのヨーキ',''],
+    1204: ['ブルック ルンバー海賊団',''],
+	1205: ['“音楽家兼剣士”ブルック ルンバー海賊団',''],
+    1206: ['ラブーン ルンバー海賊団',''],
+	1207: ['ニコ・ロビン 夢を追い求める冒険者','','New Strong World Robin'],
+    1208: ['ニコ・ロビン 信念に生きる麦わらの一味','','New Strong World Robin'],
+	1209: ['ウソップ 夢を追い求める冒険者','','New Strong World Usopp'],
+    1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp'],
+	1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky'],
+    1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky'],
+	1213: ['','','Summertime Baby 5'],
+    1214: ['','','Summertime Baby 5'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d8da72cea..ee0568614 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1,5 +1,5 @@
 window.cooldowns = [
-	[ 3, 2 ],
+    [ 3, 2 ],
 	[ 12, 9 ],
 	[ 23, 15 ],
 	[ 25, 18 ],
@@ -1024,8 +1024,8 @@ window.cooldowns = [
 	[ 17, 17 ],
 	19,
 	19,
-	11,
-	11,
+	[ 11, 5 ],
+	[ 11, 5 ],
 	18,
 	18,
 	23,
@@ -1120,10 +1120,10 @@ window.cooldowns = [
 	[ 23, 16 ],
 	[ 23, 17 ],
 	[ 23, 17 ],
-	20,
-	20,
-	20,
-	20,
+	[ 20, 14 ],
+	[ 20, 14 ],
+	[ 20, 14 ],
+	[ 20, 14 ],
 	[ 20, 14 ],
     [ 20, 14 ],
 	[ 20, 15 ],
@@ -1198,6 +1198,19 @@ window.cooldowns = [
 	[ 17, 7 ],
     [ 18, 10 ],
     [ 18, 10 ],
-    null,
-    null,
+    [ 22, 14 ],
+    [ 22, 14 ],
+    [ 14, 6 ],
+    [ 14, 6 ],
+    [ 17, 9 ],
+    [ 17, 9 ],
+    [ 25, 15 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 21, 14 ],
+    [ 21, 14 ],
+    [ 17, 11 ],
+    [ 17, 11 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 053c41e77..68ee77b84 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6070,5 +6070,55 @@ window.details = {
         specialName: "Chorus echoing in the sea",
         special: "Protects from defeat as long as HP is above 50%",
         specialNotes: "#{zombie}"
-    }
+    },
+    1207: {
+		special: "Boosts chances of getting [INT] orbs for 3 turns",
+		specialName: "Ochenta Fleur - Cuatro Manus Shock",
+		captain: "Boosts ATK and RCV of INT characters by 1.5x",
+        sailor: "Reduces blindness by 3 turn"
+	},
+	1208: {
+		special: "Boosts chances of getting [INT] orbs for 3 turns",
+		specialName: "Ochenta Fleur - Cuatro Manus Shock",
+		captain: "Boosts ATK and RCV of INT characters by 2x",
+        sailor: "Reduces blindness by 3 turn"
+	},
+    1209: {
+		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
+		specialName: "Heavenly Dragon Star",
+		captain: "Boosts ATK of Shooter characters by 2x",
+        sailor: "Boosts RCV of Shooter Characters by 10"
+	},
+	1210: {
+		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
+		specialName: "Heavenly Dragon Star",
+		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+        sailor: "Boosts RCV of Shooter Characters by 10"
+	},
+	1211: {
+		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
+		specialNotes: "#{orb : 1.5x}",
+		specialName: "Roar! Zarley Davison",
+		captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+        sailor: "Boosts ATK of Shooter Characters by 20"
+	},
+	1212: {
+		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
+		specialNotes: "#{orb : 1.5x}",
+		specialName: "Roar! Zarley Davison",
+		captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+        sailor: "Boosts ATK of Shooter Characters by 20"
+	},
+    1213: {
+        captain: "Boosts ATK of Slasher by 2x, the HP of Strikers by 1.25x, and the RCV of Shooters by 1.25x",
+        specialName: "Exciting Transfiguration",
+        special: "Recovers some HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
+    },
+    1214: {
+        captain: "Boosts ATK of Slasher by 5x, the HP of Strikers by 1.2x, and the RCV of Shooters by 1.2x",
+        specialName: "Exciting Transfiguration",
+        special: "Recovers some HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 257dfd6c4..bfb46d2ba 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1809,7 +1809,7 @@ window.evolutions = {
     },
     1193: {
         evolution: 1194,
-        evolvers: [  ]
+        evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1195: {
         evolution: 1196,
@@ -1821,7 +1821,7 @@ window.evolutions = {
     },
     1200: {
         evolution: 1201,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 85, 96, 301 ]
     },
     1202: {
         evolution: 1203,
@@ -1830,5 +1830,17 @@ window.evolutions = {
     1204: {
         evolution: 1205,
         evolvers: [ 116, 117, 90, 96, 101 ]
-    }
+    },
+    1207: {
+		evolution: 1208,
+		evolvers: [ 118, 83, 84, 300, 100 ]
+	},
+    1209: {
+		evolution: 1210,
+		evolvers: [ 118, 88, 94, 304, 104 ]
+	},
+	1211: {
+		evolution: 1212,
+		evolvers: [ 118, 86, 266, 302, 267 ]
+	},
 };
diff --git a/common/data/families.js b/common/data/families.js
index 05c4e4add..6c82c412f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1204,5 +1204,13 @@ window.families = [
     "Yoki",
     "Brook",
     "Brook",
-    "Laboon"
+    "Laboon",
+    "Nico Robin",
+    "Nico Robin",
+    "Usopp",
+	"Usopp",
+    "Franky",
+	"Franky",
+    "Baby 5",
+	"Baby 5",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 3ab98a1f6..a5ac8bcd1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1191,20 +1191,28 @@ window.units = [
     [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
     [ "Blue Pheasant, Marine Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
-    [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, null, 181, 132, 47, 945, 539, 181, null ],
-    [ "Boa Hancock, Maiden Drowned in Love", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, null, 863, 448, 144, 1724, 1132, 326, null ],
+    [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, 392109, 181, 132, 47, 945, 539, 181, 1 ],
+    [ "Boa Hancock, Maiden Drowned in Love", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 863, 448, 144, 1724, 1132, 326, 1 ],
     [ "Ganfor, Former God of Skypiea", "PSY", "Striker", 4, 18, 6, 2, 50, 392109, 222, 122, 22, 1122, 622, 122, 1 ],
     [ "Ganfor, God of Skypiea", "PSY", "Striker", 5, 30, 4, 3, 99, 3000000, 1111, 611, 111, 2122, 1222, 222, 1 ],
     [ "Ohm, Sky Breeder", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 6, 3, 70, 1778330, 197, 169, -200, 1710, 1170, -150, 1 ],
     [ "Jewelry Bonney, Splashing Sapphire", "STR", [ "Fighter", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 388, 212, 86, 1006, 559, 194, 1 ],
     [ "Jewelry Bonney, Pearl White Gleam", "STR", [ "Fighter", "Free Spirit" ], 5, 20, 4, 2, 99, 3000000, 929, 500, 149, 2000, 989, 301, 1 ],
-    [ "Summertime Violet", "QCK", [ "Fighter", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Summertime Violet Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Violet, Stirring Summer Vacation", "QCK", [ "Fighter", "Cerebral" ], 4, 12, 5, 1, 50, 392109, 109, 58, 55, 923, 480, 243, 1 ],
+    [ "Violet, Blushing Summer Vacation", "QCK", [ "Fighter", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 855, 420, 192, 1654, 837, 404, 1 ],
     [ "Yorki", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 102, 91, 36, 902, 584, 201, 1 ],
     [ "Calico Yorki", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 840, 516, 170, 1583, 1153, 315, 1 ],
     [ "Rumbar Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
     [ "Rumba Pirates Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
-    [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ]
+    [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ],
+    [ "Nico Robin, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
+	[ "Nico Robin, Loyal Straw Hat Crew", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
+    [ "Usopp, Dream-Pursuing Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
+	[ "Usopp, Loyal Straw Hat Crew", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
+	[ "Franky, Dream-Pursuing Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
+	[ "Franky, Loyal Straw Hat Crew", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
+    [ "Baby 5, Dolphin Floatie", "STR", [ "Slasher", "Striker" ], 4, 13, 4, 2, 50, 392109, 101, 103, 34, 910, 563, 177, null ],
+    [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, null ]
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index df230a329..ca381124f 100644
--- a/index.html
+++ b/index.html
@@ -62,18 +62,20 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>15/08/2016</p>
+            <p>17/08/2016</p>
             <br>
             <ul>
+                <li>Huge batch of new units updated</li>
+                <li>Including summertime units</li>
+                <br>
+                <li>Ability to search for more terms such as</li>
+                <li>"Summertime", "Raid", "Colosseum", etc</li>
+                <br>
                 <li>Added Evaluation to the HP Input</li>
                 <li>of the Calculator, so you can now </li>
                 <li>enter Stuff like 300-200 or 250*4.3</li>
                 <li>(Uses decimal point)</li>
                 <br>
-                <li>Added a few Char Abbreviations</li>
-                <br>
-                <li>Finished the Global Tags</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>

From 9b2143b45a5d4ff3bbffae39a78c1841d1a90454 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Aug 2016 15:05:59 -0500
Subject: [PATCH 0551/1569] Violet, flags

---
 common/data/details.js | 16 ++++++++++++++--
 common/data/flags.js   |  5 +++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 68ee77b84..9506ed6c0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6045,6 +6045,18 @@ window.details = {
         special: "Empties all slots with [RCV] orbs, recover 20% of MAX HP",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
+    1200: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+        special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
+        specialName: "Passionate Look, 'I'm a Bad Guy...'",
+        sailor: "Reduces Silence duration against this unit by 2 turns"
+    },
+    1201: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+        special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
+        specialName: "Passionate Look, 'I'm a Bad Guy...'",
+        sailor: "Reduces Silence duration against this unit by 2 turns"
+    },
     1202: {
         captain: "Boosts ATK of Free Spirit characters by 1.5x",
         specialName: "Session of Pirates",
@@ -6110,13 +6122,13 @@ window.details = {
         sailor: "Boosts ATK of Shooter Characters by 20"
 	},
     1213: {
-        captain: "Boosts ATK of Slasher by 2x, the HP of Strikers by 1.25x, and the RCV of Shooters by 1.25x",
+        captain: "Boosts ATK of Slasher characters by 2x, the HP of Striker characters by 1.25x, and the RCV of Shooter characters by 1.25x",
         specialName: "Exciting Transfiguration",
         special: "Recovers some HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
     1214: {
-        captain: "Boosts ATK of Slasher by 5x, the HP of Strikers by 1.2x, and the RCV of Shooters by 1.2x",
+        captain: "Boosts ATK of Slasher characters by 5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
         specialName: "Exciting Transfiguration",
         special: "Recovers some HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
diff --git a/common/data/flags.js b/common/data/flags.js
index 20746e4d0..c7486ba0d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -780,6 +780,11 @@ window.flags = {
     800: { global: 1 },
 	801: { rr: 1, rro: 1, lrr: 1 },
 	802: { rr: 1, rro: 1, lrr: 1 },
+    807: { global: 1 },
+    808: { global: 1 },
+    809: { global: 1 },
+    810: { global: 1 },
+    811: { global: 1 },
     812: { global: 1 },
     813: { global: 1 },
     814: { global: 1 },

From 0357b0466710c17c63cd8c4837a6bfc2e751ec11 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Aug 2016 15:07:50 -0500
Subject: [PATCH 0552/1569] Alias changes

---
 common/data/aliases.js | 4 ++--
 common/data/units.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 54c4257ed..1116b8618 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1138,8 +1138,8 @@ window.aliases = {
     1137: ['ジャブラ 世界政府直下暗躍諜報機関',''],
     1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
     1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
-    1140: ['ゲッコー・モリア 魔の三角地帯の主','','Colosseum Gecko Moria'],
-    1141: ['ゲッコー・モリア 魔の三角地帯の支配者','','Colosseum Gecko Moria'],
+    1140: ['ゲッコー・モリア 魔の三角地帯の主','','Colosseum Gekko Moriah'],
+    1141: ['ゲッコー・モリア 魔の三角地帯の支配者','','Colosseum Gekko Moriah'],
     1142: ['フォクシー ドーナツレースの邪魔者','','Colosseum Foxy','Dying Foxy'],
     1143: ['フォクシー コンバットの卑怯者','','Colosseum Foxy','Nurse Foxy'],
     1144: ['ポルチェ お花チアリーダーズ','','Colosseum Porche'],
diff --git a/common/data/units.js b/common/data/units.js
index a5ac8bcd1..3662f4e52 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1138,8 +1138,8 @@ window.units = [
 	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
 	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
 	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
-	[ "Gekko Moriah, Lord of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, 1066998, 689, 223, 31, 1505, 700, 112, 1 ],
-	[ "Gekko Moriah, Ruler of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, 1 ],
+	[ "Gecko Moria, Lord of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, 1066998, 689, 223, 31, 1505, 700, 112, 1 ],
+	[ "Gecko Moria, Ruler of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, 1 ],
 	[ "Foxy, Nuisance of Donut Race", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, 392109, 165, 94, 44, 949, 503, 162, 1 ],
 	[ "Foxy, Cowardly Fighter", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 867, 424, 120, 1877, 942, 313, 1 ],
 	[ "Porche, Flower Cheerleader", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, 136167, 129, 62, 40, 658, 372, 170, 1 ],

From ccd30ced016d43663a7ef60bb1ee7079c13daf46 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Aug 2016 15:09:10 -0500
Subject: [PATCH 0553/1569] 1.5

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9506ed6c0..38ede3380 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6128,7 +6128,7 @@ window.details = {
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
     1214: {
-        captain: "Boosts ATK of Slasher characters by 5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
+        captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
         specialName: "Exciting Transfiguration",
         special: "Recovers some HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."

From d96a7ca0e68050412427a1b28cba154874914012 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 17 Aug 2016 15:43:41 -0500
Subject: [PATCH 0554/1569] Baby 5

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 38ede3380..2297642b4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6124,13 +6124,13 @@ window.details = {
     1213: {
         captain: "Boosts ATK of Slasher characters by 2x, the HP of Striker characters by 1.25x, and the RCV of Shooter characters by 1.25x",
         specialName: "Exciting Transfiguration",
-        special: "Recovers some HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
+        special: "Recovers 10x character's RCV in HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
     1214: {
         captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
         specialName: "Exciting Transfiguration",
-        special: "Recovers some HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
+        special: "Recovers 10x character's RCV in HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
 };

From f834134c507968ee507fcfe22b9d4fd6b107e80c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 22 Aug 2016 12:07:37 -0500
Subject: [PATCH 0555/1569] New Island prep

---
 common/data/aliases.js   | 16 ++++++++-----
 common/data/captains.js  | 51 +++++++++++++++++++++++++---------------
 common/data/cooldowns.js | 12 +++++-----
 common/data/details.js   |  4 ++--
 common/data/drops.js     | 20 +++++++++++++---
 common/data/families.js  |  4 ++++
 common/data/flags.js     |  8 +++++++
 common/data/specials.js  |  6 +++++
 common/data/units.js     |  8 +++++--
 9 files changed, 91 insertions(+), 38 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1116b8618..59cac1fe8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1170,12 +1170,12 @@ window.aliases = {
     1169: ['ダイス 黄金船のディーラー',''],
     1170: ['タナカさん',''],
     1171: ['タナカさん 黄金船の警備担当',''],
-    1172: ['ブルック 夢を追い求める冒険者',''],
-    1173: ['ブルック 信念に生きる麦わらの一味',''],
-    1174: ['ロロノア・ゾロ 夢を追い求める冒険者',''],
-    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味',''],
-    1176: ['チョッパー 夢を追い求める冒険者',''],
-    1177: ['チョッパー 信念に生きる麦わらの一味',''],
+    1172: ['ブルック 夢を追い求める冒険者','','Strong World Brook'],
+    1173: ['ブルック 信念に生きる麦わらの一味','','Strong World Brook'],
+    1174: ['ロロノア・ゾロ 夢を追い求める冒険者','','Strong World Zoro'],
+    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味','','Strong World Zoro'],
+    1176: ['チョッパー 夢を追い求める冒険者','','Strong World Chopper'],
+    1177: ['チョッパー 信念に生きる麦わらの一味','','Strong World Chopper'],
     1178: ['オーズ','','Oz'],
     1179: ['魔人オーズ','','Oz'],
     1180: ['虹ヨロイガニ',''],
@@ -1213,4 +1213,8 @@ window.aliases = {
     1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky'],
 	1213: ['','','Summertime Baby 5'],
     1214: ['','','Summertime Baby 5'],
+    1215: ['','',''],
+    1216: ['','',''],
+    1217: ['','',''],
+    1218: ['','',''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index a2478c62a..e2fc5a2e8 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3014,24 +3014,6 @@ window.captains = {
     1188: {
 		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
 	},
-    1184: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
-	},
-    1184: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
-	},
-    1185: {
-        atk: function(p) { return p.unit.class.has("Slasher")  || p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1186: {
-        atk: function(p) { return p.unit.class.has("Slasher")  || p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1187: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
-    },
-    1188: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
-    },
     1189: {
         atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
     },
@@ -3089,5 +3071,36 @@ window.captains = {
     },
     1206: {
         hp: function(p) { return 1.3; }
-    }
+    },
+    1207: {
+		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+	},
+	1208: {
+		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+		rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+	},
+    1209: {
+		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+	},
+	1210: {
+		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+	},
+	1211: {
+		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+	},
+	1212: {
+		atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
+	},
+    1213: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+    },
+    1214: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ee0568614..fcc42bbcc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1170,12 +1170,12 @@ window.cooldowns = [
     [ 24, 18 ],
     [ 19, 9 ],
     [ 19, 9 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
     [ 17, 17 ],
     [ 17, 17 ],
 	null,
diff --git a/common/data/details.js b/common/data/details.js
index 2297642b4..730479024 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6122,13 +6122,13 @@ window.details = {
         sailor: "Boosts ATK of Shooter Characters by 20"
 	},
     1213: {
-        captain: "Boosts ATK of Slasher characters by 2x, the HP of Striker characters by 1.25x, and the RCV of Shooter characters by 1.25x",
+        captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
         specialName: "Exciting Transfiguration",
         special: "Recovers 10x character's RCV in HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
     1214: {
-        captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
+        captain: "Boosts ATK of Slasher characters by 2x, the HP of Striker characters by 1.25x, and the RCV of Shooter characters by 1.25x",
         specialName: "Exciting Transfiguration",
         special: "Recovers 10x character's RCV in HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
diff --git a/common/data/drops.js b/common/data/drops.js
index ea9aced3f..1bdc3a062 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1100,6 +1100,20 @@ window.drops = {
             condition: "None",
             "All Difficulties": [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703 ]
         },
+        
+        {
+            name: "Rumbar Pirates!",
+            thumb: 1203,
+            condition: "'Musical' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)",
+            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -1207, -677, -896, -631, -954, -1206, -617 ]
+        },
+        
+        {
+            name: "World Pirates!",
+            thumb: null,
+            condition: "Total Crew Cost must be lower than 180 (Including friend captain)",
+            "All Difficulties": [ 1215, 1216, 1217, -1025, -1029, -1033, -671, -956, -964, -633, -504, -416 ]
+        },
 		
     ],
 
@@ -1312,9 +1326,9 @@ window.drops = {
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195 ]
         }
 
    ]
diff --git a/common/data/families.js b/common/data/families.js
index 6c82c412f..abc5b5bd7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1213,4 +1213,8 @@ window.families = [
 	"Franky",
     "Baby 5",
 	"Baby 5",
+    null,
+    null,
+    null,
+    "Boa Hancock",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index c7486ba0d..b603abe22 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -959,4 +959,12 @@ window.flags = {
     1192: { rr: 1, rro: 1 },
     1193: { rr: 1, rro: 1, lrr: 1 },
     1194: { rr: 1, rro: 1, lrr: 1 },
+    1207: { rr: 1, rro: 1 },
+    1208: { rr: 1, rro: 1 },
+    1209: { rr: 1, rro: 1 },
+    1210: { rr: 1, rro: 1 },
+    1211: { rr: 1, rro: 1 },
+    1212: { rr: 1, rro: 1 },
+    1213: { rr: 1, rro: 1, lrr: 1 },
+    1214: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index ce7bfff21..c919b7ede 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1510,4 +1510,10 @@ window.specials = {
 		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
 		type: "class"
 	},
+    1211: {
+		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+	},
+	1212: {
+		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index 3662f4e52..bb3aff73a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1203,7 +1203,7 @@ window.units = [
     [ "Yorki", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 102, 91, 36, 902, 584, 201, 1 ],
     [ "Calico Yorki", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 840, 516, 170, 1583, 1153, 315, 1 ],
     [ "Rumbar Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
-    [ "Rumba Pirates Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
+    [ "Rumbar Pirates Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
     [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ],
     [ "Nico Robin, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
 	[ "Nico Robin, Loyal Straw Hat Crew", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
@@ -1212,7 +1212,11 @@ window.units = [
 	[ "Franky, Dream-Pursuing Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
 	[ "Franky, Loyal Straw Hat Crew", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
     [ "Baby 5, Dolphin Floatie", "STR", [ "Slasher", "Striker" ], 4, 13, 4, 2, 50, 392109, 101, 103, 34, 910, 563, 177, null ],
-    [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, null ]
+    [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, null ],
+    [ "Unknown World Pirates Unit", "DEX", [ "Shooter", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown World Pirates Unit", "QCK", [ "Powerhouse", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown World Pirates Unit", "PSY", [ "Fighter", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Unknown Hancock", "STR", [ "Shooter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From afe6b926f54548a559bca5da95ad2fcf3cd498c0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 23 Aug 2016 02:52:30 -0500
Subject: [PATCH 0556/1569] World Pirates

---
 common/data/cooldowns.js | 12 ++++++++++--
 common/data/details.js   | 22 ++++++++++++++++++++++
 common/data/drops.js     |  4 ++--
 common/data/units.js     |  8 ++++----
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fcc42bbcc..b333e023c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1030,8 +1030,8 @@ window.cooldowns = [
 	18,
 	23,
 	23,
-	11,
-	11,
+	[ 11, 5 ],
+	[ 11, 5 ],
 	23,
 	23,
     [ 23, 15 ],
@@ -1213,4 +1213,12 @@ window.cooldowns = [
     [ 17, 11 ],
     [ 15, 15 ],
     [ 15, 15 ],
+	18,
+	17,
+	17,
+	25,
+	null,
+	null,
+	null,
+	null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 730479024..c1f4d3fd4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6133,4 +6133,26 @@ window.details = {
         special: "Recovers 10x character's RCV in HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
+	1215: { //Gairam
+		captain: "Boosts ATK by 2.5x following a chain of [QCK] > [PSY] > [DEX] attacks no lower than Good",
+		special: "Deals 5 hits of 2,000 fixed damage to random enemies and reduces any damage received above 5,000 HP by 80% for 1 turn",
+		specialNotes: "#{randomHits : 5}",
+		specialName: "Totem Cube"
+	},
+	1216: { //sebastian
+		captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage taken based on current HP by up to 20%",
+		captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
+		special: "Reduces damage received by 50% for 1 turn, and changes own orb to [QCK]",
+		specialName: "Camouflage Air",
+	},
+	1217: { //nightin
+		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+		special: "Reduces Numbness and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
+		specialName: "Catepillar Soul Shot",
+	},
+	1218: {//hancock
+		captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
+		special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
+		specialName: "Everybody Confusing Fragrance",
+	},
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 1bdc3a062..f4278cf2b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1110,9 +1110,9 @@ window.drops = {
         
         {
             name: "World Pirates!",
-            thumb: null,
+            thumb: 1215,
             condition: "Total Crew Cost must be lower than 180 (Including friend captain)",
-            "All Difficulties": [ 1215, 1216, 1217, -1025, -1029, -1033, -671, -956, -964, -633, -504, -416 ]
+            "All Difficulties": [ 1215, 1216, 1217, 1218, -1025, -1029, -1033, -671, -956, -964, -633, -504, -1218 ]
         },
 		
     ],
diff --git a/common/data/units.js b/common/data/units.js
index bb3aff73a..322937cf0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1213,10 +1213,10 @@ window.units = [
 	[ "Franky, Loyal Straw Hat Crew", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
     [ "Baby 5, Dolphin Floatie", "STR", [ "Slasher", "Striker" ], 4, 13, 4, 2, 50, 392109, 101, 103, 34, 910, 563, 177, null ],
     [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, null ],
-    [ "Unknown World Pirates Unit", "DEX", [ "Shooter", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown World Pirates Unit", "QCK", [ "Powerhouse", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown World Pirates Unit", "PSY", [ "Fighter", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Unknown Hancock", "STR", [ "Shooter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gairam, World Pirates", "DEX", [ "Shooter", "Striker" ], 4, 20, 6, 2, 99, 3000000, 85, 35, 15, 1735, 1135, 175, 1 ],
+    [ "Sebastian, World Pirates", "QCK", [ "Powerhouse", "Striker" ], 4, 20, 6, 2, 99, 3000000, 108, 58, 0, 2258, 1258, 0, 1 ],
+    [ "Nightin, World Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 64, 27, 32, 1654, 987, 321, 1 ],
+    [ "Boa Hancock, Amazon Lily Princess", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 72, 42, 22, 1692, 1202, 262, 1 ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 028f0573a2ff6bc149d382ee8e1ff10b1dbc4c67 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 23 Aug 2016 11:41:01 -0500
Subject: [PATCH 0557/1569] Cooldowns/details/GW changes

gotta start filling up those GW pages
---
 characters/js/directives.js |    2 +-
 common/data/aliases.js      |   18 +-
 common/data/captains.js     |   29 +
 common/data/cooldowns.js    |   12 +-
 common/data/evolutions.js   |   12 +
 common/data/gw.js           | 1225 ++++++++++++++++++++++++++++++++++-
 common/data/units.js        |    4 +
 index.html                  |    6 +-
 8 files changed, 1290 insertions(+), 18 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 5fa814a8b..0a6da3cf1 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -422,7 +422,7 @@ directives.addLinks = function($stateParams) {
                 ul.append($('<li><a href="http://onepiece-treasurecruise.com/c-' + id + '" target="_blank">' +
                         'Official Guide (Japanese)</a></li>'));
             }
-            if (!isNaN(gw[id-1])) {
+            if (gw[id-1] != null) {
                 ul.append($('<li><a href="http://xn--pck6bvfc.gamewith.jp/article/show/' + gw[id-1] + '" target="_blank">' +
                         'GameWith Page (Japanese)</a> | <a href="http://translate.google.com/translate?sl=ja&tl=en&u=http://xn--pck6bvfc.gamewith.jp/article/show/' + gw[id-1] + '" target="_blank">' +'Google Translate</a></li>'));
             }
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 59cac1fe8..d7404ae7e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -424,7 +424,7 @@ window.aliases = {
     423: ['ブルック',''],
     424: ['鼻唄のブルック',''],
     425: ['リューマ','', 'Ryuuma' ],
-    426: ['マシラ',''],
+    426: ['マシラ','','Harambe'],
     427: ['ショウジョウ',''],
     428: ['モンブラン・クリケット',''],
     429: ['サウスバードと森の住民',''],
@@ -1005,8 +1005,8 @@ window.aliases = {
 	1004: ['シャチ＆ペンギン ハートの海賊団',''],
 	1005: ['ジャンバール',''],
 	1006: ['ジャンバール ハートの海賊団',''],
-	1007: ['','','Sakura Monet'],
-	1008: ['','','Sakura Monet'],
+	1007: ['モネ　寒桜','','Sakura Monet'],
+	1008: ['モネ　大寒桜','','Sakura Monet'],
 	1009: ['キズナBOOOOSTルフィ','', 'Afro Luffy', 'Afroluffy' ],
 	1010: ['バトラー伯爵',''],
 	1011: ['バトラー伯爵（王なる力）',''],
@@ -1213,8 +1213,12 @@ window.aliases = {
     1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky'],
 	1213: ['','','Summertime Baby 5'],
     1214: ['','','Summertime Baby 5'],
-    1215: ['','',''],
-    1216: ['','',''],
-    1217: ['','',''],
-    1218: ['','',''],
+    1215: ['ガイラム ワールド海賊団','',''],
+    1216: ['セバスチャン ワールド海賊団','',''],
+    1217: ['ナイチン ワールド海賊団','',''],
+    1218: ['ボア・ハンコック アマゾン・リリー皇帝','',''],
+    1219: ['','',''],
+    1220: ['','',''],
+    1221: ['','',''],
+    1222: ['','',''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index e2fc5a2e8..3444f856d 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3103,4 +3103,33 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
     },
+    1215: {
+		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'PSY', 'DEX']); },
+		hitAtk: function(p) {
+			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+				type: 'QCK',
+				minModifier: 'Good'
+			}, {
+				type: 'PSY',
+				minModifier: 'Good'
+			}, {
+				type: 'DEX',
+				minModifier: 'Good'
+			}]) ? 2.5 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
+    1216: {
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+	},
+    1217: {
+		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+	},
+    1218: {
+		hitAtk: function(p) {
+			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+		},
+		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+	},
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b333e023c..5ba7bd839 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -954,7 +954,7 @@ window.cooldowns = [
     [ 18, 10 ],
 	20,
 	16,
-	20,
+	[ 20, 14 ],
 	20,
 	[ 18, 10 ],
 	[ 18, 10 ],
@@ -1022,8 +1022,8 @@ window.cooldowns = [
 	[ 13, 13],
 	[ 15, 15 ],
 	[ 17, 17 ],
-	19,
-	19,
+	[ 19, 13 ],
+	[ 19, 13 ],
 	[ 11, 5 ],
 	[ 11, 5 ],
 	18,
@@ -1213,10 +1213,10 @@ window.cooldowns = [
     [ 17, 11 ],
     [ 15, 15 ],
     [ 15, 15 ],
-	18,
-	17,
+	[ 18, 12 ],
 	17,
-	25,
+	[ 17, 11 ],
+	[ 25, 14 ],
 	null,
 	null,
 	null,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index bfb46d2ba..a6a6a99fd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1843,4 +1843,16 @@ window.evolutions = {
 		evolution: 1212,
 		evolvers: [ 118, 86, 266, 302, 267 ]
 	},
+    1213: {
+		evolution: 1214,
+		evolvers: [  ]
+	},
+    1219: {
+		evolution: 1220,
+		evolvers: [  ]
+	},
+    1221: {
+		evolution: 1222,
+		evolvers: [  ]
+	},
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index 028075107..b19bc103c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1 +1,1224 @@
-window.gw=[2017,2017,2017,2017,2019,2019,2019,2019,2020,2020,2020,2020,2022,2022,2022,2022,2018,2018,2018,2018,2021,2021,2021,2021,2021,2021,2820,2412,2105,2105,2102,2102,2123,2123,2184,2122,2121,2106,2106,2207,2164,2804,2146,2146,2024,2024,2821,2819,2215,2163,2162,2016,2145,2145,2129,2129,2128,2128,2216,2180,2174,2147,2161,2161,1926,1926,2077,2077,2078,2078,2013,2013,2013,2015,2015,2014,2014,1652,1652,1652,1652,1652,1652,2210,2210,2210,2210,2210,1657,1657,1657,1657,1657,1657,1861,1861,1861,1861,1861,1851,1851,1851,1851,1851,2292,2292,2292,2292,2292,2333,2333,2333,2333,2333,1857,1857,1857,1857,2823,2822,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,2816,2824,2181,2179,2205,2209,2219,2185,2178,2176,2208,2218,2182,2818,2353,2817,2529,2526,2527,2528,2220,2529,2526,2527,2528,2220,3873,3873,3873,3873,3873,2529,2526,2527,2528,2220,3062,3062,3056,3056,3060,3060,3057,3057,3061,3061,3058,3058,3748,3748,3747,3747,3744,4005,4005,4035,4035,4027,4027,4039,4039,4029,4029,4143,4143,2184,2146,2215,4659,4659,4916,4916,4925,4925,4926,4929,4960,4928,4927,4926,4929,4960,4928,4927,5143,5209,5209,4707,4707,4864,4864,4863,4863,4861,4861,4862,4862,5166,5166,5100,5100,5101,5101,2210,1851,2078,2790,2204,2784,2202,2700,2786,2788,2789,2201,2796,2787,2177,2791,2797,2354,2183,2203,2355,2206,2341,2217,5589,5506,5505,5872,5871,5870,5168,5168,5819,5820,5801,5801,5801,5801,5801,5359,5359,5982,5982,5978,5978,5979,5979,5981,5981,5980,5980,6114,6114,6113,6113,6484,6484,6488,6488,6489,6659,6659,6661,6661,6664,6664,6665,6662,6663,6663,6873,6873,6871,6872,7269,7269,7273,7273,7273,7273,7273,7273,7273,7273,7273,7273,7291,7291,7310,7310,7207,7207,7209,7209,7208,7208,7211,7211,7210,7210,7311,7311,7588,7574,7591,7590,7589,7588,7574,7591,7590,7589,7576,7573,7573,7572,7575,7577,7577,7731,7731,7732,7732,8286,8286,8440,8440,8439,8438,8883,8883,8882,8882,8881,8881,8880,8880,8873,8884,8884,8885,8886,7577,9032,9032,9031,9031,9033,9033,9034,9034,9035,9035,8946,9247,9248,9249,3574,3574,3558,9875,9876,9881,9882,9877,9877,9880,10005,10004,10003,10003,10445,10445,10834,10834,10837,10837,10837,10833,10833,9878,9878,11071,11071,11072,11072,11073,11073,11074,11074,11075,11075,11070,11070,11460,3061,3061,11529,11530,11532,11531,11533,11538,11537,11538,11537,11536,11535,11550,11549,11534,11539,11540,11541,11542,11543,11539,11540,11541,11542,11543,11545,11546,11563,11545,11546,11563,11544,11562,11544,11562,11642,11642,11791,11791,11787,11787,11790,11790,11788,11788,11789,11789,11775,11775,11776,11806,11806,11786,11960,11960,12015,12015,11949,11949,11950,11950,11951,11951,11952,11952,11953,11953,11948,11948,12067,12067,11774,11774,11773,11773,12098,12098,12100,12099,12136,12137,12132,12132,12131,12131,12424,12424,12138,12138,12134,12135,12648,12648,12649,12649,12650,12650,12651,12651,12647,12647,12775,12781,12782,12780,12776,12774,12774,12805,12805,12806,12807,12794,12794,12868,12878,12878,12888,12888,13148,13137,13138,13136,13133,13133,13134,13134,13135,13135,13396,13396,13396,13396,13396,13315,13315,13568,13568,13567,13567,13688,13688,13749,13749,13947,13947,13948,13949,14421,14420,14257,14257,14296,4349,4860,6065,5085,5304,6955,5190,7435,5311,6924,6051,6430,6030,14295,14294,14303,14303,14312,14312,14399,14399,14419,14398,14405,14405,14404,14404,14403,14403,14402,14402,14401,14401,14400,14400,14660,14660,14749,14749,14749,14829,14829,14828,14827,14980,15002,15002,15111,15149,15149,15150,15150,15151,15191,15191,15190,15190,15189,15189,15187,15187,15188,15188,15442,15442,15603,15603,15441,15441,15853,15853,16015,15597,15597,15598,15598,15647,15650,15649,15646,15648,15647,15650,15649,15646,15648,15601,15621,15652,15651,15602,15600,15600,15622,15622,16021,16021,16034,16034,16036,16035,16035,16215,16215,16216,16216,16387,16387,16375,16375,16372,16372,16538,16617,16617,16616,16616,16655,16655,16656,16656,14303,14312,16658,14294,16729,16729,16728,16728,16726,16726,16863,16960,16960,16961,16961,16962,16962,16963,16963,16964,16964,16965,16965,16966,16966,17123,17127,17125,17126,17124,17920,17922,17921,17923,17349,17347,17348,17364,17363,17350,17475,17475,17474,17474,17476,17476,18004,18004,18182,18182,18185,18185,18183,18183,18184,18184,18187,18187,18567,18567,18769,18769,18770,18772,18771,18794,18794,18812,18812,18811,18811,19171,19171,19172,19172,19173,19286,19287,19288,19289,19289,19296,19297,19298,19299,19300,19290,19291,19292,19293,19294,19295,26358,26358,19416,19416,19417,19417,19418,19426,19426,19810,19810,19812,19812,19811,19811,19805,19805,19806,19806,19904,19904,19906,19905,20242,20242,20489,20488,20154,20154,20480,20480,20495,20495,20292,20292,20833,20391,20391,20793,21528,21529,21536,21536,21543,21543,21540,21540,21539,21539,21541,21541,21542,21542,21921,21921,21138,21138,22177,22117,22419,22654,22655,22655,22656,22657,22658,19289,22436,22436,22986,22983,22987,23062,23062,22820,22820,23128,23145,23145,23380,23380,23378,23378,23377,23377,23379,23379,23332,23332,23265,23265,23690,23691,24045,24045,24017,24017,24018,24018,24036,24162,24162,24305,24306,23506,23506,24564,24564,24703,24703,24701,24701,24699,24699,24702,24702,24807,24807,25016,25017,25018,25019,25098,25098,25133,25133,25318,25336,25335,25317,25316,25315,25314,24998,24978,25323,25330,25329,25319,25320,25321,25321,25321,25321,25321,25313,25313,25365,25365,25111,25111,25488,25489,25751,26489,26489,26490,26833,26833,26833,26833,26833,26487,26487,26627,26627,26464,26464,26720,26720,26797,26797,26850,26850,26911,26911,26913,26912,26912,27334,27334,27466,27634,27634,27635,27636,27637,27620,27620,27622,27622,27624,28647,28647,28650,null,28723,28723,28761,28761,28759,28759,28756,28756,28754,28754,28771,28771,29445,29445,29446,29446,29621,29621,29622,29622,29651,29651,29787,29787,29915,29915,29916,29916,29917];
\ No newline at end of file
+window.gw=[
+    2017,
+    2017,
+    2017,
+    2017,
+    2019,
+    2019,
+    2019,
+    2019,
+    2020,
+    2020,
+    2020,
+    2020,
+    2022,
+    2022,
+    2022,
+    2022,
+    2018,
+    2018,
+    2018,
+    2018,
+    2021,
+    2021,
+    2021,
+    2021,
+    2021,
+    2021,
+    2820,
+    2412,
+    2105,
+    2105,
+    2102,
+    2102,
+    2123,
+    2123,
+    2184,
+    2122,
+    2121,
+    2106,
+    2106,
+    2207,
+    2164,
+    2804,
+    2146,
+    2146,
+    2024,
+    2024,
+    2821,
+    2819,
+    2215,
+    2163,
+    2162,
+    2016,
+    2145,
+    2145,
+    2129,
+    2129,
+    2128,
+    2128,
+    2216,
+    2180,
+    2174,
+    2147,
+    2161,
+    2161,
+    1926,
+    1926,
+    2077,
+    2077,
+    2078,
+    2078,
+    2013,
+    2013,
+    2013,
+    2015,
+    2015,
+    2014,
+    2014,
+    1652,
+    1652,
+    1652,
+    1652,
+    1652,
+    1652,
+    2210,
+    2210,
+    2210,
+    2210,
+    2210,
+    1657,
+    1657,
+    1657,
+    1657,
+    1657,
+    1657,
+    1861,
+    1861,
+    1861,
+    1861,
+    1861,
+    1851,
+    1851,
+    1851,
+    1851,
+    1851,
+    2292,
+    2292,
+    2292,
+    2292,
+    2292,
+    2333,
+    2333,
+    2333,
+    2333,
+    2333,
+    1857,
+    1857,
+    1857,
+    1857,
+    2823,
+    2822,
+    2790,
+    2204,
+    2784,
+    2202,
+    2700,
+    2786,
+    2788,
+    2789,
+    2201,
+    2796,
+    2787,
+    2177,
+    2791,
+    2797,
+    2354,
+    2183,
+    2203,
+    2355,
+    2206,
+    2341,
+    2217,
+    2790,
+    2204,
+    2784,
+    2202,
+    2700,
+    2786,
+    2788,
+    2789,
+    2201,
+    2796,
+    2787,
+    2177,
+    2791,
+    2797,
+    2354,
+    2183,
+    2203,
+    2355,
+    2206,
+    2341,
+    2217,
+    2816,
+    2824,
+    2181,
+    2179,
+    2205,
+    2209,
+    2219,
+    2185,
+    2178,
+    2176,
+    2208,
+    2218,
+    2182,
+    2818,
+    2353,
+    2817,
+    2529,
+    2526,
+    2527,
+    2528,
+    2220,
+    2529,
+    2526,
+    2527,
+    2528,
+    2220,
+    3873,
+    3873,
+    3873,
+    3873,
+    3873,
+    2529,
+    2526,
+    2527,
+    2528,
+    2220,
+    3062,
+    3062,
+    3056,
+    3056,
+    3060,
+    3060,
+    3057,
+    3057,
+    3061,
+    3061,
+    3058,
+    3058,
+    3748,
+    3748,
+    3747,
+    3747,
+    3744,
+    4005,
+    4005,
+    4035,
+    4035,
+    4027,
+    4027,
+    4039,
+    4039,
+    4029,
+    4029,
+    4143,
+    4143,
+    2184,
+    2146,
+    2215,
+    4659,
+    4659,
+    4916,
+    4916,
+    4925,
+    4925,
+    4926,
+    4929,
+    4960,
+    4928,
+    4927,
+    4926,
+    4929,
+    4960,
+    4928,
+    4927,
+    5143,
+    5209,
+    5209,
+    4707,
+    4707,
+    4864,
+    4864,
+    4863,
+    4863,
+    4861,
+    4861,
+    4862,
+    4862,
+    5166,
+    5166,
+    5100,
+    5100,
+    5101,
+    5101,
+    2210,
+    1851,
+    2078,
+    2790,
+    2204,
+    2784,
+    2202,
+    2700,
+    2786,
+    2788,
+    2789,
+    2201,
+    2796,
+    2787,
+    2177,
+    2791,
+    2797,
+    2354,
+    2183,
+    2203,
+    2355,
+    2206,
+    2341,
+    2217,
+    5589,
+    5506,
+    5505,
+    5872,
+    5871,
+    5870,
+    5168,
+    5168,
+    5819,
+    5820,
+    5801,
+    5801,
+    5801,
+    5801,
+    5801,
+    5359,
+    5359,
+    5982,
+    5982,
+    5978,
+    5978,
+    5979,
+    5979,
+    5981,
+    5981,
+    5980,
+    5980,
+    6114,
+    6114,
+    6113,
+    6113,
+    6484,
+    6484,
+    6488,
+    6488,
+    6489,
+    6659,
+    6659,
+    6661,
+    6661,
+    6664,
+    6664,
+    6665,
+    6662,
+    6663,
+    6663,
+    6873,
+    6873,
+    6871,
+    6872,
+    7269,
+    7269,
+    7273,
+    7273,
+    7273,
+    7273,
+    7273,
+    7273,
+    7273,
+    7273,
+    7273,
+    7273,
+    7291,
+    7291,
+    7310,
+    7310,
+    7207,
+    7207,
+    7209,
+    7209,
+    7208,
+    7208,
+    7211,
+    7211,
+    7210,
+    7210,
+    7311,
+    7311,
+    7588,
+    7574,
+    7591,
+    7590,
+    7589,
+    7588,
+    7574,
+    7591,
+    7590,
+    7589,
+    7576,
+    7573,
+    7573,
+    7572,
+    7575,
+    7577,
+    7577,
+    7731,
+    7731,
+    7732,
+    7732,
+    8286,
+    8286,
+    8440,
+    8440,
+    8439,
+    8438,
+    8883,
+    8883,
+    8882,
+    8882,
+    8881,
+    8881,
+    8880,
+    8880,
+    8873,
+    8884,
+    8884,
+    8885,
+    8886,
+    7577,
+    9032,
+    9032,
+    9031,
+    9031,
+    9033,
+    9033,
+    9034,
+    9034,
+    9035,
+    9035,
+    8946,
+    9247,
+    9248,
+    9249,
+    3574,
+    3574,
+    3558,
+    9875,
+    9876,
+    9881,
+    9882,
+    9877,
+    9877,
+    9880,
+    10005,
+    10004,
+    10003,
+    10003,
+    10445,
+    10445,
+    10834,
+    10834,
+    10837,
+    10837,
+    10837,
+    10833,
+    10833,
+    9878,
+    9878,
+    11071,
+    11071,
+    11072,
+    11072,
+    11073,
+    11073,
+    11074,
+    11074,
+    11075,
+    11075,
+    11070,
+    11070,
+    11460,
+    3061,
+    3061,
+    11529,
+    11530,
+    11532,
+    11531,
+    11533,
+    11538,
+    11537,
+    11538,
+    11537,
+    11536,
+    11535,
+    11550,
+    11549,
+    11534,
+    11539,
+    11540,
+    11541,
+    11542,
+    11543,
+    11539,
+    11540,
+    11541,
+    11542,
+    11543,
+    11545,
+    11546,
+    11563,
+    11545,
+    11546,
+    11563,
+    11544,
+    11562,
+    11544,
+    11562,
+    11642,
+    11642,
+    11791,
+    11791,
+    11787,
+    11787,
+    11790,
+    11790,
+    11788,
+    11788,
+    11789,
+    11789,
+    11775,
+    11775,
+    11776,
+    11806,
+    11806,
+    11786,
+    11960,
+    11960,
+    12015,
+    12015,
+    11949,
+    11949,
+    11950,
+    11950,
+    11951,
+    11951,
+    11952,
+    11952,
+    11953,
+    11953,
+    11948,
+    11948,
+    12067,
+    12067,
+    11774,
+    11774,
+    11773,
+    11773,
+    12098,
+    12098,
+    12100,
+    12099,
+    12136,
+    12137,
+    12132,
+    12132,
+    12131,
+    12131,
+    12424,
+    12424,
+    12138,
+    12138,
+    12134,
+    12135,
+    12648,
+    12648,
+    12649,
+    12649,
+    12650,
+    12650,
+    12651,
+    12651,
+    12647,
+    12647,
+    12775,
+    12781,
+    12782,
+    12780,
+    12776,
+    12774,
+    12774,
+    12805,
+    12805,
+    12806,
+    12807,
+    12794,
+    12794,
+    12868,
+    12878,
+    12878,
+    12888,
+    12888,
+    13148,
+    13137,
+    13138,
+    13136,
+    13133,
+    13133,
+    13134,
+    13134,
+    13135,
+    13135,
+    13396,
+    13396,
+    13396,
+    13396,
+    13396,
+    13315,
+    13315,
+    13568,
+    13568,
+    13567,
+    13567,
+    13688,
+    13688,
+    13749,
+    13749,
+    13947,
+    13947,
+    13948,
+    13949,
+    14421,
+    14420,
+    14257,
+    14257,
+    14296,
+    4349,
+    4860,
+    6065,
+    5085,
+    5304,
+    6955,
+    5190,
+    7435,
+    5311,
+    6924,
+    6051,
+    6430,
+    6030,
+    14295,
+    14294,
+    14303,
+    14303,
+    14312,
+    14312,
+    14399,
+    14399,
+    14419,
+    14398,
+    14405,
+    14405,
+    14404,
+    14404,
+    14403,
+    14403,
+    14402,
+    14402,
+    14401,
+    14401,
+    14400,
+    14400,
+    14660,
+    14660,
+    14749,
+    14749,
+    14749,
+    14829,
+    14829,
+    14828,
+    14827,
+    14980,
+    15002,
+    15002,
+    15111,
+    15149,
+    15149,
+    15150,
+    15150,
+    15151,
+    15191,
+    15191,
+    15190,
+    15190,
+    15189,
+    15189,
+    15187,
+    15187,
+    15188,
+    15188,
+    15442,
+    15442,
+    15603,
+    15603,
+    15441,
+    15441,
+    15853,
+    15853,
+    16015,
+    15597,
+    15597,
+    15598,
+    15598,
+    15647,
+    15650,
+    15649,
+    15646,
+    15648,
+    15647,
+    15650,
+    15649,
+    15646,
+    15648,
+    15601,
+    15621,
+    15652,
+    15651,
+    15602,
+    15600,
+    15600,
+    15622,
+    15622,
+    16021,
+    16021,
+    16034,
+    16034,
+    16036,
+    16035,
+    16035,
+    16215,
+    16215,
+    16216,
+    16216,
+    16387,
+    16387,
+    16375,
+    16375,
+    16372,
+    16372,
+    16538,
+    16617,
+    16617,
+    16616,
+    16616,
+    16655,
+    16655,
+    16656,
+    16656,
+    14303,
+    14312,
+    16658,
+    14294,
+    16729,
+    16729,
+    16728,
+    16728,
+    16726,
+    16726,
+    16863,
+    16960,
+    16960,
+    16961,
+    16961,
+    16962,
+    16962,
+    16963,
+    16963,
+    16964,
+    16964,
+    16965,
+    16965,
+    16966,
+    16966,
+    17123,
+    17127,
+    17125,
+    17126,
+    17124,
+    17920,
+    17922,
+    17921,
+    17923,
+    17349,
+    17347,
+    17348,
+    17364,
+    17363,
+    17350,
+    17475,
+    17475,
+    17474,
+    17474,
+    17476,
+    17476,
+    18004,
+    18004,
+    18182,
+    18182,
+    18185,
+    18185,
+    18183,
+    18183,
+    18184,
+    18184,
+    18187,
+    18187,
+    18567,
+    18567,
+    18769,
+    18769,
+    18770,
+    18772,
+    18771,
+    18794,
+    18794,
+    18812,
+    18812,
+    18811,
+    18811,
+    19171,
+    19171,
+    19172,
+    19172,
+    19173,
+    19286,
+    19287,
+    19288,
+    19289,
+    19289,
+    19296,
+    19297,
+    19298,
+    19299,
+    19300,
+    19290,
+    19291,
+    19292,
+    19293,
+    19294,
+    19295,
+    26358,
+    26358,
+    19416,
+    19416,
+    19417,
+    19417,
+    19418,
+    19426,
+    19426,
+    19810,
+    19810,
+    19812,
+    19812,
+    19811,
+    19811,
+    19805,
+    19805,
+    19806,
+    19806,
+    19904,
+    19904,
+    19906,
+    19905,
+    20242,
+    20242,
+    20489,
+    20488,
+    20154,
+    20154,
+    20480,
+    20480,
+    20495,
+    20495,
+    20292,
+    20292,
+    20833,
+    20391,
+    20391,
+    20793,
+    21528,
+    21529,
+    21536,
+    21536,
+    21543,
+    21543,
+    21540,
+    21540,
+    21539,
+    21539,
+    21541,
+    21541,
+    21542,
+    21542,
+    21921,
+    21921,
+    21138,
+    21138,
+    22177,
+    22117,
+    22419,
+    22654,
+    22655,
+    22655,
+    22656,
+    22657,
+    22658,
+    19289,
+    22436,
+    22436,
+    22986,
+    22983,
+    22987,
+    23062,
+    23062,
+    22820,
+    22820,
+    23128,
+    23145,
+    23145,
+    23380,
+    23380,
+    23378,
+    23378,
+    23377,
+    23377,
+    23379,
+    23379,
+    23332,
+    23332,
+    23265,
+    23265,
+    23690,
+    23691,
+    24045,
+    24045,
+    24017,
+    24017,
+    24018,
+    24018,
+    24036,
+    24162,
+    24162,
+    24305,
+    24306,
+    23506,
+    23506,
+    24564,
+    24564,
+    24703,
+    24703,
+    24701,
+    24701,
+    24699,
+    24699,
+    24702,
+    24702,
+    24807,
+    24807,
+    25016,
+    25017,
+    25018,
+    25019,
+    25098,
+    25098,
+    25133,
+    25133,
+    25318,
+    25336,
+    25335,
+    25317,
+    25316,
+    25315,
+    25314,
+    24998,
+    24978,
+    25323,
+    25330,
+    25329,
+    25319,
+    25320,
+    25321,
+    25321,
+    25321,
+    25321,
+    25321,
+    25313,
+    25313,
+    25365,
+    25365,
+    25111,
+    25111,
+    25488,
+    25489,
+    25751,
+    26489,
+    26489,
+    26490,
+    26833,
+    26833,
+    26833,
+    26833,
+    26833,
+    26487,
+    26487,
+    26627,
+    26627,
+    26464,
+    26464,
+    26720,
+    26720,
+    26797,
+    26797,
+    26850,
+    26850,
+    26911,
+    26911,
+    26913,
+    26912,
+    26912,
+    27334,
+    27334,
+    27466,
+    27634,
+    27634,
+    27635,
+    27636,
+    27637,
+    27620,
+    27620,
+    27622,
+    27622,
+    27624,
+    28647,
+    28647,
+    28650,
+    null,
+    28723,
+    28723,
+    28761,
+    28761,
+    28759,
+    28759,
+    28756,
+    28756,
+    28754,
+    28754,
+    28771,
+    28771,
+    29445,
+    29445,
+    29446,
+    29446,
+    29621,
+    29621,
+    29622,
+    29622,
+    29651,
+    29651,
+    29787,
+    29787,
+    29915,
+    29915,
+    29916,
+    29916,
+    29917,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    36720,
+    36720,
+    36721,
+    36721,
+];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 322937cf0..9522f76aa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1217,6 +1217,10 @@ window.units = [
     [ "Sebastian, World Pirates", "QCK", [ "Powerhouse", "Striker" ], 4, 20, 6, 2, 99, 3000000, 108, 58, 0, 2258, 1258, 0, 1 ],
     [ "Nightin, World Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 64, 27, 32, 1654, 987, 321, 1 ],
     [ "Boa Hancock, Amazon Lily Princess", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 72, 42, 22, 1692, 1202, 262, 1 ],
+    [ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, null, null, 99, null, null, null, null, null, null, null, null ],
+    [ "Byrnndi World", "INT", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, null, null, 99, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index ca381124f..a16736678 100644
--- a/index.html
+++ b/index.html
@@ -62,11 +62,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>17/08/2016</p>
+            <p>23/08/2016</p>
             <br>
             <ul>
-                <li>Huge batch of new units updated</li>
-                <li>Including summertime units</li>
+                <li>World Pirates Added</li>
+                <li>Drops page updated</li>
                 <br>
                 <li>Ability to search for more terms such as</li>
                 <li>"Summertime", "Raid", "Colosseum", etc</li>

From 56586f4df5f0618a9565f56a4edba0d683d4aa17 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 23 Aug 2016 12:54:40 -0500
Subject: [PATCH 0558/1569] Paralysis Switch

---
 common/data/details.js  | 54 ++++++++++++++++++++---------------------
 common/data/gw.js       |  8 +++---
 common/data/matchers.js |  4 +--
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c1f4d3fd4..f7a9f86e4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1198,13 +1198,13 @@ window.details = {
 		special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
 		specialName: "Aye Aye, Captain!",
 		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
-        sailor: "Reduces numbess for 2 turns for himself"
+        sailor: "Reduces Paralysis for 2 turns for himself"
 	},
 	316: {
 		special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
 		specialName: "Aye Aye, Captain!",
 		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
-        sailor: "Reduces numbess for 2 turns for himself"
+        sailor: "Reduces Paralysis for 2 turns for himself"
 	},
 	317: {
 		special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
@@ -2178,14 +2178,14 @@ window.details = {
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe - Venaison Shot",
 		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Numbnesss by 3 turns for self"
+        sailor: "Reduces Paralysiss by 3 turns for self"
 	},
 	522: {
 		special: "Deals several times the character's ATK in INT damage to all enemies",
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe - Venaison Shot",
 		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Numbnesss by 3 turns for self"
+        sailor: "Reduces Paralysiss by 3 turns for self"
 	},
 	523: {
 		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
@@ -2781,14 +2781,14 @@ window.details = {
 		specialNotes: "#{fixed} #{orb : 1.75x}",
 		specialName: "Raging Greatsword",
 		captain: "Boosts ATK of PSY characters by 2.5x if HP is below 30% at the start of the turn",
-        sailor: "Recovers 2 turns of numbness on self"
+        sailor: "Recovers 2 turns of Paralysis on self"
 	},
 	643: {
 		special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
 		specialNotes: "#{fixed} #{orb : 1.75x}",
 		specialName: "Raging Greatsword",
 		captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Recovers 2 turns of numbness on self"
+        sailor: "Recovers 2 turns of Paralysis on self"
 	},
 	644: {
 		special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
@@ -4811,15 +4811,15 @@ window.details = {
 	},
 	1002: {
 		captain: "Boosts ATK of Fighter characters by 1.5x",
-		special: "Reduces Numbness duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
+		special: "Reduces Paralysis duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
 		specialName: "Bepo's Ultimate Fist!!",
-		specialNotes: "Numbness causes that unit to have a chance of not attacking and breaking chain"
+		specialNotes: "Paralysis causes that unit to have a chance of not attacking and breaking chain"
 	},
 	1003: {
 		captain: "Boosts ATK of Fighter characters by 2x",
-		special: "Reduces Numbness duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
+		special: "Reduces Paralysis duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
 		specialName: "Bepo's Ultimate Fist!!",
-		specialNotes: "Numbness causes that unit to have a chance of not attacking and breaking chain"
+		specialNotes: "Paralysis causes that unit to have a chance of not attacking and breaking chain"
 	},
 	1004: {
 		captain: "Boosts RCV of all characters by 1.5x",
@@ -5081,13 +5081,13 @@ window.details = {
     },
 	1048: {
 		captain: "Boosts ATK and RCV of [PSY] Units by 1.2x",
-		special: "Reduces Numbness duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
+		special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
 		specialName: "Mother's Wish to Fight The World"		
 	},
 	1049: {
 		captain: "Boosts ATK and RCV of [PSY] Units by 1.5x, when HP is low the ATK multiplier becomes 2.25x",
         captainNotes: "The low HP threshold is estimated to be 30%",
-		special: "Reduces Numbness duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
+		special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
 		specialName: "Mother's Wish to Fight The World"		
 	},
 	1050: {
@@ -5108,12 +5108,12 @@ window.details = {
 	},
     1053: {
         captain: "Boosts RCV of Cerebral characters by 1.5x",
-        special: "Reduces Numbness and Despair duration by 3 turns, removes Blindness",
+        special: "Reduces Paralysis and Despair duration by 3 turns, removes Blindness",
         specialName: "Precocious Provocation"
     },
     1054: {
         captain: "Boosts RCV of Cerebral characters by 2x",
-        special: "Reduces Numbness and Despair duration by 3 turns, removes Blindness",
+        special: "Reduces Paralysis and Despair duration by 3 turns, removes Blindness",
         specialName: "Precocious Provocation"
     },
 	1055: {
@@ -5258,15 +5258,15 @@ window.details = {
 		captain: "Recovers 3x character's RCV in HP at the end of each turn",
 		special: [
 			{
-				"description": "Recovers 6x character's RCV in HP. Removes Numbness",
+				"description": "Recovers 6x character's RCV in HP. Removes Paralysis",
 				"cooldown": 14
 			},
 			{
-				"description": "Recovers 15x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
 				"cooldown": 19
 			},
 			{
-				"description": "Recovers 50x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
 				"cooldown": 24
 			},
 		],
@@ -5277,15 +5277,15 @@ window.details = {
 		captain: "Recovers 4x character's RCV in HP at the end of each turn",
 		special: [
 			{
-				"description": "Recovers 6x character's RCV in HP. Removes Numbness",
+				"description": "Recovers 6x character's RCV in HP. Removes Paralysis",
 				"cooldown": 14
 			},
 			{
-				"description": "Recovers 15x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
 				"cooldown": 19
 			},
 			{
-				"description": "Recovers 50x character's RCV in HP. Removes Numbness, Poison, RCV Down, and Blindness",
+				"description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
 				"cooldown": 24
 			},
 		],
@@ -5516,14 +5516,14 @@ window.details = {
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe: Concassé",
 		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Numbnesss by 3 turns for self"
+        sailor: "Reduces Paralysiss by 3 turns for self"
 	},
 	1117: {
 		special: "Deals several times the character's ATK in INT damage to all enemies",
 		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
 		specialName: "Diable Jambe: Concassé",
 		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Numbnesss by 3 turns for self"
+        sailor: "Reduces Paralysiss by 3 turns for self"
 	},
 	1118: {
 		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
@@ -5587,12 +5587,12 @@ window.details = {
 	},
 	1128: {
 		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 1.75x",
-		special: "Reduces Numbness and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
+		special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
 		specialName: "Tactician's Savage Cut"
 	},
 	1129: {
 		captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of all characters by 2x",
-		special: "Reduces Numbness and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
+		special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
 		specialName: "Tactician's Savage Cut"
 	},
 	1130: {
@@ -5734,8 +5734,8 @@ window.details = {
 		specialName: "Moderate Healing",
 	},
     1148:{
-		specialName: "Numbness Recovery - Light",
-		special: "Reduces Numbness by 1 turn"
+		specialName: "Paralysis Recovery - Light",
+		special: "Reduces Paralysis by 1 turn"
 	},
 	1149:{
 		special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
@@ -6147,7 +6147,7 @@ window.details = {
 	},
 	1217: { //nightin
 		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
-		special: "Reduces Numbness and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
+		special: "Reduces Paralysis and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
 		specialName: "Catepillar Soul Shot",
 	},
 	1218: {//hancock
diff --git a/common/data/gw.js b/common/data/gw.js
index b19bc103c..5c7785c0c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1213,10 +1213,10 @@ window.gw=[
     null,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
+    36743,
+    36744,
+    36742,
+    36745,
     36720,
     36720,
     36721,
diff --git a/common/data/matchers.js b/common/data/matchers.js
index dc0e9f193..5d246db91 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -385,9 +385,9 @@ window.matchers = [
 	},
 	
 	{
-		name: 'Numbness reducers',
+		name: 'Paralysis reducers',
         target: 'special',
-        matcher: /reduces.+numbness.+duration/i
+        matcher: /reduces.+Paralysis/i
 	},
     
     /* * * * * Sailor * * * * */

From fb134372aca924c5fde62747b2d6d5fe2db47d6d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Aug 2016 00:48:10 -0500
Subject: [PATCH 0559/1569] Byrnndi world

---
 common/data/cooldowns.js | 14 ++++++------
 common/data/details.js   | 49 ++++++++++++++++++++++++++++++++++++++++
 common/data/units.js     | 10 ++++----
 3 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5ba7bd839..6e85e01e4 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1026,8 +1026,8 @@ window.cooldowns = [
 	[ 19, 13 ],
 	[ 11, 5 ],
 	[ 11, 5 ],
-	18,
-	18,
+	[ 18, 12 ],
+	[ 18, 12 ],
 	23,
 	23,
 	[ 11, 5 ],
@@ -1214,11 +1214,11 @@ window.cooldowns = [
     [ 15, 15 ],
     [ 15, 15 ],
 	[ 18, 12 ],
-	17,
+	[ 17, 10 ],
 	[ 17, 11 ],
 	[ 25, 14 ],
-	null,
-	null,
-	null,
-	null,
+	[ 29, 16 ],
+	[ 29, 16 ],
+	null, //byrnndi world
+	null,//byrnndi world
 ];
diff --git a/common/data/details.js b/common/data/details.js
index f7a9f86e4..fbd358a20 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6155,4 +6155,53 @@ window.details = {
 		special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
 		specialName: "Everybody Confusing Fragrance",
 	},
+	1219: {//Byrnndi World Colosseum
+        captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x If you did not defeat an enemy, lose all ATK boost stacks.",
+		special: [
+			{
+				"description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
+				"cooldown": [ 22, 6 ],
+			},
+			{
+				"description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
+				"cooldown": [ 28, 12 ],
+			}
+			{
+				"description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
+				"cooldown": [ 34, 18 ],
+			},
+		],        
+		specialName: "More More, 10 Times \"Iron Hammer\"",
+	},
+	1220: {//Byrnndi World Colosseum
+        captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x If you did not defeat an enemy, lose all ATK boost stacks.",
+		special: [
+			{
+				"description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
+				"cooldown": [ 22, 6 ],
+			},
+			{
+				"description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
+				"cooldown": [ 28, 12 ],
+			}
+			{
+				"description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
+				"cooldown": [ 34, 18 ],
+			},
+		],        
+		specialName: "More More, 10 Times \"Iron Hammer\"",
+	},
+	1221: {//Colosseum Oars Jr
+		captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
+		special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+		specialName: "Blood of the Devil Warrior",
+	},
+	1222: {//Colosseum Oars Jr
+		captain: "Boosts ATK of Slasher characters by 2x and the HP of Powerhouse characters by 1.75x",
+		special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+		specialName: "Blood of the Devil Warrior",
+	},
 };
+
diff --git a/common/data/units.js b/common/data/units.js
index 9522f76aa..a595fc27e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1097,7 +1097,7 @@ window.units = [
     [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 121, 47, 5, 1323, 520, 59, 1 ],
     [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1271, 467, 30, 2302, 980, 92, 1 ],
     [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
-    [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, 392109, 79, 50, 47, 151, 84, 57, 1 ],
+    [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, 392109, 79, 50, 47, 963, 471, 178, 1 ],
     [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 897, 429, 134, 1946, 995, 344, 1 ],
     [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, 1066998, 545, 404, 0, 1384, 822, 0, 1 ],
     [ "Black Arm Zephyr, Former Navy HQ Admiral", "STR", [ "Fighter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1318, 749, 0, 2620, 1500, 0, 1 ],
@@ -1217,10 +1217,10 @@ window.units = [
     [ "Sebastian, World Pirates", "QCK", [ "Powerhouse", "Striker" ], 4, 20, 6, 2, 99, 3000000, 108, 58, 0, 2258, 1258, 0, 1 ],
     [ "Nightin, World Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 64, 27, 32, 1654, 987, 321, 1 ],
     [ "Boa Hancock, Amazon Lily Princess", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 72, 42, 22, 1692, 1202, 262, 1 ],
-    [ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, null, null, 99, null, null, null, null, null, null, null, null ],
-    [ "Byrnndi World", "INT", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, null, null, 99, null, null, null, null, null, null, null, null ],
+    [ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, null, 266, 119, 9, null, null, null, null ],
+    [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, null, 1241, 482, 31, 2802, 1171, 90, null ],
+    [ "Byrnndi World", "INT", [ "Shooter", "Driven" ], 4, 25, 4, 2, 70, null, 472, 331, 19, 1093, 809, 97, null ],
+    [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, null, 1011, 744, 52, 1990, 1483, 170, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From bf6a9061476b603c3ed3bd17fc53b87ef44791af Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Aug 2016 00:49:30 -0500
Subject: [PATCH 0560/1569] ,

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fbd358a20..32121350e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6165,7 +6165,7 @@ window.details = {
 			{
 				"description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
 				"cooldown": [ 28, 12 ],
-			}
+			},
 			{
 				"description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
 				"cooldown": [ 34, 18 ],
@@ -6183,7 +6183,7 @@ window.details = {
 			{
 				"description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
 				"cooldown": [ 28, 12 ],
-			}
+			},
 			{
 				"description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
 				"cooldown": [ 34, 18 ],

From 2d61b5b810ea9c7f6b5be727de9711da5737f6e4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Aug 2016 00:50:33 -0500
Subject: [PATCH 0561/1569] wrong order

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6e85e01e4..3cf963eb4 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1217,8 +1217,8 @@ window.cooldowns = [
 	[ 17, 10 ],
 	[ 17, 11 ],
 	[ 25, 14 ],
-	[ 29, 16 ],
-	[ 29, 16 ],
 	null, //byrnndi world
 	null,//byrnndi world
+	[ 29, 16 ],
+	[ 29, 16 ],
 ];

From aba6b9b29f02f56103f3aad9789a7ad4cb81b4f1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 25 Aug 2016 01:30:33 -0500
Subject: [PATCH 0562/1569] swap order

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index a595fc27e..d41c73d05 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1217,10 +1217,10 @@ window.units = [
     [ "Sebastian, World Pirates", "QCK", [ "Powerhouse", "Striker" ], 4, 20, 6, 2, 99, 3000000, 108, 58, 0, 2258, 1258, 0, 1 ],
     [ "Nightin, World Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 64, 27, 32, 1654, 987, 321, 1 ],
     [ "Boa Hancock, Amazon Lily Princess", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 72, 42, 22, 1692, 1202, 262, 1 ],
-    [ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, null, 266, 119, 9, null, null, null, null ],
-    [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, null, 1241, 482, 31, 2802, 1171, 90, null ],
     [ "Byrnndi World", "INT", [ "Shooter", "Driven" ], 4, 25, 4, 2, 70, null, 472, 331, 19, 1093, 809, 97, null ],
     [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, null, 1011, 744, 52, 1990, 1483, 170, null ],
+	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, null, 266, 119, 9, null, null, null, null ],
+    [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, null, 1241, 482, 31, 2802, 1171, 90, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From ec34f16a4f7c06e9b06dac14379afe8311f570b6 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 23 Aug 2016 13:05:26 -0500
Subject: [PATCH 0563/1569] Matchers

changed for Mansherry
---
 common/data/matchers.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/matchers.js b/common/data/matchers.js
index 5d246db91..e91853160 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -327,13 +327,13 @@ window.matchers = [
     {
         name: 'Bind reducers',
         target: 'special',
-        matcher: /reduces.+bind.+duration/i
+        matcher: /(reduces|remove).+bind.+duration/i
     },
 
     {
         name: 'Despair reducers',
         target: 'special',
-        matcher: /reduces.+despair.+duration/i
+        matcher: /(reduces|remove).+despair.+duration/i
     },
 
     {
@@ -345,7 +345,7 @@ window.matchers = [
     {
         name: 'Blindness removers',
         target: 'special',
-        matcher: /removes blindness/i
+        matcher: /(reduces|remove) blindness/i
     },
 
     {
@@ -387,7 +387,7 @@ window.matchers = [
 	{
 		name: 'Paralysis reducers',
         target: 'special',
-        matcher: /reduces.+Paralysis/i
+        matcher: /(reduces|remove).+Paralysis/i
 	},
     
     /* * * * * Sailor * * * * */

From 306225b598e32f4eaabc00e176efaafd7fca3e0b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 26 Aug 2016 14:42:45 -0500
Subject: [PATCH 0564/1569] Finishing new units

---
 common/data/aliases.js  | 22 +++++++++++-----------
 common/data/captains.js | 18 ++++++++++++++++++
 common/data/drops.js    |  4 +++-
 common/data/families.js |  4 ++++
 common/data/flags.js    | 10 ++++++++++
 common/data/gw.js       |  4 ++--
 common/data/matchers.js |  2 +-
 common/data/specials.js | 32 ++++++++++++++++++++++++++++++++
 damage/js/cruncher.js   |  2 +-
 9 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d7404ae7e..60089dadf 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -657,7 +657,7 @@ window.aliases = {
     656: ['アーロン タイヨウの海賊団','','Young Arlong'],
     657: ['クロオビ タイヨウの海賊団','','Young Kuroobi'],
     658: ['チュウ タイヨウの海賊団','','Young Choo'],
-    659: ['モンキー・D・ルフィ うきわ','','Summertime Luffy'],
+    659: ['モンキー・D・ルフィ うきわ','','Summertime Luffy','Swimsuit Luffy'],
     660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp' ],
     661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp' ],
     662: ['ナミ バカンス',''],
@@ -678,12 +678,12 @@ window.aliases = {
     677: ['イナズマ 革命軍',''],
     678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin' ],
     679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」','', 'Log Robin' ],
-    680: ['アイス大好きナミ','','Summertime Nami'],
-    681: ['アイス大好きナミ レモンアイス','','Summertime Nami'],
-    682: ['アイス大好きロビン','','Summertime Robin'],
-    683: ['アイス大好きロビン チョコアイス','','Summertime Robin'],
-    684: ['アイス大好きペローナ','','Summertime Perona'],
-    685: ['アイス大好きペローナ ストロベリーアイス','','Summertime Perona'],
+    680: ['アイス大好きナミ','','Summertime Nami','Swimsuit Nami'],
+    681: ['アイス大好きナミ レモンアイス','','Summertime Nami','Swimsuit Nami'],
+    682: ['アイス大好きロビン','','Summertime Robin','Swimsuit Robin'],
+    683: ['アイス大好きロビン チョコアイス','','Summertime Robin','Swimsuit Robin'],
+    684: ['アイス大好きペローナ','','Summertime Perona','Swimsuit Perona'],
+    685: ['アイス大好きペローナ ストロベリーアイス','','Summertime Perona','Swimsuit Perona'],
     686: ['ビビのひとやすみ',''],
     687: ['カルガラ',''],
     688: ['カルガラ シャンディアの大戦士',''],
@@ -1158,8 +1158,8 @@ window.aliases = {
     1157: ['ハンニャバル副署長 海底監獄インペルダウン',''],
     1158: ['マゼラン署長',''],
     1159: ['マゼラン署長 海底監獄インペルダウン',''],
-    1160: ['コアラ ビーチの天使','','Summertime Koala'],
-    1161: ['コアラ 楽園の女神','','Summertime Koala'],
+    1160: ['コアラ ビーチの天使','','Summertime Koala','Swimsuit Koala'],
+    1161: ['コアラ 楽園の女神','','Summertime Koala','Swimsuit Koala'],
     1162: ['ギルド・テゾーロ','','Raid'],
     1163: ['ギルド・テゾーロ 黄金船のカジノ王','','Raid'],
     1164: ['カリーナ','','Raid'],
@@ -1211,8 +1211,8 @@ window.aliases = {
     1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp'],
 	1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky'],
     1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky'],
-	1213: ['','','Summertime Baby 5'],
-    1214: ['','','Summertime Baby 5'],
+	1213: ['','','Summertime Baby 5','Swimsuit Baby 5'],
+    1214: ['','','Summertime Baby 5','Swimsuit Baby 5'],
     1215: ['ガイラム ワールド海賊団','',''],
     1216: ['セバスチャン ワールド海賊団','',''],
     1217: ['ナイチン ワールド海賊団','',''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 3444f856d..caf06345d 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3132,4 +3132,22 @@ window.captains = {
 		},
 		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
 	},
+    1219: {
+        atk: function(p) {
+			return p.unit.class.has("Shooter") ? Math.min(3, 1 + 0.125 * p.turnCounter) : 1;
+		}
+	},
+	1220: {
+        atk: function(p) {
+			return p.unit.class.has("Shooter") ? Math.min(3.25, 1 + 0.225 * p.turnCounter) : 1;
+		}
+	},
+    1221: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1222: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index f4278cf2b..a3039b0f4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -972,6 +972,7 @@ window.drops = {
         {
             name: "Legendary Shipbuilding Company Tom's Workers",
             thumb: 848,
+            global: true,
             condition: 'You can only bring Impact and Free Spirit units. (No Evo/Boosters)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
@@ -1310,9 +1311,10 @@ window.drops = {
         {
             name: 'Girls of Summer Paradise',
             thumb: 683,
+            global: true,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['10 Times','Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems']],
-            Expert: [ 659, 680, 682, 684 ],
+            Expert: [ 659, 680, 682, 684, 1200, 1198 ],
 			"Completion Units": [686]
         },
         
diff --git a/common/data/families.js b/common/data/families.js
index abc5b5bd7..cca749337 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1217,4 +1217,8 @@ window.families = [
     null,
     null,
     "Boa Hancock",
+    "Byrnndi World",
+    "Byrnndi World",
+    "Little Oars Jr.",
+	"Little Oars Jr.",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index b603abe22..2d1d42866 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -672,6 +672,12 @@ window.flags = {
 	677: { rr: 1, rro: 1, global: 1 },
 	678: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	679: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    680: { global: 1 },
+    681: { global: 1 },
+    682: { global: 1 },
+    683: { global: 1 },
+    684: { global: 1 },
+    685: { global: 1 },
     687: { global: 1 },
     688: { global: 1 },
     689: { global: 1 },
@@ -813,6 +819,10 @@ window.flags = {
 	844: { rr: 1, rro: 1, global: 1 },
 	845: { rr: 1, rro: 1, global: 1 },
 	846: { rr: 1, rro: 1, global: 1 },
+    847: { global: 1 },
+    848: { global: 1 },
+    849: { global: 1 },
+    850: { global: 1 },
 	855: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	856: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	857: { rr: 1, rro: 1, lrr: 1, global: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index 5c7785c0c..26d4a5306 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1217,8 +1217,8 @@ window.gw=[
     36744,
     36742,
     36745,
-    36720,
-    36720,
     36721,
     36721,
+    36720,
+    36720,
 ];
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index e91853160..a8ec9a363 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -387,7 +387,7 @@ window.matchers = [
 	{
 		name: 'Paralysis reducers',
         target: 'special',
-        matcher: /(reduces|remove).+Paralysis/i
+        matcher: /(reduces|remove).+Paralysis/i 
 	},
     
     /* * * * * Sailor * * * * */
diff --git a/common/data/specials.js b/common/data/specials.js
index c919b7ede..cb8676623 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1516,4 +1516,36 @@ window.specials = {
 	1212: {
 		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
 	},
+    1219: {
+		atk: function(p) {
+			if (!window.specials[1219].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
+			if (window.specials[1219].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+			if (window.specials[1219].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
+		},
+		type: "class",
+		stage: -1,
+		onActivation: function(p) {
+			window.specials[1219].stage = (window.specials[1219].stage + 1) % 3;
+			p.scope.notify({
+				text: 'Activating stage #' + (window.specials[1219].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+				name: '1219warning'
+			});
+		}
+	},
+    1220: {
+		atk: function(p) {
+			if (!window.specials[1220].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
+			if (window.specials[1220].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+			if (window.specials[1220].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
+		},
+		type: "class",
+		stage: -1,
+		onActivation: function(p) {
+			window.specials[1220].stage = (window.specials[1220].stage + 1) % 3;
+			p.scope.notify({
+				text: 'Activating stage #' + (window.specials[1220].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+				name: '1219warning'
+			});
+		}
+	},
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index bfd1c30c5..bfdb0d35a 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -689,7 +689,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));
             }
             // activate turn counter if necessary
-            if (n < 2 && (id == 794 || id == 795 || id == 1191 || id == 1192))
+            if (n < 2 && (id == 794 || id == 795 || id == 1191 || id == 1192 || id == 1219 || id == 1220))
                 $scope.tdata.turnCounter.enabled = true;
         });
         if (conflictWarning) 

From 70cad98ccf3bc2492f037cb000def92d0402910d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 26 Aug 2016 15:17:25 -0500
Subject: [PATCH 0565/1569] Updated drops/quests

---
 common/data/drops.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index a3039b0f4..d17749edd 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -655,7 +655,7 @@ window.drops = {
             global: true,
 			condition: "None",
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
-            challengeData: [['150,000','Blue Elder'],['450,000','ATK Cotton Candy'],['750,000','3x Rainbow Gems']],
+            challengeData: [['150,000','1x Blue Elder'],['450,000','1x ATK Cotton Candy'],['750,000','3x Rainbow Gems']],
             Expert: [ 43, 49, 79, 85, 96, 106, 231, -230, -229, -221, -208, -62, -54 ],
             Elite: [ 43, 49, 96, 111, 117, 231, -230, -229, -221, -208 ]
         },
@@ -965,6 +965,7 @@ window.drops = {
         {
             name: "Nami and Lola's Great Proposal Plan",
             thumb: 808,
+            global: true,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
             "All Difficulties": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ]
         },
@@ -1036,6 +1037,8 @@ window.drops = {
 			name: "Clash! Whitebeard Pirates",
             thumb: 979,
 			condition: "You can only bring INT units",
+            challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
+            challengeData: [['150,000','1x Blue Elder'],['420,000','1x HP Cotton Candy, 1x Rainbow Gem'],['700,000','2x Rainbow Gems, 1x Orb Forbidden Tome']],
 			"All Difficulties": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
 		},
 		

From 1ee321631ca96e4b3f68732dcbd189af7cdceb2a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 29 Aug 2016 15:25:58 -0500
Subject: [PATCH 0566/1569] Kizaru Sugo Previews

---
 common/data/aliases.js  | 18 ++++++++++++++++++
 common/data/details.js  |  4 ++--
 common/data/families.js | 18 ++++++++++++++++++
 common/data/flags.js    | 12 ++++++------
 common/data/gw.js       | 18 ++++++++++++++++++
 common/data/units.js    | 18 ++++++++++++++++++
 index.html              | 10 ++++------
 7 files changed, 84 insertions(+), 14 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 60089dadf..93bff3365 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1221,4 +1221,22 @@ window.aliases = {
     1220: ['','',''],
     1221: ['','',''],
     1222: ['','',''],
+    1223: ['','',''],
+    1224: ['','',''],
+    1225: ['','',''],
+    1226: ['','',''],
+    1227: ['','',''],
+    1228: ['','',''],
+    1229: ['','','Sentoumaru'],
+    1230: ['','','Sentoumaru'],
+    1231: ['','',''],
+    1232: ['','',''],
+    1233: ['','',''],
+    1234: ['','',''],
+    1235: ['','',''],
+    1236: ['','',''],
+    1237: ['','',''],
+    1238: ['','',''],
+    1239: ['','','Kizaru'],
+    1240: ['','','Kizaru'],
 };
diff --git a/common/data/details.js b/common/data/details.js
index 32121350e..0af02f3d2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3341,14 +3341,14 @@ window.details = {
 	},
 	749: {
 		special: "Deals random DEX damage to all enemies, randomizes all orbs",
-		specialName: "Rankyaku - Amane Dachi",
+		specialName: "Tempest Kick: Sky Slicer",
         specialNotes: "The random damage is between 10,000 and 90,000",
 		captain: "Boosts ATK of DEX characters by 1.5x, boosts damage of DEX specials by 1.5x",
 		captainNotes: "#{noFixedPerc}"
 	},
 	750: {
 		special: "Deals random DEX damage to all enemies, randomizes all orbs",
-		specialName: "Rankyaku - Amane Dachi",
+		specialName: "Tempest Kick: Sky Slicer",
         specialNotes: "The random damage is between 10,000 and 90,000",
 		captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
 		captainNotes: "#{noFixedPerc}"
diff --git a/common/data/families.js b/common/data/families.js
index cca749337..981aa1629 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1221,4 +1221,22 @@ window.families = [
     "Byrnndi World",
     "Little Oars Jr.",
 	"Little Oars Jr.",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Sentomaru",
+    "Sentomaru",
+	"Smoker",
+	"Smoker",
+    "Tashigi",
+	"Tashigi",
+    "Maynard",
+    "Maynard",
+    "Bastille",
+    "Bastille",
+    "Kizaru",
+    "Kizaru",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 2d1d42866..9cab740fb 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -859,10 +859,10 @@ window.flags = {
 	912: { rr: 1, rro: 1, global: 1 },
 	913: { rr: 1, rro: 1, global: 1 },
 	914: { rr: 1, rro: 1, global: 1 },
-	915: { rr: 1, rro: 1, lrr: 1 },
-	916: { rr: 1, rro: 1, lrr: 1 },
-    921: { rr: 1, rro: 1, lrr: 1 },
-    922: { rr: 1, rro: 1, lrr: 1 },
+	915: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	916: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    921: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    922: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	934: { rr: 1, rro: 1 },
 	935: { rr: 1, rro: 1 },
 	936: { rr: 1, rro: 1 },
@@ -873,8 +873,8 @@ window.flags = {
 	941: { rr: 1, rro: 1 },
 	942: { rr: 1, rro: 1 },
 	943: { rr: 1, rro: 1 },
-	944: { rr: 1, rro: 1, lrr: 1 },
-	945: { rr: 1, rro: 1, lrr: 1 },
+	944: { rr: 1, rro: 1, lrr: 1, global: 1 },
+	945: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	975: { rr: 1, rro: 1, lrr: 1 },
 	976: { rr: 1, rro: 1, lrr: 1 },
     990: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index 26d4a5306..b9c4a2935 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1221,4 +1221,22 @@ window.gw=[
     36721,
     36720,
     36720,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    37079,
+    37079,
+    null,
+    null,
+    37082,
+    37082,
+    37051,
+    37051,
+    37052,
+    37052,
+    null,
+    null,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index d41c73d05..31397f8f5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1221,6 +1221,24 @@ window.units = [
     [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, null, 1011, 744, 52, 1990, 1483, 170, null ],
 	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, null, 266, 119, 9, null, null, null, null ],
     [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, null, 1241, 482, 31, 2802, 1171, 90, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sentomaru, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sentomaru of the Axe, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Smoker, G-5 Unit 01", "DEX", [ "Striker", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Smoker, G-5 Navy HQ Vice Admiral", "DEX", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tashigi, G-5 Unit 01", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tashigi, G-5 Navy HQ Captain ", "QCK", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Maynard, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index a16736678..a3965a56a 100644
--- a/index.html
+++ b/index.html
@@ -62,20 +62,18 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>23/08/2016</p>
+            <p>29/08/2016</p>
             <br>
             <ul>
+                <li>Previews for Kizaru</li>
+                <li>Sugofest Added</li>
+                <br>
                 <li>World Pirates Added</li>
                 <li>Drops page updated</li>
                 <br>
                 <li>Ability to search for more terms such as</li>
                 <li>"Summertime", "Raid", "Colosseum", etc</li>
                 <br>
-                <li>Added Evaluation to the HP Input</li>
-                <li>of the Calculator, so you can now </li>
-                <li>enter Stuff like 300-200 or 250*4.3</li>
-                <li>(Uses decimal point)</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>

From 039e0d75463a6922a35fc2180b851885c90c94f7 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 30 Aug 2016 11:10:56 -0500
Subject: [PATCH 0567/1569] Sugo Update

---
 common/data/details.js | 112 +++++++++++++++++++++++++++++++++++++++--
 common/data/flags.js   |  12 +++++
 common/data/gw.js      |   8 +--
 common/data/units.js   |   4 +-
 index.html             |   4 +-
 5 files changed, 128 insertions(+), 12 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 0af02f3d2..faedd0398 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2379,13 +2379,13 @@ window.details = {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
 		captain: "Boosts ATK and RCV of INT characters by 1.5x",
-        sailor: "Reduces blindness by 3 turn"
+        sailor: "Reduces duration of Blindness by 3 turn"
 	},
 	558: {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
 		captain: "Boosts ATK and RCV of INT characters by 2x",
-        sailor: "Reduces blindness by 3 turn"
+        sailor: "Reduces duration of Blindness by 3 turn"
 	},
 	559: {
 		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
@@ -6087,13 +6087,13 @@ window.details = {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
 		captain: "Boosts ATK and RCV of INT characters by 1.5x",
-        sailor: "Reduces blindness by 3 turn"
+        sailor: "Reduces duration of Blindness by 3 turn"
 	},
 	1208: {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
 		captain: "Boosts ATK and RCV of INT characters by 2x",
-        sailor: "Reduces blindness by 3 turn"
+        sailor: "Reduces duration of Blindness by 3 turn"
 	},
     1209: {
 		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
@@ -6203,5 +6203,109 @@ window.details = {
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
 		specialName: "Blood of the Devil Warrior",
 	},
+    1229: {//Sentomaru
+		captain: "Unknown",
+		special: "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
+        sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
+		specialName: "Sentomaru Special",
+	},
+    1230: {//Sentomaru
+		captain: "Boosts the ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
+		special: "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
+        sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
+		specialName: "Sentomaru Special",
+	},
+    1231: {//Smoker
+		captain: "Unknown",
+		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
+        specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
+		specialName: "Smoker Special",
+        sailor: "Boosts ATK of Striker characters by 50",
+	},
+    1232: {//Smoker
+		captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces their RCV by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
+		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
+        specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
+		specialName: "Smoker Special",
+        sailor: "Boosts ATK of Striker characters by 50",
+	},
+    1233: {//Tashigi
+		captain: "Unknown",
+		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by a large amount for 2 turns",
+        specialNotes: "'Color Affinity' is a new mechanic and must be explored",
+		specialName: "Cutting Drizzle",
+        sailor: "Boosts RCV of Slasher characters by 30",
+	},
+    1234: {//Tashigi
+		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
+		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by a large amount for 2 turns",
+        specialNotes: "'Color Affinity' is a new mechanic and must be explored",
+		specialName: "Cutting Drizzle",
+        sailor: "Boosts RCV of Slasher characters by 30",
+	},
+    1235: {//Maynard
+		captain: "Unknown",
+		special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
+		specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
+		specialName: "Maynard Special",
+        sailor: "Reduces duration of Blindness for 3 turns",
+	},
+    1236: {//Maynard
+		captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
+        special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
+		specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
+		specialName: "Maynard Special",
+        sailor: "Reduces duration of Blindness for 3 turns",
+	},
+    1237: {//Bastille
+		captain: "Unknown",
+		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 3 turns.",
+		specialName: "Bastille Special",
+        sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
+	},
+    1238: {//Bastille
+		captain: "Boosts ATK of all characters by 2x after the 15st hit in the chain and by 3x after the 30th hit",
+		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 3 turns.",
+		specialName: "Bastille Special",
+        sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
+	},
+    1239: {//6* Kizaru
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
+        specialName: "Yasakani no Magatama",
+        special: [
+			{
+				"description": "Unknown",
+				"cooldown": [ 6, 3 ],
+			},
+			{
+				"description": "Unknown",
+				"cooldown": [ 12, 9 ],
+			},
+			{
+				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+				"cooldown": [ 20, 17 ],
+			},
+		],    
+		specialNotes: "#{randomHits : 10}",
+    },
+    1240: {//6* Kizaru
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
+        specialName: "Yasakani no Magatama",
+        special: [
+			{
+				"description": "Unknown",
+				"cooldown": [ 6, 3 ],
+			},
+			{
+				"description": "Unknown",
+				"cooldown": [ 12, 9 ],
+			},
+			{
+				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+				"cooldown": [ 20, 17 ],
+			},
+		],    
+		specialNotes: "#{randomHits : 10}",
+    },
 };
 
diff --git a/common/data/flags.js b/common/data/flags.js
index 9cab740fb..7cc67cc91 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -977,4 +977,16 @@ window.flags = {
     1212: { rr: 1, rro: 1 },
     1213: { rr: 1, rro: 1, lrr: 1 },
     1214: { rr: 1, rro: 1, lrr: 1 },
+    1229: { rr: 1, rro: 1 },
+    1230: { rr: 1, rro: 1 },
+    1231: { rr: 1, rro: 1 },
+    1232: { rr: 1, rro: 1 },
+    1233: { rr: 1, rro: 1 },
+    1234: { rr: 1, rro: 1 },
+    1235: { rr: 1, rro: 1 },
+    1236: { rr: 1, rro: 1 },
+    1237: { rr: 1, rro: 1 },
+    1238: { rr: 1, rro: 1 },
+    1239: { rr: 1, rro: 1 },
+    1240: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index b9c4a2935..2521b54b6 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1229,14 +1229,14 @@ window.gw=[
     null,
     37079,
     37079,
-    null,
-    null,
+    37122,
+    37122,
     37082,
     37082,
     37051,
     37051,
     37052,
     37052,
-    null,
-    null,
+    37125,
+    37125,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 31397f8f5..da0936431 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1237,8 +1237,8 @@ window.units = [
     [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, null, 3, 70, null, 316, 293, 101, 1376, 841, 279, null ],
+    [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 5, 4, 99, null, 1321, 776, 231, 2590, 1489, 500, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index a3965a56a..9371e842f 100644
--- a/index.html
+++ b/index.html
@@ -62,11 +62,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>29/08/2016</p>
+            <p>30/08/2016</p>
             <br>
             <ul>
                 <li>Previews for Kizaru</li>
-                <li>Sugofest Added</li>
+                <li>Sugofest Updated</li>
                 <br>
                 <li>World Pirates Added</li>
                 <li>Drops page updated</li>

From cd33130acfa592879c37fa3531592bf37088d11b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 30 Aug 2016 11:25:29 -0500
Subject: [PATCH 0568/1569] combo

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index da0936431..2908cbc89 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1237,7 +1237,7 @@ window.units = [
     [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, null, 3, 70, null, 316, 293, 101, 1376, 841, 279, null ],
+    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 4, 3, 70, null, 316, 293, 101, 1376, 841, 279, null ],
     [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 5, 4, 99, null, 1321, 776, 231, 2590, 1489, 500, null ],
 	];
 	

From 72cb09312914148c9cae1e288ba2701d42d47dda Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 31 Aug 2016 01:45:16 -0500
Subject: [PATCH 0569/1569] Kizaru Sugo Units

---
 common/data/cooldowns.js | 19 +++++++++++++++++++
 common/data/details.js   | 40 ++++++++++++++++++++--------------------
 common/data/units.js     | 36 ++++++++++++++++++------------------
 3 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3cf963eb4..610926cd6 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1221,4 +1221,23 @@ window.cooldowns = [
 	null,//byrnndi world
 	[ 29, 16 ],
 	[ 29, 16 ],
+	null,
+	null,
+	null,
+	null,
+	null,
+	null,
+	22,
+	22,
+	19,
+	19,
+	23,
+	23,
+	20,
+	20,
+	22,
+	22,
+	null,//Kizaru
+	null,//Kizaru
+	
 ];
diff --git a/common/data/details.js b/common/data/details.js
index faedd0398..f1c3e35a3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6204,33 +6204,33 @@ window.details = {
 		specialName: "Blood of the Devil Warrior",
 	},
     1229: {//Sentomaru
-		captain: "Unknown",
+		captain: "Boosts the ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
 		special: "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-		specialName: "Sentomaru Special",
+		specialName: "Leg-Locked Heave-Ho",
 	},
     1230: {//Sentomaru
 		captain: "Boosts the ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
 		special: "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-		specialName: "Sentomaru Special",
+		specialName: "Leg-Locked Heave-Ho",
 	},
     1231: {//Smoker
-		captain: "Unknown",
+		captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces their RCV by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.25x",
 		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
-		specialName: "Smoker Special",
+		specialName: "Armed - White Launcher",
         sailor: "Boosts ATK of Striker characters by 50",
 	},
     1232: {//Smoker
 		captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces their RCV by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
 		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
-		specialName: "Smoker Special",
+		specialName: "Armed - White Launcher",
         sailor: "Boosts ATK of Striker characters by 50",
 	},
     1233: {//Tashigi
-		captain: "Unknown",
+		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
 		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by a large amount for 2 turns",
         specialNotes: "'Color Affinity' is a new mechanic and must be explored",
 		specialName: "Cutting Drizzle",
@@ -6244,29 +6244,29 @@ window.details = {
         sailor: "Boosts RCV of Slasher characters by 30",
 	},
     1235: {//Maynard
-		captain: "Unknown",
+		captain: "Boosts ATK of [PSY] characters by 1.75x, deals 3x character's ATK to all enemies at the end of each turn",
 		special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
 		specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
-		specialName: "Maynard Special",
+		specialName: "Sword of Silence",
         sailor: "Reduces duration of Blindness for 3 turns",
 	},
     1236: {//Maynard
 		captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
 		specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
-		specialName: "Maynard Special",
+		specialName: "Sword of Silence",
         sailor: "Reduces duration of Blindness for 3 turns",
 	},
     1237: {//Bastille
-		captain: "Unknown",
+		captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
 		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 3 turns.",
-		specialName: "Bastille Special",
+		specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
 	},
     1238: {//Bastille
-		captain: "Boosts ATK of all characters by 2x after the 15st hit in the chain and by 3x after the 30th hit",
+		captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain and by 3x after the 30th hit",
 		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 3 turns.",
-		specialName: "Bastille Special",
+		specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
 	},
     1239: {//6* Kizaru
@@ -6274,15 +6274,15 @@ window.details = {
         specialName: "Yasakani no Magatama",
         special: [
 			{
-				"description": "Unknown",
+				"description": "For Shooter and Slasher characters, randomize all orbs. Deals 10 hits of small random typeless damage to random enemies.",
 				"cooldown": [ 6, 3 ],
 			},
 			{
-				"description": "Unknown",
+				"description": "For Shooter and Slasher characters, randomize all orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
 				"cooldown": [ 12, 9 ],
 			},
 			{
-				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
 				"cooldown": [ 20, 17 ],
 			},
 		],    
@@ -6293,15 +6293,15 @@ window.details = {
         specialName: "Yasakani no Magatama",
         special: [
 			{
-				"description": "Unknown",
+				"description": "For Shooter and Slasher characters, randomize all orbs. Deals 10 hits of small random typeless damage to random enemies.",
 				"cooldown": [ 6, 3 ],
 			},
 			{
-				"description": "Unknown",
+				"description": "For Shooter and Slasher characters, randomize all orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
 				"cooldown": [ 12, 9 ],
 			},
 			{
-				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
 				"cooldown": [ 20, 17 ],
 			},
 		],    
diff --git a/common/data/units.js b/common/data/units.js
index 2908cbc89..04d4f4cbd 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1211,34 +1211,34 @@ window.units = [
 	[ "Usopp, Loyal Straw Hat Crew", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
 	[ "Franky, Dream-Pursuing Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
 	[ "Franky, Loyal Straw Hat Crew", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
-    [ "Baby 5, Dolphin Floatie", "STR", [ "Slasher", "Striker" ], 4, 13, 4, 2, 50, 392109, 101, 103, 34, 910, 563, 177, null ],
-    [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, null ],
+    [ "Baby 5, Dolphin Floatie", "STR", [ "Slasher", "Striker" ], 4, 13, 4, 2, 50, 392109, 101, 103, 34, 910, 563, 177, 1 ],
+    [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, 1 ],
     [ "Gairam, World Pirates", "DEX", [ "Shooter", "Striker" ], 4, 20, 6, 2, 99, 3000000, 85, 35, 15, 1735, 1135, 175, 1 ],
     [ "Sebastian, World Pirates", "QCK", [ "Powerhouse", "Striker" ], 4, 20, 6, 2, 99, 3000000, 108, 58, 0, 2258, 1258, 0, 1 ],
     [ "Nightin, World Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 64, 27, 32, 1654, 987, 321, 1 ],
     [ "Boa Hancock, Amazon Lily Princess", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 72, 42, 22, 1692, 1202, 262, 1 ],
-    [ "Byrnndi World", "INT", [ "Shooter", "Driven" ], 4, 25, 4, 2, 70, null, 472, 331, 19, 1093, 809, 97, null ],
-    [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, null, 1011, 744, 52, 1990, 1483, 170, null ],
-	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, null, 266, 119, 9, null, null, null, null ],
-    [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, null, 1241, 482, 31, 2802, 1171, 90, null ],
+    [ "Byrnndi World", "INT", [ "Shooter", "Driven" ], 4, 25, 4, 2, 70, 1066998, 472, 331, 19, 1093, 809, 97, 1 ],
+    [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1011, 744, 52, 1990, 1483, 170, 1 ],
+	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, 392109, 266, 119, 9, 1306, 548, 47, 1 ],
+    [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, 3000000, 1241, 482, 31, 2802, 1171, 90, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sentomaru, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sentomaru of the Axe, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Smoker, G-5 Unit 01", "DEX", [ "Striker", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Smoker, G-5 Navy HQ Vice Admiral", "DEX", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tashigi, G-5 Unit 01", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tashigi, G-5 Navy HQ Captain ", "QCK", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Maynard, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 4, 3, 70, null, 316, 293, 101, 1376, 841, 279, null ],
-    [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 5, 4, 99, null, 1321, 776, 231, 2590, 1489, 500, null ],
+    [ "Sentomaru, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 4, 15, 6, 3, 50, 392109, 251, 96, 30, 1603, 442, 140, 1 ],
+    [ "Sentomaru of the Axe, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1524, 376, 90, 3205, 1006, 362, 1 ],
+    [ "Smoker, G-5 Unit 01", "DEX", [ "Striker", "Driven" ], 4, 15, 6, 3, 50, 392109, 178, 159, 22, 1324, 659, 99, 1 ],
+    [ "Smoker, G-5 Navy HQ Vice Admiral", "DEX", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1257, 594, 44, 2738, 1430, 196, 1 ],
+    [ "Tashigi, G-5 Unit 01", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 109, 89, 60, 1061, 403, 230, 1 ],
+    [ "Tashigi, G-5 Navy HQ Captain ", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 998, 339, 185, 1990, 937, 479, 1 ],
+    [ "Maynard, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 120, 140, 34, 1172, 614, 153, 1 ],
+    [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1100, 549, 101, 2201, 1380, 303, 1 ],
+    [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 139, 123, 26, 1293, 594, 133, 1 ],
+    [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
+    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
+    [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 5, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 2244e51ef5a3a1909470a68cfea31bfc043db6d3 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 31 Aug 2016 01:49:15 -0500
Subject: [PATCH 0570/1569] bit more

---
 common/data/cooldowns.js |  4 ++--
 common/data/details.js   | 36 +++++++++++++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 610926cd6..6e501a97b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1227,8 +1227,8 @@ window.cooldowns = [
 	null,
 	null,
 	null,
-	22,
-	22,
+	22,//Sentomaru
+	22,//Sentomaru
 	19,
 	19,
 	23,
diff --git a/common/data/details.js b/common/data/details.js
index f1c3e35a3..3c6ba078d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6205,13 +6205,39 @@ window.details = {
 	},
     1229: {//Sentomaru
 		captain: "Boosts the ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
-		special: "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-        sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
+        special: [
+			{
+				"description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+				"cooldown": 11,
+			},
+			{
+				"description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+				"cooldown": 15,
+			},
+			{
+				"description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
+				"cooldown": 22, 
+			},
+		],
+		sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
 		specialName: "Leg-Locked Heave-Ho",
 	},
     1230: {//Sentomaru
 		captain: "Boosts the ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
-		special: "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
+        special: [
+			{
+				"description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+				"cooldown": 11,
+			},
+			{
+				"description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+				"cooldown": 15,
+			},
+			{
+				"description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
+				"cooldown": 22, 
+			},
+		],
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
 		specialName: "Leg-Locked Heave-Ho",
 	},
@@ -6274,11 +6300,11 @@ window.details = {
         specialName: "Yasakani no Magatama",
         special: [
 			{
-				"description": "For Shooter and Slasher characters, randomize all orbs. Deals 10 hits of small random typeless damage to random enemies.",
+				"description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
 				"cooldown": [ 6, 3 ],
 			},
 			{
-				"description": "For Shooter and Slasher characters, randomize all orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+				"description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
 				"cooldown": [ 12, 9 ],
 			},
 			{

From d663b0e699fa57ea6bfcf68141c2e948dee808b5 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 31 Aug 2016 12:27:59 -0500
Subject: [PATCH 0571/1569] Janky Captains

---
 common/data/captains.js | 57 +++++++++++++++++++++++++++++++++++++
 common/data/details.js  | 10 ++++---
 common/data/specials.js | 62 +++++++++++++++++++++++++++++++++++++++++
 common/data/units.js    | 12 ++++----
 damage/js/cruncher.js   |  5 +++-
 5 files changed, 135 insertions(+), 11 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index caf06345d..0b4ce4153 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3150,4 +3150,61 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
+    1229: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
+    },
+    1230: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.75 : p.unit.class.has("Powerhouse") ? 2.5 : 1; }  
+    },
+    1231: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.1875 : 1.75) : 1; },
+        rcv: function(p) { return .5 }
+    },
+    1232: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.925 : 2.25) : 1; },
+        rcv: function(p) { return .5 }
+    },
+    1233: {
+		atk: function(p) {
+			return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.25 :
+				p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 :
+				1;
+		},
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; }
+	},
+    1234: {
+		atk: function(p) {
+			return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.56 :
+				p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.6 :
+				1;
+		},
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1; }
+	},
+    1235: {
+		atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+	},
+    1236: {
+		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+	},
+    1237: {
+		hit: function(n) {
+			return n > 15 ? 2 : 1;
+		}
+	},
+    1238: {
+		hit: function(n) {
+			return n > 30 ? 3 :
+				n > 15 ? 2 : 1;
+		}
+	},
+    1239: {
+        atk: function(p){ 
+            return window.specials[1239].turnedOn || window.specials[1240].turnedOn ? 3 : 2; },
+        rcv: function(p) { return 1.3 }
+    },
+    1240: {
+        atk: function(p){ 
+            return window.specials[1239].turnedOn || window.specials[1240].turnedOn ? 3 : 2; },
+        rcv: function(p) { return 1.3 }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 3c6ba078d..01ca16d0f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6242,21 +6242,22 @@ window.details = {
 		specialName: "Leg-Locked Heave-Ho",
 	},
     1231: {//Smoker
-		captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces their RCV by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.25x",
+		captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.25x",
 		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
 		specialName: "Armed - White Launcher",
         sailor: "Boosts ATK of Striker characters by 50",
 	},
     1232: {//Smoker
-		captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces their RCV by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
+		captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
 		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
-        specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
+        specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
 		specialName: "Armed - White Launcher",
         sailor: "Boosts ATK of Striker characters by 50",
 	},
     1233: {//Tashigi
 		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
+        captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.25x ATK",
 		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by a large amount for 2 turns",
         specialNotes: "'Color Affinity' is a new mechanic and must be explored",
 		specialName: "Cutting Drizzle",
@@ -6264,6 +6265,7 @@ window.details = {
 	},
     1234: {//Tashigi
 		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
+        captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.56x ATK",
 		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by a large amount for 2 turns",
         specialNotes: "'Color Affinity' is a new mechanic and must be explored",
 		specialName: "Cutting Drizzle",
@@ -6309,7 +6311,7 @@ window.details = {
 			},
 			{
 				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
-				"cooldown": [ 20, 17 ],
+				"cooldown": [ 20, 17 ], 
 			},
 		],    
 		specialNotes: "#{randomHits : 10}",
diff --git a/common/data/specials.js b/common/data/specials.js
index cb8676623..bb0113b1c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1548,4 +1548,66 @@ window.specials = {
 			});
 		}
 	},
+    1231: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1231].turnedOn = true;
+			p.scope.notify({
+				text: 'Only affects damage if Smoker is your captain',
+				name: '1231warning'
+			});
+		},
+        onDeactivation: function(p) {
+            window.specials[1231].turnedOn = false;
+        }
+    },
+    1232: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1232].turnedOn = true;
+			p.scope.notify({
+				text: 'Only affects damage if Smoker is your captain',
+				name: '1232warning'
+			});
+		},
+        onDeactivation: function(p) {
+            window.specials[1232].turnedOn = false;
+        }
+    },
+    1233: {//Tashigi
+        //TODO
+        affinity: function(p){ return 1.5; },
+        type: "color affinity"
+    },
+    1234: {//Tashigi
+         //TODO
+        affinity: function(p){ return 1.5; },
+        type: "color affinity"
+    },
+    1239: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1239].turnedOn = true;
+			p.scope.notify({
+				text: 'Only affects damage if Kizaru is your captain',
+				name: '1239warning'
+			});
+		},
+        onDeactivation: function(p) {
+            window.specials[1239].turnedOn = false;
+        }
+    },
+    1240: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1240].turnedOn = true;
+			p.scope.notify({
+				text: 'Only affects damage if Kizaru is your captain',
+				name: '1240warning'
+			});
+		},
+        onDeactivation: function(p) {
+            window.specials[1240].turnedOn = false;
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 04d4f4cbd..442d6c1f8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1221,12 +1221,12 @@ window.units = [
     [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1011, 744, 52, 1990, 1483, 170, 1 ],
 	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, 392109, 266, 119, 9, 1306, 548, 47, 1 ],
     [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, 3000000, 1241, 482, 31, 2802, 1171, 90, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Story Unit", "INT", [ "Slasher", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Story Unit", "STR", [ "Slasher", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Story Mode Hina", "INT", [ "Fighter", "Cerebral" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Story Mode Smoker", "PSY", [ "Striker", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Story Mode Mihawk", "QCK", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Story Mode Kizaru", "DEX", [ "Shooter", "Fighter" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Sentomaru, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 4, 15, 6, 3, 50, 392109, 251, 96, 30, 1603, 442, 140, 1 ],
     [ "Sentomaru of the Axe, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1524, 376, 90, 3205, 1006, 362, 1 ],
     [ "Smoker, G-5 Unit 01", "DEX", [ "Striker", "Driven" ], 4, 15, 6, 3, 50, 392109, 178, 159, 22, 1324, 659, 99, 1 ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index bfdb0d35a..f131022d0 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -192,6 +192,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (enabledEffects[i].hasOwnProperty('atk'))
                 result = applyCaptainEffectsToDamage(result,enabledEffects[i].atk,null,false,enabledEffects[i].sourceSlot);
         }
+        
         // if the user has specified a custom order, sort by that
         if ($scope.tdata.orderOverride.hasOwnProperty(type)) {
             var order = $scope.tdata.orderOverride[type];
@@ -586,7 +587,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
      * The function should return true if there's a conflict between specials
      */
     var computeSpecialsCombinations = function() {
-        var result = { type: [ ], class: [ ], orb: [ ], condition: [ ] };
+        var result = { type: [ ], class: [ ], orb: [ ], affinity: [ ], condition: [ ] };
         chainSpecials = [ ];
         chainAddition = [ ];
         staticMultiplier = [ ];
@@ -597,6 +598,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 result[data.type].push({ sourceSlot: data.sourceSlot, f: (data.atk || data.atkStatic), s: data.hasOwnProperty('atkStatic') });
             if (data.hasOwnProperty('orb'))
                 result.orb.push({ sourceSlot: data.sourceSlot, f: data.orb });
+            if (data.hasOwnProperty('affinity'))
+                result.affinity.push({ sourceSlot: data.sourceSlot, f: data.affinity });
             if (data.hasOwnProperty('chain'))
                 chainSpecials.push({ sourceSlot: data.sourceSlot, chain: data.chain, chainLimiter: data.chainLimiter || function() { return Infinity; } });
             if (data.hasOwnProperty('chainAddition'))

From 3c404b0c1be59dad43522d0a78c208b967a8597c Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 31 Aug 2016 12:49:55 -0500
Subject: [PATCH 0572/1569] turn off tashigi

---
 common/data/specials.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index bb0113b1c..2c697bcff 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1573,17 +1573,17 @@ window.specials = {
         onDeactivation: function(p) {
             window.specials[1232].turnedOn = false;
         }
-    },
+    }, /*
     1233: {//Tashigi
         //TODO
         affinity: function(p){ return 1.5; },
-        type: "color affinity"
+        type: "affinity",
     },
     1234: {//Tashigi
          //TODO
         affinity: function(p){ return 1.5; },
-        type: "color affinity"
-    },
+        type: "affinity",
+    },*/
     1239: {
         turnedOn: false,
         onActivation: function(p) {

From c20cc6b6df2323f79306a7171e15b1af11399603 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 31 Aug 2016 14:06:03 -0500
Subject: [PATCH 0573/1569] Tashigi Special

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 01ca16d0f..7e0c13deb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6258,16 +6258,16 @@ window.details = {
     1233: {//Tashigi
 		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.25x ATK",
-		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by a large amount for 2 turns",
-        specialNotes: "'Color Affinity' is a new mechanic and must be explored",
+		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
+        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
 		specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
 	},
     1234: {//Tashigi
 		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.56x ATK",
-		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by a large amount for 2 turns",
-        specialNotes: "'Color Affinity' is a new mechanic and must be explored",
+		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
+        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
 		specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
 	},

From 5b3293887bdd7f11098920d45bc5e27a0e03fc4e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 1 Sep 2016 10:41:06 -0500
Subject: [PATCH 0574/1569] Story Units Complete

still need caps/specials for calc
---
 characters/index.html    |  2 ++
 common/data/aliases.js   | 28 ++++++++++++++--------------
 common/data/cooldowns.js | 12 ++++++------
 common/data/details.js   | 34 ++++++++++++++++++++++++++++++++--
 common/data/drops.js     | 27 +++++++++++++++++++++++----
 common/data/families.js  | 12 ++++++------
 common/data/flags.js     |  2 ++
 common/data/gw.js        | 12 ++++++------
 common/data/ships.js     | 16 ++++++++++++++--
 common/data/units.js     | 12 ++++++------
 damage/index.html        |  2 ++
 drops/index.html         |  2 ++
 index.html               |  9 ++++-----
 mats/index.html          |  2 ++
 probability/index.html   |  2 ++
 slots/index.html         |  2 ++
 16 files changed, 125 insertions(+), 51 deletions(-)

diff --git a/characters/index.html b/characters/index.html
index 2f80f6845..3c5a6e1a2 100644
--- a/characters/index.html
+++ b/characters/index.html
@@ -5,6 +5,8 @@
 
         <meta charset="utf-8">
         <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>
 
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 93bff3365..b653ae00e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1211,8 +1211,8 @@ window.aliases = {
     1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp'],
 	1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky'],
     1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky'],
-	1213: ['','','Summertime Baby 5','Swimsuit Baby 5'],
-    1214: ['','','Summertime Baby 5','Swimsuit Baby 5'],
+	1213: ['ベビー５ ドルフィンフロート','','Summertime Baby 5','Swimsuit Baby 5'],
+    1214: ['ベビー５ ドルフィンライダー','','Summertime Baby 5','Swimsuit Baby 5'],
     1215: ['ガイラム ワールド海賊団','',''],
     1216: ['セバスチャン ワールド海賊団','',''],
     1217: ['ナイチン ワールド海賊団','',''],
@@ -1227,16 +1227,16 @@ window.aliases = {
     1226: ['','',''],
     1227: ['','',''],
     1228: ['','',''],
-    1229: ['','','Sentoumaru'],
-    1230: ['','','Sentoumaru'],
-    1231: ['','',''],
-    1232: ['','',''],
-    1233: ['','',''],
-    1234: ['','',''],
-    1235: ['','',''],
-    1236: ['','',''],
-    1237: ['','',''],
-    1238: ['','',''],
-    1239: ['','','Kizaru'],
-    1240: ['','','Kizaru'],
+    1229: ['戦桃丸 海軍本部将校','','Sentoumaru'],
+    1230: ['鉞の戦桃丸 海軍本部将校','','Sentoumaru'],
+    1231: ['スモーカー 海軍ＧＬ第５支部','',''],
+    1232: ['スモーカー 海軍ＧＬ第５支部「Ｇ‐５」中将','',''],
+    1233: ['たしぎ 海軍ＧＬ第５支部','',''],
+    1234: ['たしぎ 海軍ＧＬ第５支部「Ｇ‐５」大佐','',''],
+    1235: ['メイナード 海軍本部中将','',''],
+    1236: ['追撃のメイナード 海軍本部中将','',''],
+    1237: ['バスティーユ 海軍本部中将','',''],
+    1238: ['鮫切りバスティーユ 海軍本部中将','',''],
+    1239: ['黄猿 海軍本部最高戦力','','Kizaru'],
+    1240: ['ボルサリーノ','','Kizaru'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6e501a97b..2fe12fd66 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1221,12 +1221,12 @@ window.cooldowns = [
 	null,//byrnndi world
 	[ 29, 16 ],
 	[ 29, 16 ],
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
+	20,
+	15,
+	16,
+	17,
+	23,
+	22,
 	22,//Sentomaru
 	22,//Sentomaru
 	19,
diff --git a/common/data/details.js b/common/data/details.js
index 7e0c13deb..c958a2e51 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6203,6 +6203,36 @@ window.details = {
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
 		specialName: "Blood of the Devil Warrior",
 	},
+    1223: { // Story Bastille
+        captain: "Boosts the ATK of [INT] characters by 2x",
+        special: "Deals 25x character's ATK in [INT] damage to all enemies",
+        specialName: "Shark Knife - Flash",
+    },
+    1224: { // Story Yamakaji
+        captain: "Boosts the ATK of Slasher characters by 2x",
+        special: "Reduces damage received by 60% for 1 turn",
+        specialName: "Appreciation For The Great Men",
+    },
+    1225: { // Story Hina
+        captain: "Boosts the ATK and RCV of [INT] characters by 1.5x",
+        special: "Delays all enemies for 1 turn, and locks all orbs for 1 turn",
+        specialName: "Binding Iron Tablet",
+    },
+    1226: { // Story Smoker
+        captain: "Boosts the ATK of Driven characters by 2x",
+        special: "Cuts the current HP of one enemy by 10% and changes own orb into [PSY]",
+        specialName: "Seastone Truncheon",
+    },
+    1227: { //Story Mihawk
+        captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight. Boosts the ATK of Slasher characters by 2.25x",
+        special: "Deals 100,000 fixed damage to one enemy, and boosts own ATK by 1.75x for 1 turn ",
+        specialName: "Black Blade - Slashing Burial Drop",
+    },
+    1228: { // Story Kizaru
+        captain: "Boosts the ATK of Shooter characters by 2.5x",
+        special: "For Shooter characters, changes [BLOCK] orbs into Matching, and deals large [DEX] damage to all enemies",
+        specialName: "The Cave of the Sun Goddess",
+    },
     1229: {//Sentomaru
 		captain: "Boosts the ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
         special: [
@@ -6321,11 +6351,11 @@ window.details = {
         specialName: "Yasakani no Magatama",
         special: [
 			{
-				"description": "For Shooter and Slasher characters, randomize all orbs. Deals 10 hits of small random typeless damage to random enemies.",
+				"description": "For Shooter and Slasher characters,randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
 				"cooldown": [ 6, 3 ],
 			},
 			{
-				"description": "For Shooter and Slasher characters, randomize all orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+				"description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
 				"cooldown": [ 12, 9 ],
 			},
 			{
diff --git a/common/data/drops.js b/common/data/drops.js
index d17749edd..5d800efb6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -521,6 +521,25 @@ window.drops = {
 			"16": [ 1158 ],
         },
         
+        {
+            name: "Marineford",
+            shortName: "Marineford",
+            thumb: 1228,
+            completion: '5x Rainbow Gems',
+            "01": [  ],
+            "02": [ 1223 ],
+            "03": [  ],
+            "04": [  ],
+            "05": [ 1224 ],
+            "06": [ 1225 ],
+            "07": [  ],
+            "08": [ 815 ],
+            "09": [ 1226 ],
+			"10": [  ],
+			"11": [ 1227 ],
+			"12": [ 1228 ]
+        },
+        
     ],
 
     'Weekly Island': [
@@ -1237,6 +1256,7 @@ window.drops = {
         {
             name: 'Clash!! Tyrant Kuma',
             thumb: 836,
+            global: true,
             Master: [ 835 ],
             Expert: [ 835 ]
         },
@@ -1308,7 +1328,7 @@ window.drops = {
             thumb: 893,
             challenge:'Total number of hits above 50,000',
             challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Anti-Bind Forbidden Tome, 2x Rainbow Gems']],
-            'Master': [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -15, -8 ]
+            "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -15, -8 ]
         },
 
         {
@@ -1317,15 +1337,14 @@ window.drops = {
             global: true,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['10 Times','Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems']],
-            Expert: [ 659, 680, 682, 684, 1200, 1198 ],
+            "All Difficulties": [ 659, 680, 682, 684, 1200, 1198 ],
 			"Completion Units": [686]
         },
         
         {
             name: '2nd Anniversary Celebration! Duel! Ace',
             thumb: 1023,
-            Expert: [ 1023 ],
-            Master: [ 1023 ]
+            "All Difficulties": [ 1023 ]
         },
 
         {
diff --git a/common/data/families.js b/common/data/families.js
index 981aa1629..fc1974b6f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1221,12 +1221,12 @@ window.families = [
     "Byrnndi World",
     "Little Oars Jr.",
 	"Little Oars Jr.",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Bastille",
+    "Yamakaji",
+    "Hina",
+    "Smoker",
+    "Dracule Mihawk",
+    "Kizaru",
     "Sentomaru",
     "Sentomaru",
 	"Smoker",
diff --git a/common/data/flags.js b/common/data/flags.js
index 7cc67cc91..f7fc507ef 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -809,6 +809,8 @@ window.flags = {
     827: { global: 1 },
     828: { rr: 1, rro: 1, lrr: 1 },
 	829: { rr: 1, rro: 1, lrr: 1 },
+    835: { global: 1 },
+    836: { global: 1 },
 	837: { rr: 1, rro: 1, global: 1 },
 	838: { rr: 1, rro: 1, global: 1 },
 	839: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index 2521b54b6..799f9e79a 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1221,12 +1221,12 @@ window.gw=[
     36721,
     36720,
     36720,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    37233,
+    37237,
+    37194,
+    37195,
+    37196,
+    37154,
     37079,
     37079,
     37122,
diff --git a/common/data/ships.js b/common/data/ships.js
index 6189ac828..d98749387 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -237,12 +237,24 @@ window.ships = [
         }
     },
     
-    {
+    { // 19
         name: "Doflamingo Ship",
         thumb: null,
         description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Special: Makes Perfects easier to Hit, Adds 0.2 to Chain  (cooldown: 15 Turns)',
         atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
         hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
-    }
+    },
+    
+    { // 20
+        name: 'The Rocket Man',
+        thumb: null,
+        description: 'Boosts ATK and Powerhouse characters by 1.55x, and heals at the end of every turn for a variable amount depending on the number of Powerhouse characters on the team. (At MAX, heals 900 per turn with 6 Powerhouse characters) Sharply reduces HP of non-Powerhouse units. Special: Deals 99,999 typeless damage to one unit.  (cooldown MAX: 17 Turns)',
+        atk: function(p) {
+            return !p.unit.class.has('Powerhouse') ? 1 : [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.4, 1.55 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return p.unit.class.has('Powerhouse') ? 1 : 0.01;
+        },
+    },
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 442d6c1f8..39134fa02 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1221,12 +1221,12 @@ window.units = [
     [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1011, 744, 52, 1990, 1483, 170, 1 ],
 	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, 392109, 266, 119, 9, 1306, 548, 47, 1 ],
     [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, 3000000, 1241, 482, 31, 2802, 1171, 90, 1 ],
-    [ "New Story Unit", "INT", [ "Slasher", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Story Unit", "STR", [ "Slasher", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Story Mode Hina", "INT", [ "Fighter", "Cerebral" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Story Mode Smoker", "PSY", [ "Striker", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Story Mode Mihawk", "QCK", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Story Mode Kizaru", "DEX", [ "Shooter", "Fighter" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bastille of Marineford", "INT", [ "Slasher", "Driven" ], 3, 15, 4, 2, 70, null, 265, 169, 1, null, null, null, null ],
+    [ "Yamakaji", "STR", [ "Slasher", "Driven" ], 3, 15, 5, 2, 70, null, 340, 128, 24, null, null, null, null ],
+    [ "Hina, of Marineford", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, null, 205, 105, 61, null, null, null, null ],
+    [ "Smoker, of Marineford", "PSY", [ "Striker", "Driven" ], 3, 15, 6, 2, 70, null, 241, 160, 33, null, null, null, null ],
+    [ "Mihawk, of Marineford", "QCK", "Slasher", 4, 30, 4, 3, 99, null, 167, 124, 6, 2119, 1390, 132, null ],
+    [ "Kizaru, of Marineford", "DEX", [ "Shooter", "Fighter" ], 4, 30, 4, 3, 99, null, 166, 109, 50, null, null, null, null ],
     [ "Sentomaru, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 4, 15, 6, 3, 50, 392109, 251, 96, 30, 1603, 442, 140, 1 ],
     [ "Sentomaru of the Axe, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1524, 376, 90, 3205, 1006, 362, 1 ],
     [ "Smoker, G-5 Unit 01", "DEX", [ "Striker", "Driven" ], 4, 15, 6, 3, 50, 392109, 178, 159, 22, 1324, 659, 99, 1 ],
diff --git a/damage/index.html b/damage/index.html
index 46a38aa49..de22de00b 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -6,6 +6,8 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=yes, user-scalable=1">
         <meta name="description" itemprop="description" content="One Piece Treasure Cruise Damage Calculator">
+        <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 Damage Calculator</title>
 
diff --git a/drops/index.html b/drops/index.html
index 567ef80cf..327446b4c 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -6,6 +6,8 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=no, user-scalable=0">
         <meta name="description" itemprop="description" content="One Piece Treasure Cruise Drop 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 Drop Table</title>
 
diff --git a/index.html b/index.html
index 9371e842f..1b3b6a852 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@
         <script src="common/js/nonSuspicious.js"></script>
         <meta name="viewport" content="initial-scale=1, user-scalable=no, user-scalable=0">
         <meta name="author" content="Zeenigami and Mondfischer">
-        <meta name="keywords" content="OPTC, One Piece Treasure Cruise, Database, Calculator, Guides, Help">
+        <meta name="keywords" content="OPTC, One Piece Treasure Cruise, Database, Calculator, Guides, Help, Walkthroughs, Tutorials">
         <meta name="description" content="Fan run database for One Piece Treasure Cruise. Includes a character database with all unit captain abilities, descriptions, sailor abilities, and special abilities. Also includes a damage calculator that accurately helps you find out how much damage your team will deal.">
 
 <!-- Google Analytics -->
@@ -62,18 +62,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>30/08/2016</p>
+            <p>1/09/2016</p>
             <br>
             <ul>
+                <li>Marineford Story Units Added</li>
+                <br>
                 <li>Previews for Kizaru</li>
                 <li>Sugofest Updated</li>
                 <br>
                 <li>World Pirates Added</li>
                 <li>Drops page updated</li>
                 <br>
-                <li>Ability to search for more terms such as</li>
-                <li>"Summertime", "Raid", "Colosseum", etc</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>
diff --git a/mats/index.html b/mats/index.html
index df35c1fd9..f3bbe9695 100644
--- a/mats/index.html
+++ b/mats/index.html
@@ -6,6 +6,8 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=no, user-scalable=0">
         <meta name="description" itemprop="description" content="One Piece Treasure Cruise Evolution Helper">
+        <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 Evolution Helper</title>
 
diff --git a/probability/index.html b/probability/index.html
index af492fad8..67a39c4b6 100644
--- a/probability/index.html
+++ b/probability/index.html
@@ -6,6 +6,8 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=yes, user-scalable=1">
         <meta name="description" itemprop="description" content="One Piece Treasure Cruise Probability Calculator">
+        <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 Probability Calculator</title>
 
diff --git a/slots/index.html b/slots/index.html
index c06e6f29f..c4c8e954b 100644
--- a/slots/index.html
+++ b/slots/index.html
@@ -6,6 +6,8 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=600, height=650, initial-scale=0.6, user-scalable=yes, user-scalable=1">
         <meta name="description" itemprop="description" content="One Piece Treasure Cruise Slot Planner">
+        <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 Slot Planner</title>
 

From 503d149a7b6d49230142ebf0b031871d8b6ef703 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 2 Sep 2016 16:06:07 -0500
Subject: [PATCH 0575/1569] Units + WB Ship

---
 common/data/cooldowns.js | 16 ++++++++--------
 common/data/details.js   |  8 ++++----
 common/data/ships.js     | 12 ++++++++++++
 common/data/units.js     |  2 +-
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 2fe12fd66..f912e4c04 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1032,8 +1032,8 @@ window.cooldowns = [
 	23,
 	[ 11, 5 ],
 	[ 11, 5 ],
-	23,
-	23,
+	[ 23, 18 ],
+	[ 23, 18 ],
     [ 23, 15 ],
     [ 23, 15 ],
     [ 11, 3 ],
@@ -1120,8 +1120,8 @@ window.cooldowns = [
 	[ 23, 16 ],
 	[ 23, 17 ],
 	[ 23, 17 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
+	[ 20, 15 ],
+	[ 20, 15 ],
 	[ 20, 14 ],
 	[ 20, 14 ],
 	[ 20, 14 ],
@@ -1189,8 +1189,8 @@ window.cooldowns = [
 	23,
 	11,
 	11,
-	19,
-	19,
+	[ 19, 13 ],
+	[ 19, 13 ],
     [ 15, 15 ],
     [ 15, 15 ],
 	29,
@@ -1221,7 +1221,7 @@ window.cooldowns = [
 	null,//byrnndi world
 	[ 29, 16 ],
 	[ 29, 16 ],
-	20,
+	[ 20, 10 ],
 	15,
 	16,
 	17,
@@ -1234,7 +1234,7 @@ window.cooldowns = [
 	23,
 	23,
 	20,
-	20,
+	[ 20, 13 ],
 	22,
 	22,
 	null,//Kizaru
diff --git a/common/data/details.js b/common/data/details.js
index c958a2e51..935bf4627 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5043,11 +5043,11 @@ window.details = {
         special: [
 			{
 				"description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
-				"cooldown": 18
+				"cooldown": [ 18, 13 ]
 			},
 			{
 				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
-				"cooldown": 25
+				"cooldown": [ 25, 20 ]
 			}
 		],
 		specialNotes: "#{stages}"
@@ -5058,11 +5058,11 @@ window.details = {
         special: [
 			{
 				"description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
-				"cooldown": 18
+				"cooldown": [ 18, 13 ]
 			},
 			{
 				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
-				"cooldown": 25
+				"cooldown": [ 25, 20 ]
 			}
 		],
 		specialNotes: "#{stages}"
diff --git a/common/data/ships.js b/common/data/ships.js
index d98749387..77f62220e 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -256,5 +256,17 @@ window.ships = [
             return p.unit.class.has('Powerhouse') ? 1 : 0.01;
         },
     },
+    
+    { // 21
+        name: 'Burning WB Ship',
+        thumb: null,
+        description: 'Boosts ATK by 1.5x, and HP by 1.4x. Take damage at the end of each turn. Special: Cuts the current HP of all enemies by 20%.  (cooldown MAX: ?? Turns)',
+        atk: function(p) {
+            return 1.5;
+        },
+        hp: function(p) {
+            return 1.4;
+        },
+    },
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 39134fa02..d5bdde6bf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1226,7 +1226,7 @@ window.units = [
     [ "Hina, of Marineford", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, null, 205, 105, 61, null, null, null, null ],
     [ "Smoker, of Marineford", "PSY", [ "Striker", "Driven" ], 3, 15, 6, 2, 70, null, 241, 160, 33, null, null, null, null ],
     [ "Mihawk, of Marineford", "QCK", "Slasher", 4, 30, 4, 3, 99, null, 167, 124, 6, 2119, 1390, 132, null ],
-    [ "Kizaru, of Marineford", "DEX", [ "Shooter", "Fighter" ], 4, 30, 4, 3, 99, null, 166, 109, 50, null, null, null, null ],
+    [ "Kizaru, of Marineford", "DEX", [ "Shooter", "Fighter" ], 4, 30, 4, 3, 99, null, 166, 109, 50, 2084, 1252, 209, null ],
     [ "Sentomaru, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 4, 15, 6, 3, 50, 392109, 251, 96, 30, 1603, 442, 140, 1 ],
     [ "Sentomaru of the Axe, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1524, 376, 90, 3205, 1006, 362, 1 ],
     [ "Smoker, G-5 Unit 01", "DEX", [ "Striker", "Driven" ], 4, 15, 6, 3, 50, 392109, 178, 159, 22, 1324, 659, 99, 1 ],

From 99a60ea102a06bf9a04914e2fc7f031d41ce9999 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 5 Sep 2016 21:55:18 -0500
Subject: [PATCH 0576/1569] Ace and Revolutionary Army Fortnight

---
 common/data/aliases.js    | 20 ++++++++++----------
 common/data/details.js    |  6 +++---
 common/data/drops.js      | 36 +++++++++++++++++++++++++++++++++---
 common/data/evolutions.js | 30 +++++++++++++++++++++++++++---
 common/data/matchers.js   |  8 ++++----
 common/data/units.js      | 12 ++++++------
 index.html                |  7 +++----
 7 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b653ae00e..fe3a2342d 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1217,16 +1217,16 @@ window.aliases = {
     1216: ['セバスチャン ワールド海賊団','',''],
     1217: ['ナイチン ワールド海賊団','',''],
     1218: ['ボア・ハンコック アマゾン・リリー皇帝','',''],
-    1219: ['','',''],
-    1220: ['','',''],
-    1221: ['','',''],
-    1222: ['','',''],
-    1223: ['','',''],
-    1224: ['','',''],
-    1225: ['','',''],
-    1226: ['','',''],
-    1227: ['','',''],
-    1228: ['','',''],
+    1219: ['バーンディ・ワールド','',''],
+    1220: ['バーンディ・ワールド ワールド海賊団船長','',''],
+    1221: ['リトルオーズJr. 白ひげ海賊団傘下','',''],
+    1222: ['猛攻のリトルオーズJr. 白ひげ海賊団傘下','',''],
+    1223: ['バスティーユ','',''],
+    1224: ['ヤマカジ','',''],
+    1225: ['ヒナ 黒檻部隊','',''],
+    1226: ['スモーカー 海軍本部准将','',''],
+    1227: ['ジュラキュール・ミホーク 鷹の目','',''],
+    1228: ['黄猿 海軍本部大将','',''],
     1229: ['戦桃丸 海軍本部将校','','Sentoumaru'],
     1230: ['鉞の戦桃丸 海軍本部将校','','Sentoumaru'],
     1231: ['スモーカー 海軍ＧＬ第５支部','',''],
diff --git a/common/data/details.js b/common/data/details.js
index 935bf4627..3d96a63e0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5938,7 +5938,7 @@ window.details = {
     },
     1185: {
         captain: "Boosts ATK of Slasher and Cerebral units by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
-        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
 			{
 				"description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
@@ -5955,7 +5955,7 @@ window.details = {
     },
     1186: {
         captain: "Boosts ATK of Slasher and Cerebral units by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
-        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
 			{
 				"description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
@@ -6215,7 +6215,7 @@ window.details = {
     },
     1225: { // Story Hina
         captain: "Boosts the ATK and RCV of [INT] characters by 1.5x",
-        special: "Delays all enemies for 1 turn, and locks all orbs for 1 turn",
+        special: "Delays all enemies for 1 turn, and locks own orb for 1 turn",
         specialName: "Binding Iron Tablet",
     },
     1226: { // Story Smoker
diff --git a/common/data/drops.js b/common/data/drops.js
index 5d800efb6..093f23242 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -986,7 +986,8 @@ window.drops = {
             thumb: 808,
             global: true,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
-            "All Difficulties": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ]
+            "Japan": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ],
+            "Global": [ 807, 809, 811, -811, -645, -451, -631, -502, -11, -12, -9 ],
         },
 
         {
@@ -996,7 +997,8 @@ window.drops = {
             condition: 'You can only bring Impact and Free Spirit units. (No Evo/Boosters)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
-            "All Difficulties": [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ]
+            "Japan": [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ],
+            "Global": [ 847, 849, 850, -849, -750, -617, -616, -615, -578, -508, -455 ]
         },
 
         {
@@ -1137,6 +1139,13 @@ window.drops = {
             condition: "Total Crew Cost must be lower than 180 (Including friend captain)",
             "All Difficulties": [ 1215, 1216, 1217, 1218, -1025, -1029, -1033, -671, -956, -964, -633, -504, -1218 ]
         },
+        
+        {
+            name: "Revolutionary Armed Forces!",
+            thumb: null,
+            condition: "Free Spirit Characters have their cooldowns reduced by 10 turns at the start of the fight",
+            "All Difficulties": [  ]
+        },
 		
     ],
 
@@ -1353,7 +1362,28 @@ window.drops = {
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197 ],
             Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195 ]
-        }
+        },
+        
+        {
+            name: 'Rescue Ace Event - Akainu',
+            thumb: null,
+            challenge: "10, 20, 30 stamina difficulty. 30 Stamina has a chance of dropping the Universal Skill Book.",
+            "All Difficulties": [ -261, -562, -720, -748, -935 ]
+        },
+        
+        {
+            name: 'Rescue Ace Event - Aokiji',
+            thumb: null,
+            challenge: "10, 20, 30 stamina difficulty. 30 Stamina has a chance of dropping the Universal Skill Book.",
+            "All Difficulties": [ -416, -459, -530, -669, -578 ]
+        },
+        
+        {
+            name: 'Rescue Ace Event - Kizaru',
+            thumb: null,
+            challenge: "10, 20, 30 stamina difficulty. 30 Stamina has a chance of dropping the Universal Skill Book.",
+            "All Difficulties": [ -367, -649, -718, -870, -1001 ]
+        },
 
    ]
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a6a6a99fd..5724beb44 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1845,14 +1845,38 @@ window.evolutions = {
 	},
     1213: {
 		evolution: 1214,
-		evolvers: [  ]
+		evolvers: [ 117, 78, 98, 95, 100 ]
 	},
     1219: {
 		evolution: 1220,
-		evolvers: [  ]
+		evolvers: [ 118, 88, 84, 304, 104 ]
 	},
     1221: {
 		evolution: 1222,
-		evolvers: [  ]
+		evolvers: [ 83, 84, 89, 95, 300 ]
 	},
+    1229: {
+        evolution: 1230,
+		evolvers: [ 98, 99, 300, 303, 304 ]
+    },
+    1231: {
+        evolution: 1232,
+		evolvers: [ 118, 83, 86, 302, 102 ]
+    },
+    1233: {
+        evolution: 1234,
+		evolvers: [ 118, 83, 85, 301, 101 ]
+    },
+    1235: {
+        evolution: 1236,
+		evolvers: [ 266, 94, 98, 303, 103 ]
+    },
+    1237: {
+        evolution: 1238,
+		evolvers: [ 84, 89, 94, 95, 100 ]
+    },
+    1239: {
+        evolution: 1240,
+		evolvers: [ 118, 266, 98, 303, 267 ]
+    },
 };
diff --git a/common/data/matchers.js b/common/data/matchers.js
index a8ec9a363..da92028c8 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -327,13 +327,13 @@ window.matchers = [
     {
         name: 'Bind reducers',
         target: 'special',
-        matcher: /(reduces|remove).+bind.+duration/i
+        matcher: /(reduces|removes).+bind.+duration/i
     },
 
     {
         name: 'Despair reducers',
         target: 'special',
-        matcher: /(reduces|remove).+despair.+duration/i
+        matcher: /(reduces|removes).+despair.+duration/i
     },
 
     {
@@ -345,7 +345,7 @@ window.matchers = [
     {
         name: 'Blindness removers',
         target: 'special',
-        matcher: /(reduces|remove) blindness/i
+        matcher: /(reduces|removes) blindness/i
     },
 
     {
@@ -387,7 +387,7 @@ window.matchers = [
 	{
 		name: 'Paralysis reducers',
         target: 'special',
-        matcher: /(reduces|remove).+Paralysis/i 
+        matcher: /(reduces|removes).+Paralysis/i 
 	},
     
     /* * * * * Sailor * * * * */
diff --git a/common/data/units.js b/common/data/units.js
index d5bdde6bf..0c2bab878 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1221,12 +1221,12 @@ window.units = [
     [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1011, 744, 52, 1990, 1483, 170, 1 ],
 	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, 392109, 266, 119, 9, 1306, 548, 47, 1 ],
     [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, 3000000, 1241, 482, 31, 2802, 1171, 90, 1 ],
-    [ "Bastille of Marineford", "INT", [ "Slasher", "Driven" ], 3, 15, 4, 2, 70, null, 265, 169, 1, null, null, null, null ],
-    [ "Yamakaji", "STR", [ "Slasher", "Driven" ], 3, 15, 5, 2, 70, null, 340, 128, 24, null, null, null, null ],
-    [ "Hina, of Marineford", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, null, 205, 105, 61, null, null, null, null ],
-    [ "Smoker, of Marineford", "PSY", [ "Striker", "Driven" ], 3, 15, 6, 2, 70, null, 241, 160, 33, null, null, null, null ],
-    [ "Mihawk, of Marineford", "QCK", "Slasher", 4, 30, 4, 3, 99, null, 167, 124, 6, 2119, 1390, 132, null ],
-    [ "Kizaru, of Marineford", "DEX", [ "Shooter", "Fighter" ], 4, 30, 4, 3, 99, null, 166, 109, 50, 2084, 1252, 209, null ],
+    [ "Bastille", "INT", [ "Slasher", "Driven" ], 3, 15, 4, 2, 70, 1066998, 265, 169, 1, 1725, 1102, 9, 1 ],
+    [ "Yamakaji", "STR", [ "Slasher", "Driven" ], 3, 15, 5, 2, 70, 1066998, 340, 128, 24, 1978, 800, 99, 1 ],
+    [ "Hina, Black Cage Corps", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 205, 105, 61, 1355, 707, 253, 1 ],
+    [ "Smoker, Navy Headquarters Commodore", "PSY", [ "Striker", "Driven" ], 3, 15, 6, 2, 70, 1066998, 241, 160, 33, 1552, 1032, 132, 1 ],
+    [ "Dracule Mihawk, Hawkeyes", "QCK", "Slasher", 4, 30, 4, 3, 99, 3000000, 167, 124, 6, 2119, 1390, 132, 1 ],
+    [ "Kizaru, Navy Headquarters Admiral", "DEX", [ "Shooter", "Fighter" ], 4, 30, 4, 3, 99, 3000000, 166, 109, 50, 2084, 1252, 209, 1 ],
     [ "Sentomaru, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 4, 15, 6, 3, 50, 392109, 251, 96, 30, 1603, 442, 140, 1 ],
     [ "Sentomaru of the Axe, Navy HQ Officer", "INT", [ "Striker", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1524, 376, 90, 3205, 1006, 362, 1 ],
     [ "Smoker, G-5 Unit 01", "DEX", [ "Striker", "Driven" ], 4, 15, 6, 3, 50, 392109, 178, 159, 22, 1324, 659, 99, 1 ],
diff --git a/index.html b/index.html
index 1b3b6a852..96219ea58 100644
--- a/index.html
+++ b/index.html
@@ -62,17 +62,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>1/09/2016</p>
+            <p>5/09/2016</p>
             <br>
             <ul>
+                <li>Rescue Ace Event Added</li>
+                <br>
                 <li>Marineford Story Units Added</li>
                 <br>
                 <li>Previews for Kizaru</li>
                 <li>Sugofest Updated</li>
                 <br>
-                <li>World Pirates Added</li>
-                <li>Drops page updated</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>

From f364f2671a749a20c0945d7c63c7c4f4d2938c57 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 6 Sep 2016 15:19:21 -0500
Subject: [PATCH 0577/1569] Revolutionary Army Units

---
 common/data/cooldowns.js  | 14 ++++++++----
 common/data/details.js    | 48 +++++++++++++++++++++++++++++++++++----
 common/data/drops.js      | 10 ++++----
 common/data/evolutions.js | 12 ++++++++++
 common/data/families.js   |  7 ++++++
 common/data/gw.js         |  7 ++++++
 common/data/matchers.js   |  8 +------
 common/data/ships.js      |  2 +-
 common/data/specials.js   |  4 ++--
 common/data/units.js      |  7 ++++++
 10 files changed, 96 insertions(+), 23 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f912e4c04..90ff4b50f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -953,7 +953,7 @@ window.cooldowns = [
 	[ 18, 10 ],
     [ 18, 10 ],
 	20,
-	16,
+	[ 16, 10 ],
 	[ 20, 14 ],
 	20,
 	[ 18, 10 ],
@@ -1028,8 +1028,8 @@ window.cooldowns = [
 	[ 11, 5 ],
 	[ 18, 12 ],
 	[ 18, 12 ],
-	23,
-	23,
+	[ 23, 15 ],
+	[ 23, 15 ],
 	[ 11, 5 ],
 	[ 11, 5 ],
 	[ 23, 18 ],
@@ -1239,5 +1239,11 @@ window.cooldowns = [
 	22,
 	null,//Kizaru
 	null,//Kizaru
-	
+	[ 19, 11 ],
+    [ 19, 11 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 23, 17 ],
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 3d96a63e0..d1833e74e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5070,13 +5070,13 @@ window.details = {
     1046: {
         captain: "Boosts ATK of Free Spirit Units by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1047: {
         captain: "Boosts ATK of Free Spirit Units by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For two turns every attacking character gets 55x Sabos ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
 	1048: {
@@ -6317,13 +6317,13 @@ window.details = {
 	},
     1237: {//Bastille
 		captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
-		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 3 turns.",
+		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
 		specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
 	},
     1238: {//Bastille
 		captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain and by 3x after the 30th hit",
-		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 3 turns.",
+		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
 		specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
 	},
@@ -6365,5 +6365,45 @@ window.details = {
 		],    
 		specialNotes: "#{randomHits : 10}",
     },
+    1241: {//Fortnight Koala
+        captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
+        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        specialName: "Fishman Karate, Midair Upwards Kick",
+    },
+    1242: {//Fortnight Koala
+        captain: "Boosts chain multiplier by 2x. Recovers 2x character's RCV in HP at the end of each turn",
+        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        specialName: "Fishman Karate, Midair Upwards Kick",
+    },
+    1243: {// Fortnight Hack
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
+        captainNotes: "Effect stacks, so Fighter/Powerhouse characters get 1.69x ATK",
+        special: "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT] and changes adjacent orbs into [G] orbs",
+        specialName:"Fishman karate, KO blow",
+        specialNotes: "#{gOrbs}"
+    },
+    1244: {// Fortnight Hack
+        captain: "Boosts ATK of Fighter characters by 1.75x and the ATK of Powerhouse characters by 1.3x",
+        captainNotes: "Effect stacks, so Fighter/Powerhouse characters get 2.275x ATK",
+        special: "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT] and changes adjacent orbs into [G] orbs",
+        specialName:"Fishman karate, KO blow",
+        specialNotes: "#{gOrbs}"
+    },
+    1245: {// Event Luffy
+        captain: "Boosts ATK of Fighter characters by 1.75x. If HP is below 10%, boosts ATK of Fighter characters by 3x instead.",
+        special: "Deals random [QCK] damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Light of a Firefly, Fire Daruma\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
+        specialName:"Gomu Gomu no Stamp Gatling",
+        specialNotes: "Light of a Firefly, Fire Daruma is Event Ace's special ability.",
+    },
+    1246: {// Event Ace
+        captain: "Unknown",
+        special: "Unknown",
+        specialName:"Light of a Firefly, Fire Daruma",
+    },
+    1247: {// Event Ace
+        captain: "Unknown",
+        special: "Unknown",
+        specialName:"Light of a Firefly, Fire Daruma",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 093f23242..0d825c29a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1142,9 +1142,9 @@ window.drops = {
         
         {
             name: "Revolutionary Armed Forces!",
-            thumb: null,
+            thumb: 1242,
             condition: "Free Spirit Characters have their cooldowns reduced by 10 turns at the start of the fight",
-            "All Difficulties": [  ]
+            "All Difficulties": [ 1241, 1243, -1035, -965, -1031, -1081, -754, -966, -502, -707, -955 ]
         },
 		
     ],
@@ -1359,9 +1359,9 @@ window.drops = {
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 5724beb44..fea984623 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1879,4 +1879,16 @@ window.evolutions = {
         evolution: 1240,
 		evolvers: [ 118, 266, 98, 303, 267 ]
     },
+    1241: {
+        evolution: 1242,
+		evolvers: [  ]
+    },
+    1243: {
+        evolution: 1244,
+		evolvers: [  ]
+    },
+    1246: {
+        evolution: 1247,
+		evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index fc1974b6f..bababe0d8 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1239,4 +1239,11 @@ window.families = [
     "Bastille",
     "Kizaru",
     "Kizaru",
+    "Koala",
+    "Koala",
+    "Hack",
+    "Hack",
+    "Monkey D. Luffy",
+    "Portgas D. Ace",
+	"Portgas D. Ace",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 799f9e79a..ae391d46f 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1239,4 +1239,11 @@ window.gw=[
     37052,
     37125,
     37125,
+    37427,
+    37427,
+    37426,
+    37426,
+    37431,
+    37432,
+    37432,
 ];
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index da92028c8..2ea40468f 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -209,12 +209,6 @@ window.matchers = [
     	matcher: /(Changes[^,]+all orbs|Changes the orbs in|Changes[^,]*every other orb)/i
     },
 
-    {
-        name: 'Orb Matcher',
-        target: 'special',
-        matcher: /(Changes.+(orb|orbs)).+Matching/i
-    },
-
     {
         name: 'Self-orb controllers',
         target: 'special',
@@ -234,7 +228,7 @@ window.matchers = [
     },
     
     {
-        name: 'Orb matcher',
+        name: 'Orb matchers',
         target: 'special',
         matcher: /(Changes.+(orb|orbs))[^,]+Matching/i,
         include: [ 1036, 1037 ]
diff --git a/common/data/ships.js b/common/data/ships.js
index 77f62220e..482845ff9 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -260,7 +260,7 @@ window.ships = [
     { // 21
         name: 'Burning WB Ship',
         thumb: null,
-        description: 'Boosts ATK by 1.5x, and HP by 1.4x. Take damage at the end of each turn. Special: Cuts the current HP of all enemies by 20%.  (cooldown MAX: ?? Turns)',
+        description: 'Boosts ATK by 1.5x, and HP by 1.4x. Take 5% current HP damage at the end of each turn. Special: Cuts the current HP of all enemies by 20%.  (cooldown MAX: 18 Turns)',
         atk: function(p) {
             return 1.5;
         },
diff --git a/common/data/specials.js b/common/data/specials.js
index 2c697bcff..4d2244531 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1351,11 +1351,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
     },
     1088: {
-        atk: function(p) { return p.unit.class.has("Slasher" || "Driven") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher" || p.unit.class.has("Driven")) ? 1.5 : 1},
         type: "class"
     },
     1089: {
-        atk: function(p) { return p.unit.class.has("Slasher" || "Driven") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher" || p.unit.class.has("Driven")) ? 1.5 : 1},
         type: "class"
     },
     1096: {
diff --git a/common/data/units.js b/common/data/units.js
index 0c2bab878..83d31e238 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1239,6 +1239,13 @@ window.units = [
     [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
     [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
     [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 5, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
+    [ "Koala, Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 3, 12, 4, 1, 50, null, 33, 40, 49, 764, 543, 196, null ],
+    [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, null, 700, 481, 137, 1426, 1190, 357, null ],
+    [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, null, null, null, null, 904, 570, 91, null ],
+    [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, null, 849, 523, 51, null, null, null, null ],
+    [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 4, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, null ],
+    [ "Ace, At Marineford", "STR", [ "Fighter", "Shooter" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ace, At Marineford Evolved", "STR", [ "Fighter", "Shooter" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 50a6494abef45d957d2fdfcc19573e2cecb6785e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 7 Sep 2016 09:11:14 -0500
Subject: [PATCH 0578/1569] Units updated

still need captains/specials
---
 common/data/aliases.js    |  7 +++++++
 common/data/evolutions.js |  4 ++--
 common/data/flags.js      | 16 ++++++++--------
 common/data/matchers.js   |  6 ++++++
 common/data/units.js      | 12 ++++++------
 index.html                |  2 +-
 6 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index fe3a2342d..d8ca644e6 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1239,4 +1239,11 @@ window.aliases = {
     1238: ['鮫切りバスティーユ 海軍本部中将','',''],
     1239: ['黄猿 海軍本部最高戦力','','Kizaru'],
     1240: ['ボルサリーノ','','Kizaru'],
+    1241: ['コアラ 魚人空手師範代','',''],
+    1242: ['コアラ 革命軍・魚人空手師範代','',''],
+    1243: ['ハック 魚人空手師範','',''],
+    1244: ['ハック 革命軍・魚人空手師範','',''],
+    1245: ['','',''],
+    1246: ['','',''],
+    1247: ['','',''],
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index fea984623..115f4c96d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1881,11 +1881,11 @@ window.evolutions = {
     },
     1241: {
         evolution: 1242,
-		evolvers: [  ]
+		evolvers: [ 116, 117, 78, 84, 100 ]
     },
     1243: {
         evolution: 1244,
-		evolvers: [  ]
+		evolvers: [ 116, 117, 93, 99, 104 ]
     },
     1246: {
         evolution: 1247,
diff --git a/common/data/flags.js b/common/data/flags.js
index f7fc507ef..0a1ade5d1 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -867,14 +867,14 @@ window.flags = {
     922: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	934: { rr: 1, rro: 1 },
 	935: { rr: 1, rro: 1 },
-	936: { rr: 1, rro: 1 },
-	937: { rr: 1, rro: 1 },
-	938: { rr: 1, rro: 1 },
-	939: { rr: 1, rro: 1 },
-	940: { rr: 1, rro: 1 },
-	941: { rr: 1, rro: 1 },
-	942: { rr: 1, rro: 1 },
-	943: { rr: 1, rro: 1 },
+	936: { rr: 1, rro: 1, global: 1 },
+	937: { rr: 1, rro: 1, global: 1 },
+	938: { rr: 1, rro: 1, global: 1 },
+	939: { rr: 1, rro: 1, global: 1 },
+	940: { rr: 1, rro: 1, global: 1 },
+	941: { rr: 1, rro: 1, global: 1 },
+	942: { rr: 1, rro: 1, global: 1 },
+	943: { rr: 1, rro: 1, global: 1 },
 	944: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	945: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	975: { rr: 1, rro: 1, lrr: 1 },
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 2ea40468f..7dbab4954 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -329,6 +329,12 @@ window.matchers = [
         target: 'special',
         matcher: /(reduces|removes).+despair.+duration/i
     },
+    
+    {
+        name: 'Silence reducers',
+        target: 'special',
+        matcher: /(reduces|removes).+silence.+duration/i
+    },
 
     {
         name: 'Block orb removers',
diff --git a/common/data/units.js b/common/data/units.js
index 83d31e238..2fbdd1b08 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1189,7 +1189,7 @@ window.units = [
     [ "Atmos, The Water Buffalo", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1159, 440, 41, 3552, 1238, 132, 1 ],
     [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, 6, 3, 70, 1066998, 242, 86, 30, 1198, 500, 148, 1 ],
     [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
-    [ "Blue Pheasant, Marine Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
+    [ "Aokiji, Marine Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
     [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, 392109, 181, 132, 47, 945, 539, 181, 1 ],
     [ "Boa Hancock, Maiden Drowned in Love", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 863, 448, 144, 1724, 1132, 326, 1 ],
@@ -1237,12 +1237,12 @@ window.units = [
     [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1100, 549, 101, 2201, 1380, 303, 1 ],
     [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 139, 123, 26, 1293, 594, 133, 1 ],
     [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
-    [ "Yellow Monkey, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
+    [ "Kizaru, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
     [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 5, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
-    [ "Koala, Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 3, 12, 4, 1, 50, null, 33, 40, 49, 764, 543, 196, null ],
-    [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, null, 700, 481, 137, 1426, 1190, 357, null ],
-    [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, null, null, null, null, 904, 570, 91, null ],
-    [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, null, 849, 523, 51, null, null, null, null ],
+    [ "Koala, Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 33, 40, 49, 764, 543, 196, 1 ],
+    [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
+    [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
+    [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
     [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 4, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, null ],
     [ "Ace, At Marineford", "STR", [ "Fighter", "Shooter" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ace, At Marineford Evolved", "STR", [ "Fighter", "Shooter" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/index.html b/index.html
index 96219ea58..13364f508 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>5/09/2016</p>
+                <li>Revolutionary Army Fortnight Added</li>
             <br>
             <ul>
                 <li>Rescue Ace Event Added</li>

From 41c215cf72cd6e58332288169ccfd42675773529 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 7 Sep 2016 09:11:38 -0500
Subject: [PATCH 0579/1569] index

---
 index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 13364f508..921a5083e 100644
--- a/index.html
+++ b/index.html
@@ -62,10 +62,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-                <li>Revolutionary Army Fortnight Added</li>
+            <p>7/09/2016</p>
             <br>
             <ul>
                 <li>Rescue Ace Event Added</li>
+                <li>Revolutionary Army Fortnight Added</li>
                 <br>
                 <li>Marineford Story Units Added</li>
                 <br>

From aa312b653e7381d581d0b48ee33ebec69faa3518 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 12 Sep 2016 12:23:08 +0200
Subject: [PATCH 0580/1569] Improved Blindness Matcher

Added .+ to account for Mansherry
---
 common/data/matchers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/matchers.js b/common/data/matchers.js
index 7dbab4954..db9158576 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -345,7 +345,7 @@ window.matchers = [
     {
         name: 'Blindness removers',
         target: 'special',
-        matcher: /(reduces|removes) blindness/i
+        matcher: /(reduces|removes).+blindness/i
     },
 
     {

From 4934eaac5e273a21705489d01feb530679840e0e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 13 Sep 2016 02:00:50 -0500
Subject: [PATCH 0581/1569] New Marco, And Coliseum Previews

added, still need to update calc
---
 common/data/aliases.js    |  6 ++++++
 common/data/cooldowns.js  |  6 ++++++
 common/data/details.js    | 34 +++++++++++++++++++++++++++++++---
 common/data/drops.js      | 18 ++++++++++--------
 common/data/evolutions.js |  8 ++++++++
 common/data/families.js   |  6 ++++++
 common/data/flags.js      | 10 ++++++++++
 common/data/gw.js         |  2 ++
 common/data/matchers.js   |  2 +-
 common/data/units.js      |  8 +++++++-
 index.html                |  7 +++----
 11 files changed, 90 insertions(+), 17 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d8ca644e6..772514416 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1246,4 +1246,10 @@ window.aliases = {
     1245: ['','',''],
     1246: ['','',''],
     1247: ['','',''],
+    1248: ['','',''],
+    1249: ['','',''],
+    1250: ['','',''],
+    1251: ['','',''],
+    1252: ['','',''],
+    1253: ['','',''],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 90ff4b50f..d121b6c77 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1246,4 +1246,10 @@ window.cooldowns = [
     [ 23, 17 ],
     null,
     null,
+    [ 13, 13 ],
+    [ 13, 13 ],
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index d1833e74e..c0caf0249 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5578,11 +5578,13 @@ window.details = {
 	1126: {
 		captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
 		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
+        specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Cannot Activate; 1 orb - 20x ATK; 2 orbs - 40x ATK; 3 orbs - 100x ATK; 4 orbs - 200x ATK; 5 orbs - 300x ATK; 6 orbs - 500x ATK.",
 		specialName: "Admiral Killer Bowling"
 	},
-	1127: {
+	1127: {//orlumbus
 		captain: "Boosts ATK of [DEX] characters by 2.25x and their HP by 1.5x",
 		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
+        specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Cannot Activate; 1 orb - 20x ATK; 2 orbs - 40x ATK; 3 orbs - 100x ATK; 4 orbs - 200x ATK; 5 orbs - 300x ATK; 6 orbs - 500x ATK.",
 		specialName: "Admiral Killer Bowling"
 	},
 	1128: {
@@ -6070,12 +6072,12 @@ window.details = {
     1204: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x",
         specialName: "Awakening Tune Power",
-        special: "Deals 500 damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
+        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
     },
     1205: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         specialName: "Awakening Tune Power",
-        special: "Deals 500 damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
+        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
     },
     1206: {
         captain: "Boosts HP by 1.3x",
@@ -6405,5 +6407,31 @@ window.details = {
         special: "Unknown",
         specialName:"Light of a Firefly, Fire Daruma",
     },
+    1248: {// Kimono Marco
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x",
+        special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
+        specialName:"Shining Daylight - Dayflower",
+    },
+    1249: {// Kimono Marco
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
+        special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
+        specialName:"Shining Daylight - Dayflower",
+    },
+    1250: {// Coliseum Marco
+        captain: "Unknown",
+        special: "Unknown",
+    },
+    1251: {// Coliseum Marco
+        captain: "Unknown",
+        special: "Unknown",
+    },
+    1252: {// Coliseum Doma
+        captain: "Unknown",
+        special: "Unknown",
+    },
+    1253: {// Coliseum Shura
+        captain: "Unknown",
+        special: "Unknown",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 0d825c29a..e71072ce9 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -535,8 +535,8 @@ window.drops = {
             "07": [  ],
             "08": [ 815 ],
             "09": [ 1226 ],
-			"10": [  ],
-			"11": [ 1227 ],
+			"10": [ 1227 ],
+			"11": [  ],
 			"12": [ 1228 ]
         },
         
@@ -1004,6 +1004,7 @@ window.drops = {
         {
             name: "Wapol's Counterattack",
             thumb: 852,
+            global: true,
             condition: 'You can only bring Shooter and Driven units. (No Evo/Boosters)',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['400,000 Damage','1x QCK Elder Turtle'],['1,400,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['4,000,000 Damage','2x Rainbow Gems, 1x Despair Forbidden Tome']],
@@ -1178,6 +1179,7 @@ window.drops = {
         {
             name: 'Clash!! Black Arm Zephyr',
             thumb: 353,
+            global: true,
             Master: [ 88, 114, 118, 352, 354 ],
             Expert: [ 99, 114, 117, 352, 354 ]
         },
@@ -1359,29 +1361,29 @@ window.drops = {
         {
             name: 'Colosseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252 ]
         },
         
         {
             name: 'Rescue Ace Event - Akainu',
             thumb: null,
-            challenge: "10, 20, 30 stamina difficulty. 30 Stamina has a chance of dropping the Universal Skill Book.",
+            challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -261, -562, -720, -748, -935 ]
         },
         
         {
             name: 'Rescue Ace Event - Aokiji',
             thumb: null,
-            challenge: "10, 20, 30 stamina difficulty. 30 Stamina has a chance of dropping the Universal Skill Book.",
+            challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -416, -459, -530, -669, -578 ]
         },
         
         {
             name: 'Rescue Ace Event - Kizaru',
             thumb: null,
-            challenge: "10, 20, 30 stamina difficulty. 30 Stamina has a chance of dropping the Universal Skill Book.",
+            challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -367, -649, -718, -870, -1001 ]
         },
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 115f4c96d..b62ca15c6 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1891,4 +1891,12 @@ window.evolutions = {
         evolution: 1247,
 		evolvers: [  ]
     },
+    1248: {
+        evolution: 1249,
+		evolvers: [  ]
+    },
+    1250: {
+        evolution: 1251,
+		evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index bababe0d8..6b37373a2 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1246,4 +1246,10 @@ window.families = [
     "Monkey D. Luffy",
     "Portgas D. Ace",
 	"Portgas D. Ace",
+    "Marco",
+    "Marco",
+    "Marco",
+    "Marco",
+    "Doma",
+    "Shura",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 0a1ade5d1..0e0c633b8 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -350,6 +350,10 @@ window.flags = {
 	349: { global: 1 },
 	350: { global: 1 },
 	351: { global: 1 },
+    352: { global: 1 },
+	353: { global: 1 },
+    354: { global: 1 },
+	355: { global: 1 },
 	356: { global: 1, rr: 1, rro: 1 },
 	357: { global: 1, rr: 1, rro: 1 },
 	358: { global: 1, rr: 1, rro: 1 },
@@ -825,6 +829,10 @@ window.flags = {
     848: { global: 1 },
     849: { global: 1 },
     850: { global: 1 },
+    851: { global: 1 },
+	852: { global: 1 },
+    853: { global: 1 },
+	854: { global: 1 },
 	855: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	856: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	857: { rr: 1, rro: 1, lrr: 1, global: 1 },
@@ -991,4 +999,6 @@ window.flags = {
     1238: { rr: 1, rro: 1 },
     1239: { rr: 1, rro: 1 },
     1240: { rr: 1, rro: 1 },
+    1248: { rr: 1, rro: 1, lrr: 1 },
+    1249: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index ae391d46f..2ae03961b 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1246,4 +1246,6 @@ window.gw=[
     37431,
     37432,
     37432,
+    38048,
+    38048,
 ];
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index db9158576..a9b543dab 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -369,7 +369,7 @@ window.matchers = [
     {
         name: 'Poison removers',
         target: 'special',
-        matcher: /Removes poison/i
+        matcher: /(reduces|removes).+poison/i 
     },
 
     {
diff --git a/common/data/units.js b/common/data/units.js
index 2fbdd1b08..5deb6cdeb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1161,7 +1161,7 @@ window.units = [
     [ "Koala, Beach Angel", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 133, 79, 37, 994, 479, 187, 1 ],
     [ "Koala, Goddess of Paradise", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 902, 412, 123, 1822, 984, 359, 1 ],
     [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
-    [ "Gild Tesoro, Casino King of Gran Tesoro", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 5000000, 1756, 1094, 268, 2256, 1300, 306, 1 ],
+    [ "Gild Tesoro, Casino King of Gran Tesoro", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 2000000, 1756, 1094, 268, 2256, 1300, 306, 1 ],
     [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],
     [ "Carina, Diva of Gran Tesoro", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, 1066998, 597, 321, 132, 1074, 719, 306, 1 ],
     [ "Baccarat", "INT", [ "Fighter", "Striker" ], 3, 12, 5, 2, 50, 392109, 44, 31, 123, 888, 444, 222, 1 ],
@@ -1246,6 +1246,12 @@ window.units = [
     [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 4, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, null ],
     [ "Ace, At Marineford", "STR", [ "Fighter", "Shooter" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ace, At Marineford Evolved", "STR", [ "Fighter", "Shooter" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, null, null, null, 940, 504, 201, null ],
+    [ "Kimono Marco Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, null, 870, 452, 164, null, null, null, null ],
+    [ "Coliseum Marco", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Marco Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Doma", "INT", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Shura", "DEX", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 921a5083e..36ea25245 100644
--- a/index.html
+++ b/index.html
@@ -62,17 +62,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>7/09/2016</p>
+            <p>13/09/2016</p>
             <br>
             <ul>
+                <li>Kimono Marco and New Coliseum Units Added</li>
+                <br>
                 <li>Rescue Ace Event Added</li>
                 <li>Revolutionary Army Fortnight Added</li>
                 <br>
                 <li>Marineford Story Units Added</li>
                 <br>
-                <li>Previews for Kizaru</li>
-                <li>Sugofest Updated</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>

From 9900147b575a1878d5d80a92cfb9ab2be77c7756 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 16 Sep 2016 01:46:00 -0500
Subject: [PATCH 0582/1569] everyone updated

except new tashigi
---
 common/data/captains.js  | 50 ++++++++++++++++++++++++++++++++++++++++
 common/data/cooldowns.js | 10 ++++----
 common/data/details.js   | 46 ++++++++++++++++++++++++++++--------
 common/data/drops.js     |  7 ++++++
 common/data/gw.js        |  4 ++++
 common/data/ships.js     | 14 +++++------
 common/data/specials.js  | 30 ++++++++++++++++++++++++
 common/data/units.js     | 12 +++++-----
 common/data/zombies.js   | 16 +++++++++++++
 index.html               | 11 ++++-----
 10 files changed, 166 insertions(+), 34 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 0b4ce4153..419c17cea 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3207,4 +3207,54 @@ window.captains = {
             return window.specials[1239].turnedOn || window.specials[1240].turnedOn ? 3 : 2; },
         rcv: function(p) { return 1.3 }
     },
+    1241: {
+        chainModifier: function(p) { return 1.5; }
+    },
+    1242: {
+        chainModifier: function(p) { return 2; }
+    },
+    1243: {
+        atk: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+				p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+				1;
+		},
+    },
+    1244: {
+        atk: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.276 :
+				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.75 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3 :
+				1;
+		},
+    },
+    1245: {
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
+    },
+    1248: {
+        atk: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+				p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+				1;
+		},
+    },
+    1249: {
+        atk: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
+				p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.6 :
+				1;
+		},
+    },
+    1250: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+    },
+    1251: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+    },
+    1252: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+    },
+    1253: {
+		atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
+	},
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d121b6c77..7c58c4e71 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -771,7 +771,7 @@ window.cooldowns = [
 	[ 23, 13 ],
 	[ 25, 15 ],
 	[ 25, 15 ],
-	[ 20, 8 ],
+	[ 17, 8 ],
 	[ 20, 11 ],
 	[ 27, 17 ],
 	[ 20, 10 ],
@@ -1248,8 +1248,8 @@ window.cooldowns = [
     null,
     [ 13, 13 ],
     [ 13, 13 ],
-    null,
-    null,
-    null,
-    null,
+    null,//Colo Marco
+    null,//Colo Marco
+    [ 24, 14 ],
+    [ 14, 6 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index c0caf0249..fb42419d8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6408,30 +6408,56 @@ window.details = {
         specialName:"Light of a Firefly, Fire Daruma",
     },
     1248: {// Kimono Marco
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
+        captainNotes: "Ability stacks, so Fighter/Powerhouse characters gets ATK boosted by 1.69x",
         special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
         specialName:"Shining Daylight - Dayflower",
     },
     1249: {// Kimono Marco
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x",
+        captainNotes: "Ability stacks, so Fighter/Powerhouse characters gets ATK boosted by 2.56x",
         special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
         specialName:"Shining Daylight - Dayflower",
     },
     1250: {// Coliseum Marco
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK of Powerhouse characters by 1.5x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
+        captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 2.5x RCV",
+        special: [
+			{
+				"description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
+				"cooldown": [ 21, 6 ],
+			},
+			{
+				"description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
+				"cooldown": [ 24, 9 ],
+			},
+		], 
+        specialName: "Burning Vanguard",
     },
     1251: {// Coliseum Marco
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK of Powerhouse characters by 2x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
+        captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 2.5x RCV",
+        special: [
+			{
+				"description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
+				"cooldown": [ 21, 6 ],
+			},
+			{
+				"description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
+				"cooldown": [ 24, 9 ],
+			},
+		], 
+        specialName: "Burning Vanguard",
     },
     1252: {// Coliseum Doma
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
+        special: "Changes adjacent orbs into [INT] orbs. Deals 20x character's ATK in [INT] damage to all enemies.",
+        specialName: "Reversed Twin Blades - Surprise Thrust",
     },
     1253: {// Coliseum Shura
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK of [DEX] characters by 2.25x if HP is above 99% at the start of the turn",
+        special: "For 1 turn, Perfects become harder to hit. If during that turn every unit scores a Perfect hit, boosts ATK of [DEX] characters by 1.75x in the following turn.",
+        specialName: "Angry Instigator",
     },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index e71072ce9..2aa58adde 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1147,6 +1147,13 @@ window.drops = {
             condition: "Free Spirit Characters have their cooldowns reduced by 10 turns at the start of the fight",
             "All Difficulties": [ 1241, 1243, -1035, -965, -1031, -1081, -754, -966, -502, -707, -955 ]
         },
+        
+        {
+            name: "Gather! Whitebeard Alliance",
+            thumb: null,
+            condition: "Unknown",
+            "All Difficulties": [ -669, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
+        },
 		
     ],
 
diff --git a/common/data/gw.js b/common/data/gw.js
index 2ae03961b..2e1fa8338 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1248,4 +1248,8 @@ window.gw=[
     37432,
     38048,
     38048,
+    38049,
+    38049,
+    38050,
+    38051,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index 482845ff9..279eae24d 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -134,7 +134,7 @@ window.ships = [
 
     { // 10
         name: 'Aokiji\'s Bike',
-        thumb: null,
+        thumb: 'ship_0011_c1.png',
         description: 'Boosts ATK and HP of Striker characters by 1.5x, greatly reduces the appearance of RCV orbs',
         atk: function(p) {
             return !p.unit.class.has('Striker') ? 1 :
@@ -148,7 +148,7 @@ window.ships = [
 
     { // 11
         name: 'Ace\'s Striker',
-        thumb: null,
+        thumb: 'ship_0012_c1.png',
         description: 'Boosts ATK of Shooter characters by 1.5x and their HP by 1.3x, reduces cooldown of all specials by 1 turn at the start of the fight',
         atk: function(p) {
             return !p.unit.class.has('Shooter') ? 1 :
@@ -180,7 +180,7 @@ window.ships = [
     
     { //14
         name: 'Kuja Pirate Ship',
-        thumb: null,
+        thumb: 'ship_0015_c1.png',
         description: 'Boosts ATK of Free Spirit characters by 1.5x and their HP by 1.35x, reduces the HP of everyone else by 99%. Special: heals the crew by 6,500HP (cooldown: 15 turns).',
         atk: function(p) {
             return !p.unit.class.has('Free Spirit') ? 1 :
@@ -194,7 +194,7 @@ window.ships = [
     
     { //15
         name: 'Ark Maxim',
-        thumb: null,
+        thumb: 'ship_0016_c1.png',
         description: 'Boosts ATK of QCK and PSY characters by 1.5x and their HP by 1.2x. Special: Deals 56560 fixed Damage to all enemies (cooldown: 17 Turns)',
         atk: function(p) {
             return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
@@ -206,7 +206,7 @@ window.ships = [
     
     { // 16
         name: 'Red Force',
-        thumb: null,
+        thumb: 'ship_0017_c1.png',
         description: 'Boosts ATK of Cerebral characters by 1.5x and their HP by 1.35x, Increased Orb Rate for Cerebral characters.',
         atk: function(p) {
             return  !p.unit.class.has('Cerebral') ? 1 : [ 1.0, 1.2, 1.2, 1.2, 1.25, 1.3, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
@@ -218,14 +218,14 @@ window.ships = [
     
     { // 17
         name: '2nd Anniversary Thousand Sunny',
-        thumb: null,
+        thumb: 'ship_0018_c1.png',
         description: 'Boosts ATK by 1.2x.',
         atk: function(p) { return 1.2; },
     }, 
     
     { // 18
         name: 'Sun Pirates Ship',
-        thumb: null,
+        thumb: 'ship_0019_c.png',
         description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units.',
         atk: function(p) {
             return !p.unit.class.has('Fighter') ? .05 :
diff --git a/common/data/specials.js b/common/data/specials.js
index 4d2244531..be72352ba 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1610,4 +1610,34 @@ window.specials = {
             window.specials[1240].turnedOn = false;
         }
     },
+    1241: {
+        staticMult: function(p) { return 15; }
+    },
+    1242: {
+        staticMult: function(p) { return 15; }
+    },
+    1245: {
+		atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1245].multiplier; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (window.specials[1245].multiplier == 1.3 ? 1 : 0);
+			window.specials[1245].multiplier = [1.3, 2][n];
+			p.scope.notify({
+				text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+				name: '1245warning'
+			});
+		}
+	},
+    1250: {
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+		type: "class"
+	},
+    1251: {
+		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+		type: "class"
+	},
+    1253: {
+		atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
+		type: "class"
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index 5deb6cdeb..36e232545 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1246,12 +1246,12 @@ window.units = [
     [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 4, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, null ],
     [ "Ace, At Marineford", "STR", [ "Fighter", "Shooter" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ace, At Marineford Evolved", "STR", [ "Fighter", "Shooter" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kimono Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, null, null, null, 940, 504, 201, null ],
-    [ "Kimono Marco Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, null, 870, 452, 164, null, null, null, null ],
-    [ "Coliseum Marco", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Marco Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Doma", "INT", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Shura", "DEX", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, 142, 79, 40, 940, 504, 201, null ],
+    [ "Kimono Marco Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, null, 870, 452, 164, 1804, 1017, 374, null ],
+    [ "Coliseum Marco", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, null ],
+    [ "Coliseum Marco Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, null, null, null, null ],
+    [ "Coliseum Doma", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, null ],
+    [ "Coliseum Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 865e0d24e..f56935e34 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -251,4 +251,20 @@ window.zombies = {
 		type: 'healer',
         multiplier: 5
 	},
+    1241: {//Fortnight Koala
+        type: 'healer',
+        multiplier: 1
+    },
+    1242: {//Fortnight Koala
+        type: 'healer',
+        multiplier: 2
+    },
+    1250: {//Colo Marco
+        type: 'healer',
+        multiplier: 2.5
+    },
+    1251: {//Colo Marco
+        type: 'healer',
+        multiplier: 2.5
+    },
 };
diff --git a/index.html b/index.html
index 36ea25245..878a83f75 100644
--- a/index.html
+++ b/index.html
@@ -62,15 +62,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>13/09/2016</p>
+            <p>16/09/2016</p>
             <br>
             <ul>
-                <li>Kimono Marco and New Coliseum Units Added</li>
-                <br>
-                <li>Rescue Ace Event Added</li>
-                <li>Revolutionary Army Fortnight Added</li>
+                <li>Units Updated, Ship Thumbnails updated</li>
+                <li>All units except Tashigi and Combo boosts</li>
+                <li>Are now active in calculator</li>
                 <br>
-                <li>Marineford Story Units Added</li>
+                <li>Kimono Marco and New Coliseum Units Added</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From de3ce624ff8654be604e9d2792f4c800b42e558e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 19 Sep 2016 04:47:34 -0500
Subject: [PATCH 0583/1569] Updates

---
 common/data/details.js  | 6 +++---
 common/data/drops.js    | 4 ++--
 common/data/matchers.js | 3 ++-
 common/data/specials.js | 8 ++++----
 common/data/units.js    | 5 ++++-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fb42419d8..217df2e3d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5240,7 +5240,7 @@ window.details = {
         specialName: "Haute Couture: Patchwork"
 	},
 	1077:{
-		captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their RCV by 1.5x",
+		captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their HP by 1.5x",
 		special: [
 			{
 				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
@@ -6072,12 +6072,12 @@ window.details = {
     1204: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x",
         specialName: "Awakening Tune Power",
-        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
+        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [QCK] and [TND] into [PSY] orbs"
     },
     1205: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         specialName: "Awakening Tune Power",
-        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [EMPTY] and [EMPTY] into [PSY] orbs"
+        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [QCK] and [TND] into [PSY] orbs"
     },
     1206: {
         captain: "Boosts HP by 1.3x",
diff --git a/common/data/drops.js b/common/data/drops.js
index 2aa58adde..5adbf8559 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1151,8 +1151,8 @@ window.drops = {
         {
             name: "Gather! Whitebeard Alliance",
             thumb: null,
-            condition: "Unknown",
-            "All Difficulties": [ -669, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
+            condition: "Driven Characters have their cooldowns reduced by 10 turns at the start of the fight",
+            "All Difficulties": [ 1254, 1255, 1256, -669, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },
 		
     ],
diff --git a/common/data/matchers.js b/common/data/matchers.js
index a9b543dab..79f9c9169 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -84,7 +84,8 @@ window.matchers = [
     {
         name: '"Beneficial" Orb captains',
         target: 'captain',
-        matcher: /Makes ((STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\])|((STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\]) and (STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\]))) orbs "beneficial"/i
+        matcher: /"beneficial/i
+        //matcher: /Makes ((STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\])|((STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\]) and (STR|DEX|QCK|PSY|INT|\[RCV\]|\[TND\]))) orbs "beneficial"/i
     },
 
     {
diff --git a/common/data/specials.js b/common/data/specials.js
index be72352ba..2f2da3c03 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1423,19 +1423,19 @@ window.specials = {
         orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
     },
     1132: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? window.specials[1132].multiplier : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[1132].multiplier == 1.5 ? 1 : 0);
 			window.specials[1132].multiplier = [1.5, 1.75][n];
 			p.scope.notify({
 				text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '1133warning'
+				name: '1132warning'
 			});
 		}
     },
     1133: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? window.specials[1133].multiplier : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? window.specials[1133].multiplier : 1; },
 		type: "class",
 		onActivation: function(p) {
 			var n = (window.specials[1133].multiplier == 1.5 ? 1 : 0);
@@ -1450,7 +1450,7 @@ window.specials = {
     	orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
     1138: {
-        atk: function(p) { return p.unit.class.has("Powerhouse" || "Fighter") ? 1.3 : 1},
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
         type: "class"
     },
     1153: {
diff --git a/common/data/units.js b/common/data/units.js
index 36e232545..41b4ce3de 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1243,7 +1243,7 @@ window.units = [
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 4, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, null ],
+    [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, null ],
     [ "Ace, At Marineford", "STR", [ "Fighter", "Shooter" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ace, At Marineford Evolved", "STR", [ "Fighter", "Shooter" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kimono Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, 142, 79, 40, 940, 504, 201, null ],
@@ -1252,6 +1252,9 @@ window.units = [
     [ "Coliseum Marco Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, null, null, null, null ],
     [ "Coliseum Doma", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, null ],
     [ "Coliseum Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, null ],
+    [ "Fortnight Squard", "QCK", [ "Striker", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Decalvan Brothers", "PSY", "Fighter", 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Whitey Bay", "DEX", [ "Slasher", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 01ffe9188bbe7b4ad585e6e6f6a9aab801a558a3 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Mon, 19 Sep 2016 21:11:42 +0200
Subject: [PATCH 0584/1569] Changed some names to global names

Most of the names haven't been updated from the Japanese translations in ages, so I changed some of them to Global's names (only units from 673 to 1086)
---
 common/data/units.js | 222 +++++++++++++++++++++----------------------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 41b4ce3de..2bd66b0b0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -671,112 +671,112 @@ window.units = [
 	[ "Koala", "DEX", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 94, 122, 48, 996, 644, 226, 1.5 ],
 	[ "Koala the Revolutionary", "DEX", [ "Fighter", "Free Spirit" ], 5, 29, 4, 4, 99, 4000000, 931, 600, 185, 1934, 1212, 392, 1.5 ],
 	[ "Hack", "STR", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 188, 136, 21, 1241, 721, 151, 1.5 ],
-	[ "Hack the Revolutionary", "STR", [ "Fighter", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
-	[ "Emporio Ivankov, Newkama Kenpo Instructor", "INT", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
-	[ "Emporio Ivankov the Revolutionary", "INT", [ "Free Spirit", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
+	[ "Hack, Revolutionary Army", "STR", [ "Fighter", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
+	[ "Emporio Ivankov, New Kama Karate Master", "INT", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
+	[ "Emporio Ivankov, Revolutionary Army", "INT", [ "Free Spirit", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
 	[ "Inazuma", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 179, 58, 47, 1300, 449, 232, 1.5 ],
 	[ "Inazuma the Revolutionary", "QCK", [ "Slasher", "Cerebral" ], 5, 29, 6, 4, 99, 4000000, 1244, 400, 199, 2559, 833, 380, 1.5 ],
 	[ "Nico Robin Voyage Log: Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 2, 50, 392109, 155, 62, 58, 1032, 484, 262, 1 ],
 	[ "Nico Robin Voyage Dream: 100-Year Void", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 6, 3, 99, 3000000, 970, 423, 220, 1924, 857, 390, 1 ],
-	[ "Ice Cream Loving Nami", "DEX", [ "Striker", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 141, 43, 53, 966, 422, 242, 1 ],
-	[ "Lemon Ice Cream Loving Nami", "DEX", [ "Striker", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 900, 366, 200, 1802, 768, 402, 1 ],
-	[ "Ice Cream Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 147, 61, 46, 988, 491, 218, 0.7 ],
-	[ "Chocolate Ice Cream Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
-	[ "Ice Cream Loving Perona", "INT", [ "Shooter", "Driven" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
-	[ "Strawberry Ice Cream Loving Perona", "INT", [ "Shooter", "Driven" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
+	[ "Ice Cream-Loving Nami", "DEX", [ "Striker", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 141, 43, 53, 966, 422, 242, 1 ],
+	[ "Ice Cream-Loving Nami, Lemon Ice Cream", "DEX", [ "Striker", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 900, 366, 200, 1802, 768, 402, 1 ],
+	[ "Ice Cream-Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 147, 61, 46, 988, 491, 218, 0.7 ],
+	[ "Ice Cream-Loving Robin, Chocolate Ice Cream", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
+	[ "Ice Cream-Loving Perona", "INT", [ "Shooter", "Driven" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
+	[ "Ice Cream-Loving Perona, Strawberry Ice Cream", "INT", [ "Shooter", "Driven" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
 	[ "Vivi's Breather", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 4, 2, 70, 1066998, 102, 37, 91, 1028, 497, 343, 1 ],
 	[ "Calgara", "STR", [ "Free Spirit", "Striker" ], 3, 12, 6, 1, 50, 392109, 94, 115, 0, 1203, 692, 0, 1 ],
-	[ "Calgara, the Great Warrior of Shandia", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
-	[ "Montblanc Noland", "INT", [ "Slasher", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
-	[ "Montblanc Noland, Explorer and Admiral of the Lvneel Kingdom", "INT", [ "Slasher", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
-	[ "Naginata Corporal Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
-	[ "Rifle Corporal Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
-	[ "Saber Corporal Navy HQ", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 51, 34, 22, 466, 330, 111, 1 ],
-	[ "Bazooka Corporal Navy HQ", "STR", "Shooter", 2, 7, 4, 0, 35, 90778, 62, 50, 14, 598, 404, 64, 1 ],
-	[ "Knuckle Corporal Navy HQ", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 55, 48, 22, 522, 392, 82, 1 ],
-	[ "Naginata Major Navy HQ", "DEX", "Striker", 3, 13, 6, 1, 70, 1066998, 554, 250, 61, 1358, 645, 170, 1 ],
-	[ "Rifle Major Navy HQ", "QCK", "Shooter", 3, 13, 5, 1, 70, 1066998, 444, 244, 96, 1002, 568, 259, 1 ],
-	[ "Saber Major Navy HQ", "PSY", "Slasher", 3, 13, 6, 1, 70, 1066998, 411, 275, 86, 989, 737, 208, 1 ],
-	[ "Bazooka Major Navy HQ", "STR", "Shooter", 3, 13, 6, 1, 70, 1066998, 547, 362, 44, 1301, 833, 117, 1 ],
-	[ "Knuckle Major Navy HQ", "INT", "Fighter", 3, 13, 5, 1, 70, 1066998, 462, 351, 49, 1244, 876, 112, 1 ],
+	[ "Calgara, Great Shandia Warrior", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
+	[ "Mont Blanc Noland", "INT", [ "Slasher", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
+	[ "Mont Blanc Noland, Lvneel Kingdom Explorer", "INT", [ "Slasher", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
+	[ "Naginata Corporal, Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
+	[ "Rifle Corporal, Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
+	[ "Saber Corporal, Navy HQ", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 51, 34, 22, 466, 330, 111, 1 ],
+	[ "Bazooka Corporal, Navy HQ", "STR", "Shooter", 2, 7, 4, 0, 35, 90778, 62, 50, 14, 598, 404, 64, 1 ],
+	[ "Knuckle Corporal, Navy HQ", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 55, 48, 22, 522, 392, 82, 1 ],
+	[ "Naginata Major, Navy HQ", "DEX", "Striker", 3, 13, 6, 1, 70, 1066998, 554, 250, 61, 1358, 645, 170, 1 ],
+	[ "Rifle Major, Navy HQ", "QCK", "Shooter", 3, 13, 5, 1, 70, 1066998, 444, 244, 96, 1002, 568, 259, 1 ],
+	[ "Saber Major, Navy HQ", "PSY", "Slasher", 3, 13, 6, 1, 70, 1066998, 411, 275, 86, 989, 737, 208, 1 ],
+	[ "Bazooka Major, Navy HQ", "STR", "Shooter", 3, 13, 6, 1, 70, 1066998, 547, 362, 44, 1301, 833, 117, 1 ],
+	[ "Knuckle Major, Navy HQ", "INT", "Fighter", 3, 13, 5, 1, 70, 1066998, 462, 351, 49, 1244, 876, 112, 1 ],
 	[ "Oimo", "PSY", [ "Striker", "Powerhouse" ], 3, 25, 5, 2, 70, 1778330, 452, 223, 23, 1602, 742, 98, 1 ],
 	[ "Kashii", "INT", [ "Slasher", "Powerhouse" ], 3, 25, 6, 2, 70, 1778330, 426, 242, 21, 1551, 798, 87, 1 ],
 	[ "Watchdog Unit of the Law", "QCK", "Slasher", 3, 13, 4, 1, 70, 1066998, 122, 43, 40, 1211, 488, 251, 1 ],
 	[ "Righteous Juror", "STR", "Striker", 3, 13, 4, 1, 70, 1066998, 108, 129, 34, 990, 900, 144, 1 ],
 	[ "Three-Headed Baskerville", "DEX", "Slasher", 3, 13, 4, 3, 70, 1066998, 102, 78, 38, 1109, 595, 232, 1 ],
 	[ "Blueno, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
-	[ "Blueno: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
+	[ "Blueno: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
 	[ "Nico Robin, Devil Child", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
 	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
 	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
 	[ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],
 	[ "Ganfor", "QCK", "Striker", 3, 12, 6, 1, 50, 392109, 80, 40, 48, 930, 452, 185, 1.5 ],
-	[ "Sky Knight Ganfor", "QCK", "Striker", 4, 20, 4, 2, 99, 3000000, 884, 401, 151, 1704, 1202, 300, 1.5 ],
+	[ "Ganfor, Sky Knight", "QCK", "Striker", 4, 20, 4, 2, 99, 3000000, 884, 401, 151, 1704, 1202, 300, 1.5 ],
 	[ "Pierre", "DEX", "Fighter", 3, 12, 4, 1, 50, 392109, 69, 32, 38, 920, 480, 182, 1 ],
-	[ "Konis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
-	[ "Konis, Skypiean Maiden", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
+	[ "Conis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
+	[ "Conis, Skypiea Girl", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
 	[ "Dracule Mihawk Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
 	[ "Dracule Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
 	[ "Sir Crocodile Logia Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
 	[ "Sir Crocodile Logia Former Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
 	[ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
-	[ "Jerry, Cipher Pol No.6", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
+	[ "Jerry, Cipher Pol No. 6", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
 	[ "T-Bone", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 99, 78, 42, 958, 542, 162, 1 ],
-	[ "Ship Cutter T-Bone, Navy HQ Captain", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 900, 493, 133, 1700, 1100, 300, 1 ],
+	[ "Ship Cutter T-Bone, Marine Captain", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 900, 493, 133, 1700, 1100, 300, 1 ],
 	[ "Nefertari Vivi Voyage Log: Princess of Alabasta", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 98, 51, 62, 855, 424, 288, 1 ],
 	[ "Nefertari Vivi Voyage Dream: Queen of the Pirates", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 800, 371, 258, 1591, 777, 474, 1 ],
 	[ "Monkey D. Luffy Gum-Gum Gatling", "DEX", [ "Free Spirit", "Fighter" ], 4, 15, 8, 3, 99, 2000000, 212, 100, 46, 1777, 795, 270, 0.7 ],
-	[ "Kalifa, Cipher Pol No.9", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
-	[ "Kalifa Rokushiki, Cipher Pol No.9", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
-	[ "Jabra, Cipher Pol No.9", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
-	[ "Jabra Rokushiki, Cipher Pol No.9", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1272, 521, -200, 2720, 1250, -200, 1 ],
-	[ "Fukuro, Cipher Pol No.9", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 2, 35, 136167, 114, 52, 30, 1123, 408, 122, 1 ],
-	[ "Fukuro Rokushiki, Cipher Pol No.9", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 70, 1066998, 1077, 362, 97, 1850, 690, 177, 1 ],
-	[ "Kumadori, Cipher Pol No.9", "PSY", [ "Striker", "Powerhouse" ], 3, 9, 5, 2, 35, 136167, 102, 60, 29, 1055, 442, 119, 1 ],
-	[ "Kumadori Rokushiki, Cipher Pol No.9", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 1000, 398, 88, 1792, 755, 165, 1 ],
-	[ "Kaku Human-Beast, Ox-Ox Fruit Model: Giraffe", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 6, 3, 99, 4000000, 1220, 692, 43, 2526, 1200, 114, 1 ],
-	[ "Lucci Human-Beast, Cat-Cat Fruit Model: Leopard", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
+	[ "Kalifa, Cipher Pol No. 9", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
+	[ "Kalifa: Six Powers, Cipher Pol No. 9", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
+	[ "Jabra, Cipher Pol No. 9", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
+	[ "Jabra: Six Powers, Cipher Pol No. 9", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1272, 521, -200, 2720, 1250, -200, 1 ],
+	[ "Fukuro, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 2, 35, 136167, 114, 52, 30, 1123, 408, 122, 1 ],
+	[ "Fukuro: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 70, 1066998, 1077, 362, 97, 1850, 690, 177, 1 ],
+	[ "Kumadori, Cipher Pol No. 9", "PSY", [ "Striker", "Powerhouse" ], 3, 9, 5, 2, 35, 136167, 102, 60, 29, 1055, 442, 119, 1 ],
+	[ "Kumadori: Six Powers, Cipher Pol No. 9", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 1000, 398, 88, 1792, 755, 165, 1 ],
+	[ "Kaku: Beastman, Ox-Ox Fruit, Model: Giraffe", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 6, 3, 99, 4000000, 1220, 692, 43, 2526, 1200, 114, 1 ],
+	[ "Lucci: Beastman, Cat-Cat Fruit, Model: Leopard", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
 	[ "Spandam", "INT", "Slasher", 4, 7, 5, 1, 35, 136167, 52, 25, 25, 258, 196, 89, 1 ],
 	[ "Franky, Straw Hat Pirates", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1623, 765, 70, 2505, 1149, 130, 1 ],
 	[ "Nero", "QCK", [ "Shooter", "Driven" ], 3, 9, 6, 1, 35, 136167, 59, 112, 20, 324, 543, 83, 0.7 ],
-	[ "Nero, Cipher Pol No.9", "QCK", [ "Shooter", "Driven" ], 4, 15, 5, 2, 70, 1066998, 277, 489, 51, 755, 1050, 145, 0.7 ],
+	[ "Nero, Cipher Pol No. 9", "QCK", [ "Shooter", "Driven" ], 4, 15, 5, 2, 70, 1066998, 277, 489, 51, 755, 1050, 145, 0.7 ],
 	[ "Wanze", "DEX", "Free Spirit", 3, 11, 4, 1, 50, 392109, 202, 44, 40, 1124, 367, 212, 1 ],
-	[ "Wanze, Cipher Pol No.7", "DEX", "Free Spirit", 4, 18, 5, 2, 99, 3000000, 1059, 312, 170, 2051, 674, 363, 1 ],
+	[ "Wanze, Cipher Pol No. 7", "DEX", "Free Spirit", 4, 18, 5, 2, 99, 3000000, 1059, 312, 170, 2051, 674, 363, 1 ],
 	[ "Portgas D. Ace, Record of the Voyage - Whitebeard Pirates", "QCK", [ "Free Spirit", "Fighter" ], 4, 12, 5, 2, 50, 392109, 141, 71, 36, 1121, 585, 189, 1.5 ],
 	[ "Portgas D. Ace Voyage Dream: Pirate Summit", "QCK", [ "Free Spirit", "Fighter" ], 5, 20, 4, 3, 99, 4000000, 1063, 524, 140, 2181, 1100, 258, 1.5 ],
 	[ "Megalo and Princess Shirahoshi", "QCK", "Fighter", 4, 15, 4, 3, 70, 1066998, 1251, 271, 150, 2001, 600, 241, 1 ],
-	[ "Rob Lucci, CP9's Dark Justice", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 70, 1066998, 496, 300, 89, 1656, 800, 245, 1.5 ],
-	[ "Rob Lucci, CP9's Strongest Generation", "STR", [ "Powerhouse", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
-	[ "Kaku, CP9's Dark Justice", "DEX", [ "Slasher", "Powerhouse" ], 4, 17, 6, 3, 70, 1066998, 151, 132, 28, 1183, 713, 178, 1 ],
-	[ "Kaku, CP9's Strongest Generation", "DEX", [ "Slasher", "Powerhouse" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
-	[ "Kalifa, CP9's Dark Justice", "QCK", [ "Cerebral", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
-	[ "Kalifa, CP9's Strongest Generation", "QCK", [ "Cerebral", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
-	[ "Jabra, CP9's Dark Justice", "QCK", [ "Powerhouse", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
-	[ "Jabra, CP9's Strongest Generation", "QCK", [ "Powerhouse", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
-	[ "Blueno, CP9's Dark Justice", "INT", [ "Powerhouse", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
-	[ "Blueno, CP9's Strongest Generation", "INT", [ "Powerhouse", "Free Spirit" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
-	[ "Fukuro, CP9's Dark Justice", "PSY", [ "Powerhouse", "Fighter" ], 4, 16, 4, 3, 70, 1066998, 151, 97, 46, 1140, 651, 203, 1 ],
-	[ "Fukuro, CP9's Strongest Generation", "PSY", [ "Powerhouse", "Fighter" ], 5, 26, 8, 4, 99, 4000000, 1093, 603, 165, 2415, 1051, 353, 1 ],
-	[ "Kumadori, CP9's Dark Justice", "STR", [ "Powerhouse", "Striker" ], 4, 16, 4, 3, 70, 1066998, 162, 89, 47, 1167, 612, 212, 1 ],
-	[ "Kumadori, CP9's Strongest Generation", "STR", [ "Powerhouse", "Striker" ], 5, 26, 7, 4, 99, 4000000, 1110, 560, 170, 2479, 1018, 355, 1 ],
-	[ "Monkey D. Luffy Halloween Monster", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
-	[ "Usopp Lying Wolf", "PSY", "Shooter", 4, 20, 5, 3, 99, 3000000, 51, 23, 46, 1444, 673, 400, 1 ],
-	[ "Franky Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
-	[ "Nami Jackie 'o Lantern", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
-	[ "Tony Tony Chopper Lil' Vampire", "INT", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
-	[ "Roronoa Zoro Jack the Ripper", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
-	[ "Nico Robin Devil Girl", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
-	[ "Sanji Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
-	[ "Brook Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
-	[ "Dalmatian, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
-	[ "Momonga, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
-	[ "Onigumo, Navy HQ Vice Admiral", "DEX", [ "Slasher", "Driven" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
+	[ "Rob Lucci, CP9 Dark Justice", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 70, 1066998, 496, 300, 89, 1656, 800, 245, 1.5 ],
+	[ "Rob Lucci, CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
+	[ "Kaku, CP9 Dark Justice", "DEX", [ "Slasher", "Powerhouse" ], 4, 17, 6, 3, 70, 1066998, 151, 132, 28, 1183, 713, 178, 1 ],
+	[ "Kaku, CP9's Strongest", "DEX", [ "Slasher", "Powerhouse" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
+	[ "Kalifa, CP9 Dark Justice", "QCK", [ "Cerebral", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
+	[ "Kalifa, CP9's Strongest", "QCK", [ "Cerebral", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
+	[ "Jabra, CP9 Dark Justice", "QCK", [ "Powerhouse", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
+	[ "Jabra, CP9's Strongest", "QCK", [ "Powerhouse", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
+	[ "Blueno, CP9 Dark Justice", "INT", [ "Powerhouse", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
+	[ "Blueno, CP9's Strongest", "INT", [ "Powerhouse", "Free Spirit" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
+	[ "Fukuro, CP9 Dark Justice", "PSY", [ "Powerhouse", "Fighter" ], 4, 16, 4, 3, 70, 1066998, 151, 97, 46, 1140, 651, 203, 1 ],
+	[ "Fukuro, CP9's Strongest", "PSY", [ "Powerhouse", "Fighter" ], 5, 26, 8, 4, 99, 4000000, 1093, 603, 165, 2415, 1051, 353, 1 ],
+	[ "Kumadori, CP9 Dark Justice", "STR", [ "Powerhouse", "Striker" ], 4, 16, 4, 3, 70, 1066998, 162, 89, 47, 1167, 612, 212, 1 ],
+	[ "Kumadori, CP9's Strongest", "STR", [ "Powerhouse", "Striker" ], 5, 26, 7, 4, 99, 4000000, 1110, 560, 170, 2479, 1018, 355, 1 ],
+	[ "Monkey D. Luffy, Halloween Monster", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
+	[ "Usopp, Lying Wolf", "PSY", "Shooter", 4, 20, 5, 3, 99, 3000000, 51, 23, 46, 1444, 673, 400, 1 ],
+	[ "Franky, Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
+	[ "Nami, Jackie 'o Lantern", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
+	[ "Tony Tony Chopper, Lil' Vampire", "INT", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
+	[ "Roronoa Zoro, Jack the Ripper", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
+	[ "Nico Robin, Devil Girl", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
+	[ "Sanji, Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
+	[ "Brook, Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
+	[ "Dalmatian, Marine Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
+	[ "Momonga, Marine Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
+	[ "Onigumo, Marine Vice Admiral", "DEX", [ "Slasher", "Driven" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
 	[ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
 	[ "Berry Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
-	[ "Strawberry, Navy HQ Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
+	[ "Strawberry, Marine Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
 	[ "Lucky Roo", "PSY", [ "Shooter", "Free Spirit" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
 	[ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
-	[ "Rebecca, Prisoner Gladiator", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
+	[ "Rebecca, Imprisoned Swordsman", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
 	[ "Rebecca, Colosseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
 	[ "Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
 	[ "Mad Monk Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1512, 755, 83, 2824, 1324, 203, 1.5 ],
@@ -795,9 +795,9 @@ window.units = [
 	[ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
 	[ "Nightmare Luffy Warrior of Hope", "INT", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1331, 711, 0, 3020, 1520, 0, 1.5 ],
 	[ "Breed", "INT", "Cerebral", 3, 13, 6, 1, 50, 392109, 59, 25, 59, 867, 418, 275, 1.5 ],
-	[ "Breed, User of the Peto-Peto Fruit", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
+	[ "Breed, Pet-Pet Fruit User", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
 	[ "Kung Fu Dugong, Sea Animal Pirates", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 2, 70, 1778330, 50, 355, 95, 450, 1115, 225, 1.5 ],
-	[ "Sea Lapin, Sea Animal Pirates", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
+	[ "Sea Lapahn, Sea Animal Pirates", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
 	[ "Octopus Boxer, Sea Animal Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 15, 8, 1, 70, 711332, 99, 91, 2, 1563, 846, 93, 1 ],
 	[ "Mr. 2 Bon Clay Voyage Log: B.W.", "PSY", [ "Fighter", "Free Spirit" ], 4, 13, 5, 2, 50, 392109, 109, 57, 32, 1033, 513, 212, 1 ],
 	[ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
@@ -805,27 +805,27 @@ window.units = [
 	[ "Black Cage Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 5, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1 ],
 	[ "Smoker, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 4, 25, 6, 2, 70, 1066998, 710, 309, 44, 1600, 703, 146, 1.5 ],
 	[ "Smoker the White Hunter, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 5, 40, 5, 3, 99, 4000000, 1549, 640, 112, 2727, 1289, 234, 1.5 ],
-	[ "Pure White Angel Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
-	[ "Pure White Goddess Wedding Nami", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
+	[ "Angel in White Nami, Wedding", "PSY", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
+	[ "Goddess in White Nami, Wedding", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
 	[ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
-	[ "Courting Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
+	[ "Loveseeking Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
 	[ "Risky Brothers", "DEX", [ "Slasher", "Free Spirit" ], 3, 9, 4, 2, 50, 392109, 30, 15, 40, 707, 368, 287, 1 ],
 	[ "Cerberus", "QCK", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
-	[ "Tararan", "INT", [ "Cerebral", "Powerhouse" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
-	[ "Bear-Skin Rug", "DEX", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
-	[ "Gecko Moria, Thriller Bark's Mysterious Four", "INT", [ "Free Spirit", "Driven" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
-	[ "Gecko Moria, Ruler of Thriller Bark", "INT", [ "Free Spirit", "Driven" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
-	[ "Soldier Zombie Boastful Shadow", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
-	[ "Soldier Zombie Quick Shadow", "QCK", "Fighter", 2, 7, 6, 0, 35, 90778, 77, 30, 92, 944, 590, 43, 1 ],
-	[ "Soldier Zombie Vile Shadow", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],
-	[ "Soldier Zombie Hateful Shadow", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 71, 40, 92, 903, 648, 29, 1 ],
-	[ "Soldier Zombie Proud Shadow", "PSY", "Fighter", 2, 7, 6, 0, 35, 90778, 70, 24, 92, 887, 551, 72, 1 ],
+	[ "Taralan", "INT", [ "Cerebral", "Powerhouse" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
+	[ "Bear Skin Rug", "DEX", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
+	[ "Gecko Moria, Thriller Bark Demon", "INT", [ "Free Spirit", "Driven" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
+	[ "Gecko Moria, Thriller Bark Ruler", "INT", [ "Free Spirit", "Driven" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
+	[ "Strong Soldier Zombie", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
+	[ "Speedy Soldier Zombie", "QCK", "Fighter", 2, 7, 6, 0, 35, 90778, 77, 30, 92, 944, 590, 43, 1 ],
+	[ "Crafty Soldier Zombie", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],
+	[ "Hate-Filled Soldier Zombie", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 71, 40, 92, 903, 648, 29, 1 ],
+	[ "Egotistical Soldier Zombie", "PSY", "Fighter", 2, 7, 6, 0, 35, 90778, 70, 24, 92, 887, 551, 72, 1 ],
 	[ "Tricky Wild Zombie", "DEX", "Powerhouse", 3, 12, 4, 1, 50, 392109, 75, 74, 132, 899, 720, 71, 1 ],
 	[ "Brainy Wild Zombie", "INT", "Powerhouse", 3, 12, 4, 1, 50, 392109, 71, 86, 132, 823, 771, 65, 1 ],
-	[ "Hearty Wild Zombie", "PSY", "Powerhouse", 3, 12, 4, 1, 50, 392109, 70, 70, 132, 801, 700, 94, 1 ],
-	[ "General Zombie Herculean Shadow", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
-	[ "General Zombie Peculiar Shadow", "DEX", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
-	[ "General Zombie Swift Shadow", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
+	[ "Heartful Wild Zombie", "PSY", "Powerhouse", 3, 12, 4, 1, 50, 392109, 70, 70, 132, 801, 700, 94, 1 ],
+	[ "Powerful General Zombie", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
+	[ "Sneaky General Zombie", "DEX", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
+	[ "Blazing General Zombie", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
 	["Trafalgar Law, the Boy from the White City", "PSY", ["Slasher", "Driven"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
 	["Trafalgar Law, the Boy Saved by Fate", "PSY", ["Slasher", "Driven"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
 	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
@@ -834,7 +834,7 @@ window.units = [
 	[ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
 	[ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Driven" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
 	[ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
-	[ "Tyrant Bartholomew Kuma, Government's Human Weapon", "STR", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
+	[ "Tyrant Bartholomew Kuma, Government Human Weapon", "STR", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
 	[ "Caesar Clown", "DEX", [ "Driven", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
 	[ "Master Caesar", "DEX", [ "Driven", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
 	[ "Vergo", "INT", [ "Striker", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
@@ -849,10 +849,10 @@ window.units = [
 	[ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
 	[ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
 	[ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
-	[ "Tin-Plate Wapol", "STR", [ "Shooter", "Driven" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
+	[ "Wapol of Tin", "STR", [ "Shooter", "Driven" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
 	[ "Slim-up Wapol", "QCK", [ "Shooter", "Driven" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
 	[ "Robson", "PSY", [ "Fighter", "Powerhouse" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
-	[ "Chopper Playing in the Snow", "DEX", [ "Fighter", "Powerhouse" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
+	[ "Chopper's Snow Day", "DEX", [ "Fighter", "Powerhouse" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
 	[ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
 	[ "Trafalgar Law Holy Night Nobleman", "DEX", [ "Slasher", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 945, 460, 151, 2003, 1030, 313, 1 ],
 	[ "Jewelry Bonney Ravenous Spoiled Santa", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 5, 3, 50, 392109, 190, 50, 54, 1003, 403, 213, 1 ],
@@ -875,10 +875,10 @@ window.units = [
 	[ "Señor Pink, Donquixote Pirates", "PSY", [ "Free Spirit", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1478, 600, 100, 2800, 1242, 241, 1 ],
 	[ "Trebol", "INT", [ "Cerebral", "Driven" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
 	[ "Trebol, Donquixote Pirates", "INT", [ "Cerebral", "Driven" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
-	[ "Jora", "DEX", [ "Free Spirit", "Driven" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
-	[ "Jora, Donquixote Pirates", "DEX", [ "Free Spirit", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
-	[ "Lao-G", "STR", [ "Fighter", "Driven" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
-	[ "Lao-G, Donquixote Pirates", "STR", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
+	[ "Giolla", "DEX", [ "Free Spirit", "Driven" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
+	[ "Giolla, Donquixote Pirates", "DEX", [ "Free Spirit", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
+	[ "Lao G.", "STR", [ "Fighter", "Driven" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
+	[ "Lao G., Donquixote Pirates", "STR", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
 	[ "Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, 5, 2, 70, 1066998, 646, 261, 83, 1247, 693, 220, 1 ],
 	[ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
 	[ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
@@ -886,14 +886,14 @@ window.units = [
 	[ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
 	[ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Cerebral" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
 	[ "Buggy, Cheerfully Crazy", "QCK", [ "Driven", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
-	[ "Hollow Hollow Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
-	[ "Perona, Thriller Bark's Mysterious Four", "DEX", [ "Shooter", "Driven" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
+	[ "Horo Horo Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
+	[ "Perona, Thriller Bark Demon", "DEX", [ "Shooter", "Driven" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
 	[ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Driven" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
-	[ "Doctor Hogback, Thriller Bark's Mysterious Four", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
-	[ "Absalom of the Graveyard, Thriller Bark's Mysterious Four", "STR", [ "Shooter", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
+	[ "Doctor Hogback, Thriller Bark Demon", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
+	[ "Absalom of the Graveyard, Thriller Bark Demon", "STR", [ "Shooter", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
 	[ "Oars, Special Zombie", "STR", [ "Fighter", "Powerhouse" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
-	[ "Gecko Moria, Shadow's Asgard", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
-	[ "Brook, Gentleman Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
+	[ "Gecko Moria, Shadows' Asgard", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
+	[ "Brook, Gentlemanly Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
 	[ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
 	[ "Sir Crocodile, Sand General", "STR", [ "Cerebral", "Driven" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
 	[ "Mr. 3, Makeshift Musician", "QCK", [ "Striker", "Cerebral" ], 4, 17, 4, 2, 99, 2000000, 24, 14, 33, 1703, 622, 312, 1.5 ],
@@ -955,24 +955,24 @@ window.units = [
 	[ "Gyaro", "QCK", [ "Slasher", "Powerhouse" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
 	[ "Macro", "PSY", [ "Shooter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
 	[ "Tansui", "INT", [ "Fighter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
-	[ "Agile Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
-	[ "Tricky Gunman, Black Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
-	[ "Fine Gunman, Green Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
-	[ "Swift Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 84, 66, 52, 805, 612, 236, 1],
-	[ "Strong Gunman, Red Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, 1123790, 82, 80, 44, 821, 700, 204, 1],
-	[ "Heart Gunman, Yellow Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
-	[ "Saint Charloss", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
+	[ "Quick-Draw Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
+	[ "Scheming Gunman, Black Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
+	[ "Technical Gunman, Green Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
+	[ "Quick-Strike Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 84, 66, 52, 805, 612, 236, 1],
+	[ "Strong-Arm Gunman, Red Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, 1123790, 82, 80, 44, 821, 700, 204, 1],
+	[ "Bold Gunman, Yellow Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
+	[ "Saint Charlos", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
 	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, 1000000, 6, 334, -600, 30, 601, -500, 1],
-	[ "Saint Shalulia", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
-	[ "Super Rookie Eustass Kid", "QCK", [ "Driven", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
-	[ "Super Rookie Trafalgar Law", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
+	[ "Saint Shalria", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
+	[ "Eustass Kid, Supernova", "QCK", [ "Driven", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
+	[ "Trafalgar Law, Supernova", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
 	[ "Pacifista PX-1", "DEX", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-2", "PSY", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-3", "QCK", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-4", "STR", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Pacifista PX-5", "INT", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
 	[ "Sentomaru", "PSY", [ "Fighter", "Powerhouse" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
-	[ "Sentomaru, Navy HQ Science Unit Commander", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
+	[ "Sentomaru, Marine Science Unit Commander", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
 	[ "Smoker, Wild Lone Wolf", "DEX", ["Striker", "Driven"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
 	[ "Smoker, Solitary Lone Wolf", "DEX", ["Striker", "Driven"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
 	[ "Kizaru", "QCK", ["Shooter", "Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
@@ -1083,7 +1083,7 @@ window.units = [
     [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 130, 130, 31, 1300, 673, 130, 1 ],
     [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1231, 631, 87, 3013, 1300, 202, 1 ],
     [ "Fujitora", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
-    [ "Fujitora, Marine Admiral", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
+    [ "Issho", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
     [ "Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, 392109, 103, 110, 34, 729, 530, 189, 1 ],
     [ "Musshuru, Poison Spore Human", "INT", [ "Driven", "Striker" ], 4, 26, 4, 3, 99, 3000000, 667, 472, 131, 1419, 1142, 302, 1 ],
     [ "Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 143, 115, 21, 977, 551, 141, 1 ],

From 014ec48cb7518fa1f2a900394b4d58a4ad4fb3a9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Mon, 19 Sep 2016 21:24:12 +0200
Subject: [PATCH 0585/1569] More units updated

Units from my friend list updated to match more Global names
---
 common/data/units.js | 56 ++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 2bd66b0b0..a82218eb4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -214,16 +214,16 @@ window.units = [
 	[ "Laboon", "STR", [ "Fighter", "Powerhouse" ], 3, 18, 5, 1, 50, 392109, 650, 300, 150, 1100, 500, 200, 1 ],
 	[ "Laboon (Luffy's drawing)", "STR", [ "Fighter", "Powerhouse" ], 4, 22, 5, 2, 99, 3000000, 1000, 400, 160, 2500, 850, 250, 1 ],
 	[ "Neptunian Squid", "DEX", "Striker", 3, 18, 8, 1, 50, 392109, 600, 280, 130, 900, 480, 180, 1.5 ],
-	[ "Monkey D. Luffy Gum-Gum Balloon", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
-	[ "Monkey D. Luffy Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
-	[ "Roronoa Zoro Streaming Wolf Swords", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
-	[ "Roronoa Zoro Lion's Song", "DEX", [ "Slasher", "Driven" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
-	[ "Nami Fine Tempo", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
-	[ "Nami Happiness Punch", "INT", [ "Striker", "Cerebral" ], 5, 22, 4, 3, 99, 4000000, 1044, 377, 94, 1990, 949, 168, 1 ],
-	[ "Usopp Usopp Hammer", "PSY", "Striker", 3, 12, 5, 1, 35, 136167, 188, 101, 40, 778, 388, 191, 1 ],
-	[ "Usopp Impact", "PSY", "Shooter", 4, 18, 6, 2, 70, 1066998, 733, 361, 97, 1185, 669, 265, 1 ],
-	[ "Mr. Prince Mutton Shot", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 4, 1, 35, 136167, 276, 108, 32, 1144, 457, 107, 1 ],
-	[ "Mr. Prince Veau Shot", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 5, 2, 70, 1066998, 1101, 422, 93, 1600, 792, 161, 1 ],
+	[ "Monkey D. Luffy, Gum-Gum Balloon", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
+	[ "Monkey D. Luffy, Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
+	[ "Roronoa Zoro, Streaming Wolf Swords", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
+	[ "Roronoa Zoro, Lion's Song", "DEX", [ "Slasher", "Driven" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
+	[ "Nami, Fine Tempo", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
+	[ "Nami, Happiness Punch", "INT", [ "Striker", "Cerebral" ], 5, 22, 4, 3, 99, 4000000, 1044, 377, 94, 1990, 949, 168, 1 ],
+	[ "Usopp, Usopp Hammer", "PSY", "Striker", 3, 12, 5, 1, 35, 136167, 188, 101, 40, 778, 388, 191, 1 ],
+	[ "Usopp, Impact", "PSY", "Shooter", 4, 18, 6, 2, 70, 1066998, 733, 361, 97, 1185, 669, 265, 1 ],
+	[ "Mr. Prince, Mutton Shot", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 4, 1, 35, 136167, 276, 108, 32, 1144, 457, 107, 1 ],
+	[ "Mr. Prince, Veau Shot", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 5, 2, 70, 1066998, 1101, 422, 93, 1600, 792, 161, 1 ],
 	[ "Dracule Mihawk", "DEX", "Slasher", 4, 30, 4, 1, 70, 1066998, 324, 201, 1, 1998, 814, 7, 1 ],
 	[ "Hawk Eyes Mihawk", "DEX", "Slasher", 5, 50, 4, 1, 99, 5000000, 1916, 782, 5, 3760, 1285, 15, 1 ],
 	[ "Escapee Morgan", "STR", [ "Slasher", "Driven" ], 3, 17, 5, 1, 70, 711332, 1427, 699, 27, 1600, 1000, 35, 1 ],
@@ -306,7 +306,7 @@ window.units = [
 	[ "Monkey D. Garp", "PSY", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 280, 145, 50, 1442, 722, 131, 1 ],
 	[ "Garp the Fist", "PSY", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1377, 685, 105, 2852, 1220, 225, 1 ],
 	[ "Trafalgar Law", "DEX", [ "Slasher", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 104, 125, 73, 876, 702, 238, 1 ],
-	[ "Trafalgar Law ROOM", "DEX", [ "Slasher", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
+	[ "Trafalgar Law, ROOM", "DEX", [ "Slasher", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
 	[ "Basil Hawkins", "INT", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 200, 200, 7, 1165, 750, 127, 1 ],
 	[ "Basil Hawkins the Magician", "INT", [ "Striker", "Cerebral" ], 5, 28, 6, 4, 99, 4000000, 1095, 717, 85, 2480, 1295, 255, 1 ],
 	[ "Killer", "QCK", [ "Striker", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 180, 250, 0, 1228, 895, -50, 1 ],
@@ -416,7 +416,7 @@ window.units = [
 	[ "Boa Hancock", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 416, 251, 197, 1595, 859, 340, 1 ],
 	[ "Boa Hancock Warlord of the Sea", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1512, 782, 301, 2860, 1320, 515, 1 ],
 	[ "Donquixote Doflamingo", "DEX", [ "Slasher", "Driven" ], 4, 30, 4, 1, 70, 1066998, 200, 186, 30, 1061, 790, 145, 1 ],
-	[ "Donquixote Doflamingo Warlord of the Sea", "DEX", [ "Slasher", "Driven" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
+	[ "Donquixote Doflamingo, Warlord of the Sea", "DEX", [ "Slasher", "Driven" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
 	[ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Powerhouse" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
 	[ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
 	[ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Driven" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
@@ -527,8 +527,8 @@ window.units = [
 	[ "Brook, Straw Hat Pirates' Attack", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
 	[ "Chopper, Merveille's Adventurer", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
 	[ "Chopper, Straw Hat Pirates' Attack", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
-	[ "Shanks Black Clad Redhead", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 478, 285, 185, 1650, 780, 291, 1 ],
-	[ "Shanks Black Clad Emperor", "PSY", [ "Slasher", "Cerebral" ], 6, 55, 5, 5, 99, 5000000, 1537, 736, 261, 3140, 1400, 418, 1 ],
+	[ "Shanks, Black Clad Redhead", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 478, 285, 185, 1650, 780, 291, 1 ],
+	[ "Shanks, Black Clad Emperor", "PSY", [ "Slasher", "Cerebral" ], 6, 55, 5, 5, 99, 5000000, 1537, 736, 261, 3140, 1400, 418, 1 ],
 	[ "Nico Robin Cherry Blossoms Falling", "DEX", [ "Fighter", "Cerebral" ], 4, 11, 4, 2, 50, 392109, 171, 55, 65, 976, 328, 252, 1 ],
 	[ "Nico Robin Cherry Blossoms in Full Bloom", "DEX", [ "Fighter", "Cerebral" ], 5, 19, 6, 3, 99, 3000000, 913, 271, 209, 1925, 747, 384, 1 ],
 	[ "Brook Cherry Blossom Hair", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 5, 2, 50, 392109, 211, 108, 40, 1267, 448, 163, 1 ],
@@ -559,8 +559,8 @@ window.units = [
 	[ "Nico Robin, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
 	[ "Franky, Merveille's Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
 	[ "Franky, Straw Hat Pirates' Attack", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
-	[ "Portgas D. Ace Black Clad Flame Fist", "DEX", [ "Shooter", "Free Spirit" ], 5, 30, 6, 4, 70, 1066998, 515, 264, 152, 1922, 758, 253, 1 ],
-	[ "Portgas D. Ace Black Clad Whitebeard 2nd Div. Commander", "DEX", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1877, 702, 214, 3818, 1352, 321, 1 ],
+	[ "Portgas D. Ace, Black Clad Flame Fist", "DEX", [ "Shooter", "Free Spirit" ], 5, 30, 6, 4, 70, 1066998, 515, 264, 152, 1922, 758, 253, 1 ],
+	[ "Portgas D. Ace, Black Clad Division Commander", "DEX", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1877, 702, 214, 3818, 1352, 321, 1 ],
 	[ "Porche", "PSY", "Shooter", 3, 10, 6, 1, 50, 392109, 33, 29, 58, 536, 338, 300, 1 ],
 	[ "Capote", "QCK", "Striker", 3, 10, 5, 1, 50, 392109, 124, 48, 36, 1188, 482, 139, 1 ],
 	[ "Hamburg", "DEX", [ "Striker", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 103, 58, 32, 1024, 620, 122, 1 ],
@@ -575,10 +575,10 @@ window.units = [
 	[ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
 	[ "Aokiji, Ice Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
 	[ "Tea Time Nami", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
-	[ "Monkey D. Luffy Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
-	[ "Monkey D. Luffy Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
-	[ "Roronoa Zoro Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Driven" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
-	[ "Roronoa Zoro Voyage Dream: Master Swordsman", "QCK", [ "Slasher", "Driven" ], 5, 20, 4, 3, 99, 3000000, 1329, 777, 90, 2250, 1118, 201, 1 ],
+	[ "Monkey D. Luffy, Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
+	[ "Monkey D. Luffy, Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
+	[ "Roronoa Zoro, Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Driven" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
+	[ "Roronoa Zoro, Voyage Dream: Master Swordsman", "QCK", [ "Slasher", "Driven" ], 5, 20, 4, 3, 99, 3000000, 1329, 777, 90, 2250, 1118, 201, 1 ],
 	[ "Genbou", "STR", [ "Shooter", "Free Spirit" ], 3, 15, 4, 1, 70, 1066998, 271, 91, 15, 1855, 711, 54, 0.7 ],
 	[ "Kamakiri", "QCK", [ "Striker", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 195, 84, 30, 1669, 691, 101, 0.7 ],
 	[ "Raki", "INT", "Shooter", 4, 18, 4, 2, 99, 3000000, 158, 55, 51, 1544, 668, 460, 0.7 ],
@@ -601,7 +601,7 @@ window.units = [
 	[ "Shanks the Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
 	[ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Free Spirit" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
 	[ "Eneru 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
-	[ "Eneru, Lightning Incarnate 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
+	[ "Eneru, Lightning Incarnate, 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
 	[ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
 	[ "Sanji Voyage Dream: All Blue", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1413, 577, 100, 2350, 1052, 208, 0.7 ],
 	[ "Zeff the Pirate", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
@@ -652,7 +652,7 @@ window.units = [
 	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
 	[ "Iron Mask Duval", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
 	[ "Duval, Head of the Flying Fish Riders", "DEX", [ "Shooter", "Driven" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
-	[ "Duval, Head of the Rosy Life Riders", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
+	[ "Duval, Rosy Life Riders Leader", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
 	[ "Pirate Arlong", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
 	[ "Arlong, Sun Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
 	[ "Kuroobi, Sun Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 50, 392109, 160, 103, 9, 1233, 744, 70, 1 ],
@@ -716,9 +716,9 @@ window.units = [
 	[ "Conis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
 	[ "Conis, Skypiea Girl", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
 	[ "Dracule Mihawk Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
-	[ "Dracule Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
-	[ "Sir Crocodile Logia Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
-	[ "Sir Crocodile Logia Former Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
+	[ "Hawk Eyes Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
+	[ "Sir Crocodile: Logia, Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
+	[ "Sir Crocodile: Logia, Ex-Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
 	[ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
 	[ "Jerry, Cipher Pol No. 6", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
 	[ "T-Bone", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 99, 78, 42, 958, 542, 162, 1 ],
@@ -935,7 +935,7 @@ window.units = [
 	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 1066998, 572, 268, 102, 1841, 797, 229, 1],
 	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
 	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
-	[ "Monkey D. Luffy, Vow to his Friends: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
+	[ "Monkey D. Luffy, Crew's Promise: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
 	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
 	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
 	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
@@ -1118,8 +1118,8 @@ window.units = [
 	[ "Sanji, Loyal Straw Hat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
 	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
 	[ "Nami, Loyal Straw Hat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
-    [ "Monkey D. Luffy Wakes of the Endless Dream, Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
-	[ "Monkey D. Luffy Oath of the Great Pirate Era: \"King of Pirates\"", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
+    [ "Monkey D. Luffy, Wakes of the Endless Dream, Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
+	[ "Monkey D. Luffy, A Vow in the Great Age of Pirates - Pirate King, "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
     [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, 1066998, 504, 277, 148, 1603, 808, 287, 1 ],
     [ "Cavendish of Hakuba", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, 5000000, 1541, 749, 231, 2970, 1460, 438, 1 ],
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 102, 151, 34, 981, 780, 201, 1 ],

From 5932b7250ada1797c819aeed2e71c49ca7b4e601 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Mon, 19 Sep 2016 21:44:05 +0200
Subject: [PATCH 0586/1569] More units updated

Changed the names of units 454 onwards to Global names
---
 common/data/units.js | 186 +++++++++++++++++++++----------------------
 1 file changed, 93 insertions(+), 93 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index a82218eb4..d5b4126e0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -458,65 +458,65 @@ window.units = [
 	[ "Heavy Specialist Curiel", "INT", [ "Shooter", "Driven" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
 	[ "Sengoku", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
 	[ "Sengoku the Buddha", "PSY", [ "Fighter", "Cerebral" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
-	[ "Criminal Galdino Mr. 3", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
-	[ "Escapee Bentham Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
-	[ "Prison Break Expert Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
+	[ "Galdino the Criminal, Mr. 3", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
+	[ "Escapee Bentham, Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
+	[ "Master Escape Artist Bentham, Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
 	[ "Satori", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 479, 190, 158, 1422, 576, 272, 1 ],
 	[ "Shura", "INT", "Striker", 4, 15, 4, 2, 70, 1066998, 330, 420, 93, 1030, 1002, 175, 1 ],
 	[ "Gedatsu", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 622, 378, 53, 2020, 703, 108, 1 ],
 	[ "Braham", "DEX", [ "Shooter", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 374, 283, 96, 1202, 684, 202, 1 ],
 	[ "Yama", "STR", "Fighter", 3, 13, 6, 1, 50, 392109, 800, 228, 1, 1700, 608, 2, 1 ],
-	[ "Yellow White Beret Skypiea Guard", "PSY", "Shooter", 2, 3, 6, 0, 20, 17456, 51, 23, 45, 330, 166, 89, 1 ],
-	[ "Black White Beret Skypiea Guard", "INT", "Shooter", 2, 3, 6, 0, 20, 17456, 49, 38, 40, 320, 197, 80, 1 ],
-	[ "Yellow White Beret Captain Skypiea Guard", "PSY", "Shooter", 3, 9, 5, 1, 50, 261406, 270, 128, 69, 845, 433, 198, 1 ],
-	[ "Black White Beret Captain Skypiea Guard", "INT", "Shooter", 3, 9, 5, 1, 50, 261406, 259, 142, 65, 837, 498, 177, 1 ],
-	[ "Eneru's Elect: Red Guard Skypiea Enforcer", "STR", "Slasher", 2, 8, 6, 0, 50, 261406, 388, 202, 87, 890, 503, 121, 1 ],
-	[ "Eneru's Elect: Blue Guard Skypiea Enforcer", "QCK", "Slasher", 2, 8, 6, 0, 50, 261406, 438, 155, 90, 962, 413, 139, 1 ],
-	[ "Eneru's Elect: Green Guard Skypiea Enforcer", "DEX", "Slasher", 2, 8, 6, 0, 50, 261406, 410, 179, 88, 926, 464, 128, 1 ],
-	[ "Eneru's Elect: Yellow Guard Skypiea Enforcer", "PSY", "Slasher", 2, 8, 6, 0, 50, 261406, 377, 140, 110, 859, 396, 170, 1 ],
-	[ "Eneru's Elect: Black Guard Skypiea Enforcer", "INT", "Slasher", 2, 8, 6, 0, 50, 261406, 390, 200, 80, 912, 501, 115, 1 ],
-	[ "Red Striker Skypiea Enforcer", "STR", "Striker", 2, 6, 4, 0, 30, 57558, 12, 55, 25, 311, 445, 70, 1 ],
-	[ "Blue Striker Skypiea Enforcer", "QCK", "Striker", 2, 6, 4, 0, 30, 57558, 20, 47, 27, 343, 420, 73, 1 ],
-	[ "Green Striker Skypiea Enforcer", "DEX", "Striker", 2, 6, 4, 0, 30, 57558, 16, 51, 26, 325, 435, 71, 1 ],
-	[ "Yellow Striker Skypiea Enforcer", "PSY", "Striker", 2, 6, 4, 0, 30, 57558, 12, 47, 30, 322, 418, 80, 1 ],
-	[ "Black Striker Skypiea Enforcer", "INT", "Striker", 2, 6, 4, 0, 30, 57558, 16, 54, 24, 329, 442, 68, 1 ],
-	[ "Red Striker Elite Skypiea Enforcer", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 243, 359, 45, 510, 804, 157, 1 ],
-	[ "Blue Striker Elite Skypiea Enforcer", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 278, 340, 48, 562, 772, 159, 1 ],
-	[ "Green Striker Elite Skypiea Enforcer", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 265, 350, 46, 536, 788, 158, 1 ],
-	[ "Yellow Striker Elite Skypiea Enforcer", "PSY", "Striker", 3, 12, 5, 1, 60, 449516, 242, 338, 53, 505, 760, 166, 1 ],
-	[ "Black Striker Elite Skypiea Enforcer", "INT", "Striker", 3, 12, 5, 1, 60, 449516, 250, 358, 45, 520, 802, 156, 1 ],
-	[ "Red Nomad Shandian Warrior", "STR", "Striker", 2, 6, 5, 0, 30, 57558, 79, 45, 26, 494, 302, 87, 1 ],
-	[ "Blue Nomad Shandian Warrior", "QCK", "Striker", 2, 6, 5, 0, 30, 57558, 92, 36, 30, 538, 268, 94, 1 ],
-	[ "Green Nomad Shandian Warrior", "DEX", "Striker", 2, 6, 5, 0, 30, 57558, 85, 40, 28, 517, 289, 89, 1 ],
-	[ "Red Nomad Adept Shandian Warrior", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 438, 228, 60, 864, 642, 162, 1 ],
-	[ "Blue Nomad Adept Shandian Warrior", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 460, 187, 63, 948, 570, 172, 1 ],
-	[ "Green Nomad Adept Shandian Warrior", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 449, 201, 61, 900, 606, 168, 1 ],
-	[ "Yellow Hunter Shandian Warrior", "PSY", "Shooter", 2, 5, 4, 0, 30, 57558, 38, 20, 41, 210, 115, 201, 1 ],
-	[ "Black Hunter Shandian Warrior", "INT", "Shooter", 2, 5, 4, 0, 30, 57558, 40, 25, 39, 214, 128, 196, 1 ],
-	[ "Yellow Hunter Adept Shandian Warrior", "PSY", "Shooter", 3, 11, 4, 1, 60, 449516, 150, 60, 160, 502, 258, 365, 1 ],
-	[ "Black Hunter Adept Shandian Warrior", "INT", "Shooter", 3, 11, 4, 1, 60, 449516, 152, 66, 153, 508, 271, 359, 1 ],
-	[ "Portgas D. Ace Mt. Corvo's Brothers 3", "QCK", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 90778, 144, 66, 60, 632, 347, 248, 0.7 ],
-	[ "Portgas D. Ace Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "QCK", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 571, 295, 200, 1072, 559, 385, 0.7 ],
+	[ "Yellow White Beret, Skypiea Guard", "PSY", "Shooter", 2, 3, 6, 0, 20, 17456, 51, 23, 45, 330, 166, 89, 1 ],
+	[ "Black White Beret, Skypiea Guard", "INT", "Shooter", 2, 3, 6, 0, 20, 17456, 49, 38, 40, 320, 197, 80, 1 ],
+	[ "Yellow White Beret Captain, Skypiea Guard", "PSY", "Shooter", 3, 9, 5, 1, 50, 261406, 270, 128, 69, 845, 433, 198, 1 ],
+	[ "Black White Beret Captain, Skypiea Guard", "INT", "Shooter", 3, 9, 5, 1, 50, 261406, 259, 142, 65, 837, 498, 177, 1 ],
+	[ "Eneru's Elect: Red Guard, Skypiea Enforcer", "STR", "Slasher", 2, 8, 6, 0, 50, 261406, 388, 202, 87, 890, 503, 121, 1 ],
+	[ "Eneru's Elect: Blue Guard, Skypiea Enforcer", "QCK", "Slasher", 2, 8, 6, 0, 50, 261406, 438, 155, 90, 962, 413, 139, 1 ],
+	[ "Eneru's Elect: Green Guard, Skypiea Enforcer", "DEX", "Slasher", 2, 8, 6, 0, 50, 261406, 410, 179, 88, 926, 464, 128, 1 ],
+	[ "Eneru's Elect: Yellow Guard, Skypiea Enforcer", "PSY", "Slasher", 2, 8, 6, 0, 50, 261406, 377, 140, 110, 859, 396, 170, 1 ],
+	[ "Eneru's Elect: Black Guard, Skypiea Enforcer", "INT", "Slasher", 2, 8, 6, 0, 50, 261406, 390, 200, 80, 912, 501, 115, 1 ],
+	[ "Red Striker, Skypiea Enforcer", "STR", "Striker", 2, 6, 4, 0, 30, 57558, 12, 55, 25, 311, 445, 70, 1 ],
+	[ "Blue Striker, Skypiea Enforcer", "QCK", "Striker", 2, 6, 4, 0, 30, 57558, 20, 47, 27, 343, 420, 73, 1 ],
+	[ "Green Striker, Skypiea Enforcer", "DEX", "Striker", 2, 6, 4, 0, 30, 57558, 16, 51, 26, 325, 435, 71, 1 ],
+	[ "Yellow Striker, Skypiea Enforcer", "PSY", "Striker", 2, 6, 4, 0, 30, 57558, 12, 47, 30, 322, 418, 80, 1 ],
+	[ "Black Striker, Skypiea Enforcer", "INT", "Striker", 2, 6, 4, 0, 30, 57558, 16, 54, 24, 329, 442, 68, 1 ],
+	[ "Red Striker Elite, Skypiea Enforcer", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 243, 359, 45, 510, 804, 157, 1 ],
+	[ "Blue Striker Elite, Skypiea Enforcer", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 278, 340, 48, 562, 772, 159, 1 ],
+	[ "Green Striker Elite, Skypiea Enforcer", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 265, 350, 46, 536, 788, 158, 1 ],
+	[ "Yellow Striker Elite, Skypiea Enforcer", "PSY", "Striker", 3, 12, 5, 1, 60, 449516, 242, 338, 53, 505, 760, 166, 1 ],
+	[ "Black Striker Elite, Skypiea Enforcer", "INT", "Striker", 3, 12, 5, 1, 60, 449516, 250, 358, 45, 520, 802, 156, 1 ],
+	[ "Red Nomad, Shandian Warrior", "STR", "Striker", 2, 6, 5, 0, 30, 57558, 79, 45, 26, 494, 302, 87, 1 ],
+	[ "Blue Nomad, Shandian Warrior", "QCK", "Striker", 2, 6, 5, 0, 30, 57558, 92, 36, 30, 538, 268, 94, 1 ],
+	[ "Green Nomad, Shandian Warrior", "DEX", "Striker", 2, 6, 5, 0, 30, 57558, 85, 40, 28, 517, 289, 89, 1 ],
+	[ "Red Nomad Adept, Shandian Warrior", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 438, 228, 60, 864, 642, 162, 1 ],
+	[ "Blue Nomad Adept, Shandian Warrior", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 460, 187, 63, 948, 570, 172, 1 ],
+	[ "Green Nomad Adept, Shandian Warrior", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 449, 201, 61, 900, 606, 168, 1 ],
+	[ "Yellow Hunter, Shandian Warrior", "PSY", "Shooter", 2, 5, 4, 0, 30, 57558, 38, 20, 41, 210, 115, 201, 1 ],
+	[ "Black Hunter, Shandian Warrior", "INT", "Shooter", 2, 5, 4, 0, 30, 57558, 40, 25, 39, 214, 128, 196, 1 ],
+	[ "Yellow Hunter Adept, Shandian Warrior", "PSY", "Shooter", 3, 11, 4, 1, 60, 449516, 150, 60, 160, 502, 258, 365, 1 ],
+	[ "Black Hunter Adept, Shandian Warrior", "INT", "Shooter", 3, 11, 4, 1, 60, 449516, 152, 66, 153, 508, 271, 359, 1 ],
+	[ "Portgas D. Ace, Mt. Corvo's Brothers 3", "QCK", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 90778, 144, 66, 60, 632, 347, 248, 0.7 ],
+	[ "Portgas D. Ace, Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "QCK", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 571, 295, 200, 1072, 559, 385, 0.7 ],
 	[ "Bellmere", "DEX", "Shooter", 3, 9, 5, 1, 35, 136167, 60, 39, 68, 426, 291, 283, 1 ],
-	[ "Bellmere Nami and Nojiko's Mother", "DEX", "Shooter", 4, 15, 4, 2, 70, 1066998, 377, 249, 240, 810, 483, 400, 1 ],
+	[ "Bellmere, Nami and Nojiko's Mother", "DEX", "Shooter", 4, 15, 4, 2, 70, 1066998, 377, 249, 240, 810, 483, 400, 1 ],
 	[ "Kaya", "PSY", [ "Shooter", "Cerebral" ], 3, 9, 6, 1, 35, 136167, 115, 50, 72, 370, 180, 330, 1.5 ],
-	[ "Kaya A Rich Young Girl from Syrup Village", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 331, 151, 275, 405, 250, 550, 1.5 ],
+	[ "Kaya, A rich young girl from Syrup Village", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 331, 151, 275, 405, 250, 550, 1.5 ],
 	[ "Hotori and Kotori", "INT", "Fighter", 3, 9, 6, 1, 35, 136167, 242, 74, 27, 1055, 455, 122, 1 ],
-	[ "Hotori and Kotori Skypiea Vice Head Enforcers", "INT", "Fighter", 4, 15, 4, 2, 70, 1066998, 989, 385, 92, 1959, 601, 151, 1 ],
+	[ "Hotori and Kotori, Skypiea Vice Head Enforcers", "INT", "Fighter", 4, 15, 4, 2, 70, 1066998, 989, 385, 92, 1959, 601, 151, 1 ],
 	[ "Pell", "QCK", [ "Slasher", "Powerhouse" ], 3, 9, 6, 1, 35, 136167, 175, 70, 40, 1000, 427, 142, 1 ],
-	[ "Pell The Guardian Falcon of Alabasta", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
+	[ "Pell, The guardian falcon of Alabasta.", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
 	[ "Chaka", "STR", [ "Slasher", "Powerhouse" ], 3, 9, 5, 1, 35, 136167, 173, 120, 21, 822, 615, 109, 1 ],
-	[ "Chaka The Guardian Jackal of Alabasta", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
-	[ "Sir Crocodile, the Strongest Prisoner Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
-	[ "Sir Crocodile, the Strongest Prisoner Ex-Warlord", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
-	[ "Daz Bones, Convict Mr. 1", "INT", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
+	[ "Chaka, The guardian jackal of Alabasta.", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
+	[ "Sir Crocodile, the Strongest Prisoner, Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
+	[ "Sir Crocodile, the Strongest Prisoner, Ex-Seven Warlords Member", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
+	[ "Daz Bones, Convict, Mr. 1", "INT", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
 	[ "Sabo Mt. Corvo's Brothers 3", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 5, 2, 35, 90778, 32, 32, 32, 522, 288, 286, 0.7 ],
 	[ "Sabo Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "PSY", [ "Striker", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 440, 233, 242, 951, 460, 450, 0.7 ],
 	[ "Nico Robin Tropical", "INT", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 99, 2000000, 368, 128, 96, 1910, 715, 292, 1 ],
-	[ "Heracles'n", "PSY", [ "Shooter", "Cerebral" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
-	[ "Heracles'n the Hero of the Forest", "PSY", [ "Shooter", "Cerebral" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
-	[ "Usopp'n", "PSY", "Shooter", 4, 10, 5, 1, 50, 261406, 444, 237, 47, 1080, 648, 144, 1 ],
-	[ "Usopp'n, Pupil of Heracles'n", "PSY", [ "Shooter", "Powerhouse" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
+	[ "Heracles-un", "PSY", [ "Shooter", "Cerebral" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
+	[ "Heracles-un, Hero of the Forest", "PSY", [ "Shooter", "Cerebral" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
+	[ "Usopp-un", "PSY", "Shooter", 4, 10, 5, 1, 50, 261406, 444, 237, 47, 1080, 648, 144, 1 ],
+	[ "Usopp-un, Hercules' Student", "PSY", [ "Shooter", "Powerhouse" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
 	[ "Monkey D. Luffy, Merveille's Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
 	[ "Monkey D. Luffy, Straw Hat Pirates' Attack", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
 	[ "Sanji, Merveille's Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
@@ -536,17 +536,17 @@ window.units = [
 	[ "Nami Blossom Cloud", "DEX", [ "Shooter", "Cerebral" ], 4, 12, 5, 2, 50, 392109, 127, 53, 73, 812, 303, 287, 1 ],
 	[ "Nami Blossom Climate", "DEX", [ "Shooter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 750, 247, 241, 1783, 670, 445, 1 ],
 	[ "Domino", "PSY", [ "Fighter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 32, 20, 80, 713, 366, 318, 1 ],
-	[ "Domino, Impel Down's Head Jailer", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 2, 99, 3000000, 634, 301, 265, 1800, 694, 449, 1 ],
+	[ "Domino, Impel Down Vice Head Jailer", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 2, 99, 3000000, 634, 301, 265, 1800, 694, 449, 1 ],
 	[ "Minorhinoceros", "STR", [ "Striker", "Powerhouse" ], 3, 30, 6, 0, 70, 1066998, 1055, 655, 0, 2122, 815, -250, 1 ],
 	[ "Basilisk", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 4, 1, 70, 1066998, 612, 289, 31, 1525, 644, 128, 1 ],
 	[ "Ohm", "STR", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 770, 480, -600, 2200, 1050, -600, 1 ],
-	[ "Nola Giant Snake", "PSY", [ "Fighter", "Powerhouse" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
+	[ "Nola, Giant Snake", "PSY", [ "Fighter", "Powerhouse" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
 	[ "Wyper", "DEX", [ "Shooter", "Free Spirit" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
-	[ "Wyper Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
+	[ "Wyper, Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
 	[ "Eneru", "PSY", [ "Shooter", "Driven" ], 3, 12, 4, 2, 50, 392109, 177, 141, 58, 951, 615, 185, 1 ],
 	[ "Kami Eneru", "PSY", [ "Shooter", "Driven" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
-	[ "Monkey D. Luffy Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
-	[ "Monkey D. Luffy Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
+	[ "Monkey D. Luffy, Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
+	[ "Monkey D. Luffy, Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
 	[ "Sadie", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
 	[ "Sadie, Impel Down Chief Jailer", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
 	[ "Minokoala", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
@@ -568,10 +568,10 @@ window.units = [
 	[ "Big Bun", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 180, 105, 2, 1895, 850, 3, 1 ],
 	[ "Foxy", "INT", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 106, 51, 30, 788, 433, 175, 1 ],
 	[ "The Silver Fox Foxy", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 725, 373, 144, 1212, 698, 266, 1 ],
-	[ "Monkey D. Luffy Davy Back Fight: Afro", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
-	[ "Monkey D. Luffy Davy Back Fight: Combat", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
-	[ "Usopp Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
-	[ "Tony Tony Chopper Davy Back Fight: Mask", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
+	[ "Monkey D. Luffy, Davy Back Fight: Afro", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
+	[ "Monkey D. Luffy, Davy Back Fight: Combat", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
+	[ "Usopp, Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
+	[ "Tony Tony Chopper, Davy Back Fight: Mask", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
 	[ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
 	[ "Aokiji, Ice Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
 	[ "Tea Time Nami", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
@@ -584,30 +584,30 @@ window.units = [
 	[ "Raki", "INT", "Shooter", 4, 18, 4, 2, 99, 3000000, 158, 55, 51, 1544, 668, 460, 0.7 ],
 	[ "Aisa", "PSY", "Fighter", 3, 11, 5, 2, 50, 392109, 32, 15, 80, 223, 109, 475, 0.7 ],
 	[ "Nojiko", "PSY", [ "Striker", "Cerebral" ], 3, 9, 5, 1, 35, 136167, 125, 57, 60, 398, 277, 293, 1 ],
-	[ "Nojiko Nami's Sister", "PSY", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 70, 1066998, 330, 233, 253, 709, 382, 438, 1 ],
+	[ "Nojiko, Nami's Sister", "PSY", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 70, 1066998, 330, 233, 253, 709, 382, 438, 1 ],
 	[ "Crocus", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 1, 35, 136167, 202, 60, 41, 886, 301, 203, 1 ],
-	[ "Crocus, Twin Cape's Lighthouse Keeper", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 820, 249, 160, 1224, 509, 320, 1 ],
+	[ "Crocus, Twin Cape Lighthouse Keeper", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 820, 249, 160, 1224, 509, 320, 1 ],
 	[ "Koza", "QCK", "Slasher", 3, 9, 5, 1, 35, 136167, 179, 69, 33, 939, 423, 158, 1 ],
-	[ "Koza Rebel Leader", "QCK", "Slasher", 4, 15, 4, 2, 70, 1066998, 872, 375, 114, 1440, 681, 225, 1 ],
+	[ "Koza, Rebel Leader", "QCK", "Slasher", 4, 15, 4, 2, 70, 1066998, 872, 375, 114, 1440, 681, 225, 1 ],
 	[ "Crimson Hime Turtle", "STR", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
 	[ "Azure Hime Turtle", "QCK", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
 	[ "Jade Hime Turtle", "DEX", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
 	[ "Amber Hime Turtle", "PSY", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
 	[ "Onyx Hime Turtle", "INT", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
-	[ "Tony Tony Chopper Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 220, 95, 46, 1324, 589, 186, 0.7 ],
-	[ "Tony Tony Chopper Voyage Dream: Great Doctor", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
-	[ "Buggy the Pirate Apprentice", "INT", [ "Slasher", "Driven" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
+	[ "Tony Tony Chopper, Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 220, 95, 46, 1324, 589, 186, 0.7 ],
+	[ "Tony Tony Chopper, Voyage Dream: Great Doctor", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
+	[ "Buggy, Pirate Apprentice", "INT", [ "Slasher", "Driven" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
 	[ "Buggy, Roger Pirates", "INT", [ "Slasher", "Driven" ], 4, 19, 5, 2, 99, 3000000, 813, 358, 123, 1602, 709, 290, 1 ],
-	[ "Shanks the Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
+	[ "Shanks, Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
 	[ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Free Spirit" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
-	[ "Eneru 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
+	[ "Eneru, 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
 	[ "Eneru, Lightning Incarnate, 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
 	[ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
 	[ "Sanji Voyage Dream: All Blue", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1413, 577, 100, 2350, 1052, 208, 0.7 ],
-	[ "Zeff the Pirate", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
-	[ "Red Leg Zeff, Captain of the Cook Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1152, 599, 81, 2000, 1088, 258, 1 ],
-	[ "Thug Patty", "STR", "Shooter", 3, 10, 4, 1, 50, 522812, 155, 120, 25, 1080, 648, 132, 0.7 ],
-	[ "Thug Carne", "QCK", "Slasher", 3, 10, 6, 1, 50, 522812, 153, 91, 35, 1054, 571, 162, 0.7 ],
+	[ "Pirate Zeff", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
+	[ "Red-Leg Zeff, Cook Pirates Captain", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1152, 599, 81, 2000, 1088, 258, 1 ],
+	[ "Gangster Patty", "STR", "Shooter", 3, 10, 4, 1, 50, 522812, 155, 120, 25, 1080, 648, 132, 0.7 ],
+	[ "Gangster Carne", "QCK", "Slasher", 3, 10, 6, 1, 50, 522812, 153, 91, 35, 1054, 571, 162, 0.7 ],
 	[ "Hiking Bear", "INT", "Fighter", 2, 7, 5, 0, 35, 90778, 129, 32, 8, 1410, 225, 30, 0.7 ],
 	[ "Purinpurin", "PSY", "Shooter", 2, 7, 6, 0, 35, 90778, 38, 14, 29, 544, 194, 193, 0.7 ],
 	[ "Brook Voyage Log: Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 208, 99, 29, 1326, 603, 168, 0.7 ],
@@ -616,44 +616,44 @@ window.units = [
 	[ "Demolisher Axeman", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
 	[ "Demolisher Spearman", "STR", [ "Striker", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
 	[ "Demolisher Gunner", "STR", [ "Shooter", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
-	[ "Street Punk: Brawler Red Bounty Hunter", "STR", "Fighter", 3, 13, 6, 1, 60, 674274, 102, 85, 28, 1158, 790, 90, 1 ],
-	[ "Street Punk: Brawler Green Bounty Hunter", "DEX", "Fighter", 3, 13, 6, 1, 60, 674274, 108, 75, 32, 1175, 754, 102, 1 ],
-	[ "Street Punk: Blade Blue Bounty Hunter", "QCK", "Slasher", 3, 13, 5, 1, 60, 674274, 153, 66, 40, 1215, 653, 128, 1 ],
-	[ "Street Punk: Blade Red Bounty Hunter", "STR", "Slasher", 3, 13, 5, 1, 60, 674274, 149, 73, 33, 1193, 690, 115, 1 ],
-	[ "Street Punk: Bullet Green Bounty Hunter", "DEX", "Shooter", 3, 13, 5, 1, 60, 674274, 92, 45, 51, 938, 500, 255, 1 ],
-	[ "Street Punk: Bullet Yellow Bounty Hunter", "PSY", "Shooter", 3, 13, 5, 1, 60, 674274, 86, 38, 55, 900, 467, 274, 1 ],
-	[ "Street Punk: Nails Yellow Bounty Hunter", "PSY", "Striker", 3, 13, 4, 1, 60, 674274, 71, 102, 33, 878, 854, 119, 1 ],
-	[ "Street Punk: Nails Black Bounty Hunter", "INT", "Striker", 3, 13, 4, 1, 60, 674274, 71, 108, 29, 877, 890, 107, 1 ],
-	[ "Street Punk: Gatling Black Bounty Hunter", "INT", "Shooter", 3, 13, 6, 1, 60, 674274, 133, 90, 3, 1556, 765, 15, 1 ],
-	[ "Street Punk: Gatling Blue Bounty Hunter", "QCK", "Shooter", 3, 13, 6, 1, 60, 674274, 150, 84, 5, 1602, 745, 16, 1 ],
+	[ "Street Punk: Brawler, Red Bounty Hunter", "STR", "Fighter", 3, 13, 6, 1, 60, 674274, 102, 85, 28, 1158, 790, 90, 1 ],
+	[ "Street Punk: Brawler, Green Bounty Hunter", "DEX", "Fighter", 3, 13, 6, 1, 60, 674274, 108, 75, 32, 1175, 754, 102, 1 ],
+	[ "Street Punk: Blade, Blue Bounty Hunter", "QCK", "Slasher", 3, 13, 5, 1, 60, 674274, 153, 66, 40, 1215, 653, 128, 1 ],
+	[ "Street Punk: Blade, Red Bounty Hunter", "STR", "Slasher", 3, 13, 5, 1, 60, 674274, 149, 73, 33, 1193, 690, 115, 1 ],
+	[ "Street Punk: Bullet, Green Bounty Hunter", "DEX", "Shooter", 3, 13, 5, 1, 60, 674274, 92, 45, 51, 938, 500, 255, 1 ],
+	[ "Street Punk: Bullet, Yellow Bounty Hunter", "PSY", "Shooter", 3, 13, 5, 1, 60, 674274, 86, 38, 55, 900, 467, 274, 1 ],
+	[ "Street Punk: Nails, Yellow Bounty Hunter", "PSY", "Striker", 3, 13, 4, 1, 60, 674274, 71, 102, 33, 878, 854, 119, 1 ],
+	[ "Street Punk: Nails, Black Bounty Hunter", "INT", "Striker", 3, 13, 4, 1, 60, 674274, 71, 108, 29, 877, 890, 107, 1 ],
+	[ "Street Punk: Gatling, Black Bounty Hunter", "INT", "Shooter", 3, 13, 6, 1, 60, 674274, 133, 90, 3, 1556, 765, 15, 1 ],
+	[ "Street Punk: Gatling, Blue Bounty Hunter", "QCK", "Shooter", 3, 13, 6, 1, 60, 674274, 150, 84, 5, 1602, 745, 16, 1 ],
 	[ "Tilestone", "STR", [ "Shooter", "Powerhouse" ], 3, 12, 4, 2, 70, 1066998, 153, 98, 30, 1521, 800, 101, 1 ],
-	[ "Franky Franky Family", "INT", "Fighter", 3, 17, 5, 2, 70, 1066998, 203, 103, 23, 1712, 831, 85, 1 ],
-	[ "Kaku Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 175, 80, 36, 1224, 643, 120, 1 ],
-	[ "Kaku: Six Powers Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1144, 577, 93, 2523, 1000, 196, 1 ],
-	[ "Rob Lucci Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 121, 153, 20, 1121, 792, 64, 1 ],
-	[ "Rob Lucci: Six Powers Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 1064, 743, 51, 2284, 1289, 134, 1 ],
+	[ "Franky, Franky Family", "INT", "Fighter", 3, 17, 5, 2, 70, 1066998, 203, 103, 23, 1712, 831, 85, 1 ],
+	[ "Kaku, Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 175, 80, 36, 1224, 643, 120, 1 ],
+	[ "Kaku: Six Powers, Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1144, 577, 93, 2523, 1000, 196, 1 ],
+	[ "Rob Lucci, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 121, 153, 20, 1121, 792, 64, 1 ],
+	[ "Rob Lucci: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 1064, 743, 51, 2284, 1289, 134, 1 ],
 	[ "Camie", "QCK", "Fighter", 3, 12, 4, 1, 50, 392109, 90, 23, 62, 960, 352, 273, [ 0.7, 1, 0.7 ] ],
-	[ "Camie, Takoyaki Stand Assistant", "QCK", "Fighter", 4, 18, 5, 2, 99, 3000000, 900, 295, 231, 1731, 698, 455, 0.7 ],
-	[ "Pappug", "INT", "Fighter", 3, 12, 5, 1, 50, 392109, 77, 30, 77, 895, 505, 214, 0.7 ],
-	[ "Hatchan, Takoyaki Stand Owner", "PSY", [ "Slasher", "Powerhouse" ], 3, 16, 6, 2, 99, 3000000, 134, 88, 41, 1788, 888, 187, 0.7 ],
+	[ "Camie, Takoyaki Shop Clerk", "QCK", "Fighter", 4, 18, 5, 2, 99, 3000000, 900, 295, 231, 1731, 698, 455, 0.7 ],
+	[ "Pappagu", "INT", "Fighter", 3, 12, 5, 1, 50, 392109, 77, 30, 77, 895, 505, 214, 0.7 ],
+	[ "Hatchan, Takoyaki Shop Manager", "PSY", [ "Slasher", "Powerhouse" ], 3, 16, 6, 2, 99, 3000000, 134, 88, 41, 1788, 888, 187, 0.7 ],
 	[ "Doma", "QCK", "Slasher", 4, 18, 4, 3, 70, 1066998, 89, 144, 43, 1098, 733, 187, 0.7 ],
 	[ "Bohemian Knight Doma", "QCK", "Slasher", 5, 29, 4, 4, 99, 4000000, 1020, 695, 150, 2134, 1268, 328, 0.7 ],
 	[ "DeCalvan Brothers", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 240, 89, 28, 1880, 668, 73, 0.7 ],
-	[ "DeCalvan Brothers Brothers' Bond", "DEX", "Fighter", 5, 29, 5, 4, 99, 4000000, 1824, 602, 50, 3330, 1183, 158, 0.7 ],
+	[ "DeCalvan Brothers, Brothers' Bond", "DEX", "Fighter", 5, 29, 5, 4, 99, 4000000, 1824, 602, 50, 3330, 1183, 158, 0.7 ],
 	[ "Squard", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 198, 190, 0, 1351, 810, 0, 0.7 ],
 	[ "Maelstrom Spider Squard", "PSY", [ "Striker", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 960, 755, -1, 2755, 1434, -150, 0.7 ],
 	[ "Whitey Bay", "INT", [ "Slasher", "Driven" ], 4, 18, 5, 3, 70, 1066998, 109, 93, 44, 1140, 600, 223, 0.7 ],
 	[ "Ice Witch Whitey Bay", "INT", [ "Slasher", "Driven" ], 5, 29, 5, 4, 99, 4000000, 1094, 561, 171, 2278, 993, 399, 0.7 ],
 	[ "Little Oars Jr.", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 6, 3, 70, 1066998, 251, 166, 1, 1900, 734, 3, 0.7 ],
-	[ "Little Oars Jr. Charging!", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
+	[ "Little Oars Jr., Charging!", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
 	[ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
 	[ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
 	[ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Cerebral" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
 	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
 	[ "Iron Mask Duval", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
-	[ "Duval, Head of the Flying Fish Riders", "DEX", [ "Shooter", "Driven" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
+	[ "Duval, Flying Fish Riders Leader", "DEX", [ "Shooter", "Driven" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
 	[ "Duval, Rosy Life Riders Leader", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
-	[ "Pirate Arlong", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
+	[ "Arlong the Pirate", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
 	[ "Arlong, Sun Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
 	[ "Kuroobi, Sun Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 50, 392109, 160, 103, 9, 1233, 744, 70, 1 ],
 	[ "Choo, Sun Pirates", "INT", [ "Shooter", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 75, 72, 22, 1002, 552, 178, 1 ],
@@ -661,11 +661,11 @@ window.units = [
 	[ "Usopp Voyage Log: Straw Hat Pirates", "QCK", "Striker", 4, 12, 6, 2, 50, 392109, 155, 67, 47, 1085, 513, 235, 0.7 ],
 	[ "Usopp Voyage Dream: Brave Sea Warrior", "QCK", "Striker", 5, 20, 4, 3, 99, 3000000, 1024, 468, 185, 2012, 938, 344, 0.7 ],
 	[ "Nami Holiday", "PSY", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 70, 30, 100, 1334, 673, 396, 0.7 ],
-	[ "Nefertari Vivi, Princess of the Alabasta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 6, 1, 35, 136167, 11, 11, 11, 285, 104, 225, 1 ],
-	[ "Nefertari Vivi, Vice-Leader of the Suna Suna Clan", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 243, 51, 187, 593, 269, 488, 1 ],
+	[ "Nefeltari Vivi, Princess of Alabasta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 6, 1, 35, 136167, 11, 11, 11, 285, 104, 225, 1 ],
+	[ "Nefeltari Vivi, Sand-Sand Band Sub-Leader", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 243, 51, 187, 593, 269, 488, 1 ],
 	[ "Koza, Alabasta Citizen", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 53, 53, 3, 503, 274, 151, 1 ],
-	[ "Koza, Leader of the Suna Suna Clan", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 445, 230, 123, 1000, 503, 341, 1 ],
-	[ "Nefertari Cobra, King of the Alabasta Kingdom", "PSY", "Fighter", 3, 15, 5, 2, 70, 1066998, 523, 294, 31, 1402, 571, 211, 1 ],
+	[ "Koza, Sand-Sand Band Leader", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 445, 230, 123, 1000, 503, 341, 1 ],
+	[ "Nefeltari Cobra, King of Alabasta Kingdom", "PSY", "Fighter", 3, 15, 5, 2, 70, 1066998, 523, 294, 31, 1402, 571, 211, 1 ],
 	[ "Sabo", "PSY", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 70, 1066998, 369, 279, 169, 1498, 821, 305, 1.5 ],
 	[ "Sabo the Revolutionary", "PSY", [ "Free Spirit", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1440, 752, 252, 2985, 1422, 451, 1.5 ],
 	[ "Koala", "DEX", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 94, 122, 48, 996, 644, 226, 1.5 ],

From 9c12581a6e6256499374039c5869121c8229f9f2 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 20 Sep 2016 21:10:11 +0200
Subject: [PATCH 0587/1569] Mansherry CD

---
 common/data/details.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 217df2e3d..c69ed45ef 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5259,15 +5259,15 @@ window.details = {
 		special: [
 			{
 				"description": "Recovers 6x character's RCV in HP. Removes Paralysis",
-				"cooldown": 14
+				"cooldown": [ 14, 8 ]
 			},
 			{
 				"description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": 19
+				"cooldown": [ 19, 13 ]
 			},
 			{
 				"description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": 24
+				"cooldown": [ 24, 18 ]
 			},
 		],
 		specialNotes: "#{stages}",
@@ -5278,15 +5278,15 @@ window.details = {
 		special: [
 			{
 				"description": "Recovers 6x character's RCV in HP. Removes Paralysis",
-				"cooldown": 14
+				"cooldown": [ 14, 8 ]
 			},
 			{
 				"description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": 19
+				"cooldown": [ 19, 13 ]
 			},
 			{
 				"description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": 24
+				"cooldown": [ 24, 18 ]
 			},
 		],
 		specialNotes: "#{stages}",

From 88e4ea1db71a681f2dbf0b555a01b16fbdec8412 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 20 Sep 2016 21:16:19 +0200
Subject: [PATCH 0588/1569] New FN CDs

---
 common/data/cooldowns.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7c58c4e71..aef98b361 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -971,8 +971,8 @@ window.cooldowns = [
 	[ 28, 20 ],
 	[ 28, 20 ],
 	[ 28, 20 ],
-	22,
-	22,
+	[ 22, 15 ],
+	[ 22, 15 ],
 	[ 15, 15 ],
 	[ 15, 15 ],
     [ 25, 11 ],
@@ -1240,16 +1240,19 @@ window.cooldowns = [
 	null,//Kizaru
 	null,//Kizaru
 	[ 19, 11 ],
-    [ 19, 11 ],
-    [ 20, 15 ],
-    [ 20, 15 ],
-    [ 23, 17 ],
-    null,
-    null,
-    [ 13, 13 ],
-    [ 13, 13 ],
-    null,//Colo Marco
-    null,//Colo Marco
-    [ 24, 14 ],
-    [ 14, 6 ],
+	[ 19, 11 ],
+    	[ 20, 15 ],
+    	[ 20, 15 ],
+    	[ 23, 17 ],
+    	null,
+    	null,
+    	[ 13, 13 ],
+    	[ 13, 13 ],
+    	null,//Colo Marco
+    	null,//Colo Marco
+    	[ 24, 14 ],
+    	[ 14, 6 ],
+    	[ 21, 14 ],
+    	[ 19, 12 ],
+    	[ 18, 12 ]
 ];

From 9af4d4c5fce362f24dcbec3e6fe704e6ce1a54b9 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 20 Sep 2016 21:53:23 +0200
Subject: [PATCH 0589/1569] FN Stuff + Units completion

---
 common/data/captains.js    | 13 +++++++++++--
 common/data/details.js     | 16 ++++++++++++++++
 common/data/specials.js    | 11 +++++++++++
 common/data/units.js       | 20 ++++++++++----------
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  4 ++--
 6 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 419c17cea..14c0ef22e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3255,6 +3255,15 @@ window.captains = {
         atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
     },
     1253: {
-		atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
+    },
+    1254: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? p.unit.class.has("Striker") ? 2.75 : 1 : 1; },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1256: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; },
+    }
 };
diff --git a/common/data/details.js b/common/data/details.js
index c69ed45ef..96b597e4b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6453,11 +6453,27 @@ window.details = {
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
         special: "Changes adjacent orbs into [INT] orbs. Deals 20x character's ATK in [INT] damage to all enemies.",
         specialName: "Reversed Twin Blades - Surprise Thrust",
+        sailor: "Reduces own Silence by 1 Turn"
     },
     1253: {// Coliseum Shura
         captain: "Boosts ATK of [DEX] characters by 2.25x if HP is above 99% at the start of the turn",
         special: "For 1 turn, Perfects become harder to hit. If during that turn every unit scores a Perfect hit, boosts ATK of [DEX] characters by 1.75x in the following turn.",
         specialName: "Angry Instigator",
     },
+    1254: {//FN Squard
+        captain: " Boost ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
+        special: "Deals 10x his ATK to one enemy, reduces crews current HP by 30% and reduces enemies defense by a certain amount for one turn",
+        sailor: "Reduces his own Numbness by 1 turn"
+    },
+    1255: {//FN DeCalvan
+        captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2x after the 16th hit, by 2.5x after the 22nd hit",
+        special: "For 1 turn, makes Perfects slightly easier to hit and amplifies the effect of orbs by 1.5x",
+        sailor: "When HP is low, boost base ATK of Fighters by 40"
+    },
+    1256: {//FN Bailey
+        captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
+        special: "Shuffle non-matching orbs on Slashers and Driven characters, boost Atk against enemies with increased defense by 1.3x for 1 turn",
+        sailor: "Boosts ATK and RCV of Driven characters by 10"
+    }
 };
 
diff --git a/common/data/specials.js b/common/data/specials.js
index 2f2da3c03..0130677d9 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1640,4 +1640,15 @@ window.specials = {
 		atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
 		type: "class"
 	},
+    1254: {
+        def: function(p) { return 0.5; } //TODO: get correct value
+    },
+    1255: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1256: {
+        atk: function(p) { return 1.3 },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+    }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 41b4ce3de..7dadbd7c1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1243,18 +1243,18 @@ window.units = [
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, null ],
+    [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
     [ "Ace, At Marineford", "STR", [ "Fighter", "Shooter" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ace, At Marineford Evolved", "STR", [ "Fighter", "Shooter" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kimono Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, 142, 79, 40, 940, 504, 201, null ],
-    [ "Kimono Marco Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, null, 870, 452, 164, 1804, 1017, 374, null ],
-    [ "Coliseum Marco", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, null ],
-    [ "Coliseum Marco Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, null, null, null, null ],
-    [ "Coliseum Doma", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, null ],
-    [ "Coliseum Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, null ],
-    [ "Fortnight Squard", "QCK", [ "Striker", "Slasher" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Decalvan Brothers", "PSY", "Fighter", 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Whitey Bay", "DEX", [ "Slasher", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fluttering in Neck the Autumn Breeze, Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, 142, 79, 40, 940, 504, 201, null ],
+    [ "Tipsy Kimono, Marco", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, null, 870, 452, 164, 1804, 1017, 374, null ],
+    [ "Coliseum Marco", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
+    [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
+    [ "Whitebeard Pirates Doma ", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
+    [ "Coliseum Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
+    [ "Fortnight Squard", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
+    [ "Fortnight Decalvan Brothers", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
+    [ "Fortnight Whitey Bay", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 151d4e6a9..fbc1dd33d 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1123, 1125, 1127, 1129, 1131, 1133 ];
+    var newUnits = [ 1245, 1251, 1252, 1253, 1254, 1255, 1256 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 878a83f75..bd11a524c 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>16/09/2016</p>
+            <p>20/09/2016</p>
             <br>
             <ul>
                 <li>Units Updated, Ship Thumbnails updated</li>
@@ -75,7 +75,7 @@
                 <br>
             </ul>
             <table id="table">
-                   <p>Recently Completed:</p>
+                   <p>Recently Added:</p>
                     <tbody>
                         <tr>
                             <td id="newUnits">

From e590ee611fec73d6312d8786e872df3b507ea0fa Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 20 Sep 2016 21:56:20 +0200
Subject: [PATCH 0590/1569] Mansherry CD for Drops page

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index aef98b361..009a32735 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1076,8 +1076,8 @@ window.cooldowns = [
 	17,
 	[ 20, 16 ], //Leo
 	[ 20, 16 ], //Leo
-	null, //Mansherry
-	null, //Mansherry
+	[ 24, 18 ], //Mansherry
+	[ 24, 18 ], //Mansherry
 	[ 18, 12 ],
 	[ 18, 12 ],
 	[ 23, 17 ],

From 667e8e2046291031d17f2eea76a7ea00fcd48cdc Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 20 Sep 2016 21:57:35 +0200
Subject: [PATCH 0591/1569] Drop icon

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 5adbf8559..6548b698a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1150,7 +1150,7 @@ window.drops = {
         
         {
             name: "Gather! Whitebeard Alliance",
-            thumb: null,
+            thumb: 1254,
             condition: "Driven Characters have their cooldowns reduced by 10 turns at the start of the fight",
             "All Difficulties": [ 1254, 1255, 1256, -669, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },

From 8cce786edfbe37d6ef842fb46294660524e82100 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 23 Sep 2016 22:55:43 -0500
Subject: [PATCH 0592/1569] All new units updated

bamo
---
 common/data/cooldowns.js |  31 +++----
 common/data/details.js   | 169 ++++++++++++++++++++++++++++-----------
 common/data/drops.js     |   4 +-
 common/data/families.js  |  25 ++++++
 common/data/flags.js     |  23 ++++++
 common/data/gw.js        |  25 ++++++
 common/data/units.js     |  40 ++++++---
 index.html               |   4 +-
 8 files changed, 249 insertions(+), 72 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 009a32735..fc5e37bfc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1241,18 +1241,21 @@ window.cooldowns = [
 	null,//Kizaru
 	[ 19, 11 ],
 	[ 19, 11 ],
-    	[ 20, 15 ],
-    	[ 20, 15 ],
-    	[ 23, 17 ],
-    	null,
-    	null,
-    	[ 13, 13 ],
-    	[ 13, 13 ],
-    	null,//Colo Marco
-    	null,//Colo Marco
-    	[ 24, 14 ],
-    	[ 14, 6 ],
-    	[ 21, 14 ],
-    	[ 19, 12 ],
-    	[ 18, 12 ]
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 23, 17 ],
+    [ 17, 17 ],
+    [ 17, 17 ],
+    [ 13, 13 ],
+    [ 13, 13 ],
+    null,//Colo Marco
+    null,//Colo Marco
+    [ 24, 14 ],
+    [ 14, 6 ],
+    [ 21, 14 ],
+    [ 19, 12 ],
+    [ 18, 12 ],
+    null,//Young Whitebeard
+    null,//Young Whitebeard
+    
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 96b597e4b..36d72801e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1369,14 +1369,14 @@ window.details = {
 		specialName: "Prehistoric Power",
 		specialNotes: "#{zombie}",
 		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts HP of Powerhouse Units by 100"
+        sailor: "Boosts HP of Powerhouse characters by 100"
 	},
 	361: {
 		special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
 		specialName: "Prehistoric Power",
 		specialNotes: "#{zombie}",
 		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts HP of Powerhouse Units by 100"
+        sailor: "Boosts HP of Powerhouse characters by 100"
 	},
 	362: {
 		special: "For 2 turns, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
@@ -1870,7 +1870,7 @@ window.details = {
 		specialName: "Zen Shockwave",
 		specialNotes: "#{random : 30,000 : 150,000}",
 		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x as well as himself",
-		captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku units in the team are included in the bonus."
+		captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku characters in the team are included in the bonus."
 	},
 	460: {
 		special: "Recovers 33 HP after the end of each turn for 999 turns, delays all enemies for 1 turn",
@@ -2512,7 +2512,7 @@ window.details = {
 		captain: "Boosts ATK and HP of Striker characters by 1.5x"
 	},
 	583: {
-		special: "Changes own orb into [INT] and the captain's orb into [DEX], boosts RCV of Shooter characters by 300 units for 3 turns",
+		special: "Changes own orb into [INT] and the captain's orb into [DEX], boosts RCV of Shooter characters by 300 for 3 turns",
 		specialName: "Disrupting Fire",
 		captain: "Boosts ATK and RCV of Shooter characters by 1.5x"
 	},
@@ -2630,12 +2630,12 @@ window.details = {
 		specialName: "[RCV] Slot Storm"
 	},
 	612: {
-		special: "Boosts ATK and RCV of all characters by 45 units for 1 turn, reduces damage received by 45% for 1 turn",
+		special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
 		specialName: "45-Degree Joy",
 		captain: "Boosts ATK of Slasher characters by 1.5x"
 	},
 	613: {
-		special: "Boosts ATK and RCV of all characters by 45 units for 1 turn, reduces damage received by 45% for 1 turn",
+		special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
 		specialName: "45-Degree Joy",
 		captain: "Boosts ATK, HP and RCV of Slasher characters by 1.5x"
 	},
@@ -2673,7 +2673,7 @@ window.details = {
 		specialName: "[INT] Slot Change [STR]"
 	},
 	622: {
-		special: "Boosts RCV of all characters by 100 units for 3 turns",
+		special: "Boosts RCV of all characters by 100 for 3 turns",
 		specialName: "Patch Job"
 	},
 	623: {
@@ -3079,7 +3079,7 @@ window.details = {
 	699: {
 		special: "Deals 13x character's ATK in character's type damage to all enemies",
 		specialName: "Hyper Burst",
-		captain: "Boosts ATK of Shooter characters by 500 units, reduces damage received by 10%"
+		captain: "Boosts ATK of Shooter characters by 500, reduces damage received by 10%"
 	},
 	700: {
 		special: "Cuts the current HP of each enemy by 5%",
@@ -3580,14 +3580,14 @@ window.details = {
 		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
 		specialName: "Gum-Gum Storm",
 		captain: "Boosts ATK of Powerhouse characters by 3x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse units."
+		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters."
 	},
 	795: {
 		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
 		specialName: "Gum-Gum Storm",
 		captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse units."
+		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters."
 	},
 	796: {
 		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
@@ -3719,7 +3719,7 @@ window.details = {
 	},
 	822: {
 		specialName: "Patch Job",
-		special: "Boosts RCV of all characters by 100 units for 3 turns"
+		special: "Boosts RCV of all characters by 100 for 3 turns"
 	},
 	823: {
 		specialName: "Slot Rate Up [INT]",
@@ -3732,7 +3732,7 @@ window.details = {
 	825: {
 		captain: "Boosts ATK and HP of STR characters by 1.5x",
 		specialName: "Energy of the Ancient Knight",
-		special: "Boosts ATK of STR characters by 200 units for 1 turn"
+		special: "Boosts ATK of STR characters by 200 for 1 turn"
 	},
 	826: {
 		captain: "Boosts ATK and HP of DEX characters by 1.5x",
@@ -4351,7 +4351,7 @@ window.details = {
 		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
 	},
 	927: {
-		captain: "Boosts ATK and HP of Driven Units by 1.5x",
+		captain: "Boosts ATK and HP of Driven characters by 1.5x",
 		specialName: "Unwavering Hammer of Justice",
 		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
 	},
@@ -4722,7 +4722,7 @@ window.details = {
 	},
 	994: {
 		captain: "Boosts amount of beli received by 2x",
-		special: "Reduces Special Cooldown of Cerebral and Fighter Units, and shows the stats of enemies",
+		special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		special: [
 			{
@@ -4740,7 +4740,7 @@ window.details = {
 	},
 	995:{
 		captain: "Boosts amount of beli received by 3x",
-		special: "Reduces Special Cooldown of Cerebral and Fighter Units, and shows the stats of enemies",
+		special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
 		specialName: "Peeping Mind",
 		special: [
 			{
@@ -4906,13 +4906,13 @@ window.details = {
 	},
     1020: {
         captain: "Boosts ATK and RCV of Shooter and Cerebral characters by 1.5x.",
-        captainNotes: "This effect does not stack for units that have both classes.",
+        captainNotes: "This effect does not stack for characters that have both classes.",
         specialName: "Sweet Fruit Trap",
         special: "Recovers 9x characters RCV in HP. Changes captain's orb into Matching orb"
     },
     1021: {
         captain: "Boosts ATK and RCV of Shooter and Cerebral characters by 1.75x.",
-        captainNotes: "This effect does not stack for units that have both classes.",
+        captainNotes: "This effect does not stack for characters that have both classes.",
         specialName: "Sweet Fruit Trap",
         special: "Recovers 9x characters RCV in HP. Changes captain's orb into Matching orb"
     },
@@ -5008,22 +5008,22 @@ window.details = {
         specialNotes: "HP>99%: Middle Left and Bottom Left Orbs to matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
     },
     1038: {
-        captain: "Boosts ATK and RCV of [DEX] and [QCK] units by 1.2x",
+        captain: "Boosts ATK and RCV of [DEX] and [QCK] characters by 1.2x",
         special: "Switches orbs between slots once, recovers 0.3x character's RCV in HP",
         specialName: "Great Scissors"
     },
     1039: {
-        captain: "Boosts ATK and RCV of [DEX] and [QCK] units by 1.5x",
+        captain: "Boosts ATK and RCV of [DEX] and [QCK] characters by 1.5x",
         special: "Switches orbs between slots once, recovers 0.3x character's RCV in HP",
         specialName: "Great Scissors"
     },
     1040: {
-        captain: "Boosts ATK and HP of [STR] units by 1.5x",
+        captain: "Boosts ATK and HP of [STR] characters by 1.5x",
         special: "Deals 30x the character's ATK as STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
         specialName: "Ice Throw"
     },
     1041: {
-        captain: "Boosts ATK and HP of [STR] units by 2x",
+        captain: "Boosts ATK and HP of [STR] characters by 2x",
         special: "Deals 30x the character's ATK as STR damage to all enemies. Boosts ATK of everyone by 1.5x if HP is below 30% at the time the special is activated",
         specialName: "Ice Throw"
     },
@@ -5068,35 +5068,35 @@ window.details = {
 		specialNotes: "#{stages}"
     },
     1046: {
-        captain: "Boosts ATK of Free Spirit Units by 2.75x following a chain of Good > Great > Perfect hits",
+        captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1047: {
-        captain: "Boosts ATK of Free Spirit Units by 3.5x following a chain of Good > Great > Perfect hits",
+        captain: "Boosts ATK of Free Spirit characters by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
 	1048: {
-		captain: "Boosts ATK and RCV of [PSY] Units by 1.2x",
+		captain: "Boosts ATK and RCV of [PSY] characters by 1.2x",
 		special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
 		specialName: "Mother's Wish to Fight The World"		
 	},
 	1049: {
-		captain: "Boosts ATK and RCV of [PSY] Units by 1.5x, when HP is low the ATK multiplier becomes 2.25x",
+		captain: "Boosts ATK and RCV of [PSY] characters by 1.5x, when HP is low the ATK multiplier becomes 2.25x",
         captainNotes: "The low HP threshold is estimated to be 30%",
 		special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
 		specialName: "Mother's Wish to Fight The World"		
 	},
 	1050: {
-		captain: "Boosts ATK of [PSY] Units by 1.5x",
+		captain: "Boosts ATK of [PSY] characters by 1.5x",
 		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
 		specialName: "Dereshishishi Towards Hope"
 	},
 	1051: {
-		captain: "Boosts ATK of [PSY] Units by 2x",
+		captain: "Boosts ATK of [PSY] characters by 2x",
 		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
 		specialName: "Dereshishishi Towards Hope"
 	},
@@ -5340,13 +5340,13 @@ window.details = {
 	},
 	1088: {
 		captain: "Boosts ATK of Slasher characters by 2x",
-		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
+		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn.",
 		specialName: "Seven Stars Sword of Darkness"
 	},
 	1089: {
 		captain: "Boosts ATK of Slasher characters by 2x and boosts HP of Driven characters by 1.75x",
 		captainNotes: "Slasher + Driven characters gain ATK AND HP",
-		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven units by 1.5x for 1 turn.",
+		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn.",
 		specialName: "Seven Stars Sword of Darkness"
 	},
 	1090: {
@@ -5495,7 +5495,7 @@ window.details = {
         specialName: "Impish Sultry Dance"
     },
     1113: {
-        captain: "Boosts ATK of [INT] units by 2x",
+        captain: "Boosts ATK of [INT] characters by 2x",
         special: "Boosts ATK of all characters by 1.2x for 1 turn",
         specialName: "Fury of the Little Monster: \"This is War!!!\""  
     },
@@ -5567,12 +5567,12 @@ window.details = {
 	},
 	1124: {
 		captain: "Boosts ATK of Slashers characters by 3x, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher units.",
+		captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
 		special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
 	},
 	1125: {
 		captain: "Boosts ATK of Slashers characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher units.",
+		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
 		special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
 	},
 	1126: {
@@ -5807,12 +5807,12 @@ window.details = {
         specialName: "Summer Koala Special"
     },
     1162: {//Tesoro
-        captain: "Boosts ATK of [PSY] units by 1.75x and boosts amount of Beli received by 1.5x",
+        captain: "Boosts ATK of [PSY] characters by 1.75x and boosts amount of Beli received by 1.5x",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
         specialName: "Gold-Gold Fruit",
     },
     1163: {//Tesoro Evolved
-        captain: "Boosts ATK of PSY units by 1.75x. Also boosts ATK of Driven and Cerebral units by 1.5x. Boosts amount of Beli received by 2x",
+        captain: "Boosts ATK of PSY characters by 1.75x. Also boosts ATK of Driven and Cerebral characters by 1.5x. Boosts amount of Beli received by 2x",
         captainNotes: "The two Boosts stack with each other so a PSY Driven or a PSY Cerebral Unit will be boosted by 2.625",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
         specialName: "Gold-Gold Fruit",
@@ -5939,7 +5939,7 @@ window.details = {
         sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
     },
     1185: {
-        captain: "Boosts ATK of Slasher and Cerebral units by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
+        captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
 			{
@@ -5947,7 +5947,7 @@ window.details = {
 				"cooldown": [ 8, 3 ],
 			},
 			{
-				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
+				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
 				"cooldown": [ 17, 12 ],
 			}
 		],
@@ -5956,7 +5956,7 @@ window.details = {
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
     },
     1186: {
-        captain: "Boosts ATK of Slasher and Cerebral units by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
+        captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
 			{
@@ -5964,7 +5964,7 @@ window.details = {
 				"cooldown": [ 8, 3 ],
 			},
 			{
-				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral units by 1 turn",
+				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
 				"cooldown": [ 17, 12 ],
 			}
 		],
@@ -6275,6 +6275,7 @@ window.details = {
 	},
     1231: {//Smoker
 		captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.25x",
+        captainNote: "If smoker uses his special ability to swap to your captain, his effective captain boost will be 2.925x",
 		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
 		specialName: "Armed - White Launcher",
@@ -6282,6 +6283,7 @@ window.details = {
 	},
     1232: {//Smoker
 		captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
+        captainNote: "If smoker uses his special ability to swap to your captain, his effective captain boost will be 2.925x",
 		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
 		specialName: "Armed - White Launcher",
@@ -6398,13 +6400,13 @@ window.details = {
         specialNotes: "Light of a Firefly, Fire Daruma is Event Ace's special ability.",
     },
     1246: {// Event Ace
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK of Fighter characters by 1.2x",
+        special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
         specialName:"Light of a Firefly, Fire Daruma",
     },
     1247: {// Event Ace
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts HP of Fighter characters by 1.2x and their ATK by 2.75x if they have a matching orb, by 2x otherwise",
+        special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
         specialName:"Light of a Firefly, Fire Daruma",
     },
     1248: {// Kimono Marco
@@ -6461,19 +6463,92 @@ window.details = {
         specialName: "Angry Instigator",
     },
     1254: {//FN Squard
-        captain: " Boost ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
+        captain: "Boost ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
         special: "Deals 10x his ATK to one enemy, reduces crews current HP by 30% and reduces enemies defense by a certain amount for one turn",
+        specialName: "Sword Attack Without Hesitation",
         sailor: "Reduces his own Numbness by 1 turn"
     },
     1255: {//FN DeCalvan
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2x after the 16th hit, by 2.5x after the 22nd hit",
         special: "For 1 turn, makes Perfects slightly easier to hit and amplifies the effect of orbs by 1.5x",
-        sailor: "When HP is low, boost base ATK of Fighters by 40"
+        sailor: "When HP is low, boost base ATK of Fighters by 40",
+        specialName: "Large Fleet Commander",
     },
-    1256: {//FN Bailey
+    1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
         special: "Shuffle non-matching orbs on Slashers and Driven characters, boost Atk against enemies with increased defense by 1.3x for 1 turn",
-        sailor: "Boosts ATK and RCV of Driven characters by 10"
-    }
+        sailor: "Boosts ATK and RCV of Driven characters by 10",
+        specialName: "Icebreaker Breakthrough Force",
+    },
+    1257: {//Young Whitebeard
+        captain: "Boosts ATK of all characters by 2x if HP is below 50% at the start of the turn",
+        special: [
+			{
+				"description": "Cuts the current HP of each enemy by 10%",
+				"cooldown": [ 23 ],
+			},
+			{
+				"description": "Cuts the current HP of each enemy by 20%",
+				"cooldown": [ 28 ],
+			},
+            {
+				"description": "Cuts the current HP of each enemy by 40%",
+				"cooldown": [ 36 ],
+			},
+		], 
+        specialName: "Earth Shattering Fist",
+    },
+    1258: {//Young Whitebeard Evolved
+        captain: "Boosts ATK of all characters by 2.5x if HP is below 50% at the start of the turn",
+        special: [
+			{
+				"description": "Cuts the current HP of each enemy by 10%",
+				"cooldown": [ 23 ],
+			},
+			{
+				"description": "Cuts the current HP of each enemy by 20%",
+				"cooldown": [ 28 ],
+			},
+            {
+				"description": "Cuts the current HP of each enemy by 40%",
+				"cooldown": [ 36 ],
+			},
+		],
+        specialName: "Earth Shattering Fist",
+    },
+    1259: {//Young Doflamingo
+        captain: "Boosts ATK of Driven characters by 2.5x",
+        special: "Deals 25x character's ATK in typeless damage to all enemies. For 3 turns, makes [STR], [DEX], [QCK], [PSY], and [INT] orbs \"beneficial\" for Driven characters",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
+        specialName: "Five Color Strings (Goshikito)",
+    },
+    1260: {//Young Doflamingo
+        captain: "Boosts ATK of Driven and Cerebral characters by 2.5x",
+        special: "Deals 25x character's ATK in typeless damage to all enemies. For 3 turns, makes [STR], [DEX], [QCK], [PSY], and [INT] orbs \"beneficial\" for Driven characters",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
+        specialName: "Five Color Strings (Goshikito)",
+    },
+    1261: {//Young Senior Pink
+        captain: "Boosts ATK of Free Spirit characters by 1.5x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
+        special: "Randomizes all orbs. Boosts the 'Color Affinity' of Free Spirit and Shooter character's regular attacks by 1.5x for 1 turn",
+        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialName: "Blood and Gunpowder of the Underground Family",
+    },
+    1262: {//Young Senior Pink
+        captain: "Boosts ATK of Free Spirit characters by 1.75x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
+        special: "Randomizes all orbs. Boosts the 'Color Affinity' of Free Spirit and Shooter character's regular attacks by 1.5x for 1 turn",
+        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialName: "Blood and Gunpowder of the Underground Family",
+    },
+    1263: {//Young Vergo
+        captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
+        special: "Deals 20,000 fixed damage to one enemy. Boosts own ATK by 2x for 2 turns",
+        specialName: "Iron Leg Sanctions",
+    },
+    1264: {//Young Vergo
+        captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
+        special: "Deals 20,000 fixed damage to one enemy. Boosts own ATK by 2x for 2 turns",
+        specialName: "Iron Leg Sanctions",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 6548b698a..26094222a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1075,7 +1075,9 @@ window.drops = {
 			name: "Rare Animal Island's Count Butler",
 			thumb: 1011,
 			condition: "None",
-			"All Difficulties": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
+            global: true,
+            "Global": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -812, -565 ],
+			"Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
 		},
         
         {
diff --git a/common/data/families.js b/common/data/families.js
index 6b37373a2..05dd6de94 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1252,4 +1252,29 @@ window.families = [
     "Marco",
     "Doma",
     "Shura",
+    "Squard",
+    "Decalvan Brothers",
+    "Whitey Bay",
+    "Whitebeard",
+	"Whitebeard",
+    "Doflamingo",
+    "Doflamingo",
+    "Señor Pink",
+    "Señor Pink",
+    "Vergo",
+    "Vergo",
+    null,
+    null,
+    "Blackbeard",
+	"Blackbeard",
+    "Doc Q",
+    "Doc Q",
+    "Van Augur",
+    "Van Augur",
+    "Jesus Burgess",
+    "Jesus Burgess",
+    "Shiliew",
+    "Shiliew",
+    "Laffitte",
+    "Laffitte",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 0e0c633b8..fb6f624cc 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -902,6 +902,11 @@ window.flags = {
 	1007: { rr: 1, rro: 1, lrr: 1 },
     1008: { rr: 1, rro: 1, lrr: 1 },
 	1009: { promo: 1 },
+    1010: { global: 1 },
+    1011: { global: 1 },
+    1012: { global: 1 },
+    1013: { global: 1 },
+    1014: { global: 1 },
 	1020: { rr: 1, rro: 1, lrr: 1 },
     1021: { rr: 1, rro: 1, lrr: 1 },
     1022: { promo: 1 },
@@ -1001,4 +1006,22 @@ window.flags = {
     1240: { rr: 1, rro: 1 },
     1248: { rr: 1, rro: 1, lrr: 1 },
     1249: { rr: 1, rro: 1, lrr: 1 },
+    1259: { rr: 1, rro: 1, lrr: 1 },
+    1260: { rr: 1, rro: 1, lrr: 1 },
+    1261: { rr: 1, rro: 1, lrr: 1 },
+    1262: { rr: 1, rro: 1, lrr: 1 },
+    1263: { rr: 1, rro: 1, lrr: 1 },
+    1264: { rr: 1, rro: 1, lrr: 1 },
+    1267: { rr: 1, rro: 1 },
+    1268: { rr: 1, rro: 1 },
+    1269: { rr: 1, rro: 1 },
+    1270: { rr: 1, rro: 1 },
+    1271: { rr: 1, rro: 1 },
+    1272: { rr: 1, rro: 1 },
+    1273: { rr: 1, rro: 1 },
+    1274: { rr: 1, rro: 1 },
+    1275: { rr: 1, rro: 1 },
+    1276: { rr: 1, rro: 1 },
+    1277: { rr: 1, rro: 1 },
+    1278: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 2e1fa8338..0532afaf2 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1252,4 +1252,29 @@ window.gw=[
     38049,
     38050,
     38051,
+    38339,
+    38341,
+    38342,
+    38236,
+    38236,
+    38724,
+    38724,
+    38723,
+    38723,
+    38722,
+    38722,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 7dadbd7c1..ce26f4598 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1243,18 +1243,40 @@ window.units = [
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "Luffy, At Marineford", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
-    [ "Ace, At Marineford", "STR", [ "Fighter", "Shooter" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ace, At Marineford Evolved", "STR", [ "Fighter", "Shooter" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Straw Hat' Monkey D Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
+    [ "Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, null, 79, 30, 2, null, null, null, null ],
+    [ "Ace, Marineford Flight Evolved", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, null, 1403, 793, 121, 2120, 1281, 246, null ],
     [ "Fluttering in Neck the Autumn Breeze, Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, 142, 79, 40, 940, 504, 201, null ],
     [ "Tipsy Kimono, Marco", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, null, 870, 452, 164, 1804, 1017, 374, null ],
-    [ "Coliseum Marco", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
+    [ "Marco, Whitebeard Pirates", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
-    [ "Whitebeard Pirates Doma ", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
-    [ "Coliseum Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
-    [ "Fortnight Squard", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
-    [ "Fortnight Decalvan Brothers", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
-    [ "Fortnight Whitey Bay", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
+    [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
+    [ "'Sky Rider' Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
+    [ "Maelstrom Spider Squardo, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
+    [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
+    [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
+    [ "Young Whitebeard", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, null, 1116, 587, 51, 1744, 894, 103, null ],
+    [ "Young Whitebeard Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, null, 1597, 762, 70, 2702, 1570, 170, null ],
+    [ "Young Doflamingo", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, null, 70, null, null, null, null, null, null, null, null ],
+    [ "Young Doflamingo Evolved", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, null, 941, 603, 152, 1997, 1418, 344, null ],
+    [ "Young Señor Pink", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, null, null, null, null, null, null, null, null ],
+    [ "Young Señor Pink Evolved", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1472, 440, 130, null, null, null, null ],
+    [ "Young Vergo", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, null, 70, null, null, null, null, 1250, 559, 48, null ],
+    [ "Young Vergo Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, null, 1250, 559, 48, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Doc Q?)", "DEX", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Doc Q?) Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Van Augur?)", "QCK", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Van Augur?) Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Jesus Burgess?)", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Jesus Burgess?) Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Shiliew?)", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Shiliew?) Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Laffitte?)", "PSY", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "New Unit (Laffitte?) Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index bd11a524c..78d5d246e 100644
--- a/index.html
+++ b/index.html
@@ -62,9 +62,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>20/09/2016</p>
+            <p>23/09/2016</p>
             <br>
             <ul>
+                <li>New Blackbeard and Young Doffy Units Added!</li>
+                <br>
                 <li>Units Updated, Ship Thumbnails updated</li>
                 <li>All units except Tashigi and Combo boosts</li>
                 <li>Are now active in calculator</li>

From 862afed81b9f4a846c48ffdc1e6e504c50765bc8 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 24 Sep 2016 11:20:09 +0200
Subject: [PATCH 0593/1569] Allias + Quickfix for Merge

---
 common/data/aliases.js | 2 +-
 common/data/units.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 772514416..89720af74 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1083,7 +1083,7 @@ window.aliases = {
     1082: [ '首領・サイ', '' ],
     1083: [ '首領・サイ 花ノ国のギャング', '' ],
     1084: [ '藤虎', '' ],
-    1085: [ 'イッショウ', '' ],
+    1085: [ 'イッショウ', '', 'Fujitora' ],
     1086: [ 'ムッシュール', '','Colosseum' ],
     1087: [ 'ムッシュール 毒胞子人間', '','Colosseum' ],
     1088: [ 'サガ', '','Colosseum' ],
diff --git a/common/data/units.js b/common/data/units.js
index ba1f59b54..e2cbf62dc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1119,7 +1119,7 @@ window.units = [
 	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
 	[ "Nami, Loyal Straw Hat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
     [ "Monkey D. Luffy, Wakes of the Endless Dream, Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
-	[ "Monkey D. Luffy, A Vow in the Great Age of Pirates - Pirate King, "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
+	[ "Monkey D. Luffy, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
     [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, 1066998, 504, 277, 148, 1603, 808, 287, 1 ],
     [ "Cavendish of Hakuba", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, 5000000, 1541, 749, 231, 2970, 1460, 438, 1 ],
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 102, 151, 34, 981, 780, 201, 1 ],

From 0e92972ff03ab1a4d417568fcc87af9d368e8ba2 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 26 Sep 2016 13:49:07 +0200
Subject: [PATCH 0594/1569] Evolver Fixes

---
 common/data/evolutions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b62ca15c6..77b93a5b5 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1837,11 +1837,11 @@ window.evolutions = {
 	},
     1209: {
 		evolution: 1210,
-		evolvers: [ 118, 88, 94, 304, 104 ]
+		evolvers: [ 118, 83, 96, 301, 101 ]
 	},
 	1211: {
 		evolution: 1212,
-		evolvers: [ 118, 86, 266, 302, 267 ]
+		evolvers: [ 118, 83, 84, 300, 100 ]
 	},
     1213: {
 		evolution: 1214,

From edfa37ddac0a94bae31c2115b6a518831f25a1e1 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 27 Sep 2016 02:17:05 -0500
Subject: [PATCH 0595/1569] all units updated minus stats and new BB Sugo

---
 common/data/aliases.js   |  25 +++++++
 common/data/captains.js  |  32 ++++++++-
 common/data/cooldowns.js |  25 ++++++-
 common/data/details.js   | 146 +++++++++++++++++++++++++++++----------
 common/data/flags.js     |   6 ++
 common/data/gw.js        |  20 +++---
 common/data/specials.js  |  56 ++++++++++++++-
 common/data/units.js     |  28 ++++----
 index.html               |   2 +-
 9 files changed, 273 insertions(+), 67 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 89720af74..ba0a0e7f8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1252,4 +1252,29 @@ window.aliases = {
     1251: ['','',''],
     1252: ['','',''],
     1253: ['','',''],
+    1254: ['','',''],
+    1255: ['','',''],
+    1256: ['','',''],
+    1257: ['','','Edward Newgate'],
+    1258: ['','','Edward Newgate'],
+    1259: ['','','Doffy','Donquixote Doflamingo'],
+    1260: ['','','Doffy','Donquixote Doflamingo'],
+    1261: ['','','Senor Pink', 'Senior Pink'],
+    1262: ['','','Senor Pink', 'Senior Pink'],
+    1263: ['','',''],
+    1264: ['','',''],
+    1265: ['','',''],
+    1266: ['','',''],
+    1267: ['','',''],
+    1268: ['','',''],
+    1269: ['','',''],
+    1270: ['','',''],
+    1271: ['','',''],
+    1272: ['','',''],
+    1273: ['','',''],
+    1274: ['','',''],
+    1275: ['','',''],
+    1276: ['','',''],
+    1277: ['','',''],
+    1278: ['','',''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 14c0ef22e..b989e1103 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3265,5 +3265,35 @@ window.captains = {
     1256: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; },
-    }
+    },
+    1257: {
+		atk: function(p) { return p.percHP <= 50.0 ? 2 : 1; }
+    },
+    1258: {
+		atk: function(p) { return p.percHP <= 50.0 ? 2.5 : 1; }
+    },
+    1259: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+    },
+    1260: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+    },
+    1261: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+    },
+    1262: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+    },
+    1263: {
+		atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+	},
+    1264: {
+		atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+	},
+    1265: {
+        atk: function(p) { return p.unit.class.has("Shooters") ? 2 : 1; },
+    },
+    1266: {
+        atk: function(p) { return p.unit.class.has("Shooters") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fc5e37bfc..a4d68877f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1193,8 +1193,8 @@ window.cooldowns = [
 	[ 19, 13 ],
     [ 15, 15 ],
     [ 15, 15 ],
-	29,
-	29,
+	[ 29, 15 ],
+	[ 29, 15 ],
 	[ 17, 7 ],
     [ 18, 10 ],
     [ 18, 10 ],
@@ -1257,5 +1257,24 @@ window.cooldowns = [
     [ 18, 12 ],
     null,//Young Whitebeard
     null,//Young Whitebeard
-    
+    [ 17, 15 ],
+    [ 17, 15 ],
+    [ 12, 10 ],
+    [ 12, 10 ],
+    [ 13, 11 ],
+    [ 13, 11 ],
+    [ 14, 14 ],
+    [ 14, 14 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 36d72801e..2de26004f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2379,13 +2379,13 @@ window.details = {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
 		captain: "Boosts ATK and RCV of INT characters by 1.5x",
-        sailor: "Reduces duration of Blindness by 3 turn"
+        sailor: "Reduces duration of Blindness by 3 turns"
 	},
 	558: {
 		special: "Boosts chances of getting [INT] orbs for 3 turns",
 		specialName: "Ochenta Fleur - Cuatro Manus Shock",
 		captain: "Boosts ATK and RCV of INT characters by 2x",
-        sailor: "Reduces duration of Blindness by 3 turn"
+        sailor: "Reduces duration of Blindness by 3 turns"
 	},
 	559: {
 		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
@@ -4407,13 +4407,13 @@ window.details = {
 	934: {
 		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs to Matching",
+		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	935: {
 		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
 		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs to Matching",
+		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into matching",
 		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
 	},
 	936: {
@@ -4431,12 +4431,12 @@ window.details = {
 	938: {
 		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Cerebral characters by 1.5x",
 		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs to Matching"
+		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
 	},
 	939: {
 		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
 		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs to Matching"
+		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
 	},
 	940: {
 		captain: "Boosts ATK and HP of [DEX] Characters by 1.5x",
@@ -4579,23 +4579,23 @@ window.details = {
 	},
 	968:{
 		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
 	},
 	969:{
 		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
 	},
 	970:{
 		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
 	},
 	971:{
 		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
 	},
 	972:{
 		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb to matching orb"
+		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
 	},
 	973:{
 		captain: "Boosts ATK of Powerhouse Characters by 2x if HP is above 99% at the start of the turn",
@@ -4760,11 +4760,11 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2x",
         special: [
 			{
-				"description": "For Powerhouse characters, changes Bad orbs to Matching orbs.",
+				"description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
 				"cooldown": 11
 			},
 			{
-				"description": "For all characters, changes Bad orbs to Matching orbs.",
+				"description": "For all characters, changes Bad orbs into matching orbs.",
 				"cooldown": 20
 			}
 		],
@@ -4776,11 +4776,11 @@ window.details = {
 		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         special: [
 			{
-				"description": "For Powerhouse characters, changes Bad orbs to Matching orbs.",
+				"description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
 				"cooldown": 11
 			},
 			{
-				"description": "For all characters, changes Bad orbs to Matching orbs.",
+				"description": "For all characters, changes Bad orbs into matching orbs.",
 				"cooldown": 20
 			}
 		],
@@ -4999,13 +4999,13 @@ window.details = {
         captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
         special: "Deals 13x ATK in QCK Damage to one Enemy, Changes Orbs depending on the current HP",
         specialName: "Kenpo: Kick Thrust Drop",
-        specialNotes: "HP>99%: Middle Left and Bottom Left Orbs to matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
+        specialNotes: "HP>99%: Middle Left and Bottom Left Orbs into matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
     },
     1037: {
         captain: "Boosts ATK of Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
         special: "Deals 13x ATK in QCK Damage to one Enemy, Changes Orbs depending on the current HP",
         specialName: "Kenpo: Kick Thrust Drop",
-        specialNotes: "HP>99%: Middle Left and Bottom Left Orbs to matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
+        specialNotes: "HP>99%: Middle Left and Bottom Left Orbs into matching <br> 99%>HP>30%: Left Column to [G] orbs <br> HP<30%: Left Column to [RCV]"
     },
     1038: {
         captain: "Boosts ATK and RCV of [DEX] and [QCK] characters by 1.2x",
@@ -5029,12 +5029,12 @@ window.details = {
     },
     1042: {
         captain: "Boosts ATK of Striker and Slasher characters by 2x, reduces crew's RCV to 0.",
-        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers to matching orbs, cuts the current HP of one enemy by 7%",
+        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers into matching orbs, cuts the current HP of one enemy by 7%",
         specialName: "Hitting Size"
     },
     1043: {
         captain: "Boosts ATK of Striker and Slasher characters by 2.75x if they have a matching Orb, by 2x otherwise, reduces crew's RCV to 0.",
-        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers to matching orbs, cuts the current HP of one enemy by 7%",
+        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers into matching orbs, cuts the current HP of one enemy by 7%",
         specialName: "Hitting Size"
     },
     1044: {
@@ -5351,12 +5351,12 @@ window.details = {
 	},
 	1090: {
 		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
-		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
+		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs into matching orbs",
 		specialName: "Double Edge of Revolt"
 	},
 	1091: {
 		captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
-		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs to Matching orbs",
+		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs into matching orbs",
 		specialName: "Double Edge of Revolt"
 	},
     1092: {
@@ -5466,12 +5466,12 @@ window.details = {
     },
 	1107: {
 		captain: "Boosts ATK and HP of Driven characters by 1.5x",
-        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters into matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
 	},
 	1108: {
 		captain: "Boosts ATK and HP of Driven characters by 2x",
-        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters to Matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters into matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
 	},
     1109: {
@@ -6397,17 +6397,17 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 1.75x. If HP is below 10%, boosts ATK of Fighter characters by 3x instead.",
         special: "Deals random [QCK] damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Light of a Firefly, Fire Daruma\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
         specialName:"Gomu Gomu no Stamp Gatling",
-        specialNotes: "Light of a Firefly, Fire Daruma is Event Ace's special ability.",
+        specialNotes: "Firefly Light, Fiery Doll is Event Ace's special ability.",
     },
     1246: {// Event Ace
         captain: "Boosts ATK of Fighter characters by 1.2x",
         special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
-        specialName:"Light of a Firefly, Fire Daruma",
+        specialName:"Firefly Light, Fiery Doll",
     },
     1247: {// Event Ace
         captain: "Boosts HP of Fighter characters by 1.2x and their ATK by 2.75x if they have a matching orb, by 2x otherwise",
         special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
-        specialName:"Light of a Firefly, Fire Daruma",
+        specialName:"Firefly Light, Fiery Doll",
     },
     1248: {// Kimono Marco
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
@@ -6485,15 +6485,15 @@ window.details = {
         special: [
 			{
 				"description": "Cuts the current HP of each enemy by 10%",
-				"cooldown": [ 23 ],
+				"cooldown": [ 23, 12 ],
 			},
 			{
 				"description": "Cuts the current HP of each enemy by 20%",
-				"cooldown": [ 28 ],
+				"cooldown": [ 28, 17 ],
 			},
             {
 				"description": "Cuts the current HP of each enemy by 40%",
-				"cooldown": [ 36 ],
+				"cooldown": [ 36, 25 ],
 			},
 		], 
         specialName: "Earth Shattering Fist",
@@ -6503,15 +6503,15 @@ window.details = {
         special: [
 			{
 				"description": "Cuts the current HP of each enemy by 10%",
-				"cooldown": [ 23 ],
+				"cooldown": [ 23, 12 ],
 			},
 			{
 				"description": "Cuts the current HP of each enemy by 20%",
-				"cooldown": [ 28 ],
+				"cooldown": [ 28, 17 ],
 			},
             {
 				"description": "Cuts the current HP of each enemy by 40%",
-				"cooldown": [ 36 ],
+				"cooldown": [ 36, 25 ],
 			},
 		],
         specialName: "Earth Shattering Fist",
@@ -6523,18 +6523,18 @@ window.details = {
         specialName: "Five Color Strings (Goshikito)",
     },
     1260: {//Young Doflamingo
-        captain: "Boosts ATK of Driven and Cerebral characters by 2.5x",
+        captain: "Reduces cooldown of Driven specials by 1 turn at the start of the fight. Boosts ATK of Driven characters by 2.5x",
         special: "Deals 25x character's ATK in typeless damage to all enemies. For 3 turns, makes [STR], [DEX], [QCK], [PSY], and [INT] orbs \"beneficial\" for Driven characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         specialName: "Five Color Strings (Goshikito)",
     },
-    1261: {//Young Senior Pink
+    1261: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.5x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the 'Color Affinity' of Free Spirit and Shooter character's regular attacks by 1.5x for 1 turn",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
         specialName: "Blood and Gunpowder of the Underground Family",
     },
-    1262: {//Young Senior Pink
+    1262: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.75x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the 'Color Affinity' of Free Spirit and Shooter character's regular attacks by 1.5x for 1 turn",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
@@ -6550,5 +6550,81 @@ window.details = {
         special: "Deals 20,000 fixed damage to one enemy. Boosts own ATK by 2x for 2 turns",
         specialName: "Iron Leg Sanctions",
     },
+    1265: {//Kimono Ace
+        captain: "Boosts ATK of Shooter characters by 2x",
+        special: "Recovers 3,000 HP and boosts the ATK of Free Spirit characters by 1.75x for 1 turn",
+        specialName: "Kimono Ace Special",
+    },
+    1266: {//Kimono Ace Evo
+        captain: "Boosts ATK of Shooter characters by 2.5x",
+        special: "Recovers 3,000 HP and boosts the ATK of Free Spirit characters by 1.75x for 1 turn",
+        specialName: "Kimono Ace Special",
+    },
+    1267: {//Legend Blackbeard
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Blackbeard Special",
+    },
+    1268: {//Legend Blackbeard
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Blackbeard Special",
+    },
+    1269: {//Laffitte
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Laffitte Special",
+    },
+    1270: {//Laffitte
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Laffitte Special",
+    },
+    1271: {//Van Augur
+        captain: "Unknown",
+        special: "Changes some slots into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
+        sailor: "Reduces duration of Blindness by X turns",
+        specialName: "Laffitte Special",
+    },
+    1272: {//Van Augur Evo
+        captain: "Unknown",
+        special: "Changes some slots into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
+        sailor: "Reduces duration of Blindness by X turns",
+        specialName: "Van Augur Special",
+    },
+    1273: {//Jesus Burgess
+        captain: "Unknown",
+        special: "Deals damage to all enemies. Boosts ATK of ___ characters for several turns",
+        sailor: "Boosts HP of X characters by Y",
+        specialName: "Jesus Burgess Special",
+    },
+    1274: {//Jesus Burgess Evo
+        captain: "Unknown",
+        special: "Deals damage to all enemies. Boosts ATK of ___ characters for several turns",
+        sailor: "Boosts HP of X characters by Y",
+        specialName: "Jesus Burgess Special",
+    },
+    1275: {//Shiliew
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Shiliew Special",
+    },
+    1276: {//Shiliew
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Shiliew Special",
+    },
+    1277: {//Doc Q
+        captain: "Unknown",
+        special: "Reduces crew's current HP by __%. Changes ____ orbs on ____ Characters into Matching Orbs,",
+        sailor: "Boosts amount healed from [RCV] orbs",
+        specialName: "Doc Q Special",
+    },
+    1278: {//Doc Q
+        captain: "Unknown",
+        special: "Reduces crew's current HP by __%. Changes ____ orbs on ____ Characters into Matching Orbs,",
+        sailor: "Boosts amount healed from [RCV] orbs",
+        specialName: "Doc Q Special",
+    },
 };
 
diff --git a/common/data/flags.js b/common/data/flags.js
index fb6f624cc..adeeec129 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -771,6 +771,12 @@ window.flags = {
     773: { global: 1 },
     774: { global: 1 },
     775: { global: 1 },
+    776: { global: 1 },
+    777: { global: 1 },
+    778: { global: 1 },
+    779: { global: 1 },
+    780: { global: 1 },
+    781: { global: 1 },
 	782: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	783: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	784: { rr: 1, rro: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index 0532afaf2..0938ff4e4 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1263,18 +1263,18 @@ window.gw=[
     38723,
     38722,
     38722,
+    38846,
+    38846,
+    38773,
+    38773,
     null,
     null,
+    38768,
+    38768,
+    38771,
+    38771,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    38769,
+    38769,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 0130677d9..70e8696af 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1575,12 +1575,12 @@ window.specials = {
         }
     }, /*
     1233: {//Tashigi
-        //TODO
+        //TODO Slasher/Cerebral
         affinity: function(p){ return 1.5; },
         type: "affinity",
     },
     1234: {//Tashigi
-         //TODO
+         //TODO Slasher/Cerebral
         affinity: function(p){ return 1.5; },
         type: "affinity",
     },*/
@@ -1628,6 +1628,30 @@ window.specials = {
 			});
 		}
 	},
+    1246: {
+		atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1246].multiplier; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (window.specials[1246].multiplier == 1.3 ? 1 : 0);
+			window.specials[1246].multiplier = [1.3, 2][n];
+			p.scope.notify({
+				text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+				name: '1246warning'
+			});
+		}
+	},
+    1247: {
+		atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1247].multiplier; },
+		type: "class",
+		onActivation: function(p) {
+			var n = (window.specials[1247].multiplier == 1.3 ? 1 : 0);
+			window.specials[1247].multiplier = [1.3, 2][n];
+			p.scope.notify({
+				text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+				name: '1247warning'
+			});
+		}
+	},
     1250: {
 		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
 		type: "class"
@@ -1650,5 +1674,31 @@ window.specials = {
         atk: function(p) { return 1.3 },
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
-    }
+    },
+/*  1261: {//Young Senor Pink
+        //TODO Free Spirit / Shooter
+        affinity: function(p){ return 1.5; },
+        type: "affinity",
+    },
+    1262: {//Young Senor Pink
+         //TODO Free Spirit / Shooter
+        affinity: function(p){ return 1.5; },
+        type: "affinity",
+    },*/
+    1263: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+		type: "type"
+	},
+	1264: {
+		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+		type: "type"
+	},
+    1265: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+		type: "class"
+	},
+    1266: {
+		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+		type: "class"
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index e2cbf62dc..a754ba6ee 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1125,7 +1125,7 @@ window.units = [
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 102, 151, 34, 981, 780, 201, 1 ],
     [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 7, 4, 99, 4000000, 903, 713, 144, 2000, 1410, 336, 1 ],
     [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, 4, 3, 70, 1066998, 201, 102, 22, 1461, 668, 152, 1 ],
-    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1389, 584, 103, 3065, 1188, 231, 1 ],
+    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1389, 584, 103, 3065, 1180, 231, 1 ],
     [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 177, 52, 31, 1332, 554, 213, 1 ],
     [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1255, 490, 150, 2940, 978, 320, 1 ],
     [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 123, 157, 20, 1137, 800, 177, 1 ],
@@ -1262,21 +1262,21 @@ window.units = [
     [ "Young Señor Pink", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, null, null, null, null, null, null, null, null ],
     [ "Young Señor Pink Evolved", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1472, 440, 130, null, null, null, null ],
     [ "Young Vergo", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, null, 70, null, null, null, null, 1250, 559, 48, null ],
-    [ "Young Vergo Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, null, 1250, 559, 48, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Young Vergo Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, null, 1250, 559, 48, 2694, 1389, 139, null ],
+    [ "Kimono Ace", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, null, 152, 90, 30, 961, 584, 174, null ],
+    [ "Kimono Ace Evolved", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, null, 890, 541, 130, null, null, null, null ],
     [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Doc Q?)", "DEX", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Doc Q?) Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Van Augur?)", "QCK", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Van Augur?) Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Jesus Burgess?)", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Jesus Burgess?) Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Shiliew?)", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Shiliew?) Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Laffitte?)", "PSY", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "New Unit (Laffitte?) Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shiliew", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 78d5d246e..7a6875795 100644
--- a/index.html
+++ b/index.html
@@ -62,7 +62,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>23/09/2016</p>
+            <p>27/09/2016</p>
             <br>
             <ul>
                 <li>New Blackbeard and Young Doffy Units Added!</li>

From 9c9be9582741a27de25e6debb6eb3a44eba752ec Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 28 Sep 2016 23:30:07 -0500
Subject: [PATCH 0596/1569] Blackbeard works!

---
 common/data/captains.js | 27 ++++++++++++++++++++++++++-
 common/data/details.js  | 34 +++++++++++++++++++++++-----------
 common/data/gw.js       |  8 ++++----
 common/data/units.js    |  4 ++--
 damage/js/cruncher.js   |  4 ++--
 5 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index b989e1103..45817aa34 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2512,7 +2512,8 @@ window.captains = {
          atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
     },
     1034: {
-        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
+        atk: function(p) { 
+            return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
     },
     1035: {
         atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
@@ -3296,4 +3297,28 @@ window.captains = {
     1266: {
         atk: function(p) { return p.unit.class.has("Shooters") ? 2.5 : 1; },
     },
+    1267: {
+        atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 2.75;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 1.5;
+            else
+                return 1; 
+               },
+    },
+    1268: {
+        atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 2.75;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 1.5;
+            else
+                return 1; 
+               },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 2de26004f..cde02fb82 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6561,23 +6561,31 @@ window.details = {
         specialName: "Kimono Ace Special",
     },
     1267: {//Legend Blackbeard
-        captain: "Unknown",
-        special: "Unknown",
-        specialName: "Blackbeard Special",
+        captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
+        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes.",
+        special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
+        specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
+        specialName: "World Shaking Impact",
     },
     1268: {//Legend Blackbeard
-        captain: "Unknown",
-        special: "Unknown",
-        specialName: "Blackbeard Special",
+        captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
+        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes.",
+        special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
+        specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
+        specialName: "World Shaking Impact",
     },
     1269: {//Laffitte
         captain: "Unknown",
-        special: "Unknown",
+        special: "Reduces Bind and Despair duration by __ turns. Makes Badly Matching orbs not reduce damage for __ turns",
+        specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
+        sailor: "Boosts ATK of all characters if your captain is a ____ character",
         specialName: "Laffitte Special",
     },
     1270: {//Laffitte
-        captain: "Unknown",
-        special: "Unknown",
+         captain: "Unknown",
+        special: "Reduces Bind and Despair duration by __ turns. Makes Badly Matching orbs not reduce damage for __ turns",
+        specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
+        sailor: "Boosts ATK of all characters if your captain is a ____ character",
         specialName: "Laffitte Special",
     },
     1271: {//Van Augur
@@ -6606,12 +6614,16 @@ window.details = {
     },
     1275: {//Shiliew
         captain: "Unknown",
-        special: "Unknown",
+        special: "For each enemy, has a small chance to instantly defeat that enemy.",
+        specialNotes: "Not sure how this is affected by resetting or against bosses",
+        sailor: "Completely resists Silence on this character",
         specialName: "Shiliew Special",
     },
     1276: {//Shiliew
         captain: "Unknown",
-        special: "Unknown",
+        special: "For each enemy, has a small chance to instantly defeat that enemy.",
+        specialNotes: "Not sure how this is affected by resetting or against bosses",
+        sailor: "Completely resists Silence on this character",
         specialName: "Shiliew Special",
     },
     1277: {//Doc Q
diff --git a/common/data/gw.js b/common/data/gw.js
index 0938ff4e4..b25c8be2c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1267,14 +1267,14 @@ window.gw=[
     38846,
     38773,
     38773,
-    null,
-    null,
+    38772,
+    38772,
     38768,
     38768,
     38771,
     38771,
-    null,
-    null,
+    38770,
+    38770,
     38769,
     38769,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index a754ba6ee..6e4991f6d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1265,8 +1265,8 @@ window.units = [
     [ "Young Vergo Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, null, 1250, 559, 48, 2694, 1389, 139, null ],
     [ "Kimono Ace", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, null, 152, 90, 30, 961, 584, 174, null ],
     [ "Kimono Ace Evolved", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, null, 890, 541, 130, null, null, null, null ],
-    [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, null, 429, 287, 39, 1674, 854, 127, null ],
+    [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, null, 1600, 789, 73, 3350, 1520, 244, null ],
     [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index f131022d0..1a2ed9ee2 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -746,8 +746,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if(team[z].unit){
                 if(team[z].unit.class.length==2){
                     classes[team[z].unit.class[0]]++;
-                    classes[team[z].unit.class[1]]++; 
-                }else if(team[z].unit.class.length==1){
+                    classes[team[z].unit.class[1]]++;
+                }else{
                     classes[team[z].unit.class]++;
                 }
             }

From cbce25261a6ced69afed0e40b19aad4f4151925e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 29 Sep 2016 08:08:39 -0500
Subject: [PATCH 0597/1569] BB fix

---
 common/data/details.js    |  4 ++--
 common/data/evolutions.js | 34 +++++++++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index cde02fb82..ca3632691 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6562,14 +6562,14 @@ window.details = {
     },
     1267: {//Legend Blackbeard
         captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
-        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes.",
+        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
         specialName: "World Shaking Impact",
     },
     1268: {//Legend Blackbeard
         captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
-        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes.",
+        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
         specialName: "World Shaking Impact",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 77b93a5b5..7a8a3fdf9 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1833,7 +1833,7 @@ window.evolutions = {
     },
     1207: {
 		evolution: 1208,
-		evolvers: [ 118, 83, 84, 300, 100 ]
+		evolvers: [ 118, 88, 94, 304, 104 ]
 	},
     1209: {
 		evolution: 1210,
@@ -1899,4 +1899,36 @@ window.evolutions = {
         evolution: 1251,
 		evolvers: [  ]
     },
+    1257: {
+        evolution: 1258,
+		evolvers: [  ]
+    },
+    1259: {
+        evolution: 1260,
+		evolvers: [  ]
+    },
+    1261: {
+        evolution: 1262,
+		evolvers: [  ]
+    },
+    1263: {
+        evolution: 1264,
+		evolvers: [  ]
+    },
+    1265: {
+        evolution: 1266,
+		evolvers: [  ]
+    },
+    1267: {
+        evolution: 1268,
+		evolvers: [  ]
+    },
+    1269: {
+        evolution: 1270,
+		evolvers: [  ]
+    },
+    1271: {
+        evolution: 1272,
+		evolvers: [  ]
+    },
 };

From 02263646d2cf6dfe0689b2b33b1e5c4168484dcc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 29 Sep 2016 21:49:28 -0500
Subject: [PATCH 0598/1569] Updates for all units except calc and stats

---
 common/data/aliases.js   |  19 +++++---
 common/data/cooldowns.js |  23 ++++++---
 common/data/details.js   | 103 ++++++++++++++++++++++++++-------------
 common/data/flags.js     |  36 +++++++-------
 common/data/gw.js        |   7 +++
 common/data/units.js     |   7 +++
 index.html               |   2 +-
 7 files changed, 129 insertions(+), 68 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ba0a0e7f8..50c70a5fe 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1112,12 +1112,12 @@ window.aliases = {
     1111: [ 'ニコ・ロビン 若返った考古学者', '' ],
     1112: [ 'ニコ・ロビン 酒場の可憐な踊り娘', '' ],
     1113: [ 'チョッパー 若返った船医', '' ],
-    1114: [ 'モンキー・D・ルフィ 夢を追い求める冒険者', '' ],
-    1115: [ 'モンキー・D・ルフィ 信念に生きる麦わらの一味', '' ],
-    1116: [ 'サンジ 夢を追い求める冒険者', '' ],
-    1117: [ 'サンジ 信念に生きる麦わらの一味', '' ],
-    1118: [ 'ナミ 夢を追い求める冒険者', '' ],
-    1119: [ 'ナミ 信念に生きる麦わらの一味', '' ],
+    1114: [ 'モンキー・D・ルフィ 夢を追い求める冒険者', 'Strong World Luffy' ],
+    1115: [ 'モンキー・D・ルフィ 信念に生きる麦わらの一味', 'Strong World Luffy' ],
+    1116: [ 'サンジ 夢を追い求める冒険者', 'Strong World Sanji' ],
+    1117: [ 'サンジ 信念に生きる麦わらの一味', 'Strong World Sanji' ],
+    1118: [ 'ナミ 夢を追い求める冒険者', 'Strong World Nami' ],
+    1119: [ 'ナミ 信念に生きる麦わらの一味', 'Strong World Nami' ],
 	1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '' ],
     1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '' ],
     1122: [ 'キャベンディッシュ', '','Hakuba','cabbage' ],
@@ -1277,4 +1277,11 @@ window.aliases = {
     1276: ['','',''],
     1277: ['','',''],
     1278: ['','',''],
+    1279: ['','',''],
+    1280: ['','',''],
+    1281: ['','',''],
+    1282: ['','',''],
+    1283: ['','',''],
+    1284: ['','',''],
+    1285: ['','',''],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a4d68877f..1698137f2 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1179,16 +1179,16 @@ window.cooldowns = [
     [ 17, 17 ],
     [ 17, 17 ],
 	null,
-	19,
-	19,
-	23,
-	23,
+	[ 19, 13 ],
+	[ 19, 13 ],
+	[ 23, 17 ],
+	[ 23, 17 ],
 	null,// Haruta
 	null,// Haruta
 	23,
 	23,
-	11,
-	11,
+	[ 11, 5 ],
+	[ 11, 5 ],
 	[ 19, 13 ],
 	[ 19, 13 ],
     [ 15, 15 ],
@@ -1227,8 +1227,8 @@ window.cooldowns = [
 	17,
 	23,
 	22,
-	22,//Sentomaru
-	22,//Sentomaru
+	[ 22, 15 ],//Sentomaru
+	[ 22, 15 ],//Sentomaru
 	19,
 	19,
 	23,
@@ -1277,4 +1277,11 @@ window.cooldowns = [
     null,
     null,
     null,
+    14,
+    21,
+    25,
+    19.
+    25,
+    [ 12, 12 ],
+    [ 12, 12 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index ca3632691..ebc25f32f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -14,11 +14,7 @@ window.details = {
 		captain: "Boosts ATK of STR characters by 1.5x"
 	},
 	4: {
-        captain: {
-			"global": "Boosts ATK of STR characters by 2x",
-			"japan": "Boosts ATK of STR characters by 2x, and ATK of all others by 1.5x"
-		},
-        captainNotes: "The calculator will use the JPN captain",
+        captain: "Boosts ATK of STR characters by 2x, and ATK of all others by 1.5x",
 		special: "Deals 25x character's ATK in STR damage to one enemy",
 		specialName: "Gum-Gum Twin Jet Pistol"
 	},
@@ -6240,15 +6236,15 @@ window.details = {
         special: [
 			{
 				"description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": 11,
+				"cooldown": [ 11, 4 ],
 			},
 			{
 				"description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": 15,
+				"cooldown": [ 15, 8 ],
 			},
 			{
 				"description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-				"cooldown": 22, 
+				"cooldown": [ 22, 15 ], 
 			},
 		],
 		sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
@@ -6259,15 +6255,15 @@ window.details = {
         special: [
 			{
 				"description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": 11,
+				"cooldown": [ 11, 4 ],
 			},
 			{
 				"description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": 15,
+				"cooldown": [ 15, 8 ],
 			},
 			{
 				"description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-				"cooldown": 22, 
+				"cooldown": [ 22, 15 ], 
 			},
 		],
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
@@ -6576,40 +6572,41 @@ window.details = {
     },
     1269: {//Laffitte
         captain: "Unknown",
-        special: "Reduces Bind and Despair duration by __ turns. Makes Badly Matching orbs not reduce damage for __ turns",
+        special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
-        sailor: "Boosts ATK of all characters if your captain is a ____ character",
+        sailor: "Boosts ATK of all characters by 100 if your captain is a Driven character",
         specialName: "Laffitte Special",
     },
     1270: {//Laffitte
-         captain: "Unknown",
-        special: "Reduces Bind and Despair duration by __ turns. Makes Badly Matching orbs not reduce damage for __ turns",
+        captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 7x character's ATK in [DEX] damage to all enemies at the end of each turn.",
+        special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
-        sailor: "Boosts ATK of all characters if your captain is a ____ character",
+        sailor: "Boosts ATK of all characters by 100 if your captain is a Driven character",
         specialName: "Laffitte Special",
     },
     1271: {//Van Augur
         captain: "Unknown",
-        special: "Changes some slots into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
-        sailor: "Reduces duration of Blindness by X turns",
-        specialName: "Laffitte Special",
+        special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
+        sailor: "Reduces duration of Blindness by 5 turns",
+        specialName: "Van Augur Special",
     },
     1272: {//Van Augur Evo
-        captain: "Unknown",
-        special: "Changes some slots into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
-        sailor: "Reduces duration of Blindness by X turns",
+        captain: "Reduces cooldown of Shooter specials by 1 turn at the start of the fight. Boosts ATK of Shooter characters by 2.5x.",
+        special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
+        sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Van Augur Special",
     },
     1273: {//Jesus Burgess
         captain: "Unknown",
-        special: "Deals damage to all enemies. Boosts ATK of ___ characters for several turns",
-        sailor: "Boosts HP of X characters by Y",
+        special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
+        sailor: "Boosts HP of all characters by 75",
         specialName: "Jesus Burgess Special",
     },
     1274: {//Jesus Burgess Evo
-        captain: "Unknown",
-        special: "Deals damage to all enemies. Boosts ATK of ___ characters for several turns",
-        sailor: "Boosts HP of X characters by Y",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.15x",
+        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.3225 HP",
+        special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
+        sailor: "Boosts HP of all characters by 75",
         specialName: "Jesus Burgess Special",
     },
     1275: {//Shiliew
@@ -6619,8 +6616,8 @@ window.details = {
         sailor: "Completely resists Silence on this character",
         specialName: "Shiliew Special",
     },
-    1276: {//Shiliew
-        captain: "Unknown",
+    1276: {//Shiliew Evo
+        captain: "Boosts ATK and HP of Slasher characters by 2x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "Not sure how this is affected by resetting or against bosses",
         sailor: "Completely resists Silence on this character",
@@ -6628,15 +6625,51 @@ window.details = {
     },
     1277: {//Doc Q
         captain: "Unknown",
-        special: "Reduces crew's current HP by __%. Changes ____ orbs on ____ Characters into Matching Orbs,",
-        sailor: "Boosts amount healed from [RCV] orbs",
+        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
+        sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Doc Q Special",
     },
-    1278: {//Doc Q
-        captain: "Unknown",
-        special: "Reduces crew's current HP by __%. Changes ____ orbs on ____ Characters into Matching Orbs,",
-        sailor: "Boosts amount healed from [RCV] orbs",
+    1278: {//Doc Q Evo
+        captain: "Reduces RCV of all characters by __%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
+        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
+        sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Doc Q Special",
     },
+    1279: {//John Giant
+        captain: "Boosts ATK and HP of Slasher characters by 1.5x",
+        special: "Reduces damage received in the next turn by 50% if the special is activated with less than 50% health remaining",
+        specialName: "John Giant Special",
+    },
+    1280: {//Marineford Aokiji
+        captain: "Boosts ATK of [PSY] characters by 2.5x",
+        special: "Deals 10,000 fixed damage to all enemies and locks all orbs for 1 turn",
+        specialName: "Aokiji Special",
+    },
+    1281: {//Marineford Garp
+        captain: "Boosts ATK of Fighter characters by 2.25x and reduces damage received by 10%",
+        special: "Deals 25x character's ATK in [STR] damage to one enemy that bypasses all defensive Buffs",
+        specialNotes: "Ignores barriers, DEF, and Damage Reduction buffs",
+        specialName: "Garp Special",
+    },
+    1282: {//Marineford Sengoku
+        captain: "Boosts ATK of Cerebral characters by 2.5x",
+        special: "Reduces cooldown of all specials by 1 turn. Boosts the ATK of all characters by 1.2x and amplifies the effect of orbs by 1.2x for 1 turn",
+        specialName: "Sengoku Special",
+    },
+    1283: {//Marineford Akainu
+        captain: "Boosts ATK of Driven characters by 2.5x",
+        special: "Deals 35x character's ATK in [INT] damage to one enemy. Boosts the ATK of Driven characters by 1.5x for 1 turn",
+        specialName: "Akainu Special",
+    },
+    1284: {//Wild Luffy
+        captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
+        special: "Reduces duration of Bind and Silence by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
+        specialName: "Wild Luffy Special",
+    },
+    1285: {//Wild Luffy Evolved
+        captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
+        special: "Reduces duration of Bind and Silence by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
+        specialName: "Wild Luffy Special",
+    },
 };
 
diff --git a/common/data/flags.js b/common/data/flags.js
index adeeec129..70ba1e1b1 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -948,12 +948,12 @@ window.flags = {
 	1093: { rr: 1, rro: 1, lrr: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
     1100: { rr: 1, rro: 1, lrr: 1 },
-	1114: { rr: 1, rro: 1 },
-    1115: { rr: 1, rro: 1 },
-    1116: { rr: 1, rro: 1 },
-    1117: { rr: 1, rro: 1 },
-    1118: { rr: 1, rro: 1 },
-    1119: { rr: 1, rro: 1 },
+	1114: { rr: 1, rro: 1, global: 1 },
+    1115: { rr: 1, rro: 1, global: 1 },
+    1116: { rr: 1, rro: 1, global: 1 },
+    1117: { rr: 1, rro: 1, global: 1 },
+    1118: { rr: 1, rro: 1, global: 1 },
+    1119: { rr: 1, rro: 1, global: 1 },
     1120: { rr: 1, rro: 1, global: 1 },
     1121: { rr: 1, rro: 1, global: 1 },
     1122: { rr: 1, rro: 1 },
@@ -970,12 +970,12 @@ window.flags = {
     1133: { rr: 1, rro: 1 },
     1160: { rr: 1, rro: 1, lrr: 1 },
     1161: { rr: 1, rro: 1, lrr: 1 },
-    1172: { rr: 1, rro: 1 },
-    1173: { rr: 1, rro: 1 },
-    1174: { rr: 1, rro: 1 },
-    1175: { rr: 1, rro: 1 },
-    1176: { rr: 1, rro: 1 },
-    1177: { rr: 1, rro: 1 },
+    1172: { rr: 1, rro: 1, global: 1 },
+    1173: { rr: 1, rro: 1, global: 1 },
+    1174: { rr: 1, rro: 1, global: 1 },
+    1175: { rr: 1, rro: 1, global: 1 },
+    1176: { rr: 1, rro: 1, global: 1 },
+    1177: { rr: 1, rro: 1, global: 1 },
     1181: { rr: 1, rro: 1 },
     1182: { rr: 1, rro: 1 },
     1183: { rr: 1, rro: 1 },
@@ -990,12 +990,12 @@ window.flags = {
     1192: { rr: 1, rro: 1 },
     1193: { rr: 1, rro: 1, lrr: 1 },
     1194: { rr: 1, rro: 1, lrr: 1 },
-    1207: { rr: 1, rro: 1 },
-    1208: { rr: 1, rro: 1 },
-    1209: { rr: 1, rro: 1 },
-    1210: { rr: 1, rro: 1 },
-    1211: { rr: 1, rro: 1 },
-    1212: { rr: 1, rro: 1 },
+    1207: { rr: 1, rro: 1, global: 1 },
+    1208: { rr: 1, rro: 1, global: 1 },
+    1209: { rr: 1, rro: 1, global: 1 },
+    1210: { rr: 1, rro: 1, global: 1 },
+    1211: { rr: 1, rro: 1, global: 1 },
+    1212: { rr: 1, rro: 1, global: 1 },
     1213: { rr: 1, rro: 1, lrr: 1 },
     1214: { rr: 1, rro: 1, lrr: 1 },
     1229: { rr: 1, rro: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index b25c8be2c..4a2def46e 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1277,4 +1277,11 @@ window.gw=[
     38770,
     38769,
     38769,
+    39054,
+    38884,
+    38882,
+    38883,
+    38885,
+    39075,
+    39075,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 6e4991f6d..fdec2a90c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1277,6 +1277,13 @@ window.units = [
     [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, null, 301, 92, 59, null, null, null, null ],
+    [ "Aokiji, of Marineford", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, null, 257, 129, 58, null, null, null, null ],
+    [ "Garp, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 171, 64, 62, null, null, null, null ],
+    [ "Sengoku, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 213, 96, 95, null, null, null, null ],
+    [ "Akainu, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 133, 100, 0, null, null, null, null ],
+    [ "Wild Luffy", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, null, 226, 154, 51, null, null, null, null ],
+    [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ]
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 7a6875795..e3db8777b 100644
--- a/index.html
+++ b/index.html
@@ -65,7 +65,7 @@
             <p>27/09/2016</p>
             <br>
             <ul>
-                <li>New Blackbeard and Young Doffy Units Added!</li>
+                <li>New Blackbeard and Story Mode Units Added!</li>
                 <br>
                 <li>Units Updated, Ship Thumbnails updated</li>
                 <li>All units except Tashigi and Combo boosts</li>

From 1dfeea85d72a6a1899cae588c127df762becd884 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 29 Sep 2016 21:55:43 -0500
Subject: [PATCH 0599/1569] .

.
---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1698137f2..0abccec8f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1280,7 +1280,7 @@ window.cooldowns = [
     14,
     21,
     25,
-    19.
+    19,
     25,
     [ 12, 12 ],
     [ 12, 12 ],

From 5ad25e34bd5133e8f0d8c9f0b74eb34b9d13896e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 30 Sep 2016 03:34:23 -0500
Subject: [PATCH 0600/1569] just need stats

---
 common/data/captains.js  | 74 ++++++++++++++++++++++++++++++++++++++++
 common/data/cooldowns.js | 24 ++++++-------
 common/data/details.js   | 17 ++++-----
 common/data/specials.js  | 23 +++++++++++++
 common/data/units.js     | 22 ++++++------
 5 files changed, 129 insertions(+), 31 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 45817aa34..dc03de66e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3321,4 +3321,78 @@ window.captains = {
                 return 1; 
                },
     },
+    1271: {
+        atk: function(p) { return p.unit.class.has("Shooters") ? 2 : 1; },
+    },
+    1272: {
+        atk: function(p) { return p.unit.class.has("Shooters") ? 2.5 : 1; },
+    },
+    1273: {
+        atk: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
+				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.5 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.5 :
+				1;
+		},
+        hp: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
+				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.15 :
+				1;
+		},
+    },
+    1274: {
+        atk: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
+				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.6 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.6 :
+				1;
+		},
+        hp: function(p) {
+			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
+				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.15 :
+				1;
+		},
+    },
+    1275: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+    },
+    1276: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+    },
+    1277: {
+		atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.25 : 1; },
+        rcv: function(p) { return .01; },
+	},
+    1278: {
+		atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.75 : 1; },
+        rcv: function(p) { return .01; },
+	},
+    1279: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+    },
+    1280: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; },
+    },
+    1281: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+    },
+    1282: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+    },
+    1283: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+    },
+    1284: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+    },
+    1285: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0abccec8f..8cd9ea602 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1265,18 +1265,18 @@ window.cooldowns = [
     [ 13, 11 ],
     [ 14, 14 ],
     [ 14, 14 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    25,
+    25,
+    14,
+    14,
+    19,
+    19,
+    25,
+    25,
+    25,
+    25,
+    10,
+    10,
     14,
     21,
     25,
diff --git a/common/data/details.js b/common/data/details.js
index ebc25f32f..1988ea174 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6571,7 +6571,7 @@ window.details = {
         specialName: "World Shaking Impact",
     },
     1269: {//Laffitte
-        captain: "Unknown",
+        captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 3x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
         sailor: "Boosts ATK of all characters by 100 if your captain is a Driven character",
@@ -6585,7 +6585,7 @@ window.details = {
         specialName: "Laffitte Special",
     },
     1271: {//Van Augur
-        captain: "Unknown",
+        captain: "Boosts ATK of Shooter characters by 2x",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Van Augur Special",
@@ -6597,20 +6597,21 @@ window.details = {
         specialName: "Van Augur Special",
     },
     1273: {//Jesus Burgess
-        captain: "Unknown",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.15",
+        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.3225 HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Jesus Burgess Special",
     },
     1274: {//Jesus Burgess Evo
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.15x",
-        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.3225 HP",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.15x",
+        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.3225 HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Jesus Burgess Special",
     },
     1275: {//Shiliew
-        captain: "Unknown",
+        captain: "Boosts ATK and HP of Slasher characters by 1.5x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "Not sure how this is affected by resetting or against bosses",
         sailor: "Completely resists Silence on this character",
@@ -6624,13 +6625,13 @@ window.details = {
         specialName: "Shiliew Special",
     },
     1277: {//Doc Q
-        captain: "Unknown",
+        captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.25x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Doc Q Special",
     },
     1278: {//Doc Q Evo
-        captain: "Reduces RCV of all characters by __%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
+        captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Doc Q Special",
diff --git a/common/data/specials.js b/common/data/specials.js
index 70e8696af..77a73840a 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1701,4 +1701,27 @@ window.specials = {
 		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
 		type: "class"
 	},
+    1271: {
+    	orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+    },
+    1272: {
+    	orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+    },
+    1273: {
+		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+		type: "class"
+	},
+    1274: {
+		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+		type: "class"
+	},
+    1282: {
+		atk: function(p) { return 1.2; },
+		type: "class",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.2); },
+	},
+    1283: {
+		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+		type: "class"
+	},
 };
diff --git a/common/data/units.js b/common/data/units.js
index fdec2a90c..a77793598 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1267,21 +1267,21 @@ window.units = [
     [ "Kimono Ace Evolved", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, null, 890, 541, 130, null, null, null, null ],
     [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, null, 429, 287, 39, 1674, 854, 127, null ],
     [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, null, 1600, 789, 73, 3350, 1520, 244, null ],
-    [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, null, null, null, null, 995, 506, 202, null ],
+    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, null, null, null, null, 2094, 1132, 406, null ],
+    [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, 4, 3, 50, null, 99, 130, 48, 903, 620, 183, null ],
+    [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, null, 831, 578, 140, null, null, null, null ],
     [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Shiliew", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, null, 1439, 522, 1, null, null, null, null ],
+    [ "Shiliew", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, null, 132, 142, -300, null, null, -300, null ],
+    [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, null, 1168, 622, -300, 2500, 1490, -300, null ],
+    [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, 4, 3, 50, null, 52, 131, 89, null, null, null, null ],
+    [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, null, 609, 549, 201, null, null, null, null ],
     [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, null, 301, 92, 59, null, null, null, null ],
     [ "Aokiji, of Marineford", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, null, 257, 129, 58, null, null, null, null ],
     [ "Garp, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 171, 64, 62, null, null, null, null ],
-    [ "Sengoku, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 213, 96, 95, null, null, null, null ],
-    [ "Akainu, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 133, 100, 0, null, null, null, null ],
+    [ "Sengoku, of Marineford", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, null, 213, 96, 95, null, null, null, null ],
+    [ "Akainu, of Marineford", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, null, 133, 100, 0, null, null, null, null ],
     [ "Wild Luffy", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, null, 226, 154, 51, null, null, null, null ],
     [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ]
 	];

From c449418d5aea62b31e81c05f6c73321d2d85bd36 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 30 Sep 2016 03:37:14 -0500
Subject: [PATCH 0601/1569] more stats

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index a77793598..c85677988 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1267,11 +1267,11 @@ window.units = [
     [ "Kimono Ace Evolved", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, null, 890, 541, 130, null, null, null, null ],
     [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, null, 429, 287, 39, 1674, 854, 127, null ],
     [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, null, 1600, 789, 73, 3350, 1520, 244, null ],
-    [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, null, null, null, null, 995, 506, 202, null ],
-    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, null, null, null, null, 2094, 1132, 406, null ],
+    [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, null, 109, 92, 51, 995, 506, 202, null ],
+    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, null, 917, 415, 152, 2094, 1132, 406, null ],
     [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, 4, 3, 50, null, 99, 130, 48, 903, 620, 183, null ],
     [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, null, 831, 578, 140, null, null, null, null ],
-    [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, null, 187, 122, 1, null, null, null, null ],
     [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, null, 1439, 522, 1, null, null, null, null ],
     [ "Shiliew", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, null, 132, 142, -300, null, null, -300, null ],
     [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, null, 1168, 622, -300, 2500, 1490, -300, null ],

From a90d5e283cadde98424a5052941bd0aefe98824a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 30 Sep 2016 04:25:21 -0500
Subject: [PATCH 0602/1569] details fix

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 1988ea174..24efc5a35 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6558,14 +6558,14 @@ window.details = {
     },
     1267: {//Legend Blackbeard
         captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
-        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes. Enemy attacks will go through YOUR defensive buffs.",
+        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
         specialName: "World Shaking Impact",
     },
     1268: {//Legend Blackbeard
         captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
-        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Not sure how the ability is affected by characters with multiple classes. Enemy attacks will go through YOUR defensive buffs.",
+        captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
         specialName: "World Shaking Impact",
@@ -6613,14 +6613,14 @@ window.details = {
     1275: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
-        specialNotes: "Not sure how this is affected by resetting or against bosses",
+        specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
         specialName: "Shiliew Special",
     },
     1276: {//Shiliew Evo
         captain: "Boosts ATK and HP of Slasher characters by 2x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
-        specialNotes: "Not sure how this is affected by resetting or against bosses",
+        specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
         specialName: "Shiliew Special",
     },

From d45fc3f5ab4e9ad25deb2a80c4ff45a92cd532a5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 1 Oct 2016 13:28:31 +0200
Subject: [PATCH 0603/1569] Marineford Ace Captain

---
 common/data/captains.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index dc03de66e..e306b64b5 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3232,6 +3232,13 @@ window.captains = {
     1245: {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
     },
+    1246: {
+	atk: function(p) { return p.unit.class.has("Fighter") ? 1.2; }
+    },
+    1247: {
+	atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.75 : 2); },
+	hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
     1248: {
         atk: function(p) {
 			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :

From 11c696169e9dc582473b3f9a388cf129b097a501 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 1 Oct 2016 13:31:57 +0200
Subject: [PATCH 0604/1569] That's why you don't make changes on github
 directly

---
 common/data/captains.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index e306b64b5..08b140d62 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3233,11 +3233,11 @@ window.captains = {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
     },
     1246: {
-	atk: function(p) { return p.unit.class.has("Fighter") ? 1.2; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1247: {
-	atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.75 : 2); },
-	hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.75 : 2); },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1248: {
         atk: function(p) {

From f27411b5f01eeef3c47fc1123464b6089c902fdc Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 3 Oct 2016 00:57:45 -0500
Subject: [PATCH 0605/1569] Lots of little updates. Stats completed

---
 characters/js/table.js        |   2 +-
 characters/js/utils.js        |   6 +-
 characters/views/sidebar.html |   8 +-
 common/data/aliases.js        | 206 +++++++++++++++++-----------------
 common/data/defenses.js       |  18 +--
 common/data/details.js        |  20 ++--
 common/data/drops.js          |  25 ++++-
 common/data/effects.js        |  14 +--
 common/data/evolutions.js     |  34 ++++--
 common/data/families.js       |  19 +++-
 common/data/flags.js          |  29 ++++-
 common/data/units.js          |  58 +++++-----
 index.html                    |   4 +-
 13 files changed, 257 insertions(+), 186 deletions(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index 823639f14..5a354e23f 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -272,7 +272,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
 
     $timeout(function() {
         jQuery.fn.dataTable.ext.search.push(tableFilter);
-        var types = { story: 'Story Island', fortnight: 'Fortnight', raid: 'Raid', colosseum: 'Colosseum' };
+        var types = { story: 'Story Island', fortnight: 'Fortnight', raid: 'Raid', Coliseum: 'Coliseum' };
         $rootScope.$watch('table',function(table) {
             tableData = table;
             if (table.parameters && table.parameters.filters && table.parameters.filters.farmable) {
diff --git a/characters/js/utils.js b/characters/js/utils.js
index 6c622ec6d..9ec80141d 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -5,7 +5,7 @@ var CharUtils = { };
 /* * * * * Reverse drop map * * * * */
 
 var reverseDropMap = null;
-var marks = { 'Story Island': 1, 'Weekly Island': 2, 'Fortnight': 4, 'Raid': 8, 'Colosseum': 16 };
+var marks = { 'Story Island': 1, 'Weekly Island': 2, 'Fortnight': 4, 'Raid': 8, 'Coliseum': 16 };
 
 var generateReverseDropMap = function() {
     reverseDropMap = { };
@@ -16,8 +16,8 @@ var generateReverseDropMap = function() {
                 if (!data || data.constructor != Array) continue;
                 for (var i=0;i<data.length;++i) {
                     if (data[i] < 0 || CharUtils.isFarmable(data[i], type)) continue;
-                    if (drops[type][island].name == 'Colosseum')
-                        flagUnit(data[i], 'Colosseum');
+                    if (drops[type][island].name == 'Coliseum')
+                        flagUnit(data[i], 'Coliseum');
                     else
                         flagUnit(data[i], type);
                 }
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 93206909b..5020d78e6 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -51,10 +51,10 @@
         ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,true)">Raid-only</span><!--
  --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.raid === false }"
         ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,false)">Hide raid-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.colosseum }"
-        ng-model="filters.farmable.colosseum" ng-click="onDropFilterClick($event,true)">Colosseum-only</span><!--
- --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.colosseum === false }"
-        ng-model="filters.farmable.colosseum" ng-click="onDropFilterClick($event,false)">Hide Clssm-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.Coliseum }"
+        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,true)">Coliseum-only</span><!--
+ --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.Coliseum === false }"
+        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,false)">Hide Clssm-only</span>
 </div>
 
 <div class="filter-container conditional" ng-show="filters.drop == 'Non-farmable'">
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 50c70a5fe..17b612f7c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -774,12 +774,12 @@ window.aliases = {
     773: ['シュウ','','Raid'],
     774: ['ベリーグッド','','Very Good','Raid'],
     775: ['ストロベリー 海軍本部中将','','Raid'],
-    776: ['ラッキー・ルウ','','Colosseum'],
-    777: ['ラッキー・ルウ 赤髪海賊団','','Colosseum'],
-    778: ['レベッカ 囚人剣闘士','','Colosseum'],
-    779: ['レベッカ コロシアム専属剣闘士','','Colosseum'],
-    780: ['ウルージ 破戒僧海賊団船長','','Supernova','Colosseum'],
-    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova','Colosseum'],
+    776: ['ラッキー・ルウ','','Coliseum'],
+    777: ['ラッキー・ルウ 赤髪海賊団','','Coliseum'],
+    778: ['レベッカ 囚人剣闘士','','Coliseum'],
+    779: ['レベッカ コロシアム専属剣闘士','','Coliseum'],
+    780: ['ウルージ 破戒僧海賊団船長','','Supernova','Coliseum'],
+    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova','Coliseum'],
     782: ['たしぎ 正義の華','', 'Kimono Tashigi' ],
     783: ['たしぎ 海軍本部少尉・正義の華','', 'Kimono Tashigi' ],
     784: ['ゲンさん',''],
@@ -801,10 +801,10 @@ window.aliases = {
     800: ['たこボクサー 海獣海賊団',''],
     801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','mr 2' ],
     802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
-    803: ['ヒナ 海軍本部大佐','','Colosseum'],
-    804: ['黒檻のヒナ 海軍本部大佐','','Colosseum'],
-    805: ['スモーカー 海軍本部大佐','','Colosseum'],
-    806: ['白猟のスモーカー 海軍本部大佐','','Colosseum'],
+    803: ['ヒナ 海軍本部大佐','','Coliseum'],
+    804: ['黒檻のヒナ 海軍本部大佐','','Coliseum'],
+    805: ['スモーカー 海軍本部大佐','','Coliseum'],
+    806: ['白猟のスモーカー 海軍本部大佐','','Coliseum'],
     807: ['純白の天使ナミ ウエディング','','Bridal Nami'],
     808: ['純白の女神ナミ ウエディング','','Bridal Nami'],
     809: ['ローラ スリラーバークの花嫁',''],
@@ -828,11 +828,11 @@ window.aliases = {
     827: ['ジェネラルゾンビ　疾速の影',''],
     828: ['？？？','','Kid Law','Young Law'],
     829: ['？？？','','Kid Law','Young Law'],
-    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Colosseum'],
-    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Colosseum'],
-    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Colosseum' ],
-    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Colosseum' ],
-    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day','Colosseum'],
+    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum'],
+    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum'],
+    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Coliseum' ],
+    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Coliseum' ],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day','Coliseum'],
     835: ['暴君バーソロミュー・くま','','Raid'],
     836: ['暴君バーソロミュー・くま 政府の人間兵器','','Raid'],
     837: ['シーザー・クラウン',''],
@@ -857,10 +857,10 @@ window.aliases = {
     856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova','Christmas Law','CLaw'],
     857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova'],
     858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ','','Supernova'],
-    859: ['コビー 海軍本部曹長','','Colosseum'],
-    860: ['戦火の勇士コビー 海軍本部曹長','','Colosseum'],
-    861: ['レディー・アルビダ うるわしき美女','','Colosseum'],
-    862: ['レディー・アルビダ 絶世の美女','','Colosseum'],
+    859: ['コビー 海軍本部曹長','','Coliseum'],
+    860: ['戦火の勇士コビー 海軍本部曹長','','Coliseum'],
+    861: ['レディー・アルビダ うるわしき美女','','Coliseum'],
+    862: ['レディー・アルビダ 絶世の美女','','Coliseum'],
     863: ['銀世界のナミ',''],
     864: ['ボア・ハンコック 九蛇海賊団船長','','Raid'],
     865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid'],
@@ -879,10 +879,10 @@ window.aliases = {
     878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates' ],
     879: ['ラオＧ',''],
     880: ['ラオＧ ドンキホーテ海賊団',''],
-    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova','Colosseum'],
-    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova','Colosseum'],
-    883: ['ドリー 巨兵海賊団','','Colosseum'],
-    884: ['青鬼のドリー','','Colosseum'],
+    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum'],
+    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum'],
+    883: ['ドリー 巨兵海賊団','','Coliseum'],
+    884: ['青鬼のドリー','','Coliseum'],
     885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
     886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
     887: ['バギー 陽気なかぶき者','', 'Kimono Buggy' ],
@@ -898,11 +898,11 @@ window.aliases = {
     897: ['サー・クロコダイル 砂の武将','', 'Kimono Crocodile' ],
     898: ['Mr.3 姑息な楽士','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
     899: ['Mr.2・ボン・クレー あやふやな侍','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
-    900: ['フレッシュ・フランキー 健康第一','','Colosseum'],
-    901: ['鉄人（サイボーグ）フランキー','','Colosseum'],
-    902: ['ブロギー 巨兵海賊団','','Colosseum'],
-    903: ['赤鬼のブロギー','','Colosseum'],
-    904: ['ヨコヅナ','','Colosseum'],
+    900: ['フレッシュ・フランキー 健康第一','','Coliseum'],
+    901: ['鉄人（サイボーグ）フランキー','','Coliseum'],
+    902: ['ブロギー 巨兵海賊団','','Coliseum'],
+    903: ['赤鬼のブロギー','','Coliseum'],
+    904: ['ヨコヅナ','','Coliseum'],
     905: ['ロロノア・ゾロ クライガナ島をさすらう剣士','','3D2Y Zoro','Timeskip Zoro'],
     906: ['ロロノア・ゾロ 世界最強剣士の門弟','','3D2Y Zoro','Timeskip Zoro'],
     907: ['ニコ・ロビン テキーラウルフの収監者','','3D2Y Robin','Timeskip Robin'],
@@ -921,11 +921,11 @@ window.aliases = {
     920: ['スイトピー',''],
     921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
     922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
-    923: ['南の海のキャプテン・キッド','','Colosseum'],
-    924: ['キャプテン・キッド キッド海賊団船長','','Colosseum'],
-    925: ['獄卒長サディちゃん','','Colosseum'],
-    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Colosseum'],
-    927: ['ドーベルマン 海軍本部中将','','Colosseum'],
+    923: ['南の海のキャプテン・キッド','','Coliseum'],
+    924: ['キャプテン・キッド キッド海賊団船長','','Coliseum'],
+    925: ['獄卒長サディちゃん','','Coliseum'],
+    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum'],
+    927: ['ドーベルマン 海軍本部中将','','Coliseum'],
 	928: ['ハンニャバル','','Hannibal'],
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
@@ -980,9 +980,9 @@ window.aliases = {
     979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
     980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
     981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
-    982: ['ビスタ 白ひげ海賊団５番隊隊長','','Colosseum'],
-    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Colosseum'],
-    984: ['パウリー ガレーラカンパニー１番ドック職長','','Colosseum'],
+    982: ['ビスタ 白ひげ海賊団５番隊隊長','','Coliseum'],
+    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Coliseum'],
+    984: ['パウリー ガレーラカンパニー１番ドック職長','','Coliseum'],
     985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味','','Raid'],
     986: ['ココア＆のらギツネ ニセ麦わらの一味','','Raid'],
     987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid'],
@@ -1013,11 +1013,11 @@ window.aliases = {
 	1012: ['ヘビー総裁',''],
 	1013: ['ホットドッグ将軍',''],
 	1014: ['トニートニー・チョッパー 動物王',''],
-	1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Colosseum'],
-	1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Colosseum'],
-	1017: ['茶ひげ','','Colosseum'],
-	1018: ['茶ひげ ワニのケンタウロス','','Colosseum'],
-	1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Colosseum'],
+	1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Coliseum'],
+	1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Coliseum'],
+	1017: ['茶ひげ','','Coliseum'],
+	1018: ['茶ひげ ワニのケンタウロス','','Coliseum'],
+	1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum'],
 	1020: ['？？？','','Sakura Sugar'],
 	1021: ['？？？','','Sakura Sugar'],
 	1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
@@ -1038,10 +1038,10 @@ window.aliases = {
     1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
     1038: ['イナズマ 秘密の花園の乙女',''],
     1039: ['イナズマ 変革を画策する乙女',''],
-    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '','Colosseum' ],
-    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Colosseum' ],
-    1042: [ 'キラー キッド海賊団', '','Colosseum' ],
-    1043: [ '“殺戮武人”キラー キッド海賊団', '','Colosseum' ],
+    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum' ],
+    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum' ],
+    1042: [ 'キラー キッド海賊団', '','Coliseum' ],
+    1043: [ '“殺戮武人”キラー キッド海賊団', '','Coliseum' ],
     1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
     1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
     1046: [ 'サボ 竜の爪', '','Raid' ],
@@ -1084,12 +1084,12 @@ window.aliases = {
     1083: [ '首領・サイ 花ノ国のギャング', '' ],
     1084: [ '藤虎', '' ],
     1085: [ 'イッショウ', '', 'Fujitora' ],
-    1086: [ 'ムッシュール', '','Colosseum' ],
-    1087: [ 'ムッシュール 毒胞子人間', '','Colosseum' ],
-    1088: [ 'サガ', '','Colosseum' ],
-    1089: [ 'サガ 呪われた聖剣', '','Colosseum' ],
-    1090: [ 'X・ドレーク ドレーク海賊団', '','Colosseum' ],
-    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '','Colosseum' ],
+    1086: [ 'ムッシュール', '','Coliseum' ],
+    1087: [ 'ムッシュール 毒胞子人間', '','Coliseum' ],
+    1088: [ 'サガ', '','Coliseum' ],
+    1089: [ 'サガ 呪われた聖剣', '','Coliseum' ],
+    1090: [ 'X・ドレーク ドレーク海賊団', '','Coliseum' ],
+    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '','Coliseum' ],
     1092: [ 'レベッカ パラソルのリズム', '','Kid Rebecca' ],
     1093: [ 'レベッカ 虹のメロディ', '','Kid Rebecca' ],
     1094: [ 'Dr.インディゴ', '' ],
@@ -1099,12 +1099,12 @@ window.aliases = {
     1098: [ '雷鳥ビリー', '' ],
     1099: [ 'コビー 雨の中の曹長', '' ],
     1100: [ 'コビー 露にきらめく曹長', '' ],
-    1101: [ '黒腕のゼファー', '','Colosseum' ],
-    1102: [ '黒腕のゼファー 元海軍本部大将', '','Colosseum' ],
-    1103: [ 'アイン ＮＥＯ海軍', '','Colosseum' ],
-    1104: [ 'アイン ゼファー最後の教え子', '','Colosseum' ],
-    1105: [ 'ビンズ ＮＥＯ海軍', '','Colosseum' ],
-    1106: [ 'ビンズ ゼファー最後の教え子', '','Colosseum' ],
+    1101: [ '黒腕のゼファー', '','Coliseum' ],
+    1102: [ '黒腕のゼファー 元海軍本部大将', '','Coliseum' ],
+    1103: [ 'アイン ＮＥＯ海軍', '','Coliseum' ],
+    1104: [ 'アイン ゼファー最後の教え子', '','Coliseum' ],
+    1105: [ 'ビンズ ＮＥＯ海軍', '','Coliseum' ],
+    1106: [ 'ビンズ ゼファー最後の教え子', '','Coliseum' ],
     1107: [ '金獅子のシキ', '','Raid' ],
     1108: [ '金獅子のシキ 金獅子海賊団', '','Raid' ],
     1109: [ 'ナミ 若返った航海士', '' ],
@@ -1138,12 +1138,12 @@ window.aliases = {
     1137: ['ジャブラ 世界政府直下暗躍諜報機関',''],
     1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
     1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
-    1140: ['ゲッコー・モリア 魔の三角地帯の主','','Colosseum Gekko Moriah'],
-    1141: ['ゲッコー・モリア 魔の三角地帯の支配者','','Colosseum Gekko Moriah'],
-    1142: ['フォクシー ドーナツレースの邪魔者','','Colosseum Foxy','Dying Foxy'],
-    1143: ['フォクシー コンバットの卑怯者','','Colosseum Foxy','Nurse Foxy'],
-    1144: ['ポルチェ お花チアリーダーズ','','Colosseum Porche'],
-    1145: ['ポルチェ キューティバトンの使い手','','Colosseum Porche'],
+    1140: ['ゲッコー・モリア 魔の三角地帯の主','','Coliseum Gekko Moriah'],
+    1141: ['ゲッコー・モリア 魔の三角地帯の支配者','','Coliseum Gekko Moriah'],
+    1142: ['フォクシー ドーナツレースの邪魔者','','Coliseum Foxy','Dying Foxy'],
+    1143: ['フォクシー コンバットの卑怯者','','Coliseum Foxy','Nurse Foxy'],
+    1144: ['ポルチェ お花チアリーダーズ','','Coliseum Porche'],
+    1145: ['ポルチェ キューティバトンの使い手','','Coliseum Porche'],
     1146: ['制圧の制服看守',''],
     1147: ['火急の制服看守',''],
     1148: ['包囲の制服看守',''],
@@ -1193,9 +1193,9 @@ window.aliases = {
     1192: ['クザン','','Aokiji'],
 	1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
 	1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
-	1195: ['ガン・フォール 先代“神”','','Colosseum Gan Fall'],
-	1196: ['ガン・フォール スカイピアの神','','Colosseum Gan Fall'],
-	1197: ['スカイブリーダー・オーム','','Colosseum Ohm'],
+	1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall'],
+	1196: ['ガン・フォール スカイピアの神','','Coliseum Gan Fall'],
+	1197: ['スカイブリーダー・オーム','','Coliseum Ohm'],
     1198: ['ジュエリー・ボニー 弾けるサファイア','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
 	1199: ['ジュエリー・ボニー パールホワイトの煌き','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
 	1200: ['ヴァイオレット 挑発のバカンス','','Summertime Viola','Swimsuit Viola'],
@@ -1243,45 +1243,45 @@ window.aliases = {
     1242: ['コアラ 革命軍・魚人空手師範代','',''],
     1243: ['ハック 魚人空手師範','',''],
     1244: ['ハック 革命軍・魚人空手師範','',''],
-    1245: ['','',''],
-    1246: ['','',''],
-    1247: ['','',''],
-    1248: ['','',''],
-    1249: ['','',''],
-    1250: ['','',''],
-    1251: ['','',''],
-    1252: ['','',''],
-    1253: ['','',''],
-    1254: ['','',''],
-    1255: ['','',''],
-    1256: ['','',''],
-    1257: ['','','Edward Newgate'],
-    1258: ['','','Edward Newgate'],
-    1259: ['','','Doffy','Donquixote Doflamingo'],
-    1260: ['','','Doffy','Donquixote Doflamingo'],
-    1261: ['','','Senor Pink', 'Senior Pink'],
-    1262: ['','','Senor Pink', 'Senior Pink'],
-    1263: ['','',''],
-    1264: ['','',''],
+    1245: ['モンキー・D・ルフィ マリンフォードに舞う“麦わら”','',''],
+    1246: ['ポートガス・D・エース 処刑台の“火拳”','',''],
+    1247: ['ポートガス・D・エース マリンフォードに舞う“火拳”','',''],
+    1248: ['マルコ 秋風にはためく襟元','',''],
+    1249: ['マルコ ほろ酔いの着崩れ','',''],
+    1250: ['マルコ 白ひげ海賊団','','Coliseum'],
+    1251: ['マルコ　復活の炎 白ひげ海賊団','','Coliseum'],
+    1252: ['遊騎士ドーマ 白ひげ海賊団傘下','','Coliseum'],
+    1253: ['スカイライダー・シュラ','','Coliseum'],
+    1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','',''],
+    1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下','',''],
+    1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下','',''],
+    1257: ['エドワード・ニューゲート 海賊王のライバル','','Edward Newgate'],
+    1258: ['エドワード・ニューゲート 大海賊“白ひげ”','','Edward Newgate'],
+    1259: ['ドンキホーテ・ドフラミンゴ “北の海”の海賊','','Young Doffy','Donquixote Doflamingo'],
+    1260: ['ドンキホーテ・ドフラミンゴ “北の海”の闇','','Young Doffy','Donquixote Doflamingo'],
+    1261: ['セニョール・ピンク “北の海”の海賊','','Senor Pink', 'Young Senior Pink'],
+    1262: ['セニョール・ピンク “北の海”の闇','','Senor Pink', 'Young Senior Pink'],
+    1263: ['ヴェルゴ “北の海”の海賊','','Young Vergo'],
+    1264: ['ヴェルゴ “北の海”の闇','','Young Vergo'],
     1265: ['','',''],
     1266: ['','',''],
-    1267: ['','',''],
-    1268: ['','',''],
-    1269: ['','',''],
-    1270: ['','',''],
-    1271: ['','',''],
-    1272: ['','',''],
-    1273: ['','',''],
-    1274: ['','',''],
-    1275: ['','',''],
-    1276: ['','',''],
-    1277: ['','',''],
-    1278: ['','',''],
-    1279: ['','',''],
-    1280: ['','',''],
-    1281: ['','',''],
-    1282: ['','',''],
-    1283: ['','',''],
+    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','',''],
+    1268: ['黒ひげ 黒ひげ海賊団船長','',''],
+    1269: ['ラフィット','',''],
+    1270: ['“鬼保安官”ラフィット','',''],
+    1271: ['ヴァン・オーガー','',''],
+    1272: ['“音越”ヴァン・オーガー','',''],
+    1273: ['ジーザス・バージェス','',''],
+    1274: ['“チャンピオン”ジーザス・バージェス','',''],
+    1275: ['シリュウ','',''],
+    1276: ['雨のシリュウ','',''],
+    1277: ['ドクＱ','',''],
+    1278: ['“死神”ドクＱ','',''],
+    1279: ['ジョン・ジャイアント','',''],
+    1280: ['青キジ 海軍本部大将','','Kuzan'],
+    1281: ['ガープ 海軍本部中将','',''],
+    1282: ['センゴク 海軍本部元帥','',''],
+    1283: ['赤犬 海軍本部大将','','Sakazuki'],
     1284: ['','',''],
     1285: ['','',''],
 };
diff --git a/common/data/defenses.js b/common/data/defenses.js
index bbecd33d8..8c60cb897 100644
--- a/common/data/defenses.js
+++ b/common/data/defenses.js
@@ -184,15 +184,15 @@ window.defenses = [
     [ 'Mr. 3'                               , 'Mountaintop Banquet Fortnight'        , 'Expert', 898, 150 ] ,
     [ 'Crocodile'                           , 'Mountaintop Banquet Fortnight'        , 'Expert', 897, 1000 ] ,
     [ 'Crocodile (def up)'                  , 'Mountaintop Banquet Fortnight'        , 'Expert', 897, 30000 ] ,
-    /* * * * * Colosseum * * * * */
-    [ 'Dr. Kureha'                          , 'Colosseum, 1st Hina Round'            , 'Chaos' , 333, 20 ],
-    [ 'Hotori and Kotori'                   , 'Colosseum, 2nd Hina Round'            , 'Chaos' , 504, 250 ],
-    [ 'Hamburg'                             , 'Colosseum, 3rd Hina Round'            , 'Chaos' , 565, 200 ],
-    [ 'Pickles'                             , 'Colosseum, 3rd Hina Round'            , 'Chaos' , 566, 250 ],
-    [ 'Big Pan'                             , 'Colosseum, 3rd Hina Round'            , 'Chaos' , 567, 250 ],
-    [ 'Pell'                                , 'Colosseum, 4th Hina Round'            , 'Chaos' , 505, 150 ],
-    [ 'Pell'                                , 'Colosseum, 5th Hina Round'            , 'Chaos' , 505, 150 ],
-    [ 'Hina'                                , 'Colosseum, 5th Hina Round'            , 'Chaos' , 804, 150 ],
+    /* * * * * Coliseum * * * * */
+    [ 'Dr. Kureha'                          , 'Coliseum, 1st Hina Round'            , 'Chaos' , 333, 20 ],
+    [ 'Hotori and Kotori'                   , 'Coliseum, 2nd Hina Round'            , 'Chaos' , 504, 250 ],
+    [ 'Hamburg'                             , 'Coliseum, 3rd Hina Round'            , 'Chaos' , 565, 200 ],
+    [ 'Pickles'                             , 'Coliseum, 3rd Hina Round'            , 'Chaos' , 566, 250 ],
+    [ 'Big Pan'                             , 'Coliseum, 3rd Hina Round'            , 'Chaos' , 567, 250 ],
+    [ 'Pell'                                , 'Coliseum, 4th Hina Round'            , 'Chaos' , 505, 150 ],
+    [ 'Pell'                                , 'Coliseum, 5th Hina Round'            , 'Chaos' , 505, 150 ],
+    [ 'Hina'                                , 'Coliseum, 5th Hina Round'            , 'Chaos' , 804, 150 ],
     /* * * * * Others * * * * */
     [ 'Thatch'                              , 'Whitebeard\'s island, 11th round'     , '', 448, 50 ],
     [ 'Namur'                               , 'Whitebeard\'s island, 12th round'     , '', 450, 500 ],
diff --git a/common/data/details.js b/common/data/details.js
index 24efc5a35..de188184d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5691,34 +5691,34 @@ window.details = {
 		special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
 		specialName: "Lack of Pure Chi: Lion Finger Gun Sneak Attack"
 	},
-	1140: {// Colosseum Moriah
+	1140: {// Coliseum Moriah
 		captain: "Boosts ATK of Driven characters by 2x",
 		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
 		specialName: "Horn Blade Shadow"
 	},
-	1141: {// Colosseum Moriah
+	1141: {// Coliseum Moriah
 		captain: "Boosts ATK of Driven characters by 2.25x, recovers 3x character's RCV in HP at the end of each turn",
 		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
 		specialName: "Horn Blade Shadow"
 	},
-	1142: {// Colosseum Foxy
+	1142: {// Coliseum Foxy
 		captain: "Boosts ATK of Free Spirit characters by 1.5x",
 		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 15}",
 		specialName: "Gorilla Punch: Golden Strike"
 	},
-	1143: {// Colosseum Foxy
+	1143: {// Coliseum Foxy
 		captain: "Boosts ATK of Free Spirit characters by 2x. Reduces cooldown of Free Spirit characters by 2 turns at the start of the fight",
 		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 15}",
 		specialName: "Gorilla Punch: Golden Strike"
 	},
-	1144: {// Colosseum Porche
+	1144: {// Coliseum Porche
 		captain: "Boosts ATK of Cerebral characters by 1.75x",
 		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
 		specialName: "Cutie Baton: Flower Shuriken"
 	},
-	1145: {// Colosseum Porche
+	1145: {// Coliseum Porche
 		captain: "Boosts ATK of Cerebral characters by 1.75x and their RCV by 1.5x",
 		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
 		specialName: "Cutie Baton: Flower Shuriken"
@@ -6153,7 +6153,7 @@ window.details = {
 		special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
 		specialName: "Everybody Confusing Fragrance",
 	},
-	1219: {//Byrnndi World Colosseum
+	1219: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x If you did not defeat an enemy, lose all ATK boost stacks.",
 		special: [
 			{
@@ -6171,7 +6171,7 @@ window.details = {
 		],        
 		specialName: "More More, 10 Times \"Iron Hammer\"",
 	},
-	1220: {//Byrnndi World Colosseum
+	1220: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x If you did not defeat an enemy, lose all ATK boost stacks.",
 		special: [
 			{
@@ -6189,13 +6189,13 @@ window.details = {
 		],        
 		specialName: "More More, 10 Times \"Iron Hammer\"",
 	},
-	1221: {//Colosseum Oars Jr
+	1221: {//Coliseum Oars Jr
 		captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
 		special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
 		specialName: "Blood of the Devil Warrior",
 	},
-	1222: {//Colosseum Oars Jr
+	1222: {//Coliseum Oars Jr
 		captain: "Boosts ATK of Slasher characters by 2x and the HP of Powerhouse characters by 1.75x",
 		special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
diff --git a/common/data/drops.js b/common/data/drops.js
index 26094222a..1d614ff65 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -465,6 +465,7 @@ window.drops = {
             name: "Sabaody Archipelago",
             shortName: "Sabaody Archipelago",
             thumb: 974,
+            global: true,
             completion: '5x Rainbow Gems',
             "01": [ 620, 111, 623, 113, 625, 114, 954, 955, 956 ],
             "02": [ ],
@@ -540,6 +541,28 @@ window.drops = {
 			"12": [ 1228 ]
         },
         
+        {
+            name: "Marineford - Oris Plaza",
+            shortName: "Oris Plaza",
+            thumb: 1283,
+            completion: '5x Rainbow Gems',
+            "01": [ 1279 ],
+            "02": [  ],
+            "03": [ 1280 ],
+            "04": [ 1228 ],
+            "05": [  ],
+            "06": [ 262 ],
+            "07": [  ],
+            "08": [ 1281, 1282 ],
+            "09": [ 1280 ],
+			"10": [ 1283 ],
+			"11": [ 1283 ],
+			"12": [  ],
+            "13": [  ],
+			"14": [ 1283 ],
+			"15": [ 1283 ],
+        },
+        
     ],
 
     'Weekly Island': [
@@ -1368,7 +1391,7 @@ window.drops = {
         },
 
         {
-            name: 'Colosseum',
+            name: 'Coliseum',
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253 ],
diff --git a/common/data/effects.js b/common/data/effects.js
index 730809eff..8bc7d6e07 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -217,7 +217,7 @@ window.effects = {
         gOrbsEnabled: true
     },
     
-    'Colosseum Franky': {
+    'Coliseum Franky': {
         description: 'Activates [G] orb Support, boosts Orbs by 1.5x',
         thumb: 560,
         id: 25, // don't change this
@@ -225,14 +225,14 @@ window.effects = {
         gOrbsEnabled: true
     },
 
-    'Colosseum Killer': {
+    'Coliseum Killer': {
         description: 'ATK of all units reduced by 95%',
         thumb: 1043,
         id: 26, // don't change this
         atk: function(p) { return 0.05; }
     },
     
-    'Colosseum Kid': {
+    'Coliseum Kid': {
         description: 'Perfect hit barrier (2 hits)',
         thumb: 966,
         id: 27,
@@ -240,7 +240,7 @@ window.effects = {
         comboType: 'Perfect'
     },
     
-    'Colosseum Fukuro': {
+    'Coliseum Fukuro': {
         description: 'Perfect hit barrier (3 hits)',
         thumb: 758,
         id: 28,
@@ -248,7 +248,7 @@ window.effects = {
         comboType: 'Perfect'
     },
     
-    'Colosseum Cricket': {
+    'Coliseum Cricket': {
         description: 'Fixed threshold barrier (200,000)',
         thumb: 428,
         id: 29,
@@ -296,7 +296,7 @@ window.effects = {
     },
     
     '1.25x Orb Boost': {
-        description: 'Used by Christmas Law in Saga Colosseum',
+        description: 'Used by Christmas Law in Saga Coliseum',
         thumb: 856,
         id: 35,
         orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); }
@@ -340,7 +340,7 @@ window.effects = {
                         }
     },
     
-    'Colosseum Tashigi': {
+    'Coliseum Tashigi': {
         description: '25 hit barrier and 2x chain limit',
         thumb: null,
         id: 38,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7a8a3fdf9..dd027628c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1889,31 +1889,31 @@ window.evolutions = {
     },
     1246: {
         evolution: 1247,
-		evolvers: [  ]
+		evolvers: [ 118, 84, 94, 95, 100 ]
     },
     1248: {
         evolution: 1249,
-		evolvers: [  ]
+		evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1250: {
         evolution: 1251,
-		evolvers: [  ]
+		evolvers: [ 118, 85, 87, 301, 101 ]
     },
     1257: {
         evolution: 1258,
-		evolvers: [  ]
+		evolvers: [ 118, 87, 266, 98, 267 ]
     },
     1259: {
         evolution: 1260,
-		evolvers: [  ]
+		evolvers: [ 300, 301, 302, 303, 304 ]
     },
     1261: {
         evolution: 1262,
-		evolvers: [  ]
+		evolvers: [ 266, 88, 88, 88, 88 ]
     },
     1263: {
         evolution: 1264,
-		evolvers: [  ]
+		evolvers: [ 96, 99, 101, 104 ]
     },
     1265: {
         evolution: 1266,
@@ -1921,14 +1921,30 @@ window.evolutions = {
     },
     1267: {
         evolution: 1268,
-		evolvers: [  ]
+		evolvers: [ 266, 302, 304, 102, 267 ]
     },
     1269: {
         evolution: 1270,
-		evolvers: [  ]
+		evolvers: [ 83, 86, 94, 97, 302 ]
     },
     1271: {
         evolution: 1272,
+		evolvers: [ 85, 94, 96, 301, 101 ]
+    },
+    1273: {
+        evolution: 1274,
+		evolvers: [ 118, 118, 78, 78, 100 ]
+    },
+    1275: {
+        evolution: 1276,
+		evolvers: [ 118, 88, 99, 304, 104 ]
+    },
+    1277: {
+        evolution: 1278,
+		evolvers: [ 118, 87, 98, 303, 103 ]
+    },
+    1284: {
+        evolution: 1285,
 		evolvers: [  ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 05dd6de94..42c593295 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1263,18 +1263,25 @@ window.families = [
     "Señor Pink",
     "Vergo",
     "Vergo",
-    null,
-    null,
+    "Portgas D. Ace",
+    "Portgas D. Ace",
     "Blackbeard",
 	"Blackbeard",
-    "Doc Q",
-    "Doc Q",
+    "Laffitte",
+    "Laffitte",
     "Van Augur",
     "Van Augur",
     "Jesus Burgess",
     "Jesus Burgess",
     "Shiliew",
     "Shiliew",
-    "Laffitte",
-    "Laffitte",
+    "Doc Q",
+    "Doc Q",
+    "John Giant",
+    "Aokiji",
+    "Monkey D. Garp",
+    "Sengoku",
+    "Akainu",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 70ba1e1b1..04895fb97 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -796,6 +796,10 @@ window.flags = {
     800: { global: 1 },
 	801: { rr: 1, rro: 1, lrr: 1 },
 	802: { rr: 1, rro: 1, lrr: 1 },
+    803: { global: 1 },
+    804: { global: 1 },
+    805: { global: 1 },
+    806: { global: 1 },
     807: { global: 1 },
     808: { global: 1 },
     809: { global: 1 },
@@ -879,8 +883,8 @@ window.flags = {
 	916: { rr: 1, rro: 1, lrr: 1, global: 1 },
     921: { rr: 1, rro: 1, lrr: 1, global: 1 },
     922: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	934: { rr: 1, rro: 1 },
-	935: { rr: 1, rro: 1 },
+	934: { rr: 1, rro: 1, global: 1 },
+	935: { rr: 1, rro: 1, global: 1 },
 	936: { rr: 1, rro: 1, global: 1 },
 	937: { rr: 1, rro: 1, global: 1 },
 	938: { rr: 1, rro: 1, global: 1 },
@@ -891,6 +895,27 @@ window.flags = {
 	943: { rr: 1, rro: 1, global: 1 },
 	944: { rr: 1, rro: 1, lrr: 1, global: 1 },
 	945: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    954: { global: 1 },
+    955: { global: 1 },
+    956: { global: 1 },
+    957: { global: 1 },
+    958: { global: 1 },
+    959: { global: 1 },
+    960: { global: 1 },
+    961: { global: 1 },
+    962: { global: 1 },
+    963: { global: 1 },
+    964: { global: 1 },
+    965: { global: 1 },
+    966: { global: 1 },
+    967: { global: 1 },
+    968: { global: 1 },
+    969: { global: 1 },
+    970: { global: 1 },
+    971: { global: 1 },
+    972: { global: 1 },
+    973: { global: 1 },
+    974: { global: 1 },
 	975: { rr: 1, rro: 1, lrr: 1 },
 	976: { rr: 1, rro: 1, lrr: 1 },
     990: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index c85677988..9c0565700 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -777,7 +777,7 @@ window.units = [
 	[ "Lucky Roo", "PSY", [ "Shooter", "Free Spirit" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
 	[ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
 	[ "Rebecca, Imprisoned Swordsman", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
-	[ "Rebecca, Colosseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
+	[ "Rebecca, Coliseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
 	[ "Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
 	[ "Mad Monk Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1512, 755, 83, 2824, 1324, 203, 1.5 ],
 	[ "Tashigi: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 132, 65, 49, 999, 495, 205, 1 ],
@@ -1244,10 +1244,10 @@ window.units = [
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
     [ "'Straw Hat' Monkey D Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
-    [ "Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, null, 79, 30, 2, null, null, null, null ],
-    [ "Ace, Marineford Flight Evolved", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, null, 1403, 793, 121, 2120, 1281, 246, null ],
-    [ "Fluttering in Neck the Autumn Breeze, Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, null, 142, 79, 40, 940, 504, 201, null ],
-    [ "Tipsy Kimono, Marco", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, null, 870, 452, 164, 1804, 1017, 374, null ],
+    [ "Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
+    [ "Ace, Marineford Flight Evolved", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
+    [ "Fluttering in Neck the Autumn Breeze, Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
+    [ "Tipsy Kimono, Marco", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
     [ "Marco, Whitebeard Pirates", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
     [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
@@ -1255,33 +1255,33 @@ window.units = [
     [ "Maelstrom Spider Squardo, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
     [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
-    [ "Young Whitebeard", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, null, 1116, 587, 51, 1744, 894, 103, null ],
+    [ "Young Whitebeard", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
     [ "Young Whitebeard Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, null, 1597, 762, 70, 2702, 1570, 170, null ],
-    [ "Young Doflamingo", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, null, 70, null, null, null, null, null, null, null, null ],
-    [ "Young Doflamingo Evolved", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, null, 941, 603, 152, 1997, 1418, 344, null ],
-    [ "Young Señor Pink", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, null, null, null, null, null, null, null, null ],
-    [ "Young Señor Pink Evolved", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, null, 1472, 440, 130, null, null, null, null ],
-    [ "Young Vergo", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, null, 70, null, null, null, null, 1250, 559, 48, null ],
-    [ "Young Vergo Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, null, 1250, 559, 48, 2694, 1389, 139, null ],
+    [ "Young Doflamingo", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
+    [ "Young Doflamingo Evolved", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
+    [ "Young Señor Pink", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
+    [ "Young Señor Pink Evolved", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
+    [ "Young Vergo", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
+    [ "Young Vergo Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
     [ "Kimono Ace", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, null, 152, 90, 30, 961, 584, 174, null ],
     [ "Kimono Ace Evolved", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, null, 890, 541, 130, null, null, null, null ],
-    [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, null, 429, 287, 39, 1674, 854, 127, null ],
-    [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, null, 1600, 789, 73, 3350, 1520, 244, null ],
-    [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, null, 109, 92, 51, 995, 506, 202, null ],
-    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, null, 917, 415, 152, 2094, 1132, 406, null ],
-    [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, 4, 3, 50, null, 99, 130, 48, 903, 620, 183, null ],
-    [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, null, 831, 578, 140, null, null, null, null ],
-    [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, null, 187, 122, 1, null, null, null, null ],
-    [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, null, 1439, 522, 1, null, null, null, null ],
-    [ "Shiliew", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, null, 132, 142, -300, null, null, -300, null ],
-    [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, null, 1168, 622, -300, 2500, 1490, -300, null ],
-    [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, 4, 3, 50, null, 52, 131, 89, null, null, null, null ],
-    [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, null, 609, 549, 201, null, null, null, null ],
-    [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, null, 301, 92, 59, null, null, null, null ],
-    [ "Aokiji, of Marineford", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, null, 257, 129, 58, null, null, null, null ],
-    [ "Garp, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 171, 64, 62, null, null, null, null ],
-    [ "Sengoku, of Marineford", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, null, 213, 96, 95, null, null, null, null ],
-    [ "Akainu, of Marineford", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, null, 133, 100, 0, null, null, null, null ],
+    [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, 1066998, 429, 287, 39, 1674, 854, 127, 1 ],
+    [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1600, 789, 73, 3350, 1520, 244, 1 ],
+    [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, 392109, 109, 92, 51, 995, 506, 202, 1 ],
+    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 917, 415, 152, 2094, 1132, 406, 1 ],
+    [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 99, 130, 48, 903, 620, 183, 1 ],
+    [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
+    [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 187, 122, 1, 1520, 603, 1, 1 ],
+    [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
+    [ "Shiliew", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 132, 142, -300, 1244, 689, -300, 1 ],
+    [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1168, 622, -300, 2500, 1490, -300, 1 ],
+    [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, 4, 3, 50, 392109, 52, 131, 89, 703, 624, 254, 1 ],
+    [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
+    [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, 1066998, 301, 92, 59, 1794, 709, 140, 1 ],
+    [ "Aokiji, of Marineford", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, 3000000, 257, 129, 58, 2206, 1152, 227, 1 ],
+    [ "Garp, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 171, 64, 62, 2094, 1002, 266, 1 ],
+    [ "Sengoku, of Marineford", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 213, 96, 95, 1942, 972, 304, 1 ],
+    [ "Akainu, of Marineford", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 133, 100, 0, 2000, 1381, 0, 1 ],
     [ "Wild Luffy", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, null, 226, 154, 51, null, null, null, null ],
     [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ]
 	];
diff --git a/index.html b/index.html
index e3db8777b..ae058c078 100644
--- a/index.html
+++ b/index.html
@@ -62,10 +62,10 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>27/09/2016</p>
+            <p>3/10/2016</p>
             <br>
             <ul>
-                <li>New Blackbeard and Story Mode Units Added!</li>
+                <li>New Units Updated!</li>
                 <br>
                 <li>Units Updated, Ship Thumbnails updated</li>
                 <li>All units except Tashigi and Combo boosts</li>

From fa53d2b4d47977163590f1d2176aaa31106d7b2b Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 3 Oct 2016 01:12:58 -0500
Subject: [PATCH 0606/1569] missed a few

---
 common/data/aliases.js  | 4 ++--
 common/data/captains.js | 7 +++++--
 common/data/details.js  | 2 +-
 common/data/matchers.js | 2 +-
 common/data/units.js    | 6 +++---
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 17b612f7c..83dd8409f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1273,8 +1273,8 @@ window.aliases = {
     1272: ['“音越”ヴァン・オーガー','',''],
     1273: ['ジーザス・バージェス','',''],
     1274: ['“チャンピオン”ジーザス・バージェス','',''],
-    1275: ['シリュウ','',''],
-    1276: ['雨のシリュウ','',''],
+    1275: ['シリュウ','','Shiliew'],
+    1276: ['雨のシリュウ','','Shiliew'],
     1277: ['ドクＱ','',''],
     1278: ['“死神”ドクＱ','',''],
     1279: ['ジョン・ジャイアント','',''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 08b140d62..523516f1f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3399,7 +3399,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
     },
     1285: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.375, [ "Striker" ]); },
+		hitAtk: function(p) {
+			return !p.unit.class.has("Striker") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.375 : 1.5;
+		},
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
     },
 };
diff --git a/common/data/details.js b/common/data/details.js
index de188184d..4664427c0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6668,7 +6668,7 @@ window.details = {
         specialName: "Wild Luffy Special",
     },
     1285: {//Wild Luffy Evolved
-        captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
+        captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 3.375x instead.",
         special: "Reduces duration of Bind and Silence by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
         specialName: "Wild Luffy Special",
     },
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 79f9c9169..643173846 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -78,7 +78,7 @@ window.matchers = [
     {
         name: 'Positional captains',
         target: 'captain',
-        matcher: /(after scoring|following a chain)/i
+        matcher: /(after scoring|following a chain|perfect|great|good)/i
     },
     
     {
diff --git a/common/data/units.js b/common/data/units.js
index 9c0565700..1c87d5c30 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1273,8 +1273,8 @@ window.units = [
     [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
     [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 187, 122, 1, 1520, 603, 1, 1 ],
     [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
-    [ "Shiliew", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 132, 142, -300, 1244, 689, -300, 1 ],
-    [ "Shiliew Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1168, 622, -300, 2500, 1490, -300, 1 ],
+    [ "Shiryu", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 132, 142, -300, 1244, 689, -300, 1 ],
+    [ "Shiryu Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1168, 622, -300, 2500, 1490, -300, 1 ],
     [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, 4, 3, 50, 392109, 52, 131, 89, 703, 624, 254, 1 ],
     [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
     [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, 1066998, 301, 92, 59, 1794, 709, 140, 1 ],
@@ -1283,7 +1283,7 @@ window.units = [
     [ "Sengoku, of Marineford", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 213, 96, 95, 1942, 972, 304, 1 ],
     [ "Akainu, of Marineford", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 133, 100, 0, 2000, 1381, 0, 1 ],
     [ "Wild Luffy", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, null, 226, 154, 51, null, null, null, null ],
-    [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, null, null, null, null, null, null, null, null, null, null, null, null ]
+    [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 3, 99, null, null, null, null, 2491, 1325, 261, null ]
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 7f17674704be865837286af53ab9ad58aa86e188 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 3 Oct 2016 01:15:46 -0500
Subject: [PATCH 0607/1569] .

.
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 1c87d5c30..23806cdd6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1283,7 +1283,7 @@ window.units = [
     [ "Sengoku, of Marineford", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 213, 96, 95, 1942, 972, 304, 1 ],
     [ "Akainu, of Marineford", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 133, 100, 0, 2000, 1381, 0, 1 ],
     [ "Wild Luffy", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, null, 226, 154, 51, null, null, null, null ],
-    [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 3, 99, null, null, null, null, 2491, 1325, 261, null ]
+    [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 3, 99, null, null, null, null, 2491, 1325, 261, null ] 
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From d768a7e479f87eaaa053f7486b77a3f68d90326f Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 4 Oct 2016 12:51:55 -0500
Subject: [PATCH 0608/1569] Added Turtles

---
 common/css/links.css                          |    11 +-
 common/data/cooldowns.js                      |     4 +-
 common/data/details.js                        |    12 +-
 common/data/units.js                          |     4 +-
 common/views/links.html                       |     7 +
 damage/index.html                             |     2 +-
 index.css                                     |     2 +
 index.html                                    |     6 +-
 turtles/.gitignore                            |     9 +
 turtles/README.md                             |     6 +
 turtles/app/app.js                            |     9 +
 turtles/app/app2.js                           |     1 +
 turtles/app/config/localizeConfig.js          |   101 +
 turtles/app/controllers/barrelCtrl.js         |    82 +
 turtles/app/controllers/contactCtrl.js        |    73 +
 turtles/app/controllers/eventCtrl.js          |   160 +
 turtles/app/controllers/localeCtrl.js         |    31 +
 turtles/app/controllers/modalCtrl.js          |    27 +
 turtles/app/controllers/navbarCtrl.js         |     4 +
 turtles/app/controllers/turtleCtrl.js         |    55 +
 turtles/app/controllers/turtleCtrlBeta.js     |    95 +
 turtles/app/directives/barrelDirective.js     |    49 +
 turtles/app/directives/collapseDirective.js   |    65 +
 turtles/app/directives/eventDirective.js      |   190 +
 turtles/app/directives/turtleBetaDirective.js |    62 +
 turtles/app/directives/turtleDirective.js     |   194 +
 turtles/app/lib/Blob.js                       |   211 +
 turtles/app/lib/FileSaver.js                  |   253 +
 turtles/app/lib/angular-local-storage.min.js  |     7 +
 .../lib/angular-polyglot.language.switcher.js |   161 +
 turtles/app/lib/angular-timer.min.js          |     8 +
 turtles/app/lib/angular-translate.min.js      |     6 +
 .../angular-animate/.bower.json               |    20 +
 .../angular-animate/README.md                 |    68 +
 .../angular-animate/angular-animate.js        |  3708 ++
 .../angular-animate/angular-animate.min.js    |    52 +
 .../angular-animate.min.js.map                |     8 +
 .../angular-animate/bower.json                |     9 +
 .../bower_components/angular-animate/index.js |     2 +
 .../angular-animate/package.json              |    26 +
 .../angular-bootstrap/.bower.json             |    32 +
 .../angular-bootstrap/bower.json              |    19 +
 .../angular-bootstrap/ui-bootstrap-csp.css    |     6 +
 .../angular-bootstrap/ui-bootstrap-tpls.js    |  4840 ++
 .../ui-bootstrap-tpls.min.js                  |    10 +
 .../angular-bootstrap/ui-bootstrap.js         |  4461 ++
 .../angular-bootstrap/ui-bootstrap.min.js     |     9 +
 .../lib/bower_components/angular/.bower.json  |    17 +
 .../lib/bower_components/angular/README.md    |    64 +
 .../bower_components/angular/angular-csp.css  |    21 +
 .../lib/bower_components/angular/angular.js   | 28133 +++++++++++
 .../bower_components/angular/angular.min.js   |   289 +
 .../angular/angular.min.js.gzip               |   Bin 0 -> 51446 bytes
 .../angular/angular.min.js.map                |     8 +
 .../lib/bower_components/angular/bower.json   |     8 +
 .../app/lib/bower_components/angular/index.js |     2 +
 .../lib/bower_components/angular/package.json |    25 +
 .../lib/bower_components/momentjs/.bower.json |    34 +
 .../bower_components/momentjs/CHANGELOG.md    |   441 +
 .../app/lib/bower_components/momentjs/LICENSE |    22 +
 .../lib/bower_components/momentjs/README.md   |    57 +
 .../lib/bower_components/momentjs/bower.json  |    23 +
 .../bower_components/momentjs/locale/af.js    |    72 +
 .../bower_components/momentjs/locale/ar-ma.js |    58 +
 .../bower_components/momentjs/locale/ar-sa.js |   102 +
 .../bower_components/momentjs/locale/ar-tn.js |    56 +
 .../bower_components/momentjs/locale/ar.js    |   135 +
 .../bower_components/momentjs/locale/az.js    |   103 +
 .../bower_components/momentjs/locale/be.js    |   146 +
 .../bower_components/momentjs/locale/bg.js    |    89 +
 .../bower_components/momentjs/locale/bn.js    |   112 +
 .../bower_components/momentjs/locale/bo.js    |   109 +
 .../bower_components/momentjs/locale/br.js    |   106 +
 .../bower_components/momentjs/locale/bs.js    |   140 +
 .../bower_components/momentjs/locale/ca.js    |    78 +
 .../bower_components/momentjs/locale/cs.js    |   156 +
 .../bower_components/momentjs/locale/cv.js    |    62 +
 .../bower_components/momentjs/locale/cy.js    |    78 +
 .../bower_components/momentjs/locale/da.js    |    59 +
 .../bower_components/momentjs/locale/de-at.js |    75 +
 .../bower_components/momentjs/locale/de.js    |    74 +
 .../bower_components/momentjs/locale/el.js    |    93 +
 .../bower_components/momentjs/locale/en-au.js |    65 +
 .../bower_components/momentjs/locale/en-ca.js |    62 +
 .../bower_components/momentjs/locale/en-gb.js |    66 +
 .../bower_components/momentjs/locale/eo.js    |    72 +
 .../bower_components/momentjs/locale/es.js    |    78 +
 .../bower_components/momentjs/locale/et.js    |    79 +
 .../bower_components/momentjs/locale/eu.js    |    63 +
 .../bower_components/momentjs/locale/fa.js    |   104 +
 .../bower_components/momentjs/locale/fi.js    |   106 +
 .../bower_components/momentjs/locale/fo.js    |    59 +
 .../bower_components/momentjs/locale/fr-ca.js |    57 +
 .../bower_components/momentjs/locale/fr.js    |    61 +
 .../bower_components/momentjs/locale/fy.js    |    70 +
 .../bower_components/momentjs/locale/gl.js    |    74 +
 .../bower_components/momentjs/locale/he.js    |    81 +
 .../bower_components/momentjs/locale/hi.js    |   122 +
 .../bower_components/momentjs/locale/hr.js    |   139 +
 .../bower_components/momentjs/locale/hu.js    |   108 +
 .../bower_components/momentjs/locale/hy-am.js |   110 +
 .../bower_components/momentjs/locale/id.js    |    82 +
 .../bower_components/momentjs/locale/is.js    |   126 +
 .../bower_components/momentjs/locale/it.js    |    69 +
 .../bower_components/momentjs/locale/ja.js    |    64 +
 .../bower_components/momentjs/locale/jv.js    |    82 +
 .../bower_components/momentjs/locale/ka.js    |   102 +
 .../bower_components/momentjs/locale/km.js    |    57 +
 .../bower_components/momentjs/locale/ko.js    |    67 +
 .../bower_components/momentjs/locale/lb.js    |   133 +
 .../bower_components/momentjs/locale/lt.js    |   114 +
 .../bower_components/momentjs/locale/lv.js    |    95 +
 .../bower_components/momentjs/locale/me.js    |   108 +
 .../bower_components/momentjs/locale/mk.js    |    89 +
 .../bower_components/momentjs/locale/ml.js    |    70 +
 .../bower_components/momentjs/locale/mr.js    |   120 +
 .../bower_components/momentjs/locale/ms-my.js |    81 +
 .../bower_components/momentjs/locale/my.js    |    92 +
 .../bower_components/momentjs/locale/nb.js    |    60 +
 .../bower_components/momentjs/locale/ne.js    |   122 +
 .../bower_components/momentjs/locale/nl.js    |    70 +
 .../bower_components/momentjs/locale/nn.js    |    59 +
 .../bower_components/momentjs/locale/pl.js    |   104 +
 .../bower_components/momentjs/locale/pt-br.js |    59 +
 .../bower_components/momentjs/locale/pt.js    |    63 +
 .../bower_components/momentjs/locale/ro.js    |    73 +
 .../bower_components/momentjs/locale/ru.js    |   163 +
 .../bower_components/momentjs/locale/si.js    |    64 +
 .../bower_components/momentjs/locale/sk.js    |   157 +
 .../bower_components/momentjs/locale/sl.js    |   159 +
 .../bower_components/momentjs/locale/sq.js    |    68 +
 .../momentjs/locale/sr-cyrl.js                |   107 +
 .../bower_components/momentjs/locale/sr.js    |   107 +
 .../bower_components/momentjs/locale/sv.js    |    66 +
 .../bower_components/momentjs/locale/ta.js    |    94 +
 .../bower_components/momentjs/locale/th.js    |    64 +
 .../bower_components/momentjs/locale/tl-ph.js |    61 +
 .../bower_components/momentjs/locale/tr.js    |    89 +
 .../momentjs/locale/tzm-latn.js               |    57 +
 .../bower_components/momentjs/locale/tzm.js   |    57 +
 .../bower_components/momentjs/locale/uk.js    |   152 +
 .../bower_components/momentjs/locale/uz.js    |    57 +
 .../bower_components/momentjs/locale/vi.js    |    65 +
 .../bower_components/momentjs/locale/zh-cn.js |   126 +
 .../bower_components/momentjs/locale/zh-tw.js |   100 +
 .../bower_components/momentjs/min/locales.js  |  6632 +++
 .../momentjs/min/locales.min.js               |    77 +
 .../momentjs/min/moment-with-locales.js       |  9737 ++++
 .../momentjs/min/moment-with-locales.min.js   |    81 +
 .../momentjs/min/moment.min.js                |     7 +
 .../bower_components/momentjs/min/tests.js    | 39537 ++++++++++++++++
 .../lib/bower_components/momentjs/moment.js   |  3111 ++
 .../momentjs/src/lib/create/check-overflow.js |    28 +
 .../src/lib/create/date-from-array.js         |    19 +
 .../momentjs/src/lib/create/from-anything.js  |    93 +
 .../momentjs/src/lib/create/from-array.js     |   124 +
 .../momentjs/src/lib/create/from-object.js    |    13 +
 .../src/lib/create/from-string-and-array.js   |    50 +
 .../src/lib/create/from-string-and-format.js  |   102 +
 .../momentjs/src/lib/create/from-string.js    |    83 +
 .../momentjs/src/lib/create/local.js          |     5 +
 .../momentjs/src/lib/create/parsing-flags.js  |    22 +
 .../momentjs/src/lib/create/utc.js            |     5 +
 .../momentjs/src/lib/create/valid.js          |    36 +
 .../momentjs/src/lib/duration/abs.js          |    18 +
 .../momentjs/src/lib/duration/add-subtract.js |    21 +
 .../momentjs/src/lib/duration/as.js           |    55 +
 .../momentjs/src/lib/duration/bubble.js       |    54 +
 .../momentjs/src/lib/duration/constructor.js  |    41 +
 .../momentjs/src/lib/duration/create.js       |   113 +
 .../momentjs/src/lib/duration/duration.js     |    12 +
 .../momentjs/src/lib/duration/get.js          |    25 +
 .../momentjs/src/lib/duration/humanize.js     |    64 +
 .../momentjs/src/lib/duration/iso-string.js   |    28 +
 .../momentjs/src/lib/duration/prototype.js    |    48 +
 .../momentjs/src/lib/format/format.js         |    95 +
 .../momentjs/src/lib/locale/calendar.js       |    13 +
 .../momentjs/src/lib/locale/constructor.js    |     2 +
 .../momentjs/src/lib/locale/en.js             |    15 +
 .../momentjs/src/lib/locale/formats.js        |    19 +
 .../momentjs/src/lib/locale/invalid.js        |     5 +
 .../momentjs/src/lib/locale/lists.js          |    48 +
 .../momentjs/src/lib/locale/locale.js         |    35 +
 .../momentjs/src/lib/locale/locales.js        |   119 +
 .../momentjs/src/lib/locale/ordinal.js        |     7 +
 .../src/lib/locale/pre-post-format.js         |     3 +
 .../momentjs/src/lib/locale/prototype.js      |    70 +
 .../momentjs/src/lib/locale/relative.js       |    27 +
 .../momentjs/src/lib/locale/set.js            |    14 +
 .../momentjs/src/lib/moment/add-subtract.js   |    46 +
 .../momentjs/src/lib/moment/calendar.js       |    17 +
 .../momentjs/src/lib/moment/clone.js          |     5 +
 .../momentjs/src/lib/moment/compare.js        |    43 +
 .../momentjs/src/lib/moment/constructor.js    |    73 +
 .../momentjs/src/lib/moment/diff.js           |    49 +
 .../momentjs/src/lib/moment/format.js         |    27 +
 .../momentjs/src/lib/moment/from.js           |    13 +
 .../momentjs/src/lib/moment/get-set.js        |    39 +
 .../momentjs/src/lib/moment/locale.js         |    34 +
 .../momentjs/src/lib/moment/min-max.js        |    54 +
 .../momentjs/src/lib/moment/moment.js         |    26 +
 .../momentjs/src/lib/moment/prototype.js      |   144 +
 .../momentjs/src/lib/moment/start-end-of.js   |    52 +
 .../momentjs/src/lib/moment/to-type.js        |    16 +
 .../momentjs/src/lib/moment/to.js             |    13 +
 .../momentjs/src/lib/moment/valid.js          |    15 +
 .../momentjs/src/lib/parse/regex.js           |    44 +
 .../momentjs/src/lib/parse/token.js           |    32 +
 .../momentjs/src/lib/units/aliases.js         |    29 +
 .../momentjs/src/lib/units/constants.js       |     7 +
 .../momentjs/src/lib/units/day-of-month.js    |    32 +
 .../momentjs/src/lib/units/day-of-week.js     |   134 +
 .../momentjs/src/lib/units/day-of-year.js     |    49 +
 .../momentjs/src/lib/units/hour.js            |    77 +
 .../momentjs/src/lib/units/millisecond.js     |    42 +
 .../momentjs/src/lib/units/minute.js          |    24 +
 .../momentjs/src/lib/units/month.js           |   129 +
 .../momentjs/src/lib/units/offset.js          |   206 +
 .../momentjs/src/lib/units/quarter.js         |    27 +
 .../momentjs/src/lib/units/second.js          |    24 +
 .../momentjs/src/lib/units/timestamp.js       |    20 +
 .../momentjs/src/lib/units/timezone.js        |    16 +
 .../momentjs/src/lib/units/units.js           |    20 +
 .../momentjs/src/lib/units/week-year.js       |    78 +
 .../momentjs/src/lib/units/week.js            |    88 +
 .../momentjs/src/lib/units/year.js            |    60 +
 .../momentjs/src/lib/utils/abs-floor.js       |     7 +
 .../momentjs/src/lib/utils/compare-arrays.js  |    16 +
 .../momentjs/src/lib/utils/defaults.js        |    10 +
 .../momentjs/src/lib/utils/deprecate.js       |    33 +
 .../momentjs/src/lib/utils/extend.js          |    19 +
 .../momentjs/src/lib/utils/has-own-prop.js    |     3 +
 .../momentjs/src/lib/utils/hooks.js           |    13 +
 .../momentjs/src/lib/utils/is-array.js        |     3 +
 .../momentjs/src/lib/utils/is-date.js         |     3 +
 .../momentjs/src/lib/utils/map.js             |     7 +
 .../momentjs/src/lib/utils/to-int.js          |    14 +
 .../momentjs/src/lib/utils/zero-fill.js       |     9 +
 .../momentjs/src/locale/af.js                 |    63 +
 .../momentjs/src/locale/ar-ma.js              |    50 +
 .../momentjs/src/locale/ar-sa.js              |    94 +
 .../momentjs/src/locale/ar-tn.js              |    48 +
 .../momentjs/src/locale/ar.js                 |   127 +
 .../momentjs/src/locale/az.js                 |    95 +
 .../momentjs/src/locale/be.js                 |   138 +
 .../momentjs/src/locale/bg.js                 |    81 +
 .../momentjs/src/locale/bn.js                 |   104 +
 .../momentjs/src/locale/bo.js                 |   101 +
 .../momentjs/src/locale/br.js                 |    98 +
 .../momentjs/src/locale/bs.js                 |   132 +
 .../momentjs/src/locale/ca.js                 |    70 +
 .../momentjs/src/locale/cs.js                 |   148 +
 .../momentjs/src/locale/cv.js                 |    53 +
 .../momentjs/src/locale/cy.js                 |    70 +
 .../momentjs/src/locale/da.js                 |    51 +
 .../momentjs/src/locale/de-at.js              |    67 +
 .../momentjs/src/locale/de.js                 |    66 +
 .../momentjs/src/locale/el.js                 |    85 +
 .../momentjs/src/locale/en-au.js              |    57 +
 .../momentjs/src/locale/en-ca.js              |    54 +
 .../momentjs/src/locale/en-gb.js              |    58 +
 .../momentjs/src/locale/eo.js                 |    64 +
 .../momentjs/src/locale/es.js                 |    70 +
 .../momentjs/src/locale/et.js                 |    71 +
 .../momentjs/src/locale/eu.js                 |    55 +
 .../momentjs/src/locale/fa.js                 |    96 +
 .../momentjs/src/locale/fi.js                 |    98 +
 .../momentjs/src/locale/fo.js                 |    51 +
 .../momentjs/src/locale/fr-ca.js              |    49 +
 .../momentjs/src/locale/fr.js                 |    53 +
 .../momentjs/src/locale/fy.js                 |    62 +
 .../momentjs/src/locale/gl.js                 |    66 +
 .../momentjs/src/locale/he.js                 |    73 +
 .../momentjs/src/locale/hi.js                 |   114 +
 .../momentjs/src/locale/hr.js                 |   131 +
 .../momentjs/src/locale/hu.js                 |   100 +
 .../momentjs/src/locale/hy-am.js              |   102 +
 .../momentjs/src/locale/id.js                 |    74 +
 .../momentjs/src/locale/is.js                 |   118 +
 .../momentjs/src/locale/it.js                 |    61 +
 .../momentjs/src/locale/ja.js                 |    56 +
 .../momentjs/src/locale/jv.js                 |    73 +
 .../momentjs/src/locale/ka.js                 |    94 +
 .../momentjs/src/locale/km.js                 |    49 +
 .../momentjs/src/locale/ko.js                 |    59 +
 .../momentjs/src/locale/lb.js                 |   125 +
 .../momentjs/src/locale/lt.js                 |   106 +
 .../momentjs/src/locale/lv.js                 |    87 +
 .../momentjs/src/locale/me.js                 |    99 +
 .../momentjs/src/locale/mk.js                 |    81 +
 .../momentjs/src/locale/ml.js                 |    62 +
 .../momentjs/src/locale/mr.js                 |   112 +
 .../momentjs/src/locale/ms-my.js              |    73 +
 .../momentjs/src/locale/my.js                 |    84 +
 .../momentjs/src/locale/nb.js                 |    52 +
 .../momentjs/src/locale/ne.js                 |   114 +
 .../momentjs/src/locale/nl.js                 |    62 +
 .../momentjs/src/locale/nn.js                 |    51 +
 .../momentjs/src/locale/pl.js                 |    95 +
 .../momentjs/src/locale/pt-br.js              |    51 +
 .../momentjs/src/locale/pt.js                 |    55 +
 .../momentjs/src/locale/ro.js                 |    65 +
 .../momentjs/src/locale/ru.js                 |   155 +
 .../momentjs/src/locale/si.js                 |    56 +
 .../momentjs/src/locale/sk.js                 |   149 +
 .../momentjs/src/locale/sl.js                 |   150 +
 .../momentjs/src/locale/sq.js                 |    60 +
 .../momentjs/src/locale/sr-cyrl.js            |    99 +
 .../momentjs/src/locale/sr.js                 |    99 +
 .../momentjs/src/locale/sv.js                 |    58 +
 .../momentjs/src/locale/ta.js                 |    86 +
 .../momentjs/src/locale/th.js                 |    56 +
 .../momentjs/src/locale/tl-ph.js              |    53 +
 .../momentjs/src/locale/tr.js                 |    81 +
 .../momentjs/src/locale/tzm-latn.js           |    49 +
 .../momentjs/src/locale/tzm.js                |    49 +
 .../momentjs/src/locale/uk.js                 |   144 +
 .../momentjs/src/locale/uz.js                 |    49 +
 .../momentjs/src/locale/vi.js                 |    57 +
 .../momentjs/src/locale/zh-cn.js              |   118 +
 .../momentjs/src/locale/zh-tw.js              |    91 +
 .../bower_components/momentjs/src/moment.js   |    68 +
 .../momentjs/templates/amd-named.js           |     7 +
 .../momentjs/templates/amd.js                 |     7 +
 .../momentjs/templates/globals.js             |     5 +
 .../momentjs/templates/locale-header.js       |     5 +
 .../momentjs/templates/test-header.js         |     5 +
 turtles/app/lib/humanize-duration.js          |   329 +
 turtles/app/lib/ics.js                        |   128 +
 turtles/app/lib/moment.min.js                 |     7 +
 turtles/app/lib/momentjs/locale/de.js         |    74 +
 turtles/app/lib/momentjs/locale/es.js         |    78 +
 turtles/app/lib/momentjs/locale/it.js         |    69 +
 turtles/app/lib/ng-table.min.js               |     4 +
 turtles/app/lib/promise-tracker.js            |   134 +
 .../app/lib/ui-bootstrap-tpls-0.13.0.min.js   |    10 +
 turtles/app/services/turtleFact.js            |   253 +
 turtles/barrel.html                           |    90 +
 .../angular-bootstrap/.bower.json             |    32 +
 .../angular-bootstrap/.gitignore              |     1 +
 .../angular-bootstrap/.npmignore              |     1 +
 .../angular-bootstrap/README.md               |   120 +
 .../angular-bootstrap/bower.json              |    19 +
 .../angular-bootstrap/index.js                |     2 +
 .../angular-bootstrap/package.json            |    23 +
 .../angular-bootstrap/ui-bootstrap-csp.css    |    29 +
 .../angular-bootstrap/ui-bootstrap-tpls.js    |  6870 +++
 .../ui-bootstrap-tpls.min.js                  |    10 +
 .../angular-bootstrap/ui-bootstrap.js         |  6449 +++
 .../angular-bootstrap/ui-bootstrap.min.js     |     9 +
 turtles/bower_components/angular/.bower.json  |    17 +
 turtles/bower_components/angular/README.md    |    64 +
 .../bower_components/angular/angular-csp.css  |    21 +
 turtles/bower_components/angular/angular.js   | 29657 ++++++++++++
 .../bower_components/angular/angular.min.js   |   298 +
 .../angular/angular.min.js.gzip               |   Bin 0 -> 54311 bytes
 .../angular/angular.min.js.map                |     8 +
 turtles/bower_components/angular/bower.json   |     8 +
 turtles/bower_components/angular/index.js     |     2 +
 turtles/bower_components/angular/package.json |    25 +
 turtles/contact.html                          |    78 +
 turtles/contact_layout.html                   |    82 +
 turtles/css/angular-dropdowns.css             |   228 +
 turtles/css/bootstrap.css                     |  6584 +++
 turtles/css/contact.css                       |     3 +
 turtles/css/font-awesome.min.css              |     4 +
 turtles/css/main.css                          |   135 +
 turtles/css/main.scss                         |   201 +
 turtles/css/normalize.css                     |   427 +
 turtles/css/polyglot-language-switcher-2.css  |   131 +
 turtles/event-jpn.html                        |    99 +
 turtles/event.html                            |   115 +
 turtles/favicon.ico                           |   Bin 0 -> 4286 bytes
 turtles/images/demo/angularjs.png             |   Bin 0 -> 6554 bytes
 turtles/images/demo/jquery.png                |   Bin 0 -> 5440 bytes
 turtles/images/demo/reactjs.png               |   Bin 0 -> 4368 bytes
 turtles/images/flags/be.png                   |   Bin 0 -> 449 bytes
 turtles/images/flags/bg.png                   |   Bin 0 -> 462 bytes
 turtles/images/flags/br.png                   |   Bin 0 -> 593 bytes
 turtles/images/flags/ca.png                   |   Bin 0 -> 628 bytes
 turtles/images/flags/catalonia.png            |   Bin 0 -> 398 bytes
 turtles/images/flags/cn.png                   |   Bin 0 -> 472 bytes
 turtles/images/flags/cz.png                   |   Bin 0 -> 476 bytes
 turtles/images/flags/de.png                   |   Bin 0 -> 545 bytes
 turtles/images/flags/dk.png                   |   Bin 0 -> 495 bytes
 turtles/images/flags/ee.png                   |   Bin 0 -> 429 bytes
 turtles/images/flags/es.png                   |   Bin 0 -> 469 bytes
 turtles/images/flags/fi.png                   |   Bin 0 -> 489 bytes
 turtles/images/flags/fr.png                   |   Bin 0 -> 545 bytes
 turtles/images/flags/gb.png                   |   Bin 0 -> 599 bytes
 turtles/images/flags/gr.png                   |   Bin 0 -> 487 bytes
 turtles/images/flags/hk.png                   |   Bin 0 -> 527 bytes
 turtles/images/flags/hr.png                   |   Bin 0 -> 524 bytes
 turtles/images/flags/hu.png                   |   Bin 0 -> 432 bytes
 turtles/images/flags/in.png                   |   Bin 0 -> 503 bytes
 turtles/images/flags/is.png                   |   Bin 0 -> 532 bytes
 turtles/images/flags/it.png                   |   Bin 0 -> 420 bytes
 turtles/images/flags/jp.png                   |   Bin 0 -> 420 bytes
 turtles/images/flags/kr.png                   |   Bin 0 -> 592 bytes
 turtles/images/flags/lt.png                   |   Bin 0 -> 508 bytes
 turtles/images/flags/lv.png                   |   Bin 0 -> 465 bytes
 turtles/images/flags/nl.png                   |   Bin 0 -> 453 bytes
 turtles/images/flags/no.png                   |   Bin 0 -> 512 bytes
 turtles/images/flags/pg.png                   |   Bin 0 -> 593 bytes
 turtles/images/flags/pl.png                   |   Bin 0 -> 374 bytes
 turtles/images/flags/ro.png                   |   Bin 0 -> 495 bytes
 turtles/images/flags/ru.png                   |   Bin 0 -> 420 bytes
 turtles/images/flags/se.png                   |   Bin 0 -> 542 bytes
 turtles/images/flags/si.png                   |   Bin 0 -> 510 bytes
 turtles/images/flags/sk.png                   |   Bin 0 -> 562 bytes
 turtles/images/flags/tr.png                   |   Bin 0 -> 492 bytes
 turtles/images/flags/tw.png                   |   Bin 0 -> 465 bytes
 turtles/images/flags/ua.png                   |   Bin 0 -> 446 bytes
 turtles/images/flags/us.png                   |   Bin 0 -> 609 bytes
 turtles/index.html                            |   145 +
 turtles/redirectModal.html                    |    10 +
 turtles/settings.html                         |    81 +
 turtles/sounds/notification.mp3               |   Bin 0 -> 111176 bytes
 418 files changed, 174456 insertions(+), 15 deletions(-)
 create mode 100644 turtles/.gitignore
 create mode 100644 turtles/README.md
 create mode 100644 turtles/app/app.js
 create mode 100644 turtles/app/app2.js
 create mode 100644 turtles/app/config/localizeConfig.js
 create mode 100644 turtles/app/controllers/barrelCtrl.js
 create mode 100644 turtles/app/controllers/contactCtrl.js
 create mode 100644 turtles/app/controllers/eventCtrl.js
 create mode 100644 turtles/app/controllers/localeCtrl.js
 create mode 100644 turtles/app/controllers/modalCtrl.js
 create mode 100644 turtles/app/controllers/navbarCtrl.js
 create mode 100644 turtles/app/controllers/turtleCtrl.js
 create mode 100644 turtles/app/controllers/turtleCtrlBeta.js
 create mode 100644 turtles/app/directives/barrelDirective.js
 create mode 100644 turtles/app/directives/collapseDirective.js
 create mode 100644 turtles/app/directives/eventDirective.js
 create mode 100644 turtles/app/directives/turtleBetaDirective.js
 create mode 100644 turtles/app/directives/turtleDirective.js
 create mode 100644 turtles/app/lib/Blob.js
 create mode 100644 turtles/app/lib/FileSaver.js
 create mode 100644 turtles/app/lib/angular-local-storage.min.js
 create mode 100644 turtles/app/lib/angular-polyglot.language.switcher.js
 create mode 100644 turtles/app/lib/angular-timer.min.js
 create mode 100644 turtles/app/lib/angular-translate.min.js
 create mode 100644 turtles/app/lib/bower_components/angular-animate/.bower.json
 create mode 100644 turtles/app/lib/bower_components/angular-animate/README.md
 create mode 100644 turtles/app/lib/bower_components/angular-animate/angular-animate.js
 create mode 100644 turtles/app/lib/bower_components/angular-animate/angular-animate.min.js
 create mode 100644 turtles/app/lib/bower_components/angular-animate/angular-animate.min.js.map
 create mode 100644 turtles/app/lib/bower_components/angular-animate/bower.json
 create mode 100644 turtles/app/lib/bower_components/angular-animate/index.js
 create mode 100644 turtles/app/lib/bower_components/angular-animate/package.json
 create mode 100644 turtles/app/lib/bower_components/angular-bootstrap/.bower.json
 create mode 100644 turtles/app/lib/bower_components/angular-bootstrap/bower.json
 create mode 100644 turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-csp.css
 create mode 100644 turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.js
 create mode 100644 turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
 create mode 100644 turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.js
 create mode 100644 turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.min.js
 create mode 100644 turtles/app/lib/bower_components/angular/.bower.json
 create mode 100644 turtles/app/lib/bower_components/angular/README.md
 create mode 100644 turtles/app/lib/bower_components/angular/angular-csp.css
 create mode 100644 turtles/app/lib/bower_components/angular/angular.js
 create mode 100644 turtles/app/lib/bower_components/angular/angular.min.js
 create mode 100644 turtles/app/lib/bower_components/angular/angular.min.js.gzip
 create mode 100644 turtles/app/lib/bower_components/angular/angular.min.js.map
 create mode 100644 turtles/app/lib/bower_components/angular/bower.json
 create mode 100644 turtles/app/lib/bower_components/angular/index.js
 create mode 100644 turtles/app/lib/bower_components/angular/package.json
 create mode 100644 turtles/app/lib/bower_components/momentjs/.bower.json
 create mode 100644 turtles/app/lib/bower_components/momentjs/CHANGELOG.md
 create mode 100644 turtles/app/lib/bower_components/momentjs/LICENSE
 create mode 100644 turtles/app/lib/bower_components/momentjs/README.md
 create mode 100644 turtles/app/lib/bower_components/momentjs/bower.json
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/af.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ar-ma.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ar-sa.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ar-tn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ar.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/az.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/be.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/bg.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/bn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/bo.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/br.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/bs.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ca.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/cs.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/cv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/cy.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/da.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/de-at.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/de.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/el.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/en-au.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/en-ca.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/en-gb.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/eo.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/es.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/et.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/eu.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/fa.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/fi.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/fo.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/fr-ca.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/fr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/fy.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/gl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/he.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/hi.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/hr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/hu.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/hy-am.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/id.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/is.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/it.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ja.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/jv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ka.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/km.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ko.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/lb.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/lt.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/lv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/me.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/mk.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ml.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/mr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ms-my.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/my.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/nb.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ne.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/nl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/nn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/pl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/pt-br.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/pt.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ro.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ru.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/si.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/sk.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/sl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/sq.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/sr-cyrl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/sr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/sv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/ta.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/th.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/tl-ph.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/tr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/tzm-latn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/tzm.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/uk.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/uz.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/vi.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/zh-cn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/locale/zh-tw.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/min/locales.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/min/locales.min.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/min/moment-with-locales.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/min/moment-with-locales.min.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/min/moment.min.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/min/tests.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/moment.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/check-overflow.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/date-from-array.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/from-anything.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/from-array.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/from-object.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-array.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-format.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/from-string.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/local.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/parsing-flags.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/utc.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/create/valid.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/abs.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/add-subtract.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/as.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/bubble.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/constructor.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/create.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/duration.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/get.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/humanize.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/iso-string.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/duration/prototype.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/format/format.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/calendar.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/constructor.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/en.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/formats.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/invalid.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/lists.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/locale.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/locales.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/ordinal.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/pre-post-format.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/prototype.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/relative.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/locale/set.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/add-subtract.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/calendar.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/clone.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/compare.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/constructor.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/diff.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/format.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/from.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/get-set.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/locale.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/min-max.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/moment.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/prototype.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/start-end-of.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/to-type.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/to.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/moment/valid.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/parse/regex.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/parse/token.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/aliases.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/constants.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-month.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-week.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-year.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/hour.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/millisecond.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/minute.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/month.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/offset.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/quarter.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/second.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/timestamp.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/timezone.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/units.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/week-year.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/week.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/units/year.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/abs-floor.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/compare-arrays.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/defaults.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/deprecate.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/extend.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/has-own-prop.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/hooks.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/is-array.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/is-date.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/map.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/to-int.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/lib/utils/zero-fill.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/af.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ar-ma.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ar-sa.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ar-tn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ar.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/az.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/be.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/bg.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/bn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/bo.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/br.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/bs.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ca.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/cs.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/cv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/cy.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/da.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/de-at.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/de.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/el.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/en-au.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/en-ca.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/en-gb.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/eo.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/es.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/et.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/eu.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/fa.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/fi.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/fo.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/fr-ca.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/fr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/fy.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/gl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/he.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/hi.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/hr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/hu.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/hy-am.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/id.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/is.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/it.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ja.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/jv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ka.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/km.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ko.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/lb.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/lt.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/lv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/me.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/mk.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ml.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/mr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ms-my.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/my.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/nb.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ne.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/nl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/nn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/pl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/pt-br.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/pt.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ro.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ru.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/si.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/sk.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/sl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/sq.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/sr-cyrl.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/sr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/sv.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/ta.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/th.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/tl-ph.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/tr.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/tzm-latn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/tzm.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/uk.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/uz.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/vi.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/zh-cn.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/locale/zh-tw.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/src/moment.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/templates/amd-named.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/templates/amd.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/templates/globals.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/templates/locale-header.js
 create mode 100644 turtles/app/lib/bower_components/momentjs/templates/test-header.js
 create mode 100644 turtles/app/lib/humanize-duration.js
 create mode 100644 turtles/app/lib/ics.js
 create mode 100644 turtles/app/lib/moment.min.js
 create mode 100644 turtles/app/lib/momentjs/locale/de.js
 create mode 100644 turtles/app/lib/momentjs/locale/es.js
 create mode 100644 turtles/app/lib/momentjs/locale/it.js
 create mode 100644 turtles/app/lib/ng-table.min.js
 create mode 100644 turtles/app/lib/promise-tracker.js
 create mode 100644 turtles/app/lib/ui-bootstrap-tpls-0.13.0.min.js
 create mode 100644 turtles/app/services/turtleFact.js
 create mode 100644 turtles/barrel.html
 create mode 100644 turtles/bower_components/angular-bootstrap/.bower.json
 create mode 100644 turtles/bower_components/angular-bootstrap/.gitignore
 create mode 100644 turtles/bower_components/angular-bootstrap/.npmignore
 create mode 100644 turtles/bower_components/angular-bootstrap/README.md
 create mode 100644 turtles/bower_components/angular-bootstrap/bower.json
 create mode 100644 turtles/bower_components/angular-bootstrap/index.js
 create mode 100644 turtles/bower_components/angular-bootstrap/package.json
 create mode 100644 turtles/bower_components/angular-bootstrap/ui-bootstrap-csp.css
 create mode 100644 turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.js
 create mode 100644 turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
 create mode 100644 turtles/bower_components/angular-bootstrap/ui-bootstrap.js
 create mode 100644 turtles/bower_components/angular-bootstrap/ui-bootstrap.min.js
 create mode 100644 turtles/bower_components/angular/.bower.json
 create mode 100644 turtles/bower_components/angular/README.md
 create mode 100644 turtles/bower_components/angular/angular-csp.css
 create mode 100644 turtles/bower_components/angular/angular.js
 create mode 100644 turtles/bower_components/angular/angular.min.js
 create mode 100644 turtles/bower_components/angular/angular.min.js.gzip
 create mode 100644 turtles/bower_components/angular/angular.min.js.map
 create mode 100644 turtles/bower_components/angular/bower.json
 create mode 100644 turtles/bower_components/angular/index.js
 create mode 100644 turtles/bower_components/angular/package.json
 create mode 100644 turtles/contact.html
 create mode 100644 turtles/contact_layout.html
 create mode 100644 turtles/css/angular-dropdowns.css
 create mode 100644 turtles/css/bootstrap.css
 create mode 100644 turtles/css/contact.css
 create mode 100644 turtles/css/font-awesome.min.css
 create mode 100644 turtles/css/main.css
 create mode 100644 turtles/css/main.scss
 create mode 100644 turtles/css/normalize.css
 create mode 100644 turtles/css/polyglot-language-switcher-2.css
 create mode 100644 turtles/event-jpn.html
 create mode 100644 turtles/event.html
 create mode 100644 turtles/favicon.ico
 create mode 100644 turtles/images/demo/angularjs.png
 create mode 100644 turtles/images/demo/jquery.png
 create mode 100644 turtles/images/demo/reactjs.png
 create mode 100644 turtles/images/flags/be.png
 create mode 100644 turtles/images/flags/bg.png
 create mode 100644 turtles/images/flags/br.png
 create mode 100644 turtles/images/flags/ca.png
 create mode 100644 turtles/images/flags/catalonia.png
 create mode 100644 turtles/images/flags/cn.png
 create mode 100644 turtles/images/flags/cz.png
 create mode 100644 turtles/images/flags/de.png
 create mode 100644 turtles/images/flags/dk.png
 create mode 100644 turtles/images/flags/ee.png
 create mode 100644 turtles/images/flags/es.png
 create mode 100644 turtles/images/flags/fi.png
 create mode 100644 turtles/images/flags/fr.png
 create mode 100644 turtles/images/flags/gb.png
 create mode 100644 turtles/images/flags/gr.png
 create mode 100644 turtles/images/flags/hk.png
 create mode 100644 turtles/images/flags/hr.png
 create mode 100644 turtles/images/flags/hu.png
 create mode 100644 turtles/images/flags/in.png
 create mode 100644 turtles/images/flags/is.png
 create mode 100644 turtles/images/flags/it.png
 create mode 100644 turtles/images/flags/jp.png
 create mode 100644 turtles/images/flags/kr.png
 create mode 100644 turtles/images/flags/lt.png
 create mode 100644 turtles/images/flags/lv.png
 create mode 100644 turtles/images/flags/nl.png
 create mode 100644 turtles/images/flags/no.png
 create mode 100644 turtles/images/flags/pg.png
 create mode 100644 turtles/images/flags/pl.png
 create mode 100644 turtles/images/flags/ro.png
 create mode 100644 turtles/images/flags/ru.png
 create mode 100644 turtles/images/flags/se.png
 create mode 100644 turtles/images/flags/si.png
 create mode 100644 turtles/images/flags/sk.png
 create mode 100644 turtles/images/flags/tr.png
 create mode 100644 turtles/images/flags/tw.png
 create mode 100644 turtles/images/flags/ua.png
 create mode 100644 turtles/images/flags/us.png
 create mode 100644 turtles/index.html
 create mode 100644 turtles/redirectModal.html
 create mode 100644 turtles/settings.html
 create mode 100644 turtles/sounds/notification.mp3

diff --git a/common/css/links.css b/common/css/links.css
index 341e4dfa8..cb81abe0f 100644
--- a/common/css/links.css
+++ b/common/css/links.css
@@ -6,8 +6,8 @@
 
 #links-button {
     position: fixed;
-    right: 20px;
-    bottom: 5px;
+    bottom: 20px;
+    right: 5px;
     transform: translateX(-50%) translateY(-50%);
     width: 2em;
     height: 2em;
@@ -179,6 +179,12 @@
     transform: translateX(-21em);
 }
 
+#links-button.active .rotater:nth-child(8) > a {
+    -webkit-transform: translateX(-24em);
+    -ms-transform: translateX(-24em);
+    transform: translateX(-24em);
+}
+
 #link-damage > .btn { background: #85C1F5; }
 #link-characters > .btn { background: #7FCA9F; }
 #link-drops > .btn { background: #F4BA70; }
@@ -187,6 +193,7 @@
 #link-slots > .btn { background: #99cc66; }
 #links-home > .btn { background: #939393; }
 #link-prob > .btn { background: #DEA5A4; }
+#link-turtles > .btn { background: #ce4500; }
 
 .tip { color: black; }
 
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8cd9ea602..50f93fc40 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -940,8 +940,8 @@ window.cooldowns = [
     [ 24, 17 ],
     [ 21, 15 ],
     [ 21, 15 ],
-    15,
-	15,
+    [ 15, 8 ],
+	[ 15, 8 ],
     [ 13, 13 ],
 	[ 13, 13 ],
 	[ 20, 12 ],
diff --git a/common/data/details.js b/common/data/details.js
index 4664427c0..3e5886744 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6481,15 +6481,15 @@ window.details = {
         special: [
 			{
 				"description": "Cuts the current HP of each enemy by 10%",
-				"cooldown": [ 23, 12 ],
+				"cooldown": [ 23, 11 ],
 			},
 			{
 				"description": "Cuts the current HP of each enemy by 20%",
-				"cooldown": [ 28, 17 ],
+				"cooldown": [ 28, 16 ],
 			},
             {
 				"description": "Cuts the current HP of each enemy by 40%",
-				"cooldown": [ 36, 25 ],
+				"cooldown": [ 36, 24 ],
 			},
 		], 
         specialName: "Earth Shattering Fist",
@@ -6499,15 +6499,15 @@ window.details = {
         special: [
 			{
 				"description": "Cuts the current HP of each enemy by 10%",
-				"cooldown": [ 23, 12 ],
+				"cooldown": [ 23, 11 ],
 			},
 			{
 				"description": "Cuts the current HP of each enemy by 20%",
-				"cooldown": [ 28, 17 ],
+				"cooldown": [ 28, 16 ],
 			},
             {
 				"description": "Cuts the current HP of each enemy by 40%",
-				"cooldown": [ 36, 25 ],
+				"cooldown": [ 36, 24 ],
 			},
 		],
         specialName: "Earth Shattering Fist",
diff --git a/common/data/units.js b/common/data/units.js
index 23806cdd6..0e165ffd3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1247,7 +1247,7 @@ window.units = [
     [ "Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
     [ "Ace, Marineford Flight Evolved", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
     [ "Fluttering in Neck the Autumn Breeze, Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
-    [ "Tipsy Kimono, Marco", "DEX", [ "Fighter", "Powerhouse" ], 5, 13, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
+    [ "Tipsy Kimono, Marco", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
     [ "Marco, Whitebeard Pirates", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
     [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
@@ -1256,7 +1256,7 @@ window.units = [
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
     [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
     [ "Young Whitebeard", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
-    [ "Young Whitebeard Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, null, 1597, 762, 70, 2702, 1570, 170, null ],
+    [ "Young Whitebeard Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
     [ "Young Doflamingo", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
     [ "Young Doflamingo Evolved", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
     [ "Young Señor Pink", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
diff --git a/common/views/links.html b/common/views/links.html
index 2dd0a21b1..cb02b9aad 100644
--- a/common/views/links.html
+++ b/common/views/links.html
@@ -62,6 +62,13 @@
             </a>
             <a class="tip">Ability Slot Planner</a>
         </div>
+        
+        <div class="rotater" id="link-turtles" title="Turtle Times" ng-if="exclude != 'turtles'">
+            <a class="btn btn-icon" target="_blank" href="../turtles">
+                <i class="fa fa-clock-o"></i>
+            </a>
+            <a class="tip">Turtle Times</a>
+        </div>
 
     </div>
 
diff --git a/damage/index.html b/damage/index.html
index de22de00b..a04a0eab1 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -99,7 +99,7 @@
 
         <error-report></error-report>
         
-        <link-button exclude="calculator"></link-button>
+        <link-button exclude="calculator"></link-button> 
 
     </body>
 
diff --git a/index.css b/index.css
index 8439c709d..7895e2bbe 100644
--- a/index.css
+++ b/index.css
@@ -93,6 +93,7 @@ body {
 .purple { background-color: #DA70D6; }
 .yellow { background-color: #F4BA70; }
 .pink   { background-color: #DEA5A4; }
+.brown   { background-color: #993300; }
 
 .green:hover  { background-color: #6EB98E; }
 .blue:hover   { background-color: #74B0E4; }
@@ -100,6 +101,7 @@ body {
 .purple:hover { background-color: #C96995; }
 .yellow:hover { background-color: #E3A969; }
 .pink:hover   { background-color: #A57777; }
+.brown:hover   { background-color: #662200; }
 
 .overlay {
     position: absolute;
diff --git a/index.html b/index.html
index ae058c078..038276e5d 100644
--- a/index.html
+++ b/index.html
@@ -55,6 +55,7 @@
             <a class="animated zoomInRight button red" href="mats">Evolution Helper</a>
             <a class="animated zoomInLeft button purple" href="slots">Slot Planner</a>
 	    <a class="animated zoomInRight button pink" href="probability">Probability Calculator</a>
+            <a class="animated zoomInLeft button brown" href="turtles">Turtle Times</a>
 
         </div> 
         <div id="empty">
@@ -62,10 +63,11 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>3/10/2016</p>
+            <p>4/10/2016</p>
             <br>
             <ul>
-                <li>New Units Updated!</li>
+                <li>Turtle Time Calculator Added!</li>
+                <li>More functionalities will be added soon</li>
                 <br>
                 <li>Units Updated, Ship Thumbnails updated</li>
                 <li>All units except Tashigi and Combo boosts</li>
diff --git a/turtles/.gitignore b/turtles/.gitignore
new file mode 100644
index 000000000..c30dae854
--- /dev/null
+++ b/turtles/.gitignore
@@ -0,0 +1,9 @@
+css/.sass-cache/
+css/bootstrap.css.map
+css/main.css.map
+/vendor/
+process.php
+composer.json
+composer.lock
+.DS_Store
+.sass-cache/
diff --git a/turtles/README.md b/turtles/README.md
new file mode 100644
index 000000000..f3758b7a1
--- /dev/null
+++ b/turtles/README.md
@@ -0,0 +1,6 @@
+# OPTC Calculator
+This is a calculator for the mobile game One Piece Treasure Cruise. More features will be added as they are requested. Shoot me a message on reddit if you want something else added.
+
+Changelog can be viewed [here](https://github.com/cyung/optc/commits/gh-pages).
+
+This is my first project done using AngularJS and I'm learning along the way, but I've made sure to follow the [Angular Style Guide](https://github.com/johnpapa/angular-styleguide) to make for easy reading.
diff --git a/turtles/app/app.js b/turtles/app/app.js
new file mode 100644
index 000000000..380634d24
--- /dev/null
+++ b/turtles/app/app.js
@@ -0,0 +1,9 @@
+angular.module('app', ['LocalStorageModule', 'timer', 'ngTable', 'pascalprecht.translate', 'ui.bootstrap', 'ngAnimate', 'polyglotLanguageSwitcher'])
+.config( [
+    '$compileProvider',
+    function( $compileProvider )
+    {   
+        $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|chrome-extension|data):/);
+        // Angular before v1.2 uses $compileProvider.urlSanitizationWhitelist(...)
+    }
+]);
\ No newline at end of file
diff --git a/turtles/app/app2.js b/turtles/app/app2.js
new file mode 100644
index 000000000..ad07bc165
--- /dev/null
+++ b/turtles/app/app2.js
@@ -0,0 +1 @@
+angular.module('app', ['ajoslin.promise-tracker']);
\ No newline at end of file
diff --git a/turtles/app/config/localizeConfig.js b/turtles/app/config/localizeConfig.js
new file mode 100644
index 000000000..f0e2ec296
--- /dev/null
+++ b/turtles/app/config/localizeConfig.js
@@ -0,0 +1,101 @@
+angular.module('app')
+	.config(function ($translateProvider) {
+		$translateProvider.translations('en', {
+			NAV_TURTLE: 'Turtle Time',
+			NAV_BARREL: 'Barrel Breaking',
+			NAV_EVENT: 'Event',
+			NAV_CONTACT: 'Contact Me',
+			NAV_SETTINGS: 'Settings',
+			TT_TITLE: 'Turtle Time Calculator',
+			TT_DIGIT: '6th ID digit:',
+			TT_FORMAT: '24hr format',
+			TT_TIMEZONE: 'Time Zone:',
+			TT_SEEMORE: 'See More',
+			TT_ADD_CALENDAR: 'Add to Calendar',
+			TT_NOTIFICATION: 'Notification Settings',
+			TT_NOTIF_MINUTES: 'Minutes before event',
+			TT_NOTIF_SOUND: 'Play sound',
+			TT_NOTIF_EXAMPLE: 'Example',
+			BB_TITLE: 'Barrel Breaking',
+			BB_TIME: 'Time till next rotation:',
+			BB_ALT: 'Show Hours',
+			BB_DATE: 'Date',
+			BB_WOODEN: 'Wooden',
+			BB_SILVER: 'Silver',
+			BB_GOLD: 'Gold'
+		})
+		.translations('de', {
+			NAV_TURTLE: 'Turtle Zeiten',
+			NAV_BARREL: 'Friend Game',
+			NAV_EVENT: 'Ereignis',
+			NAV_CONTACT: 'Kontaktiere Mich',
+			NAV_SETTINGS: 'Einstellungen',
+			TT_TITLE: 'Turtle Zeiten Rechner',
+			TT_DIGIT: '6te Ziffer der ID:',
+			TT_FORMAT: '24-Stunden Format',
+			TT_TIMEZONE: 'Zeitzone:',
+			TT_SEEMORE: 'siehe mehr',
+			TT_ADD_CALENDAR: 'Zum Kalender hinzufügen',
+			TT_NOTIFICATION: 'Mitteilungeinstellungen',
+			TT_NOTIF_MINUTES: 'Minuten bis zur Veranstaltung',
+			TT_NOTIF_SOUND: 'Ton abspielen',
+			TT_NOTIF_EXAMPLE: 'Beispiel',
+			BB_TITLE: 'Barrel Breaking',
+			BB_TIME: 'Zeit bis zum nächsten Wechsel:',
+			BB_ALT: 'Anzeige Stunden',
+			BB_DATE: 'Datum',
+			BB_WOODEN: 'Holz',
+			BB_SILVER: 'Silber',
+			BB_GOLD: 'Gold'
+		})
+		.translations('es', {
+			NAV_TURTLE: 'Horario Tortugas',
+			NAV_BARREL: 'Friend Game',
+			NAV_EVENT: 'Evento',
+			NAV_CONTACT: 'Contáctame',
+			NAV_SETTINGS: 'Configuración',
+			TT_TITLE: 'Horario Tortugas Calculadora',
+			TT_DIGIT: '6th dígito de ID:',
+			TT_FORMAT: '24 horas',
+			TT_TIMEZONE: 'Zona Horaria:',
+			TT_SEEMORE: 'ver más',
+			TT_ADD_CALENDAR: 'Añadir al calendario',
+			TT_NOTIFICATION: 'Configuración De Las Notificaciones',
+			TT_NOTIF_MINUTES: 'Minutos antes de evento',
+			TT_NOTIF_SOUND: 'Reproducir sonido',
+			TT_NOTIF_EXAMPLE: 'Ejemplo',
+			BB_TITLE: 'Friend Game',
+			BB_TIME: 'Tiempo hasta la próxima rotación:',
+			BB_ALT: 'Mostrar las horas',
+			BB_DATE: 'Fecha',
+			BB_WOODEN: 'Madera',
+			BB_SILVER: 'Plata',
+			BB_GOLD: 'Oro'
+		})
+		.translations('fr', {
+			NAV_TURTLE: 'Horaires des Tortues',
+			NAV_BARREL: 'Partie d\'amis',
+			NAV_EVENT: 'Event',
+			NAV_CONTACT: 'Me Contacter',
+			NAV_SETTINGS: 'Réglages',
+			TT_TITLE: 'Calculateur de l\'Horaire des Tortues',
+			TT_DIGIT: '6eme chiffre ID:',
+			TT_FORMAT: 'Format 24h',
+			TT_TIMEZONE: 'Fuseau Horaire:',
+			TT_SEEMORE: 'Lire la suite',
+			TT_ADD_CALENDAR: 'Ajouter au Calendrier',
+			TT_NOTIFICATION: 'Réglages des Notifications',
+			TT_NOTIF_MINUTES: 'Temps Restant avant Event',
+			TT_NOTIF_SOUND: 'Jouer le son',
+			TT_NOTIF_EXAMPLE: 'Exemple',
+			BB_TITLE: 'Éclatement du Tonneau',
+			BB_TIME: 'Temps jusqu\'à la Prochaine Rotation:',
+			BB_ALT: 'Afficher les Heures',
+			BB_DATE: 'Date',
+			BB_WOODEN: 'Bois',
+			BB_SILVER: 'Argent',
+			BB_GOLD: 'Or',
+		});
+		$translateProvider.preferredLanguage('en');
+		$translateProvider.useSanitizeValueStrategy('escaped');
+	});
diff --git a/turtles/app/controllers/barrelCtrl.js b/turtles/app/controllers/barrelCtrl.js
new file mode 100644
index 000000000..43e66b208
--- /dev/null
+++ b/turtles/app/controllers/barrelCtrl.js
@@ -0,0 +1,82 @@
+angular.module('app')
+	.controller('BarrelCtrl', function($scope, localStorageService){
+		var self = this;
+		self.see_more = false;
+
+		var day = moment().utc().startOf('day').add(12,'hours');
+		var local = day.clone().local();
+		var hour_start = local.format('HH:mm');
+		var hour_end = local.clone().add(23,'hours').add(59, 'minutes').format('HH:mm');
+		var hour_string = ' ' + hour_start + '-' + hour_end;
+		var now = moment();
+		if (day.isAfter(now))
+			day.subtract(1, 'days');
+
+		self.day_num = day.dayOfYear();
+		self.day = day.clone().add(1, 'days').format('x');
+		self.times = [];
+		self.show_hours = JSON.parse(localStorageService.get('show_hours'));
+		if (self.show_hours === null)
+			self.show_hours = false;
+
+		set_time();
+
+
+		$scope.$watch(function() {
+			return self.show_hours;
+		}, function(newVal) {
+			localStorageService.set('show_hours', self.show_hours);
+			set_time();
+		});
+
+		function set_time() {
+			self.times = [];
+			for (var i=0; i<5; i++)
+				self.times.push(calc_day(i));
+		}
+
+		function calc_day(day_offset) {
+			var wooden = [0,5,4,9,3,8,4,9,2,7,3,8,1,6,2,7,0,5,1,6];
+			var silver = [1,6,2,7,0,5,1,6,0,5,4,9,3,8,4,9,2,7,3,8];
+			var gold   = [3,8,2,7,1,6,0,5,4,9];
+
+			var offset = self.day_num + day_offset + 4;
+			offset = offset % 5;
+
+			var start1 = (offset*4) % 20;
+			var start2 = (offset*2) % 10;
+
+			var chest_wooden = wooden.slice(start1, start1+4);
+			var chest_silver = silver.slice(start1, start1+4);
+			var chest_gold   = gold  .slice(start2, start2+2);
+
+			var now = moment();
+			now.add(day_offset,'day');
+
+			var date = now.format('YYYY/MM/DD');
+
+			// Show Hours display
+			var day_end = day.clone().local().add(day_offset, 'day')
+				.add(23, 'hours').add(59, 'minutes');
+			var current_day = moment(date, "YYYY/MM/DD").endOf('day');
+			if (self.show_hours){
+				if (current_day.isAfter(day_end))
+					date = current_day.subtract(1,'day').format('YYYY/MM/DD');
+				date += hour_string;
+			}
+
+
+			var chest_day = {};
+			chest_day.date = date;
+			chest_day.wooden = chest_wooden;
+			chest_day.silver = chest_silver;
+			chest_day.gold = chest_gold;
+
+			return chest_day;
+		}
+
+		self.range = function(num) {
+			return new Array(num);
+		};
+
+	});
\ No newline at end of file
diff --git a/turtles/app/controllers/contactCtrl.js b/turtles/app/controllers/contactCtrl.js
new file mode 100644
index 000000000..8e3efc69f
--- /dev/null
+++ b/turtles/app/controllers/contactCtrl.js
@@ -0,0 +1,73 @@
+angular.module('app')
+	.controller('ContactCtrl', function ($scope, $http, $log, promiseTracker, $timeout) {
+		$scope.subjectListOptions = [
+			'Report a bug',
+			'Make a suggestion',
+			'Other'
+			];
+
+		$scope.subjectList = $scope.subjectListOptions[0];
+
+		// Inititate the promise tracker to track form submissions.
+		$scope.progress = promiseTracker();
+
+		// Form submit handler.
+		$scope.submit = function(form) {
+			// Trigger validation flag.
+			$scope.submitted = true;
+
+			// If form is invalid, return and let AngularJS show validation errors.
+			if (form.$invalid) {
+				return;
+			}
+
+			var formData = {
+					'From': $scope.name,
+					'Email': $scope.email,
+					'Subject': $scope.subjectList,
+					'Comments': $scope.comments
+			};
+			console.log('formData = ', formData);
+			// var $promise = $http.post('process.php', formData)
+			var $promise = $http({
+				url: 'process.php',
+				method: 'POST',
+				data: $.param(formData),
+				headers: {
+					'Content-Type': 'application/x-www-form-urlencoded'
+				}
+			})
+			.success(function(data, status, headers, config) {
+				console.log('data', data);
+				console.log('status', status);
+				console.log('headers', headers);
+				console.log('config', config);
+				if (data == 'OK') {
+					$scope.name = null;
+					$scope.email = null;
+					$scope.subjectList = null;
+					$scope.url = null;
+					$scope.comments = null;
+					$scope.messages = 'Your form has been sent!';
+					$scope.submitted = false;
+				} else {
+					$scope.messages = 'Oops. We received your request, but there was an error processing it.';
+					$log.error(data);
+				}
+			})
+			.error(function(data, status, headers, config) {
+				$scope.progress = data;
+				$scope.messages = 'There was a network error. Try again later.';
+				$log.error(data);
+			})
+			.finally(function() {
+				// Hide status messages after three seconds.
+				$timeout(function() {
+					$scope.messages = null;
+				}, 3000);
+			});
+
+			// Track the request and show its progress to the user.
+			$scope.progress.addPromise($promise);
+		};
+	});
\ No newline at end of file
diff --git a/turtles/app/controllers/eventCtrl.js b/turtles/app/controllers/eventCtrl.js
new file mode 100644
index 000000000..8fb6a33ce
--- /dev/null
+++ b/turtles/app/controllers/eventCtrl.js
@@ -0,0 +1,160 @@
+angular.module('app')
+	.controller('EventCtrl', function($scope, localStorageService){
+		var self = this;
+
+		/*======================================
+		=            One-time event            =
+		======================================*/
+		
+		// self.timezone = jstz.determine().name();
+
+		// self.my_time = moment.utc("2015-07-08 13:00").local();
+		// self.id = localStorageService.get('id');
+		// self.military = JSON.parse(localStorageService.get('military'));
+		
+		/*-----  End of One-time event  ------*/
+
+		/*==================================
+		=            COUNTDOWNS            =
+		==================================*/
+		
+		// var sugofest = moment.utc("2015-07-15 03:00");
+		// console.log(sugofest.format("x"));
+		
+		/*-----  End of COUNTDOWNS  ------*/
+		
+		
+		
+		var day = moment().utc().startOf('day').add(8,'hours');
+		var day_jpn = moment().utc().startOf('day').add(2, 'hours');
+		
+		var now = moment();
+		if (day.isAfter(now))
+			day.subtract(1, 'days');
+		if (day_jpn.isAfter(now))
+			day_jpn.subtract(1, 'days');
+
+		var day_num = day.dayOfYear();
+		var day_num_jpn = day_jpn.dayOfYear();
+		self.next_day = day.clone().add(1, 'days').format('x');
+		self.next_day_jpn = day_jpn.clone().add(1, 'days').format('x');
+		self.times = [];
+
+		self.global = localStorageService.get('version');
+		if (self.global === null)
+			self.global = 'global';
+		self.show_hours = JSON.parse(localStorageService.get('show_hours'));
+		if (self.show_hours === null)
+			self.show_hours = false;
+
+		calc_hour_string();
+		
+		var drop = ['Loguetown, Jaya', 'Arlong Park, Alubarna', 'Baratie, Nanohana Rainbase', 'Syrup Village, Drum Island', 'Orange Town, Little Garden', 'Shell Town, Whiskey Peak, Ark Maxim', "Alvida's Hideout, Twin Cape"];
+		var stamina = ['Orange Town, Drum Island', 'Shell Town, Little Garden', "Alvida's Hideout, Whiskey Peak", 'Fuschia Village, Twin Cape, Skypia', 'Loguetown, Jaya', 'Arlong Park, Alubarna', 'Baratie, Nanohana Rainbase'];
+		var beli = ['Baratie, Whiskey Peak, Ark Maxim', 'Syrup Village, Twin Cape, Skypia', 'Loguetown, Jaya', 'Arlong Park, Alubarna', 'Baratie, Nanohana Rainbase', 'Syrup Village, Drum Island', 'Little Garden'];
+		var drop_jpn = ['Loguetown, Jaya', 'Arlong Park, Alubarna', 'Baratie, Nanohana Rainbase', 'Syrup Village, Drum Island', 'Orange Town, Little Garden', 'Shell Town, Whiskey Peak, Ark Maxim', "Alvida's Hideout, Twin Cape"];
+		var stamina_jpn = ['Orange Town, Drum Island', 'Shell Town, Little Garden', "Alvida's Hideout, Whiskey Peak", 'Fuschia Village, Twin Cape, Skypia', 'Loguetown, Jaya', 'Arlong Park, Alubarna', 'Baratie, Nanohana Rainbase'];
+		var beli_jpn = ['Baratie, Whiskey Peak, Ark Maxim', 'Syrup Village, Twin Cape, Skypia', 'Loguetown, Jaya', 'Arlong Park, Alubarna', 'Baratie, Nanohana Rainbase', 'Syrup Village, Drum Island', 'Little Garden'];
+		
+		self.version = function() {
+			return (self.global === 'global');
+		};
+
+		set_time();
+
+		$scope.$watch(function() {
+			return self.show_hours;
+		}, function(newVal) {
+			localStorageService.set('bb_alt');
+			set_time();
+		});
+
+		$scope.$watch(function() {
+			return self.global;
+		}, function(newVal) {
+			set_time();
+			localStorageService.set('version');
+		});
+
+
+		function set_time() {
+			self.times = [];
+			for (var i=0; i<7; i++)
+				self.times.push(calc_day(i));
+		}
+
+		function calc_day(day_offset) {
+			var offset, day_drop, day_stamina, day_beli;
+			if (self.version()) {
+				offset = (day_num + day_offset + 2) % 7;
+				day_drop = drop[offset];
+				day_stamina = stamina[offset];
+				day_beli = beli[offset];
+			} else {
+				offset = (day_num_jpn + day_offset + 2) % 7;
+				day_drop = drop_jpn[offset];
+				day_stamina = stamina_jpn[offset];
+				day_beli = beli_jpn[offset];
+			}
+
+			offset = offset % 7;
+
+			var now = moment();
+			for (var i=0; i<day_offset; i++)
+				now.add(1,'day');
+
+			var date = now.format('YYYY/MM/DD');
+
+			// Show Hours display
+			if (self.show_hours) {
+				var day_end = day.clone().local().add(day_offset, 'day')
+					.add(23, 'hours').add(59, 'minutes');
+				var day_end_jpn = day_jpn.clone().local().add(day_offset, 'day')
+					.add(23, 'hours').add(59, 'minutes');
+				var current_day = moment(date, "YYYY/MM/DD").endOf('day');
+
+				if (self.version()) {
+					if (current_day.isAfter(day_end))
+						date = current_day.subtract(1,'day').format('YYYY/MM/DD');
+					date += self.hour_string;
+				} else {
+					if (current_day.isAfter(day_end_jpn))
+						date = current_day.subtract(1,'day').format('YYYY/MM/DD');
+					date += self.hour_string_jpn;
+				}
+			}
+
+			var day_bonus = {};
+			day_bonus.date = date;
+			day_bonus.drop = day_drop;
+			day_bonus.stamina = day_stamina;
+			day_bonus.beli = day_beli;
+
+			return day_bonus;
+		}
+
+		function calc_hour_string() {
+			var local = day.clone().local();
+			var local_jpn = day_jpn.clone().local();
+			var local_end = local.clone().add(23, 'hours').add(59, 'minutes');
+			var local_end_jpn = local_jpn.clone().add(12, 'hours');
+			var hour_start = local.format('HH:mm');
+			var hour_start_jpn = local_jpn.format('HH:mm');
+			var hour_end = local_end.format('HH:mm');
+			var hour_end_jpn = local_end_jpn.format('HH:mm');
+			self.hour_string = ' ' + hour_start + '-' + hour_end;
+			self.hour_string_jpn = ' ' + hour_start_jpn + '-' + hour_end_jpn;
+		}
+
+		self.get_next_day = function(global) {
+			console.log('getting next day');
+			if (global)
+				return self.next_day;
+			return self.next_day_jpn;
+		};
+
+		self.range = function(num) {
+			return new Array(num);
+		};
+
+	});
\ No newline at end of file
diff --git a/turtles/app/controllers/localeCtrl.js b/turtles/app/controllers/localeCtrl.js
new file mode 100644
index 000000000..d884b1e00
--- /dev/null
+++ b/turtles/app/controllers/localeCtrl.js
@@ -0,0 +1,31 @@
+angular.module('app')
+
+	.controller('LocaleCtrl', function ($scope, $translate, localStorageService) {
+		var self = this;
+		self.locale = localStorageService.get('locale');
+		self.flag = localStorageService.get('flag');
+		if (self.locale !== null){
+			$translate.use(self.locale);
+			moment.locale(self.locale);
+		} else
+			moment.locale('en');
+
+		$scope.$on('pls.onLanguageChanged', function(evt, lang){
+			self.locale = (lang.lang.id.substring(0,2));
+			$translate.use(self.locale);
+			localStorageService.set('locale', self.locale);
+			localStorageService.set('flag', lang.lang.id);
+		});
+
+		$scope.plsModel = {
+			languages: [
+				{id: 'en_US',title: 'English (US)',name: ' English (US)',flagImg: 'images/flags/us.png',flagTitle: 'United States'},
+				{id: 'fr_FR',title: 'French (France)',name: ' Français (France)',flagImg: 'images/flags/fr.png',flagTitle: 'France'},
+				// {id: 'it_IT',title: 'Italian',name: ' Italiano',flagImg: 'images/flags/it.png',flagTitle: 'Italy'},
+				{id: 'de_DE',title: 'German',name: ' Deutsch',flagImg: 'images/flags/de.png',flagTitle: 'Germany'},
+				{id: 'es_ES',title: 'Spanish',name: ' Español',flagImg: 'images/flags/es.png',flagTitle: 'Spain'},
+				// {id: 'jp_JP',title: 'Japanese',name: ' 日本語',flagImg: 'images/flags/jp.png',flagTitle: 'Japan'},
+				// {id: 'cn_CN',title: 'Simplified Chinese (China)',name: ' 中文(简体)',flagImg: 'images/flags/cn.png',flagTitle: 'China'},
+			]
+		};
+	});
\ No newline at end of file
diff --git a/turtles/app/controllers/modalCtrl.js b/turtles/app/controllers/modalCtrl.js
new file mode 100644
index 000000000..d92886651
--- /dev/null
+++ b/turtles/app/controllers/modalCtrl.js
@@ -0,0 +1,27 @@
+(function() {
+  'use strict';
+
+  angular.module('app')
+  .controller('ModalCtrl', ModalCtrl);
+
+  function ModalCtrl($modalInstance, $interval, $window) {
+    var self = this;
+
+    self.countdown = 10;
+    var redirect = $interval(function() {
+      self.countdown--;
+      if (!self.countdown)
+        $window.location.href = 'https://optctimer.com';
+    }, 1000);
+
+    self.ok = function() {
+      $window.location.href = 'https://optctimer.com';
+    }
+
+    self.cancel = function() {
+      $interval.cancel(redirect);
+      $modalInstance.dismiss('cancel');
+    };
+  }
+
+})();
\ No newline at end of file
diff --git a/turtles/app/controllers/navbarCtrl.js b/turtles/app/controllers/navbarCtrl.js
new file mode 100644
index 000000000..f2d7a96ee
--- /dev/null
+++ b/turtles/app/controllers/navbarCtrl.js
@@ -0,0 +1,4 @@
+angular.module('app')
+	.controller('NavbarCtrl', function($scope) {
+		$scope.isCollapsed = true;
+	});
\ No newline at end of file
diff --git a/turtles/app/controllers/turtleCtrl.js b/turtles/app/controllers/turtleCtrl.js
new file mode 100644
index 000000000..93185ad8e
--- /dev/null
+++ b/turtles/app/controllers/turtleCtrl.js
@@ -0,0 +1,55 @@
+angular.module('app')
+	.controller('TurtleCtrl', function($scope, localStorageService){
+		var self = this;
+		self.timezone = jstz.determine().name();
+		self.global = 'global';
+
+		self.my_time = moment().utc().startOf('isoWeek').add(13, 'hours').local();
+		self.jpn_time = moment().utc().startOf('isoWeek'); // every monday and friday
+		self.jpn_monday = true;
+		var now = moment();
+		var end = self.my_time.clone().add(18,'hours');
+		var end_jpn = end.clone();
+		if (now.isAfter(end)){
+			self.my_time.add(1, 'week');
+			self.jpn_time.add(4, 'days'); // set to friday
+			end_jpn.add(4, 'days');
+			self.jpn_monday = false;
+		}
+
+		if (now.isAfter(end_jpn)){
+			self.jpn_time.add(3, 'days'); // set to monday
+			self.jpn_monday = true;
+		}
+
+		self.id = localStorageService.get('id');
+		self.military = JSON.parse(localStorageService.get('military'));
+		self.global = localStorageService.get('version');
+		if (self.global === null)
+			self.global = 'global';
+
+		/*====================================
+		=            EVENT HOTFIX            =
+		====================================*/
+		
+		self.jpn_time = moment.utc("2015-07-24 00:00");
+		
+		/*-----  End of EVENT HOTFIX  ------*/
+		
+		
+
+		$scope.$watch(function() {
+			return self.global;
+		}, function(newVal) {
+			localStorageService.set('version', self.global);
+		});
+
+		self.version = function() {
+			return (self.global === 'global');
+		};
+
+		self.range = function(num) {
+			return new Array(num);
+		};
+
+	});
\ No newline at end of file
diff --git a/turtles/app/controllers/turtleCtrlBeta.js b/turtles/app/controllers/turtleCtrlBeta.js
new file mode 100644
index 000000000..9b086f614
--- /dev/null
+++ b/turtles/app/controllers/turtleCtrlBeta.js
@@ -0,0 +1,95 @@
+(function () {
+	'use strict';
+	angular.module('app')
+		.controller('TurtleCtrlBeta', turtleCtrlBeta);
+		function turtleCtrlBeta($scope, localStorageService, turtleFact, $document, $window, $modal) {
+		var self = this;
+		set_params();
+		note_permission();
+
+		function set_params() {
+			self.timezone = jstz.determine().name();
+
+			self.id = localStorageService.get('id');
+			self.military = JSON.parse(localStorageService.get('military'));
+			self.version = localStorageService.get('version');
+			if (self.version === null)
+				self.version = 'global';
+
+			self.notif_support = true;
+			self.notif_time = localStorageService.get('notif_time');
+			if (self.notif_time === null)
+				self.notif_time = 10;
+			self.notif_sound = JSON.parse(localStorageService.get('notif_sound'));
+			if (self.notif_sound === null)
+				self.notif_sound = false;
+		}
+
+		
+		function note_permission() {
+			self.iOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+			var mobileAndTabletCheck = function() {
+				var check = false;
+				(function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4)))check = true})(navigator.userAgent||navigator.vendor||window.opera);
+				return check;
+			};
+
+			// if not supported, show mesage
+			if (!("Notification" in window) || mobileAndTabletCheck())
+				self.notif_support = false;
+			else
+				Notification.requestPermission();
+		}
+
+		self.get_cal = function() {
+			turtleFact.get_cal();
+		};
+
+		self.example_notification = function() {
+			turtleFact.example_notification();
+		};
+
+		self.range = function(num) {
+			return new Array(num);
+		};
+
+		self.cancelRedirect = function() {
+			$interval.cancel(redirect);
+		}
+
+		$scope.$watch(function() {
+			return self.id;
+		}, function(newVal, oldVal) {
+			localStorageService.set('id', newVal);
+			turtleFact.set_id(self.id);
+			self.ttimes = turtleFact.get_ttimes(20);
+		});
+
+		$scope.$watch(function() {
+			return self.military;
+		}, function(newVal, oldVal) {
+			localStorageService.set('military', newVal);
+		});
+
+		$scope.$watch(function() {
+			return self.version;
+		}, function(newVal, oldVal) {
+			localStorageService.set('version', newVal);
+			turtleFact.set_version(self.version);
+		});
+
+		$scope.$watch(function() {
+			return self.notif_time;
+		}, function(newVal, oldVal) {
+			localStorageService.set('notif_time', newVal);
+			turtleFact.set_notif_time(self.notif_time);
+		});
+
+		$scope.$watch(function() {
+			return self.notif_sound;
+		}, function(newVal, oldVal) {
+			localStorageService.set('notif_sound', newVal);
+			turtleFact.set_notif_sound(self.notif_sound);
+		});
+	}
+})();
\ No newline at end of file
diff --git a/turtles/app/directives/barrelDirective.js b/turtles/app/directives/barrelDirective.js
new file mode 100644
index 000000000..e8f31c972
--- /dev/null
+++ b/turtles/app/directives/barrelDirective.js
@@ -0,0 +1,49 @@
+angular.module('app')
+	.directive('chestType', function () {
+		return {
+			restrict: 'AE',
+			scope: {
+				index: '@',
+				dayNum: '='
+			},
+			template: '<div><h2>{{date}}</h2><p>Wooden {{chest_wooden}}</p><p>Silver {{chest_silver}}</p><p>Gold {{chest_gold}}</p>',
+			link: function (scope, elem, attrs) {
+				var wooden = [0,5,4,9,3,8,4,9,2,7,3,8,1,6,2,7,0,5,1,6];
+				var silver = [1,6,2,7,0,5,1,6,0,5,4,9,3,8,4,9,2,7,3,8];
+				var gold   = [3,8,2,7,1,6,0,5,4,9];
+
+				var offset = parseInt(scope.index) + scope.dayNum;
+				offset += 4;
+
+				var start1 = (offset*4) % 20;
+				var start2 = (offset*2) % 10;
+
+				scope.chest_wooden = wooden.slice(start1, start1+4);
+				scope.chest_silver = silver.slice(start1, start1+4);
+				scope.chest_gold   = gold  .slice(start2, start2+2);
+
+				var date = moment();
+				for (var i=0; i<scope.index; i++)
+					date.add(1,'day');
+				scope.date = date.format('MMMM Do, YYYY');
+			}
+		};
+	})
+	.directive('barrelTime', function () {
+		return {
+			restrict: 'AE',
+			scope: {
+				day: '='
+			},
+			template: function (scope, elem, attrs) {
+				var day = moment().utc().startOf('day').add(12,'hours');
+				var now = moment();
+				if (day.isBefore(now))
+					day.add(1, 'days');
+				html = '<timer end-time="' + day + '" class="timer">{{hhours}}:{{mminutes}}:{{sseconds}}</timer>';
+				return html;
+			},
+			compile: function(elem, attrs) {
+			}
+		};
+	});
\ No newline at end of file
diff --git a/turtles/app/directives/collapseDirective.js b/turtles/app/directives/collapseDirective.js
new file mode 100644
index 000000000..aba284596
--- /dev/null
+++ b/turtles/app/directives/collapseDirective.js
@@ -0,0 +1,65 @@
+angular.module('ui.bootstrap.collapse', [])
+ 
+	.directive('collapse', ['$animate', '$animateCss', '$timeout', function ($animate, $animateCss, $timeout) {
+ 
+		return {
+			link: function (scope, element, attrs) {
+				function expand() {
+					element.removeClass('collapse').addClass('collapsing');
+
+					var animation = $animateCss(element, {
+						addClass: 'in',
+						to: { height: element[0].scrollHeight + 'px' }
+					});
+ 
+					animation.start().done(expandDone);
+				}
+ 
+				function expandDone() {
+					element.removeClass('in collapsing');
+					element.css({height: 'auto'});
+				}
+ 
+				function collapse() {
+					// if(! element.hasClass('collapse') && ! element.hasClass('in')) {
+					//   return collapseDone();
+					// }
+					if (element.hasClass('init')){
+						element.removeClass('init');
+						return collapseDone();
+					}
+					element
+						// IMPORTANT: The height must be set before adding "collapsing" class.
+						// Otherwise, the browser attempts to animate from height 0 (in
+						// collapsing class) to the given height here.
+						.css({height: element[0].scrollHeight + 'px'})
+						// initially all panel collapse have the collapse class, this removal
+						// prevents the animation from jumping to collapsed state
+						.removeClass('collapse')
+						.addClass('collapsing');
+
+
+					var animation = $animateCss(element, {
+						addClass: 'in',
+						to: { height: '0' }
+					});
+ 
+					animation.start().done(collapseDone);
+				}
+ 
+				function collapseDone() {
+					element.css({height: '0'}); // Required so that collapse works when animation is disabled
+					element.removeClass('in collapsing');
+					element.addClass('collapse');
+				}
+ 
+				scope.$watch(attrs.collapse, function (shouldCollapse) {
+					if (shouldCollapse) {
+						collapse();
+					} else {
+						expand();
+					}
+				});
+			}
+		};
+	}]);
\ No newline at end of file
diff --git a/turtles/app/directives/eventDirective.js b/turtles/app/directives/eventDirective.js
new file mode 100644
index 000000000..314f5b172
--- /dev/null
+++ b/turtles/app/directives/eventDirective.js
@@ -0,0 +1,190 @@
+angular.module('app')
+	.directive('eventDay', function (localStorageService) {
+		return {
+			restrict: 'AE',
+			scope: {
+				military: '=',
+				index: '=',
+				my_id: '=myId',
+				my_time: '=myTime',
+				locale: '='
+			},
+			template: '<div class="turtle-day"><p><span>{{date1}}</span>{{ttime1_format}}</p><p><span>{{date2}}</span>{{ttime2_format}}</p></div',
+			link: function (scope, elem, attrs) {
+				var my_time = scope.my_time;
+				var day_num = scope.index;
+				var now = moment();
+				var end = my_time.clone().add(7,'days');
+
+				scope.$watch('military', function(value) {
+					update_times();
+					if (scope.military !== null && scope.military !== undefined)
+						localStorageService.set('military', scope.military);
+				});
+
+				scope.$watch('my_id', function(value) {
+					update_times();
+					if (scope.my_id !== null && scope.my_id !== undefined)
+						localStorageService.set('id', scope.my_id);
+				});
+
+				scope.$watch('locale', function(value) {
+					update_times();
+				});
+
+				function update_times() {
+					var ttime1 = calc_time(scope.my_id, false);
+					var ttime2 = calc_time(scope.my_id, true);
+
+					var ttime2_end = ttime2.clone().add(8, 'hours');
+
+					if (ttime2_end.isBefore(now))
+						elem.remove();
+
+					if (scope.locale !== null){
+						ttime1.locale(scope.locale);
+						ttime2.locale(scope.locale);
+					}
+					scope.date1 = ttime1.format('LL');
+					scope.date2 = ttime2.format('LL');
+					scope.ttime1_format = print_time(ttime1, scope.military);
+					scope.ttime2_format = print_time(ttime2, scope.military);
+				}
+
+				function calc_time(id, second_time) {
+					var weekly_order = [0,1,2,3,4];
+					var ttime = my_time.clone();
+					var offset = day_num + 4;
+					offset = offset % 5;
+
+					for (var i=0; i < offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					for (i=0; i < day_num; i++)
+						ttime.add(2, 'days');
+					
+
+					if (id>4)
+						id -=5;
+
+					ttime.add(weekly_order[id]*2, 'hours');
+					if (second_time)
+						ttime.add(10,'hours');
+					return ttime;
+				}
+
+				function print_time(date, military) {
+					if (military)
+						return date.format('HH:mm');
+					return date.format('h:mm a');
+				}
+			}
+		};
+	})
+	.directive('eventDayJpn', function (localStorageService) {
+		return {
+			restrict: 'AE',
+			scope: {
+				military: '=',
+				index: '=',
+				my_id: '=myId',
+				my_time: '=myTime',
+				locale: '='
+			},
+			template: '<div class="event-day-jpn"><p><span>{{date1}}</span>{{ttime1_format}}</p></div',
+			link: function (scope, elem, attrs) {
+				var my_time = scope.my_time;
+				var day_num = scope.index;
+
+				scope.$watch('military', function(value) {
+					update_times();
+					if (scope.military !== null)
+						localStorageService.set('military', scope.military);
+				});
+
+				scope.$watch('my_id', function(value) {
+					update_times();
+					if (scope.my_id !== null && scope.my_id !== undefined)
+						localStorageService.set('id', scope.my_id);
+				});
+
+				scope.$watch('locale', function(value) {
+					update_times();
+				});
+
+				function update_times() {
+					var ttime1 = calc_time(scope.my_id).local();
+					
+					if (scope.locale !== null){
+						ttime1.locale(scope.locale);
+					}
+					scope.date1 = ttime1.format('LL');
+					scope.ttime1_format = print_time(ttime1, scope.military);
+				}
+
+				function calc_time(id) {
+					var weekly_order = [0,1,2,3,4];
+					var ttime = my_time.clone();
+					var offset = day_num + my_time.isoWeek()*2 + 2;
+
+					offset = offset % 5;
+
+					// console.log('offset = ', offset);
+
+					for (var i=0; i < offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					for (i=0; i < day_num; i++)
+						ttime.add(2, 'days');
+					if (day_num === 2)
+						ttime.add(1, 'days');
+
+					id = id % 5;
+
+					ttime.add(weekly_order[id]*3, 'hours');
+
+					return ttime;
+				}
+
+				function print_time(date, military) {
+					if (military)
+						return date.format('HH:mm');
+					return date.format('h:mm a');
+				}
+			}
+		};
+	})
+	.directive('selectOnClick', [function () {
+		return {
+			restrict: 'A',
+			link: function (scope, elem, attrs) {
+				var focused;
+				elem.on('click', function() {
+					if (focused != this) {
+						this.select();
+						focused = this;
+					}
+				});
+				elem.on('blur', function() {
+					focused = null;
+				});
+			}
+		};
+	}])
+	.directive('isleTime', function () {
+		return {
+			restrict: 'E',
+			template: function (elem, attrs) {
+				var day = moment().utc().startOf('day');
+				if (JSON.parse(attrs.global))
+					day.add(8, 'hours');
+				else
+					day.add(15, 'hours');
+				var now = moment();
+				if (day.isBefore(now))
+					day.add(1, 'days');
+				html = '<timer end-time="' + day.format('x') + '" class ="timer">{{hhours}}:{{mminutes}}:{{sseconds}}</timer>';
+				return html;
+			}
+		};
+	});
\ No newline at end of file
diff --git a/turtles/app/directives/turtleBetaDirective.js b/turtles/app/directives/turtleBetaDirective.js
new file mode 100644
index 000000000..d160b44e7
--- /dev/null
+++ b/turtles/app/directives/turtleBetaDirective.js
@@ -0,0 +1,62 @@
+(function() {
+	'use strict';
+
+	angular.module('app')
+	.directive('turtleBeta', 
+	turtle_beta);
+
+	function turtle_beta(turtleFact) {
+		return {
+			restrict: 'E',
+			scope: {
+				military: '=',
+				locale: '=',
+				index: '=',
+				numid: '=',
+				version: '='
+			},
+			template: '<p><span>{{date}}</span><span>{{ttime_format}}</span></p>',
+			link: linker
+		}
+
+		function linker(scope, elem, attrs) {
+			function update_times() {
+				var ttime = turtleFact.get_ttimes()[scope.index].local();
+				if (scope.locale !== null)
+					ttime.locale(scope.locale);
+				else 
+					ttime.locale('en');
+
+				scope.date = ttime.format('LL');
+				scope.ttime_format = print_time(ttime);
+			}
+
+			function print_time (date) {
+				if (scope.military)
+					return date.format('HH:mm');
+				return date.format('h:mm a');
+			}
+
+
+			scope.$watch('numid', function(newVal, oldVal) {
+				update_times();
+			});
+
+			scope.$watch('military', function(newVal, oldVal) {
+				update_times();
+			});
+
+			scope.$watch('ttime', function(newVal, oldVal) {
+				update_times();
+			});
+
+			scope.$watch('locale', function(newVal, oldVal) {
+				update_times();
+			});
+
+			scope.$watch('version', function(newVal, oldVal) {
+				update_times();
+			});
+		}
+	}
+})()
\ No newline at end of file
diff --git a/turtles/app/directives/turtleDirective.js b/turtles/app/directives/turtleDirective.js
new file mode 100644
index 000000000..554b01a06
--- /dev/null
+++ b/turtles/app/directives/turtleDirective.js
@@ -0,0 +1,194 @@
+angular.module('app')
+	.directive('turtleDay', function (localStorageService) {
+		return {
+			restrict: 'AE',
+			scope: {
+				military: '=',
+				index: '=',
+				my_id: '=myId',
+				my_time: '=myTime',
+				locale: '='
+			},
+			template: '<div class="turtle-day"><p><span>{{date1}}</span>{{ttime1_format}}</p><p><span>{{date2}}</span>{{ttime2_format}}</p></div>',
+			link: function (scope, elem, attrs) {
+				var my_time = scope.my_time;
+				var week_num = scope.index;
+
+				scope.$watch('military', function(value) {
+					update_times();
+					if (scope.military !== null)
+						localStorageService.set('military', scope.military);
+				});
+
+				scope.$watch('my_id', function(value) {
+					update_times();
+					if (scope.my_id !== null && scope.my_id !== undefined)
+						localStorageService.set('id', scope.my_id);
+				});
+
+				scope.$watch('locale', function(value) {
+					update_times();
+				});
+
+				function update_times() {
+					var ttime1 = calc_time(scope.my_id, false);
+					var ttime2 = calc_time(scope.my_id, true);
+					
+					if (scope.locale !== null){
+						ttime1.locale(scope.locale);
+						ttime2.locale(scope.locale);
+					}
+					scope.date1 = ttime1.format('LL');
+					scope.date2 = ttime2.format('LL');
+					scope.ttime1_format = print_time(ttime1, scope.military);
+					scope.ttime2_format = print_time(ttime2, scope.military);
+				}
+
+				function calc_time(id, second_time) {
+					var weekly_order = [0,1,2,3,4];
+					var ttime = my_time.clone();
+					var offset = week_num + my_time.isoWeek() + 3;
+
+					offset = offset % 5;
+
+					for (var i=0; i < offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					for (i=0; i < week_num; i++)
+						ttime.add(1, 'week');
+
+					if (id>4)
+						id -=5;
+
+					ttime.add(weekly_order[id]*2, 'hours');
+					if (second_time)
+						ttime.add(10,'hours');
+
+					return ttime;
+				}
+
+				function print_time(date, military) {
+					if (military)
+						return date.format('HH:mm');
+					return date.format('h:mm a');
+				}
+			}
+		};
+	})
+	.directive('turtleDayJpn', function (localStorageService) {
+		return {
+			restrict: 'AE',
+			scope: {
+				military: '=',
+				index: '=',
+				my_id: '=myId',
+				my_time: '=myTime',
+				locale: '=',
+				jpn_monday: '=jpnMonday'
+			},
+			template: '<div class="turtle-day-jpn"><p><span>{{date1}}</span>{{ttime1_format}}</p></div',
+			link: function (scope, elem, attrs) {
+				var my_time = scope.my_time;
+				var day_num = scope.index;
+
+				scope.$watch('military', function(value) {
+					update_times();
+					if (scope.military !== null)
+						localStorageService.set('military', scope.military);
+				});
+
+				scope.$watch('my_id', function(value) {
+					update_times();
+					if (scope.my_id !== null && scope.my_id !== undefined)
+						localStorageService.set('id', scope.my_id);
+				});
+
+				scope.$watch('locale', function(value) {
+					update_times();
+				});
+
+				function update_times() {
+					var ttime1 = calc_time(scope.my_id).local();
+					
+					if (scope.locale !== null){
+						ttime1.locale(scope.locale);
+					}
+					scope.date1 = ttime1.format('LL');
+					scope.ttime1_format = print_time(ttime1, scope.military);
+				}
+
+				function calc_time(id) {
+					var weekly_order = [0,1,2,3,4];
+					var ttime = my_time.clone();
+					var offset = day_num + my_time.isoWeek()*2 + 4;
+					var jpn_monday = scope.jpn_monday;
+					if (!jpn_monday)
+						offset += 1;
+
+					/*====================================
+					=            EVENT HOTFIX            =
+					====================================*/
+					
+					offset = day_num + 3;
+					console.log('offset = ', offset);
+					
+					/*-----  End of EVENT HOTFIX  ------*/
+					
+					
+					offset = offset % 5;
+
+					for (var i=0; i < offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					// for (i=0; i < day_num; i++){
+					// 	if (jpn_monday)
+					// 		ttime.add(4, 'days');
+					// 	else
+					// 		ttime.add(3, 'days');
+					// 	jpn_monday = !jpn_monday;
+					// }
+
+					/*====================================
+					=            EVENT HOTFIX            =
+					====================================*/
+					var event_offset = [2,1,4];
+					
+					for (var i=0; i < day_num; i++)
+						ttime.add(event_offset[i], 'days');
+					
+					/*-----  End of EVENT HOTFIX  ------*/
+					
+					
+
+					id = id % 5;
+
+					ttime.add(weekly_order[id]*3, 'hours');
+
+					return ttime;
+				}
+
+				function print_time(date, military) {
+					if (military)
+						return date.format('HH:mm');
+					return date.format('h:mm a');
+				}
+			}
+		};
+	})
+	.directive('selectOnClick', function () {
+		return {
+			restrict: 'A',
+			link: function (scope, elem, attrs) {
+				var focused;
+				elem.on('click', function() {
+					if (focused != this) {
+						this.select();
+						focused = this;
+					}
+				});
+				elem.on('blur', function() {
+					focused = null;
+				});
+			}
+		};
+	});
\ No newline at end of file
diff --git a/turtles/app/lib/Blob.js b/turtles/app/lib/Blob.js
new file mode 100644
index 000000000..b4dda85fe
--- /dev/null
+++ b/turtles/app/lib/Blob.js
@@ -0,0 +1,211 @@
+/* Blob.js
+ * A Blob implementation.
+ * 2014-07-24
+ *
+ * By Eli Grey, http://eligrey.com
+ * By Devin Samarin, https://github.com/dsamarin
+ * License: X11/MIT
+ *   See https://github.com/eligrey/Blob.js/blob/master/LICENSE.md
+ */
+
+/*global self, unescape */
+/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
+  plusplus: true */
+
+/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
+
+(function (view) {
+	"use strict";
+
+	view.URL = view.URL || view.webkitURL;
+
+	if (view.Blob && view.URL) {
+		try {
+			new Blob;
+			return;
+		} catch (e) {}
+	}
+
+	// Internally we use a BlobBuilder implementation to base Blob off of
+	// in order to support older browsers that only have BlobBuilder
+	var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function(view) {
+		var
+			  get_class = function(object) {
+				return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
+			}
+			, FakeBlobBuilder = function BlobBuilder() {
+				this.data = [];
+			}
+			, FakeBlob = function Blob(data, type, encoding) {
+				this.data = data;
+				this.size = data.length;
+				this.type = type;
+				this.encoding = encoding;
+			}
+			, FBB_proto = FakeBlobBuilder.prototype
+			, FB_proto = FakeBlob.prototype
+			, FileReaderSync = view.FileReaderSync
+			, FileException = function(type) {
+				this.code = this[this.name = type];
+			}
+			, file_ex_codes = (
+				  "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
+				+ "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
+			).split(" ")
+			, file_ex_code = file_ex_codes.length
+			, real_URL = view.URL || view.webkitURL || view
+			, real_create_object_URL = real_URL.createObjectURL
+			, real_revoke_object_URL = real_URL.revokeObjectURL
+			, URL = real_URL
+			, btoa = view.btoa
+			, atob = view.atob
+
+			, ArrayBuffer = view.ArrayBuffer
+			, Uint8Array = view.Uint8Array
+
+			, origin = /^[\w-]+:\/*\[?[\w\.:-]+\]?(?::[0-9]+)?/
+		;
+		FakeBlob.fake = FB_proto.fake = true;
+		while (file_ex_code--) {
+			FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
+		}
+		// Polyfill URL
+		if (!real_URL.createObjectURL) {
+			URL = view.URL = function(uri) {
+				var
+					  uri_info = document.createElementNS("http://www.w3.org/1999/xhtml", "a")
+					, uri_origin
+				;
+				uri_info.href = uri;
+				if (!("origin" in uri_info)) {
+					if (uri_info.protocol.toLowerCase() === "data:") {
+						uri_info.origin = null;
+					} else {
+						uri_origin = uri.match(origin);
+						uri_info.origin = uri_origin && uri_origin[1];
+					}
+				}
+				return uri_info;
+			};
+		}
+		URL.createObjectURL = function(blob) {
+			var
+				  type = blob.type
+				, data_URI_header
+			;
+			if (type === null) {
+				type = "application/octet-stream";
+			}
+			if (blob instanceof FakeBlob) {
+				data_URI_header = "data:" + type;
+				if (blob.encoding === "base64") {
+					return data_URI_header + ";base64," + blob.data;
+				} else if (blob.encoding === "URI") {
+					return data_URI_header + "," + decodeURIComponent(blob.data);
+				} if (btoa) {
+					return data_URI_header + ";base64," + btoa(blob.data);
+				} else {
+					return data_URI_header + "," + encodeURIComponent(blob.data);
+				}
+			} else if (real_create_object_URL) {
+				return real_create_object_URL.call(real_URL, blob);
+			}
+		};
+		URL.revokeObjectURL = function(object_URL) {
+			if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
+				real_revoke_object_URL.call(real_URL, object_URL);
+			}
+		};
+		FBB_proto.append = function(data/*, endings*/) {
+			var bb = this.data;
+			// decode data to a binary string
+			if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
+				var
+					  str = ""
+					, buf = new Uint8Array(data)
+					, i = 0
+					, buf_len = buf.length
+				;
+				for (; i < buf_len; i++) {
+					str += String.fromCharCode(buf[i]);
+				}
+				bb.push(str);
+			} else if (get_class(data) === "Blob" || get_class(data) === "File") {
+				if (FileReaderSync) {
+					var fr = new FileReaderSync;
+					bb.push(fr.readAsBinaryString(data));
+				} else {
+					// async FileReader won't work as BlobBuilder is sync
+					throw new FileException("NOT_READABLE_ERR");
+				}
+			} else if (data instanceof FakeBlob) {
+				if (data.encoding === "base64" && atob) {
+					bb.push(atob(data.data));
+				} else if (data.encoding === "URI") {
+					bb.push(decodeURIComponent(data.data));
+				} else if (data.encoding === "raw") {
+					bb.push(data.data);
+				}
+			} else {
+				if (typeof data !== "string") {
+					data += ""; // convert unsupported types to strings
+				}
+				// decode UTF-16 to binary string
+				bb.push(unescape(encodeURIComponent(data)));
+			}
+		};
+		FBB_proto.getBlob = function(type) {
+			if (!arguments.length) {
+				type = null;
+			}
+			return new FakeBlob(this.data.join(""), type, "raw");
+		};
+		FBB_proto.toString = function() {
+			return "[object BlobBuilder]";
+		};
+		FB_proto.slice = function(start, end, type) {
+			var args = arguments.length;
+			if (args < 3) {
+				type = null;
+			}
+			return new FakeBlob(
+				  this.data.slice(start, args > 1 ? end : this.data.length)
+				, type
+				, this.encoding
+			);
+		};
+		FB_proto.toString = function() {
+			return "[object Blob]";
+		};
+		FB_proto.close = function() {
+			this.size = 0;
+			delete this.data;
+		};
+		return FakeBlobBuilder;
+	}(view));
+
+	view.Blob = function(blobParts, options) {
+		var type = options ? (options.type || "") : "";
+		var builder = new BlobBuilder();
+		if (blobParts) {
+			for (var i = 0, len = blobParts.length; i < len; i++) {
+				if (Uint8Array && blobParts[i] instanceof Uint8Array) {
+					builder.append(blobParts[i].buffer);
+				}
+				else {
+					builder.append(blobParts[i]);
+				}
+			}
+		}
+		var blob = builder.getBlob(type);
+		if (!blob.slice && blob.webkitSlice) {
+			blob.slice = blob.webkitSlice;
+		}
+		return blob;
+	};
+
+	var getPrototypeOf = Object.getPrototypeOf || function(object) {
+		return object.__proto__;
+	};
+	view.Blob.prototype = getPrototypeOf(new view.Blob());
+}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));
\ No newline at end of file
diff --git a/turtles/app/lib/FileSaver.js b/turtles/app/lib/FileSaver.js
new file mode 100644
index 000000000..11081a897
--- /dev/null
+++ b/turtles/app/lib/FileSaver.js
@@ -0,0 +1,253 @@
+/* FileSaver.js
+ * A saveAs() FileSaver implementation.
+ * 2015-05-07.2
+ *
+ * By Eli Grey, http://eligrey.com
+ * License: X11/MIT
+ *   See https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md
+ */
+
+/*global self */
+/*jslint bitwise: true, indent: 4, laxbreak: true, laxcomma: true, smarttabs: true, plusplus: true */
+
+/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
+
+var saveAs = saveAs || (function(view) {
+	"use strict";
+	// IE <10 is explicitly unsupported
+	if (typeof navigator !== "undefined" && /MSIE [1-9]\./.test(navigator.userAgent)) {
+		return;
+	}
+	var
+		  doc = view.document
+		  // only get URL when necessary in case Blob.js hasn't overridden it yet
+		, get_URL = function() {
+			return view.URL || view.webkitURL || view;
+		}
+		, save_link = doc.createElementNS("http://www.w3.org/1999/xhtml", "a")
+		, can_use_save_link = "download" in save_link
+		, click = function(node) {
+			var event = doc.createEvent("MouseEvents");
+			event.initMouseEvent(
+				"click", true, false, view, 0, 0, 0, 0, 0
+				, false, false, false, false, 0, null
+			);
+			node.dispatchEvent(event);
+		}
+		, webkit_req_fs = view.webkitRequestFileSystem
+		, req_fs = view.requestFileSystem || webkit_req_fs || view.mozRequestFileSystem
+		, throw_outside = function(ex) {
+			(view.setImmediate || view.setTimeout)(function() {
+				throw ex;
+			}, 0);
+		}
+		, force_saveable_type = "application/octet-stream"
+		, fs_min_size = 0
+		// See https://code.google.com/p/chromium/issues/detail?id=375297#c7 and
+		// https://github.com/eligrey/FileSaver.js/commit/485930a#commitcomment-8768047
+		// for the reasoning behind the timeout and revocation flow
+		, arbitrary_revoke_timeout = 500 // in ms
+		, revoke = function(file) {
+			var revoker = function() {
+				if (typeof file === "string") { // file is an object URL
+					get_URL().revokeObjectURL(file);
+				} else { // file is a File
+					file.remove();
+				}
+			};
+			if (view.chrome) {
+				revoker();
+			} else {
+				setTimeout(revoker, arbitrary_revoke_timeout);
+			}
+		}
+		, dispatch = function(filesaver, event_types, event) {
+			event_types = [].concat(event_types);
+			var i = event_types.length;
+			while (i--) {
+				var listener = filesaver["on" + event_types[i]];
+				if (typeof listener === "function") {
+					try {
+						listener.call(filesaver, event || filesaver);
+					} catch (ex) {
+						throw_outside(ex);
+					}
+				}
+			}
+		}
+		, auto_bom = function(blob) {
+			// prepend BOM for UTF-8 XML and text/* types (including HTML)
+			if (/^\s*(?:text\/\S*|application\/xml|\S*\/\S*\+xml)\s*;.*charset\s*=\s*utf-8/i.test(blob.type)) {
+				return new Blob(["\ufeff", blob], {type: blob.type});
+			}
+			return blob;
+		}
+		, FileSaver = function(blob, name) {
+			blob = auto_bom(blob);
+			// First try a.download, then web filesystem, then object URLs
+			var
+				  filesaver = this
+				, type = blob.type
+				, blob_changed = false
+				, object_url
+				, target_view
+				, dispatch_all = function() {
+					dispatch(filesaver, "writestart progress write writeend".split(" "));
+				}
+				// on any filesys errors revert to saving with object URLs
+				, fs_error = function() {
+					// don't create more object URLs than needed
+					if (blob_changed || !object_url) {
+						object_url = get_URL().createObjectURL(blob);
+					}
+					if (target_view) {
+						target_view.location.href = object_url;
+					} else {
+						var new_tab = view.open(object_url, "_blank");
+						if (new_tab == undefined && typeof safari !== "undefined") {
+							//Apple do not allow window.open, see http://bit.ly/1kZffRI
+							view.location.href = object_url
+						}
+					}
+					filesaver.readyState = filesaver.DONE;
+					dispatch_all();
+					revoke(object_url);
+				}
+				, abortable = function(func) {
+					return function() {
+						if (filesaver.readyState !== filesaver.DONE) {
+							return func.apply(this, arguments);
+						}
+					};
+				}
+				, create_if_not_found = {create: true, exclusive: false}
+				, slice
+			;
+			filesaver.readyState = filesaver.INIT;
+			if (!name) {
+				name = "download";
+			}
+			if (can_use_save_link) {
+				object_url = get_URL().createObjectURL(blob);
+				save_link.href = object_url;
+				save_link.download = name;
+				click(save_link);
+				filesaver.readyState = filesaver.DONE;
+				dispatch_all();
+				revoke(object_url);
+				return;
+			}
+			// Object and web filesystem URLs have a problem saving in Google Chrome when
+			// viewed in a tab, so I force save with application/octet-stream
+			// http://code.google.com/p/chromium/issues/detail?id=91158
+			// Update: Google errantly closed 91158, I submitted it again:
+			// https://code.google.com/p/chromium/issues/detail?id=389642
+			if (view.chrome && type && type !== force_saveable_type) {
+				slice = blob.slice || blob.webkitSlice;
+				blob = slice.call(blob, 0, blob.size, force_saveable_type);
+				blob_changed = true;
+			}
+			// Since I can't be sure that the guessed media type will trigger a download
+			// in WebKit, I append .download to the filename.
+			// https://bugs.webkit.org/show_bug.cgi?id=65440
+			if (webkit_req_fs && name !== "download") {
+				name += ".download";
+			}
+			if (type === force_saveable_type || webkit_req_fs) {
+				target_view = view;
+			}
+			if (!req_fs) {
+				fs_error();
+				return;
+			}
+			fs_min_size += blob.size;
+			req_fs(view.TEMPORARY, fs_min_size, abortable(function(fs) {
+				fs.root.getDirectory("saved", create_if_not_found, abortable(function(dir) {
+					var save = function() {
+						dir.getFile(name, create_if_not_found, abortable(function(file) {
+							file.createWriter(abortable(function(writer) {
+								writer.onwriteend = function(event) {
+									target_view.location.href = file.toURL();
+									filesaver.readyState = filesaver.DONE;
+									dispatch(filesaver, "writeend", event);
+									revoke(file);
+								};
+								writer.onerror = function() {
+									var error = writer.error;
+									if (error.code !== error.ABORT_ERR) {
+										fs_error();
+									}
+								};
+								"writestart progress write abort".split(" ").forEach(function(event) {
+									writer["on" + event] = filesaver["on" + event];
+								});
+								writer.write(blob);
+								filesaver.abort = function() {
+									writer.abort();
+									filesaver.readyState = filesaver.DONE;
+								};
+								filesaver.readyState = filesaver.WRITING;
+							}), fs_error);
+						}), fs_error);
+					};
+					dir.getFile(name, {create: false}, abortable(function(file) {
+						// delete file if it already exists
+						file.remove();
+						save();
+					}), abortable(function(ex) {
+						if (ex.code === ex.NOT_FOUND_ERR) {
+							save();
+						} else {
+							fs_error();
+						}
+					}));
+				}), fs_error);
+			}), fs_error);
+		}
+		, FS_proto = FileSaver.prototype
+		, saveAs = function(blob, name) {
+			return new FileSaver(blob, name);
+		}
+	;
+	// IE 10+ (native saveAs)
+	if (typeof navigator !== "undefined" && navigator.msSaveOrOpenBlob) {
+		return function(blob, name) {
+			return navigator.msSaveOrOpenBlob(auto_bom(blob), name);
+		};
+	}
+
+	FS_proto.abort = function() {
+		var filesaver = this;
+		filesaver.readyState = filesaver.DONE;
+		dispatch(filesaver, "abort");
+	};
+	FS_proto.readyState = FS_proto.INIT = 0;
+	FS_proto.WRITING = 1;
+	FS_proto.DONE = 2;
+
+	FS_proto.error =
+	FS_proto.onwritestart =
+	FS_proto.onprogress =
+	FS_proto.onwrite =
+	FS_proto.onabort =
+	FS_proto.onerror =
+	FS_proto.onwriteend =
+		null;
+
+	return saveAs;
+}(
+	   typeof self !== "undefined" && self
+	|| typeof window !== "undefined" && window
+	|| this.content
+));
+// `self` is undefined in Firefox for Android content script context
+// while `this` is nsIContentFrameMessageManager
+// with an attribute `content` that corresponds to the window
+
+if (typeof module !== "undefined" && module.exports) {
+  module.exports.saveAs = saveAs;
+} else if ((typeof define !== "undefined" && define !== null) && (define.amd != null)) {
+  define([], function() {
+    return saveAs;
+  });
+}
\ No newline at end of file
diff --git a/turtles/app/lib/angular-local-storage.min.js b/turtles/app/lib/angular-local-storage.min.js
new file mode 100644
index 000000000..462dd62bd
--- /dev/null
+++ b/turtles/app/lib/angular-local-storage.min.js
@@ -0,0 +1,7 @@
+/**
+ * An Angular module that gives you access to the browsers local storage
+ * @version v0.2.0 - 2015-05-10
+ * @link https://github.com/grevory/angular-local-storage
+ * @author grevory <greg@gregpike.ca>
+ * @license MIT License, http://www.opensource.org/licenses/MIT
+ */!function(a,b,c){"use strict";function d(a){return/^-?\d+\.?\d*$/.test(a.replace(/["']/g,""))}var e=b.isDefined,f=b.isUndefined,g=b.isNumber,h=b.isObject,i=b.isArray,j=b.extend,k=b.toJson,l=b.module("LocalStorageModule",[]);l.provider("localStorageService",function(){this.prefix="ls",this.storageType="localStorage",this.cookie={expiry:30,path:"/"},this.notify={setItem:!0,removeItem:!1},this.setPrefix=function(a){return this.prefix=a,this},this.setStorageType=function(a){return this.storageType=a,this},this.setStorageCookie=function(a,b){return this.cookie.expiry=a,this.cookie.path=b,this},this.setStorageCookieDomain=function(a){return this.cookie.domain=a,this},this.setNotify=function(a,b){return this.notify={setItem:a,removeItem:b},this},this.$get=["$rootScope","$window","$document","$parse",function(a,b,c,l){function m(a,b){return"true"===b||"false"===b?"true"===b:b}var n,o=this,p=o.prefix,q=o.cookie,r=o.notify,s=o.storageType;c?c[0]&&(c=c[0]):c=document,"."!==p.substr(-1)&&(p=p?p+".":"");var t=function(a){return p+a},u=function(){try{var c=s in b&&null!==b[s],d=t("__"+Math.round(1e7*Math.random()));return c&&(n=b[s],n.setItem(d,""),n.removeItem(d)),c}catch(e){return s="cookie",a.$broadcast("LocalStorageModule.notification.error",e.message),!1}}(),v=function(b,c){if(f(c)?c=null:(h(c)||i(c)||g(+c||c))&&(c=k(c)),!u||"cookie"===o.storageType)return u||a.$broadcast("LocalStorageModule.notification.warning","LOCAL_STORAGE_NOT_SUPPORTED"),r.setItem&&a.$broadcast("LocalStorageModule.notification.setitem",{key:b,newvalue:c,storageType:"cookie"}),B(b,c);try{n&&n.setItem(t(b),c),r.setItem&&a.$broadcast("LocalStorageModule.notification.setitem",{key:b,newvalue:c,storageType:o.storageType})}catch(d){return a.$broadcast("LocalStorageModule.notification.error",d.message),B(b,c)}return!0},w=function(b){if(!u||"cookie"===o.storageType)return u||a.$broadcast("LocalStorageModule.notification.warning","LOCAL_STORAGE_NOT_SUPPORTED"),C(b);var c=n?n.getItem(t(b)):null;return c&&"null"!==c?"{"===c.charAt(0)||"["===c.charAt(0)||d(c)?JSON.parse(c,m):c:null},x=function(){var b,c;for(b=0;b<arguments.length;b++)if(c=arguments[b],u&&"cookie"!==o.storageType)try{n.removeItem(t(c)),r.removeItem&&a.$broadcast("LocalStorageModule.notification.removeitem",{key:c,storageType:o.storageType})}catch(d){a.$broadcast("LocalStorageModule.notification.error",d.message),D(c)}else u||a.$broadcast("LocalStorageModule.notification.warning","LOCAL_STORAGE_NOT_SUPPORTED"),r.removeItem&&a.$broadcast("LocalStorageModule.notification.removeitem",{key:c,storageType:"cookie"}),D(c)},y=function(){if(!u)return a.$broadcast("LocalStorageModule.notification.warning","LOCAL_STORAGE_NOT_SUPPORTED"),!1;var b=p.length,c=[];for(var d in n)if(d.substr(0,b)===p)try{c.push(d.substr(b))}catch(e){return a.$broadcast("LocalStorageModule.notification.error",e.Description),[]}return c},z=function(b){var c=p?new RegExp("^"+p):new RegExp,d=b?new RegExp(b):new RegExp;if(!u||"cookie"===o.storageType)return u||a.$broadcast("LocalStorageModule.notification.warning","LOCAL_STORAGE_NOT_SUPPORTED"),E();var e=p.length;for(var f in n)if(c.test(f)&&d.test(f.substr(e)))try{x(f.substr(e))}catch(g){return a.$broadcast("LocalStorageModule.notification.error",g.message),E()}return!0},A=function(){try{return b.navigator.cookieEnabled||"cookie"in c&&(c.cookie.length>0||(c.cookie="test").indexOf.call(c.cookie,"test")>-1)}catch(d){return a.$broadcast("LocalStorageModule.notification.error",d.message),!1}}(),B=function(b,d,e){if(f(d))return!1;if((i(d)||h(d))&&(d=k(d)),!A)return a.$broadcast("LocalStorageModule.notification.error","COOKIES_NOT_SUPPORTED"),!1;try{var j="",l=new Date,m="";if(null===d?(l.setTime(l.getTime()+-864e5),j="; expires="+l.toGMTString(),d=""):g(e)&&0!==e?(l.setTime(l.getTime()+24*e*60*60*1e3),j="; expires="+l.toGMTString()):0!==q.expiry&&(l.setTime(l.getTime()+24*q.expiry*60*60*1e3),j="; expires="+l.toGMTString()),b){var n="; path="+q.path;q.domain&&(m="; domain="+q.domain),c.cookie=t(b)+"="+encodeURIComponent(d)+j+n+m}}catch(o){return a.$broadcast("LocalStorageModule.notification.error",o.message),!1}return!0},C=function(b){if(!A)return a.$broadcast("LocalStorageModule.notification.error","COOKIES_NOT_SUPPORTED"),!1;for(var d=c.cookie&&c.cookie.split(";")||[],e=0;e<d.length;e++){for(var f=d[e];" "===f.charAt(0);)f=f.substring(1,f.length);if(0===f.indexOf(t(b)+"=")){var g=decodeURIComponent(f.substring(p.length+b.length+1,f.length));try{return JSON.parse(g,m)}catch(h){return g}}}return null},D=function(a){B(a,null)},E=function(){for(var a=null,b=p.length,d=c.cookie.split(";"),e=0;e<d.length;e++){for(a=d[e];" "===a.charAt(0);)a=a.substring(1,a.length);var f=a.substring(b,a.indexOf("="));D(f)}},F=function(){return s},G=function(a,b,c,d){d=d||b;var f=w(d);return null===f&&e(c)?f=c:h(f)&&h(c)&&(f=j(c,f)),l(b).assign(a,f),a.$watch(b,function(a){v(d,a)},h(a[b]))},H=function(){for(var a=0,c=b[s],d=0;d<c.length;d++)0===c.key(d).indexOf(p)&&a++;return a};return{isSupported:u,getStorageType:F,set:v,add:v,get:w,keys:y,remove:x,clearAll:z,bind:G,deriveKey:t,length:H,cookie:{isSupported:A,set:B,add:B,get:C,remove:D,clearAll:E}}}]})}(window,window.angular);
\ No newline at end of file
diff --git a/turtles/app/lib/angular-polyglot.language.switcher.js b/turtles/app/lib/angular-polyglot.language.switcher.js
new file mode 100644
index 000000000..69a6a0e18
--- /dev/null
+++ b/turtles/app/lib/angular-polyglot.language.switcher.js
@@ -0,0 +1,161 @@
+/*! Polyglot Language Switcher 2 - v1.0.0 - 2015-02-20
+ * https://github.com/ixtendo/Polyglot-Language-Switcher-2/
+ *
+ * Copyright (c) 2015 Ixtendo;
+ * Licensed under the MIT license */
+
+angular.module('polyglotLanguageSwitcher', [])
+    .directive('pls', ['$document', '$timeout', function ($document, $timeout) {
+        return {
+            restrict: 'E',
+            replace: true,
+            scope: {
+                items: '=',
+                id: '@',
+                hoverTimeout: '@',
+                openMode: '@',
+                gridColumns: '@',
+                showFlag: '@',
+                selectedLang: '@'
+            },
+            controller: ['$scope', function ($scope) {
+                var selectedLang = $scope.selectedLang;
+                var columns = Math.round($scope.items.length / parseInt($scope.gridColumns));
+                var hoverTimeout = $scope.hoverTimeout;
+                if (!hoverTimeout) {
+                    hoverTimeout = 200;
+                }
+
+                var hoverTimeoutPromise = null;
+                var documentClickHandler = function () {
+                    closePopup();
+                    $scope.$apply();
+                };
+                var documentKeyHandler = function (evt) {
+                    if (evt.keyCode === 27) {
+                        closePopup();
+                        $scope.$apply();
+                    }
+                };
+
+                var prepareModel = function () {
+                    $scope.model = {
+                        opened: false,
+                        selectedLang: null,
+                        showFlag: ($scope.showFlag === 'true'),
+                        columns: []
+                    };
+
+                    var column = [];
+                    var i = 1;
+                    angular.forEach($scope.items, function (item) {
+                        item.selected = false;
+                        if (!$scope.model.selectedLang && item.id === selectedLang) {
+                            item.selected = true;
+                            $scope.model.selectedLang = item;
+                        }
+                        column.push(item);
+                        if (i % columns === 0) {
+                            $scope.model.columns.push(column);
+                            column = [];
+                        }
+                        i++;
+                    });
+                    if (column.length > 0) {
+                        $scope.model.columns.push(column);
+                        column = null;
+                    }
+                    if (!$scope.model.selectedLang) {
+                        $scope.model.selectedLang = $scope.items[0];
+                        $scope.items[0].selected = true;
+                    }
+                };
+
+                var openPopup = function () {
+                    if (!$scope.model.opened) {
+                        $scope.$emit('pls.popupOpening', {id: $scope.id});
+                        $scope.model.opened = true;
+                        $document.on('click', documentClickHandler);
+                        $document.on('keydown', documentKeyHandler);
+                        $scope.$emit('pls.popupOpened', {id: $scope.id});
+                    }
+                    return false;
+                };
+
+                var closePopup = function () {
+                    if ($scope.model.opened) {
+                        $scope.$emit('pls.popupClosing', {id: $scope.id});
+                        $document.off('click', documentClickHandler);
+                        $document.off('keydown', documentKeyHandler);
+                        $scope.model.opened = false;
+                        $scope.$emit('pls.popupClosed', {id: $scope.id});
+                    }
+                    return false;
+                };
+
+                $scope.onMouseEnterOrLeave = function (mouseEnter) {
+                    if (mouseEnter) {
+                        if (hoverTimeoutPromise) {
+                            $timeout.cancel(hoverTimeoutPromise);
+                            hoverTimeoutPromise = null;
+                        }
+                        openPopup();
+                    } else {
+                        if (!hoverTimeoutPromise) {
+                            hoverTimeoutPromise = $timeout(function () {
+                                closePopup();
+                            }, hoverTimeout);
+                        }
+                    }
+                    return false;
+                };
+
+                $scope.onClick = function (evt) {
+                    evt.stopPropagation();
+                    if (!$scope.model.opened) {
+                        openPopup();
+                    } else {
+                        closePopup();
+                    }
+                    return false;
+                };
+
+                $scope.onLanguageChanged = function (evt, selectedLang) {
+                    evt.stopPropagation();
+                    closePopup();
+                    angular.forEach($scope.items, function (item) {
+                        item.selected = false;
+                    });
+                    selectedLang.selected = true;
+                    $scope.model.selectedLang = selectedLang;
+                    $scope.$emit('pls.onLanguageChanged', {
+                        id: $scope.id,
+                        lang: angular.copy(selectedLang)
+                    });
+                    return false;
+                };
+
+                prepareModel();
+            }],
+            template: function (context, $scope) {
+                var template = '<div class="polyglot-language-switcher ng-polyglot-language-switcher">';
+                if ($scope.openMode === 'hover') {
+                    template += '<a class="pls-selected-locale" href="#" data-ng-mouseenter="onMouseEnterOrLeave(true)" data-ng-mouseleave="onMouseEnterOrLeave(false)"><img data-ng-if="model.showFlag" data-ng-src="{{model.selectedLang.flagImg}}" alt="{{model.selectedLang.flagTitle}}"> {{model.selectedLang.name}}</a>' +
+                    '<div class="pls-language-container-scrollable" data-ng-show="model.opened" data-ng-mouseenter="onMouseEnterOrLeave(true)" data-ng-mouseleave="onMouseEnterOrLeave(false)">';
+                } else if ($scope.openMode === 'click') {
+                    template += '<a class="pls-selected-locale" href="#" data-ng-click="onClick($event)"><img data-ng-if="model.showFlag" data-ng-src="{{model.selectedLang.flagImg}}" alt="{{model.selectedLang.flagTitle}}"> {{model.selectedLang.name}}</a>' +
+                    '<div class="pls-language-container-scrollable" data-ng-show="model.opened">';
+                }
+                template += '<table class="pls-language-container"><tbody><tr>' +
+                '<td data-ng-repeat="column in model.columns"><ul>' +
+                '<li data-ng-repeat="item in column">' +
+                '<a href="#" title="{{item.title}}" data-ng-click="onLanguageChanged($event, item)" data-ng-class="item.selected? \'pls-selected-locale\':\'\'"><img data-ng-if="model.showFlag" data-ng-src="{{item.flagImg}}" alt="{{item.flagTitle}}"> {{item.name}}</a>' +
+                '</li>' +
+                '</ul></td>' +
+                '</tr></tbody></table>' +
+                '</div>' +
+                '</div>';
+                return template;
+            }
+        };
+    }]);
\ No newline at end of file
diff --git a/turtles/app/lib/angular-timer.min.js b/turtles/app/lib/angular-timer.min.js
new file mode 100644
index 000000000..f1d9b2af0
--- /dev/null
+++ b/turtles/app/lib/angular-timer.min.js
@@ -0,0 +1,8 @@
+/**
+ * angular-timer - v1.3.1 - 2015-03-30 1:00 PM
+ * https://github.com/siddii/angular-timer
+ *
+ * Copyright (c) 2015 Siddique Hameed
+ * Licensed MIT <https://github.com/siddii/angular-timer/blob/master/LICENSE.txt>
+ */
+var timerModule=angular.module("timer",[]).directive("timer",["$compile",function(a){return{restrict:"EA",replace:!1,scope:{interval:"=interval",startTimeAttr:"=startTime",endTimeAttr:"=endTime",countdownattr:"=countdown",finishCallback:"&finishCallback",autoStart:"&autoStart",language:"@?",maxTimeUnit:"="},controller:["$scope","$element","$attrs","$timeout","I18nService","$interpolate","progressBarService",function(b,c,d,e,f,g,h){function i(){b.timeoutId&&clearTimeout(b.timeoutId)}function j(){var a={};void 0!==d.startTime&&(b.millis=moment().diff(moment(b.startTimeAttr))),a=k.getTimeUnits(b.millis),b.maxTimeUnit&&"day"!==b.maxTimeUnit?"second"===b.maxTimeUnit?(b.seconds=Math.floor(b.millis/1e3),b.minutes=0,b.hours=0,b.days=0,b.months=0,b.years=0):"minute"===b.maxTimeUnit?(b.seconds=Math.floor(b.millis/1e3%60),b.minutes=Math.floor(b.millis/6e4),b.hours=0,b.days=0,b.months=0,b.years=0):"hour"===b.maxTimeUnit?(b.seconds=Math.floor(b.millis/1e3%60),b.minutes=Math.floor(b.millis/6e4%60),b.hours=Math.floor(b.millis/36e5),b.days=0,b.months=0,b.years=0):"month"===b.maxTimeUnit?(b.seconds=Math.floor(b.millis/1e3%60),b.minutes=Math.floor(b.millis/6e4%60),b.hours=Math.floor(b.millis/36e5%24),b.days=Math.floor(b.millis/36e5/24%30),b.months=Math.floor(b.millis/36e5/24/30),b.years=0):"year"===b.maxTimeUnit&&(b.seconds=Math.floor(b.millis/1e3%60),b.minutes=Math.floor(b.millis/6e4%60),b.hours=Math.floor(b.millis/36e5%24),b.days=Math.floor(b.millis/36e5/24%30),b.months=Math.floor(b.millis/36e5/24/30%12),b.years=Math.floor(b.millis/36e5/24/365)):(b.seconds=Math.floor(b.millis/1e3%60),b.minutes=Math.floor(b.millis/6e4%60),b.hours=Math.floor(b.millis/36e5%24),b.days=Math.floor(b.millis/36e5/24),b.months=0,b.years=0),b.secondsS=1===b.seconds?"":"s",b.minutesS=1===b.minutes?"":"s",b.hoursS=1===b.hours?"":"s",b.daysS=1===b.days?"":"s",b.monthsS=1===b.months?"":"s",b.yearsS=1===b.years?"":"s",b.secondUnit=a.seconds,b.minuteUnit=a.minutes,b.hourUnit=a.hours,b.dayUnit=a.days,b.monthUnit=a.months,b.yearUnit=a.years,b.sseconds=b.seconds<10?"0"+b.seconds:b.seconds,b.mminutes=b.minutes<10?"0"+b.minutes:b.minutes,b.hhours=b.hours<10?"0"+b.hours:b.hours,b.ddays=b.days<10?"0"+b.days:b.days,b.mmonths=b.months<10?"0"+b.months:b.months,b.yyears=b.years<10?"0"+b.years:b.years}"function"!=typeof String.prototype.trim&&(String.prototype.trim=function(){return this.replace(/^\s+|\s+$/g,"")}),b.autoStart=d.autoStart||d.autostart,b.language=b.language||"en",b.$watch("language",function(){k.init(b.language)});var k=new f;k.init(b.language),b.displayProgressBar=0,b.displayProgressActive="active",c.append(0===c.html().trim().length?a("<span>"+g.startSymbol()+"millis"+g.endSymbol()+"</span>")(b):a(c.contents())(b)),b.startTime=null,b.endTime=null,b.timeoutId=null,b.countdown=b.countdownattr&&parseInt(b.countdownattr,10)>=0?parseInt(b.countdownattr,10):void 0,b.isRunning=!1,b.$on("timer-start",function(){b.start()}),b.$on("timer-resume",function(){b.resume()}),b.$on("timer-stop",function(){b.stop()}),b.$on("timer-clear",function(){b.clear()}),b.$on("timer-reset",function(){b.reset()}),b.$on("timer-set-countdown",function(a,c){b.countdown=c}),b.$watch("startTimeAttr",function(a,c){a!==c&&b.isRunning&&b.start()}),b.start=c[0].start=function(){b.startTime=b.startTimeAttr?moment(b.startTimeAttr):moment(),b.endTime=b.endTimeAttr?moment(b.endTimeAttr):null,b.countdown||(b.countdown=b.countdownattr&&parseInt(b.countdownattr,10)>0?parseInt(b.countdownattr,10):void 0),i(),l(),b.isRunning=!0},b.resume=c[0].resume=function(){i(),b.countdownattr&&(b.countdown+=1),b.startTime=moment().diff(moment(b.stoppedTime).diff(moment(b.startTime))),l(),b.isRunning=!0},b.stop=b.pause=c[0].stop=c[0].pause=function(){var a=b.timeoutId;b.clear(),b.$emit("timer-stopped",{timeoutId:a,millis:b.millis,seconds:b.seconds,minutes:b.minutes,hours:b.hours,days:b.days})},b.clear=c[0].clear=function(){b.stoppedTime=moment(),i(),b.timeoutId=null,b.isRunning=!1},b.reset=c[0].reset=function(){b.startTime=b.startTimeAttr?moment(b.startTimeAttr):moment(),b.endTime=b.endTimeAttr?moment(b.endTimeAttr):null,b.countdown=b.countdownattr&&parseInt(b.countdownattr,10)>0?parseInt(b.countdownattr,10):void 0,i(),l(),b.isRunning=!1,b.clear()},c.bind("$destroy",function(){i(),b.isRunning=!1}),b.countdownattr?(b.millis=1e3*b.countdownattr,b.addCDSeconds=c[0].addCDSeconds=function(a){b.countdown+=a,b.$digest(),b.isRunning||b.start()},b.$on("timer-add-cd-seconds",function(a,c){e(function(){b.addCDSeconds(c)})}),b.$on("timer-set-countdown-seconds",function(a,c){b.isRunning||b.clear(),b.countdown=c,b.millis=1e3*c,j()})):b.millis=0,j();var l=function m(){var a=null;b.millis=moment().diff(b.startTime);var c=b.millis%1e3;return b.endTimeAttr&&(a=b.endTimeAttr,b.millis=moment(b.endTime).diff(moment()),c=b.interval-b.millis%1e3),b.countdownattr&&(a=b.countdownattr,b.millis=1e3*b.countdown),b.millis<0?(b.stop(),b.millis=0,j(),void(b.finishCallback&&b.$eval(b.finishCallback))):(j(),b.timeoutId=setTimeout(function(){m(),b.$digest()},b.interval-c),b.$emit("timer-tick",{timeoutId:b.timeoutId,millis:b.millis}),b.countdown>0?b.countdown--:b.countdown<=0&&(b.stop(),b.finishCallback&&b.$eval(b.finishCallback)),void(null!==a&&(b.progressBar=h.calculateProgressBar(b.startTime,b.millis,b.endTime,b.countdownattr),100===b.progressBar&&(b.displayProgressActive=""))))};(void 0===b.autoStart||b.autoStart===!0)&&b.start()}]}}]);"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports=timerModule);var app=angular.module("timer");app.factory("I18nService",function(){var a=function(){};return a.prototype.language="en",a.prototype.timeHumanizer={},a.prototype.init=function(a){this.language=a,moment.locale(this.language),this.timeHumanizer=humanizeDuration.humanizer({language:this.language,halfUnit:!1})},a.prototype.getTimeUnits=function(a){var b=1e3*Math.round(a/1e3),c={};return"undefined"!=typeof this.timeHumanizer?c={millis:this.timeHumanizer(b,{units:["milliseconds"]}),seconds:this.timeHumanizer(b,{units:["seconds"]}),minutes:this.timeHumanizer(b,{units:["minutes","seconds"]}),hours:this.timeHumanizer(b,{units:["hours","minutes","seconds"]}),days:this.timeHumanizer(b,{units:["days","hours","minutes","seconds"]}),months:this.timeHumanizer(b,{units:["months","days","hours","minutes","seconds"]}),years:this.timeHumanizer(b,{units:["years","months","days","hours","minutes","seconds"]})}:console.error('i18nService has not been initialized. You must call i18nService.init("en") for example'),c},a});var app=angular.module("timer");app.factory("progressBarService",function(){var a=function(){};return a.prototype.calculateProgressBar=function(a,b,c,d){var e,f,g=0;return b/=1e3,null!==c?(e=moment(c),f=e.diff(a,"seconds"),g=100*b/f):g=100*b/d,g=100-g,g=Math.round(10*g)/10,g>100&&(g=100),g},new a});
\ No newline at end of file
diff --git a/turtles/app/lib/angular-translate.min.js b/turtles/app/lib/angular-translate.min.js
new file mode 100644
index 000000000..f1104f5e2
--- /dev/null
+++ b/turtles/app/lib/angular-translate.min.js
@@ -0,0 +1,6 @@
+/*!
+ * angular-translate - v2.7.0 - 2015-05-02
+ * http://github.com/angular-translate/angular-translate
+ * Copyright (c) 2015 ; Licensed MIT
+ */
+!function(a,b){"function"==typeof define&&define.amd?define([],function(){return b()}):"object"==typeof exports?module.exports=b():b()}(this,function(){function a(a){"use strict";var b=a.storageKey(),c=a.storage(),d=function(){var d=a.preferredLanguage();angular.isString(d)?a.use(d):c.put(b,a.use())};d.displayName="fallbackFromIncorrectStorageValue",c?c.get(b)?a.use(c.get(b))["catch"](d):d():angular.isString(a.preferredLanguage())&&a.use(a.preferredLanguage())}function b(){"use strict";var a,b,c=null,d=!1,e=!1;b={sanitize:function(a,b){return"text"===b&&(a=g(a)),a},escape:function(a,b){return"text"===b&&(a=f(a)),a},sanitizeParameters:function(a,b){return"params"===b&&(a=h(a,g)),a},escapeParameters:function(a,b){return"params"===b&&(a=h(a,f)),a}},b.escaped=b.escapeParameters,this.addStrategy=function(a,c){return b[a]=c,this},this.removeStrategy=function(a){return delete b[a],this},this.useStrategy=function(a){return d=!0,c=a,this},this.$get=["$injector","$log",function(f,g){var h=function(a,c,d){return angular.forEach(d,function(d){if(angular.isFunction(d))a=d(a,c);else{if(!angular.isFunction(b[d]))throw new Error("pascalprecht.translate.$translateSanitization: Unknown sanitization strategy: '"+d+"'");a=b[d](a,c)}}),a},i=function(){d||e||(g.warn("pascalprecht.translate.$translateSanitization: No sanitization strategy has been configured. This can have serious security implications. See http://angular-translate.github.io/docs/#/guide/19_security for details."),e=!0)};return f.has("$sanitize")&&(a=f.get("$sanitize")),{useStrategy:function(a){return function(b){a.useStrategy(b)}}(this),sanitize:function(a,b,d){if(c||i(),arguments.length<3&&(d=c),!d)return a;var e=angular.isArray(d)?d:[d];return h(a,b,e)}}}];var f=function(a){return angular.element("<div></div>").text(a).html()},g=function(b){if(!a)throw new Error("pascalprecht.translate.$translateSanitization: Error cannot find $sanitize service. Either include the ngSanitize module (https://docs.angularjs.org/api/ngSanitize) or use a sanitization strategy which does not depend on $sanitize, such as 'escape'.");return a(b)},h=function(a,b){if(angular.isObject(a)){var c=angular.isArray(a)?[]:{};return angular.forEach(a,function(a,d){c[d]=h(a,b)}),c}return angular.isNumber(a)?a:b(a)}}function c(a,b,c,d){"use strict";var e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t={},u=[],v=a,w=[],x="translate-cloak",y=!1,z=".",A=0,B=!0,C="default",D={"default":function(a){return(a||"").split("-").join("_")},java:function(a){var b=(a||"").split("-").join("_"),c=b.split("_");return c.length>1?c[0].toLowerCase()+"_"+c[1].toUpperCase():b},bcp47:function(a){var b=(a||"").split("_").join("-"),c=b.split("-");return c.length>1?c[0].toLowerCase()+"-"+c[1].toUpperCase():b}},E="2.7.0",F=function(){if(angular.isFunction(d.getLocale))return d.getLocale();var a,c,e=b.$get().navigator,f=["language","browserLanguage","systemLanguage","userLanguage"];if(angular.isArray(e.languages))for(a=0;a<e.languages.length;a++)if(c=e.languages[a],c&&c.length)return c;for(a=0;a<f.length;a++)if(c=e[f[a]],c&&c.length)return c;return null};F.displayName="angular-translate/service: getFirstBrowserLanguage";var G=function(){var a=F()||"";return D[C]&&(a=D[C](a)),a};G.displayName="angular-translate/service: getLocale";var H=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},I=function(){return this.replace(/^\s+|\s+$/g,"")},J=function(a){for(var b=[],c=angular.lowercase(a),d=0,e=u.length;e>d;d++)b.push(angular.lowercase(u[d]));if(H(b,c)>-1)return a;if(f){var g;for(var h in f){var i=!1,j=Object.prototype.hasOwnProperty.call(f,h)&&angular.lowercase(h)===angular.lowercase(a);if("*"===h.slice(-1)&&(i=h.slice(0,-1)===a.slice(0,h.length-1)),(j||i)&&(g=f[h],H(b,angular.lowercase(g))>-1))return g}}if(a){var k=a.split("_");if(k.length>1&&H(b,angular.lowercase(k[0]))>-1)return k[0]}return a},K=function(a,b){if(!a&&!b)return t;if(a&&!b){if(angular.isString(a))return t[a]}else angular.isObject(t[a])||(t[a]={}),angular.extend(t[a],L(b));return this};this.translations=K,this.cloakClassName=function(a){return a?(x=a,this):x};var L=function(a,b,c,d){var e,f,g,h;b||(b=[]),c||(c={});for(e in a)Object.prototype.hasOwnProperty.call(a,e)&&(h=a[e],angular.isObject(h)?L(h,b.concat(e),c,e):(f=b.length?""+b.join(z)+z+e:e,b.length&&e===d&&(g=""+b.join(z),c[g]="@:"+f),c[f]=h));return c};L.displayName="flatObject",this.addInterpolation=function(a){return w.push(a),this},this.useMessageFormatInterpolation=function(){return this.useInterpolation("$translateMessageFormatInterpolation")},this.useInterpolation=function(a){return n=a,this},this.useSanitizeValueStrategy=function(a){return c.useStrategy(a),this},this.preferredLanguage=function(a){return M(a),this};var M=function(a){return a&&(e=a),e};this.translationNotFoundIndicator=function(a){return this.translationNotFoundIndicatorLeft(a),this.translationNotFoundIndicatorRight(a),this},this.translationNotFoundIndicatorLeft=function(a){return a?(q=a,this):q},this.translationNotFoundIndicatorRight=function(a){return a?(r=a,this):r},this.fallbackLanguage=function(a){return N(a),this};var N=function(a){return a?(angular.isString(a)?(h=!0,g=[a]):angular.isArray(a)&&(h=!1,g=a),angular.isString(e)&&H(g,e)<0&&g.push(e),this):h?g[0]:g};this.use=function(a){if(a){if(!t[a]&&!o)throw new Error("$translateProvider couldn't find translationTable for langKey: '"+a+"'");return i=a,this}return i};var O=function(a){return a?void(v=a):l?l+v:v};this.storageKey=O,this.useUrlLoader=function(a,b){return this.useLoader("$translateUrlLoader",angular.extend({url:a},b))},this.useStaticFilesLoader=function(a){return this.useLoader("$translateStaticFilesLoader",a)},this.useLoader=function(a,b){return o=a,p=b||{},this},this.useLocalStorage=function(){return this.useStorage("$translateLocalStorage")},this.useCookieStorage=function(){return this.useStorage("$translateCookieStorage")},this.useStorage=function(a){return k=a,this},this.storagePrefix=function(a){return a?(l=a,this):a},this.useMissingTranslationHandlerLog=function(){return this.useMissingTranslationHandler("$translateMissingTranslationHandlerLog")},this.useMissingTranslationHandler=function(a){return m=a,this},this.usePostCompiling=function(a){return y=!!a,this},this.uniformLanguageTag=function(a){return a?angular.isString(a)&&(a={standard:a}):a={},C=a.standard,this},this.determinePreferredLanguage=function(a){var b=a&&angular.isFunction(a)?a():G();return e=u.length?J(b):b,this},this.registerAvailableLanguageKeys=function(a,b){return a?(u=a,b&&(f=b),this):u},this.useLoaderCache=function(a){return a===!1?s=void 0:a===!0?s=!0:"undefined"==typeof a?s="$translationCache":a&&(s=a),this},this.directivePriority=function(a){return void 0===a?A:(A=a,this)},this.statefulFilter=function(a){return void 0===a?B:(B=a,this)},this.$get=["$log","$injector","$rootScope","$q",function(a,b,c,d){var f,l,u,z=b.get(n||"$translateDefaultInterpolation"),C=!1,D={},F={},G=function(a,b,c,h){if(angular.isArray(a)){var j=function(a){for(var e={},f=[],g=function(a){var f=d.defer(),g=function(b){e[a]=b,f.resolve([a,b])};return G(a,b,c,h).then(g,g),f.promise},i=0,j=a.length;j>i;i++)f.push(g(a[i]));return d.all(f).then(function(){return e})};return j(a)}var m=d.defer();a&&(a=I.apply(a));var n=function(){var a=e?F[e]:F[i];if(l=0,k&&!a){var b=f.get(v);if(a=F[b],g&&g.length){var c=H(g,b);l=0===c?1:0,H(g,e)<0&&g.push(e)}}return a}();if(n){var o=function(){_(a,b,c,h).then(m.resolve,m.reject)};o.displayName="promiseResolved",n["finally"](o,m.reject)}else _(a,b,c,h).then(m.resolve,m.reject);return m.promise},P=function(a){return q&&(a=[q,a].join(" ")),r&&(a=[a,r].join(" ")),a},Q=function(a){i=a,c.$emit("$translateChangeSuccess",{language:a}),k&&f.put(G.storageKey(),i),z.setLocale(i);var b=function(a,b){D[b].setLocale(i)};b.displayName="eachInterpolatorLocaleSetter",angular.forEach(D,b),c.$emit("$translateChangeEnd",{language:a})},R=function(a){if(!a)throw"No language key specified for loading.";var e=d.defer();c.$emit("$translateLoadingStart",{language:a}),C=!0;var f=s;"string"==typeof f&&(f=b.get(f));var g=angular.extend({},p,{key:a,$http:angular.extend({},{cache:f},p.$http)}),h=function(b){var d={};c.$emit("$translateLoadingSuccess",{language:a}),angular.isArray(b)?angular.forEach(b,function(a){angular.extend(d,L(a))}):angular.extend(d,L(b)),C=!1,e.resolve({key:a,table:d}),c.$emit("$translateLoadingEnd",{language:a})};h.displayName="onLoaderSuccess";var i=function(a){c.$emit("$translateLoadingError",{language:a}),e.reject(a),c.$emit("$translateLoadingEnd",{language:a})};return i.displayName="onLoaderError",b.get(o)(g).then(h,i),e.promise};if(k&&(f=b.get(k),!f.get||!f.put))throw new Error("Couldn't use storage '"+k+"', missing get() or put() method!");if(w.length){var S=function(a){var c=b.get(a);c.setLocale(e||i),D[c.getInterpolationIdentifier()]=c};S.displayName="interpolationFactoryAdder",angular.forEach(w,S)}var T=function(a){var b=d.defer();if(Object.prototype.hasOwnProperty.call(t,a))b.resolve(t[a]);else if(F[a]){var c=function(a){K(a.key,a.table),b.resolve(a.table)};c.displayName="translationTableResolver",F[a].then(c,b.reject)}else b.reject();return b.promise},U=function(a,b,c,e){var f=d.defer(),g=function(d){if(Object.prototype.hasOwnProperty.call(d,b)){e.setLocale(a);var g=d[b];"@:"===g.substr(0,2)?U(a,g.substr(2),c,e).then(f.resolve,f.reject):f.resolve(e.interpolate(d[b],c)),e.setLocale(i)}else f.reject()};return g.displayName="fallbackTranslationResolver",T(a).then(g,f.reject),f.promise},V=function(a,b,c,d){var e,f=t[a];if(f&&Object.prototype.hasOwnProperty.call(f,b)){if(d.setLocale(a),e=d.interpolate(f[b],c),"@:"===e.substr(0,2))return V(a,e.substr(2),c,d);d.setLocale(i)}return e},W=function(a,c){if(m){var d=b.get(m)(a,i,c);return void 0!==d?d:a}return a},X=function(a,b,c,e,f){var h=d.defer();if(a<g.length){var i=g[a];U(i,b,c,e).then(h.resolve,function(){X(a+1,b,c,e,f).then(h.resolve)})}else h.resolve(f?f:W(b,c));return h.promise},Y=function(a,b,c,d){var e;if(a<g.length){var f=g[a];e=V(f,b,c,d),e||(e=Y(a+1,b,c,d))}return e},Z=function(a,b,c,d){return X(u>0?u:l,a,b,c,d)},$=function(a,b,c){return Y(u>0?u:l,a,b,c)},_=function(a,b,c,e){var f=d.defer(),h=i?t[i]:t,j=c?D[c]:z;if(h&&Object.prototype.hasOwnProperty.call(h,a)){var k=h[a];"@:"===k.substr(0,2)?G(k.substr(2),b,c,e).then(f.resolve,f.reject):f.resolve(j.interpolate(k,b))}else{var l;m&&!C&&(l=W(a,b)),i&&g&&g.length?Z(a,b,j,e).then(function(a){f.resolve(a)},function(a){f.reject(P(a))}):m&&!C&&l?f.resolve(e?e:l):e?f.resolve(e):f.reject(P(a))}return f.promise},ab=function(a,b,c){var d,e=i?t[i]:t,f=z;if(D&&Object.prototype.hasOwnProperty.call(D,c)&&(f=D[c]),e&&Object.prototype.hasOwnProperty.call(e,a)){var h=e[a];d="@:"===h.substr(0,2)?ab(h.substr(2),b,c):f.interpolate(h,b)}else{var j;m&&!C&&(j=W(a,b)),i&&g&&g.length?(l=0,d=$(a,b,f)):d=m&&!C&&j?j:P(a)}return d},bb=function(a){j===a&&(j=void 0),F[a]=void 0};if(G.preferredLanguage=function(a){return a&&M(a),e},G.cloakClassName=function(){return x},G.fallbackLanguage=function(a){if(void 0!==a&&null!==a){if(N(a),o&&g&&g.length)for(var b=0,c=g.length;c>b;b++)F[g[b]]||(F[g[b]]=R(g[b]));G.use(G.use())}return h?g[0]:g},G.useFallbackLanguage=function(a){if(void 0!==a&&null!==a)if(a){var b=H(g,a);b>-1&&(u=b)}else u=0},G.proposedLanguage=function(){return j},G.storage=function(){return f},G.use=function(a){if(!a)return i;var b=d.defer();c.$emit("$translateChangeStart",{language:a});var e=J(a);return e&&(a=e),t[a]||!o||F[a]?j===a&&F[a]?F[a].then(function(a){return b.resolve(a.key),a},function(a){return b.reject(a),d.reject(a)}):(b.resolve(a),Q(a)):(j=a,F[a]=R(a).then(function(a){return K(a.key,a.table),b.resolve(a.key),Q(a.key),a},function(a){return c.$emit("$translateChangeError",{language:a}),b.reject(a),c.$emit("$translateChangeEnd",{language:a}),d.reject(a)}),F[a]["finally"](function(){bb(a)})),b.promise},G.storageKey=function(){return O()},G.isPostCompilingEnabled=function(){return y},G.refresh=function(a){function b(){f.resolve(),c.$emit("$translateRefreshEnd",{language:a})}function e(){f.reject(),c.$emit("$translateRefreshEnd",{language:a})}if(!o)throw new Error("Couldn't refresh translation table, no loader registered!");var f=d.defer();if(c.$emit("$translateRefreshStart",{language:a}),a)if(t[a]){var h=function(c){K(c.key,c.table),a===i&&Q(i),b()};h.displayName="refreshPostProcessor",R(a).then(h,e)}else e();else{var j=[],k={};if(g&&g.length)for(var l=0,m=g.length;m>l;l++)j.push(R(g[l])),k[g[l]]=!0;i&&!k[i]&&j.push(R(i));var n=function(a){t={},angular.forEach(a,function(a){K(a.key,a.table)}),i&&Q(i),b()};n.displayName="refreshPostProcessor",d.all(j).then(n)}return f.promise},G.instant=function(a,b,c){if(null===a||angular.isUndefined(a))return a;if(angular.isArray(a)){for(var d={},f=0,h=a.length;h>f;f++)d[a[f]]=G.instant(a[f],b,c);return d}if(angular.isString(a)&&a.length<1)return a;a&&(a=I.apply(a));var j,k=[];e&&k.push(e),i&&k.push(i),g&&g.length&&(k=k.concat(g));for(var l=0,n=k.length;n>l;l++){var o=k[l];if(t[o]&&("undefined"!=typeof t[o][a]?j=ab(a,b,c):(q||r)&&(j=P(a))),"undefined"!=typeof j)break}return j||""===j||(j=z.interpolate(a,b),m&&!C&&(j=W(a,b))),j},G.versionInfo=function(){return E},G.loaderCache=function(){return s},G.directivePriority=function(){return A},G.statefulFilter=function(){return B},o&&(angular.equals(t,{})&&G.use(G.use()),g&&g.length))for(var cb=function(a){return K(a.key,a.table),c.$emit("$translateChangeEnd",{language:a.key}),a},db=0,eb=g.length;eb>db;db++){var fb=g[db];t[fb]||(F[fb]=R(fb).then(cb))}return G}]}function d(a,b){"use strict";var c,d={},e="default";return d.setLocale=function(a){c=a},d.getInterpolationIdentifier=function(){return e},d.useSanitizeValueStrategy=function(a){return b.useStrategy(a),this},d.interpolate=function(c,d){d=d||{},d=b.sanitize(d,"params");var e=a(c)(d);return e=b.sanitize(e,"text")},d}function e(a,b,c,d,e,f){"use strict";var g=function(){return this.replace(/^\s+|\s+$/g,"")};return{restrict:"AE",scope:!0,priority:a.directivePriority(),compile:function(b,h){var i=h.translateValues?h.translateValues:void 0,j=h.translateInterpolation?h.translateInterpolation:void 0,k=b[0].outerHTML.match(/translate-value-+/i),l="^(.*)("+c.startSymbol()+".*"+c.endSymbol()+")(.*)",m="^(.*)"+c.startSymbol()+"(.*)"+c.endSymbol()+"(.*)";return function(b,n,o){b.interpolateParams={},b.preText="",b.postText="";var p={},q=function(a,c,d){if(c.translateValues&&angular.extend(a,e(c.translateValues)(b.$parent)),k)for(var f in d)if(Object.prototype.hasOwnProperty.call(c,f)&&"translateValue"===f.substr(0,14)&&"translateValues"!==f){var g=angular.lowercase(f.substr(14,1))+f.substr(15);a[g]=d[f]}},r=function(a){if(angular.isFunction(r._unwatchOld)&&(r._unwatchOld(),r._unwatchOld=void 0),angular.equals(a,"")||!angular.isDefined(a)){var d=g.apply(n.text()).match(l);if(angular.isArray(d)){b.preText=d[1],b.postText=d[3],p.translate=c(d[2])(b.$parent);var e=n.text().match(m);angular.isArray(e)&&e[2]&&e[2].length&&(r._unwatchOld=b.$watch(e[2],function(a){p.translate=a,x()}))}else p.translate=n.text().replace(/^\s+|\s+$/g,"")}else p.translate=a;x()},s=function(a){o.$observe(a,function(b){p[a]=b,x()})};q(b.interpolateParams,o,h);var t=!0;o.$observe("translate",function(a){"undefined"==typeof a?r(""):""===a&&t||(p.translate=a,x()),t=!1});for(var u in o)o.hasOwnProperty(u)&&"translateAttr"===u.substr(0,13)&&s(u);if(o.$observe("translateDefault",function(a){b.defaultText=a}),i&&o.$observe("translateValues",function(a){a&&b.$parent.$watch(function(){angular.extend(b.interpolateParams,e(a)(b.$parent))})}),k){var v=function(a){o.$observe(a,function(c){var d=angular.lowercase(a.substr(14,1))+a.substr(15);b.interpolateParams[d]=c})};for(var w in o)Object.prototype.hasOwnProperty.call(o,w)&&"translateValue"===w.substr(0,14)&&"translateValues"!==w&&v(w)}var x=function(){for(var a in p)p.hasOwnProperty(a)&&void 0!==p[a]&&y(a,p[a],b,b.interpolateParams,b.defaultText)},y=function(b,c,d,e,f){c?a(c,e,j,f).then(function(a){z(a,d,!0,b)},function(a){z(a,d,!1,b)}):z(c,d,!1,b)},z=function(b,c,e,f){if("translate"===f){e||"undefined"==typeof c.defaultText||(b=c.defaultText),n.html(c.preText+b+c.postText);var g=a.isPostCompilingEnabled(),i="undefined"!=typeof h.translateCompile,j=i&&"false"!==h.translateCompile;(g&&!i||j)&&d(n.contents())(c)}else{e||"undefined"==typeof c.defaultText||(b=c.defaultText);var k=o.$attr[f];"data-"===k.substr(0,5)&&(k=k.substr(5)),k=k.substr(15),n.attr(k,b)}};(i||k||o.translateDefault)&&b.$watch("interpolateParams",x,!0);var A=f.$on("$translateChangeSuccess",x);n.text().length&&r(o.translate?o.translate:""),x(),b.$on("$destroy",A)}}}}function f(a,b){"use strict";return{compile:function(c){var d=function(){c.addClass(b.cloakClassName())},e=function(){c.removeClass(b.cloakClassName())},f=a.$on("$translateChangeEnd",function(){e(),f(),f=null});return d(),function(a,c,f){f.translateCloak&&f.translateCloak.length&&f.$observe("translateCloak",function(a){b(a).then(e,d)})}}}}function g(a,b){"use strict";var c=function(c,d,e){return angular.isObject(d)||(d=a(d)(this)),b.instant(c,d,e)};return b.statefulFilter()&&(c.$stateful=!0),c}return angular.module("pascalprecht.translate",["ng"]).run(a),a.$inject=["$translate"],a.displayName="runTranslate",angular.module("pascalprecht.translate").provider("$translateSanitization",b),angular.module("pascalprecht.translate").constant("pascalprechtTranslateOverrider",{}).provider("$translate",c),c.$inject=["$STORAGE_KEY","$windowProvider","$translateSanitizationProvider","pascalprechtTranslateOverrider"],c.displayName="displayName",angular.module("pascalprecht.translate").factory("$translateDefaultInterpolation",d),d.$inject=["$interpolate","$translateSanitization"],d.displayName="$translateDefaultInterpolation",angular.module("pascalprecht.translate").constant("$STORAGE_KEY","NG_TRANSLATE_LANG_KEY"),angular.module("pascalprecht.translate").directive("translate",e),e.$inject=["$translate","$q","$interpolate","$compile","$parse","$rootScope"],e.displayName="translateDirective",angular.module("pascalprecht.translate").directive("translateCloak",f),f.$inject=["$rootScope","$translate"],f.displayName="translateCloakDirective",angular.module("pascalprecht.translate").filter("translate",g),g.$inject=["$parse","$translate"],g.displayName="translateFilterFactory","pascalprecht.translate"});
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular-animate/.bower.json b/turtles/app/lib/bower_components/angular-animate/.bower.json
new file mode 100644
index 000000000..49917407c
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/.bower.json
@@ -0,0 +1,20 @@
+{
+  "name": "angular-animate",
+  "version": "1.4.0",
+  "main": "./angular-animate.js",
+  "ignore": [],
+  "dependencies": {
+    "angular": "1.4.0"
+  },
+  "homepage": "https://github.com/angular/bower-angular-animate",
+  "_release": "1.4.0",
+  "_resolution": {
+    "type": "version",
+    "tag": "v1.4.0",
+    "commit": "708368e2865fcbee7c6f0f6107aa4eb9c6a9b780"
+  },
+  "_source": "git://github.com/angular/bower-angular-animate.git",
+  "_target": "~1.4.0",
+  "_originalSource": "angular-animate",
+  "_direct": true
+}
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular-animate/README.md b/turtles/app/lib/bower_components/angular-animate/README.md
new file mode 100644
index 000000000..8313da67c
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/README.md
@@ -0,0 +1,68 @@
+# packaged angular-animate
+
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
+[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngAnimate).
+Please file issues and pull requests against that repo.
+
+## Install
+
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular-animate
+```
+
+Then add `ngAnimate` as a dependency for your app:
+
+```javascript
+angular.module('myApp', [require('angular-animate')]);
+```
+
+### bower
+
+```shell
+bower install angular-animate
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/bower_components/angular-animate/angular-animate.js"></script>
+```
+
+Then add `ngAnimate` as a dependency for your app:
+
+```javascript
+angular.module('myApp', ['ngAnimate']);
+```
+
+## Documentation
+
+Documentation is available on the
+[AngularJS docs site](http://docs.angularjs.org/api/ngAnimate).
+
+## License
+
+The MIT License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/turtles/app/lib/bower_components/angular-animate/angular-animate.js b/turtles/app/lib/bower_components/angular-animate/angular-animate.js
new file mode 100644
index 000000000..42b03e0b5
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/angular-animate.js
@@ -0,0 +1,3708 @@
+/**
+ * @license AngularJS v1.4.0
+ * (c) 2010-2015 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+(function(window, angular, undefined) {'use strict';
+
+/* jshint ignore:start */
+var noop        = angular.noop;
+var extend      = angular.extend;
+var jqLite      = angular.element;
+var forEach     = angular.forEach;
+var isArray     = angular.isArray;
+var isString    = angular.isString;
+var isObject    = angular.isObject;
+var isUndefined = angular.isUndefined;
+var isDefined   = angular.isDefined;
+var isFunction  = angular.isFunction;
+var isElement   = angular.isElement;
+
+var ELEMENT_NODE = 1;
+var COMMENT_NODE = 8;
+
+var NG_ANIMATE_CLASSNAME = 'ng-animate';
+var NG_ANIMATE_CHILDREN_DATA = '$$ngAnimateChildren';
+
+var isPromiseLike = function(p) {
+  return p && p.then ? true : false;
+}
+
+function assertArg(arg, name, reason) {
+  if (!arg) {
+    throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
+  }
+  return arg;
+}
+
+function mergeClasses(a,b) {
+  if (!a && !b) return '';
+  if (!a) return b;
+  if (!b) return a;
+  if (isArray(a)) a = a.join(' ');
+  if (isArray(b)) b = b.join(' ');
+  return a + ' ' + b;
+}
+
+function packageStyles(options) {
+  var styles = {};
+  if (options && (options.to || options.from)) {
+    styles.to = options.to;
+    styles.from = options.from;
+  }
+  return styles;
+}
+
+function pendClasses(classes, fix, isPrefix) {
+  var className = '';
+  classes = isArray(classes)
+      ? classes
+      : classes && isString(classes) && classes.length
+          ? classes.split(/\s+/)
+          : [];
+  forEach(classes, function(klass, i) {
+    if (klass && klass.length > 0) {
+      className += (i > 0) ? ' ' : '';
+      className += isPrefix ? fix + klass
+                            : klass + fix;
+    }
+  });
+  return className;
+}
+
+function removeFromArray(arr, val) {
+  var index = arr.indexOf(val);
+  if (val >= 0) {
+    arr.splice(index, 1);
+  }
+}
+
+function stripCommentsFromElement(element) {
+  if (element instanceof jqLite) {
+    switch (element.length) {
+      case 0:
+        return [];
+        break;
+
+      case 1:
+        // there is no point of stripping anything if the element
+        // is the only element within the jqLite wrapper.
+        // (it's important that we retain the element instance.)
+        if (element[0].nodeType === ELEMENT_NODE) {
+          return element;
+        }
+        break;
+
+      default:
+        return jqLite(extractElementNode(element));
+        break;
+    }
+  }
+
+  if (element.nodeType === ELEMENT_NODE) {
+    return jqLite(element);
+  }
+}
+
+function extractElementNode(element) {
+  if (!element[0]) return element;
+  for (var i = 0; i < element.length; i++) {
+    var elm = element[i];
+    if (elm.nodeType == ELEMENT_NODE) {
+      return elm;
+    }
+  }
+}
+
+function $$addClass($$jqLite, element, className) {
+  forEach(element, function(elm) {
+    $$jqLite.addClass(elm, className);
+  });
+}
+
+function $$removeClass($$jqLite, element, className) {
+  forEach(element, function(elm) {
+    $$jqLite.removeClass(elm, className);
+  });
+}
+
+function applyAnimationClassesFactory($$jqLite) {
+  return function(element, options) {
+    if (options.addClass) {
+      $$addClass($$jqLite, element, options.addClass);
+      options.addClass = null;
+    }
+    if (options.removeClass) {
+      $$removeClass($$jqLite, element, options.removeClass);
+      options.removeClass = null;
+    }
+  }
+}
+
+function prepareAnimationOptions(options) {
+  options = options || {};
+  if (!options.$$prepared) {
+    var domOperation = options.domOperation || noop;
+    options.domOperation = function() {
+      options.$$domOperationFired = true;
+      domOperation();
+      domOperation = noop;
+    };
+    options.$$prepared = true;
+  }
+  return options;
+}
+
+function applyAnimationStyles(element, options) {
+  applyAnimationFromStyles(element, options);
+  applyAnimationToStyles(element, options);
+}
+
+function applyAnimationFromStyles(element, options) {
+  if (options.from) {
+    element.css(options.from);
+    options.from = null;
+  }
+}
+
+function applyAnimationToStyles(element, options) {
+  if (options.to) {
+    element.css(options.to);
+    options.to = null;
+  }
+}
+
+function mergeAnimationOptions(element, target, newOptions) {
+  var toAdd = (target.addClass || '') + ' ' + (newOptions.addClass || '');
+  var toRemove = (target.removeClass || '') + ' ' + (newOptions.removeClass || '');
+  var classes = resolveElementClasses(element.attr('class'), toAdd, toRemove);
+
+  extend(target, newOptions);
+
+  if (classes.addClass) {
+    target.addClass = classes.addClass;
+  } else {
+    target.addClass = null;
+  }
+
+  if (classes.removeClass) {
+    target.removeClass = classes.removeClass;
+  } else {
+    target.removeClass = null;
+  }
+
+  return target;
+}
+
+function resolveElementClasses(existing, toAdd, toRemove) {
+  var ADD_CLASS = 1;
+  var REMOVE_CLASS = -1;
+
+  var flags = {};
+  existing = splitClassesToLookup(existing);
+
+  toAdd = splitClassesToLookup(toAdd);
+  forEach(toAdd, function(value, key) {
+    flags[key] = ADD_CLASS;
+  });
+
+  toRemove = splitClassesToLookup(toRemove);
+  forEach(toRemove, function(value, key) {
+    flags[key] = flags[key] === ADD_CLASS ? null : REMOVE_CLASS;
+  });
+
+  var classes = {
+    addClass: '',
+    removeClass: ''
+  };
+
+  forEach(flags, function(val, klass) {
+    var prop, allow;
+    if (val === ADD_CLASS) {
+      prop = 'addClass';
+      allow = !existing[klass];
+    } else if (val === REMOVE_CLASS) {
+      prop = 'removeClass';
+      allow = existing[klass];
+    }
+    if (allow) {
+      if (classes[prop].length) {
+        classes[prop] += ' ';
+      }
+      classes[prop] += klass;
+    }
+  });
+
+  function splitClassesToLookup(classes) {
+    if (isString(classes)) {
+      classes = classes.split(' ');
+    }
+
+    var obj = {};
+    forEach(classes, function(klass) {
+      // sometimes the split leaves empty string values
+      // incase extra spaces were applied to the options
+      if (klass.length) {
+        obj[klass] = true;
+      }
+    });
+    return obj;
+  }
+
+  return classes;
+}
+
+function getDomNode(element) {
+  return (element instanceof angular.element) ? element[0] : element;
+}
+
+var $$rAFSchedulerFactory = ['$$rAF', function($$rAF) {
+  var tickQueue = [];
+  var cancelFn;
+
+  function scheduler(tasks) {
+    // we make a copy since RAFScheduler mutates the state
+    // of the passed in array variable and this would be difficult
+    // to track down on the outside code
+    tickQueue.push([].concat(tasks));
+    nextTick();
+  }
+
+  /* waitUntilQuiet does two things:
+   * 1. It will run the FINAL `fn` value only when an uncancelled RAF has passed through
+   * 2. It will delay the next wave of tasks from running until the quiet `fn` has run.
+   *
+   * The motivation here is that animation code can request more time from the scheduler
+   * before the next wave runs. This allows for certain DOM properties such as classes to
+   * be resolved in time for the next animation to run.
+   */
+  scheduler.waitUntilQuiet = function(fn) {
+    if (cancelFn) cancelFn();
+
+    cancelFn = $$rAF(function() {
+      cancelFn = null;
+      fn();
+      nextTick();
+    });
+  };
+
+  return scheduler;
+
+  function nextTick() {
+    if (!tickQueue.length) return;
+
+    var updatedQueue = [];
+    for (var i = 0; i < tickQueue.length; i++) {
+      var innerQueue = tickQueue[i];
+      runNextTask(innerQueue);
+      if (innerQueue.length) {
+        updatedQueue.push(innerQueue);
+      }
+    }
+    tickQueue = updatedQueue;
+
+    if (!cancelFn) {
+      $$rAF(function() {
+        if (!cancelFn) nextTick();
+      });
+    }
+  }
+
+  function runNextTask(tasks) {
+    var nextTask = tasks.shift();
+    nextTask();
+  }
+}];
+
+var $$AnimateChildrenDirective = [function() {
+  return function(scope, element, attrs) {
+    var val = attrs.ngAnimateChildren;
+    if (angular.isString(val) && val.length === 0) { //empty attribute
+      element.data(NG_ANIMATE_CHILDREN_DATA, true);
+    } else {
+      attrs.$observe('ngAnimateChildren', function(value) {
+        value = value === 'on' || value === 'true';
+        element.data(NG_ANIMATE_CHILDREN_DATA, value);
+      });
+    }
+  };
+}];
+
+/**
+ * @ngdoc service
+ * @name $animateCss
+ * @kind object
+ *
+ * @description
+ * The `$animateCss` service is a useful utility to trigger customized CSS-based transitions/keyframes
+ * from a JavaScript-based animation or directly from a directive. The purpose of `$animateCss` is NOT
+ * to side-step how `$animate` and ngAnimate work, but the goal is to allow pre-existing animations or
+ * directives to create more complex animations that can be purely driven using CSS code.
+ *
+ * Note that only browsers that support CSS transitions and/or keyframe animations are capable of
+ * rendering animations triggered via `$animateCss` (bad news for IE9 and lower).
+ *
+ * ## Usage
+ * Once again, `$animateCss` is designed to be used inside of a registered JavaScript animation that
+ * is powered by ngAnimate. It is possible to use `$animateCss` directly inside of a directive, however,
+ * any automatic control over cancelling animations and/or preventing animations from being run on
+ * child elements will not be handled by Angular. For this to work as expected, please use `$animate` to
+ * trigger the animation and then setup a JavaScript animation that injects `$animateCss` to trigger
+ * the CSS animation.
+ *
+ * The example below shows how we can create a folding animation on an element using `ng-if`:
+ *
+ * ```html
+ * <!-- notice the `fold-animation` CSS class -->
+ * <div ng-if="onOff" class="fold-animation">
+ *   This element will go BOOM
+ * </div>
+ * <button ng-click="onOff=true">Fold In</button>
+ * ```
+ *
+ * Now we create the **JavaScript animation** that will trigger the CSS transition:
+ *
+ * ```js
+ * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       var height = element[0].offsetHeight;
+ *       return $animateCss(element, {
+ *         from: { height:'0px' },
+ *         to: { height:height + 'px' },
+ *         duration: 1 // one second
+ *       });
+ *     }
+ *   }
+ * }]);
+ * ```
+ *
+ * ## More Advanced Uses
+ *
+ * `$animateCss` is the underlying code that ngAnimate uses to power **CSS-based animations** behind the scenes. Therefore CSS hooks
+ * like `.ng-EVENT`, `.ng-EVENT-active`, `.ng-EVENT-stagger` are all features that can be triggered using `$animateCss` via JavaScript code.
+ *
+ * This also means that just about any combination of adding classes, removing classes, setting styles, dynamically setting a keyframe animation,
+ * applying a hardcoded duration or delay value, changing the animation easing or applying a stagger animation are all options that work with
+ * `$animateCss`. The service itself is smart enough to figure out the combination of options and examine the element styling properties in order
+ * to provide a working animation that will run in CSS.
+ *
+ * The example below showcases a more advanced version of the `.fold-animation` from the example above:
+ *
+ * ```js
+ * ngModule.animation('.fold-animation', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       var height = element[0].offsetHeight;
+ *       return $animateCss(element, {
+ *         addClass: 'red large-text pulse-twice',
+ *         easing: 'ease-out',
+ *         from: { height:'0px' },
+ *         to: { height:height + 'px' },
+ *         duration: 1 // one second
+ *       });
+ *     }
+ *   }
+ * }]);
+ * ```
+ *
+ * Since we're adding/removing CSS classes then the CSS transition will also pick those up:
+ *
+ * ```css
+ * /&#42; since a hardcoded duration value of 1 was provided in the JavaScript animation code,
+ * the CSS classes below will be transitioned despite them being defined as regular CSS classes &#42;/
+ * .red { background:red; }
+ * .large-text { font-size:20px; }
+ *
+ * /&#42; we can also use a keyframe animation and $animateCss will make it work alongside the transition &#42;/
+ * .pulse-twice {
+ *   animation: 0.5s pulse linear 2;
+ *   -webkit-animation: 0.5s pulse linear 2;
+ * }
+ *
+ * @keyframes pulse {
+ *   from { transform: scale(0.5); }
+ *   to { transform: scale(1.5); }
+ * }
+ *
+ * @-webkit-keyframes pulse {
+ *   from { -webkit-transform: scale(0.5); }
+ *   to { -webkit-transform: scale(1.5); }
+ * }
+ * ```
+ *
+ * Given this complex combination of CSS classes, styles and options, `$animateCss` will figure everything out and make the animation happen.
+ *
+ * ## How the Options are handled
+ *
+ * `$animateCss` is very versatile and intelligent when it comes to figuring out what configurations to apply to the element to ensure the animation
+ * works with the options provided. Say for example we were adding a class that contained a keyframe value and we wanted to also animate some inline
+ * styles using the `from` and `to` properties.
+ *
+ * ```js
+ * var animator = $animateCss(element, {
+ *   from: { background:'red' },
+ *   to: { background:'blue' }
+ * });
+ * animator.start();
+ * ```
+ *
+ * ```css
+ * .rotating-animation {
+ *   animation:0.5s rotate linear;
+ *   -webkit-animation:0.5s rotate linear;
+ * }
+ *
+ * @keyframes rotate {
+ *   from { transform: rotate(0deg); }
+ *   to { transform: rotate(360deg); }
+ * }
+ *
+ * @-webkit-keyframes rotate {
+ *   from { -webkit-transform: rotate(0deg); }
+ *   to { -webkit-transform: rotate(360deg); }
+ * }
+ * ```
+ *
+ * The missing pieces here are that we do not have a transition set (within the CSS code nor within the `$animateCss` options) and the duration of the animation is
+ * going to be detected from what the keyframe styles on the CSS class are. In this event, `$animateCss` will automatically create an inline transition
+ * style matching the duration detected from the keyframe style (which is present in the CSS class that is being added) and then prepare both the transition
+ * and keyframe animations to run in parallel on the element. Then when the animation is underway the provided `from` and `to` CSS styles will be applied
+ * and spread across the transition and keyframe animation.
+ *
+ * ## What is returned
+ *
+ * `$animateCss` works in two stages: a preparation phase and an animation phase. Therefore when `$animateCss` is first called it will NOT actually
+ * start the animation. All that is going on here is that the element is being prepared for the animation (which means that the generated CSS classes are
+ * added and removed on the element). Once `$animateCss` is called it will return an object with the following properties:
+ *
+ * ```js
+ * var animator = $animateCss(element, { ... });
+ * ```
+ *
+ * Now what do the contents of our `animator` variable look like:
+ *
+ * ```js
+ * {
+ *   // starts the animation
+ *   start: Function,
+ *
+ *   // ends (aborts) the animation
+ *   end: Function
+ * }
+ * ```
+ *
+ * To actually start the animation we need to run `animation.start()` which will then return a promise that we can hook into to detect when the animation ends.
+ * If we choose not to run the animation then we MUST run `animation.end()` to perform a cleanup on the element (since some CSS classes and stlyes may have been
+ * applied to the element during the preparation phase). Note that all other properties such as duration, delay, transitions and keyframes are just properties
+ * and that changing them will not reconfigure the parameters of the animation.
+ *
+ * ### runner.done() vs runner.then()
+ * It is documented that `animation.start()` will return a promise object and this is true, however, there is also an additional method available on the
+ * runner called `.done(callbackFn)`. The done method works the same as `.finally(callbackFn)`, however, it does **not trigger a digest to occur**.
+ * Therefore, for performance reasons, it's always best to use `runner.done(callback)` instead of `runner.then()`, `runner.catch()` or `runner.finally()`
+ * unless you really need a digest to kick off afterwards.
+ *
+ * Keep in mind that, to make this easier, ngAnimate has tweaked the JS animations API to recognize when a runner instance is returned from $animateCss
+ * (so there is no need to call `runner.done(doneFn)` inside of your JavaScript animation code). Check the [animation code above](#usage) to see how this works.
+ *
+ * @param {DOMElement} element the element that will be animated
+ * @param {object} options the animation-related options that will be applied during the animation
+ *
+ * * `event` - The DOM event (e.g. enter, leave, move). When used, a generated CSS class of `ng-EVENT` and `ng-EVENT-active` will be applied
+ * to the element during the animation. Multiple events can be provided when spaces are used as a separator. (Note that this will not perform any DOM operation.)
+ * * `easing` - The CSS easing value that will be applied to the transition or keyframe animation (or both).
+ * * `transition` - The raw CSS transition style that will be used (e.g. `1s linear all`).
+ * * `keyframe` - The raw CSS keyframe animation style that will be used (e.g. `1s my_animation linear`).
+ * * `from` - The starting CSS styles (a key/value object) that will be applied at the start of the animation.
+ * * `to` - The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition.
+ * * `addClass` - A space separated list of CSS classes that will be added to the element and spread across the animation.
+ * * `removeClass` - A space separated list of CSS classes that will be removed from the element and spread across the animation.
+ * * `duration` - A number value representing the total duration of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `0`
+ * is provided then the animation will be skipped entirely.
+ * * `delay` - A number value representing the total delay of the transition and/or keyframe (note that a value of 1 is 1000ms). If a value of `true` is
+ * used then whatever delay value is detected from the CSS classes will be mirrored on the elements styles (e.g. by setting delay true then the style value
+ * of the element will be `transition-delay: DETECTED_VALUE`). Using `true` is useful when you want the CSS classes and inline styles to all share the same
+ * CSS delay value.
+ * * `stagger` - A numeric time value representing the delay between successively animated elements
+ * ({@link ngAnimate#css-staggering-animations Click here to learn how CSS-based staggering works in ngAnimate.})
+ * * `staggerIndex` - The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item in the stagger; therefore when a
+ * `stagger` option value of `0.1` is used then there will be a stagger delay of `600ms`)
+ * `applyClassesEarly` - Whether or not the classes being added or removed will be used when detecting the animation. This is set by `$animate` when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time. (Note that this will prevent any transitions from occuring on the classes being added and removed.)
+ *
+ * @return {object} an object with start and end methods and details about the animation.
+ *
+ * * `start` - The method to start the animation. This will return a `Promise` when called.
+ * * `end` - This method will cancel the animation and remove all applied CSS classes and styles.
+ */
+
+// Detect proper transitionend/animationend event names.
+var CSS_PREFIX = '', TRANSITION_PROP, TRANSITIONEND_EVENT, ANIMATION_PROP, ANIMATIONEND_EVENT;
+
+// If unprefixed events are not supported but webkit-prefixed are, use the latter.
+// Otherwise, just use W3C names, browsers not supporting them at all will just ignore them.
+// Note: Chrome implements `window.onwebkitanimationend` and doesn't implement `window.onanimationend`
+// but at the same time dispatches the `animationend` event and not `webkitAnimationEnd`.
+// Register both events in case `window.onanimationend` is not supported because of that,
+// do the same for `transitionend` as Safari is likely to exhibit similar behavior.
+// Also, the only modern browser that uses vendor prefixes for transitions/keyframes is webkit
+// therefore there is no reason to test anymore for other vendor prefixes:
+// http://caniuse.com/#search=transition
+if (window.ontransitionend === undefined && window.onwebkittransitionend !== undefined) {
+  CSS_PREFIX = '-webkit-';
+  TRANSITION_PROP = 'WebkitTransition';
+  TRANSITIONEND_EVENT = 'webkitTransitionEnd transitionend';
+} else {
+  TRANSITION_PROP = 'transition';
+  TRANSITIONEND_EVENT = 'transitionend';
+}
+
+if (window.onanimationend === undefined && window.onwebkitanimationend !== undefined) {
+  CSS_PREFIX = '-webkit-';
+  ANIMATION_PROP = 'WebkitAnimation';
+  ANIMATIONEND_EVENT = 'webkitAnimationEnd animationend';
+} else {
+  ANIMATION_PROP = 'animation';
+  ANIMATIONEND_EVENT = 'animationend';
+}
+
+var DURATION_KEY = 'Duration';
+var PROPERTY_KEY = 'Property';
+var DELAY_KEY = 'Delay';
+var TIMING_KEY = 'TimingFunction';
+var ANIMATION_ITERATION_COUNT_KEY = 'IterationCount';
+var ANIMATION_PLAYSTATE_KEY = 'PlayState';
+var ELAPSED_TIME_MAX_DECIMAL_PLACES = 3;
+var CLOSING_TIME_BUFFER = 1.5;
+var ONE_SECOND = 1000;
+var BASE_TEN = 10;
+
+var SAFE_FAST_FORWARD_DURATION_VALUE = 9999;
+
+var ANIMATION_DELAY_PROP = ANIMATION_PROP + DELAY_KEY;
+var ANIMATION_DURATION_PROP = ANIMATION_PROP + DURATION_KEY;
+
+var TRANSITION_DELAY_PROP = TRANSITION_PROP + DELAY_KEY;
+var TRANSITION_DURATION_PROP = TRANSITION_PROP + DURATION_KEY;
+
+var DETECT_CSS_PROPERTIES = {
+  transitionDuration:      TRANSITION_DURATION_PROP,
+  transitionDelay:         TRANSITION_DELAY_PROP,
+  transitionProperty:      TRANSITION_PROP + PROPERTY_KEY,
+  animationDuration:       ANIMATION_DURATION_PROP,
+  animationDelay:          ANIMATION_DELAY_PROP,
+  animationIterationCount: ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY
+};
+
+var DETECT_STAGGER_CSS_PROPERTIES = {
+  transitionDuration:      TRANSITION_DURATION_PROP,
+  transitionDelay:         TRANSITION_DELAY_PROP,
+  animationDuration:       ANIMATION_DURATION_PROP,
+  animationDelay:          ANIMATION_DELAY_PROP
+};
+
+function computeCssStyles($window, element, properties) {
+  var styles = Object.create(null);
+  var detectedStyles = $window.getComputedStyle(element) || {};
+  forEach(properties, function(formalStyleName, actualStyleName) {
+    var val = detectedStyles[formalStyleName];
+    if (val) {
+      var c = val.charAt(0);
+
+      // only numerical-based values have a negative sign or digit as the first value
+      if (c === '-' || c === '+' || c >= 0) {
+        val = parseMaxTime(val);
+      }
+
+      // by setting this to null in the event that the delay is not set or is set directly as 0
+      // then we can still allow for zegative values to be used later on and not mistake this
+      // value for being greater than any other negative value.
+      if (val === 0) {
+        val = null;
+      }
+      styles[actualStyleName] = val;
+    }
+  });
+
+  return styles;
+}
+
+function parseMaxTime(str) {
+  var maxValue = 0;
+  var values = str.split(/\s*,\s*/);
+  forEach(values, function(value) {
+    // it's always safe to consider only second values and omit `ms` values since
+    // getComputedStyle will always handle the conversion for us
+    if (value.charAt(value.length - 1) == 's') {
+      value = value.substring(0, value.length - 1);
+    }
+    value = parseFloat(value) || 0;
+    maxValue = maxValue ? Math.max(value, maxValue) : value;
+  });
+  return maxValue;
+}
+
+function truthyTimingValue(val) {
+  return val === 0 || val != null;
+}
+
+function getCssTransitionDurationStyle(duration, applyOnlyDuration) {
+  var style = TRANSITION_PROP;
+  var value = duration + 's';
+  if (applyOnlyDuration) {
+    style += DURATION_KEY;
+  } else {
+    value += ' linear all';
+  }
+  return [style, value];
+}
+
+function getCssKeyframeDurationStyle(duration) {
+  return [ANIMATION_DURATION_PROP, duration + 's'];
+}
+
+function getCssDelayStyle(delay, isKeyframeAnimation) {
+  var prop = isKeyframeAnimation ? ANIMATION_DELAY_PROP : TRANSITION_DELAY_PROP;
+  return [prop, delay + 's'];
+}
+
+function blockTransitions(node, duration) {
+  // we use a negative delay value since it performs blocking
+  // yet it doesn't kill any existing transitions running on the
+  // same element which makes this safe for class-based animations
+  var value = duration ? '-' + duration + 's' : '';
+  applyInlineStyle(node, [TRANSITION_DELAY_PROP, value]);
+  return [TRANSITION_DELAY_PROP, value];
+}
+
+function blockKeyframeAnimations(node, applyBlock) {
+  var value = applyBlock ? 'paused' : '';
+  var key = ANIMATION_PROP + ANIMATION_PLAYSTATE_KEY;
+  applyInlineStyle(node, [key, value]);
+  return [key, value];
+}
+
+function applyInlineStyle(node, styleTuple) {
+  var prop = styleTuple[0];
+  var value = styleTuple[1];
+  node.style[prop] = value;
+}
+
+function createLocalCacheLookup() {
+  var cache = Object.create(null);
+  return {
+    flush: function() {
+      cache = Object.create(null);
+    },
+
+    count: function(key) {
+      var entry = cache[key];
+      return entry ? entry.total : 0;
+    },
+
+    get: function(key) {
+      var entry = cache[key];
+      return entry && entry.value;
+    },
+
+    put: function(key, value) {
+      if (!cache[key]) {
+        cache[key] = { total: 1, value: value };
+      } else {
+        cache[key].total++;
+      }
+    }
+  };
+}
+
+var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
+  var gcsLookup = createLocalCacheLookup();
+  var gcsStaggerLookup = createLocalCacheLookup();
+
+  this.$get = ['$window', '$$jqLite', '$$AnimateRunner', '$timeout',
+               '$document', '$sniffer', '$$rAFScheduler',
+       function($window,   $$jqLite,   $$AnimateRunner,   $timeout,
+                $document,   $sniffer,   $$rAFScheduler) {
+
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+
+    var parentCounter = 0;
+    function gcsHashFn(node, extraClasses) {
+      var KEY = "$$ngAnimateParentKey";
+      var parentNode = node.parentNode;
+      var parentID = parentNode[KEY] || (parentNode[KEY] = ++parentCounter);
+      return parentID + '-' + node.getAttribute('class') + '-' + extraClasses;
+    }
+
+    function computeCachedCssStyles(node, className, cacheKey, properties) {
+      var timings = gcsLookup.get(cacheKey);
+
+      if (!timings) {
+        timings = computeCssStyles($window, node, properties);
+        if (timings.animationIterationCount === 'infinite') {
+          timings.animationIterationCount = 1;
+        }
+      }
+
+      // we keep putting this in multiple times even though the value and the cacheKey are the same
+      // because we're keeping an interal tally of how many duplicate animations are detected.
+      gcsLookup.put(cacheKey, timings);
+      return timings;
+    }
+
+    function computeCachedCssStaggerStyles(node, className, cacheKey, properties) {
+      var stagger;
+
+      // if we have one or more existing matches of matching elements
+      // containing the same parent + CSS styles (which is how cacheKey works)
+      // then staggering is possible
+      if (gcsLookup.count(cacheKey) > 0) {
+        stagger = gcsStaggerLookup.get(cacheKey);
+
+        if (!stagger) {
+          var staggerClassName = pendClasses(className, '-stagger');
+
+          $$jqLite.addClass(node, staggerClassName);
+
+          stagger = computeCssStyles($window, node, properties);
+
+          // force the conversion of a null value to zero incase not set
+          stagger.animationDuration = Math.max(stagger.animationDuration, 0);
+          stagger.transitionDuration = Math.max(stagger.transitionDuration, 0);
+
+          $$jqLite.removeClass(node, staggerClassName);
+
+          gcsStaggerLookup.put(cacheKey, stagger);
+        }
+      }
+
+      return stagger || {};
+    }
+
+    var bod = getDomNode($document).body;
+    var rafWaitQueue = [];
+    function waitUntilQuiet(callback) {
+      rafWaitQueue.push(callback);
+      $$rAFScheduler.waitUntilQuiet(function() {
+        gcsLookup.flush();
+        gcsStaggerLookup.flush();
+
+        //the line below will force the browser to perform a repaint so
+        //that all the animated elements within the animation frame will
+        //be properly updated and drawn on screen. This is required to
+        //ensure that the preparation animation is properly flushed so that
+        //the active state picks up from there. DO NOT REMOVE THIS LINE.
+        //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH
+        //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND
+        //WILL TAKE YEARS AWAY FROM YOUR LIFE.
+        var width = bod.offsetWidth + 1;
+
+        // we use a for loop to ensure that if the queue is changed
+        // during this looping then it will consider new requests
+        for (var i = 0; i < rafWaitQueue.length; i++) {
+          rafWaitQueue[i](width);
+        }
+        rafWaitQueue.length = 0;
+      });
+    }
+
+    return init;
+
+    function computeTimings(node, className, cacheKey) {
+      var timings = computeCachedCssStyles(node, className, cacheKey, DETECT_CSS_PROPERTIES);
+      var aD = timings.animationDelay;
+      var tD = timings.transitionDelay;
+      timings.maxDelay = aD && tD
+          ? Math.max(aD, tD)
+          : (aD || tD);
+      timings.maxDuration = Math.max(
+          timings.animationDuration * timings.animationIterationCount,
+          timings.transitionDuration);
+
+      return timings;
+    }
+
+    function init(element, options) {
+      var node = getDomNode(element);
+      options = prepareAnimationOptions(options);
+
+      var temporaryStyles = [];
+      var classes = element.attr('class');
+      var styles = packageStyles(options);
+      var animationClosed;
+      var animationPaused;
+      var animationCompleted;
+      var runner;
+      var runnerHost;
+      var maxDelay;
+      var maxDelayTime;
+      var maxDuration;
+      var maxDurationTime;
+
+      if (options.duration === 0 || (!$sniffer.animations && !$sniffer.transitions)) {
+        return closeAndReturnNoopAnimator();
+      }
+
+      var method = options.event && isArray(options.event)
+            ? options.event.join(' ')
+            : options.event;
+
+      var isStructural = method && options.structural;
+      var structuralClassName = '';
+      var addRemoveClassName = '';
+
+      if (isStructural) {
+        structuralClassName = pendClasses(method, 'ng-', true);
+      } else if (method) {
+        structuralClassName = method;
+      }
+
+      if (options.addClass) {
+        addRemoveClassName += pendClasses(options.addClass, '-add');
+      }
+
+      if (options.removeClass) {
+        if (addRemoveClassName.length) {
+          addRemoveClassName += ' ';
+        }
+        addRemoveClassName += pendClasses(options.removeClass, '-remove');
+      }
+
+      // there may be a situation where a structural animation is combined together
+      // with CSS classes that need to resolve before the animation is computed.
+      // However this means that there is no explicit CSS code to block the animation
+      // from happening (by setting 0s none in the class name). If this is the case
+      // we need to apply the classes before the first rAF so we know to continue if
+      // there actually is a detected transition or keyframe animation
+      if (options.applyClassesEarly && addRemoveClassName.length) {
+        applyAnimationClasses(element, options);
+        addRemoveClassName = '';
+      }
+
+      var setupClasses = [structuralClassName, addRemoveClassName].join(' ').trim();
+      var fullClassName = classes + ' ' + setupClasses;
+      var activeClasses = pendClasses(setupClasses, '-active');
+      var hasToStyles = styles.to && Object.keys(styles.to).length > 0;
+
+      // there is no way we can trigger an animation since no styles and
+      // no classes are being applied which would then trigger a transition
+      if (!hasToStyles && !setupClasses) {
+        return closeAndReturnNoopAnimator();
+      }
+
+      var cacheKey, stagger;
+      if (options.stagger > 0) {
+        var staggerVal = parseFloat(options.stagger);
+        stagger = {
+          transitionDelay: staggerVal,
+          animationDelay: staggerVal,
+          transitionDuration: 0,
+          animationDuration: 0
+        };
+      } else {
+        cacheKey = gcsHashFn(node, fullClassName);
+        stagger = computeCachedCssStaggerStyles(node, setupClasses, cacheKey, DETECT_STAGGER_CSS_PROPERTIES);
+      }
+
+      $$jqLite.addClass(element, setupClasses);
+
+      var applyOnlyDuration;
+
+      if (options.transitionStyle) {
+        var transitionStyle = [TRANSITION_PROP, options.transitionStyle];
+        applyInlineStyle(node, transitionStyle);
+        temporaryStyles.push(transitionStyle);
+      }
+
+      if (options.duration >= 0) {
+        applyOnlyDuration = node.style[TRANSITION_PROP].length > 0;
+        var durationStyle = getCssTransitionDurationStyle(options.duration, applyOnlyDuration);
+
+        // we set the duration so that it will be picked up by getComputedStyle later
+        applyInlineStyle(node, durationStyle);
+        temporaryStyles.push(durationStyle);
+      }
+
+      if (options.keyframeStyle) {
+        var keyframeStyle = [ANIMATION_PROP, options.keyframeStyle];
+        applyInlineStyle(node, keyframeStyle);
+        temporaryStyles.push(keyframeStyle);
+      }
+
+      var itemIndex = stagger
+          ? options.staggerIndex >= 0
+              ? options.staggerIndex
+              : gcsLookup.count(cacheKey)
+          : 0;
+
+      var isFirst = itemIndex === 0;
+
+      // this is a pre-emptive way of forcing the setup classes to be added and applied INSTANTLY
+      // without causing any combination of transitions to kick in. By adding a negative delay value
+      // it forces the setup class' transition to end immediately. We later then remove the negative
+      // transition delay to allow for the transition to naturally do it's thing. The beauty here is
+      // that if there is no transition defined then nothing will happen and this will also allow
+      // other transitions to be stacked on top of each other without any chopping them out.
+      if (isFirst) {
+        blockTransitions(node, SAFE_FAST_FORWARD_DURATION_VALUE);
+      }
+
+      var timings = computeTimings(node, fullClassName, cacheKey);
+      var relativeDelay = timings.maxDelay;
+      maxDelay = Math.max(relativeDelay, 0);
+      maxDuration = timings.maxDuration;
+
+      var flags = {};
+      flags.hasTransitions          = timings.transitionDuration > 0;
+      flags.hasAnimations           = timings.animationDuration > 0;
+      flags.hasTransitionAll        = flags.hasTransitions && timings.transitionProperty == 'all';
+      flags.applyTransitionDuration = hasToStyles && (
+                                        (flags.hasTransitions && !flags.hasTransitionAll)
+                                         || (flags.hasAnimations && !flags.hasTransitions));
+      flags.applyAnimationDuration  = options.duration && flags.hasAnimations;
+      flags.applyTransitionDelay    = truthyTimingValue(options.delay) && (flags.applyTransitionDuration || flags.hasTransitions);
+      flags.applyAnimationDelay     = truthyTimingValue(options.delay) && flags.hasAnimations;
+      flags.recalculateTimingStyles = addRemoveClassName.length > 0;
+
+      if (flags.applyTransitionDuration || flags.applyAnimationDuration) {
+        maxDuration = options.duration ? parseFloat(options.duration) : maxDuration;
+
+        if (flags.applyTransitionDuration) {
+          flags.hasTransitions = true;
+          timings.transitionDuration = maxDuration;
+          applyOnlyDuration = node.style[TRANSITION_PROP + PROPERTY_KEY].length > 0;
+          temporaryStyles.push(getCssTransitionDurationStyle(maxDuration, applyOnlyDuration));
+        }
+
+        if (flags.applyAnimationDuration) {
+          flags.hasAnimations = true;
+          timings.animationDuration = maxDuration;
+          temporaryStyles.push(getCssKeyframeDurationStyle(maxDuration));
+        }
+      }
+
+      if (maxDuration === 0 && !flags.recalculateTimingStyles) {
+        return closeAndReturnNoopAnimator();
+      }
+
+      // we need to recalculate the delay value since we used a pre-emptive negative
+      // delay value and the delay value is required for the final event checking. This
+      // property will ensure that this will happen after the RAF phase has passed.
+      if (options.duration == null && timings.transitionDuration > 0) {
+        flags.recalculateTimingStyles = flags.recalculateTimingStyles || isFirst;
+      }
+
+      maxDelayTime = maxDelay * ONE_SECOND;
+      maxDurationTime = maxDuration * ONE_SECOND;
+      if (!options.skipBlocking) {
+        flags.blockTransition = timings.transitionDuration > 0;
+        flags.blockKeyframeAnimation = timings.animationDuration > 0 &&
+                                       stagger.animationDelay > 0 &&
+                                       stagger.animationDuration === 0;
+      }
+
+      applyAnimationFromStyles(element, options);
+      if (!flags.blockTransition) {
+        blockTransitions(node, false);
+      }
+
+      applyBlocking(maxDuration);
+
+      // TODO(matsko): for 1.5 change this code to have an animator object for better debugging
+      return {
+        $$willAnimate: true,
+        end: endFn,
+        start: function() {
+          if (animationClosed) return;
+
+          runnerHost = {
+            end: endFn,
+            cancel: cancelFn,
+            resume: null, //this will be set during the start() phase
+            pause: null
+          };
+
+          runner = new $$AnimateRunner(runnerHost);
+
+          waitUntilQuiet(start);
+
+          // we don't have access to pause/resume the animation
+          // since it hasn't run yet. AnimateRunner will therefore
+          // set noop functions for resume and pause and they will
+          // later be overridden once the animation is triggered
+          return runner;
+        }
+      };
+
+      function endFn() {
+        close();
+      }
+
+      function cancelFn() {
+        close(true);
+      }
+
+      function close(rejected) { // jshint ignore:line
+        // if the promise has been called already then we shouldn't close
+        // the animation again
+        if (animationClosed || (animationCompleted && animationPaused)) return;
+        animationClosed = true;
+        animationPaused = false;
+
+        $$jqLite.removeClass(element, setupClasses);
+        $$jqLite.removeClass(element, activeClasses);
+
+        blockKeyframeAnimations(node, false);
+        blockTransitions(node, false);
+
+        forEach(temporaryStyles, function(entry) {
+          // There is only one way to remove inline style properties entirely from elements.
+          // By using `removeProperty` this works, but we need to convert camel-cased CSS
+          // styles down to hyphenated values.
+          node.style[entry[0]] = '';
+        });
+
+        applyAnimationClasses(element, options);
+        applyAnimationStyles(element, options);
+
+        // the reason why we have this option is to allow a synchronous closing callback
+        // that is fired as SOON as the animation ends (when the CSS is removed) or if
+        // the animation never takes off at all. A good example is a leave animation since
+        // the element must be removed just after the animation is over or else the element
+        // will appear on screen for one animation frame causing an overbearing flicker.
+        if (options.onDone) {
+          options.onDone();
+        }
+
+        // if the preparation function fails then the promise is not setup
+        if (runner) {
+          runner.complete(!rejected);
+        }
+      }
+
+      function applyBlocking(duration) {
+        if (flags.blockTransition) {
+          blockTransitions(node, duration);
+        }
+
+        if (flags.blockKeyframeAnimation) {
+          blockKeyframeAnimations(node, !!duration);
+        }
+      }
+
+      function closeAndReturnNoopAnimator() {
+        runner = new $$AnimateRunner({
+          end: endFn,
+          cancel: cancelFn
+        });
+
+        close();
+
+        return {
+          $$willAnimate: false,
+          start: function() {
+            return runner;
+          },
+          end: endFn
+        };
+      }
+
+      function start() {
+        if (animationClosed) return;
+
+        var startTime, events = [];
+
+        // even though we only pause keyframe animations here the pause flag
+        // will still happen when transitions are used. Only the transition will
+        // not be paused since that is not possible. If the animation ends when
+        // paused then it will not complete until unpaused or cancelled.
+        var playPause = function(playAnimation) {
+          if (!animationCompleted) {
+            animationPaused = !playAnimation;
+            if (timings.animationDuration) {
+              var value = blockKeyframeAnimations(node, animationPaused);
+              animationPaused
+                  ? temporaryStyles.push(value)
+                  : removeFromArray(temporaryStyles, value);
+            }
+          } else if (animationPaused && playAnimation) {
+            animationPaused = false;
+            close();
+          }
+        };
+
+        // checking the stagger duration prevents an accidently cascade of the CSS delay style
+        // being inherited from the parent. If the transition duration is zero then we can safely
+        // rely that the delay value is an intential stagger delay style.
+        var maxStagger = itemIndex > 0
+                         && ((timings.transitionDuration && stagger.transitionDuration === 0) ||
+                            (timings.animationDuration && stagger.animationDuration === 0))
+                         && Math.max(stagger.animationDelay, stagger.transitionDelay);
+        if (maxStagger) {
+          $timeout(triggerAnimationStart,
+                   Math.floor(maxStagger * itemIndex * ONE_SECOND),
+                   false);
+        } else {
+          triggerAnimationStart();
+        }
+
+        // this will decorate the existing promise runner with pause/resume methods
+        runnerHost.resume = function() {
+          playPause(true);
+        };
+
+        runnerHost.pause = function() {
+          playPause(false);
+        };
+
+        function triggerAnimationStart() {
+          // just incase a stagger animation kicks in when the animation
+          // itself was cancelled entirely
+          if (animationClosed) return;
+
+          applyBlocking(false);
+
+          forEach(temporaryStyles, function(entry) {
+            var key = entry[0];
+            var value = entry[1];
+            node.style[key] = value;
+          });
+
+          applyAnimationClasses(element, options);
+          $$jqLite.addClass(element, activeClasses);
+
+          if (flags.recalculateTimingStyles) {
+            fullClassName = node.className + ' ' + setupClasses;
+            cacheKey = gcsHashFn(node, fullClassName);
+
+            timings = computeTimings(node, fullClassName, cacheKey);
+            relativeDelay = timings.maxDelay;
+            maxDelay = Math.max(relativeDelay, 0);
+            maxDuration = timings.maxDuration;
+
+            if (maxDuration === 0) {
+              close();
+              return;
+            }
+
+            flags.hasTransitions = timings.transitionDuration > 0;
+            flags.hasAnimations = timings.animationDuration > 0;
+          }
+
+          if (flags.applyTransitionDelay || flags.applyAnimationDelay) {
+            relativeDelay = typeof options.delay !== "boolean" && truthyTimingValue(options.delay)
+                  ? parseFloat(options.delay)
+                  : relativeDelay;
+
+            maxDelay = Math.max(relativeDelay, 0);
+
+            var delayStyle;
+            if (flags.applyTransitionDelay) {
+              timings.transitionDelay = relativeDelay;
+              delayStyle = getCssDelayStyle(relativeDelay);
+              temporaryStyles.push(delayStyle);
+              node.style[delayStyle[0]] = delayStyle[1];
+            }
+
+            if (flags.applyAnimationDelay) {
+              timings.animationDelay = relativeDelay;
+              delayStyle = getCssDelayStyle(relativeDelay, true);
+              temporaryStyles.push(delayStyle);
+              node.style[delayStyle[0]] = delayStyle[1];
+            }
+          }
+
+          maxDelayTime = maxDelay * ONE_SECOND;
+          maxDurationTime = maxDuration * ONE_SECOND;
+
+          if (options.easing) {
+            var easeProp, easeVal = options.easing;
+            if (flags.hasTransitions) {
+              easeProp = TRANSITION_PROP + TIMING_KEY;
+              temporaryStyles.push([easeProp, easeVal]);
+              node.style[easeProp] = easeVal;
+            }
+            if (flags.hasAnimations) {
+              easeProp = ANIMATION_PROP + TIMING_KEY;
+              temporaryStyles.push([easeProp, easeVal]);
+              node.style[easeProp] = easeVal;
+            }
+          }
+
+          if (timings.transitionDuration) {
+            events.push(TRANSITIONEND_EVENT);
+          }
+
+          if (timings.animationDuration) {
+            events.push(ANIMATIONEND_EVENT);
+          }
+
+          startTime = Date.now();
+          element.on(events.join(' '), onAnimationProgress);
+          $timeout(onAnimationExpired, maxDelayTime + CLOSING_TIME_BUFFER * maxDurationTime);
+
+          applyAnimationToStyles(element, options);
+        }
+
+        function onAnimationExpired() {
+          // although an expired animation is a failed animation, getting to
+          // this outcome is very easy if the CSS code screws up. Therefore we
+          // should still continue normally as if the animation completed correctly.
+          close();
+        }
+
+        function onAnimationProgress(event) {
+          event.stopPropagation();
+          var ev = event.originalEvent || event;
+          var timeStamp = ev.$manualTimeStamp || ev.timeStamp || Date.now();
+
+          /* Firefox (or possibly just Gecko) likes to not round values up
+           * when a ms measurement is used for the animation */
+          var elapsedTime = parseFloat(ev.elapsedTime.toFixed(ELAPSED_TIME_MAX_DECIMAL_PLACES));
+
+          /* $manualTimeStamp is a mocked timeStamp value which is set
+           * within browserTrigger(). This is only here so that tests can
+           * mock animations properly. Real events fallback to event.timeStamp,
+           * or, if they don't, then a timeStamp is automatically created for them.
+           * We're checking to see if the timeStamp surpasses the expected delay,
+           * but we're using elapsedTime instead of the timeStamp on the 2nd
+           * pre-condition since animations sometimes close off early */
+          if (Math.max(timeStamp - startTime, 0) >= maxDelayTime && elapsedTime >= maxDuration) {
+            // we set this flag to ensure that if the transition is paused then, when resumed,
+            // the animation will automatically close itself since transitions cannot be paused.
+            animationCompleted = true;
+            close();
+          }
+        }
+      }
+    }
+  }];
+}];
+
+var $$AnimateCssDriverProvider = ['$$animationProvider', function($$animationProvider) {
+  $$animationProvider.drivers.push('$$animateCssDriver');
+
+  var NG_ANIMATE_SHIM_CLASS_NAME = 'ng-animate-shim';
+  var NG_ANIMATE_ANCHOR_CLASS_NAME = 'ng-anchor';
+
+  var NG_OUT_ANCHOR_CLASS_NAME = 'ng-anchor-out';
+  var NG_IN_ANCHOR_CLASS_NAME = 'ng-anchor-in';
+
+  this.$get = ['$animateCss', '$rootScope', '$$AnimateRunner', '$rootElement', '$document', '$sniffer',
+       function($animateCss,   $rootScope,   $$AnimateRunner,   $rootElement,   $document,   $sniffer) {
+
+    // only browsers that support these properties can render animations
+    if (!$sniffer.animations && !$sniffer.transitions) return noop;
+
+    var bodyNode = getDomNode($document).body;
+    var rootNode = getDomNode($rootElement);
+
+    var rootBodyElement = jqLite(bodyNode.parentNode === rootNode ? bodyNode : rootNode);
+
+    return function initDriverFn(animationDetails) {
+      return animationDetails.from && animationDetails.to
+          ? prepareFromToAnchorAnimation(animationDetails.from,
+                                         animationDetails.to,
+                                         animationDetails.classes,
+                                         animationDetails.anchors)
+          : prepareRegularAnimation(animationDetails);
+    };
+
+    function filterCssClasses(classes) {
+      //remove all the `ng-` stuff
+      return classes.replace(/\bng-\S+\b/g, '');
+    }
+
+    function getUniqueValues(a, b) {
+      if (isString(a)) a = a.split(' ');
+      if (isString(b)) b = b.split(' ');
+      return a.filter(function(val) {
+        return b.indexOf(val) === -1;
+      }).join(' ');
+    }
+
+    function prepareAnchoredAnimation(classes, outAnchor, inAnchor) {
+      var clone = jqLite(getDomNode(outAnchor).cloneNode(true));
+      var startingClasses = filterCssClasses(getClassVal(clone));
+
+      outAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME);
+      inAnchor.addClass(NG_ANIMATE_SHIM_CLASS_NAME);
+
+      clone.addClass(NG_ANIMATE_ANCHOR_CLASS_NAME);
+
+      rootBodyElement.append(clone);
+
+      var animatorIn, animatorOut = prepareOutAnimation();
+
+      // the user may not end up using the `out` animation and
+      // only making use of the `in` animation or vice-versa.
+      // In either case we should allow this and not assume the
+      // animation is over unless both animations are not used.
+      if (!animatorOut) {
+        animatorIn = prepareInAnimation();
+        if (!animatorIn) {
+          return end();
+        }
+      }
+
+      var startingAnimator = animatorOut || animatorIn;
+
+      return {
+        start: function() {
+          var runner;
+
+          var currentAnimation = startingAnimator.start();
+          currentAnimation.done(function() {
+            currentAnimation = null;
+            if (!animatorIn) {
+              animatorIn = prepareInAnimation();
+              if (animatorIn) {
+                currentAnimation = animatorIn.start();
+                currentAnimation.done(function() {
+                  currentAnimation = null;
+                  end();
+                  runner.complete();
+                });
+                return currentAnimation;
+              }
+            }
+            // in the event that there is no `in` animation
+            end();
+            runner.complete();
+          });
+
+          runner = new $$AnimateRunner({
+            end: endFn,
+            cancel: endFn
+          });
+
+          return runner;
+
+          function endFn() {
+            if (currentAnimation) {
+              currentAnimation.end();
+            }
+          }
+        }
+      };
+
+      function calculateAnchorStyles(anchor) {
+        var styles = {};
+
+        var coords = getDomNode(anchor).getBoundingClientRect();
+
+        // we iterate directly since safari messes up and doesn't return
+        // all the keys for the coods object when iterated
+        forEach(['width','height','top','left'], function(key) {
+          var value = coords[key];
+          switch (key) {
+            case 'top':
+              value += bodyNode.scrollTop;
+              break;
+            case 'left':
+              value += bodyNode.scrollLeft;
+              break;
+          }
+          styles[key] = Math.floor(value) + 'px';
+        });
+        return styles;
+      }
+
+      function prepareOutAnimation() {
+        var animator = $animateCss(clone, {
+          addClass: NG_OUT_ANCHOR_CLASS_NAME,
+          delay: true,
+          from: calculateAnchorStyles(outAnchor)
+        });
+
+        // read the comment within `prepareRegularAnimation` to understand
+        // why this check is necessary
+        return animator.$$willAnimate ? animator : null;
+      }
+
+      function getClassVal(element) {
+        return element.attr('class') || '';
+      }
+
+      function prepareInAnimation() {
+        var endingClasses = filterCssClasses(getClassVal(inAnchor));
+        var toAdd = getUniqueValues(endingClasses, startingClasses);
+        var toRemove = getUniqueValues(startingClasses, endingClasses);
+
+        var animator = $animateCss(clone, {
+          to: calculateAnchorStyles(inAnchor),
+          addClass: NG_IN_ANCHOR_CLASS_NAME + ' ' + toAdd,
+          removeClass: NG_OUT_ANCHOR_CLASS_NAME + ' ' + toRemove,
+          delay: true
+        });
+
+        // read the comment within `prepareRegularAnimation` to understand
+        // why this check is necessary
+        return animator.$$willAnimate ? animator : null;
+      }
+
+      function end() {
+        clone.remove();
+        outAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME);
+        inAnchor.removeClass(NG_ANIMATE_SHIM_CLASS_NAME);
+      }
+    }
+
+    function prepareFromToAnchorAnimation(from, to, classes, anchors) {
+      var fromAnimation = prepareRegularAnimation(from);
+      var toAnimation = prepareRegularAnimation(to);
+
+      var anchorAnimations = [];
+      forEach(anchors, function(anchor) {
+        var outElement = anchor['out'];
+        var inElement = anchor['in'];
+        var animator = prepareAnchoredAnimation(classes, outElement, inElement);
+        if (animator) {
+          anchorAnimations.push(animator);
+        }
+      });
+
+      // no point in doing anything when there are no elements to animate
+      if (!fromAnimation && !toAnimation && anchorAnimations.length === 0) return;
+
+      return {
+        start: function() {
+          var animationRunners = [];
+
+          if (fromAnimation) {
+            animationRunners.push(fromAnimation.start());
+          }
+
+          if (toAnimation) {
+            animationRunners.push(toAnimation.start());
+          }
+
+          forEach(anchorAnimations, function(animation) {
+            animationRunners.push(animation.start());
+          });
+
+          var runner = new $$AnimateRunner({
+            end: endFn,
+            cancel: endFn // CSS-driven animations cannot be cancelled, only ended
+          });
+
+          $$AnimateRunner.all(animationRunners, function(status) {
+            runner.complete(status);
+          });
+
+          return runner;
+
+          function endFn() {
+            forEach(animationRunners, function(runner) {
+              runner.end();
+            });
+          }
+        }
+      };
+    }
+
+    function prepareRegularAnimation(animationDetails) {
+      var element = animationDetails.element;
+      var options = animationDetails.options || {};
+
+      if (animationDetails.structural) {
+        // structural animations ensure that the CSS classes are always applied
+        // before the detection starts.
+        options.structural = options.applyClassesEarly = true;
+
+        // we special case the leave animation since we want to ensure that
+        // the element is removed as soon as the animation is over. Otherwise
+        // a flicker might appear or the element may not be removed at all
+        options.event = animationDetails.event;
+        if (options.event === 'leave') {
+          options.onDone = options.domOperation;
+        }
+      } else {
+        options.event = null;
+      }
+
+      var animator = $animateCss(element, options);
+
+      // the driver lookup code inside of $$animation attempts to spawn a
+      // driver one by one until a driver returns a.$$willAnimate animator object.
+      // $animateCss will always return an object, however, it will pass in
+      // a flag as a hint as to whether an animation was detected or not
+      return animator.$$willAnimate ? animator : null;
+    }
+  }];
+}];
+
+// TODO(matsko): use caching here to speed things up for detection
+// TODO(matsko): add documentation
+//  by the time...
+
+var $$AnimateJsProvider = ['$animateProvider', function($animateProvider) {
+  this.$get = ['$injector', '$$AnimateRunner', '$$rAFMutex', '$$jqLite',
+       function($injector,   $$AnimateRunner,   $$rAFMutex,   $$jqLite) {
+
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+         // $animateJs(element, 'enter');
+    return function(element, event, classes, options) {
+      // the `classes` argument is optional and if it is not used
+      // then the classes will be resolved from the element's className
+      // property as well as options.addClass/options.removeClass.
+      if (arguments.length === 3 && isObject(classes)) {
+        options = classes;
+        classes = null;
+      }
+
+      options = prepareAnimationOptions(options);
+      if (!classes) {
+        classes = element.attr('class') || '';
+        if (options.addClass) {
+          classes += ' ' + options.addClass;
+        }
+        if (options.removeClass) {
+          classes += ' ' + options.removeClass;
+        }
+      }
+
+      var classesToAdd = options.addClass;
+      var classesToRemove = options.removeClass;
+
+      // the lookupAnimations function returns a series of animation objects that are
+      // matched up with one or more of the CSS classes. These animation objects are
+      // defined via the module.animation factory function. If nothing is detected then
+      // we don't return anything which then makes $animation query the next driver.
+      var animations = lookupAnimations(classes);
+      var before, after;
+      if (animations.length) {
+        var afterFn, beforeFn;
+        if (event == 'leave') {
+          beforeFn = 'leave';
+          afterFn = 'afterLeave'; // TODO(matsko): get rid of this
+        } else {
+          beforeFn = 'before' + event.charAt(0).toUpperCase() + event.substr(1);
+          afterFn = event;
+        }
+
+        if (event !== 'enter' && event !== 'move') {
+          before = packageAnimations(element, event, options, animations, beforeFn);
+        }
+        after  = packageAnimations(element, event, options, animations, afterFn);
+      }
+
+      // no matching animations
+      if (!before && !after) return;
+
+      function applyOptions() {
+        options.domOperation();
+        applyAnimationClasses(element, options);
+      }
+
+      return {
+        start: function() {
+          var closeActiveAnimations;
+          var chain = [];
+
+          if (before) {
+            chain.push(function(fn) {
+              closeActiveAnimations = before(fn);
+            });
+          }
+
+          if (chain.length) {
+            chain.push(function(fn) {
+              applyOptions();
+              fn(true);
+            });
+          } else {
+            applyOptions();
+          }
+
+          if (after) {
+            chain.push(function(fn) {
+              closeActiveAnimations = after(fn);
+            });
+          }
+
+          var animationClosed = false;
+          var runner = new $$AnimateRunner({
+            end: function() {
+              endAnimations();
+            },
+            cancel: function() {
+              endAnimations(true);
+            }
+          });
+
+          $$AnimateRunner.chain(chain, onComplete);
+          return runner;
+
+          function onComplete(success) {
+            animationClosed = true;
+            applyOptions();
+            applyAnimationStyles(element, options);
+            runner.complete(success);
+          }
+
+          function endAnimations(cancelled) {
+            if (!animationClosed) {
+              (closeActiveAnimations || noop)(cancelled);
+              onComplete(cancelled);
+            }
+          }
+        }
+      };
+
+      function executeAnimationFn(fn, element, event, options, onDone) {
+        var args;
+        switch (event) {
+          case 'animate':
+            args = [element, options.from, options.to, onDone];
+            break;
+
+          case 'setClass':
+            args = [element, classesToAdd, classesToRemove, onDone];
+            break;
+
+          case 'addClass':
+            args = [element, classesToAdd, onDone];
+            break;
+
+          case 'removeClass':
+            args = [element, classesToRemove, onDone];
+            break;
+
+          default:
+            args = [element, onDone];
+            break;
+        }
+
+        args.push(options);
+
+        var value = fn.apply(fn, args);
+        if (value) {
+          if (isFunction(value.start)) {
+            value = value.start();
+          }
+
+          if (value instanceof $$AnimateRunner) {
+            value.done(onDone);
+          } else if (isFunction(value)) {
+            // optional onEnd / onCancel callback
+            return value;
+          }
+        }
+
+        return noop;
+      }
+
+      function groupEventedAnimations(element, event, options, animations, fnName) {
+        var operations = [];
+        forEach(animations, function(ani) {
+          var animation = ani[fnName];
+          if (!animation) return;
+
+          // note that all of these animations will run in parallel
+          operations.push(function() {
+            var runner;
+            var endProgressCb;
+
+            var resolved = false;
+            var onAnimationComplete = function(rejected) {
+              if (!resolved) {
+                resolved = true;
+                (endProgressCb || noop)(rejected);
+                runner.complete(!rejected);
+              }
+            };
+
+            runner = new $$AnimateRunner({
+              end: function() {
+                onAnimationComplete();
+              },
+              cancel: function() {
+                onAnimationComplete(true);
+              }
+            });
+
+            endProgressCb = executeAnimationFn(animation, element, event, options, function(result) {
+              var cancelled = result === false;
+              onAnimationComplete(cancelled);
+            });
+
+            return runner;
+          });
+        });
+
+        return operations;
+      }
+
+      function packageAnimations(element, event, options, animations, fnName) {
+        var operations = groupEventedAnimations(element, event, options, animations, fnName);
+        if (operations.length === 0) {
+          var a,b;
+          if (fnName === 'beforeSetClass') {
+            a = groupEventedAnimations(element, 'removeClass', options, animations, 'beforeRemoveClass');
+            b = groupEventedAnimations(element, 'addClass', options, animations, 'beforeAddClass');
+          } else if (fnName === 'setClass') {
+            a = groupEventedAnimations(element, 'removeClass', options, animations, 'removeClass');
+            b = groupEventedAnimations(element, 'addClass', options, animations, 'addClass');
+          }
+
+          if (a) {
+            operations = operations.concat(a);
+          }
+          if (b) {
+            operations = operations.concat(b);
+          }
+        }
+
+        if (operations.length === 0) return;
+
+        // TODO(matsko): add documentation
+        return function startAnimation(callback) {
+          var runners = [];
+          if (operations.length) {
+            forEach(operations, function(animateFn) {
+              runners.push(animateFn());
+            });
+          }
+
+          runners.length ? $$AnimateRunner.all(runners, callback) : callback();
+
+          return function endFn(reject) {
+            forEach(runners, function(runner) {
+              reject ? runner.cancel() : runner.end();
+            });
+          };
+        };
+      }
+    };
+
+    function lookupAnimations(classes) {
+      classes = isArray(classes) ? classes : classes.split(' ');
+      var matches = [], flagMap = {};
+      for (var i=0; i < classes.length; i++) {
+        var klass = classes[i],
+            animationFactory = $animateProvider.$$registeredAnimations[klass];
+        if (animationFactory && !flagMap[klass]) {
+          matches.push($injector.get(animationFactory));
+          flagMap[klass] = true;
+        }
+      }
+      return matches;
+    }
+  }];
+}];
+
+var $$AnimateJsDriverProvider = ['$$animationProvider', function($$animationProvider) {
+  $$animationProvider.drivers.push('$$animateJsDriver');
+  this.$get = ['$$animateJs', '$$AnimateRunner', function($$animateJs, $$AnimateRunner) {
+    return function initDriverFn(animationDetails) {
+      if (animationDetails.from && animationDetails.to) {
+        var fromAnimation = prepareAnimation(animationDetails.from);
+        var toAnimation = prepareAnimation(animationDetails.to);
+        if (!fromAnimation && !toAnimation) return;
+
+        return {
+          start: function() {
+            var animationRunners = [];
+
+            if (fromAnimation) {
+              animationRunners.push(fromAnimation.start());
+            }
+
+            if (toAnimation) {
+              animationRunners.push(toAnimation.start());
+            }
+
+            $$AnimateRunner.all(animationRunners, done);
+
+            var runner = new $$AnimateRunner({
+              end: endFnFactory(),
+              cancel: endFnFactory()
+            });
+
+            return runner;
+
+            function endFnFactory() {
+              return function() {
+                forEach(animationRunners, function(runner) {
+                  // at this point we cannot cancel animations for groups just yet. 1.5+
+                  runner.end();
+                });
+              };
+            }
+
+            function done(status) {
+              runner.complete(status);
+            }
+          }
+        };
+      } else {
+        return prepareAnimation(animationDetails);
+      }
+    };
+
+    function prepareAnimation(animationDetails) {
+      // TODO(matsko): make sure to check for grouped animations and delegate down to normal animations
+      var element = animationDetails.element;
+      var event = animationDetails.event;
+      var options = animationDetails.options;
+      var classes = animationDetails.classes;
+      return $$animateJs(element, event, classes, options);
+    }
+  }];
+}];
+
+var NG_ANIMATE_ATTR_NAME = 'data-ng-animate';
+var NG_ANIMATE_PIN_DATA = '$ngAnimatePin';
+var $$AnimateQueueProvider = ['$animateProvider', function($animateProvider) {
+  var PRE_DIGEST_STATE = 1;
+  var RUNNING_STATE = 2;
+
+  var rules = this.rules = {
+    skip: [],
+    cancel: [],
+    join: []
+  };
+
+  function isAllowed(ruleType, element, currentAnimation, previousAnimation) {
+    return rules[ruleType].some(function(fn) {
+      return fn(element, currentAnimation, previousAnimation);
+    });
+  }
+
+  function hasAnimationClasses(options, and) {
+    options = options || {};
+    var a = (options.addClass || '').length > 0;
+    var b = (options.removeClass || '').length > 0;
+    return and ? a && b : a || b;
+  }
+
+  rules.join.push(function(element, newAnimation, currentAnimation) {
+    // if the new animation is class-based then we can just tack that on
+    return !newAnimation.structural && hasAnimationClasses(newAnimation.options);
+  });
+
+  rules.skip.push(function(element, newAnimation, currentAnimation) {
+    // there is no need to animate anything if no classes are being added and
+    // there is no structural animation that will be triggered
+    return !newAnimation.structural && !hasAnimationClasses(newAnimation.options);
+  });
+
+  rules.skip.push(function(element, newAnimation, currentAnimation) {
+    // why should we trigger a new structural animation if the element will
+    // be removed from the DOM anyway?
+    return currentAnimation.event == 'leave' && newAnimation.structural;
+  });
+
+  rules.skip.push(function(element, newAnimation, currentAnimation) {
+    // if there is a current animation then skip the class-based animation
+    return currentAnimation.structural && !newAnimation.structural;
+  });
+
+  rules.cancel.push(function(element, newAnimation, currentAnimation) {
+    // there can never be two structural animations running at the same time
+    return currentAnimation.structural && newAnimation.structural;
+  });
+
+  rules.cancel.push(function(element, newAnimation, currentAnimation) {
+    // if the previous animation is already running, but the new animation will
+    // be triggered, but the new animation is structural
+    return currentAnimation.state === RUNNING_STATE && newAnimation.structural;
+  });
+
+  rules.cancel.push(function(element, newAnimation, currentAnimation) {
+    var nO = newAnimation.options;
+    var cO = currentAnimation.options;
+
+    // if the exact same CSS class is added/removed then it's safe to cancel it
+    return (nO.addClass && nO.addClass === cO.removeClass) || (nO.removeClass && nO.removeClass === cO.addClass);
+  });
+
+  this.$get = ['$$rAF', '$rootScope', '$rootElement', '$document', '$$HashMap',
+               '$$animation', '$$AnimateRunner', '$templateRequest', '$$jqLite',
+       function($$rAF,   $rootScope,   $rootElement,   $document,   $$HashMap,
+                $$animation,   $$AnimateRunner,   $templateRequest,   $$jqLite) {
+
+    var activeAnimationsLookup = new $$HashMap();
+    var disabledElementsLookup = new $$HashMap();
+
+    var animationsEnabled = null;
+
+    // Wait until all directive and route-related templates are downloaded and
+    // compiled. The $templateRequest.totalPendingRequests variable keeps track of
+    // all of the remote templates being currently downloaded. If there are no
+    // templates currently downloading then the watcher will still fire anyway.
+    var deregisterWatch = $rootScope.$watch(
+      function() { return $templateRequest.totalPendingRequests === 0; },
+      function(isEmpty) {
+        if (!isEmpty) return;
+        deregisterWatch();
+
+        // Now that all templates have been downloaded, $animate will wait until
+        // the post digest queue is empty before enabling animations. By having two
+        // calls to $postDigest calls we can ensure that the flag is enabled at the
+        // very end of the post digest queue. Since all of the animations in $animate
+        // use $postDigest, it's important that the code below executes at the end.
+        // This basically means that the page is fully downloaded and compiled before
+        // any animations are triggered.
+        $rootScope.$$postDigest(function() {
+          $rootScope.$$postDigest(function() {
+            // we check for null directly in the event that the application already called
+            // .enabled() with whatever arguments that it provided it with
+            if (animationsEnabled === null) {
+              animationsEnabled = true;
+            }
+          });
+        });
+      }
+    );
+
+    var bodyElement = jqLite($document[0].body);
+
+    var callbackRegistry = {};
+
+    // remember that the classNameFilter is set during the provider/config
+    // stage therefore we can optimize here and setup a helper function
+    var classNameFilter = $animateProvider.classNameFilter();
+    var isAnimatableClassName = !classNameFilter
+              ? function() { return true; }
+              : function(className) {
+                return classNameFilter.test(className);
+              };
+
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+
+    function normalizeAnimationOptions(element, options) {
+      return mergeAnimationOptions(element, options, {});
+    }
+
+    function findCallbacks(element, event) {
+      var targetNode = getDomNode(element);
+
+      var matches = [];
+      var entries = callbackRegistry[event];
+      if (entries) {
+        forEach(entries, function(entry) {
+          if (entry.node.contains(targetNode)) {
+            matches.push(entry.callback);
+          }
+        });
+      }
+
+      return matches;
+    }
+
+    function triggerCallback(event, element, phase, data) {
+      $$rAF(function() {
+        forEach(findCallbacks(element, event), function(callback) {
+          callback(element, phase, data);
+        });
+      });
+    }
+
+    return {
+      on: function(event, container, callback) {
+        var node = extractElementNode(container);
+        callbackRegistry[event] = callbackRegistry[event] || [];
+        callbackRegistry[event].push({
+          node: node,
+          callback: callback
+        });
+      },
+
+      off: function(event, container, callback) {
+        var entries = callbackRegistry[event];
+        if (!entries) return;
+
+        callbackRegistry[event] = arguments.length === 1
+            ? null
+            : filterFromRegistry(entries, container, callback);
+
+        function filterFromRegistry(list, matchContainer, matchCallback) {
+          var containerNode = extractElementNode(matchContainer);
+          return list.filter(function(entry) {
+            var isMatch = entry.node === containerNode &&
+                            (!matchCallback || entry.callback === matchCallback);
+            return !isMatch;
+          });
+        }
+      },
+
+      pin: function(element, parentElement) {
+        assertArg(isElement(element), 'element', 'not an element');
+        assertArg(isElement(parentElement), 'parentElement', 'not an element');
+        element.data(NG_ANIMATE_PIN_DATA, parentElement);
+      },
+
+      push: function(element, event, options, domOperation) {
+        options = options || {};
+        options.domOperation = domOperation;
+        return queueAnimation(element, event, options);
+      },
+
+      // this method has four signatures:
+      //  () - global getter
+      //  (bool) - global setter
+      //  (element) - element getter
+      //  (element, bool) - element setter<F37>
+      enabled: function(element, bool) {
+        var argCount = arguments.length;
+
+        if (argCount === 0) {
+          // () - Global getter
+          bool = !!animationsEnabled;
+        } else {
+          var hasElement = isElement(element);
+
+          if (!hasElement) {
+            // (bool) - Global setter
+            bool = animationsEnabled = !!element;
+          } else {
+            var node = getDomNode(element);
+            var recordExists = disabledElementsLookup.get(node);
+
+            if (argCount === 1) {
+              // (element) - Element getter
+              bool = !recordExists;
+            } else {
+              // (element, bool) - Element setter
+              bool = !!bool;
+              if (!bool) {
+                disabledElementsLookup.put(node, true);
+              } else if (recordExists) {
+                disabledElementsLookup.remove(node);
+              }
+            }
+          }
+        }
+
+        return bool;
+      }
+    };
+
+    function queueAnimation(element, event, options) {
+      var node, parent;
+      element = stripCommentsFromElement(element);
+      if (element) {
+        node = getDomNode(element);
+        parent = element.parent();
+      }
+
+      options = prepareAnimationOptions(options);
+
+      // we create a fake runner with a working promise.
+      // These methods will become available after the digest has passed
+      var runner = new $$AnimateRunner();
+
+      // there are situations where a directive issues an animation for
+      // a jqLite wrapper that contains only comment nodes... If this
+      // happens then there is no way we can perform an animation
+      if (!node) {
+        close();
+        return runner;
+      }
+
+      if (isArray(options.addClass)) {
+        options.addClass = options.addClass.join(' ');
+      }
+
+      if (isArray(options.removeClass)) {
+        options.removeClass = options.removeClass.join(' ');
+      }
+
+      if (options.from && !isObject(options.from)) {
+        options.from = null;
+      }
+
+      if (options.to && !isObject(options.to)) {
+        options.to = null;
+      }
+
+      var className = [node.className, options.addClass, options.removeClass].join(' ');
+      if (!isAnimatableClassName(className)) {
+        close();
+        return runner;
+      }
+
+      var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0;
+
+      // this is a hard disable of all animations for the application or on
+      // the element itself, therefore  there is no need to continue further
+      // past this point if not enabled
+      var skipAnimations = !animationsEnabled || disabledElementsLookup.get(node);
+      var existingAnimation = (!skipAnimations && activeAnimationsLookup.get(node)) || {};
+      var hasExistingAnimation = !!existingAnimation.state;
+
+      // there is no point in traversing the same collection of parent ancestors if a followup
+      // animation will be run on the same element that already did all that checking work
+      if (!skipAnimations && (!hasExistingAnimation || existingAnimation.state != PRE_DIGEST_STATE)) {
+        skipAnimations = !areAnimationsAllowed(element, parent, event);
+      }
+
+      if (skipAnimations) {
+        close();
+        return runner;
+      }
+
+      if (isStructural) {
+        closeChildAnimations(element);
+      }
+
+      var newAnimation = {
+        structural: isStructural,
+        element: element,
+        event: event,
+        close: close,
+        options: options,
+        runner: runner
+      };
+
+      if (hasExistingAnimation) {
+        var skipAnimationFlag = isAllowed('skip', element, newAnimation, existingAnimation);
+        if (skipAnimationFlag) {
+          if (existingAnimation.state === RUNNING_STATE) {
+            close();
+            return runner;
+          } else {
+            mergeAnimationOptions(element, existingAnimation.options, options);
+            return existingAnimation.runner;
+          }
+        }
+
+        var cancelAnimationFlag = isAllowed('cancel', element, newAnimation, existingAnimation);
+        if (cancelAnimationFlag) {
+          if (existingAnimation.state === RUNNING_STATE) {
+            // this will end the animation right away and it is safe
+            // to do so since the animation is already running and the
+            // runner callback code will run in async
+            existingAnimation.runner.end();
+          } else if (existingAnimation.structural) {
+            // this means that the animation is queued into a digest, but
+            // hasn't started yet. Therefore it is safe to run the close
+            // method which will call the runner methods in async.
+            existingAnimation.close();
+          } else {
+            // this will merge the existing animation options into this new follow-up animation
+            mergeAnimationOptions(element, newAnimation.options, existingAnimation.options);
+          }
+        } else {
+          // a joined animation means that this animation will take over the existing one
+          // so an example would involve a leave animation taking over an enter. Then when
+          // the postDigest kicks in the enter will be ignored.
+          var joinAnimationFlag = isAllowed('join', element, newAnimation, existingAnimation);
+          if (joinAnimationFlag) {
+            if (existingAnimation.state === RUNNING_STATE) {
+              normalizeAnimationOptions(element, options);
+            } else {
+              event = newAnimation.event = existingAnimation.event;
+              options = mergeAnimationOptions(element, existingAnimation.options, newAnimation.options);
+              return runner;
+            }
+          }
+        }
+      } else {
+        // normalization in this case means that it removes redundant CSS classes that
+        // already exist (addClass) or do not exist (removeClass) on the element
+        normalizeAnimationOptions(element, options);
+      }
+
+      // when the options are merged and cleaned up we may end up not having to do
+      // an animation at all, therefore we should check this before issuing a post
+      // digest callback. Structural animations will always run no matter what.
+      var isValidAnimation = newAnimation.structural;
+      if (!isValidAnimation) {
+        // animate (from/to) can be quickly checked first, otherwise we check if any classes are present
+        isValidAnimation = (newAnimation.event === 'animate' && Object.keys(newAnimation.options.to || {}).length > 0)
+                            || hasAnimationClasses(newAnimation.options);
+      }
+
+      if (!isValidAnimation) {
+        close();
+        clearElementAnimationState(element);
+        return runner;
+      }
+
+      if (isStructural) {
+        closeParentClassBasedAnimations(parent);
+      }
+
+      // the counter keeps track of cancelled animations
+      var counter = (existingAnimation.counter || 0) + 1;
+      newAnimation.counter = counter;
+
+      markElementAnimationState(element, PRE_DIGEST_STATE, newAnimation);
+
+      $rootScope.$$postDigest(function() {
+        var animationDetails = activeAnimationsLookup.get(node);
+        var animationCancelled = !animationDetails;
+        animationDetails = animationDetails || {};
+
+        // if addClass/removeClass is called before something like enter then the
+        // registered parent element may not be present. The code below will ensure
+        // that a final value for parent element is obtained
+        var parentElement = element.parent() || [];
+
+        // animate/structural/class-based animations all have requirements. Otherwise there
+        // is no point in performing an animation. The parent node must also be set.
+        var isValidAnimation = parentElement.length > 0
+                                && (animationDetails.event === 'animate'
+                                    || animationDetails.structural
+                                    || hasAnimationClasses(animationDetails.options));
+
+        // this means that the previous animation was cancelled
+        // even if the follow-up animation is the same event
+        if (animationCancelled || animationDetails.counter !== counter || !isValidAnimation) {
+          // if another animation did not take over then we need
+          // to make sure that the domOperation and options are
+          // handled accordingly
+          if (animationCancelled) {
+            applyAnimationClasses(element, options);
+            applyAnimationStyles(element, options);
+          }
+
+          // if the event changed from something like enter to leave then we do
+          // it, otherwise if it's the same then the end result will be the same too
+          if (animationCancelled || (isStructural && animationDetails.event !== event)) {
+            options.domOperation();
+            runner.end();
+          }
+
+          // in the event that the element animation was not cancelled or a follow-up animation
+          // isn't allowed to animate from here then we need to clear the state of the element
+          // so that any future animations won't read the expired animation data.
+          if (!isValidAnimation) {
+            clearElementAnimationState(element);
+          }
+
+          return;
+        }
+
+        // this combined multiple class to addClass / removeClass into a setClass event
+        // so long as a structural event did not take over the animation
+        event = !animationDetails.structural && hasAnimationClasses(animationDetails.options, true)
+            ? 'setClass'
+            : animationDetails.event;
+
+        if (animationDetails.structural) {
+          closeParentClassBasedAnimations(parentElement);
+        }
+
+        markElementAnimationState(element, RUNNING_STATE);
+        var realRunner = $$animation(element, event, animationDetails.options);
+        realRunner.done(function(status) {
+          close(!status);
+          var animationDetails = activeAnimationsLookup.get(node);
+          if (animationDetails && animationDetails.counter === counter) {
+            clearElementAnimationState(getDomNode(element));
+          }
+          notifyProgress(runner, event, 'close', {});
+        });
+
+        // this will update the runner's flow-control events based on
+        // the `realRunner` object.
+        runner.setHost(realRunner);
+        notifyProgress(runner, event, 'start', {});
+      });
+
+      return runner;
+
+      function notifyProgress(runner, event, phase, data) {
+        triggerCallback(event, element, phase, data);
+        runner.progress(event, phase, data);
+      }
+
+      function close(reject) { // jshint ignore:line
+        applyAnimationClasses(element, options);
+        applyAnimationStyles(element, options);
+        options.domOperation();
+        runner.complete(!reject);
+      }
+    }
+
+    function closeChildAnimations(element) {
+      var node = getDomNode(element);
+      var children = node.querySelectorAll('[' + NG_ANIMATE_ATTR_NAME + ']');
+      forEach(children, function(child) {
+        var state = parseInt(child.getAttribute(NG_ANIMATE_ATTR_NAME));
+        var animationDetails = activeAnimationsLookup.get(child);
+        switch (state) {
+          case RUNNING_STATE:
+            animationDetails.runner.end();
+            /* falls through */
+          case PRE_DIGEST_STATE:
+            if (animationDetails) {
+              activeAnimationsLookup.remove(child);
+            }
+            break;
+        }
+      });
+    }
+
+    function clearElementAnimationState(element) {
+      var node = getDomNode(element);
+      node.removeAttribute(NG_ANIMATE_ATTR_NAME);
+      activeAnimationsLookup.remove(node);
+    }
+
+    function isMatchingElement(nodeOrElmA, nodeOrElmB) {
+      return getDomNode(nodeOrElmA) === getDomNode(nodeOrElmB);
+    }
+
+    function closeParentClassBasedAnimations(startingElement) {
+      var parentNode = getDomNode(startingElement);
+      do {
+        if (!parentNode || parentNode.nodeType !== ELEMENT_NODE) break;
+
+        var animationDetails = activeAnimationsLookup.get(parentNode);
+        if (animationDetails) {
+          examineParentAnimation(parentNode, animationDetails);
+        }
+
+        parentNode = parentNode.parentNode;
+      } while (true);
+
+      // since animations are detected from CSS classes, we need to flush all parent
+      // class-based animations so that the parent classes are all present for child
+      // animations to properly function (otherwise any CSS selectors may not work)
+      function examineParentAnimation(node, animationDetails) {
+        // enter/leave/move always have priority
+        if (animationDetails.structural || !hasAnimationClasses(animationDetails.options)) return;
+
+        if (animationDetails.state === RUNNING_STATE) {
+          animationDetails.runner.end();
+        }
+        clearElementAnimationState(node);
+      }
+    }
+
+    function areAnimationsAllowed(element, parentElement, event) {
+      var bodyElementDetected = false;
+      var rootElementDetected = false;
+      var parentAnimationDetected = false;
+      var animateChildren;
+
+      var parentHost = element.data(NG_ANIMATE_PIN_DATA);
+      if (parentHost) {
+        parentElement = parentHost;
+      }
+
+      while (parentElement && parentElement.length) {
+        if (!rootElementDetected) {
+          // angular doesn't want to attempt to animate elements outside of the application
+          // therefore we need to ensure that the rootElement is an ancestor of the current element
+          rootElementDetected = isMatchingElement(parentElement, $rootElement);
+        }
+
+        var parentNode = parentElement[0];
+        if (parentNode.nodeType !== ELEMENT_NODE) {
+          // no point in inspecting the #document element
+          break;
+        }
+
+        var details = activeAnimationsLookup.get(parentNode) || {};
+        // either an enter, leave or move animation will commence
+        // therefore we can't allow any animations to take place
+        // but if a parent animation is class-based then that's ok
+        if (!parentAnimationDetected) {
+          parentAnimationDetected = details.structural || disabledElementsLookup.get(parentNode);
+        }
+
+        if (isUndefined(animateChildren) || animateChildren === true) {
+          var value = parentElement.data(NG_ANIMATE_CHILDREN_DATA);
+          if (isDefined(value)) {
+            animateChildren = value;
+          }
+        }
+
+        // there is no need to continue traversing at this point
+        if (parentAnimationDetected && animateChildren === false) break;
+
+        if (!rootElementDetected) {
+          // angular doesn't want to attempt to animate elements outside of the application
+          // therefore we need to ensure that the rootElement is an ancestor of the current element
+          rootElementDetected = isMatchingElement(parentElement, $rootElement);
+          if (!rootElementDetected) {
+            parentHost = parentElement.data(NG_ANIMATE_PIN_DATA);
+            if (parentHost) {
+              parentElement = parentHost;
+            }
+          }
+        }
+
+        if (!bodyElementDetected) {
+          // we also need to ensure that the element is or will be apart of the body element
+          // otherwise it is pointless to even issue an animation to be rendered
+          bodyElementDetected = isMatchingElement(parentElement, bodyElement);
+        }
+
+        parentElement = parentElement.parent();
+      }
+
+      var allowAnimation = !parentAnimationDetected || animateChildren;
+      return allowAnimation && rootElementDetected && bodyElementDetected;
+    }
+
+    function markElementAnimationState(element, state, details) {
+      details = details || {};
+      details.state = state;
+
+      var node = getDomNode(element);
+      node.setAttribute(NG_ANIMATE_ATTR_NAME, state);
+
+      var oldValue = activeAnimationsLookup.get(node);
+      var newValue = oldValue
+          ? extend(oldValue, details)
+          : details;
+      activeAnimationsLookup.put(node, newValue);
+    }
+  }];
+}];
+
+var $$rAFMutexFactory = ['$$rAF', function($$rAF) {
+  return function() {
+    var passed = false;
+    $$rAF(function() {
+      passed = true;
+    });
+    return function(fn) {
+      passed ? fn() : $$rAF(fn);
+    };
+  };
+}];
+
+var $$AnimateRunnerFactory = ['$q', '$$rAFMutex', function($q, $$rAFMutex) {
+  var INITIAL_STATE = 0;
+  var DONE_PENDING_STATE = 1;
+  var DONE_COMPLETE_STATE = 2;
+
+  AnimateRunner.chain = function(chain, callback) {
+    var index = 0;
+
+    next();
+    function next() {
+      if (index === chain.length) {
+        callback(true);
+        return;
+      }
+
+      chain[index](function(response) {
+        if (response === false) {
+          callback(false);
+          return;
+        }
+        index++;
+        next();
+      });
+    }
+  };
+
+  AnimateRunner.all = function(runners, callback) {
+    var count = 0;
+    var status = true;
+    forEach(runners, function(runner) {
+      runner.done(onProgress);
+    });
+
+    function onProgress(response) {
+      status = status && response;
+      if (++count === runners.length) {
+        callback(status);
+      }
+    }
+  };
+
+  function AnimateRunner(host) {
+    this.setHost(host);
+
+    this._doneCallbacks = [];
+    this._runInAnimationFrame = $$rAFMutex();
+    this._state = 0;
+  }
+
+  AnimateRunner.prototype = {
+    setHost: function(host) {
+      this.host = host || {};
+    },
+
+    done: function(fn) {
+      if (this._state === DONE_COMPLETE_STATE) {
+        fn();
+      } else {
+        this._doneCallbacks.push(fn);
+      }
+    },
+
+    progress: noop,
+
+    getPromise: function() {
+      if (!this.promise) {
+        var self = this;
+        this.promise = $q(function(resolve, reject) {
+          self.done(function(status) {
+            status === false ? reject() : resolve();
+          });
+        });
+      }
+      return this.promise;
+    },
+
+    then: function(resolveHandler, rejectHandler) {
+      return this.getPromise().then(resolveHandler, rejectHandler);
+    },
+
+    'catch': function(handler) {
+      return this.getPromise()['catch'](handler);
+    },
+
+    'finally': function(handler) {
+      return this.getPromise()['finally'](handler);
+    },
+
+    pause: function() {
+      if (this.host.pause) {
+        this.host.pause();
+      }
+    },
+
+    resume: function() {
+      if (this.host.resume) {
+        this.host.resume();
+      }
+    },
+
+    end: function() {
+      if (this.host.end) {
+        this.host.end();
+      }
+      this._resolve(true);
+    },
+
+    cancel: function() {
+      if (this.host.cancel) {
+        this.host.cancel();
+      }
+      this._resolve(false);
+    },
+
+    complete: function(response) {
+      var self = this;
+      if (self._state === INITIAL_STATE) {
+        self._state = DONE_PENDING_STATE;
+        self._runInAnimationFrame(function() {
+          self._resolve(response);
+        });
+      }
+    },
+
+    _resolve: function(response) {
+      if (this._state !== DONE_COMPLETE_STATE) {
+        forEach(this._doneCallbacks, function(fn) {
+          fn(response);
+        });
+        this._doneCallbacks.length = 0;
+        this._state = DONE_COMPLETE_STATE;
+      }
+    }
+  };
+
+  return AnimateRunner;
+}];
+
+var $$AnimationProvider = ['$animateProvider', function($animateProvider) {
+  var NG_ANIMATE_REF_ATTR = 'ng-animate-ref';
+
+  var drivers = this.drivers = [];
+
+  var RUNNER_STORAGE_KEY = '$$animationRunner';
+
+  function setRunner(element, runner) {
+    element.data(RUNNER_STORAGE_KEY, runner);
+  }
+
+  function removeRunner(element) {
+    element.removeData(RUNNER_STORAGE_KEY);
+  }
+
+  function getRunner(element) {
+    return element.data(RUNNER_STORAGE_KEY);
+  }
+
+  this.$get = ['$$jqLite', '$rootScope', '$injector', '$$AnimateRunner', '$$rAFScheduler',
+       function($$jqLite,   $rootScope,   $injector,   $$AnimateRunner,   $$rAFScheduler) {
+
+    var animationQueue = [];
+    var applyAnimationClasses = applyAnimationClassesFactory($$jqLite);
+
+    var totalPendingClassBasedAnimations = 0;
+    var totalActiveClassBasedAnimations = 0;
+    var classBasedAnimationsQueue = [];
+
+    // TODO(matsko): document the signature in a better way
+    return function(element, event, options) {
+      options = prepareAnimationOptions(options);
+      var isStructural = ['enter', 'move', 'leave'].indexOf(event) >= 0;
+
+      // there is no animation at the current moment, however
+      // these runner methods will get later updated with the
+      // methods leading into the driver's end/cancel methods
+      // for now they just stop the animation from starting
+      var runner = new $$AnimateRunner({
+        end: function() { close(); },
+        cancel: function() { close(true); }
+      });
+
+      if (!drivers.length) {
+        close();
+        return runner;
+      }
+
+      setRunner(element, runner);
+
+      var classes = mergeClasses(element.attr('class'), mergeClasses(options.addClass, options.removeClass));
+      var tempClasses = options.tempClasses;
+      if (tempClasses) {
+        classes += ' ' + tempClasses;
+        options.tempClasses = null;
+      }
+
+      var classBasedIndex;
+      if (!isStructural) {
+        classBasedIndex = totalPendingClassBasedAnimations;
+        totalPendingClassBasedAnimations += 1;
+      }
+
+      animationQueue.push({
+        // this data is used by the postDigest code and passed into
+        // the driver step function
+        element: element,
+        classes: classes,
+        event: event,
+        classBasedIndex: classBasedIndex,
+        structural: isStructural,
+        options: options,
+        beforeStart: beforeStart,
+        close: close
+      });
+
+      element.on('$destroy', handleDestroyedElement);
+
+      // we only want there to be one function called within the post digest
+      // block. This way we can group animations for all the animations that
+      // were apart of the same postDigest flush call.
+      if (animationQueue.length > 1) return runner;
+
+      $rootScope.$$postDigest(function() {
+        totalActiveClassBasedAnimations = totalPendingClassBasedAnimations;
+        totalPendingClassBasedAnimations = 0;
+        classBasedAnimationsQueue.length = 0;
+
+        var animations = [];
+        forEach(animationQueue, function(entry) {
+          // the element was destroyed early on which removed the runner
+          // form its storage. This means we can't animate this element
+          // at all and it already has been closed due to destruction.
+          if (getRunner(entry.element)) {
+            animations.push(entry);
+          }
+        });
+
+        // now any future animations will be in another postDigest
+        animationQueue.length = 0;
+
+        forEach(groupAnimations(animations), function(animationEntry) {
+          if (animationEntry.structural) {
+            triggerAnimationStart();
+          } else {
+            classBasedAnimationsQueue.push({
+              node: getDomNode(animationEntry.element),
+              fn: triggerAnimationStart
+            });
+
+            if (animationEntry.classBasedIndex === totalActiveClassBasedAnimations - 1) {
+              // we need to sort each of the animations in order of parent to child
+              // relationships. This ensures that the child classes are applied at the
+              // right time.
+              classBasedAnimationsQueue = classBasedAnimationsQueue.sort(function(a,b) {
+                return b.node.contains(a.node);
+              }).map(function(entry) {
+                return entry.fn;
+              });
+
+              $$rAFScheduler(classBasedAnimationsQueue);
+            }
+          }
+
+          function triggerAnimationStart() {
+            // it's important that we apply the `ng-animate` CSS class and the
+            // temporary classes before we do any driver invoking since these
+            // CSS classes may be required for proper CSS detection.
+            animationEntry.beforeStart();
+
+            var startAnimationFn, closeFn = animationEntry.close;
+
+            // in the event that the element was removed before the digest runs or
+            // during the RAF sequencing then we should not trigger the animation.
+            var targetElement = animationEntry.anchors
+                ? (animationEntry.from.element || animationEntry.to.element)
+                : animationEntry.element;
+
+            if (getRunner(targetElement)) {
+              var operation = invokeFirstDriver(animationEntry);
+              if (operation) {
+                startAnimationFn = operation.start;
+              }
+            }
+
+            if (!startAnimationFn) {
+              closeFn();
+            } else {
+              var animationRunner = startAnimationFn();
+              animationRunner.done(function(status) {
+                closeFn(!status);
+              });
+              updateAnimationRunners(animationEntry, animationRunner);
+            }
+          }
+        });
+      });
+
+      return runner;
+
+      // TODO(matsko): change to reference nodes
+      function getAnchorNodes(node) {
+        var SELECTOR = '[' + NG_ANIMATE_REF_ATTR + ']';
+        var items = node.hasAttribute(NG_ANIMATE_REF_ATTR)
+              ? [node]
+              : node.querySelectorAll(SELECTOR);
+        var anchors = [];
+        forEach(items, function(node) {
+          var attr = node.getAttribute(NG_ANIMATE_REF_ATTR);
+          if (attr && attr.length) {
+            anchors.push(node);
+          }
+        });
+        return anchors;
+      }
+
+      function groupAnimations(animations) {
+        var preparedAnimations = [];
+        var refLookup = {};
+        forEach(animations, function(animation, index) {
+          var element = animation.element;
+          var node = getDomNode(element);
+          var event = animation.event;
+          var enterOrMove = ['enter', 'move'].indexOf(event) >= 0;
+          var anchorNodes = animation.structural ? getAnchorNodes(node) : [];
+
+          if (anchorNodes.length) {
+            var direction = enterOrMove ? 'to' : 'from';
+
+            forEach(anchorNodes, function(anchor) {
+              var key = anchor.getAttribute(NG_ANIMATE_REF_ATTR);
+              refLookup[key] = refLookup[key] || {};
+              refLookup[key][direction] = {
+                animationID: index,
+                element: jqLite(anchor)
+              };
+            });
+          } else {
+            preparedAnimations.push(animation);
+          }
+        });
+
+        var usedIndicesLookup = {};
+        var anchorGroups = {};
+        forEach(refLookup, function(operations, key) {
+          var from = operations.from;
+          var to = operations.to;
+
+          if (!from || !to) {
+            // only one of these is set therefore we can't have an
+            // anchor animation since all three pieces are required
+            var index = from ? from.animationID : to.animationID;
+            var indexKey = index.toString();
+            if (!usedIndicesLookup[indexKey]) {
+              usedIndicesLookup[indexKey] = true;
+              preparedAnimations.push(animations[index]);
+            }
+            return;
+          }
+
+          var fromAnimation = animations[from.animationID];
+          var toAnimation = animations[to.animationID];
+          var lookupKey = from.animationID.toString();
+          if (!anchorGroups[lookupKey]) {
+            var group = anchorGroups[lookupKey] = {
+              structural: true,
+              beforeStart: function() {
+                fromAnimation.beforeStart();
+                toAnimation.beforeStart();
+              },
+              close: function() {
+                fromAnimation.close();
+                toAnimation.close();
+              },
+              classes: cssClassesIntersection(fromAnimation.classes, toAnimation.classes),
+              from: fromAnimation,
+              to: toAnimation,
+              anchors: [] // TODO(matsko): change to reference nodes
+            };
+
+            // the anchor animations require that the from and to elements both have at least
+            // one shared CSS class which effictively marries the two elements together to use
+            // the same animation driver and to properly sequence the anchor animation.
+            if (group.classes.length) {
+              preparedAnimations.push(group);
+            } else {
+              preparedAnimations.push(fromAnimation);
+              preparedAnimations.push(toAnimation);
+            }
+          }
+
+          anchorGroups[lookupKey].anchors.push({
+            'out': from.element, 'in': to.element
+          });
+        });
+
+        return preparedAnimations;
+      }
+
+      function cssClassesIntersection(a,b) {
+        a = a.split(' ');
+        b = b.split(' ');
+        var matches = [];
+
+        for (var i = 0; i < a.length; i++) {
+          var aa = a[i];
+          if (aa.substring(0,3) === 'ng-') continue;
+
+          for (var j = 0; j < b.length; j++) {
+            if (aa === b[j]) {
+              matches.push(aa);
+              break;
+            }
+          }
+        }
+
+        return matches.join(' ');
+      }
+
+      function invokeFirstDriver(animationDetails) {
+        // we loop in reverse order since the more general drivers (like CSS and JS)
+        // may attempt more elements, but custom drivers are more particular
+        for (var i = drivers.length - 1; i >= 0; i--) {
+          var driverName = drivers[i];
+          if (!$injector.has(driverName)) continue; // TODO(matsko): remove this check
+
+          var factory = $injector.get(driverName);
+          var driver = factory(animationDetails);
+          if (driver) {
+            return driver;
+          }
+        }
+      }
+
+      function beforeStart() {
+        element.addClass(NG_ANIMATE_CLASSNAME);
+        if (tempClasses) {
+          $$jqLite.addClass(element, tempClasses);
+        }
+      }
+
+      function updateAnimationRunners(animation, newRunner) {
+        if (animation.from && animation.to) {
+          update(animation.from.element);
+          update(animation.to.element);
+        } else {
+          update(animation.element);
+        }
+
+        function update(element) {
+          getRunner(element).setHost(newRunner);
+        }
+      }
+
+      function handleDestroyedElement() {
+        var runner = getRunner(element);
+        if (runner && (event !== 'leave' || !options.$$domOperationFired)) {
+          runner.end();
+        }
+      }
+
+      function close(rejected) { // jshint ignore:line
+        element.off('$destroy', handleDestroyedElement);
+        removeRunner(element);
+
+        applyAnimationClasses(element, options);
+        applyAnimationStyles(element, options);
+        options.domOperation();
+
+        if (tempClasses) {
+          $$jqLite.removeClass(element, tempClasses);
+        }
+
+        element.removeClass(NG_ANIMATE_CLASSNAME);
+        runner.complete(!rejected);
+      }
+    };
+  }];
+}];
+
+/* global angularAnimateModule: true,
+
+   $$rAFMutexFactory,
+   $$rAFSchedulerFactory,
+   $$AnimateChildrenDirective,
+   $$AnimateRunnerFactory,
+   $$AnimateQueueProvider,
+   $$AnimationProvider,
+   $AnimateCssProvider,
+   $$AnimateCssDriverProvider,
+   $$AnimateJsProvider,
+   $$AnimateJsDriverProvider,
+*/
+
+/**
+ * @ngdoc module
+ * @name ngAnimate
+ * @description
+ *
+ * The `ngAnimate` module provides support for CSS-based animations (keyframes and transitions) as well as JavaScript-based animations via
+ * callback hooks. Animations are not enabled by default, however, by including `ngAnimate` then the animation hooks are enabled for an Angular app.
+ *
+ * <div doc-module-components="ngAnimate"></div>
+ *
+ * # Usage
+ * Simply put, there are two ways to make use of animations when ngAnimate is used: by using **CSS** and **JavaScript**. The former works purely based
+ * using CSS (by using matching CSS selectors/styles) and the latter triggers animations that are registered via `module.animation()`. For
+ * both CSS and JS animations the sole requirement is to have a matching `CSS class` that exists both in the registered animation and within
+ * the HTML element that the animation will be triggered on.
+ *
+ * ## Directive Support
+ * The following directives are "animation aware":
+ *
+ * | Directive                                                                                                | Supported Animations                                                     |
+ * |----------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------|
+ * | {@link ng.directive:ngRepeat#animations ngRepeat}                                                        | enter, leave and move                                                    |
+ * | {@link ngRoute.directive:ngView#animations ngView}                                                       | enter and leave                                                          |
+ * | {@link ng.directive:ngInclude#animations ngInclude}                                                      | enter and leave                                                          |
+ * | {@link ng.directive:ngSwitch#animations ngSwitch}                                                        | enter and leave                                                          |
+ * | {@link ng.directive:ngIf#animations ngIf}                                                                | enter and leave                                                          |
+ * | {@link ng.directive:ngClass#animations ngClass}                                                          | add and remove (the CSS class(es) present)                               |
+ * | {@link ng.directive:ngShow#animations ngShow} & {@link ng.directive:ngHide#animations ngHide}            | add and remove (the ng-hide class value)                                 |
+ * | {@link ng.directive:form#animation-hooks form} & {@link ng.directive:ngModel#animation-hooks ngModel}    | add and remove (dirty, pristine, valid, invalid & all other validations) |
+ * | {@link module:ngMessages#animations ngMessages}                                                          | add and remove (ng-active & ng-inactive)                                 |
+ * | {@link module:ngMessages#animations ngMessage}                                                           | enter and leave                                                          |
+ *
+ * (More information can be found by visiting each the documentation associated with each directive.)
+ *
+ * ## CSS-based Animations
+ *
+ * CSS-based animations with ngAnimate are unique since they require no JavaScript code at all. By using a CSS class that we reference between our HTML
+ * and CSS code we can create an animation that will be picked up by Angular when an the underlying directive performs an operation.
+ *
+ * The example below shows how an `enter` animation can be made possible on a element using `ng-if`:
+ *
+ * ```html
+ * <div ng-if="bool" class="fade">
+ *    Fade me in out
+ * </div>
+ * <button ng-click="bool=true">Fade In!</button>
+ * <button ng-click="bool=false">Fade Out!</button>
+ * ```
+ *
+ * Notice the CSS class **fade**? We can now create the CSS transition code that references this class:
+ *
+ * ```css
+ * /&#42; The starting CSS styles for the enter animation &#42;/
+ * .fade.ng-enter {
+ *   transition:0.5s linear all;
+ *   opacity:0;
+ * }
+ *
+ * /&#42; The starting CSS styles for the enter animation &#42;/
+ * .fade.ng-enter.ng-enter-active {
+ *   opacity:1;
+ * }
+ * ```
+ *
+ * The key thing to remember here is that, depending on the animation event (which each of the directives above trigger depending on what's going on) two
+ * generated CSS classes will be applied to the element; in the example above we have `.ng-enter` and `.ng-enter-active`. For CSS transitions, the transition
+ * code **must** be defined within the starting CSS class (in this case `.ng-enter`). The destination class is what the transition will animate towards.
+ *
+ * If for example we wanted to create animations for `leave` and `move` (ngRepeat triggers move) then we can do so using the same CSS naming conventions:
+ *
+ * ```css
+ * /&#42; now the element will fade out before it is removed from the DOM &#42;/
+ * .fade.ng-leave {
+ *   transition:0.5s linear all;
+ *   opacity:1;
+ * }
+ * .fade.ng-leave.ng-leave-active {
+ *   opacity:0;
+ * }
+ * ```
+ *
+ * We can also make use of **CSS Keyframes** by referencing the keyframe animation within the starting CSS class:
+ *
+ * ```css
+ * /&#42; there is no need to define anything inside of the destination
+ * CSS class since the keyframe will take charge of the animation &#42;/
+ * .fade.ng-leave {
+ *   animation: my_fade_animation 0.5s linear;
+ *   -webkit-animation: my_fade_animation 0.5s linear;
+ * }
+ *
+ * @keyframes my_fade_animation {
+ *   from { opacity:1; }
+ *   to { opacity:0; }
+ * }
+ *
+ * @-webkit-keyframes my_fade_animation {
+ *   from { opacity:1; }
+ *   to { opacity:0; }
+ * }
+ * ```
+ *
+ * Feel free also mix transitions and keyframes together as well as any other CSS classes on the same element.
+ *
+ * ### CSS Class-based Animations
+ *
+ * Class-based animations (animations that are triggered via `ngClass`, `ngShow`, `ngHide` and some other directives) have a slightly different
+ * naming convention. Class-based animations are basic enough that a standard transition or keyframe can be referenced on the class being added
+ * and removed.
+ *
+ * For example if we wanted to do a CSS animation for `ngHide` then we place an animation on the `.ng-hide` CSS class:
+ *
+ * ```html
+ * <div ng-show="bool" class="fade">
+ *   Show and hide me
+ * </div>
+ * <button ng-click="bool=true">Toggle</button>
+ *
+ * <style>
+ * .fade.ng-hide {
+ *   transition:0.5s linear all;
+ *   opacity:0;
+ * }
+ * </style>
+ * ```
+ *
+ * All that is going on here with ngShow/ngHide behind the scenes is the `.ng-hide` class is added/removed (when the hidden state is valid). Since
+ * ngShow and ngHide are animation aware then we can match up a transition and ngAnimate handles the rest.
+ *
+ * In addition the addition and removal of the CSS class, ngAnimate also provides two helper methods that we can use to further decorate the animation
+ * with CSS styles.
+ *
+ * ```html
+ * <div ng-class="{on:onOff}" class="highlight">
+ *   Highlight this box
+ * </div>
+ * <button ng-click="onOff=!onOff">Toggle</button>
+ *
+ * <style>
+ * .highlight {
+ *   transition:0.5s linear all;
+ * }
+ * .highlight.on-add {
+ *   background:white;
+ * }
+ * .highlight.on {
+ *   background:yellow;
+ * }
+ * .highlight.on-remove {
+ *   background:black;
+ * }
+ * </style>
+ * ```
+ *
+ * We can also make use of CSS keyframes by placing them within the CSS classes.
+ *
+ *
+ * ### CSS Staggering Animations
+ * A Staggering animation is a collection of animations that are issued with a slight delay in between each successive operation resulting in a
+ * curtain-like effect. The ngAnimate module (versions >=1.2) supports staggering animations and the stagger effect can be
+ * performed by creating a **ng-EVENT-stagger** CSS class and attaching that class to the base CSS class used for
+ * the animation. The style property expected within the stagger class can either be a **transition-delay** or an
+ * **animation-delay** property (or both if your animation contains both transitions and keyframe animations).
+ *
+ * ```css
+ * .my-animation.ng-enter {
+ *   /&#42; standard transition code &#42;/
+ *   transition: 1s linear all;
+ *   opacity:0;
+ * }
+ * .my-animation.ng-enter-stagger {
+ *   /&#42; this will have a 100ms delay between each successive leave animation &#42;/
+ *   transition-delay: 0.1s;
+ *
+ *   /&#42; in case the stagger doesn't work then the duration value
+ *    must be set to 0 to avoid an accidental CSS inheritance &#42;/
+ *   transition-duration: 0s;
+ * }
+ * .my-animation.ng-enter.ng-enter-active {
+ *   /&#42; standard transition styles &#42;/
+ *   opacity:1;
+ * }
+ * ```
+ *
+ * Staggering animations work by default in ngRepeat (so long as the CSS class is defined). Outside of ngRepeat, to use staggering animations
+ * on your own, they can be triggered by firing multiple calls to the same event on $animate. However, the restrictions surrounding this
+ * are that each of the elements must have the same CSS className value as well as the same parent element. A stagger operation
+ * will also be reset if one or more animation frames have passed since the multiple calls to `$animate` were fired.
+ *
+ * The following code will issue the **ng-leave-stagger** event on the element provided:
+ *
+ * ```js
+ * var kids = parent.children();
+ *
+ * $animate.leave(kids[0]); //stagger index=0
+ * $animate.leave(kids[1]); //stagger index=1
+ * $animate.leave(kids[2]); //stagger index=2
+ * $animate.leave(kids[3]); //stagger index=3
+ * $animate.leave(kids[4]); //stagger index=4
+ *
+ * window.requestAnimationFrame(function() {
+ *   //stagger has reset itself
+ *   $animate.leave(kids[5]); //stagger index=0
+ *   $animate.leave(kids[6]); //stagger index=1
+ *
+ *   $scope.$digest();
+ * });
+ * ```
+ *
+ * Stagger animations are currently only supported within CSS-defined animations.
+ *
+ * ### The `ng-animate` CSS class
+ *
+ * When ngAnimate is animating an element it will apply the `ng-animate` CSS class to the element for the duration of the animation.
+ * This is a temporary CSS class and it will be removed once the animation is over (for both JavaScript and CSS-based animations).
+ *
+ * Therefore, animations can be applied to an element using this temporary class directly via CSS.
+ *
+ * ```css
+ * .zipper.ng-animate {
+ *   transition:0.5s linear all;
+ * }
+ * .zipper.ng-enter {
+ *   opacity:0;
+ * }
+ * .zipper.ng-enter.ng-enter-active {
+ *   opacity:1;
+ * }
+ * .zipper.ng-leave {
+ *   opacity:1;
+ * }
+ * .zipper.ng-leave.ng-leave-active {
+ *   opacity:0;
+ * }
+ * ```
+ *
+ * (Note that the `ng-animate` CSS class is reserved and it cannot be applied on an element directly since ngAnimate will always remove
+ * the CSS class once an animation has completed.)
+ *
+ *
+ * ## JavaScript-based Animations
+ *
+ * ngAnimate also allows for animations to be consumed by JavaScript code. The approach is similar to CSS-based animations (where there is a shared
+ * CSS class that is referenced in our HTML code) but in addition we need to register the JavaScript animation on the module. By making use of the
+ * `module.animation()` module function we can register the ainmation.
+ *
+ * Let's see an example of a enter/leave animation using `ngRepeat`:
+ *
+ * ```html
+ * <div ng-repeat="item in items" class="slide">
+ *   {{ item }}
+ * </div>
+ * ```
+ *
+ * See the **slide** CSS class? Let's use that class to define an animation that we'll structure in our module code by using `module.animation`:
+ *
+ * ```js
+ * myModule.animation('.slide', [function() {
+ *   return {
+ *     // make note that other events (like addClass/removeClass)
+ *     // have different function input parameters
+ *     enter: function(element, doneFn) {
+ *       jQuery(element).fadeIn(1000, doneFn);
+ *
+ *       // remember to call doneFn so that angular
+ *       // knows that the animation has concluded
+ *     },
+ *
+ *     move: function(element, doneFn) {
+ *       jQuery(element).fadeIn(1000, doneFn);
+ *     },
+ *
+ *     leave: function(element, doneFn) {
+ *       jQuery(element).fadeOut(1000, doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * The nice thing about JS-based animations is that we can inject other services and make use of advanced animation libraries such as
+ * greensock.js and velocity.js.
+ *
+ * If our animation code class-based (meaning that something like `ngClass`, `ngHide` and `ngShow` triggers it) then we can still define
+ * our animations inside of the same registered animation, however, the function input arguments are a bit different:
+ *
+ * ```html
+ * <div ng-class="color" class="colorful">
+ *   this box is moody
+ * </div>
+ * <button ng-click="color='red'">Change to red</button>
+ * <button ng-click="color='blue'">Change to blue</button>
+ * <button ng-click="color='green'">Change to green</button>
+ * ```
+ *
+ * ```js
+ * myModule.animation('.colorful', [function() {
+ *   return {
+ *     addClass: function(element, className, doneFn) {
+ *       // do some cool animation and call the doneFn
+ *     },
+ *     removeClass: function(element, className, doneFn) {
+ *       // do some cool animation and call the doneFn
+ *     },
+ *     setClass: function(element, addedClass, removedClass, doneFn) {
+ *       // do some cool animation and call the doneFn
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * ## CSS + JS Animations Together
+ *
+ * AngularJS 1.4 and higher has taken steps to make the amalgamation of CSS and JS animations more flexible. However, unlike earlier versions of Angular,
+ * defining CSS and JS animations to work off of the same CSS class will not work anymore. Therefore example below will only result in **JS animations taking
+ * charge of the animation**:
+ *
+ * ```html
+ * <div ng-if="bool" class="slide">
+ *   Slide in and out
+ * </div>
+ * ```
+ *
+ * ```js
+ * myModule.animation('.slide', [function() {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       jQuery(element).slideIn(1000, doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * ```css
+ * .slide.ng-enter {
+ *   transition:0.5s linear all;
+ *   transform:translateY(-100px);
+ * }
+ * .slide.ng-enter.ng-enter-active {
+ *   transform:translateY(0);
+ * }
+ * ```
+ *
+ * Does this mean that CSS and JS animations cannot be used together? Do JS-based animations always have higher priority? We can suppliment for the
+ * lack of CSS animations by making use of the `$animateCss` service to trigger our own tweaked-out, CSS-based animations directly from
+ * our own JS-based animation code:
+ *
+ * ```js
+ * myModule.animation('.slide', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+*        // this will trigger `.slide.ng-enter` and `.slide.ng-enter-active`.
+ *       var runner = $animateCss(element, {
+ *         event: 'enter',
+ *         structural: true
+ *       }).start();
+*        runner.done(doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * The nice thing here is that we can save bandwidth by sticking to our CSS-based animation code and we don't need to rely on a 3rd-party animation framework.
+ *
+ * The `$animateCss` service is very powerful since we can feed in all kinds of extra properties that will be evaluated and fed into a CSS transition or
+ * keyframe animation. For example if we wanted to animate the height of an element while adding and removing classes then we can do so by providing that
+ * data into `$animateCss` directly:
+ *
+ * ```js
+ * myModule.animation('.slide', ['$animateCss', function($animateCss) {
+ *   return {
+ *     enter: function(element, doneFn) {
+ *       var runner = $animateCss(element, {
+ *         event: 'enter',
+ *         addClass: 'maroon-setting',
+ *         from: { height:0 },
+ *         to: { height: 200 }
+ *       }).start();
+ *
+ *       runner.done(doneFn);
+ *     }
+ *   }
+ * }]
+ * ```
+ *
+ * Now we can fill in the rest via our transition CSS code:
+ *
+ * ```css
+ * /&#42; the transition tells ngAnimate to make the animation happen &#42;/
+ * .slide.ng-enter { transition:0.5s linear all; }
+ *
+ * /&#42; this extra CSS class will be absorbed into the transition
+ * since the $animateCss code is adding the class &#42;/
+ * .maroon-setting { background:red; }
+ * ```
+ *
+ * And `$animateCss` will figure out the rest. Just make sure to have the `done()` callback fire the `doneFn` function to signal when the animation is over.
+ *
+ * To learn more about what's possible be sure to visit the {@link ngAnimate.$animateCss $animateCss service}.
+ *
+ * ## Animation Anchoring (via `ng-animate-ref`)
+ *
+ * ngAnimate in AngularJS 1.4 comes packed with the ability to cross-animate elements between
+ * structural areas of an application (like views) by pairing up elements using an attribute
+ * called `ng-animate-ref`.
+ *
+ * Let's say for example we have two views that are managed by `ng-view` and we want to show
+ * that there is a relationship between two components situated in within these views. By using the
+ * `ng-animate-ref` attribute we can identify that the two components are paired together and we
+ * can then attach an animation, which is triggered when the view changes.
+ *
+ * Say for example we have the following template code:
+ *
+ * ```html
+ * <!-- index.html -->
+ * <div ng-view class="view-animation">
+ * </div>
+ *
+ * <!-- home.html -->
+ * <a href="#/banner-page">
+ *   <img src="./banner.jpg" class="banner" ng-animate-ref="banner">
+ * </a>
+ *
+ * <!-- banner-page.html -->
+ * <img src="./banner.jpg" class="banner" ng-animate-ref="banner">
+ * ```
+ *
+ * Now, when the view changes (once the link is clicked), ngAnimate will examine the
+ * HTML contents to see if there is a match reference between any components in the view
+ * that is leaving and the view that is entering. It will scan both the view which is being
+ * removed (leave) and inserted (enter) to see if there are any paired DOM elements that
+ * contain a matching ref value.
+ *
+ * The two images match since they share the same ref value. ngAnimate will now create a
+ * transport element (which is a clone of the first image element) and it will then attempt
+ * to animate to the position of the second image element in the next view. For the animation to
+ * work a special CSS class called `ng-anchor` will be added to the transported element.
+ *
+ * We can now attach a transition onto the `.banner.ng-anchor` CSS class and then
+ * ngAnimate will handle the entire transition for us as well as the addition and removal of
+ * any changes of CSS classes between the elements:
+ *
+ * ```css
+ * .banner.ng-anchor {
+ *   /&#42; this animation will last for 1 second since there are
+ *          two phases to the animation (an `in` and an `out` phase) &#42;/
+ *   transition:0.5s linear all;
+ * }
+ * ```
+ *
+ * We also **must** include animations for the views that are being entered and removed
+ * (otherwise anchoring wouldn't be possible since the new view would be inserted right away).
+ *
+ * ```css
+ * .view-animation.ng-enter, .view-animation.ng-leave {
+ *   transition:0.5s linear all;
+ *   position:fixed;
+ *   left:0;
+ *   top:0;
+ *   width:100%;
+ * }
+ * .view-animation.ng-enter {
+ *   transform:translateX(100%);
+ * }
+ * .view-animation.ng-leave,
+ * .view-animation.ng-enter.ng-enter-active {
+ *   transform:translateX(0%);
+ * }
+ * .view-animation.ng-leave.ng-leave-active {
+ *   transform:translateX(-100%);
+ * }
+ * ```
+ *
+ * Now we can jump back to the anchor animation. When the animation happens, there are two stages that occur:
+ * an `out` and an `in` stage. The `out` stage happens first and that is when the element is animated away
+ * from its origin. Once that animation is over then the `in` stage occurs which animates the
+ * element to its destination. The reason why there are two animations is to give enough time
+ * for the enter animation on the new element to be ready.
+ *
+ * The example above sets up a transition for both the in and out phases, but we can also target the out or
+ * in phases directly via `ng-anchor-out` and `ng-anchor-in`.
+ *
+ * ```css
+ * .banner.ng-anchor-out {
+ *   transition: 0.5s linear all;
+ *
+ *   /&#42; the scale will be applied during the out animation,
+ *          but will be animated away when the in animation runs &#42;/
+ *   transform: scale(1.2);
+ * }
+ *
+ * .banner.ng-anchor-in {
+ *   transition: 1s linear all;
+ * }
+ * ```
+ *
+ *
+ *
+ *
+ * ### Anchoring Demo
+ *
+  <example module="anchoringExample"
+           name="anchoringExample"
+           id="anchoringExample"
+           deps="angular-animate.js;angular-route.js"
+           animations="true">
+    <file name="index.html">
+      <a href="#/">Home</a>
+      <hr />
+      <div class="view-container">
+        <div ng-view class="view"></div>
+      </div>
+    </file>
+    <file name="script.js">
+      angular.module('anchoringExample', ['ngAnimate', 'ngRoute'])
+        .config(['$routeProvider', function($routeProvider) {
+          $routeProvider.when('/', {
+            templateUrl: 'home.html',
+            controller: 'HomeController as home'
+          });
+          $routeProvider.when('/profile/:id', {
+            templateUrl: 'profile.html',
+            controller: 'ProfileController as profile'
+          });
+        }])
+        .run(['$rootScope', function($rootScope) {
+          $rootScope.records = [
+            { id:1, title: "Miss Beulah Roob" },
+            { id:2, title: "Trent Morissette" },
+            { id:3, title: "Miss Ava Pouros" },
+            { id:4, title: "Rod Pouros" },
+            { id:5, title: "Abdul Rice" },
+            { id:6, title: "Laurie Rutherford Sr." },
+            { id:7, title: "Nakia McLaughlin" },
+            { id:8, title: "Jordon Blanda DVM" },
+            { id:9, title: "Rhoda Hand" },
+            { id:10, title: "Alexandrea Sauer" }
+          ];
+        }])
+        .controller('HomeController', [function() {
+          //empty
+        }])
+        .controller('ProfileController', ['$rootScope', '$routeParams', function($rootScope, $routeParams) {
+          var index = parseInt($routeParams.id, 10);
+          var record = $rootScope.records[index - 1];
+
+          this.title = record.title;
+          this.id = record.id;
+        }]);
+    </file>
+    <file name="home.html">
+      <h2>Welcome to the home page</h1>
+      <p>Please click on an element</p>
+      <a class="record"
+         ng-href="#/profile/{{ record.id }}"
+         ng-animate-ref="{{ record.id }}"
+         ng-repeat="record in records">
+        {{ record.title }}
+      </a>
+    </file>
+    <file name="profile.html">
+      <div class="profile record" ng-animate-ref="{{ profile.id }}">
+        {{ profile.title }}
+      </div>
+    </file>
+    <file name="animations.css">
+      .record {
+        display:block;
+        font-size:20px;
+      }
+      .profile {
+        background:black;
+        color:white;
+        font-size:100px;
+      }
+      .view-container {
+        position:relative;
+      }
+      .view-container > .view.ng-animate {
+        position:absolute;
+        top:0;
+        left:0;
+        width:100%;
+        min-height:500px;
+      }
+      .view.ng-enter, .view.ng-leave,
+      .record.ng-anchor {
+        transition:0.5s linear all;
+      }
+      .view.ng-enter {
+        transform:translateX(100%);
+      }
+      .view.ng-enter.ng-enter-active, .view.ng-leave {
+        transform:translateX(0%);
+      }
+      .view.ng-leave.ng-leave-active {
+        transform:translateX(-100%);
+      }
+      .record.ng-anchor-out {
+        background:red;
+      }
+    </file>
+  </example>
+ *
+ * ### How is the element transported?
+ *
+ * When an anchor animation occurs, ngAnimate will clone the starting element and position it exactly where the starting
+ * element is located on screen via absolute positioning. The cloned element will be placed inside of the root element
+ * of the application (where ng-app was defined) and all of the CSS classes of the starting element will be applied. The
+ * element will then animate into the `out` and `in` animations and will eventually reach the coordinates and match
+ * the dimensions of the destination element. During the entire animation a CSS class of `.ng-animate-shim` will be applied
+ * to both the starting and destination elements in order to hide them from being visible (the CSS styling for the class
+ * is: `visibility:hidden`). Once the anchor reaches its destination then it will be removed and the destination element
+ * will become visible since the shim class will be removed.
+ *
+ * ### How is the morphing handled?
+ *
+ * CSS Anchoring relies on transitions and keyframes and the internal code is intelligent enough to figure out
+ * what CSS classes differ between the starting element and the destination element. These different CSS classes
+ * will be added/removed on the anchor element and a transition will be applied (the transition that is provided
+ * in the anchor class). Long story short, ngAnimate will figure out what classes to add and remove which will
+ * make the transition of the element as smooth and automatic as possible. Be sure to use simple CSS classes that
+ * do not rely on DOM nesting structure so that the anchor element appears the same as the starting element (since
+ * the cloned element is placed inside of root element which is likely close to the body element).
+ *
+ * Note that if the root element is on the `<html>` element then the cloned node will be placed inside of body.
+ *
+ *
+ * ## Using $animate in your directive code
+ *
+ * So far we've explored how to feed in animations into an Angular application, but how do we trigger animations within our own directives in our application?
+ * By injecting the `$animate` service into our directive code, we can trigger structural and class-based hooks which can then be consumed by animations. Let's
+ * imagine we have a greeting box that shows and hides itself when the data changes
+ *
+ * ```html
+ * <greeting-box active="onOrOff">Hi there</greeting-box>
+ * ```
+ *
+ * ```js
+ * ngModule.directive('greetingBox', ['$animate', function($animate) {
+ *   return function(scope, element, attrs) {
+ *     attrs.$observe('active', function(value) {
+ *       value ? $animate.addClass(element, 'on') ? $animate.removeClass(element, 'on');
+ *     });
+ *   });
+ * }]);
+ * ```
+ *
+ * Now the `on` CSS class is added and removed on the greeting box component. Now if we add a CSS class on top of the greeting box element
+ * in our HTML code then we can trigger a CSS or JS animation to happen.
+ *
+ * ```css
+ * /&#42; normally we would create a CSS class to reference on the element &#42;/
+ * [greeting-box].on { transition:0.5s linear all; background:green; color:white; }
+ * ```
+ *
+ * The `$animate` service contains a variety of other methods like `enter`, `leave`, `animate` and `setClass`. To learn more about what's
+ * possible be sure to visit the {@link ng.$animate $animate service API page}.
+ *
+ *
+ * ### Preventing Collisions With Third Party Libraries
+ *
+ * Some third-party frameworks place animation duration defaults across many element or className
+ * selectors in order to make their code small and reuseable. This can lead to issues with ngAnimate, which
+ * is expecting actual animations on these elements and has to wait for their completion.
+ *
+ * You can prevent this unwanted behavior by using a prefix on all your animation classes:
+ *
+ * ```css
+ * /&#42; prefixed with animate- &#42;/
+ * .animate-fade-add.animate-fade-add-active {
+ *   transition:1s linear all;
+ *   opacity:0;
+ * }
+ * ```
+ *
+ * You then configure `$animate` to enforce this prefix:
+ *
+ * ```js
+ * $animateProvider.classNameFilter(/animate-/);
+ * ```
+ *
+ * This also may provide your application with a speed boost since only specific elements containing CSS class prefix
+ * will be evaluated for animation when any DOM changes occur in the application.
+ *
+ * ## Callbacks and Promises
+ *
+ * When `$animate` is called it returns a promise that can be used to capture when the animation has ended. Therefore if we were to trigger
+ * an animation (within our directive code) then we can continue performing directive and scope related activities after the animation has
+ * ended by chaining onto the returned promise that animation method returns.
+ *
+ * ```js
+ * // somewhere within the depths of the directive
+ * $animate.enter(element, parent).then(function() {
+ *   //the animation has completed
+ * });
+ * ```
+ *
+ * (Note that earlier versions of Angular prior to v1.4 required the promise code to be wrapped using `$scope.$apply(...)`. This is not the case
+ * anymore.)
+ *
+ * In addition to the animation promise, we can also make use of animation-related callbacks within our directives and controller code by registering
+ * an event listener using the `$animate` service. Let's say for example that an animation was triggered on our view
+ * routing controller to hook into that:
+ *
+ * ```js
+ * ngModule.controller('HomePageController', ['$animate', function($animate) {
+ *   $animate.on('enter', ngViewElement, function(element) {
+ *     // the animation for this route has completed
+ *   }]);
+ * }])
+ * ```
+ *
+ * (Note that you will need to trigger a digest within the callback to get angular to notice any scope-related changes.)
+ */
+
+/**
+ * @ngdoc service
+ * @name $animate
+ * @kind object
+ *
+ * @description
+ * The ngAnimate `$animate` service documentation is the same for the core `$animate` service.
+ *
+ * Click here {@link ng.$animate $animate to learn more about animations with `$animate`}.
+ */
+angular.module('ngAnimate', [])
+  .directive('ngAnimateChildren', $$AnimateChildrenDirective)
+
+  .factory('$$rAFMutex', $$rAFMutexFactory)
+  .factory('$$rAFScheduler', $$rAFSchedulerFactory)
+
+  .factory('$$AnimateRunner', $$AnimateRunnerFactory)
+
+  .provider('$$animateQueue', $$AnimateQueueProvider)
+  .provider('$$animation', $$AnimationProvider)
+
+  .provider('$animateCss', $AnimateCssProvider)
+  .provider('$$animateCssDriver', $$AnimateCssDriverProvider)
+
+  .provider('$$animateJs', $$AnimateJsProvider)
+  .provider('$$animateJsDriver', $$AnimateJsDriverProvider);
+
+
+})(window, window.angular);
diff --git a/turtles/app/lib/bower_components/angular-animate/angular-animate.min.js b/turtles/app/lib/bower_components/angular-animate/angular-animate.min.js
new file mode 100644
index 000000000..d6791a123
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/angular-animate.min.js
@@ -0,0 +1,52 @@
+/*
+ AngularJS v1.4.0
+ (c) 2010-2015 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(F,t,W){'use strict';function ua(a,b,c){if(!a)throw ngMinErr("areq",b||"?",c||"required");return a}function va(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;X(a)&&(a=a.join(" "));X(b)&&(b=b.join(" "));return a+" "+b}function Ea(a){var b={};a&&(a.to||a.from)&&(b.to=a.to,b.from=a.from);return b}function ba(a,b,c){var d="";a=X(a)?a:a&&U(a)&&a.length?a.split(/\s+/):[];u(a,function(a,s){a&&0<a.length&&(d+=0<s?" ":"",d+=c?b+a:a+b)});return d}function Fa(a){if(a instanceof G)switch(a.length){case 0:return[];
+case 1:if(1===a[0].nodeType)return a;break;default:return G(ka(a))}if(1===a.nodeType)return G(a)}function ka(a){if(!a[0])return a;for(var b=0;b<a.length;b++){var c=a[b];if(1==c.nodeType)return c}}function Ga(a,b,c){u(b,function(b){a.addClass(b,c)})}function Ha(a,b,c){u(b,function(b){a.removeClass(b,c)})}function ha(a){return function(b,c){c.addClass&&(Ga(a,b,c.addClass),c.addClass=null);c.removeClass&&(Ha(a,b,c.removeClass),c.removeClass=null)}}function ia(a){a=a||{};if(!a.$$prepared){var b=a.domOperation||
+H;a.domOperation=function(){a.$$domOperationFired=!0;b();b=H};a.$$prepared=!0}return a}function ca(a,b){wa(a,b);xa(a,b)}function wa(a,b){b.from&&(a.css(b.from),b.from=null)}function xa(a,b){b.to&&(a.css(b.to),b.to=null)}function R(a,b,c){var d=(b.addClass||"")+" "+(c.addClass||""),e=(b.removeClass||"")+" "+(c.removeClass||"");a=Ia(a.attr("class"),d,e);ya(b,c);b.addClass=a.addClass?a.addClass:null;b.removeClass=a.removeClass?a.removeClass:null;return b}function Ia(a,b,c){function d(a){U(a)&&(a=a.split(" "));
+var b={};u(a,function(a){a.length&&(b[a]=!0)});return b}var e={};a=d(a);b=d(b);u(b,function(a,b){e[b]=1});c=d(c);u(c,function(a,b){e[b]=1===e[b]?null:-1});var s={addClass:"",removeClass:""};u(e,function(b,c){var d,e;1===b?(d="addClass",e=!a[c]):-1===b&&(d="removeClass",e=a[c]);e&&(s[d].length&&(s[d]+=" "),s[d]+=c)});return s}function A(a){return a instanceof t.element?a[0]:a}function za(a,b,c){var d=Object.create(null),e=a.getComputedStyle(b)||{};u(c,function(a,b){var c=e[a];if(c){var l=c.charAt(0);
+if("-"===l||"+"===l||0<=l)c=Ja(c);0===c&&(c=null);d[b]=c}});return d}function Ja(a){var b=0;a=a.split(/\s*,\s*/);u(a,function(a){"s"==a.charAt(a.length-1)&&(a=a.substring(0,a.length-1));a=parseFloat(a)||0;b=b?Math.max(a,b):a});return b}function la(a){return 0===a||null!=a}function Aa(a,b){var c=O,d=a+"s";b?c+="Duration":d+=" linear all";return[c,d]}function ja(a,b){var c=b?"-"+b+"s":"";da(a,[ea,c]);return[ea,c]}function ma(a,b){var c=b?"paused":"",d=V+"PlayState";da(a,[d,c]);return[d,c]}function da(a,
+b){a.style[b[0]]=b[1]}function Ba(){var a=Object.create(null);return{flush:function(){a=Object.create(null)},count:function(b){return(b=a[b])?b.total:0},get:function(b){return(b=a[b])&&b.value},put:function(b,c){a[b]?a[b].total++:a[b]={total:1,value:c}}}}var H=t.noop,ya=t.extend,G=t.element,u=t.forEach,X=t.isArray,U=t.isString,na=t.isObject,Ka=t.isUndefined,La=t.isDefined,Ca=t.isFunction,oa=t.isElement,O,pa,V,qa;F.ontransitionend===W&&F.onwebkittransitionend!==W?(O="WebkitTransition",pa="webkitTransitionEnd transitionend"):
+(O="transition",pa="transitionend");F.onanimationend===W&&F.onwebkitanimationend!==W?(V="WebkitAnimation",qa="webkitAnimationEnd animationend"):(V="animation",qa="animationend");var ra=V+"Delay",sa=V+"Duration",ea=O+"Delay";F=O+"Duration";var Ma={transitionDuration:F,transitionDelay:ea,transitionProperty:O+"Property",animationDuration:sa,animationDelay:ra,animationIterationCount:V+"IterationCount"},Na={transitionDuration:F,transitionDelay:ea,animationDuration:sa,animationDelay:ra};t.module("ngAnimate",
+[]).directive("ngAnimateChildren",[function(){return function(a,b,c){a=c.ngAnimateChildren;t.isString(a)&&0===a.length?b.data("$$ngAnimateChildren",!0):c.$observe("ngAnimateChildren",function(a){b.data("$$ngAnimateChildren","on"===a||"true"===a)})}}]).factory("$$rAFMutex",["$$rAF",function(a){return function(){var b=!1;a(function(){b=!0});return function(c){b?c():a(c)}}}]).factory("$$rAFScheduler",["$$rAF",function(a){function b(a){d.push([].concat(a));c()}function c(){if(d.length){for(var b=[],n=
+0;n<d.length;n++){var g=d[n];g.shift()();g.length&&b.push(g)}d=b;e||a(function(){e||c()})}}var d=[],e;b.waitUntilQuiet=function(b){e&&e();e=a(function(){e=null;b();c()})};return b}]).factory("$$AnimateRunner",["$q","$$rAFMutex",function(a,b){function c(a){this.setHost(a);this._doneCallbacks=[];this._runInAnimationFrame=b();this._state=0}c.chain=function(a,b){function c(){if(n===a.length)b(!0);else a[n](function(a){!1===a?b(!1):(n++,c())})}var n=0;c()};c.all=function(a,b){function c(s){g=g&&s;++n===
+a.length&&b(g)}var n=0,g=!0;u(a,function(a){a.done(c)})};c.prototype={setHost:function(a){this.host=a||{}},done:function(a){2===this._state?a():this._doneCallbacks.push(a)},progress:H,getPromise:function(){if(!this.promise){var b=this;this.promise=a(function(a,c){b.done(function(b){!1===b?c():a()})})}return this.promise},then:function(a,b){return this.getPromise().then(a,b)},"catch":function(a){return this.getPromise()["catch"](a)},"finally":function(a){return this.getPromise()["finally"](a)},pause:function(){this.host.pause&&
+this.host.pause()},resume:function(){this.host.resume&&this.host.resume()},end:function(){this.host.end&&this.host.end();this._resolve(!0)},cancel:function(){this.host.cancel&&this.host.cancel();this._resolve(!1)},complete:function(a){var b=this;0===b._state&&(b._state=1,b._runInAnimationFrame(function(){b._resolve(a)}))},_resolve:function(a){2!==this._state&&(u(this._doneCallbacks,function(b){b(a)}),this._doneCallbacks.length=0,this._state=2)}};return c}]).provider("$$animateQueue",["$animateProvider",
+function(a){function b(a,b,c,g){return d[a].some(function(a){return a(b,c,g)})}function c(a,b){a=a||{};var c=0<(a.addClass||"").length,d=0<(a.removeClass||"").length;return b?c&&d:c||d}var d=this.rules={skip:[],cancel:[],join:[]};d.join.push(function(a,b,d){return!b.structural&&c(b.options)});d.skip.push(function(a,b,d){return!b.structural&&!c(b.options)});d.skip.push(function(a,b,c){return"leave"==c.event&&b.structural});d.skip.push(function(a,b,c){return c.structural&&!b.structural});d.cancel.push(function(a,
+b,c){return c.structural&&b.structural});d.cancel.push(function(a,b,c){return 2===c.state&&b.structural});d.cancel.push(function(a,b,c){a=b.options;c=c.options;return a.addClass&&a.addClass===c.removeClass||a.removeClass&&a.removeClass===c.addClass});this.$get=["$$rAF","$rootScope","$rootElement","$document","$$HashMap","$$animation","$$AnimateRunner","$templateRequest","$$jqLite",function(d,s,n,g,l,D,z,Z,I){function w(a,b){var c=A(a),f=[],d=m[b];d&&u(d,function(a){a.node.contains(c)&&f.push(a.callback)});
+return f}function B(a,b,c,f){d(function(){u(w(b,a),function(a){a(b,c,f)})})}function r(a,S,p){function d(b,c,f,p){B(c,a,f,p);b.progress(c,f,p)}function k(b){Da(a,p);ca(a,p);p.domOperation();m.complete(!b)}var P,E;if(a=Fa(a))P=A(a),E=a.parent();p=ia(p);var m=new z;if(!P)return k(),m;X(p.addClass)&&(p.addClass=p.addClass.join(" "));X(p.removeClass)&&(p.removeClass=p.removeClass.join(" "));p.from&&!na(p.from)&&(p.from=null);p.to&&!na(p.to)&&(p.to=null);var e=[P.className,p.addClass,p.removeClass].join(" ");
+if(!v(e))return k(),m;var M=0<=["enter","move","leave"].indexOf(S),g=!x||L.get(P),e=!g&&h.get(P)||{},l=!!e.state;g||l&&1==e.state||(g=!ta(a,E,S));if(g)return k(),m;M&&K(a);g={structural:M,element:a,event:S,close:k,options:p,runner:m};if(l){if(b("skip",a,g,e)){if(2===e.state)return k(),m;R(a,e.options,p);return e.runner}if(b("cancel",a,g,e))2===e.state?e.runner.end():e.structural?e.close():R(a,g.options,e.options);else if(b("join",a,g,e))if(2===e.state)R(a,p,{});else return S=g.event=e.event,p=R(a,
+e.options,g.options),m}else R(a,p,{});(l=g.structural)||(l="animate"===g.event&&0<Object.keys(g.options.to||{}).length||c(g.options));if(!l)return k(),C(a),m;M&&f(E);var r=(e.counter||0)+1;g.counter=r;ga(a,1,g);s.$$postDigest(function(){var b=h.get(P),v=!b,b=b||{},e=a.parent()||[],E=0<e.length&&("animate"===b.event||b.structural||c(b.options));if(v||b.counter!==r||!E){v&&(Da(a,p),ca(a,p));if(v||M&&b.event!==S)p.domOperation(),m.end();E||C(a)}else S=!b.structural&&c(b.options,!0)?"setClass":b.event,
+b.structural&&f(e),ga(a,2),b=D(a,S,b.options),b.done(function(b){k(!b);(b=h.get(P))&&b.counter===r&&C(A(a));d(m,S,"close",{})}),m.setHost(b),d(m,S,"start",{})});return m}function K(a){a=A(a).querySelectorAll("[data-ng-animate]");u(a,function(a){var b=parseInt(a.getAttribute("data-ng-animate")),c=h.get(a);switch(b){case 2:c.runner.end();case 1:c&&h.remove(a)}})}function C(a){a=A(a);a.removeAttribute("data-ng-animate");h.remove(a)}function E(a,b){return A(a)===A(b)}function f(a){a=A(a);do{if(!a||1!==
+a.nodeType)break;var b=h.get(a);if(b){var f=a;!b.structural&&c(b.options)&&(2===b.state&&b.runner.end(),C(f))}a=a.parentNode}while(1)}function ta(a,b,c){var f=c=!1,d=!1,v;for((a=a.data("$ngAnimatePin"))&&(b=a);b&&b.length;){f||(f=E(b,n));a=b[0];if(1!==a.nodeType)break;var e=h.get(a)||{};d||(d=e.structural||L.get(a));if(Ka(v)||!0===v)a=b.data("$$ngAnimateChildren"),La(a)&&(v=a);if(d&&!1===v)break;f||(f=E(b,n),f||(a=b.data("$ngAnimatePin"))&&(b=a));c||(c=E(b,k));b=b.parent()}return(!d||v)&&f&&c}function ga(a,
+b,c){c=c||{};c.state=b;a=A(a);a.setAttribute("data-ng-animate",b);c=(b=h.get(a))?ya(b,c):c;h.put(a,c)}var h=new l,L=new l,x=null,M=s.$watch(function(){return 0===Z.totalPendingRequests},function(a){a&&(M(),s.$$postDigest(function(){s.$$postDigest(function(){null===x&&(x=!0)})}))}),k=G(g[0].body),m={},P=a.classNameFilter(),v=P?function(a){return P.test(a)}:function(){return!0},Da=ha(I);return{on:function(a,b,c){b=ka(b);m[a]=m[a]||[];m[a].push({node:b,callback:c})},off:function(a,b,c){function f(a,
+b,c){var d=ka(b);return a.filter(function(a){return!(a.node===d&&(!c||a.callback===c))})}var d=m[a];d&&(m[a]=1===arguments.length?null:f(d,b,c))},pin:function(a,b){ua(oa(a),"element","not an element");ua(oa(b),"parentElement","not an element");a.data("$ngAnimatePin",b)},push:function(a,b,c,f){c=c||{};c.domOperation=f;return r(a,b,c)},enabled:function(a,b){var c=arguments.length;if(0===c)b=!!x;else if(oa(a)){var f=A(a),d=L.get(f);1===c?b=!d:(b=!!b)?d&&L.remove(f):L.put(f,!0)}else b=x=!!a;return b}}}]}]).provider("$$animation",
+["$animateProvider",function(a){function b(a){return a.data("$$animationRunner")}var c=this.drivers=[];this.$get=["$$jqLite","$rootScope","$injector","$$AnimateRunner","$$rAFScheduler",function(a,e,s,n,g){var l=[],D=ha(a),z=0,Z=0,I=[];return function(w,B,r){function K(a){a=a.hasAttribute("ng-animate-ref")?[a]:a.querySelectorAll("[ng-animate-ref]");var b=[];u(a,function(a){var c=a.getAttribute("ng-animate-ref");c&&c.length&&b.push(a)});return b}function C(a){var b=[],c={};u(a,function(a,f){var d=A(a.element),
+e=0<=["enter","move"].indexOf(a.event),d=a.structural?K(d):[];if(d.length){var h=e?"to":"from";u(d,function(a){var b=a.getAttribute("ng-animate-ref");c[b]=c[b]||{};c[b][h]={animationID:f,element:G(a)}})}else b.push(a)});var f={},d={};u(c,function(c,e){var h=c.from,k=c.to;if(h&&k){var m=a[h.animationID],g=a[k.animationID],x=h.animationID.toString();if(!d[x]){var B=d[x]={structural:!0,beforeStart:function(){m.beforeStart();g.beforeStart()},close:function(){m.close();g.close()},classes:E(m.classes,g.classes),
+from:m,to:g,anchors:[]};B.classes.length?b.push(B):(b.push(m),b.push(g))}d[x].anchors.push({out:h.element,"in":k.element})}else h=h?h.animationID:k.animationID,k=h.toString(),f[k]||(f[k]=!0,b.push(a[h]))});return b}function E(a,b){a=a.split(" ");b=b.split(" ");for(var c=[],f=0;f<a.length;f++){var d=a[f];if("ng-"!==d.substring(0,3))for(var h=0;h<b.length;h++)if(d===b[h]){c.push(d);break}}return c.join(" ")}function f(a){for(var b=c.length-1;0<=b;b--){var f=c[b];if(s.has(f)&&(f=s.get(f)(a)))return f}}
+function ta(a,c){a.from&&a.to?(b(a.from.element).setHost(c),b(a.to.element).setHost(c)):b(a.element).setHost(c)}function ga(){var a=b(w);!a||"leave"===B&&r.$$domOperationFired||a.end()}function h(b){w.off("$destroy",ga);w.removeData("$$animationRunner");D(w,r);ca(w,r);r.domOperation();k&&a.removeClass(w,k);w.removeClass("ng-animate");x.complete(!b)}r=ia(r);var L=0<=["enter","move","leave"].indexOf(B),x=new n({end:function(){h()},cancel:function(){h(!0)}});if(!c.length)return h(),x;w.data("$$animationRunner",
+x);var M=va(w.attr("class"),va(r.addClass,r.removeClass)),k=r.tempClasses;k&&(M+=" "+k,r.tempClasses=null);var m;L||(m=z,z+=1);l.push({element:w,classes:M,event:B,classBasedIndex:m,structural:L,options:r,beforeStart:function(){w.addClass("ng-animate");k&&a.addClass(w,k)},close:h});w.on("$destroy",ga);if(1<l.length)return x;e.$$postDigest(function(){Z=z;z=0;I.length=0;var a=[];u(l,function(c){b(c.element)&&a.push(c)});l.length=0;u(C(a),function(a){function c(){a.beforeStart();var d,h=a.close;if(b(a.anchors?
+a.from.element||a.to.element:a.element)){var k=f(a);k&&(d=k.start)}d?(d=d(),d.done(function(a){h(!a)}),ta(a,d)):h()}a.structural?c():(I.push({node:A(a.element),fn:c}),a.classBasedIndex===Z-1&&(I=I.sort(function(a,b){return b.node.contains(a.node)}).map(function(a){return a.fn}),g(I)))})});return x}}]}]).provider("$animateCss",["$animateProvider",function(a){var b=Ba(),c=Ba();this.$get=["$window","$$jqLite","$$AnimateRunner","$timeout","$document","$sniffer","$$rAFScheduler",function(a,e,s,n,g,l,D){function z(a,
+b){var c=a.parentNode;return(c.$$ngAnimateParentKey||(c.$$ngAnimateParentKey=++r))+"-"+a.getAttribute("class")+"-"+b}function Z(g,f,B,l){var h;0<b.count(B)&&(h=c.get(B),h||(f=ba(f,"-stagger"),e.addClass(g,f),h=za(a,g,l),h.animationDuration=Math.max(h.animationDuration,0),h.transitionDuration=Math.max(h.transitionDuration,0),e.removeClass(g,f),c.put(B,h)));return h||{}}function I(a){C.push(a);D.waitUntilQuiet(function(){b.flush();c.flush();for(var a=K.offsetWidth+1,d=0;d<C.length;d++)C[d](a);C.length=
+0})}function w(c,f,e){f=b.get(e);f||(f=za(a,c,Ma),"infinite"===f.animationIterationCount&&(f.animationIterationCount=1));b.put(e,f);c=f;e=c.animationDelay;f=c.transitionDelay;c.maxDelay=e&&f?Math.max(e,f):e||f;c.maxDuration=Math.max(c.animationDuration*c.animationIterationCount,c.transitionDuration);return c}var B=ha(e),r=0,K=A(g).body,C=[];return function(a,c){function d(){h()}function g(){h(!0)}function h(b){if(!(K||C&&D)){K=!0;D=!1;e.removeClass(a,Y);e.removeClass(a,W);ma(k,!1);ja(k,!1);u(m,function(a){k.style[a[0]]=
+""});B(a,c);ca(a,c);if(c.onDone)c.onDone();p&&p.complete(!b)}}function L(a){q.blockTransition&&ja(k,a);q.blockKeyframeAnimation&&ma(k,!!a)}function x(){p=new s({end:d,cancel:g});h();return{$$willAnimate:!1,start:function(){return p},end:d}}function M(){function b(){if(!K){L(!1);u(m,function(a){k.style[a[0]]=a[1]});B(a,c);e.addClass(a,W);if(q.recalculateTimingStyles){fa=k.className+" "+Y;$=z(k,fa);y=w(k,fa,$);Q=y.maxDelay;H=Math.max(Q,0);J=y.maxDuration;if(0===J){h();return}q.hasTransitions=0<y.transitionDuration;
+q.hasAnimations=0<y.animationDuration}if(q.applyTransitionDelay||q.applyAnimationDelay){Q="boolean"!==typeof c.delay&&la(c.delay)?parseFloat(c.delay):Q;H=Math.max(Q,0);var l;q.applyTransitionDelay&&(y.transitionDelay=Q,l=[ea,Q+"s"],m.push(l),k.style[l[0]]=l[1]);q.applyAnimationDelay&&(y.animationDelay=Q,l=[ra,Q+"s"],m.push(l),k.style[l[0]]=l[1])}F=1E3*H;G=1E3*J;if(c.easing){var r=c.easing;q.hasTransitions&&(l=O+"TimingFunction",m.push([l,r]),k.style[l]=r);q.hasAnimations&&(l=V+"TimingFunction",m.push([l,
+r]),k.style[l]=r)}y.transitionDuration&&p.push(pa);y.animationDuration&&p.push(qa);x=Date.now();a.on(p.join(" "),g);n(d,F+1.5*G);xa(a,c)}}function d(){h()}function g(a){a.stopPropagation();var b=a.originalEvent||a;a=b.$manualTimeStamp||b.timeStamp||Date.now();b=parseFloat(b.elapsedTime.toFixed(3));Math.max(a-x,0)>=F&&b>=J&&(C=!0,h())}if(!K){var x,p=[],l=function(a){if(C)D&&a&&(D=!1,h());else if(D=!a,y.animationDuration)if(a=ma(k,D),D)m.push(a);else{var b=m,c=b.indexOf(a);0<=a&&b.splice(c,1)}},r=0<
+U&&(y.transitionDuration&&0===T.transitionDuration||y.animationDuration&&0===T.animationDuration)&&Math.max(T.animationDelay,T.transitionDelay);r?n(b,Math.floor(r*U*1E3),!1):b();t.resume=function(){l(!0)};t.pause=function(){l(!1)}}}var k=A(a);c=ia(c);var m=[],r=a.attr("class"),v=Ea(c),K,D,C,p,t,H,F,J,G;if(0===c.duration||!l.animations&&!l.transitions)return x();var aa=c.event&&X(c.event)?c.event.join(" "):c.event,R="",N="";aa&&c.structural?R=ba(aa,"ng-",!0):aa&&(R=aa);c.addClass&&(N+=ba(c.addClass,
+"-add"));c.removeClass&&(N.length&&(N+=" "),N+=ba(c.removeClass,"-remove"));c.applyClassesEarly&&N.length&&(B(a,c),N="");var Y=[R,N].join(" ").trim(),fa=r+" "+Y,W=ba(Y,"-active"),r=v.to&&0<Object.keys(v.to).length;if(!r&&!Y)return x();var $,T;0<c.stagger?(v=parseFloat(c.stagger),T={transitionDelay:v,animationDelay:v,transitionDuration:0,animationDuration:0}):($=z(k,fa),T=Z(k,Y,$,Na));e.addClass(a,Y);c.transitionStyle&&(v=[O,c.transitionStyle],da(k,v),m.push(v));0<=c.duration&&(v=0<k.style[O].length,
+v=Aa(c.duration,v),da(k,v),m.push(v));c.keyframeStyle&&(v=[V,c.keyframeStyle],da(k,v),m.push(v));var U=T?0<=c.staggerIndex?c.staggerIndex:b.count($):0;(aa=0===U)&&ja(k,9999);var y=w(k,fa,$),Q=y.maxDelay;H=Math.max(Q,0);J=y.maxDuration;var q={};q.hasTransitions=0<y.transitionDuration;q.hasAnimations=0<y.animationDuration;q.hasTransitionAll=q.hasTransitions&&"all"==y.transitionProperty;q.applyTransitionDuration=r&&(q.hasTransitions&&!q.hasTransitionAll||q.hasAnimations&&!q.hasTransitions);q.applyAnimationDuration=
+c.duration&&q.hasAnimations;q.applyTransitionDelay=la(c.delay)&&(q.applyTransitionDuration||q.hasTransitions);q.applyAnimationDelay=la(c.delay)&&q.hasAnimations;q.recalculateTimingStyles=0<N.length;if(q.applyTransitionDuration||q.applyAnimationDuration)J=c.duration?parseFloat(c.duration):J,q.applyTransitionDuration&&(q.hasTransitions=!0,y.transitionDuration=J,v=0<k.style[O+"Property"].length,m.push(Aa(J,v))),q.applyAnimationDuration&&(q.hasAnimations=!0,y.animationDuration=J,m.push([sa,J+"s"]));if(0===
+J&&!q.recalculateTimingStyles)return x();null==c.duration&&0<y.transitionDuration&&(q.recalculateTimingStyles=q.recalculateTimingStyles||aa);F=1E3*H;G=1E3*J;c.skipBlocking||(q.blockTransition=0<y.transitionDuration,q.blockKeyframeAnimation=0<y.animationDuration&&0<T.animationDelay&&0===T.animationDuration);wa(a,c);q.blockTransition||ja(k,!1);L(J);return{$$willAnimate:!0,end:d,start:function(){if(!K)return t={end:d,cancel:g,resume:null,pause:null},p=new s(t),I(M),p}}}}]}]).provider("$$animateCssDriver",
+["$$animationProvider",function(a){a.drivers.push("$$animateCssDriver");this.$get=["$animateCss","$rootScope","$$AnimateRunner","$rootElement","$document","$sniffer",function(a,c,d,e,s,n){function g(a){return a.replace(/\bng-\S+\b/g,"")}function l(a,b){U(a)&&(a=a.split(" "));U(b)&&(b=b.split(" "));return a.filter(function(a){return-1===b.indexOf(a)}).join(" ")}function D(c,e,z){function D(a){var b={},c=A(a).getBoundingClientRect();u(["width","height","top","left"],function(a){var d=c[a];switch(a){case "top":d+=
+I.scrollTop;break;case "left":d+=I.scrollLeft}b[a]=Math.floor(d)+"px"});return b}function s(){var c=g(z.attr("class")||""),d=l(c,t),c=l(t,c),d=a(n,{to:D(z),addClass:"ng-anchor-in "+d,removeClass:"ng-anchor-out "+c,delay:!0});return d.$$willAnimate?d:null}function f(){n.remove();e.removeClass("ng-animate-shim");z.removeClass("ng-animate-shim")}var n=G(A(e).cloneNode(!0)),t=g(n.attr("class")||"");e.addClass("ng-animate-shim");z.addClass("ng-animate-shim");n.addClass("ng-anchor");w.append(n);var h;c=
+function(){var c=a(n,{addClass:"ng-anchor-out",delay:!0,from:D(e)});return c.$$willAnimate?c:null}();if(!c&&(h=s(),!h))return f();var L=c||h;return{start:function(){function a(){c&&c.end()}var b,c=L.start();c.done(function(){c=null;if(!h&&(h=s()))return c=h.start(),c.done(function(){c=null;f();b.complete()}),c;f();b.complete()});return b=new d({end:a,cancel:a})}}}function z(a,b,c,e){var g=t(a),f=t(b),l=[];u(e,function(a){(a=D(c,a.out,a["in"]))&&l.push(a)});if(g||f||0!==l.length)return{start:function(){function a(){u(b,
+function(a){a.end()})}var b=[];g&&b.push(g.start());f&&b.push(f.start());u(l,function(a){b.push(a.start())});var c=new d({end:a,cancel:a});d.all(b,function(a){c.complete(a)});return c}}}function t(c){var d=c.element,e=c.options||{};c.structural?(e.structural=e.applyClassesEarly=!0,e.event=c.event,"leave"===e.event&&(e.onDone=e.domOperation)):e.event=null;c=a(d,e);return c.$$willAnimate?c:null}if(!n.animations&&!n.transitions)return H;var I=A(s).body;c=A(e);var w=G(I.parentNode===c?I:c);return function(a){return a.from&&
+a.to?z(a.from,a.to,a.classes,a.anchors):t(a)}}]}]).provider("$$animateJs",["$animateProvider",function(a){this.$get=["$injector","$$AnimateRunner","$$rAFMutex","$$jqLite",function(b,c,d,e){function s(c){c=X(c)?c:c.split(" ");for(var d=[],e={},z=0;z<c.length;z++){var n=c[z],s=a.$$registeredAnimations[n];s&&!e[n]&&(d.push(b.get(s)),e[n]=!0)}return d}var n=ha(e);return function(a,b,d,e){function t(){e.domOperation();n(a,e)}function A(a,b,d,e,f){switch(d){case "animate":b=[b,e.from,e.to,f];break;case "setClass":b=
+[b,r,K,f];break;case "addClass":b=[b,r,f];break;case "removeClass":b=[b,K,f];break;default:b=[b,f]}b.push(e);if(a=a.apply(a,b))if(Ca(a.start)&&(a=a.start()),a instanceof c)a.done(f);else if(Ca(a))return a;return H}function w(a,b,d,e,f){var m=[];u(e,function(e){var g=e[f];g&&m.push(function(){var e,f,m=!1,k=function(a){m||(m=!0,(f||H)(a),e.complete(!a))};e=new c({end:function(){k()},cancel:function(){k(!0)}});f=A(g,a,b,d,function(a){k(!1===a)});return e})});return m}function B(a,b,d,e,f){var m=w(a,
+b,d,e,f);if(0===m.length){var g,l;"beforeSetClass"===f?(g=w(a,"removeClass",d,e,"beforeRemoveClass"),l=w(a,"addClass",d,e,"beforeAddClass")):"setClass"===f&&(g=w(a,"removeClass",d,e,"removeClass"),l=w(a,"addClass",d,e,"addClass"));g&&(m=m.concat(g));l&&(m=m.concat(l))}if(0!==m.length)return function(a){var b=[];m.length&&u(m,function(a){b.push(a())});b.length?c.all(b,a):a();return function(a){u(b,function(b){a?b.cancel():b.end()})}}}3===arguments.length&&na(d)&&(e=d,d=null);e=ia(e);d||(d=a.attr("class")||
+"",e.addClass&&(d+=" "+e.addClass),e.removeClass&&(d+=" "+e.removeClass));var r=e.addClass,K=e.removeClass,C=s(d),E,f;if(C.length){var F,G;"leave"==b?(G="leave",F="afterLeave"):(G="before"+b.charAt(0).toUpperCase()+b.substr(1),F=b);"enter"!==b&&"move"!==b&&(E=B(a,b,e,C,G));f=B(a,b,e,C,F)}if(E||f)return{start:function(){function b(c){n=!0;t();ca(a,e);k.complete(c)}var d,l=[];E&&l.push(function(a){d=E(a)});l.length?l.push(function(a){t();a(!0)}):t();f&&l.push(function(a){d=f(a)});var n=!1,k=new c({end:function(){n||
+((d||H)(void 0),b(void 0))},cancel:function(){n||((d||H)(!0),b(!0))}});c.chain(l,b);return k}}}}]}]).provider("$$animateJsDriver",["$$animationProvider",function(a){a.drivers.push("$$animateJsDriver");this.$get=["$$animateJs","$$AnimateRunner",function(a,c){function d(c){return a(c.element,c.event,c.classes,c.options)}return function(a){if(a.from&&a.to){var b=d(a.from),n=d(a.to);if(b||n)return{start:function(){function a(){return function(){u(d,function(a){a.end()})}}var d=[];b&&d.push(b.start());
+n&&d.push(n.start());c.all(d,function(a){e.complete(a)});var e=new c({end:a(),cancel:a()});return e}}}else return d(a)}}]}])})(window,window.angular);
+//# sourceMappingURL=angular-animate.min.js.map
diff --git a/turtles/app/lib/bower_components/angular-animate/angular-animate.min.js.map b/turtles/app/lib/bower_components/angular-animate/angular-animate.min.js.map
new file mode 100644
index 000000000..832b030cf
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/angular-animate.min.js.map
@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"angular-animate.min.js",
+"lineCount":51,
+"mappings":"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",
+"sources":["angular-animate.js"],
+"names":["window","angular","undefined","assertArg","arg","name","reason","ngMinErr","mergeClasses","a","b","isArray","join","packageStyles","options","styles","to","from","pendClasses","classes","fix","isPrefix","className","isString","length","split","forEach","klass","i","stripCommentsFromElement","element","jqLite","ELEMENT_NODE","nodeType","extractElementNode","elm","$$addClass","$$jqLite","addClass","$$removeClass","removeClass","applyAnimationClassesFactory","prepareAnimationOptions","$$prepared","domOperation","noop","options.domOperation","$$domOperationFired","applyAnimationStyles","applyAnimationFromStyles","applyAnimationToStyles","css","mergeAnimationOptions","target","newOptions","toAdd","toRemove","resolveElementClasses","attr","extend","existing","splitClassesToLookup","obj","flags","value","key","ADD_CLASS","REMOVE_CLASS","val","prop","allow","getDomNode","computeCssStyles","$window","properties","Object","create","detectedStyles","getComputedStyle","formalStyleName","actualStyleName","c","charAt","parseMaxTime","str","maxValue","values","substring","parseFloat","Math","max","truthyTimingValue","getCssTransitionDurationStyle","duration","applyOnlyDuration","style","TRANSITION_PROP","DURATION_KEY","blockTransitions","node","applyInlineStyle","TRANSITION_DELAY_PROP","blockKeyframeAnimations","applyBlock","ANIMATION_PROP","ANIMATION_PLAYSTATE_KEY","styleTuple","createLocalCacheLookup","cache","flush","count","entry","total","get","put","isObject","isUndefined","isDefined","isFunction","isElement","TRANSITIONEND_EVENT","ANIMATIONEND_EVENT","ontransitionend","onwebkittransitionend","onanimationend","onwebkitanimationend","ANIMATION_DELAY_PROP","DELAY_KEY","ANIMATION_DURATION_PROP","TRANSITION_DURATION_PROP","DETECT_CSS_PROPERTIES","transitionDuration","transitionDelay","transitionProperty","PROPERTY_KEY","animationDuration","animationDelay","animationIterationCount","ANIMATION_ITERATION_COUNT_KEY","DETECT_STAGGER_CSS_PROPERTIES","module","directive","$$AnimateChildrenDirective","scope","attrs","ngAnimateChildren","data","NG_ANIMATE_CHILDREN_DATA","$observe","factory","$$rAFMutexFactory","$$rAF","passed","fn","$$rAFSchedulerFactory","scheduler","tasks","tickQueue","push","concat","nextTick","updatedQueue","innerQueue","shift","nextTask","cancelFn","waitUntilQuiet","scheduler.waitUntilQuiet","$$AnimateRunnerFactory","$q","$$rAFMutex","AnimateRunner","host","setHost","_doneCallbacks","_runInAnimationFrame","_state","chain","AnimateRunner.chain","callback","next","index","response","all","AnimateRunner.all","runners","onProgress","status","runner","done","prototype","DONE_COMPLETE_STATE","progress","getPromise","promise","self","resolve","reject","then","resolveHandler","rejectHandler","catch","handler","finally","pause","resume","end","_resolve","cancel","complete","INITIAL_STATE","DONE_PENDING_STATE","provider","$$AnimateQueueProvider","$animateProvider","isAllowed","ruleType","currentAnimation","previousAnimation","rules","some","hasAnimationClasses","and","skip","newAnimation","structural","event","RUNNING_STATE","state","nO","cO","$get","$rootScope","$rootElement","$document","$$HashMap","$$animation","$$AnimateRunner","$templateRequest","findCallbacks","targetNode","matches","entries","callbackRegistry","contains","triggerCallback","phase","queueAnimation","notifyProgress","close","applyAnimationClasses","parent","isAnimatableClassName","isStructural","indexOf","skipAnimations","animationsEnabled","disabledElementsLookup","existingAnimation","activeAnimationsLookup","hasExistingAnimation","PRE_DIGEST_STATE","areAnimationsAllowed","closeChildAnimations","skipAnimationFlag","cancelAnimationFlag","joinAnimationFlag","isValidAnimation","keys","clearElementAnimationState","closeParentClassBasedAnimations","counter","markElementAnimationState","$$postDigest","animationDetails","animationCancelled","parentElement","realRunner","children","querySelectorAll","child","parseInt","getAttribute","NG_ANIMATE_ATTR_NAME","remove","removeAttribute","isMatchingElement","nodeOrElmA","nodeOrElmB","startingElement","parentNode","rootElementDetected","bodyElementDetected","parentAnimationDetected","animateChildren","parentHost","NG_ANIMATE_PIN_DATA","details","bodyElement","setAttribute","newValue","oldValue","deregisterWatch","$watch","totalPendingRequests","isEmpty","body","classNameFilter","test","on","container","off","filterFromRegistry","list","matchContainer","matchCallback","containerNode","filter","arguments","pin","enabled","bool","argCount","hasElement","recordExists","$$AnimationProvider","getRunner","RUNNER_STORAGE_KEY","drivers","$injector","$$rAFScheduler","animationQueue","totalPendingClassBasedAnimations","totalActiveClassBasedAnimations","classBasedAnimationsQueue","getAnchorNodes","items","hasAttribute","NG_ANIMATE_REF_ATTR","SELECTOR","anchors","groupAnimations","animations","preparedAnimations","refLookup","animation","enterOrMove","anchorNodes","direction","anchor","animationID","usedIndicesLookup","anchorGroups","operations","fromAnimation","toAnimation","lookupKey","toString","group","beforeStart","cssClassesIntersection","indexKey","aa","j","invokeFirstDriver","driverName","has","driver","updateAnimationRunners","newRunner","handleDestroyedElement","rejected","removeData","tempClasses","NG_ANIMATE_CLASSNAME","classBasedIndex","animationEntry","triggerAnimationStart","startAnimationFn","closeFn","targetElement","operation","start","animationRunner","sort","map","$AnimateCssProvider","gcsLookup","gcsStaggerLookup","$timeout","$sniffer","gcsHashFn","extraClasses","parentCounter","computeCachedCssStaggerStyles","cacheKey","stagger","staggerClassName","rafWaitQueue","width","bod","offsetWidth","computeTimings","timings","aD","tD","maxDelay","maxDuration","init","endFn","animationClosed","animationCompleted","animationPaused","setupClasses","activeClasses","temporaryStyles","onDone","applyBlocking","blockTransition","blockKeyframeAnimation","closeAndReturnNoopAnimator","$$willAnimate","recalculateTimingStyles","fullClassName","relativeDelay","hasTransitions","hasAnimations","applyTransitionDelay","applyAnimationDelay","delay","delayStyle","maxDelayTime","ONE_SECOND","maxDurationTime","easing","easeVal","easeProp","TIMING_KEY","events","startTime","Date","now","onAnimationProgress","onAnimationExpired","CLOSING_TIME_BUFFER","stopPropagation","ev","originalEvent","timeStamp","$manualTimeStamp","elapsedTime","toFixed","ELAPSED_TIME_MAX_DECIMAL_PLACES","playPause","playAnimation","arr","splice","maxStagger","itemIndex","floor","runnerHost","runnerHost.resume","runnerHost.pause","transitions","method","structuralClassName","addRemoveClassName","applyClassesEarly","trim","hasToStyles","staggerVal","transitionStyle","durationStyle","keyframeStyle","staggerIndex","isFirst","SAFE_FAST_FORWARD_DURATION_VALUE","hasTransitionAll","applyTransitionDuration","applyAnimationDuration","skipBlocking","$$AnimateCssDriverProvider","$$animationProvider","$animateCss","filterCssClasses","replace","getUniqueValues","prepareAnchoredAnimation","outAnchor","inAnchor","calculateAnchorStyles","coords","getBoundingClientRect","bodyNode","scrollTop","scrollLeft","prepareInAnimation","endingClasses","startingClasses","animator","clone","NG_ANIMATE_SHIM_CLASS_NAME","cloneNode","NG_ANIMATE_ANCHOR_CLASS_NAME","rootBodyElement","append","animatorIn","animatorOut","prepareOutAnimation","NG_OUT_ANCHOR_CLASS_NAME","startingAnimator","prepareFromToAnchorAnimation","prepareRegularAnimation","anchorAnimations","outElement","inElement","animationRunners","rootNode","initDriverFn","$$AnimateJsProvider","lookupAnimations","flagMap","animationFactory","$$registeredAnimations","applyOptions","executeAnimationFn","args","classesToAdd","classesToRemove","apply","groupEventedAnimations","fnName","ani","endProgressCb","resolved","onAnimationComplete","result","packageAnimations","startAnimation","animateFn","before","after","afterFn","beforeFn","toUpperCase","substr","onComplete","success","closeActiveAnimations","cancelled","$$AnimateJsDriverProvider","$$animateJs","prepareAnimation","endFnFactory"]
+}
diff --git a/turtles/app/lib/bower_components/angular-animate/bower.json b/turtles/app/lib/bower_components/angular-animate/bower.json
new file mode 100644
index 000000000..4e8b56cdb
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/bower.json
@@ -0,0 +1,9 @@
+{
+  "name": "angular-animate",
+  "version": "1.4.0",
+  "main": "./angular-animate.js",
+  "ignore": [],
+  "dependencies": {
+    "angular": "1.4.0"
+  }
+}
diff --git a/turtles/app/lib/bower_components/angular-animate/index.js b/turtles/app/lib/bower_components/angular-animate/index.js
new file mode 100644
index 000000000..6ec0a3510
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/index.js
@@ -0,0 +1,2 @@
+require('./angular-animate');
+module.exports = 'ngAnimate';
diff --git a/turtles/app/lib/bower_components/angular-animate/package.json b/turtles/app/lib/bower_components/angular-animate/package.json
new file mode 100644
index 000000000..ba2398bff
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-animate/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "angular-animate",
+  "version": "1.4.0",
+  "description": "AngularJS module for animations",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.js.git"
+  },
+  "keywords": [
+    "angular",
+    "framework",
+    "browser",
+    "animation",
+    "client-side"
+  ],
+  "author": "Angular Core Team <angular-core+npm@google.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/angular.js/issues"
+  },
+  "homepage": "http://angularjs.org"
+}
diff --git a/turtles/app/lib/bower_components/angular-bootstrap/.bower.json b/turtles/app/lib/bower_components/angular-bootstrap/.bower.json
new file mode 100644
index 000000000..7fa81554d
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-bootstrap/.bower.json
@@ -0,0 +1,32 @@
+{
+  "author": {
+    "name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
+  },
+  "name": "angular-bootstrap",
+  "keywords": [
+    "angular",
+    "angular-ui",
+    "bootstrap"
+  ],
+  "license": "MIT",
+  "ignore": [],
+  "description": "Native AngularJS (Angular) directives for Bootstrap.",
+  "version": "0.13.0",
+  "main": [
+    "./ui-bootstrap-tpls.js"
+  ],
+  "dependencies": {
+    "angular": ">=1.3.0"
+  },
+  "homepage": "https://github.com/angular-ui/bootstrap-bower",
+  "_release": "0.13.0",
+  "_resolution": {
+    "type": "version",
+    "tag": "0.13.0",
+    "commit": "a75d899addcafb73344b724bec647620adeebc9a"
+  },
+  "_source": "git://github.com/angular-ui/bootstrap-bower.git",
+  "_target": "~0.13.0",
+  "_originalSource": "angular-bootstrap",
+  "_direct": true
+}
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular-bootstrap/bower.json b/turtles/app/lib/bower_components/angular-bootstrap/bower.json
new file mode 100644
index 000000000..ea65aadd5
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-bootstrap/bower.json
@@ -0,0 +1,19 @@
+{
+    "author": {
+        "name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
+    },
+    "name": "angular-bootstrap",
+    "keywords": [
+        "angular",
+        "angular-ui",
+        "bootstrap"
+    ],
+    "license": "MIT",
+    "ignore": [],
+    "description": "Native AngularJS (Angular) directives for Bootstrap.",
+    "version": "0.13.0",
+    "main": ["./ui-bootstrap-tpls.js"],
+    "dependencies": {
+        "angular": ">=1.3.0"
+    }
+}
diff --git a/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-csp.css b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-csp.css
new file mode 100644
index 000000000..d772f786d
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-csp.css
@@ -0,0 +1,6 @@
+/* Include this file in your html if you are using the CSP mode. */
+
+.ng-animate.item:not(.left):not(.right) {
+  -webkit-transition: 0s ease-in-out left;
+  transition: 0s ease-in-out left
+}
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.js b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.js
new file mode 100644
index 000000000..611966115
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.js
@@ -0,0 +1,4840 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 0.13.0 - 2015-05-02
+ * License: MIT
+ */
+angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.transition","ui.bootstrap.typeahead"]);
+angular.module("ui.bootstrap.tpls", ["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/day.html","template/datepicker/month.html","template/datepicker/popup.html","template/datepicker/year.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-popup.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/tooltip/tooltip-template-popup.html","template/popover/popover-template.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]);
+angular.module('ui.bootstrap.collapse', [])
+
+  .directive('collapse', ['$animate', function ($animate) {
+
+    return {
+      link: function (scope, element, attrs) {
+        function expand() {
+          element.removeClass('collapse').addClass('collapsing');
+          $animate.addClass(element, 'in', {
+            to: { height: element[0].scrollHeight + 'px' }
+          }).then(expandDone);
+        }
+
+        function expandDone() {
+          element.removeClass('collapsing');
+          element.css({height: 'auto'});
+        }
+
+        function collapse() {
+          element
+            // IMPORTANT: The height must be set before adding "collapsing" class.
+            // Otherwise, the browser attempts to animate from height 0 (in
+            // collapsing class) to the given height here.
+            .css({height: element[0].scrollHeight + 'px'})
+            // initially all panel collapse have the collapse class, this removal
+            // prevents the animation from jumping to collapsed state
+            .removeClass('collapse')
+            .addClass('collapsing');
+
+          $animate.removeClass(element, 'in', {
+            to: {height: '0'}
+          }).then(collapseDone);
+        }
+
+        function collapseDone() {
+          element.css({height: '0'}); // Required so that collapse works when animation is disabled
+          element.removeClass('collapsing');
+          element.addClass('collapse');
+        }
+
+        scope.$watch(attrs.collapse, function (shouldCollapse) {
+          if (shouldCollapse) {
+            collapse();
+          } else {
+            expand();
+          }
+        });
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
+
+.constant('accordionConfig', {
+  closeOthers: true
+})
+
+.controller('AccordionController', ['$scope', '$attrs', 'accordionConfig', function ($scope, $attrs, accordionConfig) {
+
+  // This array keeps track of the accordion groups
+  this.groups = [];
+
+  // Ensure that all the groups in this accordion are closed, unless close-others explicitly says not to
+  this.closeOthers = function(openGroup) {
+    var closeOthers = angular.isDefined($attrs.closeOthers) ? $scope.$eval($attrs.closeOthers) : accordionConfig.closeOthers;
+    if ( closeOthers ) {
+      angular.forEach(this.groups, function (group) {
+        if ( group !== openGroup ) {
+          group.isOpen = false;
+        }
+      });
+    }
+  };
+
+  // This is called from the accordion-group directive to add itself to the accordion
+  this.addGroup = function(groupScope) {
+    var that = this;
+    this.groups.push(groupScope);
+
+    groupScope.$on('$destroy', function (event) {
+      that.removeGroup(groupScope);
+    });
+  };
+
+  // This is called from the accordion-group directive when to remove itself
+  this.removeGroup = function(group) {
+    var index = this.groups.indexOf(group);
+    if ( index !== -1 ) {
+      this.groups.splice(index, 1);
+    }
+  };
+
+}])
+
+// The accordion directive simply sets up the directive controller
+// and adds an accordion CSS class to itself element.
+.directive('accordion', function () {
+  return {
+    restrict:'EA',
+    controller:'AccordionController',
+    transclude: true,
+    replace: false,
+    templateUrl: 'template/accordion/accordion.html'
+  };
+})
+
+// The accordion-group directive indicates a block of html that will expand and collapse in an accordion
+.directive('accordionGroup', function() {
+  return {
+    require:'^accordion',         // We need this directive to be inside an accordion
+    restrict:'EA',
+    transclude:true,              // It transcludes the contents of the directive into the template
+    replace: true,                // The element containing the directive will be replaced with the template
+    templateUrl:'template/accordion/accordion-group.html',
+    scope: {
+      heading: '@',               // Interpolate the heading attribute onto this scope
+      isOpen: '=?',
+      isDisabled: '=?'
+    },
+    controller: function() {
+      this.setHeading = function(element) {
+        this.heading = element;
+      };
+    },
+    link: function(scope, element, attrs, accordionCtrl) {
+      accordionCtrl.addGroup(scope);
+
+      scope.$watch('isOpen', function(value) {
+        if ( value ) {
+          accordionCtrl.closeOthers(scope);
+        }
+      });
+
+      scope.toggleOpen = function() {
+        if ( !scope.isDisabled ) {
+          scope.isOpen = !scope.isOpen;
+        }
+      };
+    }
+  };
+})
+
+// Use accordion-heading below an accordion-group to provide a heading containing HTML
+// <accordion-group>
+//   <accordion-heading>Heading containing HTML - <img src="..."></accordion-heading>
+// </accordion-group>
+.directive('accordionHeading', function() {
+  return {
+    restrict: 'EA',
+    transclude: true,   // Grab the contents to be used as the heading
+    template: '',       // In effect remove this element!
+    replace: true,
+    require: '^accordionGroup',
+    link: function(scope, element, attr, accordionGroupCtrl, transclude) {
+      // Pass the heading to the accordion-group controller
+      // so that it can be transcluded into the right place in the template
+      // [The second parameter to transclude causes the elements to be cloned so that they work in ng-repeat]
+      accordionGroupCtrl.setHeading(transclude(scope, angular.noop));
+    }
+  };
+})
+
+// Use in the accordion-group template to indicate where you want the heading to be transcluded
+// You must provide the property on the accordion-group controller that will hold the transcluded element
+// <div class="accordion-group">
+//   <div class="accordion-heading" ><a ... accordion-transclude="heading">...</a></div>
+//   ...
+// </div>
+.directive('accordionTransclude', function() {
+  return {
+    require: '^accordionGroup',
+    link: function(scope, element, attr, controller) {
+      scope.$watch(function() { return controller[attr.accordionTransclude]; }, function(heading) {
+        if ( heading ) {
+          element.html('');
+          element.append(heading);
+        }
+      });
+    }
+  };
+})
+
+;
+
+angular.module('ui.bootstrap.alert', [])
+
+.controller('AlertController', ['$scope', '$attrs', function ($scope, $attrs) {
+  $scope.closeable = 'close' in $attrs;
+  this.close = $scope.close;
+}])
+
+.directive('alert', function () {
+  return {
+    restrict:'EA',
+    controller:'AlertController',
+    templateUrl:'template/alert/alert.html',
+    transclude:true,
+    replace:true,
+    scope: {
+      type: '@',
+      close: '&'
+    }
+  };
+})
+
+.directive('dismissOnTimeout', ['$timeout', function($timeout) {
+  return {
+    require: 'alert',
+    link: function(scope, element, attrs, alertCtrl) {
+      $timeout(function(){
+        alertCtrl.close();
+      }, parseInt(attrs.dismissOnTimeout, 10));
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.bindHtml', [])
+
+  .directive('bindHtmlUnsafe', function () {
+    return function (scope, element, attr) {
+      element.addClass('ng-binding').data('$binding', attr.bindHtmlUnsafe);
+      scope.$watch(attr.bindHtmlUnsafe, function bindHtmlUnsafeWatchAction(value) {
+        element.html(value || '');
+      });
+    };
+  });
+angular.module('ui.bootstrap.buttons', [])
+
+.constant('buttonConfig', {
+  activeClass: 'active',
+  toggleEvent: 'click'
+})
+
+.controller('ButtonsController', ['buttonConfig', function(buttonConfig) {
+  this.activeClass = buttonConfig.activeClass || 'active';
+  this.toggleEvent = buttonConfig.toggleEvent || 'click';
+}])
+
+.directive('btnRadio', function () {
+  return {
+    require: ['btnRadio', 'ngModel'],
+    controller: 'ButtonsController',
+    link: function (scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      //model -> UI
+      ngModelCtrl.$render = function () {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, scope.$eval(attrs.btnRadio)));
+      };
+
+      //ui->model
+      element.bind(buttonsCtrl.toggleEvent, function () {
+        var isActive = element.hasClass(buttonsCtrl.activeClass);
+
+        if (!isActive || angular.isDefined(attrs.uncheckable)) {
+          scope.$apply(function () {
+            ngModelCtrl.$setViewValue(isActive ? null : scope.$eval(attrs.btnRadio));
+            ngModelCtrl.$render();
+          });
+        }
+      });
+    }
+  };
+})
+
+.directive('btnCheckbox', function () {
+  return {
+    require: ['btnCheckbox', 'ngModel'],
+    controller: 'ButtonsController',
+    link: function (scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      function getTrueValue() {
+        return getCheckboxValue(attrs.btnCheckboxTrue, true);
+      }
+
+      function getFalseValue() {
+        return getCheckboxValue(attrs.btnCheckboxFalse, false);
+      }
+
+      function getCheckboxValue(attributeValue, defaultValue) {
+        var val = scope.$eval(attributeValue);
+        return angular.isDefined(val) ? val : defaultValue;
+      }
+
+      //model -> UI
+      ngModelCtrl.$render = function () {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, getTrueValue()));
+      };
+
+      //ui->model
+      element.bind(buttonsCtrl.toggleEvent, function () {
+        scope.$apply(function () {
+          ngModelCtrl.$setViewValue(element.hasClass(buttonsCtrl.activeClass) ? getFalseValue() : getTrueValue());
+          ngModelCtrl.$render();
+        });
+      });
+    }
+  };
+});
+
+/**
+* @ngdoc overview
+* @name ui.bootstrap.carousel
+*
+* @description
+* AngularJS version of an image carousel.
+*
+*/
+angular.module('ui.bootstrap.carousel', [])
+.controller('CarouselController', ['$scope', '$interval', '$animate', function ($scope, $interval, $animate) {
+  var self = this,
+    slides = self.slides = $scope.slides = [],
+    currentIndex = -1,
+    currentInterval, isPlaying;
+  self.currentSlide = null;
+
+  var destroyed = false;
+  /* direction: "prev" or "next" */
+  self.select = $scope.select = function(nextSlide, direction) {
+    var nextIndex = self.indexOfSlide(nextSlide);
+    //Decide direction if it's not given
+    if (direction === undefined) {
+      direction = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
+    }
+    if (nextSlide && nextSlide !== self.currentSlide) {
+      goNext();
+    }
+    function goNext() {
+      // Scope has been destroyed, stop here.
+      if (destroyed) { return; }
+
+      angular.extend(nextSlide, {direction: direction, active: true});
+      angular.extend(self.currentSlide || {}, {direction: direction, active: false});
+      if ($animate.enabled() && !$scope.noTransition && nextSlide.$element) {
+        $scope.$currentTransition = true;
+        nextSlide.$element.one('$animate:close', function closeFn() {
+          $scope.$currentTransition = null;
+        });
+      }
+
+      self.currentSlide = nextSlide;
+      currentIndex = nextIndex;
+      //every time you change slides, reset the timer
+      restartTimer();
+    }
+  };
+  $scope.$on('$destroy', function () {
+    destroyed = true;
+  });
+
+  function getSlideByIndex(index) {
+    if (angular.isUndefined(slides[index].index)) {
+      return slides[index];
+    }
+    var i, len = slides.length;
+    for (i = 0; i < slides.length; ++i) {
+      if (slides[i].index == index) {
+        return slides[i];
+      }
+    }
+  }
+
+  self.getCurrentIndex = function() {
+    if (self.currentSlide && angular.isDefined(self.currentSlide.index)) {
+      return +self.currentSlide.index;
+    }
+    return currentIndex;
+  };
+
+  /* Allow outside people to call indexOf on slides array */
+  self.indexOfSlide = function(slide) {
+    return angular.isDefined(slide.index) ? +slide.index : slides.indexOf(slide);
+  };
+
+  $scope.next = function() {
+    var newIndex = (self.getCurrentIndex() + 1) % slides.length;
+
+    //Prevent this user-triggered transition from occurring if there is already one in progress
+    if (!$scope.$currentTransition) {
+      return self.select(getSlideByIndex(newIndex), 'next');
+    }
+  };
+
+  $scope.prev = function() {
+    var newIndex = self.getCurrentIndex() - 1 < 0 ? slides.length - 1 : self.getCurrentIndex() - 1;
+
+    //Prevent this user-triggered transition from occurring if there is already one in progress
+    if (!$scope.$currentTransition) {
+      return self.select(getSlideByIndex(newIndex), 'prev');
+    }
+  };
+
+  $scope.isActive = function(slide) {
+     return self.currentSlide === slide;
+  };
+
+  $scope.$watch('interval', restartTimer);
+  $scope.$on('$destroy', resetTimer);
+
+  function restartTimer() {
+    resetTimer();
+    var interval = +$scope.interval;
+    if (!isNaN(interval) && interval > 0) {
+      currentInterval = $interval(timerFn, interval);
+    }
+  }
+
+  function resetTimer() {
+    if (currentInterval) {
+      $interval.cancel(currentInterval);
+      currentInterval = null;
+    }
+  }
+
+  function timerFn() {
+    var interval = +$scope.interval;
+    if (isPlaying && !isNaN(interval) && interval > 0) {
+      $scope.next();
+    } else {
+      $scope.pause();
+    }
+  }
+
+  $scope.play = function() {
+    if (!isPlaying) {
+      isPlaying = true;
+      restartTimer();
+    }
+  };
+  $scope.pause = function() {
+    if (!$scope.noPause) {
+      isPlaying = false;
+      resetTimer();
+    }
+  };
+
+  self.addSlide = function(slide, element) {
+    slide.$element = element;
+    slides.push(slide);
+    //if this is the first slide or the slide is set to active, select it
+    if(slides.length === 1 || slide.active) {
+      self.select(slides[slides.length-1]);
+      if (slides.length == 1) {
+        $scope.play();
+      }
+    } else {
+      slide.active = false;
+    }
+  };
+
+  self.removeSlide = function(slide) {
+    if (angular.isDefined(slide.index)) {
+      slides.sort(function(a, b) {
+        return +a.index > +b.index;
+      });
+    }
+    //get the index of the slide inside the carousel
+    var index = slides.indexOf(slide);
+    slides.splice(index, 1);
+    if (slides.length > 0 && slide.active) {
+      if (index >= slides.length) {
+        self.select(slides[index-1]);
+      } else {
+        self.select(slides[index]);
+      }
+    } else if (currentIndex > index) {
+      currentIndex--;
+    }
+  };
+
+}])
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.carousel.directive:carousel
+ * @restrict EA
+ *
+ * @description
+ * Carousel is the outer container for a set of image 'slides' to showcase.
+ *
+ * @param {number=} interval The time, in milliseconds, that it will take the carousel to go to the next slide.
+ * @param {boolean=} noTransition Whether to disable transitions on the carousel.
+ * @param {boolean=} noPause Whether to disable pausing on the carousel (by default, the carousel interval pauses on hover).
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <carousel>
+      <slide>
+        <img src="http://placekitten.com/150/150" style="margin:auto;">
+        <div class="carousel-caption">
+          <p>Beautiful!</p>
+        </div>
+      </slide>
+      <slide>
+        <img src="http://placekitten.com/100/150" style="margin:auto;">
+        <div class="carousel-caption">
+          <p>D'aww!</p>
+        </div>
+      </slide>
+    </carousel>
+  </file>
+  <file name="demo.css">
+    .carousel-indicators {
+      top: auto;
+      bottom: 15px;
+    }
+  </file>
+</example>
+ */
+.directive('carousel', [function() {
+  return {
+    restrict: 'EA',
+    transclude: true,
+    replace: true,
+    controller: 'CarouselController',
+    require: 'carousel',
+    templateUrl: 'template/carousel/carousel.html',
+    scope: {
+      interval: '=',
+      noTransition: '=',
+      noPause: '='
+    }
+  };
+}])
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.carousel.directive:slide
+ * @restrict EA
+ *
+ * @description
+ * Creates a slide inside a {@link ui.bootstrap.carousel.directive:carousel carousel}.  Must be placed as a child of a carousel element.
+ *
+ * @param {boolean=} active Model binding, whether or not this slide is currently active.
+ * @param {number=} index The index of the slide. The slides will be sorted by this parameter.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+<div ng-controller="CarouselDemoCtrl">
+  <carousel>
+    <slide ng-repeat="slide in slides" active="slide.active" index="$index">
+      <img ng-src="{{slide.image}}" style="margin:auto;">
+      <div class="carousel-caption">
+        <h4>Slide {{$index}}</h4>
+        <p>{{slide.text}}</p>
+      </div>
+    </slide>
+  </carousel>
+  Interval, in milliseconds: <input type="number" ng-model="myInterval">
+  <br />Enter a negative number to stop the interval.
+</div>
+  </file>
+  <file name="script.js">
+function CarouselDemoCtrl($scope) {
+  $scope.myInterval = 5000;
+}
+  </file>
+  <file name="demo.css">
+    .carousel-indicators {
+      top: auto;
+      bottom: 15px;
+    }
+  </file>
+</example>
+*/
+
+.directive('slide', function() {
+  return {
+    require: '^carousel',
+    restrict: 'EA',
+    transclude: true,
+    replace: true,
+    templateUrl: 'template/carousel/slide.html',
+    scope: {
+      active: '=?',
+      index: '=?'
+    },
+    link: function (scope, element, attrs, carouselCtrl) {
+      carouselCtrl.addSlide(scope, element);
+      //when the scope is destroyed then remove the slide from the current slides array
+      scope.$on('$destroy', function() {
+        carouselCtrl.removeSlide(scope);
+      });
+
+      scope.$watch('active', function(active) {
+        if (active) {
+          carouselCtrl.select(scope);
+        }
+      });
+    }
+  };
+})
+
+.animation('.item', [
+         '$animate',
+function ($animate) {
+  return {
+    beforeAddClass: function (element, className, done) {
+      // Due to transclusion, noTransition property is on parent's scope
+      if (className == 'active' && element.parent() &&
+          !element.parent().scope().noTransition) {
+        var stopped = false;
+        var direction = element.isolateScope().direction;
+        var directionClass = direction == 'next' ? 'left' : 'right';
+        element.addClass(direction);
+        $animate.addClass(element, directionClass).then(function () {
+          if (!stopped) {
+            element.removeClass(directionClass + ' ' + direction);
+          }
+          done();
+        });
+
+        return function () {
+          stopped = true;
+        };
+      }
+      done();
+    },
+    beforeRemoveClass: function (element, className, done) {
+      // Due to transclusion, noTransition property is on parent's scope
+      if (className == 'active' && element.parent() &&
+          !element.parent().scope().noTransition) {
+        var stopped = false;
+        var direction = element.isolateScope().direction;
+        var directionClass = direction == 'next' ? 'left' : 'right';
+        $animate.addClass(element, directionClass).then(function () {
+          if (!stopped) {
+            element.removeClass(directionClass);
+          }
+          done();
+        });
+        return function () {
+          stopped = true;
+        };
+      }
+      done();
+    }
+  };
+
+}])
+
+
+;
+
+angular.module('ui.bootstrap.dateparser', [])
+
+.service('dateParser', ['$locale', 'orderByFilter', function($locale, orderByFilter) {
+  // Pulled from https://github.com/mbostock/d3/blob/master/src/format/requote.js
+  var SPECIAL_CHARACTERS_REGEXP = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
+
+  this.parsers = {};
+
+  var formatCodeToRegex = {
+    'yyyy': {
+      regex: '\\d{4}',
+      apply: function(value) { this.year = +value; }
+    },
+    'yy': {
+      regex: '\\d{2}',
+      apply: function(value) { this.year = +value + 2000; }
+    },
+    'y': {
+      regex: '\\d{1,4}',
+      apply: function(value) { this.year = +value; }
+    },
+    'MMMM': {
+      regex: $locale.DATETIME_FORMATS.MONTH.join('|'),
+      apply: function(value) { this.month = $locale.DATETIME_FORMATS.MONTH.indexOf(value); }
+    },
+    'MMM': {
+      regex: $locale.DATETIME_FORMATS.SHORTMONTH.join('|'),
+      apply: function(value) { this.month = $locale.DATETIME_FORMATS.SHORTMONTH.indexOf(value); }
+    },
+    'MM': {
+      regex: '0[1-9]|1[0-2]',
+      apply: function(value) { this.month = value - 1; }
+    },
+    'M': {
+      regex: '[1-9]|1[0-2]',
+      apply: function(value) { this.month = value - 1; }
+    },
+    'dd': {
+      regex: '[0-2][0-9]{1}|3[0-1]{1}',
+      apply: function(value) { this.date = +value; }
+    },
+    'd': {
+      regex: '[1-2]?[0-9]{1}|3[0-1]{1}',
+      apply: function(value) { this.date = +value; }
+    },
+    'EEEE': {
+      regex: $locale.DATETIME_FORMATS.DAY.join('|')
+    },
+    'EEE': {
+      regex: $locale.DATETIME_FORMATS.SHORTDAY.join('|')
+    },
+    'HH': {
+      regex: '(?:0|1)[0-9]|2[0-3]',
+      apply: function(value) { this.hours = +value; }
+    },
+    'H': {
+      regex: '1?[0-9]|2[0-3]',
+      apply: function(value) { this.hours = +value; }
+    },
+    'mm': {
+      regex: '[0-5][0-9]',
+      apply: function(value) { this.minutes = +value; }
+    },
+    'm': {
+      regex: '[0-9]|[1-5][0-9]',
+      apply: function(value) { this.minutes = +value; }
+    },
+    'sss': {
+      regex: '[0-9][0-9][0-9]',
+      apply: function(value) { this.milliseconds = +value; }
+    },
+    'ss': {
+      regex: '[0-5][0-9]',
+      apply: function(value) { this.seconds = +value; }
+    },
+    's': {
+      regex: '[0-9]|[1-5][0-9]',
+      apply: function(value) { this.seconds = +value; }
+    }
+  };
+
+  function createParser(format) {
+    var map = [], regex = format.split('');
+
+    angular.forEach(formatCodeToRegex, function(data, code) {
+      var index = format.indexOf(code);
+
+      if (index > -1) {
+        format = format.split('');
+
+        regex[index] = '(' + data.regex + ')';
+        format[index] = '$'; // Custom symbol to define consumed part of format
+        for (var i = index + 1, n = index + code.length; i < n; i++) {
+          regex[i] = '';
+          format[i] = '$';
+        }
+        format = format.join('');
+
+        map.push({ index: index, apply: data.apply });
+      }
+    });
+
+    return {
+      regex: new RegExp('^' + regex.join('') + '$'),
+      map: orderByFilter(map, 'index')
+    };
+  }
+
+  this.parse = function(input, format, baseDate) {
+    if ( !angular.isString(input) || !format ) {
+      return input;
+    }
+
+    format = $locale.DATETIME_FORMATS[format] || format;
+    format = format.replace(SPECIAL_CHARACTERS_REGEXP, '\\$&');
+
+    if ( !this.parsers[format] ) {
+      this.parsers[format] = createParser(format);
+    }
+
+    var parser = this.parsers[format],
+        regex = parser.regex,
+        map = parser.map,
+        results = input.match(regex);
+
+    if ( results && results.length ) {
+      var fields, dt;
+      if (baseDate) {
+        fields = {
+          year: baseDate.getFullYear(),
+          month: baseDate.getMonth(),
+          date: baseDate.getDate(),
+          hours: baseDate.getHours(),
+          minutes: baseDate.getMinutes(),
+          seconds: baseDate.getSeconds(),
+          milliseconds: baseDate.getMilliseconds()
+        };
+      } else {
+        fields = { year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0 };
+      }
+
+      for( var i = 1, n = results.length; i < n; i++ ) {
+        var mapper = map[i-1];
+        if ( mapper.apply ) {
+          mapper.apply.call(fields, results[i]);
+        }
+      }
+
+      if ( isValid(fields.year, fields.month, fields.date) ) {
+        dt = new Date(fields.year, fields.month, fields.date, fields.hours, fields.minutes, fields.seconds,
+          fields.milliseconds || 0);
+      }
+
+      return dt;
+    }
+  };
+
+  // Check if date is valid for specific month (and year for February).
+  // Month: 0 = Jan, 1 = Feb, etc
+  function isValid(year, month, date) {
+    if (date < 1) {
+      return false;
+    }
+
+    if ( month === 1 && date > 28) {
+        return date === 29 && ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0);
+    }
+
+    if ( month === 3 || month === 5 || month === 8 || month === 10) {
+        return date < 31;
+    }
+
+    return true;
+  }
+}]);
+
+angular.module('ui.bootstrap.position', [])
+
+/**
+ * A set of utility methods that can be use to retrieve position of DOM elements.
+ * It is meant to be used where we need to absolute-position DOM elements in
+ * relation to other, existing elements (this is the case for tooltips, popovers,
+ * typeahead suggestions etc.).
+ */
+  .factory('$position', ['$document', '$window', function ($document, $window) {
+
+    function getStyle(el, cssprop) {
+      if (el.currentStyle) { //IE
+        return el.currentStyle[cssprop];
+      } else if ($window.getComputedStyle) {
+        return $window.getComputedStyle(el)[cssprop];
+      }
+      // finally try and get inline style
+      return el.style[cssprop];
+    }
+
+    /**
+     * Checks if a given element is statically positioned
+     * @param element - raw DOM element
+     */
+    function isStaticPositioned(element) {
+      return (getStyle(element, 'position') || 'static' ) === 'static';
+    }
+
+    /**
+     * returns the closest, non-statically positioned parentOffset of a given element
+     * @param element
+     */
+    var parentOffsetEl = function (element) {
+      var docDomEl = $document[0];
+      var offsetParent = element.offsetParent || docDomEl;
+      while (offsetParent && offsetParent !== docDomEl && isStaticPositioned(offsetParent) ) {
+        offsetParent = offsetParent.offsetParent;
+      }
+      return offsetParent || docDomEl;
+    };
+
+    return {
+      /**
+       * Provides read-only equivalent of jQuery's position function:
+       * http://api.jquery.com/position/
+       */
+      position: function (element) {
+        var elBCR = this.offset(element);
+        var offsetParentBCR = { top: 0, left: 0 };
+        var offsetParentEl = parentOffsetEl(element[0]);
+        if (offsetParentEl != $document[0]) {
+          offsetParentBCR = this.offset(angular.element(offsetParentEl));
+          offsetParentBCR.top += offsetParentEl.clientTop - offsetParentEl.scrollTop;
+          offsetParentBCR.left += offsetParentEl.clientLeft - offsetParentEl.scrollLeft;
+        }
+
+        var boundingClientRect = element[0].getBoundingClientRect();
+        return {
+          width: boundingClientRect.width || element.prop('offsetWidth'),
+          height: boundingClientRect.height || element.prop('offsetHeight'),
+          top: elBCR.top - offsetParentBCR.top,
+          left: elBCR.left - offsetParentBCR.left
+        };
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's offset function:
+       * http://api.jquery.com/offset/
+       */
+      offset: function (element) {
+        var boundingClientRect = element[0].getBoundingClientRect();
+        return {
+          width: boundingClientRect.width || element.prop('offsetWidth'),
+          height: boundingClientRect.height || element.prop('offsetHeight'),
+          top: boundingClientRect.top + ($window.pageYOffset || $document[0].documentElement.scrollTop),
+          left: boundingClientRect.left + ($window.pageXOffset || $document[0].documentElement.scrollLeft)
+        };
+      },
+
+      /**
+       * Provides coordinates for the targetEl in relation to hostEl
+       */
+      positionElements: function (hostEl, targetEl, positionStr, appendToBody) {
+
+        var positionStrParts = positionStr.split('-');
+        var pos0 = positionStrParts[0], pos1 = positionStrParts[1] || 'center';
+
+        var hostElPos,
+          targetElWidth,
+          targetElHeight,
+          targetElPos;
+
+        hostElPos = appendToBody ? this.offset(hostEl) : this.position(hostEl);
+
+        targetElWidth = targetEl.prop('offsetWidth');
+        targetElHeight = targetEl.prop('offsetHeight');
+
+        var shiftWidth = {
+          center: function () {
+            return hostElPos.left + hostElPos.width / 2 - targetElWidth / 2;
+          },
+          left: function () {
+            return hostElPos.left;
+          },
+          right: function () {
+            return hostElPos.left + hostElPos.width;
+          }
+        };
+
+        var shiftHeight = {
+          center: function () {
+            return hostElPos.top + hostElPos.height / 2 - targetElHeight / 2;
+          },
+          top: function () {
+            return hostElPos.top;
+          },
+          bottom: function () {
+            return hostElPos.top + hostElPos.height;
+          }
+        };
+
+        switch (pos0) {
+          case 'right':
+            targetElPos = {
+              top: shiftHeight[pos1](),
+              left: shiftWidth[pos0]()
+            };
+            break;
+          case 'left':
+            targetElPos = {
+              top: shiftHeight[pos1](),
+              left: hostElPos.left - targetElWidth
+            };
+            break;
+          case 'bottom':
+            targetElPos = {
+              top: shiftHeight[pos0](),
+              left: shiftWidth[pos1]()
+            };
+            break;
+          default:
+            targetElPos = {
+              top: hostElPos.top - targetElHeight,
+              left: shiftWidth[pos1]()
+            };
+            break;
+        }
+
+        return targetElPos;
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
+
+.constant('datepickerConfig', {
+  formatDay: 'dd',
+  formatMonth: 'MMMM',
+  formatYear: 'yyyy',
+  formatDayHeader: 'EEE',
+  formatDayTitle: 'MMMM yyyy',
+  formatMonthTitle: 'yyyy',
+  datepickerMode: 'day',
+  minMode: 'day',
+  maxMode: 'year',
+  showWeeks: true,
+  startingDay: 0,
+  yearRange: 20,
+  minDate: null,
+  maxDate: null,
+  shortcutPropagation: false
+})
+
+.controller('DatepickerController', ['$scope', '$attrs', '$parse', '$interpolate', '$timeout', '$log', 'dateFilter', 'datepickerConfig', function($scope, $attrs, $parse, $interpolate, $timeout, $log, dateFilter, datepickerConfig) {
+  var self = this,
+      ngModelCtrl = { $setViewValue: angular.noop }; // nullModelCtrl;
+
+  // Modes chain
+  this.modes = ['day', 'month', 'year'];
+
+  // Configuration attributes
+  angular.forEach(['formatDay', 'formatMonth', 'formatYear', 'formatDayHeader', 'formatDayTitle', 'formatMonthTitle',
+                   'minMode', 'maxMode', 'showWeeks', 'startingDay', 'yearRange', 'shortcutPropagation'], function( key, index ) {
+    self[key] = angular.isDefined($attrs[key]) ? (index < 8 ? $interpolate($attrs[key])($scope.$parent) : $scope.$parent.$eval($attrs[key])) : datepickerConfig[key];
+  });
+
+  // Watchable date attributes
+  angular.forEach(['minDate', 'maxDate'], function( key ) {
+    if ( $attrs[key] ) {
+      $scope.$parent.$watch($parse($attrs[key]), function(value) {
+        self[key] = value ? new Date(value) : null;
+        self.refreshView();
+      });
+    } else {
+      self[key] = datepickerConfig[key] ? new Date(datepickerConfig[key]) : null;
+    }
+  });
+
+  $scope.datepickerMode = $scope.datepickerMode || datepickerConfig.datepickerMode;
+  $scope.maxMode = self.maxMode;
+  $scope.uniqueId = 'datepicker-' + $scope.$id + '-' + Math.floor(Math.random() * 10000);
+
+  if(angular.isDefined($attrs.initDate)) {
+    this.activeDate = $scope.$parent.$eval($attrs.initDate) || new Date();
+    $scope.$parent.$watch($attrs.initDate, function(initDate){
+      if(initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)){
+        self.activeDate = initDate;
+        self.refreshView();
+      }
+    });
+  } else {
+    this.activeDate =  new Date();
+  }
+
+  $scope.isActive = function(dateObject) {
+    if (self.compare(dateObject.date, self.activeDate) === 0) {
+      $scope.activeDateId = dateObject.uid;
+      return true;
+    }
+    return false;
+  };
+
+  this.init = function( ngModelCtrl_ ) {
+    ngModelCtrl = ngModelCtrl_;
+
+    ngModelCtrl.$render = function() {
+      self.render();
+    };
+  };
+
+  this.render = function() {
+    if ( ngModelCtrl.$viewValue ) {
+      var date = new Date( ngModelCtrl.$viewValue ),
+          isValid = !isNaN(date);
+
+      if ( isValid ) {
+        this.activeDate = date;
+      } else {
+        $log.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
+      }
+      ngModelCtrl.$setValidity('date', isValid);
+    }
+    this.refreshView();
+  };
+
+  this.refreshView = function() {
+    if ( this.element ) {
+      this._refreshView();
+
+      var date = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+      ngModelCtrl.$setValidity('date-disabled', !date || (this.element && !this.isDisabled(date)));
+    }
+  };
+
+  this.createDateObject = function(date, format) {
+    var model = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+    return {
+      date: date,
+      label: dateFilter(date, format),
+      selected: model && this.compare(date, model) === 0,
+      disabled: this.isDisabled(date),
+      current: this.compare(date, new Date()) === 0,
+      customClass: this.customClass(date)
+    };
+  };
+
+  this.isDisabled = function( date ) {
+    return ((this.minDate && this.compare(date, this.minDate) < 0) || (this.maxDate && this.compare(date, this.maxDate) > 0) || ($attrs.dateDisabled && $scope.dateDisabled({date: date, mode: $scope.datepickerMode})));
+  };
+
+    this.customClass = function( date ) {
+      return $scope.customClass({date: date, mode: $scope.datepickerMode});
+    };
+
+  // Split array into smaller arrays
+  this.split = function(arr, size) {
+    var arrays = [];
+    while (arr.length > 0) {
+      arrays.push(arr.splice(0, size));
+    }
+    return arrays;
+  };
+
+  $scope.select = function( date ) {
+    if ( $scope.datepickerMode === self.minMode ) {
+      var dt = ngModelCtrl.$viewValue ? new Date( ngModelCtrl.$viewValue ) : new Date(0, 0, 0, 0, 0, 0, 0);
+      dt.setFullYear( date.getFullYear(), date.getMonth(), date.getDate() );
+      ngModelCtrl.$setViewValue( dt );
+      ngModelCtrl.$render();
+    } else {
+      self.activeDate = date;
+      $scope.datepickerMode = self.modes[ self.modes.indexOf( $scope.datepickerMode ) - 1 ];
+    }
+  };
+
+  $scope.move = function( direction ) {
+    var year = self.activeDate.getFullYear() + direction * (self.step.years || 0),
+        month = self.activeDate.getMonth() + direction * (self.step.months || 0);
+    self.activeDate.setFullYear(year, month, 1);
+    self.refreshView();
+  };
+
+  $scope.toggleMode = function( direction ) {
+    direction = direction || 1;
+
+    if (($scope.datepickerMode === self.maxMode && direction === 1) || ($scope.datepickerMode === self.minMode && direction === -1)) {
+      return;
+    }
+
+    $scope.datepickerMode = self.modes[ self.modes.indexOf( $scope.datepickerMode ) + direction ];
+  };
+
+  // Key event mapper
+  $scope.keys = { 13:'enter', 32:'space', 33:'pageup', 34:'pagedown', 35:'end', 36:'home', 37:'left', 38:'up', 39:'right', 40:'down' };
+
+  var focusElement = function() {
+    $timeout(function() {
+      self.element[0].focus();
+    }, 0 , false);
+  };
+
+  // Listen for focus requests from popup directive
+  $scope.$on('datepicker.focus', focusElement);
+
+  $scope.keydown = function( evt ) {
+    var key = $scope.keys[evt.which];
+
+    if ( !key || evt.shiftKey || evt.altKey ) {
+      return;
+    }
+
+    evt.preventDefault();
+    if(!self.shortcutPropagation){
+        evt.stopPropagation();
+    }
+
+    if (key === 'enter' || key === 'space') {
+      if ( self.isDisabled(self.activeDate)) {
+        return; // do nothing
+      }
+      $scope.select(self.activeDate);
+      focusElement();
+    } else if (evt.ctrlKey && (key === 'up' || key === 'down')) {
+      $scope.toggleMode(key === 'up' ? 1 : -1);
+      focusElement();
+    } else {
+      self.handleKeyDown(key, evt);
+      self.refreshView();
+    }
+  };
+}])
+
+.directive( 'datepicker', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/datepicker.html',
+    scope: {
+      datepickerMode: '=?',
+      dateDisabled: '&',
+      customClass: '&',
+      shortcutPropagation: '&?'
+    },
+    require: ['datepicker', '?^ngModel'],
+    controller: 'DatepickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if ( ngModelCtrl ) {
+        datepickerCtrl.init( ngModelCtrl );
+      }
+    }
+  };
+})
+
+.directive('daypicker', ['dateFilter', function (dateFilter) {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/day.html',
+    require: '^datepicker',
+    link: function(scope, element, attrs, ctrl) {
+      scope.showWeeks = ctrl.showWeeks;
+
+      ctrl.step = { months: 1 };
+      ctrl.element = element;
+
+      var DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+      function getDaysInMonth( year, month ) {
+        return ((month === 1) && (year % 4 === 0) && ((year % 100 !== 0) || (year % 400 === 0))) ? 29 : DAYS_IN_MONTH[month];
+      }
+
+      function getDates(startDate, n) {
+        var dates = new Array(n), current = new Date(startDate), i = 0;
+        current.setHours(12); // Prevent repeated dates because of timezone bug
+        while ( i < n ) {
+          dates[i++] = new Date(current);
+          current.setDate( current.getDate() + 1 );
+        }
+        return dates;
+      }
+
+      ctrl._refreshView = function() {
+        var year = ctrl.activeDate.getFullYear(),
+          month = ctrl.activeDate.getMonth(),
+          firstDayOfMonth = new Date(year, month, 1),
+          difference = ctrl.startingDay - firstDayOfMonth.getDay(),
+          numDisplayedFromPreviousMonth = (difference > 0) ? 7 - difference : - difference,
+          firstDate = new Date(firstDayOfMonth);
+
+        if ( numDisplayedFromPreviousMonth > 0 ) {
+          firstDate.setDate( - numDisplayedFromPreviousMonth + 1 );
+        }
+
+        // 42 is the number of days on a six-month calendar
+        var days = getDates(firstDate, 42);
+        for (var i = 0; i < 42; i ++) {
+          days[i] = angular.extend(ctrl.createDateObject(days[i], ctrl.formatDay), {
+            secondary: days[i].getMonth() !== month,
+            uid: scope.uniqueId + '-' + i
+          });
+        }
+
+        scope.labels = new Array(7);
+        for (var j = 0; j < 7; j++) {
+          scope.labels[j] = {
+            abbr: dateFilter(days[j].date, ctrl.formatDayHeader),
+            full: dateFilter(days[j].date, 'EEEE')
+          };
+        }
+
+        scope.title = dateFilter(ctrl.activeDate, ctrl.formatDayTitle);
+        scope.rows = ctrl.split(days, 7);
+
+        if ( scope.showWeeks ) {
+          scope.weekNumbers = [];
+          var thursdayIndex = (4 + 7 - ctrl.startingDay) % 7,
+              numWeeks = scope.rows.length;
+          for (var curWeek = 0; curWeek < numWeeks; curWeek++) {
+            scope.weekNumbers.push(
+              getISO8601WeekNumber( scope.rows[curWeek][thursdayIndex].date ));
+          }
+        }
+      };
+
+      ctrl.compare = function(date1, date2) {
+        return (new Date( date1.getFullYear(), date1.getMonth(), date1.getDate() ) - new Date( date2.getFullYear(), date2.getMonth(), date2.getDate() ) );
+      };
+
+      function getISO8601WeekNumber(date) {
+        var checkDate = new Date(date);
+        checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); // Thursday
+        var time = checkDate.getTime();
+        checkDate.setMonth(0); // Compare with Jan 1
+        checkDate.setDate(1);
+        return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+      }
+
+      ctrl.handleKeyDown = function( key, evt ) {
+        var date = ctrl.activeDate.getDate();
+
+        if (key === 'left') {
+          date = date - 1;   // up
+        } else if (key === 'up') {
+          date = date - 7;   // down
+        } else if (key === 'right') {
+          date = date + 1;   // down
+        } else if (key === 'down') {
+          date = date + 7;
+        } else if (key === 'pageup' || key === 'pagedown') {
+          var month = ctrl.activeDate.getMonth() + (key === 'pageup' ? - 1 : 1);
+          ctrl.activeDate.setMonth(month, 1);
+          date = Math.min(getDaysInMonth(ctrl.activeDate.getFullYear(), ctrl.activeDate.getMonth()), date);
+        } else if (key === 'home') {
+          date = 1;
+        } else if (key === 'end') {
+          date = getDaysInMonth(ctrl.activeDate.getFullYear(), ctrl.activeDate.getMonth());
+        }
+        ctrl.activeDate.setDate(date);
+      };
+
+      ctrl.refreshView();
+    }
+  };
+}])
+
+.directive('monthpicker', ['dateFilter', function (dateFilter) {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/month.html',
+    require: '^datepicker',
+    link: function(scope, element, attrs, ctrl) {
+      ctrl.step = { years: 1 };
+      ctrl.element = element;
+
+      ctrl._refreshView = function() {
+        var months = new Array(12),
+            year = ctrl.activeDate.getFullYear();
+
+        for ( var i = 0; i < 12; i++ ) {
+          months[i] = angular.extend(ctrl.createDateObject(new Date(year, i, 1), ctrl.formatMonth), {
+            uid: scope.uniqueId + '-' + i
+          });
+        }
+
+        scope.title = dateFilter(ctrl.activeDate, ctrl.formatMonthTitle);
+        scope.rows = ctrl.split(months, 3);
+      };
+
+      ctrl.compare = function(date1, date2) {
+        return new Date( date1.getFullYear(), date1.getMonth() ) - new Date( date2.getFullYear(), date2.getMonth() );
+      };
+
+      ctrl.handleKeyDown = function( key, evt ) {
+        var date = ctrl.activeDate.getMonth();
+
+        if (key === 'left') {
+          date = date - 1;   // up
+        } else if (key === 'up') {
+          date = date - 3;   // down
+        } else if (key === 'right') {
+          date = date + 1;   // down
+        } else if (key === 'down') {
+          date = date + 3;
+        } else if (key === 'pageup' || key === 'pagedown') {
+          var year = ctrl.activeDate.getFullYear() + (key === 'pageup' ? - 1 : 1);
+          ctrl.activeDate.setFullYear(year);
+        } else if (key === 'home') {
+          date = 0;
+        } else if (key === 'end') {
+          date = 11;
+        }
+        ctrl.activeDate.setMonth(date);
+      };
+
+      ctrl.refreshView();
+    }
+  };
+}])
+
+.directive('yearpicker', ['dateFilter', function (dateFilter) {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/year.html',
+    require: '^datepicker',
+    link: function(scope, element, attrs, ctrl) {
+      var range = ctrl.yearRange;
+
+      ctrl.step = { years: range };
+      ctrl.element = element;
+
+      function getStartingYear( year ) {
+        return parseInt((year - 1) / range, 10) * range + 1;
+      }
+
+      ctrl._refreshView = function() {
+        var years = new Array(range);
+
+        for ( var i = 0, start = getStartingYear(ctrl.activeDate.getFullYear()); i < range; i++ ) {
+          years[i] = angular.extend(ctrl.createDateObject(new Date(start + i, 0, 1), ctrl.formatYear), {
+            uid: scope.uniqueId + '-' + i
+          });
+        }
+
+        scope.title = [years[0].label, years[range - 1].label].join(' - ');
+        scope.rows = ctrl.split(years, 5);
+      };
+
+      ctrl.compare = function(date1, date2) {
+        return date1.getFullYear() - date2.getFullYear();
+      };
+
+      ctrl.handleKeyDown = function( key, evt ) {
+        var date = ctrl.activeDate.getFullYear();
+
+        if (key === 'left') {
+          date = date - 1;   // up
+        } else if (key === 'up') {
+          date = date - 5;   // down
+        } else if (key === 'right') {
+          date = date + 1;   // down
+        } else if (key === 'down') {
+          date = date + 5;
+        } else if (key === 'pageup' || key === 'pagedown') {
+          date += (key === 'pageup' ? - 1 : 1) * ctrl.step.years;
+        } else if (key === 'home') {
+          date = getStartingYear( ctrl.activeDate.getFullYear() );
+        } else if (key === 'end') {
+          date = getStartingYear( ctrl.activeDate.getFullYear() ) + range - 1;
+        }
+        ctrl.activeDate.setFullYear(date);
+      };
+
+      ctrl.refreshView();
+    }
+  };
+}])
+
+.constant('datepickerPopupConfig', {
+  datepickerPopup: 'yyyy-MM-dd',
+  html5Types: {
+    date: 'yyyy-MM-dd',
+    'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
+    'month': 'yyyy-MM'
+  },
+  currentText: 'Today',
+  clearText: 'Clear',
+  closeText: 'Done',
+  closeOnDateSelection: true,
+  appendToBody: false,
+  showButtonBar: true
+})
+
+.directive('datepickerPopup', ['$compile', '$parse', '$document', '$position', 'dateFilter', 'dateParser', 'datepickerPopupConfig',
+function ($compile, $parse, $document, $position, dateFilter, dateParser, datepickerPopupConfig) {
+  return {
+    restrict: 'EA',
+    require: 'ngModel',
+    scope: {
+      isOpen: '=?',
+      currentText: '@',
+      clearText: '@',
+      closeText: '@',
+      dateDisabled: '&',
+      customClass: '&'
+    },
+    link: function(scope, element, attrs, ngModel) {
+      var dateFormat,
+          closeOnDateSelection = angular.isDefined(attrs.closeOnDateSelection) ? scope.$parent.$eval(attrs.closeOnDateSelection) : datepickerPopupConfig.closeOnDateSelection,
+          appendToBody = angular.isDefined(attrs.datepickerAppendToBody) ? scope.$parent.$eval(attrs.datepickerAppendToBody) : datepickerPopupConfig.appendToBody;
+
+      scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? scope.$parent.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
+
+      scope.getText = function( key ) {
+        return scope[key + 'Text'] || datepickerPopupConfig[key + 'Text'];
+      };
+
+      var isHtml5DateInput = false;
+      if (datepickerPopupConfig.html5Types[attrs.type]) {
+        dateFormat = datepickerPopupConfig.html5Types[attrs.type];
+        isHtml5DateInput = true;
+      } else {
+        dateFormat = attrs.datepickerPopup || datepickerPopupConfig.datepickerPopup;
+        attrs.$observe('datepickerPopup', function(value, oldValue) {
+            var newDateFormat = value || datepickerPopupConfig.datepickerPopup;
+            // Invalidate the $modelValue to ensure that formatters re-run
+            // FIXME: Refactor when PR is merged: https://github.com/angular/angular.js/pull/10764
+            if (newDateFormat !== dateFormat) {
+              dateFormat = newDateFormat;
+              ngModel.$modelValue = null;
+
+              if (!dateFormat) {
+                throw new Error('datepickerPopup must have a date format specified.');
+              }
+            }
+        });
+      }
+
+      if (!dateFormat) {
+        throw new Error('datepickerPopup must have a date format specified.');
+      }
+
+      if (isHtml5DateInput && attrs.datepickerPopup) {
+        throw new Error('HTML5 date input types do not support custom formats.');
+      }
+
+      // popup element used to display calendar
+      var popupEl = angular.element('<div datepicker-popup-wrap><div datepicker></div></div>');
+      popupEl.attr({
+        'ng-model': 'date',
+        'ng-change': 'dateSelection()'
+      });
+
+      function cameltoDash( string ){
+        return string.replace(/([A-Z])/g, function($1) { return '-' + $1.toLowerCase(); });
+      }
+
+      // datepicker element
+      var datepickerEl = angular.element(popupEl.children()[0]);
+      if (isHtml5DateInput) {
+        if (attrs.type == 'month') {
+          datepickerEl.attr('datepicker-mode', '"month"');
+          datepickerEl.attr('min-mode', 'month');
+        }
+      }
+
+      if ( attrs.datepickerOptions ) {
+        var options = scope.$parent.$eval(attrs.datepickerOptions);
+        if(options.initDate) {
+          scope.initDate = options.initDate;
+          datepickerEl.attr( 'init-date', 'initDate' );
+          delete options.initDate;
+        }
+        angular.forEach(options, function( value, option ) {
+          datepickerEl.attr( cameltoDash(option), value );
+        });
+      }
+
+      scope.watchData = {};
+      angular.forEach(['minDate', 'maxDate', 'datepickerMode', 'initDate', 'shortcutPropagation'], function( key ) {
+        if ( attrs[key] ) {
+          var getAttribute = $parse(attrs[key]);
+          scope.$parent.$watch(getAttribute, function(value){
+            scope.watchData[key] = value;
+          });
+          datepickerEl.attr(cameltoDash(key), 'watchData.' + key);
+
+          // Propagate changes from datepicker to outside
+          if ( key === 'datepickerMode' ) {
+            var setAttribute = getAttribute.assign;
+            scope.$watch('watchData.' + key, function(value, oldvalue) {
+              if ( value !== oldvalue ) {
+                setAttribute(scope.$parent, value);
+              }
+            });
+          }
+        }
+      });
+      if (attrs.dateDisabled) {
+        datepickerEl.attr('date-disabled', 'dateDisabled({ date: date, mode: mode })');
+      }
+
+      if (attrs.showWeeks) {
+        datepickerEl.attr('show-weeks', attrs.showWeeks);
+      }
+
+      if (attrs.customClass){
+        datepickerEl.attr('custom-class', 'customClass({ date: date, mode: mode })');
+      }
+
+      function parseDate(viewValue) {
+        if (angular.isNumber(viewValue)) {
+          // presumably timestamp to date object
+          viewValue = new Date(viewValue);
+        }
+
+        if (!viewValue) {
+          return null;
+        } else if (angular.isDate(viewValue) && !isNaN(viewValue)) {
+          return viewValue;
+        } else if (angular.isString(viewValue)) {
+          var date = dateParser.parse(viewValue, dateFormat, scope.date) || new Date(viewValue);
+          if (isNaN(date)) {
+            return undefined;
+          } else {
+            return date;
+          }
+        } else {
+          return undefined;
+        }
+      }
+
+      function validator(modelValue, viewValue) {
+        var value = modelValue || viewValue;
+        if (angular.isNumber(value)) {
+          value = new Date(value);
+        }
+        if (!value) {
+          return true;
+        } else if (angular.isDate(value) && !isNaN(value)) {
+          return true;
+        } else if (angular.isString(value)) {
+          var date = dateParser.parse(value, dateFormat) || new Date(value);
+          return !isNaN(date);
+        } else {
+          return false;
+        }
+      }
+
+      if (!isHtml5DateInput) {
+        // Internal API to maintain the correct ng-invalid-[key] class
+        ngModel.$$parserName = 'date';
+        ngModel.$validators.date = validator;
+        ngModel.$parsers.unshift(parseDate);
+        ngModel.$formatters.push(function (value) {
+          scope.date = value;
+          return ngModel.$isEmpty(value) ? value : dateFilter(value, dateFormat);
+        });
+      }
+      else {
+        ngModel.$formatters.push(function (value) {
+          scope.date = value;
+          return value;
+        });
+      }
+
+      // Inner change
+      scope.dateSelection = function(dt) {
+        if (angular.isDefined(dt)) {
+          scope.date = dt;
+        }
+        var date = scope.date ? dateFilter(scope.date, dateFormat) : '';
+        element.val(date);
+        ngModel.$setViewValue(date);
+
+        if ( closeOnDateSelection ) {
+          scope.isOpen = false;
+          element[0].focus();
+        }
+      };
+
+      // Detect changes in the view from the text box
+      ngModel.$viewChangeListeners.push(function () {
+        scope.date = dateParser.parse(ngModel.$viewValue, dateFormat, scope.date) || new Date(ngModel.$viewValue);
+      });
+
+      var documentClickBind = function(event) {
+        if (scope.isOpen && event.target !== element[0]) {
+          scope.$apply(function() {
+            scope.isOpen = false;
+          });
+        }
+      };
+
+      var keydown = function(evt, noApply) {
+        scope.keydown(evt);
+      };
+      element.bind('keydown', keydown);
+
+      scope.keydown = function(evt) {
+        if (evt.which === 27) {
+          evt.preventDefault();
+          if (scope.isOpen) {
+            evt.stopPropagation();
+          }
+          scope.close();
+        } else if (evt.which === 40 && !scope.isOpen) {
+          scope.isOpen = true;
+        }
+      };
+
+      scope.$watch('isOpen', function(value) {
+        if (value) {
+          scope.$broadcast('datepicker.focus');
+          scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+          scope.position.top = scope.position.top + element.prop('offsetHeight');
+
+          $document.bind('click', documentClickBind);
+        } else {
+          $document.unbind('click', documentClickBind);
+        }
+      });
+
+      scope.select = function( date ) {
+        if (date === 'today') {
+          var today = new Date();
+          if (angular.isDate(scope.date)) {
+            date = new Date(scope.date);
+            date.setFullYear(today.getFullYear(), today.getMonth(), today.getDate());
+          } else {
+            date = new Date(today.setHours(0, 0, 0, 0));
+          }
+        }
+        scope.dateSelection( date );
+      };
+
+      scope.close = function() {
+        scope.isOpen = false;
+        element[0].focus();
+      };
+
+      var $popup = $compile(popupEl)(scope);
+      // Prevent jQuery cache memory leak (template is now redundant after linking)
+      popupEl.remove();
+
+      if ( appendToBody ) {
+        $document.find('body').append($popup);
+      } else {
+        element.after($popup);
+      }
+
+      scope.$on('$destroy', function() {
+        $popup.remove();
+        element.unbind('keydown', keydown);
+        $document.unbind('click', documentClickBind);
+      });
+    }
+  };
+}])
+
+.directive('datepickerPopupWrap', function() {
+  return {
+    restrict:'EA',
+    replace: true,
+    transclude: true,
+    templateUrl: 'template/datepicker/popup.html',
+    link:function (scope, element, attrs) {
+      element.bind('click', function(event) {
+        event.preventDefault();
+        event.stopPropagation();
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
+
+.constant('dropdownConfig', {
+  openClass: 'open'
+})
+
+.service('dropdownService', ['$document', '$rootScope', function($document, $rootScope) {
+  var openScope = null;
+
+  this.open = function( dropdownScope ) {
+    if ( !openScope ) {
+      $document.bind('click', closeDropdown);
+      $document.bind('keydown', escapeKeyBind);
+    }
+
+    if ( openScope && openScope !== dropdownScope ) {
+        openScope.isOpen = false;
+    }
+
+    openScope = dropdownScope;
+  };
+
+  this.close = function( dropdownScope ) {
+    if ( openScope === dropdownScope ) {
+      openScope = null;
+      $document.unbind('click', closeDropdown);
+      $document.unbind('keydown', escapeKeyBind);
+    }
+  };
+
+  var closeDropdown = function( evt ) {
+    // This method may still be called during the same mouse event that
+    // unbound this event handler. So check openScope before proceeding.
+    if (!openScope) { return; }
+
+    if( evt && openScope.getAutoClose() === 'disabled' )  { return ; }
+
+    var toggleElement = openScope.getToggleElement();
+    if ( evt && toggleElement && toggleElement[0].contains(evt.target) ) {
+        return;
+    }
+
+    var $element = openScope.getElement();
+    if( evt && openScope.getAutoClose() === 'outsideClick' && $element && $element[0].contains(evt.target) ) {
+      return;
+    }
+
+    openScope.isOpen = false;
+
+    if (!$rootScope.$$phase) {
+      openScope.$apply();
+    }
+  };
+
+  var escapeKeyBind = function( evt ) {
+    if ( evt.which === 27 ) {
+      openScope.focusToggleElement();
+      closeDropdown();
+    }
+  };
+}])
+
+.controller('DropdownController', ['$scope', '$attrs', '$parse', 'dropdownConfig', 'dropdownService', '$animate', '$position', '$document', function($scope, $attrs, $parse, dropdownConfig, dropdownService, $animate, $position, $document) {
+  var self = this,
+      scope = $scope.$new(), // create a child scope so we are not polluting original one
+      openClass = dropdownConfig.openClass,
+      getIsOpen,
+      setIsOpen = angular.noop,
+      toggleInvoker = $attrs.onToggle ? $parse($attrs.onToggle) : angular.noop,
+      appendToBody = false;
+
+  this.init = function( element ) {
+    self.$element = element;
+
+    if ( $attrs.isOpen ) {
+      getIsOpen = $parse($attrs.isOpen);
+      setIsOpen = getIsOpen.assign;
+
+      $scope.$watch(getIsOpen, function(value) {
+        scope.isOpen = !!value;
+      });
+    }
+
+    appendToBody = angular.isDefined($attrs.dropdownAppendToBody);
+
+    if ( appendToBody && self.dropdownMenu ) {
+      $document.find('body').append( self.dropdownMenu );
+      element.on('$destroy', function handleDestroyEvent() {
+        self.dropdownMenu.remove();
+      });
+    }
+  };
+
+  this.toggle = function( open ) {
+    return scope.isOpen = arguments.length ? !!open : !scope.isOpen;
+  };
+
+  // Allow other directives to watch status
+  this.isOpen = function() {
+    return scope.isOpen;
+  };
+
+  scope.getToggleElement = function() {
+    return self.toggleElement;
+  };
+
+  scope.getAutoClose = function() {
+    return $attrs.autoClose || 'always'; //or 'outsideClick' or 'disabled'
+  };
+
+  scope.getElement = function() {
+    return self.$element;
+  };
+
+  scope.focusToggleElement = function() {
+    if ( self.toggleElement ) {
+      self.toggleElement[0].focus();
+    }
+  };
+
+  scope.$watch('isOpen', function( isOpen, wasOpen ) {
+    if ( appendToBody && self.dropdownMenu ) {
+      var pos = $position.positionElements(self.$element, self.dropdownMenu, 'bottom-left', true);
+      self.dropdownMenu.css({
+        top: pos.top + 'px',
+        left: pos.left + 'px',
+        display: isOpen ? 'block' : 'none'
+      });
+    }
+
+    $animate[isOpen ? 'addClass' : 'removeClass'](self.$element, openClass);
+
+    if ( isOpen ) {
+      scope.focusToggleElement();
+      dropdownService.open( scope );
+    } else {
+      dropdownService.close( scope );
+    }
+
+    setIsOpen($scope, isOpen);
+    if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
+      toggleInvoker($scope, { open: !!isOpen });
+    }
+  });
+
+  $scope.$on('$locationChangeSuccess', function() {
+    scope.isOpen = false;
+  });
+
+  $scope.$on('$destroy', function() {
+    scope.$destroy();
+  });
+}])
+
+.directive('dropdown', function() {
+  return {
+    controller: 'DropdownController',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      dropdownCtrl.init( element );
+    }
+  };
+})
+
+.directive('dropdownMenu', function() {
+  return {
+    restrict: 'AC',
+    require: '?^dropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if ( !dropdownCtrl ) {
+        return;
+      }
+      dropdownCtrl.dropdownMenu = element;
+    }
+  };
+})
+
+.directive('dropdownToggle', function() {
+  return {
+    require: '?^dropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if ( !dropdownCtrl ) {
+        return;
+      }
+
+      dropdownCtrl.toggleElement = element;
+
+      var toggleDropdown = function(event) {
+        event.preventDefault();
+
+        if ( !element.hasClass('disabled') && !attrs.disabled ) {
+          scope.$apply(function() {
+            dropdownCtrl.toggle();
+          });
+        }
+      };
+
+      element.bind('click', toggleDropdown);
+
+      // WAI-ARIA
+      element.attr({ 'aria-haspopup': true, 'aria-expanded': false });
+      scope.$watch(dropdownCtrl.isOpen, function( isOpen ) {
+        element.attr('aria-expanded', !!isOpen);
+      });
+
+      scope.$on('$destroy', function() {
+        element.unbind('click', toggleDropdown);
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.modal', [])
+
+/**
+ * A helper, internal data structure that acts as a map but also allows getting / removing
+ * elements in the LIFO order
+ */
+  .factory('$$stackedMap', function () {
+    return {
+      createNew: function () {
+        var stack = [];
+
+        return {
+          add: function (key, value) {
+            stack.push({
+              key: key,
+              value: value
+            });
+          },
+          get: function (key) {
+            for (var i = 0; i < stack.length; i++) {
+              if (key == stack[i].key) {
+                return stack[i];
+              }
+            }
+          },
+          keys: function() {
+            var keys = [];
+            for (var i = 0; i < stack.length; i++) {
+              keys.push(stack[i].key);
+            }
+            return keys;
+          },
+          top: function () {
+            return stack[stack.length - 1];
+          },
+          remove: function (key) {
+            var idx = -1;
+            for (var i = 0; i < stack.length; i++) {
+              if (key == stack[i].key) {
+                idx = i;
+                break;
+              }
+            }
+            return stack.splice(idx, 1)[0];
+          },
+          removeTop: function () {
+            return stack.splice(stack.length - 1, 1)[0];
+          },
+          length: function () {
+            return stack.length;
+          }
+        };
+      }
+    };
+  })
+
+/**
+ * A helper directive for the $modal service. It creates a backdrop element.
+ */
+  .directive('modalBackdrop', ['$timeout', function ($timeout) {
+    return {
+      restrict: 'EA',
+      replace: true,
+      templateUrl: 'template/modal/backdrop.html',
+      compile: function (tElement, tAttrs) {
+        tElement.addClass(tAttrs.backdropClass);
+        return linkFn;
+      }
+    };
+
+    function linkFn(scope, element, attrs) {
+      scope.animate = false;
+
+      //trigger CSS transitions
+      $timeout(function () {
+        scope.animate = true;
+      });
+    }
+  }])
+
+  .directive('modalWindow', ['$modalStack', '$q', function ($modalStack, $q) {
+    return {
+      restrict: 'EA',
+      scope: {
+        index: '@',
+        animate: '='
+      },
+      replace: true,
+      transclude: true,
+      templateUrl: function(tElement, tAttrs) {
+        return tAttrs.templateUrl || 'template/modal/window.html';
+      },
+      link: function (scope, element, attrs) {
+        element.addClass(attrs.windowClass || '');
+        scope.size = attrs.size;
+
+        scope.close = function (evt) {
+          var modal = $modalStack.getTop();
+          if (modal && modal.value.backdrop && modal.value.backdrop != 'static' && (evt.target === evt.currentTarget)) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            $modalStack.dismiss(modal.key, 'backdrop click');
+          }
+        };
+
+        // This property is only added to the scope for the purpose of detecting when this directive is rendered.
+        // We can detect that by using this property in the template associated with this directive and then use
+        // {@link Attribute#$observe} on it. For more details please see {@link TableColumnResize}.
+        scope.$isRendered = true;
+
+        // Deferred object that will be resolved when this modal is render.
+        var modalRenderDeferObj = $q.defer();
+        // Observe function will be called on next digest cycle after compilation, ensuring that the DOM is ready.
+        // In order to use this way of finding whether DOM is ready, we need to observe a scope property used in modal's template.
+        attrs.$observe('modalRender', function (value) {
+          if (value == 'true') {
+            modalRenderDeferObj.resolve();
+          }
+        });
+
+        modalRenderDeferObj.promise.then(function () {
+          // trigger CSS transitions
+          scope.animate = true;
+
+          var inputsWithAutofocus = element[0].querySelectorAll('[autofocus]');
+          /**
+           * Auto-focusing of a freshly-opened modal element causes any child elements
+           * with the autofocus attribute to lose focus. This is an issue on touch
+           * based devices which will show and then hide the onscreen keyboard.
+           * Attempts to refocus the autofocus element via JavaScript will not reopen
+           * the onscreen keyboard. Fixed by updated the focusing logic to only autofocus
+           * the modal element if the modal does not contain an autofocus element.
+           */
+          if (inputsWithAutofocus.length) {
+            inputsWithAutofocus[0].focus();
+          } else {
+            element[0].focus();
+          }
+
+          // Notify {@link $modalStack} that modal is rendered.
+          var modal = $modalStack.getTop();
+          if (modal) {
+            $modalStack.modalRendered(modal.key);
+          }
+        });
+      }
+    };
+  }])
+
+  .directive('modalAnimationClass', [
+    function () {
+      return {
+        compile: function (tElement, tAttrs) {
+          if (tAttrs.modalAnimation) {
+            tElement.addClass(tAttrs.modalAnimationClass);
+          }
+        }
+      };
+    }])
+
+  .directive('modalTransclude', function () {
+    return {
+      link: function($scope, $element, $attrs, controller, $transclude) {
+        $transclude($scope.$parent, function(clone) {
+          $element.empty();
+          $element.append(clone);
+        });
+      }
+    };
+  })
+
+  .factory('$modalStack', ['$animate', '$timeout', '$document', '$compile', '$rootScope', '$$stackedMap',
+    function ($animate, $timeout, $document, $compile, $rootScope, $$stackedMap) {
+
+      var OPENED_MODAL_CLASS = 'modal-open';
+
+      var backdropDomEl, backdropScope;
+      var openedWindows = $$stackedMap.createNew();
+      var $modalStack = {};
+
+      function backdropIndex() {
+        var topBackdropIndex = -1;
+        var opened = openedWindows.keys();
+        for (var i = 0; i < opened.length; i++) {
+          if (openedWindows.get(opened[i]).value.backdrop) {
+            topBackdropIndex = i;
+          }
+        }
+        return topBackdropIndex;
+      }
+
+      $rootScope.$watch(backdropIndex, function(newBackdropIndex){
+        if (backdropScope) {
+          backdropScope.index = newBackdropIndex;
+        }
+      });
+
+      function removeModalWindow(modalInstance) {
+
+        var body = $document.find('body').eq(0);
+        var modalWindow = openedWindows.get(modalInstance).value;
+
+        //clean up the stack
+        openedWindows.remove(modalInstance);
+
+        //remove window DOM element
+        removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
+          body.toggleClass(OPENED_MODAL_CLASS, openedWindows.length() > 0);
+          checkRemoveBackdrop();
+        });
+      }
+
+      function checkRemoveBackdrop() {
+          //remove backdrop if no longer needed
+          if (backdropDomEl && backdropIndex() == -1) {
+            var backdropScopeRef = backdropScope;
+            removeAfterAnimate(backdropDomEl, backdropScope, function () {
+              backdropScopeRef = null;
+            });
+            backdropDomEl = undefined;
+            backdropScope = undefined;
+          }
+      }
+
+      function removeAfterAnimate(domEl, scope, done) {
+        // Closing animation
+        scope.animate = false;
+
+        if (domEl.attr('modal-animation') && $animate.enabled()) {
+          // transition out
+          domEl.one('$animate:close', function closeFn() {
+            $rootScope.$evalAsync(afterAnimating);
+          });
+        } else {
+          // Ensure this call is async
+          $timeout(afterAnimating);
+        }
+
+        function afterAnimating() {
+          if (afterAnimating.done) {
+            return;
+          }
+          afterAnimating.done = true;
+
+          domEl.remove();
+          scope.$destroy();
+          if (done) {
+            done();
+          }
+        }
+      }
+
+      $document.bind('keydown', function (evt) {
+        var modal;
+
+        if (evt.which === 27) {
+          modal = openedWindows.top();
+          if (modal && modal.value.keyboard) {
+            evt.preventDefault();
+            $rootScope.$apply(function () {
+              $modalStack.dismiss(modal.key, 'escape key press');
+            });
+          }
+        }
+      });
+
+      $modalStack.open = function (modalInstance, modal) {
+
+        var modalOpener = $document[0].activeElement;
+
+        openedWindows.add(modalInstance, {
+          deferred: modal.deferred,
+          renderDeferred: modal.renderDeferred,
+          modalScope: modal.scope,
+          backdrop: modal.backdrop,
+          keyboard: modal.keyboard
+        });
+
+        var body = $document.find('body').eq(0),
+            currBackdropIndex = backdropIndex();
+
+        if (currBackdropIndex >= 0 && !backdropDomEl) {
+          backdropScope = $rootScope.$new(true);
+          backdropScope.index = currBackdropIndex;
+          var angularBackgroundDomEl = angular.element('<div modal-backdrop="modal-backdrop"></div>');
+          angularBackgroundDomEl.attr('backdrop-class', modal.backdropClass);
+          if (modal.animation) {
+            angularBackgroundDomEl.attr('modal-animation', 'true');
+          }
+          backdropDomEl = $compile(angularBackgroundDomEl)(backdropScope);
+          body.append(backdropDomEl);
+        }
+
+        var angularDomEl = angular.element('<div modal-window="modal-window"></div>');
+        angularDomEl.attr({
+          'template-url': modal.windowTemplateUrl,
+          'window-class': modal.windowClass,
+          'size': modal.size,
+          'index': openedWindows.length() - 1,
+          'animate': 'animate'
+        }).html(modal.content);
+        if (modal.animation) {
+          angularDomEl.attr('modal-animation', 'true');
+        }
+
+        var modalDomEl = $compile(angularDomEl)(modal.scope);
+        openedWindows.top().value.modalDomEl = modalDomEl;
+        openedWindows.top().value.modalOpener = modalOpener;
+        body.append(modalDomEl);
+        body.addClass(OPENED_MODAL_CLASS);
+      };
+
+      function broadcastClosing(modalWindow, resultOrReason, closing) {
+          return !modalWindow.value.modalScope.$broadcast('modal.closing', resultOrReason, closing).defaultPrevented;
+      }
+
+      $modalStack.close = function (modalInstance, result) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, result, true)) {
+          modalWindow.value.deferred.resolve(result);
+          removeModalWindow(modalInstance);
+          modalWindow.value.modalOpener.focus();
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismiss = function (modalInstance, reason) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, reason, false)) {
+          modalWindow.value.deferred.reject(reason);
+          removeModalWindow(modalInstance);
+          modalWindow.value.modalOpener.focus();
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismissAll = function (reason) {
+        var topModal = this.getTop();
+        while (topModal && this.dismiss(topModal.key, reason)) {
+          topModal = this.getTop();
+        }
+      };
+
+      $modalStack.getTop = function () {
+        return openedWindows.top();
+      };
+
+      $modalStack.modalRendered = function (modalInstance) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow) {
+          modalWindow.value.renderDeferred.resolve();
+        }
+      };
+
+      return $modalStack;
+    }])
+
+  .provider('$modal', function () {
+
+    var $modalProvider = {
+      options: {
+        animation: true,
+        backdrop: true, //can also be false or 'static'
+        keyboard: true
+      },
+      $get: ['$injector', '$rootScope', '$q', '$templateRequest', '$controller', '$modalStack',
+        function ($injector, $rootScope, $q, $templateRequest, $controller, $modalStack) {
+
+          var $modal = {};
+
+          function getTemplatePromise(options) {
+            return options.template ? $q.when(options.template) :
+              $templateRequest(angular.isFunction(options.templateUrl) ? (options.templateUrl)() : options.templateUrl);
+          }
+
+          function getResolvePromises(resolves) {
+            var promisesArr = [];
+            angular.forEach(resolves, function (value) {
+              if (angular.isFunction(value) || angular.isArray(value)) {
+                promisesArr.push($q.when($injector.invoke(value)));
+              }
+            });
+            return promisesArr;
+          }
+
+          $modal.open = function (modalOptions) {
+
+            var modalResultDeferred = $q.defer();
+            var modalOpenedDeferred = $q.defer();
+            var modalRenderDeferred = $q.defer();
+
+            //prepare an instance of a modal to be injected into controllers and returned to a caller
+            var modalInstance = {
+              result: modalResultDeferred.promise,
+              opened: modalOpenedDeferred.promise,
+              rendered: modalRenderDeferred.promise,
+              close: function (result) {
+                return $modalStack.close(modalInstance, result);
+              },
+              dismiss: function (reason) {
+                return $modalStack.dismiss(modalInstance, reason);
+              }
+            };
+
+            //merge and clean up options
+            modalOptions = angular.extend({}, $modalProvider.options, modalOptions);
+            modalOptions.resolve = modalOptions.resolve || {};
+
+            //verify options
+            if (!modalOptions.template && !modalOptions.templateUrl) {
+              throw new Error('One of template or templateUrl options is required.');
+            }
+
+            var templateAndResolvePromise =
+              $q.all([getTemplatePromise(modalOptions)].concat(getResolvePromises(modalOptions.resolve)));
+
+
+            templateAndResolvePromise.then(function resolveSuccess(tplAndVars) {
+
+              var modalScope = (modalOptions.scope || $rootScope).$new();
+              modalScope.$close = modalInstance.close;
+              modalScope.$dismiss = modalInstance.dismiss;
+
+              var ctrlInstance, ctrlLocals = {};
+              var resolveIter = 1;
+
+              //controllers
+              if (modalOptions.controller) {
+                ctrlLocals.$scope = modalScope;
+                ctrlLocals.$modalInstance = modalInstance;
+                angular.forEach(modalOptions.resolve, function (value, key) {
+                  ctrlLocals[key] = tplAndVars[resolveIter++];
+                });
+
+                ctrlInstance = $controller(modalOptions.controller, ctrlLocals);
+                if (modalOptions.controllerAs) {
+                  modalScope[modalOptions.controllerAs] = ctrlInstance;
+                }
+              }
+
+              $modalStack.open(modalInstance, {
+                scope: modalScope,
+                deferred: modalResultDeferred,
+                renderDeferred: modalRenderDeferred,
+                content: tplAndVars[0],
+                animation: modalOptions.animation,
+                backdrop: modalOptions.backdrop,
+                keyboard: modalOptions.keyboard,
+                backdropClass: modalOptions.backdropClass,
+                windowClass: modalOptions.windowClass,
+                windowTemplateUrl: modalOptions.windowTemplateUrl,
+                size: modalOptions.size
+              });
+
+            }, function resolveError(reason) {
+              modalResultDeferred.reject(reason);
+            });
+
+            templateAndResolvePromise.then(function () {
+              modalOpenedDeferred.resolve(true);
+            }, function (reason) {
+              modalOpenedDeferred.reject(reason);
+            });
+
+            return modalInstance;
+          };
+
+          return $modal;
+        }]
+    };
+
+    return $modalProvider;
+  });
+
+angular.module('ui.bootstrap.pagination', [])
+
+.controller('PaginationController', ['$scope', '$attrs', '$parse', function ($scope, $attrs, $parse) {
+  var self = this,
+      ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl
+      setNumPages = $attrs.numPages ? $parse($attrs.numPages).assign : angular.noop;
+
+  this.init = function(ngModelCtrl_, config) {
+    ngModelCtrl = ngModelCtrl_;
+    this.config = config;
+
+    ngModelCtrl.$render = function() {
+      self.render();
+    };
+
+    if ($attrs.itemsPerPage) {
+      $scope.$parent.$watch($parse($attrs.itemsPerPage), function(value) {
+        self.itemsPerPage = parseInt(value, 10);
+        $scope.totalPages = self.calculateTotalPages();
+      });
+    } else {
+      this.itemsPerPage = config.itemsPerPage;
+    }
+
+    $scope.$watch('totalItems', function() {
+      $scope.totalPages = self.calculateTotalPages();
+    });
+
+    $scope.$watch('totalPages', function(value) {
+      setNumPages($scope.$parent, value); // Readonly variable
+
+      if ( $scope.page > value ) {
+        $scope.selectPage(value);
+      } else {
+        ngModelCtrl.$render();
+      }
+    });
+  };
+
+  this.calculateTotalPages = function() {
+    var totalPages = this.itemsPerPage < 1 ? 1 : Math.ceil($scope.totalItems / this.itemsPerPage);
+    return Math.max(totalPages || 0, 1);
+  };
+
+  this.render = function() {
+    $scope.page = parseInt(ngModelCtrl.$viewValue, 10) || 1;
+  };
+
+  $scope.selectPage = function(page, evt) {
+    if ( $scope.page !== page && page > 0 && page <= $scope.totalPages) {
+      if (evt && evt.target) {
+        evt.target.blur();
+      }
+      ngModelCtrl.$setViewValue(page);
+      ngModelCtrl.$render();
+    }
+  };
+
+  $scope.getText = function( key ) {
+    return $scope[key + 'Text'] || self.config[key + 'Text'];
+  };
+  $scope.noPrevious = function() {
+    return $scope.page === 1;
+  };
+  $scope.noNext = function() {
+    return $scope.page === $scope.totalPages;
+  };
+}])
+
+.constant('paginationConfig', {
+  itemsPerPage: 10,
+  boundaryLinks: false,
+  directionLinks: true,
+  firstText: 'First',
+  previousText: 'Previous',
+  nextText: 'Next',
+  lastText: 'Last',
+  rotate: true
+})
+
+.directive('pagination', ['$parse', 'paginationConfig', function($parse, paginationConfig) {
+  return {
+    restrict: 'EA',
+    scope: {
+      totalItems: '=',
+      firstText: '@',
+      previousText: '@',
+      nextText: '@',
+      lastText: '@'
+    },
+    require: ['pagination', '?ngModel'],
+    controller: 'PaginationController',
+    templateUrl: 'template/pagination/pagination.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+         return; // do nothing if no ng-model
+      }
+
+      // Setup configuration parameters
+      var maxSize = angular.isDefined(attrs.maxSize) ? scope.$parent.$eval(attrs.maxSize) : paginationConfig.maxSize,
+          rotate = angular.isDefined(attrs.rotate) ? scope.$parent.$eval(attrs.rotate) : paginationConfig.rotate;
+      scope.boundaryLinks = angular.isDefined(attrs.boundaryLinks) ? scope.$parent.$eval(attrs.boundaryLinks) : paginationConfig.boundaryLinks;
+      scope.directionLinks = angular.isDefined(attrs.directionLinks) ? scope.$parent.$eval(attrs.directionLinks) : paginationConfig.directionLinks;
+
+      paginationCtrl.init(ngModelCtrl, paginationConfig);
+
+      if (attrs.maxSize) {
+        scope.$parent.$watch($parse(attrs.maxSize), function(value) {
+          maxSize = parseInt(value, 10);
+          paginationCtrl.render();
+        });
+      }
+
+      // Create page object used in template
+      function makePage(number, text, isActive) {
+        return {
+          number: number,
+          text: text,
+          active: isActive
+        };
+      }
+
+      function getPages(currentPage, totalPages) {
+        var pages = [];
+
+        // Default page limits
+        var startPage = 1, endPage = totalPages;
+        var isMaxSized = ( angular.isDefined(maxSize) && maxSize < totalPages );
+
+        // recompute if maxSize
+        if ( isMaxSized ) {
+          if ( rotate ) {
+            // Current page is displayed in the middle of the visible ones
+            startPage = Math.max(currentPage - Math.floor(maxSize/2), 1);
+            endPage   = startPage + maxSize - 1;
+
+            // Adjust if limit is exceeded
+            if (endPage > totalPages) {
+              endPage   = totalPages;
+              startPage = endPage - maxSize + 1;
+            }
+          } else {
+            // Visible pages are paginated with maxSize
+            startPage = ((Math.ceil(currentPage / maxSize) - 1) * maxSize) + 1;
+
+            // Adjust last page if limit is exceeded
+            endPage = Math.min(startPage + maxSize - 1, totalPages);
+          }
+        }
+
+        // Add page number links
+        for (var number = startPage; number <= endPage; number++) {
+          var page = makePage(number, number, number === currentPage);
+          pages.push(page);
+        }
+
+        // Add links to move between page sets
+        if ( isMaxSized && ! rotate ) {
+          if ( startPage > 1 ) {
+            var previousPageSet = makePage(startPage - 1, '...', false);
+            pages.unshift(previousPageSet);
+          }
+
+          if ( endPage < totalPages ) {
+            var nextPageSet = makePage(endPage + 1, '...', false);
+            pages.push(nextPageSet);
+          }
+        }
+
+        return pages;
+      }
+
+      var originalRender = paginationCtrl.render;
+      paginationCtrl.render = function() {
+        originalRender();
+        if (scope.page > 0 && scope.page <= scope.totalPages) {
+          scope.pages = getPages(scope.page, scope.totalPages);
+        }
+      };
+    }
+  };
+}])
+
+.constant('pagerConfig', {
+  itemsPerPage: 10,
+  previousText: '« Previous',
+  nextText: 'Next »',
+  align: true
+})
+
+.directive('pager', ['pagerConfig', function(pagerConfig) {
+  return {
+    restrict: 'EA',
+    scope: {
+      totalItems: '=',
+      previousText: '@',
+      nextText: '@'
+    },
+    require: ['pager', '?ngModel'],
+    controller: 'PaginationController',
+    templateUrl: 'template/pagination/pager.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+         return; // do nothing if no ng-model
+      }
+
+      scope.align = angular.isDefined(attrs.align) ? scope.$parent.$eval(attrs.align) : pagerConfig.align;
+      paginationCtrl.init(ngModelCtrl, pagerConfig);
+    }
+  };
+}]);
+
+/**
+ * The following features are still outstanding: animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, html tooltips, and selector delegation.
+ */
+angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap.bindHtml' ] )
+
+/**
+ * The $tooltip service creates tooltip- and popover-like directives as well as
+ * houses global options for them.
+ */
+.provider( '$tooltip', function () {
+  // The default options tooltip and popover.
+  var defaultOptions = {
+    placement: 'top',
+    animation: true,
+    popupDelay: 0,
+    useContentExp: false
+  };
+
+  // Default hide triggers for each show trigger
+  var triggerMap = {
+    'mouseenter': 'mouseleave',
+    'click': 'click',
+    'focus': 'blur'
+  };
+
+  // The options specified to the provider globally.
+  var globalOptions = {};
+
+  /**
+   * `options({})` allows global configuration of all tooltips in the
+   * application.
+   *
+   *   var app = angular.module( 'App', ['ui.bootstrap.tooltip'], function( $tooltipProvider ) {
+   *     // place tooltips left instead of top by default
+   *     $tooltipProvider.options( { placement: 'left' } );
+   *   });
+   */
+	this.options = function( value ) {
+		angular.extend( globalOptions, value );
+	};
+
+  /**
+   * This allows you to extend the set of trigger mappings available. E.g.:
+   *
+   *   $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' );
+   */
+  this.setTriggers = function setTriggers ( triggers ) {
+    angular.extend( triggerMap, triggers );
+  };
+
+  /**
+   * This is a helper function for translating camel-case to snake-case.
+   */
+  function snake_case(name){
+    var regexp = /[A-Z]/g;
+    var separator = '-';
+    return name.replace(regexp, function(letter, pos) {
+      return (pos ? separator : '') + letter.toLowerCase();
+    });
+  }
+
+  /**
+   * Returns the actual instance of the $tooltip service.
+   * TODO support multiple triggers
+   */
+  this.$get = [ '$window', '$compile', '$timeout', '$document', '$position', '$interpolate', function ( $window, $compile, $timeout, $document, $position, $interpolate ) {
+    return function $tooltip ( type, prefix, defaultTriggerShow, options ) {
+      options = angular.extend( {}, defaultOptions, globalOptions, options );
+
+      /**
+       * Returns an object of show and hide triggers.
+       *
+       * If a trigger is supplied,
+       * it is used to show the tooltip; otherwise, it will use the `trigger`
+       * option passed to the `$tooltipProvider.options` method; else it will
+       * default to the trigger supplied to this directive factory.
+       *
+       * The hide trigger is based on the show trigger. If the `trigger` option
+       * was passed to the `$tooltipProvider.options` method, it will use the
+       * mapped trigger from `triggerMap` or the passed trigger if the map is
+       * undefined; otherwise, it uses the `triggerMap` value of the show
+       * trigger; else it will just use the show trigger.
+       */
+      function getTriggers ( trigger ) {
+        var show = trigger || options.trigger || defaultTriggerShow;
+        var hide = triggerMap[show] || show;
+        return {
+          show: show,
+          hide: hide
+        };
+      }
+
+      var directiveName = snake_case( type );
+
+      var startSym = $interpolate.startSymbol();
+      var endSym = $interpolate.endSymbol();
+      var template =
+        '<div '+ directiveName +'-popup '+
+          'title="'+startSym+'title'+endSym+'" '+
+          (options.useContentExp ?
+            'content-exp="contentExp()" ' :
+            'content="'+startSym+'content'+endSym+'" ') +
+          'placement="'+startSym+'placement'+endSym+'" '+
+          'popup-class="'+startSym+'popupClass'+endSym+'" '+
+          'animation="animation" '+
+          'is-open="isOpen"'+
+          'origin-scope="origScope" '+
+          '>'+
+        '</div>';
+
+      return {
+        restrict: 'EA',
+        compile: function (tElem, tAttrs) {
+          var tooltipLinker = $compile( template );
+
+          return function link ( scope, element, attrs, tooltipCtrl ) {
+            var tooltip;
+            var tooltipLinkedScope;
+            var transitionTimeout;
+            var popupTimeout;
+            var appendToBody = angular.isDefined( options.appendToBody ) ? options.appendToBody : false;
+            var triggers = getTriggers( undefined );
+            var hasEnableExp = angular.isDefined(attrs[prefix+'Enable']);
+            var ttScope = scope.$new(true);
+
+            var positionTooltip = function () {
+              if (!tooltip) { return; }
+
+              var ttPosition = $position.positionElements(element, tooltip, ttScope.placement, appendToBody);
+              ttPosition.top += 'px';
+              ttPosition.left += 'px';
+
+              // Now set the calculated positioning.
+              tooltip.css( ttPosition );
+            };
+
+            // Set up the correct scope to allow transclusion later
+            ttScope.origScope = scope;
+
+            // By default, the tooltip is not open.
+            // TODO add ability to start tooltip opened
+            ttScope.isOpen = false;
+
+            function toggleTooltipBind () {
+              if ( ! ttScope.isOpen ) {
+                showTooltipBind();
+              } else {
+                hideTooltipBind();
+              }
+            }
+
+            // Show the tooltip with delay if specified, otherwise show it immediately
+            function showTooltipBind() {
+              if(hasEnableExp && !scope.$eval(attrs[prefix+'Enable'])) {
+                return;
+              }
+
+              prepareTooltip();
+
+              if ( ttScope.popupDelay ) {
+                // Do nothing if the tooltip was already scheduled to pop-up.
+                // This happens if show is triggered multiple times before any hide is triggered.
+                if (!popupTimeout) {
+                  popupTimeout = $timeout( show, ttScope.popupDelay, false );
+                  popupTimeout.then(function(reposition){reposition();});
+                }
+              } else {
+                show()();
+              }
+            }
+
+            function hideTooltipBind () {
+              scope.$apply(function () {
+                hide();
+              });
+            }
+
+            // Show the tooltip popup element.
+            function show() {
+
+              popupTimeout = null;
+
+              // If there is a pending remove transition, we must cancel it, lest the
+              // tooltip be mysteriously removed.
+              if ( transitionTimeout ) {
+                $timeout.cancel( transitionTimeout );
+                transitionTimeout = null;
+              }
+
+              // Don't show empty tooltips.
+              if ( !(options.useContentExp ? ttScope.contentExp() : ttScope.content) ) {
+                return angular.noop;
+              }
+
+              createTooltip();
+
+              // Set the initial positioning.
+              tooltip.css({ top: 0, left: 0, display: 'block' });
+              ttScope.$digest();
+
+              positionTooltip();
+
+              // And show the tooltip.
+              ttScope.isOpen = true;
+              ttScope.$apply(); // digest required as $apply is not called
+
+              // Return positioning function as promise callback for correct
+              // positioning after draw.
+              return positionTooltip;
+            }
+
+            // Hide the tooltip popup element.
+            function hide() {
+              // First things first: we don't show it anymore.
+              ttScope.isOpen = false;
+
+              //if tooltip is going to be shown after delay, we must cancel this
+              $timeout.cancel( popupTimeout );
+              popupTimeout = null;
+
+              // And now we remove it from the DOM. However, if we have animation, we
+              // need to wait for it to expire beforehand.
+              // FIXME: this is a placeholder for a port of the transitions library.
+              if ( ttScope.animation ) {
+                if (!transitionTimeout) {
+                  transitionTimeout = $timeout(removeTooltip, 500);
+                }
+              } else {
+                removeTooltip();
+              }
+            }
+
+            function createTooltip() {
+              // There can only be one tooltip element per directive shown at once.
+              if (tooltip) {
+                removeTooltip();
+              }
+              tooltipLinkedScope = ttScope.$new();
+              tooltip = tooltipLinker(tooltipLinkedScope, function (tooltip) {
+                if ( appendToBody ) {
+                  $document.find( 'body' ).append( tooltip );
+                } else {
+                  element.after( tooltip );
+                }
+              });
+
+              tooltipLinkedScope.$watch(function () {
+                $timeout(positionTooltip, 0, false);
+              });
+
+              if (options.useContentExp) {
+                tooltipLinkedScope.$watch('contentExp()', function (val) {
+                  if (!val && ttScope.isOpen ) {
+                    hide();
+                  }
+                });
+              }
+            }
+
+            function removeTooltip() {
+              transitionTimeout = null;
+              if (tooltip) {
+                tooltip.remove();
+                tooltip = null;
+              }
+              if (tooltipLinkedScope) {
+                tooltipLinkedScope.$destroy();
+                tooltipLinkedScope = null;
+              }
+            }
+
+            function prepareTooltip() {
+              prepPopupClass();
+              prepPlacement();
+              prepPopupDelay();
+            }
+
+            ttScope.contentExp = function () {
+              return scope.$eval(attrs[type]);
+            };
+
+            /**
+             * Observe the relevant attributes.
+             */
+            if (!options.useContentExp) {
+              attrs.$observe( type, function ( val ) {
+                ttScope.content = val;
+
+                if (!val && ttScope.isOpen ) {
+                  hide();
+                }
+              });
+            }
+
+            attrs.$observe( 'disabled', function ( val ) {
+              if (val && ttScope.isOpen ) {
+                hide();
+              }
+            });
+
+            attrs.$observe( prefix+'Title', function ( val ) {
+              ttScope.title = val;
+            });
+
+            function prepPopupClass() {
+              ttScope.popupClass = attrs[prefix + 'Class'];
+            }
+
+            function prepPlacement() {
+              var val = attrs[ prefix + 'Placement' ];
+              ttScope.placement = angular.isDefined( val ) ? val : options.placement;
+            }
+
+            function prepPopupDelay() {
+              var val = attrs[ prefix + 'PopupDelay' ];
+              var delay = parseInt( val, 10 );
+              ttScope.popupDelay = ! isNaN(delay) ? delay : options.popupDelay;
+            }
+
+            var unregisterTriggers = function () {
+              element.unbind(triggers.show, showTooltipBind);
+              element.unbind(triggers.hide, hideTooltipBind);
+            };
+
+            function prepTriggers() {
+              var val = attrs[ prefix + 'Trigger' ];
+              unregisterTriggers();
+
+              triggers = getTriggers( val );
+
+              if ( triggers.show === triggers.hide ) {
+                element.bind( triggers.show, toggleTooltipBind );
+              } else {
+                element.bind( triggers.show, showTooltipBind );
+                element.bind( triggers.hide, hideTooltipBind );
+              }
+            }
+            prepTriggers();
+
+            var animation = scope.$eval(attrs[prefix + 'Animation']);
+            ttScope.animation = angular.isDefined(animation) ? !!animation : options.animation;
+
+            var appendToBodyVal = scope.$eval(attrs[prefix + 'AppendToBody']);
+            appendToBody = angular.isDefined(appendToBodyVal) ? appendToBodyVal : appendToBody;
+
+            // if a tooltip is attached to <body> we need to remove it on
+            // location change as its parent scope will probably not be destroyed
+            // by the change.
+            if ( appendToBody ) {
+              scope.$on('$locationChangeSuccess', function closeTooltipOnLocationChangeSuccess () {
+              if ( ttScope.isOpen ) {
+                hide();
+              }
+            });
+            }
+
+            // Make sure tooltip is destroyed and removed.
+            scope.$on('$destroy', function onDestroyTooltip() {
+              $timeout.cancel( transitionTimeout );
+              $timeout.cancel( popupTimeout );
+              unregisterTriggers();
+              removeTooltip();
+              ttScope = null;
+            });
+          };
+        }
+      };
+    };
+  }];
+})
+
+// This is mostly ngInclude code but with a custom scope
+.directive( 'tooltipTemplateTransclude', [
+         '$animate', '$sce', '$compile', '$templateRequest',
+function ($animate ,  $sce ,  $compile ,  $templateRequest) {
+  return {
+    link: function ( scope, elem, attrs ) {
+      var origScope = scope.$eval(attrs.tooltipTemplateTranscludeScope);
+
+      var changeCounter = 0,
+        currentScope,
+        previousElement,
+        currentElement;
+
+      var cleanupLastIncludeContent = function() {
+        if (previousElement) {
+          previousElement.remove();
+          previousElement = null;
+        }
+        if (currentScope) {
+          currentScope.$destroy();
+          currentScope = null;
+        }
+        if (currentElement) {
+          $animate.leave(currentElement).then(function() {
+            previousElement = null;
+          });
+          previousElement = currentElement;
+          currentElement = null;
+        }
+      };
+
+      scope.$watch($sce.parseAsResourceUrl(attrs.tooltipTemplateTransclude), function (src) {
+        var thisChangeId = ++changeCounter;
+
+        if (src) {
+          //set the 2nd param to true to ignore the template request error so that the inner
+          //contents and scope can be cleaned up.
+          $templateRequest(src, true).then(function(response) {
+            if (thisChangeId !== changeCounter) { return; }
+            var newScope = origScope.$new();
+            var template = response;
+
+            var clone = $compile(template)(newScope, function(clone) {
+              cleanupLastIncludeContent();
+              $animate.enter(clone, elem);
+            });
+
+            currentScope = newScope;
+            currentElement = clone;
+
+            currentScope.$emit('$includeContentLoaded', src);
+          }, function() {
+            if (thisChangeId === changeCounter) {
+              cleanupLastIncludeContent();
+              scope.$emit('$includeContentError', src);
+            }
+          });
+          scope.$emit('$includeContentRequested', src);
+        } else {
+          cleanupLastIncludeContent();
+        }
+      });
+
+      scope.$on('$destroy', cleanupLastIncludeContent);
+    }
+  };
+}])
+
+/**
+ * Note that it's intentional that these classes are *not* applied through $animate.
+ * They must not be animated as they're expected to be present on the tooltip on
+ * initialization.
+ */
+.directive('tooltipClasses', function () {
+  return {
+    restrict: 'A',
+    link: function (scope, element, attrs) {
+      if (scope.placement) {
+        element.addClass(scope.placement);
+      }
+      if (scope.popupClass) {
+        element.addClass(scope.popupClass);
+      }
+      if (scope.animation()) {
+        element.addClass(attrs.tooltipAnimationClass);
+      }
+    }
+  };
+})
+
+.directive( 'tooltipPopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/tooltip/tooltip-popup.html'
+  };
+})
+
+.directive( 'tooltip', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip( 'tooltip', 'tooltip', 'mouseenter' );
+}])
+
+.directive( 'tooltipTemplatePopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'template/tooltip/tooltip-template-popup.html'
+  };
+})
+
+.directive( 'tooltipTemplate', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip('tooltipTemplate', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}])
+
+.directive( 'tooltipHtmlPopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/tooltip/tooltip-html-popup.html'
+  };
+})
+
+.directive( 'tooltipHtml', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip('tooltipHtml', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}])
+
+/*
+Deprecated
+*/
+.directive( 'tooltipHtmlUnsafePopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/tooltip/tooltip-html-unsafe-popup.html'
+  };
+})
+
+.value('tooltipHtmlUnsafeSuppressDeprecated', false)
+.directive( 'tooltipHtmlUnsafe', [
+          '$tooltip', 'tooltipHtmlUnsafeSuppressDeprecated', '$log',
+function ( $tooltip ,  tooltipHtmlUnsafeSuppressDeprecated ,  $log) {
+  if (!tooltipHtmlUnsafeSuppressDeprecated) {
+    $log.warn('tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead.');
+  }
+  return $tooltip( 'tooltipHtmlUnsafe', 'tooltip', 'mouseenter' );
+}]);
+
+/**
+ * The following features are still outstanding: popup delay, animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, html popovers, and selector delegatation.
+ */
+angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] )
+
+.directive( 'popoverTemplatePopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { title: '@', contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'template/popover/popover-template.html'
+  };
+})
+
+.directive( 'popoverTemplate', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip( 'popoverTemplate', 'popover', 'click', {
+    useContentExp: true
+  } );
+}])
+
+.directive( 'popoverPopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { title: '@', content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/popover/popover.html'
+  };
+})
+
+.directive( 'popover', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip( 'popover', 'popover', 'click' );
+}]);
+
+angular.module('ui.bootstrap.progressbar', [])
+
+.constant('progressConfig', {
+  animate: true,
+  max: 100
+})
+
+.controller('ProgressController', ['$scope', '$attrs', 'progressConfig', function($scope, $attrs, progressConfig) {
+    var self = this,
+        animate = angular.isDefined($attrs.animate) ? $scope.$parent.$eval($attrs.animate) : progressConfig.animate;
+
+    this.bars = [];
+    $scope.max = angular.isDefined($scope.max) ? $scope.max : progressConfig.max;
+
+    this.addBar = function(bar, element) {
+        if ( !animate ) {
+            element.css({'transition': 'none'});
+        }
+
+        this.bars.push(bar);
+
+        bar.$watch('value', function( value ) {
+            bar.percent = +(100 * value / $scope.max).toFixed(2);
+        });
+
+        bar.$on('$destroy', function() {
+            element = null;
+            self.removeBar(bar);
+        });
+    };
+
+    this.removeBar = function(bar) {
+        this.bars.splice(this.bars.indexOf(bar), 1);
+    };
+}])
+
+.directive('progress', function() {
+    return {
+        restrict: 'EA',
+        replace: true,
+        transclude: true,
+        controller: 'ProgressController',
+        require: 'progress',
+        scope: {},
+        templateUrl: 'template/progressbar/progress.html'
+    };
+})
+
+.directive('bar', function() {
+    return {
+        restrict: 'EA',
+        replace: true,
+        transclude: true,
+        require: '^progress',
+        scope: {
+            value: '=',
+            max: '=?',
+            type: '@'
+        },
+        templateUrl: 'template/progressbar/bar.html',
+        link: function(scope, element, attrs, progressCtrl) {
+            progressCtrl.addBar(scope, element);
+        }
+    };
+})
+
+.directive('progressbar', function() {
+    return {
+        restrict: 'EA',
+        replace: true,
+        transclude: true,
+        controller: 'ProgressController',
+        scope: {
+            value: '=',
+            max: '=?',
+            type: '@'
+        },
+        templateUrl: 'template/progressbar/progressbar.html',
+        link: function(scope, element, attrs, progressCtrl) {
+            progressCtrl.addBar(scope, angular.element(element.children()[0]));
+        }
+    };
+});
+
+angular.module('ui.bootstrap.rating', [])
+
+.constant('ratingConfig', {
+  max: 5,
+  stateOn: null,
+  stateOff: null
+})
+
+.controller('RatingController', ['$scope', '$attrs', 'ratingConfig', function($scope, $attrs, ratingConfig) {
+  var ngModelCtrl  = { $setViewValue: angular.noop };
+
+  this.init = function(ngModelCtrl_) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.push(function(value) {
+      if (angular.isNumber(value) && value << 0 !== value) {
+        value = Math.round(value);
+      }
+      return value;
+    });
+
+    this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
+    this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
+
+    var ratingStates = angular.isDefined($attrs.ratingStates) ? $scope.$parent.$eval($attrs.ratingStates) :
+                        new Array( angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max );
+    $scope.range = this.buildTemplateObjects(ratingStates);
+  };
+
+  this.buildTemplateObjects = function(states) {
+    for (var i = 0, n = states.length; i < n; i++) {
+      states[i] = angular.extend({ index: i }, { stateOn: this.stateOn, stateOff: this.stateOff }, states[i]);
+    }
+    return states;
+  };
+
+  $scope.rate = function(value) {
+    if ( !$scope.readonly && value >= 0 && value <= $scope.range.length ) {
+      ngModelCtrl.$setViewValue(value);
+      ngModelCtrl.$render();
+    }
+  };
+
+  $scope.enter = function(value) {
+    if ( !$scope.readonly ) {
+      $scope.value = value;
+    }
+    $scope.onHover({value: value});
+  };
+
+  $scope.reset = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+    $scope.onLeave();
+  };
+
+  $scope.onKeydown = function(evt) {
+    if (/(37|38|39|40)/.test(evt.which)) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      $scope.rate( $scope.value + (evt.which === 38 || evt.which === 39 ? 1 : -1) );
+    }
+  };
+
+  this.render = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+  };
+}])
+
+.directive('rating', function() {
+  return {
+    restrict: 'EA',
+    require: ['rating', 'ngModel'],
+    scope: {
+      readonly: '=?',
+      onHover: '&',
+      onLeave: '&'
+    },
+    controller: 'RatingController',
+    templateUrl: 'template/rating/rating.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var ratingCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+      ratingCtrl.init( ngModelCtrl );
+    }
+  };
+});
+
+/**
+ * @ngdoc overview
+ * @name ui.bootstrap.tabs
+ *
+ * @description
+ * AngularJS version of the tabs directive.
+ */
+
+angular.module('ui.bootstrap.tabs', [])
+
+.controller('TabsetController', ['$scope', function TabsetCtrl($scope) {
+  var ctrl = this,
+      tabs = ctrl.tabs = $scope.tabs = [];
+
+  ctrl.select = function(selectedTab) {
+    angular.forEach(tabs, function(tab) {
+      if (tab.active && tab !== selectedTab) {
+        tab.active = false;
+        tab.onDeselect();
+      }
+    });
+    selectedTab.active = true;
+    selectedTab.onSelect();
+  };
+
+  ctrl.addTab = function addTab(tab) {
+    tabs.push(tab);
+    // we can't run the select function on the first tab
+    // since that would select it twice
+    if (tabs.length === 1 && tab.active !== false) {
+      tab.active = true;
+    } else if (tab.active) {
+      ctrl.select(tab);
+    }
+    else {
+      tab.active = false;
+    }
+  };
+
+  ctrl.removeTab = function removeTab(tab) {
+    var index = tabs.indexOf(tab);
+    //Select a new tab if the tab to be removed is selected and not destroyed
+    if (tab.active && tabs.length > 1 && !destroyed) {
+      //If this is the last tab, select the previous tab. else, the next tab.
+      var newActiveIndex = index == tabs.length - 1 ? index - 1 : index + 1;
+      ctrl.select(tabs[newActiveIndex]);
+    }
+    tabs.splice(index, 1);
+  };
+
+  var destroyed;
+  $scope.$on('$destroy', function() {
+    destroyed = true;
+  });
+}])
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.tabs.directive:tabset
+ * @restrict EA
+ *
+ * @description
+ * Tabset is the outer container for the tabs directive
+ *
+ * @param {boolean=} vertical Whether or not to use vertical styling for the tabs.
+ * @param {boolean=} justified Whether or not to use justified styling for the tabs.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <tabset>
+      <tab heading="Tab 1"><b>First</b> Content!</tab>
+      <tab heading="Tab 2"><i>Second</i> Content!</tab>
+    </tabset>
+    <hr />
+    <tabset vertical="true">
+      <tab heading="Vertical Tab 1"><b>First</b> Vertical Content!</tab>
+      <tab heading="Vertical Tab 2"><i>Second</i> Vertical Content!</tab>
+    </tabset>
+    <tabset justified="true">
+      <tab heading="Justified Tab 1"><b>First</b> Justified Content!</tab>
+      <tab heading="Justified Tab 2"><i>Second</i> Justified Content!</tab>
+    </tabset>
+  </file>
+</example>
+ */
+.directive('tabset', function() {
+  return {
+    restrict: 'EA',
+    transclude: true,
+    replace: true,
+    scope: {
+      type: '@'
+    },
+    controller: 'TabsetController',
+    templateUrl: 'template/tabs/tabset.html',
+    link: function(scope, element, attrs) {
+      scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical) : false;
+      scope.justified = angular.isDefined(attrs.justified) ? scope.$parent.$eval(attrs.justified) : false;
+    }
+  };
+})
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.tabs.directive:tab
+ * @restrict EA
+ *
+ * @param {string=} heading The visible heading, or title, of the tab. Set HTML headings with {@link ui.bootstrap.tabs.directive:tabHeading tabHeading}.
+ * @param {string=} select An expression to evaluate when the tab is selected.
+ * @param {boolean=} active A binding, telling whether or not this tab is selected.
+ * @param {boolean=} disabled A binding, telling whether or not this tab is disabled.
+ *
+ * @description
+ * Creates a tab with a heading and content. Must be placed within a {@link ui.bootstrap.tabs.directive:tabset tabset}.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <div ng-controller="TabsDemoCtrl">
+      <button class="btn btn-small" ng-click="items[0].active = true">
+        Select item 1, using active binding
+      </button>
+      <button class="btn btn-small" ng-click="items[1].disabled = !items[1].disabled">
+        Enable/disable item 2, using disabled binding
+      </button>
+      <br />
+      <tabset>
+        <tab heading="Tab 1">First Tab</tab>
+        <tab select="alertMe()">
+          <tab-heading><i class="icon-bell"></i> Alert me!</tab-heading>
+          Second Tab, with alert callback and html heading!
+        </tab>
+        <tab ng-repeat="item in items"
+          heading="{{item.title}}"
+          disabled="item.disabled"
+          active="item.active">
+          {{item.content}}
+        </tab>
+      </tabset>
+    </div>
+  </file>
+  <file name="script.js">
+    function TabsDemoCtrl($scope) {
+      $scope.items = [
+        { title:"Dynamic Title 1", content:"Dynamic Item 0" },
+        { title:"Dynamic Title 2", content:"Dynamic Item 1", disabled: true }
+      ];
+
+      $scope.alertMe = function() {
+        setTimeout(function() {
+          alert("You've selected the alert tab!");
+        });
+      };
+    };
+  </file>
+</example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.tabs.directive:tabHeading
+ * @restrict EA
+ *
+ * @description
+ * Creates an HTML heading for a {@link ui.bootstrap.tabs.directive:tab tab}. Must be placed as a child of a tab element.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <tabset>
+      <tab>
+        <tab-heading><b>HTML</b> in my titles?!</tab-heading>
+        And some content, too!
+      </tab>
+      <tab>
+        <tab-heading><i class="icon-heart"></i> Icon heading?!?</tab-heading>
+        That's right.
+      </tab>
+    </tabset>
+  </file>
+</example>
+ */
+.directive('tab', ['$parse', '$log', function($parse, $log) {
+  return {
+    require: '^tabset',
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/tabs/tab.html',
+    transclude: true,
+    scope: {
+      active: '=?',
+      heading: '@',
+      onSelect: '&select', //This callback is called in contentHeadingTransclude
+                          //once it inserts the tab's content into the dom
+      onDeselect: '&deselect'
+    },
+    controller: function() {
+      //Empty controller so other directives can require being 'under' a tab
+    },
+    compile: function(elm, attrs, transclude) {
+      return function postLink(scope, elm, attrs, tabsetCtrl) {
+        scope.$watch('active', function(active) {
+          if (active) {
+            tabsetCtrl.select(scope);
+          }
+        });
+
+        scope.disabled = false;
+        if ( attrs.disable ) {
+          scope.$parent.$watch($parse(attrs.disable), function(value) {
+            scope.disabled = !! value;
+          });
+        }
+
+        // Deprecation support of "disabled" parameter
+        // fix(tab): IE9 disabled attr renders grey text on enabled tab #2677
+        // This code is duplicated from the lines above to make it easy to remove once
+        // the feature has been completely deprecated
+        if ( attrs.disabled ) {
+          $log.warn('Use of "disabled" attribute has been deprecated, please use "disable"');
+          scope.$parent.$watch($parse(attrs.disabled), function(value) {
+            scope.disabled = !! value;
+          });
+        }
+
+        scope.select = function() {
+          if ( !scope.disabled ) {
+            scope.active = true;
+          }
+        };
+
+        tabsetCtrl.addTab(scope);
+        scope.$on('$destroy', function() {
+          tabsetCtrl.removeTab(scope);
+        });
+
+        //We need to transclude later, once the content container is ready.
+        //when this link happens, we're inside a tab heading.
+        scope.$transcludeFn = transclude;
+      };
+    }
+  };
+}])
+
+.directive('tabHeadingTransclude', [function() {
+  return {
+    restrict: 'A',
+    require: '^tab',
+    link: function(scope, elm, attrs, tabCtrl) {
+      scope.$watch('headingElement', function updateHeadingElement(heading) {
+        if (heading) {
+          elm.html('');
+          elm.append(heading);
+        }
+      });
+    }
+  };
+}])
+
+.directive('tabContentTransclude', function() {
+  return {
+    restrict: 'A',
+    require: '^tabset',
+    link: function(scope, elm, attrs) {
+      var tab = scope.$eval(attrs.tabContentTransclude);
+
+      //Now our tab is ready to be transcluded: both the tab heading area
+      //and the tab content area are loaded.  Transclude 'em both.
+      tab.$transcludeFn(tab.$parent, function(contents) {
+        angular.forEach(contents, function(node) {
+          if (isTabHeading(node)) {
+            //Let tabHeadingTransclude know.
+            tab.headingElement = node;
+          } else {
+            elm.append(node);
+          }
+        });
+      });
+    }
+  };
+  function isTabHeading(node) {
+    return node.tagName &&  (
+      node.hasAttribute('tab-heading') ||
+      node.hasAttribute('data-tab-heading') ||
+      node.tagName.toLowerCase() === 'tab-heading' ||
+      node.tagName.toLowerCase() === 'data-tab-heading'
+    );
+  }
+})
+
+;
+
+angular.module('ui.bootstrap.timepicker', [])
+
+.constant('timepickerConfig', {
+  hourStep: 1,
+  minuteStep: 1,
+  showMeridian: true,
+  meridians: null,
+  readonlyInput: false,
+  mousewheel: true,
+  arrowkeys: true
+})
+
+.controller('TimepickerController', ['$scope', '$attrs', '$parse', '$log', '$locale', 'timepickerConfig', function($scope, $attrs, $parse, $log, $locale, timepickerConfig) {
+  var selected = new Date(),
+      ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl
+      meridians = angular.isDefined($attrs.meridians) ? $scope.$parent.$eval($attrs.meridians) : timepickerConfig.meridians || $locale.DATETIME_FORMATS.AMPMS;
+
+  this.init = function( ngModelCtrl_, inputs ) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.unshift(function (modelValue) {
+      return modelValue ? new Date( modelValue ) : null;
+    });
+
+    var hoursInputEl = inputs.eq(0),
+        minutesInputEl = inputs.eq(1);
+
+    var mousewheel = angular.isDefined($attrs.mousewheel) ? $scope.$parent.$eval($attrs.mousewheel) : timepickerConfig.mousewheel;
+    if ( mousewheel ) {
+      this.setupMousewheelEvents( hoursInputEl, minutesInputEl );
+    }
+
+    var arrowkeys = angular.isDefined($attrs.arrowkeys) ? $scope.$parent.$eval($attrs.arrowkeys) : timepickerConfig.arrowkeys;
+    if (arrowkeys) {
+      this.setupArrowkeyEvents( hoursInputEl, minutesInputEl );
+    }
+
+    $scope.readonlyInput = angular.isDefined($attrs.readonlyInput) ? $scope.$parent.$eval($attrs.readonlyInput) : timepickerConfig.readonlyInput;
+    this.setupInputEvents( hoursInputEl, minutesInputEl );
+  };
+
+  var hourStep = timepickerConfig.hourStep;
+  if ($attrs.hourStep) {
+    $scope.$parent.$watch($parse($attrs.hourStep), function(value) {
+      hourStep = parseInt(value, 10);
+    });
+  }
+
+  var minuteStep = timepickerConfig.minuteStep;
+  if ($attrs.minuteStep) {
+    $scope.$parent.$watch($parse($attrs.minuteStep), function(value) {
+      minuteStep = parseInt(value, 10);
+    });
+  }
+
+  // 12H / 24H mode
+  $scope.showMeridian = timepickerConfig.showMeridian;
+  if ($attrs.showMeridian) {
+    $scope.$parent.$watch($parse($attrs.showMeridian), function(value) {
+      $scope.showMeridian = !!value;
+
+      if ( ngModelCtrl.$error.time ) {
+        // Evaluate from template
+        var hours = getHoursFromTemplate(), minutes = getMinutesFromTemplate();
+        if (angular.isDefined( hours ) && angular.isDefined( minutes )) {
+          selected.setHours( hours );
+          refresh();
+        }
+      } else {
+        updateTemplate();
+      }
+    });
+  }
+
+  // Get $scope.hours in 24H mode if valid
+  function getHoursFromTemplate ( ) {
+    var hours = parseInt( $scope.hours, 10 );
+    var valid = ( $scope.showMeridian ) ? (hours > 0 && hours < 13) : (hours >= 0 && hours < 24);
+    if ( !valid ) {
+      return undefined;
+    }
+
+    if ( $scope.showMeridian ) {
+      if ( hours === 12 ) {
+        hours = 0;
+      }
+      if ( $scope.meridian === meridians[1] ) {
+        hours = hours + 12;
+      }
+    }
+    return hours;
+  }
+
+  function getMinutesFromTemplate() {
+    var minutes = parseInt($scope.minutes, 10);
+    return ( minutes >= 0 && minutes < 60 ) ? minutes : undefined;
+  }
+
+  function pad( value ) {
+    return ( angular.isDefined(value) && value.toString().length < 2 ) ? '0' + value : value.toString();
+  }
+
+  // Respond on mousewheel spin
+  this.setupMousewheelEvents = function( hoursInputEl, minutesInputEl ) {
+    var isScrollingUp = function(e) {
+      if (e.originalEvent) {
+        e = e.originalEvent;
+      }
+      //pick correct delta variable depending on event
+      var delta = (e.wheelDelta) ? e.wheelDelta : -e.deltaY;
+      return (e.detail || delta > 0);
+    };
+
+    hoursInputEl.bind('mousewheel wheel', function(e) {
+      $scope.$apply( (isScrollingUp(e)) ? $scope.incrementHours() : $scope.decrementHours() );
+      e.preventDefault();
+    });
+
+    minutesInputEl.bind('mousewheel wheel', function(e) {
+      $scope.$apply( (isScrollingUp(e)) ? $scope.incrementMinutes() : $scope.decrementMinutes() );
+      e.preventDefault();
+    });
+
+  };
+
+  // Respond on up/down arrowkeys
+  this.setupArrowkeyEvents = function( hoursInputEl, minutesInputEl ) {
+    hoursInputEl.bind('keydown', function(e) {
+      if ( e.which === 38 ) { // up
+        e.preventDefault();
+        $scope.incrementHours();
+        $scope.$apply();
+      }
+      else if ( e.which === 40 ) { // down
+        e.preventDefault();
+        $scope.decrementHours();
+        $scope.$apply();
+      }
+    });
+
+    minutesInputEl.bind('keydown', function(e) {
+      if ( e.which === 38 ) { // up
+        e.preventDefault();
+        $scope.incrementMinutes();
+        $scope.$apply();
+      }
+      else if ( e.which === 40 ) { // down
+        e.preventDefault();
+        $scope.decrementMinutes();
+        $scope.$apply();
+      }
+    });
+  };
+
+  this.setupInputEvents = function( hoursInputEl, minutesInputEl ) {
+    if ( $scope.readonlyInput ) {
+      $scope.updateHours = angular.noop;
+      $scope.updateMinutes = angular.noop;
+      return;
+    }
+
+    var invalidate = function(invalidHours, invalidMinutes) {
+      ngModelCtrl.$setViewValue( null );
+      ngModelCtrl.$setValidity('time', false);
+      if (angular.isDefined(invalidHours)) {
+        $scope.invalidHours = invalidHours;
+      }
+      if (angular.isDefined(invalidMinutes)) {
+        $scope.invalidMinutes = invalidMinutes;
+      }
+    };
+
+    $scope.updateHours = function() {
+      var hours = getHoursFromTemplate();
+
+      if ( angular.isDefined(hours) ) {
+        selected.setHours( hours );
+        refresh( 'h' );
+      } else {
+        invalidate(true);
+      }
+    };
+
+    hoursInputEl.bind('blur', function(e) {
+      if ( !$scope.invalidHours && $scope.hours < 10) {
+        $scope.$apply( function() {
+          $scope.hours = pad( $scope.hours );
+        });
+      }
+    });
+
+    $scope.updateMinutes = function() {
+      var minutes = getMinutesFromTemplate();
+
+      if ( angular.isDefined(minutes) ) {
+        selected.setMinutes( minutes );
+        refresh( 'm' );
+      } else {
+        invalidate(undefined, true);
+      }
+    };
+
+    minutesInputEl.bind('blur', function(e) {
+      if ( !$scope.invalidMinutes && $scope.minutes < 10 ) {
+        $scope.$apply( function() {
+          $scope.minutes = pad( $scope.minutes );
+        });
+      }
+    });
+
+  };
+
+  this.render = function() {
+    var date = ngModelCtrl.$viewValue;
+
+    if ( isNaN(date) ) {
+      ngModelCtrl.$setValidity('time', false);
+      $log.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
+    } else {
+      if ( date ) {
+        selected = date;
+      }
+      makeValid();
+      updateTemplate();
+    }
+  };
+
+  // Call internally when we know that model is valid.
+  function refresh( keyboardChange ) {
+    makeValid();
+    ngModelCtrl.$setViewValue( new Date(selected) );
+    updateTemplate( keyboardChange );
+  }
+
+  function makeValid() {
+    ngModelCtrl.$setValidity('time', true);
+    $scope.invalidHours = false;
+    $scope.invalidMinutes = false;
+  }
+
+  function updateTemplate( keyboardChange ) {
+    var hours = selected.getHours(), minutes = selected.getMinutes();
+
+    if ( $scope.showMeridian ) {
+      hours = ( hours === 0 || hours === 12 ) ? 12 : hours % 12; // Convert 24 to 12 hour system
+    }
+
+    $scope.hours = keyboardChange === 'h' ? hours : pad(hours);
+    if (keyboardChange !== 'm') {
+      $scope.minutes = pad(minutes);
+    }
+    $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+  }
+
+  function addMinutes( minutes ) {
+    var dt = new Date( selected.getTime() + minutes * 60000 );
+    selected.setHours( dt.getHours(), dt.getMinutes() );
+    refresh();
+  }
+
+  $scope.incrementHours = function() {
+    addMinutes( hourStep * 60 );
+  };
+  $scope.decrementHours = function() {
+    addMinutes( - hourStep * 60 );
+  };
+  $scope.incrementMinutes = function() {
+    addMinutes( minuteStep );
+  };
+  $scope.decrementMinutes = function() {
+    addMinutes( - minuteStep );
+  };
+  $scope.toggleMeridian = function() {
+    addMinutes( 12 * 60 * (( selected.getHours() < 12 ) ? 1 : -1) );
+  };
+}])
+
+.directive('timepicker', function () {
+  return {
+    restrict: 'EA',
+    require: ['timepicker', '?^ngModel'],
+    controller:'TimepickerController',
+    replace: true,
+    scope: {},
+    templateUrl: 'template/timepicker/timepicker.html',
+    link: function(scope, element, attrs, ctrls) {
+      var timepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if ( ngModelCtrl ) {
+        timepickerCtrl.init( ngModelCtrl, element.find('input') );
+      }
+    }
+  };
+});
+
+angular.module('ui.bootstrap.transition', [])
+
+.value('$transitionSuppressDeprecated', false)
+/**
+ * $transition service provides a consistent interface to trigger CSS 3 transitions and to be informed when they complete.
+ * @param  {DOMElement} element  The DOMElement that will be animated.
+ * @param  {string|object|function} trigger  The thing that will cause the transition to start:
+ *   - As a string, it represents the css class to be added to the element.
+ *   - As an object, it represents a hash of style attributes to be applied to the element.
+ *   - As a function, it represents a function to be called that will cause the transition to occur.
+ * @return {Promise}  A promise that is resolved when the transition finishes.
+ */
+.factory('$transition', [
+        '$q', '$timeout', '$rootScope', '$log', '$transitionSuppressDeprecated',
+function($q ,  $timeout ,  $rootScope ,  $log ,  $transitionSuppressDeprecated) {
+
+  if (!$transitionSuppressDeprecated) {
+    $log.warn('$transition is now deprecated. Use $animate from ngAnimate instead.');
+  }
+
+  var $transition = function(element, trigger, options) {
+    options = options || {};
+    var deferred = $q.defer();
+    var endEventName = $transition[options.animation ? 'animationEndEventName' : 'transitionEndEventName'];
+
+    var transitionEndHandler = function(event) {
+      $rootScope.$apply(function() {
+        element.unbind(endEventName, transitionEndHandler);
+        deferred.resolve(element);
+      });
+    };
+
+    if (endEventName) {
+      element.bind(endEventName, transitionEndHandler);
+    }
+
+    // Wrap in a timeout to allow the browser time to update the DOM before the transition is to occur
+    $timeout(function() {
+      if ( angular.isString(trigger) ) {
+        element.addClass(trigger);
+      } else if ( angular.isFunction(trigger) ) {
+        trigger(element);
+      } else if ( angular.isObject(trigger) ) {
+        element.css(trigger);
+      }
+      //If browser does not support transitions, instantly resolve
+      if ( !endEventName ) {
+        deferred.resolve(element);
+      }
+    });
+
+    // Add our custom cancel function to the promise that is returned
+    // We can call this if we are about to run a new transition, which we know will prevent this transition from ending,
+    // i.e. it will therefore never raise a transitionEnd event for that transition
+    deferred.promise.cancel = function() {
+      if ( endEventName ) {
+        element.unbind(endEventName, transitionEndHandler);
+      }
+      deferred.reject('Transition cancelled');
+    };
+
+    return deferred.promise;
+  };
+
+  // Work out the name of the transitionEnd event
+  var transElement = document.createElement('trans');
+  var transitionEndEventNames = {
+    'WebkitTransition': 'webkitTransitionEnd',
+    'MozTransition': 'transitionend',
+    'OTransition': 'oTransitionEnd',
+    'transition': 'transitionend'
+  };
+  var animationEndEventNames = {
+    'WebkitTransition': 'webkitAnimationEnd',
+    'MozTransition': 'animationend',
+    'OTransition': 'oAnimationEnd',
+    'transition': 'animationend'
+  };
+  function findEndEventName(endEventNames) {
+    for (var name in endEventNames){
+      if (transElement.style[name] !== undefined) {
+        return endEventNames[name];
+      }
+    }
+  }
+  $transition.transitionEndEventName = findEndEventName(transitionEndEventNames);
+  $transition.animationEndEventName = findEndEventName(animationEndEventNames);
+  return $transition;
+}]);
+
+angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap.bindHtml'])
+
+/**
+ * A helper service that can parse typeahead's syntax (string provided by users)
+ * Extracted to a separate service for ease of unit testing
+ */
+  .factory('typeaheadParser', ['$parse', function ($parse) {
+
+  //                      00000111000000000000022200000000000000003333333333333330000000000044000
+  var TYPEAHEAD_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
+
+  return {
+    parse:function (input) {
+
+      var match = input.match(TYPEAHEAD_REGEXP);
+      if (!match) {
+        throw new Error(
+          'Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_"' +
+            ' but got "' + input + '".');
+      }
+
+      return {
+        itemName:match[3],
+        source:$parse(match[4]),
+        viewMapper:$parse(match[2] || match[1]),
+        modelMapper:$parse(match[1])
+      };
+    }
+  };
+}])
+
+  .directive('typeahead', ['$compile', '$parse', '$q', '$timeout', '$document', '$position', 'typeaheadParser',
+    function ($compile, $parse, $q, $timeout, $document, $position, typeaheadParser) {
+
+  var HOT_KEYS = [9, 13, 27, 38, 40];
+
+  return {
+    require:'ngModel',
+    link:function (originalScope, element, attrs, modelCtrl) {
+
+      //SUPPORTED ATTRIBUTES (OPTIONS)
+
+      //minimal no of characters that needs to be entered before typeahead kicks-in
+      var minSearch = originalScope.$eval(attrs.typeaheadMinLength) || 1;
+
+      //minimal wait time after last character typed before typeahead kicks-in
+      var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
+
+      //should it restrict model values to the ones selected from the popup only?
+      var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
+
+      //binding to a variable that indicates if matches are being retrieved asynchronously
+      var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
+
+      //a callback executed when a match is selected
+      var onSelectCallback = $parse(attrs.typeaheadOnSelect);
+
+      var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
+
+      var appendToBody =  attrs.typeaheadAppendToBody ? originalScope.$eval(attrs.typeaheadAppendToBody) : false;
+
+      var focusFirst = originalScope.$eval(attrs.typeaheadFocusFirst) !== false;
+
+      //INTERNAL VARIABLES
+
+      //model setter executed upon match selection
+      var $setModelValue = $parse(attrs.ngModel).assign;
+
+      //expressions used by typeahead
+      var parserResult = typeaheadParser.parse(attrs.typeahead);
+
+      var hasFocus;
+
+      //create a child scope for the typeahead directive so we are not polluting original scope
+      //with typeahead-specific data (matches, query etc.)
+      var scope = originalScope.$new();
+      originalScope.$on('$destroy', function(){
+        scope.$destroy();
+      });
+
+      // WAI-ARIA
+      var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+      element.attr({
+        'aria-autocomplete': 'list',
+        'aria-expanded': false,
+        'aria-owns': popupId
+      });
+
+      //pop-up element used to display matches
+      var popUpEl = angular.element('<div typeahead-popup></div>');
+      popUpEl.attr({
+        id: popupId,
+        matches: 'matches',
+        active: 'activeIdx',
+        select: 'select(activeIdx)',
+        query: 'query',
+        position: 'position'
+      });
+      //custom item template
+      if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
+        popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
+      }
+
+      var resetMatches = function() {
+        scope.matches = [];
+        scope.activeIdx = -1;
+        element.attr('aria-expanded', false);
+      };
+
+      var getMatchId = function(index) {
+        return popupId + '-option-' + index;
+      };
+
+      // Indicate that the specified match is the active (pre-selected) item in the list owned by this typeahead.
+      // This attribute is added or removed automatically when the `activeIdx` changes.
+      scope.$watch('activeIdx', function(index) {
+        if (index < 0) {
+          element.removeAttr('aria-activedescendant');
+        } else {
+          element.attr('aria-activedescendant', getMatchId(index));
+        }
+      });
+
+      var getMatchesAsync = function(inputValue) {
+
+        var locals = {$viewValue: inputValue};
+        isLoadingSetter(originalScope, true);
+        $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
+
+          //it might happen that several async queries were in progress if a user were typing fast
+          //but we are interested only in responses that correspond to the current view value
+          var onCurrentRequest = (inputValue === modelCtrl.$viewValue);
+          if (onCurrentRequest && hasFocus) {
+            if (matches && matches.length > 0) {
+
+              scope.activeIdx = focusFirst ? 0 : -1;
+              scope.matches.length = 0;
+
+              //transform labels
+              for(var i=0; i<matches.length; i++) {
+                locals[parserResult.itemName] = matches[i];
+                scope.matches.push({
+                  id: getMatchId(i),
+                  label: parserResult.viewMapper(scope, locals),
+                  model: matches[i]
+                });
+              }
+
+              scope.query = inputValue;
+              //position pop-up with matches - we need to re-calculate its position each time we are opening a window
+              //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
+              //due to other elements being rendered
+              scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+              scope.position.top = scope.position.top + element.prop('offsetHeight');
+
+              element.attr('aria-expanded', true);
+            } else {
+              resetMatches();
+            }
+          }
+          if (onCurrentRequest) {
+            isLoadingSetter(originalScope, false);
+          }
+        }, function(){
+          resetMatches();
+          isLoadingSetter(originalScope, false);
+        });
+      };
+
+      resetMatches();
+
+      //we need to propagate user's query so we can higlight matches
+      scope.query = undefined;
+
+      //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
+      var timeoutPromise;
+
+      var scheduleSearchWithTimeout = function(inputValue) {
+        timeoutPromise = $timeout(function () {
+          getMatchesAsync(inputValue);
+        }, waitTime);
+      };
+
+      var cancelPreviousTimeout = function() {
+        if (timeoutPromise) {
+          $timeout.cancel(timeoutPromise);
+        }
+      };
+
+      //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
+      //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
+      modelCtrl.$parsers.unshift(function (inputValue) {
+
+        hasFocus = true;
+
+        if (inputValue && inputValue.length >= minSearch) {
+          if (waitTime > 0) {
+            cancelPreviousTimeout();
+            scheduleSearchWithTimeout(inputValue);
+          } else {
+            getMatchesAsync(inputValue);
+          }
+        } else {
+          isLoadingSetter(originalScope, false);
+          cancelPreviousTimeout();
+          resetMatches();
+        }
+
+        if (isEditable) {
+          return inputValue;
+        } else {
+          if (!inputValue) {
+            // Reset in case user had typed something previously.
+            modelCtrl.$setValidity('editable', true);
+            return inputValue;
+          } else {
+            modelCtrl.$setValidity('editable', false);
+            return undefined;
+          }
+        }
+      });
+
+      modelCtrl.$formatters.push(function (modelValue) {
+
+        var candidateViewValue, emptyViewValue;
+        var locals = {};
+
+        // The validity may be set to false via $parsers (see above) if
+        // the model is restricted to selected values. If the model
+        // is set manually it is considered to be valid.
+        if (!isEditable) {
+          modelCtrl.$setValidity('editable', true);
+        }
+
+        if (inputFormatter) {
+
+          locals.$model = modelValue;
+          return inputFormatter(originalScope, locals);
+
+        } else {
+
+          //it might happen that we don't have enough info to properly render input value
+          //we need to check for this situation and simply return model value if we can't apply custom formatting
+          locals[parserResult.itemName] = modelValue;
+          candidateViewValue = parserResult.viewMapper(originalScope, locals);
+          locals[parserResult.itemName] = undefined;
+          emptyViewValue = parserResult.viewMapper(originalScope, locals);
+
+          return candidateViewValue!== emptyViewValue ? candidateViewValue : modelValue;
+        }
+      });
+
+      scope.select = function (activeIdx) {
+        //called from within the $digest() cycle
+        var locals = {};
+        var model, item;
+
+        locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
+        model = parserResult.modelMapper(originalScope, locals);
+        $setModelValue(originalScope, model);
+        modelCtrl.$setValidity('editable', true);
+        modelCtrl.$setValidity('parse', true);
+
+        onSelectCallback(originalScope, {
+          $item: item,
+          $model: model,
+          $label: parserResult.viewMapper(originalScope, locals)
+        });
+
+        resetMatches();
+
+        //return focus to the input element if a match was selected via a mouse click event
+        // use timeout to avoid $rootScope:inprog error
+        $timeout(function() { element[0].focus(); }, 0, false);
+      };
+
+      //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
+      element.bind('keydown', function (evt) {
+
+        //typeahead is open and an "interesting" key was pressed
+        if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
+          return;
+        }
+
+        // if there's nothing selected (i.e. focusFirst) and enter is hit, don't do anything
+        if (scope.activeIdx == -1 && (evt.which === 13 || evt.which === 9)) {
+          return;
+        }
+
+        evt.preventDefault();
+
+        if (evt.which === 40) {
+          scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
+          scope.$digest();
+
+        } else if (evt.which === 38) {
+          scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
+          scope.$digest();
+
+        } else if (evt.which === 13 || evt.which === 9) {
+          scope.$apply(function () {
+            scope.select(scope.activeIdx);
+          });
+
+        } else if (evt.which === 27) {
+          evt.stopPropagation();
+
+          resetMatches();
+          scope.$digest();
+        }
+      });
+
+      element.bind('blur', function (evt) {
+        hasFocus = false;
+      });
+
+      // Keep reference to click handler to unbind it.
+      var dismissClickHandler = function (evt) {
+        if (element[0] !== evt.target) {
+          resetMatches();
+          scope.$digest();
+        }
+      };
+
+      $document.bind('click', dismissClickHandler);
+
+      originalScope.$on('$destroy', function(){
+        $document.unbind('click', dismissClickHandler);
+        if (appendToBody) {
+          $popup.remove();
+        }
+        // Prevent jQuery cache memory leak
+        popUpEl.remove();
+      });
+
+      var $popup = $compile(popUpEl)(scope);
+
+      if (appendToBody) {
+        $document.find('body').append($popup);
+      } else {
+        element.after($popup);
+      }
+    }
+  };
+
+}])
+
+  .directive('typeaheadPopup', function () {
+    return {
+      restrict:'EA',
+      scope:{
+        matches:'=',
+        query:'=',
+        active:'=',
+        position:'=',
+        select:'&'
+      },
+      replace:true,
+      templateUrl:'template/typeahead/typeahead-popup.html',
+      link:function (scope, element, attrs) {
+
+        scope.templateUrl = attrs.templateUrl;
+
+        scope.isOpen = function () {
+          return scope.matches.length > 0;
+        };
+
+        scope.isActive = function (matchIdx) {
+          return scope.active == matchIdx;
+        };
+
+        scope.selectActive = function (matchIdx) {
+          scope.active = matchIdx;
+        };
+
+        scope.selectMatch = function (activeIdx) {
+          scope.select({activeIdx:activeIdx});
+        };
+      }
+    };
+  })
+
+  .directive('typeaheadMatch', ['$templateRequest', '$compile', '$parse', function ($templateRequest, $compile, $parse) {
+    return {
+      restrict:'EA',
+      scope:{
+        index:'=',
+        match:'=',
+        query:'='
+      },
+      link:function (scope, element, attrs) {
+        var tplUrl = $parse(attrs.templateUrl)(scope.$parent) || 'template/typeahead/typeahead-match.html';
+        $templateRequest(tplUrl).then(function(tplContent) {
+          $compile(tplContent.trim())(scope, function(clonedElement){
+            element.replaceWith(clonedElement);
+          });
+        });
+      }
+    };
+  }])
+
+  .filter('typeaheadHighlight', function() {
+
+    function escapeRegexp(queryToEscape) {
+      return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
+    }
+
+    return function(matchItem, query) {
+      return query ? ('' + matchItem).replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : matchItem;
+    };
+  });
+
+angular.module("template/accordion/accordion-group.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/accordion/accordion-group.html",
+    "<div class=\"panel panel-default\">\n" +
+    "  <div class=\"panel-heading\">\n" +
+    "    <h4 class=\"panel-title\">\n" +
+    "      <a href=\"javascript:void(0)\" tabindex=\"0\" class=\"accordion-toggle\" ng-click=\"toggleOpen()\" accordion-transclude=\"heading\"><span ng-class=\"{'text-muted': isDisabled}\">{{heading}}</span></a>\n" +
+    "    </h4>\n" +
+    "  </div>\n" +
+    "  <div class=\"panel-collapse collapse\" collapse=\"!isOpen\">\n" +
+    "	  <div class=\"panel-body\" ng-transclude></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/accordion/accordion.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/accordion/accordion.html",
+    "<div class=\"panel-group\" ng-transclude></div>");
+}]);
+
+angular.module("template/alert/alert.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/alert/alert.html",
+    "<div class=\"alert\" ng-class=\"['alert-' + (type || 'warning'), closeable ? 'alert-dismissable' : null]\" role=\"alert\">\n" +
+    "    <button ng-show=\"closeable\" type=\"button\" class=\"close\" ng-click=\"close()\">\n" +
+    "        <span aria-hidden=\"true\">&times;</span>\n" +
+    "        <span class=\"sr-only\">Close</span>\n" +
+    "    </button>\n" +
+    "    <div ng-transclude></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/carousel/carousel.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/carousel/carousel.html",
+    "<div ng-mouseenter=\"pause()\" ng-mouseleave=\"play()\" class=\"carousel\" ng-swipe-right=\"prev()\" ng-swipe-left=\"next()\">\n" +
+    "    <ol class=\"carousel-indicators\" ng-show=\"slides.length > 1\">\n" +
+    "        <li ng-repeat=\"slide in slides | orderBy:'index' track by $index\" ng-class=\"{active: isActive(slide)}\" ng-click=\"select(slide)\"></li>\n" +
+    "    </ol>\n" +
+    "    <div class=\"carousel-inner\" ng-transclude></div>\n" +
+    "    <a class=\"left carousel-control\" ng-click=\"prev()\" ng-show=\"slides.length > 1\"><span class=\"glyphicon glyphicon-chevron-left\"></span></a>\n" +
+    "    <a class=\"right carousel-control\" ng-click=\"next()\" ng-show=\"slides.length > 1\"><span class=\"glyphicon glyphicon-chevron-right\"></span></a>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/carousel/slide.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/carousel/slide.html",
+    "<div ng-class=\"{\n" +
+    "    'active': active\n" +
+    "  }\" class=\"item text-center\" ng-transclude></div>\n" +
+    "");
+}]);
+
+angular.module("template/datepicker/datepicker.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/datepicker/datepicker.html",
+    "<div ng-switch=\"datepickerMode\" role=\"application\" ng-keydown=\"keydown($event)\">\n" +
+    "  <daypicker ng-switch-when=\"day\" tabindex=\"0\"></daypicker>\n" +
+    "  <monthpicker ng-switch-when=\"month\" tabindex=\"0\"></monthpicker>\n" +
+    "  <yearpicker ng-switch-when=\"year\" tabindex=\"0\"></yearpicker>\n" +
+    "</div>");
+}]);
+
+angular.module("template/datepicker/day.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/datepicker/day.html",
+    "<table role=\"grid\" aria-labelledby=\"{{uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-left\"></i></button></th>\n" +
+    "      <th colspan=\"{{5 + showWeeks}}\"><button id=\"{{uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\" style=\"width:100%;\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-right\"></i></button></th>\n" +
+    "    </tr>\n" +
+    "    <tr>\n" +
+    "      <th ng-show=\"showWeeks\" class=\"text-center\"></th>\n" +
+    "      <th ng-repeat=\"label in labels track by $index\" class=\"text-center\"><small aria-label=\"{{label.full}}\">{{label.abbr}}</small></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr ng-repeat=\"row in rows track by $index\">\n" +
+    "      <td ng-show=\"showWeeks\" class=\"text-center h6\"><em>{{ weekNumbers[$index] }}</em></td>\n" +
+    "      <td ng-repeat=\"dt in row track by dt.date\" class=\"text-center\" role=\"gridcell\" id=\"{{dt.uid}}\" aria-disabled=\"{{!!dt.disabled}}\" ng-class=\"dt.customClass\">\n" +
+    "        <button type=\"button\" style=\"width:100%;\" class=\"btn btn-default btn-sm\" ng-class=\"{'btn-info': dt.selected, active: isActive(dt)}\" ng-click=\"select(dt.date)\" ng-disabled=\"dt.disabled\" tabindex=\"-1\"><span ng-class=\"{'text-muted': dt.secondary, 'text-info': dt.current}\">{{dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("template/datepicker/month.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/datepicker/month.html",
+    "<table role=\"grid\" aria-labelledby=\"{{uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-left\"></i></button></th>\n" +
+    "      <th><button id=\"{{uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\" style=\"width:100%;\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-right\"></i></button></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr ng-repeat=\"row in rows track by $index\">\n" +
+    "      <td ng-repeat=\"dt in row track by dt.date\" class=\"text-center\" role=\"gridcell\" id=\"{{dt.uid}}\" aria-disabled=\"{{!!dt.disabled}}\">\n" +
+    "        <button type=\"button\" style=\"width:100%;\" class=\"btn btn-default\" ng-class=\"{'btn-info': dt.selected, active: isActive(dt)}\" ng-click=\"select(dt.date)\" ng-disabled=\"dt.disabled\" tabindex=\"-1\"><span ng-class=\"{'text-info': dt.current}\">{{dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("template/datepicker/popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/datepicker/popup.html",
+    "<ul class=\"dropdown-menu\" ng-style=\"{display: (isOpen && 'block') || 'none', top: position.top+'px', left: position.left+'px'}\" ng-keydown=\"keydown($event)\">\n" +
+    "	<li ng-transclude></li>\n" +
+    "	<li ng-if=\"showButtonBar\" style=\"padding:10px 9px 2px\">\n" +
+    "		<span class=\"btn-group pull-left\">\n" +
+    "			<button type=\"button\" class=\"btn btn-sm btn-info\" ng-click=\"select('today')\">{{ getText('current') }}</button>\n" +
+    "			<button type=\"button\" class=\"btn btn-sm btn-danger\" ng-click=\"select(null)\">{{ getText('clear') }}</button>\n" +
+    "		</span>\n" +
+    "		<button type=\"button\" class=\"btn btn-sm btn-success pull-right\" ng-click=\"close()\">{{ getText('close') }}</button>\n" +
+    "	</li>\n" +
+    "</ul>\n" +
+    "");
+}]);
+
+angular.module("template/datepicker/year.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/datepicker/year.html",
+    "<table role=\"grid\" aria-labelledby=\"{{uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-left\"></i></button></th>\n" +
+    "      <th colspan=\"3\"><button id=\"{{uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\" style=\"width:100%;\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-right\"></i></button></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr ng-repeat=\"row in rows track by $index\">\n" +
+    "      <td ng-repeat=\"dt in row track by dt.date\" class=\"text-center\" role=\"gridcell\" id=\"{{dt.uid}}\" aria-disabled=\"{{!!dt.disabled}}\">\n" +
+    "        <button type=\"button\" style=\"width:100%;\" class=\"btn btn-default\" ng-class=\"{'btn-info': dt.selected, active: isActive(dt)}\" ng-click=\"select(dt.date)\" ng-disabled=\"dt.disabled\" tabindex=\"-1\"><span ng-class=\"{'text-info': dt.current}\">{{dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("template/modal/backdrop.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/modal/backdrop.html",
+    "<div class=\"modal-backdrop\"\n" +
+    "     modal-animation-class=\"fade\"\n" +
+    "     ng-class=\"{in: animate}\"\n" +
+    "     ng-style=\"{'z-index': 1040 + (index && 1 || 0) + index*10}\"\n" +
+    "></div>\n" +
+    "");
+}]);
+
+angular.module("template/modal/window.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/modal/window.html",
+    "<div modal-render=\"{{$isRendered}}\" tabindex=\"-1\" role=\"dialog\" class=\"modal\"\n" +
+    "    modal-animation-class=\"fade\"\n" +
+    "	ng-class=\"{in: animate}\" ng-style=\"{'z-index': 1050 + index*10, display: 'block'}\" ng-click=\"close($event)\">\n" +
+    "    <div class=\"modal-dialog\" ng-class=\"size ? 'modal-' + size : ''\"><div class=\"modal-content\" modal-transclude></div></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/pagination/pager.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/pagination/pager.html",
+    "<ul class=\"pager\">\n" +
+    "  <li ng-class=\"{disabled: noPrevious(), previous: align}\"><a href ng-click=\"selectPage(page - 1, $event)\">{{getText('previous')}}</a></li>\n" +
+    "  <li ng-class=\"{disabled: noNext(), next: align}\"><a href ng-click=\"selectPage(page + 1, $event)\">{{getText('next')}}</a></li>\n" +
+    "</ul>");
+}]);
+
+angular.module("template/pagination/pagination.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/pagination/pagination.html",
+    "<ul class=\"pagination\">\n" +
+    "  <li ng-if=\"boundaryLinks\" ng-class=\"{disabled: noPrevious()}\"><a href ng-click=\"selectPage(1, $event)\">{{getText('first')}}</a></li>\n" +
+    "  <li ng-if=\"directionLinks\" ng-class=\"{disabled: noPrevious()}\"><a href ng-click=\"selectPage(page - 1, $event)\">{{getText('previous')}}</a></li>\n" +
+    "  <li ng-repeat=\"page in pages track by $index\" ng-class=\"{active: page.active}\"><a href ng-click=\"selectPage(page.number, $event)\">{{page.text}}</a></li>\n" +
+    "  <li ng-if=\"directionLinks\" ng-class=\"{disabled: noNext()}\"><a href ng-click=\"selectPage(page + 1, $event)\">{{getText('next')}}</a></li>\n" +
+    "  <li ng-if=\"boundaryLinks\" ng-class=\"{disabled: noNext()}\"><a href ng-click=\"selectPage(totalPages, $event)\">{{getText('last')}}</a></li>\n" +
+    "</ul>");
+}]);
+
+angular.module("template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/tooltip/tooltip-html-popup.html",
+    "<div class=\"tooltip\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"tooltip-arrow\"></div>\n" +
+    "  <div class=\"tooltip-inner\" ng-bind-html=\"contentExp()\"></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/tooltip/tooltip-html-unsafe-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/tooltip/tooltip-html-unsafe-popup.html",
+    "<div class=\"tooltip\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"tooltip-arrow\"></div>\n" +
+    "  <div class=\"tooltip-inner\" bind-html-unsafe=\"content\"></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/tooltip/tooltip-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/tooltip/tooltip-popup.html",
+    "<div class=\"tooltip\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"tooltip-arrow\"></div>\n" +
+    "  <div class=\"tooltip-inner\" ng-bind=\"content\"></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/tooltip/tooltip-template-popup.html",
+    "<div class=\"tooltip\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"tooltip-arrow\"></div>\n" +
+    "  <div class=\"tooltip-inner\"\n" +
+    "    tooltip-template-transclude=\"contentExp()\"\n" +
+    "    tooltip-template-transclude-scope=\"originScope()\"></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/popover/popover-template.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/popover/popover-template.html",
+    "<div class=\"popover\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"arrow\"></div>\n" +
+    "\n" +
+    "  <div class=\"popover-inner\">\n" +
+    "      <h3 class=\"popover-title\" ng-bind=\"title\" ng-if=\"title\"></h3>\n" +
+    "      <div class=\"popover-content\"\n" +
+    "        tooltip-template-transclude=\"contentExp()\"\n" +
+    "        tooltip-template-transclude-scope=\"originScope()\"></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/popover/popover-window.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/popover/popover-window.html",
+    "<div class=\"popover {{placement}}\" ng-class=\"{ in: isOpen, fade: animation }\">\n" +
+    "  <div class=\"arrow\"></div>\n" +
+    "\n" +
+    "  <div class=\"popover-inner\">\n" +
+    "      <h3 class=\"popover-title\" ng-bind=\"title\" ng-show=\"title\"></h3>\n" +
+    "      <div class=\"popover-content\" tooltip-template-transclude></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/popover/popover.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/popover/popover.html",
+    "<div class=\"popover\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"arrow\"></div>\n" +
+    "\n" +
+    "  <div class=\"popover-inner\">\n" +
+    "      <h3 class=\"popover-title\" ng-bind=\"title\" ng-if=\"title\"></h3>\n" +
+    "      <div class=\"popover-content\" ng-bind=\"content\"></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/progressbar/bar.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/progressbar/bar.html",
+    "<div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" ng-transclude></div>\n" +
+    "");
+}]);
+
+angular.module("template/progressbar/progress.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/progressbar/progress.html",
+    "<div class=\"progress\" ng-transclude></div>");
+}]);
+
+angular.module("template/progressbar/progressbar.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/progressbar/progressbar.html",
+    "<div class=\"progress\">\n" +
+    "  <div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" ng-transclude></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/rating/rating.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/rating/rating.html",
+    "<span ng-mouseleave=\"reset()\" ng-keydown=\"onKeydown($event)\" tabindex=\"0\" role=\"slider\" aria-valuemin=\"0\" aria-valuemax=\"{{range.length}}\" aria-valuenow=\"{{value}}\">\n" +
+    "    <i ng-repeat=\"r in range track by $index\" ng-mouseenter=\"enter($index + 1)\" ng-click=\"rate($index + 1)\" class=\"glyphicon\" ng-class=\"$index < value && (r.stateOn || 'glyphicon-star') || (r.stateOff || 'glyphicon-star-empty')\">\n" +
+    "        <span class=\"sr-only\">({{ $index < value ? '*' : ' ' }})</span>\n" +
+    "    </i>\n" +
+    "</span>");
+}]);
+
+angular.module("template/tabs/tab.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/tabs/tab.html",
+    "<li ng-class=\"{active: active, disabled: disabled}\">\n" +
+    "  <a href ng-click=\"select()\" tab-heading-transclude>{{heading}}</a>\n" +
+    "</li>\n" +
+    "");
+}]);
+
+angular.module("template/tabs/tabset.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/tabs/tabset.html",
+    "<div>\n" +
+    "  <ul class=\"nav nav-{{type || 'tabs'}}\" ng-class=\"{'nav-stacked': vertical, 'nav-justified': justified}\" ng-transclude></ul>\n" +
+    "  <div class=\"tab-content\">\n" +
+    "    <div class=\"tab-pane\" \n" +
+    "         ng-repeat=\"tab in tabs\" \n" +
+    "         ng-class=\"{active: tab.active}\"\n" +
+    "         tab-content-transclude=\"tab\">\n" +
+    "    </div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("template/timepicker/timepicker.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/timepicker/timepicker.html",
+    "<table>\n" +
+    "	<tbody>\n" +
+    "		<tr class=\"text-center\">\n" +
+    "			<td><a ng-click=\"incrementHours()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "			<td>&nbsp;</td>\n" +
+    "			<td><a ng-click=\"incrementMinutes()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "			<td ng-show=\"showMeridian\"></td>\n" +
+    "		</tr>\n" +
+    "		<tr>\n" +
+    "			<td class=\"form-group\" ng-class=\"{'has-error': invalidHours}\">\n" +
+    "				<input style=\"width:50px;\" type=\"text\" ng-model=\"hours\" ng-change=\"updateHours()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\">\n" +
+    "			</td>\n" +
+    "			<td>:</td>\n" +
+    "			<td class=\"form-group\" ng-class=\"{'has-error': invalidMinutes}\">\n" +
+    "				<input style=\"width:50px;\" type=\"text\" ng-model=\"minutes\" ng-change=\"updateMinutes()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\">\n" +
+    "			</td>\n" +
+    "			<td ng-show=\"showMeridian\"><button type=\"button\" class=\"btn btn-default text-center\" ng-click=\"toggleMeridian()\">{{meridian}}</button></td>\n" +
+    "		</tr>\n" +
+    "		<tr class=\"text-center\">\n" +
+    "			<td><a ng-click=\"decrementHours()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "			<td>&nbsp;</td>\n" +
+    "			<td><a ng-click=\"decrementMinutes()\" class=\"btn btn-link\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "			<td ng-show=\"showMeridian\"></td>\n" +
+    "		</tr>\n" +
+    "	</tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("template/typeahead/typeahead-match.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/typeahead/typeahead-match.html",
+    "<a tabindex=\"-1\" bind-html-unsafe=\"match.label | typeaheadHighlight:query\"></a>");
+}]);
+
+angular.module("template/typeahead/typeahead-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("template/typeahead/typeahead-popup.html",
+    "<ul class=\"dropdown-menu\" ng-show=\"isOpen()\" ng-style=\"{top: position.top+'px', left: position.left+'px'}\" style=\"display: block;\" role=\"listbox\" aria-hidden=\"{{!isOpen()}}\">\n" +
+    "    <li ng-repeat=\"match in matches track by $index\" ng-class=\"{active: isActive($index) }\" ng-mouseenter=\"selectActive($index)\" ng-click=\"selectMatch($index)\" role=\"option\" id=\"{{match.id}}\">\n" +
+    "        <div typeahead-match index=\"$index\" match=\"match\" query=\"query\" template-url=\"templateUrl\"></div>\n" +
+    "    </li>\n" +
+    "</ul>\n" +
+    "");
+}]);
+!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
new file mode 100644
index 000000000..6d2486283
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
@@ -0,0 +1,10 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 0.13.0 - 2015-05-02
+ * License: MIT
+ */
+angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.transition","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/day.html","template/datepicker/month.html","template/datepicker/popup.html","template/datepicker/year.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-popup.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/tooltip/tooltip-template-popup.html","template/popover/popover-template.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]),angular.module("ui.bootstrap.collapse",[]).directive("collapse",["$animate",function(a){return{link:function(b,c,d){function e(){c.removeClass("collapse").addClass("collapsing"),a.addClass(c,"in",{to:{height:c[0].scrollHeight+"px"}}).then(f)}function f(){c.removeClass("collapsing"),c.css({height:"auto"})}function g(){c.css({height:c[0].scrollHeight+"px"}).removeClass("collapse").addClass("collapsing"),a.removeClass(c,"in",{to:{height:"0"}}).then(h)}function h(){c.css({height:"0"}),c.removeClass("collapsing"),c.addClass("collapse")}b.$watch(d.collapse,function(a){a?g():e()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.$watch("isOpen",function(b){b&&d.closeOthers(a)}),a.toggleOpen=function(){a.isDisabled||(a.isOpen=!a.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,angular.noop))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b,this.close=a.close}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}).directive("dismissOnTimeout",["$timeout",function(a){return{require:"alert",link:function(b,c,d,e){a(function(){e.close()},parseInt(d.dismissOnTimeout,10))}}}]),angular.module("ui.bootstrap.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("ui.bootstrap.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){var d=b.hasClass(e.activeClass);(!d||angular.isDefined(c.uncheckable))&&a.$apply(function(){f.$setViewValue(d?null:a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",[]).controller("CarouselController",["$scope","$interval","$animate",function(a,b,c){function d(a){if(angular.isUndefined(k[a].index))return k[a];{var b;k.length}for(b=0;b<k.length;++b)if(k[b].index==a)return k[b]}function e(){f();var c=+a.interval;!isNaN(c)&&c>0&&(h=b(g,c))}function f(){h&&(b.cancel(h),h=null)}function g(){var b=+a.interval;i&&!isNaN(b)&&b>0?a.next():a.pause()}var h,i,j=this,k=j.slides=a.slides=[],l=-1;j.currentSlide=null;var m=!1;j.select=a.select=function(b,d){function f(){m||(angular.extend(b,{direction:d,active:!0}),angular.extend(j.currentSlide||{},{direction:d,active:!1}),c.enabled()&&!a.noTransition&&b.$element&&(a.$currentTransition=!0,b.$element.one("$animate:close",function(){a.$currentTransition=null})),j.currentSlide=b,l=g,e())}var g=j.indexOfSlide(b);void 0===d&&(d=g>j.getCurrentIndex()?"next":"prev"),b&&b!==j.currentSlide&&f()},a.$on("$destroy",function(){m=!0}),j.getCurrentIndex=function(){return j.currentSlide&&angular.isDefined(j.currentSlide.index)?+j.currentSlide.index:l},j.indexOfSlide=function(a){return angular.isDefined(a.index)?+a.index:k.indexOf(a)},a.next=function(){var b=(j.getCurrentIndex()+1)%k.length;return a.$currentTransition?void 0:j.select(d(b),"next")},a.prev=function(){var b=j.getCurrentIndex()-1<0?k.length-1:j.getCurrentIndex()-1;return a.$currentTransition?void 0:j.select(d(b),"prev")},a.isActive=function(a){return j.currentSlide===a},a.$watch("interval",e),a.$on("$destroy",f),a.play=function(){i||(i=!0,e())},a.pause=function(){a.noPause||(i=!1,f())},j.addSlide=function(b,c){b.$element=c,k.push(b),1===k.length||b.active?(j.select(k[k.length-1]),1==k.length&&a.play()):b.active=!1},j.removeSlide=function(a){angular.isDefined(a.index)&&k.sort(function(a,b){return+a.index>+b.index});var b=k.indexOf(a);k.splice(b,1),k.length>0&&a.active?j.select(b>=k.length?k[b-1]:k[b]):l>b&&l--}}]).directive("carousel",[function(){return{restrict:"EA",transclude:!0,replace:!0,controller:"CarouselController",require:"carousel",templateUrl:"template/carousel/carousel.html",scope:{interval:"=",noTransition:"=",noPause:"="}}}]).directive("slide",function(){return{require:"^carousel",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/carousel/slide.html",scope:{active:"=?",index:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}).animation(".item",["$animate",function(a){return{beforeAddClass:function(b,c,d){if("active"==c&&b.parent()&&!b.parent().scope().noTransition){var e=!1,f=b.isolateScope().direction,g="next"==f?"left":"right";return b.addClass(f),a.addClass(b,g).then(function(){e||b.removeClass(g+" "+f),d()}),function(){e=!0}}d()},beforeRemoveClass:function(b,c,d){if("active"==c&&b.parent()&&!b.parent().scope().noTransition){var e=!1,f=b.isolateScope().direction,g="next"==f?"left":"right";return a.addClass(b,g).then(function(){e||b.removeClass(g),d()}),function(){e=!0}}d()}}}]),angular.module("ui.bootstrap.dateparser",[]).service("dateParser",["$locale","orderByFilter",function(a,b){function c(a){var c=[],d=a.split("");return angular.forEach(f,function(b,e){var f=a.indexOf(e);if(f>-1){a=a.split(""),d[f]="("+b.regex+")",a[f]="$";for(var g=f+1,h=f+e.length;h>g;g++)d[g]="",a[g]="$";a=a.join(""),c.push({index:f,apply:b.apply})}}),{regex:new RegExp("^"+d.join("")+"$"),map:b(c,"index")}}function d(a,b,c){return 1>c?!1:1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}var e=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;this.parsers={};var f={yyyy:{regex:"\\d{4}",apply:function(a){this.year=+a}},yy:{regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},y:{regex:"\\d{1,4}",apply:function(a){this.year=+a}},MMMM:{regex:a.DATETIME_FORMATS.MONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.MONTH.indexOf(b)}},MMM:{regex:a.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)}},MM:{regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},M:{regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},dd:{regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},d:{regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},EEEE:{regex:a.DATETIME_FORMATS.DAY.join("|")},EEE:{regex:a.DATETIME_FORMATS.SHORTDAY.join("|")},HH:{regex:"(?:0|1)[0-9]|2[0-3]",apply:function(a){this.hours=+a}},H:{regex:"1?[0-9]|2[0-3]",apply:function(a){this.hours=+a}},mm:{regex:"[0-5][0-9]",apply:function(a){this.minutes=+a}},m:{regex:"[0-9]|[1-5][0-9]",apply:function(a){this.minutes=+a}},sss:{regex:"[0-9][0-9][0-9]",apply:function(a){this.milliseconds=+a}},ss:{regex:"[0-5][0-9]",apply:function(a){this.seconds=+a}},s:{regex:"[0-9]|[1-5][0-9]",apply:function(a){this.seconds=+a}}};this.parse=function(b,f,g){if(!angular.isString(b)||!f)return b;f=a.DATETIME_FORMATS[f]||f,f=f.replace(e,"\\$&"),this.parsers[f]||(this.parsers[f]=c(f));var h=this.parsers[f],i=h.regex,j=h.map,k=b.match(i);if(k&&k.length){var l,m;l=g?{year:g.getFullYear(),month:g.getMonth(),date:g.getDate(),hours:g.getHours(),minutes:g.getMinutes(),seconds:g.getSeconds(),milliseconds:g.getMilliseconds()}:{year:1900,month:0,date:1,hours:0,minutes:0,seconds:0,milliseconds:0};for(var n=1,o=k.length;o>n;n++){var p=j[n-1];p.apply&&p.apply.call(l,k[n])}return d(l.year,l.month,l.date)&&(m=new Date(l.year,l.month,l.date,l.hours,l.minutes,l.seconds,l.milliseconds||0)),m}}}]),angular.module("ui.bootstrap.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].documentElement.scrollLeft)}},positionElements:function(a,b,c,d){var e,f,g,h,i=c.split("-"),j=i[0],k=i[1]||"center";e=d?this.offset(a):this.position(a),f=b.prop("offsetWidth"),g=b.prop("offsetHeight");var l={center:function(){return e.left+e.width/2-f/2},left:function(){return e.left},right:function(){return e.left+e.width}},m={center:function(){return e.top+e.height/2-g/2},top:function(){return e.top},bottom:function(){return e.top+e.height}};switch(j){case"right":h={top:m[k](),left:l[j]()};break;case"left":h={top:m[k](),left:e.left-f};break;case"bottom":h={top:m[j](),left:l[k]()};break;default:h={top:e.top-g,left:l[k]()}}return h}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.position"]).constant("datepickerConfig",{formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",datepickerMode:"day",minMode:"day",maxMode:"year",showWeeks:!0,startingDay:0,yearRange:20,minDate:null,maxDate:null,shortcutPropagation:!1}).controller("DatepickerController",["$scope","$attrs","$parse","$interpolate","$timeout","$log","dateFilter","datepickerConfig",function(a,b,c,d,e,f,g,h){var i=this,j={$setViewValue:angular.noop};this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","minMode","maxMode","showWeeks","startingDay","yearRange","shortcutPropagation"],function(c,e){i[c]=angular.isDefined(b[c])?8>e?d(b[c])(a.$parent):a.$parent.$eval(b[c]):h[c]}),angular.forEach(["minDate","maxDate"],function(d){b[d]?a.$parent.$watch(c(b[d]),function(a){i[d]=a?new Date(a):null,i.refreshView()}):i[d]=h[d]?new Date(h[d]):null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.maxMode=i.maxMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),angular.isDefined(b.initDate)?(this.activeDate=a.$parent.$eval(b.initDate)||new Date,a.$parent.$watch(b.initDate,function(a){a&&(j.$isEmpty(j.$modelValue)||j.$invalid)&&(i.activeDate=a,i.refreshView())})):this.activeDate=new Date,a.isActive=function(b){return 0===i.compare(b.date,i.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){j=a,j.$render=function(){i.render()}},this.render=function(){if(j.$viewValue){var a=new Date(j.$viewValue),b=!isNaN(a);b?this.activeDate=a:f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'),j.$setValidity("date",b)}this.refreshView()},this.refreshView=function(){if(this.element){this._refreshView();var a=j.$viewValue?new Date(j.$viewValue):null;j.$setValidity("date-disabled",!a||this.element&&!this.isDisabled(a))}},this.createDateObject=function(a,b){var c=j.$viewValue?new Date(j.$viewValue):null;return{date:a,label:g(a,b),selected:c&&0===this.compare(a,c),disabled:this.isDisabled(a),current:0===this.compare(a,new Date),customClass:this.customClass(a)}},this.isDisabled=function(c){return this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.customClass=function(b){return a.customClass({date:b,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===i.minMode){var c=j.$viewValue?new Date(j.$viewValue):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),j.$setViewValue(c),j.$render()}else i.activeDate=b,a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=i.activeDate.getFullYear()+a*(i.step.years||0),c=i.activeDate.getMonth()+a*(i.step.months||0);i.activeDate.setFullYear(b,c,1),i.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===i.maxMode&&1===b||a.datepickerMode===i.minMode&&-1===b||(a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var k=function(){e(function(){i.element[0].focus()},0,!1)};a.$on("datepicker.focus",k),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey)if(b.preventDefault(),i.shortcutPropagation||b.stopPropagation(),"enter"===c||"space"===c){if(i.isDisabled(i.activeDate))return;a.select(i.activeDate),k()}else!b.ctrlKey||"up"!==c&&"down"!==c?(i.handleKeyDown(c,b),i.refreshView()):(a.toggleMode("up"===c?1:-1),k())}}]).directive("datepicker",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/datepicker.html",scope:{datepickerMode:"=?",dateDisabled:"&",customClass:"&",shortcutPropagation:"&?"},require:["datepicker","?^ngModel"],controller:"DatepickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}).directive("daypicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/day.html",require:"^datepicker",link:function(b,c,d,e){function f(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?i[b]:29}function g(a,b){var c=new Array(b),d=new Date(a),e=0;for(d.setHours(12);b>e;)c[e++]=new Date(d),d.setDate(d.getDate()+1);return c}function h(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}b.showWeeks=e.showWeeks,e.step={months:1},e.element=c;var i=[31,28,31,30,31,30,31,31,30,31,30,31];e._refreshView=function(){var c=e.activeDate.getFullYear(),d=e.activeDate.getMonth(),f=new Date(c,d,1),i=e.startingDay-f.getDay(),j=i>0?7-i:-i,k=new Date(f);j>0&&k.setDate(-j+1);for(var l=g(k,42),m=0;42>m;m++)l[m]=angular.extend(e.createDateObject(l[m],e.formatDay),{secondary:l[m].getMonth()!==d,uid:b.uniqueId+"-"+m});b.labels=new Array(7);for(var n=0;7>n;n++)b.labels[n]={abbr:a(l[n].date,e.formatDayHeader),full:a(l[n].date,"EEEE")};if(b.title=a(e.activeDate,e.formatDayTitle),b.rows=e.split(l,7),b.showWeeks){b.weekNumbers=[];for(var o=(11-e.startingDay)%7,p=b.rows.length,q=0;p>q;q++)b.weekNumbers.push(h(b.rows[q][o].date))}},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},e.handleKeyDown=function(a){var b=e.activeDate.getDate();if("left"===a)b-=1;else if("up"===a)b-=7;else if("right"===a)b+=1;else if("down"===a)b+=7;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getMonth()+("pageup"===a?-1:1);e.activeDate.setMonth(c,1),b=Math.min(f(e.activeDate.getFullYear(),e.activeDate.getMonth()),b)}else"home"===a?b=1:"end"===a&&(b=f(e.activeDate.getFullYear(),e.activeDate.getMonth()));e.activeDate.setDate(b)},e.refreshView()}}}]).directive("monthpicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/month.html",require:"^datepicker",link:function(b,c,d,e){e.step={years:1},e.element=c,e._refreshView=function(){for(var c=new Array(12),d=e.activeDate.getFullYear(),f=0;12>f;f++)c[f]=angular.extend(e.createDateObject(new Date(d,f,1),e.formatMonth),{uid:b.uniqueId+"-"+f});b.title=a(e.activeDate,e.formatMonthTitle),b.rows=e.split(c,3)},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth())-new Date(b.getFullYear(),b.getMonth())},e.handleKeyDown=function(a){var b=e.activeDate.getMonth();if("left"===a)b-=1;else if("up"===a)b-=3;else if("right"===a)b+=1;else if("down"===a)b+=3;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getFullYear()+("pageup"===a?-1:1);e.activeDate.setFullYear(c)}else"home"===a?b=0:"end"===a&&(b=11);e.activeDate.setMonth(b)},e.refreshView()}}}]).directive("yearpicker",["dateFilter",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/year.html",require:"^datepicker",link:function(a,b,c,d){function e(a){return parseInt((a-1)/f,10)*f+1}var f=d.yearRange;d.step={years:f},d.element=b,d._refreshView=function(){for(var b=new Array(f),c=0,g=e(d.activeDate.getFullYear());f>c;c++)b[c]=angular.extend(d.createDateObject(new Date(g+c,0,1),d.formatYear),{uid:a.uniqueId+"-"+c});a.title=[b[0].label,b[f-1].label].join(" - "),a.rows=d.split(b,5)},d.compare=function(a,b){return a.getFullYear()-b.getFullYear()},d.handleKeyDown=function(a){var b=d.activeDate.getFullYear();"left"===a?b-=1:"up"===a?b-=5:"right"===a?b+=1:"down"===a?b+=5:"pageup"===a||"pagedown"===a?b+=("pageup"===a?-1:1)*d.step.years:"home"===a?b=e(d.activeDate.getFullYear()):"end"===a&&(b=e(d.activeDate.getFullYear())+f-1),d.activeDate.setFullYear(b)},d.refreshView()}}}]).constant("datepickerPopupConfig",{datepickerPopup:"yyyy-MM-dd",html5Types:{date:"yyyy-MM-dd","datetime-local":"yyyy-MM-ddTHH:mm:ss.sss",month:"yyyy-MM"},currentText:"Today",clearText:"Clear",closeText:"Done",closeOnDateSelection:!0,appendToBody:!1,showButtonBar:!0}).directive("datepickerPopup",["$compile","$parse","$document","$position","dateFilter","dateParser","datepickerPopupConfig",function(a,b,c,d,e,f,g){return{restrict:"EA",require:"ngModel",scope:{isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&",customClass:"&"},link:function(h,i,j,k){function l(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function m(a){if(angular.isNumber(a)&&(a=new Date(a)),a){if(angular.isDate(a)&&!isNaN(a))return a;if(angular.isString(a)){var b=f.parse(a,o,h.date)||new Date(a);return isNaN(b)?void 0:b}return void 0}return null}function n(a,b){var c=a||b;if(angular.isNumber(c)&&(c=new Date(c)),c){if(angular.isDate(c)&&!isNaN(c))return!0;if(angular.isString(c)){var d=f.parse(c,o)||new Date(c);return!isNaN(d)}return!1}return!0}var o,p=angular.isDefined(j.closeOnDateSelection)?h.$parent.$eval(j.closeOnDateSelection):g.closeOnDateSelection,q=angular.isDefined(j.datepickerAppendToBody)?h.$parent.$eval(j.datepickerAppendToBody):g.appendToBody;h.showButtonBar=angular.isDefined(j.showButtonBar)?h.$parent.$eval(j.showButtonBar):g.showButtonBar,h.getText=function(a){return h[a+"Text"]||g[a+"Text"]};var r=!1;if(g.html5Types[j.type]?(o=g.html5Types[j.type],r=!0):(o=j.datepickerPopup||g.datepickerPopup,j.$observe("datepickerPopup",function(a){var b=a||g.datepickerPopup;if(b!==o&&(o=b,k.$modelValue=null,!o))throw new Error("datepickerPopup must have a date format specified.")})),!o)throw new Error("datepickerPopup must have a date format specified.");if(r&&j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats.");var s=angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");s.attr({"ng-model":"date","ng-change":"dateSelection()"});var t=angular.element(s.children()[0]);if(r&&"month"==j.type&&(t.attr("datepicker-mode",'"month"'),t.attr("min-mode","month")),j.datepickerOptions){var u=h.$parent.$eval(j.datepickerOptions);u.initDate&&(h.initDate=u.initDate,t.attr("init-date","initDate"),delete u.initDate),angular.forEach(u,function(a,b){t.attr(l(b),a)})}h.watchData={},angular.forEach(["minDate","maxDate","datepickerMode","initDate","shortcutPropagation"],function(a){if(j[a]){var c=b(j[a]);if(h.$parent.$watch(c,function(b){h.watchData[a]=b}),t.attr(l(a),"watchData."+a),"datepickerMode"===a){var d=c.assign;h.$watch("watchData."+a,function(a,b){a!==b&&d(h.$parent,a)})}}}),j.dateDisabled&&t.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),j.showWeeks&&t.attr("show-weeks",j.showWeeks),j.customClass&&t.attr("custom-class","customClass({ date: date, mode: mode })"),r?k.$formatters.push(function(a){return h.date=a,a}):(k.$$parserName="date",k.$validators.date=n,k.$parsers.unshift(m),k.$formatters.push(function(a){return h.date=a,k.$isEmpty(a)?a:e(a,o)})),h.dateSelection=function(a){angular.isDefined(a)&&(h.date=a);var b=h.date?e(h.date,o):"";i.val(b),k.$setViewValue(b),p&&(h.isOpen=!1,i[0].focus())},k.$viewChangeListeners.push(function(){h.date=f.parse(k.$viewValue,o,h.date)||new Date(k.$viewValue)});var v=function(a){h.isOpen&&a.target!==i[0]&&h.$apply(function(){h.isOpen=!1})},w=function(a){h.keydown(a)};i.bind("keydown",w),h.keydown=function(a){27===a.which?(a.preventDefault(),h.isOpen&&a.stopPropagation(),h.close()):40!==a.which||h.isOpen||(h.isOpen=!0)},h.$watch("isOpen",function(a){a?(h.$broadcast("datepicker.focus"),h.position=q?d.offset(i):d.position(i),h.position.top=h.position.top+i.prop("offsetHeight"),c.bind("click",v)):c.unbind("click",v)}),h.select=function(a){if("today"===a){var b=new Date;angular.isDate(h.date)?(a=new Date(h.date),a.setFullYear(b.getFullYear(),b.getMonth(),b.getDate())):a=new Date(b.setHours(0,0,0,0))}h.dateSelection(a)},h.close=function(){h.isOpen=!1,i[0].focus()};var x=a(s)(h);s.remove(),q?c.find("body").append(x):i.after(x),h.$on("$destroy",function(){x.remove(),i.unbind("keydown",w),c.unbind("click",v)})}}}]).directive("datepickerPopupWrap",function(){return{restrict:"EA",replace:!0,transclude:!0,templateUrl:"template/datepicker/popup.html",link:function(a,b){b.bind("click",function(a){a.preventDefault(),a.stopPropagation()})}}}),angular.module("ui.bootstrap.dropdown",["ui.bootstrap.position"]).constant("dropdownConfig",{openClass:"open"}).service("dropdownService",["$document","$rootScope",function(a,b){var c=null;this.open=function(b){c||(a.bind("click",d),a.bind("keydown",e)),c&&c!==b&&(c.isOpen=!1),c=b},this.close=function(b){c===b&&(c=null,a.unbind("click",d),a.unbind("keydown",e))};var d=function(a){if(c&&(!a||"disabled"!==c.getAutoClose())){var d=c.getToggleElement();if(!(a&&d&&d[0].contains(a.target))){var e=c.getElement();a&&"outsideClick"===c.getAutoClose()&&e&&e[0].contains(a.target)||(c.isOpen=!1,b.$$phase||c.$apply())}}},e=function(a){27===a.which&&(c.focusToggleElement(),d())}}]).controller("DropdownController",["$scope","$attrs","$parse","dropdownConfig","dropdownService","$animate","$position","$document",function(a,b,c,d,e,f,g,h){var i,j=this,k=a.$new(),l=d.openClass,m=angular.noop,n=b.onToggle?c(b.onToggle):angular.noop,o=!1;this.init=function(d){j.$element=d,b.isOpen&&(i=c(b.isOpen),m=i.assign,a.$watch(i,function(a){k.isOpen=!!a})),o=angular.isDefined(b.dropdownAppendToBody),o&&j.dropdownMenu&&(h.find("body").append(j.dropdownMenu),d.on("$destroy",function(){j.dropdownMenu.remove()}))},this.toggle=function(a){return k.isOpen=arguments.length?!!a:!k.isOpen},this.isOpen=function(){return k.isOpen},k.getToggleElement=function(){return j.toggleElement},k.getAutoClose=function(){return b.autoClose||"always"},k.getElement=function(){return j.$element},k.focusToggleElement=function(){j.toggleElement&&j.toggleElement[0].focus()},k.$watch("isOpen",function(b,c){if(o&&j.dropdownMenu){var d=g.positionElements(j.$element,j.dropdownMenu,"bottom-left",!0);j.dropdownMenu.css({top:d.top+"px",left:d.left+"px",display:b?"block":"none"})}f[b?"addClass":"removeClass"](j.$element,l),b?(k.focusToggleElement(),e.open(k)):e.close(k),m(a,b),angular.isDefined(b)&&b!==c&&n(a,{open:!!b})}),a.$on("$locationChangeSuccess",function(){k.isOpen=!1}),a.$on("$destroy",function(){k.$destroy()})}]).directive("dropdown",function(){return{controller:"DropdownController",link:function(a,b,c,d){d.init(b)}}}).directive("dropdownMenu",function(){return{restrict:"AC",require:"?^dropdown",link:function(a,b,c,d){d&&(d.dropdownMenu=b)}}}).directive("dropdownToggle",function(){return{require:"?^dropdown",link:function(a,b,c,d){if(d){d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.modal",[]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){function b(b){b.animate=!1,a(function(){b.animate=!0})}return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",compile:function(a,c){return a.addClass(c.backdropClass),b}}}]).directive("modalWindow",["$modalStack","$q",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"template/modal/window.html"},link:function(c,d,e){d.addClass(e.windowClass||""),c.size=e.size,c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))},c.$isRendered=!0;var f=b.defer();e.$observe("modalRender",function(a){"true"==a&&f.resolve()}),f.promise.then(function(){c.animate=!0;var b=d[0].querySelectorAll("[autofocus]");b.length?b[0].focus():d[0].focus();var e=a.getTop();e&&a.modalRendered(e.key)})}}}]).directive("modalAnimationClass",[function(){return{compile:function(a,b){b.modalAnimation&&a.addClass(b.modalAnimationClass)}}}]).directive("modalTransclude",function(){return{link:function(a,b,c,d,e){e(a.$parent,function(a){b.empty(),b.append(a)})}}}).factory("$modalStack",["$animate","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=o.keys(),c=0;c<b.length;c++)o.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("body").eq(0),d=o.get(a).value;o.remove(a),j(d.modalDomEl,d.modalScope,function(){b.toggleClass(n,o.length()>0),i()})}function i(){if(l&&-1==g()){var a=m;j(l,m,function(){a=null}),l=void 0,m=void 0}}function j(c,d,f){function g(){g.done||(g.done=!0,c.remove(),d.$destroy(),f&&f())}d.animate=!1,c.attr("modal-animation")&&a.enabled()?c.one("$animate:close",function(){e.$evalAsync(g)}):b(g)}function k(a,b,c){return!a.value.modalScope.$broadcast("modal.closing",b,c).defaultPrevented}var l,m,n="modal-open",o=f.createNew(),p={};return e.$watch(g,function(a){m&&(m.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=o.top(),b&&b.value.keyboard&&(a.preventDefault(),e.$apply(function(){p.dismiss(b.key,"escape key press")})))}),p.open=function(a,b){var f=c[0].activeElement;o.add(a,{deferred:b.deferred,renderDeferred:b.renderDeferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var h=c.find("body").eq(0),i=g();if(i>=0&&!l){m=e.$new(!0),m.index=i;var j=angular.element('<div modal-backdrop="modal-backdrop"></div>');j.attr("backdrop-class",b.backdropClass),b.animation&&j.attr("modal-animation","true"),l=d(j)(m),h.append(l)}var k=angular.element('<div modal-window="modal-window"></div>');k.attr({"template-url":b.windowTemplateUrl,"window-class":b.windowClass,size:b.size,index:o.length()-1,animate:"animate"}).html(b.content),b.animation&&k.attr("modal-animation","true");var p=d(k)(b.scope);o.top().value.modalDomEl=p,o.top().value.modalOpener=f,h.append(p),h.addClass(n)},p.close=function(a,b){var c=o.get(a);return c&&k(c,b,!0)?(c.value.deferred.resolve(b),h(a),c.value.modalOpener.focus(),!0):!c},p.dismiss=function(a,b){var c=o.get(a);return c&&k(c,b,!1)?(c.value.deferred.reject(b),h(a),c.value.modalOpener.focus(),!0):!c},p.dismissAll=function(a){for(var b=this.getTop();b&&this.dismiss(b.key,a);)b=this.getTop()},p.getTop=function(){return o.top()},p.modalRendered=function(a){var b=o.get(a);b&&b.value.renderDeferred.resolve()},p}]).provider("$modal",function(){var a={options:{animation:!0,backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$templateRequest","$controller","$modalStack",function(b,c,d,e,f,g){function h(a){return a.template?d.when(a.template):e(angular.isFunction(a.templateUrl)?a.templateUrl():a.templateUrl)}function i(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))
+}),c}var j={};return j.open=function(b){var e=d.defer(),j=d.defer(),k=d.defer(),l={result:e.promise,opened:j.promise,rendered:k.promise,close:function(a){return g.close(l,a)},dismiss:function(a){return g.dismiss(l,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var m=d.all([h(b)].concat(i(b.resolve)));return m.then(function(a){var d=(b.scope||c).$new();d.$close=l.close,d.$dismiss=l.dismiss;var h,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=l,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),h=f(b.controller,i),b.controllerAs&&(d[b.controllerAs]=h)),g.open(l,{scope:d,deferred:e,renderDeferred:k,content:a[0],animation:b.animation,backdrop:b.backdrop,keyboard:b.keyboard,backdropClass:b.backdropClass,windowClass:b.windowClass,windowTemplateUrl:b.windowTemplateUrl,size:b.size})},function(a){e.reject(a)}),m.then(function(){j.resolve(!0)},function(a){j.reject(a)}),l},j}]};return a}),angular.module("ui.bootstrap.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse",function(a,b,c){var d=this,e={$setViewValue:angular.noop},f=b.numPages?c(b.numPages).assign:angular.noop;this.init=function(g,h){e=g,this.config=h,e.$render=function(){d.render()},b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){d.itemsPerPage=parseInt(b,10),a.totalPages=d.calculateTotalPages()}):this.itemsPerPage=h.itemsPerPage,a.$watch("totalItems",function(){a.totalPages=d.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),a.page>b?a.selectPage(b):e.$render()})},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.render=function(){a.page=parseInt(e.$viewValue,10)||1},a.selectPage=function(b,c){a.page!==b&&b>0&&b<=a.totalPages&&(c&&c.target&&c.target.blur(),e.$setViewValue(b),e.$render())},a.getText=function(b){return a[b+"Text"]||d.config[b+"Text"]},a.noPrevious=function(){return 1===a.page},a.noNext=function(){return a.page===a.totalPages}}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@"},require:["pagination","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c){return{number:a,text:b,active:c}}function h(a,b){var c=[],d=1,e=b,f=angular.isDefined(k)&&b>k;f&&(l?(d=Math.max(a-Math.floor(k/2),1),e=d+k-1,e>b&&(e=b,d=e-k+1)):(d=(Math.ceil(a/k)-1)*k+1,e=Math.min(d+k-1,b)));for(var h=d;e>=h;h++){var i=g(h,h,h===a);c.push(i)}if(f&&!l){if(d>1){var j=g(d-1,"...",!1);c.unshift(j)}if(b>e){var m=g(e+1,"...",!1);c.push(m)}}return c}var i=f[0],j=f[1];if(j){var k=angular.isDefined(e.maxSize)?c.$parent.$eval(e.maxSize):b.maxSize,l=angular.isDefined(e.rotate)?c.$parent.$eval(e.rotate):b.rotate;c.boundaryLinks=angular.isDefined(e.boundaryLinks)?c.$parent.$eval(e.boundaryLinks):b.boundaryLinks,c.directionLinks=angular.isDefined(e.directionLinks)?c.$parent.$eval(e.directionLinks):b.directionLinks,i.init(j,b),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){k=parseInt(a,10),i.render()});var m=i.render;i.render=function(){m(),c.page>0&&c.page<=c.totalPages&&(c.pages=h(c.page,c.totalPages))}}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{totalItems:"=",previousText:"@",nextText:"@"},require:["pager","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&(b.align=angular.isDefined(d.align)?b.$parent.$eval(d.align):a.align,f.init(g,a))}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0,useContentExp:!1},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$document","$position","$interpolate",function(e,f,g,h,i,j){return function(e,k,l,m){function n(a){var b=a||m.trigger||l,d=c[b]||b;return{show:b,hide:d}}m=angular.extend({},b,d,m);var o=a(e),p=j.startSymbol(),q=j.endSymbol(),r="<div "+o+'-popup title="'+p+"title"+q+'" '+(m.useContentExp?'content-exp="contentExp()" ':'content="'+p+"content"+q+'" ')+'placement="'+p+"placement"+q+'" popup-class="'+p+"popupClass"+q+'" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>';return{restrict:"EA",compile:function(){var a=f(r);return function(b,c,d){function f(){E.isOpen?l():j()}function j(){(!D||b.$eval(d[k+"Enable"]))&&(s(),E.popupDelay?A||(A=g(o,E.popupDelay,!1),A.then(function(a){a()})):o()())}function l(){b.$apply(function(){p()})}function o(){return A=null,z&&(g.cancel(z),z=null),(m.useContentExp?E.contentExp():E.content)?(q(),x.css({top:0,left:0,display:"block"}),E.$digest(),F(),E.isOpen=!0,E.$apply(),F):angular.noop}function p(){E.isOpen=!1,g.cancel(A),A=null,E.animation?z||(z=g(r,500)):r()}function q(){x&&r(),y=E.$new(),x=a(y,function(a){B?h.find("body").append(a):c.after(a)}),y.$watch(function(){g(F,0,!1)}),m.useContentExp&&y.$watch("contentExp()",function(a){!a&&E.isOpen&&p()})}function r(){z=null,x&&(x.remove(),x=null),y&&(y.$destroy(),y=null)}function s(){t(),u(),v()}function t(){E.popupClass=d[k+"Class"]}function u(){var a=d[k+"Placement"];E.placement=angular.isDefined(a)?a:m.placement}function v(){var a=d[k+"PopupDelay"],b=parseInt(a,10);E.popupDelay=isNaN(b)?m.popupDelay:b}function w(){var a=d[k+"Trigger"];G(),C=n(a),C.show===C.hide?c.bind(C.show,f):(c.bind(C.show,j),c.bind(C.hide,l))}var x,y,z,A,B=angular.isDefined(m.appendToBody)?m.appendToBody:!1,C=n(void 0),D=angular.isDefined(d[k+"Enable"]),E=b.$new(!0),F=function(){if(x){var a=i.positionElements(c,x,E.placement,B);a.top+="px",a.left+="px",x.css(a)}};E.origScope=b,E.isOpen=!1,E.contentExp=function(){return b.$eval(d[e])},m.useContentExp||d.$observe(e,function(a){E.content=a,!a&&E.isOpen&&p()}),d.$observe("disabled",function(a){a&&E.isOpen&&p()}),d.$observe(k+"Title",function(a){E.title=a});var G=function(){c.unbind(C.show,j),c.unbind(C.hide,l)};w();var H=b.$eval(d[k+"Animation"]);E.animation=angular.isDefined(H)?!!H:m.animation;var I=b.$eval(d[k+"AppendToBody"]);B=angular.isDefined(I)?I:B,B&&b.$on("$locationChangeSuccess",function(){E.isOpen&&p()}),b.$on("$destroy",function(){g.cancel(z),g.cancel(A),G(),r(),E=null})}}}}}]}).directive("tooltipTemplateTransclude",["$animate","$sce","$compile","$templateRequest",function(a,b,c,d){return{link:function(e,f,g){var h,i,j,k=e.$eval(g.tooltipTemplateTranscludeScope),l=0,m=function(){i&&(i.remove(),i=null),h&&(h.$destroy(),h=null),j&&(a.leave(j).then(function(){i=null}),i=j,j=null)};e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude),function(b){var g=++l;b?(d(b,!0).then(function(d){if(g===l){var e=k.$new(),i=d,n=c(i)(e,function(b){m(),a.enter(b,f)});h=e,j=n,h.$emit("$includeContentLoaded",b)}},function(){g===l&&(m(),e.$emit("$includeContentError",b))}),e.$emit("$includeContentRequested",b)):m()}),e.$on("$destroy",m)}}}]).directive("tooltipClasses",function(){return{restrict:"A",link:function(a,b,c){a.placement&&b.addClass(a.placement),a.popupClass&&b.addClass(a.popupClass),a.animation()&&b.addClass(c.tooltipAnimationClass)}}}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipTemplatePopup",function(){return{restrict:"EA",replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"template/tooltip/tooltip-template-popup.html"}}).directive("tooltipTemplate",["$tooltip",function(a){return a("tooltipTemplate","tooltip","mouseenter",{useContentExp:!0})}]).directive("tooltipHtmlPopup",function(){return{restrict:"EA",replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-popup.html"}}).directive("tooltipHtml",["$tooltip",function(a){return a("tooltipHtml","tooltip","mouseenter",{useContentExp:!0})}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).value("tooltipHtmlUnsafeSuppressDeprecated",!1).directive("tooltipHtmlUnsafe",["$tooltip","tooltipHtmlUnsafeSuppressDeprecated","$log",function(a,b,c){return b||c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."),a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"template/popover/popover-template.html"}}).directive("popoverTemplate",["$tooltip",function(a){return a("popoverTemplate","popover","click",{useContentExp:!0})}]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(a.max)?a.max:c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",max:"=?",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",max:"=?",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,d.$formatters.push(function(a){return angular.isNumber(a)&&a<<0!==a&&(a=Math.round(a)),a}),this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length&&a.active!==!1?a.active=!0:a.active?b.select(a):a.active=!1},b.removeTab=function(a){var e=c.indexOf(a);if(a.active&&c.length>1&&!d){var f=e==c.length-1?e-1:e+1;b.select(c[f])}c.splice(e,1)};var d;a.$on("$destroy",function(){d=!0})}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse","$log",function(a,b){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(c,d,e){return function(c,d,f,g){c.$watch("active",function(a){a&&g.select(c)}),c.disabled=!1,f.disable&&c.$parent.$watch(a(f.disable),function(a){c.disabled=!!a}),f.disabled&&(b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'),c.$parent.$watch(a(f.disabled),function(a){c.disabled=!!a})),c.select=function(){c.disabled||(c.active=!0)},g.addTab(c),c.$on("$destroy",function(){g.removeTab(c)}),c.$transcludeFn=e}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0,arrowkeys:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a.toString()}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),"m"!==b&&(a.minutes=i(d)),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render,o.$formatters.unshift(function(a){return a?new Date(a):null});var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g);var i=angular.isDefined(b.arrowkeys)?a.$parent.$eval(b.arrowkeys):f.arrowkeys;i&&this.setupArrowkeyEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupArrowkeyEvents=function(b,c){b.bind("keydown",function(b){38===b.which?(b.preventDefault(),a.incrementHours(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementHours(),a.$apply())}),c.bind("keydown",function(b){38===b.which?(b.preventDefault(),a.incrementMinutes(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementMinutes(),a.$apply())})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$viewValue;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.transition",[]).value("$transitionSuppressDeprecated",!1).factory("$transition",["$q","$timeout","$rootScope","$log","$transitionSuppressDeprecated",function(a,b,c,d,e){function f(a){for(var b in a)if(void 0!==h.style[b])return a[b]}e||d.warn("$transition is now deprecated. Use $animate from ngAnimate instead.");var g=function(d,e,f){f=f||{};var h=a.defer(),i=g[f.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(e)?d.addClass(e):angular.isFunction(e)?e(d):angular.isObject(e)&&d.css(e),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},h=document.createElement("trans"),i={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},j={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return g.transitionEndEventName=f(i),g.animationEndEventName=f(j),g}]),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=i.$eval(k.typeaheadFocusFirst)!==!1,v=b(k.ngModel).assign,w=g.parse(k.typeahead),x=i.$new();i.$on("$destroy",function(){x.$destroy()});var y="typeahead-"+x.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":y});var z=angular.element("<div typeahead-popup></div>");z.attr({id:y,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&z.attr("template-url",k.typeaheadTemplateUrl);var A=function(){x.matches=[],x.activeIdx=-1,j.attr("aria-expanded",!1)},B=function(a){return y+"-option-"+a};x.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",B(a))});var C=function(a){var b={$viewValue:a};q(i,!0),c.when(w.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c&&c.length>0){x.activeIdx=u?0:-1,x.matches.length=0;for(var e=0;e<c.length;e++)b[w.itemName]=c[e],x.matches.push({id:B(e),label:w.viewMapper(x,b),model:c[e]});x.query=a,x.position=t?f.offset(j):f.position(j),x.position.top=x.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else A();d&&q(i,!1)},function(){A(),q(i,!1)})};A(),x.query=void 0;var D,E=function(a){D=d(function(){C(a)},o)},F=function(){D&&d.cancel(D)};l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(F(),E(a)):C(a):(q(i,!1),F(),A()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return p||l.$setValidity("editable",!0),s?(d.$model=a,s(i,d)):(d[w.itemName]=a,b=w.viewMapper(i,d),d[w.itemName]=void 0,c=w.viewMapper(i,d),b!==c?b:a)}),x.select=function(a){var b,c,e={};e[w.itemName]=c=x.matches[a].model,b=w.modelMapper(i,e),v(i,b),l.$setValidity("editable",!0),l.$setValidity("parse",!0),r(i,{$item:c,$model:b,$label:w.viewMapper(i,e)}),A(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==x.matches.length&&-1!==h.indexOf(a.which)&&(-1!=x.activeIdx||13!==a.which&&9!==a.which)&&(a.preventDefault(),40===a.which?(x.activeIdx=(x.activeIdx+1)%x.matches.length,x.$digest()):38===a.which?(x.activeIdx=(x.activeIdx>0?x.activeIdx:x.matches.length)-1,x.$digest()):13===a.which||9===a.which?x.$apply(function(){x.select(x.activeIdx)}):27===a.which&&(a.stopPropagation(),A(),x.$digest()))}),j.bind("blur",function(){m=!1});var G=function(a){j[0]!==a.target&&(A(),x.$digest())};e.bind("click",G),i.$on("$destroy",function(){e.unbind("click",G),t&&H.remove(),z.remove()});var H=a(z)(x);t?e.find("body").append(H):j.after(H)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$templateRequest","$compile","$parse",function(a,b,c){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(d,e,f){var g=c(f.templateUrl)(d.$parent)||"template/typeahead/typeahead-match.html";a(g).then(function(a){b(a.trim())(d,function(a){e.replaceWith(a)})})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>\n')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html",'<div ng-class="{\n    \'active\': active\n  }" class="item text-center" ng-transclude></div>\n')}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group pull-left">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')
+}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop"\n     modal-animation-class="fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n    modal-animation-class="fade"\n	ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-template-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-template-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner"\n    tooltip-template-transclude="contentExp()"\n    tooltip-template-transclude-scope="originScope()"></div>\n</div>\n')}]),angular.module("template/popover/popover-template.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover-template.html",'<div class="popover"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n      <div class="popover-content"\n        tooltip-template-transclude="contentExp()"\n        tooltip-template-transclude-scope="originScope()"></div>\n  </div>\n</div>\n')}]),angular.module("template/popover/popover-window.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover-window.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" tooltip-template-transclude></div>\n  </div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>\n')}]),!angular.$$csp()&&angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.js b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.js
new file mode 100644
index 000000000..0f31fe499
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.js
@@ -0,0 +1,4461 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 0.13.0 - 2015-05-02
+ * License: MIT
+ */
+angular.module("ui.bootstrap", ["ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.transition","ui.bootstrap.typeahead"]);
+angular.module('ui.bootstrap.collapse', [])
+
+  .directive('collapse', ['$animate', function ($animate) {
+
+    return {
+      link: function (scope, element, attrs) {
+        function expand() {
+          element.removeClass('collapse').addClass('collapsing');
+          $animate.addClass(element, 'in', {
+            to: { height: element[0].scrollHeight + 'px' }
+          }).then(expandDone);
+        }
+
+        function expandDone() {
+          element.removeClass('collapsing');
+          element.css({height: 'auto'});
+        }
+
+        function collapse() {
+          element
+            // IMPORTANT: The height must be set before adding "collapsing" class.
+            // Otherwise, the browser attempts to animate from height 0 (in
+            // collapsing class) to the given height here.
+            .css({height: element[0].scrollHeight + 'px'})
+            // initially all panel collapse have the collapse class, this removal
+            // prevents the animation from jumping to collapsed state
+            .removeClass('collapse')
+            .addClass('collapsing');
+
+          $animate.removeClass(element, 'in', {
+            to: {height: '0'}
+          }).then(collapseDone);
+        }
+
+        function collapseDone() {
+          element.css({height: '0'}); // Required so that collapse works when animation is disabled
+          element.removeClass('collapsing');
+          element.addClass('collapse');
+        }
+
+        scope.$watch(attrs.collapse, function (shouldCollapse) {
+          if (shouldCollapse) {
+            collapse();
+          } else {
+            expand();
+          }
+        });
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
+
+.constant('accordionConfig', {
+  closeOthers: true
+})
+
+.controller('AccordionController', ['$scope', '$attrs', 'accordionConfig', function ($scope, $attrs, accordionConfig) {
+
+  // This array keeps track of the accordion groups
+  this.groups = [];
+
+  // Ensure that all the groups in this accordion are closed, unless close-others explicitly says not to
+  this.closeOthers = function(openGroup) {
+    var closeOthers = angular.isDefined($attrs.closeOthers) ? $scope.$eval($attrs.closeOthers) : accordionConfig.closeOthers;
+    if ( closeOthers ) {
+      angular.forEach(this.groups, function (group) {
+        if ( group !== openGroup ) {
+          group.isOpen = false;
+        }
+      });
+    }
+  };
+
+  // This is called from the accordion-group directive to add itself to the accordion
+  this.addGroup = function(groupScope) {
+    var that = this;
+    this.groups.push(groupScope);
+
+    groupScope.$on('$destroy', function (event) {
+      that.removeGroup(groupScope);
+    });
+  };
+
+  // This is called from the accordion-group directive when to remove itself
+  this.removeGroup = function(group) {
+    var index = this.groups.indexOf(group);
+    if ( index !== -1 ) {
+      this.groups.splice(index, 1);
+    }
+  };
+
+}])
+
+// The accordion directive simply sets up the directive controller
+// and adds an accordion CSS class to itself element.
+.directive('accordion', function () {
+  return {
+    restrict:'EA',
+    controller:'AccordionController',
+    transclude: true,
+    replace: false,
+    templateUrl: 'template/accordion/accordion.html'
+  };
+})
+
+// The accordion-group directive indicates a block of html that will expand and collapse in an accordion
+.directive('accordionGroup', function() {
+  return {
+    require:'^accordion',         // We need this directive to be inside an accordion
+    restrict:'EA',
+    transclude:true,              // It transcludes the contents of the directive into the template
+    replace: true,                // The element containing the directive will be replaced with the template
+    templateUrl:'template/accordion/accordion-group.html',
+    scope: {
+      heading: '@',               // Interpolate the heading attribute onto this scope
+      isOpen: '=?',
+      isDisabled: '=?'
+    },
+    controller: function() {
+      this.setHeading = function(element) {
+        this.heading = element;
+      };
+    },
+    link: function(scope, element, attrs, accordionCtrl) {
+      accordionCtrl.addGroup(scope);
+
+      scope.$watch('isOpen', function(value) {
+        if ( value ) {
+          accordionCtrl.closeOthers(scope);
+        }
+      });
+
+      scope.toggleOpen = function() {
+        if ( !scope.isDisabled ) {
+          scope.isOpen = !scope.isOpen;
+        }
+      };
+    }
+  };
+})
+
+// Use accordion-heading below an accordion-group to provide a heading containing HTML
+// <accordion-group>
+//   <accordion-heading>Heading containing HTML - <img src="..."></accordion-heading>
+// </accordion-group>
+.directive('accordionHeading', function() {
+  return {
+    restrict: 'EA',
+    transclude: true,   // Grab the contents to be used as the heading
+    template: '',       // In effect remove this element!
+    replace: true,
+    require: '^accordionGroup',
+    link: function(scope, element, attr, accordionGroupCtrl, transclude) {
+      // Pass the heading to the accordion-group controller
+      // so that it can be transcluded into the right place in the template
+      // [The second parameter to transclude causes the elements to be cloned so that they work in ng-repeat]
+      accordionGroupCtrl.setHeading(transclude(scope, angular.noop));
+    }
+  };
+})
+
+// Use in the accordion-group template to indicate where you want the heading to be transcluded
+// You must provide the property on the accordion-group controller that will hold the transcluded element
+// <div class="accordion-group">
+//   <div class="accordion-heading" ><a ... accordion-transclude="heading">...</a></div>
+//   ...
+// </div>
+.directive('accordionTransclude', function() {
+  return {
+    require: '^accordionGroup',
+    link: function(scope, element, attr, controller) {
+      scope.$watch(function() { return controller[attr.accordionTransclude]; }, function(heading) {
+        if ( heading ) {
+          element.html('');
+          element.append(heading);
+        }
+      });
+    }
+  };
+})
+
+;
+
+angular.module('ui.bootstrap.alert', [])
+
+.controller('AlertController', ['$scope', '$attrs', function ($scope, $attrs) {
+  $scope.closeable = 'close' in $attrs;
+  this.close = $scope.close;
+}])
+
+.directive('alert', function () {
+  return {
+    restrict:'EA',
+    controller:'AlertController',
+    templateUrl:'template/alert/alert.html',
+    transclude:true,
+    replace:true,
+    scope: {
+      type: '@',
+      close: '&'
+    }
+  };
+})
+
+.directive('dismissOnTimeout', ['$timeout', function($timeout) {
+  return {
+    require: 'alert',
+    link: function(scope, element, attrs, alertCtrl) {
+      $timeout(function(){
+        alertCtrl.close();
+      }, parseInt(attrs.dismissOnTimeout, 10));
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.bindHtml', [])
+
+  .directive('bindHtmlUnsafe', function () {
+    return function (scope, element, attr) {
+      element.addClass('ng-binding').data('$binding', attr.bindHtmlUnsafe);
+      scope.$watch(attr.bindHtmlUnsafe, function bindHtmlUnsafeWatchAction(value) {
+        element.html(value || '');
+      });
+    };
+  });
+angular.module('ui.bootstrap.buttons', [])
+
+.constant('buttonConfig', {
+  activeClass: 'active',
+  toggleEvent: 'click'
+})
+
+.controller('ButtonsController', ['buttonConfig', function(buttonConfig) {
+  this.activeClass = buttonConfig.activeClass || 'active';
+  this.toggleEvent = buttonConfig.toggleEvent || 'click';
+}])
+
+.directive('btnRadio', function () {
+  return {
+    require: ['btnRadio', 'ngModel'],
+    controller: 'ButtonsController',
+    link: function (scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      //model -> UI
+      ngModelCtrl.$render = function () {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, scope.$eval(attrs.btnRadio)));
+      };
+
+      //ui->model
+      element.bind(buttonsCtrl.toggleEvent, function () {
+        var isActive = element.hasClass(buttonsCtrl.activeClass);
+
+        if (!isActive || angular.isDefined(attrs.uncheckable)) {
+          scope.$apply(function () {
+            ngModelCtrl.$setViewValue(isActive ? null : scope.$eval(attrs.btnRadio));
+            ngModelCtrl.$render();
+          });
+        }
+      });
+    }
+  };
+})
+
+.directive('btnCheckbox', function () {
+  return {
+    require: ['btnCheckbox', 'ngModel'],
+    controller: 'ButtonsController',
+    link: function (scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      function getTrueValue() {
+        return getCheckboxValue(attrs.btnCheckboxTrue, true);
+      }
+
+      function getFalseValue() {
+        return getCheckboxValue(attrs.btnCheckboxFalse, false);
+      }
+
+      function getCheckboxValue(attributeValue, defaultValue) {
+        var val = scope.$eval(attributeValue);
+        return angular.isDefined(val) ? val : defaultValue;
+      }
+
+      //model -> UI
+      ngModelCtrl.$render = function () {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, getTrueValue()));
+      };
+
+      //ui->model
+      element.bind(buttonsCtrl.toggleEvent, function () {
+        scope.$apply(function () {
+          ngModelCtrl.$setViewValue(element.hasClass(buttonsCtrl.activeClass) ? getFalseValue() : getTrueValue());
+          ngModelCtrl.$render();
+        });
+      });
+    }
+  };
+});
+
+/**
+* @ngdoc overview
+* @name ui.bootstrap.carousel
+*
+* @description
+* AngularJS version of an image carousel.
+*
+*/
+angular.module('ui.bootstrap.carousel', [])
+.controller('CarouselController', ['$scope', '$interval', '$animate', function ($scope, $interval, $animate) {
+  var self = this,
+    slides = self.slides = $scope.slides = [],
+    currentIndex = -1,
+    currentInterval, isPlaying;
+  self.currentSlide = null;
+
+  var destroyed = false;
+  /* direction: "prev" or "next" */
+  self.select = $scope.select = function(nextSlide, direction) {
+    var nextIndex = self.indexOfSlide(nextSlide);
+    //Decide direction if it's not given
+    if (direction === undefined) {
+      direction = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
+    }
+    if (nextSlide && nextSlide !== self.currentSlide) {
+      goNext();
+    }
+    function goNext() {
+      // Scope has been destroyed, stop here.
+      if (destroyed) { return; }
+
+      angular.extend(nextSlide, {direction: direction, active: true});
+      angular.extend(self.currentSlide || {}, {direction: direction, active: false});
+      if ($animate.enabled() && !$scope.noTransition && nextSlide.$element) {
+        $scope.$currentTransition = true;
+        nextSlide.$element.one('$animate:close', function closeFn() {
+          $scope.$currentTransition = null;
+        });
+      }
+
+      self.currentSlide = nextSlide;
+      currentIndex = nextIndex;
+      //every time you change slides, reset the timer
+      restartTimer();
+    }
+  };
+  $scope.$on('$destroy', function () {
+    destroyed = true;
+  });
+
+  function getSlideByIndex(index) {
+    if (angular.isUndefined(slides[index].index)) {
+      return slides[index];
+    }
+    var i, len = slides.length;
+    for (i = 0; i < slides.length; ++i) {
+      if (slides[i].index == index) {
+        return slides[i];
+      }
+    }
+  }
+
+  self.getCurrentIndex = function() {
+    if (self.currentSlide && angular.isDefined(self.currentSlide.index)) {
+      return +self.currentSlide.index;
+    }
+    return currentIndex;
+  };
+
+  /* Allow outside people to call indexOf on slides array */
+  self.indexOfSlide = function(slide) {
+    return angular.isDefined(slide.index) ? +slide.index : slides.indexOf(slide);
+  };
+
+  $scope.next = function() {
+    var newIndex = (self.getCurrentIndex() + 1) % slides.length;
+
+    //Prevent this user-triggered transition from occurring if there is already one in progress
+    if (!$scope.$currentTransition) {
+      return self.select(getSlideByIndex(newIndex), 'next');
+    }
+  };
+
+  $scope.prev = function() {
+    var newIndex = self.getCurrentIndex() - 1 < 0 ? slides.length - 1 : self.getCurrentIndex() - 1;
+
+    //Prevent this user-triggered transition from occurring if there is already one in progress
+    if (!$scope.$currentTransition) {
+      return self.select(getSlideByIndex(newIndex), 'prev');
+    }
+  };
+
+  $scope.isActive = function(slide) {
+     return self.currentSlide === slide;
+  };
+
+  $scope.$watch('interval', restartTimer);
+  $scope.$on('$destroy', resetTimer);
+
+  function restartTimer() {
+    resetTimer();
+    var interval = +$scope.interval;
+    if (!isNaN(interval) && interval > 0) {
+      currentInterval = $interval(timerFn, interval);
+    }
+  }
+
+  function resetTimer() {
+    if (currentInterval) {
+      $interval.cancel(currentInterval);
+      currentInterval = null;
+    }
+  }
+
+  function timerFn() {
+    var interval = +$scope.interval;
+    if (isPlaying && !isNaN(interval) && interval > 0) {
+      $scope.next();
+    } else {
+      $scope.pause();
+    }
+  }
+
+  $scope.play = function() {
+    if (!isPlaying) {
+      isPlaying = true;
+      restartTimer();
+    }
+  };
+  $scope.pause = function() {
+    if (!$scope.noPause) {
+      isPlaying = false;
+      resetTimer();
+    }
+  };
+
+  self.addSlide = function(slide, element) {
+    slide.$element = element;
+    slides.push(slide);
+    //if this is the first slide or the slide is set to active, select it
+    if(slides.length === 1 || slide.active) {
+      self.select(slides[slides.length-1]);
+      if (slides.length == 1) {
+        $scope.play();
+      }
+    } else {
+      slide.active = false;
+    }
+  };
+
+  self.removeSlide = function(slide) {
+    if (angular.isDefined(slide.index)) {
+      slides.sort(function(a, b) {
+        return +a.index > +b.index;
+      });
+    }
+    //get the index of the slide inside the carousel
+    var index = slides.indexOf(slide);
+    slides.splice(index, 1);
+    if (slides.length > 0 && slide.active) {
+      if (index >= slides.length) {
+        self.select(slides[index-1]);
+      } else {
+        self.select(slides[index]);
+      }
+    } else if (currentIndex > index) {
+      currentIndex--;
+    }
+  };
+
+}])
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.carousel.directive:carousel
+ * @restrict EA
+ *
+ * @description
+ * Carousel is the outer container for a set of image 'slides' to showcase.
+ *
+ * @param {number=} interval The time, in milliseconds, that it will take the carousel to go to the next slide.
+ * @param {boolean=} noTransition Whether to disable transitions on the carousel.
+ * @param {boolean=} noPause Whether to disable pausing on the carousel (by default, the carousel interval pauses on hover).
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <carousel>
+      <slide>
+        <img src="http://placekitten.com/150/150" style="margin:auto;">
+        <div class="carousel-caption">
+          <p>Beautiful!</p>
+        </div>
+      </slide>
+      <slide>
+        <img src="http://placekitten.com/100/150" style="margin:auto;">
+        <div class="carousel-caption">
+          <p>D'aww!</p>
+        </div>
+      </slide>
+    </carousel>
+  </file>
+  <file name="demo.css">
+    .carousel-indicators {
+      top: auto;
+      bottom: 15px;
+    }
+  </file>
+</example>
+ */
+.directive('carousel', [function() {
+  return {
+    restrict: 'EA',
+    transclude: true,
+    replace: true,
+    controller: 'CarouselController',
+    require: 'carousel',
+    templateUrl: 'template/carousel/carousel.html',
+    scope: {
+      interval: '=',
+      noTransition: '=',
+      noPause: '='
+    }
+  };
+}])
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.carousel.directive:slide
+ * @restrict EA
+ *
+ * @description
+ * Creates a slide inside a {@link ui.bootstrap.carousel.directive:carousel carousel}.  Must be placed as a child of a carousel element.
+ *
+ * @param {boolean=} active Model binding, whether or not this slide is currently active.
+ * @param {number=} index The index of the slide. The slides will be sorted by this parameter.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+<div ng-controller="CarouselDemoCtrl">
+  <carousel>
+    <slide ng-repeat="slide in slides" active="slide.active" index="$index">
+      <img ng-src="{{slide.image}}" style="margin:auto;">
+      <div class="carousel-caption">
+        <h4>Slide {{$index}}</h4>
+        <p>{{slide.text}}</p>
+      </div>
+    </slide>
+  </carousel>
+  Interval, in milliseconds: <input type="number" ng-model="myInterval">
+  <br />Enter a negative number to stop the interval.
+</div>
+  </file>
+  <file name="script.js">
+function CarouselDemoCtrl($scope) {
+  $scope.myInterval = 5000;
+}
+  </file>
+  <file name="demo.css">
+    .carousel-indicators {
+      top: auto;
+      bottom: 15px;
+    }
+  </file>
+</example>
+*/
+
+.directive('slide', function() {
+  return {
+    require: '^carousel',
+    restrict: 'EA',
+    transclude: true,
+    replace: true,
+    templateUrl: 'template/carousel/slide.html',
+    scope: {
+      active: '=?',
+      index: '=?'
+    },
+    link: function (scope, element, attrs, carouselCtrl) {
+      carouselCtrl.addSlide(scope, element);
+      //when the scope is destroyed then remove the slide from the current slides array
+      scope.$on('$destroy', function() {
+        carouselCtrl.removeSlide(scope);
+      });
+
+      scope.$watch('active', function(active) {
+        if (active) {
+          carouselCtrl.select(scope);
+        }
+      });
+    }
+  };
+})
+
+.animation('.item', [
+         '$animate',
+function ($animate) {
+  return {
+    beforeAddClass: function (element, className, done) {
+      // Due to transclusion, noTransition property is on parent's scope
+      if (className == 'active' && element.parent() &&
+          !element.parent().scope().noTransition) {
+        var stopped = false;
+        var direction = element.isolateScope().direction;
+        var directionClass = direction == 'next' ? 'left' : 'right';
+        element.addClass(direction);
+        $animate.addClass(element, directionClass).then(function () {
+          if (!stopped) {
+            element.removeClass(directionClass + ' ' + direction);
+          }
+          done();
+        });
+
+        return function () {
+          stopped = true;
+        };
+      }
+      done();
+    },
+    beforeRemoveClass: function (element, className, done) {
+      // Due to transclusion, noTransition property is on parent's scope
+      if (className == 'active' && element.parent() &&
+          !element.parent().scope().noTransition) {
+        var stopped = false;
+        var direction = element.isolateScope().direction;
+        var directionClass = direction == 'next' ? 'left' : 'right';
+        $animate.addClass(element, directionClass).then(function () {
+          if (!stopped) {
+            element.removeClass(directionClass);
+          }
+          done();
+        });
+        return function () {
+          stopped = true;
+        };
+      }
+      done();
+    }
+  };
+
+}])
+
+
+;
+
+angular.module('ui.bootstrap.dateparser', [])
+
+.service('dateParser', ['$locale', 'orderByFilter', function($locale, orderByFilter) {
+  // Pulled from https://github.com/mbostock/d3/blob/master/src/format/requote.js
+  var SPECIAL_CHARACTERS_REGEXP = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
+
+  this.parsers = {};
+
+  var formatCodeToRegex = {
+    'yyyy': {
+      regex: '\\d{4}',
+      apply: function(value) { this.year = +value; }
+    },
+    'yy': {
+      regex: '\\d{2}',
+      apply: function(value) { this.year = +value + 2000; }
+    },
+    'y': {
+      regex: '\\d{1,4}',
+      apply: function(value) { this.year = +value; }
+    },
+    'MMMM': {
+      regex: $locale.DATETIME_FORMATS.MONTH.join('|'),
+      apply: function(value) { this.month = $locale.DATETIME_FORMATS.MONTH.indexOf(value); }
+    },
+    'MMM': {
+      regex: $locale.DATETIME_FORMATS.SHORTMONTH.join('|'),
+      apply: function(value) { this.month = $locale.DATETIME_FORMATS.SHORTMONTH.indexOf(value); }
+    },
+    'MM': {
+      regex: '0[1-9]|1[0-2]',
+      apply: function(value) { this.month = value - 1; }
+    },
+    'M': {
+      regex: '[1-9]|1[0-2]',
+      apply: function(value) { this.month = value - 1; }
+    },
+    'dd': {
+      regex: '[0-2][0-9]{1}|3[0-1]{1}',
+      apply: function(value) { this.date = +value; }
+    },
+    'd': {
+      regex: '[1-2]?[0-9]{1}|3[0-1]{1}',
+      apply: function(value) { this.date = +value; }
+    },
+    'EEEE': {
+      regex: $locale.DATETIME_FORMATS.DAY.join('|')
+    },
+    'EEE': {
+      regex: $locale.DATETIME_FORMATS.SHORTDAY.join('|')
+    },
+    'HH': {
+      regex: '(?:0|1)[0-9]|2[0-3]',
+      apply: function(value) { this.hours = +value; }
+    },
+    'H': {
+      regex: '1?[0-9]|2[0-3]',
+      apply: function(value) { this.hours = +value; }
+    },
+    'mm': {
+      regex: '[0-5][0-9]',
+      apply: function(value) { this.minutes = +value; }
+    },
+    'm': {
+      regex: '[0-9]|[1-5][0-9]',
+      apply: function(value) { this.minutes = +value; }
+    },
+    'sss': {
+      regex: '[0-9][0-9][0-9]',
+      apply: function(value) { this.milliseconds = +value; }
+    },
+    'ss': {
+      regex: '[0-5][0-9]',
+      apply: function(value) { this.seconds = +value; }
+    },
+    's': {
+      regex: '[0-9]|[1-5][0-9]',
+      apply: function(value) { this.seconds = +value; }
+    }
+  };
+
+  function createParser(format) {
+    var map = [], regex = format.split('');
+
+    angular.forEach(formatCodeToRegex, function(data, code) {
+      var index = format.indexOf(code);
+
+      if (index > -1) {
+        format = format.split('');
+
+        regex[index] = '(' + data.regex + ')';
+        format[index] = '$'; // Custom symbol to define consumed part of format
+        for (var i = index + 1, n = index + code.length; i < n; i++) {
+          regex[i] = '';
+          format[i] = '$';
+        }
+        format = format.join('');
+
+        map.push({ index: index, apply: data.apply });
+      }
+    });
+
+    return {
+      regex: new RegExp('^' + regex.join('') + '$'),
+      map: orderByFilter(map, 'index')
+    };
+  }
+
+  this.parse = function(input, format, baseDate) {
+    if ( !angular.isString(input) || !format ) {
+      return input;
+    }
+
+    format = $locale.DATETIME_FORMATS[format] || format;
+    format = format.replace(SPECIAL_CHARACTERS_REGEXP, '\\$&');
+
+    if ( !this.parsers[format] ) {
+      this.parsers[format] = createParser(format);
+    }
+
+    var parser = this.parsers[format],
+        regex = parser.regex,
+        map = parser.map,
+        results = input.match(regex);
+
+    if ( results && results.length ) {
+      var fields, dt;
+      if (baseDate) {
+        fields = {
+          year: baseDate.getFullYear(),
+          month: baseDate.getMonth(),
+          date: baseDate.getDate(),
+          hours: baseDate.getHours(),
+          minutes: baseDate.getMinutes(),
+          seconds: baseDate.getSeconds(),
+          milliseconds: baseDate.getMilliseconds()
+        };
+      } else {
+        fields = { year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0 };
+      }
+
+      for( var i = 1, n = results.length; i < n; i++ ) {
+        var mapper = map[i-1];
+        if ( mapper.apply ) {
+          mapper.apply.call(fields, results[i]);
+        }
+      }
+
+      if ( isValid(fields.year, fields.month, fields.date) ) {
+        dt = new Date(fields.year, fields.month, fields.date, fields.hours, fields.minutes, fields.seconds,
+          fields.milliseconds || 0);
+      }
+
+      return dt;
+    }
+  };
+
+  // Check if date is valid for specific month (and year for February).
+  // Month: 0 = Jan, 1 = Feb, etc
+  function isValid(year, month, date) {
+    if (date < 1) {
+      return false;
+    }
+
+    if ( month === 1 && date > 28) {
+        return date === 29 && ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0);
+    }
+
+    if ( month === 3 || month === 5 || month === 8 || month === 10) {
+        return date < 31;
+    }
+
+    return true;
+  }
+}]);
+
+angular.module('ui.bootstrap.position', [])
+
+/**
+ * A set of utility methods that can be use to retrieve position of DOM elements.
+ * It is meant to be used where we need to absolute-position DOM elements in
+ * relation to other, existing elements (this is the case for tooltips, popovers,
+ * typeahead suggestions etc.).
+ */
+  .factory('$position', ['$document', '$window', function ($document, $window) {
+
+    function getStyle(el, cssprop) {
+      if (el.currentStyle) { //IE
+        return el.currentStyle[cssprop];
+      } else if ($window.getComputedStyle) {
+        return $window.getComputedStyle(el)[cssprop];
+      }
+      // finally try and get inline style
+      return el.style[cssprop];
+    }
+
+    /**
+     * Checks if a given element is statically positioned
+     * @param element - raw DOM element
+     */
+    function isStaticPositioned(element) {
+      return (getStyle(element, 'position') || 'static' ) === 'static';
+    }
+
+    /**
+     * returns the closest, non-statically positioned parentOffset of a given element
+     * @param element
+     */
+    var parentOffsetEl = function (element) {
+      var docDomEl = $document[0];
+      var offsetParent = element.offsetParent || docDomEl;
+      while (offsetParent && offsetParent !== docDomEl && isStaticPositioned(offsetParent) ) {
+        offsetParent = offsetParent.offsetParent;
+      }
+      return offsetParent || docDomEl;
+    };
+
+    return {
+      /**
+       * Provides read-only equivalent of jQuery's position function:
+       * http://api.jquery.com/position/
+       */
+      position: function (element) {
+        var elBCR = this.offset(element);
+        var offsetParentBCR = { top: 0, left: 0 };
+        var offsetParentEl = parentOffsetEl(element[0]);
+        if (offsetParentEl != $document[0]) {
+          offsetParentBCR = this.offset(angular.element(offsetParentEl));
+          offsetParentBCR.top += offsetParentEl.clientTop - offsetParentEl.scrollTop;
+          offsetParentBCR.left += offsetParentEl.clientLeft - offsetParentEl.scrollLeft;
+        }
+
+        var boundingClientRect = element[0].getBoundingClientRect();
+        return {
+          width: boundingClientRect.width || element.prop('offsetWidth'),
+          height: boundingClientRect.height || element.prop('offsetHeight'),
+          top: elBCR.top - offsetParentBCR.top,
+          left: elBCR.left - offsetParentBCR.left
+        };
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's offset function:
+       * http://api.jquery.com/offset/
+       */
+      offset: function (element) {
+        var boundingClientRect = element[0].getBoundingClientRect();
+        return {
+          width: boundingClientRect.width || element.prop('offsetWidth'),
+          height: boundingClientRect.height || element.prop('offsetHeight'),
+          top: boundingClientRect.top + ($window.pageYOffset || $document[0].documentElement.scrollTop),
+          left: boundingClientRect.left + ($window.pageXOffset || $document[0].documentElement.scrollLeft)
+        };
+      },
+
+      /**
+       * Provides coordinates for the targetEl in relation to hostEl
+       */
+      positionElements: function (hostEl, targetEl, positionStr, appendToBody) {
+
+        var positionStrParts = positionStr.split('-');
+        var pos0 = positionStrParts[0], pos1 = positionStrParts[1] || 'center';
+
+        var hostElPos,
+          targetElWidth,
+          targetElHeight,
+          targetElPos;
+
+        hostElPos = appendToBody ? this.offset(hostEl) : this.position(hostEl);
+
+        targetElWidth = targetEl.prop('offsetWidth');
+        targetElHeight = targetEl.prop('offsetHeight');
+
+        var shiftWidth = {
+          center: function () {
+            return hostElPos.left + hostElPos.width / 2 - targetElWidth / 2;
+          },
+          left: function () {
+            return hostElPos.left;
+          },
+          right: function () {
+            return hostElPos.left + hostElPos.width;
+          }
+        };
+
+        var shiftHeight = {
+          center: function () {
+            return hostElPos.top + hostElPos.height / 2 - targetElHeight / 2;
+          },
+          top: function () {
+            return hostElPos.top;
+          },
+          bottom: function () {
+            return hostElPos.top + hostElPos.height;
+          }
+        };
+
+        switch (pos0) {
+          case 'right':
+            targetElPos = {
+              top: shiftHeight[pos1](),
+              left: shiftWidth[pos0]()
+            };
+            break;
+          case 'left':
+            targetElPos = {
+              top: shiftHeight[pos1](),
+              left: hostElPos.left - targetElWidth
+            };
+            break;
+          case 'bottom':
+            targetElPos = {
+              top: shiftHeight[pos0](),
+              left: shiftWidth[pos1]()
+            };
+            break;
+          default:
+            targetElPos = {
+              top: hostElPos.top - targetElHeight,
+              left: shiftWidth[pos1]()
+            };
+            break;
+        }
+
+        return targetElPos;
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
+
+.constant('datepickerConfig', {
+  formatDay: 'dd',
+  formatMonth: 'MMMM',
+  formatYear: 'yyyy',
+  formatDayHeader: 'EEE',
+  formatDayTitle: 'MMMM yyyy',
+  formatMonthTitle: 'yyyy',
+  datepickerMode: 'day',
+  minMode: 'day',
+  maxMode: 'year',
+  showWeeks: true,
+  startingDay: 0,
+  yearRange: 20,
+  minDate: null,
+  maxDate: null,
+  shortcutPropagation: false
+})
+
+.controller('DatepickerController', ['$scope', '$attrs', '$parse', '$interpolate', '$timeout', '$log', 'dateFilter', 'datepickerConfig', function($scope, $attrs, $parse, $interpolate, $timeout, $log, dateFilter, datepickerConfig) {
+  var self = this,
+      ngModelCtrl = { $setViewValue: angular.noop }; // nullModelCtrl;
+
+  // Modes chain
+  this.modes = ['day', 'month', 'year'];
+
+  // Configuration attributes
+  angular.forEach(['formatDay', 'formatMonth', 'formatYear', 'formatDayHeader', 'formatDayTitle', 'formatMonthTitle',
+                   'minMode', 'maxMode', 'showWeeks', 'startingDay', 'yearRange', 'shortcutPropagation'], function( key, index ) {
+    self[key] = angular.isDefined($attrs[key]) ? (index < 8 ? $interpolate($attrs[key])($scope.$parent) : $scope.$parent.$eval($attrs[key])) : datepickerConfig[key];
+  });
+
+  // Watchable date attributes
+  angular.forEach(['minDate', 'maxDate'], function( key ) {
+    if ( $attrs[key] ) {
+      $scope.$parent.$watch($parse($attrs[key]), function(value) {
+        self[key] = value ? new Date(value) : null;
+        self.refreshView();
+      });
+    } else {
+      self[key] = datepickerConfig[key] ? new Date(datepickerConfig[key]) : null;
+    }
+  });
+
+  $scope.datepickerMode = $scope.datepickerMode || datepickerConfig.datepickerMode;
+  $scope.maxMode = self.maxMode;
+  $scope.uniqueId = 'datepicker-' + $scope.$id + '-' + Math.floor(Math.random() * 10000);
+
+  if(angular.isDefined($attrs.initDate)) {
+    this.activeDate = $scope.$parent.$eval($attrs.initDate) || new Date();
+    $scope.$parent.$watch($attrs.initDate, function(initDate){
+      if(initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)){
+        self.activeDate = initDate;
+        self.refreshView();
+      }
+    });
+  } else {
+    this.activeDate =  new Date();
+  }
+
+  $scope.isActive = function(dateObject) {
+    if (self.compare(dateObject.date, self.activeDate) === 0) {
+      $scope.activeDateId = dateObject.uid;
+      return true;
+    }
+    return false;
+  };
+
+  this.init = function( ngModelCtrl_ ) {
+    ngModelCtrl = ngModelCtrl_;
+
+    ngModelCtrl.$render = function() {
+      self.render();
+    };
+  };
+
+  this.render = function() {
+    if ( ngModelCtrl.$viewValue ) {
+      var date = new Date( ngModelCtrl.$viewValue ),
+          isValid = !isNaN(date);
+
+      if ( isValid ) {
+        this.activeDate = date;
+      } else {
+        $log.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
+      }
+      ngModelCtrl.$setValidity('date', isValid);
+    }
+    this.refreshView();
+  };
+
+  this.refreshView = function() {
+    if ( this.element ) {
+      this._refreshView();
+
+      var date = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+      ngModelCtrl.$setValidity('date-disabled', !date || (this.element && !this.isDisabled(date)));
+    }
+  };
+
+  this.createDateObject = function(date, format) {
+    var model = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+    return {
+      date: date,
+      label: dateFilter(date, format),
+      selected: model && this.compare(date, model) === 0,
+      disabled: this.isDisabled(date),
+      current: this.compare(date, new Date()) === 0,
+      customClass: this.customClass(date)
+    };
+  };
+
+  this.isDisabled = function( date ) {
+    return ((this.minDate && this.compare(date, this.minDate) < 0) || (this.maxDate && this.compare(date, this.maxDate) > 0) || ($attrs.dateDisabled && $scope.dateDisabled({date: date, mode: $scope.datepickerMode})));
+  };
+
+    this.customClass = function( date ) {
+      return $scope.customClass({date: date, mode: $scope.datepickerMode});
+    };
+
+  // Split array into smaller arrays
+  this.split = function(arr, size) {
+    var arrays = [];
+    while (arr.length > 0) {
+      arrays.push(arr.splice(0, size));
+    }
+    return arrays;
+  };
+
+  $scope.select = function( date ) {
+    if ( $scope.datepickerMode === self.minMode ) {
+      var dt = ngModelCtrl.$viewValue ? new Date( ngModelCtrl.$viewValue ) : new Date(0, 0, 0, 0, 0, 0, 0);
+      dt.setFullYear( date.getFullYear(), date.getMonth(), date.getDate() );
+      ngModelCtrl.$setViewValue( dt );
+      ngModelCtrl.$render();
+    } else {
+      self.activeDate = date;
+      $scope.datepickerMode = self.modes[ self.modes.indexOf( $scope.datepickerMode ) - 1 ];
+    }
+  };
+
+  $scope.move = function( direction ) {
+    var year = self.activeDate.getFullYear() + direction * (self.step.years || 0),
+        month = self.activeDate.getMonth() + direction * (self.step.months || 0);
+    self.activeDate.setFullYear(year, month, 1);
+    self.refreshView();
+  };
+
+  $scope.toggleMode = function( direction ) {
+    direction = direction || 1;
+
+    if (($scope.datepickerMode === self.maxMode && direction === 1) || ($scope.datepickerMode === self.minMode && direction === -1)) {
+      return;
+    }
+
+    $scope.datepickerMode = self.modes[ self.modes.indexOf( $scope.datepickerMode ) + direction ];
+  };
+
+  // Key event mapper
+  $scope.keys = { 13:'enter', 32:'space', 33:'pageup', 34:'pagedown', 35:'end', 36:'home', 37:'left', 38:'up', 39:'right', 40:'down' };
+
+  var focusElement = function() {
+    $timeout(function() {
+      self.element[0].focus();
+    }, 0 , false);
+  };
+
+  // Listen for focus requests from popup directive
+  $scope.$on('datepicker.focus', focusElement);
+
+  $scope.keydown = function( evt ) {
+    var key = $scope.keys[evt.which];
+
+    if ( !key || evt.shiftKey || evt.altKey ) {
+      return;
+    }
+
+    evt.preventDefault();
+    if(!self.shortcutPropagation){
+        evt.stopPropagation();
+    }
+
+    if (key === 'enter' || key === 'space') {
+      if ( self.isDisabled(self.activeDate)) {
+        return; // do nothing
+      }
+      $scope.select(self.activeDate);
+      focusElement();
+    } else if (evt.ctrlKey && (key === 'up' || key === 'down')) {
+      $scope.toggleMode(key === 'up' ? 1 : -1);
+      focusElement();
+    } else {
+      self.handleKeyDown(key, evt);
+      self.refreshView();
+    }
+  };
+}])
+
+.directive( 'datepicker', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/datepicker.html',
+    scope: {
+      datepickerMode: '=?',
+      dateDisabled: '&',
+      customClass: '&',
+      shortcutPropagation: '&?'
+    },
+    require: ['datepicker', '?^ngModel'],
+    controller: 'DatepickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if ( ngModelCtrl ) {
+        datepickerCtrl.init( ngModelCtrl );
+      }
+    }
+  };
+})
+
+.directive('daypicker', ['dateFilter', function (dateFilter) {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/day.html',
+    require: '^datepicker',
+    link: function(scope, element, attrs, ctrl) {
+      scope.showWeeks = ctrl.showWeeks;
+
+      ctrl.step = { months: 1 };
+      ctrl.element = element;
+
+      var DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+      function getDaysInMonth( year, month ) {
+        return ((month === 1) && (year % 4 === 0) && ((year % 100 !== 0) || (year % 400 === 0))) ? 29 : DAYS_IN_MONTH[month];
+      }
+
+      function getDates(startDate, n) {
+        var dates = new Array(n), current = new Date(startDate), i = 0;
+        current.setHours(12); // Prevent repeated dates because of timezone bug
+        while ( i < n ) {
+          dates[i++] = new Date(current);
+          current.setDate( current.getDate() + 1 );
+        }
+        return dates;
+      }
+
+      ctrl._refreshView = function() {
+        var year = ctrl.activeDate.getFullYear(),
+          month = ctrl.activeDate.getMonth(),
+          firstDayOfMonth = new Date(year, month, 1),
+          difference = ctrl.startingDay - firstDayOfMonth.getDay(),
+          numDisplayedFromPreviousMonth = (difference > 0) ? 7 - difference : - difference,
+          firstDate = new Date(firstDayOfMonth);
+
+        if ( numDisplayedFromPreviousMonth > 0 ) {
+          firstDate.setDate( - numDisplayedFromPreviousMonth + 1 );
+        }
+
+        // 42 is the number of days on a six-month calendar
+        var days = getDates(firstDate, 42);
+        for (var i = 0; i < 42; i ++) {
+          days[i] = angular.extend(ctrl.createDateObject(days[i], ctrl.formatDay), {
+            secondary: days[i].getMonth() !== month,
+            uid: scope.uniqueId + '-' + i
+          });
+        }
+
+        scope.labels = new Array(7);
+        for (var j = 0; j < 7; j++) {
+          scope.labels[j] = {
+            abbr: dateFilter(days[j].date, ctrl.formatDayHeader),
+            full: dateFilter(days[j].date, 'EEEE')
+          };
+        }
+
+        scope.title = dateFilter(ctrl.activeDate, ctrl.formatDayTitle);
+        scope.rows = ctrl.split(days, 7);
+
+        if ( scope.showWeeks ) {
+          scope.weekNumbers = [];
+          var thursdayIndex = (4 + 7 - ctrl.startingDay) % 7,
+              numWeeks = scope.rows.length;
+          for (var curWeek = 0; curWeek < numWeeks; curWeek++) {
+            scope.weekNumbers.push(
+              getISO8601WeekNumber( scope.rows[curWeek][thursdayIndex].date ));
+          }
+        }
+      };
+
+      ctrl.compare = function(date1, date2) {
+        return (new Date( date1.getFullYear(), date1.getMonth(), date1.getDate() ) - new Date( date2.getFullYear(), date2.getMonth(), date2.getDate() ) );
+      };
+
+      function getISO8601WeekNumber(date) {
+        var checkDate = new Date(date);
+        checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); // Thursday
+        var time = checkDate.getTime();
+        checkDate.setMonth(0); // Compare with Jan 1
+        checkDate.setDate(1);
+        return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+      }
+
+      ctrl.handleKeyDown = function( key, evt ) {
+        var date = ctrl.activeDate.getDate();
+
+        if (key === 'left') {
+          date = date - 1;   // up
+        } else if (key === 'up') {
+          date = date - 7;   // down
+        } else if (key === 'right') {
+          date = date + 1;   // down
+        } else if (key === 'down') {
+          date = date + 7;
+        } else if (key === 'pageup' || key === 'pagedown') {
+          var month = ctrl.activeDate.getMonth() + (key === 'pageup' ? - 1 : 1);
+          ctrl.activeDate.setMonth(month, 1);
+          date = Math.min(getDaysInMonth(ctrl.activeDate.getFullYear(), ctrl.activeDate.getMonth()), date);
+        } else if (key === 'home') {
+          date = 1;
+        } else if (key === 'end') {
+          date = getDaysInMonth(ctrl.activeDate.getFullYear(), ctrl.activeDate.getMonth());
+        }
+        ctrl.activeDate.setDate(date);
+      };
+
+      ctrl.refreshView();
+    }
+  };
+}])
+
+.directive('monthpicker', ['dateFilter', function (dateFilter) {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/month.html',
+    require: '^datepicker',
+    link: function(scope, element, attrs, ctrl) {
+      ctrl.step = { years: 1 };
+      ctrl.element = element;
+
+      ctrl._refreshView = function() {
+        var months = new Array(12),
+            year = ctrl.activeDate.getFullYear();
+
+        for ( var i = 0; i < 12; i++ ) {
+          months[i] = angular.extend(ctrl.createDateObject(new Date(year, i, 1), ctrl.formatMonth), {
+            uid: scope.uniqueId + '-' + i
+          });
+        }
+
+        scope.title = dateFilter(ctrl.activeDate, ctrl.formatMonthTitle);
+        scope.rows = ctrl.split(months, 3);
+      };
+
+      ctrl.compare = function(date1, date2) {
+        return new Date( date1.getFullYear(), date1.getMonth() ) - new Date( date2.getFullYear(), date2.getMonth() );
+      };
+
+      ctrl.handleKeyDown = function( key, evt ) {
+        var date = ctrl.activeDate.getMonth();
+
+        if (key === 'left') {
+          date = date - 1;   // up
+        } else if (key === 'up') {
+          date = date - 3;   // down
+        } else if (key === 'right') {
+          date = date + 1;   // down
+        } else if (key === 'down') {
+          date = date + 3;
+        } else if (key === 'pageup' || key === 'pagedown') {
+          var year = ctrl.activeDate.getFullYear() + (key === 'pageup' ? - 1 : 1);
+          ctrl.activeDate.setFullYear(year);
+        } else if (key === 'home') {
+          date = 0;
+        } else if (key === 'end') {
+          date = 11;
+        }
+        ctrl.activeDate.setMonth(date);
+      };
+
+      ctrl.refreshView();
+    }
+  };
+}])
+
+.directive('yearpicker', ['dateFilter', function (dateFilter) {
+  return {
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/datepicker/year.html',
+    require: '^datepicker',
+    link: function(scope, element, attrs, ctrl) {
+      var range = ctrl.yearRange;
+
+      ctrl.step = { years: range };
+      ctrl.element = element;
+
+      function getStartingYear( year ) {
+        return parseInt((year - 1) / range, 10) * range + 1;
+      }
+
+      ctrl._refreshView = function() {
+        var years = new Array(range);
+
+        for ( var i = 0, start = getStartingYear(ctrl.activeDate.getFullYear()); i < range; i++ ) {
+          years[i] = angular.extend(ctrl.createDateObject(new Date(start + i, 0, 1), ctrl.formatYear), {
+            uid: scope.uniqueId + '-' + i
+          });
+        }
+
+        scope.title = [years[0].label, years[range - 1].label].join(' - ');
+        scope.rows = ctrl.split(years, 5);
+      };
+
+      ctrl.compare = function(date1, date2) {
+        return date1.getFullYear() - date2.getFullYear();
+      };
+
+      ctrl.handleKeyDown = function( key, evt ) {
+        var date = ctrl.activeDate.getFullYear();
+
+        if (key === 'left') {
+          date = date - 1;   // up
+        } else if (key === 'up') {
+          date = date - 5;   // down
+        } else if (key === 'right') {
+          date = date + 1;   // down
+        } else if (key === 'down') {
+          date = date + 5;
+        } else if (key === 'pageup' || key === 'pagedown') {
+          date += (key === 'pageup' ? - 1 : 1) * ctrl.step.years;
+        } else if (key === 'home') {
+          date = getStartingYear( ctrl.activeDate.getFullYear() );
+        } else if (key === 'end') {
+          date = getStartingYear( ctrl.activeDate.getFullYear() ) + range - 1;
+        }
+        ctrl.activeDate.setFullYear(date);
+      };
+
+      ctrl.refreshView();
+    }
+  };
+}])
+
+.constant('datepickerPopupConfig', {
+  datepickerPopup: 'yyyy-MM-dd',
+  html5Types: {
+    date: 'yyyy-MM-dd',
+    'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
+    'month': 'yyyy-MM'
+  },
+  currentText: 'Today',
+  clearText: 'Clear',
+  closeText: 'Done',
+  closeOnDateSelection: true,
+  appendToBody: false,
+  showButtonBar: true
+})
+
+.directive('datepickerPopup', ['$compile', '$parse', '$document', '$position', 'dateFilter', 'dateParser', 'datepickerPopupConfig',
+function ($compile, $parse, $document, $position, dateFilter, dateParser, datepickerPopupConfig) {
+  return {
+    restrict: 'EA',
+    require: 'ngModel',
+    scope: {
+      isOpen: '=?',
+      currentText: '@',
+      clearText: '@',
+      closeText: '@',
+      dateDisabled: '&',
+      customClass: '&'
+    },
+    link: function(scope, element, attrs, ngModel) {
+      var dateFormat,
+          closeOnDateSelection = angular.isDefined(attrs.closeOnDateSelection) ? scope.$parent.$eval(attrs.closeOnDateSelection) : datepickerPopupConfig.closeOnDateSelection,
+          appendToBody = angular.isDefined(attrs.datepickerAppendToBody) ? scope.$parent.$eval(attrs.datepickerAppendToBody) : datepickerPopupConfig.appendToBody;
+
+      scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? scope.$parent.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
+
+      scope.getText = function( key ) {
+        return scope[key + 'Text'] || datepickerPopupConfig[key + 'Text'];
+      };
+
+      var isHtml5DateInput = false;
+      if (datepickerPopupConfig.html5Types[attrs.type]) {
+        dateFormat = datepickerPopupConfig.html5Types[attrs.type];
+        isHtml5DateInput = true;
+      } else {
+        dateFormat = attrs.datepickerPopup || datepickerPopupConfig.datepickerPopup;
+        attrs.$observe('datepickerPopup', function(value, oldValue) {
+            var newDateFormat = value || datepickerPopupConfig.datepickerPopup;
+            // Invalidate the $modelValue to ensure that formatters re-run
+            // FIXME: Refactor when PR is merged: https://github.com/angular/angular.js/pull/10764
+            if (newDateFormat !== dateFormat) {
+              dateFormat = newDateFormat;
+              ngModel.$modelValue = null;
+
+              if (!dateFormat) {
+                throw new Error('datepickerPopup must have a date format specified.');
+              }
+            }
+        });
+      }
+
+      if (!dateFormat) {
+        throw new Error('datepickerPopup must have a date format specified.');
+      }
+
+      if (isHtml5DateInput && attrs.datepickerPopup) {
+        throw new Error('HTML5 date input types do not support custom formats.');
+      }
+
+      // popup element used to display calendar
+      var popupEl = angular.element('<div datepicker-popup-wrap><div datepicker></div></div>');
+      popupEl.attr({
+        'ng-model': 'date',
+        'ng-change': 'dateSelection()'
+      });
+
+      function cameltoDash( string ){
+        return string.replace(/([A-Z])/g, function($1) { return '-' + $1.toLowerCase(); });
+      }
+
+      // datepicker element
+      var datepickerEl = angular.element(popupEl.children()[0]);
+      if (isHtml5DateInput) {
+        if (attrs.type == 'month') {
+          datepickerEl.attr('datepicker-mode', '"month"');
+          datepickerEl.attr('min-mode', 'month');
+        }
+      }
+
+      if ( attrs.datepickerOptions ) {
+        var options = scope.$parent.$eval(attrs.datepickerOptions);
+        if(options.initDate) {
+          scope.initDate = options.initDate;
+          datepickerEl.attr( 'init-date', 'initDate' );
+          delete options.initDate;
+        }
+        angular.forEach(options, function( value, option ) {
+          datepickerEl.attr( cameltoDash(option), value );
+        });
+      }
+
+      scope.watchData = {};
+      angular.forEach(['minDate', 'maxDate', 'datepickerMode', 'initDate', 'shortcutPropagation'], function( key ) {
+        if ( attrs[key] ) {
+          var getAttribute = $parse(attrs[key]);
+          scope.$parent.$watch(getAttribute, function(value){
+            scope.watchData[key] = value;
+          });
+          datepickerEl.attr(cameltoDash(key), 'watchData.' + key);
+
+          // Propagate changes from datepicker to outside
+          if ( key === 'datepickerMode' ) {
+            var setAttribute = getAttribute.assign;
+            scope.$watch('watchData.' + key, function(value, oldvalue) {
+              if ( value !== oldvalue ) {
+                setAttribute(scope.$parent, value);
+              }
+            });
+          }
+        }
+      });
+      if (attrs.dateDisabled) {
+        datepickerEl.attr('date-disabled', 'dateDisabled({ date: date, mode: mode })');
+      }
+
+      if (attrs.showWeeks) {
+        datepickerEl.attr('show-weeks', attrs.showWeeks);
+      }
+
+      if (attrs.customClass){
+        datepickerEl.attr('custom-class', 'customClass({ date: date, mode: mode })');
+      }
+
+      function parseDate(viewValue) {
+        if (angular.isNumber(viewValue)) {
+          // presumably timestamp to date object
+          viewValue = new Date(viewValue);
+        }
+
+        if (!viewValue) {
+          return null;
+        } else if (angular.isDate(viewValue) && !isNaN(viewValue)) {
+          return viewValue;
+        } else if (angular.isString(viewValue)) {
+          var date = dateParser.parse(viewValue, dateFormat, scope.date) || new Date(viewValue);
+          if (isNaN(date)) {
+            return undefined;
+          } else {
+            return date;
+          }
+        } else {
+          return undefined;
+        }
+      }
+
+      function validator(modelValue, viewValue) {
+        var value = modelValue || viewValue;
+        if (angular.isNumber(value)) {
+          value = new Date(value);
+        }
+        if (!value) {
+          return true;
+        } else if (angular.isDate(value) && !isNaN(value)) {
+          return true;
+        } else if (angular.isString(value)) {
+          var date = dateParser.parse(value, dateFormat) || new Date(value);
+          return !isNaN(date);
+        } else {
+          return false;
+        }
+      }
+
+      if (!isHtml5DateInput) {
+        // Internal API to maintain the correct ng-invalid-[key] class
+        ngModel.$$parserName = 'date';
+        ngModel.$validators.date = validator;
+        ngModel.$parsers.unshift(parseDate);
+        ngModel.$formatters.push(function (value) {
+          scope.date = value;
+          return ngModel.$isEmpty(value) ? value : dateFilter(value, dateFormat);
+        });
+      }
+      else {
+        ngModel.$formatters.push(function (value) {
+          scope.date = value;
+          return value;
+        });
+      }
+
+      // Inner change
+      scope.dateSelection = function(dt) {
+        if (angular.isDefined(dt)) {
+          scope.date = dt;
+        }
+        var date = scope.date ? dateFilter(scope.date, dateFormat) : '';
+        element.val(date);
+        ngModel.$setViewValue(date);
+
+        if ( closeOnDateSelection ) {
+          scope.isOpen = false;
+          element[0].focus();
+        }
+      };
+
+      // Detect changes in the view from the text box
+      ngModel.$viewChangeListeners.push(function () {
+        scope.date = dateParser.parse(ngModel.$viewValue, dateFormat, scope.date) || new Date(ngModel.$viewValue);
+      });
+
+      var documentClickBind = function(event) {
+        if (scope.isOpen && event.target !== element[0]) {
+          scope.$apply(function() {
+            scope.isOpen = false;
+          });
+        }
+      };
+
+      var keydown = function(evt, noApply) {
+        scope.keydown(evt);
+      };
+      element.bind('keydown', keydown);
+
+      scope.keydown = function(evt) {
+        if (evt.which === 27) {
+          evt.preventDefault();
+          if (scope.isOpen) {
+            evt.stopPropagation();
+          }
+          scope.close();
+        } else if (evt.which === 40 && !scope.isOpen) {
+          scope.isOpen = true;
+        }
+      };
+
+      scope.$watch('isOpen', function(value) {
+        if (value) {
+          scope.$broadcast('datepicker.focus');
+          scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+          scope.position.top = scope.position.top + element.prop('offsetHeight');
+
+          $document.bind('click', documentClickBind);
+        } else {
+          $document.unbind('click', documentClickBind);
+        }
+      });
+
+      scope.select = function( date ) {
+        if (date === 'today') {
+          var today = new Date();
+          if (angular.isDate(scope.date)) {
+            date = new Date(scope.date);
+            date.setFullYear(today.getFullYear(), today.getMonth(), today.getDate());
+          } else {
+            date = new Date(today.setHours(0, 0, 0, 0));
+          }
+        }
+        scope.dateSelection( date );
+      };
+
+      scope.close = function() {
+        scope.isOpen = false;
+        element[0].focus();
+      };
+
+      var $popup = $compile(popupEl)(scope);
+      // Prevent jQuery cache memory leak (template is now redundant after linking)
+      popupEl.remove();
+
+      if ( appendToBody ) {
+        $document.find('body').append($popup);
+      } else {
+        element.after($popup);
+      }
+
+      scope.$on('$destroy', function() {
+        $popup.remove();
+        element.unbind('keydown', keydown);
+        $document.unbind('click', documentClickBind);
+      });
+    }
+  };
+}])
+
+.directive('datepickerPopupWrap', function() {
+  return {
+    restrict:'EA',
+    replace: true,
+    transclude: true,
+    templateUrl: 'template/datepicker/popup.html',
+    link:function (scope, element, attrs) {
+      element.bind('click', function(event) {
+        event.preventDefault();
+        event.stopPropagation();
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
+
+.constant('dropdownConfig', {
+  openClass: 'open'
+})
+
+.service('dropdownService', ['$document', '$rootScope', function($document, $rootScope) {
+  var openScope = null;
+
+  this.open = function( dropdownScope ) {
+    if ( !openScope ) {
+      $document.bind('click', closeDropdown);
+      $document.bind('keydown', escapeKeyBind);
+    }
+
+    if ( openScope && openScope !== dropdownScope ) {
+        openScope.isOpen = false;
+    }
+
+    openScope = dropdownScope;
+  };
+
+  this.close = function( dropdownScope ) {
+    if ( openScope === dropdownScope ) {
+      openScope = null;
+      $document.unbind('click', closeDropdown);
+      $document.unbind('keydown', escapeKeyBind);
+    }
+  };
+
+  var closeDropdown = function( evt ) {
+    // This method may still be called during the same mouse event that
+    // unbound this event handler. So check openScope before proceeding.
+    if (!openScope) { return; }
+
+    if( evt && openScope.getAutoClose() === 'disabled' )  { return ; }
+
+    var toggleElement = openScope.getToggleElement();
+    if ( evt && toggleElement && toggleElement[0].contains(evt.target) ) {
+        return;
+    }
+
+    var $element = openScope.getElement();
+    if( evt && openScope.getAutoClose() === 'outsideClick' && $element && $element[0].contains(evt.target) ) {
+      return;
+    }
+
+    openScope.isOpen = false;
+
+    if (!$rootScope.$$phase) {
+      openScope.$apply();
+    }
+  };
+
+  var escapeKeyBind = function( evt ) {
+    if ( evt.which === 27 ) {
+      openScope.focusToggleElement();
+      closeDropdown();
+    }
+  };
+}])
+
+.controller('DropdownController', ['$scope', '$attrs', '$parse', 'dropdownConfig', 'dropdownService', '$animate', '$position', '$document', function($scope, $attrs, $parse, dropdownConfig, dropdownService, $animate, $position, $document) {
+  var self = this,
+      scope = $scope.$new(), // create a child scope so we are not polluting original one
+      openClass = dropdownConfig.openClass,
+      getIsOpen,
+      setIsOpen = angular.noop,
+      toggleInvoker = $attrs.onToggle ? $parse($attrs.onToggle) : angular.noop,
+      appendToBody = false;
+
+  this.init = function( element ) {
+    self.$element = element;
+
+    if ( $attrs.isOpen ) {
+      getIsOpen = $parse($attrs.isOpen);
+      setIsOpen = getIsOpen.assign;
+
+      $scope.$watch(getIsOpen, function(value) {
+        scope.isOpen = !!value;
+      });
+    }
+
+    appendToBody = angular.isDefined($attrs.dropdownAppendToBody);
+
+    if ( appendToBody && self.dropdownMenu ) {
+      $document.find('body').append( self.dropdownMenu );
+      element.on('$destroy', function handleDestroyEvent() {
+        self.dropdownMenu.remove();
+      });
+    }
+  };
+
+  this.toggle = function( open ) {
+    return scope.isOpen = arguments.length ? !!open : !scope.isOpen;
+  };
+
+  // Allow other directives to watch status
+  this.isOpen = function() {
+    return scope.isOpen;
+  };
+
+  scope.getToggleElement = function() {
+    return self.toggleElement;
+  };
+
+  scope.getAutoClose = function() {
+    return $attrs.autoClose || 'always'; //or 'outsideClick' or 'disabled'
+  };
+
+  scope.getElement = function() {
+    return self.$element;
+  };
+
+  scope.focusToggleElement = function() {
+    if ( self.toggleElement ) {
+      self.toggleElement[0].focus();
+    }
+  };
+
+  scope.$watch('isOpen', function( isOpen, wasOpen ) {
+    if ( appendToBody && self.dropdownMenu ) {
+      var pos = $position.positionElements(self.$element, self.dropdownMenu, 'bottom-left', true);
+      self.dropdownMenu.css({
+        top: pos.top + 'px',
+        left: pos.left + 'px',
+        display: isOpen ? 'block' : 'none'
+      });
+    }
+
+    $animate[isOpen ? 'addClass' : 'removeClass'](self.$element, openClass);
+
+    if ( isOpen ) {
+      scope.focusToggleElement();
+      dropdownService.open( scope );
+    } else {
+      dropdownService.close( scope );
+    }
+
+    setIsOpen($scope, isOpen);
+    if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
+      toggleInvoker($scope, { open: !!isOpen });
+    }
+  });
+
+  $scope.$on('$locationChangeSuccess', function() {
+    scope.isOpen = false;
+  });
+
+  $scope.$on('$destroy', function() {
+    scope.$destroy();
+  });
+}])
+
+.directive('dropdown', function() {
+  return {
+    controller: 'DropdownController',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      dropdownCtrl.init( element );
+    }
+  };
+})
+
+.directive('dropdownMenu', function() {
+  return {
+    restrict: 'AC',
+    require: '?^dropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if ( !dropdownCtrl ) {
+        return;
+      }
+      dropdownCtrl.dropdownMenu = element;
+    }
+  };
+})
+
+.directive('dropdownToggle', function() {
+  return {
+    require: '?^dropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if ( !dropdownCtrl ) {
+        return;
+      }
+
+      dropdownCtrl.toggleElement = element;
+
+      var toggleDropdown = function(event) {
+        event.preventDefault();
+
+        if ( !element.hasClass('disabled') && !attrs.disabled ) {
+          scope.$apply(function() {
+            dropdownCtrl.toggle();
+          });
+        }
+      };
+
+      element.bind('click', toggleDropdown);
+
+      // WAI-ARIA
+      element.attr({ 'aria-haspopup': true, 'aria-expanded': false });
+      scope.$watch(dropdownCtrl.isOpen, function( isOpen ) {
+        element.attr('aria-expanded', !!isOpen);
+      });
+
+      scope.$on('$destroy', function() {
+        element.unbind('click', toggleDropdown);
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.modal', [])
+
+/**
+ * A helper, internal data structure that acts as a map but also allows getting / removing
+ * elements in the LIFO order
+ */
+  .factory('$$stackedMap', function () {
+    return {
+      createNew: function () {
+        var stack = [];
+
+        return {
+          add: function (key, value) {
+            stack.push({
+              key: key,
+              value: value
+            });
+          },
+          get: function (key) {
+            for (var i = 0; i < stack.length; i++) {
+              if (key == stack[i].key) {
+                return stack[i];
+              }
+            }
+          },
+          keys: function() {
+            var keys = [];
+            for (var i = 0; i < stack.length; i++) {
+              keys.push(stack[i].key);
+            }
+            return keys;
+          },
+          top: function () {
+            return stack[stack.length - 1];
+          },
+          remove: function (key) {
+            var idx = -1;
+            for (var i = 0; i < stack.length; i++) {
+              if (key == stack[i].key) {
+                idx = i;
+                break;
+              }
+            }
+            return stack.splice(idx, 1)[0];
+          },
+          removeTop: function () {
+            return stack.splice(stack.length - 1, 1)[0];
+          },
+          length: function () {
+            return stack.length;
+          }
+        };
+      }
+    };
+  })
+
+/**
+ * A helper directive for the $modal service. It creates a backdrop element.
+ */
+  .directive('modalBackdrop', ['$timeout', function ($timeout) {
+    return {
+      restrict: 'EA',
+      replace: true,
+      templateUrl: 'template/modal/backdrop.html',
+      compile: function (tElement, tAttrs) {
+        tElement.addClass(tAttrs.backdropClass);
+        return linkFn;
+      }
+    };
+
+    function linkFn(scope, element, attrs) {
+      scope.animate = false;
+
+      //trigger CSS transitions
+      $timeout(function () {
+        scope.animate = true;
+      });
+    }
+  }])
+
+  .directive('modalWindow', ['$modalStack', '$q', function ($modalStack, $q) {
+    return {
+      restrict: 'EA',
+      scope: {
+        index: '@',
+        animate: '='
+      },
+      replace: true,
+      transclude: true,
+      templateUrl: function(tElement, tAttrs) {
+        return tAttrs.templateUrl || 'template/modal/window.html';
+      },
+      link: function (scope, element, attrs) {
+        element.addClass(attrs.windowClass || '');
+        scope.size = attrs.size;
+
+        scope.close = function (evt) {
+          var modal = $modalStack.getTop();
+          if (modal && modal.value.backdrop && modal.value.backdrop != 'static' && (evt.target === evt.currentTarget)) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            $modalStack.dismiss(modal.key, 'backdrop click');
+          }
+        };
+
+        // This property is only added to the scope for the purpose of detecting when this directive is rendered.
+        // We can detect that by using this property in the template associated with this directive and then use
+        // {@link Attribute#$observe} on it. For more details please see {@link TableColumnResize}.
+        scope.$isRendered = true;
+
+        // Deferred object that will be resolved when this modal is render.
+        var modalRenderDeferObj = $q.defer();
+        // Observe function will be called on next digest cycle after compilation, ensuring that the DOM is ready.
+        // In order to use this way of finding whether DOM is ready, we need to observe a scope property used in modal's template.
+        attrs.$observe('modalRender', function (value) {
+          if (value == 'true') {
+            modalRenderDeferObj.resolve();
+          }
+        });
+
+        modalRenderDeferObj.promise.then(function () {
+          // trigger CSS transitions
+          scope.animate = true;
+
+          var inputsWithAutofocus = element[0].querySelectorAll('[autofocus]');
+          /**
+           * Auto-focusing of a freshly-opened modal element causes any child elements
+           * with the autofocus attribute to lose focus. This is an issue on touch
+           * based devices which will show and then hide the onscreen keyboard.
+           * Attempts to refocus the autofocus element via JavaScript will not reopen
+           * the onscreen keyboard. Fixed by updated the focusing logic to only autofocus
+           * the modal element if the modal does not contain an autofocus element.
+           */
+          if (inputsWithAutofocus.length) {
+            inputsWithAutofocus[0].focus();
+          } else {
+            element[0].focus();
+          }
+
+          // Notify {@link $modalStack} that modal is rendered.
+          var modal = $modalStack.getTop();
+          if (modal) {
+            $modalStack.modalRendered(modal.key);
+          }
+        });
+      }
+    };
+  }])
+
+  .directive('modalAnimationClass', [
+    function () {
+      return {
+        compile: function (tElement, tAttrs) {
+          if (tAttrs.modalAnimation) {
+            tElement.addClass(tAttrs.modalAnimationClass);
+          }
+        }
+      };
+    }])
+
+  .directive('modalTransclude', function () {
+    return {
+      link: function($scope, $element, $attrs, controller, $transclude) {
+        $transclude($scope.$parent, function(clone) {
+          $element.empty();
+          $element.append(clone);
+        });
+      }
+    };
+  })
+
+  .factory('$modalStack', ['$animate', '$timeout', '$document', '$compile', '$rootScope', '$$stackedMap',
+    function ($animate, $timeout, $document, $compile, $rootScope, $$stackedMap) {
+
+      var OPENED_MODAL_CLASS = 'modal-open';
+
+      var backdropDomEl, backdropScope;
+      var openedWindows = $$stackedMap.createNew();
+      var $modalStack = {};
+
+      function backdropIndex() {
+        var topBackdropIndex = -1;
+        var opened = openedWindows.keys();
+        for (var i = 0; i < opened.length; i++) {
+          if (openedWindows.get(opened[i]).value.backdrop) {
+            topBackdropIndex = i;
+          }
+        }
+        return topBackdropIndex;
+      }
+
+      $rootScope.$watch(backdropIndex, function(newBackdropIndex){
+        if (backdropScope) {
+          backdropScope.index = newBackdropIndex;
+        }
+      });
+
+      function removeModalWindow(modalInstance) {
+
+        var body = $document.find('body').eq(0);
+        var modalWindow = openedWindows.get(modalInstance).value;
+
+        //clean up the stack
+        openedWindows.remove(modalInstance);
+
+        //remove window DOM element
+        removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
+          body.toggleClass(OPENED_MODAL_CLASS, openedWindows.length() > 0);
+          checkRemoveBackdrop();
+        });
+      }
+
+      function checkRemoveBackdrop() {
+          //remove backdrop if no longer needed
+          if (backdropDomEl && backdropIndex() == -1) {
+            var backdropScopeRef = backdropScope;
+            removeAfterAnimate(backdropDomEl, backdropScope, function () {
+              backdropScopeRef = null;
+            });
+            backdropDomEl = undefined;
+            backdropScope = undefined;
+          }
+      }
+
+      function removeAfterAnimate(domEl, scope, done) {
+        // Closing animation
+        scope.animate = false;
+
+        if (domEl.attr('modal-animation') && $animate.enabled()) {
+          // transition out
+          domEl.one('$animate:close', function closeFn() {
+            $rootScope.$evalAsync(afterAnimating);
+          });
+        } else {
+          // Ensure this call is async
+          $timeout(afterAnimating);
+        }
+
+        function afterAnimating() {
+          if (afterAnimating.done) {
+            return;
+          }
+          afterAnimating.done = true;
+
+          domEl.remove();
+          scope.$destroy();
+          if (done) {
+            done();
+          }
+        }
+      }
+
+      $document.bind('keydown', function (evt) {
+        var modal;
+
+        if (evt.which === 27) {
+          modal = openedWindows.top();
+          if (modal && modal.value.keyboard) {
+            evt.preventDefault();
+            $rootScope.$apply(function () {
+              $modalStack.dismiss(modal.key, 'escape key press');
+            });
+          }
+        }
+      });
+
+      $modalStack.open = function (modalInstance, modal) {
+
+        var modalOpener = $document[0].activeElement;
+
+        openedWindows.add(modalInstance, {
+          deferred: modal.deferred,
+          renderDeferred: modal.renderDeferred,
+          modalScope: modal.scope,
+          backdrop: modal.backdrop,
+          keyboard: modal.keyboard
+        });
+
+        var body = $document.find('body').eq(0),
+            currBackdropIndex = backdropIndex();
+
+        if (currBackdropIndex >= 0 && !backdropDomEl) {
+          backdropScope = $rootScope.$new(true);
+          backdropScope.index = currBackdropIndex;
+          var angularBackgroundDomEl = angular.element('<div modal-backdrop="modal-backdrop"></div>');
+          angularBackgroundDomEl.attr('backdrop-class', modal.backdropClass);
+          if (modal.animation) {
+            angularBackgroundDomEl.attr('modal-animation', 'true');
+          }
+          backdropDomEl = $compile(angularBackgroundDomEl)(backdropScope);
+          body.append(backdropDomEl);
+        }
+
+        var angularDomEl = angular.element('<div modal-window="modal-window"></div>');
+        angularDomEl.attr({
+          'template-url': modal.windowTemplateUrl,
+          'window-class': modal.windowClass,
+          'size': modal.size,
+          'index': openedWindows.length() - 1,
+          'animate': 'animate'
+        }).html(modal.content);
+        if (modal.animation) {
+          angularDomEl.attr('modal-animation', 'true');
+        }
+
+        var modalDomEl = $compile(angularDomEl)(modal.scope);
+        openedWindows.top().value.modalDomEl = modalDomEl;
+        openedWindows.top().value.modalOpener = modalOpener;
+        body.append(modalDomEl);
+        body.addClass(OPENED_MODAL_CLASS);
+      };
+
+      function broadcastClosing(modalWindow, resultOrReason, closing) {
+          return !modalWindow.value.modalScope.$broadcast('modal.closing', resultOrReason, closing).defaultPrevented;
+      }
+
+      $modalStack.close = function (modalInstance, result) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, result, true)) {
+          modalWindow.value.deferred.resolve(result);
+          removeModalWindow(modalInstance);
+          modalWindow.value.modalOpener.focus();
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismiss = function (modalInstance, reason) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, reason, false)) {
+          modalWindow.value.deferred.reject(reason);
+          removeModalWindow(modalInstance);
+          modalWindow.value.modalOpener.focus();
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismissAll = function (reason) {
+        var topModal = this.getTop();
+        while (topModal && this.dismiss(topModal.key, reason)) {
+          topModal = this.getTop();
+        }
+      };
+
+      $modalStack.getTop = function () {
+        return openedWindows.top();
+      };
+
+      $modalStack.modalRendered = function (modalInstance) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow) {
+          modalWindow.value.renderDeferred.resolve();
+        }
+      };
+
+      return $modalStack;
+    }])
+
+  .provider('$modal', function () {
+
+    var $modalProvider = {
+      options: {
+        animation: true,
+        backdrop: true, //can also be false or 'static'
+        keyboard: true
+      },
+      $get: ['$injector', '$rootScope', '$q', '$templateRequest', '$controller', '$modalStack',
+        function ($injector, $rootScope, $q, $templateRequest, $controller, $modalStack) {
+
+          var $modal = {};
+
+          function getTemplatePromise(options) {
+            return options.template ? $q.when(options.template) :
+              $templateRequest(angular.isFunction(options.templateUrl) ? (options.templateUrl)() : options.templateUrl);
+          }
+
+          function getResolvePromises(resolves) {
+            var promisesArr = [];
+            angular.forEach(resolves, function (value) {
+              if (angular.isFunction(value) || angular.isArray(value)) {
+                promisesArr.push($q.when($injector.invoke(value)));
+              }
+            });
+            return promisesArr;
+          }
+
+          $modal.open = function (modalOptions) {
+
+            var modalResultDeferred = $q.defer();
+            var modalOpenedDeferred = $q.defer();
+            var modalRenderDeferred = $q.defer();
+
+            //prepare an instance of a modal to be injected into controllers and returned to a caller
+            var modalInstance = {
+              result: modalResultDeferred.promise,
+              opened: modalOpenedDeferred.promise,
+              rendered: modalRenderDeferred.promise,
+              close: function (result) {
+                return $modalStack.close(modalInstance, result);
+              },
+              dismiss: function (reason) {
+                return $modalStack.dismiss(modalInstance, reason);
+              }
+            };
+
+            //merge and clean up options
+            modalOptions = angular.extend({}, $modalProvider.options, modalOptions);
+            modalOptions.resolve = modalOptions.resolve || {};
+
+            //verify options
+            if (!modalOptions.template && !modalOptions.templateUrl) {
+              throw new Error('One of template or templateUrl options is required.');
+            }
+
+            var templateAndResolvePromise =
+              $q.all([getTemplatePromise(modalOptions)].concat(getResolvePromises(modalOptions.resolve)));
+
+
+            templateAndResolvePromise.then(function resolveSuccess(tplAndVars) {
+
+              var modalScope = (modalOptions.scope || $rootScope).$new();
+              modalScope.$close = modalInstance.close;
+              modalScope.$dismiss = modalInstance.dismiss;
+
+              var ctrlInstance, ctrlLocals = {};
+              var resolveIter = 1;
+
+              //controllers
+              if (modalOptions.controller) {
+                ctrlLocals.$scope = modalScope;
+                ctrlLocals.$modalInstance = modalInstance;
+                angular.forEach(modalOptions.resolve, function (value, key) {
+                  ctrlLocals[key] = tplAndVars[resolveIter++];
+                });
+
+                ctrlInstance = $controller(modalOptions.controller, ctrlLocals);
+                if (modalOptions.controllerAs) {
+                  modalScope[modalOptions.controllerAs] = ctrlInstance;
+                }
+              }
+
+              $modalStack.open(modalInstance, {
+                scope: modalScope,
+                deferred: modalResultDeferred,
+                renderDeferred: modalRenderDeferred,
+                content: tplAndVars[0],
+                animation: modalOptions.animation,
+                backdrop: modalOptions.backdrop,
+                keyboard: modalOptions.keyboard,
+                backdropClass: modalOptions.backdropClass,
+                windowClass: modalOptions.windowClass,
+                windowTemplateUrl: modalOptions.windowTemplateUrl,
+                size: modalOptions.size
+              });
+
+            }, function resolveError(reason) {
+              modalResultDeferred.reject(reason);
+            });
+
+            templateAndResolvePromise.then(function () {
+              modalOpenedDeferred.resolve(true);
+            }, function (reason) {
+              modalOpenedDeferred.reject(reason);
+            });
+
+            return modalInstance;
+          };
+
+          return $modal;
+        }]
+    };
+
+    return $modalProvider;
+  });
+
+angular.module('ui.bootstrap.pagination', [])
+
+.controller('PaginationController', ['$scope', '$attrs', '$parse', function ($scope, $attrs, $parse) {
+  var self = this,
+      ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl
+      setNumPages = $attrs.numPages ? $parse($attrs.numPages).assign : angular.noop;
+
+  this.init = function(ngModelCtrl_, config) {
+    ngModelCtrl = ngModelCtrl_;
+    this.config = config;
+
+    ngModelCtrl.$render = function() {
+      self.render();
+    };
+
+    if ($attrs.itemsPerPage) {
+      $scope.$parent.$watch($parse($attrs.itemsPerPage), function(value) {
+        self.itemsPerPage = parseInt(value, 10);
+        $scope.totalPages = self.calculateTotalPages();
+      });
+    } else {
+      this.itemsPerPage = config.itemsPerPage;
+    }
+
+    $scope.$watch('totalItems', function() {
+      $scope.totalPages = self.calculateTotalPages();
+    });
+
+    $scope.$watch('totalPages', function(value) {
+      setNumPages($scope.$parent, value); // Readonly variable
+
+      if ( $scope.page > value ) {
+        $scope.selectPage(value);
+      } else {
+        ngModelCtrl.$render();
+      }
+    });
+  };
+
+  this.calculateTotalPages = function() {
+    var totalPages = this.itemsPerPage < 1 ? 1 : Math.ceil($scope.totalItems / this.itemsPerPage);
+    return Math.max(totalPages || 0, 1);
+  };
+
+  this.render = function() {
+    $scope.page = parseInt(ngModelCtrl.$viewValue, 10) || 1;
+  };
+
+  $scope.selectPage = function(page, evt) {
+    if ( $scope.page !== page && page > 0 && page <= $scope.totalPages) {
+      if (evt && evt.target) {
+        evt.target.blur();
+      }
+      ngModelCtrl.$setViewValue(page);
+      ngModelCtrl.$render();
+    }
+  };
+
+  $scope.getText = function( key ) {
+    return $scope[key + 'Text'] || self.config[key + 'Text'];
+  };
+  $scope.noPrevious = function() {
+    return $scope.page === 1;
+  };
+  $scope.noNext = function() {
+    return $scope.page === $scope.totalPages;
+  };
+}])
+
+.constant('paginationConfig', {
+  itemsPerPage: 10,
+  boundaryLinks: false,
+  directionLinks: true,
+  firstText: 'First',
+  previousText: 'Previous',
+  nextText: 'Next',
+  lastText: 'Last',
+  rotate: true
+})
+
+.directive('pagination', ['$parse', 'paginationConfig', function($parse, paginationConfig) {
+  return {
+    restrict: 'EA',
+    scope: {
+      totalItems: '=',
+      firstText: '@',
+      previousText: '@',
+      nextText: '@',
+      lastText: '@'
+    },
+    require: ['pagination', '?ngModel'],
+    controller: 'PaginationController',
+    templateUrl: 'template/pagination/pagination.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+         return; // do nothing if no ng-model
+      }
+
+      // Setup configuration parameters
+      var maxSize = angular.isDefined(attrs.maxSize) ? scope.$parent.$eval(attrs.maxSize) : paginationConfig.maxSize,
+          rotate = angular.isDefined(attrs.rotate) ? scope.$parent.$eval(attrs.rotate) : paginationConfig.rotate;
+      scope.boundaryLinks = angular.isDefined(attrs.boundaryLinks) ? scope.$parent.$eval(attrs.boundaryLinks) : paginationConfig.boundaryLinks;
+      scope.directionLinks = angular.isDefined(attrs.directionLinks) ? scope.$parent.$eval(attrs.directionLinks) : paginationConfig.directionLinks;
+
+      paginationCtrl.init(ngModelCtrl, paginationConfig);
+
+      if (attrs.maxSize) {
+        scope.$parent.$watch($parse(attrs.maxSize), function(value) {
+          maxSize = parseInt(value, 10);
+          paginationCtrl.render();
+        });
+      }
+
+      // Create page object used in template
+      function makePage(number, text, isActive) {
+        return {
+          number: number,
+          text: text,
+          active: isActive
+        };
+      }
+
+      function getPages(currentPage, totalPages) {
+        var pages = [];
+
+        // Default page limits
+        var startPage = 1, endPage = totalPages;
+        var isMaxSized = ( angular.isDefined(maxSize) && maxSize < totalPages );
+
+        // recompute if maxSize
+        if ( isMaxSized ) {
+          if ( rotate ) {
+            // Current page is displayed in the middle of the visible ones
+            startPage = Math.max(currentPage - Math.floor(maxSize/2), 1);
+            endPage   = startPage + maxSize - 1;
+
+            // Adjust if limit is exceeded
+            if (endPage > totalPages) {
+              endPage   = totalPages;
+              startPage = endPage - maxSize + 1;
+            }
+          } else {
+            // Visible pages are paginated with maxSize
+            startPage = ((Math.ceil(currentPage / maxSize) - 1) * maxSize) + 1;
+
+            // Adjust last page if limit is exceeded
+            endPage = Math.min(startPage + maxSize - 1, totalPages);
+          }
+        }
+
+        // Add page number links
+        for (var number = startPage; number <= endPage; number++) {
+          var page = makePage(number, number, number === currentPage);
+          pages.push(page);
+        }
+
+        // Add links to move between page sets
+        if ( isMaxSized && ! rotate ) {
+          if ( startPage > 1 ) {
+            var previousPageSet = makePage(startPage - 1, '...', false);
+            pages.unshift(previousPageSet);
+          }
+
+          if ( endPage < totalPages ) {
+            var nextPageSet = makePage(endPage + 1, '...', false);
+            pages.push(nextPageSet);
+          }
+        }
+
+        return pages;
+      }
+
+      var originalRender = paginationCtrl.render;
+      paginationCtrl.render = function() {
+        originalRender();
+        if (scope.page > 0 && scope.page <= scope.totalPages) {
+          scope.pages = getPages(scope.page, scope.totalPages);
+        }
+      };
+    }
+  };
+}])
+
+.constant('pagerConfig', {
+  itemsPerPage: 10,
+  previousText: '« Previous',
+  nextText: 'Next »',
+  align: true
+})
+
+.directive('pager', ['pagerConfig', function(pagerConfig) {
+  return {
+    restrict: 'EA',
+    scope: {
+      totalItems: '=',
+      previousText: '@',
+      nextText: '@'
+    },
+    require: ['pager', '?ngModel'],
+    controller: 'PaginationController',
+    templateUrl: 'template/pagination/pager.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+         return; // do nothing if no ng-model
+      }
+
+      scope.align = angular.isDefined(attrs.align) ? scope.$parent.$eval(attrs.align) : pagerConfig.align;
+      paginationCtrl.init(ngModelCtrl, pagerConfig);
+    }
+  };
+}]);
+
+/**
+ * The following features are still outstanding: animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, html tooltips, and selector delegation.
+ */
+angular.module( 'ui.bootstrap.tooltip', [ 'ui.bootstrap.position', 'ui.bootstrap.bindHtml' ] )
+
+/**
+ * The $tooltip service creates tooltip- and popover-like directives as well as
+ * houses global options for them.
+ */
+.provider( '$tooltip', function () {
+  // The default options tooltip and popover.
+  var defaultOptions = {
+    placement: 'top',
+    animation: true,
+    popupDelay: 0,
+    useContentExp: false
+  };
+
+  // Default hide triggers for each show trigger
+  var triggerMap = {
+    'mouseenter': 'mouseleave',
+    'click': 'click',
+    'focus': 'blur'
+  };
+
+  // The options specified to the provider globally.
+  var globalOptions = {};
+
+  /**
+   * `options({})` allows global configuration of all tooltips in the
+   * application.
+   *
+   *   var app = angular.module( 'App', ['ui.bootstrap.tooltip'], function( $tooltipProvider ) {
+   *     // place tooltips left instead of top by default
+   *     $tooltipProvider.options( { placement: 'left' } );
+   *   });
+   */
+	this.options = function( value ) {
+		angular.extend( globalOptions, value );
+	};
+
+  /**
+   * This allows you to extend the set of trigger mappings available. E.g.:
+   *
+   *   $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' );
+   */
+  this.setTriggers = function setTriggers ( triggers ) {
+    angular.extend( triggerMap, triggers );
+  };
+
+  /**
+   * This is a helper function for translating camel-case to snake-case.
+   */
+  function snake_case(name){
+    var regexp = /[A-Z]/g;
+    var separator = '-';
+    return name.replace(regexp, function(letter, pos) {
+      return (pos ? separator : '') + letter.toLowerCase();
+    });
+  }
+
+  /**
+   * Returns the actual instance of the $tooltip service.
+   * TODO support multiple triggers
+   */
+  this.$get = [ '$window', '$compile', '$timeout', '$document', '$position', '$interpolate', function ( $window, $compile, $timeout, $document, $position, $interpolate ) {
+    return function $tooltip ( type, prefix, defaultTriggerShow, options ) {
+      options = angular.extend( {}, defaultOptions, globalOptions, options );
+
+      /**
+       * Returns an object of show and hide triggers.
+       *
+       * If a trigger is supplied,
+       * it is used to show the tooltip; otherwise, it will use the `trigger`
+       * option passed to the `$tooltipProvider.options` method; else it will
+       * default to the trigger supplied to this directive factory.
+       *
+       * The hide trigger is based on the show trigger. If the `trigger` option
+       * was passed to the `$tooltipProvider.options` method, it will use the
+       * mapped trigger from `triggerMap` or the passed trigger if the map is
+       * undefined; otherwise, it uses the `triggerMap` value of the show
+       * trigger; else it will just use the show trigger.
+       */
+      function getTriggers ( trigger ) {
+        var show = trigger || options.trigger || defaultTriggerShow;
+        var hide = triggerMap[show] || show;
+        return {
+          show: show,
+          hide: hide
+        };
+      }
+
+      var directiveName = snake_case( type );
+
+      var startSym = $interpolate.startSymbol();
+      var endSym = $interpolate.endSymbol();
+      var template =
+        '<div '+ directiveName +'-popup '+
+          'title="'+startSym+'title'+endSym+'" '+
+          (options.useContentExp ?
+            'content-exp="contentExp()" ' :
+            'content="'+startSym+'content'+endSym+'" ') +
+          'placement="'+startSym+'placement'+endSym+'" '+
+          'popup-class="'+startSym+'popupClass'+endSym+'" '+
+          'animation="animation" '+
+          'is-open="isOpen"'+
+          'origin-scope="origScope" '+
+          '>'+
+        '</div>';
+
+      return {
+        restrict: 'EA',
+        compile: function (tElem, tAttrs) {
+          var tooltipLinker = $compile( template );
+
+          return function link ( scope, element, attrs, tooltipCtrl ) {
+            var tooltip;
+            var tooltipLinkedScope;
+            var transitionTimeout;
+            var popupTimeout;
+            var appendToBody = angular.isDefined( options.appendToBody ) ? options.appendToBody : false;
+            var triggers = getTriggers( undefined );
+            var hasEnableExp = angular.isDefined(attrs[prefix+'Enable']);
+            var ttScope = scope.$new(true);
+
+            var positionTooltip = function () {
+              if (!tooltip) { return; }
+
+              var ttPosition = $position.positionElements(element, tooltip, ttScope.placement, appendToBody);
+              ttPosition.top += 'px';
+              ttPosition.left += 'px';
+
+              // Now set the calculated positioning.
+              tooltip.css( ttPosition );
+            };
+
+            // Set up the correct scope to allow transclusion later
+            ttScope.origScope = scope;
+
+            // By default, the tooltip is not open.
+            // TODO add ability to start tooltip opened
+            ttScope.isOpen = false;
+
+            function toggleTooltipBind () {
+              if ( ! ttScope.isOpen ) {
+                showTooltipBind();
+              } else {
+                hideTooltipBind();
+              }
+            }
+
+            // Show the tooltip with delay if specified, otherwise show it immediately
+            function showTooltipBind() {
+              if(hasEnableExp && !scope.$eval(attrs[prefix+'Enable'])) {
+                return;
+              }
+
+              prepareTooltip();
+
+              if ( ttScope.popupDelay ) {
+                // Do nothing if the tooltip was already scheduled to pop-up.
+                // This happens if show is triggered multiple times before any hide is triggered.
+                if (!popupTimeout) {
+                  popupTimeout = $timeout( show, ttScope.popupDelay, false );
+                  popupTimeout.then(function(reposition){reposition();});
+                }
+              } else {
+                show()();
+              }
+            }
+
+            function hideTooltipBind () {
+              scope.$apply(function () {
+                hide();
+              });
+            }
+
+            // Show the tooltip popup element.
+            function show() {
+
+              popupTimeout = null;
+
+              // If there is a pending remove transition, we must cancel it, lest the
+              // tooltip be mysteriously removed.
+              if ( transitionTimeout ) {
+                $timeout.cancel( transitionTimeout );
+                transitionTimeout = null;
+              }
+
+              // Don't show empty tooltips.
+              if ( !(options.useContentExp ? ttScope.contentExp() : ttScope.content) ) {
+                return angular.noop;
+              }
+
+              createTooltip();
+
+              // Set the initial positioning.
+              tooltip.css({ top: 0, left: 0, display: 'block' });
+              ttScope.$digest();
+
+              positionTooltip();
+
+              // And show the tooltip.
+              ttScope.isOpen = true;
+              ttScope.$apply(); // digest required as $apply is not called
+
+              // Return positioning function as promise callback for correct
+              // positioning after draw.
+              return positionTooltip;
+            }
+
+            // Hide the tooltip popup element.
+            function hide() {
+              // First things first: we don't show it anymore.
+              ttScope.isOpen = false;
+
+              //if tooltip is going to be shown after delay, we must cancel this
+              $timeout.cancel( popupTimeout );
+              popupTimeout = null;
+
+              // And now we remove it from the DOM. However, if we have animation, we
+              // need to wait for it to expire beforehand.
+              // FIXME: this is a placeholder for a port of the transitions library.
+              if ( ttScope.animation ) {
+                if (!transitionTimeout) {
+                  transitionTimeout = $timeout(removeTooltip, 500);
+                }
+              } else {
+                removeTooltip();
+              }
+            }
+
+            function createTooltip() {
+              // There can only be one tooltip element per directive shown at once.
+              if (tooltip) {
+                removeTooltip();
+              }
+              tooltipLinkedScope = ttScope.$new();
+              tooltip = tooltipLinker(tooltipLinkedScope, function (tooltip) {
+                if ( appendToBody ) {
+                  $document.find( 'body' ).append( tooltip );
+                } else {
+                  element.after( tooltip );
+                }
+              });
+
+              tooltipLinkedScope.$watch(function () {
+                $timeout(positionTooltip, 0, false);
+              });
+
+              if (options.useContentExp) {
+                tooltipLinkedScope.$watch('contentExp()', function (val) {
+                  if (!val && ttScope.isOpen ) {
+                    hide();
+                  }
+                });
+              }
+            }
+
+            function removeTooltip() {
+              transitionTimeout = null;
+              if (tooltip) {
+                tooltip.remove();
+                tooltip = null;
+              }
+              if (tooltipLinkedScope) {
+                tooltipLinkedScope.$destroy();
+                tooltipLinkedScope = null;
+              }
+            }
+
+            function prepareTooltip() {
+              prepPopupClass();
+              prepPlacement();
+              prepPopupDelay();
+            }
+
+            ttScope.contentExp = function () {
+              return scope.$eval(attrs[type]);
+            };
+
+            /**
+             * Observe the relevant attributes.
+             */
+            if (!options.useContentExp) {
+              attrs.$observe( type, function ( val ) {
+                ttScope.content = val;
+
+                if (!val && ttScope.isOpen ) {
+                  hide();
+                }
+              });
+            }
+
+            attrs.$observe( 'disabled', function ( val ) {
+              if (val && ttScope.isOpen ) {
+                hide();
+              }
+            });
+
+            attrs.$observe( prefix+'Title', function ( val ) {
+              ttScope.title = val;
+            });
+
+            function prepPopupClass() {
+              ttScope.popupClass = attrs[prefix + 'Class'];
+            }
+
+            function prepPlacement() {
+              var val = attrs[ prefix + 'Placement' ];
+              ttScope.placement = angular.isDefined( val ) ? val : options.placement;
+            }
+
+            function prepPopupDelay() {
+              var val = attrs[ prefix + 'PopupDelay' ];
+              var delay = parseInt( val, 10 );
+              ttScope.popupDelay = ! isNaN(delay) ? delay : options.popupDelay;
+            }
+
+            var unregisterTriggers = function () {
+              element.unbind(triggers.show, showTooltipBind);
+              element.unbind(triggers.hide, hideTooltipBind);
+            };
+
+            function prepTriggers() {
+              var val = attrs[ prefix + 'Trigger' ];
+              unregisterTriggers();
+
+              triggers = getTriggers( val );
+
+              if ( triggers.show === triggers.hide ) {
+                element.bind( triggers.show, toggleTooltipBind );
+              } else {
+                element.bind( triggers.show, showTooltipBind );
+                element.bind( triggers.hide, hideTooltipBind );
+              }
+            }
+            prepTriggers();
+
+            var animation = scope.$eval(attrs[prefix + 'Animation']);
+            ttScope.animation = angular.isDefined(animation) ? !!animation : options.animation;
+
+            var appendToBodyVal = scope.$eval(attrs[prefix + 'AppendToBody']);
+            appendToBody = angular.isDefined(appendToBodyVal) ? appendToBodyVal : appendToBody;
+
+            // if a tooltip is attached to <body> we need to remove it on
+            // location change as its parent scope will probably not be destroyed
+            // by the change.
+            if ( appendToBody ) {
+              scope.$on('$locationChangeSuccess', function closeTooltipOnLocationChangeSuccess () {
+              if ( ttScope.isOpen ) {
+                hide();
+              }
+            });
+            }
+
+            // Make sure tooltip is destroyed and removed.
+            scope.$on('$destroy', function onDestroyTooltip() {
+              $timeout.cancel( transitionTimeout );
+              $timeout.cancel( popupTimeout );
+              unregisterTriggers();
+              removeTooltip();
+              ttScope = null;
+            });
+          };
+        }
+      };
+    };
+  }];
+})
+
+// This is mostly ngInclude code but with a custom scope
+.directive( 'tooltipTemplateTransclude', [
+         '$animate', '$sce', '$compile', '$templateRequest',
+function ($animate ,  $sce ,  $compile ,  $templateRequest) {
+  return {
+    link: function ( scope, elem, attrs ) {
+      var origScope = scope.$eval(attrs.tooltipTemplateTranscludeScope);
+
+      var changeCounter = 0,
+        currentScope,
+        previousElement,
+        currentElement;
+
+      var cleanupLastIncludeContent = function() {
+        if (previousElement) {
+          previousElement.remove();
+          previousElement = null;
+        }
+        if (currentScope) {
+          currentScope.$destroy();
+          currentScope = null;
+        }
+        if (currentElement) {
+          $animate.leave(currentElement).then(function() {
+            previousElement = null;
+          });
+          previousElement = currentElement;
+          currentElement = null;
+        }
+      };
+
+      scope.$watch($sce.parseAsResourceUrl(attrs.tooltipTemplateTransclude), function (src) {
+        var thisChangeId = ++changeCounter;
+
+        if (src) {
+          //set the 2nd param to true to ignore the template request error so that the inner
+          //contents and scope can be cleaned up.
+          $templateRequest(src, true).then(function(response) {
+            if (thisChangeId !== changeCounter) { return; }
+            var newScope = origScope.$new();
+            var template = response;
+
+            var clone = $compile(template)(newScope, function(clone) {
+              cleanupLastIncludeContent();
+              $animate.enter(clone, elem);
+            });
+
+            currentScope = newScope;
+            currentElement = clone;
+
+            currentScope.$emit('$includeContentLoaded', src);
+          }, function() {
+            if (thisChangeId === changeCounter) {
+              cleanupLastIncludeContent();
+              scope.$emit('$includeContentError', src);
+            }
+          });
+          scope.$emit('$includeContentRequested', src);
+        } else {
+          cleanupLastIncludeContent();
+        }
+      });
+
+      scope.$on('$destroy', cleanupLastIncludeContent);
+    }
+  };
+}])
+
+/**
+ * Note that it's intentional that these classes are *not* applied through $animate.
+ * They must not be animated as they're expected to be present on the tooltip on
+ * initialization.
+ */
+.directive('tooltipClasses', function () {
+  return {
+    restrict: 'A',
+    link: function (scope, element, attrs) {
+      if (scope.placement) {
+        element.addClass(scope.placement);
+      }
+      if (scope.popupClass) {
+        element.addClass(scope.popupClass);
+      }
+      if (scope.animation()) {
+        element.addClass(attrs.tooltipAnimationClass);
+      }
+    }
+  };
+})
+
+.directive( 'tooltipPopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/tooltip/tooltip-popup.html'
+  };
+})
+
+.directive( 'tooltip', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip( 'tooltip', 'tooltip', 'mouseenter' );
+}])
+
+.directive( 'tooltipTemplatePopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'template/tooltip/tooltip-template-popup.html'
+  };
+})
+
+.directive( 'tooltipTemplate', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip('tooltipTemplate', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}])
+
+.directive( 'tooltipHtmlPopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/tooltip/tooltip-html-popup.html'
+  };
+})
+
+.directive( 'tooltipHtml', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip('tooltipHtml', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}])
+
+/*
+Deprecated
+*/
+.directive( 'tooltipHtmlUnsafePopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/tooltip/tooltip-html-unsafe-popup.html'
+  };
+})
+
+.value('tooltipHtmlUnsafeSuppressDeprecated', false)
+.directive( 'tooltipHtmlUnsafe', [
+          '$tooltip', 'tooltipHtmlUnsafeSuppressDeprecated', '$log',
+function ( $tooltip ,  tooltipHtmlUnsafeSuppressDeprecated ,  $log) {
+  if (!tooltipHtmlUnsafeSuppressDeprecated) {
+    $log.warn('tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead.');
+  }
+  return $tooltip( 'tooltipHtmlUnsafe', 'tooltip', 'mouseenter' );
+}]);
+
+/**
+ * The following features are still outstanding: popup delay, animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, html popovers, and selector delegatation.
+ */
+angular.module( 'ui.bootstrap.popover', [ 'ui.bootstrap.tooltip' ] )
+
+.directive( 'popoverTemplatePopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { title: '@', contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'template/popover/popover-template.html'
+  };
+})
+
+.directive( 'popoverTemplate', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip( 'popoverTemplate', 'popover', 'click', {
+    useContentExp: true
+  } );
+}])
+
+.directive( 'popoverPopup', function () {
+  return {
+    restrict: 'EA',
+    replace: true,
+    scope: { title: '@', content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'template/popover/popover.html'
+  };
+})
+
+.directive( 'popover', [ '$tooltip', function ( $tooltip ) {
+  return $tooltip( 'popover', 'popover', 'click' );
+}]);
+
+angular.module('ui.bootstrap.progressbar', [])
+
+.constant('progressConfig', {
+  animate: true,
+  max: 100
+})
+
+.controller('ProgressController', ['$scope', '$attrs', 'progressConfig', function($scope, $attrs, progressConfig) {
+    var self = this,
+        animate = angular.isDefined($attrs.animate) ? $scope.$parent.$eval($attrs.animate) : progressConfig.animate;
+
+    this.bars = [];
+    $scope.max = angular.isDefined($scope.max) ? $scope.max : progressConfig.max;
+
+    this.addBar = function(bar, element) {
+        if ( !animate ) {
+            element.css({'transition': 'none'});
+        }
+
+        this.bars.push(bar);
+
+        bar.$watch('value', function( value ) {
+            bar.percent = +(100 * value / $scope.max).toFixed(2);
+        });
+
+        bar.$on('$destroy', function() {
+            element = null;
+            self.removeBar(bar);
+        });
+    };
+
+    this.removeBar = function(bar) {
+        this.bars.splice(this.bars.indexOf(bar), 1);
+    };
+}])
+
+.directive('progress', function() {
+    return {
+        restrict: 'EA',
+        replace: true,
+        transclude: true,
+        controller: 'ProgressController',
+        require: 'progress',
+        scope: {},
+        templateUrl: 'template/progressbar/progress.html'
+    };
+})
+
+.directive('bar', function() {
+    return {
+        restrict: 'EA',
+        replace: true,
+        transclude: true,
+        require: '^progress',
+        scope: {
+            value: '=',
+            max: '=?',
+            type: '@'
+        },
+        templateUrl: 'template/progressbar/bar.html',
+        link: function(scope, element, attrs, progressCtrl) {
+            progressCtrl.addBar(scope, element);
+        }
+    };
+})
+
+.directive('progressbar', function() {
+    return {
+        restrict: 'EA',
+        replace: true,
+        transclude: true,
+        controller: 'ProgressController',
+        scope: {
+            value: '=',
+            max: '=?',
+            type: '@'
+        },
+        templateUrl: 'template/progressbar/progressbar.html',
+        link: function(scope, element, attrs, progressCtrl) {
+            progressCtrl.addBar(scope, angular.element(element.children()[0]));
+        }
+    };
+});
+
+angular.module('ui.bootstrap.rating', [])
+
+.constant('ratingConfig', {
+  max: 5,
+  stateOn: null,
+  stateOff: null
+})
+
+.controller('RatingController', ['$scope', '$attrs', 'ratingConfig', function($scope, $attrs, ratingConfig) {
+  var ngModelCtrl  = { $setViewValue: angular.noop };
+
+  this.init = function(ngModelCtrl_) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.push(function(value) {
+      if (angular.isNumber(value) && value << 0 !== value) {
+        value = Math.round(value);
+      }
+      return value;
+    });
+
+    this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
+    this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
+
+    var ratingStates = angular.isDefined($attrs.ratingStates) ? $scope.$parent.$eval($attrs.ratingStates) :
+                        new Array( angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max );
+    $scope.range = this.buildTemplateObjects(ratingStates);
+  };
+
+  this.buildTemplateObjects = function(states) {
+    for (var i = 0, n = states.length; i < n; i++) {
+      states[i] = angular.extend({ index: i }, { stateOn: this.stateOn, stateOff: this.stateOff }, states[i]);
+    }
+    return states;
+  };
+
+  $scope.rate = function(value) {
+    if ( !$scope.readonly && value >= 0 && value <= $scope.range.length ) {
+      ngModelCtrl.$setViewValue(value);
+      ngModelCtrl.$render();
+    }
+  };
+
+  $scope.enter = function(value) {
+    if ( !$scope.readonly ) {
+      $scope.value = value;
+    }
+    $scope.onHover({value: value});
+  };
+
+  $scope.reset = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+    $scope.onLeave();
+  };
+
+  $scope.onKeydown = function(evt) {
+    if (/(37|38|39|40)/.test(evt.which)) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      $scope.rate( $scope.value + (evt.which === 38 || evt.which === 39 ? 1 : -1) );
+    }
+  };
+
+  this.render = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+  };
+}])
+
+.directive('rating', function() {
+  return {
+    restrict: 'EA',
+    require: ['rating', 'ngModel'],
+    scope: {
+      readonly: '=?',
+      onHover: '&',
+      onLeave: '&'
+    },
+    controller: 'RatingController',
+    templateUrl: 'template/rating/rating.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var ratingCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+      ratingCtrl.init( ngModelCtrl );
+    }
+  };
+});
+
+/**
+ * @ngdoc overview
+ * @name ui.bootstrap.tabs
+ *
+ * @description
+ * AngularJS version of the tabs directive.
+ */
+
+angular.module('ui.bootstrap.tabs', [])
+
+.controller('TabsetController', ['$scope', function TabsetCtrl($scope) {
+  var ctrl = this,
+      tabs = ctrl.tabs = $scope.tabs = [];
+
+  ctrl.select = function(selectedTab) {
+    angular.forEach(tabs, function(tab) {
+      if (tab.active && tab !== selectedTab) {
+        tab.active = false;
+        tab.onDeselect();
+      }
+    });
+    selectedTab.active = true;
+    selectedTab.onSelect();
+  };
+
+  ctrl.addTab = function addTab(tab) {
+    tabs.push(tab);
+    // we can't run the select function on the first tab
+    // since that would select it twice
+    if (tabs.length === 1 && tab.active !== false) {
+      tab.active = true;
+    } else if (tab.active) {
+      ctrl.select(tab);
+    }
+    else {
+      tab.active = false;
+    }
+  };
+
+  ctrl.removeTab = function removeTab(tab) {
+    var index = tabs.indexOf(tab);
+    //Select a new tab if the tab to be removed is selected and not destroyed
+    if (tab.active && tabs.length > 1 && !destroyed) {
+      //If this is the last tab, select the previous tab. else, the next tab.
+      var newActiveIndex = index == tabs.length - 1 ? index - 1 : index + 1;
+      ctrl.select(tabs[newActiveIndex]);
+    }
+    tabs.splice(index, 1);
+  };
+
+  var destroyed;
+  $scope.$on('$destroy', function() {
+    destroyed = true;
+  });
+}])
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.tabs.directive:tabset
+ * @restrict EA
+ *
+ * @description
+ * Tabset is the outer container for the tabs directive
+ *
+ * @param {boolean=} vertical Whether or not to use vertical styling for the tabs.
+ * @param {boolean=} justified Whether or not to use justified styling for the tabs.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <tabset>
+      <tab heading="Tab 1"><b>First</b> Content!</tab>
+      <tab heading="Tab 2"><i>Second</i> Content!</tab>
+    </tabset>
+    <hr />
+    <tabset vertical="true">
+      <tab heading="Vertical Tab 1"><b>First</b> Vertical Content!</tab>
+      <tab heading="Vertical Tab 2"><i>Second</i> Vertical Content!</tab>
+    </tabset>
+    <tabset justified="true">
+      <tab heading="Justified Tab 1"><b>First</b> Justified Content!</tab>
+      <tab heading="Justified Tab 2"><i>Second</i> Justified Content!</tab>
+    </tabset>
+  </file>
+</example>
+ */
+.directive('tabset', function() {
+  return {
+    restrict: 'EA',
+    transclude: true,
+    replace: true,
+    scope: {
+      type: '@'
+    },
+    controller: 'TabsetController',
+    templateUrl: 'template/tabs/tabset.html',
+    link: function(scope, element, attrs) {
+      scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical) : false;
+      scope.justified = angular.isDefined(attrs.justified) ? scope.$parent.$eval(attrs.justified) : false;
+    }
+  };
+})
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.tabs.directive:tab
+ * @restrict EA
+ *
+ * @param {string=} heading The visible heading, or title, of the tab. Set HTML headings with {@link ui.bootstrap.tabs.directive:tabHeading tabHeading}.
+ * @param {string=} select An expression to evaluate when the tab is selected.
+ * @param {boolean=} active A binding, telling whether or not this tab is selected.
+ * @param {boolean=} disabled A binding, telling whether or not this tab is disabled.
+ *
+ * @description
+ * Creates a tab with a heading and content. Must be placed within a {@link ui.bootstrap.tabs.directive:tabset tabset}.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <div ng-controller="TabsDemoCtrl">
+      <button class="btn btn-small" ng-click="items[0].active = true">
+        Select item 1, using active binding
+      </button>
+      <button class="btn btn-small" ng-click="items[1].disabled = !items[1].disabled">
+        Enable/disable item 2, using disabled binding
+      </button>
+      <br />
+      <tabset>
+        <tab heading="Tab 1">First Tab</tab>
+        <tab select="alertMe()">
+          <tab-heading><i class="icon-bell"></i> Alert me!</tab-heading>
+          Second Tab, with alert callback and html heading!
+        </tab>
+        <tab ng-repeat="item in items"
+          heading="{{item.title}}"
+          disabled="item.disabled"
+          active="item.active">
+          {{item.content}}
+        </tab>
+      </tabset>
+    </div>
+  </file>
+  <file name="script.js">
+    function TabsDemoCtrl($scope) {
+      $scope.items = [
+        { title:"Dynamic Title 1", content:"Dynamic Item 0" },
+        { title:"Dynamic Title 2", content:"Dynamic Item 1", disabled: true }
+      ];
+
+      $scope.alertMe = function() {
+        setTimeout(function() {
+          alert("You've selected the alert tab!");
+        });
+      };
+    };
+  </file>
+</example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ui.bootstrap.tabs.directive:tabHeading
+ * @restrict EA
+ *
+ * @description
+ * Creates an HTML heading for a {@link ui.bootstrap.tabs.directive:tab tab}. Must be placed as a child of a tab element.
+ *
+ * @example
+<example module="ui.bootstrap">
+  <file name="index.html">
+    <tabset>
+      <tab>
+        <tab-heading><b>HTML</b> in my titles?!</tab-heading>
+        And some content, too!
+      </tab>
+      <tab>
+        <tab-heading><i class="icon-heart"></i> Icon heading?!?</tab-heading>
+        That's right.
+      </tab>
+    </tabset>
+  </file>
+</example>
+ */
+.directive('tab', ['$parse', '$log', function($parse, $log) {
+  return {
+    require: '^tabset',
+    restrict: 'EA',
+    replace: true,
+    templateUrl: 'template/tabs/tab.html',
+    transclude: true,
+    scope: {
+      active: '=?',
+      heading: '@',
+      onSelect: '&select', //This callback is called in contentHeadingTransclude
+                          //once it inserts the tab's content into the dom
+      onDeselect: '&deselect'
+    },
+    controller: function() {
+      //Empty controller so other directives can require being 'under' a tab
+    },
+    compile: function(elm, attrs, transclude) {
+      return function postLink(scope, elm, attrs, tabsetCtrl) {
+        scope.$watch('active', function(active) {
+          if (active) {
+            tabsetCtrl.select(scope);
+          }
+        });
+
+        scope.disabled = false;
+        if ( attrs.disable ) {
+          scope.$parent.$watch($parse(attrs.disable), function(value) {
+            scope.disabled = !! value;
+          });
+        }
+
+        // Deprecation support of "disabled" parameter
+        // fix(tab): IE9 disabled attr renders grey text on enabled tab #2677
+        // This code is duplicated from the lines above to make it easy to remove once
+        // the feature has been completely deprecated
+        if ( attrs.disabled ) {
+          $log.warn('Use of "disabled" attribute has been deprecated, please use "disable"');
+          scope.$parent.$watch($parse(attrs.disabled), function(value) {
+            scope.disabled = !! value;
+          });
+        }
+
+        scope.select = function() {
+          if ( !scope.disabled ) {
+            scope.active = true;
+          }
+        };
+
+        tabsetCtrl.addTab(scope);
+        scope.$on('$destroy', function() {
+          tabsetCtrl.removeTab(scope);
+        });
+
+        //We need to transclude later, once the content container is ready.
+        //when this link happens, we're inside a tab heading.
+        scope.$transcludeFn = transclude;
+      };
+    }
+  };
+}])
+
+.directive('tabHeadingTransclude', [function() {
+  return {
+    restrict: 'A',
+    require: '^tab',
+    link: function(scope, elm, attrs, tabCtrl) {
+      scope.$watch('headingElement', function updateHeadingElement(heading) {
+        if (heading) {
+          elm.html('');
+          elm.append(heading);
+        }
+      });
+    }
+  };
+}])
+
+.directive('tabContentTransclude', function() {
+  return {
+    restrict: 'A',
+    require: '^tabset',
+    link: function(scope, elm, attrs) {
+      var tab = scope.$eval(attrs.tabContentTransclude);
+
+      //Now our tab is ready to be transcluded: both the tab heading area
+      //and the tab content area are loaded.  Transclude 'em both.
+      tab.$transcludeFn(tab.$parent, function(contents) {
+        angular.forEach(contents, function(node) {
+          if (isTabHeading(node)) {
+            //Let tabHeadingTransclude know.
+            tab.headingElement = node;
+          } else {
+            elm.append(node);
+          }
+        });
+      });
+    }
+  };
+  function isTabHeading(node) {
+    return node.tagName &&  (
+      node.hasAttribute('tab-heading') ||
+      node.hasAttribute('data-tab-heading') ||
+      node.tagName.toLowerCase() === 'tab-heading' ||
+      node.tagName.toLowerCase() === 'data-tab-heading'
+    );
+  }
+})
+
+;
+
+angular.module('ui.bootstrap.timepicker', [])
+
+.constant('timepickerConfig', {
+  hourStep: 1,
+  minuteStep: 1,
+  showMeridian: true,
+  meridians: null,
+  readonlyInput: false,
+  mousewheel: true,
+  arrowkeys: true
+})
+
+.controller('TimepickerController', ['$scope', '$attrs', '$parse', '$log', '$locale', 'timepickerConfig', function($scope, $attrs, $parse, $log, $locale, timepickerConfig) {
+  var selected = new Date(),
+      ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl
+      meridians = angular.isDefined($attrs.meridians) ? $scope.$parent.$eval($attrs.meridians) : timepickerConfig.meridians || $locale.DATETIME_FORMATS.AMPMS;
+
+  this.init = function( ngModelCtrl_, inputs ) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.unshift(function (modelValue) {
+      return modelValue ? new Date( modelValue ) : null;
+    });
+
+    var hoursInputEl = inputs.eq(0),
+        minutesInputEl = inputs.eq(1);
+
+    var mousewheel = angular.isDefined($attrs.mousewheel) ? $scope.$parent.$eval($attrs.mousewheel) : timepickerConfig.mousewheel;
+    if ( mousewheel ) {
+      this.setupMousewheelEvents( hoursInputEl, minutesInputEl );
+    }
+
+    var arrowkeys = angular.isDefined($attrs.arrowkeys) ? $scope.$parent.$eval($attrs.arrowkeys) : timepickerConfig.arrowkeys;
+    if (arrowkeys) {
+      this.setupArrowkeyEvents( hoursInputEl, minutesInputEl );
+    }
+
+    $scope.readonlyInput = angular.isDefined($attrs.readonlyInput) ? $scope.$parent.$eval($attrs.readonlyInput) : timepickerConfig.readonlyInput;
+    this.setupInputEvents( hoursInputEl, minutesInputEl );
+  };
+
+  var hourStep = timepickerConfig.hourStep;
+  if ($attrs.hourStep) {
+    $scope.$parent.$watch($parse($attrs.hourStep), function(value) {
+      hourStep = parseInt(value, 10);
+    });
+  }
+
+  var minuteStep = timepickerConfig.minuteStep;
+  if ($attrs.minuteStep) {
+    $scope.$parent.$watch($parse($attrs.minuteStep), function(value) {
+      minuteStep = parseInt(value, 10);
+    });
+  }
+
+  // 12H / 24H mode
+  $scope.showMeridian = timepickerConfig.showMeridian;
+  if ($attrs.showMeridian) {
+    $scope.$parent.$watch($parse($attrs.showMeridian), function(value) {
+      $scope.showMeridian = !!value;
+
+      if ( ngModelCtrl.$error.time ) {
+        // Evaluate from template
+        var hours = getHoursFromTemplate(), minutes = getMinutesFromTemplate();
+        if (angular.isDefined( hours ) && angular.isDefined( minutes )) {
+          selected.setHours( hours );
+          refresh();
+        }
+      } else {
+        updateTemplate();
+      }
+    });
+  }
+
+  // Get $scope.hours in 24H mode if valid
+  function getHoursFromTemplate ( ) {
+    var hours = parseInt( $scope.hours, 10 );
+    var valid = ( $scope.showMeridian ) ? (hours > 0 && hours < 13) : (hours >= 0 && hours < 24);
+    if ( !valid ) {
+      return undefined;
+    }
+
+    if ( $scope.showMeridian ) {
+      if ( hours === 12 ) {
+        hours = 0;
+      }
+      if ( $scope.meridian === meridians[1] ) {
+        hours = hours + 12;
+      }
+    }
+    return hours;
+  }
+
+  function getMinutesFromTemplate() {
+    var minutes = parseInt($scope.minutes, 10);
+    return ( minutes >= 0 && minutes < 60 ) ? minutes : undefined;
+  }
+
+  function pad( value ) {
+    return ( angular.isDefined(value) && value.toString().length < 2 ) ? '0' + value : value.toString();
+  }
+
+  // Respond on mousewheel spin
+  this.setupMousewheelEvents = function( hoursInputEl, minutesInputEl ) {
+    var isScrollingUp = function(e) {
+      if (e.originalEvent) {
+        e = e.originalEvent;
+      }
+      //pick correct delta variable depending on event
+      var delta = (e.wheelDelta) ? e.wheelDelta : -e.deltaY;
+      return (e.detail || delta > 0);
+    };
+
+    hoursInputEl.bind('mousewheel wheel', function(e) {
+      $scope.$apply( (isScrollingUp(e)) ? $scope.incrementHours() : $scope.decrementHours() );
+      e.preventDefault();
+    });
+
+    minutesInputEl.bind('mousewheel wheel', function(e) {
+      $scope.$apply( (isScrollingUp(e)) ? $scope.incrementMinutes() : $scope.decrementMinutes() );
+      e.preventDefault();
+    });
+
+  };
+
+  // Respond on up/down arrowkeys
+  this.setupArrowkeyEvents = function( hoursInputEl, minutesInputEl ) {
+    hoursInputEl.bind('keydown', function(e) {
+      if ( e.which === 38 ) { // up
+        e.preventDefault();
+        $scope.incrementHours();
+        $scope.$apply();
+      }
+      else if ( e.which === 40 ) { // down
+        e.preventDefault();
+        $scope.decrementHours();
+        $scope.$apply();
+      }
+    });
+
+    minutesInputEl.bind('keydown', function(e) {
+      if ( e.which === 38 ) { // up
+        e.preventDefault();
+        $scope.incrementMinutes();
+        $scope.$apply();
+      }
+      else if ( e.which === 40 ) { // down
+        e.preventDefault();
+        $scope.decrementMinutes();
+        $scope.$apply();
+      }
+    });
+  };
+
+  this.setupInputEvents = function( hoursInputEl, minutesInputEl ) {
+    if ( $scope.readonlyInput ) {
+      $scope.updateHours = angular.noop;
+      $scope.updateMinutes = angular.noop;
+      return;
+    }
+
+    var invalidate = function(invalidHours, invalidMinutes) {
+      ngModelCtrl.$setViewValue( null );
+      ngModelCtrl.$setValidity('time', false);
+      if (angular.isDefined(invalidHours)) {
+        $scope.invalidHours = invalidHours;
+      }
+      if (angular.isDefined(invalidMinutes)) {
+        $scope.invalidMinutes = invalidMinutes;
+      }
+    };
+
+    $scope.updateHours = function() {
+      var hours = getHoursFromTemplate();
+
+      if ( angular.isDefined(hours) ) {
+        selected.setHours( hours );
+        refresh( 'h' );
+      } else {
+        invalidate(true);
+      }
+    };
+
+    hoursInputEl.bind('blur', function(e) {
+      if ( !$scope.invalidHours && $scope.hours < 10) {
+        $scope.$apply( function() {
+          $scope.hours = pad( $scope.hours );
+        });
+      }
+    });
+
+    $scope.updateMinutes = function() {
+      var minutes = getMinutesFromTemplate();
+
+      if ( angular.isDefined(minutes) ) {
+        selected.setMinutes( minutes );
+        refresh( 'm' );
+      } else {
+        invalidate(undefined, true);
+      }
+    };
+
+    minutesInputEl.bind('blur', function(e) {
+      if ( !$scope.invalidMinutes && $scope.minutes < 10 ) {
+        $scope.$apply( function() {
+          $scope.minutes = pad( $scope.minutes );
+        });
+      }
+    });
+
+  };
+
+  this.render = function() {
+    var date = ngModelCtrl.$viewValue;
+
+    if ( isNaN(date) ) {
+      ngModelCtrl.$setValidity('time', false);
+      $log.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
+    } else {
+      if ( date ) {
+        selected = date;
+      }
+      makeValid();
+      updateTemplate();
+    }
+  };
+
+  // Call internally when we know that model is valid.
+  function refresh( keyboardChange ) {
+    makeValid();
+    ngModelCtrl.$setViewValue( new Date(selected) );
+    updateTemplate( keyboardChange );
+  }
+
+  function makeValid() {
+    ngModelCtrl.$setValidity('time', true);
+    $scope.invalidHours = false;
+    $scope.invalidMinutes = false;
+  }
+
+  function updateTemplate( keyboardChange ) {
+    var hours = selected.getHours(), minutes = selected.getMinutes();
+
+    if ( $scope.showMeridian ) {
+      hours = ( hours === 0 || hours === 12 ) ? 12 : hours % 12; // Convert 24 to 12 hour system
+    }
+
+    $scope.hours = keyboardChange === 'h' ? hours : pad(hours);
+    if (keyboardChange !== 'm') {
+      $scope.minutes = pad(minutes);
+    }
+    $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+  }
+
+  function addMinutes( minutes ) {
+    var dt = new Date( selected.getTime() + minutes * 60000 );
+    selected.setHours( dt.getHours(), dt.getMinutes() );
+    refresh();
+  }
+
+  $scope.incrementHours = function() {
+    addMinutes( hourStep * 60 );
+  };
+  $scope.decrementHours = function() {
+    addMinutes( - hourStep * 60 );
+  };
+  $scope.incrementMinutes = function() {
+    addMinutes( minuteStep );
+  };
+  $scope.decrementMinutes = function() {
+    addMinutes( - minuteStep );
+  };
+  $scope.toggleMeridian = function() {
+    addMinutes( 12 * 60 * (( selected.getHours() < 12 ) ? 1 : -1) );
+  };
+}])
+
+.directive('timepicker', function () {
+  return {
+    restrict: 'EA',
+    require: ['timepicker', '?^ngModel'],
+    controller:'TimepickerController',
+    replace: true,
+    scope: {},
+    templateUrl: 'template/timepicker/timepicker.html',
+    link: function(scope, element, attrs, ctrls) {
+      var timepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if ( ngModelCtrl ) {
+        timepickerCtrl.init( ngModelCtrl, element.find('input') );
+      }
+    }
+  };
+});
+
+angular.module('ui.bootstrap.transition', [])
+
+.value('$transitionSuppressDeprecated', false)
+/**
+ * $transition service provides a consistent interface to trigger CSS 3 transitions and to be informed when they complete.
+ * @param  {DOMElement} element  The DOMElement that will be animated.
+ * @param  {string|object|function} trigger  The thing that will cause the transition to start:
+ *   - As a string, it represents the css class to be added to the element.
+ *   - As an object, it represents a hash of style attributes to be applied to the element.
+ *   - As a function, it represents a function to be called that will cause the transition to occur.
+ * @return {Promise}  A promise that is resolved when the transition finishes.
+ */
+.factory('$transition', [
+        '$q', '$timeout', '$rootScope', '$log', '$transitionSuppressDeprecated',
+function($q ,  $timeout ,  $rootScope ,  $log ,  $transitionSuppressDeprecated) {
+
+  if (!$transitionSuppressDeprecated) {
+    $log.warn('$transition is now deprecated. Use $animate from ngAnimate instead.');
+  }
+
+  var $transition = function(element, trigger, options) {
+    options = options || {};
+    var deferred = $q.defer();
+    var endEventName = $transition[options.animation ? 'animationEndEventName' : 'transitionEndEventName'];
+
+    var transitionEndHandler = function(event) {
+      $rootScope.$apply(function() {
+        element.unbind(endEventName, transitionEndHandler);
+        deferred.resolve(element);
+      });
+    };
+
+    if (endEventName) {
+      element.bind(endEventName, transitionEndHandler);
+    }
+
+    // Wrap in a timeout to allow the browser time to update the DOM before the transition is to occur
+    $timeout(function() {
+      if ( angular.isString(trigger) ) {
+        element.addClass(trigger);
+      } else if ( angular.isFunction(trigger) ) {
+        trigger(element);
+      } else if ( angular.isObject(trigger) ) {
+        element.css(trigger);
+      }
+      //If browser does not support transitions, instantly resolve
+      if ( !endEventName ) {
+        deferred.resolve(element);
+      }
+    });
+
+    // Add our custom cancel function to the promise that is returned
+    // We can call this if we are about to run a new transition, which we know will prevent this transition from ending,
+    // i.e. it will therefore never raise a transitionEnd event for that transition
+    deferred.promise.cancel = function() {
+      if ( endEventName ) {
+        element.unbind(endEventName, transitionEndHandler);
+      }
+      deferred.reject('Transition cancelled');
+    };
+
+    return deferred.promise;
+  };
+
+  // Work out the name of the transitionEnd event
+  var transElement = document.createElement('trans');
+  var transitionEndEventNames = {
+    'WebkitTransition': 'webkitTransitionEnd',
+    'MozTransition': 'transitionend',
+    'OTransition': 'oTransitionEnd',
+    'transition': 'transitionend'
+  };
+  var animationEndEventNames = {
+    'WebkitTransition': 'webkitAnimationEnd',
+    'MozTransition': 'animationend',
+    'OTransition': 'oAnimationEnd',
+    'transition': 'animationend'
+  };
+  function findEndEventName(endEventNames) {
+    for (var name in endEventNames){
+      if (transElement.style[name] !== undefined) {
+        return endEventNames[name];
+      }
+    }
+  }
+  $transition.transitionEndEventName = findEndEventName(transitionEndEventNames);
+  $transition.animationEndEventName = findEndEventName(animationEndEventNames);
+  return $transition;
+}]);
+
+angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.position', 'ui.bootstrap.bindHtml'])
+
+/**
+ * A helper service that can parse typeahead's syntax (string provided by users)
+ * Extracted to a separate service for ease of unit testing
+ */
+  .factory('typeaheadParser', ['$parse', function ($parse) {
+
+  //                      00000111000000000000022200000000000000003333333333333330000000000044000
+  var TYPEAHEAD_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
+
+  return {
+    parse:function (input) {
+
+      var match = input.match(TYPEAHEAD_REGEXP);
+      if (!match) {
+        throw new Error(
+          'Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_"' +
+            ' but got "' + input + '".');
+      }
+
+      return {
+        itemName:match[3],
+        source:$parse(match[4]),
+        viewMapper:$parse(match[2] || match[1]),
+        modelMapper:$parse(match[1])
+      };
+    }
+  };
+}])
+
+  .directive('typeahead', ['$compile', '$parse', '$q', '$timeout', '$document', '$position', 'typeaheadParser',
+    function ($compile, $parse, $q, $timeout, $document, $position, typeaheadParser) {
+
+  var HOT_KEYS = [9, 13, 27, 38, 40];
+
+  return {
+    require:'ngModel',
+    link:function (originalScope, element, attrs, modelCtrl) {
+
+      //SUPPORTED ATTRIBUTES (OPTIONS)
+
+      //minimal no of characters that needs to be entered before typeahead kicks-in
+      var minSearch = originalScope.$eval(attrs.typeaheadMinLength) || 1;
+
+      //minimal wait time after last character typed before typeahead kicks-in
+      var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
+
+      //should it restrict model values to the ones selected from the popup only?
+      var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
+
+      //binding to a variable that indicates if matches are being retrieved asynchronously
+      var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
+
+      //a callback executed when a match is selected
+      var onSelectCallback = $parse(attrs.typeaheadOnSelect);
+
+      var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
+
+      var appendToBody =  attrs.typeaheadAppendToBody ? originalScope.$eval(attrs.typeaheadAppendToBody) : false;
+
+      var focusFirst = originalScope.$eval(attrs.typeaheadFocusFirst) !== false;
+
+      //INTERNAL VARIABLES
+
+      //model setter executed upon match selection
+      var $setModelValue = $parse(attrs.ngModel).assign;
+
+      //expressions used by typeahead
+      var parserResult = typeaheadParser.parse(attrs.typeahead);
+
+      var hasFocus;
+
+      //create a child scope for the typeahead directive so we are not polluting original scope
+      //with typeahead-specific data (matches, query etc.)
+      var scope = originalScope.$new();
+      originalScope.$on('$destroy', function(){
+        scope.$destroy();
+      });
+
+      // WAI-ARIA
+      var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+      element.attr({
+        'aria-autocomplete': 'list',
+        'aria-expanded': false,
+        'aria-owns': popupId
+      });
+
+      //pop-up element used to display matches
+      var popUpEl = angular.element('<div typeahead-popup></div>');
+      popUpEl.attr({
+        id: popupId,
+        matches: 'matches',
+        active: 'activeIdx',
+        select: 'select(activeIdx)',
+        query: 'query',
+        position: 'position'
+      });
+      //custom item template
+      if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
+        popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
+      }
+
+      var resetMatches = function() {
+        scope.matches = [];
+        scope.activeIdx = -1;
+        element.attr('aria-expanded', false);
+      };
+
+      var getMatchId = function(index) {
+        return popupId + '-option-' + index;
+      };
+
+      // Indicate that the specified match is the active (pre-selected) item in the list owned by this typeahead.
+      // This attribute is added or removed automatically when the `activeIdx` changes.
+      scope.$watch('activeIdx', function(index) {
+        if (index < 0) {
+          element.removeAttr('aria-activedescendant');
+        } else {
+          element.attr('aria-activedescendant', getMatchId(index));
+        }
+      });
+
+      var getMatchesAsync = function(inputValue) {
+
+        var locals = {$viewValue: inputValue};
+        isLoadingSetter(originalScope, true);
+        $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
+
+          //it might happen that several async queries were in progress if a user were typing fast
+          //but we are interested only in responses that correspond to the current view value
+          var onCurrentRequest = (inputValue === modelCtrl.$viewValue);
+          if (onCurrentRequest && hasFocus) {
+            if (matches && matches.length > 0) {
+
+              scope.activeIdx = focusFirst ? 0 : -1;
+              scope.matches.length = 0;
+
+              //transform labels
+              for(var i=0; i<matches.length; i++) {
+                locals[parserResult.itemName] = matches[i];
+                scope.matches.push({
+                  id: getMatchId(i),
+                  label: parserResult.viewMapper(scope, locals),
+                  model: matches[i]
+                });
+              }
+
+              scope.query = inputValue;
+              //position pop-up with matches - we need to re-calculate its position each time we are opening a window
+              //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
+              //due to other elements being rendered
+              scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+              scope.position.top = scope.position.top + element.prop('offsetHeight');
+
+              element.attr('aria-expanded', true);
+            } else {
+              resetMatches();
+            }
+          }
+          if (onCurrentRequest) {
+            isLoadingSetter(originalScope, false);
+          }
+        }, function(){
+          resetMatches();
+          isLoadingSetter(originalScope, false);
+        });
+      };
+
+      resetMatches();
+
+      //we need to propagate user's query so we can higlight matches
+      scope.query = undefined;
+
+      //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
+      var timeoutPromise;
+
+      var scheduleSearchWithTimeout = function(inputValue) {
+        timeoutPromise = $timeout(function () {
+          getMatchesAsync(inputValue);
+        }, waitTime);
+      };
+
+      var cancelPreviousTimeout = function() {
+        if (timeoutPromise) {
+          $timeout.cancel(timeoutPromise);
+        }
+      };
+
+      //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
+      //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
+      modelCtrl.$parsers.unshift(function (inputValue) {
+
+        hasFocus = true;
+
+        if (inputValue && inputValue.length >= minSearch) {
+          if (waitTime > 0) {
+            cancelPreviousTimeout();
+            scheduleSearchWithTimeout(inputValue);
+          } else {
+            getMatchesAsync(inputValue);
+          }
+        } else {
+          isLoadingSetter(originalScope, false);
+          cancelPreviousTimeout();
+          resetMatches();
+        }
+
+        if (isEditable) {
+          return inputValue;
+        } else {
+          if (!inputValue) {
+            // Reset in case user had typed something previously.
+            modelCtrl.$setValidity('editable', true);
+            return inputValue;
+          } else {
+            modelCtrl.$setValidity('editable', false);
+            return undefined;
+          }
+        }
+      });
+
+      modelCtrl.$formatters.push(function (modelValue) {
+
+        var candidateViewValue, emptyViewValue;
+        var locals = {};
+
+        // The validity may be set to false via $parsers (see above) if
+        // the model is restricted to selected values. If the model
+        // is set manually it is considered to be valid.
+        if (!isEditable) {
+          modelCtrl.$setValidity('editable', true);
+        }
+
+        if (inputFormatter) {
+
+          locals.$model = modelValue;
+          return inputFormatter(originalScope, locals);
+
+        } else {
+
+          //it might happen that we don't have enough info to properly render input value
+          //we need to check for this situation and simply return model value if we can't apply custom formatting
+          locals[parserResult.itemName] = modelValue;
+          candidateViewValue = parserResult.viewMapper(originalScope, locals);
+          locals[parserResult.itemName] = undefined;
+          emptyViewValue = parserResult.viewMapper(originalScope, locals);
+
+          return candidateViewValue!== emptyViewValue ? candidateViewValue : modelValue;
+        }
+      });
+
+      scope.select = function (activeIdx) {
+        //called from within the $digest() cycle
+        var locals = {};
+        var model, item;
+
+        locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
+        model = parserResult.modelMapper(originalScope, locals);
+        $setModelValue(originalScope, model);
+        modelCtrl.$setValidity('editable', true);
+        modelCtrl.$setValidity('parse', true);
+
+        onSelectCallback(originalScope, {
+          $item: item,
+          $model: model,
+          $label: parserResult.viewMapper(originalScope, locals)
+        });
+
+        resetMatches();
+
+        //return focus to the input element if a match was selected via a mouse click event
+        // use timeout to avoid $rootScope:inprog error
+        $timeout(function() { element[0].focus(); }, 0, false);
+      };
+
+      //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
+      element.bind('keydown', function (evt) {
+
+        //typeahead is open and an "interesting" key was pressed
+        if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
+          return;
+        }
+
+        // if there's nothing selected (i.e. focusFirst) and enter is hit, don't do anything
+        if (scope.activeIdx == -1 && (evt.which === 13 || evt.which === 9)) {
+          return;
+        }
+
+        evt.preventDefault();
+
+        if (evt.which === 40) {
+          scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
+          scope.$digest();
+
+        } else if (evt.which === 38) {
+          scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
+          scope.$digest();
+
+        } else if (evt.which === 13 || evt.which === 9) {
+          scope.$apply(function () {
+            scope.select(scope.activeIdx);
+          });
+
+        } else if (evt.which === 27) {
+          evt.stopPropagation();
+
+          resetMatches();
+          scope.$digest();
+        }
+      });
+
+      element.bind('blur', function (evt) {
+        hasFocus = false;
+      });
+
+      // Keep reference to click handler to unbind it.
+      var dismissClickHandler = function (evt) {
+        if (element[0] !== evt.target) {
+          resetMatches();
+          scope.$digest();
+        }
+      };
+
+      $document.bind('click', dismissClickHandler);
+
+      originalScope.$on('$destroy', function(){
+        $document.unbind('click', dismissClickHandler);
+        if (appendToBody) {
+          $popup.remove();
+        }
+        // Prevent jQuery cache memory leak
+        popUpEl.remove();
+      });
+
+      var $popup = $compile(popUpEl)(scope);
+
+      if (appendToBody) {
+        $document.find('body').append($popup);
+      } else {
+        element.after($popup);
+      }
+    }
+  };
+
+}])
+
+  .directive('typeaheadPopup', function () {
+    return {
+      restrict:'EA',
+      scope:{
+        matches:'=',
+        query:'=',
+        active:'=',
+        position:'=',
+        select:'&'
+      },
+      replace:true,
+      templateUrl:'template/typeahead/typeahead-popup.html',
+      link:function (scope, element, attrs) {
+
+        scope.templateUrl = attrs.templateUrl;
+
+        scope.isOpen = function () {
+          return scope.matches.length > 0;
+        };
+
+        scope.isActive = function (matchIdx) {
+          return scope.active == matchIdx;
+        };
+
+        scope.selectActive = function (matchIdx) {
+          scope.active = matchIdx;
+        };
+
+        scope.selectMatch = function (activeIdx) {
+          scope.select({activeIdx:activeIdx});
+        };
+      }
+    };
+  })
+
+  .directive('typeaheadMatch', ['$templateRequest', '$compile', '$parse', function ($templateRequest, $compile, $parse) {
+    return {
+      restrict:'EA',
+      scope:{
+        index:'=',
+        match:'=',
+        query:'='
+      },
+      link:function (scope, element, attrs) {
+        var tplUrl = $parse(attrs.templateUrl)(scope.$parent) || 'template/typeahead/typeahead-match.html';
+        $templateRequest(tplUrl).then(function(tplContent) {
+          $compile(tplContent.trim())(scope, function(clonedElement){
+            element.replaceWith(clonedElement);
+          });
+        });
+      }
+    };
+  }])
+
+  .filter('typeaheadHighlight', function() {
+
+    function escapeRegexp(queryToEscape) {
+      return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
+    }
+
+    return function(matchItem, query) {
+      return query ? ('' + matchItem).replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : matchItem;
+    };
+  });
+!angular.$$csp() && angular.element(document).find('head').prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.min.js b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.min.js
new file mode 100644
index 000000000..c3f5c2403
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular-bootstrap/ui-bootstrap.min.js
@@ -0,0 +1,9 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 0.13.0 - 2015-05-02
+ * License: MIT
+ */
+angular.module("ui.bootstrap",["ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.transition","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.collapse",[]).directive("collapse",["$animate",function(a){return{link:function(b,c,d){function e(){c.removeClass("collapse").addClass("collapsing"),a.addClass(c,"in",{to:{height:c[0].scrollHeight+"px"}}).then(f)}function f(){c.removeClass("collapsing"),c.css({height:"auto"})}function g(){c.css({height:c[0].scrollHeight+"px"}).removeClass("collapse").addClass("collapsing"),a.removeClass(c,"in",{to:{height:"0"}}).then(h)}function h(){c.css({height:"0"}),c.removeClass("collapsing"),c.addClass("collapse")}b.$watch(d.collapse,function(a){a?g():e()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.$watch("isOpen",function(b){b&&d.closeOthers(a)}),a.toggleOpen=function(){a.isDisabled||(a.isOpen=!a.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,angular.noop))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b,this.close=a.close}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}).directive("dismissOnTimeout",["$timeout",function(a){return{require:"alert",link:function(b,c,d,e){a(function(){e.close()},parseInt(d.dismissOnTimeout,10))}}}]),angular.module("ui.bootstrap.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("ui.bootstrap.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){var d=b.hasClass(e.activeClass);(!d||angular.isDefined(c.uncheckable))&&a.$apply(function(){f.$setViewValue(d?null:a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",[]).controller("CarouselController",["$scope","$interval","$animate",function(a,b,c){function d(a){if(angular.isUndefined(k[a].index))return k[a];{var b;k.length}for(b=0;b<k.length;++b)if(k[b].index==a)return k[b]}function e(){f();var c=+a.interval;!isNaN(c)&&c>0&&(h=b(g,c))}function f(){h&&(b.cancel(h),h=null)}function g(){var b=+a.interval;i&&!isNaN(b)&&b>0?a.next():a.pause()}var h,i,j=this,k=j.slides=a.slides=[],l=-1;j.currentSlide=null;var m=!1;j.select=a.select=function(b,d){function f(){m||(angular.extend(b,{direction:d,active:!0}),angular.extend(j.currentSlide||{},{direction:d,active:!1}),c.enabled()&&!a.noTransition&&b.$element&&(a.$currentTransition=!0,b.$element.one("$animate:close",function(){a.$currentTransition=null})),j.currentSlide=b,l=g,e())}var g=j.indexOfSlide(b);void 0===d&&(d=g>j.getCurrentIndex()?"next":"prev"),b&&b!==j.currentSlide&&f()},a.$on("$destroy",function(){m=!0}),j.getCurrentIndex=function(){return j.currentSlide&&angular.isDefined(j.currentSlide.index)?+j.currentSlide.index:l},j.indexOfSlide=function(a){return angular.isDefined(a.index)?+a.index:k.indexOf(a)},a.next=function(){var b=(j.getCurrentIndex()+1)%k.length;return a.$currentTransition?void 0:j.select(d(b),"next")},a.prev=function(){var b=j.getCurrentIndex()-1<0?k.length-1:j.getCurrentIndex()-1;return a.$currentTransition?void 0:j.select(d(b),"prev")},a.isActive=function(a){return j.currentSlide===a},a.$watch("interval",e),a.$on("$destroy",f),a.play=function(){i||(i=!0,e())},a.pause=function(){a.noPause||(i=!1,f())},j.addSlide=function(b,c){b.$element=c,k.push(b),1===k.length||b.active?(j.select(k[k.length-1]),1==k.length&&a.play()):b.active=!1},j.removeSlide=function(a){angular.isDefined(a.index)&&k.sort(function(a,b){return+a.index>+b.index});var b=k.indexOf(a);k.splice(b,1),k.length>0&&a.active?j.select(b>=k.length?k[b-1]:k[b]):l>b&&l--}}]).directive("carousel",[function(){return{restrict:"EA",transclude:!0,replace:!0,controller:"CarouselController",require:"carousel",templateUrl:"template/carousel/carousel.html",scope:{interval:"=",noTransition:"=",noPause:"="}}}]).directive("slide",function(){return{require:"^carousel",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/carousel/slide.html",scope:{active:"=?",index:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}).animation(".item",["$animate",function(a){return{beforeAddClass:function(b,c,d){if("active"==c&&b.parent()&&!b.parent().scope().noTransition){var e=!1,f=b.isolateScope().direction,g="next"==f?"left":"right";return b.addClass(f),a.addClass(b,g).then(function(){e||b.removeClass(g+" "+f),d()}),function(){e=!0}}d()},beforeRemoveClass:function(b,c,d){if("active"==c&&b.parent()&&!b.parent().scope().noTransition){var e=!1,f=b.isolateScope().direction,g="next"==f?"left":"right";return a.addClass(b,g).then(function(){e||b.removeClass(g),d()}),function(){e=!0}}d()}}}]),angular.module("ui.bootstrap.dateparser",[]).service("dateParser",["$locale","orderByFilter",function(a,b){function c(a){var c=[],d=a.split("");return angular.forEach(f,function(b,e){var f=a.indexOf(e);if(f>-1){a=a.split(""),d[f]="("+b.regex+")",a[f]="$";for(var g=f+1,h=f+e.length;h>g;g++)d[g]="",a[g]="$";a=a.join(""),c.push({index:f,apply:b.apply})}}),{regex:new RegExp("^"+d.join("")+"$"),map:b(c,"index")}}function d(a,b,c){return 1>c?!1:1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}var e=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;this.parsers={};var f={yyyy:{regex:"\\d{4}",apply:function(a){this.year=+a}},yy:{regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},y:{regex:"\\d{1,4}",apply:function(a){this.year=+a}},MMMM:{regex:a.DATETIME_FORMATS.MONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.MONTH.indexOf(b)}},MMM:{regex:a.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)}},MM:{regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},M:{regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},dd:{regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},d:{regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},EEEE:{regex:a.DATETIME_FORMATS.DAY.join("|")},EEE:{regex:a.DATETIME_FORMATS.SHORTDAY.join("|")},HH:{regex:"(?:0|1)[0-9]|2[0-3]",apply:function(a){this.hours=+a}},H:{regex:"1?[0-9]|2[0-3]",apply:function(a){this.hours=+a}},mm:{regex:"[0-5][0-9]",apply:function(a){this.minutes=+a}},m:{regex:"[0-9]|[1-5][0-9]",apply:function(a){this.minutes=+a}},sss:{regex:"[0-9][0-9][0-9]",apply:function(a){this.milliseconds=+a}},ss:{regex:"[0-5][0-9]",apply:function(a){this.seconds=+a}},s:{regex:"[0-9]|[1-5][0-9]",apply:function(a){this.seconds=+a}}};this.parse=function(b,f,g){if(!angular.isString(b)||!f)return b;f=a.DATETIME_FORMATS[f]||f,f=f.replace(e,"\\$&"),this.parsers[f]||(this.parsers[f]=c(f));var h=this.parsers[f],i=h.regex,j=h.map,k=b.match(i);if(k&&k.length){var l,m;l=g?{year:g.getFullYear(),month:g.getMonth(),date:g.getDate(),hours:g.getHours(),minutes:g.getMinutes(),seconds:g.getSeconds(),milliseconds:g.getMilliseconds()}:{year:1900,month:0,date:1,hours:0,minutes:0,seconds:0,milliseconds:0};for(var n=1,o=k.length;o>n;n++){var p=j[n-1];p.apply&&p.apply.call(l,k[n])}return d(l.year,l.month,l.date)&&(m=new Date(l.year,l.month,l.date,l.hours,l.minutes,l.seconds,l.milliseconds||0)),m}}}]),angular.module("ui.bootstrap.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].documentElement.scrollLeft)}},positionElements:function(a,b,c,d){var e,f,g,h,i=c.split("-"),j=i[0],k=i[1]||"center";e=d?this.offset(a):this.position(a),f=b.prop("offsetWidth"),g=b.prop("offsetHeight");var l={center:function(){return e.left+e.width/2-f/2},left:function(){return e.left},right:function(){return e.left+e.width}},m={center:function(){return e.top+e.height/2-g/2},top:function(){return e.top},bottom:function(){return e.top+e.height}};switch(j){case"right":h={top:m[k](),left:l[j]()};break;case"left":h={top:m[k](),left:e.left-f};break;case"bottom":h={top:m[j](),left:l[k]()};break;default:h={top:e.top-g,left:l[k]()}}return h}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.position"]).constant("datepickerConfig",{formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",datepickerMode:"day",minMode:"day",maxMode:"year",showWeeks:!0,startingDay:0,yearRange:20,minDate:null,maxDate:null,shortcutPropagation:!1}).controller("DatepickerController",["$scope","$attrs","$parse","$interpolate","$timeout","$log","dateFilter","datepickerConfig",function(a,b,c,d,e,f,g,h){var i=this,j={$setViewValue:angular.noop};this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","minMode","maxMode","showWeeks","startingDay","yearRange","shortcutPropagation"],function(c,e){i[c]=angular.isDefined(b[c])?8>e?d(b[c])(a.$parent):a.$parent.$eval(b[c]):h[c]}),angular.forEach(["minDate","maxDate"],function(d){b[d]?a.$parent.$watch(c(b[d]),function(a){i[d]=a?new Date(a):null,i.refreshView()}):i[d]=h[d]?new Date(h[d]):null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.maxMode=i.maxMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),angular.isDefined(b.initDate)?(this.activeDate=a.$parent.$eval(b.initDate)||new Date,a.$parent.$watch(b.initDate,function(a){a&&(j.$isEmpty(j.$modelValue)||j.$invalid)&&(i.activeDate=a,i.refreshView())})):this.activeDate=new Date,a.isActive=function(b){return 0===i.compare(b.date,i.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){j=a,j.$render=function(){i.render()}},this.render=function(){if(j.$viewValue){var a=new Date(j.$viewValue),b=!isNaN(a);b?this.activeDate=a:f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'),j.$setValidity("date",b)}this.refreshView()},this.refreshView=function(){if(this.element){this._refreshView();var a=j.$viewValue?new Date(j.$viewValue):null;j.$setValidity("date-disabled",!a||this.element&&!this.isDisabled(a))}},this.createDateObject=function(a,b){var c=j.$viewValue?new Date(j.$viewValue):null;return{date:a,label:g(a,b),selected:c&&0===this.compare(a,c),disabled:this.isDisabled(a),current:0===this.compare(a,new Date),customClass:this.customClass(a)}},this.isDisabled=function(c){return this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.customClass=function(b){return a.customClass({date:b,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===i.minMode){var c=j.$viewValue?new Date(j.$viewValue):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),j.$setViewValue(c),j.$render()}else i.activeDate=b,a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=i.activeDate.getFullYear()+a*(i.step.years||0),c=i.activeDate.getMonth()+a*(i.step.months||0);i.activeDate.setFullYear(b,c,1),i.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===i.maxMode&&1===b||a.datepickerMode===i.minMode&&-1===b||(a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var k=function(){e(function(){i.element[0].focus()},0,!1)};a.$on("datepicker.focus",k),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey)if(b.preventDefault(),i.shortcutPropagation||b.stopPropagation(),"enter"===c||"space"===c){if(i.isDisabled(i.activeDate))return;a.select(i.activeDate),k()}else!b.ctrlKey||"up"!==c&&"down"!==c?(i.handleKeyDown(c,b),i.refreshView()):(a.toggleMode("up"===c?1:-1),k())}}]).directive("datepicker",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/datepicker.html",scope:{datepickerMode:"=?",dateDisabled:"&",customClass:"&",shortcutPropagation:"&?"},require:["datepicker","?^ngModel"],controller:"DatepickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}).directive("daypicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/day.html",require:"^datepicker",link:function(b,c,d,e){function f(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?i[b]:29}function g(a,b){var c=new Array(b),d=new Date(a),e=0;for(d.setHours(12);b>e;)c[e++]=new Date(d),d.setDate(d.getDate()+1);return c}function h(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}b.showWeeks=e.showWeeks,e.step={months:1},e.element=c;var i=[31,28,31,30,31,30,31,31,30,31,30,31];e._refreshView=function(){var c=e.activeDate.getFullYear(),d=e.activeDate.getMonth(),f=new Date(c,d,1),i=e.startingDay-f.getDay(),j=i>0?7-i:-i,k=new Date(f);j>0&&k.setDate(-j+1);for(var l=g(k,42),m=0;42>m;m++)l[m]=angular.extend(e.createDateObject(l[m],e.formatDay),{secondary:l[m].getMonth()!==d,uid:b.uniqueId+"-"+m});b.labels=new Array(7);for(var n=0;7>n;n++)b.labels[n]={abbr:a(l[n].date,e.formatDayHeader),full:a(l[n].date,"EEEE")};if(b.title=a(e.activeDate,e.formatDayTitle),b.rows=e.split(l,7),b.showWeeks){b.weekNumbers=[];for(var o=(11-e.startingDay)%7,p=b.rows.length,q=0;p>q;q++)b.weekNumbers.push(h(b.rows[q][o].date))}},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},e.handleKeyDown=function(a){var b=e.activeDate.getDate();if("left"===a)b-=1;else if("up"===a)b-=7;else if("right"===a)b+=1;else if("down"===a)b+=7;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getMonth()+("pageup"===a?-1:1);e.activeDate.setMonth(c,1),b=Math.min(f(e.activeDate.getFullYear(),e.activeDate.getMonth()),b)}else"home"===a?b=1:"end"===a&&(b=f(e.activeDate.getFullYear(),e.activeDate.getMonth()));e.activeDate.setDate(b)},e.refreshView()}}}]).directive("monthpicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/month.html",require:"^datepicker",link:function(b,c,d,e){e.step={years:1},e.element=c,e._refreshView=function(){for(var c=new Array(12),d=e.activeDate.getFullYear(),f=0;12>f;f++)c[f]=angular.extend(e.createDateObject(new Date(d,f,1),e.formatMonth),{uid:b.uniqueId+"-"+f});b.title=a(e.activeDate,e.formatMonthTitle),b.rows=e.split(c,3)},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth())-new Date(b.getFullYear(),b.getMonth())},e.handleKeyDown=function(a){var b=e.activeDate.getMonth();if("left"===a)b-=1;else if("up"===a)b-=3;else if("right"===a)b+=1;else if("down"===a)b+=3;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getFullYear()+("pageup"===a?-1:1);e.activeDate.setFullYear(c)}else"home"===a?b=0:"end"===a&&(b=11);e.activeDate.setMonth(b)},e.refreshView()}}}]).directive("yearpicker",["dateFilter",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/year.html",require:"^datepicker",link:function(a,b,c,d){function e(a){return parseInt((a-1)/f,10)*f+1}var f=d.yearRange;d.step={years:f},d.element=b,d._refreshView=function(){for(var b=new Array(f),c=0,g=e(d.activeDate.getFullYear());f>c;c++)b[c]=angular.extend(d.createDateObject(new Date(g+c,0,1),d.formatYear),{uid:a.uniqueId+"-"+c});a.title=[b[0].label,b[f-1].label].join(" - "),a.rows=d.split(b,5)},d.compare=function(a,b){return a.getFullYear()-b.getFullYear()},d.handleKeyDown=function(a){var b=d.activeDate.getFullYear();"left"===a?b-=1:"up"===a?b-=5:"right"===a?b+=1:"down"===a?b+=5:"pageup"===a||"pagedown"===a?b+=("pageup"===a?-1:1)*d.step.years:"home"===a?b=e(d.activeDate.getFullYear()):"end"===a&&(b=e(d.activeDate.getFullYear())+f-1),d.activeDate.setFullYear(b)},d.refreshView()}}}]).constant("datepickerPopupConfig",{datepickerPopup:"yyyy-MM-dd",html5Types:{date:"yyyy-MM-dd","datetime-local":"yyyy-MM-ddTHH:mm:ss.sss",month:"yyyy-MM"},currentText:"Today",clearText:"Clear",closeText:"Done",closeOnDateSelection:!0,appendToBody:!1,showButtonBar:!0}).directive("datepickerPopup",["$compile","$parse","$document","$position","dateFilter","dateParser","datepickerPopupConfig",function(a,b,c,d,e,f,g){return{restrict:"EA",require:"ngModel",scope:{isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&",customClass:"&"},link:function(h,i,j,k){function l(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function m(a){if(angular.isNumber(a)&&(a=new Date(a)),a){if(angular.isDate(a)&&!isNaN(a))return a;if(angular.isString(a)){var b=f.parse(a,o,h.date)||new Date(a);return isNaN(b)?void 0:b}return void 0}return null}function n(a,b){var c=a||b;if(angular.isNumber(c)&&(c=new Date(c)),c){if(angular.isDate(c)&&!isNaN(c))return!0;if(angular.isString(c)){var d=f.parse(c,o)||new Date(c);return!isNaN(d)}return!1}return!0}var o,p=angular.isDefined(j.closeOnDateSelection)?h.$parent.$eval(j.closeOnDateSelection):g.closeOnDateSelection,q=angular.isDefined(j.datepickerAppendToBody)?h.$parent.$eval(j.datepickerAppendToBody):g.appendToBody;h.showButtonBar=angular.isDefined(j.showButtonBar)?h.$parent.$eval(j.showButtonBar):g.showButtonBar,h.getText=function(a){return h[a+"Text"]||g[a+"Text"]};var r=!1;if(g.html5Types[j.type]?(o=g.html5Types[j.type],r=!0):(o=j.datepickerPopup||g.datepickerPopup,j.$observe("datepickerPopup",function(a){var b=a||g.datepickerPopup;if(b!==o&&(o=b,k.$modelValue=null,!o))throw new Error("datepickerPopup must have a date format specified.")})),!o)throw new Error("datepickerPopup must have a date format specified.");if(r&&j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats.");var s=angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");s.attr({"ng-model":"date","ng-change":"dateSelection()"});var t=angular.element(s.children()[0]);if(r&&"month"==j.type&&(t.attr("datepicker-mode",'"month"'),t.attr("min-mode","month")),j.datepickerOptions){var u=h.$parent.$eval(j.datepickerOptions);u.initDate&&(h.initDate=u.initDate,t.attr("init-date","initDate"),delete u.initDate),angular.forEach(u,function(a,b){t.attr(l(b),a)})}h.watchData={},angular.forEach(["minDate","maxDate","datepickerMode","initDate","shortcutPropagation"],function(a){if(j[a]){var c=b(j[a]);if(h.$parent.$watch(c,function(b){h.watchData[a]=b}),t.attr(l(a),"watchData."+a),"datepickerMode"===a){var d=c.assign;h.$watch("watchData."+a,function(a,b){a!==b&&d(h.$parent,a)})}}}),j.dateDisabled&&t.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),j.showWeeks&&t.attr("show-weeks",j.showWeeks),j.customClass&&t.attr("custom-class","customClass({ date: date, mode: mode })"),r?k.$formatters.push(function(a){return h.date=a,a}):(k.$$parserName="date",k.$validators.date=n,k.$parsers.unshift(m),k.$formatters.push(function(a){return h.date=a,k.$isEmpty(a)?a:e(a,o)})),h.dateSelection=function(a){angular.isDefined(a)&&(h.date=a);var b=h.date?e(h.date,o):"";i.val(b),k.$setViewValue(b),p&&(h.isOpen=!1,i[0].focus())},k.$viewChangeListeners.push(function(){h.date=f.parse(k.$viewValue,o,h.date)||new Date(k.$viewValue)});var v=function(a){h.isOpen&&a.target!==i[0]&&h.$apply(function(){h.isOpen=!1})},w=function(a){h.keydown(a)};i.bind("keydown",w),h.keydown=function(a){27===a.which?(a.preventDefault(),h.isOpen&&a.stopPropagation(),h.close()):40!==a.which||h.isOpen||(h.isOpen=!0)},h.$watch("isOpen",function(a){a?(h.$broadcast("datepicker.focus"),h.position=q?d.offset(i):d.position(i),h.position.top=h.position.top+i.prop("offsetHeight"),c.bind("click",v)):c.unbind("click",v)}),h.select=function(a){if("today"===a){var b=new Date;angular.isDate(h.date)?(a=new Date(h.date),a.setFullYear(b.getFullYear(),b.getMonth(),b.getDate())):a=new Date(b.setHours(0,0,0,0))}h.dateSelection(a)},h.close=function(){h.isOpen=!1,i[0].focus()};var x=a(s)(h);s.remove(),q?c.find("body").append(x):i.after(x),h.$on("$destroy",function(){x.remove(),i.unbind("keydown",w),c.unbind("click",v)})}}}]).directive("datepickerPopupWrap",function(){return{restrict:"EA",replace:!0,transclude:!0,templateUrl:"template/datepicker/popup.html",link:function(a,b){b.bind("click",function(a){a.preventDefault(),a.stopPropagation()})}}}),angular.module("ui.bootstrap.dropdown",["ui.bootstrap.position"]).constant("dropdownConfig",{openClass:"open"}).service("dropdownService",["$document","$rootScope",function(a,b){var c=null;this.open=function(b){c||(a.bind("click",d),a.bind("keydown",e)),c&&c!==b&&(c.isOpen=!1),c=b},this.close=function(b){c===b&&(c=null,a.unbind("click",d),a.unbind("keydown",e))};var d=function(a){if(c&&(!a||"disabled"!==c.getAutoClose())){var d=c.getToggleElement();if(!(a&&d&&d[0].contains(a.target))){var e=c.getElement();a&&"outsideClick"===c.getAutoClose()&&e&&e[0].contains(a.target)||(c.isOpen=!1,b.$$phase||c.$apply())}}},e=function(a){27===a.which&&(c.focusToggleElement(),d())}}]).controller("DropdownController",["$scope","$attrs","$parse","dropdownConfig","dropdownService","$animate","$position","$document",function(a,b,c,d,e,f,g,h){var i,j=this,k=a.$new(),l=d.openClass,m=angular.noop,n=b.onToggle?c(b.onToggle):angular.noop,o=!1;this.init=function(d){j.$element=d,b.isOpen&&(i=c(b.isOpen),m=i.assign,a.$watch(i,function(a){k.isOpen=!!a})),o=angular.isDefined(b.dropdownAppendToBody),o&&j.dropdownMenu&&(h.find("body").append(j.dropdownMenu),d.on("$destroy",function(){j.dropdownMenu.remove()}))},this.toggle=function(a){return k.isOpen=arguments.length?!!a:!k.isOpen},this.isOpen=function(){return k.isOpen},k.getToggleElement=function(){return j.toggleElement},k.getAutoClose=function(){return b.autoClose||"always"},k.getElement=function(){return j.$element},k.focusToggleElement=function(){j.toggleElement&&j.toggleElement[0].focus()},k.$watch("isOpen",function(b,c){if(o&&j.dropdownMenu){var d=g.positionElements(j.$element,j.dropdownMenu,"bottom-left",!0);j.dropdownMenu.css({top:d.top+"px",left:d.left+"px",display:b?"block":"none"})}f[b?"addClass":"removeClass"](j.$element,l),b?(k.focusToggleElement(),e.open(k)):e.close(k),m(a,b),angular.isDefined(b)&&b!==c&&n(a,{open:!!b})}),a.$on("$locationChangeSuccess",function(){k.isOpen=!1}),a.$on("$destroy",function(){k.$destroy()})}]).directive("dropdown",function(){return{controller:"DropdownController",link:function(a,b,c,d){d.init(b)}}}).directive("dropdownMenu",function(){return{restrict:"AC",require:"?^dropdown",link:function(a,b,c,d){d&&(d.dropdownMenu=b)}}}).directive("dropdownToggle",function(){return{require:"?^dropdown",link:function(a,b,c,d){if(d){d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.modal",[]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){function b(b){b.animate=!1,a(function(){b.animate=!0})}return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",compile:function(a,c){return a.addClass(c.backdropClass),b}}}]).directive("modalWindow",["$modalStack","$q",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"template/modal/window.html"},link:function(c,d,e){d.addClass(e.windowClass||""),c.size=e.size,c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))},c.$isRendered=!0;var f=b.defer();e.$observe("modalRender",function(a){"true"==a&&f.resolve()}),f.promise.then(function(){c.animate=!0;var b=d[0].querySelectorAll("[autofocus]");b.length?b[0].focus():d[0].focus();var e=a.getTop();e&&a.modalRendered(e.key)})}}}]).directive("modalAnimationClass",[function(){return{compile:function(a,b){b.modalAnimation&&a.addClass(b.modalAnimationClass)}}}]).directive("modalTransclude",function(){return{link:function(a,b,c,d,e){e(a.$parent,function(a){b.empty(),b.append(a)})}}}).factory("$modalStack",["$animate","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=o.keys(),c=0;c<b.length;c++)o.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("body").eq(0),d=o.get(a).value;o.remove(a),j(d.modalDomEl,d.modalScope,function(){b.toggleClass(n,o.length()>0),i()})}function i(){if(l&&-1==g()){var a=m;j(l,m,function(){a=null}),l=void 0,m=void 0}}function j(c,d,f){function g(){g.done||(g.done=!0,c.remove(),d.$destroy(),f&&f())}d.animate=!1,c.attr("modal-animation")&&a.enabled()?c.one("$animate:close",function(){e.$evalAsync(g)}):b(g)}function k(a,b,c){return!a.value.modalScope.$broadcast("modal.closing",b,c).defaultPrevented}var l,m,n="modal-open",o=f.createNew(),p={};return e.$watch(g,function(a){m&&(m.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=o.top(),b&&b.value.keyboard&&(a.preventDefault(),e.$apply(function(){p.dismiss(b.key,"escape key press")})))}),p.open=function(a,b){var f=c[0].activeElement;o.add(a,{deferred:b.deferred,renderDeferred:b.renderDeferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var h=c.find("body").eq(0),i=g();if(i>=0&&!l){m=e.$new(!0),m.index=i;var j=angular.element('<div modal-backdrop="modal-backdrop"></div>');j.attr("backdrop-class",b.backdropClass),b.animation&&j.attr("modal-animation","true"),l=d(j)(m),h.append(l)}var k=angular.element('<div modal-window="modal-window"></div>');k.attr({"template-url":b.windowTemplateUrl,"window-class":b.windowClass,size:b.size,index:o.length()-1,animate:"animate"}).html(b.content),b.animation&&k.attr("modal-animation","true");var p=d(k)(b.scope);o.top().value.modalDomEl=p,o.top().value.modalOpener=f,h.append(p),h.addClass(n)},p.close=function(a,b){var c=o.get(a);return c&&k(c,b,!0)?(c.value.deferred.resolve(b),h(a),c.value.modalOpener.focus(),!0):!c},p.dismiss=function(a,b){var c=o.get(a);return c&&k(c,b,!1)?(c.value.deferred.reject(b),h(a),c.value.modalOpener.focus(),!0):!c},p.dismissAll=function(a){for(var b=this.getTop();b&&this.dismiss(b.key,a);)b=this.getTop()},p.getTop=function(){return o.top()},p.modalRendered=function(a){var b=o.get(a);b&&b.value.renderDeferred.resolve()},p}]).provider("$modal",function(){var a={options:{animation:!0,backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$templateRequest","$controller","$modalStack",function(b,c,d,e,f,g){function h(a){return a.template?d.when(a.template):e(angular.isFunction(a.templateUrl)?a.templateUrl():a.templateUrl)}function i(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var j={};return j.open=function(b){var e=d.defer(),j=d.defer(),k=d.defer(),l={result:e.promise,opened:j.promise,rendered:k.promise,close:function(a){return g.close(l,a)},dismiss:function(a){return g.dismiss(l,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var m=d.all([h(b)].concat(i(b.resolve)));return m.then(function(a){var d=(b.scope||c).$new();d.$close=l.close,d.$dismiss=l.dismiss;var h,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=l,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),h=f(b.controller,i),b.controllerAs&&(d[b.controllerAs]=h)),g.open(l,{scope:d,deferred:e,renderDeferred:k,content:a[0],animation:b.animation,backdrop:b.backdrop,keyboard:b.keyboard,backdropClass:b.backdropClass,windowClass:b.windowClass,windowTemplateUrl:b.windowTemplateUrl,size:b.size})},function(a){e.reject(a)}),m.then(function(){j.resolve(!0)},function(a){j.reject(a)}),l},j}]};return a}),angular.module("ui.bootstrap.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse",function(a,b,c){var d=this,e={$setViewValue:angular.noop},f=b.numPages?c(b.numPages).assign:angular.noop;
+this.init=function(g,h){e=g,this.config=h,e.$render=function(){d.render()},b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){d.itemsPerPage=parseInt(b,10),a.totalPages=d.calculateTotalPages()}):this.itemsPerPage=h.itemsPerPage,a.$watch("totalItems",function(){a.totalPages=d.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),a.page>b?a.selectPage(b):e.$render()})},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.render=function(){a.page=parseInt(e.$viewValue,10)||1},a.selectPage=function(b,c){a.page!==b&&b>0&&b<=a.totalPages&&(c&&c.target&&c.target.blur(),e.$setViewValue(b),e.$render())},a.getText=function(b){return a[b+"Text"]||d.config[b+"Text"]},a.noPrevious=function(){return 1===a.page},a.noNext=function(){return a.page===a.totalPages}}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@"},require:["pagination","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c){return{number:a,text:b,active:c}}function h(a,b){var c=[],d=1,e=b,f=angular.isDefined(k)&&b>k;f&&(l?(d=Math.max(a-Math.floor(k/2),1),e=d+k-1,e>b&&(e=b,d=e-k+1)):(d=(Math.ceil(a/k)-1)*k+1,e=Math.min(d+k-1,b)));for(var h=d;e>=h;h++){var i=g(h,h,h===a);c.push(i)}if(f&&!l){if(d>1){var j=g(d-1,"...",!1);c.unshift(j)}if(b>e){var m=g(e+1,"...",!1);c.push(m)}}return c}var i=f[0],j=f[1];if(j){var k=angular.isDefined(e.maxSize)?c.$parent.$eval(e.maxSize):b.maxSize,l=angular.isDefined(e.rotate)?c.$parent.$eval(e.rotate):b.rotate;c.boundaryLinks=angular.isDefined(e.boundaryLinks)?c.$parent.$eval(e.boundaryLinks):b.boundaryLinks,c.directionLinks=angular.isDefined(e.directionLinks)?c.$parent.$eval(e.directionLinks):b.directionLinks,i.init(j,b),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){k=parseInt(a,10),i.render()});var m=i.render;i.render=function(){m(),c.page>0&&c.page<=c.totalPages&&(c.pages=h(c.page,c.totalPages))}}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{totalItems:"=",previousText:"@",nextText:"@"},require:["pager","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&(b.align=angular.isDefined(d.align)?b.$parent.$eval(d.align):a.align,f.init(g,a))}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0,useContentExp:!1},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$document","$position","$interpolate",function(e,f,g,h,i,j){return function(e,k,l,m){function n(a){var b=a||m.trigger||l,d=c[b]||b;return{show:b,hide:d}}m=angular.extend({},b,d,m);var o=a(e),p=j.startSymbol(),q=j.endSymbol(),r="<div "+o+'-popup title="'+p+"title"+q+'" '+(m.useContentExp?'content-exp="contentExp()" ':'content="'+p+"content"+q+'" ')+'placement="'+p+"placement"+q+'" popup-class="'+p+"popupClass"+q+'" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>';return{restrict:"EA",compile:function(){var a=f(r);return function(b,c,d){function f(){E.isOpen?l():j()}function j(){(!D||b.$eval(d[k+"Enable"]))&&(s(),E.popupDelay?A||(A=g(o,E.popupDelay,!1),A.then(function(a){a()})):o()())}function l(){b.$apply(function(){p()})}function o(){return A=null,z&&(g.cancel(z),z=null),(m.useContentExp?E.contentExp():E.content)?(q(),x.css({top:0,left:0,display:"block"}),E.$digest(),F(),E.isOpen=!0,E.$apply(),F):angular.noop}function p(){E.isOpen=!1,g.cancel(A),A=null,E.animation?z||(z=g(r,500)):r()}function q(){x&&r(),y=E.$new(),x=a(y,function(a){B?h.find("body").append(a):c.after(a)}),y.$watch(function(){g(F,0,!1)}),m.useContentExp&&y.$watch("contentExp()",function(a){!a&&E.isOpen&&p()})}function r(){z=null,x&&(x.remove(),x=null),y&&(y.$destroy(),y=null)}function s(){t(),u(),v()}function t(){E.popupClass=d[k+"Class"]}function u(){var a=d[k+"Placement"];E.placement=angular.isDefined(a)?a:m.placement}function v(){var a=d[k+"PopupDelay"],b=parseInt(a,10);E.popupDelay=isNaN(b)?m.popupDelay:b}function w(){var a=d[k+"Trigger"];G(),C=n(a),C.show===C.hide?c.bind(C.show,f):(c.bind(C.show,j),c.bind(C.hide,l))}var x,y,z,A,B=angular.isDefined(m.appendToBody)?m.appendToBody:!1,C=n(void 0),D=angular.isDefined(d[k+"Enable"]),E=b.$new(!0),F=function(){if(x){var a=i.positionElements(c,x,E.placement,B);a.top+="px",a.left+="px",x.css(a)}};E.origScope=b,E.isOpen=!1,E.contentExp=function(){return b.$eval(d[e])},m.useContentExp||d.$observe(e,function(a){E.content=a,!a&&E.isOpen&&p()}),d.$observe("disabled",function(a){a&&E.isOpen&&p()}),d.$observe(k+"Title",function(a){E.title=a});var G=function(){c.unbind(C.show,j),c.unbind(C.hide,l)};w();var H=b.$eval(d[k+"Animation"]);E.animation=angular.isDefined(H)?!!H:m.animation;var I=b.$eval(d[k+"AppendToBody"]);B=angular.isDefined(I)?I:B,B&&b.$on("$locationChangeSuccess",function(){E.isOpen&&p()}),b.$on("$destroy",function(){g.cancel(z),g.cancel(A),G(),r(),E=null})}}}}}]}).directive("tooltipTemplateTransclude",["$animate","$sce","$compile","$templateRequest",function(a,b,c,d){return{link:function(e,f,g){var h,i,j,k=e.$eval(g.tooltipTemplateTranscludeScope),l=0,m=function(){i&&(i.remove(),i=null),h&&(h.$destroy(),h=null),j&&(a.leave(j).then(function(){i=null}),i=j,j=null)};e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude),function(b){var g=++l;b?(d(b,!0).then(function(d){if(g===l){var e=k.$new(),i=d,n=c(i)(e,function(b){m(),a.enter(b,f)});h=e,j=n,h.$emit("$includeContentLoaded",b)}},function(){g===l&&(m(),e.$emit("$includeContentError",b))}),e.$emit("$includeContentRequested",b)):m()}),e.$on("$destroy",m)}}}]).directive("tooltipClasses",function(){return{restrict:"A",link:function(a,b,c){a.placement&&b.addClass(a.placement),a.popupClass&&b.addClass(a.popupClass),a.animation()&&b.addClass(c.tooltipAnimationClass)}}}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipTemplatePopup",function(){return{restrict:"EA",replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"template/tooltip/tooltip-template-popup.html"}}).directive("tooltipTemplate",["$tooltip",function(a){return a("tooltipTemplate","tooltip","mouseenter",{useContentExp:!0})}]).directive("tooltipHtmlPopup",function(){return{restrict:"EA",replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-popup.html"}}).directive("tooltipHtml",["$tooltip",function(a){return a("tooltipHtml","tooltip","mouseenter",{useContentExp:!0})}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).value("tooltipHtmlUnsafeSuppressDeprecated",!1).directive("tooltipHtmlUnsafe",["$tooltip","tooltipHtmlUnsafeSuppressDeprecated","$log",function(a,b,c){return b||c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."),a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"template/popover/popover-template.html"}}).directive("popoverTemplate",["$tooltip",function(a){return a("popoverTemplate","popover","click",{useContentExp:!0})}]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(a.max)?a.max:c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",max:"=?",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",max:"=?",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,d.$formatters.push(function(a){return angular.isNumber(a)&&a<<0!==a&&(a=Math.round(a)),a}),this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length&&a.active!==!1?a.active=!0:a.active?b.select(a):a.active=!1},b.removeTab=function(a){var e=c.indexOf(a);if(a.active&&c.length>1&&!d){var f=e==c.length-1?e-1:e+1;b.select(c[f])}c.splice(e,1)};var d;a.$on("$destroy",function(){d=!0})}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse","$log",function(a,b){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(c,d,e){return function(c,d,f,g){c.$watch("active",function(a){a&&g.select(c)}),c.disabled=!1,f.disable&&c.$parent.$watch(a(f.disable),function(a){c.disabled=!!a}),f.disabled&&(b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'),c.$parent.$watch(a(f.disabled),function(a){c.disabled=!!a})),c.select=function(){c.disabled||(c.active=!0)},g.addTab(c),c.$on("$destroy",function(){g.removeTab(c)}),c.$transcludeFn=e}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0,arrowkeys:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a.toString()}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),"m"!==b&&(a.minutes=i(d)),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render,o.$formatters.unshift(function(a){return a?new Date(a):null});var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g);var i=angular.isDefined(b.arrowkeys)?a.$parent.$eval(b.arrowkeys):f.arrowkeys;i&&this.setupArrowkeyEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupArrowkeyEvents=function(b,c){b.bind("keydown",function(b){38===b.which?(b.preventDefault(),a.incrementHours(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementHours(),a.$apply())}),c.bind("keydown",function(b){38===b.which?(b.preventDefault(),a.incrementMinutes(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementMinutes(),a.$apply())})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$viewValue;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.transition",[]).value("$transitionSuppressDeprecated",!1).factory("$transition",["$q","$timeout","$rootScope","$log","$transitionSuppressDeprecated",function(a,b,c,d,e){function f(a){for(var b in a)if(void 0!==h.style[b])return a[b]}e||d.warn("$transition is now deprecated. Use $animate from ngAnimate instead.");var g=function(d,e,f){f=f||{};var h=a.defer(),i=g[f.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(e)?d.addClass(e):angular.isFunction(e)?e(d):angular.isObject(e)&&d.css(e),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},h=document.createElement("trans"),i={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},j={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return g.transitionEndEventName=f(i),g.animationEndEventName=f(j),g}]),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=i.$eval(k.typeaheadFocusFirst)!==!1,v=b(k.ngModel).assign,w=g.parse(k.typeahead),x=i.$new();i.$on("$destroy",function(){x.$destroy()});var y="typeahead-"+x.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":y});var z=angular.element("<div typeahead-popup></div>");z.attr({id:y,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&z.attr("template-url",k.typeaheadTemplateUrl);var A=function(){x.matches=[],x.activeIdx=-1,j.attr("aria-expanded",!1)},B=function(a){return y+"-option-"+a};x.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",B(a))});var C=function(a){var b={$viewValue:a};q(i,!0),c.when(w.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c&&c.length>0){x.activeIdx=u?0:-1,x.matches.length=0;for(var e=0;e<c.length;e++)b[w.itemName]=c[e],x.matches.push({id:B(e),label:w.viewMapper(x,b),model:c[e]});x.query=a,x.position=t?f.offset(j):f.position(j),x.position.top=x.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else A();d&&q(i,!1)},function(){A(),q(i,!1)})};A(),x.query=void 0;var D,E=function(a){D=d(function(){C(a)},o)},F=function(){D&&d.cancel(D)};l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(F(),E(a)):C(a):(q(i,!1),F(),A()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return p||l.$setValidity("editable",!0),s?(d.$model=a,s(i,d)):(d[w.itemName]=a,b=w.viewMapper(i,d),d[w.itemName]=void 0,c=w.viewMapper(i,d),b!==c?b:a)}),x.select=function(a){var b,c,e={};e[w.itemName]=c=x.matches[a].model,b=w.modelMapper(i,e),v(i,b),l.$setValidity("editable",!0),l.$setValidity("parse",!0),r(i,{$item:c,$model:b,$label:w.viewMapper(i,e)}),A(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==x.matches.length&&-1!==h.indexOf(a.which)&&(-1!=x.activeIdx||13!==a.which&&9!==a.which)&&(a.preventDefault(),40===a.which?(x.activeIdx=(x.activeIdx+1)%x.matches.length,x.$digest()):38===a.which?(x.activeIdx=(x.activeIdx>0?x.activeIdx:x.matches.length)-1,x.$digest()):13===a.which||9===a.which?x.$apply(function(){x.select(x.activeIdx)}):27===a.which&&(a.stopPropagation(),A(),x.$digest()))}),j.bind("blur",function(){m=!1});var G=function(a){j[0]!==a.target&&(A(),x.$digest())};e.bind("click",G),i.$on("$destroy",function(){e.unbind("click",G),t&&H.remove(),z.remove()});var H=a(z)(x);t?e.find("body").append(H):j.after(H)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$templateRequest","$compile","$parse",function(a,b,c){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(d,e,f){var g=c(f.templateUrl)(d.$parent)||"template/typeahead/typeahead-match.html";a(g).then(function(a){b(a.trim())(d,function(a){e.replaceWith(a)})})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),!angular.$$csp()&&angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular/.bower.json b/turtles/app/lib/bower_components/angular/.bower.json
new file mode 100644
index 000000000..8a311ecca
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/.bower.json
@@ -0,0 +1,17 @@
+{
+  "name": "angular",
+  "version": "1.4.0",
+  "main": "./angular.js",
+  "ignore": [],
+  "dependencies": {},
+  "homepage": "https://github.com/angular/bower-angular",
+  "_release": "1.4.0",
+  "_resolution": {
+    "type": "version",
+    "tag": "v1.4.0",
+    "commit": "e2f2cf7dc4a3ef1859ab28e657eca0e9edb588ba"
+  },
+  "_source": "git://github.com/angular/bower-angular.git",
+  "_target": ">=1.3.0",
+  "_originalSource": "angular"
+}
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular/README.md b/turtles/app/lib/bower_components/angular/README.md
new file mode 100644
index 000000000..d1bc0eddf
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/README.md
@@ -0,0 +1,64 @@
+# packaged angular
+
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
+[main AngularJS repo](https://github.com/angular/angular.js).
+Please file issues and pull requests against that repo.
+
+## Install
+
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/node_modules/angular/angular.js"></script>
+```
+
+Or `require('angular')` from your code.
+
+### bower
+
+```shell
+bower install angular
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/bower_components/angular/angular.js"></script>
+```
+
+## Documentation
+
+Documentation is available on the
+[AngularJS docs site](http://docs.angularjs.org/).
+
+## License
+
+The MIT License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/turtles/app/lib/bower_components/angular/angular-csp.css b/turtles/app/lib/bower_components/angular/angular-csp.css
new file mode 100644
index 000000000..f3cd926cb
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/angular-csp.css
@@ -0,0 +1,21 @@
+/* Include this file in your html if you are using the CSP mode. */
+
+@charset "UTF-8";
+
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
+.ng-cloak, .x-ng-cloak,
+.ng-hide:not(.ng-hide-animate) {
+  display: none !important;
+}
+
+ng\:form {
+  display: block;
+}
+
+.ng-animate-shim {
+  visibility:hidden;
+}
+
+.ng-anchor {
+  position:absolute;
+}
diff --git a/turtles/app/lib/bower_components/angular/angular.js b/turtles/app/lib/bower_components/angular/angular.js
new file mode 100644
index 000000000..af94745a9
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/angular.js
@@ -0,0 +1,28133 @@
+/**
+ * @license AngularJS v1.4.0
+ * (c) 2010-2015 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+(function(window, document, undefined) {'use strict';
+
+/**
+ * @description
+ *
+ * This object provides a utility for producing rich Error messages within
+ * Angular. It can be called as follows:
+ *
+ * var exampleMinErr = minErr('example');
+ * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
+ *
+ * The above creates an instance of minErr in the example namespace. The
+ * resulting error will have a namespaced error code of example.one.  The
+ * resulting error will replace {0} with the value of foo, and {1} with the
+ * value of bar. The object is not restricted in the number of arguments it can
+ * take.
+ *
+ * If fewer arguments are specified than necessary for interpolation, the extra
+ * interpolation markers will be preserved in the final string.
+ *
+ * Since data will be parsed statically during a build step, some restrictions
+ * are applied with respect to how minErr instances are created and called.
+ * Instances should have names of the form namespaceMinErr for a minErr created
+ * using minErr('namespace') . Error codes, namespaces and template strings
+ * should all be static strings, not variables or general expressions.
+ *
+ * @param {string} module The namespace to use for the new minErr instance.
+ * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
+ *   error from returned function, for cases when a particular type of error is useful.
+ * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
+ */
+
+function minErr(module, ErrorConstructor) {
+  ErrorConstructor = ErrorConstructor || Error;
+  return function() {
+    var SKIP_INDEXES = 2;
+
+    var templateArgs = arguments,
+      code = templateArgs[0],
+      message = '[' + (module ? module + ':' : '') + code + '] ',
+      template = templateArgs[1],
+      paramPrefix, i;
+
+    message += template.replace(/\{\d+\}/g, function(match) {
+      var index = +match.slice(1, -1),
+        shiftedIndex = index + SKIP_INDEXES;
+
+      if (shiftedIndex < templateArgs.length) {
+        return toDebugString(templateArgs[shiftedIndex]);
+      }
+
+      return match;
+    });
+
+    message += '\nhttp://errors.angularjs.org/1.4.0/' +
+      (module ? module + '/' : '') + code;
+
+    for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
+      message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' +
+        encodeURIComponent(toDebugString(templateArgs[i]));
+    }
+
+    return new ErrorConstructor(message);
+  };
+}
+
+/* We need to tell jshint what variables are being exported */
+/* global angular: true,
+  msie: true,
+  jqLite: true,
+  jQuery: true,
+  slice: true,
+  splice: true,
+  push: true,
+  toString: true,
+  ngMinErr: true,
+  angularModule: true,
+  uid: true,
+  REGEX_STRING_REGEXP: true,
+  VALIDITY_STATE_PROPERTY: true,
+
+  lowercase: true,
+  uppercase: true,
+  manualLowercase: true,
+  manualUppercase: true,
+  nodeName_: true,
+  isArrayLike: true,
+  forEach: true,
+  forEachSorted: true,
+  reverseParams: true,
+  nextUid: true,
+  setHashKey: true,
+  extend: true,
+  toInt: true,
+  inherit: true,
+  merge: true,
+  noop: true,
+  identity: true,
+  valueFn: true,
+  isUndefined: true,
+  isDefined: true,
+  isObject: true,
+  isBlankObject: true,
+  isString: true,
+  isNumber: true,
+  isDate: true,
+  isArray: true,
+  isFunction: true,
+  isRegExp: true,
+  isWindow: true,
+  isScope: true,
+  isFile: true,
+  isFormData: true,
+  isBlob: true,
+  isBoolean: true,
+  isPromiseLike: true,
+  trim: true,
+  escapeForRegexp: true,
+  isElement: true,
+  makeMap: true,
+  includes: true,
+  arrayRemove: true,
+  copy: true,
+  shallowCopy: true,
+  equals: true,
+  csp: true,
+  jq: true,
+  concat: true,
+  sliceArgs: true,
+  bind: true,
+  toJsonReplacer: true,
+  toJson: true,
+  fromJson: true,
+  convertTimezoneToLocal: true,
+  timezoneToOffset: true,
+  startingTag: true,
+  tryDecodeURIComponent: true,
+  parseKeyValue: true,
+  toKeyValue: true,
+  encodeUriSegment: true,
+  encodeUriQuery: true,
+  angularInit: true,
+  bootstrap: true,
+  getTestability: true,
+  snake_case: true,
+  bindJQuery: true,
+  assertArg: true,
+  assertArgFn: true,
+  assertNotHasOwnProperty: true,
+  getter: true,
+  getBlockNodes: true,
+  hasOwnProperty: true,
+  createMap: true,
+
+  NODE_TYPE_ELEMENT: true,
+  NODE_TYPE_ATTRIBUTE: true,
+  NODE_TYPE_TEXT: true,
+  NODE_TYPE_COMMENT: true,
+  NODE_TYPE_DOCUMENT: true,
+  NODE_TYPE_DOCUMENT_FRAGMENT: true,
+*/
+
+////////////////////////////////////
+
+/**
+ * @ngdoc module
+ * @name ng
+ * @module ng
+ * @description
+ *
+ * # ng (core module)
+ * The ng module is loaded by default when an AngularJS application is started. The module itself
+ * contains the essential components for an AngularJS application to function. The table below
+ * lists a high level breakdown of each of the services/factories, filters, directives and testing
+ * components available within this core module.
+ *
+ * <div doc-module-components="ng"></div>
+ */
+
+var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/;
+
+// The name of a form control's ValidityState property.
+// This is used so that it's possible for internal tests to create mock ValidityStates.
+var VALIDITY_STATE_PROPERTY = 'validity';
+
+/**
+ * @ngdoc function
+ * @name angular.lowercase
+ * @module ng
+ * @kind function
+ *
+ * @description Converts the specified string to lowercase.
+ * @param {string} string String to be converted to lowercase.
+ * @returns {string} Lowercased string.
+ */
+var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+/**
+ * @ngdoc function
+ * @name angular.uppercase
+ * @module ng
+ * @kind function
+ *
+ * @description Converts the specified string to uppercase.
+ * @param {string} string String to be converted to uppercase.
+ * @returns {string} Uppercased string.
+ */
+var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
+
+
+var manualLowercase = function(s) {
+  /* jshint bitwise: false */
+  return isString(s)
+      ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
+      : s;
+};
+var manualUppercase = function(s) {
+  /* jshint bitwise: false */
+  return isString(s)
+      ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
+      : s;
+};
+
+
+// String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish
+// locale, for this reason we need to detect this case and redefine lowercase/uppercase methods
+// with correct but slower alternatives.
+if ('i' !== 'I'.toLowerCase()) {
+  lowercase = manualLowercase;
+  uppercase = manualUppercase;
+}
+
+
+var
+    msie,             // holds major version number for IE, or NaN if UA is not IE.
+    jqLite,           // delay binding since jQuery could be loaded after us.
+    jQuery,           // delay binding
+    slice             = [].slice,
+    splice            = [].splice,
+    push              = [].push,
+    toString          = Object.prototype.toString,
+    getPrototypeOf    = Object.getPrototypeOf,
+    ngMinErr          = minErr('ng'),
+
+    /** @name angular */
+    angular           = window.angular || (window.angular = {}),
+    angularModule,
+    uid               = 0;
+
+/**
+ * documentMode is an IE-only property
+ * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx
+ */
+msie = document.documentMode;
+
+
+/**
+ * @private
+ * @param {*} obj
+ * @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments,
+ *                   String ...)
+ */
+function isArrayLike(obj) {
+  if (obj == null || isWindow(obj)) {
+    return false;
+  }
+
+  // Support: iOS 8.2 (not reproducible in simulator)
+  // "length" in obj used to prevent JIT error (gh-11508)
+  var length = "length" in Object(obj) && obj.length;
+
+  if (obj.nodeType === NODE_TYPE_ELEMENT && length) {
+    return true;
+  }
+
+  return isString(obj) || isArray(obj) || length === 0 ||
+         typeof length === 'number' && length > 0 && (length - 1) in obj;
+}
+
+/**
+ * @ngdoc function
+ * @name angular.forEach
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Invokes the `iterator` function once for each item in `obj` collection, which can be either an
+ * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value`
+ * is the value of an object property or an array element, `key` is the object property key or
+ * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional.
+ *
+ * It is worth noting that `.forEach` does not iterate over inherited properties because it filters
+ * using the `hasOwnProperty` method.
+ *
+ * Unlike ES262's
+ * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18),
+ * Providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just
+ * return the value provided.
+ *
+   ```js
+     var values = {name: 'misko', gender: 'male'};
+     var log = [];
+     angular.forEach(values, function(value, key) {
+       this.push(key + ': ' + value);
+     }, log);
+     expect(log).toEqual(['name: misko', 'gender: male']);
+   ```
+ *
+ * @param {Object|Array} obj Object to iterate over.
+ * @param {Function} iterator Iterator function.
+ * @param {Object=} context Object to become context (`this`) for the iterator function.
+ * @returns {Object|Array} Reference to `obj`.
+ */
+
+function forEach(obj, iterator, context) {
+  var key, length;
+  if (obj) {
+    if (isFunction(obj)) {
+      for (key in obj) {
+        // Need to check if hasOwnProperty exists,
+        // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function
+        if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    } else if (isArray(obj) || isArrayLike(obj)) {
+      var isPrimitive = typeof obj !== 'object';
+      for (key = 0, length = obj.length; key < length; key++) {
+        if (isPrimitive || key in obj) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    } else if (obj.forEach && obj.forEach !== forEach) {
+        obj.forEach(iterator, context, obj);
+    } else if (isBlankObject(obj)) {
+      // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+      for (key in obj) {
+        iterator.call(context, obj[key], key, obj);
+      }
+    } else if (typeof obj.hasOwnProperty === 'function') {
+      // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
+      for (key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    } else {
+      // Slow path for objects which do not have a method `hasOwnProperty`
+      for (key in obj) {
+        if (hasOwnProperty.call(obj, key)) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    }
+  }
+  return obj;
+}
+
+function forEachSorted(obj, iterator, context) {
+  var keys = Object.keys(obj).sort();
+  for (var i = 0; i < keys.length; i++) {
+    iterator.call(context, obj[keys[i]], keys[i]);
+  }
+  return keys;
+}
+
+
+/**
+ * when using forEach the params are value, key, but it is often useful to have key, value.
+ * @param {function(string, *)} iteratorFn
+ * @returns {function(*, string)}
+ */
+function reverseParams(iteratorFn) {
+  return function(value, key) { iteratorFn(key, value); };
+}
+
+/**
+ * A consistent way of creating unique IDs in angular.
+ *
+ * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before
+ * we hit number precision issues in JavaScript.
+ *
+ * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M
+ *
+ * @returns {number} an unique alpha-numeric string
+ */
+function nextUid() {
+  return ++uid;
+}
+
+
+/**
+ * Set or clear the hashkey for an object.
+ * @param obj object
+ * @param h the hashkey (!truthy to delete the hashkey)
+ */
+function setHashKey(obj, h) {
+  if (h) {
+    obj.$$hashKey = h;
+  } else {
+    delete obj.$$hashKey;
+  }
+}
+
+
+function baseExtend(dst, objs, deep) {
+  var h = dst.$$hashKey;
+
+  for (var i = 0, ii = objs.length; i < ii; ++i) {
+    var obj = objs[i];
+    if (!isObject(obj) && !isFunction(obj)) continue;
+    var keys = Object.keys(obj);
+    for (var j = 0, jj = keys.length; j < jj; j++) {
+      var key = keys[j];
+      var src = obj[key];
+
+      if (deep && isObject(src)) {
+        if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
+        baseExtend(dst[key], [src], true);
+      } else {
+        dst[key] = src;
+      }
+    }
+  }
+
+  setHashKey(dst, h);
+  return dst;
+}
+
+/**
+ * @ngdoc function
+ * @name angular.extend
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+ * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+ * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
+ *
+ * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
+ * {@link angular.merge} for this.
+ *
+ * @param {Object} dst Destination object.
+ * @param {...Object} src Source object(s).
+ * @returns {Object} Reference to `dst`.
+ */
+function extend(dst) {
+  return baseExtend(dst, slice.call(arguments, 1), false);
+}
+
+
+/**
+* @ngdoc function
+* @name angular.merge
+* @module ng
+* @kind function
+*
+* @description
+* Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+* to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+* by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
+*
+* Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
+* objects, performing a deep copy.
+*
+* @param {Object} dst Destination object.
+* @param {...Object} src Source object(s).
+* @returns {Object} Reference to `dst`.
+*/
+function merge(dst) {
+  return baseExtend(dst, slice.call(arguments, 1), true);
+}
+
+
+
+function toInt(str) {
+  return parseInt(str, 10);
+}
+
+
+function inherit(parent, extra) {
+  return extend(Object.create(parent), extra);
+}
+
+/**
+ * @ngdoc function
+ * @name angular.noop
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * A function that performs no operations. This function can be useful when writing code in the
+ * functional style.
+   ```js
+     function foo(callback) {
+       var result = calculateResult();
+       (callback || angular.noop)(result);
+     }
+   ```
+ */
+function noop() {}
+noop.$inject = [];
+
+
+/**
+ * @ngdoc function
+ * @name angular.identity
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * A function that returns its first argument. This function is useful when writing code in the
+ * functional style.
+ *
+   ```js
+     function transformer(transformationFn, value) {
+       return (transformationFn || angular.identity)(value);
+     };
+   ```
+  * @param {*} value to be returned.
+  * @returns {*} the value passed in.
+ */
+function identity($) {return $;}
+identity.$inject = [];
+
+
+function valueFn(value) {return function() {return value;};}
+
+/**
+ * @ngdoc function
+ * @name angular.isUndefined
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is undefined.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is undefined.
+ */
+function isUndefined(value) {return typeof value === 'undefined';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isDefined
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is defined.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is defined.
+ */
+function isDefined(value) {return typeof value !== 'undefined';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isObject
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not
+ * considered to be objects. Note that JavaScript arrays are objects.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is an `Object` but not `null`.
+ */
+function isObject(value) {
+  // http://jsperf.com/isobject4
+  return value !== null && typeof value === 'object';
+}
+
+
+/**
+ * Determine if a value is an object with a null prototype
+ *
+ * @returns {boolean} True if `value` is an `Object` with a null prototype
+ */
+function isBlankObject(value) {
+  return value !== null && typeof value === 'object' && !getPrototypeOf(value);
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isString
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a `String`.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `String`.
+ */
+function isString(value) {return typeof value === 'string';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isNumber
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a `Number`.
+ *
+ * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`.
+ *
+ * If you wish to exclude these then you can use the native
+ * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite)
+ * method.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `Number`.
+ */
+function isNumber(value) {return typeof value === 'number';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isDate
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a value is a date.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `Date`.
+ */
+function isDate(value) {
+  return toString.call(value) === '[object Date]';
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isArray
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is an `Array`.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is an `Array`.
+ */
+var isArray = Array.isArray;
+
+/**
+ * @ngdoc function
+ * @name angular.isFunction
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a `Function`.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `Function`.
+ */
+function isFunction(value) {return typeof value === 'function';}
+
+
+/**
+ * Determines if a value is a regular expression object.
+ *
+ * @private
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `RegExp`.
+ */
+function isRegExp(value) {
+  return toString.call(value) === '[object RegExp]';
+}
+
+
+/**
+ * Checks if `obj` is a window object.
+ *
+ * @private
+ * @param {*} obj Object to check
+ * @returns {boolean} True if `obj` is a window obj.
+ */
+function isWindow(obj) {
+  return obj && obj.window === obj;
+}
+
+
+function isScope(obj) {
+  return obj && obj.$evalAsync && obj.$watch;
+}
+
+
+function isFile(obj) {
+  return toString.call(obj) === '[object File]';
+}
+
+
+function isFormData(obj) {
+  return toString.call(obj) === '[object FormData]';
+}
+
+
+function isBlob(obj) {
+  return toString.call(obj) === '[object Blob]';
+}
+
+
+function isBoolean(value) {
+  return typeof value === 'boolean';
+}
+
+
+function isPromiseLike(obj) {
+  return obj && isFunction(obj.then);
+}
+
+
+var TYPED_ARRAY_REGEXP = /^\[object (Uint8(Clamped)?)|(Uint16)|(Uint32)|(Int8)|(Int16)|(Int32)|(Float(32)|(64))Array\]$/;
+function isTypedArray(value) {
+  return TYPED_ARRAY_REGEXP.test(toString.call(value));
+}
+
+
+var trim = function(value) {
+  return isString(value) ? value.trim() : value;
+};
+
+// Copied from:
+// http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021
+// Prereq: s is a string.
+var escapeForRegexp = function(s) {
+  return s.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g, '\\$1').
+           replace(/\x08/g, '\\x08');
+};
+
+
+/**
+ * @ngdoc function
+ * @name angular.isElement
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a DOM element (or wrapped jQuery element).
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a DOM element (or wrapped jQuery element).
+ */
+function isElement(node) {
+  return !!(node &&
+    (node.nodeName  // we are a direct element
+    || (node.prop && node.attr && node.find)));  // we have an on and find method part of jQuery API
+}
+
+/**
+ * @param str 'key1,key2,...'
+ * @returns {object} in the form of {key1:true, key2:true, ...}
+ */
+function makeMap(str) {
+  var obj = {}, items = str.split(","), i;
+  for (i = 0; i < items.length; i++) {
+    obj[items[i]] = true;
+  }
+  return obj;
+}
+
+
+function nodeName_(element) {
+  return lowercase(element.nodeName || (element[0] && element[0].nodeName));
+}
+
+function includes(array, obj) {
+  return Array.prototype.indexOf.call(array, obj) != -1;
+}
+
+function arrayRemove(array, value) {
+  var index = array.indexOf(value);
+  if (index >= 0) {
+    array.splice(index, 1);
+  }
+  return index;
+}
+
+/**
+ * @ngdoc function
+ * @name angular.copy
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Creates a deep copy of `source`, which should be an object or an array.
+ *
+ * * If no destination is supplied, a copy of the object or array is created.
+ * * If a destination is provided, all of its elements (for arrays) or properties (for objects)
+ *   are deleted and then all elements/properties from the source are copied to it.
+ * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
+ * * If `source` is identical to 'destination' an exception will be thrown.
+ *
+ * @param {*} source The source that will be used to make a copy.
+ *                   Can be any type, including primitives, `null`, and `undefined`.
+ * @param {(Object|Array)=} destination Destination into which the source is copied. If
+ *     provided, must be of the same type as `source`.
+ * @returns {*} The copy or updated `destination`, if `destination` was specified.
+ *
+ * @example
+ <example module="copyExample">
+ <file name="index.html">
+ <div ng-controller="ExampleController">
+ <form novalidate class="simple-form">
+ Name: <input type="text" ng-model="user.name" /><br />
+ E-mail: <input type="email" ng-model="user.email" /><br />
+ Gender: <input type="radio" ng-model="user.gender" value="male" />male
+ <input type="radio" ng-model="user.gender" value="female" />female<br />
+ <button ng-click="reset()">RESET</button>
+ <button ng-click="update(user)">SAVE</button>
+ </form>
+ <pre>form = {{user | json}}</pre>
+ <pre>master = {{master | json}}</pre>
+ </div>
+
+ <script>
+  angular.module('copyExample', [])
+    .controller('ExampleController', ['$scope', function($scope) {
+      $scope.master= {};
+
+      $scope.update = function(user) {
+        // Example with 1 argument
+        $scope.master= angular.copy(user);
+      };
+
+      $scope.reset = function() {
+        // Example with 2 arguments
+        angular.copy($scope.master, $scope.user);
+      };
+
+      $scope.reset();
+    }]);
+ </script>
+ </file>
+ </example>
+ */
+function copy(source, destination, stackSource, stackDest) {
+  if (isWindow(source) || isScope(source)) {
+    throw ngMinErr('cpws',
+      "Can't copy! Making copies of Window or Scope instances is not supported.");
+  }
+  if (isTypedArray(destination)) {
+    throw ngMinErr('cpta',
+      "Can't copy! TypedArray destination cannot be mutated.");
+  }
+
+  if (!destination) {
+    destination = source;
+    if (source) {
+      if (isArray(source)) {
+        destination = copy(source, [], stackSource, stackDest);
+      } else if (isTypedArray(source)) {
+        destination = new source.constructor(source);
+      } else if (isDate(source)) {
+        destination = new Date(source.getTime());
+      } else if (isRegExp(source)) {
+        destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
+        destination.lastIndex = source.lastIndex;
+      } else if (isObject(source)) {
+        var emptyObject = Object.create(getPrototypeOf(source));
+        destination = copy(source, emptyObject, stackSource, stackDest);
+      }
+    }
+  } else {
+    if (source === destination) throw ngMinErr('cpi',
+      "Can't copy! Source and destination are identical.");
+
+    stackSource = stackSource || [];
+    stackDest = stackDest || [];
+
+    if (isObject(source)) {
+      var index = stackSource.indexOf(source);
+      if (index !== -1) return stackDest[index];
+
+      stackSource.push(source);
+      stackDest.push(destination);
+    }
+
+    var result, key;
+    if (isArray(source)) {
+      destination.length = 0;
+      for (var i = 0; i < source.length; i++) {
+        result = copy(source[i], null, stackSource, stackDest);
+        if (isObject(source[i])) {
+          stackSource.push(source[i]);
+          stackDest.push(result);
+        }
+        destination.push(result);
+      }
+    } else {
+      var h = destination.$$hashKey;
+      if (isArray(destination)) {
+        destination.length = 0;
+      } else {
+        forEach(destination, function(value, key) {
+          delete destination[key];
+        });
+      }
+      if (isBlankObject(source)) {
+        // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+        for (key in source) {
+          putValue(key, source[key], destination, stackSource, stackDest);
+        }
+      } else if (source && typeof source.hasOwnProperty === 'function') {
+        // Slow path, which must rely on hasOwnProperty
+        for (key in source) {
+          if (source.hasOwnProperty(key)) {
+            putValue(key, source[key], destination, stackSource, stackDest);
+          }
+        }
+      } else {
+        // Slowest path --- hasOwnProperty can't be called as a method
+        for (key in source) {
+          if (hasOwnProperty.call(source, key)) {
+            putValue(key, source[key], destination, stackSource, stackDest);
+          }
+        }
+      }
+      setHashKey(destination,h);
+    }
+  }
+  return destination;
+
+  function putValue(key, val, destination, stackSource, stackDest) {
+    // No context allocation, trivial outer scope, easily inlined
+    var result = copy(val, null, stackSource, stackDest);
+    if (isObject(val)) {
+      stackSource.push(val);
+      stackDest.push(result);
+    }
+    destination[key] = result;
+  }
+}
+
+/**
+ * Creates a shallow copy of an object, an array or a primitive.
+ *
+ * Assumes that there are no proto properties for objects.
+ */
+function shallowCopy(src, dst) {
+  if (isArray(src)) {
+    dst = dst || [];
+
+    for (var i = 0, ii = src.length; i < ii; i++) {
+      dst[i] = src[i];
+    }
+  } else if (isObject(src)) {
+    dst = dst || {};
+
+    for (var key in src) {
+      if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+        dst[key] = src[key];
+      }
+    }
+  }
+
+  return dst || src;
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.equals
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if two objects or two values are equivalent. Supports value types, regular
+ * expressions, arrays and objects.
+ *
+ * Two objects or values are considered equivalent if at least one of the following is true:
+ *
+ * * Both objects or values pass `===` comparison.
+ * * Both objects or values are of the same type and all of their properties are equal by
+ *   comparing them with `angular.equals`.
+ * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal)
+ * * Both values represent the same regular expression (In JavaScript,
+ *   /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual
+ *   representation matches).
+ *
+ * During a property comparison, properties of `function` type and properties with names
+ * that begin with `$` are ignored.
+ *
+ * Scope and DOMWindow objects are being compared only by identify (`===`).
+ *
+ * @param {*} o1 Object or value to compare.
+ * @param {*} o2 Object or value to compare.
+ * @returns {boolean} True if arguments are equal.
+ */
+function equals(o1, o2) {
+  if (o1 === o2) return true;
+  if (o1 === null || o2 === null) return false;
+  if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
+  var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
+  if (t1 == t2) {
+    if (t1 == 'object') {
+      if (isArray(o1)) {
+        if (!isArray(o2)) return false;
+        if ((length = o1.length) == o2.length) {
+          for (key = 0; key < length; key++) {
+            if (!equals(o1[key], o2[key])) return false;
+          }
+          return true;
+        }
+      } else if (isDate(o1)) {
+        if (!isDate(o2)) return false;
+        return equals(o1.getTime(), o2.getTime());
+      } else if (isRegExp(o1)) {
+        return isRegExp(o2) ? o1.toString() == o2.toString() : false;
+      } else {
+        if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
+          isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
+        keySet = createMap();
+        for (key in o1) {
+          if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+          if (!equals(o1[key], o2[key])) return false;
+          keySet[key] = true;
+        }
+        for (key in o2) {
+          if (!(key in keySet) &&
+              key.charAt(0) !== '$' &&
+              o2[key] !== undefined &&
+              !isFunction(o2[key])) return false;
+        }
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+var csp = function() {
+  if (isDefined(csp.isActive_)) return csp.isActive_;
+
+  var active = !!(document.querySelector('[ng-csp]') ||
+                  document.querySelector('[data-ng-csp]'));
+
+  if (!active) {
+    try {
+      /* jshint -W031, -W054 */
+      new Function('');
+      /* jshint +W031, +W054 */
+    } catch (e) {
+      active = true;
+    }
+  }
+
+  return (csp.isActive_ = active);
+};
+
+/**
+ * @ngdoc directive
+ * @module ng
+ * @name ngJq
+ *
+ * @element ANY
+ * @param {string=} ngJq the name of the library available under `window`
+ * to be used for angular.element
+ * @description
+ * Use this directive to force the angular.element library.  This should be
+ * used to force either jqLite by leaving ng-jq blank or setting the name of
+ * the jquery variable under window (eg. jQuery).
+ *
+ * Since angular looks for this directive when it is loaded (doesn't wait for the
+ * DOMContentLoaded event), it must be placed on an element that comes before the script
+ * which loads angular. Also, only the first instance of `ng-jq` will be used and all
+ * others ignored.
+ *
+ * @example
+ * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
+ ```html
+ <!doctype html>
+ <html ng-app ng-jq>
+ ...
+ ...
+ </html>
+ ```
+ * @example
+ * This example shows how to use a jQuery based library of a different name.
+ * The library name must be available at the top most 'window'.
+ ```html
+ <!doctype html>
+ <html ng-app ng-jq="jQueryLib">
+ ...
+ ...
+ </html>
+ ```
+ */
+var jq = function() {
+  if (isDefined(jq.name_)) return jq.name_;
+  var el;
+  var i, ii = ngAttrPrefixes.length, prefix, name;
+  for (i = 0; i < ii; ++i) {
+    prefix = ngAttrPrefixes[i];
+    if (el = document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) {
+      name = el.getAttribute(prefix + 'jq');
+      break;
+    }
+  }
+
+  return (jq.name_ = name);
+};
+
+function concat(array1, array2, index) {
+  return array1.concat(slice.call(array2, index));
+}
+
+function sliceArgs(args, startIndex) {
+  return slice.call(args, startIndex || 0);
+}
+
+
+/* jshint -W101 */
+/**
+ * @ngdoc function
+ * @name angular.bind
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for
+ * `fn`). You can supply optional `args` that are prebound to the function. This feature is also
+ * known as [partial application](http://en.wikipedia.org/wiki/Partial_application), as
+ * distinguished from [function currying](http://en.wikipedia.org/wiki/Currying#Contrast_with_partial_function_application).
+ *
+ * @param {Object} self Context which `fn` should be evaluated in.
+ * @param {function()} fn Function to be bound.
+ * @param {...*} args Optional arguments to be prebound to the `fn` function call.
+ * @returns {function()} Function that wraps the `fn` with all the specified bindings.
+ */
+/* jshint +W101 */
+function bind(self, fn) {
+  var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : [];
+  if (isFunction(fn) && !(fn instanceof RegExp)) {
+    return curryArgs.length
+      ? function() {
+          return arguments.length
+            ? fn.apply(self, concat(curryArgs, arguments, 0))
+            : fn.apply(self, curryArgs);
+        }
+      : function() {
+          return arguments.length
+            ? fn.apply(self, arguments)
+            : fn.call(self);
+        };
+  } else {
+    // in IE, native methods are not functions so they cannot be bound (note: they don't need to be)
+    return fn;
+  }
+}
+
+
+function toJsonReplacer(key, value) {
+  var val = value;
+
+  if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
+    val = undefined;
+  } else if (isWindow(value)) {
+    val = '$WINDOW';
+  } else if (value &&  document === value) {
+    val = '$DOCUMENT';
+  } else if (isScope(value)) {
+    val = '$SCOPE';
+  }
+
+  return val;
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.toJson
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be
+ * stripped since angular uses this notation internally.
+ *
+ * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
+ * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace.
+ *    If set to an integer, the JSON output will contain that many spaces per indentation.
+ * @returns {string|undefined} JSON-ified string representing `obj`.
+ */
+function toJson(obj, pretty) {
+  if (typeof obj === 'undefined') return undefined;
+  if (!isNumber(pretty)) {
+    pretty = pretty ? 2 : null;
+  }
+  return JSON.stringify(obj, toJsonReplacer, pretty);
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.fromJson
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Deserializes a JSON string.
+ *
+ * @param {string} json JSON string to deserialize.
+ * @returns {Object|Array|string|number} Deserialized JSON string.
+ */
+function fromJson(json) {
+  return isString(json)
+      ? JSON.parse(json)
+      : json;
+}
+
+
+function timezoneToOffset(timezone, fallback) {
+  var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+  return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+}
+
+
+function addDateMinutes(date, minutes) {
+  date = new Date(date.getTime());
+  date.setMinutes(date.getMinutes() + minutes);
+  return date;
+}
+
+
+function convertTimezoneToLocal(date, timezone, reverse) {
+  reverse = reverse ? -1 : 1;
+  var timezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+  return addDateMinutes(date, reverse * (timezoneOffset - date.getTimezoneOffset()));
+}
+
+
+/**
+ * @returns {string} Returns the string representation of the element.
+ */
+function startingTag(element) {
+  element = jqLite(element).clone();
+  try {
+    // turns out IE does not let you set .html() on elements which
+    // are not allowed to have children. So we just ignore it.
+    element.empty();
+  } catch (e) {}
+  var elemHtml = jqLite('<div>').append(element).html();
+  try {
+    return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) :
+        elemHtml.
+          match(/^(<[^>]+>)/)[1].
+          replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); });
+  } catch (e) {
+    return lowercase(elemHtml);
+  }
+
+}
+
+
+/////////////////////////////////////////////////
+
+/**
+ * Tries to decode the URI component without throwing an exception.
+ *
+ * @private
+ * @param str value potential URI component to check.
+ * @returns {boolean} True if `value` can be decoded
+ * with the decodeURIComponent function.
+ */
+function tryDecodeURIComponent(value) {
+  try {
+    return decodeURIComponent(value);
+  } catch (e) {
+    // Ignore any invalid uri component
+  }
+}
+
+
+/**
+ * Parses an escaped url query string into key-value pairs.
+ * @returns {Object.<string,boolean|Array>}
+ */
+function parseKeyValue(/**string*/keyValue) {
+  var obj = {}, key_value, key;
+  forEach((keyValue || "").split('&'), function(keyValue) {
+    if (keyValue) {
+      key_value = keyValue.replace(/\+/g,'%20').split('=');
+      key = tryDecodeURIComponent(key_value[0]);
+      if (isDefined(key)) {
+        var val = isDefined(key_value[1]) ? tryDecodeURIComponent(key_value[1]) : true;
+        if (!hasOwnProperty.call(obj, key)) {
+          obj[key] = val;
+        } else if (isArray(obj[key])) {
+          obj[key].push(val);
+        } else {
+          obj[key] = [obj[key],val];
+        }
+      }
+    }
+  });
+  return obj;
+}
+
+function toKeyValue(obj) {
+  var parts = [];
+  forEach(obj, function(value, key) {
+    if (isArray(value)) {
+      forEach(value, function(arrayValue) {
+        parts.push(encodeUriQuery(key, true) +
+                   (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
+      });
+    } else {
+    parts.push(encodeUriQuery(key, true) +
+               (value === true ? '' : '=' + encodeUriQuery(value, true)));
+    }
+  });
+  return parts.length ? parts.join('&') : '';
+}
+
+
+/**
+ * We need our custom method because encodeURIComponent is too aggressive and doesn't follow
+ * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path
+ * segments:
+ *    segment       = *pchar
+ *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+ *    pct-encoded   = "%" HEXDIG HEXDIG
+ *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+ *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+ *                     / "*" / "+" / "," / ";" / "="
+ */
+function encodeUriSegment(val) {
+  return encodeUriQuery(val, true).
+             replace(/%26/gi, '&').
+             replace(/%3D/gi, '=').
+             replace(/%2B/gi, '+');
+}
+
+
+/**
+ * This method is intended for encoding *key* or *value* parts of query component. We need a custom
+ * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be
+ * encoded per http://tools.ietf.org/html/rfc3986:
+ *    query       = *( pchar / "/" / "?" )
+ *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+ *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+ *    pct-encoded   = "%" HEXDIG HEXDIG
+ *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+ *                     / "*" / "+" / "," / ";" / "="
+ */
+function encodeUriQuery(val, pctEncodeSpaces) {
+  return encodeURIComponent(val).
+             replace(/%40/gi, '@').
+             replace(/%3A/gi, ':').
+             replace(/%24/g, '$').
+             replace(/%2C/gi, ',').
+             replace(/%3B/gi, ';').
+             replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+}
+
+var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
+
+function getNgAttribute(element, ngAttr) {
+  var attr, i, ii = ngAttrPrefixes.length;
+  for (i = 0; i < ii; ++i) {
+    attr = ngAttrPrefixes[i] + ngAttr;
+    if (isString(attr = element.getAttribute(attr))) {
+      return attr;
+    }
+  }
+  return null;
+}
+
+/**
+ * @ngdoc directive
+ * @name ngApp
+ * @module ng
+ *
+ * @element ANY
+ * @param {angular.Module} ngApp an optional application
+ *   {@link angular.module module} name to load.
+ * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be
+ *   created in "strict-di" mode. This means that the application will fail to invoke functions which
+ *   do not use explicit function annotation (and are thus unsuitable for minification), as described
+ *   in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in
+ *   tracking down the root of these bugs.
+ *
+ * @description
+ *
+ * Use this directive to **auto-bootstrap** an AngularJS application. The `ngApp` directive
+ * designates the **root element** of the application and is typically placed near the root element
+ * of the page - e.g. on the `<body>` or `<html>` tags.
+ *
+ * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
+ * found in the document will be used to define the root element to auto-bootstrap as an
+ * application. To run multiple applications in an HTML document you must manually bootstrap them using
+ * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other.
+ *
+ * You can specify an **AngularJS module** to be used as the root module for the application.  This
+ * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It
+ * should contain the application code needed or have dependencies on other modules that will
+ * contain the code. See {@link angular.module} for more information.
+ *
+ * In the example below if the `ngApp` directive were not placed on the `html` element then the
+ * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}`
+ * would not be resolved to `3`.
+ *
+ * `ngApp` is the easiest, and most common way to bootstrap an application.
+ *
+ <example module="ngAppDemo">
+   <file name="index.html">
+   <div ng-controller="ngAppDemoController">
+     I can add: {{a}} + {{b}} =  {{ a+b }}
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('ngAppDemo', []).controller('ngAppDemoController', function($scope) {
+     $scope.a = 1;
+     $scope.b = 2;
+   });
+   </file>
+ </example>
+ *
+ * Using `ngStrictDi`, you would see something like this:
+ *
+ <example ng-app-included="true">
+   <file name="index.html">
+   <div ng-app="ngAppStrictDemo" ng-strict-di>
+       <div ng-controller="GoodController1">
+           I can add: {{a}} + {{b}} =  {{ a+b }}
+
+           <p>This renders because the controller does not fail to
+              instantiate, by using explicit annotation style (see
+              script.js for details)
+           </p>
+       </div>
+
+       <div ng-controller="GoodController2">
+           Name: <input ng-model="name"><br />
+           Hello, {{name}}!
+
+           <p>This renders because the controller does not fail to
+              instantiate, by using explicit annotation style
+              (see script.js for details)
+           </p>
+       </div>
+
+       <div ng-controller="BadController">
+           I can add: {{a}} + {{b}} =  {{ a+b }}
+
+           <p>The controller could not be instantiated, due to relying
+              on automatic function annotations (which are disabled in
+              strict mode). As such, the content of this section is not
+              interpolated, and there should be an error in your web console.
+           </p>
+       </div>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('ngAppStrictDemo', [])
+     // BadController will fail to instantiate, due to relying on automatic function annotation,
+     // rather than an explicit annotation
+     .controller('BadController', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     })
+     // Unlike BadController, GoodController1 and GoodController2 will not fail to be instantiated,
+     // due to using explicit annotations using the array style and $inject property, respectively.
+     .controller('GoodController1', ['$scope', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     }])
+     .controller('GoodController2', GoodController2);
+     function GoodController2($scope) {
+       $scope.name = "World";
+     }
+     GoodController2.$inject = ['$scope'];
+   </file>
+   <file name="style.css">
+   div[ng-controller] {
+       margin-bottom: 1em;
+       -webkit-border-radius: 4px;
+       border-radius: 4px;
+       border: 1px solid;
+       padding: .5em;
+   }
+   div[ng-controller^=Good] {
+       border-color: #d6e9c6;
+       background-color: #dff0d8;
+       color: #3c763d;
+   }
+   div[ng-controller^=Bad] {
+       border-color: #ebccd1;
+       background-color: #f2dede;
+       color: #a94442;
+       margin-bottom: 0;
+   }
+   </file>
+ </example>
+ */
+function angularInit(element, bootstrap) {
+  var appElement,
+      module,
+      config = {};
+
+  // The element `element` has priority over any other element
+  forEach(ngAttrPrefixes, function(prefix) {
+    var name = prefix + 'app';
+
+    if (!appElement && element.hasAttribute && element.hasAttribute(name)) {
+      appElement = element;
+      module = element.getAttribute(name);
+    }
+  });
+  forEach(ngAttrPrefixes, function(prefix) {
+    var name = prefix + 'app';
+    var candidate;
+
+    if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) {
+      appElement = candidate;
+      module = candidate.getAttribute(name);
+    }
+  });
+  if (appElement) {
+    config.strictDi = getNgAttribute(appElement, "strict-di") !== null;
+    bootstrap(appElement, module ? [module] : [], config);
+  }
+}
+
+/**
+ * @ngdoc function
+ * @name angular.bootstrap
+ * @module ng
+ * @description
+ * Use this function to manually start up angular application.
+ *
+ * See: {@link guide/bootstrap Bootstrap}
+ *
+ * Note that Protractor based end-to-end tests cannot use this function to bootstrap manually.
+ * They must use {@link ng.directive:ngApp ngApp}.
+ *
+ * Angular will detect if it has been loaded into the browser more than once and only allow the
+ * first loaded script to be bootstrapped and will report a warning to the browser console for
+ * each of the subsequent scripts. This prevents strange results in applications, where otherwise
+ * multiple instances of Angular try to work on the DOM.
+ *
+ * ```html
+ * <!doctype html>
+ * <html>
+ * <body>
+ * <div ng-controller="WelcomeController">
+ *   {{greeting}}
+ * </div>
+ *
+ * <script src="angular.js"></script>
+ * <script>
+ *   var app = angular.module('demo', [])
+ *   .controller('WelcomeController', function($scope) {
+ *       $scope.greeting = 'Welcome!';
+ *   });
+ *   angular.bootstrap(document, ['demo']);
+ * </script>
+ * </body>
+ * </html>
+ * ```
+ *
+ * @param {DOMElement} element DOM element which is the root of angular application.
+ * @param {Array<String|Function|Array>=} modules an array of modules to load into the application.
+ *     Each item in the array should be the name of a predefined module or a (DI annotated)
+ *     function that will be invoked by the injector as a `config` block.
+ *     See: {@link angular.module modules}
+ * @param {Object=} config an object for defining configuration options for the application. The
+ *     following keys are supported:
+ *
+ * * `strictDi` - disable automatic function annotation for the application. This is meant to
+ *   assist in finding bugs which break minified code. Defaults to `false`.
+ *
+ * @returns {auto.$injector} Returns the newly created injector for this app.
+ */
+function bootstrap(element, modules, config) {
+  if (!isObject(config)) config = {};
+  var defaultConfig = {
+    strictDi: false
+  };
+  config = extend(defaultConfig, config);
+  var doBootstrap = function() {
+    element = jqLite(element);
+
+    if (element.injector()) {
+      var tag = (element[0] === document) ? 'document' : startingTag(element);
+      //Encode angle brackets to prevent input from being sanitized to empty string #8683
+      throw ngMinErr(
+          'btstrpd',
+          "App Already Bootstrapped with this Element '{0}'",
+          tag.replace(/</,'&lt;').replace(/>/,'&gt;'));
+    }
+
+    modules = modules || [];
+    modules.unshift(['$provide', function($provide) {
+      $provide.value('$rootElement', element);
+    }]);
+
+    if (config.debugInfoEnabled) {
+      // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`.
+      modules.push(['$compileProvider', function($compileProvider) {
+        $compileProvider.debugInfoEnabled(true);
+      }]);
+    }
+
+    modules.unshift('ng');
+    var injector = createInjector(modules, config.strictDi);
+    injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector',
+       function bootstrapApply(scope, element, compile, injector) {
+        scope.$apply(function() {
+          element.data('$injector', injector);
+          compile(element)(scope);
+        });
+      }]
+    );
+    return injector;
+  };
+
+  var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/;
+  var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/;
+
+  if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) {
+    config.debugInfoEnabled = true;
+    window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, '');
+  }
+
+  if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) {
+    return doBootstrap();
+  }
+
+  window.name = window.name.replace(NG_DEFER_BOOTSTRAP, '');
+  angular.resumeBootstrap = function(extraModules) {
+    forEach(extraModules, function(module) {
+      modules.push(module);
+    });
+    return doBootstrap();
+  };
+
+  if (isFunction(angular.resumeDeferredBootstrap)) {
+    angular.resumeDeferredBootstrap();
+  }
+}
+
+/**
+ * @ngdoc function
+ * @name angular.reloadWithDebugInfo
+ * @module ng
+ * @description
+ * Use this function to reload the current application with debug information turned on.
+ * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`.
+ *
+ * See {@link ng.$compileProvider#debugInfoEnabled} for more.
+ */
+function reloadWithDebugInfo() {
+  window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name;
+  window.location.reload();
+}
+
+/**
+ * @name angular.getTestability
+ * @module ng
+ * @description
+ * Get the testability service for the instance of Angular on the given
+ * element.
+ * @param {DOMElement} element DOM element which is the root of angular application.
+ */
+function getTestability(rootElement) {
+  var injector = angular.element(rootElement).injector();
+  if (!injector) {
+    throw ngMinErr('test',
+      'no injector found for element argument to getTestability');
+  }
+  return injector.get('$$testability');
+}
+
+var SNAKE_CASE_REGEXP = /[A-Z]/g;
+function snake_case(name, separator) {
+  separator = separator || '_';
+  return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) {
+    return (pos ? separator : '') + letter.toLowerCase();
+  });
+}
+
+var bindJQueryFired = false;
+var skipDestroyOnNextJQueryCleanData;
+function bindJQuery() {
+  var originalCleanData;
+
+  if (bindJQueryFired) {
+    return;
+  }
+
+  // bind to jQuery if present;
+  var jqName = jq();
+  jQuery = window.jQuery; // use default jQuery.
+  if (isDefined(jqName)) { // `ngJq` present
+    jQuery = jqName === null ? undefined : window[jqName]; // if empty; use jqLite. if not empty, use jQuery specified by `ngJq`.
+  }
+
+  // Use jQuery if it exists with proper functionality, otherwise default to us.
+  // Angular 1.2+ requires jQuery 1.7+ for on()/off() support.
+  // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older
+  // versions. It will not work for sure with jQuery <1.7, though.
+  if (jQuery && jQuery.fn.on) {
+    jqLite = jQuery;
+    extend(jQuery.fn, {
+      scope: JQLitePrototype.scope,
+      isolateScope: JQLitePrototype.isolateScope,
+      controller: JQLitePrototype.controller,
+      injector: JQLitePrototype.injector,
+      inheritedData: JQLitePrototype.inheritedData
+    });
+
+    // All nodes removed from the DOM via various jQuery APIs like .remove()
+    // are passed through jQuery.cleanData. Monkey-patch this method to fire
+    // the $destroy event on all removed nodes.
+    originalCleanData = jQuery.cleanData;
+    jQuery.cleanData = function(elems) {
+      var events;
+      if (!skipDestroyOnNextJQueryCleanData) {
+        for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+          events = jQuery._data(elem, "events");
+          if (events && events.$destroy) {
+            jQuery(elem).triggerHandler('$destroy');
+          }
+        }
+      } else {
+        skipDestroyOnNextJQueryCleanData = false;
+      }
+      originalCleanData(elems);
+    };
+  } else {
+    jqLite = JQLite;
+  }
+
+  angular.element = jqLite;
+
+  // Prevent double-proxying.
+  bindJQueryFired = true;
+}
+
+/**
+ * throw error if the argument is falsy.
+ */
+function assertArg(arg, name, reason) {
+  if (!arg) {
+    throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
+  }
+  return arg;
+}
+
+function assertArgFn(arg, name, acceptArrayAnnotation) {
+  if (acceptArrayAnnotation && isArray(arg)) {
+      arg = arg[arg.length - 1];
+  }
+
+  assertArg(isFunction(arg), name, 'not a function, got ' +
+      (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg));
+  return arg;
+}
+
+/**
+ * throw error if the name given is hasOwnProperty
+ * @param  {String} name    the name to test
+ * @param  {String} context the context in which the name is used, such as module or directive
+ */
+function assertNotHasOwnProperty(name, context) {
+  if (name === 'hasOwnProperty') {
+    throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context);
+  }
+}
+
+/**
+ * Return the value accessible from the object by path. Any undefined traversals are ignored
+ * @param {Object} obj starting object
+ * @param {String} path path to traverse
+ * @param {boolean} [bindFnToScope=true]
+ * @returns {Object} value as accessible by path
+ */
+//TODO(misko): this function needs to be removed
+function getter(obj, path, bindFnToScope) {
+  if (!path) return obj;
+  var keys = path.split('.');
+  var key;
+  var lastInstance = obj;
+  var len = keys.length;
+
+  for (var i = 0; i < len; i++) {
+    key = keys[i];
+    if (obj) {
+      obj = (lastInstance = obj)[key];
+    }
+  }
+  if (!bindFnToScope && isFunction(obj)) {
+    return bind(lastInstance, obj);
+  }
+  return obj;
+}
+
+/**
+ * Return the DOM siblings between the first and last node in the given array.
+ * @param {Array} array like object
+ * @returns {jqLite} jqLite collection containing the nodes
+ */
+function getBlockNodes(nodes) {
+  // TODO(perf): just check if all items in `nodes` are siblings and if they are return the original
+  //             collection, otherwise update the original collection.
+  var node = nodes[0];
+  var endNode = nodes[nodes.length - 1];
+  var blockNodes = [node];
+
+  do {
+    node = node.nextSibling;
+    if (!node) break;
+    blockNodes.push(node);
+  } while (node !== endNode);
+
+  return jqLite(blockNodes);
+}
+
+
+/**
+ * Creates a new object without a prototype. This object is useful for lookup without having to
+ * guard against prototypically inherited properties via hasOwnProperty.
+ *
+ * Related micro-benchmarks:
+ * - http://jsperf.com/object-create2
+ * - http://jsperf.com/proto-map-lookup/2
+ * - http://jsperf.com/for-in-vs-object-keys2
+ *
+ * @returns {Object}
+ */
+function createMap() {
+  return Object.create(null);
+}
+
+var NODE_TYPE_ELEMENT = 1;
+var NODE_TYPE_ATTRIBUTE = 2;
+var NODE_TYPE_TEXT = 3;
+var NODE_TYPE_COMMENT = 8;
+var NODE_TYPE_DOCUMENT = 9;
+var NODE_TYPE_DOCUMENT_FRAGMENT = 11;
+
+/**
+ * @ngdoc type
+ * @name angular.Module
+ * @module ng
+ * @description
+ *
+ * Interface for configuring angular {@link angular.module modules}.
+ */
+
+function setupModuleLoader(window) {
+
+  var $injectorMinErr = minErr('$injector');
+  var ngMinErr = minErr('ng');
+
+  function ensure(obj, name, factory) {
+    return obj[name] || (obj[name] = factory());
+  }
+
+  var angular = ensure(window, 'angular', Object);
+
+  // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap
+  angular.$$minErr = angular.$$minErr || minErr;
+
+  return ensure(angular, 'module', function() {
+    /** @type {Object.<string, angular.Module>} */
+    var modules = {};
+
+    /**
+     * @ngdoc function
+     * @name angular.module
+     * @module ng
+     * @description
+     *
+     * The `angular.module` is a global place for creating, registering and retrieving Angular
+     * modules.
+     * All modules (angular core or 3rd party) that should be available to an application must be
+     * registered using this mechanism.
+     *
+     * When passed two or more arguments, a new module is created.  If passed only one argument, an
+     * existing module (the name passed as the first argument to `module`) is retrieved.
+     *
+     *
+     * # Module
+     *
+     * A module is a collection of services, directives, controllers, filters, and configuration information.
+     * `angular.module` is used to configure the {@link auto.$injector $injector}.
+     *
+     * ```js
+     * // Create a new module
+     * var myModule = angular.module('myModule', []);
+     *
+     * // register a new service
+     * myModule.value('appName', 'MyCoolApp');
+     *
+     * // configure existing services inside initialization blocks.
+     * myModule.config(['$locationProvider', function($locationProvider) {
+     *   // Configure existing providers
+     *   $locationProvider.hashPrefix('!');
+     * }]);
+     * ```
+     *
+     * Then you can create an injector and load your modules like this:
+     *
+     * ```js
+     * var injector = angular.injector(['ng', 'myModule'])
+     * ```
+     *
+     * However it's more likely that you'll just use
+     * {@link ng.directive:ngApp ngApp} or
+     * {@link angular.bootstrap} to simplify this process for you.
+     *
+     * @param {!string} name The name of the module to create or retrieve.
+     * @param {!Array.<string>=} requires If specified then new module is being created. If
+     *        unspecified then the module is being retrieved for further configuration.
+     * @param {Function=} configFn Optional configuration function for the module. Same as
+     *        {@link angular.Module#config Module#config()}.
+     * @returns {module} new module with the {@link angular.Module} api.
+     */
+    return function module(name, requires, configFn) {
+      var assertNotHasOwnProperty = function(name, context) {
+        if (name === 'hasOwnProperty') {
+          throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
+        }
+      };
+
+      assertNotHasOwnProperty(name, 'module');
+      if (requires && modules.hasOwnProperty(name)) {
+        modules[name] = null;
+      }
+      return ensure(modules, name, function() {
+        if (!requires) {
+          throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
+             "the module name or forgot to load it. If registering a module ensure that you " +
+             "specify the dependencies as the second argument.", name);
+        }
+
+        /** @type {!Array.<Array.<*>>} */
+        var invokeQueue = [];
+
+        /** @type {!Array.<Function>} */
+        var configBlocks = [];
+
+        /** @type {!Array.<Function>} */
+        var runBlocks = [];
+
+        var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
+
+        /** @type {angular.Module} */
+        var moduleInstance = {
+          // Private state
+          _invokeQueue: invokeQueue,
+          _configBlocks: configBlocks,
+          _runBlocks: runBlocks,
+
+          /**
+           * @ngdoc property
+           * @name angular.Module#requires
+           * @module ng
+           *
+           * @description
+           * Holds the list of modules which the injector will load before the current module is
+           * loaded.
+           */
+          requires: requires,
+
+          /**
+           * @ngdoc property
+           * @name angular.Module#name
+           * @module ng
+           *
+           * @description
+           * Name of the module.
+           */
+          name: name,
+
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#provider
+           * @module ng
+           * @param {string} name service name
+           * @param {Function} providerType Construction function for creating new instance of the
+           *                                service.
+           * @description
+           * See {@link auto.$provide#provider $provide.provider()}.
+           */
+          provider: invokeLater('$provide', 'provider'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#factory
+           * @module ng
+           * @param {string} name service name
+           * @param {Function} providerFunction Function for creating new instance of the service.
+           * @description
+           * See {@link auto.$provide#factory $provide.factory()}.
+           */
+          factory: invokeLater('$provide', 'factory'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#service
+           * @module ng
+           * @param {string} name service name
+           * @param {Function} constructor A constructor function that will be instantiated.
+           * @description
+           * See {@link auto.$provide#service $provide.service()}.
+           */
+          service: invokeLater('$provide', 'service'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#value
+           * @module ng
+           * @param {string} name service name
+           * @param {*} object Service instance object.
+           * @description
+           * See {@link auto.$provide#value $provide.value()}.
+           */
+          value: invokeLater('$provide', 'value'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#constant
+           * @module ng
+           * @param {string} name constant name
+           * @param {*} object Constant value.
+           * @description
+           * Because the constant are fixed, they get applied before other provide methods.
+           * See {@link auto.$provide#constant $provide.constant()}.
+           */
+          constant: invokeLater('$provide', 'constant', 'unshift'),
+
+           /**
+           * @ngdoc method
+           * @name angular.Module#decorator
+           * @module ng
+           * @param {string} The name of the service to decorate.
+           * @param {Function} This function will be invoked when the service needs to be
+           *                                    instantiated and should return the decorated service instance.
+           * @description
+           * See {@link auto.$provide#decorator $provide.decorator()}.
+           */
+          decorator: invokeLater('$provide', 'decorator'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#animation
+           * @module ng
+           * @param {string} name animation name
+           * @param {Function} animationFactory Factory function for creating new instance of an
+           *                                    animation.
+           * @description
+           *
+           * **NOTE**: animations take effect only if the **ngAnimate** module is loaded.
+           *
+           *
+           * Defines an animation hook that can be later used with
+           * {@link $animate $animate} service and directives that use this service.
+           *
+           * ```js
+           * module.animation('.animation-name', function($inject1, $inject2) {
+           *   return {
+           *     eventName : function(element, done) {
+           *       //code to run the animation
+           *       //once complete, then run done()
+           *       return function cancellationFunction(element) {
+           *         //code to cancel the animation
+           *       }
+           *     }
+           *   }
+           * })
+           * ```
+           *
+           * See {@link ng.$animateProvider#register $animateProvider.register()} and
+           * {@link ngAnimate ngAnimate module} for more information.
+           */
+          animation: invokeLater('$animateProvider', 'register'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#filter
+           * @module ng
+           * @param {string} name Filter name - this must be a valid angular expression identifier
+           * @param {Function} filterFactory Factory function for creating new instance of filter.
+           * @description
+           * See {@link ng.$filterProvider#register $filterProvider.register()}.
+           *
+           * <div class="alert alert-warning">
+           * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+           * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+           * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+           * (`myapp_subsection_filterx`).
+           * </div>
+           */
+          filter: invokeLater('$filterProvider', 'register'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#controller
+           * @module ng
+           * @param {string|Object} name Controller name, or an object map of controllers where the
+           *    keys are the names and the values are the constructors.
+           * @param {Function} constructor Controller constructor function.
+           * @description
+           * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
+           */
+          controller: invokeLater('$controllerProvider', 'register'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#directive
+           * @module ng
+           * @param {string|Object} name Directive name, or an object map of directives where the
+           *    keys are the names and the values are the factories.
+           * @param {Function} directiveFactory Factory function for creating new instance of
+           * directives.
+           * @description
+           * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
+           */
+          directive: invokeLater('$compileProvider', 'directive'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#config
+           * @module ng
+           * @param {Function} configFn Execute this function on module load. Useful for service
+           *    configuration.
+           * @description
+           * Use this method to register work which needs to be performed on module loading.
+           * For more about how to configure services, see
+           * {@link providers#provider-recipe Provider Recipe}.
+           */
+          config: config,
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#run
+           * @module ng
+           * @param {Function} initializationFn Execute this function after injector creation.
+           *    Useful for application initialization.
+           * @description
+           * Use this method to register work which should be performed when the injector is done
+           * loading all modules.
+           */
+          run: function(block) {
+            runBlocks.push(block);
+            return this;
+          }
+        };
+
+        if (configFn) {
+          config(configFn);
+        }
+
+        return moduleInstance;
+
+        /**
+         * @param {string} provider
+         * @param {string} method
+         * @param {String=} insertMethod
+         * @returns {angular.Module}
+         */
+        function invokeLater(provider, method, insertMethod, queue) {
+          if (!queue) queue = invokeQueue;
+          return function() {
+            queue[insertMethod || 'push']([provider, method, arguments]);
+            return moduleInstance;
+          };
+        }
+      });
+    };
+  });
+
+}
+
+/* global: toDebugString: true */
+
+function serializeObject(obj) {
+  var seen = [];
+
+  return JSON.stringify(obj, function(key, val) {
+    val = toJsonReplacer(key, val);
+    if (isObject(val)) {
+
+      if (seen.indexOf(val) >= 0) return '<<already seen>>';
+
+      seen.push(val);
+    }
+    return val;
+  });
+}
+
+function toDebugString(obj) {
+  if (typeof obj === 'function') {
+    return obj.toString().replace(/ \{[\s\S]*$/, '');
+  } else if (typeof obj === 'undefined') {
+    return 'undefined';
+  } else if (typeof obj !== 'string') {
+    return serializeObject(obj);
+  }
+  return obj;
+}
+
+/* global angularModule: true,
+  version: true,
+
+  $LocaleProvider,
+  $CompileProvider,
+
+  htmlAnchorDirective,
+  inputDirective,
+  inputDirective,
+  formDirective,
+  scriptDirective,
+  selectDirective,
+  styleDirective,
+  optionDirective,
+  ngBindDirective,
+  ngBindHtmlDirective,
+  ngBindTemplateDirective,
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective,
+  ngCspDirective,
+  ngCloakDirective,
+  ngControllerDirective,
+  ngFormDirective,
+  ngHideDirective,
+  ngIfDirective,
+  ngIncludeDirective,
+  ngIncludeFillContentDirective,
+  ngInitDirective,
+  ngNonBindableDirective,
+  ngPluralizeDirective,
+  ngRepeatDirective,
+  ngShowDirective,
+  ngStyleDirective,
+  ngSwitchDirective,
+  ngSwitchWhenDirective,
+  ngSwitchDefaultDirective,
+  ngOptionsDirective,
+  ngTranscludeDirective,
+  ngModelDirective,
+  ngListDirective,
+  ngChangeDirective,
+  patternDirective,
+  patternDirective,
+  requiredDirective,
+  requiredDirective,
+  minlengthDirective,
+  minlengthDirective,
+  maxlengthDirective,
+  maxlengthDirective,
+  ngValueDirective,
+  ngModelOptionsDirective,
+  ngAttributeAliasDirectives,
+  ngEventDirectives,
+
+  $AnchorScrollProvider,
+  $AnimateProvider,
+  $$CoreAnimateQueueProvider,
+  $$CoreAnimateRunnerProvider,
+  $BrowserProvider,
+  $CacheFactoryProvider,
+  $ControllerProvider,
+  $DocumentProvider,
+  $ExceptionHandlerProvider,
+  $FilterProvider,
+  $InterpolateProvider,
+  $IntervalProvider,
+  $$HashMapProvider,
+  $HttpProvider,
+  $HttpParamSerializerProvider,
+  $HttpParamSerializerJQLikeProvider,
+  $HttpBackendProvider,
+  $LocationProvider,
+  $LogProvider,
+  $ParseProvider,
+  $RootScopeProvider,
+  $QProvider,
+  $$QProvider,
+  $$SanitizeUriProvider,
+  $SceProvider,
+  $SceDelegateProvider,
+  $SnifferProvider,
+  $TemplateCacheProvider,
+  $TemplateRequestProvider,
+  $$TestabilityProvider,
+  $TimeoutProvider,
+  $$RAFProvider,
+  $$AsyncCallbackProvider,
+  $WindowProvider,
+  $$jqLiteProvider,
+  $$CookieReaderProvider
+*/
+
+
+/**
+ * @ngdoc object
+ * @name angular.version
+ * @module ng
+ * @description
+ * An object that contains information about the current AngularJS version. This object has the
+ * following properties:
+ *
+ * - `full` – `{string}` – Full version string, such as "0.9.18".
+ * - `major` – `{number}` – Major version number, such as "0".
+ * - `minor` – `{number}` – Minor version number, such as "9".
+ * - `dot` – `{number}` – Dot version number, such as "18".
+ * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
+ */
+var version = {
+  full: '1.4.0',    // all of these placeholder strings will be replaced by grunt's
+  major: 1,    // package task
+  minor: 4,
+  dot: 0,
+  codeName: 'jaracimrman-existence'
+};
+
+
+function publishExternalAPI(angular) {
+  extend(angular, {
+    'bootstrap': bootstrap,
+    'copy': copy,
+    'extend': extend,
+    'merge': merge,
+    'equals': equals,
+    'element': jqLite,
+    'forEach': forEach,
+    'injector': createInjector,
+    'noop': noop,
+    'bind': bind,
+    'toJson': toJson,
+    'fromJson': fromJson,
+    'identity': identity,
+    'isUndefined': isUndefined,
+    'isDefined': isDefined,
+    'isString': isString,
+    'isFunction': isFunction,
+    'isObject': isObject,
+    'isNumber': isNumber,
+    'isElement': isElement,
+    'isArray': isArray,
+    'version': version,
+    'isDate': isDate,
+    'lowercase': lowercase,
+    'uppercase': uppercase,
+    'callbacks': {counter: 0},
+    'getTestability': getTestability,
+    '$$minErr': minErr,
+    '$$csp': csp,
+    'reloadWithDebugInfo': reloadWithDebugInfo
+  });
+
+  angularModule = setupModuleLoader(window);
+  try {
+    angularModule('ngLocale');
+  } catch (e) {
+    angularModule('ngLocale', []).provider('$locale', $LocaleProvider);
+  }
+
+  angularModule('ng', ['ngLocale'], ['$provide',
+    function ngModule($provide) {
+      // $$sanitizeUriProvider needs to be before $compileProvider as it is used by it.
+      $provide.provider({
+        $$sanitizeUri: $$SanitizeUriProvider
+      });
+      $provide.provider('$compile', $CompileProvider).
+        directive({
+            a: htmlAnchorDirective,
+            input: inputDirective,
+            textarea: inputDirective,
+            form: formDirective,
+            script: scriptDirective,
+            select: selectDirective,
+            style: styleDirective,
+            option: optionDirective,
+            ngBind: ngBindDirective,
+            ngBindHtml: ngBindHtmlDirective,
+            ngBindTemplate: ngBindTemplateDirective,
+            ngClass: ngClassDirective,
+            ngClassEven: ngClassEvenDirective,
+            ngClassOdd: ngClassOddDirective,
+            ngCloak: ngCloakDirective,
+            ngController: ngControllerDirective,
+            ngForm: ngFormDirective,
+            ngHide: ngHideDirective,
+            ngIf: ngIfDirective,
+            ngInclude: ngIncludeDirective,
+            ngInit: ngInitDirective,
+            ngNonBindable: ngNonBindableDirective,
+            ngPluralize: ngPluralizeDirective,
+            ngRepeat: ngRepeatDirective,
+            ngShow: ngShowDirective,
+            ngStyle: ngStyleDirective,
+            ngSwitch: ngSwitchDirective,
+            ngSwitchWhen: ngSwitchWhenDirective,
+            ngSwitchDefault: ngSwitchDefaultDirective,
+            ngOptions: ngOptionsDirective,
+            ngTransclude: ngTranscludeDirective,
+            ngModel: ngModelDirective,
+            ngList: ngListDirective,
+            ngChange: ngChangeDirective,
+            pattern: patternDirective,
+            ngPattern: patternDirective,
+            required: requiredDirective,
+            ngRequired: requiredDirective,
+            minlength: minlengthDirective,
+            ngMinlength: minlengthDirective,
+            maxlength: maxlengthDirective,
+            ngMaxlength: maxlengthDirective,
+            ngValue: ngValueDirective,
+            ngModelOptions: ngModelOptionsDirective
+        }).
+        directive({
+          ngInclude: ngIncludeFillContentDirective
+        }).
+        directive(ngAttributeAliasDirectives).
+        directive(ngEventDirectives);
+      $provide.provider({
+        $anchorScroll: $AnchorScrollProvider,
+        $animate: $AnimateProvider,
+        $$animateQueue: $$CoreAnimateQueueProvider,
+        $$AnimateRunner: $$CoreAnimateRunnerProvider,
+        $browser: $BrowserProvider,
+        $cacheFactory: $CacheFactoryProvider,
+        $controller: $ControllerProvider,
+        $document: $DocumentProvider,
+        $exceptionHandler: $ExceptionHandlerProvider,
+        $filter: $FilterProvider,
+        $interpolate: $InterpolateProvider,
+        $interval: $IntervalProvider,
+        $http: $HttpProvider,
+        $httpParamSerializer: $HttpParamSerializerProvider,
+        $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
+        $httpBackend: $HttpBackendProvider,
+        $location: $LocationProvider,
+        $log: $LogProvider,
+        $parse: $ParseProvider,
+        $rootScope: $RootScopeProvider,
+        $q: $QProvider,
+        $$q: $$QProvider,
+        $sce: $SceProvider,
+        $sceDelegate: $SceDelegateProvider,
+        $sniffer: $SnifferProvider,
+        $templateCache: $TemplateCacheProvider,
+        $templateRequest: $TemplateRequestProvider,
+        $$testability: $$TestabilityProvider,
+        $timeout: $TimeoutProvider,
+        $window: $WindowProvider,
+        $$rAF: $$RAFProvider,
+        $$asyncCallback: $$AsyncCallbackProvider,
+        $$jqLite: $$jqLiteProvider,
+        $$HashMap: $$HashMapProvider,
+        $$cookieReader: $$CookieReaderProvider
+      });
+    }
+  ]);
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* global JQLitePrototype: true,
+  addEventListenerFn: true,
+  removeEventListenerFn: true,
+  BOOLEAN_ATTR: true,
+  ALIASED_ATTR: true,
+*/
+
+//////////////////////////////////
+//JQLite
+//////////////////////////////////
+
+/**
+ * @ngdoc function
+ * @name angular.element
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element.
+ *
+ * If jQuery is available, `angular.element` is an alias for the
+ * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element`
+ * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or "jqLite."
+ *
+ * <div class="alert alert-success">jqLite is a tiny, API-compatible subset of jQuery that allows
+ * Angular to manipulate the DOM in a cross-browser compatible way. **jqLite** implements only the most
+ * commonly needed functionality with the goal of having a very small footprint.</div>
+ *
+ * To use `jQuery`, simply ensure it is loaded before the `angular.js` file.
+ *
+ * <div class="alert">**Note:** all element references in Angular are always wrapped with jQuery or
+ * jqLite; they are never raw DOM references.</div>
+ *
+ * ## Angular's jqLite
+ * jqLite provides only the following jQuery methods:
+ *
+ * - [`addClass()`](http://api.jquery.com/addClass/)
+ * - [`after()`](http://api.jquery.com/after/)
+ * - [`append()`](http://api.jquery.com/append/)
+ * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
+ * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData
+ * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
+ * - [`clone()`](http://api.jquery.com/clone/)
+ * - [`contents()`](http://api.jquery.com/contents/)
+ * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`. As a setter, does not convert numbers to strings or append 'px'.
+ * - [`data()`](http://api.jquery.com/data/)
+ * - [`detach()`](http://api.jquery.com/detach/)
+ * - [`empty()`](http://api.jquery.com/empty/)
+ * - [`eq()`](http://api.jquery.com/eq/)
+ * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name
+ * - [`hasClass()`](http://api.jquery.com/hasClass/)
+ * - [`html()`](http://api.jquery.com/html/)
+ * - [`next()`](http://api.jquery.com/next/) - Does not support selectors
+ * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData
+ * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces or selectors
+ * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors
+ * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors
+ * - [`prepend()`](http://api.jquery.com/prepend/)
+ * - [`prop()`](http://api.jquery.com/prop/)
+ * - [`ready()`](http://api.jquery.com/ready/)
+ * - [`remove()`](http://api.jquery.com/remove/)
+ * - [`removeAttr()`](http://api.jquery.com/removeAttr/)
+ * - [`removeClass()`](http://api.jquery.com/removeClass/)
+ * - [`removeData()`](http://api.jquery.com/removeData/)
+ * - [`replaceWith()`](http://api.jquery.com/replaceWith/)
+ * - [`text()`](http://api.jquery.com/text/)
+ * - [`toggleClass()`](http://api.jquery.com/toggleClass/)
+ * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers.
+ * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces
+ * - [`val()`](http://api.jquery.com/val/)
+ * - [`wrap()`](http://api.jquery.com/wrap/)
+ *
+ * ## jQuery/jqLite Extras
+ * Angular also provides the following additional methods and events to both jQuery and jqLite:
+ *
+ * ### Events
+ * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event
+ *    on all DOM nodes being removed.  This can be used to clean up any 3rd party bindings to the DOM
+ *    element before it is removed.
+ *
+ * ### Methods
+ * - `controller(name)` - retrieves the controller of the current element or its parent. By default
+ *   retrieves controller associated with the `ngController` directive. If `name` is provided as
+ *   camelCase directive name, then the controller for this directive will be retrieved (e.g.
+ *   `'ngModel'`).
+ * - `injector()` - retrieves the injector of the current element or its parent.
+ * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current
+ *   element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to
+ *   be enabled.
+ * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the
+ *   current element. This getter should be used only on elements that contain a directive which starts a new isolate
+ *   scope. Calling `scope()` on this element always returns the original non-isolate scope.
+ *   Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled.
+ * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top
+ *   parent element is reached.
+ *
+ * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery.
+ * @returns {Object} jQuery object.
+ */
+
+JQLite.expando = 'ng339';
+
+var jqCache = JQLite.cache = {},
+    jqId = 1,
+    addEventListenerFn = function(element, type, fn) {
+      element.addEventListener(type, fn, false);
+    },
+    removeEventListenerFn = function(element, type, fn) {
+      element.removeEventListener(type, fn, false);
+    };
+
+/*
+ * !!! This is an undocumented "private" function !!!
+ */
+JQLite._data = function(node) {
+  //jQuery always returns an object on cache miss
+  return this.cache[node[this.expando]] || {};
+};
+
+function jqNextId() { return ++jqId; }
+
+
+var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g;
+var MOZ_HACK_REGEXP = /^moz([A-Z])/;
+var MOUSE_EVENT_MAP= { mouseleave: "mouseout", mouseenter: "mouseover"};
+var jqLiteMinErr = minErr('jqLite');
+
+/**
+ * Converts snake_case to camelCase.
+ * Also there is special case for Moz prefix starting with upper case letter.
+ * @param name Name to normalize
+ */
+function camelCase(name) {
+  return name.
+    replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) {
+      return offset ? letter.toUpperCase() : letter;
+    }).
+    replace(MOZ_HACK_REGEXP, 'Moz$1');
+}
+
+var SINGLE_TAG_REGEXP = /^<(\w+)\s*\/?>(?:<\/\1>|)$/;
+var HTML_REGEXP = /<|&#?\w+;/;
+var TAG_NAME_REGEXP = /<([\w:]+)/;
+var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi;
+
+var wrapMap = {
+  'option': [1, '<select multiple="multiple">', '</select>'],
+
+  'thead': [1, '<table>', '</table>'],
+  'col': [2, '<table><colgroup>', '</colgroup></table>'],
+  'tr': [2, '<table><tbody>', '</tbody></table>'],
+  'td': [3, '<table><tbody><tr>', '</tr></tbody></table>'],
+  '_default': [0, "", ""]
+};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+
+function jqLiteIsTextNode(html) {
+  return !HTML_REGEXP.test(html);
+}
+
+function jqLiteAcceptsData(node) {
+  // The window object can accept data but has no nodeType
+  // Otherwise we are only interested in elements (1) and documents (9)
+  var nodeType = node.nodeType;
+  return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT;
+}
+
+function jqLiteBuildFragment(html, context) {
+  var tmp, tag, wrap,
+      fragment = context.createDocumentFragment(),
+      nodes = [], i;
+
+  if (jqLiteIsTextNode(html)) {
+    // Convert non-html into a text node
+    nodes.push(context.createTextNode(html));
+  } else {
+    // Convert html into DOM nodes
+    tmp = tmp || fragment.appendChild(context.createElement("div"));
+    tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
+    wrap = wrapMap[tag] || wrapMap._default;
+    tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1></$2>") + wrap[2];
+
+    // Descend through wrappers to the right content
+    i = wrap[0];
+    while (i--) {
+      tmp = tmp.lastChild;
+    }
+
+    nodes = concat(nodes, tmp.childNodes);
+
+    tmp = fragment.firstChild;
+    tmp.textContent = "";
+  }
+
+  // Remove wrapper from fragment
+  fragment.textContent = "";
+  fragment.innerHTML = ""; // Clear inner HTML
+  forEach(nodes, function(node) {
+    fragment.appendChild(node);
+  });
+
+  return fragment;
+}
+
+function jqLiteParseHTML(html, context) {
+  context = context || document;
+  var parsed;
+
+  if ((parsed = SINGLE_TAG_REGEXP.exec(html))) {
+    return [context.createElement(parsed[1])];
+  }
+
+  if ((parsed = jqLiteBuildFragment(html, context))) {
+    return parsed.childNodes;
+  }
+
+  return [];
+}
+
+/////////////////////////////////////////////
+function JQLite(element) {
+  if (element instanceof JQLite) {
+    return element;
+  }
+
+  var argIsString;
+
+  if (isString(element)) {
+    element = trim(element);
+    argIsString = true;
+  }
+  if (!(this instanceof JQLite)) {
+    if (argIsString && element.charAt(0) != '<') {
+      throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element');
+    }
+    return new JQLite(element);
+  }
+
+  if (argIsString) {
+    jqLiteAddNodes(this, jqLiteParseHTML(element));
+  } else {
+    jqLiteAddNodes(this, element);
+  }
+}
+
+function jqLiteClone(element) {
+  return element.cloneNode(true);
+}
+
+function jqLiteDealoc(element, onlyDescendants) {
+  if (!onlyDescendants) jqLiteRemoveData(element);
+
+  if (element.querySelectorAll) {
+    var descendants = element.querySelectorAll('*');
+    for (var i = 0, l = descendants.length; i < l; i++) {
+      jqLiteRemoveData(descendants[i]);
+    }
+  }
+}
+
+function jqLiteOff(element, type, fn, unsupported) {
+  if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument');
+
+  var expandoStore = jqLiteExpandoStore(element);
+  var events = expandoStore && expandoStore.events;
+  var handle = expandoStore && expandoStore.handle;
+
+  if (!handle) return; //no listeners registered
+
+  if (!type) {
+    for (type in events) {
+      if (type !== '$destroy') {
+        removeEventListenerFn(element, type, handle);
+      }
+      delete events[type];
+    }
+  } else {
+    forEach(type.split(' '), function(type) {
+      if (isDefined(fn)) {
+        var listenerFns = events[type];
+        arrayRemove(listenerFns || [], fn);
+        if (listenerFns && listenerFns.length > 0) {
+          return;
+        }
+      }
+
+      removeEventListenerFn(element, type, handle);
+      delete events[type];
+    });
+  }
+}
+
+function jqLiteRemoveData(element, name) {
+  var expandoId = element.ng339;
+  var expandoStore = expandoId && jqCache[expandoId];
+
+  if (expandoStore) {
+    if (name) {
+      delete expandoStore.data[name];
+      return;
+    }
+
+    if (expandoStore.handle) {
+      if (expandoStore.events.$destroy) {
+        expandoStore.handle({}, '$destroy');
+      }
+      jqLiteOff(element);
+    }
+    delete jqCache[expandoId];
+    element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
+  }
+}
+
+
+function jqLiteExpandoStore(element, createIfNecessary) {
+  var expandoId = element.ng339,
+      expandoStore = expandoId && jqCache[expandoId];
+
+  if (createIfNecessary && !expandoStore) {
+    element.ng339 = expandoId = jqNextId();
+    expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined};
+  }
+
+  return expandoStore;
+}
+
+
+function jqLiteData(element, key, value) {
+  if (jqLiteAcceptsData(element)) {
+
+    var isSimpleSetter = isDefined(value);
+    var isSimpleGetter = !isSimpleSetter && key && !isObject(key);
+    var massGetter = !key;
+    var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter);
+    var data = expandoStore && expandoStore.data;
+
+    if (isSimpleSetter) { // data('key', value)
+      data[key] = value;
+    } else {
+      if (massGetter) {  // data()
+        return data;
+      } else {
+        if (isSimpleGetter) { // data('key')
+          // don't force creation of expandoStore if it doesn't exist yet
+          return data && data[key];
+        } else { // mass-setter: data({key1: val1, key2: val2})
+          extend(data, key);
+        }
+      }
+    }
+  }
+}
+
+function jqLiteHasClass(element, selector) {
+  if (!element.getAttribute) return false;
+  return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
+      indexOf(" " + selector + " ") > -1);
+}
+
+function jqLiteRemoveClass(element, cssClasses) {
+  if (cssClasses && element.setAttribute) {
+    forEach(cssClasses.split(' '), function(cssClass) {
+      element.setAttribute('class', trim(
+          (" " + (element.getAttribute('class') || '') + " ")
+          .replace(/[\n\t]/g, " ")
+          .replace(" " + trim(cssClass) + " ", " "))
+      );
+    });
+  }
+}
+
+function jqLiteAddClass(element, cssClasses) {
+  if (cssClasses && element.setAttribute) {
+    var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
+                            .replace(/[\n\t]/g, " ");
+
+    forEach(cssClasses.split(' '), function(cssClass) {
+      cssClass = trim(cssClass);
+      if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) {
+        existingClasses += cssClass + ' ';
+      }
+    });
+
+    element.setAttribute('class', trim(existingClasses));
+  }
+}
+
+
+function jqLiteAddNodes(root, elements) {
+  // THIS CODE IS VERY HOT. Don't make changes without benchmarking.
+
+  if (elements) {
+
+    // if a Node (the most common case)
+    if (elements.nodeType) {
+      root[root.length++] = elements;
+    } else {
+      var length = elements.length;
+
+      // if an Array or NodeList and not a Window
+      if (typeof length === 'number' && elements.window !== elements) {
+        if (length) {
+          for (var i = 0; i < length; i++) {
+            root[root.length++] = elements[i];
+          }
+        }
+      } else {
+        root[root.length++] = elements;
+      }
+    }
+  }
+}
+
+
+function jqLiteController(element, name) {
+  return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller');
+}
+
+function jqLiteInheritedData(element, name, value) {
+  // if element is the document object work with the html element instead
+  // this makes $(document).scope() possible
+  if (element.nodeType == NODE_TYPE_DOCUMENT) {
+    element = element.documentElement;
+  }
+  var names = isArray(name) ? name : [name];
+
+  while (element) {
+    for (var i = 0, ii = names.length; i < ii; i++) {
+      if ((value = jqLite.data(element, names[i])) !== undefined) return value;
+    }
+
+    // If dealing with a document fragment node with a host element, and no parent, use the host
+    // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM
+    // to lookup parent controllers.
+    element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host);
+  }
+}
+
+function jqLiteEmpty(element) {
+  jqLiteDealoc(element, true);
+  while (element.firstChild) {
+    element.removeChild(element.firstChild);
+  }
+}
+
+function jqLiteRemove(element, keepData) {
+  if (!keepData) jqLiteDealoc(element);
+  var parent = element.parentNode;
+  if (parent) parent.removeChild(element);
+}
+
+
+function jqLiteDocumentLoaded(action, win) {
+  win = win || window;
+  if (win.document.readyState === 'complete') {
+    // Force the action to be run async for consistent behaviour
+    // from the action's point of view
+    // i.e. it will definitely not be in a $apply
+    win.setTimeout(action);
+  } else {
+    // No need to unbind this handler as load is only ever called once
+    jqLite(win).on('load', action);
+  }
+}
+
+//////////////////////////////////////////
+// Functions which are declared directly.
+//////////////////////////////////////////
+var JQLitePrototype = JQLite.prototype = {
+  ready: function(fn) {
+    var fired = false;
+
+    function trigger() {
+      if (fired) return;
+      fired = true;
+      fn();
+    }
+
+    // check if document is already loaded
+    if (document.readyState === 'complete') {
+      setTimeout(trigger);
+    } else {
+      this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
+      // we can not use jqLite since we are not done loading and jQuery could be loaded later.
+      // jshint -W064
+      JQLite(window).on('load', trigger); // fallback to window.onload for others
+      // jshint +W064
+    }
+  },
+  toString: function() {
+    var value = [];
+    forEach(this, function(e) { value.push('' + e);});
+    return '[' + value.join(', ') + ']';
+  },
+
+  eq: function(index) {
+      return (index >= 0) ? jqLite(this[index]) : jqLite(this[this.length + index]);
+  },
+
+  length: 0,
+  push: push,
+  sort: [].sort,
+  splice: [].splice
+};
+
+//////////////////////////////////////////
+// Functions iterating getter/setters.
+// these functions return self on setter and
+// value on get.
+//////////////////////////////////////////
+var BOOLEAN_ATTR = {};
+forEach('multiple,selected,checked,disabled,readOnly,required,open'.split(','), function(value) {
+  BOOLEAN_ATTR[lowercase(value)] = value;
+});
+var BOOLEAN_ELEMENTS = {};
+forEach('input,select,option,textarea,button,form,details'.split(','), function(value) {
+  BOOLEAN_ELEMENTS[value] = true;
+});
+var ALIASED_ATTR = {
+  'ngMinlength': 'minlength',
+  'ngMaxlength': 'maxlength',
+  'ngMin': 'min',
+  'ngMax': 'max',
+  'ngPattern': 'pattern'
+};
+
+function getBooleanAttrName(element, name) {
+  // check dom last since we will most likely fail on name
+  var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()];
+
+  // booleanAttr is here twice to minimize DOM access
+  return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr;
+}
+
+function getAliasedAttrName(element, name) {
+  var nodeName = element.nodeName;
+  return (nodeName === 'INPUT' || nodeName === 'TEXTAREA') && ALIASED_ATTR[name];
+}
+
+forEach({
+  data: jqLiteData,
+  removeData: jqLiteRemoveData
+}, function(fn, name) {
+  JQLite[name] = fn;
+});
+
+forEach({
+  data: jqLiteData,
+  inheritedData: jqLiteInheritedData,
+
+  scope: function(element) {
+    // Can't use jqLiteData here directly so we stay compatible with jQuery!
+    return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
+  },
+
+  isolateScope: function(element) {
+    // Can't use jqLiteData here directly so we stay compatible with jQuery!
+    return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate');
+  },
+
+  controller: jqLiteController,
+
+  injector: function(element) {
+    return jqLiteInheritedData(element, '$injector');
+  },
+
+  removeAttr: function(element, name) {
+    element.removeAttribute(name);
+  },
+
+  hasClass: jqLiteHasClass,
+
+  css: function(element, name, value) {
+    name = camelCase(name);
+
+    if (isDefined(value)) {
+      element.style[name] = value;
+    } else {
+      return element.style[name];
+    }
+  },
+
+  attr: function(element, name, value) {
+    var nodeType = element.nodeType;
+    if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT) {
+      return;
+    }
+    var lowercasedName = lowercase(name);
+    if (BOOLEAN_ATTR[lowercasedName]) {
+      if (isDefined(value)) {
+        if (!!value) {
+          element[name] = true;
+          element.setAttribute(name, lowercasedName);
+        } else {
+          element[name] = false;
+          element.removeAttribute(lowercasedName);
+        }
+      } else {
+        return (element[name] ||
+                 (element.attributes.getNamedItem(name) || noop).specified)
+               ? lowercasedName
+               : undefined;
+      }
+    } else if (isDefined(value)) {
+      element.setAttribute(name, value);
+    } else if (element.getAttribute) {
+      // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code
+      // some elements (e.g. Document) don't have get attribute, so return undefined
+      var ret = element.getAttribute(name, 2);
+      // normalize non-existing attributes to undefined (as jQuery)
+      return ret === null ? undefined : ret;
+    }
+  },
+
+  prop: function(element, name, value) {
+    if (isDefined(value)) {
+      element[name] = value;
+    } else {
+      return element[name];
+    }
+  },
+
+  text: (function() {
+    getText.$dv = '';
+    return getText;
+
+    function getText(element, value) {
+      if (isUndefined(value)) {
+        var nodeType = element.nodeType;
+        return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : '';
+      }
+      element.textContent = value;
+    }
+  })(),
+
+  val: function(element, value) {
+    if (isUndefined(value)) {
+      if (element.multiple && nodeName_(element) === 'select') {
+        var result = [];
+        forEach(element.options, function(option) {
+          if (option.selected) {
+            result.push(option.value || option.text);
+          }
+        });
+        return result.length === 0 ? null : result;
+      }
+      return element.value;
+    }
+    element.value = value;
+  },
+
+  html: function(element, value) {
+    if (isUndefined(value)) {
+      return element.innerHTML;
+    }
+    jqLiteDealoc(element, true);
+    element.innerHTML = value;
+  },
+
+  empty: jqLiteEmpty
+}, function(fn, name) {
+  /**
+   * Properties: writes return selection, reads return first value
+   */
+  JQLite.prototype[name] = function(arg1, arg2) {
+    var i, key;
+    var nodeCount = this.length;
+
+    // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it
+    // in a way that survives minification.
+    // jqLiteEmpty takes no arguments but is a setter.
+    if (fn !== jqLiteEmpty &&
+        (((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2) === undefined)) {
+      if (isObject(arg1)) {
+
+        // we are a write, but the object properties are the key/values
+        for (i = 0; i < nodeCount; i++) {
+          if (fn === jqLiteData) {
+            // data() takes the whole object in jQuery
+            fn(this[i], arg1);
+          } else {
+            for (key in arg1) {
+              fn(this[i], key, arg1[key]);
+            }
+          }
+        }
+        // return self for chaining
+        return this;
+      } else {
+        // we are a read, so read the first child.
+        // TODO: do we still need this?
+        var value = fn.$dv;
+        // Only if we have $dv do we iterate over all, otherwise it is just the first element.
+        var jj = (value === undefined) ? Math.min(nodeCount, 1) : nodeCount;
+        for (var j = 0; j < jj; j++) {
+          var nodeValue = fn(this[j], arg1, arg2);
+          value = value ? value + nodeValue : nodeValue;
+        }
+        return value;
+      }
+    } else {
+      // we are a write, so apply to all children
+      for (i = 0; i < nodeCount; i++) {
+        fn(this[i], arg1, arg2);
+      }
+      // return self for chaining
+      return this;
+    }
+  };
+});
+
+function createEventHandler(element, events) {
+  var eventHandler = function(event, type) {
+    // jQuery specific api
+    event.isDefaultPrevented = function() {
+      return event.defaultPrevented;
+    };
+
+    var eventFns = events[type || event.type];
+    var eventFnsLength = eventFns ? eventFns.length : 0;
+
+    if (!eventFnsLength) return;
+
+    if (isUndefined(event.immediatePropagationStopped)) {
+      var originalStopImmediatePropagation = event.stopImmediatePropagation;
+      event.stopImmediatePropagation = function() {
+        event.immediatePropagationStopped = true;
+
+        if (event.stopPropagation) {
+          event.stopPropagation();
+        }
+
+        if (originalStopImmediatePropagation) {
+          originalStopImmediatePropagation.call(event);
+        }
+      };
+    }
+
+    event.isImmediatePropagationStopped = function() {
+      return event.immediatePropagationStopped === true;
+    };
+
+    // Copy event handlers in case event handlers array is modified during execution.
+    if ((eventFnsLength > 1)) {
+      eventFns = shallowCopy(eventFns);
+    }
+
+    for (var i = 0; i < eventFnsLength; i++) {
+      if (!event.isImmediatePropagationStopped()) {
+        eventFns[i].call(element, event);
+      }
+    }
+  };
+
+  // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all
+  //       events on `element`
+  eventHandler.elem = element;
+  return eventHandler;
+}
+
+//////////////////////////////////////////
+// Functions iterating traversal.
+// These functions chain results into a single
+// selector.
+//////////////////////////////////////////
+forEach({
+  removeData: jqLiteRemoveData,
+
+  on: function jqLiteOn(element, type, fn, unsupported) {
+    if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters');
+
+    // Do not add event handlers to non-elements because they will not be cleaned up.
+    if (!jqLiteAcceptsData(element)) {
+      return;
+    }
+
+    var expandoStore = jqLiteExpandoStore(element, true);
+    var events = expandoStore.events;
+    var handle = expandoStore.handle;
+
+    if (!handle) {
+      handle = expandoStore.handle = createEventHandler(element, events);
+    }
+
+    // http://jsperf.com/string-indexof-vs-split
+    var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type];
+    var i = types.length;
+
+    while (i--) {
+      type = types[i];
+      var eventFns = events[type];
+
+      if (!eventFns) {
+        events[type] = [];
+
+        if (type === 'mouseenter' || type === 'mouseleave') {
+          // Refer to jQuery's implementation of mouseenter & mouseleave
+          // Read about mouseenter and mouseleave:
+          // http://www.quirksmode.org/js/events_mouse.html#link8
+
+          jqLiteOn(element, MOUSE_EVENT_MAP[type], function(event) {
+            var target = this, related = event.relatedTarget;
+            // For mousenter/leave call the handler if related is outside the target.
+            // NB: No relatedTarget if the mouse left/entered the browser window
+            if (!related || (related !== target && !target.contains(related))) {
+              handle(event, type);
+            }
+          });
+
+        } else {
+          if (type !== '$destroy') {
+            addEventListenerFn(element, type, handle);
+          }
+        }
+        eventFns = events[type];
+      }
+      eventFns.push(fn);
+    }
+  },
+
+  off: jqLiteOff,
+
+  one: function(element, type, fn) {
+    element = jqLite(element);
+
+    //add the listener twice so that when it is called
+    //you can remove the original function and still be
+    //able to call element.off(ev, fn) normally
+    element.on(type, function onFn() {
+      element.off(type, fn);
+      element.off(type, onFn);
+    });
+    element.on(type, fn);
+  },
+
+  replaceWith: function(element, replaceNode) {
+    var index, parent = element.parentNode;
+    jqLiteDealoc(element);
+    forEach(new JQLite(replaceNode), function(node) {
+      if (index) {
+        parent.insertBefore(node, index.nextSibling);
+      } else {
+        parent.replaceChild(node, element);
+      }
+      index = node;
+    });
+  },
+
+  children: function(element) {
+    var children = [];
+    forEach(element.childNodes, function(element) {
+      if (element.nodeType === NODE_TYPE_ELEMENT) {
+        children.push(element);
+      }
+    });
+    return children;
+  },
+
+  contents: function(element) {
+    return element.contentDocument || element.childNodes || [];
+  },
+
+  append: function(element, node) {
+    var nodeType = element.nodeType;
+    if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return;
+
+    node = new JQLite(node);
+
+    for (var i = 0, ii = node.length; i < ii; i++) {
+      var child = node[i];
+      element.appendChild(child);
+    }
+  },
+
+  prepend: function(element, node) {
+    if (element.nodeType === NODE_TYPE_ELEMENT) {
+      var index = element.firstChild;
+      forEach(new JQLite(node), function(child) {
+        element.insertBefore(child, index);
+      });
+    }
+  },
+
+  wrap: function(element, wrapNode) {
+    wrapNode = jqLite(wrapNode).eq(0).clone()[0];
+    var parent = element.parentNode;
+    if (parent) {
+      parent.replaceChild(wrapNode, element);
+    }
+    wrapNode.appendChild(element);
+  },
+
+  remove: jqLiteRemove,
+
+  detach: function(element) {
+    jqLiteRemove(element, true);
+  },
+
+  after: function(element, newElement) {
+    var index = element, parent = element.parentNode;
+    newElement = new JQLite(newElement);
+
+    for (var i = 0, ii = newElement.length; i < ii; i++) {
+      var node = newElement[i];
+      parent.insertBefore(node, index.nextSibling);
+      index = node;
+    }
+  },
+
+  addClass: jqLiteAddClass,
+  removeClass: jqLiteRemoveClass,
+
+  toggleClass: function(element, selector, condition) {
+    if (selector) {
+      forEach(selector.split(' '), function(className) {
+        var classCondition = condition;
+        if (isUndefined(classCondition)) {
+          classCondition = !jqLiteHasClass(element, className);
+        }
+        (classCondition ? jqLiteAddClass : jqLiteRemoveClass)(element, className);
+      });
+    }
+  },
+
+  parent: function(element) {
+    var parent = element.parentNode;
+    return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null;
+  },
+
+  next: function(element) {
+    return element.nextElementSibling;
+  },
+
+  find: function(element, selector) {
+    if (element.getElementsByTagName) {
+      return element.getElementsByTagName(selector);
+    } else {
+      return [];
+    }
+  },
+
+  clone: jqLiteClone,
+
+  triggerHandler: function(element, event, extraParameters) {
+
+    var dummyEvent, eventFnsCopy, handlerArgs;
+    var eventName = event.type || event;
+    var expandoStore = jqLiteExpandoStore(element);
+    var events = expandoStore && expandoStore.events;
+    var eventFns = events && events[eventName];
+
+    if (eventFns) {
+      // Create a dummy event to pass to the handlers
+      dummyEvent = {
+        preventDefault: function() { this.defaultPrevented = true; },
+        isDefaultPrevented: function() { return this.defaultPrevented === true; },
+        stopImmediatePropagation: function() { this.immediatePropagationStopped = true; },
+        isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; },
+        stopPropagation: noop,
+        type: eventName,
+        target: element
+      };
+
+      // If a custom event was provided then extend our dummy event with it
+      if (event.type) {
+        dummyEvent = extend(dummyEvent, event);
+      }
+
+      // Copy event handlers in case event handlers array is modified during execution.
+      eventFnsCopy = shallowCopy(eventFns);
+      handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent];
+
+      forEach(eventFnsCopy, function(fn) {
+        if (!dummyEvent.isImmediatePropagationStopped()) {
+          fn.apply(element, handlerArgs);
+        }
+      });
+    }
+  }
+}, function(fn, name) {
+  /**
+   * chaining functions
+   */
+  JQLite.prototype[name] = function(arg1, arg2, arg3) {
+    var value;
+
+    for (var i = 0, ii = this.length; i < ii; i++) {
+      if (isUndefined(value)) {
+        value = fn(this[i], arg1, arg2, arg3);
+        if (isDefined(value)) {
+          // any function which returns a value needs to be wrapped
+          value = jqLite(value);
+        }
+      } else {
+        jqLiteAddNodes(value, fn(this[i], arg1, arg2, arg3));
+      }
+    }
+    return isDefined(value) ? value : this;
+  };
+
+  // bind legacy bind/unbind to on/off
+  JQLite.prototype.bind = JQLite.prototype.on;
+  JQLite.prototype.unbind = JQLite.prototype.off;
+});
+
+
+// Provider for private $$jqLite service
+function $$jqLiteProvider() {
+  this.$get = function $$jqLite() {
+    return extend(JQLite, {
+      hasClass: function(node, classes) {
+        if (node.attr) node = node[0];
+        return jqLiteHasClass(node, classes);
+      },
+      addClass: function(node, classes) {
+        if (node.attr) node = node[0];
+        return jqLiteAddClass(node, classes);
+      },
+      removeClass: function(node, classes) {
+        if (node.attr) node = node[0];
+        return jqLiteRemoveClass(node, classes);
+      }
+    });
+  };
+}
+
+/**
+ * Computes a hash of an 'obj'.
+ * Hash of a:
+ *  string is string
+ *  number is number as string
+ *  object is either result of calling $$hashKey function on the object or uniquely generated id,
+ *         that is also assigned to the $$hashKey property of the object.
+ *
+ * @param obj
+ * @returns {string} hash string such that the same input will have the same hash string.
+ *         The resulting string key is in 'type:hashKey' format.
+ */
+function hashKey(obj, nextUidFn) {
+  var key = obj && obj.$$hashKey;
+
+  if (key) {
+    if (typeof key === 'function') {
+      key = obj.$$hashKey();
+    }
+    return key;
+  }
+
+  var objType = typeof obj;
+  if (objType == 'function' || (objType == 'object' && obj !== null)) {
+    key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)();
+  } else {
+    key = objType + ':' + obj;
+  }
+
+  return key;
+}
+
+/**
+ * HashMap which can use objects as keys
+ */
+function HashMap(array, isolatedUid) {
+  if (isolatedUid) {
+    var uid = 0;
+    this.nextUid = function() {
+      return ++uid;
+    };
+  }
+  forEach(array, this.put, this);
+}
+HashMap.prototype = {
+  /**
+   * Store key value pair
+   * @param key key to store can be any type
+   * @param value value to store can be any type
+   */
+  put: function(key, value) {
+    this[hashKey(key, this.nextUid)] = value;
+  },
+
+  /**
+   * @param key
+   * @returns {Object} the value for the key
+   */
+  get: function(key) {
+    return this[hashKey(key, this.nextUid)];
+  },
+
+  /**
+   * Remove the key/value pair
+   * @param key
+   */
+  remove: function(key) {
+    var value = this[key = hashKey(key, this.nextUid)];
+    delete this[key];
+    return value;
+  }
+};
+
+var $$HashMapProvider = [function() {
+  this.$get = [function() {
+    return HashMap;
+  }];
+}];
+
+/**
+ * @ngdoc function
+ * @module ng
+ * @name angular.injector
+ * @kind function
+ *
+ * @description
+ * Creates an injector object that can be used for retrieving services as well as for
+ * dependency injection (see {@link guide/di dependency injection}).
+ *
+ * @param {Array.<string|Function>} modules A list of module functions or their aliases. See
+ *     {@link angular.module}. The `ng` module must be explicitly added.
+ * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which
+ *     disallows argument name annotation inference.
+ * @returns {injector} Injector object. See {@link auto.$injector $injector}.
+ *
+ * @example
+ * Typical usage
+ * ```js
+ *   // create an injector
+ *   var $injector = angular.injector(['ng']);
+ *
+ *   // use the injector to kick off your application
+ *   // use the type inference to auto inject arguments, or use implicit injection
+ *   $injector.invoke(function($rootScope, $compile, $document) {
+ *     $compile($document)($rootScope);
+ *     $rootScope.$digest();
+ *   });
+ * ```
+ *
+ * Sometimes you want to get access to the injector of a currently running Angular app
+ * from outside Angular. Perhaps, you want to inject and compile some markup after the
+ * application has been bootstrapped. You can do this using the extra `injector()` added
+ * to JQuery/jqLite elements. See {@link angular.element}.
+ *
+ * *This is fairly rare but could be the case if a third party library is injecting the
+ * markup.*
+ *
+ * In the following example a new block of HTML containing a `ng-controller`
+ * directive is added to the end of the document body by JQuery. We then compile and link
+ * it into the current AngularJS scope.
+ *
+ * ```js
+ * var $div = $('<div ng-controller="MyCtrl">{{content.label}}</div>');
+ * $(document.body).append($div);
+ *
+ * angular.element(document).injector().invoke(function($compile) {
+ *   var scope = angular.element($div).scope();
+ *   $compile($div)(scope);
+ * });
+ * ```
+ */
+
+
+/**
+ * @ngdoc module
+ * @name auto
+ * @description
+ *
+ * Implicit module which gets automatically added to each {@link auto.$injector $injector}.
+ */
+
+var FN_ARGS = /^function\s*[^\(]*\(\s*([^\)]*)\)/m;
+var FN_ARG_SPLIT = /,/;
+var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
+var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
+var $injectorMinErr = minErr('$injector');
+
+function anonFn(fn) {
+  // For anonymous functions, showing at the very least the function signature can help in
+  // debugging.
+  var fnText = fn.toString().replace(STRIP_COMMENTS, ''),
+      args = fnText.match(FN_ARGS);
+  if (args) {
+    return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')';
+  }
+  return 'fn';
+}
+
+function annotate(fn, strictDi, name) {
+  var $inject,
+      fnText,
+      argDecl,
+      last;
+
+  if (typeof fn === 'function') {
+    if (!($inject = fn.$inject)) {
+      $inject = [];
+      if (fn.length) {
+        if (strictDi) {
+          if (!isString(name) || !name) {
+            name = fn.name || anonFn(fn);
+          }
+          throw $injectorMinErr('strictdi',
+            '{0} is not using explicit annotation and cannot be invoked in strict mode', name);
+        }
+        fnText = fn.toString().replace(STRIP_COMMENTS, '');
+        argDecl = fnText.match(FN_ARGS);
+        forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) {
+          arg.replace(FN_ARG, function(all, underscore, name) {
+            $inject.push(name);
+          });
+        });
+      }
+      fn.$inject = $inject;
+    }
+  } else if (isArray(fn)) {
+    last = fn.length - 1;
+    assertArgFn(fn[last], 'fn');
+    $inject = fn.slice(0, last);
+  } else {
+    assertArgFn(fn, 'fn', true);
+  }
+  return $inject;
+}
+
+///////////////////////////////////////
+
+/**
+ * @ngdoc service
+ * @name $injector
+ *
+ * @description
+ *
+ * `$injector` is used to retrieve object instances as defined by
+ * {@link auto.$provide provider}, instantiate types, invoke methods,
+ * and load modules.
+ *
+ * The following always holds true:
+ *
+ * ```js
+ *   var $injector = angular.injector();
+ *   expect($injector.get('$injector')).toBe($injector);
+ *   expect($injector.invoke(function($injector) {
+ *     return $injector;
+ *   })).toBe($injector);
+ * ```
+ *
+ * # Injection Function Annotation
+ *
+ * JavaScript does not have annotations, and annotations are needed for dependency injection. The
+ * following are all valid ways of annotating function with injection arguments and are equivalent.
+ *
+ * ```js
+ *   // inferred (only works if code not minified/obfuscated)
+ *   $injector.invoke(function(serviceA){});
+ *
+ *   // annotated
+ *   function explicit(serviceA) {};
+ *   explicit.$inject = ['serviceA'];
+ *   $injector.invoke(explicit);
+ *
+ *   // inline
+ *   $injector.invoke(['serviceA', function(serviceA){}]);
+ * ```
+ *
+ * ## Inference
+ *
+ * In JavaScript calling `toString()` on a function returns the function definition. The definition
+ * can then be parsed and the function arguments can be extracted. This method of discovering
+ * annotations is disallowed when the injector is in strict mode.
+ * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the
+ * argument names.
+ *
+ * ## `$inject` Annotation
+ * By adding an `$inject` property onto a function the injection parameters can be specified.
+ *
+ * ## Inline
+ * As an array of injection names, where the last item in the array is the function to call.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#get
+ *
+ * @description
+ * Return an instance of the service.
+ *
+ * @param {string} name The name of the instance to retrieve.
+ * @param {string=} caller An optional string to provide the origin of the function call for error messages.
+ * @return {*} The instance.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#invoke
+ *
+ * @description
+ * Invoke the method and supply the method arguments from the `$injector`.
+ *
+ * @param {Function|Array.<string|Function>} fn The injectable function to invoke. Function parameters are
+ *   injected according to the {@link guide/di $inject Annotation} rules.
+ * @param {Object=} self The `this` for the invoked method.
+ * @param {Object=} locals Optional object. If preset then any argument names are read from this
+ *                         object first, before the `$injector` is consulted.
+ * @returns {*} the value returned by the invoked `fn` function.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#has
+ *
+ * @description
+ * Allows the user to query if the particular service exists.
+ *
+ * @param {string} name Name of the service to query.
+ * @returns {boolean} `true` if injector has given service.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#instantiate
+ * @description
+ * Create a new instance of JS type. The method takes a constructor function, invokes the new
+ * operator, and supplies all of the arguments to the constructor function as specified by the
+ * constructor annotation.
+ *
+ * @param {Function} Type Annotated constructor function.
+ * @param {Object=} locals Optional object. If preset then any argument names are read from this
+ * object first, before the `$injector` is consulted.
+ * @returns {Object} new instance of `Type`.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#annotate
+ *
+ * @description
+ * Returns an array of service names which the function is requesting for injection. This API is
+ * used by the injector to determine which services need to be injected into the function when the
+ * function is invoked. There are three ways in which the function can be annotated with the needed
+ * dependencies.
+ *
+ * # Argument names
+ *
+ * The simplest form is to extract the dependencies from the arguments of the function. This is done
+ * by converting the function into a string using `toString()` method and extracting the argument
+ * names.
+ * ```js
+ *   // Given
+ *   function MyController($scope, $route) {
+ *     // ...
+ *   }
+ *
+ *   // Then
+ *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
+ * ```
+ *
+ * You can disallow this method by using strict injection mode.
+ *
+ * This method does not work with code minification / obfuscation. For this reason the following
+ * annotation strategies are supported.
+ *
+ * # The `$inject` property
+ *
+ * If a function has an `$inject` property and its value is an array of strings, then the strings
+ * represent names of services to be injected into the function.
+ * ```js
+ *   // Given
+ *   var MyController = function(obfuscatedScope, obfuscatedRoute) {
+ *     // ...
+ *   }
+ *   // Define function dependencies
+ *   MyController['$inject'] = ['$scope', '$route'];
+ *
+ *   // Then
+ *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
+ * ```
+ *
+ * # The array notation
+ *
+ * It is often desirable to inline Injected functions and that's when setting the `$inject` property
+ * is very inconvenient. In these situations using the array notation to specify the dependencies in
+ * a way that survives minification is a better choice:
+ *
+ * ```js
+ *   // We wish to write this (not minification / obfuscation safe)
+ *   injector.invoke(function($compile, $rootScope) {
+ *     // ...
+ *   });
+ *
+ *   // We are forced to write break inlining
+ *   var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) {
+ *     // ...
+ *   };
+ *   tmpFn.$inject = ['$compile', '$rootScope'];
+ *   injector.invoke(tmpFn);
+ *
+ *   // To better support inline function the inline annotation is supported
+ *   injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) {
+ *     // ...
+ *   }]);
+ *
+ *   // Therefore
+ *   expect(injector.annotate(
+ *      ['$compile', '$rootScope', function(obfus_$compile, obfus_$rootScope) {}])
+ *    ).toEqual(['$compile', '$rootScope']);
+ * ```
+ *
+ * @param {Function|Array.<string|Function>} fn Function for which dependent service names need to
+ * be retrieved as described above.
+ *
+ * @param {boolean=} [strictDi=false] Disallow argument name annotation inference.
+ *
+ * @returns {Array.<string>} The names of the services which the function requires.
+ */
+
+
+
+
+/**
+ * @ngdoc service
+ * @name $provide
+ *
+ * @description
+ *
+ * The {@link auto.$provide $provide} service has a number of methods for registering components
+ * with the {@link auto.$injector $injector}. Many of these functions are also exposed on
+ * {@link angular.Module}.
+ *
+ * An Angular **service** is a singleton object created by a **service factory**.  These **service
+ * factories** are functions which, in turn, are created by a **service provider**.
+ * The **service providers** are constructor functions. When instantiated they must contain a
+ * property called `$get`, which holds the **service factory** function.
+ *
+ * When you request a service, the {@link auto.$injector $injector} is responsible for finding the
+ * correct **service provider**, instantiating it and then calling its `$get` **service factory**
+ * function to get the instance of the **service**.
+ *
+ * Often services have no configuration options and there is no need to add methods to the service
+ * provider.  The provider will be no more than a constructor function with a `$get` property. For
+ * these cases the {@link auto.$provide $provide} service has additional helper methods to register
+ * services without specifying a provider.
+ *
+ * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the
+ *     {@link auto.$injector $injector}
+ * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by
+ *     providers and services.
+ * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by
+ *     services, not providers.
+ * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`,
+ *     that will be wrapped in a **service provider** object, whose `$get` property will contain the
+ *     given factory function.
+ * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class`
+ *     that will be wrapped in a **service provider** object, whose `$get` property will instantiate
+ *      a new object using the given constructor function.
+ *
+ * See the individual methods for more information and examples.
+ */
+
+/**
+ * @ngdoc method
+ * @name $provide#provider
+ * @description
+ *
+ * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions
+ * are constructor functions, whose instances are responsible for "providing" a factory for a
+ * service.
+ *
+ * Service provider names start with the name of the service they provide followed by `Provider`.
+ * For example, the {@link ng.$log $log} service has a provider called
+ * {@link ng.$logProvider $logProvider}.
+ *
+ * Service provider objects can have additional methods which allow configuration of the provider
+ * and its service. Importantly, you can configure what kind of service is created by the `$get`
+ * method, or how that service will act. For example, the {@link ng.$logProvider $logProvider} has a
+ * method {@link ng.$logProvider#debugEnabled debugEnabled}
+ * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the
+ * console or not.
+ *
+ * @param {string} name The name of the instance. NOTE: the provider will be available under `name +
+                        'Provider'` key.
+ * @param {(Object|function())} provider If the provider is:
+ *
+ *   - `Object`: then it should have a `$get` method. The `$get` method will be invoked using
+ *     {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created.
+ *   - `Constructor`: a new instance of the provider will be created using
+ *     {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`.
+ *
+ * @returns {Object} registered provider instance
+
+ * @example
+ *
+ * The following example shows how to create a simple event tracking service and register it using
+ * {@link auto.$provide#provider $provide.provider()}.
+ *
+ * ```js
+ *  // Define the eventTracker provider
+ *  function EventTrackerProvider() {
+ *    var trackingUrl = '/track';
+ *
+ *    // A provider method for configuring where the tracked events should been saved
+ *    this.setTrackingUrl = function(url) {
+ *      trackingUrl = url;
+ *    };
+ *
+ *    // The service factory function
+ *    this.$get = ['$http', function($http) {
+ *      var trackedEvents = {};
+ *      return {
+ *        // Call this to track an event
+ *        event: function(event) {
+ *          var count = trackedEvents[event] || 0;
+ *          count += 1;
+ *          trackedEvents[event] = count;
+ *          return count;
+ *        },
+ *        // Call this to save the tracked events to the trackingUrl
+ *        save: function() {
+ *          $http.post(trackingUrl, trackedEvents);
+ *        }
+ *      };
+ *    }];
+ *  }
+ *
+ *  describe('eventTracker', function() {
+ *    var postSpy;
+ *
+ *    beforeEach(module(function($provide) {
+ *      // Register the eventTracker provider
+ *      $provide.provider('eventTracker', EventTrackerProvider);
+ *    }));
+ *
+ *    beforeEach(module(function(eventTrackerProvider) {
+ *      // Configure eventTracker provider
+ *      eventTrackerProvider.setTrackingUrl('/custom-track');
+ *    }));
+ *
+ *    it('tracks events', inject(function(eventTracker) {
+ *      expect(eventTracker.event('login')).toEqual(1);
+ *      expect(eventTracker.event('login')).toEqual(2);
+ *    }));
+ *
+ *    it('saves to the tracking url', inject(function(eventTracker, $http) {
+ *      postSpy = spyOn($http, 'post');
+ *      eventTracker.event('login');
+ *      eventTracker.save();
+ *      expect(postSpy).toHaveBeenCalled();
+ *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
+ *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
+ *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
+ *    }));
+ *  });
+ * ```
+ */
+
+/**
+ * @ngdoc method
+ * @name $provide#factory
+ * @description
+ *
+ * Register a **service factory**, which will be called to return the service instance.
+ * This is short for registering a service where its provider consists of only a `$get` property,
+ * which is the given service factory function.
+ * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to
+ * configure your service in a provider.
+ *
+ * @param {string} name The name of the instance.
+ * @param {Function|Array.<string|Function>} $getFn The injectable $getFn for the instance creation.
+ *                      Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`.
+ * @returns {Object} registered provider instance
+ *
+ * @example
+ * Here is an example of registering a service
+ * ```js
+ *   $provide.factory('ping', ['$http', function($http) {
+ *     return function ping() {
+ *       return $http.send('/ping');
+ *     };
+ *   }]);
+ * ```
+ * You would then inject and use this service like this:
+ * ```js
+ *   someModule.controller('Ctrl', ['ping', function(ping) {
+ *     ping();
+ *   }]);
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#service
+ * @description
+ *
+ * Register a **service constructor**, which will be invoked with `new` to create the service
+ * instance.
+ * This is short for registering a service where its provider's `$get` property is the service
+ * constructor function that will be used to instantiate the service instance.
+ *
+ * You should use {@link auto.$provide#service $provide.service(class)} if you define your service
+ * as a type/class.
+ *
+ * @param {string} name The name of the instance.
+ * @param {Function|Array.<string|Function>} constructor An injectable class (constructor function)
+ *     that will be instantiated.
+ * @returns {Object} registered provider instance
+ *
+ * @example
+ * Here is an example of registering a service using
+ * {@link auto.$provide#service $provide.service(class)}.
+ * ```js
+ *   var Ping = function($http) {
+ *     this.$http = $http;
+ *   };
+ *
+ *   Ping.$inject = ['$http'];
+ *
+ *   Ping.prototype.send = function() {
+ *     return this.$http.get('/ping');
+ *   };
+ *   $provide.service('ping', Ping);
+ * ```
+ * You would then inject and use this service like this:
+ * ```js
+ *   someModule.controller('Ctrl', ['ping', function(ping) {
+ *     ping.send();
+ *   }]);
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#value
+ * @description
+ *
+ * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a
+ * number, an array, an object or a function.  This is short for registering a service where its
+ * provider's `$get` property is a factory function that takes no arguments and returns the **value
+ * service**.
+ *
+ * Value services are similar to constant services, except that they cannot be injected into a
+ * module configuration function (see {@link angular.Module#config}) but they can be overridden by
+ * an Angular
+ * {@link auto.$provide#decorator decorator}.
+ *
+ * @param {string} name The name of the instance.
+ * @param {*} value The value.
+ * @returns {Object} registered provider instance
+ *
+ * @example
+ * Here are some examples of creating value services.
+ * ```js
+ *   $provide.value('ADMIN_USER', 'admin');
+ *
+ *   $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 });
+ *
+ *   $provide.value('halfOf', function(value) {
+ *     return value / 2;
+ *   });
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#constant
+ * @description
+ *
+ * Register a **constant service**, such as a string, a number, an array, an object or a function,
+ * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be
+ * injected into a module configuration function (see {@link angular.Module#config}) and it cannot
+ * be overridden by an Angular {@link auto.$provide#decorator decorator}.
+ *
+ * @param {string} name The name of the constant.
+ * @param {*} value The constant value.
+ * @returns {Object} registered instance
+ *
+ * @example
+ * Here a some examples of creating constants:
+ * ```js
+ *   $provide.constant('SHARD_HEIGHT', 306);
+ *
+ *   $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']);
+ *
+ *   $provide.constant('double', function(value) {
+ *     return value * 2;
+ *   });
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#decorator
+ * @description
+ *
+ * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator
+ * intercepts the creation of a service, allowing it to override or modify the behaviour of the
+ * service. The object returned by the decorator may be the original service, or a new service
+ * object which replaces or wraps and delegates to the original service.
+ *
+ * @param {string} name The name of the service to decorate.
+ * @param {Function|Array.<string|Function>} decorator This function will be invoked when the service needs to be
+ *    instantiated and should return the decorated service instance. The function is called using
+ *    the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable.
+ *    Local injection arguments:
+ *
+ *    * `$delegate` - The original service instance, which can be monkey patched, configured,
+ *      decorated or delegated to.
+ *
+ * @example
+ * Here we decorate the {@link ng.$log $log} service to convert warnings to errors by intercepting
+ * calls to {@link ng.$log#error $log.warn()}.
+ * ```js
+ *   $provide.decorator('$log', ['$delegate', function($delegate) {
+ *     $delegate.warn = $delegate.error;
+ *     return $delegate;
+ *   }]);
+ * ```
+ */
+
+
+function createInjector(modulesToLoad, strictDi) {
+  strictDi = (strictDi === true);
+  var INSTANTIATING = {},
+      providerSuffix = 'Provider',
+      path = [],
+      loadedModules = new HashMap([], true),
+      providerCache = {
+        $provide: {
+            provider: supportObject(provider),
+            factory: supportObject(factory),
+            service: supportObject(service),
+            value: supportObject(value),
+            constant: supportObject(constant),
+            decorator: decorator
+          }
+      },
+      providerInjector = (providerCache.$injector =
+          createInternalInjector(providerCache, function(serviceName, caller) {
+            if (angular.isString(caller)) {
+              path.push(caller);
+            }
+            throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
+          })),
+      instanceCache = {},
+      instanceInjector = (instanceCache.$injector =
+          createInternalInjector(instanceCache, function(serviceName, caller) {
+            var provider = providerInjector.get(serviceName + providerSuffix, caller);
+            return instanceInjector.invoke(provider.$get, provider, undefined, serviceName);
+          }));
+
+
+  forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); });
+
+  return instanceInjector;
+
+  ////////////////////////////////////
+  // $provider
+  ////////////////////////////////////
+
+  function supportObject(delegate) {
+    return function(key, value) {
+      if (isObject(key)) {
+        forEach(key, reverseParams(delegate));
+      } else {
+        return delegate(key, value);
+      }
+    };
+  }
+
+  function provider(name, provider_) {
+    assertNotHasOwnProperty(name, 'service');
+    if (isFunction(provider_) || isArray(provider_)) {
+      provider_ = providerInjector.instantiate(provider_);
+    }
+    if (!provider_.$get) {
+      throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name);
+    }
+    return providerCache[name + providerSuffix] = provider_;
+  }
+
+  function enforceReturnValue(name, factory) {
+    return function enforcedReturnValue() {
+      var result = instanceInjector.invoke(factory, this);
+      if (isUndefined(result)) {
+        throw $injectorMinErr('undef', "Provider '{0}' must return a value from $get factory method.", name);
+      }
+      return result;
+    };
+  }
+
+  function factory(name, factoryFn, enforce) {
+    return provider(name, {
+      $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn
+    });
+  }
+
+  function service(name, constructor) {
+    return factory(name, ['$injector', function($injector) {
+      return $injector.instantiate(constructor);
+    }]);
+  }
+
+  function value(name, val) { return factory(name, valueFn(val), false); }
+
+  function constant(name, value) {
+    assertNotHasOwnProperty(name, 'constant');
+    providerCache[name] = value;
+    instanceCache[name] = value;
+  }
+
+  function decorator(serviceName, decorFn) {
+    var origProvider = providerInjector.get(serviceName + providerSuffix),
+        orig$get = origProvider.$get;
+
+    origProvider.$get = function() {
+      var origInstance = instanceInjector.invoke(orig$get, origProvider);
+      return instanceInjector.invoke(decorFn, null, {$delegate: origInstance});
+    };
+  }
+
+  ////////////////////////////////////
+  // Module Loading
+  ////////////////////////////////////
+  function loadModules(modulesToLoad) {
+    var runBlocks = [], moduleFn;
+    forEach(modulesToLoad, function(module) {
+      if (loadedModules.get(module)) return;
+      loadedModules.put(module, true);
+
+      function runInvokeQueue(queue) {
+        var i, ii;
+        for (i = 0, ii = queue.length; i < ii; i++) {
+          var invokeArgs = queue[i],
+              provider = providerInjector.get(invokeArgs[0]);
+
+          provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
+        }
+      }
+
+      try {
+        if (isString(module)) {
+          moduleFn = angularModule(module);
+          runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
+          runInvokeQueue(moduleFn._invokeQueue);
+          runInvokeQueue(moduleFn._configBlocks);
+        } else if (isFunction(module)) {
+            runBlocks.push(providerInjector.invoke(module));
+        } else if (isArray(module)) {
+            runBlocks.push(providerInjector.invoke(module));
+        } else {
+          assertArgFn(module, 'module');
+        }
+      } catch (e) {
+        if (isArray(module)) {
+          module = module[module.length - 1];
+        }
+        if (e.message && e.stack && e.stack.indexOf(e.message) == -1) {
+          // Safari & FF's stack traces don't contain error.message content
+          // unlike those of Chrome and IE
+          // So if stack doesn't contain message, we create a new string that contains both.
+          // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here.
+          /* jshint -W022 */
+          e = e.message + '\n' + e.stack;
+        }
+        throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}",
+                  module, e.stack || e.message || e);
+      }
+    });
+    return runBlocks;
+  }
+
+  ////////////////////////////////////
+  // internal Injector
+  ////////////////////////////////////
+
+  function createInternalInjector(cache, factory) {
+
+    function getService(serviceName, caller) {
+      if (cache.hasOwnProperty(serviceName)) {
+        if (cache[serviceName] === INSTANTIATING) {
+          throw $injectorMinErr('cdep', 'Circular dependency found: {0}',
+                    serviceName + ' <- ' + path.join(' <- '));
+        }
+        return cache[serviceName];
+      } else {
+        try {
+          path.unshift(serviceName);
+          cache[serviceName] = INSTANTIATING;
+          return cache[serviceName] = factory(serviceName, caller);
+        } catch (err) {
+          if (cache[serviceName] === INSTANTIATING) {
+            delete cache[serviceName];
+          }
+          throw err;
+        } finally {
+          path.shift();
+        }
+      }
+    }
+
+    function invoke(fn, self, locals, serviceName) {
+      if (typeof locals === 'string') {
+        serviceName = locals;
+        locals = null;
+      }
+
+      var args = [],
+          $inject = createInjector.$$annotate(fn, strictDi, serviceName),
+          length, i,
+          key;
+
+      for (i = 0, length = $inject.length; i < length; i++) {
+        key = $inject[i];
+        if (typeof key !== 'string') {
+          throw $injectorMinErr('itkn',
+                  'Incorrect injection token! Expected service name as string, got {0}', key);
+        }
+        args.push(
+          locals && locals.hasOwnProperty(key)
+          ? locals[key]
+          : getService(key, serviceName)
+        );
+      }
+      if (isArray(fn)) {
+        fn = fn[length];
+      }
+
+      // http://jsperf.com/angularjs-invoke-apply-vs-switch
+      // #5388
+      return fn.apply(self, args);
+    }
+
+    function instantiate(Type, locals, serviceName) {
+      // Check if Type is annotated and use just the given function at n-1 as parameter
+      // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]);
+      // Object creation: http://jsperf.com/create-constructor/2
+      var instance = Object.create((isArray(Type) ? Type[Type.length - 1] : Type).prototype || null);
+      var returnedValue = invoke(Type, instance, locals, serviceName);
+
+      return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance;
+    }
+
+    return {
+      invoke: invoke,
+      instantiate: instantiate,
+      get: getService,
+      annotate: createInjector.$$annotate,
+      has: function(name) {
+        return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
+      }
+    };
+  }
+}
+
+createInjector.$$annotate = annotate;
+
+/**
+ * @ngdoc provider
+ * @name $anchorScrollProvider
+ *
+ * @description
+ * Use `$anchorScrollProvider` to disable automatic scrolling whenever
+ * {@link ng.$location#hash $location.hash()} changes.
+ */
+function $AnchorScrollProvider() {
+
+  var autoScrollingEnabled = true;
+
+  /**
+   * @ngdoc method
+   * @name $anchorScrollProvider#disableAutoScrolling
+   *
+   * @description
+   * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to
+   * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.<br />
+   * Use this method to disable automatic scrolling.
+   *
+   * If automatic scrolling is disabled, one must explicitly call
+   * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the
+   * current hash.
+   */
+  this.disableAutoScrolling = function() {
+    autoScrollingEnabled = false;
+  };
+
+  /**
+   * @ngdoc service
+   * @name $anchorScroll
+   * @kind function
+   * @requires $window
+   * @requires $location
+   * @requires $rootScope
+   *
+   * @description
+   * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
+   * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
+   * in the
+   * [HTML5 spec](http://dev.w3.org/html5/spec/Overview.html#the-indicated-part-of-the-document).
+   *
+   * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
+   * match any anchor whenever it changes. This can be disabled by calling
+   * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}.
+   *
+   * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a
+   * vertical scroll-offset (either fixed or dynamic).
+   *
+   * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of
+   *                       {@link ng.$location#hash $location.hash()} will be used.
+   *
+   * @property {(number|function|jqLite)} yOffset
+   * If set, specifies a vertical scroll-offset. This is often useful when there are fixed
+   * positioned elements at the top of the page, such as navbars, headers etc.
+   *
+   * `yOffset` can be specified in various ways:
+   * - **number**: A fixed number of pixels to be used as offset.<br /><br />
+   * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return
+   *   a number representing the offset (in pixels).<br /><br />
+   * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from
+   *   the top of the page to the element's bottom will be used as offset.<br />
+   *   **Note**: The element will be taken into account only as long as its `position` is set to
+   *   `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust
+   *   their height and/or positioning according to the viewport's size.
+   *
+   * <br />
+   * <div class="alert alert-warning">
+   * In order for `yOffset` to work properly, scrolling should take place on the document's root and
+   * not some child element.
+   * </div>
+   *
+   * @example
+     <example module="anchorScrollExample">
+       <file name="index.html">
+         <div id="scrollArea" ng-controller="ScrollController">
+           <a ng-click="gotoBottom()">Go to bottom</a>
+           <a id="bottom"></a> You're at the bottom!
+         </div>
+       </file>
+       <file name="script.js">
+         angular.module('anchorScrollExample', [])
+           .controller('ScrollController', ['$scope', '$location', '$anchorScroll',
+             function ($scope, $location, $anchorScroll) {
+               $scope.gotoBottom = function() {
+                 // set the location.hash to the id of
+                 // the element you wish to scroll to.
+                 $location.hash('bottom');
+
+                 // call $anchorScroll()
+                 $anchorScroll();
+               };
+             }]);
+       </file>
+       <file name="style.css">
+         #scrollArea {
+           height: 280px;
+           overflow: auto;
+         }
+
+         #bottom {
+           display: block;
+           margin-top: 2000px;
+         }
+       </file>
+     </example>
+   *
+   * <hr />
+   * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value).
+   * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details.
+   *
+   * @example
+     <example module="anchorScrollOffsetExample">
+       <file name="index.html">
+         <div class="fixed-header" ng-controller="headerCtrl">
+           <a href="" ng-click="gotoAnchor(x)" ng-repeat="x in [1,2,3,4,5]">
+             Go to anchor {{x}}
+           </a>
+         </div>
+         <div id="anchor{{x}}" class="anchor" ng-repeat="x in [1,2,3,4,5]">
+           Anchor {{x}} of 5
+         </div>
+       </file>
+       <file name="script.js">
+         angular.module('anchorScrollOffsetExample', [])
+           .run(['$anchorScroll', function($anchorScroll) {
+             $anchorScroll.yOffset = 50;   // always scroll by 50 extra pixels
+           }])
+           .controller('headerCtrl', ['$anchorScroll', '$location', '$scope',
+             function ($anchorScroll, $location, $scope) {
+               $scope.gotoAnchor = function(x) {
+                 var newHash = 'anchor' + x;
+                 if ($location.hash() !== newHash) {
+                   // set the $location.hash to `newHash` and
+                   // $anchorScroll will automatically scroll to it
+                   $location.hash('anchor' + x);
+                 } else {
+                   // call $anchorScroll() explicitly,
+                   // since $location.hash hasn't changed
+                   $anchorScroll();
+                 }
+               };
+             }
+           ]);
+       </file>
+       <file name="style.css">
+         body {
+           padding-top: 50px;
+         }
+
+         .anchor {
+           border: 2px dashed DarkOrchid;
+           padding: 10px 10px 200px 10px;
+         }
+
+         .fixed-header {
+           background-color: rgba(0, 0, 0, 0.2);
+           height: 50px;
+           position: fixed;
+           top: 0; left: 0; right: 0;
+         }
+
+         .fixed-header > a {
+           display: inline-block;
+           margin: 5px 15px;
+         }
+       </file>
+     </example>
+   */
+  this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
+    var document = $window.document;
+
+    // Helper function to get first anchor from a NodeList
+    // (using `Array#some()` instead of `angular#forEach()` since it's more performant
+    //  and working in all supported browsers.)
+    function getFirstAnchor(list) {
+      var result = null;
+      Array.prototype.some.call(list, function(element) {
+        if (nodeName_(element) === 'a') {
+          result = element;
+          return true;
+        }
+      });
+      return result;
+    }
+
+    function getYOffset() {
+
+      var offset = scroll.yOffset;
+
+      if (isFunction(offset)) {
+        offset = offset();
+      } else if (isElement(offset)) {
+        var elem = offset[0];
+        var style = $window.getComputedStyle(elem);
+        if (style.position !== 'fixed') {
+          offset = 0;
+        } else {
+          offset = elem.getBoundingClientRect().bottom;
+        }
+      } else if (!isNumber(offset)) {
+        offset = 0;
+      }
+
+      return offset;
+    }
+
+    function scrollTo(elem) {
+      if (elem) {
+        elem.scrollIntoView();
+
+        var offset = getYOffset();
+
+        if (offset) {
+          // `offset` is the number of pixels we should scroll UP in order to align `elem` properly.
+          // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the
+          // top of the viewport.
+          //
+          // IF the number of pixels from the top of `elem` to the end of the page's content is less
+          // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some
+          // way down the page.
+          //
+          // This is often the case for elements near the bottom of the page.
+          //
+          // In such cases we do not need to scroll the whole `offset` up, just the difference between
+          // the top of the element and the offset, which is enough to align the top of `elem` at the
+          // desired position.
+          var elemTop = elem.getBoundingClientRect().top;
+          $window.scrollBy(0, elemTop - offset);
+        }
+      } else {
+        $window.scrollTo(0, 0);
+      }
+    }
+
+    function scroll(hash) {
+      hash = isString(hash) ? hash : $location.hash();
+      var elm;
+
+      // empty hash, scroll to the top of the page
+      if (!hash) scrollTo(null);
+
+      // element with given id
+      else if ((elm = document.getElementById(hash))) scrollTo(elm);
+
+      // first anchor with given name :-D
+      else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm);
+
+      // no element and hash == 'top', scroll to the top of the page
+      else if (hash === 'top') scrollTo(null);
+    }
+
+    // does not scroll when user clicks on anchor link that is currently on
+    // (no url change, no $location.hash() change), browser native does scroll
+    if (autoScrollingEnabled) {
+      $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
+        function autoScrollWatchAction(newVal, oldVal) {
+          // skip the initial scroll if $location.hash is empty
+          if (newVal === oldVal && newVal === '') return;
+
+          jqLiteDocumentLoaded(function() {
+            $rootScope.$evalAsync(scroll);
+          });
+        });
+    }
+
+    return scroll;
+  }];
+}
+
+var $animateMinErr = minErr('$animate');
+var ELEMENT_NODE = 1;
+var NG_ANIMATE_CLASSNAME = 'ng-animate';
+
+function mergeClasses(a,b) {
+  if (!a && !b) return '';
+  if (!a) return b;
+  if (!b) return a;
+  if (isArray(a)) a = a.join(' ');
+  if (isArray(b)) b = b.join(' ');
+  return a + ' ' + b;
+}
+
+function extractElementNode(element) {
+  for (var i = 0; i < element.length; i++) {
+    var elm = element[i];
+    if (elm.nodeType === ELEMENT_NODE) {
+      return elm;
+    }
+  }
+}
+
+function splitClasses(classes) {
+  if (isString(classes)) {
+    classes = classes.split(' ');
+  }
+
+  // Use createMap() to prevent class assumptions involving property names in
+  // Object.prototype
+  var obj = createMap();
+  forEach(classes, function(klass) {
+    // sometimes the split leaves empty string values
+    // incase extra spaces were applied to the options
+    if (klass.length) {
+      obj[klass] = true;
+    }
+  });
+  return obj;
+}
+
+// if any other type of options value besides an Object value is
+// passed into the $animate.method() animation then this helper code
+// will be run which will ignore it. While this patch is not the
+// greatest solution to this, a lot of existing plugins depend on
+// $animate to either call the callback (< 1.2) or return a promise
+// that can be changed. This helper function ensures that the options
+// are wiped clean incase a callback function is provided.
+function prepareAnimateOptions(options) {
+  return isObject(options)
+      ? options
+      : {};
+}
+
+var $$CoreAnimateRunnerProvider = function() {
+  this.$get = ['$q', '$$rAF', function($q, $$rAF) {
+    function AnimateRunner() {}
+    AnimateRunner.all = noop;
+    AnimateRunner.chain = noop;
+    AnimateRunner.prototype = {
+      end: noop,
+      cancel: noop,
+      resume: noop,
+      pause: noop,
+      complete: noop,
+      then: function(pass, fail) {
+        return $q(function(resolve) {
+          $$rAF(function() {
+            resolve();
+          });
+        }).then(pass, fail);
+      }
+    };
+    return AnimateRunner;
+  }];
+};
+
+// this is prefixed with Core since it conflicts with
+// the animateQueueProvider defined in ngAnimate/animateQueue.js
+var $$CoreAnimateQueueProvider = function() {
+  var postDigestQueue = new HashMap();
+  var postDigestElements = [];
+
+  this.$get = ['$$AnimateRunner', '$rootScope',
+       function($$AnimateRunner,   $rootScope) {
+    return {
+      enabled: noop,
+      on: noop,
+      off: noop,
+      pin: noop,
+
+      push: function(element, event, options, domOperation) {
+        domOperation        && domOperation();
+
+        options = options || {};
+        options.from        && element.css(options.from);
+        options.to          && element.css(options.to);
+
+        if (options.addClass || options.removeClass) {
+          addRemoveClassesPostDigest(element, options.addClass, options.removeClass);
+        }
+
+        return new $$AnimateRunner(); // jshint ignore:line
+      }
+    };
+
+    function addRemoveClassesPostDigest(element, add, remove) {
+      var data = postDigestQueue.get(element);
+      var classVal;
+
+      if (!data) {
+        postDigestQueue.put(element, data = {});
+        postDigestElements.push(element);
+      }
+
+      if (add) {
+        forEach(add.split(' '), function(className) {
+          if (className) {
+            data[className] = true;
+          }
+        });
+      }
+
+      if (remove) {
+        forEach(remove.split(' '), function(className) {
+          if (className) {
+            data[className] = false;
+          }
+        });
+      }
+
+      if (postDigestElements.length > 1) return;
+
+      $rootScope.$$postDigest(function() {
+        forEach(postDigestElements, function(element) {
+          var data = postDigestQueue.get(element);
+          if (data) {
+            var existing = splitClasses(element.attr('class'));
+            var toAdd = '';
+            var toRemove = '';
+            forEach(data, function(status, className) {
+              var hasClass = !!existing[className];
+              if (status !== hasClass) {
+                if (status) {
+                  toAdd += (toAdd.length ? ' ' : '') + className;
+                } else {
+                  toRemove += (toRemove.length ? ' ' : '') + className;
+                }
+              }
+            });
+
+            forEach(element, function(elm) {
+              toAdd    && jqLiteAddClass(elm, toAdd);
+              toRemove && jqLiteRemoveClass(elm, toRemove);
+            });
+            postDigestQueue.remove(element);
+          }
+        });
+
+        postDigestElements.length = 0;
+      });
+    }
+  }];
+};
+
+/**
+ * @ngdoc provider
+ * @name $animateProvider
+ *
+ * @description
+ * Default implementation of $animate that doesn't perform any animations, instead just
+ * synchronously performs DOM updates and resolves the returned runner promise.
+ *
+ * In order to enable animations the `ngAnimate` module has to be loaded.
+ *
+ * To see the functional implementation check out `src/ngAnimate/animate.js`.
+ */
+var $AnimateProvider = ['$provide', function($provide) {
+  var provider = this;
+
+  this.$$registeredAnimations = Object.create(null);
+
+   /**
+   * @ngdoc method
+   * @name $animateProvider#register
+   *
+   * @description
+   * Registers a new injectable animation factory function. The factory function produces the
+   * animation object which contains callback functions for each event that is expected to be
+   * animated.
+   *
+   *   * `eventFn`: `function(element, ... , doneFunction, options)`
+   *   The element to animate, the `doneFunction` and the options fed into the animation. Depending
+   *   on the type of animation additional arguments will be injected into the animation function. The
+   *   list below explains the function signatures for the different animation methods:
+   *
+   *   - setClass: function(element, addedClasses, removedClasses, doneFunction, options)
+   *   - addClass: function(element, addedClasses, doneFunction, options)
+   *   - removeClass: function(element, removedClasses, doneFunction, options)
+   *   - enter, leave, move: function(element, doneFunction, options)
+   *   - animate: function(element, fromStyles, toStyles, doneFunction, options)
+   *
+   *   Make sure to trigger the `doneFunction` once the animation is fully complete.
+   *
+   * ```js
+   *   return {
+   *     //enter, leave, move signature
+   *     eventFn : function(element, done, options) {
+   *       //code to run the animation
+   *       //once complete, then run done()
+   *       return function endFunction(wasCancelled) {
+   *         //code to cancel the animation
+   *       }
+   *     }
+   *   }
+   * ```
+   *
+   * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to).
+   * @param {Function} factory The factory function that will be executed to return the animation
+   *                           object.
+   */
+  this.register = function(name, factory) {
+    if (name && name.charAt(0) !== '.') {
+      throw $animateMinErr('notcsel', "Expecting class selector starting with '.' got '{0}'.", name);
+    }
+
+    var key = name + '-animation';
+    provider.$$registeredAnimations[name.substr(1)] = key;
+    $provide.factory(key, factory);
+  };
+
+  /**
+   * @ngdoc method
+   * @name $animateProvider#classNameFilter
+   *
+   * @description
+   * Sets and/or returns the CSS class regular expression that is checked when performing
+   * an animation. Upon bootstrap the classNameFilter value is not set at all and will
+   * therefore enable $animate to attempt to perform an animation on any element that is triggered.
+   * When setting the `classNameFilter` value, animations will only be performed on elements
+   * that successfully match the filter expression. This in turn can boost performance
+   * for low-powered devices as well as applications containing a lot of structural operations.
+   * @param {RegExp=} expression The className expression which will be checked against all animations
+   * @return {RegExp} The current CSS className expression value. If null then there is no expression value
+   */
+  this.classNameFilter = function(expression) {
+    if (arguments.length === 1) {
+      this.$$classNameFilter = (expression instanceof RegExp) ? expression : null;
+      if (this.$$classNameFilter) {
+        var reservedRegex = new RegExp("(\\s+|\\/)" + NG_ANIMATE_CLASSNAME + "(\\s+|\\/)");
+        if (reservedRegex.test(this.$$classNameFilter.toString())) {
+          throw $animateMinErr('nongcls','$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME);
+
+        }
+      }
+    }
+    return this.$$classNameFilter;
+  };
+
+  this.$get = ['$$animateQueue', function($$animateQueue) {
+    function domInsert(element, parentElement, afterElement) {
+      // if for some reason the previous element was removed
+      // from the dom sometime before this code runs then let's
+      // just stick to using the parent element as the anchor
+      if (afterElement) {
+        var afterNode = extractElementNode(afterElement);
+        if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) {
+          afterElement = null;
+        }
+      }
+      afterElement ? afterElement.after(element) : parentElement.prepend(element);
+    }
+
+    /**
+     * @ngdoc service
+     * @name $animate
+     * @description The $animate service exposes a series of DOM utility methods that provide support
+     * for animation hooks. The default behavior is the application of DOM operations, however,
+     * when an animation is detected (and animations are enabled), $animate will do the heavy lifting
+     * to ensure that animation runs with the triggered DOM operation.
+     *
+     * By default $animate doesn't trigger an animations. This is because the `ngAnimate` module isn't
+     * included and only when it is active then the animation hooks that `$animate` triggers will be
+     * functional. Once active then all structural `ng-` directives will trigger animations as they perform
+     * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`,
+     * `ngShow`, `ngHide` and `ngMessages` also provide support for animations.
+     *
+     * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives.
+     *
+     * To learn more about enabling animation support, click here to visit the
+     * {@link ngAnimate ngAnimate module page}.
+     */
+    return {
+      // we don't call it directly since non-existant arguments may
+      // be interpreted as null within the sub enabled function
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#on
+       * @kind function
+       * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...)
+       *    has fired on the given element or among any of its children. Once the listener is fired, the provided callback
+       *    is fired with the following params:
+       *
+       * ```js
+       * $animate.on('enter', container,
+       *    function callback(element, phase) {
+       *      // cool we detected an enter animation within the container
+       *    }
+       * );
+       * ```
+       *
+       * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...)
+       * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself
+       *     as well as among its children
+       * @param {Function} callback the callback function that will be fired when the listener is triggered
+       *
+       * The arguments present in the callback function are:
+       * * `element` - The captured DOM element that the animation was fired on.
+       * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends).
+       */
+      on: $$animateQueue.on,
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#off
+       * @kind function
+       * @description Deregisters an event listener based on the event which has been associated with the provided element. This method
+       * can be used in three different ways depending on the arguments:
+       *
+       * ```js
+       * // remove all the animation event listeners listening for `enter`
+       * $animate.off('enter');
+       *
+       * // remove all the animation event listeners listening for `enter` on the given element and its children
+       * $animate.off('enter', container);
+       *
+       * // remove the event listener function provided by `listenerFn` that is set
+       * // to listen for `enter` on the given `element` as well as its children
+       * $animate.off('enter', container, callback);
+       * ```
+       *
+       * @param {string} event the animation event (e.g. enter, leave, move, addClass, removeClass, etc...)
+       * @param {DOMElement=} container the container element the event listener was placed on
+       * @param {Function=} callback the callback function that was registered as the listener
+       */
+      off: $$animateQueue.off,
+
+      /**
+       * @ngdoc method
+       * @name $animate#pin
+       * @kind function
+       * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists
+       *    outside of the DOM structure of the Angular application. By doing so, any animation triggered via `$animate` can be issued on the
+       *    element despite being outside the realm of the application or within another application. Say for example if the application
+       *    was bootstrapped on an element that is somewhere inside of the `<body>` tag, but we wanted to allow for an element to be situated
+       *    as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind
+       *    that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association.
+       *
+       *    Note that this feature is only active when the `ngAnimate` module is used.
+       *
+       * @param {DOMElement} element the external element that will be pinned
+       * @param {DOMElement} parentElement the host parent element that will be associated with the external element
+       */
+      pin: $$animateQueue.pin,
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#enabled
+       * @kind function
+       * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This
+       * function can be called in four ways:
+       *
+       * ```js
+       * // returns true or false
+       * $animate.enabled();
+       *
+       * // changes the enabled state for all animations
+       * $animate.enabled(false);
+       * $animate.enabled(true);
+       *
+       * // returns true or false if animations are enabled for an element
+       * $animate.enabled(element);
+       *
+       * // changes the enabled state for an element and its children
+       * $animate.enabled(element, true);
+       * $animate.enabled(element, false);
+       * ```
+       *
+       * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state
+       * @param {boolean=} enabled whether or not the animations will be enabled for the element
+       *
+       * @return {boolean} whether or not animations are enabled
+       */
+      enabled: $$animateQueue.enabled,
+
+      /**
+       * @ngdoc method
+       * @name $animate#cancel
+       * @kind function
+       * @description Cancels the provided animation.
+       *
+       * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
+       */
+      cancel: function(runner) {
+        runner.end && runner.end();
+      },
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#enter
+       * @kind function
+       * @description Inserts the element into the DOM either after the `after` element (if provided) or
+       *   as the first child within the `parent` element and then triggers an animation.
+       *   A promise is returned that will be resolved during the next digest once the animation
+       *   has completed.
+       *
+       * @param {DOMElement} element the element which will be inserted into the DOM
+       * @param {DOMElement} parent the parent element which will append the element as
+       *   a child (so long as the after element is not present)
+       * @param {DOMElement=} after the sibling element after which the element will be appended
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      enter: function(element, parent, after, options) {
+        parent = parent && jqLite(parent);
+        after = after && jqLite(after);
+        parent = parent || after.parent();
+        domInsert(element, parent, after);
+        return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options));
+      },
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#move
+       * @kind function
+       * @description Inserts (moves) the element into its new position in the DOM either after
+       *   the `after` element (if provided) or as the first child within the `parent` element
+       *   and then triggers an animation. A promise is returned that will be resolved
+       *   during the next digest once the animation has completed.
+       *
+       * @param {DOMElement} element the element which will be moved into the new DOM position
+       * @param {DOMElement} parent the parent element which will append the element as
+       *   a child (so long as the after element is not present)
+       * @param {DOMElement=} after the sibling element after which the element will be appended
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      move: function(element, parent, after, options) {
+        parent = parent && jqLite(parent);
+        after = after && jqLite(after);
+        parent = parent || after.parent();
+        domInsert(element, parent, after);
+        return $$animateQueue.push(element, 'move', prepareAnimateOptions(options));
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#leave
+       * @kind function
+       * @description Triggers an animation and then removes the element from the DOM.
+       * When the function is called a promise is returned that will be resolved during the next
+       * digest once the animation has completed.
+       *
+       * @param {DOMElement} element the element which will be removed from the DOM
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      leave: function(element, options) {
+        return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
+          element.remove();
+        });
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#addClass
+       * @kind function
+       *
+       * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon
+       *   execution, the addClass operation will only be handled after the next digest and it will not trigger an
+       *   animation if element already contains the CSS class or if the class is removed at a later step.
+       *   Note that class-based animations are treated differently compared to structural animations
+       *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *   depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      addClass: function(element, className, options) {
+        options = prepareAnimateOptions(options);
+        options.addClass = mergeClasses(options.addclass, className);
+        return $$animateQueue.push(element, 'addClass', options);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#removeClass
+       * @kind function
+       *
+       * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon
+       *   execution, the removeClass operation will only be handled after the next digest and it will not trigger an
+       *   animation if element does not contain the CSS class or if the class is added at a later step.
+       *   Note that class-based animations are treated differently compared to structural animations
+       *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *   depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      removeClass: function(element, className, options) {
+        options = prepareAnimateOptions(options);
+        options.removeClass = mergeClasses(options.removeClass, className);
+        return $$animateQueue.push(element, 'removeClass', options);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#setClass
+       * @kind function
+       *
+       * @description Performs both the addition and removal of a CSS classes on an element and (during the process)
+       *    triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and
+       *    `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has
+       *    passed. Note that class-based animations are treated differently compared to structural animations
+       *    (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *    depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
+       * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      setClass: function(element, add, remove, options) {
+        options = prepareAnimateOptions(options);
+        options.addClass = mergeClasses(options.addClass, add);
+        options.removeClass = mergeClasses(options.removeClass, remove);
+        return $$animateQueue.push(element, 'setClass', options);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#animate
+       * @kind function
+       *
+       * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element.
+       * If any detected CSS transition, keyframe or JavaScript matches the provided className value then the animation will take
+       * on the provided styles. For example, if a transition animation is set for the given className then the provided from and
+       * to styles will be applied alongside the given transition. If a JavaScript animation is detected then the provided styles
+       * will be given in as function paramters into the `animate` method (or as apart of the `options` parameter).
+       *
+       * @param {DOMElement} element the element which the CSS styles will be applied to
+       * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation.
+       * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation.
+       * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
+       *    this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
+       *    (Note that if no animation is detected then this value will not be appplied to the element.)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      animate: function(element, from, to, className, options) {
+        options = prepareAnimateOptions(options);
+        options.from = options.from ? extend(options.from, from) : from;
+        options.to   = options.to   ? extend(options.to, to)     : to;
+
+        className = className || 'ng-inline-animate';
+        options.tempClasses = mergeClasses(options.tempClasses, className);
+        return $$animateQueue.push(element, 'animate', options);
+      }
+    };
+  }];
+}];
+
+function $$AsyncCallbackProvider() {
+  this.$get = ['$$rAF', '$timeout', function($$rAF, $timeout) {
+    return $$rAF.supported
+      ? function(fn) { return $$rAF(fn); }
+      : function(fn) {
+        return $timeout(fn, 0, false);
+      };
+  }];
+}
+
+/* global stripHash: true */
+
+/**
+ * ! This is a private undocumented service !
+ *
+ * @name $browser
+ * @requires $log
+ * @description
+ * This object has two goals:
+ *
+ * - hide all the global state in the browser caused by the window object
+ * - abstract away all the browser specific features and inconsistencies
+ *
+ * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
+ * service, which can be used for convenient testing of the application without the interaction with
+ * the real browser apis.
+ */
+/**
+ * @param {object} window The global window object.
+ * @param {object} document jQuery wrapped document.
+ * @param {object} $log window.console or an object with the same interface.
+ * @param {object} $sniffer $sniffer service
+ */
+function Browser(window, document, $log, $sniffer) {
+  var self = this,
+      rawDocument = document[0],
+      location = window.location,
+      history = window.history,
+      setTimeout = window.setTimeout,
+      clearTimeout = window.clearTimeout,
+      pendingDeferIds = {};
+
+  self.isMock = false;
+
+  var outstandingRequestCount = 0;
+  var outstandingRequestCallbacks = [];
+
+  // TODO(vojta): remove this temporary api
+  self.$$completeOutstandingRequest = completeOutstandingRequest;
+  self.$$incOutstandingRequestCount = function() { outstandingRequestCount++; };
+
+  /**
+   * Executes the `fn` function(supports currying) and decrements the `outstandingRequestCallbacks`
+   * counter. If the counter reaches 0, all the `outstandingRequestCallbacks` are executed.
+   */
+  function completeOutstandingRequest(fn) {
+    try {
+      fn.apply(null, sliceArgs(arguments, 1));
+    } finally {
+      outstandingRequestCount--;
+      if (outstandingRequestCount === 0) {
+        while (outstandingRequestCallbacks.length) {
+          try {
+            outstandingRequestCallbacks.pop()();
+          } catch (e) {
+            $log.error(e);
+          }
+        }
+      }
+    }
+  }
+
+  function getHash(url) {
+    var index = url.indexOf('#');
+    return index === -1 ? '' : url.substr(index + 1);
+  }
+
+  /**
+   * @private
+   * Note: this method is used only by scenario runner
+   * TODO(vojta): prefix this method with $$ ?
+   * @param {function()} callback Function that will be called when no outstanding request
+   */
+  self.notifyWhenNoOutstandingRequests = function(callback) {
+    if (outstandingRequestCount === 0) {
+      callback();
+    } else {
+      outstandingRequestCallbacks.push(callback);
+    }
+  };
+
+  //////////////////////////////////////////////////////////////
+  // URL API
+  //////////////////////////////////////////////////////////////
+
+  var cachedState, lastHistoryState,
+      lastBrowserUrl = location.href,
+      baseElement = document.find('base'),
+      reloadLocation = null;
+
+  cacheState();
+  lastHistoryState = cachedState;
+
+  /**
+   * @name $browser#url
+   *
+   * @description
+   * GETTER:
+   * Without any argument, this method just returns current value of location.href.
+   *
+   * SETTER:
+   * With at least one argument, this method sets url to new value.
+   * If html5 history api supported, pushState/replaceState is used, otherwise
+   * location.href/location.replace is used.
+   * Returns its own instance to allow chaining
+   *
+   * NOTE: this api is intended for use only by the $location service. Please use the
+   * {@link ng.$location $location service} to change url.
+   *
+   * @param {string} url New url (when used as setter)
+   * @param {boolean=} replace Should new url replace current history record?
+   * @param {object=} state object to use with pushState/replaceState
+   */
+  self.url = function(url, replace, state) {
+    // In modern browsers `history.state` is `null` by default; treating it separately
+    // from `undefined` would cause `$browser.url('/foo')` to change `history.state`
+    // to undefined via `pushState`. Instead, let's change `undefined` to `null` here.
+    if (isUndefined(state)) {
+      state = null;
+    }
+
+    // Android Browser BFCache causes location, history reference to become stale.
+    if (location !== window.location) location = window.location;
+    if (history !== window.history) history = window.history;
+
+    // setter
+    if (url) {
+      var sameState = lastHistoryState === state;
+
+      // Don't change anything if previous and current URLs and states match. This also prevents
+      // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode.
+      // See https://github.com/angular/angular.js/commit/ffb2701
+      if (lastBrowserUrl === url && (!$sniffer.history || sameState)) {
+        return self;
+      }
+      var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
+      lastBrowserUrl = url;
+      lastHistoryState = state;
+      // Don't use history API if only the hash changed
+      // due to a bug in IE10/IE11 which leads
+      // to not firing a `hashchange` nor `popstate` event
+      // in some cases (see #9143).
+      if ($sniffer.history && (!sameBase || !sameState)) {
+        history[replace ? 'replaceState' : 'pushState'](state, '', url);
+        cacheState();
+        // Do the assignment again so that those two variables are referentially identical.
+        lastHistoryState = cachedState;
+      } else {
+        if (!sameBase) {
+          reloadLocation = url;
+        }
+        if (replace) {
+          location.replace(url);
+        } else if (!sameBase) {
+          location.href = url;
+        } else {
+          location.hash = getHash(url);
+        }
+      }
+      return self;
+    // getter
+    } else {
+      // - reloadLocation is needed as browsers don't allow to read out
+      //   the new location.href if a reload happened.
+      // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
+      return reloadLocation || location.href.replace(/%27/g,"'");
+    }
+  };
+
+  /**
+   * @name $browser#state
+   *
+   * @description
+   * This method is a getter.
+   *
+   * Return history.state or null if history.state is undefined.
+   *
+   * @returns {object} state
+   */
+  self.state = function() {
+    return cachedState;
+  };
+
+  var urlChangeListeners = [],
+      urlChangeInit = false;
+
+  function cacheStateAndFireUrlChange() {
+    cacheState();
+    fireUrlChange();
+  }
+
+  function getCurrentState() {
+    try {
+      return history.state;
+    } catch (e) {
+      // MSIE can reportedly throw when there is no state (UNCONFIRMED).
+    }
+  }
+
+  // This variable should be used *only* inside the cacheState function.
+  var lastCachedState = null;
+  function cacheState() {
+    // This should be the only place in $browser where `history.state` is read.
+    cachedState = getCurrentState();
+    cachedState = isUndefined(cachedState) ? null : cachedState;
+
+    // Prevent callbacks fo fire twice if both hashchange & popstate were fired.
+    if (equals(cachedState, lastCachedState)) {
+      cachedState = lastCachedState;
+    }
+    lastCachedState = cachedState;
+  }
+
+  function fireUrlChange() {
+    if (lastBrowserUrl === self.url() && lastHistoryState === cachedState) {
+      return;
+    }
+
+    lastBrowserUrl = self.url();
+    lastHistoryState = cachedState;
+    forEach(urlChangeListeners, function(listener) {
+      listener(self.url(), cachedState);
+    });
+  }
+
+  /**
+   * @name $browser#onUrlChange
+   *
+   * @description
+   * Register callback function that will be called, when url changes.
+   *
+   * It's only called when the url is changed from outside of angular:
+   * - user types different url into address bar
+   * - user clicks on history (forward/back) button
+   * - user clicks on a link
+   *
+   * It's not called when url is changed by $browser.url() method
+   *
+   * The listener gets called with new url as parameter.
+   *
+   * NOTE: this api is intended for use only by the $location service. Please use the
+   * {@link ng.$location $location service} to monitor url changes in angular apps.
+   *
+   * @param {function(string)} listener Listener function to be called when url changes.
+   * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous.
+   */
+  self.onUrlChange = function(callback) {
+    // TODO(vojta): refactor to use node's syntax for events
+    if (!urlChangeInit) {
+      // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera)
+      // don't fire popstate when user change the address bar and don't fire hashchange when url
+      // changed by push/replaceState
+
+      // html5 history api - popstate event
+      if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange);
+      // hashchange event
+      jqLite(window).on('hashchange', cacheStateAndFireUrlChange);
+
+      urlChangeInit = true;
+    }
+
+    urlChangeListeners.push(callback);
+    return callback;
+  };
+
+  /**
+   * @private
+   * Remove popstate and hashchange handler from window.
+   *
+   * NOTE: this api is intended for use only by $rootScope.
+   */
+  self.$$applicationDestroyed = function() {
+    jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange);
+  };
+
+  /**
+   * Checks whether the url has changed outside of Angular.
+   * Needs to be exported to be able to check for changes that have been done in sync,
+   * as hashchange/popstate events fire in async.
+   */
+  self.$$checkUrlChange = fireUrlChange;
+
+  //////////////////////////////////////////////////////////////
+  // Misc API
+  //////////////////////////////////////////////////////////////
+
+  /**
+   * @name $browser#baseHref
+   *
+   * @description
+   * Returns current <base href>
+   * (always relative - without domain)
+   *
+   * @returns {string} The current base href
+   */
+  self.baseHref = function() {
+    var href = baseElement.attr('href');
+    return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
+  };
+
+  /**
+   * @name $browser#defer
+   * @param {function()} fn A function, who's execution should be deferred.
+   * @param {number=} [delay=0] of milliseconds to defer the function execution.
+   * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`.
+   *
+   * @description
+   * Executes a fn asynchronously via `setTimeout(fn, delay)`.
+   *
+   * Unlike when calling `setTimeout` directly, in test this function is mocked and instead of using
+   * `setTimeout` in tests, the fns are queued in an array, which can be programmatically flushed
+   * via `$browser.defer.flush()`.
+   *
+   */
+  self.defer = function(fn, delay) {
+    var timeoutId;
+    outstandingRequestCount++;
+    timeoutId = setTimeout(function() {
+      delete pendingDeferIds[timeoutId];
+      completeOutstandingRequest(fn);
+    }, delay || 0);
+    pendingDeferIds[timeoutId] = true;
+    return timeoutId;
+  };
+
+
+  /**
+   * @name $browser#defer.cancel
+   *
+   * @description
+   * Cancels a deferred task identified with `deferId`.
+   *
+   * @param {*} deferId Token returned by the `$browser.defer` function.
+   * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
+   *                    canceled.
+   */
+  self.defer.cancel = function(deferId) {
+    if (pendingDeferIds[deferId]) {
+      delete pendingDeferIds[deferId];
+      clearTimeout(deferId);
+      completeOutstandingRequest(noop);
+      return true;
+    }
+    return false;
+  };
+
+}
+
+function $BrowserProvider() {
+  this.$get = ['$window', '$log', '$sniffer', '$document',
+      function($window, $log, $sniffer, $document) {
+        return new Browser($window, $document, $log, $sniffer);
+      }];
+}
+
+/**
+ * @ngdoc service
+ * @name $cacheFactory
+ *
+ * @description
+ * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to
+ * them.
+ *
+ * ```js
+ *
+ *  var cache = $cacheFactory('cacheId');
+ *  expect($cacheFactory.get('cacheId')).toBe(cache);
+ *  expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined();
+ *
+ *  cache.put("key", "value");
+ *  cache.put("another key", "another value");
+ *
+ *  // We've specified no options on creation
+ *  expect(cache.info()).toEqual({id: 'cacheId', size: 2});
+ *
+ * ```
+ *
+ *
+ * @param {string} cacheId Name or id of the newly created cache.
+ * @param {object=} options Options object that specifies the cache behavior. Properties:
+ *
+ *   - `{number=}` `capacity` — turns the cache into LRU cache.
+ *
+ * @returns {object} Newly created cache object with the following set of methods:
+ *
+ * - `{object}` `info()` — Returns id, size, and options of cache.
+ * - `{{*}}` `put({string} key, {*} value)` — Puts a new key-value pair into the cache and returns
+ *   it.
+ * - `{{*}}` `get({string} key)` — Returns cached value for `key` or undefined for cache miss.
+ * - `{void}` `remove({string} key)` — Removes a key-value pair from the cache.
+ * - `{void}` `removeAll()` — Removes all cached values.
+ * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory.
+ *
+ * @example
+   <example module="cacheExampleApp">
+     <file name="index.html">
+       <div ng-controller="CacheController">
+         <input ng-model="newCacheKey" placeholder="Key">
+         <input ng-model="newCacheValue" placeholder="Value">
+         <button ng-click="put(newCacheKey, newCacheValue)">Cache</button>
+
+         <p ng-if="keys.length">Cached Values</p>
+         <div ng-repeat="key in keys">
+           <span ng-bind="key"></span>
+           <span>: </span>
+           <b ng-bind="cache.get(key)"></b>
+         </div>
+
+         <p>Cache Info</p>
+         <div ng-repeat="(key, value) in cache.info()">
+           <span ng-bind="key"></span>
+           <span>: </span>
+           <b ng-bind="value"></b>
+         </div>
+       </div>
+     </file>
+     <file name="script.js">
+       angular.module('cacheExampleApp', []).
+         controller('CacheController', ['$scope', '$cacheFactory', function($scope, $cacheFactory) {
+           $scope.keys = [];
+           $scope.cache = $cacheFactory('cacheId');
+           $scope.put = function(key, value) {
+             if ($scope.cache.get(key) === undefined) {
+               $scope.keys.push(key);
+             }
+             $scope.cache.put(key, value === undefined ? null : value);
+           };
+         }]);
+     </file>
+     <file name="style.css">
+       p {
+         margin: 10px 0 3px;
+       }
+     </file>
+   </example>
+ */
+function $CacheFactoryProvider() {
+
+  this.$get = function() {
+    var caches = {};
+
+    function cacheFactory(cacheId, options) {
+      if (cacheId in caches) {
+        throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId);
+      }
+
+      var size = 0,
+          stats = extend({}, options, {id: cacheId}),
+          data = {},
+          capacity = (options && options.capacity) || Number.MAX_VALUE,
+          lruHash = {},
+          freshEnd = null,
+          staleEnd = null;
+
+      /**
+       * @ngdoc type
+       * @name $cacheFactory.Cache
+       *
+       * @description
+       * A cache object used to store and retrieve data, primarily used by
+       * {@link $http $http} and the {@link ng.directive:script script} directive to cache
+       * templates and other data.
+       *
+       * ```js
+       *  angular.module('superCache')
+       *    .factory('superCache', ['$cacheFactory', function($cacheFactory) {
+       *      return $cacheFactory('super-cache');
+       *    }]);
+       * ```
+       *
+       * Example test:
+       *
+       * ```js
+       *  it('should behave like a cache', inject(function(superCache) {
+       *    superCache.put('key', 'value');
+       *    superCache.put('another key', 'another value');
+       *
+       *    expect(superCache.info()).toEqual({
+       *      id: 'super-cache',
+       *      size: 2
+       *    });
+       *
+       *    superCache.remove('another key');
+       *    expect(superCache.get('another key')).toBeUndefined();
+       *
+       *    superCache.removeAll();
+       *    expect(superCache.info()).toEqual({
+       *      id: 'super-cache',
+       *      size: 0
+       *    });
+       *  }));
+       * ```
+       */
+      return caches[cacheId] = {
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#put
+         * @kind function
+         *
+         * @description
+         * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be
+         * retrieved later, and incrementing the size of the cache if the key was not already
+         * present in the cache. If behaving like an LRU cache, it will also remove stale
+         * entries from the set.
+         *
+         * It will not insert undefined values into the cache.
+         *
+         * @param {string} key the key under which the cached data is stored.
+         * @param {*} value the value to store alongside the key. If it is undefined, the key
+         *    will not be stored.
+         * @returns {*} the value stored.
+         */
+        put: function(key, value) {
+          if (isUndefined(value)) return;
+          if (capacity < Number.MAX_VALUE) {
+            var lruEntry = lruHash[key] || (lruHash[key] = {key: key});
+
+            refresh(lruEntry);
+          }
+
+          if (!(key in data)) size++;
+          data[key] = value;
+
+          if (size > capacity) {
+            this.remove(staleEnd.key);
+          }
+
+          return value;
+        },
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#get
+         * @kind function
+         *
+         * @description
+         * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object.
+         *
+         * @param {string} key the key of the data to be retrieved
+         * @returns {*} the value stored.
+         */
+        get: function(key) {
+          if (capacity < Number.MAX_VALUE) {
+            var lruEntry = lruHash[key];
+
+            if (!lruEntry) return;
+
+            refresh(lruEntry);
+          }
+
+          return data[key];
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#remove
+         * @kind function
+         *
+         * @description
+         * Removes an entry from the {@link $cacheFactory.Cache Cache} object.
+         *
+         * @param {string} key the key of the entry to be removed
+         */
+        remove: function(key) {
+          if (capacity < Number.MAX_VALUE) {
+            var lruEntry = lruHash[key];
+
+            if (!lruEntry) return;
+
+            if (lruEntry == freshEnd) freshEnd = lruEntry.p;
+            if (lruEntry == staleEnd) staleEnd = lruEntry.n;
+            link(lruEntry.n,lruEntry.p);
+
+            delete lruHash[key];
+          }
+
+          delete data[key];
+          size--;
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#removeAll
+         * @kind function
+         *
+         * @description
+         * Clears the cache object of any entries.
+         */
+        removeAll: function() {
+          data = {};
+          size = 0;
+          lruHash = {};
+          freshEnd = staleEnd = null;
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#destroy
+         * @kind function
+         *
+         * @description
+         * Destroys the {@link $cacheFactory.Cache Cache} object entirely,
+         * removing it from the {@link $cacheFactory $cacheFactory} set.
+         */
+        destroy: function() {
+          data = null;
+          stats = null;
+          lruHash = null;
+          delete caches[cacheId];
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#info
+         * @kind function
+         *
+         * @description
+         * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}.
+         *
+         * @returns {object} an object with the following properties:
+         *   <ul>
+         *     <li>**id**: the id of the cache instance</li>
+         *     <li>**size**: the number of entries kept in the cache instance</li>
+         *     <li>**...**: any additional properties from the options object when creating the
+         *       cache.</li>
+         *   </ul>
+         */
+        info: function() {
+          return extend({}, stats, {size: size});
+        }
+      };
+
+
+      /**
+       * makes the `entry` the freshEnd of the LRU linked list
+       */
+      function refresh(entry) {
+        if (entry != freshEnd) {
+          if (!staleEnd) {
+            staleEnd = entry;
+          } else if (staleEnd == entry) {
+            staleEnd = entry.n;
+          }
+
+          link(entry.n, entry.p);
+          link(entry, freshEnd);
+          freshEnd = entry;
+          freshEnd.n = null;
+        }
+      }
+
+
+      /**
+       * bidirectionally links two entries of the LRU linked list
+       */
+      function link(nextEntry, prevEntry) {
+        if (nextEntry != prevEntry) {
+          if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify
+          if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify
+        }
+      }
+    }
+
+
+  /**
+   * @ngdoc method
+   * @name $cacheFactory#info
+   *
+   * @description
+   * Get information about all the caches that have been created
+   *
+   * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info`
+   */
+    cacheFactory.info = function() {
+      var info = {};
+      forEach(caches, function(cache, cacheId) {
+        info[cacheId] = cache.info();
+      });
+      return info;
+    };
+
+
+  /**
+   * @ngdoc method
+   * @name $cacheFactory#get
+   *
+   * @description
+   * Get access to a cache object by the `cacheId` used when it was created.
+   *
+   * @param {string} cacheId Name or id of a cache to access.
+   * @returns {object} Cache object identified by the cacheId or undefined if no such cache.
+   */
+    cacheFactory.get = function(cacheId) {
+      return caches[cacheId];
+    };
+
+
+    return cacheFactory;
+  };
+}
+
+/**
+ * @ngdoc service
+ * @name $templateCache
+ *
+ * @description
+ * The first time a template is used, it is loaded in the template cache for quick retrieval. You
+ * can load templates directly into the cache in a `script` tag, or by consuming the
+ * `$templateCache` service directly.
+ *
+ * Adding via the `script` tag:
+ *
+ * ```html
+ *   <script type="text/ng-template" id="templateId.html">
+ *     <p>This is the content of the template</p>
+ *   </script>
+ * ```
+ *
+ * **Note:** the `script` tag containing the template does not need to be included in the `head` of
+ * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE,
+ * element with ng-app attribute), otherwise the template will be ignored.
+ *
+ * Adding via the `$templateCache` service:
+ *
+ * ```js
+ * var myApp = angular.module('myApp', []);
+ * myApp.run(function($templateCache) {
+ *   $templateCache.put('templateId.html', 'This is the content of the template');
+ * });
+ * ```
+ *
+ * To retrieve the template later, simply use it in your HTML:
+ * ```html
+ * <div ng-include=" 'templateId.html' "></div>
+ * ```
+ *
+ * or get it via Javascript:
+ * ```js
+ * $templateCache.get('templateId.html')
+ * ```
+ *
+ * See {@link ng.$cacheFactory $cacheFactory}.
+ *
+ */
+function $TemplateCacheProvider() {
+  this.$get = ['$cacheFactory', function($cacheFactory) {
+    return $cacheFactory('templates');
+  }];
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE!
+ *
+ * DOM-related variables:
+ *
+ * - "node" - DOM Node
+ * - "element" - DOM Element or Node
+ * - "$node" or "$element" - jqLite-wrapped node or element
+ *
+ *
+ * Compiler related stuff:
+ *
+ * - "linkFn" - linking fn of a single directive
+ * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
+ * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
+ * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
+ */
+
+
+/**
+ * @ngdoc service
+ * @name $compile
+ * @kind function
+ *
+ * @description
+ * Compiles an HTML string or DOM into a template and produces a template function, which
+ * can then be used to link {@link ng.$rootScope.Scope `scope`} and the template together.
+ *
+ * The compilation is a process of walking the DOM tree and matching DOM elements to
+ * {@link ng.$compileProvider#directive directives}.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** This document is an in-depth reference of all directive options.
+ * For a gentle introduction to directives with examples of common use cases,
+ * see the {@link guide/directive directive guide}.
+ * </div>
+ *
+ * ## Comprehensive Directive API
+ *
+ * There are many different options for a directive.
+ *
+ * The difference resides in the return value of the factory function.
+ * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
+ * or just the `postLink` function (all other properties will have the default values).
+ *
+ * <div class="alert alert-success">
+ * **Best Practice:** It's recommended to use the "directive definition object" form.
+ * </div>
+ *
+ * Here's an example directive declared with a Directive Definition Object:
+ *
+ * ```js
+ *   var myModule = angular.module(...);
+ *
+ *   myModule.directive('directiveName', function factory(injectables) {
+ *     var directiveDefinitionObject = {
+ *       priority: 0,
+ *       template: '<div></div>', // or // function(tElement, tAttrs) { ... },
+ *       // or
+ *       // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... },
+ *       transclude: false,
+ *       restrict: 'A',
+ *       templateNamespace: 'html',
+ *       scope: false,
+ *       controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
+ *       controllerAs: 'stringIdentifier',
+ *       bindToController: false,
+ *       require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
+ *       compile: function compile(tElement, tAttrs, transclude) {
+ *         return {
+ *           pre: function preLink(scope, iElement, iAttrs, controller) { ... },
+ *           post: function postLink(scope, iElement, iAttrs, controller) { ... }
+ *         }
+ *         // or
+ *         // return function postLink( ... ) { ... }
+ *       },
+ *       // or
+ *       // link: {
+ *       //  pre: function preLink(scope, iElement, iAttrs, controller) { ... },
+ *       //  post: function postLink(scope, iElement, iAttrs, controller) { ... }
+ *       // }
+ *       // or
+ *       // link: function postLink( ... ) { ... }
+ *     };
+ *     return directiveDefinitionObject;
+ *   });
+ * ```
+ *
+ * <div class="alert alert-warning">
+ * **Note:** Any unspecified options will use the default value. You can see the default values below.
+ * </div>
+ *
+ * Therefore the above can be simplified as:
+ *
+ * ```js
+ *   var myModule = angular.module(...);
+ *
+ *   myModule.directive('directiveName', function factory(injectables) {
+ *     var directiveDefinitionObject = {
+ *       link: function postLink(scope, iElement, iAttrs) { ... }
+ *     };
+ *     return directiveDefinitionObject;
+ *     // or
+ *     // return function postLink(scope, iElement, iAttrs) { ... }
+ *   });
+ * ```
+ *
+ *
+ *
+ * ### Directive Definition Object
+ *
+ * The directive definition object provides instructions to the {@link ng.$compile
+ * compiler}. The attributes are:
+ *
+ * #### `multiElement`
+ * When this property is set to true, the HTML compiler will collect DOM nodes between
+ * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them
+ * together as the directive elements. It is recommended that this feature be used on directives
+ * which are not strictly behavioural (such as {@link ngClick}), and which
+ * do not manipulate or replace child nodes (such as {@link ngInclude}).
+ *
+ * #### `priority`
+ * When there are multiple directives defined on a single DOM element, sometimes it
+ * is necessary to specify the order in which the directives are applied. The `priority` is used
+ * to sort the directives before their `compile` functions get called. Priority is defined as a
+ * number. Directives with greater numerical `priority` are compiled first. Pre-link functions
+ * are also run in priority order, but post-link functions are run in reverse order. The order
+ * of directives with the same priority is undefined. The default priority is `0`.
+ *
+ * #### `terminal`
+ * If set to true then the current `priority` will be the last set of directives
+ * which will execute (any directives at the current priority will still execute
+ * as the order of execution on same `priority` is undefined). Note that expressions
+ * and other directives used in the directive's template will also be excluded from execution.
+ *
+ * #### `scope`
+ * **If set to `true`,** then a new scope will be created for this directive. If multiple directives on the
+ * same element request a new scope, only one new scope is created. The new scope rule does not
+ * apply for the root of the template since the root of the template always gets a new scope.
+ *
+ * **If set to `{}` (object hash),** then a new "isolate" scope is created. The 'isolate' scope differs from
+ * normal scope in that it does not prototypically inherit from the parent scope. This is useful
+ * when creating reusable components, which should not accidentally read or modify data in the
+ * parent scope.
+ *
+ * The 'isolate' scope takes an object hash which defines a set of local scope properties
+ * derived from the parent scope. These local properties are useful for aliasing values for
+ * templates. Locals definition is a hash of local scope property to its source:
+ *
+ * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is
+ *   always a string since DOM attributes are strings. If no `attr` name is specified  then the
+ *   attribute name is assumed to be the same as the local name.
+ *   Given `<widget my-attr="hello {{name}}">` and widget definition
+ *   of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect
+ *   the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the
+ *   `localName` property on the widget scope. The `name` is read from the parent scope (not
+ *   component scope).
+ *
+ * * `=` or `=attr` - set up bi-directional binding between a local scope property and the
+ *   parent scope property of name defined via the value of the `attr` attribute. If no `attr`
+ *   name is specified then the attribute name is assumed to be the same as the local name.
+ *   Given `<widget my-attr="parentModel">` and widget definition of
+ *   `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the
+ *   value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected
+ *   in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent
+ *   scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You
+ *   can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional. If
+ *   you want to shallow watch for changes (i.e. $watchCollection instead of $watch) you can use
+ *   `=*` or `=*attr` (`=*?` or `=*?attr` if the property is optional).
+ *
+ * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope.
+ *   If no `attr` name is specified then the attribute name is assumed to be the same as the
+ *   local name. Given `<widget my-attr="count = count + value">` and widget definition of
+ *   `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to
+ *   a function wrapper for the `count = count + value` expression. Often it's desirable to
+ *   pass data from the isolated scope via an expression to the parent scope, this can be
+ *   done by passing a map of local variable names and values into the expression wrapper fn.
+ *   For example, if the expression is `increment(amount)` then we can specify the amount value
+ *   by calling the `localFn` as `localFn({amount: 22})`.
+ *
+ *
+ * #### `bindToController`
+ * When an isolate scope is used for a component (see above), and `controllerAs` is used, `bindToController: true` will
+ * allow a component to have its properties bound to the controller, rather than to scope. When the controller
+ * is instantiated, the initial values of the isolate scope bindings are already available.
+ *
+ * #### `controller`
+ * Controller constructor function. The controller is instantiated before the
+ * pre-linking phase and it is shared with other directives (see
+ * `require` attribute). This allows the directives to communicate with each other and augment
+ * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals:
+ *
+ * * `$scope` - Current scope associated with the element
+ * * `$element` - Current element
+ * * `$attrs` - Current attributes object for the element
+ * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope:
+ *   `function([scope], cloneLinkingFn, futureParentElement)`.
+ *    * `scope`: optional argument to override the scope.
+ *    * `cloneLinkingFn`: optional argument to create clones of the original transcluded content.
+ *    * `futureParentElement`:
+ *        * defines the parent to which the `cloneLinkingFn` will add the cloned elements.
+ *        * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`.
+ *        * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements)
+ *          and when the `cloneLinkinFn` is passed,
+ *          as those elements need to created and cloned in a special way when they are defined outside their
+ *          usual containers (e.g. like `<svg>`).
+ *        * See also the `directive.templateNamespace` property.
+ *
+ *
+ * #### `require`
+ * Require another directive and inject its controller as the fourth argument to the linking function. The
+ * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the
+ * injected argument will be an array in corresponding order. If no such directive can be
+ * found, or if the directive does not have a controller, then an error is raised (unless no link function
+ * is specified, in which case error checking is skipped). The name can be prefixed with:
+ *
+ * * (no prefix) - Locate the required controller on the current element. Throw an error if not found.
+ * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found.
+ * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found.
+ * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found.
+ * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass
+ *   `null` to the `link` fn if not found.
+ * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass
+ *   `null` to the `link` fn if not found.
+ *
+ *
+ * #### `controllerAs`
+ * Identifier name for a reference to the controller in the directive's scope.
+ * This allows the controller to be referenced from the directive template. The directive
+ * needs to define a scope for this configuration to be used. Useful in the case when
+ * directive is used as component.
+ *
+ *
+ * #### `restrict`
+ * String of subset of `EACM` which restricts the directive to a specific directive
+ * declaration style. If omitted, the defaults (elements and attributes) are used.
+ *
+ * * `E` - Element name (default): `<my-directive></my-directive>`
+ * * `A` - Attribute (default): `<div my-directive="exp"></div>`
+ * * `C` - Class: `<div class="my-directive: exp;"></div>`
+ * * `M` - Comment: `<!-- directive: my-directive exp -->`
+ *
+ *
+ * #### `templateNamespace`
+ * String representing the document type used by the markup in the template.
+ * AngularJS needs this information as those elements need to be created and cloned
+ * in a special way when they are defined outside their usual containers like `<svg>` and `<math>`.
+ *
+ * * `html` - All root nodes in the template are HTML. Root nodes may also be
+ *   top-level elements such as `<svg>` or `<math>`.
+ * * `svg` - The root nodes in the template are SVG elements (excluding `<math>`).
+ * * `math` - The root nodes in the template are MathML elements (excluding `<svg>`).
+ *
+ * If no `templateNamespace` is specified, then the namespace is considered to be `html`.
+ *
+ * #### `template`
+ * HTML markup that may:
+ * * Replace the contents of the directive's element (default).
+ * * Replace the directive's element itself (if `replace` is true - DEPRECATED).
+ * * Wrap the contents of the directive's element (if `transclude` is true).
+ *
+ * Value may be:
+ *
+ * * A string. For example `<div red-on-hover>{{delete_str}}</div>`.
+ * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile`
+ *   function api below) and returns a string value.
+ *
+ *
+ * #### `templateUrl`
+ * This is similar to `template` but the template is loaded from the specified URL, asynchronously.
+ *
+ * Because template loading is asynchronous the compiler will suspend compilation of directives on that element
+ * for later when the template has been resolved.  In the meantime it will continue to compile and link
+ * sibling and parent elements as though this element had not contained any directives.
+ *
+ * The compiler does not suspend the entire compilation to wait for templates to be loaded because this
+ * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the
+ * case when only one deeply nested directive has `templateUrl`.
+ *
+ * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache}
+ *
+ * You can specify `templateUrl` as a string representing the URL or as a function which takes two
+ * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns
+ * a string value representing the url.  In either case, the template URL is passed through {@link
+ * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
+ *
+ *
+ * #### `replace` ([*DEPRECATED*!], will be removed in next major release - i.e. v2.0)
+ * specify what the template should replace. Defaults to `false`.
+ *
+ * * `true` - the template will replace the directive's element.
+ * * `false` - the template will replace the contents of the directive's element.
+ *
+ * The replacement process migrates all of the attributes / classes from the old element to the new
+ * one. See the {@link guide/directive#template-expanding-directive
+ * Directives Guide} for an example.
+ *
+ * There are very few scenarios where element replacement is required for the application function,
+ * the main one being reusable custom components that are used within SVG contexts
+ * (because SVG doesn't work with custom elements in the DOM tree).
+ *
+ * #### `transclude`
+ * Extract the contents of the element where the directive appears and make it available to the directive.
+ * The contents are compiled and provided to the directive as a **transclusion function**. See the
+ * {@link $compile#transclusion Transclusion} section below.
+ *
+ * There are two kinds of transclusion depending upon whether you want to transclude just the contents of the
+ * directive's element or the entire element:
+ *
+ * * `true` - transclude the content (i.e. the child nodes) of the directive's element.
+ * * `'element'` - transclude the whole of the directive's element including any directives on this
+ *   element that defined at a lower priority than this directive. When used, the `template`
+ *   property is ignored.
+ *
+ *
+ * #### `compile`
+ *
+ * ```js
+ *   function compile(tElement, tAttrs, transclude) { ... }
+ * ```
+ *
+ * The compile function deals with transforming the template DOM. Since most directives do not do
+ * template transformation, it is not used often. The compile function takes the following arguments:
+ *
+ *   * `tElement` - template element - The element where the directive has been declared. It is
+ *     safe to do template transformation on the element and child elements only.
+ *
+ *   * `tAttrs` - template attributes - Normalized list of attributes declared on this element shared
+ *     between all directive compile functions.
+ *
+ *   * `transclude` -  [*DEPRECATED*!] A transclude linking function: `function(scope, cloneLinkingFn)`
+ *
+ * <div class="alert alert-warning">
+ * **Note:** The template instance and the link instance may be different objects if the template has
+ * been cloned. For this reason it is **not** safe to do anything other than DOM transformations that
+ * apply to all cloned DOM nodes within the compile function. Specifically, DOM listener registration
+ * should be done in a linking function rather than in a compile function.
+ * </div>
+
+ * <div class="alert alert-warning">
+ * **Note:** The compile function cannot handle directives that recursively use themselves in their
+ * own templates or compile functions. Compiling these directives results in an infinite loop and a
+ * stack overflow errors.
+ *
+ * This can be avoided by manually using $compile in the postLink function to imperatively compile
+ * a directive's template instead of relying on automatic template compilation via `template` or
+ * `templateUrl` declaration or manual compilation inside the compile function.
+ * </div>
+ *
+ * <div class="alert alert-danger">
+ * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it
+ *   e.g. does not know about the right outer scope. Please use the transclude function that is passed
+ *   to the link function instead.
+ * </div>
+
+ * A compile function can have a return value which can be either a function or an object.
+ *
+ * * returning a (post-link) function - is equivalent to registering the linking function via the
+ *   `link` property of the config object when the compile function is empty.
+ *
+ * * returning an object with function(s) registered via `pre` and `post` properties - allows you to
+ *   control when a linking function should be called during the linking phase. See info about
+ *   pre-linking and post-linking functions below.
+ *
+ *
+ * #### `link`
+ * This property is used only if the `compile` property is not defined.
+ *
+ * ```js
+ *   function link(scope, iElement, iAttrs, controller, transcludeFn) { ... }
+ * ```
+ *
+ * The link function is responsible for registering DOM listeners as well as updating the DOM. It is
+ * executed after the template has been cloned. This is where most of the directive logic will be
+ * put.
+ *
+ *   * `scope` - {@link ng.$rootScope.Scope Scope} - The scope to be used by the
+ *     directive for registering {@link ng.$rootScope.Scope#$watch watches}.
+ *
+ *   * `iElement` - instance element - The element where the directive is to be used. It is safe to
+ *     manipulate the children of the element only in `postLink` function since the children have
+ *     already been linked.
+ *
+ *   * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared
+ *     between all directive linking functions.
+ *
+ *   * `controller` - the directive's required controller instance(s) - Instances are shared
+ *     among all directives, which allows the directives to use the controllers as a communication
+ *     channel. The exact value depends on the directive's `require` property:
+ *       * `string`: the controller instance
+ *       * `array`: array of controller instances
+ *       * no controller(s) required: `undefined`
+ *
+ *     If a required controller cannot be found, and it is optional, the instance is `null`,
+ *     otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown.
+ *
+ *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
+ *     This is the same as the `$transclude`
+ *     parameter of directive controllers, see there for details.
+ *     `function([scope], cloneLinkingFn, futureParentElement)`.
+ *
+ * #### Pre-linking function
+ *
+ * Executed before the child elements are linked. Not safe to do DOM transformation since the
+ * compiler linking function will fail to locate the correct elements for linking.
+ *
+ * #### Post-linking function
+ *
+ * Executed after the child elements are linked.
+ *
+ * Note that child elements that contain `templateUrl` directives will not have been compiled
+ * and linked since they are waiting for their template to load asynchronously and their own
+ * compilation and linking has been suspended until that occurs.
+ *
+ * It is safe to do DOM transformation in the post-linking function on elements that are not waiting
+ * for their async templates to be resolved.
+ *
+ *
+ * ### Transclusion
+ *
+ * Transclusion is the process of extracting a collection of DOM element from one part of the DOM and
+ * copying them to another part of the DOM, while maintaining their connection to the original AngularJS
+ * scope from where they were taken.
+ *
+ * Transclusion is used (often with {@link ngTransclude}) to insert the
+ * original contents of a directive's element into a specified place in the template of the directive.
+ * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded
+ * content has access to the properties on the scope from which it was taken, even if the directive
+ * has isolated scope.
+ * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}.
+ *
+ * This makes it possible for the widget to have private state for its template, while the transcluded
+ * content has access to its originating scope.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** When testing an element transclude directive you must not place the directive at the root of the
+ * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives
+ * Testing Transclusion Directives}.
+ * </div>
+ *
+ * #### Transclusion Functions
+ *
+ * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion
+ * function** to the directive's `link` function and `controller`. This transclusion function is a special
+ * **linking function** that will return the compiled contents linked to a new transclusion scope.
+ *
+ * <div class="alert alert-info">
+ * If you are just using {@link ngTransclude} then you don't need to worry about this function, since
+ * ngTransclude will deal with it for us.
+ * </div>
+ *
+ * If you want to manually control the insertion and removal of the transcluded content in your directive
+ * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery
+ * object that contains the compiled DOM, which is linked to the correct transclusion scope.
+ *
+ * When you call a transclusion function you can pass in a **clone attach function**. This function accepts
+ * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded
+ * content and the `scope` is the newly created transclusion scope, to which the clone is bound.
+ *
+ * <div class="alert alert-info">
+ * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a translude function
+ * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope.
+ * </div>
+ *
+ * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone
+ * attach function**:
+ *
+ * ```js
+ * var transcludedContent, transclusionScope;
+ *
+ * $transclude(function(clone, scope) {
+ *   element.append(clone);
+ *   transcludedContent = clone;
+ *   transclusionScope = scope;
+ * });
+ * ```
+ *
+ * Later, if you want to remove the transcluded content from your DOM then you should also destroy the
+ * associated transclusion scope:
+ *
+ * ```js
+ * transcludedContent.remove();
+ * transclusionScope.$destroy();
+ * ```
+ *
+ * <div class="alert alert-info">
+ * **Best Practice**: if you intend to add and remove transcluded content manually in your directive
+ * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it),
+ * then you are also responsible for calling `$destroy` on the transclusion scope.
+ * </div>
+ *
+ * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat}
+ * automatically destroy their transluded clones as necessary so you do not need to worry about this if
+ * you are simply using {@link ngTransclude} to inject the transclusion into your directive.
+ *
+ *
+ * #### Transclusion Scopes
+ *
+ * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion
+ * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed
+ * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it
+ * was taken.
+ *
+ * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look
+ * like this:
+ *
+ * ```html
+ * <div ng-app>
+ *   <div isolate>
+ *     <div transclusion>
+ *     </div>
+ *   </div>
+ * </div>
+ * ```
+ *
+ * The `$parent` scope hierarchy will look like this:
+ *
+ * ```
+ * - $rootScope
+ *   - isolate
+ *     - transclusion
+ * ```
+ *
+ * but the scopes will inherit prototypically from different scopes to their `$parent`.
+ *
+ * ```
+ * - $rootScope
+ *   - transclusion
+ * - isolate
+ * ```
+ *
+ *
+ * ### Attributes
+ *
+ * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the
+ * `link()` or `compile()` functions. It has a variety of uses.
+ *
+ * accessing *Normalized attribute names:*
+ * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'.
+ * the attributes object allows for normalized access to
+ *   the attributes.
+ *
+ * * *Directive inter-communication:* All directives share the same instance of the attributes
+ *   object which allows the directives to use the attributes object as inter directive
+ *   communication.
+ *
+ * * *Supports interpolation:* Interpolation attributes are assigned to the attribute object
+ *   allowing other directives to read the interpolated value.
+ *
+ * * *Observing interpolated attributes:* Use `$observe` to observe the value changes of attributes
+ *   that contain interpolation (e.g. `src="{{bar}}"`). Not only is this very efficient but it's also
+ *   the only way to easily get the actual value because during the linking phase the interpolation
+ *   hasn't been evaluated yet and so the value is at this time set to `undefined`.
+ *
+ * ```js
+ * function linkingFn(scope, elm, attrs, ctrl) {
+ *   // get the attribute value
+ *   console.log(attrs.ngModel);
+ *
+ *   // change the attribute
+ *   attrs.$set('ngModel', 'new value');
+ *
+ *   // observe changes to interpolated attribute
+ *   attrs.$observe('ngModel', function(value) {
+ *     console.log('ngModel has changed value to ' + value);
+ *   });
+ * }
+ * ```
+ *
+ * ## Example
+ *
+ * <div class="alert alert-warning">
+ * **Note**: Typically directives are registered with `module.directive`. The example below is
+ * to illustrate how `$compile` works.
+ * </div>
+ *
+ <example module="compileExample">
+   <file name="index.html">
+    <script>
+      angular.module('compileExample', [], function($compileProvider) {
+        // configure new 'compile' directive by passing a directive
+        // factory function. The factory function injects the '$compile'
+        $compileProvider.directive('compile', function($compile) {
+          // directive factory creates a link function
+          return function(scope, element, attrs) {
+            scope.$watch(
+              function(scope) {
+                 // watch the 'compile' expression for changes
+                return scope.$eval(attrs.compile);
+              },
+              function(value) {
+                // when the 'compile' expression changes
+                // assign it into the current DOM
+                element.html(value);
+
+                // compile the new DOM and link it to the current
+                // scope.
+                // NOTE: we only compile .childNodes so that
+                // we don't get into infinite loop compiling ourselves
+                $compile(element.contents())(scope);
+              }
+            );
+          };
+        });
+      })
+      .controller('GreeterController', ['$scope', function($scope) {
+        $scope.name = 'Angular';
+        $scope.html = 'Hello {{name}}';
+      }]);
+    </script>
+    <div ng-controller="GreeterController">
+      <input ng-model="name"> <br/>
+      <textarea ng-model="html"></textarea> <br/>
+      <div compile="html"></div>
+    </div>
+   </file>
+   <file name="protractor.js" type="protractor">
+     it('should auto compile', function() {
+       var textarea = $('textarea');
+       var output = $('div[compile]');
+       // The initial state reads 'Hello Angular'.
+       expect(output.getText()).toBe('Hello Angular');
+       textarea.clear();
+       textarea.sendKeys('{{name}}!');
+       expect(output.getText()).toBe('Angular!');
+     });
+   </file>
+ </example>
+
+ *
+ *
+ * @param {string|DOMElement} element Element or HTML string to compile into a template function.
+ * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED.
+ *
+ * <div class="alert alert-danger">
+ * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it
+ *   e.g. will not use the right outer scope. Please pass the transclude function as a
+ *   `parentBoundTranscludeFn` to the link function instead.
+ * </div>
+ *
+ * @param {number} maxPriority only apply directives lower than given priority (Only effects the
+ *                 root element(s), not their children)
+ * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template
+ * (a DOM element/tree) to a scope. Where:
+ *
+ *  * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to.
+ *  * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the
+ *  `template` and call the `cloneAttachFn` function allowing the caller to attach the
+ *  cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is
+ *  called as: <br/> `cloneAttachFn(clonedElement, scope)` where:
+ *
+ *      * `clonedElement` - is a clone of the original `element` passed into the compiler.
+ *      * `scope` - is the current scope with which the linking function is working with.
+ *
+ *  * `options` - An optional object hash with linking options. If `options` is provided, then the following
+ *  keys may be used to control linking behavior:
+ *
+ *      * `parentBoundTranscludeFn` - the transclude function made available to
+ *        directives; if given, it will be passed through to the link functions of
+ *        directives found in `element` during compilation.
+ *      * `transcludeControllers` - an object hash with keys that map controller names
+ *        to controller instances; if given, it will make the controllers
+ *        available to directives.
+ *      * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add
+ *        the cloned elements; only needed for transcludes that are allowed to contain non html
+ *        elements (e.g. SVG elements). See also the directive.controller property.
+ *
+ * Calling the linking function returns the element of the template. It is either the original
+ * element passed in, or the clone of the element if the `cloneAttachFn` is provided.
+ *
+ * After linking the view is not updated until after a call to $digest which typically is done by
+ * Angular automatically.
+ *
+ * If you need access to the bound view, there are two ways to do it:
+ *
+ * - If you are not asking the linking function to clone the template, create the DOM element(s)
+ *   before you send them to the compiler and keep this reference around.
+ *   ```js
+ *     var element = $compile('<p>{{total}}</p>')(scope);
+ *   ```
+ *
+ * - if on the other hand, you need the element to be cloned, the view reference from the original
+ *   example would not point to the clone, but rather to the original template that was cloned. In
+ *   this case, you can access the clone via the cloneAttachFn:
+ *   ```js
+ *     var templateElement = angular.element('<p>{{total}}</p>'),
+ *         scope = ....;
+ *
+ *     var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) {
+ *       //attach the clone to DOM document at the right place
+ *     });
+ *
+ *     //now we have reference to the cloned DOM via `clonedElement`
+ *   ```
+ *
+ *
+ * For information on how the compiler works, see the
+ * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide.
+ */
+
+var $compileMinErr = minErr('$compile');
+
+/**
+ * @ngdoc provider
+ * @name $compileProvider
+ *
+ * @description
+ */
+$CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider'];
+function $CompileProvider($provide, $$sanitizeUriProvider) {
+  var hasDirectives = {},
+      Suffix = 'Directive',
+      COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\w\-]+)\s+(.*)$/,
+      CLASS_DIRECTIVE_REGEXP = /(([\w\-]+)(?:\:([^;]+))?;?)/,
+      ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'),
+      REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/;
+
+  // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes
+  // The assumption is that future DOM event attribute names will begin with
+  // 'on' and be composed of only English letters.
+  var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/;
+
+  function parseIsolateBindings(scope, directiveName, isController) {
+    var LOCAL_REGEXP = /^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/;
+
+    var bindings = {};
+
+    forEach(scope, function(definition, scopeName) {
+      var match = definition.match(LOCAL_REGEXP);
+
+      if (!match) {
+        throw $compileMinErr('iscp',
+            "Invalid {3} for directive '{0}'." +
+            " Definition: {... {1}: '{2}' ...}",
+            directiveName, scopeName, definition,
+            (isController ? "controller bindings definition" :
+            "isolate scope definition"));
+      }
+
+      bindings[scopeName] = {
+        mode: match[1][0],
+        collection: match[2] === '*',
+        optional: match[3] === '?',
+        attrName: match[4] || scopeName
+      };
+    });
+
+    return bindings;
+  }
+
+  function parseDirectiveBindings(directive, directiveName) {
+    var bindings = {
+      isolateScope: null,
+      bindToController: null
+    };
+    if (isObject(directive.scope)) {
+      if (directive.bindToController === true) {
+        bindings.bindToController = parseIsolateBindings(directive.scope,
+                                                         directiveName, true);
+        bindings.isolateScope = {};
+      } else {
+        bindings.isolateScope = parseIsolateBindings(directive.scope,
+                                                     directiveName, false);
+      }
+    }
+    if (isObject(directive.bindToController)) {
+      bindings.bindToController =
+          parseIsolateBindings(directive.bindToController, directiveName, true);
+    }
+    if (isObject(bindings.bindToController)) {
+      var controller = directive.controller;
+      var controllerAs = directive.controllerAs;
+      if (!controller) {
+        // There is no controller, there may or may not be a controllerAs property
+        throw $compileMinErr('noctrl',
+              "Cannot bind to controller without directive '{0}'s controller.",
+              directiveName);
+      } else if (!identifierForController(controller, controllerAs)) {
+        // There is a controller, but no identifier or controllerAs property
+        throw $compileMinErr('noident',
+              "Cannot bind to controller without identifier for directive '{0}'.",
+              directiveName);
+      }
+    }
+    return bindings;
+  }
+
+  function assertValidDirectiveName(name) {
+    var letter = name.charAt(0);
+    if (!letter || letter !== lowercase(letter)) {
+      throw $compileMinErr('baddir', "Directive name '{0}' is invalid. The first character must be a lowercase letter", name);
+    }
+    if (name !== name.trim()) {
+      throw $compileMinErr('baddir',
+            "Directive name '{0}' is invalid. The name should not contain leading or trailing whitespaces",
+            name);
+    }
+  }
+
+  /**
+   * @ngdoc method
+   * @name $compileProvider#directive
+   * @kind function
+   *
+   * @description
+   * Register a new directive with the compiler.
+   *
+   * @param {string|Object} name Name of the directive in camel-case (i.e. <code>ngBind</code> which
+   *    will match as <code>ng-bind</code>), or an object map of directives where the keys are the
+   *    names and the values are the factories.
+   * @param {Function|Array} directiveFactory An injectable directive factory function. See
+   *    {@link guide/directive} for more info.
+   * @returns {ng.$compileProvider} Self for chaining.
+   */
+   this.directive = function registerDirective(name, directiveFactory) {
+    assertNotHasOwnProperty(name, 'directive');
+    if (isString(name)) {
+      assertValidDirectiveName(name);
+      assertArg(directiveFactory, 'directiveFactory');
+      if (!hasDirectives.hasOwnProperty(name)) {
+        hasDirectives[name] = [];
+        $provide.factory(name + Suffix, ['$injector', '$exceptionHandler',
+          function($injector, $exceptionHandler) {
+            var directives = [];
+            forEach(hasDirectives[name], function(directiveFactory, index) {
+              try {
+                var directive = $injector.invoke(directiveFactory);
+                if (isFunction(directive)) {
+                  directive = { compile: valueFn(directive) };
+                } else if (!directive.compile && directive.link) {
+                  directive.compile = valueFn(directive.link);
+                }
+                directive.priority = directive.priority || 0;
+                directive.index = index;
+                directive.name = directive.name || name;
+                directive.require = directive.require || (directive.controller && directive.name);
+                directive.restrict = directive.restrict || 'EA';
+                var bindings = directive.$$bindings =
+                    parseDirectiveBindings(directive, directive.name);
+                if (isObject(bindings.isolateScope)) {
+                  directive.$$isolateBindings = bindings.isolateScope;
+                }
+                directives.push(directive);
+              } catch (e) {
+                $exceptionHandler(e);
+              }
+            });
+            return directives;
+          }]);
+      }
+      hasDirectives[name].push(directiveFactory);
+    } else {
+      forEach(name, reverseParams(registerDirective));
+    }
+    return this;
+  };
+
+
+  /**
+   * @ngdoc method
+   * @name $compileProvider#aHrefSanitizationWhitelist
+   * @kind function
+   *
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during a[href] sanitization.
+   *
+   * The sanitization is a security measure aimed at preventing XSS attacks via html links.
+   *
+   * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.aHrefSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      $$sanitizeUriProvider.aHrefSanitizationWhitelist(regexp);
+      return this;
+    } else {
+      return $$sanitizeUriProvider.aHrefSanitizationWhitelist();
+    }
+  };
+
+
+  /**
+   * @ngdoc method
+   * @name $compileProvider#imgSrcSanitizationWhitelist
+   * @kind function
+   *
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during img[src] sanitization.
+   *
+   * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+   *
+   * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.imgSrcSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      $$sanitizeUriProvider.imgSrcSanitizationWhitelist(regexp);
+      return this;
+    } else {
+      return $$sanitizeUriProvider.imgSrcSanitizationWhitelist();
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name  $compileProvider#debugInfoEnabled
+   *
+   * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the
+   * current debugInfoEnabled state
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
+   *
+   * @kind function
+   *
+   * @description
+   * Call this method to enable/disable various debug runtime information in the compiler such as adding
+   * binding information and a reference to the current scope on to DOM elements.
+   * If enabled, the compiler will add the following to DOM elements that have been bound to the scope
+   * * `ng-binding` CSS class
+   * * `$binding` data property containing an array of the binding expressions
+   *
+   * You may want to disable this in production for a significant performance boost. See
+   * {@link guide/production#disabling-debug-data Disabling Debug Data} for more.
+   *
+   * The default value is true.
+   */
+  var debugInfoEnabled = true;
+  this.debugInfoEnabled = function(enabled) {
+    if (isDefined(enabled)) {
+      debugInfoEnabled = enabled;
+      return this;
+    }
+    return debugInfoEnabled;
+  };
+
+  this.$get = [
+            '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse',
+            '$controller', '$rootScope', '$document', '$sce', '$animate', '$$sanitizeUri',
+    function($injector,   $interpolate,   $exceptionHandler,   $templateRequest,   $parse,
+             $controller,   $rootScope,   $document,   $sce,   $animate,   $$sanitizeUri) {
+
+    var Attributes = function(element, attributesToCopy) {
+      if (attributesToCopy) {
+        var keys = Object.keys(attributesToCopy);
+        var i, l, key;
+
+        for (i = 0, l = keys.length; i < l; i++) {
+          key = keys[i];
+          this[key] = attributesToCopy[key];
+        }
+      } else {
+        this.$attr = {};
+      }
+
+      this.$$element = element;
+    };
+
+    Attributes.prototype = {
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$normalize
+       * @kind function
+       *
+       * @description
+       * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or
+       * `data-`) to its normalized, camelCase form.
+       *
+       * Also there is special case for Moz prefix starting with upper case letter.
+       *
+       * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+       *
+       * @param {string} name Name to normalize
+       */
+      $normalize: directiveNormalize,
+
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$addClass
+       * @kind function
+       *
+       * @description
+       * Adds the CSS class value specified by the classVal parameter to the element. If animations
+       * are enabled then an animation will be triggered for the class addition.
+       *
+       * @param {string} classVal The className value that will be added to the element
+       */
+      $addClass: function(classVal) {
+        if (classVal && classVal.length > 0) {
+          $animate.addClass(this.$$element, classVal);
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$removeClass
+       * @kind function
+       *
+       * @description
+       * Removes the CSS class value specified by the classVal parameter from the element. If
+       * animations are enabled then an animation will be triggered for the class removal.
+       *
+       * @param {string} classVal The className value that will be removed from the element
+       */
+      $removeClass: function(classVal) {
+        if (classVal && classVal.length > 0) {
+          $animate.removeClass(this.$$element, classVal);
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$updateClass
+       * @kind function
+       *
+       * @description
+       * Adds and removes the appropriate CSS class values to the element based on the difference
+       * between the new and old CSS class values (specified as newClasses and oldClasses).
+       *
+       * @param {string} newClasses The current CSS className value
+       * @param {string} oldClasses The former CSS className value
+       */
+      $updateClass: function(newClasses, oldClasses) {
+        var toAdd = tokenDifference(newClasses, oldClasses);
+        if (toAdd && toAdd.length) {
+          $animate.addClass(this.$$element, toAdd);
+        }
+
+        var toRemove = tokenDifference(oldClasses, newClasses);
+        if (toRemove && toRemove.length) {
+          $animate.removeClass(this.$$element, toRemove);
+        }
+      },
+
+      /**
+       * Set a normalized attribute on the element in a way such that all directives
+       * can share the attribute. This function properly handles boolean attributes.
+       * @param {string} key Normalized key. (ie ngAttribute)
+       * @param {string|boolean} value The value to set. If `null` attribute will be deleted.
+       * @param {boolean=} writeAttr If false, does not write the value to DOM element attribute.
+       *     Defaults to true.
+       * @param {string=} attrName Optional none normalized name. Defaults to key.
+       */
+      $set: function(key, value, writeAttr, attrName) {
+        // TODO: decide whether or not to throw an error if "class"
+        //is set through this function since it may cause $updateClass to
+        //become unstable.
+
+        var node = this.$$element[0],
+            booleanKey = getBooleanAttrName(node, key),
+            aliasedKey = getAliasedAttrName(node, key),
+            observer = key,
+            nodeName;
+
+        if (booleanKey) {
+          this.$$element.prop(key, value);
+          attrName = booleanKey;
+        } else if (aliasedKey) {
+          this[aliasedKey] = value;
+          observer = aliasedKey;
+        }
+
+        this[key] = value;
+
+        // translate normalized key to actual key
+        if (attrName) {
+          this.$attr[key] = attrName;
+        } else {
+          attrName = this.$attr[key];
+          if (!attrName) {
+            this.$attr[key] = attrName = snake_case(key, '-');
+          }
+        }
+
+        nodeName = nodeName_(this.$$element);
+
+        if ((nodeName === 'a' && key === 'href') ||
+            (nodeName === 'img' && key === 'src')) {
+          // sanitize a[href] and img[src] values
+          this[key] = value = $$sanitizeUri(value, key === 'src');
+        } else if (nodeName === 'img' && key === 'srcset') {
+          // sanitize img[srcset] values
+          var result = "";
+
+          // first check if there are spaces because it's not the same pattern
+          var trimmedSrcset = trim(value);
+          //                (   999x   ,|   999w   ,|   ,|,   )
+          var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/;
+          var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/;
+
+          // split srcset into tuple of uri and descriptor except for the last item
+          var rawUris = trimmedSrcset.split(pattern);
+
+          // for each tuples
+          var nbrUrisWith2parts = Math.floor(rawUris.length / 2);
+          for (var i = 0; i < nbrUrisWith2parts; i++) {
+            var innerIdx = i * 2;
+            // sanitize the uri
+            result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
+            // add the descriptor
+            result += (" " + trim(rawUris[innerIdx + 1]));
+          }
+
+          // split the last item into uri and descriptor
+          var lastTuple = trim(rawUris[i * 2]).split(/\s/);
+
+          // sanitize the last uri
+          result += $$sanitizeUri(trim(lastTuple[0]), true);
+
+          // and add the last descriptor if any
+          if (lastTuple.length === 2) {
+            result += (" " + trim(lastTuple[1]));
+          }
+          this[key] = value = result;
+        }
+
+        if (writeAttr !== false) {
+          if (value === null || value === undefined) {
+            this.$$element.removeAttr(attrName);
+          } else {
+            this.$$element.attr(attrName, value);
+          }
+        }
+
+        // fire observers
+        var $$observers = this.$$observers;
+        $$observers && forEach($$observers[observer], function(fn) {
+          try {
+            fn(value);
+          } catch (e) {
+            $exceptionHandler(e);
+          }
+        });
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$observe
+       * @kind function
+       *
+       * @description
+       * Observes an interpolated attribute.
+       *
+       * The observer function will be invoked once during the next `$digest` following
+       * compilation. The observer is then invoked whenever the interpolated value
+       * changes.
+       *
+       * @param {string} key Normalized key. (ie ngAttribute) .
+       * @param {function(interpolatedValue)} fn Function that will be called whenever
+                the interpolated value of the attribute changes.
+       *        See the {@link guide/directive#text-and-attribute-bindings Directives} guide for more info.
+       * @returns {function()} Returns a deregistration function for this observer.
+       */
+      $observe: function(key, fn) {
+        var attrs = this,
+            $$observers = (attrs.$$observers || (attrs.$$observers = createMap())),
+            listeners = ($$observers[key] || ($$observers[key] = []));
+
+        listeners.push(fn);
+        $rootScope.$evalAsync(function() {
+          if (!listeners.$$inter && attrs.hasOwnProperty(key)) {
+            // no one registered attribute interpolation function, so lets call it manually
+            fn(attrs[key]);
+          }
+        });
+
+        return function() {
+          arrayRemove(listeners, fn);
+        };
+      }
+    };
+
+
+    function safeAddClass($element, className) {
+      try {
+        $element.addClass(className);
+      } catch (e) {
+        // ignore, since it means that we are trying to set class on
+        // SVG element, where class name is read-only.
+      }
+    }
+
+
+    var startSymbol = $interpolate.startSymbol(),
+        endSymbol = $interpolate.endSymbol(),
+        denormalizeTemplate = (startSymbol == '{{' || endSymbol  == '}}')
+            ? identity
+            : function denormalizeTemplate(template) {
+              return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
+        },
+        NG_ATTR_BINDING = /^ngAttr[A-Z]/;
+
+    compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) {
+      var bindings = $element.data('$binding') || [];
+
+      if (isArray(binding)) {
+        bindings = bindings.concat(binding);
+      } else {
+        bindings.push(binding);
+      }
+
+      $element.data('$binding', bindings);
+    } : noop;
+
+    compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) {
+      safeAddClass($element, 'ng-binding');
+    } : noop;
+
+    compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) {
+      var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope';
+      $element.data(dataName, scope);
+    } : noop;
+
+    compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) {
+      safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope');
+    } : noop;
+
+    return compile;
+
+    //================================
+
+    function compile($compileNodes, transcludeFn, maxPriority, ignoreDirective,
+                        previousCompileContext) {
+      if (!($compileNodes instanceof jqLite)) {
+        // jquery always rewraps, whereas we need to preserve the original selector so that we can
+        // modify it.
+        $compileNodes = jqLite($compileNodes);
+      }
+      // We can not compile top level text elements since text nodes can be merged and we will
+      // not be able to attach scope data to them, so we will wrap them in <span>
+      forEach($compileNodes, function(node, index) {
+        if (node.nodeType == NODE_TYPE_TEXT && node.nodeValue.match(/\S+/) /* non-empty */ ) {
+          $compileNodes[index] = jqLite(node).wrap('<span></span>').parent()[0];
+        }
+      });
+      var compositeLinkFn =
+              compileNodes($compileNodes, transcludeFn, $compileNodes,
+                           maxPriority, ignoreDirective, previousCompileContext);
+      compile.$$addScopeClass($compileNodes);
+      var namespace = null;
+      return function publicLinkFn(scope, cloneConnectFn, options) {
+        assertArg(scope, 'scope');
+
+        options = options || {};
+        var parentBoundTranscludeFn = options.parentBoundTranscludeFn,
+          transcludeControllers = options.transcludeControllers,
+          futureParentElement = options.futureParentElement;
+
+        // When `parentBoundTranscludeFn` is passed, it is a
+        // `controllersBoundTransclude` function (it was previously passed
+        // as `transclude` to directive.link) so we must unwrap it to get
+        // its `boundTranscludeFn`
+        if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) {
+          parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude;
+        }
+
+        if (!namespace) {
+          namespace = detectNamespaceForChildElements(futureParentElement);
+        }
+        var $linkNode;
+        if (namespace !== 'html') {
+          // When using a directive with replace:true and templateUrl the $compileNodes
+          // (or a child element inside of them)
+          // might change, so we need to recreate the namespace adapted compileNodes
+          // for call to the link function.
+          // Note: This will already clone the nodes...
+          $linkNode = jqLite(
+            wrapTemplate(namespace, jqLite('<div>').append($compileNodes).html())
+          );
+        } else if (cloneConnectFn) {
+          // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
+          // and sometimes changes the structure of the DOM.
+          $linkNode = JQLitePrototype.clone.call($compileNodes);
+        } else {
+          $linkNode = $compileNodes;
+        }
+
+        if (transcludeControllers) {
+          for (var controllerName in transcludeControllers) {
+            $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance);
+          }
+        }
+
+        compile.$$addScopeInfo($linkNode, scope);
+
+        if (cloneConnectFn) cloneConnectFn($linkNode, scope);
+        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn);
+        return $linkNode;
+      };
+    }
+
+    function detectNamespaceForChildElements(parentElement) {
+      // TODO: Make this detect MathML as well...
+      var node = parentElement && parentElement[0];
+      if (!node) {
+        return 'html';
+      } else {
+        return nodeName_(node) !== 'foreignobject' && node.toString().match(/SVG/) ? 'svg' : 'html';
+      }
+    }
+
+    /**
+     * Compile function matches each node in nodeList against the directives. Once all directives
+     * for a particular node are collected their compile functions are executed. The compile
+     * functions return values - the linking functions - are combined into a composite linking
+     * function, which is the a linking function for the node.
+     *
+     * @param {NodeList} nodeList an array of nodes or NodeList to compile
+     * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the
+     *        scope argument is auto-generated to the new child of the transcluded parent scope.
+     * @param {DOMElement=} $rootElement If the nodeList is the root of the compilation tree then
+     *        the rootElement must be set the jqLite collection of the compile root. This is
+     *        needed so that the jqLite collection items can be replaced with widgets.
+     * @param {number=} maxPriority Max directive priority.
+     * @returns {Function} A composite linking function of all of the matched directives or null.
+     */
+    function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective,
+                            previousCompileContext) {
+      var linkFns = [],
+          attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound;
+
+      for (var i = 0; i < nodeList.length; i++) {
+        attrs = new Attributes();
+
+        // we must always refer to nodeList[i] since the nodes can be replaced underneath us.
+        directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined,
+                                        ignoreDirective);
+
+        nodeLinkFn = (directives.length)
+            ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement,
+                                      null, [], [], previousCompileContext)
+            : null;
+
+        if (nodeLinkFn && nodeLinkFn.scope) {
+          compile.$$addScopeClass(attrs.$$element);
+        }
+
+        childLinkFn = (nodeLinkFn && nodeLinkFn.terminal ||
+                      !(childNodes = nodeList[i].childNodes) ||
+                      !childNodes.length)
+            ? null
+            : compileNodes(childNodes,
+                 nodeLinkFn ? (
+                  (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement)
+                     && nodeLinkFn.transclude) : transcludeFn);
+
+        if (nodeLinkFn || childLinkFn) {
+          linkFns.push(i, nodeLinkFn, childLinkFn);
+          linkFnFound = true;
+          nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn;
+        }
+
+        //use the previous context only for the first element in the virtual group
+        previousCompileContext = null;
+      }
+
+      // return a linking function if we have found anything, null otherwise
+      return linkFnFound ? compositeLinkFn : null;
+
+      function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) {
+        var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn;
+        var stableNodeList;
+
+
+        if (nodeLinkFnFound) {
+          // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our
+          // offsets don't get screwed up
+          var nodeListLength = nodeList.length;
+          stableNodeList = new Array(nodeListLength);
+
+          // create a sparse array by only copying the elements which have a linkFn
+          for (i = 0; i < linkFns.length; i+=3) {
+            idx = linkFns[i];
+            stableNodeList[idx] = nodeList[idx];
+          }
+        } else {
+          stableNodeList = nodeList;
+        }
+
+        for (i = 0, ii = linkFns.length; i < ii;) {
+          node = stableNodeList[linkFns[i++]];
+          nodeLinkFn = linkFns[i++];
+          childLinkFn = linkFns[i++];
+
+          if (nodeLinkFn) {
+            if (nodeLinkFn.scope) {
+              childScope = scope.$new();
+              compile.$$addScopeInfo(jqLite(node), childScope);
+              var destroyBindings = nodeLinkFn.$$destroyBindings;
+              if (destroyBindings) {
+                nodeLinkFn.$$destroyBindings = null;
+                childScope.$on('$destroyed', destroyBindings);
+              }
+            } else {
+              childScope = scope;
+            }
+
+            if (nodeLinkFn.transcludeOnThisElement) {
+              childBoundTranscludeFn = createBoundTranscludeFn(
+                  scope, nodeLinkFn.transclude, parentBoundTranscludeFn,
+                  nodeLinkFn.elementTranscludeOnThisElement);
+
+            } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) {
+              childBoundTranscludeFn = parentBoundTranscludeFn;
+
+            } else if (!parentBoundTranscludeFn && transcludeFn) {
+              childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn);
+
+            } else {
+              childBoundTranscludeFn = null;
+            }
+
+            nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn,
+                       nodeLinkFn);
+
+          } else if (childLinkFn) {
+            childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn);
+          }
+        }
+      }
+    }
+
+    function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn, elementTransclusion) {
+
+      var boundTranscludeFn = function(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) {
+
+        if (!transcludedScope) {
+          transcludedScope = scope.$new(false, containingScope);
+          transcludedScope.$$transcluded = true;
+        }
+
+        return transcludeFn(transcludedScope, cloneFn, {
+          parentBoundTranscludeFn: previousBoundTranscludeFn,
+          transcludeControllers: controllers,
+          futureParentElement: futureParentElement
+        });
+      };
+
+      return boundTranscludeFn;
+    }
+
+    /**
+     * Looks for directives on the given node and adds them to the directive collection which is
+     * sorted.
+     *
+     * @param node Node to search.
+     * @param directives An array to which the directives are added to. This array is sorted before
+     *        the function returns.
+     * @param attrs The shared attrs object which is used to populate the normalized attributes.
+     * @param {number=} maxPriority Max directive priority.
+     */
+    function collectDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
+      var nodeType = node.nodeType,
+          attrsMap = attrs.$attr,
+          match,
+          className;
+
+      switch (nodeType) {
+        case NODE_TYPE_ELEMENT: /* Element */
+          // use the node name: <directive>
+          addDirective(directives,
+              directiveNormalize(nodeName_(node)), 'E', maxPriority, ignoreDirective);
+
+          // iterate over the attributes
+          for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes,
+                   j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
+            var attrStartName = false;
+            var attrEndName = false;
+
+            attr = nAttrs[j];
+            name = attr.name;
+            value = trim(attr.value);
+
+            // support ngAttr attribute binding
+            ngAttrName = directiveNormalize(name);
+            if (isNgAttr = NG_ATTR_BINDING.test(ngAttrName)) {
+              name = name.replace(PREFIX_REGEXP, '')
+                .substr(8).replace(/_(.)/g, function(match, letter) {
+                  return letter.toUpperCase();
+                });
+            }
+
+            var directiveNName = ngAttrName.replace(/(Start|End)$/, '');
+            if (directiveIsMultiElement(directiveNName)) {
+              if (ngAttrName === directiveNName + 'Start') {
+                attrStartName = name;
+                attrEndName = name.substr(0, name.length - 5) + 'end';
+                name = name.substr(0, name.length - 6);
+              }
+            }
+
+            nName = directiveNormalize(name.toLowerCase());
+            attrsMap[nName] = name;
+            if (isNgAttr || !attrs.hasOwnProperty(nName)) {
+                attrs[nName] = value;
+                if (getBooleanAttrName(node, nName)) {
+                  attrs[nName] = true; // presence means true
+                }
+            }
+            addAttrInterpolateDirective(node, directives, value, nName, isNgAttr);
+            addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
+                          attrEndName);
+          }
+
+          // use class as directive
+          className = node.className;
+          if (isObject(className)) {
+              // Maybe SVGAnimatedString
+              className = className.animVal;
+          }
+          if (isString(className) && className !== '') {
+            while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) {
+              nName = directiveNormalize(match[2]);
+              if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) {
+                attrs[nName] = trim(match[3]);
+              }
+              className = className.substr(match.index + match[0].length);
+            }
+          }
+          break;
+        case NODE_TYPE_TEXT: /* Text Node */
+          addTextInterpolateDirective(directives, node.nodeValue);
+          break;
+        case NODE_TYPE_COMMENT: /* Comment */
+          try {
+            match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+            if (match) {
+              nName = directiveNormalize(match[1]);
+              if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+                attrs[nName] = trim(match[2]);
+              }
+            }
+          } catch (e) {
+            // turns out that under some circumstances IE9 throws errors when one attempts to read
+            // comment's node value.
+            // Just ignore it and continue. (Can't seem to reproduce in test case.)
+          }
+          break;
+      }
+
+      directives.sort(byPriority);
+      return directives;
+    }
+
+    /**
+     * Given a node with an directive-start it collects all of the siblings until it finds
+     * directive-end.
+     * @param node
+     * @param attrStart
+     * @param attrEnd
+     * @returns {*}
+     */
+    function groupScan(node, attrStart, attrEnd) {
+      var nodes = [];
+      var depth = 0;
+      if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) {
+        do {
+          if (!node) {
+            throw $compileMinErr('uterdir',
+                      "Unterminated attribute, found '{0}' but no matching '{1}' found.",
+                      attrStart, attrEnd);
+          }
+          if (node.nodeType == NODE_TYPE_ELEMENT) {
+            if (node.hasAttribute(attrStart)) depth++;
+            if (node.hasAttribute(attrEnd)) depth--;
+          }
+          nodes.push(node);
+          node = node.nextSibling;
+        } while (depth > 0);
+      } else {
+        nodes.push(node);
+      }
+
+      return jqLite(nodes);
+    }
+
+    /**
+     * Wrapper for linking function which converts normal linking function into a grouped
+     * linking function.
+     * @param linkFn
+     * @param attrStart
+     * @param attrEnd
+     * @returns {Function}
+     */
+    function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) {
+      return function(scope, element, attrs, controllers, transcludeFn) {
+        element = groupScan(element[0], attrStart, attrEnd);
+        return linkFn(scope, element, attrs, controllers, transcludeFn);
+      };
+    }
+
+    /**
+     * Once the directives have been collected, their compile functions are executed. This method
+     * is responsible for inlining directive templates as well as terminating the application
+     * of the directives if the terminal directive has been reached.
+     *
+     * @param {Array} directives Array of collected directives to execute their compile function.
+     *        this needs to be pre-sorted by priority order.
+     * @param {Node} compileNode The raw DOM node to apply the compile functions to
+     * @param {Object} templateAttrs The shared attribute function
+     * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the
+     *                                                  scope argument is auto-generated to the new
+     *                                                  child of the transcluded parent scope.
+     * @param {JQLite} jqCollection If we are working on the root of the compile tree then this
+     *                              argument has the root jqLite array so that we can replace nodes
+     *                              on it.
+     * @param {Object=} originalReplaceDirective An optional directive that will be ignored when
+     *                                           compiling the transclusion.
+     * @param {Array.<Function>} preLinkFns
+     * @param {Array.<Function>} postLinkFns
+     * @param {Object} previousCompileContext Context used for previous compilation of the current
+     *                                        node
+     * @returns {Function} linkFn
+     */
+    function applyDirectivesToNode(directives, compileNode, templateAttrs, transcludeFn,
+                                   jqCollection, originalReplaceDirective, preLinkFns, postLinkFns,
+                                   previousCompileContext) {
+      previousCompileContext = previousCompileContext || {};
+
+      var terminalPriority = -Number.MAX_VALUE,
+          newScopeDirective,
+          controllerDirectives = previousCompileContext.controllerDirectives,
+          newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
+          templateDirective = previousCompileContext.templateDirective,
+          nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
+          hasTranscludeDirective = false,
+          hasTemplate = false,
+          hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective,
+          $compileNode = templateAttrs.$$element = jqLite(compileNode),
+          directive,
+          directiveName,
+          $template,
+          replaceDirective = originalReplaceDirective,
+          childTranscludeFn = transcludeFn,
+          linkFn,
+          directiveValue;
+
+      // executes all directives on the current element
+      for (var i = 0, ii = directives.length; i < ii; i++) {
+        directive = directives[i];
+        var attrStart = directive.$$start;
+        var attrEnd = directive.$$end;
+
+        // collect multiblock sections
+        if (attrStart) {
+          $compileNode = groupScan(compileNode, attrStart, attrEnd);
+        }
+        $template = undefined;
+
+        if (terminalPriority > directive.priority) {
+          break; // prevent further processing of directives
+        }
+
+        if (directiveValue = directive.scope) {
+
+          // skip the check for directives with async templates, we'll check the derived sync
+          // directive when the template arrives
+          if (!directive.templateUrl) {
+            if (isObject(directiveValue)) {
+              // This directive is trying to add an isolated scope.
+              // Check that there is no scope of any kind already
+              assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective,
+                                directive, $compileNode);
+              newIsolateScopeDirective = directive;
+            } else {
+              // This directive is trying to add a child scope.
+              // Check that there is no isolated scope already
+              assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
+                                $compileNode);
+            }
+          }
+
+          newScopeDirective = newScopeDirective || directive;
+        }
+
+        directiveName = directive.name;
+
+        if (!directive.templateUrl && directive.controller) {
+          directiveValue = directive.controller;
+          controllerDirectives = controllerDirectives || createMap();
+          assertNoDuplicate("'" + directiveName + "' controller",
+              controllerDirectives[directiveName], directive, $compileNode);
+          controllerDirectives[directiveName] = directive;
+        }
+
+        if (directiveValue = directive.transclude) {
+          hasTranscludeDirective = true;
+
+          // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion.
+          // This option should only be used by directives that know how to safely handle element transclusion,
+          // where the transcluded nodes are added or replaced after linking.
+          if (!directive.$$tlb) {
+            assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode);
+            nonTlbTranscludeDirective = directive;
+          }
+
+          if (directiveValue == 'element') {
+            hasElementTranscludeDirective = true;
+            terminalPriority = directive.priority;
+            $template = $compileNode;
+            $compileNode = templateAttrs.$$element =
+                jqLite(document.createComment(' ' + directiveName + ': ' +
+                                              templateAttrs[directiveName] + ' '));
+            compileNode = $compileNode[0];
+            replaceWith(jqCollection, sliceArgs($template), compileNode);
+
+            childTranscludeFn = compile($template, transcludeFn, terminalPriority,
+                                        replaceDirective && replaceDirective.name, {
+                                          // Don't pass in:
+                                          // - controllerDirectives - otherwise we'll create duplicates controllers
+                                          // - newIsolateScopeDirective or templateDirective - combining templates with
+                                          //   element transclusion doesn't make sense.
+                                          //
+                                          // We need only nonTlbTranscludeDirective so that we prevent putting transclusion
+                                          // on the same element more than once.
+                                          nonTlbTranscludeDirective: nonTlbTranscludeDirective
+                                        });
+          } else {
+            $template = jqLite(jqLiteClone(compileNode)).contents();
+            $compileNode.empty(); // clear contents
+            childTranscludeFn = compile($template, transcludeFn);
+          }
+        }
+
+        if (directive.template) {
+          hasTemplate = true;
+          assertNoDuplicate('template', templateDirective, directive, $compileNode);
+          templateDirective = directive;
+
+          directiveValue = (isFunction(directive.template))
+              ? directive.template($compileNode, templateAttrs)
+              : directive.template;
+
+          directiveValue = denormalizeTemplate(directiveValue);
+
+          if (directive.replace) {
+            replaceDirective = directive;
+            if (jqLiteIsTextNode(directiveValue)) {
+              $template = [];
+            } else {
+              $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue)));
+            }
+            compileNode = $template[0];
+
+            if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
+              throw $compileMinErr('tplrt',
+                  "Template for directive '{0}' must have exactly one root element. {1}",
+                  directiveName, '');
+            }
+
+            replaceWith(jqCollection, $compileNode, compileNode);
+
+            var newTemplateAttrs = {$attr: {}};
+
+            // combine directives from the original node and from the template:
+            // - take the array of directives for this element
+            // - split it into two parts, those that already applied (processed) and those that weren't (unprocessed)
+            // - collect directives from the template and sort them by priority
+            // - combine directives as: processed + template + unprocessed
+            var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs);
+            var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1));
+
+            if (newIsolateScopeDirective) {
+              markDirectivesAsIsolate(templateDirectives);
+            }
+            directives = directives.concat(templateDirectives).concat(unprocessedDirectives);
+            mergeTemplateAttributes(templateAttrs, newTemplateAttrs);
+
+            ii = directives.length;
+          } else {
+            $compileNode.html(directiveValue);
+          }
+        }
+
+        if (directive.templateUrl) {
+          hasTemplate = true;
+          assertNoDuplicate('template', templateDirective, directive, $compileNode);
+          templateDirective = directive;
+
+          if (directive.replace) {
+            replaceDirective = directive;
+          }
+
+          nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode,
+              templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, {
+                controllerDirectives: controllerDirectives,
+                newIsolateScopeDirective: newIsolateScopeDirective,
+                templateDirective: templateDirective,
+                nonTlbTranscludeDirective: nonTlbTranscludeDirective
+              });
+          ii = directives.length;
+        } else if (directive.compile) {
+          try {
+            linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn);
+            if (isFunction(linkFn)) {
+              addLinkFns(null, linkFn, attrStart, attrEnd);
+            } else if (linkFn) {
+              addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd);
+            }
+          } catch (e) {
+            $exceptionHandler(e, startingTag($compileNode));
+          }
+        }
+
+        if (directive.terminal) {
+          nodeLinkFn.terminal = true;
+          terminalPriority = Math.max(terminalPriority, directive.priority);
+        }
+
+      }
+
+      nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
+      nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective;
+      nodeLinkFn.elementTranscludeOnThisElement = hasElementTranscludeDirective;
+      nodeLinkFn.templateOnThisElement = hasTemplate;
+      nodeLinkFn.transclude = childTranscludeFn;
+
+      previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
+
+      // might be normal or delayed nodeLinkFn depending on if templateUrl is present
+      return nodeLinkFn;
+
+      ////////////////////
+
+      function addLinkFns(pre, post, attrStart, attrEnd) {
+        if (pre) {
+          if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd);
+          pre.require = directive.require;
+          pre.directiveName = directiveName;
+          if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
+            pre = cloneAndAnnotateFn(pre, {isolateScope: true});
+          }
+          preLinkFns.push(pre);
+        }
+        if (post) {
+          if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd);
+          post.require = directive.require;
+          post.directiveName = directiveName;
+          if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
+            post = cloneAndAnnotateFn(post, {isolateScope: true});
+          }
+          postLinkFns.push(post);
+        }
+      }
+
+
+      function getControllers(directiveName, require, $element, elementControllers) {
+        var value;
+
+        if (isString(require)) {
+          var match = require.match(REQUIRE_PREFIX_REGEXP);
+          var name = require.substring(match[0].length);
+          var inheritType = match[1] || match[3];
+          var optional = match[2] === '?';
+
+          //If only parents then start at the parent element
+          if (inheritType === '^^') {
+            $element = $element.parent();
+          //Otherwise attempt getting the controller from elementControllers in case
+          //the element is transcluded (and has no data) and to avoid .data if possible
+          } else {
+            value = elementControllers && elementControllers[name];
+            value = value && value.instance;
+          }
+
+          if (!value) {
+            var dataName = '$' + name + 'Controller';
+            value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
+          }
+
+          if (!value && !optional) {
+            throw $compileMinErr('ctreq',
+                "Controller '{0}', required by directive '{1}', can't be found!",
+                name, directiveName);
+          }
+        } else if (isArray(require)) {
+          value = [];
+          for (var i = 0, ii = require.length; i < ii; i++) {
+            value[i] = getControllers(directiveName, require[i], $element, elementControllers);
+          }
+        }
+
+        return value || null;
+      }
+
+      function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope) {
+        var elementControllers = createMap();
+        for (var controllerKey in controllerDirectives) {
+          var directive = controllerDirectives[controllerKey];
+          var locals = {
+            $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
+            $element: $element,
+            $attrs: attrs,
+            $transclude: transcludeFn
+          };
+
+          var controller = directive.controller;
+          if (controller == '@') {
+            controller = attrs[directive.name];
+          }
+
+          var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+
+          // For directives with element transclusion the element is a comment,
+          // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
+          // clean up (http://bugs.jquery.com/ticket/8335).
+          // Instead, we save the controllers for the element in a local hash and attach to .data
+          // later, once we have the actual element.
+          elementControllers[directive.name] = controllerInstance;
+          if (!hasElementTranscludeDirective) {
+            $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
+          }
+        }
+        return elementControllers;
+      }
+
+      function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn,
+                          thisLinkFn) {
+        var i, ii, linkFn, controller, isolateScope, elementControllers, transcludeFn, $element,
+            attrs;
+
+        if (compileNode === linkNode) {
+          attrs = templateAttrs;
+          $element = templateAttrs.$$element;
+        } else {
+          $element = jqLite(linkNode);
+          attrs = new Attributes($element, templateAttrs);
+        }
+
+        if (newIsolateScopeDirective) {
+          isolateScope = scope.$new(true);
+        }
+
+        if (boundTranscludeFn) {
+          // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn`
+          // is later passed as `parentBoundTranscludeFn` to `publicLinkFn`
+          transcludeFn = controllersBoundTransclude;
+          transcludeFn.$$boundTransclude = boundTranscludeFn;
+        }
+
+        if (controllerDirectives) {
+          elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope);
+        }
+
+        if (newIsolateScopeDirective) {
+          // Initialize isolate scope bindings for new isolate scope directive.
+          compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective ||
+              templateDirective === newIsolateScopeDirective.$$originalDirective)));
+          compile.$$addScopeClass($element, true);
+          isolateScope.$$isolateBindings =
+              newIsolateScopeDirective.$$isolateBindings;
+          initializeDirectiveBindings(scope, attrs, isolateScope,
+                                      isolateScope.$$isolateBindings,
+                                      newIsolateScopeDirective, isolateScope);
+        }
+        if (elementControllers) {
+          // Initialize bindToController bindings for new/isolate scopes
+          var scopeDirective = newIsolateScopeDirective || newScopeDirective;
+          var bindings;
+          var controllerForBindings;
+          if (scopeDirective && elementControllers[scopeDirective.name]) {
+            bindings = scopeDirective.$$bindings.bindToController;
+            controller = elementControllers[scopeDirective.name];
+
+            if (controller && controller.identifier && bindings) {
+              controllerForBindings = controller;
+              thisLinkFn.$$destroyBindings =
+                  initializeDirectiveBindings(scope, attrs, controller.instance,
+                                              bindings, scopeDirective);
+            }
+          }
+          for (i in elementControllers) {
+            controller = elementControllers[i];
+            var controllerResult = controller();
+            if (controllerResult !== controller.instance) {
+              controller.instance = controllerResult;
+              $element.data('$' + directive.name + 'Controller', controllerResult);
+              if (controller === controllerForBindings) {
+                // Remove and re-install bindToController bindings
+                thisLinkFn.$$destroyBindings();
+                thisLinkFn.$$destroyBindings =
+                  initializeDirectiveBindings(scope, attrs, controllerResult, bindings, scopeDirective);
+              }
+            }
+          }
+        }
+
+        // PRELINKING
+        for (i = 0, ii = preLinkFns.length; i < ii; i++) {
+          linkFn = preLinkFns[i];
+          invokeLinkFn(linkFn,
+              linkFn.isolateScope ? isolateScope : scope,
+              $element,
+              attrs,
+              linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+              transcludeFn
+          );
+        }
+
+        // RECURSION
+        // We only pass the isolate scope, if the isolate directive has a template,
+        // otherwise the child elements do not belong to the isolate directive.
+        var scopeToChild = scope;
+        if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) {
+          scopeToChild = isolateScope;
+        }
+        childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
+
+        // POSTLINKING
+        for (i = postLinkFns.length - 1; i >= 0; i--) {
+          linkFn = postLinkFns[i];
+          invokeLinkFn(linkFn,
+              linkFn.isolateScope ? isolateScope : scope,
+              $element,
+              attrs,
+              linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+              transcludeFn
+          );
+        }
+
+        // This is the function that is injected as `$transclude`.
+        // Note: all arguments are optional!
+        function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement) {
+          var transcludeControllers;
+
+          // No scope passed in:
+          if (!isScope(scope)) {
+            futureParentElement = cloneAttachFn;
+            cloneAttachFn = scope;
+            scope = undefined;
+          }
+
+          if (hasElementTranscludeDirective) {
+            transcludeControllers = elementControllers;
+          }
+          if (!futureParentElement) {
+            futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element;
+          }
+          return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+        }
+      }
+    }
+
+    function markDirectivesAsIsolate(directives) {
+      // mark all directives as needing isolate scope.
+      for (var j = 0, jj = directives.length; j < jj; j++) {
+        directives[j] = inherit(directives[j], {$$isolateScope: true});
+      }
+    }
+
+    /**
+     * looks up the directive and decorates it with exception handling and proper parameters. We
+     * call this the boundDirective.
+     *
+     * @param {string} name name of the directive to look up.
+     * @param {string} location The directive must be found in specific format.
+     *   String containing any of theses characters:
+     *
+     *   * `E`: element name
+     *   * `A': attribute
+     *   * `C`: class
+     *   * `M`: comment
+     * @returns {boolean} true if directive was added.
+     */
+    function addDirective(tDirectives, name, location, maxPriority, ignoreDirective, startAttrName,
+                          endAttrName) {
+      if (name === ignoreDirective) return null;
+      var match = null;
+      if (hasDirectives.hasOwnProperty(name)) {
+        for (var directive, directives = $injector.get(name + Suffix),
+            i = 0, ii = directives.length; i < ii; i++) {
+          try {
+            directive = directives[i];
+            if ((maxPriority === undefined || maxPriority > directive.priority) &&
+                 directive.restrict.indexOf(location) != -1) {
+              if (startAttrName) {
+                directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
+              }
+              tDirectives.push(directive);
+              match = directive;
+            }
+          } catch (e) { $exceptionHandler(e); }
+        }
+      }
+      return match;
+    }
+
+
+    /**
+     * looks up the directive and returns true if it is a multi-element directive,
+     * and therefore requires DOM nodes between -start and -end markers to be grouped
+     * together.
+     *
+     * @param {string} name name of the directive to look up.
+     * @returns true if directive was registered as multi-element.
+     */
+    function directiveIsMultiElement(name) {
+      if (hasDirectives.hasOwnProperty(name)) {
+        for (var directive, directives = $injector.get(name + Suffix),
+            i = 0, ii = directives.length; i < ii; i++) {
+          directive = directives[i];
+          if (directive.multiElement) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
+    /**
+     * When the element is replaced with HTML template then the new attributes
+     * on the template need to be merged with the existing attributes in the DOM.
+     * The desired effect is to have both of the attributes present.
+     *
+     * @param {object} dst destination attributes (original DOM)
+     * @param {object} src source attributes (from the directive template)
+     */
+    function mergeTemplateAttributes(dst, src) {
+      var srcAttr = src.$attr,
+          dstAttr = dst.$attr,
+          $element = dst.$$element;
+
+      // reapply the old attributes to the new element
+      forEach(dst, function(value, key) {
+        if (key.charAt(0) != '$') {
+          if (src[key] && src[key] !== value) {
+            value += (key === 'style' ? ';' : ' ') + src[key];
+          }
+          dst.$set(key, value, true, srcAttr[key]);
+        }
+      });
+
+      // copy the new attributes on the old attrs object
+      forEach(src, function(value, key) {
+        if (key == 'class') {
+          safeAddClass($element, value);
+          dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
+        } else if (key == 'style') {
+          $element.attr('style', $element.attr('style') + ';' + value);
+          dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
+          // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+          // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+          // have an attribute like "has-own-property" or "data-has-own-property", etc.
+        } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
+          dst[key] = value;
+          dstAttr[key] = srcAttr[key];
+        }
+      });
+    }
+
+
+    function compileTemplateUrl(directives, $compileNode, tAttrs,
+        $rootElement, childTranscludeFn, preLinkFns, postLinkFns, previousCompileContext) {
+      var linkQueue = [],
+          afterTemplateNodeLinkFn,
+          afterTemplateChildLinkFn,
+          beforeTemplateCompileNode = $compileNode[0],
+          origAsyncDirective = directives.shift(),
+          derivedSyncDirective = inherit(origAsyncDirective, {
+            templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
+          }),
+          templateUrl = (isFunction(origAsyncDirective.templateUrl))
+              ? origAsyncDirective.templateUrl($compileNode, tAttrs)
+              : origAsyncDirective.templateUrl,
+          templateNamespace = origAsyncDirective.templateNamespace;
+
+      $compileNode.empty();
+
+      $templateRequest($sce.getTrustedResourceUrl(templateUrl))
+        .then(function(content) {
+          var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
+
+          content = denormalizeTemplate(content);
+
+          if (origAsyncDirective.replace) {
+            if (jqLiteIsTextNode(content)) {
+              $template = [];
+            } else {
+              $template = removeComments(wrapTemplate(templateNamespace, trim(content)));
+            }
+            compileNode = $template[0];
+
+            if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
+              throw $compileMinErr('tplrt',
+                  "Template for directive '{0}' must have exactly one root element. {1}",
+                  origAsyncDirective.name, templateUrl);
+            }
+
+            tempTemplateAttrs = {$attr: {}};
+            replaceWith($rootElement, $compileNode, compileNode);
+            var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs);
+
+            if (isObject(origAsyncDirective.scope)) {
+              markDirectivesAsIsolate(templateDirectives);
+            }
+            directives = templateDirectives.concat(directives);
+            mergeTemplateAttributes(tAttrs, tempTemplateAttrs);
+          } else {
+            compileNode = beforeTemplateCompileNode;
+            $compileNode.html(content);
+          }
+
+          directives.unshift(derivedSyncDirective);
+
+          afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs,
+              childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns,
+              previousCompileContext);
+          forEach($rootElement, function(node, i) {
+            if (node == compileNode) {
+              $rootElement[i] = $compileNode[0];
+            }
+          });
+          afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn);
+
+          while (linkQueue.length) {
+            var scope = linkQueue.shift(),
+                beforeTemplateLinkNode = linkQueue.shift(),
+                linkRootElement = linkQueue.shift(),
+                boundTranscludeFn = linkQueue.shift(),
+                linkNode = $compileNode[0];
+
+            if (scope.$$destroyed) continue;
+
+            if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
+              var oldClasses = beforeTemplateLinkNode.className;
+
+              if (!(previousCompileContext.hasElementTranscludeDirective &&
+                  origAsyncDirective.replace)) {
+                // it was cloned therefore we have to clone as well.
+                linkNode = jqLiteClone(compileNode);
+              }
+              replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
+
+              // Copy in CSS classes from original node
+              safeAddClass(jqLite(linkNode), oldClasses);
+            }
+            if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+              childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+            } else {
+              childBoundTranscludeFn = boundTranscludeFn;
+            }
+            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement,
+              childBoundTranscludeFn, afterTemplateNodeLinkFn);
+          }
+          linkQueue = null;
+        });
+
+      return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) {
+        var childBoundTranscludeFn = boundTranscludeFn;
+        if (scope.$$destroyed) return;
+        if (linkQueue) {
+          linkQueue.push(scope,
+                         node,
+                         rootElement,
+                         childBoundTranscludeFn);
+        } else {
+          if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+            childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+          }
+          afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn,
+                                  afterTemplateNodeLinkFn);
+        }
+      };
+    }
+
+
+    /**
+     * Sorting function for bound directives.
+     */
+    function byPriority(a, b) {
+      var diff = b.priority - a.priority;
+      if (diff !== 0) return diff;
+      if (a.name !== b.name) return (a.name < b.name) ? -1 : 1;
+      return a.index - b.index;
+    }
+
+
+    function assertNoDuplicate(what, previousDirective, directive, element) {
+      if (previousDirective) {
+        throw $compileMinErr('multidir', 'Multiple directives [{0}, {1}] asking for {2} on: {3}',
+            previousDirective.name, directive.name, what, startingTag(element));
+      }
+    }
+
+
+    function addTextInterpolateDirective(directives, text) {
+      var interpolateFn = $interpolate(text, true);
+      if (interpolateFn) {
+        directives.push({
+          priority: 0,
+          compile: function textInterpolateCompileFn(templateNode) {
+            var templateNodeParent = templateNode.parent(),
+                hasCompileParent = !!templateNodeParent.length;
+
+            // When transcluding a template that has bindings in the root
+            // we don't have a parent and thus need to add the class during linking fn.
+            if (hasCompileParent) compile.$$addBindingClass(templateNodeParent);
+
+            return function textInterpolateLinkFn(scope, node) {
+              var parent = node.parent();
+              if (!hasCompileParent) compile.$$addBindingClass(parent);
+              compile.$$addBindingInfo(parent, interpolateFn.expressions);
+              scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
+                node[0].nodeValue = value;
+              });
+            };
+          }
+        });
+      }
+    }
+
+
+    function wrapTemplate(type, template) {
+      type = lowercase(type || 'html');
+      switch (type) {
+      case 'svg':
+      case 'math':
+        var wrapper = document.createElement('div');
+        wrapper.innerHTML = '<' + type + '>' + template + '</' + type + '>';
+        return wrapper.childNodes[0].childNodes;
+      default:
+        return template;
+      }
+    }
+
+
+    function getTrustedContext(node, attrNormalizedName) {
+      if (attrNormalizedName == "srcdoc") {
+        return $sce.HTML;
+      }
+      var tag = nodeName_(node);
+      // maction[xlink:href] can source SVG.  It's not limited to <maction>.
+      if (attrNormalizedName == "xlinkHref" ||
+          (tag == "form" && attrNormalizedName == "action") ||
+          (tag != "img" && (attrNormalizedName == "src" ||
+                            attrNormalizedName == "ngSrc"))) {
+        return $sce.RESOURCE_URL;
+      }
+    }
+
+
+    function addAttrInterpolateDirective(node, directives, value, name, allOrNothing) {
+      var trustedContext = getTrustedContext(node, name);
+      allOrNothing = ALL_OR_NOTHING_ATTRS[name] || allOrNothing;
+
+      var interpolateFn = $interpolate(value, true, trustedContext, allOrNothing);
+
+      // no interpolation found -> ignore
+      if (!interpolateFn) return;
+
+
+      if (name === "multiple" && nodeName_(node) === "select") {
+        throw $compileMinErr("selmulti",
+            "Binding to the 'multiple' attribute is not supported. Element: {0}",
+            startingTag(node));
+      }
+
+      directives.push({
+        priority: 100,
+        compile: function() {
+            return {
+              pre: function attrInterpolatePreLinkFn(scope, element, attr) {
+                var $$observers = (attr.$$observers || (attr.$$observers = {}));
+
+                if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
+                  throw $compileMinErr('nodomevents',
+                      "Interpolations for HTML DOM event attributes are disallowed.  Please use the " +
+                          "ng- versions (such as ng-click instead of onclick) instead.");
+                }
+
+                // If the attribute has changed since last $interpolate()ed
+                var newValue = attr[name];
+                if (newValue !== value) {
+                  // we need to interpolate again since the attribute value has been updated
+                  // (e.g. by another directive's compile function)
+                  // ensure unset/empty values make interpolateFn falsy
+                  interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing);
+                  value = newValue;
+                }
+
+                // if attribute was updated so that there is no interpolation going on we don't want to
+                // register any observers
+                if (!interpolateFn) return;
+
+                // initialize attr object so that it's ready in case we need the value for isolate
+                // scope initialization, otherwise the value would not be available from isolate
+                // directive's linking fn during linking phase
+                attr[name] = interpolateFn(scope);
+
+                ($$observers[name] || ($$observers[name] = [])).$$inter = true;
+                (attr.$$observers && attr.$$observers[name].$$scope || scope).
+                  $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
+                    //special case for class attribute addition + removal
+                    //so that class changes can tap into the animation
+                    //hooks provided by the $animate service. Be sure to
+                    //skip animations when the first digest occurs (when
+                    //both the new and the old values are the same) since
+                    //the CSS classes are the non-interpolated values
+                    if (name === 'class' && newValue != oldValue) {
+                      attr.$updateClass(newValue, oldValue);
+                    } else {
+                      attr.$set(name, newValue);
+                    }
+                  });
+              }
+            };
+          }
+      });
+    }
+
+
+    /**
+     * This is a special jqLite.replaceWith, which can replace items which
+     * have no parents, provided that the containing jqLite collection is provided.
+     *
+     * @param {JqLite=} $rootElement The root of the compile tree. Used so that we can replace nodes
+     *                               in the root of the tree.
+     * @param {JqLite} elementsToRemove The jqLite element which we are going to replace. We keep
+     *                                  the shell, but replace its DOM node reference.
+     * @param {Node} newNode The new DOM node.
+     */
+    function replaceWith($rootElement, elementsToRemove, newNode) {
+      var firstElementToRemove = elementsToRemove[0],
+          removeCount = elementsToRemove.length,
+          parent = firstElementToRemove.parentNode,
+          i, ii;
+
+      if ($rootElement) {
+        for (i = 0, ii = $rootElement.length; i < ii; i++) {
+          if ($rootElement[i] == firstElementToRemove) {
+            $rootElement[i++] = newNode;
+            for (var j = i, j2 = j + removeCount - 1,
+                     jj = $rootElement.length;
+                 j < jj; j++, j2++) {
+              if (j2 < jj) {
+                $rootElement[j] = $rootElement[j2];
+              } else {
+                delete $rootElement[j];
+              }
+            }
+            $rootElement.length -= removeCount - 1;
+
+            // If the replaced element is also the jQuery .context then replace it
+            // .context is a deprecated jQuery api, so we should set it only when jQuery set it
+            // http://api.jquery.com/context/
+            if ($rootElement.context === firstElementToRemove) {
+              $rootElement.context = newNode;
+            }
+            break;
+          }
+        }
+      }
+
+      if (parent) {
+        parent.replaceChild(newNode, firstElementToRemove);
+      }
+
+      // TODO(perf): what's this document fragment for? is it needed? can we at least reuse it?
+      var fragment = document.createDocumentFragment();
+      fragment.appendChild(firstElementToRemove);
+
+      // Copy over user data (that includes Angular's $scope etc.). Don't copy private
+      // data here because there's no public interface in jQuery to do that and copying over
+      // event listeners (which is the main use of private data) wouldn't work anyway.
+      jqLite(newNode).data(jqLite(firstElementToRemove).data());
+
+      // Remove data of the replaced element. We cannot just call .remove()
+      // on the element it since that would deallocate scope that is needed
+      // for the new node. Instead, remove the data "manually".
+      if (!jQuery) {
+        delete jqLite.cache[firstElementToRemove[jqLite.expando]];
+      } else {
+        // jQuery 2.x doesn't expose the data storage. Use jQuery.cleanData to clean up after
+        // the replaced element. The cleanData version monkey-patched by Angular would cause
+        // the scope to be trashed and we do need the very same scope to work with the new
+        // element. However, we cannot just cache the non-patched version and use it here as
+        // that would break if another library patches the method after Angular does (one
+        // example is jQuery UI). Instead, set a flag indicating scope destroying should be
+        // skipped this one time.
+        skipDestroyOnNextJQueryCleanData = true;
+        jQuery.cleanData([firstElementToRemove]);
+      }
+
+      for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
+        var element = elementsToRemove[k];
+        jqLite(element).remove(); // must do this way to clean up expando
+        fragment.appendChild(element);
+        delete elementsToRemove[k];
+      }
+
+      elementsToRemove[0] = newNode;
+      elementsToRemove.length = 1;
+    }
+
+
+    function cloneAndAnnotateFn(fn, annotation) {
+      return extend(function() { return fn.apply(null, arguments); }, fn, annotation);
+    }
+
+
+    function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) {
+      try {
+        linkFn(scope, $element, attrs, controllers, transcludeFn);
+      } catch (e) {
+        $exceptionHandler(e, startingTag($element));
+      }
+    }
+
+
+    // Set up $watches for isolate scope and controller bindings. This process
+    // only occurs for isolate scopes and new scopes with controllerAs.
+    function initializeDirectiveBindings(scope, attrs, destination, bindings,
+                                         directive, newScope) {
+      var onNewScopeDestroyed;
+      forEach(bindings, function(definition, scopeName) {
+        var attrName = definition.attrName,
+        optional = definition.optional,
+        mode = definition.mode, // @, =, or &
+        lastValue,
+        parentGet, parentSet, compare;
+
+        switch (mode) {
+
+          case '@':
+            attrs.$observe(attrName, function(value) {
+              destination[scopeName] = value;
+            });
+            attrs.$$observers[attrName].$$scope = scope;
+            if (attrs[attrName]) {
+              // If the attribute has been provided then we trigger an interpolation to ensure
+              // the value is there for use in the link fn
+              destination[scopeName] = $interpolate(attrs[attrName])(scope);
+            }
+            break;
+
+          case '=':
+            if (optional && !attrs[attrName]) {
+              return;
+            }
+            parentGet = $parse(attrs[attrName]);
+            if (parentGet.literal) {
+              compare = equals;
+            } else {
+              compare = function(a, b) { return a === b || (a !== a && b !== b); };
+            }
+            parentSet = parentGet.assign || function() {
+              // reset the change, or we will throw this exception on every $digest
+              lastValue = destination[scopeName] = parentGet(scope);
+              throw $compileMinErr('nonassign',
+                  "Expression '{0}' used with directive '{1}' is non-assignable!",
+                  attrs[attrName], directive.name);
+            };
+            lastValue = destination[scopeName] = parentGet(scope);
+            var parentValueWatch = function parentValueWatch(parentValue) {
+              if (!compare(parentValue, destination[scopeName])) {
+                // we are out of sync and need to copy
+                if (!compare(parentValue, lastValue)) {
+                  // parent changed and it has precedence
+                  destination[scopeName] = parentValue;
+                } else {
+                  // if the parent can be assigned then do so
+                  parentSet(scope, parentValue = destination[scopeName]);
+                }
+              }
+              return lastValue = parentValue;
+            };
+            parentValueWatch.$stateful = true;
+            var unwatch;
+            if (definition.collection) {
+              unwatch = scope.$watchCollection(attrs[attrName], parentValueWatch);
+            } else {
+              unwatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
+            }
+            onNewScopeDestroyed = (onNewScopeDestroyed || []);
+            onNewScopeDestroyed.push(unwatch);
+            break;
+
+          case '&':
+            // Don't assign Object.prototype method to scope
+            if (!attrs.hasOwnProperty(attrName) && optional) break;
+
+            parentGet = $parse(attrs[attrName]);
+
+            // Don't assign noop to destination if expression is not valid
+            if (parentGet === noop && optional) break;
+
+            destination[scopeName] = function(locals) {
+              return parentGet(scope, locals);
+            };
+            break;
+        }
+      });
+      var destroyBindings = onNewScopeDestroyed ? function destroyBindings() {
+        for (var i = 0, ii = onNewScopeDestroyed.length; i < ii; ++i) {
+          onNewScopeDestroyed[i]();
+        }
+      } : noop;
+      if (newScope && destroyBindings !== noop) {
+        newScope.$on('$destroy', destroyBindings);
+        return noop;
+      }
+      return destroyBindings;
+    }
+  }];
+}
+
+var PREFIX_REGEXP = /^((?:x|data)[\:\-_])/i;
+/**
+ * Converts all accepted directives format into proper directive name.
+ * @param name Name to normalize
+ */
+function directiveNormalize(name) {
+  return camelCase(name.replace(PREFIX_REGEXP, ''));
+}
+
+/**
+ * @ngdoc type
+ * @name $compile.directive.Attributes
+ *
+ * @description
+ * A shared object between directive compile / linking functions which contains normalized DOM
+ * element attributes. The values reflect current binding state `{{ }}`. The normalization is
+ * needed since all of these are treated as equivalent in Angular:
+ *
+ * ```
+ *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
+ * ```
+ */
+
+/**
+ * @ngdoc property
+ * @name $compile.directive.Attributes#$attr
+ *
+ * @description
+ * A map of DOM element attribute names to the normalized name. This is
+ * needed to do reverse lookup from normalized name back to actual name.
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $compile.directive.Attributes#$set
+ * @kind function
+ *
+ * @description
+ * Set DOM element attribute value.
+ *
+ *
+ * @param {string} name Normalized element attribute name of the property to modify. The name is
+ *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
+ *          property to the original name.
+ * @param {string} value Value to set the attribute to. The value can be an interpolated string.
+ */
+
+
+
+/**
+ * Closure compiler type information
+ */
+
+function nodesetLinkingFn(
+  /* angular.Scope */ scope,
+  /* NodeList */ nodeList,
+  /* Element */ rootElement,
+  /* function(Function) */ boundTranscludeFn
+) {}
+
+function directiveLinkingFn(
+  /* nodesetLinkingFn */ nodesetLinkingFn,
+  /* angular.Scope */ scope,
+  /* Node */ node,
+  /* Element */ rootElement,
+  /* function(Function) */ boundTranscludeFn
+) {}
+
+function tokenDifference(str1, str2) {
+  var values = '',
+      tokens1 = str1.split(/\s+/),
+      tokens2 = str2.split(/\s+/);
+
+  outer:
+  for (var i = 0; i < tokens1.length; i++) {
+    var token = tokens1[i];
+    for (var j = 0; j < tokens2.length; j++) {
+      if (token == tokens2[j]) continue outer;
+    }
+    values += (values.length > 0 ? ' ' : '') + token;
+  }
+  return values;
+}
+
+function removeComments(jqNodes) {
+  jqNodes = jqLite(jqNodes);
+  var i = jqNodes.length;
+
+  if (i <= 1) {
+    return jqNodes;
+  }
+
+  while (i--) {
+    var node = jqNodes[i];
+    if (node.nodeType === NODE_TYPE_COMMENT) {
+      splice.call(jqNodes, i, 1);
+    }
+  }
+  return jqNodes;
+}
+
+var $controllerMinErr = minErr('$controller');
+
+
+var CNTRL_REG = /^(\S+)(\s+as\s+(\w+))?$/;
+function identifierForController(controller, ident) {
+  if (ident && isString(ident)) return ident;
+  if (isString(controller)) {
+    var match = CNTRL_REG.exec(controller);
+    if (match) return match[3];
+  }
+}
+
+
+/**
+ * @ngdoc provider
+ * @name $controllerProvider
+ * @description
+ * The {@link ng.$controller $controller service} is used by Angular to create new
+ * controllers.
+ *
+ * This provider allows controller registration via the
+ * {@link ng.$controllerProvider#register register} method.
+ */
+function $ControllerProvider() {
+  var controllers = {},
+      globals = false;
+
+  /**
+   * @ngdoc method
+   * @name $controllerProvider#register
+   * @param {string|Object} name Controller name, or an object map of controllers where the keys are
+   *    the names and the values are the constructors.
+   * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI
+   *    annotations in the array notation).
+   */
+  this.register = function(name, constructor) {
+    assertNotHasOwnProperty(name, 'controller');
+    if (isObject(name)) {
+      extend(controllers, name);
+    } else {
+      controllers[name] = constructor;
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $controllerProvider#allowGlobals
+   * @description If called, allows `$controller` to find controller constructors on `window`
+   */
+  this.allowGlobals = function() {
+    globals = true;
+  };
+
+
+  this.$get = ['$injector', '$window', function($injector, $window) {
+
+    /**
+     * @ngdoc service
+     * @name $controller
+     * @requires $injector
+     *
+     * @param {Function|string} constructor If called with a function then it's considered to be the
+     *    controller constructor function. Otherwise it's considered to be a string which is used
+     *    to retrieve the controller constructor using the following steps:
+     *
+     *    * check if a controller with given name is registered via `$controllerProvider`
+     *    * check if evaluating the string on the current scope returns a constructor
+     *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
+     *      `window` object (not recommended)
+     *
+     *    The string can use the `controller as property` syntax, where the controller instance is published
+     *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
+     *    to work correctly.
+     *
+     * @param {Object} locals Injection locals for Controller.
+     * @return {Object} Instance of given controller.
+     *
+     * @description
+     * `$controller` service is responsible for instantiating controllers.
+     *
+     * It's just a simple call to {@link auto.$injector $injector}, but extracted into
+     * a service, so that one can override this service with [BC version](https://gist.github.com/1649788).
+     */
+    return function(expression, locals, later, ident) {
+      // PRIVATE API:
+      //   param `later` --- indicates that the controller's constructor is invoked at a later time.
+      //                     If true, $controller will allocate the object with the correct
+      //                     prototype chain, but will not invoke the controller until a returned
+      //                     callback is invoked.
+      //   param `ident` --- An optional label which overrides the label parsed from the controller
+      //                     expression, if any.
+      var instance, match, constructor, identifier;
+      later = later === true;
+      if (ident && isString(ident)) {
+        identifier = ident;
+      }
+
+      if (isString(expression)) {
+        match = expression.match(CNTRL_REG);
+        if (!match) {
+          throw $controllerMinErr('ctrlfmt',
+            "Badly formed controller string '{0}'. " +
+            "Must match `__name__ as __id__` or `__name__`.", expression);
+        }
+        constructor = match[1],
+        identifier = identifier || match[3];
+        expression = controllers.hasOwnProperty(constructor)
+            ? controllers[constructor]
+            : getter(locals.$scope, constructor, true) ||
+                (globals ? getter($window, constructor, true) : undefined);
+
+        assertArgFn(expression, constructor, true);
+      }
+
+      if (later) {
+        // Instantiate controller later:
+        // This machinery is used to create an instance of the object before calling the
+        // controller's constructor itself.
+        //
+        // This allows properties to be added to the controller before the constructor is
+        // invoked. Primarily, this is used for isolate scope bindings in $compile.
+        //
+        // This feature is not intended for use by applications, and is thus not documented
+        // publicly.
+        // Object creation: http://jsperf.com/create-constructor/2
+        var controllerPrototype = (isArray(expression) ?
+          expression[expression.length - 1] : expression).prototype;
+        instance = Object.create(controllerPrototype || null);
+
+        if (identifier) {
+          addIdentifier(locals, identifier, instance, constructor || expression.name);
+        }
+
+        var instantiate;
+        return instantiate = extend(function() {
+          var result = $injector.invoke(expression, instance, locals, constructor);
+          if (result !== instance && (isObject(result) || isFunction(result))) {
+            instance = result;
+            if (identifier) {
+              // If result changed, re-assign controllerAs value to scope.
+              addIdentifier(locals, identifier, instance, constructor || expression.name);
+            }
+          }
+          return instance;
+        }, {
+          instance: instance,
+          identifier: identifier
+        });
+      }
+
+      instance = $injector.instantiate(expression, locals, constructor);
+
+      if (identifier) {
+        addIdentifier(locals, identifier, instance, constructor || expression.name);
+      }
+
+      return instance;
+    };
+
+    function addIdentifier(locals, identifier, instance, name) {
+      if (!(locals && isObject(locals.$scope))) {
+        throw minErr('$controller')('noscp',
+          "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",
+          name, identifier);
+      }
+
+      locals.$scope[identifier] = instance;
+    }
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $document
+ * @requires $window
+ *
+ * @description
+ * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object.
+ *
+ * @example
+   <example module="documentExample">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+         <p>$document title: <b ng-bind="title"></b></p>
+         <p>window.document title: <b ng-bind="windowTitle"></b></p>
+       </div>
+     </file>
+     <file name="script.js">
+       angular.module('documentExample', [])
+         .controller('ExampleController', ['$scope', '$document', function($scope, $document) {
+           $scope.title = $document[0].title;
+           $scope.windowTitle = angular.element(window.document)[0].title;
+         }]);
+     </file>
+   </example>
+ */
+function $DocumentProvider() {
+  this.$get = ['$window', function(window) {
+    return jqLite(window.document);
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $exceptionHandler
+ * @requires ng.$log
+ *
+ * @description
+ * Any uncaught exception in angular expressions is delegated to this service.
+ * The default implementation simply delegates to `$log.error` which logs it into
+ * the browser console.
+ *
+ * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by
+ * {@link ngMock.$exceptionHandler mock $exceptionHandler} which aids in testing.
+ *
+ * ## Example:
+ *
+ * ```js
+ *   angular.module('exceptionOverride', []).factory('$exceptionHandler', function() {
+ *     return function(exception, cause) {
+ *       exception.message += ' (caused by "' + cause + '")';
+ *       throw exception;
+ *     };
+ *   });
+ * ```
+ *
+ * This example will override the normal action of `$exceptionHandler`, to make angular
+ * exceptions fail hard when they happen, instead of just logging to the console.
+ *
+ * <hr />
+ * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
+ * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
+ * (unless executed during a digest).
+ *
+ * If you wish, you can manually delegate exceptions, e.g.
+ * `try { ... } catch(e) { $exceptionHandler(e); }`
+ *
+ * @param {Error} exception Exception associated with the error.
+ * @param {string=} cause optional information about the context in which
+ *       the error was thrown.
+ *
+ */
+function $ExceptionHandlerProvider() {
+  this.$get = ['$log', function($log) {
+    return function(exception, cause) {
+      $log.error.apply($log, arguments);
+    };
+  }];
+}
+
+var APPLICATION_JSON = 'application/json';
+var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'};
+var JSON_START = /^\[|^\{(?!\{)/;
+var JSON_ENDS = {
+  '[': /]$/,
+  '{': /}$/
+};
+var JSON_PROTECTION_PREFIX = /^\)\]\}',?\n/;
+
+function serializeValue(v) {
+  if (isObject(v)) {
+    return isDate(v) ? v.toISOString() : toJson(v);
+  }
+  return v;
+}
+
+
+function $HttpParamSerializerProvider() {
+  /**
+   * @ngdoc service
+   * @name $httpParamSerializer
+   * @description
+   *
+   * Default $http params serializer that converts objects to a part of a request URL
+   * according to the following rules:
+   * * `{'foo': 'bar'}` results in `foo=bar`
+   * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
+   * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
+   * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object)
+   * */
+  this.$get = function() {
+    return function ngParamSerializer(params) {
+      if (!params) return '';
+      var parts = [];
+      forEachSorted(params, function(value, key) {
+        if (value === null || isUndefined(value)) return;
+        if (isArray(value)) {
+          forEach(value, function(v, k) {
+            parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
+          });
+        } else {
+          parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value)));
+        }
+      });
+
+      return parts.join('&');
+    };
+  };
+}
+
+function $HttpParamSerializerJQLikeProvider() {
+  /**
+   * @ngdoc service
+   * @name $httpParamSerializerJQLike
+   * @description
+   *
+   * Alternative $http params serializer that follows jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
+   * */
+  this.$get = function() {
+    return function jQueryLikeParamSerializer(params) {
+      if (!params) return '';
+      var parts = [];
+      serialize(params, '', true);
+      return parts.join('&');
+
+      function serialize(toSerialize, prefix, topLevel) {
+        if (toSerialize === null || isUndefined(toSerialize)) return;
+        if (isArray(toSerialize)) {
+          forEach(toSerialize, function(value) {
+            serialize(value, prefix + '[]');
+          });
+        } else if (isObject(toSerialize) && !isDate(toSerialize)) {
+          forEachSorted(toSerialize, function(value, key) {
+            serialize(value, prefix +
+                (topLevel ? '' : '[') +
+                key +
+                (topLevel ? '' : ']'));
+          });
+        } else {
+          parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
+        }
+      }
+    };
+  };
+}
+
+function defaultHttpResponseTransform(data, headers) {
+  if (isString(data)) {
+    // Strip json vulnerability protection prefix and trim whitespace
+    var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim();
+
+    if (tempData) {
+      var contentType = headers('Content-Type');
+      if ((contentType && (contentType.indexOf(APPLICATION_JSON) === 0)) || isJsonLike(tempData)) {
+        data = fromJson(tempData);
+      }
+    }
+  }
+
+  return data;
+}
+
+function isJsonLike(str) {
+    var jsonStart = str.match(JSON_START);
+    return jsonStart && JSON_ENDS[jsonStart[0]].test(str);
+}
+
+/**
+ * Parse headers into key value object
+ *
+ * @param {string} headers Raw headers as a string
+ * @returns {Object} Parsed headers as key value object
+ */
+function parseHeaders(headers) {
+  var parsed = createMap(), i;
+
+  function fillInParsed(key, val) {
+    if (key) {
+      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+    }
+  }
+
+  if (isString(headers)) {
+    forEach(headers.split('\n'), function(line) {
+      i = line.indexOf(':');
+      fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1)));
+    });
+  } else if (isObject(headers)) {
+    forEach(headers, function(headerVal, headerKey) {
+      fillInParsed(lowercase(headerKey), trim(headerVal));
+    });
+  }
+
+  return parsed;
+}
+
+
+/**
+ * Returns a function that provides access to parsed headers.
+ *
+ * Headers are lazy parsed when first requested.
+ * @see parseHeaders
+ *
+ * @param {(string|Object)} headers Headers to provide access to.
+ * @returns {function(string=)} Returns a getter function which if called with:
+ *
+ *   - if called with single an argument returns a single header value or null
+ *   - if called with no arguments returns an object containing all headers.
+ */
+function headersGetter(headers) {
+  var headersObj;
+
+  return function(name) {
+    if (!headersObj) headersObj =  parseHeaders(headers);
+
+    if (name) {
+      var value = headersObj[lowercase(name)];
+      if (value === void 0) {
+        value = null;
+      }
+      return value;
+    }
+
+    return headersObj;
+  };
+}
+
+
+/**
+ * Chain all given functions
+ *
+ * This function is used for both request and response transforming
+ *
+ * @param {*} data Data to transform.
+ * @param {function(string=)} headers HTTP headers getter fn.
+ * @param {number} status HTTP status code of the response.
+ * @param {(Function|Array.<Function>)} fns Function or an array of functions.
+ * @returns {*} Transformed data.
+ */
+function transformData(data, headers, status, fns) {
+  if (isFunction(fns)) {
+    return fns(data, headers, status);
+  }
+
+  forEach(fns, function(fn) {
+    data = fn(data, headers, status);
+  });
+
+  return data;
+}
+
+
+function isSuccess(status) {
+  return 200 <= status && status < 300;
+}
+
+
+/**
+ * @ngdoc provider
+ * @name $httpProvider
+ * @description
+ * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service.
+ * */
+function $HttpProvider() {
+  /**
+   * @ngdoc property
+   * @name $httpProvider#defaults
+   * @description
+   *
+   * Object containing default values for all {@link ng.$http $http} requests.
+   *
+   * - **`defaults.cache`** - {Object} - an object built with {@link ng.$cacheFactory `$cacheFactory`}
+   * that will provide the cache for all requests who set their `cache` property to `true`.
+   * If you set the `default.cache = false` then only requests that specify their own custom
+   * cache object will be cached. See {@link $http#caching $http Caching} for more information.
+   *
+   * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token.
+   * Defaults value is `'XSRF-TOKEN'`.
+   *
+   * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the
+   * XSRF token. Defaults value is `'X-XSRF-TOKEN'`.
+   *
+   * - **`defaults.headers`** - {Object} - Default headers for all $http requests.
+   * Refer to {@link ng.$http#setting-http-headers $http} for documentation on
+   * setting default headers.
+   *     - **`defaults.headers.common`**
+   *     - **`defaults.headers.post`**
+   *     - **`defaults.headers.put`**
+   *     - **`defaults.headers.patch`**
+   *
+   * - **`defaults.paramSerializer`** - {string|function(Object<string,string>):string} - A function used to prepare string representation
+   * of request parameters (specified as an object).
+   * If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
+   * Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
+   *
+   **/
+  var defaults = this.defaults = {
+    // transform incoming response data
+    transformResponse: [defaultHttpResponseTransform],
+
+    // transform outgoing request data
+    transformRequest: [function(d) {
+      return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d;
+    }],
+
+    // default headers
+    headers: {
+      common: {
+        'Accept': 'application/json, text/plain, */*'
+      },
+      post:   shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+      put:    shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+      patch:  shallowCopy(CONTENT_TYPE_APPLICATION_JSON)
+    },
+
+    xsrfCookieName: 'XSRF-TOKEN',
+    xsrfHeaderName: 'X-XSRF-TOKEN',
+
+    paramSerializer: '$httpParamSerializer'
+  };
+
+  var useApplyAsync = false;
+  /**
+   * @ngdoc method
+   * @name $httpProvider#useApplyAsync
+   * @description
+   *
+   * Configure $http service to combine processing of multiple http responses received at around
+   * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in
+   * significant performance improvement for bigger applications that make many HTTP requests
+   * concurrently (common during application bootstrap).
+   *
+   * Defaults to false. If no value is specified, returns the current configured value.
+   *
+   * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred
+   *    "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window
+   *    to load and share the same digest cycle.
+   *
+   * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+   *    otherwise, returns the current configured value.
+   **/
+  this.useApplyAsync = function(value) {
+    if (isDefined(value)) {
+      useApplyAsync = !!value;
+      return this;
+    }
+    return useApplyAsync;
+  };
+
+  /**
+   * @ngdoc property
+   * @name $httpProvider#interceptors
+   * @description
+   *
+   * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http}
+   * pre-processing of request or postprocessing of responses.
+   *
+   * These service factories are ordered by request, i.e. they are applied in the same order as the
+   * array, on request, but reverse order, on response.
+   *
+   * {@link ng.$http#interceptors Interceptors detailed info}
+   **/
+  var interceptorFactories = this.interceptors = [];
+
+  this.$get = ['$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector',
+      function($httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector) {
+
+    var defaultCache = $cacheFactory('$http');
+
+    /**
+     * Make sure that default param serializer is exposed as a function
+     */
+    defaults.paramSerializer = isString(defaults.paramSerializer) ?
+      $injector.get(defaults.paramSerializer) : defaults.paramSerializer;
+
+    /**
+     * Interceptors stored in reverse order. Inner interceptors before outer interceptors.
+     * The reversal is needed so that we can build up the interception chain around the
+     * server request.
+     */
+    var reversedInterceptors = [];
+
+    forEach(interceptorFactories, function(interceptorFactory) {
+      reversedInterceptors.unshift(isString(interceptorFactory)
+          ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory));
+    });
+
+    /**
+     * @ngdoc service
+     * @kind function
+     * @name $http
+     * @requires ng.$httpBackend
+     * @requires $cacheFactory
+     * @requires $rootScope
+     * @requires $q
+     * @requires $injector
+     *
+     * @description
+     * The `$http` service is a core Angular service that facilitates communication with the remote
+     * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest)
+     * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP).
+     *
+     * For unit testing applications that use `$http` service, see
+     * {@link ngMock.$httpBackend $httpBackend mock}.
+     *
+     * For a higher level of abstraction, please check out the {@link ngResource.$resource
+     * $resource} service.
+     *
+     * The $http API is based on the {@link ng.$q deferred/promise APIs} exposed by
+     * the $q service. While for simple usage patterns this doesn't matter much, for advanced usage
+     * it is important to familiarize yourself with these APIs and the guarantees they provide.
+     *
+     *
+     * ## General usage
+     * The `$http` service is a function which takes a single argument — a configuration object —
+     * that is used to generate an HTTP request and returns  a {@link ng.$q promise}
+     * with two $http specific methods: `success` and `error`.
+     *
+     * ```js
+     *   // Simple GET request example :
+     *   $http.get('/someUrl').
+     *     success(function(data, status, headers, config) {
+     *       // this callback will be called asynchronously
+     *       // when the response is available
+     *     }).
+     *     error(function(data, status, headers, config) {
+     *       // called asynchronously if an error occurs
+     *       // or server returns response with an error status.
+     *     });
+     * ```
+     *
+     * ```js
+     *   // Simple POST request example (passing data) :
+     *   $http.post('/someUrl', {msg:'hello word!'}).
+     *     success(function(data, status, headers, config) {
+     *       // this callback will be called asynchronously
+     *       // when the response is available
+     *     }).
+     *     error(function(data, status, headers, config) {
+     *       // called asynchronously if an error occurs
+     *       // or server returns response with an error status.
+     *     });
+     * ```
+     *
+     *
+     * Since the returned value of calling the $http function is a `promise`, you can also use
+     * the `then` method to register callbacks, and these callbacks will receive a single argument –
+     * an object representing the response. See the API signature and type info below for more
+     * details.
+     *
+     * A response status code between 200 and 299 is considered a success status and
+     * will result in the success callback being called. Note that if the response is a redirect,
+     * XMLHttpRequest will transparently follow it, meaning that the error callback will not be
+     * called for such responses.
+     *
+     * ## Writing Unit Tests that use $http
+     * When unit testing (using {@link ngMock ngMock}), it is necessary to call
+     * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
+     * request using trained responses.
+     *
+     * ```
+     * $httpBackend.expectGET(...);
+     * $http.get(...);
+     * $httpBackend.flush();
+     * ```
+     *
+     * ## Shortcut methods
+     *
+     * Shortcut methods are also available. All shortcut methods require passing in the URL, and
+     * request data must be passed in for POST/PUT requests.
+     *
+     * ```js
+     *   $http.get('/someUrl').success(successCallback);
+     *   $http.post('/someUrl', data).success(successCallback);
+     * ```
+     *
+     * Complete list of shortcut methods:
+     *
+     * - {@link ng.$http#get $http.get}
+     * - {@link ng.$http#head $http.head}
+     * - {@link ng.$http#post $http.post}
+     * - {@link ng.$http#put $http.put}
+     * - {@link ng.$http#delete $http.delete}
+     * - {@link ng.$http#jsonp $http.jsonp}
+     * - {@link ng.$http#patch $http.patch}
+     *
+     *
+     * ## Setting HTTP Headers
+     *
+     * The $http service will automatically add certain HTTP headers to all requests. These defaults
+     * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration
+     * object, which currently contains this default configuration:
+     *
+     * - `$httpProvider.defaults.headers.common` (headers that are common for all requests):
+     *   - `Accept: application/json, text/plain, * / *`
+     * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests)
+     *   - `Content-Type: application/json`
+     * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests)
+     *   - `Content-Type: application/json`
+     *
+     * To add or overwrite these defaults, simply add or remove a property from these configuration
+     * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object
+     * with the lowercased HTTP method name as the key, e.g.
+     * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`.
+     *
+     * The defaults can also be set at runtime via the `$http.defaults` object in the same
+     * fashion. For example:
+     *
+     * ```
+     * module.run(function($http) {
+     *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w'
+     * });
+     * ```
+     *
+     * In addition, you can supply a `headers` property in the config object passed when
+     * calling `$http(config)`, which overrides the defaults without changing them globally.
+     *
+     * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis,
+     * Use the `headers` property, setting the desired header to `undefined`. For example:
+     *
+     * ```js
+     * var req = {
+     *  method: 'POST',
+     *  url: 'http://example.com',
+     *  headers: {
+     *    'Content-Type': undefined
+     *  },
+     *  data: { test: 'test' }
+     * }
+     *
+     * $http(req).success(function(){...}).error(function(){...});
+     * ```
+     *
+     * ## Transforming Requests and Responses
+     *
+     * Both requests and responses can be transformed using transformation functions: `transformRequest`
+     * and `transformResponse`. These properties can be a single function that returns
+     * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions,
+     * which allows you to `push` or `unshift` a new transformation function into the transformation chain.
+     *
+     * ### Default Transformations
+     *
+     * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and
+     * `defaults.transformResponse` properties. If a request does not provide its own transformations
+     * then these will be applied.
+     *
+     * You can augment or replace the default transformations by modifying these properties by adding to or
+     * replacing the array.
+     *
+     * Angular provides the following default transformations:
+     *
+     * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`):
+     *
+     * - If the `data` property of the request configuration object contains an object, serialize it
+     *   into JSON format.
+     *
+     * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`):
+     *
+     *  - If XSRF prefix is detected, strip it (see Security Considerations section below).
+     *  - If JSON response is detected, deserialize it using a JSON parser.
+     *
+     *
+     * ### Overriding the Default Transformations Per Request
+     *
+     * If you wish override the request/response transformations only for a single request then provide
+     * `transformRequest` and/or `transformResponse` properties on the configuration object passed
+     * into `$http`.
+     *
+     * Note that if you provide these properties on the config object the default transformations will be
+     * overwritten. If you wish to augment the default transformations then you must include them in your
+     * local transformation array.
+     *
+     * The following code demonstrates adding a new response transformation to be run after the default response
+     * transformations have been run.
+     *
+     * ```js
+     * function appendTransform(defaults, transform) {
+     *
+     *   // We can't guarantee that the default transformation is an array
+     *   defaults = angular.isArray(defaults) ? defaults : [defaults];
+     *
+     *   // Append the new transformation to the defaults
+     *   return defaults.concat(transform);
+     * }
+     *
+     * $http({
+     *   url: '...',
+     *   method: 'GET',
+     *   transformResponse: appendTransform($http.defaults.transformResponse, function(value) {
+     *     return doTransform(value);
+     *   })
+     * });
+     * ```
+     *
+     *
+     * ## Caching
+     *
+     * To enable caching, set the request configuration `cache` property to `true` (to use default
+     * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}).
+     * When the cache is enabled, `$http` stores the response from the server in the specified
+     * cache. The next time the same request is made, the response is served from the cache without
+     * sending a request to the server.
+     *
+     * Note that even if the response is served from cache, delivery of the data is asynchronous in
+     * the same way that real requests are.
+     *
+     * If there are multiple GET requests for the same URL that should be cached using the same
+     * cache, but the cache is not populated yet, only one request to the server will be made and
+     * the remaining requests will be fulfilled using the response from the first request.
+     *
+     * You can change the default cache to a new object (built with
+     * {@link ng.$cacheFactory `$cacheFactory`}) by updating the
+     * {@link ng.$http#defaults `$http.defaults.cache`} property. All requests who set
+     * their `cache` property to `true` will now use this cache object.
+     *
+     * If you set the default cache to `false` then only requests that specify their own custom
+     * cache object will be cached.
+     *
+     * ## Interceptors
+     *
+     * Before you start creating interceptors, be sure to understand the
+     * {@link ng.$q $q and deferred/promise APIs}.
+     *
+     * For purposes of global error handling, authentication, or any kind of synchronous or
+     * asynchronous pre-processing of request or postprocessing of responses, it is desirable to be
+     * able to intercept requests before they are handed to the server and
+     * responses before they are handed over to the application code that
+     * initiated these requests. The interceptors leverage the {@link ng.$q
+     * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing.
+     *
+     * The interceptors are service factories that are registered with the `$httpProvider` by
+     * adding them to the `$httpProvider.interceptors` array. The factory is called and
+     * injected with dependencies (if specified) and returns the interceptor.
+     *
+     * There are two kinds of interceptors (and two kinds of rejection interceptors):
+     *
+     *   * `request`: interceptors get called with a http `config` object. The function is free to
+     *     modify the `config` object or create a new one. The function needs to return the `config`
+     *     object directly, or a promise containing the `config` or a new `config` object.
+     *   * `requestError`: interceptor gets called when a previous interceptor threw an error or
+     *     resolved with a rejection.
+     *   * `response`: interceptors get called with http `response` object. The function is free to
+     *     modify the `response` object or create a new one. The function needs to return the `response`
+     *     object directly, or as a promise containing the `response` or a new `response` object.
+     *   * `responseError`: interceptor gets called when a previous interceptor threw an error or
+     *     resolved with a rejection.
+     *
+     *
+     * ```js
+     *   // register the interceptor as a service
+     *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
+     *     return {
+     *       // optional method
+     *       'request': function(config) {
+     *         // do something on success
+     *         return config;
+     *       },
+     *
+     *       // optional method
+     *      'requestError': function(rejection) {
+     *         // do something on error
+     *         if (canRecover(rejection)) {
+     *           return responseOrNewPromise
+     *         }
+     *         return $q.reject(rejection);
+     *       },
+     *
+     *
+     *
+     *       // optional method
+     *       'response': function(response) {
+     *         // do something on success
+     *         return response;
+     *       },
+     *
+     *       // optional method
+     *      'responseError': function(rejection) {
+     *         // do something on error
+     *         if (canRecover(rejection)) {
+     *           return responseOrNewPromise
+     *         }
+     *         return $q.reject(rejection);
+     *       }
+     *     };
+     *   });
+     *
+     *   $httpProvider.interceptors.push('myHttpInterceptor');
+     *
+     *
+     *   // alternatively, register the interceptor via an anonymous factory
+     *   $httpProvider.interceptors.push(function($q, dependency1, dependency2) {
+     *     return {
+     *      'request': function(config) {
+     *          // same as above
+     *       },
+     *
+     *       'response': function(response) {
+     *          // same as above
+     *       }
+     *     };
+     *   });
+     * ```
+     *
+     * ## Security Considerations
+     *
+     * When designing web applications, consider security threats from:
+     *
+     * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+     * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
+     *
+     * Both server and the client must cooperate in order to eliminate these threats. Angular comes
+     * pre-configured with strategies that address these issues, but for this to work backend server
+     * cooperation is required.
+     *
+     * ### JSON Vulnerability Protection
+     *
+     * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+     * allows third party website to turn your JSON resource URL into
+     * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To
+     * counter this your server can prefix all JSON requests with following string `")]}',\n"`.
+     * Angular will automatically strip the prefix before processing it as JSON.
+     *
+     * For example if your server needs to return:
+     * ```js
+     * ['one','two']
+     * ```
+     *
+     * which is vulnerable to attack, your server can return:
+     * ```js
+     * )]}',
+     * ['one','two']
+     * ```
+     *
+     * Angular will strip the prefix, before processing the JSON.
+     *
+     *
+     * ### Cross Site Request Forgery (XSRF) Protection
+     *
+     * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is a technique by which
+     * an unauthorized site can gain your user's private data. Angular provides a mechanism
+     * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie
+     * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only
+     * JavaScript that runs on your domain could read the cookie, your server can be assured that
+     * the XHR came from JavaScript running on your domain. The header will not be set for
+     * cross-domain requests.
+     *
+     * To take advantage of this, your server needs to set a token in a JavaScript readable session
+     * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the
+     * server can verify that the cookie matches `X-XSRF-TOKEN` HTTP header, and therefore be sure
+     * that only JavaScript running on your domain could have sent the request. The token must be
+     * unique for each user and must be verifiable by the server (to prevent the JavaScript from
+     * making up its own tokens). We recommend that the token is a digest of your site's
+     * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography&#41;)
+     * for added security.
+     *
+     * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName
+     * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time,
+     * or the per-request config object.
+     *
+     *
+     * @param {object} config Object describing the request to be made and how it should be
+     *    processed. The object has following properties:
+     *
+     *    - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc)
+     *    - **url** – `{string}` – Absolute or relative URL of the resource that is being requested.
+     *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be turned
+     *      to `?key1=value1&key2=value2` after the url. If the value is not a string, it will be
+     *      JSONified.
+     *    - **data** – `{string|Object}` – Data to be sent as the request message data.
+     *    - **headers** – `{Object}` – Map of strings or functions which return strings representing
+     *      HTTP headers to send to the server. If the return value of a function is null, the
+     *      header will not be sent. Functions accept a config object as an argument.
+     *    - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token.
+     *    - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token.
+     *    - **transformRequest** –
+     *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+     *      transform function or an array of such functions. The transform function takes the http
+     *      request body and headers and returns its transformed (typically serialized) version.
+     *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
+     *    - **transformResponse** –
+     *      `{function(data, headersGetter, status)|Array.<function(data, headersGetter, status)>}` –
+     *      transform function or an array of such functions. The transform function takes the http
+     *      response body, headers and status and returns its transformed (typically deserialized) version.
+     *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
+     *    - **paramSerializer** - {string|function(Object<string,string>):string} - A function used to prepare string representation
+     *      of request parameters (specified as an object).
+     *      Is specified as string, it is interpreted as function registered in with the {$injector}.
+     *    - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
+     *      GET request, otherwise if a cache instance built with
+     *      {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
+     *      caching.
+     *    - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
+     *      that should abort the request when resolved.
+     *    - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
+     *      XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials)
+     *      for more information.
+     *    - **responseType** - `{string}` - see
+     *      [requestType](https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType).
+     *
+     * @returns {HttpPromise} Returns a {@link ng.$q promise} object with the
+     *   standard `then` method and two http specific methods: `success` and `error`. The `then`
+     *   method takes two arguments a success and an error callback which will be called with a
+     *   response object. The `success` and `error` methods take a single argument - a function that
+     *   will be called when the request succeeds or fails respectively. The arguments passed into
+     *   these functions are destructured representation of the response object passed into the
+     *   `then` method. The response object has these properties:
+     *
+     *   - **data** – `{string|Object}` – The response body transformed with the transform
+     *     functions.
+     *   - **status** – `{number}` – HTTP status code of the response.
+     *   - **headers** – `{function([headerName])}` – Header getter function.
+     *   - **config** – `{Object}` – The configuration object that was used to generate the request.
+     *   - **statusText** – `{string}` – HTTP status text of the response.
+     *
+     * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
+     *   requests. This is primarily meant to be used for debugging purposes.
+     *
+     *
+     * @example
+<example module="httpExample">
+<file name="index.html">
+  <div ng-controller="FetchController">
+    <select ng-model="method" aria-label="Request method">
+      <option>GET</option>
+      <option>JSONP</option>
+    </select>
+    <input type="text" ng-model="url" size="80" aria-label="URL" />
+    <button id="fetchbtn" ng-click="fetch()">fetch</button><br>
+    <button id="samplegetbtn" ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
+    <button id="samplejsonpbtn"
+      ng-click="updateModel('JSONP',
+                    'https://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">
+      Sample JSONP
+    </button>
+    <button id="invalidjsonpbtn"
+      ng-click="updateModel('JSONP', 'https://angularjs.org/doesntexist&callback=JSON_CALLBACK')">
+        Invalid JSONP
+      </button>
+    <pre>http status code: {{status}}</pre>
+    <pre>http response data: {{data}}</pre>
+  </div>
+</file>
+<file name="script.js">
+  angular.module('httpExample', [])
+    .controller('FetchController', ['$scope', '$http', '$templateCache',
+      function($scope, $http, $templateCache) {
+        $scope.method = 'GET';
+        $scope.url = 'http-hello.html';
+
+        $scope.fetch = function() {
+          $scope.code = null;
+          $scope.response = null;
+
+          $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
+            success(function(data, status) {
+              $scope.status = status;
+              $scope.data = data;
+            }).
+            error(function(data, status) {
+              $scope.data = data || "Request failed";
+              $scope.status = status;
+          });
+        };
+
+        $scope.updateModel = function(method, url) {
+          $scope.method = method;
+          $scope.url = url;
+        };
+      }]);
+</file>
+<file name="http-hello.html">
+  Hello, $http!
+</file>
+<file name="protractor.js" type="protractor">
+  var status = element(by.binding('status'));
+  var data = element(by.binding('data'));
+  var fetchBtn = element(by.id('fetchbtn'));
+  var sampleGetBtn = element(by.id('samplegetbtn'));
+  var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
+  var invalidJsonpBtn = element(by.id('invalidjsonpbtn'));
+
+  it('should make an xhr GET request', function() {
+    sampleGetBtn.click();
+    fetchBtn.click();
+    expect(status.getText()).toMatch('200');
+    expect(data.getText()).toMatch(/Hello, \$http!/);
+  });
+
+// Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185
+// it('should make a JSONP request to angularjs.org', function() {
+//   sampleJsonpBtn.click();
+//   fetchBtn.click();
+//   expect(status.getText()).toMatch('200');
+//   expect(data.getText()).toMatch(/Super Hero!/);
+// });
+
+  it('should make JSONP request to invalid URL and invoke the error handler',
+      function() {
+    invalidJsonpBtn.click();
+    fetchBtn.click();
+    expect(status.getText()).toMatch('0');
+    expect(data.getText()).toMatch('Request failed');
+  });
+</file>
+</example>
+     */
+    function $http(requestConfig) {
+
+      if (!angular.isObject(requestConfig)) {
+        throw minErr('$http')('badreq', 'Http request configuration must be an object.  Received: {0}', requestConfig);
+      }
+
+      var config = extend({
+        method: 'get',
+        transformRequest: defaults.transformRequest,
+        transformResponse: defaults.transformResponse,
+        paramSerializer: defaults.paramSerializer
+      }, requestConfig);
+
+      config.headers = mergeHeaders(requestConfig);
+      config.method = uppercase(config.method);
+      config.paramSerializer = isString(config.paramSerializer) ?
+        $injector.get(config.paramSerializer) : config.paramSerializer;
+
+      var serverRequest = function(config) {
+        var headers = config.headers;
+        var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
+
+        // strip content-type if data is undefined
+        if (isUndefined(reqData)) {
+          forEach(headers, function(value, header) {
+            if (lowercase(header) === 'content-type') {
+                delete headers[header];
+            }
+          });
+        }
+
+        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+          config.withCredentials = defaults.withCredentials;
+        }
+
+        // send request
+        return sendReq(config, reqData).then(transformResponse, transformResponse);
+      };
+
+      var chain = [serverRequest, undefined];
+      var promise = $q.when(config);
+
+      // apply interceptors
+      forEach(reversedInterceptors, function(interceptor) {
+        if (interceptor.request || interceptor.requestError) {
+          chain.unshift(interceptor.request, interceptor.requestError);
+        }
+        if (interceptor.response || interceptor.responseError) {
+          chain.push(interceptor.response, interceptor.responseError);
+        }
+      });
+
+      while (chain.length) {
+        var thenFn = chain.shift();
+        var rejectFn = chain.shift();
+
+        promise = promise.then(thenFn, rejectFn);
+      }
+
+      promise.success = function(fn) {
+        assertArgFn(fn, 'fn');
+
+        promise.then(function(response) {
+          fn(response.data, response.status, response.headers, config);
+        });
+        return promise;
+      };
+
+      promise.error = function(fn) {
+        assertArgFn(fn, 'fn');
+
+        promise.then(null, function(response) {
+          fn(response.data, response.status, response.headers, config);
+        });
+        return promise;
+      };
+
+      return promise;
+
+      function transformResponse(response) {
+        // make a copy since the response must be cacheable
+        var resp = extend({}, response);
+        if (!response.data) {
+          resp.data = response.data;
+        } else {
+          resp.data = transformData(response.data, response.headers, response.status, config.transformResponse);
+        }
+        return (isSuccess(response.status))
+          ? resp
+          : $q.reject(resp);
+      }
+
+      function executeHeaderFns(headers, config) {
+        var headerContent, processedHeaders = {};
+
+        forEach(headers, function(headerFn, header) {
+          if (isFunction(headerFn)) {
+            headerContent = headerFn(config);
+            if (headerContent != null) {
+              processedHeaders[header] = headerContent;
+            }
+          } else {
+            processedHeaders[header] = headerFn;
+          }
+        });
+
+        return processedHeaders;
+      }
+
+      function mergeHeaders(config) {
+        var defHeaders = defaults.headers,
+            reqHeaders = extend({}, config.headers),
+            defHeaderName, lowercaseDefHeaderName, reqHeaderName;
+
+        defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]);
+
+        // using for-in instead of forEach to avoid unecessary iteration after header has been found
+        defaultHeadersIteration:
+        for (defHeaderName in defHeaders) {
+          lowercaseDefHeaderName = lowercase(defHeaderName);
+
+          for (reqHeaderName in reqHeaders) {
+            if (lowercase(reqHeaderName) === lowercaseDefHeaderName) {
+              continue defaultHeadersIteration;
+            }
+          }
+
+          reqHeaders[defHeaderName] = defHeaders[defHeaderName];
+        }
+
+        // execute if header value is a function for merged headers
+        return executeHeaderFns(reqHeaders, shallowCopy(config));
+      }
+    }
+
+    $http.pendingRequests = [];
+
+    /**
+     * @ngdoc method
+     * @name $http#get
+     *
+     * @description
+     * Shortcut method to perform `GET` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#delete
+     *
+     * @description
+     * Shortcut method to perform `DELETE` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#head
+     *
+     * @description
+     * Shortcut method to perform `HEAD` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#jsonp
+     *
+     * @description
+     * Shortcut method to perform `JSONP` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request.
+     *                     The name of the callback should be the string `JSON_CALLBACK`.
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+    createShortMethods('get', 'delete', 'head', 'jsonp');
+
+    /**
+     * @ngdoc method
+     * @name $http#post
+     *
+     * @description
+     * Shortcut method to perform `POST` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {*} data Request content
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#put
+     *
+     * @description
+     * Shortcut method to perform `PUT` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {*} data Request content
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+     /**
+      * @ngdoc method
+      * @name $http#patch
+      *
+      * @description
+      * Shortcut method to perform `PATCH` request.
+      *
+      * @param {string} url Relative or absolute URL specifying the destination of the request
+      * @param {*} data Request content
+      * @param {Object=} config Optional configuration object
+      * @returns {HttpPromise} Future object
+      */
+    createShortMethodsWithData('post', 'put', 'patch');
+
+        /**
+         * @ngdoc property
+         * @name $http#defaults
+         *
+         * @description
+         * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of
+         * default headers, withCredentials as well as request and response transformations.
+         *
+         * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above.
+         */
+    $http.defaults = defaults;
+
+
+    return $http;
+
+
+    function createShortMethods(names) {
+      forEach(arguments, function(name) {
+        $http[name] = function(url, config) {
+          return $http(extend({}, config || {}, {
+            method: name,
+            url: url
+          }));
+        };
+      });
+    }
+
+
+    function createShortMethodsWithData(name) {
+      forEach(arguments, function(name) {
+        $http[name] = function(url, data, config) {
+          return $http(extend({}, config || {}, {
+            method: name,
+            url: url,
+            data: data
+          }));
+        };
+      });
+    }
+
+
+    /**
+     * Makes the request.
+     *
+     * !!! ACCESSES CLOSURE VARS:
+     * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests
+     */
+    function sendReq(config, reqData) {
+      var deferred = $q.defer(),
+          promise = deferred.promise,
+          cache,
+          cachedResp,
+          reqHeaders = config.headers,
+          url = buildUrl(config.url, config.paramSerializer(config.params));
+
+      $http.pendingRequests.push(config);
+      promise.then(removePendingReq, removePendingReq);
+
+
+      if ((config.cache || defaults.cache) && config.cache !== false &&
+          (config.method === 'GET' || config.method === 'JSONP')) {
+        cache = isObject(config.cache) ? config.cache
+              : isObject(defaults.cache) ? defaults.cache
+              : defaultCache;
+      }
+
+      if (cache) {
+        cachedResp = cache.get(url);
+        if (isDefined(cachedResp)) {
+          if (isPromiseLike(cachedResp)) {
+            // cached request has already been sent, but there is no response yet
+            cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult);
+          } else {
+            // serving from cache
+            if (isArray(cachedResp)) {
+              resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3]);
+            } else {
+              resolvePromise(cachedResp, 200, {}, 'OK');
+            }
+          }
+        } else {
+          // put the promise for the non-transformed response into cache as a placeholder
+          cache.put(url, promise);
+        }
+      }
+
+
+      // if we won't have the response in cache, set the xsrf headers and
+      // send the request to the backend
+      if (isUndefined(cachedResp)) {
+        var xsrfValue = urlIsSameOrigin(config.url)
+            ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName]
+            : undefined;
+        if (xsrfValue) {
+          reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+        }
+
+        $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout,
+            config.withCredentials, config.responseType);
+      }
+
+      return promise;
+
+
+      /**
+       * Callback registered to $httpBackend():
+       *  - caches the response if desired
+       *  - resolves the raw $http promise
+       *  - calls $apply
+       */
+      function done(status, response, headersString, statusText) {
+        if (cache) {
+          if (isSuccess(status)) {
+            cache.put(url, [status, response, parseHeaders(headersString), statusText]);
+          } else {
+            // remove promise from the cache
+            cache.remove(url);
+          }
+        }
+
+        function resolveHttpPromise() {
+          resolvePromise(response, status, headersString, statusText);
+        }
+
+        if (useApplyAsync) {
+          $rootScope.$applyAsync(resolveHttpPromise);
+        } else {
+          resolveHttpPromise();
+          if (!$rootScope.$$phase) $rootScope.$apply();
+        }
+      }
+
+
+      /**
+       * Resolves the raw $http promise.
+       */
+      function resolvePromise(response, status, headers, statusText) {
+        // normalize internal statuses to 0
+        status = Math.max(status, 0);
+
+        (isSuccess(status) ? deferred.resolve : deferred.reject)({
+          data: response,
+          status: status,
+          headers: headersGetter(headers),
+          config: config,
+          statusText: statusText
+        });
+      }
+
+      function resolvePromiseWithResult(result) {
+        resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText);
+      }
+
+      function removePendingReq() {
+        var idx = $http.pendingRequests.indexOf(config);
+        if (idx !== -1) $http.pendingRequests.splice(idx, 1);
+      }
+    }
+
+
+    function buildUrl(url, serializedParams) {
+      if (serializedParams.length > 0) {
+        url += ((url.indexOf('?') == -1) ? '?' : '&') + serializedParams;
+      }
+      return url;
+    }
+  }];
+}
+
+function createXhr() {
+    return new window.XMLHttpRequest();
+}
+
+/**
+ * @ngdoc service
+ * @name $httpBackend
+ * @requires $window
+ * @requires $document
+ *
+ * @description
+ * HTTP backend used by the {@link ng.$http service} that delegates to
+ * XMLHttpRequest object or JSONP and deals with browser incompatibilities.
+ *
+ * You should never need to use this service directly, instead use the higher-level abstractions:
+ * {@link ng.$http $http} or {@link ngResource.$resource $resource}.
+ *
+ * During testing this implementation is swapped with {@link ngMock.$httpBackend mock
+ * $httpBackend} which can be trained with responses.
+ */
+function $HttpBackendProvider() {
+  this.$get = ['$browser', '$window', '$document', function($browser, $window, $document) {
+    return createHttpBackend($browser, createXhr, $browser.defer, $window.angular.callbacks, $document[0]);
+  }];
+}
+
+function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) {
+  // TODO(vojta): fix the signature
+  return function(method, url, post, callback, headers, timeout, withCredentials, responseType) {
+    $browser.$$incOutstandingRequestCount();
+    url = url || $browser.url();
+
+    if (lowercase(method) == 'jsonp') {
+      var callbackId = '_' + (callbacks.counter++).toString(36);
+      callbacks[callbackId] = function(data) {
+        callbacks[callbackId].data = data;
+        callbacks[callbackId].called = true;
+      };
+
+      var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
+          callbackId, function(status, text) {
+        completeRequest(callback, status, callbacks[callbackId].data, "", text);
+        callbacks[callbackId] = noop;
+      });
+    } else {
+
+      var xhr = createXhr();
+
+      xhr.open(method, url, true);
+      forEach(headers, function(value, key) {
+        if (isDefined(value)) {
+            xhr.setRequestHeader(key, value);
+        }
+      });
+
+      xhr.onload = function requestLoaded() {
+        var statusText = xhr.statusText || '';
+
+        // responseText is the old-school way of retrieving response (supported by IE8 & 9)
+        // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
+        var response = ('response' in xhr) ? xhr.response : xhr.responseText;
+
+        // normalize IE9 bug (http://bugs.jquery.com/ticket/1450)
+        var status = xhr.status === 1223 ? 204 : xhr.status;
+
+        // fix status code when it is 0 (0 status is undocumented).
+        // Occurs when accessing file resources or on Android 4.1 stock browser
+        // while retrieving files from application cache.
+        if (status === 0) {
+          status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0;
+        }
+
+        completeRequest(callback,
+            status,
+            response,
+            xhr.getAllResponseHeaders(),
+            statusText);
+      };
+
+      var requestError = function() {
+        // The response is always empty
+        // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+        completeRequest(callback, -1, null, null, '');
+      };
+
+      xhr.onerror = requestError;
+      xhr.onabort = requestError;
+
+      if (withCredentials) {
+        xhr.withCredentials = true;
+      }
+
+      if (responseType) {
+        try {
+          xhr.responseType = responseType;
+        } catch (e) {
+          // WebKit added support for the json responseType value on 09/03/2013
+          // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are
+          // known to throw when setting the value "json" as the response type. Other older
+          // browsers implementing the responseType
+          //
+          // The json response type can be ignored if not supported, because JSON payloads are
+          // parsed on the client-side regardless.
+          if (responseType !== 'json') {
+            throw e;
+          }
+        }
+      }
+
+      xhr.send(post);
+    }
+
+    if (timeout > 0) {
+      var timeoutId = $browserDefer(timeoutRequest, timeout);
+    } else if (isPromiseLike(timeout)) {
+      timeout.then(timeoutRequest);
+    }
+
+
+    function timeoutRequest() {
+      jsonpDone && jsonpDone();
+      xhr && xhr.abort();
+    }
+
+    function completeRequest(callback, status, response, headersString, statusText) {
+      // cancel timeout and subsequent timeout promise resolution
+      if (timeoutId !== undefined) {
+        $browserDefer.cancel(timeoutId);
+      }
+      jsonpDone = xhr = null;
+
+      callback(status, response, headersString, statusText);
+      $browser.$$completeOutstandingRequest(noop);
+    }
+  };
+
+  function jsonpReq(url, callbackId, done) {
+    // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
+    // - fetches local scripts via XHR and evals them
+    // - adds and immediately removes script elements from the document
+    var script = rawDocument.createElement('script'), callback = null;
+    script.type = "text/javascript";
+    script.src = url;
+    script.async = true;
+
+    callback = function(event) {
+      removeEventListenerFn(script, "load", callback);
+      removeEventListenerFn(script, "error", callback);
+      rawDocument.body.removeChild(script);
+      script = null;
+      var status = -1;
+      var text = "unknown";
+
+      if (event) {
+        if (event.type === "load" && !callbacks[callbackId].called) {
+          event = { type: "error" };
+        }
+        text = event.type;
+        status = event.type === "error" ? 404 : 200;
+      }
+
+      if (done) {
+        done(status, text);
+      }
+    };
+
+    addEventListenerFn(script, "load", callback);
+    addEventListenerFn(script, "error", callback);
+    rawDocument.body.appendChild(script);
+    return callback;
+  }
+}
+
+var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
+$interpolateMinErr.throwNoconcat = function(text) {
+  throw $interpolateMinErr('noconcat',
+      "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
+      "interpolations that concatenate multiple expressions when a trusted value is " +
+      "required.  See http://docs.angularjs.org/api/ng.$sce", text);
+};
+
+$interpolateMinErr.interr = function(text, err) {
+  return $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, err.toString());
+};
+
+/**
+ * @ngdoc provider
+ * @name $interpolateProvider
+ *
+ * @description
+ *
+ * Used for configuring the interpolation markup. Defaults to `{{` and `}}`.
+ *
+ * @example
+<example module="customInterpolationApp">
+<file name="index.html">
+<script>
+  var customInterpolationApp = angular.module('customInterpolationApp', []);
+
+  customInterpolationApp.config(function($interpolateProvider) {
+    $interpolateProvider.startSymbol('//');
+    $interpolateProvider.endSymbol('//');
+  });
+
+
+  customInterpolationApp.controller('DemoController', function() {
+      this.label = "This binding is brought you by // interpolation symbols.";
+  });
+</script>
+<div ng-app="App" ng-controller="DemoController as demo">
+    //demo.label//
+</div>
+</file>
+<file name="protractor.js" type="protractor">
+  it('should interpolate binding with custom symbols', function() {
+    expect(element(by.binding('demo.label')).getText()).toBe('This binding is brought you by // interpolation symbols.');
+  });
+</file>
+</example>
+ */
+function $InterpolateProvider() {
+  var startSymbol = '{{';
+  var endSymbol = '}}';
+
+  /**
+   * @ngdoc method
+   * @name $interpolateProvider#startSymbol
+   * @description
+   * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
+   *
+   * @param {string=} value new value to set the starting symbol to.
+   * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
+   */
+  this.startSymbol = function(value) {
+    if (value) {
+      startSymbol = value;
+      return this;
+    } else {
+      return startSymbol;
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $interpolateProvider#endSymbol
+   * @description
+   * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
+   *
+   * @param {string=} value new value to set the ending symbol to.
+   * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
+   */
+  this.endSymbol = function(value) {
+    if (value) {
+      endSymbol = value;
+      return this;
+    } else {
+      return endSymbol;
+    }
+  };
+
+
+  this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) {
+    var startSymbolLength = startSymbol.length,
+        endSymbolLength = endSymbol.length,
+        escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'),
+        escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g');
+
+    function escape(ch) {
+      return '\\\\\\' + ch;
+    }
+
+    function unescapeText(text) {
+      return text.replace(escapedStartRegexp, startSymbol).
+        replace(escapedEndRegexp, endSymbol);
+    }
+
+    function stringify(value) {
+      if (value == null) { // null || undefined
+        return '';
+      }
+      switch (typeof value) {
+        case 'string':
+          break;
+        case 'number':
+          value = '' + value;
+          break;
+        default:
+          value = toJson(value);
+      }
+
+      return value;
+    }
+
+    /**
+     * @ngdoc service
+     * @name $interpolate
+     * @kind function
+     *
+     * @requires $parse
+     * @requires $sce
+     *
+     * @description
+     *
+     * Compiles a string with markup into an interpolation function. This service is used by the
+     * HTML {@link ng.$compile $compile} service for data binding. See
+     * {@link ng.$interpolateProvider $interpolateProvider} for configuring the
+     * interpolation markup.
+     *
+     *
+     * ```js
+     *   var $interpolate = ...; // injected
+     *   var exp = $interpolate('Hello {{name | uppercase}}!');
+     *   expect(exp({name:'Angular'}).toEqual('Hello ANGULAR!');
+     * ```
+     *
+     * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is
+     * `true`, the interpolation function will return `undefined` unless all embedded expressions
+     * evaluate to a value other than `undefined`.
+     *
+     * ```js
+     *   var $interpolate = ...; // injected
+     *   var context = {greeting: 'Hello', name: undefined };
+     *
+     *   // default "forgiving" mode
+     *   var exp = $interpolate('{{greeting}} {{name}}!');
+     *   expect(exp(context)).toEqual('Hello !');
+     *
+     *   // "allOrNothing" mode
+     *   exp = $interpolate('{{greeting}} {{name}}!', false, null, true);
+     *   expect(exp(context)).toBeUndefined();
+     *   context.name = 'Angular';
+     *   expect(exp(context)).toEqual('Hello Angular!');
+     * ```
+     *
+     * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
+     *
+     * ####Escaped Interpolation
+     * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
+     * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
+     * It will be rendered as a regular start/end marker, and will not be interpreted as an expression
+     * or binding.
+     *
+     * This enables web-servers to prevent script injection attacks and defacing attacks, to some
+     * degree, while also enabling code examples to work without relying on the
+     * {@link ng.directive:ngNonBindable ngNonBindable} directive.
+     *
+     * **For security purposes, it is strongly encouraged that web servers escape user-supplied data,
+     * replacing angle brackets (&lt;, &gt;) with &amp;lt; and &amp;gt; respectively, and replacing all
+     * interpolation start/end markers with their escaped counterparts.**
+     *
+     * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered
+     * output when the $interpolate service processes the text. So, for HTML elements interpolated
+     * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter
+     * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such,
+     * this is typically useful only when user-data is used in rendering a template from the server, or
+     * when otherwise untrusted data is used by a directive.
+     *
+     * <example>
+     *  <file name="index.html">
+     *    <div ng-init="username='A user'">
+     *      <p ng-init="apptitle='Escaping demo'">{{apptitle}}: \{\{ username = "defaced value"; \}\}
+     *        </p>
+     *      <p><strong>{{username}}</strong> attempts to inject code which will deface the
+     *        application, but fails to accomplish their task, because the server has correctly
+     *        escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash)
+     *        characters.</p>
+     *      <p>Instead, the result of the attempted script injection is visible, and can be removed
+     *        from the database by an administrator.</p>
+     *    </div>
+     *  </file>
+     * </example>
+     *
+     * @param {string} text The text with markup to interpolate.
+     * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have
+     *    embedded expression in order to return an interpolation function. Strings with no
+     *    embedded expression will return null for the interpolation function.
+     * @param {string=} trustedContext when provided, the returned function passes the interpolated
+     *    result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult,
+     *    trustedContext)} before returning it.  Refer to the {@link ng.$sce $sce} service that
+     *    provides Strict Contextual Escaping for details.
+     * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined
+     *    unless all embedded expressions evaluate to a value other than `undefined`.
+     * @returns {function(context)} an interpolation function which is used to compute the
+     *    interpolated string. The function has these parameters:
+     *
+     * - `context`: evaluation context for all expressions embedded in the interpolated text
+     */
+    function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
+      allOrNothing = !!allOrNothing;
+      var startIndex,
+          endIndex,
+          index = 0,
+          expressions = [],
+          parseFns = [],
+          textLength = text.length,
+          exp,
+          concat = [],
+          expressionPositions = [];
+
+      while (index < textLength) {
+        if (((startIndex = text.indexOf(startSymbol, index)) != -1) &&
+             ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1)) {
+          if (index !== startIndex) {
+            concat.push(unescapeText(text.substring(index, startIndex)));
+          }
+          exp = text.substring(startIndex + startSymbolLength, endIndex);
+          expressions.push(exp);
+          parseFns.push($parse(exp, parseStringifyInterceptor));
+          index = endIndex + endSymbolLength;
+          expressionPositions.push(concat.length);
+          concat.push('');
+        } else {
+          // we did not find an interpolation, so we have to add the remainder to the separators array
+          if (index !== textLength) {
+            concat.push(unescapeText(text.substring(index)));
+          }
+          break;
+        }
+      }
+
+      // Concatenating expressions makes it hard to reason about whether some combination of
+      // concatenated values are unsafe to use and could easily lead to XSS.  By requiring that a
+      // single expression be used for iframe[src], object[src], etc., we ensure that the value
+      // that's used is assigned or constructed by some JS code somewhere that is more testable or
+      // make it obvious that you bound the value to some user controlled value.  This helps reduce
+      // the load when auditing for XSS issues.
+      if (trustedContext && concat.length > 1) {
+          $interpolateMinErr.throwNoconcat(text);
+      }
+
+      if (!mustHaveExpression || expressions.length) {
+        var compute = function(values) {
+          for (var i = 0, ii = expressions.length; i < ii; i++) {
+            if (allOrNothing && isUndefined(values[i])) return;
+            concat[expressionPositions[i]] = values[i];
+          }
+          return concat.join('');
+        };
+
+        var getValue = function(value) {
+          return trustedContext ?
+            $sce.getTrusted(trustedContext, value) :
+            $sce.valueOf(value);
+        };
+
+        return extend(function interpolationFn(context) {
+            var i = 0;
+            var ii = expressions.length;
+            var values = new Array(ii);
+
+            try {
+              for (; i < ii; i++) {
+                values[i] = parseFns[i](context);
+              }
+
+              return compute(values);
+            } catch (err) {
+              $exceptionHandler($interpolateMinErr.interr(text, err));
+            }
+
+          }, {
+          // all of these properties are undocumented for now
+          exp: text, //just for compatibility with regular watchers created via $watch
+          expressions: expressions,
+          $$watchDelegate: function(scope, listener) {
+            var lastValue;
+            return scope.$watchGroup(parseFns, function interpolateFnWatcher(values, oldValues) {
+              var currValue = compute(values);
+              if (isFunction(listener)) {
+                listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
+              }
+              lastValue = currValue;
+            });
+          }
+        });
+      }
+
+      function parseStringifyInterceptor(value) {
+        try {
+          value = getValue(value);
+          return allOrNothing && !isDefined(value) ? value : stringify(value);
+        } catch (err) {
+          $exceptionHandler($interpolateMinErr.interr(text, err));
+        }
+      }
+    }
+
+
+    /**
+     * @ngdoc method
+     * @name $interpolate#startSymbol
+     * @description
+     * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.
+     *
+     * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change
+     * the symbol.
+     *
+     * @returns {string} start symbol.
+     */
+    $interpolate.startSymbol = function() {
+      return startSymbol;
+    };
+
+
+    /**
+     * @ngdoc method
+     * @name $interpolate#endSymbol
+     * @description
+     * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
+     *
+     * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change
+     * the symbol.
+     *
+     * @returns {string} end symbol.
+     */
+    $interpolate.endSymbol = function() {
+      return endSymbol;
+    };
+
+    return $interpolate;
+  }];
+}
+
+function $IntervalProvider() {
+  this.$get = ['$rootScope', '$window', '$q', '$$q',
+       function($rootScope,   $window,   $q,   $$q) {
+    var intervals = {};
+
+
+     /**
+      * @ngdoc service
+      * @name $interval
+      *
+      * @description
+      * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
+      * milliseconds.
+      *
+      * The return value of registering an interval function is a promise. This promise will be
+      * notified upon each tick of the interval, and will be resolved after `count` iterations, or
+      * run indefinitely if `count` is not defined. The value of the notification will be the
+      * number of iterations that have run.
+      * To cancel an interval, call `$interval.cancel(promise)`.
+      *
+      * In tests you can use {@link ngMock.$interval#flush `$interval.flush(millis)`} to
+      * move forward by `millis` milliseconds and trigger any functions scheduled to run in that
+      * time.
+      *
+      * <div class="alert alert-warning">
+      * **Note**: Intervals created by this service must be explicitly destroyed when you are finished
+      * with them.  In particular they are not automatically destroyed when a controller's scope or a
+      * directive's element are destroyed.
+      * You should take this into consideration and make sure to always cancel the interval at the
+      * appropriate moment.  See the example below for more details on how and when to do this.
+      * </div>
+      *
+      * @param {function()} fn A function that should be called repeatedly.
+      * @param {number} delay Number of milliseconds between each function call.
+      * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
+      *   indefinitely.
+      * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
+      *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+      * @param {...*=} Pass additional parameters to the executed function.
+      * @returns {promise} A promise which will be notified on each iteration.
+      *
+      * @example
+      * <example module="intervalExample">
+      * <file name="index.html">
+      *   <script>
+      *     angular.module('intervalExample', [])
+      *       .controller('ExampleController', ['$scope', '$interval',
+      *         function($scope, $interval) {
+      *           $scope.format = 'M/d/yy h:mm:ss a';
+      *           $scope.blood_1 = 100;
+      *           $scope.blood_2 = 120;
+      *
+      *           var stop;
+      *           $scope.fight = function() {
+      *             // Don't start a new fight if we are already fighting
+      *             if ( angular.isDefined(stop) ) return;
+      *
+      *             stop = $interval(function() {
+      *               if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
+      *                 $scope.blood_1 = $scope.blood_1 - 3;
+      *                 $scope.blood_2 = $scope.blood_2 - 4;
+      *               } else {
+      *                 $scope.stopFight();
+      *               }
+      *             }, 100);
+      *           };
+      *
+      *           $scope.stopFight = function() {
+      *             if (angular.isDefined(stop)) {
+      *               $interval.cancel(stop);
+      *               stop = undefined;
+      *             }
+      *           };
+      *
+      *           $scope.resetFight = function() {
+      *             $scope.blood_1 = 100;
+      *             $scope.blood_2 = 120;
+      *           };
+      *
+      *           $scope.$on('$destroy', function() {
+      *             // Make sure that the interval is destroyed too
+      *             $scope.stopFight();
+      *           });
+      *         }])
+      *       // Register the 'myCurrentTime' directive factory method.
+      *       // We inject $interval and dateFilter service since the factory method is DI.
+      *       .directive('myCurrentTime', ['$interval', 'dateFilter',
+      *         function($interval, dateFilter) {
+      *           // return the directive link function. (compile function not needed)
+      *           return function(scope, element, attrs) {
+      *             var format,  // date format
+      *                 stopTime; // so that we can cancel the time updates
+      *
+      *             // used to update the UI
+      *             function updateTime() {
+      *               element.text(dateFilter(new Date(), format));
+      *             }
+      *
+      *             // watch the expression, and update the UI on change.
+      *             scope.$watch(attrs.myCurrentTime, function(value) {
+      *               format = value;
+      *               updateTime();
+      *             });
+      *
+      *             stopTime = $interval(updateTime, 1000);
+      *
+      *             // listen on DOM destroy (removal) event, and cancel the next UI update
+      *             // to prevent updating time after the DOM element was removed.
+      *             element.on('$destroy', function() {
+      *               $interval.cancel(stopTime);
+      *             });
+      *           }
+      *         }]);
+      *   </script>
+      *
+      *   <div>
+      *     <div ng-controller="ExampleController">
+      *       <label>Date format: <input ng-model="format"></label> <hr/>
+      *       Current time is: <span my-current-time="format"></span>
+      *       <hr/>
+      *       Blood 1 : <font color='red'>{{blood_1}}</font>
+      *       Blood 2 : <font color='red'>{{blood_2}}</font>
+      *       <button type="button" data-ng-click="fight()">Fight</button>
+      *       <button type="button" data-ng-click="stopFight()">StopFight</button>
+      *       <button type="button" data-ng-click="resetFight()">resetFight</button>
+      *     </div>
+      *   </div>
+      *
+      * </file>
+      * </example>
+      */
+    function interval(fn, delay, count, invokeApply) {
+      var hasParams = arguments.length > 4,
+          args = hasParams ? sliceArgs(arguments, 4) : [],
+          setInterval = $window.setInterval,
+          clearInterval = $window.clearInterval,
+          iteration = 0,
+          skipApply = (isDefined(invokeApply) && !invokeApply),
+          deferred = (skipApply ? $$q : $q).defer(),
+          promise = deferred.promise;
+
+      count = isDefined(count) ? count : 0;
+
+      promise.then(null, null, (!hasParams) ? fn : function() {
+        fn.apply(null, args);
+      });
+
+      promise.$$intervalId = setInterval(function tick() {
+        deferred.notify(iteration++);
+
+        if (count > 0 && iteration >= count) {
+          deferred.resolve(iteration);
+          clearInterval(promise.$$intervalId);
+          delete intervals[promise.$$intervalId];
+        }
+
+        if (!skipApply) $rootScope.$apply();
+
+      }, delay);
+
+      intervals[promise.$$intervalId] = deferred;
+
+      return promise;
+    }
+
+
+     /**
+      * @ngdoc method
+      * @name $interval#cancel
+      *
+      * @description
+      * Cancels a task associated with the `promise`.
+      *
+      * @param {promise} promise returned by the `$interval` function.
+      * @returns {boolean} Returns `true` if the task was successfully canceled.
+      */
+    interval.cancel = function(promise) {
+      if (promise && promise.$$intervalId in intervals) {
+        intervals[promise.$$intervalId].reject('canceled');
+        $window.clearInterval(promise.$$intervalId);
+        delete intervals[promise.$$intervalId];
+        return true;
+      }
+      return false;
+    };
+
+    return interval;
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $locale
+ *
+ * @description
+ * $locale service provides localization rules for various Angular components. As of right now the
+ * only public api is:
+ *
+ * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
+ */
+function $LocaleProvider() {
+  this.$get = function() {
+    return {
+      id: 'en-us',
+
+      NUMBER_FORMATS: {
+        DECIMAL_SEP: '.',
+        GROUP_SEP: ',',
+        PATTERNS: [
+          { // Decimal Pattern
+            minInt: 1,
+            minFrac: 0,
+            maxFrac: 3,
+            posPre: '',
+            posSuf: '',
+            negPre: '-',
+            negSuf: '',
+            gSize: 3,
+            lgSize: 3
+          },{ //Currency Pattern
+            minInt: 1,
+            minFrac: 2,
+            maxFrac: 2,
+            posPre: '\u00A4',
+            posSuf: '',
+            negPre: '(\u00A4',
+            negSuf: ')',
+            gSize: 3,
+            lgSize: 3
+          }
+        ],
+        CURRENCY_SYM: '$'
+      },
+
+      DATETIME_FORMATS: {
+        MONTH:
+            'January,February,March,April,May,June,July,August,September,October,November,December'
+            .split(','),
+        SHORTMONTH:  'Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec'.split(','),
+        DAY: 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','),
+        SHORTDAY: 'Sun,Mon,Tue,Wed,Thu,Fri,Sat'.split(','),
+        AMPMS: ['AM','PM'],
+        medium: 'MMM d, y h:mm:ss a',
+        'short': 'M/d/yy h:mm a',
+        fullDate: 'EEEE, MMMM d, y',
+        longDate: 'MMMM d, y',
+        mediumDate: 'MMM d, y',
+        shortDate: 'M/d/yy',
+        mediumTime: 'h:mm:ss a',
+        shortTime: 'h:mm a',
+        ERANAMES: [
+          "Before Christ",
+          "Anno Domini"
+        ],
+        ERAS: [
+          "BC",
+          "AD"
+        ]
+      },
+
+      pluralCat: function(num) {
+        if (num === 1) {
+          return 'one';
+        }
+        return 'other';
+      }
+    };
+  };
+}
+
+var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/,
+    DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
+var $locationMinErr = minErr('$location');
+
+
+/**
+ * Encode path using encodeUriSegment, ignoring forward slashes
+ *
+ * @param {string} path Path to encode
+ * @returns {string}
+ */
+function encodePath(path) {
+  var segments = path.split('/'),
+      i = segments.length;
+
+  while (i--) {
+    segments[i] = encodeUriSegment(segments[i]);
+  }
+
+  return segments.join('/');
+}
+
+function parseAbsoluteUrl(absoluteUrl, locationObj) {
+  var parsedUrl = urlResolve(absoluteUrl);
+
+  locationObj.$$protocol = parsedUrl.protocol;
+  locationObj.$$host = parsedUrl.hostname;
+  locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
+}
+
+
+function parseAppUrl(relativeUrl, locationObj) {
+  var prefixed = (relativeUrl.charAt(0) !== '/');
+  if (prefixed) {
+    relativeUrl = '/' + relativeUrl;
+  }
+  var match = urlResolve(relativeUrl);
+  locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ?
+      match.pathname.substring(1) : match.pathname);
+  locationObj.$$search = parseKeyValue(match.search);
+  locationObj.$$hash = decodeURIComponent(match.hash);
+
+  // make sure path starts with '/';
+  if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') {
+    locationObj.$$path = '/' + locationObj.$$path;
+  }
+}
+
+
+/**
+ *
+ * @param {string} begin
+ * @param {string} whole
+ * @returns {string} returns text from whole after begin or undefined if it does not begin with
+ *                   expected string.
+ */
+function beginsWith(begin, whole) {
+  if (whole.indexOf(begin) === 0) {
+    return whole.substr(begin.length);
+  }
+}
+
+
+function stripHash(url) {
+  var index = url.indexOf('#');
+  return index == -1 ? url : url.substr(0, index);
+}
+
+function trimEmptyHash(url) {
+  return url.replace(/(#.+)|#$/, '$1');
+}
+
+
+function stripFile(url) {
+  return url.substr(0, stripHash(url).lastIndexOf('/') + 1);
+}
+
+/* return the server only (scheme://host:port) */
+function serverBase(url) {
+  return url.substring(0, url.indexOf('/', url.indexOf('//') + 2));
+}
+
+
+/**
+ * LocationHtml5Url represents an url
+ * This object is exposed as $location service when HTML5 mode is enabled and supported
+ *
+ * @constructor
+ * @param {string} appBase application base URL
+ * @param {string} basePrefix url path prefix
+ */
+function LocationHtml5Url(appBase, basePrefix) {
+  this.$$html5 = true;
+  basePrefix = basePrefix || '';
+  var appBaseNoFile = stripFile(appBase);
+  parseAbsoluteUrl(appBase, this);
+
+
+  /**
+   * Parse given html5 (regular) url string into properties
+   * @param {string} url HTML5 url
+   * @private
+   */
+  this.$$parse = function(url) {
+    var pathUrl = beginsWith(appBaseNoFile, url);
+    if (!isString(pathUrl)) {
+      throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url,
+          appBaseNoFile);
+    }
+
+    parseAppUrl(pathUrl, this);
+
+    if (!this.$$path) {
+      this.$$path = '/';
+    }
+
+    this.$$compose();
+  };
+
+  /**
+   * Compose url and update `absUrl` property
+   * @private
+   */
+  this.$$compose = function() {
+    var search = toKeyValue(this.$$search),
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+
+    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
+  };
+
+  this.$$parseLinkUrl = function(url, relHref) {
+    if (relHref && relHref[0] === '#') {
+      // special case for links to hash fragments:
+      // keep the old url and only replace the hash fragment
+      this.hash(relHref.slice(1));
+      return true;
+    }
+    var appUrl, prevAppUrl;
+    var rewrittenUrl;
+
+    if ((appUrl = beginsWith(appBase, url)) !== undefined) {
+      prevAppUrl = appUrl;
+      if ((appUrl = beginsWith(basePrefix, appUrl)) !== undefined) {
+        rewrittenUrl = appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
+      } else {
+        rewrittenUrl = appBase + prevAppUrl;
+      }
+    } else if ((appUrl = beginsWith(appBaseNoFile, url)) !== undefined) {
+      rewrittenUrl = appBaseNoFile + appUrl;
+    } else if (appBaseNoFile == url + '/') {
+      rewrittenUrl = appBaseNoFile;
+    }
+    if (rewrittenUrl) {
+      this.$$parse(rewrittenUrl);
+    }
+    return !!rewrittenUrl;
+  };
+}
+
+
+/**
+ * LocationHashbangUrl represents url
+ * This object is exposed as $location service when developer doesn't opt into html5 mode.
+ * It also serves as the base class for html5 mode fallback on legacy browsers.
+ *
+ * @constructor
+ * @param {string} appBase application base URL
+ * @param {string} hashPrefix hashbang prefix
+ */
+function LocationHashbangUrl(appBase, hashPrefix) {
+  var appBaseNoFile = stripFile(appBase);
+
+  parseAbsoluteUrl(appBase, this);
+
+
+  /**
+   * Parse given hashbang url into properties
+   * @param {string} url Hashbang url
+   * @private
+   */
+  this.$$parse = function(url) {
+    var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url);
+    var withoutHashUrl;
+
+    if (withoutBaseUrl.charAt(0) === '#') {
+
+      // The rest of the url starts with a hash so we have
+      // got either a hashbang path or a plain hash fragment
+      withoutHashUrl = beginsWith(hashPrefix, withoutBaseUrl);
+      if (isUndefined(withoutHashUrl)) {
+        // There was no hashbang prefix so we just have a hash fragment
+        withoutHashUrl = withoutBaseUrl;
+      }
+
+    } else {
+      // There was no hashbang path nor hash fragment:
+      // If we are in HTML5 mode we use what is left as the path;
+      // Otherwise we ignore what is left
+      withoutHashUrl = this.$$html5 ? withoutBaseUrl : '';
+    }
+
+    parseAppUrl(withoutHashUrl, this);
+
+    this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase);
+
+    this.$$compose();
+
+    /*
+     * In Windows, on an anchor node on documents loaded from
+     * the filesystem, the browser will return a pathname
+     * prefixed with the drive name ('/C:/path') when a
+     * pathname without a drive is set:
+     *  * a.setAttribute('href', '/foo')
+     *   * a.pathname === '/C:/foo' //true
+     *
+     * Inside of Angular, we're always using pathnames that
+     * do not include drive names for routing.
+     */
+    function removeWindowsDriveName(path, url, base) {
+      /*
+      Matches paths for file protocol on windows,
+      such as /C:/foo/bar, and captures only /foo/bar.
+      */
+      var windowsFilePathExp = /^\/[A-Z]:(\/.*)/;
+
+      var firstPathSegmentMatch;
+
+      //Get the relative path from the input URL.
+      if (url.indexOf(base) === 0) {
+        url = url.replace(base, '');
+      }
+
+      // The input URL intentionally contains a first path segment that ends with a colon.
+      if (windowsFilePathExp.exec(url)) {
+        return path;
+      }
+
+      firstPathSegmentMatch = windowsFilePathExp.exec(path);
+      return firstPathSegmentMatch ? firstPathSegmentMatch[1] : path;
+    }
+  };
+
+  /**
+   * Compose hashbang url and update `absUrl` property
+   * @private
+   */
+  this.$$compose = function() {
+    var search = toKeyValue(this.$$search),
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+
+    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
+  };
+
+  this.$$parseLinkUrl = function(url, relHref) {
+    if (stripHash(appBase) == stripHash(url)) {
+      this.$$parse(url);
+      return true;
+    }
+    return false;
+  };
+}
+
+
+/**
+ * LocationHashbangUrl represents url
+ * This object is exposed as $location service when html5 history api is enabled but the browser
+ * does not support it.
+ *
+ * @constructor
+ * @param {string} appBase application base URL
+ * @param {string} hashPrefix hashbang prefix
+ */
+function LocationHashbangInHtml5Url(appBase, hashPrefix) {
+  this.$$html5 = true;
+  LocationHashbangUrl.apply(this, arguments);
+
+  var appBaseNoFile = stripFile(appBase);
+
+  this.$$parseLinkUrl = function(url, relHref) {
+    if (relHref && relHref[0] === '#') {
+      // special case for links to hash fragments:
+      // keep the old url and only replace the hash fragment
+      this.hash(relHref.slice(1));
+      return true;
+    }
+
+    var rewrittenUrl;
+    var appUrl;
+
+    if (appBase == stripHash(url)) {
+      rewrittenUrl = url;
+    } else if ((appUrl = beginsWith(appBaseNoFile, url))) {
+      rewrittenUrl = appBase + hashPrefix + appUrl;
+    } else if (appBaseNoFile === url + '/') {
+      rewrittenUrl = appBaseNoFile;
+    }
+    if (rewrittenUrl) {
+      this.$$parse(rewrittenUrl);
+    }
+    return !!rewrittenUrl;
+  };
+
+  this.$$compose = function() {
+    var search = toKeyValue(this.$$search),
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+
+    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    // include hashPrefix in $$absUrl when $$url is empty so IE8 & 9 do not reload page because of removal of '#'
+    this.$$absUrl = appBase + hashPrefix + this.$$url;
+  };
+
+}
+
+
+var locationPrototype = {
+
+  /**
+   * Are we in html5 mode?
+   * @private
+   */
+  $$html5: false,
+
+  /**
+   * Has any change been replacing?
+   * @private
+   */
+  $$replace: false,
+
+  /**
+   * @ngdoc method
+   * @name $location#absUrl
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return full url representation with all segments encoded according to rules specified in
+   * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var absUrl = $location.absUrl();
+   * // => "http://example.com/#/some/path?foo=bar&baz=xoxo"
+   * ```
+   *
+   * @return {string} full url
+   */
+  absUrl: locationGetter('$$absUrl'),
+
+  /**
+   * @ngdoc method
+   * @name $location#url
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return url (e.g. `/path?a=b#hash`) when called without any parameter.
+   *
+   * Change path, search and hash, when called with parameter and return `$location`.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var url = $location.url();
+   * // => "/some/path?foo=bar&baz=xoxo"
+   * ```
+   *
+   * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`)
+   * @return {string} url
+   */
+  url: function(url) {
+    if (isUndefined(url)) {
+      return this.$$url;
+    }
+
+    var match = PATH_MATCH.exec(url);
+    if (match[1] || url === '') this.path(decodeURIComponent(match[1]));
+    if (match[2] || match[1] || url === '') this.search(match[3] || '');
+    this.hash(match[5] || '');
+
+    return this;
+  },
+
+  /**
+   * @ngdoc method
+   * @name $location#protocol
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return protocol of current url.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var protocol = $location.protocol();
+   * // => "http"
+   * ```
+   *
+   * @return {string} protocol of current url
+   */
+  protocol: locationGetter('$$protocol'),
+
+  /**
+   * @ngdoc method
+   * @name $location#host
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return host of current url.
+   *
+   * Note: compared to the non-angular version `location.host` which returns `hostname:port`, this returns the `hostname` portion only.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var host = $location.host();
+   * // => "example.com"
+   *
+   * // given url http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo
+   * host = $location.host();
+   * // => "example.com"
+   * host = location.host;
+   * // => "example.com:8080"
+   * ```
+   *
+   * @return {string} host of current url.
+   */
+  host: locationGetter('$$host'),
+
+  /**
+   * @ngdoc method
+   * @name $location#port
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return port of current url.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var port = $location.port();
+   * // => 80
+   * ```
+   *
+   * @return {Number} port
+   */
+  port: locationGetter('$$port'),
+
+  /**
+   * @ngdoc method
+   * @name $location#path
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return path of current url when called without any parameter.
+   *
+   * Change path when called with parameter and return `$location`.
+   *
+   * Note: Path should always begin with forward slash (/), this method will add the forward slash
+   * if it is missing.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var path = $location.path();
+   * // => "/some/path"
+   * ```
+   *
+   * @param {(string|number)=} path New path
+   * @return {string} path
+   */
+  path: locationGetterSetter('$$path', function(path) {
+    path = path !== null ? path.toString() : '';
+    return path.charAt(0) == '/' ? path : '/' + path;
+  }),
+
+  /**
+   * @ngdoc method
+   * @name $location#search
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return search part (as object) of current url when called without any parameter.
+   *
+   * Change search part when called with parameter and return `$location`.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var searchObject = $location.search();
+   * // => {foo: 'bar', baz: 'xoxo'}
+   *
+   * // set foo to 'yipee'
+   * $location.search('foo', 'yipee');
+   * // $location.search() => {foo: 'yipee', baz: 'xoxo'}
+   * ```
+   *
+   * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
+   * hash object.
+   *
+   * When called with a single argument the method acts as a setter, setting the `search` component
+   * of `$location` to the specified value.
+   *
+   * If the argument is a hash object containing an array of values, these values will be encoded
+   * as duplicate search parameters in the url.
+   *
+   * @param {(string|Number|Array<string>|boolean)=} paramValue If `search` is a string or number, then `paramValue`
+   * will override only a single search property.
+   *
+   * If `paramValue` is an array, it will override the property of the `search` component of
+   * `$location` specified via the first argument.
+   *
+   * If `paramValue` is `null`, the property specified via the first argument will be deleted.
+   *
+   * If `paramValue` is `true`, the property specified via the first argument will be added with no
+   * value nor trailing equal sign.
+   *
+   * @return {Object} If called with no arguments returns the parsed `search` object. If called with
+   * one or more arguments returns `$location` object itself.
+   */
+  search: function(search, paramValue) {
+    switch (arguments.length) {
+      case 0:
+        return this.$$search;
+      case 1:
+        if (isString(search) || isNumber(search)) {
+          search = search.toString();
+          this.$$search = parseKeyValue(search);
+        } else if (isObject(search)) {
+          search = copy(search, {});
+          // remove object undefined or null properties
+          forEach(search, function(value, key) {
+            if (value == null) delete search[key];
+          });
+
+          this.$$search = search;
+        } else {
+          throw $locationMinErr('isrcharg',
+              'The first argument of the `$location#search()` call must be a string or an object.');
+        }
+        break;
+      default:
+        if (isUndefined(paramValue) || paramValue === null) {
+          delete this.$$search[search];
+        } else {
+          this.$$search[search] = paramValue;
+        }
+    }
+
+    this.$$compose();
+    return this;
+  },
+
+  /**
+   * @ngdoc method
+   * @name $location#hash
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return hash fragment when called without any parameter.
+   *
+   * Change hash fragment when called with parameter and return `$location`.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue
+   * var hash = $location.hash();
+   * // => "hashValue"
+   * ```
+   *
+   * @param {(string|number)=} hash New hash fragment
+   * @return {string} hash
+   */
+  hash: locationGetterSetter('$$hash', function(hash) {
+    return hash !== null ? hash.toString() : '';
+  }),
+
+  /**
+   * @ngdoc method
+   * @name $location#replace
+   *
+   * @description
+   * If called, all changes to $location during current `$digest` will be replacing current history
+   * record, instead of adding new one.
+   */
+  replace: function() {
+    this.$$replace = true;
+    return this;
+  }
+};
+
+forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) {
+  Location.prototype = Object.create(locationPrototype);
+
+  /**
+   * @ngdoc method
+   * @name $location#state
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return the history state object when called without any parameter.
+   *
+   * Change the history state object when called with one parameter and return `$location`.
+   * The state object is later passed to `pushState` or `replaceState`.
+   *
+   * NOTE: This method is supported only in HTML5 mode and only in browsers supporting
+   * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support
+   * older browsers (like IE9 or Android < 4.0), don't use this method.
+   *
+   * @param {object=} state State object for pushState or replaceState
+   * @return {object} state
+   */
+  Location.prototype.state = function(state) {
+    if (!arguments.length) {
+      return this.$$state;
+    }
+
+    if (Location !== LocationHtml5Url || !this.$$html5) {
+      throw $locationMinErr('nostate', 'History API state support is available only ' +
+        'in HTML5 mode and only in browsers supporting HTML5 History API');
+    }
+    // The user might modify `stateObject` after invoking `$location.state(stateObject)`
+    // but we're changing the $$state reference to $browser.state() during the $digest
+    // so the modification window is narrow.
+    this.$$state = isUndefined(state) ? null : state;
+
+    return this;
+  };
+});
+
+
+function locationGetter(property) {
+  return function() {
+    return this[property];
+  };
+}
+
+
+function locationGetterSetter(property, preprocess) {
+  return function(value) {
+    if (isUndefined(value)) {
+      return this[property];
+    }
+
+    this[property] = preprocess(value);
+    this.$$compose();
+
+    return this;
+  };
+}
+
+
+/**
+ * @ngdoc service
+ * @name $location
+ *
+ * @requires $rootElement
+ *
+ * @description
+ * The $location service parses the URL in the browser address bar (based on the
+ * [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL
+ * available to your application. Changes to the URL in the address bar are reflected into
+ * $location service and changes to $location are reflected into the browser address bar.
+ *
+ * **The $location service:**
+ *
+ * - Exposes the current URL in the browser address bar, so you can
+ *   - Watch and observe the URL.
+ *   - Change the URL.
+ * - Synchronizes the URL with the browser when the user
+ *   - Changes the address bar.
+ *   - Clicks the back or forward button (or clicks a History link).
+ *   - Clicks on a link.
+ * - Represents the URL object as a set of methods (protocol, host, port, path, search, hash).
+ *
+ * For more information see {@link guide/$location Developer Guide: Using $location}
+ */
+
+/**
+ * @ngdoc provider
+ * @name $locationProvider
+ * @description
+ * Use the `$locationProvider` to configure how the application deep linking paths are stored.
+ */
+function $LocationProvider() {
+  var hashPrefix = '',
+      html5Mode = {
+        enabled: false,
+        requireBase: true,
+        rewriteLinks: true
+      };
+
+  /**
+   * @ngdoc method
+   * @name $locationProvider#hashPrefix
+   * @description
+   * @param {string=} prefix Prefix for hash part (containing path and search)
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
+   */
+  this.hashPrefix = function(prefix) {
+    if (isDefined(prefix)) {
+      hashPrefix = prefix;
+      return this;
+    } else {
+      return hashPrefix;
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $locationProvider#html5Mode
+   * @description
+   * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value.
+   *   If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported
+   *   properties:
+   *   - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to
+   *     change urls where supported. Will fall back to hash-prefixed paths in browsers that do not
+   *     support `pushState`.
+   *   - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies
+   *     whether or not a <base> tag is required to be present. If `enabled` and `requireBase` are
+   *     true, and a base tag is not present, an error will be thrown when `$location` is injected.
+   *     See the {@link guide/$location $location guide for more information}
+   *   - **rewriteLinks** - `{boolean}` - (default: `true`) When html5Mode is enabled,
+   *     enables/disables url rewriting for relative links.
+   *
+   * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter
+   */
+  this.html5Mode = function(mode) {
+    if (isBoolean(mode)) {
+      html5Mode.enabled = mode;
+      return this;
+    } else if (isObject(mode)) {
+
+      if (isBoolean(mode.enabled)) {
+        html5Mode.enabled = mode.enabled;
+      }
+
+      if (isBoolean(mode.requireBase)) {
+        html5Mode.requireBase = mode.requireBase;
+      }
+
+      if (isBoolean(mode.rewriteLinks)) {
+        html5Mode.rewriteLinks = mode.rewriteLinks;
+      }
+
+      return this;
+    } else {
+      return html5Mode;
+    }
+  };
+
+  /**
+   * @ngdoc event
+   * @name $location#$locationChangeStart
+   * @eventType broadcast on root scope
+   * @description
+   * Broadcasted before a URL will change.
+   *
+   * This change can be prevented by calling
+   * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more
+   * details about event object. Upon successful change
+   * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired.
+   *
+   * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+   * the browser supports the HTML5 History API.
+   *
+   * @param {Object} angularEvent Synthetic event object.
+   * @param {string} newUrl New URL
+   * @param {string=} oldUrl URL that was before it was changed.
+   * @param {string=} newState New history state object
+   * @param {string=} oldState History state object that was before it was changed.
+   */
+
+  /**
+   * @ngdoc event
+   * @name $location#$locationChangeSuccess
+   * @eventType broadcast on root scope
+   * @description
+   * Broadcasted after a URL was changed.
+   *
+   * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+   * the browser supports the HTML5 History API.
+   *
+   * @param {Object} angularEvent Synthetic event object.
+   * @param {string} newUrl New URL
+   * @param {string=} oldUrl URL that was before it was changed.
+   * @param {string=} newState New history state object
+   * @param {string=} oldState History state object that was before it was changed.
+   */
+
+  this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window',
+      function($rootScope, $browser, $sniffer, $rootElement, $window) {
+    var $location,
+        LocationMode,
+        baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''
+        initialUrl = $browser.url(),
+        appBase;
+
+    if (html5Mode.enabled) {
+      if (!baseHref && html5Mode.requireBase) {
+        throw $locationMinErr('nobase',
+          "$location in HTML5 mode requires a <base> tag to be present!");
+      }
+      appBase = serverBase(initialUrl) + (baseHref || '/');
+      LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url;
+    } else {
+      appBase = stripHash(initialUrl);
+      LocationMode = LocationHashbangUrl;
+    }
+    $location = new LocationMode(appBase, '#' + hashPrefix);
+    $location.$$parseLinkUrl(initialUrl, initialUrl);
+
+    $location.$$state = $browser.state();
+
+    var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i;
+
+    function setBrowserUrlWithFallback(url, replace, state) {
+      var oldUrl = $location.url();
+      var oldState = $location.$$state;
+      try {
+        $browser.url(url, replace, state);
+
+        // Make sure $location.state() returns referentially identical (not just deeply equal)
+        // state object; this makes possible quick checking if the state changed in the digest
+        // loop. Checking deep equality would be too expensive.
+        $location.$$state = $browser.state();
+      } catch (e) {
+        // Restore old values if pushState fails
+        $location.url(oldUrl);
+        $location.$$state = oldState;
+
+        throw e;
+      }
+    }
+
+    $rootElement.on('click', function(event) {
+      // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser)
+      // currently we open nice url link and redirect then
+
+      if (!html5Mode.rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which == 2 || event.button == 2) return;
+
+      var elm = jqLite(event.target);
+
+      // traverse the DOM up to find first A tag
+      while (nodeName_(elm[0]) !== 'a') {
+        // ignore rewriting if no A tag (reached root element, or no parent - removed from document)
+        if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return;
+      }
+
+      var absHref = elm.prop('href');
+      // get the actual href attribute - see
+      // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
+      var relHref = elm.attr('href') || elm.attr('xlink:href');
+
+      if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') {
+        // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during
+        // an animation.
+        absHref = urlResolve(absHref.animVal).href;
+      }
+
+      // Ignore when url is started with javascript: or mailto:
+      if (IGNORE_URI_REGEXP.test(absHref)) return;
+
+      if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) {
+        if ($location.$$parseLinkUrl(absHref, relHref)) {
+          // We do a preventDefault for all urls that are part of the angular application,
+          // in html5mode and also without, so that we are able to abort navigation without
+          // getting double entries in the location history.
+          event.preventDefault();
+          // update location manually
+          if ($location.absUrl() != $browser.url()) {
+            $rootScope.$apply();
+            // hack to work around FF6 bug 684208 when scenario runner clicks on links
+            $window.angular['ff-684208-preventDefault'] = true;
+          }
+        }
+      }
+    });
+
+
+    // rewrite hashbang url <> html5 url
+    if (trimEmptyHash($location.absUrl()) != trimEmptyHash(initialUrl)) {
+      $browser.url($location.absUrl(), true);
+    }
+
+    var initializing = true;
+
+    // update $location when $browser url changes
+    $browser.onUrlChange(function(newUrl, newState) {
+      $rootScope.$evalAsync(function() {
+        var oldUrl = $location.absUrl();
+        var oldState = $location.$$state;
+        var defaultPrevented;
+
+        $location.$$parse(newUrl);
+        $location.$$state = newState;
+
+        defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+            newState, oldState).defaultPrevented;
+
+        // if the location was changed by a `$locationChangeStart` handler then stop
+        // processing this location change
+        if ($location.absUrl() !== newUrl) return;
+
+        if (defaultPrevented) {
+          $location.$$parse(oldUrl);
+          $location.$$state = oldState;
+          setBrowserUrlWithFallback(oldUrl, false, oldState);
+        } else {
+          initializing = false;
+          afterLocationChange(oldUrl, oldState);
+        }
+      });
+      if (!$rootScope.$$phase) $rootScope.$digest();
+    });
+
+    // update browser
+    $rootScope.$watch(function $locationWatch() {
+      var oldUrl = trimEmptyHash($browser.url());
+      var newUrl = trimEmptyHash($location.absUrl());
+      var oldState = $browser.state();
+      var currentReplace = $location.$$replace;
+      var urlOrStateChanged = oldUrl !== newUrl ||
+        ($location.$$html5 && $sniffer.history && oldState !== $location.$$state);
+
+      if (initializing || urlOrStateChanged) {
+        initializing = false;
+
+        $rootScope.$evalAsync(function() {
+          var newUrl = $location.absUrl();
+          var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+              $location.$$state, oldState).defaultPrevented;
+
+          // if the location was changed by a `$locationChangeStart` handler then stop
+          // processing this location change
+          if ($location.absUrl() !== newUrl) return;
+
+          if (defaultPrevented) {
+            $location.$$parse(oldUrl);
+            $location.$$state = oldState;
+          } else {
+            if (urlOrStateChanged) {
+              setBrowserUrlWithFallback(newUrl, currentReplace,
+                                        oldState === $location.$$state ? null : $location.$$state);
+            }
+            afterLocationChange(oldUrl, oldState);
+          }
+        });
+      }
+
+      $location.$$replace = false;
+
+      // we don't need to return anything because $evalAsync will make the digest loop dirty when
+      // there is a change
+    });
+
+    return $location;
+
+    function afterLocationChange(oldUrl, oldState) {
+      $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl,
+        $location.$$state, oldState);
+    }
+}];
+}
+
+/**
+ * @ngdoc service
+ * @name $log
+ * @requires $window
+ *
+ * @description
+ * Simple service for logging. Default implementation safely writes the message
+ * into the browser's console (if present).
+ *
+ * The main purpose of this service is to simplify debugging and troubleshooting.
+ *
+ * The default is to log `debug` messages. You can use
+ * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this.
+ *
+ * @example
+   <example module="logExample">
+     <file name="script.js">
+       angular.module('logExample', [])
+         .controller('LogController', ['$scope', '$log', function($scope, $log) {
+           $scope.$log = $log;
+           $scope.message = 'Hello World!';
+         }]);
+     </file>
+     <file name="index.html">
+       <div ng-controller="LogController">
+         <p>Reload this page with open console, enter text and hit the log button...</p>
+         <label>Message:
+         <input type="text" ng-model="message" /></label>
+         <button ng-click="$log.log(message)">log</button>
+         <button ng-click="$log.warn(message)">warn</button>
+         <button ng-click="$log.info(message)">info</button>
+         <button ng-click="$log.error(message)">error</button>
+         <button ng-click="$log.debug(message)">debug</button>
+       </div>
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc provider
+ * @name $logProvider
+ * @description
+ * Use the `$logProvider` to configure how the application logs messages
+ */
+function $LogProvider() {
+  var debug = true,
+      self = this;
+
+  /**
+   * @ngdoc method
+   * @name $logProvider#debugEnabled
+   * @description
+   * @param {boolean=} flag enable or disable debug level messages
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
+   */
+  this.debugEnabled = function(flag) {
+    if (isDefined(flag)) {
+      debug = flag;
+    return this;
+    } else {
+      return debug;
+    }
+  };
+
+  this.$get = ['$window', function($window) {
+    return {
+      /**
+       * @ngdoc method
+       * @name $log#log
+       *
+       * @description
+       * Write a log message
+       */
+      log: consoleLog('log'),
+
+      /**
+       * @ngdoc method
+       * @name $log#info
+       *
+       * @description
+       * Write an information message
+       */
+      info: consoleLog('info'),
+
+      /**
+       * @ngdoc method
+       * @name $log#warn
+       *
+       * @description
+       * Write a warning message
+       */
+      warn: consoleLog('warn'),
+
+      /**
+       * @ngdoc method
+       * @name $log#error
+       *
+       * @description
+       * Write an error message
+       */
+      error: consoleLog('error'),
+
+      /**
+       * @ngdoc method
+       * @name $log#debug
+       *
+       * @description
+       * Write a debug message
+       */
+      debug: (function() {
+        var fn = consoleLog('debug');
+
+        return function() {
+          if (debug) {
+            fn.apply(self, arguments);
+          }
+        };
+      }())
+    };
+
+    function formatError(arg) {
+      if (arg instanceof Error) {
+        if (arg.stack) {
+          arg = (arg.message && arg.stack.indexOf(arg.message) === -1)
+              ? 'Error: ' + arg.message + '\n' + arg.stack
+              : arg.stack;
+        } else if (arg.sourceURL) {
+          arg = arg.message + '\n' + arg.sourceURL + ':' + arg.line;
+        }
+      }
+      return arg;
+    }
+
+    function consoleLog(type) {
+      var console = $window.console || {},
+          logFn = console[type] || console.log || noop,
+          hasApply = false;
+
+      // Note: reading logFn.apply throws an error in IE11 in IE8 document mode.
+      // The reason behind this is that console.log has type "object" in IE8...
+      try {
+        hasApply = !!logFn.apply;
+      } catch (e) {}
+
+      if (hasApply) {
+        return function() {
+          var args = [];
+          forEach(arguments, function(arg) {
+            args.push(formatError(arg));
+          });
+          return logFn.apply(console, args);
+        };
+      }
+
+      // we are IE which either doesn't have window.console => this is noop and we do nothing,
+      // or we are IE where console.log doesn't have apply so we log at least first 2 args
+      return function(arg1, arg2) {
+        logFn(arg1, arg2 == null ? '' : arg2);
+      };
+    }
+  }];
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+var $parseMinErr = minErr('$parse');
+
+// Sandboxing Angular Expressions
+// ------------------------------
+// Angular expressions are generally considered safe because these expressions only have direct
+// access to `$scope` and locals. However, one can obtain the ability to execute arbitrary JS code by
+// obtaining a reference to native JS functions such as the Function constructor.
+//
+// As an example, consider the following Angular expression:
+//
+//   {}.toString.constructor('alert("evil JS code")')
+//
+// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits
+// against the expression language, but not to prevent exploits that were enabled by exposing
+// sensitive JavaScript or browser APIs on Scope. Exposing such objects on a Scope is never a good
+// practice and therefore we are not even trying to protect against interaction with an object
+// explicitly exposed in this way.
+//
+// In general, it is not possible to access a Window object from an angular expression unless a
+// window or some DOM object that has a reference to window is published onto a Scope.
+// Similarly we prevent invocations of function known to be dangerous, as well as assignments to
+// native objects.
+//
+// See https://docs.angularjs.org/guide/security
+
+
+function ensureSafeMemberName(name, fullExpression) {
+  if (name === "__defineGetter__" || name === "__defineSetter__"
+      || name === "__lookupGetter__" || name === "__lookupSetter__"
+      || name === "__proto__") {
+    throw $parseMinErr('isecfld',
+        'Attempting to access a disallowed field in Angular expressions! '
+        + 'Expression: {0}', fullExpression);
+  }
+  return name;
+}
+
+function ensureSafeObject(obj, fullExpression) {
+  // nifty check if obj is Function that is fast and works across iframes and other contexts
+  if (obj) {
+    if (obj.constructor === obj) {
+      throw $parseMinErr('isecfn',
+          'Referencing Function in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    } else if (// isWindow(obj)
+        obj.window === obj) {
+      throw $parseMinErr('isecwindow',
+          'Referencing the Window in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    } else if (// isElement(obj)
+        obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) {
+      throw $parseMinErr('isecdom',
+          'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    } else if (// block Object so that we can't get hold of dangerous Object.* methods
+        obj === Object) {
+      throw $parseMinErr('isecobj',
+          'Referencing Object in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    }
+  }
+  return obj;
+}
+
+var CALL = Function.prototype.call;
+var APPLY = Function.prototype.apply;
+var BIND = Function.prototype.bind;
+
+function ensureSafeFunction(obj, fullExpression) {
+  if (obj) {
+    if (obj.constructor === obj) {
+      throw $parseMinErr('isecfn',
+        'Referencing Function in Angular expressions is disallowed! Expression: {0}',
+        fullExpression);
+    } else if (obj === CALL || obj === APPLY || obj === BIND) {
+      throw $parseMinErr('isecff',
+        'Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}',
+        fullExpression);
+    }
+  }
+}
+
+var OPERATORS = createMap();
+forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
+var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
+
+
+/////////////////////////////////////////
+
+
+/**
+ * @constructor
+ */
+var Lexer = function(options) {
+  this.options = options;
+};
+
+Lexer.prototype = {
+  constructor: Lexer,
+
+  lex: function(text) {
+    this.text = text;
+    this.index = 0;
+    this.tokens = [];
+
+    while (this.index < this.text.length) {
+      var ch = this.text.charAt(this.index);
+      if (ch === '"' || ch === "'") {
+        this.readString(ch);
+      } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) {
+        this.readNumber();
+      } else if (this.isIdent(ch)) {
+        this.readIdent();
+      } else if (this.is(ch, '(){}[].,;:?')) {
+        this.tokens.push({index: this.index, text: ch});
+        this.index++;
+      } else if (this.isWhitespace(ch)) {
+        this.index++;
+      } else {
+        var ch2 = ch + this.peek();
+        var ch3 = ch2 + this.peek(2);
+        var op1 = OPERATORS[ch];
+        var op2 = OPERATORS[ch2];
+        var op3 = OPERATORS[ch3];
+        if (op1 || op2 || op3) {
+          var token = op3 ? ch3 : (op2 ? ch2 : ch);
+          this.tokens.push({index: this.index, text: token, operator: true});
+          this.index += token.length;
+        } else {
+          this.throwError('Unexpected next character ', this.index, this.index + 1);
+        }
+      }
+    }
+    return this.tokens;
+  },
+
+  is: function(ch, chars) {
+    return chars.indexOf(ch) !== -1;
+  },
+
+  peek: function(i) {
+    var num = i || 1;
+    return (this.index + num < this.text.length) ? this.text.charAt(this.index + num) : false;
+  },
+
+  isNumber: function(ch) {
+    return ('0' <= ch && ch <= '9') && typeof ch === "string";
+  },
+
+  isWhitespace: function(ch) {
+    // IE treats non-breaking space as \u00A0
+    return (ch === ' ' || ch === '\r' || ch === '\t' ||
+            ch === '\n' || ch === '\v' || ch === '\u00A0');
+  },
+
+  isIdent: function(ch) {
+    return ('a' <= ch && ch <= 'z' ||
+            'A' <= ch && ch <= 'Z' ||
+            '_' === ch || ch === '$');
+  },
+
+  isExpOperator: function(ch) {
+    return (ch === '-' || ch === '+' || this.isNumber(ch));
+  },
+
+  throwError: function(error, start, end) {
+    end = end || this.index;
+    var colStr = (isDefined(start)
+            ? 's ' + start +  '-' + this.index + ' [' + this.text.substring(start, end) + ']'
+            : ' ' + end);
+    throw $parseMinErr('lexerr', 'Lexer Error: {0} at column{1} in expression [{2}].',
+        error, colStr, this.text);
+  },
+
+  readNumber: function() {
+    var number = '';
+    var start = this.index;
+    while (this.index < this.text.length) {
+      var ch = lowercase(this.text.charAt(this.index));
+      if (ch == '.' || this.isNumber(ch)) {
+        number += ch;
+      } else {
+        var peekCh = this.peek();
+        if (ch == 'e' && this.isExpOperator(peekCh)) {
+          number += ch;
+        } else if (this.isExpOperator(ch) &&
+            peekCh && this.isNumber(peekCh) &&
+            number.charAt(number.length - 1) == 'e') {
+          number += ch;
+        } else if (this.isExpOperator(ch) &&
+            (!peekCh || !this.isNumber(peekCh)) &&
+            number.charAt(number.length - 1) == 'e') {
+          this.throwError('Invalid exponent');
+        } else {
+          break;
+        }
+      }
+      this.index++;
+    }
+    this.tokens.push({
+      index: start,
+      text: number,
+      constant: true,
+      value: Number(number)
+    });
+  },
+
+  readIdent: function() {
+    var start = this.index;
+    while (this.index < this.text.length) {
+      var ch = this.text.charAt(this.index);
+      if (!(this.isIdent(ch) || this.isNumber(ch))) {
+        break;
+      }
+      this.index++;
+    }
+    this.tokens.push({
+      index: start,
+      text: this.text.slice(start, this.index),
+      identifier: true
+    });
+  },
+
+  readString: function(quote) {
+    var start = this.index;
+    this.index++;
+    var string = '';
+    var rawString = quote;
+    var escape = false;
+    while (this.index < this.text.length) {
+      var ch = this.text.charAt(this.index);
+      rawString += ch;
+      if (escape) {
+        if (ch === 'u') {
+          var hex = this.text.substring(this.index + 1, this.index + 5);
+          if (!hex.match(/[\da-f]{4}/i)) {
+            this.throwError('Invalid unicode escape [\\u' + hex + ']');
+          }
+          this.index += 4;
+          string += String.fromCharCode(parseInt(hex, 16));
+        } else {
+          var rep = ESCAPE[ch];
+          string = string + (rep || ch);
+        }
+        escape = false;
+      } else if (ch === '\\') {
+        escape = true;
+      } else if (ch === quote) {
+        this.index++;
+        this.tokens.push({
+          index: start,
+          text: rawString,
+          constant: true,
+          value: string
+        });
+        return;
+      } else {
+        string += ch;
+      }
+      this.index++;
+    }
+    this.throwError('Unterminated quote', start);
+  }
+};
+
+var AST = function(lexer, options) {
+  this.lexer = lexer;
+  this.options = options;
+};
+
+AST.Program = 'Program';
+AST.ExpressionStatement = 'ExpressionStatement';
+AST.AssignmentExpression = 'AssignmentExpression';
+AST.ConditionalExpression = 'ConditionalExpression';
+AST.LogicalExpression = 'LogicalExpression';
+AST.BinaryExpression = 'BinaryExpression';
+AST.UnaryExpression = 'UnaryExpression';
+AST.CallExpression = 'CallExpression';
+AST.MemberExpression = 'MemberExpression';
+AST.Identifier = 'Identifier';
+AST.Literal = 'Literal';
+AST.ArrayExpression = 'ArrayExpression';
+AST.Property = 'Property';
+AST.ObjectExpression = 'ObjectExpression';
+AST.ThisExpression = 'ThisExpression';
+
+// Internal use only
+AST.NGValueParameter = 'NGValueParameter';
+
+AST.prototype = {
+  ast: function(text) {
+    this.text = text;
+    this.tokens = this.lexer.lex(text);
+
+    var value = this.program();
+
+    if (this.tokens.length !== 0) {
+      this.throwError('is an unexpected token', this.tokens[0]);
+    }
+
+    return value;
+  },
+
+  program: function() {
+    var body = [];
+    while (true) {
+      if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
+        body.push(this.expressionStatement());
+      if (!this.expect(';')) {
+        return { type: AST.Program, body: body};
+      }
+    }
+  },
+
+  expressionStatement: function() {
+    return { type: AST.ExpressionStatement, expression: this.filterChain() };
+  },
+
+  filterChain: function() {
+    var left = this.expression();
+    var token;
+    while ((token = this.expect('|'))) {
+      left = this.filter(left);
+    }
+    return left;
+  },
+
+  expression: function() {
+    return this.assignment();
+  },
+
+  assignment: function() {
+    var result = this.ternary();
+    if (this.expect('=')) {
+      result = { type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='};
+    }
+    return result;
+  },
+
+  ternary: function() {
+    var test = this.logicalOR();
+    var alternate;
+    var consequent;
+    if (this.expect('?')) {
+      alternate = this.expression();
+      if (this.consume(':')) {
+        consequent = this.expression();
+        return { type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent};
+      }
+    }
+    return test;
+  },
+
+  logicalOR: function() {
+    var left = this.logicalAND();
+    while (this.expect('||')) {
+      left = { type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND() };
+    }
+    return left;
+  },
+
+  logicalAND: function() {
+    var left = this.equality();
+    while (this.expect('&&')) {
+      left = { type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()};
+    }
+    return left;
+  },
+
+  equality: function() {
+    var left = this.relational();
+    var token;
+    while ((token = this.expect('==','!=','===','!=='))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational() };
+    }
+    return left;
+  },
+
+  relational: function() {
+    var left = this.additive();
+    var token;
+    while ((token = this.expect('<', '>', '<=', '>='))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive() };
+    }
+    return left;
+  },
+
+  additive: function() {
+    var left = this.multiplicative();
+    var token;
+    while ((token = this.expect('+','-'))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative() };
+    }
+    return left;
+  },
+
+  multiplicative: function() {
+    var left = this.unary();
+    var token;
+    while ((token = this.expect('*','/','%'))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary() };
+    }
+    return left;
+  },
+
+  unary: function() {
+    var token;
+    if ((token = this.expect('+', '-', '!'))) {
+      return { type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary() };
+    } else {
+      return this.primary();
+    }
+  },
+
+  primary: function() {
+    var primary;
+    if (this.expect('(')) {
+      primary = this.filterChain();
+      this.consume(')');
+    } else if (this.expect('[')) {
+      primary = this.arrayDeclaration();
+    } else if (this.expect('{')) {
+      primary = this.object();
+    } else if (this.constants.hasOwnProperty(this.peek().text)) {
+      primary = copy(this.constants[this.consume().text]);
+    } else if (this.peek().identifier) {
+      primary = this.identifier();
+    } else if (this.peek().constant) {
+      primary = this.constant();
+    } else {
+      this.throwError('not a primary expression', this.peek());
+    }
+
+    var next;
+    while ((next = this.expect('(', '[', '.'))) {
+      if (next.text === '(') {
+        primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments() };
+        this.consume(')');
+      } else if (next.text === '[') {
+        primary = { type: AST.MemberExpression, object: primary, property: this.expression(), computed: true };
+        this.consume(']');
+      } else if (next.text === '.') {
+        primary = { type: AST.MemberExpression, object: primary, property: this.identifier(), computed: false };
+      } else {
+        this.throwError('IMPOSSIBLE');
+      }
+    }
+    return primary;
+  },
+
+  filter: function(baseExpression) {
+    var args = [baseExpression];
+    var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true};
+
+    while (this.expect(':')) {
+      args.push(this.expression());
+    }
+
+    return result;
+  },
+
+  parseArguments: function() {
+    var args = [];
+    if (this.peekToken().text !== ')') {
+      do {
+        args.push(this.expression());
+      } while (this.expect(','));
+    }
+    return args;
+  },
+
+  identifier: function() {
+    var token = this.consume();
+    if (!token.identifier) {
+      this.throwError('is not a valid identifier', token);
+    }
+    return { type: AST.Identifier, name: token.text };
+  },
+
+  constant: function() {
+    // TODO check that it is a constant
+    return { type: AST.Literal, value: this.consume().value };
+  },
+
+  arrayDeclaration: function() {
+    var elements = [];
+    if (this.peekToken().text !== ']') {
+      do {
+        if (this.peek(']')) {
+          // Support trailing commas per ES5.1.
+          break;
+        }
+        elements.push(this.expression());
+      } while (this.expect(','));
+    }
+    this.consume(']');
+
+    return { type: AST.ArrayExpression, elements: elements };
+  },
+
+  object: function() {
+    var properties = [], property;
+    if (this.peekToken().text !== '}') {
+      do {
+        if (this.peek('}')) {
+          // Support trailing commas per ES5.1.
+          break;
+        }
+        property = {type: AST.Property, kind: 'init'};
+        if (this.peek().constant) {
+          property.key = this.constant();
+        } else if (this.peek().identifier) {
+          property.key = this.identifier();
+        } else {
+          this.throwError("invalid key", this.peek());
+        }
+        this.consume(':');
+        property.value = this.expression();
+        properties.push(property);
+      } while (this.expect(','));
+    }
+    this.consume('}');
+
+    return {type: AST.ObjectExpression, properties: properties };
+  },
+
+  throwError: function(msg, token) {
+    throw $parseMinErr('syntax',
+        'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
+          token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
+  },
+
+  consume: function(e1) {
+    if (this.tokens.length === 0) {
+      throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+    }
+
+    var token = this.expect(e1);
+    if (!token) {
+      this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
+    }
+    return token;
+  },
+
+  peekToken: function() {
+    if (this.tokens.length === 0) {
+      throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+    }
+    return this.tokens[0];
+  },
+
+  peek: function(e1, e2, e3, e4) {
+    return this.peekAhead(0, e1, e2, e3, e4);
+  },
+
+  peekAhead: function(i, e1, e2, e3, e4) {
+    if (this.tokens.length > i) {
+      var token = this.tokens[i];
+      var t = token.text;
+      if (t === e1 || t === e2 || t === e3 || t === e4 ||
+          (!e1 && !e2 && !e3 && !e4)) {
+        return token;
+      }
+    }
+    return false;
+  },
+
+  expect: function(e1, e2, e3, e4) {
+    var token = this.peek(e1, e2, e3, e4);
+    if (token) {
+      this.tokens.shift();
+      return token;
+    }
+    return false;
+  },
+
+
+  /* `undefined` is not a constant, it is an identifier,
+   * but using it as an identifier is not supported
+   */
+  constants: {
+    'true': { type: AST.Literal, value: true },
+    'false': { type: AST.Literal, value: false },
+    'null': { type: AST.Literal, value: null },
+    'undefined': {type: AST.Literal, value: undefined },
+    'this': {type: AST.ThisExpression }
+  }
+};
+
+function ifDefined(v, d) {
+  return typeof v !== 'undefined' ? v : d;
+}
+
+function plusFn(l, r) {
+  if (typeof l === 'undefined') return r;
+  if (typeof r === 'undefined') return l;
+  return l + r;
+}
+
+function isStateless($filter, filterName) {
+  var fn = $filter(filterName);
+  return !fn.$stateful;
+}
+
+function findConstantAndWatchExpressions(ast, $filter) {
+  var allConstants;
+  var argsToWatch;
+  switch (ast.type) {
+  case AST.Program:
+    allConstants = true;
+    forEach(ast.body, function(expr) {
+      findConstantAndWatchExpressions(expr.expression, $filter);
+      allConstants = allConstants && expr.expression.constant;
+    });
+    ast.constant = allConstants;
+    break;
+  case AST.Literal:
+    ast.constant = true;
+    ast.toWatch = [];
+    break;
+  case AST.UnaryExpression:
+    findConstantAndWatchExpressions(ast.argument, $filter);
+    ast.constant = ast.argument.constant;
+    ast.toWatch = ast.argument.toWatch;
+    break;
+  case AST.BinaryExpression:
+    findConstantAndWatchExpressions(ast.left, $filter);
+    findConstantAndWatchExpressions(ast.right, $filter);
+    ast.constant = ast.left.constant && ast.right.constant;
+    ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch);
+    break;
+  case AST.LogicalExpression:
+    findConstantAndWatchExpressions(ast.left, $filter);
+    findConstantAndWatchExpressions(ast.right, $filter);
+    ast.constant = ast.left.constant && ast.right.constant;
+    ast.toWatch = ast.constant ? [] : [ast];
+    break;
+  case AST.ConditionalExpression:
+    findConstantAndWatchExpressions(ast.test, $filter);
+    findConstantAndWatchExpressions(ast.alternate, $filter);
+    findConstantAndWatchExpressions(ast.consequent, $filter);
+    ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant;
+    ast.toWatch = ast.constant ? [] : [ast];
+    break;
+  case AST.Identifier:
+    ast.constant = false;
+    ast.toWatch = [ast];
+    break;
+  case AST.MemberExpression:
+    findConstantAndWatchExpressions(ast.object, $filter);
+    if (ast.computed) {
+      findConstantAndWatchExpressions(ast.property, $filter);
+    }
+    ast.constant = ast.object.constant && (!ast.computed || ast.property.constant);
+    ast.toWatch = [ast];
+    break;
+  case AST.CallExpression:
+    allConstants = ast.filter ? isStateless($filter, ast.callee.name) : false;
+    argsToWatch = [];
+    forEach(ast.arguments, function(expr) {
+      findConstantAndWatchExpressions(expr, $filter);
+      allConstants = allConstants && expr.constant;
+      if (!expr.constant) {
+        argsToWatch.push.apply(argsToWatch, expr.toWatch);
+      }
+    });
+    ast.constant = allConstants;
+    ast.toWatch = ast.filter && isStateless($filter, ast.callee.name) ? argsToWatch : [ast];
+    break;
+  case AST.AssignmentExpression:
+    findConstantAndWatchExpressions(ast.left, $filter);
+    findConstantAndWatchExpressions(ast.right, $filter);
+    ast.constant = ast.left.constant && ast.right.constant;
+    ast.toWatch = [ast];
+    break;
+  case AST.ArrayExpression:
+    allConstants = true;
+    argsToWatch = [];
+    forEach(ast.elements, function(expr) {
+      findConstantAndWatchExpressions(expr, $filter);
+      allConstants = allConstants && expr.constant;
+      if (!expr.constant) {
+        argsToWatch.push.apply(argsToWatch, expr.toWatch);
+      }
+    });
+    ast.constant = allConstants;
+    ast.toWatch = argsToWatch;
+    break;
+  case AST.ObjectExpression:
+    allConstants = true;
+    argsToWatch = [];
+    forEach(ast.properties, function(property) {
+      findConstantAndWatchExpressions(property.value, $filter);
+      allConstants = allConstants && property.value.constant;
+      if (!property.value.constant) {
+        argsToWatch.push.apply(argsToWatch, property.value.toWatch);
+      }
+    });
+    ast.constant = allConstants;
+    ast.toWatch = argsToWatch;
+    break;
+  case AST.ThisExpression:
+    ast.constant = false;
+    ast.toWatch = [];
+    break;
+  }
+}
+
+function getInputs(body) {
+  if (body.length != 1) return;
+  var lastExpression = body[0].expression;
+  var candidate = lastExpression.toWatch;
+  if (candidate.length !== 1) return candidate;
+  return candidate[0] !== lastExpression ? candidate : undefined;
+}
+
+function isAssignable(ast) {
+  return ast.type === AST.Identifier || ast.type === AST.MemberExpression;
+}
+
+function assignableAST(ast) {
+  if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) {
+    return {type: AST.AssignmentExpression, left: ast.body[0].expression, right: {type: AST.NGValueParameter}, operator: '='};
+  }
+}
+
+function isLiteral(ast) {
+  return ast.body.length === 0 ||
+      ast.body.length === 1 && (
+      ast.body[0].expression.type === AST.Literal ||
+      ast.body[0].expression.type === AST.ArrayExpression ||
+      ast.body[0].expression.type === AST.ObjectExpression);
+}
+
+function isConstant(ast) {
+  return ast.constant;
+}
+
+function ASTCompiler(astBuilder, $filter) {
+  this.astBuilder = astBuilder;
+  this.$filter = $filter;
+}
+
+ASTCompiler.prototype = {
+  compile: function(expression, expensiveChecks) {
+    var self = this;
+    var ast = this.astBuilder.ast(expression);
+    this.state = {
+      nextId: 0,
+      filters: {},
+      expensiveChecks: expensiveChecks,
+      fn: {vars: [], body: [], own: {}},
+      assign: {vars: [], body: [], own: {}},
+      inputs: []
+    };
+    findConstantAndWatchExpressions(ast, self.$filter);
+    var extra = '';
+    var assignable;
+    this.stage = 'assign';
+    if ((assignable = assignableAST(ast))) {
+      this.state.computing = 'assign';
+      var result = this.nextId();
+      this.recurse(assignable, result);
+      extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l');
+    }
+    var toWatch = getInputs(ast.body);
+    self.stage = 'inputs';
+    forEach(toWatch, function(watch, key) {
+      var fnKey = 'fn' + key;
+      self.state[fnKey] = {vars: [], body: [], own: {}};
+      self.state.computing = fnKey;
+      var intoId = self.nextId();
+      self.recurse(watch, intoId);
+      self.return_(intoId);
+      self.state.inputs.push(fnKey);
+      watch.watchId = key;
+    });
+    this.state.computing = 'fn';
+    this.stage = 'main';
+    this.recurse(ast);
+    var fnString =
+      // The build and minification steps remove the string "use strict" from the code, but this is done using a regex.
+      // This is a workaround for this until we do a better job at only removing the prefix only when we should.
+      '"' + this.USE + ' ' + this.STRICT + '";\n' +
+      this.filterPrefix() +
+      'var fn=' + this.generateFunction('fn', 's,l,a,i') +
+      extra +
+      this.watchFns() +
+      'return fn;';
+
+    /* jshint -W054 */
+    var fn = (new Function('$filter',
+        'ensureSafeMemberName',
+        'ensureSafeObject',
+        'ensureSafeFunction',
+        'ifDefined',
+        'plus',
+        'text',
+        fnString))(
+          this.$filter,
+          ensureSafeMemberName,
+          ensureSafeObject,
+          ensureSafeFunction,
+          ifDefined,
+          plusFn,
+          expression);
+    /* jshint +W054 */
+    this.state = this.stage = undefined;
+    fn.literal = isLiteral(ast);
+    fn.constant = isConstant(ast);
+    return fn;
+  },
+
+  USE: 'use',
+
+  STRICT: 'strict',
+
+  watchFns: function() {
+    var result = [];
+    var fns = this.state.inputs;
+    var self = this;
+    forEach(fns, function(name) {
+      result.push('var ' + name + '=' + self.generateFunction(name, 's'));
+    });
+    if (fns.length) {
+      result.push('fn.inputs=[' + fns.join(',') + '];');
+    }
+    return result.join('');
+  },
+
+  generateFunction: function(name, params) {
+    return 'function(' + params + '){' +
+        this.varsPrefix(name) +
+        this.body(name) +
+        '};';
+  },
+
+  filterPrefix: function() {
+    var parts = [];
+    var self = this;
+    forEach(this.state.filters, function(id, filter) {
+      parts.push(id + '=$filter(' + self.escape(filter) + ')');
+    });
+    if (parts.length) return 'var ' + parts.join(',') + ';';
+    return '';
+  },
+
+  varsPrefix: function(section) {
+    return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : '';
+  },
+
+  body: function(section) {
+    return this.state[section].body.join('');
+  },
+
+  recurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+    var left, right, self = this, args, expression;
+    recursionFn = recursionFn || noop;
+    if (!skipWatchIdCheck && isDefined(ast.watchId)) {
+      intoId = intoId || this.nextId();
+      this.if_('i',
+        this.lazyAssign(intoId, this.computedMember('i', ast.watchId)),
+        this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true)
+      );
+      return;
+    }
+    switch (ast.type) {
+    case AST.Program:
+      forEach(ast.body, function(expression, pos) {
+        self.recurse(expression.expression, undefined, undefined, function(expr) { right = expr; });
+        if (pos !== ast.body.length - 1) {
+          self.current().body.push(right, ';');
+        } else {
+          self.return_(right);
+        }
+      });
+      break;
+    case AST.Literal:
+      expression = this.escape(ast.value);
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.UnaryExpression:
+      this.recurse(ast.argument, undefined, undefined, function(expr) { right = expr; });
+      expression = ast.operator + '(' + this.ifDefined(right, 0) + ')';
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.BinaryExpression:
+      this.recurse(ast.left, undefined, undefined, function(expr) { left = expr; });
+      this.recurse(ast.right, undefined, undefined, function(expr) { right = expr; });
+      if (ast.operator === '+') {
+        expression = this.plus(left, right);
+      } else if (ast.operator === '-') {
+        expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0);
+      } else {
+        expression = '(' + left + ')' + ast.operator + '(' + right + ')';
+      }
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.LogicalExpression:
+      intoId = intoId || this.nextId();
+      self.recurse(ast.left, intoId);
+      self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
+      recursionFn(intoId);
+      break;
+    case AST.ConditionalExpression:
+      intoId = intoId || this.nextId();
+      self.recurse(ast.test, intoId);
+      self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
+      recursionFn(intoId);
+      break;
+    case AST.Identifier:
+      intoId = intoId || this.nextId();
+      if (nameId) {
+        nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s');
+        nameId.computed = false;
+        nameId.name = ast.name;
+      }
+      ensureSafeMemberName(ast.name);
+      self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
+        function() {
+          self.if_(self.stage === 'inputs' || 's', function() {
+            if (create && create !== 1) {
+              self.if_(
+                self.not(self.nonComputedMember('s', ast.name)),
+                self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
+            }
+            self.assign(intoId, self.nonComputedMember('s', ast.name));
+          });
+        }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name))
+        );
+      if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.name)) {
+        self.addEnsureSafeObject(intoId);
+      }
+      recursionFn(intoId);
+      break;
+    case AST.MemberExpression:
+      left = nameId && (nameId.context = this.nextId()) || this.nextId();
+      intoId = intoId || this.nextId();
+      self.recurse(ast.object, left, undefined, function() {
+        self.if_(self.notNull(left), function() {
+          if (ast.computed) {
+            right = self.nextId();
+            self.recurse(ast.property, right);
+            self.addEnsureSafeMemberName(right);
+            if (create && create !== 1) {
+              self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
+            }
+            expression = self.ensureSafeObject(self.computedMember(left, right));
+            self.assign(intoId, expression);
+            if (nameId) {
+              nameId.computed = true;
+              nameId.name = right;
+            }
+          } else {
+            ensureSafeMemberName(ast.property.name);
+            if (create && create !== 1) {
+              self.if_(self.not(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
+            }
+            expression = self.nonComputedMember(left, ast.property.name);
+            if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.property.name)) {
+              expression = self.ensureSafeObject(expression);
+            }
+            self.assign(intoId, expression);
+            if (nameId) {
+              nameId.computed = false;
+              nameId.name = ast.property.name;
+            }
+          }
+          recursionFn(intoId);
+        });
+      }, !!create);
+      break;
+    case AST.CallExpression:
+      intoId = intoId || this.nextId();
+      if (ast.filter) {
+        right = self.filter(ast.callee.name);
+        args = [];
+        forEach(ast.arguments, function(expr) {
+          var argument = self.nextId();
+          self.recurse(expr, argument);
+          args.push(argument);
+        });
+        expression = right + '(' + args.join(',') + ')';
+        self.assign(intoId, expression);
+        recursionFn(intoId);
+      } else {
+        right = self.nextId();
+        left = {};
+        args = [];
+        self.recurse(ast.callee, right, left, function() {
+          self.if_(self.notNull(right), function() {
+            self.addEnsureSafeFunction(right);
+            forEach(ast.arguments, function(expr) {
+              self.recurse(expr, self.nextId(), undefined, function(argument) {
+                args.push(self.ensureSafeObject(argument));
+              });
+            });
+            if (left.name) {
+              if (!self.state.expensiveChecks) {
+                self.addEnsureSafeObject(left.context);
+              }
+              expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')';
+            } else {
+              expression = right + '(' + args.join(',') + ')';
+            }
+            expression = self.ensureSafeObject(expression);
+            self.assign(intoId, expression);
+            recursionFn(intoId);
+          });
+        });
+      }
+      break;
+    case AST.AssignmentExpression:
+      right = this.nextId();
+      left = {};
+      if (!isAssignable(ast.left)) {
+        throw $parseMinErr('lval', 'Trying to assing a value to a non l-value');
+      }
+      this.recurse(ast.left, undefined, left, function() {
+        self.if_(self.notNull(left.context), function() {
+          self.recurse(ast.right, right);
+          self.addEnsureSafeObject(self.member(left.context, left.name, left.computed));
+          expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
+          self.assign(intoId, expression);
+          recursionFn(intoId || expression);
+        });
+      }, 1);
+      break;
+    case AST.ArrayExpression:
+      args = [];
+      forEach(ast.elements, function(expr) {
+        self.recurse(expr, self.nextId(), undefined, function(argument) {
+          args.push(argument);
+        });
+      });
+      expression = '[' + args.join(',') + ']';
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.ObjectExpression:
+      args = [];
+      forEach(ast.properties, function(property) {
+        self.recurse(property.value, self.nextId(), undefined, function(expr) {
+          args.push(self.escape(
+              property.key.type === AST.Identifier ? property.key.name :
+                ('' + property.key.value)) +
+              ':' + expr);
+        });
+      });
+      expression = '{' + args.join(',') + '}';
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.ThisExpression:
+      this.assign(intoId, 's');
+      recursionFn('s');
+      break;
+    case AST.NGValueParameter:
+      this.assign(intoId, 'v');
+      recursionFn('v');
+      break;
+    }
+  },
+
+  getHasOwnProperty: function(element, property) {
+    var key = element + '.' + property;
+    var own = this.current().own;
+    if (!own.hasOwnProperty(key)) {
+      own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')');
+    }
+    return own[key];
+  },
+
+  assign: function(id, value) {
+    if (!id) return;
+    this.current().body.push(id, '=', value, ';');
+    return id;
+  },
+
+  filter: function(filterName) {
+    if (!this.state.filters.hasOwnProperty(filterName)) {
+      this.state.filters[filterName] = this.nextId(true);
+    }
+    return this.state.filters[filterName];
+  },
+
+  ifDefined: function(id, defaultValue) {
+    return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')';
+  },
+
+  plus: function(left, right) {
+    return 'plus(' + left + ',' + right + ')';
+  },
+
+  return_: function(id) {
+    this.current().body.push('return ', id, ';');
+  },
+
+  if_: function(test, alternate, consequent) {
+    if (test === true) {
+      alternate();
+    } else {
+      var body = this.current().body;
+      body.push('if(', test, '){');
+      alternate();
+      body.push('}');
+      if (consequent) {
+        body.push('else{');
+        consequent();
+        body.push('}');
+      }
+    }
+  },
+
+  not: function(expression) {
+    return '!(' + expression + ')';
+  },
+
+  notNull: function(expression) {
+    return expression + '!=null';
+  },
+
+  nonComputedMember: function(left, right) {
+    return left + '.' + right;
+  },
+
+  computedMember: function(left, right) {
+    return left + '[' + right + ']';
+  },
+
+  member: function(left, right, computed) {
+    if (computed) return this.computedMember(left, right);
+    return this.nonComputedMember(left, right);
+  },
+
+  addEnsureSafeObject: function(item) {
+    this.current().body.push(this.ensureSafeObject(item), ';');
+  },
+
+  addEnsureSafeMemberName: function(item) {
+    this.current().body.push(this.ensureSafeMemberName(item), ';');
+  },
+
+  addEnsureSafeFunction: function(item) {
+    this.current().body.push(this.ensureSafeFunction(item), ';');
+  },
+
+  ensureSafeObject: function(item) {
+    return 'ensureSafeObject(' + item + ',text)';
+  },
+
+  ensureSafeMemberName: function(item) {
+    return 'ensureSafeMemberName(' + item + ',text)';
+  },
+
+  ensureSafeFunction: function(item) {
+    return 'ensureSafeFunction(' + item + ',text)';
+  },
+
+  lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+    var self = this;
+    return function() {
+      self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck);
+    };
+  },
+
+  lazyAssign: function(id, value) {
+    var self = this;
+    return function() {
+      self.assign(id, value);
+    };
+  },
+
+  stringEscapeRegex: /[^ a-zA-Z0-9]/g,
+
+  stringEscapeFn: function(c) {
+    return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
+  },
+
+  escape: function(value) {
+    if (isString(value)) return "'" + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + "'";
+    if (isNumber(value)) return value.toString();
+    if (value === true) return 'true';
+    if (value === false) return 'false';
+    if (value === null) return 'null';
+    if (typeof value === 'undefined') return 'undefined';
+
+    throw $parseMinErr('esc', 'IMPOSSIBLE');
+  },
+
+  nextId: function(skip, init) {
+    var id = 'v' + (this.state.nextId++);
+    if (!skip) {
+      this.current().vars.push(id + (init ? '=' + init : ''));
+    }
+    return id;
+  },
+
+  current: function() {
+    return this.state[this.state.computing];
+  }
+};
+
+
+function ASTInterpreter(astBuilder, $filter) {
+  this.astBuilder = astBuilder;
+  this.$filter = $filter;
+}
+
+ASTInterpreter.prototype = {
+  compile: function(expression, expensiveChecks) {
+    var self = this;
+    var ast = this.astBuilder.ast(expression);
+    this.expression = expression;
+    this.expensiveChecks = expensiveChecks;
+    findConstantAndWatchExpressions(ast, self.$filter);
+    var assignable;
+    var assign;
+    if ((assignable = assignableAST(ast))) {
+      assign = this.recurse(assignable);
+    }
+    var toWatch = getInputs(ast.body);
+    var inputs;
+    if (toWatch) {
+      inputs = [];
+      forEach(toWatch, function(watch, key) {
+        var input = self.recurse(watch);
+        watch.input = input;
+        inputs.push(input);
+        watch.watchId = key;
+      });
+    }
+    var expressions = [];
+    forEach(ast.body, function(expression) {
+      expressions.push(self.recurse(expression.expression));
+    });
+    var fn = ast.body.length === 0 ? function() {} :
+             ast.body.length === 1 ? expressions[0] :
+             function(scope, locals) {
+               var lastValue;
+               forEach(expressions, function(exp) {
+                 lastValue = exp(scope, locals);
+               });
+               return lastValue;
+             };
+    if (assign) {
+      fn.assign = function(scope, value, locals) {
+        return assign(scope, locals, value);
+      };
+    }
+    if (inputs) {
+      fn.inputs = inputs;
+    }
+    fn.literal = isLiteral(ast);
+    fn.constant = isConstant(ast);
+    return fn;
+  },
+
+  recurse: function(ast, context, create) {
+    var left, right, self = this, args, expression;
+    if (ast.input) {
+      return this.inputs(ast.input, ast.watchId);
+    }
+    switch (ast.type) {
+    case AST.Literal:
+      return this.value(ast.value, context);
+    case AST.UnaryExpression:
+      right = this.recurse(ast.argument);
+      return this['unary' + ast.operator](right, context);
+    case AST.BinaryExpression:
+      left = this.recurse(ast.left);
+      right = this.recurse(ast.right);
+      return this['binary' + ast.operator](left, right, context);
+    case AST.LogicalExpression:
+      left = this.recurse(ast.left);
+      right = this.recurse(ast.right);
+      return this['binary' + ast.operator](left, right, context);
+    case AST.ConditionalExpression:
+      return this['ternary?:'](
+        this.recurse(ast.test),
+        this.recurse(ast.alternate),
+        this.recurse(ast.consequent),
+        context
+      );
+    case AST.Identifier:
+      ensureSafeMemberName(ast.name, self.expression);
+      return self.identifier(ast.name,
+                             self.expensiveChecks || isPossiblyDangerousMemberName(ast.name),
+                             context, create, self.expression);
+    case AST.MemberExpression:
+      left = this.recurse(ast.object, false, !!create);
+      if (!ast.computed) {
+        ensureSafeMemberName(ast.property.name, self.expression);
+        right = ast.property.name;
+      }
+      if (ast.computed) right = this.recurse(ast.property);
+      return ast.computed ?
+        this.computedMember(left, right, context, create, self.expression) :
+        this.nonComputedMember(left, right, self.expensiveChecks, context, create, self.expression);
+    case AST.CallExpression:
+      args = [];
+      forEach(ast.arguments, function(expr) {
+        args.push(self.recurse(expr));
+      });
+      if (ast.filter) right = this.$filter(ast.callee.name);
+      if (!ast.filter) right = this.recurse(ast.callee, true);
+      return ast.filter ?
+        function(scope, locals, assign, inputs) {
+          var values = [];
+          for (var i = 0; i < args.length; ++i) {
+            values.push(args[i](scope, locals, assign, inputs));
+          }
+          var value = right.apply(undefined, values, inputs);
+          return context ? {context: undefined, name: undefined, value: value} : value;
+        } :
+        function(scope, locals, assign, inputs) {
+          var rhs = right(scope, locals, assign, inputs);
+          var value;
+          if (rhs.value != null) {
+            ensureSafeObject(rhs.context, self.expression);
+            ensureSafeFunction(rhs.value, self.expression);
+            var values = [];
+            for (var i = 0; i < args.length; ++i) {
+              values.push(ensureSafeObject(args[i](scope, locals, assign, inputs), self.expression));
+            }
+            value = ensureSafeObject(rhs.value.apply(rhs.context, values), self.expression);
+          }
+          return context ? {value: value} : value;
+        };
+    case AST.AssignmentExpression:
+      left = this.recurse(ast.left, true, 1);
+      right = this.recurse(ast.right);
+      return function(scope, locals, assign, inputs) {
+        var lhs = left(scope, locals, assign, inputs);
+        var rhs = right(scope, locals, assign, inputs);
+        ensureSafeObject(lhs.value, self.expression);
+        lhs.context[lhs.name] = rhs;
+        return context ? {value: rhs} : rhs;
+      };
+    case AST.ArrayExpression:
+      args = [];
+      forEach(ast.elements, function(expr) {
+        args.push(self.recurse(expr));
+      });
+      return function(scope, locals, assign, inputs) {
+        var value = [];
+        for (var i = 0; i < args.length; ++i) {
+          value.push(args[i](scope, locals, assign, inputs));
+        }
+        return context ? {value: value} : value;
+      };
+    case AST.ObjectExpression:
+      args = [];
+      forEach(ast.properties, function(property) {
+        args.push({key: property.key.type === AST.Identifier ?
+                        property.key.name :
+                        ('' + property.key.value),
+                   value: self.recurse(property.value)
+        });
+      });
+      return function(scope, locals, assign, inputs) {
+        var value = {};
+        for (var i = 0; i < args.length; ++i) {
+          value[args[i].key] = args[i].value(scope, locals, assign, inputs);
+        }
+        return context ? {value: value} : value;
+      };
+    case AST.ThisExpression:
+      return function(scope) {
+        return context ? {value: scope} : scope;
+      };
+    case AST.NGValueParameter:
+      return function(scope, locals, assign, inputs) {
+        return context ? {value: assign} : assign;
+      };
+    }
+  },
+
+  'unary+': function(argument, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = argument(scope, locals, assign, inputs);
+      if (isDefined(arg)) {
+        arg = +arg;
+      } else {
+        arg = 0;
+      }
+      return context ? {value: arg} : arg;
+    };
+  },
+  'unary-': function(argument, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = argument(scope, locals, assign, inputs);
+      if (isDefined(arg)) {
+        arg = -arg;
+      } else {
+        arg = 0;
+      }
+      return context ? {value: arg} : arg;
+    };
+  },
+  'unary!': function(argument, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = !argument(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary+': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      var rhs = right(scope, locals, assign, inputs);
+      var arg = plusFn(lhs, rhs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary-': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      var rhs = right(scope, locals, assign, inputs);
+      var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary*': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary/': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary%': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary===': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary!==': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary==': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary!=': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary<': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary>': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary<=': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary>=': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary&&': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary||': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'ternary?:': function(test, alternate, consequent, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  value: function(value, context) {
+    return function() { return context ? {context: undefined, name: undefined, value: value} : value; };
+  },
+  identifier: function(name, expensiveChecks, context, create, expression) {
+    return function(scope, locals, assign, inputs) {
+      var base = locals && (name in locals) ? locals : scope;
+      if (create && create !== 1 && base && !(base[name])) {
+        base[name] = {};
+      }
+      var value = base ? base[name] : undefined;
+      if (expensiveChecks) {
+        ensureSafeObject(value, expression);
+      }
+      if (context) {
+        return {context: base, name: name, value: value};
+      } else {
+        return value;
+      }
+    };
+  },
+  computedMember: function(left, right, context, create, expression) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      var rhs;
+      var value;
+      if (lhs != null) {
+        rhs = right(scope, locals, assign, inputs);
+        ensureSafeMemberName(rhs, expression);
+        if (create && create !== 1 && lhs && !(lhs[rhs])) {
+          lhs[rhs] = {};
+        }
+        value = lhs[rhs];
+        ensureSafeObject(value, expression);
+      }
+      if (context) {
+        return {context: lhs, name: rhs, value: value};
+      } else {
+        return value;
+      }
+    };
+  },
+  nonComputedMember: function(left, right, expensiveChecks, context, create, expression) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      if (create && create !== 1 && lhs && !(lhs[right])) {
+        lhs[right] = {};
+      }
+      var value = lhs != null ? lhs[right] : undefined;
+      if (expensiveChecks || isPossiblyDangerousMemberName(right)) {
+        ensureSafeObject(value, expression);
+      }
+      if (context) {
+        return {context: lhs, name: right, value: value};
+      } else {
+        return value;
+      }
+    };
+  },
+  inputs: function(input, watchId) {
+    return function(scope, value, locals, inputs) {
+      if (inputs) return inputs[watchId];
+      return input(scope, value, locals);
+    };
+  }
+};
+
+/**
+ * @constructor
+ */
+var Parser = function(lexer, $filter, options) {
+  this.lexer = lexer;
+  this.$filter = $filter;
+  this.options = options;
+  this.ast = new AST(this.lexer);
+  this.astCompiler = options.csp ? new ASTInterpreter(this.ast, $filter) :
+                                   new ASTCompiler(this.ast, $filter);
+};
+
+Parser.prototype = {
+  constructor: Parser,
+
+  parse: function(text) {
+    return this.astCompiler.compile(text, this.options.expensiveChecks);
+  }
+};
+
+//////////////////////////////////////////////////
+// Parser helper functions
+//////////////////////////////////////////////////
+
+function setter(obj, path, setValue, fullExp) {
+  ensureSafeObject(obj, fullExp);
+
+  var element = path.split('.'), key;
+  for (var i = 0; element.length > 1; i++) {
+    key = ensureSafeMemberName(element.shift(), fullExp);
+    var propertyObj = ensureSafeObject(obj[key], fullExp);
+    if (!propertyObj) {
+      propertyObj = {};
+      obj[key] = propertyObj;
+    }
+    obj = propertyObj;
+  }
+  key = ensureSafeMemberName(element.shift(), fullExp);
+  ensureSafeObject(obj[key], fullExp);
+  obj[key] = setValue;
+  return setValue;
+}
+
+var getterFnCacheDefault = createMap();
+var getterFnCacheExpensive = createMap();
+
+function isPossiblyDangerousMemberName(name) {
+  return name == 'constructor';
+}
+
+var objectValueOf = Object.prototype.valueOf;
+
+function getValueOf(value) {
+  return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value);
+}
+
+///////////////////////////////////
+
+/**
+ * @ngdoc service
+ * @name $parse
+ * @kind function
+ *
+ * @description
+ *
+ * Converts Angular {@link guide/expression expression} into a function.
+ *
+ * ```js
+ *   var getter = $parse('user.name');
+ *   var setter = getter.assign;
+ *   var context = {user:{name:'angular'}};
+ *   var locals = {user:{name:'local'}};
+ *
+ *   expect(getter(context)).toEqual('angular');
+ *   setter(context, 'newValue');
+ *   expect(context.user.name).toEqual('newValue');
+ *   expect(getter(context, locals)).toEqual('local');
+ * ```
+ *
+ *
+ * @param {string} expression String expression to compile.
+ * @returns {function(context, locals)} a function which represents the compiled expression:
+ *
+ *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+ *      are evaluated against (typically a scope object).
+ *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+ *      `context`.
+ *
+ *    The returned function also has the following properties:
+ *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
+ *        literal.
+ *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
+ *        constant literals.
+ *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
+ *        set to a function to change its value on the given context.
+ *
+ */
+
+
+/**
+ * @ngdoc provider
+ * @name $parseProvider
+ *
+ * @description
+ * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
+ *  service.
+ */
+function $ParseProvider() {
+  var cacheDefault = createMap();
+  var cacheExpensive = createMap();
+
+  this.$get = ['$filter', '$sniffer', function($filter, $sniffer) {
+    var $parseOptions = {
+          csp: $sniffer.csp,
+          expensiveChecks: false
+        },
+        $parseOptionsExpensive = {
+          csp: $sniffer.csp,
+          expensiveChecks: true
+        };
+
+    return function $parse(exp, interceptorFn, expensiveChecks) {
+      var parsedExpression, oneTime, cacheKey;
+
+      switch (typeof exp) {
+        case 'string':
+          exp = exp.trim();
+          cacheKey = exp;
+
+          var cache = (expensiveChecks ? cacheExpensive : cacheDefault);
+          parsedExpression = cache[cacheKey];
+
+          if (!parsedExpression) {
+            if (exp.charAt(0) === ':' && exp.charAt(1) === ':') {
+              oneTime = true;
+              exp = exp.substring(2);
+            }
+            var parseOptions = expensiveChecks ? $parseOptionsExpensive : $parseOptions;
+            var lexer = new Lexer(parseOptions);
+            var parser = new Parser(lexer, $filter, parseOptions);
+            parsedExpression = parser.parse(exp);
+            if (parsedExpression.constant) {
+              parsedExpression.$$watchDelegate = constantWatchDelegate;
+            } else if (oneTime) {
+              parsedExpression.$$watchDelegate = parsedExpression.literal ?
+                  oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
+            } else if (parsedExpression.inputs) {
+              parsedExpression.$$watchDelegate = inputsWatchDelegate;
+            }
+            cache[cacheKey] = parsedExpression;
+          }
+          return addInterceptor(parsedExpression, interceptorFn);
+
+        case 'function':
+          return addInterceptor(exp, interceptorFn);
+
+        default:
+          return noop;
+      }
+    };
+
+    function expressionInputDirtyCheck(newValue, oldValueOfValue) {
+
+      if (newValue == null || oldValueOfValue == null) { // null/undefined
+        return newValue === oldValueOfValue;
+      }
+
+      if (typeof newValue === 'object') {
+
+        // attempt to convert the value to a primitive type
+        // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
+        //             be cheaply dirty-checked
+        newValue = getValueOf(newValue);
+
+        if (typeof newValue === 'object') {
+          // objects/arrays are not supported - deep-watching them would be too expensive
+          return false;
+        }
+
+        // fall-through to the primitive equality check
+      }
+
+      //Primitive or NaN
+      return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
+    }
+
+    function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+      var inputExpressions = parsedExpression.inputs;
+      var lastResult;
+
+      if (inputExpressions.length === 1) {
+        var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails
+        inputExpressions = inputExpressions[0];
+        return scope.$watch(function expressionInputWatch(scope) {
+          var newInputValue = inputExpressions(scope);
+          if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf)) {
+            lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]);
+            oldInputValueOf = newInputValue && getValueOf(newInputValue);
+          }
+          return lastResult;
+        }, listener, objectEquality, prettyPrintExpression);
+      }
+
+      var oldInputValueOfValues = [];
+      var oldInputValues = [];
+      for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+        oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
+        oldInputValues[i] = null;
+      }
+
+      return scope.$watch(function expressionInputsWatch(scope) {
+        var changed = false;
+
+        for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+          var newInputValue = inputExpressions[i](scope);
+          if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
+            oldInputValues[i] = newInputValue;
+            oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue);
+          }
+        }
+
+        if (changed) {
+          lastResult = parsedExpression(scope, undefined, undefined, oldInputValues);
+        }
+
+        return lastResult;
+      }, listener, objectEquality, prettyPrintExpression);
+    }
+
+    function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+      var unwatch, lastValue;
+      return unwatch = scope.$watch(function oneTimeWatch(scope) {
+        return parsedExpression(scope);
+      }, function oneTimeListener(value, old, scope) {
+        lastValue = value;
+        if (isFunction(listener)) {
+          listener.apply(this, arguments);
+        }
+        if (isDefined(value)) {
+          scope.$$postDigest(function() {
+            if (isDefined(lastValue)) {
+              unwatch();
+            }
+          });
+        }
+      }, objectEquality);
+    }
+
+    function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+      var unwatch, lastValue;
+      return unwatch = scope.$watch(function oneTimeWatch(scope) {
+        return parsedExpression(scope);
+      }, function oneTimeListener(value, old, scope) {
+        lastValue = value;
+        if (isFunction(listener)) {
+          listener.call(this, value, old, scope);
+        }
+        if (isAllDefined(value)) {
+          scope.$$postDigest(function() {
+            if (isAllDefined(lastValue)) unwatch();
+          });
+        }
+      }, objectEquality);
+
+      function isAllDefined(value) {
+        var allDefined = true;
+        forEach(value, function(val) {
+          if (!isDefined(val)) allDefined = false;
+        });
+        return allDefined;
+      }
+    }
+
+    function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+      var unwatch;
+      return unwatch = scope.$watch(function constantWatch(scope) {
+        return parsedExpression(scope);
+      }, function constantListener(value, old, scope) {
+        if (isFunction(listener)) {
+          listener.apply(this, arguments);
+        }
+        unwatch();
+      }, objectEquality);
+    }
+
+    function addInterceptor(parsedExpression, interceptorFn) {
+      if (!interceptorFn) return parsedExpression;
+      var watchDelegate = parsedExpression.$$watchDelegate;
+
+      var regularWatch =
+          watchDelegate !== oneTimeLiteralWatchDelegate &&
+          watchDelegate !== oneTimeWatchDelegate;
+
+      var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) {
+        var value = parsedExpression(scope, locals, assign, inputs);
+        return interceptorFn(value, scope, locals);
+      } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) {
+        var value = parsedExpression(scope, locals, assign, inputs);
+        var result = interceptorFn(value, scope, locals);
+        // we only return the interceptor's result if the
+        // initial value is defined (for bind-once)
+        return isDefined(value) ? result : value;
+      };
+
+      // Propagate $$watchDelegates other then inputsWatchDelegate
+      if (parsedExpression.$$watchDelegate &&
+          parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
+        fn.$$watchDelegate = parsedExpression.$$watchDelegate;
+      } else if (!interceptorFn.$stateful) {
+        // If there is an interceptor, but no watchDelegate then treat the interceptor like
+        // we treat filters - it is assumed to be a pure function unless flagged with $stateful
+        fn.$$watchDelegate = inputsWatchDelegate;
+        fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression];
+      }
+
+      return fn;
+    }
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $q
+ * @requires $rootScope
+ *
+ * @description
+ * A service that helps you run functions asynchronously, and use their return values (or exceptions)
+ * when they are done processing.
+ *
+ * This is an implementation of promises/deferred objects inspired by
+ * [Kris Kowal's Q](https://github.com/kriskowal/q).
+ *
+ * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred
+ * implementations, and the other which resembles ES6 promises to some degree.
+ *
+ * # $q constructor
+ *
+ * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver`
+ * function as the first argument. This is similar to the native Promise implementation from ES6 Harmony,
+ * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise).
+ *
+ * While the constructor-style use is supported, not all of the supporting methods from ES6 Harmony promises are
+ * available yet.
+ *
+ * It can be used like so:
+ *
+ * ```js
+ *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+ *   // are available in the current lexical scope (they could have been injected or passed in).
+ *
+ *   function asyncGreet(name) {
+ *     // perform some asynchronous operation, resolve or reject the promise when appropriate.
+ *     return $q(function(resolve, reject) {
+ *       setTimeout(function() {
+ *         if (okToGreet(name)) {
+ *           resolve('Hello, ' + name + '!');
+ *         } else {
+ *           reject('Greeting ' + name + ' is not allowed.');
+ *         }
+ *       }, 1000);
+ *     });
+ *   }
+ *
+ *   var promise = asyncGreet('Robin Hood');
+ *   promise.then(function(greeting) {
+ *     alert('Success: ' + greeting);
+ *   }, function(reason) {
+ *     alert('Failed: ' + reason);
+ *   });
+ * ```
+ *
+ * Note: progress/notify callbacks are not currently supported via the ES6-style interface.
+ *
+ * However, the more traditional CommonJS-style usage is still available, and documented below.
+ *
+ * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
+ * interface for interacting with an object that represents the result of an action that is
+ * performed asynchronously, and may or may not be finished at any given point in time.
+ *
+ * From the perspective of dealing with error handling, deferred and promise APIs are to
+ * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
+ *
+ * ```js
+ *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+ *   // are available in the current lexical scope (they could have been injected or passed in).
+ *
+ *   function asyncGreet(name) {
+ *     var deferred = $q.defer();
+ *
+ *     setTimeout(function() {
+ *       deferred.notify('About to greet ' + name + '.');
+ *
+ *       if (okToGreet(name)) {
+ *         deferred.resolve('Hello, ' + name + '!');
+ *       } else {
+ *         deferred.reject('Greeting ' + name + ' is not allowed.');
+ *       }
+ *     }, 1000);
+ *
+ *     return deferred.promise;
+ *   }
+ *
+ *   var promise = asyncGreet('Robin Hood');
+ *   promise.then(function(greeting) {
+ *     alert('Success: ' + greeting);
+ *   }, function(reason) {
+ *     alert('Failed: ' + reason);
+ *   }, function(update) {
+ *     alert('Got notification: ' + update);
+ *   });
+ * ```
+ *
+ * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
+ * comes in the way of guarantees that promise and deferred APIs make, see
+ * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
+ *
+ * Additionally the promise api allows for composition that is very hard to do with the
+ * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
+ * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
+ * section on serial or parallel joining of promises.
+ *
+ * # The Deferred API
+ *
+ * A new instance of deferred is constructed by calling `$q.defer()`.
+ *
+ * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
+ * that can be used for signaling the successful or unsuccessful completion, as well as the status
+ * of the task.
+ *
+ * **Methods**
+ *
+ * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
+ *   constructed via `$q.reject`, the promise will be rejected instead.
+ * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
+ *   resolving it with a rejection constructed via `$q.reject`.
+ * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
+ *   multiple times before the promise is either resolved or rejected.
+ *
+ * **Properties**
+ *
+ * - promise – `{Promise}` – promise object associated with this deferred.
+ *
+ *
+ * # The Promise API
+ *
+ * A new promise instance is created when a deferred instance is created and can be retrieved by
+ * calling `deferred.promise`.
+ *
+ * The purpose of the promise object is to allow for interested parties to get access to the result
+ * of the deferred task when it completes.
+ *
+ * **Methods**
+ *
+ * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
+ *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
+ *   as soon as the result is available. The callbacks are called with a single argument: the result
+ *   or rejection reason. Additionally, the notify callback may be called zero or more times to
+ *   provide a progress indication, before the promise is resolved or rejected.
+ *
+ *   This method *returns a new promise* which is resolved or rejected via the return value of the
+ *   `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved
+ *   with the value which is resolved in that promise using
+ *   [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
+ *   It also notifies via the return value of the `notifyCallback` method. The promise cannot be
+ *   resolved or rejected from the notifyCallback method.
+ *
+ * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
+ *
+ * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise,
+ *   but to do so without modifying the final value. This is useful to release resources or do some
+ *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
+ *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
+ *   more information.
+ *
+ * # Chaining promises
+ *
+ * Because calling the `then` method of a promise returns a new derived promise, it is easily
+ * possible to create a chain of promises:
+ *
+ * ```js
+ *   promiseB = promiseA.then(function(result) {
+ *     return result + 1;
+ *   });
+ *
+ *   // promiseB will be resolved immediately after promiseA is resolved and its value
+ *   // will be the result of promiseA incremented by 1
+ * ```
+ *
+ * It is possible to create chains of any length and since a promise can be resolved with another
+ * promise (which will defer its resolution further), it is possible to pause/defer resolution of
+ * the promises at any point in the chain. This makes it possible to implement powerful APIs like
+ * $http's response interceptors.
+ *
+ *
+ * # Differences between Kris Kowal's Q and $q
+ *
+ *  There are two main differences:
+ *
+ * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
+ *   mechanism in angular, which means faster propagation of resolution or rejection into your
+ *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
+ * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
+ *   all the important functionality needed for common async tasks.
+ *
+ *  # Testing
+ *
+ *  ```js
+ *    it('should simulate promise', inject(function($q, $rootScope) {
+ *      var deferred = $q.defer();
+ *      var promise = deferred.promise;
+ *      var resolvedValue;
+ *
+ *      promise.then(function(value) { resolvedValue = value; });
+ *      expect(resolvedValue).toBeUndefined();
+ *
+ *      // Simulate resolving of promise
+ *      deferred.resolve(123);
+ *      // Note that the 'then' function does not get called synchronously.
+ *      // This is because we want the promise API to always be async, whether or not
+ *      // it got called synchronously or asynchronously.
+ *      expect(resolvedValue).toBeUndefined();
+ *
+ *      // Propagate promise resolution to 'then' functions using $apply().
+ *      $rootScope.$apply();
+ *      expect(resolvedValue).toEqual(123);
+ *    }));
+ *  ```
+ *
+ * @param {function(function, function)} resolver Function which is responsible for resolving or
+ *   rejecting the newly created promise. The first parameter is a function which resolves the
+ *   promise, the second parameter is a function which rejects the promise.
+ *
+ * @returns {Promise} The newly created promise.
+ */
+function $QProvider() {
+
+  this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
+    return qFactory(function(callback) {
+      $rootScope.$evalAsync(callback);
+    }, $exceptionHandler);
+  }];
+}
+
+function $$QProvider() {
+  this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) {
+    return qFactory(function(callback) {
+      $browser.defer(callback);
+    }, $exceptionHandler);
+  }];
+}
+
+/**
+ * Constructs a promise manager.
+ *
+ * @param {function(function)} nextTick Function for executing functions in the next turn.
+ * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
+ *     debugging purposes.
+ * @returns {object} Promise manager.
+ */
+function qFactory(nextTick, exceptionHandler) {
+  var $qMinErr = minErr('$q', TypeError);
+  function callOnce(self, resolveFn, rejectFn) {
+    var called = false;
+    function wrap(fn) {
+      return function(value) {
+        if (called) return;
+        called = true;
+        fn.call(self, value);
+      };
+    }
+
+    return [wrap(resolveFn), wrap(rejectFn)];
+  }
+
+  /**
+   * @ngdoc method
+   * @name ng.$q#defer
+   * @kind function
+   *
+   * @description
+   * Creates a `Deferred` object which represents a task which will finish in the future.
+   *
+   * @returns {Deferred} Returns a new instance of deferred.
+   */
+  var defer = function() {
+    return new Deferred();
+  };
+
+  function Promise() {
+    this.$$state = { status: 0 };
+  }
+
+  Promise.prototype = {
+    then: function(onFulfilled, onRejected, progressBack) {
+      var result = new Deferred();
+
+      this.$$state.pending = this.$$state.pending || [];
+      this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]);
+      if (this.$$state.status > 0) scheduleProcessQueue(this.$$state);
+
+      return result.promise;
+    },
+
+    "catch": function(callback) {
+      return this.then(null, callback);
+    },
+
+    "finally": function(callback, progressBack) {
+      return this.then(function(value) {
+        return handleCallback(value, true, callback);
+      }, function(error) {
+        return handleCallback(error, false, callback);
+      }, progressBack);
+    }
+  };
+
+  //Faster, more basic than angular.bind http://jsperf.com/angular-bind-vs-custom-vs-native
+  function simpleBind(context, fn) {
+    return function(value) {
+      fn.call(context, value);
+    };
+  }
+
+  function processQueue(state) {
+    var fn, deferred, pending;
+
+    pending = state.pending;
+    state.processScheduled = false;
+    state.pending = undefined;
+    for (var i = 0, ii = pending.length; i < ii; ++i) {
+      deferred = pending[i][0];
+      fn = pending[i][state.status];
+      try {
+        if (isFunction(fn)) {
+          deferred.resolve(fn(state.value));
+        } else if (state.status === 1) {
+          deferred.resolve(state.value);
+        } else {
+          deferred.reject(state.value);
+        }
+      } catch (e) {
+        deferred.reject(e);
+        exceptionHandler(e);
+      }
+    }
+  }
+
+  function scheduleProcessQueue(state) {
+    if (state.processScheduled || !state.pending) return;
+    state.processScheduled = true;
+    nextTick(function() { processQueue(state); });
+  }
+
+  function Deferred() {
+    this.promise = new Promise();
+    //Necessary to support unbound execution :/
+    this.resolve = simpleBind(this, this.resolve);
+    this.reject = simpleBind(this, this.reject);
+    this.notify = simpleBind(this, this.notify);
+  }
+
+  Deferred.prototype = {
+    resolve: function(val) {
+      if (this.promise.$$state.status) return;
+      if (val === this.promise) {
+        this.$$reject($qMinErr(
+          'qcycle',
+          "Expected promise to be resolved with value other than itself '{0}'",
+          val));
+      } else {
+        this.$$resolve(val);
+      }
+
+    },
+
+    $$resolve: function(val) {
+      var then, fns;
+
+      fns = callOnce(this, this.$$resolve, this.$$reject);
+      try {
+        if ((isObject(val) || isFunction(val))) then = val && val.then;
+        if (isFunction(then)) {
+          this.promise.$$state.status = -1;
+          then.call(val, fns[0], fns[1], this.notify);
+        } else {
+          this.promise.$$state.value = val;
+          this.promise.$$state.status = 1;
+          scheduleProcessQueue(this.promise.$$state);
+        }
+      } catch (e) {
+        fns[1](e);
+        exceptionHandler(e);
+      }
+    },
+
+    reject: function(reason) {
+      if (this.promise.$$state.status) return;
+      this.$$reject(reason);
+    },
+
+    $$reject: function(reason) {
+      this.promise.$$state.value = reason;
+      this.promise.$$state.status = 2;
+      scheduleProcessQueue(this.promise.$$state);
+    },
+
+    notify: function(progress) {
+      var callbacks = this.promise.$$state.pending;
+
+      if ((this.promise.$$state.status <= 0) && callbacks && callbacks.length) {
+        nextTick(function() {
+          var callback, result;
+          for (var i = 0, ii = callbacks.length; i < ii; i++) {
+            result = callbacks[i][0];
+            callback = callbacks[i][3];
+            try {
+              result.notify(isFunction(callback) ? callback(progress) : progress);
+            } catch (e) {
+              exceptionHandler(e);
+            }
+          }
+        });
+      }
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $q#reject
+   * @kind function
+   *
+   * @description
+   * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
+   * used to forward rejection in a chain of promises. If you are dealing with the last promise in
+   * a promise chain, you don't need to worry about it.
+   *
+   * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
+   * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
+   * a promise error callback and you want to forward the error to the promise derived from the
+   * current promise, you have to "rethrow" the error by returning a rejection constructed via
+   * `reject`.
+   *
+   * ```js
+   *   promiseB = promiseA.then(function(result) {
+   *     // success: do something and resolve promiseB
+   *     //          with the old or a new result
+   *     return result;
+   *   }, function(reason) {
+   *     // error: handle the error if possible and
+   *     //        resolve promiseB with newPromiseOrValue,
+   *     //        otherwise forward the rejection to promiseB
+   *     if (canHandle(reason)) {
+   *      // handle the error and recover
+   *      return newPromiseOrValue;
+   *     }
+   *     return $q.reject(reason);
+   *   });
+   * ```
+   *
+   * @param {*} reason Constant, message, exception or an object representing the rejection reason.
+   * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
+   */
+  var reject = function(reason) {
+    var result = new Deferred();
+    result.reject(reason);
+    return result.promise;
+  };
+
+  var makePromise = function makePromise(value, resolved) {
+    var result = new Deferred();
+    if (resolved) {
+      result.resolve(value);
+    } else {
+      result.reject(value);
+    }
+    return result.promise;
+  };
+
+  var handleCallback = function handleCallback(value, isResolved, callback) {
+    var callbackOutput = null;
+    try {
+      if (isFunction(callback)) callbackOutput = callback();
+    } catch (e) {
+      return makePromise(e, false);
+    }
+    if (isPromiseLike(callbackOutput)) {
+      return callbackOutput.then(function() {
+        return makePromise(value, isResolved);
+      }, function(error) {
+        return makePromise(error, false);
+      });
+    } else {
+      return makePromise(value, isResolved);
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $q#when
+   * @kind function
+   *
+   * @description
+   * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
+   * This is useful when you are dealing with an object that might or might not be a promise, or if
+   * the promise comes from a source that can't be trusted.
+   *
+   * @param {*} value Value or a promise
+   * @returns {Promise} Returns a promise of the passed value or promise
+   */
+
+
+  var when = function(value, callback, errback, progressBack) {
+    var result = new Deferred();
+    result.resolve(value);
+    return result.promise.then(callback, errback, progressBack);
+  };
+
+  /**
+   * @ngdoc method
+   * @name $q#all
+   * @kind function
+   *
+   * @description
+   * Combines multiple promises into a single promise that is resolved when all of the input
+   * promises are resolved.
+   *
+   * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
+   * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
+   *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
+   *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
+   *   with the same rejection value.
+   */
+
+  function all(promises) {
+    var deferred = new Deferred(),
+        counter = 0,
+        results = isArray(promises) ? [] : {};
+
+    forEach(promises, function(promise, key) {
+      counter++;
+      when(promise).then(function(value) {
+        if (results.hasOwnProperty(key)) return;
+        results[key] = value;
+        if (!(--counter)) deferred.resolve(results);
+      }, function(reason) {
+        if (results.hasOwnProperty(key)) return;
+        deferred.reject(reason);
+      });
+    });
+
+    if (counter === 0) {
+      deferred.resolve(results);
+    }
+
+    return deferred.promise;
+  }
+
+  var $Q = function Q(resolver) {
+    if (!isFunction(resolver)) {
+      throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver);
+    }
+
+    if (!(this instanceof Q)) {
+      // More useful when $Q is the Promise itself.
+      return new Q(resolver);
+    }
+
+    var deferred = new Deferred();
+
+    function resolveFn(value) {
+      deferred.resolve(value);
+    }
+
+    function rejectFn(reason) {
+      deferred.reject(reason);
+    }
+
+    resolver(resolveFn, rejectFn);
+
+    return deferred.promise;
+  };
+
+  $Q.defer = defer;
+  $Q.reject = reject;
+  $Q.when = when;
+  $Q.all = all;
+
+  return $Q;
+}
+
+function $$RAFProvider() { //rAF
+  this.$get = ['$window', '$timeout', function($window, $timeout) {
+    var requestAnimationFrame = $window.requestAnimationFrame ||
+                                $window.webkitRequestAnimationFrame;
+
+    var cancelAnimationFrame = $window.cancelAnimationFrame ||
+                               $window.webkitCancelAnimationFrame ||
+                               $window.webkitCancelRequestAnimationFrame;
+
+    var rafSupported = !!requestAnimationFrame;
+    var rafFn = rafSupported
+      ? function(fn) {
+          var id = requestAnimationFrame(fn);
+          return function() {
+            cancelAnimationFrame(id);
+          };
+        }
+      : function(fn) {
+          var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
+          return function() {
+            $timeout.cancel(timer);
+          };
+        };
+
+    queueFn.supported = rafSupported;
+
+    var cancelLastRAF;
+    var taskCount = 0;
+    var taskQueue = [];
+    return queueFn;
+
+    function flush() {
+      for (var i = 0; i < taskQueue.length; i++) {
+        var task = taskQueue[i];
+        if (task) {
+          taskQueue[i] = null;
+          task();
+        }
+      }
+      taskCount = taskQueue.length = 0;
+    }
+
+    function queueFn(asyncFn) {
+      var index = taskQueue.length;
+
+      taskCount++;
+      taskQueue.push(asyncFn);
+
+      if (index === 0) {
+        cancelLastRAF = rafFn(flush);
+      }
+
+      return function cancelQueueFn() {
+        if (index >= 0) {
+          taskQueue[index] = null;
+          index = null;
+
+          if (--taskCount === 0 && cancelLastRAF) {
+            cancelLastRAF();
+            cancelLastRAF = null;
+            taskQueue.length = 0;
+          }
+        }
+      };
+    }
+  }];
+}
+
+/**
+ * DESIGN NOTES
+ *
+ * The design decisions behind the scope are heavily favored for speed and memory consumption.
+ *
+ * The typical use of scope is to watch the expressions, which most of the time return the same
+ * value as last time so we optimize the operation.
+ *
+ * Closures construction is expensive in terms of speed as well as memory:
+ *   - No closures, instead use prototypical inheritance for API
+ *   - Internal state needs to be stored on scope directly, which means that private state is
+ *     exposed as $$____ properties
+ *
+ * Loop operations are optimized by using while(count--) { ... }
+ *   - this means that in order to keep the same order of execution as addition we have to add
+ *     items to the array at the beginning (unshift) instead of at the end (push)
+ *
+ * Child scopes are created and removed often
+ *   - Using an array would be slow since inserts in middle are expensive so we use linked list
+ *
+ * There are few watches then a lot of observers. This is why you don't want the observer to be
+ * implemented in the same way as watch. Watch requires return of initialization function which
+ * are expensive to construct.
+ */
+
+
+/**
+ * @ngdoc provider
+ * @name $rootScopeProvider
+ * @description
+ *
+ * Provider for the $rootScope service.
+ */
+
+/**
+ * @ngdoc method
+ * @name $rootScopeProvider#digestTtl
+ * @description
+ *
+ * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
+ * assuming that the model is unstable.
+ *
+ * The current default is 10 iterations.
+ *
+ * In complex applications it's possible that the dependencies between `$watch`s will result in
+ * several digest iterations. However if an application needs more than the default 10 digest
+ * iterations for its model to stabilize then you should investigate what is causing the model to
+ * continuously change during the digest.
+ *
+ * Increasing the TTL could have performance implications, so you should not change it without
+ * proper justification.
+ *
+ * @param {number} limit The number of digest iterations.
+ */
+
+
+/**
+ * @ngdoc service
+ * @name $rootScope
+ * @description
+ *
+ * Every application has a single root {@link ng.$rootScope.Scope scope}.
+ * All other scopes are descendant scopes of the root scope. Scopes provide separation
+ * between the model and the view, via a mechanism for watching the model for changes.
+ * They also provide an event emission/broadcast and subscription facility. See the
+ * {@link guide/scope developer guide on scopes}.
+ */
+function $RootScopeProvider() {
+  var TTL = 10;
+  var $rootScopeMinErr = minErr('$rootScope');
+  var lastDirtyWatch = null;
+  var applyAsyncId = null;
+
+  this.digestTtl = function(value) {
+    if (arguments.length) {
+      TTL = value;
+    }
+    return TTL;
+  };
+
+  function createChildScopeClass(parent) {
+    function ChildScope() {
+      this.$$watchers = this.$$nextSibling =
+          this.$$childHead = this.$$childTail = null;
+      this.$$listeners = {};
+      this.$$listenerCount = {};
+      this.$$watchersCount = 0;
+      this.$id = nextUid();
+      this.$$ChildScope = null;
+    }
+    ChildScope.prototype = parent;
+    return ChildScope;
+  }
+
+  this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
+      function($injector, $exceptionHandler, $parse, $browser) {
+
+    function destroyChildScope($event) {
+        $event.currentScope.$$destroyed = true;
+    }
+
+    /**
+     * @ngdoc type
+     * @name $rootScope.Scope
+     *
+     * @description
+     * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
+     * {@link auto.$injector $injector}. Child scopes are created using the
+     * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
+     * compiled HTML template is executed.)
+     *
+     * Here is a simple scope snippet to show how you can interact with the scope.
+     * ```html
+     * <file src="./test/ng/rootScopeSpec.js" tag="docs1" />
+     * ```
+     *
+     * # Inheritance
+     * A scope can inherit from a parent scope, as in this example:
+     * ```js
+         var parent = $rootScope;
+         var child = parent.$new();
+
+         parent.salutation = "Hello";
+         expect(child.salutation).toEqual('Hello');
+
+         child.salutation = "Welcome";
+         expect(child.salutation).toEqual('Welcome');
+         expect(parent.salutation).toEqual('Hello');
+     * ```
+     *
+     * When interacting with `Scope` in tests, additional helper methods are available on the
+     * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional
+     * details.
+     *
+     *
+     * @param {Object.<string, function()>=} providers Map of service factory which need to be
+     *                                       provided for the current scope. Defaults to {@link ng}.
+     * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
+     *                              append/override services provided by `providers`. This is handy
+     *                              when unit-testing and having the need to override a default
+     *                              service.
+     * @returns {Object} Newly created scope.
+     *
+     */
+    function Scope() {
+      this.$id = nextUid();
+      this.$$phase = this.$parent = this.$$watchers =
+                     this.$$nextSibling = this.$$prevSibling =
+                     this.$$childHead = this.$$childTail = null;
+      this.$root = this;
+      this.$$destroyed = false;
+      this.$$listeners = {};
+      this.$$listenerCount = {};
+      this.$$watchersCount = 0;
+      this.$$isolateBindings = null;
+    }
+
+    /**
+     * @ngdoc property
+     * @name $rootScope.Scope#$id
+     *
+     * @description
+     * Unique scope ID (monotonically increasing) useful for debugging.
+     */
+
+     /**
+      * @ngdoc property
+      * @name $rootScope.Scope#$parent
+      *
+      * @description
+      * Reference to the parent scope.
+      */
+
+      /**
+       * @ngdoc property
+       * @name $rootScope.Scope#$root
+       *
+       * @description
+       * Reference to the root scope.
+       */
+
+    Scope.prototype = {
+      constructor: Scope,
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$new
+       * @kind function
+       *
+       * @description
+       * Creates a new child {@link ng.$rootScope.Scope scope}.
+       *
+       * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event.
+       * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
+       *
+       * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
+       * desired for the scope and its child scopes to be permanently detached from the parent and
+       * thus stop participating in model change detection and listener notification by invoking.
+       *
+       * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
+       *         parent scope. The scope is isolated, as it can not see parent scope properties.
+       *         When creating widgets, it is useful for the widget to not accidentally read parent
+       *         state.
+       *
+       * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent`
+       *                              of the newly created scope. Defaults to `this` scope if not provided.
+       *                              This is used when creating a transclude scope to correctly place it
+       *                              in the scope hierarchy while maintaining the correct prototypical
+       *                              inheritance.
+       *
+       * @returns {Object} The newly created child scope.
+       *
+       */
+      $new: function(isolate, parent) {
+        var child;
+
+        parent = parent || this;
+
+        if (isolate) {
+          child = new Scope();
+          child.$root = this.$root;
+        } else {
+          // Only create a child scope class if somebody asks for one,
+          // but cache it to allow the VM to optimize lookups.
+          if (!this.$$ChildScope) {
+            this.$$ChildScope = createChildScopeClass(this);
+          }
+          child = new this.$$ChildScope();
+        }
+        child.$parent = parent;
+        child.$$prevSibling = parent.$$childTail;
+        if (parent.$$childHead) {
+          parent.$$childTail.$$nextSibling = child;
+          parent.$$childTail = child;
+        } else {
+          parent.$$childHead = parent.$$childTail = child;
+        }
+
+        // When the new scope is not isolated or we inherit from `this`, and
+        // the parent scope is destroyed, the property `$$destroyed` is inherited
+        // prototypically. In all other cases, this property needs to be set
+        // when the parent scope is destroyed.
+        // The listener needs to be added after the parent is set
+        if (isolate || parent != this) child.$on('$destroy', destroyChildScope);
+
+        return child;
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$watch
+       * @kind function
+       *
+       * @description
+       * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
+       *
+       * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
+       *   $digest()} and should return the value that will be watched. (Since
+       *   {@link ng.$rootScope.Scope#$digest $digest()} reruns when it detects changes the
+       *   `watchExpression` can execute multiple times per
+       *   {@link ng.$rootScope.Scope#$digest $digest()} and should be idempotent.)
+       * - The `listener` is called only when the value from the current `watchExpression` and the
+       *   previous call to `watchExpression` are not equal (with the exception of the initial run,
+       *   see below). Inequality is determined according to reference inequality,
+       *   [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators)
+       *    via the `!==` Javascript operator, unless `objectEquality == true`
+       *   (see next point)
+       * - When `objectEquality == true`, inequality of the `watchExpression` is determined
+       *   according to the {@link angular.equals} function. To save the value of the object for
+       *   later comparison, the {@link angular.copy} function is used. This therefore means that
+       *   watching complex objects will have adverse memory and performance implications.
+       * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
+       *   This is achieved by rerunning the watchers until no changes are detected. The rerun
+       *   iteration limit is 10 to prevent an infinite loop deadlock.
+       *
+       *
+       * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
+       * you can register a `watchExpression` function with no `listener`. (Since `watchExpression`
+       * can execute multiple times per {@link ng.$rootScope.Scope#$digest $digest} cycle when a
+       * change is detected, be prepared for multiple calls to your listener.)
+       *
+       * After a watcher is registered with the scope, the `listener` fn is called asynchronously
+       * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
+       * watcher. In rare cases, this is undesirable because the listener is called when the result
+       * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
+       * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
+       * listener was called due to initialization.
+       *
+       *
+       *
+       * # Example
+       * ```js
+           // let's assume that scope was dependency injected as the $rootScope
+           var scope = $rootScope;
+           scope.name = 'misko';
+           scope.counter = 0;
+
+           expect(scope.counter).toEqual(0);
+           scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+           expect(scope.counter).toEqual(0);
+
+           scope.$digest();
+           // the listener is always called during the first $digest loop after it was registered
+           expect(scope.counter).toEqual(1);
+
+           scope.$digest();
+           // but now it will not be called unless the value changes
+           expect(scope.counter).toEqual(1);
+
+           scope.name = 'adam';
+           scope.$digest();
+           expect(scope.counter).toEqual(2);
+
+
+
+           // Using a function as a watchExpression
+           var food;
+           scope.foodCounter = 0;
+           expect(scope.foodCounter).toEqual(0);
+           scope.$watch(
+             // This function returns the value being watched. It is called for each turn of the $digest loop
+             function() { return food; },
+             // This is the change listener, called when the value returned from the above function changes
+             function(newValue, oldValue) {
+               if ( newValue !== oldValue ) {
+                 // Only increment the counter if the value changed
+                 scope.foodCounter = scope.foodCounter + 1;
+               }
+             }
+           );
+           // No digest has been run so the counter will be zero
+           expect(scope.foodCounter).toEqual(0);
+
+           // Run the digest but since food has not changed count will still be zero
+           scope.$digest();
+           expect(scope.foodCounter).toEqual(0);
+
+           // Update food and run digest.  Now the counter will increment
+           food = 'cheeseburger';
+           scope.$digest();
+           expect(scope.foodCounter).toEqual(1);
+
+       * ```
+       *
+       *
+       *
+       * @param {(function()|string)} watchExpression Expression that is evaluated on each
+       *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
+       *    a call to the `listener`.
+       *
+       *    - `string`: Evaluated as {@link guide/expression expression}
+       *    - `function(scope)`: called with current `scope` as a parameter.
+       * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value
+       *    of `watchExpression` changes.
+       *
+       *    - `newVal` contains the current value of the `watchExpression`
+       *    - `oldVal` contains the previous value of the `watchExpression`
+       *    - `scope` refers to the current scope
+       * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of
+       *     comparing for reference equality.
+       * @returns {function()} Returns a deregistration function for this listener.
+       */
+      $watch: function(watchExp, listener, objectEquality, prettyPrintExpression) {
+        var get = $parse(watchExp);
+
+        if (get.$$watchDelegate) {
+          return get.$$watchDelegate(this, listener, objectEquality, get, watchExp);
+        }
+        var scope = this,
+            array = scope.$$watchers,
+            watcher = {
+              fn: listener,
+              last: initWatchVal,
+              get: get,
+              exp: prettyPrintExpression || watchExp,
+              eq: !!objectEquality
+            };
+
+        lastDirtyWatch = null;
+
+        if (!isFunction(listener)) {
+          watcher.fn = noop;
+        }
+
+        if (!array) {
+          array = scope.$$watchers = [];
+        }
+        // we use unshift since we use a while loop in $digest for speed.
+        // the while loop reads in reverse order.
+        array.unshift(watcher);
+        incrementWatchersCount(this, 1);
+
+        return function deregisterWatch() {
+          if (arrayRemove(array, watcher) >= 0) {
+            incrementWatchersCount(scope, -1);
+          }
+          lastDirtyWatch = null;
+        };
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$watchGroup
+       * @kind function
+       *
+       * @description
+       * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`.
+       * If any one expression in the collection changes the `listener` is executed.
+       *
+       * - The items in the `watchExpressions` array are observed via standard $watch operation and are examined on every
+       *   call to $digest() to see if any items changes.
+       * - The `listener` is called whenever any expression in the `watchExpressions` array changes.
+       *
+       * @param {Array.<string|Function(scope)>} watchExpressions Array of expressions that will be individually
+       * watched using {@link ng.$rootScope.Scope#$watch $watch()}
+       *
+       * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any
+       *    expression in `watchExpressions` changes
+       *    The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching
+       *    those of `watchExpression`
+       *    and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching
+       *    those of `watchExpression`
+       *    The `scope` refers to the current scope.
+       * @returns {function()} Returns a de-registration function for all listeners.
+       */
+      $watchGroup: function(watchExpressions, listener) {
+        var oldValues = new Array(watchExpressions.length);
+        var newValues = new Array(watchExpressions.length);
+        var deregisterFns = [];
+        var self = this;
+        var changeReactionScheduled = false;
+        var firstRun = true;
+
+        if (!watchExpressions.length) {
+          // No expressions means we call the listener ASAP
+          var shouldCall = true;
+          self.$evalAsync(function() {
+            if (shouldCall) listener(newValues, newValues, self);
+          });
+          return function deregisterWatchGroup() {
+            shouldCall = false;
+          };
+        }
+
+        if (watchExpressions.length === 1) {
+          // Special case size of one
+          return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) {
+            newValues[0] = value;
+            oldValues[0] = oldValue;
+            listener(newValues, (value === oldValue) ? newValues : oldValues, scope);
+          });
+        }
+
+        forEach(watchExpressions, function(expr, i) {
+          var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) {
+            newValues[i] = value;
+            oldValues[i] = oldValue;
+            if (!changeReactionScheduled) {
+              changeReactionScheduled = true;
+              self.$evalAsync(watchGroupAction);
+            }
+          });
+          deregisterFns.push(unwatchFn);
+        });
+
+        function watchGroupAction() {
+          changeReactionScheduled = false;
+
+          if (firstRun) {
+            firstRun = false;
+            listener(newValues, newValues, self);
+          } else {
+            listener(newValues, oldValues, self);
+          }
+        }
+
+        return function deregisterWatchGroup() {
+          while (deregisterFns.length) {
+            deregisterFns.shift()();
+          }
+        };
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$watchCollection
+       * @kind function
+       *
+       * @description
+       * Shallow watches the properties of an object and fires whenever any of the properties change
+       * (for arrays, this implies watching the array items; for object maps, this implies watching
+       * the properties). If a change is detected, the `listener` callback is fired.
+       *
+       * - The `obj` collection is observed via standard $watch operation and is examined on every
+       *   call to $digest() to see if any items have been added, removed, or moved.
+       * - The `listener` is called whenever anything within the `obj` has changed. Examples include
+       *   adding, removing, and moving items belonging to an object or array.
+       *
+       *
+       * # Example
+       * ```js
+          $scope.names = ['igor', 'matias', 'misko', 'james'];
+          $scope.dataCount = 4;
+
+          $scope.$watchCollection('names', function(newNames, oldNames) {
+            $scope.dataCount = newNames.length;
+          });
+
+          expect($scope.dataCount).toEqual(4);
+          $scope.$digest();
+
+          //still at 4 ... no changes
+          expect($scope.dataCount).toEqual(4);
+
+          $scope.names.pop();
+          $scope.$digest();
+
+          //now there's been a change
+          expect($scope.dataCount).toEqual(3);
+       * ```
+       *
+       *
+       * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
+       *    expression value should evaluate to an object or an array which is observed on each
+       *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
+       *    collection will trigger a call to the `listener`.
+       *
+       * @param {function(newCollection, oldCollection, scope)} listener a callback function called
+       *    when a change is detected.
+       *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
+       *    - The `oldCollection` object is a copy of the former collection data.
+       *      Due to performance considerations, the`oldCollection` value is computed only if the
+       *      `listener` function declares two or more arguments.
+       *    - The `scope` argument refers to the current scope.
+       *
+       * @returns {function()} Returns a de-registration function for this listener. When the
+       *    de-registration function is executed, the internal watch operation is terminated.
+       */
+      $watchCollection: function(obj, listener) {
+        $watchCollectionInterceptor.$stateful = true;
+
+        var self = this;
+        // the current value, updated on each dirty-check run
+        var newValue;
+        // a shallow copy of the newValue from the last dirty-check run,
+        // updated to match newValue during dirty-check run
+        var oldValue;
+        // a shallow copy of the newValue from when the last change happened
+        var veryOldValue;
+        // only track veryOldValue if the listener is asking for it
+        var trackVeryOldValue = (listener.length > 1);
+        var changeDetected = 0;
+        var changeDetector = $parse(obj, $watchCollectionInterceptor);
+        var internalArray = [];
+        var internalObject = {};
+        var initRun = true;
+        var oldLength = 0;
+
+        function $watchCollectionInterceptor(_value) {
+          newValue = _value;
+          var newLength, key, bothNaN, newItem, oldItem;
+
+          // If the new value is undefined, then return undefined as the watch may be a one-time watch
+          if (isUndefined(newValue)) return;
+
+          if (!isObject(newValue)) { // if primitive
+            if (oldValue !== newValue) {
+              oldValue = newValue;
+              changeDetected++;
+            }
+          } else if (isArrayLike(newValue)) {
+            if (oldValue !== internalArray) {
+              // we are transitioning from something which was not an array into array.
+              oldValue = internalArray;
+              oldLength = oldValue.length = 0;
+              changeDetected++;
+            }
+
+            newLength = newValue.length;
+
+            if (oldLength !== newLength) {
+              // if lengths do not match we need to trigger change notification
+              changeDetected++;
+              oldValue.length = oldLength = newLength;
+            }
+            // copy the items to oldValue and look for changes.
+            for (var i = 0; i < newLength; i++) {
+              oldItem = oldValue[i];
+              newItem = newValue[i];
+
+              bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+              if (!bothNaN && (oldItem !== newItem)) {
+                changeDetected++;
+                oldValue[i] = newItem;
+              }
+            }
+          } else {
+            if (oldValue !== internalObject) {
+              // we are transitioning from something which was not an object into object.
+              oldValue = internalObject = {};
+              oldLength = 0;
+              changeDetected++;
+            }
+            // copy the items to oldValue and look for changes.
+            newLength = 0;
+            for (key in newValue) {
+              if (newValue.hasOwnProperty(key)) {
+                newLength++;
+                newItem = newValue[key];
+                oldItem = oldValue[key];
+
+                if (key in oldValue) {
+                  bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                  if (!bothNaN && (oldItem !== newItem)) {
+                    changeDetected++;
+                    oldValue[key] = newItem;
+                  }
+                } else {
+                  oldLength++;
+                  oldValue[key] = newItem;
+                  changeDetected++;
+                }
+              }
+            }
+            if (oldLength > newLength) {
+              // we used to have more keys, need to find them and destroy them.
+              changeDetected++;
+              for (key in oldValue) {
+                if (!newValue.hasOwnProperty(key)) {
+                  oldLength--;
+                  delete oldValue[key];
+                }
+              }
+            }
+          }
+          return changeDetected;
+        }
+
+        function $watchCollectionAction() {
+          if (initRun) {
+            initRun = false;
+            listener(newValue, newValue, self);
+          } else {
+            listener(newValue, veryOldValue, self);
+          }
+
+          // make a copy for the next time a collection is changed
+          if (trackVeryOldValue) {
+            if (!isObject(newValue)) {
+              //primitive
+              veryOldValue = newValue;
+            } else if (isArrayLike(newValue)) {
+              veryOldValue = new Array(newValue.length);
+              for (var i = 0; i < newValue.length; i++) {
+                veryOldValue[i] = newValue[i];
+              }
+            } else { // if object
+              veryOldValue = {};
+              for (var key in newValue) {
+                if (hasOwnProperty.call(newValue, key)) {
+                  veryOldValue[key] = newValue[key];
+                }
+              }
+            }
+          }
+        }
+
+        return this.$watch(changeDetector, $watchCollectionAction);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$digest
+       * @kind function
+       *
+       * @description
+       * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
+       * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
+       * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
+       * until no more listeners are firing. This means that it is possible to get into an infinite
+       * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
+       * iterations exceeds 10.
+       *
+       * Usually, you don't call `$digest()` directly in
+       * {@link ng.directive:ngController controllers} or in
+       * {@link ng.$compileProvider#directive directives}.
+       * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
+       * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`.
+       *
+       * If you want to be notified whenever `$digest()` is called,
+       * you can register a `watchExpression` function with
+       * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
+       *
+       * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
+       *
+       * # Example
+       * ```js
+           var scope = ...;
+           scope.name = 'misko';
+           scope.counter = 0;
+
+           expect(scope.counter).toEqual(0);
+           scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+           expect(scope.counter).toEqual(0);
+
+           scope.$digest();
+           // the listener is always called during the first $digest loop after it was registered
+           expect(scope.counter).toEqual(1);
+
+           scope.$digest();
+           // but now it will not be called unless the value changes
+           expect(scope.counter).toEqual(1);
+
+           scope.name = 'adam';
+           scope.$digest();
+           expect(scope.counter).toEqual(2);
+       * ```
+       *
+       */
+      $digest: function() {
+        var watch, value, last,
+            watchers,
+            length,
+            dirty, ttl = TTL,
+            next, current, target = this,
+            watchLog = [],
+            logIdx, logMsg, asyncTask;
+
+        beginPhase('$digest');
+        // Check for changes to browser url that happened in sync before the call to $digest
+        $browser.$$checkUrlChange();
+
+        if (this === $rootScope && applyAsyncId !== null) {
+          // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then
+          // cancel the scheduled $apply and flush the queue of expressions to be evaluated.
+          $browser.defer.cancel(applyAsyncId);
+          flushApplyAsync();
+        }
+
+        lastDirtyWatch = null;
+
+        do { // "while dirty" loop
+          dirty = false;
+          current = target;
+
+          while (asyncQueue.length) {
+            try {
+              asyncTask = asyncQueue.shift();
+              asyncTask.scope.$eval(asyncTask.expression, asyncTask.locals);
+            } catch (e) {
+              $exceptionHandler(e);
+            }
+            lastDirtyWatch = null;
+          }
+
+          traverseScopesLoop:
+          do { // "traverse the scopes" loop
+            if ((watchers = current.$$watchers)) {
+              // process our watches
+              length = watchers.length;
+              while (length--) {
+                try {
+                  watch = watchers[length];
+                  // Most common watches are on primitives, in which case we can short
+                  // circuit it with === operator, only when === fails do we use .equals
+                  if (watch) {
+                    if ((value = watch.get(current)) !== (last = watch.last) &&
+                        !(watch.eq
+                            ? equals(value, last)
+                            : (typeof value === 'number' && typeof last === 'number'
+                               && isNaN(value) && isNaN(last)))) {
+                      dirty = true;
+                      lastDirtyWatch = watch;
+                      watch.last = watch.eq ? copy(value, null) : value;
+                      watch.fn(value, ((last === initWatchVal) ? value : last), current);
+                      if (ttl < 5) {
+                        logIdx = 4 - ttl;
+                        if (!watchLog[logIdx]) watchLog[logIdx] = [];
+                        watchLog[logIdx].push({
+                          msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp,
+                          newVal: value,
+                          oldVal: last
+                        });
+                      }
+                    } else if (watch === lastDirtyWatch) {
+                      // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
+                      // have already been tested.
+                      dirty = false;
+                      break traverseScopesLoop;
+                    }
+                  }
+                } catch (e) {
+                  $exceptionHandler(e);
+                }
+              }
+            }
+
+            // Insanity Warning: scope depth-first traversal
+            // yes, this code is a bit crazy, but it works and we have tests to prove it!
+            // this piece should be kept in sync with the traversal in $broadcast
+            if (!(next = ((current.$$watchersCount && current.$$childHead) ||
+                (current !== target && current.$$nextSibling)))) {
+              while (current !== target && !(next = current.$$nextSibling)) {
+                current = current.$parent;
+              }
+            }
+          } while ((current = next));
+
+          // `break traverseScopesLoop;` takes us to here
+
+          if ((dirty || asyncQueue.length) && !(ttl--)) {
+            clearPhase();
+            throw $rootScopeMinErr('infdig',
+                '{0} $digest() iterations reached. Aborting!\n' +
+                'Watchers fired in the last 5 iterations: {1}',
+                TTL, watchLog);
+          }
+
+        } while (dirty || asyncQueue.length);
+
+        clearPhase();
+
+        while (postDigestQueue.length) {
+          try {
+            postDigestQueue.shift()();
+          } catch (e) {
+            $exceptionHandler(e);
+          }
+        }
+      },
+
+
+      /**
+       * @ngdoc event
+       * @name $rootScope.Scope#$destroy
+       * @eventType broadcast on scope being destroyed
+       *
+       * @description
+       * Broadcasted when a scope and its children are being destroyed.
+       *
+       * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+       * clean up DOM bindings before an element is removed from the DOM.
+       */
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$destroy
+       * @kind function
+       *
+       * @description
+       * Removes the current scope (and all of its children) from the parent scope. Removal implies
+       * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
+       * propagate to the current scope and its children. Removal also implies that the current
+       * scope is eligible for garbage collection.
+       *
+       * The `$destroy()` is usually used by directives such as
+       * {@link ng.directive:ngRepeat ngRepeat} for managing the
+       * unrolling of the loop.
+       *
+       * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
+       * Application code can register a `$destroy` event handler that will give it a chance to
+       * perform any necessary cleanup.
+       *
+       * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+       * clean up DOM bindings before an element is removed from the DOM.
+       */
+      $destroy: function() {
+        // We can't destroy a scope that has been already destroyed.
+        if (this.$$destroyed) return;
+        var parent = this.$parent;
+
+        this.$broadcast('$destroy');
+        this.$$destroyed = true;
+
+        if (this === $rootScope) {
+          //Remove handlers attached to window when $rootScope is removed
+          $browser.$$applicationDestroyed();
+        }
+
+        incrementWatchersCount(this, -this.$$watchersCount);
+        for (var eventName in this.$$listenerCount) {
+          decrementListenerCount(this, this.$$listenerCount[eventName], eventName);
+        }
+
+        // sever all the references to parent scopes (after this cleanup, the current scope should
+        // not be retained by any of our references and should be eligible for garbage collection)
+        if (parent && parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
+        if (parent && parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
+        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
+        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
+
+        // Disable listeners, watchers and apply/digest methods
+        this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop;
+        this.$on = this.$watch = this.$watchGroup = function() { return noop; };
+        this.$$listeners = {};
+
+        // All of the code below is bogus code that works around V8's memory leak via optimized code
+        // and inline caches.
+        //
+        // see:
+        // - https://code.google.com/p/v8/issues/detail?id=2073#c26
+        // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
+        // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
+
+        this.$parent = this.$$nextSibling = this.$$prevSibling = this.$$childHead =
+            this.$$childTail = this.$root = this.$$watchers = null;
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$eval
+       * @kind function
+       *
+       * @description
+       * Executes the `expression` on the current scope and returns the result. Any exceptions in
+       * the expression are propagated (uncaught). This is useful when evaluating Angular
+       * expressions.
+       *
+       * # Example
+       * ```js
+           var scope = ng.$rootScope.Scope();
+           scope.a = 1;
+           scope.b = 2;
+
+           expect(scope.$eval('a+b')).toEqual(3);
+           expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
+       * ```
+       *
+       * @param {(string|function())=} expression An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with the current `scope` parameter.
+       *
+       * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+       * @returns {*} The result of evaluating the expression.
+       */
+      $eval: function(expr, locals) {
+        return $parse(expr)(this, locals);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$evalAsync
+       * @kind function
+       *
+       * @description
+       * Executes the expression on the current scope at a later point in time.
+       *
+       * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
+       * that:
+       *
+       *   - it will execute after the function that scheduled the evaluation (preferably before DOM
+       *     rendering).
+       *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
+       *     `expression` execution.
+       *
+       * Any exceptions from the execution of the expression are forwarded to the
+       * {@link ng.$exceptionHandler $exceptionHandler} service.
+       *
+       * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
+       * will be scheduled. However, it is encouraged to always call code that changes the model
+       * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
+       *
+       * @param {(string|function())=} expression An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with the current `scope` parameter.
+       *
+       * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+       */
+      $evalAsync: function(expr, locals) {
+        // if we are outside of an $digest loop and this is the first time we are scheduling async
+        // task also schedule async auto-flush
+        if (!$rootScope.$$phase && !asyncQueue.length) {
+          $browser.defer(function() {
+            if (asyncQueue.length) {
+              $rootScope.$digest();
+            }
+          });
+        }
+
+        asyncQueue.push({scope: this, expression: expr, locals: locals});
+      },
+
+      $$postDigest: function(fn) {
+        postDigestQueue.push(fn);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$apply
+       * @kind function
+       *
+       * @description
+       * `$apply()` is used to execute an expression in angular from outside of the angular
+       * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
+       * Because we are calling into the angular framework we need to perform proper scope life
+       * cycle of {@link ng.$exceptionHandler exception handling},
+       * {@link ng.$rootScope.Scope#$digest executing watches}.
+       *
+       * ## Life cycle
+       *
+       * # Pseudo-Code of `$apply()`
+       * ```js
+           function $apply(expr) {
+             try {
+               return $eval(expr);
+             } catch (e) {
+               $exceptionHandler(e);
+             } finally {
+               $root.$digest();
+             }
+           }
+       * ```
+       *
+       *
+       * Scope's `$apply()` method transitions through the following stages:
+       *
+       * 1. The {@link guide/expression expression} is executed using the
+       *    {@link ng.$rootScope.Scope#$eval $eval()} method.
+       * 2. Any exceptions from the execution of the expression are forwarded to the
+       *    {@link ng.$exceptionHandler $exceptionHandler} service.
+       * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
+       *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
+       *
+       *
+       * @param {(string|function())=} exp An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with current `scope` parameter.
+       *
+       * @returns {*} The result of evaluating the expression.
+       */
+      $apply: function(expr) {
+        try {
+          beginPhase('$apply');
+          return this.$eval(expr);
+        } catch (e) {
+          $exceptionHandler(e);
+        } finally {
+          clearPhase();
+          try {
+            $rootScope.$digest();
+          } catch (e) {
+            $exceptionHandler(e);
+            throw e;
+          }
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$applyAsync
+       * @kind function
+       *
+       * @description
+       * Schedule the invocation of $apply to occur at a later time. The actual time difference
+       * varies across browsers, but is typically around ~10 milliseconds.
+       *
+       * This can be used to queue up multiple expressions which need to be evaluated in the same
+       * digest.
+       *
+       * @param {(string|function())=} exp An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with current `scope` parameter.
+       */
+      $applyAsync: function(expr) {
+        var scope = this;
+        expr && applyAsyncQueue.push($applyAsyncExpression);
+        scheduleApplyAsync();
+
+        function $applyAsyncExpression() {
+          scope.$eval(expr);
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$on
+       * @kind function
+       *
+       * @description
+       * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
+       * discussion of event life cycle.
+       *
+       * The event listener function format is: `function(event, args...)`. The `event` object
+       * passed into the listener has the following attributes:
+       *
+       *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
+       *     `$broadcast`-ed.
+       *   - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the
+       *     event propagates through the scope hierarchy, this property is set to null.
+       *   - `name` - `{string}`: name of the event.
+       *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
+       *     further event propagation (available only for events that were `$emit`-ed).
+       *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
+       *     to true.
+       *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
+       *
+       * @param {string} name Event name to listen on.
+       * @param {function(event, ...args)} listener Function to call when the event is emitted.
+       * @returns {function()} Returns a deregistration function for this listener.
+       */
+      $on: function(name, listener) {
+        var namedListeners = this.$$listeners[name];
+        if (!namedListeners) {
+          this.$$listeners[name] = namedListeners = [];
+        }
+        namedListeners.push(listener);
+
+        var current = this;
+        do {
+          if (!current.$$listenerCount[name]) {
+            current.$$listenerCount[name] = 0;
+          }
+          current.$$listenerCount[name]++;
+        } while ((current = current.$parent));
+
+        var self = this;
+        return function() {
+          var indexOfListener = namedListeners.indexOf(listener);
+          if (indexOfListener !== -1) {
+            namedListeners[indexOfListener] = null;
+            decrementListenerCount(self, 1, name);
+          }
+        };
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$emit
+       * @kind function
+       *
+       * @description
+       * Dispatches an event `name` upwards through the scope hierarchy notifying the
+       * registered {@link ng.$rootScope.Scope#$on} listeners.
+       *
+       * The event life cycle starts at the scope on which `$emit` was called. All
+       * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+       * notified. Afterwards, the event traverses upwards toward the root scope and calls all
+       * registered listeners along the way. The event will stop propagating if one of the listeners
+       * cancels it.
+       *
+       * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+       * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+       *
+       * @param {string} name Event name to emit.
+       * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+       * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
+       */
+      $emit: function(name, args) {
+        var empty = [],
+            namedListeners,
+            scope = this,
+            stopPropagation = false,
+            event = {
+              name: name,
+              targetScope: scope,
+              stopPropagation: function() {stopPropagation = true;},
+              preventDefault: function() {
+                event.defaultPrevented = true;
+              },
+              defaultPrevented: false
+            },
+            listenerArgs = concat([event], arguments, 1),
+            i, length;
+
+        do {
+          namedListeners = scope.$$listeners[name] || empty;
+          event.currentScope = scope;
+          for (i = 0, length = namedListeners.length; i < length; i++) {
+
+            // if listeners were deregistered, defragment the array
+            if (!namedListeners[i]) {
+              namedListeners.splice(i, 1);
+              i--;
+              length--;
+              continue;
+            }
+            try {
+              //allow all listeners attached to the current scope to run
+              namedListeners[i].apply(null, listenerArgs);
+            } catch (e) {
+              $exceptionHandler(e);
+            }
+          }
+          //if any listener on the current scope stops propagation, prevent bubbling
+          if (stopPropagation) {
+            event.currentScope = null;
+            return event;
+          }
+          //traverse upwards
+          scope = scope.$parent;
+        } while (scope);
+
+        event.currentScope = null;
+
+        return event;
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$broadcast
+       * @kind function
+       *
+       * @description
+       * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
+       * registered {@link ng.$rootScope.Scope#$on} listeners.
+       *
+       * The event life cycle starts at the scope on which `$broadcast` was called. All
+       * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+       * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
+       * scope and calls all registered listeners along the way. The event cannot be canceled.
+       *
+       * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+       * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+       *
+       * @param {string} name Event name to broadcast.
+       * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+       * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
+       */
+      $broadcast: function(name, args) {
+        var target = this,
+            current = target,
+            next = target,
+            event = {
+              name: name,
+              targetScope: target,
+              preventDefault: function() {
+                event.defaultPrevented = true;
+              },
+              defaultPrevented: false
+            };
+
+        if (!target.$$listenerCount[name]) return event;
+
+        var listenerArgs = concat([event], arguments, 1),
+            listeners, i, length;
+
+        //down while you can, then up and next sibling or up and next sibling until back at root
+        while ((current = next)) {
+          event.currentScope = current;
+          listeners = current.$$listeners[name] || [];
+          for (i = 0, length = listeners.length; i < length; i++) {
+            // if listeners were deregistered, defragment the array
+            if (!listeners[i]) {
+              listeners.splice(i, 1);
+              i--;
+              length--;
+              continue;
+            }
+
+            try {
+              listeners[i].apply(null, listenerArgs);
+            } catch (e) {
+              $exceptionHandler(e);
+            }
+          }
+
+          // Insanity Warning: scope depth-first traversal
+          // yes, this code is a bit crazy, but it works and we have tests to prove it!
+          // this piece should be kept in sync with the traversal in $digest
+          // (though it differs due to having the extra check for $$listenerCount)
+          if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
+              (current !== target && current.$$nextSibling)))) {
+            while (current !== target && !(next = current.$$nextSibling)) {
+              current = current.$parent;
+            }
+          }
+        }
+
+        event.currentScope = null;
+        return event;
+      }
+    };
+
+    var $rootScope = new Scope();
+
+    //The internal queues. Expose them on the $rootScope for debugging/testing purposes.
+    var asyncQueue = $rootScope.$$asyncQueue = [];
+    var postDigestQueue = $rootScope.$$postDigestQueue = [];
+    var applyAsyncQueue = $rootScope.$$applyAsyncQueue = [];
+
+    return $rootScope;
+
+
+    function beginPhase(phase) {
+      if ($rootScope.$$phase) {
+        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
+      }
+
+      $rootScope.$$phase = phase;
+    }
+
+    function clearPhase() {
+      $rootScope.$$phase = null;
+    }
+
+    function incrementWatchersCount(current, count) {
+      do {
+        current.$$watchersCount += count;
+      } while ((current = current.$parent));
+    }
+
+    function decrementListenerCount(current, count, name) {
+      do {
+        current.$$listenerCount[name] -= count;
+
+        if (current.$$listenerCount[name] === 0) {
+          delete current.$$listenerCount[name];
+        }
+      } while ((current = current.$parent));
+    }
+
+    /**
+     * function used as an initial value for watchers.
+     * because it's unique we can easily tell it apart from other values
+     */
+    function initWatchVal() {}
+
+    function flushApplyAsync() {
+      while (applyAsyncQueue.length) {
+        try {
+          applyAsyncQueue.shift()();
+        } catch (e) {
+          $exceptionHandler(e);
+        }
+      }
+      applyAsyncId = null;
+    }
+
+    function scheduleApplyAsync() {
+      if (applyAsyncId === null) {
+        applyAsyncId = $browser.defer(function() {
+          $rootScope.$apply(flushApplyAsync);
+        });
+      }
+    }
+  }];
+}
+
+/**
+ * @description
+ * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
+ */
+function $$SanitizeUriProvider() {
+  var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/,
+    imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/;
+
+  /**
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during a[href] sanitization.
+   *
+   * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+   *
+   * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.aHrefSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      aHrefSanitizationWhitelist = regexp;
+      return this;
+    }
+    return aHrefSanitizationWhitelist;
+  };
+
+
+  /**
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during img[src] sanitization.
+   *
+   * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+   *
+   * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.imgSrcSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      imgSrcSanitizationWhitelist = regexp;
+      return this;
+    }
+    return imgSrcSanitizationWhitelist;
+  };
+
+  this.$get = function() {
+    return function sanitizeUri(uri, isImage) {
+      var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
+      var normalizedVal;
+      normalizedVal = urlResolve(uri).href;
+      if (normalizedVal !== '' && !normalizedVal.match(regex)) {
+        return 'unsafe:' + normalizedVal;
+      }
+      return uri;
+    };
+  };
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+var $sceMinErr = minErr('$sce');
+
+var SCE_CONTEXTS = {
+  HTML: 'html',
+  CSS: 'css',
+  URL: 'url',
+  // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a
+  // url.  (e.g. ng-include, script src, templateUrl)
+  RESOURCE_URL: 'resourceUrl',
+  JS: 'js'
+};
+
+// Helper functions follow.
+
+function adjustMatcher(matcher) {
+  if (matcher === 'self') {
+    return matcher;
+  } else if (isString(matcher)) {
+    // Strings match exactly except for 2 wildcards - '*' and '**'.
+    // '*' matches any character except those from the set ':/.?&'.
+    // '**' matches any character (like .* in a RegExp).
+    // More than 2 *'s raises an error as it's ill defined.
+    if (matcher.indexOf('***') > -1) {
+      throw $sceMinErr('iwcard',
+          'Illegal sequence *** in string matcher.  String: {0}', matcher);
+    }
+    matcher = escapeForRegexp(matcher).
+                  replace('\\*\\*', '.*').
+                  replace('\\*', '[^:/.?&;]*');
+    return new RegExp('^' + matcher + '$');
+  } else if (isRegExp(matcher)) {
+    // The only other type of matcher allowed is a Regexp.
+    // Match entire URL / disallow partial matches.
+    // Flags are reset (i.e. no global, ignoreCase or multiline)
+    return new RegExp('^' + matcher.source + '$');
+  } else {
+    throw $sceMinErr('imatcher',
+        'Matchers may only be "self", string patterns or RegExp objects');
+  }
+}
+
+
+function adjustMatchers(matchers) {
+  var adjustedMatchers = [];
+  if (isDefined(matchers)) {
+    forEach(matchers, function(matcher) {
+      adjustedMatchers.push(adjustMatcher(matcher));
+    });
+  }
+  return adjustedMatchers;
+}
+
+
+/**
+ * @ngdoc service
+ * @name $sceDelegate
+ * @kind function
+ *
+ * @description
+ *
+ * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
+ * Contextual Escaping (SCE)} services to AngularJS.
+ *
+ * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
+ * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
+ * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
+ * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
+ * work because `$sce` delegates to `$sceDelegate` for these operations.
+ *
+ * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
+ *
+ * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
+ * can override it completely to change the behavior of `$sce`, the common case would
+ * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
+ * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
+ * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
+ * $sceDelegateProvider.resourceUrlWhitelist} and {@link
+ * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+ */
+
+/**
+ * @ngdoc provider
+ * @name $sceDelegateProvider
+ * @description
+ *
+ * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
+ * $sceDelegate} service.  This allows one to get/set the whitelists and blacklists used to ensure
+ * that the URLs used for sourcing Angular templates are safe.  Refer {@link
+ * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and
+ * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+ *
+ * For the general details about this service in Angular, read the main page for {@link ng.$sce
+ * Strict Contextual Escaping (SCE)}.
+ *
+ * **Example**:  Consider the following case. <a name="example"></a>
+ *
+ * - your app is hosted at url `http://myapp.example.com/`
+ * - but some of your templates are hosted on other domains you control such as
+ *   `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc.
+ * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
+ *
+ * Here is what a secure configuration for this scenario might look like:
+ *
+ * ```
+ *  angular.module('myApp', []).config(function($sceDelegateProvider) {
+ *    $sceDelegateProvider.resourceUrlWhitelist([
+ *      // Allow same origin resource loads.
+ *      'self',
+ *      // Allow loading from our assets domain.  Notice the difference between * and **.
+ *      'http://srv*.assets.example.com/**'
+ *    ]);
+ *
+ *    // The blacklist overrides the whitelist so the open redirect here is blocked.
+ *    $sceDelegateProvider.resourceUrlBlacklist([
+ *      'http://myapp.example.com/clickThru**'
+ *    ]);
+ *  });
+ * ```
+ */
+
+function $SceDelegateProvider() {
+  this.SCE_CONTEXTS = SCE_CONTEXTS;
+
+  // Resource URLs can also be trusted by policy.
+  var resourceUrlWhitelist = ['self'],
+      resourceUrlBlacklist = [];
+
+  /**
+   * @ngdoc method
+   * @name $sceDelegateProvider#resourceUrlWhitelist
+   * @kind function
+   *
+   * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
+   *     provided.  This must be an array or null.  A snapshot of this array is used so further
+   *     changes to the array are ignored.
+   *
+   *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+   *     allowed in this array.
+   *
+   *     Note: **an empty whitelist array will block all URLs**!
+   *
+   * @return {Array} the currently set whitelist array.
+   *
+   * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
+   * same origin resource requests.
+   *
+   * @description
+   * Sets/Gets the whitelist of trusted resource URLs.
+   */
+  this.resourceUrlWhitelist = function(value) {
+    if (arguments.length) {
+      resourceUrlWhitelist = adjustMatchers(value);
+    }
+    return resourceUrlWhitelist;
+  };
+
+  /**
+   * @ngdoc method
+   * @name $sceDelegateProvider#resourceUrlBlacklist
+   * @kind function
+   *
+   * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
+   *     provided.  This must be an array or null.  A snapshot of this array is used so further
+   *     changes to the array are ignored.
+   *
+   *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+   *     allowed in this array.
+   *
+   *     The typical usage for the blacklist is to **block
+   *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
+   *     these would otherwise be trusted but actually return content from the redirected domain.
+   *
+   *     Finally, **the blacklist overrides the whitelist** and has the final say.
+   *
+   * @return {Array} the currently set blacklist array.
+   *
+   * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
+   * is no blacklist.)
+   *
+   * @description
+   * Sets/Gets the blacklist of trusted resource URLs.
+   */
+
+  this.resourceUrlBlacklist = function(value) {
+    if (arguments.length) {
+      resourceUrlBlacklist = adjustMatchers(value);
+    }
+    return resourceUrlBlacklist;
+  };
+
+  this.$get = ['$injector', function($injector) {
+
+    var htmlSanitizer = function htmlSanitizer(html) {
+      throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+    };
+
+    if ($injector.has('$sanitize')) {
+      htmlSanitizer = $injector.get('$sanitize');
+    }
+
+
+    function matchUrl(matcher, parsedUrl) {
+      if (matcher === 'self') {
+        return urlIsSameOrigin(parsedUrl);
+      } else {
+        // definitely a regex.  See adjustMatchers()
+        return !!matcher.exec(parsedUrl.href);
+      }
+    }
+
+    function isResourceUrlAllowedByPolicy(url) {
+      var parsedUrl = urlResolve(url.toString());
+      var i, n, allowed = false;
+      // Ensure that at least one item from the whitelist allows this url.
+      for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
+        if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
+          allowed = true;
+          break;
+        }
+      }
+      if (allowed) {
+        // Ensure that no item from the blacklist blocked this url.
+        for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
+          if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
+            allowed = false;
+            break;
+          }
+        }
+      }
+      return allowed;
+    }
+
+    function generateHolderType(Base) {
+      var holderType = function TrustedValueHolderType(trustedValue) {
+        this.$$unwrapTrustedValue = function() {
+          return trustedValue;
+        };
+      };
+      if (Base) {
+        holderType.prototype = new Base();
+      }
+      holderType.prototype.valueOf = function sceValueOf() {
+        return this.$$unwrapTrustedValue();
+      };
+      holderType.prototype.toString = function sceToString() {
+        return this.$$unwrapTrustedValue().toString();
+      };
+      return holderType;
+    }
+
+    var trustedValueHolderBase = generateHolderType(),
+        byType = {};
+
+    byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
+
+    /**
+     * @ngdoc method
+     * @name $sceDelegate#trustAs
+     *
+     * @description
+     * Returns an object that is trusted by angular for use in specified strict
+     * contextual escaping contexts (such as ng-bind-html, ng-include, any src
+     * attribute interpolation, any dom event binding attribute interpolation
+     * such as for onclick,  etc.) that uses the provided value.
+     * See {@link ng.$sce $sce} for enabling strict contextual escaping.
+     *
+     * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
+     *   resourceUrl, html, js and css.
+     * @param {*} value The value that that should be considered trusted/safe.
+     * @returns {*} A value that can be used to stand in for the provided `value` in places
+     * where Angular expects a $sce.trustAs() return value.
+     */
+    function trustAs(type, trustedValue) {
+      var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+      if (!Constructor) {
+        throw $sceMinErr('icontext',
+            'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
+            type, trustedValue);
+      }
+      if (trustedValue === null || trustedValue === undefined || trustedValue === '') {
+        return trustedValue;
+      }
+      // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
+      // mutable objects, we ensure here that the value passed in is actually a string.
+      if (typeof trustedValue !== 'string') {
+        throw $sceMinErr('itype',
+            'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
+            type);
+      }
+      return new Constructor(trustedValue);
+    }
+
+    /**
+     * @ngdoc method
+     * @name $sceDelegate#valueOf
+     *
+     * @description
+     * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
+     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
+     * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
+     *
+     * If the passed parameter is not a value that had been returned by {@link
+     * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is.
+     *
+     * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
+     *      call or anything else.
+     * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
+     *     `value` unchanged.
+     */
+    function valueOf(maybeTrusted) {
+      if (maybeTrusted instanceof trustedValueHolderBase) {
+        return maybeTrusted.$$unwrapTrustedValue();
+      } else {
+        return maybeTrusted;
+      }
+    }
+
+    /**
+     * @ngdoc method
+     * @name $sceDelegate#getTrusted
+     *
+     * @description
+     * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and
+     * returns the originally supplied value if the queried context type is a supertype of the
+     * created type.  If this condition isn't satisfied, throws an exception.
+     *
+     * @param {string} type The kind of context in which this value is to be used.
+     * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} call.
+     * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} if valid in this context.  Otherwise, throws an exception.
+     */
+    function getTrusted(type, maybeTrusted) {
+      if (maybeTrusted === null || maybeTrusted === undefined || maybeTrusted === '') {
+        return maybeTrusted;
+      }
+      var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+      if (constructor && maybeTrusted instanceof constructor) {
+        return maybeTrusted.$$unwrapTrustedValue();
+      }
+      // If we get here, then we may only take one of two actions.
+      // 1. sanitize the value for the requested type, or
+      // 2. throw an exception.
+      if (type === SCE_CONTEXTS.RESOURCE_URL) {
+        if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
+          return maybeTrusted;
+        } else {
+          throw $sceMinErr('insecurl',
+              'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
+              maybeTrusted.toString());
+        }
+      } else if (type === SCE_CONTEXTS.HTML) {
+        return htmlSanitizer(maybeTrusted);
+      }
+      throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+    }
+
+    return { trustAs: trustAs,
+             getTrusted: getTrusted,
+             valueOf: valueOf };
+  }];
+}
+
+
+/**
+ * @ngdoc provider
+ * @name $sceProvider
+ * @description
+ *
+ * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
+ * -   enable/disable Strict Contextual Escaping (SCE) in a module
+ * -   override the default implementation with a custom delegate
+ *
+ * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
+ */
+
+/* jshint maxlen: false*/
+
+/**
+ * @ngdoc service
+ * @name $sce
+ * @kind function
+ *
+ * @description
+ *
+ * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
+ *
+ * # Strict Contextual Escaping
+ *
+ * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain
+ * contexts to result in a value that is marked as safe to use for that context.  One example of
+ * such a context is binding arbitrary html controlled by the user via `ng-bind-html`.  We refer
+ * to these contexts as privileged or SCE contexts.
+ *
+ * As of version 1.2, Angular ships with SCE enabled by default.
+ *
+ * Note:  When enabled (the default), IE<11 in quirks mode is not supported.  In this mode, IE<11 allow
+ * one to execute arbitrary javascript by the use of the expression() syntax.  Refer
+ * <http://blogs.msdn.com/b/ie/archive/2008/10/16/ending-expressions.aspx> to learn more about them.
+ * You can ensure your document is in standards mode and not quirks mode by adding `<!doctype html>`
+ * to the top of your HTML document.
+ *
+ * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for
+ * security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
+ *
+ * Here's an example of a binding in a privileged context:
+ *
+ * ```
+ * <input ng-model="userHtml" aria-label="User input">
+ * <div ng-bind-html="userHtml"></div>
+ * ```
+ *
+ * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
+ * disabled, this application allows the user to render arbitrary HTML into the DIV.
+ * In a more realistic example, one may be rendering user comments, blog articles, etc. via
+ * bindings.  (HTML is just one example of a context where rendering user controlled input creates
+ * security vulnerabilities.)
+ *
+ * For the case of HTML, you might use a library, either on the client side, or on the server side,
+ * to sanitize unsafe HTML before binding to the value and rendering it in the document.
+ *
+ * How would you ensure that every place that used these types of bindings was bound to a value that
+ * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
+ * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
+ * properties/fields and forgot to update the binding to the sanitized value?
+ *
+ * To be secure by default, you want to ensure that any such bindings are disallowed unless you can
+ * determine that something explicitly says it's safe to use a value for binding in that
+ * context.  You can then audit your code (a simple grep would do) to ensure that this is only done
+ * for those values that you can easily tell are safe - because they were received from your server,
+ * sanitized by your library, etc.  You can organize your codebase to help with this - perhaps
+ * allowing only the files in a specific directory to do this.  Ensuring that the internal API
+ * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task.
+ *
+ * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
+ * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
+ * obtain values that will be accepted by SCE / privileged contexts.
+ *
+ *
+ * ## How does it work?
+ *
+ * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
+ * $sce.getTrusted(context, value)} rather than to the value directly.  Directives use {@link
+ * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the
+ * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals.
+ *
+ * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
+ * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
+ * simplified):
+ *
+ * ```
+ * var ngBindHtmlDirective = ['$sce', function($sce) {
+ *   return function(scope, element, attr) {
+ *     scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
+ *       element.html(value || '');
+ *     });
+ *   };
+ * }];
+ * ```
+ *
+ * ## Impact on loading templates
+ *
+ * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
+ * `templateUrl`'s specified by {@link guide/directive directives}.
+ *
+ * By default, Angular only loads templates from the same domain and protocol as the application
+ * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
+ * protocols, you may either either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
+ * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
+ *
+ * *Please note*:
+ * The browser's
+ * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+ * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+ * policy apply in addition to this and may further restrict whether the template is successfully
+ * loaded.  This means that without the right CORS policy, loading templates from a different domain
+ * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
+ * browsers.
+ *
+ * ## This feels like too much overhead
+ *
+ * It's important to remember that SCE only applies to interpolation expressions.
+ *
+ * If your expressions are constant literals, they're automatically trusted and you don't need to
+ * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g.
+ * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works.
+ *
+ * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
+ * through {@link ng.$sce#getTrusted $sce.getTrusted}.  SCE doesn't play a role here.
+ *
+ * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
+ * templates in `ng-include` from your application's domain without having to even know about SCE.
+ * It blocks loading templates from other domains or loading templates over http from an https
+ * served document.  You can change these by setting your own custom {@link
+ * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
+ * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
+ *
+ * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
+ * application that's secure and can be audited to verify that with much more ease than bolting
+ * security onto an application later.
+ *
+ * <a name="contexts"></a>
+ * ## What trusted context types are supported?
+ *
+ * | Context             | Notes          |
+ * |---------------------|----------------|
+ * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered and the {@link ngSanitize $sanitize} module is present this will sanitize the value instead of throwing an error. |
+ * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently unused.  Feel free to use it in your own directives. |
+ * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=` and `<img src=` sanitize their urls and don't constitute an SCE context. |
+ * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
+ * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently unused.  Feel free to use it in your own directives. |
+ *
+ * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
+ *
+ *  Each element in these arrays must be one of the following:
+ *
+ *  - **'self'**
+ *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
+ *      domain** as the application document using the **same protocol**.
+ *  - **String** (except the special value `'self'`)
+ *    - The string is matched against the full *normalized / absolute URL* of the resource
+ *      being tested (substring matches are not good enough.)
+ *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
+ *      match themselves.
+ *    - `*`: matches zero or more occurrences of any character other than one of the following 6
+ *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and ';'.  It's a useful wildcard for use
+ *      in a whitelist.
+ *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
+ *      not appropriate to use in for a scheme, domain, etc. as it would match too much.  (e.g.
+ *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
+ *      not have been the intention.)  Its usage at the very end of the path is ok.  (e.g.
+ *      http://foo.example.com/templates/**).
+ *  - **RegExp** (*see caveat below*)
+ *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
+ *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
+ *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
+ *      have good test coverage.).  For instance, the use of `.` in the regex is correct only in a
+ *      small number of cases.  A `.` character in the regex used when matching the scheme or a
+ *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
+ *      is highly recommended to use the string patterns and only fall back to regular expressions
+ *      if they as a last resort.
+ *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
+ *      matched against the **entire** *normalized / absolute URL* of the resource being tested
+ *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
+ *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
+ *    - If you are generating your JavaScript from some other templating engine (not
+ *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
+ *      remember to escape your regular expression (and be aware that you might need more than
+ *      one level of escaping depending on your templating engine and the way you interpolated
+ *      the value.)  Do make use of your platform's escaping mechanism as it might be good
+ *      enough before coding your own.  e.g. Ruby has
+ *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
+ *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
+ *      Javascript lacks a similar built in function for escaping.  Take a look at Google
+ *      Closure library's [goog.string.regExpEscape(s)](
+ *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
+ *
+ * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
+ *
+ * ## Show me an example using SCE.
+ *
+ * <example module="mySceApp" deps="angular-sanitize.js">
+ * <file name="index.html">
+ *   <div ng-controller="AppController as myCtrl">
+ *     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
+ *     <b>User comments</b><br>
+ *     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
+ *     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
+ *     exploit.
+ *     <div class="well">
+ *       <div ng-repeat="userComment in myCtrl.userComments">
+ *         <b>{{userComment.name}}</b>:
+ *         <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
+ *         <br>
+ *       </div>
+ *     </div>
+ *   </div>
+ * </file>
+ *
+ * <file name="script.js">
+ *   angular.module('mySceApp', ['ngSanitize'])
+ *     .controller('AppController', ['$http', '$templateCache', '$sce',
+ *       function($http, $templateCache, $sce) {
+ *         var self = this;
+ *         $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) {
+ *           self.userComments = userComments;
+ *         });
+ *         self.explicitlyTrustedHtml = $sce.trustAsHtml(
+ *             '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+ *             'sanitization.&quot;">Hover over this text.</span>');
+ *       }]);
+ * </file>
+ *
+ * <file name="test_data.json">
+ * [
+ *   { "name": "Alice",
+ *     "htmlComment":
+ *         "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
+ *   },
+ *   { "name": "Bob",
+ *     "htmlComment": "<i>Yes!</i>  Am I the only other one?"
+ *   }
+ * ]
+ * </file>
+ *
+ * <file name="protractor.js" type="protractor">
+ *   describe('SCE doc demo', function() {
+ *     it('should sanitize untrusted values', function() {
+ *       expect(element.all(by.css('.htmlComment')).first().getInnerHtml())
+ *           .toBe('<span>Is <i>anyone</i> reading this?</span>');
+ *     });
+ *
+ *     it('should NOT sanitize explicitly trusted values', function() {
+ *       expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe(
+ *           '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+ *           'sanitization.&quot;">Hover over this text.</span>');
+ *     });
+ *   });
+ * </file>
+ * </example>
+ *
+ *
+ *
+ * ## Can I disable SCE completely?
+ *
+ * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
+ * for little coding overhead.  It will be much harder to take an SCE disabled application and
+ * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
+ * for cases where you have a lot of existing code that was written before SCE was introduced and
+ * you're migrating them a module at a time.
+ *
+ * That said, here's how you can completely disable SCE:
+ *
+ * ```
+ * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
+ *   // Completely disable SCE.  For demonstration purposes only!
+ *   // Do not use in new projects.
+ *   $sceProvider.enabled(false);
+ * });
+ * ```
+ *
+ */
+/* jshint maxlen: 100 */
+
+function $SceProvider() {
+  var enabled = true;
+
+  /**
+   * @ngdoc method
+   * @name $sceProvider#enabled
+   * @kind function
+   *
+   * @param {boolean=} value If provided, then enables/disables SCE.
+   * @return {boolean} true if SCE is enabled, false otherwise.
+   *
+   * @description
+   * Enables/disables SCE and returns the current value.
+   */
+  this.enabled = function(value) {
+    if (arguments.length) {
+      enabled = !!value;
+    }
+    return enabled;
+  };
+
+
+  /* Design notes on the default implementation for SCE.
+   *
+   * The API contract for the SCE delegate
+   * -------------------------------------
+   * The SCE delegate object must provide the following 3 methods:
+   *
+   * - trustAs(contextEnum, value)
+   *     This method is used to tell the SCE service that the provided value is OK to use in the
+   *     contexts specified by contextEnum.  It must return an object that will be accepted by
+   *     getTrusted() for a compatible contextEnum and return this value.
+   *
+   * - valueOf(value)
+   *     For values that were not produced by trustAs(), return them as is.  For values that were
+   *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
+   *     trustAs is wrapping the given values into some type, this operation unwraps it when given
+   *     such a value.
+   *
+   * - getTrusted(contextEnum, value)
+   *     This function should return the a value that is safe to use in the context specified by
+   *     contextEnum or throw and exception otherwise.
+   *
+   * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
+   * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
+   * instance, an implementation could maintain a registry of all trusted objects by context.  In
+   * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
+   * return the same object passed in if it was found in the registry under a compatible context or
+   * throw an exception otherwise.  An implementation might only wrap values some of the time based
+   * on some criteria.  getTrusted() might return a value and not throw an exception for special
+   * constants or objects even if not wrapped.  All such implementations fulfill this contract.
+   *
+   *
+   * A note on the inheritance model for SCE contexts
+   * ------------------------------------------------
+   * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
+   * is purely an implementation details.
+   *
+   * The contract is simply this:
+   *
+   *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
+   *     will also succeed.
+   *
+   * Inheritance happens to capture this in a natural way.  In some future, we
+   * may not use inheritance anymore.  That is OK because no code outside of
+   * sce.js and sceSpecs.js would need to be aware of this detail.
+   */
+
+  this.$get = ['$parse', '$sceDelegate', function(
+                $parse,   $sceDelegate) {
+    // Prereq: Ensure that we're not running in IE<11 quirks mode.  In that mode, IE < 11 allow
+    // the "expression(javascript expression)" syntax which is insecure.
+    if (enabled && msie < 8) {
+      throw $sceMinErr('iequirks',
+        'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' +
+        'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
+        'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
+    }
+
+    var sce = shallowCopy(SCE_CONTEXTS);
+
+    /**
+     * @ngdoc method
+     * @name $sce#isEnabled
+     * @kind function
+     *
+     * @return {Boolean} true if SCE is enabled, false otherwise.  If you want to set the value, you
+     * have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
+     *
+     * @description
+     * Returns a boolean indicating if SCE is enabled.
+     */
+    sce.isEnabled = function() {
+      return enabled;
+    };
+    sce.trustAs = $sceDelegate.trustAs;
+    sce.getTrusted = $sceDelegate.getTrusted;
+    sce.valueOf = $sceDelegate.valueOf;
+
+    if (!enabled) {
+      sce.trustAs = sce.getTrusted = function(type, value) { return value; };
+      sce.valueOf = identity;
+    }
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAs
+     *
+     * @description
+     * Converts Angular {@link guide/expression expression} into a function.  This is like {@link
+     * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
+     * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
+     * *result*)}
+     *
+     * @param {string} type The kind of SCE context in which this result will be used.
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+    sce.parseAs = function sceParseAs(type, expr) {
+      var parsed = $parse(expr);
+      if (parsed.literal && parsed.constant) {
+        return parsed;
+      } else {
+        return $parse(expr, function(value) {
+          return sce.getTrusted(type, value);
+        });
+      }
+    };
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAs
+     *
+     * @description
+     * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.  As such,
+     * returns an object that is trusted by angular for use in specified strict contextual
+     * escaping contexts (such as ng-bind-html, ng-include, any src attribute
+     * interpolation, any dom event binding attribute interpolation such as for onclick,  etc.)
+     * that uses the provided value.  See * {@link ng.$sce $sce} for enabling strict contextual
+     * escaping.
+     *
+     * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
+     *   resourceUrl, html, js and css.
+     * @param {*} value The value that that should be considered trusted/safe.
+     * @returns {*} A value that can be used to stand in for the provided `value` in places
+     * where Angular expects a $sce.trustAs() return value.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsHtml
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsHtml(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml
+     *     $sce.getTrustedHtml(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the
+     *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsUrl(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl
+     *     $sce.getTrustedUrl(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the
+     *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsResourceUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl
+     *     $sce.getTrustedResourceUrl(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the return
+     *     value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsJs
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsJs(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs
+     *     $sce.getTrustedJs(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the
+     *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrusted
+     *
+     * @description
+     * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
+     * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the
+     * originally supplied value if the queried context type is a supertype of the created type.
+     * If this condition isn't satisfied, throws an exception.
+     *
+     * @param {string} type The kind of context in which this value is to be used.
+     * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`}
+     *                         call.
+     * @returns {*} The value the was originally provided to
+     *              {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context.
+     *              Otherwise, throws an exception.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedHtml
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedHtml(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedCss
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedCss(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedUrl(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedResourceUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
+     *
+     * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedJs
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedJs(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsHtml
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsHtml(expression string)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsCss
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsCss(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsUrl(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsResourceUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsJs
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsJs(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    // Shorthand delegations.
+    var parse = sce.parseAs,
+        getTrusted = sce.getTrusted,
+        trustAs = sce.trustAs;
+
+    forEach(SCE_CONTEXTS, function(enumValue, name) {
+      var lName = lowercase(name);
+      sce[camelCase("parse_as_" + lName)] = function(expr) {
+        return parse(enumValue, expr);
+      };
+      sce[camelCase("get_trusted_" + lName)] = function(value) {
+        return getTrusted(enumValue, value);
+      };
+      sce[camelCase("trust_as_" + lName)] = function(value) {
+        return trustAs(enumValue, value);
+      };
+    });
+
+    return sce;
+  }];
+}
+
+/**
+ * !!! This is an undocumented "private" service !!!
+ *
+ * @name $sniffer
+ * @requires $window
+ * @requires $document
+ *
+ * @property {boolean} history Does the browser support html5 history api ?
+ * @property {boolean} transitions Does the browser support CSS transition events ?
+ * @property {boolean} animations Does the browser support CSS animation events ?
+ *
+ * @description
+ * This is very simple implementation of testing browser's features.
+ */
+function $SnifferProvider() {
+  this.$get = ['$window', '$document', function($window, $document) {
+    var eventSupport = {},
+        android =
+          toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
+        boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
+        document = $document[0] || {},
+        vendorPrefix,
+        vendorRegex = /^(Moz|webkit|ms)(?=[A-Z])/,
+        bodyStyle = document.body && document.body.style,
+        transitions = false,
+        animations = false,
+        match;
+
+    if (bodyStyle) {
+      for (var prop in bodyStyle) {
+        if (match = vendorRegex.exec(prop)) {
+          vendorPrefix = match[0];
+          vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1);
+          break;
+        }
+      }
+
+      if (!vendorPrefix) {
+        vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit';
+      }
+
+      transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle));
+      animations  = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle));
+
+      if (android && (!transitions ||  !animations)) {
+        transitions = isString(bodyStyle.webkitTransition);
+        animations = isString(bodyStyle.webkitAnimation);
+      }
+    }
+
+
+    return {
+      // Android has history.pushState, but it does not update location correctly
+      // so let's not use the history API at all.
+      // http://code.google.com/p/android/issues/detail?id=17471
+      // https://github.com/angular/angular.js/issues/904
+
+      // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
+      // so let's not use the history API also
+      // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
+      // jshint -W018
+      history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
+      // jshint +W018
+      hasEvent: function(event) {
+        // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
+        // it. In particular the event is not fired when backspace or delete key are pressed or
+        // when cut operation is performed.
+        // IE10+ implements 'input' event but it erroneously fires under various situations,
+        // e.g. when placeholder changes, or a form is focused.
+        if (event === 'input' && msie <= 11) return false;
+
+        if (isUndefined(eventSupport[event])) {
+          var divElm = document.createElement('div');
+          eventSupport[event] = 'on' + event in divElm;
+        }
+
+        return eventSupport[event];
+      },
+      csp: csp(),
+      vendorPrefix: vendorPrefix,
+      transitions: transitions,
+      animations: animations,
+      android: android
+    };
+  }];
+}
+
+var $compileMinErr = minErr('$compile');
+
+/**
+ * @ngdoc service
+ * @name $templateRequest
+ *
+ * @description
+ * The `$templateRequest` service downloads the provided template using `$http` and, upon success,
+ * stores the contents inside of `$templateCache`. If the HTTP request fails or the response data
+ * of the HTTP request is empty, a `$compile` error will be thrown (the exception can be thwarted
+ * by setting the 2nd parameter of the function to true).
+ *
+ * @param {string} tpl The HTTP request template URL
+ * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty
+ *
+ * @return {Promise} a promise for the HTTP response data of the given URL.
+ *
+ * @property {number} totalPendingRequests total amount of pending template requests being downloaded.
+ */
+function $TemplateRequestProvider() {
+  this.$get = ['$templateCache', '$http', '$q', function($templateCache, $http, $q) {
+    function handleRequestFn(tpl, ignoreRequestError) {
+      handleRequestFn.totalPendingRequests++;
+
+      var transformResponse = $http.defaults && $http.defaults.transformResponse;
+
+      if (isArray(transformResponse)) {
+        transformResponse = transformResponse.filter(function(transformer) {
+          return transformer !== defaultHttpResponseTransform;
+        });
+      } else if (transformResponse === defaultHttpResponseTransform) {
+        transformResponse = null;
+      }
+
+      var httpOptions = {
+        cache: $templateCache,
+        transformResponse: transformResponse
+      };
+
+      return $http.get(tpl, httpOptions)
+        ['finally'](function() {
+          handleRequestFn.totalPendingRequests--;
+        })
+        .then(function(response) {
+          $templateCache.put(tpl, response.data);
+          return response.data;
+        }, handleError);
+
+      function handleError(resp) {
+        if (!ignoreRequestError) {
+          throw $compileMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})',
+            tpl, resp.status, resp.statusText);
+        }
+        return $q.reject(resp);
+      }
+    }
+
+    handleRequestFn.totalPendingRequests = 0;
+
+    return handleRequestFn;
+  }];
+}
+
+function $$TestabilityProvider() {
+  this.$get = ['$rootScope', '$browser', '$location',
+       function($rootScope,   $browser,   $location) {
+
+    /**
+     * @name $testability
+     *
+     * @description
+     * The private $$testability service provides a collection of methods for use when debugging
+     * or by automated test and debugging tools.
+     */
+    var testability = {};
+
+    /**
+     * @name $$testability#findBindings
+     *
+     * @description
+     * Returns an array of elements that are bound (via ng-bind or {{}})
+     * to expressions matching the input.
+     *
+     * @param {Element} element The element root to search from.
+     * @param {string} expression The binding expression to match.
+     * @param {boolean} opt_exactMatch If true, only returns exact matches
+     *     for the expression. Filters and whitespace are ignored.
+     */
+    testability.findBindings = function(element, expression, opt_exactMatch) {
+      var bindings = element.getElementsByClassName('ng-binding');
+      var matches = [];
+      forEach(bindings, function(binding) {
+        var dataBinding = angular.element(binding).data('$binding');
+        if (dataBinding) {
+          forEach(dataBinding, function(bindingName) {
+            if (opt_exactMatch) {
+              var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)');
+              if (matcher.test(bindingName)) {
+                matches.push(binding);
+              }
+            } else {
+              if (bindingName.indexOf(expression) != -1) {
+                matches.push(binding);
+              }
+            }
+          });
+        }
+      });
+      return matches;
+    };
+
+    /**
+     * @name $$testability#findModels
+     *
+     * @description
+     * Returns an array of elements that are two-way found via ng-model to
+     * expressions matching the input.
+     *
+     * @param {Element} element The element root to search from.
+     * @param {string} expression The model expression to match.
+     * @param {boolean} opt_exactMatch If true, only returns exact matches
+     *     for the expression.
+     */
+    testability.findModels = function(element, expression, opt_exactMatch) {
+      var prefixes = ['ng-', 'data-ng-', 'ng\\:'];
+      for (var p = 0; p < prefixes.length; ++p) {
+        var attributeEquals = opt_exactMatch ? '=' : '*=';
+        var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]';
+        var elements = element.querySelectorAll(selector);
+        if (elements.length) {
+          return elements;
+        }
+      }
+    };
+
+    /**
+     * @name $$testability#getLocation
+     *
+     * @description
+     * Shortcut for getting the location in a browser agnostic way. Returns
+     *     the path, search, and hash. (e.g. /path?a=b#hash)
+     */
+    testability.getLocation = function() {
+      return $location.url();
+    };
+
+    /**
+     * @name $$testability#setLocation
+     *
+     * @description
+     * Shortcut for navigating to a location without doing a full page reload.
+     *
+     * @param {string} url The location url (path, search and hash,
+     *     e.g. /path?a=b#hash) to go to.
+     */
+    testability.setLocation = function(url) {
+      if (url !== $location.url()) {
+        $location.url(url);
+        $rootScope.$digest();
+      }
+    };
+
+    /**
+     * @name $$testability#whenStable
+     *
+     * @description
+     * Calls the callback when $timeout and $http requests are completed.
+     *
+     * @param {function} callback
+     */
+    testability.whenStable = function(callback) {
+      $browser.notifyWhenNoOutstandingRequests(callback);
+    };
+
+    return testability;
+  }];
+}
+
+function $TimeoutProvider() {
+  this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler',
+       function($rootScope,   $browser,   $q,   $$q,   $exceptionHandler) {
+
+    var deferreds = {};
+
+
+     /**
+      * @ngdoc service
+      * @name $timeout
+      *
+      * @description
+      * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
+      * block and delegates any exceptions to
+      * {@link ng.$exceptionHandler $exceptionHandler} service.
+      *
+      * The return value of calling `$timeout` is a promise, which will be resolved when
+      * the delay has passed and the timeout function, if provided, is executed.
+      *
+      * To cancel a timeout request, call `$timeout.cancel(promise)`.
+      *
+      * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
+      * synchronously flush the queue of deferred functions.
+      *
+      * If you only want a promise that will be resolved after some specified delay
+      * then you can call `$timeout` without the `fn` function.
+      *
+      * @param {function()=} fn A function, whose execution should be delayed.
+      * @param {number=} [delay=0] Delay in milliseconds.
+      * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
+      *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+      * @param {...*=} Pass additional parameters to the executed function.
+      * @returns {Promise} Promise that will be resolved when the timeout is reached. The value this
+      *   promise will be resolved with is the return value of the `fn` function.
+      *
+      */
+    function timeout(fn, delay, invokeApply) {
+      if (!isFunction(fn)) {
+        invokeApply = delay;
+        delay = fn;
+        fn = noop;
+      }
+
+      var args = sliceArgs(arguments, 3),
+          skipApply = (isDefined(invokeApply) && !invokeApply),
+          deferred = (skipApply ? $$q : $q).defer(),
+          promise = deferred.promise,
+          timeoutId;
+
+      timeoutId = $browser.defer(function() {
+        try {
+          deferred.resolve(fn.apply(null, args));
+        } catch (e) {
+          deferred.reject(e);
+          $exceptionHandler(e);
+        }
+        finally {
+          delete deferreds[promise.$$timeoutId];
+        }
+
+        if (!skipApply) $rootScope.$apply();
+      }, delay);
+
+      promise.$$timeoutId = timeoutId;
+      deferreds[timeoutId] = deferred;
+
+      return promise;
+    }
+
+
+     /**
+      * @ngdoc method
+      * @name $timeout#cancel
+      *
+      * @description
+      * Cancels a task associated with the `promise`. As a result of this, the promise will be
+      * resolved with a rejection.
+      *
+      * @param {Promise=} promise Promise returned by the `$timeout` function.
+      * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
+      *   canceled.
+      */
+    timeout.cancel = function(promise) {
+      if (promise && promise.$$timeoutId in deferreds) {
+        deferreds[promise.$$timeoutId].reject('canceled');
+        delete deferreds[promise.$$timeoutId];
+        return $browser.defer.cancel(promise.$$timeoutId);
+      }
+      return false;
+    };
+
+    return timeout;
+  }];
+}
+
+// NOTE:  The usage of window and document instead of $window and $document here is
+// deliberate.  This service depends on the specific behavior of anchor nodes created by the
+// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
+// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
+// doesn't know about mocked locations and resolves URLs to the real document - which is
+// exactly the behavior needed here.  There is little value is mocking these out for this
+// service.
+var urlParsingNode = document.createElement("a");
+var originUrl = urlResolve(window.location.href);
+
+
+/**
+ *
+ * Implementation Notes for non-IE browsers
+ * ----------------------------------------
+ * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
+ * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
+ * URL will be resolved into an absolute URL in the context of the application document.
+ * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
+ * properties are all populated to reflect the normalized URL.  This approach has wide
+ * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc.  See
+ * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+ *
+ * Implementation Notes for IE
+ * ---------------------------
+ * IE >= 8 and <= 10 normalizes the URL when assigned to the anchor node similar to the other
+ * browsers.  However, the parsed components will not be set if the URL assigned did not specify
+ * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
+ * work around that by performing the parsing in a 2nd step by taking a previously normalized
+ * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
+ * properties such as protocol, hostname, port, etc.
+ *
+ * IE7 does not normalize the URL when assigned to an anchor node.  (Apparently, it does, if one
+ * uses the inner HTML approach to assign the URL as part of an HTML snippet -
+ * http://stackoverflow.com/a/472729)  However, setting img[src] does normalize the URL.
+ * Unfortunately, setting img[src] to something like "javascript:foo" on IE throws an exception.
+ * Since the primary usage for normalizing URLs is to sanitize such URLs, we can't use that
+ * method and IE < 8 is unsupported.
+ *
+ * References:
+ *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
+ *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+ *   http://url.spec.whatwg.org/#urlutils
+ *   https://github.com/angular/angular.js/pull/2902
+ *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+ *
+ * @kind function
+ * @param {string} url The URL to be parsed.
+ * @description Normalizes and parses a URL.
+ * @returns {object} Returns the normalized URL as a dictionary.
+ *
+ *   | member name   | Description    |
+ *   |---------------|----------------|
+ *   | href          | A normalized version of the provided URL if it was not an absolute URL |
+ *   | protocol      | The protocol including the trailing colon                              |
+ *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
+ *   | search        | The search params, minus the question mark                             |
+ *   | hash          | The hash string, minus the hash symbol
+ *   | hostname      | The hostname
+ *   | port          | The port, without ":"
+ *   | pathname      | The pathname, beginning with "/"
+ *
+ */
+function urlResolve(url) {
+  var href = url;
+
+  if (msie) {
+    // Normalize before parse.  Refer Implementation Notes on why this is
+    // done in two steps on IE.
+    urlParsingNode.setAttribute("href", href);
+    href = urlParsingNode.href;
+  }
+
+  urlParsingNode.setAttribute('href', href);
+
+  // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
+  return {
+    href: urlParsingNode.href,
+    protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
+    host: urlParsingNode.host,
+    search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
+    hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
+    hostname: urlParsingNode.hostname,
+    port: urlParsingNode.port,
+    pathname: (urlParsingNode.pathname.charAt(0) === '/')
+      ? urlParsingNode.pathname
+      : '/' + urlParsingNode.pathname
+  };
+}
+
+/**
+ * Parse a request URL and determine whether this is a same-origin request as the application document.
+ *
+ * @param {string|object} requestUrl The url of the request as a string that will be resolved
+ * or a parsed URL object.
+ * @returns {boolean} Whether the request is for the same origin as the application document.
+ */
+function urlIsSameOrigin(requestUrl) {
+  var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
+  return (parsed.protocol === originUrl.protocol &&
+          parsed.host === originUrl.host);
+}
+
+/**
+ * @ngdoc service
+ * @name $window
+ *
+ * @description
+ * A reference to the browser's `window` object. While `window`
+ * is globally available in JavaScript, it causes testability problems, because
+ * it is a global variable. In angular we always refer to it through the
+ * `$window` service, so it may be overridden, removed or mocked for testing.
+ *
+ * Expressions, like the one defined for the `ngClick` directive in the example
+ * below, are evaluated with respect to the current scope.  Therefore, there is
+ * no risk of inadvertently coding in a dependency on a global value in such an
+ * expression.
+ *
+ * @example
+   <example module="windowExample">
+     <file name="index.html">
+       <script>
+         angular.module('windowExample', [])
+           .controller('ExampleController', ['$scope', '$window', function($scope, $window) {
+             $scope.greeting = 'Hello, World!';
+             $scope.doGreeting = function(greeting) {
+               $window.alert(greeting);
+             };
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <input type="text" ng-model="greeting" aria-label="greeting" />
+         <button ng-click="doGreeting(greeting)">ALERT</button>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+      it('should display the greeting in the input box', function() {
+       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
+       // If we click the button it will block the test runner
+       // element(':button').click();
+      });
+     </file>
+   </example>
+ */
+function $WindowProvider() {
+  this.$get = valueFn(window);
+}
+
+/**
+ * @name $$cookieReader
+ * @requires $document
+ *
+ * @description
+ * This is a private service for reading cookies used by $http and ngCookies
+ *
+ * @return {Object} a key/value map of the current cookies
+ */
+function $$CookieReader($document) {
+  var rawDocument = $document[0] || {};
+  var lastCookies = {};
+  var lastCookieString = '';
+
+  function safeDecodeURIComponent(str) {
+    try {
+      return decodeURIComponent(str);
+    } catch (e) {
+      return str;
+    }
+  }
+
+  return function() {
+    var cookieArray, cookie, i, index, name;
+    var currentCookieString = rawDocument.cookie || '';
+
+    if (currentCookieString !== lastCookieString) {
+      lastCookieString = currentCookieString;
+      cookieArray = lastCookieString.split('; ');
+      lastCookies = {};
+
+      for (i = 0; i < cookieArray.length; i++) {
+        cookie = cookieArray[i];
+        index = cookie.indexOf('=');
+        if (index > 0) { //ignore nameless cookies
+          name = safeDecodeURIComponent(cookie.substring(0, index));
+          // the first value that is seen for a cookie is the most
+          // specific one.  values for the same cookie name that
+          // follow are for less specific paths.
+          if (lastCookies[name] === undefined) {
+            lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
+          }
+        }
+      }
+    }
+    return lastCookies;
+  };
+}
+
+$$CookieReader.$inject = ['$document'];
+
+function $$CookieReaderProvider() {
+  this.$get = $$CookieReader;
+}
+
+/* global currencyFilter: true,
+ dateFilter: true,
+ filterFilter: true,
+ jsonFilter: true,
+ limitToFilter: true,
+ lowercaseFilter: true,
+ numberFilter: true,
+ orderByFilter: true,
+ uppercaseFilter: true,
+ */
+
+/**
+ * @ngdoc provider
+ * @name $filterProvider
+ * @description
+ *
+ * Filters are just functions which transform input to an output. However filters need to be
+ * Dependency Injected. To achieve this a filter definition consists of a factory function which is
+ * annotated with dependencies and is responsible for creating a filter function.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+ * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+ * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+ * (`myapp_subsection_filterx`).
+ * </div>
+ *
+ * ```js
+ *   // Filter registration
+ *   function MyModule($provide, $filterProvider) {
+ *     // create a service to demonstrate injection (not always needed)
+ *     $provide.value('greet', function(name){
+ *       return 'Hello ' + name + '!';
+ *     });
+ *
+ *     // register a filter factory which uses the
+ *     // greet service to demonstrate DI.
+ *     $filterProvider.register('greet', function(greet){
+ *       // return the filter function which uses the greet service
+ *       // to generate salutation
+ *       return function(text) {
+ *         // filters need to be forgiving so check input validity
+ *         return text && greet(text) || text;
+ *       };
+ *     });
+ *   }
+ * ```
+ *
+ * The filter function is registered with the `$injector` under the filter name suffix with
+ * `Filter`.
+ *
+ * ```js
+ *   it('should be the same instance', inject(
+ *     function($filterProvider) {
+ *       $filterProvider.register('reverse', function(){
+ *         return ...;
+ *       });
+ *     },
+ *     function($filter, reverseFilter) {
+ *       expect($filter('reverse')).toBe(reverseFilter);
+ *     });
+ * ```
+ *
+ *
+ * For more information about how angular filters work, and how to create your own filters, see
+ * {@link guide/filter Filters} in the Angular Developer Guide.
+ */
+
+/**
+ * @ngdoc service
+ * @name $filter
+ * @kind function
+ * @description
+ * Filters are used for formatting data displayed to the user.
+ *
+ * The general syntax in templates is as follows:
+ *
+ *         {{ expression [| filter_name[:parameter_value] ... ] }}
+ *
+ * @param {String} name Name of the filter function to retrieve
+ * @return {Function} the filter function
+ * @example
+   <example name="$filter" module="filterExample">
+     <file name="index.html">
+       <div ng-controller="MainCtrl">
+        <h3>{{ originalText }}</h3>
+        <h3>{{ filteredText }}</h3>
+       </div>
+     </file>
+
+     <file name="script.js">
+      angular.module('filterExample', [])
+      .controller('MainCtrl', function($scope, $filter) {
+        $scope.originalText = 'hello';
+        $scope.filteredText = $filter('uppercase')($scope.originalText);
+      });
+     </file>
+   </example>
+  */
+$FilterProvider.$inject = ['$provide'];
+function $FilterProvider($provide) {
+  var suffix = 'Filter';
+
+  /**
+   * @ngdoc method
+   * @name $filterProvider#register
+   * @param {string|Object} name Name of the filter function, or an object map of filters where
+   *    the keys are the filter names and the values are the filter factories.
+   *
+   *    <div class="alert alert-warning">
+   *    **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+   *    Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+   *    your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+   *    (`myapp_subsection_filterx`).
+   *    </div>
+   * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
+   *    of the registered filter instances.
+   */
+  function register(name, factory) {
+    if (isObject(name)) {
+      var filters = {};
+      forEach(name, function(filter, key) {
+        filters[key] = register(key, filter);
+      });
+      return filters;
+    } else {
+      return $provide.factory(name + suffix, factory);
+    }
+  }
+  this.register = register;
+
+  this.$get = ['$injector', function($injector) {
+    return function(name) {
+      return $injector.get(name + suffix);
+    };
+  }];
+
+  ////////////////////////////////////////
+
+  /* global
+    currencyFilter: false,
+    dateFilter: false,
+    filterFilter: false,
+    jsonFilter: false,
+    limitToFilter: false,
+    lowercaseFilter: false,
+    numberFilter: false,
+    orderByFilter: false,
+    uppercaseFilter: false,
+  */
+
+  register('currency', currencyFilter);
+  register('date', dateFilter);
+  register('filter', filterFilter);
+  register('json', jsonFilter);
+  register('limitTo', limitToFilter);
+  register('lowercase', lowercaseFilter);
+  register('number', numberFilter);
+  register('orderBy', orderByFilter);
+  register('uppercase', uppercaseFilter);
+}
+
+/**
+ * @ngdoc filter
+ * @name filter
+ * @kind function
+ *
+ * @description
+ * Selects a subset of items from `array` and returns it as a new array.
+ *
+ * @param {Array} array The source array.
+ * @param {string|Object|function()} expression The predicate to be used for selecting items from
+ *   `array`.
+ *
+ *   Can be one of:
+ *
+ *   - `string`: The string is used for matching against the contents of the `array`. All strings or
+ *     objects with string properties in `array` that match this string will be returned. This also
+ *     applies to nested object properties.
+ *     The predicate can be negated by prefixing the string with `!`.
+ *
+ *   - `Object`: A pattern object can be used to filter specific properties on objects contained
+ *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
+ *     which have property `name` containing "M" and property `phone` containing "1". A special
+ *     property name `$` can be used (as in `{$:"text"}`) to accept a match against any
+ *     property of the object or its nested object properties. That's equivalent to the simple
+ *     substring match with a `string` as described above. The predicate can be negated by prefixing
+ *     the string with `!`.
+ *     For example `{name: "!M"}` predicate will return an array of items which have property `name`
+ *     not containing "M".
+ *
+ *     Note that a named property will match properties on the same level only, while the special
+ *     `$` property will match properties on the same level or deeper. E.g. an array item like
+ *     `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but
+ *     **will** be matched by `{$: 'John'}`.
+ *
+ *   - `function(value, index)`: A predicate function can be used to write arbitrary filters. The
+ *     function is called for each element of `array`. The final result is an array of those
+ *     elements that the predicate returned true for.
+ *
+ * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
+ *     determining if the expected value (from the filter expression) and actual value (from
+ *     the object in the array) should be considered a match.
+ *
+ *   Can be one of:
+ *
+ *   - `function(actual, expected)`:
+ *     The function will be given the object value and the predicate value to compare and
+ *     should return true if both values should be considered equal.
+ *
+ *   - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`.
+ *     This is essentially strict comparison of expected and actual.
+ *
+ *   - `false|undefined`: A short hand for a function which will look for a substring match in case
+ *     insensitive way.
+ *
+ *     Primitive values are converted to strings. Objects are not compared against primitives,
+ *     unless they have a custom `toString` method (e.g. `Date` objects).
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <div ng-init="friends = [{name:'John', phone:'555-1276'},
+                                {name:'Mary', phone:'800-BIG-MARY'},
+                                {name:'Mike', phone:'555-4321'},
+                                {name:'Adam', phone:'555-5678'},
+                                {name:'Julie', phone:'555-8765'},
+                                {name:'Juliette', phone:'555-5678'}]"></div>
+
+       <label>Search: <input ng-model="searchText"></label>
+       <table id="searchTextResults">
+         <tr><th>Name</th><th>Phone</th></tr>
+         <tr ng-repeat="friend in friends | filter:searchText">
+           <td>{{friend.name}}</td>
+           <td>{{friend.phone}}</td>
+         </tr>
+       </table>
+       <hr>
+       <label>Any: <input ng-model="search.$"></label> <br>
+       <label>Name only <input ng-model="search.name"></label><br>
+       <label>Phone only <input ng-model="search.phone"></label><br>
+       <label>Equality <input type="checkbox" ng-model="strict"></label><br>
+       <table id="searchObjResults">
+         <tr><th>Name</th><th>Phone</th></tr>
+         <tr ng-repeat="friendObj in friends | filter:search:strict">
+           <td>{{friendObj.name}}</td>
+           <td>{{friendObj.phone}}</td>
+         </tr>
+       </table>
+     </file>
+     <file name="protractor.js" type="protractor">
+       var expectFriendNames = function(expectedNames, key) {
+         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
+           arr.forEach(function(wd, i) {
+             expect(wd.getText()).toMatch(expectedNames[i]);
+           });
+         });
+       };
+
+       it('should search across all fields when filtering with a string', function() {
+         var searchText = element(by.model('searchText'));
+         searchText.clear();
+         searchText.sendKeys('m');
+         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
+
+         searchText.clear();
+         searchText.sendKeys('76');
+         expectFriendNames(['John', 'Julie'], 'friend');
+       });
+
+       it('should search in specific fields when filtering with a predicate object', function() {
+         var searchAny = element(by.model('search.$'));
+         searchAny.clear();
+         searchAny.sendKeys('i');
+         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
+       });
+       it('should use a equal comparison when comparator is true', function() {
+         var searchName = element(by.model('search.name'));
+         var strict = element(by.model('strict'));
+         searchName.clear();
+         searchName.sendKeys('Julie');
+         strict.click();
+         expectFriendNames(['Julie'], 'friendObj');
+       });
+     </file>
+   </example>
+ */
+function filterFilter() {
+  return function(array, expression, comparator) {
+    if (!isArrayLike(array)) {
+      if (array == null) {
+        return array;
+      } else {
+        throw minErr('filter')('notarray', 'Expected array but received: {0}', array);
+      }
+    }
+
+    var expressionType = getTypeForFilter(expression);
+    var predicateFn;
+    var matchAgainstAnyProp;
+
+    switch (expressionType) {
+      case 'function':
+        predicateFn = expression;
+        break;
+      case 'boolean':
+      case 'null':
+      case 'number':
+      case 'string':
+        matchAgainstAnyProp = true;
+        //jshint -W086
+      case 'object':
+        //jshint +W086
+        predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp);
+        break;
+      default:
+        return array;
+    }
+
+    return Array.prototype.filter.call(array, predicateFn);
+  };
+}
+
+function hasCustomToString(obj) {
+  return isFunction(obj.toString) && obj.toString !== Object.prototype.toString;
+}
+
+// Helper functions for `filterFilter`
+function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
+  var shouldMatchPrimitives = isObject(expression) && ('$' in expression);
+  var predicateFn;
+
+  if (comparator === true) {
+    comparator = equals;
+  } else if (!isFunction(comparator)) {
+    comparator = function(actual, expected) {
+      if (isUndefined(actual)) {
+        // No substring matching against `undefined`
+        return false;
+      }
+      if ((actual === null) || (expected === null)) {
+        // No substring matching against `null`; only match against `null`
+        return actual === expected;
+      }
+      if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) {
+        // Should not compare primitives against objects, unless they have custom `toString` method
+        return false;
+      }
+
+      actual = lowercase('' + actual);
+      expected = lowercase('' + expected);
+      return actual.indexOf(expected) !== -1;
+    };
+  }
+
+  predicateFn = function(item) {
+    if (shouldMatchPrimitives && !isObject(item)) {
+      return deepCompare(item, expression.$, comparator, false);
+    }
+    return deepCompare(item, expression, comparator, matchAgainstAnyProp);
+  };
+
+  return predicateFn;
+}
+
+function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) {
+  var actualType = getTypeForFilter(actual);
+  var expectedType = getTypeForFilter(expected);
+
+  if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
+    return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp);
+  } else if (isArray(actual)) {
+    // In case `actual` is an array, consider it a match
+    // if ANY of it's items matches `expected`
+    return actual.some(function(item) {
+      return deepCompare(item, expected, comparator, matchAgainstAnyProp);
+    });
+  }
+
+  switch (actualType) {
+    case 'object':
+      var key;
+      if (matchAgainstAnyProp) {
+        for (key in actual) {
+          if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) {
+            return true;
+          }
+        }
+        return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false);
+      } else if (expectedType === 'object') {
+        for (key in expected) {
+          var expectedVal = expected[key];
+          if (isFunction(expectedVal) || isUndefined(expectedVal)) {
+            continue;
+          }
+
+          var matchAnyProperty = key === '$';
+          var actualVal = matchAnyProperty ? actual : actual[key];
+          if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) {
+            return false;
+          }
+        }
+        return true;
+      } else {
+        return comparator(actual, expected);
+      }
+      break;
+    case 'function':
+      return false;
+    default:
+      return comparator(actual, expected);
+  }
+}
+
+// Used for easily differentiating between `null` and actual `object`
+function getTypeForFilter(val) {
+  return (val === null) ? 'null' : typeof val;
+}
+
+/**
+ * @ngdoc filter
+ * @name currency
+ * @kind function
+ *
+ * @description
+ * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
+ * symbol for current locale is used.
+ *
+ * @param {number} amount Input to filter.
+ * @param {string=} symbol Currency symbol or identifier to be displayed.
+ * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
+ * @returns {string} Formatted number.
+ *
+ *
+ * @example
+   <example module="currencyExample">
+     <file name="index.html">
+       <script>
+         angular.module('currencyExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.amount = 1234.56;
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <input type="number" ng-model="amount" aria-label="amount"> <br>
+         default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
+         custom currency identifier (USD$): <span id="currency-custom">{{amount | currency:"USD$"}}</span>
+         no fractions (0): <span id="currency-no-fractions">{{amount | currency:"USD$":0}}</span>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should init with 1234.56', function() {
+         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
+         expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235');
+       });
+       it('should update', function() {
+         if (browser.params.browser == 'safari') {
+           // Safari does not understand the minus key. See
+           // https://github.com/angular/protractor/issues/481
+           return;
+         }
+         element(by.model('amount')).clear();
+         element(by.model('amount')).sendKeys('-1234');
+         expect(element(by.id('currency-default')).getText()).toBe('($1,234.00)');
+         expect(element(by.id('currency-custom')).getText()).toBe('(USD$1,234.00)');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('(USD$1,234)');
+       });
+     </file>
+   </example>
+ */
+currencyFilter.$inject = ['$locale'];
+function currencyFilter($locale) {
+  var formats = $locale.NUMBER_FORMATS;
+  return function(amount, currencySymbol, fractionSize) {
+    if (isUndefined(currencySymbol)) {
+      currencySymbol = formats.CURRENCY_SYM;
+    }
+
+    if (isUndefined(fractionSize)) {
+      fractionSize = formats.PATTERNS[1].maxFrac;
+    }
+
+    // if null or undefined pass it through
+    return (amount == null)
+        ? amount
+        : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize).
+            replace(/\u00A4/g, currencySymbol);
+  };
+}
+
+/**
+ * @ngdoc filter
+ * @name number
+ * @kind function
+ *
+ * @description
+ * Formats a number as text.
+ *
+ * If the input is not a number an empty string is returned.
+ *
+ * If the input is an infinite (Infinity/-Infinity) the Infinity symbol '∞' is returned.
+ *
+ * @param {number|string} number Number to format.
+ * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
+ * If this is not provided then the fraction size is computed from the current locale's number
+ * formatting pattern. In the case of the default locale, it will be 3.
+ * @returns {string} Number rounded to decimalPlaces and places a “,” after each third digit.
+ *
+ * @example
+   <example module="numberFilterExample">
+     <file name="index.html">
+       <script>
+         angular.module('numberFilterExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.val = 1234.56789;
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <label>Enter number: <input ng-model='val'></label><br>
+         Default formatting: <span id='number-default'>{{val | number}}</span><br>
+         No fractions: <span>{{val | number:0}}</span><br>
+         Negative number: <span>{{-val | number:4}}</span>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should format numbers', function() {
+         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
+         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
+       });
+
+       it('should update', function() {
+         element(by.model('val')).clear();
+         element(by.model('val')).sendKeys('3374.333');
+         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
+         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
+      });
+     </file>
+   </example>
+ */
+
+
+numberFilter.$inject = ['$locale'];
+function numberFilter($locale) {
+  var formats = $locale.NUMBER_FORMATS;
+  return function(number, fractionSize) {
+
+    // if null or undefined pass it through
+    return (number == null)
+        ? number
+        : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
+                       fractionSize);
+  };
+}
+
+var DECIMAL_SEP = '.';
+function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
+  if (isObject(number)) return '';
+
+  var isNegative = number < 0;
+  number = Math.abs(number);
+
+  var isInfinity = number === Infinity;
+  if (!isInfinity && !isFinite(number)) return '';
+
+  var numStr = number + '',
+      formatedText = '',
+      hasExponent = false,
+      parts = [];
+
+  if (isInfinity) formatedText = '\u221e';
+
+  if (!isInfinity && numStr.indexOf('e') !== -1) {
+    var match = numStr.match(/([\d\.]+)e(-?)(\d+)/);
+    if (match && match[2] == '-' && match[3] > fractionSize + 1) {
+      number = 0;
+    } else {
+      formatedText = numStr;
+      hasExponent = true;
+    }
+  }
+
+  if (!isInfinity && !hasExponent) {
+    var fractionLen = (numStr.split(DECIMAL_SEP)[1] || '').length;
+
+    // determine fractionSize if it is not specified
+    if (isUndefined(fractionSize)) {
+      fractionSize = Math.min(Math.max(pattern.minFrac, fractionLen), pattern.maxFrac);
+    }
+
+    // safely round numbers in JS without hitting imprecisions of floating-point arithmetics
+    // inspired by:
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/round
+    number = +(Math.round(+(number.toString() + 'e' + fractionSize)).toString() + 'e' + -fractionSize);
+
+    var fraction = ('' + number).split(DECIMAL_SEP);
+    var whole = fraction[0];
+    fraction = fraction[1] || '';
+
+    var i, pos = 0,
+        lgroup = pattern.lgSize,
+        group = pattern.gSize;
+
+    if (whole.length >= (lgroup + group)) {
+      pos = whole.length - lgroup;
+      for (i = 0; i < pos; i++) {
+        if ((pos - i) % group === 0 && i !== 0) {
+          formatedText += groupSep;
+        }
+        formatedText += whole.charAt(i);
+      }
+    }
+
+    for (i = pos; i < whole.length; i++) {
+      if ((whole.length - i) % lgroup === 0 && i !== 0) {
+        formatedText += groupSep;
+      }
+      formatedText += whole.charAt(i);
+    }
+
+    // format fraction part.
+    while (fraction.length < fractionSize) {
+      fraction += '0';
+    }
+
+    if (fractionSize && fractionSize !== "0") formatedText += decimalSep + fraction.substr(0, fractionSize);
+  } else {
+    if (fractionSize > 0 && number < 1) {
+      formatedText = number.toFixed(fractionSize);
+      number = parseFloat(formatedText);
+    }
+  }
+
+  if (number === 0) {
+    isNegative = false;
+  }
+
+  parts.push(isNegative ? pattern.negPre : pattern.posPre,
+             formatedText,
+             isNegative ? pattern.negSuf : pattern.posSuf);
+  return parts.join('');
+}
+
+function padNumber(num, digits, trim) {
+  var neg = '';
+  if (num < 0) {
+    neg =  '-';
+    num = -num;
+  }
+  num = '' + num;
+  while (num.length < digits) num = '0' + num;
+  if (trim) {
+    num = num.substr(num.length - digits);
+  }
+  return neg + num;
+}
+
+
+function dateGetter(name, size, offset, trim) {
+  offset = offset || 0;
+  return function(date) {
+    var value = date['get' + name]();
+    if (offset > 0 || value > -offset) {
+      value += offset;
+    }
+    if (value === 0 && offset == -12) value = 12;
+    return padNumber(value, size, trim);
+  };
+}
+
+function dateStrGetter(name, shortForm) {
+  return function(date, formats) {
+    var value = date['get' + name]();
+    var get = uppercase(shortForm ? ('SHORT' + name) : name);
+
+    return formats[get][value];
+  };
+}
+
+function timeZoneGetter(date, formats, offset) {
+  var zone = -1 * offset;
+  var paddedZone = (zone >= 0) ? "+" : "";
+
+  paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
+                padNumber(Math.abs(zone % 60), 2);
+
+  return paddedZone;
+}
+
+function getFirstThursdayOfYear(year) {
+    // 0 = index of January
+    var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay();
+    // 4 = index of Thursday (+1 to account for 1st = 5)
+    // 11 = index of *next* Thursday (+1 account for 1st = 12)
+    return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst);
+}
+
+function getThursdayThisWeek(datetime) {
+    return new Date(datetime.getFullYear(), datetime.getMonth(),
+      // 4 = index of Thursday
+      datetime.getDate() + (4 - datetime.getDay()));
+}
+
+function weekGetter(size) {
+   return function(date) {
+      var firstThurs = getFirstThursdayOfYear(date.getFullYear()),
+         thisThurs = getThursdayThisWeek(date);
+
+      var diff = +thisThurs - +firstThurs,
+         result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week
+
+      return padNumber(result, size);
+   };
+}
+
+function ampmGetter(date, formats) {
+  return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
+}
+
+function eraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
+}
+
+function longEraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
+}
+
+var DATE_FORMATS = {
+  yyyy: dateGetter('FullYear', 4),
+    yy: dateGetter('FullYear', 2, 0, true),
+     y: dateGetter('FullYear', 1),
+  MMMM: dateStrGetter('Month'),
+   MMM: dateStrGetter('Month', true),
+    MM: dateGetter('Month', 2, 1),
+     M: dateGetter('Month', 1, 1),
+    dd: dateGetter('Date', 2),
+     d: dateGetter('Date', 1),
+    HH: dateGetter('Hours', 2),
+     H: dateGetter('Hours', 1),
+    hh: dateGetter('Hours', 2, -12),
+     h: dateGetter('Hours', 1, -12),
+    mm: dateGetter('Minutes', 2),
+     m: dateGetter('Minutes', 1),
+    ss: dateGetter('Seconds', 2),
+     s: dateGetter('Seconds', 1),
+     // while ISO 8601 requires fractions to be prefixed with `.` or `,`
+     // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
+   sss: dateGetter('Milliseconds', 3),
+  EEEE: dateStrGetter('Day'),
+   EEE: dateStrGetter('Day', true),
+     a: ampmGetter,
+     Z: timeZoneGetter,
+    ww: weekGetter(2),
+     w: weekGetter(1),
+     G: eraGetter,
+     GG: eraGetter,
+     GGG: eraGetter,
+     GGGG: longEraGetter
+};
+
+var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,
+    NUMBER_STRING = /^\-?\d+$/;
+
+/**
+ * @ngdoc filter
+ * @name date
+ * @kind function
+ *
+ * @description
+ *   Formats `date` to a string based on the requested `format`.
+ *
+ *   `format` string can be composed of the following elements:
+ *
+ *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
+ *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
+ *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
+ *   * `'MMMM'`: Month in year (January-December)
+ *   * `'MMM'`: Month in year (Jan-Dec)
+ *   * `'MM'`: Month in year, padded (01-12)
+ *   * `'M'`: Month in year (1-12)
+ *   * `'dd'`: Day in month, padded (01-31)
+ *   * `'d'`: Day in month (1-31)
+ *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
+ *   * `'EEE'`: Day in Week, (Sun-Sat)
+ *   * `'HH'`: Hour in day, padded (00-23)
+ *   * `'H'`: Hour in day (0-23)
+ *   * `'hh'`: Hour in AM/PM, padded (01-12)
+ *   * `'h'`: Hour in AM/PM, (1-12)
+ *   * `'mm'`: Minute in hour, padded (00-59)
+ *   * `'m'`: Minute in hour (0-59)
+ *   * `'ss'`: Second in minute, padded (00-59)
+ *   * `'s'`: Second in minute (0-59)
+ *   * `'sss'`: Millisecond in second, padded (000-999)
+ *   * `'a'`: AM/PM marker
+ *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
+ *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
+ *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
+ *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
+ *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
+ *
+ *   `format` string can also be one of the following predefined
+ *   {@link guide/i18n localizable formats}:
+ *
+ *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
+ *     (e.g. Sep 3, 2010 12:05:08 PM)
+ *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 PM)
+ *   * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US  locale
+ *     (e.g. Friday, September 3, 2010)
+ *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
+ *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
+ *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
+ *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM)
+ *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM)
+ *
+ *   `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g.
+ *   `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence
+ *   (e.g. `"h 'o''clock'"`).
+ *
+ * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
+ *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its
+ *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
+ *    specified in the string input, the time is considered to be in the local timezone.
+ * @param {string=} format Formatting rules (see Description). If not specified,
+ *    `mediumDate` is used.
+ * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the
+ *    continental US time zone abbreviations, but for general use, use a time zone offset, for
+ *    example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+ *    If not specified, the timezone of the browser will be used.
+ * @returns {string} Formatted string or the input if input is not recognized as date/millis.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
+           <span>{{1288323623006 | date:'medium'}}</span><br>
+       <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
+          <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
+       <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
+          <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
+       <span ng-non-bindable>{{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}</span>:
+          <span>{{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should format date', function() {
+         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
+            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
+         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
+            toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/);
+         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
+            toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
+         expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()).
+            toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/);
+       });
+     </file>
+   </example>
+ */
+dateFilter.$inject = ['$locale'];
+function dateFilter($locale) {
+
+
+  var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
+                     // 1        2       3         4          5          6          7          8  9     10      11
+  function jsonStringToDate(string) {
+    var match;
+    if (match = string.match(R_ISO8601_STR)) {
+      var date = new Date(0),
+          tzHour = 0,
+          tzMin  = 0,
+          dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
+          timeSetter = match[8] ? date.setUTCHours : date.setHours;
+
+      if (match[9]) {
+        tzHour = toInt(match[9] + match[10]);
+        tzMin = toInt(match[9] + match[11]);
+      }
+      dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3]));
+      var h = toInt(match[4] || 0) - tzHour;
+      var m = toInt(match[5] || 0) - tzMin;
+      var s = toInt(match[6] || 0);
+      var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000);
+      timeSetter.call(date, h, m, s, ms);
+      return date;
+    }
+    return string;
+  }
+
+
+  return function(date, format, timezone) {
+    var text = '',
+        parts = [],
+        fn, match;
+
+    format = format || 'mediumDate';
+    format = $locale.DATETIME_FORMATS[format] || format;
+    if (isString(date)) {
+      date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date);
+    }
+
+    if (isNumber(date)) {
+      date = new Date(date);
+    }
+
+    if (!isDate(date) || !isFinite(date.getTime())) {
+      return date;
+    }
+
+    while (format) {
+      match = DATE_FORMATS_SPLIT.exec(format);
+      if (match) {
+        parts = concat(parts, match, 1);
+        format = parts.pop();
+      } else {
+        parts.push(format);
+        format = null;
+      }
+    }
+
+    var dateTimezoneOffset = date.getTimezoneOffset();
+    if (timezone) {
+      dateTimezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+      date = convertTimezoneToLocal(date, timezone, true);
+    }
+    forEach(parts, function(value) {
+      fn = DATE_FORMATS[value];
+      text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset)
+                 : value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
+    });
+
+    return text;
+  };
+}
+
+
+/**
+ * @ngdoc filter
+ * @name json
+ * @kind function
+ *
+ * @description
+ *   Allows you to convert a JavaScript object into JSON string.
+ *
+ *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
+ *   the binding is automatically converted to JSON.
+ *
+ * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
+ * @param {number=} spacing The number of spaces to use per indentation, defaults to 2.
+ * @returns {string} JSON string.
+ *
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <pre id="default-spacing">{{ {'name':'value'} | json }}</pre>
+       <pre id="custom-spacing">{{ {'name':'value'} | json:4 }}</pre>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should jsonify filtered objects', function() {
+         expect(element(by.id('default-spacing')).getText()).toMatch(/\{\n  "name": ?"value"\n}/);
+         expect(element(by.id('custom-spacing')).getText()).toMatch(/\{\n    "name": ?"value"\n}/);
+       });
+     </file>
+   </example>
+ *
+ */
+function jsonFilter() {
+  return function(object, spacing) {
+    if (isUndefined(spacing)) {
+        spacing = 2;
+    }
+    return toJson(object, spacing);
+  };
+}
+
+
+/**
+ * @ngdoc filter
+ * @name lowercase
+ * @kind function
+ * @description
+ * Converts string to lowercase.
+ * @see angular.lowercase
+ */
+var lowercaseFilter = valueFn(lowercase);
+
+
+/**
+ * @ngdoc filter
+ * @name uppercase
+ * @kind function
+ * @description
+ * Converts string to uppercase.
+ * @see angular.uppercase
+ */
+var uppercaseFilter = valueFn(uppercase);
+
+/**
+ * @ngdoc filter
+ * @name limitTo
+ * @kind function
+ *
+ * @description
+ * Creates a new array or string containing only a specified number of elements. The elements
+ * are taken from either the beginning or the end of the source array, string or number, as specified by
+ * the value and sign (positive or negative) of `limit`. If a number is used as input, it is
+ * converted to a string.
+ *
+ * @param {Array|string|number} input Source array, string or number to be limited.
+ * @param {string|number} limit The length of the returned array or string. If the `limit` number
+ *     is positive, `limit` number of items from the beginning of the source array/string are copied.
+ *     If the number is negative, `limit` number  of items from the end of the source array/string
+ *     are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
+ *     the input will be returned unchanged.
+ * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin`
+ *     indicates an offset from the end of `input`. Defaults to `0`.
+ * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
+ *     had less than `limit` elements.
+ *
+ * @example
+   <example module="limitToExample">
+     <file name="index.html">
+       <script>
+         angular.module('limitToExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.numbers = [1,2,3,4,5,6,7,8,9];
+             $scope.letters = "abcdefghi";
+             $scope.longNumber = 2345432342;
+             $scope.numLimit = 3;
+             $scope.letterLimit = 3;
+             $scope.longNumberLimit = 3;
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <label>
+            Limit {{numbers}} to:
+            <input type="number" step="1" ng-model="numLimit">
+         </label>
+         <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
+         <label>
+            Limit {{letters}} to:
+            <input type="number" step="1" ng-model="letterLimit">
+         </label>
+         <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
+         <label>
+            Limit {{longNumber}} to:
+            <input type="number" step="1" ng-model="longNumberLimit">
+         </label>
+         <p>Output long number: {{ longNumber | limitTo:longNumberLimit }}</p>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       var numLimitInput = element(by.model('numLimit'));
+       var letterLimitInput = element(by.model('letterLimit'));
+       var longNumberLimitInput = element(by.model('longNumberLimit'));
+       var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
+       var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
+       var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit'));
+
+       it('should limit the number array to first three items', function() {
+         expect(numLimitInput.getAttribute('value')).toBe('3');
+         expect(letterLimitInput.getAttribute('value')).toBe('3');
+         expect(longNumberLimitInput.getAttribute('value')).toBe('3');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abc');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 234');
+       });
+
+       // There is a bug in safari and protractor that doesn't like the minus key
+       // it('should update the output when -3 is entered', function() {
+       //   numLimitInput.clear();
+       //   numLimitInput.sendKeys('-3');
+       //   letterLimitInput.clear();
+       //   letterLimitInput.sendKeys('-3');
+       //   longNumberLimitInput.clear();
+       //   longNumberLimitInput.sendKeys('-3');
+       //   expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
+       //   expect(limitedLetters.getText()).toEqual('Output letters: ghi');
+       //   expect(limitedLongNumber.getText()).toEqual('Output long number: 342');
+       // });
+
+       it('should not exceed the maximum size of input array', function() {
+         numLimitInput.clear();
+         numLimitInput.sendKeys('100');
+         letterLimitInput.clear();
+         letterLimitInput.sendKeys('100');
+         longNumberLimitInput.clear();
+         longNumberLimitInput.sendKeys('100');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342');
+       });
+     </file>
+   </example>
+*/
+function limitToFilter() {
+  return function(input, limit, begin) {
+    if (Math.abs(Number(limit)) === Infinity) {
+      limit = Number(limit);
+    } else {
+      limit = toInt(limit);
+    }
+    if (isNaN(limit)) return input;
+
+    if (isNumber(input)) input = input.toString();
+    if (!isArray(input) && !isString(input)) return input;
+
+    begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
+    begin = (begin < 0 && begin >= -input.length) ? input.length + begin : begin;
+
+    if (limit >= 0) {
+      return input.slice(begin, begin + limit);
+    } else {
+      if (begin === 0) {
+        return input.slice(limit, input.length);
+      } else {
+        return input.slice(Math.max(0, begin + limit), begin);
+      }
+    }
+  };
+}
+
+/**
+ * @ngdoc filter
+ * @name orderBy
+ * @kind function
+ *
+ * @description
+ * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically
+ * for strings and numerically for numbers. Note: if you notice numbers are not being sorted
+ * correctly, make sure they are actually being saved as numbers and not strings.
+ *
+ * @param {Array} array The array to sort.
+ * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
+ *    used by the comparator to determine the order of elements.
+ *
+ *    Can be one of:
+ *
+ *    - `function`: Getter function. The result of this function will be sorted using the
+ *      `<`, `===`, `>` operator.
+ *    - `string`: An Angular expression. The result of this expression is used to compare elements
+ *      (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by
+ *      3 first characters of a property called `name`). The result of a constant expression
+ *      is interpreted as a property name to be used in comparisons (for example `"special name"`
+ *      to sort object by the value of their `special name` property). An expression can be
+ *      optionally prefixed with `+` or `-` to control ascending or descending sort order
+ *      (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array
+ *      element itself is used to compare where sorting.
+ *    - `Array`: An array of function or string predicates. The first predicate in the array
+ *      is used for sorting, but when two items are equivalent, the next predicate is used.
+ *
+ *    If the predicate is missing or empty then it defaults to `'+'`.
+ *
+ * @param {boolean=} reverse Reverse the order of the array.
+ * @returns {Array} Sorted copy of the source array.
+ *
+ *
+ * @example
+ * The example below demonstrates a simple ngRepeat, where the data is sorted
+ * by age in descending order (predicate is set to `'-age'`).
+ * `reverse` is not set, which means it defaults to `false`.
+   <example module="orderByExample">
+     <file name="index.html">
+       <script>
+         angular.module('orderByExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.friends =
+                 [{name:'John', phone:'555-1212', age:10},
+                  {name:'Mary', phone:'555-9876', age:19},
+                  {name:'Mike', phone:'555-4321', age:21},
+                  {name:'Adam', phone:'555-5678', age:35},
+                  {name:'Julie', phone:'555-8765', age:29}];
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <table class="friend">
+           <tr>
+             <th>Name</th>
+             <th>Phone Number</th>
+             <th>Age</th>
+           </tr>
+           <tr ng-repeat="friend in friends | orderBy:'-age'">
+             <td>{{friend.name}}</td>
+             <td>{{friend.phone}}</td>
+             <td>{{friend.age}}</td>
+           </tr>
+         </table>
+       </div>
+     </file>
+   </example>
+ *
+ * The predicate and reverse parameters can be controlled dynamically through scope properties,
+ * as shown in the next example.
+ * @example
+   <example module="orderByExample">
+     <file name="index.html">
+       <script>
+         angular.module('orderByExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.friends =
+                 [{name:'John', phone:'555-1212', age:10},
+                  {name:'Mary', phone:'555-9876', age:19},
+                  {name:'Mike', phone:'555-4321', age:21},
+                  {name:'Adam', phone:'555-5678', age:35},
+                  {name:'Julie', phone:'555-8765', age:29}];
+             $scope.predicate = '-age';
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
+         <hr/>
+         [ <a href="" ng-click="predicate=''">unsorted</a> ]
+         <table class="friend">
+           <tr>
+             <th><a href="" ng-click="predicate = 'name'; reverse=false">Name</a>
+                 (<a href="" ng-click="predicate = '-name'; reverse=false">^</a>)</th>
+             <th><a href="" ng-click="predicate = 'phone'; reverse=!reverse">Phone Number</a></th>
+             <th><a href="" ng-click="predicate = 'age'; reverse=!reverse">Age</a></th>
+           </tr>
+           <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
+             <td>{{friend.name}}</td>
+             <td>{{friend.phone}}</td>
+             <td>{{friend.age}}</td>
+           </tr>
+         </table>
+       </div>
+     </file>
+   </example>
+ *
+ * It's also possible to call the orderBy filter manually, by injecting `$filter`, retrieving the
+ * filter routine with `$filter('orderBy')`, and calling the returned filter routine with the
+ * desired parameters.
+ *
+ * Example:
+ *
+ * @example
+  <example module="orderByExample">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <table class="friend">
+          <tr>
+            <th><a href="" ng-click="reverse=false;order('name', false)">Name</a>
+              (<a href="" ng-click="order('-name',false)">^</a>)</th>
+            <th><a href="" ng-click="reverse=!reverse;order('phone', reverse)">Phone Number</a></th>
+            <th><a href="" ng-click="reverse=!reverse;order('age',reverse)">Age</a></th>
+          </tr>
+          <tr ng-repeat="friend in friends">
+            <td>{{friend.name}}</td>
+            <td>{{friend.phone}}</td>
+            <td>{{friend.age}}</td>
+          </tr>
+        </table>
+      </div>
+    </file>
+
+    <file name="script.js">
+      angular.module('orderByExample', [])
+        .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) {
+          var orderBy = $filter('orderBy');
+          $scope.friends = [
+            { name: 'John',    phone: '555-1212',    age: 10 },
+            { name: 'Mary',    phone: '555-9876',    age: 19 },
+            { name: 'Mike',    phone: '555-4321',    age: 21 },
+            { name: 'Adam',    phone: '555-5678',    age: 35 },
+            { name: 'Julie',   phone: '555-8765',    age: 29 }
+          ];
+          $scope.order = function(predicate, reverse) {
+            $scope.friends = orderBy($scope.friends, predicate, reverse);
+          };
+          $scope.order('-age',false);
+        }]);
+    </file>
+</example>
+ */
+orderByFilter.$inject = ['$parse'];
+function orderByFilter($parse) {
+  return function(array, sortPredicate, reverseOrder) {
+    if (!(isArrayLike(array))) return array;
+    sortPredicate = isArray(sortPredicate) ? sortPredicate : [sortPredicate];
+    if (sortPredicate.length === 0) { sortPredicate = ['+']; }
+    sortPredicate = sortPredicate.map(function(predicate) {
+      var descending = false, get = predicate || identity;
+      if (isString(predicate)) {
+        if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) {
+          descending = predicate.charAt(0) == '-';
+          predicate = predicate.substring(1);
+        }
+        if (predicate === '') {
+          // Effectively no predicate was passed so we compare identity
+          return reverseComparator(compare, descending);
+        }
+        get = $parse(predicate);
+        if (get.constant) {
+          var key = get();
+          return reverseComparator(function(a, b) {
+            return compare(a[key], b[key]);
+          }, descending);
+        }
+      }
+      return reverseComparator(function(a, b) {
+        return compare(get(a),get(b));
+      }, descending);
+    });
+    return slice.call(array).sort(reverseComparator(comparator, reverseOrder));
+
+    function comparator(o1, o2) {
+      for (var i = 0; i < sortPredicate.length; i++) {
+        var comp = sortPredicate[i](o1, o2);
+        if (comp !== 0) return comp;
+      }
+      return 0;
+    }
+    function reverseComparator(comp, descending) {
+      return descending
+          ? function(a, b) {return comp(b,a);}
+          : comp;
+    }
+
+    function isPrimitive(value) {
+      switch (typeof value) {
+        case 'number': /* falls through */
+        case 'boolean': /* falls through */
+        case 'string':
+          return true;
+        default:
+          return false;
+      }
+    }
+
+    function objectToString(value) {
+      if (value === null) return 'null';
+      if (typeof value.valueOf === 'function') {
+        value = value.valueOf();
+        if (isPrimitive(value)) return value;
+      }
+      if (typeof value.toString === 'function') {
+        value = value.toString();
+        if (isPrimitive(value)) return value;
+      }
+      return '';
+    }
+
+    function compare(v1, v2) {
+      var t1 = typeof v1;
+      var t2 = typeof v2;
+      if (t1 === t2 && t1 === "object") {
+        v1 = objectToString(v1);
+        v2 = objectToString(v2);
+      }
+      if (t1 === t2) {
+        if (t1 === "string") {
+           v1 = v1.toLowerCase();
+           v2 = v2.toLowerCase();
+        }
+        if (v1 === v2) return 0;
+        return v1 < v2 ? -1 : 1;
+      } else {
+        return t1 < t2 ? -1 : 1;
+      }
+    }
+  };
+}
+
+function ngDirective(directive) {
+  if (isFunction(directive)) {
+    directive = {
+      link: directive
+    };
+  }
+  directive.restrict = directive.restrict || 'AC';
+  return valueFn(directive);
+}
+
+/**
+ * @ngdoc directive
+ * @name a
+ * @restrict E
+ *
+ * @description
+ * Modifies the default behavior of the html A tag so that the default action is prevented when
+ * the href attribute is empty.
+ *
+ * This change permits the easy creation of action links with the `ngClick` directive
+ * without changing the location or causing page reloads, e.g.:
+ * `<a href="" ng-click="list.addItem()">Add Item</a>`
+ */
+var htmlAnchorDirective = valueFn({
+  restrict: 'E',
+  compile: function(element, attr) {
+    if (!attr.href && !attr.xlinkHref) {
+      return function(scope, element) {
+        // If the linked element is not an anchor tag anymore, do nothing
+        if (element[0].nodeName.toLowerCase() !== 'a') return;
+
+        // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
+        var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
+                   'xlink:href' : 'href';
+        element.on('click', function(event) {
+          // if we have no href url, then don't navigate anywhere.
+          if (!element.attr(href)) {
+            event.preventDefault();
+          }
+        });
+      };
+    }
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngHref
+ * @restrict A
+ * @priority 99
+ *
+ * @description
+ * Using Angular markup like `{{hash}}` in an href attribute will
+ * make the link go to the wrong URL if the user clicks it before
+ * Angular has a chance to replace the `{{hash}}` markup with its
+ * value. Until Angular replaces the markup the link will be broken
+ * and will most likely return a 404 error. The `ngHref` directive
+ * solves this problem.
+ *
+ * The wrong way to write it:
+ * ```html
+ * <a href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+ * ```
+ *
+ * The correct way to write it:
+ * ```html
+ * <a ng-href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+ * ```
+ *
+ * @element A
+ * @param {template} ngHref any string which can contain `{{}}` markup.
+ *
+ * @example
+ * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
+ * in links and their different behaviors:
+    <example>
+      <file name="index.html">
+        <input ng-model="value" /><br />
+        <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
+        <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
+        <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
+        <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
+        <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
+        <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should execute ng-click but not reload when href without value', function() {
+          element(by.id('link-1')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
+          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
+        });
+
+        it('should execute ng-click but not reload when href empty string', function() {
+          element(by.id('link-2')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
+          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
+        });
+
+        it('should execute ng-click and change url when ng-href specified', function() {
+          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
+
+          element(by.id('link-3')).click();
+
+          // At this point, we navigate away from an Angular page, so we need
+          // to use browser.driver to get the base webdriver.
+
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/123$/);
+            });
+          }, 5000, 'page should navigate to /123');
+        });
+
+        it('should execute ng-click but not reload when href empty string and name specified', function() {
+          element(by.id('link-4')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
+          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
+        });
+
+        it('should execute ng-click but not reload when no href but name specified', function() {
+          element(by.id('link-5')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
+          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
+        });
+
+        it('should only change url when only ng-href', function() {
+          element(by.model('value')).clear();
+          element(by.model('value')).sendKeys('6');
+          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
+
+          element(by.id('link-6')).click();
+
+          // At this point, we navigate away from an Angular page, so we need
+          // to use browser.driver to get the base webdriver.
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/6$/);
+            });
+          }, 5000, 'page should navigate to /6');
+        });
+      </file>
+    </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngSrc
+ * @restrict A
+ * @priority 99
+ *
+ * @description
+ * Using Angular markup like `{{hash}}` in a `src` attribute doesn't
+ * work right: The browser will fetch from the URL with the literal
+ * text `{{hash}}` until Angular replaces the expression inside
+ * `{{hash}}`. The `ngSrc` directive solves this problem.
+ *
+ * The buggy way to write it:
+ * ```html
+ * <img src="http://www.gravatar.com/avatar/{{hash}}" alt="Description"/>
+ * ```
+ *
+ * The correct way to write it:
+ * ```html
+ * <img ng-src="http://www.gravatar.com/avatar/{{hash}}" alt="Description" />
+ * ```
+ *
+ * @element IMG
+ * @param {template} ngSrc any string which can contain `{{}}` markup.
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngSrcset
+ * @restrict A
+ * @priority 99
+ *
+ * @description
+ * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't
+ * work right: The browser will fetch from the URL with the literal
+ * text `{{hash}}` until Angular replaces the expression inside
+ * `{{hash}}`. The `ngSrcset` directive solves this problem.
+ *
+ * The buggy way to write it:
+ * ```html
+ * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description"/>
+ * ```
+ *
+ * The correct way to write it:
+ * ```html
+ * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description" />
+ * ```
+ *
+ * @element IMG
+ * @param {template} ngSrcset any string which can contain `{{}}` markup.
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngDisabled
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ *
+ * This directive sets the `disabled` attribute on the element if the
+ * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy.
+ *
+ * A special directive is necessary because we cannot use interpolation inside the `disabled`
+ * attribute.  The following example would make the button enabled on Chrome/Firefox
+ * but not on older IEs:
+ *
+ * ```html
+ * <!-- See below for an example of ng-disabled being used correctly -->
+ * <div ng-init="isDisabled = false">
+ *  <button disabled="{{isDisabled}}">Disabled</button>
+ * </div>
+ * ```
+ *
+ * This is because the HTML specification does not require browsers to preserve the values of
+ * boolean attributes such as `disabled` (Their presence means true and their absence means false.)
+ * If we put an Angular interpolation expression into such an attribute then the
+ * binding information would be lost when the browser removes the attribute.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Click me to toggle: <input type="checkbox" ng-model="checked"></label><br/>
+        <button ng-model="button" ng-disabled="checked">Button</button>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should toggle button', function() {
+          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element INPUT
+ * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
+ *     then the `disabled` attribute will be set on the element
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngChecked
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ * The HTML specification does not require browsers to preserve the values of boolean attributes
+ * such as checked. (Their presence means true and their absence means false.)
+ * If we put an Angular interpolation expression into such an attribute then the
+ * binding information would be lost when the browser removes the attribute.
+ * The `ngChecked` directive solves this problem for the `checked` attribute.
+ * This complementary directive is not removed by the browser and so provides
+ * a permanent reliable place to store the binding information.
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Check me to check both: <input type="checkbox" ng-model="master"></label><br/>
+        <input id="checkSlave" type="checkbox" ng-checked="master" aria-label="Slave input">
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should check both checkBoxes', function() {
+          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy();
+          element(by.model('master')).click();
+          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element INPUT
+ * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
+ *     then special attribute "checked" will be set on the element
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngReadonly
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ * The HTML specification does not require browsers to preserve the values of boolean attributes
+ * such as readonly. (Their presence means true and their absence means false.)
+ * If we put an Angular interpolation expression into such an attribute then the
+ * binding information would be lost when the browser removes the attribute.
+ * The `ngReadonly` directive solves this problem for the `readonly` attribute.
+ * This complementary directive is not removed by the browser and so provides
+ * a permanent reliable place to store the binding information.
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Check me to make text readonly: <input type="checkbox" ng-model="checked"></label><br/>
+        <input type="text" ng-readonly="checked" value="I'm Angular" aria-label="Readonly field" />
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should toggle readonly attr', function() {
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element INPUT
+ * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
+ *     then special attribute "readonly" will be set on the element
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngSelected
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ * The HTML specification does not require browsers to preserve the values of boolean attributes
+ * such as selected. (Their presence means true and their absence means false.)
+ * If we put an Angular interpolation expression into such an attribute then the
+ * binding information would be lost when the browser removes the attribute.
+ * The `ngSelected` directive solves this problem for the `selected` attribute.
+ * This complementary directive is not removed by the browser and so provides
+ * a permanent reliable place to store the binding information.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Check me to select: <input type="checkbox" ng-model="selected"></label><br/>
+        <select aria-label="ngSelected demo">
+          <option>Hello!</option>
+          <option id="greet" ng-selected="selected">Greetings!</option>
+        </select>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should select Greetings!', function() {
+          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
+          element(by.model('selected')).click();
+          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element OPTION
+ * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
+ *     then special attribute "selected" will be set on the element
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngOpen
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ * The HTML specification does not require browsers to preserve the values of boolean attributes
+ * such as open. (Their presence means true and their absence means false.)
+ * If we put an Angular interpolation expression into such an attribute then the
+ * binding information would be lost when the browser removes the attribute.
+ * The `ngOpen` directive solves this problem for the `open` attribute.
+ * This complementary directive is not removed by the browser and so provides
+ * a permanent reliable place to store the binding information.
+ * @example
+     <example>
+       <file name="index.html">
+         <label>Check me check multiple: <input type="checkbox" ng-model="open"></label><br/>
+         <details id="details" ng-open="open">
+            <summary>Show/Hide me</summary>
+         </details>
+       </file>
+       <file name="protractor.js" type="protractor">
+         it('should toggle open', function() {
+           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
+           element(by.model('open')).click();
+           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
+         });
+       </file>
+     </example>
+ *
+ * @element DETAILS
+ * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
+ *     then special attribute "open" will be set on the element
+ */
+
+var ngAttributeAliasDirectives = {};
+
+// boolean attrs are evaluated
+forEach(BOOLEAN_ATTR, function(propName, attrName) {
+  // binding to multiple is not supported
+  if (propName == "multiple") return;
+
+  function defaultLinkFn(scope, element, attr) {
+    scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
+      attr.$set(attrName, !!value);
+    });
+  }
+
+  var normalized = directiveNormalize('ng-' + attrName);
+  var linkFn = defaultLinkFn;
+
+  if (propName === 'checked') {
+    linkFn = function(scope, element, attr) {
+      // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input
+      if (attr.ngModel !== attr[normalized]) {
+        defaultLinkFn(scope, element, attr);
+      }
+    };
+  }
+
+  ngAttributeAliasDirectives[normalized] = function() {
+    return {
+      restrict: 'A',
+      priority: 100,
+      link: linkFn
+    };
+  };
+});
+
+// aliased input attrs are evaluated
+forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) {
+  ngAttributeAliasDirectives[ngAttr] = function() {
+    return {
+      priority: 100,
+      link: function(scope, element, attr) {
+        //special case ngPattern when a literal regular expression value
+        //is used as the expression (this way we don't have to watch anything).
+        if (ngAttr === "ngPattern" && attr.ngPattern.charAt(0) == "/") {
+          var match = attr.ngPattern.match(REGEX_STRING_REGEXP);
+          if (match) {
+            attr.$set("ngPattern", new RegExp(match[1], match[2]));
+            return;
+          }
+        }
+
+        scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) {
+          attr.$set(ngAttr, value);
+        });
+      }
+    };
+  };
+});
+
+// ng-src, ng-srcset, ng-href are interpolated
+forEach(['src', 'srcset', 'href'], function(attrName) {
+  var normalized = directiveNormalize('ng-' + attrName);
+  ngAttributeAliasDirectives[normalized] = function() {
+    return {
+      priority: 99, // it needs to run after the attributes are interpolated
+      link: function(scope, element, attr) {
+        var propName = attrName,
+            name = attrName;
+
+        if (attrName === 'href' &&
+            toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
+          name = 'xlinkHref';
+          attr.$attr[name] = 'xlink:href';
+          propName = null;
+        }
+
+        attr.$observe(normalized, function(value) {
+          if (!value) {
+            if (attrName === 'href') {
+              attr.$set(name, null);
+            }
+            return;
+          }
+
+          attr.$set(name, value);
+
+          // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
+          // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
+          // to set the property as well to achieve the desired effect.
+          // we use attr[attrName] value since $set can sanitize the url.
+          if (msie && propName) element.prop(propName, attr[name]);
+        });
+      }
+    };
+  };
+});
+
+/* global -nullFormCtrl, -SUBMITTED_CLASS, addSetValidityMethod: true
+ */
+var nullFormCtrl = {
+  $addControl: noop,
+  $$renameControl: nullFormRenameControl,
+  $removeControl: noop,
+  $setValidity: noop,
+  $setDirty: noop,
+  $setPristine: noop,
+  $setSubmitted: noop
+},
+SUBMITTED_CLASS = 'ng-submitted';
+
+function nullFormRenameControl(control, name) {
+  control.$name = name;
+}
+
+/**
+ * @ngdoc type
+ * @name form.FormController
+ *
+ * @property {boolean} $pristine True if user has not interacted with the form yet.
+ * @property {boolean} $dirty True if user has already interacted with the form.
+ * @property {boolean} $valid True if all of the containing forms and controls are valid.
+ * @property {boolean} $invalid True if at least one containing control or form is invalid.
+ * @property {boolean} $submitted True if user has submitted the form even if its invalid.
+ *
+ * @property {Object} $error Is an object hash, containing references to controls or
+ *  forms with failing validators, where:
+ *
+ *  - keys are validation tokens (error names),
+ *  - values are arrays of controls or forms that have a failing validator for given error name.
+ *
+ *  Built-in validation tokens:
+ *
+ *  - `email`
+ *  - `max`
+ *  - `maxlength`
+ *  - `min`
+ *  - `minlength`
+ *  - `number`
+ *  - `pattern`
+ *  - `required`
+ *  - `url`
+ *  - `date`
+ *  - `datetimelocal`
+ *  - `time`
+ *  - `week`
+ *  - `month`
+ *
+ * @description
+ * `FormController` keeps track of all its controls and nested forms as well as the state of them,
+ * such as being valid/invalid or dirty/pristine.
+ *
+ * Each {@link ng.directive:form form} directive creates an instance
+ * of `FormController`.
+ *
+ */
+//asks for $scope to fool the BC controller module
+FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate'];
+function FormController(element, attrs, $scope, $animate, $interpolate) {
+  var form = this,
+      controls = [];
+
+  var parentForm = form.$$parentForm = element.parent().controller('form') || nullFormCtrl;
+
+  // init state
+  form.$error = {};
+  form.$$success = {};
+  form.$pending = undefined;
+  form.$name = $interpolate(attrs.name || attrs.ngForm || '')($scope);
+  form.$dirty = false;
+  form.$pristine = true;
+  form.$valid = true;
+  form.$invalid = false;
+  form.$submitted = false;
+
+  parentForm.$addControl(form);
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$rollbackViewValue
+   *
+   * @description
+   * Rollback all form controls pending updates to the `$modelValue`.
+   *
+   * Updates may be pending by a debounced event or because the input is waiting for a some future
+   * event defined in `ng-model-options`. This method is typically needed by the reset button of
+   * a form that uses `ng-model-options` to pend updates.
+   */
+  form.$rollbackViewValue = function() {
+    forEach(controls, function(control) {
+      control.$rollbackViewValue();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$commitViewValue
+   *
+   * @description
+   * Commit all form controls pending updates to the `$modelValue`.
+   *
+   * Updates may be pending by a debounced event or because the input is waiting for a some future
+   * event defined in `ng-model-options`. This method is rarely needed as `NgModelController`
+   * usually handles calling this in response to input events.
+   */
+  form.$commitViewValue = function() {
+    forEach(controls, function(control) {
+      control.$commitViewValue();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$addControl
+   *
+   * @description
+   * Register a control with the form.
+   *
+   * Input elements using ngModelController do this automatically when they are linked.
+   */
+  form.$addControl = function(control) {
+    // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
+    // and not added to the scope.  Now we throw an error.
+    assertNotHasOwnProperty(control.$name, 'input');
+    controls.push(control);
+
+    if (control.$name) {
+      form[control.$name] = control;
+    }
+  };
+
+  // Private API: rename a form control
+  form.$$renameControl = function(control, newName) {
+    var oldName = control.$name;
+
+    if (form[oldName] === control) {
+      delete form[oldName];
+    }
+    form[newName] = control;
+    control.$name = newName;
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$removeControl
+   *
+   * @description
+   * Deregister a control from the form.
+   *
+   * Input elements using ngModelController do this automatically when they are destroyed.
+   */
+  form.$removeControl = function(control) {
+    if (control.$name && form[control.$name] === control) {
+      delete form[control.$name];
+    }
+    forEach(form.$pending, function(value, name) {
+      form.$setValidity(name, null, control);
+    });
+    forEach(form.$error, function(value, name) {
+      form.$setValidity(name, null, control);
+    });
+    forEach(form.$$success, function(value, name) {
+      form.$setValidity(name, null, control);
+    });
+
+    arrayRemove(controls, control);
+  };
+
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setValidity
+   *
+   * @description
+   * Sets the validity of a form control.
+   *
+   * This method will also propagate to parent forms.
+   */
+  addSetValidityMethod({
+    ctrl: this,
+    $element: element,
+    set: function(object, property, controller) {
+      var list = object[property];
+      if (!list) {
+        object[property] = [controller];
+      } else {
+        var index = list.indexOf(controller);
+        if (index === -1) {
+          list.push(controller);
+        }
+      }
+    },
+    unset: function(object, property, controller) {
+      var list = object[property];
+      if (!list) {
+        return;
+      }
+      arrayRemove(list, controller);
+      if (list.length === 0) {
+        delete object[property];
+      }
+    },
+    parentForm: parentForm,
+    $animate: $animate
+  });
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setDirty
+   *
+   * @description
+   * Sets the form to a dirty state.
+   *
+   * This method can be called to add the 'ng-dirty' class and set the form to a dirty
+   * state (ng-dirty class). This method will also propagate to parent forms.
+   */
+  form.$setDirty = function() {
+    $animate.removeClass(element, PRISTINE_CLASS);
+    $animate.addClass(element, DIRTY_CLASS);
+    form.$dirty = true;
+    form.$pristine = false;
+    parentForm.$setDirty();
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setPristine
+   *
+   * @description
+   * Sets the form to its pristine state.
+   *
+   * This method can be called to remove the 'ng-dirty' class and set the form to its pristine
+   * state (ng-pristine class). This method will also propagate to all the controls contained
+   * in this form.
+   *
+   * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
+   * saving or resetting it.
+   */
+  form.$setPristine = function() {
+    $animate.setClass(element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS);
+    form.$dirty = false;
+    form.$pristine = true;
+    form.$submitted = false;
+    forEach(controls, function(control) {
+      control.$setPristine();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setUntouched
+   *
+   * @description
+   * Sets the form to its untouched state.
+   *
+   * This method can be called to remove the 'ng-touched' class and set the form controls to their
+   * untouched state (ng-untouched class).
+   *
+   * Setting a form controls back to their untouched state is often useful when setting the form
+   * back to its pristine state.
+   */
+  form.$setUntouched = function() {
+    forEach(controls, function(control) {
+      control.$setUntouched();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setSubmitted
+   *
+   * @description
+   * Sets the form to its submitted state.
+   */
+  form.$setSubmitted = function() {
+    $animate.addClass(element, SUBMITTED_CLASS);
+    form.$submitted = true;
+    parentForm.$setSubmitted();
+  };
+}
+
+/**
+ * @ngdoc directive
+ * @name ngForm
+ * @restrict EAC
+ *
+ * @description
+ * Nestable alias of {@link ng.directive:form `form`} directive. HTML
+ * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
+ * sub-group of controls needs to be determined.
+ *
+ * Note: the purpose of `ngForm` is to group controls,
+ * but not to be a replacement for the `<form>` tag with all of its capabilities
+ * (e.g. posting to the server, ...).
+ *
+ * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
+ *                       related scope, under this name.
+ *
+ */
+
+ /**
+ * @ngdoc directive
+ * @name form
+ * @restrict E
+ *
+ * @description
+ * Directive that instantiates
+ * {@link form.FormController FormController}.
+ *
+ * If the `name` attribute is specified, the form controller is published onto the current scope under
+ * this name.
+ *
+ * # Alias: {@link ng.directive:ngForm `ngForm`}
+ *
+ * In Angular, forms can be nested. This means that the outer form is valid when all of the child
+ * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
+ * Angular provides the {@link ng.directive:ngForm `ngForm`} directive which behaves identically to
+ * `<form>` but can be nested.  This allows you to have nested forms, which is very useful when
+ * using Angular validation directives in forms that are dynamically generated using the
+ * {@link ng.directive:ngRepeat `ngRepeat`} directive. Since you cannot dynamically generate the `name`
+ * attribute of input elements using interpolation, you have to wrap each set of repeated inputs in an
+ * `ngForm` directive and nest these in an outer `form` element.
+ *
+ *
+ * # CSS classes
+ *  - `ng-valid` is set if the form is valid.
+ *  - `ng-invalid` is set if the form is invalid.
+ *  - `ng-pristine` is set if the form is pristine.
+ *  - `ng-dirty` is set if the form is dirty.
+ *  - `ng-submitted` is set if the form was submitted.
+ *
+ * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+ *
+ *
+ * # Submitting a form and preventing the default action
+ *
+ * Since the role of forms in client-side Angular applications is different than in classical
+ * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
+ * page reload that sends the data to the server. Instead some javascript logic should be triggered
+ * to handle the form submission in an application-specific way.
+ *
+ * For this reason, Angular prevents the default action (form submission to the server) unless the
+ * `<form>` element has an `action` attribute specified.
+ *
+ * You can use one of the following two ways to specify what javascript method should be called when
+ * a form is submitted:
+ *
+ * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
+ * - {@link ng.directive:ngClick ngClick} directive on the first
+  *  button or input field of type submit (input[type=submit])
+ *
+ * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
+ * or {@link ng.directive:ngClick ngClick} directives.
+ * This is because of the following form submission rules in the HTML specification:
+ *
+ * - If a form has only one input field then hitting enter in this field triggers form submit
+ * (`ngSubmit`)
+ * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
+ * doesn't trigger submit
+ * - if a form has one or more input fields and one or more buttons or input[type=submit] then
+ * hitting enter in any of the input fields will trigger the click handler on the *first* button or
+ * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
+ *
+ * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is
+ * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+ * to have access to the updated model.
+ *
+ * ## Animation Hooks
+ *
+ * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
+ * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
+ * other validations that are performed within the form. Animations in ngForm are similar to how
+ * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
+ * as JS animations.
+ *
+ * The following example shows a simple way to utilize CSS transitions to style a form element
+ * that has been rendered as invalid after it has been validated:
+ *
+ * <pre>
+ * //be sure to include ngAnimate as a module to hook into more
+ * //advanced animations
+ * .my-form {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+ * .my-form.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+ * </pre>
+ *
+ * @example
+    <example deps="angular-animate.js" animations="true" fixBase="true" module="formExample">
+      <file name="index.html">
+       <script>
+         angular.module('formExample', [])
+           .controller('FormController', ['$scope', function($scope) {
+             $scope.userType = 'guest';
+           }]);
+       </script>
+       <style>
+        .my-form {
+          -webkit-transition:all linear 0.5s;
+          transition:all linear 0.5s;
+          background: transparent;
+        }
+        .my-form.ng-invalid {
+          background: red;
+        }
+       </style>
+       <form name="myForm" ng-controller="FormController" class="my-form">
+         userType: <input name="input" ng-model="userType" required>
+         <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
+         <code>userType = {{userType}}</code><br>
+         <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br>
+         <code>myForm.input.$error = {{myForm.input.$error}}</code><br>
+         <code>myForm.$valid = {{myForm.$valid}}</code><br>
+         <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br>
+        </form>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should initialize to model', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+
+          expect(userType.getText()).toContain('guest');
+          expect(valid.getText()).toContain('true');
+        });
+
+        it('should be invalid if empty', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var userInput = element(by.model('userType'));
+
+          userInput.clear();
+          userInput.sendKeys('');
+
+          expect(userType.getText()).toEqual('userType =');
+          expect(valid.getText()).toContain('false');
+        });
+      </file>
+    </example>
+ *
+ * @param {string=} name Name of the form. If specified, the form controller will be published into
+ *                       related scope, under this name.
+ */
+var formDirectiveFactory = function(isNgForm) {
+  return ['$timeout', function($timeout) {
+    var formDirective = {
+      name: 'form',
+      restrict: isNgForm ? 'EAC' : 'E',
+      controller: FormController,
+      compile: function ngFormCompile(formElement, attr) {
+        // Setup initial state of the control
+        formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
+
+        var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
+
+        return {
+          pre: function ngFormPreLink(scope, formElement, attr, controller) {
+            // if `action` attr is not present on the form, prevent the default action (submission)
+            if (!('action' in attr)) {
+              // we can't use jq events because if a form is destroyed during submission the default
+              // action is not prevented. see #1238
+              //
+              // IE 9 is not affected because it doesn't fire a submit event and try to do a full
+              // page reload if the form was destroyed by submission of the form via a click handler
+              // on a button in the form. Looks like an IE9 specific bug.
+              var handleFormSubmission = function(event) {
+                scope.$apply(function() {
+                  controller.$commitViewValue();
+                  controller.$setSubmitted();
+                });
+
+                event.preventDefault();
+              };
+
+              addEventListenerFn(formElement[0], 'submit', handleFormSubmission);
+
+              // unregister the preventDefault listener so that we don't not leak memory but in a
+              // way that will achieve the prevention of the default action.
+              formElement.on('$destroy', function() {
+                $timeout(function() {
+                  removeEventListenerFn(formElement[0], 'submit', handleFormSubmission);
+                }, 0, false);
+              });
+            }
+
+            var parentFormCtrl = controller.$$parentForm;
+
+            if (nameAttr) {
+              setter(scope, controller.$name, controller, controller.$name);
+              attr.$observe(nameAttr, function(newValue) {
+                if (controller.$name === newValue) return;
+                setter(scope, controller.$name, undefined, controller.$name);
+                parentFormCtrl.$$renameControl(controller, newValue);
+                setter(scope, controller.$name, controller, controller.$name);
+              });
+            }
+            formElement.on('$destroy', function() {
+              parentFormCtrl.$removeControl(controller);
+              if (nameAttr) {
+                setter(scope, attr[nameAttr], undefined, controller.$name);
+              }
+              extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
+            });
+          }
+        };
+      }
+    };
+
+    return formDirective;
+  }];
+};
+
+var formDirective = formDirectiveFactory();
+var ngFormDirective = formDirectiveFactory(true);
+
+/* global VALID_CLASS: false,
+  INVALID_CLASS: false,
+  PRISTINE_CLASS: false,
+  DIRTY_CLASS: false,
+  UNTOUCHED_CLASS: false,
+  TOUCHED_CLASS: false,
+  $ngModelMinErr: false,
+*/
+
+// Regex code is obtained from SO: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
+var ISO_DATE_REGEXP = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/;
+var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
+var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
+var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
+var DATE_REGEXP = /^(\d{4})-(\d{2})-(\d{2})$/;
+var DATETIMELOCAL_REGEXP = /^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+var WEEK_REGEXP = /^(\d{4})-W(\d\d)$/;
+var MONTH_REGEXP = /^(\d{4})-(\d\d)$/;
+var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+
+var inputType = {
+
+  /**
+   * @ngdoc input
+   * @name input[text]
+   *
+   * @description
+   * Standard HTML text input with angular data binding, inherited by most of the `input` elements.
+   *
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} required Adds `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+   *    This parameter is ignored for input[type=password] controls, which will never trim the
+   *    input.
+   *
+   * @example
+      <example name="text-input-directive" module="textInputExample">
+        <file name="index.html">
+         <script>
+           angular.module('textInputExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 text: 'guest',
+                 word: /^\s*\w*\s*$/
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>Single word:
+             <input type="text" name="input" ng-model="example.text"
+                    ng-pattern="example.word" required ng-trim="false">
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.pattern">
+               Single word only!</span>
+           </div>
+           <tt>text = {{example.text}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          var text = element(by.binding('example.text'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('example.text'));
+
+          it('should initialize to model', function() {
+            expect(text.getText()).toContain('guest');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if multi word', function() {
+            input.clear();
+            input.sendKeys('hello world');
+
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'text': textInputType,
+
+    /**
+     * @ngdoc input
+     * @name input[date]
+     *
+     * @description
+     * Input with date validation and transformation. In browsers that do not yet support
+     * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601
+     * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many
+     * modern browsers do not yet support this input type, it is important to provide cues to users on the
+     * expected input format via a placeholder or label.
+     *
+     * The model must always be a Date object, otherwise Angular will throw an error.
+     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+     *
+     * The timezone to be used to read/write the `Date` instance in the model can be defined using
+     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+     *
+     * @param {string} ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+     * valid ISO date string (yyyy-MM-dd).
+     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
+     * a valid ISO date string (yyyy-MM-dd).
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngChange Angular expression to be executed when input changes due to user
+     *    interaction with the input element.
+     *
+     * @example
+     <example name="date-input-directive" module="dateInputExample">
+     <file name="index.html">
+       <script>
+          angular.module('dateInputExample', [])
+            .controller('DateController', ['$scope', function($scope) {
+              $scope.example = {
+                value: new Date(2013, 9, 22)
+              };
+            }]);
+       </script>
+       <form name="myForm" ng-controller="DateController as dateCtrl">
+          <label for="exampleInput">Pick a date in 2013:</label>
+          <input type="date" id="exampleInput" name="input" ng-model="example.value"
+              placeholder="yyyy-MM-dd" min="2013-01-01" max="2013-12-31" required />
+          <div role="alert">
+            <span class="error" ng-show="myForm.input.$error.required">
+                Required!</span>
+            <span class="error" ng-show="myForm.input.$error.date">
+                Not a valid date!</span>
+           </div>
+           <tt>value = {{example.value | date: "yyyy-MM-dd"}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+       </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+        var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
+        var valid = element(by.binding('myForm.input.$valid'));
+        var input = element(by.model('example.value'));
+
+        // currently protractor/webdriver does not support
+        // sending keys to all known HTML5 input controls
+        // for various browsers (see https://github.com/angular/protractor/issues/562).
+        function setInput(val) {
+          // set the value of the element and force validation.
+          var scr = "var ipt = document.getElementById('exampleInput'); " +
+          "ipt.value = '" + val + "';" +
+          "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+          browser.executeScript(scr);
+        }
+
+        it('should initialize to model', function() {
+          expect(value.getText()).toContain('2013-10-22');
+          expect(valid.getText()).toContain('myForm.input.$valid = true');
+        });
+
+        it('should be invalid if empty', function() {
+          setInput('');
+          expect(value.getText()).toEqual('value =');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
+
+        it('should be invalid if over max', function() {
+          setInput('2015-01-01');
+          expect(value.getText()).toContain('');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
+     </file>
+     </example>
+     */
+  'date': createDateInputType('date', DATE_REGEXP,
+         createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']),
+         'yyyy-MM-dd'),
+
+   /**
+    * @ngdoc input
+    * @name input[datetime-local]
+    *
+    * @description
+    * Input with datetime validation and transformation. In browsers that do not yet support
+    * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+    * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`.
+    *
+    * The model must always be a Date object, otherwise Angular will throw an error.
+    * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+    *
+    * The timezone to be used to read/write the `Date` instance in the model can be defined using
+    * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+    *
+    * @param {string} ngModel Assignable angular expression to data-bind to.
+    * @param {string=} name Property name of the form under which the control is published.
+    * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+    * valid ISO datetime format (yyyy-MM-ddTHH:mm:ss).
+    * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
+    * a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss).
+    * @param {string=} required Sets `required` validation error key if the value is not entered.
+    * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+    *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+    *    `required` when you want to data-bind to the `required` attribute.
+    * @param {string=} ngChange Angular expression to be executed when input changes due to user
+    *    interaction with the input element.
+    *
+    * @example
+    <example name="datetimelocal-input-directive" module="dateExample">
+    <file name="index.html">
+      <script>
+        angular.module('dateExample', [])
+          .controller('DateController', ['$scope', function($scope) {
+            $scope.example = {
+              value: new Date(2010, 11, 28, 14, 57)
+            };
+          }]);
+      </script>
+      <form name="myForm" ng-controller="DateController as dateCtrl">
+        <label for="exampleInput">Pick a date between in 2013:</label>
+        <input type="datetime-local" id="exampleInput" name="input" ng-model="example.value"
+            placeholder="yyyy-MM-ddTHH:mm:ss" min="2001-01-01T00:00:00" max="2013-12-31T00:00:00" required />
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.datetimelocal">
+              Not a valid date!</span>
+        </div>
+        <tt>value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}</tt><br/>
+        <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+        <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+        <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+        <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+      </form>
+    </file>
+    <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('2010-12-28T14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('2015-01-01T23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+    </file>
+    </example>
+    */
+  'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
+      createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
+      'yyyy-MM-ddTHH:mm:ss.sss'),
+
+  /**
+   * @ngdoc input
+   * @name input[time]
+   *
+   * @description
+   * Input with time validation and transformation. In browsers that do not yet support
+   * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+   * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a
+   * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`.
+   *
+   * The model must always be a Date object, otherwise Angular will throw an error.
+   * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+   *
+   * The timezone to be used to read/write the `Date` instance in the model can be defined using
+   * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+   * valid ISO time format (HH:mm:ss).
+   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be a
+   * valid ISO time format (HH:mm:ss).
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+   <example name="time-input-directive" module="timeExample">
+   <file name="index.html">
+     <script>
+      angular.module('timeExample', [])
+        .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(1970, 0, 1, 14, 57, 0)
+          };
+        }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+        <label for="exampleInput">Pick a between 8am and 5pm:</label>
+        <input type="time" id="exampleInput" name="input" ng-model="example.value"
+            placeholder="HH:mm:ss" min="08:00:00" max="17:00:00" required />
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.time">
+              Not a valid date!</span>
+        </div>
+        <tt>value = {{example.value | date: "HH:mm:ss"}}</tt><br/>
+        <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+        <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+        <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+        <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+   </file>
+   <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "HH:mm:ss"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+   </file>
+   </example>
+   */
+  'time': createDateInputType('time', TIME_REGEXP,
+      createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
+     'HH:mm:ss.sss'),
+
+   /**
+    * @ngdoc input
+    * @name input[week]
+    *
+    * @description
+    * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support
+    * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+    * week format (yyyy-W##), for example: `2013-W02`.
+    *
+    * The model must always be a Date object, otherwise Angular will throw an error.
+    * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+    *
+    * The timezone to be used to read/write the `Date` instance in the model can be defined using
+    * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+    *
+    * @param {string} ngModel Assignable angular expression to data-bind to.
+    * @param {string=} name Property name of the form under which the control is published.
+    * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+    * valid ISO week format (yyyy-W##).
+    * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
+    * a valid ISO week format (yyyy-W##).
+    * @param {string=} required Sets `required` validation error key if the value is not entered.
+    * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+    *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+    *    `required` when you want to data-bind to the `required` attribute.
+    * @param {string=} ngChange Angular expression to be executed when input changes due to user
+    *    interaction with the input element.
+    *
+    * @example
+    <example name="week-input-directive" module="weekExample">
+    <file name="index.html">
+      <script>
+      angular.module('weekExample', [])
+        .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 0, 3)
+          };
+        }]);
+      </script>
+      <form name="myForm" ng-controller="DateController as dateCtrl">
+        <label>Pick a date between in 2013:
+          <input id="exampleInput" type="week" name="input" ng-model="example.value"
+                 placeholder="YYYY-W##" min="2012-W32"
+                 max="2013-W52" required />
+        </label>
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.week">
+              Not a valid date!</span>
+        </div>
+        <tt>value = {{example.value | date: "yyyy-Www"}}</tt><br/>
+        <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+        <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+        <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+        <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+      </form>
+    </file>
+    <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "yyyy-Www"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-W01');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('2015-W01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+    </file>
+    </example>
+    */
+  'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'),
+
+  /**
+   * @ngdoc input
+   * @name input[month]
+   *
+   * @description
+   * Input with month validation and transformation. In browsers that do not yet support
+   * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+   * month format (yyyy-MM), for example: `2009-01`.
+   *
+   * The model must always be a Date object, otherwise Angular will throw an error.
+   * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+   * If the model is not set to the first of the month, the next view to model update will set it
+   * to the first of the month.
+   *
+   * The timezone to be used to read/write the `Date` instance in the model can be defined using
+   * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be
+   * a valid ISO month format (yyyy-MM).
+   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must
+   * be a valid ISO month format (yyyy-MM).
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+   <example name="month-input-directive" module="monthExample">
+   <file name="index.html">
+     <script>
+      angular.module('monthExample', [])
+        .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 9, 1)
+          };
+        }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+       <label for="exampleInput">Pick a month in 2013:</label>
+       <input id="exampleInput" type="month" name="input" ng-model="example.value"
+          placeholder="yyyy-MM" min="2013-01" max="2013-12" required />
+       <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+            Required!</span>
+         <span class="error" ng-show="myForm.input.$error.month">
+            Not a valid month!</span>
+       </div>
+       <tt>value = {{example.value | date: "yyyy-MM"}}</tt><br/>
+       <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+       <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+       <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+       <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+   </file>
+   <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "yyyy-MM"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-10');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('2015-01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+   </file>
+   </example>
+   */
+  'month': createDateInputType('month', MONTH_REGEXP,
+     createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
+     'yyyy-MM'),
+
+  /**
+   * @ngdoc input
+   * @name input[number]
+   *
+   * @description
+   * Text input with number validation and transformation. Sets the `number` validation
+   * error if not a valid number.
+   *
+   * <div class="alert alert-warning">
+   * The model must always be of type `number` otherwise Angular will throw an error.
+   * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
+   * error docs for more information and an example of how to convert your model if necessary.
+   * </div>
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="number-input-directive" module="numberExample">
+        <file name="index.html">
+         <script>
+           angular.module('numberExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 value: 12
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>Number:
+             <input type="number" name="input" ng-model="example.value"
+                    min="0" max="99" required>
+          </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.number">
+               Not valid number!</span>
+           </div>
+           <tt>value = {{example.value}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          var value = element(by.binding('example.value'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('example.value'));
+
+          it('should initialize to model', function() {
+            expect(value.getText()).toContain('12');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if over max', function() {
+            input.clear();
+            input.sendKeys('123');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'number': numberInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[url]
+   *
+   * @description
+   * Text input with URL validation. Sets the `url` validation error key if the content is not a
+   * valid URL.
+   *
+   * <div class="alert alert-warning">
+   * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
+   * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
+   * the built-in validators (see the {@link guide/forms Forms guide})
+   * </div>
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="url-input-directive" module="urlExample">
+        <file name="index.html">
+         <script>
+           angular.module('urlExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.url = {
+                 text: 'http://google.com'
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>URL:
+             <input type="url" name="input" ng-model="url.text" required>
+           <label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.url">
+               Not valid url!</span>
+           </div>
+           <tt>text = {{url.text}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+           <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          var text = element(by.binding('url.text'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('url.text'));
+
+          it('should initialize to model', function() {
+            expect(text.getText()).toContain('http://google.com');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if not url', function() {
+            input.clear();
+            input.sendKeys('box');
+
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'url': urlInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[email]
+   *
+   * @description
+   * Text input with email validation. Sets the `email` validation error key if not a valid email
+   * address.
+   *
+   * <div class="alert alert-warning">
+   * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
+   * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
+   * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
+   * </div>
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="email-input-directive" module="emailExample">
+        <file name="index.html">
+         <script>
+           angular.module('emailExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.email = {
+                 text: 'me@example.com'
+               };
+             }]);
+         </script>
+           <form name="myForm" ng-controller="ExampleController">
+             <label>Email:
+               <input type="email" name="input" ng-model="email.text" required>
+             </label>
+             <div role="alert">
+               <span class="error" ng-show="myForm.input.$error.required">
+                 Required!</span>
+               <span class="error" ng-show="myForm.input.$error.email">
+                 Not valid email!</span>
+             </div>
+             <tt>text = {{email.text}}</tt><br/>
+             <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+             <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+             <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+             <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+             <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
+           </form>
+         </file>
+        <file name="protractor.js" type="protractor">
+          var text = element(by.binding('email.text'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('email.text'));
+
+          it('should initialize to model', function() {
+            expect(text.getText()).toContain('me@example.com');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if not email', function() {
+            input.clear();
+            input.sendKeys('xxx');
+
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'email': emailInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[radio]
+   *
+   * @description
+   * HTML radio button.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string} value The value to which the expression should be set when selected.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   * @param {string} ngValue Angular expression which sets the value to which the expression should
+   *    be set when selected.
+   *
+   * @example
+      <example name="radio-input-directive" module="radioExample">
+        <file name="index.html">
+         <script>
+           angular.module('radioExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.color = {
+                 name: 'blue'
+               };
+               $scope.specialValue = {
+                 "id": "12345",
+                 "value": "green"
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>
+             <input type="radio" ng-model="color.name" value="red">
+             Red
+           </label><br/>
+           <label>
+             <input type="radio" ng-model="color.name" ng-value="specialValue">
+             Green
+           </label><br/>
+           <label>
+             <input type="radio" ng-model="color.name" value="blue">
+             Blue
+           </label><br/>
+           <tt>color = {{color.name | json}}</tt><br/>
+          </form>
+          Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
+        </file>
+        <file name="protractor.js" type="protractor">
+          it('should change state', function() {
+            var color = element(by.binding('color.name'));
+
+            expect(color.getText()).toContain('blue');
+
+            element.all(by.model('color.name')).get(0).click();
+
+            expect(color.getText()).toContain('red');
+          });
+        </file>
+      </example>
+   */
+  'radio': radioInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[checkbox]
+   *
+   * @description
+   * HTML checkbox.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
+   * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="checkbox-input-directive" module="checkboxExample">
+        <file name="index.html">
+         <script>
+           angular.module('checkboxExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.checkboxModel = {
+                value1 : true,
+                value2 : 'YES'
+              };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>Value1:
+             <input type="checkbox" ng-model="checkboxModel.value1">
+           </label><br/>
+           <label>Value2:
+             <input type="checkbox" ng-model="checkboxModel.value2"
+                    ng-true-value="'YES'" ng-false-value="'NO'">
+            </label><br/>
+           <tt>value1 = {{checkboxModel.value1}}</tt><br/>
+           <tt>value2 = {{checkboxModel.value2}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          it('should change state', function() {
+            var value1 = element(by.binding('checkboxModel.value1'));
+            var value2 = element(by.binding('checkboxModel.value2'));
+
+            expect(value1.getText()).toContain('true');
+            expect(value2.getText()).toContain('YES');
+
+            element(by.model('checkboxModel.value1')).click();
+            element(by.model('checkboxModel.value2')).click();
+
+            expect(value1.getText()).toContain('false');
+            expect(value2.getText()).toContain('NO');
+          });
+        </file>
+      </example>
+   */
+  'checkbox': checkboxInputType,
+
+  'hidden': noop,
+  'button': noop,
+  'submit': noop,
+  'reset': noop,
+  'file': noop
+};
+
+function stringBasedInputType(ctrl) {
+  ctrl.$formatters.push(function(value) {
+    return ctrl.$isEmpty(value) ? value : value.toString();
+  });
+}
+
+function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+  stringBasedInputType(ctrl);
+}
+
+function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  var type = lowercase(element[0].type);
+
+  // In composition mode, users are still inputing intermediate text buffer,
+  // hold the listener until composition is done.
+  // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
+  if (!$sniffer.android) {
+    var composing = false;
+
+    element.on('compositionstart', function(data) {
+      composing = true;
+    });
+
+    element.on('compositionend', function() {
+      composing = false;
+      listener();
+    });
+  }
+
+  var listener = function(ev) {
+    if (timeout) {
+      $browser.defer.cancel(timeout);
+      timeout = null;
+    }
+    if (composing) return;
+    var value = element.val(),
+        event = ev && ev.type;
+
+    // By default we will trim the value
+    // If the attribute ng-trim exists we will avoid trimming
+    // If input type is 'password', the value is never trimmed
+    if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
+      value = trim(value);
+    }
+
+    // If a control is suffering from bad input (due to native validators), browsers discard its
+    // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
+    // control's value is the same empty value twice in a row.
+    if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
+      ctrl.$setViewValue(value, event);
+    }
+  };
+
+  // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
+  // input event on backspace, delete or cut
+  if ($sniffer.hasEvent('input')) {
+    element.on('input', listener);
+  } else {
+    var timeout;
+
+    var deferListener = function(ev, input, origValue) {
+      if (!timeout) {
+        timeout = $browser.defer(function() {
+          timeout = null;
+          if (!input || input.value !== origValue) {
+            listener(ev);
+          }
+        });
+      }
+    };
+
+    element.on('keydown', function(event) {
+      var key = event.keyCode;
+
+      // ignore
+      //    command            modifiers                   arrows
+      if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
+
+      deferListener(event, this, this.value);
+    });
+
+    // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
+    if ($sniffer.hasEvent('paste')) {
+      element.on('paste cut', deferListener);
+    }
+  }
+
+  // if user paste into input using mouse on older browser
+  // or form autocomplete on newer browser, we need "change" event to catch it
+  element.on('change', listener);
+
+  ctrl.$render = function() {
+    element.val(ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue);
+  };
+}
+
+function weekParser(isoWeek, existingDate) {
+  if (isDate(isoWeek)) {
+    return isoWeek;
+  }
+
+  if (isString(isoWeek)) {
+    WEEK_REGEXP.lastIndex = 0;
+    var parts = WEEK_REGEXP.exec(isoWeek);
+    if (parts) {
+      var year = +parts[1],
+          week = +parts[2],
+          hours = 0,
+          minutes = 0,
+          seconds = 0,
+          milliseconds = 0,
+          firstThurs = getFirstThursdayOfYear(year),
+          addDays = (week - 1) * 7;
+
+      if (existingDate) {
+        hours = existingDate.getHours();
+        minutes = existingDate.getMinutes();
+        seconds = existingDate.getSeconds();
+        milliseconds = existingDate.getMilliseconds();
+      }
+
+      return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
+    }
+  }
+
+  return NaN;
+}
+
+function createDateParser(regexp, mapping) {
+  return function(iso, date) {
+    var parts, map;
+
+    if (isDate(iso)) {
+      return iso;
+    }
+
+    if (isString(iso)) {
+      // When a date is JSON'ified to wraps itself inside of an extra
+      // set of double quotes. This makes the date parsing code unable
+      // to match the date string and parse it as a date.
+      if (iso.charAt(0) == '"' && iso.charAt(iso.length - 1) == '"') {
+        iso = iso.substring(1, iso.length - 1);
+      }
+      if (ISO_DATE_REGEXP.test(iso)) {
+        return new Date(iso);
+      }
+      regexp.lastIndex = 0;
+      parts = regexp.exec(iso);
+
+      if (parts) {
+        parts.shift();
+        if (date) {
+          map = {
+            yyyy: date.getFullYear(),
+            MM: date.getMonth() + 1,
+            dd: date.getDate(),
+            HH: date.getHours(),
+            mm: date.getMinutes(),
+            ss: date.getSeconds(),
+            sss: date.getMilliseconds() / 1000
+          };
+        } else {
+          map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
+        }
+
+        forEach(parts, function(part, index) {
+          if (index < mapping.length) {
+            map[mapping[index]] = +part;
+          }
+        });
+        return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
+      }
+    }
+
+    return NaN;
+  };
+}
+
+function createDateInputType(type, regexp, parseDate, format) {
+  return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
+    badInputChecker(scope, element, attr, ctrl);
+    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    var timezone = ctrl && ctrl.$options && ctrl.$options.timezone;
+    var previousDate;
+
+    ctrl.$$parserName = type;
+    ctrl.$parsers.push(function(value) {
+      if (ctrl.$isEmpty(value)) return null;
+      if (regexp.test(value)) {
+        // Note: We cannot read ctrl.$modelValue, as there might be a different
+        // parser/formatter in the processing chain so that the model
+        // contains some different data format!
+        var parsedDate = parseDate(value, previousDate);
+        if (timezone) {
+          parsedDate = convertTimezoneToLocal(parsedDate, timezone);
+        }
+        return parsedDate;
+      }
+      return undefined;
+    });
+
+    ctrl.$formatters.push(function(value) {
+      if (value && !isDate(value)) {
+        throw $ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
+      }
+      if (isValidDate(value)) {
+        previousDate = value;
+        if (previousDate && timezone) {
+          previousDate = convertTimezoneToLocal(previousDate, timezone, true);
+        }
+        return $filter('date')(value, format, timezone);
+      } else {
+        previousDate = null;
+        return '';
+      }
+    });
+
+    if (isDefined(attr.min) || attr.ngMin) {
+      var minVal;
+      ctrl.$validators.min = function(value) {
+        return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
+      };
+      attr.$observe('min', function(val) {
+        minVal = parseObservedDateValue(val);
+        ctrl.$validate();
+      });
+    }
+
+    if (isDefined(attr.max) || attr.ngMax) {
+      var maxVal;
+      ctrl.$validators.max = function(value) {
+        return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
+      };
+      attr.$observe('max', function(val) {
+        maxVal = parseObservedDateValue(val);
+        ctrl.$validate();
+      });
+    }
+
+    function isValidDate(value) {
+      // Invalid Date: getTime() returns NaN
+      return value && !(value.getTime && value.getTime() !== value.getTime());
+    }
+
+    function parseObservedDateValue(val) {
+      return isDefined(val) ? (isDate(val) ? val : parseDate(val)) : undefined;
+    }
+  };
+}
+
+function badInputChecker(scope, element, attr, ctrl) {
+  var node = element[0];
+  var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
+  if (nativeValidation) {
+    ctrl.$parsers.push(function(value) {
+      var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
+      // Detect bug in FF35 for input[email] (https://bugzilla.mozilla.org/show_bug.cgi?id=1064430):
+      // - also sets validity.badInput (should only be validity.typeMismatch).
+      // - see http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#e-mail-state-(type=email)
+      // - can ignore this case as we can still read out the erroneous email...
+      return validity.badInput && !validity.typeMismatch ? undefined : value;
+    });
+  }
+}
+
+function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  badInputChecker(scope, element, attr, ctrl);
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+  ctrl.$$parserName = 'number';
+  ctrl.$parsers.push(function(value) {
+    if (ctrl.$isEmpty(value))      return null;
+    if (NUMBER_REGEXP.test(value)) return parseFloat(value);
+    return undefined;
+  });
+
+  ctrl.$formatters.push(function(value) {
+    if (!ctrl.$isEmpty(value)) {
+      if (!isNumber(value)) {
+        throw $ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
+      }
+      value = value.toString();
+    }
+    return value;
+  });
+
+  if (isDefined(attr.min) || attr.ngMin) {
+    var minVal;
+    ctrl.$validators.min = function(value) {
+      return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
+    };
+
+    attr.$observe('min', function(val) {
+      if (isDefined(val) && !isNumber(val)) {
+        val = parseFloat(val, 10);
+      }
+      minVal = isNumber(val) && !isNaN(val) ? val : undefined;
+      // TODO(matsko): implement validateLater to reduce number of validations
+      ctrl.$validate();
+    });
+  }
+
+  if (isDefined(attr.max) || attr.ngMax) {
+    var maxVal;
+    ctrl.$validators.max = function(value) {
+      return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
+    };
+
+    attr.$observe('max', function(val) {
+      if (isDefined(val) && !isNumber(val)) {
+        val = parseFloat(val, 10);
+      }
+      maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
+      // TODO(matsko): implement validateLater to reduce number of validations
+      ctrl.$validate();
+    });
+  }
+}
+
+function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  // Note: no badInputChecker here by purpose as `url` is only a validation
+  // in browsers, i.e. we can always read out input.value even if it is not valid!
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+  stringBasedInputType(ctrl);
+
+  ctrl.$$parserName = 'url';
+  ctrl.$validators.url = function(modelValue, viewValue) {
+    var value = modelValue || viewValue;
+    return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
+  };
+}
+
+function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  // Note: no badInputChecker here by purpose as `url` is only a validation
+  // in browsers, i.e. we can always read out input.value even if it is not valid!
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+  stringBasedInputType(ctrl);
+
+  ctrl.$$parserName = 'email';
+  ctrl.$validators.email = function(modelValue, viewValue) {
+    var value = modelValue || viewValue;
+    return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
+  };
+}
+
+function radioInputType(scope, element, attr, ctrl) {
+  // make the name unique, if not defined
+  if (isUndefined(attr.name)) {
+    element.attr('name', nextUid());
+  }
+
+  var listener = function(ev) {
+    if (element[0].checked) {
+      ctrl.$setViewValue(attr.value, ev && ev.type);
+    }
+  };
+
+  element.on('click', listener);
+
+  ctrl.$render = function() {
+    var value = attr.value;
+    element[0].checked = (value == ctrl.$viewValue);
+  };
+
+  attr.$observe('value', ctrl.$render);
+}
+
+function parseConstantExpr($parse, context, name, expression, fallback) {
+  var parseFn;
+  if (isDefined(expression)) {
+    parseFn = $parse(expression);
+    if (!parseFn.constant) {
+      throw minErr('ngModel')('constexpr', 'Expected constant expression for `{0}`, but saw ' +
+                                   '`{1}`.', name, expression);
+    }
+    return parseFn(context);
+  }
+  return fallback;
+}
+
+function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
+  var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
+  var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
+
+  var listener = function(ev) {
+    ctrl.$setViewValue(element[0].checked, ev && ev.type);
+  };
+
+  element.on('click', listener);
+
+  ctrl.$render = function() {
+    element[0].checked = ctrl.$viewValue;
+  };
+
+  // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
+  // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
+  // it to a boolean.
+  ctrl.$isEmpty = function(value) {
+    return value === false;
+  };
+
+  ctrl.$formatters.push(function(value) {
+    return equals(value, trueValue);
+  });
+
+  ctrl.$parsers.push(function(value) {
+    return value ? trueValue : falseValue;
+  });
+}
+
+
+/**
+ * @ngdoc directive
+ * @name textarea
+ * @restrict E
+ *
+ * @description
+ * HTML textarea element control with angular data-binding. The data-binding and validation
+ * properties of this element are exactly the same as those of the
+ * {@link ng.directive:input input element}.
+ *
+ * @param {string} ngModel Assignable angular expression to data-bind to.
+ * @param {string=} name Property name of the form under which the control is published.
+ * @param {string=} required Sets `required` validation error key if the value is not entered.
+ * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+ *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+ *    `required` when you want to data-bind to the `required` attribute.
+ * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+ *    minlength.
+ * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+ *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+ *    length.
+ * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+ *    a RegExp found by evaluating the Angular expression given in the attribute value.
+ *    If the expression evaluates to a RegExp object, then this is used directly.
+ *    If the expression evaluates to a string, then it will be converted to a RegExp
+ *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+ *    `new RegExp('^abc$')`.<br />
+ *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+ *    start at the index of the last search's match, thus not taking the whole input value into
+ *    account.
+ * @param {string=} ngChange Angular expression to be executed when input changes due to user
+ *    interaction with the input element.
+ * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name input
+ * @restrict E
+ *
+ * @description
+ * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding,
+ * input state control, and validation.
+ * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** Not every feature offered is available for all input types.
+ * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`.
+ * </div>
+ *
+ * @param {string} ngModel Assignable angular expression to data-bind to.
+ * @param {string=} name Property name of the form under which the control is published.
+ * @param {string=} required Sets `required` validation error key if the value is not entered.
+ * @param {boolean=} ngRequired Sets `required` attribute if set to true
+ * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+ *    minlength.
+ * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+ *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+ *    length.
+ * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+ *    a RegExp found by evaluating the Angular expression given in the attribute value.
+ *    If the expression evaluates to a RegExp object, then this is used directly.
+ *    If the expression evaluates to a string, then it will be converted to a RegExp
+ *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+ *    `new RegExp('^abc$')`.<br />
+ *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+ *    start at the index of the last search's match, thus not taking the whole input value into
+ *    account.
+ * @param {string=} ngChange Angular expression to be executed when input changes due to user
+ *    interaction with the input element.
+ * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+ *    This parameter is ignored for input[type=password] controls, which will never trim the
+ *    input.
+ *
+ * @example
+    <example name="input-directive" module="inputExample">
+      <file name="index.html">
+       <script>
+          angular.module('inputExample', [])
+            .controller('ExampleController', ['$scope', function($scope) {
+              $scope.user = {name: 'guest', last: 'visitor'};
+            }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <form name="myForm">
+           <label>
+              User name:
+              <input type="text" name="userName" ng-model="user.name" required>
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.userName.$error.required">
+              Required!</span>
+           </div>
+           <label>
+              Last name:
+              <input type="text" name="lastName" ng-model="user.last"
+              ng-minlength="3" ng-maxlength="10">
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.lastName.$error.minlength">
+               Too short!</span>
+             <span class="error" ng-show="myForm.lastName.$error.maxlength">
+               Too long!</span>
+           </div>
+         </form>
+         <hr>
+         <tt>user = {{user}}</tt><br/>
+         <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br/>
+         <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br/>
+         <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br/>
+         <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br/>
+         <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br/>
+       </div>
+      </file>
+      <file name="protractor.js" type="protractor">
+        var user = element(by.exactBinding('user'));
+        var userNameValid = element(by.binding('myForm.userName.$valid'));
+        var lastNameValid = element(by.binding('myForm.lastName.$valid'));
+        var lastNameError = element(by.binding('myForm.lastName.$error'));
+        var formValid = element(by.binding('myForm.$valid'));
+        var userNameInput = element(by.model('user.name'));
+        var userLastInput = element(by.model('user.last'));
+
+        it('should initialize to model', function() {
+          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
+          expect(userNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+        it('should be invalid if empty when required', function() {
+          userNameInput.clear();
+          userNameInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"last":"visitor"}');
+          expect(userNameValid.getText()).toContain('false');
+          expect(formValid.getText()).toContain('false');
+        });
+
+        it('should be valid if empty when min length is set', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"name":"guest","last":""}');
+          expect(lastNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+        it('should be invalid if less than required min length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('xx');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('minlength');
+          expect(formValid.getText()).toContain('false');
+        });
+
+        it('should be invalid if longer than max length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('some ridiculously long name');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('maxlength');
+          expect(formValid.getText()).toContain('false');
+        });
+      </file>
+    </example>
+ */
+var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
+    function($browser, $sniffer, $filter, $parse) {
+  return {
+    restrict: 'E',
+    require: ['?ngModel'],
+    link: {
+      pre: function(scope, element, attr, ctrls) {
+        if (ctrls[0]) {
+          (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
+                                                              $browser, $filter, $parse);
+        }
+      }
+    }
+  };
+}];
+
+
+
+var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
+/**
+ * @ngdoc directive
+ * @name ngValue
+ *
+ * @description
+ * Binds the given expression to the value of `<option>` or {@link input[radio] `input[radio]`},
+ * so that when the element is selected, the {@link ngModel `ngModel`} of that element is set to
+ * the bound value.
+ *
+ * `ngValue` is useful when dynamically generating lists of radio buttons using
+ * {@link ngRepeat `ngRepeat`}, as shown below.
+ *
+ * Likewise, `ngValue` can be used to generate `<option>` elements for
+ * the {@link select `select`} element. In that case however, only strings are supported
+ * for the `value `attribute, so the resulting `ngModel` will always be a string.
+ * Support for `select` models with non-string values is available via `ngOptions`.
+ *
+ * @element input
+ * @param {string=} ngValue angular expression, whose value will be bound to the `value` attribute
+ *   of the `input` element
+ *
+ * @example
+    <example name="ngValue-directive" module="valueExample">
+      <file name="index.html">
+       <script>
+          angular.module('valueExample', [])
+            .controller('ExampleController', ['$scope', function($scope) {
+              $scope.names = ['pizza', 'unicorns', 'robots'];
+              $scope.my = { favorite: 'unicorns' };
+            }]);
+       </script>
+        <form ng-controller="ExampleController">
+          <h2>Which is your favorite?</h2>
+            <label ng-repeat="name in names" for="{{name}}">
+              {{name}}
+              <input type="radio"
+                     ng-model="my.favorite"
+                     ng-value="name"
+                     id="{{name}}"
+                     name="favorite">
+            </label>
+          <div>You chose {{my.favorite}}</div>
+        </form>
+      </file>
+      <file name="protractor.js" type="protractor">
+        var favorite = element(by.binding('my.favorite'));
+
+        it('should initialize to model', function() {
+          expect(favorite.getText()).toContain('unicorns');
+        });
+        it('should bind the values to the inputs', function() {
+          element.all(by.model('my.favorite')).get(0).click();
+          expect(favorite.getText()).toContain('pizza');
+        });
+      </file>
+    </example>
+ */
+var ngValueDirective = function() {
+  return {
+    restrict: 'A',
+    priority: 100,
+    compile: function(tpl, tplAttr) {
+      if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
+        return function ngValueConstantLink(scope, elm, attr) {
+          attr.$set('value', scope.$eval(attr.ngValue));
+        };
+      } else {
+        return function ngValueLink(scope, elm, attr) {
+          scope.$watch(attr.ngValue, function valueWatchAction(value) {
+            attr.$set('value', value);
+          });
+        };
+      }
+    }
+  };
+};
+
+/**
+ * @ngdoc directive
+ * @name ngBind
+ * @restrict AC
+ *
+ * @description
+ * The `ngBind` attribute tells Angular to replace the text content of the specified HTML element
+ * with the value of a given expression, and to update the text content when the value of that
+ * expression changes.
+ *
+ * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
+ * `{{ expression }}` which is similar but less verbose.
+ *
+ * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily
+ * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
+ * element attribute, it makes the bindings invisible to the user while the page is loading.
+ *
+ * An alternative solution to this problem would be using the
+ * {@link ng.directive:ngCloak ngCloak} directive.
+ *
+ *
+ * @element ANY
+ * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
+ *
+ * @example
+ * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
+   <example module="bindExample">
+     <file name="index.html">
+       <script>
+         angular.module('bindExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.name = 'Whirled';
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <label>Enter name: <input type="text" ng-model="name"></label><br>
+         Hello <span ng-bind="name"></span>!
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-bind', function() {
+         var nameInput = element(by.model('name'));
+
+         expect(element(by.binding('name')).getText()).toBe('Whirled');
+         nameInput.clear();
+         nameInput.sendKeys('world');
+         expect(element(by.binding('name')).getText()).toBe('world');
+       });
+     </file>
+   </example>
+ */
+var ngBindDirective = ['$compile', function($compile) {
+  return {
+    restrict: 'AC',
+    compile: function ngBindCompile(templateElement) {
+      $compile.$$addBindingClass(templateElement);
+      return function ngBindLink(scope, element, attr) {
+        $compile.$$addBindingInfo(element, attr.ngBind);
+        element = element[0];
+        scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
+          element.textContent = value === undefined ? '' : value;
+        });
+      };
+    }
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngBindTemplate
+ *
+ * @description
+ * The `ngBindTemplate` directive specifies that the element
+ * text content should be replaced with the interpolation of the template
+ * in the `ngBindTemplate` attribute.
+ * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
+ * expressions. This directive is needed since some HTML elements
+ * (such as TITLE and OPTION) cannot contain SPAN elements.
+ *
+ * @element ANY
+ * @param {string} ngBindTemplate template of form
+ *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
+ *
+ * @example
+ * Try it here: enter text in text box and watch the greeting change.
+   <example module="bindExample">
+     <file name="index.html">
+       <script>
+         angular.module('bindExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.salutation = 'Hello';
+             $scope.name = 'World';
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+        <label>Salutation: <input type="text" ng-model="salutation"></label><br>
+        <label>Name: <input type="text" ng-model="name"></label><br>
+        <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-bind', function() {
+         var salutationElem = element(by.binding('salutation'));
+         var salutationInput = element(by.model('salutation'));
+         var nameInput = element(by.model('name'));
+
+         expect(salutationElem.getText()).toBe('Hello World!');
+
+         salutationInput.clear();
+         salutationInput.sendKeys('Greetings');
+         nameInput.clear();
+         nameInput.sendKeys('user');
+
+         expect(salutationElem.getText()).toBe('Greetings user!');
+       });
+     </file>
+   </example>
+ */
+var ngBindTemplateDirective = ['$interpolate', '$compile', function($interpolate, $compile) {
+  return {
+    compile: function ngBindTemplateCompile(templateElement) {
+      $compile.$$addBindingClass(templateElement);
+      return function ngBindTemplateLink(scope, element, attr) {
+        var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
+        $compile.$$addBindingInfo(element, interpolateFn.expressions);
+        element = element[0];
+        attr.$observe('ngBindTemplate', function(value) {
+          element.textContent = value === undefined ? '' : value;
+        });
+      };
+    }
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngBindHtml
+ *
+ * @description
+ * Evaluates the expression and inserts the resulting HTML into the element in a secure way. By default,
+ * the resulting HTML content will be sanitized using the {@link ngSanitize.$sanitize $sanitize} service.
+ * To utilize this functionality, ensure that `$sanitize` is available, for example, by including {@link
+ * ngSanitize} in your module's dependencies (not in core Angular). In order to use {@link ngSanitize}
+ * in your module's dependencies, you need to include "angular-sanitize.js" in your application.
+ *
+ * You may also bypass sanitization for values you know are safe. To do so, bind to
+ * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
+ * under {@link ng.$sce#show-me-an-example-using-sce- Strict Contextual Escaping (SCE)}.
+ *
+ * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
+ * will have an exception (instead of an exploit.)
+ *
+ * @element ANY
+ * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
+ *
+ * @example
+
+   <example module="bindHtmlExample" deps="angular-sanitize.js">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+        <p ng-bind-html="myHTML"></p>
+       </div>
+     </file>
+
+     <file name="script.js">
+       angular.module('bindHtmlExample', ['ngSanitize'])
+         .controller('ExampleController', ['$scope', function($scope) {
+           $scope.myHTML =
+              'I am an <code>HTML</code>string with ' +
+              '<a href="#">links!</a> and other <em>stuff</em>';
+         }]);
+     </file>
+
+     <file name="protractor.js" type="protractor">
+       it('should check ng-bind-html', function() {
+         expect(element(by.binding('myHTML')).getText()).toBe(
+             'I am an HTMLstring with links! and other stuff');
+       });
+     </file>
+   </example>
+ */
+var ngBindHtmlDirective = ['$sce', '$parse', '$compile', function($sce, $parse, $compile) {
+  return {
+    restrict: 'A',
+    compile: function ngBindHtmlCompile(tElement, tAttrs) {
+      var ngBindHtmlGetter = $parse(tAttrs.ngBindHtml);
+      var ngBindHtmlWatch = $parse(tAttrs.ngBindHtml, function getStringValue(value) {
+        return (value || '').toString();
+      });
+      $compile.$$addBindingClass(tElement);
+
+      return function ngBindHtmlLink(scope, element, attr) {
+        $compile.$$addBindingInfo(element, attr.ngBindHtml);
+
+        scope.$watch(ngBindHtmlWatch, function ngBindHtmlWatchAction() {
+          // we re-evaluate the expr because we want a TrustedValueHolderType
+          // for $sce, not a string
+          element.html($sce.getTrustedHtml(ngBindHtmlGetter(scope)) || '');
+        });
+      };
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngChange
+ *
+ * @description
+ * Evaluate the given expression when the user changes the input.
+ * The expression is evaluated immediately, unlike the JavaScript onchange event
+ * which only triggers at the end of a change (usually, when the user leaves the
+ * form element or presses the return key).
+ *
+ * The `ngChange` expression is only evaluated when a change in the input value causes
+ * a new value to be committed to the model.
+ *
+ * It will not be evaluated:
+ * * if the value returned from the `$parsers` transformation pipeline has not changed
+ * * if the input has continued to be invalid since the model will stay `null`
+ * * if the model is changed programmatically and not by a change to the input value
+ *
+ *
+ * Note, this directive requires `ngModel` to be present.
+ *
+ * @element input
+ * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
+ * in input value.
+ *
+ * @example
+ * <example name="ngChange-directive" module="changeExample">
+ *   <file name="index.html">
+ *     <script>
+ *       angular.module('changeExample', [])
+ *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.counter = 0;
+ *           $scope.change = function() {
+ *             $scope.counter++;
+ *           };
+ *         }]);
+ *     </script>
+ *     <div ng-controller="ExampleController">
+ *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
+ *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
+ *       <label for="ng-change-example2">Confirmed</label><br />
+ *       <tt>debug = {{confirmed}}</tt><br/>
+ *       <tt>counter = {{counter}}</tt><br/>
+ *     </div>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     var counter = element(by.binding('counter'));
+ *     var debug = element(by.binding('confirmed'));
+ *
+ *     it('should evaluate the expression if changing from view', function() {
+ *       expect(counter.getText()).toContain('0');
+ *
+ *       element(by.id('ng-change-example1')).click();
+ *
+ *       expect(counter.getText()).toContain('1');
+ *       expect(debug.getText()).toContain('true');
+ *     });
+ *
+ *     it('should not evaluate the expression if changing from model', function() {
+ *       element(by.id('ng-change-example2')).click();
+
+ *       expect(counter.getText()).toContain('0');
+ *       expect(debug.getText()).toContain('true');
+ *     });
+ *   </file>
+ * </example>
+ */
+var ngChangeDirective = valueFn({
+  restrict: 'A',
+  require: 'ngModel',
+  link: function(scope, element, attr, ctrl) {
+    ctrl.$viewChangeListeners.push(function() {
+      scope.$eval(attr.ngChange);
+    });
+  }
+});
+
+function classDirective(name, selector) {
+  name = 'ngClass' + name;
+  return ['$animate', function($animate) {
+    return {
+      restrict: 'AC',
+      link: function(scope, element, attr) {
+        var oldVal;
+
+        scope.$watch(attr[name], ngClassWatchAction, true);
+
+        attr.$observe('class', function(value) {
+          ngClassWatchAction(scope.$eval(attr[name]));
+        });
+
+
+        if (name !== 'ngClass') {
+          scope.$watch('$index', function($index, old$index) {
+            // jshint bitwise: false
+            var mod = $index & 1;
+            if (mod !== (old$index & 1)) {
+              var classes = arrayClasses(scope.$eval(attr[name]));
+              mod === selector ?
+                addClasses(classes) :
+                removeClasses(classes);
+            }
+          });
+        }
+
+        function addClasses(classes) {
+          var newClasses = digestClassCounts(classes, 1);
+          attr.$addClass(newClasses);
+        }
+
+        function removeClasses(classes) {
+          var newClasses = digestClassCounts(classes, -1);
+          attr.$removeClass(newClasses);
+        }
+
+        function digestClassCounts(classes, count) {
+          // Use createMap() to prevent class assumptions involving property
+          // names in Object.prototype
+          var classCounts = element.data('$classCounts') || createMap();
+          var classesToUpdate = [];
+          forEach(classes, function(className) {
+            if (count > 0 || classCounts[className]) {
+              classCounts[className] = (classCounts[className] || 0) + count;
+              if (classCounts[className] === +(count > 0)) {
+                classesToUpdate.push(className);
+              }
+            }
+          });
+          element.data('$classCounts', classCounts);
+          return classesToUpdate.join(' ');
+        }
+
+        function updateClasses(oldClasses, newClasses) {
+          var toAdd = arrayDifference(newClasses, oldClasses);
+          var toRemove = arrayDifference(oldClasses, newClasses);
+          toAdd = digestClassCounts(toAdd, 1);
+          toRemove = digestClassCounts(toRemove, -1);
+          if (toAdd && toAdd.length) {
+            $animate.addClass(element, toAdd);
+          }
+          if (toRemove && toRemove.length) {
+            $animate.removeClass(element, toRemove);
+          }
+        }
+
+        function ngClassWatchAction(newVal) {
+          if (selector === true || scope.$index % 2 === selector) {
+            var newClasses = arrayClasses(newVal || []);
+            if (!oldVal) {
+              addClasses(newClasses);
+            } else if (!equals(newVal,oldVal)) {
+              var oldClasses = arrayClasses(oldVal);
+              updateClasses(oldClasses, newClasses);
+            }
+          }
+          oldVal = shallowCopy(newVal);
+        }
+      }
+    };
+
+    function arrayDifference(tokens1, tokens2) {
+      var values = [];
+
+      outer:
+      for (var i = 0; i < tokens1.length; i++) {
+        var token = tokens1[i];
+        for (var j = 0; j < tokens2.length; j++) {
+          if (token == tokens2[j]) continue outer;
+        }
+        values.push(token);
+      }
+      return values;
+    }
+
+    function arrayClasses(classVal) {
+      var classes = [];
+      if (isArray(classVal)) {
+        forEach(classVal, function(v) {
+          classes = classes.concat(arrayClasses(v));
+        });
+        return classes;
+      } else if (isString(classVal)) {
+        return classVal.split(' ');
+      } else if (isObject(classVal)) {
+        forEach(classVal, function(v, k) {
+          if (v) {
+            classes = classes.concat(k.split(' '));
+          }
+        });
+        return classes;
+      }
+      return classVal;
+    }
+  }];
+}
+
+/**
+ * @ngdoc directive
+ * @name ngClass
+ * @restrict AC
+ *
+ * @description
+ * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
+ * an expression that represents all classes to be added.
+ *
+ * The directive operates in three different ways, depending on which of three types the expression
+ * evaluates to:
+ *
+ * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
+ * names.
+ *
+ * 2. If the expression evaluates to an object, then for each key-value pair of the
+ * object with a truthy value the corresponding key is used as a class name.
+ *
+ * 3. If the expression evaluates to an array, each element of the array should either be a string as in
+ * type 1 or an object as in type 2. This means that you can mix strings and objects together in an array
+ * to give you more control over what CSS classes appear. See the code below for an example of this.
+ *
+ *
+ * The directive won't add duplicate classes if a particular class was already set.
+ *
+ * When the expression changes, the previously added classes are removed and only then are the
+ * new classes added.
+ *
+ * @animations
+ * **add** - happens just before the class is applied to the elements
+ *
+ * **remove** - happens just before the class is removed from the element
+ *
+ * @element ANY
+ * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
+ *   of the evaluation can be a string representing space delimited class
+ *   names, an array, or a map of class names to boolean values. In the case of a map, the
+ *   names of the properties whose values are truthy will be added as css classes to the
+ *   element.
+ *
+ * @example Example that demonstrates basic bindings via ngClass directive.
+   <example>
+     <file name="index.html">
+       <p ng-class="{strike: deleted, bold: important, red: error}">Map Syntax Example</p>
+       <label>
+          <input type="checkbox" ng-model="deleted">
+          deleted (apply "strike" class)
+       </label><br>
+       <label>
+          <input type="checkbox" ng-model="important">
+          important (apply "bold" class)
+       </label><br>
+       <label>
+          <input type="checkbox" ng-model="error">
+          error (apply "red" class)
+       </label>
+       <hr>
+       <p ng-class="style">Using String Syntax</p>
+       <input type="text" ng-model="style"
+              placeholder="Type: bold strike red" aria-label="Type: bold strike red">
+       <hr>
+       <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
+       <input ng-model="style1"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red"><br>
+       <input ng-model="style2"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 2"><br>
+       <input ng-model="style3"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 3"><br>
+       <hr>
+       <p ng-class="[style4, {orange: warning}]">Using Array and Map Syntax</p>
+       <input ng-model="style4" placeholder="Type: bold, strike" aria-label="Type: bold, strike"><br>
+       <label><input type="checkbox" ng-model="warning"> warning (apply "orange" class)</label>
+     </file>
+     <file name="style.css">
+       .strike {
+           text-decoration: line-through;
+       }
+       .bold {
+           font-weight: bold;
+       }
+       .red {
+           color: red;
+       }
+       .orange {
+           color: orange;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       var ps = element.all(by.css('p'));
+
+       it('should let you toggle the class', function() {
+
+         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/red/);
+
+         element(by.model('important')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/bold/);
+
+         element(by.model('error')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/red/);
+       });
+
+       it('should let you toggle string example', function() {
+         expect(ps.get(1).getAttribute('class')).toBe('');
+         element(by.model('style')).clear();
+         element(by.model('style')).sendKeys('red');
+         expect(ps.get(1).getAttribute('class')).toBe('red');
+       });
+
+       it('array example should have 3 classes', function() {
+         expect(ps.get(2).getAttribute('class')).toBe('');
+         element(by.model('style1')).sendKeys('bold');
+         element(by.model('style2')).sendKeys('strike');
+         element(by.model('style3')).sendKeys('red');
+         expect(ps.get(2).getAttribute('class')).toBe('bold strike red');
+       });
+
+       it('array with map example should have 2 classes', function() {
+         expect(ps.last().getAttribute('class')).toBe('');
+         element(by.model('style4')).sendKeys('bold');
+         element(by.model('warning')).click();
+         expect(ps.last().getAttribute('class')).toBe('bold orange');
+       });
+     </file>
+   </example>
+
+   ## Animations
+
+   The example below demonstrates how to perform animations using ngClass.
+
+   <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     <file name="index.html">
+      <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
+      <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
+      <br>
+      <span class="base-class" ng-class="myVar">Sample Text</span>
+     </file>
+     <file name="style.css">
+       .base-class {
+         -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+       }
+
+       .base-class.my-class {
+         color: red;
+         font-size:3em;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-class', function() {
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+
+         element(by.id('setbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).
+           toMatch(/my-class/);
+
+         element(by.id('clearbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+       });
+     </file>
+   </example>
+
+
+   ## ngClass and pre-existing CSS3 Transitions/Animations
+   The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
+   Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
+   any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
+   to view the step by step details of {@link $animate#addClass $animate.addClass} and
+   {@link $animate#removeClass $animate.removeClass}.
+ */
+var ngClassDirective = classDirective('', true);
+
+/**
+ * @ngdoc directive
+ * @name ngClassOdd
+ * @restrict AC
+ *
+ * @description
+ * The `ngClassOdd` and `ngClassEven` directives work exactly as
+ * {@link ng.directive:ngClass ngClass}, except they work in
+ * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+ *
+ * This directive can be applied only within the scope of an
+ * {@link ng.directive:ngRepeat ngRepeat}.
+ *
+ * @element ANY
+ * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
+ *   of the evaluation can be a string representing space delimited class names or an array.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+          <li ng-repeat="name in names">
+           <span ng-class-odd="'odd'" ng-class-even="'even'">
+             {{name}}
+           </span>
+          </li>
+        </ol>
+     </file>
+     <file name="style.css">
+       .odd {
+         color: red;
+       }
+       .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+   </example>
+ */
+var ngClassOddDirective = classDirective('Odd', 0);
+
+/**
+ * @ngdoc directive
+ * @name ngClassEven
+ * @restrict AC
+ *
+ * @description
+ * The `ngClassOdd` and `ngClassEven` directives work exactly as
+ * {@link ng.directive:ngClass ngClass}, except they work in
+ * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+ *
+ * This directive can be applied only within the scope of an
+ * {@link ng.directive:ngRepeat ngRepeat}.
+ *
+ * @element ANY
+ * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
+ *   result of the evaluation can be a string representing space delimited class names or an array.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+          <li ng-repeat="name in names">
+           <span ng-class-odd="'odd'" ng-class-even="'even'">
+             {{name}} &nbsp; &nbsp; &nbsp;
+           </span>
+          </li>
+        </ol>
+     </file>
+     <file name="style.css">
+       .odd {
+         color: red;
+       }
+       .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+   </example>
+ */
+var ngClassEvenDirective = classDirective('Even', 1);
+
+/**
+ * @ngdoc directive
+ * @name ngCloak
+ * @restrict AC
+ *
+ * @description
+ * The `ngCloak` directive is used to prevent the Angular html template from being briefly
+ * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
+ * directive to avoid the undesirable flicker effect caused by the html template display.
+ *
+ * The directive can be applied to the `<body>` element, but the preferred usage is to apply
+ * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
+ * of the browser view.
+ *
+ * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
+ * `angular.min.js`.
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```css
+ * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+ *   display: none !important;
+ * }
+ * ```
+ *
+ * When this css rule is loaded by the browser, all html elements (including their children) that
+ * are tagged with the `ngCloak` directive are hidden. When Angular encounters this directive
+ * during the compilation of the template it deletes the `ngCloak` element attribute, making
+ * the compiled element visible.
+ *
+ * For the best result, the `angular.js` script must be loaded in the head section of the html
+ * document; alternatively, the css rule above must be included in the external stylesheet of the
+ * application.
+ *
+ * @element ANY
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <div id="template1" ng-cloak>{{ 'hello' }}</div>
+        <div id="template2" class="ng-cloak">{{ 'world' }}</div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should remove the template directive and css class', function() {
+         expect($('#template1').getAttribute('ng-cloak')).
+           toBeNull();
+         expect($('#template2').getAttribute('ng-cloak')).
+           toBeNull();
+       });
+     </file>
+   </example>
+ *
+ */
+var ngCloakDirective = ngDirective({
+  compile: function(element, attr) {
+    attr.$set('ngCloak', undefined);
+    element.removeClass('ng-cloak');
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngController
+ *
+ * @description
+ * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
+ * supports the principles behind the Model-View-Controller design pattern.
+ *
+ * MVC components in angular:
+ *
+ * * Model — Models are the properties of a scope; scopes are attached to the DOM where scope properties
+ *   are accessed through bindings.
+ * * View — The template (HTML with data bindings) that is rendered into the View.
+ * * Controller — The `ngController` directive specifies a Controller class; the class contains business
+ *   logic behind the application to decorate the scope with functions and values
+ *
+ * Note that you can also attach controllers to the DOM by declaring it in a route definition
+ * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
+ * again using `ng-controller` in the template itself.  This will cause the controller to be attached
+ * and executed twice.
+ *
+ * @element ANY
+ * @scope
+ * @priority 500
+ * @param {expression} ngController Name of a constructor function registered with the current
+ * {@link ng.$controllerProvider $controllerProvider} or an {@link guide/expression expression}
+ * that on the current scope evaluates to a constructor function.
+ *
+ * The controller instance can be published into a scope property by specifying
+ * `ng-controller="as propertyName"`.
+ *
+ * If the current `$controllerProvider` is configured to use globals (via
+ * {@link ng.$controllerProvider#allowGlobals `$controllerProvider.allowGlobals()` }), this may
+ * also be the name of a globally accessible constructor function (not recommended).
+ *
+ * @example
+ * Here is a simple form for editing user contact information. Adding, removing, clearing, and
+ * greeting are methods declared on the controller (see source tab). These methods can
+ * easily be called from the angular markup. Any changes to the data are automatically reflected
+ * in the View without the need for a manual update.
+ *
+ * Two different declaration styles are included below:
+ *
+ * * one binds methods and properties directly onto the controller using `this`:
+ * `ng-controller="SettingsController1 as settings"`
+ * * one injects `$scope` into the controller:
+ * `ng-controller="SettingsController2"`
+ *
+ * The second option is more common in the Angular community, and is generally used in boilerplates
+ * and in this guide. However, there are advantages to binding properties directly to the controller
+ * and avoiding scope.
+ *
+ * * Using `controller as` makes it obvious which controller you are accessing in the template when
+ * multiple controllers apply to an element.
+ * * If you are writing your controllers as classes you have easier access to the properties and
+ * methods, which will appear on the scope, from inside the controller code.
+ * * Since there is always a `.` in the bindings, you don't have to worry about prototypal
+ * inheritance masking primitives.
+ *
+ * This example demonstrates the `controller as` syntax.
+ *
+ * <example name="ngControllerAs" module="controllerAsExample">
+ *   <file name="index.html">
+ *    <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
+ *      <label>Name: <input type="text" ng-model="settings.name"/></label>
+ *      <button ng-click="settings.greet()">greet</button><br/>
+ *      Contact:
+ *      <ul>
+ *        <li ng-repeat="contact in settings.contacts">
+ *          <select ng-model="contact.type" aria-label="Contact method" id="select_{{$index}}">
+ *             <option>phone</option>
+ *             <option>email</option>
+ *          </select>
+ *          <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+ *          <button ng-click="settings.clearContact(contact)">clear</button>
+ *          <button ng-click="settings.removeContact(contact)" aria-label="Remove">X</button>
+ *        </li>
+ *        <li><button ng-click="settings.addContact()">add</button></li>
+ *     </ul>
+ *    </div>
+ *   </file>
+ *   <file name="app.js">
+ *    angular.module('controllerAsExample', [])
+ *      .controller('SettingsController1', SettingsController1);
+ *
+ *    function SettingsController1() {
+ *      this.name = "John Smith";
+ *      this.contacts = [
+ *        {type: 'phone', value: '408 555 1212'},
+ *        {type: 'email', value: 'john.smith@example.org'} ];
+ *    }
+ *
+ *    SettingsController1.prototype.greet = function() {
+ *      alert(this.name);
+ *    };
+ *
+ *    SettingsController1.prototype.addContact = function() {
+ *      this.contacts.push({type: 'email', value: 'yourname@example.org'});
+ *    };
+ *
+ *    SettingsController1.prototype.removeContact = function(contactToRemove) {
+ *     var index = this.contacts.indexOf(contactToRemove);
+ *      this.contacts.splice(index, 1);
+ *    };
+ *
+ *    SettingsController1.prototype.clearContact = function(contact) {
+ *      contact.type = 'phone';
+ *      contact.value = '';
+ *    };
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     it('should check controller as', function() {
+ *       var container = element(by.id('ctrl-as-exmpl'));
+ *         expect(container.element(by.model('settings.name'))
+ *           .getAttribute('value')).toBe('John Smith');
+ *
+ *       var firstRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(0));
+ *       var secondRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(1));
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('408 555 1212');
+ *
+ *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('john.smith@example.org');
+ *
+ *       firstRepeat.element(by.buttonText('clear')).click();
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('');
+ *
+ *       container.element(by.buttonText('add')).click();
+ *
+ *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
+ *           .element(by.model('contact.value'))
+ *           .getAttribute('value'))
+ *           .toBe('yourname@example.org');
+ *     });
+ *   </file>
+ * </example>
+ *
+ * This example demonstrates the "attach to `$scope`" style of controller.
+ *
+ * <example name="ngController" module="controllerExample">
+ *  <file name="index.html">
+ *   <div id="ctrl-exmpl" ng-controller="SettingsController2">
+ *     <label>Name: <input type="text" ng-model="name"/></label>
+ *     <button ng-click="greet()">greet</button><br/>
+ *     Contact:
+ *     <ul>
+ *       <li ng-repeat="contact in contacts">
+ *         <select ng-model="contact.type" id="select_{{$index}}">
+ *            <option>phone</option>
+ *            <option>email</option>
+ *         </select>
+ *         <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+ *         <button ng-click="clearContact(contact)">clear</button>
+ *         <button ng-click="removeContact(contact)">X</button>
+ *       </li>
+ *       <li>[ <button ng-click="addContact()">add</button> ]</li>
+ *    </ul>
+ *   </div>
+ *  </file>
+ *  <file name="app.js">
+ *   angular.module('controllerExample', [])
+ *     .controller('SettingsController2', ['$scope', SettingsController2]);
+ *
+ *   function SettingsController2($scope) {
+ *     $scope.name = "John Smith";
+ *     $scope.contacts = [
+ *       {type:'phone', value:'408 555 1212'},
+ *       {type:'email', value:'john.smith@example.org'} ];
+ *
+ *     $scope.greet = function() {
+ *       alert($scope.name);
+ *     };
+ *
+ *     $scope.addContact = function() {
+ *       $scope.contacts.push({type:'email', value:'yourname@example.org'});
+ *     };
+ *
+ *     $scope.removeContact = function(contactToRemove) {
+ *       var index = $scope.contacts.indexOf(contactToRemove);
+ *       $scope.contacts.splice(index, 1);
+ *     };
+ *
+ *     $scope.clearContact = function(contact) {
+ *       contact.type = 'phone';
+ *       contact.value = '';
+ *     };
+ *   }
+ *  </file>
+ *  <file name="protractor.js" type="protractor">
+ *    it('should check controller', function() {
+ *      var container = element(by.id('ctrl-exmpl'));
+ *
+ *      expect(container.element(by.model('name'))
+ *          .getAttribute('value')).toBe('John Smith');
+ *
+ *      var firstRepeat =
+ *          container.element(by.repeater('contact in contacts').row(0));
+ *      var secondRepeat =
+ *          container.element(by.repeater('contact in contacts').row(1));
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('408 555 1212');
+ *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('john.smith@example.org');
+ *
+ *      firstRepeat.element(by.buttonText('clear')).click();
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('');
+ *
+ *      container.element(by.buttonText('add')).click();
+ *
+ *      expect(container.element(by.repeater('contact in contacts').row(2))
+ *          .element(by.model('contact.value'))
+ *          .getAttribute('value'))
+ *          .toBe('yourname@example.org');
+ *    });
+ *  </file>
+ *</example>
+
+ */
+var ngControllerDirective = [function() {
+  return {
+    restrict: 'A',
+    scope: true,
+    controller: '@',
+    priority: 500
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngCsp
+ *
+ * @element html
+ * @description
+ * Enables [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) support.
+ *
+ * This is necessary when developing things like Google Chrome Extensions or Universal Windows Apps.
+ *
+ * CSP forbids apps to use `eval` or `Function(string)` generated functions (among other things).
+ * For Angular to be CSP compatible there are only two things that we need to do differently:
+ *
+ * - don't use `Function` constructor to generate optimized value getters
+ * - don't inject custom stylesheet into the document
+ *
+ * AngularJS uses `Function(string)` generated functions as a speed optimization. Applying the `ngCsp`
+ * directive will cause Angular to use CSP compatibility mode. When this mode is on AngularJS will
+ * evaluate all expressions up to 30% slower than in non-CSP mode, but no security violations will
+ * be raised.
+ *
+ * CSP forbids JavaScript to inline stylesheet rules. In non CSP mode Angular automatically
+ * includes some CSS rules (e.g. {@link ng.directive:ngCloak ngCloak}).
+ * To make those directives work in CSP mode, include the `angular-csp.css` manually.
+ *
+ * Angular tries to autodetect if CSP is active and automatically turn on the CSP-safe mode. This
+ * autodetection however triggers a CSP error to be logged in the console:
+ *
+ * ```
+ * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
+ * script in the following Content Security Policy directive: "default-src 'self'". Note that
+ * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
+ * ```
+ *
+ * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
+ * directive on the root element of the application or on the `angular.js` script tag, whichever
+ * appears first in the html document.
+ *
+ * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
+ *
+ * @example
+ * This example shows how to apply the `ngCsp` directive to the `html` tag.
+   ```html
+     <!doctype html>
+     <html ng-app ng-csp>
+     ...
+     ...
+     </html>
+   ```
+  * @example
+      // Note: the suffix `.csp` in the example name triggers
+      // csp mode in our http server!
+      <example name="example.csp" module="cspExample" ng-csp="true">
+        <file name="index.html">
+          <div ng-controller="MainController as ctrl">
+            <div>
+              <button ng-click="ctrl.inc()" id="inc">Increment</button>
+              <span id="counter">
+                {{ctrl.counter}}
+              </span>
+            </div>
+
+            <div>
+              <button ng-click="ctrl.evil()" id="evil">Evil</button>
+              <span id="evilError">
+                {{ctrl.evilError}}
+              </span>
+            </div>
+          </div>
+        </file>
+        <file name="script.js">
+           angular.module('cspExample', [])
+             .controller('MainController', function() {
+                this.counter = 0;
+                this.inc = function() {
+                  this.counter++;
+                };
+                this.evil = function() {
+                  // jshint evil:true
+                  try {
+                    eval('1+2');
+                  } catch (e) {
+                    this.evilError = e.message;
+                  }
+                };
+              });
+        </file>
+        <file name="protractor.js" type="protractor">
+          var util, webdriver;
+
+          var incBtn = element(by.id('inc'));
+          var counter = element(by.id('counter'));
+          var evilBtn = element(by.id('evil'));
+          var evilError = element(by.id('evilError'));
+
+          function getAndClearSevereErrors() {
+            return browser.manage().logs().get('browser').then(function(browserLog) {
+              return browserLog.filter(function(logEntry) {
+                return logEntry.level.value > webdriver.logging.Level.WARNING.value;
+              });
+            });
+          }
+
+          function clearErrors() {
+            getAndClearSevereErrors();
+          }
+
+          function expectNoErrors() {
+            getAndClearSevereErrors().then(function(filteredLog) {
+              expect(filteredLog.length).toEqual(0);
+              if (filteredLog.length) {
+                console.log('browser console errors: ' + util.inspect(filteredLog));
+              }
+            });
+          }
+
+          function expectError(regex) {
+            getAndClearSevereErrors().then(function(filteredLog) {
+              var found = false;
+              filteredLog.forEach(function(log) {
+                if (log.message.match(regex)) {
+                  found = true;
+                }
+              });
+              if (!found) {
+                throw new Error('expected an error that matches ' + regex);
+              }
+            });
+          }
+
+          beforeEach(function() {
+            util = require('util');
+            webdriver = require('protractor/node_modules/selenium-webdriver');
+          });
+
+          // For now, we only test on Chrome,
+          // as Safari does not load the page with Protractor's injected scripts,
+          // and Firefox webdriver always disables content security policy (#6358)
+          if (browser.params.browser !== 'chrome') {
+            return;
+          }
+
+          it('should not report errors when the page is loaded', function() {
+            // clear errors so we are not dependent on previous tests
+            clearErrors();
+            // Need to reload the page as the page is already loaded when
+            // we come here
+            browser.driver.getCurrentUrl().then(function(url) {
+              browser.get(url);
+            });
+            expectNoErrors();
+          });
+
+          it('should evaluate expressions', function() {
+            expect(counter.getText()).toEqual('0');
+            incBtn.click();
+            expect(counter.getText()).toEqual('1');
+            expectNoErrors();
+          });
+
+          it('should throw and report an error when using "eval"', function() {
+            evilBtn.click();
+            expect(evilError.getText()).toMatch(/Content Security Policy/);
+            expectError(/Content Security Policy/);
+          });
+        </file>
+      </example>
+  */
+
+// ngCsp is not implemented as a proper directive any more, because we need it be processed while we
+// bootstrap the system (before $parse is instantiated), for this reason we just have
+// the csp.isActive() fn that looks for ng-csp attribute anywhere in the current doc
+
+/**
+ * @ngdoc directive
+ * @name ngClick
+ *
+ * @description
+ * The ngClick directive allows you to specify custom behavior when
+ * an element is clicked.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
+ * click. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-click="count = count + 1" ng-init="count=0">
+        Increment
+      </button>
+      <span>
+        count: {{count}}
+      </span>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-click', function() {
+         expect(element(by.binding('count')).getText()).toMatch('0');
+         element(by.css('button')).click();
+         expect(element(by.binding('count')).getText()).toMatch('1');
+       });
+     </file>
+   </example>
+ */
+/*
+ * A collection of directives that allows creation of custom event handlers that are defined as
+ * angular expressions and are compiled and executed within the current scope.
+ */
+var ngEventDirectives = {};
+
+// For events that might fire synchronously during DOM manipulation
+// we need to execute their event handlers asynchronously using $evalAsync,
+// so that they are not executed in an inconsistent state.
+var forceAsyncEvents = {
+  'blur': true,
+  'focus': true
+};
+forEach(
+  'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
+  function(eventName) {
+    var directiveName = directiveNormalize('ng-' + eventName);
+    ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
+      return {
+        restrict: 'A',
+        compile: function($element, attr) {
+          // We expose the powerful $event object on the scope that provides access to the Window,
+          // etc. that isn't protected by the fast paths in $parse.  We explicitly request better
+          // checks at the cost of speed since event handler expressions are not executed as
+          // frequently as regular change detection.
+          var fn = $parse(attr[directiveName], /* interceptorFn */ null, /* expensiveChecks */ true);
+          return function ngEventHandler(scope, element) {
+            element.on(eventName, function(event) {
+              var callback = function() {
+                fn(scope, {$event:event});
+              };
+              if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+                scope.$evalAsync(callback);
+              } else {
+                scope.$apply(callback);
+              }
+            });
+          };
+        }
+      };
+    }];
+  }
+);
+
+/**
+ * @ngdoc directive
+ * @name ngDblclick
+ *
+ * @description
+ * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
+ * a dblclick. (The Event object is available as `$event`)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-dblclick="count = count + 1" ng-init="count=0">
+        Increment (on double click)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMousedown
+ *
+ * @description
+ * The ngMousedown directive allows you to specify custom behavior on mousedown event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
+ * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mousedown="count = count + 1" ng-init="count=0">
+        Increment (on mouse down)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseup
+ *
+ * @description
+ * Specify custom behavior on mouseup event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
+ * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseup="count = count + 1" ng-init="count=0">
+        Increment (on mouse up)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngMouseover
+ *
+ * @description
+ * Specify custom behavior on mouseover event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
+ * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseover="count = count + 1" ng-init="count=0">
+        Increment (when mouse is over)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseenter
+ *
+ * @description
+ * Specify custom behavior on mouseenter event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
+ * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseenter="count = count + 1" ng-init="count=0">
+        Increment (when mouse enters)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseleave
+ *
+ * @description
+ * Specify custom behavior on mouseleave event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
+ * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseleave="count = count + 1" ng-init="count=0">
+        Increment (when mouse leaves)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMousemove
+ *
+ * @description
+ * Specify custom behavior on mousemove event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
+ * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mousemove="count = count + 1" ng-init="count=0">
+        Increment (when mouse moves)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeydown
+ *
+ * @description
+ * Specify custom behavior on keydown event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
+ * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-keydown="count = count + 1" ng-init="count=0">
+      key down count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeyup
+ *
+ * @description
+ * Specify custom behavior on keyup event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
+ * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <p>Typing in the input box below updates the key count</p>
+       <input ng-keyup="count = count + 1" ng-init="count=0"> key up count: {{count}}
+
+       <p>Typing in the input box below updates the keycode</p>
+       <input ng-keyup="event=$event">
+       <p>event keyCode: {{ event.keyCode }}</p>
+       <p>event altKey: {{ event.altKey }}</p>
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeypress
+ *
+ * @description
+ * Specify custom behavior on keypress event.
+ *
+ * @element ANY
+ * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
+ * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
+ * and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-keypress="count = count + 1" ng-init="count=0">
+      key press count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngSubmit
+ *
+ * @description
+ * Enables binding angular expressions to onsubmit events.
+ *
+ * Additionally it prevents the default action (which for form means sending the request to the
+ * server and reloading the current page), but only if the form does not contain `action`,
+ * `data-action`, or `x-action` attributes.
+ *
+ * <div class="alert alert-warning">
+ * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
+ * `ngSubmit` handlers together. See the
+ * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
+ * for a detailed discussion of when `ngSubmit` may be triggered.
+ * </div>
+ *
+ * @element form
+ * @priority 0
+ * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
+ * ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example module="submitExample">
+     <file name="index.html">
+      <script>
+        angular.module('submitExample', [])
+          .controller('ExampleController', ['$scope', function($scope) {
+            $scope.list = [];
+            $scope.text = 'hello';
+            $scope.submit = function() {
+              if ($scope.text) {
+                $scope.list.push(this.text);
+                $scope.text = '';
+              }
+            };
+          }]);
+      </script>
+      <form ng-submit="submit()" ng-controller="ExampleController">
+        Enter text and hit enter:
+        <input type="text" ng-model="text" name="text" />
+        <input type="submit" id="submit" value="Submit" />
+        <pre>list={{list}}</pre>
+      </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-submit', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+         expect(element(by.model('text')).getAttribute('value')).toBe('');
+       });
+       it('should ignore empty strings', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+        });
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngFocus
+ *
+ * @description
+ * Specify custom behavior on focus event.
+ *
+ * Note: As the `focus` event is executed synchronously when calling `input.focus()`
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
+ * focus. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+ * See {@link ng.directive:ngClick ngClick}
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngBlur
+ *
+ * @description
+ * Specify custom behavior on blur event.
+ *
+ * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
+ * an element has lost focus.
+ *
+ * Note: As the `blur` event is executed synchronously also during DOM manipulations
+ * (e.g. removing a focussed input),
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
+ * blur. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+ * See {@link ng.directive:ngClick ngClick}
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngCopy
+ *
+ * @description
+ * Specify custom behavior on copy event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
+ * copy. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
+      copied: {{copied}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngCut
+ *
+ * @description
+ * Specify custom behavior on cut event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
+ * cut. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
+      cut: {{cut}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngPaste
+ *
+ * @description
+ * Specify custom behavior on paste event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
+ * paste. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
+      pasted: {{paste}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngIf
+ * @restrict A
+ *
+ * @description
+ * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
+ * {expression}. If the expression assigned to `ngIf` evaluates to a false
+ * value then the element is removed from the DOM, otherwise a clone of the
+ * element is reinserted into the DOM.
+ *
+ * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
+ * element in the DOM rather than changing its visibility via the `display` css property.  A common
+ * case when this difference is significant is when using css selectors that rely on an element's
+ * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
+ *
+ * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
+ * is created when the element is restored.  The scope created within `ngIf` inherits from
+ * its parent scope using
+ * [prototypal inheritance](https://github.com/angular/angular.js/wiki/Understanding-Scopes#javascript-prototypal-inheritance).
+ * An important implication of this is if `ngModel` is used within `ngIf` to bind to
+ * a javascript primitive defined in the parent scope. In this case any modifications made to the
+ * variable within the child scope will override (hide) the value in the parent scope.
+ *
+ * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
+ * is if an element's class attribute is directly modified after it's compiled, using something like
+ * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
+ * the added class will be lost because the original compiled state is used to regenerate the element.
+ *
+ * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
+ * and `leave` effects.
+ *
+ * @animations
+ * enter - happens just after the `ngIf` contents change and a new DOM element is created and injected into the `ngIf` container
+ * leave - happens just before the `ngIf` contents are removed from the DOM
+ *
+ * @element ANY
+ * @scope
+ * @priority 600
+ * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
+ *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
+ *     element is added to the DOM tree.
+ *
+ * @example
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      <label>Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /></label><br/>
+      Show when checked:
+      <span ng-if="checked" class="animate-if">
+        This is removed when the checkbox is unchecked.
+      </span>
+    </file>
+    <file name="animations.css">
+      .animate-if {
+        background:white;
+        border:1px solid black;
+        padding:10px;
+      }
+
+      .animate-if.ng-enter, .animate-if.ng-leave {
+        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+      }
+
+      .animate-if.ng-enter,
+      .animate-if.ng-leave.ng-leave-active {
+        opacity:0;
+      }
+
+      .animate-if.ng-leave,
+      .animate-if.ng-enter.ng-enter-active {
+        opacity:1;
+      }
+    </file>
+  </example>
+ */
+var ngIfDirective = ['$animate', function($animate) {
+  return {
+    multiElement: true,
+    transclude: 'element',
+    priority: 600,
+    terminal: true,
+    restrict: 'A',
+    $$tlb: true,
+    link: function($scope, $element, $attr, ctrl, $transclude) {
+        var block, childScope, previousElements;
+        $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
+
+          if (value) {
+            if (!childScope) {
+              $transclude(function(clone, newScope) {
+                childScope = newScope;
+                clone[clone.length++] = document.createComment(' end ngIf: ' + $attr.ngIf + ' ');
+                // Note: We only need the first/last node of the cloned nodes.
+                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                // by a directive with templateUrl when its template arrives.
+                block = {
+                  clone: clone
+                };
+                $animate.enter(clone, $element.parent(), $element);
+              });
+            }
+          } else {
+            if (previousElements) {
+              previousElements.remove();
+              previousElements = null;
+            }
+            if (childScope) {
+              childScope.$destroy();
+              childScope = null;
+            }
+            if (block) {
+              previousElements = getBlockNodes(block.clone);
+              $animate.leave(previousElements).then(function() {
+                previousElements = null;
+              });
+              block = null;
+            }
+          }
+        });
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngInclude
+ * @restrict ECA
+ *
+ * @description
+ * Fetches, compiles and includes an external HTML fragment.
+ *
+ * By default, the template URL is restricted to the same domain and protocol as the
+ * application document. This is done by calling {@link $sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
+ * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
+ * {@link $sce#trustAsResourceUrl wrap them} as trusted values. Refer to Angular's {@link
+ * ng.$sce Strict Contextual Escaping}.
+ *
+ * In addition, the browser's
+ * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+ * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+ * policy may further restrict whether the template is successfully loaded.
+ * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
+ * access on some browsers.
+ *
+ * @animations
+ * enter - animation is used to bring new content into the browser.
+ * leave - animation is used to animate existing content away.
+ *
+ * The enter and leave animation occur concurrently.
+ *
+ * @scope
+ * @priority 400
+ *
+ * @param {string} ngInclude|src angular expression evaluating to URL. If the source is a string constant,
+ *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
+ * @param {string=} onload Expression to evaluate when a new partial is loaded.
+ *
+ * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
+ *                  $anchorScroll} to scroll the viewport after the content is loaded.
+ *
+ *                  - If the attribute is not set, disable scrolling.
+ *                  - If the attribute is set without value, enable scrolling.
+ *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
+ *
+ * @example
+  <example module="includeExample" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+     <div ng-controller="ExampleController">
+       <select ng-model="template" ng-options="t.name for t in templates">
+        <option value="">(blank)</option>
+       </select>
+       url of the template: <code>{{template.url}}</code>
+       <hr/>
+       <div class="slide-animate-container">
+         <div class="slide-animate" ng-include="template.url"></div>
+       </div>
+     </div>
+    </file>
+    <file name="script.js">
+      angular.module('includeExample', ['ngAnimate'])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.templates =
+            [ { name: 'template1.html', url: 'template1.html'},
+              { name: 'template2.html', url: 'template2.html'} ];
+          $scope.template = $scope.templates[0];
+        }]);
+     </file>
+    <file name="template1.html">
+      Content of template1.html
+    </file>
+    <file name="template2.html">
+      Content of template2.html
+    </file>
+    <file name="animations.css">
+      .slide-animate-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+      .slide-animate {
+        padding:10px;
+      }
+
+      .slide-animate.ng-enter, .slide-animate.ng-leave {
+        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+        display:block;
+        padding:10px;
+      }
+
+      .slide-animate.ng-enter {
+        top:-50px;
+      }
+      .slide-animate.ng-enter.ng-enter-active {
+        top:0;
+      }
+
+      .slide-animate.ng-leave {
+        top:0;
+      }
+      .slide-animate.ng-leave.ng-leave-active {
+        top:50px;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var templateSelect = element(by.model('template'));
+      var includeElem = element(by.css('[ng-include]'));
+
+      it('should load template1.html', function() {
+        expect(includeElem.getText()).toMatch(/Content of template1.html/);
+      });
+
+      it('should load template2.html', function() {
+        if (browser.params.browser == 'firefox') {
+          // Firefox can't handle using selects
+          // See https://github.com/angular/protractor/issues/480
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(2).click();
+        expect(includeElem.getText()).toMatch(/Content of template2.html/);
+      });
+
+      it('should change to blank', function() {
+        if (browser.params.browser == 'firefox') {
+          // Firefox can't handle using selects
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(0).click();
+        expect(includeElem.isPresent()).toBe(false);
+      });
+    </file>
+  </example>
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentRequested
+ * @eventType emit on the scope ngInclude was declared in
+ * @description
+ * Emitted every time the ngInclude content is requested.
+ *
+ * @param {Object} angularEvent Synthetic event object.
+ * @param {String} src URL of content to load.
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentLoaded
+ * @eventType emit on the current ngInclude scope
+ * @description
+ * Emitted every time the ngInclude content is reloaded.
+ *
+ * @param {Object} angularEvent Synthetic event object.
+ * @param {String} src URL of content to load.
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentError
+ * @eventType emit on the scope ngInclude was declared in
+ * @description
+ * Emitted when a template HTTP request yields an erroneous response (status < 200 || status > 299)
+ *
+ * @param {Object} angularEvent Synthetic event object.
+ * @param {String} src URL of content to load.
+ */
+var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate', '$sce',
+                  function($templateRequest,   $anchorScroll,   $animate,   $sce) {
+  return {
+    restrict: 'ECA',
+    priority: 400,
+    terminal: true,
+    transclude: 'element',
+    controller: angular.noop,
+    compile: function(element, attr) {
+      var srcExp = attr.ngInclude || attr.src,
+          onloadExp = attr.onload || '',
+          autoScrollExp = attr.autoscroll;
+
+      return function(scope, $element, $attr, ctrl, $transclude) {
+        var changeCounter = 0,
+            currentScope,
+            previousElement,
+            currentElement;
+
+        var cleanupLastIncludeContent = function() {
+          if (previousElement) {
+            previousElement.remove();
+            previousElement = null;
+          }
+          if (currentScope) {
+            currentScope.$destroy();
+            currentScope = null;
+          }
+          if (currentElement) {
+            $animate.leave(currentElement).then(function() {
+              previousElement = null;
+            });
+            previousElement = currentElement;
+            currentElement = null;
+          }
+        };
+
+        scope.$watch($sce.parseAsResourceUrl(srcExp), function ngIncludeWatchAction(src) {
+          var afterAnimation = function() {
+            if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
+              $anchorScroll();
+            }
+          };
+          var thisChangeId = ++changeCounter;
+
+          if (src) {
+            //set the 2nd param to true to ignore the template request error so that the inner
+            //contents and scope can be cleaned up.
+            $templateRequest(src, true).then(function(response) {
+              if (thisChangeId !== changeCounter) return;
+              var newScope = scope.$new();
+              ctrl.template = response;
+
+              // Note: This will also link all children of ng-include that were contained in the original
+              // html. If that content contains controllers, ... they could pollute/change the scope.
+              // However, using ng-include on an element with additional content does not make sense...
+              // Note: We can't remove them in the cloneAttchFn of $transclude as that
+              // function is called before linking the content, which would apply child
+              // directives to non existing elements.
+              var clone = $transclude(newScope, function(clone) {
+                cleanupLastIncludeContent();
+                $animate.enter(clone, null, $element).then(afterAnimation);
+              });
+
+              currentScope = newScope;
+              currentElement = clone;
+
+              currentScope.$emit('$includeContentLoaded', src);
+              scope.$eval(onloadExp);
+            }, function() {
+              if (thisChangeId === changeCounter) {
+                cleanupLastIncludeContent();
+                scope.$emit('$includeContentError', src);
+              }
+            });
+            scope.$emit('$includeContentRequested', src);
+          } else {
+            cleanupLastIncludeContent();
+            ctrl.template = null;
+          }
+        });
+      };
+    }
+  };
+}];
+
+// This directive is called during the $transclude call of the first `ngInclude` directive.
+// It will replace and compile the content of the element with the loaded template.
+// We need this directive so that the element content is already filled when
+// the link function of another directive on the same element as ngInclude
+// is called.
+var ngIncludeFillContentDirective = ['$compile',
+  function($compile) {
+    return {
+      restrict: 'ECA',
+      priority: -400,
+      require: 'ngInclude',
+      link: function(scope, $element, $attr, ctrl) {
+        if (/SVG/.test($element[0].toString())) {
+          // WebKit: https://bugs.webkit.org/show_bug.cgi?id=135698 --- SVG elements do not
+          // support innerHTML, so detect this here and try to generate the contents
+          // specially.
+          $element.empty();
+          $compile(jqLiteBuildFragment(ctrl.template, document).childNodes)(scope,
+              function namespaceAdaptedClone(clone) {
+            $element.append(clone);
+          }, {futureParentElement: $element});
+          return;
+        }
+
+        $element.html(ctrl.template);
+        $compile($element.contents())(scope);
+      }
+    };
+  }];
+
+/**
+ * @ngdoc directive
+ * @name ngInit
+ * @restrict AC
+ *
+ * @description
+ * The `ngInit` directive allows you to evaluate an expression in the
+ * current scope.
+ *
+ * <div class="alert alert-danger">
+ * The only appropriate use of `ngInit` is for aliasing special properties of
+ * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below. Besides this case, you
+ * should use {@link guide/controller controllers} rather than `ngInit`
+ * to initialize values on a scope.
+ * </div>
+ * <div class="alert alert-warning">
+ * **Note**: If you have assignment in `ngInit` along with {@link ng.$filter `$filter`}, make
+ * sure you have parenthesis for correct precedence:
+ * <pre class="prettyprint">
+ * `<div ng-init="test1 = (data | orderBy:'name')"></div>`
+ * </pre>
+ * </div>
+ *
+ * @priority 450
+ *
+ * @element ANY
+ * @param {expression} ngInit {@link guide/expression Expression} to eval.
+ *
+ * @example
+   <example module="initExample">
+     <file name="index.html">
+   <script>
+     angular.module('initExample', [])
+       .controller('ExampleController', ['$scope', function($scope) {
+         $scope.list = [['a', 'b'], ['c', 'd']];
+       }]);
+   </script>
+   <div ng-controller="ExampleController">
+     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
+       <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
+          <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
+       </div>
+     </div>
+   </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should alias index positions', function() {
+         var elements = element.all(by.css('.example-init'));
+         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
+         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
+         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
+         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
+       });
+     </file>
+   </example>
+ */
+var ngInitDirective = ngDirective({
+  priority: 450,
+  compile: function() {
+    return {
+      pre: function(scope, element, attrs) {
+        scope.$eval(attrs.ngInit);
+      }
+    };
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngList
+ *
+ * @description
+ * Text input that converts between a delimited string and an array of strings. The default
+ * delimiter is a comma followed by a space - equivalent to `ng-list=", "`. You can specify a custom
+ * delimiter as the value of the `ngList` attribute - for example, `ng-list=" | "`.
+ *
+ * The behaviour of the directive is affected by the use of the `ngTrim` attribute.
+ * * If `ngTrim` is set to `"false"` then whitespace around both the separator and each
+ *   list item is respected. This implies that the user of the directive is responsible for
+ *   dealing with whitespace but also allows you to use whitespace as a delimiter, such as a
+ *   tab or newline character.
+ * * Otherwise whitespace around the delimiter is ignored when splitting (although it is respected
+ *   when joining the list items back together) and whitespace around each list item is stripped
+ *   before it is added to the model.
+ *
+ * ### Example with Validation
+ *
+ * <example name="ngList-directive" module="listExample">
+ *   <file name="app.js">
+ *      angular.module('listExample', [])
+ *        .controller('ExampleController', ['$scope', function($scope) {
+ *          $scope.names = ['morpheus', 'neo', 'trinity'];
+ *        }]);
+ *   </file>
+ *   <file name="index.html">
+ *    <form name="myForm" ng-controller="ExampleController">
+ *      <label>List: <input name="namesInput" ng-model="names" ng-list required></label>
+ *      <span role="alert">
+ *        <span class="error" ng-show="myForm.namesInput.$error.required">
+ *        Required!</span>
+ *      </span>
+ *      <br>
+ *      <tt>names = {{names}}</tt><br/>
+ *      <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
+ *      <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
+ *      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+ *      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+ *     </form>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     var listInput = element(by.model('names'));
+ *     var names = element(by.exactBinding('names'));
+ *     var valid = element(by.binding('myForm.namesInput.$valid'));
+ *     var error = element(by.css('span.error'));
+ *
+ *     it('should initialize to model', function() {
+ *       expect(names.getText()).toContain('["morpheus","neo","trinity"]');
+ *       expect(valid.getText()).toContain('true');
+ *       expect(error.getCssValue('display')).toBe('none');
+ *     });
+ *
+ *     it('should be invalid if empty', function() {
+ *       listInput.clear();
+ *       listInput.sendKeys('');
+ *
+ *       expect(names.getText()).toContain('');
+ *       expect(valid.getText()).toContain('false');
+ *       expect(error.getCssValue('display')).not.toBe('none');
+ *     });
+ *   </file>
+ * </example>
+ *
+ * ### Example - splitting on whitespace
+ * <example name="ngList-directive-newlines">
+ *   <file name="index.html">
+ *    <textarea ng-model="list" ng-list="&#10;" ng-trim="false"></textarea>
+ *    <pre>{{ list | json }}</pre>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     it("should split the text by newlines", function() {
+ *       var listInput = element(by.model('list'));
+ *       var output = element(by.binding('list | json'));
+ *       listInput.sendKeys('abc\ndef\nghi');
+ *       expect(output.getText()).toContain('[\n  "abc",\n  "def",\n  "ghi"\n]');
+ *     });
+ *   </file>
+ * </example>
+ *
+ * @element input
+ * @param {string=} ngList optional delimiter that should be used to split the value.
+ */
+var ngListDirective = function() {
+  return {
+    restrict: 'A',
+    priority: 100,
+    require: 'ngModel',
+    link: function(scope, element, attr, ctrl) {
+      // We want to control whitespace trimming so we use this convoluted approach
+      // to access the ngList attribute, which doesn't pre-trim the attribute
+      var ngList = element.attr(attr.$attr.ngList) || ', ';
+      var trimValues = attr.ngTrim !== 'false';
+      var separator = trimValues ? trim(ngList) : ngList;
+
+      var parse = function(viewValue) {
+        // If the viewValue is invalid (say required but empty) it will be `undefined`
+        if (isUndefined(viewValue)) return;
+
+        var list = [];
+
+        if (viewValue) {
+          forEach(viewValue.split(separator), function(value) {
+            if (value) list.push(trimValues ? trim(value) : value);
+          });
+        }
+
+        return list;
+      };
+
+      ctrl.$parsers.push(parse);
+      ctrl.$formatters.push(function(value) {
+        if (isArray(value)) {
+          return value.join(ngList);
+        }
+
+        return undefined;
+      });
+
+      // Override the standard $isEmpty because an empty array means the input is empty.
+      ctrl.$isEmpty = function(value) {
+        return !value || !value.length;
+      };
+    }
+  };
+};
+
+/* global VALID_CLASS: true,
+  INVALID_CLASS: true,
+  PRISTINE_CLASS: true,
+  DIRTY_CLASS: true,
+  UNTOUCHED_CLASS: true,
+  TOUCHED_CLASS: true,
+*/
+
+var VALID_CLASS = 'ng-valid',
+    INVALID_CLASS = 'ng-invalid',
+    PRISTINE_CLASS = 'ng-pristine',
+    DIRTY_CLASS = 'ng-dirty',
+    UNTOUCHED_CLASS = 'ng-untouched',
+    TOUCHED_CLASS = 'ng-touched',
+    PENDING_CLASS = 'ng-pending';
+
+
+var $ngModelMinErr = new minErr('ngModel');
+
+/**
+ * @ngdoc type
+ * @name ngModel.NgModelController
+ *
+ * @property {string} $viewValue Actual string value in the view.
+ * @property {*} $modelValue The value in the model that the control is bound to.
+ * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
+       the control reads value from the DOM. The functions are called in array order, each passing
+       its return value through to the next. The last return value is forwarded to the
+       {@link ngModel.NgModelController#$validators `$validators`} collection.
+
+Parsers are used to sanitize / convert the {@link ngModel.NgModelController#$viewValue
+`$viewValue`}.
+
+Returning `undefined` from a parser means a parse error occurred. In that case,
+no {@link ngModel.NgModelController#$validators `$validators`} will run and the `ngModel`
+will be set to `undefined` unless {@link ngModelOptions `ngModelOptions.allowInvalid`}
+is set to `true`. The parse error is stored in `ngModel.$error.parse`.
+
+ *
+ * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
+       the model value changes. The functions are called in reverse array order, each passing the value through to the
+       next. The last return value is used as the actual DOM value.
+       Used to format / convert values for display in the control.
+ * ```js
+ * function formatter(value) {
+ *   if (value) {
+ *     return value.toUpperCase();
+ *   }
+ * }
+ * ngModel.$formatters.push(formatter);
+ * ```
+ *
+ * @property {Object.<string, function>} $validators A collection of validators that are applied
+ *      whenever the model value changes. The key value within the object refers to the name of the
+ *      validator while the function refers to the validation operation. The validation operation is
+ *      provided with the model value as an argument and must return a true or false value depending
+ *      on the response of that validation.
+ *
+ * ```js
+ * ngModel.$validators.validCharacters = function(modelValue, viewValue) {
+ *   var value = modelValue || viewValue;
+ *   return /[0-9]+/.test(value) &&
+ *          /[a-z]+/.test(value) &&
+ *          /[A-Z]+/.test(value) &&
+ *          /\W+/.test(value);
+ * };
+ * ```
+ *
+ * @property {Object.<string, function>} $asyncValidators A collection of validations that are expected to
+ *      perform an asynchronous validation (e.g. a HTTP request). The validation function that is provided
+ *      is expected to return a promise when it is run during the model validation process. Once the promise
+ *      is delivered then the validation status will be set to true when fulfilled and false when rejected.
+ *      When the asynchronous validators are triggered, each of the validators will run in parallel and the model
+ *      value will only be updated once all validators have been fulfilled. As long as an asynchronous validator
+ *      is unfulfilled, its key will be added to the controllers `$pending` property. Also, all asynchronous validators
+ *      will only run once all synchronous validators have passed.
+ *
+ * Please note that if $http is used then it is important that the server returns a success HTTP response code
+ * in order to fulfill the validation and a status level of `4xx` in order to reject the validation.
+ *
+ * ```js
+ * ngModel.$asyncValidators.uniqueUsername = function(modelValue, viewValue) {
+ *   var value = modelValue || viewValue;
+ *
+ *   // Lookup user by username
+ *   return $http.get('/api/users/' + value).
+ *      then(function resolved() {
+ *        //username exists, this means validation fails
+ *        return $q.reject('exists');
+ *      }, function rejected() {
+ *        //username does not exist, therefore this validation passes
+ *        return true;
+ *      });
+ * };
+ * ```
+ *
+ * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever the
+ *     view value has changed. It is called with no arguments, and its return value is ignored.
+ *     This can be used in place of additional $watches against the model value.
+ *
+ * @property {Object} $error An object hash with all failing validator ids as keys.
+ * @property {Object} $pending An object hash with all pending validator ids as keys.
+ *
+ * @property {boolean} $untouched True if control has not lost focus yet.
+ * @property {boolean} $touched True if control has lost focus.
+ * @property {boolean} $pristine True if user has not interacted with the control yet.
+ * @property {boolean} $dirty True if user has already interacted with the control.
+ * @property {boolean} $valid True if there is no error.
+ * @property {boolean} $invalid True if at least one error on the control.
+ * @property {string} $name The name attribute of the control.
+ *
+ * @description
+ *
+ * `NgModelController` provides API for the {@link ngModel `ngModel`} directive.
+ * The controller contains services for data-binding, validation, CSS updates, and value formatting
+ * and parsing. It purposefully does not contain any logic which deals with DOM rendering or
+ * listening to DOM events.
+ * Such DOM related logic should be provided by other directives which make use of
+ * `NgModelController` for data-binding to control elements.
+ * Angular provides this DOM logic for most {@link input `input`} elements.
+ * At the end of this page you can find a {@link ngModel.NgModelController#custom-control-example
+ * custom control example} that uses `ngModelController` to bind to `contenteditable` elements.
+ *
+ * @example
+ * ### Custom Control Example
+ * This example shows how to use `NgModelController` with a custom control to achieve
+ * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
+ * collaborate together to achieve the desired result.
+ *
+ * `contenteditable` is an HTML5 attribute, which tells the browser to let the element
+ * contents be edited in place by the user.
+ *
+ * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
+ * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
+ * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks
+ * that content using the `$sce` service.
+ *
+ * <example name="NgModelController" module="customControl" deps="angular-sanitize.js">
+    <file name="style.css">
+      [contenteditable] {
+        border: 1px solid black;
+        background-color: white;
+        min-height: 20px;
+      }
+
+      .ng-invalid {
+        border: 1px solid red;
+      }
+
+    </file>
+    <file name="script.js">
+      angular.module('customControl', ['ngSanitize']).
+        directive('contenteditable', ['$sce', function($sce) {
+          return {
+            restrict: 'A', // only activate on element attribute
+            require: '?ngModel', // get a hold of NgModelController
+            link: function(scope, element, attrs, ngModel) {
+              if (!ngModel) return; // do nothing if no ng-model
+
+              // Specify how UI should be updated
+              ngModel.$render = function() {
+                element.html($sce.getTrustedHtml(ngModel.$viewValue || ''));
+              };
+
+              // Listen for change events to enable binding
+              element.on('blur keyup change', function() {
+                scope.$evalAsync(read);
+              });
+              read(); // initialize
+
+              // Write data to the model
+              function read() {
+                var html = element.html();
+                // When we clear the content editable the browser leaves a <br> behind
+                // If strip-br attribute is provided then we strip this out
+                if ( attrs.stripBr && html == '<br>' ) {
+                  html = '';
+                }
+                ngModel.$setViewValue(html);
+              }
+            }
+          };
+        }]);
+    </file>
+    <file name="index.html">
+      <form name="myForm">
+       <div contenteditable
+            name="myWidget" ng-model="userContent"
+            strip-br="true"
+            required>Change me!</div>
+        <span ng-show="myForm.myWidget.$error.required">Required!</span>
+       <hr>
+       <textarea ng-model="userContent" aria-label="Dynamic textarea"></textarea>
+      </form>
+    </file>
+    <file name="protractor.js" type="protractor">
+    it('should data-bind and become invalid', function() {
+      if (browser.params.browser == 'safari' || browser.params.browser == 'firefox') {
+        // SafariDriver can't handle contenteditable
+        // and Firefox driver can't clear contenteditables very well
+        return;
+      }
+      var contentEditable = element(by.css('[contenteditable]'));
+      var content = 'Change me!';
+
+      expect(contentEditable.getText()).toEqual(content);
+
+      contentEditable.clear();
+      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
+      expect(contentEditable.getText()).toEqual('');
+      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
+    });
+    </file>
+ * </example>
+ *
+ *
+ */
+var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$rootScope', '$q', '$interpolate',
+    function($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $rootScope, $q, $interpolate) {
+  this.$viewValue = Number.NaN;
+  this.$modelValue = Number.NaN;
+  this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity.
+  this.$validators = {};
+  this.$asyncValidators = {};
+  this.$parsers = [];
+  this.$formatters = [];
+  this.$viewChangeListeners = [];
+  this.$untouched = true;
+  this.$touched = false;
+  this.$pristine = true;
+  this.$dirty = false;
+  this.$valid = true;
+  this.$invalid = false;
+  this.$error = {}; // keep invalid keys here
+  this.$$success = {}; // keep valid keys here
+  this.$pending = undefined; // keep pending keys here
+  this.$name = $interpolate($attr.name || '', false)($scope);
+
+
+  var parsedNgModel = $parse($attr.ngModel),
+      parsedNgModelAssign = parsedNgModel.assign,
+      ngModelGet = parsedNgModel,
+      ngModelSet = parsedNgModelAssign,
+      pendingDebounce = null,
+      parserValid,
+      ctrl = this;
+
+  this.$$setOptions = function(options) {
+    ctrl.$options = options;
+    if (options && options.getterSetter) {
+      var invokeModelGetter = $parse($attr.ngModel + '()'),
+          invokeModelSetter = $parse($attr.ngModel + '($$$p)');
+
+      ngModelGet = function($scope) {
+        var modelValue = parsedNgModel($scope);
+        if (isFunction(modelValue)) {
+          modelValue = invokeModelGetter($scope);
+        }
+        return modelValue;
+      };
+      ngModelSet = function($scope, newValue) {
+        if (isFunction(parsedNgModel($scope))) {
+          invokeModelSetter($scope, {$$$p: ctrl.$modelValue});
+        } else {
+          parsedNgModelAssign($scope, ctrl.$modelValue);
+        }
+      };
+    } else if (!parsedNgModel.assign) {
+      throw $ngModelMinErr('nonassign', "Expression '{0}' is non-assignable. Element: {1}",
+          $attr.ngModel, startingTag($element));
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$render
+   *
+   * @description
+   * Called when the view needs to be updated. It is expected that the user of the ng-model
+   * directive will implement this method.
+   *
+   * The `$render()` method is invoked in the following situations:
+   *
+   * * `$rollbackViewValue()` is called.  If we are rolling back the view value to the last
+   *   committed value then `$render()` is called to update the input control.
+   * * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and
+   *   the `$viewValue` are different from last time.
+   *
+   * Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of
+   * `$modelValue` and `$viewValue` are actually different from their previous value. If `$modelValue`
+   * or `$viewValue` are objects (rather than a string or number) then `$render()` will not be
+   * invoked if you only change a property on the objects.
+   */
+  this.$render = noop;
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$isEmpty
+   *
+   * @description
+   * This is called when we need to determine if the value of an input is empty.
+   *
+   * For instance, the required directive does this to work out if the input has data or not.
+   *
+   * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
+   *
+   * You can override this for input directives whose concept of being empty is different from the
+   * default. The `checkboxInputType` directive does this because in its case a value of `false`
+   * implies empty.
+   *
+   * @param {*} value The value of the input to check for emptiness.
+   * @returns {boolean} True if `value` is "empty".
+   */
+  this.$isEmpty = function(value) {
+    return isUndefined(value) || value === '' || value === null || value !== value;
+  };
+
+  var parentForm = $element.inheritedData('$formController') || nullFormCtrl,
+      currentValidationRunId = 0;
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setValidity
+   *
+   * @description
+   * Change the validity state, and notify the form.
+   *
+   * This method can be called within $parsers/$formatters or a custom validation implementation.
+   * However, in most cases it should be sufficient to use the `ngModel.$validators` and
+   * `ngModel.$asyncValidators` collections which will call `$setValidity` automatically.
+   *
+   * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be assigned
+   *        to either `$error[validationErrorKey]` or `$pending[validationErrorKey]`
+   *        (for unfulfilled `$asyncValidators`), so that it is available for data-binding.
+   *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
+   *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
+   *        class and can be bound to as  `{{someForm.someControl.$error.myError}}` .
+   * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending (undefined),
+   *                          or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+   *                          Skipped is used by Angular when validators do not run because of parse errors and
+   *                          when `$asyncValidators` do not run because any of the `$validators` failed.
+   */
+  addSetValidityMethod({
+    ctrl: this,
+    $element: $element,
+    set: function(object, property) {
+      object[property] = true;
+    },
+    unset: function(object, property) {
+      delete object[property];
+    },
+    parentForm: parentForm,
+    $animate: $animate
+  });
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setPristine
+   *
+   * @description
+   * Sets the control to its pristine state.
+   *
+   * This method can be called to remove the `ng-dirty` class and set the control to its pristine
+   * state (`ng-pristine` class). A model is considered to be pristine when the control
+   * has not been changed from when first compiled.
+   */
+  this.$setPristine = function() {
+    ctrl.$dirty = false;
+    ctrl.$pristine = true;
+    $animate.removeClass($element, DIRTY_CLASS);
+    $animate.addClass($element, PRISTINE_CLASS);
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setDirty
+   *
+   * @description
+   * Sets the control to its dirty state.
+   *
+   * This method can be called to remove the `ng-pristine` class and set the control to its dirty
+   * state (`ng-dirty` class). A model is considered to be dirty when the control has been changed
+   * from when first compiled.
+   */
+  this.$setDirty = function() {
+    ctrl.$dirty = true;
+    ctrl.$pristine = false;
+    $animate.removeClass($element, PRISTINE_CLASS);
+    $animate.addClass($element, DIRTY_CLASS);
+    parentForm.$setDirty();
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setUntouched
+   *
+   * @description
+   * Sets the control to its untouched state.
+   *
+   * This method can be called to remove the `ng-touched` class and set the control to its
+   * untouched state (`ng-untouched` class). Upon compilation, a model is set as untouched
+   * by default, however this function can be used to restore that state if the model has
+   * already been touched by the user.
+   */
+  this.$setUntouched = function() {
+    ctrl.$touched = false;
+    ctrl.$untouched = true;
+    $animate.setClass($element, UNTOUCHED_CLASS, TOUCHED_CLASS);
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setTouched
+   *
+   * @description
+   * Sets the control to its touched state.
+   *
+   * This method can be called to remove the `ng-untouched` class and set the control to its
+   * touched state (`ng-touched` class). A model is considered to be touched when the user has
+   * first focused the control element and then shifted focus away from the control (blur event).
+   */
+  this.$setTouched = function() {
+    ctrl.$touched = true;
+    ctrl.$untouched = false;
+    $animate.setClass($element, TOUCHED_CLASS, UNTOUCHED_CLASS);
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$rollbackViewValue
+   *
+   * @description
+   * Cancel an update and reset the input element's value to prevent an update to the `$modelValue`,
+   * which may be caused by a pending debounced event or because the input is waiting for a some
+   * future event.
+   *
+   * If you have an input that uses `ng-model-options` to set up debounced events or events such
+   * as blur you can have a situation where there is a period when the `$viewValue`
+   * is out of synch with the ngModel's `$modelValue`.
+   *
+   * In this case, you can run into difficulties if you try to update the ngModel's `$modelValue`
+   * programmatically before these debounced/future events have resolved/occurred, because Angular's
+   * dirty checking mechanism is not able to tell whether the model has actually changed or not.
+   *
+   * The `$rollbackViewValue()` method should be called before programmatically changing the model of an
+   * input which may have such events pending. This is important in order to make sure that the
+   * input field will be updated with the new model value and any pending operations are cancelled.
+   *
+   * <example name="ng-model-cancel-update" module="cancel-update-example">
+   *   <file name="app.js">
+   *     angular.module('cancel-update-example', [])
+   *
+   *     .controller('CancelUpdateController', ['$scope', function($scope) {
+   *       $scope.resetWithCancel = function(e) {
+   *         if (e.keyCode == 27) {
+   *           $scope.myForm.myInput1.$rollbackViewValue();
+   *           $scope.myValue = '';
+   *         }
+   *       };
+   *       $scope.resetWithoutCancel = function(e) {
+   *         if (e.keyCode == 27) {
+   *           $scope.myValue = '';
+   *         }
+   *       };
+   *     }]);
+   *   </file>
+   *   <file name="index.html">
+   *     <div ng-controller="CancelUpdateController">
+   *       <p>Try typing something in each input.  See that the model only updates when you
+   *          blur off the input.
+   *        </p>
+   *        <p>Now see what happens if you start typing then press the Escape key</p>
+   *
+   *       <form name="myForm" ng-model-options="{ updateOn: 'blur' }">
+   *         <p id="inputDescription1">With $rollbackViewValue()</p>
+   *         <input name="myInput1" aria-describedby="inputDescription1" ng-model="myValue"
+   *                ng-keydown="resetWithCancel($event)"><br/>
+   *         myValue: "{{ myValue }}"
+   *
+   *         <p id="inputDescription2">Without $rollbackViewValue()</p>
+   *         <input name="myInput2" aria-describedby="inputDescription2" ng-model="myValue"
+   *                ng-keydown="resetWithoutCancel($event)"><br/>
+   *         myValue: "{{ myValue }}"
+   *       </form>
+   *     </div>
+   *   </file>
+   * </example>
+   */
+  this.$rollbackViewValue = function() {
+    $timeout.cancel(pendingDebounce);
+    ctrl.$viewValue = ctrl.$$lastCommittedViewValue;
+    ctrl.$render();
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$validate
+   *
+   * @description
+   * Runs each of the registered validators (first synchronous validators and then
+   * asynchronous validators).
+   * If the validity changes to invalid, the model will be set to `undefined`,
+   * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`.
+   * If the validity changes to valid, it will set the model to the last available valid
+   * `$modelValue`, i.e. either the last parsed value or the last value set from the scope.
+   */
+  this.$validate = function() {
+    // ignore $validate before model is initialized
+    if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) {
+      return;
+    }
+
+    var viewValue = ctrl.$$lastCommittedViewValue;
+    // Note: we use the $$rawModelValue as $modelValue might have been
+    // set to undefined during a view -> model update that found validation
+    // errors. We can't parse the view here, since that could change
+    // the model although neither viewValue nor the model on the scope changed
+    var modelValue = ctrl.$$rawModelValue;
+
+    var prevValid = ctrl.$valid;
+    var prevModelValue = ctrl.$modelValue;
+
+    var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
+
+    ctrl.$$runValidators(modelValue, viewValue, function(allValid) {
+      // If there was no change in validity, don't update the model
+      // This prevents changing an invalid modelValue to undefined
+      if (!allowInvalid && prevValid !== allValid) {
+        // Note: Don't check ctrl.$valid here, as we could have
+        // external validators (e.g. calculated on the server),
+        // that just call $setValidity and need the model value
+        // to calculate their validity.
+        ctrl.$modelValue = allValid ? modelValue : undefined;
+
+        if (ctrl.$modelValue !== prevModelValue) {
+          ctrl.$$writeModelToScope();
+        }
+      }
+    });
+
+  };
+
+  this.$$runValidators = function(modelValue, viewValue, doneCallback) {
+    currentValidationRunId++;
+    var localValidationRunId = currentValidationRunId;
+
+    // check parser error
+    if (!processParseErrors()) {
+      validationDone(false);
+      return;
+    }
+    if (!processSyncValidators()) {
+      validationDone(false);
+      return;
+    }
+    processAsyncValidators();
+
+    function processParseErrors() {
+      var errorKey = ctrl.$$parserName || 'parse';
+      if (parserValid === undefined) {
+        setValidity(errorKey, null);
+      } else {
+        if (!parserValid) {
+          forEach(ctrl.$validators, function(v, name) {
+            setValidity(name, null);
+          });
+          forEach(ctrl.$asyncValidators, function(v, name) {
+            setValidity(name, null);
+          });
+        }
+        // Set the parse error last, to prevent unsetting it, should a $validators key == parserName
+        setValidity(errorKey, parserValid);
+        return parserValid;
+      }
+      return true;
+    }
+
+    function processSyncValidators() {
+      var syncValidatorsValid = true;
+      forEach(ctrl.$validators, function(validator, name) {
+        var result = validator(modelValue, viewValue);
+        syncValidatorsValid = syncValidatorsValid && result;
+        setValidity(name, result);
+      });
+      if (!syncValidatorsValid) {
+        forEach(ctrl.$asyncValidators, function(v, name) {
+          setValidity(name, null);
+        });
+        return false;
+      }
+      return true;
+    }
+
+    function processAsyncValidators() {
+      var validatorPromises = [];
+      var allValid = true;
+      forEach(ctrl.$asyncValidators, function(validator, name) {
+        var promise = validator(modelValue, viewValue);
+        if (!isPromiseLike(promise)) {
+          throw $ngModelMinErr("$asyncValidators",
+            "Expected asynchronous validator to return a promise but got '{0}' instead.", promise);
+        }
+        setValidity(name, undefined);
+        validatorPromises.push(promise.then(function() {
+          setValidity(name, true);
+        }, function(error) {
+          allValid = false;
+          setValidity(name, false);
+        }));
+      });
+      if (!validatorPromises.length) {
+        validationDone(true);
+      } else {
+        $q.all(validatorPromises).then(function() {
+          validationDone(allValid);
+        }, noop);
+      }
+    }
+
+    function setValidity(name, isValid) {
+      if (localValidationRunId === currentValidationRunId) {
+        ctrl.$setValidity(name, isValid);
+      }
+    }
+
+    function validationDone(allValid) {
+      if (localValidationRunId === currentValidationRunId) {
+
+        doneCallback(allValid);
+      }
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$commitViewValue
+   *
+   * @description
+   * Commit a pending update to the `$modelValue`.
+   *
+   * Updates may be pending by a debounced event or because the input is waiting for a some future
+   * event defined in `ng-model-options`. this method is rarely needed as `NgModelController`
+   * usually handles calling this in response to input events.
+   */
+  this.$commitViewValue = function() {
+    var viewValue = ctrl.$viewValue;
+
+    $timeout.cancel(pendingDebounce);
+
+    // If the view value has not changed then we should just exit, except in the case where there is
+    // a native validator on the element. In this case the validation state may have changed even though
+    // the viewValue has stayed empty.
+    if (ctrl.$$lastCommittedViewValue === viewValue && (viewValue !== '' || !ctrl.$$hasNativeValidators)) {
+      return;
+    }
+    ctrl.$$lastCommittedViewValue = viewValue;
+
+    // change to dirty
+    if (ctrl.$pristine) {
+      this.$setDirty();
+    }
+    this.$$parseAndValidate();
+  };
+
+  this.$$parseAndValidate = function() {
+    var viewValue = ctrl.$$lastCommittedViewValue;
+    var modelValue = viewValue;
+    parserValid = isUndefined(modelValue) ? undefined : true;
+
+    if (parserValid) {
+      for (var i = 0; i < ctrl.$parsers.length; i++) {
+        modelValue = ctrl.$parsers[i](modelValue);
+        if (isUndefined(modelValue)) {
+          parserValid = false;
+          break;
+        }
+      }
+    }
+    if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) {
+      // ctrl.$modelValue has not been touched yet...
+      ctrl.$modelValue = ngModelGet($scope);
+    }
+    var prevModelValue = ctrl.$modelValue;
+    var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
+    ctrl.$$rawModelValue = modelValue;
+
+    if (allowInvalid) {
+      ctrl.$modelValue = modelValue;
+      writeToModelIfNeeded();
+    }
+
+    // Pass the $$lastCommittedViewValue here, because the cached viewValue might be out of date.
+    // This can happen if e.g. $setViewValue is called from inside a parser
+    ctrl.$$runValidators(modelValue, ctrl.$$lastCommittedViewValue, function(allValid) {
+      if (!allowInvalid) {
+        // Note: Don't check ctrl.$valid here, as we could have
+        // external validators (e.g. calculated on the server),
+        // that just call $setValidity and need the model value
+        // to calculate their validity.
+        ctrl.$modelValue = allValid ? modelValue : undefined;
+        writeToModelIfNeeded();
+      }
+    });
+
+    function writeToModelIfNeeded() {
+      if (ctrl.$modelValue !== prevModelValue) {
+        ctrl.$$writeModelToScope();
+      }
+    }
+  };
+
+  this.$$writeModelToScope = function() {
+    ngModelSet($scope, ctrl.$modelValue);
+    forEach(ctrl.$viewChangeListeners, function(listener) {
+      try {
+        listener();
+      } catch (e) {
+        $exceptionHandler(e);
+      }
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setViewValue
+   *
+   * @description
+   * Update the view value.
+   *
+   * This method should be called when an input directive want to change the view value; typically,
+   * this is done from within a DOM event handler.
+   *
+   * For example {@link ng.directive:input input} calls it when the value of the input changes and
+   * {@link ng.directive:select select} calls it when an option is selected.
+   *
+   * If the new `value` is an object (rather than a string or a number), we should make a copy of the
+   * object before passing it to `$setViewValue`.  This is because `ngModel` does not perform a deep
+   * watch of objects, it only looks for a change of identity. If you only change the property of
+   * the object then ngModel will not realise that the object has changed and will not invoke the
+   * `$parsers` and `$validators` pipelines.
+   *
+   * For this reason, you should not change properties of the copy once it has been passed to
+   * `$setViewValue`. Otherwise you may cause the model value on the scope to change incorrectly.
+   *
+   * When this method is called, the new `value` will be staged for committing through the `$parsers`
+   * and `$validators` pipelines. If there are no special {@link ngModelOptions} specified then the staged
+   * value sent directly for processing, finally to be applied to `$modelValue` and then the
+   * **expression** specified in the `ng-model` attribute.
+   *
+   * Lastly, all the registered change listeners, in the `$viewChangeListeners` list, are called.
+   *
+   * In case the {@link ng.directive:ngModelOptions ngModelOptions} directive is used with `updateOn`
+   * and the `default` trigger is not listed, all those actions will remain pending until one of the
+   * `updateOn` events is triggered on the DOM element.
+   * All these actions will be debounced if the {@link ng.directive:ngModelOptions ngModelOptions}
+   * directive is used with a custom debounce for this particular event.
+   *
+   * Note that calling this function does not trigger a `$digest`.
+   *
+   * @param {string} value Value from the view.
+   * @param {string} trigger Event that triggered the update.
+   */
+  this.$setViewValue = function(value, trigger) {
+    ctrl.$viewValue = value;
+    if (!ctrl.$options || ctrl.$options.updateOnDefault) {
+      ctrl.$$debounceViewValueCommit(trigger);
+    }
+  };
+
+  this.$$debounceViewValueCommit = function(trigger) {
+    var debounceDelay = 0,
+        options = ctrl.$options,
+        debounce;
+
+    if (options && isDefined(options.debounce)) {
+      debounce = options.debounce;
+      if (isNumber(debounce)) {
+        debounceDelay = debounce;
+      } else if (isNumber(debounce[trigger])) {
+        debounceDelay = debounce[trigger];
+      } else if (isNumber(debounce['default'])) {
+        debounceDelay = debounce['default'];
+      }
+    }
+
+    $timeout.cancel(pendingDebounce);
+    if (debounceDelay) {
+      pendingDebounce = $timeout(function() {
+        ctrl.$commitViewValue();
+      }, debounceDelay);
+    } else if ($rootScope.$$phase) {
+      ctrl.$commitViewValue();
+    } else {
+      $scope.$apply(function() {
+        ctrl.$commitViewValue();
+      });
+    }
+  };
+
+  // model -> value
+  // Note: we cannot use a normal scope.$watch as we want to detect the following:
+  // 1. scope value is 'a'
+  // 2. user enters 'b'
+  // 3. ng-change kicks in and reverts scope value to 'a'
+  //    -> scope value did not change since the last digest as
+  //       ng-change executes in apply phase
+  // 4. view should be changed back to 'a'
+  $scope.$watch(function ngModelWatch() {
+    var modelValue = ngModelGet($scope);
+
+    // if scope model value and ngModel value are out of sync
+    // TODO(perf): why not move this to the action fn?
+    if (modelValue !== ctrl.$modelValue &&
+       // checks for NaN is needed to allow setting the model to NaN when there's an asyncValidator
+       (ctrl.$modelValue === ctrl.$modelValue || modelValue === modelValue)
+    ) {
+      ctrl.$modelValue = ctrl.$$rawModelValue = modelValue;
+      parserValid = undefined;
+
+      var formatters = ctrl.$formatters,
+          idx = formatters.length;
+
+      var viewValue = modelValue;
+      while (idx--) {
+        viewValue = formatters[idx](viewValue);
+      }
+      if (ctrl.$viewValue !== viewValue) {
+        ctrl.$viewValue = ctrl.$$lastCommittedViewValue = viewValue;
+        ctrl.$render();
+
+        ctrl.$$runValidators(modelValue, viewValue, noop);
+      }
+    }
+
+    return modelValue;
+  });
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngModel
+ *
+ * @element input
+ * @priority 1
+ *
+ * @description
+ * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
+ * property on the scope using {@link ngModel.NgModelController NgModelController},
+ * which is created and exposed by this directive.
+ *
+ * `ngModel` is responsible for:
+ *
+ * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
+ *   require.
+ * - Providing validation behavior (i.e. required, number, email, url).
+ * - Keeping the state of the control (valid/invalid, dirty/pristine, touched/untouched, validation errors).
+ * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`, `ng-touched`, `ng-untouched`) including animations.
+ * - Registering the control with its parent {@link ng.directive:form form}.
+ *
+ * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
+ * current scope. If the property doesn't already exist on this scope, it will be created
+ * implicitly and added to the scope.
+ *
+ * For best practices on using `ngModel`, see:
+ *
+ *  - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes)
+ *
+ * For basic examples, how to use `ngModel`, see:
+ *
+ *  - {@link ng.directive:input input}
+ *    - {@link input[text] text}
+ *    - {@link input[checkbox] checkbox}
+ *    - {@link input[radio] radio}
+ *    - {@link input[number] number}
+ *    - {@link input[email] email}
+ *    - {@link input[url] url}
+ *    - {@link input[date] date}
+ *    - {@link input[datetime-local] datetime-local}
+ *    - {@link input[time] time}
+ *    - {@link input[month] month}
+ *    - {@link input[week] week}
+ *  - {@link ng.directive:select select}
+ *  - {@link ng.directive:textarea textarea}
+ *
+ * # CSS classes
+ * The following CSS classes are added and removed on the associated input/select/textarea element
+ * depending on the validity of the model.
+ *
+ *  - `ng-valid`: the model is valid
+ *  - `ng-invalid`: the model is invalid
+ *  - `ng-valid-[key]`: for each valid key added by `$setValidity`
+ *  - `ng-invalid-[key]`: for each invalid key added by `$setValidity`
+ *  - `ng-pristine`: the control hasn't been interacted with yet
+ *  - `ng-dirty`: the control has been interacted with
+ *  - `ng-touched`: the control has been blurred
+ *  - `ng-untouched`: the control hasn't been blurred
+ *  - `ng-pending`: any `$asyncValidators` are unfulfilled
+ *
+ * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+ *
+ * ## Animation Hooks
+ *
+ * Animations within models are triggered when any of the associated CSS classes are added and removed
+ * on the input element which is attached to the model. These classes are: `.ng-pristine`, `.ng-dirty`,
+ * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
+ * The animations that are triggered within ngModel are similar to how they work in ngClass and
+ * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
+ *
+ * The following example shows a simple way to utilize CSS transitions to style an input element
+ * that has been rendered as invalid after it has been validated:
+ *
+ * <pre>
+ * //be sure to include ngAnimate as a module to hook into more
+ * //advanced animations
+ * .my-input {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+ * .my-input.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+ * </pre>
+ *
+ * @example
+ * <example deps="angular-animate.js" animations="true" fixBase="true" module="inputExample">
+     <file name="index.html">
+       <script>
+        angular.module('inputExample', [])
+          .controller('ExampleController', ['$scope', function($scope) {
+            $scope.val = '1';
+          }]);
+       </script>
+       <style>
+         .my-input {
+           -webkit-transition:all linear 0.5s;
+           transition:all linear 0.5s;
+           background: transparent;
+         }
+         .my-input.ng-invalid {
+           color:white;
+           background: red;
+         }
+       </style>
+       <p id="inputDescription">
+        Update input to see transitions when valid/invalid.
+        Integer is a valid value.
+       </p>
+       <form name="testForm" ng-controller="ExampleController">
+         <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input"
+                aria-describedby="inputDescription" />
+       </form>
+     </file>
+ * </example>
+ *
+ * ## Binding to a getter/setter
+ *
+ * Sometimes it's helpful to bind `ngModel` to a getter/setter function.  A getter/setter is a
+ * function that returns a representation of the model when called with zero arguments, and sets
+ * the internal state of a model when called with an argument. It's sometimes useful to use this
+ * for models that have an internal representation that's different from what the model exposes
+ * to the view.
+ *
+ * <div class="alert alert-success">
+ * **Best Practice:** It's best to keep getters fast because Angular is likely to call them more
+ * frequently than other parts of your code.
+ * </div>
+ *
+ * You use this behavior by adding `ng-model-options="{ getterSetter: true }"` to an element that
+ * has `ng-model` attached to it. You can also add `ng-model-options="{ getterSetter: true }"` to
+ * a `<form>`, which will enable this behavior for all `<input>`s within it. See
+ * {@link ng.directive:ngModelOptions `ngModelOptions`} for more.
+ *
+ * The following example shows how to use `ngModel` with a getter/setter:
+ *
+ * @example
+ * <example name="ngModel-getter-setter" module="getterSetterExample">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+         <form name="userForm">
+           <label>Name:
+             <input type="text" name="userName"
+                    ng-model="user.name"
+                    ng-model-options="{ getterSetter: true }" />
+           </label>
+         </form>
+         <pre>user.name = <span ng-bind="user.name()"></span></pre>
+       </div>
+     </file>
+     <file name="app.js">
+       angular.module('getterSetterExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+           var _name = 'Brian';
+           $scope.user = {
+             name: function(newName) {
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
+             }
+           };
+         }]);
+     </file>
+ * </example>
+ */
+var ngModelDirective = ['$rootScope', function($rootScope) {
+  return {
+    restrict: 'A',
+    require: ['ngModel', '^?form', '^?ngModelOptions'],
+    controller: NgModelController,
+    // Prelink needs to run before any input directive
+    // so that we can set the NgModelOptions in NgModelController
+    // before anyone else uses it.
+    priority: 1,
+    compile: function ngModelCompile(element) {
+      // Setup initial state of the control
+      element.addClass(PRISTINE_CLASS).addClass(UNTOUCHED_CLASS).addClass(VALID_CLASS);
+
+      return {
+        pre: function ngModelPreLink(scope, element, attr, ctrls) {
+          var modelCtrl = ctrls[0],
+              formCtrl = ctrls[1] || nullFormCtrl;
+
+          modelCtrl.$$setOptions(ctrls[2] && ctrls[2].$options);
+
+          // notify others, especially parent forms
+          formCtrl.$addControl(modelCtrl);
+
+          attr.$observe('name', function(newValue) {
+            if (modelCtrl.$name !== newValue) {
+              formCtrl.$$renameControl(modelCtrl, newValue);
+            }
+          });
+
+          scope.$on('$destroy', function() {
+            formCtrl.$removeControl(modelCtrl);
+          });
+        },
+        post: function ngModelPostLink(scope, element, attr, ctrls) {
+          var modelCtrl = ctrls[0];
+          if (modelCtrl.$options && modelCtrl.$options.updateOn) {
+            element.on(modelCtrl.$options.updateOn, function(ev) {
+              modelCtrl.$$debounceViewValueCommit(ev && ev.type);
+            });
+          }
+
+          element.on('blur', function(ev) {
+            if (modelCtrl.$touched) return;
+
+            if ($rootScope.$$phase) {
+              scope.$evalAsync(modelCtrl.$setTouched);
+            } else {
+              scope.$apply(modelCtrl.$setTouched);
+            }
+          });
+        }
+      };
+    }
+  };
+}];
+
+var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
+
+/**
+ * @ngdoc directive
+ * @name ngModelOptions
+ *
+ * @description
+ * Allows tuning how model updates are done. Using `ngModelOptions` you can specify a custom list of
+ * events that will trigger a model update and/or a debouncing delay so that the actual update only
+ * takes place when a timer expires; this timer will be reset after another change takes place.
+ *
+ * Given the nature of `ngModelOptions`, the value displayed inside input fields in the view might
+ * be different from the value in the actual model. This means that if you update the model you
+ * should also invoke {@link ngModel.NgModelController `$rollbackViewValue`} on the relevant input field in
+ * order to make sure it is synchronized with the model and that any debounced action is canceled.
+ *
+ * The easiest way to reference the control's {@link ngModel.NgModelController `$rollbackViewValue`}
+ * method is by making sure the input is placed inside a form that has a `name` attribute. This is
+ * important because `form` controllers are published to the related scope under the name in their
+ * `name` attribute.
+ *
+ * Any pending changes will take place immediately when an enclosing form is submitted via the
+ * `submit` event. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+ * to have access to the updated model.
+ *
+ * `ngModelOptions` has an effect on the element it's declared on and its descendants.
+ *
+ * @param {Object} ngModelOptions options to apply to the current model. Valid keys are:
+ *   - `updateOn`: string specifying which event should the input be bound to. You can set several
+ *     events using an space delimited list. There is a special event called `default` that
+ *     matches the default events belonging of the control.
+ *   - `debounce`: integer value which contains the debounce model update value in milliseconds. A
+ *     value of 0 triggers an immediate update. If an object is supplied instead, you can specify a
+ *     custom value for each event. For example:
+ *     `ng-model-options="{ updateOn: 'default blur', debounce: {'default': 500, 'blur': 0} }"`
+ *   - `allowInvalid`: boolean value which indicates that the model can be set with values that did
+ *     not validate correctly instead of the default behavior of setting the model to undefined.
+ *   - `getterSetter`: boolean value which determines whether or not to treat functions bound to
+       `ngModel` as getters/setters.
+ *   - `timezone`: Defines the timezone to be used to read/write the `Date` instance in the model for
+ *     `<input type="date">`, `<input type="time">`, ... . It understands UTC/GMT and the
+ *     continental US time zone abbreviations, but for general use, use a time zone offset, for
+ *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+ *     If not specified, the timezone of the browser will be used.
+ *
+ * @example
+
+  The following example shows how to override immediate updates. Changes on the inputs within the
+  form will update the model only when the control loses focus (blur event). If `escape` key is
+  pressed while the input field is focused, the value is reset to the value in the current model.
+
+  <example name="ngModelOptions-directive-blur" module="optionsExample">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <form name="userForm">
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ updateOn: 'blur' }"
+                   ng-keyup="cancel($event)" />
+          </label><br />
+          <label>Other data:
+            <input type="text" ng-model="user.data" />
+          </label><br />
+        </form>
+        <pre>user.name = <span ng-bind="user.name"></span></pre>
+      </div>
+    </file>
+    <file name="app.js">
+      angular.module('optionsExample', [])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.user = { name: 'say', data: '' };
+
+          $scope.cancel = function(e) {
+            if (e.keyCode == 27) {
+              $scope.userForm.userName.$rollbackViewValue();
+            }
+          };
+        }]);
+    </file>
+    <file name="protractor.js" type="protractor">
+      var model = element(by.binding('user.name'));
+      var input = element(by.model('user.name'));
+      var other = element(by.model('user.data'));
+
+      it('should allow custom events', function() {
+        input.sendKeys(' hello');
+        input.click();
+        expect(model.getText()).toEqual('say');
+        other.click();
+        expect(model.getText()).toEqual('say hello');
+      });
+
+      it('should $rollbackViewValue when model changes', function() {
+        input.sendKeys(' hello');
+        expect(input.getAttribute('value')).toEqual('say hello');
+        input.sendKeys(protractor.Key.ESCAPE);
+        expect(input.getAttribute('value')).toEqual('say');
+        other.click();
+        expect(model.getText()).toEqual('say');
+      });
+    </file>
+  </example>
+
+  This one shows how to debounce model changes. Model will be updated only 1 sec after last change.
+  If the `Clear` button is pressed, any debounced action is canceled and the value becomes empty.
+
+  <example name="ngModelOptions-directive-debounce" module="optionsExample">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <form name="userForm">
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ debounce: 1000 }" />
+          </label>
+          <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button>
+          <br />
+        </form>
+        <pre>user.name = <span ng-bind="user.name"></span></pre>
+      </div>
+    </file>
+    <file name="app.js">
+      angular.module('optionsExample', [])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.user = { name: 'say' };
+        }]);
+    </file>
+  </example>
+
+  This one shows how to bind to getter/setters:
+
+  <example name="ngModelOptions-directive-getter-setter" module="getterSetterExample">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <form name="userForm">
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ getterSetter: true }" />
+          </label>
+        </form>
+        <pre>user.name = <span ng-bind="user.name()"></span></pre>
+      </div>
+    </file>
+    <file name="app.js">
+      angular.module('getterSetterExample', [])
+        .controller('ExampleController', ['$scope', function($scope) {
+          var _name = 'Brian';
+          $scope.user = {
+            name: function(newName) {
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
+            }
+          };
+        }]);
+    </file>
+  </example>
+ */
+var ngModelOptionsDirective = function() {
+  return {
+    restrict: 'A',
+    controller: ['$scope', '$attrs', function($scope, $attrs) {
+      var that = this;
+      this.$options = copy($scope.$eval($attrs.ngModelOptions));
+      // Allow adding/overriding bound events
+      if (this.$options.updateOn !== undefined) {
+        this.$options.updateOnDefault = false;
+        // extract "default" pseudo-event from list of events that can trigger a model update
+        this.$options.updateOn = trim(this.$options.updateOn.replace(DEFAULT_REGEXP, function() {
+          that.$options.updateOnDefault = true;
+          return ' ';
+        }));
+      } else {
+        this.$options.updateOnDefault = true;
+      }
+    }]
+  };
+};
+
+
+
+// helper methods
+function addSetValidityMethod(context) {
+  var ctrl = context.ctrl,
+      $element = context.$element,
+      classCache = {},
+      set = context.set,
+      unset = context.unset,
+      parentForm = context.parentForm,
+      $animate = context.$animate;
+
+  classCache[INVALID_CLASS] = !(classCache[VALID_CLASS] = $element.hasClass(VALID_CLASS));
+
+  ctrl.$setValidity = setValidity;
+
+  function setValidity(validationErrorKey, state, controller) {
+    if (state === undefined) {
+      createAndSet('$pending', validationErrorKey, controller);
+    } else {
+      unsetAndCleanup('$pending', validationErrorKey, controller);
+    }
+    if (!isBoolean(state)) {
+      unset(ctrl.$error, validationErrorKey, controller);
+      unset(ctrl.$$success, validationErrorKey, controller);
+    } else {
+      if (state) {
+        unset(ctrl.$error, validationErrorKey, controller);
+        set(ctrl.$$success, validationErrorKey, controller);
+      } else {
+        set(ctrl.$error, validationErrorKey, controller);
+        unset(ctrl.$$success, validationErrorKey, controller);
+      }
+    }
+    if (ctrl.$pending) {
+      cachedToggleClass(PENDING_CLASS, true);
+      ctrl.$valid = ctrl.$invalid = undefined;
+      toggleValidationCss('', null);
+    } else {
+      cachedToggleClass(PENDING_CLASS, false);
+      ctrl.$valid = isObjectEmpty(ctrl.$error);
+      ctrl.$invalid = !ctrl.$valid;
+      toggleValidationCss('', ctrl.$valid);
+    }
+
+    // re-read the state as the set/unset methods could have
+    // combined state in ctrl.$error[validationError] (used for forms),
+    // where setting/unsetting only increments/decrements the value,
+    // and does not replace it.
+    var combinedState;
+    if (ctrl.$pending && ctrl.$pending[validationErrorKey]) {
+      combinedState = undefined;
+    } else if (ctrl.$error[validationErrorKey]) {
+      combinedState = false;
+    } else if (ctrl.$$success[validationErrorKey]) {
+      combinedState = true;
+    } else {
+      combinedState = null;
+    }
+
+    toggleValidationCss(validationErrorKey, combinedState);
+    parentForm.$setValidity(validationErrorKey, combinedState, ctrl);
+  }
+
+  function createAndSet(name, value, controller) {
+    if (!ctrl[name]) {
+      ctrl[name] = {};
+    }
+    set(ctrl[name], value, controller);
+  }
+
+  function unsetAndCleanup(name, value, controller) {
+    if (ctrl[name]) {
+      unset(ctrl[name], value, controller);
+    }
+    if (isObjectEmpty(ctrl[name])) {
+      ctrl[name] = undefined;
+    }
+  }
+
+  function cachedToggleClass(className, switchValue) {
+    if (switchValue && !classCache[className]) {
+      $animate.addClass($element, className);
+      classCache[className] = true;
+    } else if (!switchValue && classCache[className]) {
+      $animate.removeClass($element, className);
+      classCache[className] = false;
+    }
+  }
+
+  function toggleValidationCss(validationErrorKey, isValid) {
+    validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
+
+    cachedToggleClass(VALID_CLASS + validationErrorKey, isValid === true);
+    cachedToggleClass(INVALID_CLASS + validationErrorKey, isValid === false);
+  }
+}
+
+function isObjectEmpty(obj) {
+  if (obj) {
+    for (var prop in obj) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * @ngdoc directive
+ * @name ngNonBindable
+ * @restrict AC
+ * @priority 1000
+ *
+ * @description
+ * The `ngNonBindable` directive tells Angular not to compile or bind the contents of the current
+ * DOM element. This is useful if the element contains what appears to be Angular directives and
+ * bindings but which should be ignored by Angular. This could be the case if you have a site that
+ * displays snippets of code, for instance.
+ *
+ * @element ANY
+ *
+ * @example
+ * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
+ * but the one wrapped in `ngNonBindable` is left alone.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <div>Normal: {{1 + 2}}</div>
+        <div ng-non-bindable>Ignored: {{1 + 2}}</div>
+      </file>
+      <file name="protractor.js" type="protractor">
+       it('should check ng-non-bindable', function() {
+         expect(element(by.binding('1 + 2')).getText()).toContain('3');
+         expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
+       });
+      </file>
+    </example>
+ */
+var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
+
+/* global jqLiteRemove */
+
+var ngOptionsMinErr = minErr('ngOptions');
+
+/**
+ * @ngdoc directive
+ * @name ngOptions
+ * @restrict A
+ *
+ * @description
+ *
+ * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
+ * elements for the `<select>` element using the array or object obtained by evaluating the
+ * `ngOptions` comprehension expression.
+ *
+ * In many cases, `ngRepeat` can be used on `<option>` elements instead of `ngOptions` to achieve a
+ * similar result. However, `ngOptions` provides some benefits such as reducing memory and
+ * increasing speed by not creating a new scope for each repeated instance, as well as providing
+ * more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+ * comprehension expression. `ngOptions` should be used when the `<select>` model needs to be bound
+ *  to a non-string value. This is because an option element can only be bound to string values at
+ * present.
+ *
+ * When an item in the `<select>` menu is selected, the array element or object property
+ * represented by the selected option will be bound to the model identified by the `ngModel`
+ * directive.
+ *
+ * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+ * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+ * option. See example below for demonstration.
+ *
+ * ## Complex Models (objects or collections)
+ *
+ * **Note:** By default, `ngModel` watches the model by reference, not value. This is important when
+ * binding any input directive to a model that is an object or a collection.
+ *
+ * Since this is a common situation for `ngOptions` the directive additionally watches the model using
+ * `$watchCollection` when the select has the `multiple` attribute or when there is a `track by` clause in
+ * the options expression. This allows ngOptions to trigger a re-rendering of the options even if the actual
+ * object/collection has not changed identity but only a property on the object or an item in the collection
+ * changes.
+ *
+ * Note that `$watchCollection` does a shallow comparison of the properties of the object (or the items in the collection
+ * if the model is an array). This means that changing a property deeper inside the object/collection that the
+ * first level will not trigger a re-rendering.
+ *
+ *
+ * ## `select` **`as`**
+ *
+ * Using `select` **`as`** will bind the result of the `select` expression to the model, but
+ * the value of the `<select>` and `<option>` html elements will be either the index (for array data sources)
+ * or property name (for object data sources) of the value within the collection. If a **`track by`** expression
+ * is used, the result of that expression will be set as the value of the `option` and `select` elements.
+ *
+ *
+ * ### `select` **`as`** and **`track by`**
+ *
+ * <div class="alert alert-warning">
+ * Do not use `select` **`as`** and **`track by`** in the same expression. They are not designed to work together.
+ * </div>
+ *
+ * Consider the following example:
+ *
+ * ```html
+ * <select ng-options="item.subItem as item.label for item in values track by item.id" ng-model="selected">
+ * ```
+ *
+ * ```js
+ * $scope.values = [{
+ *   id: 1,
+ *   label: 'aLabel',
+ *   subItem: { name: 'aSubItem' }
+ * }, {
+ *   id: 2,
+ *   label: 'bLabel',
+ *   subItem: { name: 'bSubItem' }
+ * }];
+ *
+ * $scope.selected = { name: 'aSubItem' };
+ * ```
+ *
+ * With the purpose of preserving the selection, the **`track by`** expression is always applied to the element
+ * of the data source (to `item` in this example). To calculate whether an element is selected, we do the
+ * following:
+ *
+ * 1. Apply **`track by`** to the elements in the array. In the example: `[1, 2]`
+ * 2. Apply **`track by`** to the already selected value in `ngModel`.
+ *    In the example: this is not possible as **`track by`** refers to `item.id`, but the selected
+ *    value from `ngModel` is `{name: 'aSubItem'}`, so the **`track by`** expression is applied to
+ *    a wrong object, the selected element can't be found, `<select>` is always reset to the "not
+ *    selected" option.
+ *
+ *
+ * @param {string} ngModel Assignable angular expression to data-bind to.
+ * @param {string=} name Property name of the form under which the control is published.
+ * @param {string=} required The control is considered valid only if value is entered.
+ * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+ *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+ *    `required` when you want to data-bind to the `required` attribute.
+ * @param {comprehension_expression=} ngOptions in one of the following forms:
+ *
+ *   * for array data sources:
+ *     * `label` **`for`** `value` **`in`** `array`
+ *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
+ *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array`
+ *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array`
+ *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+ *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+ *     * `label` **`for`** `value` **`in`** `array` | orderBy:`orderexpr` **`track by`** `trackexpr`
+ *        (for including a filter with `track by`)
+ *   * for object data sources:
+ *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+ *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+ *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
+ *     * `label` **`disable when`** `disable` **`for (`**`key`**`,`** `value`**`) in`** `object`
+ *     * `select` **`as`** `label` **`group by`** `group`
+ *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+ *     * `select` **`as`** `label` **`disable when`** `disable`
+ *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+ *
+ * Where:
+ *
+ *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
+ *   * `value`: local variable which will refer to each item in the `array` or each property value
+ *      of `object` during iteration.
+ *   * `key`: local variable which will refer to a property name in `object` during iteration.
+ *   * `label`: The result of this expression will be the label for `<option>` element. The
+ *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
+ *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
+ *      element. If not specified, `select` expression will default to `value`.
+ *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
+ *      DOM element.
+ *   * `disable`: The result of this expression will be used to disable the rendered `<option>`
+ *      element. Return `true` to disable.
+ *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
+ *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
+ *     `value` variable (e.g. `value.propertyName`). With this the selection is preserved
+ *      even when the options are recreated (e.g. reloaded from the server).
+ *
+ * @example
+    <example module="selectExample">
+      <file name="index.html">
+        <script>
+        angular.module('selectExample', [])
+          .controller('ExampleController', ['$scope', function($scope) {
+            $scope.colors = [
+              {name:'black', shade:'dark'},
+              {name:'white', shade:'light', notAnOption: true},
+              {name:'red', shade:'dark'},
+              {name:'blue', shade:'dark', notAnOption: true},
+              {name:'yellow', shade:'light', notAnOption: false}
+            ];
+            $scope.myColor = $scope.colors[2]; // red
+          }]);
+        </script>
+        <div ng-controller="ExampleController">
+          <ul>
+            <li ng-repeat="color in colors">
+              <label>Name: <input ng-model="color.name"></label>
+              <label><input type="checkbox" ng-model="color.notAnOption"> Disabled?</label>
+              <button ng-click="colors.splice($index, 1)" aria-label="Remove">X</button>
+            </li>
+            <li>
+              <button ng-click="colors.push({})">add</button>
+            </li>
+          </ul>
+          <hr/>
+          <label>Color (null not allowed):
+            <select ng-model="myColor" ng-options="color.name for color in colors"></select>
+          </label><br/>
+          <label>Color (null allowed):
+          <span  class="nullable">
+            <select ng-model="myColor" ng-options="color.name for color in colors">
+              <option value="">-- choose color --</option>
+            </select>
+          </span></label><br/>
+
+          <label>Color grouped by shade:
+            <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
+            </select>
+          </label><br/>
+
+          <label>Color grouped by shade, with some disabled:
+            <select ng-model="myColor"
+                  ng-options="color.name group by color.shade disable when color.notAnOption for color in colors">
+            </select>
+          </label><br/>
+
+
+
+          Select <button ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</button>.
+          <br/>
+          <hr/>
+          Currently selected: {{ {selected_color:myColor} }}
+          <div style="border:solid 1px black; height:20px"
+               ng-style="{'background-color':myColor.name}">
+          </div>
+        </div>
+      </file>
+      <file name="protractor.js" type="protractor">
+         it('should check ng-options', function() {
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('red');
+           element.all(by.model('myColor')).first().click();
+           element.all(by.css('select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('black');
+           element(by.css('.nullable select[ng-model="myColor"]')).click();
+           element.all(by.css('.nullable select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('null');
+         });
+      </file>
+    </example>
+ */
+
+// jshint maxlen: false
+//                     //00001111111111000000000002222222222000000000000000000000333333333300000000000000000000000004444444444400000000000005555555555555550000000006666666666666660000000777777777777777000000000000000888888888800000000000000000009999999999
+var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
+                        // 1: value expression (valueFn)
+                        // 2: label expression (displayFn)
+                        // 3: group by expression (groupByFn)
+                        // 4: disable when expression (disableWhenFn)
+                        // 5: array item variable name
+                        // 6: object item key variable name
+                        // 7: object item value variable name
+                        // 8: collection expression
+                        // 9: track by expression
+// jshint maxlen: 100
+
+
+var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
+
+  function parseOptionsExpression(optionsExp, selectElement, scope) {
+
+    var match = optionsExp.match(NG_OPTIONS_REGEXP);
+    if (!(match)) {
+      throw ngOptionsMinErr('iexp',
+        "Expected expression in form of " +
+        "'_select_ (as _label_)? for (_key_,)?_value_ in _collection_'" +
+        " but got '{0}'. Element: {1}",
+        optionsExp, startingTag(selectElement));
+    }
+
+    // Extract the parts from the ngOptions expression
+
+    // The variable name for the value of the item in the collection
+    var valueName = match[5] || match[7];
+    // The variable name for the key of the item in the collection
+    var keyName = match[6];
+
+    // An expression that generates the viewValue for an option if there is a label expression
+    var selectAs = / as /.test(match[0]) && match[1];
+    // An expression that is used to track the id of each object in the options collection
+    var trackBy = match[9];
+    // An expression that generates the viewValue for an option if there is no label expression
+    var valueFn = $parse(match[2] ? match[1] : valueName);
+    var selectAsFn = selectAs && $parse(selectAs);
+    var viewValueFn = selectAsFn || valueFn;
+    var trackByFn = trackBy && $parse(trackBy);
+
+    // Get the value by which we are going to track the option
+    // if we have a trackFn then use that (passing scope and locals)
+    // otherwise just hash the given viewValue
+    var getTrackByValueFn = trackBy ?
+                              function(value, locals) { return trackByFn(scope, locals); } :
+                              function getHashOfValue(value) { return hashKey(value); };
+    var getTrackByValue = function(value, key) {
+      return getTrackByValueFn(value, getLocals(value, key));
+    };
+
+    var displayFn = $parse(match[2] || match[1]);
+    var groupByFn = $parse(match[3] || '');
+    var disableWhenFn = $parse(match[4] || '');
+    var valuesFn = $parse(match[8]);
+
+    var locals = {};
+    var getLocals = keyName ? function(value, key) {
+      locals[keyName] = key;
+      locals[valueName] = value;
+      return locals;
+    } : function(value) {
+      locals[valueName] = value;
+      return locals;
+    };
+
+
+    function Option(selectValue, viewValue, label, group, disabled) {
+      this.selectValue = selectValue;
+      this.viewValue = viewValue;
+      this.label = label;
+      this.group = group;
+      this.disabled = disabled;
+    }
+
+    return {
+      trackBy: trackBy,
+      getTrackByValue: getTrackByValue,
+      getWatchables: $parse(valuesFn, function(values) {
+        // Create a collection of things that we would like to watch (watchedArray)
+        // so that they can all be watched using a single $watchCollection
+        // that only runs the handler once if anything changes
+        var watchedArray = [];
+        values = values || [];
+
+        Object.keys(values).forEach(function getWatchable(key) {
+          var locals = getLocals(values[key], key);
+          var selectValue = getTrackByValueFn(values[key], locals);
+          watchedArray.push(selectValue);
+
+          // Only need to watch the displayFn if there is a specific label expression
+          if (match[2] || match[1]) {
+            var label = displayFn(scope, locals);
+            watchedArray.push(label);
+          }
+
+          // Only need to watch the disableWhenFn if there is a specific disable expression
+          if (match[4]) {
+            var disableWhen = disableWhenFn(scope, locals);
+            watchedArray.push(disableWhen);
+          }
+        });
+        return watchedArray;
+      }),
+
+      getOptions: function() {
+
+        var optionItems = [];
+        var selectValueMap = {};
+
+        // The option values were already computed in the `getWatchables` fn,
+        // which must have been called to trigger `getOptions`
+        var optionValues = valuesFn(scope) || [];
+        var optionValuesKeys;
+
+
+        if (!keyName && isArrayLike(optionValues)) {
+          optionValuesKeys = optionValues;
+        } else {
+          // if object, extract keys, in enumeration order, unsorted
+          optionValuesKeys = [];
+          for (var itemKey in optionValues) {
+            if (optionValues.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
+              optionValuesKeys.push(itemKey);
+            }
+          }
+        }
+
+        var optionValuesLength = optionValuesKeys.length;
+
+        for (var index = 0; index < optionValuesLength; index++) {
+          var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+          var value = optionValues[key];
+          var locals = getLocals(value, key);
+          var viewValue = viewValueFn(scope, locals);
+          var selectValue = getTrackByValueFn(viewValue, locals);
+          var label = displayFn(scope, locals);
+          var group = groupByFn(scope, locals);
+          var disabled = disableWhenFn(scope, locals);
+          var optionItem = new Option(selectValue, viewValue, label, group, disabled);
+
+          optionItems.push(optionItem);
+          selectValueMap[selectValue] = optionItem;
+        }
+
+        return {
+          items: optionItems,
+          selectValueMap: selectValueMap,
+          getOptionFromViewValue: function(value) {
+            return selectValueMap[getTrackByValue(value)];
+          },
+          getViewValueFromOption: function(option) {
+            // If the viewValue could be an object that may be mutated by the application,
+            // we need to make a copy and not return the reference to the value on the option.
+            return trackBy ? angular.copy(option.viewValue) : option.viewValue;
+          }
+        };
+      }
+    };
+  }
+
+
+  // we can't just jqLite('<option>') since jqLite is not smart enough
+  // to create it in <select> and IE barfs otherwise.
+  var optionTemplate = document.createElement('option'),
+      optGroupTemplate = document.createElement('optgroup');
+
+  return {
+    restrict: 'A',
+    terminal: true,
+    require: ['select', '?ngModel'],
+    link: function(scope, selectElement, attr, ctrls) {
+
+      // if ngModel is not defined, we don't need to do anything
+      var ngModelCtrl = ctrls[1];
+      if (!ngModelCtrl) return;
+
+      var selectCtrl = ctrls[0];
+      var multiple = attr.multiple;
+
+      // The emptyOption allows the application developer to provide their own custom "empty"
+      // option when the viewValue does not match any of the option values.
+      var emptyOption;
+      for (var i = 0, children = selectElement.children(), ii = children.length; i < ii; i++) {
+        if (children[i].value === '') {
+          emptyOption = children.eq(i);
+          break;
+        }
+      }
+
+      var providedEmptyOption = !!emptyOption;
+
+      var unknownOption = jqLite(optionTemplate.cloneNode(false));
+      unknownOption.val('?');
+
+      var options;
+      var ngOptions = parseOptionsExpression(attr.ngOptions, selectElement, scope);
+
+
+      var renderEmptyOption = function() {
+        if (!providedEmptyOption) {
+          selectElement.prepend(emptyOption);
+        }
+        selectElement.val('');
+        emptyOption.prop('selected', true); // needed for IE
+        emptyOption.attr('selected', true);
+      };
+
+      var removeEmptyOption = function() {
+        if (!providedEmptyOption) {
+          emptyOption.remove();
+        }
+      };
+
+
+      var renderUnknownOption = function() {
+        selectElement.prepend(unknownOption);
+        selectElement.val('?');
+        unknownOption.prop('selected', true); // needed for IE
+        unknownOption.attr('selected', true);
+      };
+
+      var removeUnknownOption = function() {
+        unknownOption.remove();
+      };
+
+
+      // Update the controller methods for multiple selectable options
+      if (!multiple) {
+
+        selectCtrl.writeValue = function writeNgOptionsValue(value) {
+          var option = options.getOptionFromViewValue(value);
+
+          if (option && !option.disabled) {
+            if (selectElement[0].value !== option.selectValue) {
+              removeUnknownOption();
+              removeEmptyOption();
+
+              selectElement[0].value = option.selectValue;
+              option.element.selected = true;
+              option.element.setAttribute('selected', 'selected');
+            }
+          } else {
+            if (value === null || providedEmptyOption) {
+              removeUnknownOption();
+              renderEmptyOption();
+            } else {
+              removeEmptyOption();
+              renderUnknownOption();
+            }
+          }
+        };
+
+        selectCtrl.readValue = function readNgOptionsValue() {
+
+          var selectedOption = options.selectValueMap[selectElement.val()];
+
+          if (selectedOption && !selectedOption.disabled) {
+            removeEmptyOption();
+            removeUnknownOption();
+            return options.getViewValueFromOption(selectedOption);
+          }
+          return null;
+        };
+
+        // If we are using `track by` then we must watch the tracked value on the model
+        // since ngModel only watches for object identity change
+        if (ngOptions.trackBy) {
+          scope.$watch(
+            function() { return ngOptions.getTrackByValue(ngModelCtrl.$viewValue); },
+            function() { ngModelCtrl.$render(); }
+          );
+        }
+
+      } else {
+
+        ngModelCtrl.$isEmpty = function(value) {
+          return !value || value.length === 0;
+        };
+
+
+        selectCtrl.writeValue = function writeNgOptionsMultiple(value) {
+          options.items.forEach(function(option) {
+            option.element.selected = false;
+          });
+
+          if (value) {
+            value.forEach(function(item) {
+              var option = options.getOptionFromViewValue(item);
+              if (option && !option.disabled) option.element.selected = true;
+            });
+          }
+        };
+
+
+        selectCtrl.readValue = function readNgOptionsMultiple() {
+          var selectedValues = selectElement.val() || [],
+              selections = [];
+
+          forEach(selectedValues, function(value) {
+            var option = options.selectValueMap[value];
+            if (!option.disabled) selections.push(options.getViewValueFromOption(option));
+          });
+
+          return selections;
+        };
+
+        // If we are using `track by` then we must watch these tracked values on the model
+        // since ngModel only watches for object identity change
+        if (ngOptions.trackBy) {
+
+          scope.$watchCollection(function() {
+            if (isArray(ngModelCtrl.$viewValue)) {
+              return ngModelCtrl.$viewValue.map(function(value) {
+                return ngOptions.getTrackByValue(value);
+              });
+            }
+          }, function() {
+            ngModelCtrl.$render();
+          });
+
+        }
+      }
+
+
+      if (providedEmptyOption) {
+
+        // we need to remove it before calling selectElement.empty() because otherwise IE will
+        // remove the label from the element. wtf?
+        emptyOption.remove();
+
+        // compile the element since there might be bindings in it
+        $compile(emptyOption)(scope);
+
+        // remove the class, which is added automatically because we recompile the element and it
+        // becomes the compilation root
+        emptyOption.removeClass('ng-scope');
+      } else {
+        emptyOption = jqLite(optionTemplate.cloneNode(false));
+      }
+
+      // We need to do this here to ensure that the options object is defined
+      // when we first hit it in writeNgOptionsValue
+      updateOptions();
+
+      // We will re-render the option elements if the option values or labels change
+      scope.$watchCollection(ngOptions.getWatchables, updateOptions);
+
+      // ------------------------------------------------------------------ //
+
+
+      function updateOptionElement(option, element) {
+        option.element = element;
+        element.disabled = option.disabled;
+        if (option.value !== element.value) element.value = option.selectValue;
+        if (option.label !== element.label) {
+          element.label = option.label;
+          element.textContent = option.label;
+        }
+      }
+
+      function addOrReuseElement(parent, current, type, templateElement) {
+        var element;
+        // Check whether we can reuse the next element
+        if (current && lowercase(current.nodeName) === type) {
+          // The next element is the right type so reuse it
+          element = current;
+        } else {
+          // The next element is not the right type so create a new one
+          element = templateElement.cloneNode(false);
+          if (!current) {
+            // There are no more elements so just append it to the select
+            parent.appendChild(element);
+          } else {
+            // The next element is not a group so insert the new one
+            parent.insertBefore(element, current);
+          }
+        }
+        return element;
+      }
+
+
+      function removeExcessElements(current) {
+        var next;
+        while (current) {
+          next = current.nextSibling;
+          jqLiteRemove(current);
+          current = next;
+        }
+      }
+
+
+      function skipEmptyAndUnknownOptions(current) {
+        var emptyOption_ = emptyOption && emptyOption[0];
+        var unknownOption_ = unknownOption && unknownOption[0];
+
+        if (emptyOption_ || unknownOption_) {
+          while (current &&
+                (current === emptyOption_ ||
+                current === unknownOption_)) {
+            current = current.nextSibling;
+          }
+        }
+        return current;
+      }
+
+
+      function updateOptions() {
+
+        var previousValue = options && selectCtrl.readValue();
+
+        options = ngOptions.getOptions();
+
+        var groupMap = {};
+        var currentElement = selectElement[0].firstChild;
+
+        // Ensure that the empty option is always there if it was explicitly provided
+        if (providedEmptyOption) {
+          selectElement.prepend(emptyOption);
+        }
+
+        currentElement = skipEmptyAndUnknownOptions(currentElement);
+
+        options.items.forEach(function updateOption(option) {
+          var group;
+          var groupElement;
+          var optionElement;
+
+          if (option.group) {
+
+            // This option is to live in a group
+            // See if we have already created this group
+            group = groupMap[option.group];
+
+            if (!group) {
+
+              // We have not already created this group
+              groupElement = addOrReuseElement(selectElement[0],
+                                               currentElement,
+                                               'optgroup',
+                                               optGroupTemplate);
+              // Move to the next element
+              currentElement = groupElement.nextSibling;
+
+              // Update the label on the group element
+              groupElement.label = option.group;
+
+              // Store it for use later
+              group = groupMap[option.group] = {
+                groupElement: groupElement,
+                currentOptionElement: groupElement.firstChild
+              };
+
+            }
+
+            // So now we have a group for this option we add the option to the group
+            optionElement = addOrReuseElement(group.groupElement,
+                                              group.currentOptionElement,
+                                              'option',
+                                              optionTemplate);
+            updateOptionElement(option, optionElement);
+            // Move to the next element
+            group.currentOptionElement = optionElement.nextSibling;
+
+          } else {
+
+            // This option is not in a group
+            optionElement = addOrReuseElement(selectElement[0],
+                                              currentElement,
+                                              'option',
+                                              optionTemplate);
+            updateOptionElement(option, optionElement);
+            // Move to the next element
+            currentElement = optionElement.nextSibling;
+          }
+        });
+
+
+        // Now remove all excess options and group
+        Object.keys(groupMap).forEach(function(key) {
+          removeExcessElements(groupMap[key].currentOptionElement);
+        });
+        removeExcessElements(currentElement);
+
+        ngModelCtrl.$render();
+
+        // Check to see if the value has changed due to the update to the options
+        if (!ngModelCtrl.$isEmpty(previousValue)) {
+          var nextValue = selectCtrl.readValue();
+          if (ngOptions.trackBy && !equals(previousValue, nextValue) ||
+                previousValue !== nextValue) {
+            ngModelCtrl.$setViewValue(nextValue);
+            ngModelCtrl.$render();
+          }
+        }
+
+      }
+
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngPluralize
+ * @restrict EA
+ *
+ * @description
+ * `ngPluralize` is a directive that displays messages according to en-US localization rules.
+ * These rules are bundled with angular.js, but can be overridden
+ * (see {@link guide/i18n Angular i18n} dev guide). You configure ngPluralize directive
+ * by specifying the mappings between
+ * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+ * and the strings to be displayed.
+ *
+ * # Plural categories and explicit number rules
+ * There are two
+ * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+ * in Angular's default en-US locale: "one" and "other".
+ *
+ * While a plural category may match many numbers (for example, in en-US locale, "other" can match
+ * any number that is not 1), an explicit number rule can only match one number. For example, the
+ * explicit number rule for "3" matches the number 3. There are examples of plural categories
+ * and explicit number rules throughout the rest of this documentation.
+ *
+ * # Configuring ngPluralize
+ * You configure ngPluralize by providing 2 attributes: `count` and `when`.
+ * You can also provide an optional attribute, `offset`.
+ *
+ * The value of the `count` attribute can be either a string or an {@link guide/expression
+ * Angular expression}; these are evaluated on the current scope for its bound value.
+ *
+ * The `when` attribute specifies the mappings between plural categories and the actual
+ * string to be displayed. The value of the attribute should be a JSON object.
+ *
+ * The following example shows how to configure ngPluralize:
+ *
+ * ```html
+ * <ng-pluralize count="personCount"
+                 when="{'0': 'Nobody is viewing.',
+ *                      'one': '1 person is viewing.',
+ *                      'other': '{} people are viewing.'}">
+ * </ng-pluralize>
+ *```
+ *
+ * In the example, `"0: Nobody is viewing."` is an explicit number rule. If you did not
+ * specify this rule, 0 would be matched to the "other" category and "0 people are viewing"
+ * would be shown instead of "Nobody is viewing". You can specify an explicit number rule for
+ * other numbers, for example 12, so that instead of showing "12 people are viewing", you can
+ * show "a dozen people are viewing".
+ *
+ * You can use a set of closed braces (`{}`) as a placeholder for the number that you want substituted
+ * into pluralized strings. In the previous example, Angular will replace `{}` with
+ * <span ng-non-bindable>`{{personCount}}`</span>. The closed braces `{}` is a placeholder
+ * for <span ng-non-bindable>{{numberExpression}}</span>.
+ *
+ * If no rule is defined for a category, then an empty string is displayed and a warning is generated.
+ * Note that some locales define more categories than `one` and `other`. For example, fr-fr defines `few` and `many`.
+ *
+ * # Configuring ngPluralize with offset
+ * The `offset` attribute allows further customization of pluralized text, which can result in
+ * a better user experience. For example, instead of the message "4 people are viewing this document",
+ * you might display "John, Kate and 2 others are viewing this document".
+ * The offset attribute allows you to offset a number by any desired value.
+ * Let's take a look at an example:
+ *
+ * ```html
+ * <ng-pluralize count="personCount" offset=2
+ *               when="{'0': 'Nobody is viewing.',
+ *                      '1': '{{person1}} is viewing.',
+ *                      '2': '{{person1}} and {{person2}} are viewing.',
+ *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
+ *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
+ * </ng-pluralize>
+ * ```
+ *
+ * Notice that we are still using two plural categories(one, other), but we added
+ * three explicit number rules 0, 1 and 2.
+ * When one person, perhaps John, views the document, "John is viewing" will be shown.
+ * When three people view the document, no explicit number rule is found, so
+ * an offset of 2 is taken off 3, and Angular uses 1 to decide the plural category.
+ * In this case, plural category 'one' is matched and "John, Mary and one other person are viewing"
+ * is shown.
+ *
+ * Note that when you specify offsets, you must provide explicit number rules for
+ * numbers from 0 up to and including the offset. If you use an offset of 3, for example,
+ * you must provide explicit number rules for 0, 1, 2 and 3. You must also provide plural strings for
+ * plural categories "one" and "other".
+ *
+ * @param {string|expression} count The variable to be bound to.
+ * @param {string} when The mapping between plural category to its corresponding strings.
+ * @param {number=} offset Offset to deduct from the total number.
+ *
+ * @example
+    <example module="pluralizeExample">
+      <file name="index.html">
+        <script>
+          angular.module('pluralizeExample', [])
+            .controller('ExampleController', ['$scope', function($scope) {
+              $scope.person1 = 'Igor';
+              $scope.person2 = 'Misko';
+              $scope.personCount = 1;
+            }]);
+        </script>
+        <div ng-controller="ExampleController">
+          <label>Person 1:<input type="text" ng-model="person1" value="Igor" /></label><br/>
+          <label>Person 2:<input type="text" ng-model="person2" value="Misko" /></label><br/>
+          <label>Number of People:<input type="text" ng-model="personCount" value="1" /></label><br/>
+
+          <!--- Example with simple pluralization rules for en locale --->
+          Without Offset:
+          <ng-pluralize count="personCount"
+                        when="{'0': 'Nobody is viewing.',
+                               'one': '1 person is viewing.',
+                               'other': '{} people are viewing.'}">
+          </ng-pluralize><br>
+
+          <!--- Example with offset --->
+          With Offset(2):
+          <ng-pluralize count="personCount" offset=2
+                        when="{'0': 'Nobody is viewing.',
+                               '1': '{{person1}} is viewing.',
+                               '2': '{{person1}} and {{person2}} are viewing.',
+                               'one': '{{person1}}, {{person2}} and one other person are viewing.',
+                               'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
+          </ng-pluralize>
+        </div>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should show correct pluralized string', function() {
+          var withoutOffset = element.all(by.css('ng-pluralize')).get(0);
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var countInput = element(by.model('personCount'));
+
+          expect(withoutOffset.getText()).toEqual('1 person is viewing.');
+          expect(withOffset.getText()).toEqual('Igor is viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('0');
+
+          expect(withoutOffset.getText()).toEqual('Nobody is viewing.');
+          expect(withOffset.getText()).toEqual('Nobody is viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('2');
+
+          expect(withoutOffset.getText()).toEqual('2 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor and Misko are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('3');
+
+          expect(withoutOffset.getText()).toEqual('3 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and one other person are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('4');
+
+          expect(withoutOffset.getText()).toEqual('4 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and 2 other people are viewing.');
+        });
+        it('should show data-bound names', function() {
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var personCount = element(by.model('personCount'));
+          var person1 = element(by.model('person1'));
+          var person2 = element(by.model('person2'));
+          personCount.clear();
+          personCount.sendKeys('4');
+          person1.clear();
+          person1.sendKeys('Di');
+          person2.clear();
+          person2.sendKeys('Vojta');
+          expect(withOffset.getText()).toEqual('Di, Vojta and 2 other people are viewing.');
+        });
+      </file>
+    </example>
+ */
+var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale, $interpolate, $log) {
+  var BRACE = /{}/g,
+      IS_WHEN = /^when(Minus)?(.+)$/;
+
+  return {
+    link: function(scope, element, attr) {
+      var numberExp = attr.count,
+          whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
+          offset = attr.offset || 0,
+          whens = scope.$eval(whenExp) || {},
+          whensExpFns = {},
+          startSymbol = $interpolate.startSymbol(),
+          endSymbol = $interpolate.endSymbol(),
+          braceReplacement = startSymbol + numberExp + '-' + offset + endSymbol,
+          watchRemover = angular.noop,
+          lastCount;
+
+      forEach(attr, function(expression, attributeName) {
+        var tmpMatch = IS_WHEN.exec(attributeName);
+        if (tmpMatch) {
+          var whenKey = (tmpMatch[1] ? '-' : '') + lowercase(tmpMatch[2]);
+          whens[whenKey] = element.attr(attr.$attr[attributeName]);
+        }
+      });
+      forEach(whens, function(expression, key) {
+        whensExpFns[key] = $interpolate(expression.replace(BRACE, braceReplacement));
+
+      });
+
+      scope.$watch(numberExp, function ngPluralizeWatchAction(newVal) {
+        var count = parseFloat(newVal);
+        var countIsNaN = isNaN(count);
+
+        if (!countIsNaN && !(count in whens)) {
+          // If an explicit number rule such as 1, 2, 3... is defined, just use it.
+          // Otherwise, check it against pluralization rules in $locale service.
+          count = $locale.pluralCat(count - offset);
+        }
+
+        // If both `count` and `lastCount` are NaN, we don't need to re-register a watch.
+        // In JS `NaN !== NaN`, so we have to exlicitly check.
+        if ((count !== lastCount) && !(countIsNaN && isNumber(lastCount) && isNaN(lastCount))) {
+          watchRemover();
+          var whenExpFn = whensExpFns[count];
+          if (isUndefined(whenExpFn)) {
+            if (newVal != null) {
+              $log.debug("ngPluralize: no rule defined for '" + count + "' in " + whenExp);
+            }
+            watchRemover = noop;
+            updateElementText();
+          } else {
+            watchRemover = scope.$watch(whenExpFn, updateElementText);
+          }
+          lastCount = count;
+        }
+      });
+
+      function updateElementText(newText) {
+        element.text(newText || '');
+      }
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngRepeat
+ *
+ * @description
+ * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
+ * instance gets its own scope, where the given loop variable is set to the current collection item,
+ * and `$index` is set to the item index or key.
+ *
+ * Special properties are exposed on the local scope of each template instance, including:
+ *
+ * | Variable  | Type            | Details                                                                     |
+ * |-----------|-----------------|-----------------------------------------------------------------------------|
+ * | `$index`  | {@type number}  | iterator offset of the repeated element (0..length-1)                       |
+ * | `$first`  | {@type boolean} | true if the repeated element is first in the iterator.                      |
+ * | `$middle` | {@type boolean} | true if the repeated element is between the first and last in the iterator. |
+ * | `$last`   | {@type boolean} | true if the repeated element is last in the iterator.                       |
+ * | `$even`   | {@type boolean} | true if the iterator position `$index` is even (otherwise false).           |
+ * | `$odd`    | {@type boolean} | true if the iterator position `$index` is odd (otherwise false).            |
+ *
+ * Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
+ * This may be useful when, for instance, nesting ngRepeats.
+ *
+ *
+ * # Iterating over object properties
+ *
+ * It is possible to get `ngRepeat` to iterate over the properties of an object using the following
+ * syntax:
+ *
+ * ```js
+ * <div ng-repeat="(key, value) in myObj"> ... </div>
+ * ```
+ *
+ * You need to be aware that the JavaScript specification does not define the order of keys
+ * returned for an object. (To mitigate this in Angular 1.3 the `ngRepeat` directive
+ * used to sort the keys alphabetically.)
+ *
+ * Version 1.4 removed the alphabetic sorting. We now rely on the order returned by the browser
+ * when running `for key in myObj`. It seems that browsers generally follow the strategy of providing
+ * keys in the order in which they were defined, although there are exceptions when keys are deleted
+ * and reinstated. See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_issues
+ *
+ * If this is not desired, the recommended workaround is to convert your object into an array
+ * that is sorted into the order that you prefer before providing it to `ngRepeat`.  You could
+ * do this with a filter such as [toArrayFilter](http://ngmodules.org/modules/angular-toArrayFilter)
+ * or implement a `$watch` on the object yourself.
+ *
+ *
+ * # Tracking and Duplicates
+ *
+ * When the contents of the collection change, `ngRepeat` makes the corresponding changes to the DOM:
+ *
+ * * When an item is added, a new instance of the template is added to the DOM.
+ * * When an item is removed, its template instance is removed from the DOM.
+ * * When items are reordered, their respective templates are reordered in the DOM.
+ *
+ * By default, `ngRepeat` does not allow duplicate items in arrays. This is because when
+ * there are duplicates, it is not possible to maintain a one-to-one mapping between collection
+ * items and DOM elements.
+ *
+ * If you do need to repeat duplicate items, you can substitute the default tracking behavior
+ * with your own using the `track by` expression.
+ *
+ * For example, you may track items by the index of each item in the collection, using the
+ * special scope property `$index`:
+ * ```html
+ *    <div ng-repeat="n in [42, 42, 43, 43] track by $index">
+ *      {{n}}
+ *    </div>
+ * ```
+ *
+ * You may use arbitrary expressions in `track by`, including references to custom functions
+ * on the scope:
+ * ```html
+ *    <div ng-repeat="n in [42, 42, 43, 43] track by myTrackingFunction(n)">
+ *      {{n}}
+ *    </div>
+ * ```
+ *
+ * If you are working with objects that have an identifier property, you can track
+ * by the identifier instead of the whole object. Should you reload your data later, `ngRepeat`
+ * will not have to rebuild the DOM elements for items it has already rendered, even if the
+ * JavaScript objects in the collection have been substituted for new ones:
+ * ```html
+ *    <div ng-repeat="model in collection track by model.id">
+ *      {{model.name}}
+ *    </div>
+ * ```
+ *
+ * When no `track by` expression is provided, it is equivalent to tracking by the built-in
+ * `$id` function, which tracks items by their identity:
+ * ```html
+ *    <div ng-repeat="obj in collection track by $id(obj)">
+ *      {{obj.prop}}
+ *    </div>
+ * ```
+ *
+ * # Special repeat start and end points
+ * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
+ * the range of the repeater by defining explicit start and end points by using **ng-repeat-start** and **ng-repeat-end** respectively.
+ * The **ng-repeat-start** directive works the same as **ng-repeat**, but will repeat all the HTML code (including the tag it's defined on)
+ * up to and including the ending HTML tag where **ng-repeat-end** is placed.
+ *
+ * The example below makes use of this feature:
+ * ```html
+ *   <header ng-repeat-start="item in items">
+ *     Header {{ item }}
+ *   </header>
+ *   <div class="body">
+ *     Body {{ item }}
+ *   </div>
+ *   <footer ng-repeat-end>
+ *     Footer {{ item }}
+ *   </footer>
+ * ```
+ *
+ * And with an input of {@type ['A','B']} for the items variable in the example above, the output will evaluate to:
+ * ```html
+ *   <header>
+ *     Header A
+ *   </header>
+ *   <div class="body">
+ *     Body A
+ *   </div>
+ *   <footer>
+ *     Footer A
+ *   </footer>
+ *   <header>
+ *     Header B
+ *   </header>
+ *   <div class="body">
+ *     Body B
+ *   </div>
+ *   <footer>
+ *     Footer B
+ *   </footer>
+ * ```
+ *
+ * The custom start and end points for ngRepeat also support all other HTML directive syntax flavors provided in AngularJS (such
+ * as **data-ng-repeat-start**, **x-ng-repeat-start** and **ng:repeat-start**).
+ *
+ * @animations
+ * **.enter** - when a new item is added to the list or when an item is revealed after a filter
+ *
+ * **.leave** - when an item is removed from the list or when an item is filtered out
+ *
+ * **.move** - when an adjacent item is filtered out causing a reorder or when the item contents are reordered
+ *
+ * @element ANY
+ * @scope
+ * @priority 1000
+ * @param {repeat_expression} ngRepeat The expression indicating how to enumerate a collection. These
+ *   formats are currently supported:
+ *
+ *   * `variable in expression` – where variable is the user defined loop variable and `expression`
+ *     is a scope expression giving the collection to enumerate.
+ *
+ *     For example: `album in artist.albums`.
+ *
+ *   * `(key, value) in expression` – where `key` and `value` can be any user defined identifiers,
+ *     and `expression` is the scope expression giving the collection to enumerate.
+ *
+ *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
+ *
+ *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking expression
+ *     which can be used to associate the objects in the collection with the DOM elements. If no tracking expression
+ *     is specified, ng-repeat associates elements by identity. It is an error to have
+ *     more than one tracking expression value resolve to the same key. (This would mean that two distinct objects are
+ *     mapped to the same DOM element, which is not possible.)  If filters are used in the expression, they should be
+ *     applied before the tracking expression.
+ *
+ *     For example: `item in items` is equivalent to `item in items track by $id(item)`. This implies that the DOM elements
+ *     will be associated by item identity in the array.
+ *
+ *     For example: `item in items track by $id(item)`. A built in `$id()` function can be used to assign a unique
+ *     `$$hashKey` property to each item in the array. This property is then used as a key to associated DOM elements
+ *     with the corresponding item in the array by identity. Moving the same object in array would move the DOM
+ *     element in the same way in the DOM.
+ *
+ *     For example: `item in items track by item.id` is a typical pattern when the items come from the database. In this
+ *     case the object identity does not matter. Two objects are considered equivalent as long as their `id`
+ *     property is same.
+ *
+ *     For example: `item in items | filter:searchText track by item.id` is a pattern that might be used to apply a filter
+ *     to items in conjunction with a tracking expression.
+ *
+ *   * `variable in expression as alias_expression` – You can also provide an optional alias expression which will then store the
+ *     intermediate results of the repeater after the filters have been applied. Typically this is used to render a special message
+ *     when a filter is active on the repeater, but the filtered result set is empty.
+ *
+ *     For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after
+ *     the items have been processed through the filter.
+ *
+ *     Please note that `as [variable name] is not an operator but rather a part of ngRepeat micro-syntax so it can be used only at the end
+ *     (and not as operator, inside an expression).
+ *
+ *     For example: `item in items | filter : x | orderBy : order | limitTo : limit as results` .
+ *
+ * @example
+ * This example initializes the scope to a list of names and
+ * then uses `ngRepeat` to display every person:
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      <div ng-init="friends = [
+        {name:'John', age:25, gender:'boy'},
+        {name:'Jessie', age:30, gender:'girl'},
+        {name:'Johanna', age:28, gender:'girl'},
+        {name:'Joy', age:15, gender:'girl'},
+        {name:'Mary', age:28, gender:'girl'},
+        {name:'Peter', age:95, gender:'boy'},
+        {name:'Sebastian', age:50, gender:'boy'},
+        {name:'Erika', age:27, gender:'girl'},
+        {name:'Patrick', age:40, gender:'boy'},
+        {name:'Samantha', age:60, gender:'girl'}
+      ]">
+        I have {{friends.length}} friends. They are:
+        <input type="search" ng-model="q" placeholder="filter friends..." aria-label="filter friends" />
+        <ul class="example-animate-container">
+          <li class="animate-repeat" ng-repeat="friend in friends | filter:q as results">
+            [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
+          </li>
+          <li class="animate-repeat" ng-if="results.length == 0">
+            <strong>No results found...</strong>
+          </li>
+        </ul>
+      </div>
+    </file>
+    <file name="animations.css">
+      .example-animate-container {
+        background:white;
+        border:1px solid black;
+        list-style:none;
+        margin:0;
+        padding:0 10px;
+      }
+
+      .animate-repeat {
+        line-height:40px;
+        list-style:none;
+        box-sizing:border-box;
+      }
+
+      .animate-repeat.ng-move,
+      .animate-repeat.ng-enter,
+      .animate-repeat.ng-leave {
+        -webkit-transition:all linear 0.5s;
+        transition:all linear 0.5s;
+      }
+
+      .animate-repeat.ng-leave.ng-leave-active,
+      .animate-repeat.ng-move,
+      .animate-repeat.ng-enter {
+        opacity:0;
+        max-height:0;
+      }
+
+      .animate-repeat.ng-leave,
+      .animate-repeat.ng-move.ng-move-active,
+      .animate-repeat.ng-enter.ng-enter-active {
+        opacity:1;
+        max-height:40px;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var friends = element.all(by.repeater('friend in friends'));
+
+      it('should render initial data set', function() {
+        expect(friends.count()).toBe(10);
+        expect(friends.get(0).getText()).toEqual('[1] John who is 25 years old.');
+        expect(friends.get(1).getText()).toEqual('[2] Jessie who is 30 years old.');
+        expect(friends.last().getText()).toEqual('[10] Samantha who is 60 years old.');
+        expect(element(by.binding('friends.length')).getText())
+            .toMatch("I have 10 friends. They are:");
+      });
+
+       it('should update repeater when filter predicate changes', function() {
+         expect(friends.count()).toBe(10);
+
+         element(by.model('q')).sendKeys('ma');
+
+         expect(friends.count()).toBe(2);
+         expect(friends.get(0).getText()).toEqual('[1] Mary who is 28 years old.');
+         expect(friends.last().getText()).toEqual('[2] Samantha who is 60 years old.');
+       });
+      </file>
+    </example>
+ */
+var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
+  var NG_REMOVED = '$$NG_REMOVED';
+  var ngRepeatMinErr = minErr('ngRepeat');
+
+  var updateScope = function(scope, index, valueIdentifier, value, keyIdentifier, key, arrayLength) {
+    // TODO(perf): generate setters to shave off ~40ms or 1-1.5%
+    scope[valueIdentifier] = value;
+    if (keyIdentifier) scope[keyIdentifier] = key;
+    scope.$index = index;
+    scope.$first = (index === 0);
+    scope.$last = (index === (arrayLength - 1));
+    scope.$middle = !(scope.$first || scope.$last);
+    // jshint bitwise: false
+    scope.$odd = !(scope.$even = (index&1) === 0);
+    // jshint bitwise: true
+  };
+
+  var getBlockStart = function(block) {
+    return block.clone[0];
+  };
+
+  var getBlockEnd = function(block) {
+    return block.clone[block.clone.length - 1];
+  };
+
+
+  return {
+    restrict: 'A',
+    multiElement: true,
+    transclude: 'element',
+    priority: 1000,
+    terminal: true,
+    $$tlb: true,
+    compile: function ngRepeatCompile($element, $attr) {
+      var expression = $attr.ngRepeat;
+      var ngRepeatEndComment = document.createComment(' end ngRepeat: ' + expression + ' ');
+
+      var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
+
+      if (!match) {
+        throw ngRepeatMinErr('iexp', "Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",
+            expression);
+      }
+
+      var lhs = match[1];
+      var rhs = match[2];
+      var aliasAs = match[3];
+      var trackByExp = match[4];
+
+      match = lhs.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/);
+
+      if (!match) {
+        throw ngRepeatMinErr('iidexp', "'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",
+            lhs);
+      }
+      var valueIdentifier = match[3] || match[1];
+      var keyIdentifier = match[2];
+
+      if (aliasAs && (!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(aliasAs) ||
+          /^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(aliasAs))) {
+        throw ngRepeatMinErr('badident', "alias '{0}' is invalid --- must be a valid JS identifier which is not a reserved name.",
+          aliasAs);
+      }
+
+      var trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn;
+      var hashFnLocals = {$id: hashKey};
+
+      if (trackByExp) {
+        trackByExpGetter = $parse(trackByExp);
+      } else {
+        trackByIdArrayFn = function(key, value) {
+          return hashKey(value);
+        };
+        trackByIdObjFn = function(key) {
+          return key;
+        };
+      }
+
+      return function ngRepeatLink($scope, $element, $attr, ctrl, $transclude) {
+
+        if (trackByExpGetter) {
+          trackByIdExpFn = function(key, value, index) {
+            // assign key, value, and $index to the locals so that they can be used in hash functions
+            if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
+            hashFnLocals[valueIdentifier] = value;
+            hashFnLocals.$index = index;
+            return trackByExpGetter($scope, hashFnLocals);
+          };
+        }
+
+        // Store a list of elements from previous run. This is a hash where key is the item from the
+        // iterator, and the value is objects with following properties.
+        //   - scope: bound scope
+        //   - element: previous element.
+        //   - index: position
+        //
+        // We are using no-proto object so that we don't need to guard against inherited props via
+        // hasOwnProperty.
+        var lastBlockMap = createMap();
+
+        //watch props
+        $scope.$watchCollection(rhs, function ngRepeatAction(collection) {
+          var index, length,
+              previousNode = $element[0],     // node that cloned nodes should be inserted after
+                                              // initialized to the comment node anchor
+              nextNode,
+              // Same as lastBlockMap but it has the current state. It will become the
+              // lastBlockMap on the next iteration.
+              nextBlockMap = createMap(),
+              collectionLength,
+              key, value, // key/value of iteration
+              trackById,
+              trackByIdFn,
+              collectionKeys,
+              block,       // last object information {scope, element, id}
+              nextBlockOrder,
+              elementsToRemove;
+
+          if (aliasAs) {
+            $scope[aliasAs] = collection;
+          }
+
+          if (isArrayLike(collection)) {
+            collectionKeys = collection;
+            trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
+          } else {
+            trackByIdFn = trackByIdExpFn || trackByIdObjFn;
+            // if object, extract keys, in enumeration order, unsorted
+            collectionKeys = [];
+            for (var itemKey in collection) {
+              if (collection.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
+                collectionKeys.push(itemKey);
+              }
+            }
+          }
+
+          collectionLength = collectionKeys.length;
+          nextBlockOrder = new Array(collectionLength);
+
+          // locate existing items
+          for (index = 0; index < collectionLength; index++) {
+            key = (collection === collectionKeys) ? index : collectionKeys[index];
+            value = collection[key];
+            trackById = trackByIdFn(key, value, index);
+            if (lastBlockMap[trackById]) {
+              // found previously seen block
+              block = lastBlockMap[trackById];
+              delete lastBlockMap[trackById];
+              nextBlockMap[trackById] = block;
+              nextBlockOrder[index] = block;
+            } else if (nextBlockMap[trackById]) {
+              // if collision detected. restore lastBlockMap and throw an error
+              forEach(nextBlockOrder, function(block) {
+                if (block && block.scope) lastBlockMap[block.id] = block;
+              });
+              throw ngRepeatMinErr('dupes',
+                  "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",
+                  expression, trackById, value);
+            } else {
+              // new never before seen block
+              nextBlockOrder[index] = {id: trackById, scope: undefined, clone: undefined};
+              nextBlockMap[trackById] = true;
+            }
+          }
+
+          // remove leftover items
+          for (var blockKey in lastBlockMap) {
+            block = lastBlockMap[blockKey];
+            elementsToRemove = getBlockNodes(block.clone);
+            $animate.leave(elementsToRemove);
+            if (elementsToRemove[0].parentNode) {
+              // if the element was not removed yet because of pending animation, mark it as deleted
+              // so that we can ignore it later
+              for (index = 0, length = elementsToRemove.length; index < length; index++) {
+                elementsToRemove[index][NG_REMOVED] = true;
+              }
+            }
+            block.scope.$destroy();
+          }
+
+          // we are not using forEach for perf reasons (trying to avoid #call)
+          for (index = 0; index < collectionLength; index++) {
+            key = (collection === collectionKeys) ? index : collectionKeys[index];
+            value = collection[key];
+            block = nextBlockOrder[index];
+
+            if (block.scope) {
+              // if we have already seen this object, then we need to reuse the
+              // associated scope/element
+
+              nextNode = previousNode;
+
+              // skip nodes that are already pending removal via leave animation
+              do {
+                nextNode = nextNode.nextSibling;
+              } while (nextNode && nextNode[NG_REMOVED]);
+
+              if (getBlockStart(block) != nextNode) {
+                // existing item which got moved
+                $animate.move(getBlockNodes(block.clone), null, jqLite(previousNode));
+              }
+              previousNode = getBlockEnd(block);
+              updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+            } else {
+              // new item which we don't know about
+              $transclude(function ngRepeatTransclude(clone, scope) {
+                block.scope = scope;
+                // http://jsperf.com/clone-vs-createcomment
+                var endNode = ngRepeatEndComment.cloneNode(false);
+                clone[clone.length++] = endNode;
+
+                // TODO(perf): support naked previousNode in `enter` to avoid creation of jqLite wrapper?
+                $animate.enter(clone, null, jqLite(previousNode));
+                previousNode = endNode;
+                // Note: We only need the first/last node of the cloned nodes.
+                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                // by a directive with templateUrl when its template arrives.
+                block.clone = clone;
+                nextBlockMap[block.id] = block;
+                updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+              });
+            }
+          }
+          lastBlockMap = nextBlockMap;
+        });
+      };
+    }
+  };
+}];
+
+var NG_HIDE_CLASS = 'ng-hide';
+var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
+/**
+ * @ngdoc directive
+ * @name ngShow
+ *
+ * @description
+ * The `ngShow` directive shows or hides the given HTML element based on the expression
+ * provided to the `ngShow` attribute. The element is shown or hidden by removing or adding
+ * the `.ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
+ * in AngularJS and sets the display style to none (using an !important flag).
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```html
+ * <!-- when $scope.myValue is truthy (element is visible) -->
+ * <div ng-show="myValue"></div>
+ *
+ * <!-- when $scope.myValue is falsy (element is hidden) -->
+ * <div ng-show="myValue" class="ng-hide"></div>
+ * ```
+ *
+ * When the `ngShow` expression evaluates to a falsy value then the `.ng-hide` CSS class is added to the class
+ * attribute on the element causing it to become hidden. When truthy, the `.ng-hide` CSS class is removed
+ * from the element causing the element not to appear hidden.
+ *
+ * ## Why is !important used?
+ *
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
+ * can be easily overridden by heavier selectors. For example, something as simple
+ * as changing the display style on a HTML list item would make hidden elements appear visible.
+ * This also becomes a bigger issue when dealing with CSS frameworks.
+ *
+ * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
+ * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
+ * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+ *
+ * ### Overriding `.ng-hide`
+ *
+ * By default, the `.ng-hide` class will style the element with `display: none!important`. If you wish to change
+ * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
+ * class CSS. Note that the selector that needs to be used is actually `.ng-hide:not(.ng-hide-animate)` to cope
+ * with extra animation classes that can be added.
+ *
+ * ```css
+ * .ng-hide:not(.ng-hide-animate) {
+ *   /&#42; this is just another form of hiding an element &#42;/
+ *   display: block!important;
+ *   position: absolute;
+ *   top: -9999px;
+ *   left: -9999px;
+ * }
+ * ```
+ *
+ * By default you don't need to override in CSS anything and the animations will work around the display style.
+ *
+ * ## A note about animations with `ngShow`
+ *
+ * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
+ * is true and false. This system works like the animation system present with ngClass except that
+ * you must also include the !important flag to override the display property
+ * so that you can perform an animation when the element is hidden during the time of the animation.
+ *
+ * ```css
+ * //
+ * //a working example can be found at the bottom of this page
+ * //
+ * .my-element.ng-hide-add, .my-element.ng-hide-remove {
+ *   /&#42; this is required as of 1.3x to properly
+ *      apply all styling in a show/hide animation &#42;/
+ *   transition: 0s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add-active,
+ * .my-element.ng-hide-remove-active {
+ *   /&#42; the transition is defined in the active class &#42;/
+ *   transition: 1s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add { ... }
+ * .my-element.ng-hide-add.ng-hide-add-active { ... }
+ * .my-element.ng-hide-remove { ... }
+ * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
+ * ```
+ *
+ * Keep in mind that, as of AngularJS version 1.3.0-beta.11, there is no need to change the display
+ * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
+ *
+ * @animations
+ * addClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a truthy value and the just before contents are set to visible
+ * removeClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden
+ *
+ * @element ANY
+ * @param {expression} ngShow If the {@link guide/expression expression} is truthy
+ *     then the element is shown or hidden respectively.
+ *
+ * @example
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      Click me: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br/>
+      <div>
+        Show:
+        <div class="check-element animate-show" ng-show="checked">
+          <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
+        </div>
+      </div>
+      <div>
+        Hide:
+        <div class="check-element animate-show" ng-hide="checked">
+          <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
+        </div>
+      </div>
+    </file>
+    <file name="glyphicons.css">
+      @import url(../../components/bootstrap-3.1.1/css/bootstrap.css);
+    </file>
+    <file name="animations.css">
+      .animate-show {
+        line-height: 20px;
+        opacity: 1;
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+
+      .animate-show.ng-hide-add.ng-hide-add-active,
+      .animate-show.ng-hide-remove.ng-hide-remove-active {
+        -webkit-transition: all linear 0.5s;
+        transition: all linear 0.5s;
+      }
+
+      .animate-show.ng-hide {
+        line-height: 0;
+        opacity: 0;
+        padding: 0 10px;
+      }
+
+      .check-element {
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
+      var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
+
+      it('should check ng-show / ng-hide', function() {
+        expect(thumbsUp.isDisplayed()).toBeFalsy();
+        expect(thumbsDown.isDisplayed()).toBeTruthy();
+
+        element(by.model('checked')).click();
+
+        expect(thumbsUp.isDisplayed()).toBeTruthy();
+        expect(thumbsDown.isDisplayed()).toBeFalsy();
+      });
+    </file>
+  </example>
+ */
+var ngShowDirective = ['$animate', function($animate) {
+  return {
+    restrict: 'A',
+    multiElement: true,
+    link: function(scope, element, attr) {
+      scope.$watch(attr.ngShow, function ngShowWatchAction(value) {
+        // we're adding a temporary, animation-specific class for ng-hide since this way
+        // we can control when the element is actually displayed on screen without having
+        // to have a global/greedy CSS selector that breaks when other animations are run.
+        // Read: https://github.com/angular/angular.js/issues/9103#issuecomment-58335845
+        $animate[value ? 'removeClass' : 'addClass'](element, NG_HIDE_CLASS, {
+          tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+        });
+      });
+    }
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngHide
+ *
+ * @description
+ * The `ngHide` directive shows or hides the given HTML element based on the expression
+ * provided to the `ngHide` attribute. The element is shown or hidden by removing or adding
+ * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
+ * in AngularJS and sets the display style to none (using an !important flag).
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```html
+ * <!-- when $scope.myValue is truthy (element is hidden) -->
+ * <div ng-hide="myValue" class="ng-hide"></div>
+ *
+ * <!-- when $scope.myValue is falsy (element is visible) -->
+ * <div ng-hide="myValue"></div>
+ * ```
+ *
+ * When the `ngHide` expression evaluates to a truthy value then the `.ng-hide` CSS class is added to the class
+ * attribute on the element causing it to become hidden. When falsy, the `.ng-hide` CSS class is removed
+ * from the element causing the element not to appear hidden.
+ *
+ * ## Why is !important used?
+ *
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
+ * can be easily overridden by heavier selectors. For example, something as simple
+ * as changing the display style on a HTML list item would make hidden elements appear visible.
+ * This also becomes a bigger issue when dealing with CSS frameworks.
+ *
+ * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
+ * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
+ * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+ *
+ * ### Overriding `.ng-hide`
+ *
+ * By default, the `.ng-hide` class will style the element with `display: none!important`. If you wish to change
+ * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
+ * class in CSS:
+ *
+ * ```css
+ * .ng-hide {
+ *   /&#42; this is just another form of hiding an element &#42;/
+ *   display: block!important;
+ *   position: absolute;
+ *   top: -9999px;
+ *   left: -9999px;
+ * }
+ * ```
+ *
+ * By default you don't need to override in CSS anything and the animations will work around the display style.
+ *
+ * ## A note about animations with `ngHide`
+ *
+ * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
+ * is true and false. This system works like the animation system present with ngClass, except that the `.ng-hide`
+ * CSS class is added and removed for you instead of your own CSS class.
+ *
+ * ```css
+ * //
+ * //a working example can be found at the bottom of this page
+ * //
+ * .my-element.ng-hide-add, .my-element.ng-hide-remove {
+ *   transition: 0.5s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add { ... }
+ * .my-element.ng-hide-add.ng-hide-add-active { ... }
+ * .my-element.ng-hide-remove { ... }
+ * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
+ * ```
+ *
+ * Keep in mind that, as of AngularJS version 1.3.0-beta.11, there is no need to change the display
+ * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
+ *
+ * @animations
+ * removeClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden
+ * addClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a non truthy value and just before the contents are set to visible
+ *
+ * @element ANY
+ * @param {expression} ngHide If the {@link guide/expression expression} is truthy then
+ *     the element is shown or hidden respectively.
+ *
+ * @example
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      Click me: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br/>
+      <div>
+        Show:
+        <div class="check-element animate-hide" ng-show="checked">
+          <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
+        </div>
+      </div>
+      <div>
+        Hide:
+        <div class="check-element animate-hide" ng-hide="checked">
+          <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
+        </div>
+      </div>
+    </file>
+    <file name="glyphicons.css">
+      @import url(../../components/bootstrap-3.1.1/css/bootstrap.css);
+    </file>
+    <file name="animations.css">
+      .animate-hide {
+        -webkit-transition: all linear 0.5s;
+        transition: all linear 0.5s;
+        line-height: 20px;
+        opacity: 1;
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+
+      .animate-hide.ng-hide {
+        line-height: 0;
+        opacity: 0;
+        padding: 0 10px;
+      }
+
+      .check-element {
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
+      var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
+
+      it('should check ng-show / ng-hide', function() {
+        expect(thumbsUp.isDisplayed()).toBeFalsy();
+        expect(thumbsDown.isDisplayed()).toBeTruthy();
+
+        element(by.model('checked')).click();
+
+        expect(thumbsUp.isDisplayed()).toBeTruthy();
+        expect(thumbsDown.isDisplayed()).toBeFalsy();
+      });
+    </file>
+  </example>
+ */
+var ngHideDirective = ['$animate', function($animate) {
+  return {
+    restrict: 'A',
+    multiElement: true,
+    link: function(scope, element, attr) {
+      scope.$watch(attr.ngHide, function ngHideWatchAction(value) {
+        // The comment inside of the ngShowDirective explains why we add and
+        // remove a temporary class for the show/hide animation
+        $animate[value ? 'addClass' : 'removeClass'](element,NG_HIDE_CLASS, {
+          tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+        });
+      });
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngStyle
+ * @restrict AC
+ *
+ * @description
+ * The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
+ *
+ * @element ANY
+ * @param {expression} ngStyle
+ *
+ * {@link guide/expression Expression} which evals to an
+ * object whose keys are CSS style names and values are corresponding values for those CSS
+ * keys.
+ *
+ * Since some CSS style names are not valid keys for an object, they must be quoted.
+ * See the 'background-color' style in the example below.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <input type="button" value="set color" ng-click="myStyle={color:'red'}">
+        <input type="button" value="set background" ng-click="myStyle={'background-color':'blue'}">
+        <input type="button" value="clear" ng-click="myStyle={}">
+        <br/>
+        <span ng-style="myStyle">Sample Text</span>
+        <pre>myStyle={{myStyle}}</pre>
+     </file>
+     <file name="style.css">
+       span {
+         color: black;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       var colorSpan = element(by.css('span'));
+
+       it('should check ng-style', function() {
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
+         element(by.css('input[value=\'set color\']')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)');
+         element(by.css('input[value=clear]')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
+       });
+     </file>
+   </example>
+ */
+var ngStyleDirective = ngDirective(function(scope, element, attr) {
+  scope.$watch(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
+    if (oldStyles && (newStyles !== oldStyles)) {
+      forEach(oldStyles, function(val, style) { element.css(style, '');});
+    }
+    if (newStyles) element.css(newStyles);
+  }, true);
+});
+
+/**
+ * @ngdoc directive
+ * @name ngSwitch
+ * @restrict EA
+ *
+ * @description
+ * The `ngSwitch` directive is used to conditionally swap DOM structure on your template based on a scope expression.
+ * Elements within `ngSwitch` but without `ngSwitchWhen` or `ngSwitchDefault` directives will be preserved at the location
+ * as specified in the template.
+ *
+ * The directive itself works similar to ngInclude, however, instead of downloading template code (or loading it
+ * from the template cache), `ngSwitch` simply chooses one of the nested elements and makes it visible based on which element
+ * matches the value obtained from the evaluated expression. In other words, you define a container element
+ * (where you place the directive), place an expression on the **`on="..."` attribute**
+ * (or the **`ng-switch="..."` attribute**), define any inner elements inside of the directive and place
+ * a when attribute per element. The when attribute is used to inform ngSwitch which element to display when the on
+ * expression is evaluated. If a matching expression is not found via a when attribute then an element with the default
+ * attribute is displayed.
+ *
+ * <div class="alert alert-info">
+ * Be aware that the attribute values to match against cannot be expressions. They are interpreted
+ * as literal string values to match against.
+ * For example, **`ng-switch-when="someVal"`** will match against the string `"someVal"` not against the
+ * value of the expression `$scope.someVal`.
+ * </div>
+
+ * @animations
+ * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container
+ * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM
+ *
+ * @usage
+ *
+ * ```
+ * <ANY ng-switch="expression">
+ *   <ANY ng-switch-when="matchValue1">...</ANY>
+ *   <ANY ng-switch-when="matchValue2">...</ANY>
+ *   <ANY ng-switch-default>...</ANY>
+ * </ANY>
+ * ```
+ *
+ *
+ * @scope
+ * @priority 1200
+ * @param {*} ngSwitch|on expression to match against <code>ng-switch-when</code>.
+ * On child elements add:
+ *
+ * * `ngSwitchWhen`: the case statement to match against. If match then this
+ *   case will be displayed. If the same match appears multiple times, all the
+ *   elements will be displayed.
+ * * `ngSwitchDefault`: the default case when no other case match. If there
+ *   are multiple default cases, all of them will be displayed when no other
+ *   case match.
+ *
+ *
+ * @example
+  <example module="switchExample" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <select ng-model="selection" ng-options="item for item in items">
+        </select>
+        <code>selection={{selection}}</code>
+        <hr/>
+        <div class="animate-switch-container"
+          ng-switch on="selection">
+            <div class="animate-switch" ng-switch-when="settings">Settings Div</div>
+            <div class="animate-switch" ng-switch-when="home">Home Span</div>
+            <div class="animate-switch" ng-switch-default>default</div>
+        </div>
+      </div>
+    </file>
+    <file name="script.js">
+      angular.module('switchExample', ['ngAnimate'])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.items = ['settings', 'home', 'other'];
+          $scope.selection = $scope.items[0];
+        }]);
+    </file>
+    <file name="animations.css">
+      .animate-switch-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+      .animate-switch {
+        padding:10px;
+      }
+
+      .animate-switch.ng-animate {
+        -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+      }
+
+      .animate-switch.ng-leave.ng-leave-active,
+      .animate-switch.ng-enter {
+        top:-50px;
+      }
+      .animate-switch.ng-leave,
+      .animate-switch.ng-enter.ng-enter-active {
+        top:0;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var switchElem = element(by.css('[ng-switch]'));
+      var select = element(by.model('selection'));
+
+      it('should start in settings', function() {
+        expect(switchElem.getText()).toMatch(/Settings Div/);
+      });
+      it('should change to home', function() {
+        select.all(by.css('option')).get(1).click();
+        expect(switchElem.getText()).toMatch(/Home Span/);
+      });
+      it('should select default', function() {
+        select.all(by.css('option')).get(2).click();
+        expect(switchElem.getText()).toMatch(/default/);
+      });
+    </file>
+  </example>
+ */
+var ngSwitchDirective = ['$animate', function($animate) {
+  return {
+    require: 'ngSwitch',
+
+    // asks for $scope to fool the BC controller module
+    controller: ['$scope', function ngSwitchController() {
+     this.cases = {};
+    }],
+    link: function(scope, element, attr, ngSwitchController) {
+      var watchExpr = attr.ngSwitch || attr.on,
+          selectedTranscludes = [],
+          selectedElements = [],
+          previousLeaveAnimations = [],
+          selectedScopes = [];
+
+      var spliceFactory = function(array, index) {
+          return function() { array.splice(index, 1); };
+      };
+
+      scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
+        var i, ii;
+        for (i = 0, ii = previousLeaveAnimations.length; i < ii; ++i) {
+          $animate.cancel(previousLeaveAnimations[i]);
+        }
+        previousLeaveAnimations.length = 0;
+
+        for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
+          var selected = getBlockNodes(selectedElements[i].clone);
+          selectedScopes[i].$destroy();
+          var promise = previousLeaveAnimations[i] = $animate.leave(selected);
+          promise.then(spliceFactory(previousLeaveAnimations, i));
+        }
+
+        selectedElements.length = 0;
+        selectedScopes.length = 0;
+
+        if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
+          forEach(selectedTranscludes, function(selectedTransclude) {
+            selectedTransclude.transclude(function(caseElement, selectedScope) {
+              selectedScopes.push(selectedScope);
+              var anchor = selectedTransclude.element;
+              caseElement[caseElement.length++] = document.createComment(' end ngSwitchWhen: ');
+              var block = { clone: caseElement };
+
+              selectedElements.push(block);
+              $animate.enter(caseElement, anchor.parent(), anchor);
+            });
+          });
+        }
+      });
+    }
+  };
+}];
+
+var ngSwitchWhenDirective = ngDirective({
+  transclude: 'element',
+  priority: 1200,
+  require: '^ngSwitch',
+  multiElement: true,
+  link: function(scope, element, attrs, ctrl, $transclude) {
+    ctrl.cases['!' + attrs.ngSwitchWhen] = (ctrl.cases['!' + attrs.ngSwitchWhen] || []);
+    ctrl.cases['!' + attrs.ngSwitchWhen].push({ transclude: $transclude, element: element });
+  }
+});
+
+var ngSwitchDefaultDirective = ngDirective({
+  transclude: 'element',
+  priority: 1200,
+  require: '^ngSwitch',
+  multiElement: true,
+  link: function(scope, element, attr, ctrl, $transclude) {
+    ctrl.cases['?'] = (ctrl.cases['?'] || []);
+    ctrl.cases['?'].push({ transclude: $transclude, element: element });
+   }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngTransclude
+ * @restrict EAC
+ *
+ * @description
+ * Directive that marks the insertion point for the transcluded DOM of the nearest parent directive that uses transclusion.
+ *
+ * Any existing content of the element that this directive is placed on will be removed before the transcluded content is inserted.
+ *
+ * @element ANY
+ *
+ * @example
+   <example module="transcludeExample">
+     <file name="index.html">
+       <script>
+         angular.module('transcludeExample', [])
+          .directive('pane', function(){
+             return {
+               restrict: 'E',
+               transclude: true,
+               scope: { title:'@' },
+               template: '<div style="border: 1px solid black;">' +
+                           '<div style="background-color: gray">{{title}}</div>' +
+                           '<ng-transclude></ng-transclude>' +
+                         '</div>'
+             };
+         })
+         .controller('ExampleController', ['$scope', function($scope) {
+           $scope.title = 'Lorem Ipsum';
+           $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+         }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <input ng-model="title" aria-label="title"> <br/>
+         <textarea ng-model="text" aria-label="text"></textarea> <br/>
+         <pane title="{{title}}">{{text}}</pane>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+        it('should have transcluded', function() {
+          var titleElement = element(by.model('title'));
+          titleElement.clear();
+          titleElement.sendKeys('TITLE');
+          var textElement = element(by.model('text'));
+          textElement.clear();
+          textElement.sendKeys('TEXT');
+          expect(element(by.binding('title')).getText()).toEqual('TITLE');
+          expect(element(by.binding('text')).getText()).toEqual('TEXT');
+        });
+     </file>
+   </example>
+ *
+ */
+var ngTranscludeDirective = ngDirective({
+  restrict: 'EAC',
+  link: function($scope, $element, $attrs, controller, $transclude) {
+    if (!$transclude) {
+      throw minErr('ngTransclude')('orphan',
+       'Illegal use of ngTransclude directive in the template! ' +
+       'No parent directive that requires a transclusion found. ' +
+       'Element: {0}',
+       startingTag($element));
+    }
+
+    $transclude(function(clone) {
+      $element.empty();
+      $element.append(clone);
+    });
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name script
+ * @restrict E
+ *
+ * @description
+ * Load the content of a `<script>` element into {@link ng.$templateCache `$templateCache`}, so that the
+ * template can be used by {@link ng.directive:ngInclude `ngInclude`},
+ * {@link ngRoute.directive:ngView `ngView`}, or {@link guide/directive directives}. The type of the
+ * `<script>` element must be specified as `text/ng-template`, and a cache name for the template must be
+ * assigned through the element's `id`, which can then be used as a directive's `templateUrl`.
+ *
+ * @param {string} type Must be set to `'text/ng-template'`.
+ * @param {string} id Cache name of the template.
+ *
+ * @example
+  <example>
+    <file name="index.html">
+      <script type="text/ng-template" id="/tpl.html">
+        Content of the template.
+      </script>
+
+      <a ng-click="currentTpl='/tpl.html'" id="tpl-link">Load inlined template</a>
+      <div id="tpl-content" ng-include src="currentTpl"></div>
+    </file>
+    <file name="protractor.js" type="protractor">
+      it('should load template defined inside script tag', function() {
+        element(by.css('#tpl-link')).click();
+        expect(element(by.css('#tpl-content')).getText()).toMatch(/Content of the template/);
+      });
+    </file>
+  </example>
+ */
+var scriptDirective = ['$templateCache', function($templateCache) {
+  return {
+    restrict: 'E',
+    terminal: true,
+    compile: function(element, attr) {
+      if (attr.type == 'text/ng-template') {
+        var templateUrl = attr.id,
+            text = element[0].text;
+
+        $templateCache.put(templateUrl, text);
+      }
+    }
+  };
+}];
+
+var noopNgModelController = { $setViewValue: noop, $render: noop };
+
+/**
+ * @ngdoc type
+ * @name  select.SelectController
+ * @description
+ * The controller for the `<select>` directive. This provides support for reading
+ * and writing the selected value(s) of the control and also coordinates dynamically
+ * added `<option>` elements, perhaps by an `ngRepeat` directive.
+ */
+var SelectController =
+        ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
+
+  var self = this,
+      optionsMap = new HashMap();
+
+  // If the ngModel doesn't get provided then provide a dummy noop version to prevent errors
+  self.ngModelCtrl = noopNgModelController;
+
+  // The "unknown" option is one that is prepended to the list if the viewValue
+  // does not match any of the options. When it is rendered the value of the unknown
+  // option is '? XXX ?' where XXX is the hashKey of the value that is not known.
+  //
+  // We can't just jqLite('<option>') since jqLite is not smart enough
+  // to create it in <select> and IE barfs otherwise.
+  self.unknownOption = jqLite(document.createElement('option'));
+  self.renderUnknownOption = function(val) {
+    var unknownVal = '? ' + hashKey(val) + ' ?';
+    self.unknownOption.val(unknownVal);
+    $element.prepend(self.unknownOption);
+    $element.val(unknownVal);
+  };
+
+  $scope.$on('$destroy', function() {
+    // disable unknown option so that we don't do work when the whole select is being destroyed
+    self.renderUnknownOption = noop;
+  });
+
+  self.removeUnknownOption = function() {
+    if (self.unknownOption.parent()) self.unknownOption.remove();
+  };
+
+
+  // Read the value of the select control, the implementation of this changes depending
+  // upon whether the select can have multiple values and whether ngOptions is at work.
+  self.readValue = function readSingleValue() {
+    self.removeUnknownOption();
+    return $element.val();
+  };
+
+
+  // Write the value to the select control, the implementation of this changes depending
+  // upon whether the select can have multiple values and whether ngOptions is at work.
+  self.writeValue = function writeSingleValue(value) {
+    if (self.hasOption(value)) {
+      self.removeUnknownOption();
+      $element.val(value);
+      if (value === '') self.emptyOption.prop('selected', true); // to make IE9 happy
+    } else {
+      if (value == null && self.emptyOption) {
+        self.removeUnknownOption();
+        $element.val('');
+      } else {
+        self.renderUnknownOption(value);
+      }
+    }
+  };
+
+
+  // Tell the select control that an option, with the given value, has been added
+  self.addOption = function(value, element) {
+    assertNotHasOwnProperty(value, '"option value"');
+    if (value === '') {
+      self.emptyOption = element;
+    }
+    var count = optionsMap.get(value) || 0;
+    optionsMap.put(value, count + 1);
+  };
+
+  // Tell the select control that an option, with the given value, has been removed
+  self.removeOption = function(value) {
+    var count = optionsMap.get(value);
+    if (count) {
+      if (count === 1) {
+        optionsMap.remove(value);
+        if (value === '') {
+          self.emptyOption = undefined;
+        }
+      } else {
+        optionsMap.put(value, count - 1);
+      }
+    }
+  };
+
+  // Check whether the select control has an option matching the given value
+  self.hasOption = function(value) {
+    return !!optionsMap.get(value);
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name select
+ * @restrict E
+ *
+ * @description
+ * HTML `SELECT` element with angular data-binding.
+ *
+ * In many cases, `ngRepeat` can be used on `<option>` elements instead of {@link ng.directive:ngOptions
+ * ngOptions} to achieve a similar result. However, `ngOptions` provides some benefits such as reducing
+ * memory and increasing speed by not creating a new scope for each repeated instance, as well as providing
+ * more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+ * comprehension expression.
+ *
+ * When an item in the `<select>` menu is selected, the array element or object property
+ * represented by the selected option will be bound to the model identified by the `ngModel`
+ * directive.
+ *
+ * If the viewValue contains a value that doesn't match any of the options then the control
+ * will automatically add an "unknown" option, which it then removes when this is resolved.
+ *
+ * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+ * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+ * option. See example below for demonstration.
+ *
+ * <div class="alert alert-info">
+ * The value of a `select` directive used without `ngOptions` is always a string.
+ * When the model needs to be bound to a non-string value, you must either explictly convert it
+ * using a directive (see example below) or use `ngOptions` to specify the set of options.
+ * This is because an option element can only be bound to string values at present.
+ * </div>
+ *
+ * ### Example (binding `select` to a non-string value)
+ *
+ * <example name="select-with-non-string-options" module="nonStringSelect">
+ *   <file name="index.html">
+ *     <select ng-model="model.id" convert-to-number>
+ *       <option value="0">Zero</option>
+ *       <option value="1">One</option>
+ *       <option value="2">Two</option>
+ *     </select>
+ *     {{ model }}
+ *   </file>
+ *   <file name="app.js">
+ *     angular.module('nonStringSelect', [])
+ *       .run(function($rootScope) {
+ *         $rootScope.model = { id: 2 };
+ *       })
+ *       .directive('convertToNumber', function() {
+ *         return {
+ *           require: 'ngModel',
+ *           link: function(scope, element, attrs, ngModel) {
+ *             ngModel.$parsers.push(function(val) {
+ *               return parseInt(val, 10);
+ *             });
+ *             ngModel.$formatters.push(function(val) {
+ *               return '' + val;
+ *             });
+ *           }
+ *         };
+ *       });
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     it('should initialize to model', function() {
+ *       var select = element(by.css('select'));
+ *       expect(element(by.model('model.id')).$('option:checked').getText()).toEqual('Two');
+ *     });
+ *   </file>
+ * </example>
+ *
+ */
+var selectDirective = function() {
+
+  return {
+    restrict: 'E',
+    require: ['select', '?ngModel'],
+    controller: SelectController,
+    link: function(scope, element, attr, ctrls) {
+
+      // if ngModel is not defined, we don't need to do anything
+      var ngModelCtrl = ctrls[1];
+      if (!ngModelCtrl) return;
+
+      var selectCtrl = ctrls[0];
+
+      selectCtrl.ngModelCtrl = ngModelCtrl;
+
+      // We delegate rendering to the `writeValue` method, which can be changed
+      // if the select can have multiple selected values or if the options are being
+      // generated by `ngOptions`
+      ngModelCtrl.$render = function() {
+        selectCtrl.writeValue(ngModelCtrl.$viewValue);
+      };
+
+      // When the selected item(s) changes we delegate getting the value of the select control
+      // to the `readValue` method, which can be changed if the select can have multiple
+      // selected values or if the options are being generated by `ngOptions`
+      element.on('change', function() {
+        scope.$apply(function() {
+          ngModelCtrl.$setViewValue(selectCtrl.readValue());
+        });
+      });
+
+      // If the select allows multiple values then we need to modify how we read and write
+      // values from and to the control; also what it means for the value to be empty and
+      // we have to add an extra watch since ngModel doesn't work well with arrays - it
+      // doesn't trigger rendering if only an item in the array changes.
+      if (attr.multiple) {
+
+        // Read value now needs to check each option to see if it is selected
+        selectCtrl.readValue = function readMultipleValue() {
+          var array = [];
+          forEach(element.find('option'), function(option) {
+            if (option.selected) {
+              array.push(option.value);
+            }
+          });
+          return array;
+        };
+
+        // Write value now needs to set the selected property of each matching option
+        selectCtrl.writeValue = function writeMultipleValue(value) {
+          var items = new HashMap(value);
+          forEach(element.find('option'), function(option) {
+            option.selected = isDefined(items.get(option.value));
+          });
+        };
+
+        // we have to do it on each watch since ngModel watches reference, but
+        // we need to work of an array, so we need to see if anything was inserted/removed
+        var lastView, lastViewRef = NaN;
+        scope.$watch(function selectMultipleWatch() {
+          if (lastViewRef === ngModelCtrl.$viewValue && !equals(lastView, ngModelCtrl.$viewValue)) {
+            lastView = shallowCopy(ngModelCtrl.$viewValue);
+            ngModelCtrl.$render();
+          }
+          lastViewRef = ngModelCtrl.$viewValue;
+        });
+
+        // If we are a multiple select then value is now a collection
+        // so the meaning of $isEmpty changes
+        ngModelCtrl.$isEmpty = function(value) {
+          return !value || value.length === 0;
+        };
+
+      }
+    }
+  };
+};
+
+
+// The option directive is purely designed to communicate the existence (or lack of)
+// of dynamically created (and destroyed) option elements to their containing select
+// directive via its controller.
+var optionDirective = ['$interpolate', function($interpolate) {
+
+  function chromeHack(optionElement) {
+    // Workaround for https://code.google.com/p/chromium/issues/detail?id=381459
+    // Adding an <option selected="selected"> element to a <select required="required"> should
+    // automatically select the new element
+    if (optionElement[0].hasAttribute('selected')) {
+      optionElement[0].selected = true;
+    }
+  }
+
+  return {
+    restrict: 'E',
+    priority: 100,
+    compile: function(element, attr) {
+
+      // If the value attribute is not defined then we fall back to the
+      // text content of the option element, which may be interpolated
+      if (isUndefined(attr.value)) {
+        var interpolateFn = $interpolate(element.text(), true);
+        if (!interpolateFn) {
+          attr.$set('value', element.text());
+        }
+      }
+
+      return function(scope, element, attr) {
+
+        // This is an optimization over using ^^ since we don't want to have to search
+        // all the way to the root of the DOM for every single option element
+        var selectCtrlName = '$selectController',
+            parent = element.parent(),
+            selectCtrl = parent.data(selectCtrlName) ||
+              parent.parent().data(selectCtrlName); // in case we are in optgroup
+
+        // Only update trigger option updates if this is an option within a `select`
+        // that also has `ngModel` attached
+        if (selectCtrl && selectCtrl.ngModelCtrl) {
+
+          if (interpolateFn) {
+            scope.$watch(interpolateFn, function interpolateWatchAction(newVal, oldVal) {
+              attr.$set('value', newVal);
+              if (oldVal !== newVal) {
+                selectCtrl.removeOption(oldVal);
+              }
+              selectCtrl.addOption(newVal, element);
+              selectCtrl.ngModelCtrl.$render();
+              chromeHack(element);
+            });
+          } else {
+            selectCtrl.addOption(attr.value, element);
+            selectCtrl.ngModelCtrl.$render();
+            chromeHack(element);
+          }
+
+          element.on('$destroy', function() {
+            selectCtrl.removeOption(attr.value);
+            selectCtrl.ngModelCtrl.$render();
+          });
+        }
+      };
+    }
+  };
+}];
+
+var styleDirective = valueFn({
+  restrict: 'E',
+  terminal: false
+});
+
+var requiredDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+      attr.required = true; // force truthy in case we are on non input element
+
+      ctrl.$validators.required = function(modelValue, viewValue) {
+        return !attr.required || !ctrl.$isEmpty(viewValue);
+      };
+
+      attr.$observe('required', function() {
+        ctrl.$validate();
+      });
+    }
+  };
+};
+
+
+var patternDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+
+      var regexp, patternExp = attr.ngPattern || attr.pattern;
+      attr.$observe('pattern', function(regex) {
+        if (isString(regex) && regex.length > 0) {
+          regex = new RegExp('^' + regex + '$');
+        }
+
+        if (regex && !regex.test) {
+          throw minErr('ngPattern')('noregexp',
+            'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp,
+            regex, startingTag(elm));
+        }
+
+        regexp = regex || undefined;
+        ctrl.$validate();
+      });
+
+      ctrl.$validators.pattern = function(value) {
+        return ctrl.$isEmpty(value) || isUndefined(regexp) || regexp.test(value);
+      };
+    }
+  };
+};
+
+
+var maxlengthDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+
+      var maxlength = -1;
+      attr.$observe('maxlength', function(value) {
+        var intVal = toInt(value);
+        maxlength = isNaN(intVal) ? -1 : intVal;
+        ctrl.$validate();
+      });
+      ctrl.$validators.maxlength = function(modelValue, viewValue) {
+        return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength);
+      };
+    }
+  };
+};
+
+var minlengthDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+
+      var minlength = 0;
+      attr.$observe('minlength', function(value) {
+        minlength = toInt(value) || 0;
+        ctrl.$validate();
+      });
+      ctrl.$validators.minlength = function(modelValue, viewValue) {
+        return ctrl.$isEmpty(viewValue) || viewValue.length >= minlength;
+      };
+    }
+  };
+};
+
+  if (window.angular.bootstrap) {
+    //AngularJS is already loaded, so we can return here...
+    console.log('WARNING: Tried to load angular more than once.');
+    return;
+  }
+
+  //try to bind to jquery now so that one can write jqLite(document).ready()
+  //but we will rebind on bootstrap again.
+  bindJQuery();
+
+  publishExternalAPI(angular);
+
+  jqLite(document).ready(function() {
+    angularInit(document, bootstrap);
+  });
+
+})(window, document);
+
+!window.angular.$$csp() && window.angular.element(document).find('head').prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/angular/angular.min.js b/turtles/app/lib/bower_components/angular/angular.min.js
new file mode 100644
index 000000000..1fefca2bf
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/angular.min.js
@@ -0,0 +1,289 @@
+/*
+ AngularJS v1.4.0
+ (c) 2010-2015 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(N,W,u){'use strict';function F(b){return function(){var a=arguments[0],c;c="["+(b?b+":":"")+a+"] http://errors.angularjs.org/1.4.0/"+(b?b+"/":"")+a;for(a=1;a<arguments.length;a++){c=c+(1==a?"?":"&")+"p"+(a-1)+"=";var d=encodeURIComponent,e;e=arguments[a];e="function"==typeof e?e.toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof e?"undefined":"string"!=typeof e?JSON.stringify(e):e;c+=d(e)}return Error(c)}}function Da(b){if(null==b||Ta(b))return!1;var a="length"in Object(b)&&b.length;
+return b.nodeType===pa&&a?!0:L(b)||K(b)||0===a||"number"===typeof a&&0<a&&a-1 in b}function n(b,a,c){var d,e;if(b)if(G(b))for(d in b)"prototype"==d||"length"==d||"name"==d||b.hasOwnProperty&&!b.hasOwnProperty(d)||a.call(c,b[d],d,b);else if(K(b)||Da(b)){var f="object"!==typeof b;d=0;for(e=b.length;d<e;d++)(f||d in b)&&a.call(c,b[d],d,b)}else if(b.forEach&&b.forEach!==n)b.forEach(a,c,b);else if(nc(b))for(d in b)a.call(c,b[d],d,b);else if("function"===typeof b.hasOwnProperty)for(d in b)b.hasOwnProperty(d)&&
+a.call(c,b[d],d,b);else for(d in b)kb.call(b,d)&&a.call(c,b[d],d,b);return b}function oc(b,a,c){for(var d=Object.keys(b).sort(),e=0;e<d.length;e++)a.call(c,b[d[e]],d[e]);return d}function pc(b){return function(a,c){b(c,a)}}function Td(){return++lb}function qc(b,a){a?b.$$hashKey=a:delete b.$$hashKey}function Nb(b,a,c){for(var d=b.$$hashKey,e=0,f=a.length;e<f;++e){var g=a[e];if(C(g)||G(g))for(var h=Object.keys(g),l=0,k=h.length;l<k;l++){var m=h[l],r=g[m];c&&C(r)?(C(b[m])||(b[m]=K(r)?[]:{}),Nb(b[m],
+[r],!0)):b[m]=r}}qc(b,d);return b}function Q(b){return Nb(b,ra.call(arguments,1),!1)}function Ud(b){return Nb(b,ra.call(arguments,1),!0)}function Y(b){return parseInt(b,10)}function Ob(b,a){return Q(Object.create(b),a)}function w(){}function Ua(b){return b}function qa(b){return function(){return b}}function v(b){return"undefined"===typeof b}function y(b){return"undefined"!==typeof b}function C(b){return null!==b&&"object"===typeof b}function nc(b){return null!==b&&"object"===typeof b&&!rc(b)}function L(b){return"string"===
+typeof b}function V(b){return"number"===typeof b}function da(b){return"[object Date]"===sa.call(b)}function G(b){return"function"===typeof b}function Va(b){return"[object RegExp]"===sa.call(b)}function Ta(b){return b&&b.window===b}function Wa(b){return b&&b.$evalAsync&&b.$watch}function Xa(b){return"boolean"===typeof b}function sc(b){return!(!b||!(b.nodeName||b.prop&&b.attr&&b.find))}function Vd(b){var a={};b=b.split(",");var c;for(c=0;c<b.length;c++)a[b[c]]=!0;return a}function ta(b){return E(b.nodeName||
+b[0]&&b[0].nodeName)}function Ya(b,a){var c=b.indexOf(a);0<=c&&b.splice(c,1);return c}function ua(b,a,c,d){function e(a,b,c,d,e){var f=ua(b,null,d,e);C(b)&&(d.push(b),e.push(f));c[a]=f}if(Ta(b)||Wa(b))throw Ea("cpws");if(tc.test(sa.call(a)))throw Ea("cpta");if(a){if(b===a)throw Ea("cpi");c=c||[];d=d||[];if(C(b)){var f=c.indexOf(b);if(-1!==f)return d[f];c.push(b);d.push(a)}var g;if(K(b))for(f=a.length=0;f<b.length;f++)g=ua(b[f],null,c,d),C(b[f])&&(c.push(b[f]),d.push(g)),a.push(g);else{f=a.$$hashKey;
+K(a)?a.length=0:n(a,function(b,c){delete a[c]});if(nc(b))for(g in b)e(g,b[g],a,c,d);else if(b&&"function"===typeof b.hasOwnProperty)for(g in b)b.hasOwnProperty(g)&&e(g,b[g],a,c,d);else for(g in b)kb.call(b,g)&&e(g,b[g],a,c,d);qc(a,f)}}else if(a=b)K(b)?a=ua(b,[],c,d):tc.test(sa.call(b))?a=new b.constructor(b):da(b)?a=new Date(b.getTime()):Va(b)?(a=new RegExp(b.source,b.toString().match(/[^\/]*$/)[0]),a.lastIndex=b.lastIndex):C(b)&&(g=Object.create(rc(b)),a=ua(b,g,c,d));return a}function fa(b,a){if(K(b)){a=
+a||[];for(var c=0,d=b.length;c<d;c++)a[c]=b[c]}else if(C(b))for(c in a=a||{},b)if("$"!==c.charAt(0)||"$"!==c.charAt(1))a[c]=b[c];return a||b}function ka(b,a){if(b===a)return!0;if(null===b||null===a)return!1;if(b!==b&&a!==a)return!0;var c=typeof b,d;if(c==typeof a&&"object"==c)if(K(b)){if(!K(a))return!1;if((c=b.length)==a.length){for(d=0;d<c;d++)if(!ka(b[d],a[d]))return!1;return!0}}else{if(da(b))return da(a)?ka(b.getTime(),a.getTime()):!1;if(Va(b))return Va(a)?b.toString()==a.toString():!1;if(Wa(b)||
+Wa(a)||Ta(b)||Ta(a)||K(a)||da(a)||Va(a))return!1;c=ga();for(d in b)if("$"!==d.charAt(0)&&!G(b[d])){if(!ka(b[d],a[d]))return!1;c[d]=!0}for(d in a)if(!(d in c||"$"===d.charAt(0)||a[d]===u||G(a[d])))return!1;return!0}return!1}function Za(b,a,c){return b.concat(ra.call(a,c))}function uc(b,a){var c=2<arguments.length?ra.call(arguments,2):[];return!G(a)||a instanceof RegExp?a:c.length?function(){return arguments.length?a.apply(b,Za(c,arguments,0)):a.apply(b,c)}:function(){return arguments.length?a.apply(b,
+arguments):a.call(b)}}function Wd(b,a){var c=a;"string"===typeof b&&"$"===b.charAt(0)&&"$"===b.charAt(1)?c=u:Ta(a)?c="$WINDOW":a&&W===a?c="$DOCUMENT":Wa(a)&&(c="$SCOPE");return c}function $a(b,a){if("undefined"===typeof b)return u;V(a)||(a=a?2:null);return JSON.stringify(b,Wd,a)}function vc(b){return L(b)?JSON.parse(b):b}function wc(b,a){var c=Date.parse("Jan 01, 1970 00:00:00 "+b)/6E4;return isNaN(c)?a:c}function Pb(b,a,c){c=c?-1:1;var d=wc(a,b.getTimezoneOffset());a=b;b=c*(d-b.getTimezoneOffset());
+a=new Date(a.getTime());a.setMinutes(a.getMinutes()+b);return a}function va(b){b=z(b).clone();try{b.empty()}catch(a){}var c=z("<div>").append(b).html();try{return b[0].nodeType===ab?E(c):c.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(a,b){return"<"+E(b)})}catch(d){return E(c)}}function xc(b){try{return decodeURIComponent(b)}catch(a){}}function yc(b){var a={},c,d;n((b||"").split("&"),function(b){b&&(c=b.replace(/\+/g,"%20").split("="),d=xc(c[0]),y(d)&&(b=y(c[1])?xc(c[1]):!0,kb.call(a,d)?K(a[d])?
+a[d].push(b):a[d]=[a[d],b]:a[d]=b))});return a}function Qb(b){var a=[];n(b,function(b,d){K(b)?n(b,function(b){a.push(ia(d,!0)+(!0===b?"":"="+ia(b,!0)))}):a.push(ia(d,!0)+(!0===b?"":"="+ia(b,!0)))});return a.length?a.join("&"):""}function mb(b){return ia(b,!0).replace(/%26/gi,"&").replace(/%3D/gi,"=").replace(/%2B/gi,"+")}function ia(b,a){return encodeURIComponent(b).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,a?"%20":"+")}
+function Xd(b,a){var c,d,e=Na.length;for(d=0;d<e;++d)if(c=Na[d]+a,L(c=b.getAttribute(c)))return c;return null}function Yd(b,a){var c,d,e={};n(Na,function(a){a+="app";!c&&b.hasAttribute&&b.hasAttribute(a)&&(c=b,d=b.getAttribute(a))});n(Na,function(a){a+="app";var e;!c&&(e=b.querySelector("["+a.replace(":","\\:")+"]"))&&(c=e,d=e.getAttribute(a))});c&&(e.strictDi=null!==Xd(c,"strict-di"),a(c,d?[d]:[],e))}function zc(b,a,c){C(c)||(c={});c=Q({strictDi:!1},c);var d=function(){b=z(b);if(b.injector()){var d=
+b[0]===W?"document":va(b);throw Ea("btstrpd",d.replace(/</,"&lt;").replace(/>/,"&gt;"));}a=a||[];a.unshift(["$provide",function(a){a.value("$rootElement",b)}]);c.debugInfoEnabled&&a.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);a.unshift("ng");d=bb(a,c.strictDi);d.invoke(["$rootScope","$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return d},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;N&&e.test(N.name)&&(c.debugInfoEnabled=
+!0,N.name=N.name.replace(e,""));if(N&&!f.test(N.name))return d();N.name=N.name.replace(f,"");aa.resumeBootstrap=function(b){n(b,function(b){a.push(b)});return d()};G(aa.resumeDeferredBootstrap)&&aa.resumeDeferredBootstrap()}function Zd(){N.name="NG_ENABLE_DEBUG_INFO!"+N.name;N.location.reload()}function $d(b){b=aa.element(b).injector();if(!b)throw Ea("test");return b.get("$$testability")}function Ac(b,a){a=a||"_";return b.replace(ae,function(b,d){return(d?a:"")+b.toLowerCase()})}function be(){var b;
+if(!Bc){var a=nb();la=N.jQuery;y(a)&&(la=null===a?u:N[a]);la&&la.fn.on?(z=la,Q(la.fn,{scope:Oa.scope,isolateScope:Oa.isolateScope,controller:Oa.controller,injector:Oa.injector,inheritedData:Oa.inheritedData}),b=la.cleanData,la.cleanData=function(a){var d;if(Rb)Rb=!1;else for(var e=0,f;null!=(f=a[e]);e++)(d=la._data(f,"events"))&&d.$destroy&&la(f).triggerHandler("$destroy");b(a)}):z=R;aa.element=z;Bc=!0}}function Sb(b,a,c){if(!b)throw Ea("areq",a||"?",c||"required");return b}function Pa(b,a,c){c&&
+K(b)&&(b=b[b.length-1]);Sb(G(b),a,"not a function, got "+(b&&"object"===typeof b?b.constructor.name||"Object":typeof b));return b}function Qa(b,a){if("hasOwnProperty"===b)throw Ea("badname",a);}function Cc(b,a,c){if(!a)return b;a=a.split(".");for(var d,e=b,f=a.length,g=0;g<f;g++)d=a[g],b&&(b=(e=b)[d]);return!c&&G(b)?uc(e,b):b}function ob(b){var a=b[0];b=b[b.length-1];var c=[a];do{a=a.nextSibling;if(!a)break;c.push(a)}while(a!==b);return z(c)}function ga(){return Object.create(null)}function ce(b){function a(a,
+b,c){return a[b]||(a[b]=c())}var c=F("$injector"),d=F("ng");b=a(b,"angular",Object);b.$$minErr=b.$$minErr||F;return a(b,"module",function(){var b={};return function(f,g,h){if("hasOwnProperty"===f)throw d("badname","module");g&&b.hasOwnProperty(f)&&(b[f]=null);return a(b,f,function(){function a(c,d,e,f){f||(f=b);return function(){f[e||"push"]([c,d,arguments]);return A}}if(!g)throw c("nomod",f);var b=[],d=[],e=[],s=a("$injector","invoke","push",d),A={_invokeQueue:b,_configBlocks:d,_runBlocks:e,requires:g,
+name:f,provider:a("$provide","provider"),factory:a("$provide","factory"),service:a("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),decorator:a("$provide","decorator"),animation:a("$animateProvider","register"),filter:a("$filterProvider","register"),controller:a("$controllerProvider","register"),directive:a("$compileProvider","directive"),config:s,run:function(a){e.push(a);return this}};h&&s(h);return A})}})}function de(b){Q(b,{bootstrap:zc,copy:ua,extend:Q,
+merge:Ud,equals:ka,element:z,forEach:n,injector:bb,noop:w,bind:uc,toJson:$a,fromJson:vc,identity:Ua,isUndefined:v,isDefined:y,isString:L,isFunction:G,isObject:C,isNumber:V,isElement:sc,isArray:K,version:ee,isDate:da,lowercase:E,uppercase:pb,callbacks:{counter:0},getTestability:$d,$$minErr:F,$$csp:cb,reloadWithDebugInfo:Zd});db=ce(N);try{db("ngLocale")}catch(a){db("ngLocale",[]).provider("$locale",fe)}db("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:ge});a.provider("$compile",
+Dc).directive({a:he,input:Ec,textarea:Ec,form:ie,script:je,select:ke,style:le,option:me,ngBind:ne,ngBindHtml:oe,ngBindTemplate:pe,ngClass:qe,ngClassEven:re,ngClassOdd:se,ngCloak:te,ngController:ue,ngForm:ve,ngHide:we,ngIf:xe,ngInclude:ye,ngInit:ze,ngNonBindable:Ae,ngPluralize:Be,ngRepeat:Ce,ngShow:De,ngStyle:Ee,ngSwitch:Fe,ngSwitchWhen:Ge,ngSwitchDefault:He,ngOptions:Ie,ngTransclude:Je,ngModel:Ke,ngList:Le,ngChange:Me,pattern:Fc,ngPattern:Fc,required:Gc,ngRequired:Gc,minlength:Hc,ngMinlength:Hc,maxlength:Ic,
+ngMaxlength:Ic,ngValue:Ne,ngModelOptions:Oe}).directive({ngInclude:Pe}).directive(qb).directive(Jc);a.provider({$anchorScroll:Qe,$animate:Re,$$animateQueue:Se,$$AnimateRunner:Te,$browser:Ue,$cacheFactory:Ve,$controller:We,$document:Xe,$exceptionHandler:Ye,$filter:Kc,$interpolate:Ze,$interval:$e,$http:af,$httpParamSerializer:bf,$httpParamSerializerJQLike:cf,$httpBackend:df,$location:ef,$log:ff,$parse:gf,$rootScope:hf,$q:jf,$$q:kf,$sce:lf,$sceDelegate:mf,$sniffer:nf,$templateCache:of,$templateRequest:pf,
+$$testability:qf,$timeout:rf,$window:sf,$$rAF:tf,$$asyncCallback:uf,$$jqLite:vf,$$HashMap:wf,$$cookieReader:xf})}])}function eb(b){return b.replace(yf,function(a,b,d,e){return e?d.toUpperCase():d}).replace(zf,"Moz$1")}function Lc(b){b=b.nodeType;return b===pa||!b||9===b}function Mc(b,a){var c,d,e=a.createDocumentFragment(),f=[];if(Tb.test(b)){c=c||e.appendChild(a.createElement("div"));d=(Af.exec(b)||["",""])[1].toLowerCase();d=ma[d]||ma._default;c.innerHTML=d[1]+b.replace(Bf,"<$1></$2>")+d[2];for(d=
+d[0];d--;)c=c.lastChild;f=Za(f,c.childNodes);c=e.firstChild;c.textContent=""}else f.push(a.createTextNode(b));e.textContent="";e.innerHTML="";n(f,function(a){e.appendChild(a)});return e}function R(b){if(b instanceof R)return b;var a;L(b)&&(b=T(b),a=!0);if(!(this instanceof R)){if(a&&"<"!=b.charAt(0))throw Ub("nosel");return new R(b)}if(a){a=W;var c;b=(c=Cf.exec(b))?[a.createElement(c[1])]:(c=Mc(b,a))?c.childNodes:[]}Nc(this,b)}function Vb(b){return b.cloneNode(!0)}function rb(b,a){a||sb(b);if(b.querySelectorAll)for(var c=
+b.querySelectorAll("*"),d=0,e=c.length;d<e;d++)sb(c[d])}function Oc(b,a,c,d){if(y(d))throw Ub("offargs");var e=(d=tb(b))&&d.events,f=d&&d.handle;if(f)if(a)n(a.split(" "),function(a){if(y(c)){var d=e[a];Ya(d||[],c);if(d&&0<d.length)return}b.removeEventListener(a,f,!1);delete e[a]});else for(a in e)"$destroy"!==a&&b.removeEventListener(a,f,!1),delete e[a]}function sb(b,a){var c=b.ng339,d=c&&ub[c];d&&(a?delete d.data[a]:(d.handle&&(d.events.$destroy&&d.handle({},"$destroy"),Oc(b)),delete ub[c],b.ng339=
+u))}function tb(b,a){var c=b.ng339,c=c&&ub[c];a&&!c&&(b.ng339=c=++Df,c=ub[c]={events:{},data:{},handle:u});return c}function Wb(b,a,c){if(Lc(b)){var d=y(c),e=!d&&a&&!C(a),f=!a;b=(b=tb(b,!e))&&b.data;if(d)b[a]=c;else{if(f)return b;if(e)return b&&b[a];Q(b,a)}}}function vb(b,a){return b.getAttribute?-1<(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+a+" "):!1}function wb(b,a){a&&b.setAttribute&&n(a.split(" "),function(a){b.setAttribute("class",T((" "+(b.getAttribute("class")||
+"")+" ").replace(/[\n\t]/g," ").replace(" "+T(a)+" "," ")))})}function xb(b,a){if(a&&b.setAttribute){var c=(" "+(b.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ");n(a.split(" "),function(a){a=T(a);-1===c.indexOf(" "+a+" ")&&(c+=a+" ")});b.setAttribute("class",T(c))}}function Nc(b,a){if(a)if(a.nodeType)b[b.length++]=a;else{var c=a.length;if("number"===typeof c&&a.window!==a){if(c)for(var d=0;d<c;d++)b[b.length++]=a[d]}else b[b.length++]=a}}function Pc(b,a){return yb(b,"$"+(a||"ngController")+
+"Controller")}function yb(b,a,c){9==b.nodeType&&(b=b.documentElement);for(a=K(a)?a:[a];b;){for(var d=0,e=a.length;d<e;d++)if((c=z.data(b,a[d]))!==u)return c;b=b.parentNode||11===b.nodeType&&b.host}}function Qc(b){for(rb(b,!0);b.firstChild;)b.removeChild(b.firstChild)}function Xb(b,a){a||rb(b);var c=b.parentNode;c&&c.removeChild(b)}function Ef(b,a){a=a||N;if("complete"===a.document.readyState)a.setTimeout(b);else z(a).on("load",b)}function Rc(b,a){var c=zb[a.toLowerCase()];return c&&Sc[ta(b)]&&c}function Ff(b,
+a){var c=b.nodeName;return("INPUT"===c||"TEXTAREA"===c)&&Tc[a]}function Gf(b,a){var c=function(c,e){c.isDefaultPrevented=function(){return c.defaultPrevented};var f=a[e||c.type],g=f?f.length:0;if(g){if(v(c.immediatePropagationStopped)){var h=c.stopImmediatePropagation;c.stopImmediatePropagation=function(){c.immediatePropagationStopped=!0;c.stopPropagation&&c.stopPropagation();h&&h.call(c)}}c.isImmediatePropagationStopped=function(){return!0===c.immediatePropagationStopped};1<g&&(f=fa(f));for(var l=
+0;l<g;l++)c.isImmediatePropagationStopped()||f[l].call(b,c)}};c.elem=b;return c}function vf(){this.$get=function(){return Q(R,{hasClass:function(b,a){b.attr&&(b=b[0]);return vb(b,a)},addClass:function(b,a){b.attr&&(b=b[0]);return xb(b,a)},removeClass:function(b,a){b.attr&&(b=b[0]);return wb(b,a)}})}}function Fa(b,a){var c=b&&b.$$hashKey;if(c)return"function"===typeof c&&(c=b.$$hashKey()),c;c=typeof b;return c="function"==c||"object"==c&&null!==b?b.$$hashKey=c+":"+(a||Td)():c+":"+b}function Ra(b,a){if(a){var c=
+0;this.nextUid=function(){return++c}}n(b,this.put,this)}function Hf(b){return(b=b.toString().replace(Uc,"").match(Vc))?"function("+(b[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function bb(b,a){function c(a){return function(b,c){if(C(b))n(b,pc(a));else return a(b,c)}}function d(a,b){Qa(a,"service");if(G(b)||K(b))b=s.instantiate(b);if(!b.$get)throw Ga("pget",a);return r[a+"Provider"]=b}function e(a,b){return function(){var c=H.invoke(b,this);if(v(c))throw Ga("undef",a);return c}}function f(a,b,c){return d(a,
+{$get:!1!==c?e(a,b):b})}function g(a){var b=[],c;n(a,function(a){function d(a){var b,c;b=0;for(c=a.length;b<c;b++){var e=a[b],f=s.get(e[0]);f[e[1]].apply(f,e[2])}}if(!m.get(a)){m.put(a,!0);try{L(a)?(c=db(a),b=b.concat(g(c.requires)).concat(c._runBlocks),d(c._invokeQueue),d(c._configBlocks)):G(a)?b.push(s.invoke(a)):K(a)?b.push(s.invoke(a)):Pa(a,"module")}catch(e){throw K(a)&&(a=a[a.length-1]),e.message&&e.stack&&-1==e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),Ga("modulerr",a,e.stack||e.message||
+e);}}});return b}function h(b,c){function d(a,e){if(b.hasOwnProperty(a)){if(b[a]===l)throw Ga("cdep",a+" <- "+k.join(" <- "));return b[a]}try{return k.unshift(a),b[a]=l,b[a]=c(a,e)}catch(f){throw b[a]===l&&delete b[a],f;}finally{k.shift()}}function e(b,c,f,g){"string"===typeof f&&(g=f,f=null);var h=[],k=bb.$$annotate(b,a,g),l,s,m;s=0;for(l=k.length;s<l;s++){m=k[s];if("string"!==typeof m)throw Ga("itkn",m);h.push(f&&f.hasOwnProperty(m)?f[m]:d(m,g))}K(b)&&(b=b[l]);return b.apply(c,h)}return{invoke:e,
+instantiate:function(a,b,c){var d=Object.create((K(a)?a[a.length-1]:a).prototype||null);a=e(a,d,b,c);return C(a)||G(a)?a:d},get:d,annotate:bb.$$annotate,has:function(a){return r.hasOwnProperty(a+"Provider")||b.hasOwnProperty(a)}}}a=!0===a;var l={},k=[],m=new Ra([],!0),r={$provide:{provider:c(d),factory:c(f),service:c(function(a,b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:c(function(a,b){return f(a,qa(b),!1)}),constant:c(function(a,b){Qa(a,"constant");r[a]=b;A[a]=b}),
+decorator:function(a,b){var c=s.get(a+"Provider"),d=c.$get;c.$get=function(){var a=H.invoke(d,c);return H.invoke(b,null,{$delegate:a})}}}},s=r.$injector=h(r,function(a,b){aa.isString(b)&&k.push(b);throw Ga("unpr",k.join(" <- "));}),A={},H=A.$injector=h(A,function(a,b){var c=s.get(a+"Provider",b);return H.invoke(c.$get,c,u,a)});n(g(b),function(a){H.invoke(a||w)});return H}function Qe(){var b=!0;this.disableAutoScrolling=function(){b=!1};this.$get=["$window","$location","$rootScope",function(a,c,d){function e(a){var b=
+null;Array.prototype.some.call(a,function(a){if("a"===ta(a))return b=a,!0});return b}function f(b){if(b){b.scrollIntoView();var c;c=g.yOffset;G(c)?c=c():sc(c)?(c=c[0],c="fixed"!==a.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):V(c)||(c=0);c&&(b=b.getBoundingClientRect().top,a.scrollBy(0,b-c))}else a.scrollTo(0,0)}function g(a){a=L(a)?a:c.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&f(null):f(null)}var h=a.document;b&&d.$watch(function(){return c.hash()},
+function(a,b){a===b&&""===a||Ef(function(){d.$evalAsync(g)})});return g}]}function fb(b,a){if(!b&&!a)return"";if(!b)return a;if(!a)return b;K(b)&&(b=b.join(" "));K(a)&&(a=a.join(" "));return b+" "+a}function If(b){L(b)&&(b=b.split(" "));var a=ga();n(b,function(b){b.length&&(a[b]=!0)});return a}function Ha(b){return C(b)?b:{}}function uf(){this.$get=["$$rAF","$timeout",function(b,a){return b.supported?function(a){return b(a)}:function(b){return a(b,0,!1)}}]}function Jf(b,a,c,d){function e(a){try{a.apply(null,
+ra.call(arguments,1))}finally{if(H--,0===H)for(;M.length;)try{M.pop()()}catch(b){c.error(b)}}}function f(){g();h()}function g(){a:{try{t=m.state;break a}catch(a){}t=void 0}t=v(t)?null:t;ka(t,D)&&(t=D);D=t}function h(){if(x!==l.url()||p!==t)x=l.url(),p=t,n(B,function(a){a(l.url(),t)})}var l=this,k=b.location,m=b.history,r=b.setTimeout,s=b.clearTimeout,A={};l.isMock=!1;var H=0,M=[];l.$$completeOutstandingRequest=e;l.$$incOutstandingRequestCount=function(){H++};l.notifyWhenNoOutstandingRequests=function(a){0===
+H?a():M.push(a)};var t,p,x=k.href,q=a.find("base"),I=null;g();p=t;l.url=function(a,c,e){v(e)&&(e=null);k!==b.location&&(k=b.location);m!==b.history&&(m=b.history);if(a){var f=p===e;if(x===a&&(!d.history||f))return l;var h=x&&Ia(x)===Ia(a);x=a;p=e;!d.history||h&&f?(h||(I=a),c?k.replace(a):h?(c=k,e=a.indexOf("#"),a=-1===e?"":a.substr(e+1),c.hash=a):k.href=a):(m[c?"replaceState":"pushState"](e,"",a),g(),p=t);return l}return I||k.href.replace(/%27/g,"'")};l.state=function(){return t};var B=[],O=!1,D=
+null;l.onUrlChange=function(a){if(!O){if(d.history)z(b).on("popstate",f);z(b).on("hashchange",f);O=!0}B.push(a);return a};l.$$applicationDestroyed=function(){z(b).off("hashchange popstate",f)};l.$$checkUrlChange=h;l.baseHref=function(){var a=q.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};l.defer=function(a,b){var c;H++;c=r(function(){delete A[c];e(a)},b||0);A[c]=!0;return c};l.defer.cancel=function(a){return A[a]?(delete A[a],s(a),e(w),!0):!1}}function Ue(){this.$get=["$window",
+"$log","$sniffer","$document",function(b,a,c,d){return new Jf(b,d,a,c)}]}function Ve(){this.$get=function(){function b(b,d){function e(a){a!=r&&(s?s==a&&(s=a.n):s=a,f(a.n,a.p),f(a,r),r=a,r.n=null)}function f(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(b in a)throw F("$cacheFactory")("iid",b);var g=0,h=Q({},d,{id:b}),l={},k=d&&d.capacity||Number.MAX_VALUE,m={},r=null,s=null;return a[b]={put:function(a,b){if(!v(b)){if(k<Number.MAX_VALUE){var c=m[a]||(m[a]={key:a});e(c)}a in l||g++;l[a]=b;g>k&&this.remove(s.key);
+return b}},get:function(a){if(k<Number.MAX_VALUE){var b=m[a];if(!b)return;e(b)}return l[a]},remove:function(a){if(k<Number.MAX_VALUE){var b=m[a];if(!b)return;b==r&&(r=b.p);b==s&&(s=b.n);f(b.n,b.p);delete m[a]}delete l[a];g--},removeAll:function(){l={};g=0;m={};r=s=null},destroy:function(){m=h=l=null;delete a[b]},info:function(){return Q({},h,{size:g})}}}var a={};b.info=function(){var b={};n(a,function(a,e){b[e]=a.info()});return b};b.get=function(b){return a[b]};return b}}function of(){this.$get=
+["$cacheFactory",function(b){return b("templates")}]}function Dc(b,a){function c(a,b,c){var d=/^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/,e={};n(a,function(a,f){var g=a.match(d);if(!g)throw ea("iscp",b,f,a,c?"controller bindings definition":"isolate scope definition");e[f]={mode:g[1][0],collection:"*"===g[2],optional:"?"===g[3],attrName:g[4]||f}});return e}function d(a){var b=a.charAt(0);if(!b||b!==E(b))throw ea("baddir",a);if(a!==a.trim())throw ea("baddir",a);}var e={},f=/^\s*directive\:\s*([\w\-]+)\s+(.*)$/,
+g=/(([\w\-]+)(?:\:([^;]+))?;?)/,h=Vd("ngSrc,ngSrcset,src,srcset"),l=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,k=/^(on[a-z]+|formaction)$/;this.directive=function s(a,f){Qa(a,"directive");L(a)?(d(a),Sb(f,"directiveFactory"),e.hasOwnProperty(a)||(e[a]=[],b.factory(a+"Directive",["$injector","$exceptionHandler",function(b,d){var f=[];n(e[a],function(e,g){try{var h=b.invoke(e);G(h)?h={compile:qa(h)}:!h.compile&&h.link&&(h.compile=qa(h.link));h.priority=h.priority||0;h.index=g;h.name=h.name||a;h.require=h.require||
+h.controller&&h.name;h.restrict=h.restrict||"EA";var k=h,l=h,s=h.name,m={isolateScope:null,bindToController:null};C(l.scope)&&(!0===l.bindToController?(m.bindToController=c(l.scope,s,!0),m.isolateScope={}):m.isolateScope=c(l.scope,s,!1));C(l.bindToController)&&(m.bindToController=c(l.bindToController,s,!0));if(C(m.bindToController)){var H=l.controller,ba=l.controllerAs;if(!H)throw ea("noctrl",s);var ha;a:if(ba&&L(ba))ha=ba;else{if(L(H)){var n=Wc.exec(H);if(n){ha=n[3];break a}}ha=void 0}if(!ha)throw ea("noident",
+s);}var q=k.$$bindings=m;C(q.isolateScope)&&(h.$$isolateBindings=q.isolateScope);f.push(h)}catch(u){d(u)}});return f}])),e[a].push(f)):n(a,pc(s));return this};this.aHrefSanitizationWhitelist=function(b){return y(b)?(a.aHrefSanitizationWhitelist(b),this):a.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(b){return y(b)?(a.imgSrcSanitizationWhitelist(b),this):a.imgSrcSanitizationWhitelist()};var m=!0;this.debugInfoEnabled=function(a){return y(a)?(m=a,this):m};this.$get=["$injector",
+"$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$document","$sce","$animate","$$sanitizeUri",function(a,b,c,d,t,p,x,q,I,B,O){function D(a,b){try{a.addClass(b)}catch(c){}}function S(a,b,c,d,e){a instanceof z||(a=z(a));n(a,function(b,c){b.nodeType==ab&&b.nodeValue.match(/\S+/)&&(a[c]=z(b).wrap("<span></span>").parent()[0])});var f=P(a,b,a,c,d,e);S.$$addScopeClass(a);var g=null;return function(b,c,d){Sb(b,"scope");d=d||{};var e=d.parentBoundTranscludeFn,h=d.transcludeControllers;
+d=d.futureParentElement;e&&e.$$boundTransclude&&(e=e.$$boundTransclude);g||(g=(d=d&&d[0])?"foreignobject"!==ta(d)&&d.toString().match(/SVG/)?"svg":"html":"html");d="html"!==g?z(Yb(g,z("<div>").append(a).html())):c?Oa.clone.call(a):a;if(h)for(var l in h)d.data("$"+l+"Controller",h[l].instance);S.$$addScopeInfo(d,b);c&&c(d,b);f&&f(b,d,d,e);return d}}function P(a,b,c,d,e,f){function g(a,c,d,e){var f,l,k,m,s,B,A;if(p)for(A=Array(c.length),m=0;m<h.length;m+=3)f=h[m],A[f]=c[f];else A=c;m=0;for(s=h.length;m<
+s;)if(l=A[h[m++]],c=h[m++],f=h[m++],c){if(c.scope){if(k=a.$new(),S.$$addScopeInfo(z(l),k),B=c.$$destroyBindings)c.$$destroyBindings=null,k.$on("$destroyed",B)}else k=a;B=c.transcludeOnThisElement?ba(a,c.transclude,e,c.elementTranscludeOnThisElement):!c.templateOnThisElement&&e?e:!e&&b?ba(a,b):null;c(f,k,l,d,B,c)}else f&&f(a,l.childNodes,u,e)}for(var h=[],l,k,m,s,p,B=0;B<a.length;B++){l=new aa;k=ha(a[B],[],l,0===B?d:u,e);(f=k.length?J(k,a[B],l,b,c,null,[],[],f):null)&&f.scope&&S.$$addScopeClass(l.$$element);
+l=f&&f.terminal||!(m=a[B].childNodes)||!m.length?null:P(m,f?(f.transcludeOnThisElement||!f.templateOnThisElement)&&f.transclude:b);if(f||l)h.push(B,f,l),s=!0,p=p||f;f=null}return s?g:null}function ba(a,b,c,d){return function(d,e,f,g,h){d||(d=a.$new(!1,h),d.$$transcluded=!0);return b(d,e,{parentBoundTranscludeFn:c,transcludeControllers:f,futureParentElement:g})}}function ha(a,b,c,d,e){var h=c.$attr,l;switch(a.nodeType){case pa:v(b,xa(ta(a)),"E",d,e);for(var k,m,s,p=a.attributes,B=0,A=p&&p.length;B<
+A;B++){var H=!1,M=!1;k=p[B];l=k.name;m=T(k.value);k=xa(l);if(s=ia.test(k))l=l.replace(Yc,"").substr(8).replace(/_(.)/g,function(a,b){return b.toUpperCase()});var P=k.replace(/(Start|End)$/,"");F(P)&&k===P+"Start"&&(H=l,M=l.substr(0,l.length-5)+"end",l=l.substr(0,l.length-6));k=xa(l.toLowerCase());h[k]=l;if(s||!c.hasOwnProperty(k))c[k]=m,Rc(a,k)&&(c[k]=!0);V(a,b,m,k,s);v(b,k,"A",d,e,H,M)}a=a.className;C(a)&&(a=a.animVal);if(L(a)&&""!==a)for(;l=g.exec(a);)k=xa(l[2]),v(b,k,"C",d,e)&&(c[k]=T(l[3])),a=
+a.substr(l.index+l[0].length);break;case ab:za(b,a.nodeValue);break;case 8:try{if(l=f.exec(a.nodeValue))k=xa(l[1]),v(b,k,"M",d,e)&&(c[k]=T(l[2]))}catch(O){}}b.sort(Ja);return b}function wa(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ea("uterdir",b,c);a.nodeType==pa&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return z(d)}function Xc(a,b,c){return function(d,e,f,g,h){e=wa(e[0],b,c);return a(d,e,f,g,h)}}function J(a,
+b,d,e,f,g,h,k,m){function s(a,b,c,d){if(a){c&&(a=Xc(a,c,d));a.require=J.require;a.directiveName=w;if(t===J||J.$$isolateScope)a=Z(a,{isolateScope:!0});h.push(a)}if(b){c&&(b=Xc(b,c,d));b.require=J.require;b.directiveName=w;if(t===J||J.$$isolateScope)b=Z(b,{isolateScope:!0});k.push(b)}}function B(a,b,c,d){var e;if(L(b)){var f=b.match(l);b=b.substring(f[0].length);var g=f[1]||f[3],f="?"===f[2];"^^"===g?c=c.parent():e=(e=d&&d[b])&&e.instance;e||(d="$"+b+"Controller",e=g?c.inheritedData(d):c.data(d));if(!e&&
+!f)throw ea("ctreq",b,a);}else if(K(b))for(e=[],g=0,f=b.length;g<f;g++)e[g]=B(a,b[g],c,d);return e||null}function A(a,b,c,d,e,f){var g=ga(),h;for(h in d){var l=d[h],k={$scope:l===t||l.$$isolateScope?e:f,$element:a,$attrs:b,$transclude:c},m=l.controller;"@"==m&&(m=b[l.name]);k=p(m,k,!0,l.controllerAs);g[l.name]=k;q||a.data("$"+l.name+"Controller",k.instance)}return g}function M(a,c,e,f,g,l){function m(a,b,c){var d;Wa(a)||(c=b,b=a,a=u);q&&(d=n);c||(c=q?ja.parent():ja);return g(a,b,d,c,X)}var s,p,H,
+P,n,ha,ja;b===e?(f=d,ja=d.$$element):(ja=z(e),f=new aa(ja,d));t&&(P=c.$new(!0));g&&(ha=m,ha.$$boundTransclude=g);ba&&(n=A(ja,f,ha,ba,P,c));t&&(S.$$addScopeInfo(ja,P,!0,!(D&&(D===t||D===t.$$originalDirective))),S.$$addScopeClass(ja,!0),P.$$isolateBindings=t.$$isolateBindings,Y(c,f,P,P.$$isolateBindings,t,P));if(n){var x=t||O,I;x&&n[x.name]&&(p=x.$$bindings.bindToController,(H=n[x.name])&&H.identifier&&p&&(I=H,l.$$destroyBindings=Y(c,f,H.instance,p,x)));for(s in n){H=n[s];var wa=H();wa!==H.instance&&
+(H.instance=wa,ja.data("$"+J.name+"Controller",wa),H===I&&(l.$$destroyBindings(),l.$$destroyBindings=Y(c,f,wa,p,x)))}}s=0;for(l=h.length;s<l;s++)p=h[s],$(p,p.isolateScope?P:c,ja,f,p.require&&B(p.directiveName,p.require,ja,n),ha);var X=c;t&&(t.template||null===t.templateUrl)&&(X=P);a&&a(X,e.childNodes,u,g);for(s=k.length-1;0<=s;s--)p=k[s],$(p,p.isolateScope?P:c,ja,f,p.require&&B(p.directiveName,p.require,ja,n),ha)}m=m||{};for(var P=-Number.MAX_VALUE,O,ba=m.controllerDirectives,t=m.newIsolateScopeDirective,
+D=m.templateDirective,n=m.nonTlbTranscludeDirective,x=!1,I=!1,q=m.hasElementTranscludeDirective,X=d.$$element=z(b),J,w,v,Ja=e,za,F=0,E=a.length;F<E;F++){J=a[F];var Ab=J.$$start,Q=J.$$end;Ab&&(X=wa(b,Ab,Q));v=u;if(P>J.priority)break;if(v=J.scope)J.templateUrl||(C(v)?(N("new/isolated scope",t||O,J,X),t=J):N("new/isolated scope",t,J,X)),O=O||J;w=J.name;!J.templateUrl&&J.controller&&(v=J.controller,ba=ba||ga(),N("'"+w+"' controller",ba[w],J,X),ba[w]=J);if(v=J.transclude)x=!0,J.$$tlb||(N("transclusion",
+n,J,X),n=J),"element"==v?(q=!0,P=J.priority,v=X,X=d.$$element=z(W.createComment(" "+w+": "+d[w]+" ")),b=X[0],U(f,ra.call(v,0),b),Ja=S(v,e,P,g&&g.name,{nonTlbTranscludeDirective:n})):(v=z(Vb(b)).contents(),X.empty(),Ja=S(v,e));if(J.template)if(I=!0,N("template",D,J,X),D=J,v=G(J.template)?J.template(X,d):J.template,v=fa(v),J.replace){g=J;v=Tb.test(v)?Zc(Yb(J.templateNamespace,T(v))):[];b=v[0];if(1!=v.length||b.nodeType!==pa)throw ea("tplrt",w,"");U(f,X,b);E={$attr:{}};v=ha(b,[],E);var R=a.splice(F+
+1,a.length-(F+1));t&&y(v);a=a.concat(v).concat(R);$c(d,E);E=a.length}else X.html(v);if(J.templateUrl)I=!0,N("template",D,J,X),D=J,J.replace&&(g=J),M=Kf(a.splice(F,a.length-F),X,d,f,x&&Ja,h,k,{controllerDirectives:ba,newIsolateScopeDirective:t,templateDirective:D,nonTlbTranscludeDirective:n}),E=a.length;else if(J.compile)try{za=J.compile(X,d,Ja),G(za)?s(null,za,Ab,Q):za&&s(za.pre,za.post,Ab,Q)}catch(V){c(V,va(X))}J.terminal&&(M.terminal=!0,P=Math.max(P,J.priority))}M.scope=O&&!0===O.scope;M.transcludeOnThisElement=
+x;M.elementTranscludeOnThisElement=q;M.templateOnThisElement=I;M.transclude=Ja;m.hasElementTranscludeDirective=q;return M}function y(a){for(var b=0,c=a.length;b<c;b++)a[b]=Ob(a[b],{$$isolateScope:!0})}function v(b,d,f,g,h,l,k){if(d===h)return null;h=null;if(e.hasOwnProperty(d)){var m;d=a.get(d+"Directive");for(var p=0,B=d.length;p<B;p++)try{m=d[p],(g===u||g>m.priority)&&-1!=m.restrict.indexOf(f)&&(l&&(m=Ob(m,{$$start:l,$$end:k})),b.push(m),h=m)}catch(A){c(A)}}return h}function F(b){if(e.hasOwnProperty(b))for(var c=
+a.get(b+"Directive"),d=0,f=c.length;d<f;d++)if(b=c[d],b.multiElement)return!0;return!1}function $c(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;n(a,function(d,e){"$"!=e.charAt(0)&&(b[e]&&b[e]!==d&&(d+=("style"===e?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});n(b,function(b,f){"class"==f?(D(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):"style"==f?(e.attr("style",e.attr("style")+";"+b),a.style=(a.style?a.style+";":"")+b):"$"==f.charAt(0)||a.hasOwnProperty(f)||(a[f]=b,d[f]=c[f])})}function Kf(a,b,c,e,f,g,
+h,l){var k=[],m,s,p=b[0],B=a.shift(),A=Ob(B,{templateUrl:null,transclude:null,replace:null,$$originalDirective:B}),H=G(B.templateUrl)?B.templateUrl(b,c):B.templateUrl,O=B.templateNamespace;b.empty();d(I.getTrustedResourceUrl(H)).then(function(d){var M,t;d=fa(d);if(B.replace){d=Tb.test(d)?Zc(Yb(O,T(d))):[];M=d[0];if(1!=d.length||M.nodeType!==pa)throw ea("tplrt",B.name,H);d={$attr:{}};U(e,b,M);var x=ha(M,[],d);C(B.scope)&&y(x);a=x.concat(a);$c(c,d)}else M=p,b.html(d);a.unshift(A);m=J(a,M,c,f,b,B,g,
+h,l);n(e,function(a,c){a==M&&(e[c]=b[0])});for(s=P(b[0].childNodes,f);k.length;){d=k.shift();t=k.shift();var S=k.shift(),I=k.shift(),x=b[0];if(!d.$$destroyed){if(t!==p){var wa=t.className;l.hasElementTranscludeDirective&&B.replace||(x=Vb(M));U(S,z(t),x);D(z(x),wa)}t=m.transcludeOnThisElement?ba(d,m.transclude,I):I;m(s,d,x,e,t,m)}}k=null});return function(a,b,c,d,e){a=e;b.$$destroyed||(k?k.push(b,c,d,a):(m.transcludeOnThisElement&&(a=ba(b,m.transclude,e)),m(s,b,c,d,a,m)))}}function Ja(a,b){var c=b.priority-
+a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function N(a,b,c,d){if(b)throw ea("multidir",b.name,c.name,a,va(d));}function za(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){a=a.parent();var b=!!a.length;b&&S.$$addBindingClass(a);return function(a,c){var e=c.parent();b||S.$$addBindingClass(e);S.$$addBindingInfo(e,d.expressions);a.$watch(d,function(a){c[0].nodeValue=a})}}})}function Yb(a,b){a=E(a||"html");switch(a){case "svg":case "math":var c=W.createElement("div");
+c.innerHTML="<"+a+">"+b+"</"+a+">";return c.childNodes[0].childNodes;default:return b}}function R(a,b){if("srcdoc"==b)return I.HTML;var c=ta(a);if("xlinkHref"==b||"form"==c&&"action"==b||"img"!=c&&("src"==b||"ngSrc"==b))return I.RESOURCE_URL}function V(a,c,d,e,f){var g=R(a,e);f=h[e]||f;var l=b(d,!0,g,f);if(l){if("multiple"===e&&"select"===ta(a))throw ea("selmulti",va(a));c.push({priority:100,compile:function(){return{pre:function(a,c,h){c=h.$$observers||(h.$$observers={});if(k.test(e))throw ea("nodomevents");
+var m=h[e];m!==d&&(l=m&&b(m,!0,g,f),d=m);l&&(h[e]=l(a),(c[e]||(c[e]=[])).$$inter=!0,(h.$$observers&&h.$$observers[e].$$scope||a).$watch(l,function(a,b){"class"===e&&a!=b?h.$updateClass(a,b):h.$set(e,a)}))}}}})}}function U(a,b,c){var d=b[0],e=b.length,f=d.parentNode,g,h;if(a)for(g=0,h=a.length;g<h;g++)if(a[g]==d){a[g++]=c;h=g+e-1;for(var l=a.length;g<l;g++,h++)h<l?a[g]=a[h]:delete a[g];a.length-=e-1;a.context===d&&(a.context=c);break}f&&f.replaceChild(c,d);a=W.createDocumentFragment();a.appendChild(d);
+z(c).data(z(d).data());la?(Rb=!0,la.cleanData([d])):delete z.cache[d[z.expando]];d=1;for(e=b.length;d<e;d++)f=b[d],z(f).remove(),a.appendChild(f),delete b[d];b[0]=c;b.length=1}function Z(a,b){return Q(function(){return a.apply(null,arguments)},a,b)}function $(a,b,d,e,f,g){try{a(b,d,e,f,g)}catch(h){c(h,va(d))}}function Y(a,c,d,e,f,g){var h;n(e,function(e,g){var l=e.attrName,k=e.optional,m,s,p,B;switch(e.mode){case "@":c.$observe(l,function(a){d[g]=a});c.$$observers[l].$$scope=a;c[l]&&(d[g]=b(c[l])(a));
+break;case "=":if(k&&!c[l])break;s=t(c[l]);B=s.literal?ka:function(a,b){return a===b||a!==a&&b!==b};p=s.assign||function(){m=d[g]=s(a);throw ea("nonassign",c[l],f.name);};m=d[g]=s(a);k=function(b){B(b,d[g])||(B(b,m)?p(a,b=d[g]):d[g]=b);return m=b};k.$stateful=!0;k=e.collection?a.$watchCollection(c[l],k):a.$watch(t(c[l],k),null,s.literal);h=h||[];h.push(k);break;case "&":if(!c.hasOwnProperty(l)&&k)break;s=t(c[l]);if(s===w&&k)break;d[g]=function(b){return s(a,b)}}});e=h?function(){for(var a=0,b=h.length;a<
+b;++a)h[a]()}:w;return g&&e!==w?(g.$on("$destroy",e),w):e}var aa=function(a,b){if(b){var c=Object.keys(b),d,e,f;d=0;for(e=c.length;d<e;d++)f=c[d],this[f]=b[f]}else this.$attr={};this.$$element=a};aa.prototype={$normalize:xa,$addClass:function(a){a&&0<a.length&&B.addClass(this.$$element,a)},$removeClass:function(a){a&&0<a.length&&B.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=ad(a,b);c&&c.length&&B.addClass(this.$$element,c);(c=ad(b,a))&&c.length&&B.removeClass(this.$$element,c)},
+$set:function(a,b,d,e){var f=this.$$element[0],g=Rc(f,a),h=Ff(f,a),f=a;g?(this.$$element.prop(a,b),e=g):h&&(this[h]=b,f=h);this[a]=b;e?this.$attr[a]=e:(e=this.$attr[a])||(this.$attr[a]=e=Ac(a,"-"));g=ta(this.$$element);if("a"===g&&"href"===a||"img"===g&&"src"===a)this[a]=b=O(b,"src"===a);else if("img"===g&&"srcset"===a){for(var g="",h=T(b),l=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,l=/\s/.test(h)?l:/(,)/,h=h.split(l),l=Math.floor(h.length/2),k=0;k<l;k++)var m=2*k,g=g+O(T(h[m]),!0),g=g+(" "+T(h[m+1]));
+h=T(h[2*k]).split(/\s/);g+=O(T(h[0]),!0);2===h.length&&(g+=" "+T(h[1]));this[a]=b=g}!1!==d&&(null===b||b===u?this.$$element.removeAttr(e):this.$$element.attr(e,b));(a=this.$$observers)&&n(a[f],function(a){try{a(b)}catch(d){c(d)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers=ga()),e=d[a]||(d[a]=[]);e.push(b);x.$evalAsync(function(){!e.$$inter&&c.hasOwnProperty(a)&&b(c[a])});return function(){Ya(e,b)}}};var ca=b.startSymbol(),da=b.endSymbol(),fa="{{"==ca||"}}"==da?Ua:function(a){return a.replace(/\{\{/g,
+ca).replace(/}}/g,da)},ia=/^ngAttr[A-Z]/;S.$$addBindingInfo=m?function(a,b){var c=a.data("$binding")||[];K(b)?c=c.concat(b):c.push(b);a.data("$binding",c)}:w;S.$$addBindingClass=m?function(a){D(a,"ng-binding")}:w;S.$$addScopeInfo=m?function(a,b,c,d){a.data(c?d?"$isolateScopeNoTemplate":"$isolateScope":"$scope",b)}:w;S.$$addScopeClass=m?function(a,b){D(a,b?"ng-isolate-scope":"ng-scope")}:w;return S}]}function xa(b){return eb(b.replace(Yc,""))}function ad(b,a){var c="",d=b.split(/\s+/),e=a.split(/\s+/),
+f=0;a:for(;f<d.length;f++){for(var g=d[f],h=0;h<e.length;h++)if(g==e[h])continue a;c+=(0<c.length?" ":"")+g}return c}function Zc(b){b=z(b);var a=b.length;if(1>=a)return b;for(;a--;)8===b[a].nodeType&&Lf.call(b,a,1);return b}function We(){var b={},a=!1;this.register=function(a,d){Qa(a,"controller");C(a)?Q(b,a):b[a]=d};this.allowGlobals=function(){a=!0};this.$get=["$injector","$window",function(c,d){function e(a,b,c,d){if(!a||!C(a.$scope))throw F("$controller")("noscp",d,b);a.$scope[b]=c}return function(f,
+g,h,l){var k,m,r;h=!0===h;l&&L(l)&&(r=l);if(L(f)){l=f.match(Wc);if(!l)throw Mf("ctrlfmt",f);m=l[1];r=r||l[3];f=b.hasOwnProperty(m)?b[m]:Cc(g.$scope,m,!0)||(a?Cc(d,m,!0):u);Pa(f,m,!0)}if(h)return h=(K(f)?f[f.length-1]:f).prototype,k=Object.create(h||null),r&&e(g,r,k,m||f.name),Q(function(){var a=c.invoke(f,k,g,m);a!==k&&(C(a)||G(a))&&(k=a,r&&e(g,r,k,m||f.name));return k},{instance:k,identifier:r});k=c.instantiate(f,g,m);r&&e(g,r,k,m||f.name);return k}}]}function Xe(){this.$get=["$window",function(b){return z(b.document)}]}
+function Ye(){this.$get=["$log",function(b){return function(a,c){b.error.apply(b,arguments)}}]}function Zb(b){return C(b)?da(b)?b.toISOString():$a(b):b}function bf(){this.$get=function(){return function(b){if(!b)return"";var a=[];oc(b,function(b,d){null===b||v(b)||(K(b)?n(b,function(b,c){a.push(ia(d)+"="+ia(Zb(b)))}):a.push(ia(d)+"="+ia(Zb(b))))});return a.join("&")}}}function cf(){this.$get=function(){return function(b){function a(b,e,f){null===b||v(b)||(K(b)?n(b,function(b){a(b,e+"[]")}):C(b)&&
+!da(b)?oc(b,function(b,c){a(b,e+(f?"":"[")+c+(f?"":"]"))}):c.push(ia(e)+"="+ia(Zb(b))))}if(!b)return"";var c=[];a(b,"",!0);return c.join("&")}}}function $b(b,a){if(L(b)){var c=b.replace(Nf,"").trim();if(c){var d=a("Content-Type");(d=d&&0===d.indexOf(bd))||(d=(d=c.match(Of))&&Pf[d[0]].test(c));d&&(b=vc(c))}}return b}function cd(b){var a=ga(),c;L(b)?n(b.split("\n"),function(b){c=b.indexOf(":");var e=E(T(b.substr(0,c)));b=T(b.substr(c+1));e&&(a[e]=a[e]?a[e]+", "+b:b)}):C(b)&&n(b,function(b,c){var f=
+E(c),g=T(b);f&&(a[f]=a[f]?a[f]+", "+g:g)});return a}function dd(b){var a;return function(c){a||(a=cd(b));return c?(c=a[E(c)],void 0===c&&(c=null),c):a}}function ed(b,a,c,d){if(G(d))return d(b,a,c);n(d,function(d){b=d(b,a,c)});return b}function af(){var b=this.defaults={transformResponse:[$b],transformRequest:[function(a){return C(a)&&"[object File]"!==sa.call(a)&&"[object Blob]"!==sa.call(a)&&"[object FormData]"!==sa.call(a)?$a(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},post:fa(ac),
+put:fa(ac),patch:fa(ac)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer"},a=!1;this.useApplyAsync=function(b){return y(b)?(a=!!b,this):a};var c=this.interceptors=[];this.$get=["$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector",function(d,e,f,g,h,l){function k(a){function c(a){var b=Q({},a);b.data=a.data?ed(a.data,a.headers,a.status,e.transformResponse):a.data;a=a.status;return 200<=a&&300>a?b:h.reject(b)}function d(a,b){var c,
+e={};n(a,function(a,d){G(a)?(c=a(b),null!=c&&(e[d]=c)):e[d]=a});return e}if(!aa.isObject(a))throw F("$http")("badreq",a);var e=Q({method:"get",transformRequest:b.transformRequest,transformResponse:b.transformResponse,paramSerializer:b.paramSerializer},a);e.headers=function(a){var c=b.headers,e=Q({},a.headers),f,g,h,c=Q({},c.common,c[E(a.method)]);a:for(f in c){g=E(f);for(h in e)if(E(h)===g)continue a;e[f]=c[f]}return d(e,fa(a))}(a);e.method=pb(e.method);e.paramSerializer=L(e.paramSerializer)?l.get(e.paramSerializer):
+e.paramSerializer;var f=[function(a){var d=a.headers,e=ed(a.data,dd(d),u,a.transformRequest);v(e)&&n(d,function(a,b){"content-type"===E(b)&&delete d[b]});v(a.withCredentials)&&!v(b.withCredentials)&&(a.withCredentials=b.withCredentials);return m(a,e).then(c,c)},u],g=h.when(e);for(n(A,function(a){(a.request||a.requestError)&&f.unshift(a.request,a.requestError);(a.response||a.responseError)&&f.push(a.response,a.responseError)});f.length;){a=f.shift();var k=f.shift(),g=g.then(a,k)}g.success=function(a){Pa(a,
+"fn");g.then(function(b){a(b.data,b.status,b.headers,e)});return g};g.error=function(a){Pa(a,"fn");g.then(null,function(b){a(b.data,b.status,b.headers,e)});return g};return g}function m(c,f){function l(b,c,d,e){function f(){m(c,b,d,e)}O&&(200<=b&&300>b?O.put(P,[b,c,cd(d),e]):O.remove(P));a?g.$applyAsync(f):(f(),g.$$phase||g.$apply())}function m(a,b,d,e){b=Math.max(b,0);(200<=b&&300>b?I.resolve:I.reject)({data:a,status:b,headers:dd(d),config:c,statusText:e})}function A(a){m(a.data,a.status,fa(a.headers()),
+a.statusText)}function n(){var a=k.pendingRequests.indexOf(c);-1!==a&&k.pendingRequests.splice(a,1)}var I=h.defer(),B=I.promise,O,D,S=c.headers,P=r(c.url,c.paramSerializer(c.params));k.pendingRequests.push(c);B.then(n,n);!c.cache&&!b.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(O=C(c.cache)?c.cache:C(b.cache)?b.cache:s);O&&(D=O.get(P),y(D)?D&&G(D.then)?D.then(A,A):K(D)?m(D[1],D[0],fa(D[2]),D[3]):m(D,200,{},"OK"):O.put(P,B));v(D)&&((D=fd(c.url)?e()[c.xsrfCookieName||b.xsrfCookieName]:
+u)&&(S[c.xsrfHeaderName||b.xsrfHeaderName]=D),d(c.method,P,f,l,S,c.timeout,c.withCredentials,c.responseType));return B}function r(a,b){0<b.length&&(a+=(-1==a.indexOf("?")?"?":"&")+b);return a}var s=f("$http");b.paramSerializer=L(b.paramSerializer)?l.get(b.paramSerializer):b.paramSerializer;var A=[];n(c,function(a){A.unshift(L(a)?l.get(a):l.invoke(a))});k.pendingRequests=[];(function(a){n(arguments,function(a){k[a]=function(b,c){return k(Q({},c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");
+(function(a){n(arguments,function(a){k[a]=function(b,c,d){return k(Q({},d||{},{method:a,url:b,data:c}))}})})("post","put","patch");k.defaults=b;return k}]}function Qf(){return new N.XMLHttpRequest}function df(){this.$get=["$browser","$window","$document",function(b,a,c){return Rf(b,Qf,b.defer,a.angular.callbacks,c[0])}]}function Rf(b,a,c,d,e){function f(a,b,c){var f=e.createElement("script"),m=null;f.type="text/javascript";f.src=a;f.async=!0;m=function(a){f.removeEventListener("load",m,!1);f.removeEventListener("error",
+m,!1);e.body.removeChild(f);f=null;var g=-1,A="unknown";a&&("load"!==a.type||d[b].called||(a={type:"error"}),A=a.type,g="error"===a.type?404:200);c&&c(g,A)};f.addEventListener("load",m,!1);f.addEventListener("error",m,!1);e.body.appendChild(f);return m}return function(e,h,l,k,m,r,s,A){function H(){p&&p();x&&x.abort()}function M(a,d,e,f,g){I!==u&&c.cancel(I);p=x=null;a(d,e,f,g);b.$$completeOutstandingRequest(w)}b.$$incOutstandingRequestCount();h=h||b.url();if("jsonp"==E(e)){var t="_"+(d.counter++).toString(36);
+d[t]=function(a){d[t].data=a;d[t].called=!0};var p=f(h.replace("JSON_CALLBACK","angular.callbacks."+t),t,function(a,b){M(k,a,d[t].data,"",b);d[t]=w})}else{var x=a();x.open(e,h,!0);n(m,function(a,b){y(a)&&x.setRequestHeader(b,a)});x.onload=function(){var a=x.statusText||"",b="response"in x?x.response:x.responseText,c=1223===x.status?204:x.status;0===c&&(c=b?200:"file"==Aa(h).protocol?404:0);M(k,c,b,x.getAllResponseHeaders(),a)};e=function(){M(k,-1,null,null,"")};x.onerror=e;x.onabort=e;s&&(x.withCredentials=
+!0);if(A)try{x.responseType=A}catch(q){if("json"!==A)throw q;}x.send(l)}if(0<r)var I=c(H,r);else r&&G(r.then)&&r.then(H)}}function Ze(){var b="{{",a="}}";this.startSymbol=function(a){return a?(b=a,this):b};this.endSymbol=function(b){return b?(a=b,this):a};this.$get=["$parse","$exceptionHandler","$sce",function(c,d,e){function f(a){return"\\\\\\"+a}function g(c){return c.replace(m,b).replace(r,a)}function h(f,h,m,r){function t(a){try{var b=a;a=m?e.getTrusted(m,b):e.valueOf(b);var c;if(r&&!y(a))c=a;
+else if(null==a)c="";else{switch(typeof a){case "string":break;case "number":a=""+a;break;default:a=$a(a)}c=a}return c}catch(g){d(Ka.interr(f,g))}}r=!!r;for(var p,n,q=0,I=[],B=[],O=f.length,D=[],S=[];q<O;)if(-1!=(p=f.indexOf(b,q))&&-1!=(n=f.indexOf(a,p+l)))q!==p&&D.push(g(f.substring(q,p))),q=f.substring(p+l,n),I.push(q),B.push(c(q,t)),q=n+k,S.push(D.length),D.push("");else{q!==O&&D.push(g(f.substring(q)));break}m&&1<D.length&&Ka.throwNoconcat(f);if(!h||I.length){var P=function(a){for(var b=0,c=I.length;b<
+c;b++){if(r&&v(a[b]))return;D[S[b]]=a[b]}return D.join("")};return Q(function(a){var b=0,c=I.length,e=Array(c);try{for(;b<c;b++)e[b]=B[b](a);return P(e)}catch(g){d(Ka.interr(f,g))}},{exp:f,expressions:I,$$watchDelegate:function(a,b){var c;return a.$watchGroup(B,function(d,e){var f=P(d);G(b)&&b.call(this,f,d!==e?c:f,a);c=f})}})}}var l=b.length,k=a.length,m=new RegExp(b.replace(/./g,f),"g"),r=new RegExp(a.replace(/./g,f),"g");h.startSymbol=function(){return b};h.endSymbol=function(){return a};return h}]}
+function $e(){this.$get=["$rootScope","$window","$q","$$q",function(b,a,c,d){function e(e,h,l,k){var m=4<arguments.length,r=m?ra.call(arguments,4):[],s=a.setInterval,A=a.clearInterval,H=0,M=y(k)&&!k,t=(M?d:c).defer(),p=t.promise;l=y(l)?l:0;p.then(null,null,m?function(){e.apply(null,r)}:e);p.$$intervalId=s(function(){t.notify(H++);0<l&&H>=l&&(t.resolve(H),A(p.$$intervalId),delete f[p.$$intervalId]);M||b.$apply()},h);f[p.$$intervalId]=t;return p}var f={};e.cancel=function(b){return b&&b.$$intervalId in
+f?(f[b.$$intervalId].reject("canceled"),a.clearInterval(b.$$intervalId),delete f[b.$$intervalId],!0):!1};return e}]}function fe(){this.$get=function(){return{id:"en-us",NUMBER_FORMATS:{DECIMAL_SEP:".",GROUP_SEP:",",PATTERNS:[{minInt:1,minFrac:0,maxFrac:3,posPre:"",posSuf:"",negPre:"-",negSuf:"",gSize:3,lgSize:3},{minInt:1,minFrac:2,maxFrac:2,posPre:"\u00a4",posSuf:"",negPre:"(\u00a4",negSuf:")",gSize:3,lgSize:3}],CURRENCY_SYM:"$"},DATETIME_FORMATS:{MONTH:"January February March April May June July August September October November December".split(" "),
+SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),AMPMS:["AM","PM"],medium:"MMM d, y h:mm:ss a","short":"M/d/yy h:mm a",fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",mediumDate:"MMM d, y",shortDate:"M/d/yy",mediumTime:"h:mm:ss a",shortTime:"h:mm a",ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"]},pluralCat:function(b){return 1===b?"one":"other"}}}}
+function bc(b){b=b.split("/");for(var a=b.length;a--;)b[a]=mb(b[a]);return b.join("/")}function gd(b,a){var c=Aa(b);a.$$protocol=c.protocol;a.$$host=c.hostname;a.$$port=Y(c.port)||Sf[c.protocol]||null}function hd(b,a){var c="/"!==b.charAt(0);c&&(b="/"+b);var d=Aa(b);a.$$path=decodeURIComponent(c&&"/"===d.pathname.charAt(0)?d.pathname.substring(1):d.pathname);a.$$search=yc(d.search);a.$$hash=decodeURIComponent(d.hash);a.$$path&&"/"!=a.$$path.charAt(0)&&(a.$$path="/"+a.$$path)}function ya(b,a){if(0===
+a.indexOf(b))return a.substr(b.length)}function Ia(b){var a=b.indexOf("#");return-1==a?b:b.substr(0,a)}function Bb(b){return b.replace(/(#.+)|#$/,"$1")}function cc(b){return b.substr(0,Ia(b).lastIndexOf("/")+1)}function dc(b,a){this.$$html5=!0;a=a||"";var c=cc(b);gd(b,this);this.$$parse=function(a){var b=ya(c,a);if(!L(b))throw Cb("ipthprfx",a,c);hd(b,this);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=Qb(this.$$search),b=this.$$hash?"#"+mb(this.$$hash):"";this.$$url=
+bc(this.$$path)+(a?"?"+a:"")+b;this.$$absUrl=c+this.$$url.substr(1)};this.$$parseLinkUrl=function(d,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;(f=ya(b,d))!==u?(g=f,g=(f=ya(a,f))!==u?c+(ya("/",f)||f):b+g):(f=ya(c,d))!==u?g=c+f:c==d+"/"&&(g=c);g&&this.$$parse(g);return!!g}}function ec(b,a){var c=cc(b);gd(b,this);this.$$parse=function(d){d=ya(b,d)||ya(c,d);var e;"#"===d.charAt(0)?(e=ya(a,d),v(e)&&(e=d)):e=this.$$html5?d:"";hd(e,this);d=this.$$path;var f=/^\/[A-Z]:(\/.*)/;0===e.indexOf(b)&&
+(e=e.replace(b,""));f.exec(e)||(d=(e=f.exec(d))?e[1]:d);this.$$path=d;this.$$compose()};this.$$compose=function(){var c=Qb(this.$$search),e=this.$$hash?"#"+mb(this.$$hash):"";this.$$url=bc(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+(this.$$url?a+this.$$url:"")};this.$$parseLinkUrl=function(a,c){return Ia(b)==Ia(a)?(this.$$parse(a),!0):!1}}function id(b,a){this.$$html5=!0;ec.apply(this,arguments);var c=cc(b);this.$$parseLinkUrl=function(d,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,
+g;b==Ia(d)?f=d:(g=ya(c,d))?f=b+a+g:c===d+"/"&&(f=c);f&&this.$$parse(f);return!!f};this.$$compose=function(){var c=Qb(this.$$search),e=this.$$hash?"#"+mb(this.$$hash):"";this.$$url=bc(this.$$path)+(c?"?"+c:"")+e;this.$$absUrl=b+a+this.$$url}}function Db(b){return function(){return this[b]}}function jd(b,a){return function(c){if(v(c))return this[b];this[b]=a(c);this.$$compose();return this}}function ef(){var b="",a={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(a){return y(a)?
+(b=a,this):b};this.html5Mode=function(b){return Xa(b)?(a.enabled=b,this):C(b)?(Xa(b.enabled)&&(a.enabled=b.enabled),Xa(b.requireBase)&&(a.requireBase=b.requireBase),Xa(b.rewriteLinks)&&(a.rewriteLinks=b.rewriteLinks),this):a};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(c,d,e,f,g){function h(a,b,c){var e=k.url(),f=k.$$state;try{d.url(a,b,c),k.$$state=d.state()}catch(g){throw k.url(e),k.$$state=f,g;}}function l(a,b){c.$broadcast("$locationChangeSuccess",k.absUrl(),
+a,k.$$state,b)}var k,m;m=d.baseHref();var r=d.url(),s;if(a.enabled){if(!m&&a.requireBase)throw Cb("nobase");s=r.substring(0,r.indexOf("/",r.indexOf("//")+2))+(m||"/");m=e.history?dc:id}else s=Ia(r),m=ec;k=new m(s,"#"+b);k.$$parseLinkUrl(r,r);k.$$state=d.state();var A=/^\s*(javascript|mailto):/i;f.on("click",function(b){if(a.rewriteLinks&&!b.ctrlKey&&!b.metaKey&&!b.shiftKey&&2!=b.which&&2!=b.button){for(var e=z(b.target);"a"!==ta(e[0]);)if(e[0]===f[0]||!(e=e.parent())[0])return;var h=e.prop("href"),
+l=e.attr("href")||e.attr("xlink:href");C(h)&&"[object SVGAnimatedString]"===h.toString()&&(h=Aa(h.animVal).href);A.test(h)||!h||e.attr("target")||b.isDefaultPrevented()||!k.$$parseLinkUrl(h,l)||(b.preventDefault(),k.absUrl()!=d.url()&&(c.$apply(),g.angular["ff-684208-preventDefault"]=!0))}});Bb(k.absUrl())!=Bb(r)&&d.url(k.absUrl(),!0);var H=!0;d.onUrlChange(function(a,b){c.$evalAsync(function(){var d=k.absUrl(),e=k.$$state,f;k.$$parse(a);k.$$state=b;f=c.$broadcast("$locationChangeStart",a,d,b,e).defaultPrevented;
+k.absUrl()===a&&(f?(k.$$parse(d),k.$$state=e,h(d,!1,e)):(H=!1,l(d,e)))});c.$$phase||c.$digest()});c.$watch(function(){var a=Bb(d.url()),b=Bb(k.absUrl()),f=d.state(),g=k.$$replace,m=a!==b||k.$$html5&&e.history&&f!==k.$$state;if(H||m)H=!1,c.$evalAsync(function(){var b=k.absUrl(),d=c.$broadcast("$locationChangeStart",b,a,k.$$state,f).defaultPrevented;k.absUrl()===b&&(d?(k.$$parse(a),k.$$state=f):(m&&h(b,g,f===k.$$state?null:k.$$state),l(a,f)))});k.$$replace=!1});return k}]}function ff(){var b=!0,a=this;
+this.debugEnabled=function(a){return y(a)?(b=a,this):b};this.$get=["$window",function(c){function d(a){a instanceof Error&&(a.stack?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=c.console||{},e=b[a]||b.log||w;a=!1;try{a=!!e.apply}catch(l){}return a?function(){var a=[];n(arguments,function(b){a.push(d(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),
+info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){b&&c.apply(a,arguments)}}()}}]}function Ba(b,a){if("__defineGetter__"===b||"__defineSetter__"===b||"__lookupGetter__"===b||"__lookupSetter__"===b||"__proto__"===b)throw ca("isecfld",a);return b}function na(b,a){if(b){if(b.constructor===b)throw ca("isecfn",a);if(b.window===b)throw ca("isecwindow",a);if(b.children&&(b.nodeName||b.prop&&b.attr&&b.find))throw ca("isecdom",a);if(b===Object)throw ca("isecobj",
+a);}return b}function kd(b,a){if(b){if(b.constructor===b)throw ca("isecfn",a);if(b===Tf||b===Uf||b===Vf)throw ca("isecff",a);}}function Wf(b,a){return"undefined"!==typeof b?b:a}function ld(b,a){return"undefined"===typeof b?a:"undefined"===typeof a?b:b+a}function U(b,a){var c,d;switch(b.type){case q.Program:c=!0;n(b.body,function(b){U(b.expression,a);c=c&&b.expression.constant});b.constant=c;break;case q.Literal:b.constant=!0;b.toWatch=[];break;case q.UnaryExpression:U(b.argument,a);b.constant=b.argument.constant;
+b.toWatch=b.argument.toWatch;break;case q.BinaryExpression:U(b.left,a);U(b.right,a);b.constant=b.left.constant&&b.right.constant;b.toWatch=b.left.toWatch.concat(b.right.toWatch);break;case q.LogicalExpression:U(b.left,a);U(b.right,a);b.constant=b.left.constant&&b.right.constant;b.toWatch=b.constant?[]:[b];break;case q.ConditionalExpression:U(b.test,a);U(b.alternate,a);U(b.consequent,a);b.constant=b.test.constant&&b.alternate.constant&&b.consequent.constant;b.toWatch=b.constant?[]:[b];break;case q.Identifier:b.constant=
+!1;b.toWatch=[b];break;case q.MemberExpression:U(b.object,a);b.computed&&U(b.property,a);b.constant=b.object.constant&&(!b.computed||b.property.constant);b.toWatch=[b];break;case q.CallExpression:c=b.filter?!a(b.callee.name).$stateful:!1;d=[];n(b.arguments,function(b){U(b,a);c=c&&b.constant;b.constant||d.push.apply(d,b.toWatch)});b.constant=c;b.toWatch=b.filter&&!a(b.callee.name).$stateful?d:[b];break;case q.AssignmentExpression:U(b.left,a);U(b.right,a);b.constant=b.left.constant&&b.right.constant;
+b.toWatch=[b];break;case q.ArrayExpression:c=!0;d=[];n(b.elements,function(b){U(b,a);c=c&&b.constant;b.constant||d.push.apply(d,b.toWatch)});b.constant=c;b.toWatch=d;break;case q.ObjectExpression:c=!0;d=[];n(b.properties,function(b){U(b.value,a);c=c&&b.value.constant;b.value.constant||d.push.apply(d,b.value.toWatch)});b.constant=c;b.toWatch=d;break;case q.ThisExpression:b.constant=!1,b.toWatch=[]}}function md(b){if(1==b.length){b=b[0].expression;var a=b.toWatch;return 1!==a.length?a:a[0]!==b?a:u}}
+function nd(b){return b.type===q.Identifier||b.type===q.MemberExpression}function od(b){if(1===b.body.length&&nd(b.body[0].expression))return{type:q.AssignmentExpression,left:b.body[0].expression,right:{type:q.NGValueParameter},operator:"="}}function pd(b){return 0===b.body.length||1===b.body.length&&(b.body[0].expression.type===q.Literal||b.body[0].expression.type===q.ArrayExpression||b.body[0].expression.type===q.ObjectExpression)}function qd(b,a){this.astBuilder=b;this.$filter=a}function rd(b,
+a){this.astBuilder=b;this.$filter=a}function Eb(b,a,c,d){na(b,d);a=a.split(".");for(var e,f=0;1<a.length;f++){e=Ba(a.shift(),d);var g=na(b[e],d);g||(g={},b[e]=g);b=g}e=Ba(a.shift(),d);na(b[e],d);return b[e]=c}function Fb(b){return"constructor"==b}function fc(b){return G(b.valueOf)?b.valueOf():Xf.call(b)}function gf(){var b=ga(),a=ga();this.$get=["$filter","$sniffer",function(c,d){function e(a,b){return null==a||null==b?a===b:"object"===typeof a&&(a=fc(a),"object"===typeof a)?!1:a===b||a!==a&&b!==
+b}function f(a,b,c,d,f){var g=d.inputs,h;if(1===g.length){var l=e,g=g[0];return a.$watch(function(a){var b=g(a);e(b,l)||(h=d(a,u,u,[b]),l=b&&fc(b));return h},b,c,f)}for(var k=[],m=[],r=0,n=g.length;r<n;r++)k[r]=e,m[r]=null;return a.$watch(function(a){for(var b=!1,c=0,f=g.length;c<f;c++){var l=g[c](a);if(b||(b=!e(l,k[c])))m[c]=l,k[c]=l&&fc(l)}b&&(h=d(a,u,u,m));return h},b,c,f)}function g(a,b,c,d){var e,f;return e=a.$watch(function(a){return d(a)},function(a,c,d){f=a;G(b)&&b.apply(this,arguments);y(a)&&
+d.$$postDigest(function(){y(f)&&e()})},c)}function h(a,b,c,d){function e(a){var b=!0;n(a,function(a){y(a)||(b=!1)});return b}var f,g;return f=a.$watch(function(a){return d(a)},function(a,c,d){g=a;G(b)&&b.call(this,a,c,d);e(a)&&d.$$postDigest(function(){e(g)&&f()})},c)}function l(a,b,c,d){var e;return e=a.$watch(function(a){return d(a)},function(a,c,d){G(b)&&b.apply(this,arguments);e()},c)}function k(a,b){if(!b)return a;var c=a.$$watchDelegate,c=c!==h&&c!==g?function(c,d,e,f){e=a(c,d,e,f);return b(e,
+c,d)}:function(c,d,e,f){e=a(c,d,e,f);c=b(e,c,d);return y(e)?c:e};a.$$watchDelegate&&a.$$watchDelegate!==f?c.$$watchDelegate=a.$$watchDelegate:b.$stateful||(c.$$watchDelegate=f,c.inputs=a.inputs?a.inputs:[a]);return c}var m={csp:d.csp,expensiveChecks:!1},r={csp:d.csp,expensiveChecks:!0};return function(d,e,H){var n,t,p;switch(typeof d){case "string":p=d=d.trim();var q=H?a:b;n=q[p];n||(":"===d.charAt(0)&&":"===d.charAt(1)&&(t=!0,d=d.substring(2)),H=H?r:m,n=new gc(H),n=(new hc(n,c,H)).parse(d),n.constant?
+n.$$watchDelegate=l:t?n.$$watchDelegate=n.literal?h:g:n.inputs&&(n.$$watchDelegate=f),q[p]=n);return k(n,e);case "function":return k(d,e);default:return w}}}]}function jf(){this.$get=["$rootScope","$exceptionHandler",function(b,a){return sd(function(a){b.$evalAsync(a)},a)}]}function kf(){this.$get=["$browser","$exceptionHandler",function(b,a){return sd(function(a){b.defer(a)},a)}]}function sd(b,a){function c(a,b,c){function d(b){return function(c){e||(e=!0,b.call(a,c))}}var e=!1;return[d(b),d(c)]}
+function d(){this.$$state={status:0}}function e(a,b){return function(c){b.call(a,c)}}function f(c){!c.processScheduled&&c.pending&&(c.processScheduled=!0,b(function(){var b,d,e;e=c.pending;c.processScheduled=!1;c.pending=u;for(var f=0,g=e.length;f<g;++f){d=e[f][0];b=e[f][c.status];try{G(b)?d.resolve(b(c.value)):1===c.status?d.resolve(c.value):d.reject(c.value)}catch(h){d.reject(h),a(h)}}}))}function g(){this.promise=new d;this.resolve=e(this,this.resolve);this.reject=e(this,this.reject);this.notify=
+e(this,this.notify)}var h=F("$q",TypeError);d.prototype={then:function(a,b,c){var d=new g;this.$$state.pending=this.$$state.pending||[];this.$$state.pending.push([d,a,b,c]);0<this.$$state.status&&f(this.$$state);return d.promise},"catch":function(a){return this.then(null,a)},"finally":function(a,b){return this.then(function(b){return k(b,!0,a)},function(b){return k(b,!1,a)},b)}};g.prototype={resolve:function(a){this.promise.$$state.status||(a===this.promise?this.$$reject(h("qcycle",a)):this.$$resolve(a))},
+$$resolve:function(b){var d,e;e=c(this,this.$$resolve,this.$$reject);try{if(C(b)||G(b))d=b&&b.then;G(d)?(this.promise.$$state.status=-1,d.call(b,e[0],e[1],this.notify)):(this.promise.$$state.value=b,this.promise.$$state.status=1,f(this.promise.$$state))}catch(g){e[1](g),a(g)}},reject:function(a){this.promise.$$state.status||this.$$reject(a)},$$reject:function(a){this.promise.$$state.value=a;this.promise.$$state.status=2;f(this.promise.$$state)},notify:function(c){var d=this.promise.$$state.pending;
+0>=this.promise.$$state.status&&d&&d.length&&b(function(){for(var b,e,f=0,g=d.length;f<g;f++){e=d[f][0];b=d[f][3];try{e.notify(G(b)?b(c):c)}catch(h){a(h)}}})}};var l=function(a,b){var c=new g;b?c.resolve(a):c.reject(a);return c.promise},k=function(a,b,c){var d=null;try{G(c)&&(d=c())}catch(e){return l(e,!1)}return d&&G(d.then)?d.then(function(){return l(a,b)},function(a){return l(a,!1)}):l(a,b)},m=function(a,b,c,d){var e=new g;e.resolve(a);return e.promise.then(b,c,d)},r=function A(a){if(!G(a))throw h("norslvr",
+a);if(!(this instanceof A))return new A(a);var b=new g;a(function(a){b.resolve(a)},function(a){b.reject(a)});return b.promise};r.defer=function(){return new g};r.reject=function(a){var b=new g;b.reject(a);return b.promise};r.when=m;r.all=function(a){var b=new g,c=0,d=K(a)?[]:{};n(a,function(a,e){c++;m(a).then(function(a){d.hasOwnProperty(e)||(d[e]=a,--c||b.resolve(d))},function(a){d.hasOwnProperty(e)||b.reject(a)})});0===c&&b.resolve(d);return b.promise};return r}function tf(){this.$get=["$window",
+"$timeout",function(b,a){function c(){for(var a=0;a<m.length;a++){var b=m[a];b&&(m[a]=null,b())}k=m.length=0}function d(a){var b=m.length;k++;m.push(a);0===b&&(l=h(c));return function(){0<=b&&(b=m[b]=null,0===--k&&l&&(l(),l=null,m.length=0))}}var e=b.requestAnimationFrame||b.webkitRequestAnimationFrame,f=b.cancelAnimationFrame||b.webkitCancelAnimationFrame||b.webkitCancelRequestAnimationFrame,g=!!e,h=g?function(a){var b=e(a);return function(){f(b)}}:function(b){var c=a(b,16.66,!1);return function(){a.cancel(c)}};
+d.supported=g;var l,k=0,m=[];return d}]}function hf(){function b(a){function b(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$id=++lb;this.$$ChildScope=null}b.prototype=a;return b}var a=10,c=F("$rootScope"),d=null,e=null;this.digestTtl=function(b){arguments.length&&(a=b);return a};this.$get=["$injector","$exceptionHandler","$parse","$browser",function(f,g,h,l){function k(a){a.currentScope.$$destroyed=
+!0}function m(){this.$id=++lb;this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=this.$$prevSibling=this.$$childHead=this.$$childTail=null;this.$root=this;this.$$destroyed=!1;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$$isolateBindings=null}function r(a){if(p.$$phase)throw c("inprog",p.$$phase);p.$$phase=a}function s(a,b){do a.$$watchersCount+=b;while(a=a.$parent)}function A(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];
+while(a=a.$parent)}function q(){}function u(){for(;I.length;)try{I.shift()()}catch(a){g(a)}e=null}function t(){null===e&&(e=l.defer(function(){p.$apply(u)}))}m.prototype={constructor:m,$new:function(a,c){var d;c=c||this;a?(d=new m,d.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=b(this)),d=new this.$$ChildScope);d.$parent=c;d.$$prevSibling=c.$$childTail;c.$$childHead?(c.$$childTail.$$nextSibling=d,c.$$childTail=d):c.$$childHead=c.$$childTail=d;(a||c!=this)&&d.$on("$destroy",k);return d},
+$watch:function(a,b,c,e){var f=h(a);if(f.$$watchDelegate)return f.$$watchDelegate(this,b,c,f,a);var g=this,l=g.$$watchers,k={fn:b,last:q,get:f,exp:e||a,eq:!!c};d=null;G(b)||(k.fn=w);l||(l=g.$$watchers=[]);l.unshift(k);s(this,1);return function(){0<=Ya(l,k)&&s(g,-1);d=null}},$watchGroup:function(a,b){function c(){h=!1;l?(l=!1,b(e,e,g)):b(e,d,g)}var d=Array(a.length),e=Array(a.length),f=[],g=this,h=!1,l=!0;if(!a.length){var k=!0;g.$evalAsync(function(){k&&b(e,e,g)});return function(){k=!1}}if(1===a.length)return this.$watch(a[0],
+function(a,c,f){e[0]=a;d[0]=c;b(e,a===c?e:d,f)});n(a,function(a,b){var l=g.$watch(a,function(a,f){e[b]=a;d[b]=f;h||(h=!0,g.$evalAsync(c))});f.push(l)});return function(){for(;f.length;)f.shift()()}},$watchCollection:function(a,b){function c(a){e=a;var b,d,g,h;if(!v(e)){if(C(e))if(Da(e))for(f!==r&&(f=r,n=f.length=0,k++),a=e.length,n!==a&&(k++,f.length=n=a),b=0;b<a;b++)h=f[b],g=e[b],d=h!==h&&g!==g,d||h===g||(k++,f[b]=g);else{f!==s&&(f=s={},n=0,k++);a=0;for(b in e)e.hasOwnProperty(b)&&(a++,g=e[b],h=
+f[b],b in f?(d=h!==h&&g!==g,d||h===g||(k++,f[b]=g)):(n++,f[b]=g,k++));if(n>a)for(b in k++,f)e.hasOwnProperty(b)||(n--,delete f[b])}else f!==e&&(f=e,k++);return k}}c.$stateful=!0;var d=this,e,f,g,l=1<b.length,k=0,m=h(a,c),r=[],s={},p=!0,n=0;return this.$watch(m,function(){p?(p=!1,b(e,e,d)):b(e,g,d);if(l)if(C(e))if(Da(e)){g=Array(e.length);for(var a=0;a<e.length;a++)g[a]=e[a]}else for(a in g={},e)kb.call(e,a)&&(g[a]=e[a]);else g=e})},$digest:function(){var b,f,h,k,m,s,n=a,A,t=[],I,v;r("$digest");l.$$checkUrlChange();
+this===p&&null!==e&&(l.defer.cancel(e),u());d=null;do{s=!1;for(A=this;x.length;){try{v=x.shift(),v.scope.$eval(v.expression,v.locals)}catch(w){g(w)}d=null}a:do{if(k=A.$$watchers)for(m=k.length;m--;)try{if(b=k[m])if((f=b.get(A))!==(h=b.last)&&!(b.eq?ka(f,h):"number"===typeof f&&"number"===typeof h&&isNaN(f)&&isNaN(h)))s=!0,d=b,b.last=b.eq?ua(f,null):f,b.fn(f,h===q?f:h,A),5>n&&(I=4-n,t[I]||(t[I]=[]),t[I].push({msg:G(b.exp)?"fn: "+(b.exp.name||b.exp.toString()):b.exp,newVal:f,oldVal:h}));else if(b===
+d){s=!1;break a}}catch(z){g(z)}if(!(k=A.$$watchersCount&&A.$$childHead||A!==this&&A.$$nextSibling))for(;A!==this&&!(k=A.$$nextSibling);)A=A.$parent}while(A=k);if((s||x.length)&&!n--)throw p.$$phase=null,c("infdig",a,t);}while(s||x.length);for(p.$$phase=null;y.length;)try{y.shift()()}catch(C){g(C)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===p&&l.$$applicationDestroyed();s(this,-this.$$watchersCount);for(var b in this.$$listenerCount)A(this,
+this.$$listenerCount[b],b);a&&a.$$childHead==this&&(a.$$childHead=this.$$nextSibling);a&&a.$$childTail==this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=w;this.$on=this.$watch=this.$watchGroup=function(){return w};this.$$listeners={};this.$parent=this.$$nextSibling=this.$$prevSibling=this.$$childHead=
+this.$$childTail=this.$root=this.$$watchers=null}},$eval:function(a,b){return h(a)(this,b)},$evalAsync:function(a,b){p.$$phase||x.length||l.defer(function(){x.length&&p.$digest()});x.push({scope:this,expression:a,locals:b})},$$postDigest:function(a){y.push(a)},$apply:function(a){try{return r("$apply"),this.$eval(a)}catch(b){g(b)}finally{p.$$phase=null;try{p.$digest()}catch(c){throw g(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&I.push(b);t()},$on:function(a,b){var c=this.$$listeners[a];
+c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(c[d]=null,A(e,1,a))}},$emit:function(a,b){var c=[],d,e=this,f=!1,h={name:a,targetScope:e,stopPropagation:function(){f=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},l=Za([h],arguments,1),k,m;do{d=e.$$listeners[a]||c;h.currentScope=e;k=0;for(m=d.length;k<m;k++)if(d[k])try{d[k].apply(null,
+l)}catch(r){g(r)}else d.splice(k,1),k--,m--;if(f)return h.currentScope=null,h;e=e.$parent}while(e);h.currentScope=null;return h},$broadcast:function(a,b){var c=this,d=this,e={name:a,targetScope:this,preventDefault:function(){e.defaultPrevented=!0},defaultPrevented:!1};if(!this.$$listenerCount[a])return e;for(var f=Za([e],arguments,1),h,l;c=d;){e.currentScope=c;d=c.$$listeners[a]||[];h=0;for(l=d.length;h<l;h++)if(d[h])try{d[h].apply(null,f)}catch(k){g(k)}else d.splice(h,1),h--,l--;if(!(d=c.$$listenerCount[a]&&
+c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}e.currentScope=null;return e}};var p=new m,x=p.$$asyncQueue=[],y=p.$$postDigestQueue=[],I=p.$$applyAsyncQueue=[];return p}]}function ge(){var b=/^\s*(https?|ftp|mailto|tel|file):/,a=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(a){return y(a)?(b=a,this):b};this.imgSrcSanitizationWhitelist=function(b){return y(b)?(a=b,this):a};this.$get=function(){return function(c,d){var e=
+d?a:b,f;f=Aa(c).href;return""===f||f.match(e)?c:"unsafe:"+f}}}function Yf(b){if("self"===b)return b;if(L(b)){if(-1<b.indexOf("***"))throw Ca("iwcard",b);b=td(b).replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*");return new RegExp("^"+b+"$")}if(Va(b))return new RegExp("^"+b.source+"$");throw Ca("imatcher");}function ud(b){var a=[];y(b)&&n(b,function(b){a.push(Yf(b))});return a}function mf(){this.SCE_CONTEXTS=oa;var b=["self"],a=[];this.resourceUrlWhitelist=function(a){arguments.length&&(b=ud(a));return b};
+this.resourceUrlBlacklist=function(b){arguments.length&&(a=ud(b));return a};this.$get=["$injector",function(c){function d(a,b){return"self"===a?fd(b):!!a.exec(b.href)}function e(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var f=function(a){throw Ca("unsafe");};c.has("$sanitize")&&(f=c.get("$sanitize"));
+var g=e(),h={};h[oa.HTML]=e(g);h[oa.CSS]=e(g);h[oa.URL]=e(g);h[oa.JS]=e(g);h[oa.RESOURCE_URL]=e(h[oa.URL]);return{trustAs:function(a,b){var c=h.hasOwnProperty(a)?h[a]:null;if(!c)throw Ca("icontext",a,b);if(null===b||b===u||""===b)return b;if("string"!==typeof b)throw Ca("itype",a);return new c(b)},getTrusted:function(c,e){if(null===e||e===u||""===e)return e;var g=h.hasOwnProperty(c)?h[c]:null;if(g&&e instanceof g)return e.$$unwrapTrustedValue();if(c===oa.RESOURCE_URL){var g=Aa(e.toString()),r,s,n=
+!1;r=0;for(s=b.length;r<s;r++)if(d(b[r],g)){n=!0;break}if(n)for(r=0,s=a.length;r<s;r++)if(d(a[r],g)){n=!1;break}if(n)return e;throw Ca("insecurl",e.toString());}if(c===oa.HTML)return f(e);throw Ca("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function lf(){var b=!0;this.enabled=function(a){arguments.length&&(b=!!a);return b};this.$get=["$parse","$sceDelegate",function(a,c){if(b&&8>gb)throw Ca("iequirks");var d=fa(oa);d.isEnabled=function(){return b};d.trustAs=
+c.trustAs;d.getTrusted=c.getTrusted;d.valueOf=c.valueOf;b||(d.trustAs=d.getTrusted=function(a,b){return b},d.valueOf=Ua);d.parseAs=function(b,c){var e=a(c);return e.literal&&e.constant?e:a(c,function(a){return d.getTrusted(b,a)})};var e=d.parseAs,f=d.getTrusted,g=d.trustAs;n(oa,function(a,b){var c=E(b);d[eb("parse_as_"+c)]=function(b){return e(a,b)};d[eb("get_trusted_"+c)]=function(b){return f(a,b)};d[eb("trust_as_"+c)]=function(b){return g(a,b)}});return d}]}function nf(){this.$get=["$window","$document",
+function(b,a){var c={},d=Y((/android (\d+)/.exec(E((b.navigator||{}).userAgent))||[])[1]),e=/Boxee/i.test((b.navigator||{}).userAgent),f=a[0]||{},g,h=/^(Moz|webkit|ms)(?=[A-Z])/,l=f.body&&f.body.style,k=!1,m=!1;if(l){for(var r in l)if(k=h.exec(r)){g=k[0];g=g.substr(0,1).toUpperCase()+g.substr(1);break}g||(g="WebkitOpacity"in l&&"webkit");k=!!("transition"in l||g+"Transition"in l);m=!!("animation"in l||g+"Animation"in l);!d||k&&m||(k=L(l.webkitTransition),m=L(l.webkitAnimation))}return{history:!(!b.history||
+!b.history.pushState||4>d||e),hasEvent:function(a){if("input"===a&&11>=gb)return!1;if(v(c[a])){var b=f.createElement("div");c[a]="on"+a in b}return c[a]},csp:cb(),vendorPrefix:g,transitions:k,animations:m,android:d}}]}function pf(){this.$get=["$templateCache","$http","$q",function(b,a,c){function d(e,f){d.totalPendingRequests++;var g=a.defaults&&a.defaults.transformResponse;K(g)?g=g.filter(function(a){return a!==$b}):g===$b&&(g=null);return a.get(e,{cache:b,transformResponse:g})["finally"](function(){d.totalPendingRequests--}).then(function(a){b.put(e,
+a.data);return a.data},function(a){if(!f)throw ea("tpload",e,a.status,a.statusText);return c.reject(a)})}d.totalPendingRequests=0;return d}]}function qf(){this.$get=["$rootScope","$browser","$location",function(b,a,c){return{findBindings:function(a,b,c){a=a.getElementsByClassName("ng-binding");var g=[];n(a,function(a){var d=aa.element(a).data("$binding");d&&n(d,function(d){c?(new RegExp("(^|\\s)"+td(b)+"(\\s|\\||$)")).test(d)&&g.push(a):-1!=d.indexOf(b)&&g.push(a)})});return g},findModels:function(a,
+b,c){for(var g=["ng-","data-ng-","ng\\:"],h=0;h<g.length;++h){var l=a.querySelectorAll("["+g[h]+"model"+(c?"=":"*=")+'"'+b+'"]');if(l.length)return l}},getLocation:function(){return c.url()},setLocation:function(a){a!==c.url()&&(c.url(a),b.$digest())},whenStable:function(b){a.notifyWhenNoOutstandingRequests(b)}}}]}function rf(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(b,a,c,d,e){function f(f,l,k){G(f)||(k=l,l=f,f=w);var m=ra.call(arguments,3),r=y(k)&&!k,s=(r?d:c).defer(),
+n=s.promise,q;q=a.defer(function(){try{s.resolve(f.apply(null,m))}catch(a){s.reject(a),e(a)}finally{delete g[n.$$timeoutId]}r||b.$apply()},l);n.$$timeoutId=q;g[q]=s;return n}var g={};f.cancel=function(b){return b&&b.$$timeoutId in g?(g[b.$$timeoutId].reject("canceled"),delete g[b.$$timeoutId],a.defer.cancel(b.$$timeoutId)):!1};return f}]}function Aa(b){gb&&(Z.setAttribute("href",b),b=Z.href);Z.setAttribute("href",b);return{href:Z.href,protocol:Z.protocol?Z.protocol.replace(/:$/,""):"",host:Z.host,
+search:Z.search?Z.search.replace(/^\?/,""):"",hash:Z.hash?Z.hash.replace(/^#/,""):"",hostname:Z.hostname,port:Z.port,pathname:"/"===Z.pathname.charAt(0)?Z.pathname:"/"+Z.pathname}}function fd(b){b=L(b)?Aa(b):b;return b.protocol===vd.protocol&&b.host===vd.host}function sf(){this.$get=qa(N)}function wd(b){function a(a){try{return decodeURIComponent(a)}catch(b){return a}}var c=b[0]||{},d={},e="";return function(){var b,g,h,l,k;b=c.cookie||"";if(b!==e)for(e=b,b=e.split("; "),d={},h=0;h<b.length;h++)g=
+b[h],l=g.indexOf("="),0<l&&(k=a(g.substring(0,l)),d[k]===u&&(d[k]=a(g.substring(l+1))));return d}}function xf(){this.$get=wd}function Kc(b){function a(c,d){if(C(c)){var e={};n(c,function(b,c){e[c]=a(c,b)});return e}return b.factory(c+"Filter",d)}this.register=a;this.$get=["$injector",function(a){return function(b){return a.get(b+"Filter")}}];a("currency",xd);a("date",yd);a("filter",Zf);a("json",$f);a("limitTo",ag);a("lowercase",bg);a("number",zd);a("orderBy",Ad);a("uppercase",cg)}function Zf(){return function(b,
+a,c){if(!Da(b)){if(null==b)return b;throw F("filter")("notarray",b);}var d;switch(ic(a)){case "function":break;case "boolean":case "null":case "number":case "string":d=!0;case "object":a=dg(a,c,d);break;default:return b}return Array.prototype.filter.call(b,a)}}function dg(b,a,c){var d=C(b)&&"$"in b;!0===a?a=ka:G(a)||(a=function(a,b){if(v(a))return!1;if(null===a||null===b)return a===b;var c;!(c=C(b))&&(c=C(a))&&(c=a,c=!(G(c.toString)&&c.toString!==Object.prototype.toString));if(c)return!1;a=E(""+a);
+b=E(""+b);return-1!==a.indexOf(b)});return function(e){return d&&!C(e)?La(e,b.$,a,!1):La(e,b,a,c)}}function La(b,a,c,d,e){var f=ic(b),g=ic(a);if("string"===g&&"!"===a.charAt(0))return!La(b,a.substring(1),c,d);if(K(b))return b.some(function(b){return La(b,a,c,d)});switch(f){case "object":var h;if(d){for(h in b)if("$"!==h.charAt(0)&&La(b[h],a,c,!0))return!0;return e?!1:La(b,a,c,!1)}if("object"===g){for(h in a)if(e=a[h],!G(e)&&!v(e)&&(f="$"===h,!La(f?b:b[h],e,c,f,f)))return!1;return!0}return c(b,a);
+case "function":return!1;default:return c(b,a)}}function ic(b){return null===b?"null":typeof b}function xd(b){var a=b.NUMBER_FORMATS;return function(b,d,e){v(d)&&(d=a.CURRENCY_SYM);v(e)&&(e=a.PATTERNS[1].maxFrac);return null==b?b:Bd(b,a.PATTERNS[1],a.GROUP_SEP,a.DECIMAL_SEP,e).replace(/\u00A4/g,d)}}function zd(b){var a=b.NUMBER_FORMATS;return function(b,d){return null==b?b:Bd(b,a.PATTERNS[0],a.GROUP_SEP,a.DECIMAL_SEP,d)}}function Bd(b,a,c,d,e){if(C(b))return"";var f=0>b;b=Math.abs(b);var g=Infinity===
+b;if(!g&&!isFinite(b))return"";var h=b+"",l="",k=!1,m=[];g&&(l="\u221e");if(!g&&-1!==h.indexOf("e")){var r=h.match(/([\d\.]+)e(-?)(\d+)/);r&&"-"==r[2]&&r[3]>e+1?b=0:(l=h,k=!0)}if(g||k)0<e&&1>b&&(l=b.toFixed(e),b=parseFloat(l));else{g=(h.split(Cd)[1]||"").length;v(e)&&(e=Math.min(Math.max(a.minFrac,g),a.maxFrac));b=+(Math.round(+(b.toString()+"e"+e)).toString()+"e"+-e);var g=(""+b).split(Cd),h=g[0],g=g[1]||"",r=0,s=a.lgSize,n=a.gSize;if(h.length>=s+n)for(r=h.length-s,k=0;k<r;k++)0===(r-k)%n&&0!==k&&
+(l+=c),l+=h.charAt(k);for(k=r;k<h.length;k++)0===(h.length-k)%s&&0!==k&&(l+=c),l+=h.charAt(k);for(;g.length<e;)g+="0";e&&"0"!==e&&(l+=d+g.substr(0,e))}0===b&&(f=!1);m.push(f?a.negPre:a.posPre,l,f?a.negSuf:a.posSuf);return m.join("")}function Gb(b,a,c){var d="";0>b&&(d="-",b=-b);for(b=""+b;b.length<a;)b="0"+b;c&&(b=b.substr(b.length-a));return d+b}function $(b,a,c,d){c=c||0;return function(e){e=e["get"+b]();if(0<c||e>-c)e+=c;0===e&&-12==c&&(e=12);return Gb(e,a,d)}}function Hb(b,a){return function(c,
+d){var e=c["get"+b](),f=pb(a?"SHORT"+b:b);return d[f][e]}}function Dd(b){var a=(new Date(b,0,1)).getDay();return new Date(b,0,(4>=a?5:12)-a)}function Ed(b){return function(a){var c=Dd(a.getFullYear());a=+new Date(a.getFullYear(),a.getMonth(),a.getDate()+(4-a.getDay()))-+c;a=1+Math.round(a/6048E5);return Gb(a,b)}}function jc(b,a){return 0>=b.getFullYear()?a.ERAS[0]:a.ERAS[1]}function yd(b){function a(a){var b;if(b=a.match(c)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,l=b[8]?a.setUTCHours:
+a.setHours;b[9]&&(f=Y(b[9]+b[10]),g=Y(b[9]+b[11]));h.call(a,Y(b[1]),Y(b[2])-1,Y(b[3]));f=Y(b[4]||0)-f;g=Y(b[5]||0)-g;h=Y(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));l.call(a,f,g,h,b)}return a}var c=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,e,f){var g="",h=[],l,k;e=e||"mediumDate";e=b.DATETIME_FORMATS[e]||e;L(c)&&(c=eg.test(c)?Y(c):a(c));V(c)&&(c=new Date(c));if(!da(c)||!isFinite(c.getTime()))return c;for(;e;)(k=
+fg.exec(e))?(h=Za(h,k,1),e=h.pop()):(h.push(e),e=null);var m=c.getTimezoneOffset();f&&(m=wc(f,c.getTimezoneOffset()),c=Pb(c,f,!0));n(h,function(a){l=gg[a];g+=l?l(c,b.DATETIME_FORMATS,m):a.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function $f(){return function(b,a){v(a)&&(a=2);return $a(b,a)}}function ag(){return function(b,a,c){a=Infinity===Math.abs(Number(a))?Number(a):Y(a);if(isNaN(a))return b;V(b)&&(b=b.toString());if(!K(b)&&!L(b))return b;c=!c||isNaN(c)?0:Y(c);c=0>c&&c>=-b.length?
+b.length+c:c;return 0<=a?b.slice(c,c+a):0===c?b.slice(a,b.length):b.slice(Math.max(0,c+a),c)}}function Ad(b){return function(a,c,d){function e(a,b){return b?function(b,c){return a(c,b)}:a}function f(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}function g(a){return null===a?"null":"function"===typeof a.valueOf&&(a=a.valueOf(),f(a))||"function"===typeof a.toString&&(a=a.toString(),f(a))?a:""}function h(a,b){var c=typeof a,d=typeof b;c===d&&"object"===c&&
+(a=g(a),b=g(b));return c===d?("string"===c&&(a=a.toLowerCase(),b=b.toLowerCase()),a===b?0:a<b?-1:1):c<d?-1:1}if(!Da(a))return a;c=K(c)?c:[c];0===c.length&&(c=["+"]);c=c.map(function(a){var c=!1,d=a||Ua;if(L(a)){if("+"==a.charAt(0)||"-"==a.charAt(0))c="-"==a.charAt(0),a=a.substring(1);if(""===a)return e(h,c);d=b(a);if(d.constant){var f=d();return e(function(a,b){return h(a[f],b[f])},c)}}return e(function(a,b){return h(d(a),d(b))},c)});return ra.call(a).sort(e(function(a,b){for(var d=0;d<c.length;d++){var e=
+c[d](a,b);if(0!==e)return e}return 0},d))}}function Ma(b){G(b)&&(b={link:b});b.restrict=b.restrict||"AC";return qa(b)}function Fd(b,a,c,d,e){var f=this,g=[],h=f.$$parentForm=b.parent().controller("form")||Ib;f.$error={};f.$$success={};f.$pending=u;f.$name=e(a.name||a.ngForm||"")(c);f.$dirty=!1;f.$pristine=!0;f.$valid=!0;f.$invalid=!1;f.$submitted=!1;h.$addControl(f);f.$rollbackViewValue=function(){n(g,function(a){a.$rollbackViewValue()})};f.$commitViewValue=function(){n(g,function(a){a.$commitViewValue()})};
+f.$addControl=function(a){Qa(a.$name,"input");g.push(a);a.$name&&(f[a.$name]=a)};f.$$renameControl=function(a,b){var c=a.$name;f[c]===a&&delete f[c];f[b]=a;a.$name=b};f.$removeControl=function(a){a.$name&&f[a.$name]===a&&delete f[a.$name];n(f.$pending,function(b,c){f.$setValidity(c,null,a)});n(f.$error,function(b,c){f.$setValidity(c,null,a)});n(f.$$success,function(b,c){f.$setValidity(c,null,a)});Ya(g,a)};Gd({ctrl:this,$element:b,set:function(a,b,c){var d=a[b];d?-1===d.indexOf(c)&&d.push(c):a[b]=
+[c]},unset:function(a,b,c){var d=a[b];d&&(Ya(d,c),0===d.length&&delete a[b])},parentForm:h,$animate:d});f.$setDirty=function(){d.removeClass(b,Sa);d.addClass(b,Jb);f.$dirty=!0;f.$pristine=!1;h.$setDirty()};f.$setPristine=function(){d.setClass(b,Sa,Jb+" ng-submitted");f.$dirty=!1;f.$pristine=!0;f.$submitted=!1;n(g,function(a){a.$setPristine()})};f.$setUntouched=function(){n(g,function(a){a.$setUntouched()})};f.$setSubmitted=function(){d.addClass(b,"ng-submitted");f.$submitted=!0;h.$setSubmitted()}}
+function kc(b){b.$formatters.push(function(a){return b.$isEmpty(a)?a:a.toString()})}function hb(b,a,c,d,e,f){var g=E(a[0].type);if(!e.android){var h=!1;a.on("compositionstart",function(a){h=!0});a.on("compositionend",function(){h=!1;l()})}var l=function(b){k&&(f.defer.cancel(k),k=null);if(!h){var e=a.val();b=b&&b.type;"password"===g||c.ngTrim&&"false"===c.ngTrim||(e=T(e));(d.$viewValue!==e||""===e&&d.$$hasNativeValidators)&&d.$setViewValue(e,b)}};if(e.hasEvent("input"))a.on("input",l);else{var k,
+m=function(a,b,c){k||(k=f.defer(function(){k=null;b&&b.value===c||l(a)}))};a.on("keydown",function(a){var b=a.keyCode;91===b||15<b&&19>b||37<=b&&40>=b||m(a,this,this.value)});if(e.hasEvent("paste"))a.on("paste cut",m)}a.on("change",l);d.$render=function(){a.val(d.$isEmpty(d.$viewValue)?"":d.$viewValue)}}function Kb(b,a){return function(c,d){var e,f;if(da(c))return c;if(L(c)){'"'==c.charAt(0)&&'"'==c.charAt(c.length-1)&&(c=c.substring(1,c.length-1));if(hg.test(c))return new Date(c);b.lastIndex=0;if(e=
+b.exec(c))return e.shift(),f=d?{yyyy:d.getFullYear(),MM:d.getMonth()+1,dd:d.getDate(),HH:d.getHours(),mm:d.getMinutes(),ss:d.getSeconds(),sss:d.getMilliseconds()/1E3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},n(e,function(b,c){c<a.length&&(f[a[c]]=+b)}),new Date(f.yyyy,f.MM-1,f.dd,f.HH,f.mm,f.ss||0,1E3*f.sss||0)}return NaN}}function ib(b,a,c,d){return function(e,f,g,h,l,k,m){function r(a){return a&&!(a.getTime&&a.getTime()!==a.getTime())}function s(a){return y(a)?da(a)?a:c(a):u}Hd(e,f,g,h);hb(e,
+f,g,h,l,k);var n=h&&h.$options&&h.$options.timezone,q;h.$$parserName=b;h.$parsers.push(function(b){return h.$isEmpty(b)?null:a.test(b)?(b=c(b,q),n&&(b=Pb(b,n)),b):u});h.$formatters.push(function(a){if(a&&!da(a))throw Lb("datefmt",a);if(r(a))return(q=a)&&n&&(q=Pb(q,n,!0)),m("date")(a,d,n);q=null;return""});if(y(g.min)||g.ngMin){var M;h.$validators.min=function(a){return!r(a)||v(M)||c(a)>=M};g.$observe("min",function(a){M=s(a);h.$validate()})}if(y(g.max)||g.ngMax){var t;h.$validators.max=function(a){return!r(a)||
+v(t)||c(a)<=t};g.$observe("max",function(a){t=s(a);h.$validate()})}}}function Hd(b,a,c,d){(d.$$hasNativeValidators=C(a[0].validity))&&d.$parsers.push(function(b){var c=a.prop("validity")||{};return c.badInput&&!c.typeMismatch?u:b})}function Id(b,a,c,d,e){if(y(d)){b=b(d);if(!b.constant)throw F("ngModel")("constexpr",c,d);return b(a)}return e}function lc(b,a){b="ngClass"+b;return["$animate",function(c){function d(a,b){var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],m=0;m<b.length;m++)if(e==b[m])continue a;
+c.push(e)}return c}function e(a){var b=[];return K(a)?(n(a,function(a){b=b.concat(e(a))}),b):L(a)?a.split(" "):C(a)?(n(a,function(a,c){a&&(b=b.concat(c.split(" ")))}),b):a}return{restrict:"AC",link:function(f,g,h){function l(a,b){var c=g.data("$classCounts")||ga(),d=[];n(a,function(a){if(0<b||c[a])c[a]=(c[a]||0)+b,c[a]===+(0<b)&&d.push(a)});g.data("$classCounts",c);return d.join(" ")}function k(b){if(!0===a||f.$index%2===a){var k=e(b||[]);if(!m){var n=l(k,1);h.$addClass(n)}else if(!ka(b,m)){var q=
+e(m),n=d(k,q),k=d(q,k),n=l(n,1),k=l(k,-1);n&&n.length&&c.addClass(g,n);k&&k.length&&c.removeClass(g,k)}}m=fa(b)}var m;f.$watch(h[b],k,!0);h.$observe("class",function(a){k(f.$eval(h[b]))});"ngClass"!==b&&f.$watch("$index",function(c,d){var g=c&1;if(g!==(d&1)){var k=e(f.$eval(h[b]));g===a?(g=l(k,1),h.$addClass(g)):(g=l(k,-1),h.$removeClass(g))}})}}}]}function Gd(b){function a(a,b){b&&!f[a]?(k.addClass(e,a),f[a]=!0):!b&&f[a]&&(k.removeClass(e,a),f[a]=!1)}function c(b,c){b=b?"-"+Ac(b,"-"):"";a(jb+b,!0===
+c);a(Jd+b,!1===c)}var d=b.ctrl,e=b.$element,f={},g=b.set,h=b.unset,l=b.parentForm,k=b.$animate;f[Jd]=!(f[jb]=e.hasClass(jb));d.$setValidity=function(b,e,f){e===u?(d.$pending||(d.$pending={}),g(d.$pending,b,f)):(d.$pending&&h(d.$pending,b,f),Kd(d.$pending)&&(d.$pending=u));Xa(e)?e?(h(d.$error,b,f),g(d.$$success,b,f)):(g(d.$error,b,f),h(d.$$success,b,f)):(h(d.$error,b,f),h(d.$$success,b,f));d.$pending?(a(Ld,!0),d.$valid=d.$invalid=u,c("",null)):(a(Ld,!1),d.$valid=Kd(d.$error),d.$invalid=!d.$valid,c("",
+d.$valid));e=d.$pending&&d.$pending[b]?u:d.$error[b]?!1:d.$$success[b]?!0:null;c(b,e);l.$setValidity(b,e,d)}}function Kd(b){if(b)for(var a in b)return!1;return!0}var ig=/^\/(.+)\/([a-z]*)$/,E=function(b){return L(b)?b.toLowerCase():b},kb=Object.prototype.hasOwnProperty,pb=function(b){return L(b)?b.toUpperCase():b},gb,z,la,ra=[].slice,Lf=[].splice,jg=[].push,sa=Object.prototype.toString,rc=Object.getPrototypeOf,Ea=F("ng"),aa=N.angular||(N.angular={}),db,lb=0;gb=W.documentMode;w.$inject=[];Ua.$inject=
+[];var K=Array.isArray,tc=/^\[object (Uint8(Clamped)?)|(Uint16)|(Uint32)|(Int8)|(Int16)|(Int32)|(Float(32)|(64))Array\]$/,T=function(b){return L(b)?b.trim():b},td=function(b){return b.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")},cb=function(){if(y(cb.isActive_))return cb.isActive_;var b=!(!W.querySelector("[ng-csp]")&&!W.querySelector("[data-ng-csp]"));if(!b)try{new Function("")}catch(a){b=!0}return cb.isActive_=b},nb=function(){if(y(nb.name_))return nb.name_;var b,a,
+c=Na.length,d,e;for(a=0;a<c;++a)if(d=Na[a],b=W.querySelector("["+d.replace(":","\\:")+"jq]")){e=b.getAttribute(d+"jq");break}return nb.name_=e},Na=["ng-","data-ng-","ng:","x-ng-"],ae=/[A-Z]/g,Bc=!1,Rb,pa=1,ab=3,ee={full:"1.4.0",major:1,minor:4,dot:0,codeName:"jaracimrman-existence"};R.expando="ng339";var ub=R.cache={},Df=1;R._data=function(b){return this.cache[b[this.expando]]||{}};var yf=/([\:\-\_]+(.))/g,zf=/^moz([A-Z])/,kg={mouseleave:"mouseout",mouseenter:"mouseover"},Ub=F("jqLite"),Cf=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,
+Tb=/<|&#?\w+;/,Af=/<([\w:]+)/,Bf=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ma={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ma.optgroup=ma.option;ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead;ma.th=ma.td;var Oa=R.prototype={ready:function(b){function a(){c||(c=
+!0,b())}var c=!1;"complete"===W.readyState?setTimeout(a):(this.on("DOMContentLoaded",a),R(N).on("load",a))},toString:function(){var b=[];n(this,function(a){b.push(""+a)});return"["+b.join(", ")+"]"},eq:function(b){return 0<=b?z(this[b]):z(this[this.length+b])},length:0,push:jg,sort:[].sort,splice:[].splice},zb={};n("multiple selected checked disabled readOnly required open".split(" "),function(b){zb[E(b)]=b});var Sc={};n("input select option textarea button form details".split(" "),function(b){Sc[b]=
+!0});var Tc={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern"};n({data:Wb,removeData:sb},function(b,a){R[a]=b});n({data:Wb,inheritedData:yb,scope:function(b){return z.data(b,"$scope")||yb(b.parentNode||b,["$isolateScope","$scope"])},isolateScope:function(b){return z.data(b,"$isolateScope")||z.data(b,"$isolateScopeNoTemplate")},controller:Pc,injector:function(b){return yb(b,"$injector")},removeAttr:function(b,a){b.removeAttribute(a)},hasClass:vb,css:function(b,
+a,c){a=eb(a);if(y(c))b.style[a]=c;else return b.style[a]},attr:function(b,a,c){var d=b.nodeType;if(d!==ab&&2!==d&&8!==d)if(d=E(a),zb[d])if(y(c))c?(b[a]=!0,b.setAttribute(a,d)):(b[a]=!1,b.removeAttribute(d));else return b[a]||(b.attributes.getNamedItem(a)||w).specified?d:u;else if(y(c))b.setAttribute(a,c);else if(b.getAttribute)return b=b.getAttribute(a,2),null===b?u:b},prop:function(b,a,c){if(y(c))b[a]=c;else return b[a]},text:function(){function b(a,b){if(v(b)){var d=a.nodeType;return d===pa||d===
+ab?a.textContent:""}a.textContent=b}b.$dv="";return b}(),val:function(b,a){if(v(a)){if(b.multiple&&"select"===ta(b)){var c=[];n(b.options,function(a){a.selected&&c.push(a.value||a.text)});return 0===c.length?null:c}return b.value}b.value=a},html:function(b,a){if(v(a))return b.innerHTML;rb(b,!0);b.innerHTML=a},empty:Qc},function(b,a){R.prototype[a]=function(a,d){var e,f,g=this.length;if(b!==Qc&&(2==b.length&&b!==vb&&b!==Pc?a:d)===u){if(C(a)){for(e=0;e<g;e++)if(b===Wb)b(this[e],a);else for(f in a)b(this[e],
+f,a[f]);return this}e=b.$dv;g=e===u?Math.min(g,1):g;for(f=0;f<g;f++){var h=b(this[f],a,d);e=e?e+h:h}return e}for(e=0;e<g;e++)b(this[e],a,d);return this}});n({removeData:sb,on:function a(c,d,e,f){if(y(f))throw Ub("onargs");if(Lc(c)){var g=tb(c,!0);f=g.events;var h=g.handle;h||(h=g.handle=Gf(c,f));for(var g=0<=d.indexOf(" ")?d.split(" "):[d],l=g.length;l--;){d=g[l];var k=f[d];k||(f[d]=[],"mouseenter"===d||"mouseleave"===d?a(c,kg[d],function(a){var c=a.relatedTarget;c&&(c===this||this.contains(c))||
+h(a,d)}):"$destroy"!==d&&c.addEventListener(d,h,!1),k=f[d]);k.push(e)}}},off:Oc,one:function(a,c,d){a=z(a);a.on(c,function f(){a.off(c,d);a.off(c,f)});a.on(c,d)},replaceWith:function(a,c){var d,e=a.parentNode;rb(a);n(new R(c),function(c){d?e.insertBefore(c,d.nextSibling):e.replaceChild(c,a);d=c})},children:function(a){var c=[];n(a.childNodes,function(a){a.nodeType===pa&&c.push(a)});return c},contents:function(a){return a.contentDocument||a.childNodes||[]},append:function(a,c){var d=a.nodeType;if(d===
+pa||11===d){c=new R(c);for(var d=0,e=c.length;d<e;d++)a.appendChild(c[d])}},prepend:function(a,c){if(a.nodeType===pa){var d=a.firstChild;n(new R(c),function(c){a.insertBefore(c,d)})}},wrap:function(a,c){c=z(c).eq(0).clone()[0];var d=a.parentNode;d&&d.replaceChild(c,a);c.appendChild(a)},remove:Xb,detach:function(a){Xb(a,!0)},after:function(a,c){var d=a,e=a.parentNode;c=new R(c);for(var f=0,g=c.length;f<g;f++){var h=c[f];e.insertBefore(h,d.nextSibling);d=h}},addClass:xb,removeClass:wb,toggleClass:function(a,
+c,d){c&&n(c.split(" "),function(c){var f=d;v(f)&&(f=!vb(a,c));(f?xb:wb)(a,c)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){return a.nextElementSibling},find:function(a,c){return a.getElementsByTagName?a.getElementsByTagName(c):[]},clone:Vb,triggerHandler:function(a,c,d){var e,f,g=c.type||c,h=tb(a);if(h=(h=h&&h.events)&&h[g])e={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=
+!0},isImmediatePropagationStopped:function(){return!0===this.immediatePropagationStopped},stopPropagation:w,type:g,target:a},c.type&&(e=Q(e,c)),c=fa(h),f=d?[e].concat(d):[e],n(c,function(c){e.isImmediatePropagationStopped()||c.apply(a,f)})}},function(a,c){R.prototype[c]=function(c,e,f){for(var g,h=0,l=this.length;h<l;h++)v(g)?(g=a(this[h],c,e,f),y(g)&&(g=z(g))):Nc(g,a(this[h],c,e,f));return y(g)?g:this};R.prototype.bind=R.prototype.on;R.prototype.unbind=R.prototype.off});Ra.prototype={put:function(a,
+c){this[Fa(a,this.nextUid)]=c},get:function(a){return this[Fa(a,this.nextUid)]},remove:function(a){var c=this[a=Fa(a,this.nextUid)];delete this[a];return c}};var wf=[function(){this.$get=[function(){return Ra}]}],Vc=/^function\s*[^\(]*\(\s*([^\)]*)\)/m,lg=/,/,mg=/^\s*(_?)(\S+?)\1\s*$/,Uc=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Ga=F("$injector");bb.$$annotate=function(a,c,d){var e;if("function"===typeof a){if(!(e=a.$inject)){e=[];if(a.length){if(c)throw L(d)&&d||(d=a.name||Hf(a)),Ga("strictdi",d);c=a.toString().replace(Uc,
+"");c=c.match(Vc);n(c[1].split(lg),function(a){a.replace(mg,function(a,c,d){e.push(d)})})}a.$inject=e}}else K(a)?(c=a.length-1,Pa(a[c],"fn"),e=a.slice(0,c)):Pa(a,"fn",!0);return e};var Md=F("$animate"),Te=function(){this.$get=["$q","$$rAF",function(a,c){function d(){}d.all=w;d.chain=w;d.prototype={end:w,cancel:w,resume:w,pause:w,complete:w,then:function(d,f){return a(function(a){c(function(){a()})}).then(d,f)}};return d}]},Se=function(){var a=new Ra,c=[];this.$get=["$$AnimateRunner","$rootScope",
+function(d,e){function f(d,f,l){var k=a.get(d);k||(a.put(d,k={}),c.push(d));f&&n(f.split(" "),function(a){a&&(k[a]=!0)});l&&n(l.split(" "),function(a){a&&(k[a]=!1)});1<c.length||e.$$postDigest(function(){n(c,function(c){var d=a.get(c);if(d){var e=If(c.attr("class")),f="",g="";n(d,function(a,c){a!==!!e[c]&&(a?f+=(f.length?" ":"")+c:g+=(g.length?" ":"")+c)});n(c,function(a){f&&xb(a,f);g&&wb(a,g)});a.remove(c)}});c.length=0})}return{enabled:w,on:w,off:w,pin:w,push:function(a,c,e,k){k&&k();e=e||{};e.from&&
+a.css(e.from);e.to&&a.css(e.to);(e.addClass||e.removeClass)&&f(a,e.addClass,e.removeClass);return new d}}}]},Re=["$provide",function(a){var c=this;this.$$registeredAnimations=Object.create(null);this.register=function(d,e){if(d&&"."!==d.charAt(0))throw Md("notcsel",d);var f=d+"-animation";c.$$registeredAnimations[d.substr(1)]=f;a.factory(f,e)};this.classNameFilter=function(a){if(1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?a:null)&&/(\s+|\/)ng-animate(\s+|\/)/.test(this.$$classNameFilter.toString()))throw Md("nongcls",
+"ng-animate");return this.$$classNameFilter};this.$get=["$$animateQueue",function(a){function c(a,d,e){if(e){var l;a:{for(l=0;l<e.length;l++){var k=e[l];if(1===k.nodeType){l=k;break a}}l=void 0}!l||l.parentNode||l.previousElementSibling||(e=null)}e?e.after(a):d.prepend(a)}return{on:a.on,off:a.off,pin:a.pin,enabled:a.enabled,cancel:function(a){a.end&&a.end()},enter:function(f,g,h,l){g=g&&z(g);h=h&&z(h);g=g||h.parent();c(f,g,h);return a.push(f,"enter",Ha(l))},move:function(f,g,h,l){g=g&&z(g);h=h&&z(h);
+g=g||h.parent();c(f,g,h);return a.push(f,"move",Ha(l))},leave:function(c,e){return a.push(c,"leave",Ha(e),function(){c.remove()})},addClass:function(c,e,h){h=Ha(h);h.addClass=fb(h.addclass,e);return a.push(c,"addClass",h)},removeClass:function(c,e,h){h=Ha(h);h.removeClass=fb(h.removeClass,e);return a.push(c,"removeClass",h)},setClass:function(c,e,h,l){l=Ha(l);l.addClass=fb(l.addClass,e);l.removeClass=fb(l.removeClass,h);return a.push(c,"setClass",l)},animate:function(c,e,h,l,k){k=Ha(k);k.from=k.from?
+Q(k.from,e):e;k.to=k.to?Q(k.to,h):h;k.tempClasses=fb(k.tempClasses,l||"ng-inline-animate");return a.push(c,"animate",k)}}}]}],ea=F("$compile");Dc.$inject=["$provide","$$sanitizeUriProvider"];var Yc=/^((?:x|data)[\:\-_])/i,Mf=F("$controller"),Wc=/^(\S+)(\s+as\s+(\w+))?$/,bd="application/json",ac={"Content-Type":bd+";charset=utf-8"},Of=/^\[|^\{(?!\{)/,Pf={"[":/]$/,"{":/}$/},Nf=/^\)\]\}',?\n/,Ka=aa.$interpolateMinErr=F("$interpolate");Ka.throwNoconcat=function(a){throw Ka("noconcat",a);};Ka.interr=function(a,
+c){return Ka("interr",a,c.toString())};var ng=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,Sf={http:80,https:443,ftp:21},Cb=F("$location"),og={$$html5:!1,$$replace:!1,absUrl:Db("$$absUrl"),url:function(a){if(v(a))return this.$$url;var c=ng.exec(a);(c[1]||""===a)&&this.path(decodeURIComponent(c[1]));(c[2]||c[1]||""===a)&&this.search(c[3]||"");this.hash(c[5]||"");return this},protocol:Db("$$protocol"),host:Db("$$host"),port:Db("$$port"),path:jd("$$path",function(a){a=null!==a?a.toString():"";return"/"==a.charAt(0)?
+a:"/"+a}),search:function(a,c){switch(arguments.length){case 0:return this.$$search;case 1:if(L(a)||V(a))a=a.toString(),this.$$search=yc(a);else if(C(a))a=ua(a,{}),n(a,function(c,e){null==c&&delete a[e]}),this.$$search=a;else throw Cb("isrcharg");break;default:v(c)||null===c?delete this.$$search[a]:this.$$search[a]=c}this.$$compose();return this},hash:jd("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};n([id,ec,dc],function(a){a.prototype=Object.create(og);
+a.prototype.state=function(c){if(!arguments.length)return this.$$state;if(a!==dc||!this.$$html5)throw Cb("nostate");this.$$state=v(c)?null:c;return this}});var ca=F("$parse"),Tf=Function.prototype.call,Uf=Function.prototype.apply,Vf=Function.prototype.bind,Mb=ga();n("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),function(a){Mb[a]=!0});var pg={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},gc=function(a){this.options=a};gc.prototype={constructor:gc,lex:function(a){this.text=a;this.index=
+0;for(this.tokens=[];this.index<this.text.length;)if(a=this.text.charAt(this.index),'"'===a||"'"===a)this.readString(a);else if(this.isNumber(a)||"."===a&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(a))this.readIdent();else if(this.is(a,"(){}[].,;:?"))this.tokens.push({index:this.index,text:a}),this.index++;else if(this.isWhitespace(a))this.index++;else{var c=a+this.peek(),d=c+this.peek(2),e=Mb[c],f=Mb[d];Mb[a]||e||f?(a=f?d:e?c:a,this.tokens.push({index:this.index,text:a,operator:!0}),
+this.index+=a.length):this.throwError("Unexpected next character ",this.index,this.index+1)}return this.tokens},is:function(a,c){return-1!==c.indexOf(a)},peek:function(a){a=a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a&&"string"===typeof a},isWhitespace:function(a){return" "===a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===
+a||"+"===a||this.isNumber(a)},throwError:function(a,c,d){d=d||this.index;c=y(c)?"s "+c+"-"+this.index+" ["+this.text.substring(c,d)+"]":" "+d;throw ca("lexerr",a,c,this.text);},readNumber:function(){for(var a="",c=this.index;this.index<this.text.length;){var d=E(this.text.charAt(this.index));if("."==d||this.isNumber(d))a+=d;else{var e=this.peek();if("e"==d&&this.isExpOperator(e))a+=d;else if(this.isExpOperator(d)&&e&&this.isNumber(e)&&"e"==a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||
+e&&this.isNumber(e)||"e"!=a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}this.tokens.push({index:c,text:a,constant:!0,value:Number(a)})},readIdent:function(){for(var a=this.index;this.index<this.text.length;){var c=this.text.charAt(this.index);if(!this.isIdent(c)&&!this.isNumber(c))break;this.index++}this.tokens.push({index:a,text:this.text.slice(a,this.index),identifier:!0})},readString:function(a){var c=this.index;this.index++;for(var d="",e=a,f=!1;this.index<this.text.length;){var g=
+this.text.charAt(this.index),e=e+g;if(f)"u"===g?(f=this.text.substring(this.index+1,this.index+5),f.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+f+"]"),this.index+=4,d+=String.fromCharCode(parseInt(f,16))):d+=pg[g]||g,f=!1;else if("\\"===g)f=!0;else{if(g===a){this.index++;this.tokens.push({index:c,text:e,constant:!0,value:d});return}d+=g}this.index++}this.throwError("Unterminated quote",c)}};var q=function(a,c){this.lexer=a;this.options=c};q.Program="Program";q.ExpressionStatement=
+"ExpressionStatement";q.AssignmentExpression="AssignmentExpression";q.ConditionalExpression="ConditionalExpression";q.LogicalExpression="LogicalExpression";q.BinaryExpression="BinaryExpression";q.UnaryExpression="UnaryExpression";q.CallExpression="CallExpression";q.MemberExpression="MemberExpression";q.Identifier="Identifier";q.Literal="Literal";q.ArrayExpression="ArrayExpression";q.Property="Property";q.ObjectExpression="ObjectExpression";q.ThisExpression="ThisExpression";q.NGValueParameter="NGValueParameter";
+q.prototype={ast:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.program();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);return a},program:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.expressionStatement()),!this.expect(";"))return{type:q.Program,body:a}},expressionStatement:function(){return{type:q.ExpressionStatement,expression:this.filterChain()}},filterChain:function(){for(var a=this.expression();this.expect("|");)a=
+this.filter(a);return a},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary();this.expect("=")&&(a={type:q.AssignmentExpression,left:a,right:this.assignment(),operator:"="});return a},ternary:function(){var a=this.logicalOR(),c,d;return this.expect("?")&&(c=this.expression(),this.consume(":"))?(d=this.expression(),{type:q.ConditionalExpression,test:a,alternate:c,consequent:d}):a},logicalOR:function(){for(var a=this.logicalAND();this.expect("||");)a={type:q.LogicalExpression,
+operator:"||",left:a,right:this.logicalAND()};return a},logicalAND:function(){for(var a=this.equality();this.expect("&&");)a={type:q.LogicalExpression,operator:"&&",left:a,right:this.equality()};return a},equality:function(){for(var a=this.relational(),c;c=this.expect("==","!=","===","!==");)a={type:q.BinaryExpression,operator:c.text,left:a,right:this.relational()};return a},relational:function(){for(var a=this.additive(),c;c=this.expect("<",">","<=",">=");)a={type:q.BinaryExpression,operator:c.text,
+left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),c;c=this.expect("+","-");)a={type:q.BinaryExpression,operator:c.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),c;c=this.expect("*","/","%");)a={type:q.BinaryExpression,operator:c.text,left:a,right:this.unary()};return a},unary:function(){var a;return(a=this.expect("+","-","!"))?{type:q.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:this.primary()},
+primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.constants.hasOwnProperty(this.peek().text)?a=ua(this.constants[this.consume().text]):this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():this.throwError("not a primary expression",this.peek());for(var c;c=this.expect("(","[",".");)"("===c.text?(a={type:q.CallExpression,callee:a,arguments:this.parseArguments()},
+this.consume(")")):"["===c.text?(a={type:q.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===c.text?a={type:q.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");return a},filter:function(a){a=[a];for(var c={type:q.CallExpression,callee:this.identifier(),arguments:a,filter:!0};this.expect(":");)a.push(this.expression());return c},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.expression());
+while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:q.Identifier,name:a.text}},constant:function(){return{type:q.Literal,value:this.consume().value}},arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;a.push(this.expression())}while(this.expect(","))}this.consume("]");return{type:q.ArrayExpression,elements:a}},object:function(){var a=[],c;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;
+c={type:q.Property,kind:"init"};this.peek().constant?c.key=this.constant():this.peek().identifier?c.key=this.identifier():this.throwError("invalid key",this.peek());this.consume(":");c.value=this.expression();a.push(c)}while(this.expect(","))}this.consume("}");return{type:q.ObjectExpression,properties:a}},throwError:function(a,c){throw ca("syntax",c.text,a,c.index+1,this.text,this.text.substring(c.index));},consume:function(a){if(0===this.tokens.length)throw ca("ueoe",this.text);var c=this.expect(a);
+c||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return c},peekToken:function(){if(0===this.tokens.length)throw ca("ueoe",this.text);return this.tokens[0]},peek:function(a,c,d,e){return this.peekAhead(0,a,c,d,e)},peekAhead:function(a,c,d,e,f){if(this.tokens.length>a){a=this.tokens[a];var g=a.text;if(g===c||g===d||g===e||g===f||!(c||d||e||f))return a}return!1},expect:function(a,c,d,e){return(a=this.peek(a,c,d,e))?(this.tokens.shift(),a):!1},constants:{"true":{type:q.Literal,value:!0},
+"false":{type:q.Literal,value:!1},"null":{type:q.Literal,value:null},undefined:{type:q.Literal,value:u},"this":{type:q.ThisExpression}}};qd.prototype={compile:function(a,c){var d=this,e=this.astBuilder.ast(a);this.state={nextId:0,filters:{},expensiveChecks:c,fn:{vars:[],body:[],own:{}},assign:{vars:[],body:[],own:{}},inputs:[]};U(e,d.$filter);var f="",g;this.stage="assign";if(g=od(e))this.state.computing="assign",f=this.nextId(),this.recurse(g,f),f="fn.assign="+this.generateFunction("assign","s,v,l");
+g=md(e.body);d.stage="inputs";n(g,function(a,c){var e="fn"+c;d.state[e]={vars:[],body:[],own:{}};d.state.computing=e;var f=d.nextId();d.recurse(a,f);d.return_(f);d.state.inputs.push(e);a.watchId=c});this.state.computing="fn";this.stage="main";this.recurse(e);f='"'+this.USE+" "+this.STRICT+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+f+this.watchFns()+"return fn;";f=(new Function("$filter","ensureSafeMemberName","ensureSafeObject","ensureSafeFunction","ifDefined","plus",
+"text",f))(this.$filter,Ba,na,kd,Wf,ld,a);this.state=this.stage=u;f.literal=pd(e);f.constant=e.constant;return f},USE:"use",STRICT:"strict",watchFns:function(){var a=[],c=this.state.inputs,d=this;n(c,function(c){a.push("var "+c+"="+d.generateFunction(c,"s"))});c.length&&a.push("fn.inputs=["+c.join(",")+"];");return a.join("")},generateFunction:function(a,c){return"function("+c+"){"+this.varsPrefix(a)+this.body(a)+"};"},filterPrefix:function(){var a=[],c=this;n(this.state.filters,function(d,e){a.push(d+
+"=$filter("+c.escape(e)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?"var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},recurse:function(a,c,d,e,f,g){var h,l,k=this,m,r;e=e||w;if(!g&&y(a.watchId))c=c||this.nextId(),this.if_("i",this.lazyAssign(c,this.computedMember("i",a.watchId)),this.lazyRecurse(a,c,d,e,f,!0));else switch(a.type){case q.Program:n(a.body,function(c,d){k.recurse(c.expression,
+u,u,function(a){l=a});d!==a.body.length-1?k.current().body.push(l,";"):k.return_(l)});break;case q.Literal:r=this.escape(a.value);this.assign(c,r);e(r);break;case q.UnaryExpression:this.recurse(a.argument,u,u,function(a){l=a});r=a.operator+"("+this.ifDefined(l,0)+")";this.assign(c,r);e(r);break;case q.BinaryExpression:this.recurse(a.left,u,u,function(a){h=a});this.recurse(a.right,u,u,function(a){l=a});r="+"===a.operator?this.plus(h,l):"-"===a.operator?this.ifDefined(h,0)+a.operator+this.ifDefined(l,
+0):"("+h+")"+a.operator+"("+l+")";this.assign(c,r);e(r);break;case q.LogicalExpression:c=c||this.nextId();k.recurse(a.left,c);k.if_("&&"===a.operator?c:k.not(c),k.lazyRecurse(a.right,c));e(c);break;case q.ConditionalExpression:c=c||this.nextId();k.recurse(a.test,c);k.if_(c,k.lazyRecurse(a.alternate,c),k.lazyRecurse(a.consequent,c));e(c);break;case q.Identifier:c=c||this.nextId();d&&(d.context="inputs"===k.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,
+d.name=a.name);Ba(a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===k.stage||"s",function(){f&&1!==f&&k.if_(k.not(k.nonComputedMember("s",a.name)),k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(c,k.nonComputedMember("s",a.name))})},c&&k.lazyAssign(c,k.nonComputedMember("l",a.name)));(k.state.expensiveChecks||Fb(a.name))&&k.addEnsureSafeObject(c);e(c);break;case q.MemberExpression:h=d&&(d.context=this.nextId())||this.nextId();c=c||this.nextId();
+k.recurse(a.object,h,u,function(){k.if_(k.notNull(h),function(){if(a.computed)l=k.nextId(),k.recurse(a.property,l),k.addEnsureSafeMemberName(l),f&&1!==f&&k.if_(k.not(k.computedMember(h,l)),k.lazyAssign(k.computedMember(h,l),"{}")),r=k.ensureSafeObject(k.computedMember(h,l)),k.assign(c,r),d&&(d.computed=!0,d.name=l);else{Ba(a.property.name);f&&1!==f&&k.if_(k.not(k.nonComputedMember(h,a.property.name)),k.lazyAssign(k.nonComputedMember(h,a.property.name),"{}"));r=k.nonComputedMember(h,a.property.name);
+if(k.state.expensiveChecks||Fb(a.property.name))r=k.ensureSafeObject(r);k.assign(c,r);d&&(d.computed=!1,d.name=a.property.name)}e(c)})},!!f);break;case q.CallExpression:c=c||this.nextId();a.filter?(l=k.filter(a.callee.name),m=[],n(a.arguments,function(a){var c=k.nextId();k.recurse(a,c);m.push(c)}),r=l+"("+m.join(",")+")",k.assign(c,r),e(c)):(l=k.nextId(),h={},m=[],k.recurse(a.callee,l,h,function(){k.if_(k.notNull(l),function(){k.addEnsureSafeFunction(l);n(a.arguments,function(a){k.recurse(a,k.nextId(),
+u,function(a){m.push(k.ensureSafeObject(a))})});h.name?(k.state.expensiveChecks||k.addEnsureSafeObject(h.context),r=k.member(h.context,h.name,h.computed)+"("+m.join(",")+")"):r=l+"("+m.join(",")+")";r=k.ensureSafeObject(r);k.assign(c,r);e(c)})}));break;case q.AssignmentExpression:l=this.nextId();h={};if(!nd(a.left))throw ca("lval");this.recurse(a.left,u,h,function(){k.if_(k.notNull(h.context),function(){k.recurse(a.right,l);k.addEnsureSafeObject(k.member(h.context,h.name,h.computed));r=k.member(h.context,
+h.name,h.computed)+a.operator+l;k.assign(c,r);e(c||r)})},1);break;case q.ArrayExpression:m=[];n(a.elements,function(a){k.recurse(a,k.nextId(),u,function(a){m.push(a)})});r="["+m.join(",")+"]";this.assign(c,r);e(r);break;case q.ObjectExpression:m=[];n(a.properties,function(a){k.recurse(a.value,k.nextId(),u,function(c){m.push(k.escape(a.key.type===q.Identifier?a.key.name:""+a.key.value)+":"+c)})});r="{"+m.join(",")+"}";this.assign(c,r);e(r);break;case q.ThisExpression:this.assign(c,"s");e("s");break;
+case q.NGValueParameter:this.assign(c,"v"),e("v")}},getHasOwnProperty:function(a,c){var d=a+"."+c,e=this.current().own;e.hasOwnProperty(d)||(e[d]=this.nextId(!1,a+"&&("+this.escape(c)+" in "+a+")"));return e[d]},assign:function(a,c){if(a)return this.current().body.push(a,"=",c,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,c){return"ifDefined("+a+","+this.escape(c)+")"},plus:function(a,c){return"plus("+
+a+","+c+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,c,d){if(!0===a)c();else{var e=this.current().body;e.push("if(",a,"){");c();e.push("}");d&&(e.push("else{"),d(),e.push("}"))}},not:function(a){return"!("+a+")"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,c){return a+"."+c},computedMember:function(a,c){return a+"["+c+"]"},member:function(a,c,d){return d?this.computedMember(a,c):this.nonComputedMember(a,c)},addEnsureSafeObject:function(a){this.current().body.push(this.ensureSafeObject(a),
+";")},addEnsureSafeMemberName:function(a){this.current().body.push(this.ensureSafeMemberName(a),";")},addEnsureSafeFunction:function(a){this.current().body.push(this.ensureSafeFunction(a),";")},ensureSafeObject:function(a){return"ensureSafeObject("+a+",text)"},ensureSafeMemberName:function(a){return"ensureSafeMemberName("+a+",text)"},ensureSafeFunction:function(a){return"ensureSafeFunction("+a+",text)"},lazyRecurse:function(a,c,d,e,f,g){var h=this;return function(){h.recurse(a,c,d,e,f,g)}},lazyAssign:function(a,
+c){var d=this;return function(){d.assign(a,c)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(L(a))return"'"+a.replace(this.stringEscapeRegex,this.stringEscapeFn)+"'";if(V(a))return a.toString();if(!0===a)return"true";if(!1===a)return"false";if(null===a)return"null";if("undefined"===typeof a)return"undefined";throw ca("esc");},nextId:function(a,c){var d="v"+this.state.nextId++;a||this.current().vars.push(d+
+(c?"="+c:""));return d},current:function(){return this.state[this.state.computing]}};rd.prototype={compile:function(a,c){var d=this,e=this.astBuilder.ast(a);this.expression=a;this.expensiveChecks=c;U(e,d.$filter);var f,g;if(f=od(e))g=this.recurse(f);f=md(e.body);var h;f&&(h=[],n(f,function(a,c){var e=d.recurse(a);a.input=e;h.push(e);a.watchId=c}));var l=[];n(e.body,function(a){l.push(d.recurse(a.expression))});f=0===e.body.length?function(){}:1===e.body.length?l[0]:function(a,c){var d;n(l,function(e){d=
+e(a,c)});return d};g&&(f.assign=function(a,c,d){return g(a,d,c)});h&&(f.inputs=h);f.literal=pd(e);f.constant=e.constant;return f},recurse:function(a,c,d){var e,f,g=this,h;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case q.Literal:return this.value(a.value,c);case q.UnaryExpression:return f=this.recurse(a.argument),this["unary"+a.operator](f,c);case q.BinaryExpression:return e=this.recurse(a.left),f=this.recurse(a.right),this["binary"+a.operator](e,f,c);case q.LogicalExpression:return e=
+this.recurse(a.left),f=this.recurse(a.right),this["binary"+a.operator](e,f,c);case q.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),c);case q.Identifier:return Ba(a.name,g.expression),g.identifier(a.name,g.expensiveChecks||Fb(a.name),c,d,g.expression);case q.MemberExpression:return e=this.recurse(a.object,!1,!!d),a.computed||(Ba(a.property.name,g.expression),f=a.property.name),a.computed&&(f=this.recurse(a.property)),a.computed?
+this.computedMember(e,f,c,d,g.expression):this.nonComputedMember(e,f,g.expensiveChecks,c,d,g.expression);case q.CallExpression:return h=[],n(a.arguments,function(a){h.push(g.recurse(a))}),a.filter&&(f=this.$filter(a.callee.name)),a.filter||(f=this.recurse(a.callee,!0)),a.filter?function(a,d,e,g){for(var n=[],q=0;q<h.length;++q)n.push(h[q](a,d,e,g));a=f.apply(u,n,g);return c?{context:u,name:u,value:a}:a}:function(a,d,e,r){var n=f(a,d,e,r),q;if(null!=n.value){na(n.context,g.expression);kd(n.value,g.expression);
+q=[];for(var u=0;u<h.length;++u)q.push(na(h[u](a,d,e,r),g.expression));q=na(n.value.apply(n.context,q),g.expression)}return c?{value:q}:q};case q.AssignmentExpression:return e=this.recurse(a.left,!0,1),f=this.recurse(a.right),function(a,d,h,n){var s=e(a,d,h,n);a=f(a,d,h,n);na(s.value,g.expression);s.context[s.name]=a;return c?{value:a}:a};case q.ArrayExpression:return h=[],n(a.elements,function(a){h.push(g.recurse(a))}),function(a,d,e,f){for(var g=[],n=0;n<h.length;++n)g.push(h[n](a,d,e,f));return c?
+{value:g}:g};case q.ObjectExpression:return h=[],n(a.properties,function(a){h.push({key:a.key.type===q.Identifier?a.key.name:""+a.key.value,value:g.recurse(a.value)})}),function(a,d,e,f){for(var g={},n=0;n<h.length;++n)g[h[n].key]=h[n].value(a,d,e,f);return c?{value:g}:g};case q.ThisExpression:return function(a){return c?{value:a}:a};case q.NGValueParameter:return function(a,d,e,f){return c?{value:e}:e}}},"unary+":function(a,c){return function(d,e,f,g){d=a(d,e,f,g);d=y(d)?+d:0;return c?{value:d}:
+d}},"unary-":function(a,c){return function(d,e,f,g){d=a(d,e,f,g);d=y(d)?-d:0;return c?{value:d}:d}},"unary!":function(a,c){return function(d,e,f,g){d=!a(d,e,f,g);return c?{value:d}:d}},"binary+":function(a,c,d){return function(e,f,g,h){var l=a(e,f,g,h);e=c(e,f,g,h);l=ld(l,e);return d?{value:l}:l}},"binary-":function(a,c,d){return function(e,f,g,h){var l=a(e,f,g,h);e=c(e,f,g,h);l=(y(l)?l:0)-(y(e)?e:0);return d?{value:l}:l}},"binary*":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)*c(e,f,g,h);
+return d?{value:e}:e}},"binary/":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)/c(e,f,g,h);return d?{value:e}:e}},"binary%":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)%c(e,f,g,h);return d?{value:e}:e}},"binary===":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)===c(e,f,g,h);return d?{value:e}:e}},"binary!==":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)!==c(e,f,g,h);return d?{value:e}:e}},"binary==":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)==c(e,f,g,h);return d?
+{value:e}:e}},"binary!=":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)!=c(e,f,g,h);return d?{value:e}:e}},"binary<":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)<c(e,f,g,h);return d?{value:e}:e}},"binary>":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)>c(e,f,g,h);return d?{value:e}:e}},"binary<=":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)<=c(e,f,g,h);return d?{value:e}:e}},"binary>=":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)>=c(e,f,g,h);return d?{value:e}:
+e}},"binary&&":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)&&c(e,f,g,h);return d?{value:e}:e}},"binary||":function(a,c,d){return function(e,f,g,h){e=a(e,f,g,h)||c(e,f,g,h);return d?{value:e}:e}},"ternary?:":function(a,c,d,e){return function(f,g,h,l){f=a(f,g,h,l)?c(f,g,h,l):d(f,g,h,l);return e?{value:f}:f}},value:function(a,c){return function(){return c?{context:u,name:u,value:a}:a}},identifier:function(a,c,d,e,f){return function(g,h,l,k){g=h&&a in h?h:g;e&&1!==e&&g&&!g[a]&&(g[a]={});h=g?
+g[a]:u;c&&na(h,f);return d?{context:g,name:a,value:h}:h}},computedMember:function(a,c,d,e,f){return function(g,h,l,k){var m=a(g,h,l,k),n,s;null!=m&&(n=c(g,h,l,k),Ba(n,f),e&&1!==e&&m&&!m[n]&&(m[n]={}),s=m[n],na(s,f));return d?{context:m,name:n,value:s}:s}},nonComputedMember:function(a,c,d,e,f,g){return function(h,l,k,m){h=a(h,l,k,m);f&&1!==f&&h&&!h[c]&&(h[c]={});l=null!=h?h[c]:u;(d||Fb(c))&&na(l,g);return e?{context:h,name:c,value:l}:l}},inputs:function(a,c){return function(d,e,f,g){return g?g[c]:
+a(d,e,f)}}};var hc=function(a,c,d){this.lexer=a;this.$filter=c;this.options=d;this.ast=new q(this.lexer);this.astCompiler=d.csp?new rd(this.ast,c):new qd(this.ast,c)};hc.prototype={constructor:hc,parse:function(a){return this.astCompiler.compile(a,this.options.expensiveChecks)}};ga();ga();var Xf=Object.prototype.valueOf,Ca=F("$sce"),oa={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},ea=F("$compile"),Z=W.createElement("a"),vd=Aa(N.location.href);wd.$inject=["$document"];Kc.$inject=
+["$provide"];xd.$inject=["$locale"];zd.$inject=["$locale"];var Cd=".",gg={yyyy:$("FullYear",4),yy:$("FullYear",2,0,!0),y:$("FullYear",1),MMMM:Hb("Month"),MMM:Hb("Month",!0),MM:$("Month",2,1),M:$("Month",1,1),dd:$("Date",2),d:$("Date",1),HH:$("Hours",2),H:$("Hours",1),hh:$("Hours",2,-12),h:$("Hours",1,-12),mm:$("Minutes",2),m:$("Minutes",1),ss:$("Seconds",2),s:$("Seconds",1),sss:$("Milliseconds",3),EEEE:Hb("Day"),EEE:Hb("Day",!0),a:function(a,c){return 12>a.getHours()?c.AMPMS[0]:c.AMPMS[1]},Z:function(a,
+c,d){a=-1*d;return a=(0<=a?"+":"")+(Gb(Math[0<a?"floor":"ceil"](a/60),2)+Gb(Math.abs(a%60),2))},ww:Ed(2),w:Ed(1),G:jc,GG:jc,GGG:jc,GGGG:function(a,c){return 0>=a.getFullYear()?c.ERANAMES[0]:c.ERANAMES[1]}},fg=/((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,eg=/^\-?\d+$/;yd.$inject=["$locale"];var bg=qa(E),cg=qa(pb);Ad.$inject=["$parse"];var he=qa({restrict:"E",compile:function(a,c){if(!c.href&&!c.xlinkHref)return function(a,c){if("a"===c[0].nodeName.toLowerCase()){var f=
+"[object SVGAnimatedString]"===sa.call(c.prop("href"))?"xlink:href":"href";c.on("click",function(a){c.attr(f)||a.preventDefault()})}}}}),qb={};n(zb,function(a,c){function d(a,d,f){a.$watch(f[e],function(a){f.$set(c,!!a)})}if("multiple"!=a){var e=xa("ng-"+c),f=d;"checked"===a&&(f=function(a,c,f){f.ngModel!==f[e]&&d(a,c,f)});qb[e]=function(){return{restrict:"A",priority:100,link:f}}}});n(Tc,function(a,c){qb[c]=function(){return{priority:100,link:function(a,e,f){if("ngPattern"===c&&"/"==f.ngPattern.charAt(0)&&
+(e=f.ngPattern.match(ig))){f.$set("ngPattern",new RegExp(e[1],e[2]));return}a.$watch(f[c],function(a){f.$set(c,a)})}}}});n(["src","srcset","href"],function(a){var c=xa("ng-"+a);qb[c]=function(){return{priority:99,link:function(d,e,f){var g=a,h=a;"href"===a&&"[object SVGAnimatedString]"===sa.call(e.prop("href"))&&(h="xlinkHref",f.$attr[h]="xlink:href",g=null);f.$observe(c,function(c){c?(f.$set(h,c),gb&&g&&e.prop(g,f[h])):"href"===a&&f.$set(h,null)})}}}});var Ib={$addControl:w,$$renameControl:function(a,
+c){a.$name=c},$removeControl:w,$setValidity:w,$setDirty:w,$setPristine:w,$setSubmitted:w};Fd.$inject=["$element","$attrs","$scope","$animate","$interpolate"];var Nd=function(a){return["$timeout",function(c){return{name:"form",restrict:a?"EAC":"E",controller:Fd,compile:function(d,e){d.addClass(Sa).addClass(jb);var f=e.name?"name":a&&e.ngForm?"ngForm":!1;return{pre:function(a,d,e,k){if(!("action"in e)){var m=function(c){a.$apply(function(){k.$commitViewValue();k.$setSubmitted()});c.preventDefault()};
+d[0].addEventListener("submit",m,!1);d.on("$destroy",function(){c(function(){d[0].removeEventListener("submit",m,!1)},0,!1)})}var n=k.$$parentForm;f&&(Eb(a,k.$name,k,k.$name),e.$observe(f,function(c){k.$name!==c&&(Eb(a,k.$name,u,k.$name),n.$$renameControl(k,c),Eb(a,k.$name,k,k.$name))}));d.on("$destroy",function(){n.$removeControl(k);f&&Eb(a,e[f],u,k.$name);Q(k,Ib)})}}}}}]},ie=Nd(),ve=Nd(!0),hg=/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,qg=/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/,
+rg=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,sg=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/,Od=/^(\d{4})-(\d{2})-(\d{2})$/,Pd=/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,mc=/^(\d{4})-W(\d\d)$/,Qd=/^(\d{4})-(\d\d)$/,Rd=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Sd={text:function(a,c,d,e,f,g){hb(a,c,d,e,f,g);kc(e)},date:ib("date",Od,Kb(Od,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":ib("datetimelocal",Pd,Kb(Pd,"yyyy MM dd HH mm ss sss".split(" ")),
+"yyyy-MM-ddTHH:mm:ss.sss"),time:ib("time",Rd,Kb(Rd,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:ib("week",mc,function(a,c){if(da(a))return a;if(L(a)){mc.lastIndex=0;var d=mc.exec(a);if(d){var e=+d[1],f=+d[2],g=d=0,h=0,l=0,k=Dd(e),f=7*(f-1);c&&(d=c.getHours(),g=c.getMinutes(),h=c.getSeconds(),l=c.getMilliseconds());return new Date(e,0,k.getDate()+f,d,g,h,l)}}return NaN},"yyyy-Www"),month:ib("month",Qd,Kb(Qd,["yyyy","MM"]),"yyyy-MM"),number:function(a,c,d,e,f,g){Hd(a,c,d,e);hb(a,c,d,e,f,g);e.$$parserName=
+"number";e.$parsers.push(function(a){return e.$isEmpty(a)?null:sg.test(a)?parseFloat(a):u});e.$formatters.push(function(a){if(!e.$isEmpty(a)){if(!V(a))throw Lb("numfmt",a);a=a.toString()}return a});if(y(d.min)||d.ngMin){var h;e.$validators.min=function(a){return e.$isEmpty(a)||v(h)||a>=h};d.$observe("min",function(a){y(a)&&!V(a)&&(a=parseFloat(a,10));h=V(a)&&!isNaN(a)?a:u;e.$validate()})}if(y(d.max)||d.ngMax){var l;e.$validators.max=function(a){return e.$isEmpty(a)||v(l)||a<=l};d.$observe("max",function(a){y(a)&&
+!V(a)&&(a=parseFloat(a,10));l=V(a)&&!isNaN(a)?a:u;e.$validate()})}},url:function(a,c,d,e,f,g){hb(a,c,d,e,f,g);kc(e);e.$$parserName="url";e.$validators.url=function(a,c){var d=a||c;return e.$isEmpty(d)||qg.test(d)}},email:function(a,c,d,e,f,g){hb(a,c,d,e,f,g);kc(e);e.$$parserName="email";e.$validators.email=function(a,c){var d=a||c;return e.$isEmpty(d)||rg.test(d)}},radio:function(a,c,d,e){v(d.name)&&c.attr("name",++lb);c.on("click",function(a){c[0].checked&&e.$setViewValue(d.value,a&&a.type)});e.$render=
+function(){c[0].checked=d.value==e.$viewValue};d.$observe("value",e.$render)},checkbox:function(a,c,d,e,f,g,h,l){var k=Id(l,a,"ngTrueValue",d.ngTrueValue,!0),m=Id(l,a,"ngFalseValue",d.ngFalseValue,!1);c.on("click",function(a){e.$setViewValue(c[0].checked,a&&a.type)});e.$render=function(){c[0].checked=e.$viewValue};e.$isEmpty=function(a){return!1===a};e.$formatters.push(function(a){return ka(a,k)});e.$parsers.push(function(a){return a?k:m})},hidden:w,button:w,submit:w,reset:w,file:w},Ec=["$browser",
+"$sniffer","$filter","$parse",function(a,c,d,e){return{restrict:"E",require:["?ngModel"],link:{pre:function(f,g,h,l){l[0]&&(Sd[E(h.type)]||Sd.text)(f,g,h,l[0],c,a,d,e)}}}}],tg=/^(true|false|\d+)$/,Ne=function(){return{restrict:"A",priority:100,compile:function(a,c){return tg.test(c.ngValue)?function(a,c,f){f.$set("value",a.$eval(f.ngValue))}:function(a,c,f){a.$watch(f.ngValue,function(a){f.$set("value",a)})}}}},ne=["$compile",function(a){return{restrict:"AC",compile:function(c){a.$$addBindingClass(c);
+return function(c,e,f){a.$$addBindingInfo(e,f.ngBind);e=e[0];c.$watch(f.ngBind,function(a){e.textContent=a===u?"":a})}}}}],pe=["$interpolate","$compile",function(a,c){return{compile:function(d){c.$$addBindingClass(d);return function(d,f,g){d=a(f.attr(g.$attr.ngBindTemplate));c.$$addBindingInfo(f,d.expressions);f=f[0];g.$observe("ngBindTemplate",function(a){f.textContent=a===u?"":a})}}}}],oe=["$sce","$parse","$compile",function(a,c,d){return{restrict:"A",compile:function(e,f){var g=c(f.ngBindHtml),
+h=c(f.ngBindHtml,function(a){return(a||"").toString()});d.$$addBindingClass(e);return function(c,e,f){d.$$addBindingInfo(e,f.ngBindHtml);c.$watch(h,function(){e.html(a.getTrustedHtml(g(c))||"")})}}}}],Me=qa({restrict:"A",require:"ngModel",link:function(a,c,d,e){e.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),qe=lc("",!0),se=lc("Odd",0),re=lc("Even",1),te=Ma({compile:function(a,c){c.$set("ngCloak",u);a.removeClass("ng-cloak")}}),ue=[function(){return{restrict:"A",scope:!0,controller:"@",
+priority:500}}],Jc={},ug={blur:!0,focus:!0};n("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var c=xa("ng-"+a);Jc[c]=["$parse","$rootScope",function(d,e){return{restrict:"A",compile:function(f,g){var h=d(g[c],null,!0);return function(c,d){d.on(a,function(d){var f=function(){h(c,{$event:d})};ug[a]&&e.$$phase?c.$evalAsync(f):c.$apply(f)})}}}}]});var xe=["$animate",function(a){return{multiElement:!0,
+transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(c,d,e,f,g){var h,l,k;c.$watch(e.ngIf,function(c){c?l||g(function(c,f){l=f;c[c.length++]=W.createComment(" end ngIf: "+e.ngIf+" ");h={clone:c};a.enter(c,d.parent(),d)}):(k&&(k.remove(),k=null),l&&(l.$destroy(),l=null),h&&(k=ob(h.clone),a.leave(k).then(function(){k=null}),h=null))})}}}],ye=["$templateRequest","$anchorScroll","$animate","$sce",function(a,c,d,e){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",
+controller:aa.noop,compile:function(f,g){var h=g.ngInclude||g.src,l=g.onload||"",k=g.autoscroll;return function(f,g,n,q,u){var v=0,t,p,x,w=function(){p&&(p.remove(),p=null);t&&(t.$destroy(),t=null);x&&(d.leave(x).then(function(){p=null}),p=x,x=null)};f.$watch(e.parseAsResourceUrl(h),function(e){var h=function(){!y(k)||k&&!f.$eval(k)||c()},n=++v;e?(a(e,!0).then(function(a){if(n===v){var c=f.$new();q.template=a;a=u(c,function(a){w();d.enter(a,null,g).then(h)});t=c;x=a;t.$emit("$includeContentLoaded",
+e);f.$eval(l)}},function(){n===v&&(w(),f.$emit("$includeContentError",e))}),f.$emit("$includeContentRequested",e)):(w(),q.template=null)})}}}}],Pe=["$compile",function(a){return{restrict:"ECA",priority:-400,require:"ngInclude",link:function(c,d,e,f){/SVG/.test(d[0].toString())?(d.empty(),a(Mc(f.template,W).childNodes)(c,function(a){d.append(a)},{futureParentElement:d})):(d.html(f.template),a(d.contents())(c))}}}],ze=Ma({priority:450,compile:function(){return{pre:function(a,c,d){a.$eval(d.ngInit)}}}}),
+Le=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,c,d,e){var f=c.attr(d.$attr.ngList)||", ",g="false"!==d.ngTrim,h=g?T(f):f;e.$parsers.push(function(a){if(!v(a)){var c=[];a&&n(a.split(h),function(a){a&&c.push(g?T(a):a)});return c}});e.$formatters.push(function(a){return K(a)?a.join(f):u});e.$isEmpty=function(a){return!a||!a.length}}}},jb="ng-valid",Jd="ng-invalid",Sa="ng-pristine",Jb="ng-dirty",Ld="ng-pending",Lb=new F("ngModel"),vg=["$scope","$exceptionHandler","$attrs",
+"$element","$parse","$animate","$timeout","$rootScope","$q","$interpolate",function(a,c,d,e,f,g,h,l,k,m){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=u;this.$validators={};this.$asyncValidators={};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=u;this.$name=m(d.name||"",!1)(a);var r=f(d.ngModel),s=r.assign,q=r,H=s,
+M=null,t,p=this;this.$$setOptions=function(a){if((p.$options=a)&&a.getterSetter){var c=f(d.ngModel+"()"),g=f(d.ngModel+"($$$p)");q=function(a){var d=r(a);G(d)&&(d=c(a));return d};H=function(a,c){G(r(a))?g(a,{$$$p:p.$modelValue}):s(a,p.$modelValue)}}else if(!r.assign)throw Lb("nonassign",d.ngModel,va(e));};this.$render=w;this.$isEmpty=function(a){return v(a)||""===a||null===a||a!==a};var x=e.inheritedData("$formController")||Ib,z=0;Gd({ctrl:this,$element:e,set:function(a,c){a[c]=!0},unset:function(a,
+c){delete a[c]},parentForm:x,$animate:g});this.$setPristine=function(){p.$dirty=!1;p.$pristine=!0;g.removeClass(e,Jb);g.addClass(e,Sa)};this.$setDirty=function(){p.$dirty=!0;p.$pristine=!1;g.removeClass(e,Sa);g.addClass(e,Jb);x.$setDirty()};this.$setUntouched=function(){p.$touched=!1;p.$untouched=!0;g.setClass(e,"ng-untouched","ng-touched")};this.$setTouched=function(){p.$touched=!0;p.$untouched=!1;g.setClass(e,"ng-touched","ng-untouched")};this.$rollbackViewValue=function(){h.cancel(M);p.$viewValue=
+p.$$lastCommittedViewValue;p.$render()};this.$validate=function(){if(!V(p.$modelValue)||!isNaN(p.$modelValue)){var a=p.$$rawModelValue,c=p.$valid,d=p.$modelValue,e=p.$options&&p.$options.allowInvalid;p.$$runValidators(a,p.$$lastCommittedViewValue,function(f){e||c===f||(p.$modelValue=f?a:u,p.$modelValue!==d&&p.$$writeModelToScope())})}};this.$$runValidators=function(a,c,d){function e(){var d=!0;n(p.$validators,function(e,f){var h=e(a,c);d=d&&h;g(f,h)});return d?!0:(n(p.$asyncValidators,function(a,
+c){g(c,null)}),!1)}function f(){var d=[],e=!0;n(p.$asyncValidators,function(f,h){var k=f(a,c);if(!k||!G(k.then))throw Lb("$asyncValidators",k);g(h,u);d.push(k.then(function(){g(h,!0)},function(a){e=!1;g(h,!1)}))});d.length?k.all(d).then(function(){h(e)},w):h(!0)}function g(a,c){l===z&&p.$setValidity(a,c)}function h(a){l===z&&d(a)}z++;var l=z;(function(){var a=p.$$parserName||"parse";if(t===u)g(a,null);else return t||(n(p.$validators,function(a,c){g(c,null)}),n(p.$asyncValidators,function(a,c){g(c,
+null)})),g(a,t),t;return!0})()?e()?f():h(!1):h(!1)};this.$commitViewValue=function(){var a=p.$viewValue;h.cancel(M);if(p.$$lastCommittedViewValue!==a||""===a&&p.$$hasNativeValidators)p.$$lastCommittedViewValue=a,p.$pristine&&this.$setDirty(),this.$$parseAndValidate()};this.$$parseAndValidate=function(){var c=p.$$lastCommittedViewValue;if(t=v(c)?u:!0)for(var d=0;d<p.$parsers.length;d++)if(c=p.$parsers[d](c),v(c)){t=!1;break}V(p.$modelValue)&&isNaN(p.$modelValue)&&(p.$modelValue=q(a));var e=p.$modelValue,
+f=p.$options&&p.$options.allowInvalid;p.$$rawModelValue=c;f&&(p.$modelValue=c,p.$modelValue!==e&&p.$$writeModelToScope());p.$$runValidators(c,p.$$lastCommittedViewValue,function(a){f||(p.$modelValue=a?c:u,p.$modelValue!==e&&p.$$writeModelToScope())})};this.$$writeModelToScope=function(){H(a,p.$modelValue);n(p.$viewChangeListeners,function(a){try{a()}catch(d){c(d)}})};this.$setViewValue=function(a,c){p.$viewValue=a;p.$options&&!p.$options.updateOnDefault||p.$$debounceViewValueCommit(c)};this.$$debounceViewValueCommit=
+function(c){var d=0,e=p.$options;e&&y(e.debounce)&&(e=e.debounce,V(e)?d=e:V(e[c])?d=e[c]:V(e["default"])&&(d=e["default"]));h.cancel(M);d?M=h(function(){p.$commitViewValue()},d):l.$$phase?p.$commitViewValue():a.$apply(function(){p.$commitViewValue()})};a.$watch(function(){var c=q(a);if(c!==p.$modelValue&&(p.$modelValue===p.$modelValue||c===c)){p.$modelValue=p.$$rawModelValue=c;t=u;for(var d=p.$formatters,e=d.length,f=c;e--;)f=d[e](f);p.$viewValue!==f&&(p.$viewValue=p.$$lastCommittedViewValue=f,p.$render(),
+p.$$runValidators(c,f,w))}return c})}],Ke=["$rootScope",function(a){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:vg,priority:1,compile:function(c){c.addClass(Sa).addClass("ng-untouched").addClass(jb);return{pre:function(a,c,f,g){var h=g[0],l=g[1]||Ib;h.$$setOptions(g[2]&&g[2].$options);l.$addControl(h);f.$observe("name",function(a){h.$name!==a&&l.$$renameControl(h,a)});a.$on("$destroy",function(){l.$removeControl(h)})},post:function(c,e,f,g){var h=g[0];if(h.$options&&
+h.$options.updateOn)e.on(h.$options.updateOn,function(a){h.$$debounceViewValueCommit(a&&a.type)});e.on("blur",function(e){h.$touched||(a.$$phase?c.$evalAsync(h.$setTouched):c.$apply(h.$setTouched))})}}}}}],wg=/(\s+|^)default(\s+|$)/,Oe=function(){return{restrict:"A",controller:["$scope","$attrs",function(a,c){var d=this;this.$options=ua(a.$eval(c.ngModelOptions));this.$options.updateOn!==u?(this.$options.updateOnDefault=!1,this.$options.updateOn=T(this.$options.updateOn.replace(wg,function(){d.$options.updateOnDefault=
+!0;return" "}))):this.$options.updateOnDefault=!0}]}},Ae=Ma({terminal:!0,priority:1E3}),xg=F("ngOptions"),yg=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,Ie=["$compile","$parse",function(a,c){function d(a,d,e){function f(a,c,d,e,g){this.selectValue=a;this.viewValue=c;this.label=d;this.group=e;this.disabled=g}
+var m=a.match(yg);if(!m)throw xg("iexp",a,va(d));var n=m[5]||m[7],s=m[6];a=/ as /.test(m[0])&&m[1];var q=m[9];d=c(m[2]?m[1]:n);var u=a&&c(a)||d,v=q&&c(q),t=q?function(a,c){return v(e,c)}:function(a){return Fa(a)},p=function(a,c){return t(a,D(a,c))},x=c(m[2]||m[1]),w=c(m[3]||""),y=c(m[4]||""),B=c(m[8]),z={},D=s?function(a,c){z[s]=c;z[n]=a;return z}:function(a){z[n]=a;return z};return{trackBy:q,getTrackByValue:p,getWatchables:c(B,function(a){var c=[];a=a||[];Object.keys(a).forEach(function(d){var f=
+D(a[d],d);d=t(a[d],f);c.push(d);if(m[2]||m[1])d=x(e,f),c.push(d);m[4]&&(f=y(e,f),c.push(f))});return c}),getOptions:function(){var a=[],c={},d=B(e)||[],g;if(!s&&Da(d))g=d;else{g=[];for(var h in d)d.hasOwnProperty(h)&&"$"!==h.charAt(0)&&g.push(h)}h=g.length;for(var m=0;m<h;m++){var n=d===g?m:g[m],r=D(d[n],n),v=u(e,r),n=t(v,r),z=x(e,r),M=w(e,r),r=y(e,r),v=new f(n,v,z,M,r);a.push(v);c[n]=v}return{items:a,selectValueMap:c,getOptionFromViewValue:function(a){return c[p(a)]},getViewValueFromOption:function(a){return q?
+aa.copy(a.viewValue):a.viewValue}}}}}var e=W.createElement("option"),f=W.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","?ngModel"],link:function(c,h,l,k){function m(a,c){a.element=c;c.disabled=a.disabled;a.value!==c.value&&(c.value=a.selectValue);a.label!==c.label&&(c.label=a.label,c.textContent=a.label)}function r(a,c,d,e){c&&E(c.nodeName)===d?d=c:(d=e.cloneNode(!1),c?a.insertBefore(d,c):a.appendChild(d));return d}function q(a){for(var c;a;)c=a.nextSibling,Xb(a),a=c}
+function u(a){var c=p&&p[0],d=O&&O[0];if(c||d)for(;a&&(a===c||a===d);)a=a.nextSibling;return a}function v(){var a=D&&t.readValue();D=C.getOptions();var c={},d=h[0].firstChild;B&&h.prepend(p);d=u(d);D.items.forEach(function(a){var g,k;a.group?(g=c[a.group],g||(g=r(h[0],d,"optgroup",f),d=g.nextSibling,g.label=a.group,g=c[a.group]={groupElement:g,currentOptionElement:g.firstChild}),k=r(g.groupElement,g.currentOptionElement,"option",e),m(a,k),g.currentOptionElement=k.nextSibling):(k=r(h[0],d,"option",
+e),m(a,k),d=k.nextSibling)});Object.keys(c).forEach(function(a){q(c[a].currentOptionElement)});q(d);w.$render();if(!w.$isEmpty(a)){var g=t.readValue();if(C.trackBy&&!ka(a,g)||a!==g)w.$setViewValue(g),w.$render()}}var w=k[1];if(w){var t=k[0];k=l.multiple;for(var p,x=0,y=h.children(),I=y.length;x<I;x++)if(""===y[x].value){p=y.eq(x);break}var B=!!p,O=z(e.cloneNode(!1));O.val("?");var D,C=d(l.ngOptions,h,c);k?(w.$isEmpty=function(a){return!a||0===a.length},t.writeValue=function(a){D.items.forEach(function(a){a.element.selected=
+!1});a&&a.forEach(function(a){(a=D.getOptionFromViewValue(a))&&!a.disabled&&(a.element.selected=!0)})},t.readValue=function(){var a=h.val()||[],c=[];n(a,function(a){a=D.selectValueMap[a];a.disabled||c.push(D.getViewValueFromOption(a))});return c},C.trackBy&&c.$watchCollection(function(){if(K(w.$viewValue))return w.$viewValue.map(function(a){return C.getTrackByValue(a)})},function(){w.$render()})):(t.writeValue=function(a){var c=D.getOptionFromViewValue(a);c&&!c.disabled?h[0].value!==c.selectValue&&
+(O.remove(),B||p.remove(),h[0].value=c.selectValue,c.element.selected=!0,c.element.setAttribute("selected","selected")):null===a||B?(O.remove(),B||h.prepend(p),h.val(""),p.prop("selected",!0),p.attr("selected",!0)):(B||p.remove(),h.prepend(O),h.val("?"),O.prop("selected",!0),O.attr("selected",!0))},t.readValue=function(){var a=D.selectValueMap[h.val()];return a&&!a.disabled?(B||p.remove(),O.remove(),D.getViewValueFromOption(a)):null},C.trackBy&&c.$watch(function(){return C.getTrackByValue(w.$viewValue)},
+function(){w.$render()}));B?(p.remove(),a(p)(c),p.removeClass("ng-scope")):p=z(e.cloneNode(!1));v();c.$watchCollection(C.getWatchables,v)}}}}],Be=["$locale","$interpolate","$log",function(a,c,d){var e=/{}/g,f=/^when(Minus)?(.+)$/;return{link:function(g,h,l){function k(a){h.text(a||"")}var m=l.count,r=l.$attr.when&&h.attr(l.$attr.when),q=l.offset||0,u=g.$eval(r)||{},z={},y=c.startSymbol(),t=c.endSymbol(),p=y+m+"-"+q+t,x=aa.noop,C;n(l,function(a,c){var d=f.exec(c);d&&(d=(d[1]?"-":"")+E(d[2]),u[d]=h.attr(l.$attr[c]))});
+n(u,function(a,d){z[d]=c(a.replace(e,p))});g.$watch(m,function(c){var e=parseFloat(c),f=isNaN(e);f||e in u||(e=a.pluralCat(e-q));e===C||f&&V(C)&&isNaN(C)||(x(),f=z[e],v(f)?(null!=c&&d.debug("ngPluralize: no rule defined for '"+e+"' in "+r),x=w,k()):x=g.$watch(f,k),C=e)})}}}],Ce=["$parse","$animate",function(a,c){var d=F("ngRepeat"),e=function(a,c,d,e,k,m,n){a[d]=e;k&&(a[k]=m);a.$index=c;a.$first=0===c;a.$last=c===n-1;a.$middle=!(a.$first||a.$last);a.$odd=!(a.$even=0===(c&1))};return{restrict:"A",
+multiElement:!0,transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,compile:function(f,g){var h=g.ngRepeat,l=W.createComment(" end ngRepeat: "+h+" "),k=h.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);if(!k)throw d("iexp",h);var m=k[1],r=k[2],q=k[3],v=k[4],k=m.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/);if(!k)throw d("iidexp",m);var w=k[3]||k[1],y=k[2];if(q&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(q)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(q)))throw d("badident",
+q);var t,p,x,C,I={$id:Fa};v?t=a(v):(x=function(a,c){return Fa(c)},C=function(a){return a});return function(a,f,g,k,m){t&&(p=function(c,d,e){y&&(I[y]=c);I[w]=d;I.$index=e;return t(a,I)});var v=ga();a.$watchCollection(r,function(g){var k,r,t=f[0],A,D=ga(),I,G,L,F,K,E,N;q&&(a[q]=g);if(Da(g))K=g,r=p||x;else for(N in r=p||C,K=[],g)g.hasOwnProperty(N)&&"$"!==N.charAt(0)&&K.push(N);I=K.length;N=Array(I);for(k=0;k<I;k++)if(G=g===K?k:K[k],L=g[G],F=r(G,L,k),v[F])E=v[F],delete v[F],D[F]=E,N[k]=E;else{if(D[F])throw n(N,
+function(a){a&&a.scope&&(v[a.id]=a)}),d("dupes",h,F,L);N[k]={id:F,scope:u,clone:u};D[F]=!0}for(A in v){E=v[A];F=ob(E.clone);c.leave(F);if(F[0].parentNode)for(k=0,r=F.length;k<r;k++)F[k].$$NG_REMOVED=!0;E.scope.$destroy()}for(k=0;k<I;k++)if(G=g===K?k:K[k],L=g[G],E=N[k],E.scope){A=t;do A=A.nextSibling;while(A&&A.$$NG_REMOVED);E.clone[0]!=A&&c.move(ob(E.clone),null,z(t));t=E.clone[E.clone.length-1];e(E.scope,k,w,L,y,G,I)}else m(function(a,d){E.scope=d;var f=l.cloneNode(!1);a[a.length++]=f;c.enter(a,
+null,z(t));t=f;E.clone=a;D[E.id]=E;e(E.scope,k,w,L,y,G,I)});v=D})}}}}],De=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(c,d,e){c.$watch(e.ngShow,function(c){a[c?"removeClass":"addClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],we=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(c,d,e){c.$watch(e.ngHide,function(c){a[c?"addClass":"removeClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Ee=Ma(function(a,c,d){a.$watch(d.ngStyle,
+function(a,d){d&&a!==d&&n(d,function(a,d){c.css(d,"")});a&&c.css(a)},!0)}),Fe=["$animate",function(a){return{require:"ngSwitch",controller:["$scope",function(){this.cases={}}],link:function(c,d,e,f){var g=[],h=[],l=[],k=[],m=function(a,c){return function(){a.splice(c,1)}};c.$watch(e.ngSwitch||e.on,function(c){var d,e;d=0;for(e=l.length;d<e;++d)a.cancel(l[d]);d=l.length=0;for(e=k.length;d<e;++d){var q=ob(h[d].clone);k[d].$destroy();(l[d]=a.leave(q)).then(m(l,d))}h.length=0;k.length=0;(g=f.cases["!"+
+c]||f.cases["?"])&&n(g,function(c){c.transclude(function(d,e){k.push(e);var f=c.element;d[d.length++]=W.createComment(" end ngSwitchWhen: ");h.push({clone:d});a.enter(d,f.parent(),f)})})})}}}],Ge=Ma({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,c,d,e,f){e.cases["!"+d.ngSwitchWhen]=e.cases["!"+d.ngSwitchWhen]||[];e.cases["!"+d.ngSwitchWhen].push({transclude:f,element:c})}}),He=Ma({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,
+c,d,e,f){e.cases["?"]=e.cases["?"]||[];e.cases["?"].push({transclude:f,element:c})}}),Je=Ma({restrict:"EAC",link:function(a,c,d,e,f){if(!f)throw F("ngTransclude")("orphan",va(c));f(function(a){c.empty();c.append(a)})}}),je=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(c,d){"text/ng-template"==d.type&&a.put(d.id,c[0].text)}}}],zg={$setViewValue:w,$render:w},Ag=["$element","$scope","$attrs",function(a,c,d){var e=this,f=new Ra;e.ngModelCtrl=zg;e.unknownOption=z(W.createElement("option"));
+e.renderUnknownOption=function(c){c="? "+Fa(c)+" ?";e.unknownOption.val(c);a.prepend(e.unknownOption);a.val(c)};c.$on("$destroy",function(){e.renderUnknownOption=w});e.removeUnknownOption=function(){e.unknownOption.parent()&&e.unknownOption.remove()};e.readValue=function(){e.removeUnknownOption();return a.val()};e.writeValue=function(c){e.hasOption(c)?(e.removeUnknownOption(),a.val(c),""===c&&e.emptyOption.prop("selected",!0)):null==c&&e.emptyOption?(e.removeUnknownOption(),a.val("")):e.renderUnknownOption(c)};
+e.addOption=function(a,c){Qa(a,'"option value"');""===a&&(e.emptyOption=c);var d=f.get(a)||0;f.put(a,d+1)};e.removeOption=function(a){var c=f.get(a);c&&(1===c?(f.remove(a),""===a&&(e.emptyOption=u)):f.put(a,c-1))};e.hasOption=function(a){return!!f.get(a)}}],ke=function(){return{restrict:"E",require:["select","?ngModel"],controller:Ag,link:function(a,c,d,e){var f=e[1];if(f){var g=e[0];g.ngModelCtrl=f;f.$render=function(){g.writeValue(f.$viewValue)};c.on("change",function(){a.$apply(function(){f.$setViewValue(g.readValue())})});
+if(d.multiple){g.readValue=function(){var a=[];n(c.find("option"),function(c){c.selected&&a.push(c.value)});return a};g.writeValue=function(a){var d=new Ra(a);n(c.find("option"),function(a){a.selected=y(d.get(a.value))})};var h,l=NaN;a.$watch(function(){l!==f.$viewValue||ka(h,f.$viewValue)||(h=fa(f.$viewValue),f.$render());l=f.$viewValue});f.$isEmpty=function(a){return!a||0===a.length}}}}}},me=["$interpolate",function(a){function c(a){a[0].hasAttribute("selected")&&(a[0].selected=!0)}return{restrict:"E",
+priority:100,compile:function(d,e){if(v(e.value)){var f=a(d.text(),!0);f||e.$set("value",d.text())}return function(a,d,e){var k=d.parent(),m=k.data("$selectController")||k.parent().data("$selectController");m&&m.ngModelCtrl&&(f?a.$watch(f,function(a,f){e.$set("value",a);f!==a&&m.removeOption(f);m.addOption(a,d);m.ngModelCtrl.$render();c(d)}):(m.addOption(e.value,d),m.ngModelCtrl.$render(),c(d)),d.on("$destroy",function(){m.removeOption(e.value);m.ngModelCtrl.$render()}))}}}}],le=qa({restrict:"E",
+terminal:!1}),Gc=function(){return{restrict:"A",require:"?ngModel",link:function(a,c,d,e){e&&(d.required=!0,e.$validators.required=function(a,c){return!d.required||!e.$isEmpty(c)},d.$observe("required",function(){e.$validate()}))}}},Fc=function(){return{restrict:"A",require:"?ngModel",link:function(a,c,d,e){if(e){var f,g=d.ngPattern||d.pattern;d.$observe("pattern",function(a){L(a)&&0<a.length&&(a=new RegExp("^"+a+"$"));if(a&&!a.test)throw F("ngPattern")("noregexp",g,a,va(c));f=a||u;e.$validate()});
+e.$validators.pattern=function(a){return e.$isEmpty(a)||v(f)||f.test(a)}}}}},Ic=function(){return{restrict:"A",require:"?ngModel",link:function(a,c,d,e){if(e){var f=-1;d.$observe("maxlength",function(a){a=Y(a);f=isNaN(a)?-1:a;e.$validate()});e.$validators.maxlength=function(a,c){return 0>f||e.$isEmpty(c)||c.length<=f}}}}},Hc=function(){return{restrict:"A",require:"?ngModel",link:function(a,c,d,e){if(e){var f=0;d.$observe("minlength",function(a){f=Y(a)||0;e.$validate()});e.$validators.minlength=function(a,
+c){return e.$isEmpty(c)||c.length>=f}}}}};N.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):(be(),de(aa),z(W).ready(function(){Yd(W,zc)}))})(window,document);!window.angular.$$csp()&&window.angular.element(document).find("head").prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+//# sourceMappingURL=angular.min.js.map
diff --git a/turtles/app/lib/bower_components/angular/angular.min.js.gzip b/turtles/app/lib/bower_components/angular/angular.min.js.gzip
new file mode 100644
index 0000000000000000000000000000000000000000..eb416dbf62f058b22d53d64c1a8b7e40bdae574f
GIT binary patch
literal 51446
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%0A1Q
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

literal 0
HcmV?d00001

diff --git a/turtles/app/lib/bower_components/angular/angular.min.js.map b/turtles/app/lib/bower_components/angular/angular.min.js.map
new file mode 100644
index 000000000..af4c6bf39
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/angular.min.js.map
@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"angular.min.js",
+"lineCount":288,
+"mappings":"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",
+"sources":["angular.js"],
+"names":["window","document","undefined","minErr","isArrayLike","obj","isWindow","length","Object","nodeType","NODE_TYPE_ELEMENT","isString","isArray","forEach","iterator","context","key","isFunction","hasOwnProperty","call","isPrimitive","isBlankObject","forEachSorted","keys","sort","i","reverseParams","iteratorFn","value","nextUid","uid","setHashKey","h","$$hashKey","baseExtend","dst","objs","deep","ii","isObject","j","jj","src","extend","slice","arguments","merge","toInt","str","parseInt","inherit","parent","extra","create","noop","identity","$","valueFn","isUndefined","isDefined","getPrototypeOf","isNumber","isDate","toString","isRegExp","isScope","$evalAsync","$watch","isBoolean","isElement","node","nodeName","prop","attr","find","makeMap","items","split","nodeName_","element","lowercase","arrayRemove","array","index","indexOf","splice","copy","source","destination","stackSource","stackDest","putValue","val","result","push","ngMinErr","TYPED_ARRAY_REGEXP","test","constructor","Date","getTime","RegExp","match","lastIndex","emptyObject","shallowCopy","charAt","equals","o1","o2","t1","t2","keySet","createMap","concat","array1","array2","bind","self","fn","curryArgs","startIndex","apply","toJsonReplacer","toJson","pretty","JSON","stringify","fromJson","json","parse","timezoneToOffset","timezone","fallback","requestedTimezoneOffset","isNaN","convertTimezoneToLocal","date","reverse","timezoneOffset","getTimezoneOffset","setMinutes","getMinutes","minutes","startingTag","jqLite","clone","empty","e","elemHtml","append","html","NODE_TYPE_TEXT","replace","tryDecodeURIComponent","decodeURIComponent","parseKeyValue","keyValue","key_value","toKeyValue","parts","arrayValue","encodeUriQuery","join","encodeUriSegment","pctEncodeSpaces","encodeURIComponent","getNgAttribute","ngAttr","ngAttrPrefixes","getAttribute","angularInit","bootstrap","appElement","module","config","prefix","name","hasAttribute","candidate","querySelector","strictDi","modules","defaultConfig","doBootstrap","injector","tag","unshift","$provide","debugInfoEnabled","$compileProvider","createInjector","invoke","bootstrapApply","scope","compile","$apply","data","NG_ENABLE_DEBUG_INFO","NG_DEFER_BOOTSTRAP","angular","resumeBootstrap","angular.resumeBootstrap","extraModules","resumeDeferredBootstrap","reloadWithDebugInfo","location","reload","getTestability","rootElement","get","snake_case","separator","SNAKE_CASE_REGEXP","letter","pos","toLowerCase","bindJQuery","originalCleanData","bindJQueryFired","jqName","jq","jQuery","on","JQLitePrototype","isolateScope","controller","inheritedData","cleanData","jQuery.cleanData","elems","events","skipDestroyOnNextJQueryCleanData","elem","_data","$destroy","triggerHandler","JQLite","assertArg","arg","reason","assertArgFn","acceptArrayAnnotation","assertNotHasOwnProperty","getter","path","bindFnToScope","lastInstance","len","getBlockNodes","nodes","endNode","blockNodes","nextSibling","setupModuleLoader","ensure","factory","$injectorMinErr","$$minErr","requires","configFn","invokeLater","provider","method","insertMethod","queue","invokeQueue","moduleInstance","configBlocks","runBlocks","_invokeQueue","_configBlocks","_runBlocks","service","constant","decorator","animation","filter","directive","run","block","publishExternalAPI","version","uppercase","counter","csp","angularModule","$LocaleProvider","ngModule","$$sanitizeUri","$$SanitizeUriProvider","$CompileProvider","a","htmlAnchorDirective","input","inputDirective","textarea","form","formDirective","script","scriptDirective","select","selectDirective","style","styleDirective","option","optionDirective","ngBind","ngBindDirective","ngBindHtml","ngBindHtmlDirective","ngBindTemplate","ngBindTemplateDirective","ngClass","ngClassDirective","ngClassEven","ngClassEvenDirective","ngClassOdd","ngClassOddDirective","ngCloak","ngCloakDirective","ngController","ngControllerDirective","ngForm","ngFormDirective","ngHide","ngHideDirective","ngIf","ngIfDirective","ngInclude","ngIncludeDirective","ngInit","ngInitDirective","ngNonBindable","ngNonBindableDirective","ngPluralize","ngPluralizeDirective","ngRepeat","ngRepeatDirective","ngShow","ngShowDirective","ngStyle","ngStyleDirective","ngSwitch","ngSwitchDirective","ngSwitchWhen","ngSwitchWhenDirective","ngSwitchDefault","ngSwitchDefaultDirective","ngOptions","ngOptionsDirective","ngTransclude","ngTranscludeDirective","ngModel","ngModelDirective","ngList","ngListDirective","ngChange","ngChangeDirective","pattern","patternDirective","ngPattern","required","requiredDirective","ngRequired","minlength","minlengthDirective","ngMinlength","maxlength","maxlengthDirective","ngMaxlength","ngValue","ngValueDirective","ngModelOptions","ngModelOptionsDirective","ngIncludeFillContentDirective","ngAttributeAliasDirectives","ngEventDirectives","$anchorScroll","$AnchorScrollProvider","$animate","$AnimateProvider","$$animateQueue","$$CoreAnimateQueueProvider","$$AnimateRunner","$$CoreAnimateRunnerProvider","$browser","$BrowserProvider","$cacheFactory","$CacheFactoryProvider","$controller","$ControllerProvider","$document","$DocumentProvider","$exceptionHandler","$ExceptionHandlerProvider","$filter","$FilterProvider","$interpolate","$InterpolateProvider","$interval","$IntervalProvider","$http","$HttpProvider","$httpParamSerializer","$HttpParamSerializerProvider","$httpParamSerializerJQLike","$HttpParamSerializerJQLikeProvider","$httpBackend","$HttpBackendProvider","$location","$LocationProvider","$log","$LogProvider","$parse","$ParseProvider","$rootScope","$RootScopeProvider","$q","$QProvider","$$q","$$QProvider","$sce","$SceProvider","$sceDelegate","$SceDelegateProvider","$sniffer","$SnifferProvider","$templateCache","$TemplateCacheProvider","$templateRequest","$TemplateRequestProvider","$$testability","$$TestabilityProvider","$timeout","$TimeoutProvider","$window","$WindowProvider","$$rAF","$$RAFProvider","$$asyncCallback","$$AsyncCallbackProvider","$$jqLite","$$jqLiteProvider","$$HashMap","$$HashMapProvider","$$cookieReader","$$CookieReaderProvider","camelCase","SPECIAL_CHARS_REGEXP","_","offset","toUpperCase","MOZ_HACK_REGEXP","jqLiteAcceptsData","NODE_TYPE_DOCUMENT","jqLiteBuildFragment","tmp","fragment","createDocumentFragment","HTML_REGEXP","appendChild","createElement","TAG_NAME_REGEXP","exec","wrap","wrapMap","_default","innerHTML","XHTML_TAG_REGEXP","lastChild","childNodes","firstChild","textContent","createTextNode","argIsString","trim","jqLiteMinErr","parsed","SINGLE_TAG_REGEXP","jqLiteAddNodes","jqLiteClone","cloneNode","jqLiteDealoc","onlyDescendants","jqLiteRemoveData","querySelectorAll","descendants","l","jqLiteOff","type","unsupported","expandoStore","jqLiteExpandoStore","handle","listenerFns","removeEventListener","expandoId","ng339","jqCache","createIfNecessary","jqId","jqLiteData","isSimpleSetter","isSimpleGetter","massGetter","jqLiteHasClass","selector","jqLiteRemoveClass","cssClasses","setAttribute","cssClass","jqLiteAddClass","existingClasses","root","elements","jqLiteController","jqLiteInheritedData","documentElement","names","parentNode","NODE_TYPE_DOCUMENT_FRAGMENT","host","jqLiteEmpty","removeChild","jqLiteRemove","keepData","jqLiteDocumentLoaded","action","win","readyState","setTimeout","getBooleanAttrName","booleanAttr","BOOLEAN_ATTR","BOOLEAN_ELEMENTS","getAliasedAttrName","ALIASED_ATTR","createEventHandler","eventHandler","event","isDefaultPrevented","event.isDefaultPrevented","defaultPrevented","eventFns","eventFnsLength","immediatePropagationStopped","originalStopImmediatePropagation","stopImmediatePropagation","event.stopImmediatePropagation","stopPropagation","isImmediatePropagationStopped","event.isImmediatePropagationStopped","$get","this.$get","hasClass","classes","addClass","removeClass","hashKey","nextUidFn","objType","HashMap","isolatedUid","this.nextUid","put","anonFn","args","fnText","STRIP_COMMENTS","FN_ARGS","modulesToLoad","supportObject","delegate","provider_","providerInjector","instantiate","providerCache","providerSuffix","enforceReturnValue","enforcedReturnValue","instanceInjector","factoryFn","enforce","loadModules","moduleFn","runInvokeQueue","invokeArgs","loadedModules","message","stack","createInternalInjector","cache","getService","serviceName","caller","INSTANTIATING","err","shift","locals","$inject","$$annotate","Type","instance","prototype","returnedValue","annotate","has","$injector","instanceCache","decorFn","origProvider","orig$get","origProvider.$get","origInstance","$delegate","autoScrollingEnabled","disableAutoScrolling","this.disableAutoScrolling","getFirstAnchor","list","Array","some","scrollTo","scrollIntoView","scroll","yOffset","getComputedStyle","position","getBoundingClientRect","bottom","elemTop","top","scrollBy","hash","elm","getElementById","getElementsByName","autoScrollWatch","autoScrollWatchAction","newVal","oldVal","mergeClasses","b","splitClasses","klass","prepareAnimateOptions","options","supported","Browser","completeOutstandingRequest","outstandingRequestCount","outstandingRequestCallbacks","pop","error","cacheStateAndFireUrlChange","cacheState","fireUrlChange","history","state","cachedState","lastCachedState","lastBrowserUrl","url","lastHistoryState","urlChangeListeners","listener","clearTimeout","pendingDeferIds","isMock","$$completeOutstandingRequest","$$incOutstandingRequestCount","self.$$incOutstandingRequestCount","notifyWhenNoOutstandingRequests","self.notifyWhenNoOutstandingRequests","callback","href","baseElement","reloadLocation","self.url","sameState","sameBase","stripHash","substr","self.state","urlChangeInit","onUrlChange","self.onUrlChange","$$applicationDestroyed","self.$$applicationDestroyed","off","$$checkUrlChange","baseHref","self.baseHref","defer","self.defer","delay","timeoutId","cancel","self.defer.cancel","deferId","cacheFactory","cacheId","refresh","entry","freshEnd","staleEnd","n","link","p","nextEntry","prevEntry","caches","size","stats","id","capacity","Number","MAX_VALUE","lruHash","lruEntry","remove","removeAll","destroy","info","cacheFactory.info","cacheFactory.get","$$sanitizeUriProvider","parseIsolateBindings","directiveName","isController","LOCAL_REGEXP","bindings","definition","scopeName","$compileMinErr","mode","collection","optional","attrName","assertValidDirectiveName","hasDirectives","COMMENT_DIRECTIVE_REGEXP","CLASS_DIRECTIVE_REGEXP","ALL_OR_NOTHING_ATTRS","REQUIRE_PREFIX_REGEXP","EVENT_HANDLER_ATTR_REGEXP","this.directive","registerDirective","directiveFactory","Suffix","directives","priority","require","restrict","bindToController","controllerAs","CNTRL_REG","$$bindings","$$isolateBindings","aHrefSanitizationWhitelist","this.aHrefSanitizationWhitelist","regexp","imgSrcSanitizationWhitelist","this.imgSrcSanitizationWhitelist","this.debugInfoEnabled","enabled","safeAddClass","$element","className","$compileNodes","transcludeFn","maxPriority","ignoreDirective","previousCompileContext","nodeValue","compositeLinkFn","compileNodes","$$addScopeClass","namespace","publicLinkFn","cloneConnectFn","parentBoundTranscludeFn","transcludeControllers","futureParentElement","$$boundTransclude","$linkNode","wrapTemplate","controllerName","$$addScopeInfo","nodeList","$rootElement","childLinkFn","childScope","childBoundTranscludeFn","stableNodeList","nodeLinkFnFound","linkFns","idx","nodeLinkFn","destroyBindings","$new","$$destroyBindings","$on","transcludeOnThisElement","createBoundTranscludeFn","transclude","elementTranscludeOnThisElement","templateOnThisElement","attrs","linkFnFound","Attributes","collectDirectives","applyDirectivesToNode","$$element","terminal","previousBoundTranscludeFn","elementTransclusion","boundTranscludeFn","transcludedScope","cloneFn","controllers","containingScope","$$transcluded","attrsMap","$attr","addDirective","directiveNormalize","isNgAttr","nAttrs","attributes","attrStartName","attrEndName","ngAttrName","NG_ATTR_BINDING","PREFIX_REGEXP","directiveNName","directiveIsMultiElement","nName","addAttrInterpolateDirective","animVal","addTextInterpolateDirective","NODE_TYPE_COMMENT","byPriority","groupScan","attrStart","attrEnd","depth","groupElementsLinkFnWrapper","linkFn","compileNode","templateAttrs","jqCollection","originalReplaceDirective","preLinkFns","postLinkFns","addLinkFns","pre","post","newIsolateScopeDirective","$$isolateScope","cloneAndAnnotateFn","getControllers","elementControllers","substring","inheritType","dataName","setupControllers","controllerDirectives","controllerKey","$scope","$attrs","$transclude","controllerInstance","hasElementTranscludeDirective","linkNode","thisLinkFn","controllersBoundTransclude","cloneAttachFn","scopeToChild","templateDirective","$$originalDirective","initializeDirectiveBindings","scopeDirective","newScopeDirective","controllerForBindings","identifier","controllerResult","invokeLinkFn","template","templateUrl","terminalPriority","nonTlbTranscludeDirective","hasTranscludeDirective","hasTemplate","$compileNode","$template","childTranscludeFn","$$start","$$end","directiveValue","assertNoDuplicate","$$tlb","createComment","replaceWith","replaceDirective","contents","denormalizeTemplate","removeComments","templateNamespace","newTemplateAttrs","templateDirectives","unprocessedDirectives","markDirectivesAsIsolate","mergeTemplateAttributes","compileTemplateUrl","Math","max","tDirectives","startAttrName","endAttrName","multiElement","srcAttr","dstAttr","$set","tAttrs","linkQueue","afterTemplateNodeLinkFn","afterTemplateChildLinkFn","beforeTemplateCompileNode","origAsyncDirective","derivedSyncDirective","getTrustedResourceUrl","then","content","tempTemplateAttrs","beforeTemplateLinkNode","linkRootElement","$$destroyed","oldClasses","delayedNodeLinkFn","ignoreChildLinkFn","diff","what","previousDirective","text","interpolateFn","textInterpolateCompileFn","templateNode","templateNodeParent","hasCompileParent","$$addBindingClass","textInterpolateLinkFn","$$addBindingInfo","expressions","interpolateFnWatchAction","wrapper","getTrustedContext","attrNormalizedName","HTML","RESOURCE_URL","allOrNothing","trustedContext","attrInterpolatePreLinkFn","$$observers","newValue","$$inter","$$scope","oldValue","$updateClass","elementsToRemove","newNode","firstElementToRemove","removeCount","j2","replaceChild","expando","k","kk","annotation","newScope","onNewScopeDestroyed","lastValue","parentGet","parentSet","compare","$observe","literal","assign","parentValueWatch","parentValue","$stateful","unwatch","$watchCollection","attributesToCopy","$normalize","$addClass","classVal","$removeClass","newClasses","toAdd","tokenDifference","toRemove","writeAttr","booleanKey","aliasedKey","observer","trimmedSrcset","srcPattern","rawUris","nbrUrisWith2parts","floor","innerIdx","lastTuple","removeAttr","listeners","startSymbol","endSymbol","binding","isolated","noTemplate","str1","str2","values","tokens1","tokens2","token","jqNodes","globals","register","this.register","allowGlobals","this.allowGlobals","addIdentifier","expression","later","ident","$controllerMinErr","controllerPrototype","exception","cause","serializeValue","v","toISOString","ngParamSerializer","params","jQueryLikeParamSerializer","serialize","toSerialize","topLevel","defaultHttpResponseTransform","headers","tempData","JSON_PROTECTION_PREFIX","contentType","jsonStart","JSON_START","JSON_ENDS","parseHeaders","line","headerVal","headerKey","headersGetter","headersObj","transformData","status","fns","defaults","transformResponse","transformRequest","d","common","CONTENT_TYPE_APPLICATION_JSON","patch","xsrfCookieName","xsrfHeaderName","paramSerializer","useApplyAsync","this.useApplyAsync","interceptorFactories","interceptors","requestConfig","response","resp","reject","executeHeaderFns","headerContent","processedHeaders","headerFn","header","mergeHeaders","defHeaders","reqHeaders","defHeaderName","lowercaseDefHeaderName","reqHeaderName","chain","serverRequest","reqData","withCredentials","sendReq","promise","when","reversedInterceptors","interceptor","request","requestError","responseError","thenFn","rejectFn","success","promise.success","promise.error","done","headersString","statusText","resolveHttpPromise","resolvePromise","$applyAsync","$$phase","deferred","resolve","resolvePromiseWithResult","removePendingReq","pendingRequests","cachedResp","buildUrl","defaultCache","xsrfValue","urlIsSameOrigin","timeout","responseType","serializedParams","interceptorFactory","createShortMethods","createShortMethodsWithData","createXhr","XMLHttpRequest","createHttpBackend","callbacks","$browserDefer","rawDocument","jsonpReq","callbackId","async","body","called","addEventListener","timeoutRequest","jsonpDone","xhr","abort","completeRequest","open","setRequestHeader","onload","xhr.onload","responseText","urlResolve","protocol","getAllResponseHeaders","onerror","onabort","send","this.startSymbol","this.endSymbol","escape","ch","unescapeText","escapedStartRegexp","escapedEndRegexp","mustHaveExpression","parseStringifyInterceptor","getTrusted","valueOf","$interpolateMinErr","interr","endIndex","parseFns","textLength","expressionPositions","startSymbolLength","exp","endSymbolLength","throwNoconcat","compute","interpolationFn","$$watchDelegate","$watchGroup","interpolateFnWatcher","oldValues","currValue","$interpolate.startSymbol","$interpolate.endSymbol","interval","count","invokeApply","hasParams","setInterval","clearInterval","iteration","skipApply","$$intervalId","tick","notify","intervals","interval.cancel","NUMBER_FORMATS","DECIMAL_SEP","GROUP_SEP","PATTERNS","minInt","minFrac","maxFrac","posPre","posSuf","negPre","negSuf","gSize","lgSize","CURRENCY_SYM","DATETIME_FORMATS","MONTH","SHORTMONTH","DAY","SHORTDAY","AMPMS","medium","fullDate","longDate","mediumDate","shortDate","mediumTime","shortTime","ERANAMES","ERAS","pluralCat","num","encodePath","segments","parseAbsoluteUrl","absoluteUrl","locationObj","parsedUrl","$$protocol","$$host","hostname","$$port","port","DEFAULT_PORTS","parseAppUrl","relativeUrl","prefixed","$$path","pathname","$$search","search","$$hash","beginsWith","begin","whole","trimEmptyHash","stripFile","lastIndexOf","LocationHtml5Url","appBase","basePrefix","$$html5","appBaseNoFile","$$parse","this.$$parse","pathUrl","$locationMinErr","$$compose","this.$$compose","$$url","$$absUrl","$$parseLinkUrl","this.$$parseLinkUrl","relHref","appUrl","prevAppUrl","rewrittenUrl","LocationHashbangUrl","hashPrefix","withoutBaseUrl","withoutHashUrl","windowsFilePathExp","firstPathSegmentMatch","LocationHashbangInHtml5Url","locationGetter","property","locationGetterSetter","preprocess","html5Mode","requireBase","rewriteLinks","this.hashPrefix","this.html5Mode","setBrowserUrlWithFallback","oldUrl","oldState","$$state","afterLocationChange","$broadcast","absUrl","LocationMode","initialUrl","IGNORE_URI_REGEXP","ctrlKey","metaKey","shiftKey","which","button","target","absHref","preventDefault","initializing","newUrl","newState","$digest","$locationWatch","currentReplace","$$replace","urlOrStateChanged","debug","debugEnabled","this.debugEnabled","flag","formatError","Error","sourceURL","consoleLog","console","logFn","log","hasApply","arg1","arg2","warn","ensureSafeMemberName","fullExpression","$parseMinErr","ensureSafeObject","children","ensureSafeFunction","CALL","APPLY","BIND","ifDefined","plusFn","r","findConstantAndWatchExpressions","ast","allConstants","argsToWatch","AST","Program","expr","Literal","toWatch","UnaryExpression","argument","BinaryExpression","left","right","LogicalExpression","ConditionalExpression","alternate","consequent","Identifier","MemberExpression","object","computed","CallExpression","callee","AssignmentExpression","ArrayExpression","ObjectExpression","properties","ThisExpression","getInputs","lastExpression","isAssignable","assignableAST","NGValueParameter","operator","isLiteral","ASTCompiler","astBuilder","ASTInterpreter","setter","setValue","fullExp","propertyObj","isPossiblyDangerousMemberName","getValueOf","objectValueOf","cacheDefault","cacheExpensive","expressionInputDirtyCheck","oldValueOfValue","inputsWatchDelegate","objectEquality","parsedExpression","prettyPrintExpression","inputExpressions","inputs","lastResult","oldInputValueOf","expressionInputWatch","newInputValue","oldInputValueOfValues","oldInputValues","expressionInputsWatch","changed","oneTimeWatchDelegate","oneTimeWatch","oneTimeListener","old","$$postDigest","oneTimeLiteralWatchDelegate","isAllDefined","allDefined","constantWatchDelegate","constantWatch","constantListener","addInterceptor","interceptorFn","watchDelegate","regularInterceptedExpression","oneTimeInterceptedExpression","$parseOptions","expensiveChecks","$parseOptionsExpensive","oneTime","cacheKey","parseOptions","lexer","Lexer","parser","Parser","qFactory","nextTick","exceptionHandler","callOnce","resolveFn","Promise","simpleBind","scheduleProcessQueue","processScheduled","pending","Deferred","$qMinErr","TypeError","onFulfilled","onRejected","progressBack","catch","finally","handleCallback","$$reject","$$resolve","progress","makePromise","resolved","isResolved","callbackOutput","errback","$Q","Q","resolver","all","promises","results","flush","taskQueue","task","taskCount","queueFn","asyncFn","cancelLastRAF","rafFn","cancelQueueFn","requestAnimationFrame","webkitRequestAnimationFrame","cancelAnimationFrame","webkitCancelAnimationFrame","webkitCancelRequestAnimationFrame","rafSupported","timer","createChildScopeClass","ChildScope","$$watchers","$$nextSibling","$$childHead","$$childTail","$$listeners","$$listenerCount","$$watchersCount","$id","$$ChildScope","TTL","$rootScopeMinErr","lastDirtyWatch","applyAsyncId","digestTtl","this.digestTtl","destroyChildScope","$event","currentScope","Scope","$parent","$$prevSibling","$root","beginPhase","phase","incrementWatchersCount","current","decrementListenerCount","initWatchVal","flushApplyAsync","applyAsyncQueue","scheduleApplyAsync","isolate","child","watchExp","watcher","last","eq","deregisterWatch","watchExpressions","watchGroupAction","changeReactionScheduled","firstRun","newValues","deregisterFns","shouldCall","deregisterWatchGroup","unwatchFn","watchGroupSubAction","$watchCollectionInterceptor","_value","bothNaN","newItem","oldItem","internalArray","oldLength","changeDetected","newLength","internalObject","veryOldValue","trackVeryOldValue","changeDetector","initRun","$watchCollectionAction","watch","watchers","dirty","ttl","watchLog","logIdx","asyncTask","asyncQueue","$eval","msg","next","postDigestQueue","eventName","this.$watchGroup","$applyAsyncExpression","namedListeners","indexOfListener","$emit","targetScope","listenerArgs","$$asyncQueue","$$postDigestQueue","$$applyAsyncQueue","sanitizeUri","uri","isImage","regex","normalizedVal","adjustMatcher","matcher","$sceMinErr","escapeForRegexp","adjustMatchers","matchers","adjustedMatchers","SCE_CONTEXTS","resourceUrlWhitelist","resourceUrlBlacklist","this.resourceUrlWhitelist","this.resourceUrlBlacklist","matchUrl","generateHolderType","Base","holderType","trustedValue","$$unwrapTrustedValue","this.$$unwrapTrustedValue","holderType.prototype.valueOf","holderType.prototype.toString","htmlSanitizer","trustedValueHolderBase","byType","CSS","URL","JS","trustAs","Constructor","maybeTrusted","allowed","this.enabled","msie","sce","isEnabled","sce.isEnabled","sce.getTrusted","parseAs","sce.parseAs","enumValue","lName","eventSupport","android","userAgent","navigator","boxee","vendorPrefix","vendorRegex","bodyStyle","transitions","animations","webkitTransition","webkitAnimation","pushState","hasEvent","divElm","handleRequestFn","tpl","ignoreRequestError","totalPendingRequests","transformer","httpOptions","handleError","testability","testability.findBindings","opt_exactMatch","getElementsByClassName","matches","dataBinding","bindingName","testability.findModels","prefixes","attributeEquals","testability.getLocation","testability.setLocation","testability.whenStable","deferreds","$$timeoutId","timeout.cancel","urlParsingNode","requestUrl","originUrl","$$CookieReader","safeDecodeURIComponent","lastCookies","lastCookieString","cookieArray","cookie","currentCookieString","filters","suffix","currencyFilter","dateFilter","filterFilter","jsonFilter","limitToFilter","lowercaseFilter","numberFilter","orderByFilter","uppercaseFilter","comparator","matchAgainstAnyProp","getTypeForFilter","expressionType","predicateFn","createPredicateFn","shouldMatchPrimitives","actual","expected","item","deepCompare","dontMatchWholeObject","actualType","expectedType","expectedVal","matchAnyProperty","actualVal","$locale","formats","amount","currencySymbol","fractionSize","formatNumber","number","groupSep","decimalSep","isNegative","abs","isInfinity","Infinity","isFinite","numStr","formatedText","hasExponent","toFixed","parseFloat","fractionLen","min","round","fraction","lgroup","group","padNumber","digits","neg","dateGetter","dateStrGetter","shortForm","getFirstThursdayOfYear","year","dayOfWeekOnFirst","getDay","weekGetter","firstThurs","getFullYear","thisThurs","getMonth","getDate","eraGetter","jsonStringToDate","string","R_ISO8601_STR","tzHour","tzMin","dateSetter","setUTCFullYear","setFullYear","timeSetter","setUTCHours","setHours","m","s","ms","format","NUMBER_STRING","DATE_FORMATS_SPLIT","dateTimezoneOffset","DATE_FORMATS","spacing","limit","sortPredicate","reverseOrder","reverseComparator","comp","descending","objectToString","v1","v2","map","predicate","ngDirective","FormController","controls","parentForm","$$parentForm","nullFormCtrl","$error","$$success","$pending","$name","$dirty","$pristine","$valid","$invalid","$submitted","$addControl","$rollbackViewValue","form.$rollbackViewValue","control","$commitViewValue","form.$commitViewValue","form.$addControl","$$renameControl","form.$$renameControl","newName","oldName","$removeControl","form.$removeControl","$setValidity","addSetValidityMethod","ctrl","set","unset","$setDirty","form.$setDirty","PRISTINE_CLASS","DIRTY_CLASS","$setPristine","form.$setPristine","setClass","SUBMITTED_CLASS","$setUntouched","form.$setUntouched","$setSubmitted","form.$setSubmitted","stringBasedInputType","$formatters","$isEmpty","baseInputType","composing","ev","ngTrim","$viewValue","$$hasNativeValidators","$setViewValue","deferListener","origValue","keyCode","$render","ctrl.$render","createDateParser","mapping","iso","ISO_DATE_REGEXP","yyyy","MM","dd","HH","getHours","mm","ss","getSeconds","sss","getMilliseconds","part","NaN","createDateInputType","parseDate","dynamicDateInputType","isValidDate","parseObservedDateValue","badInputChecker","$options","previousDate","$$parserName","$parsers","parsedDate","$ngModelMinErr","ngMin","minVal","$validators","ctrl.$validators.min","$validate","ngMax","maxVal","ctrl.$validators.max","validity","VALIDITY_STATE_PROPERTY","badInput","typeMismatch","parseConstantExpr","parseFn","classDirective","arrayDifference","arrayClasses","digestClassCounts","classCounts","classesToUpdate","ngClassWatchAction","$index","old$index","mod","cachedToggleClass","switchValue","classCache","toggleValidationCss","validationErrorKey","isValid","VALID_CLASS","INVALID_CLASS","setValidity","isObjectEmpty","PENDING_CLASS","combinedState","REGEX_STRING_REGEXP","documentMode","isActive_","active","Function","name_","el","full","major","minor","dot","codeName","JQLite._data","MOUSE_EVENT_MAP","mouseleave","mouseenter","optgroup","tbody","tfoot","colgroup","caption","thead","th","td","ready","trigger","fired","removeData","removeAttribute","css","NODE_TYPE_ATTRIBUTE","lowercasedName","specified","getNamedItem","ret","getText","$dv","multiple","selected","nodeCount","jqLiteOn","types","related","relatedTarget","contains","one","onFn","replaceNode","insertBefore","contentDocument","prepend","wrapNode","detach","after","newElement","toggleClass","condition","classCondition","nextElementSibling","getElementsByTagName","extraParameters","dummyEvent","handlerArgs","eventFnsCopy","arg3","unbind","FN_ARG_SPLIT","FN_ARG","argDecl","underscore","$animateMinErr","AnimateRunner","end","resume","pause","complete","pass","fail","postDigestElements","addRemoveClassesPostDigest","add","existing","pin","domOperation","from","to","$$registeredAnimations","classNameFilter","this.classNameFilter","$$classNameFilter","reservedRegex","NG_ANIMATE_CLASSNAME","domInsert","parentElement","afterElement","afterNode","ELEMENT_NODE","previousElementSibling","runner","enter","move","leave","addclass","animate","tempClasses","APPLICATION_JSON","$interpolateMinErr.throwNoconcat","$interpolateMinErr.interr","PATH_MATCH","locationPrototype","paramValue","Location","Location.prototype.state","OPERATORS","ESCAPE","lex","tokens","readString","peek","readNumber","isIdent","readIdent","is","isWhitespace","ch2","ch3","op2","op3","op1","throwError","chars","isExpOperator","start","colStr","peekCh","quote","rawString","hex","String","fromCharCode","rep","ExpressionStatement","Property","program","expressionStatement","expect","filterChain","assignment","ternary","logicalOR","consume","logicalAND","equality","relational","additive","multiplicative","unary","primary","arrayDeclaration","constants","parseArguments","baseExpression","peekToken","kind","e1","e2","e3","e4","peekAhead","t","nextId","vars","own","assignable","stage","computing","recurse","generateFunction","fnKey","intoId","return_","watchId","fnString","USE","STRICT","filterPrefix","watchFns","varsPrefix","section","nameId","recursionFn","skipWatchIdCheck","if_","lazyAssign","computedMember","lazyRecurse","plus","not","getHasOwnProperty","nonComputedMember","addEnsureSafeObject","notNull","addEnsureSafeMemberName","addEnsureSafeFunction","member","filterName","defaultValue","stringEscapeRegex","stringEscapeFn","c","charCodeAt","skip","init","fn.assign","rhs","lhs","unary+","unary-","unary!","binary+","binary-","binary*","binary/","binary%","binary===","binary!==","binary==","binary!=","binary<","binary>","binary<=","binary>=","binary&&","binary||","ternary?:","base","astCompiler","yy","y","MMMM","MMM","M","H","hh","EEEE","EEE","ampmGetter","Z","timeZoneGetter","zone","paddedZone","ww","w","G","GG","GGG","GGGG","longEraGetter","xlinkHref","propName","defaultLinkFn","normalized","ngBooleanAttrWatchAction","htmlAttr","ngAttrAliasWatchAction","nullFormRenameControl","formDirectiveFactory","isNgForm","ngFormCompile","formElement","nameAttr","ngFormPreLink","handleFormSubmission","parentFormCtrl","URL_REGEXP","EMAIL_REGEXP","NUMBER_REGEXP","DATE_REGEXP","DATETIMELOCAL_REGEXP","WEEK_REGEXP","MONTH_REGEXP","TIME_REGEXP","inputType","textInputType","weekParser","isoWeek","existingDate","week","hours","seconds","milliseconds","addDays","numberInputType","urlInputType","ctrl.$validators.url","modelValue","viewValue","emailInputType","email","ctrl.$validators.email","radioInputType","checked","checkboxInputType","trueValue","ngTrueValue","falseValue","ngFalseValue","ctrl.$isEmpty","ctrls","CONSTANT_VALUE_REGEXP","tplAttr","ngValueConstantLink","ngValueLink","valueWatchAction","$compile","ngBindCompile","templateElement","ngBindLink","ngBindWatchAction","ngBindTemplateCompile","ngBindTemplateLink","ngBindHtmlCompile","tElement","ngBindHtmlGetter","ngBindHtmlWatch","getStringValue","ngBindHtmlLink","ngBindHtmlWatchAction","getTrustedHtml","$viewChangeListeners","forceAsyncEvents","ngEventHandler","previousElements","ngIfWatchAction","srcExp","onloadExp","autoScrollExp","autoscroll","changeCounter","previousElement","currentElement","cleanupLastIncludeContent","parseAsResourceUrl","ngIncludeWatchAction","afterAnimation","thisChangeId","namespaceAdaptedClone","trimValues","NgModelController","$modelValue","$$rawModelValue","$asyncValidators","$untouched","$touched","parsedNgModel","parsedNgModelAssign","ngModelGet","ngModelSet","pendingDebounce","parserValid","$$setOptions","this.$$setOptions","getterSetter","invokeModelGetter","invokeModelSetter","$$$p","this.$isEmpty","currentValidationRunId","this.$setPristine","this.$setDirty","this.$setUntouched","UNTOUCHED_CLASS","TOUCHED_CLASS","$setTouched","this.$setTouched","this.$rollbackViewValue","$$lastCommittedViewValue","this.$validate","prevValid","prevModelValue","allowInvalid","$$runValidators","allValid","$$writeModelToScope","this.$$runValidators","doneCallback","processSyncValidators","syncValidatorsValid","validator","processAsyncValidators","validatorPromises","validationDone","localValidationRunId","processParseErrors","errorKey","this.$commitViewValue","$$parseAndValidate","this.$$parseAndValidate","this.$$writeModelToScope","this.$setViewValue","updateOnDefault","$$debounceViewValueCommit","this.$$debounceViewValueCommit","debounceDelay","debounce","ngModelWatch","formatters","ngModelCompile","ngModelPreLink","modelCtrl","formCtrl","ngModelPostLink","updateOn","DEFAULT_REGEXP","that","ngOptionsMinErr","NG_OPTIONS_REGEXP","parseOptionsExpression","optionsExp","selectElement","Option","selectValue","label","disabled","valueName","keyName","selectAs","trackBy","viewValueFn","trackByFn","getTrackByValueFn","getHashOfValue","getTrackByValue","getLocals","displayFn","groupByFn","disableWhenFn","valuesFn","getWatchables","watchedArray","getWatchable","disableWhen","getOptions","optionItems","selectValueMap","optionValues","optionValuesKeys","itemKey","optionValuesLength","optionItem","getOptionFromViewValue","getViewValueFromOption","optionTemplate","optGroupTemplate","updateOptionElement","addOrReuseElement","removeExcessElements","skipEmptyAndUnknownOptions","emptyOption_","emptyOption","unknownOption_","unknownOption","updateOptions","previousValue","selectCtrl","readValue","groupMap","providedEmptyOption","updateOption","optionElement","groupElement","currentOptionElement","ngModelCtrl","nextValue","ngModelCtrl.$isEmpty","writeValue","selectCtrl.writeValue","selectCtrl.readValue","selectedValues","selections","selectedOption","BRACE","IS_WHEN","updateElementText","newText","numberExp","whenExp","whens","whensExpFns","braceReplacement","watchRemover","lastCount","attributeName","tmpMatch","whenKey","ngPluralizeWatchAction","countIsNaN","whenExpFn","ngRepeatMinErr","updateScope","valueIdentifier","keyIdentifier","arrayLength","$first","$last","$middle","$odd","$even","ngRepeatCompile","ngRepeatEndComment","aliasAs","trackByExp","trackByExpGetter","trackByIdExpFn","trackByIdArrayFn","trackByIdObjFn","hashFnLocals","ngRepeatLink","lastBlockMap","ngRepeatAction","previousNode","nextNode","nextBlockMap","collectionLength","trackById","collectionKeys","nextBlockOrder","trackByIdFn","blockKey","ngRepeatTransclude","ngShowWatchAction","NG_HIDE_CLASS","NG_HIDE_IN_PROGRESS_CLASS","ngHideWatchAction","ngStyleWatchAction","newStyles","oldStyles","ngSwitchController","cases","selectedTranscludes","selectedElements","previousLeaveAnimations","selectedScopes","spliceFactory","ngSwitchWatchAction","selectedTransclude","caseElement","selectedScope","anchor","noopNgModelController","SelectController","optionsMap","renderUnknownOption","self.renderUnknownOption","unknownVal","removeUnknownOption","self.removeUnknownOption","self.readValue","self.writeValue","hasOption","addOption","self.addOption","removeOption","self.removeOption","self.hasOption","ngModelCtrl.$render","lastView","lastViewRef","selectMultipleWatch","chromeHack","selectCtrlName","interpolateWatchAction","ctrl.$validators.required","patternExp","ctrl.$validators.pattern","intVal","ctrl.$validators.maxlength","ctrl.$validators.minlength","$$csp"]
+}
diff --git a/turtles/app/lib/bower_components/angular/bower.json b/turtles/app/lib/bower_components/angular/bower.json
new file mode 100644
index 000000000..186e41c9f
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/bower.json
@@ -0,0 +1,8 @@
+{
+  "name": "angular",
+  "version": "1.4.0",
+  "main": "./angular.js",
+  "ignore": [],
+  "dependencies": {
+  }
+}
diff --git a/turtles/app/lib/bower_components/angular/index.js b/turtles/app/lib/bower_components/angular/index.js
new file mode 100644
index 000000000..5c1aafcca
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/index.js
@@ -0,0 +1,2 @@
+require('./angular');
+module.exports = angular;
diff --git a/turtles/app/lib/bower_components/angular/package.json b/turtles/app/lib/bower_components/angular/package.json
new file mode 100644
index 000000000..d1adede3b
--- /dev/null
+++ b/turtles/app/lib/bower_components/angular/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "angular",
+  "version": "1.4.0",
+  "description": "HTML enhanced for web apps",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.js.git"
+  },
+  "keywords": [
+    "angular",
+    "framework",
+    "browser",
+    "client-side"
+  ],
+  "author": "Angular Core Team <angular-core+npm@google.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/angular.js/issues"
+  },
+  "homepage": "http://angularjs.org"
+}
diff --git a/turtles/app/lib/bower_components/momentjs/.bower.json b/turtles/app/lib/bower_components/momentjs/.bower.json
new file mode 100644
index 000000000..15d9cfedb
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/.bower.json
@@ -0,0 +1,34 @@
+{
+  "name": "moment",
+  "version": "2.10.3",
+  "main": "moment.js",
+  "ignore": [
+    "**/.*",
+    "benchmarks",
+    "bower_components",
+    "meteor",
+    "node_modules",
+    "scripts",
+    "tasks",
+    "test",
+    "component.json",
+    "composer.json",
+    "CONTRIBUTING.md",
+    "ender.js",
+    "Gruntfile.js",
+    "Moment.js.nuspec",
+    "package.js",
+    "package.json"
+  ],
+  "homepage": "https://github.com/moment/moment",
+  "_release": "2.10.3",
+  "_resolution": {
+    "type": "version",
+    "tag": "2.10.3",
+    "commit": "6fa444238494318e3c488c81d8520ad2eba8bae7"
+  },
+  "_source": "git://github.com/moment/moment.git",
+  "_target": "~2.10.3",
+  "_originalSource": "momentjs",
+  "_direct": true
+}
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/CHANGELOG.md b/turtles/app/lib/bower_components/momentjs/CHANGELOG.md
new file mode 100644
index 000000000..395261fd8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/CHANGELOG.md
@@ -0,0 +1,441 @@
+Changelog
+=========
+
+### 2.10.3 [See full changelog](https://gist.github.com/ichernev/f264b9bed5b00f8b1b7f)
+
+* add `moment.fn.to` and `moment.fn.toNow` (similar to `from` and `fromNow`)
+* new locales (Sinhalese (si), Montenegrin (me), Javanese (ja))
+* performance improvements
+
+### 2.10.2
+
+* fixed moment-with-locales in browser env caused by esperanto change
+
+### 2.10.1
+
+* regression: Add moment.duration.fn back
+
+### 2.10.0
+
+Ported code to es6 modules.
+
+### 2.9.0 [See full changelog](https://gist.github.com/ichernev/0c9a9b49951111a27ce7)
+
+languages:
+* [2104](https://github.com/moment/moment/issues/2104) Frisian (fy) language file with unit test
+* [2097](https://github.com/moment/moment/issues/2097) add ar-tn locale
+
+deprecations:
+* [2074](https://github.com/moment/moment/issues/2074) Implement `moment.fn.utcOffset`, deprecate `momen.fn.zone`
+
+features:
+* [2088](https://github.com/moment/moment/issues/2088) add moment.fn.isBetween
+* [2054](https://github.com/moment/moment/issues/2054) Call updateOffset when creating moment (needed for default timezone in
+  moment-timezone)
+* [1893](https://github.com/moment/moment/issues/1893) Add moment.isDate method
+* [1825](https://github.com/moment/moment/issues/1825) Implement toJSON function on Duration
+* [1809](https://github.com/moment/moment/issues/1809) Allowing moment.set() to accept a hash of units
+* [2128](https://github.com/moment/moment/issues/2128) Add firstDayOfWeek, firstDayOfYear locale getters
+* [2131](https://github.com/moment/moment/issues/2131) Add quarter diff support
+
+Some bugfixes and language improvements -- [full changelog](https://gist.github.com/ichernev/0c9a9b49951111a27ce7)
+
+### 2.8.4 [See full changelog](https://gist.github.com/ichernev/a4fcb0a46d74e4b9b996)
+
+Features:
+
+* [#2000](https://github.com/moment/moment/issues/2000) Add LTS localised format that includes seconds
+* [#1960](https://github.com/moment/moment/issues/1960) added formatToken 'x' for unix offset in milliseconds #1938
+* [#1965](https://github.com/moment/moment/issues/1965) Support 24:00:00.000 to mean next day, at midnight.
+* [#2002](https://github.com/moment/moment/issues/2002) Accept 'date' key when creating moment with object
+* [#2009](https://github.com/moment/moment/issues/2009) Use native toISOString when we can
+
+Some bugfixes and language improvements -- [full changelog](https://gist.github.com/ichernev/a4fcb0a46d74e4b9b996)
+
+### 2.8.3
+
+Bugfixes:
+
+* [#1801](https://github.com/moment/moment/issues/1801) proper pluralization for Arabic
+* [#1833](https://github.com/moment/moment/issues/1833) improve spm integration
+* [#1871](https://github.com/moment/moment/issues/1871) fix zone bug caused by Firefox 24
+* [#1882](https://github.com/moment/moment/issues/1882) Use hh:mm in Czech
+* [#1883](https://github.com/moment/moment/issues/1883) Fix 2.8.0 regression in duration as conversions
+* [#1890](https://github.com/moment/moment/issues/1890) Faster travis builds
+* [#1892](https://github.com/moment/moment/issues/1892) Faster isBefore/After/Same
+* [#1848](https://github.com/moment/moment/issues/1848) Fix flaky month diffs
+* [#1895](https://github.com/moment/moment/issues/1895) Fix 2.8.0 regression in moment.utc with format array
+* [#1896](https://github.com/moment/moment/issues/1896) Support setting invalid instance locale (noop)
+* [#1897](https://github.com/moment/moment/issues/1897) Support moment([str]) in addition to moment([int])
+
+### 2.8.2
+
+Minor bugfixes:
+
+* [#1874](https://github.com/moment/moment/issues/1874) use `Object.prototype.hasOwnProperty`
+  instead of `obj.hasOwnProperty` (ie8 bug)
+* [#1873](https://github.com/moment/moment/issues/1873) add `duration#toString()`
+* [#1859](https://github.com/moment/moment/issues/1859) better month/weekday names in norwegian
+* [#1812](https://github.com/moment/moment/issues/1812) meridiem parsing for greek
+* [#1804](https://github.com/moment/moment/issues/1804) spanish del -> de
+* [#1800](https://github.com/moment/moment/issues/1800) korean LT improvement
+
+### 2.8.1
+
+* bugfix [#1813](https://github.com/moment/moment/issues/1813): fix moment().lang([key]) incompatibility
+
+### 2.8.0 [See changelog](https://gist.github.com/ichernev/ac3899324a5fa6c8c9b4)
+
+* incompatible changes
+    * [#1761](https://github.com/moment/moment/issues/1761): moments created without a language are no longer following the global language, in case it changes. Only newly created moments take the global language by default. In case you're affected by this, wait, comment on [#1797](https://github.com/moment/moment/issues/1797) and wait for a proper reimplementation
+    * [#1642](https://github.com/moment/moment/issues/1642): 45 days is no longer "a month" according to humanize, cutoffs for month, and year have changed. Hopefully your code does not depend on a particular answer from humanize (which it shouldn't anyway)
+    * [#1784](https://github.com/moment/moment/issues/1784): if you use the human readable English datetime format in a weird way (like storing them in a database) that would break when the format changes you're at risk.
+
+* deprecations (old behavior will be dropped in 3.0)
+    * [#1761](https://github.com/moment/moment/issues/1761) `lang` is renamed to `locale`, `langData` -> `localeData`. Also there is now `defineLocale` that should be used when creating new locales
+    * [#1763](https://github.com/moment/moment/issues/1763) `add(unit, value)` and `subtract(unit, value)` are now deprecated. Use `add(value, unit)` and `subtract(value, unit)` instead.
+    * [#1759](https://github.com/moment/moment/issues/1759) rename `duration.toIsoString` to `duration.toISOString`. The js standard library and moment's `toISOString` follow that convention.
+
+* new locales
+    * [#1789](https://github.com/moment/moment/issues/1789) Tibetan (bo)
+    * [#1786](https://github.com/moment/moment/issues/1786) Africaans (af)
+    * [#1778](https://github.com/moment/moment/issues/1778) Burmese (my)
+    * [#1727](https://github.com/moment/moment/issues/1727) Belarusian (be)
+
+* bugfixes, locale bugfixes, performance improvements, features
+
+### 2.7.0 [See changelog](https://gist.github.com/ichernev/b0a3d456d5a84c9901d7)
+
+* new languages
+
+  * [#1678](https://github.com/moment/moment/issues/1678) Bengali (bn)
+  * [#1628](https://github.com/moment/moment/issues/1628) Azerbaijani (az)
+  * [#1633](https://github.com/moment/moment/issues/1633) Arabic, Saudi Arabia (ar-sa)
+  * [#1648](https://github.com/moment/moment/issues/1648) Austrian German (de-at)
+
+* features
+
+  * [#1663](https://github.com/moment/moment/issues/1663) configurable relative time thresholds
+  * [#1554](https://github.com/moment/moment/issues/1554) support anchor time in moment.calendar
+  * [#1693](https://github.com/moment/moment/issues/1693) support moment.ISO_8601 as parsing format
+  * [#1637](https://github.com/moment/moment/issues/1637) add moment.min and moment.max and deprecate min/max instance methods
+  * [#1704](https://github.com/moment/moment/issues/1704) support string value in add/subtract
+  * [#1647](https://github.com/moment/moment/issues/1647) add spm support (package manager)
+
+* bugfixes
+
+### 2.6.0 [See changelog](https://gist.github.com/ichernev/10544682)
+
+* languages
+  * [#1529](https://github.com/moment/moment/issues/1529) Serbian-Cyrillic (sr-cyr)
+  * [#1544](https://github.com/moment/moment/issues/1544), [#1546](https://github.com/moment/moment/issues/1546) Khmer Cambodia (km)
+
+* features
+    * [#1419](https://github.com/moment/moment/issues/1419), [#1468](https://github.com/moment/moment/issues/1468), [#1467](https://github.com/moment/moment/issues/1467), [#1546](https://github.com/moment/moment/issues/1546) better handling of timezone-d moments around DST
+    * [#1462](https://github.com/moment/moment/issues/1462) add weeksInYear and isoWeeksInYear
+    * [#1475](https://github.com/moment/moment/issues/1475) support ordinal parsing
+    * [#1499](https://github.com/moment/moment/issues/1499) composer support
+    * [#1577](https://github.com/moment/moment/issues/1577), [#1604](https://github.com/moment/moment/issues/1604) put Date parsing in moment.createFromInputFallback so it can be properly deprecated and controlled in the future
+    * [#1545](https://github.com/moment/moment/issues/1545) extract two-digit year parsing in moment.parseTwoDigitYear, so it can be overwritten
+    * [#1590](https://github.com/moment/moment/issues/1590) (see [#1574](https://github.com/moment/moment/issues/1574)) set AMD global before module definition to better support non AMD module dependencies used in AMD environment
+    * [#1589](https://github.com/moment/moment/issues/1589) remove global in Node.JS environment (was not working before, nobody complained, was scheduled for removal anyway)
+    * [#1586](https://github.com/moment/moment/issues/1586) support quarter setting and parsing
+
+* 18 bugs fixed
+
+### 2.5.1
+
+* languages
+  * [#1392](https://github.com/moment/moment/issues/1392) Armenian (hy-am)
+
+* bugfixes
+  * [#1429](https://github.com/moment/moment/issues/1429) fixes [#1423](https://github.com/moment/moment/issues/1423) weird chrome-32 bug with js object creation
+  * [#1421](https://github.com/moment/moment/issues/1421) remove html entities from Welsh
+  * [#1418](https://github.com/moment/moment/issues/1418) fixes [#1401](https://github.com/moment/moment/issues/1401) improved non-padded tokens in strict matching
+  * [#1417](https://github.com/moment/moment/issues/1417) fixes [#1404](https://github.com/moment/moment/issues/1404) handle buggy moment object created by property cloning
+  * [#1398](https://github.com/moment/moment/issues/1398) fixes [#1397](https://github.com/moment/moment/issues/1397) fix Arabic-like week number parsing
+  * [#1396](https://github.com/moment/moment/issues/1396) add leftZeroFill(4) to GGGG and gggg formats
+  * [#1373](https://github.com/moment/moment/issues/1373) use lowercase for months and days in Catalan
+
+* testing
+  * [#1374](https://github.com/moment/moment/issues/1374) run tests on multiple browser/os combos via SauceLabs and Travis
+
+### 2.5.0 [See changelog](https://gist.github.com/ichernev/8104451)
+
+* New languages
+  * Luxemburish (lb) [1247](https://github.com/moment/moment/issues/1247)
+  * Serbian (rs) [1319](https://github.com/moment/moment/issues/1319)
+  * Tamil (ta) [1324](https://github.com/moment/moment/issues/1324)
+  * Macedonian (mk) [1337](https://github.com/moment/moment/issues/1337)
+
+* Features
+  * [1311](https://github.com/moment/moment/issues/1311) Add quarter getter and format token `Q`
+  * [1303](https://github.com/moment/moment/issues/1303) strict parsing now respects number of digits per token (fix [1196](https://github.com/moment/moment/issues/1196))
+  * 0d30bb7 add jspm support
+  * [1347](https://github.com/moment/moment/issues/1347) improve zone parsing
+  * [1362](https://github.com/moment/moment/issues/1362) support merideam parsing in Korean
+
+* 22 bugfixes
+
+### 2.4.0
+
+* **Deprecate** globally exported moment, will be removed in next major
+* New languages
+  * Farose (fo) [#1206](https://github.com/moment/moment/issues/1206)
+  * Tagalog/Filipino (tl-ph) [#1197](https://github.com/moment/moment/issues/1197)
+  * Welsh (cy) [#1215](https://github.com/moment/moment/issues/1215)
+* Bugfixes
+  * properly handle Z at the end of iso RegExp [#1187](https://github.com/moment/moment/issues/1187)
+  * chinese meridian time improvements [#1076](https://github.com/moment/moment/issues/1076)
+  * fix language tests [#1177](https://github.com/moment/moment/issues/1177)
+  * remove some failing tests (that should have never existed :))
+    [#1185](https://github.com/moment/moment/issues/1185)
+    [#1183](https://github.com/moment/moment/issues/1183)
+  * handle russian noun cases in weird cases [#1195](https://github.com/moment/moment/issues/1195)
+
+### 2.3.1
+
+Removed a trailing comma [1169] and fixed a bug with `months`, `weekdays` getters [#1171](https://github.com/moment/moment/issues/1171).
+
+### 2.3.0 [See changelog](https://gist.github.com/ichernev/6864354)
+
+Changed isValid, added strict parsing.
+Week tokens parsing.
+
+### 2.2.1
+
+Fixed bug in string prototype test.
+Updated authors and contributors.
+
+### 2.2.0 [See changelog](https://gist.github.com/ichernev/00f837a9baf46a3565e4)
+
+Added bower support.
+
+Language files now use UMD.
+
+Creating moment defaults to current date/month/year.
+
+Added a bundle of moment and all language files.
+
+### 2.1.0 [See changelog](https://gist.github.com/timrwood/b8c2d90d528eddb53ab5)
+
+Added better week support.
+
+Added ability to set offset with `moment#zone`.
+
+Added ability to set month or weekday from a string.
+
+Added `moment#min` and `moment#max`
+
+### 2.0.0 [See changelog](https://gist.github.com/timrwood/e72f2eef320ed9e37c51)
+
+Added short form localized tokens.
+
+Added ability to define language a string should be parsed in.
+
+Added support for reversed add/subtract arguments.
+
+Added support for `endOf('week')` and `startOf('week')`.
+
+Fixed the logic for `moment#diff(Moment, 'months')` and `moment#diff(Moment, 'years')`
+
+`moment#diff` now floors instead of rounds.
+
+Normalized `moment#toString`.
+
+Added `isSame`, `isAfter`, and `isBefore` methods.
+
+Added better week support.
+
+Added `moment#toJSON`
+
+Bugfix: Fixed parsing of first century dates
+
+Bugfix: Parsing 10Sep2001 should work as expected
+
+Bugfix: Fixed wierdness with `moment.utc()` parsing.
+
+Changed language ordinal method to return the number + ordinal instead of just the ordinal.
+
+Changed two digit year parsing cutoff to match strptime.
+
+Removed `moment#sod` and `moment#eod` in favor of `moment#startOf` and `moment#endOf`.
+
+Removed `moment.humanizeDuration()` in favor of `moment.duration().humanize()`.
+
+Removed the lang data objects from the top level namespace.
+
+Duplicate `Date` passed to `moment()` instead of referencing it.
+
+### 1.7.2 [See discussion](https://github.com/timrwood/moment/issues/456)
+
+Bugfixes
+
+### 1.7.1 [See discussion](https://github.com/timrwood/moment/issues/384)
+
+Bugfixes
+
+### 1.7.0 [See discussion](https://github.com/timrwood/moment/issues/288)
+
+Added `moment.fn.endOf()` and `moment.fn.startOf()`.
+
+Added validation via `moment.fn.isValid()`.
+
+Made formatting method 3x faster. http://jsperf.com/momentjs-cached-format-functions
+
+Add support for month/weekday callbacks in `moment.fn.format()`
+
+Added instance specific languages.
+
+Added two letter weekday abbreviations with the formatting token `dd`.
+
+Various language updates.
+
+Various bugfixes.
+
+### 1.6.0 [See discussion](https://github.com/timrwood/moment/pull/268)
+
+Added Durations.
+
+Revamped parser to support parsing non-separated strings (YYYYMMDD vs YYYY-MM-DD).
+
+Added support for millisecond parsing and formatting tokens (S SS SSS)
+
+Added a getter for `moment.lang()`
+
+Various bugfixes.
+
+There are a few things deprecated in the 1.6.0 release.
+
+1. The format tokens `z` and `zz` (timezone abbreviations like EST CST MST etc) will no longer be supported. Due to inconsistent browser support, we are unable to consistently produce this value. See [this issue](https://github.com/timrwood/moment/issues/162) for more background.
+
+2. The method `moment.fn.native` is deprecated in favor of `moment.fn.toDate`. There continue to be issues with Google Closure Compiler throwing errors when using `native`, even in valid instances.
+
+3. The way to customize am/pm strings is being changed. This would only affect you if you created a custom language file. For more information, see [this issue](https://github.com/timrwood/moment/pull/222).
+
+### 1.5.0 [See milestone](https://github.com/timrwood/moment/issues?milestone=10&page=1&state=closed)
+
+Added UTC mode.
+
+Added automatic ISO8601 parsing.
+
+Various bugfixes.
+
+### 1.4.0 [See milestone](https://github.com/timrwood/moment/issues?milestone=8&state=closed)
+
+Added `moment.fn.toDate` as a replacement for `moment.fn.native`.
+
+Added `moment.fn.sod` and `moment.fn.eod` to get the start and end of day.
+
+Various bugfixes.
+
+### 1.3.0 [See milestone](https://github.com/timrwood/moment/issues?milestone=7&state=closed)
+
+Added support for parsing month names in the current language.
+
+Added escape blocks for parsing tokens.
+
+Added `moment.fn.calendar` to format strings like 'Today 2:30 PM', 'Tomorrow 1:25 AM', and 'Last Sunday 4:30 AM'.
+
+Added `moment.fn.day` as a setter.
+
+Various bugfixes
+
+### 1.2.0 [See milestone](https://github.com/timrwood/moment/issues?milestone=4&state=closed)
+
+Added timezones to parser and formatter.
+
+Added `moment.fn.isDST`.
+
+Added `moment.fn.zone` to get the timezone offset in minutes.
+
+### 1.1.2 [See milestone](https://github.com/timrwood/moment/issues?milestone=6&state=closed)
+
+Various bugfixes
+
+### 1.1.1 [See milestone](https://github.com/timrwood/moment/issues?milestone=5&state=closed)
+
+Added time specific diffs (months, days, hours, etc)
+
+### 1.1.0
+
+Added `moment.fn.format` localized masks. 'L LL LLL LLLL' [issue 29](https://github.com/timrwood/moment/pull/29)
+
+Fixed [issue 31](https://github.com/timrwood/moment/pull/31).
+
+### 1.0.1
+
+Added `moment.version` to get the current version.
+
+Removed `window !== undefined` when checking if module exists to support browserify. [issue 25](https://github.com/timrwood/moment/pull/25)
+
+### 1.0.0
+
+Added convenience methods for getting and setting date parts.
+
+Added better support for `moment.add()`.
+
+Added better lang support in NodeJS.
+
+Renamed library from underscore.date to Moment.js
+
+### 0.6.1
+
+Added Portuguese, Italian, and French language support
+
+### 0.6.0
+
+Added _date.lang() support.
+Added support for passing multiple formats to try to parse a date. _date("07-10-1986", ["MM-DD-YYYY", "YYYY-MM-DD"]);
+Made parse from string and single format 25% faster.
+
+### 0.5.2
+
+Bugfix for [issue 8](https://github.com/timrwood/underscore.date/pull/8) and [issue 9](https://github.com/timrwood/underscore.date/pull/9).
+
+### 0.5.1
+
+Bugfix for [issue 5](https://github.com/timrwood/underscore.date/pull/5).
+
+### 0.5.0
+
+Dropped the redundant `_date.date()` in favor of `_date()`.
+Removed `_date.now()`, as it is a duplicate of `_date()` with no parameters.
+Removed `_date.isLeapYear(yearNumber)`. Use `_date([yearNumber]).isLeapYear()` instead.
+Exposed customization options through the `_date.relativeTime`, `_date.weekdays`, `_date.weekdaysShort`, `_date.months`, `_date.monthsShort`, and `_date.ordinal` variables instead of the `_date.customize()` function.
+
+### 0.4.1
+
+Added date input formats for input strings.
+
+### 0.4.0
+
+Added underscore.date to npm. Removed dependencies on underscore.
+
+### 0.3.2
+
+Added `'z'` and `'zz'` to `_.date().format()`. Cleaned up some redundant code to trim off some bytes.
+
+### 0.3.1
+
+Cleaned up the namespace. Moved all date manipulation and display functions to the _.date() object.
+
+### 0.3.0
+
+Switched to the Underscore methodology of not mucking with the native objects' prototypes.
+Made chaining possible.
+
+### 0.2.1
+
+Changed date names to be a more pseudo standardized 'dddd, MMMM Do YYYY, h:mm:ss a'.
+Added `Date.prototype` functions `add`, `subtract`, `isdst`, and `isleapyear`.
+
+### 0.2.0
+
+Changed function names to be more concise.
+Changed date format from php date format to custom format.
+
+### 0.1.0
+
+Initial release
+
diff --git a/turtles/app/lib/bower_components/momentjs/LICENSE b/turtles/app/lib/bower_components/momentjs/LICENSE
new file mode 100644
index 000000000..34f5b3707
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2011-2015 Tim Wood, Iskren Chernev, Moment.js contributors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/turtles/app/lib/bower_components/momentjs/README.md b/turtles/app/lib/bower_components/momentjs/README.md
new file mode 100644
index 000000000..d5fc00a27
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/README.md
@@ -0,0 +1,57 @@
+[![Join the chat at https://gitter.im/moment/moment](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/moment/moment?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+[![NPM version][npm-version-image]][npm-url] [![NPM downloads][npm-downloads-image]][npm-url] [![MIT License][license-image]][license-url] [![Build Status][travis-image]][travis-url]
+
+A lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates.
+
+## [Documentation](http://momentjs.com/docs/)
+
+## Port to ES6 (version 2.10.0)
+
+Moment 2.10.0 does not bring any new features, but the code is now written in
+es6 modules and placed inside `src/`. Previously `moment.js`, `locale/*.js` and
+`test/moment/*.js`, `test/locale/*.js` contained the source of the project. Now
+the source is in `src/`, temporary build (es5) files are placed under
+`build/umd/` (for running tests during development), and the `moment.js` and
+`locale/*.js` files are updated only on release.
+
+If you want to use a particular revision of the code, make sure to run
+`grunt transpile update-index`, so `moment.js` and `locales/*.js` are synced
+with `src/*`. We might place that in a commit hook in the future.
+
+## Upgrading to 2.0.0
+
+There are a number of small backwards incompatible changes with version 2.0.0. [See the full descriptions here](https://gist.github.com/timrwood/e72f2eef320ed9e37c51#backwards-incompatible-changes)
+
+ * Changed language ordinal method to return the number + ordinal instead of just the ordinal.
+
+ * Changed two digit year parsing cutoff to match strptime.
+
+ * Removed `moment#sod` and `moment#eod` in favor of `moment#startOf` and `moment#endOf`.
+
+ * Removed `moment.humanizeDuration()` in favor of `moment.duration().humanize()`.
+
+ * Removed the lang data objects from the top level namespace.
+
+ * Duplicate `Date` passed to `moment()` instead of referencing it.
+
+## [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
+
+## [Contributing](https://github.com/moment/moment/blob/develop/CONTRIBUTING.md)
+
+We're looking for co-maintainers! If you want to become a master of time please
+write to [ichernev](https://github.com/ichernev).
+
+## License
+
+Moment.js is freely distributable under the terms of the [MIT license](https://github.com/moment/moment/blob/develop/LICENSE).
+
+[license-image]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
+[license-url]: LICENSE
+
+[npm-url]: https://npmjs.org/package/moment
+[npm-version-image]: http://img.shields.io/npm/v/moment.svg?style=flat
+[npm-downloads-image]: http://img.shields.io/npm/dm/moment.svg?style=flat
+
+[travis-url]: http://travis-ci.org/moment/moment
+[travis-image]: http://img.shields.io/travis/moment/moment/develop.svg?style=flat
diff --git a/turtles/app/lib/bower_components/momentjs/bower.json b/turtles/app/lib/bower_components/momentjs/bower.json
new file mode 100644
index 000000000..48d24c71f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/bower.json
@@ -0,0 +1,23 @@
+{
+  "name": "moment",
+  "version": "2.10.3",
+  "main": "moment.js",
+  "ignore": [
+    "**/.*",
+    "benchmarks",
+    "bower_components",
+    "meteor",
+    "node_modules",
+    "scripts",
+    "tasks",
+    "test",
+    "component.json",
+    "composer.json",
+    "CONTRIBUTING.md",
+    "ender.js",
+    "Gruntfile.js",
+    "Moment.js.nuspec",
+    "package.js",
+    "package.json"
+  ]
+}
diff --git a/turtles/app/lib/bower_components/momentjs/locale/af.js b/turtles/app/lib/bower_components/momentjs/locale/af.js
new file mode 100644
index 000000000..341170b6e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/af.js
@@ -0,0 +1,72 @@
+//! moment.js locale configuration
+//! locale : afrikaans (af)
+//! author : Werner Mollentze : https://github.com/wernerm
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var af = moment.defineLocale('af', {
+        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
+        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
+        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
+        meridiemParse: /vm|nm/i,
+        isPM : function (input) {
+            return /^nm$/i.test(input);
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower ? 'vm' : 'VM';
+            } else {
+                return isLower ? 'nm' : 'NM';
+            }
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Vandag om] LT',
+            nextDay : '[Môre om] LT',
+            nextWeek : 'dddd [om] LT',
+            lastDay : '[Gister om] LT',
+            lastWeek : '[Laas] dddd [om] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'oor %s',
+            past : '%s gelede',
+            s : '\'n paar sekondes',
+            m : '\'n minuut',
+            mm : '%d minute',
+            h : '\'n uur',
+            hh : '%d ure',
+            d : '\'n dag',
+            dd : '%d dae',
+            M : '\'n maand',
+            MM : '%d maande',
+            y : '\'n jaar',
+            yy : '%d jaar'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
+        },
+        week : {
+            dow : 1, // Maandag is die eerste dag van die week.
+            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
+        }
+    });
+
+    return af;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ar-ma.js b/turtles/app/lib/bower_components/momentjs/locale/ar-ma.js
new file mode 100644
index 000000000..aa50dd8c9
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ar-ma.js
@@ -0,0 +1,58 @@
+//! moment.js locale configuration
+//! locale : Moroccan Arabic (ar-ma)
+//! author : ElFadili Yassine : https://github.com/ElFadiliY
+//! author : Abdel Said : https://github.com/abdelsaid
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ar_ma = moment.defineLocale('ar-ma', {
+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ar_ma;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ar-sa.js b/turtles/app/lib/bower_components/momentjs/locale/ar-sa.js
new file mode 100644
index 000000000..ef5da5ba3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ar-sa.js
@@ -0,0 +1,102 @@
+//! moment.js locale configuration
+//! locale : Arabic Saudi Arabia (ar-sa)
+//! author : Suhail Alkowaileet : https://github.com/xsoh
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    };
+
+    var ar_sa = moment.defineLocale('ar-sa', {
+        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ar_sa;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ar-tn.js b/turtles/app/lib/bower_components/momentjs/locale/ar-tn.js
new file mode 100644
index 000000000..ccf82cd6d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ar-tn.js
@@ -0,0 +1,56 @@
+//! moment.js locale configuration
+//! locale  : Tunisian Arabic (ar-tn)
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ar_tn = moment.defineLocale('ar-tn', {
+        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'في %s',
+            past: 'منذ %s',
+            s: 'ثوان',
+            m: 'دقيقة',
+            mm: '%d دقائق',
+            h: 'ساعة',
+            hh: '%d ساعات',
+            d: 'يوم',
+            dd: '%d أيام',
+            M: 'شهر',
+            MM: '%d أشهر',
+            y: 'سنة',
+            yy: '%d سنوات'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return ar_tn;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ar.js b/turtles/app/lib/bower_components/momentjs/locale/ar.js
new file mode 100644
index 000000000..d08c9834f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ar.js
@@ -0,0 +1,135 @@
+//! moment.js locale configuration
+//! Locale: Arabic (ar)
+//! Author: Abdel Said: https://github.com/abdelsaid
+//! Changes in months, weekdays: Ahmed Elkhatib
+//! Native plural forms: forabi https://github.com/forabi
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, months = [
+        'كانون الثاني يناير',
+        'شباط فبراير',
+        'آذار مارس',
+        'نيسان أبريل',
+        'أيار مايو',
+        'حزيران يونيو',
+        'تموز يوليو',
+        'آب أغسطس',
+        'أيلول سبتمبر',
+        'تشرين الأول أكتوبر',
+        'تشرين الثاني نوفمبر',
+        'كانون الأول ديسمبر'
+    ];
+
+    var ar = moment.defineLocale('ar', {
+        months : months,
+        monthsShort : months,
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/\u200FM/\u200FYYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'بعد %s',
+            past : 'منذ %s',
+            s : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
+        },
+        preparse: function (string) {
+            return string.replace(/\u200f/g, '').replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ar;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/az.js b/turtles/app/lib/bower_components/momentjs/locale/az.js
new file mode 100644
index 000000000..6c17574de
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/az.js
@@ -0,0 +1,103 @@
+//! moment.js locale configuration
+//! locale : azerbaijani (az)
+//! author : topchiyev : https://github.com/topchiyev
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var suffixes = {
+        1: '-inci',
+        5: '-inci',
+        8: '-inci',
+        70: '-inci',
+        80: '-inci',
+        2: '-nci',
+        7: '-nci',
+        20: '-nci',
+        50: '-nci',
+        3: '-üncü',
+        4: '-üncü',
+        100: '-üncü',
+        6: '-ncı',
+        9: '-uncu',
+        10: '-uncu',
+        30: '-uncu',
+        60: '-ıncı',
+        90: '-ıncı'
+    };
+
+    var az = moment.defineLocale('az', {
+        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
+        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
+        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
+        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
+        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[sabah saat] LT',
+            nextWeek : '[gələn həftə] dddd [saat] LT',
+            lastDay : '[dünən] LT',
+            lastWeek : '[keçən həftə] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s əvvəl',
+            s : 'birneçə saniyyə',
+            m : 'bir dəqiqə',
+            mm : '%d dəqiqə',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir il',
+            yy : '%d il'
+        },
+        meridiemParse: /gecə|səhər|gündüz|axşam/,
+        isPM : function (input) {
+            return /^(gündüz|axşam)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'gecə';
+            } else if (hour < 12) {
+                return 'səhər';
+            } else if (hour < 17) {
+                return 'gündüz';
+            } else {
+                return 'axşam';
+            }
+        },
+        ordinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '-ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return az;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/be.js b/turtles/app/lib/bower_components/momentjs/locale/be.js
new file mode 100644
index 000000000..7ca287e13
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/be.js
@@ -0,0 +1,146 @@
+//! moment.js locale configuration
+//! locale : belarusian (be)
+//! author : Dmitry Demidov : https://github.com/demidov91
+//! author: Praleska: http://praleska.pro/
+//! Author : Menelion Elensúle : https://github.com/Oire
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
+            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
+            'dd': 'дзень_дні_дзён',
+            'MM': 'месяц_месяцы_месяцаў',
+            'yy': 'год_гады_гадоў'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвіліна' : 'хвіліну';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'гадзіна' : 'гадзіну';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
+    }
+    function monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_'),
+            'accusative': 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
+            'accusative': 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_')
+        },
+        nounCase = (/\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var be = moment.defineLocale('be', {
+        months : monthsCaseReplace,
+        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., LT',
+            LLLL : 'dddd, D MMMM YYYY г., LT'
+        },
+        calendar : {
+            sameDay: '[Сёння ў] LT',
+            nextDay: '[Заўтра ў] LT',
+            lastDay: '[Учора ў] LT',
+            nextWeek: function () {
+                return '[У] dddd [ў] LT';
+            },
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 5:
+                case 6:
+                    return '[У мінулую] dddd [ў] LT';
+                case 1:
+                case 2:
+                case 4:
+                    return '[У мінулы] dddd [ў] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'праз %s',
+            past : '%s таму',
+            s : 'некалькі секунд',
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : relativeTimeWithPlural,
+            hh : relativeTimeWithPlural,
+            d : 'дзень',
+            dd : relativeTimeWithPlural,
+            M : 'месяц',
+            MM : relativeTimeWithPlural,
+            y : 'год',
+            yy : relativeTimeWithPlural
+        },
+        meridiemParse: /ночы|раніцы|дня|вечара/,
+        isPM : function (input) {
+            return /^(дня|вечара)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночы';
+            } else if (hour < 12) {
+                return 'раніцы';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечара';
+            }
+        },
+        ordinalParse: /\d{1,2}-(і|ы|га)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+            case 'w':
+            case 'W':
+                return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
+            case 'D':
+                return number + '-га';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return be;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/bg.js b/turtles/app/lib/bower_components/momentjs/locale/bg.js
new file mode 100644
index 000000000..af66834bb
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/bg.js
@@ -0,0 +1,89 @@
+//! moment.js locale configuration
+//! locale : bulgarian (bg)
+//! author : Krasen Borisov : https://github.com/kraz
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var bg = moment.defineLocale('bg', {
+        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Днес в] LT',
+            nextDay : '[Утре в] LT',
+            nextWeek : 'dddd [в] LT',
+            lastDay : '[Вчера в] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 6:
+                    return '[В изминалата] dddd [в] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[В изминалия] dddd [в] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'след %s',
+            past : 'преди %s',
+            s : 'няколко секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дни',
+            M : 'месец',
+            MM : '%d месеца',
+            y : 'година',
+            yy : '%d години'
+        },
+        ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return bg;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/bn.js b/turtles/app/lib/bower_components/momentjs/locale/bn.js
new file mode 100644
index 000000000..515a6f111
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/bn.js
@@ -0,0 +1,112 @@
+//! moment.js locale configuration
+//! locale : Bengali (bn)
+//! author : Kaushik Gandhi : https://github.com/kaushikgandhi
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '১',
+        '2': '২',
+        '3': '৩',
+        '4': '৪',
+        '5': '৫',
+        '6': '৬',
+        '7': '৭',
+        '8': '৮',
+        '9': '৯',
+        '0': '০'
+    },
+    numberMap = {
+        '১': '1',
+        '২': '2',
+        '৩': '3',
+        '৪': '4',
+        '৫': '5',
+        '৬': '6',
+        '৭': '7',
+        '৮': '8',
+        '৯': '9',
+        '০': '0'
+    };
+
+    var bn = moment.defineLocale('bn', {
+        months : 'জানুয়ারী_ফেবুয়ারী_মার্চ_এপ্রিল_মে_জুন_জুলাই_অগাস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+        monthsShort : 'জানু_ফেব_মার্চ_এপর_মে_জুন_জুল_অগ_সেপ্ট_অক্টো_নভ_ডিসেম্'.split('_'),
+        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পত্তিবার_শুক্রুবার_শনিবার'.split('_'),
+        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পত্তি_শুক্রু_শনি'.split('_'),
+        weekdaysMin : 'রব_সম_মঙ্গ_বু_ব্রিহ_শু_শনি'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm সময়',
+            LTS : 'A h:mm:ss সময়',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[আজ] LT',
+            nextDay : '[আগামীকাল] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[গতকাল] LT',
+            lastWeek : '[গত] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s পরে',
+            past : '%s আগে',
+            s : 'কএক সেকেন্ড',
+            m : 'এক মিনিট',
+            mm : '%d মিনিট',
+            h : 'এক ঘন্টা',
+            hh : '%d ঘন্টা',
+            d : 'এক দিন',
+            dd : '%d দিন',
+            M : 'এক মাস',
+            MM : '%d মাস',
+            y : 'এক বছর',
+            yy : '%d বছর'
+        },
+        preparse: function (string) {
+            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/,
+        isPM: function (input) {
+            return /^(দুপুর|বিকেল|রাত)$/.test(input);
+        },
+        //Bengali is a vast language its spoken
+        //in different forms in various parts of the world.
+        //I have just generalized with most common one used
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'রাত';
+            } else if (hour < 10) {
+                return 'শকাল';
+            } else if (hour < 17) {
+                return 'দুপুর';
+            } else if (hour < 20) {
+                return 'বিকেল';
+            } else {
+                return 'রাত';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return bn;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/bo.js b/turtles/app/lib/bower_components/momentjs/locale/bo.js
new file mode 100644
index 000000000..5bcfd9a5f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/bo.js
@@ -0,0 +1,109 @@
+//! moment.js locale configuration
+//! locale : tibetan (bo)
+//! author : Thupten N. Chakrishar : https://github.com/vajradog
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '༡',
+        '2': '༢',
+        '3': '༣',
+        '4': '༤',
+        '5': '༥',
+        '6': '༦',
+        '7': '༧',
+        '8': '༨',
+        '9': '༩',
+        '0': '༠'
+    },
+    numberMap = {
+        '༡': '1',
+        '༢': '2',
+        '༣': '3',
+        '༤': '4',
+        '༥': '5',
+        '༦': '6',
+        '༧': '7',
+        '༨': '8',
+        '༩': '9',
+        '༠': '0'
+    };
+
+    var bo = moment.defineLocale('bo', {
+        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
+        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[དི་རིང] LT',
+            nextDay : '[སང་ཉིན] LT',
+            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
+            lastDay : '[ཁ་སང] LT',
+            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ལ་',
+            past : '%s སྔན་ལ',
+            s : 'ལམ་སང',
+            m : 'སྐར་མ་གཅིག',
+            mm : '%d སྐར་མ',
+            h : 'ཆུ་ཚོད་གཅིག',
+            hh : '%d ཆུ་ཚོད',
+            d : 'ཉིན་གཅིག',
+            dd : '%d ཉིན་',
+            M : 'ཟླ་བ་གཅིག',
+            MM : '%d ཟླ་བ',
+            y : 'ལོ་གཅིག',
+            yy : '%d ལོ'
+        },
+        preparse: function (string) {
+            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
+        isPM: function (input) {
+            return /^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'མཚན་མོ';
+            } else if (hour < 10) {
+                return 'ཞོགས་ཀས';
+            } else if (hour < 17) {
+                return 'ཉིན་གུང';
+            } else if (hour < 20) {
+                return 'དགོང་དག';
+            } else {
+                return 'མཚན་མོ';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return bo;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/br.js b/turtles/app/lib/bower_components/momentjs/locale/br.js
new file mode 100644
index 000000000..a08280c03
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/br.js
@@ -0,0 +1,106 @@
+//! moment.js locale configuration
+//! locale : breton (br)
+//! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function relativeTimeWithMutation(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'munutenn',
+            'MM': 'miz',
+            'dd': 'devezh'
+        };
+        return number + ' ' + mutation(format[key], number);
+    }
+    function specialMutationForYears(number) {
+        switch (lastNumber(number)) {
+        case 1:
+        case 3:
+        case 4:
+        case 5:
+        case 9:
+            return number + ' bloaz';
+        default:
+            return number + ' vloaz';
+        }
+    }
+    function lastNumber(number) {
+        if (number > 9) {
+            return lastNumber(number % 10);
+        }
+        return number;
+    }
+    function mutation(text, number) {
+        if (number === 2) {
+            return softMutation(text);
+        }
+        return text;
+    }
+    function softMutation(text) {
+        var mutationTable = {
+            'm': 'v',
+            'b': 'v',
+            'd': 'z'
+        };
+        if (mutationTable[text.charAt(0)] === undefined) {
+            return text;
+        }
+        return mutationTable[text.charAt(0)] + text.substring(1);
+    }
+
+    var br = moment.defineLocale('br', {
+        months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
+        monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
+        weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
+        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
+        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h[e]mm A',
+            LTS : 'h[e]mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D [a viz] MMMM YYYY',
+            LLL : 'D [a viz] MMMM YYYY LT',
+            LLLL : 'dddd, D [a viz] MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Hiziv da] LT',
+            nextDay : '[Warc\'hoazh da] LT',
+            nextWeek : 'dddd [da] LT',
+            lastDay : '[Dec\'h da] LT',
+            lastWeek : 'dddd [paset da] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'a-benn %s',
+            past : '%s \'zo',
+            s : 'un nebeud segondennoù',
+            m : 'ur vunutenn',
+            mm : relativeTimeWithMutation,
+            h : 'un eur',
+            hh : '%d eur',
+            d : 'un devezh',
+            dd : relativeTimeWithMutation,
+            M : 'ur miz',
+            MM : relativeTimeWithMutation,
+            y : 'ur bloaz',
+            yy : specialMutationForYears
+        },
+        ordinalParse: /\d{1,2}(añ|vet)/,
+        ordinal : function (number) {
+            var output = (number === 1) ? 'añ' : 'vet';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return br;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/bs.js b/turtles/app/lib/bower_components/momentjs/locale/bs.js
new file mode 100644
index 000000000..57139cca6
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/bs.js
@@ -0,0 +1,140 @@
+//! moment.js locale configuration
+//! locale : bosnian (bs)
+//! author : Nedim Cholich : https://github.com/frontyard
+//! based on (hr) translation by Bojan Marković
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+        case 'mm':
+            if (number === 1) {
+                result += 'minuta';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'minute';
+            } else {
+                result += 'minuta';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'jedan sat' : 'jednog sata';
+        case 'hh':
+            if (number === 1) {
+                result += 'sat';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'sata';
+            } else {
+                result += 'sati';
+            }
+            return result;
+        case 'dd':
+            if (number === 1) {
+                result += 'dan';
+            } else {
+                result += 'dana';
+            }
+            return result;
+        case 'MM':
+            if (number === 1) {
+                result += 'mjesec';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'mjeseca';
+            } else {
+                result += 'mjeseci';
+            }
+            return result;
+        case 'yy':
+            if (number === 1) {
+                result += 'godina';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'godine';
+            } else {
+                result += 'godina';
+            }
+            return result;
+        }
+    }
+
+    var bs = moment.defineLocale('bs', {
+        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                    return '[prošlu] dddd [u] LT';
+                case 6:
+                    return '[prošle] [subote] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            m      : translate,
+            mm     : translate,
+            h      : translate,
+            hh     : translate,
+            d      : 'dan',
+            dd     : translate,
+            M      : 'mjesec',
+            MM     : translate,
+            y      : 'godinu',
+            yy     : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return bs;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ca.js b/turtles/app/lib/bower_components/momentjs/locale/ca.js
new file mode 100644
index 000000000..11cce502d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ca.js
@@ -0,0 +1,78 @@
+//! moment.js locale configuration
+//! locale : catalan (ca)
+//! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ca = moment.defineLocale('ca', {
+        months : 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
+        monthsShort : 'gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.'.split('_'),
+        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
+        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
+        weekdaysMin : 'Dg_Dl_Dt_Dc_Dj_Dv_Ds'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextDay : function () {
+                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastDay : function () {
+                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'fa %s',
+            s : 'uns segons',
+            m : 'un minut',
+            mm : '%d minuts',
+            h : 'una hora',
+            hh : '%d hores',
+            d : 'un dia',
+            dd : '%d dies',
+            M : 'un mes',
+            MM : '%d mesos',
+            y : 'un any',
+            yy : '%d anys'
+        },
+        ordinalParse: /\d{1,2}(r|n|t|è|a)/,
+        ordinal : function (number, period) {
+            var output = (number === 1) ? 'r' :
+                (number === 2) ? 'n' :
+                (number === 3) ? 'r' :
+                (number === 4) ? 't' : 'è';
+            if (period === 'w' || period === 'W') {
+                output = 'a';
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return ca;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/cs.js b/turtles/app/lib/bower_components/momentjs/locale/cs.js
new file mode 100644
index 000000000..0d8789dd3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/cs.js
@@ -0,0 +1,156 @@
+//! moment.js locale configuration
+//! locale : czech (cs)
+//! author : petrbela : https://github.com/petrbela
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
+        monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
+    function plural(n) {
+        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':  // a few seconds / in a few seconds / a few seconds ago
+            return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
+        case 'm':  // a minute / in a minute / a minute ago
+            return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
+        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'minuty' : 'minut');
+            } else {
+                return result + 'minutami';
+            }
+            break;
+        case 'h':  // an hour / in an hour / an hour ago
+            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+        case 'hh': // 9 hours / in 9 hours / 9 hours ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'hodiny' : 'hodin');
+            } else {
+                return result + 'hodinami';
+            }
+            break;
+        case 'd':  // a day / in a day / a day ago
+            return (withoutSuffix || isFuture) ? 'den' : 'dnem';
+        case 'dd': // 9 days / in 9 days / 9 days ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'dny' : 'dní');
+            } else {
+                return result + 'dny';
+            }
+            break;
+        case 'M':  // a month / in a month / a month ago
+            return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
+        case 'MM': // 9 months / in 9 months / 9 months ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'měsíce' : 'měsíců');
+            } else {
+                return result + 'měsíci';
+            }
+            break;
+        case 'y':  // a year / in a year / a year ago
+            return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
+        case 'yy': // 9 years / in 9 years / 9 years ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'roky' : 'let');
+            } else {
+                return result + 'lety';
+            }
+            break;
+        }
+    }
+
+    var cs = moment.defineLocale('cs', {
+        months : months,
+        monthsShort : monthsShort,
+        monthsParse : (function (months, monthsShort) {
+            var i, _monthsParse = [];
+            for (i = 0; i < 12; i++) {
+                // use custom parser to solve problem with July (červenec)
+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+            }
+            return _monthsParse;
+        }(months, monthsShort)),
+        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
+        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
+        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[dnes v] LT',
+            nextDay: '[zítra v] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v neděli v] LT';
+                case 1:
+                case 2:
+                    return '[v] dddd [v] LT';
+                case 3:
+                    return '[ve středu v] LT';
+                case 4:
+                    return '[ve čtvrtek v] LT';
+                case 5:
+                    return '[v pátek v] LT';
+                case 6:
+                    return '[v sobotu v] LT';
+                }
+            },
+            lastDay: '[včera v] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[minulou neděli v] LT';
+                case 1:
+                case 2:
+                    return '[minulé] dddd [v] LT';
+                case 3:
+                    return '[minulou středu v] LT';
+                case 4:
+                case 5:
+                    return '[minulý] dddd [v] LT';
+                case 6:
+                    return '[minulou sobotu v] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'před %s',
+            s : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        ordinalParse : /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return cs;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/cv.js b/turtles/app/lib/bower_components/momentjs/locale/cv.js
new file mode 100644
index 000000000..d01acab1d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/cv.js
@@ -0,0 +1,62 @@
+//! moment.js locale configuration
+//! locale : chuvash (cv)
+//! author : Anatoly Mironov : https://github.com/mirontoli
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var cv = moment.defineLocale('cv', {
+        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
+        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
+        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
+        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
+        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
+            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT',
+            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT'
+        },
+        calendar : {
+            sameDay: '[Паян] LT [сехетре]',
+            nextDay: '[Ыран] LT [сехетре]',
+            lastDay: '[Ӗнер] LT [сехетре]',
+            nextWeek: '[Ҫитес] dddd LT [сехетре]',
+            lastWeek: '[Иртнӗ] dddd LT [сехетре]',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (output) {
+                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
+                return output + affix;
+            },
+            past : '%s каялла',
+            s : 'пӗр-ик ҫеккунт',
+            m : 'пӗр минут',
+            mm : '%d минут',
+            h : 'пӗр сехет',
+            hh : '%d сехет',
+            d : 'пӗр кун',
+            dd : '%d кун',
+            M : 'пӗр уйӑх',
+            MM : '%d уйӑх',
+            y : 'пӗр ҫул',
+            yy : '%d ҫул'
+        },
+        ordinalParse: /\d{1,2}-мӗш/,
+        ordinal : '%d-мӗш',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return cv;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/cy.js b/turtles/app/lib/bower_components/momentjs/locale/cy.js
new file mode 100644
index 000000000..e639124b9
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/cy.js
@@ -0,0 +1,78 @@
+//! moment.js locale configuration
+//! locale : Welsh (cy)
+//! author : Robert Allen
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var cy = moment.defineLocale('cy', {
+        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
+        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
+        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
+        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
+        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
+        // time formats are the same as en-gb
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd, D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[Heddiw am] LT',
+            nextDay: '[Yfory am] LT',
+            nextWeek: 'dddd [am] LT',
+            lastDay: '[Ddoe am] LT',
+            lastWeek: 'dddd [diwethaf am] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'mewn %s',
+            past: '%s yn ôl',
+            s: 'ychydig eiliadau',
+            m: 'munud',
+            mm: '%d munud',
+            h: 'awr',
+            hh: '%d awr',
+            d: 'diwrnod',
+            dd: '%d diwrnod',
+            M: 'mis',
+            MM: '%d mis',
+            y: 'blwyddyn',
+            yy: '%d flynedd'
+        },
+        ordinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
+        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
+        ordinal: function (number) {
+            var b = number,
+                output = '',
+                lookup = [
+                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
+                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
+                ];
+            if (b > 20) {
+                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
+                    output = 'fed'; // not 30ain, 70ain or 90ain
+                } else {
+                    output = 'ain';
+                }
+            } else if (b > 0) {
+                output = lookup[b];
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return cy;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/da.js b/turtles/app/lib/bower_components/momentjs/locale/da.js
new file mode 100644
index 000000000..9a9938155
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/da.js
@@ -0,0 +1,59 @@
+//! moment.js locale configuration
+//! locale : danish (da)
+//! author : Ulrik Nielsen : https://github.com/mrbase
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var da = moment.defineLocale('da', {
+        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd [d.] D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[I dag kl.] LT',
+            nextDay : '[I morgen kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[I går kl.] LT',
+            lastWeek : '[sidste] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'få sekunder',
+            m : 'et minut',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dage',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'et år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return da;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/de-at.js b/turtles/app/lib/bower_components/momentjs/locale/de-at.js
new file mode 100644
index 000000000..53096013f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/de-at.js
@@ -0,0 +1,75 @@
+//! moment.js locale configuration
+//! locale : austrian german (de-at)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+//! author : Martin Groller : https://github.com/MadMG
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de_at = moment.defineLocale('de-at', {
+        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return de_at;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/de.js b/turtles/app/lib/bower_components/momentjs/locale/de.js
new file mode 100644
index 000000000..30a9b1e10
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/de.js
@@ -0,0 +1,74 @@
+//! moment.js locale configuration
+//! locale : german (de)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de = moment.defineLocale('de', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return de;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/el.js b/turtles/app/lib/bower_components/momentjs/locale/el.js
new file mode 100644
index 000000000..d18564240
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/el.js
@@ -0,0 +1,93 @@
+//! moment.js locale configuration
+//! locale : modern greek (el)
+//! author : Aggelos Karalias : https://github.com/mehiel
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var el = moment.defineLocale('el', {
+        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
+        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
+        months : function (momentToFormat, format) {
+            if (/D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
+                return this._monthsGenitiveEl[momentToFormat.month()];
+            } else {
+                return this._monthsNominativeEl[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
+        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
+        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
+        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'μμ' : 'ΜΜ';
+            } else {
+                return isLower ? 'πμ' : 'ΠΜ';
+            }
+        },
+        isPM : function (input) {
+            return ((input + '').toLowerCase()[0] === 'μ');
+        },
+        meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendarEl : {
+            sameDay : '[Σήμερα {}] LT',
+            nextDay : '[Αύριο {}] LT',
+            nextWeek : 'dddd [{}] LT',
+            lastDay : '[Χθες {}] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        calendar : function (key, mom) {
+            var output = this._calendarEl[key],
+                hours = mom && mom.hours();
+            if (typeof output === 'function') {
+                output = output.apply(mom);
+            }
+            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
+        },
+        relativeTime : {
+            future : 'σε %s',
+            past : '%s πριν',
+            s : 'λίγα δευτερόλεπτα',
+            m : 'ένα λεπτό',
+            mm : '%d λεπτά',
+            h : 'μία ώρα',
+            hh : '%d ώρες',
+            d : 'μία μέρα',
+            dd : '%d μέρες',
+            M : 'ένας μήνας',
+            MM : '%d μήνες',
+            y : 'ένας χρόνος',
+            yy : '%d χρόνια'
+        },
+        ordinalParse: /\d{1,2}η/,
+        ordinal: '%dη',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4st is the first week of the year.
+        }
+    });
+
+    return el;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/en-au.js b/turtles/app/lib/bower_components/momentjs/locale/en-au.js
new file mode 100644
index 000000000..9a358e5a5
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/en-au.js
@@ -0,0 +1,65 @@
+//! moment.js locale configuration
+//! locale : australian english (en-au)
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var en_au = moment.defineLocale('en-au', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return en_au;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/en-ca.js b/turtles/app/lib/bower_components/momentjs/locale/en-ca.js
new file mode 100644
index 000000000..e0aaf01a8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/en-ca.js
@@ -0,0 +1,62 @@
+//! moment.js locale configuration
+//! locale : canadian english (en-ca)
+//! author : Jonathan Abourbih : https://github.com/jonbca
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var en_ca = moment.defineLocale('en-ca', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM, YYYY',
+            LLL : 'D MMMM, YYYY LT',
+            LLLL : 'dddd, D MMMM, YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    return en_ca;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/en-gb.js b/turtles/app/lib/bower_components/momentjs/locale/en-gb.js
new file mode 100644
index 000000000..e9eeace5b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/en-gb.js
@@ -0,0 +1,66 @@
+//! moment.js locale configuration
+//! locale : great britain english (en-gb)
+//! author : Chris Gedrim : https://github.com/chrisgedrim
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var en_gb = moment.defineLocale('en-gb', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return en_gb;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/eo.js b/turtles/app/lib/bower_components/momentjs/locale/eo.js
new file mode 100644
index 000000000..d4c79086b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/eo.js
@@ -0,0 +1,72 @@
+//! moment.js locale configuration
+//! locale : esperanto (eo)
+//! author : Colin Dean : https://github.com/colindean
+//! komento: Mi estas malcerta se mi korekte traktis akuzativojn en tiu traduko.
+//!          Se ne, bonvolu korekti kaj avizi min por ke mi povas lerni!
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var eo = moment.defineLocale('eo', {
+        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
+        weekdays : 'Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato'.split('_'),
+        weekdaysShort : 'Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Ĵa_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D[-an de] MMMM, YYYY',
+            LLL : 'D[-an de] MMMM, YYYY LT',
+            LLLL : 'dddd, [la] D[-an de] MMMM, YYYY LT'
+        },
+        meridiemParse: /[ap]\.t\.m/i,
+        isPM: function (input) {
+            return input.charAt(0).toLowerCase() === 'p';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'p.t.m.' : 'P.T.M.';
+            } else {
+                return isLower ? 'a.t.m.' : 'A.T.M.';
+            }
+        },
+        calendar : {
+            sameDay : '[Hodiaŭ je] LT',
+            nextDay : '[Morgaŭ je] LT',
+            nextWeek : 'dddd [je] LT',
+            lastDay : '[Hieraŭ je] LT',
+            lastWeek : '[pasinta] dddd [je] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'je %s',
+            past : 'antaŭ %s',
+            s : 'sekundoj',
+            m : 'minuto',
+            mm : '%d minutoj',
+            h : 'horo',
+            hh : '%d horoj',
+            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
+            dd : '%d tagoj',
+            M : 'monato',
+            MM : '%d monatoj',
+            y : 'jaro',
+            yy : '%d jaroj'
+        },
+        ordinalParse: /\d{1,2}a/,
+        ordinal : '%da',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return eo;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/es.js b/turtles/app/lib/bower_components/momentjs/locale/es.js
new file mode 100644
index 000000000..4349217c2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/es.js
@@ -0,0 +1,78 @@
+//! moment.js locale configuration
+//! locale : spanish (es)
+//! author : Julio Napurí : https://github.com/julionc
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var monthsShortDot = 'Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.'.split('_'),
+        monthsShort = 'Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic'.split('_');
+
+    var es = moment.defineLocale('es', {
+        months : 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        weekdays : 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mié._Jue._Vie._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return es;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/et.js b/turtles/app/lib/bower_components/momentjs/locale/et.js
new file mode 100644
index 000000000..8cadeb2f3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/et.js
@@ -0,0 +1,79 @@
+//! moment.js locale configuration
+//! locale : estonian (et)
+//! author : Henry Kehlmann : https://github.com/madhenry
+//! improvements : Illimar Tambek : https://github.com/ragulka
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
+            'm' : ['ühe minuti', 'üks minut'],
+            'mm': [number + ' minuti', number + ' minutit'],
+            'h' : ['ühe tunni', 'tund aega', 'üks tund'],
+            'hh': [number + ' tunni', number + ' tundi'],
+            'd' : ['ühe päeva', 'üks päev'],
+            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
+            'MM': [number + ' kuu', number + ' kuud'],
+            'y' : ['ühe aasta', 'aasta', 'üks aasta'],
+            'yy': [number + ' aasta', number + ' aastat']
+        };
+        if (withoutSuffix) {
+            return format[key][2] ? format[key][2] : format[key][1];
+        }
+        return isFuture ? format[key][0] : format[key][1];
+    }
+
+    var et = moment.defineLocale('et', {
+        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
+        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
+        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
+        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
+        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
+        longDateFormat : {
+            LT   : 'H:mm',
+            LTS : 'LT:ss',
+            L    : 'DD.MM.YYYY',
+            LL   : 'D. MMMM YYYY',
+            LLL  : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[Täna,] LT',
+            nextDay  : '[Homme,] LT',
+            nextWeek : '[Järgmine] dddd LT',
+            lastDay  : '[Eile,] LT',
+            lastWeek : '[Eelmine] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s pärast',
+            past   : '%s tagasi',
+            s      : processRelativeTime,
+            m      : processRelativeTime,
+            mm     : processRelativeTime,
+            h      : processRelativeTime,
+            hh     : processRelativeTime,
+            d      : processRelativeTime,
+            dd     : '%d päeva',
+            M      : processRelativeTime,
+            MM     : processRelativeTime,
+            y      : processRelativeTime,
+            yy     : processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return et;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/eu.js b/turtles/app/lib/bower_components/momentjs/locale/eu.js
new file mode 100644
index 000000000..c90391a1b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/eu.js
@@ -0,0 +1,63 @@
+//! moment.js locale configuration
+//! locale : euskara (eu)
+//! author : Eneko Illarramendi : https://github.com/eillarra
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var eu = moment.defineLocale('eu', {
+        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
+        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
+        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
+        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
+        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY[ko] MMMM[ren] D[a]',
+            LLL : 'YYYY[ko] MMMM[ren] D[a] LT',
+            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] LT',
+            l : 'YYYY-M-D',
+            ll : 'YYYY[ko] MMM D[a]',
+            lll : 'YYYY[ko] MMM D[a] LT',
+            llll : 'ddd, YYYY[ko] MMM D[a] LT'
+        },
+        calendar : {
+            sameDay : '[gaur] LT[etan]',
+            nextDay : '[bihar] LT[etan]',
+            nextWeek : 'dddd LT[etan]',
+            lastDay : '[atzo] LT[etan]',
+            lastWeek : '[aurreko] dddd LT[etan]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s barru',
+            past : 'duela %s',
+            s : 'segundo batzuk',
+            m : 'minutu bat',
+            mm : '%d minutu',
+            h : 'ordu bat',
+            hh : '%d ordu',
+            d : 'egun bat',
+            dd : '%d egun',
+            M : 'hilabete bat',
+            MM : '%d hilabete',
+            y : 'urte bat',
+            yy : '%d urte'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return eu;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/fa.js b/turtles/app/lib/bower_components/momentjs/locale/fa.js
new file mode 100644
index 000000000..9a5e5125d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/fa.js
@@ -0,0 +1,104 @@
+//! moment.js locale configuration
+//! locale : Persian (fa)
+//! author : Ebrahim Byagowi : https://github.com/ebraminio
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '۱',
+        '2': '۲',
+        '3': '۳',
+        '4': '۴',
+        '5': '۵',
+        '6': '۶',
+        '7': '۷',
+        '8': '۸',
+        '9': '۹',
+        '0': '۰'
+    }, numberMap = {
+        '۱': '1',
+        '۲': '2',
+        '۳': '3',
+        '۴': '4',
+        '۵': '5',
+        '۶': '6',
+        '۷': '7',
+        '۸': '8',
+        '۹': '9',
+        '۰': '0'
+    };
+
+    var fa = moment.defineLocale('fa', {
+        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        meridiemParse: /قبل از ظهر|بعد از ظهر/,
+        isPM: function (input) {
+            return /بعد از ظهر/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'قبل از ظهر';
+            } else {
+                return 'بعد از ظهر';
+            }
+        },
+        calendar : {
+            sameDay : '[امروز ساعت] LT',
+            nextDay : '[فردا ساعت] LT',
+            nextWeek : 'dddd [ساعت] LT',
+            lastDay : '[دیروز ساعت] LT',
+            lastWeek : 'dddd [پیش] [ساعت] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'در %s',
+            past : '%s پیش',
+            s : 'چندین ثانیه',
+            m : 'یک دقیقه',
+            mm : '%d دقیقه',
+            h : 'یک ساعت',
+            hh : '%d ساعت',
+            d : 'یک روز',
+            dd : '%d روز',
+            M : 'یک ماه',
+            MM : '%d ماه',
+            y : 'یک سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/[۰-۹]/g, function (match) {
+                return numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        ordinalParse: /\d{1,2}م/,
+        ordinal : '%dم',
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return fa;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/fi.js b/turtles/app/lib/bower_components/momentjs/locale/fi.js
new file mode 100644
index 000000000..b4023208b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/fi.js
@@ -0,0 +1,106 @@
+//! moment.js locale configuration
+//! locale : finnish (fi)
+//! author : Tarmo Aidantausta : https://github.com/bleadof
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
+        numbersFuture = [
+            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+            numbersPast[7], numbersPast[8], numbersPast[9]
+        ];
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = '';
+        switch (key) {
+        case 's':
+            return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
+        case 'm':
+            return isFuture ? 'minuutin' : 'minuutti';
+        case 'mm':
+            result = isFuture ? 'minuutin' : 'minuuttia';
+            break;
+        case 'h':
+            return isFuture ? 'tunnin' : 'tunti';
+        case 'hh':
+            result = isFuture ? 'tunnin' : 'tuntia';
+            break;
+        case 'd':
+            return isFuture ? 'päivän' : 'päivä';
+        case 'dd':
+            result = isFuture ? 'päivän' : 'päivää';
+            break;
+        case 'M':
+            return isFuture ? 'kuukauden' : 'kuukausi';
+        case 'MM':
+            result = isFuture ? 'kuukauden' : 'kuukautta';
+            break;
+        case 'y':
+            return isFuture ? 'vuoden' : 'vuosi';
+        case 'yy':
+            result = isFuture ? 'vuoden' : 'vuotta';
+            break;
+        }
+        result = verbalNumber(number, isFuture) + ' ' + result;
+        return result;
+    }
+    function verbalNumber(number, isFuture) {
+        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
+    }
+
+    var fi = moment.defineLocale('fi', {
+        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'Do MMMM[ta] YYYY',
+            LLL : 'Do MMMM[ta] YYYY, [klo] LT',
+            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] LT',
+            l : 'D.M.YYYY',
+            ll : 'Do MMM YYYY',
+            lll : 'Do MMM YYYY, [klo] LT',
+            llll : 'ddd, Do MMM YYYY, [klo] LT'
+        },
+        calendar : {
+            sameDay : '[tänään] [klo] LT',
+            nextDay : '[huomenna] [klo] LT',
+            nextWeek : 'dddd [klo] LT',
+            lastDay : '[eilen] [klo] LT',
+            lastWeek : '[viime] dddd[na] [klo] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s päästä',
+            past : '%s sitten',
+            s : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return fi;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/fo.js b/turtles/app/lib/bower_components/momentjs/locale/fo.js
new file mode 100644
index 000000000..734d0789a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/fo.js
@@ -0,0 +1,59 @@
+//! moment.js locale configuration
+//! locale : faroese (fo)
+//! author : Ragnar Johannesen : https://github.com/ragnar123
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var fo = moment.defineLocale('fo', {
+        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
+        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
+        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM, YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Í dag kl.] LT',
+            nextDay : '[Í morgin kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[Í gjár kl.] LT',
+            lastWeek : '[síðstu] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'um %s',
+            past : '%s síðani',
+            s : 'fá sekund',
+            m : 'ein minutt',
+            mm : '%d minuttir',
+            h : 'ein tími',
+            hh : '%d tímar',
+            d : 'ein dagur',
+            dd : '%d dagar',
+            M : 'ein mánaði',
+            MM : '%d mánaðir',
+            y : 'eitt ár',
+            yy : '%d ár'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return fo;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/fr-ca.js b/turtles/app/lib/bower_components/momentjs/locale/fr-ca.js
new file mode 100644
index 000000000..decc50c79
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/fr-ca.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+//! locale : canadian french (fr-ca)
+//! author : Jonathan Abourbih : https://github.com/jonbca
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var fr_ca = moment.defineLocale('fr-ca', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        }
+    });
+
+    return fr_ca;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/fr.js b/turtles/app/lib/bower_components/momentjs/locale/fr.js
new file mode 100644
index 000000000..c2f83ef28
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/fr.js
@@ -0,0 +1,61 @@
+//! moment.js locale configuration
+//! locale : french (fr)
+//! author : John Fischer : https://github.com/jfroffice
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var fr = moment.defineLocale('fr', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return fr;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/fy.js b/turtles/app/lib/bower_components/momentjs/locale/fy.js
new file mode 100644
index 000000000..57380dd71
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/fy.js
@@ -0,0 +1,70 @@
+//! moment.js locale configuration
+//! locale : frisian (fy)
+//! author : Robin van der Vliet : https://github.com/robin0van0der0v
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
+
+    var fy = moment.defineLocale('fy', {
+        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
+        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
+        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
+        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[hjoed om] LT',
+            nextDay: '[moarn om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[juster om] LT',
+            lastWeek: '[ôfrûne] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'oer %s',
+            past : '%s lyn',
+            s : 'in pear sekonden',
+            m : 'ien minút',
+            mm : '%d minuten',
+            h : 'ien oere',
+            hh : '%d oeren',
+            d : 'ien dei',
+            dd : '%d dagen',
+            M : 'ien moanne',
+            MM : '%d moannen',
+            y : 'ien jier',
+            yy : '%d jierren'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return fy;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/gl.js b/turtles/app/lib/bower_components/momentjs/locale/gl.js
new file mode 100644
index 000000000..88f271ee7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/gl.js
@@ -0,0 +1,74 @@
+//! moment.js locale configuration
+//! locale : galician (gl)
+//! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var gl = moment.defineLocale('gl', {
+        months : 'Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro'.split('_'),
+        monthsShort : 'Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.'.split('_'),
+        weekdays : 'Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mér._Xov._Ven._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mé_Xo_Ve_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            lastDay : function () {
+                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
+            },
+            lastWeek : function () {
+                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (str) {
+                if (str === 'uns segundos') {
+                    return 'nuns segundos';
+                }
+                return 'en ' + str;
+            },
+            past : 'hai %s',
+            s : 'uns segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'unha hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un ano',
+            yy : '%d anos'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return gl;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/he.js b/turtles/app/lib/bower_components/momentjs/locale/he.js
new file mode 100644
index 000000000..19a3b87ea
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/he.js
@@ -0,0 +1,81 @@
+//! moment.js locale configuration
+//! locale : Hebrew (he)
+//! author : Tomer Cohen : https://github.com/tomer
+//! author : Moshe Simantov : https://github.com/DevelopmentIL
+//! author : Tal Ater : https://github.com/TalAter
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var he = moment.defineLocale('he', {
+        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
+        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [ב]MMMM YYYY',
+            LLL : 'D [ב]MMMM YYYY LT',
+            LLLL : 'dddd, D [ב]MMMM YYYY LT',
+            l : 'D/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY LT',
+            llll : 'ddd, D MMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[היום ב־]LT',
+            nextDay : '[מחר ב־]LT',
+            nextWeek : 'dddd [בשעה] LT',
+            lastDay : '[אתמול ב־]LT',
+            lastWeek : '[ביום] dddd [האחרון בשעה] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'בעוד %s',
+            past : 'לפני %s',
+            s : 'מספר שניות',
+            m : 'דקה',
+            mm : '%d דקות',
+            h : 'שעה',
+            hh : function (number) {
+                if (number === 2) {
+                    return 'שעתיים';
+                }
+                return number + ' שעות';
+            },
+            d : 'יום',
+            dd : function (number) {
+                if (number === 2) {
+                    return 'יומיים';
+                }
+                return number + ' ימים';
+            },
+            M : 'חודש',
+            MM : function (number) {
+                if (number === 2) {
+                    return 'חודשיים';
+                }
+                return number + ' חודשים';
+            },
+            y : 'שנה',
+            yy : function (number) {
+                if (number === 2) {
+                    return 'שנתיים';
+                } else if (number % 10 === 0 && number !== 10) {
+                    return number + ' שנה';
+                }
+                return number + ' שנים';
+            }
+        }
+    });
+
+    return he;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/hi.js b/turtles/app/lib/bower_components/momentjs/locale/hi.js
new file mode 100644
index 000000000..717780619
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/hi.js
@@ -0,0 +1,122 @@
+//! moment.js locale configuration
+//! locale : hindi (hi)
+//! author : Mayank Singhal : https://github.com/mayanksinghal
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var hi = moment.defineLocale('hi', {
+        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
+        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
+        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm बजे',
+            LTS : 'A h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[कल] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[कल] LT',
+            lastWeek : '[पिछले] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s में',
+            past : '%s पहले',
+            s : 'कुछ ही क्षण',
+            m : 'एक मिनट',
+            mm : '%d मिनट',
+            h : 'एक घंटा',
+            hh : '%d घंटे',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महीने',
+            MM : '%d महीने',
+            y : 'एक वर्ष',
+            yy : '%d वर्ष'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        // Hindi notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
+        meridiemParse: /रात|सुबह|दोपहर|शाम/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सुबह') {
+                return hour;
+            } else if (meridiem === 'दोपहर') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'शाम') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात';
+            } else if (hour < 10) {
+                return 'सुबह';
+            } else if (hour < 17) {
+                return 'दोपहर';
+            } else if (hour < 20) {
+                return 'शाम';
+            } else {
+                return 'रात';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return hi;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/hr.js b/turtles/app/lib/bower_components/momentjs/locale/hr.js
new file mode 100644
index 000000000..2c948e348
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/hr.js
@@ -0,0 +1,139 @@
+//! moment.js locale configuration
+//! locale : hrvatski (hr)
+//! author : Bojan Marković : https://github.com/bmarkovic
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+        case 'mm':
+            if (number === 1) {
+                result += 'minuta';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'minute';
+            } else {
+                result += 'minuta';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'jedan sat' : 'jednog sata';
+        case 'hh':
+            if (number === 1) {
+                result += 'sat';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'sata';
+            } else {
+                result += 'sati';
+            }
+            return result;
+        case 'dd':
+            if (number === 1) {
+                result += 'dan';
+            } else {
+                result += 'dana';
+            }
+            return result;
+        case 'MM':
+            if (number === 1) {
+                result += 'mjesec';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'mjeseca';
+            } else {
+                result += 'mjeseci';
+            }
+            return result;
+        case 'yy':
+            if (number === 1) {
+                result += 'godina';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'godine';
+            } else {
+                result += 'godina';
+            }
+            return result;
+        }
+    }
+
+    var hr = moment.defineLocale('hr', {
+        months : 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_'),
+        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                    return '[prošlu] dddd [u] LT';
+                case 6:
+                    return '[prošle] [subote] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            m      : translate,
+            mm     : translate,
+            h      : translate,
+            hh     : translate,
+            d      : 'dan',
+            dd     : translate,
+            M      : 'mjesec',
+            MM     : translate,
+            y      : 'godinu',
+            yy     : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return hr;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/hu.js b/turtles/app/lib/bower_components/momentjs/locale/hu.js
new file mode 100644
index 000000000..4a95c8479
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/hu.js
@@ -0,0 +1,108 @@
+//! moment.js locale configuration
+//! locale : hungarian (hu)
+//! author : Adam Brunner : https://github.com/adambrunner
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
+    function translate(number, withoutSuffix, key, isFuture) {
+        var num = number,
+            suffix;
+        switch (key) {
+        case 's':
+            return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
+        case 'm':
+            return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
+        case 'mm':
+            return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
+        case 'h':
+            return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
+        case 'hh':
+            return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
+        case 'd':
+            return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
+        case 'dd':
+            return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
+        case 'M':
+            return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+        case 'MM':
+            return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+        case 'y':
+            return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
+        case 'yy':
+            return num + (isFuture || withoutSuffix ? ' év' : ' éve');
+        }
+        return '';
+    }
+    function week(isFuture) {
+        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
+    }
+
+    var hu = moment.defineLocale('hu', {
+        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
+        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
+        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
+        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
+        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY.MM.DD.',
+            LL : 'YYYY. MMMM D.',
+            LLL : 'YYYY. MMMM D., LT',
+            LLLL : 'YYYY. MMMM D., dddd LT'
+        },
+        meridiemParse: /de|du/i,
+        isPM: function (input) {
+            return input.charAt(1).toLowerCase() === 'u';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower === true ? 'de' : 'DE';
+            } else {
+                return isLower === true ? 'du' : 'DU';
+            }
+        },
+        calendar : {
+            sameDay : '[ma] LT[-kor]',
+            nextDay : '[holnap] LT[-kor]',
+            nextWeek : function () {
+                return week.call(this, true);
+            },
+            lastDay : '[tegnap] LT[-kor]',
+            lastWeek : function () {
+                return week.call(this, false);
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s múlva',
+            past : '%s',
+            s : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return hu;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/hy-am.js b/turtles/app/lib/bower_components/momentjs/locale/hy-am.js
new file mode 100644
index 000000000..08c5c754f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/hy-am.js
@@ -0,0 +1,110 @@
+//! moment.js locale configuration
+//! locale : Armenian (hy-am)
+//! author : Armendarabyan : https://github.com/armendarabyan
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'),
+            'accusative': 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function monthsShortCaseReplace(m, format) {
+        var monthsShort = 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_');
+        return monthsShort[m.month()];
+    }
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_');
+        return weekdays[m.day()];
+    }
+
+    var hy_am = moment.defineLocale('hy-am', {
+        months : monthsCaseReplace,
+        monthsShort : monthsShortCaseReplace,
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY թ.',
+            LLL : 'D MMMM YYYY թ., LT',
+            LLLL : 'dddd, D MMMM YYYY թ., LT'
+        },
+        calendar : {
+            sameDay: '[այսօր] LT',
+            nextDay: '[վաղը] LT',
+            lastDay: '[երեկ] LT',
+            nextWeek: function () {
+                return 'dddd [օրը ժամը] LT';
+            },
+            lastWeek: function () {
+                return '[անցած] dddd [օրը ժամը] LT';
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s հետո',
+            past : '%s առաջ',
+            s : 'մի քանի վայրկյան',
+            m : 'րոպե',
+            mm : '%d րոպե',
+            h : 'ժամ',
+            hh : '%d ժամ',
+            d : 'օր',
+            dd : '%d օր',
+            M : 'ամիս',
+            MM : '%d ամիս',
+            y : 'տարի',
+            yy : '%d տարի'
+        },
+        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
+        isPM: function (input) {
+            return /^(ցերեկվա|երեկոյան)$/.test(input);
+        },
+        meridiem : function (hour) {
+            if (hour < 4) {
+                return 'գիշերվա';
+            } else if (hour < 12) {
+                return 'առավոտվա';
+            } else if (hour < 17) {
+                return 'ցերեկվա';
+            } else {
+                return 'երեկոյան';
+            }
+        },
+        ordinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'DDD':
+            case 'w':
+            case 'W':
+            case 'DDDo':
+                if (number === 1) {
+                    return number + '-ին';
+                }
+                return number + '-րդ';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return hy_am;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/id.js b/turtles/app/lib/bower_components/momentjs/locale/id.js
new file mode 100644
index 000000000..d9278bdc8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/id.js
@@ -0,0 +1,82 @@
+//! moment.js locale configuration
+//! locale : Bahasa Indonesia (id)
+//! author : Mohammad Satrio Utomo : https://github.com/tyok
+//! reference: http://id.wikisource.org/wiki/Pedoman_Umum_Ejaan_Bahasa_Indonesia_yang_Disempurnakan
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var id = moment.defineLocale('id', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /pagi|siang|sore|malam/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'siang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sore' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'siang';
+            } else if (hours < 19) {
+                return 'sore';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Besok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kemarin pukul] LT',
+            lastWeek : 'dddd [lalu pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lalu',
+            s : 'beberapa detik',
+            m : 'semenit',
+            mm : '%d menit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return id;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/is.js b/turtles/app/lib/bower_components/momentjs/locale/is.js
new file mode 100644
index 000000000..32767124e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/is.js
@@ -0,0 +1,126 @@
+//! moment.js locale configuration
+//! locale : icelandic (is)
+//! author : Hinrik Örn Sigurðsson : https://github.com/hinrik
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function plural(n) {
+        if (n % 100 === 11) {
+            return true;
+        } else if (n % 10 === 1) {
+            return false;
+        }
+        return true;
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':
+            return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
+        case 'm':
+            return withoutSuffix ? 'mínúta' : 'mínútu';
+        case 'mm':
+            if (plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
+            } else if (withoutSuffix) {
+                return result + 'mínúta';
+            }
+            return result + 'mínútu';
+        case 'hh':
+            if (plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
+            }
+            return result + 'klukkustund';
+        case 'd':
+            if (withoutSuffix) {
+                return 'dagur';
+            }
+            return isFuture ? 'dag' : 'degi';
+        case 'dd':
+            if (plural(number)) {
+                if (withoutSuffix) {
+                    return result + 'dagar';
+                }
+                return result + (isFuture ? 'daga' : 'dögum');
+            } else if (withoutSuffix) {
+                return result + 'dagur';
+            }
+            return result + (isFuture ? 'dag' : 'degi');
+        case 'M':
+            if (withoutSuffix) {
+                return 'mánuður';
+            }
+            return isFuture ? 'mánuð' : 'mánuði';
+        case 'MM':
+            if (plural(number)) {
+                if (withoutSuffix) {
+                    return result + 'mánuðir';
+                }
+                return result + (isFuture ? 'mánuði' : 'mánuðum');
+            } else if (withoutSuffix) {
+                return result + 'mánuður';
+            }
+            return result + (isFuture ? 'mánuð' : 'mánuði');
+        case 'y':
+            return withoutSuffix || isFuture ? 'ár' : 'ári';
+        case 'yy':
+            if (plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
+            }
+            return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
+        }
+    }
+
+    var is = moment.defineLocale('is', {
+        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
+        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
+        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
+        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] LT',
+            LLLL : 'dddd, D. MMMM YYYY [kl.] LT'
+        },
+        calendar : {
+            sameDay : '[í dag kl.] LT',
+            nextDay : '[á morgun kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[í gær kl.] LT',
+            lastWeek : '[síðasta] dddd [kl.] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'eftir %s',
+            past : 'fyrir %s síðan',
+            s : translate,
+            m : translate,
+            mm : translate,
+            h : 'klukkustund',
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return is;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/it.js b/turtles/app/lib/bower_components/momentjs/locale/it.js
new file mode 100644
index 000000000..84fe3894b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/it.js
@@ -0,0 +1,69 @@
+//! moment.js locale configuration
+//! locale : italian (it)
+//! author : Lorenzo : https://github.com/aliem
+//! author: Mattia Larentis: https://github.com/nostalgiaz
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var it = moment.defineLocale('it', {
+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+        weekdays : 'Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato'.split('_'),
+        weekdaysShort : 'Dom_Lun_Mar_Mer_Gio_Ven_Sab'.split('_'),
+        weekdaysMin : 'D_L_Ma_Me_G_V_S'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Oggi alle] LT',
+            nextDay: '[Domani alle] LT',
+            nextWeek: 'dddd [alle] LT',
+            lastDay: '[Ieri alle] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[la scorsa] dddd [alle] LT';
+                    default:
+                        return '[lo scorso] dddd [alle] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+            },
+            past : '%s fa',
+            s : 'alcuni secondi',
+            m : 'un minuto',
+            mm : '%d minuti',
+            h : 'un\'ora',
+            hh : '%d ore',
+            d : 'un giorno',
+            dd : '%d giorni',
+            M : 'un mese',
+            MM : '%d mesi',
+            y : 'un anno',
+            yy : '%d anni'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return it;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ja.js b/turtles/app/lib/bower_components/momentjs/locale/ja.js
new file mode 100644
index 000000000..de01577dc
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ja.js
@@ -0,0 +1,64 @@
+//! moment.js locale configuration
+//! locale : japanese (ja)
+//! author : LI Long : https://github.com/baryon
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ja = moment.defineLocale('ja', {
+        months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
+        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
+        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
+        longDateFormat : {
+            LT : 'Ah時m分',
+            LTS : 'LTs秒',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日LT',
+            LLLL : 'YYYY年M月D日LT dddd'
+        },
+        meridiemParse: /午前|午後/i,
+        isPM : function (input) {
+            return input === '午後';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return '午前';
+            } else {
+                return '午後';
+            }
+        },
+        calendar : {
+            sameDay : '[今日] LT',
+            nextDay : '[明日] LT',
+            nextWeek : '[来週]dddd LT',
+            lastDay : '[昨日] LT',
+            lastWeek : '[前週]dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s後',
+            past : '%s前',
+            s : '数秒',
+            m : '1分',
+            mm : '%d分',
+            h : '1時間',
+            hh : '%d時間',
+            d : '1日',
+            dd : '%d日',
+            M : '1ヶ月',
+            MM : '%dヶ月',
+            y : '1年',
+            yy : '%d年'
+        }
+    });
+
+    return ja;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/jv.js b/turtles/app/lib/bower_components/momentjs/locale/jv.js
new file mode 100644
index 000000000..e73ae1996
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/jv.js
@@ -0,0 +1,82 @@
+//! moment.js locale configuration
+//! locale : Boso Jowo (jv)
+//! author : Rony Lantip : https://github.com/lantip
+//! reference: http://jv.wikipedia.org/wiki/Basa_Jawa
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var jv = moment.defineLocale('jv', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
+        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /enjing|siyang|sonten|ndalu/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'enjing') {
+                return hour;
+            } else if (meridiem === 'siyang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'enjing';
+            } else if (hours < 15) {
+                return 'siyang';
+            } else if (hours < 19) {
+                return 'sonten';
+            } else {
+                return 'ndalu';
+            }
+        },
+        calendar : {
+            sameDay : '[Dinten puniko pukul] LT',
+            nextDay : '[Mbenjang pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kala wingi pukul] LT',
+            lastWeek : 'dddd [kepengker pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'wonten ing %s',
+            past : '%s ingkang kepengker',
+            s : 'sawetawis detik',
+            m : 'setunggal menit',
+            mm : '%d menit',
+            h : 'setunggal jam',
+            hh : '%d jam',
+            d : 'sedinten',
+            dd : '%d dinten',
+            M : 'sewulan',
+            MM : '%d wulan',
+            y : 'setaun',
+            yy : '%d taun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return jv;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ka.js b/turtles/app/lib/bower_components/momentjs/locale/ka.js
new file mode 100644
index 000000000..19bcb3aa7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ka.js
@@ -0,0 +1,102 @@
+//! moment.js locale configuration
+//! locale : Georgian (ka)
+//! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
+            'accusative': 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
+        },
+        nounCase = (/D[oD] *MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
+            'accusative': 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_')
+        },
+        nounCase = (/(წინა|შემდეგ)/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var ka = moment.defineLocale('ka', {
+        months : monthsCaseReplace,
+        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
+        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[დღეს] LT[-ზე]',
+            nextDay : '[ხვალ] LT[-ზე]',
+            lastDay : '[გუშინ] LT[-ზე]',
+            nextWeek : '[შემდეგ] dddd LT[-ზე]',
+            lastWeek : '[წინა] dddd LT-ზე',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
+                    s.replace(/ი$/, 'ში') :
+                    s + 'ში';
+            },
+            past : function (s) {
+                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
+                    return s.replace(/(ი|ე)$/, 'ის წინ');
+                }
+                if ((/წელი/).test(s)) {
+                    return s.replace(/წელი$/, 'წლის წინ');
+                }
+            },
+            s : 'რამდენიმე წამი',
+            m : 'წუთი',
+            mm : '%d წუთი',
+            h : 'საათი',
+            hh : '%d საათი',
+            d : 'დღე',
+            dd : '%d დღე',
+            M : 'თვე',
+            MM : '%d თვე',
+            y : 'წელი',
+            yy : '%d წელი'
+        },
+        ordinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
+        ordinal : function (number) {
+            if (number === 0) {
+                return number;
+            }
+            if (number === 1) {
+                return number + '-ლი';
+            }
+            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
+                return 'მე-' + number;
+            }
+            return number + '-ე';
+        },
+        week : {
+            dow : 1,
+            doy : 7
+        }
+    });
+
+    return ka;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/km.js b/turtles/app/lib/bower_components/momentjs/locale/km.js
new file mode 100644
index 000000000..d6f6c652a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/km.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+//! locale : khmer (km)
+//! author : Kruy Vanna : https://github.com/kruyvanna
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var km = moment.defineLocale('km', {
+        months: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+        monthsShort: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysShort: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysMin: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd, D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[ថ្ងៃនៈ ម៉ោង] LT',
+            nextDay: '[ស្អែក ម៉ោង] LT',
+            nextWeek: 'dddd [ម៉ោង] LT',
+            lastDay: '[ម្សិលមិញ ម៉ោង] LT',
+            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%sទៀត',
+            past: '%sមុន',
+            s: 'ប៉ុន្មានវិនាទី',
+            m: 'មួយនាទី',
+            mm: '%d នាទី',
+            h: 'មួយម៉ោង',
+            hh: '%d ម៉ោង',
+            d: 'មួយថ្ងៃ',
+            dd: '%d ថ្ងៃ',
+            M: 'មួយខែ',
+            MM: '%d ខែ',
+            y: 'មួយឆ្នាំ',
+            yy: '%d ឆ្នាំ'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return km;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ko.js b/turtles/app/lib/bower_components/momentjs/locale/ko.js
new file mode 100644
index 000000000..ded3714ce
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ko.js
@@ -0,0 +1,67 @@
+//! moment.js locale configuration
+//! locale : korean (ko)
+//!
+//! authors
+//!
+//! - Kyungwook, Park : https://github.com/kyungw00k
+//! - Jeeeyul Lee <jeeeyul@gmail.com>
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ko = moment.defineLocale('ko', {
+        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
+        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
+        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
+        longDateFormat : {
+            LT : 'A h시 m분',
+            LTS : 'A h시 m분 s초',
+            L : 'YYYY.MM.DD',
+            LL : 'YYYY년 MMMM D일',
+            LLL : 'YYYY년 MMMM D일 LT',
+            LLLL : 'YYYY년 MMMM D일 dddd LT'
+        },
+        calendar : {
+            sameDay : '오늘 LT',
+            nextDay : '내일 LT',
+            nextWeek : 'dddd LT',
+            lastDay : '어제 LT',
+            lastWeek : '지난주 dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s 후',
+            past : '%s 전',
+            s : '몇초',
+            ss : '%d초',
+            m : '일분',
+            mm : '%d분',
+            h : '한시간',
+            hh : '%d시간',
+            d : '하루',
+            dd : '%d일',
+            M : '한달',
+            MM : '%d달',
+            y : '일년',
+            yy : '%d년'
+        },
+        ordinalParse : /\d{1,2}일/,
+        ordinal : '%d일',
+        meridiemParse : /오전|오후/,
+        isPM : function (token) {
+            return token === '오후';
+        },
+        meridiem : function (hour, minute, isUpper) {
+            return hour < 12 ? '오전' : '오후';
+        }
+    });
+
+    return ko;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/lb.js b/turtles/app/lib/bower_components/momentjs/locale/lb.js
new file mode 100644
index 000000000..43f988ac7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/lb.js
@@ -0,0 +1,133 @@
+//! moment.js locale configuration
+//! locale : Luxembourgish (lb)
+//! author : mweimerskirch : https://github.com/mweimerskirch, David Raison : https://github.com/kwisatz
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eng Minutt', 'enger Minutt'],
+            'h': ['eng Stonn', 'enger Stonn'],
+            'd': ['een Dag', 'engem Dag'],
+            'M': ['ee Mount', 'engem Mount'],
+            'y': ['ee Joer', 'engem Joer']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+    function processFutureTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'a ' + string;
+        }
+        return 'an ' + string;
+    }
+    function processPastTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'viru ' + string;
+        }
+        return 'virun ' + string;
+    }
+    /**
+     * Returns true if the word before the given number loses the '-n' ending.
+     * e.g. 'an 10 Deeg' but 'a 5 Deeg'
+     *
+     * @param number {integer}
+     * @returns {boolean}
+     */
+    function eifelerRegelAppliesToNumber(number) {
+        number = parseInt(number, 10);
+        if (isNaN(number)) {
+            return false;
+        }
+        if (number < 0) {
+            // Negative Number --> always true
+            return true;
+        } else if (number < 10) {
+            // Only 1 digit
+            if (4 <= number && number <= 7) {
+                return true;
+            }
+            return false;
+        } else if (number < 100) {
+            // 2 digits
+            var lastDigit = number % 10, firstDigit = number / 10;
+            if (lastDigit === 0) {
+                return eifelerRegelAppliesToNumber(firstDigit);
+            }
+            return eifelerRegelAppliesToNumber(lastDigit);
+        } else if (number < 10000) {
+            // 3 or 4 digits --> recursively check first digit
+            while (number >= 10) {
+                number = number / 10;
+            }
+            return eifelerRegelAppliesToNumber(number);
+        } else {
+            // Anything larger than 4 digits: recursively check first n-3 digits
+            number = number / 1000;
+            return eifelerRegelAppliesToNumber(number);
+        }
+    }
+
+    var lb = moment.defineLocale('lb', {
+        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
+        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
+        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
+        longDateFormat: {
+            LT: 'H:mm [Auer]',
+            LTS: 'H:mm:ss [Auer]',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[Haut um] LT',
+            sameElse: 'L',
+            nextDay: '[Muer um] LT',
+            nextWeek: 'dddd [um] LT',
+            lastDay: '[Gëschter um] LT',
+            lastWeek: function () {
+                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
+                switch (this.day()) {
+                    case 2:
+                    case 4:
+                        return '[Leschten] dddd [um] LT';
+                    default:
+                        return '[Leschte] dddd [um] LT';
+                }
+            }
+        },
+        relativeTime : {
+            future : processFutureTime,
+            past : processPastTime,
+            s : 'e puer Sekonnen',
+            m : processRelativeTime,
+            mm : '%d Minutten',
+            h : processRelativeTime,
+            hh : '%d Stonnen',
+            d : processRelativeTime,
+            dd : '%d Deeg',
+            M : processRelativeTime,
+            MM : '%d Méint',
+            y : processRelativeTime,
+            yy : '%d Joer'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal: '%d.',
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return lb;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/lt.js b/turtles/app/lib/bower_components/momentjs/locale/lt.js
new file mode 100644
index 000000000..8f0ef5450
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/lt.js
@@ -0,0 +1,114 @@
+//! moment.js locale configuration
+//! locale : Lithuanian (lt)
+//! author : Mindaugas Mozūras : https://github.com/mmozuras
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var units = {
+        'm' : 'minutė_minutės_minutę',
+        'mm': 'minutės_minučių_minutes',
+        'h' : 'valanda_valandos_valandą',
+        'hh': 'valandos_valandų_valandas',
+        'd' : 'diena_dienos_dieną',
+        'dd': 'dienos_dienų_dienas',
+        'M' : 'mėnuo_mėnesio_mėnesį',
+        'MM': 'mėnesiai_mėnesių_mėnesius',
+        'y' : 'metai_metų_metus',
+        'yy': 'metai_metų_metus'
+    },
+    weekDays = 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_');
+    function translateSeconds(number, withoutSuffix, key, isFuture) {
+        if (withoutSuffix) {
+            return 'kelios sekundės';
+        } else {
+            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
+        }
+    }
+    function translateSingular(number, withoutSuffix, key, isFuture) {
+        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
+    }
+    function special(number) {
+        return number % 10 === 0 || (number > 10 && number < 20);
+    }
+    function forms(key) {
+        return units[key].split('_');
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        if (number === 1) {
+            return result + translateSingular(number, withoutSuffix, key[0], isFuture);
+        } else if (withoutSuffix) {
+            return result + (special(number) ? forms(key)[1] : forms(key)[0]);
+        } else {
+            if (isFuture) {
+                return result + forms(key)[1];
+            } else {
+                return result + (special(number) ? forms(key)[1] : forms(key)[2]);
+            }
+        }
+    }
+    function relativeWeekDay(moment, format) {
+        var nominative = format.indexOf('dddd HH:mm') === -1,
+            weekDay = weekDays[moment.day()];
+        return nominative ? weekDay : weekDay.substring(0, weekDay.length - 2) + 'į';
+    }
+
+    var lt = moment.defineLocale('lt', {
+        months : 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
+        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
+        weekdays : relativeWeekDay,
+        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
+        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY [m.] MMMM D [d.]',
+            LLL : 'YYYY [m.] MMMM D [d.], LT [val.]',
+            LLLL : 'YYYY [m.] MMMM D [d.], dddd, LT [val.]',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY [m.] MMMM D [d.]',
+            lll : 'YYYY [m.] MMMM D [d.], LT [val.]',
+            llll : 'YYYY [m.] MMMM D [d.], ddd, LT [val.]'
+        },
+        calendar : {
+            sameDay : '[Šiandien] LT',
+            nextDay : '[Rytoj] LT',
+            nextWeek : 'dddd LT',
+            lastDay : '[Vakar] LT',
+            lastWeek : '[Praėjusį] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'po %s',
+            past : 'prieš %s',
+            s : translateSeconds,
+            m : translateSingular,
+            mm : translate,
+            h : translateSingular,
+            hh : translate,
+            d : translateSingular,
+            dd : translate,
+            M : translateSingular,
+            MM : translate,
+            y : translateSingular,
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}-oji/,
+        ordinal : function (number) {
+            return number + '-oji';
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return lt;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/lv.js b/turtles/app/lib/bower_components/momentjs/locale/lv.js
new file mode 100644
index 000000000..ad1cc0a1f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/lv.js
@@ -0,0 +1,95 @@
+//! moment.js locale configuration
+//! locale : latvian (lv)
+//! author : Kristaps Karlsons : https://github.com/skakri
+//! author : Jānis Elmeris : https://github.com/JanisE
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var units = {
+        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'h': 'stundas_stundām_stunda_stundas'.split('_'),
+        'hh': 'stundas_stundām_stunda_stundas'.split('_'),
+        'd': 'dienas_dienām_diena_dienas'.split('_'),
+        'dd': 'dienas_dienām_diena_dienas'.split('_'),
+        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'y': 'gada_gadiem_gads_gadi'.split('_'),
+        'yy': 'gada_gadiem_gads_gadi'.split('_')
+    };
+    /**
+     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
+     */
+    function format(forms, number, withoutSuffix) {
+        if (withoutSuffix) {
+            // E.g. "21 minūte", "3 minūtes".
+            return number % 10 === 1 && number !== 11 ? forms[2] : forms[3];
+        } else {
+            // E.g. "21 minūtes" as in "pēc 21 minūtes".
+            // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
+            return number % 10 === 1 && number !== 11 ? forms[0] : forms[1];
+        }
+    }
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        return number + ' ' + format(units[key], number, withoutSuffix);
+    }
+    function relativeTimeWithSingular(number, withoutSuffix, key) {
+        return format(units[key], number, withoutSuffix);
+    }
+    function relativeSeconds(number, withoutSuffix) {
+        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
+    }
+
+    var lv = moment.defineLocale('lv', {
+        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
+        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY.',
+            LL : 'YYYY. [gada] D. MMMM',
+            LLL : 'YYYY. [gada] D. MMMM, LT',
+            LLLL : 'YYYY. [gada] D. MMMM, dddd, LT'
+        },
+        calendar : {
+            sameDay : '[Šodien pulksten] LT',
+            nextDay : '[Rīt pulksten] LT',
+            nextWeek : 'dddd [pulksten] LT',
+            lastDay : '[Vakar pulksten] LT',
+            lastWeek : '[Pagājušā] dddd [pulksten] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'pēc %s',
+            past : 'pirms %s',
+            s : relativeSeconds,
+            m : relativeTimeWithSingular,
+            mm : relativeTimeWithPlural,
+            h : relativeTimeWithSingular,
+            hh : relativeTimeWithPlural,
+            d : relativeTimeWithSingular,
+            dd : relativeTimeWithPlural,
+            M : relativeTimeWithSingular,
+            MM : relativeTimeWithPlural,
+            y : relativeTimeWithSingular,
+            yy : relativeTimeWithPlural
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return lv;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/me.js b/turtles/app/lib/bower_components/momentjs/locale/me.js
new file mode 100644
index 000000000..37bc78ce3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/me.js
@@ -0,0 +1,108 @@
+//! moment.js locale configuration
+//! locale : Montenegrin (me)
+//! author : Miodrag Nikač <miodrag@restartit.me> : https://github.com/miodragnikac
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var translator = {
+        words: { //Different grammatical cases
+            m: ['jedan minut', 'jednog minuta'],
+            mm: ['minut', 'minuta', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mjesec', 'mjeseca', 'mjeseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var me = moment.defineLocale('me', {
+        months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+        monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+        weekdays: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda', 'četvrtak', 'petak', 'subota'],
+        weekdaysShort: ['ned.', 'pon.', 'uto.', 'sri.', 'čet.', 'pet.', 'sub.'],
+        weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sjutra u] LT',
+
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedjelje] [u] LT',
+                    '[prošlog] [ponedjeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srijede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'nekoliko sekundi',
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'dan',
+            dd     : translator.translate,
+            M      : 'mjesec',
+            MM     : translator.translate,
+            y      : 'godinu',
+            yy     : translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return me;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/mk.js b/turtles/app/lib/bower_components/momentjs/locale/mk.js
new file mode 100644
index 000000000..f04826fb7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/mk.js
@@ -0,0 +1,89 @@
+//! moment.js locale configuration
+//! locale : macedonian (mk)
+//! author : Borislav Mickov : https://github.com/B0k0
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var mk = moment.defineLocale('mk', {
+        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
+        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Денес во] LT',
+            nextDay : '[Утре во] LT',
+            nextWeek : 'dddd [во] LT',
+            lastDay : '[Вчера во] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 6:
+                    return '[Во изминатата] dddd [во] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[Во изминатиот] dddd [во] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'после %s',
+            past : 'пред %s',
+            s : 'неколку секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дена',
+            M : 'месец',
+            MM : '%d месеци',
+            y : 'година',
+            yy : '%d години'
+        },
+        ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return mk;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ml.js b/turtles/app/lib/bower_components/momentjs/locale/ml.js
new file mode 100644
index 000000000..fe593736d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ml.js
@@ -0,0 +1,70 @@
+//! moment.js locale configuration
+//! locale : malayalam (ml)
+//! author : Floyd Pink : https://github.com/floydpink
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ml = moment.defineLocale('ml', {
+        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
+        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
+        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
+        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
+        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm -നു',
+            LTS : 'A h:mm:ss -നു',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[ഇന്ന്] LT',
+            nextDay : '[നാളെ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ഇന്നലെ] LT',
+            lastWeek : '[കഴിഞ്ഞ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s കഴിഞ്ഞ്',
+            past : '%s മുൻപ്',
+            s : 'അൽപ നിമിഷങ്ങൾ',
+            m : 'ഒരു മിനിറ്റ്',
+            mm : '%d മിനിറ്റ്',
+            h : 'ഒരു മണിക്കൂർ',
+            hh : '%d മണിക്കൂർ',
+            d : 'ഒരു ദിവസം',
+            dd : '%d ദിവസം',
+            M : 'ഒരു മാസം',
+            MM : '%d മാസം',
+            y : 'ഒരു വർഷം',
+            yy : '%d വർഷം'
+        },
+        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
+        isPM : function (input) {
+            return /^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'രാത്രി';
+            } else if (hour < 12) {
+                return 'രാവിലെ';
+            } else if (hour < 17) {
+                return 'ഉച്ച കഴിഞ്ഞ്';
+            } else if (hour < 20) {
+                return 'വൈകുന്നേരം';
+            } else {
+                return 'രാത്രി';
+            }
+        }
+    });
+
+    return ml;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/mr.js b/turtles/app/lib/bower_components/momentjs/locale/mr.js
new file mode 100644
index 000000000..9072d696c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/mr.js
@@ -0,0 +1,120 @@
+//! moment.js locale configuration
+//! locale : Marathi (mr)
+//! author : Harshad Kale : https://github.com/kalehv
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var mr = moment.defineLocale('mr', {
+        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
+        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
+        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm वाजता',
+            LTS : 'A h:mm:ss वाजता',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[उद्या] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[काल] LT',
+            lastWeek: '[मागील] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s नंतर',
+            past : '%s पूर्वी',
+            s : 'सेकंद',
+            m: 'एक मिनिट',
+            mm: '%d मिनिटे',
+            h : 'एक तास',
+            hh : '%d तास',
+            d : 'एक दिवस',
+            dd : '%d दिवस',
+            M : 'एक महिना',
+            MM : '%d महिने',
+            y : 'एक वर्ष',
+            yy : '%d वर्षे'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात्री') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सकाळी') {
+                return hour;
+            } else if (meridiem === 'दुपारी') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'सायंकाळी') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात्री';
+            } else if (hour < 10) {
+                return 'सकाळी';
+            } else if (hour < 17) {
+                return 'दुपारी';
+            } else if (hour < 20) {
+                return 'सायंकाळी';
+            } else {
+                return 'रात्री';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return mr;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ms-my.js b/turtles/app/lib/bower_components/momentjs/locale/ms-my.js
new file mode 100644
index 000000000..d1ea5a288
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ms-my.js
@@ -0,0 +1,81 @@
+//! moment.js locale configuration
+//! locale : Bahasa Malaysia (ms-MY)
+//! author : Weldan Jamili : https://github.com/weldan
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ms_my = moment.defineLocale('ms-my', {
+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /pagi|tengahari|petang|malam/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'tengahari') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'petang' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'tengahari';
+            } else if (hours < 19) {
+                return 'petang';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Esok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kelmarin pukul] LT',
+            lastWeek : 'dddd [lepas pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lepas',
+            s : 'beberapa saat',
+            m : 'seminit',
+            mm : '%d minit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ms_my;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/my.js b/turtles/app/lib/bower_components/momentjs/locale/my.js
new file mode 100644
index 000000000..e50972b5a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/my.js
@@ -0,0 +1,92 @@
+//! moment.js locale configuration
+//! locale : Burmese (my)
+//! author : Squar team, mysquar.com
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '၁',
+        '2': '၂',
+        '3': '၃',
+        '4': '၄',
+        '5': '၅',
+        '6': '၆',
+        '7': '၇',
+        '8': '၈',
+        '9': '၉',
+        '0': '၀'
+    }, numberMap = {
+        '၁': '1',
+        '၂': '2',
+        '၃': '3',
+        '၄': '4',
+        '၅': '5',
+        '၆': '6',
+        '၇': '7',
+        '၈': '8',
+        '၉': '9',
+        '၀': '0'
+    };
+
+    var my = moment.defineLocale('my', {
+        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
+        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
+        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
+        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[ယနေ.] LT [မှာ]',
+            nextDay: '[မနက်ဖြန်] LT [မှာ]',
+            nextWeek: 'dddd LT [မှာ]',
+            lastDay: '[မနေ.က] LT [မှာ]',
+            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'လာမည့် %s မှာ',
+            past: 'လွန်ခဲ့သော %s က',
+            s: 'စက္ကန်.အနည်းငယ်',
+            m: 'တစ်မိနစ်',
+            mm: '%d မိနစ်',
+            h: 'တစ်နာရီ',
+            hh: '%d နာရီ',
+            d: 'တစ်ရက်',
+            dd: '%d ရက်',
+            M: 'တစ်လ',
+            MM: '%d လ',
+            y: 'တစ်နှစ်',
+            yy: '%d နှစ်'
+        },
+        preparse: function (string) {
+            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return my;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/nb.js b/turtles/app/lib/bower_components/momentjs/locale/nb.js
new file mode 100644
index 000000000..6ab39c4db
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/nb.js
@@ -0,0 +1,60 @@
+//! moment.js locale configuration
+//! locale : norwegian bokmål (nb)
+//! authors : Espen Hovlandsdal : https://github.com/rexxars
+//!           Sigurd Gartmann : https://github.com/sigurdga
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var nb = moment.defineLocale('nb', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tirs_ons_tors_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'H.mm',
+            LTS : 'LT.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] LT',
+            LLLL : 'dddd D. MMMM YYYY [kl.] LT'
+        },
+        calendar : {
+            sameDay: '[i dag kl.] LT',
+            nextDay: '[i morgen kl.] LT',
+            nextWeek: 'dddd [kl.] LT',
+            lastDay: '[i går kl.] LT',
+            lastWeek: '[forrige] dddd [kl.] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'for %s siden',
+            s : 'noen sekunder',
+            m : 'ett minutt',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dager',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return nb;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ne.js b/turtles/app/lib/bower_components/momentjs/locale/ne.js
new file mode 100644
index 000000000..dfbe878ef
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ne.js
@@ -0,0 +1,122 @@
+//! moment.js locale configuration
+//! locale : nepali/nepalese
+//! author : suvash : https://github.com/suvash
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var ne = moment.defineLocale('ne', {
+        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
+        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
+        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
+        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
+        weekdaysMin : 'आइ._सो._मङ्_बु._बि._शु._श.'.split('_'),
+        longDateFormat : {
+            LT : 'Aको h:mm बजे',
+            LTS : 'Aको h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return symbolMap[match];
+            });
+        },
+        meridiemParse: /राती|बिहान|दिउँसो|बेलुका|साँझ|राती/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'राती') {
+                return hour < 3 ? hour : hour + 12;
+            } else if (meridiem === 'बिहान') {
+                return hour;
+            } else if (meridiem === 'दिउँसो') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'बेलुका' || meridiem === 'साँझ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 3) {
+                return 'राती';
+            } else if (hour < 10) {
+                return 'बिहान';
+            } else if (hour < 15) {
+                return 'दिउँसो';
+            } else if (hour < 18) {
+                return 'बेलुका';
+            } else if (hour < 20) {
+                return 'साँझ';
+            } else {
+                return 'राती';
+            }
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[भोली] LT',
+            nextWeek : '[आउँदो] dddd[,] LT',
+            lastDay : '[हिजो] LT',
+            lastWeek : '[गएको] dddd[,] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sमा',
+            past : '%s अगाडी',
+            s : 'केही समय',
+            m : 'एक मिनेट',
+            mm : '%d मिनेट',
+            h : 'एक घण्टा',
+            hh : '%d घण्टा',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महिना',
+            MM : '%d महिना',
+            y : 'एक बर्ष',
+            yy : '%d बर्ष'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ne;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/nl.js b/turtles/app/lib/bower_components/momentjs/locale/nl.js
new file mode 100644
index 000000000..7b5f3a202
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/nl.js
@@ -0,0 +1,70 @@
+//! moment.js locale configuration
+//! locale : dutch (nl)
+//! author : Joris Röling : https://github.com/jjupiter
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+
+    var nl = moment.defineLocale('nl', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return monthsShortWithoutDots[m.month()];
+            } else {
+                return monthsShortWithDots[m.month()];
+            }
+        },
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return nl;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/nn.js b/turtles/app/lib/bower_components/momentjs/locale/nn.js
new file mode 100644
index 000000000..74424cd75
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/nn.js
@@ -0,0 +1,59 @@
+//! moment.js locale configuration
+//! locale : norwegian nynorsk (nn)
+//! author : https://github.com/mechuwind
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var nn = moment.defineLocale('nn', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
+        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
+        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[I dag klokka] LT',
+            nextDay: '[I morgon klokka] LT',
+            nextWeek: 'dddd [klokka] LT',
+            lastDay: '[I går klokka] LT',
+            lastWeek: '[Føregåande] dddd [klokka] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'for %s sidan',
+            s : 'nokre sekund',
+            m : 'eit minutt',
+            mm : '%d minutt',
+            h : 'ein time',
+            hh : '%d timar',
+            d : 'ein dag',
+            dd : '%d dagar',
+            M : 'ein månad',
+            MM : '%d månader',
+            y : 'eit år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return nn;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/pl.js b/turtles/app/lib/bower_components/momentjs/locale/pl.js
new file mode 100644
index 000000000..075c10286
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/pl.js
@@ -0,0 +1,104 @@
+//! moment.js locale configuration
+//! locale : polish (pl)
+//! author : Rafal Hirsz : https://github.com/evoL
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
+        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+    function plural(n) {
+        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
+    }
+    function translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'minuta' : 'minutę';
+        case 'mm':
+            return result + (plural(number) ? 'minuty' : 'minut');
+        case 'h':
+            return withoutSuffix  ? 'godzina'  : 'godzinę';
+        case 'hh':
+            return result + (plural(number) ? 'godziny' : 'godzin');
+        case 'MM':
+            return result + (plural(number) ? 'miesiące' : 'miesięcy');
+        case 'yy':
+            return result + (plural(number) ? 'lata' : 'lat');
+        }
+    }
+
+    var pl = moment.defineLocale('pl', {
+        months : function (momentToFormat, format) {
+            if (format === '') {
+                // Hack: if format empty we know this is used to generate
+                // RegExp by moment. Give then back both valid forms of months
+                // in RegExp ready format.
+                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+            } else if (/D MMMM/.test(format)) {
+                return monthsSubjective[momentToFormat.month()];
+            } else {
+                return monthsNominative[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+        weekdaysShort : 'nie_pon_wt_śr_czw_pt_sb'.split('_'),
+        weekdaysMin : 'N_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Dziś o] LT',
+            nextDay: '[Jutro o] LT',
+            nextWeek: '[W] dddd [o] LT',
+            lastDay: '[Wczoraj o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[W zeszłą niedzielę o] LT';
+                case 3:
+                    return '[W zeszłą środę o] LT';
+                case 6:
+                    return '[W zeszłą sobotę o] LT';
+                default:
+                    return '[W zeszły] dddd [o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : '%s temu',
+            s : 'kilka sekund',
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : '1 dzień',
+            dd : '%d dni',
+            M : 'miesiąc',
+            MM : translate,
+            y : 'rok',
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return pl;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/pt-br.js b/turtles/app/lib/bower_components/momentjs/locale/pt-br.js
new file mode 100644
index 000000000..47948a3a2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/pt-br.js
@@ -0,0 +1,59 @@
+//! moment.js locale configuration
+//! locale : brazilian portuguese (pt-br)
+//! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var pt_br = moment.defineLocale('pt-br', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY [às] LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] LT'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : '%s atrás',
+            s : 'segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        ordinalParse: /\d{1,2}º/,
+        ordinal : '%dº'
+    });
+
+    return pt_br;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/pt.js b/turtles/app/lib/bower_components/momentjs/locale/pt.js
new file mode 100644
index 000000000..1a332e2c9
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/pt.js
@@ -0,0 +1,63 @@
+//! moment.js locale configuration
+//! locale : portuguese (pt)
+//! author : Jefferson : https://github.com/jalex79
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var pt = moment.defineLocale('pt', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : 'há %s',
+            s : 'segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        ordinalParse: /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return pt;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ro.js b/turtles/app/lib/bower_components/momentjs/locale/ro.js
new file mode 100644
index 000000000..576798b0d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ro.js
@@ -0,0 +1,73 @@
+//! moment.js locale configuration
+//! locale : romanian (ro)
+//! author : Vlad Gurdiga : https://github.com/gurdiga
+//! author : Valentin Agachi : https://github.com/avaly
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+                'mm': 'minute',
+                'hh': 'ore',
+                'dd': 'zile',
+                'MM': 'luni',
+                'yy': 'ani'
+            },
+            separator = ' ';
+        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+            separator = ' de ';
+        }
+        return number + separator + format[key];
+    }
+
+    var ro = moment.defineLocale('ro', {
+        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay: '[azi la] LT',
+            nextDay: '[mâine la] LT',
+            nextWeek: 'dddd [la] LT',
+            lastDay: '[ieri la] LT',
+            lastWeek: '[fosta] dddd [la] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'peste %s',
+            past : '%s în urmă',
+            s : 'câteva secunde',
+            m : 'un minut',
+            mm : relativeTimeWithPlural,
+            h : 'o oră',
+            hh : relativeTimeWithPlural,
+            d : 'o zi',
+            dd : relativeTimeWithPlural,
+            M : 'o lună',
+            MM : relativeTimeWithPlural,
+            y : 'un an',
+            yy : relativeTimeWithPlural
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ro;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ru.js b/turtles/app/lib/bower_components/momentjs/locale/ru.js
new file mode 100644
index 000000000..77efbe4ed
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ru.js
@@ -0,0 +1,163 @@
+//! moment.js locale configuration
+//! locale : russian (ru)
+//! author : Viktorminator : https://github.com/Viktorminator
+//! Author : Menelion Elensúle : https://github.com/Oire
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+            'hh': 'час_часа_часов',
+            'dd': 'день_дня_дней',
+            'MM': 'месяц_месяца_месяцев',
+            'yy': 'год_года_лет'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'минута' : 'минуту';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
+    }
+    function monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+            'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function monthsShortCaseReplace(m, format) {
+        var monthsShort = {
+            'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+            'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return monthsShort[nounCase][m.month()];
+    }
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+            'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
+        },
+        nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var ru = moment.defineLocale('ru', {
+        months : monthsCaseReplace,
+        monthsShort : monthsShortCaseReplace,
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i],
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., LT',
+            LLLL : 'dddd, D MMMM YYYY г., LT'
+        },
+        calendar : {
+            sameDay: '[Сегодня в] LT',
+            nextDay: '[Завтра в] LT',
+            lastDay: '[Вчера в] LT',
+            nextWeek: function () {
+                return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
+            },
+            lastWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
+                    case 0:
+                        return '[В прошлое] dddd [в] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                        return '[В прошлый] dddd [в] LT';
+                    case 3:
+                    case 5:
+                    case 6:
+                        return '[В прошлую] dddd [в] LT';
+                    }
+                } else {
+                    if (this.day() === 2) {
+                        return '[Во] dddd [в] LT';
+                    } else {
+                        return '[В] dddd [в] LT';
+                    }
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'через %s',
+            past : '%s назад',
+            s : 'несколько секунд',
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : 'час',
+            hh : relativeTimeWithPlural,
+            d : 'день',
+            dd : relativeTimeWithPlural,
+            M : 'месяц',
+            MM : relativeTimeWithPlural,
+            y : 'год',
+            yy : relativeTimeWithPlural
+        },
+        meridiemParse: /ночи|утра|дня|вечера/i,
+        isPM : function (input) {
+            return /^(дня|вечера)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночи';
+            } else if (hour < 12) {
+                return 'утра';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечера';
+            }
+        },
+        ordinalParse: /\d{1,2}-(й|го|я)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+                return number + '-й';
+            case 'D':
+                return number + '-го';
+            case 'w':
+            case 'W':
+                return number + '-я';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ru;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/si.js b/turtles/app/lib/bower_components/momentjs/locale/si.js
new file mode 100644
index 000000000..e831f250d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/si.js
@@ -0,0 +1,64 @@
+//! moment.js locale configuration
+//! locale : Sinhalese (si)
+//! author : Sampath Sitinamaluwa : https://github.com/sampathsris
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var si = moment.defineLocale('si', {
+        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
+        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
+        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
+        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
+        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
+        longDateFormat : {
+            LT : 'a h:mm',
+            LTS : 'a h:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY MMMM D',
+            LLL : 'YYYY MMMM D, LT',
+            LLLL : 'YYYY MMMM D [වැනි] dddd, LTS'
+        },
+        calendar : {
+            sameDay : '[අද] LT[ට]',
+            nextDay : '[හෙට] LT[ට]',
+            nextWeek : 'dddd LT[ට]',
+            lastDay : '[ඊයේ] LT[ට]',
+            lastWeek : '[පසුගිය] dddd LT[ට]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sකින්',
+            past : '%sකට පෙර',
+            s : 'තත්පර කිහිපය',
+            m : 'මිනිත්තුව',
+            mm : 'මිනිත්තු %d',
+            h : 'පැය',
+            hh : 'පැය %d',
+            d : 'දිනය',
+            dd : 'දින %d',
+            M : 'මාසය',
+            MM : 'මාස %d',
+            y : 'වසර',
+            yy : 'වසර %d'
+        },
+        ordinalParse: /\d{1,2} වැනි/,
+        ordinal : function (number) {
+            return number + ' වැනි';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'ප.ව.' : 'පස් වරු';
+            } else {
+                return isLower ? 'පෙ.ව.' : 'පෙර වරු';
+            }
+        }
+    });
+
+    return si;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/sk.js b/turtles/app/lib/bower_components/momentjs/locale/sk.js
new file mode 100644
index 000000000..f48a560f1
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/sk.js
@@ -0,0 +1,157 @@
+//! moment.js locale configuration
+//! locale : slovak (sk)
+//! author : Martin Minka : https://github.com/k2s
+//! based on work of petrbela : https://github.com/petrbela
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
+        monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
+    function plural(n) {
+        return (n > 1) && (n < 5);
+    }
+    function translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':  // a few seconds / in a few seconds / a few seconds ago
+            return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
+        case 'm':  // a minute / in a minute / a minute ago
+            return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
+        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'minúty' : 'minút');
+            } else {
+                return result + 'minútami';
+            }
+            break;
+        case 'h':  // an hour / in an hour / an hour ago
+            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+        case 'hh': // 9 hours / in 9 hours / 9 hours ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'hodiny' : 'hodín');
+            } else {
+                return result + 'hodinami';
+            }
+            break;
+        case 'd':  // a day / in a day / a day ago
+            return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
+        case 'dd': // 9 days / in 9 days / 9 days ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'dni' : 'dní');
+            } else {
+                return result + 'dňami';
+            }
+            break;
+        case 'M':  // a month / in a month / a month ago
+            return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
+        case 'MM': // 9 months / in 9 months / 9 months ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'mesiace' : 'mesiacov');
+            } else {
+                return result + 'mesiacmi';
+            }
+            break;
+        case 'y':  // a year / in a year / a year ago
+            return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
+        case 'yy': // 9 years / in 9 years / 9 years ago
+            if (withoutSuffix || isFuture) {
+                return result + (plural(number) ? 'roky' : 'rokov');
+            } else {
+                return result + 'rokmi';
+            }
+            break;
+        }
+    }
+
+    var sk = moment.defineLocale('sk', {
+        months : months,
+        monthsShort : monthsShort,
+        monthsParse : (function (months, monthsShort) {
+            var i, _monthsParse = [];
+            for (i = 0; i < 12; i++) {
+                // use custom parser to solve problem with July (červenec)
+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+            }
+            return _monthsParse;
+        }(months, monthsShort)),
+        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
+        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
+        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[dnes o] LT',
+            nextDay: '[zajtra o] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v nedeľu o] LT';
+                case 1:
+                case 2:
+                    return '[v] dddd [o] LT';
+                case 3:
+                    return '[v stredu o] LT';
+                case 4:
+                    return '[vo štvrtok o] LT';
+                case 5:
+                    return '[v piatok o] LT';
+                case 6:
+                    return '[v sobotu o] LT';
+                }
+            },
+            lastDay: '[včera o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[minulú nedeľu o] LT';
+                case 1:
+                case 2:
+                    return '[minulý] dddd [o] LT';
+                case 3:
+                    return '[minulú stredu o] LT';
+                case 4:
+                case 5:
+                    return '[minulý] dddd [o] LT';
+                case 6:
+                    return '[minulú sobotu o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'pred %s',
+            s : translate,
+            m : translate,
+            mm : translate,
+            h : translate,
+            hh : translate,
+            d : translate,
+            dd : translate,
+            M : translate,
+            MM : translate,
+            y : translate,
+            yy : translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return sk;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/sl.js b/turtles/app/lib/bower_components/momentjs/locale/sl.js
new file mode 100644
index 000000000..00c079bc7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/sl.js
@@ -0,0 +1,159 @@
+//! moment.js locale configuration
+//! locale : slovenian (sl)
+//! author : Robert Sedovšek : https://github.com/sedovsek
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':
+            return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
+        case 'm':
+            return withoutSuffix ? 'ena minuta' : 'eno minuto';
+        case 'mm':
+            if (number === 1) {
+                result += withoutSuffix ? 'minuta' : 'minuto';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'minute' : 'minutami';
+            } else {
+                result += withoutSuffix || isFuture ? 'minut' : 'minutami';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'ena ura' : 'eno uro';
+        case 'hh':
+            if (number === 1) {
+                result += withoutSuffix ? 'ura' : 'uro';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'uri' : 'urama';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'ure' : 'urami';
+            } else {
+                result += withoutSuffix || isFuture ? 'ur' : 'urami';
+            }
+            return result;
+        case 'd':
+            return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
+        case 'dd':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'dan' : 'dnem';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
+            } else {
+                result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
+            }
+            return result;
+        case 'M':
+            return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
+        case 'MM':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
+            } else {
+                result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
+            }
+            return result;
+        case 'y':
+            return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
+        case 'yy':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'leto' : 'letom';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'leti' : 'letoma';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'leta' : 'leti';
+            } else {
+                result += withoutSuffix || isFuture ? 'let' : 'leti';
+            }
+            return result;
+        }
+    }
+
+    var sl = moment.defineLocale('sl', {
+        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
+        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
+        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
+        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danes ob] LT',
+            nextDay  : '[jutri ob] LT',
+
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v] [nedeljo] [ob] LT';
+                case 3:
+                    return '[v] [sredo] [ob] LT';
+                case 6:
+                    return '[v] [soboto] [ob] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[v] dddd [ob] LT';
+                }
+            },
+            lastDay  : '[včeraj ob] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[prejšnjo] [nedeljo] [ob] LT';
+                case 3:
+                    return '[prejšnjo] [sredo] [ob] LT';
+                case 6:
+                    return '[prejšnjo] [soboto] [ob] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prejšnji] dddd [ob] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'čez %s',
+            past   : 'pred %s',
+            s      : processRelativeTime,
+            m      : processRelativeTime,
+            mm     : processRelativeTime,
+            h      : processRelativeTime,
+            hh     : processRelativeTime,
+            d      : processRelativeTime,
+            dd     : processRelativeTime,
+            M      : processRelativeTime,
+            MM     : processRelativeTime,
+            y      : processRelativeTime,
+            yy     : processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return sl;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/sq.js b/turtles/app/lib/bower_components/momentjs/locale/sq.js
new file mode 100644
index 000000000..ce587cc7a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/sq.js
@@ -0,0 +1,68 @@
+//! moment.js locale configuration
+//! locale : Albanian (sq)
+//! author : Flakërim Ismani : https://github.com/flakerimi
+//! author: Menelion Elensúle: https://github.com/Oire (tests)
+//! author : Oerd Cukalla : https://github.com/oerd (fixes)
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var sq = moment.defineLocale('sq', {
+        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
+        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
+        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
+        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
+        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
+        meridiemParse: /PD|MD/,
+        isPM: function (input) {
+            return input.charAt(0) === 'M';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            return hours < 12 ? 'PD' : 'MD';
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Sot në] LT',
+            nextDay : '[Nesër në] LT',
+            nextWeek : 'dddd [në] LT',
+            lastDay : '[Dje në] LT',
+            lastWeek : 'dddd [e kaluar në] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'në %s',
+            past : '%s më parë',
+            s : 'disa sekonda',
+            m : 'një minutë',
+            mm : '%d minuta',
+            h : 'një orë',
+            hh : '%d orë',
+            d : 'një ditë',
+            dd : '%d ditë',
+            M : 'një muaj',
+            MM : '%d muaj',
+            y : 'një vit',
+            yy : '%d vite'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return sq;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/sr-cyrl.js b/turtles/app/lib/bower_components/momentjs/locale/sr-cyrl.js
new file mode 100644
index 000000000..8414596b5
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/sr-cyrl.js
@@ -0,0 +1,107 @@
+//! moment.js locale configuration
+//! locale : Serbian-cyrillic (sr-cyrl)
+//! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var translator = {
+        words: { //Different grammatical cases
+            m: ['један минут', 'једне минуте'],
+            mm: ['минут', 'минуте', 'минута'],
+            h: ['један сат', 'једног сата'],
+            hh: ['сат', 'сата', 'сати'],
+            dd: ['дан', 'дана', 'дана'],
+            MM: ['месец', 'месеца', 'месеци'],
+            yy: ['година', 'године', 'година']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var sr_cyrl = moment.defineLocale('sr-cyrl', {
+        months: ['јануар', 'фебруар', 'март', 'април', 'мај', 'јун', 'јул', 'август', 'септембар', 'октобар', 'новембар', 'децембар'],
+        monthsShort: ['јан.', 'феб.', 'мар.', 'апр.', 'мај', 'јун', 'јул', 'авг.', 'сеп.', 'окт.', 'нов.', 'дец.'],
+        weekdays: ['недеља', 'понедељак', 'уторак', 'среда', 'четвртак', 'петак', 'субота'],
+        weekdaysShort: ['нед.', 'пон.', 'уто.', 'сре.', 'чет.', 'пет.', 'суб.'],
+        weekdaysMin: ['не', 'по', 'ут', 'ср', 'че', 'пе', 'су'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[данас у] LT',
+            nextDay: '[сутра у] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[у] [недељу] [у] LT';
+                case 3:
+                    return '[у] [среду] [у] LT';
+                case 6:
+                    return '[у] [суботу] [у] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[у] dddd [у] LT';
+                }
+            },
+            lastDay  : '[јуче у] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[прошле] [недеље] [у] LT',
+                    '[прошлог] [понедељка] [у] LT',
+                    '[прошлог] [уторка] [у] LT',
+                    '[прошле] [среде] [у] LT',
+                    '[прошлог] [четвртка] [у] LT',
+                    '[прошлог] [петка] [у] LT',
+                    '[прошле] [суботе] [у] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past   : 'пре %s',
+            s      : 'неколико секунди',
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'дан',
+            dd     : translator.translate,
+            M      : 'месец',
+            MM     : translator.translate,
+            y      : 'годину',
+            yy     : translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return sr_cyrl;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/sr.js b/turtles/app/lib/bower_components/momentjs/locale/sr.js
new file mode 100644
index 000000000..923b01817
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/sr.js
@@ -0,0 +1,107 @@
+//! moment.js locale configuration
+//! locale : Serbian-latin (sr)
+//! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var translator = {
+        words: { //Different grammatical cases
+            m: ['jedan minut', 'jedne minute'],
+            mm: ['minut', 'minute', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mesec', 'meseca', 'meseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var sr = moment.defineLocale('sr', {
+        months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+        monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+        weekdays: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak', 'subota'],
+        weekdaysShort: ['ned.', 'pon.', 'uto.', 'sre.', 'čet.', 'pet.', 'sub.'],
+        weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sutra u] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedelju] [u] LT';
+                case 3:
+                    return '[u] [sredu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedelje] [u] LT',
+                    '[prošlog] [ponedeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'pre %s',
+            s      : 'nekoliko sekundi',
+            m      : translator.translate,
+            mm     : translator.translate,
+            h      : translator.translate,
+            hh     : translator.translate,
+            d      : 'dan',
+            dd     : translator.translate,
+            M      : 'mesec',
+            MM     : translator.translate,
+            y      : 'godinu',
+            yy     : translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return sr;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/sv.js b/turtles/app/lib/bower_components/momentjs/locale/sv.js
new file mode 100644
index 000000000..df2421a24
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/sv.js
@@ -0,0 +1,66 @@
+//! moment.js locale configuration
+//! locale : swedish (sv)
+//! author : Jens Alm : https://github.com/ulmus
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var sv = moment.defineLocale('sv', {
+        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Idag] LT',
+            nextDay: '[Imorgon] LT',
+            lastDay: '[Igår] LT',
+            nextWeek: '[På] dddd LT',
+            lastWeek: '[I] dddd[s] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'för %s sedan',
+            s : 'några sekunder',
+            m : 'en minut',
+            mm : '%d minuter',
+            h : 'en timme',
+            hh : '%d timmar',
+            d : 'en dag',
+            dd : '%d dagar',
+            M : 'en månad',
+            MM : '%d månader',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}(e|a)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'e' :
+                (b === 1) ? 'a' :
+                (b === 2) ? 'a' :
+                (b === 3) ? 'e' : 'e';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return sv;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/ta.js b/turtles/app/lib/bower_components/momentjs/locale/ta.js
new file mode 100644
index 000000000..f0291c89f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/ta.js
@@ -0,0 +1,94 @@
+//! moment.js locale configuration
+//! locale : tamil (ta)
+//! author : Arjunkumar Krishnamoorthy : https://github.com/tk120404
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var ta = moment.defineLocale('ta', {
+        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
+        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
+        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[இன்று] LT',
+            nextDay : '[நாளை] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[நேற்று] LT',
+            lastWeek : '[கடந்த வாரம்] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s இல்',
+            past : '%s முன்',
+            s : 'ஒரு சில விநாடிகள்',
+            m : 'ஒரு நிமிடம்',
+            mm : '%d நிமிடங்கள்',
+            h : 'ஒரு மணி நேரம்',
+            hh : '%d மணி நேரம்',
+            d : 'ஒரு நாள்',
+            dd : '%d நாட்கள்',
+            M : 'ஒரு மாதம்',
+            MM : '%d மாதங்கள்',
+            y : 'ஒரு வருடம்',
+            yy : '%d ஆண்டுகள்'
+        },
+        ordinalParse: /\d{1,2}வது/,
+        ordinal : function (number) {
+            return number + 'வது';
+        },
+        // refer http://ta.wikipedia.org/s/1er1
+        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 2) {
+                return ' யாமம்';
+            } else if (hour < 6) {
+                return ' வைகறை';  // வைகறை
+            } else if (hour < 10) {
+                return ' காலை'; // காலை
+            } else if (hour < 14) {
+                return ' நண்பகல்'; // நண்பகல்
+            } else if (hour < 18) {
+                return ' எற்பாடு'; // எற்பாடு
+            } else if (hour < 22) {
+                return ' மாலை'; // மாலை
+            } else {
+                return ' யாமம்';
+            }
+        },
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'யாமம்') {
+                return hour < 2 ? hour : hour + 12;
+            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
+                return hour;
+            } else if (meridiem === 'நண்பகல்') {
+                return hour >= 10 ? hour : hour + 12;
+            } else {
+                return hour + 12;
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return ta;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/th.js b/turtles/app/lib/bower_components/momentjs/locale/th.js
new file mode 100644
index 000000000..6fe2f4430
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/th.js
@@ -0,0 +1,64 @@
+//! moment.js locale configuration
+//! locale : thai (th)
+//! author : Kridsada Thanabulpong : https://github.com/sirn
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var th = moment.defineLocale('th', {
+        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
+        monthsShort : 'มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา'.split('_'),
+        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
+        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
+        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
+        longDateFormat : {
+            LT : 'H นาฬิกา m นาที',
+            LTS : 'LT s วินาที',
+            L : 'YYYY/MM/DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY เวลา LT',
+            LLLL : 'วันddddที่ D MMMM YYYY เวลา LT'
+        },
+        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
+        isPM: function (input) {
+            return input === 'หลังเที่ยง';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ก่อนเที่ยง';
+            } else {
+                return 'หลังเที่ยง';
+            }
+        },
+        calendar : {
+            sameDay : '[วันนี้ เวลา] LT',
+            nextDay : '[พรุ่งนี้ เวลา] LT',
+            nextWeek : 'dddd[หน้า เวลา] LT',
+            lastDay : '[เมื่อวานนี้ เวลา] LT',
+            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'อีก %s',
+            past : '%sที่แล้ว',
+            s : 'ไม่กี่วินาที',
+            m : '1 นาที',
+            mm : '%d นาที',
+            h : '1 ชั่วโมง',
+            hh : '%d ชั่วโมง',
+            d : '1 วัน',
+            dd : '%d วัน',
+            M : '1 เดือน',
+            MM : '%d เดือน',
+            y : '1 ปี',
+            yy : '%d ปี'
+        }
+    });
+
+    return th;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/tl-ph.js b/turtles/app/lib/bower_components/momentjs/locale/tl-ph.js
new file mode 100644
index 000000000..938fd9d49
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/tl-ph.js
@@ -0,0 +1,61 @@
+//! moment.js locale configuration
+//! locale : Tagalog/Filipino (tl-ph)
+//! author : Dan Hagman
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var tl_ph = moment.defineLocale('tl-ph', {
+        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
+        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
+        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
+        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
+        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'MM/D/YYYY',
+            LL : 'MMMM D, YYYY',
+            LLL : 'MMMM D, YYYY LT',
+            LLLL : 'dddd, MMMM DD, YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Ngayon sa] LT',
+            nextDay: '[Bukas sa] LT',
+            nextWeek: 'dddd [sa] LT',
+            lastDay: '[Kahapon sa] LT',
+            lastWeek: 'dddd [huling linggo] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'sa loob ng %s',
+            past : '%s ang nakalipas',
+            s : 'ilang segundo',
+            m : 'isang minuto',
+            mm : '%d minuto',
+            h : 'isang oras',
+            hh : '%d oras',
+            d : 'isang araw',
+            dd : '%d araw',
+            M : 'isang buwan',
+            MM : '%d buwan',
+            y : 'isang taon',
+            yy : '%d taon'
+        },
+        ordinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return tl_ph;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/tr.js b/turtles/app/lib/bower_components/momentjs/locale/tr.js
new file mode 100644
index 000000000..f92e81d48
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/tr.js
@@ -0,0 +1,89 @@
+//! moment.js locale configuration
+//! locale : turkish (tr)
+//! authors : Erhan Gundogan : https://github.com/erhangundogan,
+//!           Burak Yiğit Kaya: https://github.com/BYK
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var suffixes = {
+        1: '\'inci',
+        5: '\'inci',
+        8: '\'inci',
+        70: '\'inci',
+        80: '\'inci',
+        2: '\'nci',
+        7: '\'nci',
+        20: '\'nci',
+        50: '\'nci',
+        3: '\'üncü',
+        4: '\'üncü',
+        100: '\'üncü',
+        6: '\'ncı',
+        9: '\'uncu',
+        10: '\'uncu',
+        30: '\'uncu',
+        60: '\'ıncı',
+        90: '\'ıncı'
+    };
+
+    var tr = moment.defineLocale('tr', {
+        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
+        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
+        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
+        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
+        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[yarın saat] LT',
+            nextWeek : '[haftaya] dddd [saat] LT',
+            lastDay : '[dün] LT',
+            lastWeek : '[geçen hafta] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s önce',
+            s : 'birkaç saniye',
+            m : 'bir dakika',
+            mm : '%d dakika',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir yıl',
+            yy : '%d yıl'
+        },
+        ordinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '\'ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return tr;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/tzm-latn.js b/turtles/app/lib/bower_components/momentjs/locale/tzm-latn.js
new file mode 100644
index 000000000..0442d1316
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/tzm-latn.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+//! locale : Morocco Central Atlas Tamaziɣt in Latin (tzm-latn)
+//! author : Abdel Said : https://github.com/abdelsaid
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var tzm_latn = moment.defineLocale('tzm-latn', {
+        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[asdkh g] LT',
+            nextDay: '[aska g] LT',
+            nextWeek: 'dddd [g] LT',
+            lastDay: '[assant g] LT',
+            lastWeek: 'dddd [g] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dadkh s yan %s',
+            past : 'yan %s',
+            s : 'imik',
+            m : 'minuḍ',
+            mm : '%d minuḍ',
+            h : 'saɛa',
+            hh : '%d tassaɛin',
+            d : 'ass',
+            dd : '%d ossan',
+            M : 'ayowr',
+            MM : '%d iyyirn',
+            y : 'asgas',
+            yy : '%d isgasn'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return tzm_latn;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/tzm.js b/turtles/app/lib/bower_components/momentjs/locale/tzm.js
new file mode 100644
index 000000000..a64d9108c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/tzm.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+//! locale : Morocco Central Atlas Tamaziɣt (tzm)
+//! author : Abdel Said : https://github.com/abdelsaid
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var tzm = moment.defineLocale('tzm', {
+        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS: 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
+            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
+            nextWeek: 'dddd [ⴴ] LT',
+            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
+            lastWeek: 'dddd [ⴴ] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
+            past : 'ⵢⴰⵏ %s',
+            s : 'ⵉⵎⵉⴽ',
+            m : 'ⵎⵉⵏⵓⴺ',
+            mm : '%d ⵎⵉⵏⵓⴺ',
+            h : 'ⵙⴰⵄⴰ',
+            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
+            d : 'ⴰⵙⵙ',
+            dd : '%d oⵙⵙⴰⵏ',
+            M : 'ⴰⵢoⵓⵔ',
+            MM : '%d ⵉⵢⵢⵉⵔⵏ',
+            y : 'ⴰⵙⴳⴰⵙ',
+            yy : '%d ⵉⵙⴳⴰⵙⵏ'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return tzm;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/uk.js b/turtles/app/lib/bower_components/momentjs/locale/uk.js
new file mode 100644
index 000000000..3a85ef8b6
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/uk.js
@@ -0,0 +1,152 @@
+//! moment.js locale configuration
+//! locale : ukrainian (uk)
+//! author : zemlanin : https://github.com/zemlanin
+//! Author : Menelion Elensúle : https://github.com/Oire
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'хвилина_хвилини_хвилин',
+            'hh': 'година_години_годин',
+            'dd': 'день_дні_днів',
+            'MM': 'місяць_місяці_місяців',
+            'yy': 'рік_роки_років'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвилина' : 'хвилину';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'година' : 'годину';
+        }
+        else {
+            return number + ' ' + plural(format[key], +number);
+        }
+    }
+    function monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_'),
+            'accusative': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_')
+        },
+        nounCase = (/D[oD]? *MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
+            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
+            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
+        },
+        nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
+            'accusative' :
+            ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
+                'genitive' :
+                'nominative');
+        return weekdays[nounCase][m.day()];
+    }
+    function processHoursFunction(str) {
+        return function () {
+            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
+        };
+    }
+
+    var uk = moment.defineLocale('uk', {
+        months : monthsCaseReplace,
+        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
+        weekdays : weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY р.',
+            LLL : 'D MMMM YYYY р., LT',
+            LLLL : 'dddd, D MMMM YYYY р., LT'
+        },
+        calendar : {
+            sameDay: processHoursFunction('[Сьогодні '),
+            nextDay: processHoursFunction('[Завтра '),
+            lastDay: processHoursFunction('[Вчора '),
+            nextWeek: processHoursFunction('[У] dddd ['),
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 5:
+                case 6:
+                    return processHoursFunction('[Минулої] dddd [').call(this);
+                case 1:
+                case 2:
+                case 4:
+                    return processHoursFunction('[Минулого] dddd [').call(this);
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past : '%s тому',
+            s : 'декілька секунд',
+            m : relativeTimeWithPlural,
+            mm : relativeTimeWithPlural,
+            h : 'годину',
+            hh : relativeTimeWithPlural,
+            d : 'день',
+            dd : relativeTimeWithPlural,
+            M : 'місяць',
+            MM : relativeTimeWithPlural,
+            y : 'рік',
+            yy : relativeTimeWithPlural
+        },
+        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
+        meridiemParse: /ночі|ранку|дня|вечора/,
+        isPM: function (input) {
+            return /^(дня|вечора)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночі';
+            } else if (hour < 12) {
+                return 'ранку';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечора';
+            }
+        },
+        ordinalParse: /\d{1,2}-(й|го)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+            case 'w':
+            case 'W':
+                return number + '-й';
+            case 'D':
+                return number + '-го';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    return uk;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/uz.js b/turtles/app/lib/bower_components/momentjs/locale/uz.js
new file mode 100644
index 000000000..4a84d00d8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/uz.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+//! locale : uzbek (uz)
+//! author : Sardor Muminov : https://github.com/muminoff
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var uz = moment.defineLocale('uz', {
+        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
+        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
+        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'D MMMM YYYY, dddd LT'
+        },
+        calendar : {
+            sameDay : '[Бугун соат] LT [да]',
+            nextDay : '[Эртага] LT [да]',
+            nextWeek : 'dddd [куни соат] LT [да]',
+            lastDay : '[Кеча соат] LT [да]',
+            lastWeek : '[Утган] dddd [куни соат] LT [да]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'Якин %s ичида',
+            past : 'Бир неча %s олдин',
+            s : 'фурсат',
+            m : 'бир дакика',
+            mm : '%d дакика',
+            h : 'бир соат',
+            hh : '%d соат',
+            d : 'бир кун',
+            dd : '%d кун',
+            M : 'бир ой',
+            MM : '%d ой',
+            y : 'бир йил',
+            yy : '%d йил'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return uz;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/vi.js b/turtles/app/lib/bower_components/momentjs/locale/vi.js
new file mode 100644
index 000000000..4b6d289d6
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/vi.js
@@ -0,0 +1,65 @@
+//! moment.js locale configuration
+//! locale : vietnamese (vi)
+//! author : Bang Nguyen : https://github.com/bangnk
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var vi = moment.defineLocale('vi', {
+        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
+        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
+        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
+        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM [năm] YYYY',
+            LLL : 'D MMMM [năm] YYYY LT',
+            LLLL : 'dddd, D MMMM [năm] YYYY LT',
+            l : 'DD/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY LT',
+            llll : 'ddd, D MMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Hôm nay lúc] LT',
+            nextDay: '[Ngày mai lúc] LT',
+            nextWeek: 'dddd [tuần tới lúc] LT',
+            lastDay: '[Hôm qua lúc] LT',
+            lastWeek: 'dddd [tuần rồi lúc] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s tới',
+            past : '%s trước',
+            s : 'vài giây',
+            m : 'một phút',
+            mm : '%d phút',
+            h : 'một giờ',
+            hh : '%d giờ',
+            d : 'một ngày',
+            dd : '%d ngày',
+            M : 'một tháng',
+            MM : '%d tháng',
+            y : 'một năm',
+            yy : '%d năm'
+        },
+        ordinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return vi;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/zh-cn.js b/turtles/app/lib/bower_components/momentjs/locale/zh-cn.js
new file mode 100644
index 000000000..056c5ad98
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/zh-cn.js
@@ -0,0 +1,126 @@
+//! moment.js locale configuration
+//! locale : chinese (zh-cn)
+//! author : suupic : https://github.com/suupic
+//! author : Zeno Zeng : https://github.com/zenozeng
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var zh_cn = moment.defineLocale('zh-cn', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah点mm分',
+            LTS : 'Ah点m分s秒',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日LT',
+            LLLL : 'YYYY年MMMD日ddddLT',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日LT',
+            llll : 'YYYY年MMMD日ddddLT'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : function () {
+                return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+            },
+            nextDay : function () {
+                return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+            },
+            lastDay : function () {
+                return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+            },
+            nextWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            lastWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            sameElse : 'LL'
+        },
+        ordinalParse: /\d{1,2}(日|月|周)/,
+        ordinal : function (number, period) {
+            switch (period) {
+            case 'd':
+            case 'D':
+            case 'DDD':
+                return number + '日';
+            case 'M':
+                return number + '月';
+            case 'w':
+            case 'W':
+                return number + '周';
+            default:
+                return number;
+            }
+        },
+        relativeTime : {
+            future : '%s内',
+            past : '%s前',
+            s : '几秒',
+            m : '1 分钟',
+            mm : '%d 分钟',
+            h : '1 小时',
+            hh : '%d 小时',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 个月',
+            MM : '%d 个月',
+            y : '1 年',
+            yy : '%d 年'
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return zh_cn;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/locale/zh-tw.js b/turtles/app/lib/bower_components/momentjs/locale/zh-tw.js
new file mode 100644
index 000000000..ce2022599
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/locale/zh-tw.js
@@ -0,0 +1,100 @@
+//! moment.js locale configuration
+//! locale : traditional chinese (zh-tw)
+//! author : Ben : https://github.com/ben-lin
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var zh_tw = moment.defineLocale('zh-tw', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah點mm分',
+            LTS : 'Ah點m分s秒',
+            L : 'YYYY年MMMD日',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日LT',
+            LLLL : 'YYYY年MMMD日ddddLT',
+            l : 'YYYY年MMMD日',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日LT',
+            llll : 'YYYY年MMMD日ddddLT'
+        },
+        meridiemParse: /早上|上午|中午|下午|晚上/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '早上' || meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '中午') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天]LT',
+            nextDay : '[明天]LT',
+            nextWeek : '[下]ddddLT',
+            lastDay : '[昨天]LT',
+            lastWeek : '[上]ddddLT',
+            sameElse : 'L'
+        },
+        ordinalParse: /\d{1,2}(日|月|週)/,
+        ordinal : function (number, period) {
+            switch (period) {
+            case 'd' :
+            case 'D' :
+            case 'DDD' :
+                return number + '日';
+            case 'M' :
+                return number + '月';
+            case 'w' :
+            case 'W' :
+                return number + '週';
+            default :
+                return number;
+            }
+        },
+        relativeTime : {
+            future : '%s內',
+            past : '%s前',
+            s : '幾秒',
+            m : '一分鐘',
+            mm : '%d分鐘',
+            h : '一小時',
+            hh : '%d小時',
+            d : '一天',
+            dd : '%d天',
+            M : '一個月',
+            MM : '%d個月',
+            y : '一年',
+            yy : '%d年'
+        }
+    });
+
+    return zh_tw;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/min/locales.js b/turtles/app/lib/bower_components/momentjs/min/locales.js
new file mode 100644
index 000000000..4dfa44cc3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/min/locales.js
@@ -0,0 +1,6632 @@
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    //! moment.js locale configuration
+    //! locale : afrikaans (af)
+    //! author : Werner Mollentze : https://github.com/wernerm
+
+    var af = moment.defineLocale('af', {
+        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
+        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
+        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
+        meridiemParse: /vm|nm/i,
+        isPM : function (input) {
+            return /^nm$/i.test(input);
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower ? 'vm' : 'VM';
+            } else {
+                return isLower ? 'nm' : 'NM';
+            }
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Vandag om] LT',
+            nextDay : '[Môre om] LT',
+            nextWeek : 'dddd [om] LT',
+            lastDay : '[Gister om] LT',
+            lastWeek : '[Laas] dddd [om] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'oor %s',
+            past : '%s gelede',
+            s : '\'n paar sekondes',
+            m : '\'n minuut',
+            mm : '%d minute',
+            h : '\'n uur',
+            hh : '%d ure',
+            d : '\'n dag',
+            dd : '%d dae',
+            M : '\'n maand',
+            MM : '%d maande',
+            y : '\'n jaar',
+            yy : '%d jaar'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
+        },
+        week : {
+            dow : 1, // Maandag is die eerste dag van die week.
+            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Moroccan Arabic (ar-ma)
+    //! author : ElFadili Yassine : https://github.com/ElFadiliY
+    //! author : Abdel Said : https://github.com/abdelsaid
+
+    var ar_ma = moment.defineLocale('ar-ma', {
+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Arabic Saudi Arabia (ar-sa)
+    //! author : Suhail Alkowaileet : https://github.com/xsoh
+
+    var ar_sa__symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, ar_sa__numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    };
+
+    var ar_sa = moment.defineLocale('ar-sa', {
+        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return ar_sa__numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return ar_sa__symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale  : Tunisian Arabic (ar-tn)
+
+    var ar_tn = moment.defineLocale('ar-tn', {
+        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'في %s',
+            past: 'منذ %s',
+            s: 'ثوان',
+            m: 'دقيقة',
+            mm: '%d دقائق',
+            h: 'ساعة',
+            hh: '%d ساعات',
+            d: 'يوم',
+            dd: '%d أيام',
+            M: 'شهر',
+            MM: '%d أشهر',
+            y: 'سنة',
+            yy: '%d سنوات'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! Locale: Arabic (ar)
+    //! Author: Abdel Said: https://github.com/abdelsaid
+    //! Changes in months, weekdays: Ahmed Elkhatib
+    //! Native plural forms: forabi https://github.com/forabi
+
+    var ar__symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, ar__numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, ar__months = [
+        'كانون الثاني يناير',
+        'شباط فبراير',
+        'آذار مارس',
+        'نيسان أبريل',
+        'أيار مايو',
+        'حزيران يونيو',
+        'تموز يوليو',
+        'آب أغسطس',
+        'أيلول سبتمبر',
+        'تشرين الأول أكتوبر',
+        'تشرين الثاني نوفمبر',
+        'كانون الأول ديسمبر'
+    ];
+
+    var ar = moment.defineLocale('ar', {
+        months : ar__months,
+        monthsShort : ar__months,
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/\u200FM/\u200FYYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'بعد %s',
+            past : 'منذ %s',
+            s : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
+        },
+        preparse: function (string) {
+            return string.replace(/\u200f/g, '').replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return ar__numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return ar__symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : azerbaijani (az)
+    //! author : topchiyev : https://github.com/topchiyev
+
+    var az__suffixes = {
+        1: '-inci',
+        5: '-inci',
+        8: '-inci',
+        70: '-inci',
+        80: '-inci',
+        2: '-nci',
+        7: '-nci',
+        20: '-nci',
+        50: '-nci',
+        3: '-üncü',
+        4: '-üncü',
+        100: '-üncü',
+        6: '-ncı',
+        9: '-uncu',
+        10: '-uncu',
+        30: '-uncu',
+        60: '-ıncı',
+        90: '-ıncı'
+    };
+
+    var az = moment.defineLocale('az', {
+        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
+        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
+        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
+        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
+        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[sabah saat] LT',
+            nextWeek : '[gələn həftə] dddd [saat] LT',
+            lastDay : '[dünən] LT',
+            lastWeek : '[keçən həftə] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s əvvəl',
+            s : 'birneçə saniyyə',
+            m : 'bir dəqiqə',
+            mm : '%d dəqiqə',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir il',
+            yy : '%d il'
+        },
+        meridiemParse: /gecə|səhər|gündüz|axşam/,
+        isPM : function (input) {
+            return /^(gündüz|axşam)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'gecə';
+            } else if (hour < 12) {
+                return 'səhər';
+            } else if (hour < 17) {
+                return 'gündüz';
+            } else {
+                return 'axşam';
+            }
+        },
+        ordinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '-ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (az__suffixes[a] || az__suffixes[b] || az__suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : belarusian (be)
+    //! author : Dmitry Demidov : https://github.com/demidov91
+    //! author: Praleska: http://praleska.pro/
+    //! Author : Menelion Elensúle : https://github.com/Oire
+
+    function be__plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function be__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
+            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
+            'dd': 'дзень_дні_дзён',
+            'MM': 'месяц_месяцы_месяцаў',
+            'yy': 'год_гады_гадоў'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвіліна' : 'хвіліну';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'гадзіна' : 'гадзіну';
+        }
+        else {
+            return number + ' ' + be__plural(format[key], +number);
+        }
+    }
+    function be__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_'),
+            'accusative': 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function be__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
+            'accusative': 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_')
+        },
+        nounCase = (/\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var be = moment.defineLocale('be', {
+        months : be__monthsCaseReplace,
+        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
+        weekdays : be__weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., LT',
+            LLLL : 'dddd, D MMMM YYYY г., LT'
+        },
+        calendar : {
+            sameDay: '[Сёння ў] LT',
+            nextDay: '[Заўтра ў] LT',
+            lastDay: '[Учора ў] LT',
+            nextWeek: function () {
+                return '[У] dddd [ў] LT';
+            },
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 5:
+                case 6:
+                    return '[У мінулую] dddd [ў] LT';
+                case 1:
+                case 2:
+                case 4:
+                    return '[У мінулы] dddd [ў] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'праз %s',
+            past : '%s таму',
+            s : 'некалькі секунд',
+            m : be__relativeTimeWithPlural,
+            mm : be__relativeTimeWithPlural,
+            h : be__relativeTimeWithPlural,
+            hh : be__relativeTimeWithPlural,
+            d : 'дзень',
+            dd : be__relativeTimeWithPlural,
+            M : 'месяц',
+            MM : be__relativeTimeWithPlural,
+            y : 'год',
+            yy : be__relativeTimeWithPlural
+        },
+        meridiemParse: /ночы|раніцы|дня|вечара/,
+        isPM : function (input) {
+            return /^(дня|вечара)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночы';
+            } else if (hour < 12) {
+                return 'раніцы';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечара';
+            }
+        },
+        ordinalParse: /\d{1,2}-(і|ы|га)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+            case 'w':
+            case 'W':
+                return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
+            case 'D':
+                return number + '-га';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : bulgarian (bg)
+    //! author : Krasen Borisov : https://github.com/kraz
+
+    var bg = moment.defineLocale('bg', {
+        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Днес в] LT',
+            nextDay : '[Утре в] LT',
+            nextWeek : 'dddd [в] LT',
+            lastDay : '[Вчера в] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 6:
+                    return '[В изминалата] dddd [в] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[В изминалия] dddd [в] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'след %s',
+            past : 'преди %s',
+            s : 'няколко секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дни',
+            M : 'месец',
+            MM : '%d месеца',
+            y : 'година',
+            yy : '%d години'
+        },
+        ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Bengali (bn)
+    //! author : Kaushik Gandhi : https://github.com/kaushikgandhi
+
+    var bn__symbolMap = {
+        '1': '১',
+        '2': '২',
+        '3': '৩',
+        '4': '৪',
+        '5': '৫',
+        '6': '৬',
+        '7': '৭',
+        '8': '৮',
+        '9': '৯',
+        '0': '০'
+    },
+    bn__numberMap = {
+        '১': '1',
+        '২': '2',
+        '৩': '3',
+        '৪': '4',
+        '৫': '5',
+        '৬': '6',
+        '৭': '7',
+        '৮': '8',
+        '৯': '9',
+        '০': '0'
+    };
+
+    var bn = moment.defineLocale('bn', {
+        months : 'জানুয়ারী_ফেবুয়ারী_মার্চ_এপ্রিল_মে_জুন_জুলাই_অগাস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+        monthsShort : 'জানু_ফেব_মার্চ_এপর_মে_জুন_জুল_অগ_সেপ্ট_অক্টো_নভ_ডিসেম্'.split('_'),
+        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পত্তিবার_শুক্রুবার_শনিবার'.split('_'),
+        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পত্তি_শুক্রু_শনি'.split('_'),
+        weekdaysMin : 'রব_সম_মঙ্গ_বু_ব্রিহ_শু_শনি'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm সময়',
+            LTS : 'A h:mm:ss সময়',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[আজ] LT',
+            nextDay : '[আগামীকাল] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[গতকাল] LT',
+            lastWeek : '[গত] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s পরে',
+            past : '%s আগে',
+            s : 'কএক সেকেন্ড',
+            m : 'এক মিনিট',
+            mm : '%d মিনিট',
+            h : 'এক ঘন্টা',
+            hh : '%d ঘন্টা',
+            d : 'এক দিন',
+            dd : '%d দিন',
+            M : 'এক মাস',
+            MM : '%d মাস',
+            y : 'এক বছর',
+            yy : '%d বছর'
+        },
+        preparse: function (string) {
+            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+                return bn__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return bn__symbolMap[match];
+            });
+        },
+        meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/,
+        isPM: function (input) {
+            return /^(দুপুর|বিকেল|রাত)$/.test(input);
+        },
+        //Bengali is a vast language its spoken
+        //in different forms in various parts of the world.
+        //I have just generalized with most common one used
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'রাত';
+            } else if (hour < 10) {
+                return 'শকাল';
+            } else if (hour < 17) {
+                return 'দুপুর';
+            } else if (hour < 20) {
+                return 'বিকেল';
+            } else {
+                return 'রাত';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : tibetan (bo)
+    //! author : Thupten N. Chakrishar : https://github.com/vajradog
+
+    var bo__symbolMap = {
+        '1': '༡',
+        '2': '༢',
+        '3': '༣',
+        '4': '༤',
+        '5': '༥',
+        '6': '༦',
+        '7': '༧',
+        '8': '༨',
+        '9': '༩',
+        '0': '༠'
+    },
+    bo__numberMap = {
+        '༡': '1',
+        '༢': '2',
+        '༣': '3',
+        '༤': '4',
+        '༥': '5',
+        '༦': '6',
+        '༧': '7',
+        '༨': '8',
+        '༩': '9',
+        '༠': '0'
+    };
+
+    var bo = moment.defineLocale('bo', {
+        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
+        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[དི་རིང] LT',
+            nextDay : '[སང་ཉིན] LT',
+            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
+            lastDay : '[ཁ་སང] LT',
+            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ལ་',
+            past : '%s སྔན་ལ',
+            s : 'ལམ་སང',
+            m : 'སྐར་མ་གཅིག',
+            mm : '%d སྐར་མ',
+            h : 'ཆུ་ཚོད་གཅིག',
+            hh : '%d ཆུ་ཚོད',
+            d : 'ཉིན་གཅིག',
+            dd : '%d ཉིན་',
+            M : 'ཟླ་བ་གཅིག',
+            MM : '%d ཟླ་བ',
+            y : 'ལོ་གཅིག',
+            yy : '%d ལོ'
+        },
+        preparse: function (string) {
+            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
+                return bo__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return bo__symbolMap[match];
+            });
+        },
+        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
+        isPM: function (input) {
+            return /^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'མཚན་མོ';
+            } else if (hour < 10) {
+                return 'ཞོགས་ཀས';
+            } else if (hour < 17) {
+                return 'ཉིན་གུང';
+            } else if (hour < 20) {
+                return 'དགོང་དག';
+            } else {
+                return 'མཚན་མོ';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : breton (br)
+    //! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou
+
+    function relativeTimeWithMutation(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'munutenn',
+            'MM': 'miz',
+            'dd': 'devezh'
+        };
+        return number + ' ' + mutation(format[key], number);
+    }
+    function specialMutationForYears(number) {
+        switch (lastNumber(number)) {
+        case 1:
+        case 3:
+        case 4:
+        case 5:
+        case 9:
+            return number + ' bloaz';
+        default:
+            return number + ' vloaz';
+        }
+    }
+    function lastNumber(number) {
+        if (number > 9) {
+            return lastNumber(number % 10);
+        }
+        return number;
+    }
+    function mutation(text, number) {
+        if (number === 2) {
+            return softMutation(text);
+        }
+        return text;
+    }
+    function softMutation(text) {
+        var mutationTable = {
+            'm': 'v',
+            'b': 'v',
+            'd': 'z'
+        };
+        if (mutationTable[text.charAt(0)] === undefined) {
+            return text;
+        }
+        return mutationTable[text.charAt(0)] + text.substring(1);
+    }
+
+    var br = moment.defineLocale('br', {
+        months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
+        monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
+        weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
+        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
+        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h[e]mm A',
+            LTS : 'h[e]mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D [a viz] MMMM YYYY',
+            LLL : 'D [a viz] MMMM YYYY LT',
+            LLLL : 'dddd, D [a viz] MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Hiziv da] LT',
+            nextDay : '[Warc\'hoazh da] LT',
+            nextWeek : 'dddd [da] LT',
+            lastDay : '[Dec\'h da] LT',
+            lastWeek : 'dddd [paset da] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'a-benn %s',
+            past : '%s \'zo',
+            s : 'un nebeud segondennoù',
+            m : 'ur vunutenn',
+            mm : relativeTimeWithMutation,
+            h : 'un eur',
+            hh : '%d eur',
+            d : 'un devezh',
+            dd : relativeTimeWithMutation,
+            M : 'ur miz',
+            MM : relativeTimeWithMutation,
+            y : 'ur bloaz',
+            yy : specialMutationForYears
+        },
+        ordinalParse: /\d{1,2}(añ|vet)/,
+        ordinal : function (number) {
+            var output = (number === 1) ? 'añ' : 'vet';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : bosnian (bs)
+    //! author : Nedim Cholich : https://github.com/frontyard
+    //! based on (hr) translation by Bojan Marković
+
+    function bs__translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+        case 'mm':
+            if (number === 1) {
+                result += 'minuta';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'minute';
+            } else {
+                result += 'minuta';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'jedan sat' : 'jednog sata';
+        case 'hh':
+            if (number === 1) {
+                result += 'sat';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'sata';
+            } else {
+                result += 'sati';
+            }
+            return result;
+        case 'dd':
+            if (number === 1) {
+                result += 'dan';
+            } else {
+                result += 'dana';
+            }
+            return result;
+        case 'MM':
+            if (number === 1) {
+                result += 'mjesec';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'mjeseca';
+            } else {
+                result += 'mjeseci';
+            }
+            return result;
+        case 'yy':
+            if (number === 1) {
+                result += 'godina';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'godine';
+            } else {
+                result += 'godina';
+            }
+            return result;
+        }
+    }
+
+    var bs = moment.defineLocale('bs', {
+        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                    return '[prošlu] dddd [u] LT';
+                case 6:
+                    return '[prošle] [subote] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            m      : bs__translate,
+            mm     : bs__translate,
+            h      : bs__translate,
+            hh     : bs__translate,
+            d      : 'dan',
+            dd     : bs__translate,
+            M      : 'mjesec',
+            MM     : bs__translate,
+            y      : 'godinu',
+            yy     : bs__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : catalan (ca)
+    //! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+    var ca = moment.defineLocale('ca', {
+        months : 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
+        monthsShort : 'gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.'.split('_'),
+        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
+        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
+        weekdaysMin : 'Dg_Dl_Dt_Dc_Dj_Dv_Ds'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextDay : function () {
+                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastDay : function () {
+                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'fa %s',
+            s : 'uns segons',
+            m : 'un minut',
+            mm : '%d minuts',
+            h : 'una hora',
+            hh : '%d hores',
+            d : 'un dia',
+            dd : '%d dies',
+            M : 'un mes',
+            MM : '%d mesos',
+            y : 'un any',
+            yy : '%d anys'
+        },
+        ordinalParse: /\d{1,2}(r|n|t|è|a)/,
+        ordinal : function (number, period) {
+            var output = (number === 1) ? 'r' :
+                (number === 2) ? 'n' :
+                (number === 3) ? 'r' :
+                (number === 4) ? 't' : 'è';
+            if (period === 'w' || period === 'W') {
+                output = 'a';
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : czech (cs)
+    //! author : petrbela : https://github.com/petrbela
+
+    var cs__months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
+        cs__monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
+    function cs__plural(n) {
+        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
+    }
+    function cs__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':  // a few seconds / in a few seconds / a few seconds ago
+            return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
+        case 'm':  // a minute / in a minute / a minute ago
+            return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
+        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'minuty' : 'minut');
+            } else {
+                return result + 'minutami';
+            }
+            break;
+        case 'h':  // an hour / in an hour / an hour ago
+            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+        case 'hh': // 9 hours / in 9 hours / 9 hours ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'hodiny' : 'hodin');
+            } else {
+                return result + 'hodinami';
+            }
+            break;
+        case 'd':  // a day / in a day / a day ago
+            return (withoutSuffix || isFuture) ? 'den' : 'dnem';
+        case 'dd': // 9 days / in 9 days / 9 days ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'dny' : 'dní');
+            } else {
+                return result + 'dny';
+            }
+            break;
+        case 'M':  // a month / in a month / a month ago
+            return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
+        case 'MM': // 9 months / in 9 months / 9 months ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'měsíce' : 'měsíců');
+            } else {
+                return result + 'měsíci';
+            }
+            break;
+        case 'y':  // a year / in a year / a year ago
+            return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
+        case 'yy': // 9 years / in 9 years / 9 years ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'roky' : 'let');
+            } else {
+                return result + 'lety';
+            }
+            break;
+        }
+    }
+
+    var cs = moment.defineLocale('cs', {
+        months : cs__months,
+        monthsShort : cs__monthsShort,
+        monthsParse : (function (months, monthsShort) {
+            var i, _monthsParse = [];
+            for (i = 0; i < 12; i++) {
+                // use custom parser to solve problem with July (červenec)
+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+            }
+            return _monthsParse;
+        }(cs__months, cs__monthsShort)),
+        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
+        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
+        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[dnes v] LT',
+            nextDay: '[zítra v] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v neděli v] LT';
+                case 1:
+                case 2:
+                    return '[v] dddd [v] LT';
+                case 3:
+                    return '[ve středu v] LT';
+                case 4:
+                    return '[ve čtvrtek v] LT';
+                case 5:
+                    return '[v pátek v] LT';
+                case 6:
+                    return '[v sobotu v] LT';
+                }
+            },
+            lastDay: '[včera v] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[minulou neděli v] LT';
+                case 1:
+                case 2:
+                    return '[minulé] dddd [v] LT';
+                case 3:
+                    return '[minulou středu v] LT';
+                case 4:
+                case 5:
+                    return '[minulý] dddd [v] LT';
+                case 6:
+                    return '[minulou sobotu v] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'před %s',
+            s : cs__translate,
+            m : cs__translate,
+            mm : cs__translate,
+            h : cs__translate,
+            hh : cs__translate,
+            d : cs__translate,
+            dd : cs__translate,
+            M : cs__translate,
+            MM : cs__translate,
+            y : cs__translate,
+            yy : cs__translate
+        },
+        ordinalParse : /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : chuvash (cv)
+    //! author : Anatoly Mironov : https://github.com/mirontoli
+
+    var cv = moment.defineLocale('cv', {
+        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
+        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
+        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
+        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
+        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
+            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT',
+            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT'
+        },
+        calendar : {
+            sameDay: '[Паян] LT [сехетре]',
+            nextDay: '[Ыран] LT [сехетре]',
+            lastDay: '[Ӗнер] LT [сехетре]',
+            nextWeek: '[Ҫитес] dddd LT [сехетре]',
+            lastWeek: '[Иртнӗ] dddd LT [сехетре]',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (output) {
+                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
+                return output + affix;
+            },
+            past : '%s каялла',
+            s : 'пӗр-ик ҫеккунт',
+            m : 'пӗр минут',
+            mm : '%d минут',
+            h : 'пӗр сехет',
+            hh : '%d сехет',
+            d : 'пӗр кун',
+            dd : '%d кун',
+            M : 'пӗр уйӑх',
+            MM : '%d уйӑх',
+            y : 'пӗр ҫул',
+            yy : '%d ҫул'
+        },
+        ordinalParse: /\d{1,2}-мӗш/,
+        ordinal : '%d-мӗш',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Welsh (cy)
+    //! author : Robert Allen
+
+    var cy = moment.defineLocale('cy', {
+        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
+        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
+        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
+        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
+        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
+        // time formats are the same as en-gb
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd, D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[Heddiw am] LT',
+            nextDay: '[Yfory am] LT',
+            nextWeek: 'dddd [am] LT',
+            lastDay: '[Ddoe am] LT',
+            lastWeek: 'dddd [diwethaf am] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'mewn %s',
+            past: '%s yn ôl',
+            s: 'ychydig eiliadau',
+            m: 'munud',
+            mm: '%d munud',
+            h: 'awr',
+            hh: '%d awr',
+            d: 'diwrnod',
+            dd: '%d diwrnod',
+            M: 'mis',
+            MM: '%d mis',
+            y: 'blwyddyn',
+            yy: '%d flynedd'
+        },
+        ordinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
+        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
+        ordinal: function (number) {
+            var b = number,
+                output = '',
+                lookup = [
+                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
+                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
+                ];
+            if (b > 20) {
+                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
+                    output = 'fed'; // not 30ain, 70ain or 90ain
+                } else {
+                    output = 'ain';
+                }
+            } else if (b > 0) {
+                output = lookup[b];
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : danish (da)
+    //! author : Ulrik Nielsen : https://github.com/mrbase
+
+    var da = moment.defineLocale('da', {
+        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd [d.] D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[I dag kl.] LT',
+            nextDay : '[I morgen kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[I går kl.] LT',
+            lastWeek : '[sidste] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'få sekunder',
+            m : 'et minut',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dage',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'et år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : austrian german (de-at)
+    //! author : lluchs : https://github.com/lluchs
+    //! author: Menelion Elensúle: https://github.com/Oire
+    //! author : Martin Groller : https://github.com/MadMG
+
+    function de_at__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de_at = moment.defineLocale('de-at', {
+        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : de_at__processRelativeTime,
+            mm : '%d Minuten',
+            h : de_at__processRelativeTime,
+            hh : '%d Stunden',
+            d : de_at__processRelativeTime,
+            dd : de_at__processRelativeTime,
+            M : de_at__processRelativeTime,
+            MM : de_at__processRelativeTime,
+            y : de_at__processRelativeTime,
+            yy : de_at__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : german (de)
+    //! author : lluchs : https://github.com/lluchs
+    //! author: Menelion Elensúle: https://github.com/Oire
+
+    function de__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de = moment.defineLocale('de', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : de__processRelativeTime,
+            mm : '%d Minuten',
+            h : de__processRelativeTime,
+            hh : '%d Stunden',
+            d : de__processRelativeTime,
+            dd : de__processRelativeTime,
+            M : de__processRelativeTime,
+            MM : de__processRelativeTime,
+            y : de__processRelativeTime,
+            yy : de__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : modern greek (el)
+    //! author : Aggelos Karalias : https://github.com/mehiel
+
+    var el = moment.defineLocale('el', {
+        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
+        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
+        months : function (momentToFormat, format) {
+            if (/D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
+                return this._monthsGenitiveEl[momentToFormat.month()];
+            } else {
+                return this._monthsNominativeEl[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
+        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
+        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
+        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'μμ' : 'ΜΜ';
+            } else {
+                return isLower ? 'πμ' : 'ΠΜ';
+            }
+        },
+        isPM : function (input) {
+            return ((input + '').toLowerCase()[0] === 'μ');
+        },
+        meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendarEl : {
+            sameDay : '[Σήμερα {}] LT',
+            nextDay : '[Αύριο {}] LT',
+            nextWeek : 'dddd [{}] LT',
+            lastDay : '[Χθες {}] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        calendar : function (key, mom) {
+            var output = this._calendarEl[key],
+                hours = mom && mom.hours();
+            if (typeof output === 'function') {
+                output = output.apply(mom);
+            }
+            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
+        },
+        relativeTime : {
+            future : 'σε %s',
+            past : '%s πριν',
+            s : 'λίγα δευτερόλεπτα',
+            m : 'ένα λεπτό',
+            mm : '%d λεπτά',
+            h : 'μία ώρα',
+            hh : '%d ώρες',
+            d : 'μία μέρα',
+            dd : '%d μέρες',
+            M : 'ένας μήνας',
+            MM : '%d μήνες',
+            y : 'ένας χρόνος',
+            yy : '%d χρόνια'
+        },
+        ordinalParse: /\d{1,2}η/,
+        ordinal: '%dη',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : australian english (en-au)
+
+    var en_au = moment.defineLocale('en-au', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : canadian english (en-ca)
+    //! author : Jonathan Abourbih : https://github.com/jonbca
+
+    var en_ca = moment.defineLocale('en-ca', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM, YYYY',
+            LLL : 'D MMMM, YYYY LT',
+            LLLL : 'dddd, D MMMM, YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : great britain english (en-gb)
+    //! author : Chris Gedrim : https://github.com/chrisgedrim
+
+    var en_gb = moment.defineLocale('en-gb', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : esperanto (eo)
+    //! author : Colin Dean : https://github.com/colindean
+    //! komento: Mi estas malcerta se mi korekte traktis akuzativojn en tiu traduko.
+    //!          Se ne, bonvolu korekti kaj avizi min por ke mi povas lerni!
+
+    var eo = moment.defineLocale('eo', {
+        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
+        weekdays : 'Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato'.split('_'),
+        weekdaysShort : 'Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Ĵa_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D[-an de] MMMM, YYYY',
+            LLL : 'D[-an de] MMMM, YYYY LT',
+            LLLL : 'dddd, [la] D[-an de] MMMM, YYYY LT'
+        },
+        meridiemParse: /[ap]\.t\.m/i,
+        isPM: function (input) {
+            return input.charAt(0).toLowerCase() === 'p';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'p.t.m.' : 'P.T.M.';
+            } else {
+                return isLower ? 'a.t.m.' : 'A.T.M.';
+            }
+        },
+        calendar : {
+            sameDay : '[Hodiaŭ je] LT',
+            nextDay : '[Morgaŭ je] LT',
+            nextWeek : 'dddd [je] LT',
+            lastDay : '[Hieraŭ je] LT',
+            lastWeek : '[pasinta] dddd [je] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'je %s',
+            past : 'antaŭ %s',
+            s : 'sekundoj',
+            m : 'minuto',
+            mm : '%d minutoj',
+            h : 'horo',
+            hh : '%d horoj',
+            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
+            dd : '%d tagoj',
+            M : 'monato',
+            MM : '%d monatoj',
+            y : 'jaro',
+            yy : '%d jaroj'
+        },
+        ordinalParse: /\d{1,2}a/,
+        ordinal : '%da',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : spanish (es)
+    //! author : Julio Napurí : https://github.com/julionc
+
+    var monthsShortDot = 'Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.'.split('_'),
+        es__monthsShort = 'Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic'.split('_');
+
+    var es = moment.defineLocale('es', {
+        months : 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return es__monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        weekdays : 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mié._Jue._Vie._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : estonian (et)
+    //! author : Henry Kehlmann : https://github.com/madhenry
+    //! improvements : Illimar Tambek : https://github.com/ragulka
+
+    function et__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
+            'm' : ['ühe minuti', 'üks minut'],
+            'mm': [number + ' minuti', number + ' minutit'],
+            'h' : ['ühe tunni', 'tund aega', 'üks tund'],
+            'hh': [number + ' tunni', number + ' tundi'],
+            'd' : ['ühe päeva', 'üks päev'],
+            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
+            'MM': [number + ' kuu', number + ' kuud'],
+            'y' : ['ühe aasta', 'aasta', 'üks aasta'],
+            'yy': [number + ' aasta', number + ' aastat']
+        };
+        if (withoutSuffix) {
+            return format[key][2] ? format[key][2] : format[key][1];
+        }
+        return isFuture ? format[key][0] : format[key][1];
+    }
+
+    var et = moment.defineLocale('et', {
+        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
+        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
+        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
+        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
+        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
+        longDateFormat : {
+            LT   : 'H:mm',
+            LTS : 'LT:ss',
+            L    : 'DD.MM.YYYY',
+            LL   : 'D. MMMM YYYY',
+            LLL  : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[Täna,] LT',
+            nextDay  : '[Homme,] LT',
+            nextWeek : '[Järgmine] dddd LT',
+            lastDay  : '[Eile,] LT',
+            lastWeek : '[Eelmine] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s pärast',
+            past   : '%s tagasi',
+            s      : et__processRelativeTime,
+            m      : et__processRelativeTime,
+            mm     : et__processRelativeTime,
+            h      : et__processRelativeTime,
+            hh     : et__processRelativeTime,
+            d      : et__processRelativeTime,
+            dd     : '%d päeva',
+            M      : et__processRelativeTime,
+            MM     : et__processRelativeTime,
+            y      : et__processRelativeTime,
+            yy     : et__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : euskara (eu)
+    //! author : Eneko Illarramendi : https://github.com/eillarra
+
+    var eu = moment.defineLocale('eu', {
+        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
+        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
+        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
+        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
+        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY[ko] MMMM[ren] D[a]',
+            LLL : 'YYYY[ko] MMMM[ren] D[a] LT',
+            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] LT',
+            l : 'YYYY-M-D',
+            ll : 'YYYY[ko] MMM D[a]',
+            lll : 'YYYY[ko] MMM D[a] LT',
+            llll : 'ddd, YYYY[ko] MMM D[a] LT'
+        },
+        calendar : {
+            sameDay : '[gaur] LT[etan]',
+            nextDay : '[bihar] LT[etan]',
+            nextWeek : 'dddd LT[etan]',
+            lastDay : '[atzo] LT[etan]',
+            lastWeek : '[aurreko] dddd LT[etan]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s barru',
+            past : 'duela %s',
+            s : 'segundo batzuk',
+            m : 'minutu bat',
+            mm : '%d minutu',
+            h : 'ordu bat',
+            hh : '%d ordu',
+            d : 'egun bat',
+            dd : '%d egun',
+            M : 'hilabete bat',
+            MM : '%d hilabete',
+            y : 'urte bat',
+            yy : '%d urte'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Persian (fa)
+    //! author : Ebrahim Byagowi : https://github.com/ebraminio
+
+    var fa__symbolMap = {
+        '1': '۱',
+        '2': '۲',
+        '3': '۳',
+        '4': '۴',
+        '5': '۵',
+        '6': '۶',
+        '7': '۷',
+        '8': '۸',
+        '9': '۹',
+        '0': '۰'
+    }, fa__numberMap = {
+        '۱': '1',
+        '۲': '2',
+        '۳': '3',
+        '۴': '4',
+        '۵': '5',
+        '۶': '6',
+        '۷': '7',
+        '۸': '8',
+        '۹': '9',
+        '۰': '0'
+    };
+
+    var fa = moment.defineLocale('fa', {
+        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        meridiemParse: /قبل از ظهر|بعد از ظهر/,
+        isPM: function (input) {
+            return /بعد از ظهر/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'قبل از ظهر';
+            } else {
+                return 'بعد از ظهر';
+            }
+        },
+        calendar : {
+            sameDay : '[امروز ساعت] LT',
+            nextDay : '[فردا ساعت] LT',
+            nextWeek : 'dddd [ساعت] LT',
+            lastDay : '[دیروز ساعت] LT',
+            lastWeek : 'dddd [پیش] [ساعت] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'در %s',
+            past : '%s پیش',
+            s : 'چندین ثانیه',
+            m : 'یک دقیقه',
+            mm : '%d دقیقه',
+            h : 'یک ساعت',
+            hh : '%d ساعت',
+            d : 'یک روز',
+            dd : '%d روز',
+            M : 'یک ماه',
+            MM : '%d ماه',
+            y : 'یک سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/[۰-۹]/g, function (match) {
+                return fa__numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return fa__symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        ordinalParse: /\d{1,2}م/,
+        ordinal : '%dم',
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : finnish (fi)
+    //! author : Tarmo Aidantausta : https://github.com/bleadof
+
+    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
+        numbersFuture = [
+            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+            numbersPast[7], numbersPast[8], numbersPast[9]
+        ];
+    function fi__translate(number, withoutSuffix, key, isFuture) {
+        var result = '';
+        switch (key) {
+        case 's':
+            return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
+        case 'm':
+            return isFuture ? 'minuutin' : 'minuutti';
+        case 'mm':
+            result = isFuture ? 'minuutin' : 'minuuttia';
+            break;
+        case 'h':
+            return isFuture ? 'tunnin' : 'tunti';
+        case 'hh':
+            result = isFuture ? 'tunnin' : 'tuntia';
+            break;
+        case 'd':
+            return isFuture ? 'päivän' : 'päivä';
+        case 'dd':
+            result = isFuture ? 'päivän' : 'päivää';
+            break;
+        case 'M':
+            return isFuture ? 'kuukauden' : 'kuukausi';
+        case 'MM':
+            result = isFuture ? 'kuukauden' : 'kuukautta';
+            break;
+        case 'y':
+            return isFuture ? 'vuoden' : 'vuosi';
+        case 'yy':
+            result = isFuture ? 'vuoden' : 'vuotta';
+            break;
+        }
+        result = verbalNumber(number, isFuture) + ' ' + result;
+        return result;
+    }
+    function verbalNumber(number, isFuture) {
+        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
+    }
+
+    var fi = moment.defineLocale('fi', {
+        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'Do MMMM[ta] YYYY',
+            LLL : 'Do MMMM[ta] YYYY, [klo] LT',
+            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] LT',
+            l : 'D.M.YYYY',
+            ll : 'Do MMM YYYY',
+            lll : 'Do MMM YYYY, [klo] LT',
+            llll : 'ddd, Do MMM YYYY, [klo] LT'
+        },
+        calendar : {
+            sameDay : '[tänään] [klo] LT',
+            nextDay : '[huomenna] [klo] LT',
+            nextWeek : 'dddd [klo] LT',
+            lastDay : '[eilen] [klo] LT',
+            lastWeek : '[viime] dddd[na] [klo] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s päästä',
+            past : '%s sitten',
+            s : fi__translate,
+            m : fi__translate,
+            mm : fi__translate,
+            h : fi__translate,
+            hh : fi__translate,
+            d : fi__translate,
+            dd : fi__translate,
+            M : fi__translate,
+            MM : fi__translate,
+            y : fi__translate,
+            yy : fi__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : faroese (fo)
+    //! author : Ragnar Johannesen : https://github.com/ragnar123
+
+    var fo = moment.defineLocale('fo', {
+        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
+        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
+        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM, YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Í dag kl.] LT',
+            nextDay : '[Í morgin kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[Í gjár kl.] LT',
+            lastWeek : '[síðstu] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'um %s',
+            past : '%s síðani',
+            s : 'fá sekund',
+            m : 'ein minutt',
+            mm : '%d minuttir',
+            h : 'ein tími',
+            hh : '%d tímar',
+            d : 'ein dagur',
+            dd : '%d dagar',
+            M : 'ein mánaði',
+            MM : '%d mánaðir',
+            y : 'eitt ár',
+            yy : '%d ár'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : canadian french (fr-ca)
+    //! author : Jonathan Abourbih : https://github.com/jonbca
+
+    var fr_ca = moment.defineLocale('fr-ca', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : french (fr)
+    //! author : John Fischer : https://github.com/jfroffice
+
+    var fr = moment.defineLocale('fr', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : frisian (fy)
+    //! author : Robin van der Vliet : https://github.com/robin0van0der0v
+
+    var fy__monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
+        fy__monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
+
+    var fy = moment.defineLocale('fy', {
+        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return fy__monthsShortWithoutDots[m.month()];
+            } else {
+                return fy__monthsShortWithDots[m.month()];
+            }
+        },
+        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
+        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
+        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[hjoed om] LT',
+            nextDay: '[moarn om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[juster om] LT',
+            lastWeek: '[ôfrûne] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'oer %s',
+            past : '%s lyn',
+            s : 'in pear sekonden',
+            m : 'ien minút',
+            mm : '%d minuten',
+            h : 'ien oere',
+            hh : '%d oeren',
+            d : 'ien dei',
+            dd : '%d dagen',
+            M : 'ien moanne',
+            MM : '%d moannen',
+            y : 'ien jier',
+            yy : '%d jierren'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : galician (gl)
+    //! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+    var gl = moment.defineLocale('gl', {
+        months : 'Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro'.split('_'),
+        monthsShort : 'Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.'.split('_'),
+        weekdays : 'Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mér._Xov._Ven._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mé_Xo_Ve_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            lastDay : function () {
+                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
+            },
+            lastWeek : function () {
+                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (str) {
+                if (str === 'uns segundos') {
+                    return 'nuns segundos';
+                }
+                return 'en ' + str;
+            },
+            past : 'hai %s',
+            s : 'uns segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'unha hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un ano',
+            yy : '%d anos'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Hebrew (he)
+    //! author : Tomer Cohen : https://github.com/tomer
+    //! author : Moshe Simantov : https://github.com/DevelopmentIL
+    //! author : Tal Ater : https://github.com/TalAter
+
+    var he = moment.defineLocale('he', {
+        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
+        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [ב]MMMM YYYY',
+            LLL : 'D [ב]MMMM YYYY LT',
+            LLLL : 'dddd, D [ב]MMMM YYYY LT',
+            l : 'D/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY LT',
+            llll : 'ddd, D MMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[היום ב־]LT',
+            nextDay : '[מחר ב־]LT',
+            nextWeek : 'dddd [בשעה] LT',
+            lastDay : '[אתמול ב־]LT',
+            lastWeek : '[ביום] dddd [האחרון בשעה] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'בעוד %s',
+            past : 'לפני %s',
+            s : 'מספר שניות',
+            m : 'דקה',
+            mm : '%d דקות',
+            h : 'שעה',
+            hh : function (number) {
+                if (number === 2) {
+                    return 'שעתיים';
+                }
+                return number + ' שעות';
+            },
+            d : 'יום',
+            dd : function (number) {
+                if (number === 2) {
+                    return 'יומיים';
+                }
+                return number + ' ימים';
+            },
+            M : 'חודש',
+            MM : function (number) {
+                if (number === 2) {
+                    return 'חודשיים';
+                }
+                return number + ' חודשים';
+            },
+            y : 'שנה',
+            yy : function (number) {
+                if (number === 2) {
+                    return 'שנתיים';
+                } else if (number % 10 === 0 && number !== 10) {
+                    return number + ' שנה';
+                }
+                return number + ' שנים';
+            }
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : hindi (hi)
+    //! author : Mayank Singhal : https://github.com/mayanksinghal
+
+    var hi__symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    hi__numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var hi = moment.defineLocale('hi', {
+        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
+        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
+        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm बजे',
+            LTS : 'A h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[कल] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[कल] LT',
+            lastWeek : '[पिछले] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s में',
+            past : '%s पहले',
+            s : 'कुछ ही क्षण',
+            m : 'एक मिनट',
+            mm : '%d मिनट',
+            h : 'एक घंटा',
+            hh : '%d घंटे',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महीने',
+            MM : '%d महीने',
+            y : 'एक वर्ष',
+            yy : '%d वर्ष'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return hi__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return hi__symbolMap[match];
+            });
+        },
+        // Hindi notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
+        meridiemParse: /रात|सुबह|दोपहर|शाम/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सुबह') {
+                return hour;
+            } else if (meridiem === 'दोपहर') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'शाम') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात';
+            } else if (hour < 10) {
+                return 'सुबह';
+            } else if (hour < 17) {
+                return 'दोपहर';
+            } else if (hour < 20) {
+                return 'शाम';
+            } else {
+                return 'रात';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : hrvatski (hr)
+    //! author : Bojan Marković : https://github.com/bmarkovic
+
+    function hr__translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+        case 'mm':
+            if (number === 1) {
+                result += 'minuta';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'minute';
+            } else {
+                result += 'minuta';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'jedan sat' : 'jednog sata';
+        case 'hh':
+            if (number === 1) {
+                result += 'sat';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'sata';
+            } else {
+                result += 'sati';
+            }
+            return result;
+        case 'dd':
+            if (number === 1) {
+                result += 'dan';
+            } else {
+                result += 'dana';
+            }
+            return result;
+        case 'MM':
+            if (number === 1) {
+                result += 'mjesec';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'mjeseca';
+            } else {
+                result += 'mjeseci';
+            }
+            return result;
+        case 'yy':
+            if (number === 1) {
+                result += 'godina';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'godine';
+            } else {
+                result += 'godina';
+            }
+            return result;
+        }
+    }
+
+    var hr = moment.defineLocale('hr', {
+        months : 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_'),
+        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                    return '[prošlu] dddd [u] LT';
+                case 6:
+                    return '[prošle] [subote] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            m      : hr__translate,
+            mm     : hr__translate,
+            h      : hr__translate,
+            hh     : hr__translate,
+            d      : 'dan',
+            dd     : hr__translate,
+            M      : 'mjesec',
+            MM     : hr__translate,
+            y      : 'godinu',
+            yy     : hr__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : hungarian (hu)
+    //! author : Adam Brunner : https://github.com/adambrunner
+
+    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
+    function hu__translate(number, withoutSuffix, key, isFuture) {
+        var num = number,
+            suffix;
+        switch (key) {
+        case 's':
+            return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
+        case 'm':
+            return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
+        case 'mm':
+            return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
+        case 'h':
+            return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
+        case 'hh':
+            return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
+        case 'd':
+            return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
+        case 'dd':
+            return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
+        case 'M':
+            return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+        case 'MM':
+            return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+        case 'y':
+            return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
+        case 'yy':
+            return num + (isFuture || withoutSuffix ? ' év' : ' éve');
+        }
+        return '';
+    }
+    function week(isFuture) {
+        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
+    }
+
+    var hu = moment.defineLocale('hu', {
+        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
+        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
+        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
+        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
+        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY.MM.DD.',
+            LL : 'YYYY. MMMM D.',
+            LLL : 'YYYY. MMMM D., LT',
+            LLLL : 'YYYY. MMMM D., dddd LT'
+        },
+        meridiemParse: /de|du/i,
+        isPM: function (input) {
+            return input.charAt(1).toLowerCase() === 'u';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower === true ? 'de' : 'DE';
+            } else {
+                return isLower === true ? 'du' : 'DU';
+            }
+        },
+        calendar : {
+            sameDay : '[ma] LT[-kor]',
+            nextDay : '[holnap] LT[-kor]',
+            nextWeek : function () {
+                return week.call(this, true);
+            },
+            lastDay : '[tegnap] LT[-kor]',
+            lastWeek : function () {
+                return week.call(this, false);
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s múlva',
+            past : '%s',
+            s : hu__translate,
+            m : hu__translate,
+            mm : hu__translate,
+            h : hu__translate,
+            hh : hu__translate,
+            d : hu__translate,
+            dd : hu__translate,
+            M : hu__translate,
+            MM : hu__translate,
+            y : hu__translate,
+            yy : hu__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Armenian (hy-am)
+    //! author : Armendarabyan : https://github.com/armendarabyan
+
+    function hy_am__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'),
+            'accusative': 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function hy_am__monthsShortCaseReplace(m, format) {
+        var monthsShort = 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_');
+        return monthsShort[m.month()];
+    }
+    function hy_am__weekdaysCaseReplace(m, format) {
+        var weekdays = 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_');
+        return weekdays[m.day()];
+    }
+
+    var hy_am = moment.defineLocale('hy-am', {
+        months : hy_am__monthsCaseReplace,
+        monthsShort : hy_am__monthsShortCaseReplace,
+        weekdays : hy_am__weekdaysCaseReplace,
+        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY թ.',
+            LLL : 'D MMMM YYYY թ., LT',
+            LLLL : 'dddd, D MMMM YYYY թ., LT'
+        },
+        calendar : {
+            sameDay: '[այսօր] LT',
+            nextDay: '[վաղը] LT',
+            lastDay: '[երեկ] LT',
+            nextWeek: function () {
+                return 'dddd [օրը ժամը] LT';
+            },
+            lastWeek: function () {
+                return '[անցած] dddd [օրը ժամը] LT';
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s հետո',
+            past : '%s առաջ',
+            s : 'մի քանի վայրկյան',
+            m : 'րոպե',
+            mm : '%d րոպե',
+            h : 'ժամ',
+            hh : '%d ժամ',
+            d : 'օր',
+            dd : '%d օր',
+            M : 'ամիս',
+            MM : '%d ամիս',
+            y : 'տարի',
+            yy : '%d տարի'
+        },
+        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
+        isPM: function (input) {
+            return /^(ցերեկվա|երեկոյան)$/.test(input);
+        },
+        meridiem : function (hour) {
+            if (hour < 4) {
+                return 'գիշերվա';
+            } else if (hour < 12) {
+                return 'առավոտվա';
+            } else if (hour < 17) {
+                return 'ցերեկվա';
+            } else {
+                return 'երեկոյան';
+            }
+        },
+        ordinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'DDD':
+            case 'w':
+            case 'W':
+            case 'DDDo':
+                if (number === 1) {
+                    return number + '-ին';
+                }
+                return number + '-րդ';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Bahasa Indonesia (id)
+    //! author : Mohammad Satrio Utomo : https://github.com/tyok
+    //! reference: http://id.wikisource.org/wiki/Pedoman_Umum_Ejaan_Bahasa_Indonesia_yang_Disempurnakan
+
+    var id = moment.defineLocale('id', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /pagi|siang|sore|malam/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'siang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sore' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'siang';
+            } else if (hours < 19) {
+                return 'sore';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Besok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kemarin pukul] LT',
+            lastWeek : 'dddd [lalu pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lalu',
+            s : 'beberapa detik',
+            m : 'semenit',
+            mm : '%d menit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : icelandic (is)
+    //! author : Hinrik Örn Sigurðsson : https://github.com/hinrik
+
+    function is__plural(n) {
+        if (n % 100 === 11) {
+            return true;
+        } else if (n % 10 === 1) {
+            return false;
+        }
+        return true;
+    }
+    function is__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':
+            return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
+        case 'm':
+            return withoutSuffix ? 'mínúta' : 'mínútu';
+        case 'mm':
+            if (is__plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
+            } else if (withoutSuffix) {
+                return result + 'mínúta';
+            }
+            return result + 'mínútu';
+        case 'hh':
+            if (is__plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
+            }
+            return result + 'klukkustund';
+        case 'd':
+            if (withoutSuffix) {
+                return 'dagur';
+            }
+            return isFuture ? 'dag' : 'degi';
+        case 'dd':
+            if (is__plural(number)) {
+                if (withoutSuffix) {
+                    return result + 'dagar';
+                }
+                return result + (isFuture ? 'daga' : 'dögum');
+            } else if (withoutSuffix) {
+                return result + 'dagur';
+            }
+            return result + (isFuture ? 'dag' : 'degi');
+        case 'M':
+            if (withoutSuffix) {
+                return 'mánuður';
+            }
+            return isFuture ? 'mánuð' : 'mánuði';
+        case 'MM':
+            if (is__plural(number)) {
+                if (withoutSuffix) {
+                    return result + 'mánuðir';
+                }
+                return result + (isFuture ? 'mánuði' : 'mánuðum');
+            } else if (withoutSuffix) {
+                return result + 'mánuður';
+            }
+            return result + (isFuture ? 'mánuð' : 'mánuði');
+        case 'y':
+            return withoutSuffix || isFuture ? 'ár' : 'ári';
+        case 'yy':
+            if (is__plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
+            }
+            return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
+        }
+    }
+
+    var is = moment.defineLocale('is', {
+        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
+        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
+        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
+        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] LT',
+            LLLL : 'dddd, D. MMMM YYYY [kl.] LT'
+        },
+        calendar : {
+            sameDay : '[í dag kl.] LT',
+            nextDay : '[á morgun kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[í gær kl.] LT',
+            lastWeek : '[síðasta] dddd [kl.] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'eftir %s',
+            past : 'fyrir %s síðan',
+            s : is__translate,
+            m : is__translate,
+            mm : is__translate,
+            h : 'klukkustund',
+            hh : is__translate,
+            d : is__translate,
+            dd : is__translate,
+            M : is__translate,
+            MM : is__translate,
+            y : is__translate,
+            yy : is__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : italian (it)
+    //! author : Lorenzo : https://github.com/aliem
+    //! author: Mattia Larentis: https://github.com/nostalgiaz
+
+    var it = moment.defineLocale('it', {
+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+        weekdays : 'Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato'.split('_'),
+        weekdaysShort : 'Dom_Lun_Mar_Mer_Gio_Ven_Sab'.split('_'),
+        weekdaysMin : 'D_L_Ma_Me_G_V_S'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Oggi alle] LT',
+            nextDay: '[Domani alle] LT',
+            nextWeek: 'dddd [alle] LT',
+            lastDay: '[Ieri alle] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[la scorsa] dddd [alle] LT';
+                    default:
+                        return '[lo scorso] dddd [alle] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+            },
+            past : '%s fa',
+            s : 'alcuni secondi',
+            m : 'un minuto',
+            mm : '%d minuti',
+            h : 'un\'ora',
+            hh : '%d ore',
+            d : 'un giorno',
+            dd : '%d giorni',
+            M : 'un mese',
+            MM : '%d mesi',
+            y : 'un anno',
+            yy : '%d anni'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : japanese (ja)
+    //! author : LI Long : https://github.com/baryon
+
+    var ja = moment.defineLocale('ja', {
+        months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
+        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
+        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
+        longDateFormat : {
+            LT : 'Ah時m分',
+            LTS : 'LTs秒',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日LT',
+            LLLL : 'YYYY年M月D日LT dddd'
+        },
+        meridiemParse: /午前|午後/i,
+        isPM : function (input) {
+            return input === '午後';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return '午前';
+            } else {
+                return '午後';
+            }
+        },
+        calendar : {
+            sameDay : '[今日] LT',
+            nextDay : '[明日] LT',
+            nextWeek : '[来週]dddd LT',
+            lastDay : '[昨日] LT',
+            lastWeek : '[前週]dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s後',
+            past : '%s前',
+            s : '数秒',
+            m : '1分',
+            mm : '%d分',
+            h : '1時間',
+            hh : '%d時間',
+            d : '1日',
+            dd : '%d日',
+            M : '1ヶ月',
+            MM : '%dヶ月',
+            y : '1年',
+            yy : '%d年'
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Boso Jowo (jv)
+    //! author : Rony Lantip : https://github.com/lantip
+    //! reference: http://jv.wikipedia.org/wiki/Basa_Jawa
+
+    var jv = moment.defineLocale('jv', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
+        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /enjing|siyang|sonten|ndalu/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'enjing') {
+                return hour;
+            } else if (meridiem === 'siyang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'enjing';
+            } else if (hours < 15) {
+                return 'siyang';
+            } else if (hours < 19) {
+                return 'sonten';
+            } else {
+                return 'ndalu';
+            }
+        },
+        calendar : {
+            sameDay : '[Dinten puniko pukul] LT',
+            nextDay : '[Mbenjang pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kala wingi pukul] LT',
+            lastWeek : 'dddd [kepengker pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'wonten ing %s',
+            past : '%s ingkang kepengker',
+            s : 'sawetawis detik',
+            m : 'setunggal menit',
+            mm : '%d menit',
+            h : 'setunggal jam',
+            hh : '%d jam',
+            d : 'sedinten',
+            dd : '%d dinten',
+            M : 'sewulan',
+            MM : '%d wulan',
+            y : 'setaun',
+            yy : '%d taun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Georgian (ka)
+    //! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
+
+    function ka__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
+            'accusative': 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
+        },
+        nounCase = (/D[oD] *MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function ka__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
+            'accusative': 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_')
+        },
+        nounCase = (/(წინა|შემდეგ)/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var ka = moment.defineLocale('ka', {
+        months : ka__monthsCaseReplace,
+        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
+        weekdays : ka__weekdaysCaseReplace,
+        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
+        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[დღეს] LT[-ზე]',
+            nextDay : '[ხვალ] LT[-ზე]',
+            lastDay : '[გუშინ] LT[-ზე]',
+            nextWeek : '[შემდეგ] dddd LT[-ზე]',
+            lastWeek : '[წინა] dddd LT-ზე',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
+                    s.replace(/ი$/, 'ში') :
+                    s + 'ში';
+            },
+            past : function (s) {
+                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
+                    return s.replace(/(ი|ე)$/, 'ის წინ');
+                }
+                if ((/წელი/).test(s)) {
+                    return s.replace(/წელი$/, 'წლის წინ');
+                }
+            },
+            s : 'რამდენიმე წამი',
+            m : 'წუთი',
+            mm : '%d წუთი',
+            h : 'საათი',
+            hh : '%d საათი',
+            d : 'დღე',
+            dd : '%d დღე',
+            M : 'თვე',
+            MM : '%d თვე',
+            y : 'წელი',
+            yy : '%d წელი'
+        },
+        ordinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
+        ordinal : function (number) {
+            if (number === 0) {
+                return number;
+            }
+            if (number === 1) {
+                return number + '-ლი';
+            }
+            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
+                return 'მე-' + number;
+            }
+            return number + '-ე';
+        },
+        week : {
+            dow : 1,
+            doy : 7
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : khmer (km)
+    //! author : Kruy Vanna : https://github.com/kruyvanna
+
+    var km = moment.defineLocale('km', {
+        months: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+        monthsShort: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysShort: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysMin: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd, D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[ថ្ងៃនៈ ម៉ោង] LT',
+            nextDay: '[ស្អែក ម៉ោង] LT',
+            nextWeek: 'dddd [ម៉ោង] LT',
+            lastDay: '[ម្សិលមិញ ម៉ោង] LT',
+            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%sទៀត',
+            past: '%sមុន',
+            s: 'ប៉ុន្មានវិនាទី',
+            m: 'មួយនាទី',
+            mm: '%d នាទី',
+            h: 'មួយម៉ោង',
+            hh: '%d ម៉ោង',
+            d: 'មួយថ្ងៃ',
+            dd: '%d ថ្ងៃ',
+            M: 'មួយខែ',
+            MM: '%d ខែ',
+            y: 'មួយឆ្នាំ',
+            yy: '%d ឆ្នាំ'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : korean (ko)
+    //!
+    //! authors
+    //!
+    //! - Kyungwook, Park : https://github.com/kyungw00k
+    //! - Jeeeyul Lee <jeeeyul@gmail.com>
+
+    var ko = moment.defineLocale('ko', {
+        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
+        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
+        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
+        longDateFormat : {
+            LT : 'A h시 m분',
+            LTS : 'A h시 m분 s초',
+            L : 'YYYY.MM.DD',
+            LL : 'YYYY년 MMMM D일',
+            LLL : 'YYYY년 MMMM D일 LT',
+            LLLL : 'YYYY년 MMMM D일 dddd LT'
+        },
+        calendar : {
+            sameDay : '오늘 LT',
+            nextDay : '내일 LT',
+            nextWeek : 'dddd LT',
+            lastDay : '어제 LT',
+            lastWeek : '지난주 dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s 후',
+            past : '%s 전',
+            s : '몇초',
+            ss : '%d초',
+            m : '일분',
+            mm : '%d분',
+            h : '한시간',
+            hh : '%d시간',
+            d : '하루',
+            dd : '%d일',
+            M : '한달',
+            MM : '%d달',
+            y : '일년',
+            yy : '%d년'
+        },
+        ordinalParse : /\d{1,2}일/,
+        ordinal : '%d일',
+        meridiemParse : /오전|오후/,
+        isPM : function (token) {
+            return token === '오후';
+        },
+        meridiem : function (hour, minute, isUpper) {
+            return hour < 12 ? '오전' : '오후';
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Luxembourgish (lb)
+    //! author : mweimerskirch : https://github.com/mweimerskirch, David Raison : https://github.com/kwisatz
+
+    function lb__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eng Minutt', 'enger Minutt'],
+            'h': ['eng Stonn', 'enger Stonn'],
+            'd': ['een Dag', 'engem Dag'],
+            'M': ['ee Mount', 'engem Mount'],
+            'y': ['ee Joer', 'engem Joer']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+    function processFutureTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'a ' + string;
+        }
+        return 'an ' + string;
+    }
+    function processPastTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'viru ' + string;
+        }
+        return 'virun ' + string;
+    }
+    /**
+     * Returns true if the word before the given number loses the '-n' ending.
+     * e.g. 'an 10 Deeg' but 'a 5 Deeg'
+     *
+     * @param number {integer}
+     * @returns {boolean}
+     */
+    function eifelerRegelAppliesToNumber(number) {
+        number = parseInt(number, 10);
+        if (isNaN(number)) {
+            return false;
+        }
+        if (number < 0) {
+            // Negative Number --> always true
+            return true;
+        } else if (number < 10) {
+            // Only 1 digit
+            if (4 <= number && number <= 7) {
+                return true;
+            }
+            return false;
+        } else if (number < 100) {
+            // 2 digits
+            var lastDigit = number % 10, firstDigit = number / 10;
+            if (lastDigit === 0) {
+                return eifelerRegelAppliesToNumber(firstDigit);
+            }
+            return eifelerRegelAppliesToNumber(lastDigit);
+        } else if (number < 10000) {
+            // 3 or 4 digits --> recursively check first digit
+            while (number >= 10) {
+                number = number / 10;
+            }
+            return eifelerRegelAppliesToNumber(number);
+        } else {
+            // Anything larger than 4 digits: recursively check first n-3 digits
+            number = number / 1000;
+            return eifelerRegelAppliesToNumber(number);
+        }
+    }
+
+    var lb = moment.defineLocale('lb', {
+        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
+        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
+        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
+        longDateFormat: {
+            LT: 'H:mm [Auer]',
+            LTS: 'H:mm:ss [Auer]',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[Haut um] LT',
+            sameElse: 'L',
+            nextDay: '[Muer um] LT',
+            nextWeek: 'dddd [um] LT',
+            lastDay: '[Gëschter um] LT',
+            lastWeek: function () {
+                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
+                switch (this.day()) {
+                    case 2:
+                    case 4:
+                        return '[Leschten] dddd [um] LT';
+                    default:
+                        return '[Leschte] dddd [um] LT';
+                }
+            }
+        },
+        relativeTime : {
+            future : processFutureTime,
+            past : processPastTime,
+            s : 'e puer Sekonnen',
+            m : lb__processRelativeTime,
+            mm : '%d Minutten',
+            h : lb__processRelativeTime,
+            hh : '%d Stonnen',
+            d : lb__processRelativeTime,
+            dd : '%d Deeg',
+            M : lb__processRelativeTime,
+            MM : '%d Méint',
+            y : lb__processRelativeTime,
+            yy : '%d Joer'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal: '%d.',
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Lithuanian (lt)
+    //! author : Mindaugas Mozūras : https://github.com/mmozuras
+
+    var lt__units = {
+        'm' : 'minutė_minutės_minutę',
+        'mm': 'minutės_minučių_minutes',
+        'h' : 'valanda_valandos_valandą',
+        'hh': 'valandos_valandų_valandas',
+        'd' : 'diena_dienos_dieną',
+        'dd': 'dienos_dienų_dienas',
+        'M' : 'mėnuo_mėnesio_mėnesį',
+        'MM': 'mėnesiai_mėnesių_mėnesius',
+        'y' : 'metai_metų_metus',
+        'yy': 'metai_metų_metus'
+    },
+    weekDays = 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_');
+    function translateSeconds(number, withoutSuffix, key, isFuture) {
+        if (withoutSuffix) {
+            return 'kelios sekundės';
+        } else {
+            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
+        }
+    }
+    function translateSingular(number, withoutSuffix, key, isFuture) {
+        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
+    }
+    function special(number) {
+        return number % 10 === 0 || (number > 10 && number < 20);
+    }
+    function forms(key) {
+        return lt__units[key].split('_');
+    }
+    function lt__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        if (number === 1) {
+            return result + translateSingular(number, withoutSuffix, key[0], isFuture);
+        } else if (withoutSuffix) {
+            return result + (special(number) ? forms(key)[1] : forms(key)[0]);
+        } else {
+            if (isFuture) {
+                return result + forms(key)[1];
+            } else {
+                return result + (special(number) ? forms(key)[1] : forms(key)[2]);
+            }
+        }
+    }
+    function relativeWeekDay(moment, format) {
+        var nominative = format.indexOf('dddd HH:mm') === -1,
+            weekDay = weekDays[moment.day()];
+        return nominative ? weekDay : weekDay.substring(0, weekDay.length - 2) + 'į';
+    }
+
+    var lt = moment.defineLocale('lt', {
+        months : 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
+        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
+        weekdays : relativeWeekDay,
+        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
+        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY [m.] MMMM D [d.]',
+            LLL : 'YYYY [m.] MMMM D [d.], LT [val.]',
+            LLLL : 'YYYY [m.] MMMM D [d.], dddd, LT [val.]',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY [m.] MMMM D [d.]',
+            lll : 'YYYY [m.] MMMM D [d.], LT [val.]',
+            llll : 'YYYY [m.] MMMM D [d.], ddd, LT [val.]'
+        },
+        calendar : {
+            sameDay : '[Šiandien] LT',
+            nextDay : '[Rytoj] LT',
+            nextWeek : 'dddd LT',
+            lastDay : '[Vakar] LT',
+            lastWeek : '[Praėjusį] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'po %s',
+            past : 'prieš %s',
+            s : translateSeconds,
+            m : translateSingular,
+            mm : lt__translate,
+            h : translateSingular,
+            hh : lt__translate,
+            d : translateSingular,
+            dd : lt__translate,
+            M : translateSingular,
+            MM : lt__translate,
+            y : translateSingular,
+            yy : lt__translate
+        },
+        ordinalParse: /\d{1,2}-oji/,
+        ordinal : function (number) {
+            return number + '-oji';
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : latvian (lv)
+    //! author : Kristaps Karlsons : https://github.com/skakri
+    //! author : Jānis Elmeris : https://github.com/JanisE
+
+    var lv__units = {
+        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'h': 'stundas_stundām_stunda_stundas'.split('_'),
+        'hh': 'stundas_stundām_stunda_stundas'.split('_'),
+        'd': 'dienas_dienām_diena_dienas'.split('_'),
+        'dd': 'dienas_dienām_diena_dienas'.split('_'),
+        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'y': 'gada_gadiem_gads_gadi'.split('_'),
+        'yy': 'gada_gadiem_gads_gadi'.split('_')
+    };
+    /**
+     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
+     */
+    function format(forms, number, withoutSuffix) {
+        if (withoutSuffix) {
+            // E.g. "21 minūte", "3 minūtes".
+            return number % 10 === 1 && number !== 11 ? forms[2] : forms[3];
+        } else {
+            // E.g. "21 minūtes" as in "pēc 21 minūtes".
+            // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
+            return number % 10 === 1 && number !== 11 ? forms[0] : forms[1];
+        }
+    }
+    function lv__relativeTimeWithPlural(number, withoutSuffix, key) {
+        return number + ' ' + format(lv__units[key], number, withoutSuffix);
+    }
+    function relativeTimeWithSingular(number, withoutSuffix, key) {
+        return format(lv__units[key], number, withoutSuffix);
+    }
+    function relativeSeconds(number, withoutSuffix) {
+        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
+    }
+
+    var lv = moment.defineLocale('lv', {
+        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
+        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY.',
+            LL : 'YYYY. [gada] D. MMMM',
+            LLL : 'YYYY. [gada] D. MMMM, LT',
+            LLLL : 'YYYY. [gada] D. MMMM, dddd, LT'
+        },
+        calendar : {
+            sameDay : '[Šodien pulksten] LT',
+            nextDay : '[Rīt pulksten] LT',
+            nextWeek : 'dddd [pulksten] LT',
+            lastDay : '[Vakar pulksten] LT',
+            lastWeek : '[Pagājušā] dddd [pulksten] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'pēc %s',
+            past : 'pirms %s',
+            s : relativeSeconds,
+            m : relativeTimeWithSingular,
+            mm : lv__relativeTimeWithPlural,
+            h : relativeTimeWithSingular,
+            hh : lv__relativeTimeWithPlural,
+            d : relativeTimeWithSingular,
+            dd : lv__relativeTimeWithPlural,
+            M : relativeTimeWithSingular,
+            MM : lv__relativeTimeWithPlural,
+            y : relativeTimeWithSingular,
+            yy : lv__relativeTimeWithPlural
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Montenegrin (me)
+    //! author : Miodrag Nikač <miodrag@restartit.me> : https://github.com/miodragnikac
+
+    var me__translator = {
+        words: { //Different grammatical cases
+            m: ['jedan minut', 'jednog minuta'],
+            mm: ['minut', 'minuta', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mjesec', 'mjeseca', 'mjeseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = me__translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + me__translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var me = moment.defineLocale('me', {
+        months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+        monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+        weekdays: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda', 'četvrtak', 'petak', 'subota'],
+        weekdaysShort: ['ned.', 'pon.', 'uto.', 'sri.', 'čet.', 'pet.', 'sub.'],
+        weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sjutra u] LT',
+
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedjelje] [u] LT',
+                    '[prošlog] [ponedjeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srijede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'nekoliko sekundi',
+            m      : me__translator.translate,
+            mm     : me__translator.translate,
+            h      : me__translator.translate,
+            hh     : me__translator.translate,
+            d      : 'dan',
+            dd     : me__translator.translate,
+            M      : 'mjesec',
+            MM     : me__translator.translate,
+            y      : 'godinu',
+            yy     : me__translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : macedonian (mk)
+    //! author : Borislav Mickov : https://github.com/B0k0
+
+    var mk = moment.defineLocale('mk', {
+        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
+        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Денес во] LT',
+            nextDay : '[Утре во] LT',
+            nextWeek : 'dddd [во] LT',
+            lastDay : '[Вчера во] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 6:
+                    return '[Во изминатата] dddd [во] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[Во изминатиот] dddd [во] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'после %s',
+            past : 'пред %s',
+            s : 'неколку секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дена',
+            M : 'месец',
+            MM : '%d месеци',
+            y : 'година',
+            yy : '%d години'
+        },
+        ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : malayalam (ml)
+    //! author : Floyd Pink : https://github.com/floydpink
+
+    var ml = moment.defineLocale('ml', {
+        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
+        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
+        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
+        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
+        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm -നു',
+            LTS : 'A h:mm:ss -നു',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[ഇന്ന്] LT',
+            nextDay : '[നാളെ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ഇന്നലെ] LT',
+            lastWeek : '[കഴിഞ്ഞ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s കഴിഞ്ഞ്',
+            past : '%s മുൻപ്',
+            s : 'അൽപ നിമിഷങ്ങൾ',
+            m : 'ഒരു മിനിറ്റ്',
+            mm : '%d മിനിറ്റ്',
+            h : 'ഒരു മണിക്കൂർ',
+            hh : '%d മണിക്കൂർ',
+            d : 'ഒരു ദിവസം',
+            dd : '%d ദിവസം',
+            M : 'ഒരു മാസം',
+            MM : '%d മാസം',
+            y : 'ഒരു വർഷം',
+            yy : '%d വർഷം'
+        },
+        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
+        isPM : function (input) {
+            return /^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'രാത്രി';
+            } else if (hour < 12) {
+                return 'രാവിലെ';
+            } else if (hour < 17) {
+                return 'ഉച്ച കഴിഞ്ഞ്';
+            } else if (hour < 20) {
+                return 'വൈകുന്നേരം';
+            } else {
+                return 'രാത്രി';
+            }
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Marathi (mr)
+    //! author : Harshad Kale : https://github.com/kalehv
+
+    var mr__symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    mr__numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var mr = moment.defineLocale('mr', {
+        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
+        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
+        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm वाजता',
+            LTS : 'A h:mm:ss वाजता',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[उद्या] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[काल] LT',
+            lastWeek: '[मागील] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s नंतर',
+            past : '%s पूर्वी',
+            s : 'सेकंद',
+            m: 'एक मिनिट',
+            mm: '%d मिनिटे',
+            h : 'एक तास',
+            hh : '%d तास',
+            d : 'एक दिवस',
+            dd : '%d दिवस',
+            M : 'एक महिना',
+            MM : '%d महिने',
+            y : 'एक वर्ष',
+            yy : '%d वर्षे'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return mr__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return mr__symbolMap[match];
+            });
+        },
+        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात्री') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सकाळी') {
+                return hour;
+            } else if (meridiem === 'दुपारी') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'सायंकाळी') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात्री';
+            } else if (hour < 10) {
+                return 'सकाळी';
+            } else if (hour < 17) {
+                return 'दुपारी';
+            } else if (hour < 20) {
+                return 'सायंकाळी';
+            } else {
+                return 'रात्री';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Bahasa Malaysia (ms-MY)
+    //! author : Weldan Jamili : https://github.com/weldan
+
+    var ms_my = moment.defineLocale('ms-my', {
+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /pagi|tengahari|petang|malam/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'tengahari') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'petang' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'tengahari';
+            } else if (hours < 19) {
+                return 'petang';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Esok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kelmarin pukul] LT',
+            lastWeek : 'dddd [lepas pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lepas',
+            s : 'beberapa saat',
+            m : 'seminit',
+            mm : '%d minit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Burmese (my)
+    //! author : Squar team, mysquar.com
+
+    var my__symbolMap = {
+        '1': '၁',
+        '2': '၂',
+        '3': '၃',
+        '4': '၄',
+        '5': '၅',
+        '6': '၆',
+        '7': '၇',
+        '8': '၈',
+        '9': '၉',
+        '0': '၀'
+    }, my__numberMap = {
+        '၁': '1',
+        '၂': '2',
+        '၃': '3',
+        '၄': '4',
+        '၅': '5',
+        '၆': '6',
+        '၇': '7',
+        '၈': '8',
+        '၉': '9',
+        '၀': '0'
+    };
+
+    var my = moment.defineLocale('my', {
+        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
+        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
+        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
+        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[ယနေ.] LT [မှာ]',
+            nextDay: '[မနက်ဖြန်] LT [မှာ]',
+            nextWeek: 'dddd LT [မှာ]',
+            lastDay: '[မနေ.က] LT [မှာ]',
+            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'လာမည့် %s မှာ',
+            past: 'လွန်ခဲ့သော %s က',
+            s: 'စက္ကန်.အနည်းငယ်',
+            m: 'တစ်မိနစ်',
+            mm: '%d မိနစ်',
+            h: 'တစ်နာရီ',
+            hh: '%d နာရီ',
+            d: 'တစ်ရက်',
+            dd: '%d ရက်',
+            M: 'တစ်လ',
+            MM: '%d လ',
+            y: 'တစ်နှစ်',
+            yy: '%d နှစ်'
+        },
+        preparse: function (string) {
+            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
+                return my__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return my__symbolMap[match];
+            });
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : norwegian bokmål (nb)
+    //! authors : Espen Hovlandsdal : https://github.com/rexxars
+    //!           Sigurd Gartmann : https://github.com/sigurdga
+
+    var nb = moment.defineLocale('nb', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tirs_ons_tors_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'H.mm',
+            LTS : 'LT.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] LT',
+            LLLL : 'dddd D. MMMM YYYY [kl.] LT'
+        },
+        calendar : {
+            sameDay: '[i dag kl.] LT',
+            nextDay: '[i morgen kl.] LT',
+            nextWeek: 'dddd [kl.] LT',
+            lastDay: '[i går kl.] LT',
+            lastWeek: '[forrige] dddd [kl.] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'for %s siden',
+            s : 'noen sekunder',
+            m : 'ett minutt',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dager',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : nepali/nepalese
+    //! author : suvash : https://github.com/suvash
+
+    var ne__symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    ne__numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var ne = moment.defineLocale('ne', {
+        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
+        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
+        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
+        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
+        weekdaysMin : 'आइ._सो._मङ्_बु._बि._शु._श.'.split('_'),
+        longDateFormat : {
+            LT : 'Aको h:mm बजे',
+            LTS : 'Aको h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return ne__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return ne__symbolMap[match];
+            });
+        },
+        meridiemParse: /राती|बिहान|दिउँसो|बेलुका|साँझ|राती/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'राती') {
+                return hour < 3 ? hour : hour + 12;
+            } else if (meridiem === 'बिहान') {
+                return hour;
+            } else if (meridiem === 'दिउँसो') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'बेलुका' || meridiem === 'साँझ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 3) {
+                return 'राती';
+            } else if (hour < 10) {
+                return 'बिहान';
+            } else if (hour < 15) {
+                return 'दिउँसो';
+            } else if (hour < 18) {
+                return 'बेलुका';
+            } else if (hour < 20) {
+                return 'साँझ';
+            } else {
+                return 'राती';
+            }
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[भोली] LT',
+            nextWeek : '[आउँदो] dddd[,] LT',
+            lastDay : '[हिजो] LT',
+            lastWeek : '[गएको] dddd[,] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sमा',
+            past : '%s अगाडी',
+            s : 'केही समय',
+            m : 'एक मिनेट',
+            mm : '%d मिनेट',
+            h : 'एक घण्टा',
+            hh : '%d घण्टा',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महिना',
+            MM : '%d महिना',
+            y : 'एक बर्ष',
+            yy : '%d बर्ष'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : dutch (nl)
+    //! author : Joris Röling : https://github.com/jjupiter
+
+    var nl__monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        nl__monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+
+    var nl = moment.defineLocale('nl', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return nl__monthsShortWithoutDots[m.month()];
+            } else {
+                return nl__monthsShortWithDots[m.month()];
+            }
+        },
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : norwegian nynorsk (nn)
+    //! author : https://github.com/mechuwind
+
+    var nn = moment.defineLocale('nn', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
+        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
+        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[I dag klokka] LT',
+            nextDay: '[I morgon klokka] LT',
+            nextWeek: 'dddd [klokka] LT',
+            lastDay: '[I går klokka] LT',
+            lastWeek: '[Føregåande] dddd [klokka] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'for %s sidan',
+            s : 'nokre sekund',
+            m : 'eit minutt',
+            mm : '%d minutt',
+            h : 'ein time',
+            hh : '%d timar',
+            d : 'ein dag',
+            dd : '%d dagar',
+            M : 'ein månad',
+            MM : '%d månader',
+            y : 'eit år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : polish (pl)
+    //! author : Rafal Hirsz : https://github.com/evoL
+
+    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
+        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+    function pl__plural(n) {
+        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
+    }
+    function pl__translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'minuta' : 'minutę';
+        case 'mm':
+            return result + (pl__plural(number) ? 'minuty' : 'minut');
+        case 'h':
+            return withoutSuffix  ? 'godzina'  : 'godzinę';
+        case 'hh':
+            return result + (pl__plural(number) ? 'godziny' : 'godzin');
+        case 'MM':
+            return result + (pl__plural(number) ? 'miesiące' : 'miesięcy');
+        case 'yy':
+            return result + (pl__plural(number) ? 'lata' : 'lat');
+        }
+    }
+
+    var pl = moment.defineLocale('pl', {
+        months : function (momentToFormat, format) {
+            if (format === '') {
+                // Hack: if format empty we know this is used to generate
+                // RegExp by moment. Give then back both valid forms of months
+                // in RegExp ready format.
+                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+            } else if (/D MMMM/.test(format)) {
+                return monthsSubjective[momentToFormat.month()];
+            } else {
+                return monthsNominative[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+        weekdaysShort : 'nie_pon_wt_śr_czw_pt_sb'.split('_'),
+        weekdaysMin : 'N_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Dziś o] LT',
+            nextDay: '[Jutro o] LT',
+            nextWeek: '[W] dddd [o] LT',
+            lastDay: '[Wczoraj o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[W zeszłą niedzielę o] LT';
+                case 3:
+                    return '[W zeszłą środę o] LT';
+                case 6:
+                    return '[W zeszłą sobotę o] LT';
+                default:
+                    return '[W zeszły] dddd [o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : '%s temu',
+            s : 'kilka sekund',
+            m : pl__translate,
+            mm : pl__translate,
+            h : pl__translate,
+            hh : pl__translate,
+            d : '1 dzień',
+            dd : '%d dni',
+            M : 'miesiąc',
+            MM : pl__translate,
+            y : 'rok',
+            yy : pl__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : brazilian portuguese (pt-br)
+    //! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira
+
+    var pt_br = moment.defineLocale('pt-br', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY [às] LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] LT'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : '%s atrás',
+            s : 'segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        ordinalParse: /\d{1,2}º/,
+        ordinal : '%dº'
+    });
+
+    //! moment.js locale configuration
+    //! locale : portuguese (pt)
+    //! author : Jefferson : https://github.com/jalex79
+
+    var pt = moment.defineLocale('pt', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : 'há %s',
+            s : 'segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        ordinalParse: /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : romanian (ro)
+    //! author : Vlad Gurdiga : https://github.com/gurdiga
+    //! author : Valentin Agachi : https://github.com/avaly
+
+    function ro__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+                'mm': 'minute',
+                'hh': 'ore',
+                'dd': 'zile',
+                'MM': 'luni',
+                'yy': 'ani'
+            },
+            separator = ' ';
+        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+            separator = ' de ';
+        }
+        return number + separator + format[key];
+    }
+
+    var ro = moment.defineLocale('ro', {
+        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay: '[azi la] LT',
+            nextDay: '[mâine la] LT',
+            nextWeek: 'dddd [la] LT',
+            lastDay: '[ieri la] LT',
+            lastWeek: '[fosta] dddd [la] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'peste %s',
+            past : '%s în urmă',
+            s : 'câteva secunde',
+            m : 'un minut',
+            mm : ro__relativeTimeWithPlural,
+            h : 'o oră',
+            hh : ro__relativeTimeWithPlural,
+            d : 'o zi',
+            dd : ro__relativeTimeWithPlural,
+            M : 'o lună',
+            MM : ro__relativeTimeWithPlural,
+            y : 'un an',
+            yy : ro__relativeTimeWithPlural
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : russian (ru)
+    //! author : Viktorminator : https://github.com/Viktorminator
+    //! Author : Menelion Elensúle : https://github.com/Oire
+
+    function ru__plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function ru__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+            'hh': 'час_часа_часов',
+            'dd': 'день_дня_дней',
+            'MM': 'месяц_месяца_месяцев',
+            'yy': 'год_года_лет'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'минута' : 'минуту';
+        }
+        else {
+            return number + ' ' + ru__plural(format[key], +number);
+        }
+    }
+    function ru__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+            'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function ru__monthsShortCaseReplace(m, format) {
+        var monthsShort = {
+            'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+            'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return monthsShort[nounCase][m.month()];
+    }
+    function ru__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+            'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
+        },
+        nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var ru = moment.defineLocale('ru', {
+        months : ru__monthsCaseReplace,
+        monthsShort : ru__monthsShortCaseReplace,
+        weekdays : ru__weekdaysCaseReplace,
+        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i],
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., LT',
+            LLLL : 'dddd, D MMMM YYYY г., LT'
+        },
+        calendar : {
+            sameDay: '[Сегодня в] LT',
+            nextDay: '[Завтра в] LT',
+            lastDay: '[Вчера в] LT',
+            nextWeek: function () {
+                return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
+            },
+            lastWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
+                    case 0:
+                        return '[В прошлое] dddd [в] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                        return '[В прошлый] dddd [в] LT';
+                    case 3:
+                    case 5:
+                    case 6:
+                        return '[В прошлую] dddd [в] LT';
+                    }
+                } else {
+                    if (this.day() === 2) {
+                        return '[Во] dddd [в] LT';
+                    } else {
+                        return '[В] dddd [в] LT';
+                    }
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'через %s',
+            past : '%s назад',
+            s : 'несколько секунд',
+            m : ru__relativeTimeWithPlural,
+            mm : ru__relativeTimeWithPlural,
+            h : 'час',
+            hh : ru__relativeTimeWithPlural,
+            d : 'день',
+            dd : ru__relativeTimeWithPlural,
+            M : 'месяц',
+            MM : ru__relativeTimeWithPlural,
+            y : 'год',
+            yy : ru__relativeTimeWithPlural
+        },
+        meridiemParse: /ночи|утра|дня|вечера/i,
+        isPM : function (input) {
+            return /^(дня|вечера)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночи';
+            } else if (hour < 12) {
+                return 'утра';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечера';
+            }
+        },
+        ordinalParse: /\d{1,2}-(й|го|я)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+                return number + '-й';
+            case 'D':
+                return number + '-го';
+            case 'w':
+            case 'W':
+                return number + '-я';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Sinhalese (si)
+    //! author : Sampath Sitinamaluwa : https://github.com/sampathsris
+
+    var si = moment.defineLocale('si', {
+        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
+        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
+        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
+        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
+        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
+        longDateFormat : {
+            LT : 'a h:mm',
+            LTS : 'a h:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY MMMM D',
+            LLL : 'YYYY MMMM D, LT',
+            LLLL : 'YYYY MMMM D [වැනි] dddd, LTS'
+        },
+        calendar : {
+            sameDay : '[අද] LT[ට]',
+            nextDay : '[හෙට] LT[ට]',
+            nextWeek : 'dddd LT[ට]',
+            lastDay : '[ඊයේ] LT[ට]',
+            lastWeek : '[පසුගිය] dddd LT[ට]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sකින්',
+            past : '%sකට පෙර',
+            s : 'තත්පර කිහිපය',
+            m : 'මිනිත්තුව',
+            mm : 'මිනිත්තු %d',
+            h : 'පැය',
+            hh : 'පැය %d',
+            d : 'දිනය',
+            dd : 'දින %d',
+            M : 'මාසය',
+            MM : 'මාස %d',
+            y : 'වසර',
+            yy : 'වසර %d'
+        },
+        ordinalParse: /\d{1,2} වැනි/,
+        ordinal : function (number) {
+            return number + ' වැනි';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'ප.ව.' : 'පස් වරු';
+            } else {
+                return isLower ? 'පෙ.ව.' : 'පෙර වරු';
+            }
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : slovak (sk)
+    //! author : Martin Minka : https://github.com/k2s
+    //! based on work of petrbela : https://github.com/petrbela
+
+    var sk__months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
+        sk__monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
+    function sk__plural(n) {
+        return (n > 1) && (n < 5);
+    }
+    function sk__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':  // a few seconds / in a few seconds / a few seconds ago
+            return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
+        case 'm':  // a minute / in a minute / a minute ago
+            return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
+        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'minúty' : 'minút');
+            } else {
+                return result + 'minútami';
+            }
+            break;
+        case 'h':  // an hour / in an hour / an hour ago
+            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+        case 'hh': // 9 hours / in 9 hours / 9 hours ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'hodiny' : 'hodín');
+            } else {
+                return result + 'hodinami';
+            }
+            break;
+        case 'd':  // a day / in a day / a day ago
+            return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
+        case 'dd': // 9 days / in 9 days / 9 days ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'dni' : 'dní');
+            } else {
+                return result + 'dňami';
+            }
+            break;
+        case 'M':  // a month / in a month / a month ago
+            return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
+        case 'MM': // 9 months / in 9 months / 9 months ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'mesiace' : 'mesiacov');
+            } else {
+                return result + 'mesiacmi';
+            }
+            break;
+        case 'y':  // a year / in a year / a year ago
+            return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
+        case 'yy': // 9 years / in 9 years / 9 years ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'roky' : 'rokov');
+            } else {
+                return result + 'rokmi';
+            }
+            break;
+        }
+    }
+
+    var sk = moment.defineLocale('sk', {
+        months : sk__months,
+        monthsShort : sk__monthsShort,
+        monthsParse : (function (months, monthsShort) {
+            var i, _monthsParse = [];
+            for (i = 0; i < 12; i++) {
+                // use custom parser to solve problem with July (červenec)
+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+            }
+            return _monthsParse;
+        }(sk__months, sk__monthsShort)),
+        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
+        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
+        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[dnes o] LT',
+            nextDay: '[zajtra o] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v nedeľu o] LT';
+                case 1:
+                case 2:
+                    return '[v] dddd [o] LT';
+                case 3:
+                    return '[v stredu o] LT';
+                case 4:
+                    return '[vo štvrtok o] LT';
+                case 5:
+                    return '[v piatok o] LT';
+                case 6:
+                    return '[v sobotu o] LT';
+                }
+            },
+            lastDay: '[včera o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[minulú nedeľu o] LT';
+                case 1:
+                case 2:
+                    return '[minulý] dddd [o] LT';
+                case 3:
+                    return '[minulú stredu o] LT';
+                case 4:
+                case 5:
+                    return '[minulý] dddd [o] LT';
+                case 6:
+                    return '[minulú sobotu o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'pred %s',
+            s : sk__translate,
+            m : sk__translate,
+            mm : sk__translate,
+            h : sk__translate,
+            hh : sk__translate,
+            d : sk__translate,
+            dd : sk__translate,
+            M : sk__translate,
+            MM : sk__translate,
+            y : sk__translate,
+            yy : sk__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : slovenian (sl)
+    //! author : Robert Sedovšek : https://github.com/sedovsek
+
+    function sl__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':
+            return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
+        case 'm':
+            return withoutSuffix ? 'ena minuta' : 'eno minuto';
+        case 'mm':
+            if (number === 1) {
+                result += withoutSuffix ? 'minuta' : 'minuto';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'minute' : 'minutami';
+            } else {
+                result += withoutSuffix || isFuture ? 'minut' : 'minutami';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'ena ura' : 'eno uro';
+        case 'hh':
+            if (number === 1) {
+                result += withoutSuffix ? 'ura' : 'uro';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'uri' : 'urama';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'ure' : 'urami';
+            } else {
+                result += withoutSuffix || isFuture ? 'ur' : 'urami';
+            }
+            return result;
+        case 'd':
+            return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
+        case 'dd':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'dan' : 'dnem';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
+            } else {
+                result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
+            }
+            return result;
+        case 'M':
+            return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
+        case 'MM':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
+            } else {
+                result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
+            }
+            return result;
+        case 'y':
+            return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
+        case 'yy':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'leto' : 'letom';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'leti' : 'letoma';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'leta' : 'leti';
+            } else {
+                result += withoutSuffix || isFuture ? 'let' : 'leti';
+            }
+            return result;
+        }
+    }
+
+    var sl = moment.defineLocale('sl', {
+        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
+        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
+        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
+        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danes ob] LT',
+            nextDay  : '[jutri ob] LT',
+
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v] [nedeljo] [ob] LT';
+                case 3:
+                    return '[v] [sredo] [ob] LT';
+                case 6:
+                    return '[v] [soboto] [ob] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[v] dddd [ob] LT';
+                }
+            },
+            lastDay  : '[včeraj ob] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[prejšnjo] [nedeljo] [ob] LT';
+                case 3:
+                    return '[prejšnjo] [sredo] [ob] LT';
+                case 6:
+                    return '[prejšnjo] [soboto] [ob] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prejšnji] dddd [ob] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'čez %s',
+            past   : 'pred %s',
+            s      : sl__processRelativeTime,
+            m      : sl__processRelativeTime,
+            mm     : sl__processRelativeTime,
+            h      : sl__processRelativeTime,
+            hh     : sl__processRelativeTime,
+            d      : sl__processRelativeTime,
+            dd     : sl__processRelativeTime,
+            M      : sl__processRelativeTime,
+            MM     : sl__processRelativeTime,
+            y      : sl__processRelativeTime,
+            yy     : sl__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Albanian (sq)
+    //! author : Flakërim Ismani : https://github.com/flakerimi
+    //! author: Menelion Elensúle: https://github.com/Oire (tests)
+    //! author : Oerd Cukalla : https://github.com/oerd (fixes)
+
+    var sq = moment.defineLocale('sq', {
+        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
+        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
+        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
+        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
+        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
+        meridiemParse: /PD|MD/,
+        isPM: function (input) {
+            return input.charAt(0) === 'M';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            return hours < 12 ? 'PD' : 'MD';
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Sot në] LT',
+            nextDay : '[Nesër në] LT',
+            nextWeek : 'dddd [në] LT',
+            lastDay : '[Dje në] LT',
+            lastWeek : 'dddd [e kaluar në] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'në %s',
+            past : '%s më parë',
+            s : 'disa sekonda',
+            m : 'një minutë',
+            mm : '%d minuta',
+            h : 'një orë',
+            hh : '%d orë',
+            d : 'një ditë',
+            dd : '%d ditë',
+            M : 'një muaj',
+            MM : '%d muaj',
+            y : 'një vit',
+            yy : '%d vite'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Serbian-cyrillic (sr-cyrl)
+    //! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+    var sr_cyrl__translator = {
+        words: { //Different grammatical cases
+            m: ['један минут', 'једне минуте'],
+            mm: ['минут', 'минуте', 'минута'],
+            h: ['један сат', 'једног сата'],
+            hh: ['сат', 'сата', 'сати'],
+            dd: ['дан', 'дана', 'дана'],
+            MM: ['месец', 'месеца', 'месеци'],
+            yy: ['година', 'године', 'година']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = sr_cyrl__translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + sr_cyrl__translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var sr_cyrl = moment.defineLocale('sr-cyrl', {
+        months: ['јануар', 'фебруар', 'март', 'април', 'мај', 'јун', 'јул', 'август', 'септембар', 'октобар', 'новембар', 'децембар'],
+        monthsShort: ['јан.', 'феб.', 'мар.', 'апр.', 'мај', 'јун', 'јул', 'авг.', 'сеп.', 'окт.', 'нов.', 'дец.'],
+        weekdays: ['недеља', 'понедељак', 'уторак', 'среда', 'четвртак', 'петак', 'субота'],
+        weekdaysShort: ['нед.', 'пон.', 'уто.', 'сре.', 'чет.', 'пет.', 'суб.'],
+        weekdaysMin: ['не', 'по', 'ут', 'ср', 'че', 'пе', 'су'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[данас у] LT',
+            nextDay: '[сутра у] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[у] [недељу] [у] LT';
+                case 3:
+                    return '[у] [среду] [у] LT';
+                case 6:
+                    return '[у] [суботу] [у] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[у] dddd [у] LT';
+                }
+            },
+            lastDay  : '[јуче у] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[прошле] [недеље] [у] LT',
+                    '[прошлог] [понедељка] [у] LT',
+                    '[прошлог] [уторка] [у] LT',
+                    '[прошле] [среде] [у] LT',
+                    '[прошлог] [четвртка] [у] LT',
+                    '[прошлог] [петка] [у] LT',
+                    '[прошле] [суботе] [у] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past   : 'пре %s',
+            s      : 'неколико секунди',
+            m      : sr_cyrl__translator.translate,
+            mm     : sr_cyrl__translator.translate,
+            h      : sr_cyrl__translator.translate,
+            hh     : sr_cyrl__translator.translate,
+            d      : 'дан',
+            dd     : sr_cyrl__translator.translate,
+            M      : 'месец',
+            MM     : sr_cyrl__translator.translate,
+            y      : 'годину',
+            yy     : sr_cyrl__translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Serbian-latin (sr)
+    //! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+    var sr__translator = {
+        words: { //Different grammatical cases
+            m: ['jedan minut', 'jedne minute'],
+            mm: ['minut', 'minute', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mesec', 'meseca', 'meseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = sr__translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + sr__translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var sr = moment.defineLocale('sr', {
+        months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+        monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+        weekdays: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak', 'subota'],
+        weekdaysShort: ['ned.', 'pon.', 'uto.', 'sre.', 'čet.', 'pet.', 'sub.'],
+        weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sutra u] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedelju] [u] LT';
+                case 3:
+                    return '[u] [sredu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedelje] [u] LT',
+                    '[prošlog] [ponedeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'pre %s',
+            s      : 'nekoliko sekundi',
+            m      : sr__translator.translate,
+            mm     : sr__translator.translate,
+            h      : sr__translator.translate,
+            hh     : sr__translator.translate,
+            d      : 'dan',
+            dd     : sr__translator.translate,
+            M      : 'mesec',
+            MM     : sr__translator.translate,
+            y      : 'godinu',
+            yy     : sr__translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : swedish (sv)
+    //! author : Jens Alm : https://github.com/ulmus
+
+    var sv = moment.defineLocale('sv', {
+        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Idag] LT',
+            nextDay: '[Imorgon] LT',
+            lastDay: '[Igår] LT',
+            nextWeek: '[På] dddd LT',
+            lastWeek: '[I] dddd[s] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'för %s sedan',
+            s : 'några sekunder',
+            m : 'en minut',
+            mm : '%d minuter',
+            h : 'en timme',
+            hh : '%d timmar',
+            d : 'en dag',
+            dd : '%d dagar',
+            M : 'en månad',
+            MM : '%d månader',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}(e|a)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'e' :
+                (b === 1) ? 'a' :
+                (b === 2) ? 'a' :
+                (b === 3) ? 'e' : 'e';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : tamil (ta)
+    //! author : Arjunkumar Krishnamoorthy : https://github.com/tk120404
+
+    var ta = moment.defineLocale('ta', {
+        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
+        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
+        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[இன்று] LT',
+            nextDay : '[நாளை] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[நேற்று] LT',
+            lastWeek : '[கடந்த வாரம்] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s இல்',
+            past : '%s முன்',
+            s : 'ஒரு சில விநாடிகள்',
+            m : 'ஒரு நிமிடம்',
+            mm : '%d நிமிடங்கள்',
+            h : 'ஒரு மணி நேரம்',
+            hh : '%d மணி நேரம்',
+            d : 'ஒரு நாள்',
+            dd : '%d நாட்கள்',
+            M : 'ஒரு மாதம்',
+            MM : '%d மாதங்கள்',
+            y : 'ஒரு வருடம்',
+            yy : '%d ஆண்டுகள்'
+        },
+        ordinalParse: /\d{1,2}வது/,
+        ordinal : function (number) {
+            return number + 'வது';
+        },
+        // refer http://ta.wikipedia.org/s/1er1
+        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 2) {
+                return ' யாமம்';
+            } else if (hour < 6) {
+                return ' வைகறை';  // வைகறை
+            } else if (hour < 10) {
+                return ' காலை'; // காலை
+            } else if (hour < 14) {
+                return ' நண்பகல்'; // நண்பகல்
+            } else if (hour < 18) {
+                return ' எற்பாடு'; // எற்பாடு
+            } else if (hour < 22) {
+                return ' மாலை'; // மாலை
+            } else {
+                return ' யாமம்';
+            }
+        },
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'யாமம்') {
+                return hour < 2 ? hour : hour + 12;
+            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
+                return hour;
+            } else if (meridiem === 'நண்பகல்') {
+                return hour >= 10 ? hour : hour + 12;
+            } else {
+                return hour + 12;
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : thai (th)
+    //! author : Kridsada Thanabulpong : https://github.com/sirn
+
+    var th = moment.defineLocale('th', {
+        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
+        monthsShort : 'มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา'.split('_'),
+        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
+        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
+        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
+        longDateFormat : {
+            LT : 'H นาฬิกา m นาที',
+            LTS : 'LT s วินาที',
+            L : 'YYYY/MM/DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY เวลา LT',
+            LLLL : 'วันddddที่ D MMMM YYYY เวลา LT'
+        },
+        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
+        isPM: function (input) {
+            return input === 'หลังเที่ยง';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ก่อนเที่ยง';
+            } else {
+                return 'หลังเที่ยง';
+            }
+        },
+        calendar : {
+            sameDay : '[วันนี้ เวลา] LT',
+            nextDay : '[พรุ่งนี้ เวลา] LT',
+            nextWeek : 'dddd[หน้า เวลา] LT',
+            lastDay : '[เมื่อวานนี้ เวลา] LT',
+            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'อีก %s',
+            past : '%sที่แล้ว',
+            s : 'ไม่กี่วินาที',
+            m : '1 นาที',
+            mm : '%d นาที',
+            h : '1 ชั่วโมง',
+            hh : '%d ชั่วโมง',
+            d : '1 วัน',
+            dd : '%d วัน',
+            M : '1 เดือน',
+            MM : '%d เดือน',
+            y : '1 ปี',
+            yy : '%d ปี'
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Tagalog/Filipino (tl-ph)
+    //! author : Dan Hagman
+
+    var tl_ph = moment.defineLocale('tl-ph', {
+        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
+        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
+        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
+        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
+        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'MM/D/YYYY',
+            LL : 'MMMM D, YYYY',
+            LLL : 'MMMM D, YYYY LT',
+            LLLL : 'dddd, MMMM DD, YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Ngayon sa] LT',
+            nextDay: '[Bukas sa] LT',
+            nextWeek: 'dddd [sa] LT',
+            lastDay: '[Kahapon sa] LT',
+            lastWeek: 'dddd [huling linggo] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'sa loob ng %s',
+            past : '%s ang nakalipas',
+            s : 'ilang segundo',
+            m : 'isang minuto',
+            mm : '%d minuto',
+            h : 'isang oras',
+            hh : '%d oras',
+            d : 'isang araw',
+            dd : '%d araw',
+            M : 'isang buwan',
+            MM : '%d buwan',
+            y : 'isang taon',
+            yy : '%d taon'
+        },
+        ordinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : turkish (tr)
+    //! authors : Erhan Gundogan : https://github.com/erhangundogan,
+    //!           Burak Yiğit Kaya: https://github.com/BYK
+
+    var tr__suffixes = {
+        1: '\'inci',
+        5: '\'inci',
+        8: '\'inci',
+        70: '\'inci',
+        80: '\'inci',
+        2: '\'nci',
+        7: '\'nci',
+        20: '\'nci',
+        50: '\'nci',
+        3: '\'üncü',
+        4: '\'üncü',
+        100: '\'üncü',
+        6: '\'ncı',
+        9: '\'uncu',
+        10: '\'uncu',
+        30: '\'uncu',
+        60: '\'ıncı',
+        90: '\'ıncı'
+    };
+
+    var tr = moment.defineLocale('tr', {
+        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
+        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
+        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
+        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
+        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[yarın saat] LT',
+            nextWeek : '[haftaya] dddd [saat] LT',
+            lastDay : '[dün] LT',
+            lastWeek : '[geçen hafta] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s önce',
+            s : 'birkaç saniye',
+            m : 'bir dakika',
+            mm : '%d dakika',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir yıl',
+            yy : '%d yıl'
+        },
+        ordinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '\'ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (tr__suffixes[a] || tr__suffixes[b] || tr__suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Morocco Central Atlas Tamaziɣt in Latin (tzm-latn)
+    //! author : Abdel Said : https://github.com/abdelsaid
+
+    var tzm_latn = moment.defineLocale('tzm-latn', {
+        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[asdkh g] LT',
+            nextDay: '[aska g] LT',
+            nextWeek: 'dddd [g] LT',
+            lastDay: '[assant g] LT',
+            lastWeek: 'dddd [g] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dadkh s yan %s',
+            past : 'yan %s',
+            s : 'imik',
+            m : 'minuḍ',
+            mm : '%d minuḍ',
+            h : 'saɛa',
+            hh : '%d tassaɛin',
+            d : 'ass',
+            dd : '%d ossan',
+            M : 'ayowr',
+            MM : '%d iyyirn',
+            y : 'asgas',
+            yy : '%d isgasn'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Morocco Central Atlas Tamaziɣt (tzm)
+    //! author : Abdel Said : https://github.com/abdelsaid
+
+    var tzm = moment.defineLocale('tzm', {
+        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS: 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
+            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
+            nextWeek: 'dddd [ⴴ] LT',
+            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
+            lastWeek: 'dddd [ⴴ] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
+            past : 'ⵢⴰⵏ %s',
+            s : 'ⵉⵎⵉⴽ',
+            m : 'ⵎⵉⵏⵓⴺ',
+            mm : '%d ⵎⵉⵏⵓⴺ',
+            h : 'ⵙⴰⵄⴰ',
+            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
+            d : 'ⴰⵙⵙ',
+            dd : '%d oⵙⵙⴰⵏ',
+            M : 'ⴰⵢoⵓⵔ',
+            MM : '%d ⵉⵢⵢⵉⵔⵏ',
+            y : 'ⴰⵙⴳⴰⵙ',
+            yy : '%d ⵉⵙⴳⴰⵙⵏ'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : ukrainian (uk)
+    //! author : zemlanin : https://github.com/zemlanin
+    //! Author : Menelion Elensúle : https://github.com/Oire
+
+    function uk__plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function uk__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'хвилина_хвилини_хвилин',
+            'hh': 'година_години_годин',
+            'dd': 'день_дні_днів',
+            'MM': 'місяць_місяці_місяців',
+            'yy': 'рік_роки_років'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвилина' : 'хвилину';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'година' : 'годину';
+        }
+        else {
+            return number + ' ' + uk__plural(format[key], +number);
+        }
+    }
+    function uk__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_'),
+            'accusative': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_')
+        },
+        nounCase = (/D[oD]? *MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function uk__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
+            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
+            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
+        },
+        nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
+            'accusative' :
+            ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
+                'genitive' :
+                'nominative');
+        return weekdays[nounCase][m.day()];
+    }
+    function processHoursFunction(str) {
+        return function () {
+            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
+        };
+    }
+
+    var uk = moment.defineLocale('uk', {
+        months : uk__monthsCaseReplace,
+        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
+        weekdays : uk__weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY р.',
+            LLL : 'D MMMM YYYY р., LT',
+            LLLL : 'dddd, D MMMM YYYY р., LT'
+        },
+        calendar : {
+            sameDay: processHoursFunction('[Сьогодні '),
+            nextDay: processHoursFunction('[Завтра '),
+            lastDay: processHoursFunction('[Вчора '),
+            nextWeek: processHoursFunction('[У] dddd ['),
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 5:
+                case 6:
+                    return processHoursFunction('[Минулої] dddd [').call(this);
+                case 1:
+                case 2:
+                case 4:
+                    return processHoursFunction('[Минулого] dddd [').call(this);
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past : '%s тому',
+            s : 'декілька секунд',
+            m : uk__relativeTimeWithPlural,
+            mm : uk__relativeTimeWithPlural,
+            h : 'годину',
+            hh : uk__relativeTimeWithPlural,
+            d : 'день',
+            dd : uk__relativeTimeWithPlural,
+            M : 'місяць',
+            MM : uk__relativeTimeWithPlural,
+            y : 'рік',
+            yy : uk__relativeTimeWithPlural
+        },
+        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
+        meridiemParse: /ночі|ранку|дня|вечора/,
+        isPM: function (input) {
+            return /^(дня|вечора)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночі';
+            } else if (hour < 12) {
+                return 'ранку';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечора';
+            }
+        },
+        ordinalParse: /\d{1,2}-(й|го)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+            case 'w':
+            case 'W':
+                return number + '-й';
+            case 'D':
+                return number + '-го';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : uzbek (uz)
+    //! author : Sardor Muminov : https://github.com/muminoff
+
+    var uz = moment.defineLocale('uz', {
+        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
+        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
+        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'D MMMM YYYY, dddd LT'
+        },
+        calendar : {
+            sameDay : '[Бугун соат] LT [да]',
+            nextDay : '[Эртага] LT [да]',
+            nextWeek : 'dddd [куни соат] LT [да]',
+            lastDay : '[Кеча соат] LT [да]',
+            lastWeek : '[Утган] dddd [куни соат] LT [да]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'Якин %s ичида',
+            past : 'Бир неча %s олдин',
+            s : 'фурсат',
+            m : 'бир дакика',
+            mm : '%d дакика',
+            h : 'бир соат',
+            hh : '%d соат',
+            d : 'бир кун',
+            dd : '%d кун',
+            M : 'бир ой',
+            MM : '%d ой',
+            y : 'бир йил',
+            yy : '%d йил'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : vietnamese (vi)
+    //! author : Bang Nguyen : https://github.com/bangnk
+
+    var vi = moment.defineLocale('vi', {
+        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
+        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
+        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
+        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM [năm] YYYY',
+            LLL : 'D MMMM [năm] YYYY LT',
+            LLLL : 'dddd, D MMMM [năm] YYYY LT',
+            l : 'DD/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY LT',
+            llll : 'ddd, D MMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Hôm nay lúc] LT',
+            nextDay: '[Ngày mai lúc] LT',
+            nextWeek: 'dddd [tuần tới lúc] LT',
+            lastDay: '[Hôm qua lúc] LT',
+            lastWeek: 'dddd [tuần rồi lúc] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s tới',
+            past : '%s trước',
+            s : 'vài giây',
+            m : 'một phút',
+            mm : '%d phút',
+            h : 'một giờ',
+            hh : '%d giờ',
+            d : 'một ngày',
+            dd : '%d ngày',
+            M : 'một tháng',
+            MM : '%d tháng',
+            y : 'một năm',
+            yy : '%d năm'
+        },
+        ordinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : chinese (zh-cn)
+    //! author : suupic : https://github.com/suupic
+    //! author : Zeno Zeng : https://github.com/zenozeng
+
+    var zh_cn = moment.defineLocale('zh-cn', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah点mm分',
+            LTS : 'Ah点m分s秒',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日LT',
+            LLLL : 'YYYY年MMMD日ddddLT',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日LT',
+            llll : 'YYYY年MMMD日ddddLT'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : function () {
+                return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+            },
+            nextDay : function () {
+                return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+            },
+            lastDay : function () {
+                return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+            },
+            nextWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            lastWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = moment().startOf('week');
+                prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            sameElse : 'LL'
+        },
+        ordinalParse: /\d{1,2}(日|月|周)/,
+        ordinal : function (number, period) {
+            switch (period) {
+            case 'd':
+            case 'D':
+            case 'DDD':
+                return number + '日';
+            case 'M':
+                return number + '月';
+            case 'w':
+            case 'W':
+                return number + '周';
+            default:
+                return number;
+            }
+        },
+        relativeTime : {
+            future : '%s内',
+            past : '%s前',
+            s : '几秒',
+            m : '1 分钟',
+            mm : '%d 分钟',
+            h : '1 小时',
+            hh : '%d 小时',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 个月',
+            MM : '%d 个月',
+            y : '1 年',
+            yy : '%d 年'
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : traditional chinese (zh-tw)
+    //! author : Ben : https://github.com/ben-lin
+
+    var zh_tw = moment.defineLocale('zh-tw', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah點mm分',
+            LTS : 'Ah點m分s秒',
+            L : 'YYYY年MMMD日',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日LT',
+            LLLL : 'YYYY年MMMD日ddddLT',
+            l : 'YYYY年MMMD日',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日LT',
+            llll : 'YYYY年MMMD日ddddLT'
+        },
+        meridiemParse: /早上|上午|中午|下午|晚上/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '早上' || meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '中午') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天]LT',
+            nextDay : '[明天]LT',
+            nextWeek : '[下]ddddLT',
+            lastDay : '[昨天]LT',
+            lastWeek : '[上]ddddLT',
+            sameElse : 'L'
+        },
+        ordinalParse: /\d{1,2}(日|月|週)/,
+        ordinal : function (number, period) {
+            switch (period) {
+            case 'd' :
+            case 'D' :
+            case 'DDD' :
+                return number + '日';
+            case 'M' :
+                return number + '月';
+            case 'w' :
+            case 'W' :
+                return number + '週';
+            default :
+                return number;
+            }
+        },
+        relativeTime : {
+            future : '%s內',
+            past : '%s前',
+            s : '幾秒',
+            m : '一分鐘',
+            mm : '%d分鐘',
+            h : '一小時',
+            hh : '%d小時',
+            d : '一天',
+            dd : '%d天',
+            M : '一個月',
+            MM : '%d個月',
+            y : '一年',
+            yy : '%d年'
+        }
+    });
+
+
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/min/locales.min.js b/turtles/app/lib/bower_components/momentjs/min/locales.min.js
new file mode 100644
index 000000000..a691d5e2f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/min/locales.min.js
@@ -0,0 +1,77 @@
+!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?b(require("../moment")):"function"==typeof define&&define.amd?define(["moment"],b):b(a.moment)}(this,function(a){"use strict";
+//! moment.js locale configuration
+//! locale : belarusian (be)
+//! author : Dmitry Demidov : https://github.com/demidov91
+//! author: Praleska: http://praleska.pro/
+//! Author : Menelion Elensúle : https://github.com/Oire
+function b(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(a,c,d){var e={mm:c?"хвіліна_хвіліны_хвілін":"хвіліну_хвіліны_хвілін",hh:c?"гадзіна_гадзіны_гадзін":"гадзіну_гадзіны_гадзін",dd:"дзень_дні_дзён",MM:"месяц_месяцы_месяцаў",yy:"год_гады_гадоў"};return"m"===d?c?"хвіліна":"хвіліну":"h"===d?c?"гадзіна":"гадзіну":a+" "+b(e[d],+a)}function d(a,b){var c={nominative:"студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань".split("_"),accusative:"студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function e(a,b){var c={nominative:"нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота".split("_"),accusative:"нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу".split("_")},d=/\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/.test(b)?"accusative":"nominative";return c[d][a.day()]}
+//! moment.js locale configuration
+//! locale : breton (br)
+//! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou
+function f(a,b,c){var d={mm:"munutenn",MM:"miz",dd:"devezh"};return a+" "+i(d[c],a)}function g(a){switch(h(a)){case 1:case 3:case 4:case 5:case 9:return a+" bloaz";default:return a+" vloaz"}}function h(a){return a>9?h(a%10):a}function i(a,b){return 2===b?j(a):a}function j(a){var b={m:"v",b:"v",d:"z"};return void 0===b[a.charAt(0)]?a:b[a.charAt(0)]+a.substring(1)}
+//! moment.js locale configuration
+//! locale : bosnian (bs)
+//! author : Nedim Cholich : https://github.com/frontyard
+//! based on (hr) translation by Bojan Marković
+function k(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}function l(a){return a>1&&5>a&&1!==~~(a/10)}function m(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"pár sekund":"pár sekundami";case"m":return b?"minuta":d?"minutu":"minutou";case"mm":return b||d?e+(l(a)?"minuty":"minut"):e+"minutami";break;case"h":return b?"hodina":d?"hodinu":"hodinou";case"hh":return b||d?e+(l(a)?"hodiny":"hodin"):e+"hodinami";break;case"d":return b||d?"den":"dnem";case"dd":return b||d?e+(l(a)?"dny":"dní"):e+"dny";break;case"M":return b||d?"měsíc":"měsícem";case"MM":return b||d?e+(l(a)?"měsíce":"měsíců"):e+"měsíci";break;case"y":return b||d?"rok":"rokem";case"yy":return b||d?e+(l(a)?"roky":"let"):e+"lety"}}
+//! moment.js locale configuration
+//! locale : austrian german (de-at)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+//! author : Martin Groller : https://github.com/MadMG
+function n(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}
+//! moment.js locale configuration
+//! locale : german (de)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+function o(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}
+//! moment.js locale configuration
+//! locale : estonian (et)
+//! author : Henry Kehlmann : https://github.com/madhenry
+//! improvements : Illimar Tambek : https://github.com/ragulka
+function p(a,b,c,d){var e={s:["mõne sekundi","mõni sekund","paar sekundit"],m:["ühe minuti","üks minut"],mm:[a+" minuti",a+" minutit"],h:["ühe tunni","tund aega","üks tund"],hh:[a+" tunni",a+" tundi"],d:["ühe päeva","üks päev"],M:["kuu aja","kuu aega","üks kuu"],MM:[a+" kuu",a+" kuud"],y:["ühe aasta","aasta","üks aasta"],yy:[a+" aasta",a+" aastat"]};return b?e[c][2]?e[c][2]:e[c][1]:d?e[c][0]:e[c][1]}function q(a,b,c,d){var e="";switch(c){case"s":return d?"muutaman sekunnin":"muutama sekunti";case"m":return d?"minuutin":"minuutti";case"mm":e=d?"minuutin":"minuuttia";break;case"h":return d?"tunnin":"tunti";case"hh":e=d?"tunnin":"tuntia";break;case"d":return d?"päivän":"päivä";case"dd":e=d?"päivän":"päivää";break;case"M":return d?"kuukauden":"kuukausi";case"MM":e=d?"kuukauden":"kuukautta";break;case"y":return d?"vuoden":"vuosi";case"yy":e=d?"vuoden":"vuotta"}return e=r(a,d)+" "+e}function r(a,b){return 10>a?b?ya[a]:xa[a]:a}
+//! moment.js locale configuration
+//! locale : hrvatski (hr)
+//! author : Bojan Marković : https://github.com/bmarkovic
+function s(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}function t(a,b,c,d){var e=a;switch(c){case"s":return d||b?"néhány másodperc":"néhány másodperce";case"m":return"egy"+(d||b?" perc":" perce");case"mm":return e+(d||b?" perc":" perce");case"h":return"egy"+(d||b?" óra":" órája");case"hh":return e+(d||b?" óra":" órája");case"d":return"egy"+(d||b?" nap":" napja");case"dd":return e+(d||b?" nap":" napja");case"M":return"egy"+(d||b?" hónap":" hónapja");case"MM":return e+(d||b?" hónap":" hónapja");case"y":return"egy"+(d||b?" év":" éve");case"yy":return e+(d||b?" év":" éve")}return""}function u(a){return(a?"":"[múlt] ")+"["+Da[this.day()]+"] LT[-kor]"}
+//! moment.js locale configuration
+//! locale : Armenian (hy-am)
+//! author : Armendarabyan : https://github.com/armendarabyan
+function v(a,b){var c={nominative:"հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր".split("_"),accusative:"հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function w(a,b){var c="հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ".split("_");return c[a.month()]}function x(a,b){var c="կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ".split("_");return c[a.day()]}
+//! moment.js locale configuration
+//! locale : icelandic (is)
+//! author : Hinrik Örn Sigurðsson : https://github.com/hinrik
+function y(a){return a%100===11?!0:a%10===1?!1:!0}function z(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"nokkrar sekúndur":"nokkrum sekúndum";case"m":return b?"mínúta":"mínútu";case"mm":return y(a)?e+(b||d?"mínútur":"mínútum"):b?e+"mínúta":e+"mínútu";case"hh":return y(a)?e+(b||d?"klukkustundir":"klukkustundum"):e+"klukkustund";case"d":return b?"dagur":d?"dag":"degi";case"dd":return y(a)?b?e+"dagar":e+(d?"daga":"dögum"):b?e+"dagur":e+(d?"dag":"degi");case"M":return b?"mánuður":d?"mánuð":"mánuði";case"MM":return y(a)?b?e+"mánuðir":e+(d?"mánuði":"mánuðum"):b?e+"mánuður":e+(d?"mánuð":"mánuði");case"y":return b||d?"ár":"ári";case"yy":return y(a)?e+(b||d?"ár":"árum"):e+(b||d?"ár":"ári")}}
+//! moment.js locale configuration
+//! locale : Georgian (ka)
+//! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
+function A(a,b){var c={nominative:"იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი".split("_"),accusative:"იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს".split("_")},d=/D[oD] *MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function B(a,b){var c={nominative:"კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი".split("_"),accusative:"კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს".split("_")},d=/(წინა|შემდეგ)/.test(b)?"accusative":"nominative";return c[d][a.day()]}
+//! moment.js locale configuration
+//! locale : Luxembourgish (lb)
+//! author : mweimerskirch : https://github.com/mweimerskirch, David Raison : https://github.com/kwisatz
+function C(a,b,c,d){var e={m:["eng Minutt","enger Minutt"],h:["eng Stonn","enger Stonn"],d:["een Dag","engem Dag"],M:["ee Mount","engem Mount"],y:["ee Joer","engem Joer"]};return b?e[c][0]:e[c][1]}function D(a){var b=a.substr(0,a.indexOf(" "));return F(b)?"a "+a:"an "+a}function E(a){var b=a.substr(0,a.indexOf(" "));return F(b)?"viru "+a:"virun "+a}function F(a){if(a=parseInt(a,10),isNaN(a))return!1;if(0>a)return!0;if(10>a)return a>=4&&7>=a?!0:!1;if(100>a){var b=a%10,c=a/10;return F(0===b?c:b)}if(1e4>a){for(;a>=10;)a/=10;return F(a)}return a/=1e3,F(a)}function G(a,b,c,d){return b?"kelios sekundės":d?"kelių sekundžių":"kelias sekundes"}function H(a,b,c,d){return b?J(c)[0]:d?J(c)[1]:J(c)[2]}function I(a){return a%10===0||a>10&&20>a}function J(a){return Ea[a].split("_")}function K(a,b,c,d){var e=a+" ";return 1===a?e+H(a,b,c[0],d):b?e+(I(a)?J(c)[1]:J(c)[0]):d?e+J(c)[1]:e+(I(a)?J(c)[1]:J(c)[2])}function L(a,b){var c=-1===b.indexOf("dddd HH:mm"),d=Fa[a.day()];return c?d:d.substring(0,d.length-2)+"į"}function M(a,b,c){return c?b%10===1&&11!==b?a[2]:a[3]:b%10===1&&11!==b?a[0]:a[1]}function N(a,b,c){return a+" "+M(Ga[c],a,b)}function O(a,b,c){return M(Ga[c],a,b)}function P(a,b){return b?"dažas sekundes":"dažām sekundēm"}function Q(a){return 5>a%10&&a%10>1&&~~(a/10)%10!==1}function R(a,b,c){var d=a+" ";switch(c){case"m":return b?"minuta":"minutę";case"mm":return d+(Q(a)?"minuty":"minut");case"h":return b?"godzina":"godzinę";case"hh":return d+(Q(a)?"godziny":"godzin");case"MM":return d+(Q(a)?"miesiące":"miesięcy");case"yy":return d+(Q(a)?"lata":"lat")}}
+//! moment.js locale configuration
+//! locale : romanian (ro)
+//! author : Vlad Gurdiga : https://github.com/gurdiga
+//! author : Valentin Agachi : https://github.com/avaly
+function S(a,b,c){var d={mm:"minute",hh:"ore",dd:"zile",MM:"luni",yy:"ani"},e=" ";return(a%100>=20||a>=100&&a%100===0)&&(e=" de "),a+e+d[c]}
+//! moment.js locale configuration
+//! locale : russian (ru)
+//! author : Viktorminator : https://github.com/Viktorminator
+//! Author : Menelion Elensúle : https://github.com/Oire
+function T(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function U(a,b,c){var d={mm:b?"минута_минуты_минут":"минуту_минуты_минут",hh:"час_часа_часов",dd:"день_дня_дней",MM:"месяц_месяца_месяцев",yy:"год_года_лет"};return"m"===c?b?"минута":"минуту":a+" "+T(d[c],+a)}function V(a,b){var c={nominative:"январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),accusative:"января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function W(a,b){var c={nominative:"янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек".split("_"),accusative:"янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function X(a,b){var c={nominative:"воскресенье_понедельник_вторник_среда_четверг_пятница_суббота".split("_"),accusative:"воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу".split("_")},d=/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/.test(b)?"accusative":"nominative";return c[d][a.day()]}function Y(a){return a>1&&5>a}function Z(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"pár sekúnd":"pár sekundami";case"m":return b?"minúta":d?"minútu":"minútou";case"mm":return b||d?e+(Y(a)?"minúty":"minút"):e+"minútami";break;case"h":return b?"hodina":d?"hodinu":"hodinou";case"hh":return b||d?e+(Y(a)?"hodiny":"hodín"):e+"hodinami";break;case"d":return b||d?"deň":"dňom";case"dd":return b||d?e+(Y(a)?"dni":"dní"):e+"dňami";break;case"M":return b||d?"mesiac":"mesiacom";case"MM":return b||d?e+(Y(a)?"mesiace":"mesiacov"):e+"mesiacmi";break;case"y":return b||d?"rok":"rokom";case"yy":return b||d?e+(Y(a)?"roky":"rokov"):e+"rokmi"}}
+//! moment.js locale configuration
+//! locale : slovenian (sl)
+//! author : Robert Sedovšek : https://github.com/sedovsek
+function $(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"nekaj sekund":"nekaj sekundami";case"m":return b?"ena minuta":"eno minuto";case"mm":return e+=1===a?b?"minuta":"minuto":2===a?b||d?"minuti":"minutama":5>a?b||d?"minute":"minutami":b||d?"minut":"minutami";case"h":return b?"ena ura":"eno uro";case"hh":return e+=1===a?b?"ura":"uro":2===a?b||d?"uri":"urama":5>a?b||d?"ure":"urami":b||d?"ur":"urami";case"d":return b||d?"en dan":"enim dnem";case"dd":return e+=1===a?b||d?"dan":"dnem":2===a?b||d?"dni":"dnevoma":b||d?"dni":"dnevi";case"M":return b||d?"en mesec":"enim mesecem";case"MM":return e+=1===a?b||d?"mesec":"mesecem":2===a?b||d?"meseca":"mesecema":5>a?b||d?"mesece":"meseci":b||d?"mesecev":"meseci";case"y":return b||d?"eno leto":"enim letom";case"yy":return e+=1===a?b||d?"leto":"letom":2===a?b||d?"leti":"letoma":5>a?b||d?"leta":"leti":b||d?"let":"leti"}}
+//! moment.js locale configuration
+//! locale : ukrainian (uk)
+//! author : zemlanin : https://github.com/zemlanin
+//! Author : Menelion Elensúle : https://github.com/Oire
+function _(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function aa(a,b,c){var d={mm:"хвилина_хвилини_хвилин",hh:"година_години_годин",dd:"день_дні_днів",MM:"місяць_місяці_місяців",yy:"рік_роки_років"};return"m"===c?b?"хвилина":"хвилину":"h"===c?b?"година":"годину":a+" "+_(d[c],+a)}function ba(a,b){var c={nominative:"січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень".split("_"),accusative:"січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня".split("_")},d=/D[oD]? *MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function ca(a,b){var c={nominative:"неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота".split("_"),accusative:"неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу".split("_"),genitive:"неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи".split("_")},d=/(\[[ВвУу]\]) ?dddd/.test(b)?"accusative":/\[?(?:минулої|наступної)? ?\] ?dddd/.test(b)?"genitive":"nominative";return c[d][a.day()]}function da(a){return function(){return a+"о"+(11===this.hours()?"б":"")+"] LT"}}
+//! moment.js locale configuration
+//! locale : afrikaans (af)
+//! author : Werner Mollentze : https://github.com/wernerm
+{var ea=(a.defineLocale("af",{months:"Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),weekdays:"Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),weekdaysShort:"Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),weekdaysMin:"So_Ma_Di_Wo_Do_Vr_Sa".split("_"),meridiemParse:/vm|nm/i,isPM:function(a){return/^nm$/i.test(a)},meridiem:function(a,b,c){return 12>a?c?"vm":"VM":c?"nm":"NM"},longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Vandag om] LT",nextDay:"[Môre om] LT",nextWeek:"dddd [om] LT",lastDay:"[Gister om] LT",lastWeek:"[Laas] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oor %s",past:"%s gelede",s:"'n paar sekondes",m:"'n minuut",mm:"%d minute",h:"'n uur",hh:"%d ure",d:"'n dag",dd:"%d dae",M:"'n maand",MM:"%d maande",y:"'n jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}}),a.defineLocale("ar-ma",{months:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdays:"الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:6,doy:12}}),{1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"}),fa={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},ga=(a.defineLocale("ar-sa",{months:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},preparse:function(a){return a.replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return fa[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return ea[a]}).replace(/,/g,"،")},week:{dow:6,doy:12}}),a.defineLocale("ar-tn",{months:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:1,doy:4}}),{1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"}),ha={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},ia=function(a){return 0===a?0:1===a?1:2===a?2:a%100>=3&&10>=a%100?3:a%100>=11?4:5},ja={s:["أقل من ثانية","ثانية واحدة",["ثانيتان","ثانيتين"],"%d ثوان","%d ثانية","%d ثانية"],m:["أقل من دقيقة","دقيقة واحدة",["دقيقتان","دقيقتين"],"%d دقائق","%d دقيقة","%d دقيقة"],h:["أقل من ساعة","ساعة واحدة",["ساعتان","ساعتين"],"%d ساعات","%d ساعة","%d ساعة"],d:["أقل من يوم","يوم واحد",["يومان","يومين"],"%d أيام","%d يومًا","%d يوم"],M:["أقل من شهر","شهر واحد",["شهران","شهرين"],"%d أشهر","%d شهرا","%d شهر"],y:["أقل من عام","عام واحد",["عامان","عامين"],"%d أعوام","%d عامًا","%d عام"]},ka=function(a){return function(b,c,d,e){var f=ia(b),g=ja[a][ia(b)];return 2===f&&(g=g[c?0:1]),g.replace(/%d/i,b)}},la=["كانون الثاني يناير","شباط فبراير","آذار مارس","نيسان أبريل","أيار مايو","حزيران يونيو","تموز يوليو","آب أغسطس","أيلول سبتمبر","تشرين الأول أكتوبر","تشرين الثاني نوفمبر","كانون الأول ديسمبر"],ma=(a.defineLocale("ar",{months:la,monthsShort:la,weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/‏M/‏YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم عند الساعة] LT",nextDay:"[غدًا عند الساعة] LT",nextWeek:"dddd [عند الساعة] LT",lastDay:"[أمس عند الساعة] LT",lastWeek:"dddd [عند الساعة] LT",sameElse:"L"},relativeTime:{future:"بعد %s",past:"منذ %s",s:ka("s"),m:ka("m"),mm:ka("m"),h:ka("h"),hh:ka("h"),d:ka("d"),dd:ka("d"),M:ka("M"),MM:ka("M"),y:ka("y"),yy:ka("y")},preparse:function(a){return a.replace(/\u200f/g,"").replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return ha[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return ga[a]}).replace(/,/g,"،")},week:{dow:6,doy:12}}),{1:"-inci",5:"-inci",8:"-inci",70:"-inci",80:"-inci",2:"-nci",7:"-nci",20:"-nci",50:"-nci",3:"-üncü",4:"-üncü",100:"-üncü",6:"-ncı",9:"-uncu",10:"-uncu",30:"-uncu",60:"-ıncı",90:"-ıncı"}),na=(a.defineLocale("az",{months:"yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr".split("_"),monthsShort:"yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek".split("_"),weekdays:"Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə".split("_"),weekdaysShort:"Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən".split("_"),weekdaysMin:"Bz_BE_ÇA_Çə_CA_Cü_Şə".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[sabah saat] LT",nextWeek:"[gələn həftə] dddd [saat] LT",lastDay:"[dünən] LT",lastWeek:"[keçən həftə] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s əvvəl",s:"birneçə saniyyə",m:"bir dəqiqə",mm:"%d dəqiqə",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir il",yy:"%d il"},meridiemParse:/gecə|səhər|gündüz|axşam/,isPM:function(a){return/^(gündüz|axşam)$/.test(a)},meridiem:function(a,b,c){return 4>a?"gecə":12>a?"səhər":17>a?"gündüz":"axşam"},ordinalParse:/\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,ordinal:function(a){if(0===a)return a+"-ıncı";var b=a%10,c=a%100-b,d=a>=100?100:null;return a+(ma[b]||ma[c]||ma[d])},week:{dow:1,doy:7}}),a.defineLocale("be",{months:d,monthsShort:"студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж".split("_"),weekdays:e,weekdaysShort:"нд_пн_ат_ср_чц_пт_сб".split("_"),weekdaysMin:"нд_пн_ат_ср_чц_пт_сб".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., LT",LLLL:"dddd, D MMMM YYYY г., LT"},calendar:{sameDay:"[Сёння ў] LT",nextDay:"[Заўтра ў] LT",lastDay:"[Учора ў] LT",nextWeek:function(){return"[У] dddd [ў] LT"},lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return"[У мінулую] dddd [ў] LT";case 1:case 2:case 4:return"[У мінулы] dddd [ў] LT"}},sameElse:"L"},relativeTime:{future:"праз %s",past:"%s таму",s:"некалькі секунд",m:c,mm:c,h:c,hh:c,d:"дзень",dd:c,M:"месяц",MM:c,y:"год",yy:c},meridiemParse:/ночы|раніцы|дня|вечара/,isPM:function(a){return/^(дня|вечара)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночы":12>a?"раніцы":17>a?"дня":"вечара"},ordinalParse:/\d{1,2}-(і|ы|га)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a%10!==2&&a%10!==3||a%100===12||a%100===13?a+"-ы":a+"-і";case"D":return a+"-га";default:return a}},week:{dow:1,doy:7}}),a.defineLocale("bg",{months:"януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември".split("_"),monthsShort:"янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек".split("_"),weekdays:"неделя_понеделник_вторник_сряда_четвъртък_петък_събота".split("_"),weekdaysShort:"нед_пон_вто_сря_чет_пет_съб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Днес в] LT",nextDay:"[Утре в] LT",nextWeek:"dddd [в] LT",lastDay:"[Вчера в] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[В изминалата] dddd [в] LT";case 1:case 2:case 4:case 5:return"[В изминалия] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"след %s",past:"преди %s",s:"няколко секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дни",M:"месец",MM:"%d месеца",y:"година",yy:"%d години"},ordinalParse:/\d{1,2}-(ев|ен|ти|ви|ри|ми)/,ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}}),{1:"১",2:"২",3:"৩",4:"৪",5:"৫",6:"৬",7:"৭",8:"৮",9:"৯",0:"০"}),oa={"১":"1","২":"2","৩":"3","৪":"4","৫":"5","৬":"6","৭":"7","৮":"8","৯":"9","০":"0"},pa=(a.defineLocale("bn",{months:"জানুয়ারী_ফেবুয়ারী_মার্চ_এপ্রিল_মে_জুন_জুলাই_অগাস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর".split("_"),monthsShort:"জানু_ফেব_মার্চ_এপর_মে_জুন_জুল_অগ_সেপ্ট_অক্টো_নভ_ডিসেম্".split("_"),weekdays:"রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পত্তিবার_শুক্রুবার_শনিবার".split("_"),weekdaysShort:"রবি_সোম_মঙ্গল_বুধ_বৃহস্পত্তি_শুক্রু_শনি".split("_"),weekdaysMin:"রব_সম_মঙ্গ_বু_ব্রিহ_শু_শনি".split("_"),longDateFormat:{LT:"A h:mm সময়",LTS:"A h:mm:ss সময়",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[আজ] LT",nextDay:"[আগামীকাল] LT",nextWeek:"dddd, LT",lastDay:"[গতকাল] LT",lastWeek:"[গত] dddd, LT",sameElse:"L"},relativeTime:{future:"%s পরে",past:"%s আগে",s:"কএক সেকেন্ড",m:"এক মিনিট",mm:"%d মিনিট",h:"এক ঘন্টা",hh:"%d ঘন্টা",d:"এক দিন",dd:"%d দিন",M:"এক মাস",MM:"%d মাস",y:"এক বছর",yy:"%d বছর"},preparse:function(a){return a.replace(/[১২৩৪৫৬৭৮৯০]/g,function(a){return oa[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return na[a]})},meridiemParse:/রাত|শকাল|দুপুর|বিকেল|রাত/,isPM:function(a){return/^(দুপুর|বিকেল|রাত)$/.test(a)},meridiem:function(a,b,c){return 4>a?"রাত":10>a?"শকাল":17>a?"দুপুর":20>a?"বিকেল":"রাত"},week:{dow:0,doy:6}}),{1:"༡",2:"༢",3:"༣",4:"༤",5:"༥",6:"༦",7:"༧",8:"༨",9:"༩",0:"༠"}),qa={"༡":"1","༢":"2","༣":"3","༤":"4","༥":"5","༦":"6","༧":"7","༨":"8","༩":"9","༠":"0"},ra=(a.defineLocale("bo",{months:"ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),monthsShort:"ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),weekdays:"གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་".split("_"),weekdaysShort:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),weekdaysMin:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),longDateFormat:{LT:"A h:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[དི་རིང] LT",nextDay:"[སང་ཉིན] LT",nextWeek:"[བདུན་ཕྲག་རྗེས་མ], LT",lastDay:"[ཁ་སང] LT",lastWeek:"[བདུན་ཕྲག་མཐའ་མ] dddd, LT",sameElse:"L"},relativeTime:{future:"%s ལ་",past:"%s སྔན་ལ",s:"ལམ་སང",m:"སྐར་མ་གཅིག",mm:"%d སྐར་མ",h:"ཆུ་ཚོད་གཅིག",hh:"%d ཆུ་ཚོད",d:"ཉིན་གཅིག",dd:"%d ཉིན་",M:"ཟླ་བ་གཅིག",MM:"%d ཟླ་བ",y:"ལོ་གཅིག",yy:"%d ལོ"},preparse:function(a){return a.replace(/[༡༢༣༤༥༦༧༨༩༠]/g,function(a){return qa[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return pa[a]})},meridiemParse:/མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,isPM:function(a){return/^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(a)},meridiem:function(a,b,c){return 4>a?"མཚན་མོ":10>a?"ཞོགས་ཀས":17>a?"ཉིན་གུང":20>a?"དགོང་དག":"མཚན་མོ"},week:{dow:0,doy:6}}),a.defineLocale("br",{months:"Genver_C'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"),monthsShort:"Gen_C'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"),weekdays:"Sul_Lun_Meurzh_Merc'her_Yaou_Gwener_Sadorn".split("_"),weekdaysShort:"Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"),weekdaysMin:"Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"),longDateFormat:{LT:"h[e]mm A",LTS:"h[e]mm:ss A",L:"DD/MM/YYYY",LL:"D [a viz] MMMM YYYY",LLL:"D [a viz] MMMM YYYY LT",LLLL:"dddd, D [a viz] MMMM YYYY LT"},calendar:{sameDay:"[Hiziv da] LT",nextDay:"[Warc'hoazh da] LT",nextWeek:"dddd [da] LT",lastDay:"[Dec'h da] LT",lastWeek:"dddd [paset da] LT",sameElse:"L"},relativeTime:{future:"a-benn %s",past:"%s 'zo",s:"un nebeud segondennoù",m:"ur vunutenn",mm:f,h:"un eur",hh:"%d eur",d:"un devezh",dd:f,M:"ur miz",MM:f,y:"ur bloaz",yy:g},ordinalParse:/\d{1,2}(añ|vet)/,ordinal:function(a){var b=1===a?"añ":"vet";return a+b},week:{dow:1,doy:4}}),a.defineLocale("bs",{months:"januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.".split("_"),weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[jučer u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:k,mm:k,h:k,hh:k,d:"dan",dd:k,M:"mjesec",MM:k,y:"godinu",yy:k},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),a.defineLocale("ca",{months:"gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),monthsShort:"gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.".split("_"),weekdays:"diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dt._dc._dj._dv._ds.".split("_"),weekdaysMin:"Dg_Dl_Dt_Dc_Dj_Dv_Ds".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:function(){return"[avui a "+(1!==this.hours()?"les":"la")+"] LT"},nextDay:function(){return"[demà a "+(1!==this.hours()?"les":"la")+"] LT"},nextWeek:function(){return"dddd [a "+(1!==this.hours()?"les":"la")+"] LT"},lastDay:function(){return"[ahir a "+(1!==this.hours()?"les":"la")+"] LT"},lastWeek:function(){return"[el] dddd [passat a "+(1!==this.hours()?"les":"la")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"fa %s",s:"uns segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},ordinalParse:/\d{1,2}(r|n|t|è|a)/,ordinal:function(a,b){var c=1===a?"r":2===a?"n":3===a?"r":4===a?"t":"è";return("w"===b||"W"===b)&&(c="a"),a+c},week:{dow:1,doy:4}}),"leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec".split("_")),sa="led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro".split("_"),ta=(a.defineLocale("cs",{months:ra,monthsShort:sa,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(ra,sa),weekdays:"neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota".split("_"),weekdaysShort:"ne_po_út_st_čt_pá_so".split("_"),weekdaysMin:"ne_po_út_st_čt_pá_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd D. MMMM YYYY LT"},calendar:{sameDay:"[dnes v] LT",nextDay:"[zítra v] LT",nextWeek:function(){switch(this.day()){case 0:return"[v neděli v] LT";case 1:case 2:return"[v] dddd [v] LT";case 3:return"[ve středu v] LT";case 4:return"[ve čtvrtek v] LT";case 5:return"[v pátek v] LT";case 6:return"[v sobotu v] LT"}},lastDay:"[včera v] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulou neděli v] LT";case 1:case 2:return"[minulé] dddd [v] LT";case 3:return"[minulou středu v] LT";case 4:case 5:return"[minulý] dddd [v] LT";case 6:return"[minulou sobotu v] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"před %s",s:m,m:m,mm:m,h:m,hh:m,d:m,dd:m,M:m,MM:m,y:m,yy:m},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("cv",{months:"кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав".split("_"),monthsShort:"кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш".split("_"),weekdays:"вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун".split("_"),weekdaysShort:"выр_тун_ытл_юн_кӗҫ_эрн_шӑм".split("_"),weekdaysMin:"вр_тн_ыт_юн_кҫ_эр_шм".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD-MM-YYYY",LL:"YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]",LLL:"YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT",LLLL:"dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT"},calendar:{sameDay:"[Паян] LT [сехетре]",nextDay:"[Ыран] LT [сехетре]",lastDay:"[Ӗнер] LT [сехетре]",nextWeek:"[Ҫитес] dddd LT [сехетре]",lastWeek:"[Иртнӗ] dddd LT [сехетре]",sameElse:"L"},relativeTime:{future:function(a){var b=/сехет$/i.exec(a)?"рен":/ҫул$/i.exec(a)?"тан":"ран";return a+b},past:"%s каялла",s:"пӗр-ик ҫеккунт",m:"пӗр минут",mm:"%d минут",h:"пӗр сехет",hh:"%d сехет",d:"пӗр кун",dd:"%d кун",M:"пӗр уйӑх",MM:"%d уйӑх",y:"пӗр ҫул",yy:"%d ҫул"},ordinalParse:/\d{1,2}-мӗш/,ordinal:"%d-мӗш",week:{dow:1,doy:7}}),a.defineLocale("cy",{months:"Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"),monthsShort:"Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"),weekdays:"Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"),weekdaysShort:"Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"),weekdaysMin:"Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Heddiw am] LT",nextDay:"[Yfory am] LT",nextWeek:"dddd [am] LT",lastDay:"[Ddoe am] LT",lastWeek:"dddd [diwethaf am] LT",sameElse:"L"},relativeTime:{future:"mewn %s",past:"%s yn ôl",s:"ychydig eiliadau",m:"munud",mm:"%d munud",h:"awr",hh:"%d awr",d:"diwrnod",dd:"%d diwrnod",M:"mis",MM:"%d mis",y:"blwyddyn",yy:"%d flynedd"},ordinalParse:/\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,ordinal:function(a){var b=a,c="",d=["","af","il","ydd","ydd","ed","ed","ed","fed","fed","fed","eg","fed","eg","eg","fed","eg","eg","fed","eg","fed"];return b>20?c=40===b||50===b||60===b||80===b||100===b?"fed":"ain":b>0&&(c=d[b]),a+c},week:{dow:1,doy:4}}),a.defineLocale("da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tir_ons_tor_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd [d.] D. MMMM YYYY LT"},calendar:{sameDay:"[I dag kl.] LT",nextDay:"[I morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[I går kl.] LT",lastWeek:"[sidste] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"få sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en måned",MM:"%d måneder",y:"et år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("de-at",{months:"Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Heute um] LT [Uhr]",sameElse:"L",nextDay:"[Morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[Gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:n,mm:"%d Minuten",h:n,hh:"%d Stunden",d:n,dd:n,M:n,MM:n,y:n,yy:n},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("de",{months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Heute um] LT [Uhr]",sameElse:"L",nextDay:"[Morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[Gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:o,mm:"%d Minuten",h:o,hh:"%d Stunden",d:o,dd:o,M:o,MM:o,y:o,yy:o},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("el",{monthsNominativeEl:"Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος".split("_"),monthsGenitiveEl:"Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου".split("_"),months:function(a,b){return/D/.test(b.substring(0,b.indexOf("MMMM")))?this._monthsGenitiveEl[a.month()]:this._monthsNominativeEl[a.month()]},monthsShort:"Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ".split("_"),weekdays:"Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο".split("_"),weekdaysShort:"Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ".split("_"),weekdaysMin:"Κυ_Δε_Τρ_Τε_Πε_Πα_Σα".split("_"),meridiem:function(a,b,c){return a>11?c?"μμ":"ΜΜ":c?"πμ":"ΠΜ"},isPM:function(a){return"μ"===(a+"").toLowerCase()[0]},meridiemParse:/[ΠΜ]\.?Μ?\.?/i,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendarEl:{sameDay:"[Σήμερα {}] LT",nextDay:"[Αύριο {}] LT",nextWeek:"dddd [{}] LT",lastDay:"[Χθες {}] LT",lastWeek:function(){switch(this.day()){case 6:return"[το προηγούμενο] dddd [{}] LT";default:return"[την προηγούμενη] dddd [{}] LT"}},sameElse:"L"},calendar:function(a,b){var c=this._calendarEl[a],d=b&&b.hours();return"function"==typeof c&&(c=c.apply(b)),c.replace("{}",d%12===1?"στη":"στις")},relativeTime:{future:"σε %s",past:"%s πριν",s:"λίγα δευτερόλεπτα",m:"ένα λεπτό",mm:"%d λεπτά",h:"μία ώρα",hh:"%d ώρες",d:"μία μέρα",dd:"%d μέρες",M:"ένας μήνας",MM:"%d μήνες",y:"ένας χρόνος",yy:"%d χρόνια"},ordinalParse:/\d{1,2}η/,ordinal:"%dη",week:{dow:1,doy:4}}),a.defineLocale("en-au",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}}),a.defineLocale("en-ca",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"YYYY-MM-DD",LL:"D MMMM, YYYY",LLL:"D MMMM, YYYY LT",LLLL:"dddd, D MMMM, YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.defineLocale("en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}}),a.defineLocale("eo",{months:"januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec".split("_"),weekdays:"Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato".split("_"),weekdaysShort:"Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Ĵa_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"D[-an de] MMMM, YYYY",LLL:"D[-an de] MMMM, YYYY LT",LLLL:"dddd, [la] D[-an de] MMMM, YYYY LT"},meridiemParse:/[ap]\.t\.m/i,isPM:function(a){return"p"===a.charAt(0).toLowerCase()},meridiem:function(a,b,c){return a>11?c?"p.t.m.":"P.T.M.":c?"a.t.m.":"A.T.M."},calendar:{sameDay:"[Hodiaŭ je] LT",nextDay:"[Morgaŭ je] LT",nextWeek:"dddd [je] LT",lastDay:"[Hieraŭ je] LT",lastWeek:"[pasinta] dddd [je] LT",sameElse:"L"},relativeTime:{future:"je %s",past:"antaŭ %s",s:"sekundoj",m:"minuto",mm:"%d minutoj",h:"horo",hh:"%d horoj",d:"tago",dd:"%d tagoj",M:"monato",MM:"%d monatoj",y:"jaro",yy:"%d jaroj"},ordinalParse:/\d{1,2}a/,ordinal:"%da",week:{dow:1,doy:7}}),"Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.".split("_")),ua="Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic".split("_"),va=(a.defineLocale("es",{months:"Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre".split("_"),monthsShort:function(a,b){return/-MMM-/.test(b)?ua[a.month()]:ta[a.month()]},weekdays:"Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado".split("_"),weekdaysShort:"Dom._Lun._Mar._Mié._Jue._Vie._Sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mi_Ju_Vi_Sá".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY LT",LLLL:"dddd, D [de] MMMM [de] YYYY LT"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[mañana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}}),a.defineLocale("et",{months:"jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),monthsShort:"jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),weekdays:"pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev".split("_"),weekdaysShort:"P_E_T_K_N_R_L".split("_"),weekdaysMin:"P_E_T_K_N_R_L".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Täna,] LT",nextDay:"[Homme,] LT",nextWeek:"[Järgmine] dddd LT",lastDay:"[Eile,] LT",lastWeek:"[Eelmine] dddd LT",sameElse:"L"},relativeTime:{future:"%s pärast",past:"%s tagasi",s:p,m:p,mm:p,h:p,hh:p,d:p,dd:"%d päeva",M:p,MM:p,y:p,yy:p},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("eu",{months:"urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),monthsShort:"urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),weekdays:"igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),weekdaysShort:"ig._al._ar._az._og._ol._lr.".split("_"),weekdaysMin:"ig_al_ar_az_og_ol_lr".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"YYYY[ko] MMMM[ren] D[a]",LLL:"YYYY[ko] MMMM[ren] D[a] LT",LLLL:"dddd, YYYY[ko] MMMM[ren] D[a] LT",l:"YYYY-M-D",ll:"YYYY[ko] MMM D[a]",lll:"YYYY[ko] MMM D[a] LT",llll:"ddd, YYYY[ko] MMM D[a] LT"},calendar:{sameDay:"[gaur] LT[etan]",nextDay:"[bihar] LT[etan]",nextWeek:"dddd LT[etan]",lastDay:"[atzo] LT[etan]",lastWeek:"[aurreko] dddd LT[etan]",sameElse:"L"},relativeTime:{future:"%s barru",past:"duela %s",s:"segundo batzuk",m:"minutu bat",mm:"%d minutu",h:"ordu bat",hh:"%d ordu",d:"egun bat",dd:"%d egun",M:"hilabete bat",MM:"%d hilabete",y:"urte bat",yy:"%d urte"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),{1:"۱",2:"۲",3:"۳",4:"۴",5:"۵",6:"۶",7:"۷",8:"۸",9:"۹",0:"۰"}),wa={"۱":"1","۲":"2","۳":"3","۴":"4","۵":"5","۶":"6","۷":"7","۸":"8","۹":"9","۰":"0"},xa=(a.defineLocale("fa",{months:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),monthsShort:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),
+weekdays:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysShort:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysMin:"ی_د_س_چ_پ_ج_ش".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},meridiemParse:/قبل از ظهر|بعد از ظهر/,isPM:function(a){return/بعد از ظهر/.test(a)},meridiem:function(a,b,c){return 12>a?"قبل از ظهر":"بعد از ظهر"},calendar:{sameDay:"[امروز ساعت] LT",nextDay:"[فردا ساعت] LT",nextWeek:"dddd [ساعت] LT",lastDay:"[دیروز ساعت] LT",lastWeek:"dddd [پیش] [ساعت] LT",sameElse:"L"},relativeTime:{future:"در %s",past:"%s پیش",s:"چندین ثانیه",m:"یک دقیقه",mm:"%d دقیقه",h:"یک ساعت",hh:"%d ساعت",d:"یک روز",dd:"%d روز",M:"یک ماه",MM:"%d ماه",y:"یک سال",yy:"%d سال"},preparse:function(a){return a.replace(/[۰-۹]/g,function(a){return wa[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return va[a]}).replace(/,/g,"،")},ordinalParse:/\d{1,2}م/,ordinal:"%dم",week:{dow:6,doy:12}}),"nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän".split(" ")),ya=["nolla","yhden","kahden","kolmen","neljän","viiden","kuuden",xa[7],xa[8],xa[9]],za=(a.defineLocale("fi",{months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"),weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"Do MMMM[ta] YYYY",LLL:"Do MMMM[ta] YYYY, [klo] LT",LLLL:"dddd, Do MMMM[ta] YYYY, [klo] LT",l:"D.M.YYYY",ll:"Do MMM YYYY",lll:"Do MMM YYYY, [klo] LT",llll:"ddd, Do MMM YYYY, [klo] LT"},calendar:{sameDay:"[tänään] [klo] LT",nextDay:"[huomenna] [klo] LT",nextWeek:"dddd [klo] LT",lastDay:"[eilen] [klo] LT",lastWeek:"[viime] dddd[na] [klo] LT",sameElse:"L"},relativeTime:{future:"%s päästä",past:"%s sitten",s:q,m:q,mm:q,h:q,hh:q,d:q,dd:q,M:q,MM:q,y:q,yy:q},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("fo",{months:"januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur".split("_"),weekdaysShort:"sun_mán_týs_mik_hós_frí_ley".split("_"),weekdaysMin:"su_má_tý_mi_hó_fr_le".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D. MMMM, YYYY LT"},calendar:{sameDay:"[Í dag kl.] LT",nextDay:"[Í morgin kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[Í gjár kl.] LT",lastWeek:"[síðstu] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"um %s",past:"%s síðani",s:"fá sekund",m:"ein minutt",mm:"%d minuttir",h:"ein tími",hh:"%d tímar",d:"ein dagur",dd:"%d dagar",M:"ein mánaði",MM:"%d mánaðir",y:"eitt ár",yy:"%d ár"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("fr-ca",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|)/,ordinal:function(a){return a+(1===a?"er":"")}}),a.defineLocale("fr",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|)/,ordinal:function(a){return a+(1===a?"er":"")},week:{dow:1,doy:4}}),"jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.".split("_")),Aa="jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),Ba=(a.defineLocale("fy",{months:"jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber".split("_"),monthsShort:function(a,b){return/-MMM-/.test(b)?Aa[a.month()]:za[a.month()]},weekdays:"snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon".split("_"),weekdaysShort:"si._mo._ti._wo._to._fr._so.".split("_"),weekdaysMin:"Si_Mo_Ti_Wo_To_Fr_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[hjoed om] LT",nextDay:"[moarn om] LT",nextWeek:"dddd [om] LT",lastDay:"[juster om] LT",lastWeek:"[ôfrûne] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oer %s",past:"%s lyn",s:"in pear sekonden",m:"ien minút",mm:"%d minuten",h:"ien oere",hh:"%d oeren",d:"ien dei",dd:"%d dagen",M:"ien moanne",MM:"%d moannen",y:"ien jier",yy:"%d jierren"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}}),a.defineLocale("gl",{months:"Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro".split("_"),monthsShort:"Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.".split("_"),weekdays:"Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado".split("_"),weekdaysShort:"Dom._Lun._Mar._Mér._Xov._Ven._Sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mé_Xo_Ve_Sá".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:function(){return"[hoxe "+(1!==this.hours()?"ás":"á")+"] LT"},nextDay:function(){return"[mañá "+(1!==this.hours()?"ás":"á")+"] LT"},nextWeek:function(){return"dddd ["+(1!==this.hours()?"ás":"a")+"] LT"},lastDay:function(){return"[onte "+(1!==this.hours()?"á":"a")+"] LT"},lastWeek:function(){return"[o] dddd [pasado "+(1!==this.hours()?"ás":"a")+"] LT"},sameElse:"L"},relativeTime:{future:function(a){return"uns segundos"===a?"nuns segundos":"en "+a},past:"hai %s",s:"uns segundos",m:"un minuto",mm:"%d minutos",h:"unha hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:7}}),a.defineLocale("he",{months:"ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"),monthsShort:"ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳".split("_"),weekdays:"ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),weekdaysShort:"א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),weekdaysMin:"א_ב_ג_ד_ה_ו_ש".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY LT",LLLL:"dddd, D [ב]MMMM YYYY LT",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY LT",llll:"ddd, D MMM YYYY LT"},calendar:{sameDay:"[היום ב־]LT",nextDay:"[מחר ב־]LT",nextWeek:"dddd [בשעה] LT",lastDay:"[אתמול ב־]LT",lastWeek:"[ביום] dddd [האחרון בשעה] LT",sameElse:"L"},relativeTime:{future:"בעוד %s",past:"לפני %s",s:"מספר שניות",m:"דקה",mm:"%d דקות",h:"שעה",hh:function(a){return 2===a?"שעתיים":a+" שעות"},d:"יום",dd:function(a){return 2===a?"יומיים":a+" ימים"},M:"חודש",MM:function(a){return 2===a?"חודשיים":a+" חודשים"},y:"שנה",yy:function(a){return 2===a?"שנתיים":a%10===0&&10!==a?a+" שנה":a+" שנים"}}}),{1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"}),Ca={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},Da=(a.defineLocale("hi",{months:"जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर".split("_"),monthsShort:"जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.".split("_"),weekdays:"रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),longDateFormat:{LT:"A h:mm बजे",LTS:"A h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[आज] LT",nextDay:"[कल] LT",nextWeek:"dddd, LT",lastDay:"[कल] LT",lastWeek:"[पिछले] dddd, LT",sameElse:"L"},relativeTime:{future:"%s में",past:"%s पहले",s:"कुछ ही क्षण",m:"एक मिनट",mm:"%d मिनट",h:"एक घंटा",hh:"%d घंटे",d:"एक दिन",dd:"%d दिन",M:"एक महीने",MM:"%d महीने",y:"एक वर्ष",yy:"%d वर्ष"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return Ca[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Ba[a]})},meridiemParse:/रात|सुबह|दोपहर|शाम/,meridiemHour:function(a,b){return 12===a&&(a=0),"रात"===b?4>a?a:a+12:"सुबह"===b?a:"दोपहर"===b?a>=10?a:a+12:"शाम"===b?a+12:void 0},meridiem:function(a,b,c){return 4>a?"रात":10>a?"सुबह":17>a?"दोपहर":20>a?"शाम":"रात"},week:{dow:0,doy:6}}),a.defineLocale("hr",{months:"siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_"),monthsShort:"sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[jučer u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:s,mm:s,h:s,hh:s,d:"dan",dd:s,M:"mjesec",MM:s,y:"godinu",yy:s},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),"vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton".split(" ")),Ea=(a.defineLocale("hu",{months:"január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),monthsShort:"jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"),weekdays:"vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),weekdaysShort:"vas_hét_kedd_sze_csüt_pén_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D., LT",LLLL:"YYYY. MMMM D., dddd LT"},meridiemParse:/de|du/i,isPM:function(a){return"u"===a.charAt(1).toLowerCase()},meridiem:function(a,b,c){return 12>a?c===!0?"de":"DE":c===!0?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return u.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return u.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s múlva",past:"%s",s:t,m:t,mm:t,h:t,hh:t,d:t,dd:t,M:t,MM:t,y:t,yy:t},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),a.defineLocale("hy-am",{months:v,monthsShort:w,weekdays:x,weekdaysShort:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),weekdaysMin:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY թ.",LLL:"D MMMM YYYY թ., LT",LLLL:"dddd, D MMMM YYYY թ., LT"},calendar:{sameDay:"[այսօր] LT",nextDay:"[վաղը] LT",lastDay:"[երեկ] LT",nextWeek:function(){return"dddd [օրը ժամը] LT"},lastWeek:function(){return"[անցած] dddd [օրը ժամը] LT"},sameElse:"L"},relativeTime:{future:"%s հետո",past:"%s առաջ",s:"մի քանի վայրկյան",m:"րոպե",mm:"%d րոպե",h:"ժամ",hh:"%d ժամ",d:"օր",dd:"%d օր",M:"ամիս",MM:"%d ամիս",y:"տարի",yy:"%d տարի"},meridiemParse:/գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,isPM:function(a){return/^(ցերեկվա|երեկոյան)$/.test(a)},meridiem:function(a){return 4>a?"գիշերվա":12>a?"առավոտվա":17>a?"ցերեկվա":"երեկոյան"},ordinalParse:/\d{1,2}|\d{1,2}-(ին|րդ)/,ordinal:function(a,b){switch(b){case"DDD":case"w":case"W":case"DDDo":return 1===a?a+"-ին":a+"-րդ";default:return a}},week:{dow:1,doy:7}}),a.defineLocale("id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"LT.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiemParse:/pagi|siang|sore|malam/,meridiemHour:function(a,b){return 12===a&&(a=0),"pagi"===b?a:"siang"===b?a>=11?a:a+12:"sore"===b||"malam"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"pagi":15>a?"siang":19>a?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),a.defineLocale("is",{months:"janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),monthsShort:"jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),weekdays:"sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),weekdaysShort:"sun_mán_þri_mið_fim_fös_lau".split("_"),weekdaysMin:"Su_Má_Þr_Mi_Fi_Fö_La".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] LT",LLLL:"dddd, D. MMMM YYYY [kl.] LT"},calendar:{sameDay:"[í dag kl.] LT",nextDay:"[á morgun kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[í gær kl.] LT",lastWeek:"[síðasta] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"eftir %s",past:"fyrir %s síðan",s:z,m:z,mm:z,h:"klukkustund",hh:z,d:z,dd:z,M:z,MM:z,y:z,yy:z},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),weekdaysMin:"D_L_Ma_Me_G_V_S".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:function(){switch(this.day()){case 0:return"[la scorsa] dddd [alle] LT";default:return"[lo scorso] dddd [alle] LT"}},sameElse:"L"},relativeTime:{future:function(a){return(/^[0-9].+$/.test(a)?"tra":"in")+" "+a},past:"%s fa",s:"alcuni secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}}),a.defineLocale("ja",{months:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),weekdaysShort:"日_月_火_水_木_金_土".split("_"),weekdaysMin:"日_月_火_水_木_金_土".split("_"),longDateFormat:{LT:"Ah時m分",LTS:"LTs秒",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日LT",LLLL:"YYYY年M月D日LT dddd"},meridiemParse:/午前|午後/i,isPM:function(a){return"午後"===a},meridiem:function(a,b,c){return 12>a?"午前":"午後"},calendar:{sameDay:"[今日] LT",nextDay:"[明日] LT",nextWeek:"[来週]dddd LT",lastDay:"[昨日] LT",lastWeek:"[前週]dddd LT",sameElse:"L"},relativeTime:{future:"%s後",past:"%s前",s:"数秒",m:"1分",mm:"%d分",h:"1時間",hh:"%d時間",d:"1日",dd:"%d日",M:"1ヶ月",MM:"%dヶ月",y:"1年",yy:"%d年"}}),a.defineLocale("jv",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des".split("_"),weekdays:"Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu".split("_"),weekdaysShort:"Min_Sen_Sel_Reb_Kem_Jem_Sep".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sp".split("_"),longDateFormat:{LT:"HH.mm",LTS:"LT.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiemParse:/enjing|siyang|sonten|ndalu/,meridiemHour:function(a,b){return 12===a&&(a=0),"enjing"===b?a:"siyang"===b?a>=11?a:a+12:"sonten"===b||"ndalu"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"enjing":15>a?"siyang":19>a?"sonten":"ndalu"},calendar:{sameDay:"[Dinten puniko pukul] LT",nextDay:"[Mbenjang pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kala wingi pukul] LT",lastWeek:"dddd [kepengker pukul] LT",sameElse:"L"},relativeTime:{future:"wonten ing %s",past:"%s ingkang kepengker",s:"sawetawis detik",m:"setunggal menit",mm:"%d menit",h:"setunggal jam",hh:"%d jam",d:"sedinten",dd:"%d dinten",M:"sewulan",MM:"%d wulan",y:"setaun",yy:"%d taun"},week:{dow:1,doy:7}}),a.defineLocale("ka",{months:A,monthsShort:"იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ".split("_"),weekdays:B,weekdaysShort:"კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ".split("_"),weekdaysMin:"კვ_ორ_სა_ოთ_ხუ_პა_შა".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[დღეს] LT[-ზე]",nextDay:"[ხვალ] LT[-ზე]",lastDay:"[გუშინ] LT[-ზე]",nextWeek:"[შემდეგ] dddd LT[-ზე]",lastWeek:"[წინა] dddd LT-ზე",sameElse:"L"},relativeTime:{future:function(a){return/(წამი|წუთი|საათი|წელი)/.test(a)?a.replace(/ი$/,"ში"):a+"ში"},past:function(a){return/(წამი|წუთი|საათი|დღე|თვე)/.test(a)?a.replace(/(ი|ე)$/,"ის წინ"):/წელი/.test(a)?a.replace(/წელი$/,"წლის წინ"):void 0},s:"რამდენიმე წამი",m:"წუთი",mm:"%d წუთი",h:"საათი",hh:"%d საათი",d:"დღე",dd:"%d დღე",M:"თვე",MM:"%d თვე",y:"წელი",yy:"%d წელი"},ordinalParse:/0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,ordinal:function(a){return 0===a?a:1===a?a+"-ლი":20>a||100>=a&&a%20===0||a%100===0?"მე-"+a:a+"-ე"},week:{dow:1,doy:7}}),a.defineLocale("km",{months:"មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),monthsShort:"មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),weekdays:"អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),weekdaysShort:"អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),weekdaysMin:"អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[ថ្ងៃនៈ ម៉ោង] LT",nextDay:"[ស្អែក ម៉ោង] LT",nextWeek:"dddd [ម៉ោង] LT",lastDay:"[ម្សិលមិញ ម៉ោង] LT",lastWeek:"dddd [សប្តាហ៍មុន] [ម៉ោង] LT",sameElse:"L"},relativeTime:{future:"%sទៀត",past:"%sមុន",s:"ប៉ុន្មានវិនាទី",m:"មួយនាទី",mm:"%d នាទី",h:"មួយម៉ោង",hh:"%d ម៉ោង",d:"មួយថ្ងៃ",dd:"%d ថ្ងៃ",M:"មួយខែ",MM:"%d ខែ",y:"មួយឆ្នាំ",yy:"%d ឆ្នាំ"},week:{dow:1,doy:4}}),a.defineLocale("ko",{months:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),monthsShort:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),weekdays:"일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"),weekdaysShort:"일_월_화_수_목_금_토".split("_"),weekdaysMin:"일_월_화_수_목_금_토".split("_"),longDateFormat:{LT:"A h시 m분",LTS:"A h시 m분 s초",L:"YYYY.MM.DD",LL:"YYYY년 MMMM D일",LLL:"YYYY년 MMMM D일 LT",LLLL:"YYYY년 MMMM D일 dddd LT"},calendar:{sameDay:"오늘 LT",nextDay:"내일 LT",nextWeek:"dddd LT",lastDay:"어제 LT",lastWeek:"지난주 dddd LT",sameElse:"L"},relativeTime:{future:"%s 후",past:"%s 전",s:"몇초",ss:"%d초",m:"일분",mm:"%d분",h:"한시간",hh:"%d시간",d:"하루",dd:"%d일",M:"한달",MM:"%d달",y:"일년",yy:"%d년"},ordinalParse:/\d{1,2}일/,ordinal:"%d일",meridiemParse:/오전|오후/,isPM:function(a){return"오후"===a},meridiem:function(a,b,c){return 12>a?"오전":"오후"}}),a.defineLocale("lb",{months:"Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),weekdaysShort:"So._Mé._Dë._Më._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mé_Dë_Më_Do_Fr_Sa".split("_"),longDateFormat:{LT:"H:mm [Auer]",LTS:"H:mm:ss [Auer]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Haut um] LT",sameElse:"L",nextDay:"[Muer um] LT",nextWeek:"dddd [um] LT",lastDay:"[Gëschter um] LT",lastWeek:function(){switch(this.day()){case 2:case 4:return"[Leschten] dddd [um] LT";default:return"[Leschte] dddd [um] LT"}}},relativeTime:{future:D,past:E,s:"e puer Sekonnen",m:C,mm:"%d Minutten",h:C,hh:"%d Stonnen",d:C,dd:"%d Deeg",M:C,MM:"%d Méint",y:C,yy:"%d Joer"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{m:"minutė_minutės_minutę",mm:"minutės_minučių_minutes",h:"valanda_valandos_valandą",hh:"valandos_valandų_valandas",d:"diena_dienos_dieną",dd:"dienos_dienų_dienas",M:"mėnuo_mėnesio_mėnesį",MM:"mėnesiai_mėnesių_mėnesius",y:"metai_metų_metus",yy:"metai_metų_metus"}),Fa="sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis".split("_"),Ga=(a.defineLocale("lt",{months:"sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio".split("_"),monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),weekdays:L,weekdaysShort:"Sek_Pir_Ant_Tre_Ket_Pen_Šeš".split("_"),weekdaysMin:"S_P_A_T_K_Pn_Š".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], LT [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, LT [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], LT [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, LT [val.]"},calendar:{sameDay:"[Šiandien] LT",nextDay:"[Rytoj] LT",nextWeek:"dddd LT",lastDay:"[Vakar] LT",lastWeek:"[Praėjusį] dddd LT",sameElse:"L"},relativeTime:{future:"po %s",past:"prieš %s",s:G,m:H,mm:K,h:H,hh:K,d:H,dd:K,M:H,MM:K,y:H,yy:K},ordinalParse:/\d{1,2}-oji/,ordinal:function(a){return a+"-oji"},week:{dow:1,doy:4}}),{m:"minūtes_minūtēm_minūte_minūtes".split("_"),mm:"minūtes_minūtēm_minūte_minūtes".split("_"),h:"stundas_stundām_stunda_stundas".split("_"),hh:"stundas_stundām_stunda_stundas".split("_"),d:"dienas_dienām_diena_dienas".split("_"),dd:"dienas_dienām_diena_dienas".split("_"),M:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),MM:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),y:"gada_gadiem_gads_gadi".split("_"),yy:"gada_gadiem_gads_gadi".split("_")}),Ha=(a.defineLocale("lv",{months:"janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"),monthsShort:"jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"),weekdays:"svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"),weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY.",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, LT",LLLL:"YYYY. [gada] D. MMMM, dddd, LT"},calendar:{sameDay:"[Šodien pulksten] LT",nextDay:"[Rīt pulksten] LT",nextWeek:"dddd [pulksten] LT",lastDay:"[Vakar pulksten] LT",lastWeek:"[Pagājušā] dddd [pulksten] LT",sameElse:"L"},relativeTime:{future:"pēc %s",past:"pirms %s",s:P,m:O,mm:N,h:O,hh:N,d:O,dd:N,M:O,MM:N,y:O,yy:N},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{words:{m:["jedan minut","jednog minuta"],mm:["minut","minuta","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mjesec","mjeseca","mjeseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,b,c){var d=Ha.words[c];return 1===c.length?b?d[0]:d[1]:a+" "+Ha.correctGrammaticalCase(a,d)}}),Ia=(a.defineLocale("me",{months:["januar","februar","mart","april","maj","jun","jul","avgust","septembar","oktobar","novembar","decembar"],monthsShort:["jan.","feb.","mar.","apr.","maj","jun","jul","avg.","sep.","okt.","nov.","dec."],weekdays:["nedjelja","ponedjeljak","utorak","srijeda","četvrtak","petak","subota"],weekdaysShort:["ned.","pon.","uto.","sri.","čet.","pet.","sub."],weekdaysMin:["ne","po","ut","sr","če","pe","su"],longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sjutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[juče u] LT",lastWeek:function(){var a=["[prošle] [nedjelje] [u] LT","[prošlog] [ponedjeljka] [u] LT","[prošlog] [utorka] [u] LT","[prošle] [srijede] [u] LT","[prošlog] [četvrtka] [u] LT","[prošlog] [petka] [u] LT","[prošle] [subote] [u] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"nekoliko sekundi",m:Ha.translate,mm:Ha.translate,h:Ha.translate,hh:Ha.translate,d:"dan",dd:Ha.translate,M:"mjesec",MM:Ha.translate,y:"godinu",yy:Ha.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),a.defineLocale("mk",{months:"јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември".split("_"),monthsShort:"јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек".split("_"),weekdays:"недела_понеделник_вторник_среда_четврток_петок_сабота".split("_"),weekdaysShort:"нед_пон_вто_сре_чет_пет_саб".split("_"),weekdaysMin:"нe_пo_вт_ср_че_пе_сa".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Денес во] LT",nextDay:"[Утре во] LT",nextWeek:"dddd [во] LT",lastDay:"[Вчера во] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[Во изминатата] dddd [во] LT";case 1:case 2:case 4:case 5:return"[Во изминатиот] dddd [во] LT"}},sameElse:"L"},relativeTime:{future:"после %s",past:"пред %s",s:"неколку секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дена",M:"месец",MM:"%d месеци",y:"година",yy:"%d години"},ordinalParse:/\d{1,2}-(ев|ен|ти|ви|ри|ми)/,ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}}),a.defineLocale("ml",{months:"ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ".split("_"),monthsShort:"ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.".split("_"),weekdays:"ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച".split("_"),weekdaysShort:"ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി".split("_"),weekdaysMin:"ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ".split("_"),longDateFormat:{LT:"A h:mm -നു",LTS:"A h:mm:ss -നു",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[ഇന്ന്] LT",nextDay:"[നാളെ] LT",nextWeek:"dddd, LT",lastDay:"[ഇന്നലെ] LT",lastWeek:"[കഴിഞ്ഞ] dddd, LT",sameElse:"L"},relativeTime:{future:"%s കഴിഞ്ഞ്",past:"%s മുൻപ്",s:"അൽപ നിമിഷങ്ങൾ",m:"ഒരു മിനിറ്റ്",mm:"%d മിനിറ്റ്",h:"ഒരു മണിക്കൂർ",hh:"%d മണിക്കൂർ",d:"ഒരു ദിവസം",dd:"%d ദിവസം",M:"ഒരു മാസം",MM:"%d മാസം",y:"ഒരു വർഷം",yy:"%d വർഷം"},meridiemParse:/രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,isPM:function(a){return/^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(a)},meridiem:function(a,b,c){return 4>a?"രാത്രി":12>a?"രാവിലെ":17>a?"ഉച്ച കഴിഞ്ഞ്":20>a?"വൈകുന്നേരം":"രാത്രി"}}),{1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"}),Ja={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},Ka=(a.defineLocale("mr",{months:"जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर".split("_"),monthsShort:"जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.".split("_"),weekdays:"रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),longDateFormat:{LT:"A h:mm वाजता",LTS:"A h:mm:ss वाजता",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[आज] LT",nextDay:"[उद्या] LT",nextWeek:"dddd, LT",lastDay:"[काल] LT",lastWeek:"[मागील] dddd, LT",sameElse:"L"},relativeTime:{future:"%s नंतर",past:"%s पूर्वी",s:"सेकंद",m:"एक मिनिट",mm:"%d मिनिटे",h:"एक तास",hh:"%d तास",d:"एक दिवस",dd:"%d दिवस",M:"एक महिना",MM:"%d महिने",y:"एक वर्ष",yy:"%d वर्षे"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return Ja[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Ia[a]})},meridiemParse:/रात्री|सकाळी|दुपारी|सायंकाळी/,meridiemHour:function(a,b){return 12===a&&(a=0),"रात्री"===b?4>a?a:a+12:"सकाळी"===b?a:"दुपारी"===b?a>=10?a:a+12:"सायंकाळी"===b?a+12:void 0},meridiem:function(a,b,c){return 4>a?"रात्री":10>a?"सकाळी":17>a?"दुपारी":20>a?"सायंकाळी":"रात्री"},week:{dow:0,doy:6}}),a.defineLocale("ms-my",{months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"LT.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiemParse:/pagi|tengahari|petang|malam/,meridiemHour:function(a,b){return 12===a&&(a=0),"pagi"===b?a:"tengahari"===b?a>=11?a:a+12:"petang"===b||"malam"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"pagi":15>a?"tengahari":19>a?"petang":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Esok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kelmarin pukul] LT",lastWeek:"dddd [lepas pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),{1:"၁",2:"၂",3:"၃",4:"၄",5:"၅",6:"၆",7:"၇",8:"၈",9:"၉",0:"၀"}),La={"၁":"1","၂":"2","၃":"3","၄":"4","၅":"5","၆":"6","၇":"7","၈":"8","၉":"9","၀":"0"},Ma=(a.defineLocale("my",{months:"ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ".split("_"),monthsShort:"ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ".split("_"),weekdays:"တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ".split("_"),weekdaysShort:"နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),weekdaysMin:"နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[ယနေ.] LT [မှာ]",nextDay:"[မနက်ဖြန်] LT [မှာ]",
+nextWeek:"dddd LT [မှာ]",lastDay:"[မနေ.က] LT [မှာ]",lastWeek:"[ပြီးခဲ့သော] dddd LT [မှာ]",sameElse:"L"},relativeTime:{future:"လာမည့် %s မှာ",past:"လွန်ခဲ့သော %s က",s:"စက္ကန်.အနည်းငယ်",m:"တစ်မိနစ်",mm:"%d မိနစ်",h:"တစ်နာရီ",hh:"%d နာရီ",d:"တစ်ရက်",dd:"%d ရက်",M:"တစ်လ",MM:"%d လ",y:"တစ်နှစ်",yy:"%d နှစ်"},preparse:function(a){return a.replace(/[၁၂၃၄၅၆၇၈၉၀]/g,function(a){return La[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Ka[a]})},week:{dow:1,doy:4}}),a.defineLocale("nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tirs_ons_tors_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"H.mm",LTS:"LT.ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] LT",LLLL:"dddd D. MMMM YYYY [kl.] LT"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i går kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s siden",s:"noen sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en måned",MM:"%d måneder",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"}),Na={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},Oa=(a.defineLocale("ne",{months:"जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर".split("_"),monthsShort:"जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.".split("_"),weekdays:"आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार".split("_"),weekdaysShort:"आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.".split("_"),weekdaysMin:"आइ._सो._मङ्_बु._बि._शु._श.".split("_"),longDateFormat:{LT:"Aको h:mm बजे",LTS:"Aको h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return Na[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Ma[a]})},meridiemParse:/राती|बिहान|दिउँसो|बेलुका|साँझ|राती/,meridiemHour:function(a,b){return 12===a&&(a=0),"राती"===b?3>a?a:a+12:"बिहान"===b?a:"दिउँसो"===b?a>=10?a:a+12:"बेलुका"===b||"साँझ"===b?a+12:void 0},meridiem:function(a,b,c){return 3>a?"राती":10>a?"बिहान":15>a?"दिउँसो":18>a?"बेलुका":20>a?"साँझ":"राती"},calendar:{sameDay:"[आज] LT",nextDay:"[भोली] LT",nextWeek:"[आउँदो] dddd[,] LT",lastDay:"[हिजो] LT",lastWeek:"[गएको] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%sमा",past:"%s अगाडी",s:"केही समय",m:"एक मिनेट",mm:"%d मिनेट",h:"एक घण्टा",hh:"%d घण्टा",d:"एक दिन",dd:"%d दिन",M:"एक महिना",MM:"%d महिना",y:"एक बर्ष",yy:"%d बर्ष"},week:{dow:1,doy:7}}),"jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_")),Pa="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),Qa=(a.defineLocale("nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(a,b){return/-MMM-/.test(b)?Pa[a.month()]:Oa[a.month()]},weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"Zo_Ma_Di_Wo_Do_Vr_Za".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"één minuut",mm:"%d minuten",h:"één uur",hh:"%d uur",d:"één dag",dd:"%d dagen",M:"één maand",MM:"%d maanden",y:"één jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}}),a.defineLocale("nn",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"),weekdaysShort:"sun_mån_tys_ons_tor_fre_lau".split("_"),weekdaysMin:"su_må_ty_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[I dag klokka] LT",nextDay:"[I morgon klokka] LT",nextWeek:"dddd [klokka] LT",lastDay:"[I går klokka] LT",lastWeek:"[Føregåande] dddd [klokka] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s sidan",s:"nokre sekund",m:"eit minutt",mm:"%d minutt",h:"ein time",hh:"%d timar",d:"ein dag",dd:"%d dagar",M:"ein månad",MM:"%d månader",y:"eit år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),"styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_")),Ra="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"),Sa=(a.defineLocale("pl",{months:function(a,b){return""===b?"("+Ra[a.month()]+"|"+Qa[a.month()]+")":/D MMMM/.test(b)?Ra[a.month()]:Qa[a.month()]},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),weekdays:"niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),weekdaysShort:"nie_pon_wt_śr_czw_pt_sb".split("_"),weekdaysMin:"N_Pn_Wt_Śr_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Dziś o] LT",nextDay:"[Jutro o] LT",nextWeek:"[W] dddd [o] LT",lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zeszłą niedzielę o] LT";case 3:return"[W zeszłą środę o] LT";case 6:return"[W zeszłą sobotę o] LT";default:return"[W zeszły] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",m:R,mm:R,h:R,hh:R,d:"1 dzień",dd:"%d dni",M:"miesiąc",MM:R,y:"rok",yy:R},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("pt-br",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] LT",LLLL:"dddd, D [de] MMMM [de] YYYY [às] LT"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"%s atrás",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº"}),a.defineLocale("pt",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY LT",LLLL:"dddd, D [de] MMMM [de] YYYY LT"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"há %s",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}}),a.defineLocale("ro",{months:"ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),monthsShort:"ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),weekdays:"duminică_luni_marți_miercuri_joi_vineri_sâmbătă".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[azi la] LT",nextDay:"[mâine la] LT",nextWeek:"dddd [la] LT",lastDay:"[ieri la] LT",lastWeek:"[fosta] dddd [la] LT",sameElse:"L"},relativeTime:{future:"peste %s",past:"%s în urmă",s:"câteva secunde",m:"un minut",mm:S,h:"o oră",hh:S,d:"o zi",dd:S,M:"o lună",MM:S,y:"un an",yy:S},week:{dow:1,doy:7}}),a.defineLocale("ru",{months:V,monthsShort:W,weekdays:X,weekdaysShort:"вс_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"вс_пн_вт_ср_чт_пт_сб".split("_"),monthsParse:[/^янв/i,/^фев/i,/^мар/i,/^апр/i,/^ма[й|я]/i,/^июн/i,/^июл/i,/^авг/i,/^сен/i,/^окт/i,/^ноя/i,/^дек/i],longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., LT",LLLL:"dddd, D MMMM YYYY г., LT"},calendar:{sameDay:"[Сегодня в] LT",nextDay:"[Завтра в] LT",lastDay:"[Вчера в] LT",nextWeek:function(){return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT"},lastWeek:function(a){if(a.week()===this.week())return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT";switch(this.day()){case 0:return"[В прошлое] dddd [в] LT";case 1:case 2:case 4:return"[В прошлый] dddd [в] LT";case 3:case 5:case 6:return"[В прошлую] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"через %s",past:"%s назад",s:"несколько секунд",m:U,mm:U,h:"час",hh:U,d:"день",dd:U,M:"месяц",MM:U,y:"год",yy:U},meridiemParse:/ночи|утра|дня|вечера/i,isPM:function(a){return/^(дня|вечера)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночи":12>a?"утра":17>a?"дня":"вечера"},ordinalParse:/\d{1,2}-(й|го|я)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":return a+"-й";case"D":return a+"-го";case"w":case"W":return a+"-я";default:return a}},week:{dow:1,doy:7}}),a.defineLocale("si",{months:"ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්".split("_"),monthsShort:"ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ".split("_"),weekdays:"ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා".split("_"),weekdaysShort:"ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන".split("_"),weekdaysMin:"ඉ_ස_අ_බ_බ්‍ර_සි_සෙ".split("_"),longDateFormat:{LT:"a h:mm",LTS:"a h:mm:ss",L:"YYYY/MM/DD",LL:"YYYY MMMM D",LLL:"YYYY MMMM D, LT",LLLL:"YYYY MMMM D [වැනි] dddd, LTS"},calendar:{sameDay:"[අද] LT[ට]",nextDay:"[හෙට] LT[ට]",nextWeek:"dddd LT[ට]",lastDay:"[ඊයේ] LT[ට]",lastWeek:"[පසුගිය] dddd LT[ට]",sameElse:"L"},relativeTime:{future:"%sකින්",past:"%sකට පෙර",s:"තත්පර කිහිපය",m:"මිනිත්තුව",mm:"මිනිත්තු %d",h:"පැය",hh:"පැය %d",d:"දිනය",dd:"දින %d",M:"මාසය",MM:"මාස %d",y:"වසර",yy:"වසර %d"},ordinalParse:/\d{1,2} වැනි/,ordinal:function(a){return a+" වැනි"},meridiem:function(a,b,c){return a>11?c?"ප.ව.":"පස් වරු":c?"පෙ.ව.":"පෙර වරු"}}),"január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_")),Ta="jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_"),Ua=(a.defineLocale("sk",{months:Sa,monthsShort:Ta,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(Sa,Ta),weekdays:"nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_št_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_št_pi_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd D. MMMM YYYY LT"},calendar:{sameDay:"[dnes o] LT",nextDay:"[zajtra o] LT",nextWeek:function(){switch(this.day()){case 0:return"[v nedeľu o] LT";case 1:case 2:return"[v] dddd [o] LT";case 3:return"[v stredu o] LT";case 4:return"[vo štvrtok o] LT";case 5:return"[v piatok o] LT";case 6:return"[v sobotu o] LT"}},lastDay:"[včera o] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulú nedeľu o] LT";case 1:case 2:return"[minulý] dddd [o] LT";case 3:return"[minulú stredu o] LT";case 4:case 5:return"[minulý] dddd [o] LT";case 6:return"[minulú sobotu o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"pred %s",s:Z,m:Z,mm:Z,h:Z,hh:Z,d:Z,dd:Z,M:Z,MM:Z,y:Z,yy:Z},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),a.defineLocale("sl",{months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),weekdays:"nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"),weekdaysShort:"ned._pon._tor._sre._čet._pet._sob.".split("_"),weekdaysMin:"ne_po_to_sr_če_pe_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danes ob] LT",nextDay:"[jutri ob] LT",nextWeek:function(){switch(this.day()){case 0:return"[v] [nedeljo] [ob] LT";case 3:return"[v] [sredo] [ob] LT";case 6:return"[v] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[v] dddd [ob] LT"}},lastDay:"[včeraj ob] LT",lastWeek:function(){switch(this.day()){case 0:return"[prejšnjo] [nedeljo] [ob] LT";case 3:return"[prejšnjo] [sredo] [ob] LT";case 6:return"[prejšnjo] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[prejšnji] dddd [ob] LT"}},sameElse:"L"},relativeTime:{future:"čez %s",past:"pred %s",s:$,m:$,mm:$,h:$,hh:$,d:$,dd:$,M:$,MM:$,y:$,yy:$},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),a.defineLocale("sq",{months:"Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor".split("_"),monthsShort:"Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj".split("_"),weekdays:"E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë".split("_"),weekdaysShort:"Die_Hën_Mar_Mër_Enj_Pre_Sht".split("_"),weekdaysMin:"D_H_Ma_Më_E_P_Sh".split("_"),meridiemParse:/PD|MD/,isPM:function(a){return"M"===a.charAt(0)},meridiem:function(a,b,c){return 12>a?"PD":"MD"},longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Sot në] LT",nextDay:"[Nesër në] LT",nextWeek:"dddd [në] LT",lastDay:"[Dje në] LT",lastWeek:"dddd [e kaluar në] LT",sameElse:"L"},relativeTime:{future:"në %s",past:"%s më parë",s:"disa sekonda",m:"një minutë",mm:"%d minuta",h:"një orë",hh:"%d orë",d:"një ditë",dd:"%d ditë",M:"një muaj",MM:"%d muaj",y:"një vit",yy:"%d vite"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{words:{m:["један минут","једне минуте"],mm:["минут","минуте","минута"],h:["један сат","једног сата"],hh:["сат","сата","сати"],dd:["дан","дана","дана"],MM:["месец","месеца","месеци"],yy:["година","године","година"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,b,c){var d=Ua.words[c];return 1===c.length?b?d[0]:d[1]:a+" "+Ua.correctGrammaticalCase(a,d)}}),Va=(a.defineLocale("sr-cyrl",{months:["јануар","фебруар","март","април","мај","јун","јул","август","септембар","октобар","новембар","децембар"],monthsShort:["јан.","феб.","мар.","апр.","мај","јун","јул","авг.","сеп.","окт.","нов.","дец."],weekdays:["недеља","понедељак","уторак","среда","четвртак","петак","субота"],weekdaysShort:["нед.","пон.","уто.","сре.","чет.","пет.","суб."],weekdaysMin:["не","по","ут","ср","че","пе","су"],longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[данас у] LT",nextDay:"[сутра у] LT",nextWeek:function(){switch(this.day()){case 0:return"[у] [недељу] [у] LT";case 3:return"[у] [среду] [у] LT";case 6:return"[у] [суботу] [у] LT";case 1:case 2:case 4:case 5:return"[у] dddd [у] LT"}},lastDay:"[јуче у] LT",lastWeek:function(){var a=["[прошле] [недеље] [у] LT","[прошлог] [понедељка] [у] LT","[прошлог] [уторка] [у] LT","[прошле] [среде] [у] LT","[прошлог] [четвртка] [у] LT","[прошлог] [петка] [у] LT","[прошле] [суботе] [у] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"за %s",past:"пре %s",s:"неколико секунди",m:Ua.translate,mm:Ua.translate,h:Ua.translate,hh:Ua.translate,d:"дан",dd:Ua.translate,M:"месец",MM:Ua.translate,y:"годину",yy:Ua.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),{words:{m:["jedan minut","jedne minute"],mm:["minut","minute","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mesec","meseca","meseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,b,c){var d=Va.words[c];return 1===c.length?b?d[0]:d[1]:a+" "+Va.correctGrammaticalCase(a,d)}}),Wa=(a.defineLocale("sr",{months:["januar","februar","mart","april","maj","jun","jul","avgust","septembar","oktobar","novembar","decembar"],monthsShort:["jan.","feb.","mar.","apr.","maj","jun","jul","avg.","sep.","okt.","nov.","dec."],weekdays:["nedelja","ponedeljak","utorak","sreda","četvrtak","petak","subota"],weekdaysShort:["ned.","pon.","uto.","sre.","čet.","pet.","sub."],weekdaysMin:["ne","po","ut","sr","če","pe","su"],longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedelju] [u] LT";case 3:return"[u] [sredu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[juče u] LT",lastWeek:function(){var a=["[prošle] [nedelje] [u] LT","[prošlog] [ponedeljka] [u] LT","[prošlog] [utorka] [u] LT","[prošle] [srede] [u] LT","[prošlog] [četvrtka] [u] LT","[prošlog] [petka] [u] LT","[prošle] [subote] [u] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",m:Va.translate,mm:Va.translate,h:Va.translate,hh:Va.translate,d:"dan",dd:Va.translate,M:"mesec",MM:Va.translate,y:"godinu",yy:Va.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),a.defineLocale("sv",{months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Idag] LT",nextDay:"[Imorgon] LT",lastDay:"[Igår] LT",nextWeek:"[På] dddd LT",lastWeek:"[I] dddd[s] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}(e|a)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"e":1===b?"a":2===b?"a":"e";return a+c},week:{dow:1,doy:4}}),a.defineLocale("ta",{months:"ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),monthsShort:"ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),weekdays:"ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை".split("_"),weekdaysShort:"ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி".split("_"),weekdaysMin:"ஞா_தி_செ_பு_வி_வெ_ச".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[இன்று] LT",nextDay:"[நாளை] LT",nextWeek:"dddd, LT",lastDay:"[நேற்று] LT",lastWeek:"[கடந்த வாரம்] dddd, LT",sameElse:"L"},relativeTime:{future:"%s இல்",past:"%s முன்",s:"ஒரு சில விநாடிகள்",m:"ஒரு நிமிடம்",mm:"%d நிமிடங்கள்",h:"ஒரு மணி நேரம்",hh:"%d மணி நேரம்",d:"ஒரு நாள்",dd:"%d நாட்கள்",M:"ஒரு மாதம்",MM:"%d மாதங்கள்",y:"ஒரு வருடம்",yy:"%d ஆண்டுகள்"},ordinalParse:/\d{1,2}வது/,ordinal:function(a){return a+"வது"},meridiemParse:/யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,meridiem:function(a,b,c){return 2>a?" யாமம்":6>a?" வைகறை":10>a?" காலை":14>a?" நண்பகல்":18>a?" எற்பாடு":22>a?" மாலை":" யாமம்"},meridiemHour:function(a,b){return 12===a&&(a=0),"யாமம்"===b?2>a?a:a+12:"வைகறை"===b||"காலை"===b?a:"நண்பகல்"===b&&a>=10?a:a+12},week:{dow:0,doy:6}}),a.defineLocale("th",{months:"มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม".split("_"),monthsShort:"มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา".split("_"),weekdays:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์".split("_"),weekdaysShort:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์".split("_"),weekdaysMin:"อา._จ._อ._พ._พฤ._ศ._ส.".split("_"),longDateFormat:{LT:"H นาฬิกา m นาที",LTS:"LT s วินาที",L:"YYYY/MM/DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY เวลา LT",LLLL:"วันddddที่ D MMMM YYYY เวลา LT"},meridiemParse:/ก่อนเที่ยง|หลังเที่ยง/,isPM:function(a){return"หลังเที่ยง"===a},meridiem:function(a,b,c){return 12>a?"ก่อนเที่ยง":"หลังเที่ยง"},calendar:{sameDay:"[วันนี้ เวลา] LT",nextDay:"[พรุ่งนี้ เวลา] LT",nextWeek:"dddd[หน้า เวลา] LT",lastDay:"[เมื่อวานนี้ เวลา] LT",lastWeek:"[วัน]dddd[ที่แล้ว เวลา] LT",sameElse:"L"},relativeTime:{future:"อีก %s",past:"%sที่แล้ว",s:"ไม่กี่วินาที",m:"1 นาที",mm:"%d นาที",h:"1 ชั่วโมง",hh:"%d ชั่วโมง",d:"1 วัน",dd:"%d วัน",M:"1 เดือน",MM:"%d เดือน",y:"1 ปี",yy:"%d ปี"}}),a.defineLocale("tl-ph",{months:"Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),monthsShort:"Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),weekdays:"Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),weekdaysShort:"Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),weekdaysMin:"Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"MM/D/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM DD, YYYY LT"},calendar:{sameDay:"[Ngayon sa] LT",nextDay:"[Bukas sa] LT",nextWeek:"dddd [sa] LT",lastDay:"[Kahapon sa] LT",lastWeek:"dddd [huling linggo] LT",sameElse:"L"},relativeTime:{future:"sa loob ng %s",past:"%s ang nakalipas",s:"ilang segundo",m:"isang minuto",mm:"%d minuto",h:"isang oras",hh:"%d oras",d:"isang araw",dd:"%d araw",M:"isang buwan",MM:"%d buwan",y:"isang taon",yy:"%d taon"},ordinalParse:/\d{1,2}/,ordinal:function(a){return a},week:{dow:1,doy:4}}),{1:"'inci",5:"'inci",8:"'inci",70:"'inci",80:"'inci",2:"'nci",7:"'nci",20:"'nci",50:"'nci",3:"'üncü",4:"'üncü",100:"'üncü",6:"'ncı",9:"'uncu",10:"'uncu",30:"'uncu",60:"'ıncı",90:"'ıncı"});a.defineLocale("tr",{months:"Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),monthsShort:"Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),weekdays:"Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_Çar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[yarın saat] LT",nextWeek:"[haftaya] dddd [saat] LT",lastDay:"[dün] LT",lastWeek:"[geçen hafta] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s önce",s:"birkaç saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir yıl",yy:"%d yıl"},ordinalParse:/\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,ordinal:function(a){if(0===a)return a+"'ıncı";var b=a%10,c=a%100-b,d=a>=100?100:null;return a+(Wa[b]||Wa[c]||Wa[d])},week:{dow:1,doy:7}}),a.defineLocale("tzm-latn",{months:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),monthsShort:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),weekdays:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),weekdaysShort:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),weekdaysMin:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[asdkh g] LT",nextDay:"[aska g] LT",nextWeek:"dddd [g] LT",lastDay:"[assant g] LT",lastWeek:"dddd [g] LT",sameElse:"L"},relativeTime:{future:"dadkh s yan %s",past:"yan %s",s:"imik",m:"minuḍ",mm:"%d minuḍ",h:"saɛa",hh:"%d tassaɛin",d:"ass",dd:"%d ossan",M:"ayowr",MM:"%d iyyirn",y:"asgas",yy:"%d isgasn"},week:{dow:6,doy:12}}),a.defineLocale("tzm",{months:"ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),monthsShort:"ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),weekdays:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),weekdaysShort:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),weekdaysMin:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[ⴰⵙⴷⵅ ⴴ] LT",nextDay:"[ⴰⵙⴽⴰ ⴴ] LT",nextWeek:"dddd [ⴴ] LT",lastDay:"[ⴰⵚⴰⵏⵜ ⴴ] LT",lastWeek:"dddd [ⴴ] LT",sameElse:"L"},relativeTime:{future:"ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s",past:"ⵢⴰⵏ %s",s:"ⵉⵎⵉⴽ",m:"ⵎⵉⵏⵓⴺ",mm:"%d ⵎⵉⵏⵓⴺ",h:"ⵙⴰⵄⴰ",hh:"%d ⵜⴰⵙⵙⴰⵄⵉⵏ",d:"ⴰⵙⵙ",dd:"%d oⵙⵙⴰⵏ",M:"ⴰⵢoⵓⵔ",MM:"%d ⵉⵢⵢⵉⵔⵏ",y:"ⴰⵙⴳⴰⵙ",yy:"%d ⵉⵙⴳⴰⵙⵏ"},week:{dow:6,doy:12}}),a.defineLocale("uk",{months:ba,monthsShort:"січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"),weekdays:ca,weekdaysShort:"нд_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY р.",LLL:"D MMMM YYYY р., LT",LLLL:"dddd, D MMMM YYYY р., LT"},calendar:{sameDay:da("[Сьогодні "),nextDay:da("[Завтра "),lastDay:da("[Вчора "),nextWeek:da("[У] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return da("[Минулої] dddd [").call(this);case 1:case 2:case 4:return da("[Минулого] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"за %s",past:"%s тому",s:"декілька секунд",m:aa,mm:aa,h:"годину",hh:aa,d:"день",dd:aa,M:"місяць",MM:aa,y:"рік",yy:aa},meridiemParse:/ночі|ранку|дня|вечора/,isPM:function(a){return/^(дня|вечора)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночі":12>a?"ранку":17>a?"дня":"вечора"},ordinalParse:/\d{1,2}-(й|го)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a+"-й";case"D":return a+"-го";default:return a}},week:{dow:1,doy:7}}),a.defineLocale("uz",{months:"январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),monthsShort:"янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"),weekdays:"Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба".split("_"),weekdaysShort:"Якш_Душ_Сеш_Чор_Пай_Жум_Шан".split("_"),weekdaysMin:"Як_Ду_Се_Чо_Па_Жу_Ша".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"D MMMM YYYY, dddd LT"},calendar:{sameDay:"[Бугун соат] LT [да]",nextDay:"[Эртага] LT [да]",nextWeek:"dddd [куни соат] LT [да]",lastDay:"[Кеча соат] LT [да]",lastWeek:"[Утган] dddd [куни соат] LT [да]",sameElse:"L"},relativeTime:{future:"Якин %s ичида",past:"Бир неча %s олдин",s:"фурсат",m:"бир дакика",mm:"%d дакика",h:"бир соат",hh:"%d соат",d:"бир кун",dd:"%d кун",M:"бир ой",MM:"%d ой",y:"бир йил",yy:"%d йил"},week:{dow:1,doy:7}}),a.defineLocale("vi",{months:"tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"),monthsShort:"Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"),weekdays:"chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"),weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM [năm] YYYY",LLL:"D MMMM [năm] YYYY LT",LLLL:"dddd, D MMMM [năm] YYYY LT",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY LT",llll:"ddd, D MMM YYYY LT"},calendar:{sameDay:"[Hôm nay lúc] LT",nextDay:"[Ngày mai lúc] LT",nextWeek:"dddd [tuần tới lúc] LT",lastDay:"[Hôm qua lúc] LT",lastWeek:"dddd [tuần rồi lúc] LT",sameElse:"L"},relativeTime:{future:"%s tới",past:"%s trước",s:"vài giây",m:"một phút",mm:"%d phút",h:"một giờ",hh:"%d giờ",d:"một ngày",dd:"%d ngày",M:"một tháng",MM:"%d tháng",y:"một năm",yy:"%d năm"},ordinalParse:/\d{1,2}/,ordinal:function(a){return a},week:{dow:1,doy:4}}),a.defineLocale("zh-cn",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah点mm分",LTS:"Ah点m分s秒",L:"YYYY-MM-DD",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日LT",LLLL:"YYYY年MMMD日ddddLT",l:"YYYY-MM-DD",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日LT",llll:"YYYY年MMMD日ddddLT"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"凌晨"===b||"早上"===b||"上午"===b?a:"下午"===b||"晚上"===b?a+12:a>=11?a:a+12},meridiem:function(a,b,c){var d=100*a+b;return 600>d?"凌晨":900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:function(){return 0===this.minutes()?"[今天]Ah[点整]":"[今天]LT"},nextDay:function(){return 0===this.minutes()?"[明天]Ah[点整]":"[明天]LT"},lastDay:function(){return 0===this.minutes()?"[昨天]Ah[点整]":"[昨天]LT"},nextWeek:function(){var b,c;return b=a().startOf("week"),c=this.unix()-b.unix()>=604800?"[下]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"},lastWeek:function(){var b,c;return b=a().startOf("week"),c=this.unix()<b.unix()?"[上]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"},sameElse:"LL"},ordinalParse:/\d{1,2}(日|月|周)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"周";default:return a}},relativeTime:{future:"%s内",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},week:{dow:1,doy:4}}),a.defineLocale("zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah點mm分",LTS:"Ah點m分s秒",L:"YYYY年MMMD日",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日LT",LLLL:"YYYY年MMMD日ddddLT",l:"YYYY年MMMD日",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日LT",llll:"YYYY年MMMD日ddddLT"},meridiemParse:/早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"早上"===b||"上午"===b?a:"中午"===b?a>=11?a:a+12:"下午"===b||"晚上"===b?a+12:void 0},meridiem:function(a,b,c){var d=100*a+b;return 900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:"[今天]LT",nextDay:"[明天]LT",nextWeek:"[下]ddddLT",lastDay:"[昨天]LT",lastWeek:"[上]ddddLT",sameElse:"L"},ordinalParse:/\d{1,2}(日|月|週)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"週";default:return a}},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",m:"一分鐘",mm:"%d分鐘",h:"一小時",hh:"%d小時",d:"一天",dd:"%d天",M:"一個月",MM:"%d個月",y:"一年",yy:"%d年"}})}});
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/min/moment-with-locales.js b/turtles/app/lib/bower_components/momentjs/min/moment-with-locales.js
new file mode 100644
index 000000000..61145c0ff
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/min/moment-with-locales.js
@@ -0,0 +1,9737 @@
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    global.moment = factory()
+}(this, function () { 'use strict';
+
+    var hookCallback;
+
+    function utils_hooks__hooks () {
+        return hookCallback.apply(null, arguments);
+    }
+
+    // This is done to register the method called with moment()
+    // without creating circular dependencies.
+    function setHookCallback (callback) {
+        hookCallback = callback;
+    }
+
+    function isArray(input) {
+        return Object.prototype.toString.call(input) === '[object Array]';
+    }
+
+    function isDate(input) {
+        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+    }
+
+    function map(arr, fn) {
+        var res = [], i;
+        for (i = 0; i < arr.length; ++i) {
+            res.push(fn(arr[i], i));
+        }
+        return res;
+    }
+
+    function hasOwnProp(a, b) {
+        return Object.prototype.hasOwnProperty.call(a, b);
+    }
+
+    function extend(a, b) {
+        for (var i in b) {
+            if (hasOwnProp(b, i)) {
+                a[i] = b[i];
+            }
+        }
+
+        if (hasOwnProp(b, 'toString')) {
+            a.toString = b.toString;
+        }
+
+        if (hasOwnProp(b, 'valueOf')) {
+            a.valueOf = b.valueOf;
+        }
+
+        return a;
+    }
+
+    function create_utc__createUTC (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, true).utc();
+    }
+
+    function defaultParsingFlags() {
+        // We need to deep clone this object.
+        return {
+            empty           : false,
+            unusedTokens    : [],
+            unusedInput     : [],
+            overflow        : -2,
+            charsLeftOver   : 0,
+            nullInput       : false,
+            invalidMonth    : null,
+            invalidFormat   : false,
+            userInvalidated : false,
+            iso             : false
+        };
+    }
+
+    function getParsingFlags(m) {
+        if (m._pf == null) {
+            m._pf = defaultParsingFlags();
+        }
+        return m._pf;
+    }
+
+    function valid__isValid(m) {
+        if (m._isValid == null) {
+            var flags = getParsingFlags(m);
+            m._isValid = !isNaN(m._d.getTime()) &&
+                flags.overflow < 0 &&
+                !flags.empty &&
+                !flags.invalidMonth &&
+                !flags.nullInput &&
+                !flags.invalidFormat &&
+                !flags.userInvalidated;
+
+            if (m._strict) {
+                m._isValid = m._isValid &&
+                    flags.charsLeftOver === 0 &&
+                    flags.unusedTokens.length === 0 &&
+                    flags.bigHour === undefined;
+            }
+        }
+        return m._isValid;
+    }
+
+    function valid__createInvalid (flags) {
+        var m = create_utc__createUTC(NaN);
+        if (flags != null) {
+            extend(getParsingFlags(m), flags);
+        }
+        else {
+            getParsingFlags(m).userInvalidated = true;
+        }
+
+        return m;
+    }
+
+    var momentProperties = utils_hooks__hooks.momentProperties = [];
+
+    function copyConfig(to, from) {
+        var i, prop, val;
+
+        if (typeof from._isAMomentObject !== 'undefined') {
+            to._isAMomentObject = from._isAMomentObject;
+        }
+        if (typeof from._i !== 'undefined') {
+            to._i = from._i;
+        }
+        if (typeof from._f !== 'undefined') {
+            to._f = from._f;
+        }
+        if (typeof from._l !== 'undefined') {
+            to._l = from._l;
+        }
+        if (typeof from._strict !== 'undefined') {
+            to._strict = from._strict;
+        }
+        if (typeof from._tzm !== 'undefined') {
+            to._tzm = from._tzm;
+        }
+        if (typeof from._isUTC !== 'undefined') {
+            to._isUTC = from._isUTC;
+        }
+        if (typeof from._offset !== 'undefined') {
+            to._offset = from._offset;
+        }
+        if (typeof from._pf !== 'undefined') {
+            to._pf = getParsingFlags(from);
+        }
+        if (typeof from._locale !== 'undefined') {
+            to._locale = from._locale;
+        }
+
+        if (momentProperties.length > 0) {
+            for (i in momentProperties) {
+                prop = momentProperties[i];
+                val = from[prop];
+                if (typeof val !== 'undefined') {
+                    to[prop] = val;
+                }
+            }
+        }
+
+        return to;
+    }
+
+    var updateInProgress = false;
+
+    // Moment prototype object
+    function Moment(config) {
+        copyConfig(this, config);
+        this._d = new Date(+config._d);
+        // Prevent infinite loop in case updateOffset creates new moment
+        // objects.
+        if (updateInProgress === false) {
+            updateInProgress = true;
+            utils_hooks__hooks.updateOffset(this);
+            updateInProgress = false;
+        }
+    }
+
+    function isMoment (obj) {
+        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
+    }
+
+    function toInt(argumentForCoercion) {
+        var coercedNumber = +argumentForCoercion,
+            value = 0;
+
+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+            if (coercedNumber >= 0) {
+                value = Math.floor(coercedNumber);
+            } else {
+                value = Math.ceil(coercedNumber);
+            }
+        }
+
+        return value;
+    }
+
+    function compareArrays(array1, array2, dontConvert) {
+        var len = Math.min(array1.length, array2.length),
+            lengthDiff = Math.abs(array1.length - array2.length),
+            diffs = 0,
+            i;
+        for (i = 0; i < len; i++) {
+            if ((dontConvert && array1[i] !== array2[i]) ||
+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+                diffs++;
+            }
+        }
+        return diffs + lengthDiff;
+    }
+
+    function Locale() {
+    }
+
+    var locales = {};
+    var globalLocale;
+
+    function normalizeLocale(key) {
+        return key ? key.toLowerCase().replace('_', '-') : key;
+    }
+
+    // pick the locale from the array
+    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+    function chooseLocale(names) {
+        var i = 0, j, next, locale, split;
+
+        while (i < names.length) {
+            split = normalizeLocale(names[i]).split('-');
+            j = split.length;
+            next = normalizeLocale(names[i + 1]);
+            next = next ? next.split('-') : null;
+            while (j > 0) {
+                locale = loadLocale(split.slice(0, j).join('-'));
+                if (locale) {
+                    return locale;
+                }
+                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+                    //the next array item is better than a shallower substring of this one
+                    break;
+                }
+                j--;
+            }
+            i++;
+        }
+        return null;
+    }
+
+    function loadLocale(name) {
+        var oldLocale = null;
+        // TODO: Find a better way to register and load all the locales in Node
+        if (!locales[name] && typeof module !== 'undefined' &&
+                module && module.exports) {
+            try {
+                oldLocale = globalLocale._abbr;
+                require('./locale/' + name);
+                // because defineLocale currently also sets the global locale, we
+                // want to undo that for lazy loaded locales
+                locale_locales__getSetGlobalLocale(oldLocale);
+            } catch (e) { }
+        }
+        return locales[name];
+    }
+
+    // This function will load locale and then set the global locale.  If
+    // no arguments are passed in, it will simply return the current global
+    // locale key.
+    function locale_locales__getSetGlobalLocale (key, values) {
+        var data;
+        if (key) {
+            if (typeof values === 'undefined') {
+                data = locale_locales__getLocale(key);
+            }
+            else {
+                data = defineLocale(key, values);
+            }
+
+            if (data) {
+                // moment.duration._locale = moment._locale = data;
+                globalLocale = data;
+            }
+        }
+
+        return globalLocale._abbr;
+    }
+
+    function defineLocale (name, values) {
+        if (values !== null) {
+            values.abbr = name;
+            if (!locales[name]) {
+                locales[name] = new Locale();
+            }
+            locales[name].set(values);
+
+            // backwards compat for now: also set the locale
+            locale_locales__getSetGlobalLocale(name);
+
+            return locales[name];
+        } else {
+            // useful for testing
+            delete locales[name];
+            return null;
+        }
+    }
+
+    // returns locale data
+    function locale_locales__getLocale (key) {
+        var locale;
+
+        if (key && key._locale && key._locale._abbr) {
+            key = key._locale._abbr;
+        }
+
+        if (!key) {
+            return globalLocale;
+        }
+
+        if (!isArray(key)) {
+            //short-circuit everything else
+            locale = loadLocale(key);
+            if (locale) {
+                return locale;
+            }
+            key = [key];
+        }
+
+        return chooseLocale(key);
+    }
+
+    var aliases = {};
+
+    function addUnitAlias (unit, shorthand) {
+        var lowerCase = unit.toLowerCase();
+        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+    }
+
+    function normalizeUnits(units) {
+        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
+    }
+
+    function normalizeObjectUnits(inputObject) {
+        var normalizedInput = {},
+            normalizedProp,
+            prop;
+
+        for (prop in inputObject) {
+            if (hasOwnProp(inputObject, prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = inputObject[prop];
+                }
+            }
+        }
+
+        return normalizedInput;
+    }
+
+    function makeGetSet (unit, keepTime) {
+        return function (value) {
+            if (value != null) {
+                get_set__set(this, unit, value);
+                utils_hooks__hooks.updateOffset(this, keepTime);
+                return this;
+            } else {
+                return get_set__get(this, unit);
+            }
+        };
+    }
+
+    function get_set__get (mom, unit) {
+        return mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]();
+    }
+
+    function get_set__set (mom, unit, value) {
+        return mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
+    }
+
+    // MOMENTS
+
+    function getSet (units, value) {
+        var unit;
+        if (typeof units === 'object') {
+            for (unit in units) {
+                this.set(unit, units[unit]);
+            }
+        } else {
+            units = normalizeUnits(units);
+            if (typeof this[units] === 'function') {
+                return this[units](value);
+            }
+        }
+        return this;
+    }
+
+    function zeroFill(number, targetLength, forceSign) {
+        var output = '' + Math.abs(number),
+            sign = number >= 0;
+
+        while (output.length < targetLength) {
+            output = '0' + output;
+        }
+        return (sign ? (forceSign ? '+' : '') : '-') + output;
+    }
+
+    var formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g;
+
+    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
+
+    var formatFunctions = {};
+
+    var formatTokenFunctions = {};
+
+    // token:    'M'
+    // padded:   ['MM', 2]
+    // ordinal:  'Mo'
+    // callback: function () { this.month() + 1 }
+    function addFormatToken (token, padded, ordinal, callback) {
+        var func = callback;
+        if (typeof callback === 'string') {
+            func = function () {
+                return this[callback]();
+            };
+        }
+        if (token) {
+            formatTokenFunctions[token] = func;
+        }
+        if (padded) {
+            formatTokenFunctions[padded[0]] = function () {
+                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+            };
+        }
+        if (ordinal) {
+            formatTokenFunctions[ordinal] = function () {
+                return this.localeData().ordinal(func.apply(this, arguments), token);
+            };
+        }
+    }
+
+    function removeFormattingTokens(input) {
+        if (input.match(/\[[\s\S]/)) {
+            return input.replace(/^\[|\]$/g, '');
+        }
+        return input.replace(/\\/g, '');
+    }
+
+    function makeFormatFunction(format) {
+        var array = format.match(formattingTokens), i, length;
+
+        for (i = 0, length = array.length; i < length; i++) {
+            if (formatTokenFunctions[array[i]]) {
+                array[i] = formatTokenFunctions[array[i]];
+            } else {
+                array[i] = removeFormattingTokens(array[i]);
+            }
+        }
+
+        return function (mom) {
+            var output = '';
+            for (i = 0; i < length; i++) {
+                output += array[i] instanceof Function ? array[i].call(mom, format) : array[i];
+            }
+            return output;
+        };
+    }
+
+    // format date using native date object
+    function formatMoment(m, format) {
+        if (!m.isValid()) {
+            return m.localeData().invalidDate();
+        }
+
+        format = expandFormat(format, m.localeData());
+
+        if (!formatFunctions[format]) {
+            formatFunctions[format] = makeFormatFunction(format);
+        }
+
+        return formatFunctions[format](m);
+    }
+
+    function expandFormat(format, locale) {
+        var i = 5;
+
+        function replaceLongDateFormatTokens(input) {
+            return locale.longDateFormat(input) || input;
+        }
+
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
+            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
+        }
+
+        return format;
+    }
+
+    var match1         = /\d/;            //       0 - 9
+    var match2         = /\d\d/;          //      00 - 99
+    var match3         = /\d{3}/;         //     000 - 999
+    var match4         = /\d{4}/;         //    0000 - 9999
+    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
+    var match1to2      = /\d\d?/;         //       0 - 99
+    var match1to3      = /\d{1,3}/;       //       0 - 999
+    var match1to4      = /\d{1,4}/;       //       0 - 9999
+    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
+
+    var matchUnsigned  = /\d+/;           //       0 - inf
+    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
+
+    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
+
+    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
+
+    // any word (or two) characters or numbers including two/three word month in arabic.
+    var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
+
+    var regexes = {};
+
+    function addRegexToken (token, regex, strictRegex) {
+        regexes[token] = typeof regex === 'function' ? regex : function (isStrict) {
+            return (isStrict && strictRegex) ? strictRegex : regex;
+        };
+    }
+
+    function getParseRegexForToken (token, config) {
+        if (!hasOwnProp(regexes, token)) {
+            return new RegExp(unescapeFormat(token));
+        }
+
+        return regexes[token](config._strict, config._locale);
+    }
+
+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+    function unescapeFormat(s) {
+        return s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+            return p1 || p2 || p3 || p4;
+        }).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+
+    var tokens = {};
+
+    function addParseToken (token, callback) {
+        var i, func = callback;
+        if (typeof token === 'string') {
+            token = [token];
+        }
+        if (typeof callback === 'number') {
+            func = function (input, array) {
+                array[callback] = toInt(input);
+            };
+        }
+        for (i = 0; i < token.length; i++) {
+            tokens[token[i]] = func;
+        }
+    }
+
+    function addWeekParseToken (token, callback) {
+        addParseToken(token, function (input, array, config, token) {
+            config._w = config._w || {};
+            callback(input, config._w, config, token);
+        });
+    }
+
+    function addTimeToArrayFromToken(token, input, config) {
+        if (input != null && hasOwnProp(tokens, token)) {
+            tokens[token](input, config._a, config, token);
+        }
+    }
+
+    var YEAR = 0;
+    var MONTH = 1;
+    var DATE = 2;
+    var HOUR = 3;
+    var MINUTE = 4;
+    var SECOND = 5;
+    var MILLISECOND = 6;
+
+    function daysInMonth(year, month) {
+        return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+    }
+
+    // FORMATTING
+
+    addFormatToken('M', ['MM', 2], 'Mo', function () {
+        return this.month() + 1;
+    });
+
+    addFormatToken('MMM', 0, 0, function (format) {
+        return this.localeData().monthsShort(this, format);
+    });
+
+    addFormatToken('MMMM', 0, 0, function (format) {
+        return this.localeData().months(this, format);
+    });
+
+    // ALIASES
+
+    addUnitAlias('month', 'M');
+
+    // PARSING
+
+    addRegexToken('M',    match1to2);
+    addRegexToken('MM',   match1to2, match2);
+    addRegexToken('MMM',  matchWord);
+    addRegexToken('MMMM', matchWord);
+
+    addParseToken(['M', 'MM'], function (input, array) {
+        array[MONTH] = toInt(input) - 1;
+    });
+
+    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+        var month = config._locale.monthsParse(input, token, config._strict);
+        // if we didn't find a month name, mark the date as invalid.
+        if (month != null) {
+            array[MONTH] = month;
+        } else {
+            getParsingFlags(config).invalidMonth = input;
+        }
+    });
+
+    // LOCALES
+
+    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
+    function localeMonths (m) {
+        return this._months[m.month()];
+    }
+
+    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
+    function localeMonthsShort (m) {
+        return this._monthsShort[m.month()];
+    }
+
+    function localeMonthsParse (monthName, format, strict) {
+        var i, mom, regex;
+
+        if (!this._monthsParse) {
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+        }
+
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = create_utc__createUTC([2000, i]);
+            if (strict && !this._longMonthsParse[i]) {
+                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
+                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
+            }
+            if (!strict && !this._monthsParse[i]) {
+                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (!strict && this._monthsParse[i].test(monthName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function setMonth (mom, value) {
+        var dayOfMonth;
+
+        // TODO: Move this out of here!
+        if (typeof value === 'string') {
+            value = mom.localeData().monthsParse(value);
+            // TODO: Another silent failure?
+            if (typeof value !== 'number') {
+                return mom;
+            }
+        }
+
+        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
+        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
+        return mom;
+    }
+
+    function getSetMonth (value) {
+        if (value != null) {
+            setMonth(this, value);
+            utils_hooks__hooks.updateOffset(this, true);
+            return this;
+        } else {
+            return get_set__get(this, 'Month');
+        }
+    }
+
+    function getDaysInMonth () {
+        return daysInMonth(this.year(), this.month());
+    }
+
+    function checkOverflow (m) {
+        var overflow;
+        var a = m._a;
+
+        if (a && getParsingFlags(m).overflow === -2) {
+            overflow =
+                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
+                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
+                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
+                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
+                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
+                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
+                -1;
+
+            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+                overflow = DATE;
+            }
+
+            getParsingFlags(m).overflow = overflow;
+        }
+
+        return m;
+    }
+
+    function warn(msg) {
+        if (utils_hooks__hooks.suppressDeprecationWarnings === false && typeof console !== 'undefined' && console.warn) {
+            console.warn('Deprecation warning: ' + msg);
+        }
+    }
+
+    function deprecate(msg, fn) {
+        var firstTime = true,
+            msgWithStack = msg + '\n' + (new Error()).stack;
+
+        return extend(function () {
+            if (firstTime) {
+                warn(msgWithStack);
+                firstTime = false;
+            }
+            return fn.apply(this, arguments);
+        }, fn);
+    }
+
+    var deprecations = {};
+
+    function deprecateSimple(name, msg) {
+        if (!deprecations[name]) {
+            warn(msg);
+            deprecations[name] = true;
+        }
+    }
+
+    utils_hooks__hooks.suppressDeprecationWarnings = false;
+
+    var from_string__isoRegex = /^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+
+    var isoDates = [
+        ['YYYYYY-MM-DD', /[+-]\d{6}-\d{2}-\d{2}/],
+        ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/],
+        ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/],
+        ['GGGG-[W]WW', /\d{4}-W\d{2}/],
+        ['YYYY-DDD', /\d{4}-\d{3}/]
+    ];
+
+    // iso time formats and regexes
+    var isoTimes = [
+        ['HH:mm:ss.SSSS', /(T| )\d\d:\d\d:\d\d\.\d+/],
+        ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/],
+        ['HH:mm', /(T| )\d\d:\d\d/],
+        ['HH', /(T| )\d\d/]
+    ];
+
+    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
+
+    // date from iso format
+    function configFromISO(config) {
+        var i, l,
+            string = config._i,
+            match = from_string__isoRegex.exec(string);
+
+        if (match) {
+            getParsingFlags(config).iso = true;
+            for (i = 0, l = isoDates.length; i < l; i++) {
+                if (isoDates[i][1].exec(string)) {
+                    // match[5] should be 'T' or undefined
+                    config._f = isoDates[i][0] + (match[6] || ' ');
+                    break;
+                }
+            }
+            for (i = 0, l = isoTimes.length; i < l; i++) {
+                if (isoTimes[i][1].exec(string)) {
+                    config._f += isoTimes[i][0];
+                    break;
+                }
+            }
+            if (string.match(matchOffset)) {
+                config._f += 'Z';
+            }
+            configFromStringAndFormat(config);
+        } else {
+            config._isValid = false;
+        }
+    }
+
+    // date from iso format or fallback
+    function configFromString(config) {
+        var matched = aspNetJsonRegex.exec(config._i);
+
+        if (matched !== null) {
+            config._d = new Date(+matched[1]);
+            return;
+        }
+
+        configFromISO(config);
+        if (config._isValid === false) {
+            delete config._isValid;
+            utils_hooks__hooks.createFromInputFallback(config);
+        }
+    }
+
+    utils_hooks__hooks.createFromInputFallback = deprecate(
+        'moment construction falls back to js Date. This is ' +
+        'discouraged and will be removed in upcoming major ' +
+        'release. Please refer to ' +
+        'https://github.com/moment/moment/issues/1407 for more info.',
+        function (config) {
+            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
+        }
+    );
+
+    function createDate (y, m, d, h, M, s, ms) {
+        //can't just apply() to create a date:
+        //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply
+        var date = new Date(y, m, d, h, M, s, ms);
+
+        //the date constructor doesn't accept years < 1970
+        if (y < 1970) {
+            date.setFullYear(y);
+        }
+        return date;
+    }
+
+    function createUTCDate (y) {
+        var date = new Date(Date.UTC.apply(null, arguments));
+        if (y < 1970) {
+            date.setUTCFullYear(y);
+        }
+        return date;
+    }
+
+    addFormatToken(0, ['YY', 2], 0, function () {
+        return this.year() % 100;
+    });
+
+    addFormatToken(0, ['YYYY',   4],       0, 'year');
+    addFormatToken(0, ['YYYYY',  5],       0, 'year');
+    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
+
+    // ALIASES
+
+    addUnitAlias('year', 'y');
+
+    // PARSING
+
+    addRegexToken('Y',      matchSigned);
+    addRegexToken('YY',     match1to2, match2);
+    addRegexToken('YYYY',   match1to4, match4);
+    addRegexToken('YYYYY',  match1to6, match6);
+    addRegexToken('YYYYYY', match1to6, match6);
+
+    addParseToken(['YYYY', 'YYYYY', 'YYYYYY'], YEAR);
+    addParseToken('YY', function (input, array) {
+        array[YEAR] = utils_hooks__hooks.parseTwoDigitYear(input);
+    });
+
+    // HELPERS
+
+    function daysInYear(year) {
+        return isLeapYear(year) ? 366 : 365;
+    }
+
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
+
+    // HOOKS
+
+    utils_hooks__hooks.parseTwoDigitYear = function (input) {
+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+    };
+
+    // MOMENTS
+
+    var getSetYear = makeGetSet('FullYear', false);
+
+    function getIsLeapYear () {
+        return isLeapYear(this.year());
+    }
+
+    addFormatToken('w', ['ww', 2], 'wo', 'week');
+    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
+
+    // ALIASES
+
+    addUnitAlias('week', 'w');
+    addUnitAlias('isoWeek', 'W');
+
+    // PARSING
+
+    addRegexToken('w',  match1to2);
+    addRegexToken('ww', match1to2, match2);
+    addRegexToken('W',  match1to2);
+    addRegexToken('WW', match1to2, match2);
+
+    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
+        week[token.substr(0, 1)] = toInt(input);
+    });
+
+    // HELPERS
+
+    // firstDayOfWeek       0 = sun, 6 = sat
+    //                      the day of the week that starts the week
+    //                      (usually sunday or monday)
+    // firstDayOfWeekOfYear 0 = sun, 6 = sat
+    //                      the first week is the week that contains the first
+    //                      of this day of the week
+    //                      (eg. ISO weeks use thursday (4))
+    function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) {
+        var end = firstDayOfWeekOfYear - firstDayOfWeek,
+            daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(),
+            adjustedMoment;
+
+
+        if (daysToDayOfWeek > end) {
+            daysToDayOfWeek -= 7;
+        }
+
+        if (daysToDayOfWeek < end - 7) {
+            daysToDayOfWeek += 7;
+        }
+
+        adjustedMoment = local__createLocal(mom).add(daysToDayOfWeek, 'd');
+        return {
+            week: Math.ceil(adjustedMoment.dayOfYear() / 7),
+            year: adjustedMoment.year()
+        };
+    }
+
+    // LOCALES
+
+    function localeWeek (mom) {
+        return weekOfYear(mom, this._week.dow, this._week.doy).week;
+    }
+
+    var defaultLocaleWeek = {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    };
+
+    function localeFirstDayOfWeek () {
+        return this._week.dow;
+    }
+
+    function localeFirstDayOfYear () {
+        return this._week.doy;
+    }
+
+    // MOMENTS
+
+    function getSetWeek (input) {
+        var week = this.localeData().week(this);
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    function getSetISOWeek (input) {
+        var week = weekOfYear(this, 1, 4).week;
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
+
+    // ALIASES
+
+    addUnitAlias('dayOfYear', 'DDD');
+
+    // PARSING
+
+    addRegexToken('DDD',  match1to3);
+    addRegexToken('DDDD', match3);
+    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+        config._dayOfYear = toInt(input);
+    });
+
+    // HELPERS
+
+    //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+    function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) {
+        var d = createUTCDate(year, 0, 1).getUTCDay();
+        var daysToAdd;
+        var dayOfYear;
+
+        d = d === 0 ? 7 : d;
+        weekday = weekday != null ? weekday : firstDayOfWeek;
+        daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0) - (d < firstDayOfWeek ? 7 : 0);
+        dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1;
+
+        return {
+            year      : dayOfYear > 0 ? year      : year - 1,
+            dayOfYear : dayOfYear > 0 ? dayOfYear : daysInYear(year - 1) + dayOfYear
+        };
+    }
+
+    // MOMENTS
+
+    function getSetDayOfYear (input) {
+        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
+        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
+    }
+
+    // Pick the first defined of two or three arguments.
+    function defaults(a, b, c) {
+        if (a != null) {
+            return a;
+        }
+        if (b != null) {
+            return b;
+        }
+        return c;
+    }
+
+    function currentDateArray(config) {
+        var now = new Date();
+        if (config._useUTC) {
+            return [now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()];
+        }
+        return [now.getFullYear(), now.getMonth(), now.getDate()];
+    }
+
+    // convert an array to a date.
+    // the array should mirror the parameters below
+    // note: all values past the year are optional and will default to the lowest possible value.
+    // [year, month, day , hour, minute, second, millisecond]
+    function configFromArray (config) {
+        var i, date, input = [], currentDate, yearToUse;
+
+        if (config._d) {
+            return;
+        }
+
+        currentDate = currentDateArray(config);
+
+        //compute day of the year from weeks and weekdays
+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+            dayOfYearFromWeekInfo(config);
+        }
+
+        //if the day of the year is set, figure out what it is
+        if (config._dayOfYear) {
+            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
+
+            if (config._dayOfYear > daysInYear(yearToUse)) {
+                getParsingFlags(config)._overflowDayOfYear = true;
+            }
+
+            date = createUTCDate(yearToUse, 0, config._dayOfYear);
+            config._a[MONTH] = date.getUTCMonth();
+            config._a[DATE] = date.getUTCDate();
+        }
+
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
+
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
+            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+        }
+
+        // Check for 24:00:00.000
+        if (config._a[HOUR] === 24 &&
+                config._a[MINUTE] === 0 &&
+                config._a[SECOND] === 0 &&
+                config._a[MILLISECOND] === 0) {
+            config._nextDay = true;
+            config._a[HOUR] = 0;
+        }
+
+        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
+        // Apply timezone offset from input. The actual utcOffset can be changed
+        // with parseZone.
+        if (config._tzm != null) {
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+        }
+
+        if (config._nextDay) {
+            config._a[HOUR] = 24;
+        }
+    }
+
+    function dayOfYearFromWeekInfo(config) {
+        var w, weekYear, week, weekday, dow, doy, temp;
+
+        w = config._w;
+        if (w.GG != null || w.W != null || w.E != null) {
+            dow = 1;
+            doy = 4;
+
+            // TODO: We need to take the current isoWeekYear, but that depends on
+            // how we interpret now (local, utc, fixed offset). So create
+            // a now version of current config (take local/utc/offset flags, and
+            // create now).
+            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(local__createLocal(), 1, 4).year);
+            week = defaults(w.W, 1);
+            weekday = defaults(w.E, 1);
+        } else {
+            dow = config._locale._week.dow;
+            doy = config._locale._week.doy;
+
+            weekYear = defaults(w.gg, config._a[YEAR], weekOfYear(local__createLocal(), dow, doy).year);
+            week = defaults(w.w, 1);
+
+            if (w.d != null) {
+                // weekday -- low day numbers are considered next week
+                weekday = w.d;
+                if (weekday < dow) {
+                    ++week;
+                }
+            } else if (w.e != null) {
+                // local weekday -- counting starts from begining of week
+                weekday = w.e + dow;
+            } else {
+                // default to begining of week
+                weekday = dow;
+            }
+        }
+        temp = dayOfYearFromWeeks(weekYear, week, weekday, doy, dow);
+
+        config._a[YEAR] = temp.year;
+        config._dayOfYear = temp.dayOfYear;
+    }
+
+    utils_hooks__hooks.ISO_8601 = function () {};
+
+    // date from string and format string
+    function configFromStringAndFormat(config) {
+        // TODO: Move this to another part of the creation flow to prevent circular deps
+        if (config._f === utils_hooks__hooks.ISO_8601) {
+            configFromISO(config);
+            return;
+        }
+
+        config._a = [];
+        getParsingFlags(config).empty = true;
+
+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
+        var string = '' + config._i,
+            i, parsedInput, tokens, token, skipped,
+            stringLength = string.length,
+            totalParsedInputLength = 0;
+
+        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
+
+        for (i = 0; i < tokens.length; i++) {
+            token = tokens[i];
+            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+            if (parsedInput) {
+                skipped = string.substr(0, string.indexOf(parsedInput));
+                if (skipped.length > 0) {
+                    getParsingFlags(config).unusedInput.push(skipped);
+                }
+                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+                totalParsedInputLength += parsedInput.length;
+            }
+            // don't parse if it's not a known token
+            if (formatTokenFunctions[token]) {
+                if (parsedInput) {
+                    getParsingFlags(config).empty = false;
+                }
+                else {
+                    getParsingFlags(config).unusedTokens.push(token);
+                }
+                addTimeToArrayFromToken(token, parsedInput, config);
+            }
+            else if (config._strict && !parsedInput) {
+                getParsingFlags(config).unusedTokens.push(token);
+            }
+        }
+
+        // add remaining unparsed input length to the string
+        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
+        if (string.length > 0) {
+            getParsingFlags(config).unusedInput.push(string);
+        }
+
+        // clear _12h flag if hour is <= 12
+        if (getParsingFlags(config).bigHour === true &&
+                config._a[HOUR] <= 12 &&
+                config._a[HOUR] > 0) {
+            getParsingFlags(config).bigHour = undefined;
+        }
+        // handle meridiem
+        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
+
+        configFromArray(config);
+        checkOverflow(config);
+    }
+
+
+    function meridiemFixWrap (locale, hour, meridiem) {
+        var isPm;
+
+        if (meridiem == null) {
+            // nothing to do
+            return hour;
+        }
+        if (locale.meridiemHour != null) {
+            return locale.meridiemHour(hour, meridiem);
+        } else if (locale.isPM != null) {
+            // Fallback
+            isPm = locale.isPM(meridiem);
+            if (isPm && hour < 12) {
+                hour += 12;
+            }
+            if (!isPm && hour === 12) {
+                hour = 0;
+            }
+            return hour;
+        } else {
+            // this is not supposed to happen
+            return hour;
+        }
+    }
+
+    function configFromStringAndArray(config) {
+        var tempConfig,
+            bestMoment,
+
+            scoreToBeat,
+            i,
+            currentScore;
+
+        if (config._f.length === 0) {
+            getParsingFlags(config).invalidFormat = true;
+            config._d = new Date(NaN);
+            return;
+        }
+
+        for (i = 0; i < config._f.length; i++) {
+            currentScore = 0;
+            tempConfig = copyConfig({}, config);
+            if (config._useUTC != null) {
+                tempConfig._useUTC = config._useUTC;
+            }
+            tempConfig._f = config._f[i];
+            configFromStringAndFormat(tempConfig);
+
+            if (!valid__isValid(tempConfig)) {
+                continue;
+            }
+
+            // if there is any input that was not parsed add a penalty for that format
+            currentScore += getParsingFlags(tempConfig).charsLeftOver;
+
+            //or tokens
+            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
+
+            getParsingFlags(tempConfig).score = currentScore;
+
+            if (scoreToBeat == null || currentScore < scoreToBeat) {
+                scoreToBeat = currentScore;
+                bestMoment = tempConfig;
+            }
+        }
+
+        extend(config, bestMoment || tempConfig);
+    }
+
+    function configFromObject(config) {
+        if (config._d) {
+            return;
+        }
+
+        var i = normalizeObjectUnits(config._i);
+        config._a = [i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond];
+
+        configFromArray(config);
+    }
+
+    function createFromConfig (config) {
+        var input = config._i,
+            format = config._f,
+            res;
+
+        config._locale = config._locale || locale_locales__getLocale(config._l);
+
+        if (input === null || (format === undefined && input === '')) {
+            return valid__createInvalid({nullInput: true});
+        }
+
+        if (typeof input === 'string') {
+            config._i = input = config._locale.preparse(input);
+        }
+
+        if (isMoment(input)) {
+            return new Moment(checkOverflow(input));
+        } else if (isArray(format)) {
+            configFromStringAndArray(config);
+        } else if (format) {
+            configFromStringAndFormat(config);
+        } else if (isDate(input)) {
+            config._d = input;
+        } else {
+            configFromInput(config);
+        }
+
+        res = new Moment(checkOverflow(config));
+        if (res._nextDay) {
+            // Adding is smart enough around DST
+            res.add(1, 'd');
+            res._nextDay = undefined;
+        }
+
+        return res;
+    }
+
+    function configFromInput(config) {
+        var input = config._i;
+        if (input === undefined) {
+            config._d = new Date();
+        } else if (isDate(input)) {
+            config._d = new Date(+input);
+        } else if (typeof input === 'string') {
+            configFromString(config);
+        } else if (isArray(input)) {
+            config._a = map(input.slice(0), function (obj) {
+                return parseInt(obj, 10);
+            });
+            configFromArray(config);
+        } else if (typeof(input) === 'object') {
+            configFromObject(config);
+        } else if (typeof(input) === 'number') {
+            // from milliseconds
+            config._d = new Date(input);
+        } else {
+            utils_hooks__hooks.createFromInputFallback(config);
+        }
+    }
+
+    function createLocalOrUTC (input, format, locale, strict, isUTC) {
+        var c = {};
+
+        if (typeof(locale) === 'boolean') {
+            strict = locale;
+            locale = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c._isAMomentObject = true;
+        c._useUTC = c._isUTC = isUTC;
+        c._l = locale;
+        c._i = input;
+        c._f = format;
+        c._strict = strict;
+
+        return createFromConfig(c);
+    }
+
+    function local__createLocal (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, false);
+    }
+
+    var prototypeMin = deprecate(
+         'moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548',
+         function () {
+             var other = local__createLocal.apply(null, arguments);
+             return other < this ? this : other;
+         }
+     );
+
+    var prototypeMax = deprecate(
+        'moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548',
+        function () {
+            var other = local__createLocal.apply(null, arguments);
+            return other > this ? this : other;
+        }
+    );
+
+    // Pick a moment m from moments so that m[fn](other) is true for all
+    // other. This relies on the function fn to be transitive.
+    //
+    // moments should either be an array of moment objects or an array, whose
+    // first element is an array of moment objects.
+    function pickBy(fn, moments) {
+        var res, i;
+        if (moments.length === 1 && isArray(moments[0])) {
+            moments = moments[0];
+        }
+        if (!moments.length) {
+            return local__createLocal();
+        }
+        res = moments[0];
+        for (i = 1; i < moments.length; ++i) {
+            if (moments[i][fn](res)) {
+                res = moments[i];
+            }
+        }
+        return res;
+    }
+
+    // TODO: Use [].sort instead?
+    function min () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isBefore', args);
+    }
+
+    function max () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isAfter', args);
+    }
+
+    function Duration (duration) {
+        var normalizedInput = normalizeObjectUnits(duration),
+            years = normalizedInput.year || 0,
+            quarters = normalizedInput.quarter || 0,
+            months = normalizedInput.month || 0,
+            weeks = normalizedInput.week || 0,
+            days = normalizedInput.day || 0,
+            hours = normalizedInput.hour || 0,
+            minutes = normalizedInput.minute || 0,
+            seconds = normalizedInput.second || 0,
+            milliseconds = normalizedInput.millisecond || 0;
+
+        // representation for dateAddRemove
+        this._milliseconds = +milliseconds +
+            seconds * 1e3 + // 1000
+            minutes * 6e4 + // 1000 * 60
+            hours * 36e5; // 1000 * 60 * 60
+        // Because of dateAddRemove treats 24 hours as different from a
+        // day when working around DST, we need to store them separately
+        this._days = +days +
+            weeks * 7;
+        // It is impossible translate months into days without knowing
+        // which months you are are talking about, so we have to store
+        // it separately.
+        this._months = +months +
+            quarters * 3 +
+            years * 12;
+
+        this._data = {};
+
+        this._locale = locale_locales__getLocale();
+
+        this._bubble();
+    }
+
+    function isDuration (obj) {
+        return obj instanceof Duration;
+    }
+
+    function offset (token, separator) {
+        addFormatToken(token, 0, 0, function () {
+            var offset = this.utcOffset();
+            var sign = '+';
+            if (offset < 0) {
+                offset = -offset;
+                sign = '-';
+            }
+            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
+        });
+    }
+
+    offset('Z', ':');
+    offset('ZZ', '');
+
+    // PARSING
+
+    addRegexToken('Z',  matchOffset);
+    addRegexToken('ZZ', matchOffset);
+    addParseToken(['Z', 'ZZ'], function (input, array, config) {
+        config._useUTC = true;
+        config._tzm = offsetFromString(input);
+    });
+
+    // HELPERS
+
+    // timezone chunker
+    // '+10:00' > ['10',  '00']
+    // '-1530'  > ['-15', '30']
+    var chunkOffset = /([\+\-]|\d\d)/gi;
+
+    function offsetFromString(string) {
+        var matches = ((string || '').match(matchOffset) || []);
+        var chunk   = matches[matches.length - 1] || [];
+        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+        var minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+        return parts[0] === '+' ? minutes : -minutes;
+    }
+
+    // Return a moment from input, that is local/utc/zone equivalent to model.
+    function cloneWithOffset(input, model) {
+        var res, diff;
+        if (model._isUTC) {
+            res = model.clone();
+            diff = (isMoment(input) || isDate(input) ? +input : +local__createLocal(input)) - (+res);
+            // Use low-level api, because this fn is low-level api.
+            res._d.setTime(+res._d + diff);
+            utils_hooks__hooks.updateOffset(res, false);
+            return res;
+        } else {
+            return local__createLocal(input).local();
+        }
+        return model._isUTC ? local__createLocal(input).zone(model._offset || 0) : local__createLocal(input).local();
+    }
+
+    function getDateOffset (m) {
+        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+        // https://github.com/moment/moment/pull/1871
+        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
+    }
+
+    // HOOKS
+
+    // This function will be called whenever a moment is mutated.
+    // It is intended to keep the offset in sync with the timezone.
+    utils_hooks__hooks.updateOffset = function () {};
+
+    // MOMENTS
+
+    // keepLocalTime = true means only change the timezone, without
+    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+    // +0200, so we adjust the time as needed, to be valid.
+    //
+    // Keeping the time actually adds/subtracts (one hour)
+    // from the actual represented time. That is why we call updateOffset
+    // a second time. In case it wants us to change the offset again
+    // _changeInProgress == true case, then we have to adjust, because
+    // there is no such time in the given timezone.
+    function getSetOffset (input, keepLocalTime) {
+        var offset = this._offset || 0,
+            localAdjust;
+        if (input != null) {
+            if (typeof input === 'string') {
+                input = offsetFromString(input);
+            }
+            if (Math.abs(input) < 16) {
+                input = input * 60;
+            }
+            if (!this._isUTC && keepLocalTime) {
+                localAdjust = getDateOffset(this);
+            }
+            this._offset = input;
+            this._isUTC = true;
+            if (localAdjust != null) {
+                this.add(localAdjust, 'm');
+            }
+            if (offset !== input) {
+                if (!keepLocalTime || this._changeInProgress) {
+                    add_subtract__addSubtract(this, create__createDuration(input - offset, 'm'), 1, false);
+                } else if (!this._changeInProgress) {
+                    this._changeInProgress = true;
+                    utils_hooks__hooks.updateOffset(this, true);
+                    this._changeInProgress = null;
+                }
+            }
+            return this;
+        } else {
+            return this._isUTC ? offset : getDateOffset(this);
+        }
+    }
+
+    function getSetZone (input, keepLocalTime) {
+        if (input != null) {
+            if (typeof input !== 'string') {
+                input = -input;
+            }
+
+            this.utcOffset(input, keepLocalTime);
+
+            return this;
+        } else {
+            return -this.utcOffset();
+        }
+    }
+
+    function setOffsetToUTC (keepLocalTime) {
+        return this.utcOffset(0, keepLocalTime);
+    }
+
+    function setOffsetToLocal (keepLocalTime) {
+        if (this._isUTC) {
+            this.utcOffset(0, keepLocalTime);
+            this._isUTC = false;
+
+            if (keepLocalTime) {
+                this.subtract(getDateOffset(this), 'm');
+            }
+        }
+        return this;
+    }
+
+    function setOffsetToParsedOffset () {
+        if (this._tzm) {
+            this.utcOffset(this._tzm);
+        } else if (typeof this._i === 'string') {
+            this.utcOffset(offsetFromString(this._i));
+        }
+        return this;
+    }
+
+    function hasAlignedHourOffset (input) {
+        if (!input) {
+            input = 0;
+        }
+        else {
+            input = local__createLocal(input).utcOffset();
+        }
+
+        return (this.utcOffset() - input) % 60 === 0;
+    }
+
+    function isDaylightSavingTime () {
+        return (
+            this.utcOffset() > this.clone().month(0).utcOffset() ||
+            this.utcOffset() > this.clone().month(5).utcOffset()
+        );
+    }
+
+    function isDaylightSavingTimeShifted () {
+        if (this._a) {
+            var other = this._isUTC ? create_utc__createUTC(this._a) : local__createLocal(this._a);
+            return this.isValid() && compareArrays(this._a, other.toArray()) > 0;
+        }
+
+        return false;
+    }
+
+    function isLocal () {
+        return !this._isUTC;
+    }
+
+    function isUtcOffset () {
+        return this._isUTC;
+    }
+
+    function isUtc () {
+        return this._isUTC && this._offset === 0;
+    }
+
+    var aspNetRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/;
+
+    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+    var create__isoRegex = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;
+
+    function create__createDuration (input, key) {
+        var duration = input,
+            // matching against regexp is expensive, do it on demand
+            match = null,
+            sign,
+            ret,
+            diffRes;
+
+        if (isDuration(input)) {
+            duration = {
+                ms : input._milliseconds,
+                d  : input._days,
+                M  : input._months
+            };
+        } else if (typeof input === 'number') {
+            duration = {};
+            if (key) {
+                duration[key] = input;
+            } else {
+                duration.milliseconds = input;
+            }
+        } else if (!!(match = aspNetRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y  : 0,
+                d  : toInt(match[DATE])        * sign,
+                h  : toInt(match[HOUR])        * sign,
+                m  : toInt(match[MINUTE])      * sign,
+                s  : toInt(match[SECOND])      * sign,
+                ms : toInt(match[MILLISECOND]) * sign
+            };
+        } else if (!!(match = create__isoRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y : parseIso(match[2], sign),
+                M : parseIso(match[3], sign),
+                d : parseIso(match[4], sign),
+                h : parseIso(match[5], sign),
+                m : parseIso(match[6], sign),
+                s : parseIso(match[7], sign),
+                w : parseIso(match[8], sign)
+            };
+        } else if (duration == null) {// checks for null or undefined
+            duration = {};
+        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
+            diffRes = momentsDifference(local__createLocal(duration.from), local__createLocal(duration.to));
+
+            duration = {};
+            duration.ms = diffRes.milliseconds;
+            duration.M = diffRes.months;
+        }
+
+        ret = new Duration(duration);
+
+        if (isDuration(input) && hasOwnProp(input, '_locale')) {
+            ret._locale = input._locale;
+        }
+
+        return ret;
+    }
+
+    create__createDuration.fn = Duration.prototype;
+
+    function parseIso (inp, sign) {
+        // We'd normally use ~~inp for this, but unfortunately it also
+        // converts floats to ints.
+        // inp may be undefined, so careful calling replace on it.
+        var res = inp && parseFloat(inp.replace(',', '.'));
+        // apply sign while we're at it
+        return (isNaN(res) ? 0 : res) * sign;
+    }
+
+    function positiveMomentsDifference(base, other) {
+        var res = {milliseconds: 0, months: 0};
+
+        res.months = other.month() - base.month() +
+            (other.year() - base.year()) * 12;
+        if (base.clone().add(res.months, 'M').isAfter(other)) {
+            --res.months;
+        }
+
+        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
+
+        return res;
+    }
+
+    function momentsDifference(base, other) {
+        var res;
+        other = cloneWithOffset(other, base);
+        if (base.isBefore(other)) {
+            res = positiveMomentsDifference(base, other);
+        } else {
+            res = positiveMomentsDifference(other, base);
+            res.milliseconds = -res.milliseconds;
+            res.months = -res.months;
+        }
+
+        return res;
+    }
+
+    function createAdder(direction, name) {
+        return function (val, period) {
+            var dur, tmp;
+            //invert the arguments, but complain about it
+            if (period !== null && !isNaN(+period)) {
+                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period).');
+                tmp = val; val = period; period = tmp;
+            }
+
+            val = typeof val === 'string' ? +val : val;
+            dur = create__createDuration(val, period);
+            add_subtract__addSubtract(this, dur, direction);
+            return this;
+        };
+    }
+
+    function add_subtract__addSubtract (mom, duration, isAdding, updateOffset) {
+        var milliseconds = duration._milliseconds,
+            days = duration._days,
+            months = duration._months;
+        updateOffset = updateOffset == null ? true : updateOffset;
+
+        if (milliseconds) {
+            mom._d.setTime(+mom._d + milliseconds * isAdding);
+        }
+        if (days) {
+            get_set__set(mom, 'Date', get_set__get(mom, 'Date') + days * isAdding);
+        }
+        if (months) {
+            setMonth(mom, get_set__get(mom, 'Month') + months * isAdding);
+        }
+        if (updateOffset) {
+            utils_hooks__hooks.updateOffset(mom, days || months);
+        }
+    }
+
+    var add_subtract__add      = createAdder(1, 'add');
+    var add_subtract__subtract = createAdder(-1, 'subtract');
+
+    function moment_calendar__calendar (time) {
+        // We want to compare the start of today, vs this.
+        // Getting start-of-today depends on whether we're local/utc/offset or not.
+        var now = time || local__createLocal(),
+            sod = cloneWithOffset(now, this).startOf('day'),
+            diff = this.diff(sod, 'days', true),
+            format = diff < -6 ? 'sameElse' :
+                diff < -1 ? 'lastWeek' :
+                diff < 0 ? 'lastDay' :
+                diff < 1 ? 'sameDay' :
+                diff < 2 ? 'nextDay' :
+                diff < 7 ? 'nextWeek' : 'sameElse';
+        return this.format(this.localeData().calendar(format, this, local__createLocal(now)));
+    }
+
+    function clone () {
+        return new Moment(this);
+    }
+
+    function isAfter (input, units) {
+        var inputMs;
+        units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+        if (units === 'millisecond') {
+            input = isMoment(input) ? input : local__createLocal(input);
+            return +this > +input;
+        } else {
+            inputMs = isMoment(input) ? +input : +local__createLocal(input);
+            return inputMs < +this.clone().startOf(units);
+        }
+    }
+
+    function isBefore (input, units) {
+        var inputMs;
+        units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+        if (units === 'millisecond') {
+            input = isMoment(input) ? input : local__createLocal(input);
+            return +this < +input;
+        } else {
+            inputMs = isMoment(input) ? +input : +local__createLocal(input);
+            return +this.clone().endOf(units) < inputMs;
+        }
+    }
+
+    function isBetween (from, to, units) {
+        return this.isAfter(from, units) && this.isBefore(to, units);
+    }
+
+    function isSame (input, units) {
+        var inputMs;
+        units = normalizeUnits(units || 'millisecond');
+        if (units === 'millisecond') {
+            input = isMoment(input) ? input : local__createLocal(input);
+            return +this === +input;
+        } else {
+            inputMs = +local__createLocal(input);
+            return +(this.clone().startOf(units)) <= inputMs && inputMs <= +(this.clone().endOf(units));
+        }
+    }
+
+    function absFloor (number) {
+        if (number < 0) {
+            return Math.ceil(number);
+        } else {
+            return Math.floor(number);
+        }
+    }
+
+    function diff (input, units, asFloat) {
+        var that = cloneWithOffset(input, this),
+            zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4,
+            delta, output;
+
+        units = normalizeUnits(units);
+
+        if (units === 'year' || units === 'month' || units === 'quarter') {
+            output = monthDiff(this, that);
+            if (units === 'quarter') {
+                output = output / 3;
+            } else if (units === 'year') {
+                output = output / 12;
+            }
+        } else {
+            delta = this - that;
+            output = units === 'second' ? delta / 1e3 : // 1000
+                units === 'minute' ? delta / 6e4 : // 1000 * 60
+                units === 'hour' ? delta / 36e5 : // 1000 * 60 * 60
+                units === 'day' ? (delta - zoneDelta) / 864e5 : // 1000 * 60 * 60 * 24, negate dst
+                units === 'week' ? (delta - zoneDelta) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst
+                delta;
+        }
+        return asFloat ? output : absFloor(output);
+    }
+
+    function monthDiff (a, b) {
+        // difference in months
+        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
+            // b is in (anchor - 1 month, anchor + 1 month)
+            anchor = a.clone().add(wholeMonthDiff, 'months'),
+            anchor2, adjust;
+
+        if (b - anchor < 0) {
+            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor - anchor2);
+        } else {
+            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor2 - anchor);
+        }
+
+        return -(wholeMonthDiff + adjust);
+    }
+
+    utils_hooks__hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+
+    function toString () {
+        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+    }
+
+    function moment_format__toISOString () {
+        var m = this.clone().utc();
+        if (0 < m.year() && m.year() <= 9999) {
+            if ('function' === typeof Date.prototype.toISOString) {
+                // native implementation is ~50x faster, use it when we can
+                return this.toDate().toISOString();
+            } else {
+                return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+            }
+        } else {
+            return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+        }
+    }
+
+    function moment_format__format (inputString) {
+        var output = formatMoment(this, inputString || utils_hooks__hooks.defaultFormat);
+        return this.localeData().postformat(output);
+    }
+
+    function from (time, withoutSuffix) {
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+        return create__createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
+    }
+
+    function fromNow (withoutSuffix) {
+        return this.from(local__createLocal(), withoutSuffix);
+    }
+
+    function to (time, withoutSuffix) {
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+        return create__createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
+    }
+
+    function toNow (withoutSuffix) {
+        return this.to(local__createLocal(), withoutSuffix);
+    }
+
+    function locale (key) {
+        var newLocaleData;
+
+        if (key === undefined) {
+            return this._locale._abbr;
+        } else {
+            newLocaleData = locale_locales__getLocale(key);
+            if (newLocaleData != null) {
+                this._locale = newLocaleData;
+            }
+            return this;
+        }
+    }
+
+    var lang = deprecate(
+        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+        function (key) {
+            if (key === undefined) {
+                return this.localeData();
+            } else {
+                return this.locale(key);
+            }
+        }
+    );
+
+    function localeData () {
+        return this._locale;
+    }
+
+    function startOf (units) {
+        units = normalizeUnits(units);
+        // the following switch intentionally omits break keywords
+        // to utilize falling through the cases.
+        switch (units) {
+        case 'year':
+            this.month(0);
+            /* falls through */
+        case 'quarter':
+        case 'month':
+            this.date(1);
+            /* falls through */
+        case 'week':
+        case 'isoWeek':
+        case 'day':
+            this.hours(0);
+            /* falls through */
+        case 'hour':
+            this.minutes(0);
+            /* falls through */
+        case 'minute':
+            this.seconds(0);
+            /* falls through */
+        case 'second':
+            this.milliseconds(0);
+        }
+
+        // weeks are a special case
+        if (units === 'week') {
+            this.weekday(0);
+        }
+        if (units === 'isoWeek') {
+            this.isoWeekday(1);
+        }
+
+        // quarters are also special
+        if (units === 'quarter') {
+            this.month(Math.floor(this.month() / 3) * 3);
+        }
+
+        return this;
+    }
+
+    function endOf (units) {
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond') {
+            return this;
+        }
+        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
+    }
+
+    function to_type__valueOf () {
+        return +this._d - ((this._offset || 0) * 60000);
+    }
+
+    function unix () {
+        return Math.floor(+this / 1000);
+    }
+
+    function toDate () {
+        return this._offset ? new Date(+this) : this._d;
+    }
+
+    function toArray () {
+        var m = this;
+        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
+    }
+
+    function moment_valid__isValid () {
+        return valid__isValid(this);
+    }
+
+    function parsingFlags () {
+        return extend({}, getParsingFlags(this));
+    }
+
+    function invalidAt () {
+        return getParsingFlags(this).overflow;
+    }
+
+    addFormatToken(0, ['gg', 2], 0, function () {
+        return this.weekYear() % 100;
+    });
+
+    addFormatToken(0, ['GG', 2], 0, function () {
+        return this.isoWeekYear() % 100;
+    });
+
+    function addWeekYearFormatToken (token, getter) {
+        addFormatToken(0, [token, token.length], 0, getter);
+    }
+
+    addWeekYearFormatToken('gggg',     'weekYear');
+    addWeekYearFormatToken('ggggg',    'weekYear');
+    addWeekYearFormatToken('GGGG',  'isoWeekYear');
+    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
+
+    // ALIASES
+
+    addUnitAlias('weekYear', 'gg');
+    addUnitAlias('isoWeekYear', 'GG');
+
+    // PARSING
+
+    addRegexToken('G',      matchSigned);
+    addRegexToken('g',      matchSigned);
+    addRegexToken('GG',     match1to2, match2);
+    addRegexToken('gg',     match1to2, match2);
+    addRegexToken('GGGG',   match1to4, match4);
+    addRegexToken('gggg',   match1to4, match4);
+    addRegexToken('GGGGG',  match1to6, match6);
+    addRegexToken('ggggg',  match1to6, match6);
+
+    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
+        week[token.substr(0, 2)] = toInt(input);
+    });
+
+    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+        week[token] = utils_hooks__hooks.parseTwoDigitYear(input);
+    });
+
+    // HELPERS
+
+    function weeksInYear(year, dow, doy) {
+        return weekOfYear(local__createLocal([year, 11, 31 + dow - doy]), dow, doy).week;
+    }
+
+    // MOMENTS
+
+    function getSetWeekYear (input) {
+        var year = weekOfYear(this, this.localeData()._week.dow, this.localeData()._week.doy).year;
+        return input == null ? year : this.add((input - year), 'y');
+    }
+
+    function getSetISOWeekYear (input) {
+        var year = weekOfYear(this, 1, 4).year;
+        return input == null ? year : this.add((input - year), 'y');
+    }
+
+    function getISOWeeksInYear () {
+        return weeksInYear(this.year(), 1, 4);
+    }
+
+    function getWeeksInYear () {
+        var weekInfo = this.localeData()._week;
+        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+    }
+
+    addFormatToken('Q', 0, 0, 'quarter');
+
+    // ALIASES
+
+    addUnitAlias('quarter', 'Q');
+
+    // PARSING
+
+    addRegexToken('Q', match1);
+    addParseToken('Q', function (input, array) {
+        array[MONTH] = (toInt(input) - 1) * 3;
+    });
+
+    // MOMENTS
+
+    function getSetQuarter (input) {
+        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
+    }
+
+    addFormatToken('D', ['DD', 2], 'Do', 'date');
+
+    // ALIASES
+
+    addUnitAlias('date', 'D');
+
+    // PARSING
+
+    addRegexToken('D',  match1to2);
+    addRegexToken('DD', match1to2, match2);
+    addRegexToken('Do', function (isStrict, locale) {
+        return isStrict ? locale._ordinalParse : locale._ordinalParseLenient;
+    });
+
+    addParseToken(['D', 'DD'], DATE);
+    addParseToken('Do', function (input, array) {
+        array[DATE] = toInt(input.match(match1to2)[0], 10);
+    });
+
+    // MOMENTS
+
+    var getSetDayOfMonth = makeGetSet('Date', true);
+
+    addFormatToken('d', 0, 'do', 'day');
+
+    addFormatToken('dd', 0, 0, function (format) {
+        return this.localeData().weekdaysMin(this, format);
+    });
+
+    addFormatToken('ddd', 0, 0, function (format) {
+        return this.localeData().weekdaysShort(this, format);
+    });
+
+    addFormatToken('dddd', 0, 0, function (format) {
+        return this.localeData().weekdays(this, format);
+    });
+
+    addFormatToken('e', 0, 0, 'weekday');
+    addFormatToken('E', 0, 0, 'isoWeekday');
+
+    // ALIASES
+
+    addUnitAlias('day', 'd');
+    addUnitAlias('weekday', 'e');
+    addUnitAlias('isoWeekday', 'E');
+
+    // PARSING
+
+    addRegexToken('d',    match1to2);
+    addRegexToken('e',    match1to2);
+    addRegexToken('E',    match1to2);
+    addRegexToken('dd',   matchWord);
+    addRegexToken('ddd',  matchWord);
+    addRegexToken('dddd', matchWord);
+
+    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config) {
+        var weekday = config._locale.weekdaysParse(input);
+        // if we didn't get a weekday name, mark the date as invalid
+        if (weekday != null) {
+            week.d = weekday;
+        } else {
+            getParsingFlags(config).invalidWeekday = input;
+        }
+    });
+
+    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+        week[token] = toInt(input);
+    });
+
+    // HELPERS
+
+    function parseWeekday(input, locale) {
+        if (typeof input === 'string') {
+            if (!isNaN(input)) {
+                input = parseInt(input, 10);
+            }
+            else {
+                input = locale.weekdaysParse(input);
+                if (typeof input !== 'number') {
+                    return null;
+                }
+            }
+        }
+        return input;
+    }
+
+    // LOCALES
+
+    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
+    function localeWeekdays (m) {
+        return this._weekdays[m.day()];
+    }
+
+    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
+    function localeWeekdaysShort (m) {
+        return this._weekdaysShort[m.day()];
+    }
+
+    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
+    function localeWeekdaysMin (m) {
+        return this._weekdaysMin[m.day()];
+    }
+
+    function localeWeekdaysParse (weekdayName) {
+        var i, mom, regex;
+
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+        }
+
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+            if (!this._weekdaysParse[i]) {
+                mom = local__createLocal([2000, 1]).day(i);
+                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (this._weekdaysParse[i].test(weekdayName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function getSetDayOfWeek (input) {
+        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+        if (input != null) {
+            input = parseWeekday(input, this.localeData());
+            return this.add(input - day, 'd');
+        } else {
+            return day;
+        }
+    }
+
+    function getSetLocaleDayOfWeek (input) {
+        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+        return input == null ? weekday : this.add(input - weekday, 'd');
+    }
+
+    function getSetISODayOfWeek (input) {
+        // behaves the same as moment#day except
+        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+        // as a setter, sunday should belong to the previous week.
+        return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
+    }
+
+    addFormatToken('H', ['HH', 2], 0, 'hour');
+    addFormatToken('h', ['hh', 2], 0, function () {
+        return this.hours() % 12 || 12;
+    });
+
+    function meridiem (token, lowercase) {
+        addFormatToken(token, 0, 0, function () {
+            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
+        });
+    }
+
+    meridiem('a', true);
+    meridiem('A', false);
+
+    // ALIASES
+
+    addUnitAlias('hour', 'h');
+
+    // PARSING
+
+    function matchMeridiem (isStrict, locale) {
+        return locale._meridiemParse;
+    }
+
+    addRegexToken('a',  matchMeridiem);
+    addRegexToken('A',  matchMeridiem);
+    addRegexToken('H',  match1to2);
+    addRegexToken('h',  match1to2);
+    addRegexToken('HH', match1to2, match2);
+    addRegexToken('hh', match1to2, match2);
+
+    addParseToken(['H', 'HH'], HOUR);
+    addParseToken(['a', 'A'], function (input, array, config) {
+        config._isPm = config._locale.isPM(input);
+        config._meridiem = input;
+    });
+    addParseToken(['h', 'hh'], function (input, array, config) {
+        array[HOUR] = toInt(input);
+        getParsingFlags(config).bigHour = true;
+    });
+
+    // LOCALES
+
+    function localeIsPM (input) {
+        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+        // Using charAt should be more compatible.
+        return ((input + '').toLowerCase().charAt(0) === 'p');
+    }
+
+    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+    function localeMeridiem (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'pm' : 'PM';
+        } else {
+            return isLower ? 'am' : 'AM';
+        }
+    }
+
+
+    // MOMENTS
+
+    // Setting the hour should keep the time, because the user explicitly
+    // specified which hour he wants. So trying to maintain the same hour (in
+    // a new timezone) makes sense. Adding/subtracting hours does not follow
+    // this rule.
+    var getSetHour = makeGetSet('Hours', true);
+
+    addFormatToken('m', ['mm', 2], 0, 'minute');
+
+    // ALIASES
+
+    addUnitAlias('minute', 'm');
+
+    // PARSING
+
+    addRegexToken('m',  match1to2);
+    addRegexToken('mm', match1to2, match2);
+    addParseToken(['m', 'mm'], MINUTE);
+
+    // MOMENTS
+
+    var getSetMinute = makeGetSet('Minutes', false);
+
+    addFormatToken('s', ['ss', 2], 0, 'second');
+
+    // ALIASES
+
+    addUnitAlias('second', 's');
+
+    // PARSING
+
+    addRegexToken('s',  match1to2);
+    addRegexToken('ss', match1to2, match2);
+    addParseToken(['s', 'ss'], SECOND);
+
+    // MOMENTS
+
+    var getSetSecond = makeGetSet('Seconds', false);
+
+    addFormatToken('S', 0, 0, function () {
+        return ~~(this.millisecond() / 100);
+    });
+
+    addFormatToken(0, ['SS', 2], 0, function () {
+        return ~~(this.millisecond() / 10);
+    });
+
+    function millisecond__milliseconds (token) {
+        addFormatToken(0, [token, 3], 0, 'millisecond');
+    }
+
+    millisecond__milliseconds('SSS');
+    millisecond__milliseconds('SSSS');
+
+    // ALIASES
+
+    addUnitAlias('millisecond', 'ms');
+
+    // PARSING
+
+    addRegexToken('S',    match1to3, match1);
+    addRegexToken('SS',   match1to3, match2);
+    addRegexToken('SSS',  match1to3, match3);
+    addRegexToken('SSSS', matchUnsigned);
+    addParseToken(['S', 'SS', 'SSS', 'SSSS'], function (input, array) {
+        array[MILLISECOND] = toInt(('0.' + input) * 1000);
+    });
+
+    // MOMENTS
+
+    var getSetMillisecond = makeGetSet('Milliseconds', false);
+
+    addFormatToken('z',  0, 0, 'zoneAbbr');
+    addFormatToken('zz', 0, 0, 'zoneName');
+
+    // MOMENTS
+
+    function getZoneAbbr () {
+        return this._isUTC ? 'UTC' : '';
+    }
+
+    function getZoneName () {
+        return this._isUTC ? 'Coordinated Universal Time' : '';
+    }
+
+    var momentPrototype__proto = Moment.prototype;
+
+    momentPrototype__proto.add          = add_subtract__add;
+    momentPrototype__proto.calendar     = moment_calendar__calendar;
+    momentPrototype__proto.clone        = clone;
+    momentPrototype__proto.diff         = diff;
+    momentPrototype__proto.endOf        = endOf;
+    momentPrototype__proto.format       = moment_format__format;
+    momentPrototype__proto.from         = from;
+    momentPrototype__proto.fromNow      = fromNow;
+    momentPrototype__proto.to           = to;
+    momentPrototype__proto.toNow        = toNow;
+    momentPrototype__proto.get          = getSet;
+    momentPrototype__proto.invalidAt    = invalidAt;
+    momentPrototype__proto.isAfter      = isAfter;
+    momentPrototype__proto.isBefore     = isBefore;
+    momentPrototype__proto.isBetween    = isBetween;
+    momentPrototype__proto.isSame       = isSame;
+    momentPrototype__proto.isValid      = moment_valid__isValid;
+    momentPrototype__proto.lang         = lang;
+    momentPrototype__proto.locale       = locale;
+    momentPrototype__proto.localeData   = localeData;
+    momentPrototype__proto.max          = prototypeMax;
+    momentPrototype__proto.min          = prototypeMin;
+    momentPrototype__proto.parsingFlags = parsingFlags;
+    momentPrototype__proto.set          = getSet;
+    momentPrototype__proto.startOf      = startOf;
+    momentPrototype__proto.subtract     = add_subtract__subtract;
+    momentPrototype__proto.toArray      = toArray;
+    momentPrototype__proto.toDate       = toDate;
+    momentPrototype__proto.toISOString  = moment_format__toISOString;
+    momentPrototype__proto.toJSON       = moment_format__toISOString;
+    momentPrototype__proto.toString     = toString;
+    momentPrototype__proto.unix         = unix;
+    momentPrototype__proto.valueOf      = to_type__valueOf;
+
+    // Year
+    momentPrototype__proto.year       = getSetYear;
+    momentPrototype__proto.isLeapYear = getIsLeapYear;
+
+    // Week Year
+    momentPrototype__proto.weekYear    = getSetWeekYear;
+    momentPrototype__proto.isoWeekYear = getSetISOWeekYear;
+
+    // Quarter
+    momentPrototype__proto.quarter = momentPrototype__proto.quarters = getSetQuarter;
+
+    // Month
+    momentPrototype__proto.month       = getSetMonth;
+    momentPrototype__proto.daysInMonth = getDaysInMonth;
+
+    // Week
+    momentPrototype__proto.week           = momentPrototype__proto.weeks        = getSetWeek;
+    momentPrototype__proto.isoWeek        = momentPrototype__proto.isoWeeks     = getSetISOWeek;
+    momentPrototype__proto.weeksInYear    = getWeeksInYear;
+    momentPrototype__proto.isoWeeksInYear = getISOWeeksInYear;
+
+    // Day
+    momentPrototype__proto.date       = getSetDayOfMonth;
+    momentPrototype__proto.day        = momentPrototype__proto.days             = getSetDayOfWeek;
+    momentPrototype__proto.weekday    = getSetLocaleDayOfWeek;
+    momentPrototype__proto.isoWeekday = getSetISODayOfWeek;
+    momentPrototype__proto.dayOfYear  = getSetDayOfYear;
+
+    // Hour
+    momentPrototype__proto.hour = momentPrototype__proto.hours = getSetHour;
+
+    // Minute
+    momentPrototype__proto.minute = momentPrototype__proto.minutes = getSetMinute;
+
+    // Second
+    momentPrototype__proto.second = momentPrototype__proto.seconds = getSetSecond;
+
+    // Millisecond
+    momentPrototype__proto.millisecond = momentPrototype__proto.milliseconds = getSetMillisecond;
+
+    // Offset
+    momentPrototype__proto.utcOffset            = getSetOffset;
+    momentPrototype__proto.utc                  = setOffsetToUTC;
+    momentPrototype__proto.local                = setOffsetToLocal;
+    momentPrototype__proto.parseZone            = setOffsetToParsedOffset;
+    momentPrototype__proto.hasAlignedHourOffset = hasAlignedHourOffset;
+    momentPrototype__proto.isDST                = isDaylightSavingTime;
+    momentPrototype__proto.isDSTShifted         = isDaylightSavingTimeShifted;
+    momentPrototype__proto.isLocal              = isLocal;
+    momentPrototype__proto.isUtcOffset          = isUtcOffset;
+    momentPrototype__proto.isUtc                = isUtc;
+    momentPrototype__proto.isUTC                = isUtc;
+
+    // Timezone
+    momentPrototype__proto.zoneAbbr = getZoneAbbr;
+    momentPrototype__proto.zoneName = getZoneName;
+
+    // Deprecations
+    momentPrototype__proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
+    momentPrototype__proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
+    momentPrototype__proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
+    momentPrototype__proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779', getSetZone);
+
+    var momentPrototype = momentPrototype__proto;
+
+    function moment_moment__createUnix (input) {
+        return local__createLocal(input * 1000);
+    }
+
+    function moment_moment__createInZone () {
+        return local__createLocal.apply(null, arguments).parseZone();
+    }
+
+    var defaultCalendar = {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
+    };
+
+    function locale_calendar__calendar (key, mom, now) {
+        var output = this._calendar[key];
+        return typeof output === 'function' ? output.call(mom, now) : output;
+    }
+
+    var defaultLongDateFormat = {
+        LTS  : 'h:mm:ss A',
+        LT   : 'h:mm A',
+        L    : 'MM/DD/YYYY',
+        LL   : 'MMMM D, YYYY',
+        LLL  : 'MMMM D, YYYY LT',
+        LLLL : 'dddd, MMMM D, YYYY LT'
+    };
+
+    function longDateFormat (key) {
+        var output = this._longDateFormat[key];
+        if (!output && this._longDateFormat[key.toUpperCase()]) {
+            output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) {
+                return val.slice(1);
+            });
+            this._longDateFormat[key] = output;
+        }
+        return output;
+    }
+
+    var defaultInvalidDate = 'Invalid date';
+
+    function invalidDate () {
+        return this._invalidDate;
+    }
+
+    var defaultOrdinal = '%d';
+    var defaultOrdinalParse = /\d{1,2}/;
+
+    function ordinal (number) {
+        return this._ordinal.replace('%d', number);
+    }
+
+    function preParsePostFormat (string) {
+        return string;
+    }
+
+    var defaultRelativeTime = {
+        future : 'in %s',
+        past   : '%s ago',
+        s  : 'a few seconds',
+        m  : 'a minute',
+        mm : '%d minutes',
+        h  : 'an hour',
+        hh : '%d hours',
+        d  : 'a day',
+        dd : '%d days',
+        M  : 'a month',
+        MM : '%d months',
+        y  : 'a year',
+        yy : '%d years'
+    };
+
+    function relative__relativeTime (number, withoutSuffix, string, isFuture) {
+        var output = this._relativeTime[string];
+        return (typeof output === 'function') ?
+            output(number, withoutSuffix, string, isFuture) :
+            output.replace(/%d/i, number);
+    }
+
+    function pastFuture (diff, output) {
+        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+        return typeof format === 'function' ? format(output) : format.replace(/%s/i, output);
+    }
+
+    function locale_set__set (config) {
+        var prop, i;
+        for (i in config) {
+            prop = config[i];
+            if (typeof prop === 'function') {
+                this[i] = prop;
+            } else {
+                this['_' + i] = prop;
+            }
+        }
+        // Lenient ordinal parsing accepts just a number in addition to
+        // number + (possibly) stuff coming from _ordinalParseLenient.
+        this._ordinalParseLenient = new RegExp(this._ordinalParse.source + '|' + (/\d{1,2}/).source);
+    }
+
+    var prototype__proto = Locale.prototype;
+
+    prototype__proto._calendar       = defaultCalendar;
+    prototype__proto.calendar        = locale_calendar__calendar;
+    prototype__proto._longDateFormat = defaultLongDateFormat;
+    prototype__proto.longDateFormat  = longDateFormat;
+    prototype__proto._invalidDate    = defaultInvalidDate;
+    prototype__proto.invalidDate     = invalidDate;
+    prototype__proto._ordinal        = defaultOrdinal;
+    prototype__proto.ordinal         = ordinal;
+    prototype__proto._ordinalParse   = defaultOrdinalParse;
+    prototype__proto.preparse        = preParsePostFormat;
+    prototype__proto.postformat      = preParsePostFormat;
+    prototype__proto._relativeTime   = defaultRelativeTime;
+    prototype__proto.relativeTime    = relative__relativeTime;
+    prototype__proto.pastFuture      = pastFuture;
+    prototype__proto.set             = locale_set__set;
+
+    // Month
+    prototype__proto.months       =        localeMonths;
+    prototype__proto._months      = defaultLocaleMonths;
+    prototype__proto.monthsShort  =        localeMonthsShort;
+    prototype__proto._monthsShort = defaultLocaleMonthsShort;
+    prototype__proto.monthsParse  =        localeMonthsParse;
+
+    // Week
+    prototype__proto.week = localeWeek;
+    prototype__proto._week = defaultLocaleWeek;
+    prototype__proto.firstDayOfYear = localeFirstDayOfYear;
+    prototype__proto.firstDayOfWeek = localeFirstDayOfWeek;
+
+    // Day of Week
+    prototype__proto.weekdays       =        localeWeekdays;
+    prototype__proto._weekdays      = defaultLocaleWeekdays;
+    prototype__proto.weekdaysMin    =        localeWeekdaysMin;
+    prototype__proto._weekdaysMin   = defaultLocaleWeekdaysMin;
+    prototype__proto.weekdaysShort  =        localeWeekdaysShort;
+    prototype__proto._weekdaysShort = defaultLocaleWeekdaysShort;
+    prototype__proto.weekdaysParse  =        localeWeekdaysParse;
+
+    // Hours
+    prototype__proto.isPM = localeIsPM;
+    prototype__proto._meridiemParse = defaultLocaleMeridiemParse;
+    prototype__proto.meridiem = localeMeridiem;
+
+    function lists__get (format, index, field, setter) {
+        var locale = locale_locales__getLocale();
+        var utc = create_utc__createUTC().set(setter, index);
+        return locale[field](utc, format);
+    }
+
+    function list (format, index, field, count, setter) {
+        if (typeof format === 'number') {
+            index = format;
+            format = undefined;
+        }
+
+        format = format || '';
+
+        if (index != null) {
+            return lists__get(format, index, field, setter);
+        }
+
+        var i;
+        var out = [];
+        for (i = 0; i < count; i++) {
+            out[i] = lists__get(format, i, field, setter);
+        }
+        return out;
+    }
+
+    function lists__listMonths (format, index) {
+        return list(format, index, 'months', 12, 'month');
+    }
+
+    function lists__listMonthsShort (format, index) {
+        return list(format, index, 'monthsShort', 12, 'month');
+    }
+
+    function lists__listWeekdays (format, index) {
+        return list(format, index, 'weekdays', 7, 'day');
+    }
+
+    function lists__listWeekdaysShort (format, index) {
+        return list(format, index, 'weekdaysShort', 7, 'day');
+    }
+
+    function lists__listWeekdaysMin (format, index) {
+        return list(format, index, 'weekdaysMin', 7, 'day');
+    }
+
+    locale_locales__getSetGlobalLocale('en', {
+        ordinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (toInt(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    // Side effect imports
+    utils_hooks__hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', locale_locales__getSetGlobalLocale);
+    utils_hooks__hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', locale_locales__getLocale);
+
+    var mathAbs = Math.abs;
+
+    function duration_abs__abs () {
+        var data           = this._data;
+
+        this._milliseconds = mathAbs(this._milliseconds);
+        this._days         = mathAbs(this._days);
+        this._months       = mathAbs(this._months);
+
+        data.milliseconds  = mathAbs(data.milliseconds);
+        data.seconds       = mathAbs(data.seconds);
+        data.minutes       = mathAbs(data.minutes);
+        data.hours         = mathAbs(data.hours);
+        data.months        = mathAbs(data.months);
+        data.years         = mathAbs(data.years);
+
+        return this;
+    }
+
+    function duration_add_subtract__addSubtract (duration, input, value, direction) {
+        var other = create__createDuration(input, value);
+
+        duration._milliseconds += direction * other._milliseconds;
+        duration._days         += direction * other._days;
+        duration._months       += direction * other._months;
+
+        return duration._bubble();
+    }
+
+    // supports only 2.0-style add(1, 's') or add(duration)
+    function duration_add_subtract__add (input, value) {
+        return duration_add_subtract__addSubtract(this, input, value, 1);
+    }
+
+    // supports only 2.0-style subtract(1, 's') or subtract(duration)
+    function duration_add_subtract__subtract (input, value) {
+        return duration_add_subtract__addSubtract(this, input, value, -1);
+    }
+
+    function bubble () {
+        var milliseconds = this._milliseconds;
+        var days         = this._days;
+        var months       = this._months;
+        var data         = this._data;
+        var seconds, minutes, hours, years = 0;
+
+        // The following code bubbles up values, see the tests for
+        // examples of what that means.
+        data.milliseconds = milliseconds % 1000;
+
+        seconds           = absFloor(milliseconds / 1000);
+        data.seconds      = seconds % 60;
+
+        minutes           = absFloor(seconds / 60);
+        data.minutes      = minutes % 60;
+
+        hours             = absFloor(minutes / 60);
+        data.hours        = hours % 24;
+
+        days += absFloor(hours / 24);
+
+        // Accurately convert days to years, assume start from year 0.
+        years = absFloor(daysToYears(days));
+        days -= absFloor(yearsToDays(years));
+
+        // 30 days to a month
+        // TODO (iskren): Use anchor date (like 1st Jan) to compute this.
+        months += absFloor(days / 30);
+        days   %= 30;
+
+        // 12 months -> 1 year
+        years  += absFloor(months / 12);
+        months %= 12;
+
+        data.days   = days;
+        data.months = months;
+        data.years  = years;
+
+        return this;
+    }
+
+    function daysToYears (days) {
+        // 400 years have 146097 days (taking into account leap year rules)
+        return days * 400 / 146097;
+    }
+
+    function yearsToDays (years) {
+        // years * 365 + absFloor(years / 4) -
+        //     absFloor(years / 100) + absFloor(years / 400);
+        return years * 146097 / 400;
+    }
+
+    function as (units) {
+        var days;
+        var months;
+        var milliseconds = this._milliseconds;
+
+        units = normalizeUnits(units);
+
+        if (units === 'month' || units === 'year') {
+            days   = this._days   + milliseconds / 864e5;
+            months = this._months + daysToYears(days) * 12;
+            return units === 'month' ? months : months / 12;
+        } else {
+            // handle milliseconds separately because of floating point math errors (issue #1867)
+            days = this._days + Math.round(yearsToDays(this._months / 12));
+            switch (units) {
+                case 'week'   : return days / 7     + milliseconds / 6048e5;
+                case 'day'    : return days         + milliseconds / 864e5;
+                case 'hour'   : return days * 24    + milliseconds / 36e5;
+                case 'minute' : return days * 1440  + milliseconds / 6e4;
+                case 'second' : return days * 86400 + milliseconds / 1000;
+                // Math.floor prevents floating point math errors here
+                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
+                default: throw new Error('Unknown unit ' + units);
+            }
+        }
+    }
+
+    // TODO: Use this.as('ms')?
+    function duration_as__valueOf () {
+        return (
+            this._milliseconds +
+            this._days * 864e5 +
+            (this._months % 12) * 2592e6 +
+            toInt(this._months / 12) * 31536e6
+        );
+    }
+
+    function makeAs (alias) {
+        return function () {
+            return this.as(alias);
+        };
+    }
+
+    var asMilliseconds = makeAs('ms');
+    var asSeconds      = makeAs('s');
+    var asMinutes      = makeAs('m');
+    var asHours        = makeAs('h');
+    var asDays         = makeAs('d');
+    var asWeeks        = makeAs('w');
+    var asMonths       = makeAs('M');
+    var asYears        = makeAs('y');
+
+    function duration_get__get (units) {
+        units = normalizeUnits(units);
+        return this[units + 's']();
+    }
+
+    function makeGetter(name) {
+        return function () {
+            return this._data[name];
+        };
+    }
+
+    var duration_get__milliseconds = makeGetter('milliseconds');
+    var seconds      = makeGetter('seconds');
+    var minutes      = makeGetter('minutes');
+    var hours        = makeGetter('hours');
+    var days         = makeGetter('days');
+    var duration_get__months       = makeGetter('months');
+    var years        = makeGetter('years');
+
+    function weeks () {
+        return absFloor(this.days() / 7);
+    }
+
+    var round = Math.round;
+    var thresholds = {
+        s: 45,  // seconds to minute
+        m: 45,  // minutes to hour
+        h: 22,  // hours to day
+        d: 26,  // days to month
+        M: 11   // months to year
+    };
+
+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+    }
+
+    function duration_humanize__relativeTime (posNegDuration, withoutSuffix, locale) {
+        var duration = create__createDuration(posNegDuration).abs();
+        var seconds  = round(duration.as('s'));
+        var minutes  = round(duration.as('m'));
+        var hours    = round(duration.as('h'));
+        var days     = round(duration.as('d'));
+        var months   = round(duration.as('M'));
+        var years    = round(duration.as('y'));
+
+        var a = seconds < thresholds.s && ['s', seconds]  ||
+                minutes === 1          && ['m']           ||
+                minutes < thresholds.m && ['mm', minutes] ||
+                hours   === 1          && ['h']           ||
+                hours   < thresholds.h && ['hh', hours]   ||
+                days    === 1          && ['d']           ||
+                days    < thresholds.d && ['dd', days]    ||
+                months  === 1          && ['M']           ||
+                months  < thresholds.M && ['MM', months]  ||
+                years   === 1          && ['y']           || ['yy', years];
+
+        a[2] = withoutSuffix;
+        a[3] = +posNegDuration > 0;
+        a[4] = locale;
+        return substituteTimeAgo.apply(null, a);
+    }
+
+    // This function allows you to set a threshold for relative time strings
+    function duration_humanize__getSetRelativeTimeThreshold (threshold, limit) {
+        if (thresholds[threshold] === undefined) {
+            return false;
+        }
+        if (limit === undefined) {
+            return thresholds[threshold];
+        }
+        thresholds[threshold] = limit;
+        return true;
+    }
+
+    function humanize (withSuffix) {
+        var locale = this.localeData();
+        var output = duration_humanize__relativeTime(this, !withSuffix, locale);
+
+        if (withSuffix) {
+            output = locale.pastFuture(+this, output);
+        }
+
+        return locale.postformat(output);
+    }
+
+    var iso_string__abs = Math.abs;
+
+    function iso_string__toISOString() {
+        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+        var Y = iso_string__abs(this.years());
+        var M = iso_string__abs(this.months());
+        var D = iso_string__abs(this.days());
+        var h = iso_string__abs(this.hours());
+        var m = iso_string__abs(this.minutes());
+        var s = iso_string__abs(this.seconds() + this.milliseconds() / 1000);
+        var total = this.asSeconds();
+
+        if (!total) {
+            // this is the same as C#'s (Noda) and python (isodate)...
+            // but not other JS (goog.date)
+            return 'P0D';
+        }
+
+        return (total < 0 ? '-' : '') +
+            'P' +
+            (Y ? Y + 'Y' : '') +
+            (M ? M + 'M' : '') +
+            (D ? D + 'D' : '') +
+            ((h || m || s) ? 'T' : '') +
+            (h ? h + 'H' : '') +
+            (m ? m + 'M' : '') +
+            (s ? s + 'S' : '');
+    }
+
+    var duration_prototype__proto = Duration.prototype;
+
+    duration_prototype__proto.abs            = duration_abs__abs;
+    duration_prototype__proto.add            = duration_add_subtract__add;
+    duration_prototype__proto.subtract       = duration_add_subtract__subtract;
+    duration_prototype__proto.as             = as;
+    duration_prototype__proto.asMilliseconds = asMilliseconds;
+    duration_prototype__proto.asSeconds      = asSeconds;
+    duration_prototype__proto.asMinutes      = asMinutes;
+    duration_prototype__proto.asHours        = asHours;
+    duration_prototype__proto.asDays         = asDays;
+    duration_prototype__proto.asWeeks        = asWeeks;
+    duration_prototype__proto.asMonths       = asMonths;
+    duration_prototype__proto.asYears        = asYears;
+    duration_prototype__proto.valueOf        = duration_as__valueOf;
+    duration_prototype__proto._bubble        = bubble;
+    duration_prototype__proto.get            = duration_get__get;
+    duration_prototype__proto.milliseconds   = duration_get__milliseconds;
+    duration_prototype__proto.seconds        = seconds;
+    duration_prototype__proto.minutes        = minutes;
+    duration_prototype__proto.hours          = hours;
+    duration_prototype__proto.days           = days;
+    duration_prototype__proto.weeks          = weeks;
+    duration_prototype__proto.months         = duration_get__months;
+    duration_prototype__proto.years          = years;
+    duration_prototype__proto.humanize       = humanize;
+    duration_prototype__proto.toISOString    = iso_string__toISOString;
+    duration_prototype__proto.toString       = iso_string__toISOString;
+    duration_prototype__proto.toJSON         = iso_string__toISOString;
+    duration_prototype__proto.locale         = locale;
+    duration_prototype__proto.localeData     = localeData;
+
+    // Deprecations
+    duration_prototype__proto.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', iso_string__toISOString);
+    duration_prototype__proto.lang = lang;
+
+    // Side effect imports
+
+    addFormatToken('X', 0, 0, 'unix');
+    addFormatToken('x', 0, 0, 'valueOf');
+
+    // PARSING
+
+    addRegexToken('x', matchSigned);
+    addRegexToken('X', matchTimestamp);
+    addParseToken('X', function (input, array, config) {
+        config._d = new Date(parseFloat(input, 10) * 1000);
+    });
+    addParseToken('x', function (input, array, config) {
+        config._d = new Date(toInt(input));
+    });
+
+    // Side effect imports
+
+    ;
+
+    //! moment.js
+    //! version : 2.10.3
+    //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+    //! license : MIT
+    //! momentjs.com
+
+    utils_hooks__hooks.version = '2.10.3';
+
+    setHookCallback(local__createLocal);
+
+    utils_hooks__hooks.fn                    = momentPrototype;
+    utils_hooks__hooks.min                   = min;
+    utils_hooks__hooks.max                   = max;
+    utils_hooks__hooks.utc                   = create_utc__createUTC;
+    utils_hooks__hooks.unix                  = moment_moment__createUnix;
+    utils_hooks__hooks.months                = lists__listMonths;
+    utils_hooks__hooks.isDate                = isDate;
+    utils_hooks__hooks.locale                = locale_locales__getSetGlobalLocale;
+    utils_hooks__hooks.invalid               = valid__createInvalid;
+    utils_hooks__hooks.duration              = create__createDuration;
+    utils_hooks__hooks.isMoment              = isMoment;
+    utils_hooks__hooks.weekdays              = lists__listWeekdays;
+    utils_hooks__hooks.parseZone             = moment_moment__createInZone;
+    utils_hooks__hooks.localeData            = locale_locales__getLocale;
+    utils_hooks__hooks.isDuration            = isDuration;
+    utils_hooks__hooks.monthsShort           = lists__listMonthsShort;
+    utils_hooks__hooks.weekdaysMin           = lists__listWeekdaysMin;
+    utils_hooks__hooks.defineLocale          = defineLocale;
+    utils_hooks__hooks.weekdaysShort         = lists__listWeekdaysShort;
+    utils_hooks__hooks.normalizeUnits        = normalizeUnits;
+    utils_hooks__hooks.relativeTimeThreshold = duration_humanize__getSetRelativeTimeThreshold;
+
+    var _moment__default = utils_hooks__hooks;
+
+    //! moment.js locale configuration
+    //! locale : afrikaans (af)
+    //! author : Werner Mollentze : https://github.com/wernerm
+
+    var af = _moment__default.defineLocale('af', {
+        months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
+        weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
+        weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
+        meridiemParse: /vm|nm/i,
+        isPM : function (input) {
+            return /^nm$/i.test(input);
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower ? 'vm' : 'VM';
+            } else {
+                return isLower ? 'nm' : 'NM';
+            }
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Vandag om] LT',
+            nextDay : '[Môre om] LT',
+            nextWeek : 'dddd [om] LT',
+            lastDay : '[Gister om] LT',
+            lastWeek : '[Laas] dddd [om] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'oor %s',
+            past : '%s gelede',
+            s : '\'n paar sekondes',
+            m : '\'n minuut',
+            mm : '%d minute',
+            h : '\'n uur',
+            hh : '%d ure',
+            d : '\'n dag',
+            dd : '%d dae',
+            M : '\'n maand',
+            MM : '%d maande',
+            y : '\'n jaar',
+            yy : '%d jaar'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
+        },
+        week : {
+            dow : 1, // Maandag is die eerste dag van die week.
+            doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Moroccan Arabic (ar-ma)
+    //! author : ElFadili Yassine : https://github.com/ElFadiliY
+    //! author : Abdel Said : https://github.com/abdelsaid
+
+    var ar_ma = _moment__default.defineLocale('ar-ma', {
+        months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+        weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Arabic Saudi Arabia (ar-sa)
+    //! author : Suhail Alkowaileet : https://github.com/xsoh
+
+    var ar_sa__symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, ar_sa__numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    };
+
+    var ar_sa = _moment__default.defineLocale('ar-sa', {
+        months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'في %s',
+            past : 'منذ %s',
+            s : 'ثوان',
+            m : 'دقيقة',
+            mm : '%d دقائق',
+            h : 'ساعة',
+            hh : '%d ساعات',
+            d : 'يوم',
+            dd : '%d أيام',
+            M : 'شهر',
+            MM : '%d أشهر',
+            y : 'سنة',
+            yy : '%d سنوات'
+        },
+        preparse: function (string) {
+            return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return ar_sa__numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return ar_sa__symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale  : Tunisian Arabic (ar-tn)
+
+    var ar_tn = _moment__default.defineLocale('ar-tn', {
+        months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+        weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[اليوم على الساعة] LT',
+            nextDay: '[غدا على الساعة] LT',
+            nextWeek: 'dddd [على الساعة] LT',
+            lastDay: '[أمس على الساعة] LT',
+            lastWeek: 'dddd [على الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'في %s',
+            past: 'منذ %s',
+            s: 'ثوان',
+            m: 'دقيقة',
+            mm: '%d دقائق',
+            h: 'ساعة',
+            hh: '%d ساعات',
+            d: 'يوم',
+            dd: '%d أيام',
+            M: 'شهر',
+            MM: '%d أشهر',
+            y: 'سنة',
+            yy: '%d سنوات'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! Locale: Arabic (ar)
+    //! Author: Abdel Said: https://github.com/abdelsaid
+    //! Changes in months, weekdays: Ahmed Elkhatib
+    //! Native plural forms: forabi https://github.com/forabi
+
+    var ar__symbolMap = {
+        '1': '١',
+        '2': '٢',
+        '3': '٣',
+        '4': '٤',
+        '5': '٥',
+        '6': '٦',
+        '7': '٧',
+        '8': '٨',
+        '9': '٩',
+        '0': '٠'
+    }, ar__numberMap = {
+        '١': '1',
+        '٢': '2',
+        '٣': '3',
+        '٤': '4',
+        '٥': '5',
+        '٦': '6',
+        '٧': '7',
+        '٨': '8',
+        '٩': '9',
+        '٠': '0'
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, ar__months = [
+        'كانون الثاني يناير',
+        'شباط فبراير',
+        'آذار مارس',
+        'نيسان أبريل',
+        'أيار مايو',
+        'حزيران يونيو',
+        'تموز يوليو',
+        'آب أغسطس',
+        'أيلول سبتمبر',
+        'تشرين الأول أكتوبر',
+        'تشرين الثاني نوفمبر',
+        'كانون الأول ديسمبر'
+    ];
+
+    var ar = _moment__default.defineLocale('ar', {
+        months : ar__months,
+        monthsShort : ar__months,
+        weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+        weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+        weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'D/\u200FM/\u200FYYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        meridiemParse: /ص|م/,
+        isPM : function (input) {
+            return 'م' === input;
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ص';
+            } else {
+                return 'م';
+            }
+        },
+        calendar : {
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'بعد %s',
+            past : 'منذ %s',
+            s : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
+        },
+        preparse: function (string) {
+            return string.replace(/\u200f/g, '').replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+                return ar__numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return ar__symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : azerbaijani (az)
+    //! author : topchiyev : https://github.com/topchiyev
+
+    var az__suffixes = {
+        1: '-inci',
+        5: '-inci',
+        8: '-inci',
+        70: '-inci',
+        80: '-inci',
+        2: '-nci',
+        7: '-nci',
+        20: '-nci',
+        50: '-nci',
+        3: '-üncü',
+        4: '-üncü',
+        100: '-üncü',
+        6: '-ncı',
+        9: '-uncu',
+        10: '-uncu',
+        30: '-uncu',
+        60: '-ıncı',
+        90: '-ıncı'
+    };
+
+    var az = _moment__default.defineLocale('az', {
+        months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
+        monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
+        weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
+        weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
+        weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[sabah saat] LT',
+            nextWeek : '[gələn həftə] dddd [saat] LT',
+            lastDay : '[dünən] LT',
+            lastWeek : '[keçən həftə] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s əvvəl',
+            s : 'birneçə saniyyə',
+            m : 'bir dəqiqə',
+            mm : '%d dəqiqə',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir il',
+            yy : '%d il'
+        },
+        meridiemParse: /gecə|səhər|gündüz|axşam/,
+        isPM : function (input) {
+            return /^(gündüz|axşam)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'gecə';
+            } else if (hour < 12) {
+                return 'səhər';
+            } else if (hour < 17) {
+                return 'gündüz';
+            } else {
+                return 'axşam';
+            }
+        },
+        ordinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '-ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (az__suffixes[a] || az__suffixes[b] || az__suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : belarusian (be)
+    //! author : Dmitry Demidov : https://github.com/demidov91
+    //! author: Praleska: http://praleska.pro/
+    //! Author : Menelion Elensúle : https://github.com/Oire
+
+    function be__plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function be__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
+            'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
+            'dd': 'дзень_дні_дзён',
+            'MM': 'месяц_месяцы_месяцаў',
+            'yy': 'год_гады_гадоў'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвіліна' : 'хвіліну';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'гадзіна' : 'гадзіну';
+        }
+        else {
+            return number + ' ' + be__plural(format[key], +number);
+        }
+    }
+    function be__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_'),
+            'accusative': 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function be__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
+            'accusative': 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_')
+        },
+        nounCase = (/\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var be = _moment__default.defineLocale('be', {
+        months : be__monthsCaseReplace,
+        monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
+        weekdays : be__weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., LT',
+            LLLL : 'dddd, D MMMM YYYY г., LT'
+        },
+        calendar : {
+            sameDay: '[Сёння ў] LT',
+            nextDay: '[Заўтра ў] LT',
+            lastDay: '[Учора ў] LT',
+            nextWeek: function () {
+                return '[У] dddd [ў] LT';
+            },
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 5:
+                case 6:
+                    return '[У мінулую] dddd [ў] LT';
+                case 1:
+                case 2:
+                case 4:
+                    return '[У мінулы] dddd [ў] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'праз %s',
+            past : '%s таму',
+            s : 'некалькі секунд',
+            m : be__relativeTimeWithPlural,
+            mm : be__relativeTimeWithPlural,
+            h : be__relativeTimeWithPlural,
+            hh : be__relativeTimeWithPlural,
+            d : 'дзень',
+            dd : be__relativeTimeWithPlural,
+            M : 'месяц',
+            MM : be__relativeTimeWithPlural,
+            y : 'год',
+            yy : be__relativeTimeWithPlural
+        },
+        meridiemParse: /ночы|раніцы|дня|вечара/,
+        isPM : function (input) {
+            return /^(дня|вечара)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночы';
+            } else if (hour < 12) {
+                return 'раніцы';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечара';
+            }
+        },
+        ordinalParse: /\d{1,2}-(і|ы|га)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+            case 'w':
+            case 'W':
+                return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
+            case 'D':
+                return number + '-га';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : bulgarian (bg)
+    //! author : Krasen Borisov : https://github.com/kraz
+
+    var bg = _moment__default.defineLocale('bg', {
+        months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Днес в] LT',
+            nextDay : '[Утре в] LT',
+            nextWeek : 'dddd [в] LT',
+            lastDay : '[Вчера в] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 6:
+                    return '[В изминалата] dddd [в] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[В изминалия] dddd [в] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'след %s',
+            past : 'преди %s',
+            s : 'няколко секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дни',
+            M : 'месец',
+            MM : '%d месеца',
+            y : 'година',
+            yy : '%d години'
+        },
+        ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Bengali (bn)
+    //! author : Kaushik Gandhi : https://github.com/kaushikgandhi
+
+    var bn__symbolMap = {
+        '1': '১',
+        '2': '২',
+        '3': '৩',
+        '4': '৪',
+        '5': '৫',
+        '6': '৬',
+        '7': '৭',
+        '8': '৮',
+        '9': '৯',
+        '0': '০'
+    },
+    bn__numberMap = {
+        '১': '1',
+        '২': '2',
+        '৩': '3',
+        '৪': '4',
+        '৫': '5',
+        '৬': '6',
+        '৭': '7',
+        '৮': '8',
+        '৯': '9',
+        '০': '0'
+    };
+
+    var bn = _moment__default.defineLocale('bn', {
+        months : 'জানুয়ারী_ফেবুয়ারী_মার্চ_এপ্রিল_মে_জুন_জুলাই_অগাস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+        monthsShort : 'জানু_ফেব_মার্চ_এপর_মে_জুন_জুল_অগ_সেপ্ট_অক্টো_নভ_ডিসেম্'.split('_'),
+        weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পত্তিবার_শুক্রুবার_শনিবার'.split('_'),
+        weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পত্তি_শুক্রু_শনি'.split('_'),
+        weekdaysMin : 'রব_সম_মঙ্গ_বু_ব্রিহ_শু_শনি'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm সময়',
+            LTS : 'A h:mm:ss সময়',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[আজ] LT',
+            nextDay : '[আগামীকাল] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[গতকাল] LT',
+            lastWeek : '[গত] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s পরে',
+            past : '%s আগে',
+            s : 'কএক সেকেন্ড',
+            m : 'এক মিনিট',
+            mm : '%d মিনিট',
+            h : 'এক ঘন্টা',
+            hh : '%d ঘন্টা',
+            d : 'এক দিন',
+            dd : '%d দিন',
+            M : 'এক মাস',
+            MM : '%d মাস',
+            y : 'এক বছর',
+            yy : '%d বছর'
+        },
+        preparse: function (string) {
+            return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+                return bn__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return bn__symbolMap[match];
+            });
+        },
+        meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/,
+        isPM: function (input) {
+            return /^(দুপুর|বিকেল|রাত)$/.test(input);
+        },
+        //Bengali is a vast language its spoken
+        //in different forms in various parts of the world.
+        //I have just generalized with most common one used
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'রাত';
+            } else if (hour < 10) {
+                return 'শকাল';
+            } else if (hour < 17) {
+                return 'দুপুর';
+            } else if (hour < 20) {
+                return 'বিকেল';
+            } else {
+                return 'রাত';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : tibetan (bo)
+    //! author : Thupten N. Chakrishar : https://github.com/vajradog
+
+    var bo__symbolMap = {
+        '1': '༡',
+        '2': '༢',
+        '3': '༣',
+        '4': '༤',
+        '5': '༥',
+        '6': '༦',
+        '7': '༧',
+        '8': '༨',
+        '9': '༩',
+        '0': '༠'
+    },
+    bo__numberMap = {
+        '༡': '1',
+        '༢': '2',
+        '༣': '3',
+        '༤': '4',
+        '༥': '5',
+        '༦': '6',
+        '༧': '7',
+        '༨': '8',
+        '༩': '9',
+        '༠': '0'
+    };
+
+    var bo = _moment__default.defineLocale('bo', {
+        months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+        weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
+        weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[དི་རིང] LT',
+            nextDay : '[སང་ཉིན] LT',
+            nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
+            lastDay : '[ཁ་སང] LT',
+            lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s ལ་',
+            past : '%s སྔན་ལ',
+            s : 'ལམ་སང',
+            m : 'སྐར་མ་གཅིག',
+            mm : '%d སྐར་མ',
+            h : 'ཆུ་ཚོད་གཅིག',
+            hh : '%d ཆུ་ཚོད',
+            d : 'ཉིན་གཅིག',
+            dd : '%d ཉིན་',
+            M : 'ཟླ་བ་གཅིག',
+            MM : '%d ཟླ་བ',
+            y : 'ལོ་གཅིག',
+            yy : '%d ལོ'
+        },
+        preparse: function (string) {
+            return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
+                return bo__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return bo__symbolMap[match];
+            });
+        },
+        meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
+        isPM: function (input) {
+            return /^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'མཚན་མོ';
+            } else if (hour < 10) {
+                return 'ཞོགས་ཀས';
+            } else if (hour < 17) {
+                return 'ཉིན་གུང';
+            } else if (hour < 20) {
+                return 'དགོང་དག';
+            } else {
+                return 'མཚན་མོ';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : breton (br)
+    //! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou
+
+    function relativeTimeWithMutation(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'munutenn',
+            'MM': 'miz',
+            'dd': 'devezh'
+        };
+        return number + ' ' + mutation(format[key], number);
+    }
+    function specialMutationForYears(number) {
+        switch (lastNumber(number)) {
+        case 1:
+        case 3:
+        case 4:
+        case 5:
+        case 9:
+            return number + ' bloaz';
+        default:
+            return number + ' vloaz';
+        }
+    }
+    function lastNumber(number) {
+        if (number > 9) {
+            return lastNumber(number % 10);
+        }
+        return number;
+    }
+    function mutation(text, number) {
+        if (number === 2) {
+            return softMutation(text);
+        }
+        return text;
+    }
+    function softMutation(text) {
+        var mutationTable = {
+            'm': 'v',
+            'b': 'v',
+            'd': 'z'
+        };
+        if (mutationTable[text.charAt(0)] === undefined) {
+            return text;
+        }
+        return mutationTable[text.charAt(0)] + text.substring(1);
+    }
+
+    var br = _moment__default.defineLocale('br', {
+        months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
+        monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
+        weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
+        weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
+        weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h[e]mm A',
+            LTS : 'h[e]mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D [a viz] MMMM YYYY',
+            LLL : 'D [a viz] MMMM YYYY LT',
+            LLLL : 'dddd, D [a viz] MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Hiziv da] LT',
+            nextDay : '[Warc\'hoazh da] LT',
+            nextWeek : 'dddd [da] LT',
+            lastDay : '[Dec\'h da] LT',
+            lastWeek : 'dddd [paset da] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'a-benn %s',
+            past : '%s \'zo',
+            s : 'un nebeud segondennoù',
+            m : 'ur vunutenn',
+            mm : relativeTimeWithMutation,
+            h : 'un eur',
+            hh : '%d eur',
+            d : 'un devezh',
+            dd : relativeTimeWithMutation,
+            M : 'ur miz',
+            MM : relativeTimeWithMutation,
+            y : 'ur bloaz',
+            yy : specialMutationForYears
+        },
+        ordinalParse: /\d{1,2}(añ|vet)/,
+        ordinal : function (number) {
+            var output = (number === 1) ? 'añ' : 'vet';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : bosnian (bs)
+    //! author : Nedim Cholich : https://github.com/frontyard
+    //! based on (hr) translation by Bojan Marković
+
+    function bs__translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+        case 'mm':
+            if (number === 1) {
+                result += 'minuta';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'minute';
+            } else {
+                result += 'minuta';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'jedan sat' : 'jednog sata';
+        case 'hh':
+            if (number === 1) {
+                result += 'sat';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'sata';
+            } else {
+                result += 'sati';
+            }
+            return result;
+        case 'dd':
+            if (number === 1) {
+                result += 'dan';
+            } else {
+                result += 'dana';
+            }
+            return result;
+        case 'MM':
+            if (number === 1) {
+                result += 'mjesec';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'mjeseca';
+            } else {
+                result += 'mjeseci';
+            }
+            return result;
+        case 'yy':
+            if (number === 1) {
+                result += 'godina';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'godine';
+            } else {
+                result += 'godina';
+            }
+            return result;
+        }
+    }
+
+    var bs = _moment__default.defineLocale('bs', {
+        months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                    return '[prošlu] dddd [u] LT';
+                case 6:
+                    return '[prošle] [subote] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            m      : bs__translate,
+            mm     : bs__translate,
+            h      : bs__translate,
+            hh     : bs__translate,
+            d      : 'dan',
+            dd     : bs__translate,
+            M      : 'mjesec',
+            MM     : bs__translate,
+            y      : 'godinu',
+            yy     : bs__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : catalan (ca)
+    //! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+    var ca = _moment__default.defineLocale('ca', {
+        months : 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
+        monthsShort : 'gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.'.split('_'),
+        weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
+        weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
+        weekdaysMin : 'Dg_Dl_Dt_Dc_Dj_Dv_Ds'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextDay : function () {
+                return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastDay : function () {
+                return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'fa %s',
+            s : 'uns segons',
+            m : 'un minut',
+            mm : '%d minuts',
+            h : 'una hora',
+            hh : '%d hores',
+            d : 'un dia',
+            dd : '%d dies',
+            M : 'un mes',
+            MM : '%d mesos',
+            y : 'un any',
+            yy : '%d anys'
+        },
+        ordinalParse: /\d{1,2}(r|n|t|è|a)/,
+        ordinal : function (number, period) {
+            var output = (number === 1) ? 'r' :
+                (number === 2) ? 'n' :
+                (number === 3) ? 'r' :
+                (number === 4) ? 't' : 'è';
+            if (period === 'w' || period === 'W') {
+                output = 'a';
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : czech (cs)
+    //! author : petrbela : https://github.com/petrbela
+
+    var cs__months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
+        cs__monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
+    function cs__plural(n) {
+        return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
+    }
+    function cs__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':  // a few seconds / in a few seconds / a few seconds ago
+            return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
+        case 'm':  // a minute / in a minute / a minute ago
+            return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
+        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'minuty' : 'minut');
+            } else {
+                return result + 'minutami';
+            }
+            break;
+        case 'h':  // an hour / in an hour / an hour ago
+            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+        case 'hh': // 9 hours / in 9 hours / 9 hours ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'hodiny' : 'hodin');
+            } else {
+                return result + 'hodinami';
+            }
+            break;
+        case 'd':  // a day / in a day / a day ago
+            return (withoutSuffix || isFuture) ? 'den' : 'dnem';
+        case 'dd': // 9 days / in 9 days / 9 days ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'dny' : 'dní');
+            } else {
+                return result + 'dny';
+            }
+            break;
+        case 'M':  // a month / in a month / a month ago
+            return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
+        case 'MM': // 9 months / in 9 months / 9 months ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'měsíce' : 'měsíců');
+            } else {
+                return result + 'měsíci';
+            }
+            break;
+        case 'y':  // a year / in a year / a year ago
+            return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
+        case 'yy': // 9 years / in 9 years / 9 years ago
+            if (withoutSuffix || isFuture) {
+                return result + (cs__plural(number) ? 'roky' : 'let');
+            } else {
+                return result + 'lety';
+            }
+            break;
+        }
+    }
+
+    var cs = _moment__default.defineLocale('cs', {
+        months : cs__months,
+        monthsShort : cs__monthsShort,
+        monthsParse : (function (months, monthsShort) {
+            var i, _monthsParse = [];
+            for (i = 0; i < 12; i++) {
+                // use custom parser to solve problem with July (červenec)
+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+            }
+            return _monthsParse;
+        }(cs__months, cs__monthsShort)),
+        weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
+        weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
+        weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[dnes v] LT',
+            nextDay: '[zítra v] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v neděli v] LT';
+                case 1:
+                case 2:
+                    return '[v] dddd [v] LT';
+                case 3:
+                    return '[ve středu v] LT';
+                case 4:
+                    return '[ve čtvrtek v] LT';
+                case 5:
+                    return '[v pátek v] LT';
+                case 6:
+                    return '[v sobotu v] LT';
+                }
+            },
+            lastDay: '[včera v] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[minulou neděli v] LT';
+                case 1:
+                case 2:
+                    return '[minulé] dddd [v] LT';
+                case 3:
+                    return '[minulou středu v] LT';
+                case 4:
+                case 5:
+                    return '[minulý] dddd [v] LT';
+                case 6:
+                    return '[minulou sobotu v] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'před %s',
+            s : cs__translate,
+            m : cs__translate,
+            mm : cs__translate,
+            h : cs__translate,
+            hh : cs__translate,
+            d : cs__translate,
+            dd : cs__translate,
+            M : cs__translate,
+            MM : cs__translate,
+            y : cs__translate,
+            yy : cs__translate
+        },
+        ordinalParse : /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : chuvash (cv)
+    //! author : Anatoly Mironov : https://github.com/mirontoli
+
+    var cv = _moment__default.defineLocale('cv', {
+        months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
+        monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
+        weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
+        weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
+        weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
+            LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT',
+            LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT'
+        },
+        calendar : {
+            sameDay: '[Паян] LT [сехетре]',
+            nextDay: '[Ыран] LT [сехетре]',
+            lastDay: '[Ӗнер] LT [сехетре]',
+            nextWeek: '[Ҫитес] dddd LT [сехетре]',
+            lastWeek: '[Иртнӗ] dddd LT [сехетре]',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (output) {
+                var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
+                return output + affix;
+            },
+            past : '%s каялла',
+            s : 'пӗр-ик ҫеккунт',
+            m : 'пӗр минут',
+            mm : '%d минут',
+            h : 'пӗр сехет',
+            hh : '%d сехет',
+            d : 'пӗр кун',
+            dd : '%d кун',
+            M : 'пӗр уйӑх',
+            MM : '%d уйӑх',
+            y : 'пӗр ҫул',
+            yy : '%d ҫул'
+        },
+        ordinalParse: /\d{1,2}-мӗш/,
+        ordinal : '%d-мӗш',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Welsh (cy)
+    //! author : Robert Allen
+
+    var cy = _moment__default.defineLocale('cy', {
+        months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
+        monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
+        weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
+        weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
+        weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
+        // time formats are the same as en-gb
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd, D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[Heddiw am] LT',
+            nextDay: '[Yfory am] LT',
+            nextWeek: 'dddd [am] LT',
+            lastDay: '[Ddoe am] LT',
+            lastWeek: 'dddd [diwethaf am] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'mewn %s',
+            past: '%s yn ôl',
+            s: 'ychydig eiliadau',
+            m: 'munud',
+            mm: '%d munud',
+            h: 'awr',
+            hh: '%d awr',
+            d: 'diwrnod',
+            dd: '%d diwrnod',
+            M: 'mis',
+            MM: '%d mis',
+            y: 'blwyddyn',
+            yy: '%d flynedd'
+        },
+        ordinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
+        // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
+        ordinal: function (number) {
+            var b = number,
+                output = '',
+                lookup = [
+                    '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
+                    'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
+                ];
+            if (b > 20) {
+                if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
+                    output = 'fed'; // not 30ain, 70ain or 90ain
+                } else {
+                    output = 'ain';
+                }
+            } else if (b > 0) {
+                output = lookup[b];
+            }
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : danish (da)
+    //! author : Ulrik Nielsen : https://github.com/mrbase
+
+    var da = _moment__default.defineLocale('da', {
+        months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd [d.] D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[I dag kl.] LT',
+            nextDay : '[I morgen kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[I går kl.] LT',
+            lastWeek : '[sidste] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : '%s siden',
+            s : 'få sekunder',
+            m : 'et minut',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dage',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'et år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : austrian german (de-at)
+    //! author : lluchs : https://github.com/lluchs
+    //! author: Menelion Elensúle: https://github.com/Oire
+    //! author : Martin Groller : https://github.com/MadMG
+
+    function de_at__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de_at = _moment__default.defineLocale('de-at', {
+        months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : de_at__processRelativeTime,
+            mm : '%d Minuten',
+            h : de_at__processRelativeTime,
+            hh : '%d Stunden',
+            d : de_at__processRelativeTime,
+            dd : de_at__processRelativeTime,
+            M : de_at__processRelativeTime,
+            MM : de_at__processRelativeTime,
+            y : de_at__processRelativeTime,
+            yy : de_at__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : german (de)
+    //! author : lluchs : https://github.com/lluchs
+    //! author: Menelion Elensúle: https://github.com/Oire
+
+    function de__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de = _moment__default.defineLocale('de', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : de__processRelativeTime,
+            mm : '%d Minuten',
+            h : de__processRelativeTime,
+            hh : '%d Stunden',
+            d : de__processRelativeTime,
+            dd : de__processRelativeTime,
+            M : de__processRelativeTime,
+            MM : de__processRelativeTime,
+            y : de__processRelativeTime,
+            yy : de__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : modern greek (el)
+    //! author : Aggelos Karalias : https://github.com/mehiel
+
+    var el = _moment__default.defineLocale('el', {
+        monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
+        monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
+        months : function (momentToFormat, format) {
+            if (/D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
+                return this._monthsGenitiveEl[momentToFormat.month()];
+            } else {
+                return this._monthsNominativeEl[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
+        weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
+        weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
+        weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'μμ' : 'ΜΜ';
+            } else {
+                return isLower ? 'πμ' : 'ΠΜ';
+            }
+        },
+        isPM : function (input) {
+            return ((input + '').toLowerCase()[0] === 'μ');
+        },
+        meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendarEl : {
+            sameDay : '[Σήμερα {}] LT',
+            nextDay : '[Αύριο {}] LT',
+            nextWeek : 'dddd [{}] LT',
+            lastDay : '[Χθες {}] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                    case 6:
+                        return '[το προηγούμενο] dddd [{}] LT';
+                    default:
+                        return '[την προηγούμενη] dddd [{}] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        calendar : function (key, mom) {
+            var output = this._calendarEl[key],
+                hours = mom && mom.hours();
+            if (typeof output === 'function') {
+                output = output.apply(mom);
+            }
+            return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
+        },
+        relativeTime : {
+            future : 'σε %s',
+            past : '%s πριν',
+            s : 'λίγα δευτερόλεπτα',
+            m : 'ένα λεπτό',
+            mm : '%d λεπτά',
+            h : 'μία ώρα',
+            hh : '%d ώρες',
+            d : 'μία μέρα',
+            dd : '%d μέρες',
+            M : 'ένας μήνας',
+            MM : '%d μήνες',
+            y : 'ένας χρόνος',
+            yy : '%d χρόνια'
+        },
+        ordinalParse: /\d{1,2}η/,
+        ordinal: '%dη',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : australian english (en-au)
+
+    var en_au = _moment__default.defineLocale('en-au', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : canadian english (en-ca)
+    //! author : Jonathan Abourbih : https://github.com/jonbca
+
+    var en_ca = _moment__default.defineLocale('en-ca', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM, YYYY',
+            LLL : 'D MMMM, YYYY LT',
+            LLLL : 'dddd, D MMMM, YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : great britain english (en-gb)
+    //! author : Chris Gedrim : https://github.com/chrisgedrim
+
+    var en_gb = _moment__default.defineLocale('en-gb', {
+        months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+        weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+        weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+        weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'HH:mm:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Today at] LT',
+            nextDay : '[Tomorrow at] LT',
+            nextWeek : 'dddd [at] LT',
+            lastDay : '[Yesterday at] LT',
+            lastWeek : '[Last] dddd [at] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : '%s ago',
+            s : 'a few seconds',
+            m : 'a minute',
+            mm : '%d minutes',
+            h : 'an hour',
+            hh : '%d hours',
+            d : 'a day',
+            dd : '%d days',
+            M : 'a month',
+            MM : '%d months',
+            y : 'a year',
+            yy : '%d years'
+        },
+        ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : esperanto (eo)
+    //! author : Colin Dean : https://github.com/colindean
+    //! komento: Mi estas malcerta se mi korekte traktis akuzativojn en tiu traduko.
+    //!          Se ne, bonvolu korekti kaj avizi min por ke mi povas lerni!
+
+    var eo = _moment__default.defineLocale('eo', {
+        months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
+        weekdays : 'Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato'.split('_'),
+        weekdaysShort : 'Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Ĵa_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D[-an de] MMMM, YYYY',
+            LLL : 'D[-an de] MMMM, YYYY LT',
+            LLLL : 'dddd, [la] D[-an de] MMMM, YYYY LT'
+        },
+        meridiemParse: /[ap]\.t\.m/i,
+        isPM: function (input) {
+            return input.charAt(0).toLowerCase() === 'p';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'p.t.m.' : 'P.T.M.';
+            } else {
+                return isLower ? 'a.t.m.' : 'A.T.M.';
+            }
+        },
+        calendar : {
+            sameDay : '[Hodiaŭ je] LT',
+            nextDay : '[Morgaŭ je] LT',
+            nextWeek : 'dddd [je] LT',
+            lastDay : '[Hieraŭ je] LT',
+            lastWeek : '[pasinta] dddd [je] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'je %s',
+            past : 'antaŭ %s',
+            s : 'sekundoj',
+            m : 'minuto',
+            mm : '%d minutoj',
+            h : 'horo',
+            hh : '%d horoj',
+            d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
+            dd : '%d tagoj',
+            M : 'monato',
+            MM : '%d monatoj',
+            y : 'jaro',
+            yy : '%d jaroj'
+        },
+        ordinalParse: /\d{1,2}a/,
+        ordinal : '%da',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : spanish (es)
+    //! author : Julio Napurí : https://github.com/julionc
+
+    var monthsShortDot = 'Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.'.split('_'),
+        es__monthsShort = 'Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic'.split('_');
+
+    var es = _moment__default.defineLocale('es', {
+        months : 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return es__monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        weekdays : 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mié._Jue._Vie._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : estonian (et)
+    //! author : Henry Kehlmann : https://github.com/madhenry
+    //! improvements : Illimar Tambek : https://github.com/ragulka
+
+    function et__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
+            'm' : ['ühe minuti', 'üks minut'],
+            'mm': [number + ' minuti', number + ' minutit'],
+            'h' : ['ühe tunni', 'tund aega', 'üks tund'],
+            'hh': [number + ' tunni', number + ' tundi'],
+            'd' : ['ühe päeva', 'üks päev'],
+            'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
+            'MM': [number + ' kuu', number + ' kuud'],
+            'y' : ['ühe aasta', 'aasta', 'üks aasta'],
+            'yy': [number + ' aasta', number + ' aastat']
+        };
+        if (withoutSuffix) {
+            return format[key][2] ? format[key][2] : format[key][1];
+        }
+        return isFuture ? format[key][0] : format[key][1];
+    }
+
+    var et = _moment__default.defineLocale('et', {
+        months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
+        monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
+        weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
+        weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
+        weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
+        longDateFormat : {
+            LT   : 'H:mm',
+            LTS : 'LT:ss',
+            L    : 'DD.MM.YYYY',
+            LL   : 'D. MMMM YYYY',
+            LLL  : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[Täna,] LT',
+            nextDay  : '[Homme,] LT',
+            nextWeek : '[Järgmine] dddd LT',
+            lastDay  : '[Eile,] LT',
+            lastWeek : '[Eelmine] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s pärast',
+            past   : '%s tagasi',
+            s      : et__processRelativeTime,
+            m      : et__processRelativeTime,
+            mm     : et__processRelativeTime,
+            h      : et__processRelativeTime,
+            hh     : et__processRelativeTime,
+            d      : et__processRelativeTime,
+            dd     : '%d päeva',
+            M      : et__processRelativeTime,
+            MM     : et__processRelativeTime,
+            y      : et__processRelativeTime,
+            yy     : et__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : euskara (eu)
+    //! author : Eneko Illarramendi : https://github.com/eillarra
+
+    var eu = _moment__default.defineLocale('eu', {
+        months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
+        monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
+        weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
+        weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
+        weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY[ko] MMMM[ren] D[a]',
+            LLL : 'YYYY[ko] MMMM[ren] D[a] LT',
+            LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] LT',
+            l : 'YYYY-M-D',
+            ll : 'YYYY[ko] MMM D[a]',
+            lll : 'YYYY[ko] MMM D[a] LT',
+            llll : 'ddd, YYYY[ko] MMM D[a] LT'
+        },
+        calendar : {
+            sameDay : '[gaur] LT[etan]',
+            nextDay : '[bihar] LT[etan]',
+            nextWeek : 'dddd LT[etan]',
+            lastDay : '[atzo] LT[etan]',
+            lastWeek : '[aurreko] dddd LT[etan]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s barru',
+            past : 'duela %s',
+            s : 'segundo batzuk',
+            m : 'minutu bat',
+            mm : '%d minutu',
+            h : 'ordu bat',
+            hh : '%d ordu',
+            d : 'egun bat',
+            dd : '%d egun',
+            M : 'hilabete bat',
+            MM : '%d hilabete',
+            y : 'urte bat',
+            yy : '%d urte'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Persian (fa)
+    //! author : Ebrahim Byagowi : https://github.com/ebraminio
+
+    var fa__symbolMap = {
+        '1': '۱',
+        '2': '۲',
+        '3': '۳',
+        '4': '۴',
+        '5': '۵',
+        '6': '۶',
+        '7': '۷',
+        '8': '۸',
+        '9': '۹',
+        '0': '۰'
+    }, fa__numberMap = {
+        '۱': '1',
+        '۲': '2',
+        '۳': '3',
+        '۴': '4',
+        '۵': '5',
+        '۶': '6',
+        '۷': '7',
+        '۸': '8',
+        '۹': '9',
+        '۰': '0'
+    };
+
+    var fa = _moment__default.defineLocale('fa', {
+        months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+        weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+        weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        meridiemParse: /قبل از ظهر|بعد از ظهر/,
+        isPM: function (input) {
+            return /بعد از ظهر/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'قبل از ظهر';
+            } else {
+                return 'بعد از ظهر';
+            }
+        },
+        calendar : {
+            sameDay : '[امروز ساعت] LT',
+            nextDay : '[فردا ساعت] LT',
+            nextWeek : 'dddd [ساعت] LT',
+            lastDay : '[دیروز ساعت] LT',
+            lastWeek : 'dddd [پیش] [ساعت] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'در %s',
+            past : '%s پیش',
+            s : 'چندین ثانیه',
+            m : 'یک دقیقه',
+            mm : '%d دقیقه',
+            h : 'یک ساعت',
+            hh : '%d ساعت',
+            d : 'یک روز',
+            dd : '%d روز',
+            M : 'یک ماه',
+            MM : '%d ماه',
+            y : 'یک سال',
+            yy : '%d سال'
+        },
+        preparse: function (string) {
+            return string.replace(/[۰-۹]/g, function (match) {
+                return fa__numberMap[match];
+            }).replace(/،/g, ',');
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return fa__symbolMap[match];
+            }).replace(/,/g, '،');
+        },
+        ordinalParse: /\d{1,2}م/,
+        ordinal : '%dم',
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : finnish (fi)
+    //! author : Tarmo Aidantausta : https://github.com/bleadof
+
+    var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
+        numbersFuture = [
+            'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+            numbersPast[7], numbersPast[8], numbersPast[9]
+        ];
+    function fi__translate(number, withoutSuffix, key, isFuture) {
+        var result = '';
+        switch (key) {
+        case 's':
+            return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
+        case 'm':
+            return isFuture ? 'minuutin' : 'minuutti';
+        case 'mm':
+            result = isFuture ? 'minuutin' : 'minuuttia';
+            break;
+        case 'h':
+            return isFuture ? 'tunnin' : 'tunti';
+        case 'hh':
+            result = isFuture ? 'tunnin' : 'tuntia';
+            break;
+        case 'd':
+            return isFuture ? 'päivän' : 'päivä';
+        case 'dd':
+            result = isFuture ? 'päivän' : 'päivää';
+            break;
+        case 'M':
+            return isFuture ? 'kuukauden' : 'kuukausi';
+        case 'MM':
+            result = isFuture ? 'kuukauden' : 'kuukautta';
+            break;
+        case 'y':
+            return isFuture ? 'vuoden' : 'vuosi';
+        case 'yy':
+            result = isFuture ? 'vuoden' : 'vuotta';
+            break;
+        }
+        result = verbalNumber(number, isFuture) + ' ' + result;
+        return result;
+    }
+    function verbalNumber(number, isFuture) {
+        return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
+    }
+
+    var fi = _moment__default.defineLocale('fi', {
+        months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+        monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+        weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+        weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'HH.mm.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'Do MMMM[ta] YYYY',
+            LLL : 'Do MMMM[ta] YYYY, [klo] LT',
+            LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] LT',
+            l : 'D.M.YYYY',
+            ll : 'Do MMM YYYY',
+            lll : 'Do MMM YYYY, [klo] LT',
+            llll : 'ddd, Do MMM YYYY, [klo] LT'
+        },
+        calendar : {
+            sameDay : '[tänään] [klo] LT',
+            nextDay : '[huomenna] [klo] LT',
+            nextWeek : 'dddd [klo] LT',
+            lastDay : '[eilen] [klo] LT',
+            lastWeek : '[viime] dddd[na] [klo] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s päästä',
+            past : '%s sitten',
+            s : fi__translate,
+            m : fi__translate,
+            mm : fi__translate,
+            h : fi__translate,
+            hh : fi__translate,
+            d : fi__translate,
+            dd : fi__translate,
+            M : fi__translate,
+            MM : fi__translate,
+            y : fi__translate,
+            yy : fi__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : faroese (fo)
+    //! author : Ragnar Johannesen : https://github.com/ragnar123
+
+    var fo = _moment__default.defineLocale('fo', {
+        months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
+        weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
+        weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM, YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Í dag kl.] LT',
+            nextDay : '[Í morgin kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[Í gjár kl.] LT',
+            lastWeek : '[síðstu] dddd [kl] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'um %s',
+            past : '%s síðani',
+            s : 'fá sekund',
+            m : 'ein minutt',
+            mm : '%d minuttir',
+            h : 'ein tími',
+            hh : '%d tímar',
+            d : 'ein dagur',
+            dd : '%d dagar',
+            M : 'ein mánaði',
+            MM : '%d mánaðir',
+            y : 'eitt ár',
+            yy : '%d ár'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : canadian french (fr-ca)
+    //! author : Jonathan Abourbih : https://github.com/jonbca
+
+    var fr_ca = _moment__default.defineLocale('fr-ca', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : french (fr)
+    //! author : John Fischer : https://github.com/jfroffice
+
+    var fr = _moment__default.defineLocale('fr', {
+        months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+        monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+        weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+        weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+        weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Aujourd\'hui à] LT',
+            nextDay: '[Demain à] LT',
+            nextWeek: 'dddd [à] LT',
+            lastDay: '[Hier à] LT',
+            lastWeek: 'dddd [dernier à] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dans %s',
+            past : 'il y a %s',
+            s : 'quelques secondes',
+            m : 'une minute',
+            mm : '%d minutes',
+            h : 'une heure',
+            hh : '%d heures',
+            d : 'un jour',
+            dd : '%d jours',
+            M : 'un mois',
+            MM : '%d mois',
+            y : 'un an',
+            yy : '%d ans'
+        },
+        ordinalParse: /\d{1,2}(er|)/,
+        ordinal : function (number) {
+            return number + (number === 1 ? 'er' : '');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : frisian (fy)
+    //! author : Robin van der Vliet : https://github.com/robin0van0der0v
+
+    var fy__monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
+        fy__monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
+
+    var fy = _moment__default.defineLocale('fy', {
+        months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return fy__monthsShortWithoutDots[m.month()];
+            } else {
+                return fy__monthsShortWithDots[m.month()];
+            }
+        },
+        weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
+        weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
+        weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[hjoed om] LT',
+            nextDay: '[moarn om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[juster om] LT',
+            lastWeek: '[ôfrûne] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'oer %s',
+            past : '%s lyn',
+            s : 'in pear sekonden',
+            m : 'ien minút',
+            mm : '%d minuten',
+            h : 'ien oere',
+            hh : '%d oeren',
+            d : 'ien dei',
+            dd : '%d dagen',
+            M : 'ien moanne',
+            MM : '%d moannen',
+            y : 'ien jier',
+            yy : '%d jierren'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : galician (gl)
+    //! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+    var gl = _moment__default.defineLocale('gl', {
+        months : 'Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro'.split('_'),
+        monthsShort : 'Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.'.split('_'),
+        weekdays : 'Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mér._Xov._Ven._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mé_Xo_Ve_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            lastDay : function () {
+                return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
+            },
+            lastWeek : function () {
+                return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (str) {
+                if (str === 'uns segundos') {
+                    return 'nuns segundos';
+                }
+                return 'en ' + str;
+            },
+            past : 'hai %s',
+            s : 'uns segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'unha hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un ano',
+            yy : '%d anos'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Hebrew (he)
+    //! author : Tomer Cohen : https://github.com/tomer
+    //! author : Moshe Simantov : https://github.com/DevelopmentIL
+    //! author : Tal Ater : https://github.com/TalAter
+
+    var he = _moment__default.defineLocale('he', {
+        months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+        monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
+        weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+        weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+        weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [ב]MMMM YYYY',
+            LLL : 'D [ב]MMMM YYYY LT',
+            LLLL : 'dddd, D [ב]MMMM YYYY LT',
+            l : 'D/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY LT',
+            llll : 'ddd, D MMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[היום ב־]LT',
+            nextDay : '[מחר ב־]LT',
+            nextWeek : 'dddd [בשעה] LT',
+            lastDay : '[אתמול ב־]LT',
+            lastWeek : '[ביום] dddd [האחרון בשעה] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'בעוד %s',
+            past : 'לפני %s',
+            s : 'מספר שניות',
+            m : 'דקה',
+            mm : '%d דקות',
+            h : 'שעה',
+            hh : function (number) {
+                if (number === 2) {
+                    return 'שעתיים';
+                }
+                return number + ' שעות';
+            },
+            d : 'יום',
+            dd : function (number) {
+                if (number === 2) {
+                    return 'יומיים';
+                }
+                return number + ' ימים';
+            },
+            M : 'חודש',
+            MM : function (number) {
+                if (number === 2) {
+                    return 'חודשיים';
+                }
+                return number + ' חודשים';
+            },
+            y : 'שנה',
+            yy : function (number) {
+                if (number === 2) {
+                    return 'שנתיים';
+                } else if (number % 10 === 0 && number !== 10) {
+                    return number + ' שנה';
+                }
+                return number + ' שנים';
+            }
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : hindi (hi)
+    //! author : Mayank Singhal : https://github.com/mayanksinghal
+
+    var hi__symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    hi__numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var hi = _moment__default.defineLocale('hi', {
+        months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
+        monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
+        weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm बजे',
+            LTS : 'A h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[कल] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[कल] LT',
+            lastWeek : '[पिछले] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s में',
+            past : '%s पहले',
+            s : 'कुछ ही क्षण',
+            m : 'एक मिनट',
+            mm : '%d मिनट',
+            h : 'एक घंटा',
+            hh : '%d घंटे',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महीने',
+            MM : '%d महीने',
+            y : 'एक वर्ष',
+            yy : '%d वर्ष'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return hi__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return hi__symbolMap[match];
+            });
+        },
+        // Hindi notation for meridiems are quite fuzzy in practice. While there exists
+        // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
+        meridiemParse: /रात|सुबह|दोपहर|शाम/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सुबह') {
+                return hour;
+            } else if (meridiem === 'दोपहर') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'शाम') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात';
+            } else if (hour < 10) {
+                return 'सुबह';
+            } else if (hour < 17) {
+                return 'दोपहर';
+            } else if (hour < 20) {
+                return 'शाम';
+            } else {
+                return 'रात';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : hrvatski (hr)
+    //! author : Bojan Marković : https://github.com/bmarkovic
+
+    function hr__translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+        case 'mm':
+            if (number === 1) {
+                result += 'minuta';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'minute';
+            } else {
+                result += 'minuta';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'jedan sat' : 'jednog sata';
+        case 'hh':
+            if (number === 1) {
+                result += 'sat';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'sata';
+            } else {
+                result += 'sati';
+            }
+            return result;
+        case 'dd':
+            if (number === 1) {
+                result += 'dan';
+            } else {
+                result += 'dana';
+            }
+            return result;
+        case 'MM':
+            if (number === 1) {
+                result += 'mjesec';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'mjeseca';
+            } else {
+                result += 'mjeseci';
+            }
+            return result;
+        case 'yy':
+            if (number === 1) {
+                result += 'godina';
+            } else if (number === 2 || number === 3 || number === 4) {
+                result += 'godine';
+            } else {
+                result += 'godina';
+            }
+            return result;
+        }
+    }
+
+    var hr = _moment__default.defineLocale('hr', {
+        months : 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_'),
+        monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
+        weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+        weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+        weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danas u] LT',
+            nextDay  : '[sutra u] LT',
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[jučer u] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                    return '[prošlu] dddd [u] LT';
+                case 6:
+                    return '[prošle] [subote] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prošli] dddd [u] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'par sekundi',
+            m      : hr__translate,
+            mm     : hr__translate,
+            h      : hr__translate,
+            hh     : hr__translate,
+            d      : 'dan',
+            dd     : hr__translate,
+            M      : 'mjesec',
+            MM     : hr__translate,
+            y      : 'godinu',
+            yy     : hr__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : hungarian (hu)
+    //! author : Adam Brunner : https://github.com/adambrunner
+
+    var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
+    function hu__translate(number, withoutSuffix, key, isFuture) {
+        var num = number,
+            suffix;
+        switch (key) {
+        case 's':
+            return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
+        case 'm':
+            return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
+        case 'mm':
+            return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
+        case 'h':
+            return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
+        case 'hh':
+            return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
+        case 'd':
+            return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
+        case 'dd':
+            return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
+        case 'M':
+            return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+        case 'MM':
+            return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+        case 'y':
+            return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
+        case 'yy':
+            return num + (isFuture || withoutSuffix ? ' év' : ' éve');
+        }
+        return '';
+    }
+    function week(isFuture) {
+        return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
+    }
+
+    var hu = _moment__default.defineLocale('hu', {
+        months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
+        monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
+        weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
+        weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
+        weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY.MM.DD.',
+            LL : 'YYYY. MMMM D.',
+            LLL : 'YYYY. MMMM D., LT',
+            LLLL : 'YYYY. MMMM D., dddd LT'
+        },
+        meridiemParse: /de|du/i,
+        isPM: function (input) {
+            return input.charAt(1).toLowerCase() === 'u';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 12) {
+                return isLower === true ? 'de' : 'DE';
+            } else {
+                return isLower === true ? 'du' : 'DU';
+            }
+        },
+        calendar : {
+            sameDay : '[ma] LT[-kor]',
+            nextDay : '[holnap] LT[-kor]',
+            nextWeek : function () {
+                return week.call(this, true);
+            },
+            lastDay : '[tegnap] LT[-kor]',
+            lastWeek : function () {
+                return week.call(this, false);
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s múlva',
+            past : '%s',
+            s : hu__translate,
+            m : hu__translate,
+            mm : hu__translate,
+            h : hu__translate,
+            hh : hu__translate,
+            d : hu__translate,
+            dd : hu__translate,
+            M : hu__translate,
+            MM : hu__translate,
+            y : hu__translate,
+            yy : hu__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Armenian (hy-am)
+    //! author : Armendarabyan : https://github.com/armendarabyan
+
+    function hy_am__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'),
+            'accusative': 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function hy_am__monthsShortCaseReplace(m, format) {
+        var monthsShort = 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_');
+        return monthsShort[m.month()];
+    }
+    function hy_am__weekdaysCaseReplace(m, format) {
+        var weekdays = 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_');
+        return weekdays[m.day()];
+    }
+
+    var hy_am = _moment__default.defineLocale('hy-am', {
+        months : hy_am__monthsCaseReplace,
+        monthsShort : hy_am__monthsShortCaseReplace,
+        weekdays : hy_am__weekdaysCaseReplace,
+        weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY թ.',
+            LLL : 'D MMMM YYYY թ., LT',
+            LLLL : 'dddd, D MMMM YYYY թ., LT'
+        },
+        calendar : {
+            sameDay: '[այսօր] LT',
+            nextDay: '[վաղը] LT',
+            lastDay: '[երեկ] LT',
+            nextWeek: function () {
+                return 'dddd [օրը ժամը] LT';
+            },
+            lastWeek: function () {
+                return '[անցած] dddd [օրը ժամը] LT';
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s հետո',
+            past : '%s առաջ',
+            s : 'մի քանի վայրկյան',
+            m : 'րոպե',
+            mm : '%d րոպե',
+            h : 'ժամ',
+            hh : '%d ժամ',
+            d : 'օր',
+            dd : '%d օր',
+            M : 'ամիս',
+            MM : '%d ամիս',
+            y : 'տարի',
+            yy : '%d տարի'
+        },
+        meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
+        isPM: function (input) {
+            return /^(ցերեկվա|երեկոյան)$/.test(input);
+        },
+        meridiem : function (hour) {
+            if (hour < 4) {
+                return 'գիշերվա';
+            } else if (hour < 12) {
+                return 'առավոտվա';
+            } else if (hour < 17) {
+                return 'ցերեկվա';
+            } else {
+                return 'երեկոյան';
+            }
+        },
+        ordinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'DDD':
+            case 'w':
+            case 'W':
+            case 'DDDo':
+                if (number === 1) {
+                    return number + '-ին';
+                }
+                return number + '-րդ';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Bahasa Indonesia (id)
+    //! author : Mohammad Satrio Utomo : https://github.com/tyok
+    //! reference: http://id.wikisource.org/wiki/Pedoman_Umum_Ejaan_Bahasa_Indonesia_yang_Disempurnakan
+
+    var id = _moment__default.defineLocale('id', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des'.split('_'),
+        weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /pagi|siang|sore|malam/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'siang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sore' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'siang';
+            } else if (hours < 19) {
+                return 'sore';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Besok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kemarin pukul] LT',
+            lastWeek : 'dddd [lalu pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lalu',
+            s : 'beberapa detik',
+            m : 'semenit',
+            mm : '%d menit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : icelandic (is)
+    //! author : Hinrik Örn Sigurðsson : https://github.com/hinrik
+
+    function is__plural(n) {
+        if (n % 100 === 11) {
+            return true;
+        } else if (n % 10 === 1) {
+            return false;
+        }
+        return true;
+    }
+    function is__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':
+            return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
+        case 'm':
+            return withoutSuffix ? 'mínúta' : 'mínútu';
+        case 'mm':
+            if (is__plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
+            } else if (withoutSuffix) {
+                return result + 'mínúta';
+            }
+            return result + 'mínútu';
+        case 'hh':
+            if (is__plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
+            }
+            return result + 'klukkustund';
+        case 'd':
+            if (withoutSuffix) {
+                return 'dagur';
+            }
+            return isFuture ? 'dag' : 'degi';
+        case 'dd':
+            if (is__plural(number)) {
+                if (withoutSuffix) {
+                    return result + 'dagar';
+                }
+                return result + (isFuture ? 'daga' : 'dögum');
+            } else if (withoutSuffix) {
+                return result + 'dagur';
+            }
+            return result + (isFuture ? 'dag' : 'degi');
+        case 'M':
+            if (withoutSuffix) {
+                return 'mánuður';
+            }
+            return isFuture ? 'mánuð' : 'mánuði';
+        case 'MM':
+            if (is__plural(number)) {
+                if (withoutSuffix) {
+                    return result + 'mánuðir';
+                }
+                return result + (isFuture ? 'mánuði' : 'mánuðum');
+            } else if (withoutSuffix) {
+                return result + 'mánuður';
+            }
+            return result + (isFuture ? 'mánuð' : 'mánuði');
+        case 'y':
+            return withoutSuffix || isFuture ? 'ár' : 'ári';
+        case 'yy':
+            if (is__plural(number)) {
+                return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
+            }
+            return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
+        }
+    }
+
+    var is = _moment__default.defineLocale('is', {
+        months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
+        weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
+        weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
+        weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] LT',
+            LLLL : 'dddd, D. MMMM YYYY [kl.] LT'
+        },
+        calendar : {
+            sameDay : '[í dag kl.] LT',
+            nextDay : '[á morgun kl.] LT',
+            nextWeek : 'dddd [kl.] LT',
+            lastDay : '[í gær kl.] LT',
+            lastWeek : '[síðasta] dddd [kl.] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'eftir %s',
+            past : 'fyrir %s síðan',
+            s : is__translate,
+            m : is__translate,
+            mm : is__translate,
+            h : 'klukkustund',
+            hh : is__translate,
+            d : is__translate,
+            dd : is__translate,
+            M : is__translate,
+            MM : is__translate,
+            y : is__translate,
+            yy : is__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : italian (it)
+    //! author : Lorenzo : https://github.com/aliem
+    //! author: Mattia Larentis: https://github.com/nostalgiaz
+
+    var it = _moment__default.defineLocale('it', {
+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+        weekdays : 'Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato'.split('_'),
+        weekdaysShort : 'Dom_Lun_Mar_Mer_Gio_Ven_Sab'.split('_'),
+        weekdaysMin : 'D_L_Ma_Me_G_V_S'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Oggi alle] LT',
+            nextDay: '[Domani alle] LT',
+            nextWeek: 'dddd [alle] LT',
+            lastDay: '[Ieri alle] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[la scorsa] dddd [alle] LT';
+                    default:
+                        return '[lo scorso] dddd [alle] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+            },
+            past : '%s fa',
+            s : 'alcuni secondi',
+            m : 'un minuto',
+            mm : '%d minuti',
+            h : 'un\'ora',
+            hh : '%d ore',
+            d : 'un giorno',
+            dd : '%d giorni',
+            M : 'un mese',
+            MM : '%d mesi',
+            y : 'un anno',
+            yy : '%d anni'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : japanese (ja)
+    //! author : LI Long : https://github.com/baryon
+
+    var ja = _moment__default.defineLocale('ja', {
+        months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
+        weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
+        weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
+        longDateFormat : {
+            LT : 'Ah時m分',
+            LTS : 'LTs秒',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY年M月D日',
+            LLL : 'YYYY年M月D日LT',
+            LLLL : 'YYYY年M月D日LT dddd'
+        },
+        meridiemParse: /午前|午後/i,
+        isPM : function (input) {
+            return input === '午後';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return '午前';
+            } else {
+                return '午後';
+            }
+        },
+        calendar : {
+            sameDay : '[今日] LT',
+            nextDay : '[明日] LT',
+            nextWeek : '[来週]dddd LT',
+            lastDay : '[昨日] LT',
+            lastWeek : '[前週]dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s後',
+            past : '%s前',
+            s : '数秒',
+            m : '1分',
+            mm : '%d分',
+            h : '1時間',
+            hh : '%d時間',
+            d : '1日',
+            dd : '%d日',
+            M : '1ヶ月',
+            MM : '%dヶ月',
+            y : '1年',
+            yy : '%d年'
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Boso Jowo (jv)
+    //! author : Rony Lantip : https://github.com/lantip
+    //! reference: http://jv.wikipedia.org/wiki/Basa_Jawa
+
+    var jv = _moment__default.defineLocale('jv', {
+        months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
+        monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
+        weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
+        weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
+        weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /enjing|siyang|sonten|ndalu/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'enjing') {
+                return hour;
+            } else if (meridiem === 'siyang') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'enjing';
+            } else if (hours < 15) {
+                return 'siyang';
+            } else if (hours < 19) {
+                return 'sonten';
+            } else {
+                return 'ndalu';
+            }
+        },
+        calendar : {
+            sameDay : '[Dinten puniko pukul] LT',
+            nextDay : '[Mbenjang pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kala wingi pukul] LT',
+            lastWeek : 'dddd [kepengker pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'wonten ing %s',
+            past : '%s ingkang kepengker',
+            s : 'sawetawis detik',
+            m : 'setunggal menit',
+            mm : '%d menit',
+            h : 'setunggal jam',
+            hh : '%d jam',
+            d : 'sedinten',
+            dd : '%d dinten',
+            M : 'sewulan',
+            MM : '%d wulan',
+            y : 'setaun',
+            yy : '%d taun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Georgian (ka)
+    //! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
+
+    function ka__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
+            'accusative': 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
+        },
+        nounCase = (/D[oD] *MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function ka__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
+            'accusative': 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_')
+        },
+        nounCase = (/(წინა|შემდეგ)/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var ka = _moment__default.defineLocale('ka', {
+        months : ka__monthsCaseReplace,
+        monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
+        weekdays : ka__weekdaysCaseReplace,
+        weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
+        weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
+        longDateFormat : {
+            LT : 'h:mm A',
+            LTS : 'h:mm:ss A',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[დღეს] LT[-ზე]',
+            nextDay : '[ხვალ] LT[-ზე]',
+            lastDay : '[გუშინ] LT[-ზე]',
+            nextWeek : '[შემდეგ] dddd LT[-ზე]',
+            lastWeek : '[წინა] dddd LT-ზე',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
+                    s.replace(/ი$/, 'ში') :
+                    s + 'ში';
+            },
+            past : function (s) {
+                if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
+                    return s.replace(/(ი|ე)$/, 'ის წინ');
+                }
+                if ((/წელი/).test(s)) {
+                    return s.replace(/წელი$/, 'წლის წინ');
+                }
+            },
+            s : 'რამდენიმე წამი',
+            m : 'წუთი',
+            mm : '%d წუთი',
+            h : 'საათი',
+            hh : '%d საათი',
+            d : 'დღე',
+            dd : '%d დღე',
+            M : 'თვე',
+            MM : '%d თვე',
+            y : 'წელი',
+            yy : '%d წელი'
+        },
+        ordinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
+        ordinal : function (number) {
+            if (number === 0) {
+                return number;
+            }
+            if (number === 1) {
+                return number + '-ლი';
+            }
+            if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
+                return 'მე-' + number;
+            }
+            return number + '-ე';
+        },
+        week : {
+            dow : 1,
+            doy : 7
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : khmer (km)
+    //! author : Kruy Vanna : https://github.com/kruyvanna
+
+    var km = _moment__default.defineLocale('km', {
+        months: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+        monthsShort: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+        weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysShort: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        weekdaysMin: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS : 'LT:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd, D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[ថ្ងៃនៈ ម៉ោង] LT',
+            nextDay: '[ស្អែក ម៉ោង] LT',
+            nextWeek: 'dddd [ម៉ោង] LT',
+            lastDay: '[ម្សិលមិញ ម៉ោង] LT',
+            lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: '%sទៀត',
+            past: '%sមុន',
+            s: 'ប៉ុន្មានវិនាទី',
+            m: 'មួយនាទី',
+            mm: '%d នាទី',
+            h: 'មួយម៉ោង',
+            hh: '%d ម៉ោង',
+            d: 'មួយថ្ងៃ',
+            dd: '%d ថ្ងៃ',
+            M: 'មួយខែ',
+            MM: '%d ខែ',
+            y: 'មួយឆ្នាំ',
+            yy: '%d ឆ្នាំ'
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : korean (ko)
+    //!
+    //! authors
+    //!
+    //! - Kyungwook, Park : https://github.com/kyungw00k
+    //! - Jeeeyul Lee <jeeeyul@gmail.com>
+
+    var ko = _moment__default.defineLocale('ko', {
+        months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+        weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
+        weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
+        weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
+        longDateFormat : {
+            LT : 'A h시 m분',
+            LTS : 'A h시 m분 s초',
+            L : 'YYYY.MM.DD',
+            LL : 'YYYY년 MMMM D일',
+            LLL : 'YYYY년 MMMM D일 LT',
+            LLLL : 'YYYY년 MMMM D일 dddd LT'
+        },
+        calendar : {
+            sameDay : '오늘 LT',
+            nextDay : '내일 LT',
+            nextWeek : 'dddd LT',
+            lastDay : '어제 LT',
+            lastWeek : '지난주 dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s 후',
+            past : '%s 전',
+            s : '몇초',
+            ss : '%d초',
+            m : '일분',
+            mm : '%d분',
+            h : '한시간',
+            hh : '%d시간',
+            d : '하루',
+            dd : '%d일',
+            M : '한달',
+            MM : '%d달',
+            y : '일년',
+            yy : '%d년'
+        },
+        ordinalParse : /\d{1,2}일/,
+        ordinal : '%d일',
+        meridiemParse : /오전|오후/,
+        isPM : function (token) {
+            return token === '오후';
+        },
+        meridiem : function (hour, minute, isUpper) {
+            return hour < 12 ? '오전' : '오후';
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Luxembourgish (lb)
+    //! author : mweimerskirch : https://github.com/mweimerskirch, David Raison : https://github.com/kwisatz
+
+    function lb__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eng Minutt', 'enger Minutt'],
+            'h': ['eng Stonn', 'enger Stonn'],
+            'd': ['een Dag', 'engem Dag'],
+            'M': ['ee Mount', 'engem Mount'],
+            'y': ['ee Joer', 'engem Joer']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+    function processFutureTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'a ' + string;
+        }
+        return 'an ' + string;
+    }
+    function processPastTime(string) {
+        var number = string.substr(0, string.indexOf(' '));
+        if (eifelerRegelAppliesToNumber(number)) {
+            return 'viru ' + string;
+        }
+        return 'virun ' + string;
+    }
+    /**
+     * Returns true if the word before the given number loses the '-n' ending.
+     * e.g. 'an 10 Deeg' but 'a 5 Deeg'
+     *
+     * @param number {integer}
+     * @returns {boolean}
+     */
+    function eifelerRegelAppliesToNumber(number) {
+        number = parseInt(number, 10);
+        if (isNaN(number)) {
+            return false;
+        }
+        if (number < 0) {
+            // Negative Number --> always true
+            return true;
+        } else if (number < 10) {
+            // Only 1 digit
+            if (4 <= number && number <= 7) {
+                return true;
+            }
+            return false;
+        } else if (number < 100) {
+            // 2 digits
+            var lastDigit = number % 10, firstDigit = number / 10;
+            if (lastDigit === 0) {
+                return eifelerRegelAppliesToNumber(firstDigit);
+            }
+            return eifelerRegelAppliesToNumber(lastDigit);
+        } else if (number < 10000) {
+            // 3 or 4 digits --> recursively check first digit
+            while (number >= 10) {
+                number = number / 10;
+            }
+            return eifelerRegelAppliesToNumber(number);
+        } else {
+            // Anything larger than 4 digits: recursively check first n-3 digits
+            number = number / 1000;
+            return eifelerRegelAppliesToNumber(number);
+        }
+    }
+
+    var lb = _moment__default.defineLocale('lb', {
+        months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
+        weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
+        weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
+        longDateFormat: {
+            LT: 'H:mm [Auer]',
+            LTS: 'H:mm:ss [Auer]',
+            L: 'DD.MM.YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[Haut um] LT',
+            sameElse: 'L',
+            nextDay: '[Muer um] LT',
+            nextWeek: 'dddd [um] LT',
+            lastDay: '[Gëschter um] LT',
+            lastWeek: function () {
+                // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
+                switch (this.day()) {
+                    case 2:
+                    case 4:
+                        return '[Leschten] dddd [um] LT';
+                    default:
+                        return '[Leschte] dddd [um] LT';
+                }
+            }
+        },
+        relativeTime : {
+            future : processFutureTime,
+            past : processPastTime,
+            s : 'e puer Sekonnen',
+            m : lb__processRelativeTime,
+            mm : '%d Minutten',
+            h : lb__processRelativeTime,
+            hh : '%d Stonnen',
+            d : lb__processRelativeTime,
+            dd : '%d Deeg',
+            M : lb__processRelativeTime,
+            MM : '%d Méint',
+            y : lb__processRelativeTime,
+            yy : '%d Joer'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal: '%d.',
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Lithuanian (lt)
+    //! author : Mindaugas Mozūras : https://github.com/mmozuras
+
+    var lt__units = {
+        'm' : 'minutė_minutės_minutę',
+        'mm': 'minutės_minučių_minutes',
+        'h' : 'valanda_valandos_valandą',
+        'hh': 'valandos_valandų_valandas',
+        'd' : 'diena_dienos_dieną',
+        'dd': 'dienos_dienų_dienas',
+        'M' : 'mėnuo_mėnesio_mėnesį',
+        'MM': 'mėnesiai_mėnesių_mėnesius',
+        'y' : 'metai_metų_metus',
+        'yy': 'metai_metų_metus'
+    },
+    weekDays = 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_');
+    function translateSeconds(number, withoutSuffix, key, isFuture) {
+        if (withoutSuffix) {
+            return 'kelios sekundės';
+        } else {
+            return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
+        }
+    }
+    function translateSingular(number, withoutSuffix, key, isFuture) {
+        return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
+    }
+    function special(number) {
+        return number % 10 === 0 || (number > 10 && number < 20);
+    }
+    function forms(key) {
+        return lt__units[key].split('_');
+    }
+    function lt__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        if (number === 1) {
+            return result + translateSingular(number, withoutSuffix, key[0], isFuture);
+        } else if (withoutSuffix) {
+            return result + (special(number) ? forms(key)[1] : forms(key)[0]);
+        } else {
+            if (isFuture) {
+                return result + forms(key)[1];
+            } else {
+                return result + (special(number) ? forms(key)[1] : forms(key)[2]);
+            }
+        }
+    }
+    function relativeWeekDay(moment, format) {
+        var nominative = format.indexOf('dddd HH:mm') === -1,
+            weekDay = weekDays[moment.day()];
+        return nominative ? weekDay : weekDay.substring(0, weekDay.length - 2) + 'į';
+    }
+
+    var lt = _moment__default.defineLocale('lt', {
+        months : 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
+        monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
+        weekdays : relativeWeekDay,
+        weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
+        weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY [m.] MMMM D [d.]',
+            LLL : 'YYYY [m.] MMMM D [d.], LT [val.]',
+            LLLL : 'YYYY [m.] MMMM D [d.], dddd, LT [val.]',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY [m.] MMMM D [d.]',
+            lll : 'YYYY [m.] MMMM D [d.], LT [val.]',
+            llll : 'YYYY [m.] MMMM D [d.], ddd, LT [val.]'
+        },
+        calendar : {
+            sameDay : '[Šiandien] LT',
+            nextDay : '[Rytoj] LT',
+            nextWeek : 'dddd LT',
+            lastDay : '[Vakar] LT',
+            lastWeek : '[Praėjusį] dddd LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'po %s',
+            past : 'prieš %s',
+            s : translateSeconds,
+            m : translateSingular,
+            mm : lt__translate,
+            h : translateSingular,
+            hh : lt__translate,
+            d : translateSingular,
+            dd : lt__translate,
+            M : translateSingular,
+            MM : lt__translate,
+            y : translateSingular,
+            yy : lt__translate
+        },
+        ordinalParse: /\d{1,2}-oji/,
+        ordinal : function (number) {
+            return number + '-oji';
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : latvian (lv)
+    //! author : Kristaps Karlsons : https://github.com/skakri
+    //! author : Jānis Elmeris : https://github.com/JanisE
+
+    var lv__units = {
+        'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+        'h': 'stundas_stundām_stunda_stundas'.split('_'),
+        'hh': 'stundas_stundām_stunda_stundas'.split('_'),
+        'd': 'dienas_dienām_diena_dienas'.split('_'),
+        'dd': 'dienas_dienām_diena_dienas'.split('_'),
+        'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+        'y': 'gada_gadiem_gads_gadi'.split('_'),
+        'yy': 'gada_gadiem_gads_gadi'.split('_')
+    };
+    /**
+     * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
+     */
+    function lv__format(forms, number, withoutSuffix) {
+        if (withoutSuffix) {
+            // E.g. "21 minūte", "3 minūtes".
+            return number % 10 === 1 && number !== 11 ? forms[2] : forms[3];
+        } else {
+            // E.g. "21 minūtes" as in "pēc 21 minūtes".
+            // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
+            return number % 10 === 1 && number !== 11 ? forms[0] : forms[1];
+        }
+    }
+    function lv__relativeTimeWithPlural(number, withoutSuffix, key) {
+        return number + ' ' + lv__format(lv__units[key], number, withoutSuffix);
+    }
+    function relativeTimeWithSingular(number, withoutSuffix, key) {
+        return lv__format(lv__units[key], number, withoutSuffix);
+    }
+    function relativeSeconds(number, withoutSuffix) {
+        return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
+    }
+
+    var lv = _moment__default.defineLocale('lv', {
+        months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
+        weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY.',
+            LL : 'YYYY. [gada] D. MMMM',
+            LLL : 'YYYY. [gada] D. MMMM, LT',
+            LLLL : 'YYYY. [gada] D. MMMM, dddd, LT'
+        },
+        calendar : {
+            sameDay : '[Šodien pulksten] LT',
+            nextDay : '[Rīt pulksten] LT',
+            nextWeek : 'dddd [pulksten] LT',
+            lastDay : '[Vakar pulksten] LT',
+            lastWeek : '[Pagājušā] dddd [pulksten] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'pēc %s',
+            past : 'pirms %s',
+            s : relativeSeconds,
+            m : relativeTimeWithSingular,
+            mm : lv__relativeTimeWithPlural,
+            h : relativeTimeWithSingular,
+            hh : lv__relativeTimeWithPlural,
+            d : relativeTimeWithSingular,
+            dd : lv__relativeTimeWithPlural,
+            M : relativeTimeWithSingular,
+            MM : lv__relativeTimeWithPlural,
+            y : relativeTimeWithSingular,
+            yy : lv__relativeTimeWithPlural
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Montenegrin (me)
+    //! author : Miodrag Nikač <miodrag@restartit.me> : https://github.com/miodragnikac
+
+    var me__translator = {
+        words: { //Different grammatical cases
+            m: ['jedan minut', 'jednog minuta'],
+            mm: ['minut', 'minuta', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mjesec', 'mjeseca', 'mjeseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = me__translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + me__translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var me = _moment__default.defineLocale('me', {
+        months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+        monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+        weekdays: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda', 'četvrtak', 'petak', 'subota'],
+        weekdaysShort: ['ned.', 'pon.', 'uto.', 'sri.', 'čet.', 'pet.', 'sub.'],
+        weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sjutra u] LT',
+
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedjelju] [u] LT';
+                case 3:
+                    return '[u] [srijedu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedjelje] [u] LT',
+                    '[prošlog] [ponedjeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srijede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'prije %s',
+            s      : 'nekoliko sekundi',
+            m      : me__translator.translate,
+            mm     : me__translator.translate,
+            h      : me__translator.translate,
+            hh     : me__translator.translate,
+            d      : 'dan',
+            dd     : me__translator.translate,
+            M      : 'mjesec',
+            MM     : me__translator.translate,
+            y      : 'godinu',
+            yy     : me__translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : macedonian (mk)
+    //! author : Borislav Mickov : https://github.com/B0k0
+
+    var mk = _moment__default.defineLocale('mk', {
+        months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
+        monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
+        weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
+        weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
+        weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'D.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Денес во] LT',
+            nextDay : '[Утре во] LT',
+            nextWeek : 'dddd [во] LT',
+            lastDay : '[Вчера во] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 6:
+                    return '[Во изминатата] dddd [во] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[Во изминатиот] dddd [во] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'после %s',
+            past : 'пред %s',
+            s : 'неколку секунди',
+            m : 'минута',
+            mm : '%d минути',
+            h : 'час',
+            hh : '%d часа',
+            d : 'ден',
+            dd : '%d дена',
+            M : 'месец',
+            MM : '%d месеци',
+            y : 'година',
+            yy : '%d години'
+        },
+        ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+        ordinal : function (number) {
+            var lastDigit = number % 10,
+                last2Digits = number % 100;
+            if (number === 0) {
+                return number + '-ев';
+            } else if (last2Digits === 0) {
+                return number + '-ен';
+            } else if (last2Digits > 10 && last2Digits < 20) {
+                return number + '-ти';
+            } else if (lastDigit === 1) {
+                return number + '-ви';
+            } else if (lastDigit === 2) {
+                return number + '-ри';
+            } else if (lastDigit === 7 || lastDigit === 8) {
+                return number + '-ми';
+            } else {
+                return number + '-ти';
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : malayalam (ml)
+    //! author : Floyd Pink : https://github.com/floydpink
+
+    var ml = _moment__default.defineLocale('ml', {
+        months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
+        monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
+        weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
+        weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
+        weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm -നു',
+            LTS : 'A h:mm:ss -നു',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[ഇന്ന്] LT',
+            nextDay : '[നാളെ] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[ഇന്നലെ] LT',
+            lastWeek : '[കഴിഞ്ഞ] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s കഴിഞ്ഞ്',
+            past : '%s മുൻപ്',
+            s : 'അൽപ നിമിഷങ്ങൾ',
+            m : 'ഒരു മിനിറ്റ്',
+            mm : '%d മിനിറ്റ്',
+            h : 'ഒരു മണിക്കൂർ',
+            hh : '%d മണിക്കൂർ',
+            d : 'ഒരു ദിവസം',
+            dd : '%d ദിവസം',
+            M : 'ഒരു മാസം',
+            MM : '%d മാസം',
+            y : 'ഒരു വർഷം',
+            yy : '%d വർഷം'
+        },
+        meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
+        isPM : function (input) {
+            return /^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'രാത്രി';
+            } else if (hour < 12) {
+                return 'രാവിലെ';
+            } else if (hour < 17) {
+                return 'ഉച്ച കഴിഞ്ഞ്';
+            } else if (hour < 20) {
+                return 'വൈകുന്നേരം';
+            } else {
+                return 'രാത്രി';
+            }
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Marathi (mr)
+    //! author : Harshad Kale : https://github.com/kalehv
+
+    var mr__symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    mr__numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var mr = _moment__default.defineLocale('mr', {
+        months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
+        monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
+        weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+        weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
+        weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+        longDateFormat : {
+            LT : 'A h:mm वाजता',
+            LTS : 'A h:mm:ss वाजता',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[उद्या] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[काल] LT',
+            lastWeek: '[मागील] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s नंतर',
+            past : '%s पूर्वी',
+            s : 'सेकंद',
+            m: 'एक मिनिट',
+            mm: '%d मिनिटे',
+            h : 'एक तास',
+            hh : '%d तास',
+            d : 'एक दिवस',
+            dd : '%d दिवस',
+            M : 'एक महिना',
+            MM : '%d महिने',
+            y : 'एक वर्ष',
+            yy : '%d वर्षे'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return mr__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return mr__symbolMap[match];
+            });
+        },
+        meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'रात्री') {
+                return hour < 4 ? hour : hour + 12;
+            } else if (meridiem === 'सकाळी') {
+                return hour;
+            } else if (meridiem === 'दुपारी') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'सायंकाळी') {
+                return hour + 12;
+            }
+        },
+        meridiem: function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'रात्री';
+            } else if (hour < 10) {
+                return 'सकाळी';
+            } else if (hour < 17) {
+                return 'दुपारी';
+            } else if (hour < 20) {
+                return 'सायंकाळी';
+            } else {
+                return 'रात्री';
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Bahasa Malaysia (ms-MY)
+    //! author : Weldan Jamili : https://github.com/weldan
+
+    var ms_my = _moment__default.defineLocale('ms-my', {
+        months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+        monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+        weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+        weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+        weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+        longDateFormat : {
+            LT : 'HH.mm',
+            LTS : 'LT.ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY [pukul] LT',
+            LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+        },
+        meridiemParse: /pagi|tengahari|petang|malam/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'pagi') {
+                return hour;
+            } else if (meridiem === 'tengahari') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === 'petang' || meridiem === 'malam') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours < 11) {
+                return 'pagi';
+            } else if (hours < 15) {
+                return 'tengahari';
+            } else if (hours < 19) {
+                return 'petang';
+            } else {
+                return 'malam';
+            }
+        },
+        calendar : {
+            sameDay : '[Hari ini pukul] LT',
+            nextDay : '[Esok pukul] LT',
+            nextWeek : 'dddd [pukul] LT',
+            lastDay : '[Kelmarin pukul] LT',
+            lastWeek : 'dddd [lepas pukul] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'dalam %s',
+            past : '%s yang lepas',
+            s : 'beberapa saat',
+            m : 'seminit',
+            mm : '%d minit',
+            h : 'sejam',
+            hh : '%d jam',
+            d : 'sehari',
+            dd : '%d hari',
+            M : 'sebulan',
+            MM : '%d bulan',
+            y : 'setahun',
+            yy : '%d tahun'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Burmese (my)
+    //! author : Squar team, mysquar.com
+
+    var my__symbolMap = {
+        '1': '၁',
+        '2': '၂',
+        '3': '၃',
+        '4': '၄',
+        '5': '၅',
+        '6': '၆',
+        '7': '၇',
+        '8': '၈',
+        '9': '၉',
+        '0': '၀'
+    }, my__numberMap = {
+        '၁': '1',
+        '၂': '2',
+        '၃': '3',
+        '၄': '4',
+        '၅': '5',
+        '၆': '6',
+        '၇': '7',
+        '၈': '8',
+        '၉': '9',
+        '၀': '0'
+    };
+
+    var my = _moment__default.defineLocale('my', {
+        months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
+        monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
+        weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
+        weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+        weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+
+        longDateFormat: {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L: 'DD/MM/YYYY',
+            LL: 'D MMMM YYYY',
+            LLL: 'D MMMM YYYY LT',
+            LLLL: 'dddd D MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[ယနေ.] LT [မှာ]',
+            nextDay: '[မနက်ဖြန်] LT [မှာ]',
+            nextWeek: 'dddd LT [မှာ]',
+            lastDay: '[မနေ.က] LT [မှာ]',
+            lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
+            sameElse: 'L'
+        },
+        relativeTime: {
+            future: 'လာမည့် %s မှာ',
+            past: 'လွန်ခဲ့သော %s က',
+            s: 'စက္ကန်.အနည်းငယ်',
+            m: 'တစ်မိနစ်',
+            mm: '%d မိနစ်',
+            h: 'တစ်နာရီ',
+            hh: '%d နာရီ',
+            d: 'တစ်ရက်',
+            dd: '%d ရက်',
+            M: 'တစ်လ',
+            MM: '%d လ',
+            y: 'တစ်နှစ်',
+            yy: '%d နှစ်'
+        },
+        preparse: function (string) {
+            return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
+                return my__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return my__symbolMap[match];
+            });
+        },
+        week: {
+            dow: 1, // Monday is the first day of the week.
+            doy: 4 // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : norwegian bokmål (nb)
+    //! authors : Espen Hovlandsdal : https://github.com/rexxars
+    //!           Sigurd Gartmann : https://github.com/sigurdga
+
+    var nb = _moment__default.defineLocale('nb', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+        weekdaysShort : 'søn_man_tirs_ons_tors_fre_lør'.split('_'),
+        weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'H.mm',
+            LTS : 'LT.ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY [kl.] LT',
+            LLLL : 'dddd D. MMMM YYYY [kl.] LT'
+        },
+        calendar : {
+            sameDay: '[i dag kl.] LT',
+            nextDay: '[i morgen kl.] LT',
+            nextWeek: 'dddd [kl.] LT',
+            lastDay: '[i går kl.] LT',
+            lastWeek: '[forrige] dddd [kl.] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'for %s siden',
+            s : 'noen sekunder',
+            m : 'ett minutt',
+            mm : '%d minutter',
+            h : 'en time',
+            hh : '%d timer',
+            d : 'en dag',
+            dd : '%d dager',
+            M : 'en måned',
+            MM : '%d måneder',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : nepali/nepalese
+    //! author : suvash : https://github.com/suvash
+
+    var ne__symbolMap = {
+        '1': '१',
+        '2': '२',
+        '3': '३',
+        '4': '४',
+        '5': '५',
+        '6': '६',
+        '7': '७',
+        '8': '८',
+        '9': '९',
+        '0': '०'
+    },
+    ne__numberMap = {
+        '१': '1',
+        '२': '2',
+        '३': '3',
+        '४': '4',
+        '५': '5',
+        '६': '6',
+        '७': '7',
+        '८': '8',
+        '९': '9',
+        '०': '0'
+    };
+
+    var ne = _moment__default.defineLocale('ne', {
+        months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
+        monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
+        weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
+        weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
+        weekdaysMin : 'आइ._सो._मङ्_बु._बि._शु._श.'.split('_'),
+        longDateFormat : {
+            LT : 'Aको h:mm बजे',
+            LTS : 'Aको h:mm:ss बजे',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        preparse: function (string) {
+            return string.replace(/[१२३४५६७८९०]/g, function (match) {
+                return ne__numberMap[match];
+            });
+        },
+        postformat: function (string) {
+            return string.replace(/\d/g, function (match) {
+                return ne__symbolMap[match];
+            });
+        },
+        meridiemParse: /राती|बिहान|दिउँसो|बेलुका|साँझ|राती/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'राती') {
+                return hour < 3 ? hour : hour + 12;
+            } else if (meridiem === 'बिहान') {
+                return hour;
+            } else if (meridiem === 'दिउँसो') {
+                return hour >= 10 ? hour : hour + 12;
+            } else if (meridiem === 'बेलुका' || meridiem === 'साँझ') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 3) {
+                return 'राती';
+            } else if (hour < 10) {
+                return 'बिहान';
+            } else if (hour < 15) {
+                return 'दिउँसो';
+            } else if (hour < 18) {
+                return 'बेलुका';
+            } else if (hour < 20) {
+                return 'साँझ';
+            } else {
+                return 'राती';
+            }
+        },
+        calendar : {
+            sameDay : '[आज] LT',
+            nextDay : '[भोली] LT',
+            nextWeek : '[आउँदो] dddd[,] LT',
+            lastDay : '[हिजो] LT',
+            lastWeek : '[गएको] dddd[,] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sमा',
+            past : '%s अगाडी',
+            s : 'केही समय',
+            m : 'एक मिनेट',
+            mm : '%d मिनेट',
+            h : 'एक घण्टा',
+            hh : '%d घण्टा',
+            d : 'एक दिन',
+            dd : '%d दिन',
+            M : 'एक महिना',
+            MM : '%d महिना',
+            y : 'एक बर्ष',
+            yy : '%d बर्ष'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : dutch (nl)
+    //! author : Joris Röling : https://github.com/jjupiter
+
+    var nl__monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+        nl__monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+
+    var nl = _moment__default.defineLocale('nl', {
+        months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return nl__monthsShortWithoutDots[m.month()];
+            } else {
+                return nl__monthsShortWithDots[m.month()];
+            }
+        },
+        weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+        weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+        weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD-MM-YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[vandaag om] LT',
+            nextDay: '[morgen om] LT',
+            nextWeek: 'dddd [om] LT',
+            lastDay: '[gisteren om] LT',
+            lastWeek: '[afgelopen] dddd [om] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'over %s',
+            past : '%s geleden',
+            s : 'een paar seconden',
+            m : 'één minuut',
+            mm : '%d minuten',
+            h : 'één uur',
+            hh : '%d uur',
+            d : 'één dag',
+            dd : '%d dagen',
+            M : 'één maand',
+            MM : '%d maanden',
+            y : 'één jaar',
+            yy : '%d jaar'
+        },
+        ordinalParse: /\d{1,2}(ste|de)/,
+        ordinal : function (number) {
+            return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : norwegian nynorsk (nn)
+    //! author : https://github.com/mechuwind
+
+    var nn = _moment__default.defineLocale('nn', {
+        months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+        weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
+        weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
+        weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[I dag klokka] LT',
+            nextDay: '[I morgon klokka] LT',
+            nextWeek: 'dddd [klokka] LT',
+            lastDay: '[I går klokka] LT',
+            lastWeek: '[Føregåande] dddd [klokka] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'for %s sidan',
+            s : 'nokre sekund',
+            m : 'eit minutt',
+            mm : '%d minutt',
+            h : 'ein time',
+            hh : '%d timar',
+            d : 'ein dag',
+            dd : '%d dagar',
+            M : 'ein månad',
+            MM : '%d månader',
+            y : 'eit år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : polish (pl)
+    //! author : Rafal Hirsz : https://github.com/evoL
+
+    var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
+        monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+    function pl__plural(n) {
+        return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
+    }
+    function pl__translate(number, withoutSuffix, key) {
+        var result = number + ' ';
+        switch (key) {
+        case 'm':
+            return withoutSuffix ? 'minuta' : 'minutę';
+        case 'mm':
+            return result + (pl__plural(number) ? 'minuty' : 'minut');
+        case 'h':
+            return withoutSuffix  ? 'godzina'  : 'godzinę';
+        case 'hh':
+            return result + (pl__plural(number) ? 'godziny' : 'godzin');
+        case 'MM':
+            return result + (pl__plural(number) ? 'miesiące' : 'miesięcy');
+        case 'yy':
+            return result + (pl__plural(number) ? 'lata' : 'lat');
+        }
+    }
+
+    var pl = _moment__default.defineLocale('pl', {
+        months : function (momentToFormat, format) {
+            if (format === '') {
+                // Hack: if format empty we know this is used to generate
+                // RegExp by moment. Give then back both valid forms of months
+                // in RegExp ready format.
+                return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+            } else if (/D MMMM/.test(format)) {
+                return monthsSubjective[momentToFormat.month()];
+            } else {
+                return monthsNominative[momentToFormat.month()];
+            }
+        },
+        monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+        weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+        weekdaysShort : 'nie_pon_wt_śr_czw_pt_sb'.split('_'),
+        weekdaysMin : 'N_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Dziś o] LT',
+            nextDay: '[Jutro o] LT',
+            nextWeek: '[W] dddd [o] LT',
+            lastDay: '[Wczoraj o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[W zeszłą niedzielę o] LT';
+                case 3:
+                    return '[W zeszłą środę o] LT';
+                case 6:
+                    return '[W zeszłą sobotę o] LT';
+                default:
+                    return '[W zeszły] dddd [o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : '%s temu',
+            s : 'kilka sekund',
+            m : pl__translate,
+            mm : pl__translate,
+            h : pl__translate,
+            hh : pl__translate,
+            d : '1 dzień',
+            dd : '%d dni',
+            M : 'miesiąc',
+            MM : pl__translate,
+            y : 'rok',
+            yy : pl__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : brazilian portuguese (pt-br)
+    //! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira
+
+    var pt_br = _moment__default.defineLocale('pt-br', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY [às] LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY [às] LT'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : '%s atrás',
+            s : 'segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        ordinalParse: /\d{1,2}º/,
+        ordinal : '%dº'
+    });
+
+    //! moment.js locale configuration
+    //! locale : portuguese (pt)
+    //! author : Jefferson : https://github.com/jalex79
+
+    var pt = _moment__default.defineLocale('pt', {
+        months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+        monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+        weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+        weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+        weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Hoje às] LT',
+            nextDay: '[Amanhã às] LT',
+            nextWeek: 'dddd [às] LT',
+            lastDay: '[Ontem às] LT',
+            lastWeek: function () {
+                return (this.day() === 0 || this.day() === 6) ?
+                    '[Último] dddd [às] LT' : // Saturday + Sunday
+                    '[Última] dddd [às] LT'; // Monday - Friday
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'em %s',
+            past : 'há %s',
+            s : 'segundos',
+            m : 'um minuto',
+            mm : '%d minutos',
+            h : 'uma hora',
+            hh : '%d horas',
+            d : 'um dia',
+            dd : '%d dias',
+            M : 'um mês',
+            MM : '%d meses',
+            y : 'um ano',
+            yy : '%d anos'
+        },
+        ordinalParse: /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : romanian (ro)
+    //! author : Vlad Gurdiga : https://github.com/gurdiga
+    //! author : Valentin Agachi : https://github.com/avaly
+
+    function ro__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+                'mm': 'minute',
+                'hh': 'ore',
+                'dd': 'zile',
+                'MM': 'luni',
+                'yy': 'ani'
+            },
+            separator = ' ';
+        if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+            separator = ' de ';
+        }
+        return number + separator + format[key];
+    }
+
+    var ro = _moment__default.defineLocale('ro', {
+        months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+        monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+        weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+        weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+        weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY H:mm',
+            LLLL : 'dddd, D MMMM YYYY H:mm'
+        },
+        calendar : {
+            sameDay: '[azi la] LT',
+            nextDay: '[mâine la] LT',
+            nextWeek: 'dddd [la] LT',
+            lastDay: '[ieri la] LT',
+            lastWeek: '[fosta] dddd [la] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'peste %s',
+            past : '%s în urmă',
+            s : 'câteva secunde',
+            m : 'un minut',
+            mm : ro__relativeTimeWithPlural,
+            h : 'o oră',
+            hh : ro__relativeTimeWithPlural,
+            d : 'o zi',
+            dd : ro__relativeTimeWithPlural,
+            M : 'o lună',
+            MM : ro__relativeTimeWithPlural,
+            y : 'un an',
+            yy : ro__relativeTimeWithPlural
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : russian (ru)
+    //! author : Viktorminator : https://github.com/Viktorminator
+    //! Author : Menelion Elensúle : https://github.com/Oire
+
+    function ru__plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function ru__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+            'hh': 'час_часа_часов',
+            'dd': 'день_дня_дней',
+            'MM': 'месяц_месяца_месяцев',
+            'yy': 'год_года_лет'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'минута' : 'минуту';
+        }
+        else {
+            return number + ' ' + ru__plural(format[key], +number);
+        }
+    }
+    function ru__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+            'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function ru__monthsShortCaseReplace(m, format) {
+        var monthsShort = {
+            'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+            'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
+        },
+        nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return monthsShort[nounCase][m.month()];
+    }
+    function ru__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+            'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
+        },
+        nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/).test(format) ?
+            'accusative' :
+            'nominative';
+        return weekdays[nounCase][m.day()];
+    }
+
+    var ru = _moment__default.defineLocale('ru', {
+        months : ru__monthsCaseReplace,
+        monthsShort : ru__monthsShortCaseReplace,
+        weekdays : ru__weekdaysCaseReplace,
+        weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+        monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i],
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY г.',
+            LLL : 'D MMMM YYYY г., LT',
+            LLLL : 'dddd, D MMMM YYYY г., LT'
+        },
+        calendar : {
+            sameDay: '[Сегодня в] LT',
+            nextDay: '[Завтра в] LT',
+            lastDay: '[Вчера в] LT',
+            nextWeek: function () {
+                return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
+            },
+            lastWeek: function (now) {
+                if (now.week() !== this.week()) {
+                    switch (this.day()) {
+                    case 0:
+                        return '[В прошлое] dddd [в] LT';
+                    case 1:
+                    case 2:
+                    case 4:
+                        return '[В прошлый] dddd [в] LT';
+                    case 3:
+                    case 5:
+                    case 6:
+                        return '[В прошлую] dddd [в] LT';
+                    }
+                } else {
+                    if (this.day() === 2) {
+                        return '[Во] dddd [в] LT';
+                    } else {
+                        return '[В] dddd [в] LT';
+                    }
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'через %s',
+            past : '%s назад',
+            s : 'несколько секунд',
+            m : ru__relativeTimeWithPlural,
+            mm : ru__relativeTimeWithPlural,
+            h : 'час',
+            hh : ru__relativeTimeWithPlural,
+            d : 'день',
+            dd : ru__relativeTimeWithPlural,
+            M : 'месяц',
+            MM : ru__relativeTimeWithPlural,
+            y : 'год',
+            yy : ru__relativeTimeWithPlural
+        },
+        meridiemParse: /ночи|утра|дня|вечера/i,
+        isPM : function (input) {
+            return /^(дня|вечера)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночи';
+            } else if (hour < 12) {
+                return 'утра';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечера';
+            }
+        },
+        ordinalParse: /\d{1,2}-(й|го|я)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+                return number + '-й';
+            case 'D':
+                return number + '-го';
+            case 'w':
+            case 'W':
+                return number + '-я';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Sinhalese (si)
+    //! author : Sampath Sitinamaluwa : https://github.com/sampathsris
+
+    var si = _moment__default.defineLocale('si', {
+        months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
+        monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
+        weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
+        weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
+        weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
+        longDateFormat : {
+            LT : 'a h:mm',
+            LTS : 'a h:mm:ss',
+            L : 'YYYY/MM/DD',
+            LL : 'YYYY MMMM D',
+            LLL : 'YYYY MMMM D, LT',
+            LLLL : 'YYYY MMMM D [වැනි] dddd, LTS'
+        },
+        calendar : {
+            sameDay : '[අද] LT[ට]',
+            nextDay : '[හෙට] LT[ට]',
+            nextWeek : 'dddd LT[ට]',
+            lastDay : '[ඊයේ] LT[ට]',
+            lastWeek : '[පසුගිය] dddd LT[ට]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%sකින්',
+            past : '%sකට පෙර',
+            s : 'තත්පර කිහිපය',
+            m : 'මිනිත්තුව',
+            mm : 'මිනිත්තු %d',
+            h : 'පැය',
+            hh : 'පැය %d',
+            d : 'දිනය',
+            dd : 'දින %d',
+            M : 'මාසය',
+            MM : 'මාස %d',
+            y : 'වසර',
+            yy : 'වසර %d'
+        },
+        ordinalParse: /\d{1,2} වැනි/,
+        ordinal : function (number) {
+            return number + ' වැනි';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            if (hours > 11) {
+                return isLower ? 'ප.ව.' : 'පස් වරු';
+            } else {
+                return isLower ? 'පෙ.ව.' : 'පෙර වරු';
+            }
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : slovak (sk)
+    //! author : Martin Minka : https://github.com/k2s
+    //! based on work of petrbela : https://github.com/petrbela
+
+    var sk__months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
+        sk__monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
+    function sk__plural(n) {
+        return (n > 1) && (n < 5);
+    }
+    function sk__translate(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':  // a few seconds / in a few seconds / a few seconds ago
+            return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
+        case 'm':  // a minute / in a minute / a minute ago
+            return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
+        case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'minúty' : 'minút');
+            } else {
+                return result + 'minútami';
+            }
+            break;
+        case 'h':  // an hour / in an hour / an hour ago
+            return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+        case 'hh': // 9 hours / in 9 hours / 9 hours ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'hodiny' : 'hodín');
+            } else {
+                return result + 'hodinami';
+            }
+            break;
+        case 'd':  // a day / in a day / a day ago
+            return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
+        case 'dd': // 9 days / in 9 days / 9 days ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'dni' : 'dní');
+            } else {
+                return result + 'dňami';
+            }
+            break;
+        case 'M':  // a month / in a month / a month ago
+            return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
+        case 'MM': // 9 months / in 9 months / 9 months ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'mesiace' : 'mesiacov');
+            } else {
+                return result + 'mesiacmi';
+            }
+            break;
+        case 'y':  // a year / in a year / a year ago
+            return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
+        case 'yy': // 9 years / in 9 years / 9 years ago
+            if (withoutSuffix || isFuture) {
+                return result + (sk__plural(number) ? 'roky' : 'rokov');
+            } else {
+                return result + 'rokmi';
+            }
+            break;
+        }
+    }
+
+    var sk = _moment__default.defineLocale('sk', {
+        months : sk__months,
+        monthsShort : sk__monthsShort,
+        monthsParse : (function (months, monthsShort) {
+            var i, _monthsParse = [];
+            for (i = 0; i < 12; i++) {
+                // use custom parser to solve problem with July (červenec)
+                _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+            }
+            return _monthsParse;
+        }(sk__months, sk__monthsShort)),
+        weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
+        weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
+        weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
+        longDateFormat : {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[dnes o] LT',
+            nextDay: '[zajtra o] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v nedeľu o] LT';
+                case 1:
+                case 2:
+                    return '[v] dddd [o] LT';
+                case 3:
+                    return '[v stredu o] LT';
+                case 4:
+                    return '[vo štvrtok o] LT';
+                case 5:
+                    return '[v piatok o] LT';
+                case 6:
+                    return '[v sobotu o] LT';
+                }
+            },
+            lastDay: '[včera o] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[minulú nedeľu o] LT';
+                case 1:
+                case 2:
+                    return '[minulý] dddd [o] LT';
+                case 3:
+                    return '[minulú stredu o] LT';
+                case 4:
+                case 5:
+                    return '[minulý] dddd [o] LT';
+                case 6:
+                    return '[minulú sobotu o] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past : 'pred %s',
+            s : sk__translate,
+            m : sk__translate,
+            mm : sk__translate,
+            h : sk__translate,
+            hh : sk__translate,
+            d : sk__translate,
+            dd : sk__translate,
+            M : sk__translate,
+            MM : sk__translate,
+            y : sk__translate,
+            yy : sk__translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : slovenian (sl)
+    //! author : Robert Sedovšek : https://github.com/sedovsek
+
+    function sl__processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var result = number + ' ';
+        switch (key) {
+        case 's':
+            return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
+        case 'm':
+            return withoutSuffix ? 'ena minuta' : 'eno minuto';
+        case 'mm':
+            if (number === 1) {
+                result += withoutSuffix ? 'minuta' : 'minuto';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'minute' : 'minutami';
+            } else {
+                result += withoutSuffix || isFuture ? 'minut' : 'minutami';
+            }
+            return result;
+        case 'h':
+            return withoutSuffix ? 'ena ura' : 'eno uro';
+        case 'hh':
+            if (number === 1) {
+                result += withoutSuffix ? 'ura' : 'uro';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'uri' : 'urama';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'ure' : 'urami';
+            } else {
+                result += withoutSuffix || isFuture ? 'ur' : 'urami';
+            }
+            return result;
+        case 'd':
+            return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
+        case 'dd':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'dan' : 'dnem';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
+            } else {
+                result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
+            }
+            return result;
+        case 'M':
+            return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
+        case 'MM':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
+            } else {
+                result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
+            }
+            return result;
+        case 'y':
+            return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
+        case 'yy':
+            if (number === 1) {
+                result += withoutSuffix || isFuture ? 'leto' : 'letom';
+            } else if (number === 2) {
+                result += withoutSuffix || isFuture ? 'leti' : 'letoma';
+            } else if (number < 5) {
+                result += withoutSuffix || isFuture ? 'leta' : 'leti';
+            } else {
+                result += withoutSuffix || isFuture ? 'let' : 'leti';
+            }
+            return result;
+        }
+    }
+
+    var sl = _moment__default.defineLocale('sl', {
+        months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
+        weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
+        weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
+        weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD. MM. YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay  : '[danes ob] LT',
+            nextDay  : '[jutri ob] LT',
+
+            nextWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[v] [nedeljo] [ob] LT';
+                case 3:
+                    return '[v] [sredo] [ob] LT';
+                case 6:
+                    return '[v] [soboto] [ob] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[v] dddd [ob] LT';
+                }
+            },
+            lastDay  : '[včeraj ob] LT',
+            lastWeek : function () {
+                switch (this.day()) {
+                case 0:
+                    return '[prejšnjo] [nedeljo] [ob] LT';
+                case 3:
+                    return '[prejšnjo] [sredo] [ob] LT';
+                case 6:
+                    return '[prejšnjo] [soboto] [ob] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[prejšnji] dddd [ob] LT';
+                }
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'čez %s',
+            past   : 'pred %s',
+            s      : sl__processRelativeTime,
+            m      : sl__processRelativeTime,
+            mm     : sl__processRelativeTime,
+            h      : sl__processRelativeTime,
+            hh     : sl__processRelativeTime,
+            d      : sl__processRelativeTime,
+            dd     : sl__processRelativeTime,
+            M      : sl__processRelativeTime,
+            MM     : sl__processRelativeTime,
+            y      : sl__processRelativeTime,
+            yy     : sl__processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Albanian (sq)
+    //! author : Flakërim Ismani : https://github.com/flakerimi
+    //! author: Menelion Elensúle: https://github.com/Oire (tests)
+    //! author : Oerd Cukalla : https://github.com/oerd (fixes)
+
+    var sq = _moment__default.defineLocale('sq', {
+        months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
+        monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
+        weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
+        weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
+        weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
+        meridiemParse: /PD|MD/,
+        isPM: function (input) {
+            return input.charAt(0) === 'M';
+        },
+        meridiem : function (hours, minutes, isLower) {
+            return hours < 12 ? 'PD' : 'MD';
+        },
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[Sot në] LT',
+            nextDay : '[Nesër në] LT',
+            nextWeek : 'dddd [në] LT',
+            lastDay : '[Dje në] LT',
+            lastWeek : 'dddd [e kaluar në] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'në %s',
+            past : '%s më parë',
+            s : 'disa sekonda',
+            m : 'një minutë',
+            mm : '%d minuta',
+            h : 'një orë',
+            hh : '%d orë',
+            d : 'një ditë',
+            dd : '%d ditë',
+            M : 'një muaj',
+            MM : '%d muaj',
+            y : 'një vit',
+            yy : '%d vite'
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Serbian-cyrillic (sr-cyrl)
+    //! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+    var sr_cyrl__translator = {
+        words: { //Different grammatical cases
+            m: ['један минут', 'једне минуте'],
+            mm: ['минут', 'минуте', 'минута'],
+            h: ['један сат', 'једног сата'],
+            hh: ['сат', 'сата', 'сати'],
+            dd: ['дан', 'дана', 'дана'],
+            MM: ['месец', 'месеца', 'месеци'],
+            yy: ['година', 'године', 'година']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = sr_cyrl__translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + sr_cyrl__translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var sr_cyrl = _moment__default.defineLocale('sr-cyrl', {
+        months: ['јануар', 'фебруар', 'март', 'април', 'мај', 'јун', 'јул', 'август', 'септембар', 'октобар', 'новембар', 'децембар'],
+        monthsShort: ['јан.', 'феб.', 'мар.', 'апр.', 'мај', 'јун', 'јул', 'авг.', 'сеп.', 'окт.', 'нов.', 'дец.'],
+        weekdays: ['недеља', 'понедељак', 'уторак', 'среда', 'четвртак', 'петак', 'субота'],
+        weekdaysShort: ['нед.', 'пон.', 'уто.', 'сре.', 'чет.', 'пет.', 'суб.'],
+        weekdaysMin: ['не', 'по', 'ут', 'ср', 'че', 'пе', 'су'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[данас у] LT',
+            nextDay: '[сутра у] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[у] [недељу] [у] LT';
+                case 3:
+                    return '[у] [среду] [у] LT';
+                case 6:
+                    return '[у] [суботу] [у] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[у] dddd [у] LT';
+                }
+            },
+            lastDay  : '[јуче у] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[прошле] [недеље] [у] LT',
+                    '[прошлог] [понедељка] [у] LT',
+                    '[прошлог] [уторка] [у] LT',
+                    '[прошле] [среде] [у] LT',
+                    '[прошлог] [четвртка] [у] LT',
+                    '[прошлог] [петка] [у] LT',
+                    '[прошле] [суботе] [у] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past   : 'пре %s',
+            s      : 'неколико секунди',
+            m      : sr_cyrl__translator.translate,
+            mm     : sr_cyrl__translator.translate,
+            h      : sr_cyrl__translator.translate,
+            hh     : sr_cyrl__translator.translate,
+            d      : 'дан',
+            dd     : sr_cyrl__translator.translate,
+            M      : 'месец',
+            MM     : sr_cyrl__translator.translate,
+            y      : 'годину',
+            yy     : sr_cyrl__translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Serbian-latin (sr)
+    //! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+    var sr__translator = {
+        words: { //Different grammatical cases
+            m: ['jedan minut', 'jedne minute'],
+            mm: ['minut', 'minute', 'minuta'],
+            h: ['jedan sat', 'jednog sata'],
+            hh: ['sat', 'sata', 'sati'],
+            dd: ['dan', 'dana', 'dana'],
+            MM: ['mesec', 'meseca', 'meseci'],
+            yy: ['godina', 'godine', 'godina']
+        },
+        correctGrammaticalCase: function (number, wordKey) {
+            return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+        },
+        translate: function (number, withoutSuffix, key) {
+            var wordKey = sr__translator.words[key];
+            if (key.length === 1) {
+                return withoutSuffix ? wordKey[0] : wordKey[1];
+            } else {
+                return number + ' ' + sr__translator.correctGrammaticalCase(number, wordKey);
+            }
+        }
+    };
+
+    var sr = _moment__default.defineLocale('sr', {
+        months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+        monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+        weekdays: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak', 'subota'],
+        weekdaysShort: ['ned.', 'pon.', 'uto.', 'sre.', 'čet.', 'pet.', 'sub.'],
+        weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+        longDateFormat: {
+            LT: 'H:mm',
+            LTS : 'LT:ss',
+            L: 'DD. MM. YYYY',
+            LL: 'D. MMMM YYYY',
+            LLL: 'D. MMMM YYYY LT',
+            LLLL: 'dddd, D. MMMM YYYY LT'
+        },
+        calendar: {
+            sameDay: '[danas u] LT',
+            nextDay: '[sutra u] LT',
+            nextWeek: function () {
+                switch (this.day()) {
+                case 0:
+                    return '[u] [nedelju] [u] LT';
+                case 3:
+                    return '[u] [sredu] [u] LT';
+                case 6:
+                    return '[u] [subotu] [u] LT';
+                case 1:
+                case 2:
+                case 4:
+                case 5:
+                    return '[u] dddd [u] LT';
+                }
+            },
+            lastDay  : '[juče u] LT',
+            lastWeek : function () {
+                var lastWeekDays = [
+                    '[prošle] [nedelje] [u] LT',
+                    '[prošlog] [ponedeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+                return lastWeekDays[this.day()];
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'za %s',
+            past   : 'pre %s',
+            s      : 'nekoliko sekundi',
+            m      : sr__translator.translate,
+            mm     : sr__translator.translate,
+            h      : sr__translator.translate,
+            hh     : sr__translator.translate,
+            d      : 'dan',
+            dd     : sr__translator.translate,
+            M      : 'mesec',
+            MM     : sr__translator.translate,
+            y      : 'godinu',
+            yy     : sr__translator.translate
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : swedish (sv)
+    //! author : Jens Alm : https://github.com/ulmus
+
+    var sv = _moment__default.defineLocale('sv', {
+        months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+        monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+        weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+        weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+        weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'YYYY-MM-DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Idag] LT',
+            nextDay: '[Imorgon] LT',
+            lastDay: '[Igår] LT',
+            nextWeek: '[På] dddd LT',
+            lastWeek: '[I] dddd[s] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'om %s',
+            past : 'för %s sedan',
+            s : 'några sekunder',
+            m : 'en minut',
+            mm : '%d minuter',
+            h : 'en timme',
+            hh : '%d timmar',
+            d : 'en dag',
+            dd : '%d dagar',
+            M : 'en månad',
+            MM : '%d månader',
+            y : 'ett år',
+            yy : '%d år'
+        },
+        ordinalParse: /\d{1,2}(e|a)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (~~(number % 100 / 10) === 1) ? 'e' :
+                (b === 1) ? 'a' :
+                (b === 2) ? 'a' :
+                (b === 3) ? 'e' : 'e';
+            return number + output;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : tamil (ta)
+    //! author : Arjunkumar Krishnamoorthy : https://github.com/tk120404
+
+    var ta = _moment__default.defineLocale('ta', {
+        months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+        weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
+        weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
+        weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY, LT',
+            LLLL : 'dddd, D MMMM YYYY, LT'
+        },
+        calendar : {
+            sameDay : '[இன்று] LT',
+            nextDay : '[நாளை] LT',
+            nextWeek : 'dddd, LT',
+            lastDay : '[நேற்று] LT',
+            lastWeek : '[கடந்த வாரம்] dddd, LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s இல்',
+            past : '%s முன்',
+            s : 'ஒரு சில விநாடிகள்',
+            m : 'ஒரு நிமிடம்',
+            mm : '%d நிமிடங்கள்',
+            h : 'ஒரு மணி நேரம்',
+            hh : '%d மணி நேரம்',
+            d : 'ஒரு நாள்',
+            dd : '%d நாட்கள்',
+            M : 'ஒரு மாதம்',
+            MM : '%d மாதங்கள்',
+            y : 'ஒரு வருடம்',
+            yy : '%d ஆண்டுகள்'
+        },
+        ordinalParse: /\d{1,2}வது/,
+        ordinal : function (number) {
+            return number + 'வது';
+        },
+        // refer http://ta.wikipedia.org/s/1er1
+        meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 2) {
+                return ' யாமம்';
+            } else if (hour < 6) {
+                return ' வைகறை';  // வைகறை
+            } else if (hour < 10) {
+                return ' காலை'; // காலை
+            } else if (hour < 14) {
+                return ' நண்பகல்'; // நண்பகல்
+            } else if (hour < 18) {
+                return ' எற்பாடு'; // எற்பாடு
+            } else if (hour < 22) {
+                return ' மாலை'; // மாலை
+            } else {
+                return ' யாமம்';
+            }
+        },
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === 'யாமம்') {
+                return hour < 2 ? hour : hour + 12;
+            } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
+                return hour;
+            } else if (meridiem === 'நண்பகல்') {
+                return hour >= 10 ? hour : hour + 12;
+            } else {
+                return hour + 12;
+            }
+        },
+        week : {
+            dow : 0, // Sunday is the first day of the week.
+            doy : 6  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : thai (th)
+    //! author : Kridsada Thanabulpong : https://github.com/sirn
+
+    var th = _moment__default.defineLocale('th', {
+        months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
+        monthsShort : 'มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา'.split('_'),
+        weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
+        weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
+        weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
+        longDateFormat : {
+            LT : 'H นาฬิกา m นาที',
+            LTS : 'LT s วินาที',
+            L : 'YYYY/MM/DD',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY เวลา LT',
+            LLLL : 'วันddddที่ D MMMM YYYY เวลา LT'
+        },
+        meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
+        isPM: function (input) {
+            return input === 'หลังเที่ยง';
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 12) {
+                return 'ก่อนเที่ยง';
+            } else {
+                return 'หลังเที่ยง';
+            }
+        },
+        calendar : {
+            sameDay : '[วันนี้ เวลา] LT',
+            nextDay : '[พรุ่งนี้ เวลา] LT',
+            nextWeek : 'dddd[หน้า เวลา] LT',
+            lastDay : '[เมื่อวานนี้ เวลา] LT',
+            lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'อีก %s',
+            past : '%sที่แล้ว',
+            s : 'ไม่กี่วินาที',
+            m : '1 นาที',
+            mm : '%d นาที',
+            h : '1 ชั่วโมง',
+            hh : '%d ชั่วโมง',
+            d : '1 วัน',
+            dd : '%d วัน',
+            M : '1 เดือน',
+            MM : '%d เดือน',
+            y : '1 ปี',
+            yy : '%d ปี'
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Tagalog/Filipino (tl-ph)
+    //! author : Dan Hagman
+
+    var tl_ph = _moment__default.defineLocale('tl-ph', {
+        months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
+        monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
+        weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
+        weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
+        weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'MM/D/YYYY',
+            LL : 'MMMM D, YYYY',
+            LLL : 'MMMM D, YYYY LT',
+            LLLL : 'dddd, MMMM DD, YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Ngayon sa] LT',
+            nextDay: '[Bukas sa] LT',
+            nextWeek: 'dddd [sa] LT',
+            lastDay: '[Kahapon sa] LT',
+            lastWeek: 'dddd [huling linggo] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'sa loob ng %s',
+            past : '%s ang nakalipas',
+            s : 'ilang segundo',
+            m : 'isang minuto',
+            mm : '%d minuto',
+            h : 'isang oras',
+            hh : '%d oras',
+            d : 'isang araw',
+            dd : '%d araw',
+            M : 'isang buwan',
+            MM : '%d buwan',
+            y : 'isang taon',
+            yy : '%d taon'
+        },
+        ordinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : turkish (tr)
+    //! authors : Erhan Gundogan : https://github.com/erhangundogan,
+    //!           Burak Yiğit Kaya: https://github.com/BYK
+
+    var tr__suffixes = {
+        1: '\'inci',
+        5: '\'inci',
+        8: '\'inci',
+        70: '\'inci',
+        80: '\'inci',
+        2: '\'nci',
+        7: '\'nci',
+        20: '\'nci',
+        50: '\'nci',
+        3: '\'üncü',
+        4: '\'üncü',
+        100: '\'üncü',
+        6: '\'ncı',
+        9: '\'uncu',
+        10: '\'uncu',
+        30: '\'uncu',
+        60: '\'ıncı',
+        90: '\'ıncı'
+    };
+
+    var tr = _moment__default.defineLocale('tr', {
+        months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
+        monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
+        weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
+        weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
+        weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay : '[bugün saat] LT',
+            nextDay : '[yarın saat] LT',
+            nextWeek : '[haftaya] dddd [saat] LT',
+            lastDay : '[dün] LT',
+            lastWeek : '[geçen hafta] dddd [saat] LT',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : '%s sonra',
+            past : '%s önce',
+            s : 'birkaç saniye',
+            m : 'bir dakika',
+            mm : '%d dakika',
+            h : 'bir saat',
+            hh : '%d saat',
+            d : 'bir gün',
+            dd : '%d gün',
+            M : 'bir ay',
+            MM : '%d ay',
+            y : 'bir yıl',
+            yy : '%d yıl'
+        },
+        ordinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,
+        ordinal : function (number) {
+            if (number === 0) {  // special case for zero
+                return number + '\'ıncı';
+            }
+            var a = number % 10,
+                b = number % 100 - a,
+                c = number >= 100 ? 100 : null;
+            return number + (tr__suffixes[a] || tr__suffixes[b] || tr__suffixes[c]);
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Morocco Central Atlas Tamaziɣt in Latin (tzm-latn)
+    //! author : Abdel Said : https://github.com/abdelsaid
+
+    var tzm_latn = _moment__default.defineLocale('tzm-latn', {
+        months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+        weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[asdkh g] LT',
+            nextDay: '[aska g] LT',
+            nextWeek: 'dddd [g] LT',
+            lastDay: '[assant g] LT',
+            lastWeek: 'dddd [g] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'dadkh s yan %s',
+            past : 'yan %s',
+            s : 'imik',
+            m : 'minuḍ',
+            mm : '%d minuḍ',
+            h : 'saɛa',
+            hh : '%d tassaɛin',
+            d : 'ass',
+            dd : '%d ossan',
+            M : 'ayowr',
+            MM : '%d iyyirn',
+            y : 'asgas',
+            yy : '%d isgasn'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : Morocco Central Atlas Tamaziɣt (tzm)
+    //! author : Abdel Said : https://github.com/abdelsaid
+
+    var tzm = _moment__default.defineLocale('tzm', {
+        months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+        weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS: 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
+            nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
+            nextWeek: 'dddd [ⴴ] LT',
+            lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
+            lastWeek: 'dddd [ⴴ] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
+            past : 'ⵢⴰⵏ %s',
+            s : 'ⵉⵎⵉⴽ',
+            m : 'ⵎⵉⵏⵓⴺ',
+            mm : '%d ⵎⵉⵏⵓⴺ',
+            h : 'ⵙⴰⵄⴰ',
+            hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
+            d : 'ⴰⵙⵙ',
+            dd : '%d oⵙⵙⴰⵏ',
+            M : 'ⴰⵢoⵓⵔ',
+            MM : '%d ⵉⵢⵢⵉⵔⵏ',
+            y : 'ⴰⵙⴳⴰⵙ',
+            yy : '%d ⵉⵙⴳⴰⵙⵏ'
+        },
+        week : {
+            dow : 6, // Saturday is the first day of the week.
+            doy : 12  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : ukrainian (uk)
+    //! author : zemlanin : https://github.com/zemlanin
+    //! Author : Menelion Elensúle : https://github.com/Oire
+
+    function uk__plural(word, num) {
+        var forms = word.split('_');
+        return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+    }
+    function uk__relativeTimeWithPlural(number, withoutSuffix, key) {
+        var format = {
+            'mm': 'хвилина_хвилини_хвилин',
+            'hh': 'година_години_годин',
+            'dd': 'день_дні_днів',
+            'MM': 'місяць_місяці_місяців',
+            'yy': 'рік_роки_років'
+        };
+        if (key === 'm') {
+            return withoutSuffix ? 'хвилина' : 'хвилину';
+        }
+        else if (key === 'h') {
+            return withoutSuffix ? 'година' : 'годину';
+        }
+        else {
+            return number + ' ' + uk__plural(format[key], +number);
+        }
+    }
+    function uk__monthsCaseReplace(m, format) {
+        var months = {
+            'nominative': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_'),
+            'accusative': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_')
+        },
+        nounCase = (/D[oD]? *MMMM?/).test(format) ?
+            'accusative' :
+            'nominative';
+        return months[nounCase][m.month()];
+    }
+    function uk__weekdaysCaseReplace(m, format) {
+        var weekdays = {
+            'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
+            'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
+            'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
+        },
+        nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
+            'accusative' :
+            ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
+                'genitive' :
+                'nominative');
+        return weekdays[nounCase][m.day()];
+    }
+    function processHoursFunction(str) {
+        return function () {
+            return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
+        };
+    }
+
+    var uk = _moment__default.defineLocale('uk', {
+        months : uk__monthsCaseReplace,
+        monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
+        weekdays : uk__weekdaysCaseReplace,
+        weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D MMMM YYYY р.',
+            LLL : 'D MMMM YYYY р., LT',
+            LLLL : 'dddd, D MMMM YYYY р., LT'
+        },
+        calendar : {
+            sameDay: processHoursFunction('[Сьогодні '),
+            nextDay: processHoursFunction('[Завтра '),
+            lastDay: processHoursFunction('[Вчора '),
+            nextWeek: processHoursFunction('[У] dddd ['),
+            lastWeek: function () {
+                switch (this.day()) {
+                case 0:
+                case 3:
+                case 5:
+                case 6:
+                    return processHoursFunction('[Минулої] dddd [').call(this);
+                case 1:
+                case 2:
+                case 4:
+                    return processHoursFunction('[Минулого] dddd [').call(this);
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : 'за %s',
+            past : '%s тому',
+            s : 'декілька секунд',
+            m : uk__relativeTimeWithPlural,
+            mm : uk__relativeTimeWithPlural,
+            h : 'годину',
+            hh : uk__relativeTimeWithPlural,
+            d : 'день',
+            dd : uk__relativeTimeWithPlural,
+            M : 'місяць',
+            MM : uk__relativeTimeWithPlural,
+            y : 'рік',
+            yy : uk__relativeTimeWithPlural
+        },
+        // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
+        meridiemParse: /ночі|ранку|дня|вечора/,
+        isPM: function (input) {
+            return /^(дня|вечора)$/.test(input);
+        },
+        meridiem : function (hour, minute, isLower) {
+            if (hour < 4) {
+                return 'ночі';
+            } else if (hour < 12) {
+                return 'ранку';
+            } else if (hour < 17) {
+                return 'дня';
+            } else {
+                return 'вечора';
+            }
+        },
+        ordinalParse: /\d{1,2}-(й|го)/,
+        ordinal: function (number, period) {
+            switch (period) {
+            case 'M':
+            case 'd':
+            case 'DDD':
+            case 'w':
+            case 'W':
+                return number + '-й';
+            case 'D':
+                return number + '-го';
+            default:
+                return number;
+            }
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 1st is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : uzbek (uz)
+    //! author : Sardor Muminov : https://github.com/muminoff
+
+    var uz = _moment__default.defineLocale('uz', {
+        months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+        monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+        weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
+        weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
+        weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'D MMMM YYYY, dddd LT'
+        },
+        calendar : {
+            sameDay : '[Бугун соат] LT [да]',
+            nextDay : '[Эртага] LT [да]',
+            nextWeek : 'dddd [куни соат] LT [да]',
+            lastDay : '[Кеча соат] LT [да]',
+            lastWeek : '[Утган] dddd [куни соат] LT [да]',
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'Якин %s ичида',
+            past : 'Бир неча %s олдин',
+            s : 'фурсат',
+            m : 'бир дакика',
+            mm : '%d дакика',
+            h : 'бир соат',
+            hh : '%d соат',
+            d : 'бир кун',
+            dd : '%d кун',
+            M : 'бир ой',
+            MM : '%d ой',
+            y : 'бир йил',
+            yy : '%d йил'
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 7  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : vietnamese (vi)
+    //! author : Bang Nguyen : https://github.com/bangnk
+
+    var vi = _moment__default.defineLocale('vi', {
+        months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
+        monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
+        weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
+        weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM [năm] YYYY',
+            LLL : 'D MMMM [năm] YYYY LT',
+            LLLL : 'dddd, D MMMM [năm] YYYY LT',
+            l : 'DD/M/YYYY',
+            ll : 'D MMM YYYY',
+            lll : 'D MMM YYYY LT',
+            llll : 'ddd, D MMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Hôm nay lúc] LT',
+            nextDay: '[Ngày mai lúc] LT',
+            nextWeek: 'dddd [tuần tới lúc] LT',
+            lastDay: '[Hôm qua lúc] LT',
+            lastWeek: 'dddd [tuần rồi lúc] LT',
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : '%s tới',
+            past : '%s trước',
+            s : 'vài giây',
+            m : 'một phút',
+            mm : '%d phút',
+            h : 'một giờ',
+            hh : '%d giờ',
+            d : 'một ngày',
+            dd : '%d ngày',
+            M : 'một tháng',
+            MM : '%d tháng',
+            y : 'một năm',
+            yy : '%d năm'
+        },
+        ordinalParse: /\d{1,2}/,
+        ordinal : function (number) {
+            return number;
+        },
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : chinese (zh-cn)
+    //! author : suupic : https://github.com/suupic
+    //! author : Zeno Zeng : https://github.com/zenozeng
+
+    var zh_cn = _moment__default.defineLocale('zh-cn', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah点mm分',
+            LTS : 'Ah点m分s秒',
+            L : 'YYYY-MM-DD',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日LT',
+            LLLL : 'YYYY年MMMD日ddddLT',
+            l : 'YYYY-MM-DD',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日LT',
+            llll : 'YYYY年MMMD日ddddLT'
+        },
+        meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+        meridiemHour: function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '凌晨' || meridiem === '早上' ||
+                    meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            } else {
+                // '中午'
+                return hour >= 11 ? hour : hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 600) {
+                return '凌晨';
+            } else if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : function () {
+                return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+            },
+            nextDay : function () {
+                return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+            },
+            lastDay : function () {
+                return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+            },
+            nextWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = _moment__default().startOf('week');
+                prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            lastWeek : function () {
+                var startOfWeek, prefix;
+                startOfWeek = _moment__default().startOf('week');
+                prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
+                return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+            },
+            sameElse : 'LL'
+        },
+        ordinalParse: /\d{1,2}(日|月|周)/,
+        ordinal : function (number, period) {
+            switch (period) {
+            case 'd':
+            case 'D':
+            case 'DDD':
+                return number + '日';
+            case 'M':
+                return number + '月';
+            case 'w':
+            case 'W':
+                return number + '周';
+            default:
+                return number;
+            }
+        },
+        relativeTime : {
+            future : '%s内',
+            past : '%s前',
+            s : '几秒',
+            m : '1 分钟',
+            mm : '%d 分钟',
+            h : '1 小时',
+            hh : '%d 小时',
+            d : '1 天',
+            dd : '%d 天',
+            M : '1 个月',
+            MM : '%d 个月',
+            y : '1 年',
+            yy : '%d 年'
+        },
+        week : {
+            // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    //! moment.js locale configuration
+    //! locale : traditional chinese (zh-tw)
+    //! author : Ben : https://github.com/ben-lin
+
+    var zh_tw = _moment__default.defineLocale('zh-tw', {
+        months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+        monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+        weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+        weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+        weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+        longDateFormat : {
+            LT : 'Ah點mm分',
+            LTS : 'Ah點m分s秒',
+            L : 'YYYY年MMMD日',
+            LL : 'YYYY年MMMD日',
+            LLL : 'YYYY年MMMD日LT',
+            LLLL : 'YYYY年MMMD日ddddLT',
+            l : 'YYYY年MMMD日',
+            ll : 'YYYY年MMMD日',
+            lll : 'YYYY年MMMD日LT',
+            llll : 'YYYY年MMMD日ddddLT'
+        },
+        meridiemParse: /早上|上午|中午|下午|晚上/,
+        meridiemHour : function (hour, meridiem) {
+            if (hour === 12) {
+                hour = 0;
+            }
+            if (meridiem === '早上' || meridiem === '上午') {
+                return hour;
+            } else if (meridiem === '中午') {
+                return hour >= 11 ? hour : hour + 12;
+            } else if (meridiem === '下午' || meridiem === '晚上') {
+                return hour + 12;
+            }
+        },
+        meridiem : function (hour, minute, isLower) {
+            var hm = hour * 100 + minute;
+            if (hm < 900) {
+                return '早上';
+            } else if (hm < 1130) {
+                return '上午';
+            } else if (hm < 1230) {
+                return '中午';
+            } else if (hm < 1800) {
+                return '下午';
+            } else {
+                return '晚上';
+            }
+        },
+        calendar : {
+            sameDay : '[今天]LT',
+            nextDay : '[明天]LT',
+            nextWeek : '[下]ddddLT',
+            lastDay : '[昨天]LT',
+            lastWeek : '[上]ddddLT',
+            sameElse : 'L'
+        },
+        ordinalParse: /\d{1,2}(日|月|週)/,
+        ordinal : function (number, period) {
+            switch (period) {
+            case 'd' :
+            case 'D' :
+            case 'DDD' :
+                return number + '日';
+            case 'M' :
+                return number + '月';
+            case 'w' :
+            case 'W' :
+                return number + '週';
+            default :
+                return number;
+            }
+        },
+        relativeTime : {
+            future : '%s內',
+            past : '%s前',
+            s : '幾秒',
+            m : '一分鐘',
+            mm : '%d分鐘',
+            h : '一小時',
+            hh : '%d小時',
+            d : '一天',
+            dd : '%d天',
+            M : '一個月',
+            MM : '%d個月',
+            y : '一年',
+            yy : '%d年'
+        }
+    });
+
+    var moment_with_locales = _moment__default;
+
+    return moment_with_locales;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/min/moment-with-locales.min.js b/turtles/app/lib/bower_components/momentjs/min/moment-with-locales.min.js
new file mode 100644
index 000000000..071bdf9af
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/min/moment-with-locales.min.js
@@ -0,0 +1,81 @@
+!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return Gd.apply(null,arguments)}function b(a){Gd=a}function c(a){return"[object Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function f(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function g(a,b){for(var c in b)f(b,c)&&(a[c]=b[c]);return f(b,"toString")&&(a.toString=b.toString),f(b,"valueOf")&&(a.valueOf=b.valueOf),a}function h(a,b,c,d){return za(a,b,c,d,!0).utc()}function i(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function j(a){return null==a._pf&&(a._pf=i()),a._pf}function k(a){if(null==a._isValid){var b=j(a);a._isValid=!isNaN(a._d.getTime())&&b.overflow<0&&!b.empty&&!b.invalidMonth&&!b.nullInput&&!b.invalidFormat&&!b.userInvalidated,a._strict&&(a._isValid=a._isValid&&0===b.charsLeftOver&&0===b.unusedTokens.length&&void 0===b.bigHour)}return a._isValid}function l(a){var b=h(0/0);return null!=a?g(j(b),a):j(b).userInvalidated=!0,b}function m(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=j(b)),"undefined"!=typeof b._locale&&(a._locale=b._locale),Id.length>0)for(c in Id)d=Id[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function n(b){m(this,b),this._d=new Date(+b._d),Jd===!1&&(Jd=!0,a.updateOffset(this),Jd=!1)}function o(a){return a instanceof n||null!=a&&null!=a._isAMomentObject}function p(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function q(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&p(a[d])!==p(b[d]))&&g++;return g+f}function r(){}function s(a){return a?a.toLowerCase().replace("_","-"):a}function t(a){for(var b,c,d,e,f=0;f<a.length;){for(e=s(a[f]).split("-"),b=e.length,c=s(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=u(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&q(e,c,!0)>=b-1)break;b--}f++}return null}function u(a){var b=null;if(!Kd[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=Hd._abbr,require("./locale/"+a),v(b)}catch(c){}return Kd[a]}function v(a,b){var c;return a&&(c="undefined"==typeof b?x(a):w(a,b),c&&(Hd=c)),Hd._abbr}function w(a,b){return null!==b?(b.abbr=a,Kd[a]||(Kd[a]=new r),Kd[a].set(b),v(a),Kd[a]):(delete Kd[a],null)}function x(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return Hd;if(!c(a)){if(b=u(a))return b;a=[a]}return t(a)}function y(a,b){var c=a.toLowerCase();Ld[c]=Ld[c+"s"]=Ld[b]=a}function z(a){return"string"==typeof a?Ld[a]||Ld[a.toLowerCase()]:void 0}function A(a){var b,c,d={};for(c in a)f(a,c)&&(b=z(c),b&&(d[b]=a[c]));return d}function B(b,c){return function(d){return null!=d?(D(this,b,d),a.updateOffset(this,c),this):C(this,b)}}function C(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function D(a,b,c){return a._d["set"+(a._isUTC?"UTC":"")+b](c)}function E(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else if(a=z(a),"function"==typeof this[a])return this[a](b);return this}function F(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function G(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(Pd[a]=e),b&&(Pd[b[0]]=function(){return F(e.apply(this,arguments),b[1],b[2])}),c&&(Pd[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function H(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function I(a){var b,c,d=a.match(Md);for(b=0,c=d.length;c>b;b++)Pd[d[b]]?d[b]=Pd[d[b]]:d[b]=H(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function J(a,b){return a.isValid()?(b=K(b,a.localeData()),Od[b]||(Od[b]=I(b)),Od[b](a)):a.localeData().invalidDate()}function K(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Nd.lastIndex=0;d>=0&&Nd.test(a);)a=a.replace(Nd,c),Nd.lastIndex=0,d-=1;return a}function L(a,b,c){ce[a]="function"==typeof b?b:function(a){return a&&c?c:b}}function M(a,b){return f(ce,a)?ce[a](b._strict,b._locale):new RegExp(N(a))}function N(a){return a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function O(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=p(a)}),c=0;c<a.length;c++)de[a[c]]=d}function P(a,b){O(a,function(a,c,d,e){d._w=d._w||{},b(a,d._w,d,e)})}function Q(a,b,c){null!=b&&f(de,a)&&de[a](b,c._a,c,a)}function R(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function S(a){return this._months[a.month()]}function T(a){return this._monthsShort[a.month()]}function U(a,b,c){var d,e,f;for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=h([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}function V(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),R(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function W(b){return null!=b?(V(this,b),a.updateOffset(this,!0),this):C(this,"Month")}function X(){return R(this.year(),this.month())}function Y(a){var b,c=a._a;return c&&-2===j(a).overflow&&(b=c[fe]<0||c[fe]>11?fe:c[ge]<1||c[ge]>R(c[ee],c[fe])?ge:c[he]<0||c[he]>24||24===c[he]&&(0!==c[ie]||0!==c[je]||0!==c[ke])?he:c[ie]<0||c[ie]>59?ie:c[je]<0||c[je]>59?je:c[ke]<0||c[ke]>999?ke:-1,j(a)._overflowDayOfYear&&(ee>b||b>ge)&&(b=ge),j(a).overflow=b),a}function Z(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function $(a,b){var c=!0,d=a+"\n"+(new Error).stack;return g(function(){return c&&(Z(d),c=!1),b.apply(this,arguments)},b)}function _(a,b){ne[a]||(Z(b),ne[a]=!0)}function aa(a){var b,c,d=a._i,e=oe.exec(d);if(e){for(j(a).iso=!0,b=0,c=pe.length;c>b;b++)if(pe[b][1].exec(d)){a._f=pe[b][0]+(e[6]||" ");break}for(b=0,c=qe.length;c>b;b++)if(qe[b][1].exec(d)){a._f+=qe[b][0];break}d.match(_d)&&(a._f+="Z"),ta(a)}else a._isValid=!1}function ba(b){var c=re.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(aa(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}function ca(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function da(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function ea(a){return fa(a)?366:365}function fa(a){return a%4===0&&a%100!==0||a%400===0}function ga(){return fa(this.year())}function ha(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=Aa(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function ia(a){return ha(a,this._week.dow,this._week.doy).week}function ja(){return this._week.dow}function ka(){return this._week.doy}function la(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function ma(a){var b=ha(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function na(a,b,c,d,e){var f,g,h=da(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:ea(a-1)+g}}function oa(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function pa(a,b,c){return null!=a?a:null!=b?b:c}function qa(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function ra(a){var b,c,d,e,f=[];if(!a._d){for(d=qa(a),a._w&&null==a._a[ge]&&null==a._a[fe]&&sa(a),a._dayOfYear&&(e=pa(a._a[ee],d[ee]),a._dayOfYear>ea(e)&&(j(a)._overflowDayOfYear=!0),c=da(e,0,a._dayOfYear),a._a[fe]=c.getUTCMonth(),a._a[ge]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=f[b]=d[b];for(;7>b;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[he]&&0===a._a[ie]&&0===a._a[je]&&0===a._a[ke]&&(a._nextDay=!0,a._a[he]=0),a._d=(a._useUTC?da:ca).apply(null,f),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[he]=24)}}function sa(a){var b,c,d,e,f,g,h;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=pa(b.GG,a._a[ee],ha(Aa(),1,4).year),d=pa(b.W,1),e=pa(b.E,1)):(f=a._locale._week.dow,g=a._locale._week.doy,c=pa(b.gg,a._a[ee],ha(Aa(),f,g).year),d=pa(b.w,1),null!=b.d?(e=b.d,f>e&&++d):e=null!=b.e?b.e+f:f),h=na(c,d,e,g,f),a._a[ee]=h.year,a._dayOfYear=h.dayOfYear}function ta(b){if(b._f===a.ISO_8601)return void aa(b);b._a=[],j(b).empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,k=0;for(e=K(b._f,b._locale).match(Md)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(M(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&j(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),k+=d.length),Pd[f]?(d?j(b).empty=!1:j(b).unusedTokens.push(f),Q(f,d,b)):b._strict&&!d&&j(b).unusedTokens.push(f);j(b).charsLeftOver=i-k,h.length>0&&j(b).unusedInput.push(h),j(b).bigHour===!0&&b._a[he]<=12&&b._a[he]>0&&(j(b).bigHour=void 0),b._a[he]=ua(b._locale,b._a[he],b._meridiem),ra(b),Y(b)}function ua(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function va(a){var b,c,d,e,f;if(0===a._f.length)return j(a).invalidFormat=!0,void(a._d=new Date(0/0));for(e=0;e<a._f.length;e++)f=0,b=m({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._f=a._f[e],ta(b),k(b)&&(f+=j(b).charsLeftOver,f+=10*j(b).unusedTokens.length,j(b).score=f,(null==d||d>f)&&(d=f,c=b));g(a,c||b)}function wa(a){if(!a._d){var b=A(a._i);a._a=[b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],ra(a)}}function xa(a){var b,e=a._i,f=a._f;return a._locale=a._locale||x(a._l),null===e||void 0===f&&""===e?l({nullInput:!0}):("string"==typeof e&&(a._i=e=a._locale.preparse(e)),o(e)?new n(Y(e)):(c(f)?va(a):f?ta(a):d(e)?a._d=e:ya(a),b=new n(Y(a)),b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b))}function ya(b){var f=b._i;void 0===f?b._d=new Date:d(f)?b._d=new Date(+f):"string"==typeof f?ba(b):c(f)?(b._a=e(f.slice(0),function(a){return parseInt(a,10)}),ra(b)):"object"==typeof f?wa(b):"number"==typeof f?b._d=new Date(f):a.createFromInputFallback(b)}function za(a,b,c,d,e){var f={};return"boolean"==typeof c&&(d=c,c=void 0),f._isAMomentObject=!0,f._useUTC=f._isUTC=e,f._l=c,f._i=a,f._f=b,f._strict=d,xa(f)}function Aa(a,b,c,d){return za(a,b,c,d,!1)}function Ba(a,b){var d,e;if(1===b.length&&c(b[0])&&(b=b[0]),!b.length)return Aa();for(d=b[0],e=1;e<b.length;++e)b[e][a](d)&&(d=b[e]);return d}function Ca(){var a=[].slice.call(arguments,0);return Ba("isBefore",a)}function Da(){var a=[].slice.call(arguments,0);return Ba("isAfter",a)}function Ea(a){var b=A(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=x(),this._bubble()}function Fa(a){return a instanceof Ea}function Ga(a,b){G(a,0,0,function(){var a=this.utcOffset(),c="+";return 0>a&&(a=-a,c="-"),c+F(~~(a/60),2)+b+F(~~a%60,2)})}function Ha(a){var b=(a||"").match(_d)||[],c=b[b.length-1]||[],d=(c+"").match(we)||["-",0,0],e=+(60*d[1])+p(d[2]);return"+"===d[0]?e:-e}function Ia(b,c){var e,f;return c._isUTC?(e=c.clone(),f=(o(b)||d(b)?+b:+Aa(b))-+e,e._d.setTime(+e._d+f),a.updateOffset(e,!1),e):Aa(b).local();return c._isUTC?Aa(b).zone(c._offset||0):Aa(b).local()}function Ja(a){return 15*-Math.round(a._d.getTimezoneOffset()/15)}function Ka(b,c){var d,e=this._offset||0;return null!=b?("string"==typeof b&&(b=Ha(b)),Math.abs(b)<16&&(b=60*b),!this._isUTC&&c&&(d=Ja(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?$a(this,Va(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?e:Ja(this)}function La(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Ma(a){return this.utcOffset(0,a)}function Na(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Ja(this),"m")),this}function Oa(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(Ha(this._i)),this}function Pa(a){return a=a?Aa(a).utcOffset():0,(this.utcOffset()-a)%60===0}function Qa(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Ra(){if(this._a){var a=this._isUTC?h(this._a):Aa(this._a);return this.isValid()&&q(this._a,a.toArray())>0}return!1}function Sa(){return!this._isUTC}function Ta(){return this._isUTC}function Ua(){return this._isUTC&&0===this._offset}function Va(a,b){var c,d,e,g=a,h=null;return Fa(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=xe.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:p(h[ge])*c,h:p(h[he])*c,m:p(h[ie])*c,s:p(h[je])*c,ms:p(h[ke])*c}):(h=ye.exec(a))?(c="-"===h[1]?-1:1,g={y:Wa(h[2],c),M:Wa(h[3],c),d:Wa(h[4],c),h:Wa(h[5],c),m:Wa(h[6],c),s:Wa(h[7],c),w:Wa(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=Ya(Aa(g.from),Aa(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new Ea(g),Fa(a)&&f(a,"_locale")&&(d._locale=a._locale),d}function Wa(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function Xa(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function Ya(a,b){var c;return b=Ia(b,a),a.isBefore(b)?c=Xa(a,b):(c=Xa(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function Za(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(_(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=Va(c,d),$a(this,e,a),this}}function $a(b,c,d,e){var f=c._milliseconds,g=c._days,h=c._months;e=null==e?!0:e,f&&b._d.setTime(+b._d+f*d),g&&D(b,"Date",C(b,"Date")+g*d),h&&V(b,C(b,"Month")+h*d),e&&a.updateOffset(b,g||h)}function _a(a){var b=a||Aa(),c=Ia(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this,Aa(b)))}function ab(){return new n(this)}function bb(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+this>+a):(c=o(a)?+a:+Aa(a),c<+this.clone().startOf(b))}function cb(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+a>+this):(c=o(a)?+a:+Aa(a),+this.clone().endOf(b)<c)}function db(a,b,c){return this.isAfter(a,c)&&this.isBefore(b,c)}function eb(a,b){var c;return b=z(b||"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+this===+a):(c=+Aa(a),+this.clone().startOf(b)<=c&&c<=+this.clone().endOf(b))}function fb(a){return 0>a?Math.ceil(a):Math.floor(a)}function gb(a,b,c){var d,e,f=Ia(a,this),g=6e4*(f.utcOffset()-this.utcOffset());return b=z(b),"year"===b||"month"===b||"quarter"===b?(e=hb(this,f),"quarter"===b?e/=3:"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:fb(e)}function hb(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function ib(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function jb(){var a=this.clone().utc();return 0<a.year()&&a.year()<=9999?"function"==typeof Date.prototype.toISOString?this.toDate().toISOString():J(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):J(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}function kb(b){var c=J(this,b||a.defaultFormat);return this.localeData().postformat(c)}function lb(a,b){return this.isValid()?Va({to:this,from:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function mb(a){return this.from(Aa(),a)}function nb(a,b){return this.isValid()?Va({from:this,to:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function ob(a){return this.to(Aa(),a)}function pb(a){var b;return void 0===a?this._locale._abbr:(b=x(a),null!=b&&(this._locale=b),this)}function qb(){return this._locale}function rb(a){switch(a=z(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a&&this.weekday(0),"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this}function sb(a){return a=z(a),void 0===a||"millisecond"===a?this:this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")}function tb(){return+this._d-6e4*(this._offset||0)}function ub(){return Math.floor(+this/1e3)}function vb(){return this._offset?new Date(+this):this._d}function wb(){var a=this;return[a.year(),a.month(),a.date(),a.hour(),a.minute(),a.second(),a.millisecond()]}function xb(){return k(this)}function yb(){return g({},j(this))}function zb(){return j(this).overflow}function Ab(a,b){G(0,[a,a.length],0,b)}function Bb(a,b,c){return ha(Aa([a,11,31+b-c]),b,c).week}function Cb(a){var b=ha(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")}function Db(a){var b=ha(this,1,4).year;return null==a?b:this.add(a-b,"y")}function Eb(){return Bb(this.year(),1,4)}function Fb(){var a=this.localeData()._week;return Bb(this.year(),a.dow,a.doy)}function Gb(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}function Hb(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function Ib(a){return this._weekdays[a.day()]}function Jb(a){return this._weekdaysShort[a.day()]}function Kb(a){return this._weekdaysMin[a.day()]}function Lb(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=Aa([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b}function Mb(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Hb(a,this.localeData()),this.add(a-b,"d")):b}function Nb(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Ob(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)}function Pb(a,b){G(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function Qb(a,b){return b._meridiemParse}function Rb(a){return"p"===(a+"").toLowerCase().charAt(0)}function Sb(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function Tb(a){G(0,[a,3],0,"millisecond")}function Ub(){return this._isUTC?"UTC":""}function Vb(){return this._isUTC?"Coordinated Universal Time":""}function Wb(a){return Aa(1e3*a)}function Xb(){return Aa.apply(null,arguments).parseZone()}function Yb(a,b,c){var d=this._calendar[a];return"function"==typeof d?d.call(b,c):d}function Zb(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b}function $b(){return this._invalidDate}function _b(a){return this._ordinal.replace("%d",a)}function ac(a){return a}function bc(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)}function cc(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)}function dc(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function ec(a,b,c,d){var e=x(),f=h().set(d,b);return e[c](f,a)}function fc(a,b,c,d,e){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return ec(a,b,c,e);var f,g=[];for(f=0;d>f;f++)g[f]=ec(a,f,c,e);return g}function gc(a,b){return fc(a,b,"months",12,"month")}function hc(a,b){return fc(a,b,"monthsShort",12,"month")}function ic(a,b){return fc(a,b,"weekdays",7,"day")}function jc(a,b){return fc(a,b,"weekdaysShort",7,"day")}function kc(a,b){return fc(a,b,"weekdaysMin",7,"day")}function lc(){var a=this._data;return this._milliseconds=Ue(this._milliseconds),this._days=Ue(this._days),this._months=Ue(this._months),a.milliseconds=Ue(a.milliseconds),a.seconds=Ue(a.seconds),a.minutes=Ue(a.minutes),a.hours=Ue(a.hours),a.months=Ue(a.months),a.years=Ue(a.years),this}function mc(a,b,c,d){var e=Va(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function nc(a,b){return mc(this,a,b,1)}function oc(a,b){return mc(this,a,b,-1)}function pc(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;return g.milliseconds=d%1e3,a=fb(d/1e3),g.seconds=a%60,b=fb(a/60),g.minutes=b%60,c=fb(b/60),g.hours=c%24,e+=fb(c/24),h=fb(qc(e)),e-=fb(rc(h)),f+=fb(e/30),e%=30,h+=fb(f/12),f%=12,g.days=e,g.months=f,g.years=h,this}function qc(a){return 400*a/146097}function rc(a){return 146097*a/400}function sc(a){var b,c,d=this._milliseconds;if(a=z(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+12*qc(b),"month"===a?c:c/12;switch(b=this._days+Math.round(rc(this._months/12)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}function tc(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*p(this._months/12)}function uc(a){return function(){return this.as(a)}}function vc(a){return a=z(a),this[a+"s"]()}function wc(a){return function(){return this._data[a]}}function xc(){return fb(this.days()/7)}function yc(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function zc(a,b,c){var d=Va(a).abs(),e=jf(d.as("s")),f=jf(d.as("m")),g=jf(d.as("h")),h=jf(d.as("d")),i=jf(d.as("M")),j=jf(d.as("y")),k=e<kf.s&&["s",e]||1===f&&["m"]||f<kf.m&&["mm",f]||1===g&&["h"]||g<kf.h&&["hh",g]||1===h&&["d"]||h<kf.d&&["dd",h]||1===i&&["M"]||i<kf.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,yc.apply(null,k)}function Ac(a,b){return void 0===kf[a]?!1:void 0===b?kf[a]:(kf[a]=b,!0)}function Bc(a){var b=this.localeData(),c=zc(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function Cc(){var a=lf(this.years()),b=lf(this.months()),c=lf(this.days()),d=lf(this.hours()),e=lf(this.minutes()),f=lf(this.seconds()+this.milliseconds()/1e3),g=this.asSeconds();return g?(0>g?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"}
+//! moment.js locale configuration
+//! locale : belarusian (be)
+//! author : Dmitry Demidov : https://github.com/demidov91
+//! author: Praleska: http://praleska.pro/
+//! Author : Menelion Elensúle : https://github.com/Oire
+function Dc(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function Ec(a,b,c){var d={mm:b?"хвіліна_хвіліны_хвілін":"хвіліну_хвіліны_хвілін",hh:b?"гадзіна_гадзіны_гадзін":"гадзіну_гадзіны_гадзін",dd:"дзень_дні_дзён",MM:"месяц_месяцы_месяцаў",yy:"год_гады_гадоў"};return"m"===c?b?"хвіліна":"хвіліну":"h"===c?b?"гадзіна":"гадзіну":a+" "+Dc(d[c],+a)}function Fc(a,b){var c={nominative:"студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань".split("_"),accusative:"студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function Gc(a,b){var c={nominative:"нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота".split("_"),accusative:"нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу".split("_")},d=/\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/.test(b)?"accusative":"nominative";return c[d][a.day()]}
+//! moment.js locale configuration
+//! locale : breton (br)
+//! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou
+function Hc(a,b,c){var d={mm:"munutenn",MM:"miz",dd:"devezh"};return a+" "+Kc(d[c],a)}function Ic(a){switch(Jc(a)){case 1:case 3:case 4:case 5:case 9:return a+" bloaz";default:return a+" vloaz"}}function Jc(a){return a>9?Jc(a%10):a}function Kc(a,b){return 2===b?Lc(a):a}function Lc(a){var b={m:"v",b:"v",d:"z"};return void 0===b[a.charAt(0)]?a:b[a.charAt(0)]+a.substring(1)}
+//! moment.js locale configuration
+//! locale : bosnian (bs)
+//! author : Nedim Cholich : https://github.com/frontyard
+//! based on (hr) translation by Bojan Marković
+function Mc(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}function Nc(a){return a>1&&5>a&&1!==~~(a/10)}function Oc(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"pár sekund":"pár sekundami";case"m":return b?"minuta":d?"minutu":"minutou";case"mm":return b||d?e+(Nc(a)?"minuty":"minut"):e+"minutami";break;case"h":return b?"hodina":d?"hodinu":"hodinou";case"hh":return b||d?e+(Nc(a)?"hodiny":"hodin"):e+"hodinami";break;case"d":return b||d?"den":"dnem";case"dd":return b||d?e+(Nc(a)?"dny":"dní"):e+"dny";break;case"M":return b||d?"měsíc":"měsícem";case"MM":return b||d?e+(Nc(a)?"měsíce":"měsíců"):e+"měsíci";break;case"y":return b||d?"rok":"rokem";case"yy":return b||d?e+(Nc(a)?"roky":"let"):e+"lety"}}
+//! moment.js locale configuration
+//! locale : austrian german (de-at)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+//! author : Martin Groller : https://github.com/MadMG
+function Pc(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}
+//! moment.js locale configuration
+//! locale : german (de)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+function Qc(a,b,c,d){var e={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?e[c][0]:e[c][1]}
+//! moment.js locale configuration
+//! locale : estonian (et)
+//! author : Henry Kehlmann : https://github.com/madhenry
+//! improvements : Illimar Tambek : https://github.com/ragulka
+function Rc(a,b,c,d){var e={s:["mõne sekundi","mõni sekund","paar sekundit"],m:["ühe minuti","üks minut"],mm:[a+" minuti",a+" minutit"],h:["ühe tunni","tund aega","üks tund"],hh:[a+" tunni",a+" tundi"],d:["ühe päeva","üks päev"],M:["kuu aja","kuu aega","üks kuu"],MM:[a+" kuu",a+" kuud"],y:["ühe aasta","aasta","üks aasta"],yy:[a+" aasta",a+" aastat"]};return b?e[c][2]?e[c][2]:e[c][1]:d?e[c][0]:e[c][1]}function Sc(a,b,c,d){var e="";switch(c){case"s":return d?"muutaman sekunnin":"muutama sekunti";case"m":return d?"minuutin":"minuutti";case"mm":e=d?"minuutin":"minuuttia";break;case"h":return d?"tunnin":"tunti";case"hh":e=d?"tunnin":"tuntia";break;case"d":return d?"päivän":"päivä";case"dd":e=d?"päivän":"päivää";break;case"M":return d?"kuukauden":"kuukausi";case"MM":e=d?"kuukauden":"kuukautta";break;case"y":return d?"vuoden":"vuosi";case"yy":e=d?"vuoden":"vuotta"}return e=Tc(a,d)+" "+e}function Tc(a,b){return 10>a?b?If[a]:Hf[a]:a}
+//! moment.js locale configuration
+//! locale : hrvatski (hr)
+//! author : Bojan Marković : https://github.com/bmarkovic
+function Uc(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}function Vc(a,b,c,d){var e=a;switch(c){case"s":return d||b?"néhány másodperc":"néhány másodperce";case"m":return"egy"+(d||b?" perc":" perce");case"mm":return e+(d||b?" perc":" perce");case"h":return"egy"+(d||b?" óra":" órája");case"hh":return e+(d||b?" óra":" órája");case"d":return"egy"+(d||b?" nap":" napja");case"dd":return e+(d||b?" nap":" napja");case"M":return"egy"+(d||b?" hónap":" hónapja");case"MM":return e+(d||b?" hónap":" hónapja");case"y":return"egy"+(d||b?" év":" éve");case"yy":return e+(d||b?" év":" éve")}return""}function Wc(a){return(a?"":"[múlt] ")+"["+Nf[this.day()]+"] LT[-kor]"}
+//! moment.js locale configuration
+//! locale : Armenian (hy-am)
+//! author : Armendarabyan : https://github.com/armendarabyan
+function Xc(a,b){var c={nominative:"հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր".split("_"),accusative:"հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function Yc(a,b){var c="հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ".split("_");return c[a.month()]}function Zc(a,b){var c="կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ".split("_");return c[a.day()]}
+//! moment.js locale configuration
+//! locale : icelandic (is)
+//! author : Hinrik Örn Sigurðsson : https://github.com/hinrik
+function $c(a){return a%100===11?!0:a%10===1?!1:!0}function _c(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"nokkrar sekúndur":"nokkrum sekúndum";case"m":return b?"mínúta":"mínútu";case"mm":return $c(a)?e+(b||d?"mínútur":"mínútum"):b?e+"mínúta":e+"mínútu";case"hh":return $c(a)?e+(b||d?"klukkustundir":"klukkustundum"):e+"klukkustund";case"d":return b?"dagur":d?"dag":"degi";case"dd":return $c(a)?b?e+"dagar":e+(d?"daga":"dögum"):b?e+"dagur":e+(d?"dag":"degi");case"M":return b?"mánuður":d?"mánuð":"mánuði";case"MM":return $c(a)?b?e+"mánuðir":e+(d?"mánuði":"mánuðum"):b?e+"mánuður":e+(d?"mánuð":"mánuði");case"y":return b||d?"ár":"ári";case"yy":return $c(a)?e+(b||d?"ár":"árum"):e+(b||d?"ár":"ári")}}
+//! moment.js locale configuration
+//! locale : Georgian (ka)
+//! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
+function ad(a,b){var c={nominative:"იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი".split("_"),accusative:"იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს".split("_")},d=/D[oD] *MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function bd(a,b){var c={nominative:"კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი".split("_"),accusative:"კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს".split("_")},d=/(წინა|შემდეგ)/.test(b)?"accusative":"nominative";return c[d][a.day()]}
+//! moment.js locale configuration
+//! locale : Luxembourgish (lb)
+//! author : mweimerskirch : https://github.com/mweimerskirch, David Raison : https://github.com/kwisatz
+function cd(a,b,c,d){var e={m:["eng Minutt","enger Minutt"],h:["eng Stonn","enger Stonn"],d:["een Dag","engem Dag"],M:["ee Mount","engem Mount"],y:["ee Joer","engem Joer"]};return b?e[c][0]:e[c][1]}function dd(a){var b=a.substr(0,a.indexOf(" "));return fd(b)?"a "+a:"an "+a}function ed(a){var b=a.substr(0,a.indexOf(" "));return fd(b)?"viru "+a:"virun "+a}function fd(a){if(a=parseInt(a,10),isNaN(a))return!1;if(0>a)return!0;if(10>a)return a>=4&&7>=a?!0:!1;if(100>a){var b=a%10,c=a/10;return fd(0===b?c:b)}if(1e4>a){for(;a>=10;)a/=10;return fd(a)}return a/=1e3,fd(a)}function gd(a,b,c,d){return b?"kelios sekundės":d?"kelių sekundžių":"kelias sekundes"}function hd(a,b,c,d){return b?jd(c)[0]:d?jd(c)[1]:jd(c)[2]}function id(a){return a%10===0||a>10&&20>a}function jd(a){return Of[a].split("_")}function kd(a,b,c,d){var e=a+" ";return 1===a?e+hd(a,b,c[0],d):b?e+(id(a)?jd(c)[1]:jd(c)[0]):d?e+jd(c)[1]:e+(id(a)?jd(c)[1]:jd(c)[2])}function ld(a,b){var c=-1===b.indexOf("dddd HH:mm"),d=Pf[a.day()];return c?d:d.substring(0,d.length-2)+"į"}function md(a,b,c){return c?b%10===1&&11!==b?a[2]:a[3]:b%10===1&&11!==b?a[0]:a[1]}function nd(a,b,c){return a+" "+md(Qf[c],a,b)}function od(a,b,c){return md(Qf[c],a,b)}function pd(a,b){return b?"dažas sekundes":"dažām sekundēm"}function qd(a){return 5>a%10&&a%10>1&&~~(a/10)%10!==1}function rd(a,b,c){var d=a+" ";switch(c){case"m":return b?"minuta":"minutę";case"mm":return d+(qd(a)?"minuty":"minut");case"h":return b?"godzina":"godzinę";case"hh":return d+(qd(a)?"godziny":"godzin");case"MM":return d+(qd(a)?"miesiące":"miesięcy");case"yy":return d+(qd(a)?"lata":"lat")}}
+//! moment.js locale configuration
+//! locale : romanian (ro)
+//! author : Vlad Gurdiga : https://github.com/gurdiga
+//! author : Valentin Agachi : https://github.com/avaly
+function sd(a,b,c){var d={mm:"minute",hh:"ore",dd:"zile",MM:"luni",yy:"ani"},e=" ";return(a%100>=20||a>=100&&a%100===0)&&(e=" de "),a+e+d[c]}
+//! moment.js locale configuration
+//! locale : russian (ru)
+//! author : Viktorminator : https://github.com/Viktorminator
+//! Author : Menelion Elensúle : https://github.com/Oire
+function td(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function ud(a,b,c){var d={mm:b?"минута_минуты_минут":"минуту_минуты_минут",hh:"час_часа_часов",dd:"день_дня_дней",MM:"месяц_месяца_месяцев",yy:"год_года_лет"};return"m"===c?b?"минута":"минуту":a+" "+td(d[c],+a)}function vd(a,b){var c={nominative:"январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),accusative:"января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function wd(a,b){var c={nominative:"янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек".split("_"),accusative:"янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function xd(a,b){var c={nominative:"воскресенье_понедельник_вторник_среда_четверг_пятница_суббота".split("_"),accusative:"воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу".split("_")},d=/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/.test(b)?"accusative":"nominative";return c[d][a.day()]}function yd(a){return a>1&&5>a}function zd(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"pár sekúnd":"pár sekundami";case"m":return b?"minúta":d?"minútu":"minútou";case"mm":return b||d?e+(yd(a)?"minúty":"minút"):e+"minútami";break;case"h":return b?"hodina":d?"hodinu":"hodinou";case"hh":return b||d?e+(yd(a)?"hodiny":"hodín"):e+"hodinami";break;case"d":return b||d?"deň":"dňom";case"dd":return b||d?e+(yd(a)?"dni":"dní"):e+"dňami";break;case"M":return b||d?"mesiac":"mesiacom";case"MM":return b||d?e+(yd(a)?"mesiace":"mesiacov"):e+"mesiacmi";break;case"y":return b||d?"rok":"rokom";case"yy":return b||d?e+(yd(a)?"roky":"rokov"):e+"rokmi"}}
+//! moment.js locale configuration
+//! locale : slovenian (sl)
+//! author : Robert Sedovšek : https://github.com/sedovsek
+function Ad(a,b,c,d){var e=a+" ";switch(c){case"s":return b||d?"nekaj sekund":"nekaj sekundami";case"m":return b?"ena minuta":"eno minuto";case"mm":return e+=1===a?b?"minuta":"minuto":2===a?b||d?"minuti":"minutama":5>a?b||d?"minute":"minutami":b||d?"minut":"minutami";case"h":return b?"ena ura":"eno uro";case"hh":return e+=1===a?b?"ura":"uro":2===a?b||d?"uri":"urama":5>a?b||d?"ure":"urami":b||d?"ur":"urami";case"d":return b||d?"en dan":"enim dnem";case"dd":return e+=1===a?b||d?"dan":"dnem":2===a?b||d?"dni":"dnevoma":b||d?"dni":"dnevi";case"M":return b||d?"en mesec":"enim mesecem";case"MM":return e+=1===a?b||d?"mesec":"mesecem":2===a?b||d?"meseca":"mesecema":5>a?b||d?"mesece":"meseci":b||d?"mesecev":"meseci";case"y":return b||d?"eno leto":"enim letom";case"yy":return e+=1===a?b||d?"leto":"letom":2===a?b||d?"leti":"letoma":5>a?b||d?"leta":"leti":b||d?"let":"leti"}}
+//! moment.js locale configuration
+//! locale : ukrainian (uk)
+//! author : zemlanin : https://github.com/zemlanin
+//! Author : Menelion Elensúle : https://github.com/Oire
+function Bd(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function Cd(a,b,c){var d={mm:"хвилина_хвилини_хвилин",hh:"година_години_годин",dd:"день_дні_днів",MM:"місяць_місяці_місяців",yy:"рік_роки_років"};return"m"===c?b?"хвилина":"хвилину":"h"===c?b?"година":"годину":a+" "+Bd(d[c],+a)}function Dd(a,b){var c={nominative:"січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень".split("_"),accusative:"січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня".split("_")},d=/D[oD]? *MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function Ed(a,b){var c={nominative:"неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота".split("_"),accusative:"неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу".split("_"),genitive:"неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи".split("_")},d=/(\[[ВвУу]\]) ?dddd/.test(b)?"accusative":/\[?(?:минулої|наступної)? ?\] ?dddd/.test(b)?"genitive":"nominative";return c[d][a.day()]}function Fd(a){return function(){return a+"о"+(11===this.hours()?"б":"")+"] LT"}}var Gd,Hd,Id=a.momentProperties=[],Jd=!1,Kd={},Ld={},Md=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g,Nd=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Od={},Pd={},Qd=/\d/,Rd=/\d\d/,Sd=/\d{3}/,Td=/\d{4}/,Ud=/[+-]?\d{6}/,Vd=/\d\d?/,Wd=/\d{1,3}/,Xd=/\d{1,4}/,Yd=/[+-]?\d{1,6}/,Zd=/\d+/,$d=/[+-]?\d+/,_d=/Z|[+-]\d\d:?\d\d/gi,ae=/[+-]?\d+(\.\d{1,3})?/,be=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,ce={},de={},ee=0,fe=1,ge=2,he=3,ie=4,je=5,ke=6;G("M",["MM",2],"Mo",function(){return this.month()+1}),G("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),G("MMMM",0,0,function(a){return this.localeData().months(this,a)}),y("month","M"),L("M",Vd),L("MM",Vd,Rd),L("MMM",be),L("MMMM",be),O(["M","MM"],function(a,b){b[fe]=p(a)-1}),O(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);null!=e?b[fe]=e:j(c).invalidMonth=a});var le="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),me="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),ne={};a.suppressDeprecationWarnings=!1;var oe=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,pe=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],qe=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],re=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=$("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),G(0,["YY",2],0,function(){return this.year()%100}),G(0,["YYYY",4],0,"year"),G(0,["YYYYY",5],0,"year"),G(0,["YYYYYY",6,!0],0,"year"),y("year","y"),L("Y",$d),L("YY",Vd,Rd),L("YYYY",Xd,Td),L("YYYYY",Yd,Ud),L("YYYYYY",Yd,Ud),O(["YYYY","YYYYY","YYYYYY"],ee),O("YY",function(b,c){c[ee]=a.parseTwoDigitYear(b)}),a.parseTwoDigitYear=function(a){return p(a)+(p(a)>68?1900:2e3)};var se=B("FullYear",!1);G("w",["ww",2],"wo","week"),G("W",["WW",2],"Wo","isoWeek"),y("week","w"),y("isoWeek","W"),L("w",Vd),L("ww",Vd,Rd),L("W",Vd),L("WW",Vd,Rd),P(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=p(a)});var te={dow:0,doy:6};G("DDD",["DDDD",3],"DDDo","dayOfYear"),y("dayOfYear","DDD"),L("DDD",Wd),L("DDDD",Sd),O(["DDD","DDDD"],function(a,b,c){c._dayOfYear=p(a)}),a.ISO_8601=function(){};var ue=$("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var a=Aa.apply(null,arguments);return this>a?this:a}),ve=$("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var a=Aa.apply(null,arguments);return a>this?this:a});Ga("Z",":"),Ga("ZZ",""),L("Z",_d),L("ZZ",_d),O(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ha(a)});var we=/([\+\-]|\d\d)/gi;a.updateOffset=function(){};var xe=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,ye=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;Va.fn=Ea.prototype;var ze=Za(1,"add"),Ae=Za(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ";var Be=$("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});G(0,["gg",2],0,function(){return this.weekYear()%100}),G(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Ab("gggg","weekYear"),Ab("ggggg","weekYear"),Ab("GGGG","isoWeekYear"),Ab("GGGGG","isoWeekYear"),y("weekYear","gg"),y("isoWeekYear","GG"),L("G",$d),L("g",$d),L("GG",Vd,Rd),L("gg",Vd,Rd),L("GGGG",Xd,Td),L("gggg",Xd,Td),L("GGGGG",Yd,Ud),L("ggggg",Yd,Ud),P(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=p(a)}),P(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),G("Q",0,0,"quarter"),y("quarter","Q"),L("Q",Qd),O("Q",function(a,b){b[fe]=3*(p(a)-1)}),G("D",["DD",2],"Do","date"),y("date","D"),L("D",Vd),L("DD",Vd,Rd),L("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),O(["D","DD"],ge),O("Do",function(a,b){b[ge]=p(a.match(Vd)[0],10)});var Ce=B("Date",!0);G("d",0,"do","day"),G("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),G("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),G("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),G("e",0,0,"weekday"),G("E",0,0,"isoWeekday"),y("day","d"),y("weekday","e"),y("isoWeekday","E"),L("d",Vd),L("e",Vd),L("E",Vd),L("dd",be),L("ddd",be),L("dddd",be),P(["dd","ddd","dddd"],function(a,b,c){var d=c._locale.weekdaysParse(a);null!=d?b.d=d:j(c).invalidWeekday=a}),P(["d","e","E"],function(a,b,c,d){b[d]=p(a)});var De="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Ee="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Fe="Su_Mo_Tu_We_Th_Fr_Sa".split("_");G("H",["HH",2],0,"hour"),G("h",["hh",2],0,function(){return this.hours()%12||12}),Pb("a",!0),Pb("A",!1),y("hour","h"),L("a",Qb),L("A",Qb),L("H",Vd),L("h",Vd),L("HH",Vd,Rd),L("hh",Vd,Rd),O(["H","HH"],he),O(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),O(["h","hh"],function(a,b,c){b[he]=p(a),j(c).bigHour=!0});var Ge=/[ap]\.?m?\.?/i,He=B("Hours",!0);G("m",["mm",2],0,"minute"),y("minute","m"),L("m",Vd),L("mm",Vd,Rd),O(["m","mm"],ie);var Ie=B("Minutes",!1);G("s",["ss",2],0,"second"),y("second","s"),L("s",Vd),L("ss",Vd,Rd),O(["s","ss"],je);var Je=B("Seconds",!1);G("S",0,0,function(){return~~(this.millisecond()/100)}),G(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),Tb("SSS"),Tb("SSSS"),y("millisecond","ms"),L("S",Wd,Qd),L("SS",Wd,Rd),L("SSS",Wd,Sd),L("SSSS",Zd),O(["S","SS","SSS","SSSS"],function(a,b){b[ke]=p(1e3*("0."+a))});var Ke=B("Milliseconds",!1);G("z",0,0,"zoneAbbr"),G("zz",0,0,"zoneName");var Le=n.prototype;Le.add=ze,Le.calendar=_a,Le.clone=ab,Le.diff=gb,Le.endOf=sb,Le.format=kb,Le.from=lb,Le.fromNow=mb,Le.to=nb,Le.toNow=ob,Le.get=E,Le.invalidAt=zb,Le.isAfter=bb,Le.isBefore=cb,Le.isBetween=db,Le.isSame=eb,Le.isValid=xb,Le.lang=Be,Le.locale=pb,Le.localeData=qb,Le.max=ve,Le.min=ue,Le.parsingFlags=yb,Le.set=E,Le.startOf=rb,Le.subtract=Ae,Le.toArray=wb,Le.toDate=vb,Le.toISOString=jb,Le.toJSON=jb,Le.toString=ib,Le.unix=ub,Le.valueOf=tb,Le.year=se,Le.isLeapYear=ga,Le.weekYear=Cb,Le.isoWeekYear=Db,Le.quarter=Le.quarters=Gb,Le.month=W,Le.daysInMonth=X,Le.week=Le.weeks=la,Le.isoWeek=Le.isoWeeks=ma,Le.weeksInYear=Fb,Le.isoWeeksInYear=Eb,Le.date=Ce,Le.day=Le.days=Mb,Le.weekday=Nb,Le.isoWeekday=Ob,Le.dayOfYear=oa,Le.hour=Le.hours=He,Le.minute=Le.minutes=Ie,Le.second=Le.seconds=Je,Le.millisecond=Le.milliseconds=Ke,Le.utcOffset=Ka,Le.utc=Ma,Le.local=Na,Le.parseZone=Oa,Le.hasAlignedHourOffset=Pa,Le.isDST=Qa,Le.isDSTShifted=Ra,Le.isLocal=Sa,Le.isUtcOffset=Ta,Le.isUtc=Ua,Le.isUTC=Ua,Le.zoneAbbr=Ub,Le.zoneName=Vb,Le.dates=$("dates accessor is deprecated. Use date instead.",Ce),Le.months=$("months accessor is deprecated. Use month instead",W),Le.years=$("years accessor is deprecated. Use year instead",se),Le.zone=$("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",La);var Me=Le,Ne={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},Oe={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},Pe="Invalid date",Qe="%d",Re=/\d{1,2}/,Se={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Te=r.prototype;Te._calendar=Ne,Te.calendar=Yb,Te._longDateFormat=Oe,Te.longDateFormat=Zb,Te._invalidDate=Pe,Te.invalidDate=$b,Te._ordinal=Qe,Te.ordinal=_b,Te._ordinalParse=Re,Te.preparse=ac,Te.postformat=ac,Te._relativeTime=Se,Te.relativeTime=bc,Te.pastFuture=cc,Te.set=dc,Te.months=S,Te._months=le,Te.monthsShort=T,Te._monthsShort=me,Te.monthsParse=U,Te.week=ia,Te._week=te,Te.firstDayOfYear=ka,Te.firstDayOfWeek=ja,Te.weekdays=Ib,Te._weekdays=De,Te.weekdaysMin=Kb,Te._weekdaysMin=Fe,Te.weekdaysShort=Jb,Te._weekdaysShort=Ee,Te.weekdaysParse=Lb,Te.isPM=Rb,Te._meridiemParse=Ge,Te.meridiem=Sb,v("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===p(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.lang=$("moment.lang is deprecated. Use moment.locale instead.",v),a.langData=$("moment.langData is deprecated. Use moment.localeData instead.",x);var Ue=Math.abs,Ve=uc("ms"),We=uc("s"),Xe=uc("m"),Ye=uc("h"),Ze=uc("d"),$e=uc("w"),_e=uc("M"),af=uc("y"),bf=wc("milliseconds"),cf=wc("seconds"),df=wc("minutes"),ef=wc("hours"),ff=wc("days"),gf=wc("months"),hf=wc("years"),jf=Math.round,kf={s:45,m:45,h:22,d:26,M:11},lf=Math.abs,mf=Ea.prototype;mf.abs=lc,mf.add=nc,mf.subtract=oc,mf.as=sc,mf.asMilliseconds=Ve,mf.asSeconds=We,mf.asMinutes=Xe,mf.asHours=Ye,mf.asDays=Ze,mf.asWeeks=$e,mf.asMonths=_e,mf.asYears=af,mf.valueOf=tc,mf._bubble=pc,mf.get=vc,mf.milliseconds=bf,mf.seconds=cf,mf.minutes=df,mf.hours=ef,mf.days=ff,mf.weeks=xc,mf.months=gf,mf.years=hf,mf.humanize=Bc,mf.toISOString=Cc,mf.toString=Cc,mf.toJSON=Cc,mf.locale=pb,mf.localeData=qb,mf.toIsoString=$("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Cc),mf.lang=Be,G("X",0,0,"unix"),G("x",0,0,"valueOf"),L("x",$d),L("X",ae),O("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),O("x",function(a,b,c){c._d=new Date(p(a))}),
+//! moment.js
+//! version : 2.10.3
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+a.version="2.10.3",b(Aa),a.fn=Me,a.min=Ca,a.max=Da,a.utc=h,a.unix=Wb,a.months=gc,a.isDate=d,a.locale=v,a.invalid=l,a.duration=Va,a.isMoment=o,a.weekdays=ic,a.parseZone=Xb,a.localeData=x,a.isDuration=Fa,a.monthsShort=hc,a.weekdaysMin=kc,a.defineLocale=w,a.weekdaysShort=jc,a.normalizeUnits=z,a.relativeTimeThreshold=Ac;var nf=a,of=(nf.defineLocale("af",{months:"Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),weekdays:"Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),weekdaysShort:"Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),weekdaysMin:"So_Ma_Di_Wo_Do_Vr_Sa".split("_"),meridiemParse:/vm|nm/i,isPM:function(a){return/^nm$/i.test(a)},meridiem:function(a,b,c){return 12>a?c?"vm":"VM":c?"nm":"NM"},longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Vandag om] LT",nextDay:"[Môre om] LT",nextWeek:"dddd [om] LT",lastDay:"[Gister om] LT",lastWeek:"[Laas] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oor %s",past:"%s gelede",s:"'n paar sekondes",m:"'n minuut",mm:"%d minute",h:"'n uur",hh:"%d ure",d:"'n dag",dd:"%d dae",M:"'n maand",MM:"%d maande",y:"'n jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}}),nf.defineLocale("ar-ma",{months:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdays:"الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:6,doy:12}}),{1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"}),pf={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},qf=(nf.defineLocale("ar-sa",{months:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},preparse:function(a){return a.replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return pf[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return of[a]}).replace(/,/g,"،")},week:{dow:6,doy:12}}),nf.defineLocale("ar-tn",{months:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),monthsShort:"جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"في %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:1,doy:4}}),{1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"}),rf={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"},sf=function(a){return 0===a?0:1===a?1:2===a?2:a%100>=3&&10>=a%100?3:a%100>=11?4:5},tf={s:["أقل من ثانية","ثانية واحدة",["ثانيتان","ثانيتين"],"%d ثوان","%d ثانية","%d ثانية"],m:["أقل من دقيقة","دقيقة واحدة",["دقيقتان","دقيقتين"],"%d دقائق","%d دقيقة","%d دقيقة"],h:["أقل من ساعة","ساعة واحدة",["ساعتان","ساعتين"],"%d ساعات","%d ساعة","%d ساعة"],d:["أقل من يوم","يوم واحد",["يومان","يومين"],"%d أيام","%d يومًا","%d يوم"],M:["أقل من شهر","شهر واحد",["شهران","شهرين"],"%d أشهر","%d شهرا","%d شهر"],y:["أقل من عام","عام واحد",["عامان","عامين"],"%d أعوام","%d عامًا","%d عام"]},uf=function(a){return function(b,c,d,e){var f=sf(b),g=tf[a][sf(b)];return 2===f&&(g=g[c?0:1]),g.replace(/%d/i,b)}},vf=["كانون الثاني يناير","شباط فبراير","آذار مارس","نيسان أبريل","أيار مايو","حزيران يونيو","تموز يوليو","آب أغسطس","أيلول سبتمبر","تشرين الأول أكتوبر","تشرين الثاني نوفمبر","كانون الأول ديسمبر"],wf=(nf.defineLocale("ar",{months:vf,monthsShort:vf,weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/‏M/‏YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},meridiemParse:/ص|م/,isPM:function(a){return"م"===a},meridiem:function(a,b,c){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم عند الساعة] LT",nextDay:"[غدًا عند الساعة] LT",nextWeek:"dddd [عند الساعة] LT",lastDay:"[أمس عند الساعة] LT",lastWeek:"dddd [عند الساعة] LT",sameElse:"L"},relativeTime:{future:"بعد %s",past:"منذ %s",s:uf("s"),m:uf("m"),mm:uf("m"),h:uf("h"),hh:uf("h"),d:uf("d"),dd:uf("d"),M:uf("M"),MM:uf("M"),y:uf("y"),yy:uf("y")},preparse:function(a){return a.replace(/\u200f/g,"").replace(/[١٢٣٤٥٦٧٨٩٠]/g,function(a){return rf[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return qf[a]}).replace(/,/g,"،")},week:{dow:6,doy:12}}),{1:"-inci",5:"-inci",8:"-inci",70:"-inci",80:"-inci",2:"-nci",7:"-nci",20:"-nci",50:"-nci",3:"-üncü",4:"-üncü",100:"-üncü",6:"-ncı",9:"-uncu",10:"-uncu",30:"-uncu",60:"-ıncı",90:"-ıncı"}),xf=(nf.defineLocale("az",{months:"yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr".split("_"),monthsShort:"yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek".split("_"),weekdays:"Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə".split("_"),weekdaysShort:"Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən".split("_"),weekdaysMin:"Bz_BE_ÇA_Çə_CA_Cü_Şə".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[sabah saat] LT",nextWeek:"[gələn həftə] dddd [saat] LT",lastDay:"[dünən] LT",lastWeek:"[keçən həftə] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s əvvəl",s:"birneçə saniyyə",m:"bir dəqiqə",mm:"%d dəqiqə",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir il",yy:"%d il"},meridiemParse:/gecə|səhər|gündüz|axşam/,isPM:function(a){return/^(gündüz|axşam)$/.test(a)},meridiem:function(a,b,c){return 4>a?"gecə":12>a?"səhər":17>a?"gündüz":"axşam"},ordinalParse:/\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,ordinal:function(a){if(0===a)return a+"-ıncı";var b=a%10,c=a%100-b,d=a>=100?100:null;return a+(wf[b]||wf[c]||wf[d])},week:{dow:1,doy:7}}),nf.defineLocale("be",{months:Fc,monthsShort:"студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж".split("_"),weekdays:Gc,weekdaysShort:"нд_пн_ат_ср_чц_пт_сб".split("_"),weekdaysMin:"нд_пн_ат_ср_чц_пт_сб".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., LT",LLLL:"dddd, D MMMM YYYY г., LT"},calendar:{sameDay:"[Сёння ў] LT",nextDay:"[Заўтра ў] LT",lastDay:"[Учора ў] LT",nextWeek:function(){return"[У] dddd [ў] LT"},lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return"[У мінулую] dddd [ў] LT";case 1:case 2:case 4:return"[У мінулы] dddd [ў] LT"}},sameElse:"L"},relativeTime:{future:"праз %s",past:"%s таму",s:"некалькі секунд",m:Ec,mm:Ec,h:Ec,hh:Ec,d:"дзень",dd:Ec,M:"месяц",MM:Ec,y:"год",yy:Ec},meridiemParse:/ночы|раніцы|дня|вечара/,isPM:function(a){return/^(дня|вечара)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночы":12>a?"раніцы":17>a?"дня":"вечара"},ordinalParse:/\d{1,2}-(і|ы|га)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a%10!==2&&a%10!==3||a%100===12||a%100===13?a+"-ы":a+"-і";case"D":return a+"-га";default:return a}},week:{dow:1,doy:7}}),nf.defineLocale("bg",{months:"януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември".split("_"),monthsShort:"янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек".split("_"),weekdays:"неделя_понеделник_вторник_сряда_четвъртък_петък_събота".split("_"),weekdaysShort:"нед_пон_вто_сря_чет_пет_съб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Днес в] LT",nextDay:"[Утре в] LT",nextWeek:"dddd [в] LT",lastDay:"[Вчера в] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[В изминалата] dddd [в] LT";case 1:case 2:case 4:case 5:return"[В изминалия] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"след %s",past:"преди %s",s:"няколко секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дни",M:"месец",MM:"%d месеца",y:"година",yy:"%d години"},ordinalParse:/\d{1,2}-(ев|ен|ти|ви|ри|ми)/,ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}}),{1:"১",2:"২",3:"৩",4:"৪",5:"৫",6:"৬",7:"৭",8:"৮",9:"৯",0:"০"}),yf={"১":"1","২":"2","৩":"3","৪":"4","৫":"5","৬":"6","৭":"7","৮":"8","৯":"9","০":"0"},zf=(nf.defineLocale("bn",{months:"জানুয়ারী_ফেবুয়ারী_মার্চ_এপ্রিল_মে_জুন_জুলাই_অগাস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর".split("_"),monthsShort:"জানু_ফেব_মার্চ_এপর_মে_জুন_জুল_অগ_সেপ্ট_অক্টো_নভ_ডিসেম্".split("_"),weekdays:"রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পত্তিবার_শুক্রুবার_শনিবার".split("_"),weekdaysShort:"রবি_সোম_মঙ্গল_বুধ_বৃহস্পত্তি_শুক্রু_শনি".split("_"),weekdaysMin:"রব_সম_মঙ্গ_বু_ব্রিহ_শু_শনি".split("_"),longDateFormat:{LT:"A h:mm সময়",LTS:"A h:mm:ss সময়",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[আজ] LT",nextDay:"[আগামীকাল] LT",nextWeek:"dddd, LT",lastDay:"[গতকাল] LT",lastWeek:"[গত] dddd, LT",sameElse:"L"},relativeTime:{future:"%s পরে",past:"%s আগে",s:"কএক সেকেন্ড",m:"এক মিনিট",mm:"%d মিনিট",h:"এক ঘন্টা",hh:"%d ঘন্টা",d:"এক দিন",dd:"%d দিন",M:"এক মাস",MM:"%d মাস",y:"এক বছর",yy:"%d বছর"},preparse:function(a){return a.replace(/[১২৩৪৫৬৭৮৯০]/g,function(a){return yf[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return xf[a]})},meridiemParse:/রাত|শকাল|দুপুর|বিকেল|রাত/,isPM:function(a){return/^(দুপুর|বিকেল|রাত)$/.test(a)},meridiem:function(a,b,c){return 4>a?"রাত":10>a?"শকাল":17>a?"দুপুর":20>a?"বিকেল":"রাত"},week:{dow:0,doy:6}}),{1:"༡",2:"༢",3:"༣",4:"༤",5:"༥",6:"༦",7:"༧",8:"༨",9:"༩",0:"༠"}),Af={"༡":"1","༢":"2","༣":"3","༤":"4","༥":"5","༦":"6","༧":"7","༨":"8","༩":"9","༠":"0"},Bf=(nf.defineLocale("bo",{months:"ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),monthsShort:"ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),weekdays:"གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་".split("_"),weekdaysShort:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),weekdaysMin:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),longDateFormat:{LT:"A h:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[དི་རིང] LT",nextDay:"[སང་ཉིན] LT",nextWeek:"[བདུན་ཕྲག་རྗེས་མ], LT",lastDay:"[ཁ་སང] LT",lastWeek:"[བདུན་ཕྲག་མཐའ་མ] dddd, LT",sameElse:"L"},relativeTime:{future:"%s ལ་",past:"%s སྔན་ལ",s:"ལམ་སང",m:"སྐར་མ་གཅིག",mm:"%d སྐར་མ",h:"ཆུ་ཚོད་གཅིག",hh:"%d ཆུ་ཚོད",d:"ཉིན་གཅིག",dd:"%d ཉིན་",M:"ཟླ་བ་གཅིག",MM:"%d ཟླ་བ",y:"ལོ་གཅིག",yy:"%d ལོ"},preparse:function(a){return a.replace(/[༡༢༣༤༥༦༧༨༩༠]/g,function(a){return Af[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return zf[a]})},meridiemParse:/མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,isPM:function(a){return/^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(a)},meridiem:function(a,b,c){return 4>a?"མཚན་མོ":10>a?"ཞོགས་ཀས":17>a?"ཉིན་གུང":20>a?"དགོང་དག":"མཚན་མོ"},week:{dow:0,doy:6}}),nf.defineLocale("br",{months:"Genver_C'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"),monthsShort:"Gen_C'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"),weekdays:"Sul_Lun_Meurzh_Merc'her_Yaou_Gwener_Sadorn".split("_"),weekdaysShort:"Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"),weekdaysMin:"Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"),longDateFormat:{LT:"h[e]mm A",LTS:"h[e]mm:ss A",L:"DD/MM/YYYY",LL:"D [a viz] MMMM YYYY",LLL:"D [a viz] MMMM YYYY LT",LLLL:"dddd, D [a viz] MMMM YYYY LT"},calendar:{sameDay:"[Hiziv da] LT",nextDay:"[Warc'hoazh da] LT",nextWeek:"dddd [da] LT",lastDay:"[Dec'h da] LT",lastWeek:"dddd [paset da] LT",sameElse:"L"},relativeTime:{future:"a-benn %s",past:"%s 'zo",s:"un nebeud segondennoù",m:"ur vunutenn",mm:Hc,h:"un eur",hh:"%d eur",d:"un devezh",dd:Hc,M:"ur miz",MM:Hc,y:"ur bloaz",yy:Ic},ordinalParse:/\d{1,2}(añ|vet)/,ordinal:function(a){var b=1===a?"añ":"vet";return a+b},week:{dow:1,doy:4}}),nf.defineLocale("bs",{months:"januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.".split("_"),weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[jučer u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:Mc,mm:Mc,h:Mc,hh:Mc,d:"dan",dd:Mc,M:"mjesec",MM:Mc,y:"godinu",yy:Mc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),nf.defineLocale("ca",{months:"gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),monthsShort:"gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.".split("_"),weekdays:"diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dt._dc._dj._dv._ds.".split("_"),weekdaysMin:"Dg_Dl_Dt_Dc_Dj_Dv_Ds".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:function(){return"[avui a "+(1!==this.hours()?"les":"la")+"] LT"},nextDay:function(){return"[demà a "+(1!==this.hours()?"les":"la")+"] LT"},nextWeek:function(){return"dddd [a "+(1!==this.hours()?"les":"la")+"] LT"},lastDay:function(){return"[ahir a "+(1!==this.hours()?"les":"la")+"] LT"},lastWeek:function(){return"[el] dddd [passat a "+(1!==this.hours()?"les":"la")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"fa %s",s:"uns segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},ordinalParse:/\d{1,2}(r|n|t|è|a)/,ordinal:function(a,b){var c=1===a?"r":2===a?"n":3===a?"r":4===a?"t":"è";return("w"===b||"W"===b)&&(c="a"),a+c},week:{dow:1,doy:4}}),"leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec".split("_")),Cf="led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro".split("_"),Df=(nf.defineLocale("cs",{months:Bf,monthsShort:Cf,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(Bf,Cf),weekdays:"neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota".split("_"),weekdaysShort:"ne_po_út_st_čt_pá_so".split("_"),weekdaysMin:"ne_po_út_st_čt_pá_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd D. MMMM YYYY LT"},calendar:{sameDay:"[dnes v] LT",nextDay:"[zítra v] LT",nextWeek:function(){switch(this.day()){case 0:return"[v neděli v] LT";case 1:case 2:return"[v] dddd [v] LT";case 3:return"[ve středu v] LT";case 4:return"[ve čtvrtek v] LT";case 5:return"[v pátek v] LT";case 6:return"[v sobotu v] LT"}},lastDay:"[včera v] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulou neděli v] LT";case 1:case 2:return"[minulé] dddd [v] LT";case 3:return"[minulou středu v] LT";case 4:case 5:return"[minulý] dddd [v] LT";case 6:return"[minulou sobotu v] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"před %s",s:Oc,m:Oc,mm:Oc,h:Oc,hh:Oc,d:Oc,dd:Oc,M:Oc,MM:Oc,y:Oc,yy:Oc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("cv",{months:"кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав".split("_"),monthsShort:"кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш".split("_"),weekdays:"вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун".split("_"),weekdaysShort:"выр_тун_ытл_юн_кӗҫ_эрн_шӑм".split("_"),weekdaysMin:"вр_тн_ыт_юн_кҫ_эр_шм".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD-MM-YYYY",LL:"YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]",LLL:"YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT",LLLL:"dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT"},calendar:{sameDay:"[Паян] LT [сехетре]",nextDay:"[Ыран] LT [сехетре]",lastDay:"[Ӗнер] LT [сехетре]",nextWeek:"[Ҫитес] dddd LT [сехетре]",lastWeek:"[Иртнӗ] dddd LT [сехетре]",sameElse:"L"},relativeTime:{future:function(a){var b=/сехет$/i.exec(a)?"рен":/ҫул$/i.exec(a)?"тан":"ран";return a+b},past:"%s каялла",s:"пӗр-ик ҫеккунт",m:"пӗр минут",mm:"%d минут",h:"пӗр сехет",hh:"%d сехет",d:"пӗр кун",dd:"%d кун",M:"пӗр уйӑх",MM:"%d уйӑх",y:"пӗр ҫул",yy:"%d ҫул"},ordinalParse:/\d{1,2}-мӗш/,ordinal:"%d-мӗш",week:{dow:1,doy:7}}),nf.defineLocale("cy",{months:"Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"),monthsShort:"Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"),weekdays:"Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"),weekdaysShort:"Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"),weekdaysMin:"Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Heddiw am] LT",nextDay:"[Yfory am] LT",nextWeek:"dddd [am] LT",lastDay:"[Ddoe am] LT",lastWeek:"dddd [diwethaf am] LT",sameElse:"L"},relativeTime:{future:"mewn %s",past:"%s yn ôl",s:"ychydig eiliadau",m:"munud",mm:"%d munud",h:"awr",hh:"%d awr",d:"diwrnod",dd:"%d diwrnod",M:"mis",MM:"%d mis",y:"blwyddyn",yy:"%d flynedd"},ordinalParse:/\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,ordinal:function(a){var b=a,c="",d=["","af","il","ydd","ydd","ed","ed","ed","fed","fed","fed","eg","fed","eg","eg","fed","eg","eg","fed","eg","fed"];return b>20?c=40===b||50===b||60===b||80===b||100===b?"fed":"ain":b>0&&(c=d[b]),a+c},week:{dow:1,doy:4}}),nf.defineLocale("da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tir_ons_tor_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd [d.] D. MMMM YYYY LT"},calendar:{sameDay:"[I dag kl.] LT",nextDay:"[I morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[I går kl.] LT",lastWeek:"[sidste] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"få sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en måned",MM:"%d måneder",y:"et år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("de-at",{months:"Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Heute um] LT [Uhr]",sameElse:"L",nextDay:"[Morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[Gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:Pc,mm:"%d Minuten",h:Pc,hh:"%d Stunden",d:Pc,dd:Pc,M:Pc,MM:Pc,y:Pc,yy:Pc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("de",{months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Heute um] LT [Uhr]",sameElse:"L",nextDay:"[Morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[Gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:Qc,mm:"%d Minuten",h:Qc,hh:"%d Stunden",d:Qc,dd:Qc,M:Qc,MM:Qc,y:Qc,yy:Qc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("el",{monthsNominativeEl:"Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος".split("_"),monthsGenitiveEl:"Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου".split("_"),months:function(a,b){return/D/.test(b.substring(0,b.indexOf("MMMM")))?this._monthsGenitiveEl[a.month()]:this._monthsNominativeEl[a.month()]},monthsShort:"Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ".split("_"),weekdays:"Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο".split("_"),weekdaysShort:"Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ".split("_"),weekdaysMin:"Κυ_Δε_Τρ_Τε_Πε_Πα_Σα".split("_"),meridiem:function(a,b,c){return a>11?c?"μμ":"ΜΜ":c?"πμ":"ΠΜ"},isPM:function(a){return"μ"===(a+"").toLowerCase()[0]},meridiemParse:/[ΠΜ]\.?Μ?\.?/i,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendarEl:{sameDay:"[Σήμερα {}] LT",nextDay:"[Αύριο {}] LT",nextWeek:"dddd [{}] LT",lastDay:"[Χθες {}] LT",lastWeek:function(){switch(this.day()){case 6:return"[το προηγούμενο] dddd [{}] LT";default:return"[την προηγούμενη] dddd [{}] LT"}},sameElse:"L"},calendar:function(a,b){var c=this._calendarEl[a],d=b&&b.hours();return"function"==typeof c&&(c=c.apply(b)),c.replace("{}",d%12===1?"στη":"στις")},relativeTime:{future:"σε %s",past:"%s πριν",s:"λίγα δευτερόλεπτα",m:"ένα λεπτό",mm:"%d λεπτά",h:"μία ώρα",hh:"%d ώρες",d:"μία μέρα",dd:"%d μέρες",M:"ένας μήνας",MM:"%d μήνες",y:"ένας χρόνος",yy:"%d χρόνια"},ordinalParse:/\d{1,2}η/,ordinal:"%dη",week:{dow:1,doy:4}}),nf.defineLocale("en-au",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}}),nf.defineLocale("en-ca",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"YYYY-MM-DD",LL:"D MMMM, YYYY",LLL:"D MMMM, YYYY LT",LLLL:"dddd, D MMMM, YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),nf.defineLocale("en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}}),nf.defineLocale("eo",{months:"januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec".split("_"),weekdays:"Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato".split("_"),weekdaysShort:"Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Ĵa_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"D[-an de] MMMM, YYYY",LLL:"D[-an de] MMMM, YYYY LT",LLLL:"dddd, [la] D[-an de] MMMM, YYYY LT"},meridiemParse:/[ap]\.t\.m/i,isPM:function(a){return"p"===a.charAt(0).toLowerCase()},meridiem:function(a,b,c){return a>11?c?"p.t.m.":"P.T.M.":c?"a.t.m.":"A.T.M."},calendar:{sameDay:"[Hodiaŭ je] LT",nextDay:"[Morgaŭ je] LT",nextWeek:"dddd [je] LT",lastDay:"[Hieraŭ je] LT",lastWeek:"[pasinta] dddd [je] LT",sameElse:"L"},relativeTime:{future:"je %s",past:"antaŭ %s",s:"sekundoj",m:"minuto",mm:"%d minutoj",h:"horo",hh:"%d horoj",d:"tago",dd:"%d tagoj",M:"monato",MM:"%d monatoj",y:"jaro",yy:"%d jaroj"},ordinalParse:/\d{1,2}a/,ordinal:"%da",week:{dow:1,doy:7}}),"Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.".split("_")),Ef="Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic".split("_"),Ff=(nf.defineLocale("es",{months:"Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre".split("_"),monthsShort:function(a,b){return/-MMM-/.test(b)?Ef[a.month()]:Df[a.month()]},weekdays:"Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado".split("_"),weekdaysShort:"Dom._Lun._Mar._Mié._Jue._Vie._Sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mi_Ju_Vi_Sá".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY LT",LLLL:"dddd, D [de] MMMM [de] YYYY LT"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[mañana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}}),nf.defineLocale("et",{months:"jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),monthsShort:"jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),weekdays:"pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev".split("_"),weekdaysShort:"P_E_T_K_N_R_L".split("_"),weekdaysMin:"P_E_T_K_N_R_L".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Täna,] LT",nextDay:"[Homme,] LT",nextWeek:"[Järgmine] dddd LT",lastDay:"[Eile,] LT",lastWeek:"[Eelmine] dddd LT",sameElse:"L"},relativeTime:{future:"%s pärast",past:"%s tagasi",s:Rc,m:Rc,mm:Rc,h:Rc,hh:Rc,d:Rc,dd:"%d päeva",M:Rc,MM:Rc,y:Rc,yy:Rc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("eu",{months:"urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),monthsShort:"urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),weekdays:"igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),weekdaysShort:"ig._al._ar._az._og._ol._lr.".split("_"),weekdaysMin:"ig_al_ar_az_og_ol_lr".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"YYYY[ko] MMMM[ren] D[a]",LLL:"YYYY[ko] MMMM[ren] D[a] LT",LLLL:"dddd, YYYY[ko] MMMM[ren] D[a] LT",l:"YYYY-M-D",ll:"YYYY[ko] MMM D[a]",lll:"YYYY[ko] MMM D[a] LT",llll:"ddd, YYYY[ko] MMM D[a] LT"},calendar:{sameDay:"[gaur] LT[etan]",nextDay:"[bihar] LT[etan]",nextWeek:"dddd LT[etan]",lastDay:"[atzo] LT[etan]",lastWeek:"[aurreko] dddd LT[etan]",sameElse:"L"},relativeTime:{future:"%s barru",past:"duela %s",s:"segundo batzuk",m:"minutu bat",mm:"%d minutu",h:"ordu bat",hh:"%d ordu",d:"egun bat",
+dd:"%d egun",M:"hilabete bat",MM:"%d hilabete",y:"urte bat",yy:"%d urte"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),{1:"۱",2:"۲",3:"۳",4:"۴",5:"۵",6:"۶",7:"۷",8:"۸",9:"۹",0:"۰"}),Gf={"۱":"1","۲":"2","۳":"3","۴":"4","۵":"5","۶":"6","۷":"7","۸":"8","۹":"9","۰":"0"},Hf=(nf.defineLocale("fa",{months:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),monthsShort:"ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),weekdays:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysShort:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysMin:"ی_د_س_چ_پ_ج_ش".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},meridiemParse:/قبل از ظهر|بعد از ظهر/,isPM:function(a){return/بعد از ظهر/.test(a)},meridiem:function(a,b,c){return 12>a?"قبل از ظهر":"بعد از ظهر"},calendar:{sameDay:"[امروز ساعت] LT",nextDay:"[فردا ساعت] LT",nextWeek:"dddd [ساعت] LT",lastDay:"[دیروز ساعت] LT",lastWeek:"dddd [پیش] [ساعت] LT",sameElse:"L"},relativeTime:{future:"در %s",past:"%s پیش",s:"چندین ثانیه",m:"یک دقیقه",mm:"%d دقیقه",h:"یک ساعت",hh:"%d ساعت",d:"یک روز",dd:"%d روز",M:"یک ماه",MM:"%d ماه",y:"یک سال",yy:"%d سال"},preparse:function(a){return a.replace(/[۰-۹]/g,function(a){return Gf[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return Ff[a]}).replace(/,/g,"،")},ordinalParse:/\d{1,2}م/,ordinal:"%dم",week:{dow:6,doy:12}}),"nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän".split(" ")),If=["nolla","yhden","kahden","kolmen","neljän","viiden","kuuden",Hf[7],Hf[8],Hf[9]],Jf=(nf.defineLocale("fi",{months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"),weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"Do MMMM[ta] YYYY",LLL:"Do MMMM[ta] YYYY, [klo] LT",LLLL:"dddd, Do MMMM[ta] YYYY, [klo] LT",l:"D.M.YYYY",ll:"Do MMM YYYY",lll:"Do MMM YYYY, [klo] LT",llll:"ddd, Do MMM YYYY, [klo] LT"},calendar:{sameDay:"[tänään] [klo] LT",nextDay:"[huomenna] [klo] LT",nextWeek:"dddd [klo] LT",lastDay:"[eilen] [klo] LT",lastWeek:"[viime] dddd[na] [klo] LT",sameElse:"L"},relativeTime:{future:"%s päästä",past:"%s sitten",s:Sc,m:Sc,mm:Sc,h:Sc,hh:Sc,d:Sc,dd:Sc,M:Sc,MM:Sc,y:Sc,yy:Sc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("fo",{months:"januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur".split("_"),weekdaysShort:"sun_mán_týs_mik_hós_frí_ley".split("_"),weekdaysMin:"su_má_tý_mi_hó_fr_le".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D. MMMM, YYYY LT"},calendar:{sameDay:"[Í dag kl.] LT",nextDay:"[Í morgin kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[Í gjár kl.] LT",lastWeek:"[síðstu] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"um %s",past:"%s síðani",s:"fá sekund",m:"ein minutt",mm:"%d minuttir",h:"ein tími",hh:"%d tímar",d:"ein dagur",dd:"%d dagar",M:"ein mánaði",MM:"%d mánaðir",y:"eitt ár",yy:"%d ár"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("fr-ca",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|)/,ordinal:function(a){return a+(1===a?"er":"")}}),nf.defineLocale("fr",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|)/,ordinal:function(a){return a+(1===a?"er":"")},week:{dow:1,doy:4}}),"jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.".split("_")),Kf="jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),Lf=(nf.defineLocale("fy",{months:"jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber".split("_"),monthsShort:function(a,b){return/-MMM-/.test(b)?Kf[a.month()]:Jf[a.month()]},weekdays:"snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon".split("_"),weekdaysShort:"si._mo._ti._wo._to._fr._so.".split("_"),weekdaysMin:"Si_Mo_Ti_Wo_To_Fr_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[hjoed om] LT",nextDay:"[moarn om] LT",nextWeek:"dddd [om] LT",lastDay:"[juster om] LT",lastWeek:"[ôfrûne] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oer %s",past:"%s lyn",s:"in pear sekonden",m:"ien minút",mm:"%d minuten",h:"ien oere",hh:"%d oeren",d:"ien dei",dd:"%d dagen",M:"ien moanne",MM:"%d moannen",y:"ien jier",yy:"%d jierren"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}}),nf.defineLocale("gl",{months:"Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro".split("_"),monthsShort:"Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.".split("_"),weekdays:"Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado".split("_"),weekdaysShort:"Dom._Lun._Mar._Mér._Xov._Ven._Sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mé_Xo_Ve_Sá".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:function(){return"[hoxe "+(1!==this.hours()?"ás":"á")+"] LT"},nextDay:function(){return"[mañá "+(1!==this.hours()?"ás":"á")+"] LT"},nextWeek:function(){return"dddd ["+(1!==this.hours()?"ás":"a")+"] LT"},lastDay:function(){return"[onte "+(1!==this.hours()?"á":"a")+"] LT"},lastWeek:function(){return"[o] dddd [pasado "+(1!==this.hours()?"ás":"a")+"] LT"},sameElse:"L"},relativeTime:{future:function(a){return"uns segundos"===a?"nuns segundos":"en "+a},past:"hai %s",s:"uns segundos",m:"un minuto",mm:"%d minutos",h:"unha hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:7}}),nf.defineLocale("he",{months:"ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"),monthsShort:"ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳".split("_"),weekdays:"ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),weekdaysShort:"א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),weekdaysMin:"א_ב_ג_ד_ה_ו_ש".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY LT",LLLL:"dddd, D [ב]MMMM YYYY LT",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY LT",llll:"ddd, D MMM YYYY LT"},calendar:{sameDay:"[היום ב־]LT",nextDay:"[מחר ב־]LT",nextWeek:"dddd [בשעה] LT",lastDay:"[אתמול ב־]LT",lastWeek:"[ביום] dddd [האחרון בשעה] LT",sameElse:"L"},relativeTime:{future:"בעוד %s",past:"לפני %s",s:"מספר שניות",m:"דקה",mm:"%d דקות",h:"שעה",hh:function(a){return 2===a?"שעתיים":a+" שעות"},d:"יום",dd:function(a){return 2===a?"יומיים":a+" ימים"},M:"חודש",MM:function(a){return 2===a?"חודשיים":a+" חודשים"},y:"שנה",yy:function(a){return 2===a?"שנתיים":a%10===0&&10!==a?a+" שנה":a+" שנים"}}}),{1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"}),Mf={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},Nf=(nf.defineLocale("hi",{months:"जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर".split("_"),monthsShort:"जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.".split("_"),weekdays:"रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),longDateFormat:{LT:"A h:mm बजे",LTS:"A h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[आज] LT",nextDay:"[कल] LT",nextWeek:"dddd, LT",lastDay:"[कल] LT",lastWeek:"[पिछले] dddd, LT",sameElse:"L"},relativeTime:{future:"%s में",past:"%s पहले",s:"कुछ ही क्षण",m:"एक मिनट",mm:"%d मिनट",h:"एक घंटा",hh:"%d घंटे",d:"एक दिन",dd:"%d दिन",M:"एक महीने",MM:"%d महीने",y:"एक वर्ष",yy:"%d वर्ष"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return Mf[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Lf[a]})},meridiemParse:/रात|सुबह|दोपहर|शाम/,meridiemHour:function(a,b){return 12===a&&(a=0),"रात"===b?4>a?a:a+12:"सुबह"===b?a:"दोपहर"===b?a>=10?a:a+12:"शाम"===b?a+12:void 0},meridiem:function(a,b,c){return 4>a?"रात":10>a?"सुबह":17>a?"दोपहर":20>a?"शाम":"रात"},week:{dow:0,doy:6}}),nf.defineLocale("hr",{months:"siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_"),monthsShort:"sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),weekdays:"nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._čet._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_če_pe_su".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[jučer u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:Uc,mm:Uc,h:Uc,hh:Uc,d:"dan",dd:Uc,M:"mjesec",MM:Uc,y:"godinu",yy:Uc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),"vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton".split(" ")),Of=(nf.defineLocale("hu",{months:"január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),monthsShort:"jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"),weekdays:"vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),weekdaysShort:"vas_hét_kedd_sze_csüt_pén_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D., LT",LLLL:"YYYY. MMMM D., dddd LT"},meridiemParse:/de|du/i,isPM:function(a){return"u"===a.charAt(1).toLowerCase()},meridiem:function(a,b,c){return 12>a?c===!0?"de":"DE":c===!0?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return Wc.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return Wc.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s múlva",past:"%s",s:Vc,m:Vc,mm:Vc,h:Vc,hh:Vc,d:Vc,dd:Vc,M:Vc,MM:Vc,y:Vc,yy:Vc},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),nf.defineLocale("hy-am",{months:Xc,monthsShort:Yc,weekdays:Zc,weekdaysShort:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),weekdaysMin:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY թ.",LLL:"D MMMM YYYY թ., LT",LLLL:"dddd, D MMMM YYYY թ., LT"},calendar:{sameDay:"[այսօր] LT",nextDay:"[վաղը] LT",lastDay:"[երեկ] LT",nextWeek:function(){return"dddd [օրը ժամը] LT"},lastWeek:function(){return"[անցած] dddd [օրը ժամը] LT"},sameElse:"L"},relativeTime:{future:"%s հետո",past:"%s առաջ",s:"մի քանի վայրկյան",m:"րոպե",mm:"%d րոպե",h:"ժամ",hh:"%d ժամ",d:"օր",dd:"%d օր",M:"ամիս",MM:"%d ամիս",y:"տարի",yy:"%d տարի"},meridiemParse:/գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,isPM:function(a){return/^(ցերեկվա|երեկոյան)$/.test(a)},meridiem:function(a){return 4>a?"գիշերվա":12>a?"առավոտվա":17>a?"ցերեկվա":"երեկոյան"},ordinalParse:/\d{1,2}|\d{1,2}-(ին|րդ)/,ordinal:function(a,b){switch(b){case"DDD":case"w":case"W":case"DDDo":return 1===a?a+"-ին":a+"-րդ";default:return a}},week:{dow:1,doy:7}}),nf.defineLocale("id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"LT.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiemParse:/pagi|siang|sore|malam/,meridiemHour:function(a,b){return 12===a&&(a=0),"pagi"===b?a:"siang"===b?a>=11?a:a+12:"sore"===b||"malam"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"pagi":15>a?"siang":19>a?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),nf.defineLocale("is",{months:"janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),monthsShort:"jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),weekdays:"sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),weekdaysShort:"sun_mán_þri_mið_fim_fös_lau".split("_"),weekdaysMin:"Su_Má_Þr_Mi_Fi_Fö_La".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] LT",LLLL:"dddd, D. MMMM YYYY [kl.] LT"},calendar:{sameDay:"[í dag kl.] LT",nextDay:"[á morgun kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[í gær kl.] LT",lastWeek:"[síðasta] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"eftir %s",past:"fyrir %s síðan",s:_c,m:_c,mm:_c,h:"klukkustund",hh:_c,d:_c,dd:_c,M:_c,MM:_c,y:_c,yy:_c},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),weekdaysMin:"D_L_Ma_Me_G_V_S".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:function(){switch(this.day()){case 0:return"[la scorsa] dddd [alle] LT";default:return"[lo scorso] dddd [alle] LT"}},sameElse:"L"},relativeTime:{future:function(a){return(/^[0-9].+$/.test(a)?"tra":"in")+" "+a},past:"%s fa",s:"alcuni secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}}),nf.defineLocale("ja",{months:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),weekdaysShort:"日_月_火_水_木_金_土".split("_"),weekdaysMin:"日_月_火_水_木_金_土".split("_"),longDateFormat:{LT:"Ah時m分",LTS:"LTs秒",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日LT",LLLL:"YYYY年M月D日LT dddd"},meridiemParse:/午前|午後/i,isPM:function(a){return"午後"===a},meridiem:function(a,b,c){return 12>a?"午前":"午後"},calendar:{sameDay:"[今日] LT",nextDay:"[明日] LT",nextWeek:"[来週]dddd LT",lastDay:"[昨日] LT",lastWeek:"[前週]dddd LT",sameElse:"L"},relativeTime:{future:"%s後",past:"%s前",s:"数秒",m:"1分",mm:"%d分",h:"1時間",hh:"%d時間",d:"1日",dd:"%d日",M:"1ヶ月",MM:"%dヶ月",y:"1年",yy:"%d年"}}),nf.defineLocale("jv",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des".split("_"),weekdays:"Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu".split("_"),weekdaysShort:"Min_Sen_Sel_Reb_Kem_Jem_Sep".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sp".split("_"),longDateFormat:{LT:"HH.mm",LTS:"LT.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiemParse:/enjing|siyang|sonten|ndalu/,meridiemHour:function(a,b){return 12===a&&(a=0),"enjing"===b?a:"siyang"===b?a>=11?a:a+12:"sonten"===b||"ndalu"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"enjing":15>a?"siyang":19>a?"sonten":"ndalu"},calendar:{sameDay:"[Dinten puniko pukul] LT",nextDay:"[Mbenjang pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kala wingi pukul] LT",lastWeek:"dddd [kepengker pukul] LT",sameElse:"L"},relativeTime:{future:"wonten ing %s",past:"%s ingkang kepengker",s:"sawetawis detik",m:"setunggal menit",mm:"%d menit",h:"setunggal jam",hh:"%d jam",d:"sedinten",dd:"%d dinten",M:"sewulan",MM:"%d wulan",y:"setaun",yy:"%d taun"},week:{dow:1,doy:7}}),nf.defineLocale("ka",{months:ad,monthsShort:"იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ".split("_"),weekdays:bd,weekdaysShort:"კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ".split("_"),weekdaysMin:"კვ_ორ_სა_ოთ_ხუ_პა_შა".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[დღეს] LT[-ზე]",nextDay:"[ხვალ] LT[-ზე]",lastDay:"[გუშინ] LT[-ზე]",nextWeek:"[შემდეგ] dddd LT[-ზე]",lastWeek:"[წინა] dddd LT-ზე",sameElse:"L"},relativeTime:{future:function(a){return/(წამი|წუთი|საათი|წელი)/.test(a)?a.replace(/ი$/,"ში"):a+"ში"},past:function(a){return/(წამი|წუთი|საათი|დღე|თვე)/.test(a)?a.replace(/(ი|ე)$/,"ის წინ"):/წელი/.test(a)?a.replace(/წელი$/,"წლის წინ"):void 0},s:"რამდენიმე წამი",m:"წუთი",mm:"%d წუთი",h:"საათი",hh:"%d საათი",d:"დღე",dd:"%d დღე",M:"თვე",MM:"%d თვე",y:"წელი",yy:"%d წელი"},ordinalParse:/0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,ordinal:function(a){return 0===a?a:1===a?a+"-ლი":20>a||100>=a&&a%20===0||a%100===0?"მე-"+a:a+"-ე"},week:{dow:1,doy:7}}),nf.defineLocale("km",{months:"មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),monthsShort:"មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ".split("_"),weekdays:"អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),weekdaysShort:"អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),weekdaysMin:"អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[ថ្ងៃនៈ ម៉ោង] LT",nextDay:"[ស្អែក ម៉ោង] LT",nextWeek:"dddd [ម៉ោង] LT",lastDay:"[ម្សិលមិញ ម៉ោង] LT",lastWeek:"dddd [សប្តាហ៍មុន] [ម៉ោង] LT",sameElse:"L"},relativeTime:{future:"%sទៀត",past:"%sមុន",s:"ប៉ុន្មានវិនាទី",m:"មួយនាទី",mm:"%d នាទី",h:"មួយម៉ោង",hh:"%d ម៉ោង",d:"មួយថ្ងៃ",dd:"%d ថ្ងៃ",M:"មួយខែ",MM:"%d ខែ",y:"មួយឆ្នាំ",yy:"%d ឆ្នាំ"},week:{dow:1,doy:4}}),nf.defineLocale("ko",{months:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),monthsShort:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),weekdays:"일요일_월요일_화요일_수요일_목요일_금요일_토요일".split("_"),weekdaysShort:"일_월_화_수_목_금_토".split("_"),weekdaysMin:"일_월_화_수_목_금_토".split("_"),longDateFormat:{LT:"A h시 m분",LTS:"A h시 m분 s초",L:"YYYY.MM.DD",LL:"YYYY년 MMMM D일",LLL:"YYYY년 MMMM D일 LT",LLLL:"YYYY년 MMMM D일 dddd LT"},calendar:{sameDay:"오늘 LT",nextDay:"내일 LT",nextWeek:"dddd LT",lastDay:"어제 LT",lastWeek:"지난주 dddd LT",sameElse:"L"},relativeTime:{future:"%s 후",past:"%s 전",s:"몇초",ss:"%d초",m:"일분",mm:"%d분",h:"한시간",hh:"%d시간",d:"하루",dd:"%d일",M:"한달",MM:"%d달",y:"일년",yy:"%d년"},ordinalParse:/\d{1,2}일/,ordinal:"%d일",meridiemParse:/오전|오후/,isPM:function(a){return"오후"===a},meridiem:function(a,b,c){return 12>a?"오전":"오후"}}),nf.defineLocale("lb",{months:"Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),weekdaysShort:"So._Mé._Dë._Më._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mé_Dë_Më_Do_Fr_Sa".split("_"),longDateFormat:{LT:"H:mm [Auer]",LTS:"H:mm:ss [Auer]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Haut um] LT",sameElse:"L",nextDay:"[Muer um] LT",nextWeek:"dddd [um] LT",lastDay:"[Gëschter um] LT",lastWeek:function(){switch(this.day()){case 2:case 4:return"[Leschten] dddd [um] LT";default:return"[Leschte] dddd [um] LT"}}},relativeTime:{future:dd,past:ed,s:"e puer Sekonnen",m:cd,mm:"%d Minutten",h:cd,hh:"%d Stonnen",d:cd,dd:"%d Deeg",M:cd,MM:"%d Méint",y:cd,yy:"%d Joer"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{m:"minutė_minutės_minutę",mm:"minutės_minučių_minutes",h:"valanda_valandos_valandą",hh:"valandos_valandų_valandas",d:"diena_dienos_dieną",dd:"dienos_dienų_dienas",M:"mėnuo_mėnesio_mėnesį",MM:"mėnesiai_mėnesių_mėnesius",y:"metai_metų_metus",yy:"metai_metų_metus"}),Pf="sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis".split("_"),Qf=(nf.defineLocale("lt",{months:"sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio".split("_"),monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),weekdays:ld,weekdaysShort:"Sek_Pir_Ant_Tre_Ket_Pen_Šeš".split("_"),weekdaysMin:"S_P_A_T_K_Pn_Š".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], LT [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, LT [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], LT [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, LT [val.]"},calendar:{sameDay:"[Šiandien] LT",nextDay:"[Rytoj] LT",nextWeek:"dddd LT",lastDay:"[Vakar] LT",lastWeek:"[Praėjusį] dddd LT",sameElse:"L"},relativeTime:{future:"po %s",past:"prieš %s",s:gd,m:hd,mm:kd,h:hd,hh:kd,d:hd,dd:kd,M:hd,MM:kd,y:hd,yy:kd},ordinalParse:/\d{1,2}-oji/,ordinal:function(a){return a+"-oji"},week:{dow:1,doy:4}}),{m:"minūtes_minūtēm_minūte_minūtes".split("_"),mm:"minūtes_minūtēm_minūte_minūtes".split("_"),h:"stundas_stundām_stunda_stundas".split("_"),hh:"stundas_stundām_stunda_stundas".split("_"),d:"dienas_dienām_diena_dienas".split("_"),dd:"dienas_dienām_diena_dienas".split("_"),M:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),MM:"mēneša_mēnešiem_mēnesis_mēneši".split("_"),y:"gada_gadiem_gads_gadi".split("_"),yy:"gada_gadiem_gads_gadi".split("_")}),Rf=(nf.defineLocale("lv",{months:"janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"),monthsShort:"jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"),weekdays:"svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"),weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY.",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, LT",LLLL:"YYYY. [gada] D. MMMM, dddd, LT"},calendar:{sameDay:"[Šodien pulksten] LT",nextDay:"[Rīt pulksten] LT",nextWeek:"dddd [pulksten] LT",lastDay:"[Vakar pulksten] LT",lastWeek:"[Pagājušā] dddd [pulksten] LT",sameElse:"L"},relativeTime:{future:"pēc %s",past:"pirms %s",s:pd,m:od,mm:nd,h:od,hh:nd,d:od,dd:nd,M:od,MM:nd,y:od,yy:nd},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{words:{m:["jedan minut","jednog minuta"],mm:["minut","minuta","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mjesec","mjeseca","mjeseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,b,c){var d=Rf.words[c];return 1===c.length?b?d[0]:d[1]:a+" "+Rf.correctGrammaticalCase(a,d)}}),Sf=(nf.defineLocale("me",{months:["januar","februar","mart","april","maj","jun","jul","avgust","septembar","oktobar","novembar","decembar"],monthsShort:["jan.","feb.","mar.","apr.","maj","jun","jul","avg.","sep.","okt.","nov.","dec."],weekdays:["nedjelja","ponedjeljak","utorak","srijeda","četvrtak","petak","subota"],weekdaysShort:["ned.","pon.","uto.","sri.","čet.","pet.","sub."],weekdaysMin:["ne","po","ut","sr","če","pe","su"],longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sjutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[juče u] LT",lastWeek:function(){var a=["[prošle] [nedjelje] [u] LT","[prošlog] [ponedjeljka] [u] LT","[prošlog] [utorka] [u] LT","[prošle] [srijede] [u] LT","[prošlog] [četvrtka] [u] LT","[prošlog] [petka] [u] LT","[prošle] [subote] [u] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"nekoliko sekundi",m:Rf.translate,mm:Rf.translate,h:Rf.translate,hh:Rf.translate,d:"dan",dd:Rf.translate,M:"mjesec",MM:Rf.translate,y:"godinu",yy:Rf.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),nf.defineLocale("mk",{months:"јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември".split("_"),monthsShort:"јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек".split("_"),weekdays:"недела_понеделник_вторник_среда_четврток_петок_сабота".split("_"),weekdaysShort:"нед_пон_вто_сре_чет_пет_саб".split("_"),weekdaysMin:"нe_пo_вт_ср_че_пе_сa".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Денес во] LT",nextDay:"[Утре во] LT",nextWeek:"dddd [во] LT",lastDay:"[Вчера во] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[Во изминатата] dddd [во] LT";case 1:case 2:case 4:case 5:return"[Во изминатиот] dddd [во] LT"}},sameElse:"L"},relativeTime:{future:"после %s",past:"пред %s",s:"неколку секунди",m:"минута",mm:"%d минути",h:"час",hh:"%d часа",d:"ден",dd:"%d дена",M:"месец",MM:"%d месеци",y:"година",yy:"%d години"},ordinalParse:/\d{1,2}-(ев|ен|ти|ви|ри|ми)/,ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}}),nf.defineLocale("ml",{months:"ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ".split("_"),monthsShort:"ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.".split("_"),weekdays:"ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച".split("_"),weekdaysShort:"ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി".split("_"),weekdaysMin:"ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ".split("_"),longDateFormat:{LT:"A h:mm -നു",LTS:"A h:mm:ss -നു",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[ഇന്ന്] LT",nextDay:"[നാളെ] LT",nextWeek:"dddd, LT",lastDay:"[ഇന്നലെ] LT",lastWeek:"[കഴിഞ്ഞ] dddd, LT",sameElse:"L"},relativeTime:{future:"%s കഴിഞ്ഞ്",past:"%s മുൻപ്",s:"അൽപ നിമിഷങ്ങൾ",m:"ഒരു മിനിറ്റ്",mm:"%d മിനിറ്റ്",h:"ഒരു മണിക്കൂർ",hh:"%d മണിക്കൂർ",d:"ഒരു ദിവസം",dd:"%d ദിവസം",M:"ഒരു മാസം",MM:"%d മാസം",y:"ഒരു വർഷം",yy:"%d വർഷം"},meridiemParse:/രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,isPM:function(a){return/^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(a)},meridiem:function(a,b,c){return 4>a?"രാത്രി":12>a?"രാവിലെ":17>a?"ഉച്ച കഴിഞ്ഞ്":20>a?"വൈകുന്നേരം":"രാത്രി"}}),{1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"}),Tf={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},Uf=(nf.defineLocale("mr",{months:"जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर".split("_"),monthsShort:"जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.".split("_"),weekdays:"रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि".split("_"),weekdaysMin:"र_सो_मं_बु_गु_शु_श".split("_"),longDateFormat:{LT:"A h:mm वाजता",LTS:"A h:mm:ss वाजता",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[आज] LT",nextDay:"[उद्या] LT",nextWeek:"dddd, LT",lastDay:"[काल] LT",lastWeek:"[मागील] dddd, LT",sameElse:"L"},relativeTime:{future:"%s नंतर",past:"%s पूर्वी",s:"सेकंद",m:"एक मिनिट",mm:"%d मिनिटे",h:"एक तास",hh:"%d तास",d:"एक दिवस",dd:"%d दिवस",M:"एक महिना",MM:"%d महिने",y:"एक वर्ष",yy:"%d वर्षे"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return Tf[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Sf[a]})},meridiemParse:/रात्री|सकाळी|दुपारी|सायंकाळी/,meridiemHour:function(a,b){return 12===a&&(a=0),"रात्री"===b?4>a?a:a+12:"सकाळी"===b?a:"दुपारी"===b?a>=10?a:a+12:"सायंकाळी"===b?a+12:void 0},meridiem:function(a,b,c){return 4>a?"रात्री":10>a?"सकाळी":17>a?"दुपारी":20>a?"सायंकाळी":"रात्री"},week:{dow:0,doy:6}}),nf.defineLocale("ms-my",{months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"LT.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiemParse:/pagi|tengahari|petang|malam/,meridiemHour:function(a,b){return 12===a&&(a=0),"pagi"===b?a:"tengahari"===b?a>=11?a:a+12:"petang"===b||"malam"===b?a+12:void 0},meridiem:function(a,b,c){return 11>a?"pagi":15>a?"tengahari":19>a?"petang":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Esok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kelmarin pukul] LT",lastWeek:"dddd [lepas pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),{1:"၁",2:"၂",3:"၃",4:"၄",5:"၅",6:"၆",7:"၇",8:"၈",9:"၉",0:"၀"}),Vf={"၁":"1","၂":"2","၃":"3","၄":"4","၅":"5",
+"၆":"6","၇":"7","၈":"8","၉":"9","၀":"0"},Wf=(nf.defineLocale("my",{months:"ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ".split("_"),monthsShort:"ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ".split("_"),weekdays:"တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ".split("_"),weekdaysShort:"နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),weekdaysMin:"နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[ယနေ.] LT [မှာ]",nextDay:"[မနက်ဖြန်] LT [မှာ]",nextWeek:"dddd LT [မှာ]",lastDay:"[မနေ.က] LT [မှာ]",lastWeek:"[ပြီးခဲ့သော] dddd LT [မှာ]",sameElse:"L"},relativeTime:{future:"လာမည့် %s မှာ",past:"လွန်ခဲ့သော %s က",s:"စက္ကန်.အနည်းငယ်",m:"တစ်မိနစ်",mm:"%d မိနစ်",h:"တစ်နာရီ",hh:"%d နာရီ",d:"တစ်ရက်",dd:"%d ရက်",M:"တစ်လ",MM:"%d လ",y:"တစ်နှစ်",yy:"%d နှစ်"},preparse:function(a){return a.replace(/[၁၂၃၄၅၆၇၈၉၀]/g,function(a){return Vf[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Uf[a]})},week:{dow:1,doy:4}}),nf.defineLocale("nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tirs_ons_tors_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"H.mm",LTS:"LT.ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] LT",LLLL:"dddd D. MMMM YYYY [kl.] LT"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i går kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s siden",s:"noen sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en måned",MM:"%d måneder",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"}),Xf={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},Yf=(nf.defineLocale("ne",{months:"जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर".split("_"),monthsShort:"जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.".split("_"),weekdays:"आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार".split("_"),weekdaysShort:"आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.".split("_"),weekdaysMin:"आइ._सो._मङ्_बु._बि._शु._श.".split("_"),longDateFormat:{LT:"Aको h:mm बजे",LTS:"Aको h:mm:ss बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return Xf[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return Wf[a]})},meridiemParse:/राती|बिहान|दिउँसो|बेलुका|साँझ|राती/,meridiemHour:function(a,b){return 12===a&&(a=0),"राती"===b?3>a?a:a+12:"बिहान"===b?a:"दिउँसो"===b?a>=10?a:a+12:"बेलुका"===b||"साँझ"===b?a+12:void 0},meridiem:function(a,b,c){return 3>a?"राती":10>a?"बिहान":15>a?"दिउँसो":18>a?"बेलुका":20>a?"साँझ":"राती"},calendar:{sameDay:"[आज] LT",nextDay:"[भोली] LT",nextWeek:"[आउँदो] dddd[,] LT",lastDay:"[हिजो] LT",lastWeek:"[गएको] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%sमा",past:"%s अगाडी",s:"केही समय",m:"एक मिनेट",mm:"%d मिनेट",h:"एक घण्टा",hh:"%d घण्टा",d:"एक दिन",dd:"%d दिन",M:"एक महिना",MM:"%d महिना",y:"एक बर्ष",yy:"%d बर्ष"},week:{dow:1,doy:7}}),"jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_")),Zf="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),$f=(nf.defineLocale("nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(a,b){return/-MMM-/.test(b)?Zf[a.month()]:Yf[a.month()]},weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"Zo_Ma_Di_Wo_Do_Vr_Za".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"één minuut",mm:"%d minuten",h:"één uur",hh:"%d uur",d:"één dag",dd:"%d dagen",M:"één maand",MM:"%d maanden",y:"één jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}}),nf.defineLocale("nn",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"),weekdaysShort:"sun_mån_tys_ons_tor_fre_lau".split("_"),weekdaysMin:"su_må_ty_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[I dag klokka] LT",nextDay:"[I morgon klokka] LT",nextWeek:"dddd [klokka] LT",lastDay:"[I går klokka] LT",lastWeek:"[Føregåande] dddd [klokka] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s sidan",s:"nokre sekund",m:"eit minutt",mm:"%d minutt",h:"ein time",hh:"%d timar",d:"ein dag",dd:"%d dagar",M:"ein månad",MM:"%d månader",y:"eit år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),"styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_")),_f="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"),ag=(nf.defineLocale("pl",{months:function(a,b){return""===b?"("+_f[a.month()]+"|"+$f[a.month()]+")":/D MMMM/.test(b)?_f[a.month()]:$f[a.month()]},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),weekdays:"niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),weekdaysShort:"nie_pon_wt_śr_czw_pt_sb".split("_"),weekdaysMin:"N_Pn_Wt_Śr_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Dziś o] LT",nextDay:"[Jutro o] LT",nextWeek:"[W] dddd [o] LT",lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zeszłą niedzielę o] LT";case 3:return"[W zeszłą środę o] LT";case 6:return"[W zeszłą sobotę o] LT";default:return"[W zeszły] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",m:rd,mm:rd,h:rd,hh:rd,d:"1 dzień",dd:"%d dni",M:"miesiąc",MM:rd,y:"rok",yy:rd},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("pt-br",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] LT",LLLL:"dddd, D [de] MMMM [de] YYYY [às] LT"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"%s atrás",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº"}),nf.defineLocale("pt",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY LT",LLLL:"dddd, D [de] MMMM [de] YYYY LT"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"há %s",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}}),nf.defineLocale("ro",{months:"ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),monthsShort:"ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),weekdays:"duminică_luni_marți_miercuri_joi_vineri_sâmbătă".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[azi la] LT",nextDay:"[mâine la] LT",nextWeek:"dddd [la] LT",lastDay:"[ieri la] LT",lastWeek:"[fosta] dddd [la] LT",sameElse:"L"},relativeTime:{future:"peste %s",past:"%s în urmă",s:"câteva secunde",m:"un minut",mm:sd,h:"o oră",hh:sd,d:"o zi",dd:sd,M:"o lună",MM:sd,y:"un an",yy:sd},week:{dow:1,doy:7}}),nf.defineLocale("ru",{months:vd,monthsShort:wd,weekdays:xd,weekdaysShort:"вс_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"вс_пн_вт_ср_чт_пт_сб".split("_"),monthsParse:[/^янв/i,/^фев/i,/^мар/i,/^апр/i,/^ма[й|я]/i,/^июн/i,/^июл/i,/^авг/i,/^сен/i,/^окт/i,/^ноя/i,/^дек/i],longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., LT",LLLL:"dddd, D MMMM YYYY г., LT"},calendar:{sameDay:"[Сегодня в] LT",nextDay:"[Завтра в] LT",lastDay:"[Вчера в] LT",nextWeek:function(){return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT"},lastWeek:function(a){if(a.week()===this.week())return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT";switch(this.day()){case 0:return"[В прошлое] dddd [в] LT";case 1:case 2:case 4:return"[В прошлый] dddd [в] LT";case 3:case 5:case 6:return"[В прошлую] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"через %s",past:"%s назад",s:"несколько секунд",m:ud,mm:ud,h:"час",hh:ud,d:"день",dd:ud,M:"месяц",MM:ud,y:"год",yy:ud},meridiemParse:/ночи|утра|дня|вечера/i,isPM:function(a){return/^(дня|вечера)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночи":12>a?"утра":17>a?"дня":"вечера"},ordinalParse:/\d{1,2}-(й|го|я)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":return a+"-й";case"D":return a+"-го";case"w":case"W":return a+"-я";default:return a}},week:{dow:1,doy:7}}),nf.defineLocale("si",{months:"ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්".split("_"),monthsShort:"ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ".split("_"),weekdays:"ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා".split("_"),weekdaysShort:"ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන".split("_"),weekdaysMin:"ඉ_ස_අ_බ_බ්‍ර_සි_සෙ".split("_"),longDateFormat:{LT:"a h:mm",LTS:"a h:mm:ss",L:"YYYY/MM/DD",LL:"YYYY MMMM D",LLL:"YYYY MMMM D, LT",LLLL:"YYYY MMMM D [වැනි] dddd, LTS"},calendar:{sameDay:"[අද] LT[ට]",nextDay:"[හෙට] LT[ට]",nextWeek:"dddd LT[ට]",lastDay:"[ඊයේ] LT[ට]",lastWeek:"[පසුගිය] dddd LT[ට]",sameElse:"L"},relativeTime:{future:"%sකින්",past:"%sකට පෙර",s:"තත්පර කිහිපය",m:"මිනිත්තුව",mm:"මිනිත්තු %d",h:"පැය",hh:"පැය %d",d:"දිනය",dd:"දින %d",M:"මාසය",MM:"මාස %d",y:"වසර",yy:"වසර %d"},ordinalParse:/\d{1,2} වැනි/,ordinal:function(a){return a+" වැනි"},meridiem:function(a,b,c){return a>11?c?"ප.ව.":"පස් වරු":c?"පෙ.ව.":"පෙර වරු"}}),"január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_")),bg="jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_"),cg=(nf.defineLocale("sk",{months:ag,monthsShort:bg,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(ag,bg),weekdays:"nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_št_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_št_pi_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd D. MMMM YYYY LT"},calendar:{sameDay:"[dnes o] LT",nextDay:"[zajtra o] LT",nextWeek:function(){switch(this.day()){case 0:return"[v nedeľu o] LT";case 1:case 2:return"[v] dddd [o] LT";case 3:return"[v stredu o] LT";case 4:return"[vo štvrtok o] LT";case 5:return"[v piatok o] LT";case 6:return"[v sobotu o] LT"}},lastDay:"[včera o] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulú nedeľu o] LT";case 1:case 2:return"[minulý] dddd [o] LT";case 3:return"[minulú stredu o] LT";case 4:case 5:return"[minulý] dddd [o] LT";case 6:return"[minulú sobotu o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"pred %s",s:zd,m:zd,mm:zd,h:zd,hh:zd,d:zd,dd:zd,M:zd,MM:zd,y:zd,yy:zd},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),nf.defineLocale("sl",{months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),weekdays:"nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota".split("_"),weekdaysShort:"ned._pon._tor._sre._čet._pet._sob.".split("_"),weekdaysMin:"ne_po_to_sr_če_pe_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danes ob] LT",nextDay:"[jutri ob] LT",nextWeek:function(){switch(this.day()){case 0:return"[v] [nedeljo] [ob] LT";case 3:return"[v] [sredo] [ob] LT";case 6:return"[v] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[v] dddd [ob] LT"}},lastDay:"[včeraj ob] LT",lastWeek:function(){switch(this.day()){case 0:return"[prejšnjo] [nedeljo] [ob] LT";case 3:return"[prejšnjo] [sredo] [ob] LT";case 6:return"[prejšnjo] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[prejšnji] dddd [ob] LT"}},sameElse:"L"},relativeTime:{future:"čez %s",past:"pred %s",s:Ad,m:Ad,mm:Ad,h:Ad,hh:Ad,d:Ad,dd:Ad,M:Ad,MM:Ad,y:Ad,yy:Ad},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),nf.defineLocale("sq",{months:"Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor".split("_"),monthsShort:"Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj".split("_"),weekdays:"E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë".split("_"),weekdaysShort:"Die_Hën_Mar_Mër_Enj_Pre_Sht".split("_"),weekdaysMin:"D_H_Ma_Më_E_P_Sh".split("_"),meridiemParse:/PD|MD/,isPM:function(a){return"M"===a.charAt(0)},meridiem:function(a,b,c){return 12>a?"PD":"MD"},longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Sot në] LT",nextDay:"[Nesër në] LT",nextWeek:"dddd [në] LT",lastDay:"[Dje në] LT",lastWeek:"dddd [e kaluar në] LT",sameElse:"L"},relativeTime:{future:"në %s",past:"%s më parë",s:"disa sekonda",m:"një minutë",mm:"%d minuta",h:"një orë",hh:"%d orë",d:"një ditë",dd:"%d ditë",M:"një muaj",MM:"%d muaj",y:"një vit",yy:"%d vite"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),{words:{m:["један минут","једне минуте"],mm:["минут","минуте","минута"],h:["један сат","једног сата"],hh:["сат","сата","сати"],dd:["дан","дана","дана"],MM:["месец","месеца","месеци"],yy:["година","године","година"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,b,c){var d=cg.words[c];return 1===c.length?b?d[0]:d[1]:a+" "+cg.correctGrammaticalCase(a,d)}}),dg=(nf.defineLocale("sr-cyrl",{months:["јануар","фебруар","март","април","мај","јун","јул","август","септембар","октобар","новембар","децембар"],monthsShort:["јан.","феб.","мар.","апр.","мај","јун","јул","авг.","сеп.","окт.","нов.","дец."],weekdays:["недеља","понедељак","уторак","среда","четвртак","петак","субота"],weekdaysShort:["нед.","пон.","уто.","сре.","чет.","пет.","суб."],weekdaysMin:["не","по","ут","ср","че","пе","су"],longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[данас у] LT",nextDay:"[сутра у] LT",nextWeek:function(){switch(this.day()){case 0:return"[у] [недељу] [у] LT";case 3:return"[у] [среду] [у] LT";case 6:return"[у] [суботу] [у] LT";case 1:case 2:case 4:case 5:return"[у] dddd [у] LT"}},lastDay:"[јуче у] LT",lastWeek:function(){var a=["[прошле] [недеље] [у] LT","[прошлог] [понедељка] [у] LT","[прошлог] [уторка] [у] LT","[прошле] [среде] [у] LT","[прошлог] [четвртка] [у] LT","[прошлог] [петка] [у] LT","[прошле] [суботе] [у] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"за %s",past:"пре %s",s:"неколико секунди",m:cg.translate,mm:cg.translate,h:cg.translate,hh:cg.translate,d:"дан",dd:cg.translate,M:"месец",MM:cg.translate,y:"годину",yy:cg.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),{words:{m:["jedan minut","jedne minute"],mm:["minut","minute","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mesec","meseca","meseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,b,c){var d=dg.words[c];return 1===c.length?b?d[0]:d[1]:a+" "+dg.correctGrammaticalCase(a,d)}}),eg=(nf.defineLocale("sr",{months:["januar","februar","mart","april","maj","jun","jul","avgust","septembar","oktobar","novembar","decembar"],monthsShort:["jan.","feb.","mar.","apr.","maj","jun","jul","avg.","sep.","okt.","nov.","dec."],weekdays:["nedelja","ponedeljak","utorak","sreda","četvrtak","petak","subota"],weekdaysShort:["ned.","pon.","uto.","sre.","čet.","pet.","sub."],weekdaysMin:["ne","po","ut","sr","če","pe","su"],longDateFormat:{LT:"H:mm",LTS:"LT:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedelju] [u] LT";case 3:return"[u] [sredu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[juče u] LT",lastWeek:function(){var a=["[prošle] [nedelje] [u] LT","[prošlog] [ponedeljka] [u] LT","[prošlog] [utorka] [u] LT","[prošle] [srede] [u] LT","[prošlog] [četvrtka] [u] LT","[prošlog] [petka] [u] LT","[prošle] [subote] [u] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",m:dg.translate,mm:dg.translate,h:dg.translate,hh:dg.translate,d:"dan",dd:dg.translate,M:"mesec",MM:dg.translate,y:"godinu",yy:dg.translate},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),nf.defineLocale("sv",{months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Idag] LT",nextDay:"[Imorgon] LT",lastDay:"[Igår] LT",nextWeek:"[På] dddd LT",lastWeek:"[I] dddd[s] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}(e|a)/,ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"e":1===b?"a":2===b?"a":"e";return a+c},week:{dow:1,doy:4}}),nf.defineLocale("ta",{months:"ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),monthsShort:"ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்".split("_"),weekdays:"ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை".split("_"),weekdaysShort:"ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி".split("_"),weekdaysMin:"ஞா_தி_செ_பு_வி_வெ_ச".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[இன்று] LT",nextDay:"[நாளை] LT",nextWeek:"dddd, LT",lastDay:"[நேற்று] LT",lastWeek:"[கடந்த வாரம்] dddd, LT",sameElse:"L"},relativeTime:{future:"%s இல்",past:"%s முன்",s:"ஒரு சில விநாடிகள்",m:"ஒரு நிமிடம்",mm:"%d நிமிடங்கள்",h:"ஒரு மணி நேரம்",hh:"%d மணி நேரம்",d:"ஒரு நாள்",dd:"%d நாட்கள்",M:"ஒரு மாதம்",MM:"%d மாதங்கள்",y:"ஒரு வருடம்",yy:"%d ஆண்டுகள்"},ordinalParse:/\d{1,2}வது/,ordinal:function(a){return a+"வது"},meridiemParse:/யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,meridiem:function(a,b,c){return 2>a?" யாமம்":6>a?" வைகறை":10>a?" காலை":14>a?" நண்பகல்":18>a?" எற்பாடு":22>a?" மாலை":" யாமம்"},meridiemHour:function(a,b){return 12===a&&(a=0),"யாமம்"===b?2>a?a:a+12:"வைகறை"===b||"காலை"===b?a:"நண்பகல்"===b&&a>=10?a:a+12},week:{dow:0,doy:6}}),nf.defineLocale("th",{months:"มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม".split("_"),monthsShort:"มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา".split("_"),weekdays:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์".split("_"),weekdaysShort:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์".split("_"),weekdaysMin:"อา._จ._อ._พ._พฤ._ศ._ส.".split("_"),longDateFormat:{LT:"H นาฬิกา m นาที",LTS:"LT s วินาที",L:"YYYY/MM/DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY เวลา LT",LLLL:"วันddddที่ D MMMM YYYY เวลา LT"},meridiemParse:/ก่อนเที่ยง|หลังเที่ยง/,isPM:function(a){return"หลังเที่ยง"===a},meridiem:function(a,b,c){return 12>a?"ก่อนเที่ยง":"หลังเที่ยง"},calendar:{sameDay:"[วันนี้ เวลา] LT",nextDay:"[พรุ่งนี้ เวลา] LT",nextWeek:"dddd[หน้า เวลา] LT",lastDay:"[เมื่อวานนี้ เวลา] LT",lastWeek:"[วัน]dddd[ที่แล้ว เวลา] LT",sameElse:"L"},relativeTime:{future:"อีก %s",past:"%sที่แล้ว",s:"ไม่กี่วินาที",m:"1 นาที",mm:"%d นาที",h:"1 ชั่วโมง",hh:"%d ชั่วโมง",d:"1 วัน",dd:"%d วัน",M:"1 เดือน",MM:"%d เดือน",y:"1 ปี",yy:"%d ปี"}}),nf.defineLocale("tl-ph",{months:"Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),monthsShort:"Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),weekdays:"Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),weekdaysShort:"Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),weekdaysMin:"Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"MM/D/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM DD, YYYY LT"},calendar:{sameDay:"[Ngayon sa] LT",nextDay:"[Bukas sa] LT",nextWeek:"dddd [sa] LT",lastDay:"[Kahapon sa] LT",lastWeek:"dddd [huling linggo] LT",sameElse:"L"},relativeTime:{future:"sa loob ng %s",past:"%s ang nakalipas",s:"ilang segundo",m:"isang minuto",mm:"%d minuto",h:"isang oras",hh:"%d oras",d:"isang araw",dd:"%d araw",M:"isang buwan",MM:"%d buwan",y:"isang taon",yy:"%d taon"},ordinalParse:/\d{1,2}/,ordinal:function(a){return a},week:{dow:1,doy:4}}),{1:"'inci",5:"'inci",8:"'inci",70:"'inci",80:"'inci",2:"'nci",7:"'nci",20:"'nci",50:"'nci",3:"'üncü",4:"'üncü",100:"'üncü",6:"'ncı",9:"'uncu",10:"'uncu",30:"'uncu",60:"'ıncı",90:"'ıncı"}),fg=(nf.defineLocale("tr",{months:"Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),monthsShort:"Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),weekdays:"Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_Çar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[yarın saat] LT",nextWeek:"[haftaya] dddd [saat] LT",lastDay:"[dün] LT",lastWeek:"[geçen hafta] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s önce",s:"birkaç saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir yıl",yy:"%d yıl"},ordinalParse:/\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,ordinal:function(a){if(0===a)return a+"'ıncı";var b=a%10,c=a%100-b,d=a>=100?100:null;return a+(eg[b]||eg[c]||eg[d])},week:{dow:1,doy:7}}),nf.defineLocale("tzm-latn",{months:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),monthsShort:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),weekdays:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),weekdaysShort:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),weekdaysMin:"asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[asdkh g] LT",nextDay:"[aska g] LT",nextWeek:"dddd [g] LT",lastDay:"[assant g] LT",lastWeek:"dddd [g] LT",sameElse:"L"},relativeTime:{future:"dadkh s yan %s",past:"yan %s",s:"imik",m:"minuḍ",mm:"%d minuḍ",h:"saɛa",hh:"%d tassaɛin",d:"ass",dd:"%d ossan",M:"ayowr",MM:"%d iyyirn",y:"asgas",yy:"%d isgasn"},week:{dow:6,doy:12}}),nf.defineLocale("tzm",{months:"ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),monthsShort:"ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ".split("_"),weekdays:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),weekdaysShort:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),weekdaysMin:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[ⴰⵙⴷⵅ ⴴ] LT",nextDay:"[ⴰⵙⴽⴰ ⴴ] LT",nextWeek:"dddd [ⴴ] LT",lastDay:"[ⴰⵚⴰⵏⵜ ⴴ] LT",lastWeek:"dddd [ⴴ] LT",sameElse:"L"},relativeTime:{future:"ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s",past:"ⵢⴰⵏ %s",s:"ⵉⵎⵉⴽ",m:"ⵎⵉⵏⵓⴺ",mm:"%d ⵎⵉⵏⵓⴺ",h:"ⵙⴰⵄⴰ",hh:"%d ⵜⴰⵙⵙⴰⵄⵉⵏ",d:"ⴰⵙⵙ",dd:"%d oⵙⵙⴰⵏ",M:"ⴰⵢoⵓⵔ",MM:"%d ⵉⵢⵢⵉⵔⵏ",y:"ⴰⵙⴳⴰⵙ",yy:"%d ⵉⵙⴳⴰⵙⵏ"},week:{dow:6,doy:12}}),nf.defineLocale("uk",{months:Dd,monthsShort:"січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"),weekdays:Ed,weekdaysShort:"нд_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY р.",LLL:"D MMMM YYYY р., LT",LLLL:"dddd, D MMMM YYYY р., LT"},calendar:{sameDay:Fd("[Сьогодні "),nextDay:Fd("[Завтра "),lastDay:Fd("[Вчора "),nextWeek:Fd("[У] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return Fd("[Минулої] dddd [").call(this);case 1:case 2:case 4:return Fd("[Минулого] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"за %s",past:"%s тому",s:"декілька секунд",m:Cd,mm:Cd,h:"годину",hh:Cd,d:"день",dd:Cd,M:"місяць",MM:Cd,y:"рік",yy:Cd},meridiemParse:/ночі|ранку|дня|вечора/,isPM:function(a){return/^(дня|вечора)$/.test(a)},meridiem:function(a,b,c){return 4>a?"ночі":12>a?"ранку":17>a?"дня":"вечора"},ordinalParse:/\d{1,2}-(й|го)/,ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a+"-й";case"D":return a+"-го";default:return a}},week:{dow:1,doy:7}}),nf.defineLocale("uz",{months:"январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),monthsShort:"янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек".split("_"),weekdays:"Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба".split("_"),weekdaysShort:"Якш_Душ_Сеш_Чор_Пай_Жум_Шан".split("_"),weekdaysMin:"Як_Ду_Се_Чо_Па_Жу_Ша".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"D MMMM YYYY, dddd LT"},calendar:{sameDay:"[Бугун соат] LT [да]",nextDay:"[Эртага] LT [да]",nextWeek:"dddd [куни соат] LT [да]",lastDay:"[Кеча соат] LT [да]",lastWeek:"[Утган] dddd [куни соат] LT [да]",sameElse:"L"},relativeTime:{future:"Якин %s ичида",past:"Бир неча %s олдин",s:"фурсат",m:"бир дакика",mm:"%d дакика",h:"бир соат",hh:"%d соат",d:"бир кун",dd:"%d кун",M:"бир ой",MM:"%d ой",y:"бир йил",yy:"%d йил"},week:{dow:1,doy:7}}),nf.defineLocale("vi",{months:"tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"),monthsShort:"Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"),weekdays:"chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"),weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),longDateFormat:{LT:"HH:mm",LTS:"LT:ss",L:"DD/MM/YYYY",LL:"D MMMM [năm] YYYY",LLL:"D MMMM [năm] YYYY LT",LLLL:"dddd, D MMMM [năm] YYYY LT",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY LT",llll:"ddd, D MMM YYYY LT"},calendar:{sameDay:"[Hôm nay lúc] LT",nextDay:"[Ngày mai lúc] LT",nextWeek:"dddd [tuần tới lúc] LT",lastDay:"[Hôm qua lúc] LT",lastWeek:"dddd [tuần rồi lúc] LT",sameElse:"L"},relativeTime:{future:"%s tới",past:"%s trước",s:"vài giây",m:"một phút",mm:"%d phút",h:"một giờ",hh:"%d giờ",d:"một ngày",dd:"%d ngày",M:"một tháng",MM:"%d tháng",y:"một năm",yy:"%d năm"},ordinalParse:/\d{1,2}/,ordinal:function(a){return a},week:{dow:1,doy:4}}),nf.defineLocale("zh-cn",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah点mm分",LTS:"Ah点m分s秒",L:"YYYY-MM-DD",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日LT",LLLL:"YYYY年MMMD日ddddLT",l:"YYYY-MM-DD",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日LT",llll:"YYYY年MMMD日ddddLT"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"凌晨"===b||"早上"===b||"上午"===b?a:"下午"===b||"晚上"===b?a+12:a>=11?a:a+12},meridiem:function(a,b,c){var d=100*a+b;return 600>d?"凌晨":900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:function(){return 0===this.minutes()?"[今天]Ah[点整]":"[今天]LT"},nextDay:function(){return 0===this.minutes()?"[明天]Ah[点整]":"[明天]LT"},lastDay:function(){return 0===this.minutes()?"[昨天]Ah[点整]":"[昨天]LT"},nextWeek:function(){var a,b;return a=nf().startOf("week"),b=this.unix()-a.unix()>=604800?"[下]":"[本]",0===this.minutes()?b+"dddAh点整":b+"dddAh点mm"},lastWeek:function(){var a,b;return a=nf().startOf("week"),b=this.unix()<a.unix()?"[上]":"[本]",0===this.minutes()?b+"dddAh点整":b+"dddAh点mm"},sameElse:"LL"},ordinalParse:/\d{1,2}(日|月|周)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"周";default:return a}},relativeTime:{future:"%s内",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},week:{dow:1,doy:4}}),nf.defineLocale("zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah點mm分",LTS:"Ah點m分s秒",L:"YYYY年MMMD日",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日LT",LLLL:"YYYY年MMMD日ddddLT",l:"YYYY年MMMD日",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日LT",llll:"YYYY年MMMD日ddddLT"},meridiemParse:/早上|上午|中午|下午|晚上/,meridiemHour:function(a,b){return 12===a&&(a=0),"早上"===b||"上午"===b?a:"中午"===b?a>=11?a:a+12:"下午"===b||"晚上"===b?a+12:void 0},meridiem:function(a,b,c){var d=100*a+b;
+
+return 900>d?"早上":1130>d?"上午":1230>d?"中午":1800>d?"下午":"晚上"},calendar:{sameDay:"[今天]LT",nextDay:"[明天]LT",nextWeek:"[下]ddddLT",lastDay:"[昨天]LT",lastWeek:"[上]ddddLT",sameElse:"L"},ordinalParse:/\d{1,2}(日|月|週)/,ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"週";default:return a}},relativeTime:{future:"%s內",past:"%s前",s:"幾秒",m:"一分鐘",mm:"%d分鐘",h:"一小時",hh:"%d小時",d:"一天",dd:"%d天",M:"一個月",MM:"%d個月",y:"一年",yy:"%d年"}}),nf);return fg});
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/min/moment.min.js b/turtles/app/lib/bower_components/momentjs/min/moment.min.js
new file mode 100644
index 000000000..05199bd3b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/min/moment.min.js
@@ -0,0 +1,7 @@
+//! moment.js
+//! version : 2.10.3
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return Dc.apply(null,arguments)}function b(a){Dc=a}function c(a){return"[object Array]"===Object.prototype.toString.call(a)}function d(a){return a instanceof Date||"[object Date]"===Object.prototype.toString.call(a)}function e(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function f(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function g(a,b){for(var c in b)f(b,c)&&(a[c]=b[c]);return f(b,"toString")&&(a.toString=b.toString),f(b,"valueOf")&&(a.valueOf=b.valueOf),a}function h(a,b,c,d){return za(a,b,c,d,!0).utc()}function i(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function j(a){return null==a._pf&&(a._pf=i()),a._pf}function k(a){if(null==a._isValid){var b=j(a);a._isValid=!isNaN(a._d.getTime())&&b.overflow<0&&!b.empty&&!b.invalidMonth&&!b.nullInput&&!b.invalidFormat&&!b.userInvalidated,a._strict&&(a._isValid=a._isValid&&0===b.charsLeftOver&&0===b.unusedTokens.length&&void 0===b.bigHour)}return a._isValid}function l(a){var b=h(0/0);return null!=a?g(j(b),a):j(b).userInvalidated=!0,b}function m(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=j(b)),"undefined"!=typeof b._locale&&(a._locale=b._locale),Fc.length>0)for(c in Fc)d=Fc[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function n(b){m(this,b),this._d=new Date(+b._d),Gc===!1&&(Gc=!0,a.updateOffset(this),Gc=!1)}function o(a){return a instanceof n||null!=a&&null!=a._isAMomentObject}function p(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function q(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&p(a[d])!==p(b[d]))&&g++;return g+f}function r(){}function s(a){return a?a.toLowerCase().replace("_","-"):a}function t(a){for(var b,c,d,e,f=0;f<a.length;){for(e=s(a[f]).split("-"),b=e.length,c=s(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=u(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&q(e,c,!0)>=b-1)break;b--}f++}return null}function u(a){var b=null;if(!Hc[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=Ec._abbr,require("./locale/"+a),v(b)}catch(c){}return Hc[a]}function v(a,b){var c;return a&&(c="undefined"==typeof b?x(a):w(a,b),c&&(Ec=c)),Ec._abbr}function w(a,b){return null!==b?(b.abbr=a,Hc[a]||(Hc[a]=new r),Hc[a].set(b),v(a),Hc[a]):(delete Hc[a],null)}function x(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return Ec;if(!c(a)){if(b=u(a))return b;a=[a]}return t(a)}function y(a,b){var c=a.toLowerCase();Ic[c]=Ic[c+"s"]=Ic[b]=a}function z(a){return"string"==typeof a?Ic[a]||Ic[a.toLowerCase()]:void 0}function A(a){var b,c,d={};for(c in a)f(a,c)&&(b=z(c),b&&(d[b]=a[c]));return d}function B(b,c){return function(d){return null!=d?(D(this,b,d),a.updateOffset(this,c),this):C(this,b)}}function C(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function D(a,b,c){return a._d["set"+(a._isUTC?"UTC":"")+b](c)}function E(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else if(a=z(a),"function"==typeof this[a])return this[a](b);return this}function F(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function G(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(Mc[a]=e),b&&(Mc[b[0]]=function(){return F(e.apply(this,arguments),b[1],b[2])}),c&&(Mc[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function H(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function I(a){var b,c,d=a.match(Jc);for(b=0,c=d.length;c>b;b++)Mc[d[b]]?d[b]=Mc[d[b]]:d[b]=H(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function J(a,b){return a.isValid()?(b=K(b,a.localeData()),Lc[b]||(Lc[b]=I(b)),Lc[b](a)):a.localeData().invalidDate()}function K(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Kc.lastIndex=0;d>=0&&Kc.test(a);)a=a.replace(Kc,c),Kc.lastIndex=0,d-=1;return a}function L(a,b,c){_c[a]="function"==typeof b?b:function(a){return a&&c?c:b}}function M(a,b){return f(_c,a)?_c[a](b._strict,b._locale):new RegExp(N(a))}function N(a){return a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function O(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=p(a)}),c=0;c<a.length;c++)ad[a[c]]=d}function P(a,b){O(a,function(a,c,d,e){d._w=d._w||{},b(a,d._w,d,e)})}function Q(a,b,c){null!=b&&f(ad,a)&&ad[a](b,c._a,c,a)}function R(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function S(a){return this._months[a.month()]}function T(a){return this._monthsShort[a.month()]}function U(a,b,c){var d,e,f;for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=h([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}function V(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),R(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function W(b){return null!=b?(V(this,b),a.updateOffset(this,!0),this):C(this,"Month")}function X(){return R(this.year(),this.month())}function Y(a){var b,c=a._a;return c&&-2===j(a).overflow&&(b=c[cd]<0||c[cd]>11?cd:c[dd]<1||c[dd]>R(c[bd],c[cd])?dd:c[ed]<0||c[ed]>24||24===c[ed]&&(0!==c[fd]||0!==c[gd]||0!==c[hd])?ed:c[fd]<0||c[fd]>59?fd:c[gd]<0||c[gd]>59?gd:c[hd]<0||c[hd]>999?hd:-1,j(a)._overflowDayOfYear&&(bd>b||b>dd)&&(b=dd),j(a).overflow=b),a}function Z(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function $(a,b){var c=!0,d=a+"\n"+(new Error).stack;return g(function(){return c&&(Z(d),c=!1),b.apply(this,arguments)},b)}function _(a,b){kd[a]||(Z(b),kd[a]=!0)}function aa(a){var b,c,d=a._i,e=ld.exec(d);if(e){for(j(a).iso=!0,b=0,c=md.length;c>b;b++)if(md[b][1].exec(d)){a._f=md[b][0]+(e[6]||" ");break}for(b=0,c=nd.length;c>b;b++)if(nd[b][1].exec(d)){a._f+=nd[b][0];break}d.match(Yc)&&(a._f+="Z"),ta(a)}else a._isValid=!1}function ba(b){var c=od.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(aa(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}function ca(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function da(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function ea(a){return fa(a)?366:365}function fa(a){return a%4===0&&a%100!==0||a%400===0}function ga(){return fa(this.year())}function ha(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=Aa(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function ia(a){return ha(a,this._week.dow,this._week.doy).week}function ja(){return this._week.dow}function ka(){return this._week.doy}function la(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function ma(a){var b=ha(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function na(a,b,c,d,e){var f,g,h=da(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:ea(a-1)+g}}function oa(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function pa(a,b,c){return null!=a?a:null!=b?b:c}function qa(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function ra(a){var b,c,d,e,f=[];if(!a._d){for(d=qa(a),a._w&&null==a._a[dd]&&null==a._a[cd]&&sa(a),a._dayOfYear&&(e=pa(a._a[bd],d[bd]),a._dayOfYear>ea(e)&&(j(a)._overflowDayOfYear=!0),c=da(e,0,a._dayOfYear),a._a[cd]=c.getUTCMonth(),a._a[dd]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=f[b]=d[b];for(;7>b;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[ed]&&0===a._a[fd]&&0===a._a[gd]&&0===a._a[hd]&&(a._nextDay=!0,a._a[ed]=0),a._d=(a._useUTC?da:ca).apply(null,f),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[ed]=24)}}function sa(a){var b,c,d,e,f,g,h;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=pa(b.GG,a._a[bd],ha(Aa(),1,4).year),d=pa(b.W,1),e=pa(b.E,1)):(f=a._locale._week.dow,g=a._locale._week.doy,c=pa(b.gg,a._a[bd],ha(Aa(),f,g).year),d=pa(b.w,1),null!=b.d?(e=b.d,f>e&&++d):e=null!=b.e?b.e+f:f),h=na(c,d,e,g,f),a._a[bd]=h.year,a._dayOfYear=h.dayOfYear}function ta(b){if(b._f===a.ISO_8601)return void aa(b);b._a=[],j(b).empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,k=0;for(e=K(b._f,b._locale).match(Jc)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(M(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&j(b).unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),k+=d.length),Mc[f]?(d?j(b).empty=!1:j(b).unusedTokens.push(f),Q(f,d,b)):b._strict&&!d&&j(b).unusedTokens.push(f);j(b).charsLeftOver=i-k,h.length>0&&j(b).unusedInput.push(h),j(b).bigHour===!0&&b._a[ed]<=12&&b._a[ed]>0&&(j(b).bigHour=void 0),b._a[ed]=ua(b._locale,b._a[ed],b._meridiem),ra(b),Y(b)}function ua(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function va(a){var b,c,d,e,f;if(0===a._f.length)return j(a).invalidFormat=!0,void(a._d=new Date(0/0));for(e=0;e<a._f.length;e++)f=0,b=m({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._f=a._f[e],ta(b),k(b)&&(f+=j(b).charsLeftOver,f+=10*j(b).unusedTokens.length,j(b).score=f,(null==d||d>f)&&(d=f,c=b));g(a,c||b)}function wa(a){if(!a._d){var b=A(a._i);a._a=[b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],ra(a)}}function xa(a){var b,e=a._i,f=a._f;return a._locale=a._locale||x(a._l),null===e||void 0===f&&""===e?l({nullInput:!0}):("string"==typeof e&&(a._i=e=a._locale.preparse(e)),o(e)?new n(Y(e)):(c(f)?va(a):f?ta(a):d(e)?a._d=e:ya(a),b=new n(Y(a)),b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b))}function ya(b){var f=b._i;void 0===f?b._d=new Date:d(f)?b._d=new Date(+f):"string"==typeof f?ba(b):c(f)?(b._a=e(f.slice(0),function(a){return parseInt(a,10)}),ra(b)):"object"==typeof f?wa(b):"number"==typeof f?b._d=new Date(f):a.createFromInputFallback(b)}function za(a,b,c,d,e){var f={};return"boolean"==typeof c&&(d=c,c=void 0),f._isAMomentObject=!0,f._useUTC=f._isUTC=e,f._l=c,f._i=a,f._f=b,f._strict=d,xa(f)}function Aa(a,b,c,d){return za(a,b,c,d,!1)}function Ba(a,b){var d,e;if(1===b.length&&c(b[0])&&(b=b[0]),!b.length)return Aa();for(d=b[0],e=1;e<b.length;++e)b[e][a](d)&&(d=b[e]);return d}function Ca(){var a=[].slice.call(arguments,0);return Ba("isBefore",a)}function Da(){var a=[].slice.call(arguments,0);return Ba("isAfter",a)}function Ea(a){var b=A(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=x(),this._bubble()}function Fa(a){return a instanceof Ea}function Ga(a,b){G(a,0,0,function(){var a=this.utcOffset(),c="+";return 0>a&&(a=-a,c="-"),c+F(~~(a/60),2)+b+F(~~a%60,2)})}function Ha(a){var b=(a||"").match(Yc)||[],c=b[b.length-1]||[],d=(c+"").match(td)||["-",0,0],e=+(60*d[1])+p(d[2]);return"+"===d[0]?e:-e}function Ia(b,c){var e,f;return c._isUTC?(e=c.clone(),f=(o(b)||d(b)?+b:+Aa(b))-+e,e._d.setTime(+e._d+f),a.updateOffset(e,!1),e):Aa(b).local();return c._isUTC?Aa(b).zone(c._offset||0):Aa(b).local()}function Ja(a){return 15*-Math.round(a._d.getTimezoneOffset()/15)}function Ka(b,c){var d,e=this._offset||0;return null!=b?("string"==typeof b&&(b=Ha(b)),Math.abs(b)<16&&(b=60*b),!this._isUTC&&c&&(d=Ja(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?$a(this,Va(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?e:Ja(this)}function La(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function Ma(a){return this.utcOffset(0,a)}function Na(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Ja(this),"m")),this}function Oa(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(Ha(this._i)),this}function Pa(a){return a=a?Aa(a).utcOffset():0,(this.utcOffset()-a)%60===0}function Qa(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Ra(){if(this._a){var a=this._isUTC?h(this._a):Aa(this._a);return this.isValid()&&q(this._a,a.toArray())>0}return!1}function Sa(){return!this._isUTC}function Ta(){return this._isUTC}function Ua(){return this._isUTC&&0===this._offset}function Va(a,b){var c,d,e,g=a,h=null;return Fa(a)?g={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(g={},b?g[b]=a:g.milliseconds=a):(h=ud.exec(a))?(c="-"===h[1]?-1:1,g={y:0,d:p(h[dd])*c,h:p(h[ed])*c,m:p(h[fd])*c,s:p(h[gd])*c,ms:p(h[hd])*c}):(h=vd.exec(a))?(c="-"===h[1]?-1:1,g={y:Wa(h[2],c),M:Wa(h[3],c),d:Wa(h[4],c),h:Wa(h[5],c),m:Wa(h[6],c),s:Wa(h[7],c),w:Wa(h[8],c)}):null==g?g={}:"object"==typeof g&&("from"in g||"to"in g)&&(e=Ya(Aa(g.from),Aa(g.to)),g={},g.ms=e.milliseconds,g.M=e.months),d=new Ea(g),Fa(a)&&f(a,"_locale")&&(d._locale=a._locale),d}function Wa(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function Xa(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function Ya(a,b){var c;return b=Ia(b,a),a.isBefore(b)?c=Xa(a,b):(c=Xa(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function Za(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(_(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=Va(c,d),$a(this,e,a),this}}function $a(b,c,d,e){var f=c._milliseconds,g=c._days,h=c._months;e=null==e?!0:e,f&&b._d.setTime(+b._d+f*d),g&&D(b,"Date",C(b,"Date")+g*d),h&&V(b,C(b,"Month")+h*d),e&&a.updateOffset(b,g||h)}function _a(a){var b=a||Aa(),c=Ia(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this,Aa(b)))}function ab(){return new n(this)}function bb(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+this>+a):(c=o(a)?+a:+Aa(a),c<+this.clone().startOf(b))}function cb(a,b){var c;return b=z("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+a>+this):(c=o(a)?+a:+Aa(a),+this.clone().endOf(b)<c)}function db(a,b,c){return this.isAfter(a,c)&&this.isBefore(b,c)}function eb(a,b){var c;return b=z(b||"millisecond"),"millisecond"===b?(a=o(a)?a:Aa(a),+this===+a):(c=+Aa(a),+this.clone().startOf(b)<=c&&c<=+this.clone().endOf(b))}function fb(a){return 0>a?Math.ceil(a):Math.floor(a)}function gb(a,b,c){var d,e,f=Ia(a,this),g=6e4*(f.utcOffset()-this.utcOffset());return b=z(b),"year"===b||"month"===b||"quarter"===b?(e=hb(this,f),"quarter"===b?e/=3:"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:fb(e)}function hb(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function ib(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function jb(){var a=this.clone().utc();return 0<a.year()&&a.year()<=9999?"function"==typeof Date.prototype.toISOString?this.toDate().toISOString():J(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):J(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}function kb(b){var c=J(this,b||a.defaultFormat);return this.localeData().postformat(c)}function lb(a,b){return this.isValid()?Va({to:this,from:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function mb(a){return this.from(Aa(),a)}function nb(a,b){return this.isValid()?Va({from:this,to:a}).locale(this.locale()).humanize(!b):this.localeData().invalidDate()}function ob(a){return this.to(Aa(),a)}function pb(a){var b;return void 0===a?this._locale._abbr:(b=x(a),null!=b&&(this._locale=b),this)}function qb(){return this._locale}function rb(a){switch(a=z(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a&&this.weekday(0),"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this}function sb(a){return a=z(a),void 0===a||"millisecond"===a?this:this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")}function tb(){return+this._d-6e4*(this._offset||0)}function ub(){return Math.floor(+this/1e3)}function vb(){return this._offset?new Date(+this):this._d}function wb(){var a=this;return[a.year(),a.month(),a.date(),a.hour(),a.minute(),a.second(),a.millisecond()]}function xb(){return k(this)}function yb(){return g({},j(this))}function zb(){return j(this).overflow}function Ab(a,b){G(0,[a,a.length],0,b)}function Bb(a,b,c){return ha(Aa([a,11,31+b-c]),b,c).week}function Cb(a){var b=ha(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")}function Db(a){var b=ha(this,1,4).year;return null==a?b:this.add(a-b,"y")}function Eb(){return Bb(this.year(),1,4)}function Fb(){var a=this.localeData()._week;return Bb(this.year(),a.dow,a.doy)}function Gb(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}function Hb(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function Ib(a){return this._weekdays[a.day()]}function Jb(a){return this._weekdaysShort[a.day()]}function Kb(a){return this._weekdaysMin[a.day()]}function Lb(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=Aa([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b}function Mb(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Hb(a,this.localeData()),this.add(a-b,"d")):b}function Nb(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Ob(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)}function Pb(a,b){G(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function Qb(a,b){return b._meridiemParse}function Rb(a){return"p"===(a+"").toLowerCase().charAt(0)}function Sb(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function Tb(a){G(0,[a,3],0,"millisecond")}function Ub(){return this._isUTC?"UTC":""}function Vb(){return this._isUTC?"Coordinated Universal Time":""}function Wb(a){return Aa(1e3*a)}function Xb(){return Aa.apply(null,arguments).parseZone()}function Yb(a,b,c){var d=this._calendar[a];return"function"==typeof d?d.call(b,c):d}function Zb(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b}function $b(){return this._invalidDate}function _b(a){return this._ordinal.replace("%d",a)}function ac(a){return a}function bc(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)}function cc(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)}function dc(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function ec(a,b,c,d){var e=x(),f=h().set(d,b);return e[c](f,a)}function fc(a,b,c,d,e){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return ec(a,b,c,e);var f,g=[];for(f=0;d>f;f++)g[f]=ec(a,f,c,e);return g}function gc(a,b){return fc(a,b,"months",12,"month")}function hc(a,b){return fc(a,b,"monthsShort",12,"month")}function ic(a,b){return fc(a,b,"weekdays",7,"day")}function jc(a,b){return fc(a,b,"weekdaysShort",7,"day")}function kc(a,b){return fc(a,b,"weekdaysMin",7,"day")}function lc(){var a=this._data;return this._milliseconds=Rd(this._milliseconds),this._days=Rd(this._days),this._months=Rd(this._months),a.milliseconds=Rd(a.milliseconds),a.seconds=Rd(a.seconds),a.minutes=Rd(a.minutes),a.hours=Rd(a.hours),a.months=Rd(a.months),a.years=Rd(a.years),this}function mc(a,b,c,d){var e=Va(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function nc(a,b){return mc(this,a,b,1)}function oc(a,b){return mc(this,a,b,-1)}function pc(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;return g.milliseconds=d%1e3,a=fb(d/1e3),g.seconds=a%60,b=fb(a/60),g.minutes=b%60,c=fb(b/60),g.hours=c%24,e+=fb(c/24),h=fb(qc(e)),e-=fb(rc(h)),f+=fb(e/30),e%=30,h+=fb(f/12),f%=12,g.days=e,g.months=f,g.years=h,this}function qc(a){return 400*a/146097}function rc(a){return 146097*a/400}function sc(a){var b,c,d=this._milliseconds;if(a=z(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+12*qc(b),"month"===a?c:c/12;switch(b=this._days+Math.round(rc(this._months/12)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 1440*b+d/6e4;case"second":return 86400*b+d/1e3;case"millisecond":return Math.floor(864e5*b)+d;default:throw new Error("Unknown unit "+a)}}function tc(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*p(this._months/12)}function uc(a){return function(){return this.as(a)}}function vc(a){return a=z(a),this[a+"s"]()}function wc(a){return function(){return this._data[a]}}function xc(){return fb(this.days()/7)}function yc(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function zc(a,b,c){var d=Va(a).abs(),e=fe(d.as("s")),f=fe(d.as("m")),g=fe(d.as("h")),h=fe(d.as("d")),i=fe(d.as("M")),j=fe(d.as("y")),k=e<ge.s&&["s",e]||1===f&&["m"]||f<ge.m&&["mm",f]||1===g&&["h"]||g<ge.h&&["hh",g]||1===h&&["d"]||h<ge.d&&["dd",h]||1===i&&["M"]||i<ge.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,yc.apply(null,k)}function Ac(a,b){return void 0===ge[a]?!1:void 0===b?ge[a]:(ge[a]=b,!0)}function Bc(a){var b=this.localeData(),c=zc(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function Cc(){var a=he(this.years()),b=he(this.months()),c=he(this.days()),d=he(this.hours()),e=he(this.minutes()),f=he(this.seconds()+this.milliseconds()/1e3),g=this.asSeconds();return g?(0>g?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"}var Dc,Ec,Fc=a.momentProperties=[],Gc=!1,Hc={},Ic={},Jc=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g,Kc=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Lc={},Mc={},Nc=/\d/,Oc=/\d\d/,Pc=/\d{3}/,Qc=/\d{4}/,Rc=/[+-]?\d{6}/,Sc=/\d\d?/,Tc=/\d{1,3}/,Uc=/\d{1,4}/,Vc=/[+-]?\d{1,6}/,Wc=/\d+/,Xc=/[+-]?\d+/,Yc=/Z|[+-]\d\d:?\d\d/gi,Zc=/[+-]?\d+(\.\d{1,3})?/,$c=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,_c={},ad={},bd=0,cd=1,dd=2,ed=3,fd=4,gd=5,hd=6;G("M",["MM",2],"Mo",function(){return this.month()+1}),G("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),G("MMMM",0,0,function(a){return this.localeData().months(this,a)}),y("month","M"),L("M",Sc),L("MM",Sc,Oc),L("MMM",$c),L("MMMM",$c),O(["M","MM"],function(a,b){b[cd]=p(a)-1}),O(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);null!=e?b[cd]=e:j(c).invalidMonth=a});var id="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),jd="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),kd={};a.suppressDeprecationWarnings=!1;var ld=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,md=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],nd=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],od=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=$("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),G(0,["YY",2],0,function(){return this.year()%100}),G(0,["YYYY",4],0,"year"),G(0,["YYYYY",5],0,"year"),G(0,["YYYYYY",6,!0],0,"year"),y("year","y"),L("Y",Xc),L("YY",Sc,Oc),L("YYYY",Uc,Qc),L("YYYYY",Vc,Rc),L("YYYYYY",Vc,Rc),O(["YYYY","YYYYY","YYYYYY"],bd),O("YY",function(b,c){c[bd]=a.parseTwoDigitYear(b)}),a.parseTwoDigitYear=function(a){return p(a)+(p(a)>68?1900:2e3)};var pd=B("FullYear",!1);G("w",["ww",2],"wo","week"),G("W",["WW",2],"Wo","isoWeek"),y("week","w"),y("isoWeek","W"),L("w",Sc),L("ww",Sc,Oc),L("W",Sc),L("WW",Sc,Oc),P(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=p(a)});var qd={dow:0,doy:6};G("DDD",["DDDD",3],"DDDo","dayOfYear"),y("dayOfYear","DDD"),L("DDD",Tc),L("DDDD",Pc),O(["DDD","DDDD"],function(a,b,c){c._dayOfYear=p(a)}),a.ISO_8601=function(){};var rd=$("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var a=Aa.apply(null,arguments);return this>a?this:a}),sd=$("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var a=Aa.apply(null,arguments);return a>this?this:a});Ga("Z",":"),Ga("ZZ",""),L("Z",Yc),L("ZZ",Yc),O(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ha(a)});var td=/([\+\-]|\d\d)/gi;a.updateOffset=function(){};var ud=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,vd=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;Va.fn=Ea.prototype;var wd=Za(1,"add"),xd=Za(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ";var yd=$("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});G(0,["gg",2],0,function(){return this.weekYear()%100}),G(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Ab("gggg","weekYear"),Ab("ggggg","weekYear"),Ab("GGGG","isoWeekYear"),Ab("GGGGG","isoWeekYear"),y("weekYear","gg"),y("isoWeekYear","GG"),L("G",Xc),L("g",Xc),L("GG",Sc,Oc),L("gg",Sc,Oc),L("GGGG",Uc,Qc),L("gggg",Uc,Qc),L("GGGGG",Vc,Rc),L("ggggg",Vc,Rc),P(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=p(a)}),P(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),G("Q",0,0,"quarter"),y("quarter","Q"),L("Q",Nc),O("Q",function(a,b){b[cd]=3*(p(a)-1)}),G("D",["DD",2],"Do","date"),y("date","D"),L("D",Sc),L("DD",Sc,Oc),L("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),O(["D","DD"],dd),O("Do",function(a,b){b[dd]=p(a.match(Sc)[0],10)});var zd=B("Date",!0);G("d",0,"do","day"),G("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),G("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),G("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),G("e",0,0,"weekday"),G("E",0,0,"isoWeekday"),y("day","d"),y("weekday","e"),y("isoWeekday","E"),L("d",Sc),L("e",Sc),L("E",Sc),L("dd",$c),L("ddd",$c),L("dddd",$c),P(["dd","ddd","dddd"],function(a,b,c){var d=c._locale.weekdaysParse(a);null!=d?b.d=d:j(c).invalidWeekday=a}),P(["d","e","E"],function(a,b,c,d){b[d]=p(a)});var Ad="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Bd="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Cd="Su_Mo_Tu_We_Th_Fr_Sa".split("_");G("H",["HH",2],0,"hour"),G("h",["hh",2],0,function(){return this.hours()%12||12}),Pb("a",!0),Pb("A",!1),y("hour","h"),L("a",Qb),L("A",Qb),L("H",Sc),L("h",Sc),L("HH",Sc,Oc),L("hh",Sc,Oc),O(["H","HH"],ed),O(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),O(["h","hh"],function(a,b,c){b[ed]=p(a),j(c).bigHour=!0});var Dd=/[ap]\.?m?\.?/i,Ed=B("Hours",!0);G("m",["mm",2],0,"minute"),y("minute","m"),L("m",Sc),L("mm",Sc,Oc),O(["m","mm"],fd);var Fd=B("Minutes",!1);G("s",["ss",2],0,"second"),y("second","s"),L("s",Sc),L("ss",Sc,Oc),O(["s","ss"],gd);var Gd=B("Seconds",!1);G("S",0,0,function(){return~~(this.millisecond()/100)}),G(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),Tb("SSS"),Tb("SSSS"),y("millisecond","ms"),L("S",Tc,Nc),L("SS",Tc,Oc),L("SSS",Tc,Pc),L("SSSS",Wc),O(["S","SS","SSS","SSSS"],function(a,b){b[hd]=p(1e3*("0."+a))});var Hd=B("Milliseconds",!1);G("z",0,0,"zoneAbbr"),G("zz",0,0,"zoneName");var Id=n.prototype;Id.add=wd,Id.calendar=_a,Id.clone=ab,Id.diff=gb,Id.endOf=sb,Id.format=kb,Id.from=lb,Id.fromNow=mb,Id.to=nb,Id.toNow=ob,Id.get=E,Id.invalidAt=zb,Id.isAfter=bb,Id.isBefore=cb,Id.isBetween=db,Id.isSame=eb,Id.isValid=xb,Id.lang=yd,Id.locale=pb,Id.localeData=qb,Id.max=sd,Id.min=rd,Id.parsingFlags=yb,Id.set=E,Id.startOf=rb,Id.subtract=xd,Id.toArray=wb,Id.toDate=vb,Id.toISOString=jb,Id.toJSON=jb,Id.toString=ib,Id.unix=ub,Id.valueOf=tb,Id.year=pd,Id.isLeapYear=ga,Id.weekYear=Cb,Id.isoWeekYear=Db,Id.quarter=Id.quarters=Gb,Id.month=W,Id.daysInMonth=X,Id.week=Id.weeks=la,Id.isoWeek=Id.isoWeeks=ma,Id.weeksInYear=Fb,Id.isoWeeksInYear=Eb,Id.date=zd,Id.day=Id.days=Mb,Id.weekday=Nb,Id.isoWeekday=Ob,Id.dayOfYear=oa,Id.hour=Id.hours=Ed,Id.minute=Id.minutes=Fd,Id.second=Id.seconds=Gd,Id.millisecond=Id.milliseconds=Hd,Id.utcOffset=Ka,Id.utc=Ma,Id.local=Na,Id.parseZone=Oa,Id.hasAlignedHourOffset=Pa,Id.isDST=Qa,Id.isDSTShifted=Ra,Id.isLocal=Sa,Id.isUtcOffset=Ta,Id.isUtc=Ua,Id.isUTC=Ua,Id.zoneAbbr=Ub,Id.zoneName=Vb,Id.dates=$("dates accessor is deprecated. Use date instead.",zd),Id.months=$("months accessor is deprecated. Use month instead",W),Id.years=$("years accessor is deprecated. Use year instead",pd),Id.zone=$("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",La);var Jd=Id,Kd={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},Ld={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},Md="Invalid date",Nd="%d",Od=/\d{1,2}/,Pd={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",
+hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Qd=r.prototype;Qd._calendar=Kd,Qd.calendar=Yb,Qd._longDateFormat=Ld,Qd.longDateFormat=Zb,Qd._invalidDate=Md,Qd.invalidDate=$b,Qd._ordinal=Nd,Qd.ordinal=_b,Qd._ordinalParse=Od,Qd.preparse=ac,Qd.postformat=ac,Qd._relativeTime=Pd,Qd.relativeTime=bc,Qd.pastFuture=cc,Qd.set=dc,Qd.months=S,Qd._months=id,Qd.monthsShort=T,Qd._monthsShort=jd,Qd.monthsParse=U,Qd.week=ia,Qd._week=qd,Qd.firstDayOfYear=ka,Qd.firstDayOfWeek=ja,Qd.weekdays=Ib,Qd._weekdays=Ad,Qd.weekdaysMin=Kb,Qd._weekdaysMin=Cd,Qd.weekdaysShort=Jb,Qd._weekdaysShort=Bd,Qd.weekdaysParse=Lb,Qd.isPM=Rb,Qd._meridiemParse=Dd,Qd.meridiem=Sb,v("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===p(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.lang=$("moment.lang is deprecated. Use moment.locale instead.",v),a.langData=$("moment.langData is deprecated. Use moment.localeData instead.",x);var Rd=Math.abs,Sd=uc("ms"),Td=uc("s"),Ud=uc("m"),Vd=uc("h"),Wd=uc("d"),Xd=uc("w"),Yd=uc("M"),Zd=uc("y"),$d=wc("milliseconds"),_d=wc("seconds"),ae=wc("minutes"),be=wc("hours"),ce=wc("days"),de=wc("months"),ee=wc("years"),fe=Math.round,ge={s:45,m:45,h:22,d:26,M:11},he=Math.abs,ie=Ea.prototype;ie.abs=lc,ie.add=nc,ie.subtract=oc,ie.as=sc,ie.asMilliseconds=Sd,ie.asSeconds=Td,ie.asMinutes=Ud,ie.asHours=Vd,ie.asDays=Wd,ie.asWeeks=Xd,ie.asMonths=Yd,ie.asYears=Zd,ie.valueOf=tc,ie._bubble=pc,ie.get=vc,ie.milliseconds=$d,ie.seconds=_d,ie.minutes=ae,ie.hours=be,ie.days=ce,ie.weeks=xc,ie.months=de,ie.years=ee,ie.humanize=Bc,ie.toISOString=Cc,ie.toString=Cc,ie.toJSON=Cc,ie.locale=pb,ie.localeData=qb,ie.toIsoString=$("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Cc),ie.lang=yd,G("X",0,0,"unix"),G("x",0,0,"valueOf"),L("x",Xc),L("X",Zc),O("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),O("x",function(a,b,c){c._d=new Date(p(a))}),a.version="2.10.3",b(Aa),a.fn=Jd,a.min=Ca,a.max=Da,a.utc=h,a.unix=Wb,a.months=gc,a.isDate=d,a.locale=v,a.invalid=l,a.duration=Va,a.isMoment=o,a.weekdays=ic,a.parseZone=Xb,a.localeData=x,a.isDuration=Fa,a.monthsShort=hc,a.weekdaysMin=kc,a.defineLocale=w,a.weekdaysShort=jc,a.normalizeUnits=z,a.relativeTimeThreshold=Ac;var je=a;return je});
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/min/tests.js b/turtles/app/lib/bower_components/momentjs/min/tests.js
new file mode 100644
index 000000000..0d7bb958e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/min/tests.js
@@ -0,0 +1,39537 @@
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('af');
+
+    test('parse', function (assert) {
+        var tests = 'Januarie Jan_Februarie Feb_Maart Mar_April Apr_Mei Mei_Junie Jun_Julie Jul_Augustus Aug_September Sep_Oktober Okt_November Nov_Desember Des'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sondag, Februarie 14de 2010, 3:25:50 nm'],
+                ['ddd, hA',                            'Son, 3NM'],
+                ['M Mo MM MMMM MMM',                   '2 2de 02 Februarie Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14de 14'],
+                ['d do dddd ddd dd',                   '0 0de Sondag Son So'],
+                ['DDD DDDo DDDD',                      '45 45ste 045'],
+                ['w wo ww',                            '6 6de 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'nm NM'],
+                ['[the] DDDo [day of the year]',       'the 45ste day of the year'],
+                ['LT',                                 '15:25'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Februarie 2010'],
+                ['LLL',                                '14 Februarie 2010 15:25'],
+                ['LLLL',                               'Sondag, 14 Februarie 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 15:25'],
+                ['llll',                               'Son, 14 Feb 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1ste', '1ste');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2de', '2de');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3de', '3de');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4de', '4de');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5de', '5de');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6de', '6de');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7de', '7de');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8ste', '8ste');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9de', '9de');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10de', '10de');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11de', '11de');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12de', '12de');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13de', '13de');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14de', '14de');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15de', '15de');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16de', '16de');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17de', '17de');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18de', '18de');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19de', '19de');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20ste', '20ste');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21ste', '21ste');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22ste', '22ste');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23ste', '23ste');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24ste', '24ste');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25ste', '25ste');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26ste', '26ste');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27ste', '27ste');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28ste', '28ste');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29ste', '29ste');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30ste', '30ste');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31ste', '31ste');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Januarie Jan_Februarie Feb_Maart Mar_April Apr_Mei Mei_Junie Jun_Julie Jul_Augustus Aug_September Sep_Oktober Okt_November Nov_Desember Des'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Sondag Son So_Maandag Maa Ma_Dinsdag Din Di_Woensdag Woe Wo_Donderdag Don Do_Vrydag Vry Vr_Saterdag Sat Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  '\'n paar sekondes', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  '\'n minuut',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  '\'n minuut',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minute',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minute',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  '\'n uur',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  '\'n uur',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ure',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ure',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ure',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  '\'n dag',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  '\'n dag',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dae',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   '\'n dag',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dae',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dae',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  '\'n maand',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  '\'n maand',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  '\'n maand',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 maande',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 maande',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 maande',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   '\'n maand',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 maande',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), '\'n jaar',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 jaar',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   '\'n jaar',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 jaar',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'oor \'n paar sekondes',  'prefix');
+        assert.equal(moment(0).from(30000), '\'n paar sekondes gelede', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), '\'n paar sekondes gelede',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'oor \'n paar sekondes', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'oor 5 dae', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                   'Vandag om 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Vandag om 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Vandag om 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Môre om 02:00',    'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Vandag om 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Gister om 02:00',   'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Laas] dddd [om] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Laas] dddd [om] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Laas] dddd [om] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52ste', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1ste', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1ste', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),    '2 02 2de', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ar-ma');
+
+    test('parse', function (assert) {
+        var tests = 'يناير:يناير_فبراير:فبراير_مارس:مارس_أبريل:أبريل_ماي:ماي_يونيو:يونيو_يوليوز:يوليوز_غشت:غشت_شتنبر:شتنبر_أكتوبر:أكتوبر_نونبر:نونبر_دجنبر:دجنبر'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(':');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'الأحد, فبراير 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'احد, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 فبراير فبراير'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 الأحد احد ح'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LT',                                 '15:25'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 فبراير 2010'],
+                ['LLL',                                '14 فبراير 2010 15:25'],
+                ['LLLL',                               'الأحد 14 فبراير 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 فبراير 2010'],
+                ['lll',                                '14 فبراير 2010 15:25'],
+                ['llll',                               'احد 14 فبراير 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'يناير يناير_فبراير فبراير_مارس مارس_أبريل أبريل_ماي ماي_يونيو يونيو_يوليوز يوليوز_غشت غشت_شتنبر شتنبر_أكتوبر أكتوبر_نونبر نونبر_دجنبر دجنبر'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'الأحد احد ح_الإتنين اتنين ن_الثلاثاء ثلاثاء ث_الأربعاء اربعاء ر_الخميس خميس خ_الجمعة جمعة ج_السبت سبت س'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ثوان', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'دقيقة',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'دقيقة',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 دقائق',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 دقائق',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ساعة',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ساعة',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ساعات',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ساعات',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ساعات',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'يوم',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'يوم',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 أيام',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'يوم',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 أيام',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 أيام',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'شهر',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'شهر',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'شهر',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 أشهر',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 أشهر',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 أشهر',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'شهر',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 أشهر',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'سنة',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 سنوات',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'سنة',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 سنوات',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'في ثوان',  'prefix');
+        assert.equal(moment(0).from(30000), 'منذ ثوان', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'منذ ثوان',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'في ثوان', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'في 5 أيام', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'اليوم على الساعة 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'اليوم على الساعة 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'اليوم على الساعة 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'غدا على الساعة 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'اليوم على الساعة 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'أمس على الساعة 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 31]).week(), 1, 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).week(), 1, 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).week(), 2, 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).week(), 2, 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).week(), 3, 'Jan 14 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 30]).week(), 1, 'Dec 30 2006 should be week 1');
+        assert.equal(moment([2007,  0,  5]).week(), 1, 'Jan  5 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 2, 'Jan  6 2007 should be week 2');
+        assert.equal(moment([2007,  0, 12]).week(), 2, 'Jan 12 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 3, 'Jan 13 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 1, 'Dec 29 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  4]).week(), 1, 'Jan  4 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 2, 'Jan  5 2008 should be week 2');
+        assert.equal(moment([2008,  0, 11]).week(), 2, 'Jan 11 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 3, 'Jan 12 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 28]).week(), 1, 'Dec 28 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  3]).week(), 1, 'Jan  3 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 2, 'Jan  4 2003 should be week 2');
+        assert.equal(moment([2003,  0, 10]).week(), 2, 'Jan 10 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 3, 'Jan 11 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 27]).week(), 1, 'Dec 27 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  2]).week(), 1, 'Jan  2 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 2, 'Jan  3 2009 should be week 2');
+        assert.equal(moment([2009,  0,  9]).week(), 2, 'Jan  9 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 3, 'Jan 10 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 26]).week(), 1, 'Dec 26 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 2, 'Jan  2 2010 should be week 2');
+        assert.equal(moment([2010,  0,  8]).week(), 2, 'Jan  8 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 3, 'Jan  9 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2011, 0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011, 0,  7]).week(), 1, 'Jan  7 2011 should be week 1');
+        assert.equal(moment([2011, 0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011, 0, 14]).week(), 2, 'Jan 14 2011 should be week 2');
+        assert.equal(moment([2011, 0, 15]).week(), 3, 'Jan 15 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 31]).format('w ww wo'), '1 01 1', 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).format('w ww wo'), '1 01 1', 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).format('w ww wo'), '2 02 2', 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', 'Jan 14 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ar-sa');
+
+    test('parse', function (assert) {
+        var tests = 'يناير:يناير_فبراير:فبراير_مارس:مارس_أبريل:أبريل_مايو:مايو_يونيو:يونيو_يوليو:يوليو_أغسطس:أغسطس_سبتمبر:سبتمبر_أكتوبر:أكتوبر_نوفمبر:نوفمبر_ديسمبر:ديسمبر'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1) + ' instead is month ' + moment(input, mmm).month());
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(':');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'الأحد، فبراير ١٤ ٢٠١٠، ٣:٢٥:٥٠ م'],
+                ['ddd, hA',                            'أحد، ٣م'],
+                ['M Mo MM MMMM MMM',                   '٢ ٢ ٠٢ فبراير فبراير'],
+                ['YYYY YY',                            '٢٠١٠ ١٠'],
+                ['D Do DD',                            '١٤ ١٤ ١٤'],
+                ['d do dddd ddd dd',                   '٠ ٠ الأحد أحد ح'],
+                ['DDD DDDo DDDD',                      '٤٥ ٤٥ ٠٤٥'],
+                ['w wo ww',                            '٨ ٨ ٠٨'],
+                ['h hh',                               '٣ ٠٣'],
+                ['H HH',                               '١٥ ١٥'],
+                ['m mm',                               '٢٥ ٢٥'],
+                ['s ss',                               '٥٠ ٥٠'],
+                ['a A',                                'م م'],
+                ['[the] DDDo [day of the year]',       'the ٤٥ day of the year'],
+                ['LT',                                 '١٥:٢٥'],
+                ['LTS',                                '١٥:٢٥:٥٠'],
+                ['L',                                  '١٤/٠٢/٢٠١٠'],
+                ['LL',                                 '١٤ فبراير ٢٠١٠'],
+                ['LLL',                                '١٤ فبراير ٢٠١٠ ١٥:٢٥'],
+                ['LLLL',                               'الأحد ١٤ فبراير ٢٠١٠ ١٥:٢٥'],
+                ['l',                                  '١٤/٢/٢٠١٠'],
+                ['ll',                                 '١٤ فبراير ٢٠١٠'],
+                ['lll',                                '١٤ فبراير ٢٠١٠ ١٥:٢٥'],
+                ['llll',                               'أحد ١٤ فبراير ٢٠١٠ ١٥:٢٥']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '١', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '٢', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '٣', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '٤', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '٥', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '٦', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '٧', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '٨', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '٩', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '١٠', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '١١', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '١٢', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '١٣', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '١٤', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '١٥', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '١٦', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '١٧', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '١٨', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '١٩', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '٢٠', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '٢١', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '٢٢', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '٢٣', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '٢٤', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '٢٥', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '٢٦', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '٢٧', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '٢٨', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '٢٩', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '٣٠', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '٣١', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'يناير يناير_فبراير فبراير_مارس مارس_أبريل أبريل_مايو مايو_يونيو يونيو_يوليو يوليو_أغسطس أغسطس_سبتمبر سبتمبر_أكتوبر أكتوبر_نوفمبر نوفمبر_ديسمبر ديسمبر'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'الأحد أحد ح_الإثنين إثنين ن_الثلاثاء ثلاثاء ث_الأربعاء أربعاء ر_الخميس خميس خ_الجمعة جمعة ج_السبت سبت س'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ثوان', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'دقيقة',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'دقيقة',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '٢ دقائق',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '٤٤ دقائق',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ساعة',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ساعة',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '٢ ساعات',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '٥ ساعات',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '٢١ ساعات',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'يوم',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'يوم',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '٢ أيام',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'يوم',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '٥ أيام',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '٢٥ أيام',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'شهر',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'شهر',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'شهر',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '٢ أشهر',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '٢ أشهر',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '٣ أشهر',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'شهر',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '٥ أشهر',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'سنة',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '٢ سنوات',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'سنة',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '٥ سنوات',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'في ثوان',  'prefix');
+        assert.equal(moment(0).from(30000), 'منذ ثوان', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'منذ ثوان',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'في ثوان', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'في ٥ أيام', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'اليوم على الساعة ٠٢:٠٠',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'اليوم على الساعة ٠٢:٢٥',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'اليوم على الساعة ٠٣:٠٠',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'غدا على الساعة ٠٢:٠٠',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'اليوم على الساعة ٠١:٠٠',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'أمس على الساعة ٠٢:٠٠', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [على الساعة] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 31]).week(), 1, 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).week(), 1, 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).week(), 2, 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).week(), 2, 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).week(), 3, 'Jan 14 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 30]).week(), 1, 'Dec 30 2006 should be week 1');
+        assert.equal(moment([2007,  0,  5]).week(), 1, 'Jan  5 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 2, 'Jan  6 2007 should be week 2');
+        assert.equal(moment([2007,  0, 12]).week(), 2, 'Jan 12 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 3, 'Jan 13 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 1, 'Dec 29 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  4]).week(), 1, 'Jan  4 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 2, 'Jan  5 2008 should be week 2');
+        assert.equal(moment([2008,  0, 11]).week(), 2, 'Jan 11 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 3, 'Jan 12 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 28]).week(), 1, 'Dec 28 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  3]).week(), 1, 'Jan  3 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 2, 'Jan  4 2003 should be week 2');
+        assert.equal(moment([2003,  0, 10]).week(), 2, 'Jan 10 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 3, 'Jan 11 2003 should be week 3');
+
+        assert.equal(moment('2003 1 6', 'gggg w d').format('YYYY-MM-DD'), '٢٠٠٢-١٢-٢٨', 'Week 1 of 2003 should be Dec 28 2002');
+        assert.equal(moment('2003 1 0', 'gggg w e').format('YYYY-MM-DD'), '٢٠٠٢-١٢-٢٨', 'Week 1 of 2003 should be Dec 28 2002');
+        assert.equal(moment('2003 1 6', 'gggg w d').format('gggg w d'), '٢٠٠٣ ١ ٦', 'Saturday of week 1 of 2003 parsed should be formatted as 2003 1 6');
+        assert.equal(moment('2003 1 0', 'gggg w e').format('gggg w e'), '٢٠٠٣ ١ ٠', '1st day of week 1 of 2003 parsed should be formatted as 2003 1 0');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 27]).week(), 1, 'Dec 27 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  2]).week(), 1, 'Jan  2 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 2, 'Jan  3 2009 should be week 2');
+        assert.equal(moment([2009,  0,  9]).week(), 2, 'Jan  9 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 3, 'Jan 10 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 26]).week(), 1, 'Dec 26 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 2, 'Jan  2 2010 should be week 2');
+        assert.equal(moment([2010,  0,  8]).week(), 2, 'Jan  8 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 3, 'Jan  9 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2011, 0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011, 0,  7]).week(), 1, 'Jan  7 2011 should be week 1');
+        assert.equal(moment([2011, 0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011, 0, 14]).week(), 2, 'Jan 14 2011 should be week 2');
+        assert.equal(moment([2011, 0, 15]).week(), 3, 'Jan 15 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 31]).format('w ww wo'), '١ ٠١ ١', 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).format('w ww wo'), '١ ٠١ ١', 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).format('w ww wo'), '٢ ٠٢ ٢', 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).format('w ww wo'), '٢ ٠٢ ٢', 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).format('w ww wo'), '٣ ٠٣ ٣', 'Jan 14 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ar-tn');
+
+    test('parse', function (assert) {
+        var tests = 'جانفي:جانفي_فيفري:فيفري_مارس:مارس_أفريل:أفريل_ماي:ماي_جوان:جوان_جويلية:جويلية_أوت:أوت_سبتمبر:سبتمبر_أكتوبر:أكتوبر_نوفمبر:نوفمبر_ديسمبر:ديسمبر'.split('_'),
+            i;
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(':');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a', 'الأحد, فيفري 14 2010, 3:25:50 pm'],
+                ['ddd, hA', 'أحد, 3PM'],
+                ['M Mo MM MMMM MMM', '2 2 02 فيفري فيفري'],
+                ['YYYY YY', '2010 10'],
+                ['D Do DD', '14 14 14'],
+                ['d do dddd ddd dd', '0 0 الأحد أحد ح'],
+                ['DDD DDDo DDDD', '45 45 045'],
+                ['w wo ww', '6 6 06'],
+                ['h hh', '3 03'],
+                ['H HH', '15 15'],
+                ['m mm', '25 25'],
+                ['s ss', '50 50'],
+                ['a A', 'pm PM'],
+                ['[the] DDDo [day of the year]', 'the 45 day of the year'],
+                ['LT', '15:25'],
+                ['LTS', '15:25:50'],
+                ['L', '14/02/2010'],
+                ['LL', '14 فيفري 2010'],
+                ['LLL', '14 فيفري 2010 15:25'],
+                ['LLLL', 'الأحد 14 فيفري 2010 15:25'],
+                ['l', '14/2/2010'],
+                ['ll', '14 فيفري 2010'],
+                ['lll', '14 فيفري 2010 15:25'],
+                ['llll', 'أحد 14 فيفري 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'جانفي جانفي_فيفري فيفري_مارس مارس_أفريل أفريل_ماي ماي_جوان جوان_جويلية جويلية_أوت أوت_سبتمبر سبتمبر_أكتوبر أكتوبر_نوفمبر نوفمبر_ديسمبر ديسمبر'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'الأحد أحد ح_الإثنين إثنين ن_الثلاثاء ثلاثاء ث_الأربعاء أربعاء ر_الخميس خميس خ_الجمعة جمعة ج_السبت سبت س'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 44
+        }), true), 'ثوان', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 45
+        }), true), 'دقيقة', '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 89
+        }), true), 'دقيقة', '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 90
+        }), true), '2 دقائق', '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 44
+        }), true), '44 دقائق', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 45
+        }), true), 'ساعة', '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 89
+        }), true), 'ساعة', '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 90
+        }), true), '2 ساعات', '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 5
+        }), true), '5 ساعات', '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 21
+        }), true), '21 ساعات', '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 22
+        }), true), 'يوم', '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 35
+        }), true), 'يوم', '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 36
+        }), true), '2 أيام', '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 1
+        }), true), 'يوم', '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 5
+        }), true), '5 أيام', '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 25
+        }), true), '25 أيام', '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 26
+        }), true), 'شهر', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 30
+        }), true), 'شهر', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 43
+        }), true), 'شهر', '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 46
+        }), true), '2 أشهر', '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 74
+        }), true), '2 أشهر', '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 76
+        }), true), '3 أشهر', '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            M: 1
+        }), true), 'شهر', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            M: 5
+        }), true), '5 أشهر', '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 345
+        }), true), 'سنة', '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 548
+        }), true), '2 سنوات', '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            y: 1
+        }), true), 'سنة', '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            y: 5
+        }), true), '5 سنوات', '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'في ثوان', 'prefix');
+        assert.equal(moment(0).from(30000), 'منذ ثوان', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'منذ ثوان', 'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({
+            s: 30
+        }).fromNow(), 'في ثوان', 'in a few seconds');
+        assert.equal(moment().add({
+            d: 5
+        }).fromNow(), 'في 5 أيام', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(), 'اليوم على الساعة 02:00', 'today at the same time');
+        assert.equal(moment(a).add({
+            m: 25
+        }).calendar(), 'اليوم على الساعة 02:25', 'Now plus 25 min');
+        assert.equal(moment(a).add({
+            h: 1
+        }).calendar(), 'اليوم على الساعة 03:00', 'Now plus 1 hour');
+        assert.equal(moment(a).add({
+            d: 1
+        }).calendar(), 'غدا على الساعة 02:00', 'tomorrow at the same time');
+        assert.equal(moment(a).subtract({
+            h: 1
+        }).calendar(), 'اليوم على الساعة 01:00', 'Now minus 1 hour');
+        assert.equal(moment(a).subtract({
+            d: 1
+        }).calendar(), 'أمس على الساعة 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({
+                d: i
+            });
+            assert.equal(m.calendar(), m.format('dddd [على الساعة] LT'), 'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('dddd [على الساعة] LT'), 'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('dddd [على الساعة] LT'), 'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({
+                d: i
+            });
+            assert.equal(m.calendar(), m.format('dddd [على الساعة] LT'), 'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('dddd [على الساعة] LT'), 'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('dddd [على الساعة] LT'), 'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({
+                w: 1
+            }),
+            weeksFromNow = moment().add({
+                w: 1
+            });
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '1 week ago');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 1 week');
+
+        weeksAgo = moment().subtract({
+            w: 2
+        });
+        weeksFromNow = moment().add({
+            w: 2
+        });
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'), '1 01 1', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '1 01 1', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ar');
+
+    var months = [
+        'كانون الثاني يناير',
+        'شباط فبراير',
+        'آذار مارس',
+        'نيسان أبريل',
+        'أيار مايو',
+        'حزيران يونيو',
+        'تموز يوليو',
+        'آب أغسطس',
+        'أيلول سبتمبر',
+        'تشرين الأول أكتوبر',
+        'تشرين الثاني نوفمبر',
+        'كانون الأول ديسمبر'
+    ];
+
+    test('parse', function (assert) {
+        var tests = months, i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1) + ' instead is month ' + moment(input, mmm).month());
+        }
+        for (i = 0; i < 12; i++) {
+            equalTest(tests[i], 'MMM', i);
+            equalTest(tests[i], 'MMM', i);
+            equalTest(tests[i], 'MMMM', i);
+            equalTest(tests[i], 'MMMM', i);
+            equalTest(tests[i].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'الأحد، شباط فبراير ١٤ ٢٠١٠، ٣:٢٥:٥٠ م'],
+                ['ddd, hA',                            'أحد، ٣م'],
+                ['M Mo MM MMMM MMM',                   '٢ ٢ ٠٢ شباط فبراير شباط فبراير'],
+                ['YYYY YY',                            '٢٠١٠ ١٠'],
+                ['D Do DD',                            '١٤ ١٤ ١٤'],
+                ['d do dddd ddd dd',                   '٠ ٠ الأحد أحد ح'],
+                ['DDD DDDo DDDD',                      '٤٥ ٤٥ ٠٤٥'],
+                ['w wo ww',                            '٨ ٨ ٠٨'],
+                ['h hh',                               '٣ ٠٣'],
+                ['H HH',                               '١٥ ١٥'],
+                ['m mm',                               '٢٥ ٢٥'],
+                ['s ss',                               '٥٠ ٥٠'],
+                ['a A',                                'م م'],
+                ['[the] DDDo [day of the year]',       'the ٤٥ day of the year'],
+                ['LT',                                 '١٥:٢٥'],
+                ['LTS',                                '١٥:٢٥:٥٠'],
+                ['L',                                  '١٤/\u200f٢/\u200f٢٠١٠'],
+                ['LL',                                 '١٤ شباط فبراير ٢٠١٠'],
+                ['LLL',                                '١٤ شباط فبراير ٢٠١٠ ١٥:٢٥'],
+                ['LLLL',                               'الأحد ١٤ شباط فبراير ٢٠١٠ ١٥:٢٥'],
+                ['l',                                  '١٤/\u200f٢/\u200f٢٠١٠'],
+                ['ll',                                 '١٤ شباط فبراير ٢٠١٠'],
+                ['lll',                                '١٤ شباط فبراير ٢٠١٠ ١٥:٢٥'],
+                ['llll',                               'أحد ١٤ شباط فبراير ٢٠١٠ ١٥:٢٥']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '١', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '٢', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '٣', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '٤', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '٥', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '٦', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '٧', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '٨', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '٩', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '١٠', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '١١', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '١٢', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '١٣', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '١٤', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '١٥', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '١٦', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '١٧', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '١٨', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '١٩', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '٢٠', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '٢١', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '٢٢', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '٢٣', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '٢٤', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '٢٥', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '٢٦', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '٢٧', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '٢٨', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '٢٩', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '٣٠', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '٣١', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = months, i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM'), expected[i], expected[i]);
+            assert.equal(moment([2011, i, 1]).format('MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'الأحد أحد ح_الإثنين إثنين ن_الثلاثاء ثلاثاء ث_الأربعاء أربعاء ر_الخميس خميس خ_الجمعة جمعة ج_السبت سبت س'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  '٤٤ ثانية', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'دقيقة واحدة',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'دقيقة واحدة',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  'دقيقتان',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '٤٤ دقيقة',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ساعة واحدة',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ساعة واحدة',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  'ساعتان',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '٥ ساعات',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '٢١ ساعة',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'يوم واحد',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'يوم واحد',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  'يومان',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'يوم واحد',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '٥ أيام',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '٢٥ يومًا',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'شهر واحد',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'شهر واحد',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'شهر واحد',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  'شهران',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  'شهران',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '٣ أشهر',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'شهر واحد',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '٥ أشهر',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'عام واحد',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), 'عامان',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'عام واحد',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '٥ أعوام',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'بعد ٣٠ ثانية',  'prefix');
+        assert.equal(moment(0).from(30000), 'منذ ٣٠ ثانية', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'منذ ثانية واحدة',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'بعد ٣٠ ثانية', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'بعد ٥ أيام', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'اليوم عند الساعة ٠٢:٠٠',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'اليوم عند الساعة ٠٢:٢٥',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'اليوم عند الساعة ٠٣:٠٠',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'غدًا عند الساعة ٠٢:٠٠',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'اليوم عند الساعة ٠١:٠٠',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'أمس عند الساعة ٠٢:٠٠', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [عند الساعة] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [عند الساعة] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [عند الساعة] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [عند الساعة] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [عند الساعة] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [عند الساعة] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 31]).week(), 1, 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).week(), 1, 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).week(), 2, 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).week(), 2, 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).week(), 3, 'Jan 14 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 30]).week(), 1, 'Dec 30 2006 should be week 1');
+        assert.equal(moment([2007,  0,  5]).week(), 1, 'Jan  5 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 2, 'Jan  6 2007 should be week 2');
+        assert.equal(moment([2007,  0, 12]).week(), 2, 'Jan 12 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 3, 'Jan 13 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 1, 'Dec 29 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  4]).week(), 1, 'Jan  4 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 2, 'Jan  5 2008 should be week 2');
+        assert.equal(moment([2008,  0, 11]).week(), 2, 'Jan 11 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 3, 'Jan 12 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 28]).week(), 1, 'Dec 28 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  3]).week(), 1, 'Jan  3 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 2, 'Jan  4 2003 should be week 2');
+        assert.equal(moment([2003,  0, 10]).week(), 2, 'Jan 10 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 3, 'Jan 11 2003 should be week 3');
+
+        assert.equal(moment('2003 1 6', 'gggg w d').format('YYYY-MM-DD'), '٢٠٠٢-١٢-٢٨', 'Week 1 of 2003 should be Dec 28 2002');
+        assert.equal(moment('2003 1 0', 'gggg w e').format('YYYY-MM-DD'), '٢٠٠٢-١٢-٢٨', 'Week 1 of 2003 should be Dec 28 2002');
+        assert.equal(moment('2003 1 6', 'gggg w d').format('gggg w d'), '٢٠٠٣ ١ ٦', 'Saturday of week 1 of 2003 parsed should be formatted as 2003 1 6');
+        assert.equal(moment('2003 1 0', 'gggg w e').format('gggg w e'), '٢٠٠٣ ١ ٠', '1st day of week 1 of 2003 parsed should be formatted as 2003 1 0');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 27]).week(), 1, 'Dec 27 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  2]).week(), 1, 'Jan  2 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 2, 'Jan  3 2009 should be week 2');
+        assert.equal(moment([2009,  0,  9]).week(), 2, 'Jan  9 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 3, 'Jan 10 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 26]).week(), 1, 'Dec 26 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 2, 'Jan  2 2010 should be week 2');
+        assert.equal(moment([2010,  0,  8]).week(), 2, 'Jan  8 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 3, 'Jan  9 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2011, 0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011, 0,  7]).week(), 1, 'Jan  7 2011 should be week 1');
+        assert.equal(moment([2011, 0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011, 0, 14]).week(), 2, 'Jan 14 2011 should be week 2');
+        assert.equal(moment([2011, 0, 15]).week(), 3, 'Jan 15 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 31]).format('w ww wo'), '١ ٠١ ١', 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).format('w ww wo'), '١ ٠١ ١', 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).format('w ww wo'), '٢ ٠٢ ٢', 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).format('w ww wo'), '٢ ٠٢ ٢', 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).format('w ww wo'), '٣ ٠٣ ٣', 'Jan 14 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+    test('no leading zeros in long date formats', function (assert) {
+        var i, j, longDateStr, shortDateStr;
+        for (i = 1; i <= 9; ++i) {
+            for (j = 1; j <= 9; ++j) {
+                longDateStr = moment([2014, i, j]).format('L');
+                shortDateStr = moment([2014, i, j]).format('l');
+                assert.equal(longDateStr, shortDateStr, 'should not have leading zeros in month or day');
+            }
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('az');
+
+    test('parse', function (assert) {
+        var tests = 'yanvar yan_fevral fev_mart mar_Aprel apr_may may_iyun iyn_iyul iyl_Avqust avq_sentyabr sen_oktyabr okt_noyabr noy_dekabr dek'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, D MMMM YYYY, HH:mm:ss',        'Bazar, 14 fevral 2010, 15:25:50'],
+                ['ddd, A h',                           'Baz, gündüz 3'],
+                ['M Mo MM MMMM MMM',                   '2 2-nci 02 fevral fev'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-üncü 14'],
+                ['d do dddd ddd dd',                   '0 0-ıncı Bazar Baz Bz'],
+                ['DDD DDDo DDDD',                      '45 45-inci 045'],
+                ['w wo ww',                            '7 7-nci 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'gündüz gündüz'],
+                ['[ilin] DDDo [günü]',                 'ilin 45-inci günü'],
+                ['LT',                                 '15:25'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 fevral 2010'],
+                ['LLL',                                '14 fevral 2010 15:25'],
+                ['LLLL',                               'Bazar, 14 fevral 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 fev 2010'],
+                ['lll',                                '14 fev 2010 15:25'],
+                ['llll',                               'Baz, 14 fev 2010 15:25']
+            ],
+            DDDo = [
+                [359, '360-ıncı'],
+                [199, '200-üncü'],
+                [149, '150-nci']
+            ],
+            dt = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            DDDoDt,
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(dt.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+        for (i = 0; i < DDDo.length; i++) {
+            DDDoDt = moment([2010]);
+            assert.equal(DDDoDt.add(DDDo[i][0], 'days').format('DDDo'), DDDo[i][1], DDDo[i][0] + ' ---> ' + DDDo[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-inci', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-nci', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-üncü', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-üncü', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-inci', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-ncı', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-nci', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-inci', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-uncu', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-uncu', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-inci', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-nci', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-üncü', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-üncü', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-inci', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-ncı', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-nci', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-inci', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-uncu', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-nci', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-inci', '21th');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-nci', '22th');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-üncü', '23th');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-üncü', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-inci', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-ncı', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-nci', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-inci', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-uncu', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-uncu', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-inci', '31st');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'yanvar yan_fevral fev_mart mar_aprel apr_may may_iyun iyn_iyul iyl_avqust avq_sentyabr sen_oktyabr okt_noyabr noy_dekabr dek'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Bazar Baz Bz_Bazar ertəsi BzE BE_Çərşənbə axşamı ÇAx ÇA_Çərşənbə Çər Çə_Cümə axşamı CAx CA_Cümə Cüm Cü_Şənbə Şən Şə'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'birneçə saniyyə', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'bir dəqiqə',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'bir dəqiqə',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 dəqiqə',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 dəqiqə',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'bir saat',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'bir saat',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 saat',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 saat',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 saat',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'bir gün',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'bir gün',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 gün',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'bir gün',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 gün',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 gün',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'bir ay',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'bir ay',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 ay',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 ay',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 ay',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'bir ay',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 ay',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'bir il',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 il',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'bir il',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 il',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'birneçə saniyyə sonra',  'prefix');
+        assert.equal(moment(0).from(30000), 'birneçə saniyyə əvvəl', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'birneçə saniyyə əvvəl',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'birneçə saniyyə sonra', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 gün sonra', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'bugün saat 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'bugün saat 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'bugün saat 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'sabah saat 02:00',     'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'bugün saat 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'dünən 02:00',          'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[gələn həftə] dddd [saat] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[gələn həftə] dddd [saat] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[gələn həftə] dddd [saat] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[keçən həftə] dddd [saat] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[keçən həftə] dddd [saat] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[keçən həftə] dddd [saat] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-inci', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-inci', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-nci', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-nci', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-üncü', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('be');
+
+    test('parse', function (assert) {
+        var tests = 'студзень студ_люты лют_сакавік сак_красавік крас_травень трав_чэрвень чэрв_ліпень ліп_жнівень жнів_верасень вер_кастрычнік каст_лістапад ліст_снежань снеж'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, HH:mm:ss',       'нядзеля, 14-га лютага 2010, 15:25:50'],
+                ['ddd, h A',                           'нд, 3 дня'],
+                ['M Mo MM MMMM MMM',                   '2 2-і 02 люты лют'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-га 14'],
+                ['d do dddd ddd dd',                   '0 0-ы нядзеля нд нд'],
+                ['DDD DDDo DDDD',                      '45 45-ы 045'],
+                ['w wo ww',                            '7 7-ы 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'дня дня'],
+                ['DDDo [дзень года]',                   '45-ы дзень года'],
+                ['LT',                                 '15:25'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 лютага 2010 г.'],
+                ['LLL',                                '14 лютага 2010 г., 15:25'],
+                ['LLLL',                               'нядзеля, 14 лютага 2010 г., 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 лют 2010 г.'],
+                ['lll',                                '14 лют 2010 г., 15:25'],
+                ['llll',                               'нд, 14 лют 2010 г., 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format meridiem', function (assert) {
+        assert.equal(moment([2012, 11, 28, 0, 0]).format('A'), 'ночы', 'night');
+        assert.equal(moment([2012, 11, 28, 3, 59]).format('A'), 'ночы', 'night');
+        assert.equal(moment([2012, 11, 28, 4, 0]).format('A'), 'раніцы', 'morning');
+        assert.equal(moment([2012, 11, 28, 11, 59]).format('A'), 'раніцы', 'morning');
+        assert.equal(moment([2012, 11, 28, 12, 0]).format('A'), 'дня', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 16, 59]).format('A'), 'дня', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 17, 0]).format('A'), 'вечара', 'evening');
+        assert.equal(moment([2012, 11, 28, 23, 59]).format('A'), 'вечара', 'evening');
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-ы', '1-ы');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-і', '2-і');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-і', '3-і');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-ы', '4-ы');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-ы', '5-ы');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-ы', '6-ы');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-ы', '7-ы');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-ы', '8-ы');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-ы', '9-ы');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-ы', '10-ы');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-ы', '11-ы');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-ы', '12-ы');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-ы', '13-ы');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-ы', '14-ы');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-ы', '15-ы');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-ы', '16-ы');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-ы', '17-ы');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-ы', '18-ы');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-ы', '19-ы');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-ы', '20-ы');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-ы', '21-ы');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-і', '22-і');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-і', '23-і');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-ы', '24-ы');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-ы', '25-ы');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-ы', '26-ы');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-ы', '27-ы');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-ы', '28-ы');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-ы', '29-ы');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-ы', '30-ы');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-ы', '31-ы');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'студзень студ_люты лют_сакавік сак_красавік крас_травень трав_чэрвень чэрв_ліпень ліп_жнівень жнів_верасень вер_кастрычнік каст_лістапад ліст_снежань снеж'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format month case', function (assert) {
+        var months = {
+            'nominative': 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_'),
+            'accusative': 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2011, i, 1]).format('D MMMM'), '1 ' + months.accusative[i], '1 ' + months.accusative[i]);
+            assert.equal(moment([2011, i, 1]).format('MMMM'), months.nominative[i], '1 ' + months.nominative[i]);
+        }
+    });
+
+    test('format month case with escaped symbols', function (assert) {
+        var months = {
+            'nominative': 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_'),
+            'accusative': 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2013, i, 1]).format('D[] MMMM'), '1 ' + months.accusative[i], '1 ' + months.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('[<i>]D[</i>] [<b>]MMMM[</b>]'), '<i>1</i> <b>' + months.accusative[i] + '</b>', '1 <b>' + months.accusative[i] + '</b>');
+            assert.equal(moment([2013, i, 1]).format('D[-ы дзень] MMMM'), '1-ы дзень ' + months.accusative[i], '1-ы дзень ' + months.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('D, MMMM'), '1, ' + months.nominative[i], '1, ' + months.nominative[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'нядзеля нд нд_панядзелак пн пн_аўторак ат ат_серада ср ср_чацвер чц чц_пятніца пт пт_субота сб сб'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'некалькі секунд',    '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'хвіліна',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'хвіліна',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 хвіліны',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 31}), true),  '31 хвіліна',  '31 minutes = 31 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 хвіліны', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'гадзіна',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'гадзіна',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 гадзіны',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 гадзін',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 гадзіна',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'дзень',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'дзень',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 дні',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'дзень',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 дзён',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 11}), true),  '11 дзён',     '11 days = 11 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 21}), true),  '21 дзень',     '21 days = 21 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 дзён',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'месяц',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'месяц',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'месяц',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 месяцы',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 месяцы',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 месяцы',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'месяц',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 месяцаў',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'год',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 гады',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'год',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 гадоў',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'праз некалькі секунд', 'prefix');
+        assert.equal(moment(0).from(30000), 'некалькі секунд таму', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'праз некалькі секунд', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'праз 5 дзён', 'in 5 days');
+        assert.equal(moment().add({m: 31}).fromNow(), 'праз 31 хвіліну', 'in 31 minutes = in 31 minutes');
+        assert.equal(moment().subtract({m: 31}).fromNow(), '31 хвіліну таму', '31 minutes ago = 31 minutes ago');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Сёння ў 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Сёння ў 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Сёння ў 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Заўтра ў 02:00',      'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Сёння ў 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Учора ў 02:00',       'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        function makeFormat(d) {
+            return '[У] dddd [ў] LT';
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+            case 3:
+            case 5:
+            case 6:
+                return '[У мінулую] dddd [ў] LT';
+            case 1:
+            case 2:
+            case 4:
+                return '[У мінулы] dddd [ў] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-ы', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-ы', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-і', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-і', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-і', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('bg');
+
+    test('parse', function (assert) {
+        var tests = 'януари янр_февруари фев_март мар_април апр_май май_юни юни_юли юли_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, H:mm:ss',        'неделя, февруари 14-ти 2010, 15:25:50'],
+                ['ddd, hA',                            'нед, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2-ри 02 февруари фев'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-ти 14'],
+                ['d do dddd ddd dd',                   '0 0-ев неделя нед нд'],
+                ['DDD DDDo DDDD',                      '45 45-ти 045'],
+                ['w wo ww',                            '7 7-ми 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45-ти day of the year'],
+                ['LT',                                 '15:25'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 февруари 2010'],
+                ['LLL',                                '14 февруари 2010 15:25'],
+                ['LLLL',                               'неделя, 14 февруари 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 фев 2010'],
+                ['lll',                                '14 фев 2010 15:25'],
+                ['llll',                               'нед, 14 фев 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-ви', '1-ви');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-ри', '2-ри');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-ти', '3-ти');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-ти', '4-ти');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-ти', '5-ти');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-ти', '6-ти');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-ми', '7-ми');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-ми', '8-ми');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-ти', '9-ти');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-ти', '10-ти');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-ти', '11-ти');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-ти', '12-ти');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-ти', '13-ти');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-ти', '14-ти');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-ти', '15-ти');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-ти', '16-ти');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-ти', '17-ти');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-ти', '18-ти');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-ти', '19-ти');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-ти', '20-ти');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-ви', '21-ви');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-ри', '22-ри');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-ти', '23-ти');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-ти', '24-ти');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-ти', '25-ти');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-ти', '26-ти');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-ми', '27-ми');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-ми', '28-ми');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-ти', '29-ти');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-ти', '30-ти');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-ви', '31-ви');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'януари янр_февруари фев_март мар_април апр_май май_юни юни_юли юли_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'неделя нед нд_понеделник пон пн_вторник вто вт_сряда сря ср_четвъртък чет чт_петък пет пт_събота съб сб'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'няколко секунди', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'минута',          '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'минута',          '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 минути',        '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 минути',       '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'час',             '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'час',             '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 часа',          '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 часа',          '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 часа',         '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ден',             '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ден',             '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 дни',           '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ден',             '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 дни',           '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 дни',          '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'месец',           '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'месец',           '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'месец',           '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 месеца',        '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 месеца',        '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 месеца',        '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'месец',           '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 месеца',        '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'година',          '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 години',        '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'година',          '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 години',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'след няколко секунди',  'prefix');
+        assert.equal(moment(0).from(30000), 'преди няколко секунди', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'преди няколко секунди',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'след няколко секунди', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'след 5 дни', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Днес в 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Днес в 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Днес в 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Утре в 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Днес в 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Вчера в 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [в] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [в] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [в] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+            case 3:
+            case 6:
+                return '[В изминалата] dddd [в] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[В изминалия] dddd [в] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-ви', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-ви', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-ри', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-ри', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-ти', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('bn');
+
+    test('parse', function (assert) {
+        var tests = 'জানুয়ারী জানু_ফেবুয়ারী ফেব_মার্চ মার্চ_এপ্রিল এপর_মে মে_জুন জুন_জুলাই জুল_অগাস্ট অগ_সেপ্টেম্বর সেপ্ট_অক্টোবর অক্টো_নভেম্বর নভ_ডিসেম্বর ডিসেম্'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, a h:mm:ss সময়',  'রবিবার, ১৪ ফেবুয়ারী ২০১০, দুপুর ৩:২৫:৫০ সময়'],
+                ['ddd, a h সময়',                       'রবি, দুপুর ৩ সময়'],
+                ['M Mo MM MMMM MMM',                   '২ ২ ০২ ফেবুয়ারী ফেব'],
+                ['YYYY YY',                            '২০১০ ১০'],
+                ['D Do DD',                            '১৪ ১৪ ১৪'],
+                ['d do dddd ddd dd',                   '০ ০ রবিবার রবি রব'],
+                ['DDD DDDo DDDD',                      '৪৫ ৪৫ ০৪৫'],
+                ['w wo ww',                            '৮ ৮ ০৮'],
+                ['h hh',                               '৩ ০৩'],
+                ['H HH',                               '১৫ ১৫'],
+                ['m mm',                               '২৫ ২৫'],
+                ['s ss',                               '৫০ ৫০'],
+                ['a A',                                'দুপুর দুপুর'],
+                ['LT',                                 'দুপুর ৩:২৫ সময়'],
+                ['LTS',                                'দুপুর ৩:২৫:৫০ সময়'],
+                ['L',                                  '১৪/০২/২০১০'],
+                ['LL',                                 '১৪ ফেবুয়ারী ২০১০'],
+                ['LLL',                                '১৪ ফেবুয়ারী ২০১০, দুপুর ৩:২৫ সময়'],
+                ['LLLL',                               'রবিবার, ১৪ ফেবুয়ারী ২০১০, দুপুর ৩:২৫ সময়'],
+                ['l',                                  '১৪/২/২০১০'],
+                ['ll',                                 '১৪ ফেব ২০১০'],
+                ['lll',                                '১৪ ফেব ২০১০, দুপুর ৩:২৫ সময়'],
+                ['llll',                               'রবি, ১৪ ফেব ২০১০, দুপুর ৩:২৫ সময়']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '১', '১');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '২', '২');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '৩', '৩');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '৪', '৪');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '৫', '৫');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '৬', '৬');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '৭', '৭');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '৮', '৮');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '৯', '৯');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '১০', '১০');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '১১', '১১');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '১২', '১২');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '১৩', '১৩');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '১৪', '১৪');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '১৫', '১৫');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '১৬', '১৬');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '১৭', '১৭');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '১৮', '১৮');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '১৯', '১৯');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '২০', '২০');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '২১', '২১');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '২২', '২২');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '২৩', '২৩');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '২৪', '২৪');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '২৫', '২৫');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '২৬', '২৬');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '২৭', '২৭');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '২৮', '२৮');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '২৯', '২৯');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '৩০', '৩০');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '৩১', '৩১');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'জানুয়ারী জানু_ফেবুয়ারী ফেব_মার্চ মার্চ_এপ্রিল এপর_মে মে_জুন জুন_জুলাই জুল_অগাস্ট অগ_সেপ্টেম্বর সেপ্ট_অক্টোবর অক্টো_নভেম্বর নভ_ডিসেম্বর ডিসেম্'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'রবিবার রবি রব_সোমবার সোম সম_মঙ্গলবার মঙ্গল মঙ্গ_বুধবার বুধ বু_বৃহস্পত্তিবার বৃহস্পত্তি ব্রিহ_শুক্রুবার শুক্রু শু_শনিবার শনি শনি'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'কএক সেকেন্ড', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'এক মিনিট',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'এক মিনিট',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '২ মিনিট',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '৪৪ মিনিট',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'এক ঘন্টা',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'এক ঘন্টা',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '২ ঘন্টা',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '৫ ঘন্টা',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '২১ ঘন্টা',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'এক দিন',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'এক দিন',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '২ দিন',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'এক দিন',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '৫ দিন',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '২৫ দিন',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'এক মাস',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'এক মাস',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '২ মাস',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '২ মাস',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '৩ মাস',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'এক মাস',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '৫ মাস',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'এক বছর',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '২ বছর',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'এক বছর',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '৫ বছর',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'কএক সেকেন্ড পরে',  'prefix');
+        assert.equal(moment(0).from(30000), 'কএক সেকেন্ড আগে', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'কএক সেকেন্ড আগে',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'কএক সেকেন্ড পরে', 'কএক সেকেন্ড পরে');
+        assert.equal(moment().add({d: 5}).fromNow(), '৫ দিন পরে', '৫ দিন পরে');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'আজ রাত ২:০০ সময়',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'আজ রাত ২:২৫ সময়',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 3}).calendar(),       'আজ শকাল ৫:০০ সময়',     'Now plus 3 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'আগামীকাল রাত ২:০০ সময়',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'আজ রাত ১:০০ সময়',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'গতকাল রাত ২:০০ সময়', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[গত] dddd[,] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[গত] dddd[,] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[গত] dddd[,] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('a'), 'রাত', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('a'), 'শকাল', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('a'), 'দুপুর', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('a'), 'বিকেল', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('a'), 'বিকেল', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('a'), 'রাত', 'night');
+
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('A'), 'রাত', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('A'), 'শকাল', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('A'), 'দুপুর', ' during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('A'), 'বিকেল', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('A'), 'বিকেল', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('A'), 'রাত', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '১ ০১ ১', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '১ ০১ ১', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '২ ০২ ২', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '২ ০২ ২', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '৩ ০৩ ৩', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('bo');
+
+    test('parse', function (assert) {
+        var tests = 'ཟླ་བ་དང་པོ ཟླ་བ་དང་པོ._ཟླ་བ་གཉིས་པ ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ ཟླ་བ་བཅུ་གཉིས་པ'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, a h:mm:ss ལ་',  'གཟའ་ཉི་མ་, ༡༤ ཟླ་བ་གཉིས་པ ༢༠༡༠, ཉིན་གུང ༣:༢༥:༥༠ ལ་'],
+                ['ddd, a h ལ་',                       'ཉི་མ་, ཉིན་གུང ༣ ལ་'],
+                ['M Mo MM MMMM MMM',                   '༢ ༢ ༠༢ ཟླ་བ་གཉིས་པ ཟླ་བ་གཉིས་པ'],
+                ['YYYY YY',                            '༢༠༡༠ ༡༠'],
+                ['D Do DD',                            '༡༤ ༡༤ ༡༤'],
+                ['d do dddd ddd dd',                   '༠ ༠ གཟའ་ཉི་མ་ ཉི་མ་ ཉི་མ་'],
+                ['DDD DDDo DDDD',                      '༤༥ ༤༥ ༠༤༥'],
+                ['w wo ww',                            '༨ ༨ ༠༨'],
+                ['h hh',                               '༣ ༠༣'],
+                ['H HH',                               '༡༥ ༡༥'],
+                ['m mm',                               '༢༥ ༢༥'],
+                ['s ss',                               '༥༠ ༥༠'],
+                ['a A',                                'ཉིན་གུང ཉིན་གུང'],
+                ['LT',                                 'ཉིན་གུང ༣:༢༥'],
+                ['LTS',                                'ཉིན་གུང ༣:༢༥:༥༠'],
+                ['L',                                  '༡༤/༠༢/༢༠༡༠'],
+                ['LL',                                 '༡༤ ཟླ་བ་གཉིས་པ ༢༠༡༠'],
+                ['LLL',                                '༡༤ ཟླ་བ་གཉིས་པ ༢༠༡༠, ཉིན་གུང ༣:༢༥'],
+                ['LLLL',                               'གཟའ་ཉི་མ་, ༡༤ ཟླ་བ་གཉིས་པ ༢༠༡༠, ཉིན་གུང ༣:༢༥'],
+                ['l',                                  '༡༤/༢/༢༠༡༠'],
+                ['ll',                                 '༡༤ ཟླ་བ་གཉིས་པ ༢༠༡༠'],
+                ['lll',                                '༡༤ ཟླ་བ་གཉིས་པ ༢༠༡༠, ཉིན་གུང ༣:༢༥'],
+                ['llll',                               'ཉི་མ་, ༡༤ ཟླ་བ་གཉིས་པ ༢༠༡༠, ཉིན་གུང ༣:༢༥']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '༡', '༡');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '༢', '༢');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '༣', '༣');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '༤', '༤');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '༥', '༥');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '༦', '༦');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '༧', '༧');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '༨', '༨');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '༩', '༩');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '༡༠', '༡༠');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '༡༡', '༡༡');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '༡༢', '༡༢');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '༡༣', '༡༣');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '༡༤', '༡༤');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '༡༥', '༡༥');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '༡༦', '༡༦');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '༡༧', '༡༧');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '༡༨', '༡༨');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '༡༩', '༡༩');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '༢༠', '༢༠');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '༢༡', '༢༡');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '༢༢', '༢༢');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '༢༣', '༢༣');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '༢༤', '༢༤');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '༢༥', '༢༥');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '༢༦', '༢༦');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '༢༧', '༢༧');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '༢༨', '༢༨');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '༢༩', '༢༩');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '༣༠', '༣༠');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '༣༡', '༣༡');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ཟླ་བ་དང་པོ ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ ཟླ་བ་བཅུ་གཉིས་པ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'གཟའ་ཉི་མ་ ཉི་མ་ ཉི་མ་_གཟའ་ཟླ་བ་ ཟླ་བ་ ཟླ་བ་_གཟའ་མིག་དམར་ མིག་དམར་ མིག་དམར་_གཟའ་ལྷག་པ་ ལྷག་པ་ ལྷག་པ་_གཟའ་ཕུར་བུ ཕུར་བུ ཕུར་བུ_གཟའ་པ་སངས་ པ་སངས་ པ་སངས་_གཟའ་སྤེན་པ་ སྤེན་པ་ སྤེན་པ་'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ལམ་སང', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'སྐར་མ་གཅིག',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'སྐར་མ་གཅིག',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '༢ སྐར་མ',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '༤༤ སྐར་མ',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ཆུ་ཚོད་གཅིག',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ཆུ་ཚོད་གཅིག',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '༢ ཆུ་ཚོད',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '༥ ཆུ་ཚོད',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '༢༡ ཆུ་ཚོད',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ཉིན་གཅིག',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ཉིན་གཅིག',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '༢ ཉིན་',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ཉིན་གཅིག',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '༥ ཉིན་',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '༢༥ ཉིན་',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ཟླ་བ་གཅིག',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ཟླ་བ་གཅིག',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ཟླ་བ་གཅིག',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '༢ ཟླ་བ',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '༢ ཟླ་བ',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '༣ ཟླ་བ',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ཟླ་བ་གཅིག',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '༥ ཟླ་བ',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ལོ་གཅིག',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '༢ ལོ',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ལོ་གཅིག',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '༥ ལོ',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'ལམ་སང ལ་',  'prefix');
+        assert.equal(moment(0).from(30000), 'ལམ་སང སྔན་ལ', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'ལམ་སང སྔན་ལ',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'ལམ་སང ལ་', 'ལམ་སང ལ་');
+        assert.equal(moment().add({d: 5}).fromNow(), '༥ ཉིན་ ལ་', '༥ ཉིན་ ལ་');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'དི་རིང མཚན་མོ ༢:༠༠',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'དི་རིང མཚན་མོ ༢:༢༥',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 3}).calendar(),       'དི་རིང ཞོགས་ཀས ༥:༠༠',     'Now plus 3 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'སང་ཉིན མཚན་མོ ༢:༠༠',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'དི་རིང མཚན་མོ ༡:༠༠',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'ཁ་སང མཚན་མོ ༢:༠༠', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[བདུན་ཕྲག་རྗེས་མ][,] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[བདུན་ཕྲག་རྗེས་མ][,] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[བདུན་ཕྲག་རྗེས་མ][,] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[བདུན་ཕྲག་མཐའ་མ] dddd[,] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[བདུན་ཕྲག་མཐའ་མ] dddd[,] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[བདུན་ཕྲག་མཐའ་མ] dddd[,] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('a'), 'མཚན་མོ', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('a'), 'ཞོགས་ཀས', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('a'), 'ཉིན་གུང', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('a'), 'དགོང་དག', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('a'), 'དགོང་དག', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('a'), 'མཚན་མོ', 'night');
+
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('A'), 'མཚན་མོ', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('A'), 'ཞོགས་ཀས', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('A'), 'ཉིན་གུང', ' during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('A'), 'དགོང་དག', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('A'), 'དགོང་དག', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('A'), 'མཚན་མོ', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '༡ ༠༡ ༡', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '༡ ༠༡ ༡', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '༢ ༠༢ ༢', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '༢ ༠༢ ༢', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '༣ ༠༣ ༣', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('br');
+
+    test('parse', function (assert) {
+        var tests = 'Genver Gen_C\'hwevrer C\'hwe_Meurzh Meu_Ebrel Ebr_Mae Mae_Mezheven Eve_Gouere Gou_Eost Eos_Gwengolo Gwe_Here Her_Du Du_Kerzu Ker'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        moment.locale('br');
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sul, C\'hwevrer 14vet 2010, 3:25:50 pm'],
+                ['ddd, h A',                            'Sul, 3 PM'],
+                ['M Mo MM MMMM MMM',                   '2 2vet 02 C\'hwevrer C\'hwe'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14vet 14'],
+                ['d do dddd ddd dd',                   '0 0vet Sul Sul Su'],
+                ['DDD DDDo DDDD',                      '45 45vet 045'],
+                ['w wo ww',                            '6 6vet 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['DDDo [devezh] [ar] [vloaz]',       '45vet devezh ar vloaz'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 a viz C\'hwevrer 2010'],
+                ['LLL',                                '14 a viz C\'hwevrer 2010 3e25 PM'],
+                ['LLLL',                               'Sul, 14 a viz C\'hwevrer 2010 3e25 PM']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        moment.locale('br');
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1añ', '1añ');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2vet', '2vet');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3vet', '3vet');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4vet', '4vet');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5vet', '5vet');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6vet', '6vet');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7vet', '7vet');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8vet', '8vet');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9vet', '9vet');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10vet', '10vet');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11vet', '11vet');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12vet', '12vet');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13vet', '13vet');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14vet', '14vet');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15vet', '15vet');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16vet', '16vet');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17vet', '17vet');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18vet', '18vet');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19vet', '19vet');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20vet', '20vet');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21vet', '21vet');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22vet', '22vet');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23vet', '23vet');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24vet', '24vet');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25vet', '25vet');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26vet', '26vet');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27vet', '27vet');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28vet', '28vet');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29vet', '29vet');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30vet', '30vet');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31vet', '31vet');
+    });
+
+    test('format month', function (assert) {
+        moment.locale('br');
+        var expected = 'Genver Gen_C\'hwevrer C\'hwe_Meurzh Meu_Ebrel Ebr_Mae Mae_Mezheven Eve_Gouere Gou_Eost Eos_Gwengolo Gwe_Here Her_Du Du_Kerzu Ker'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        moment.locale('br');
+        var expected = 'Sul Sul Su_Lun Lun Lu_Meurzh Meu Me_Merc\'her Mer Mer_Yaou Yao Ya_Gwener Gwe Gw_Sadorn Sad Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        moment.locale('br');
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'un nebeud segondennoù', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ur vunutenn',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ur vunutenn',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 vunutenn',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 munutenn',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'un eur',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'un eur',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 eur',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 eur',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 eur',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'un devezh',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'un devezh',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 zevezh',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'un devezh',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 devezh',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 devezh',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ur miz',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ur miz',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ur miz',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 viz',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 viz',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 miz',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ur miz',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 miz',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ur bloaz',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 vloaz',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ur bloaz',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 bloaz',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        moment.locale('br');
+        assert.equal(moment(30000).from(0), 'a-benn un nebeud segondennoù',  'prefix');
+        assert.equal(moment(0).from(30000), 'un nebeud segondennoù \'zo', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        moment.locale('br');
+        assert.equal(moment().fromNow(), 'un nebeud segondennoù \'zo',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        moment.locale('br');
+        assert.equal(moment().add({s: 30}).fromNow(), 'a-benn un nebeud segondennoù', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'a-benn 5 devezh', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        moment.locale('br');
+
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Hiziv da 2e00 AM',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Hiziv da 2e25 AM',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Hiziv da 3e00 AM',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Warc\'hoazh da 2e00 AM',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hiziv da 1e00 AM',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Dec\'h da 2e00 AM', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        moment.locale('br');
+
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [da] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [da] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [da] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        moment.locale('br');
+
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [paset da] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [paset da] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [paset da] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        moment.locale('br');
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('special mutations for years', function (assert) {
+        moment.locale('br');
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), 'ur bloaz', 'mutation 1 year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 2}), true), '2 vloaz', 'mutation 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 3}), true), '3 bloaz', 'mutation 3 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 4}), true), '4 bloaz', 'mutation 4 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), '5 bloaz', 'mutation 5 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 9}), true), '9 bloaz', 'mutation 9 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 10}), true), '10 vloaz', 'mutation 10 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 21}), true), '21 bloaz', 'mutation 21 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 22}), true), '22 vloaz', 'mutation 22 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 133}), true), '133 bloaz', 'mutation 133 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 148}), true), '148 vloaz', 'mutation 148 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 261}), true), '261 bloaz', 'mutation 261 years');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('bs');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan._februar feb._mart mar._april apr._maj maj._juni jun._juli jul._august aug._septembar sep._oktobar okt._novembar nov._decembar dec.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'nedjelja, 14. februar 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'ned., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. nedjelja ned. ne'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14. 02. 2010'],
+                ['LL',                                 '14. februar 2010'],
+                ['LLL',                                '14. februar 2010 15:25'],
+                ['LLLL',                               'nedjelja, 14. februar 2010 15:25'],
+                ['l',                                  '14. 2. 2010'],
+                ['ll',                                 '14. feb. 2010'],
+                ['lll',                                '14. feb. 2010 15:25'],
+                ['llll',                               'ned., 14. feb. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan._februar feb._mart mar._april apr._maj maj._juni jun._juli jul._august aug._septembar sep._oktobar okt._novembar nov._decembar dec.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'nedjelja ned. ne_ponedjeljak pon. po_utorak uto. ut_srijeda sri. sr_četvrtak čet. če_petak pet. pe_subota sub. su'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'par sekundi', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'jedna minuta',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'jedna minuta',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minute',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuta',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'jedan sat',      '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'jedan sat',      '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 sata',        '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 sati',         '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 sati',        '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'dan',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'dan',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dana',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'dan',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dana',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dana',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mjesec',     '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mjesec',     '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mjesec',     '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mjeseca',     '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mjeseca',     '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mjeseca',     '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mjesec',     '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mjeseci',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'godinu',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 godine',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'godinu',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 godina',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'za par sekundi',  'prefix');
+        assert.equal(moment(0).from(30000), 'prije par sekundi', 'prefix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'prije par sekundi',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'za par sekundi', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'za 5 dana', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'danas u 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'danas u 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'danas u 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'sutra u 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'danas u 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'jučer u 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[u] [nedjelju] [u] LT';
+            case 3:
+                return '[u] [srijedu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+            case 3:
+                return '[prošlu] dddd [u] LT';
+            case 6:
+                return '[prošle] [subote] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[prošli] dddd [u] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ca');
+
+    test('parse', function (assert) {
+        var tests = 'gener gen._febrer febr._març mar._abril abr._maig mai._juny jun._juliol jul._agost ag._setembre set._octubre oct._novembre nov._desembre des.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'diumenge, 14è febrer 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'dg., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2n 02 febrer febr.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14è 14'],
+                ['d do dddd ddd dd',                   '0 0è diumenge dg. Dg'],
+                ['DDD DDDo DDDD',                      '45 45è 045'],
+                ['w wo ww',                            '6 6a 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45è day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 febrer 2010'],
+                ['LLL',                                '14 febrer 2010 15:25'],
+                ['LLLL',                               'diumenge 14 febrer 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 febr. 2010'],
+                ['lll',                                '14 febr. 2010 15:25'],
+                ['llll',                               'dg. 14 febr. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1r', '1r');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2n', '2n');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3r', '3r');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4t', '4t');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5è', '5è');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6è', '6è');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7è', '7è');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8è', '8è');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9è', '9è');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10è', '10è');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11è', '11è');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12è', '12è');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13è', '13è');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14è', '14è');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15è', '15è');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16è', '16è');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17è', '17è');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18è', '18è');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19è', '19è');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20è', '20è');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21è', '21è');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22è', '22è');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23è', '23è');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24è', '24è');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25è', '25è');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26è', '26è');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27è', '27è');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28è', '28è');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29è', '29è');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30è', '30è');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31è', '31è');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'gener gen._febrer febr._març mar._abril abr._maig mai._juny jun._juliol jul._agost ag._setembre set._octubre oct._novembre nov._desembre des.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'diumenge dg. Dg_dilluns dl. Dl_dimarts dt. Dt_dimecres dc. Dc_dijous dj. Dj_divendres dv. Dv_dissabte ds. Ds'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'uns segons', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'un minut',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'un minut',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuts',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuts',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'una hora',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'una hora',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 hores',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 hores',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 hores',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'un dia',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'un dia',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dies',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'un dia',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dies',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dies',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'un mes',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'un mes',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'un mes',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mesos',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mesos',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mesos',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'un mes',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mesos',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'un any',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 anys',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'un any',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 anys',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'en uns segons',  'prefix');
+        assert.equal(moment(0).from(30000), 'fa uns segons', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'fa uns segons',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'en uns segons', 'en uns segons');
+        assert.equal(moment().add({d: 5}).fromNow(), 'en 5 dies', 'en 5 dies');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                         'avui a les 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),          'avui a les 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),           'avui a les 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),           'demà a les 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).add({d: 1, h : -1}).calendar(),   'demà a la 1:00',   'tomorrow minus 1 hour');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),      'avui a la 1:00',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),      'ahir a les 2:00',    'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [a ' + ((m.hours() !== 1) ? 'les' : 'la') + '] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [a ' + ((m.hours() !== 1) ? 'les' : 'la') + '] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [a ' + ((m.hours() !== 1) ? 'les' : 'la') + '] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[el] dddd [passat a ' + ((m.hours() !== 1) ? 'les' : 'la') + '] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[el] dddd [passat a ' + ((m.hours() !== 1) ? 'les' : 'la') + '] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[el] dddd [passat a ' + ((m.hours() !== 1) ? 'les' : 'la') + '] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52a', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1a', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1a', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2a', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2a', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('cs');
+
+    test('parse', function (assert) {
+        var tests = 'leden led_únor úno_březen bře_duben dub_květen kvě_červen čvn_červenec čvc_srpen srp_září zář_říjen říj_listopad lis_prosinec pro'.split('_'), i;
+        function equalTest(input, mmm, monthIndex) {
+            assert.equal(moment(input, mmm).month(), monthIndex, input + ' should be month ' + (monthIndex + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss',  'neděle, únor 14. 2010, 3:25:50'],
+                ['ddd, h',                       'ne, 3'],
+                ['M Mo MM MMMM MMM',             '2 2. 02 únor úno'],
+                ['YYYY YY',                      '2010 10'],
+                ['D Do DD',                      '14 14. 14'],
+                ['d do dddd ddd dd',             '0 0. neděle ne ne'],
+                ['DDD DDDo DDDD',                '45 45. 045'],
+                ['w wo ww',                      '6 6. 06'],
+                ['h hh',                         '3 03'],
+                ['H HH',                         '15 15'],
+                ['m mm',                         '25 25'],
+                ['s ss',                         '50 50'],
+                ['a A',                          'pm PM'],
+                ['DDDo [den v roce]',            '45. den v roce'],
+                ['LTS',                          '15:25:50'],
+                ['L',                            '14.02.2010'],
+                ['LL',                           '14. únor 2010'],
+                ['LLL',                          '14. únor 2010 15:25'],
+                ['LLLL',                         'neděle 14. únor 2010 15:25'],
+                ['l',                            '14.2.2010'],
+                ['ll',                           '14. úno 2010'],
+                ['lll',                          '14. úno 2010 15:25'],
+                ['llll',                         'ne 14. úno 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'leden led_únor úno_březen bře_duben dub_květen kvě_červen čvn_červenec čvc_srpen srp_září zář_říjen říj_listopad lis_prosinec pro'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'neděle ne ne_pondělí po po_úterý út út_středa st st_čtvrtek čt čt_pátek pá pá_sobota so so'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'pár sekund',  '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minuta',        '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minuta',        '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuty',      '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minut',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'hodina',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'hodina',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 hodiny',     '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 hodin',      '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 hodin',     '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'den',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'den',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dny',         '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'den',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dní',         '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dní',        '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'měsíc',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'měsíc',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'měsíc',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 měsíce',    '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 měsíce',    '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 měsíce',    '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'měsíc',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 měsíců',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'rok',           '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 roky',        '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'rok',           '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 let',         '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'za pár sekund',  'prefix');
+        assert.equal(moment(0).from(30000), 'před pár sekundami', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'před pár sekundami',  'now from now should display as in the past');
+    });
+
+    test('fromNow (future)', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'za pár sekund', 'in a few seconds');
+        assert.equal(moment().add({m: 1}).fromNow(), 'za minutu', 'in a minute');
+        assert.equal(moment().add({m: 3}).fromNow(), 'za 3 minuty', 'in 3 minutes');
+        assert.equal(moment().add({m: 10}).fromNow(), 'za 10 minut', 'in 10 minutes');
+        assert.equal(moment().add({h: 1}).fromNow(), 'za hodinu', 'in an hour');
+        assert.equal(moment().add({h: 3}).fromNow(), 'za 3 hodiny', 'in 3 hours');
+        assert.equal(moment().add({h: 10}).fromNow(), 'za 10 hodin', 'in 10 hours');
+        assert.equal(moment().add({d: 1}).fromNow(), 'za den', 'in a day');
+        assert.equal(moment().add({d: 3}).fromNow(), 'za 3 dny', 'in 3 days');
+        assert.equal(moment().add({d: 10}).fromNow(), 'za 10 dní', 'in 10 days');
+        assert.equal(moment().add({M: 1}).fromNow(), 'za měsíc', 'in a month');
+        assert.equal(moment().add({M: 3}).fromNow(), 'za 3 měsíce', 'in 3 months');
+        assert.equal(moment().add({M: 10}).fromNow(), 'za 10 měsíců', 'in 10 months');
+        assert.equal(moment().add({y: 1}).fromNow(), 'za rok', 'in a year');
+        assert.equal(moment().add({y: 3}).fromNow(), 'za 3 roky', 'in 3 years');
+        assert.equal(moment().add({y: 10}).fromNow(), 'za 10 let', 'in 10 years');
+    });
+
+    test('fromNow (past)', function (assert) {
+        assert.equal(moment().subtract({s: 30}).fromNow(), 'před pár sekundami', 'a few seconds ago');
+        assert.equal(moment().subtract({m: 1}).fromNow(), 'před minutou', 'a minute ago');
+        assert.equal(moment().subtract({m: 3}).fromNow(), 'před 3 minutami', '3 minutes ago');
+        assert.equal(moment().subtract({m: 10}).fromNow(), 'před 10 minutami', '10 minutes ago');
+        assert.equal(moment().subtract({h: 1}).fromNow(), 'před hodinou', 'an hour ago');
+        assert.equal(moment().subtract({h: 3}).fromNow(), 'před 3 hodinami', '3 hours ago');
+        assert.equal(moment().subtract({h: 10}).fromNow(), 'před 10 hodinami', '10 hours ago');
+        assert.equal(moment().subtract({d: 1}).fromNow(), 'před dnem', 'a day ago');
+        assert.equal(moment().subtract({d: 3}).fromNow(), 'před 3 dny', '3 days ago');
+        assert.equal(moment().subtract({d: 10}).fromNow(), 'před 10 dny', '10 days ago');
+        assert.equal(moment().subtract({M: 1}).fromNow(), 'před měsícem', 'a month ago');
+        assert.equal(moment().subtract({M: 3}).fromNow(), 'před 3 měsíci', '3 months ago');
+        assert.equal(moment().subtract({M: 10}).fromNow(), 'před 10 měsíci', '10 months ago');
+        assert.equal(moment().subtract({y: 1}).fromNow(), 'před rokem', 'a year ago');
+        assert.equal(moment().subtract({y: 3}).fromNow(), 'před 3 lety', '3 years ago');
+        assert.equal(moment().subtract({y: 10}).fromNow(), 'před 10 lety', '10 years ago');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'dnes v 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'dnes v 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'dnes v 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'zítra v 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'dnes v 1:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'včera v 2:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m, nextDay;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            nextDay = '';
+            switch (m.day()) {
+            case 0:
+                nextDay = 'v neděli';
+                break;
+            case 1:
+                nextDay = 'v pondělí';
+                break;
+            case 2:
+                nextDay = 'v úterý';
+                break;
+            case 3:
+                nextDay = 've středu';
+                break;
+            case 4:
+                nextDay = 've čtvrtek';
+                break;
+            case 5:
+                nextDay = 'v pátek';
+                break;
+            case 6:
+                nextDay = 'v sobotu';
+                break;
+            }
+            assert.equal(m.calendar(),       m.format('[' + nextDay + '] [v] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[' + nextDay + '] [v] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[' + nextDay + '] [v] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m, lastDay;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            lastDay = '';
+            switch (m.day()) {
+            case 0:
+                lastDay = 'minulou neděli';
+                break;
+            case 1:
+                lastDay = 'minulé pondělí';
+                break;
+            case 2:
+                lastDay = 'minulé úterý';
+                break;
+            case 3:
+                lastDay = 'minulou středu';
+                break;
+            case 4:
+                lastDay = 'minulý čtvrtek';
+                break;
+            case 5:
+                lastDay = 'minulý pátek';
+                break;
+            case 6:
+                lastDay = 'minulou sobotu';
+                break;
+            }
+            assert.equal(m.calendar(),       m.format('[' + lastDay + '] [v] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[' + lastDay + '] [v] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[' + lastDay + '] [v] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('humanize duration', function (assert) {
+        assert.equal(moment.duration(1, 'minutes').humanize(), 'minuta', 'a minute (future)');
+        assert.equal(moment.duration(1, 'minutes').humanize(true), 'za minutu', 'in a minute');
+        assert.equal(moment.duration(-1, 'minutes').humanize(), 'minuta', 'a minute (past)');
+        assert.equal(moment.duration(-1, 'minutes').humanize(true), 'před minutou', 'a minute ago');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('cv');
+
+    test('parse', function (assert) {
+        var tests = 'кӑрлач кӑр_нарӑс нар_пуш пуш_ака ака_май май_ҫӗртме ҫӗр_утӑ утӑ_ҫурла ҫур_авӑн авн_юпа юпа_чӳк чӳк_раштав раш'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'вырсарникун, нарӑс 14-мӗш 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'выр, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2-мӗш 02 нарӑс нар'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-мӗш 14'],
+                ['d do dddd ddd dd',                   '0 0-мӗш вырсарникун выр вр'],
+                ['DDD DDDo DDDD',                      '45 45-мӗш 045'],
+                ['w wo ww',                            '7 7-мӗш 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['Ҫулӑн DDDo кунӗ',                    'Ҫулӑн 45-мӗш кунӗ'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14-02-2010'],
+                ['LL',                                 '2010 ҫулхи нарӑс уйӑхӗн 14-мӗшӗ'],
+                ['LLL',                                '2010 ҫулхи нарӑс уйӑхӗн 14-мӗшӗ, 15:25'],
+                ['LLLL',                               'вырсарникун, 2010 ҫулхи нарӑс уйӑхӗн 14-мӗшӗ, 15:25'],
+                ['l',                                  '14-2-2010'],
+                ['ll',                                 '2010 ҫулхи нар уйӑхӗн 14-мӗшӗ'],
+                ['lll',                                '2010 ҫулхи нар уйӑхӗн 14-мӗшӗ, 15:25'],
+                ['llll',                               'выр, 2010 ҫулхи нар уйӑхӗн 14-мӗшӗ, 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-мӗш', '1-мӗш');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-мӗш', '2-мӗш');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-мӗш', '3-мӗш');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-мӗш', '4-мӗш');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-мӗш', '5-мӗш');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-мӗш', '6-мӗш');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-мӗш', '7-мӗш');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-мӗш', '8-мӗш');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-мӗш', '9-мӗш');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-мӗш', '10-мӗш');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-мӗш', '11-мӗш');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-мӗш', '12-мӗш');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-мӗш', '13-мӗш');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-мӗш', '14-мӗш');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-мӗш', '15-мӗш');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-мӗш', '16-мӗш');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-мӗш', '17-мӗш');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-мӗш', '18-мӗш');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-мӗш', '19-мӗш');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-мӗш', '20-мӗш');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-мӗш', '21-мӗш');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-мӗш', '22-мӗш');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-мӗш', '23-мӗш');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-мӗш', '24-мӗш');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-мӗш', '25-мӗш');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-мӗш', '26-мӗш');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-мӗш', '27-мӗш');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-мӗш', '28-мӗш');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-мӗш', '29-мӗш');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-мӗш', '30-мӗш');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-мӗш', '31-мӗш');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'кӑрлач кӑр_нарӑс нар_пуш пуш_ака ака_май май_ҫӗртме ҫӗр_утӑ утӑ_ҫурла ҫур_авӑн авн_юпа юпа_чӳк чӳк_раштав раш'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'вырсарникун выр вр_тунтикун тун тн_ытларикун ытл ыт_юнкун юн юн_кӗҫнерникун кӗҫ кҫ_эрнекун эрн эр_шӑматкун шӑм шм'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'пӗр-ик ҫеккунт', '44 sekunder = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'пӗр минут',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'пӗр минут',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 минут',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 минут',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'пӗр сехет',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'пӗр сехет',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 сехет',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 сехет',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 сехет',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'пӗр кун',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'пӗр кун',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 кун',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'пӗр кун',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 кун',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 кун',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'пӗр уйӑх',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'пӗр уйӑх',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'пӗр уйӑх',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 уйӑх',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 уйӑх',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 уйӑх',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'пӗр уйӑх',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 уйӑх',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'пӗр ҫул',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ҫул',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'пӗр ҫул',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ҫул',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'пӗр-ик ҫеккунтран',  'prefix');
+        assert.equal(moment(0).from(30000), 'пӗр-ик ҫеккунт каялла', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'пӗр-ик ҫеккунт каялла',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'пӗр-ик ҫеккунтран', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 кунран', 'in 5 days');
+        assert.equal(moment().add({h: 2}).fromNow(), '2 сехетрен', 'in 2 hours, the right suffix!');
+        assert.equal(moment().add({y: 3}).fromNow(), '3 ҫултан', 'in 3 years, the right suffix!');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+        assert.equal(moment(a).calendar(),                   'Паян 02:00 сехетре',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Паян 02:25 сехетре',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Паян 03:00 сехетре',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Ыран 02:00 сехетре',     'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Паян 01:00 сехетре',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Ӗнер 02:00 сехетре',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[Ҫитес] dddd LT [сехетре]'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Ҫитес] dddd LT [сехетре]'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Ҫитес] dddd LT [сехетре]'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Иртнӗ] dddd LT [сехетре]'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Иртнӗ] dddd LT [сехетре]'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Иртнӗ] dddd LT [сехетре]'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    // Monday is the first day of the week.
+    // The week that contains Jan 1st is the first week of the year.
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-мӗш', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-мӗш', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-мӗш', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-мӗш', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-мӗш', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('cy');
+
+    test('parse', function (assert) {
+        var tests = 'Ionawr Ion_Chwefror Chwe_Mawrth Maw_Ebrill Ebr_Mai Mai_Mehefin Meh_Gorffennaf Gor_Awst Aws_Medi Med_Hydref Hyd_Tachwedd Tach_Rhagfyr Rhag'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Dydd Sul, Chwefror 14eg 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Sul, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2il 02 Chwefror Chwe'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14eg 14'],
+                ['d do dddd ddd dd',                   '0 0 Dydd Sul Sul Su'],
+                ['DDD DDDo DDDD',                      '45 45ain 045'],
+                ['w wo ww',                            '6 6ed 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45ain day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Chwefror 2010'],
+                ['LLL',                                '14 Chwefror 2010 15:25'],
+                ['LLLL',                               'Dydd Sul, 14 Chwefror 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Chwe 2010'],
+                ['lll',                                '14 Chwe 2010 15:25'],
+                ['llll',                               'Sul, 14 Chwe 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1af', '1af');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2il', '2il');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3ydd', '3ydd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4ydd', '4ydd');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5ed', '5ed');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6ed', '6ed');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7ed', '7ed');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8fed', '8fed');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9fed', '9fed');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10fed', '10fed');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11eg', '11eg');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12fed', '12fed');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13eg', '13eg');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14eg', '14eg');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15fed', '15fed');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16eg', '16eg');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17eg', '17eg');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18fed', '18fed');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19eg', '19eg');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20fed', '20fed');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21ain', '21ain');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22ain', '22ain');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23ain', '23ain');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24ain', '24ain');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25ain', '25ain');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26ain', '26ain');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27ain', '27ain');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28ain', '28ain');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29ain', '29ain');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30ain', '30ain');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31ain', '31ain');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Ionawr Ion_Chwefror Chwe_Mawrth Maw_Ebrill Ebr_Mai Mai_Mehefin Meh_Gorffennaf Gor_Awst Aws_Medi Med_Hydref Hyd_Tachwedd Tach_Rhagfyr Rhag'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Dydd Sul Sul Su_Dydd Llun Llun Ll_Dydd Mawrth Maw Ma_Dydd Mercher Mer Me_Dydd Iau Iau Ia_Dydd Gwener Gwe Gw_Dydd Sadwrn Sad Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ychydig eiliadau', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'munud',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'munud',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 munud',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 munud', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'awr',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'awr',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 awr',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 awr',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 awr',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'diwrnod',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'diwrnod',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 diwrnod',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'diwrnod',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 diwrnod',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 diwrnod',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mis',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mis',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mis',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mis',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mis',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mis',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mis',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mis',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'blwyddyn',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 flynedd',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'blwyddyn',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 flynedd',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'mewn ychydig eiliadau', 'prefix');
+        assert.equal(moment(0).from(30000), 'ychydig eiliadau yn ôl', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'mewn ychydig eiliadau', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'mewn 5 diwrnod', 'in 5 days');
+    });
+
+    test('same day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Heddiw am 02:00',    'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Heddiw am 02:25',    'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Heddiw am 03:00',    'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Yfory am 02:00',         'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Heddiw am 01:00',    'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Ddoe am 02:00',           'yesterday at the same time');
+    });
+
+    test('same next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [am] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [am] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [am] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('same last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [diwethaf am] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [diwethaf am] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [diwethaf am] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('same all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52ain', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'), '1 01 1af', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '1 01 1af', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2il', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2il', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('da');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan_februar feb_marts mar_april apr_maj maj_juni jun_juli jul_august aug_september sep_oktober okt_november nov_december dec'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd [den] Do MMMM YYYY, h:mm:ss a', 'søndag den 14. februar 2010, 3:25:50 pm'],
+                ['ddd hA',                             'søn 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. søndag søn sø'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[den] DDDo [dag på året]',           'den 45. dag på året'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14. februar 2010'],
+                ['LLL',                                '14. februar 2010 15:25'],
+                ['LLLL',                               'søndag d. 14. februar 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14. feb 2010'],
+                ['lll',                                '14. feb 2010 15:25'],
+                ['llll',                               'søn d. 14. feb 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan_februar feb_marts mar_april apr_maj maj_juni jun_juli jul_august aug_september sep_oktober okt_november nov_december dec'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'søndag søn sø_mandag man ma_tirsdag tir ti_onsdag ons on_torsdag tor to_fredag fre fr_lørdag lør lø'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'få sekunder', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'et minut',    '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'et minut',    '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutter',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutter', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'en time',     '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'en time',     '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 timer',     '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 timer',     '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 timer',    '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'en dag',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'en dag',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dage',      '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'en dag',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dage',      '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dage',     '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'en måned',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'en måned',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'en måned',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 måneder',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 måneder',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 måneder',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'en måned',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 måneder',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'et år',       '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 år',        '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'et år',       '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 år',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'om få sekunder',  'prefix');
+        assert.equal(moment(0).from(30000), 'få sekunder siden', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'få sekunder siden',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'om få sekunder', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'om 5 dage', 'in 5 days');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('de-at');
+
+    test('parse', function (assert) {
+        var tests = 'Jänner Jän._Februar Febr._März Mrz._April Apr._Mai Mai_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split('_'), i;
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a', 'Sonntag, 14. Februar 2010, 3:25:50 pm'],
+                ['ddd, hA', 'So., 3PM'],
+                ['M Mo MM MMMM MMM', '2 2. 02 Februar Febr.'],
+                ['YYYY YY', '2010 10'],
+                ['D Do DD', '14 14. 14'],
+                ['d do dddd ddd dd', '0 0. Sonntag So. So'],
+                ['DDD DDDo DDDD', '45 45. 045'],
+                ['w wo ww', '6 6. 06'],
+                ['h hh', '3 03'],
+                ['H HH', '15 15'],
+                ['m mm', '25 25'],
+                ['s ss', '50 50'],
+                ['a A', 'pm PM'],
+                ['[the] DDDo [day of the year]', 'the 45. day of the year'],
+                ['LTS', '15:25:50'],
+                ['L', '14.02.2010'],
+                ['LL', '14. Februar 2010'],
+                ['LLL', '14. Februar 2010 15:25'],
+                ['LLLL', 'Sonntag, 14. Februar 2010 15:25'],
+                ['l', '14.2.2010'],
+                ['ll', '14. Febr. 2010'],
+                ['lll', '14. Febr. 2010 15:25'],
+                ['llll', 'So., 14. Febr. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Jänner Jän._Februar Febr._März Mrz._April Apr._Mai Mai_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Sonntag So. So_Montag Mo. Mo_Dienstag Di. Di_Mittwoch Mi. Mi_Donnerstag Do. Do_Freitag Fr. Fr_Samstag Sa. Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), 'ein paar Sekunden', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), 'eine Minute', '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true), 'eine Minute', '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true), '2 Minuten', '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true), '44 Minuten', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true), 'eine Stunde', '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true), 'eine Stunde', '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true), '2 Stunden', '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true), '5 Stunden', '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true), '21 Stunden', '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true), 'ein Tag', '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true), 'ein Tag', '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true), '2 Tage', '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true), 'ein Tag', '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true), '5 Tage', '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), '25 Tage', '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), 'ein Monat', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), 'ein Monat', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), '2 Monate', '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), '2 Monate', '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), '3 Monate', '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), 'ein Monat', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), '5 Monate', '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ein Jahr', '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 Jahre', '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), 'ein Jahr', '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), '5 Jahre', '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'in ein paar Sekunden', 'prefix');
+        assert.equal(moment(0).from(30000), 'vor ein paar Sekunden', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'in ein paar Sekunden', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'in 5 Tagen', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(), 'Heute um 02:00 Uhr', 'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(), 'Heute um 02:25 Uhr', 'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(), 'Heute um 03:00 Uhr', 'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(), 'Morgen um 02:00 Uhr', 'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(), 'Heute um 01:00 Uhr', 'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(), 'Gestern um 02:00 Uhr', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(), m.format('dddd [um] LT [Uhr]'), 'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('dddd [um] LT [Uhr]'), 'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('dddd [um] LT [Uhr]'), 'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(), m.format('[letzten] dddd [um] LT [Uhr]'), 'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('[letzten] dddd [um] LT [Uhr]'), 'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('[letzten] dddd [um] LT [Uhr]'), 'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '1 week ago');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(), 1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(), 1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(), 2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(), 1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(), 2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008, 0, 1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008, 0, 6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008, 0, 7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008, 0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008, 0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003, 0, 1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003, 0, 5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003, 0, 6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003, 0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003, 0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009, 0, 1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009, 0, 4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009, 0, 5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009, 0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009, 0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010, 0, 1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010, 0, 3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010, 0, 4]).week(), 1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010, 0, 10]).week(), 1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010, 0, 11]).week(), 2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011, 0, 1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011, 0, 2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011, 0, 3]).week(), 1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011, 0, 9]).week(), 1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011, 0, 10]).week(), 2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).format('w ww wo'), '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).format('w ww wo'), '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('de');
+
+    test('parse', function (assert) {
+        var tests = 'Januar Jan._Februar Febr._März Mrz._April Apr._Mai Mai_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'Sonntag, 14. Februar 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'So., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 Februar Febr.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. Sonntag So. So'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14. Februar 2010'],
+                ['LLL',                                '14. Februar 2010 15:25'],
+                ['LLLL',                               'Sonntag, 14. Februar 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14. Febr. 2010'],
+                ['lll',                                '14. Febr. 2010 15:25'],
+                ['llll',                               'So., 14. Febr. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Januar Jan._Februar Febr._März Mrz._April Apr._Mai Mai_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Sonntag So. So_Montag Mo. Mo_Dienstag Di. Di_Mittwoch Mi. Mi_Donnerstag Do. Do_Freitag Fr. Fr_Samstag Sa. Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ein paar Sekunden',  '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'eine Minute',       '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'eine Minute',       '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 Minuten',          '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 Minuten',         '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'eine Stunde',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'eine Stunde',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 Stunden',          '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 Stunden',          '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 Stunden',         '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ein Tag',          '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ein Tag',          '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 Tage',            '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ein Tag',          '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 Tage',            '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 Tage',           '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ein Monat',        '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ein Monat',        '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ein Monat',        '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 Monate',          '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 Monate',          '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 Monate',          '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ein Monat',        '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 Monate',          '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ein Jahr',         '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 Jahre',           '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ein Jahr',         '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 Jahre',           '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'in ein paar Sekunden', 'prefix');
+        assert.equal(moment(0).from(30000), 'vor ein paar Sekunden', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'in ein paar Sekunden', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'in 5 Tagen', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Heute um 02:00 Uhr',   'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Heute um 02:25 Uhr',   'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Heute um 03:00 Uhr',   'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Morgen um 02:00 Uhr',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Heute um 01:00 Uhr',   'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Gestern um 02:00 Uhr', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [um] LT [Uhr]'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [um] LT [Uhr]'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [um] LT [Uhr]'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[letzten] dddd [um] LT [Uhr]'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[letzten] dddd [um] LT [Uhr]'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[letzten] dddd [um] LT [Uhr]'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('el');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'Ιανουάριος Ιαν_Φεβρουάριος Φεβ_Μάρτιος Μαρ_Απρίλιος Απρ_Μάιος Μαϊ_Ιούνιος Ιουν_Ιούλιος Ιουλ_Αύγουστος Αυγ_Σεπτέμβριος Σεπ_Οκτώβριος Οκτ_Νοέμβριος Νοε_Δεκέμβριος Δεκ'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('parse meridiem', function (assert) {
+        var i,
+            b = moment(),
+            meridiemTests = [
+                // h a patterns, expected hours, isValid
+                ['10 πμ',   10, true],
+                ['10 μμ',   22, true],
+                ['10 π.μ.', 10, true],
+                ['10 μ.μ.', 22, true],
+                ['10 π',    10, true],
+                ['10 μ',    22, true],
+                ['10 ΠΜ',   10, true],
+                ['10 ΜΜ',   22, true],
+                ['10 Π.Μ.', 10, true],
+                ['10 Μ.Μ.', 22, true],
+                ['10 Π',    10, true],
+                ['10 Μ',    22, true],
+                ['10 am',   10, false],
+                ['10 pm',   10, false]
+            ];
+
+        // test that a formatted moment including meridiem string can be parsed back to the same moment
+        assert.ok(b.isSame(moment(b.format('h:mm:ss a'), 'h:mm:ss a', 'el', true), 'seconds'), b.format('h:mm:ss a') + ' should be equal to ' + moment(b.format('h:mm:ss a'), 'h:mm:ss a', 'el', true).format('h:mm:ss a'));
+
+        // test that a formatted moment having a meridiem string can be parsed with strict flag
+        assert.ok(moment(b.format('h:mm:ss a'), 'h:mm:ss a', 'el', true).isValid(), b.format('h:mm:ss a') + ' should be parsed as valid');
+
+        for (i = 0; i < meridiemTests.length; i++) {
+            assert.equal(moment(meridiemTests[i][0], 'h a', 'el', true).hours(), meridiemTests[i][1], moment(meridiemTests[i][0], 'h a', 'el', true).hours() + ' should be ' + meridiemTests[i][1]);
+            assert.ok(moment(meridiemTests[i][0], 'h a', 'el', true).isValid() === meridiemTests[i][2], meridiemTests[i][0] + ' ----> ' + meridiemTests[i][2]);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Κυριακή, Φεβρουάριος 14η 2010, 3:25:50 μμ'],
+                ['dddd, D MMMM YYYY, h:mm:ss a',       'Κυριακή, 14 Φεβρουαρίου 2010, 3:25:50 μμ'],
+                ['ddd, hA',                            'Κυρ, 3ΜΜ'],
+                ['dddd, MMMM YYYY',                    'Κυριακή, Φεβρουάριος 2010'],
+                ['M Mo MM MMMM MMM',                   '2 2η 02 Φεβρουάριος Φεβ'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14η 14'],
+                ['d do dddd ddd dd',                   '0 0η Κυριακή Κυρ Κυ'],
+                ['DDD DDDo DDDD',                      '45 45η 045'],
+                ['w wo ww',                            '6 6η 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'μμ ΜΜ'],
+                ['[the] DDDo [day of the year]',       'the 45η day of the year'],
+                ['LTS',                                '3:25:50 ΜΜ'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Φεβρουαρίου 2010'],
+                ['LLL',                                '14 Φεβρουαρίου 2010 3:25 ΜΜ'],
+                ['LLLL',                               'Κυριακή, 14 Φεβρουαρίου 2010 3:25 ΜΜ'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Φεβ 2010'],
+                ['lll',                                '14 Φεβ 2010 3:25 ΜΜ'],
+                ['llll',                               'Κυρ, 14 Φεβ 2010 3:25 ΜΜ']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1η', '1η');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2η', '2η');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3η', '3η');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4η', '4η');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5η', '5η');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6η', '6η');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7η', '7η');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8η', '8η');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9η', '9η');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10η', '10η');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11η', '11η');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12η', '12η');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13η', '13η');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14η', '14η');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15η', '15η');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16η', '16η');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17η', '17η');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18η', '18η');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19η', '19η');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20η', '20η');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21η', '21η');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22η', '22η');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23η', '23η');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24η', '24η');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25η', '25η');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26η', '26η');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27η', '27η');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28η', '28η');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29η', '29η');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30η', '30η');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31η', '31η');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'Ιανουάριος Ιαν_Φεβρουάριος Φεβ_Μάρτιος Μαρ_Απρίλιος Απρ_Μάιος Μαϊ_Ιούνιος Ιουν_Ιούλιος Ιουλ_Αύγουστος Αυγ_Σεπτέμβριος Σεπ_Οκτώβριος Οκτ_Νοέμβριος Νοε_Δεκέμβριος Δεκ'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'Κυριακή Κυρ Κυ_Δευτέρα Δευ Δε_Τρίτη Τρι Τρ_Τετάρτη Τετ Τε_Πέμπτη Πεμ Πε_Παρασκευή Παρ Πα_Σάββατο Σαβ Σα'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'λίγα δευτερόλεπτα',   '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ένα λεπτό',           '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ένα λεπτό',           '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 λεπτά',             '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 λεπτά',            '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'μία ώρα',             '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'μία ώρα',             '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ώρες',              '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ώρες',              '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ώρες',             '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'μία μέρα',            '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'μία μέρα',            '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 μέρες',             '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'μία μέρα',            '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 μέρες',             '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 μέρες',            '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ένας μήνας',          '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ένας μήνας',          '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ένας μήνας',          '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 μήνες',             '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 μήνες',             '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 μήνες',             '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ένας μήνας',          '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 μήνες',             '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ένας χρόνος',         '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 χρόνια',            '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ένας χρόνος',         '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 χρόνια',            '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'σε λίγα δευτερόλεπτα',  'prefix');
+        assert.equal(moment(0).from(30000), 'λίγα δευτερόλεπτα πριν', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'λίγα δευτερόλεπτα πριν',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'σε λίγα δευτερόλεπτα', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'σε 5 μέρες', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Σήμερα στις 2:00 ΠΜ',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Σήμερα στις 2:25 ΠΜ',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Σήμερα στις 3:00 ΠΜ',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Αύριο στις 2:00 ΠΜ',      'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Σήμερα στη 1:00 ΠΜ',        'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Χθες στις 2:00 ΠΜ',       'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [' + (m.hours() % 12 === 1 ? 'στη' : 'στις') + '] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [στις] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [στις] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m, dayString;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            dayString = m.day() === 6 ? '[το προηγούμενο Σάββατο]' : '[την προηγούμενη] dddd';
+            assert.equal(m.calendar(),       m.format(dayString + ' [' + (m.hours() % 12 === 1 ? 'στη' : 'στις') + '] LT'),  'Today - ' + i + ' days current time');
+            m.hours(1).minutes(30).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(dayString + ' [στη] LT'),  'Today - ' + i + ' days one o clock');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(dayString + ' [στις] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(dayString + ' [στις] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 52, 'Dec 31 2006 should be week 52');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 30]).week(), 52, 'Dec 30 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 52, 'Dec 29 2002 should be week 52');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 52, 'Dec 28 2008 should be week 52');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 52, 'Dec 27 2009 should be week 52');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  2]).week(), 53, 'Jan  2 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  9]).week(), 1, 'Jan  9 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(), 1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(), 2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 51, 'Dec 26 2010 should be week 51');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  8]).week(), 1, 'Jan  8 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(), 1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(), 2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52η', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'),   '1 01 1η', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1η', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'),   '2 02 2η', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2η', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('en-au');
+
+    test('parse', function (assert) {
+        var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sunday, February 14th 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Sun, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2nd 02 February Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14th 14'],
+                ['d do dddd ddd dd',                   '0 0th Sunday Sun Su'],
+                ['DDD DDDo DDDD',                      '45 45th 045'],
+                ['w wo ww',                            '6 6th 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45th day of the year'],
+                ['LTS',                                '3:25:50 PM'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 February 2010'],
+                ['LLL',                                '14 February 2010 3:25 PM'],
+                ['LLLL',                               'Sunday, 14 February 2010 3:25 PM'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 3:25 PM'],
+                ['llll',                               'Sun, 14 Feb 2010 3:25 PM']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3rd', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4th', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5th', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6th', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7th', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8th', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9th', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10th', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11th', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12th', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13th', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14th', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15th', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16th', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17th', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18th', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19th', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20th', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21st', '21st');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22nd', '22nd');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23rd', '23rd');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24th', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25th', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26th', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27th', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28th', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29th', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30th', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31st', '31st');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'a few seconds', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'a minute',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'a minute',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutes',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutes',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'an hour',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'an hour',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 hours',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 hours',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 hours',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'a day',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'a day',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 days',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'a day',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 days',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 days',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'a month',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'a month',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'a month',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 months',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 months',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 months',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'a month',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 months',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'a year',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 years',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'a year',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 years',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'in a few seconds',  'prefix');
+        assert.equal(moment(0).from(30000), 'a few seconds ago', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'a few seconds ago',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'in a few seconds', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'in 5 days', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Today at 2:00 AM',      'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Today at 2:25 AM',      'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Today at 3:00 AM',      'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Tomorrow at 2:00 AM',   'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Today at 1:00 AM',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Yesterday at 2:00 AM',  'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52nd', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1st', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1st', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2nd', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testStr;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testStr = moment(ordinalStr, 'YYYY MM Do').format('YYYY MM D');
+            assert.equal(testStr, '2014 01 ' + i, 'lenient ordinal parsing ' + i);
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testStr;
+        for (i = 1; i <= 31; ++i) {
+            testStr = moment('2014 01 ' + i, 'YYYY MM Do').format('YYYY MM D');
+            assert.equal(testStr, '2014 01 ' + i,
+                    'lenient ordinal parsing of number ' + i);
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MMM Do');
+            testMoment = moment(ordinalStr, 'YYYY MMM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('en-ca');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sunday, February 14th 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Sun, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2nd 02 February Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14th 14'],
+                ['d do dddd ddd dd',                   '0 0th Sunday Sun Su'],
+                ['DDD DDDo DDDD',                      '45 45th 045'],
+                ['w wo ww',                            '8 8th 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45th day of the year'],
+                ['L',                                  '2010-02-14'],
+                ['LTS',                                '3:25:50 PM'],
+                ['LL',                                 '14 February, 2010'],
+                ['LLL',                                '14 February, 2010 3:25 PM'],
+                ['LLLL',                               'Sunday, 14 February, 2010 3:25 PM'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14 Feb, 2010'],
+                ['lll',                                '14 Feb, 2010 3:25 PM'],
+                ['llll',                               'Sun, 14 Feb, 2010 3:25 PM']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3rd', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4th', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5th', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6th', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7th', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8th', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9th', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10th', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11th', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12th', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13th', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14th', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15th', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16th', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17th', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18th', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19th', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20th', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21st', '21st');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22nd', '22nd');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23rd', '23rd');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24th', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25th', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26th', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27th', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28th', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29th', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30th', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31st', '31st');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'a few seconds', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'a minute',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'a minute',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutes',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutes',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'an hour',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'an hour',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 hours',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 hours',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 hours',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'a day',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'a day',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 days',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'a day',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 days',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 days',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'a month',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'a month',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'a month',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 months',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 months',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 months',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'a month',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 months',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'a year',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 years',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'a year',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 years',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'in a few seconds',  'prefix');
+        assert.equal(moment(0).from(30000), 'a few seconds ago', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'a few seconds ago',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'in a few seconds', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'in 5 days', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Today at 2:00 AM',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Today at 2:25 AM',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Today at 3:00 AM',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Tomorrow at 2:00 AM',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Today at 1:00 AM',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Yesterday at 2:00 AM', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1st', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1st', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2nd', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2nd', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3rd', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('en-gb');
+
+    test('parse', function (assert) {
+        var tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sunday, February 14th 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Sun, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2nd 02 February Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14th 14'],
+                ['d do dddd ddd dd',                   '0 0th Sunday Sun Su'],
+                ['DDD DDDo DDDD',                      '45 45th 045'],
+                ['w wo ww',                            '6 6th 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45th day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 February 2010'],
+                ['LLL',                                '14 February 2010 15:25'],
+                ['LLLL',                               'Sunday, 14 February 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 15:25'],
+                ['llll',                               'Sun, 14 Feb 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3rd', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4th', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5th', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6th', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7th', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8th', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9th', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10th', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11th', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12th', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13th', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14th', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15th', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16th', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17th', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18th', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19th', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20th', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21st', '21st');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22nd', '22nd');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23rd', '23rd');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24th', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25th', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26th', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27th', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28th', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29th', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30th', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31st', '31st');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'a few seconds', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'a minute',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'a minute',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutes',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutes',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'an hour',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'an hour',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 hours',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 hours',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 hours',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'a day',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'a day',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 days',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'a day',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 days',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 days',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'a month',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'a month',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'a month',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 months',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 months',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 months',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'a month',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 months',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'a year',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 years',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'a year',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 years',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'in a few seconds',  'prefix');
+        assert.equal(moment(0).from(30000), 'a few seconds ago', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'a few seconds ago',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'in a few seconds', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'in 5 days', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Today at 02:00',      'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Today at 02:25',      'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Today at 03:00',      'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Tomorrow at 02:00',   'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Today at 01:00',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Yesterday at 02:00',  'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52nd', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1st', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1st', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2nd', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2nd', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('en');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Sunday, February 14th 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Sun, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2nd 02 February Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14th 14'],
+                ['d do dddd ddd dd',                   '0 0th Sunday Sun Su'],
+                ['DDD DDDo DDDD',                      '45 45th 045'],
+                ['w wo ww',                            '8 8th 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45th day of the year'],
+                ['LTS',                                '3:25:50 PM'],
+                ['L',                                  '02/14/2010'],
+                ['LL',                                 'February 14, 2010'],
+                ['LLL',                                'February 14, 2010 3:25 PM'],
+                ['LLLL',                               'Sunday, February 14, 2010 3:25 PM'],
+                ['l',                                  '2/14/2010'],
+                ['ll',                                 'Feb 14, 2010'],
+                ['lll',                                'Feb 14, 2010 3:25 PM'],
+                ['llll',                               'Sun, Feb 14, 2010 3:25 PM']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1st', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2nd', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3rd', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4th', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5th', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6th', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7th', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8th', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9th', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10th', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11th', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12th', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13th', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14th', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15th', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16th', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17th', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18th', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19th', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20th', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21st', '21st');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22nd', '22nd');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23rd', '23rd');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24th', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25th', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26th', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27th', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28th', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29th', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30th', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31st', '31st');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'January Jan_February Feb_March Mar_April Apr_May May_June Jun_July Jul_August Aug_September Sep_October Oct_November Nov_December Dec'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'Sunday Sun Su_Monday Mon Mo_Tuesday Tue Tu_Wednesday Wed We_Thursday Thu Th_Friday Fri Fr_Saturday Sat Sa'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'a few seconds', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'a minute',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'a minute',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutes',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutes',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'an hour',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'an hour',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 hours',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 hours',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 hours',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'a day',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'a day',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 days',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'a day',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 days',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 days',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'a month',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'a month',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'a month',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 months',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 months',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 months',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'a month',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 months',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'a year',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 years',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'a year',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 years',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'in a few seconds',  'prefix');
+        assert.equal(moment(0).from(30000), 'a few seconds ago', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'a few seconds ago',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'in a few seconds', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'in 5 days', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Today at 2:00 AM',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Today at 2:25 AM',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Today at 3:00 AM',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Tomorrow at 2:00 AM',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Today at 1:00 AM',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Yesterday at 2:00 AM', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [at] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Last] dddd [at] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1st', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1st', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2nd', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2nd', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3rd', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('eo');
+
+    test('parse', function (assert) {
+        var tests = 'januaro jan_februaro feb_marto mar_aprilo apr_majo maj_junio jun_julio jul_aŭgusto aŭg_septembro sep_oktobro okt_novembro nov_decembro dec'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Dimanĉo, februaro 14a 2010, 3:25:50 p.t.m.'],
+                ['ddd, hA',                            'Dim, 3P.T.M.'],
+                ['M Mo MM MMMM MMM',                   '2 2a 02 februaro feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14a 14'],
+                ['d do dddd ddd dd',                   '0 0a Dimanĉo Dim Di'],
+                ['DDD DDDo DDDD',                      '45 45a 045'],
+                ['w wo ww',                            '7 7a 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'p.t.m. P.T.M.'],
+                ['[la] DDDo [tago] [de] [la] [jaro]',  'la 45a tago de la jaro'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '2010-02-14'],
+                ['LL',                                 '14-an de februaro, 2010'],
+                ['LLL',                                '14-an de februaro, 2010 15:25'],
+                ['LLLL',                               'Dimanĉo, la 14-an de februaro, 2010 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14-an de feb, 2010'],
+                ['lll',                                '14-an de feb, 2010 15:25'],
+                ['llll',                               'Dim, la 14-an de feb, 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1a', '1a');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2a', '2a');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3a', '3a');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4a', '4a');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5a', '5a');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6a', '6a');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7a', '7a');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8a', '8a');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9a', '9a');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10a', '10a');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11a', '11a');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12a', '12a');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13a', '13a');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14a', '14a');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15a', '15a');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16a', '16a');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17a', '17a');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18a', '18a');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19a', '19a');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20a', '20a');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21a', '21a');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22a', '22a');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23a', '23a');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24a', '24a');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25a', '25a');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26a', '26a');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27a', '27a');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28a', '28a');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29a', '29a');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30a', '30a');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31a', '31a');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januaro jan_februaro feb_marto mar_aprilo apr_majo maj_junio jun_julio jul_aŭgusto aŭg_septembro sep_oktobro okt_novembro nov_decembro dec'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Dimanĉo Dim Di_Lundo Lun Lu_Mardo Mard Ma_Merkredo Merk Me_Ĵaŭdo Ĵaŭ Ĵa_Vendredo Ven Ve_Sabato Sab Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'sekundoj', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minuto',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minuto',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutoj',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutoj',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'horo',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'horo',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 horoj',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 horoj',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 horoj',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'tago',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'tago',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 tagoj',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'tago',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 tagoj',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 tagoj',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'monato',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'monato',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'monato',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 monatoj',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 monatoj',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 monatoj',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'monato',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 monatoj',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'jaro',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 jaroj',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'jaro',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 jaroj',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'je sekundoj',  'je prefix');
+        assert.equal(moment(0).from(30000), 'antaŭ sekundoj', 'antaŭ prefix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'antaŭ sekundoj',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'je sekundoj', 'je sekundoj');
+        assert.equal(moment().add({d: 5}).fromNow(), 'je 5 tagoj', 'je 5 tagoj');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Hodiaŭ je 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Hodiaŭ je 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Hodiaŭ je 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Morgaŭ je 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hodiaŭ je 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Hieraŭ je 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [je] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [je] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [je] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[pasinta] dddd [je] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[pasinta] dddd [je] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[pasinta] dddd [je] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1a', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1a', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2a', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2a', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3a', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('es');
+
+    test('parse', function (assert) {
+        var tests = 'enero ene._febrero feb._marzo mar._abril abr._mayo may._junio jun._julio jul._agosto ago._septiembre sep._octubre oct._noviembre nov._diciembre dic.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domingo, Febrero 14º 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Dom., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2º 02 Febrero Feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14º 14'],
+                ['d do dddd ddd dd',                   '0 0º Domingo Dom. Do'],
+                ['DDD DDDo DDDD',                      '45 45º 045'],
+                ['w wo ww',                            '6 6º 06'],
+                ['YYYY-MMM-DD',                        '2010-Feb-14'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45º day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 de Febrero de 2010'],
+                ['LLL',                                '14 de Febrero de 2010 15:25'],
+                ['LLLL',                               'Domingo, 14 de Febrero de 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 de Feb. de 2010'],
+                ['lll',                                '14 de Feb. de 2010 15:25'],
+                ['llll',                               'Dom., 14 de Feb. de 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3º', '3º');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4º', '4º');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5º', '5º');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6º', '6º');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7º', '7º');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8º', '8º');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9º', '9º');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10º', '10º');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11º', '11º');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12º', '12º');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13º', '13º');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14º', '14º');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15º', '15º');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16º', '16º');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17º', '17º');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18º', '18º');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19º', '19º');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20º', '20º');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21º', '21º');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22º', '22º');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23º', '23º');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24º', '24º');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25º', '25º');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26º', '26º');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27º', '27º');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28º', '28º');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29º', '29º');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30º', '30º');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31º', '31º');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Enero Ene._Febrero Feb._Marzo Mar._Abril Abr._Mayo May._Junio Jun._Julio Jul._Agosto Ago._Septiembre Sep._Octubre Oct._Noviembre Nov._Diciembre Dic.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Domingo Dom. Do_Lunes Lun. Lu_Martes Mar. Ma_Miércoles Mié. Mi_Jueves Jue. Ju_Viernes Vie. Vi_Sábado Sáb. Sá'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'unos segundos', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'un minuto',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'un minuto',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutos',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutos',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'una hora',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'una hora',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 horas',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 horas',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 horas',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'un día',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'un día',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 días',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'un día',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 días',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 días',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'un mes',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'un mes',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'un mes',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 meses',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 meses',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 meses',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'un mes',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 meses',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'un año',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 años',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'un año',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 años',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'en unos segundos',  'prefix');
+        assert.equal(moment(0).from(30000), 'hace unos segundos', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'hace unos segundos',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'en unos segundos', 'en unos segundos');
+        assert.equal(moment().add({d: 5}).fromNow(), 'en 5 días', 'en 5 días');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                         'hoy a las 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),          'hoy a las 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),           'hoy a las 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),           'mañana a las 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).add({d: 1, h : -1}).calendar(),   'mañana a la 1:00',   'tomorrow minus 1 hour');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),      'hoy a la 1:00',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),      'ayer a las 2:00',    'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [a la' + ((m.hours() !== 1) ? 's' : '') + '] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [a la' + ((m.hours() !== 1) ? 's' : '') + '] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [a la' + ((m.hours() !== 1) ? 's' : '') + '] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[el] dddd [pasado a la' + ((m.hours() !== 1) ? 's' : '') + '] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[el] dddd [pasado a la' + ((m.hours() !== 1) ? 's' : '') + '] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[el] dddd [pasado a la' + ((m.hours() !== 1) ? 's' : '') + '] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52º', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1º', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1º', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2º', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2º', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('et');
+
+    test('parse', function (assert) {
+        var tests = 'jaanuar jaan_veebruar veebr_märts märts_aprill apr_mai mai_juuni juuni_juuli juuli_august aug_september sept_oktoober okt_november nov_detsember dets'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' peaks olema kuu ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, H:mm:ss',      'pühapäev, 14. veebruar 2010, 15:25:50'],
+                ['ddd, h',                           'P, 3'],
+                ['M Mo MM MMMM MMM',                 '2 2. 02 veebruar veebr'],
+                ['YYYY YY',                          '2010 10'],
+                ['D Do DD',                          '14 14. 14'],
+                ['d do dddd ddd dd',                 '0 0. pühapäev P P'],
+                ['DDD DDDo DDDD',                    '45 45. 045'],
+                ['w wo ww',                          '6 6. 06'],
+                ['h hh',                             '3 03'],
+                ['H HH',                             '15 15'],
+                ['m mm',                             '25 25'],
+                ['s ss',                             '50 50'],
+                ['a A',                              'pm PM'],
+                ['[aasta] DDDo [päev]',              'aasta 45. päev'],
+                ['LTS',                              '15:25:50'],
+                ['L',                                '14.02.2010'],
+                ['LL',                               '14. veebruar 2010'],
+                ['LLL',                              '14. veebruar 2010 15:25'],
+                ['LLLL',                             'pühapäev, 14. veebruar 2010 15:25'],
+                ['l',                                '14.2.2010'],
+                ['ll',                               '14. veebr 2010'],
+                ['lll',                              '14. veebr 2010 15:25'],
+                ['llll',                             'P, 14. veebr 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'jaanuar jaan_veebruar veebr_märts märts_aprill apr_mai mai_juuni juuni_juuli juuli_august aug_september sept_oktoober okt_november nov_detsember dets'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'pühapäev P P_esmaspäev E E_teisipäev T T_kolmapäev K K_neljapäev N N_reede R R_laupäev L L'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'paar sekundit',  '44 seconds = paar sekundit');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'üks minut',      '45 seconds = üks minut');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'üks minut',      '89 seconds = üks minut');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutit',      '90 seconds = 2 minutit');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutit',     '44 minutes = 44 minutit');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'üks tund',       '45 minutes = tund aega');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'üks tund',       '89 minutes = üks tund');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 tundi',        '90 minutes = 2 tundi');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 tundi',        '5 hours = 5 tundi');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 tundi',       '21 hours = 21 tundi');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'üks päev',       '22 hours = üks päev');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'üks päev',       '35 hours = üks päev');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 päeva',        '36 hours = 2 päeva');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'üks päev',       '1 day = üks päev');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 päeva',        '5 days = 5 päeva');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 päeva',       '25 days = 25 päeva');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'üks kuu',        '26 days = üks kuu');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'üks kuu',        '30 days = üks kuu');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'üks kuu',        '43 days = üks kuu');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 kuud',         '46 days = 2 kuud');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 kuud',         '75 days = 2 kuud');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 kuud',         '76 days = 3 kuud');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'üks kuu',        '1 month = üks kuu');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 kuud',         '5 months = 5 kuud');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'üks aasta',      '345 days = üks aasta');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 aastat',       '548 days = 2 aastat');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'üks aasta',      '1 year = üks aasta');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 aastat',       '5 years = 5 aastat');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'mõne sekundi pärast',  'prefix');
+        assert.equal(moment(0).from(30000), 'mõni sekund tagasi', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'mõni sekund tagasi',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'mõne sekundi pärast', 'in a few seconds');
+        assert.equal(moment().subtract({s: 30}).fromNow(), 'mõni sekund tagasi', 'a few seconds ago');
+
+        assert.equal(moment().add({m: 1}).fromNow(), 'ühe minuti pärast', 'in a minute');
+        assert.equal(moment().subtract({m: 1}).fromNow(), 'üks minut tagasi', 'a minute ago');
+
+        assert.equal(moment().add({m: 5}).fromNow(), '5 minuti pärast', 'in 5 minutes');
+        assert.equal(moment().subtract({m: 5}).fromNow(), '5 minutit tagasi', '5 minutes ago');
+
+        assert.equal(moment().add({d: 1}).fromNow(), 'ühe päeva pärast', 'in one day');
+        assert.equal(moment().subtract({d: 1}).fromNow(), 'üks päev tagasi', 'one day ago');
+
+        assert.equal(moment().add({d: 5}).fromNow(), '5 päeva pärast', 'in 5 days');
+        assert.equal(moment().subtract({d: 5}).fromNow(), '5 päeva tagasi', '5 days ago');
+
+        assert.equal(moment().add({M: 1}).fromNow(), 'kuu aja pärast', 'in a month');
+        assert.equal(moment().subtract({M: 1}).fromNow(), 'kuu aega tagasi', 'a month ago');
+
+        assert.equal(moment().add({M: 5}).fromNow(), '5 kuu pärast', 'in 5 months');
+        assert.equal(moment().subtract({M: 5}).fromNow(), '5 kuud tagasi', '5 months ago');
+
+        assert.equal(moment().add({y: 1}).fromNow(), 'ühe aasta pärast', 'in a year');
+        assert.equal(moment().subtract({y: 1}).fromNow(), 'aasta tagasi', 'a year ago');
+
+        assert.equal(moment().add({y: 5}).fromNow(), '5 aasta pärast', 'in 5 years');
+        assert.equal(moment().subtract({y: 5}).fromNow(), '5 aastat tagasi', '5 years ago');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Täna, 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Täna, 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Täna, 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Homme, 2:00',    'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Täna, 1:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Eile, 2:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[Järgmine] dddd LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Järgmine] dddd LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Järgmine] dddd LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Eelmine] dddd LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Eelmine] dddd LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Eelmine] dddd LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 nädal tagasi');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  '1 nädala pärast');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 nädalat tagasi');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  '2 nädala pärast');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('eu');
+
+    test('parse', function (assert) {
+        var tests = 'urtarrila urt._otsaila ots._martxoa mar._apirila api._maiatza mai._ekaina eka._uztaila uzt._abuztua abu._iraila ira._urria urr._azaroa aza._abendua abe.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'igandea, otsaila 14. 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'ig., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 otsaila ots.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. igandea ig. ig'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '2010-02-14'],
+                ['LL',                                 '2010ko otsailaren 14a'],
+                ['LLL',                                '2010ko otsailaren 14a 15:25'],
+                ['LLLL',                               'igandea, 2010ko otsailaren 14a 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '2010ko ots. 14a'],
+                ['lll',                                '2010ko ots. 14a 15:25'],
+                ['llll',                               'ig., 2010ko ots. 14a 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'urtarrila urt._otsaila ots._martxoa mar._apirila api._maiatza mai._ekaina eka._uztaila uzt._abuztua abu._iraila ira._urria urr._azaroa aza._abendua abe.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'igandea ig. ig_astelehena al. al_asteartea ar. ar_asteazkena az. az_osteguna og. og_ostirala ol. ol_larunbata lr. lr'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'segundo batzuk', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minutu bat',     '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minutu bat',     '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutu',       '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutu',      '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ordu bat',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ordu bat',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ordu',         '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ordu',         '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ordu',        '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'egun bat',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'egun bat',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 egun',         '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'egun bat',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 egun',         '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 egun',        '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'hilabete bat',   '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'hilabete bat',   '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'hilabete bat',   '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 hilabete',     '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 hilabete',     '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 hilabete',     '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'hilabete bat',   '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 hilabete',     '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'urte bat',       '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 urte',         '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'urte bat',       '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 urte',         '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'segundo batzuk barru',  'prefix');
+        assert.equal(moment(0).from(30000), 'duela segundo batzuk', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'duela segundo batzuk',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'segundo batzuk barru', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 egun barru', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'gaur 02:00etan',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'gaur 02:25etan',  'now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'gaur 03:00etan',  'now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'bihar 02:00etan', 'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'gaur 01:00etan',  'now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'atzo 02:00etan',  'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd LT[etan]'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd LT[etan]'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd LT[etan]'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[aurreko] dddd LT[etan]'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[aurreko] dddd LT[etan]'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[aurreko] dddd LT[etan]'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('fa');
+
+    test('parse', function (assert) {
+        var tests = 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1) + ' instead is month ' + moment(input, mmm).month());
+        }
+        for (i = 0; i < 12; i++) {
+            equalTest(tests[i], 'MMM', i);
+            equalTest(tests[i], 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'یک\u200cشنبه، فوریه ۱۴م ۲۰۱۰، ۳:۲۵:۵۰ بعد از ظهر'],
+                ['ddd, hA',                            'یک\u200cشنبه، ۳بعد از ظهر'],
+                ['M Mo MM MMMM MMM',                   '۲ ۲م ۰۲ فوریه فوریه'],
+                ['YYYY YY',                            '۲۰۱۰ ۱۰'],
+                ['D Do DD',                            '۱۴ ۱۴م ۱۴'],
+                ['d do dddd ddd dd',                   '۰ ۰م یک\u200cشنبه یک\u200cشنبه ی'],
+                ['DDD DDDo DDDD',                      '۴۵ ۴۵م ۰۴۵'],
+                ['w wo ww',                            '۸ ۸م ۰۸'],
+                ['h hh',                               '۳ ۰۳'],
+                ['H HH',                               '۱۵ ۱۵'],
+                ['m mm',                               '۲۵ ۲۵'],
+                ['s ss',                               '۵۰ ۵۰'],
+                ['a A',                                'بعد از ظهر بعد از ظهر'],
+                ['DDDo [روز سال]',             '۴۵م روز سال'],
+                ['LTS',                                '۱۵:۲۵:۵۰'],
+                ['L',                                  '۱۴/۰۲/۲۰۱۰'],
+                ['LL',                                 '۱۴ فوریه ۲۰۱۰'],
+                ['LLL',                                '۱۴ فوریه ۲۰۱۰ ۱۵:۲۵'],
+                ['LLLL',                               'یک\u200cشنبه، ۱۴ فوریه ۲۰۱۰ ۱۵:۲۵'],
+                ['l',                                  '۱۴/۲/۲۰۱۰'],
+                ['ll',                                 '۱۴ فوریه ۲۰۱۰'],
+                ['lll',                                '۱۴ فوریه ۲۰۱۰ ۱۵:۲۵'],
+                ['llll',                               'یک\u200cشنبه، ۱۴ فوریه ۲۰۱۰ ۱۵:۲۵']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '۱م', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '۲م', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '۳م', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '۴م', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '۵م', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '۶م', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '۷م', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '۸م', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '۹م', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '۱۰م', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '۱۱م', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '۱۲م', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '۱۳م', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '۱۴م', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '۱۵م', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '۱۶م', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '۱۷م', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '۱۸م', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '۱۹م', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '۲۰م', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '۲۱م', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '۲۲م', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '۲۳م', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '۲۴م', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '۲۵م', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '۲۶م', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '۲۷م', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '۲۸م', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '۲۹م', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '۳۰م', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '۳۱م', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ژانویه ژانویه_فوریه فوریه_مارس مارس_آوریل آوریل_مه مه_ژوئن ژوئن_ژوئیه ژوئیه_اوت اوت_سپتامبر سپتامبر_اکتبر اکتبر_نوامبر نوامبر_دسامبر دسامبر'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'یک\u200cشنبه یک\u200cشنبه ی_دوشنبه دوشنبه د_سه\u200cشنبه سه\u200cشنبه س_چهارشنبه چهارشنبه چ_پنج\u200cشنبه پنج\u200cشنبه پ_جمعه جمعه ج_شنبه شنبه ش'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'چندین ثانیه', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'یک دقیقه',       '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'یک دقیقه',       '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '۲ دقیقه',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '۴۴ دقیقه',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'یک ساعت',     '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'یک ساعت',     '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '۲ ساعت',      '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '۵ ساعت',      '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '۲۱ ساعت',     '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'یک روز',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'یک روز',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '۲ روز',       '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'یک روز',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '۵ روز',       '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '۲۵ روز',      '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'یک ماه',      '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'یک ماه',      '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'یک ماه',      '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '۲ ماه',       '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '۲ ماه',       '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '۳ ماه',       '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'یک ماه',      '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '۵ ماه',       '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'یک سال',      '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '۲ سال',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'یک سال',      '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '۵ سال',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'در چندین ثانیه', 'prefix');
+        assert.equal(moment(0).from(30000), 'چندین ثانیه پیش', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'چندین ثانیه پیش',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'در چندین ثانیه', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'در ۵ روز', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'امروز ساعت ۰۲:۰۰', 'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'امروز ساعت ۰۲:۲۵', 'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'امروز ساعت ۰۳:۰۰', 'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'فردا ساعت ۰۲:۰۰', 'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'امروز ساعت ۰۱:۰۰', 'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'دیروز ساعت ۰۲:۰۰', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [ساعت] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [ساعت] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [ساعت] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [پیش ساعت] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [پیش ساعت] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [پیش ساعت] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 31]).week(), 1, 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).week(), 1, 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).week(), 2, 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).week(), 2, 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).week(), 3, 'Jan 14 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 30]).week(), 1, 'Dec 30 2006 should be week 1');
+        assert.equal(moment([2007,  0,  5]).week(), 1, 'Jan  5 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 2, 'Jan  6 2007 should be week 2');
+        assert.equal(moment([2007,  0, 12]).week(), 2, 'Jan 12 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 3, 'Jan 13 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 1, 'Dec 29 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  4]).week(), 1, 'Jan  4 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 2, 'Jan  5 2008 should be week 2');
+        assert.equal(moment([2008,  0, 11]).week(), 2, 'Jan 11 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 3, 'Jan 12 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 28]).week(), 1, 'Dec 28 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  3]).week(), 1, 'Jan  3 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 2, 'Jan  4 2003 should be week 2');
+        assert.equal(moment([2003,  0, 10]).week(), 2, 'Jan 10 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 3, 'Jan 11 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 27]).week(), 1, 'Dec 27 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  2]).week(), 1, 'Jan  2 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 2, 'Jan  3 2009 should be week 2');
+        assert.equal(moment([2009,  0,  9]).week(), 2, 'Jan  9 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 3, 'Jan 10 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 26]).week(), 1, 'Dec 26 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 2, 'Jan  2 2010 should be week 2');
+        assert.equal(moment([2010,  0,  8]).week(), 2, 'Jan  8 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 3, 'Jan  9 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2011, 0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011, 0,  7]).week(), 1, 'Jan  7 2011 should be week 1');
+        assert.equal(moment([2011, 0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011, 0, 14]).week(), 2, 'Jan 14 2011 should be week 2');
+        assert.equal(moment([2011, 0, 15]).week(), 3, 'Jan 15 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 31]).format('w ww wo'), '۱ ۰۱ ۱م', 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).format('w ww wo'), '۱ ۰۱ ۱م', 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).format('w ww wo'), '۲ ۰۲ ۲م', 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).format('w ww wo'), '۲ ۰۲ ۲م', 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).format('w ww wo'), '۳ ۰۳ ۳م', 'Jan 14 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('fi');
+
+    test('parse', function (assert) {
+        var tests = 'tammikuu tammi_helmikuu helmi_maaliskuu maalis_huhtikuu huhti_toukokuu touko_kesäkuu kesä_heinäkuu heinä_elokuu elo_syyskuu syys_lokakuu loka_marraskuu marras_joulukuu joulu'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'sunnuntai, helmikuu 14. 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'su, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 helmikuu helmi'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. sunnuntai su su'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[vuoden] DDDo [päivä]',              'vuoden 45. päivä'],
+                ['LTS',                                '15.25.50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14. helmikuuta 2010'],
+                ['LLL',                                '14. helmikuuta 2010, klo 15.25'],
+                ['LLLL',                               'sunnuntai, 14. helmikuuta 2010, klo 15.25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14. helmi 2010'],
+                ['lll',                                '14. helmi 2010, klo 15.25'],
+                ['llll',                               'su, 14. helmi 2010, klo 15.25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21st');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22nd');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23rd');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31st');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'tammikuu tammi_helmikuu helmi_maaliskuu maalis_huhtikuu huhti_toukokuu touko_kesäkuu kesä_heinäkuu heinä_elokuu elo_syyskuu syys_lokakuu loka_marraskuu marras_joulukuu joulu'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'sunnuntai su su_maanantai ma ma_tiistai ti ti_keskiviikko ke ke_torstai to to_perjantai pe pe_lauantai la la'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'muutama sekunti', '44 seconds = few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minuutti',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minuutti',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  'kaksi minuuttia',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuuttia',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'tunti',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'tunti',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  'kaksi tuntia',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   'viisi tuntia',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 tuntia',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'päivä',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'päivä',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  'kaksi päivää',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'päivä',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   'viisi päivää',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 päivää',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'kuukausi',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'kuukausi',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'kuukausi',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  'kaksi kuukautta',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  'kaksi kuukautta',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  'kolme kuukautta',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'kuukausi',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   'viisi kuukautta',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'vuosi',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), 'kaksi vuotta',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'vuosi',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   'viisi vuotta',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'muutaman sekunnin päästä',  'prefix');
+        assert.equal(moment(0).from(30000), 'muutama sekunti sitten', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'muutama sekunti sitten',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'muutaman sekunnin päästä', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'viiden päivän päästä', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'tänään klo 02.00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'tänään klo 02.25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'tänään klo 03.00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'huomenna klo 02.00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'tänään klo 01.00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'eilen klo 02.00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [klo] LT'),  'today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [klo] LT'),  'today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [klo] LT'),  'today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[viime] dddd[na] [klo] LT'),  'today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[viime] dddd[na] [klo] LT'),  'today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[viime] dddd[na] [klo] LT'),  'today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  'yksi viikko sitten');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'yhden viikon päästä');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  'kaksi viikkoa sitten');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'kaden viikon päästä');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('fo');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan_februar feb_mars mar_apríl apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd [tann] Do MMMM YYYY, h:mm:ss a', 'sunnudagur tann 14. februar 2010, 3:25:50 pm'],
+                ['ddd hA',                             'sun 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. sunnudagur sun su'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[tann] DDDo [dagin á árinum]',       'tann 45. dagin á árinum'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 februar 2010'],
+                ['LLL',                                '14 februar 2010 15:25'],
+                ['LLLL',                               'sunnudagur 14. februar, 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 feb 2010'],
+                ['lll',                                '14 feb 2010 15:25'],
+                ['llll',                               'sun 14. feb, 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan_februar feb_mars mar_apríl apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'sunnudagur sun su_mánadagur mán má_týsdagur týs tý_mikudagur mik mi_hósdagur hós hó_fríggjadagur frí fr_leygardagur ley le'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'fá sekund', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ein minutt',    '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ein minutt',    '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuttir',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuttir', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ein tími',     '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ein tími',     '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 tímar',     '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 tímar',     '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 tímar',    '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ein dagur',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ein dagur',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dagar',      '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ein dagur',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dagar',      '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dagar',     '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ein mánaði',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ein mánaði',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ein mánaði',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mánaðir',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mánaðir',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mánaðir',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ein mánaði',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mánaðir',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'eitt ár',       '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ár',        '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'eitt ár',       '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ár',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'um fá sekund',  'prefix');
+        assert.equal(moment(0).from(30000), 'fá sekund síðani', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'fá sekund síðani',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'um fá sekund', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'um 5 dagar', 'in 5 days');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('fr-ca');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'dimanche, février 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'dim., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 février févr.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 dimanche dim. Di'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '2010-02-14'],
+                ['LL',                                 '14 février 2010'],
+                ['LLL',                                '14 février 2010 15:25'],
+                ['LLLL',                               'dimanche 14 février 2010 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14 févr. 2010'],
+                ['lll',                                '14 févr. 2010 15:25'],
+                ['llll',                               'dim. 14 févr. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1er', '1er');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'dimanche dim. Di_lundi lun. Lu_mardi mar. Ma_mercredi mer. Me_jeudi jeu. Je_vendredi ven. Ve_samedi sam. Sa'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'quelques secondes', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'une minute',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'une minute',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutes',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutes', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'une heure',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'une heure',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 heures',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 heures',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 heures',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'un jour',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'un jour',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 jours',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'un jour',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 jours',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 jours',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'un mois',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'un mois',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'un mois',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mois',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mois',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mois',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'un mois',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mois',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'un an',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ans',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'un an',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ans',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'dans quelques secondes', 'prefix');
+        assert.equal(moment(0).from(30000), 'il y a quelques secondes', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'dans quelques secondes', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'dans 5 jours', 'in 5 days');
+    });
+
+    test('same day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Aujourd\'hui à 02:00',    'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Aujourd\'hui à 02:25',    'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Aujourd\'hui à 03:00',    'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Demain à 02:00',         'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Aujourd\'hui à 01:00',    'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Hier à 02:00',           'yesterday at the same time');
+    });
+
+    test('same next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [à] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [à] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [à] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('same last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [dernier à] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [dernier à] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [dernier à] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('same all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1er', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1er', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('fr');
+
+    test('parse', function (assert) {
+        var tests = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'dimanche, février 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'dim., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 février févr.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 dimanche dim. Di'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '6 6 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 février 2010'],
+                ['LLL',                                '14 février 2010 15:25'],
+                ['LLLL',                               'dimanche 14 février 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 févr. 2010'],
+                ['lll',                                '14 févr. 2010 15:25'],
+                ['llll',                               'dim. 14 févr. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1er', '1er');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'janvier janv._février févr._mars mars_avril avr._mai mai_juin juin_juillet juil._août août_septembre sept._octobre oct._novembre nov._décembre déc.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'dimanche dim. Di_lundi lun. Lu_mardi mar. Ma_mercredi mer. Me_jeudi jeu. Je_vendredi ven. Ve_samedi sam. Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'quelques secondes', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'une minute',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'une minute',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutes',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutes', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'une heure',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'une heure',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 heures',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 heures',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 heures',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'un jour',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'un jour',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 jours',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'un jour',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 jours',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 jours',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'un mois',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'un mois',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'un mois',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mois',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mois',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mois',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'un mois',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mois',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'un an',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ans',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'un an',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ans',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'dans quelques secondes', 'prefix');
+        assert.equal(moment(0).from(30000), 'il y a quelques secondes', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'dans quelques secondes', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'dans 5 jours', 'in 5 days');
+    });
+
+    test('same day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Aujourd\'hui à 02:00',    'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Aujourd\'hui à 02:25',    'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Aujourd\'hui à 03:00',    'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Demain à 02:00',         'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Aujourd\'hui à 01:00',    'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Hier à 02:00',           'yesterday at the same time');
+    });
+
+    test('same next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [à] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [à] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [à] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('same last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [dernier à] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [dernier à] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [dernier à] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('same all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'), '1 01 1er', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '1 01 1er', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('fy');
+
+    test('parse', function (assert) {
+        var tests = 'jannewaris jan._febrewaris feb._maart mrt._april apr._maaie mai._juny jun._july jul._augustus aug._septimber sep._oktober okt._novimber nov._desimber des.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, HH:mm:ss',       'snein, febrewaris 14de 2010, 15:25:50'],
+                ['ddd, HH',                            'si., 15'],
+                ['M Mo MM MMMM MMM',                   '2 2de 02 febrewaris feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14de 14'],
+                ['d do dddd ddd dd',                   '0 0de snein si. Si'],
+                ['DDD DDDo DDDD',                      '45 45ste 045'],
+                ['w wo ww',                            '6 6de 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45ste day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14-02-2010'],
+                ['LL',                                 '14 febrewaris 2010'],
+                ['LLL',                                '14 febrewaris 2010 15:25'],
+                ['LLLL',                               'snein 14 febrewaris 2010 15:25'],
+                ['l',                                  '14-2-2010'],
+                ['ll',                                 '14 feb. 2010'],
+                ['lll',                                '14 feb. 2010 15:25'],
+                ['llll',                               'si. 14 feb. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1ste', '1ste');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2de', '2de');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3de', '3de');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4de', '4de');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5de', '5de');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6de', '6de');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7de', '7de');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8ste', '8ste');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9de', '9de');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10de', '10de');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11de', '11de');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12de', '12de');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13de', '13de');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14de', '14de');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15de', '15de');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16de', '16de');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17de', '17de');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18de', '18de');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19de', '19de');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20ste', '20ste');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21ste', '21ste');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22ste', '22ste');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23ste', '23ste');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24ste', '24ste');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25ste', '25ste');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26ste', '26ste');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27ste', '27ste');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28ste', '28ste');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29ste', '29ste');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30ste', '30ste');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31ste', '31ste');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'jannewaris jan._febrewaris feb._maart mrt._april apr._maaie mai_juny jun._july jul._augustus aug._septimber sep._oktober okt._novimber nov._desimber des.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'snein si. Si_moandei mo. Mo_tiisdei ti. Ti_woansdei wo. Wo_tongersdei to. To_freed fr. Fr_sneon so. So'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'in pear sekonden', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ien minút',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ien minút',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuten',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuten',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ien oere',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ien oere',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 oeren',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 oeren',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 oeren',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ien dei',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ien dei',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dagen',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ien dei',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dagen',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dagen',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ien moanne',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ien moanne',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ien moanne',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 moannen',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 moannen',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 moannen',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ien moanne',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 moannen',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ien jier',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 jierren',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ien jier',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 jierren',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'oer in pear sekonden',  'prefix');
+        assert.equal(moment(0).from(30000), 'in pear sekonden lyn', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'in pear sekonden lyn',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'oer in pear sekonden', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'oer 5 dagen', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'hjoed om 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'hjoed om 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'hjoed om 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'moarn om 02:00',    'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'hjoed om 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'juster om 02:00',   'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[ôfrûne] dddd [om] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[ôfrûne] dddd [om] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[ôfrûne] dddd [om] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('month abbreviation', function (assert) {
+        assert.equal(moment([2012, 5, 23]).format('D-MMM-YYYY'), '23-jun-2012', 'format month abbreviation surrounded by dashes should not include a dot');
+        assert.equal(moment([2012, 5, 23]).format('D MMM YYYY'), '23 jun. 2012', 'format month abbreviation not surrounded by dashes should include a dot');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52ste', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1ste', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1ste', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),    '2 02 2de', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('gl');
+
+    test('parse', function (assert) {
+        var tests = 'Xaneiro Xan._Febreiro Feb._Marzo Mar._Abril Abr._Maio Mai._Xuño Xuñ._Xullo Xul._Agosto Ago._Setembro Set._Outubro Out._Novembro Nov._Decembro Dec.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domingo, Febreiro 14º 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Dom., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2º 02 Febreiro Feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14º 14'],
+                ['d do dddd ddd dd',                   '0 0º Domingo Dom. Do'],
+                ['DDD DDDo DDDD',                      '45 45º 045'],
+                ['w wo ww',                            '7 7º 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45º day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Febreiro 2010'],
+                ['LLL',                                '14 Febreiro 2010 15:25'],
+                ['LLLL',                               'Domingo 14 Febreiro 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb. 2010'],
+                ['lll',                                '14 Feb. 2010 15:25'],
+                ['llll',                               'Dom. 14 Feb. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3º', '3º');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4º', '4º');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5º', '5º');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6º', '6º');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7º', '7º');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8º', '8º');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9º', '9º');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10º', '10º');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11º', '11º');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12º', '12º');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13º', '13º');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14º', '14º');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15º', '15º');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16º', '16º');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17º', '17º');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18º', '18º');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19º', '19º');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20º', '20º');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21º', '21º');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22º', '22º');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23º', '23º');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24º', '24º');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25º', '25º');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26º', '26º');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27º', '27º');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28º', '28º');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29º', '29º');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30º', '30º');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31º', '31º');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Xaneiro Xan._Febreiro Feb._Marzo Mar._Abril Abr._Maio Mai._Xuño Xuñ._Xullo Xul._Agosto Ago._Setembro Set._Outubro Out._Novembro Nov._Decembro Dec.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Domingo Dom. Do_Luns Lun. Lu_Martes Mar. Ma_Mércores Mér. Mé_Xoves Xov. Xo_Venres Ven. Ve_Sábado Sáb. Sá'.split('_'),
+        i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'uns segundos', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'un minuto',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'un minuto',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutos',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutos',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'unha hora',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'unha hora',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 horas',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 horas',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 horas',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'un día',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'un día',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 días',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'un día',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 días',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 días',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'un mes',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'un mes',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'un mes',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 meses',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 meses',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 meses',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'un mes',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 meses',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'un ano',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 anos',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'un ano',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 anos',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'nuns segundos',  'prefix');
+        assert.equal(moment(0).from(30000), 'hai uns segundos', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'hai uns segundos',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'nuns segundos', 'en unos segundos');
+        assert.equal(moment().add({d: 5}).fromNow(), 'en 5 días', 'en 5 días');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                         'hoxe ás 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),          'hoxe ás 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),           'hoxe ás 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),           'mañá ás 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).add({d: 1, h : -1}).calendar(),   'mañá á 1:00',   'tomorrow minus 1 hour');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),      'hoxe á 1:00',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),      'onte á 2:00',    'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [' + ((m.hours() !== 1) ? 'ás' : 'a') + '] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [' + ((m.hours() !== 1) ? 'ás' : 'a') + '] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [' + ((m.hours() !== 1) ? 'ás' : 'a') + '] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[o] dddd [pasado ' + ((m.hours() !== 1) ? 'ás' : 'a') + '] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[o] dddd [pasado ' + ((m.hours() !== 1) ? 'ás' : 'a') + '] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[o] dddd [pasado ' + ((m.hours() !== 1) ? 'ás' : 'a') + '] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('regression tests', function (assert) {
+        var lastWeek = moment().subtract({d: 4}).hours(1);
+        assert.equal(lastWeek.calendar(), lastWeek.format('[o] dddd [pasado a] LT'), '1 o\'clock bug');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1º', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1º', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2º', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2º', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3º', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('he');
+
+    test('parse', function (assert) {
+        var tests = 'ינואר ינו׳_פברואר פבר׳_מרץ מרץ_אפריל אפר׳_מאי מאי_יוני יוני_יולי יולי_אוגוסט אוג׳_ספטמבר ספט׳_אוקטובר אוק׳_נובמבר נוב׳_דצמבר דצמ׳'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'ראשון, פברואר 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'א׳, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 פברואר פבר׳'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 ראשון א׳ א'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 בפברואר 2010'],
+                ['LLL',                                '14 בפברואר 2010 15:25'],
+                ['LLLL',                               'ראשון, 14 בפברואר 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 פבר׳ 2010'],
+                ['lll',                                '14 פבר׳ 2010 15:25'],
+                ['llll',                               'א׳, 14 פבר׳ 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ינואר ינו׳_פברואר פבר׳_מרץ מרץ_אפריל אפר׳_מאי מאי_יוני יוני_יולי יולי_אוגוסט אוג׳_ספטמבר ספט׳_אוקטובר אוק׳_נובמבר נוב׳_דצמבר דצמ׳'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'ראשון א׳ א|שני ב׳ ב|שלישי ג׳ ג|רביעי ד׳ ד|חמישי ה׳ ה|שישי ו׳ ו|שבת ש׳ ש'.split('|'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'מספר שניות', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'דקה',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'דקה',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 דקות',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 דקות',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'שעה',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'שעה',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  'שעתיים',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 שעות',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 שעות',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'יום',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'יום',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  'יומיים',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'יום',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 ימים',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 ימים',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'חודש',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'חודש',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'חודש',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  'חודשיים',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  'חודשיים',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 חודשים',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'חודש',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 חודשים',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'שנה',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), 'שנתיים',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 3699}), true), '10 שנים',        '345 days = 10 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 7340}), true), '20 שנה',       '548 days = 20 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'שנה',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 שנים',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'בעוד מספר שניות',  'prefix');
+        assert.equal(moment(0).from(30000), 'לפני מספר שניות', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'לפני מספר שניות',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'בעוד מספר שניות', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'בעוד 5 ימים', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'היום ב־02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'היום ב־02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'היום ב־03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'מחר ב־02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'היום ב־01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'אתמול ב־02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [בשעה] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [בשעה] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [בשעה] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[ביום] dddd [האחרון בשעה] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[ביום] dddd [האחרון בשעה] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[ביום] dddd [האחרון בשעה] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('hi');
+
+    test('parse', function (assert) {
+        var tests = 'जनवरी जन._फ़रवरी फ़र._मार्च मार्च_अप्रैल अप्रै._मई मई_जून जून_जुलाई जुल._अगस्त अग._सितम्बर सित._अक्टूबर अक्टू._नवम्बर नव._दिसम्बर दिस.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, a h:mm:ss बजे',  'रविवार, १४ फ़रवरी २०१०, दोपहर ३:२५:५० बजे'],
+                ['ddd, a h बजे',                       'रवि, दोपहर ३ बजे'],
+                ['M Mo MM MMMM MMM',                   '२ २ ०२ फ़रवरी फ़र.'],
+                ['YYYY YY',                            '२०१० १०'],
+                ['D Do DD',                            '१४ १४ १४'],
+                ['d do dddd ddd dd',                   '० ० रविवार रवि र'],
+                ['DDD DDDo DDDD',                      '४५ ४५ ०४५'],
+                ['w wo ww',                            '८ ८ ०८'],
+                ['h hh',                               '३ ०३'],
+                ['H HH',                               '१५ १५'],
+                ['m mm',                               '२५ २५'],
+                ['s ss',                               '५० ५०'],
+                ['a A',                                'दोपहर दोपहर'],
+                ['LTS',                                'दोपहर ३:२५:५० बजे'],
+                ['L',                                  '१४/०२/२०१०'],
+                ['LL',                                 '१४ फ़रवरी २०१०'],
+                ['LLL',                                '१४ फ़रवरी २०१०, दोपहर ३:२५ बजे'],
+                ['LLLL',                               'रविवार, १४ फ़रवरी २०१०, दोपहर ३:२५ बजे'],
+                ['l',                                  '१४/२/२०१०'],
+                ['ll',                                 '१४ फ़र. २०१०'],
+                ['lll',                                '१४ फ़र. २०१०, दोपहर ३:२५ बजे'],
+                ['llll',                               'रवि, १४ फ़र. २०१०, दोपहर ३:२५ बजे']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '१', '१');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '२', '२');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '३', '३');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '४', '४');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '५', '५');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '६', '६');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '७', '७');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '८', '८');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '९', '९');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '१०', '१०');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '११', '११');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '१२', '१२');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '१३', '१३');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '१४', '१४');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '१५', '१५');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '१६', '१६');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '१७', '१७');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '१८', '१८');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '१९', '१९');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '२०', '२०');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '२१', '२१');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '२२', '२२');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '२३', '२३');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '२४', '२४');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '२५', '२५');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '२६', '२६');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '२७', '२७');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '२८', '२८');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '२९', '२९');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '३०', '३०');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '३१', '३१');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'जनवरी जन._फ़रवरी फ़र._मार्च मार्च_अप्रैल अप्रै._मई मई_जून जून_जुलाई जुल._अगस्त अग._सितम्बर सित._अक्टूबर अक्टू._नवम्बर नव._दिसम्बर दिस.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'रविवार रवि र_सोमवार सोम सो_मंगलवार मंगल मं_बुधवार बुध बु_गुरूवार गुरू गु_शुक्रवार शुक्र शु_शनिवार शनि श'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'कुछ ही क्षण', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'एक मिनट',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'एक मिनट',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '२ मिनट',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '४४ मिनट',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'एक घंटा',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'एक घंटा',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '२ घंटे',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '५ घंटे',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '२१ घंटे',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'एक दिन',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'एक दिन',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '२ दिन',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'एक दिन',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '५ दिन',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '२५ दिन',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'एक महीने',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'एक महीने',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'एक महीने',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '२ महीने',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '२ महीने',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '३ महीने',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'एक महीने',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '५ महीने',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'एक वर्ष',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '२ वर्ष',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'एक वर्ष',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '५ वर्ष',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'कुछ ही क्षण में',  'prefix');
+        assert.equal(moment(0).from(30000), 'कुछ ही क्षण पहले', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'कुछ ही क्षण पहले',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'कुछ ही क्षण में', 'कुछ ही क्षण में');
+        assert.equal(moment().add({d: 5}).fromNow(), '५ दिन में', '५ दिन में');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'आज रात २:०० बजे',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'आज रात २:२५ बजे',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 3}).calendar(),       'आज सुबह ५:०० बजे',     'Now plus 3 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'कल रात २:०० बजे',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'आज रात १:०० बजे',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'कल रात २:०० बजे', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[पिछले] dddd[,] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[पिछले] dddd[,] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[पिछले] dddd[,] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('meridiem invariant', function (assert) {
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('a'), 'रात', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('a'), 'सुबह', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('a'), 'दोपहर', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('a'), 'शाम', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('a'), 'शाम', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('a'), 'रात', 'night');
+
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('A'), 'रात', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('A'), 'सुबह', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('A'), 'दोपहर', ' during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('A'), 'शाम', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('A'), 'शाम', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('A'), 'रात', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '१ ०१ १', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '१ ०१ १', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '२ ०२ २', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '२ ०२ २', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '३ ०३ ३', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('hr');
+
+    test('parse', function (assert) {
+        var tests = 'siječanj sij._veljača velj._ožujak ožu._travanj tra._svibanj svi._lipanj lip._srpanj srp._kolovoz kol._rujan ruj._listopad lis._studeni stu._prosinac pro.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'nedjelja, 14. veljača 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'ned., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 veljača velj.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. nedjelja ned. ne'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14. 02. 2010'],
+                ['LL',                                 '14. veljača 2010'],
+                ['LLL',                                '14. veljača 2010 15:25'],
+                ['LLLL',                               'nedjelja, 14. veljača 2010 15:25'],
+                ['l',                                  '14. 2. 2010'],
+                ['ll',                                 '14. velj. 2010'],
+                ['lll',                                '14. velj. 2010 15:25'],
+                ['llll',                               'ned., 14. velj. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'siječanj sij._veljača velj._ožujak ožu._travanj tra._svibanj svi._lipanj lip._srpanj srp._kolovoz kol._rujan ruj._listopad lis._studeni stu._prosinac pro.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'nedjelja ned. ne_ponedjeljak pon. po_utorak uto. ut_srijeda sri. sr_četvrtak čet. če_petak pet. pe_subota sub. su'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'par sekundi', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'jedna minuta',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'jedna minuta',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minute',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuta',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'jedan sat',      '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'jedan sat',      '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 sata',        '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 sati',         '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 sati',        '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'dan',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'dan',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dana',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'dan',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dana',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dana',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mjesec',     '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mjesec',     '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mjesec',     '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mjeseca',     '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mjeseca',     '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mjeseca',     '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mjesec',     '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mjeseci',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'godinu',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 godine',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'godinu',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 godina',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'za par sekundi',  'prefix');
+        assert.equal(moment(0).from(30000), 'prije par sekundi', 'prefix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'prije par sekundi',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'za par sekundi', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'za 5 dana', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'danas u 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'danas u 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'danas u 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'sutra u 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'danas u 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'jučer u 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[u] [nedjelju] [u] LT';
+            case 3:
+                return '[u] [srijedu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+            case 3:
+                return '[prošlu] dddd [u] LT';
+            case 6:
+                return '[prošle] [subote] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[prošli] dddd [u] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('hu');
+
+    test('parse', function (assert) {
+        var tests = 'január jan_február feb_március márc_április ápr_május máj_június jún_július júl_augusztus aug_szeptember szept_október okt_november nov_december dec'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, HH:mm:ss',      'vasárnap, február 14. 2010, 15:25:50'],
+                ['ddd, HH',                            'vas, 15'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 február feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. vasárnap vas v'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['[az év] DDDo [napja]',               'az év 45. napja'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '2010.02.14.'],
+                ['LL',                                 '2010. február 14.'],
+                ['LLL',                                '2010. február 14., 15:25'],
+                ['LLLL',                               '2010. február 14., vasárnap 15:25'],
+                ['l',                                  '2010.2.14.'],
+                ['ll',                                 '2010. feb 14.'],
+                ['lll',                                '2010. feb 14., 15:25'],
+                ['llll',                               '2010. feb 14., vas 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  0,  0]).format('a'), 'de', 'am');
+        assert.equal(moment([2011, 2, 23, 11, 59]).format('a'), 'de', 'am');
+        assert.equal(moment([2011, 2, 23, 12,  0]).format('a'), 'du', 'pm');
+        assert.equal(moment([2011, 2, 23, 23, 59]).format('a'), 'du', 'pm');
+
+        assert.equal(moment([2011, 2, 23,  0,  0]).format('A'), 'DE', 'AM');
+        assert.equal(moment([2011, 2, 23, 11, 59]).format('A'), 'DE', 'AM');
+        assert.equal(moment([2011, 2, 23, 12,  0]).format('A'), 'DU', 'PM');
+        assert.equal(moment([2011, 2, 23, 23, 59]).format('A'), 'DU', 'PM');
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'január jan_február feb_március márc_április ápr_május máj_június jún_július júl_augusztus aug_szeptember szept_október okt_november nov_december dec'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'vasárnap vas_hétfő hét_kedd kedd_szerda sze_csütörtök csüt_péntek pén_szombat szo'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'néhány másodperc', '44 másodperc = néhány másodperc');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'egy perc',         '45 másodperc = egy perc');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'egy perc',         '89 másodperc = egy perc');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 perc',           '90 másodperc = 2 perc');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 perc',          '44 perc = 44 perc');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'egy óra',          '45 perc = egy óra');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'egy óra',          '89 perc = egy óra');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 óra',            '90 perc = 2 óra');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 óra',            '5 óra = 5 óra');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 óra',           '21 óra = 21 óra');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'egy nap',          '22 óra = egy nap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'egy nap',          '35 óra = egy nap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 nap',            '36 óra = 2 nap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'egy nap',          '1 nap = egy nap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 nap',            '5 nap = 5 nap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 nap',           '25 nap = 25 nap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'egy hónap',        '26 nap = egy hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'egy hónap',        '30 nap = egy hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'egy hónap',        '45 nap = egy hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 hónap',          '46 nap = 2 hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 hónap',          '75 nap = 2 hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 hónap',          '76 nap = 3 hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'egy hónap',        '1 hónap = egy hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 hónap',          '5 hónap = 5 hónap');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'egy év',           '345 nap = egy év');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 év',             '548 nap = 2 év');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'egy év',           '1 év = egy év');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 év',             '5 év = 5 év');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'néhány másodperc múlva',  'prefix');
+        assert.equal(moment(0).from(30000), 'néhány másodperce', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'néhány másodperce',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'néhány másodperc múlva', 'néhány másodperc múlva');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 nap múlva', '5 nap múlva');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'ma 2:00-kor',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'ma 2:25-kor',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'ma 3:00-kor',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'holnap 2:00-kor', 'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'ma 1:00-kor',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'tegnap 2:00-kor', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m, days = 'vasárnap_hétfőn_kedden_szerdán_csütörtökön_pénteken_szombaton'.split('_');
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[' + days[m.day()] + '] LT[-kor]'),  'today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[' + days[m.day()] + '] LT[-kor]'),  'today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[' + days[m.day()] + '] LT[-kor]'),  'today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m, days = 'vasárnap_hétfőn_kedden_szerdán_csütörtökön_pénteken_szombaton'.split('_');
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[múlt ' + days[m.day()] + '] LT[-kor]'),  'today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[múlt ' + days[m.day()] + '] LT[-kor]'),  'today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[múlt ' + days[m.day()] + '] LT[-kor]'),  'today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  'egy héte');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'egy hét múlva');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 hete');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  '2 hét múlva');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('hy-am');
+
+    test('parse', function (assert) {
+        var tests = 'հունվար հնվ_փետրվար փտր_մարտ մրտ_ապրիլ ապր_մայիս մյս_հունիս հնս_հուլիս հլս_օգոստոս օգս_սեպտեմբեր սպտ_հոկտեմբեր հկտ_նոյեմբեր նմբ_դեկտեմբեր դկտ'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('parse exceptional case', function (assert) {
+        assert.equal(moment('11 մայիսի 1989', ['DD MMMM YYYY']).format('DD-MM-YYYY'), '11-05-1989');
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, HH:mm:ss',       'կիրակի, 14 փետրվարի 2010, 15:25:50'],
+                ['ddd, h A',                           'կրկ, 3 ցերեկվա'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 փետրվար փտր'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 կիրակի կրկ կրկ'],
+                ['DDD DDDo DDDD',                      '45 45-րդ 045'],
+                ['w wo ww',                            '7 7-րդ 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'ցերեկվա ցերեկվա'],
+                ['[տարվա] DDDo [օրը]',                 'տարվա 45-րդ օրը'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 փետրվարի 2010 թ.'],
+                ['LLL',                                '14 փետրվարի 2010 թ., 15:25'],
+                ['LLLL',                               'կիրակի, 14 փետրվարի 2010 թ., 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 փտր 2010 թ.'],
+                ['lll',                                '14 փտր 2010 թ., 15:25'],
+                ['llll',                               'կրկ, 14 փտր 2010 թ., 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format meridiem', function (assert) {
+        assert.equal(moment([2012, 11, 28, 0, 0]).format('A'), 'գիշերվա', 'night');
+        assert.equal(moment([2012, 11, 28, 3, 59]).format('A'), 'գիշերվա', 'night');
+        assert.equal(moment([2012, 11, 28, 4, 0]).format('A'), 'առավոտվա', 'morning');
+        assert.equal(moment([2012, 11, 28, 11, 59]).format('A'), 'առավոտվա', 'morning');
+        assert.equal(moment([2012, 11, 28, 12, 0]).format('A'), 'ցերեկվա', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 16, 59]).format('A'), 'ցերեկվա', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 17, 0]).format('A'), 'երեկոյան', 'evening');
+        assert.equal(moment([2012, 11, 28, 23, 59]).format('A'), 'երեկոյան', 'evening');
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-ին', '1-ին');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-րդ', '2-րդ');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-րդ', '3-րդ');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-րդ', '4-րդ');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-րդ', '5-րդ');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-րդ', '6-րդ');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-րդ', '7-րդ');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-րդ', '8-րդ');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-րդ', '9-րդ');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-րդ', '10-րդ');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-րդ', '11-րդ');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-րդ', '12-րդ');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-րդ', '13-րդ');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-րդ', '14-րդ');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-րդ', '15-րդ');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-րդ', '16-րդ');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-րդ', '17-րդ');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-րդ', '18-րդ');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-րդ', '19-րդ');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-րդ', '20-րդ');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-րդ', '21-րդ');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-րդ', '22-րդ');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-րդ', '23-րդ');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-րդ', '24-րդ');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-րդ', '25-րդ');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-րդ', '26-րդ');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-րդ', '27-րդ');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-րդ', '28-րդ');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-րդ', '29-րդ');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-րդ', '30-րդ');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-րդ', '31-րդ');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'հունվար հնվ_փետրվար փտր_մարտ մրտ_ապրիլ ապր_մայիս մյս_հունիս հնս_հուլիս հլս_օգոստոս օգս_սեպտեմբեր սպտ_հոկտեմբեր հկտ_նոյեմբեր նմբ_դեկտեմբեր դկտ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format month case', function (assert) {
+        var months = {
+            'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'),
+            'accusative': 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2011, i, 1]).format('D MMMM'), '1 ' + months.accusative[i], '1 ' + months.accusative[i]);
+            assert.equal(moment([2011, i, 1]).format('MMMM'), months.nominative[i], '1 ' + months.nominative[i]);
+        }
+    });
+
+    test('format month short case', function (assert) {
+        var monthsShort = {
+            'nominative': 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
+            'accusative': 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2011, i, 1]).format('D MMM'), '1 ' + monthsShort.accusative[i], '1 ' + monthsShort.accusative[i]);
+            assert.equal(moment([2011, i, 1]).format('MMM'), monthsShort.nominative[i], '1 ' + monthsShort.nominative[i]);
+        }
+    });
+
+    test('format month case with escaped symbols', function (assert) {
+        var months = {
+            'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'),
+            'accusative': 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2013, i, 1]).format('D[] MMMM'), '1 ' + months.accusative[i], '1 ' + months.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('[<i>]D[</i>] [<b>]MMMM[</b>]'), '<i>1</i> <b>' + months.accusative[i] + '</b>', '1 <b>' + months.accusative[i] + '</b>');
+            assert.equal(moment([2013, i, 1]).format('D[-ին օրը] MMMM'), '1-ին օրը ' + months.accusative[i], '1-ին օրը ' + months.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('D, MMMM'), '1, ' + months.nominative[i], '1, ' + months.nominative[i]);
+        }
+    });
+
+    test('format month short case with escaped symbols', function (assert) {
+        var monthsShort = {
+            'nominative': 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_'),
+            'accusative': 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2013, i, 1]).format('D[] MMM'), '1 ' + monthsShort.accusative[i], '1 ' + monthsShort.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('[<i>]D[</i>] [<b>]MMM[</b>]'), '<i>1</i> <b>' + monthsShort.accusative[i] + '</b>', '1 <b>' + monthsShort.accusative[i] + '</b>');
+            assert.equal(moment([2013, i, 1]).format('D[-ին օրը] MMM'), '1-ին օրը ' + monthsShort.accusative[i], '1-ին օրը ' + monthsShort.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('D, MMM'), '1, ' + monthsShort.nominative[i], '1, ' + monthsShort.nominative[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'կիրակի կրկ կրկ_երկուշաբթի երկ երկ_երեքշաբթի երք երք_չորեքշաբթի չրք չրք_հինգշաբթի հնգ հնգ_ուրբաթ ուրբ ուրբ_շաբաթ շբթ շբթ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'մի քանի վայրկյան',    '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'րոպե',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'րոպե',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 րոպե',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 րոպե', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ժամ',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ժամ',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ժամ',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ժամ',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ժամ',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'օր',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'օր',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 օր',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'օր',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 օր',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 11}), true),  '11 օր',     '11 days = 11 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 21}), true),  '21 օր',     '21 days = 21 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 օր',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ամիս',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ամիս',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ամիս',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 ամիս',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 ամիս',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 ամիս',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ամիս',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 ամիս',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'տարի',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 տարի',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'տարի',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 տարի',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'մի քանի վայրկյան հետո', 'prefix');
+        assert.equal(moment(0).from(30000), 'մի քանի վայրկյան առաջ', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'մի քանի վայրկյան հետո', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 օր հետո', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'այսօր 02:00',   'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'այսօր 02:25',   'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'այսօր 03:00',   'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'վաղը 02:00',   'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'այսօր 01:00',   'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'երեկ 02:00',   'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        function makeFormat(d) {
+            return 'dddd [օրը ժամը] LT';
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            return '[անցած] dddd [օրը ժամը] LT';
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-ին', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-ին', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-րդ', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-րդ', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-րդ', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('id');
+
+    test('parse', function (assert) {
+        var tests = 'Januari Jan_Februari Feb_Maret Mar_April Apr_Mei Mei_Juni Jun_Juli Jul_Agustus Ags_September Sep_Oktober Okt_November Nov_Desember Des'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Minggu, Februari 14 2010, 3:25:50 sore'],
+                ['ddd, hA',                            'Min, 3sore'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 Februari Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 Minggu Min Mg'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '7 7 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'sore sore'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15.25.50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Februari 2010'],
+                ['LLL',                                '14 Februari 2010 pukul 15.25'],
+                ['LLLL',                               'Minggu, 14 Februari 2010 pukul 15.25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 pukul 15.25'],
+                ['llll',                               'Min, 14 Feb 2010 pukul 15.25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Januari Jan_Februari Feb_Maret Mar_April Apr_Mei Mei_Juni Jun_Juli Jul_Agustus Ags_September Sep_Oktober Okt_November Nov_Desember Des'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Minggu Min Mg_Senin Sen Sn_Selasa Sel Sl_Rabu Rab Rb_Kamis Kam Km_Jumat Jum Jm_Sabtu Sab Sb'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'beberapa detik', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'semenit',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'semenit',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 menit',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 menit',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'sejam',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'sejam',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 jam',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 jam',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 jam',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'sehari',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'sehari',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 hari',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'sehari',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 hari',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 hari',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'sebulan',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'sebulan',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'sebulan',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 bulan',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 bulan',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 bulan',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'sebulan',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 bulan',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'setahun',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 tahun',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'setahun',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 tahun',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'dalam beberapa detik',  'prefix');
+        assert.equal(moment(0).from(30000), 'beberapa detik yang lalu', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'beberapa detik yang lalu',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'dalam beberapa detik', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'dalam 5 hari', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Hari ini pukul 02.00', 'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Hari ini pukul 02.25', 'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Hari ini pukul 03.00', 'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Besok pukul 02.00',    'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hari ini pukul 01.00', 'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Kemarin pukul 02.00',  'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [lalu pukul] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [lalu pukul] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [lalu pukul] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('is');
+
+    test('parse', function (assert) {
+        var tests = 'janúar jan_febrúar feb_mars mar_apríl apr_maí maí_júní jún_júlí júl_ágúst ágú_september sep_október okt_nóvember nóv_desember des'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'sunnudagur, 14. febrúar 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'sun, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 febrúar feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. sunnudagur sun Su'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14. febrúar 2010'],
+                ['LLL',                                '14. febrúar 2010 kl. 15:25'],
+                ['LLLL',                               'sunnudagur, 14. febrúar 2010 kl. 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14. feb 2010'],
+                ['lll',                                '14. feb 2010 kl. 15:25'],
+                ['llll',                               'sun, 14. feb 2010 kl. 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'janúar jan_febrúar feb_mars mar_apríl apr_maí maí_júní jún_júlí júl_ágúst ágú_september sep_október okt_nóvember nóv_desember des'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'sunnudagur sun Su_mánudagur mán Má_þriðjudagur þri Þr_miðvikudagur mið Mi_fimmtudagur fim Fi_föstudagur fös Fö_laugardagur lau La'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'nokkrar sekúndur', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'mínúta',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'mínúta',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 mínútur',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 mínútur',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 21}), true),  '21 mínúta',    '21 minutes = 21 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'klukkustund',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'klukkustund',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 klukkustundir',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 klukkustundir',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 klukkustund',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'dagur',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'dagur',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dagar',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'dagur',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dagar',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dagar',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 11}), true),  '11 dagar',       '11 days = 11 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 21}), true),  '21 dagur',       '21 days = 21 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mánuður',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mánuður',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mánuður',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mánuðir',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mánuðir',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mánuðir',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mánuður',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mánuðir',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ár',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ár',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ár',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ár',       '5 years = 5 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 21}), true),  '21 ár',       '21 years = 21 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'eftir nokkrar sekúndur',  'prefix');
+        assert.equal(moment(0).from(30000), 'fyrir nokkrum sekúndum síðan', 'suffix');
+        assert.equal(moment().subtract({m: 1}).fromNow(), 'fyrir mínútu síðan', 'a minute ago');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'fyrir nokkrum sekúndum síðan',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'eftir nokkrar sekúndur', 'in a few seconds');
+        assert.equal(moment().add({m: 1}).fromNow(), 'eftir mínútu', 'in a minute');
+        assert.equal(moment().add({d: 5}).fromNow(), 'eftir 5 daga', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'í dag kl. 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'í dag kl. 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'í dag kl. 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'á morgun kl. 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'í dag kl. 1:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'í gær kl. 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [kl.] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [kl.] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [kl.] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[síðasta] dddd [kl.] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[síðasta] dddd [kl.] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[síðasta] dddd [kl.] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),  '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),  '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('it');
+
+    test('parse', function (assert) {
+        var tests = 'gennaio gen_febbraio feb_marzo mar_aprile apr_maggio mag_giugno giu_luglio lug_agosto ago_settembre set_ottobre ott_novembre nov_dicembre dic'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domenica, febbraio 14º 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Dom, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2º 02 febbraio feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14º 14'],
+                ['d do dddd ddd dd',                   '0 0º Domenica Dom D'],
+                ['DDD DDDo DDDD',                      '45 45º 045'],
+                ['w wo ww',                            '6 6º 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45º day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 febbraio 2010'],
+                ['LLL',                                '14 febbraio 2010 15:25'],
+                ['LLLL',                               'Domenica, 14 febbraio 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 feb 2010'],
+                ['lll',                                '14 feb 2010 15:25'],
+                ['llll',                               'Dom, 14 feb 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3º', '3º');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4º', '4º');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5º', '5º');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6º', '6º');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7º', '7º');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8º', '8º');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9º', '9º');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10º', '10º');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11º', '11º');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12º', '12º');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13º', '13º');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14º', '14º');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15º', '15º');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16º', '16º');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17º', '17º');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18º', '18º');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19º', '19º');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20º', '20º');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21º', '21º');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22º', '22º');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23º', '23º');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24º', '24º');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25º', '25º');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26º', '26º');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27º', '27º');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28º', '28º');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29º', '29º');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30º', '30º');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31º', '31º');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'gennaio gen_febbraio feb_marzo mar_aprile apr_maggio mag_giugno giu_luglio lug_agosto ago_settembre set_ottobre ott_novembre nov_dicembre dic'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Domenica Dom D_Lunedì Lun L_Martedì Mar Ma_Mercoledì Mer Me_Giovedì Gio G_Venerdì Ven V_Sabato Sab S'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'alcuni secondi', '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'un minuto',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'un minuto',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuti',       '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuti',      '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'un\'ora',        '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'un\'ora',        '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ore',          '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ore',          '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ore',         '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'un giorno',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'un giorno',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 giorni',       '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'un giorno',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 giorni',       '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 giorni',      '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'un mese',        '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'un mese',        '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'un mese',        '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mesi',         '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mesi',         '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mesi',         '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'un mese',        '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mesi',         '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'un anno',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 anni',         '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'un anno',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 anni',         '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'in alcuni secondi', 'prefix');
+        assert.equal(moment(0).from(30000), 'alcuni secondi fa', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'in alcuni secondi', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'tra 5 giorni', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                   'Oggi alle 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Oggi alle 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Oggi alle 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Domani alle 02:00',   'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Oggi alle 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Ieri alle 02:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [alle] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [alle] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [alle] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m, weekday, datestring;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            // Different date string
+            weekday = parseInt(m.format('d'), 10);
+            datestring = (weekday === 0) ? '[la scorsa] dddd [alle] LT' : '[lo scorso] dddd [alle] LT';
+            assert.equal(m.calendar(), m.format(datestring), 'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format(datestring), 'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format(datestring), 'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52º', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),  '1 01 1º', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),  '1 01 1º', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2º', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2º', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ja');
+
+    test('parse', function (assert) {
+        var tests = '1月 1月_2月 2月_3月 3月_4月 4月_5月 5月_6月 6月_7月 7月_8月 8月_9月 9月_10月 10月_11月 11月_12月 12月'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, a h:mm:ss',      '日曜日, 2月 14 2010, 午後 3:25:50'],
+                ['ddd, Ah',                            '日, 午後3'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 2月 2月'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 日曜日 日 日'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                '午後 午後'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '午後3時25分50秒'],
+                ['L',                                  '2010/02/14'],
+                ['LL',                                 '2010年2月14日'],
+                ['LLL',                                '2010年2月14日午後3時25分'],
+                ['LLLL',                               '2010年2月14日午後3時25分 日曜日'],
+                ['l',                                  '2010/2/14'],
+                ['ll',                                 '2010年2月14日'],
+                ['lll',                                '2010年2月14日午後3時25分'],
+                ['llll',                               '2010年2月14日午後3時25分 日']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = '1月 1月_2月 2月_3月 3月_4月 4月_5月 5月_6月 6月_7月 7月_8月 8月_9月 9月_10月 10月_11月 11月_12月 12月'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = '日曜日 日 日_月曜日 月 月_火曜日 火 火_水曜日 水 水_木曜日 木 木_金曜日 金 金_土曜日 土 土'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  '数秒',   '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  '1分', '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  '1分', '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2分',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44分', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  '1時間', '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  '1時間', '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2時間',  '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5時間',  '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21時間', '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  '1日',   '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  '1日',   '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2日',   '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   '1日',   '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5日',   '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25日',  '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  '1ヶ月', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  '1ヶ月', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  '1ヶ月', '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2ヶ月',  '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2ヶ月',  '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3ヶ月',  '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   '1ヶ月', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5ヶ月',  '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), '1年',   '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2年',   '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   '1年',   '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5年',   '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), '数秒後',  'prefix');
+        assert.equal(moment(0).from(30000), '数秒前', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), '数秒前',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), '数秒後', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5日後', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     '今日 午前2時0分',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      '今日 午前2時25分',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       '今日 午前3時0分',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       '明日 午前2時0分',     'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  '今日 午前1時0分',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  '昨日 午前2時0分',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[来週]dddd LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[来週]dddd LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[来週]dddd LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[前週]dddd LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[前週]dddd LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[前週]dddd LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('jv');
+
+
+    test('parse', function (assert) {
+        var tests = 'Januari Jan_Februari Feb_Maret Mar_April Apr_Mei Mei_Juni Jun_Juli Jul_Agustus Ags_September Sep_Oktober Okt_Nopember Nop_Desember Des'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Minggu, Februari 14 2010, 3:25:50 sonten'],
+                ['ddd, hA',                            'Min, 3sonten'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 Februari Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 Minggu Min Mg'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '7 7 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'sonten sonten'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15.25.50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Februari 2010'],
+                ['LLL',                                '14 Februari 2010 pukul 15.25'],
+                ['LLLL',                               'Minggu, 14 Februari 2010 pukul 15.25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 pukul 15.25'],
+                ['llll',                               'Min, 14 Feb 2010 pukul 15.25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Januari Jan_Februari Feb_Maret Mar_April Apr_Mei Mei_Juni Jun_Juli Jul_Agustus Ags_September Sep_Oktober Okt_Nopember Nop_Desember Des'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Minggu Min Mg_Senen Sen Sn_Seloso Sel Sl_Rebu Reb Rb_Kemis Kem Km_Jemuwah Jem Jm_Septu Sep Sp'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'sawetawis detik', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'setunggal menit',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'setunggal menit',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 menit',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 menit',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'setunggal jam',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'setunggal jam',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 jam',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 jam',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 jam',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'sedinten',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'sedinten',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dinten',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'sedinten',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dinten',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dinten',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'sewulan',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'sewulan',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'sewulan',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 wulan',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 wulan',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 wulan',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'sewulan',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 wulan',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'setaun',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 taun',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'setaun',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 taun',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'wonten ing sawetawis detik',  'prefix');
+        assert.equal(moment(0).from(30000), 'sawetawis detik ingkang kepengker', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'sawetawis detik ingkang kepengker',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'wonten ing sawetawis detik', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'wonten ing 5 dinten', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Dinten puniko pukul 02.00', 'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Dinten puniko pukul 02.25', 'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Dinten puniko pukul 03.00', 'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Mbenjang pukul 02.00',    'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Dinten puniko pukul 01.00', 'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Kala wingi pukul 02.00',  'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [kepengker pukul] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [kepengker pukul] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [kepengker pukul] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    // Monday is the first day of the week.
+    // The week that contains Jan 1st is the first week of the year.
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ka');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'იანვარი იან_თებერვალი თებ_მარტი მარ_აპრილი აპრ_მაისი მაი_ივნისი ივნ_ივლისი ივლ_აგვისტო აგვ_სექტემბერი სექ_ოქტომბერი ოქტ_ნოემბერი ნოე_დეკემბერი დეკ'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' უნდა იყოს თვე ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a', 'კვირა, თებერვალი მე-14 2010, 3:25:50 pm'],
+                ['ddd, hA',                       'კვი, 3PM'],
+                ['M Mo MM MMMM MMM',              '2 მე-2 02 თებერვალი თებ'],
+                ['YYYY YY',                       '2010 10'],
+                ['D Do DD',                       '14 მე-14 14'],
+                ['d do dddd ddd dd',              '0 0 კვირა კვი კვ'],
+                ['DDD DDDo DDDD',                 '45 45-ე 045'],
+                ['w wo ww',                       '7 მე-7 07'],
+                ['h hh',                          '3 03'],
+                ['H HH',                          '15 15'],
+                ['m mm',                          '25 25'],
+                ['s ss',                          '50 50'],
+                ['a A',                           'pm PM'],
+                ['წლის DDDo დღე',                 'წლის 45-ე დღე'],
+                ['LTS',                           '3:25:50 PM'],
+                ['L',                             '14/02/2010'],
+                ['LL',                            '14 თებერვალი 2010'],
+                ['LLL',                           '14 თებერვალი 2010 3:25 PM'],
+                ['LLLL',                          'კვირა, 14 თებერვალი 2010 3:25 PM'],
+                ['l',                             '14/2/2010'],
+                ['ll',                            '14 თებ 2010'],
+                ['lll',                           '14 თებ 2010 3:25 PM'],
+                ['llll',                          'კვი, 14 თებ 2010 3:25 PM']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'),  '1-ლი',  '1-ლი');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'),  'მე-2',  'მე-2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'),  'მე-3',  'მე-3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'),  'მე-4',  'მე-4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'),  'მე-5',  'მე-5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'),  'მე-6',  'მე-6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'),  'მე-7',  'მე-7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'),  'მე-8',  'მე-8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'),  'მე-9',  'მე-9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), 'მე-10', 'მე-10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), 'მე-11', 'მე-11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), 'მე-12', 'მე-12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), 'მე-13', 'მე-13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), 'მე-14', 'მე-14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), 'მე-15', 'მე-15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), 'მე-16', 'მე-16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), 'მე-17', 'მე-17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), 'მე-18', 'მე-18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), 'მე-19', 'მე-19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), 'მე-20', 'მე-20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-ე', '21-ე');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-ე', '22-ე');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-ე', '23-ე');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-ე', '24-ე');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-ე', '25-ე');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-ე', '26-ე');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-ე', '27-ე');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-ე', '28-ე');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-ე', '29-ე');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-ე', '30-ე');
+
+        assert.equal(moment('2011 40', 'YYYY DDD').format('DDDo'),  'მე-40',  'მე-40');
+        assert.equal(moment('2011 50', 'YYYY DDD').format('DDDo'),  '50-ე',   '50-ე');
+        assert.equal(moment('2011 60', 'YYYY DDD').format('DDDo'),  'მე-60',  'მე-60');
+        assert.equal(moment('2011 100', 'YYYY DDD').format('DDDo'), 'მე-100', 'მე-100');
+        assert.equal(moment('2011 101', 'YYYY DDD').format('DDDo'), '101-ე',  '101-ე');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'იანვარი იან_თებერვალი თებ_მარტი მარ_აპრილი აპრ_მაისი მაი_ივნისი ივნ_ივლისი ივლ_აგვისტო აგვ_სექტემბერი სექ_ოქტომბერი ოქტ_ნოემბერი ნოე_დეკემბერი დეკ'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'კვირა კვი კვ_ორშაბათი ორშ ორ_სამშაბათი სამ სა_ოთხშაბათი ოთხ ოთ_ხუთშაბათი ხუთ ხუ_პარასკევი პარ პა_შაბათი შაბ შა'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}),  true), 'რამდენიმე წამი', '44 წამი  = რამდენიმე წამი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}),  true), 'წუთი',           '45 წამი  = წუთი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}),  true), 'წუთი',           '89 წამი  = წუთი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}),  true), '2 წუთი',         '90 წამი  = 2 წუთი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}),  true), '44 წუთი',        '44 წამი  = 44 წუთი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}),  true), 'საათი',          '45 წამი  = საათი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}),  true), 'საათი',          '89 წამი  = საათი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}),  true), '2 საათი',        '90 წამი  = 2 საათი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}),   true), '5 საათი',        '5 საათი  = 5 საათი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}),  true), '21 საათი',       '21 საათი = 21 საათი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}),  true), 'დღე',            '22 საათი = დღე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}),  true), 'დღე',            '35 საათი = დღე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}),  true), '2 დღე',          '36 საათი = 2 დღე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}),   true), 'დღე',            '1 დღე    = დღე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}),   true), '5 დღე',          '5 დღე    = 5 დღე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}),  true), '25 დღე',         '25 დღე   = 25 დღე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}),  true), 'თვე',            '26 დღე   = თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}),  true), 'თვე',            '30 დღე   = თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}),  true), 'თვე',            '45 დღე   = თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}),  true), '2 თვე',          '46 დღე   = 2 თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}),  true), '2 თვე',          '75 დღე   = 2 თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}),  true), '3 თვე',          '76 დღე   = 3 თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}),   true), 'თვე',            '1 თვე    = თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}),   true), '5 თვე',          '5 თვე    = 5 თვე');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'წელი',           '345 დღე  = წელი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 წელი',         '548 დღე  = 2 წელი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}),   true), 'წელი',           '1 წელი   = წელი');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}),   true), '5 წელი',         '5 წელი   = 5 წელი');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'რამდენიმე წამში',     'ში სუფიქსი');
+        assert.equal(moment(0).from(30000), 'რამდენიმე წამის წინ', 'წინ სუფიქსი');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'რამდენიმე წამის წინ', 'უნდა აჩვენოს როგორც წარსული');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'რამდენიმე წამში', 'რამდენიმე წამში');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 დღეში', '5 დღეში');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'დღეს 2:00 AM-ზე',  'დღეს ამავე დროს');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'დღეს 2:25 AM-ზე',  'ახლანდელ დროს დამატებული 25 წუთი');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'დღეს 3:00 AM-ზე',  'ახლანდელ დროს დამატებული 1 საათი');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'ხვალ 2:00 AM-ზე',  'ხვალ ამავე დროს');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'დღეს 1:00 AM-ზე',  'ახლანდელ დროს გამოკლებული 1 საათი');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'გუშინ 2:00 AM-ზე', 'გუშინ ამავე დროს');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[შემდეგ] dddd LT[-ზე]'),  'დღეს + ' + i + ' დღე ახლანდელ დროს');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[შემდეგ] dddd LT[-ზე]'),  'დღეს + ' + i + ' დღე დღის დასაწყისში');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[შემდეგ] dddd LT[-ზე]'),  'დღეს + ' + i + ' დღე დღის დასასრულს');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[წინა] dddd LT[-ზე]'),  'დღეს - ' + i + ' დღე ახლანდელ დროს');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[წინა] dddd LT[-ზე]'),  'დღეს - ' + i + ' დღე დღის დასაწყისში');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[წინა] dddd LT[-ზე]'),  'დღეს - ' + i + ' დღე დღის დასასრულს');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 კვირის წინ');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  '1 კვირაში');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 კვირის წინ');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  '2 კვირაში');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'დეკ 26 2011 უნდა იყოს კვირა 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'იან  1 2012 უნდა იყოს კვირა 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'იან  2 2012 უნდა იყოს კვირა 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'იან  8 2012 უნდა იყოს კვირა 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'იან  9 2012 უნდა იყოს კვირა 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'იან  1 2007 უნდა იყოს კვირა 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'იან  7 2007 უნდა იყოს კვირა 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'იან  8 2007 უნდა იყოს კვირა 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'იან 14 2007 უნდა იყოს კვირა 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'იან 15 2007 უნდა იყოს კვირა 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'დეკ 31 2007 უნდა იყოს კვირა 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'იან  1 2008 უნდა იყოს კვირა 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'იან  6 2008 უნდა იყოს კვირა 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'იან  7 2008 უნდა იყოს კვირა 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'იან 13 2008 უნდა იყოს კვირა 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'იან 14 2008 უნდა იყოს კვირა 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'დეკ 30 2002 უნდა იყოს კვირა 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'იან  1 2003 უნდა იყოს კვირა 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'იან  5 2003 უნდა იყოს კვირა 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'იან  6 2003 უნდა იყოს კვირა 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'იან 12 2003 უნდა იყოს კვირა 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'იან 13 2003 უნდა იყოს კვირა 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'დეკ 29 2008 უნდა იყოს კვირა 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'იან  1 2009 უნდა იყოს კვირა 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'იან  4 2009 უნდა იყოს კვირა 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'იან  5 2009 უნდა იყოს კვირა 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'იან 11 2009 უნდა იყოს კვირა 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'იან 12 2009 უნდა იყოს კვირა 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'დეკ 28 2009 უნდა იყოს კვირა 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'იან  1 2010 უნდა იყოს კვირა 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'იან  3 2010 უნდა იყოს კვირა 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'იან  4 2010 უნდა იყოს კვირა 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'იან 10 2010 უნდა იყოს კვირა 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'იან 11 2010 უნდა იყოს კვირა 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'დეკ 27 2010 უნდა იყოს კვირა 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'იან  1 2011 უნდა იყოს კვირა 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'იან  2 2011 უნდა იყოს კვირა 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'იან  3 2011 უნდა იყოს კვირა 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'იან  9 2011 უნდა იყოს კვირა 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'იან 10 2011 უნდა იყოს კვირა 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-ლი', 'დეკ 26 2011 უნდა იყოს კვირა 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-ლი', 'იან  1 2012 უნდა იყოს კვირა 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 მე-2', 'იან  2 2012 უნდა იყოს კვირა 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 მე-2', 'იან  8 2012 უნდა იყოს კვირა 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 მე-3', 'იან  9 2012 უნდა იყოს კვირა 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('km');
+
+    test('parse', function (assert) {
+        var tests = 'មករា មករា_កុម្ភៈ កុម្ភៈ_មិនា មិនា_មេសា មេសា_ឧសភា ឧសភា_មិថុនា មិថុនា_កក្កដា កក្កដា_សីហា សីហា_កញ្ញា កញ្ញា_តុលា តុលា_វិច្ឆិកា វិច្ឆិកា_ធ្នូ ធ្នូ'.split('_'),
+            i;
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a', 'អាទិត្យ, កុម្ភៈ 14 2010, 3:25:50 pm'],
+                ['ddd, hA', 'អាទិត្យ, 3PM'],
+                ['M Mo MM MMMM MMM', '2 2 02 កុម្ភៈ កុម្ភៈ'],
+                ['YYYY YY', '2010 10'],
+                ['D Do DD', '14 14 14'],
+                ['d do dddd ddd dd', '0 0 អាទិត្យ អាទិត្យ អាទិត្យ'],
+                ['DDD DDDo DDDD', '45 45 045'],
+                ['w wo ww', '6 6 06'],
+                ['h hh', '3 03'],
+                ['H HH', '15 15'],
+                ['m mm', '25 25'],
+                ['s ss', '50 50'],
+                ['a A', 'pm PM'],
+                ['[the] DDDo [day of the year]', 'the 45 day of the year'],
+                ['LTS', '15:25:50'],
+                ['L', '14/02/2010'],
+                ['LL', '14 កុម្ភៈ 2010'],
+                ['LLL', '14 កុម្ភៈ 2010 15:25'],
+                ['LLLL', 'អាទិត្យ, 14 កុម្ភៈ 2010 15:25'],
+                ['l', '14/2/2010'],
+                ['ll', '14 កុម្ភៈ 2010'],
+                ['lll', '14 កុម្ភៈ 2010 15:25'],
+                ['llll', 'អាទិត្យ, 14 កុម្ភៈ 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21st');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22nd');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23rd');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31st');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'មករា មករា_កុម្ភៈ កុម្ភៈ_មិនា មិនា_មេសា មេសា_ឧសភា ឧសភា_មិថុនា មិថុនា_កក្កដា កក្កដា_សីហា សីហា_កញ្ញា កញ្ញា_តុលា តុលា_វិច្ឆិកា វិច្ឆិកា_ធ្នូ ធ្នូ'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'អាទិត្យ អាទិត្យ អាទិត្យ_ច័ន្ទ ច័ន្ទ ច័ន្ទ_អង្គារ អង្គារ អង្គារ_ពុធ ពុធ ពុធ_ព្រហស្បតិ៍ ព្រហស្បតិ៍ ព្រហស្បតិ៍_សុក្រ សុក្រ សុក្រ_សៅរ៍ សៅរ៍ សៅរ៍'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), 'ប៉ុន្មានវិនាទី', '44 seconds = ប៉ុន្មានវិនាទី');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), 'មួយនាទី', '45 seconds = មួយនាទី');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true), 'មួយនាទី', '89 seconds = មួយនាទី');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true), '2 នាទី', '90 seconds = 2 នាទី');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true), '44 នាទី', '44 minutes = 44 នាទី');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true), 'មួយម៉ោង', '45 minutes = មួយម៉ោង');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true), 'មួយម៉ោង', '89 minutes = មួយម៉ោង');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true), '2 ម៉ោង', '90 minutes = 2 ម៉ោង');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true), '5 ម៉ោង', '5 hours = 5 ម៉ោង');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true), '21 ម៉ោង', '21 hours = 21 ម៉ោង');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true), 'មួយថ្ងៃ', '22 hours = មួយថ្ងៃ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true), 'មួយថ្ងៃ', '35 hours = មួយថ្ងៃ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true), '2 ថ្ងៃ', '36 hours = 2 ថ្ងៃ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true), 'មួយថ្ងៃ', '1 day = មួយថ្ងៃ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true), '5 ថ្ងៃ', '5 days = 5 ថ្ងៃ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), '25 ថ្ងៃ', '25 days = 25 ថ្ងៃ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), 'មួយខែ', '26 days = មួយខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), 'មួយខែ', '30 days = មួយខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), 'មួយខែ', '43 days = មួយខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), '2 ខែ', '46 days = 2 ខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), '2 ខែ', '75 days = 2 ខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), '3 ខែ', '76 days = 3 ខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), 'មួយខែ', '1 month = មួយខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), '5 ខែ', '5 months = 5 ខែ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'មួយឆ្នាំ', '345 days = មួយឆ្នាំ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ឆ្នាំ', '548 days = 2 ឆ្នាំ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), 'មួយឆ្នាំ', '1 year = មួយឆ្នាំ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), '5 ឆ្នាំ', '5 years = 5 ឆ្នាំ');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'ប៉ុន្មានវិនាទីទៀត', 'prefix');
+        assert.equal(moment(0).from(30000), 'ប៉ុន្មានវិនាទីមុន', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'ប៉ុន្មានវិនាទីមុន', 'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({
+            s: 30
+        }).fromNow(), 'ប៉ុន្មានវិនាទីទៀត', 'in a few seconds');
+        assert.equal(moment().add({
+            d: 5
+        }).fromNow(), '5 ថ្ងៃទៀត', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(), 'ថ្ងៃនៈ ម៉ោង 02:00', 'today at the same time');
+        assert.equal(moment(a).add({
+            m: 25
+        }).calendar(), 'ថ្ងៃនៈ ម៉ោង 02:25', 'Now plus 25 min');
+        assert.equal(moment(a).add({
+            h: 1
+        }).calendar(), 'ថ្ងៃនៈ ម៉ោង 03:00', 'Now plus 1 hour');
+        assert.equal(moment(a).add({
+            d: 1
+        }).calendar(), 'ស្អែក ម៉ោង 02:00', 'tomorrow at the same time');
+        assert.equal(moment(a).subtract({
+            h: 1
+        }).calendar(), 'ថ្ងៃនៈ ម៉ោង 01:00', 'Now minus 1 hour');
+        assert.equal(moment(a).subtract({
+            d: 1
+        }).calendar(), 'ម្សិលមិញ ម៉ោង 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({
+                d: i
+            });
+            assert.equal(m.calendar(), m.format('dddd [ម៉ោង] LT'), 'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('dddd [ម៉ោង] LT'), 'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('dddd [ម៉ោង] LT'), 'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({
+                d: i
+            });
+            assert.equal(m.calendar(), m.format('dddd [សប្តាហ៍មុន] [ម៉ោង] LT'), 'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('dddd [សប្តាហ៍មុន] [ម៉ោង] LT'), 'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('dddd [សប្តាហ៍មុន] [ម៉ោង] LT'), 'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({
+                w: 1
+            }),
+            weeksFromNow = moment().add({
+                w: 1
+            });
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '1 week ago');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 1 week');
+
+        weeksAgo = moment().subtract({
+            w: 2
+        });
+        weeksFromNow = moment().add({
+            w: 2
+        });
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), 'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(), 1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(), 1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(), 2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(), 1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(), 2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008, 0, 1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008, 0, 6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008, 0, 7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008, 0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008, 0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003, 0, 1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003, 0, 5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003, 0, 6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003, 0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003, 0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009, 0, 1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009, 0, 4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009, 0, 5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009, 0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009, 0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010, 0, 1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010, 0, 3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010, 0, 4]).week(), 1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010, 0, 10]).week(), 1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010, 0, 11]).week(), 2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011, 0, 1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011, 0, 2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011, 0, 3]).week(), 1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011, 0, 9]).week(), 1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011, 0, 10]).week(), 2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0, 1]).format('w ww wo'), '52 52 52', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).format('w ww wo'), '1 01 1', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).format('w ww wo'), '1 01 1', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).format('w ww wo'), '2 02 2', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '2 02 2', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ko');
+
+    test('parse', function (assert) {
+        var tests = '1월 1월_2월 2월_3월 3월_4월 4월_5월 5월_6월 6월_7월 7월_8월 8월_9월 9월_10월 10월_11월 11월_12월 12월'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('parse meridiem', function (assert) {
+        var elements = [{
+            expression : '1981년 9월 8일 오후 2시 30분',
+            inputFormat : 'YYYY[년] M[월] D[일] A h[시] m[분]',
+            outputFormat : 'A',
+            expected : '오후'
+        }, {
+            expression : '1981년 9월 8일 오전 2시 30분',
+            inputFormat : 'YYYY[년] M[월] D[일] A h[시] m[분]',
+            outputFormat : 'A h시',
+            expected : '오전 2시'
+        }, {
+            expression : '14시 30분',
+            inputFormat : 'H[시] m[분]',
+            outputFormat : 'A',
+            expected : '오후'
+        }, {
+            expression : '오후 4시',
+            inputFormat : 'A h[시]',
+            outputFormat : 'H',
+            expected : '16'
+        }], i, l, it, actual;
+
+
+        for (i = 0, l = elements.length; i < l; ++i) {
+            it = elements[i];
+            actual = moment(it.expression, it.inputFormat).format(it.outputFormat);
+
+            assert.equal(
+                actual,
+                it.expected,
+                '\'' + it.outputFormat + '\' of \'' + it.expression + '\' must be \'' + it.expected + '\' but was \'' + actual + '\'.'
+            );
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['YYYY년 MMMM Do dddd a h:mm:ss',      '2010년 2월 14일 일요일 오후 3:25:50'],
+                ['ddd A h',                            '일 오후 3'],
+                ['M Mo MM MMMM MMM',                   '2 2일 02 2월 2월'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14일 14'],
+                ['d do dddd ddd dd',                   '0 0일 일요일 일 일'],
+                ['DDD DDDo DDDD',                      '45 45일 045'],
+                ['w wo ww',                            '8 8일 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                '오후 오후'],
+                ['일년 중 DDDo째 되는 날',                 '일년 중 45일째 되는 날'],
+                ['LTS',                                '오후 3시 25분 50초'],
+                ['L',                                  '2010.02.14'],
+                ['LL',                                 '2010년 2월 14일'],
+                ['LLL',                                '2010년 2월 14일 오후 3시 25분'],
+                ['LLLL',                               '2010년 2월 14일 일요일 오후 3시 25분'],
+                ['l',                                  '2010.2.14'],
+                ['ll',                                 '2010년 2월 14일'],
+                ['lll',                                '2010년 2월 14일 오후 3시 25분'],
+                ['llll',                               '2010년 2월 14일 일 오후 3시 25분']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1일', '1일');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2일', '2일');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3일', '3일');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4일', '4일');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5일', '5일');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6일', '6일');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7일', '7일');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8일', '8일');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9일', '9일');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10일', '10일');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11일', '11일');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12일', '12일');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13일', '13일');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14일', '14일');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15일', '15일');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16일', '16일');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17일', '17일');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18일', '18일');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19일', '19일');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20일', '20일');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21일', '21일');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22일', '22일');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23일', '23일');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24일', '24일');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25일', '25일');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26일', '26일');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27일', '27일');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28일', '28일');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29일', '29일');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30일', '30일');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31일', '31일');
+    });
+
+    test('format month', function (assert) {
+        var expected = '1월 1월_2월 2월_3월 3월_4월 4월_5월 5월_6월 6월_7월 7월_8월 8월_9월 9월_10월 10월_11월 11월_12월 12월'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = '일요일 일 일_월요일 월 월_화요일 화 화_수요일 수 수_목요일 목 목_금요일 금 금_토요일 토 토'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  '몇초', '44초 = 몇초');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  '일분',      '45초 = 일분');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  '일분',      '89초 = 일분');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2분',     '90초 = 2분');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44분',    '44분 = 44분');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  '한시간',       '45분 = 한시간');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  '한시간',       '89분 = 한시간');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2시간',       '90분 = 2시간');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5시간',       '5시간 = 5시간');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21시간',      '21시간 = 21시간');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  '하루',         '22시간 = 하루');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  '하루',         '35시간 = 하루');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2일',        '36시간 = 2일');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   '하루',         '하루 = 하루');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5일',        '5일 = 5일');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25일',       '25일 = 25일');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  '한달',       '26일 = 한달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  '한달',       '30일 = 한달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  '한달',       '45일 = 한달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2달',      '46일 = 2달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2달',      '75일 = 2달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3달',      '76일 = 3달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   '한달',       '1달 = 한달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5달',      '5달 = 5달');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), '일년',        '345일 = 일년');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2년',       '548일 = 2년');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   '일년',        '일년 = 일년');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5년',       '5년 = 5년');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), '몇초 후',  'prefix');
+        assert.equal(moment(0).from(30000), '몇초 전', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), '몇초 전',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), '몇초 후', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5일 후', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     '오늘 오전 2시 0분',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      '오늘 오전 2시 25분',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       '오늘 오전 3시 0분',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       '내일 오전 2시 0분',     'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  '오늘 오전 1시 0분',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  '어제 오전 2시 0분',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('지난주 dddd LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('지난주 dddd LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('지난주 dddd LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1일', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1일', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2일', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2일', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3일', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('lb');
+
+    test('parse', function (assert) {
+        var tests = 'Januar Jan._Februar Febr._Mäerz Mrz._Abrëll Abr._Mee Mee_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split('_'), i;
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, HH:mm:ss', 'Sonndeg, 14. Februar 2010, 15:25:50'],
+                ['ddd, HH:mm', 'So., 15:25'],
+                ['M Mo MM MMMM MMM', '2 2. 02 Februar Febr.'],
+                ['YYYY YY', '2010 10'],
+                ['D Do DD', '14 14. 14'],
+                ['d do dddd ddd dd', '0 0. Sonndeg So. So'],
+                ['DDD DDDo DDDD', '45 45. 045'],
+                ['w wo ww', '6 6. 06'],
+                ['h hh', '3 03'],
+                ['H HH', '15 15'],
+                ['m mm', '25 25'],
+                ['s ss', '50 50'],
+                ['a A', 'pm PM'],
+                ['[the] DDDo [day of the year]', 'the 45. day of the year'],
+                ['LTS', '15:25:50 Auer'],
+                ['L', '14.02.2010'],
+                ['LL', '14. Februar 2010'],
+                ['LLL', '14. Februar 2010 15:25 Auer'],
+                ['LLLL', 'Sonndeg, 14. Februar 2010 15:25 Auer'],
+                ['l', '14.2.2010'],
+                ['ll', '14. Febr. 2010'],
+                ['lll', '14. Febr. 2010 15:25 Auer'],
+                ['llll', 'So., 14. Febr. 2010 15:25 Auer']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Januar Jan._Februar Febr._Mäerz Mrz._Abrëll Abr._Mee Mee_Juni Jun._Juli Jul._August Aug._September Sept._Oktober Okt._November Nov._Dezember Dez.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Sonndeg So. So_Méindeg Mé. Mé_Dënschdeg Dë. Dë_Mëttwoch Më. Më_Donneschdeg Do. Do_Freideg Fr. Fr_Samschdeg Sa. Sa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true), 'e puer Sekonnen', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true), 'eng Minutt', '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true), 'eng Minutt', '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true), '2 Minutten', '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true), '44 Minutten', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true), 'eng Stonn', '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true), 'eng Stonn', '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true), '2 Stonnen', '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true), '5 Stonnen', '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true), '21 Stonnen', '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true), 'een Dag', '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true), 'een Dag', '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true), '2 Deeg', '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true), 'een Dag', '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true), '5 Deeg', '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true), '25 Deeg', '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), 'ee Mount', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), 'ee Mount', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), 'ee Mount', '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), '2 Méint', '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), '2 Méint', '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), '3 Méint', '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), 'ee Mount', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), '5 Méint', '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ee Joer', '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 Joer', '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true), 'ee Joer', '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), '5 Joer', '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'an e puer Sekonnen', 'prefix');
+        assert.equal(moment(0).from(30000), 'virun e puer Sekonnen', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'an e puer Sekonnen', 'in a few seconds');
+        assert.equal(moment().add({d: 1}).fromNow(), 'an engem Dag', 'in one day');
+        assert.equal(moment().add({d: 2}).fromNow(), 'an 2 Deeg', 'in 2 days');
+        assert.equal(moment().add({d: 3}).fromNow(), 'an 3 Deeg', 'in 3 days');
+        assert.equal(moment().add({d: 4}).fromNow(), 'a 4 Deeg', 'in 4 days');
+        assert.equal(moment().add({d: 5}).fromNow(), 'a 5 Deeg', 'in 5 days');
+        assert.equal(moment().add({d: 6}).fromNow(), 'a 6 Deeg', 'in 6 days');
+        assert.equal(moment().add({d: 7}).fromNow(), 'a 7 Deeg', 'in 7 days');
+        assert.equal(moment().add({d: 8}).fromNow(), 'an 8 Deeg', 'in 8 days');
+        assert.equal(moment().add({d: 9}).fromNow(), 'an 9 Deeg', 'in 9 days');
+        assert.equal(moment().add({d: 10}).fromNow(), 'an 10 Deeg', 'in 10 days');
+        assert.equal(moment().add({y: 100}).fromNow(), 'an 100 Joer', 'in 100 years');
+        assert.equal(moment().add({y: 400}).fromNow(), 'a 400 Joer', 'in 400 years');
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m, weekday, datestring;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+
+            // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday)
+            weekday = parseInt(m.format('d'), 10);
+            datestring = (weekday === 2 || weekday === 4 ? '[Leschten] dddd [um] LT' : '[Leschte] dddd [um] LT');
+
+            assert.equal(m.calendar(), m.format(datestring), 'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format(datestring), 'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format(datestring), 'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('lt');
+
+    test('parse', function (assert) {
+        var tests = 'sausio sau_vasario vas_kovo kov_balandžio bal_gegužės geg_birželio bir_liepos lie_rugpjūčio rgp_rugsėjo rgs_spalio spa_lapkričio lap_gruodžio grd'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'sekmadienis, 14-oji vasario 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Sek, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2-oji 02 vasario vas'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-oji 14'],
+                ['d do dddd ddd dd',                   '0 0-oji sekmadienis Sek S'],
+                ['DDD DDDo DDDD',                      '45 45-oji 045'],
+                ['w wo ww',                            '6 6-oji 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['DDDo [metų diena]',                  '45-oji metų diena'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '2010-02-14'],
+                ['LL',                                 '2010 m. vasario 14 d.'],
+                ['LLL',                                '2010 m. vasario 14 d., 15:25 val.'],
+                ['LLLL',                               '2010 m. vasario 14 d., sekmadienis, 15:25 val.'],
+                ['l',                                  '2010-02-14'],
+                ['ll',                                 '2010 m. vasario 14 d.'],
+                ['lll',                                '2010 m. vasario 14 d., 15:25 val.'],
+                ['llll',                               '2010 m. vasario 14 d., Sek, 15:25 val.']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-oji', '1-oji');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-oji', '2-oji');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-oji', '3-oji');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-oji', '4-oji');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-oji', '5-oji');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-oji', '6-oji');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-oji', '7-oji');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-oji', '8-oji');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-oji', '9-oji');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-oji', '10-oji');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-oji', '11-oji');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-oji', '12-oji');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-oji', '13-oji');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-oji', '14-oji');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-oji', '15-oji');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-oji', '16-oji');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-oji', '17-oji');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-oji', '18-oji');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-oji', '19-oji');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-oji', '20-oji');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-oji', '21-oji');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-oji', '22-oji');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-oji', '23-oji');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-oji', '24-oji');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-oji', '25-oji');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-oji', '26-oji');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-oji', '27-oji');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-oji', '28-oji');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-oji', '29-oji');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-oji', '30-oji');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-oji', '31-oji');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'sausio sau_vasario vas_kovo kov_balandžio bal_gegužės geg_birželio bir_liepos lie_rugpjūčio rgp_rugsėjo rgs_spalio spa_lapkričio lap_gruodžio grd'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'sekmadienis Sek S_pirmadienis Pir P_antradienis Ant A_trečiadienis Tre T_ketvirtadienis Ket K_penktadienis Pen Pn_šeštadienis Šeš Š'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week on US calendar', function (assert) {
+        // Tests, whether the weekday names are correct, even if the week does not start on Monday
+        moment.locale('lt', {week: {dow: 0, doy: 6}});
+        var expected = 'sekmadienis Sek S_pirmadienis Pir P_antradienis Ant A_trečiadienis Tre T_ketvirtadienis Ket K_penktadienis Pen Pn_šeštadienis Šeš Š'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+        moment.locale('lt', {week: {dow: 1, doy: 4}});
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'kelios sekundės', '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minutė',          '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minutė',          '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutės',       '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 10}), true),  '10 minučių',       '10 minutes = 10 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 11}), true),  '11 minučių',       '11 minutes = 11 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 19}), true),  '19 minučių',       '19 minutes = 19 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 20}), true),  '20 minučių',       '20 minutes = 20 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutės',      '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'valanda',         '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'valanda',         '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 valandos',      '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 valandos',      '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 10}), true),  '10 valandų',      '10 hours = 10 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 valandos',     '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'diena',           '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'diena',           '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dienos',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'diena',           '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dienos',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 10}), true),  '10 dienų',        '10 days = 10 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dienos',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mėnuo',           '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mėnuo',           '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mėnuo',           '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mėnesiai',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mėnesiai',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mėnesiai',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mėnuo',           '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mėnesiai',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 10}), true),  '10 mėnesių',      '10 months = 10 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'metai',           '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 metai',         '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'metai',           '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 metai',         '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'po kelių sekundžių',  'prefix');
+        assert.equal(moment(0).from(30000), 'prieš kelias sekundes', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'prieš kelias sekundes',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'po kelių sekundžių', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'po 5 dienų', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Šiandien 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Šiandien 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Šiandien 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Rytoj 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Šiandien 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Vakar 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Praėjusį] dddd LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Praėjusį] dddd LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Praėjusį] dddd LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52-oji', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),  '1 01 1-oji', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),  '1 01 1-oji', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2-oji', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2-oji', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('lv');
+
+    test('parse', function (assert) {
+        var tests = 'janvāris jan_februāris feb_marts mar_aprīlis apr_maijs mai_jūnijs jūn_jūlijs jūl_augusts aug_septembris sep_oktobris okt_novembris nov_decembris dec'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'svētdiena, 14. februāris 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Sv, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februāris feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. svētdiena Sv Sv'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010.'],
+                ['LL',                                 '2010. gada 14. februāris'],
+                ['LLL',                                '2010. gada 14. februāris, 15:25'],
+                ['LLLL',                               '2010. gada 14. februāris, svētdiena, 15:25'],
+                ['l',                                  '14.2.2010.'],
+                ['ll',                                 '2010. gada 14. feb'],
+                ['lll',                                '2010. gada 14. feb, 15:25'],
+                ['llll',                               '2010. gada 14. feb, Sv, 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'janvāris jan_februāris feb_marts mar_aprīlis apr_maijs mai_jūnijs jūn_jūlijs jūl_augusts aug_septembris sep_oktobris okt_novembris nov_decembris dec'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'svētdiena Sv Sv_pirmdiena P P_otrdiena O O_trešdiena T T_ceturtdiena C C_piektdiena Pk Pk_sestdiena S S'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    // Includes testing the cases of withoutSuffix = true and false.
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),   'dažas sekundes',       '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), false),  'pirms dažām sekundēm', '44 seconds with suffix = seconds ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),   'minūte',               '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), false),  'pirms minūtes',        '45 seconds with suffix = a minute ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),   'minūte',               '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: -89}), false), 'pēc minūtes',          '89 seconds with suffix/prefix = in a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),   '2 minūtes',            '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), false),  'pirms 2 minūtēm',      '90 seconds with suffix = 2 minutes ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),   '44 minūtes',           '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), false),  'pirms 44 minūtēm',     '44 minutes with suffix = 44 minutes ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),   'stunda',               '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), false),  'pirms stundas',        '45 minutes with suffix = an hour ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),   'stunda',               '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),   '2 stundas',            '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: -90}), false), 'pēc 2 stundām',        '90 minutes with suffix = in 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),    '5 stundas',            '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), false),   'pirms 5 stundām',      '5 hours with suffix = 5 hours ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),   '21 stunda',            '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), false),  'pirms 21 stundas',     '21 hours with suffix = 21 hours ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),   'diena',                '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), false),  'pirms dienas',         '22 hours with suffix = a day ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),   'diena',                '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),   '2 dienas',             '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), false),  'pirms 2 dienām',       '36 hours with suffix = 2 days ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),    'diena',                '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),    '5 dienas',             '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), false),   'pirms 5 dienām',       '5 days with suffix = 5 days ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),   '25 dienas',            '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), false),  'pirms 25 dienām',      '25 days with suffix = 25 days ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),   'mēnesis',              '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), false),  'pirms mēneša',         '26 days with suffix = a month ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),   'mēnesis',              '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),   'mēnesis',              '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),   '2 mēneši',             '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), false),  'pirms 2 mēnešiem',     '46 days with suffix = 2 months ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),   '2 mēneši',             '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),   '3 mēneši',             '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), false),  'pirms 3 mēnešiem',     '76 days with suffix = 3 months ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),    'mēnesis',              '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),    '5 mēneši',             '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), false),   'pirms 5 mēnešiem',     '5 months with suffix = 5 months ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true),  'gads',                 '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), false), 'pirms gada',           '345 days with suffix = a year ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true),  '2 gadi',               '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), false), 'pirms 2 gadiem',       '548 days with suffix = 2 years ago');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),    'gads',                 '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),    '5 gadi',               '5 years = 5 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), false),   'pirms 5 gadiem',       '5 years with suffix = 5 years ago');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'pēc dažām sekundēm',  'prefix');
+        assert.equal(moment(0).from(30000), 'pirms dažām sekundēm', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'pirms dažām sekundēm',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'pēc dažām sekundēm', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'pēc 5 dienām', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Šodien pulksten 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Šodien pulksten 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Šodien pulksten 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Rīt pulksten 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Šodien pulksten 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Vakar pulksten 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [pulksten] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [pulksten] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [pulksten] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Pagājušā] dddd [pulksten] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Pagājušā] dddd [pulksten] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Pagājušā] dddd [pulksten] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),  '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),  '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('me');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan._februar feb._mart mar._april apr._maj maj_jun jun_jul jul_avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'nedjelja, 14. februar 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'ned., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. nedjelja ned. ne'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14. 02. 2010'],
+                ['LL',                                 '14. februar 2010'],
+                ['LLL',                                '14. februar 2010 15:25'],
+                ['LLLL',                               'nedjelja, 14. februar 2010 15:25'],
+                ['l',                                  '14. 2. 2010'],
+                ['ll',                                 '14. feb. 2010'],
+                ['lll',                                '14. feb. 2010 15:25'],
+                ['llll',                               'ned., 14. feb. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan._februar feb._mart mar._april apr._maj maj_jun jun_jul jul_avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'nedjelja ned. ne_ponedjeljak pon. po_utorak uto. ut_srijeda sri. sr_četvrtak čet. če_petak pet. pe_subota sub. su'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'nekoliko sekundi', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'jedan minut',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'jedan minut',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuta',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuta',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'jedan sat',      '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'jedan sat',      '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 sata',        '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 sati',         '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 sati',        '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'dan',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'dan',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dana',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'dan',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dana',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dana',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mjesec',     '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mjesec',     '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mjesec',     '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mjeseca',     '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mjeseca',     '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mjeseca',     '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mjesec',     '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mjeseci',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'godinu',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 godine',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'godinu',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 godina',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'za nekoliko sekundi',  'prefix');
+        assert.equal(moment(0).from(30000), 'prije nekoliko sekundi', 'prefix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'prije nekoliko sekundi',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'za nekoliko sekundi', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'za 5 dana', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                   'danas u 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'danas u 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'danas u 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'sjutra u 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'danas u 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'juče u 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[u] [nedjelju] [u] LT';
+            case 3:
+                return '[u] [srijedu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            var lastWeekDay = [
+                    '[prošle] [nedjelje] [u] LT',
+                    '[prošlog] [ponedjeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srijede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+
+            return lastWeekDay[d.day()];
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    // Monday is the first day of the week.
+    // The week that contains Jan 1st is the first week of the year.
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('mk');
+
+    test('parse', function (assert) {
+        var tests = 'јануари јан_февруари фев_март мар_април апр_мај мај_јуни јун_јули јул_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, H:mm:ss',        'недела, февруари 14-ти 2010, 15:25:50'],
+                ['ddd, hA',                            'нед, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2-ри 02 февруари фев'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-ти 14'],
+                ['d do dddd ddd dd',                   '0 0-ев недела нед нe'],
+                ['DDD DDDo DDDD',                      '45 45-ти 045'],
+                ['w wo ww',                            '7 7-ми 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45-ти day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 февруари 2010'],
+                ['LLL',                                '14 февруари 2010 15:25'],
+                ['LLLL',                               'недела, 14 февруари 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 фев 2010'],
+                ['lll',                                '14 фев 2010 15:25'],
+                ['llll',                               'нед, 14 фев 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-ви', '1-ви');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-ри', '2-ри');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-ти', '3-ти');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-ти', '4-ти');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-ти', '5-ти');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-ти', '6-ти');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-ми', '7-ми');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-ми', '8-ми');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-ти', '9-ти');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-ти', '10-ти');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-ти', '11-ти');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-ти', '12-ти');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-ти', '13-ти');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-ти', '14-ти');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-ти', '15-ти');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-ти', '16-ти');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-ти', '17-ти');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-ти', '18-ти');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-ти', '19-ти');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-ти', '20-ти');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-ви', '21-ви');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-ри', '22-ри');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-ти', '23-ти');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-ти', '24-ти');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-ти', '25-ти');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-ти', '26-ти');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-ми', '27-ми');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-ми', '28-ми');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-ти', '29-ти');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-ти', '30-ти');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-ви', '31-ви');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'јануари јан_февруари фев_март мар_април апр_мај мај_јуни јун_јули јул_август авг_септември сеп_октомври окт_ноември ное_декември дек'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'недела нед нe_понеделник пон пo_вторник вто вт_среда сре ср_четврток чет че_петок пет пе_сабота саб сa'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'неколку секунди', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'минута',          '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'минута',          '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 минути',        '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 минути',       '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'час',             '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'час',             '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 часа',          '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 часа',          '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 часа',         '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ден',             '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ден',             '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 дена',          '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ден',             '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 дена',          '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 дена',         '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'месец',           '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'месец',           '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'месец',           '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 месеци',        '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 месеци',        '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 месеци',        '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'месец',           '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 месеци',        '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'година',          '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 години',        '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'година',          '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 години',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'после неколку секунди',  'prefix');
+        assert.equal(moment(0).from(30000), 'пред неколку секунди', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'пред неколку секунди',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'после неколку секунди', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'после 5 дена', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Денес во 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Денес во 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Денес во 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Утре во 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Денес во 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Вчера во 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [во] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [во] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [во] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+            case 3:
+            case 6:
+                return '[Во изминатата] dddd [во] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[Во изминатиот] dddd [во] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-ви', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-ви', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-ри', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-ри', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-ти', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ml');
+
+    test('parse', function (assert) {
+        var tests = 'ജനുവരി ജനു._ഫെബ്രുവരി ഫെബ്രു._മാർച്ച് മാർ._ഏപ്രിൽ ഏപ്രി._മേയ് മേയ്_ജൂൺ ജൂൺ_ജൂലൈ ജൂലൈ._ഓഗസ്റ്റ് ഓഗ._സെപ്റ്റംബർ സെപ്റ്റ._ഒക്ടോബർ ഒക്ടോ._നവംബർ നവം._ഡിസംബർ ഡിസം.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, a h:mm:ss -നു',  'ഞായറാഴ്ച, 14 ഫെബ്രുവരി 2010, ഉച്ച കഴിഞ്ഞ് 3:25:50 -നു'],
+                ['ddd, a h -നു',                       'ഞായർ, ഉച്ച കഴിഞ്ഞ് 3 -നു'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 ഫെബ്രുവരി ഫെബ്രു.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 ഞായറാഴ്ച ഞായർ ഞാ'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'ഉച്ച കഴിഞ്ഞ് ഉച്ച കഴിഞ്ഞ്'],
+                ['LTS',                                'ഉച്ച കഴിഞ്ഞ് 3:25:50 -നു'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 ഫെബ്രുവരി 2010'],
+                ['LLL',                                '14 ഫെബ്രുവരി 2010, ഉച്ച കഴിഞ്ഞ് 3:25 -നു'],
+                ['LLLL',                               'ഞായറാഴ്ച, 14 ഫെബ്രുവരി 2010, ഉച്ച കഴിഞ്ഞ് 3:25 -നു'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 ഫെബ്രു. 2010'],
+                ['lll',                                '14 ഫെബ്രു. 2010, ഉച്ച കഴിഞ്ഞ് 3:25 -നു'],
+                ['llll',                               'ഞായർ, 14 ഫെബ്രു. 2010, ഉച്ച കഴിഞ്ഞ് 3:25 -നു']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ജനുവരി ജനു._ഫെബ്രുവരി ഫെബ്രു._മാർച്ച് മാർ._ഏപ്രിൽ ഏപ്രി._മേയ് മേയ്_ജൂൺ ജൂൺ_ജൂലൈ ജൂലൈ._ഓഗസ്റ്റ് ഓഗ._സെപ്റ്റംബർ സെപ്റ്റ._ഒക്ടോബർ ഒക്ടോ._നവംബർ നവം._ഡിസംബർ ഡിസം.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'ഞായറാഴ്ച ഞായർ ഞാ_തിങ്കളാഴ്ച തിങ്കൾ തി_ചൊവ്വാഴ്ച ചൊവ്വ ചൊ_ബുധനാഴ്ച ബുധൻ ബു_വ്യാഴാഴ്ച വ്യാഴം വ്യാ_വെള്ളിയാഴ്ച വെള്ളി വെ_ശനിയാഴ്ച ശനി ശ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'അൽപ നിമിഷങ്ങൾ', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ഒരു മിനിറ്റ്',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ഒരു മിനിറ്റ്',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 മിനിറ്റ്',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 മിനിറ്റ്',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ഒരു മണിക്കൂർ',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ഒരു മണിക്കൂർ',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 മണിക്കൂർ',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 മണിക്കൂർ',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 മണിക്കൂർ',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ഒരു ദിവസം',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ഒരു ദിവസം',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 ദിവസം',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ഒരു ദിവസം',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 ദിവസം',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 ദിവസം',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ഒരു മാസം',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ഒരു മാസം',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ഒരു മാസം',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 മാസം',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 മാസം',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 മാസം',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ഒരു മാസം',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 മാസം',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ഒരു വർഷം',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 വർഷം',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ഒരു വർഷം',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 വർഷം',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'അൽപ നിമിഷങ്ങൾ കഴിഞ്ഞ്',  'prefix');
+        assert.equal(moment(0).from(30000), 'അൽപ നിമിഷങ്ങൾ മുൻപ്', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'അൽപ നിമിഷങ്ങൾ മുൻപ്',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'അൽപ നിമിഷങ്ങൾ കഴിഞ്ഞ്', 'അൽപ നിമിഷങ്ങൾ കഴിഞ്ഞ്');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 ദിവസം കഴിഞ്ഞ്', '5 ദിവസം കഴിഞ്ഞ്');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'ഇന്ന് രാത്രി 2:00 -നു',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'ഇന്ന് രാത്രി 2:25 -നു',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 3}).calendar(),       'ഇന്ന് രാവിലെ 5:00 -നു',     'Now plus 3 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'നാളെ രാത്രി 2:00 -നു',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'ഇന്ന് രാത്രി 1:00 -നു',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'ഇന്നലെ രാത്രി 2:00 -നു', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[കഴിഞ്ഞ] dddd[,] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[കഴിഞ്ഞ] dddd[,] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[കഴിഞ്ഞ] dddd[,] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('a'), 'രാത്രി', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('a'), 'രാവിലെ', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('a'), 'ഉച്ച കഴിഞ്ഞ്', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('a'), 'വൈകുന്നേരം', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('a'), 'വൈകുന്നേരം', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('a'), 'രാത്രി', 'night');
+
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('A'), 'രാത്രി', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('A'), 'രാവിലെ', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('A'), 'ഉച്ച കഴിഞ്ഞ്', ' during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('A'), 'വൈകുന്നേരം', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('A'), 'വൈകുന്നേരം', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('A'), 'രാത്രി', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('mr');
+
+    test('parse', function (assert) {
+        var tests = 'जानेवारी जाने._फेब्रुवारी फेब्रु._मार्च मार्च._एप्रिल एप्रि._मे मे._जून जून._जुलै जुलै._ऑगस्ट ऑग._सप्टेंबर सप्टें._ऑक्टोबर ऑक्टो._नोव्हेंबर नोव्हें._डिसेंबर डिसें.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, a h:mm:ss वाजता', 'रविवार, १४ फेब्रुवारी २०१०, दुपारी ३:२५:५० वाजता'],
+                ['ddd, a h वाजता',                       'रवि, दुपारी ३ वाजता'],
+                ['M Mo MM MMMM MMM',                   '२ २ ०२ फेब्रुवारी फेब्रु.'],
+                ['YYYY YY',                            '२०१० १०'],
+                ['D Do DD',                            '१४ १४ १४'],
+                ['d do dddd ddd dd',                   '० ० रविवार रवि र'],
+                ['DDD DDDo DDDD',                      '४५ ४५ ०४५'],
+                ['w wo ww',                            '८ ८ ०८'],
+                ['h hh',                               '३ ०३'],
+                ['H HH',                               '१५ १५'],
+                ['m mm',                               '२५ २५'],
+                ['s ss',                               '५० ५०'],
+                ['a A',                                'दुपारी दुपारी'],
+                ['LTS',                                'दुपारी ३:२५:५० वाजता'],
+                ['L',                                  '१४/०२/२०१०'],
+                ['LL',                                 '१४ फेब्रुवारी २०१०'],
+                ['LLL',                                '१४ फेब्रुवारी २०१०, दुपारी ३:२५ वाजता'],
+                ['LLLL',                               'रविवार, १४ फेब्रुवारी २०१०, दुपारी ३:२५ वाजता'],
+                ['l',                                  '१४/२/२०१०'],
+                ['ll',                                 '१४ फेब्रु. २०१०'],
+                ['lll',                                '१४ फेब्रु. २०१०, दुपारी ३:२५ वाजता'],
+                ['llll',                               'रवि, १४ फेब्रु. २०१०, दुपारी ३:२५ वाजता']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '१', '१');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '२', '२');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '३', '३');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '४', '४');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '५', '५');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '६', '६');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '७', '७');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '८', '८');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '९', '९');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '१०', '१०');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '११', '११');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '१२', '१२');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '१३', '१३');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '१४', '१४');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '१५', '१५');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '१६', '१६');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '१७', '१७');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '१८', '१८');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '१९', '१९');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '२०', '२०');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '२१', '२१');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '२२', '२२');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '२३', '२३');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '२४', '२४');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '२५', '२५');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '२६', '२६');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '२७', '२७');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '२८', '२८');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '२९', '२९');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '३०', '३०');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '३१', '३१');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'जानेवारी जाने._फेब्रुवारी फेब्रु._मार्च मार्च._एप्रिल एप्रि._मे मे._जून जून._जुलै जुलै._ऑगस्ट ऑग._सप्टेंबर सप्टें._ऑक्टोबर ऑक्टो._नोव्हेंबर नोव्हें._डिसेंबर डिसें.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'रविवार रवि र_सोमवार सोम सो_मंगळवार मंगळ मं_बुधवार बुध बु_गुरूवार गुरू गु_शुक्रवार शुक्र शु_शनिवार शनि श'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'सेकंद', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'एक मिनिट',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'एक मिनिट',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '२ मिनिटे',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true), '४४ मिनिटे', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'एक तास',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'एक तास',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '२ तास',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '५ तास',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '२१ तास',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'एक दिवस',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'एक दिवस',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '२ दिवस',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'एक दिवस',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '५ दिवस',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '२५ दिवस',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true), 'एक महिना', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true), 'एक महिना', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true), 'एक महिना', '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true), '२ महिने', '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true), '२ महिने', '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true), '३ महिने', '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true), 'एक महिना', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true), '५ महिने', '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'एक वर्ष',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '२ वर्षे',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'एक वर्ष',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true), '५ वर्षे', '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'सेकंद नंतर', 'prefix');
+        assert.equal(moment(0).from(30000), 'सेकंद पूर्वी', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'सेकंद पूर्वी',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'सेकंद नंतर', 'सेकंद नंतर');
+        assert.equal(moment().add({d: 5}).fromNow(), '५ दिवस नंतर', '५ दिवस नंतर');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'आज रात्री २:०० वाजता',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'आज रात्री २:२५ वाजता',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 3}).calendar(),       'आज सकाळी ५:०० वाजता',     'Now plus 3 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'उद्या रात्री २:०० वाजता',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'आज रात्री १:०० वाजता',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'काल रात्री २:०० वाजता', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd[,] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(), m.format('[मागील] dddd[,] LT'), 'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('[मागील] dddd[,] LT'), 'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('[मागील] dddd[,] LT'), 'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('a'), 'रात्री', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('a'), 'सकाळी', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('a'), 'दुपारी', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('a'), 'सायंकाळी', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('a'), 'सायंकाळी', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('a'), 'रात्री', 'night');
+
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('A'), 'रात्री', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('A'), 'सकाळी', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('A'), 'दुपारी', ' during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('A'), 'सायंकाळी', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('A'), 'सायंकाळी', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('A'), 'रात्री', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '१ ०१ १', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '१ ०१ १', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '२ ०२ २', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '२ ०२ २', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '३ ०३ ३', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ms-my');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'Januari Jan_Februari Feb_Mac Mac_April Apr_Mei Mei_Jun Jun_Julai Jul_Ogos Ogs_September Sep_Oktober Okt_November Nov_Disember Dis'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' sepatutnya bulan ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Ahad, Februari 14 2010, 3:25:50 petang'],
+                ['ddd, hA',                            'Ahd, 3petang'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 Februari Feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 Ahad Ahd Ah'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '7 7 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'petang petang'],
+                ['[hari] [ke] DDDo [tahun] ini', 'hari ke 45 tahun ini'],
+                ['LTS',                                '15.25.50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Februari 2010'],
+                ['LLL',                                '14 Februari 2010 pukul 15.25'],
+                ['LLLL',                               'Ahad, 14 Februari 2010 pukul 15.25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Feb 2010'],
+                ['lll',                                '14 Feb 2010 pukul 15.25'],
+                ['llll',                               'Ahd, 14 Feb 2010 pukul 15.25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'Januari Jan_Februari Feb_Mac Mac_April Apr_Mei Mei_Jun Jun_Julai Jul_Ogos Ogs_September Sep_Oktober Okt_November Nov_Disember Dis'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'Ahad Ahd Ah_Isnin Isn Is_Selasa Sel Sl_Rabu Rab Rb_Khamis Kha Km_Jumaat Jum Jm_Sabtu Sab Sb'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'beberapa saat', '44 saat = beberapa saat');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'seminit',      '45 saat = seminit');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'seminit',      '89 saat = seminit');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minit',     '90 saat = 2 minit');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minit',    '44 minit = 44 minit');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'sejam',       '45 minit = sejam');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'sejam',       '89 minit = sejam');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 jam',       '90 minit = 2 jam');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 jam',       '5 jam = 5 jam');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 jam',      '21 jam = 21 jam');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'sehari',         '22 jam = sehari');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'sehari',         '35 jam = sehari');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 hari',        '36 jam = 2 hari');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'sehari',         '1 hari = sehari');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 hari',        '5 hari = 5 hari');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 hari',       '25 hari = 25 hari');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'sebulan',       '26 hari = sebulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'sebulan',       '30 hari = sebulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'sebulan',       '45 hari = sebulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 bulan',      '46 hari = 2 bulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 bulan',      '75 hari = 2 bulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 bulan',      '76 hari = 3 bulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'sebulan',       '1 bulan = sebulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 bulan',      '5 bulan = 5 bulan');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'setahun',        '345 hari = setahun');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 tahun',       '548 hari = 2 tahun');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'setahun',        '1 tahun = setahun');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 tahun',       '5 tahun = 5 tahun');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'dalam beberapa saat',  'prefix');
+        assert.equal(moment(0).from(30000), 'beberapa saat yang lepas', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'beberapa saat yang lepas',  'waktu sekarang dari sekarang sepatutnya menunjukkan sebagai telah lepas');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'dalam beberapa saat', 'dalam beberapa saat');
+        assert.equal(moment().add({d: 5}).fromNow(), 'dalam 5 hari', 'dalam 5 hari');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Hari ini pukul 02.00',     'hari ini pada waktu yang sama');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Hari ini pukul 02.25',     'Sekarang tambah 25 minit');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Hari ini pukul 03.00',     'Sekarang tambah 1 jam');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Esok pukul 02.00',  'esok pada waktu yang sama');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hari ini pukul 01.00',     'Sekarang tolak 1 jam');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Kelmarin pukul 02.00', 'kelmarin pada waktu yang sama');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Hari ini + ' + i + ' hari waktu sekarang');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Hari ini + ' + i + ' hari permulaan hari');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [pukul] LT'),  'Hari ini + ' + i + ' hari tamat hari');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [lepas] [pukul] LT'),  'Hari ini - ' + i + ' hari waktu sekarang');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [lepas] [pukul] LT'),  'Hari ini - ' + i + ' hari permulaan hari');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [lepas] [pukul] LT'),  'Hari ini - ' + i + ' hari tamat hari');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 minggu lepas');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'dalam 1 minggu');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 minggu lepas');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'dalam 2 minggu');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 sepatutnya minggu 1');
+        assert.equal(moment([2012, 0,  7]).week(), 2, 'Jan  7 2012 sepatutnya minggu 2');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 sepatutnya minggu 2');
+        assert.equal(moment([2012, 0, 14]).week(), 3, 'Jan 14 2012 sepatutnya minggu 3');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 sepatutnya minggu 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 53, 'Dec 31 2006 sepatutnya minggu 53');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 sepatutnya minggu 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 sepatutnya minggu 1');
+        assert.equal(moment([2007,  0,  7]).week(), 1, 'Jan  7 2007 sepatutnya minggu 1');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 sepatutnya minggu 2');
+        assert.equal(moment([2007,  0, 14]).week(), 2, 'Jan 14 2007 sepatutnya minggu 2');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 30]).week(), 52, 'Dec 30 2007 sepatutnya minggu 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 sepatutnya minggu 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 sepatutnya minggu 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 sepatutnya minggu 1');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 sepatutnya minggu 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 sepatutnya minggu 2');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 52, 'Dec 29 2002 sepatutnya minggu 52');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 sepatutnya minggu 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 sepatutnya minggu 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 sepatutnya minggu 1');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 sepatutnya minggu 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 sepatutnya minggu 2');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 52, 'Dec 28 2008 sepatutnya minggu 52');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 sepatutnya minggu 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 sepatutnya minggu 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 sepatutnya minggu 1');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 sepatutnya minggu 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 sepatutnya minggu 2');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 52, 'Dec 27 2009 sepatutnya minggu 52');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 sepatutnya minggu 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 sepatutnya minggu 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 sepatutnya minggu 1');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 sepatutnya minggu 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 sepatutnya minggu 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 52, 'Dec 26 2010 sepatutnya minggu 52');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 sepatutnya minggu 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 sepatutnya minggu 1');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 sepatutnya minggu 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 sepatutnya minggu 2');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 sepatutnya minggu 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '2 02 2', 'Jan  7 2012 sepatutnya minggu 2');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 sepatutnya minggu 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '3 03 3', 'Jan 14 2012 sepatutnya minggu 3');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 sepatutnya minggu 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('my');
+
+    test('parse', function (assert) {
+        var tests = 'ဇန်နဝါရီ ဇန်_ဖေဖော်ဝါရီ ဖေ_မတ် မတ်_ဧပြီ ပြီ_မေ မေ_ဇွန် ဇွန်_ဇူလိုင် လိုင်_သြဂုတ် သြ_စက်တင်ဘာ စက်_အောက်တိုဘာ အောက်_နိုဝင်ဘာ နို_ဒီဇင်ဘာ ဒီ'.split('_'),
+            i;
+
+        function equalTest (input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a', 'တနင်္ဂနွေ, ဖေဖော်ဝါရီ ၁၄ ၂၀၁၀, ၃:၂၅:၅၀ pm'],
+                ['ddd, hA', 'နွေ, ၃PM'],
+                ['M Mo MM MMMM MMM', '၂ ၂ ၀၂ ဖေဖော်ဝါရီ ဖေ'],
+                ['YYYY YY', '၂၀၁၀ ၁၀'],
+                ['D Do DD', '၁၄ ၁၄ ၁၄'],
+                ['d do dddd ddd dd', '၀ ၀ တနင်္ဂနွေ နွေ နွေ'],
+                ['DDD DDDo DDDD', '၄၅ ၄၅ ၀၄၅'],
+                ['w wo ww', '၆ ၆ ၀၆'],
+                ['h hh', '၃ ၀၃'],
+                ['H HH', '၁၅ ၁၅'],
+                ['m mm', '၂၅ ၂၅'],
+                ['s ss', '၅၀ ၅၀'],
+                ['a A', 'pm PM'],
+                ['[နှစ်၏] DDDo [ရက်မြောက်]', 'နှစ်၏ ၄၅ ရက်မြောက်'],
+                ['LTS', '၁၅:၂၅:၅၀'],
+                ['L', '၁၄/၀၂/၂၀၁၀'],
+                ['LL', '၁၄ ဖေဖော်ဝါရီ ၂၀၁၀'],
+                ['LLL', '၁၄ ဖေဖော်ဝါရီ ၂၀၁၀ ၁၅:၂၅'],
+                ['LLLL', 'တနင်္ဂနွေ ၁၄ ဖေဖော်ဝါရီ ၂၀၁၀ ၁၅:၂၅'],
+                ['l', '၁၄/၂/၂၀၁၀'],
+                ['ll', '၁၄ ဖေ ၂၀၁၀'],
+                ['lll', '၁၄ ဖေ ၂၀၁၀ ၁၅:၂၅'],
+                ['llll', 'နွေ ၁၄ ဖေ ၂၀၁၀ ၁၅:၂၅']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '၁', '၁');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '၂', '၂');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '၃', '၃');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '၄', '၄');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '၅', '၅');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '၆', '၆');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '၇', '၇');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '၈', '၈');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '၉', '၉');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '၁၀', '၁၀');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '၁၁', '၁၁');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '၁၂', '၁၂');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '၁၃', '၁၃');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '၁၄', '၁၄');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '၁၅', '၁၅');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '၁၆', '၁၆');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '၁၇', '၁၇');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '၁၈', '၁၈');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '၁၉', '၁၉');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '၂၀', '၂၀');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '၂၁', '၂၁');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '၂၂', '၂၂');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '၂၃', '၂၃');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '၂၄', '၂၄');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '၂၅', '၂၅');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '၂၆', '၂၆');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '၂၇', '၂၇');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '၂၈', '၂၈');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '၂၉', '၂၉');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '၃၀', '၃၀');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '၃၁', '၃၁');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ဇန်နဝါရီ ဇန်_ဖေဖော်ဝါရီ ဖေ_မတ် မတ်_ဧပြီ ပြီ_မေ မေ_ဇွန် ဇွန်_ဇူလိုင် လိုင်_သြဂုတ် သြ_စက်တင်ဘာ စက်_အောက်တိုဘာ အောက်_နိုဝင်ဘာ နို_ဒီဇင်ဘာ ဒီ'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'တနင်္ဂနွေ နွေ နွေ_တနင်္လာ လာ လာ_အင်္ဂါ ဂါ ဂါ_ဗုဒ္ဓဟူး ဟူး ဟူး_ကြာသပတေး ကြာ ကြာ_သောကြာ သော သော_စနေ နေ နေ'.split('_'),
+            i;
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 44
+        }), true), 'စက္ကန်.အနည်းငယ်', '၄၄ စက္ကန်. = စက္ကန်.အနည်းငယ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 45
+        }), true), 'တစ်မိနစ်', '၄၅ စက္ကန်. = တစ်မိနစ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 89
+        }), true), 'တစ်မိနစ်', '၈၉ စက္ကန်. = တစ်မိနစ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            s: 90
+        }), true), '၂ မိနစ်', '၉၀ စက္ကန်. =  ၂ မိနစ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 44
+        }), true), '၄၄ မိနစ်', '၄၄ မိနစ် = ၄၄ မိနစ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 45
+        }), true), 'တစ်နာရီ', '၄၅ မိနစ် = ၁ နာရီ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 89
+        }), true), 'တစ်နာရီ', '၈၉ မိနစ် = တစ်နာရီ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            m: 90
+        }), true), '၂ နာရီ', 'မိနစ် ၉၀= ၂ နာရီ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 5
+        }), true), '၅ နာရီ', '၅ နာရီ= ၅ နာရီ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 21
+        }), true), '၂၁ နာရီ', '၂၁ နာရီ =၂၁ နာရီ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 22
+        }), true), 'တစ်ရက်', '၂၂ နာရီ =တစ်ရက်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 35
+        }), true), 'တစ်ရက်', '၃၅ နာရီ =တစ်ရက်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            h: 36
+        }), true), '၂ ရက်', '၃၆ နာရီ = ၂ ရက်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 1
+        }), true), 'တစ်ရက်', '၁ ရက်= တစ်ရက်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 5
+        }), true), '၅ ရက်', '၅ ရက် = ၅ ရက်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 25
+        }), true), '၂၅ ရက်', '၂၅ ရက်= ၂၅ ရက်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 26
+        }), true), 'တစ်လ', '၂၆ ရက် = တစ်လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 30
+        }), true), 'တစ်လ', 'ရက် ၃၀ = တစ်လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 43
+        }), true), 'တစ်လ', '၄၃ ရက် = တစ်လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 46
+        }), true), '၂ လ', '၄၆ ရက် = ၂ လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 74
+        }), true), '၂ လ', '၇၅ ရက်= ၂ လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 76
+        }), true), '၃ လ', '၇၆ ရက် = ၃ လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            M: 1
+        }), true), 'တစ်လ', '၁ လ = တစ်လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            M: 5
+        }), true), '၅ လ', '၅ လ = ၅ လ');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 345
+        }), true), 'တစ်နှစ်', '၃၄၅ ရက် = တစ်နှစ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            d: 548
+        }), true), '၂ နှစ်', '၅၄၈ ရက် = ၂ နှစ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            y: 1
+        }), true), 'တစ်နှစ်', '၁ နှစ် = တစ်နှစ်');
+        assert.equal(start.from(moment([2007, 1, 28]).add({
+            y: 5
+        }), true), '၅ နှစ်', '၅ နှစ် = ၅ နှစ်');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'လာမည့် စက္ကန်.အနည်းငယ် မှာ', 'prefix');
+        assert.equal(moment(0).from(30000), 'လွန်ခဲ့သော စက္ကန်.အနည်းငယ် က', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'လွန်ခဲ့သော စက္ကန်.အနည်းငယ် က', 'ယခုမှစပြီး အတိတ်တွင်ဖော်ပြသလိုဖော်ပြမည်');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({
+            s: 30
+        }).fromNow(), 'လာမည့် စက္ကန်.အနည်းငယ် မှာ', 'လာမည့် စက္ကန်.အနည်းငယ် မှာ');
+        assert.equal(moment().add({
+            d: 5
+        }).fromNow(), 'လာမည့် ၅ ရက် မှာ', 'လာမည့် ၅ ရက် မှာ');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(), 'ယနေ. ၀၂:၀၀ မှာ', 'ယနေ. ဒီအချိန်');
+        assert.equal(moment(a).add({
+            m: 25
+        }).calendar(), 'ယနေ. ၀၂:၂၅ မှာ', 'ယခုမှ ၂၅ မိနစ်ပေါင်းထည့်');
+        assert.equal(moment(a).add({
+            h: 1
+        }).calendar(), 'ယနေ. ၀၃:၀၀ မှာ', 'ယခုမှ ၁ နာရီပေါင်းထည့်');
+        assert.equal(moment(a).add({
+            d: 1
+        }).calendar(), 'မနက်ဖြန် ၀၂:၀၀ မှာ', 'မနက်ဖြန် ဒီအချိန်');
+        assert.equal(moment(a).subtract({
+            h: 1
+        }).calendar(), 'ယနေ. ၀၁:၀၀ မှာ', 'ယခုမှ ၁ နာရီနှုတ်');
+        assert.equal(moment(a).subtract({
+            d: 1
+        }).calendar(), 'မနေ.က ၀၂:၀၀ မှာ', 'မနေ.က ဒီအချိန်');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({
+                d: i
+            });
+            assert.equal(m.calendar(), m.format('dddd LT [မှာ]'), 'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('dddd LT [မှာ]'), 'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('dddd LT [မှာ]'), 'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({
+                d: i
+            });
+            assert.equal(m.calendar(), m.format('[ပြီးခဲ့သော] dddd LT [မှာ]'), 'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format('[ပြီးခဲ့သော] dddd LT [မှာ]'), 'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format('[ပြီးခဲ့သော] dddd LT [မှာ]'), 'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({
+                w: 1
+            }),
+            weeksFromNow = moment().add({
+                w: 1
+            });
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), 'လွန်ခဲ့သော ၁ ပတ်က');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), '၁ ပတ်အတွင်း');
+
+        weeksAgo = moment().subtract({
+            w: 2
+        });
+        weeksFromNow = moment().add({
+            w: 2
+        });
+
+        assert.equal(weeksAgo.calendar(), weeksAgo.format('L'), '၂ ပတ် အရင်က');
+        assert.equal(weeksFromNow.calendar(), weeksFromNow.format('L'), '၂ ပတ် အတွင်း');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(), 1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(), 1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(), 2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(), 1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(), 2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008, 0, 1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008, 0, 6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008, 0, 7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008, 0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008, 0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003, 0, 1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003, 0, 5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003, 0, 6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003, 0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003, 0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009, 0, 1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009, 0, 4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009, 0, 5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009, 0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009, 0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010, 0, 1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010, 0, 3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010, 0, 4]).week(), 1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010, 0, 10]).week(), 1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010, 0, 11]).week(), 2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011, 0, 1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011, 0, 2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011, 0, 3]).week(), 1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011, 0, 9]).week(), 1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011, 0, 10]).week(), 2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0, 1]).format('w ww wo'), '၅၂ ၅၂ ၅၂', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).format('w ww wo'), '၁ ၀၁ ၁', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).format('w ww wo'), '၁ ၀၁ ၁', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).format('w ww wo'), '၂ ၀၂ ၂', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '၂ ၀၂ ၂', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('nb');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan_februar feb_mars mar_april apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'søndag, februar 14. 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'søn, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. søndag søn sø'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[den] DDDo [dagen i året]',          'den 45. dagen i året'],
+                ['LTS',                                '15.25.50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14. februar 2010'],
+                ['LLL',                                '14. februar 2010 kl. 15.25'],
+                ['LLLL',                               'søndag 14. februar 2010 kl. 15.25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14. feb 2010'],
+                ['lll',                                '14. feb 2010 kl. 15.25'],
+                ['llll',                               'søn 14. feb 2010 kl. 15.25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan_februar feb_mars mar_april apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'søndag søn sø_mandag man ma_tirsdag tirs ti_onsdag ons on_torsdag tors to_fredag fre fr_lørdag lør lø'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'noen sekunder', '44 sekunder = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ett minutt',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ett minutt',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutter',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutter',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'en time',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'en time',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 timer',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 timer',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 timer',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'en dag',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'en dag',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dager',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'en dag',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dager',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dager',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'en måned',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'en måned',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'en måned',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 måneder',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 måneder',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 måneder',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'en måned',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 måneder',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ett år',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 år',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ett år',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 år',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'om noen sekunder',  'prefix');
+        assert.equal(moment(0).from(30000), 'for noen sekunder siden', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'for noen sekunder siden',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'om noen sekunder', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'om 5 dager', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'i dag kl. 2.00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'i dag kl. 2.25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'i dag kl. 3.00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'i morgen kl. 2.00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'i dag kl. 1.00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'i går kl. 2.00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [kl.] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [kl.] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [kl.] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[forrige] dddd [kl.] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[forrige] dddd [kl.] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[forrige] dddd [kl.] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),  '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),  '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ne');
+
+    test('parse', function (assert) {
+        var tests = 'जनवरी जन._फेब्रुवरी फेब्रु._मार्च मार्च_अप्रिल अप्रि._मई मई_जुन जुन_जुलाई जुलाई._अगष्ट अग._सेप्टेम्बर सेप्ट._अक्टोबर अक्टो._नोभेम्बर नोभे._डिसेम्बर डिसे.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, aको h:mm:ss बजे',       'आइतबार, १४ फेब्रुवरी २०१०, बेलुकाको ३:२५:५० बजे'],
+                ['ddd, aको h बजे',                                                      'आइत., बेलुकाको ३ बजे'],
+                ['M Mo MM MMMM MMM',                   '२ २ ०२ फेब्रुवरी फेब्रु.'],
+                ['YYYY YY',                            '२०१० १०'],
+                ['D Do DD',                            '१४ १४ १४'],
+                ['d do dddd ddd dd',                   '० ० आइतबार आइत. आइ.'],
+                ['DDD DDDo DDDD',                      '४५ ४५ ०४५'],
+                ['w wo ww',                            '७ ७ ०७'],
+                ['h hh',                               '३ ०३'],
+                ['H HH',                               '१५ १५'],
+                ['m mm',                               '२५ २५'],
+                ['s ss',                               '५० ५०'],
+                ['a A',                                'बेलुका बेलुका'],
+                ['LTS',                                'बेलुकाको ३:२५:५० बजे'],
+                ['L',                                  '१४/०२/२०१०'],
+                ['LL',                                 '१४ फेब्रुवरी २०१०'],
+                ['LLL',                                '१४ फेब्रुवरी २०१०, बेलुकाको ३:२५ बजे'],
+                ['LLLL',                               'आइतबार, १४ फेब्रुवरी २०१०, बेलुकाको ३:२५ बजे'],
+                ['l',                                  '१४/२/२०१०'],
+                ['ll',                                 '१४ फेब्रु. २०१०'],
+                ['lll',                                '१४ फेब्रु. २०१०, बेलुकाको ३:२५ बजे'],
+                ['llll',                               'आइत., १४ फेब्रु. २०१०, बेलुकाको ३:२५ बजे']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '१', '१');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '२', '२');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '३', '३');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '४', '४');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '५', '५');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '६', '६');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '७', '७');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '८', '८');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '९', '९');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '१०', '१०');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '११', '११');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '१२', '१२');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '१३', '१३');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '१४', '१४');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '१५', '१५');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '१६', '१६');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '१७', '१७');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '१८', '१८');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '१९', '१९');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '२०', '२०');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '२१', '२१');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '२२', '२२');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '२३', '२३');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '२४', '२४');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '२५', '२५');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '२६', '२६');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '२७', '२७');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '२८', '२८');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '२९', '२९');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '३०', '३०');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '३१', '३१');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'जनवरी जन._फेब्रुवरी फेब्रु._मार्च मार्च_अप्रिल अप्रि._मई मई_जुन जुन_जुलाई जुलाई._अगष्ट अग._सेप्टेम्बर सेप्ट._अक्टोबर अक्टो._नोभेम्बर नोभे._डिसेम्बर डिसे.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'आइतबार आइत. आइ._सोमबार सोम. सो._मङ्गलबार मङ्गल. मङ्_बुधबार बुध. बु._बिहिबार बिहि. बि._शुक्रबार शुक्र. शु._शनिबार शनि. श.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'केही समय', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'एक मिनेट',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'एक मिनेट',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '२ मिनेट',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '४४ मिनेट',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'एक घण्टा',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'एक घण्टा',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '२ घण्टा',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '५ घण्टा',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '२१ घण्टा',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'एक दिन',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'एक दिन',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '२ दिन',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'एक दिन',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '५ दिन',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '२५ दिन',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'एक महिना',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'एक महिना',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'एक महिना',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '२ महिना',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '२ महिना',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '३ महिना',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'एक महिना',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '५ महिना',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'एक बर्ष',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '२ बर्ष',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'एक बर्ष',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '५ बर्ष',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'केही समयमा',  'prefix');
+        assert.equal(moment(0).from(30000), 'केही समय अगाडी', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'केही समय अगाडी',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'केही समयमा', 'केही समयमा');
+        assert.equal(moment().add({d: 5}).fromNow(), '५ दिनमा', '५ दिनमा');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'आज रातीको २:०० बजे',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'आज रातीको २:२५ बजे',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'आज बिहानको ३:०० बजे',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'भोली रातीको २:०० बजे',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'आज रातीको १:०० बजे',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'हिजो रातीको २:०० बजे', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[आउँदो] dddd[,] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[आउँदो] dddd[,] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[आउँदो] dddd[,] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[गएको] dddd[,] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[गएको] dddd[,] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[गएको] dddd[,] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('a'), 'राती', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('a'), 'बिहान', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('a'), 'दिउँसो', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('a'), 'बेलुका', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('a'), 'साँझ', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('a'), 'राती', 'night');
+
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('A'), 'राती', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('A'), 'बिहान', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('A'), 'दिउँसो', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('A'), 'बेलुका', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('A'), 'साँझ', 'late evening');
+        assert.equal(moment([2011, 2, 23, 21, 20]).format('A'), 'राती', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '१ ०१ १', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '१ ०१ १', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '२ ०२ २', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '२ ०२ २', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '३ ०३ ३', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('nl');
+
+    test('parse', function (assert) {
+        var tests = 'januari jan._februari feb._maart mrt._april apr._mei mei._juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, HH:mm:ss',       'zondag, februari 14de 2010, 15:25:50'],
+                ['ddd, HH',                            'zo., 15'],
+                ['M Mo MM MMMM MMM',                   '2 2de 02 februari feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14de 14'],
+                ['d do dddd ddd dd',                   '0 0de zondag zo. Zo'],
+                ['DDD DDDo DDDD',                      '45 45ste 045'],
+                ['w wo ww',                            '6 6de 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45ste day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14-02-2010'],
+                ['LL',                                 '14 februari 2010'],
+                ['LLL',                                '14 februari 2010 15:25'],
+                ['LLLL',                               'zondag 14 februari 2010 15:25'],
+                ['l',                                  '14-2-2010'],
+                ['ll',                                 '14 feb. 2010'],
+                ['lll',                                '14 feb. 2010 15:25'],
+                ['llll',                               'zo. 14 feb. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1ste', '1ste');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2de', '2de');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3de', '3de');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4de', '4de');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5de', '5de');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6de', '6de');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7de', '7de');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8ste', '8ste');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9de', '9de');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10de', '10de');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11de', '11de');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12de', '12de');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13de', '13de');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14de', '14de');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15de', '15de');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16de', '16de');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17de', '17de');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18de', '18de');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19de', '19de');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20ste', '20ste');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21ste', '21ste');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22ste', '22ste');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23ste', '23ste');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24ste', '24ste');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25ste', '25ste');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26ste', '26ste');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27ste', '27ste');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28ste', '28ste');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29ste', '29ste');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30ste', '30ste');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31ste', '31ste');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januari jan._februari feb._maart mrt._april apr._mei mei_juni jun._juli jul._augustus aug._september sep._oktober okt._november nov._december dec.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'zondag zo. Zo_maandag ma. Ma_dinsdag di. Di_woensdag wo. Wo_donderdag do. Do_vrijdag vr. Vr_zaterdag za. Za'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'een paar seconden', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'één minuut',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'één minuut',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuten',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuten',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'één uur',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'één uur',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 uur',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 uur',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 uur',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'één dag',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'één dag',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dagen',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'één dag',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dagen',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dagen',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'één maand',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'één maand',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'één maand',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 maanden',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 maanden',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 maanden',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'één maand',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 maanden',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'één jaar',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 jaar',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'één jaar',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 jaar',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'over een paar seconden',  'prefix');
+        assert.equal(moment(0).from(30000), 'een paar seconden geleden', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'een paar seconden geleden',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'over een paar seconden', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'over 5 dagen', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'vandaag om 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'vandaag om 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'vandaag om 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'morgen om 02:00',    'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'vandaag om 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'gisteren om 02:00',   'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [om] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[afgelopen] dddd [om] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[afgelopen] dddd [om] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[afgelopen] dddd [om] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('month abbreviation', function (assert) {
+        assert.equal(moment([2012, 5, 23]).format('D-MMM-YYYY'), '23-jun-2012', 'format month abbreviation surrounded by dashes should not include a dot');
+        assert.equal(moment([2012, 5, 23]).format('D MMM YYYY'), '23 jun. 2012', 'format month abbreviation not surrounded by dashes should include a dot');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52ste', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1ste', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1ste', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),    '2 02 2de', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),    '2 02 2de', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('nn');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan_februar feb_mars mar_april apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'sundag, februar 14. 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'sun, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. sundag sun su'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 februar 2010'],
+                ['LLL',                                '14 februar 2010 15:25'],
+                ['LLLL',                               'sundag 14 februar 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 feb 2010'],
+                ['lll',                                '14 feb 2010 15:25'],
+                ['llll',                               'sun 14 feb 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan_februar feb_mars mar_april apr_mai mai_juni jun_juli jul_august aug_september sep_oktober okt_november nov_desember des'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'sundag sun su_måndag mån må_tysdag tys ty_onsdag ons on_torsdag tor to_fredag fre fr_laurdag lau lø'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'nokre sekund', '44 sekunder = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'eit minutt',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'eit minutt',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutt',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutt',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ein time',     '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ein time',     '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 timar',      '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 timar',      '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 timar',     '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ein dag',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ein dag',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dagar',      '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ein dag',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dagar',      '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dagar',     '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ein månad',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ein månad',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ein månad',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 månader',    '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 månader',    '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 månader',    '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ein månad',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 månader',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'eit år',       '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 år',         '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'eit år',       '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 år',         '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'om nokre sekund',  'prefix');
+        assert.equal(moment(0).from(30000), 'for nokre sekund sidan', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'for nokre sekund sidan',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'om nokre sekund', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'om 5 dagar', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'I dag klokka 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'I dag klokka 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'I dag klokka 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'I morgon klokka 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'I dag klokka 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'I går klokka 02:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [klokka] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [klokka] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [klokka] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Føregåande] dddd [klokka] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Føregåande] dddd [klokka] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Føregåande] dddd [klokka] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('pl');
+
+    test('parse', function (assert) {
+        var tests = 'styczeń stycznia sty_luty lutego lut_marzec marca mar_kwiecień kwietnia kwi_maj maja maj_czerwiec czerwca cze_lipiec lipca lip_sierpień sierpnia sie_wrzesień września wrz_październik października paź_listopad listopada lis_grudzień grudnia gru'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][2], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][2], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][2].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][2].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('parse strict', function (assert) {
+        var tests = 'styczeń stycznia sty_luty lutego lut_marzec marca mar_kwiecień kwietnia kwi_maj maja maj_czerwiec czerwca cze_lipiec lipca lip_sierpień sierpnia sie_wrzesień września wrz_październik października paź_listopad listopada lis_grudzień grudnia gru'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm, true).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][2], 'MMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][2].toLocaleLowerCase(), 'MMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][2].toLocaleUpperCase(), 'MMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'niedziela, luty 14. 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'nie, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 luty lut'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. niedziela nie N'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 lutego 2010'],
+                ['LLL',                                '14 lutego 2010 15:25'],
+                ['LLLL',                               'niedziela, 14 lutego 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 lut 2010'],
+                ['lll',                                '14 lut 2010 15:25'],
+                ['llll',                               'nie, 14 lut 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'styczeń sty_luty lut_marzec mar_kwiecień kwi_maj maj_czerwiec cze_lipiec lip_sierpień sie_wrzesień wrz_październik paź_listopad lis_grudzień gru'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'niedziela nie N_poniedziałek pon Pn_wtorek wt Wt_środa śr Śr_czwartek czw Cz_piątek pt Pt_sobota sb So'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'kilka sekund',  '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minuta',        '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minuta',        '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuty',      '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuty',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'godzina',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'godzina',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 godziny',     '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 godzin',      '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 godzin',     '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  '1 dzień',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  '1 dzień',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dni',         '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   '1 dzień',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dni',         '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dni',        '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'miesiąc',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'miesiąc',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'miesiąc',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 miesiące',    '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 miesiące',    '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 miesiące',    '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'miesiąc',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 miesięcy',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'rok',           '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 lata',        '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'rok',           '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 lat',         '5 years = 5 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 112}), true), '112 lat',       '112 years = 112 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 122}), true), '122 lata',      '122 years = 122 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 213}), true), '213 lat',       '213 years = 213 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 223}), true), '223 lata',      '223 years = 223 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'za kilka sekund',  'prefix');
+        assert.equal(moment(0).from(30000), 'kilka sekund temu', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'kilka sekund temu',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'za kilka sekund', 'in a few seconds');
+        assert.equal(moment().add({h: 1}).fromNow(), 'za godzinę', 'in an hour');
+        assert.equal(moment().add({d: 5}).fromNow(), 'za 5 dni', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Dziś o 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Dziś o 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Dziś o 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Jutro o 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Dziś o 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Wczoraj o 02:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[W] dddd [o] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[W] dddd [o] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[W] dddd [o] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[W zeszłą niedzielę o] LT';
+            case 3:
+                return '[W zeszłą środę o] LT';
+            case 6:
+                return '[W zeszłą sobotę o] LT';
+            default:
+                return '[W zeszły] dddd [o] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(), m.format(makeFormat(m)), 'Today - ' + i + ' days current time');
+
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(), m.format(makeFormat(m)), 'Today - ' + i + ' days beginning of day');
+
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(), m.format(makeFormat(m)), 'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('pt-br');
+
+    test('parse', function (assert) {
+        var tests = 'janeiro jan_fevereiro fev_março mar_abril abr_maio mai_junho jun_julho jul_agosto ago_setembro set_outubro out_novembro nov_dezembro dez'.split('_'), i;
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domingo, Fevereiro 14º 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Dom, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2º 02 Fevereiro Fev'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14º 14'],
+                ['d do dddd ddd',                      '0 0º Domingo Dom'],
+                ['DDD DDDo DDDD',                      '45 45º 045'],
+                ['w wo ww',                            '8 8º 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45º day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 de Fevereiro de 2010'],
+                ['LLL',                                '14 de Fevereiro de 2010 às 15:25'],
+                ['LLLL',                               'Domingo, 14 de Fevereiro de 2010 às 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 de Fev de 2010'],
+                ['lll',                                '14 de Fev de 2010 às 15:25'],
+                ['llll',                               'Dom, 14 de Fev de 2010 às 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3º', '3º');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4º', '4º');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5º', '5º');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6º', '6º');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7º', '7º');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8º', '8º');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9º', '9º');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10º', '10º');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11º', '11º');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12º', '12º');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13º', '13º');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14º', '14º');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15º', '15º');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16º', '16º');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17º', '17º');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18º', '18º');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19º', '19º');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20º', '20º');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21º', '21º');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22º', '22º');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23º', '23º');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24º', '24º');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25º', '25º');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26º', '26º');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27º', '27º');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28º', '28º');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29º', '29º');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30º', '30º');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31º', '31º');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Janeiro Jan_Fevereiro Fev_Março Mar_Abril Abr_Maio Mai_Junho Jun_Julho Jul_Agosto Ago_Setembro Set_Outubro Out_Novembro Nov_Dezembro Dez'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Domingo Dom_Segunda-Feira Seg_Terça-Feira Ter_Quarta-Feira Qua_Quinta-Feira Qui_Sexta-Feira Sex_Sábado Sáb'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'segundos',    '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'um minuto',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'um minuto',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutos',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutos', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'uma hora',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'uma hora',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 horas',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 horas',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 horas',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'um dia',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'um dia',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dias',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'um dia',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dias',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dias',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'um mês',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'um mês',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'um mês',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 meses',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 meses',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 meses',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'um mês',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 meses',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'um ano',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 anos',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'um ano',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 anos',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'em segundos', 'prefix');
+        assert.equal(moment(0).from(30000), 'segundos atrás', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'em segundos', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'em 5 dias', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Hoje às 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Hoje às 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Hoje às 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Amanhã às 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hoje às 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Ontem às 02:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [às] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [às] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [às] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format((m.day() === 0 || m.day() === 6) ? '[Último] dddd [às] LT' : '[Última] dddd [às] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format((m.day() === 0 || m.day() === 6) ? '[Último] dddd [às] LT' : '[Última] dddd [às] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format((m.day() === 0 || m.day() === 6) ? '[Último] dddd [às] LT' : '[Última] dddd [às] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1º', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1º', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2º', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2º', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3º', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('pt');
+
+    test('parse', function (assert) {
+        var tests = 'Janeiro Jan_Fevereiro Fev_Março Mar_Abril Abr_Maio Mai_Junho Jun_Julho Jul_Agosto Ago_Setembro Set_Outubro Out_Novembro Nov_Dezembro Dez'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Domingo, Fevereiro 14º 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Dom, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2º 02 Fevereiro Fev'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14º 14'],
+                ['d do dddd ddd',                      '0 0º Domingo Dom'],
+                ['DDD DDDo DDDD',                      '45 45º 045'],
+                ['w wo ww',                            '6 6º 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45º day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 de Fevereiro de 2010'],
+                ['LLL',                                '14 de Fevereiro de 2010 15:25'],
+                ['LLLL',                               'Domingo, 14 de Fevereiro de 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 de Fev de 2010'],
+                ['lll',                                '14 de Fev de 2010 15:25'],
+                ['llll',                               'Dom, 14 de Fev de 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1º', '1º');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2º', '2º');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3º', '3º');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4º', '4º');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5º', '5º');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6º', '6º');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7º', '7º');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8º', '8º');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9º', '9º');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10º', '10º');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11º', '11º');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12º', '12º');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13º', '13º');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14º', '14º');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15º', '15º');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16º', '16º');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17º', '17º');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18º', '18º');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19º', '19º');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20º', '20º');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21º', '21º');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22º', '22º');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23º', '23º');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24º', '24º');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25º', '25º');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26º', '26º');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27º', '27º');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28º', '28º');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29º', '29º');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30º', '30º');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31º', '31º');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Janeiro Jan_Fevereiro Fev_Março Mar_Abril Abr_Maio Mai_Junho Jun_Julho Jul_Agosto Ago_Setembro Set_Outubro Out_Novembro Nov_Dezembro Dez'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Domingo Dom Dom_Segunda-Feira Seg 2ª_Terça-Feira Ter 3ª_Quarta-Feira Qua 4ª_Quinta-Feira Qui 5ª_Sexta-Feira Sex 6ª_Sábado Sáb Sáb'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'segundos',    '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'um minuto',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'um minuto',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minutos',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minutos', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'uma hora',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'uma hora',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 horas',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 horas',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 horas',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'um dia',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'um dia',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dias',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'um dia',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dias',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dias',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'um mês',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'um mês',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'um mês',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 meses',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 meses',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 meses',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'um mês',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 meses',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'um ano',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 anos',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'um ano',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 anos',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'em segundos', 'prefix');
+        assert.equal(moment(0).from(30000), 'há segundos', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'em segundos', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'em 5 dias', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Hoje às 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Hoje às 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Hoje às 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Amanhã às 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hoje às 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Ontem às 02:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [às] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [às] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [às] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format((m.day() === 0 || m.day() === 6) ? '[Último] dddd [às] LT' : '[Última] dddd [às] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format((m.day() === 0 || m.day() === 6) ? '[Último] dddd [às] LT' : '[Última] dddd [às] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format((m.day() === 0 || m.day() === 6) ? '[Último] dddd [às] LT' : '[Última] dddd [às] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52º', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),  '1 01 1º', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),  '1 01 1º', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),  '2 02 2º', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),  '2 02 2º', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ro');
+
+    test('parse', function (assert) {
+        var tests = 'ianuarie ian._februarie febr._martie mart._aprilie apr._mai mai_iunie iun._iulie iul._august aug._septembrie sept._octombrie oct._noiembrie nov._decembrie dec.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss A',  'duminică, februarie 14 2010, 3:25:50 PM'],
+                ['ddd, hA',                        'Dum, 3PM'],
+                ['M Mo MM MMMM MMM',               '2 2 02 februarie febr.'],
+                ['YYYY YY',                        '2010 10'],
+                ['D Do DD',                        '14 14 14'],
+                ['d do dddd ddd dd',               '0 0 duminică Dum Du'],
+                ['DDD DDDo DDDD',                  '45 45 045'],
+                ['w wo ww',                        '7 7 07'],
+                ['h hh',                           '3 03'],
+                ['H HH',                           '15 15'],
+                ['m mm',                           '25 25'],
+                ['s ss',                           '50 50'],
+                ['a A',                            'pm PM'],
+                ['[a] DDDo[a zi a anului]',        'a 45a zi a anului'],
+                ['LTS',                            '15:25:50'],
+                ['L',                              '14.02.2010'],
+                ['LL',                             '14 februarie 2010'],
+                ['LLL',                            '14 februarie 2010 15:25'],
+                ['LLLL',                           'duminică, 14 februarie 2010 15:25'],
+                ['l',                              '14.2.2010'],
+                ['ll',                             '14 febr. 2010'],
+                ['lll',                            '14 febr. 2010 15:25'],
+                ['llll',                           'Dum, 14 febr. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ianuarie ian._februarie febr._martie mart._aprilie apr._mai mai_iunie iun._iulie iul._august aug._septembrie sept._octombrie oct._noiembrie nov._decembrie dec.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'duminică Dum Du_luni Lun Lu_marți Mar Ma_miercuri Mie Mi_joi Joi Jo_vineri Vin Vi_sâmbătă Sâm Sâ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'câteva secunde', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'un minut',       '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'un minut',       '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minute',       '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 de minute',   '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'o oră',          '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'o oră',          '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ore',          '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ore',          '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 de ore',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'o zi',           '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'o zi',           '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 zile',         '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'o zi',           '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 zile',         '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 de zile',     '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'o lună',         '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'o lună',         '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'o lună',         '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 luni',         '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 luni',         '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 luni',         '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'o lună',         '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 luni',         '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'un an',          '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ani',          '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'un an',          '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ani',          '5 years = 5 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 19}), true),   '19 ani',        '19 years = 19 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 20}), true),   '20 de ani',     '20 years = 20 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 100}), true),   '100 de ani',   '100 years = 100 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 101}), true),   '101 ani',      '101 years = 101 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 119}), true),   '119 ani',      '119 years = 119 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 120}), true),   '120 de ani',   '120 years = 120 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 219}), true),   '219 ani',      '219 years = 219 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 220}), true),   '220 de ani',   '220 years = 220 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'peste câteva secunde',   'prefix');
+        assert.equal(moment(0).from(30000), 'câteva secunde în urmă', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'câteva secunde în urmă',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'peste câteva secunde', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'peste 5 zile', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'azi la 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'azi la 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'azi la 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'mâine la 2:00',   'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'azi la 1:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'ieri la 2:00',    'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [la] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [la] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [la] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[fosta] dddd [la] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[fosta] dddd [la] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[fosta] dddd [la] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ru');
+
+    test('parse', function (assert) {
+        var tests = 'январь янв_февраль фев_март март_апрель апр_май май_июнь июнь_июль июль_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('parse exceptional case', function (assert) {
+        assert.equal(moment('11 мая 1989', ['DD MMMM YYYY']).format('DD-MM-YYYY'), '11-05-1989');
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, HH:mm:ss',       'воскресенье, 14-го февраля 2010, 15:25:50'],
+                ['ddd, h A',                           'вс, 3 дня'],
+                ['M Mo MM MMMM MMM',                   '2 2-й 02 февраль фев'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-го 14'],
+                ['d do dddd ddd dd',                   '0 0-й воскресенье вс вс'],
+                ['DDD DDDo DDDD',                      '45 45-й 045'],
+                ['w wo ww',                            '7 7-я 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'дня дня'],
+                ['DDDo [день года]',                   '45-й день года'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 февраля 2010 г.'],
+                ['LLL',                                '14 февраля 2010 г., 15:25'],
+                ['LLLL',                               'воскресенье, 14 февраля 2010 г., 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 фев 2010 г.'],
+                ['lll',                                '14 фев 2010 г., 15:25'],
+                ['llll',                               'вс, 14 фев 2010 г., 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format meridiem', function (assert) {
+        assert.equal(moment([2012, 11, 28, 0, 0]).format('A'), 'ночи', 'night');
+        assert.equal(moment([2012, 11, 28, 3, 59]).format('A'), 'ночи', 'night');
+        assert.equal(moment([2012, 11, 28, 4, 0]).format('A'), 'утра', 'morning');
+        assert.equal(moment([2012, 11, 28, 11, 59]).format('A'), 'утра', 'morning');
+        assert.equal(moment([2012, 11, 28, 12, 0]).format('A'), 'дня', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 16, 59]).format('A'), 'дня', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 17, 0]).format('A'), 'вечера', 'evening');
+        assert.equal(moment([2012, 11, 28, 23, 59]).format('A'), 'вечера', 'evening');
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-й', '1-й');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-й', '2-й');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-й', '3-й');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-й', '4-й');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-й', '5-й');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-й', '6-й');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-й', '7-й');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-й', '8-й');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-й', '9-й');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-й', '10-й');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-й', '11-й');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-й', '12-й');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-й', '13-й');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-й', '14-й');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-й', '15-й');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-й', '16-й');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-й', '17-й');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-й', '18-й');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-й', '19-й');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-й', '20-й');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-й', '21-й');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-й', '22-й');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-й', '23-й');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-й', '24-й');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-й', '25-й');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-й', '26-й');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-й', '27-й');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-й', '28-й');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-й', '29-й');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-й', '30-й');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-й', '31-й');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'январь янв_февраль фев_март март_апрель апр_май май_июнь июнь_июль июль_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format month case', function (assert) {
+        var months = {
+            'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+            'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2011, i, 1]).format('D MMMM'), '1 ' + months.accusative[i], '1 ' + months.accusative[i]);
+            assert.equal(moment([2011, i, 1]).format('MMMM'), months.nominative[i], '1 ' + months.nominative[i]);
+        }
+    });
+
+    test('format month short case', function (assert) {
+        var monthsShort = {
+            'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+            'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2011, i, 1]).format('D MMM'), '1 ' + monthsShort.accusative[i], '1 ' + monthsShort.accusative[i]);
+            assert.equal(moment([2011, i, 1]).format('MMM'), monthsShort.nominative[i], '1 ' + monthsShort.nominative[i]);
+        }
+    });
+
+    test('format month case with escaped symbols', function (assert) {
+        var months = {
+            'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+            'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2013, i, 1]).format('D[] MMMM'), '1 ' + months.accusative[i], '1 ' + months.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('[<i>]D[</i>] [<b>]MMMM[</b>]'), '<i>1</i> <b>' + months.accusative[i] + '</b>', '1 <b>' + months.accusative[i] + '</b>');
+            assert.equal(moment([2013, i, 1]).format('D[-й день] MMMM'), '1-й день ' + months.accusative[i], '1-й день ' + months.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('D, MMMM'), '1, ' + months.nominative[i], '1, ' + months.nominative[i]);
+        }
+    });
+
+    test('format month short case with escaped symbols', function (assert) {
+        var monthsShort = {
+            'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+            'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2013, i, 1]).format('D[] MMM'), '1 ' + monthsShort.accusative[i], '1 ' + monthsShort.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('[<i>]D[</i>] [<b>]MMM[</b>]'), '<i>1</i> <b>' + monthsShort.accusative[i] + '</b>', '1 <b>' + monthsShort.accusative[i] + '</b>');
+            assert.equal(moment([2013, i, 1]).format('D[-й день] MMM'), '1-й день ' + monthsShort.accusative[i], '1-й день ' + monthsShort.accusative[i]);
+            assert.equal(moment([2013, i, 1]).format('D, MMM'), '1, ' + monthsShort.nominative[i], '1, ' + monthsShort.nominative[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'воскресенье вс вс_понедельник пн пн_вторник вт вт_среда ср ср_четверг чт чт_пятница пт пт_суббота сб сб'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'несколько секунд',    '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'минута',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'минута',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 минуты',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 31}), true),  '31 минута',  '31 minutes = 31 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 минуты', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'час',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'час',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 часа',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 часов',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 час',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'день',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'день',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 дня',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'день',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 дней',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 11}), true),  '11 дней',     '11 days = 11 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 21}), true),  '21 день',     '21 days = 21 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 дней',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'месяц',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'месяц',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'месяц',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 месяца',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 месяца',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 месяца',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'месяц',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 месяцев',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'год',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 года',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'год',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 лет',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'через несколько секунд', 'prefix');
+        assert.equal(moment(0).from(30000), 'несколько секунд назад', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'через несколько секунд', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'через 5 дней', 'in 5 days');
+        assert.equal(moment().add({m: 31}).fromNow(), 'через 31 минуту', 'in 31 minutes = in 31 minutes');
+        assert.equal(moment().subtract({m: 31}).fromNow(), '31 минуту назад', '31 minutes ago = 31 minutes ago');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Сегодня в 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Сегодня в 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Сегодня в 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Завтра в 02:00',      'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Сегодня в 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Вчера в 02:00',       'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        function makeFormat(d) {
+            return d.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m, now;
+
+        function makeFormatLast(d) {
+            switch (d.day()) {
+            case 0:
+                return '[В прошлое] dddd [в] LT';
+            case 1:
+            case 2:
+            case 4:
+                return '[В прошлый] dddd [в] LT';
+            case 3:
+            case 5:
+            case 6:
+                return '[В прошлую] dddd [в] LT';
+            }
+        }
+
+        function makeFormatThis(d) {
+            switch (d.day()) {
+            case 2:
+                return '[Во] dddd [в] LT';
+            case 0:
+            case 1:
+            case 3:
+            case 4:
+            case 5:
+            case 6:
+                return '[В] dddd [в] LT';
+            }
+        }
+
+        now = moment().startOf('week');
+        for (i = 2; i < 7; i++) {
+            m = moment(now).subtract({d: i});
+            assert.equal(m.calendar(now),       m.format(makeFormatLast(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(now),       m.format(makeFormatLast(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(now),       m.format(makeFormatLast(m)),  'Today - ' + i + ' days end of day');
+        }
+
+        now = moment().endOf('week');
+        for (i = 2; i < 7; i++) {
+            m = moment(now).subtract({d: i});
+            assert.equal(m.calendar(now),       m.format(makeFormatThis(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(now),       m.format(makeFormatThis(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(now),       m.format(makeFormatThis(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-я', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-я', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-я', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-я', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-я', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('si');
+
+    /*jshint -W100*/
+    test('parse', function (assert) {
+        var tests = 'ජනවාරි ජන_පෙබරවාරි පෙබ_මාර්තු මාර්_අප්‍රේල් අප්_මැයි මැයි_ජූනි ජූනි_ජූලි ජූලි_අගෝස්තු අගෝ_සැප්තැම්බර් සැප්_ඔක්තෝබර් ඔක්_නොවැම්බර් නොවැ_දෙසැම්බර් දෙසැ'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['YYYY MMMM Do dddd, a h:mm:ss',       '2010 පෙබරවාරි 14 වැනි ඉරිදා, ප.ව. 3:25:50'],
+                ['YYYY MMMM Do dddd, a h:mm:ss',       '2010 පෙබරවාරි 14 වැනි ඉරිදා, ප.ව. 3:25:50'],
+                ['ddd, A h',                            'ඉරි, පස් වරු 3'],
+                ['M Mo MM MMMM MMM',                   '2 2 වැනි 02 පෙබරවාරි පෙබ'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 වැනි 14'],
+                ['d do dddd ddd dd',                   '0 0 වැනි ඉරිදා ඉරි ඉ'],
+                ['DDD DDDo DDDD',                      '45 45 වැනි 045'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'ප.ව. පස් වරු'],
+                ['[වසරේ] DDDo [දිනය]',                      'වසරේ 45 වැනි දිනය'],
+                ['LTS',                                'ප.ව. 3:25:50'],
+                ['LT',                                 'ප.ව. 3:25'],
+                ['L',                                  '2010/02/14'],
+                ['LL',                                 '2010 පෙබරවාරි 14'],
+                ['LLL',                                '2010 පෙබරවාරි 14, ප.ව. 3:25'],
+                ['LLLL',                               '2010 පෙබරවාරි 14 වැනි ඉරිදා, ප.ව. 3:25:50'],
+                ['l',                                  '2010/2/14'],
+                ['ll',                                 '2010 පෙබ 14'],
+                ['lll',                                '2010 පෙබ 14, ප.ව. 3:25'],
+                ['llll',                               '2010 පෙබ 14 වැනි ඉරි, ප.ව. 3:25:50']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1 වැනි', '1 වැනි');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2 වැනි', '2 වැනි');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3 වැනි', '3 වැනි');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4 වැනි', '4 වැනි');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5 වැනි', '5 වැනි');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6 වැනි', '6 වැනි');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7 වැනි', '7 වැනි');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8 වැනි', '8 වැනි');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9 වැනි', '9 වැනි');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10 වැනි', '10 වැනි');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11 වැනි', '11 වැනි');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12 වැනි', '12 වැනි');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13 වැනි', '13 වැනි');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14 වැනි', '14 වැනි');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15 වැනි', '15 වැනි');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16 වැනි', '16 වැනි');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17 වැනි', '17 වැනි');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18 වැනි', '18 වැනි');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19 වැනි', '19 වැනි');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20 වැනි', '20 වැනි');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21 වැනි', '21 වැනි');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22 වැනි', '22 වැනි');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23 වැනි', '23 වැනි');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24 වැනි', '24 වැනි');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25 වැනි', '25 වැනි');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26 වැනි', '26 වැනි');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27 වැනි', '27 වැනි');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28 වැනි', '28 වැනි');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29 වැනි', '29 වැනි');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30 වැනි', '30 වැනි');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31 වැනි', '31 වැනි');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ජනවාරි ජන_පෙබරවාරි පෙබ_මාර්තු මාර්_අප්‍රේල් අප්_මැයි මැයි_ජූනි ජූනි_ජූලි ජූලි_අගෝස්තු අගෝ_සැප්තැම්බර් සැප්_ඔක්තෝබර් ඔක්_නොවැම්බර් නොවැ_දෙසැම්බර් දෙසැ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'ඉරිදා ඉරි ඉ_සඳුදා සඳු ස_අඟහරුවාදා අඟ අ_බදාදා බදා බ_බ්‍රහස්පතින්දා බ්‍රහ බ්‍ර_සිකුරාදා සිකු සි_සෙනසුරාදා සෙන සෙ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'තත්පර කිහිපය', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'මිනිත්තුව',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'මිනිත්තුව',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  'මිනිත්තු 2',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  'මිනිත්තු 44',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'පැය',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'පැය',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  'පැය 2',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   'පැය 5',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  'පැය 21',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'දිනය',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'දිනය',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  'දින 2',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'දිනය',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   'දින 5',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  'දින 25',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'මාසය',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'මාසය',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'මාසය',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  'මාස 2',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  'මාස 2',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  'මාස 3',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'මාසය',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   'මාස 5',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'වසර',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), 'වසර 2',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'වසර',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   'වසර 5',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'තත්පර කිහිපයකින්',  'prefix');
+        assert.equal(moment(0).from(30000), 'තත්පර කිහිපයකට පෙර', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'තත්පර කිහිපයකට පෙර',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'තත්පර කිහිපයකින්', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'දින 5කින්', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                   'අද පෙ.ව. 2:00ට',      'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'අද පෙ.ව. 2:25ට',      'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'අද පෙ.ව. 3:00ට',      'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'හෙට පෙ.ව. 2:00ට',   'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'අද පෙ.ව. 1:00ට',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'ඊයේ පෙ.ව. 2:00ට',  'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd LT[ට]'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd LT[ට]'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd LT[ට]'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[පසුගිය] dddd LT[ට]'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[පසුගිය] dddd LT[ට]'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[පසුගිය] dddd LT[ට]'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('sk');
+
+    test('parse', function (assert) {
+        var tests = 'január jan._február feb._marec mar._apríl apr._máj máj_jún jún._júl júl._august aug._september sep._október okt._november nov._december dec.'.split('_'), i;
+        function equalTest(input, mmm, monthIndex) {
+            assert.equal(moment(input, mmm).month(), monthIndex, input + ' should be month ' + (monthIndex + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss',  'nedeľa, február 14. 2010, 3:25:50'],
+                ['ddd, h',                       'ne, 3'],
+                ['M Mo MM MMMM MMM',             '2 2. 02 február feb'],
+                ['YYYY YY',                      '2010 10'],
+                ['D Do DD',                      '14 14. 14'],
+                ['d do dddd ddd dd',             '0 0. nedeľa ne ne'],
+                ['DDD DDDo DDDD',                '45 45. 045'],
+                ['w wo ww',                      '6 6. 06'],
+                ['h hh',                         '3 03'],
+                ['H HH',                         '15 15'],
+                ['m mm',                         '25 25'],
+                ['s ss',                         '50 50'],
+                ['a A',                          'pm PM'],
+                ['DDDo [deň v roku]',            '45. deň v roku'],
+                ['LTS',                          '15:25:50'],
+                ['L',                            '14.02.2010'],
+                ['LL',                           '14. február 2010'],
+                ['LLL',                          '14. február 2010 15:25'],
+                ['LLLL',                         'nedeľa 14. február 2010 15:25'],
+                ['l',                            '14.2.2010'],
+                ['ll',                           '14. feb 2010'],
+                ['lll',                          '14. feb 2010 15:25'],
+                ['llll',                         'ne 14. feb 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'január jan_február feb_marec mar_apríl apr_máj máj_jún jún_júl júl_august aug_september sep_október okt_november nov_december dec'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'nedeľa ne ne_pondelok po po_utorok ut ut_streda st st_štvrtok št št_piatok pi pi_sobota so so'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'pár sekúnd',  '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minúta',        '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minúta',        '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minúty',      '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minút',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'hodina',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'hodina',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 hodiny',     '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 hodín',      '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 hodín',     '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'deň',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'deň',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dni',         '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'deň',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dní',         '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dní',        '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mesiac',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mesiac',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mesiac',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 mesiace',    '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 mesiace',    '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mesiace',    '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mesiac',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mesiacov',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'rok',           '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 roky',        '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'rok',           '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 rokov',         '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'za pár sekúnd',  'prefix');
+        assert.equal(moment(0).from(30000), 'pred pár sekundami', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'pred pár sekundami',  'now from now should display as in the past');
+    });
+
+    test('fromNow (future)', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'za pár sekúnd', 'in a few seconds');
+        assert.equal(moment().add({m: 1}).fromNow(), 'za minútu', 'in a minute');
+        assert.equal(moment().add({m: 3}).fromNow(), 'za 3 minúty', 'in 3 minutes');
+        assert.equal(moment().add({m: 10}).fromNow(), 'za 10 minút', 'in 10 minutes');
+        assert.equal(moment().add({h: 1}).fromNow(), 'za hodinu', 'in an hour');
+        assert.equal(moment().add({h: 3}).fromNow(), 'za 3 hodiny', 'in 3 hours');
+        assert.equal(moment().add({h: 10}).fromNow(), 'za 10 hodín', 'in 10 hours');
+        assert.equal(moment().add({d: 1}).fromNow(), 'za deň', 'in a day');
+        assert.equal(moment().add({d: 3}).fromNow(), 'za 3 dni', 'in 3 days');
+        assert.equal(moment().add({d: 10}).fromNow(), 'za 10 dní', 'in 10 days');
+        assert.equal(moment().add({M: 1}).fromNow(), 'za mesiac', 'in a month');
+        assert.equal(moment().add({M: 3}).fromNow(), 'za 3 mesiace', 'in 3 months');
+        assert.equal(moment().add({M: 10}).fromNow(), 'za 10 mesiacov', 'in 10 months');
+        assert.equal(moment().add({y: 1}).fromNow(), 'za rok', 'in a year');
+        assert.equal(moment().add({y: 3}).fromNow(), 'za 3 roky', 'in 3 years');
+        assert.equal(moment().add({y: 10}).fromNow(), 'za 10 rokov', 'in 10 years');
+    });
+
+    test('fromNow (past)', function (assert) {
+        assert.equal(moment().subtract({s: 30}).fromNow(), 'pred pár sekundami', 'a few seconds ago');
+        assert.equal(moment().subtract({m: 1}).fromNow(), 'pred minútou', 'a minute ago');
+        assert.equal(moment().subtract({m: 3}).fromNow(), 'pred 3 minútami', '3 minutes ago');
+        assert.equal(moment().subtract({m: 10}).fromNow(), 'pred 10 minútami', '10 minutes ago');
+        assert.equal(moment().subtract({h: 1}).fromNow(), 'pred hodinou', 'an hour ago');
+        assert.equal(moment().subtract({h: 3}).fromNow(), 'pred 3 hodinami', '3 hours ago');
+        assert.equal(moment().subtract({h: 10}).fromNow(), 'pred 10 hodinami', '10 hours ago');
+        assert.equal(moment().subtract({d: 1}).fromNow(), 'pred dňom', 'a day ago');
+        assert.equal(moment().subtract({d: 3}).fromNow(), 'pred 3 dňami', '3 days ago');
+        assert.equal(moment().subtract({d: 10}).fromNow(), 'pred 10 dňami', '10 days ago');
+        assert.equal(moment().subtract({M: 1}).fromNow(), 'pred mesiacom', 'a month ago');
+        assert.equal(moment().subtract({M: 3}).fromNow(), 'pred 3 mesiacmi', '3 months ago');
+        assert.equal(moment().subtract({M: 10}).fromNow(), 'pred 10 mesiacmi', '10 months ago');
+        assert.equal(moment().subtract({y: 1}).fromNow(), 'pred rokom', 'a year ago');
+        assert.equal(moment().subtract({y: 3}).fromNow(), 'pred 3 rokmi', '3 years ago');
+        assert.equal(moment().subtract({y: 10}).fromNow(), 'pred 10 rokmi', '10 years ago');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'dnes o 2:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'dnes o 2:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'dnes o 3:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'zajtra o 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'dnes o 1:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'včera o 2:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m, nextDay;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            nextDay = '';
+            switch (m.day()) {
+            case 0:
+                nextDay = 'v nedeľu';
+                break;
+            case 1:
+                nextDay = 'v pondelok';
+                break;
+            case 2:
+                nextDay = 'v utorok';
+                break;
+            case 3:
+                nextDay = 'v stredu';
+                break;
+            case 4:
+                nextDay = 'vo štvrtok';
+                break;
+            case 5:
+                nextDay = 'v piatok';
+                break;
+            case 6:
+                nextDay = 'v sobotu';
+                break;
+            }
+            assert.equal(m.calendar(),       m.format('[' + nextDay + '] [o] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[' + nextDay + '] [o] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[' + nextDay + '] [o] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m, lastDay;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            lastDay = '';
+            switch (m.day()) {
+            case 0:
+                lastDay = 'minulú nedeľu';
+                break;
+            case 1:
+                lastDay = 'minulý pondelok';
+                break;
+            case 2:
+                lastDay = 'minulý utorok';
+                break;
+            case 3:
+                lastDay = 'minulú stredu';
+                break;
+            case 4:
+                lastDay = 'minulý štvrtok';
+                break;
+            case 5:
+                lastDay = 'minulý piatok';
+                break;
+            case 6:
+                lastDay = 'minulú sobotu';
+                break;
+            }
+            assert.equal(m.calendar(),       m.format('[' + lastDay + '] [o] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[' + lastDay + '] [o] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[' + lastDay + '] [o] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('humanize duration', function (assert) {
+        assert.equal(moment.duration(1, 'minutes').humanize(), 'minúta', 'a minute (future)');
+        assert.equal(moment.duration(1, 'minutes').humanize(true), 'za minútu', 'in a minute');
+        assert.equal(moment.duration(-1, 'minutes').humanize(), 'minúta', 'a minute (past)');
+        assert.equal(moment.duration(-1, 'minutes').humanize(true), 'pred minútou', 'a minute ago');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('sl');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan._februar feb._marec mar._april apr._maj maj_junij jun._julij jul._avgust avg._september sep._oktober okt._november nov._december dec.'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'nedelja, 14. februar 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'ned., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. nedelja ned. ne'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14. 02. 2010'],
+                ['LL',                                 '14. februar 2010'],
+                ['LLL',                                '14. februar 2010 15:25'],
+                ['LLLL',                               'nedelja, 14. februar 2010 15:25'],
+                ['l',                                  '14. 2. 2010'],
+                ['ll',                                 '14. feb. 2010'],
+                ['lll',                                '14. feb. 2010 15:25'],
+                ['llll',                               'ned., 14. feb. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan._februar feb._marec mar._april apr._maj maj._junij jun._julij jul._avgust avg._september sep._oktober okt._november nov._december dec.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'nedelja ned. ne_ponedeljek pon. po_torek tor. to_sreda sre. sr_četrtek čet. če_petek pet. pe_sobota sob. so'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'nekaj sekund', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ena minuta',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ena minuta',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuti',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minut',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ena ura',      '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ena ura',      '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 uri',        '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ur',         '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ur',        '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'en dan',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'en dan',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dni',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'en dan',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dni',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dni',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'en mesec',     '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'en mesec',     '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'en mesec',     '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 meseca',     '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 meseca',     '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 mesece',     '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'en mesec',     '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 mesecev',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'eno leto',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 leti',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'eno leto',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 let',        '5 years = 5 years');
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 1}), true),  'ena minuta', 'a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 2}), true),  '2 minuti',   '2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 3}), true),  '3 minute',   '3 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 4}), true),  '4 minute',   '4 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 5}), true),  '5 minut',    '5 minutes');
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 1}), true),  'ena ura', 'an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 2}), true),  '2 uri',   '2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 3}), true),  '3 ure',   '3 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 4}), true),  '4 ure',   '4 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),  '5 ur',    '5 hours');
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),  'en dan', 'a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 2}), true),  '2 dni',  '2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 3}), true),  '3 dni',  '3 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 4}), true),  '4 dni',  '4 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),  '5 dni',  '5 days');
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),  'en mesec',  'a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 2}), true),  '2 meseca',  '2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 3}), true),  '3 mesece',  '3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 4}), true),  '4 mesece',  '4 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),  '5 mesecev', '5 months');
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),  'eno leto', 'a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 2}), true),  '2 leti',   '2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 3}), true),  '3 leta',   '3 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 4}), true),  '4 leta',   '4 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),  '5 let',    '5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'čez nekaj sekund',  'prefix');
+        assert.equal(moment(0).from(30000), 'pred nekaj sekundami', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'pred nekaj sekundami',  'now from now should display as in the past');
+    });
+
+    test('fromNow (future)', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'čez nekaj sekund', 'in a few seconds');
+        assert.equal(moment().add({m: 1}).fromNow(),  'čez eno minuto', 'in a minute');
+        assert.equal(moment().add({m: 2}).fromNow(),  'čez 2 minuti',   'in 2 minutes');
+        assert.equal(moment().add({m: 3}).fromNow(),  'čez 3 minute',   'in 3 minutes');
+        assert.equal(moment().add({m: 4}).fromNow(),  'čez 4 minute',   'in 4 minutes');
+        assert.equal(moment().add({m: 5}).fromNow(),  'čez 5 minut',    'in 5 minutes');
+
+        assert.equal(moment().add({h: 1}).fromNow(),  'čez eno uro', 'in an hour');
+        assert.equal(moment().add({h: 2}).fromNow(),  'čez 2 uri',   'in 2 hours');
+        assert.equal(moment().add({h: 3}).fromNow(),  'čez 3 ure',   'in 3 hours');
+        assert.equal(moment().add({h: 4}).fromNow(),  'čez 4 ure',   'in 4 hours');
+        assert.equal(moment().add({h: 5}).fromNow(),  'čez 5 ur',    'in 5 hours');
+
+        assert.equal(moment().add({d: 1}).fromNow(),  'čez en dan', 'in a day');
+        assert.equal(moment().add({d: 2}).fromNow(),  'čez 2 dni',  'in 2 days');
+        assert.equal(moment().add({d: 3}).fromNow(),  'čez 3 dni',  'in 3 days');
+        assert.equal(moment().add({d: 4}).fromNow(),  'čez 4 dni',  'in 4 days');
+        assert.equal(moment().add({d: 5}).fromNow(),  'čez 5 dni',  'in 5 days');
+
+        assert.equal(moment().add({M: 1}).fromNow(),  'čez en mesec',  'in a month');
+        assert.equal(moment().add({M: 2}).fromNow(),  'čez 2 meseca',  'in 2 months');
+        assert.equal(moment().add({M: 3}).fromNow(),  'čez 3 mesece',  'in 3 months');
+        assert.equal(moment().add({M: 4}).fromNow(),  'čez 4 mesece',  'in 4 months');
+        assert.equal(moment().add({M: 5}).fromNow(),  'čez 5 mesecev', 'in 5 months');
+
+        assert.equal(moment().add({y: 1}).fromNow(),  'čez eno leto', 'in a year');
+        assert.equal(moment().add({y: 2}).fromNow(),  'čez 2 leti',   'in 2 years');
+        assert.equal(moment().add({y: 3}).fromNow(),  'čez 3 leta',   'in 3 years');
+        assert.equal(moment().add({y: 4}).fromNow(),  'čez 4 leta',   'in 4 years');
+        assert.equal(moment().add({y: 5}).fromNow(),  'čez 5 let',    'in 5 years');
+
+        assert.equal(moment().subtract({s: 30}).fromNow(), 'pred nekaj sekundami', 'a few seconds ago');
+
+        assert.equal(moment().subtract({m: 1}).fromNow(),  'pred eno minuto', 'a minute ago');
+        assert.equal(moment().subtract({m: 2}).fromNow(),  'pred 2 minutama', '2 minutes ago');
+        assert.equal(moment().subtract({m: 3}).fromNow(),  'pred 3 minutami', '3 minutes ago');
+        assert.equal(moment().subtract({m: 4}).fromNow(),  'pred 4 minutami', '4 minutes ago');
+        assert.equal(moment().subtract({m: 5}).fromNow(),  'pred 5 minutami', '5 minutes ago');
+
+        assert.equal(moment().subtract({h: 1}).fromNow(),  'pred eno uro', 'an hour ago');
+        assert.equal(moment().subtract({h: 2}).fromNow(),  'pred 2 urama', '2 hours ago');
+        assert.equal(moment().subtract({h: 3}).fromNow(),  'pred 3 urami', '3 hours ago');
+        assert.equal(moment().subtract({h: 4}).fromNow(),  'pred 4 urami', '4 hours ago');
+        assert.equal(moment().subtract({h: 5}).fromNow(),  'pred 5 urami', '5 hours ago');
+
+        assert.equal(moment().subtract({d: 1}).fromNow(),  'pred enim dnem', 'a day ago');
+        assert.equal(moment().subtract({d: 2}).fromNow(),  'pred 2 dnevoma', '2 days ago');
+        assert.equal(moment().subtract({d: 3}).fromNow(),  'pred 3 dnevi',   '3 days ago');
+        assert.equal(moment().subtract({d: 4}).fromNow(),  'pred 4 dnevi',   '4 days ago');
+        assert.equal(moment().subtract({d: 5}).fromNow(),  'pred 5 dnevi',   '5 days ago');
+
+        assert.equal(moment().subtract({M: 1}).fromNow(),  'pred enim mesecem', 'a month ago');
+        assert.equal(moment().subtract({M: 2}).fromNow(),  'pred 2 mesecema',   '2 months ago');
+        assert.equal(moment().subtract({M: 3}).fromNow(),  'pred 3 meseci',     '3 months ago');
+        assert.equal(moment().subtract({M: 4}).fromNow(),  'pred 4 meseci',     '4 months ago');
+        assert.equal(moment().subtract({M: 5}).fromNow(),  'pred 5 meseci',     '5 months ago');
+
+        assert.equal(moment().subtract({y: 1}).fromNow(),  'pred enim letom', 'a year ago');
+        assert.equal(moment().subtract({y: 2}).fromNow(),  'pred 2 letoma',   '2 years ago');
+        assert.equal(moment().subtract({y: 3}).fromNow(),  'pred 3 leti',     '3 years ago');
+        assert.equal(moment().subtract({y: 4}).fromNow(),  'pred 4 leti',     '4 years ago');
+        assert.equal(moment().subtract({y: 5}).fromNow(),  'pred 5 leti',     '5 years ago');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'danes ob 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'danes ob 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'danes ob 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'jutri ob 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'danes ob 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'včeraj ob 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[v] [nedeljo] [ob] LT';
+            case 3:
+                return '[v] [sredo] [ob] LT';
+            case 6:
+                return '[v] [soboto] [ob] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[v] dddd [ob] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[prejšnjo] [nedeljo] [ob] LT';
+            case 3:
+                return '[prejšnjo] [sredo] [ob] LT';
+            case 6:
+                return '[prejšnjo] [soboto] [ob] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[prejšnji] dddd [ob] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('sq');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'Janar Jan_Shkurt Shk_Mars Mar_Prill Pri_Maj Maj_Qershor Qer_Korrik Kor_Gusht Gus_Shtator Sht_Tetor Tet_Nëntor Nën_Dhjetor Dhj'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, HH:mm:ss',       'E Diel, Shkurt 14. 2010, 15:25:50'],
+                ['ddd, HH',                            'Die, 15'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 Shkurt Shk'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. E Diel Die D'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '6 6. 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'MD MD'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 Shkurt 2010'],
+                ['LLL',                                '14 Shkurt 2010 15:25'],
+                ['LLLL',                               'E Diel, 14 Shkurt 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Shk 2010'],
+                ['lll',                                '14 Shk 2010 15:25'],
+                ['llll',                               'Die, 14 Shk 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  0, 0]).format('A'), 'PD', 'before dawn');
+        assert.equal(moment([2011, 2, 23, 12, 0]).format('A'), 'MD', 'noon');
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'Janar Jan_Shkurt Shk_Mars Mar_Prill Pri_Maj Maj_Qershor Qer_Korrik Kor_Gusht Gus_Shtator Sht_Tetor Tet_Nëntor Nën_Dhjetor Dhj'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'E Diel Die D_E Hënë Hën H_E Martë Mar Ma_E Mërkurë Mër Më_E Enjte Enj E_E Premte Pre P_E Shtunë Sht Sh'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'disa sekonda', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'një minutë',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'një minutë',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuta',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuta',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'një orë',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'një orë',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 orë',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 orë',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 orë',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'një ditë',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'një ditë',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 ditë',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'një ditë',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 ditë',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 ditë',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'një muaj',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'një muaj',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'një muaj',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 muaj',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 muaj',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 muaj',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'një muaj',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 muaj',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'një vit',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 vite',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'një vit',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 vite',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'në disa sekonda',  'prefix');
+        assert.equal(moment(0).from(30000), 'disa sekonda më parë', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'disa sekonda më parë',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'në disa sekonda', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'në 5 ditë', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Sot në 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Sot në 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Sot në 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Nesër në 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Sot në 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Dje në 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [në] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [në] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [në] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [e kaluar në] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [e kaluar në] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [e kaluar në] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52.', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1.', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1.', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2.', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2.', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('sr-cyrl');
+
+    test('parse', function (assert) {
+        var tests = 'јануар јан._фебруар феб._март мар._април апр._мај мај_јун јун_јул јул_август авг._септембар сеп._октобар окт._новембар нов._децембар дец.'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'недеља, 14. фебруар 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'нед., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 фебруар феб.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. недеља нед. не'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14. 02. 2010'],
+                ['LL',                                 '14. фебруар 2010'],
+                ['LLL',                                '14. фебруар 2010 15:25'],
+                ['LLLL',                               'недеља, 14. фебруар 2010 15:25'],
+                ['l',                                  '14. 2. 2010'],
+                ['ll',                                 '14. феб. 2010'],
+                ['lll',                                '14. феб. 2010 15:25'],
+                ['llll',                               'нед., 14. феб. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'јануар јан._фебруар феб._март мар._април апр._мај мај_јун јун_јул јул_август авг._септембар сеп._октобар окт._новембар нов._децембар дец.'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'недеља нед. не_понедељак пон. по_уторак уто. ут_среда сре. ср_четвртак чет. че_петак пет. пе_субота суб. су'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'неколико секунди', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'један минут',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'један минут',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 минуте',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 минута',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'један сат',      '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'један сат',      '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 сата',        '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 сати',         '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 сати',        '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'дан',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'дан',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 дана',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'дан',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 дана',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 дана',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'месец',     '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'месец',     '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'месец',     '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 месеца',     '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 месеца',     '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 месеца',     '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'месец',     '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 месеци',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'годину',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 године',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'годину',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 година',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'за неколико секунди',  'prefix');
+        assert.equal(moment(0).from(30000), 'пре неколико секунди', 'prefix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'пре неколико секунди',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'за неколико секунди', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'за 5 дана', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'данас у 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'данас у 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'данас у 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'сутра у 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'данас у 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'јуче у 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[у] [недељу] [у] LT';
+            case 3:
+                return '[у] [среду] [у] LT';
+            case 6:
+                return '[у] [суботу] [у] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[у] dddd [у] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            var lastWeekDay = [
+                    '[прошле] [недеље] [у] LT',
+                    '[прошлог] [понедељка] [у] LT',
+                    '[прошлог] [уторка] [у] LT',
+                    '[прошле] [среде] [у] LT',
+                    '[прошлог] [четвртка] [у] LT',
+                    '[прошлог] [петка] [у] LT',
+                    '[прошле] [суботе] [у] LT'
+                ];
+
+            return lastWeekDay[d.day()];
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('sr');
+
+    test('parse', function (assert) {
+        var tests = 'januar jan._februar feb._mart mar._april apr._maj maj_jun jun_jul jul_avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'nedelja, 14. februar 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'ned., 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2. 02 februar feb.'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14. 14'],
+                ['d do dddd ddd dd',                   '0 0. nedelja ned. ne'],
+                ['DDD DDDo DDDD',                      '45 45. 045'],
+                ['w wo ww',                            '7 7. 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45. day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14. 02. 2010'],
+                ['LL',                                 '14. februar 2010'],
+                ['LLL',                                '14. februar 2010 15:25'],
+                ['LLLL',                               'nedelja, 14. februar 2010 15:25'],
+                ['l',                                  '14. 2. 2010'],
+                ['ll',                                 '14. feb. 2010'],
+                ['lll',                                '14. feb. 2010 15:25'],
+                ['llll',                               'ned., 14. feb. 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1.', '1.');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2.', '2.');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3.', '3.');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4.', '4.');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5.', '5.');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6.', '6.');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7.', '7.');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8.', '8.');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9.', '9.');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10.', '10.');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11.', '11.');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12.', '12.');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13.', '13.');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14.', '14.');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15.', '15.');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16.', '16.');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17.', '17.');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18.', '18.');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19.', '19.');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20.', '20.');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21.', '21.');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22.', '22.');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23.', '23.');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24.', '24.');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25.', '25.');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26.', '26.');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27.', '27.');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28.', '28.');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29.', '29.');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30.', '30.');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31.', '31.');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januar jan._februar feb._mart mar._april apr._maj maj_jun jun_jul jul_avgust avg._septembar sep._oktobar okt._novembar nov._decembar dec.'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'nedelja ned. ne_ponedeljak pon. po_utorak uto. ut_sreda sre. sr_četvrtak čet. če_petak pet. pe_subota sub. su'.split('_'),
+            i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'nekoliko sekundi', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'jedan minut',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'jedan minut',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minute',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuta',     '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'jedan sat',      '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'jedan sat',      '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 sata',        '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 sati',         '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 sati',        '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'dan',       '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'dan',       '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dana',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'dan',       '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dana',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dana',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'mesec',     '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'mesec',     '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'mesec',     '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 meseca',     '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 meseca',     '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 meseca',     '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'mesec',     '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 meseci',    '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'godinu',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 godine',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'godinu',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 godina',        '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'za nekoliko sekundi',  'prefix');
+        assert.equal(moment(0).from(30000), 'pre nekoliko sekundi', 'prefix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'pre nekoliko sekundi',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'za nekoliko sekundi', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'za 5 dana', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'danas u 2:00',  'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'danas u 2:25',  'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'danas u 3:00',  'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'sutra u 2:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'danas u 1:00',  'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'juče u 2:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+                return '[u] [nedelju] [u] LT';
+            case 3:
+                return '[u] [sredu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            var lastWeekDay = [
+                    '[prošle] [nedelje] [u] LT',
+                    '[prošlog] [ponedeljka] [u] LT',
+                    '[prošlog] [utorka] [u] LT',
+                    '[prošle] [srede] [u] LT',
+                    '[prošlog] [četvrtka] [u] LT',
+                    '[prošlog] [petka] [u] LT',
+                    '[prošle] [subote] [u] LT'
+                ];
+
+            return lastWeekDay[d.day()];
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1.', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1.', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2.', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2.', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3.', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('sv');
+
+    test('parse', function (assert) {
+        var tests = 'januari jan_februari feb_mars mar_april apr_maj maj_juni jun_juli jul_augusti aug_september sep_oktober okt_november nov_december dec'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'söndag, februari 14e 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'sön, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2a 02 februari feb'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14e 14'],
+                ['d do dddd ddd dd',                   '0 0e söndag sön sö'],
+                ['DDD DDDo DDDD',                      '45 45e 045'],
+                ['w wo ww',                            '6 6e 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45e day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '2010-02-14'],
+                ['LL',                                 '14 februari 2010'],
+                ['LLL',                                '14 februari 2010 15:25'],
+                ['LLLL',                               'söndag 14 februari 2010 15:25'],
+                ['l',                                  '2010-2-14'],
+                ['ll',                                 '14 feb 2010'],
+                ['lll',                                '14 feb 2010 15:25'],
+                ['llll',                               'sön 14 feb 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1a', '1a');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2a', '2a');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3e', '3e');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4e', '4e');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5e', '5e');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6e', '6e');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7e', '7e');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8e', '8e');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9e', '9e');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10e', '10e');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11e', '11e');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12e', '12e');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13e', '13e');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14e', '14e');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15e', '15e');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16e', '16e');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17e', '17e');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18e', '18e');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19e', '19e');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20e', '20e');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21a', '21a');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22a', '22a');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23e', '23e');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24e', '24e');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25e', '25e');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26e', '26e');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27e', '27e');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28e', '28e');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29e', '29e');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30e', '30e');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31a', '31a');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'januari jan_februari feb_mars mar_april apr_maj maj_juni jun_juli jul_augusti aug_september sep_oktober okt_november nov_december dec'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'söndag sön sö_måndag mån må_tisdag tis ti_onsdag ons on_torsdag tor to_fredag fre fr_lördag lör lö'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'några sekunder', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'en minut',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'en minut',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuter',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuter',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'en timme',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'en timme',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 timmar',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 timmar',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 timmar',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'en dag',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'en dag',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 dagar',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'en dag',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 dagar',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 dagar',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'en månad',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'en månad',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'en månad',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 månader',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 månader',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 månader',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'en månad',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 månader',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ett år',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 år',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ett år',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 år',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'om några sekunder',  'prefix');
+        assert.equal(moment(0).from(30000), 'för några sekunder sedan', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'för några sekunder sedan',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'om några sekunder', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'om 5 dagar', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Idag 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Idag 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Idag 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Imorgon 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Idag 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Igår 02:00',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[På] dddd LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[På] dddd LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[På] dddd LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[I] dddd[s] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[I] dddd[s] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[I] dddd[s] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52a', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1a', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1a', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2a', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2a', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('ta');
+
+    test('parse', function (assert) {
+        var tests = 'ஜனவரி ஜனவரி_பிப்ரவரி பிப்ரவரி_மார்ச் மார்ச்_ஏப்ரல் ஏப்ரல்_மே மே_ஜூன் ஜூன்_ஜூலை ஜூலை_ஆகஸ்ட் ஆகஸ்ட்_செப்டெம்பர் செப்டெம்பர்_அக்டோபர் அக்டோபர்_நவம்பர் நவம்பர்_டிசம்பர் டிசம்பர்'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a', 'ஞாயிற்றுக்கிழமை, பிப்ரவரி 14வது 2010, 3:25:50  எற்பாடு'],
+                ['ddd, hA',                       'ஞாயிறு, 3 எற்பாடு'],
+                ['M Mo MM MMMM MMM',              '2 2வது 02 பிப்ரவரி பிப்ரவரி'],
+                ['YYYY YY',                       '2010 10'],
+                ['D Do DD',                       '14 14வது 14'],
+                ['d do dddd ddd dd',              '0 0வது ஞாயிற்றுக்கிழமை ஞாயிறு ஞா'],
+                ['DDD DDDo DDDD',                 '45 45வது 045'],
+                ['w wo ww',                       '8 8வது 08'],
+                ['h hh',                          '3 03'],
+                ['H HH',                          '15 15'],
+                ['m mm',                          '25 25'],
+                ['s ss',                          '50 50'],
+                ['a A',                           ' எற்பாடு  எற்பாடு'],
+                ['[ஆண்டின்] DDDo  [நாள்]', 'ஆண்டின் 45வது  நாள்'],
+                ['LTS',                           '15:25:50'],
+                ['L',                             '14/02/2010'],
+                ['LL',                            '14 பிப்ரவரி 2010'],
+                ['LLL',                           '14 பிப்ரவரி 2010, 15:25'],
+                ['LLLL',                          'ஞாயிற்றுக்கிழமை, 14 பிப்ரவரி 2010, 15:25'],
+                ['l',                             '14/2/2010'],
+                ['ll',                            '14 பிப்ரவரி 2010'],
+                ['lll',                           '14 பிப்ரவரி 2010, 15:25'],
+                ['llll',                          'ஞாயிறு, 14 பிப்ரவரி 2010, 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1வது', '1வது');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2வது', '2வது');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3வது', '3வது');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4வது', '4வது');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5வது', '5வது');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6வது', '6வது');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7வது', '7வது');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8வது', '8வது');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9வது', '9வது');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10வது', '10வது');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11வது', '11வது');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12வது', '12வது');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13வது', '13வது');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14வது', '14வது');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15வது', '15வது');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16வது', '16வது');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17வது', '17வது');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18வது', '18வது');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19வது', '19வது');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20வது', '20வது');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21வது', '21வது');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22வது', '22வது');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23வது', '23வது');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24வது', '24வது');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25வது', '25வது');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26வது', '26வது');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27வது', '27வது');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28வது', '28வது');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29வது', '29வது');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30வது', '30வது');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31வது', '31வது');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ஜனவரி ஜனவரி_பிப்ரவரி பிப்ரவரி_மார்ச் மார்ச்_ஏப்ரல் ஏப்ரல்_மே மே_ஜூன் ஜூன்_ஜூலை ஜூலை_ஆகஸ்ட் ஆகஸ்ட்_செப்டெம்பர் செப்டெம்பர்_அக்டோபர் அக்டோபர்_நவம்பர் நவம்பர்_டிசம்பர் டிசம்பர்'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'ஞாயிற்றுக்கிழமை ஞாயிறு ஞா_திங்கட்கிழமை திங்கள் தி_செவ்வாய்கிழமை செவ்வாய் செ_புதன்கிழமை புதன் பு_வியாழக்கிழமை வியாழன் வி_வெள்ளிக்கிழமை வெள்ளி வெ_சனிக்கிழமை சனி ச'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ஒரு சில விநாடிகள்', '44 விநாடிகள் = ஒரு சில விநாடிகள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ஒரு நிமிடம்',      '45 விநாடிகள் = ஒரு நிமிடம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ஒரு நிமிடம்',      '89 விநாடிகள் = ஒரு நிமிடம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 நிமிடங்கள்',     '90 விநாடிகள் = 2 நிமிடங்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 நிமிடங்கள்',    '44 நிமிடங்கள் = 44 நிமிடங்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ஒரு மணி நேரம்',       '45 நிமிடங்கள் = ஒரு மணி நேரம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ஒரு மணி நேரம்',       '89 நிமிடங்கள் = ஒரு மணி நேரம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 மணி நேரம்',       '90 நிமிடங்கள் = 2 மணி நேரம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 மணி நேரம்',       '5 மணி நேரம் = 5 மணி நேரம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 மணி நேரம்',      '21 மணி நேரம் = 21 மணி நேரம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ஒரு நாள்',         '22 மணி நேரம் = ஒரு நாள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ஒரு நாள்',         '35 மணி நேரம் = ஒரு நாள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 நாட்கள்',        '36 மணி நேரம் = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ஒரு நாள்',         '1 நாள் = ஒரு நாள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 நாட்கள்',        '5 நாட்கள் = 5 நாட்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 நாட்கள்',       '25 நாட்கள் = 25 நாட்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ஒரு மாதம்',       '26 நாட்கள் = ஒரு மாதம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ஒரு மாதம்',       '30 நாட்கள் = ஒரு மாதம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ஒரு மாதம்',       '45 நாட்கள் = ஒரு மாதம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 மாதங்கள்',      '46 நாட்கள் = 2 மாதங்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 மாதங்கள்',      '75 நாட்கள் = 2 மாதங்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 மாதங்கள்',      '76 நாட்கள் = 3 மாதங்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ஒரு மாதம்',       '1 மாதம் = ஒரு மாதம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 மாதங்கள்',      '5 மாதங்கள் = 5 மாதங்கள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ஒரு வருடம்',        '345 நாட்கள் = ஒரு வருடம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ஆண்டுகள்',       '548 நாட்கள் = 2 ஆண்டுகள்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ஒரு வருடம்',        '1 வருடம் = ஒரு வருடம்');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ஆண்டுகள்',       '5 ஆண்டுகள் = 5 ஆண்டுகள்');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'ஒரு சில விநாடிகள் இல்',  'prefix');
+        assert.equal(moment(0).from(30000), 'ஒரு சில விநாடிகள் முன்', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'ஒரு சில விநாடிகள் முன்',  'இப்போது இருந்து கடந்த காலத்தில் காட்ட வேண்டும்');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'ஒரு சில விநாடிகள் இல்', 'ஒரு சில விநாடிகள் இல்');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 நாட்கள் இல்', '5 நாட்கள் இல்');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),  'இன்று 02:00', 'இன்று  02:00');
+        assert.equal(moment(a).add({m: 25}).calendar(), 'இன்று 02:25', 'இன்று  02:25');
+        assert.equal(moment(a).add({h: 1}).calendar(), 'இன்று 03:00', 'இன்று  03:00');
+        assert.equal(moment(a).add({d: 1}).calendar(), 'நாளை 02:00', 'நாளை  02:00');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'இன்று 01:00',      'இன்று  01:00');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'நேற்று 02:00',  'நேற்று  02:00');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd, LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd, LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd, LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[கடந்த வாரம்] dddd, LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[கடந்த வாரம்] dddd, LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[கடந்த வாரம்] dddd, LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  0, 30]).format('a'), ' யாமம்', '(after) midnight');
+        assert.equal(moment([2011, 2, 23,  2, 30]).format('a'), ' வைகறை', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  9, 30]).format('a'), ' காலை', 'morning');
+        assert.equal(moment([2011, 2, 23, 14, 30]).format('a'), ' எற்பாடு', 'during day');
+        assert.equal(moment([2011, 2, 23, 17, 30]).format('a'), ' எற்பாடு', 'evening');
+        assert.equal(moment([2011, 2, 23, 19, 30]).format('a'), ' மாலை', 'late evening');
+        assert.equal(moment([2011, 2, 23, 23, 30]).format('a'), ' யாமம்', '(before) midnight');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('th');
+
+    test('parse', function (assert) {
+        var tests = 'มกราคม มกรา_กุมภาพันธ์ กุมภา_มีนาคม มีนา_เมษายน เมษา_พฤษภาคม พฤษภา_มิถุนายน มิถุนา_กรกฎาคม กรกฎา_สิงหาคม สิงหา_กันยายน กันยา_ตุลาคม ตุลา_พฤศจิกายน พฤศจิกา_ธันวาคม ธันวา'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, h:mm:ss a',      'อาทิตย์, 14 กุมภาพันธ์ 2010, 3:25:50 หลังเที่ยง'],
+                ['ddd, h A',                           'อาทิตย์, 3 หลังเที่ยง'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 กุมภาพันธ์ กุมภา'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 อาทิตย์ อาทิตย์ อา.'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'หลังเที่ยง หลังเที่ยง'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15 นาฬิกา 25 นาที 50 วินาที'],
+                ['L',                                  '2010/02/14'],
+                ['LL',                                 '14 กุมภาพันธ์ 2010'],
+                ['LLL',                                '14 กุมภาพันธ์ 2010 เวลา 15 นาฬิกา 25 นาที'],
+                ['LLLL',                               'วันอาทิตย์ที่ 14 กุมภาพันธ์ 2010 เวลา 15 นาฬิกา 25 นาที'],
+                ['l',                                  '2010/2/14'],
+                ['ll',                                 '14 กุมภา 2010'],
+                ['lll',                                '14 กุมภา 2010 เวลา 15 นาฬิกา 25 นาที'],
+                ['llll',                               'วันอาทิตย์ที่ 14 กุมภา 2010 เวลา 15 นาฬิกา 25 นาที']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = 'มกราคม มกรา_กุมภาพันธ์ กุมภา_มีนาคม มีนา_เมษายน เมษา_พฤษภาคม พฤษภา_มิถุนายน มิถุนา_กรกฎาคม กรกฎา_สิงหาคม สิงหา_กันยายน กันยา_ตุลาคม ตุลา_พฤศจิกายน พฤศจิกา_ธันวาคม ธันวา'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'อาทิตย์ อาทิตย์ อา._จันทร์ จันทร์ จ._อังคาร อังคาร อ._พุธ พุธ พ._พฤหัสบดี พฤหัส พฤ._ศุกร์ ศุกร์ ศ._เสาร์ เสาร์ ส.'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ไม่กี่วินาที',   '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  '1 นาที', '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  '1 นาที', '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 นาที',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 นาที', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  '1 ชั่วโมง', '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  '1 ชั่วโมง', '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ชั่วโมง',  '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ชั่วโมง',  '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ชั่วโมง', '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  '1 วัน',   '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  '1 วัน',   '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 วัน',   '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   '1 วัน',   '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 วัน',   '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 วัน',  '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  '1 เดือน', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  '1 เดือน', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  '1 เดือน', '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 เดือน',  '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 เดือน',  '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 เดือน',  '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   '1 เดือน', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 เดือน',  '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), '1 ปี',   '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ปี',   '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   '1 ปี',   '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ปี',   '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'อีก ไม่กี่วินาที',  'prefix');
+        assert.equal(moment(0).from(30000), 'ไม่กี่วินาทีที่แล้ว', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'ไม่กี่วินาทีที่แล้ว',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'อีก ไม่กี่วินาที', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'อีก 5 วัน', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'วันนี้ เวลา 2 นาฬิกา 0 นาที',      'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'วันนี้ เวลา 2 นาฬิกา 25 นาที',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'วันนี้ เวลา 3 นาฬิกา 0 นาที',      'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'พรุ่งนี้ เวลา 2 นาฬิกา 0 นาที', 'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'วันนี้ เวลา 1 นาฬิกา 0 นาที',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'เมื่อวานนี้ เวลา 2 นาฬิกา 0 นาที', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd[หน้า เวลา] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd[หน้า เวลา] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd[หน้า เวลา] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[วัน]dddd[ที่แล้ว เวลา] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[วัน]dddd[ที่แล้ว เวลา] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[วัน]dddd[ที่แล้ว เวลา] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1', 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2', 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3', 'Jan 15 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('tl-ph');
+
+    test('parse', function (assert) {
+        var tests = 'Enero Ene_Pebrero Peb_Marso Mar_Abril Abr_Mayo May_Hunyo Hun_Hulyo Hul_Agosto Ago_Setyembre Set_Oktubre Okt_Nobyembre Nob_Disyembre Dis'.split('_'),
+            i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Linggo, Pebrero 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Lin, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 Pebrero Peb'],
+                ['YYYY YY',                             '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 Linggo Lin Li'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '6 6 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '02/14/2010'],
+                ['LL',                                 'Pebrero 14, 2010'],
+                ['LLL',                                'Pebrero 14, 2010 15:25'],
+                ['LLLL',                               'Linggo, Pebrero 14, 2010 15:25'],
+                ['l',                                  '2/14/2010'],
+                ['ll',                                 'Peb 14, 2010'],
+                ['lll',                                'Peb 14, 2010 15:25'],
+                ['llll',                               'Lin, Peb 14, 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Enero Ene_Pebrero Peb_Marso Mar_Abril Abr_Mayo May_Hunyo Hun_Hulyo Hul_Agosto Ago_Setyembre Set_Oktubre Okt_Nobyembre Nob_Disyembre Dis'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Linggo Lin Li_Lunes Lun Lu_Martes Mar Ma_Miyerkules Miy Mi_Huwebes Huw Hu_Biyernes Biy Bi_Sabado Sab Sab'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ilang segundo', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'isang minuto',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'isang minuto',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuto',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuto', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'isang oras',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'isang oras',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 oras',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 oras',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 oras',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'isang araw',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'isang araw',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 araw',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'isang araw',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 araw',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 araw',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'isang buwan',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'isang buwan',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'isang buwan',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 buwan',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 buwan',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 buwan',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'isang buwan',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 buwan',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'isang taon',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 taon',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'isang taon',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 taon',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'sa loob ng ilang segundo', 'prefix');
+        assert.equal(moment(0).from(30000), 'ilang segundo ang nakalipas', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'sa loob ng ilang segundo', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'sa loob ng 5 araw', 'in 5 days');
+    });
+
+    test('same day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Ngayon sa 02:00',    'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Ngayon sa 02:25',    'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Ngayon sa 03:00',    'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Bukas sa 02:00',     'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Ngayon sa 01:00',    'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Kahapon sa 02:00',   'yesterday at the same time');
+    });
+
+    test('same next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [sa] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [sa] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [sa] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('same last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [huling linggo] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [huling linggo] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [huling linggo] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('same all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'), '1 01 1', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '1 01 1', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('tr');
+
+    test('parse', function (assert) {
+        var tests = 'Ocak Oca_Şubat Şub_Mart Mar_Nisan Nis_Mayıs May_Haziran Haz_Temmuz Tem_Ağustos Ağu_Eylül Eyl_Ekim Eki_Kasım Kas_Aralık Ara'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'Pazar, Şubat 14\'üncü 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'Paz, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2\'nci 02 Şubat Şub'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14\'üncü 14'],
+                ['d do dddd ddd dd',                   '0 0\'ıncı Pazar Paz Pz'],
+                ['DDD DDDo DDDD',                      '45 45\'inci 045'],
+                ['w wo ww',                            '7 7\'nci 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[yılın] DDDo [günü]',                'yılın 45\'inci günü'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 Şubat 2010'],
+                ['LLL',                                '14 Şubat 2010 15:25'],
+                ['LLLL',                               'Pazar, 14 Şubat 2010 15:25'],
+                ['l',                                  '14.2.2010'],
+                ['ll',                                 '14 Şub 2010'],
+                ['lll',                                '14 Şub 2010 15:25'],
+                ['llll',                               'Paz, 14 Şub 2010 15:25']
+            ],
+            DDDo = [
+                [359, '360\'ıncı'],
+                [199, '200\'üncü'],
+                [149, '150\'nci']
+            ],
+            dt = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            DDDoDt,
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(dt.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+        for (i = 0; i < DDDo.length; i++) {
+            DDDoDt = moment([2010]);
+            assert.equal(DDDoDt.add(DDDo[i][0], 'days').format('DDDo'), DDDo[i][1], DDDo[i][0] + ' ---> ' + DDDo[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1\'inci', '1st');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2\'nci', '2nd');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3\'üncü', '3rd');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4\'üncü', '4th');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5\'inci', '5th');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6\'ncı', '6th');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7\'nci', '7th');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8\'inci', '8th');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9\'uncu', '9th');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10\'uncu', '10th');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11\'inci', '11th');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12\'nci', '12th');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13\'üncü', '13th');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14\'üncü', '14th');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15\'inci', '15th');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16\'ncı', '16th');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17\'nci', '17th');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18\'inci', '18th');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19\'uncu', '19th');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20\'nci', '20th');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21\'inci', '21th');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22\'nci', '22th');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23\'üncü', '23th');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24\'üncü', '24th');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25\'inci', '25th');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26\'ncı', '26th');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27\'nci', '27th');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28\'inci', '28th');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29\'uncu', '29th');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30\'uncu', '30th');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31\'inci', '31st');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'Ocak Oca_Şubat Şub_Mart Mar_Nisan Nis_Mayıs May_Haziran Haz_Temmuz Tem_Ağustos Ağu_Eylül Eyl_Ekim Eki_Kasım Kas_Aralık Ara'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Pazar Paz Pz_Pazartesi Pts Pt_Salı Sal Sa_Çarşamba Çar Ça_Perşembe Per Pe_Cuma Cum Cu_Cumartesi Cts Ct'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'birkaç saniye', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'bir dakika',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'bir dakika',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 dakika',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 dakika',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'bir saat',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'bir saat',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 saat',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 saat',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 saat',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'bir gün',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'bir gün',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 gün',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'bir gün',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 gün',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 gün',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'bir ay',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'bir ay',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'bir ay',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 ay',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 ay',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 ay',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'bir ay',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 ay',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'bir yıl',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 yıl',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'bir yıl',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 yıl',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'birkaç saniye sonra',  'prefix');
+        assert.equal(moment(0).from(30000), 'birkaç saniye önce', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'birkaç saniye önce',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'birkaç saniye sonra', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 gün sonra', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'bugün saat 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'bugün saat 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'bugün saat 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'yarın saat 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'bugün saat 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'dün 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[haftaya] dddd [saat] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[haftaya] dddd [saat] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[haftaya] dddd [saat] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[geçen hafta] dddd [saat] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[geçen hafta] dddd [saat] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[geçen hafta] dddd [saat] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1\'inci', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1\'inci', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2\'nci', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2\'nci', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3\'üncü', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('tzm-latn');
+
+    test('parse', function (assert) {
+        var tests = 'innayr innayr_brˤayrˤ brˤayrˤ_marˤsˤ marˤsˤ_ibrir ibrir_mayyw mayyw_ywnyw ywnyw_ywlywz ywlywz_ɣwšt ɣwšt_šwtanbir šwtanbir_ktˤwbrˤ ktˤwbrˤ_nwwanbir nwwanbir_dwjnbir dwjnbir'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'asamas, brˤayrˤ 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'asamas, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 brˤayrˤ brˤayrˤ'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 asamas asamas asamas'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 brˤayrˤ 2010'],
+                ['LLL',                                '14 brˤayrˤ 2010 15:25'],
+                ['LLLL',                               'asamas 14 brˤayrˤ 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 brˤayrˤ 2010'],
+                ['lll',                                '14 brˤayrˤ 2010 15:25'],
+                ['llll',                               'asamas 14 brˤayrˤ 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'innayr innayr_brˤayrˤ brˤayrˤ_marˤsˤ marˤsˤ_ibrir ibrir_mayyw mayyw_ywnyw ywnyw_ywlywz ywlywz_ɣwšt ɣwšt_šwtanbir šwtanbir_ktˤwbrˤ ktˤwbrˤ_nwwanbir nwwanbir_dwjnbir dwjnbir'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'asamas asamas asamas_aynas aynas aynas_asinas asinas asinas_akras akras akras_akwas akwas akwas_asimwas asimwas asimwas_asiḍyas asiḍyas asiḍyas'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'imik', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'minuḍ',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'minuḍ',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 minuḍ',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 minuḍ',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'saɛa',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'saɛa',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 tassaɛin',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 tassaɛin',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 tassaɛin',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ass',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ass',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 ossan',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ass',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 ossan',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 ossan',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ayowr',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ayowr',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ayowr',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 iyyirn',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 iyyirn',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 iyyirn',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ayowr',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 iyyirn',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'asgas',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 isgasn',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'asgas',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 isgasn',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'dadkh s yan imik',  'prefix');
+        assert.equal(moment(0).from(30000), 'yan imik', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'yan imik',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'dadkh s yan imik', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'dadkh s yan 5 ossan', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'asdkh g 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'asdkh g 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'asdkh g 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'aska g 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'asdkh g 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'assant g 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [g] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [g] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [g] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [g] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [g] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [g] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 31]).week(), 1, 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).week(), 1, 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).week(), 2, 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).week(), 2, 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).week(), 3, 'Jan 14 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 30]).week(), 1, 'Dec 30 2006 should be week 1');
+        assert.equal(moment([2007,  0,  5]).week(), 1, 'Jan  5 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 2, 'Jan  6 2007 should be week 2');
+        assert.equal(moment([2007,  0, 12]).week(), 2, 'Jan 12 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 3, 'Jan 13 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 1, 'Dec 29 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  4]).week(), 1, 'Jan  4 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 2, 'Jan  5 2008 should be week 2');
+        assert.equal(moment([2008,  0, 11]).week(), 2, 'Jan 11 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 3, 'Jan 12 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 28]).week(), 1, 'Dec 28 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  3]).week(), 1, 'Jan  3 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 2, 'Jan  4 2003 should be week 2');
+        assert.equal(moment([2003,  0, 10]).week(), 2, 'Jan 10 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 3, 'Jan 11 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 27]).week(), 1, 'Dec 27 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  2]).week(), 1, 'Jan  2 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 2, 'Jan  3 2009 should be week 2');
+        assert.equal(moment([2009,  0,  9]).week(), 2, 'Jan  9 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 3, 'Jan 10 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 26]).week(), 1, 'Dec 26 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 2, 'Jan  2 2010 should be week 2');
+        assert.equal(moment([2010,  0,  8]).week(), 2, 'Jan  8 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 3, 'Jan  9 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2011, 0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011, 0,  7]).week(), 1, 'Jan  7 2011 should be week 1');
+        assert.equal(moment([2011, 0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011, 0, 14]).week(), 2, 'Jan 14 2011 should be week 2');
+        assert.equal(moment([2011, 0, 15]).week(), 3, 'Jan 15 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 31]).format('w ww wo'), '1 01 1', 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).format('w ww wo'), '1 01 1', 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).format('w ww wo'), '2 02 2', 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', 'Jan 14 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('tzm');
+
+    test('parse', function (assert) {
+        var tests = 'ⵉⵏⵏⴰⵢⵔ ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ ⴷⵓⵊⵏⴱⵉⵔ'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'ⴰⵙⴰⵎⴰⵙ, ⴱⵕⴰⵢⵕ 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'ⴰⵙⴰⵎⴰⵙ, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 ⴱⵕⴰⵢⵕ ⴱⵕⴰⵢⵕ'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '8 8 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[the] DDDo [day of the year]',       'the 45 day of the year'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 ⴱⵕⴰⵢⵕ 2010'],
+                ['LLL',                                '14 ⴱⵕⴰⵢⵕ 2010 15:25'],
+                ['LLLL',                               'ⴰⵙⴰⵎⴰⵙ 14 ⴱⵕⴰⵢⵕ 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 ⴱⵕⴰⵢⵕ 2010'],
+                ['lll',                                '14 ⴱⵕⴰⵢⵕ 2010 15:25'],
+                ['llll',                               'ⴰⵙⴰⵎⴰⵙ 14 ⴱⵕⴰⵢⵕ 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'ⵉⵏⵏⴰⵢⵔ ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ ⴷⵓⵊⵏⴱⵉⵔ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ ⴰⵢⵏⴰⵙ ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ ⴰⵙⵉⵏⴰⵙ ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ ⴰⴽⵔⴰⵙ ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ ⴰⴽⵡⴰⵙ ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ ⴰⵙⵉⵎⵡⴰⵙ ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ ⴰⵙⵉⴹⵢⴰⵙ ⴰⵙⵉⴹⵢⴰⵙ'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'ⵉⵎⵉⴽ', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'ⵎⵉⵏⵓⴺ',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'ⵎⵉⵏⵓⴺ',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 ⵎⵉⵏⵓⴺ',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 ⵎⵉⵏⵓⴺ',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'ⵙⴰⵄⴰ',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'ⵙⴰⵄⴰ',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 ⵜⴰⵙⵙⴰⵄⵉⵏ',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 ⵜⴰⵙⵙⴰⵄⵉⵏ',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 ⵜⴰⵙⵙⴰⵄⵉⵏ',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'ⴰⵙⵙ',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'ⴰⵙⵙ',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 oⵙⵙⴰⵏ',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'ⴰⵙⵙ',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 oⵙⵙⴰⵏ',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 oⵙⵙⴰⵏ',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'ⴰⵢoⵓⵔ',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'ⴰⵢoⵓⵔ',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'ⴰⵢoⵓⵔ',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 ⵉⵢⵢⵉⵔⵏ',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 ⵉⵢⵢⵉⵔⵏ',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 ⵉⵢⵢⵉⵔⵏ',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'ⴰⵢoⵓⵔ',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 ⵉⵢⵢⵉⵔⵏ',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'ⴰⵙⴳⴰⵙ',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 ⵉⵙⴳⴰⵙⵏ',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'ⴰⵙⴳⴰⵙ',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 ⵉⵙⴳⴰⵙⵏ',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ ⵉⵎⵉⴽ',  'prefix');
+        assert.equal(moment(0).from(30000), 'ⵢⴰⵏ ⵉⵎⵉⴽ', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'ⵢⴰⵏ ⵉⵎⵉⴽ',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ ⵉⵎⵉⴽ', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ 5 oⵙⵙⴰⵏ', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'ⴰⵙⴷⵅ ⴴ 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'ⴰⵙⴷⵅ ⴴ 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'ⴰⵙⴷⵅ ⴴ 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'ⴰⵙⴽⴰ ⴴ 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'ⴰⵙⴷⵅ ⴴ 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'ⴰⵚⴰⵏⵜ ⴴ 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [ⴴ] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 31]).week(), 1, 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).week(), 1, 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).week(), 2, 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).week(), 2, 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).week(), 3, 'Jan 14 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 30]).week(), 1, 'Dec 30 2006 should be week 1');
+        assert.equal(moment([2007,  0,  5]).week(), 1, 'Jan  5 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 2, 'Jan  6 2007 should be week 2');
+        assert.equal(moment([2007,  0, 12]).week(), 2, 'Jan 12 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 3, 'Jan 13 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 1, 'Dec 29 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  4]).week(), 1, 'Jan  4 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 2, 'Jan  5 2008 should be week 2');
+        assert.equal(moment([2008,  0, 11]).week(), 2, 'Jan 11 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 3, 'Jan 12 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 28]).week(), 1, 'Dec 28 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  3]).week(), 1, 'Jan  3 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 2, 'Jan  4 2003 should be week 2');
+        assert.equal(moment([2003,  0, 10]).week(), 2, 'Jan 10 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 3, 'Jan 11 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 27]).week(), 1, 'Dec 27 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  2]).week(), 1, 'Jan  2 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 2, 'Jan  3 2009 should be week 2');
+        assert.equal(moment([2009,  0,  9]).week(), 2, 'Jan  9 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 3, 'Jan 10 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 26]).week(), 1, 'Dec 26 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 2, 'Jan  2 2010 should be week 2');
+        assert.equal(moment([2010,  0,  8]).week(), 2, 'Jan  8 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 3, 'Jan  9 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2011, 0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011, 0,  7]).week(), 1, 'Jan  7 2011 should be week 1');
+        assert.equal(moment([2011, 0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011, 0, 14]).week(), 2, 'Jan 14 2011 should be week 2');
+        assert.equal(moment([2011, 0, 15]).week(), 3, 'Jan 15 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 31]).format('w ww wo'), '1 01 1', 'Dec 31 2011 should be week 1');
+        assert.equal(moment([2012,  0,  6]).format('w ww wo'), '1 01 1', 'Jan  6 2012 should be week 1');
+        assert.equal(moment([2012,  0,  7]).format('w ww wo'), '2 02 2', 'Jan  7 2012 should be week 2');
+        assert.equal(moment([2012,  0, 13]).format('w ww wo'), '2 02 2', 'Jan 13 2012 should be week 2');
+        assert.equal(moment([2012,  0, 14]).format('w ww wo'), '3 03 3', 'Jan 14 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('uk');
+
+    test('parse', function (assert) {
+        var tests = 'січень січ_лютий лют_березень бер_квітень квіт_травень трав_червень черв_липень лип_серпень серп_вересень вер_жовтень жовт_листопад лист_грудень груд'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do MMMM YYYY, HH:mm:ss',       'неділя, 14-го лютого 2010, 15:25:50'],
+                ['ddd, h A',                           'нд, 3 дня'],
+                ['M Mo MM MMMM MMM',                   '2 2-й 02 лютий лют'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14-го 14'],
+                ['d do dddd ddd dd',                   '0 0-й неділя нд нд'],
+                ['DDD DDDo DDDD',                      '45 45-й 045'],
+                ['w wo ww',                            '7 7-й 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'дня дня'],
+                ['DDDo [день року]',                  '45-й день року'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14.02.2010'],
+                ['LL',                                 '14 лютого 2010 р.'],
+                ['LLL',                                '14 лютого 2010 р., 15:25'],
+                ['LLLL',                               'неділя, 14 лютого 2010 р., 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format meridiem', function (assert) {
+        assert.equal(moment([2012, 11, 28, 0, 0]).format('A'), 'ночі', 'night');
+        assert.equal(moment([2012, 11, 28, 3, 59]).format('A'), 'ночі', 'night');
+        assert.equal(moment([2012, 11, 28, 4, 0]).format('A'), 'ранку', 'morning');
+        assert.equal(moment([2012, 11, 28, 11, 59]).format('A'), 'ранку', 'morning');
+        assert.equal(moment([2012, 11, 28, 12, 0]).format('A'), 'дня', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 16, 59]).format('A'), 'дня', 'afternoon');
+        assert.equal(moment([2012, 11, 28, 17, 0]).format('A'), 'вечора', 'evening');
+        assert.equal(moment([2012, 11, 28, 23, 59]).format('A'), 'вечора', 'evening');
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1-й', '1-й');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2-й', '2-й');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3-й', '3-й');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4-й', '4-й');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5-й', '5-й');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6-й', '6-й');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7-й', '7-й');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8-й', '8-й');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9-й', '9-й');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10-й', '10-й');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11-й', '11-й');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12-й', '12-й');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13-й', '13-й');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14-й', '14-й');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15-й', '15-й');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16-й', '16-й');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17-й', '17-й');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18-й', '18-й');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19-й', '19-й');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20-й', '20-й');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21-й', '21-й');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22-й', '22-й');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23-й', '23-й');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24-й', '24-й');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25-й', '25-й');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26-й', '26-й');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27-й', '27-й');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28-й', '28-й');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29-й', '29-й');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30-й', '30-й');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31-й', '31-й');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'січень січ_лютий лют_березень бер_квітень квіт_травень трав_червень черв_липень лип_серпень серп_вересень вер_жовтень жовт_листопад лист_грудень груд'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format month case', function (assert) {
+        var months = {
+            'nominative': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_'),
+            'accusative': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_')
+        }, i;
+        for (i = 0; i < 12; i++) {
+            assert.equal(moment([2011, i, 1]).format('D MMMM'), '1 ' + months.accusative[i], '1 ' + months.accusative[i]);
+            assert.equal(moment([2011, i, 1]).format('MMMM'), months.nominative[i], '1 ' + months.nominative[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'неділя нд нд_понеділок пн пн_вівторок вт вт_середа ср ср_четвер чт чт_п’ятниця пт пт_субота сб сб'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'декілька секунд',    '44 seconds = seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'хвилина',   '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'хвилина',   '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 хвилини',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 хвилини', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'годину',    '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'годину',    '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 години',    '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 годин',    '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 година',   '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'день',      '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'день',      '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 дні',     '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'день',      '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 днів',     '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 11}), true),  '11 днів',     '11 days = 11 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 21}), true),  '21 день',     '21 days = 21 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 днів',    '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'місяць',    '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'місяць',    '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'місяць',    '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 місяці',   '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 місяці',   '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 місяці',   '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'місяць',    '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 місяців',   '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'рік',     '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 роки',    '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'рік',     '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 років',    '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'за декілька секунд', 'prefix');
+        assert.equal(moment(0).from(30000), 'декілька секунд тому', 'suffix');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'за декілька секунд', 'in seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'за 5 днів', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Сьогодні о 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Сьогодні о 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Сьогодні о 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Завтра о 02:00',      'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Сьогодні о 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Вчора о 02:00',       'yesterday at the same time');
+        // A special case for Ukrainian since 11 hours have different preposition
+        assert.equal(moment(a).add({h: 9}).calendar(),  'Сьогодні об 11:00',       'same day at 11 o\'clock');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[У] dddd [о' + (m.hours() === 11 ? 'б' : '') + '] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[У] dddd [о] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[У] dddd [о] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        function makeFormat(d) {
+            switch (d.day()) {
+            case 0:
+            case 3:
+            case 5:
+            case 6:
+                return '[Минулої] dddd [о' + (d.hours() === 11 ? 'б' : '') + '] LT';
+            case 1:
+            case 2:
+            case 4:
+                return '[Минулого] dddd [о' + (d.hours() === 11 ? 'б' : '') + '] LT';
+            }
+        }
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format(makeFormat(m)),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2011, 11, 26]).week(), 1, 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).week(), 2, 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).week(), 3, 'Jan  9 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 12]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 1');
+        assert.equal(moment([2010,  0,  4]).week(), 2, 'Jan  4 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 2, 'Jan 10 2010 should be week 2');
+        assert.equal(moment([2010,  0, 11]).week(), 3, 'Jan 11 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 1');
+        assert.equal(moment([2011,  0,  3]).week(), 2, 'Jan  3 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 2, 'Jan  9 2011 should be week 2');
+        assert.equal(moment([2011,  0, 10]).week(), 3, 'Jan 10 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2011, 11, 26]).format('w ww wo'), '1 01 1-й', 'Dec 26 2011 should be week 1');
+        assert.equal(moment([2012,  0,  1]).format('w ww wo'), '1 01 1-й', 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012,  0,  2]).format('w ww wo'), '2 02 2-й', 'Jan  2 2012 should be week 2');
+        assert.equal(moment([2012,  0,  8]).format('w ww wo'), '2 02 2-й', 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012,  0,  9]).format('w ww wo'), '3 03 3-й', 'Jan  9 2012 should be week 3');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('uz');
+
+    test('parse', function (assert) {
+        var tests = 'январь янв_февраль фев_март мар_апрель апр_май май_июнь июнь_июль июль_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, Do-MMMM YYYY, h:mm:ss',        'Якшанба, 14-февраль 2010, 3:25:50'],
+                ['ddd, h:mm',                          'Якш, 3:25'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 февраль фев'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 Якшанба Якш Як'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '7 7 07'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[йилнинг] DDDo-[куни]',             'йилнинг 45-куни'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 февраль 2010'],
+                ['LLL',                                '14 февраль 2010 15:25'],
+                ['LLLL',                               '14 февраль 2010, Якшанба 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 фев 2010'],
+                ['lll',                                '14 фев 2010 15:25'],
+                ['llll',                               '14 фев 2010, Якш 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var expected = 'январь янв_февраль фев_март мар_апрель апр_май май_июнь июн_июль июл_август авг_сентябрь сен_октябрь окт_ноябрь ноя_декабрь дек'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = 'Якшанба Якш Як_Душанба Душ Ду_Сешанба Сеш Се_Чоршанба Чор Чо_Пайшанба Пай Па_Жума Жум Жу_Шанба Шан Ша'.split('_'), i;
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'фурсат', '44 секунд = фурсат');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'бир дакика',      '45 секунд = бир дакика');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'бир дакика',      '89 секунд = бир дакика');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 дакика',     '90 секунд = 2 дакика');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 дакика',    '44 дакика = 44 дакика');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'бир соат',       '45 минут = бир соат');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'бир соат',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 соат',       '90 минут = 2 соат');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 соат',       '5 соат = 5 соат');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 соат',      '21 соат = 21 соат');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'бир кун',         '22 соат = бир кун');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'бир кун',         '35 соат = бир кун');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 кун',        '36 соат = 2 кун');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'бир кун',         '1 кун = 1 кун');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 кун',        '5 кун = 5 кун');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 кун',       '25 кун = 25 кун');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'бир ой',       '26 кун = бир ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'бир ой',       '30 кун = бир ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'бир ой',       '45 кун = бир ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 ой',      '46 кун = 2 ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 ой',      '75 кун = 2 ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 ой',      '76 кун = 3 ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'бир ой',       'бир ой = бир ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 ой',      '5 ой = 5 ой');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'бир йил',        '345 кун = бир йил');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 йил',       '548 кун = 2 йил');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'бир йил',        '1 йил = бир йил');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 йил',       '5 йил = 5 йил');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'Якин фурсат ичида',  'prefix');
+        assert.equal(moment(0).from(30000), 'Бир неча фурсат олдин', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'Бир неча фурсат олдин',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'Якин фурсат ичида', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), 'Якин 5 кун ичида', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Бугун соат 02:00 да',      'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Бугун соат 02:25 да',      'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Бугун соат 03:00 да',      'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Эртага 02:00 да',   'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Бугун соат 01:00 да',      'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Кеча соат 02:00 да',  'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [куни соат] LT [да]'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [куни соат] LT [да]'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [куни соат] LT [да]'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[Утган] dddd [куни соат] LT [да]'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[Утган] dddd [куни соат] LT [да]'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[Утган] dddd [куни соат] LT [да]'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 1, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  2, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  2, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  3, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 1, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 1, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  2, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  2, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  3, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 1, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 1, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  2, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  2, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  3, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '2 02 2', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '2 02 2', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '3 03 3', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '3 03 3', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('vi');
+
+    test('parse', function (assert) {
+        var i,
+            tests = 'tháng 1,Th01_tháng 2,Th02_tháng 3,Th03_tháng 4,Th04_tháng 5,Th05_tháng 6,Th06_tháng 7,Th07_tháng 8,Th08_tháng 9,Th09_tháng 10,Th10_tháng 11,Th11_tháng 12,Th12'.split('_');
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + i);
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(',');
+            equalTest(tests[i][0], '[tháng] M', i);
+            equalTest(tests[i][1], '[Th]M', i);
+            equalTest(tests[i][0], '[tháng] MM', i);
+            equalTest(tests[i][1], '[Th]MM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), '[THÁNG] M', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), '[TH]M', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), '[THÁNG] MM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), '[TH]MM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, h:mm:ss a',      'chủ nhật, tháng 2 14 2010, 3:25:50 pm'],
+                ['ddd, hA',                            'CN, 3PM'],
+                ['M Mo MM MMMM MMM',                   '2 2 02 tháng 2 Th02'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14 14'],
+                ['d do dddd ddd dd',                   '0 0 chủ nhật CN CN'],
+                ['DDD DDDo DDDD',                      '45 45 045'],
+                ['w wo ww',                            '6 6 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                'pm PM'],
+                ['[ngày thứ] DDDo [của năm]',          'ngày thứ 45 của năm'],
+                ['LTS',                                '15:25:50'],
+                ['L',                                  '14/02/2010'],
+                ['LL',                                 '14 tháng 2 năm 2010'],
+                ['LLL',                                '14 tháng 2 năm 2010 15:25'],
+                ['LLLL',                               'chủ nhật, 14 tháng 2 năm 2010 15:25'],
+                ['l',                                  '14/2/2010'],
+                ['ll',                                 '14 Th02 2010'],
+                ['lll',                                '14 Th02 2010 15:25'],
+                ['llll',                               'CN, 14 Th02 2010 15:25']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format ordinal', function (assert) {
+        assert.equal(moment([2011, 0, 1]).format('DDDo'), '1', '1');
+        assert.equal(moment([2011, 0, 2]).format('DDDo'), '2', '2');
+        assert.equal(moment([2011, 0, 3]).format('DDDo'), '3', '3');
+        assert.equal(moment([2011, 0, 4]).format('DDDo'), '4', '4');
+        assert.equal(moment([2011, 0, 5]).format('DDDo'), '5', '5');
+        assert.equal(moment([2011, 0, 6]).format('DDDo'), '6', '6');
+        assert.equal(moment([2011, 0, 7]).format('DDDo'), '7', '7');
+        assert.equal(moment([2011, 0, 8]).format('DDDo'), '8', '8');
+        assert.equal(moment([2011, 0, 9]).format('DDDo'), '9', '9');
+        assert.equal(moment([2011, 0, 10]).format('DDDo'), '10', '10');
+
+        assert.equal(moment([2011, 0, 11]).format('DDDo'), '11', '11');
+        assert.equal(moment([2011, 0, 12]).format('DDDo'), '12', '12');
+        assert.equal(moment([2011, 0, 13]).format('DDDo'), '13', '13');
+        assert.equal(moment([2011, 0, 14]).format('DDDo'), '14', '14');
+        assert.equal(moment([2011, 0, 15]).format('DDDo'), '15', '15');
+        assert.equal(moment([2011, 0, 16]).format('DDDo'), '16', '16');
+        assert.equal(moment([2011, 0, 17]).format('DDDo'), '17', '17');
+        assert.equal(moment([2011, 0, 18]).format('DDDo'), '18', '18');
+        assert.equal(moment([2011, 0, 19]).format('DDDo'), '19', '19');
+        assert.equal(moment([2011, 0, 20]).format('DDDo'), '20', '20');
+
+        assert.equal(moment([2011, 0, 21]).format('DDDo'), '21', '21');
+        assert.equal(moment([2011, 0, 22]).format('DDDo'), '22', '22');
+        assert.equal(moment([2011, 0, 23]).format('DDDo'), '23', '23');
+        assert.equal(moment([2011, 0, 24]).format('DDDo'), '24', '24');
+        assert.equal(moment([2011, 0, 25]).format('DDDo'), '25', '25');
+        assert.equal(moment([2011, 0, 26]).format('DDDo'), '26', '26');
+        assert.equal(moment([2011, 0, 27]).format('DDDo'), '27', '27');
+        assert.equal(moment([2011, 0, 28]).format('DDDo'), '28', '28');
+        assert.equal(moment([2011, 0, 29]).format('DDDo'), '29', '29');
+        assert.equal(moment([2011, 0, 30]).format('DDDo'), '30', '30');
+
+        assert.equal(moment([2011, 0, 31]).format('DDDo'), '31', '31');
+    });
+
+    test('format month', function (assert) {
+        var i,
+            expected = 'tháng 1,Th01_tháng 2,Th02_tháng 3,Th03_tháng 4,Th04_tháng 5,Th05_tháng 6,Th06_tháng 7,Th07_tháng 8,Th08_tháng 9,Th09_tháng 10,Th10_tháng 11,Th11_tháng 12,Th12'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM,MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var i,
+            expected = 'chủ nhật CN CN_thứ hai T2 T2_thứ ba T3 T3_thứ tư T4 T4_thứ năm T5 T5_thứ sáu T6 T6_thứ bảy T7 T7'.split('_');
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  'vài giây', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  'một phút',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  'một phút',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 phút',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 phút',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  'một giờ',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  'một giờ',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 giờ',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 giờ',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 giờ',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  'một ngày',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  'một ngày',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 ngày',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   'một ngày',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 ngày',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 ngày',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  'một tháng',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  'một tháng',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  'một tháng',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 tháng',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 tháng',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 tháng',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   'một tháng',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 tháng',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), 'một năm',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 năm',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   'một năm',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 năm',       '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), 'vài giây tới',  'prefix');
+        assert.equal(moment(0).from(30000), 'vài giây trước', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), 'vài giây trước',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), 'vài giây tới', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 ngày tới', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                     'Hôm nay lúc 02:00',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Hôm nay lúc 02:25',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Hôm nay lúc 03:00',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Ngày mai lúc 02:00',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Hôm nay lúc 01:00',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Hôm qua lúc 02:00', 'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [tuần tới lúc] LT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [tuần tới lúc] LT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [tuần tới lúc] LT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('dddd [tuần rồi lúc] LT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('dddd [tuần rồi lúc] LT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('dddd [tuần rồi lúc] LT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),  '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0, 2]).week(),  1, 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0, 8]).week(),  1, 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0, 9]).week(),  2, 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 2, 'Jan 15 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).week(),  1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007, 0, 7]).week(),  1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007, 0, 8]).week(),  2, 'Jan  8 2007 should be week 2');
+        assert.equal(moment([2007, 0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+        assert.equal(moment([2007, 0, 15]).week(), 3, 'Jan 15 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).week(), 1, 'Dec 31 2007 should be week 1');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0,  7]).week(), 2, 'Jan  7 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+        assert.equal(moment([2008,  0, 14]).week(), 3, 'Jan 14 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).week(), 1, 'Dec 30 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0,  6]).week(), 2, 'Jan  6 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+        assert.equal(moment([2003,  0, 13]).week(), 3, 'Jan 13 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).week(), 1, 'Dec 29 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0,  5]).week(), 2, 'Jan  5 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+        assert.equal(moment([2009,  0, 13]).week(), 3, 'Jan 12 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).week(), 53, 'Dec 28 2009 should be week 53');
+        assert.equal(moment([2010,  0,  1]).week(), 53, 'Jan  1 2010 should be week 53');
+        assert.equal(moment([2010,  0,  3]).week(), 53, 'Jan  3 2010 should be week 53');
+        assert.equal(moment([2010,  0,  4]).week(),  1, 'Jan  4 2010 should be week 1');
+        assert.equal(moment([2010,  0, 10]).week(),  1, 'Jan 10 2010 should be week 1');
+        assert.equal(moment([2010,  0, 11]).week(),  2, 'Jan 11 2010 should be week 2');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).week(), 52, 'Dec 27 2010 should be week 52');
+        assert.equal(moment([2011,  0,  1]).week(), 52, 'Jan  1 2011 should be week 52');
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  3]).week(),  1, 'Jan  3 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(),  1, 'Jan  9 2011 should be week 1');
+        assert.equal(moment([2011,  0, 10]).week(),  2, 'Jan 10 2011 should be week 2');
+    });
+
+    test('weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52', 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).format('w ww wo'),   '1 01 1', 'Jan  2 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'),   '1 01 1', 'Jan  8 2012 should be week 1');
+        assert.equal(moment([2012, 0,  9]).format('w ww wo'),   '2 02 2', 'Jan  9 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'),   '2 02 2', 'Jan 15 2012 should be week 2');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('zh-cn');
+
+    test('parse', function (assert) {
+        var tests = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split('_'), i;
+
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, a h:mm:ss',      '星期日, 二月 14日 2010, 下午 3:25:50'],
+                ['ddd, Ah',                            '周日, 下午3'],
+                ['M Mo MM MMMM MMM',                   '2 2月 02 二月 2月'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14日 14'],
+                ['d do dddd ddd dd',                   '0 0日 星期日 周日 日'],
+                ['DDD DDDo DDDD',                      '45 45日 045'],
+                ['w wo ww',                            '6 6周 06'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                '下午 下午'],
+                ['[这年的第] DDDo',                    '这年的第 45日'],
+                ['LTS',                                '下午3点25分50秒'],
+                ['L',                                  '2010-02-14'],
+                ['LL',                                 '2010年2月14日'],
+                ['LLL',                                '2010年2月14日下午3点25分'],
+                ['LLLL',                               '2010年2月14日星期日下午3点25分'],
+                ['l',                                  '2010-02-14'],
+                ['ll',                                 '2010年2月14日'],
+                ['lll',                                '2010年2月14日下午3点25分'],
+                ['llll',                               '2010年2月14日星期日下午3点25分']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split('_'), i;
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = '星期日 周日 日_星期一 周一 一_星期二 周二 二_星期三 周三 三_星期四 周四 四_星期五 周五 五_星期六 周六 六'.split('_'), i;
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  '几秒',   '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  '1 分钟', '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  '1 分钟', '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2 分钟',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44 分钟', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  '1 小时', '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  '1 小时', '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2 小时',  '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5 小时',  '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21 小时', '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  '1 天',   '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  '1 天',   '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2 天',   '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   '1 天',   '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5 天',   '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25 天',  '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  '1 个月', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  '1 个月', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  '1 个月', '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2 个月',  '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2 个月',  '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3 个月',  '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   '1 个月', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5 个月',  '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), '1 年',   '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2 年',   '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   '1 年',   '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5 年',   '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), '几秒内',  'prefix');
+        assert.equal(moment(0).from(30000), '几秒前', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), '几秒前',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), '几秒内', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5 天内', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                   '今天凌晨2点整',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      '今天凌晨2点25分',   'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       '今天凌晨3点整',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       '明天凌晨2点整',     'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  '今天凌晨1点整',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  '昨天凌晨2点整',     'yesterday at the same time');
+    });
+
+    test('calendar current week', function (assert) {
+        var i, m,
+            today = moment().startOf('day');
+
+        for (i = 0; i < 7; i++) {
+            m = moment().startOf('week').add({d: i});
+            if (Math.abs(m.diff(today, 'days')) <= 1) {
+                continue; // skip today, yesterday, tomorrow
+            }
+            assert.equal(m.calendar(),       m.format('[本]ddd凌晨12点整'),  'Monday + ' + i + ' days current time');
+        }
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m,
+            today = moment().startOf('day');
+
+        for (i = 7; i < 14; i++) {
+            m = moment().startOf('week').add({d: i});
+            if (Math.abs(m.diff(today, 'days')) >= 7) {
+                continue;
+            }
+            if (Math.abs(m.diff(today, 'days')) <= 1) {
+                continue; // skip today, yesterday, tomorrow
+            }
+            assert.equal(m.calendar(),  m.format('[下]ddd凌晨12点整'), 'Today + ' + i + ' days beginning of day');
+        }
+        assert.equal(42, 42, 'at least one assert');
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m,
+            today = moment().startOf('day');
+
+        for (i = 1; i < 8; i++) {
+            m = moment().startOf('week').subtract({d: i});
+            if ((Math.abs(m.diff(today, 'days')) >= 7) || (Math.abs(m.diff(today, 'days')) <= 1)) {
+                continue;
+            }
+            assert.equal(m.calendar(),  m.format('[上]ddd凌晨12点整'),  'Monday - ' + i + ' days next week');
+        }
+        assert.equal(42, 42, 'at least one assert');
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('LL'),      '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('LL'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('LL'),      '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('LL'),  'in 2 weeks');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  0, 0]).format('A'), '凌晨', 'before dawn');
+        assert.equal(moment([2011, 2, 23,  6, 0]).format('A'), '早上', 'morning');
+        assert.equal(moment([2011, 2, 23,  9, 0]).format('A'), '上午', 'before noon');
+        assert.equal(moment([2011, 2, 23, 12, 0]).format('A'), '中午', 'noon');
+        assert.equal(moment([2011, 2, 23, 13, 0]).format('A'), '下午', 'afternoon');
+        assert.equal(moment([2011, 2, 23, 18, 0]).format('A'), '晚上', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 52, 'Jan  1 2012 should be week 52');
+        assert.equal(moment([2012, 0,  2]).week(), 1, 'Jan  2 2012 should be week 52');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 52, 'Dec 31 2006 should be week 52');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 1, 'Jan  7 2007 should be week 1');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 2, 'Jan 14 2007 should be week 2');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 1, 'Jan  6 2008 should be week 1');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 2, 'Jan 13 2008 should be week 2');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 52, 'Dec 29 2002 should be week 52');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 1, 'Jan  5 2003 should be week 1');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 2, 'Jan 12 2003 should be week 2');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 1, 'Jan  4 2009 should be week 1');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 2, 'Jan 11 2009 should be week 2');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2010,  0,  2]).week(), 53, 'Jan  2 2010 should be week 53');
+        assert.equal(moment([2010,  0, 10]).week(), 1, 'Jan 10 2010 should be week 1');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2011,  0,  2]).week(), 52, 'Jan  2 2011 should be week 52');
+        assert.equal(moment([2011,  0,  8]).week(), 1, 'Jan  8 2011 should be week 1');
+        assert.equal(moment([2011,  0,  9]).week(), 1, 'Jan  9 2011 should be week 1');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '52 52 52周', 'Jan  1 2012 应该是第52周');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1周', 'Jan  7 2012 应该是第 1周');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2周', 'Jan 14 2012 应该是第 2周');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    localeModule('zh-tw');
+
+    test('parse', function (assert) {
+        var tests = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split('_'), i;
+        function equalTest(input, mmm, i) {
+            assert.equal(moment(input, mmm).month(), i, input + ' should be month ' + (i + 1));
+        }
+        for (i = 0; i < 12; i++) {
+            tests[i] = tests[i].split(' ');
+            equalTest(tests[i][0], 'MMM', i);
+            equalTest(tests[i][1], 'MMM', i);
+            equalTest(tests[i][0], 'MMMM', i);
+            equalTest(tests[i][1], 'MMMM', i);
+            equalTest(tests[i][0].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleLowerCase(), 'MMMM', i);
+            equalTest(tests[i][0].toLocaleUpperCase(), 'MMMM', i);
+            equalTest(tests[i][1].toLocaleUpperCase(), 'MMMM', i);
+        }
+    });
+
+    test('format', function (assert) {
+        var a = [
+                ['dddd, MMMM Do YYYY, a h:mm:ss',      '星期日, 二月 14日 2010, 下午 3:25:50'],
+                ['ddd, Ah',                            '週日, 下午3'],
+                ['M Mo MM MMMM MMM',                   '2 2月 02 二月 2月'],
+                ['YYYY YY',                            '2010 10'],
+                ['D Do DD',                            '14 14日 14'],
+                ['d do dddd ddd dd',                   '0 0日 星期日 週日 日'],
+                ['DDD DDDo DDDD',                      '45 45日 045'],
+                ['w wo ww',                            '8 8週 08'],
+                ['h hh',                               '3 03'],
+                ['H HH',                               '15 15'],
+                ['m mm',                               '25 25'],
+                ['s ss',                               '50 50'],
+                ['a A',                                '下午 下午'],
+                ['[這年的第] DDDo',                    '這年的第 45日'],
+                ['LTS',                                '下午3點25分50秒'],
+                ['L',                                  '2010年2月14日'],
+                ['LL',                                 '2010年2月14日'],
+                ['LLL',                                '2010年2月14日下午3點25分'],
+                ['LLLL',                               '2010年2月14日星期日下午3點25分'],
+                ['l',                                  '2010年2月14日'],
+                ['ll',                                 '2010年2月14日'],
+                ['lll',                                '2010年2月14日下午3點25分'],
+                ['llll',                               '2010年2月14日星期日下午3點25分']
+            ],
+            b = moment(new Date(2010, 1, 14, 15, 25, 50, 125)),
+            i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('format month', function (assert) {
+        var expected = '一月 1月_二月 2月_三月 3月_四月 4月_五月 5月_六月 6月_七月 7月_八月 8月_九月 9月_十月 10月_十一月 11月_十二月 12月'.split('_'), i;
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, i, 1]).format('MMMM MMM'), expected[i], expected[i]);
+        }
+    });
+
+    test('format week', function (assert) {
+        var expected = '星期日 週日 日_星期一 週一 一_星期二 週二 二_星期三 週三 三_星期四 週四 四_星期五 週五 五_星期六 週六 六'.split('_'), i;
+
+        for (i = 0; i < expected.length; i++) {
+            assert.equal(moment([2011, 0, 2 + i]).format('dddd ddd dd'), expected[i], expected[i]);
+        }
+    });
+
+    test('from', function (assert) {
+        var start = moment([2007, 1, 28]);
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  '幾秒',   '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  '一分鐘', '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  '一分鐘', '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  '2分鐘',  '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44}), true),  '44分鐘', '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45}), true),  '一小時', '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89}), true),  '一小時', '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90}), true),  '2小時',  '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5}), true),   '5小時',  '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21}), true),  '21小時', '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22}), true),  '一天',   '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35}), true),  '一天',   '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36}), true),  '2天',   '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1}), true),   '一天',   '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5}), true),   '5天',   '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25}), true),  '25天',  '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26}), true),  '一個月', '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30}), true),  '一個月', '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43}), true),  '一個月', '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46}), true),  '2個月',  '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74}), true),  '2個月',  '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76}), true),  '3個月',  '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1}), true),   '一個月', '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5}), true),   '5個月',  '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345}), true), '一年',   '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548}), true), '2年',   '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1}), true),   '一年',   '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5}), true),   '5年',   '5 years = 5 years');
+    });
+
+    test('suffix', function (assert) {
+        assert.equal(moment(30000).from(0), '幾秒內',  'prefix');
+        assert.equal(moment(0).from(30000), '幾秒前', 'suffix');
+    });
+
+    test('now from now', function (assert) {
+        assert.equal(moment().fromNow(), '幾秒前',  'now from now should display as in the past');
+    });
+
+    test('fromNow', function (assert) {
+        assert.equal(moment().add({s: 30}).fromNow(), '幾秒內', 'in a few seconds');
+        assert.equal(moment().add({d: 5}).fromNow(), '5天內', 'in 5 days');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                   '今天早上2點00分',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      '今天早上2點25分',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       '今天早上3點00分',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       '明天早上2點00分',     'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  '今天早上1點00分',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  '昨天早上2點00分',     'yesterday at the same time');
+    });
+
+    test('calendar next week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().add({d: i});
+            assert.equal(m.calendar(),       m.format('[下]ddddLT'),  'Today + ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[下]ddddLT'),  'Today + ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[下]ddddLT'),  'Today + ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar last week', function (assert) {
+        var i, m;
+        for (i = 2; i < 7; i++) {
+            m = moment().subtract({d: i});
+            assert.equal(m.calendar(),       m.format('[上]ddddLT'),  'Today - ' + i + ' days current time');
+            m.hours(0).minutes(0).seconds(0).milliseconds(0);
+            assert.equal(m.calendar(),       m.format('[上]ddddLT'),  'Today - ' + i + ' days beginning of day');
+            m.hours(23).minutes(59).seconds(59).milliseconds(999);
+            assert.equal(m.calendar(),       m.format('[上]ddddLT'),  'Today - ' + i + ' days end of day');
+        }
+    });
+
+    test('calendar all else', function (assert) {
+        var weeksAgo = moment().subtract({w: 1}),
+            weeksFromNow = moment().add({w: 1});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '1 week ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 1 week');
+
+        weeksAgo = moment().subtract({w: 2});
+        weeksFromNow = moment().add({w: 2});
+
+        assert.equal(weeksAgo.calendar(),       weeksAgo.format('L'),      '2 weeks ago');
+        assert.equal(weeksFromNow.calendar(),   weeksFromNow.format('L'),  'in 2 weeks');
+    });
+
+    test('meridiem', function (assert) {
+        assert.equal(moment([2011, 2, 23,  0, 0]).format('a'), '早上', 'morning');
+        assert.equal(moment([2011, 2, 23,  9, 0]).format('a'), '上午', 'before noon');
+        assert.equal(moment([2011, 2, 23, 12, 0]).format('a'), '中午', 'noon');
+        assert.equal(moment([2011, 2, 23, 13, 0]).format('a'), '下午', 'after noon');
+        assert.equal(moment([2011, 2, 23, 18, 0]).format('a'), '晚上', 'night');
+
+        assert.equal(moment([2011, 2, 23,  0, 0]).format('A'), '早上', 'morning');
+        assert.equal(moment([2011, 2, 23,  9, 0]).format('A'), '上午', 'before noon');
+        assert.equal(moment([2011, 2, 23, 12, 0]).format('A'), '中午', 'noon');
+        assert.equal(moment([2011, 2, 23, 13, 0]).format('A'), '下午', 'afternoon');
+        assert.equal(moment([2011, 2, 23, 18, 0]).format('A'), '晚上', 'night');
+    });
+
+    test('weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).week(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).week(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).week(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).week(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('weeks year starting monday', function (assert) {
+        assert.equal(moment([2006, 11, 31]).week(), 1, 'Dec 31 2006 should be week 1');
+        assert.equal(moment([2007,  0,  1]).week(), 1, 'Jan  1 2007 should be week 1');
+        assert.equal(moment([2007,  0,  6]).week(), 1, 'Jan  6 2007 should be week 1');
+        assert.equal(moment([2007,  0,  7]).week(), 2, 'Jan  7 2007 should be week 2');
+        assert.equal(moment([2007,  0, 13]).week(), 2, 'Jan 13 2007 should be week 2');
+        assert.equal(moment([2007,  0, 14]).week(), 3, 'Jan 14 2007 should be week 3');
+    });
+
+    test('weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 29]).week(), 52, 'Dec 29 2007 should be week 52');
+        assert.equal(moment([2008,  0,  1]).week(), 1, 'Jan  1 2008 should be week 1');
+        assert.equal(moment([2008,  0,  5]).week(), 1, 'Jan  5 2008 should be week 1');
+        assert.equal(moment([2008,  0,  6]).week(), 2, 'Jan  6 2008 should be week 2');
+        assert.equal(moment([2008,  0, 12]).week(), 2, 'Jan 12 2008 should be week 2');
+        assert.equal(moment([2008,  0, 13]).week(), 3, 'Jan 13 2008 should be week 3');
+    });
+
+    test('weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 29]).week(), 1, 'Dec 29 2002 should be week 1');
+        assert.equal(moment([2003,  0,  1]).week(), 1, 'Jan  1 2003 should be week 1');
+        assert.equal(moment([2003,  0,  4]).week(), 1, 'Jan  4 2003 should be week 1');
+        assert.equal(moment([2003,  0,  5]).week(), 2, 'Jan  5 2003 should be week 2');
+        assert.equal(moment([2003,  0, 11]).week(), 2, 'Jan 11 2003 should be week 2');
+        assert.equal(moment([2003,  0, 12]).week(), 3, 'Jan 12 2003 should be week 3');
+    });
+
+    test('weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 28]).week(), 1, 'Dec 28 2008 should be week 1');
+        assert.equal(moment([2009,  0,  1]).week(), 1, 'Jan  1 2009 should be week 1');
+        assert.equal(moment([2009,  0,  3]).week(), 1, 'Jan  3 2009 should be week 1');
+        assert.equal(moment([2009,  0,  4]).week(), 2, 'Jan  4 2009 should be week 2');
+        assert.equal(moment([2009,  0, 10]).week(), 2, 'Jan 10 2009 should be week 2');
+        assert.equal(moment([2009,  0, 11]).week(), 3, 'Jan 11 2009 should be week 3');
+    });
+
+    test('weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 27]).week(), 1, 'Dec 27 2009 should be week 1');
+        assert.equal(moment([2010,  0,  1]).week(), 1, 'Jan  1 2010 should be week 1');
+        assert.equal(moment([2010,  0,  2]).week(), 1, 'Jan  2 2010 should be week 1');
+        assert.equal(moment([2010,  0,  3]).week(), 2, 'Jan  3 2010 should be week 2');
+        assert.equal(moment([2010,  0,  9]).week(), 2, 'Jan  9 2010 should be week 2');
+        assert.equal(moment([2010,  0, 10]).week(), 3, 'Jan 10 2010 should be week 3');
+    });
+
+    test('weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 26]).week(), 1, 'Dec 26 2010 should be week 1');
+        assert.equal(moment([2011,  0,  1]).week(), 1, 'Jan  1 2011 should be week 1');
+        assert.equal(moment([2011,  0,  2]).week(), 2, 'Jan  2 2011 should be week 2');
+        assert.equal(moment([2011,  0,  8]).week(), 2, 'Jan  8 2011 should be week 2');
+        assert.equal(moment([2011,  0,  9]).week(), 3, 'Jan  9 2011 should be week 3');
+    });
+
+    test('weeks year starting sunday format', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('w ww wo'), '1 01 1週', 'Jan  1 2012 應該是第 1週');
+        assert.equal(moment([2012, 0,  7]).format('w ww wo'), '1 01 1週', 'Jan  7 2012 應該是第 1週');
+        assert.equal(moment([2012, 0,  8]).format('w ww wo'), '2 02 2週', 'Jan  8 2012 應該是第 2週');
+        assert.equal(moment([2012, 0, 14]).format('w ww wo'), '2 02 2週', 'Jan 14 2012 應該是第 2週');
+        assert.equal(moment([2012, 0, 15]).format('w ww wo'), '3 03 3週', 'Jan 15 2012 應該是第 3週');
+    });
+
+    test('lenient ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing ' + i + ' date check');
+        }
+    });
+
+    test('lenient ordinal parsing of number', function (assert) {
+        var i, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            testMoment = moment('2014 01 ' + i, 'YYYY MM Do');
+            assert.equal(testMoment.year(), 2014,
+                    'lenient ordinal parsing of number ' + i + ' year check');
+            assert.equal(testMoment.month(), 0,
+                    'lenient ordinal parsing of number ' + i + ' month check');
+            assert.equal(testMoment.date(), i,
+                    'lenient ordinal parsing of number ' + i + ' date check');
+        }
+    });
+
+    test('meridiem invariant', function (assert) {
+        var h, m, t1, t2;
+        for (h = 0; h < 24; ++h) {
+            for (m = 0; m < 60; m += 15) {
+                t1 = moment.utc([2000, 0, 1, h, m]);
+                t2 = moment(t1.format('A h:mm'), 'A h:mm');
+                assert.equal(t2.format('HH:mm'), t1.format('HH:mm'),
+                        'meridiem at ' + t1.format('HH:mm'));
+            }
+        }
+    });
+
+    test('strict ordinal parsing', function (assert) {
+        var i, ordinalStr, testMoment;
+        for (i = 1; i <= 31; ++i) {
+            ordinalStr = moment([2014, 0, i]).format('YYYY MM Do');
+            testMoment = moment(ordinalStr, 'YYYY MM Do', true);
+            assert.ok(testMoment.isValid(), 'strict ordinal parsing ' + i);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('add and subtract');
+
+    test('add short reverse args', function (assert) {
+        var a = moment(), b, c, d;
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add({ms: 50}).milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add({s: 1}).seconds(), 9, 'Add seconds');
+        assert.equal(a.add({m: 1}).minutes(), 8, 'Add minutes');
+        assert.equal(a.add({h: 1}).hours(), 7, 'Add hours');
+        assert.equal(a.add({d: 1}).date(), 13, 'Add date');
+        assert.equal(a.add({w: 1}).date(), 20, 'Add week');
+        assert.equal(a.add({M: 1}).month(), 10, 'Add month');
+        assert.equal(a.add({y: 1}).year(), 2012, 'Add year');
+        assert.equal(a.add({Q: 1}).month(), 1, 'Add quarter');
+
+        b = moment([2010, 0, 31]).add({M: 1});
+        c = moment([2010, 1, 28]).subtract({M: 1});
+        d = moment([2010, 1, 28]).subtract({Q: 1});
+
+        assert.equal(b.month(), 1, 'add month, jan 31st to feb 28th');
+        assert.equal(b.date(), 28, 'add month, jan 31st to feb 28th');
+        assert.equal(c.month(), 0, 'subtract month, feb 28th to jan 28th');
+        assert.equal(c.date(), 28, 'subtract month, feb 28th to jan 28th');
+        assert.equal(d.month(), 10, 'subtract quarter, feb 28th 2010 to nov 28th 2009');
+        assert.equal(d.date(), 28, 'subtract quarter, feb 28th 2010 to nov 28th 2009');
+        assert.equal(d.year(), 2009, 'subtract quarter, feb 28th 2010 to nov 28th 2009');
+    });
+
+    test('add long reverse args', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add({milliseconds: 50}).milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add({seconds: 1}).seconds(), 9, 'Add seconds');
+        assert.equal(a.add({minutes: 1}).minutes(), 8, 'Add minutes');
+        assert.equal(a.add({hours: 1}).hours(), 7, 'Add hours');
+        assert.equal(a.add({days: 1}).date(), 13, 'Add date');
+        assert.equal(a.add({weeks: 1}).date(), 20, 'Add week');
+        assert.equal(a.add({months: 1}).month(), 10, 'Add month');
+        assert.equal(a.add({years: 1}).year(), 2012, 'Add year');
+        assert.equal(a.add({quarters: 1}).month(), 1, 'Add quarter');
+    });
+
+    test('add long singular reverse args', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add({millisecond: 50}).milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add({second: 1}).seconds(), 9, 'Add seconds');
+        assert.equal(a.add({minute: 1}).minutes(), 8, 'Add minutes');
+        assert.equal(a.add({hour: 1}).hours(), 7, 'Add hours');
+        assert.equal(a.add({day: 1}).date(), 13, 'Add date');
+        assert.equal(a.add({week: 1}).date(), 20, 'Add week');
+        assert.equal(a.add({month: 1}).month(), 10, 'Add month');
+        assert.equal(a.add({year: 1}).year(), 2012, 'Add year');
+        assert.equal(a.add({quarter: 1}).month(), 1, 'Add quarter');
+    });
+
+    test('add string long reverse args', function (assert) {
+        var a = moment(), b;
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        b = a.clone();
+
+        assert.equal(a.add('millisecond', 50).milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add('second', 1).seconds(), 9, 'Add seconds');
+        assert.equal(a.add('minute', 1).minutes(), 8, 'Add minutes');
+        assert.equal(a.add('hour', 1).hours(), 7, 'Add hours');
+        assert.equal(a.add('day', 1).date(), 13, 'Add date');
+        assert.equal(a.add('week', 1).date(), 20, 'Add week');
+        assert.equal(a.add('month', 1).month(), 10, 'Add month');
+        assert.equal(a.add('year', 1).year(), 2012, 'Add year');
+        assert.equal(b.add('day', '01').date(), 13, 'Add date');
+        assert.equal(a.add('quarter', 1).month(), 1, 'Add quarter');
+    });
+
+    test('add string long singular reverse args', function (assert) {
+        var a = moment(), b;
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        b = a.clone();
+
+        assert.equal(a.add('milliseconds', 50).milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add('seconds', 1).seconds(), 9, 'Add seconds');
+        assert.equal(a.add('minutes', 1).minutes(), 8, 'Add minutes');
+        assert.equal(a.add('hours', 1).hours(), 7, 'Add hours');
+        assert.equal(a.add('days', 1).date(), 13, 'Add date');
+        assert.equal(a.add('weeks', 1).date(), 20, 'Add week');
+        assert.equal(a.add('months', 1).month(), 10, 'Add month');
+        assert.equal(a.add('years', 1).year(), 2012, 'Add year');
+        assert.equal(b.add('days', '01').date(), 13, 'Add date');
+        assert.equal(a.add('quarters', 1).month(), 1, 'Add quarter');
+    });
+
+    test('add string short reverse args', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add('ms', 50).milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add('s', 1).seconds(), 9, 'Add seconds');
+        assert.equal(a.add('m', 1).minutes(), 8, 'Add minutes');
+        assert.equal(a.add('h', 1).hours(), 7, 'Add hours');
+        assert.equal(a.add('d', 1).date(), 13, 'Add date');
+        assert.equal(a.add('w', 1).date(), 20, 'Add week');
+        assert.equal(a.add('M', 1).month(), 10, 'Add month');
+        assert.equal(a.add('y', 1).year(), 2012, 'Add year');
+        assert.equal(a.add('Q', 1).month(), 1, 'Add quarter');
+    });
+
+    test('add string long', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add(50, 'millisecond').milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add(1, 'second').seconds(), 9, 'Add seconds');
+        assert.equal(a.add(1, 'minute').minutes(), 8, 'Add minutes');
+        assert.equal(a.add(1, 'hour').hours(), 7, 'Add hours');
+        assert.equal(a.add(1, 'day').date(), 13, 'Add date');
+        assert.equal(a.add(1, 'week').date(), 20, 'Add week');
+        assert.equal(a.add(1, 'month').month(), 10, 'Add month');
+        assert.equal(a.add(1, 'year').year(), 2012, 'Add year');
+        assert.equal(a.add(1, 'quarter').month(), 1, 'Add quarter');
+    });
+
+    test('add string long singular', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add(50, 'milliseconds').milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add(1, 'seconds').seconds(), 9, 'Add seconds');
+        assert.equal(a.add(1, 'minutes').minutes(), 8, 'Add minutes');
+        assert.equal(a.add(1, 'hours').hours(), 7, 'Add hours');
+        assert.equal(a.add(1, 'days').date(), 13, 'Add date');
+        assert.equal(a.add(1, 'weeks').date(), 20, 'Add week');
+        assert.equal(a.add(1, 'months').month(), 10, 'Add month');
+        assert.equal(a.add(1, 'years').year(), 2012, 'Add year');
+        assert.equal(a.add(1, 'quarters').month(), 1, 'Add quarter');
+    });
+
+    test('add string short', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add(50, 'ms').milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add(1, 's').seconds(), 9, 'Add seconds');
+        assert.equal(a.add(1, 'm').minutes(), 8, 'Add minutes');
+        assert.equal(a.add(1, 'h').hours(), 7, 'Add hours');
+        assert.equal(a.add(1, 'd').date(), 13, 'Add date');
+        assert.equal(a.add(1, 'w').date(), 20, 'Add week');
+        assert.equal(a.add(1, 'M').month(), 10, 'Add month');
+        assert.equal(a.add(1, 'y').year(), 2012, 'Add year');
+        assert.equal(a.add(1, 'Q').month(), 1, 'Add quarter');
+    });
+
+    test('add strings string short args', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add('ms', '50').milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add('s', '1').seconds(), 9, 'Add seconds');
+        assert.equal(a.add('m', '1').minutes(), 8, 'Add minutes');
+        assert.equal(a.add('h', '1').hours(), 7, 'Add hours');
+        assert.equal(a.add('d', '1').date(), 13, 'Add date');
+        assert.equal(a.add('w', '1').date(), 20, 'Add week');
+        assert.equal(a.add('M', '1').month(), 10, 'Add month');
+        assert.equal(a.add('y', '1').year(), 2012, 'Add year');
+        assert.equal(a.add('Q', '1').month(), 1, 'Add quarter');
+    });
+
+    test('subtract strings string short args', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.subtract('ms', '50').milliseconds(), 450, 'Subtract milliseconds');
+        assert.equal(a.subtract('s', '1').seconds(), 7, 'Subtract seconds');
+        assert.equal(a.subtract('m', '1').minutes(), 6, 'Subtract minutes');
+        assert.equal(a.subtract('h', '1').hours(), 5, 'Subtract hours');
+        assert.equal(a.subtract('d', '1').date(), 11, 'Subtract date');
+        assert.equal(a.subtract('w', '1').date(), 4, 'Subtract week');
+        assert.equal(a.subtract('M', '1').month(), 8, 'Subtract month');
+        assert.equal(a.subtract('y', '1').year(), 2010, 'Subtract year');
+        assert.equal(a.subtract('Q', '1').month(), 5, 'Subtract quarter');
+    });
+
+    test('add strings string short', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.add('50', 'ms').milliseconds(), 550, 'Add milliseconds');
+        assert.equal(a.add('1', 's').seconds(), 9, 'Add seconds');
+        assert.equal(a.add('1', 'm').minutes(), 8, 'Add minutes');
+        assert.equal(a.add('1', 'h').hours(), 7, 'Add hours');
+        assert.equal(a.add('1', 'd').date(), 13, 'Add date');
+        assert.equal(a.add('1', 'w').date(), 20, 'Add week');
+        assert.equal(a.add('1', 'M').month(), 10, 'Add month');
+        assert.equal(a.add('1', 'y').year(), 2012, 'Add year');
+        assert.equal(a.add('1', 'Q').month(), 1, 'Add quarter');
+    });
+
+    test('subtract strings string short', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(500);
+
+        assert.equal(a.subtract('50', 'ms').milliseconds(), 450, 'Subtract milliseconds');
+        assert.equal(a.subtract('1', 's').seconds(), 7, 'Subtract seconds');
+        assert.equal(a.subtract('1', 'm').minutes(), 6, 'Subtract minutes');
+        assert.equal(a.subtract('1', 'h').hours(), 5, 'Subtract hours');
+        assert.equal(a.subtract('1', 'd').date(), 11, 'Subtract date');
+        assert.equal(a.subtract('1', 'w').date(), 4, 'Subtract week');
+        assert.equal(a.subtract('1', 'M').month(), 8, 'Subtract month');
+        assert.equal(a.subtract('1', 'y').year(), 2010, 'Subtract year');
+        assert.equal(a.subtract('1', 'Q').month(), 5, 'Subtract quarter');
+    });
+
+    test('add across DST', function (assert) {
+        // Detect Safari bug and bail. Hours on 13th March 2011 are shifted
+        // with 1 ahead.
+        if (new Date(2011, 2, 13, 5, 0, 0).getHours() !== 5) {
+            return;
+        }
+
+        var a = moment(new Date(2011, 2, 12, 5, 0, 0)),
+            b = moment(new Date(2011, 2, 12, 5, 0, 0)),
+            c = moment(new Date(2011, 2, 12, 5, 0, 0)),
+            d = moment(new Date(2011, 2, 12, 5, 0, 0)),
+            e = moment(new Date(2011, 2, 12, 5, 0, 0));
+        a.add(1, 'days');
+        b.add(24, 'hours');
+        c.add(1, 'months');
+        e.add(1, 'quarter');
+
+        assert.equal(a.hours(), 5, 'adding days over DST difference should result in the same hour');
+        if (b.isDST() && !d.isDST()) {
+            assert.equal(b.hours(), 6, 'adding hours over DST difference should result in a different hour');
+        } else if (!b.isDST() && d.isDST()) {
+            assert.equal(b.hours(), 4, 'adding hours over DST difference should result in a different hour');
+        } else {
+            assert.equal(b.hours(), 5, 'adding hours over DST difference should result in a same hour if the timezone does not have daylight savings time');
+        }
+        assert.equal(c.hours(), 5, 'adding months over DST difference should result in the same hour');
+        assert.equal(e.hours(), 5, 'adding quarters over DST difference should result in the same hour');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('create');
+
+    test('array', function (assert) {
+        assert.ok(moment([2010]).toDate() instanceof Date, '[2010]');
+        assert.ok(moment([2010, 1]).toDate() instanceof Date, '[2010, 1]');
+        assert.ok(moment([2010, 1, 12]).toDate() instanceof Date, '[2010, 1, 12]');
+        assert.ok(moment([2010, 1, 12, 1]).toDate() instanceof Date, '[2010, 1, 12, 1]');
+        assert.ok(moment([2010, 1, 12, 1, 1]).toDate() instanceof Date, '[2010, 1, 12, 1, 1]');
+        assert.ok(moment([2010, 1, 12, 1, 1, 1]).toDate() instanceof Date, '[2010, 1, 12, 1, 1, 1]');
+        assert.ok(moment([2010, 1, 12, 1, 1, 1, 1]).toDate() instanceof Date, '[2010, 1, 12, 1, 1, 1, 1]');
+        assert.equal(+moment(new Date(2010, 1, 14, 15, 25, 50, 125)), +moment([2010, 1, 14, 15, 25, 50, 125]), 'constructing with array === constructing with new Date()');
+    });
+
+    test('array copying', function (assert) {
+        var importantArray = [2009, 11];
+        moment(importantArray);
+        assert.deepEqual(importantArray, [2009, 11], 'initializer should not mutate the original array');
+    });
+
+    test('object', function (assert) {
+        var fmt = 'YYYY-MM-DD HH:mm:ss.SSS',
+            tests = [
+                [{year: 2010}, '2010-01-01 00:00:00.000'],
+                [{year: 2010, month: 1}, '2010-02-01 00:00:00.000'],
+                [{year: 2010, month: 1, day: 12}, '2010-02-12 00:00:00.000'],
+                [{year: 2010, month: 1, date: 12}, '2010-02-12 00:00:00.000'],
+                [{year: 2010, month: 1, day: 12, hours: 1}, '2010-02-12 01:00:00.000'],
+                [{year: 2010, month: 1, date: 12, hours: 1}, '2010-02-12 01:00:00.000'],
+                [{year: 2010, month: 1, day: 12, hours: 1, minutes: 1}, '2010-02-12 01:01:00.000'],
+                [{year: 2010, month: 1, date: 12, hours: 1, minutes: 1}, '2010-02-12 01:01:00.000'],
+                [{year: 2010, month: 1, day: 12, hours: 1, minutes: 1, seconds: 1}, '2010-02-12 01:01:01.000'],
+                [{year: 2010, month: 1, day: 12, hours: 1, minutes: 1, seconds: 1, milliseconds: 1}, '2010-02-12 01:01:01.001'],
+                [{years: 2010, months: 1, days: 14, hours: 15, minutes: 25, seconds: 50, milliseconds: 125}, '2010-02-14 15:25:50.125'],
+                [{year: 2010, month: 1, day: 14, hour: 15, minute: 25, second: 50, millisecond: 125}, '2010-02-14 15:25:50.125'],
+                [{y: 2010, M: 1, d: 14, h: 15, m: 25, s: 50, ms: 125}, '2010-02-14 15:25:50.125']
+            ], i;
+        for (i = 0; i < tests.length; ++i) {
+            assert.equal(moment(tests[i][0]).format(fmt), tests[i][1]);
+        }
+    });
+
+    test('multi format array copying', function (assert) {
+        var importantArray = ['MM/DD/YYYY', 'YYYY-MM-DD', 'MM-DD-YYYY'];
+        moment('1999-02-13', importantArray);
+        assert.deepEqual(importantArray, ['MM/DD/YYYY', 'YYYY-MM-DD', 'MM-DD-YYYY'], 'initializer should not mutate the original array');
+    });
+
+    test('number', function (assert) {
+        assert.ok(moment(1000).toDate() instanceof Date, '1000');
+        assert.equal(moment(1000).valueOf(), 1000, 'asserting valueOf');
+        assert.equal(moment.utc(1000).valueOf(), 1000, 'asserting valueOf');
+    });
+
+    test('unix', function (assert) {
+        assert.equal(moment.unix(1).valueOf(), 1000, '1 unix timestamp == 1000 Date.valueOf');
+        assert.equal(moment(1000).unix(), 1, '1000 Date.valueOf == 1 unix timestamp');
+        assert.equal(moment.unix(1000).valueOf(), 1000000, '1000 unix timestamp == 1000000 Date.valueOf');
+        assert.equal(moment(1500).unix(), 1, '1500 Date.valueOf == 1 unix timestamp');
+        assert.equal(moment(1900).unix(), 1, '1900 Date.valueOf == 1 unix timestamp');
+        assert.equal(moment(2100).unix(), 2, '2100 Date.valueOf == 2 unix timestamp');
+        assert.equal(moment(1333129333524).unix(), 1333129333, '1333129333524 Date.valueOf == 1333129333 unix timestamp');
+        assert.equal(moment(1333129333524000).unix(), 1333129333524, '1333129333524000 Date.valueOf == 1333129333524 unix timestamp');
+    });
+
+    test('date', function (assert) {
+        assert.ok(moment(new Date()).toDate() instanceof Date, 'new Date()');
+    });
+
+    test('date mutation', function (assert) {
+        var a = new Date();
+        assert.ok(moment(a).toDate() !== a, 'the date moment uses should not be the date passed in');
+    });
+
+    test('moment', function (assert) {
+        assert.ok(moment(moment()).toDate() instanceof Date, 'moment(moment())');
+        assert.ok(moment(moment(moment())).toDate() instanceof Date, 'moment(moment(moment()))');
+    });
+
+    test('cloning moment should only copy own properties', function (assert) {
+        assert.ok(!moment().clone().hasOwnProperty('month'), 'Should not clone prototype methods');
+    });
+
+    test('cloning moment works with weird clones', function (assert) {
+        var extend = function (a, b) {
+            var i;
+            for (i in b) {
+                a[i] = b[i];
+            }
+            return a;
+        },
+        now = moment(),
+        nowu = moment.utc();
+
+        assert.equal(+extend({}, now).clone(), +now, 'cloning extend-ed now is now');
+        assert.equal(+extend({}, nowu).clone(), +nowu, 'cloning extend-ed utc now is utc now');
+    });
+
+    test('cloning respects moment.momentProperties', function (assert) {
+        var m = moment();
+
+        assert.equal(m.clone()._special, undefined, 'cloning ignores extra properties');
+        m._special = 'bacon';
+        moment.momentProperties.push('_special');
+        assert.equal(m.clone()._special, 'bacon', 'cloning respects momentProperties');
+        moment.momentProperties.pop();
+    });
+
+    test('undefined', function (assert) {
+        assert.ok(moment().toDate() instanceof Date, 'undefined');
+    });
+
+    test('iso format 24hrs', function (assert) {
+        assert.equal(moment('2014-01-01T24:00:00.000').format('YYYY-MM-DD[T]HH:mm:ss.SSS'),
+                '2014-01-02T00:00:00.000', 'iso format with 24:00 localtime');
+        assert.equal(moment.utc('2014-01-01T24:00:00.000').format('YYYY-MM-DD[T]HH:mm:ss.SSS'),
+                '2014-01-02T00:00:00.000', 'iso format with 24:00 utc');
+    });
+
+    test('string without format - json', function (assert) {
+        assert.equal(moment('Date(1325132654000)').valueOf(), 1325132654000, 'Date(1325132654000)');
+        assert.equal(moment('Date(-1325132654000)').valueOf(), -1325132654000, 'Date(-1325132654000)');
+        assert.equal(moment('/Date(1325132654000)/').valueOf(), 1325132654000, '/Date(1325132654000)/');
+        assert.equal(moment('/Date(1325132654000+0700)/').valueOf(), 1325132654000, '/Date(1325132654000+0700)/');
+        assert.equal(moment('/Date(1325132654000-0700)/').valueOf(), 1325132654000, '/Date(1325132654000-0700)/');
+    });
+
+    test('string with format dropped am/pm bug', function (assert) {
+        moment.locale('en');
+
+        assert.equal(moment('05/1/2012 12:25:00', 'MM/DD/YYYY h:m:s a').format('MM/DD/YYYY'), '05/01/2012', 'should not break if am/pm is left off from the parsing tokens');
+        assert.equal(moment('05/1/2012 12:25:00 am', 'MM/DD/YYYY h:m:s a').format('MM/DD/YYYY'), '05/01/2012', 'should not break if am/pm is left off from the parsing tokens');
+        assert.equal(moment('05/1/2012 12:25:00 pm', 'MM/DD/YYYY h:m:s a').format('MM/DD/YYYY'), '05/01/2012', 'should not break if am/pm is left off from the parsing tokens');
+
+        assert.ok(moment('05/1/2012 12:25:00', 'MM/DD/YYYY h:m:s a').isValid());
+        assert.ok(moment('05/1/2012 12:25:00 am', 'MM/DD/YYYY h:m:s a').isValid());
+        assert.ok(moment('05/1/2012 12:25:00 pm', 'MM/DD/YYYY h:m:s a').isValid());
+    });
+
+    test('empty string with formats', function (assert) {
+        assert.equal(moment('', 'MM').format('YYYY-MM-DD HH:mm:ss'), 'Invalid date');
+        assert.equal(moment(' ', 'MM').format('YYYY-MM-DD HH:mm:ss'), 'Invalid date');
+        assert.equal(moment(' ', 'DD').format('YYYY-MM-DD HH:mm:ss'), 'Invalid date');
+        assert.equal(moment(' ', ['MM', 'DD']).format('YYYY-MM-DD HH:mm:ss'), 'Invalid date');
+
+        assert.ok(!moment('', 'MM').isValid());
+        assert.ok(!moment(' ', 'MM').isValid());
+        assert.ok(!moment(' ', 'DD').isValid());
+        assert.ok(!moment(' ', ['MM', 'DD']).isValid());
+    });
+
+    test('defaulting to current date', function (assert) {
+        var now = moment();
+        assert.equal(moment('12:13:14', 'hh:mm:ss').format('YYYY-MM-DD hh:mm:ss'),
+                     now.clone().hour(12).minute(13).second(14).format('YYYY-MM-DD hh:mm:ss'),
+                     'given only time default to current date');
+        assert.equal(moment('05', 'DD').format('YYYY-MM-DD'),
+                     now.clone().date(5).format('YYYY-MM-DD'),
+                     'given day of month default to current month, year');
+        assert.equal(moment('05', 'MM').format('YYYY-MM-DD'),
+                     now.clone().month(4).date(1).format('YYYY-MM-DD'),
+                     'given month default to current year');
+        assert.equal(moment('1996', 'YYYY').format('YYYY-MM-DD'),
+                     now.clone().year(1996).month(0).date(1).format('YYYY-MM-DD'),
+                     'given year do not default');
+    });
+
+    test('matching am/pm', function (assert) {
+        assert.equal(moment('2012-09-03T03:00PM',   'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00PM', 'am/pm should parse correctly for PM');
+        assert.equal(moment('2012-09-03T03:00P.M.', 'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00PM', 'am/pm should parse correctly for P.M.');
+        assert.equal(moment('2012-09-03T03:00P',    'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00PM', 'am/pm should parse correctly for P');
+        assert.equal(moment('2012-09-03T03:00pm',   'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00PM', 'am/pm should parse correctly for pm');
+        assert.equal(moment('2012-09-03T03:00p.m.', 'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00PM', 'am/pm should parse correctly for p.m.');
+        assert.equal(moment('2012-09-03T03:00p',    'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00PM', 'am/pm should parse correctly for p');
+
+        assert.equal(moment('2012-09-03T03:00AM',   'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00AM', 'am/pm should parse correctly for AM');
+        assert.equal(moment('2012-09-03T03:00A.M.', 'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00AM', 'am/pm should parse correctly for A.M.');
+        assert.equal(moment('2012-09-03T03:00A',    'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00AM', 'am/pm should parse correctly for A');
+        assert.equal(moment('2012-09-03T03:00am',   'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00AM', 'am/pm should parse correctly for am');
+        assert.equal(moment('2012-09-03T03:00a.m.', 'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00AM', 'am/pm should parse correctly for a.m.');
+        assert.equal(moment('2012-09-03T03:00a',    'YYYY-MM-DDThh:mmA').format('YYYY-MM-DDThh:mmA'), '2012-09-03T03:00AM', 'am/pm should parse correctly for a');
+
+        assert.equal(moment('5:00p.m.March 4 2012', 'h:mmAMMMM D YYYY').format('YYYY-MM-DDThh:mmA'), '2012-03-04T05:00PM', 'am/pm should parse correctly before month names');
+    });
+
+    test('string with format', function (assert) {
+        moment.locale('en');
+        var a = [
+            ['YYYY-Q',              '2014-4'],
+            ['MM-DD-YYYY',          '12-02-1999'],
+            ['DD-MM-YYYY',          '12-02-1999'],
+            ['DD/MM/YYYY',          '12/02/1999'],
+            ['DD_MM_YYYY',          '12_02_1999'],
+            ['DD:MM:YYYY',          '12:02:1999'],
+            ['D-M-YY',              '2-2-99'],
+            ['YY',                  '99'],
+            ['DDD-YYYY',            '300-1999'],
+            ['DD-MM-YYYY h:m:s',    '12-02-1999 2:45:10'],
+            ['DD-MM-YYYY h:m:s a',  '12-02-1999 2:45:10 am'],
+            ['DD-MM-YYYY h:m:s a',  '12-02-1999 2:45:10 pm'],
+            ['h:mm a',              '12:00 pm'],
+            ['h:mm a',              '12:30 pm'],
+            ['h:mm a',              '12:00 am'],
+            ['h:mm a',              '12:30 am'],
+            ['HH:mm',               '12:00'],
+            ['YYYY-MM-DDTHH:mm:ss', '2011-11-11T11:11:11'],
+            ['MM-DD-YYYY [M]',      '12-02-1999 M'],
+            ['ddd MMM DD HH:mm:ss YYYY', 'Tue Apr 07 22:52:51 2009'],
+            ['HH:mm:ss',            '12:00:00'],
+            ['HH:mm:ss',            '12:30:00'],
+            ['HH:mm:ss',            '00:00:00'],
+            ['HH:mm:ss S',          '00:30:00 1'],
+            ['HH:mm:ss SS',         '00:30:00 12'],
+            ['HH:mm:ss SSS',        '00:30:00 123'],
+            ['HH:mm:ss S',          '00:30:00 7'],
+            ['HH:mm:ss SS',         '00:30:00 78'],
+            ['HH:mm:ss SSS',        '00:30:00 789'],
+            ['X',                   '1234567890'],
+            ['x',                   '1234567890123'],
+            ['LT',                  '12:30 AM'],
+            ['LTS',                 '12:30:29 AM'],
+            ['L',                   '09/02/1999'],
+            ['l',                   '9/2/1999'],
+            ['LL',                  'September 2, 1999'],
+            ['ll',                  'Sep 2, 1999'],
+            ['LLL',                 'September 2, 1999 12:30 AM'],
+            ['lll',                 'Sep 2, 1999 12:30 AM'],
+            ['LLLL',                'Thursday, September 2, 1999 12:30 AM'],
+            ['llll',                'Thu, Sep 2, 1999 12:30 AM']
+        ],
+        m,
+        i;
+
+        for (i = 0; i < a.length; i++) {
+            m = moment(a[i][1], a[i][0]);
+            assert.ok(m.isValid());
+            assert.equal(m.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('unix timestamp format', function (assert) {
+        var formats = ['X', 'X.S', 'X.SS', 'X.SSS'], i, format;
+
+        for (i = 0; i < formats.length; i++) {
+            format = formats[i];
+            assert.equal(moment('1234567890',     format).valueOf(), 1234567890 * 1000,       format + ' matches timestamp without milliseconds');
+            assert.equal(moment('1234567890.1',   format).valueOf(), 1234567890 * 1000 + 100, format + ' matches timestamp with deciseconds');
+            assert.equal(moment('1234567890.12',  format).valueOf(), 1234567890 * 1000 + 120, format + ' matches timestamp with centiseconds');
+            assert.equal(moment('1234567890.123', format).valueOf(), 1234567890 * 1000 + 123, format + ' matches timestamp with milliseconds');
+        }
+    });
+
+    test('unix offset milliseconds', function (assert) {
+        assert.equal(moment('1234567890123', 'x').valueOf(), 1234567890123, 'x matches unix offset in milliseconds');
+    });
+
+    test('milliseconds format', function (assert) {
+        assert.equal(moment('1', 'S').get('ms'), 100, 'deciseconds');
+        // assert.equal(moment('10', 'S', true).isValid(), false, 'deciseconds with two digits');
+        // assert.equal(moment('1', 'SS', true).isValid(), false, 'centiseconds with one digits');
+        assert.equal(moment('12', 'SS').get('ms'), 120, 'centiseconds');
+        // assert.equal(moment('123', 'SS', true).isValid(), false, 'centiseconds with three digits');
+        assert.equal(moment('123', 'SSS').get('ms'), 123, 'milliseconds');
+        assert.equal(moment('1234', 'SSSS').get('ms'), 123, 'milliseconds with SSSS');
+        assert.equal(moment('123456789101112', 'SSSS').get('ms'), 123, 'milliseconds with SSSS');
+    });
+
+    test('string with format no separators', function (assert) {
+        moment.locale('en');
+        var a = [
+            ['MMDDYYYY',          '12021999'],
+            ['DDMMYYYY',          '12021999'],
+            ['YYYYMMDD',          '19991202'],
+            ['DDMMMYYYY',         '10Sep2001']
+        ], i;
+
+        for (i = 0; i < a.length; i++) {
+            assert.equal(moment(a[i][1], a[i][0]).format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
+        }
+    });
+
+    test('string with format (timezone)', function (assert) {
+        assert.equal(moment('5 -0700', 'H ZZ').toDate().getUTCHours(), 12, 'parse hours \'5 -0700\' ---> \'H ZZ\'');
+        assert.equal(moment('5 -07:00', 'H Z').toDate().getUTCHours(), 12, 'parse hours \'5 -07:00\' ---> \'H Z\'');
+        assert.equal(moment('5 -0730', 'H ZZ').toDate().getUTCMinutes(), 30, 'parse hours \'5 -0730\' ---> \'H ZZ\'');
+        assert.equal(moment('5 -07:30', 'H Z').toDate().getUTCMinutes(), 30, 'parse hours \'5 -07:0\' ---> \'H Z\'');
+        assert.equal(moment('5 +0100', 'H ZZ').toDate().getUTCHours(), 4, 'parse hours \'5 +0100\' ---> \'H ZZ\'');
+        assert.equal(moment('5 +01:00', 'H Z').toDate().getUTCHours(), 4, 'parse hours \'5 +01:00\' ---> \'H Z\'');
+        assert.equal(moment('5 +0130', 'H ZZ').toDate().getUTCMinutes(), 30, 'parse hours \'5 +0130\' ---> \'H ZZ\'');
+        assert.equal(moment('5 +01:30', 'H Z').toDate().getUTCMinutes(), 30, 'parse hours \'5 +01:30\' ---> \'H Z\'');
+    });
+
+    test('string with format (timezone offset)', function (assert) {
+        var a, b, c, d, e, f;
+        a = new Date(Date.UTC(2011, 0, 1, 1));
+        b = moment('2011 1 1 0 -01:00', 'YYYY MM DD HH Z');
+        assert.equal(a.getHours(), b.hours(), 'date created with utc == parsed string with timezone offset');
+        assert.equal(+a, +b, 'date created with utc == parsed string with timezone offset');
+        c = moment('2011 2 1 10 -05:00', 'YYYY MM DD HH Z');
+        d = moment('2011 2 1 8 -07:00', 'YYYY MM DD HH Z');
+        assert.equal(c.hours(), d.hours(), '10 am central time == 8 am pacific time');
+        e = moment.utc('Fri, 20 Jul 2012 17:15:00', 'ddd, DD MMM YYYY HH:mm:ss');
+        f = moment.utc('Fri, 20 Jul 2012 10:15:00 -0700', 'ddd, DD MMM YYYY HH:mm:ss ZZ');
+        assert.equal(e.hours(), f.hours(), 'parse timezone offset in utc');
+    });
+
+    test('string with timezone around start of year', function (assert) {
+        assert.equal(moment('2000-01-01T00:00:00.000+01:00').toISOString(), '1999-12-31T23:00:00.000Z', '+1:00 around 2000');
+        assert.equal(moment('2000-01-01T00:00:00.000-01:00').toISOString(), '2000-01-01T01:00:00.000Z', '-1:00 around 2000');
+        assert.equal(moment('1970-01-01T00:00:00.000+01:00').toISOString(), '1969-12-31T23:00:00.000Z', '+1:00 around 1970');
+        assert.equal(moment('1970-01-01T00:00:00.000-01:00').toISOString(), '1970-01-01T01:00:00.000Z', '-1:00 around 1970');
+        assert.equal(moment('1200-01-01T00:00:00.000+01:00').toISOString(), '1199-12-31T23:00:00.000Z', '+1:00 around 1200');
+        assert.equal(moment('1200-01-01T00:00:00.000-01:00').toISOString(), '1200-01-01T01:00:00.000Z', '-1:00 around 1200');
+    });
+
+    test('string with array of formats', function (assert) {
+        assert.equal(moment('11-02-1999', ['MM-DD-YYYY', 'DD-MM-YYYY']).format('MM DD YYYY'), '11 02 1999', 'switching month and day');
+        assert.equal(moment('02-11-1999', ['MM/DD/YYYY', 'YYYY MM DD', 'MM-DD-YYYY']).format('MM DD YYYY'), '02 11 1999', 'year last');
+        assert.equal(moment('1999-02-11', ['MM/DD/YYYY', 'YYYY MM DD', 'MM-DD-YYYY']).format('MM DD YYYY'), '02 11 1999', 'year first');
+
+        assert.equal(moment('02-11-1999', ['MM/DD/YYYY', 'YYYY MM DD']).format('MM DD YYYY'), '02 11 1999', 'year last');
+        assert.equal(moment('1999-02-11', ['MM/DD/YYYY', 'YYYY MM DD']).format('MM DD YYYY'), '02 11 1999', 'year first');
+        assert.equal(moment('02-11-1999', ['YYYY MM DD', 'MM/DD/YYYY']).format('MM DD YYYY'), '02 11 1999', 'year last');
+        assert.equal(moment('1999-02-11', ['YYYY MM DD', 'MM/DD/YYYY']).format('MM DD YYYY'), '02 11 1999', 'year first');
+
+        assert.equal(moment('13-11-1999', ['MM/DD/YYYY', 'DD/MM/YYYY']).format('MM DD YYYY'), '11 13 1999', 'second must be month');
+        assert.equal(moment('11-13-1999', ['MM/DD/YYYY', 'DD/MM/YYYY']).format('MM DD YYYY'), '11 13 1999', 'first must be month');
+        assert.equal(moment('01-02-2000', ['MM/DD/YYYY', 'DD/MM/YYYY']).format('MM DD YYYY'), '01 02 2000', 'either can be a month, month first format');
+        assert.equal(moment('02-01-2000', ['DD/MM/YYYY', 'MM/DD/YYYY']).format('MM DD YYYY'), '01 02 2000', 'either can be a month, day first format');
+
+        assert.equal(moment('11-02-10', ['MM/DD/YY', 'YY MM DD', 'DD-MM-YY']).format('MM DD YYYY'), '02 11 2010', 'all unparsed substrings have influence on format penalty');
+        assert.equal(moment('11-02-10', ['MM-DD-YY HH:mm', 'YY MM DD']).format('MM DD YYYY'), '02 10 2011', 'prefer formats without extra tokens');
+        assert.equal(moment('11-02-10 junk', ['MM-DD-YY', 'YY.MM.DD junk']).format('MM DD YYYY'), '02 10 2011', 'prefer formats that dont result in extra characters');
+        assert.equal(moment('11-22-10', ['YY-MM-DD', 'YY-DD-MM']).format('MM DD YYYY'), '10 22 2011', 'prefer valid results');
+
+        assert.equal(moment('gibberish', ['YY-MM-DD', 'YY-DD-MM']).format('MM DD YYYY'), 'Invalid date', 'doest throw for invalid strings');
+        assert.equal(moment('gibberish', []).format('MM DD YYYY'), 'Invalid date', 'doest throw for an empty array');
+
+        //https://github.com/moment/moment/issues/1143
+        assert.equal(moment(
+            'System Administrator and Database Assistant (7/1/2011), System Administrator and Database Assistant (7/1/2011), Database Coordinator (7/1/2011), Vice President (7/1/2011), System Administrator and Database Assistant (5/31/2012), Database Coordinator (7/1/2012), System Administrator and Database Assistant (7/1/2013)',
+            ['MM/DD/YYYY', 'MM-DD-YYYY', 'YYYY-MM-DD', 'YYYY-MM-DDTHH:mm:ssZ'])
+            .format('YYYY-MM-DD'), '2011-07-01', 'Works for long strings');
+
+        assert.equal(moment('11-02-10', ['MM.DD.YY', 'DD-MM-YY']).format('MM DD YYYY'), '02 11 2010', 'escape RegExp special characters on comparing');
+
+        assert.equal(moment('13-10-98', ['DD MM YY', 'DD MM YYYY'])._f, 'DD MM YY', 'use two digit year');
+        assert.equal(moment('13-10-1998', ['DD MM YY', 'DD MM YYYY'])._f, 'DD MM YYYY', 'use four digit year');
+
+        assert.equal(moment('01', ['MM', 'DD'])._f, 'MM', 'Should use first valid format');
+    });
+
+    test('string with array of formats + ISO', function (assert) {
+        assert.equal(moment('1994', [moment.ISO_8601, 'MM', 'HH:mm', 'YYYY']).year(), 1994, 'iso: assert parse YYYY');
+        assert.equal(moment('17:15', [moment.ISO_8601, 'MM', 'HH:mm', 'YYYY']).hour(), 17, 'iso: assert parse HH:mm (1)');
+        assert.equal(moment('17:15', [moment.ISO_8601, 'MM', 'HH:mm', 'YYYY']).minutes(), 15, 'iso: assert parse HH:mm (2)');
+        assert.equal(moment('06', [moment.ISO_8601, 'MM', 'HH:mm', 'YYYY']).month(), 6 - 1, 'iso: assert parse MM');
+        assert.equal(moment('2012-06-01', [moment.ISO_8601, 'MM', 'HH:mm', 'YYYY']).parsingFlags().iso, true, 'iso: assert parse iso');
+        assert.equal(moment('2014-05-05', [moment.ISO_8601, 'YYYY-MM-DD']).parsingFlags().iso, true, 'iso: edge case array precedence iso');
+        assert.equal(moment('2014-05-05', ['YYYY-MM-DD', moment.ISO_8601]).parsingFlags().iso, false, 'iso: edge case array precedence not iso');
+    });
+
+    test('string with format - years', function (assert) {
+        assert.equal(moment('67', 'YY').format('YYYY'), '2067', '67 > 2067');
+        assert.equal(moment('68', 'YY').format('YYYY'), '2068', '68 > 2068');
+        assert.equal(moment('69', 'YY').format('YYYY'), '1969', '69 > 1969');
+        assert.equal(moment('70', 'YY').format('YYYY'), '1970', '70 > 1970');
+    });
+
+    test('implicit cloning', function (assert) {
+        var momentA = moment([2011, 10, 10]),
+        momentB = moment(momentA);
+        momentA.month(5);
+        assert.equal(momentB.month(), 10, 'Calling moment() on a moment will create a clone');
+        assert.equal(momentA.month(), 5, 'Calling moment() on a moment will create a clone');
+    });
+
+    test('explicit cloning', function (assert) {
+        var momentA = moment([2011, 10, 10]),
+        momentB = momentA.clone();
+        momentA.month(5);
+        assert.equal(momentB.month(), 10, 'Calling moment() on a moment will create a clone');
+        assert.equal(momentA.month(), 5, 'Calling moment() on a moment will create a clone');
+    });
+
+    test('cloning carrying over utc mode', function (assert) {
+        assert.equal(moment().local().clone()._isUTC, false, 'An explicit cloned local moment should have _isUTC == false');
+        assert.equal(moment().utc().clone()._isUTC, true, 'An cloned utc moment should have _isUTC == true');
+        assert.equal(moment().clone()._isUTC, false, 'An explicit cloned local moment should have _isUTC == false');
+        assert.equal(moment.utc().clone()._isUTC, true, 'An explicit cloned utc moment should have _isUTC == true');
+        assert.equal(moment(moment().local())._isUTC, false, 'An implicit cloned local moment should have _isUTC == false');
+        assert.equal(moment(moment().utc())._isUTC, true, 'An implicit cloned utc moment should have _isUTC == true');
+        assert.equal(moment(moment())._isUTC, false, 'An implicit cloned local moment should have _isUTC == false');
+        assert.equal(moment(moment.utc())._isUTC, true, 'An implicit cloned utc moment should have _isUTC == true');
+    });
+
+    test('parsing iso', function (assert) {
+        var offset = moment([2011, 9, 8]).utcOffset(),
+        pad = function (input) {
+            if (input < 10) {
+                return '0' + input;
+            }
+            return '' + input;
+        },
+        hourOffset = (offset > 0 ? Math.floor(offset / 60) : Math.ceil(offset / 60)),
+        minOffset = offset - (hourOffset * 60),
+        tz = (offset >= 0) ?
+            '+' + pad(hourOffset) + ':' + pad(minOffset) :
+            '-' + pad(-hourOffset) + ':' + pad(-minOffset),
+        tz2 = tz.replace(':', ''),
+        tz3 = tz2.slice(0, 3),
+        formats = [
+            ['2011-10-08',                    '2011-10-08T00:00:00.000' + tz],
+            ['2011-10-08T18',                 '2011-10-08T18:00:00.000' + tz],
+            ['2011-10-08T18:04',              '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08T18:04:20',           '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08T18:04' + tz,         '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08T18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08T18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08T18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08T18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08T18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08T18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
+            ['2011-10-08T18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
+            ['2011-10-08T18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
+            ['2011-10-08 18',                 '2011-10-08T18:00:00.000' + tz],
+            ['2011-10-08 18:04',              '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08 18:04:20',           '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08 18:04' + tz,         '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08 18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08 18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08 18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08 18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-10-08 18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-10-08 18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
+            ['2011-10-08 18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
+            ['2011-10-08 18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
+            ['2011-W40',                      '2011-10-03T00:00:00.000' + tz],
+            ['2011-W40-6',                    '2011-10-08T00:00:00.000' + tz],
+            ['2011-W40-6T18',                 '2011-10-08T18:00:00.000' + tz],
+            ['2011-W40-6T18:04',              '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6T18:04:20',           '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6T18:04' + tz,         '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6T18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6T18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6T18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6T18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6T18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6T18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
+            ['2011-W40-6T18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
+            ['2011-W40-6T18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
+            ['2011-W40-6 18',                 '2011-10-08T18:00:00.000' + tz],
+            ['2011-W40-6 18:04',              '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6 18:04:20',           '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6 18:04' + tz,         '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6 18:04:20' + tz,      '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6 18:04' + tz2,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6 18:04:20' + tz2,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6 18:04' + tz3,        '2011-10-08T18:04:00.000' + tz],
+            ['2011-W40-6 18:04:20' + tz3,     '2011-10-08T18:04:20.000' + tz],
+            ['2011-W40-6 18:04:20.1' + tz2,   '2011-10-08T18:04:20.100' + tz],
+            ['2011-W40-6 18:04:20.11' + tz2,  '2011-10-08T18:04:20.110' + tz],
+            ['2011-W40-6 18:04:20.111' + tz2, '2011-10-08T18:04:20.111' + tz],
+            ['2011-281',                      '2011-10-08T00:00:00.000' + tz],
+            ['2011-281T18',                   '2011-10-08T18:00:00.000' + tz],
+            ['2011-281T18:04',                '2011-10-08T18:04:00.000' + tz],
+            ['2011-281T18:04:20',             '2011-10-08T18:04:20.000' + tz],
+            ['2011-281T18:04' + tz,           '2011-10-08T18:04:00.000' + tz],
+            ['2011-281T18:04:20' + tz,        '2011-10-08T18:04:20.000' + tz],
+            ['2011-281T18:04' + tz2,          '2011-10-08T18:04:00.000' + tz],
+            ['2011-281T18:04:20' + tz2,       '2011-10-08T18:04:20.000' + tz],
+            ['2011-281T18:04' + tz3,          '2011-10-08T18:04:00.000' + tz],
+            ['2011-281T18:04:20' + tz3,       '2011-10-08T18:04:20.000' + tz],
+            ['2011-281T18:04:20.1' + tz2,     '2011-10-08T18:04:20.100' + tz],
+            ['2011-281T18:04:20.11' + tz2,    '2011-10-08T18:04:20.110' + tz],
+            ['2011-281T18:04:20.111' + tz2,   '2011-10-08T18:04:20.111' + tz],
+            ['2011-281 18',                   '2011-10-08T18:00:00.000' + tz],
+            ['2011-281 18:04',                '2011-10-08T18:04:00.000' + tz],
+            ['2011-281 18:04:20',             '2011-10-08T18:04:20.000' + tz],
+            ['2011-281 18:04' + tz,           '2011-10-08T18:04:00.000' + tz],
+            ['2011-281 18:04:20' + tz,        '2011-10-08T18:04:20.000' + tz],
+            ['2011-281 18:04' + tz2,          '2011-10-08T18:04:00.000' + tz],
+            ['2011-281 18:04:20' + tz2,       '2011-10-08T18:04:20.000' + tz],
+            ['2011-281 18:04' + tz3,          '2011-10-08T18:04:00.000' + tz],
+            ['2011-281 18:04:20' + tz3,       '2011-10-08T18:04:20.000' + tz],
+            ['2011-281 18:04:20.1' + tz2,     '2011-10-08T18:04:20.100' + tz],
+            ['2011-281 18:04:20.11' + tz2,    '2011-10-08T18:04:20.110' + tz],
+            ['2011-281 18:04:20.111' + tz2,   '2011-10-08T18:04:20.111' + tz]
+        ], i;
+        for (i = 0; i < formats.length; i++) {
+            assert.equal(moment(formats[i][0]).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), formats[i][1], 'moment should be able to parse ISO ' + formats[i][0]);
+        }
+    });
+
+    test('parsing iso week year/week/weekday', function (assert) {
+        assert.equal(moment.utc('2007-W01').format(), '2007-01-01T00:00:00+00:00', '2008 week 1 (1st Jan Mon)');
+        assert.equal(moment.utc('2008-W01').format(), '2007-12-31T00:00:00+00:00', '2008 week 1 (1st Jan Tue)');
+        assert.equal(moment.utc('2003-W01').format(), '2002-12-30T00:00:00+00:00', '2008 week 1 (1st Jan Wed)');
+        assert.equal(moment.utc('2009-W01').format(), '2008-12-29T00:00:00+00:00', '2009 week 1 (1st Jan Thu)');
+        assert.equal(moment.utc('2010-W01').format(), '2010-01-04T00:00:00+00:00', '2010 week 1 (1st Jan Fri)');
+        assert.equal(moment.utc('2011-W01').format(), '2011-01-03T00:00:00+00:00', '2011 week 1 (1st Jan Sat)');
+        assert.equal(moment.utc('2012-W01').format(), '2012-01-02T00:00:00+00:00', '2012 week 1 (1st Jan Sun)');
+    });
+
+    test('parsing week year/week/weekday (dow 1, doy 4)', function (assert) {
+        moment.locale('dow:1,doy:4', {week: {dow: 1, doy: 4}});
+
+        assert.equal(moment.utc('2007-01', 'gggg-ww').format(), '2007-01-01T00:00:00+00:00', '2007 week 1 (1st Jan Mon)');
+        assert.equal(moment.utc('2008-01', 'gggg-ww').format(), '2007-12-31T00:00:00+00:00', '2008 week 1 (1st Jan Tue)');
+        assert.equal(moment.utc('2003-01', 'gggg-ww').format(), '2002-12-30T00:00:00+00:00', '2003 week 1 (1st Jan Wed)');
+        assert.equal(moment.utc('2009-01', 'gggg-ww').format(), '2008-12-29T00:00:00+00:00', '2009 week 1 (1st Jan Thu)');
+        assert.equal(moment.utc('2010-01', 'gggg-ww').format(), '2010-01-04T00:00:00+00:00', '2010 week 1 (1st Jan Fri)');
+        assert.equal(moment.utc('2011-01', 'gggg-ww').format(), '2011-01-03T00:00:00+00:00', '2011 week 1 (1st Jan Sat)');
+        assert.equal(moment.utc('2012-01', 'gggg-ww').format(), '2012-01-02T00:00:00+00:00', '2012 week 1 (1st Jan Sun)');
+
+        moment.defineLocale('dow:1,doy:4', null);
+    });
+
+    test('parsing week year/week/weekday (dow 1, doy 7)', function (assert) {
+        moment.locale('dow:1,doy:7', {week: {dow: 1, doy: 7}});
+
+        assert.equal(moment.utc('2007-01', 'gggg-ww').format(), '2007-01-01T00:00:00+00:00', '2007 week 1 (1st Jan Mon)');
+        assert.equal(moment.utc('2008-01', 'gggg-ww').format(), '2007-12-31T00:00:00+00:00', '2008 week 1 (1st Jan Tue)');
+        assert.equal(moment.utc('2003-01', 'gggg-ww').format(), '2002-12-30T00:00:00+00:00', '2003 week 1 (1st Jan Wed)');
+        assert.equal(moment.utc('2009-01', 'gggg-ww').format(), '2008-12-29T00:00:00+00:00', '2009 week 1 (1st Jan Thu)');
+        assert.equal(moment.utc('2010-01', 'gggg-ww').format(), '2009-12-28T00:00:00+00:00', '2010 week 1 (1st Jan Fri)');
+        assert.equal(moment.utc('2011-01', 'gggg-ww').format(), '2010-12-27T00:00:00+00:00', '2011 week 1 (1st Jan Sat)');
+        assert.equal(moment.utc('2012-01', 'gggg-ww').format(), '2011-12-26T00:00:00+00:00', '2012 week 1 (1st Jan Sun)');
+        moment.defineLocale('dow:1,doy:7', null);
+    });
+
+    test('parsing week year/week/weekday (dow 0, doy 6)', function (assert) {
+        moment.locale('dow:0,doy:6', {week: {dow: 0, doy: 6}});
+
+        assert.equal(moment.utc('2007-01', 'gggg-ww').format(), '2006-12-31T00:00:00+00:00', '2007 week 1 (1st Jan Mon)');
+        assert.equal(moment.utc('2008-01', 'gggg-ww').format(), '2007-12-30T00:00:00+00:00', '2008 week 1 (1st Jan Tue)');
+        assert.equal(moment.utc('2003-01', 'gggg-ww').format(), '2002-12-29T00:00:00+00:00', '2003 week 1 (1st Jan Wed)');
+        assert.equal(moment.utc('2009-01', 'gggg-ww').format(), '2008-12-28T00:00:00+00:00', '2009 week 1 (1st Jan Thu)');
+        assert.equal(moment.utc('2010-01', 'gggg-ww').format(), '2009-12-27T00:00:00+00:00', '2010 week 1 (1st Jan Fri)');
+        assert.equal(moment.utc('2011-01', 'gggg-ww').format(), '2010-12-26T00:00:00+00:00', '2011 week 1 (1st Jan Sat)');
+        assert.equal(moment.utc('2012-01', 'gggg-ww').format(), '2012-01-01T00:00:00+00:00', '2012 week 1 (1st Jan Sun)');
+        moment.defineLocale('dow:0,doy:6', null);
+    });
+
+    test('parsing week year/week/weekday (dow 6, doy 12)', function (assert) {
+        moment.locale('dow:6,doy:12', {week: {dow: 6, doy: 12}});
+
+        assert.equal(moment.utc('2007-01', 'gggg-ww').format(), '2006-12-30T00:00:00+00:00', '2007 week 1 (1st Jan Mon)');
+        assert.equal(moment.utc('2008-01', 'gggg-ww').format(), '2007-12-29T00:00:00+00:00', '2008 week 1 (1st Jan Tue)');
+        assert.equal(moment.utc('2003-01', 'gggg-ww').format(), '2002-12-28T00:00:00+00:00', '2003 week 1 (1st Jan Wed)');
+        assert.equal(moment.utc('2009-01', 'gggg-ww').format(), '2008-12-27T00:00:00+00:00', '2009 week 1 (1st Jan Thu)');
+        assert.equal(moment.utc('2010-01', 'gggg-ww').format(), '2009-12-26T00:00:00+00:00', '2010 week 1 (1st Jan Fri)');
+        assert.equal(moment.utc('2011-01', 'gggg-ww').format(), '2011-01-01T00:00:00+00:00', '2011 week 1 (1st Jan Sat)');
+        assert.equal(moment.utc('2012-01', 'gggg-ww').format(), '2011-12-31T00:00:00+00:00', '2012 week 1 (1st Jan Sun)');
+    });
+
+    test('parsing ISO with Z', function (assert) {
+        var i, mom, formats = [
+            ['2011-10-08T18:04',             '2011-10-08T18:04:00.000'],
+            ['2011-10-08T18:04:20',          '2011-10-08T18:04:20.000'],
+            ['2011-10-08T18:04:20.1',        '2011-10-08T18:04:20.100'],
+            ['2011-10-08T18:04:20.11',       '2011-10-08T18:04:20.110'],
+            ['2011-10-08T18:04:20.111',      '2011-10-08T18:04:20.111'],
+            ['2011-W40-6T18',                '2011-10-08T18:00:00.000'],
+            ['2011-W40-6T18:04',             '2011-10-08T18:04:00.000'],
+            ['2011-W40-6T18:04:20',          '2011-10-08T18:04:20.000'],
+            ['2011-W40-6T18:04:20.1',        '2011-10-08T18:04:20.100'],
+            ['2011-W40-6T18:04:20.11',       '2011-10-08T18:04:20.110'],
+            ['2011-W40-6T18:04:20.111',      '2011-10-08T18:04:20.111'],
+            ['2011-281T18',                  '2011-10-08T18:00:00.000'],
+            ['2011-281T18:04',               '2011-10-08T18:04:00.000'],
+            ['2011-281T18:04:20',            '2011-10-08T18:04:20.000'],
+            ['2011-281T18:04:20',            '2011-10-08T18:04:20.000'],
+            ['2011-281T18:04:20.1',          '2011-10-08T18:04:20.100'],
+            ['2011-281T18:04:20.11',         '2011-10-08T18:04:20.110'],
+            ['2011-281T18:04:20.111',        '2011-10-08T18:04:20.111']
+        ];
+
+        for (i = 0; i < formats.length; i++) {
+            mom = moment(formats[i][0] + 'Z').utc();
+            assert.equal(mom.format('YYYY-MM-DDTHH:mm:ss.SSS'), formats[i][1], 'moment should be able to parse ISO in UTC ' + formats[i][0] + 'Z');
+
+            mom = moment(formats[i][0] + ' Z').utc();
+            assert.equal(mom.format('YYYY-MM-DDTHH:mm:ss.SSS'), formats[i][1], 'moment should be able to parse ISO in UTC ' + formats[i][0] + ' Z');
+        }
+    });
+
+    test('parsing iso with T', function (assert) {
+        assert.equal(moment('2011-10-08T18')._f, 'YYYY-MM-DDTHH', 'should include \'T\' in the format');
+        assert.equal(moment('2011-10-08T18:20')._f, 'YYYY-MM-DDTHH:mm', 'should include \'T\' in the format');
+        assert.equal(moment('2011-10-08T18:20:13')._f, 'YYYY-MM-DDTHH:mm:ss', 'should include \'T\' in the format');
+        assert.equal(moment('2011-10-08T18:20:13.321')._f, 'YYYY-MM-DDTHH:mm:ss.SSSS', 'should include \'T\' in the format');
+
+        assert.equal(moment('2011-10-08 18')._f, 'YYYY-MM-DD HH', 'should not include \'T\' in the format');
+        assert.equal(moment('2011-10-08 18:20')._f, 'YYYY-MM-DD HH:mm', 'should not include \'T\' in the format');
+        assert.equal(moment('2011-10-08 18:20:13')._f, 'YYYY-MM-DD HH:mm:ss', 'should not include \'T\' in the format');
+        assert.equal(moment('2011-10-08 18:20:13.321')._f, 'YYYY-MM-DD HH:mm:ss.SSSS', 'should not include \'T\' in the format');
+    });
+
+    test('parsing iso Z timezone', function (assert) {
+        var i,
+        formats = [
+            ['2011-10-08T18:04Z',             '2011-10-08T18:04:00.000+00:00'],
+            ['2011-10-08T18:04:20Z',          '2011-10-08T18:04:20.000+00:00'],
+            ['2011-10-08T18:04:20.111Z',      '2011-10-08T18:04:20.111+00:00']
+        ];
+        for (i = 0; i < formats.length; i++) {
+            assert.equal(moment.utc(formats[i][0]).format('YYYY-MM-DDTHH:mm:ss.SSSZ'), formats[i][1], 'moment should be able to parse ISO ' + formats[i][0]);
+        }
+    });
+
+    test('parsing iso Z timezone into local', function (assert) {
+        var m = moment('2011-10-08T18:04:20.111Z');
+
+        assert.equal(m.utc().format('YYYY-MM-DDTHH:mm:ss.SSS'), '2011-10-08T18:04:20.111', 'moment should be able to parse ISO 2011-10-08T18:04:20.111Z');
+    });
+
+    test('parsing iso with more subsecond precision digits', function (assert) {
+        assert.equal(moment.utc('2013-07-31T22:00:00.0000000Z').format(), '2013-07-31T22:00:00+00:00', 'more than 3 subsecond digits');
+    });
+
+    test('null or empty', function (assert) {
+        assert.equal(moment('').isValid(), false, 'moment(\'\') is not valid');
+        assert.equal(moment(null).isValid(), false, 'moment(null) is not valid');
+        assert.equal(moment(null, 'YYYY-MM-DD').isValid(), false, 'moment(\'\', \'format\') is not valid');
+        assert.equal(moment('', 'YYYY-MM-DD').isValid(), false, 'moment(\'\', \'format\') is not valid');
+        assert.equal(moment.utc('').isValid(), false, 'moment.utc(\'\') is not valid');
+        assert.equal(moment.utc(null).isValid(), false, 'moment.utc(null) is not valid');
+        assert.equal(moment.utc(null, 'YYYY-MM-DD').isValid(), false, 'moment.utc(null) is not valid');
+        assert.equal(moment.utc('', 'YYYY-MM-DD').isValid(), false, 'moment.utc(\'\', \'YYYY-MM-DD\') is not valid');
+    });
+
+    test('first century', function (assert) {
+        assert.equal(moment([0, 0, 1]).format('YYYY-MM-DD'), '0000-01-01', 'Year AD 0');
+        assert.equal(moment([99, 0, 1]).format('YYYY-MM-DD'), '0099-01-01', 'Year AD 99');
+        assert.equal(moment([999, 0, 1]).format('YYYY-MM-DD'), '0999-01-01', 'Year AD 999');
+        assert.equal(moment('0 1 1', 'YYYY MM DD').format('YYYY-MM-DD'), '0000-01-01', 'Year AD 0');
+        assert.equal(moment('99 1 1', 'YYYY MM DD').format('YYYY-MM-DD'), '0099-01-01', 'Year AD 99');
+        assert.equal(moment('999 1 1', 'YYYY MM DD').format('YYYY-MM-DD'), '0999-01-01', 'Year AD 999');
+        assert.equal(moment('0 1 1', 'YYYYY MM DD').format('YYYYY-MM-DD'), '00000-01-01', 'Year AD 0');
+        assert.equal(moment('99 1 1', 'YYYYY MM DD').format('YYYYY-MM-DD'), '00099-01-01', 'Year AD 99');
+        assert.equal(moment('999 1 1', 'YYYYY MM DD').format('YYYYY-MM-DD'), '00999-01-01', 'Year AD 999');
+    });
+
+    test('six digit years', function (assert) {
+        assert.equal(moment([-270000, 0, 1]).format('YYYYY-MM-DD'), '-270000-01-01', 'format BC 270,001');
+        assert.equal(moment([270000, 0, 1]).format('YYYYY-MM-DD'), '270000-01-01', 'format AD 270,000');
+        assert.equal(moment('-270000-01-01', 'YYYYY-MM-DD').toDate().getFullYear(), -270000, 'parse BC 270,001');
+        assert.equal(moment('270000-01-01',  'YYYYY-MM-DD').toDate().getFullYear(), 270000, 'parse AD 270,000');
+        assert.equal(moment('+270000-01-01', 'YYYYY-MM-DD').toDate().getFullYear(), 270000, 'parse AD +270,000');
+        assert.equal(moment.utc('-270000-01-01', 'YYYYY-MM-DD').toDate().getUTCFullYear(), -270000, 'parse utc BC 270,001');
+        assert.equal(moment.utc('270000-01-01',  'YYYYY-MM-DD').toDate().getUTCFullYear(), 270000, 'parse utc AD 270,000');
+        assert.equal(moment.utc('+270000-01-01', 'YYYYY-MM-DD').toDate().getUTCFullYear(), 270000, 'parse utc AD +270,000');
+    });
+
+    test('negative four digit years', function (assert) {
+        assert.equal(moment('-1000-01-01', 'YYYYY-MM-DD').toDate().getFullYear(), -1000, 'parse BC 1,001');
+        assert.equal(moment.utc('-1000-01-01', 'YYYYY-MM-DD').toDate().getUTCFullYear(), -1000, 'parse utc BC 1,001');
+    });
+
+    test('strict parsing', function (assert) {
+        assert.equal(moment('2014-', 'YYYY-Q', true).isValid(), false, 'fail missing quarter');
+
+        assert.equal(moment('2012-05', 'YYYY-MM', true).format('YYYY-MM'), '2012-05', 'parse correct string');
+        assert.equal(moment(' 2012-05', 'YYYY-MM', true).isValid(), false, 'fail on extra whitespace');
+        assert.equal(moment('foo 2012-05', '[foo] YYYY-MM', true).format('YYYY-MM'), '2012-05', 'handle fixed text');
+        assert.equal(moment('2012 05', 'YYYY-MM', true).isValid(), false, 'fail on different separator');
+        assert.equal(moment('2012 05', 'YYYY MM DD', true).isValid(), false, 'fail on too many tokens');
+
+        assert.equal(moment('05 30 2010', ['DD MM YYYY', 'MM DD YYYY'], true).format('MM DD YYYY'), '05 30 2010', 'array with bad date');
+        assert.equal(moment('05 30 2010', ['', 'MM DD YYYY'], true).format('MM DD YYYY'), '05 30 2010', 'array with invalid format');
+        assert.equal(moment('05 30 2010', [' DD MM YYYY', 'MM DD YYYY'], true).format('MM DD YYYY'), '05 30 2010', 'array with non-matching format');
+
+        assert.equal(moment('2010.*...', 'YYYY.*', true).isValid(), false, 'invalid format with regex chars');
+        assert.equal(moment('2010.*', 'YYYY.*', true).year(), 2010, 'valid format with regex chars');
+        assert.equal(moment('.*2010.*', '.*YYYY.*', true).year(), 2010, 'valid format with regex chars on both sides');
+
+        //strict tokens
+        assert.equal(moment('-5-05-25', 'YYYY-MM-DD', true).isValid(), false, 'invalid negative year');
+        assert.equal(moment('2-05-25', 'YYYY-MM-DD', true).isValid(), false, 'invalid one-digit year');
+        assert.equal(moment('20-05-25', 'YYYY-MM-DD', true).isValid(), false, 'invalid two-digit year');
+        assert.equal(moment('201-05-25', 'YYYY-MM-DD', true).isValid(), false, 'invalid three-digit year');
+        assert.equal(moment('2010-05-25', 'YYYY-MM-DD', true).isValid(), true, 'valid four-digit year');
+        assert.equal(moment('22010-05-25', 'YYYY-MM-DD', true).isValid(), false, 'invalid five-digit year');
+
+        assert.equal(moment('12-05-25', 'YY-MM-DD', true).isValid(), true, 'valid two-digit year');
+        assert.equal(moment('2012-05-25', 'YY-MM-DD', true).isValid(), false, 'invalid four-digit year');
+
+        assert.equal(moment('-5-05-25', 'Y-MM-DD', true).isValid(), true, 'valid negative year');
+        assert.equal(moment('2-05-25', 'Y-MM-DD', true).isValid(), true, 'valid one-digit year');
+        assert.equal(moment('20-05-25', 'Y-MM-DD', true).isValid(), true, 'valid two-digit year');
+        assert.equal(moment('201-05-25', 'Y-MM-DD', true).isValid(), true, 'valid three-digit year');
+
+        assert.equal(moment('2012-5-25', 'YYYY-M-DD', true).isValid(), true, 'valid one-digit month');
+        assert.equal(moment('2012-5-25', 'YYYY-MM-DD', true).isValid(), false, 'invalid one-digit month');
+        assert.equal(moment('2012-05-25', 'YYYY-M-DD', true).isValid(), true, 'valid one-digit month');
+        assert.equal(moment('2012-05-25', 'YYYY-MM-DD', true).isValid(), true, 'valid one-digit month');
+
+        assert.equal(moment('2012-05-2', 'YYYY-MM-D', true).isValid(), true, 'valid one-digit day');
+        assert.equal(moment('2012-05-2', 'YYYY-MM-DD', true).isValid(), false, 'invalid one-digit day');
+        assert.equal(moment('2012-05-02', 'YYYY-MM-D', true).isValid(), true, 'valid two-digit day');
+        assert.equal(moment('2012-05-02', 'YYYY-MM-DD', true).isValid(), true, 'valid two-digit day');
+
+        assert.equal(moment('+002012-05-25', 'YYYYY-MM-DD', true).isValid(), true, 'valid six-digit year');
+        assert.equal(moment('+2012-05-25', 'YYYYY-MM-DD', true).isValid(), false, 'invalid four-digit year');
+
+        //thse are kinda pointless, but they should work as expected
+        assert.equal(moment('1', 'S', true).isValid(), true, 'valid one-digit milisecond');
+        assert.equal(moment('12', 'S', true).isValid(), false, 'invalid two-digit milisecond');
+        assert.equal(moment('123', 'S', true).isValid(), false, 'invalid three-digit milisecond');
+
+        assert.equal(moment('1', 'SS', true).isValid(), false, 'invalid one-digit milisecond');
+        assert.equal(moment('12', 'SS', true).isValid(), true, 'valid two-digit milisecond');
+        assert.equal(moment('123', 'SS', true).isValid(), false, 'invalid three-digit milisecond');
+
+        assert.equal(moment('1', 'SSS', true).isValid(), false, 'invalid one-digit milisecond');
+        assert.equal(moment('12', 'SSS', true).isValid(), false, 'invalid two-digit milisecond');
+        assert.equal(moment('123', 'SSS', true).isValid(), true, 'valid three-digit milisecond');
+
+        // strict parsing respects month length
+        assert.ok(moment('1 January 2000', 'D MMMM YYYY', true).isValid(), 'capital long-month + MMMM');
+        assert.ok(!moment('1 January 2000', 'D MMM YYYY', true).isValid(), 'capital long-month + MMM');
+        assert.ok(!moment('1 Jan 2000', 'D MMMM YYYY', true).isValid(), 'capital short-month + MMMM');
+        assert.ok(moment('1 Jan 2000', 'D MMM YYYY', true).isValid(), 'capital short-month + MMM');
+        assert.ok(moment('1 january 2000', 'D MMMM YYYY', true).isValid(), 'lower long-month + MMMM');
+        assert.ok(!moment('1 january 2000', 'D MMM YYYY', true).isValid(), 'lower long-month + MMM');
+        assert.ok(!moment('1 jan 2000', 'D MMMM YYYY', true).isValid(), 'lower short-month + MMMM');
+        assert.ok(moment('1 jan 2000', 'D MMM YYYY', true).isValid(), 'lower short-month + MMM');
+    });
+
+    test('parsing into a locale', function (assert) {
+        moment.defineLocale('parselocale', {
+            months : 'one_two_three_four_five_six_seven_eight_nine_ten_eleven_twelve'.split('_'),
+            monthsShort : 'one_two_three_four_five_six_seven_eight_nine_ten_eleven_twelve'.split('_')
+        });
+
+        moment.locale('en');
+
+        assert.equal(moment('2012 seven', 'YYYY MMM', 'parselocale').month(), 6, 'should be able to parse in a specific locale');
+
+        moment.locale('parselocale');
+
+        assert.equal(moment('2012 july', 'YYYY MMM', 'en').month(), 6, 'should be able to parse in a specific locale');
+
+        moment.defineLocale('parselocale', null);
+    });
+
+    function getVerifier(test) {
+        return function (input, format, expected, description, asymetrical) {
+            var m = moment(input, format);
+            test.equal(m.format('YYYY MM DD'), expected, 'compare: ' + description);
+
+            //test round trip
+            if (!asymetrical) {
+                test.equal(m.format(format), input, 'round trip: ' + description);
+            }
+        };
+    }
+
+    test('parsing week and weekday information', function (assert) {
+        var ver = getVerifier(assert);
+
+        // year
+        ver('12', 'gg', '2012 01 01', 'week-year two digits');
+        ver('2012', 'gggg', '2012 01 01', 'week-year four digits');
+
+        ver('99', 'gg', '1998 12 27', 'week-year two digits previous year');
+        ver('1999', 'gggg', '1998 12 27', 'week-year four digits previous year');
+
+        ver('99', 'GG', '1999 01 04', 'iso week-year two digits');
+        ver('1999', 'GGGG', '1999 01 04', 'iso week-year four digits');
+
+        ver('13', 'GG', '2012 12 31', 'iso week-year two digits previous year');
+        ver('2013', 'GGGG', '2012 12 31', 'iso week-year four digits previous year');
+
+        // year + week
+        ver('1999 37', 'gggg w', '1999 09 05', 'week');
+        ver('1999 37', 'gggg ww', '1999 09 05', 'week double');
+        ver('1999 37', 'GGGG W', '1999 09 13', 'iso week');
+        ver('1999 37', 'GGGG WW', '1999 09 13', 'iso week double');
+
+        ver('1999 37 4', 'GGGG WW E', '1999 09 16', 'iso day');
+        ver('1999 37 04', 'GGGG WW E', '1999 09 16', 'iso day wide', true);
+
+        ver('1999 37 4', 'gggg ww e', '1999 09 09', 'day');
+        ver('1999 37 04', 'gggg ww e', '1999 09 09', 'day wide', true);
+
+        // year + week + day
+        ver('1999 37 4', 'gggg ww d', '1999 09 09', 'd');
+        ver('1999 37 Th', 'gggg ww dd', '1999 09 09', 'dd');
+        ver('1999 37 Thu', 'gggg ww ddd', '1999 09 09', 'ddd');
+        ver('1999 37 Thursday', 'gggg ww dddd', '1999 09 09', 'dddd');
+
+        // lower-order only
+        assert.equal(moment('22', 'ww').week(), 22, 'week sets the week by itself');
+        assert.equal(moment('22', 'ww').weekYear(), moment().weekYear(), 'week keeps this year');
+        assert.equal(moment('2012 22', 'YYYY ww').weekYear(), 2012, 'week keeps parsed year');
+
+        assert.equal(moment('22', 'WW').isoWeek(), 22, 'iso week sets the week by itself');
+        assert.equal(moment('2012 22', 'YYYY WW').weekYear(), 2012, 'iso week keeps parsed year');
+        assert.equal(moment('22', 'WW').isoWeekYear(), moment().isoWeekYear(), 'iso week keeps this year');
+
+        // order
+        ver('6 2013 2', 'e gggg w', '2013 01 12', 'order doesn\'t matter');
+        ver('6 2013 2', 'E GGGG W', '2013 01 12', 'iso order doesn\'t matter');
+
+        //can parse other stuff too
+        assert.equal(moment('1999-W37-4 3:30', 'GGGG-[W]WW-E HH:mm').format('YYYY MM DD HH:mm'), '1999 09 16 03:30', 'parsing weeks and hours');
+
+        // In safari, all years before 1300 are shifted back with one day.
+        // http://stackoverflow.com/questions/20768975/safari-subtracts-1-day-from-dates-before-1300
+        if (new Date('1300-01-01').getUTCFullYear() === 1300) {
+            // Years less than 100
+            ver('0098-06', 'GGGG-WW', '0098 02 03', 'small years work', true);
+        }
+    });
+
+    test('parsing localized weekdays', function (assert) {
+        var ver = getVerifier(assert);
+        try {
+            moment.locale('dow:1,doy:4', {
+                weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+                weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+                weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+                week: {dow: 1, doy: 4}
+            });
+            ver('1999 37 4', 'GGGG WW E', '1999 09 16', 'iso ignores locale');
+            ver('1999 37 7', 'GGGG WW E', '1999 09 19', 'iso ignores locale');
+
+            ver('1999 37 0', 'gggg ww e', '1999 09 13', 'localized e uses local doy and dow: 0 = monday');
+            ver('1999 37 4', 'gggg ww e', '1999 09 17', 'localized e uses local doy and dow: 4 = friday');
+
+            ver('1999 37 1', 'gggg ww d', '1999 09 13', 'localized d uses 0-indexed days: 1 = monday');
+            ver('1999 37 Lu', 'gggg ww dd', '1999 09 13', 'localized d uses 0-indexed days: Mo');
+            ver('1999 37 lun.', 'gggg ww ddd', '1999 09 13', 'localized d uses 0-indexed days: Mon');
+            ver('1999 37 lundi', 'gggg ww dddd', '1999 09 13', 'localized d uses 0-indexed days: Monday');
+            ver('1999 37 4', 'gggg ww d', '1999 09 16', 'localized d uses 0-indexed days: 4');
+
+            //sunday goes at the end of the week
+            ver('1999 37 0', 'gggg ww d', '1999 09 19', 'localized d uses 0-indexed days: 0 = sund');
+            ver('1999 37 Di', 'gggg ww dd', '1999 09 19', 'localized d uses 0-indexed days: 0 = sund');
+        }
+        finally {
+            moment.locale('en');
+        }
+    });
+
+    test('parsing with customized two-digit year', function (assert) {
+        var original = moment.parseTwoDigitYear;
+        try {
+            assert.equal(moment('68', 'YY').year(), 2068);
+            assert.equal(moment('69', 'YY').year(), 1969);
+            moment.parseTwoDigitYear = function (input) {
+                return +input + (+input > 30 ? 1900 : 2000);
+            };
+            assert.equal(moment('68', 'YY').year(), 1968);
+            assert.equal(moment('67', 'YY').year(), 1967);
+            assert.equal(moment('31', 'YY').year(), 1931);
+            assert.equal(moment('30', 'YY').year(), 2030);
+        }
+        finally {
+            moment.parseTwoDigitYear = original;
+        }
+    });
+
+    test('array with strings', function (assert) {
+        assert.equal(moment(['2014', '7', '31']).isValid(), true, 'string array + isValid');
+    });
+
+    test('utc with array of formats', function (assert) {
+        assert.equal(moment.utc('2014-01-01', ['YYYY-MM-DD', 'YYYY-MM']).format(), '2014-01-01T00:00:00+00:00', 'moment.utc works with array of formats');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function each(array, callback) {
+        var i;
+        for (i = 0; i < array.length; i++) {
+            callback(array[i], i, array);
+        }
+    }
+
+    var helpers_each = each;
+
+    module('days in month');
+
+    test('days in month', function (assert) {
+        helpers_each([31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31], function (days, i) {
+            var firstDay = moment([2012, i]),
+                lastDay  = moment([2012, i, days]);
+            assert.equal(firstDay.daysInMonth(), days, firstDay.format('L') + ' should have ' + days + ' days.');
+            assert.equal(lastDay.daysInMonth(), days, lastDay.format('L') + ' should have ' + days + ' days.');
+        });
+    });
+
+    test('days in month leap years', function (assert) {
+        assert.equal(moment([2010, 1]).daysInMonth(), 28, 'Feb 2010 should have 28 days');
+        assert.equal(moment([2100, 1]).daysInMonth(), 28, 'Feb 2100 should have 28 days');
+        assert.equal(moment([2008, 1]).daysInMonth(), 29, 'Feb 2008 should have 29 days');
+        assert.equal(moment([2000, 1]).daysInMonth(), 29, 'Feb 2000 should have 29 days');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function equal(assert, a, b, message) {
+        assert.ok(Math.abs(a - b) < 0.00000001, '(' + a + ' === ' + b + ') ' + message);
+    }
+
+    function dstForYear(year) {
+        var start = moment([year]),
+            end = moment([year + 1]),
+            current = start.clone(),
+            last;
+
+        while (current < end) {
+            last = current.clone();
+            current.add(24, 'hour');
+            if (last.utcOffset() !== current.utcOffset()) {
+                end = current.clone();
+                current = last.clone();
+                break;
+            }
+        }
+
+        while (current < end) {
+            last = current.clone();
+            current.add(1, 'hour');
+            if (last.utcOffset() !== current.utcOffset()) {
+                return {
+                    moment : last,
+                    diff : -(current.utcOffset() - last.utcOffset()) / 60
+                };
+            }
+        }
+    }
+
+    module('diff');
+
+    test('diff', function (assert) {
+        assert.equal(moment(1000).diff(0), 1000, '1 second - 0 = 1000');
+        assert.equal(moment(1000).diff(500), 500, '1 second - 0.5 seconds = 500');
+        assert.equal(moment(0).diff(1000), -1000, '0 - 1 second = -1000');
+        assert.equal(moment(new Date(1000)).diff(1000), 0, '1 second - 1 second = 0');
+        var oneHourDate = new Date(),
+        nowDate = new Date(+oneHourDate);
+        oneHourDate.setHours(oneHourDate.getHours() + 1);
+        assert.equal(moment(oneHourDate).diff(nowDate), 60 * 60 * 1000, '1 hour from now = 3600000');
+    });
+
+    test('diff key after', function (assert) {
+        assert.equal(moment([2010]).diff([2011], 'years'), -1, 'year diff');
+        assert.equal(moment([2010]).diff([2010, 2], 'months'), -2, 'month diff');
+        assert.equal(moment([2010]).diff([2010, 0, 7], 'weeks'), 0, 'week diff');
+        assert.equal(moment([2010]).diff([2010, 0, 8], 'weeks'), -1, 'week diff');
+        assert.equal(moment([2010]).diff([2010, 0, 21], 'weeks'), -2, 'week diff');
+        assert.equal(moment([2010]).diff([2010, 0, 22], 'weeks'), -3, 'week diff');
+        assert.equal(moment([2010]).diff([2010, 0, 4], 'days'), -3, 'day diff');
+        assert.equal(moment([2010]).diff([2010, 0, 1, 4], 'hours'), -4, 'hour diff');
+        assert.equal(moment([2010]).diff([2010, 0, 1, 0, 5], 'minutes'), -5, 'minute diff');
+        assert.equal(moment([2010]).diff([2010, 0, 1, 0, 0, 6], 'seconds'), -6, 'second diff');
+    });
+
+    test('diff key before', function (assert) {
+        assert.equal(moment([2011]).diff([2010], 'years'), 1, 'year diff');
+        assert.equal(moment([2010, 2]).diff([2010], 'months'), 2, 'month diff');
+        assert.equal(moment([2010, 0, 4]).diff([2010], 'days'), 3, 'day diff');
+        assert.equal(moment([2010, 0, 7]).diff([2010], 'weeks'), 0, 'week diff');
+        assert.equal(moment([2010, 0, 8]).diff([2010], 'weeks'), 1, 'week diff');
+        assert.equal(moment([2010, 0, 21]).diff([2010], 'weeks'), 2, 'week diff');
+        assert.equal(moment([2010, 0, 22]).diff([2010], 'weeks'), 3, 'week diff');
+        assert.equal(moment([2010, 0, 1, 4]).diff([2010], 'hours'), 4, 'hour diff');
+        assert.equal(moment([2010, 0, 1, 0, 5]).diff([2010], 'minutes'), 5, 'minute diff');
+        assert.equal(moment([2010, 0, 1, 0, 0, 6]).diff([2010], 'seconds'), 6, 'second diff');
+    });
+
+    test('diff key before singular', function (assert) {
+        assert.equal(moment([2011]).diff([2010], 'year'), 1, 'year diff singular');
+        assert.equal(moment([2010, 2]).diff([2010], 'month'), 2, 'month diff singular');
+        assert.equal(moment([2010, 0, 4]).diff([2010], 'day'), 3, 'day diff singular');
+        assert.equal(moment([2010, 0, 7]).diff([2010], 'week'), 0, 'week diff singular');
+        assert.equal(moment([2010, 0, 8]).diff([2010], 'week'), 1, 'week diff singular');
+        assert.equal(moment([2010, 0, 21]).diff([2010], 'week'), 2, 'week diff singular');
+        assert.equal(moment([2010, 0, 22]).diff([2010], 'week'), 3, 'week diff singular');
+        assert.equal(moment([2010, 0, 1, 4]).diff([2010], 'hour'), 4, 'hour diff singular');
+        assert.equal(moment([2010, 0, 1, 0, 5]).diff([2010], 'minute'), 5, 'minute diff singular');
+        assert.equal(moment([2010, 0, 1, 0, 0, 6]).diff([2010], 'second'), 6, 'second diff singular');
+    });
+
+    test('diff key before abbreviated', function (assert) {
+        assert.equal(moment([2011]).diff([2010], 'y'), 1, 'year diff abbreviated');
+        assert.equal(moment([2010, 2]).diff([2010], 'M'), 2, 'month diff abbreviated');
+        assert.equal(moment([2010, 0, 4]).diff([2010], 'd'), 3, 'day diff abbreviated');
+        assert.equal(moment([2010, 0, 7]).diff([2010], 'w'), 0, 'week diff abbreviated');
+        assert.equal(moment([2010, 0, 8]).diff([2010], 'w'), 1, 'week diff abbreviated');
+        assert.equal(moment([2010, 0, 21]).diff([2010], 'w'), 2, 'week diff abbreviated');
+        assert.equal(moment([2010, 0, 22]).diff([2010], 'w'), 3, 'week diff abbreviated');
+        assert.equal(moment([2010, 0, 1, 4]).diff([2010], 'h'), 4, 'hour diff abbreviated');
+        assert.equal(moment([2010, 0, 1, 0, 5]).diff([2010], 'm'), 5, 'minute diff abbreviated');
+        assert.equal(moment([2010, 0, 1, 0, 0, 6]).diff([2010], 's'), 6, 'second diff abbreviated');
+    });
+
+    test('diff month', function (assert) {
+        assert.equal(moment([2011, 0, 31]).diff([2011, 2, 1], 'months'), -1, 'month diff');
+    });
+
+    test('diff across DST', function (assert) {
+        var dst = dstForYear(2012), a, b, daysInMonth;
+        if (!dst) {
+            assert.equal(42, 42, 'at least one assertion');
+            return;
+        }
+
+        a = dst.moment;
+        b = a.clone().utc().add(12, 'hours').local();
+        daysInMonth = (a.daysInMonth() + b.daysInMonth()) / 2;
+        assert.equal(b.diff(a, 'milliseconds', true), 12 * 60 * 60 * 1000,
+                'ms diff across DST');
+        assert.equal(b.diff(a, 'seconds', true), 12 * 60 * 60,
+                'second diff across DST');
+        assert.equal(b.diff(a, 'minutes', true), 12 * 60,
+                'minute diff across DST');
+        assert.equal(b.diff(a, 'hours', true), 12,
+                'hour diff across DST');
+        assert.equal(b.diff(a, 'days', true), (12 - dst.diff) / 24,
+                'day diff across DST');
+        equal(assert, b.diff(a, 'weeks', true),  (12 - dst.diff) / 24 / 7,
+                'week diff across DST');
+        assert.ok(0.95 / (2 * 31) < b.diff(a, 'months', true),
+                'month diff across DST, lower bound');
+        assert.ok(b.diff(a, 'month', true) < 1.05 / (2 * 28),
+                'month diff across DST, upper bound');
+        assert.ok(0.95 / (2 * 31 * 12) < b.diff(a, 'years', true),
+                'year diff across DST, lower bound');
+        assert.ok(b.diff(a, 'year', true) < 1.05 / (2 * 28 * 12),
+                'year diff across DST, upper bound');
+
+        a = dst.moment;
+        b = a.clone().utc().add(12 + dst.diff, 'hours').local();
+        daysInMonth = (a.daysInMonth() + b.daysInMonth()) / 2;
+
+        assert.equal(b.diff(a, 'milliseconds', true),
+                (12 + dst.diff) * 60 * 60 * 1000,
+                'ms diff across DST');
+        assert.equal(b.diff(a, 'seconds', true),  (12 + dst.diff) * 60 * 60,
+                'second diff across DST');
+        assert.equal(b.diff(a, 'minutes', true),  (12 + dst.diff) * 60,
+                'minute diff across DST');
+        assert.equal(b.diff(a, 'hours', true),  (12 + dst.diff),
+                'hour diff across DST');
+        assert.equal(b.diff(a, 'days', true),  12 / 24, 'day diff across DST');
+        equal(assert, b.diff(a, 'weeks', true),  12 / 24 / 7,
+                'week diff across DST');
+        assert.ok(0.95 / (2 * 31) < b.diff(a, 'months', true),
+                'month diff across DST, lower bound');
+        assert.ok(b.diff(a, 'month', true) < 1.05 / (2 * 28),
+                'month diff across DST, upper bound');
+        assert.ok(0.95 / (2 * 31 * 12) < b.diff(a, 'years', true),
+                'year diff across DST, lower bound');
+        assert.ok(b.diff(a, 'year', true) < 1.05 / (2 * 28 * 12),
+                'year diff across DST, upper bound');
+    });
+
+    test('diff overflow', function (assert) {
+        assert.equal(moment([2011]).diff([2010], 'months'), 12, 'month diff');
+        assert.equal(moment([2010, 0, 2]).diff([2010], 'hours'), 24, 'hour diff');
+        assert.equal(moment([2010, 0, 1, 2]).diff([2010], 'minutes'), 120, 'minute diff');
+        assert.equal(moment([2010, 0, 1, 0, 4]).diff([2010], 'seconds'), 240, 'second diff');
+    });
+
+    test('diff between utc and local', function (assert) {
+        if (moment([2012]).utcOffset() === moment([2011]).utcOffset()) {
+            // Russia's utc offset on 1st of Jan 2012 vs 2011 is different
+            assert.equal(moment([2012]).utc().diff([2011], 'years'), 1, 'year diff');
+        }
+        assert.equal(moment([2010, 2, 2]).utc().diff([2010, 0, 2], 'months'), 2, 'month diff');
+        assert.equal(moment([2010, 0, 4]).utc().diff([2010], 'days'), 3, 'day diff');
+        assert.equal(moment([2010, 0, 22]).utc().diff([2010], 'weeks'), 3, 'week diff');
+        assert.equal(moment([2010, 0, 1, 4]).utc().diff([2010], 'hours'), 4, 'hour diff');
+        assert.equal(moment([2010, 0, 1, 0, 5]).utc().diff([2010], 'minutes'), 5, 'minute diff');
+        assert.equal(moment([2010, 0, 1, 0, 0, 6]).utc().diff([2010], 'seconds'), 6, 'second diff');
+    });
+
+    test('diff floored', function (assert) {
+        assert.equal(moment([2010, 0, 1, 23]).diff([2010], 'day'), 0, '23 hours = 0 days');
+        assert.equal(moment([2010, 0, 1, 23, 59]).diff([2010], 'day'), 0, '23:59 hours = 0 days');
+        assert.equal(moment([2010, 0, 1, 24]).diff([2010], 'day'), 1, '24 hours = 1 day');
+        assert.equal(moment([2010, 0, 2]).diff([2011, 0, 1], 'year'), 0, 'year rounded down');
+        assert.equal(moment([2011, 0, 1]).diff([2010, 0, 2], 'year'), 0, 'year rounded down');
+        assert.equal(moment([2010, 0, 2]).diff([2011, 0, 2], 'year'), -1, 'year rounded down');
+        assert.equal(moment([2011, 0, 2]).diff([2010, 0, 2], 'year'), 1, 'year rounded down');
+    });
+
+    test('year diffs include dates', function (assert) {
+        assert.ok(moment([2012, 1, 19]).diff(moment([2002, 1, 20]), 'years', true) < 10, 'year diff should include date of month');
+    });
+
+    test('month diffs', function (assert) {
+        // due to floating point math errors, these tests just need to be accurate within 0.00000001
+        assert.equal(moment([2012, 0, 1]).diff([2012, 1, 1], 'months', true), -1, 'Jan 1 to Feb 1 should be 1 month');
+        equal(assert, moment([2012, 0, 1]).diff([2012, 0, 1, 12], 'months', true), -0.5 / 31, 'Jan 1 to Jan 1 noon should be 0.5 / 31 months');
+        assert.equal(moment([2012, 0, 15]).diff([2012, 1, 15], 'months', true), -1, 'Jan 15 to Feb 15 should be 1 month');
+        assert.equal(moment([2012, 0, 28]).diff([2012, 1, 28], 'months', true), -1, 'Jan 28 to Feb 28 should be 1 month');
+        assert.ok(moment([2012, 0, 31]).diff([2012, 1, 29], 'months', true), -1, 'Jan 31 to Feb 29 should be 1 month');
+        assert.ok(-1 > moment([2012, 0, 31]).diff([2012, 2, 1], 'months', true), 'Jan 31 to Mar 1 should be more than 1 month');
+        assert.ok(-30 / 28 < moment([2012, 0, 31]).diff([2012, 2, 1], 'months', true), 'Jan 31 to Mar 1 should be less than 1 month and 1 day');
+        equal(assert, moment([2012, 0, 1]).diff([2012, 0, 31], 'months', true), -(30 / 31), 'Jan 1 to Jan 31 should be 30 / 31 months');
+        assert.ok(0 < moment('2014-02-01').diff(moment('2014-01-31'), 'months', true), 'jan-31 to feb-1 diff is positive');
+    });
+
+    test('exact month diffs', function (assert) {
+        // generate all pairs of months and compute month diff, with fixed day
+        // of month = 15.
+
+        var m1, m2;
+        for (m1 = 0; m1 < 12; ++m1) {
+            for (m2 = m1; m2 < 12; ++m2) {
+                assert.equal(moment([2013, m2, 15]).diff(moment([2013, m1, 15]), 'months', true), m2 - m1,
+                             'month diff from 2013-' + m1 + '-15 to 2013-' + m2 + '-15');
+            }
+        }
+    });
+
+    test('year diffs', function (assert) {
+        // due to floating point math errors, these tests just need to be accurate within 0.00000001
+        equal(assert, moment([2012, 0, 1]).diff([2013, 0, 1], 'years', true), -1, 'Jan 1 2012 to Jan 1 2013 should be 1 year');
+        equal(assert, moment([2012, 1, 28]).diff([2013, 1, 28], 'years', true), -1, 'Feb 28 2012 to Feb 28 2013 should be 1 year');
+        equal(assert, moment([2012, 2, 1]).diff([2013, 2, 1], 'years', true), -1, 'Mar 1 2012 to Mar 1 2013 should be 1 year');
+        equal(assert, moment([2012, 11, 1]).diff([2013, 11, 1], 'years', true), -1, 'Dec 1 2012 to Dec 1 2013 should be 1 year');
+        equal(assert, moment([2012, 11, 31]).diff([2013, 11, 31], 'years', true), -1, 'Dec 31 2012 to Dec 31 2013 should be 1 year');
+        equal(assert, moment([2012, 0, 1]).diff([2013, 6, 1], 'years', true), -1.5, 'Jan 1 2012 to Jul 1 2013 should be 1.5 years');
+        equal(assert, moment([2012, 0, 31]).diff([2013, 6, 31], 'years', true), -1.5, 'Jan 31 2012 to Jul 31 2013 should be 1.5 years');
+        equal(assert, moment([2012, 0, 1]).diff([2013, 0, 1, 12], 'years', true), -1 - (0.5 / 31) / 12, 'Jan 1 2012 to Jan 1 2013 noon should be 1+(0.5 / 31) / 12 years');
+        equal(assert, moment([2012, 0, 1]).diff([2013, 6, 1, 12], 'years', true), -1.5 - (0.5 / 31) / 12, 'Jan 1 2012 to Jul 1 2013 noon should be 1.5+(0.5 / 31) / 12 years');
+        equal(assert, moment([2012, 1, 29]).diff([2013, 1, 28], 'years', true), -1, 'Feb 29 2012 to Feb 28 2013 should be 1-(1 / 28.5) / 12 years');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('duration');
+
+    test('object instantiation', function (assert) {
+        var d = moment.duration({
+            years: 2,
+            months: 3,
+            weeks: 2,
+            days: 1,
+            hours: 8,
+            minutes: 9,
+            seconds: 20,
+            milliseconds: 12
+        });
+
+        assert.equal(d.years(),        2,  'years');
+        assert.equal(d.months(),       3,  'months');
+        assert.equal(d.weeks(),        2,  'weeks');
+        assert.equal(d.days(),         15, 'days'); // two weeks + 1 day
+        assert.equal(d.hours(),        8,  'hours');
+        assert.equal(d.minutes(),      9,  'minutes');
+        assert.equal(d.seconds(),      20, 'seconds');
+        assert.equal(d.milliseconds(), 12, 'milliseconds');
+    });
+
+    test('object instantiation with strings', function (assert) {
+        var d = moment.duration({
+            years: '2',
+            months: '3',
+            weeks: '2',
+            days: '1',
+            hours: '8',
+            minutes: '9',
+            seconds: '20',
+            milliseconds: '12'
+        });
+
+        assert.equal(d.years(),        2,  'years');
+        assert.equal(d.months(),       3,  'months');
+        assert.equal(d.weeks(),        2,  'weeks');
+        assert.equal(d.days(),         15, 'days'); // two weeks + 1 day
+        assert.equal(d.hours(),        8,  'hours');
+        assert.equal(d.minutes(),      9,  'minutes');
+        assert.equal(d.seconds(),      20, 'seconds');
+        assert.equal(d.milliseconds(), 12, 'milliseconds');
+    });
+
+    test('milliseconds instantiation', function (assert) {
+        assert.equal(moment.duration(72).milliseconds(), 72, 'milliseconds');
+    });
+
+    test('undefined instantiation', function (assert) {
+        assert.equal(moment.duration(undefined).milliseconds(), 0, 'milliseconds');
+    });
+
+    test('null instantiation', function (assert) {
+        assert.equal(moment.duration(null).milliseconds(), 0, 'milliseconds');
+    });
+
+    test('instantiation by type', function (assert) {
+        assert.equal(moment.duration(1, 'years').years(),                 1, 'years');
+        assert.equal(moment.duration(1, 'y').years(),                     1, 'y');
+        assert.equal(moment.duration(2, 'months').months(),               2, 'months');
+        assert.equal(moment.duration(2, 'M').months(),                    2, 'M');
+        assert.equal(moment.duration(3, 'weeks').weeks(),                 3, 'weeks');
+        assert.equal(moment.duration(3, 'w').weeks(),                     3, 'weeks');
+        assert.equal(moment.duration(4, 'days').days(),                   4, 'days');
+        assert.equal(moment.duration(4, 'd').days(),                      4, 'd');
+        assert.equal(moment.duration(5, 'hours').hours(),                 5, 'hours');
+        assert.equal(moment.duration(5, 'h').hours(),                     5, 'h');
+        assert.equal(moment.duration(6, 'minutes').minutes(),             6, 'minutes');
+        assert.equal(moment.duration(6, 'm').minutes(),                   6, 'm');
+        assert.equal(moment.duration(7, 'seconds').seconds(),             7, 'seconds');
+        assert.equal(moment.duration(7, 's').seconds(),                   7, 's');
+        assert.equal(moment.duration(8, 'milliseconds').milliseconds(),   8, 'milliseconds');
+        assert.equal(moment.duration(8, 'ms').milliseconds(),             8, 'ms');
+    });
+
+    test('shortcuts', function (assert) {
+        assert.equal(moment.duration({y: 1}).years(),         1, 'years = y');
+        assert.equal(moment.duration({M: 2}).months(),        2, 'months = M');
+        assert.equal(moment.duration({w: 3}).weeks(),         3, 'weeks = w');
+        assert.equal(moment.duration({d: 4}).days(),          4, 'days = d');
+        assert.equal(moment.duration({h: 5}).hours(),         5, 'hours = h');
+        assert.equal(moment.duration({m: 6}).minutes(),       6, 'minutes = m');
+        assert.equal(moment.duration({s: 7}).seconds(),       7, 'seconds = s');
+        assert.equal(moment.duration({ms: 8}).milliseconds(), 8, 'milliseconds = ms');
+    });
+
+    test('generic getter', function (assert) {
+        assert.equal(moment.duration(1, 'years').get('years'),                1, 'years');
+        assert.equal(moment.duration(1, 'years').get('year'),                 1, 'years = year');
+        assert.equal(moment.duration(1, 'years').get('y'),                    1, 'years = y');
+        assert.equal(moment.duration(2, 'months').get('months'),              2, 'months');
+        assert.equal(moment.duration(2, 'months').get('month'),               2, 'months = month');
+        assert.equal(moment.duration(2, 'months').get('M'),                   2, 'months = M');
+        assert.equal(moment.duration(3, 'weeks').get('weeks'),                3, 'weeks');
+        assert.equal(moment.duration(3, 'weeks').get('week'),                 3, 'weeks = week');
+        assert.equal(moment.duration(3, 'weeks').get('w'),                    3, 'weeks = w');
+        assert.equal(moment.duration(4, 'days').get('days'),                  4, 'days');
+        assert.equal(moment.duration(4, 'days').get('day'),                   4, 'days = day');
+        assert.equal(moment.duration(4, 'days').get('d'),                     4, 'days = d');
+        assert.equal(moment.duration(5, 'hours').get('hours'),                5, 'hours');
+        assert.equal(moment.duration(5, 'hours').get('hour'),                 5, 'hours = hour');
+        assert.equal(moment.duration(5, 'hours').get('h'),                    5, 'hours = h');
+        assert.equal(moment.duration(6, 'minutes').get('minutes'),            6, 'minutes');
+        assert.equal(moment.duration(6, 'minutes').get('minute'),             6, 'minutes = minute');
+        assert.equal(moment.duration(6, 'minutes').get('m'),                  6, 'minutes = m');
+        assert.equal(moment.duration(7, 'seconds').get('seconds'),            7, 'seconds');
+        assert.equal(moment.duration(7, 'seconds').get('second'),             7, 'seconds = second');
+        assert.equal(moment.duration(7, 'seconds').get('s'),                  7, 'seconds = s');
+        assert.equal(moment.duration(8, 'milliseconds').get('milliseconds'),  8, 'milliseconds');
+        assert.equal(moment.duration(8, 'milliseconds').get('millisecond'),   8, 'milliseconds = millisecond');
+        assert.equal(moment.duration(8, 'milliseconds').get('ms'),            8, 'milliseconds = ms');
+    });
+
+    test('instantiation from another duration', function (assert) {
+        var simple = moment.duration(1234),
+            lengthy = moment.duration(60 * 60 * 24 * 360 * 1e3),
+            complicated = moment.duration({
+                years: 2,
+                months: 3,
+                weeks: 4,
+                days: 1,
+                hours: 8,
+                minutes: 9,
+                seconds: 20,
+                milliseconds: 12
+            }),
+            modified = moment.duration(1, 'day').add(moment.duration(1, 'day'));
+
+        assert.deepEqual(moment.duration(simple), simple, 'simple clones are equal');
+        assert.deepEqual(moment.duration(lengthy), lengthy, 'lengthy clones are equal');
+        assert.deepEqual(moment.duration(complicated), complicated, 'complicated clones are equal');
+        assert.deepEqual(moment.duration(modified), modified, 'cloning modified duration works');
+    });
+
+    test('instantiation from 24-hour time zero', function (assert) {
+        assert.equal(moment.duration('00:00').years(), 0, '0 years');
+        assert.equal(moment.duration('00:00').days(), 0, '0 days');
+        assert.equal(moment.duration('00:00').hours(), 0, '0 hours');
+        assert.equal(moment.duration('00:00').minutes(), 0, '0 minutes');
+        assert.equal(moment.duration('00:00').seconds(), 0, '0 seconds');
+        assert.equal(moment.duration('00:00').milliseconds(), 0, '0 milliseconds');
+    });
+
+    test('instantiation from 24-hour time <24 hours', function (assert) {
+        assert.equal(moment.duration('06:45').years(), 0, '0 years');
+        assert.equal(moment.duration('06:45').days(), 0, '0 days');
+        assert.equal(moment.duration('06:45').hours(), 6, '6 hours');
+        assert.equal(moment.duration('06:45').minutes(), 45, '45 minutes');
+        assert.equal(moment.duration('06:45').seconds(), 0, '0 seconds');
+        assert.equal(moment.duration('06:45').milliseconds(), 0, '0 milliseconds');
+    });
+
+    test('instantiation from 24-hour time >24 hours', function (assert) {
+        assert.equal(moment.duration('26:45').years(), 0, '0 years');
+        assert.equal(moment.duration('26:45').days(), 1, '0 days');
+        assert.equal(moment.duration('26:45').hours(), 2, '2 hours');
+        assert.equal(moment.duration('26:45').minutes(), 45, '45 minutes');
+        assert.equal(moment.duration('26:45').seconds(), 0, '0 seconds');
+        assert.equal(moment.duration('26:45').milliseconds(), 0, '0 milliseconds');
+    });
+
+    test('instatiation from serialized C# TimeSpan zero', function (assert) {
+        assert.equal(moment.duration('00:00:00').years(), 0, '0 years');
+        assert.equal(moment.duration('00:00:00').days(), 0, '0 days');
+        assert.equal(moment.duration('00:00:00').hours(), 0, '0 hours');
+        assert.equal(moment.duration('00:00:00').minutes(), 0, '0 minutes');
+        assert.equal(moment.duration('00:00:00').seconds(), 0, '0 seconds');
+        assert.equal(moment.duration('00:00:00').milliseconds(), 0, '0 milliseconds');
+    });
+
+    test('instatiation from serialized C# TimeSpan with days', function (assert) {
+        assert.equal(moment.duration('1.02:03:04.9999999').years(), 0, '0 years');
+        assert.equal(moment.duration('1.02:03:04.9999999').days(), 1, '1 day');
+        assert.equal(moment.duration('1.02:03:04.9999999').hours(), 2, '2 hours');
+        assert.equal(moment.duration('1.02:03:04.9999999').minutes(), 3, '3 minutes');
+        assert.equal(moment.duration('1.02:03:04.9999999').seconds(), 4, '4 seconds');
+        assert.equal(moment.duration('1.02:03:04.9999999').milliseconds(), 999, '999 milliseconds');
+    });
+
+    test('instatiation from serialized C# TimeSpan without days', function (assert) {
+        assert.equal(moment.duration('01:02:03.9999999').years(), 0, '0 years');
+        assert.equal(moment.duration('01:02:03.9999999').days(), 0, '0 days');
+        assert.equal(moment.duration('01:02:03.9999999').hours(), 1, '1 hour');
+        assert.equal(moment.duration('01:02:03.9999999').minutes(), 2, '2 minutes');
+        assert.equal(moment.duration('01:02:03.9999999').seconds(), 3, '3 seconds');
+        assert.equal(moment.duration('01:02:03.9999999').milliseconds(), 999, '999 milliseconds');
+
+        assert.equal(moment.duration('23:59:59.9999999').days(), 0, '0 days');
+        assert.equal(moment.duration('23:59:59.9999999').hours(), 23, '23 hours');
+
+        assert.equal(moment.duration('500:59:59.9999999').days(), 20, '500 hours overflows to 20 days');
+        assert.equal(moment.duration('500:59:59.9999999').hours(), 20, '500 hours overflows to 20 hours');
+    });
+
+    test('instatiation from serialized C# TimeSpan without days or milliseconds', function (assert) {
+        assert.equal(moment.duration('01:02:03').years(), 0, '0 years');
+        assert.equal(moment.duration('01:02:03').days(), 0, '0 days');
+        assert.equal(moment.duration('01:02:03').hours(), 1, '1 hour');
+        assert.equal(moment.duration('01:02:03').minutes(), 2, '2 minutes');
+        assert.equal(moment.duration('01:02:03').seconds(), 3, '3 seconds');
+        assert.equal(moment.duration('01:02:03').milliseconds(), 0, '0 milliseconds');
+    });
+
+    test('instatiation from serialized C# TimeSpan without milliseconds', function (assert) {
+        assert.equal(moment.duration('1.02:03:04').years(), 0, '0 years');
+        assert.equal(moment.duration('1.02:03:04').days(), 1, '1 day');
+        assert.equal(moment.duration('1.02:03:04').hours(), 2, '2 hours');
+        assert.equal(moment.duration('1.02:03:04').minutes(), 3, '3 minutes');
+        assert.equal(moment.duration('1.02:03:04').seconds(), 4, '4 seconds');
+        assert.equal(moment.duration('1.02:03:04').milliseconds(), 0, '0 milliseconds');
+    });
+
+    test('instatiation from serialized C# TimeSpan maxValue', function (assert) {
+        var d = moment.duration('10675199.02:48:05.4775807');
+
+        assert.equal(d.years(), 29227, '29227 years');
+        assert.equal(d.months(), 8, '8 months');
+        assert.equal(d.days(), 17, '17 day');  // this should be 13
+
+        assert.equal(d.hours(), 2, '2 hours');
+        assert.equal(d.minutes(), 48, '48 minutes');
+        assert.equal(d.seconds(), 5, '5 seconds');
+        assert.equal(d.milliseconds(), 477, '477 milliseconds');
+    });
+
+    test('instatiation from serialized C# TimeSpan minValue', function (assert) {
+        var d = moment.duration('-10675199.02:48:05.4775808');
+
+        assert.equal(d.years(), -29227, '29653 years');
+        assert.equal(d.months(), -8, '8 day');
+        assert.equal(d.days(), -17, '17 day'); // this should be 13
+
+        assert.equal(d.hours(), -2, '2 hours');
+        assert.equal(d.minutes(), -48, '48 minutes');
+        assert.equal(d.seconds(), -5, '5 seconds');
+        assert.equal(d.milliseconds(), -477, '477 milliseconds');
+    });
+
+    test('instantiation from ISO 8601 duration', function (assert) {
+        assert.equal(moment.duration('P1Y2M3DT4H5M6S').asSeconds(), moment.duration({y: 1, M: 2, d: 3, h: 4, m: 5, s: 6}).asSeconds(), 'all fields');
+        assert.equal(moment.duration('P1M').asSeconds(), moment.duration({M: 1}).asSeconds(), 'single month field');
+        assert.equal(moment.duration('PT1M').asSeconds(), moment.duration({m: 1}).asSeconds(), 'single minute field');
+        assert.equal(moment.duration('P1MT2H').asSeconds(), moment.duration({M: 1, h: 2}).asSeconds(), 'random fields missing');
+        assert.equal(moment.duration('-P60D').asSeconds(), moment.duration({d: -60}).asSeconds(), 'negative days');
+        assert.equal(moment.duration('PT0.5S').asSeconds(), moment.duration({s: 0.5}).asSeconds(), 'fractional seconds');
+        assert.equal(moment.duration('PT0,5S').asSeconds(), moment.duration({s: 0.5}).asSeconds(), 'fractional seconds (comma)');
+    });
+
+    test('serialization to ISO 8601 duration strings', function (assert) {
+        assert.equal(moment.duration({y: 1, M: 2, d: 3, h: 4, m: 5, s: 6}).toISOString(), 'P1Y2M3DT4H5M6S', 'all fields');
+        assert.equal(moment.duration({M: -1}).toISOString(), '-P1M', 'one month ago');
+        assert.equal(moment.duration({m: -1}).toISOString(), '-PT1M', 'one minute ago');
+        assert.equal(moment.duration({s: -0.5}).toISOString(), '-PT0.5S', 'one half second ago');
+        assert.equal(moment.duration({y: -0.5, M: 1}).toISOString(), '-P5M', 'a month after half a year ago');
+        assert.equal(moment.duration({}).toISOString(), 'P0D', 'zero duration');
+    });
+
+    test('toString acts as toISOString', function (assert) {
+        assert.equal(moment.duration({y: 1, M: 2, d: 3, h: 4, m: 5, s: 6}).toString(), 'P1Y2M3DT4H5M6S', 'all fields');
+        assert.equal(moment.duration({M: -1}).toString(), '-P1M', 'one month ago');
+        assert.equal(moment.duration({m: -1}).toString(), '-PT1M', 'one minute ago');
+        assert.equal(moment.duration({s: -0.5}).toString(), '-PT0.5S', 'one half second ago');
+        assert.equal(moment.duration({y: -0.5, M: 1}).toString(), '-P5M', 'a month after half a year ago');
+        assert.equal(moment.duration({}).toString(), 'P0D', 'zero duration');
+    });
+
+    test('toIsoString deprecation', function (assert) {
+        assert.equal(moment.duration({}).toIsoString(), moment.duration({}).toISOString(), 'toIsoString delegates to toISOString');
+    });
+
+    test('`isodate` (python) test cases', function (assert) {
+        assert.equal(moment.duration('P18Y9M4DT11H9M8S').asSeconds(), moment.duration({y: 18, M: 9, d: 4, h: 11, m: 9, s: 8}).asSeconds(), 'python isodate 1');
+        assert.equal(moment.duration('P2W').asSeconds(), moment.duration({w: 2}).asSeconds(), 'python isodate 2');
+        assert.equal(moment.duration('P3Y6M4DT12H30M5S').asSeconds(), moment.duration({y: 3, M: 6, d: 4, h: 12, m: 30, s: 5}).asSeconds(), 'python isodate 3');
+        assert.equal(moment.duration('P23DT23H').asSeconds(), moment.duration({d: 23, h: 23}).asSeconds(), 'python isodate 4');
+        assert.equal(moment.duration('P4Y').asSeconds(), moment.duration({y: 4}).asSeconds(), 'python isodate 5');
+        assert.equal(moment.duration('P1M').asSeconds(), moment.duration({M: 1}).asSeconds(), 'python isodate 6');
+        assert.equal(moment.duration('PT1M').asSeconds(), moment.duration({m: 1}).asSeconds(), 'python isodate 7');
+        assert.equal(moment.duration('P0.5Y').asSeconds(), moment.duration({y: 0.5}).asSeconds(), 'python isodate 8');
+        assert.equal(moment.duration('PT36H').asSeconds(), moment.duration({h: 36}).asSeconds(), 'python isodate 9');
+        assert.equal(moment.duration('P1DT12H').asSeconds(), moment.duration({d: 1, h: 12}).asSeconds(), 'python isodate 10');
+        assert.equal(moment.duration('-P2W').asSeconds(), moment.duration({w: -2}).asSeconds(), 'python isodate 11');
+        assert.equal(moment.duration('-P2.2W').asSeconds(), moment.duration({w: -2.2}).asSeconds(), 'python isodate 12');
+        assert.equal(moment.duration('P1DT2H3M4S').asSeconds(), moment.duration({d: 1, h: 2, m: 3, s: 4}).asSeconds(), 'python isodate 13');
+        assert.equal(moment.duration('P1DT2H3M').asSeconds(), moment.duration({d: 1, h: 2, m: 3}).asSeconds(), 'python isodate 14');
+        assert.equal(moment.duration('P1DT2H').asSeconds(), moment.duration({d: 1, h: 2}).asSeconds(), 'python isodate 15');
+        assert.equal(moment.duration('PT2H').asSeconds(), moment.duration({h: 2}).asSeconds(), 'python isodate 16');
+        assert.equal(moment.duration('PT2.3H').asSeconds(), moment.duration({h: 2.3}).asSeconds(), 'python isodate 17');
+        assert.equal(moment.duration('PT2H3M4S').asSeconds(), moment.duration({h: 2, m: 3, s: 4}).asSeconds(), 'python isodate 18');
+        assert.equal(moment.duration('PT3M4S').asSeconds(), moment.duration({m: 3, s: 4}).asSeconds(), 'python isodate 19');
+        assert.equal(moment.duration('PT22S').asSeconds(), moment.duration({s: 22}).asSeconds(), 'python isodate 20');
+        assert.equal(moment.duration('PT22.22S').asSeconds(), moment.duration({s: 22.22}).asSeconds(), 'python isodate 21');
+        assert.equal(moment.duration('-P2Y').asSeconds(), moment.duration({y: -2}).asSeconds(), 'python isodate 22');
+        assert.equal(moment.duration('-P3Y6M4DT12H30M5S').asSeconds(), moment.duration({y: -3, M: -6, d: -4, h: -12, m: -30, s: -5}).asSeconds(), 'python isodate 23');
+        assert.equal(moment.duration('-P1DT2H3M4S').asSeconds(), moment.duration({d: -1, h: -2, m: -3, s: -4}).asSeconds(), 'python isodate 24');
+    });
+
+    test('ISO 8601 misuse cases', function (assert) {
+        assert.equal(moment.duration('P').asSeconds(), 0, 'lonely P');
+        assert.equal(moment.duration('PT').asSeconds(), 0, 'just P and T');
+        assert.equal(moment.duration('P1H').asSeconds(), 0, 'missing T');
+        assert.equal(moment.duration('P1D1Y').asSeconds(), 0, 'out of order');
+        assert.equal(moment.duration('PT.5S').asSeconds(), 0.5, 'accept no leading zero for decimal');
+        assert.equal(moment.duration('PT1,S').asSeconds(), 1, 'accept trailing decimal separator');
+        assert.equal(moment.duration('PT1M0,,5S').asSeconds(), 60, 'extra decimal separators are ignored as 0');
+        assert.equal(moment.duration('P-1DS').asSeconds(), 0, 'wrong position of negative');
+    });
+
+    test('humanize', function (assert) {
+        moment.locale('en');
+        assert.equal(moment.duration({seconds: 44}).humanize(),  'a few seconds', '44 seconds = a few seconds');
+        assert.equal(moment.duration({seconds: 45}).humanize(),  'a minute',      '45 seconds = a minute');
+        assert.equal(moment.duration({seconds: 89}).humanize(),  'a minute',      '89 seconds = a minute');
+        assert.equal(moment.duration({seconds: 90}).humanize(),  '2 minutes',     '90 seconds = 2 minutes');
+        assert.equal(moment.duration({minutes: 44}).humanize(),  '44 minutes',    '44 minutes = 44 minutes');
+        assert.equal(moment.duration({minutes: 45}).humanize(),  'an hour',       '45 minutes = an hour');
+        assert.equal(moment.duration({minutes: 89}).humanize(),  'an hour',       '89 minutes = an hour');
+        assert.equal(moment.duration({minutes: 90}).humanize(),  '2 hours',       '90 minutes = 2 hours');
+        assert.equal(moment.duration({hours: 5}).humanize(),     '5 hours',       '5 hours = 5 hours');
+        assert.equal(moment.duration({hours: 21}).humanize(),    '21 hours',      '21 hours = 21 hours');
+        assert.equal(moment.duration({hours: 22}).humanize(),    'a day',         '22 hours = a day');
+        assert.equal(moment.duration({hours: 35}).humanize(),    'a day',         '35 hours = a day');
+        assert.equal(moment.duration({hours: 36}).humanize(),    '2 days',        '36 hours = 2 days');
+        assert.equal(moment.duration({days: 1}).humanize(),      'a day',         '1 day = a day');
+        assert.equal(moment.duration({days: 5}).humanize(),      '5 days',        '5 days = 5 days');
+        assert.equal(moment.duration({weeks: 1}).humanize(),     '7 days',        '1 week = 7 days');
+        assert.equal(moment.duration({days: 25}).humanize(),     '25 days',       '25 days = 25 days');
+        assert.equal(moment.duration({days: 26}).humanize(),     'a month',       '26 days = a month');
+        assert.equal(moment.duration({days: 30}).humanize(),     'a month',       '30 days = a month');
+        assert.equal(moment.duration({days: 45}).humanize(),     'a month',       '45 days = a month');
+        assert.equal(moment.duration({days: 46}).humanize(),     '2 months',      '46 days = 2 months');
+        assert.equal(moment.duration({days: 74}).humanize(),     '2 months',      '74 days = 2 months');
+        assert.equal(moment.duration({days: 77}).humanize(),     '3 months',      '77 days = 3 months');
+        assert.equal(moment.duration({months: 1}).humanize(),    'a month',       '1 month = a month');
+        assert.equal(moment.duration({months: 5}).humanize(),    '5 months',      '5 months = 5 months');
+        assert.equal(moment.duration({days: 344}).humanize(),    'a year',        '344 days = a year');
+        assert.equal(moment.duration({days: 345}).humanize(),    'a year',        '345 days = a year');
+        assert.equal(moment.duration({days: 547}).humanize(),    'a year',        '547 days = a year');
+        assert.equal(moment.duration({days: 548}).humanize(),    '2 years',       '548 days = 2 years');
+        assert.equal(moment.duration({years: 1}).humanize(),     'a year',        '1 year = a year');
+        assert.equal(moment.duration({years: 5}).humanize(),     '5 years',       '5 years = 5 years');
+        assert.equal(moment.duration(7200000).humanize(),        '2 hours',       '7200000 = 2 minutes');
+    });
+
+    test('humanize duration with suffix', function (assert) {
+        moment.locale('en');
+        assert.equal(moment.duration({seconds:  44}).humanize(true),  'in a few seconds', '44 seconds = a few seconds');
+        assert.equal(moment.duration({seconds: -44}).humanize(true),  'a few seconds ago', '44 seconds = a few seconds');
+    });
+
+    test('bubble value up', function (assert) {
+        assert.equal(moment.duration({milliseconds: 61001}).milliseconds(), 1, '61001 milliseconds has 1 millisecond left over');
+        assert.equal(moment.duration({milliseconds: 61001}).seconds(),      1, '61001 milliseconds has 1 second left over');
+        assert.equal(moment.duration({milliseconds: 61001}).minutes(),      1, '61001 milliseconds has 1 minute left over');
+
+        assert.equal(moment.duration({minutes: 350}).minutes(), 50, '350 minutes has 50 minutes left over');
+        assert.equal(moment.duration({minutes: 350}).hours(),   5,  '350 minutes has 5 hours left over');
+    });
+
+    test('clipping', function (assert) {
+        assert.equal(moment.duration({months: 11}).months(), 11, '11 months is 11 months');
+        assert.equal(moment.duration({months: 11}).years(),  0,  '11 months makes no year');
+        assert.equal(moment.duration({months: 12}).months(), 0,  '12 months is 0 months left over');
+        assert.equal(moment.duration({months: 12}).years(),  1,  '12 months makes 1 year');
+        assert.equal(moment.duration({months: 13}).months(), 1,  '13 months is 1 month left over');
+        assert.equal(moment.duration({months: 13}).years(),  1,  '13 months makes 1 year');
+
+        assert.equal(moment.duration({days: 29}).days(),   29, '29 days is 29 days');
+        assert.equal(moment.duration({days: 29}).months(), 0,  '29 days makes no month');
+        assert.equal(moment.duration({days: 30}).days(),   0,  '30 days is 0 days left over');
+        assert.equal(moment.duration({days: 30}).months(), 1,  '30 days is a month');
+        assert.equal(moment.duration({days: 31}).days(),   1,  '31 days is 1 day left over');
+        assert.equal(moment.duration({days: 31}).months(), 1,  '31 days is a month');
+
+        assert.equal(moment.duration({hours: 23}).hours(), 23, '23 hours is 23 hours');
+        assert.equal(moment.duration({hours: 23}).days(),  0,  '23 hours makes no day');
+        assert.equal(moment.duration({hours: 24}).hours(), 0,  '24 hours is 0 hours left over');
+        assert.equal(moment.duration({hours: 24}).days(),  1,  '24 hours makes 1 day');
+        assert.equal(moment.duration({hours: 25}).hours(), 1,  '25 hours is 1 hour left over');
+        assert.equal(moment.duration({hours: 25}).days(),  1,  '25 hours makes 1 day');
+    });
+
+    test('effective equivalency', function (assert) {
+        assert.deepEqual(moment.duration({seconds: 1})._data,  moment.duration({milliseconds: 1000})._data, '1 second is the same as 1000 milliseconds');
+        assert.deepEqual(moment.duration({seconds: 60})._data, moment.duration({minutes: 1})._data,         '1 minute is the same as 60 seconds');
+        assert.deepEqual(moment.duration({minutes: 60})._data, moment.duration({hours: 1})._data,           '1 hour is the same as 60 minutes');
+        assert.deepEqual(moment.duration({hours: 24})._data,   moment.duration({days: 1})._data,            '1 day is the same as 24 hours');
+        assert.deepEqual(moment.duration({days: 7})._data,     moment.duration({weeks: 1})._data,           '1 week is the same as 7 days');
+        assert.deepEqual(moment.duration({days: 30})._data,    moment.duration({months: 1})._data,          '1 month is the same as 30 days');
+        assert.deepEqual(moment.duration({months: 12})._data,  moment.duration({years: 1})._data,           '1 years is the same as 12 months');
+    });
+
+    test('asGetters', function (assert) {
+        // 400 years have exactly 146097 days
+
+        // years
+        assert.equal(moment.duration(1, 'year').asYears(),            1,           '1 year as years');
+        assert.equal(moment.duration(1, 'year').asMonths(),           12,          '1 year as months');
+        assert.equal(moment.duration(400, 'year').asMonths(),         4800,        '400 years as months');
+        assert.equal(moment.duration(1, 'year').asWeeks().toFixed(3), 52.143,      '1 year as weeks');
+        assert.equal(moment.duration(1, 'year').asDays(),             365,         '1 year as days');
+        assert.equal(moment.duration(2, 'year').asDays(),             730,         '2 years as days');
+        assert.equal(moment.duration(3, 'year').asDays(),             1096,        '3 years as days');
+        assert.equal(moment.duration(4, 'year').asDays(),             1461,        '4 years as days');
+        assert.equal(moment.duration(400, 'year').asDays(),           146097,      '400 years as days');
+        assert.equal(moment.duration(1, 'year').asHours(),            8760,        '1 year as hours');
+        assert.equal(moment.duration(1, 'year').asMinutes(),          525600,      '1 year as minutes');
+        assert.equal(moment.duration(1, 'year').asSeconds(),          31536000,    '1 year as seconds');
+        assert.equal(moment.duration(1, 'year').asMilliseconds(),     31536000000, '1 year as milliseconds');
+
+        // months
+        assert.equal(moment.duration(1, 'month').asYears().toFixed(4), 0.0833,     '1 month as years');
+        assert.equal(moment.duration(1, 'month').asMonths(),           1,          '1 month as months');
+        assert.equal(moment.duration(1, 'month').asWeeks().toFixed(3), 4.286,      '1 month as weeks');
+        assert.equal(moment.duration(1, 'month').asDays(),             30,         '1 month as days');
+        assert.equal(moment.duration(2, 'month').asDays(),             61,         '2 months as days');
+        assert.equal(moment.duration(3, 'month').asDays(),             91,         '3 months as days');
+        assert.equal(moment.duration(4, 'month').asDays(),             122,        '4 months as days');
+        assert.equal(moment.duration(5, 'month').asDays(),             152,        '5 months as days');
+        assert.equal(moment.duration(6, 'month').asDays(),             183,        '6 months as days');
+        assert.equal(moment.duration(7, 'month').asDays(),             213,        '7 months as days');
+        assert.equal(moment.duration(8, 'month').asDays(),             243,        '8 months as days');
+        assert.equal(moment.duration(9, 'month').asDays(),             274,        '9 months as days');
+        assert.equal(moment.duration(10, 'month').asDays(),            304,        '10 months as days');
+        assert.equal(moment.duration(11, 'month').asDays(),            335,        '11 months as days');
+        assert.equal(moment.duration(12, 'month').asDays(),            365,        '12 months as days');
+        assert.equal(moment.duration(24, 'month').asDays(),            730,        '24 months as days');
+        assert.equal(moment.duration(36, 'month').asDays(),            1096,       '36 months as days');
+        assert.equal(moment.duration(48, 'month').asDays(),            1461,       '48 months as days');
+        assert.equal(moment.duration(4800, 'month').asDays(),          146097,     '4800 months as days');
+        assert.equal(moment.duration(1, 'month').asHours(),            720,        '1 month as hours');
+        assert.equal(moment.duration(1, 'month').asMinutes(),          43200,      '1 month as minutes');
+        assert.equal(moment.duration(1, 'month').asSeconds(),          2592000,    '1 month as seconds');
+        assert.equal(moment.duration(1, 'month').asMilliseconds(),     2592000000, '1 month as milliseconds');
+
+        // weeks
+        assert.equal(moment.duration(1, 'week').asYears().toFixed(4),  0.0192,    '1 week as years');
+        assert.equal(moment.duration(1, 'week').asMonths().toFixed(3), 0.230,     '1 week as months');
+        assert.equal(moment.duration(1, 'week').asWeeks(),             1,         '1 week as weeks');
+        assert.equal(moment.duration(1, 'week').asDays(),              7,         '1 week as days');
+        assert.equal(moment.duration(1, 'week').asHours(),             168,       '1 week as hours');
+        assert.equal(moment.duration(1, 'week').asMinutes(),           10080,     '1 week as minutes');
+        assert.equal(moment.duration(1, 'week').asSeconds(),           604800,    '1 week as seconds');
+        assert.equal(moment.duration(1, 'week').asMilliseconds(),      604800000, '1 week as milliseconds');
+
+        // days
+        assert.equal(moment.duration(1, 'day').asYears().toFixed(4),  0.0027,   '1 day as years');
+        assert.equal(moment.duration(1, 'day').asMonths().toFixed(3), 0.033,    '1 day as months');
+        assert.equal(moment.duration(1, 'day').asWeeks().toFixed(3),  0.143,    '1 day as weeks');
+        assert.equal(moment.duration(1, 'day').asDays(),              1,        '1 day as days');
+        assert.equal(moment.duration(1, 'day').asHours(),             24,       '1 day as hours');
+        assert.equal(moment.duration(1, 'day').asMinutes(),           1440,     '1 day as minutes');
+        assert.equal(moment.duration(1, 'day').asSeconds(),           86400,    '1 day as seconds');
+        assert.equal(moment.duration(1, 'day').asMilliseconds(),      86400000, '1 day as milliseconds');
+
+        // hours
+        assert.equal(moment.duration(1, 'hour').asYears().toFixed(6),  0.000114, '1 hour as years');
+        assert.equal(moment.duration(1, 'hour').asMonths().toFixed(5), 0.00137,  '1 hour as months');
+        assert.equal(moment.duration(1, 'hour').asWeeks().toFixed(5),  0.00595,  '1 hour as weeks');
+        assert.equal(moment.duration(1, 'hour').asDays().toFixed(4),   0.0417,   '1 hour as days');
+        assert.equal(moment.duration(1, 'hour').asHours(),             1,        '1 hour as hours');
+        assert.equal(moment.duration(1, 'hour').asMinutes(),           60,       '1 hour as minutes');
+        assert.equal(moment.duration(1, 'hour').asSeconds(),           3600,     '1 hour as seconds');
+        assert.equal(moment.duration(1, 'hour').asMilliseconds(),      3600000,  '1 hour as milliseconds');
+
+        // minutes
+        assert.equal(moment.duration(1, 'minute').asYears().toFixed(8),  0.00000190, '1 minute as years');
+        assert.equal(moment.duration(1, 'minute').asMonths().toFixed(7), 0.0000228,  '1 minute as months');
+        assert.equal(moment.duration(1, 'minute').asWeeks().toFixed(7),  0.0000992,  '1 minute as weeks');
+        assert.equal(moment.duration(1, 'minute').asDays().toFixed(6),   0.000694,   '1 minute as days');
+        assert.equal(moment.duration(1, 'minute').asHours().toFixed(4),  0.0167,     '1 minute as hours');
+        assert.equal(moment.duration(1, 'minute').asMinutes(),           1,          '1 minute as minutes');
+        assert.equal(moment.duration(1, 'minute').asSeconds(),           60,         '1 minute as seconds');
+        assert.equal(moment.duration(1, 'minute').asMilliseconds(),      60000,      '1 minute as milliseconds');
+
+        // seconds
+        assert.equal(moment.duration(1, 'second').asYears().toFixed(10),  0.0000000317, '1 second as years');
+        assert.equal(moment.duration(1, 'second').asMonths().toFixed(9),  0.000000380,  '1 second as months');
+        assert.equal(moment.duration(1, 'second').asWeeks().toFixed(8),   0.00000165,   '1 second as weeks');
+        assert.equal(moment.duration(1, 'second').asDays().toFixed(7),    0.0000116,    '1 second as days');
+        assert.equal(moment.duration(1, 'second').asHours().toFixed(6),   0.000278,     '1 second as hours');
+        assert.equal(moment.duration(1, 'second').asMinutes().toFixed(4), 0.0167,       '1 second as minutes');
+        assert.equal(moment.duration(1, 'second').asSeconds(),            1,            '1 second as seconds');
+        assert.equal(moment.duration(1, 'second').asMilliseconds(),       1000,         '1 second as milliseconds');
+
+        // milliseconds
+        assert.equal(moment.duration(1, 'millisecond').asYears().toFixed(13),  0.0000000000317, '1 millisecond as years');
+        assert.equal(moment.duration(1, 'millisecond').asMonths().toFixed(12), 0.000000000380,  '1 millisecond as months');
+        assert.equal(moment.duration(1, 'millisecond').asWeeks().toFixed(11),  0.00000000165,   '1 millisecond as weeks');
+        assert.equal(moment.duration(1, 'millisecond').asDays().toFixed(10),   0.0000000116,    '1 millisecond as days');
+        assert.equal(moment.duration(1, 'millisecond').asHours().toFixed(9),   0.000000278,     '1 millisecond as hours');
+        assert.equal(moment.duration(1, 'millisecond').asMinutes().toFixed(7), 0.0000167,       '1 millisecond as minutes');
+        assert.equal(moment.duration(1, 'millisecond').asSeconds(),            0.001,           '1 millisecond as seconds');
+        assert.equal(moment.duration(1, 'millisecond').asMilliseconds(),       1,               '1 millisecond as milliseconds');
+    });
+
+    test('as getters for small units', function (assert) {
+        var dS = moment.duration(1, 'milliseconds'),
+            ds = moment.duration(3, 'seconds'),
+            dm = moment.duration(13, 'minutes');
+
+        // Tests for issue #1867.
+        // Floating point errors for small duration units were introduced in version 2.8.0.
+        assert.equal(dS.as('milliseconds'), 1, 'as("milliseconds")');
+        assert.equal(dS.asMilliseconds(),   1, 'asMilliseconds()');
+        assert.equal(ds.as('seconds'),      3, 'as("seconds")');
+        assert.equal(ds.asSeconds(),        3, 'asSeconds()');
+        assert.equal(dm.as('minutes'),      13, 'as("minutes")');
+        assert.equal(dm.asMinutes(),        13, 'asMinutes()');
+    });
+
+    test('isDuration', function (assert) {
+        assert.ok(moment.isDuration(moment.duration(12345678)), 'correctly says true');
+        assert.ok(!moment.isDuration(moment()), 'moment object is not a duration');
+        assert.ok(!moment.isDuration({milliseconds: 1}), 'plain object is not a duration');
+    });
+
+    test('add', function (assert) {
+        var d = moment.duration({months: 4, weeks: 3, days: 2});
+        // for some reason, d._data._months does not get updated; use d._months instead.
+        assert.equal(d.add(1, 'month')._months, 5, 'Add months');
+        assert.equal(d.add(5, 'days')._days, 28, 'Add days');
+        assert.equal(d.add(10000)._milliseconds, 10000, 'Add milliseconds');
+        assert.equal(d.add({h: 23, m: 59})._milliseconds, 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 10000, 'Add hour:minute');
+    });
+
+    test('add and bubble', function (assert) {
+        assert.equal(moment.duration(1, 'second').add(1000, 'milliseconds').seconds(), 2, 'Adding milliseconds should bubble up to seconds');
+        assert.equal(moment.duration(1, 'minute').add(60, 'second').minutes(), 2, 'Adding seconds should bubble up to minutes');
+        assert.equal(moment.duration(1, 'hour').add(60, 'minutes').hours(), 2, 'Adding minutes should bubble up to hours');
+        assert.equal(moment.duration(1, 'day').add(24, 'hours').days(), 2, 'Adding hours should bubble up to days');
+    });
+
+    test('subtract and bubble', function (assert) {
+        assert.equal(moment.duration(2, 'second').subtract(1000, 'milliseconds').seconds(), 1, 'Subtracting milliseconds should bubble up to seconds');
+        assert.equal(moment.duration(2, 'minute').subtract(60, 'second').minutes(), 1, 'Subtracting seconds should bubble up to minutes');
+        assert.equal(moment.duration(2, 'hour').subtract(60, 'minutes').hours(), 1, 'Subtracting minutes should bubble up to hours');
+        assert.equal(moment.duration(2, 'day').subtract(24, 'hours').days(), 1, 'Subtracting hours should bubble up to days');
+    });
+
+    test('subtract', function (assert) {
+        var d = moment.duration({months: 2, weeks: 2, days: 0, hours: 5});
+        // for some reason, d._data._months does not get updated; use d._months instead.
+        assert.equal(d.subtract(1, 'months')._months, 1, 'Subtract months');
+        assert.equal(d.subtract(14, 'days')._days, 0, 'Subtract days');
+        assert.equal(d.subtract(10000)._milliseconds, 5 * 60 * 60 * 1000 - 10000, 'Subtract milliseconds');
+        assert.equal(d.subtract({h: 1, m: 59})._milliseconds, 3 * 60 * 60 * 1000 + 1 * 60 * 1000 - 10000, 'Subtract hour:minute');
+    });
+
+    test('JSON.stringify duration', function (assert) {
+        var d = moment.duration(1024, 'h');
+
+        assert.equal(JSON.stringify(d), '"' + d.toISOString() + '"', 'JSON.stringify on duration should return ISO string');
+    });
+
+    test('duration plugins', function (assert) {
+        var durationObject = moment.duration();
+        moment.duration.fn.foo = function (arg) {
+            assert.equal(this, durationObject);
+            assert.equal(arg, 5);
+        };
+        durationObject.foo(5);
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('duration from moments');
+
+    test('pure year diff', function (assert) {
+        var m1 = moment('2012-01-01T00:00:00.000Z'),
+            m2 = moment('2013-01-01T00:00:00.000Z');
+
+        assert.equal(moment.duration({from: m1, to: m2}).as('years'), 1, 'year moment difference');
+        assert.equal(moment.duration({from: m2, to: m1}).as('years'), -1, 'negative year moment difference');
+    });
+
+    test('month and day diff', function (assert) {
+        var m1 = moment('2012-01-15T00:00:00.000Z'),
+            m2 = moment('2012-02-17T00:00:00.000Z'),
+            d = moment.duration({from: m1, to: m2});
+
+        assert.equal(d.get('days'), 2);
+        assert.equal(d.get('months'), 1);
+    });
+
+    test('day diff, separate months', function (assert) {
+        var m1 = moment('2012-01-15T00:00:00.000Z'),
+            m2 = moment('2012-02-13T00:00:00.000Z'),
+            d = moment.duration({from: m1, to: m2});
+
+        assert.equal(d.as('days'), 29);
+    });
+
+    test('hour diff', function (assert) {
+        var m1 = moment('2012-01-15T17:00:00.000Z'),
+            m2 = moment('2012-01-16T03:00:00.000Z'),
+            d = moment.duration({from: m1, to: m2});
+
+        assert.equal(d.as('hours'), 10);
+    });
+
+    test('minute diff', function (assert) {
+        var m1 = moment('2012-01-15T17:45:00.000Z'),
+            m2 = moment('2012-01-16T03:15:00.000Z'),
+            d = moment.duration({from: m1, to: m2});
+
+        assert.equal(d.as('hours'), 9.5);
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('format');
+
+    test('format YY', function (assert) {
+        var b = moment(new Date(2009, 1, 14, 15, 25, 50, 125));
+        assert.equal(b.format('YY'), '09', 'YY ---> 09');
+    });
+
+    test('format escape brackets', function (assert) {
+        moment.locale('en');
+
+        var b = moment(new Date(2009, 1, 14, 15, 25, 50, 125));
+        assert.equal(b.format('[day]'), 'day', 'Single bracket');
+        assert.equal(b.format('[day] YY [YY]'), 'day 09 YY', 'Double bracket');
+        assert.equal(b.format('[YY'), '[09', 'Un-ended bracket');
+        assert.equal(b.format('[[YY]]'), '[YY]', 'Double nested brackets');
+        assert.equal(b.format('[[]'), '[', 'Escape open bracket');
+        assert.equal(b.format('[Last]'), 'Last', 'localized tokens');
+        assert.equal(b.format('[L] L'), 'L 02/14/2009', 'localized tokens with escaped localized tokens');
+        assert.equal(b.format('[L LL LLL LLLL aLa]'), 'L LL LLL LLLL aLa', 'localized tokens with escaped localized tokens');
+        assert.equal(b.format('[LLL] LLL'), 'LLL February 14, 2009 3:25 PM', 'localized tokens with escaped localized tokens (recursion)');
+        assert.equal(b.format('YYYY[\n]DD[\n]'), '2009\n14\n', 'Newlines');
+    });
+
+    test('handle negative years', function (assert) {
+        moment.locale('en');
+        assert.equal(moment.utc().year(-1).format('YY'), '-01', 'YY with negative year');
+        assert.equal(moment.utc().year(-1).format('YYYY'), '-0001', 'YYYY with negative year');
+        assert.equal(moment.utc().year(-12).format('YY'), '-12', 'YY with negative year');
+        assert.equal(moment.utc().year(-12).format('YYYY'), '-0012', 'YYYY with negative year');
+        assert.equal(moment.utc().year(-123).format('YY'), '-23', 'YY with negative year');
+        assert.equal(moment.utc().year(-123).format('YYYY'), '-0123', 'YYYY with negative year');
+        assert.equal(moment.utc().year(-1234).format('YY'), '-34', 'YY with negative year');
+        assert.equal(moment.utc().year(-1234).format('YYYY'), '-1234', 'YYYY with negative year');
+        assert.equal(moment.utc().year(-12345).format('YY'), '-45', 'YY with negative year');
+        assert.equal(moment.utc().year(-12345).format('YYYY'), '-12345', 'YYYY with negative year');
+    });
+
+    test('format milliseconds', function (assert) {
+        var b = moment(new Date(2009, 1, 14, 15, 25, 50, 123));
+        assert.equal(b.format('S'), '1', 'Deciseconds');
+        assert.equal(b.format('SS'), '12', 'Centiseconds');
+        assert.equal(b.format('SSS'), '123', 'Milliseconds');
+        b.milliseconds(789);
+        assert.equal(b.format('S'), '7', 'Deciseconds');
+        assert.equal(b.format('SS'), '78', 'Centiseconds');
+        assert.equal(b.format('SSS'), '789', 'Milliseconds');
+    });
+
+    test('format timezone', function (assert) {
+        var b = moment(new Date(2010, 1, 14, 15, 25, 50, 125));
+        assert.ok(b.format('Z').match(/^[\+\-]\d\d:\d\d$/), b.format('Z') + ' should be something like \'+07:30\'');
+        assert.ok(b.format('ZZ').match(/^[\+\-]\d{4}$/), b.format('ZZ') + ' should be something like \'+0700\'');
+    });
+
+    test('format multiple with utc offset', function (assert) {
+        var b = moment('2012-10-08 -1200', ['YYYY-MM-DD HH:mm ZZ', 'YYYY-MM-DD ZZ', 'YYYY-MM-DD']);
+        assert.equal(b.format('YYYY-MM'), '2012-10', 'Parsing multiple formats should not crash with different sized formats');
+    });
+
+    test('isDST', function (assert) {
+        var janOffset = new Date(2011, 0, 1).getTimezoneOffset(),
+            julOffset = new Date(2011, 6, 1).getTimezoneOffset(),
+            janIsDst = janOffset < julOffset,
+            julIsDst = julOffset < janOffset,
+            jan1 = moment([2011]),
+            jul1 = moment([2011, 6]);
+
+        if (janIsDst && julIsDst) {
+            assert.ok(0, 'January and July cannot both be in DST');
+            assert.ok(0, 'January and July cannot both be in DST');
+        } else if (janIsDst) {
+            assert.ok(jan1.isDST(), 'January 1 is DST');
+            assert.ok(!jul1.isDST(), 'July 1 is not DST');
+        } else if (julIsDst) {
+            assert.ok(!jan1.isDST(), 'January 1 is not DST');
+            assert.ok(jul1.isDST(), 'July 1 is DST');
+        } else {
+            assert.ok(!jan1.isDST(), 'January 1 is not DST');
+            assert.ok(!jul1.isDST(), 'July 1 is not DST');
+        }
+    });
+
+    test('unix timestamp', function (assert) {
+        var m = moment('1234567890.123', 'X');
+        assert.equal(m.format('X'), '1234567890', 'unix timestamp without milliseconds');
+        assert.equal(m.format('X.S'), '1234567890.1', 'unix timestamp with deciseconds');
+        assert.equal(m.format('X.SS'), '1234567890.12', 'unix timestamp with centiseconds');
+        assert.equal(m.format('X.SSS'), '1234567890.123', 'unix timestamp with milliseconds');
+
+        m = moment(1234567890.123, 'X');
+        assert.equal(m.format('X'), '1234567890', 'unix timestamp as integer');
+    });
+
+    test('unix offset milliseconds', function (assert) {
+        var m = moment('1234567890123', 'x');
+        assert.equal(m.format('x'), '1234567890123', 'unix offset in milliseconds');
+
+        m = moment(1234567890123, 'x');
+        assert.equal(m.format('x'), '1234567890123', 'unix offset in milliseconds as integer');
+    });
+
+    test('utcOffset sanity checks', function (assert) {
+        assert.equal(moment().utcOffset() % 15, 0,
+                'utc offset should be a multiple of 15 (was ' + moment().utcOffset() + ')');
+
+        assert.equal(moment().utcOffset(), -(new Date()).getTimezoneOffset(),
+            'utcOffset should return the opposite of getTimezoneOffset');
+    });
+
+    test('default format', function (assert) {
+        var isoRegex = /\d{4}.\d\d.\d\dT\d\d.\d\d.\d\d[\+\-]\d\d:\d\d/;
+        assert.ok(isoRegex.exec(moment().format()), 'default format (' + moment().format() + ') should match ISO');
+    });
+
+    test('toJSON', function (assert) {
+        var supportsJson = typeof JSON !== 'undefined' && JSON.stringify && JSON.stringify.call,
+            date = moment('2012-10-09T21:30:40.678+0100');
+
+        assert.equal(date.toJSON(), '2012-10-09T20:30:40.678Z', 'should output ISO8601 on moment.fn.toJSON');
+
+        if (supportsJson) {
+            assert.equal(JSON.stringify({
+                date : date
+            }), '{"date":"2012-10-09T20:30:40.678Z"}', 'should output ISO8601 on JSON.stringify');
+        }
+    });
+
+    test('toISOString', function (assert) {
+        var date = moment.utc('2012-10-09T20:30:40.678');
+
+        assert.equal(date.toISOString(), '2012-10-09T20:30:40.678Z', 'should output ISO8601 on moment.fn.toISOString');
+
+        // big years
+        date = moment.utc('+020123-10-09T20:30:40.678');
+        assert.equal(date.toISOString(), '+020123-10-09T20:30:40.678Z', 'ISO8601 format on big positive year');
+        // negative years
+        date = moment.utc('-000001-10-09T20:30:40.678');
+        assert.equal(date.toISOString(), '-000001-10-09T20:30:40.678Z', 'ISO8601 format on negative year');
+        // big negative years
+        date = moment.utc('-020123-10-09T20:30:40.678');
+        assert.equal(date.toISOString(), '-020123-10-09T20:30:40.678Z', 'ISO8601 format on big negative year');
+    });
+
+    test('long years', function (assert) {
+        assert.equal(moment.utc().year(2).format('YYYYYY'), '+000002', 'small year with YYYYYY');
+        assert.equal(moment.utc().year(2012).format('YYYYYY'), '+002012', 'regular year with YYYYYY');
+        assert.equal(moment.utc().year(20123).format('YYYYYY'), '+020123', 'big year with YYYYYY');
+
+        assert.equal(moment.utc().year(-1).format('YYYYYY'), '-000001', 'small negative year with YYYYYY');
+        assert.equal(moment.utc().year(-2012).format('YYYYYY'), '-002012', 'negative year with YYYYYY');
+        assert.equal(moment.utc().year(-20123).format('YYYYYY'), '-020123', 'big negative year with YYYYYY');
+    });
+
+    test('iso week formats', function (assert) {
+        // http://en.wikipedia.org/wiki/ISO_week_date
+        var cases = {
+            '2005-01-02': '2004-53',
+            '2005-12-31': '2005-52',
+            '2007-01-01': '2007-01',
+            '2007-12-30': '2007-52',
+            '2007-12-31': '2008-01',
+            '2008-01-01': '2008-01',
+            '2008-12-28': '2008-52',
+            '2008-12-29': '2009-01',
+            '2008-12-30': '2009-01',
+            '2008-12-31': '2009-01',
+            '2009-01-01': '2009-01',
+            '2009-12-31': '2009-53',
+            '2010-01-01': '2009-53',
+            '2010-01-02': '2009-53',
+            '2010-01-03': '2009-53',
+            '404-12-31': '0404-53',
+            '405-12-31': '0405-52'
+        }, i, isoWeek, formatted2, formatted1;
+
+        for (i in cases) {
+            isoWeek = cases[i].split('-').pop();
+            formatted2 = moment(i, 'YYYY-MM-DD').format('WW');
+            assert.equal(isoWeek, formatted2, i + ': WW should be ' + isoWeek + ', but ' + formatted2);
+            isoWeek = isoWeek.replace(/^0+/, '');
+            formatted1 = moment(i, 'YYYY-MM-DD').format('W');
+            assert.equal(isoWeek, formatted1, i + ': W should be ' + isoWeek + ', but ' + formatted1);
+        }
+    });
+
+    test('iso week year formats', function (assert) {
+        // http://en.wikipedia.org/wiki/ISO_week_date
+        var cases = {
+            '2005-01-02': '2004-53',
+            '2005-12-31': '2005-52',
+            '2007-01-01': '2007-01',
+            '2007-12-30': '2007-52',
+            '2007-12-31': '2008-01',
+            '2008-01-01': '2008-01',
+            '2008-12-28': '2008-52',
+            '2008-12-29': '2009-01',
+            '2008-12-30': '2009-01',
+            '2008-12-31': '2009-01',
+            '2009-01-01': '2009-01',
+            '2009-12-31': '2009-53',
+            '2010-01-01': '2009-53',
+            '2010-01-02': '2009-53',
+            '2010-01-03': '2009-53',
+            '404-12-31': '0404-53',
+            '405-12-31': '0405-52'
+        }, i, isoWeekYear, formatted5, formatted4, formatted2;
+
+        for (i in cases) {
+            isoWeekYear = cases[i].split('-')[0];
+            formatted5 = moment(i, 'YYYY-MM-DD').format('GGGGG');
+            assert.equal('0' + isoWeekYear, formatted5, i + ': GGGGG should be ' + isoWeekYear + ', but ' + formatted5);
+            formatted4 = moment(i, 'YYYY-MM-DD').format('GGGG');
+            assert.equal(isoWeekYear, formatted4, i + ': GGGG should be ' + isoWeekYear + ', but ' + formatted4);
+            formatted2 = moment(i, 'YYYY-MM-DD').format('GG');
+            assert.equal(isoWeekYear.slice(2, 4), formatted2, i + ': GG should be ' + isoWeekYear + ', but ' + formatted2);
+        }
+    });
+
+    test('week year formats', function (assert) {
+        // http://en.wikipedia.org/wiki/ISO_week_date
+        var cases = {
+            '2005-01-02': '2004-53',
+            '2005-12-31': '2005-52',
+            '2007-01-01': '2007-01',
+            '2007-12-30': '2007-52',
+            '2007-12-31': '2008-01',
+            '2008-01-01': '2008-01',
+            '2008-12-28': '2008-52',
+            '2008-12-29': '2009-01',
+            '2008-12-30': '2009-01',
+            '2008-12-31': '2009-01',
+            '2009-01-01': '2009-01',
+            '2009-12-31': '2009-53',
+            '2010-01-01': '2009-53',
+            '2010-01-02': '2009-53',
+            '2010-01-03': '2009-53',
+            '404-12-31': '0404-53',
+            '405-12-31': '0405-52'
+        }, i, isoWeekYear, formatted5, formatted4, formatted2;
+
+        moment.locale('dow:1,doy:4', {week: {dow: 1, doy: 4}});
+
+        for (i in cases) {
+            isoWeekYear = cases[i].split('-')[0];
+            formatted5 = moment(i, 'YYYY-MM-DD').format('ggggg');
+            assert.equal('0' + isoWeekYear, formatted5, i + ': ggggg should be ' + isoWeekYear + ', but ' + formatted5);
+            formatted4 = moment(i, 'YYYY-MM-DD').format('gggg');
+            assert.equal(isoWeekYear, formatted4, i + ': gggg should be ' + isoWeekYear + ', but ' + formatted4);
+            formatted2 = moment(i, 'YYYY-MM-DD').format('gg');
+            assert.equal(isoWeekYear.slice(2, 4), formatted2, i + ': gg should be ' + isoWeekYear + ', but ' + formatted2);
+        }
+    });
+
+    test('iso weekday formats', function (assert) {
+        assert.equal(moment([1985, 1,  4]).format('E'), '1', 'Feb  4 1985 is Monday    -- 1st day');
+        assert.equal(moment([2029, 8, 18]).format('E'), '2', 'Sep 18 2029 is Tuesday   -- 2nd day');
+        assert.equal(moment([2013, 3, 24]).format('E'), '3', 'Apr 24 2013 is Wednesday -- 3rd day');
+        assert.equal(moment([2015, 2,  5]).format('E'), '4', 'Mar  5 2015 is Thursday  -- 4th day');
+        assert.equal(moment([1970, 0,  2]).format('E'), '5', 'Jan  2 1970 is Friday    -- 5th day');
+        assert.equal(moment([2001, 4, 12]).format('E'), '6', 'May 12 2001 is Saturday  -- 6th day');
+        assert.equal(moment([2000, 0,  2]).format('E'), '7', 'Jan  2 2000 is Sunday    -- 7th day');
+    });
+
+    test('weekday formats', function (assert) {
+        moment.locale('dow: 3,doy: 5', {week: {dow: 3, doy: 5}});
+        assert.equal(moment([1985, 1,  6]).format('e'), '0', 'Feb  6 1985 is Wednesday -- 0th day');
+        assert.equal(moment([2029, 8, 20]).format('e'), '1', 'Sep 20 2029 is Thursday  -- 1st day');
+        assert.equal(moment([2013, 3, 26]).format('e'), '2', 'Apr 26 2013 is Friday    -- 2nd day');
+        assert.equal(moment([2015, 2,  7]).format('e'), '3', 'Mar  7 2015 is Saturday  -- 3nd day');
+        assert.equal(moment([1970, 0,  4]).format('e'), '4', 'Jan  4 1970 is Sunday    -- 4th day');
+        assert.equal(moment([2001, 4, 14]).format('e'), '5', 'May 14 2001 is Monday    -- 5th day');
+        assert.equal(moment([2000, 0,  4]).format('e'), '6', 'Jan  4 2000 is Tuesday   -- 6th day');
+    });
+
+    test('toString is just human readable format', function (assert) {
+        var b = moment(new Date(2009, 1, 5, 15, 25, 50, 125));
+        assert.equal(b.toString(), b.format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ'));
+    });
+
+    test('toJSON skips postformat', function (assert) {
+        moment.locale('postformat', {
+            postformat: function (s) {
+                s.replace(/./g, 'X');
+            }
+        });
+        assert.equal(moment.utc([2000, 0, 1]).toJSON(), '2000-01-01T00:00:00.000Z', 'toJSON doesn\'t postformat');
+        moment.locale('postformat', null);
+    });
+
+    test('calendar day timezone', function (assert) {
+        moment.locale('en');
+        var zones = [60, -60, 90, -90, 360, -360, 720, -720],
+            b = moment().utc().startOf('day').subtract({m : 1}),
+            c = moment().local().startOf('day').subtract({m : 1}),
+            d = moment().local().startOf('day').subtract({d : 2}),
+            i, z, a;
+
+        for (i = 0; i < zones.length; ++i) {
+            z = zones[i];
+            a = moment().utcOffset(z).startOf('day').subtract({m: 1});
+            assert.equal(moment(a).utcOffset(z).calendar(), 'Yesterday at 11:59 PM',
+                         'Yesterday at 11:59 PM, not Today, or the wrong time, tz = ' + z);
+        }
+
+        assert.equal(moment(b).utc().calendar(), 'Yesterday at 11:59 PM', 'Yesterday at 11:59 PM, not Today, or the wrong time');
+        assert.equal(moment(c).local().calendar(), 'Yesterday at 11:59 PM', 'Yesterday at 11:59 PM, not Today, or the wrong time');
+        assert.equal(moment(c).local().calendar(d), 'Tomorrow at 11:59 PM', 'Tomorrow at 11:59 PM, not Yesterday, or the wrong time');
+    });
+
+    test('invalid', function (assert) {
+        assert.equal(moment.invalid().format(), 'Invalid date');
+        assert.equal(moment.invalid().format('YYYY-MM-DD'), 'Invalid date');
+    });
+
+    test('quarter formats', function (assert) {
+        assert.equal(moment([1985, 1,  4]).format('Q'), '1', 'Feb  4 1985 is Q1');
+        assert.equal(moment([2029, 8, 18]).format('Q'), '3', 'Sep 18 2029 is Q3');
+        assert.equal(moment([2013, 3, 24]).format('Q'), '2', 'Apr 24 2013 is Q2');
+        assert.equal(moment([2015, 2,  5]).format('Q'), '1', 'Mar  5 2015 is Q1');
+        assert.equal(moment([1970, 0,  2]).format('Q'), '1', 'Jan  2 1970 is Q1');
+        assert.equal(moment([2001, 11, 12]).format('Q'), '4', 'Dec 12 2001 is Q4');
+        assert.equal(moment([2000, 0,  2]).format('[Q]Q-YYYY'), 'Q1-2000', 'Jan  2 2000 is Q1');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('from_to');
+
+    test('from', function (assert) {
+        var start = moment();
+        moment.locale('en');
+        assert.equal(start.from(start.clone().add(5, 'seconds')),  'a few seconds ago', '5 seconds = a few seconds ago');
+        assert.equal(start.from(start.clone().add(1, 'minute')),  'a minute ago', '1 minute = a minute ago');
+        assert.equal(start.from(start.clone().add(5, 'minutes')),  '5 minutes ago', '5 minutes = 5 minutes ago');
+
+        assert.equal(start.from(start.clone().subtract(5, 'seconds')),  'in a few seconds', '5 seconds = in a few seconds');
+        assert.equal(start.from(start.clone().subtract(1, 'minute')),  'in a minute', '1 minute = in a minute');
+        assert.equal(start.from(start.clone().subtract(5, 'minutes')),  'in 5 minutes', '5 minutes = in 5 minutes');
+    });
+
+    test('from with absolute duration', function (assert) {
+        var start = moment();
+        moment.locale('en');
+        assert.equal(start.from(start.clone().add(5, 'seconds'), true),  'a few seconds', '5 seconds = a few seconds');
+        assert.equal(start.from(start.clone().add(1, 'minute'), true),  'a minute', '1 minute = a minute');
+        assert.equal(start.from(start.clone().add(5, 'minutes'), true),  '5 minutes', '5 minutes = 5 minutes');
+
+        assert.equal(start.from(start.clone().subtract(5, 'seconds'), true),  'a few seconds', '5 seconds = a few seconds');
+        assert.equal(start.from(start.clone().subtract(1, 'minute'), true),  'a minute', '1 minute = a minute');
+        assert.equal(start.from(start.clone().subtract(5, 'minutes'), true),  '5 minutes', '5 minutes = 5 minutes');
+    });
+
+    test('to', function (assert) {
+        var start = moment();
+        moment.locale('en');
+        assert.equal(start.to(start.clone().subtract(5, 'seconds')),  'a few seconds ago', '5 seconds = a few seconds ago');
+        assert.equal(start.to(start.clone().subtract(1, 'minute')),  'a minute ago', '1 minute = a minute ago');
+        assert.equal(start.to(start.clone().subtract(5, 'minutes')),  '5 minutes ago', '5 minutes = 5 minutes ago');
+
+        assert.equal(start.to(start.clone().add(5, 'seconds')),  'in a few seconds', '5 seconds = in a few seconds');
+        assert.equal(start.to(start.clone().add(1, 'minute')),  'in a minute', '1 minute = in a minute');
+        assert.equal(start.to(start.clone().add(5, 'minutes')),  'in 5 minutes', '5 minutes = in 5 minutes');
+    });
+
+    test('to with absolute duration', function (assert) {
+        var start = moment();
+        moment.locale('en');
+        assert.equal(start.to(start.clone().add(5, 'seconds'), true),  'a few seconds', '5 seconds = a few seconds');
+        assert.equal(start.to(start.clone().add(1, 'minute'), true),  'a minute', '1 minute = a minute');
+        assert.equal(start.to(start.clone().add(5, 'minutes'), true),  '5 minutes', '5 minutes = 5 minutes');
+
+        assert.equal(start.to(start.clone().subtract(5, 'seconds'), true),  'a few seconds', '5 seconds = a few seconds');
+        assert.equal(start.to(start.clone().subtract(1, 'minute'), true),  'a minute', '1 minute = a minute');
+        assert.equal(start.to(start.clone().subtract(5, 'minutes'), true),  '5 minutes', '5 minutes = 5 minutes');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('getters and setters');
+
+    test('getters', function (assert) {
+        var a = moment([2011, 9, 12, 6, 7, 8, 9]);
+        assert.equal(a.year(), 2011, 'year');
+        assert.equal(a.month(), 9, 'month');
+        assert.equal(a.date(), 12, 'date');
+        assert.equal(a.day(), 3, 'day');
+        assert.equal(a.hours(), 6, 'hour');
+        assert.equal(a.minutes(), 7, 'minute');
+        assert.equal(a.seconds(), 8, 'second');
+        assert.equal(a.milliseconds(), 9, 'milliseconds');
+    });
+
+    test('getters programmatic', function (assert) {
+        var a = moment([2011, 9, 12, 6, 7, 8, 9]);
+        assert.equal(a.get('year'), 2011, 'year');
+        assert.equal(a.get('month'), 9, 'month');
+        assert.equal(a.get('date'), 12, 'date');
+        assert.equal(a.get('day'), 3, 'day');
+        assert.equal(a.get('hour'), 6, 'hour');
+        assert.equal(a.get('minute'), 7, 'minute');
+        assert.equal(a.get('second'), 8, 'second');
+        assert.equal(a.get('milliseconds'), 9, 'milliseconds');
+
+        //actual getters tested elsewhere
+        assert.equal(a.get('weekday'), a.weekday(), 'weekday');
+        assert.equal(a.get('isoWeekday'), a.isoWeekday(), 'isoWeekday');
+        assert.equal(a.get('week'), a.week(), 'week');
+        assert.equal(a.get('isoWeek'), a.isoWeek(), 'isoWeek');
+        assert.equal(a.get('dayOfYear'), a.dayOfYear(), 'dayOfYear');
+    });
+
+    test('setters plural', function (assert) {
+        var a = moment();
+        a.years(2011);
+        a.months(9);
+        a.dates(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(9);
+        assert.equal(a.years(), 2011, 'years');
+        assert.equal(a.months(), 9, 'months');
+        assert.equal(a.dates(), 12, 'dates');
+        assert.equal(a.days(), 3, 'days');
+        assert.equal(a.hours(), 6, 'hours');
+        assert.equal(a.minutes(), 7, 'minutes');
+        assert.equal(a.seconds(), 8, 'seconds');
+        assert.equal(a.milliseconds(), 9, 'milliseconds');
+    });
+
+    test('setters singular', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hour(6);
+        a.minute(7);
+        a.second(8);
+        a.millisecond(9);
+        assert.equal(a.year(), 2011, 'year');
+        assert.equal(a.month(), 9, 'month');
+        assert.equal(a.date(), 12, 'date');
+        assert.equal(a.day(), 3, 'day');
+        assert.equal(a.hour(), 6, 'hour');
+        assert.equal(a.minute(), 7, 'minute');
+        assert.equal(a.second(), 8, 'second');
+        assert.equal(a.millisecond(), 9, 'milliseconds');
+    });
+
+    test('setters', function (assert) {
+        var a = moment();
+        a.year(2011);
+        a.month(9);
+        a.date(12);
+        a.hours(6);
+        a.minutes(7);
+        a.seconds(8);
+        a.milliseconds(9);
+        assert.equal(a.year(), 2011, 'year');
+        assert.equal(a.month(), 9, 'month');
+        assert.equal(a.date(), 12, 'date');
+        assert.equal(a.day(), 3, 'day');
+        assert.equal(a.hours(), 6, 'hour');
+        assert.equal(a.minutes(), 7, 'minute');
+        assert.equal(a.seconds(), 8, 'second');
+        assert.equal(a.milliseconds(), 9, 'milliseconds');
+
+        // Test month() behavior. See https://github.com/timrwood/moment/pull/822
+        a = moment('20130531', 'YYYYMMDD');
+        a.month(3);
+        assert.equal(a.month(), 3, 'month edge case');
+    });
+
+    test('setter programmatic', function (assert) {
+        var a = moment();
+        a.set('year', 2011);
+        a.set('month', 9);
+        a.set('date', 12);
+        a.set('hours', 6);
+        a.set('minutes', 7);
+        a.set('seconds', 8);
+        a.set('milliseconds', 9);
+        assert.equal(a.year(), 2011, 'year');
+        assert.equal(a.month(), 9, 'month');
+        assert.equal(a.date(), 12, 'date');
+        assert.equal(a.day(), 3, 'day');
+        assert.equal(a.hours(), 6, 'hour');
+        assert.equal(a.minutes(), 7, 'minute');
+        assert.equal(a.seconds(), 8, 'second');
+        assert.equal(a.milliseconds(), 9, 'milliseconds');
+
+        // Test month() behavior. See https://github.com/timrwood/moment/pull/822
+        a = moment('20130531', 'YYYYMMDD');
+        a.month(3);
+        assert.equal(a.month(), 3, 'month edge case');
+    });
+
+    // Disable this, until we weekYear setter is fixed.
+    // https://github.com/moment/moment/issues/1379
+    // test('setters programatic with weeks', function (assert) {
+    //     var a = moment();
+    //     a.set('weekYear', 2001);
+    //     a.set('week', 49);
+    //     a.set('day', 4);
+    //     assert.equals(a.weekYear(), 2001);
+    //     assert.equals(a.week(), 49);
+    //     assert.equals(a.day(), 4);
+
+    //     a.set('weekday', 1);
+    //     assert.equals(a.weekday(), 1);
+
+    //     assert.done();
+    //},
+
+    // I think this suffers from the same issue as the non-iso version.
+    // test('setters programatic with weeks ISO', function (assert) {
+    //     var a = moment();
+    //     a.set('isoWeekYear', 2001);
+    //     a.set('isoWeek', 49);
+    //     a.set('isoWeekday', 4);
+
+    //     assert.equals(a.weekYear(), 2001);
+    //     assert.equals(a.week(), 49);
+    //     assert.equals(a.day(), 4);
+
+    //     assert.done();
+    //},
+
+    test('setters strings', function (assert) {
+        var a = moment([2012]).locale('en');
+        assert.equal(a.clone().day(0).day('Wednesday').day(), 3, 'day full name');
+        assert.equal(a.clone().day(0).day('Wed').day(), 3, 'day short name');
+        assert.equal(a.clone().day(0).day('We').day(), 3, 'day minimal name');
+        assert.equal(a.clone().day(0).day('invalid').day(), 0, 'invalid day name');
+        assert.equal(a.clone().month(0).month('April').month(), 3, 'month full name');
+        assert.equal(a.clone().month(0).month('Apr').month(), 3, 'month short name');
+        assert.equal(a.clone().month(0).month('invalid').month(), 0, 'invalid month name');
+    });
+
+    test('setters - falsey values', function (assert) {
+        var a = moment();
+        // ensure minutes wasn't coincidentally 0 already
+        a.minutes(1);
+        a.minutes(0);
+        assert.equal(a.minutes(), 0, 'falsey value');
+    });
+
+    test('chaining setters', function (assert) {
+        var a = moment();
+        a.year(2011)
+         .month(9)
+         .date(12)
+         .hours(6)
+         .minutes(7)
+         .seconds(8);
+        assert.equal(a.year(), 2011, 'year');
+        assert.equal(a.month(), 9, 'month');
+        assert.equal(a.date(), 12, 'date');
+        assert.equal(a.day(), 3, 'day');
+        assert.equal(a.hours(), 6, 'hour');
+        assert.equal(a.minutes(), 7, 'minute');
+        assert.equal(a.seconds(), 8, 'second');
+    });
+
+    test('setter with multiple unit values', function (assert) {
+        var a = moment();
+        a.set({
+            year: 2011,
+            month: 9,
+            date: 12,
+            hours: 6,
+            minutes: 7,
+            seconds: 8,
+            milliseconds: 9
+        });
+        assert.equal(a.year(), 2011, 'year');
+        assert.equal(a.month(), 9, 'month');
+        assert.equal(a.date(), 12, 'date');
+        assert.equal(a.day(), 3, 'day');
+        assert.equal(a.hours(), 6, 'hour');
+        assert.equal(a.minutes(), 7, 'minute');
+        assert.equal(a.seconds(), 8, 'second');
+        assert.equal(a.milliseconds(), 9, 'milliseconds');
+    });
+
+    test('day setter', function (assert) {
+        var a = moment([2011, 0, 15]);
+        assert.equal(moment(a).day(0).date(), 9, 'set from saturday to sunday');
+        assert.equal(moment(a).day(6).date(), 15, 'set from saturday to saturday');
+        assert.equal(moment(a).day(3).date(), 12, 'set from saturday to wednesday');
+
+        a = moment([2011, 0, 9]);
+        assert.equal(moment(a).day(0).date(), 9, 'set from sunday to sunday');
+        assert.equal(moment(a).day(6).date(), 15, 'set from sunday to saturday');
+        assert.equal(moment(a).day(3).date(), 12, 'set from sunday to wednesday');
+
+        a = moment([2011, 0, 12]);
+        assert.equal(moment(a).day(0).date(), 9, 'set from wednesday to sunday');
+        assert.equal(moment(a).day(6).date(), 15, 'set from wednesday to saturday');
+        assert.equal(moment(a).day(3).date(), 12, 'set from wednesday to wednesday');
+
+        assert.equal(moment(a).day(-7).date(), 2, 'set from wednesday to last sunday');
+        assert.equal(moment(a).day(-1).date(), 8, 'set from wednesday to last saturday');
+        assert.equal(moment(a).day(-4).date(), 5, 'set from wednesday to last wednesday');
+
+        assert.equal(moment(a).day(7).date(), 16, 'set from wednesday to next sunday');
+        assert.equal(moment(a).day(13).date(), 22, 'set from wednesday to next saturday');
+        assert.equal(moment(a).day(10).date(), 19, 'set from wednesday to next wednesday');
+
+        assert.equal(moment(a).day(14).date(), 23, 'set from wednesday to second next sunday');
+        assert.equal(moment(a).day(20).date(), 29, 'set from wednesday to second next saturday');
+        assert.equal(moment(a).day(17).date(), 26, 'set from wednesday to second next wednesday');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('invalid');
+
+    test('invalid', function (assert) {
+        var m = moment.invalid();
+        assert.equal(m.isValid(), false);
+        assert.equal(m.parsingFlags().userInvalidated, true);
+        assert.ok(isNaN(m.valueOf()));
+    });
+
+    test('invalid with existing flag', function (assert) {
+        var m = moment.invalid({invalidMonth : 'whatchamacallit'});
+        assert.equal(m.isValid(), false);
+        assert.equal(m.parsingFlags().userInvalidated, false);
+        assert.equal(m.parsingFlags().invalidMonth, 'whatchamacallit');
+        assert.ok(isNaN(m.valueOf()));
+    });
+
+    test('invalid with custom flag', function (assert) {
+        var m = moment.invalid({tooBusyWith : 'reiculating splines'});
+        assert.equal(m.isValid(), false);
+        assert.equal(m.parsingFlags().userInvalidated, false);
+        assert.equal(m.parsingFlags().tooBusyWith, 'reiculating splines');
+        assert.ok(isNaN(m.valueOf()));
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('is after');
+
+    test('is after without units', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2012, 3, 2, 3, 5, 5, 10))), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 3, 5, 10))), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 4, 2, 3, 4, 5, 10))), false, 'month is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 2, 3, 4, 5, 10))), true, 'month is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 3, 3, 4, 5, 10))), false, 'day is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 3, 4, 5, 10))), true, 'day is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 4, 4, 5, 10))), false, 'hour is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 2, 4, 5, 10))), true, 'hour is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 5, 5, 10))), false, 'minute is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 3, 5, 10))), true, 'minute is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 6, 10))), false, 'second is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 4, 11))), true, 'second is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'millisecond match');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 5, 11))), false, 'millisecond is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 5, 9))), true, 'millisecond is earlier');
+        assert.equal(m.isAfter(m), false, 'moments are not after themselves');
+        assert.equal(+m, +mCopy, 'isAfter second should not change moment');
+    });
+
+    test('is after year', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year match');
+        assert.equal(m.isAfter(moment(new Date(2010, 5, 6, 7, 8, 9, 10)), 'years'), true, 'plural should work');
+        assert.equal(m.isAfter(moment(new Date(2013, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 5, 6, 7, 8, 9, 10)), 'year'), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 0, 1, 0, 0, 0, 0)), 'year'), false, 'exact start of year');
+        assert.equal(m.isAfter(moment(new Date(2011, 11, 31, 23, 59, 59, 999)), 'year'), false, 'exact end of year');
+        assert.equal(m.isAfter(moment(new Date(2012, 0, 1, 0, 0, 0, 0)), 'year'), false, 'start of next year');
+        assert.equal(m.isAfter(moment(new Date(2010, 11, 31, 23, 59, 59, 999)), 'year'), true, 'end of previous year');
+        assert.equal(m.isAfter(moment(new Date(1980, 11, 31, 23, 59, 59, 999)), 'year'), true, 'end of year far before');
+        assert.equal(m.isAfter(m, 'year'), false, 'same moments are not after the same year');
+        assert.equal(+m, +mCopy, 'isAfter year should not change moment');
+    });
+
+    test('is after month', function (assert) {
+        var m = moment(new Date(2011, 2, 3, 4, 5, 6, 7)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 6, 7, 8, 9, 10)), 'month'), false, 'month match');
+        assert.equal(m.isAfter(moment(new Date(2010, 2, 6, 7, 8, 9, 10)), 'months'), true, 'plural should work');
+        assert.equal(m.isAfter(moment(new Date(2012, 2, 6, 7, 8, 9, 10)), 'month'), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 2, 6, 7, 8, 9, 10)), 'month'), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'month'), false, 'month is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 1, 6, 7, 8, 9, 10)), 'month'), true, 'month is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 1, 0, 0, 0, 0)), 'month'), false, 'exact start of month');
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 31, 23, 59, 59, 999)), 'month'), false, 'exact end of month');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 0, 0, 0, 0)), 'month'), false, 'start of next month');
+        assert.equal(m.isAfter(moment(new Date(2011, 1, 27, 23, 59, 59, 999)), 'month'), true, 'end of previous month');
+        assert.equal(m.isAfter(moment(new Date(2010, 12, 31, 23, 59, 59, 999)), 'month'), true, 'later month but earlier year');
+        assert.equal(m.isAfter(m, 'month'), false, 'same moments are not after the same month');
+        assert.equal(+m, +mCopy, 'isAfter month should not change moment');
+    });
+
+    test('is after day', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 7, 8, 9, 10)), 'day'), false, 'day match');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 7, 8, 9, 10)), 'days'), true, 'plural should work');
+        assert.equal(m.isAfter(moment(new Date(2012, 3, 2, 7, 8, 9, 10)), 'day'), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 7, 8, 9, 10)), 'day'), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 4, 2, 7, 8, 9, 10)), 'day'), false, 'month is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 2, 7, 8, 9, 10)), 'day'), true, 'month is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 3, 7, 8, 9, 10)), 'day'), false, 'day is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 7, 8, 9, 10)), 'day'), true, 'day is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 0, 0, 0, 0)), 'day'), false, 'exact start of day');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 23, 59, 59, 999)), 'day'), false, 'exact end of day');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 3, 0, 0, 0, 0)), 'day'), false, 'start of next day');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 23, 59, 59, 999)), 'day'), true, 'end of previous day');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 10, 0, 0, 0, 0)), 'day'), true, 'later day but earlier year');
+        assert.equal(m.isAfter(m, 'day'), false, 'same moments are not after the same day');
+        assert.equal(+m, +mCopy, 'isAfter day should not change moment');
+    });
+
+    test('is after hour', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 8, 9, 10)), 'hour'), false, 'hour match');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 8, 9, 10)), 'hours'), true, 'plural should work');
+        assert.equal(m.isAfter(moment(new Date(2012, 3, 2, 3, 8, 9, 10)), 'hour'), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 8, 9, 10)), 'hour'), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 4, 2, 3, 8, 9, 10)), 'hour'), false, 'month is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 1, 2, 3, 8, 9, 10)), 'hour'), true, 'month is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 3, 3, 8, 9, 10)), 'hour'), false, 'day is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 3, 8, 9, 10)), 'hour'), true, 'day is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 4, 8, 9, 10)), 'hour'), false, 'hour is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 8, 9, 10)), 'hour'), false, 'hour is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 0, 0, 0)), 'hour'), false, 'exact start of hour');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 59, 59, 999)), 'hour'), false, 'exact end of hour');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 4, 0, 0, 0)), 'hour'), false, 'start of next hour');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 2, 59, 59, 999)), 'hour'), true, 'end of previous hour');
+        assert.equal(m.isAfter(m, 'hour'), false, 'same moments are not after the same hour');
+        assert.equal(+m, +mCopy, 'isAfter hour should not change moment');
+    });
+
+    test('is after minute', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 9, 10)), 'minute'), false, 'minute match');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 4, 9, 10)), 'minutes'), true, 'plural should work');
+        assert.equal(m.isAfter(moment(new Date(2012, 3, 2, 3, 4, 9, 10)), 'minute'), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 4, 9, 10)), 'minute'), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 4, 2, 3, 4, 9, 10)), 'minute'), false, 'month is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 2, 3, 4, 9, 10)), 'minute'), true, 'month is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 3, 3, 4, 9, 10)), 'minute'), false, 'day is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 3, 4, 9, 10)), 'minute'), true, 'day is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 4, 4, 9, 10)), 'minute'), false, 'hour is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 2, 4, 9, 10)), 'minute'), true, 'hour is earler');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 5, 9, 10)), 'minute'), false, 'minute is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 3, 9, 10)), 'minute'), true, 'minute is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 0, 0)), 'minute'), false, 'exact start of minute');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 59, 999)), 'minute'), false, 'exact end of minute');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 5, 0, 0)), 'minute'), false, 'start of next minute');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 3, 59, 999)), 'minute'), true, 'end of previous minute');
+        assert.equal(m.isAfter(m, 'minute'), false, 'same moments are not after the same minute');
+        assert.equal(+m, +mCopy, 'isAfter minute should not change moment');
+    });
+
+    test('is after second', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 5, 10)), 'second'), false, 'second match');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'seconds'), true, 'plural should work');
+        assert.equal(m.isAfter(moment(new Date(2012, 3, 2, 3, 4, 5, 10)), 'second'), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'second'), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 4, 2, 3, 4, 5, 10)), 'second'), false, 'month is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 2, 3, 4, 5, 10)), 'second'), true, 'month is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 3, 3, 4, 5, 10)), 'second'), false, 'day is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 1, 4, 5, 10)), 'second'), true, 'day is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 4, 4, 5, 10)), 'second'), false, 'hour is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 4, 1, 5, 10)), 'second'), true, 'hour is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 5, 5, 10)), 'second'), false, 'minute is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 3, 5, 10)), 'second'), true, 'minute is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 6, 10)), 'second'), false, 'second is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 4, 5)), 'second'), true, 'second is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 5, 0)), 'second'), false, 'exact start of second');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 5, 999)), 'second'), false, 'exact end of second');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 6, 0)), 'second'), false, 'start of next second');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 4, 999)), 'second'), true, 'end of previous second');
+        assert.equal(m.isAfter(m, 'second'), false, 'same moments are not after the same second');
+        assert.equal(+m, +mCopy, 'isAfter second should not change moment');
+    });
+
+    test('is after millisecond', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 5, 10)), 'millisecond'), false, 'millisecond match');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'milliseconds'), true, 'plural should work');
+        assert.equal(m.isAfter(moment(new Date(2012, 3, 2, 3, 4, 5, 10)), 'millisecond'), false, 'year is later');
+        assert.equal(m.isAfter(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'millisecond'), true, 'year is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 4, 2, 3, 4, 5, 10)), 'millisecond'), false, 'month is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 2, 2, 3, 4, 5, 10)), 'millisecond'), true, 'month is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 3, 3, 4, 5, 10)), 'millisecond'), false, 'day is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 1, 4, 5, 10)), 'millisecond'), true, 'day is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 4, 4, 5, 10)), 'millisecond'), false, 'hour is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 1, 4, 1, 5, 10)), 'millisecond'), true, 'hour is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 5, 5, 10)), 'millisecond'), false, 'minute is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 3, 5, 10)), 'millisecond'), true, 'minute is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 6, 10)), 'millisecond'), false, 'second is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 4, 5)), 'millisecond'), true, 'second is earlier');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 6, 11)), 'millisecond'), false, 'millisecond is later');
+        assert.equal(m.isAfter(moment(new Date(2011, 3, 2, 3, 4, 4, 9)), 'millisecond'), true, 'millisecond is earlier');
+        assert.equal(m.isAfter(m, 'millisecond'), false, 'same moments are not after the same millisecond');
+        assert.equal(+m, +mCopy, 'isAfter millisecond should not change moment');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('is before');
+
+    test('is after without units', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 5, 5, 10))), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 2, 3, 3, 5, 10))), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 4, 2, 3, 4, 5, 10))), true, 'month is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 2, 3, 4, 5, 10))), false, 'month is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 3, 3, 4, 5, 10))), true, 'day is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 3, 4, 5, 10))), false, 'day is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 4, 4, 5, 10))), true, 'hour is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 2, 4, 5, 10))), false, 'hour is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 5, 5, 10))), true, 'minute is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 3, 5, 10))), false, 'minute is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 6, 10))), true, 'second is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 4, 11))), false, 'second is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'millisecond match');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 5, 11))), true, 'millisecond is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 5, 9))), false, 'millisecond is earlier');
+        assert.equal(m.isBefore(m), false, 'moments are not before themselves');
+        assert.equal(+m, +mCopy, 'isBefore second should not change moment');
+    });
+
+    test('is before year', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year match');
+        assert.equal(m.isBefore(moment(new Date(2012, 5, 6, 7, 8, 9, 10)), 'years'), true, 'plural should work');
+        assert.equal(m.isBefore(moment(new Date(2013, 5, 6, 7, 8, 9, 10)), 'year'), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 0, 1, 0, 0, 0, 0)), 'year'), false, 'exact start of year');
+        assert.equal(m.isBefore(moment(new Date(2011, 11, 31, 23, 59, 59, 999)), 'year'), false, 'exact end of year');
+        assert.equal(m.isBefore(moment(new Date(2012, 0, 1, 0, 0, 0, 0)), 'year'), true, 'start of next year');
+        assert.equal(m.isBefore(moment(new Date(2010, 11, 31, 23, 59, 59, 999)), 'year'), false, 'end of previous year');
+        assert.equal(m.isBefore(moment(new Date(1980, 11, 31, 23, 59, 59, 999)), 'year'), false, 'end of year far before');
+        assert.equal(m.isBefore(m, 'year'), false, 'same moments are not before the same year');
+        assert.equal(+m, +mCopy, 'isBefore year should not change moment');
+    });
+
+    test('is before month', function (assert) {
+        var m = moment(new Date(2011, 2, 3, 4, 5, 6, 7)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 6, 7, 8, 9, 10)), 'month'), false, 'month match');
+        assert.equal(m.isBefore(moment(new Date(2012, 2, 6, 7, 8, 9, 10)), 'months'), true, 'plural should work');
+        assert.equal(m.isBefore(moment(new Date(2012, 2, 6, 7, 8, 9, 10)), 'month'), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 2, 6, 7, 8, 9, 10)), 'month'), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'month'), true, 'month is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 1, 6, 7, 8, 9, 10)), 'month'), false, 'month is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 1, 0, 0, 0, 0)), 'month'), false, 'exact start of month');
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 31, 23, 59, 59, 999)), 'month'), false, 'exact end of month');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 0, 0, 0, 0)), 'month'), true, 'start of next month');
+        assert.equal(m.isBefore(moment(new Date(2011, 1, 27, 23, 59, 59, 999)), 'month'), false, 'end of previous month');
+        assert.equal(m.isBefore(moment(new Date(2010, 12, 31, 23, 59, 59, 999)), 'month'), false, 'later month but earlier year');
+        assert.equal(m.isBefore(m, 'month'), false, 'same moments are not before the same month');
+        assert.equal(+m, +mCopy, 'isBefore month should not change moment');
+    });
+
+    test('is before day', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 7, 8, 9, 10)), 'day'), false, 'day match');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 7, 8, 9, 10)), 'days'), true, 'plural should work');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 7, 8, 9, 10)), 'day'), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 2, 7, 8, 9, 10)), 'day'), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 4, 2, 7, 8, 9, 10)), 'day'), true, 'month is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 2, 7, 8, 9, 10)), 'day'), false, 'month is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 3, 7, 8, 9, 10)), 'day'), true, 'day is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 7, 8, 9, 10)), 'day'), false, 'day is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 0, 0, 0, 0)), 'day'), false, 'exact start of day');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 23, 59, 59, 999)), 'day'), false, 'exact end of day');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 3, 0, 0, 0, 0)), 'day'), true, 'start of next day');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 23, 59, 59, 999)), 'day'), false, 'end of previous day');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 10, 0, 0, 0, 0)), 'day'), false, 'later day but earlier year');
+        assert.equal(m.isBefore(m, 'day'), false, 'same moments are not before the same day');
+        assert.equal(+m, +mCopy, 'isBefore day should not change moment');
+    });
+
+    test('is before hour', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 8, 9, 10)), 'hour'), false, 'hour match');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 8, 9, 10)), 'hours'), true, 'plural should work');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 8, 9, 10)), 'hour'), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 2, 3, 8, 9, 10)), 'hour'), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 4, 2, 3, 8, 9, 10)), 'hour'), true, 'month is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 1, 2, 3, 8, 9, 10)), 'hour'), false, 'month is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 3, 3, 8, 9, 10)), 'hour'), true, 'day is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 3, 8, 9, 10)), 'hour'), false, 'day is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 4, 8, 9, 10)), 'hour'), true, 'hour is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 8, 9, 10)), 'hour'), false, 'hour is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 0, 0, 0)), 'hour'), false, 'exact start of hour');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 59, 59, 999)), 'hour'), false, 'exact end of hour');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 4, 0, 0, 0)), 'hour'), true, 'start of next hour');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 2, 59, 59, 999)), 'hour'), false, 'end of previous hour');
+        assert.equal(m.isBefore(m, 'hour'), false, 'same moments are not before the same hour');
+        assert.equal(+m, +mCopy, 'isBefore hour should not change moment');
+    });
+
+    test('is before minute', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 9, 10)), 'minute'), false, 'minute match');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 4, 9, 10)), 'minutes'), true, 'plural should work');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 4, 9, 10)), 'minute'), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 2, 3, 4, 9, 10)), 'minute'), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 4, 2, 3, 4, 9, 10)), 'minute'), true, 'month is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 2, 3, 4, 9, 10)), 'minute'), false, 'month is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 3, 3, 4, 9, 10)), 'minute'), true, 'day is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 3, 4, 9, 10)), 'minute'), false, 'day is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 4, 4, 9, 10)), 'minute'), true, 'hour is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 2, 4, 9, 10)), 'minute'), false, 'hour is earler');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 5, 9, 10)), 'minute'), true, 'minute is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 3, 9, 10)), 'minute'), false, 'minute is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 0, 0)), 'minute'), false, 'exact start of minute');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 59, 999)), 'minute'), false, 'exact end of minute');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 5, 0, 0)), 'minute'), true, 'start of next minute');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 3, 59, 999)), 'minute'), false, 'end of previous minute');
+        assert.equal(m.isBefore(m, 'minute'), false, 'same moments are not before the same minute');
+        assert.equal(+m, +mCopy, 'isBefore minute should not change moment');
+    });
+
+    test('is before second', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 5, 10)), 'second'), false, 'second match');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 4, 5, 10)), 'seconds'), true, 'plural should work');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 4, 5, 10)), 'second'), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'second'), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 4, 2, 3, 4, 5, 10)), 'second'), true, 'month is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 2, 3, 4, 5, 10)), 'second'), false, 'month is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 3, 3, 4, 5, 10)), 'second'), true, 'day is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 1, 4, 5, 10)), 'second'), false, 'day is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 4, 4, 5, 10)), 'second'), true, 'hour is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 4, 1, 5, 10)), 'second'), false, 'hour is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 5, 5, 10)), 'second'), true, 'minute is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 3, 5, 10)), 'second'), false, 'minute is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 6, 10)), 'second'), true, 'second is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 4, 5)), 'second'), false, 'second is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 5, 0)), 'second'), false, 'exact start of second');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 5, 999)), 'second'), false, 'exact end of second');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 6, 0)), 'second'), true, 'start of next second');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 4, 999)), 'second'), false, 'end of previous second');
+        assert.equal(m.isBefore(m, 'second'), false, 'same moments are not before the same second');
+        assert.equal(+m, +mCopy, 'isBefore second should not change moment');
+    });
+
+    test('is before millisecond', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 5, 10)), 'millisecond'), false, 'millisecond match');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'milliseconds'), false, 'plural should work');
+        assert.equal(m.isBefore(moment(new Date(2012, 3, 2, 3, 4, 5, 10)), 'millisecond'), true, 'year is later');
+        assert.equal(m.isBefore(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'millisecond'), false, 'year is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 4, 2, 3, 4, 5, 10)), 'millisecond'), true, 'month is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 2, 2, 3, 4, 5, 10)), 'millisecond'), false, 'month is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 3, 3, 4, 5, 10)), 'millisecond'), true, 'day is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 1, 4, 5, 10)), 'millisecond'), false, 'day is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 4, 4, 5, 10)), 'millisecond'), true, 'hour is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 1, 4, 1, 5, 10)), 'millisecond'), false, 'hour is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 5, 5, 10)), 'millisecond'), true, 'minute is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 3, 5, 10)), 'millisecond'), false, 'minute is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 6, 10)), 'millisecond'), true, 'second is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 4, 5)), 'millisecond'), false, 'second is earlier');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 6, 11)), 'millisecond'), true, 'millisecond is later');
+        assert.equal(m.isBefore(moment(new Date(2011, 3, 2, 3, 4, 4, 9)), 'millisecond'), false, 'millisecond is earlier');
+        assert.equal(m.isBefore(m, 'millisecond'), false, 'same moments are not before the same millisecond');
+        assert.equal(+m, +mCopy, 'isBefore millisecond should not change moment');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('is between');
+
+    test('is between without units', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2009, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'year is later');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2013, 3, 2, 3, 4, 5, 10))), false, 'year is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2010, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2012, 3, 2, 3, 4, 5, 10))), true, 'year is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'month is later');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 5, 2, 3, 4, 5, 10))), false, 'month is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 2, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 4, 2, 3, 4, 5, 10))), true, 'month is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 1, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'day is later');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 4, 3, 4, 5, 10))), false, 'day is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 1, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 3, 3, 4, 5, 10))), true, 'day is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 1, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'hour is later');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 5, 4, 5, 10))), false, 'hour is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 2, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 4, 4, 5, 10))), true, 'hour is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 6, 5, 10))), false, 'minute is later');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 2, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'minute is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 3, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 5, 5, 10))), true, 'minute is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 7, 10))), false, 'second is later');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 3, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'second is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 4, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 6, 10))), true, 'second is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 12))), false, 'millisecond is later');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 8)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 10))), false, 'millisecond is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 9)),
+                    moment(new Date(2011, 3, 2, 3, 4, 5, 11))), true, 'millisecond is between');
+        assert.equal(m.isBetween(m, m), false, 'moments are not between themselves');
+        assert.equal(+m, +mCopy, 'isBetween second should not change moment');
+    });
+
+    test('is between year', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 5, 6, 7, 8, 9, 10)),
+                    moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year match');
+        assert.equal(m.isBetween(
+                    moment(new Date(2010, 5, 6, 7, 8, 9, 10)),
+                    moment(new Date(2012, 5, 6, 7, 8, 9, 10)), 'years'), true, 'plural should work');
+        assert.equal(m.isBetween(
+                    moment(new Date(2010, 5, 6, 7, 8, 9, 10)),
+                    moment(new Date(2012, 5, 6, 7, 8, 9, 10)), 'year'), true, 'year is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 5, 6, 7, 8, 9, 10)),
+                    moment(new Date(2013, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2010, 5, 6, 7, 8, 9, 10)),
+                    moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year is later');
+        assert.equal(m.isBetween(m, 'year'), false, 'same moments are not between the same year');
+        assert.equal(+m, +mCopy, 'isBetween year should not change moment');
+    });
+
+    test('is between month', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 6, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 6, 7, 8, 9, 10)), 'month'), false, 'month match');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 0, 6, 7, 8, 9, 10)),
+                    moment(new Date(2011, 2, 6, 7, 8, 9, 10)), 'months'), true, 'plural should work');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 0, 31, 23, 59, 59, 999)),
+                    moment(new Date(2011, 2, 1, 0, 0, 0, 0)), 'month'), true, 'month is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 6, 7, 8, 9, 10)),
+                    moment(new Date(2011, 2, 6, 7, 8, 9, 10)), 'month'), false, 'month is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 11, 6, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 6, 7, 8, 9, 10)), 'month'), false, 'month is later');
+        assert.equal(m.isBetween(m, 'month'), false, 'same moments are not between the same month');
+        assert.equal(+m, +mCopy, 'isBetween month should not change moment');
+    });
+
+    test('is between day', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)), 'day'), false, 'day match');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 1, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 3, 7, 8, 9, 10)), 'days'), true, 'plural should work');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 1, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 3, 7, 8, 9, 10)), 'day'), true, 'day is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 4, 7, 8, 9, 10)), 'day'), false, 'day is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 1, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)), 'day'), false, 'day is later');
+        assert.equal(m.isBetween(m, 'day'), false, 'same moments are not between the same day');
+        assert.equal(+m, +mCopy, 'isBetween day should not change moment');
+    });
+
+    test('is between hour', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 5, 9, 10)),
+                    moment(new Date(2011, 1, 2, 3, 9, 9, 10)), 'hour'), false, 'hour match');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 1, 59, 59, 999)),
+                    moment(new Date(2011, 1, 2, 4, 0, 0, 0)), 'hours'), true, 'plural should work');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 2, 59, 59, 999)),
+                    moment(new Date(2011, 1, 2, 4, 0, 0, 0)), 'hour'), true, 'hour is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)), 'hour'), false, 'hour is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)),
+                    moment(new Date(2011, 1, 2, 7, 8, 9, 10)), 'hour'), false, 'hour is later');
+        assert.equal(m.isBetween(m, 'hour'), false, 'same moments are not between the same hour');
+        assert.equal(+m, +mCopy, 'isBetween hour should not change moment');
+    });
+
+    test('is between minute', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 9, 10)),
+                    moment(new Date(2011, 1, 2, 3, 4, 9, 10)), 'minute'), false, 'minute match');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 3, 9, 10)),
+                    moment(new Date(2011, 1, 2, 3, 5, 9, 10)), 'minutes'), true, 'plural should work');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 3, 59, 999)),
+                    moment(new Date(2011, 1, 2, 3, 5, 0, 0)), 'minute'), true, 'minute is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 5, 0, 0)),
+                    moment(new Date(2011, 1, 2, 3, 8, 9, 10)), 'minute'), false, 'minute is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 2, 9, 10)),
+                    moment(new Date(2011, 1, 2, 3, 3, 59, 999)), 'minute'), false, 'minute is later');
+        assert.equal(m.isBetween(m, 'minute'), false, 'same moments are not between the same minute');
+        assert.equal(+m, +mCopy, 'isBetween minute should not change moment');
+    });
+
+    test('is between second', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 10)),
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 10)), 'second'), false, 'second match');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 4, 10)),
+                    moment(new Date(2011, 1, 2, 3, 4, 6, 10)), 'seconds'), true, 'plural should work');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 4, 999)),
+                    moment(new Date(2011, 1, 2, 3, 4, 6, 0)), 'second'), true, 'second is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 6, 0)),
+                    moment(new Date(2011, 1, 2, 3, 4, 7, 10)), 'second'), false, 'second is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 3, 10)),
+                    moment(new Date(2011, 1, 2, 3, 4, 4, 999)), 'second'), false, 'second is later');
+        assert.equal(m.isBetween(m, 'second'), false, 'same moments are not between the same second');
+        assert.equal(+m, +mCopy, 'isBetween second should not change moment');
+    });
+
+    test('is between millisecond', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 6)),
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 6)), 'millisecond'), false, 'millisecond match');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 5)),
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 7)), 'milliseconds'), true, 'plural should work');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 5)),
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 7)), 'millisecond'), true, 'millisecond is between');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 7)),
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 10)), 'millisecond'), false, 'millisecond is earlier');
+        assert.equal(m.isBetween(
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 4)),
+                    moment(new Date(2011, 1, 2, 3, 4, 5, 6)), 'millisecond'), false, 'millisecond is later');
+        assert.equal(m.isBetween(m, 'millisecond'), false, 'same moments are not between the same millisecond');
+        assert.equal(+m, +mCopy, 'isBetween millisecond should not change moment');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('is date');
+
+    test('isDate recognizes Date objects', function (assert) {
+        assert.ok(moment.isDate(new Date()), 'no args (now)');
+        assert.ok(moment.isDate(new Date([2014, 2, 15])), 'array args');
+        assert.ok(moment.isDate(new Date('2014-03-15')), 'string args');
+        assert.ok(moment.isDate(new Date('does NOT look like a date')), 'invalid date');
+    });
+
+    test('isDate rejects non-Date objects', function (assert) {
+        assert.ok(!moment.isDate(), 'nothing');
+        assert.ok(!moment.isDate(undefined), 'undefined');
+        assert.ok(!moment.isDate(null), 'string args');
+        assert.ok(!moment.isDate(42), 'number');
+        assert.ok(!moment.isDate('2014-03-15'), 'string');
+        assert.ok(!moment.isDate([2014, 2, 15]), 'array');
+        assert.ok(!moment.isDate({year: 2014, month: 2, day: 15}), 'object');
+        assert.ok(!moment.isDate({toString: function () {
+            return '[object Date]';
+        }}), 'lying object');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('is moment');
+
+    test('is moment object', function (assert) {
+        var MyObj = function () {},
+            extend = function (a, b) {
+                var i;
+                for (i in b) {
+                    a[i] = b[i];
+                }
+                return a;
+            };
+        MyObj.prototype.toDate = function () {
+            return new Date();
+        };
+
+        assert.ok(moment.isMoment(moment()), 'simple moment object');
+        assert.ok(moment.isMoment(moment(null)), 'invalid moment object');
+        assert.ok(moment.isMoment(extend({}, moment())), 'externally cloned moments are moments');
+        assert.ok(moment.isMoment(extend({}, moment.utc())), 'externally cloned utc moments are moments');
+
+        assert.ok(!moment.isMoment(new MyObj()), 'myObj is not moment object');
+        assert.ok(!moment.isMoment(moment), 'moment function is not moment object');
+        assert.ok(!moment.isMoment(new Date()), 'date object is not moment object');
+        assert.ok(!moment.isMoment(Object), 'Object is not moment object');
+        assert.ok(!moment.isMoment('foo'), 'string is not moment object');
+        assert.ok(!moment.isMoment(1), 'number is not moment object');
+        assert.ok(!moment.isMoment(NaN), 'NaN is not moment object');
+        assert.ok(!moment.isMoment(null), 'null is not moment object');
+        assert.ok(!moment.isMoment(undefined), 'undefined is not moment object');
+    });
+
+    test('is moment with hacked hasOwnProperty', function (assert) {
+        var obj = {};
+        // HACK to suppress jshint warning about bad property name
+        obj['hasOwnMoney'.replace('Money', 'Property')] = function () {
+            return true;
+        };
+
+        assert.ok(!moment.isMoment(obj), 'isMoment works even if passed object has a wrong hasOwnProperty implementation (ie8)');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('is same');
+
+    test('is same without units', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2012, 3, 2, 3, 5, 5, 10))), false, 'year is later');
+        assert.equal(m.isSame(moment(new Date(2010, 3, 2, 3, 3, 5, 10))), false, 'year is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 4, 2, 3, 4, 5, 10))), false, 'month is later');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 2, 3, 4, 5, 10))), false, 'month is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 3, 3, 4, 5, 10))), false, 'day is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 1, 3, 4, 5, 10))), false, 'day is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 4, 4, 5, 10))), false, 'hour is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 2, 4, 5, 10))), false, 'hour is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 5, 5, 10))), false, 'minute is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 3, 5, 10))), false, 'minute is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 6, 10))), false, 'second is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 4, 11))), false, 'second is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 5, 10))), true, 'millisecond match');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 5, 11))), false, 'millisecond is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 5, 9))), false, 'millisecond is earlier');
+        assert.equal(m.isSame(m), true, 'moments are the same as themselves');
+        assert.equal(+m, +mCopy, 'isSame second should not change moment');
+    });
+
+    test('is same year', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'year'), true, 'year match');
+        assert.equal(m.isSame(moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'years'), true, 'plural should work');
+        assert.equal(m.isSame(moment(new Date(2012, 5, 6, 7, 8, 9, 10)), 'year'), false, 'year mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 0, 1, 0, 0, 0, 0)), 'year'), true, 'exact start of year');
+        assert.equal(m.isSame(moment(new Date(2011, 11, 31, 23, 59, 59, 999)), 'year'), true, 'exact end of year');
+        assert.equal(m.isSame(moment(new Date(2012, 0, 1, 0, 0, 0, 0)), 'year'), false, 'start of next year');
+        assert.equal(m.isSame(moment(new Date(2010, 11, 31, 23, 59, 59, 999)), 'year'), false, 'end of previous year');
+        assert.equal(m.isSame(m, 'year'), true, 'same moments are in the same year');
+        assert.equal(+m, +mCopy, 'isSame year should not change moment');
+    });
+
+    test('is same month', function (assert) {
+        var m = moment(new Date(2011, 2, 3, 4, 5, 6, 7)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2011, 2, 6, 7, 8, 9, 10)), 'month'), true, 'month match');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 6, 7, 8, 9, 10)), 'months'), true, 'plural should work');
+        assert.equal(m.isSame(moment(new Date(2012, 2, 6, 7, 8, 9, 10)), 'month'), false, 'year mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 5, 6, 7, 8, 9, 10)), 'month'), false, 'month mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 1, 0, 0, 0, 0)), 'month'), true, 'exact start of month');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 31, 23, 59, 59, 999)), 'month'), true, 'exact end of month');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 1, 0, 0, 0, 0)), 'month'), false, 'start of next month');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 27, 23, 59, 59, 999)), 'month'), false, 'end of previous month');
+        assert.equal(m.isSame(m, 'month'), true, 'same moments are in the same month');
+        assert.equal(+m, +mCopy, 'isSame month should not change moment');
+    });
+
+    test('is same day', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 7, 8, 9, 10)), 'day'), true, 'day match');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 7, 8, 9, 10)), 'days'), true, 'plural should work');
+        assert.equal(m.isSame(moment(new Date(2012, 1, 2, 7, 8, 9, 10)), 'day'), false, 'year mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 2, 7, 8, 9, 10)), 'day'), false, 'month mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 3, 7, 8, 9, 10)), 'day'), false, 'day mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 0, 0, 0, 0)), 'day'), true, 'exact start of day');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 23, 59, 59, 999)), 'day'), true, 'exact end of day');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 3, 0, 0, 0, 0)), 'day'), false, 'start of next day');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 1, 23, 59, 59, 999)), 'day'), false, 'end of previous day');
+        assert.equal(m.isSame(m, 'day'), true, 'same moments are in the same day');
+        assert.equal(+m, +mCopy, 'isSame day should not change moment');
+    });
+
+    test('is same hour', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 8, 9, 10)), 'hour'), true, 'hour match');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 8, 9, 10)), 'hours'), true, 'plural should work');
+        assert.equal(m.isSame(moment(new Date(2012, 1, 2, 3, 8, 9, 10)), 'hour'), false, 'year mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 2, 3, 8, 9, 10)), 'hour'), false, 'month mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 3, 3, 8, 9, 10)), 'hour'), false, 'day mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 4, 8, 9, 10)), 'hour'), false, 'hour mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 0, 0, 0)), 'hour'), true, 'exact start of hour');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 59, 59, 999)), 'hour'), true, 'exact end of hour');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 4, 0, 0, 0)), 'hour'), false, 'start of next hour');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 2, 59, 59, 999)), 'hour'), false, 'end of previous hour');
+        assert.equal(m.isSame(m, 'hour'), true, 'same moments are in the same hour');
+        assert.equal(+m, +mCopy, 'isSame hour should not change moment');
+    });
+
+    test('is same minute', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 9, 10)), 'minute'), true, 'minute match');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 9, 10)), 'minutes'), true, 'plural should work');
+        assert.equal(m.isSame(moment(new Date(2012, 1, 2, 3, 4, 9, 10)), 'minute'), false, 'year mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 2, 3, 4, 9, 10)), 'minute'), false, 'month mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 3, 3, 4, 9, 10)), 'minute'), false, 'day mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 4, 4, 9, 10)), 'minute'), false, 'hour mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 5, 9, 10)), 'minute'), false, 'minute mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 0, 0)), 'minute'), true, 'exact start of minute');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 59, 999)), 'minute'), true, 'exact end of minute');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 5, 0, 0)), 'minute'), false, 'start of next minute');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 3, 59, 999)), 'minute'), false, 'end of previous minute');
+        assert.equal(m.isSame(m, 'minute'), true, 'same moments are in the same minute');
+        assert.equal(+m, +mCopy, 'isSame minute should not change moment');
+    });
+
+    test('is same second', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 5, 10)), 'second'), true, 'second match');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 5, 10)), 'seconds'), true, 'plural should work');
+        assert.equal(m.isSame(moment(new Date(2012, 1, 2, 3, 4, 5, 10)), 'second'), false, 'year mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 2, 3, 4, 5, 10)), 'second'), false, 'month mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 3, 3, 4, 5, 10)), 'second'), false, 'day mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 4, 4, 5, 10)), 'second'), false, 'hour mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 5, 5, 10)), 'second'), false, 'minute mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 6, 10)), 'second'), false, 'second mismatch');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 5, 0)), 'second'), true, 'exact start of second');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 5, 999)), 'second'), true, 'exact end of second');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 6, 0)), 'second'), false, 'start of next second');
+        assert.equal(m.isSame(moment(new Date(2011, 1, 2, 3, 4, 4, 999)), 'second'), false, 'end of previous second');
+        assert.equal(m.isSame(m, 'second'), true, 'same moments are in the same second');
+        assert.equal(+m, +mCopy, 'isSame second should not change moment');
+    });
+
+    test('is same millisecond', function (assert) {
+        var m = moment(new Date(2011, 3, 2, 3, 4, 5, 10)), mCopy = moment(m);
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 5, 10)), 'millisecond'), true, 'millisecond match');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 5, 10)), 'milliseconds'), true, 'plural should work');
+        assert.equal(m.isSame(moment(new Date(2012, 3, 2, 3, 4, 5, 10)), 'millisecond'), false, 'year is later');
+        assert.equal(m.isSame(moment(new Date(2010, 3, 2, 3, 4, 5, 10)), 'millisecond'), false, 'year is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 4, 2, 3, 4, 5, 10)), 'millisecond'), false, 'month is later');
+        assert.equal(m.isSame(moment(new Date(2011, 2, 2, 3, 4, 5, 10)), 'millisecond'), false, 'month is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 3, 3, 4, 5, 10)), 'millisecond'), false, 'day is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 1, 1, 4, 5, 10)), 'millisecond'), false, 'day is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 4, 4, 5, 10)), 'millisecond'), false, 'hour is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 1, 4, 1, 5, 10)), 'millisecond'), false, 'hour is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 5, 5, 10)), 'millisecond'), false, 'minute is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 3, 5, 10)), 'millisecond'), false, 'minute is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 6, 10)), 'millisecond'), false, 'second is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 4, 5)), 'millisecond'), false, 'second is earlier');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 6, 11)), 'millisecond'), false, 'millisecond is later');
+        assert.equal(m.isSame(moment(new Date(2011, 3, 2, 3, 4, 4, 9)), 'millisecond'), false, 'millisecond is earlier');
+        assert.equal(m.isSame(m, 'millisecond'), true, 'same moments are in the same millisecond');
+        assert.equal(+m, +mCopy, 'isSame millisecond should not change moment');
+    });
+
+    test('is same with utc offset moments', function (assert) {
+        assert.ok(moment.parseZone('2013-02-01T-05:00').isSame(moment('2013-02-01'), 'year'), 'zoned vs local moment');
+        assert.ok(moment('2013-02-01').isSame(moment('2013-02-01').utcOffset('-05:00'), 'year'), 'local vs zoned moment');
+        assert.ok(moment.parseZone('2013-02-01T-05:00').isSame(moment.parseZone('2013-02-01T-06:30'), 'year'),
+                'zoned vs (differently) zoned moment');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('is valid');
+
+    test('array bad month', function (assert) {
+        assert.equal(moment([2010, -1]).isValid(), false, 'month -1 invalid');
+        assert.equal(moment([2100, 12]).isValid(), false, 'month 12 invalid');
+    });
+
+    test('array good month', function (assert) {
+        for (var i = 0; i < 12; i++) {
+            assert.equal(moment([2010, i]).isValid(), true, 'month ' + i);
+            assert.equal(moment.utc([2010, i]).isValid(), true, 'month ' + i);
+        }
+    });
+
+    test('array bad date', function (assert) {
+        var tests = [
+            moment([2010, 0, 0]),
+            moment([2100, 0, 32]),
+            moment.utc([2010, 0, 0]),
+            moment.utc([2100, 0, 32])
+        ],
+        i, m;
+
+        for (i in tests) {
+            m = tests[i];
+            assert.equal(m.isValid(), false);
+        }
+    });
+
+    test('h/hh with hour > 12', function (assert) {
+        assert.ok(moment('06/20/2014 11:51 PM', 'MM/DD/YYYY hh:mm A', true).isValid(), '11 for hh');
+        assert.ok(moment('06/20/2014 11:51 AM', 'MM/DD/YYYY hh:mm A', true).isValid(), '11 for hh');
+        assert.ok(moment('06/20/2014 23:51 PM', 'MM/DD/YYYY hh:mm A').isValid(), 'non-strict validity 23 for hh');
+        assert.ok(moment('06/20/2014 23:51 PM', 'MM/DD/YYYY hh:mm A').parsingFlags().bigHour, 'non-strict bigHour 23 for hh');
+        assert.ok(!moment('06/20/2014 23:51 PM', 'MM/DD/YYYY hh:mm A', true).isValid(), 'validity 23 for hh');
+        assert.ok(moment('06/20/2014 23:51 PM', 'MM/DD/YYYY hh:mm A', true).parsingFlags().bigHour, 'bigHour 23 for hh');
+    });
+
+    test('array bad date leap year', function (assert) {
+        assert.equal(moment([2010, 1, 29]).isValid(), false, '2010 feb 29');
+        assert.equal(moment([2100, 1, 29]).isValid(), false, '2100 feb 29');
+        assert.equal(moment([2008, 1, 30]).isValid(), false, '2008 feb 30');
+        assert.equal(moment([2000, 1, 30]).isValid(), false, '2000 feb 30');
+
+        assert.equal(moment.utc([2010, 1, 29]).isValid(), false, 'utc 2010 feb 29');
+        assert.equal(moment.utc([2100, 1, 29]).isValid(), false, 'utc 2100 feb 29');
+        assert.equal(moment.utc([2008, 1, 30]).isValid(), false, 'utc 2008 feb 30');
+        assert.equal(moment.utc([2000, 1, 30]).isValid(), false, 'utc 2000 feb 30');
+    });
+
+    test('string + formats bad date', function (assert) {
+        assert.equal(moment('2020-00-00', []).isValid(), false, 'invalid on empty array');
+        assert.equal(moment('2020-00-00', ['YYYY-MM-DD', 'DD-MM-YYYY']).isValid(), false, 'invalid on all in array');
+        assert.equal(moment('2020-00-00', ['DD-MM-YYYY', 'YYYY-MM-DD']).isValid(), false, 'invalid on all in array');
+        assert.equal(moment('2020-01-01', ['YYYY-MM-DD', 'DD-MM-YYYY']).isValid(), true, 'valid on first');
+        assert.equal(moment('2020-01-01', ['DD-MM-YYYY', 'YYYY-MM-DD']).isValid(), true, 'valid on last');
+        assert.equal(moment('2020-01-01', ['YYYY-MM-DD', 'YYYY-DD-MM']).isValid(), true, 'valid on both');
+        assert.equal(moment('2020-13-01', ['YYYY-MM-DD', 'YYYY-DD-MM']).isValid(), true, 'valid on last');
+
+        assert.equal(moment('12-13-2012', ['DD-MM-YYYY', 'YYYY-MM-DD']).isValid(), false, 'month rollover');
+        assert.equal(moment('12-13-2012', ['DD-MM-YYYY', 'DD-MM-YYYY']).isValid(), false, 'month rollover');
+        assert.equal(moment('38-12-2012', ['DD-MM-YYYY']).isValid(), false, 'day rollover');
+    });
+
+    test('string nonsensical with format', function (assert) {
+        assert.equal(moment('fail', 'MM-DD-YYYY').isValid(), false, 'string \'fail\' with format \'MM-DD-YYYY\'');
+        assert.equal(moment('xx-xx-2001', 'DD-MM-YYY').isValid(), true, 'string \'xx-xx-2001\' with format \'MM-DD-YYYY\'');
+    });
+
+    test('string with bad month name', function (assert) {
+        assert.equal(moment('01-Nam-2012', 'DD-MMM-YYYY').isValid(), false, '\'Nam\' is an invalid month');
+        assert.equal(moment('01-Aug-2012', 'DD-MMM-YYYY').isValid(), true, '\'Aug\' is a valid month');
+    });
+
+    test('string with spaceless format', function (assert) {
+        assert.equal(moment('10Sep2001', 'DDMMMYYYY').isValid(), true, 'Parsing 10Sep2001 should result in a valid date');
+    });
+
+    test('invalid string iso 8601', function (assert) {
+        var tests = [
+            '2010-00-00',
+            '2010-01-00',
+            '2010-01-40',
+            '2010-01-01T24:01',  // 24:00:00 is actually valid
+            '2010-01-01T23:60',
+            '2010-01-01T23:59:60'
+        ], i;
+
+        for (i = 0; i < tests.length; i++) {
+            assert.equal(moment(tests[i]).isValid(), false, tests[i] + ' should be invalid');
+            assert.equal(moment.utc(tests[i]).isValid(), false, tests[i] + ' should be invalid');
+        }
+    });
+
+    test('invalid string iso 8601 + timezone', function (assert) {
+        var tests = [
+            '2010-00-00T+00:00',
+            '2010-01-00T+00:00',
+            '2010-01-40T+00:00',
+            '2010-01-40T24:01+00:00',
+            '2010-01-40T23:60+00:00',
+            '2010-01-40T23:59:60+00:00',
+            '2010-01-40T23:59:59.9999+00:00'
+        ], i;
+
+        for (i = 0; i < tests.length; i++) {
+            assert.equal(moment(tests[i]).isValid(), false, tests[i] + ' should be invalid');
+            assert.equal(moment.utc(tests[i]).isValid(), false, tests[i] + ' should be invalid');
+        }
+    });
+
+    test('valid string iso 8601 + timezone', function (assert) {
+        var tests = [
+            '2010-01-01',
+            '2010-01-30',
+            '2010-01-30T23+00:00',
+            '2010-01-30T23:59+00:00',
+            '2010-01-30T23:59:59+00:00',
+            '2010-01-30T23:59:59.999+00:00',
+            '2010-01-30T23:59:59.999-07:00',
+            '2010-01-30T00:00:00.000+07:00',
+            '2010-01-30T00:00:00.000+07'
+        ], i;
+
+        for (i = 0; i < tests.length; i++) {
+            assert.equal(moment(tests[i]).isValid(), true, tests[i] + ' should be valid');
+            assert.equal(moment.utc(tests[i]).isValid(), true, tests[i] + ' should be valid');
+        }
+    });
+
+    test('invalidAt', function (assert) {
+        assert.equal(moment([2000, 12]).invalidAt(), 1, 'month 12 is invalid: 0-11');
+        assert.equal(moment([2000, 1, 30]).invalidAt(), 2, '30 is not a valid february day');
+        assert.equal(moment([2000, 1, 29, 25]).invalidAt(), 3, '25 is invalid hour');
+        assert.equal(moment([2000, 1, 29, 24,  1]).invalidAt(), 3, '24:01 is invalid hour');
+        assert.equal(moment([2000, 1, 29, 23, 60]).invalidAt(), 4, '60 is invalid minute');
+        assert.equal(moment([2000, 1, 29, 23, 59, 60]).invalidAt(), 5, '60 is invalid second');
+        assert.equal(moment([2000, 1, 29, 23, 59, 59, 1000]).invalidAt(), 6, '1000 is invalid millisecond');
+        assert.equal(moment([2000, 1, 29, 23, 59, 59, 999]).invalidAt(), -1, '-1 if everything is fine');
+    });
+
+    test('valid Unix timestamp', function (assert) {
+        assert.equal(moment(1371065286, 'X').isValid(), true, 'number integer');
+        assert.equal(moment(1379066897.0, 'X').isValid(), true, 'number whole 1dp');
+        assert.equal(moment(1379066897.7, 'X').isValid(), true, 'number 1dp');
+        assert.equal(moment(1379066897.00, 'X').isValid(), true, 'number whole 2dp');
+        assert.equal(moment(1379066897.07, 'X').isValid(), true, 'number 2dp');
+        assert.equal(moment(1379066897.17, 'X').isValid(), true, 'number 2dp');
+        assert.equal(moment(1379066897.000, 'X').isValid(), true, 'number whole 3dp');
+        assert.equal(moment(1379066897.007, 'X').isValid(), true, 'number 3dp');
+        assert.equal(moment(1379066897.017, 'X').isValid(), true, 'number 3dp');
+        assert.equal(moment(1379066897.157, 'X').isValid(), true, 'number 3dp');
+        assert.equal(moment('1371065286', 'X').isValid(), true, 'string integer');
+        assert.equal(moment('1379066897.', 'X').isValid(), true, 'string trailing .');
+        assert.equal(moment('1379066897.0', 'X').isValid(), true, 'string whole 1dp');
+        assert.equal(moment('1379066897.7', 'X').isValid(), true, 'string 1dp');
+        assert.equal(moment('1379066897.00', 'X').isValid(), true, 'string whole 2dp');
+        assert.equal(moment('1379066897.07', 'X').isValid(), true, 'string 2dp');
+        assert.equal(moment('1379066897.17', 'X').isValid(), true, 'string 2dp');
+        assert.equal(moment('1379066897.000', 'X').isValid(), true, 'string whole 3dp');
+        assert.equal(moment('1379066897.007', 'X').isValid(), true, 'string 3dp');
+        assert.equal(moment('1379066897.017', 'X').isValid(), true, 'string 3dp');
+        assert.equal(moment('1379066897.157', 'X').isValid(), true, 'string 3dp');
+    });
+
+    test('invalid Unix timestamp', function (assert) {
+        assert.equal(moment(undefined, 'X').isValid(), false, 'undefined');
+        assert.equal(moment('undefined', 'X').isValid(), false, 'string undefined');
+        try {
+            assert.equal(moment(null, 'X').isValid(), false, 'null');
+        } catch (e) {
+            assert.ok(true, 'null');
+        }
+
+        assert.equal(moment('null', 'X').isValid(), false, 'string null');
+        assert.equal(moment([], 'X').isValid(), false, 'array');
+        assert.equal(moment('{}', 'X').isValid(), false, 'object');
+        try {
+            assert.equal(moment('', 'X').isValid(), false, 'string empty');
+        } catch (e) {
+            assert.ok(true, 'string empty');
+        }
+
+        assert.equal(moment(' ', 'X').isValid(), false, 'string space');
+    });
+
+    test('valid Unix offset milliseconds', function (assert) {
+        assert.equal(moment(1234567890123, 'x').isValid(), true, 'number integer');
+        assert.equal(moment('1234567890123', 'x').isValid(), true, 'string integer');
+    });
+
+    test('invalid Unix offset milliseconds', function (assert) {
+        assert.equal(moment(undefined, 'x').isValid(), false, 'undefined');
+        assert.equal(moment('undefined', 'x').isValid(), false, 'string undefined');
+        try {
+            assert.equal(moment(null, 'x').isValid(), false, 'null');
+        } catch (e) {
+            assert.ok(true, 'null');
+        }
+
+        assert.equal(moment('null', 'x').isValid(), false, 'string null');
+        assert.equal(moment([], 'x').isValid(), false, 'array');
+        assert.equal(moment('{}', 'x').isValid(), false, 'object');
+        try {
+            assert.equal(moment('', 'x').isValid(), false, 'string empty');
+        } catch (e) {
+            assert.ok(true, 'string empty');
+        }
+
+        assert.equal(moment(' ', 'x').isValid(), false, 'string space');
+    });
+
+    test('empty', function (assert) {
+        assert.equal(moment(null).isValid(), false, 'null');
+        assert.equal(moment('').isValid(), false, 'empty string');
+        assert.equal(moment(null, 'YYYY').isValid(), false, 'format + null');
+        assert.equal(moment('', 'YYYY').isValid(), false, 'format + empty string');
+        assert.equal(moment(' ', 'YYYY').isValid(), false, 'format + empty when trimmed');
+    });
+
+    test('days of the year', function (assert) {
+        assert.equal(moment('2010 300', 'YYYY DDDD').isValid(), true, 'day 300 of year valid');
+        assert.equal(moment('2010 365', 'YYYY DDDD').isValid(), true, 'day 365 of year valid');
+        assert.equal(moment('2010 366', 'YYYY DDDD').isValid(), false, 'day 366 of year invalid');
+        assert.equal(moment('2012 365', 'YYYY DDDD').isValid(), true, 'day 365 of leap year valid');
+        assert.equal(moment('2012 366', 'YYYY DDDD').isValid(), true, 'day 366 of leap year valid');
+        assert.equal(moment('2012 367', 'YYYY DDDD').isValid(), false, 'day 367 of leap year invalid');
+    });
+
+    test('24:00:00.000 is valid', function (assert) {
+        assert.equal(moment('2014-01-01 24', 'YYYY-MM-DD HH').isValid(), true, '24 is valid');
+        assert.equal(moment('2014-01-01 24:00', 'YYYY-MM-DD HH:mm').isValid(), true, '24:00 is valid');
+        assert.equal(moment('2014-01-01 24:01', 'YYYY-MM-DD HH:mm').isValid(), false, '24:01 is not valid');
+    });
+
+    test('oddball permissiveness', function (assert) {
+        //https://github.com/moment/moment/issues/1128
+        assert.ok(moment('2010-10-3199', ['MM/DD/YYYY', 'MM-DD-YYYY', 'YYYY-MM-DD']).isValid());
+
+        //https://github.com/moment/moment/issues/1122
+        assert.ok(moment('3:25', ['h:mma', 'hh:mma', 'H:mm', 'HH:mm']).isValid());
+    });
+
+    test('0 hour is invalid in strict', function (assert) {
+        assert.equal(moment('00:01', 'hh:mm', true).isValid(), false, '00 hour is invalid in strict');
+        assert.equal(moment('00:01', 'hh:mm').isValid(), true, '00 hour is valid in normal');
+        assert.equal(moment('0:01', 'h:mm', true).isValid(), false, '0 hour is invalid in strict');
+        assert.equal(moment('0:01', 'h:mm').isValid(), true, '0 hour is valid in normal');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('leap year');
+
+    test('leap year', function (assert) {
+        assert.equal(moment([2010, 0, 1]).isLeapYear(), false, '2010');
+        assert.equal(moment([2100, 0, 1]).isLeapYear(), false, '2100');
+        assert.equal(moment([2008, 0, 1]).isLeapYear(), true, '2008');
+        assert.equal(moment([2000, 0, 1]).isLeapYear(), true, '2000');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('listers');
+
+    test('default', function (assert) {
+        assert.deepEqual(moment.months(), ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']);
+        assert.deepEqual(moment.monthsShort(), ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']);
+        assert.deepEqual(moment.weekdays(), ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']);
+        assert.deepEqual(moment.weekdaysShort(), ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']);
+        assert.deepEqual(moment.weekdaysMin(), ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa']);
+    });
+
+    test('index', function (assert) {
+        assert.equal(moment.months(0), 'January');
+        assert.equal(moment.months(2), 'March');
+        assert.equal(moment.monthsShort(0), 'Jan');
+        assert.equal(moment.monthsShort(2), 'Mar');
+        assert.equal(moment.weekdays(0), 'Sunday');
+        assert.equal(moment.weekdays(2), 'Tuesday');
+        assert.equal(moment.weekdaysShort(0), 'Sun');
+        assert.equal(moment.weekdaysShort(2), 'Tue');
+        assert.equal(moment.weekdaysMin(0), 'Su');
+        assert.equal(moment.weekdaysMin(2), 'Tu');
+    });
+
+    test('localized', function (assert) {
+        var months = 'one_two_three_four_five_six_seven_eight_nine_ten_eleven_twelve'.split('_'),
+            monthsShort = 'on_tw_th_fo_fi_si_se_ei_ni_te_el_tw'.split('_'),
+            weekdays = 'one_two_three_four_five_six_seven'.split('_'),
+            weekdaysShort = 'on_tw_th_fo_fi_si_se'.split('_'),
+            weekdaysMin = '1_2_3_4_5_6_7'.split('_');
+
+        moment.locale('numerologists', {
+            months : months,
+            monthsShort : monthsShort,
+            weekdays : weekdays,
+            weekdaysShort: weekdaysShort,
+            weekdaysMin: weekdaysMin
+        });
+
+        assert.deepEqual(moment.months(), months);
+        assert.deepEqual(moment.monthsShort(), monthsShort);
+        assert.deepEqual(moment.weekdays(), weekdays);
+        assert.deepEqual(moment.weekdaysShort(), weekdaysShort);
+        assert.deepEqual(moment.weekdaysMin(), weekdaysMin);
+
+        assert.equal(moment.months(0), 'one');
+        assert.equal(moment.monthsShort(0), 'on');
+        assert.equal(moment.weekdays(0), 'one');
+        assert.equal(moment.weekdaysShort(0), 'on');
+        assert.equal(moment.weekdaysMin(0), '1');
+
+        assert.equal(moment.months(2), 'three');
+        assert.equal(moment.monthsShort(2), 'th');
+        assert.equal(moment.weekdays(2), 'three');
+        assert.equal(moment.weekdaysShort(2), 'th');
+        assert.equal(moment.weekdaysMin(2), '3');
+    });
+
+    test('with functions', function (assert) {
+        var monthsShort = 'one_two_three_four_five_six_seven_eight_nine_ten_eleven_twelve'.split('_'),
+            monthsShortWeird = 'onesy_twosy_threesy_foursy_fivesy_sixsy_sevensy_eightsy_ninesy_tensy_elevensy_twelvesy'.split('_');
+
+        moment.locale('difficult', {
+
+            monthsShort: function (m, format) {
+                var arr = format.match(/-MMM-/) ? monthsShortWeird : monthsShort;
+                return arr[m.month()];
+            }
+        });
+
+        assert.deepEqual(moment.monthsShort(), monthsShort);
+        assert.deepEqual(moment.monthsShort('MMM'), monthsShort);
+        assert.deepEqual(moment.monthsShort('-MMM-'), monthsShortWeird);
+
+        assert.deepEqual(moment.monthsShort('MMM', 2), 'three');
+        assert.deepEqual(moment.monthsShort('-MMM-', 2), 'threesy');
+        assert.deepEqual(moment.monthsShort(2), 'three');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function each(array, callback) {
+        var i;
+        for (i = 0; i < array.length; i++) {
+            callback(array[i], i, array);
+        }
+    }
+
+    var helpers_each = each;
+
+    module('locale', {
+        setup : function () {
+            // TODO: Remove once locales are switched to ES6
+            helpers_each([{
+                name: 'en-gb',
+                data: {}
+            }, {
+                name: 'en-ca',
+                data: {}
+            }, {
+                name: 'es',
+                data: {
+                    relativeTime: {past: 'hace %s', s: 'unos segundos', d: 'un día'},
+                    months: 'enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre'.split('_')
+                }
+            }, {
+                name: 'fr',
+                data: {}
+            }, {
+                name: 'fr-ca',
+                data: {}
+            }, {
+                name: 'it',
+                data: {}
+            }, {
+                name: 'zh-cn',
+                data: {
+                    months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_')
+                }
+            }], function (locale) {
+                if (moment.locale(locale.name) !== locale.name) {
+                    moment.defineLocale(locale.name, locale.data);
+                }
+            });
+            moment.locale('en');
+        }
+    });
+
+    test('library getters and setters', function (assert) {
+        var r = moment.locale('en');
+
+        assert.equal(r, 'en', 'locale should return en by default');
+        assert.equal(moment.locale(), 'en', 'locale should return en by default');
+
+        moment.locale('fr');
+        assert.equal(moment.locale(), 'fr', 'locale should return the changed locale');
+
+        moment.locale('en-gb');
+        assert.equal(moment.locale(), 'en-gb', 'locale should return the changed locale');
+
+        moment.locale('en');
+        assert.equal(moment.locale(), 'en', 'locale should reset');
+
+        moment.locale('does-not-exist');
+        assert.equal(moment.locale(), 'en', 'locale should reset');
+
+        moment.locale('EN');
+        assert.equal(moment.locale(), 'en', 'Normalize locale key case');
+
+        moment.locale('EN_gb');
+        assert.equal(moment.locale(), 'en-gb', 'Normalize locale key underscore');
+    });
+
+    test('library setter array of locales', function (assert) {
+        assert.equal(moment.locale(['non-existent', 'fr', 'also-non-existent']), 'fr', 'passing an array uses the first valid locale');
+        assert.equal(moment.locale(['es', 'fr', 'also-non-existent']), 'es', 'passing an array uses the first valid locale');
+    });
+
+    test('library setter locale substrings', function (assert) {
+        assert.equal(moment.locale('fr-crap'), 'fr', 'use substrings');
+        assert.equal(moment.locale('fr-does-not-exist'), 'fr', 'uses deep substrings');
+        assert.equal(moment.locale('fr-CA-does-not-exist'), 'fr-ca', 'uses deepest substring');
+    });
+
+    test('library getter locale array and substrings', function (assert) {
+        assert.equal(moment.locale(['en-CH', 'fr']), 'en', 'prefer root locale to shallower ones');
+        assert.equal(moment.locale(['en-gb-leeds', 'en-CA']), 'en-gb', 'prefer root locale to shallower ones');
+        assert.equal(moment.locale(['en-fake', 'en-CA']), 'en-ca', 'prefer alternatives with shared roots');
+        assert.equal(moment.locale(['en-fake', 'en-fake2', 'en-ca']), 'en-ca', 'prefer alternatives with shared roots');
+        assert.equal(moment.locale(['fake-CA', 'fake-MX', 'fr']), 'fr', 'always find something if possible');
+        assert.equal(moment.locale(['fake-CA', 'fake-MX', 'fr']), 'fr', 'always find something if possible');
+        assert.equal(moment.locale(['fake-CA', 'fake-MX', 'fr-fake-fake-fake']), 'fr', 'always find something if possible');
+        assert.equal(moment.locale(['en', 'en-CA']), 'en', 'prefer earlier if it works');
+    });
+
+    test('library ensure inheritance', function (assert) {
+        moment.locale('made-up', {
+            // I put them out of order
+            months : 'February_March_April_May_June_July_August_September_October_November_December_January'.split('_')
+            // the rest of the properties should be inherited.
+        });
+
+        assert.equal(moment([2012, 5, 6]).format('MMMM'), 'July', 'Override some of the configs');
+        assert.equal(moment([2012, 5, 6]).format('MMM'), 'Jun', 'But not all of them');
+    });
+
+    test('library ensure inheritance LT L LL LLL LLLL', function (assert) {
+        var locale = 'test-inherit-lt';
+
+        moment.defineLocale(locale, {
+            longDateFormat : {
+                LT : '-[LT]-',
+                L : '-[L]-',
+                LL : '-[LL]-',
+                LLL : '-[LLL]-',
+                LLLL : '-[LLLL]-'
+            },
+            calendar : {
+                sameDay : '[sameDay] LT',
+                nextDay : '[nextDay] L',
+                nextWeek : '[nextWeek] LL',
+                lastDay : '[lastDay] LLL',
+                lastWeek : '[lastWeek] LLLL',
+                sameElse : 'L'
+            }
+        });
+
+        moment.locale('es');
+
+        assert.equal(moment().locale(locale).calendar(), 'sameDay -LT-', 'Should use instance locale in LT formatting');
+        assert.equal(moment().add(1, 'days').locale(locale).calendar(), 'nextDay -L-', 'Should use instance locale in L formatting');
+        assert.equal(moment().add(-1, 'days').locale(locale).calendar(), 'lastDay -LLL-', 'Should use instance locale in LL formatting');
+        assert.equal(moment().add(4, 'days').locale(locale).calendar(), 'nextWeek -LL-', 'Should use instance locale in LLL formatting');
+        assert.equal(moment().add(-4, 'days').locale(locale).calendar(), 'lastWeek -LLLL-', 'Should use instance locale in LLLL formatting');
+    });
+
+    test('library localeData', function (assert) {
+        moment.locale('en');
+
+        var jan = moment([2000, 0]);
+
+        assert.equal(moment.localeData().months(jan), 'January', 'no arguments returns global');
+        assert.equal(moment.localeData('zh-cn').months(jan), '一月', 'a string returns the locale based on key');
+        assert.equal(moment.localeData(moment().locale('es')).months(jan), 'Enero', 'if you pass in a moment it uses the moment\'s locale');
+    });
+
+    test('library deprecations', function (assert) {
+        moment.lang('dude', {months: ['Movember']});
+        assert.equal(moment.locale(), 'dude', 'setting the lang sets the locale');
+        assert.equal(moment.lang(), moment.locale());
+        assert.equal(moment.langData(), moment.localeData(), 'langData is localeData');
+    });
+
+    test('defineLocale', function (assert) {
+        moment.locale('en');
+        moment.defineLocale('dude', {months: ['Movember']});
+        assert.equal(moment().locale(), 'dude', 'defineLocale also sets it');
+        assert.equal(moment().locale('dude').locale(), 'dude', 'defineLocale defines a locale');
+    });
+
+    test('library convenience', function (assert) {
+        moment.locale('something', {week: {dow: 3}});
+        moment.locale('something');
+        assert.equal(moment.locale(), 'something', 'locale can be used to create the locale too');
+    });
+
+    test('firstDayOfWeek firstDayOfYear locale getters', function (assert) {
+        moment.locale('something', {week: {dow: 3, doy: 4}});
+        moment.locale('something');
+        assert.equal(moment.localeData().firstDayOfWeek(), 3, 'firstDayOfWeek');
+        assert.equal(moment.localeData().firstDayOfYear(), 4, 'firstDayOfYear');
+    });
+
+    test('instance locale method', function (assert) {
+        moment.locale('en');
+
+        assert.equal(moment([2012, 5, 6]).format('MMMM'), 'June', 'Normally default to global');
+        assert.equal(moment([2012, 5, 6]).locale('es').format('MMMM'), 'Junio', 'Use the instance specific locale');
+        assert.equal(moment([2012, 5, 6]).format('MMMM'), 'June', 'Using an instance specific locale does not affect other moments');
+    });
+
+    test('instance locale method with array', function (assert) {
+        var m = moment().locale(['non-existent', 'fr', 'also-non-existent']);
+        assert.equal(m.locale(), 'fr', 'passing an array uses the first valid locale');
+        m = moment().locale(['es', 'fr', 'also-non-existent']);
+        assert.equal(m.locale(), 'es', 'passing an array uses the first valid locale');
+    });
+
+    test('instance getter locale substrings', function (assert) {
+        var m = moment();
+
+        m.locale('fr-crap');
+        assert.equal(m.locale(), 'fr', 'use substrings');
+
+        m.locale('fr-does-not-exist');
+        assert.equal(m.locale(), 'fr', 'uses deep substrings');
+    });
+
+    test('instance locale persists with manipulation', function (assert) {
+        moment.locale('en');
+
+        assert.equal(moment([2012, 5, 6]).locale('es').add({days: 1}).format('MMMM'), 'Junio', 'With addition');
+        assert.equal(moment([2012, 5, 6]).locale('es').day(0).format('MMMM'), 'Junio', 'With day getter');
+        assert.equal(moment([2012, 5, 6]).locale('es').endOf('day').format('MMMM'), 'Junio', 'With endOf');
+    });
+
+    test('instance locale persists with cloning', function (assert) {
+        moment.locale('en');
+
+        var a = moment([2012, 5, 6]).locale('es'),
+            b = a.clone(),
+            c = moment(a);
+
+        assert.equal(b.format('MMMM'), 'Junio', 'using moment.fn.clone()');
+        assert.equal(b.format('MMMM'), 'Junio', 'using moment()');
+    });
+
+    test('duration locale method', function (assert) {
+        moment.locale('en');
+
+        assert.equal(moment.duration({seconds:  44}).humanize(), 'a few seconds', 'Normally default to global');
+        assert.equal(moment.duration({seconds:  44}).locale('es').humanize(), 'unos segundos', 'Use the instance specific locale');
+        assert.equal(moment.duration({seconds:  44}).humanize(), 'a few seconds', 'Using an instance specific locale does not affect other durations');
+    });
+
+    test('duration locale persists with cloning', function (assert) {
+        moment.locale('en');
+
+        var a = moment.duration({seconds:  44}).locale('es'),
+            b = moment.duration(a);
+
+        assert.equal(b.humanize(), 'unos segundos', 'using moment.duration()');
+    });
+
+    test('changing the global locale doesn\'t affect existing duration instances', function (assert) {
+        var mom = moment.duration();
+        moment.locale('fr');
+        assert.equal('en', mom.locale());
+    });
+
+    test('duration deprecations', function (assert) {
+        assert.equal(moment.duration().lang(), moment.duration().localeData(), 'duration.lang is the same as duration.localeData');
+    });
+
+    test('from and fromNow with invalid date', function (assert) {
+        assert.equal(moment(NaN).from(), 'Invalid date', 'moment.from with invalid moment');
+        assert.equal(moment(NaN).fromNow(), 'Invalid date', 'moment.fromNow with invalid moment');
+    });
+
+    test('from relative time future', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({s: 44})),  'in a few seconds', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({s: 45})),  'in a minute',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({s: 89})),  'in a minute',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({s: 90})),  'in 2 minutes',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({m: 44})),  'in 44 minutes',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({m: 45})),  'in an hour',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({m: 89})),  'in an hour',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({m: 90})),  'in 2 hours',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({h: 5})),   'in 5 hours',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({h: 21})),  'in 21 hours',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({h: 22})),  'in a day',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({h: 35})),  'in a day',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({h: 36})),  'in 2 days',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 1})),   'in a day',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 5})),   'in 5 days',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 25})),  'in 25 days',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 26})),  'in a month',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 30})),  'in a month',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 45})),  'in a month',       '45 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 47})),  'in 2 months',      '47 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 74})),  'in 2 months',      '74 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 78})),  'in 3 months',      '78 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({M: 1})),   'in a month',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({M: 5})),   'in 5 months',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 315})), 'in 10 months',     '315 days = 10 months');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 344})), 'in a year',        '344 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 345})), 'in a year',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({d: 548})), 'in 2 years',       '548 days = in 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({y: 1})),   'in a year',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).subtract({y: 5})),   'in 5 years',       '5 years = 5 years');
+    });
+
+    test('from relative time past', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 44})),  'a few seconds ago', '44 seconds = a few seconds');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 45})),  'a minute ago',      '45 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 89})),  'a minute ago',      '89 seconds = a minute');
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90})),  '2 minutes ago',     '90 seconds = 2 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 44})),  '44 minutes ago',    '44 minutes = 44 minutes');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 45})),  'an hour ago',       '45 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 89})),  'an hour ago',       '89 minutes = an hour');
+        assert.equal(start.from(moment([2007, 1, 28]).add({m: 90})),  '2 hours ago',       '90 minutes = 2 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 5})),   '5 hours ago',       '5 hours = 5 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 21})),  '21 hours ago',      '21 hours = 21 hours');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 22})),  'a day ago',         '22 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 35})),  'a day ago',         '35 hours = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({h: 36})),  '2 days ago',        '36 hours = 2 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 1})),   'a day ago',         '1 day = a day');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 5})),   '5 days ago',        '5 days = 5 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 25})),  '25 days ago',       '25 days = 25 days');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 26})),  'a month ago',       '26 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 30})),  'a month ago',       '30 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 43})),  'a month ago',       '43 days = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 46})),  '2 months ago',      '46 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 74})),  '2 months ago',      '75 days = 2 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 76})),  '3 months ago',      '76 days = 3 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 1})),   'a month ago',       '1 month = a month');
+        assert.equal(start.from(moment([2007, 1, 28]).add({M: 5})),   '5 months ago',      '5 months = 5 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 315})), '10 months ago',     '315 days = 10 months');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 344})), 'a year ago',        '344 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 345})), 'a year ago',        '345 days = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({d: 548})), '2 years ago',       '548 days = 2 years');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 1})),   'a year ago',        '1 year = a year');
+        assert.equal(start.from(moment([2007, 1, 28]).add({y: 5})),   '5 years ago',       '5 years = 5 years');
+    });
+
+    test('instance locale used with from', function (assert) {
+        moment.locale('en');
+
+        var a = moment([2012, 5, 6]).locale('es'),
+            b = moment([2012, 5, 7]);
+
+        assert.equal(a.from(b), 'hace un día', 'preserve locale of first moment');
+        assert.equal(b.from(a), 'in a day', 'do not preserve locale of second moment');
+    });
+
+    test('instance localeData', function (assert) {
+        moment.defineLocale('dude', {week: {dow: 3}});
+        assert.equal(moment().locale('dude').localeData()._week.dow, 3);
+    });
+
+    test('month name callback function', function (assert) {
+        function fakeReplace(m, format) {
+            if (/test/.test(format)) {
+                return 'test';
+            }
+            if (m.date() === 1) {
+                return 'date';
+            }
+            return 'default';
+        }
+
+        moment.locale('made-up-2', {
+            months : fakeReplace,
+            monthsShort : fakeReplace,
+            weekdays : fakeReplace,
+            weekdaysShort : fakeReplace,
+            weekdaysMin : fakeReplace
+        });
+
+        assert.equal(moment().format('[test] dd ddd dddd MMM MMMM'), 'test test test test test test', 'format month name function should be able to access the format string');
+        assert.equal(moment([2011, 0, 1]).format('dd ddd dddd MMM MMMM'), 'date date date date date', 'format month name function should be able to access the moment object');
+        assert.equal(moment([2011, 0, 2]).format('dd ddd dddd MMM MMMM'), 'default default default default default', 'format month name function should be able to access the moment object');
+    });
+
+    test('changing parts of a locale config', function (assert) {
+        moment.locale('partial-lang', {
+            months : 'a b c d e f g h i j k l'.split(' ')
+        });
+
+        assert.equal(moment([2011, 0, 1]).format('MMMM'), 'a', 'should be able to set locale values when creating the localeuage');
+
+        moment.locale('partial-lang', {
+            monthsShort : 'A B C D E F G H I J K L'.split(' ')
+        });
+
+        assert.equal(moment([2011, 0, 1]).format('MMMM MMM'), 'a A', 'should be able to set locale values after creating the localeuage');
+    });
+
+    test('start/endOf week feature for first-day-is-monday locales', function (assert) {
+        moment.locale('monday-lang', {
+            week : {
+                dow : 1 // Monday is the first day of the week
+            }
+        });
+
+        moment.locale('monday-lang');
+        assert.equal(moment([2013, 0, 1]).startOf('week').day(), 1, 'for locale monday-lang first day of the week should be monday');
+        assert.equal(moment([2013, 0, 1]).endOf('week').day(), 0, 'for locale monday-lang last day of the week should be sunday');
+    });
+
+    test('meridiem parsing', function (assert) {
+        moment.locale('meridiem-parsing', {
+            meridiemParse : /[bd]/i,
+            isPM : function (input) {
+                return input === 'b';
+            }
+        });
+
+        moment.locale('meridiem-parsing');
+        assert.equal(moment('2012-01-01 3b', 'YYYY-MM-DD ha').hour(), 15, 'Custom parsing of meridiem should work');
+        assert.equal(moment('2012-01-01 3d', 'YYYY-MM-DD ha').hour(), 3, 'Custom parsing of meridiem should work');
+    });
+
+    test('invalid date formatting', function (assert) {
+        moment.locale('has-invalid', {
+            invalidDate: 'KHAAAAAAAAAAAN!'
+        });
+
+        assert.equal(moment.invalid().format(), 'KHAAAAAAAAAAAN!');
+        assert.equal(moment.invalid().format('YYYY-MM-DD'), 'KHAAAAAAAAAAAN!');
+    });
+
+    test('return locale name', function (assert) {
+        var registered = moment.locale('return-this', {});
+
+        assert.equal(registered, 'return-this', 'returns the locale configured');
+    });
+
+    test('changing the global locale doesn\'t affect existing instances', function (assert) {
+        var mom = moment();
+        moment.locale('fr');
+        assert.equal('en', mom.locale());
+    });
+
+    test('setting a language on instance returns the original moment for chaining', function (assert) {
+        var mom = moment();
+
+        assert.equal(mom.lang('fr'), mom, 'setting the language (lang) returns the original moment for chaining');
+        assert.equal(mom.locale('it'), mom, 'setting the language (locale) returns the original moment for chaining');
+    });
+
+    test('lang(key) changes the language of the instance', function (assert) {
+        var m = moment().month(0);
+        m.lang('fr');
+        assert.equal(m.locale(), 'fr', 'm.lang(key) changes instance locale');
+    });
+
+    test('moment#locale(false) resets to global locale', function (assert) {
+        var m = moment();
+
+        moment.locale('fr');
+        m.locale('it');
+
+        assert.equal(moment.locale(), 'fr', 'global locale is it');
+        assert.equal(m.locale(), 'it', 'instance locale is it');
+        m.locale(false);
+        assert.equal(m.locale(), 'fr', 'instance locale reset to global locale');
+    });
+
+    test('moment().locale with missing key doesn\'t change locale', function (assert) {
+        assert.equal(moment().locale('boo').localeData(), moment.localeData(),
+                'preserve global locale in case of bad locale id');
+    });
+
+    test('moment().lang with missing key doesn\'t change locale', function (assert) {
+        assert.equal(moment().lang('boo').localeData(), moment.localeData(),
+                'preserve global locale in case of bad locale id');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('min max');
+
+    test('min', function (assert) {
+        var now = moment(),
+            future = now.clone().add(1, 'month'),
+            past = now.clone().subtract(1, 'month');
+
+        assert.equal(moment.min(now, future, past), past, 'min(now, future, past)');
+        assert.equal(moment.min(future, now, past), past, 'min(future, now, past)');
+        assert.equal(moment.min(future, past, now), past, 'min(future, past, now)');
+        assert.equal(moment.min(past, future, now), past, 'min(past, future, now)');
+        assert.equal(moment.min(now, past), past, 'min(now, past)');
+        assert.equal(moment.min(past, now), past, 'min(past, now)');
+        assert.equal(moment.min(now), now, 'min(now, past)');
+
+        assert.equal(moment.min([now, future, past]), past, 'min([now, future, past])');
+        assert.equal(moment.min([now, past]), past, 'min(now, past)');
+        assert.equal(moment.min([now]), now, 'min(now)');
+    });
+
+    test('max', function (assert) {
+        var now = moment(),
+            future = now.clone().add(1, 'month'),
+            past = now.clone().subtract(1, 'month');
+
+        assert.equal(moment.max(now, future, past), future, 'max(now, future, past)');
+        assert.equal(moment.max(future, now, past), future, 'max(future, now, past)');
+        assert.equal(moment.max(future, past, now), future, 'max(future, past, now)');
+        assert.equal(moment.max(past, future, now), future, 'max(past, future, now)');
+        assert.equal(moment.max(now, past), now, 'max(now, past)');
+        assert.equal(moment.max(past, now), now, 'max(past, now)');
+        assert.equal(moment.max(now), now, 'max(now, past)');
+
+        assert.equal(moment.max([now, future, past]), future, 'max([now, future, past])');
+        assert.equal(moment.max([now, past]), now, 'max(now, past)');
+        assert.equal(moment.max([now]), now, 'max(now)');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('mutable');
+
+    test('manipulation methods', function (assert) {
+        var m = moment();
+
+        assert.equal(m, m.year(2011), 'year() should be mutable');
+        assert.equal(m, m.month(1), 'month() should be mutable');
+        assert.equal(m, m.hours(7), 'hours() should be mutable');
+        assert.equal(m, m.minutes(33), 'minutes() should be mutable');
+        assert.equal(m, m.seconds(44), 'seconds() should be mutable');
+        assert.equal(m, m.milliseconds(55), 'milliseconds() should be mutable');
+        assert.equal(m, m.day(2), 'day() should be mutable');
+        assert.equal(m, m.startOf('week'), 'startOf() should be mutable');
+        assert.equal(m, m.add(1, 'days'), 'add() should be mutable');
+        assert.equal(m, m.subtract(2, 'years'), 'subtract() should be mutable');
+        assert.equal(m, m.local(), 'local() should be mutable');
+        assert.equal(m, m.utc(), 'utc() should be mutable');
+    });
+
+    test('non mutable methods', function (assert) {
+        var m = moment();
+        assert.notEqual(m, m.clone(), 'clone() should not be mutable');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('normalize units');
+
+    test('normalize units', function (assert) {
+        var fullKeys = ['year', 'quarter', 'month', 'isoWeek', 'week', 'day', 'hour', 'minute', 'second', 'millisecond', 'date', 'dayOfYear', 'weekday', 'isoWeekday', 'weekYear', 'isoWeekYear'],
+            aliases = ['y', 'Q', 'M', 'W', 'w', 'd', 'h', 'm', 's', 'ms', 'D', 'DDD', 'e', 'E', 'gg', 'GG'],
+            length = fullKeys.length,
+            fullKey,
+            fullKeyCaps,
+            fullKeyPlural,
+            fullKeyCapsPlural,
+            fullKeyLower,
+            alias,
+            index;
+
+        for (index = 0; index < length; index += 1) {
+            fullKey = fullKeys[index];
+            fullKeyCaps = fullKey.toUpperCase();
+            fullKeyLower = fullKey.toLowerCase();
+            fullKeyPlural = fullKey + 's';
+            fullKeyCapsPlural = fullKeyCaps + 's';
+            alias = aliases[index];
+            assert.equal(moment.normalizeUnits(fullKey), fullKey, 'Testing full key ' + fullKey);
+            assert.equal(moment.normalizeUnits(fullKeyCaps), fullKey, 'Testing full key capitalised ' + fullKey);
+            assert.equal(moment.normalizeUnits(fullKeyPlural), fullKey, 'Testing full key plural ' + fullKey);
+            assert.equal(moment.normalizeUnits(fullKeyCapsPlural), fullKey, 'Testing full key capitalised and plural ' + fullKey);
+            assert.equal(moment.normalizeUnits(alias), fullKey, 'Testing alias ' + fullKey);
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('parsing flags');
+
+    function flags () {
+        return moment.apply(null, arguments).parsingFlags();
+    }
+
+    test('overflow with array', function (assert) {
+        //months
+        assert.equal(flags([2010, 0]).overflow, -1, 'month 0 valid');
+        assert.equal(flags([2010, 1]).overflow, -1, 'month 1 valid');
+        assert.equal(flags([2010, -1]).overflow, 1, 'month -1 invalid');
+        assert.equal(flags([2100, 12]).overflow, 1, 'month 12 invalid');
+
+        //days
+        assert.equal(flags([2010, 1, 16]).overflow, -1, 'date valid');
+        assert.equal(flags([2010, 1, -1]).overflow, 2, 'date -1 invalid');
+        assert.equal(flags([2010, 1, 0]).overflow, 2, 'date 0 invalid');
+        assert.equal(flags([2010, 1, 32]).overflow, 2, 'date 32 invalid');
+        assert.equal(flags([2012, 1, 29]).overflow, -1, 'date leap year valid');
+        assert.equal(flags([2010, 1, 29]).overflow, 2, 'date leap year invalid');
+
+        //hours
+        assert.equal(flags([2010, 1, 1, 8]).overflow, -1, 'hour valid');
+        assert.equal(flags([2010, 1, 1, 0]).overflow, -1, 'hour 0 valid');
+        assert.equal(flags([2010, 1, 1, -1]).overflow, 3, 'hour -1 invalid');
+        assert.equal(flags([2010, 1, 1, 25]).overflow, 3, 'hour 25 invalid');
+        assert.equal(flags([2010, 1, 1, 24, 1]).overflow, 3, 'hour 24:01 invalid');
+
+        //minutes
+        assert.equal(flags([2010, 1, 1, 8, 15]).overflow, -1, 'minute valid');
+        assert.equal(flags([2010, 1, 1, 8, 0]).overflow, -1, 'minute 0 valid');
+        assert.equal(flags([2010, 1, 1, 8, -1]).overflow, 4, 'minute -1 invalid');
+        assert.equal(flags([2010, 1, 1, 8, 60]).overflow, 4, 'minute 60 invalid');
+
+        //seconds
+        assert.equal(flags([2010, 1, 1, 8, 15, 12]).overflow, -1, 'second valid');
+        assert.equal(flags([2010, 1, 1, 8, 15, 0]).overflow, -1, 'second 0 valid');
+        assert.equal(flags([2010, 1, 1, 8, 15, -1]).overflow, 5, 'second -1 invalid');
+        assert.equal(flags([2010, 1, 1, 8, 15, 60]).overflow, 5, 'second 60 invalid');
+
+        //milliseconds
+        assert.equal(flags([2010, 1, 1, 8, 15, 12, 345]).overflow, -1, 'millisecond valid');
+        assert.equal(flags([2010, 1, 1, 8, 15, 12, 0]).overflow, -1, 'millisecond 0 valid');
+        assert.equal(flags([2010, 1, 1, 8, 15, 12, -1]).overflow, 6, 'millisecond -1 invalid');
+        assert.equal(flags([2010, 1, 1, 8, 15, 12, 1000]).overflow, 6, 'millisecond 1000 invalid');
+
+        // 24 hrs
+        assert.equal(flags([2010, 1, 1, 24, 0, 0, 0]).overflow, -1, '24:00:00.000 is fine');
+        assert.equal(flags([2010, 1, 1, 24, 1, 0, 0]).overflow, 3, '24:01:00.000 is wrong hour');
+        assert.equal(flags([2010, 1, 1, 24, 0, 1, 0]).overflow, 3, '24:00:01.000 is wrong hour');
+        assert.equal(flags([2010, 1, 1, 24, 0, 0, 1]).overflow, 3, '24:00:00.001 is wrong hour');
+    });
+
+    test('overflow without format', function (assert) {
+        //months
+        assert.equal(flags('2001-01', 'YYYY-MM').overflow, -1, 'month 1 valid');
+        assert.equal(flags('2001-12', 'YYYY-MM').overflow, -1, 'month 12 valid');
+        assert.equal(flags('2001-13', 'YYYY-MM').overflow, 1, 'month 13 invalid');
+
+        //days
+        assert.equal(flags('2010-01-16', 'YYYY-MM-DD').overflow, -1, 'date 16 valid');
+        assert.equal(flags('2010-01-0',  'YYYY-MM-DD').overflow, 2, 'date 0 invalid');
+        assert.equal(flags('2010-01-32', 'YYYY-MM-DD').overflow, 2, 'date 32 invalid');
+        assert.equal(flags('2012-02-29', 'YYYY-MM-DD').overflow, -1, 'date leap year valid');
+        assert.equal(flags('2010-02-29', 'YYYY-MM-DD').overflow, 2, 'date leap year invalid');
+
+        //days of the year
+        assert.equal(flags('2010 300', 'YYYY DDDD').overflow, -1, 'day 300 of year valid');
+        assert.equal(flags('2010 365', 'YYYY DDDD').overflow, -1, 'day 365 of year valid');
+        assert.equal(flags('2010 366', 'YYYY DDDD').overflow, 2, 'day 366 of year invalid');
+        assert.equal(flags('2012 366', 'YYYY DDDD').overflow, -1, 'day 366 of leap year valid');
+        assert.equal(flags('2012 367', 'YYYY DDDD').overflow, 2, 'day 367 of leap year invalid');
+
+        //hours
+        assert.equal(flags('08', 'HH').overflow, -1, 'hour valid');
+        assert.equal(flags('00', 'HH').overflow, -1, 'hour 0 valid');
+        assert.equal(flags('25', 'HH').overflow, 3, 'hour 25 invalid');
+        assert.equal(flags('24:01', 'HH:mm').overflow, 3, 'hour 24:01 invalid');
+
+        //minutes
+        assert.equal(flags('08:15', 'HH:mm').overflow, -1, 'minute valid');
+        assert.equal(flags('08:00', 'HH:mm').overflow, -1, 'minute 0 valid');
+        assert.equal(flags('08:60', 'HH:mm').overflow, 4, 'minute 60 invalid');
+
+        //seconds
+        assert.equal(flags('08:15:12', 'HH:mm:ss').overflow, -1, 'second valid');
+        assert.equal(flags('08:15:00', 'HH:mm:ss').overflow, -1, 'second 0 valid');
+        assert.equal(flags('08:15:60', 'HH:mm:ss').overflow, 5, 'second 60 invalid');
+
+        //milliseconds
+        assert.equal(flags('08:15:12:345', 'HH:mm:ss:SSSS').overflow, -1, 'millisecond valid');
+        assert.equal(flags('08:15:12:000', 'HH:mm:ss:SSSS').overflow, -1, 'millisecond 0 valid');
+
+        //this is OK because we don't match the last digit, so it's 100 ms
+        assert.equal(flags('08:15:12:1000', 'HH:mm:ss:SSSS').overflow, -1, 'millisecond 1000 actually valid');
+    });
+
+    test('extra tokens', function (assert) {
+        assert.deepEqual(flags('1982-05-25', 'YYYY-MM-DD').unusedTokens, [], 'nothing extra');
+        assert.deepEqual(flags('1982-05', 'YYYY-MM-DD').unusedTokens, ['DD'], 'extra formatting token');
+        assert.deepEqual(flags('1982', 'YYYY-MM-DD').unusedTokens, ['MM', 'DD'], 'multiple extra formatting tokens');
+        assert.deepEqual(flags('1982-05', 'YYYY-MM-').unusedTokens, [], 'extra non-formatting token');
+        assert.deepEqual(flags('1982-05-', 'YYYY-MM-DD').unusedTokens, ['DD'], 'non-extra non-formatting token');
+        assert.deepEqual(flags('1982 05 1982', 'YYYY-MM-DD').unusedTokens, [], 'different non-formatting token');
+    });
+
+    test('extra tokens strict', function (assert) {
+        assert.deepEqual(flags('1982-05-25', 'YYYY-MM-DD', true).unusedTokens, [], 'nothing extra');
+        assert.deepEqual(flags('1982-05', 'YYYY-MM-DD', true).unusedTokens, ['-', 'DD'], 'extra formatting token');
+        assert.deepEqual(flags('1982', 'YYYY-MM-DD', true).unusedTokens, ['-', 'MM', '-', 'DD'], 'multiple extra formatting tokens');
+        assert.deepEqual(flags('1982-05', 'YYYY-MM-', true).unusedTokens, ['-'], 'extra non-formatting token');
+        assert.deepEqual(flags('1982-05-', 'YYYY-MM-DD', true).unusedTokens, ['DD'], 'non-extra non-formatting token');
+        assert.deepEqual(flags('1982 05 1982', 'YYYY-MM-DD', true).unusedTokens, ['-', '-'], 'different non-formatting token');
+    });
+
+    test('unused input', function (assert) {
+        assert.deepEqual(flags('1982-05-25', 'YYYY-MM-DD').unusedInput, [], 'normal input');
+        assert.deepEqual(flags('1982-05-25 this is more stuff', 'YYYY-MM-DD').unusedInput, [' this is more stuff'], 'trailing nonsense');
+        assert.deepEqual(flags('1982-05-25 09:30', 'YYYY-MM-DD').unusedInput, [' 09:30'], ['trailing legit-looking input']);
+        assert.deepEqual(flags('1982-05-25 some junk', 'YYYY-MM-DD [some junk]').unusedInput, [], 'junk that actually gets matched');
+        assert.deepEqual(flags('stuff at beginning 1982-05-25', 'YYYY-MM-DD').unusedInput, ['stuff at beginning '], 'leading junk');
+        assert.deepEqual(flags('junk 1982 more junk 05 yet more junk25', 'YYYY-MM-DD').unusedInput, ['junk ', ' more junk ', ' yet more junk'], 'interstitial junk');
+    });
+
+    test('unused input strict', function (assert) {
+        assert.deepEqual(flags('1982-05-25', 'YYYY-MM-DD', true).unusedInput, [], 'normal input');
+        assert.deepEqual(flags('1982-05-25 this is more stuff', 'YYYY-MM-DD', true).unusedInput, [' this is more stuff'], 'trailing nonsense');
+        assert.deepEqual(flags('1982-05-25 09:30', 'YYYY-MM-DD', true).unusedInput, [' 09:30'], ['trailing legit-looking input']);
+        assert.deepEqual(flags('1982-05-25 some junk', 'YYYY-MM-DD [some junk]', true).unusedInput, [], 'junk that actually gets matched');
+        assert.deepEqual(flags('stuff at beginning 1982-05-25', 'YYYY-MM-DD', true).unusedInput, ['stuff at beginning '], 'leading junk');
+        assert.deepEqual(flags('junk 1982 more junk 05 yet more junk25', 'YYYY-MM-DD', true).unusedInput, ['junk ', ' more junk ', ' yet more junk'], 'interstitial junk');
+    });
+
+    test('chars left over', function (assert) {
+        assert.equal(flags('1982-05-25', 'YYYY-MM-DD').charsLeftOver, 0, 'normal input');
+        assert.equal(flags('1982-05-25 this is more stuff', 'YYYY-MM-DD').charsLeftOver, ' this is more stuff'.length, 'trailing nonsense');
+        assert.equal(flags('1982-05-25 09:30', 'YYYY-MM-DD').charsLeftOver, ' 09:30'.length, 'trailing legit-looking input');
+        assert.equal(flags('stuff at beginning 1982-05-25', 'YYYY-MM-DD').charsLeftOver, 'stuff at beginning '.length, 'leading junk');
+        assert.equal(flags('1982 junk 05 more junk25', 'YYYY-MM-DD').charsLeftOver, [' junk ', ' more junk'].join('').length, 'interstitial junk');
+        assert.equal(flags('stuff at beginning 1982 junk 05 more junk25', 'YYYY-MM-DD').charsLeftOver, ['stuff at beginning ', ' junk ', ' more junk'].join('').length, 'leading and interstitial junk');
+    });
+
+    test('empty', function (assert) {
+        assert.equal(flags('1982-05-25', 'YYYY-MM-DD').empty, false, 'normal input');
+        assert.equal(flags('nothing here', 'YYYY-MM-DD').empty, true, 'pure garbage');
+        assert.equal(flags('junk but has the number 2000 in it', 'YYYY-MM-DD').empty, false, 'only mostly garbage');
+        assert.equal(flags('', 'YYYY-MM-DD').empty, true, 'empty string');
+        assert.equal(flags('', 'YYYY-MM-DD').empty, true, 'blank string');
+    });
+
+    test('null', function (assert) {
+        assert.equal(flags('1982-05-25', 'YYYY-MM-DD').nullInput, false, 'normal input');
+        assert.equal(flags(null).nullInput, true, 'just null');
+        assert.equal(flags(null, 'YYYY-MM-DD').nullInput, true, 'null with format');
+    });
+
+    test('invalid month', function (assert) {
+        assert.equal(flags('1982 May', 'YYYY MMMM').invalidMonth, null, 'normal input');
+        assert.equal(flags('1982 Laser', 'YYYY MMMM').invalidMonth, 'Laser', 'bad month name');
+    });
+
+    test('empty format array', function (assert) {
+        assert.equal(flags('1982 May', ['YYYY MMM']).invalidFormat, false, 'empty format array');
+        assert.equal(flags('1982 May', []).invalidFormat, true, 'empty format array');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    var symbolMap = {
+            '1': '!',
+            '2': '@',
+            '3': '#',
+            '4': '$',
+            '5': '%',
+            '6': '^',
+            '7': '&',
+            '8': '*',
+            '9': '(',
+            '0': ')'
+        },
+        numberMap = {
+            '!': '1',
+            '@': '2',
+            '#': '3',
+            '$': '4',
+            '%': '5',
+            '^': '6',
+            '&': '7',
+            '*': '8',
+            '(': '9',
+            ')': '0'
+        };
+
+    module('preparse and postformat', {
+        setup: function () {
+            moment.locale('symbol', {
+                preparse: function (string) {
+                    return string.replace(/[!@#$%\^&*()]/g, function (match) {
+                        return numberMap[match];
+                    });
+                },
+
+                postformat: function (string) {
+                    return string.replace(/\d/g, function (match) {
+                        return symbolMap[match];
+                    });
+                }
+            });
+        }
+    });
+
+    test('transform', function (assert) {
+        assert.equal(moment.utc('@)!@-)*-@&', 'YYYY-MM-DD').unix(), 1346025600, 'preparse string + format');
+        assert.equal(moment.utc('@)!@-)*-@&').unix(), 1346025600, 'preparse ISO8601 string');
+        assert.equal(moment.unix(1346025600).utc().format('YYYY-MM-DD'), '@)!@-)*-@&', 'postformat');
+    });
+
+    test('transform from', function (assert) {
+        var start = moment([2007, 1, 28]);
+
+        assert.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true), '@ minutes', 'postformat should work on moment.fn.from');
+        assert.equal(moment().add(6, 'd').fromNow(true), '^ days', 'postformat should work on moment.fn.fromNow');
+        assert.equal(moment.duration(10, 'h').humanize(), '!) hours', 'postformat should work on moment.duration.fn.humanize');
+    });
+
+    test('calendar day', function (assert) {
+        var a = moment().hours(2).minutes(0).seconds(0);
+
+        assert.equal(moment(a).calendar(),                   'Today at @:)) AM',     'today at the same time');
+        assert.equal(moment(a).add({m: 25}).calendar(),      'Today at @:@% AM',     'Now plus 25 min');
+        assert.equal(moment(a).add({h: 1}).calendar(),       'Today at #:)) AM',     'Now plus 1 hour');
+        assert.equal(moment(a).add({d: 1}).calendar(),       'Tomorrow at @:)) AM',  'tomorrow at the same time');
+        assert.equal(moment(a).subtract({h: 1}).calendar(),  'Today at !:)) AM',     'Now minus 1 hour');
+        assert.equal(moment(a).subtract({d: 1}).calendar(),  'Yesterday at @:)) AM', 'yesterday at the same time');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('quarter');
+
+    test('library quarter getter', function (assert) {
+        assert.equal(moment([1985,  1,  4]).quarter(), 1, 'Feb  4 1985 is Q1');
+        assert.equal(moment([2029,  8, 18]).quarter(), 3, 'Sep 18 2029 is Q3');
+        assert.equal(moment([2013,  3, 24]).quarter(), 2, 'Apr 24 2013 is Q2');
+        assert.equal(moment([2015,  2,  5]).quarter(), 1, 'Mar  5 2015 is Q1');
+        assert.equal(moment([1970,  0,  2]).quarter(), 1, 'Jan  2 1970 is Q1');
+        assert.equal(moment([2001, 11, 12]).quarter(), 4, 'Dec 12 2001 is Q4');
+        assert.equal(moment([2000,  0,  2]).quarter(), 1, 'Jan  2 2000 is Q1');
+    });
+
+    test('quarter setter singular', function (assert) {
+        var m = moment([2014, 4, 11]);
+        assert.equal(m.quarter(2).month(), 4, 'set same quarter');
+        assert.equal(m.quarter(3).month(), 7, 'set 3rd quarter');
+        assert.equal(m.quarter(1).month(), 1, 'set 1st quarter');
+        assert.equal(m.quarter(4).month(), 10, 'set 4th quarter');
+    });
+
+    test('quarter setter plural', function (assert) {
+        var m = moment([2014, 4, 11]);
+        assert.equal(m.quarters(2).month(), 4, 'set same quarter');
+        assert.equal(m.quarters(3).month(), 7, 'set 3rd quarter');
+        assert.equal(m.quarters(1).month(), 1, 'set 1st quarter');
+        assert.equal(m.quarters(4).month(), 10, 'set 4th quarter');
+    });
+
+    test('quarter setter programmatic', function (assert) {
+        var m = moment([2014, 4, 11]);
+        assert.equal(m.set('quarter', 2).month(), 4, 'set same quarter');
+        assert.equal(m.set('quarter', 3).month(), 7, 'set 3rd quarter');
+        assert.equal(m.set('quarter', 1).month(), 1, 'set 1st quarter');
+        assert.equal(m.set('quarter', 4).month(), 10, 'set 4th quarter');
+    });
+
+    test('quarter setter programmatic plural', function (assert) {
+        var m = moment([2014, 4, 11]);
+        assert.equal(m.set('quarters', 2).month(), 4, 'set same quarter');
+        assert.equal(m.set('quarters', 3).month(), 7, 'set 3rd quarter');
+        assert.equal(m.set('quarters', 1).month(), 1, 'set 1st quarter');
+        assert.equal(m.set('quarters', 4).month(), 10, 'set 4th quarter');
+    });
+
+    test('quarter setter programmatic abbr', function (assert) {
+        var m = moment([2014, 4, 11]);
+        assert.equal(m.set('Q', 2).month(), 4, 'set same quarter');
+        assert.equal(m.set('Q', 3).month(), 7, 'set 3rd quarter');
+        assert.equal(m.set('Q', 1).month(), 1, 'set 1st quarter');
+        assert.equal(m.set('Q', 4).month(), 10, 'set 4th quarter');
+    });
+
+    test('quarter setter only month changes', function (assert) {
+        var m = moment([2014, 4, 11, 1, 2, 3, 4]).quarter(4);
+        assert.equal(m.year(), 2014, 'keep year');
+        assert.equal(m.month(), 10, 'set month');
+        assert.equal(m.date(), 11, 'keep date');
+        assert.equal(m.hour(), 1, 'keep hour');
+        assert.equal(m.minute(), 2, 'keep minutes');
+        assert.equal(m.second(), 3, 'keep seconds');
+        assert.equal(m.millisecond(), 4, 'keep milliseconds');
+    });
+
+    test('quarter setter bubble to next year', function (assert) {
+        var m = moment([2014, 4, 11, 1, 2, 3, 4]).quarter(7);
+        assert.equal(m.year(), 2015, 'year bubbled');
+        assert.equal(m.month(), 7, 'set month');
+        assert.equal(m.date(), 11, 'keep date');
+        assert.equal(m.hour(), 1, 'keep hour');
+        assert.equal(m.minute(), 2, 'keep minutes');
+        assert.equal(m.second(), 3, 'keep seconds');
+        assert.equal(m.millisecond(), 4, 'keep milliseconds');
+    });
+
+    test('quarter diff', function (assert) {
+        assert.equal(moment('2014-01-01').diff(moment('2014-04-01'), 'quarter'),
+                -1, 'diff -1 quarter');
+        assert.equal(moment('2014-04-01').diff(moment('2014-01-01'), 'quarter'),
+                1, 'diff 1 quarter');
+        assert.equal(moment('2014-05-01').diff(moment('2014-01-01'), 'quarter'),
+                1, 'diff 1 quarter');
+        assert.ok(Math.abs((4 / 3) - moment('2014-05-01').diff(
+                        moment('2014-01-01'), 'quarter', true)) < 0.00001,
+                'diff 1 1/3 quarter');
+        assert.equal(moment('2015-01-01').diff(moment('2014-01-01'), 'quarter'),
+                4, 'diff 4 quarters');
+    });
+
+    test('quarter setter bubble to previous year', function (assert) {
+        var m = moment([2014, 4, 11, 1, 2, 3, 4]).quarter(-3);
+        assert.equal(m.year(), 2013, 'year bubbled');
+        assert.equal(m.month(), 1, 'set month');
+        assert.equal(m.date(), 11, 'keep date');
+        assert.equal(m.hour(), 1, 'keep hour');
+        assert.equal(m.minute(), 2, 'keep minutes');
+        assert.equal(m.second(), 3, 'keep seconds');
+        assert.equal(m.millisecond(), 4, 'keep milliseconds');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('relative time');
+
+    test('default thresholds fromNow', function (assert) {
+        var a = moment();
+
+        // Seconds to minutes threshold
+        a.subtract(44, 'seconds');
+        assert.equal(a.fromNow(), 'a few seconds ago', 'Below default seconds to minutes threshold');
+        a.subtract(1, 'seconds');
+        assert.equal(a.fromNow(), 'a minute ago', 'Above default seconds to minutes threshold');
+
+        // Minutes to hours threshold
+        a = moment();
+        a.subtract(44, 'minutes');
+        assert.equal(a.fromNow(), '44 minutes ago', 'Below default minute to hour threshold');
+        a.subtract(1, 'minutes');
+        assert.equal(a.fromNow(), 'an hour ago', 'Above default minute to hour threshold');
+
+        // Hours to days threshold
+        a = moment();
+        a.subtract(21, 'hours');
+        assert.equal(a.fromNow(), '21 hours ago', 'Below default hours to day threshold');
+        a.subtract(1, 'hours');
+        assert.equal(a.fromNow(), 'a day ago', 'Above default hours to day threshold');
+
+        // Days to month threshold
+        a = moment();
+        a.subtract(25, 'days');
+        assert.equal(a.fromNow(), '25 days ago', 'Below default days to month (singular) threshold');
+        a.subtract(1, 'days');
+        assert.equal(a.fromNow(), 'a month ago', 'Above default days to month (singular) threshold');
+
+        // months to year threshold
+        a = moment();
+        a.subtract(10, 'months');
+        assert.equal(a.fromNow(), '10 months ago', 'Below default days to years threshold');
+        a.subtract(1, 'month');
+        assert.equal(a.fromNow(), 'a year ago', 'Above default days to years threshold');
+    });
+
+    test('default thresholds toNow', function (assert) {
+        var a = moment();
+
+        // Seconds to minutes threshold
+        a.subtract(44, 'seconds');
+        assert.equal(a.toNow(), 'in a few seconds', 'Below default seconds to minutes threshold');
+        a.subtract(1, 'seconds');
+        assert.equal(a.toNow(), 'in a minute', 'Above default seconds to minutes threshold');
+
+        // Minutes to hours threshold
+        a = moment();
+        a.subtract(44, 'minutes');
+        assert.equal(a.toNow(), 'in 44 minutes', 'Below default minute to hour threshold');
+        a.subtract(1, 'minutes');
+        assert.equal(a.toNow(), 'in an hour', 'Above default minute to hour threshold');
+
+        // Hours to days threshold
+        a = moment();
+        a.subtract(21, 'hours');
+        assert.equal(a.toNow(), 'in 21 hours', 'Below default hours to day threshold');
+        a.subtract(1, 'hours');
+        assert.equal(a.toNow(), 'in a day', 'Above default hours to day threshold');
+
+        // Days to month threshold
+        a = moment();
+        a.subtract(25, 'days');
+        assert.equal(a.toNow(), 'in 25 days', 'Below default days to month (singular) threshold');
+        a.subtract(1, 'days');
+        assert.equal(a.toNow(), 'in a month', 'Above default days to month (singular) threshold');
+
+        // months to year threshold
+        a = moment();
+        a.subtract(10, 'months');
+        assert.equal(a.toNow(), 'in 10 months', 'Below default days to years threshold');
+        a.subtract(1, 'month');
+        assert.equal(a.toNow(), 'in a year', 'Above default days to years threshold');
+    });
+
+    test('custom thresholds', function (assert) {
+        // Seconds to minutes threshold
+        moment.relativeTimeThreshold('s', 55);
+
+        var a = moment();
+        a.subtract(54, 'seconds');
+        assert.equal(a.fromNow(), 'a few seconds ago', 'Below custom seconds to minutes threshold');
+        a.subtract(1, 'seconds');
+        assert.equal(a.fromNow(), 'a minute ago', 'Above custom seconds to minutes threshold');
+
+        moment.relativeTimeThreshold('s', 45);
+
+        // Minutes to hours threshold
+        moment.relativeTimeThreshold('m', 55);
+        a = moment();
+        a.subtract(54, 'minutes');
+        assert.equal(a.fromNow(), '54 minutes ago', 'Below custom minutes to hours threshold');
+        a.subtract(1, 'minutes');
+        assert.equal(a.fromNow(), 'an hour ago', 'Above custom minutes to hours threshold');
+        moment.relativeTimeThreshold('m', 45);
+
+        // Hours to days threshold
+        moment.relativeTimeThreshold('h', 24);
+        a = moment();
+        a.subtract(23, 'hours');
+        assert.equal(a.fromNow(), '23 hours ago', 'Below custom hours to days threshold');
+        a.subtract(1, 'hours');
+        assert.equal(a.fromNow(), 'a day ago', 'Above custom hours to days threshold');
+        moment.relativeTimeThreshold('h', 22);
+
+        // Days to month threshold
+        moment.relativeTimeThreshold('d', 28);
+        a = moment();
+        a.subtract(27, 'days');
+        assert.equal(a.fromNow(), '27 days ago', 'Below custom days to month (singular) threshold');
+        a.subtract(1, 'days');
+        assert.equal(a.fromNow(), 'a month ago', 'Above custom days to month (singular) threshold');
+        moment.relativeTimeThreshold('d', 26);
+
+        // months to years threshold
+        moment.relativeTimeThreshold('M', 9);
+        a = moment();
+        a.subtract(8, 'months');
+        assert.equal(a.fromNow(), '8 months ago', 'Below custom days to years threshold');
+        a.subtract(1, 'months');
+        assert.equal(a.fromNow(), 'a year ago', 'Above custom days to years threshold');
+        moment.relativeTimeThreshold('M', 11);
+    });
+
+    test('retrive threshold settings', function (assert) {
+        moment.relativeTimeThreshold('m', 45);
+        var minuteThreshold = moment.relativeTimeThreshold('m');
+
+        assert.equal(minuteThreshold, 45, 'Can retrieve minute setting');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('start and end of units');
+
+    test('start of year', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('year'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('years'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('y');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 0, 'strip out the month');
+        assert.equal(m.date(), 1, 'strip out the day');
+        assert.equal(m.hours(), 0, 'strip out the hours');
+        assert.equal(m.minutes(), 0, 'strip out the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of year', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('year'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('years'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('y');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 11, 'set the month');
+        assert.equal(m.date(), 31, 'set the day');
+        assert.equal(m.hours(), 23, 'set the hours');
+        assert.equal(m.minutes(), 59, 'set the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of quarter', function (assert) {
+        var m = moment(new Date(2011, 4, 2, 3, 4, 5, 6)).startOf('quarter'),
+            ms = moment(new Date(2011, 4, 2, 3, 4, 5, 6)).startOf('quarters'),
+            ma = moment(new Date(2011, 4, 2, 3, 4, 5, 6)).startOf('Q');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.quarter(), 2, 'keep the quarter');
+        assert.equal(m.month(), 3, 'strip out the month');
+        assert.equal(m.date(), 1, 'strip out the day');
+        assert.equal(m.hours(), 0, 'strip out the hours');
+        assert.equal(m.minutes(), 0, 'strip out the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of quarter', function (assert) {
+        var m = moment(new Date(2011, 4, 2, 3, 4, 5, 6)).endOf('quarter'),
+            ms = moment(new Date(2011, 4, 2, 3, 4, 5, 6)).endOf('quarters'),
+            ma = moment(new Date(2011, 4, 2, 3, 4, 5, 6)).endOf('Q');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.quarter(), 2, 'keep the quarter');
+        assert.equal(m.month(), 5, 'set the month');
+        assert.equal(m.date(), 30, 'set the day');
+        assert.equal(m.hours(), 23, 'set the hours');
+        assert.equal(m.minutes(), 59, 'set the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of month', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('month'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('months'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('M');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 1, 'strip out the day');
+        assert.equal(m.hours(), 0, 'strip out the hours');
+        assert.equal(m.minutes(), 0, 'strip out the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of month', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('month'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('months'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('M');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 28, 'set the day');
+        assert.equal(m.hours(), 23, 'set the hours');
+        assert.equal(m.minutes(), 59, 'set the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of week', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('week'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('weeks'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('w');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 0, 'rolls back to January');
+        assert.equal(m.day(), 0, 'set day of week');
+        assert.equal(m.date(), 30, 'set correct date');
+        assert.equal(m.hours(), 0, 'strip out the hours');
+        assert.equal(m.minutes(), 0, 'strip out the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of week', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('week'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('weeks'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('weeks');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.day(), 6, 'set the day of the week');
+        assert.equal(m.date(), 5, 'set the day');
+        assert.equal(m.hours(), 23, 'set the hours');
+        assert.equal(m.minutes(), 59, 'set the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of iso-week', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('isoWeek'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('isoWeeks'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('W');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 0, 'rollback to January');
+        assert.equal(m.isoWeekday(), 1, 'set day of iso-week');
+        assert.equal(m.date(), 31, 'set correct date');
+        assert.equal(m.hours(), 0, 'strip out the hours');
+        assert.equal(m.minutes(), 0, 'strip out the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of iso-week', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('isoWeek'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('isoWeeks'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('W');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.isoWeekday(), 7, 'set the day of the week');
+        assert.equal(m.date(), 6, 'set the day');
+        assert.equal(m.hours(), 23, 'set the hours');
+        assert.equal(m.minutes(), 59, 'set the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of day', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('day'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('days'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('d');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 0, 'strip out the hours');
+        assert.equal(m.minutes(), 0, 'strip out the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of day', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('day'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('days'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('d');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 23, 'set the hours');
+        assert.equal(m.minutes(), 59, 'set the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of hour', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('hour'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('hours'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('h');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 3, 'keep the hours');
+        assert.equal(m.minutes(), 0, 'strip out the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of hour', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('hour'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('hours'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('h');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 3, 'keep the hours');
+        assert.equal(m.minutes(), 59, 'set the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of minute', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('minute'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('minutes'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('m');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 3, 'keep the hours');
+        assert.equal(m.minutes(), 4, 'keep the minutes');
+        assert.equal(m.seconds(), 0, 'strip out the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of minute', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('minute'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('minutes'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('m');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 3, 'keep the hours');
+        assert.equal(m.minutes(), 4, 'keep the minutes');
+        assert.equal(m.seconds(), 59, 'set the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('start of second', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('second'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('seconds'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).startOf('s');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 3, 'keep the hours');
+        assert.equal(m.minutes(), 4, 'keep the minutes');
+        assert.equal(m.seconds(), 5, 'keep the the seconds');
+        assert.equal(m.milliseconds(), 0, 'strip out the milliseconds');
+    });
+
+    test('end of second', function (assert) {
+        var m = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('second'),
+            ms = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('seconds'),
+            ma = moment(new Date(2011, 1, 2, 3, 4, 5, 6)).endOf('s');
+        assert.equal(+m, +ms, 'Plural or singular should work');
+        assert.equal(+m, +ma, 'Full or abbreviated should work');
+        assert.equal(m.year(), 2011, 'keep the year');
+        assert.equal(m.month(), 1, 'keep the month');
+        assert.equal(m.date(), 2, 'keep the day');
+        assert.equal(m.hours(), 3, 'keep the hours');
+        assert.equal(m.minutes(), 4, 'keep the minutes');
+        assert.equal(m.seconds(), 5, 'keep the seconds');
+        assert.equal(m.milliseconds(), 999, 'set the seconds');
+    });
+
+    test('startOf across DST +1', function (assert) {
+        var oldUpdateOffset = moment.updateOffset,
+            // Based on a real story somewhere in America/Los_Angeles
+            dstAt = moment('2014-03-09T02:00:00-08:00').parseZone(),
+            m;
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.isBefore(dstAt)) {
+                mom.utcOffset(-8, keepTime);
+            } else {
+                mom.utcOffset(-7, keepTime);
+            }
+        };
+
+        m = moment('2014-03-15T00:00:00-07:00').parseZone();
+        m.startOf('M');
+        assert.equal(m.format(), '2014-03-01T00:00:00-08:00', 'startOf(\'month\') across +1');
+
+        m = moment('2014-03-09T09:00:00-07:00').parseZone();
+        m.startOf('d');
+        assert.equal(m.format(), '2014-03-09T00:00:00-08:00', 'startOf(\'day\') across +1');
+
+        m = moment('2014-03-09T03:05:00-07:00').parseZone();
+        m.startOf('h');
+        assert.equal(m.format(), '2014-03-09T03:00:00-07:00', 'startOf(\'hour\') after +1');
+
+        m = moment('2014-03-09T01:35:00-08:00').parseZone();
+        m.startOf('h');
+        assert.equal(m.format(), '2014-03-09T01:00:00-08:00', 'startOf(\'hour\') before +1');
+
+        // There is no such time as 2:30-7 to try startOf('hour') across that
+
+        moment.updateOffset = oldUpdateOffset;
+    });
+
+    test('startOf across DST -1', function (assert) {
+        var oldUpdateOffset = moment.updateOffset,
+            // Based on a real story somewhere in America/Los_Angeles
+            dstAt = moment('2014-11-02T02:00:00-07:00').parseZone(),
+            m;
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.isBefore(dstAt)) {
+                mom.utcOffset(-7, keepTime);
+            } else {
+                mom.utcOffset(-8, keepTime);
+            }
+        };
+
+        m = moment('2014-11-15T00:00:00-08:00').parseZone();
+        m.startOf('M');
+        assert.equal(m.format(), '2014-11-01T00:00:00-07:00', 'startOf(\'month\') across -1');
+
+        m = moment('2014-11-02T09:00:00-08:00').parseZone();
+        m.startOf('d');
+        assert.equal(m.format(), '2014-11-02T00:00:00-07:00', 'startOf(\'day\') across -1');
+
+        // note that utc offset is -8
+        m = moment('2014-11-02T01:30:00-08:00').parseZone();
+        m.startOf('h');
+        assert.equal(m.format(), '2014-11-02T01:00:00-08:00', 'startOf(\'hour\') after +1');
+
+        // note that utc offset is -7
+        m = moment('2014-11-02T01:30:00-07:00').parseZone();
+        m.startOf('h');
+        assert.equal(m.format(), '2014-11-02T01:00:00-07:00', 'startOf(\'hour\') before +1');
+
+        moment.updateOffset = oldUpdateOffset;
+    });
+
+    test('endOf millisecond and no-arg', function (assert) {
+        var m = moment();
+        assert.equal(+m, +m.clone().endOf(), 'endOf without argument should change time');
+        assert.equal(+m, +m.clone().endOf('ms'), 'endOf with ms argument should change time');
+        assert.equal(+m, +m.clone().endOf('millisecond'), 'endOf with millisecond argument should change time');
+        assert.equal(+m, +m.clone().endOf('milliseconds'), 'endOf with milliseconds argument should change time');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('string prototype');
+
+    test('string prototype overrides call', function (assert) {
+        var prior = String.prototype.call, b;
+        String.prototype.call = function () {
+            return null;
+        };
+
+        b = moment(new Date(2011, 7, 28, 15, 25, 50, 125));
+        assert.equal(b.format('MMMM Do YYYY, h:mm a'), 'August 28th 2011, 3:25 pm');
+
+        String.prototype.call = prior;
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('utc');
+
+    test('utc and local', function (assert) {
+        var m = moment(Date.UTC(2011, 1, 2, 3, 4, 5, 6)), offset, expected;
+        m.utc();
+        // utc
+        assert.equal(m.date(), 2, 'the day should be correct for utc');
+        assert.equal(m.day(), 3, 'the date should be correct for utc');
+        assert.equal(m.hours(), 3, 'the hours should be correct for utc');
+
+        // local
+        m.local();
+        if (m.zone() > 180) {
+            assert.equal(m.date(), 1, 'the date should be correct for local');
+            assert.equal(m.day(), 2, 'the day should be correct for local');
+        } else {
+            assert.equal(m.date(), 2, 'the date should be correct for local');
+            assert.equal(m.day(), 3, 'the day should be correct for local');
+        }
+        offset = Math.ceil(m.utcOffset() / 60);
+        expected = (24 + 3 + offset) % 24;
+        assert.equal(m.hours(), expected, 'the hours (' + m.hours() + ') should be correct for local');
+        assert.equal(moment().utc().utcOffset(), 0, 'timezone in utc should always be zero');
+    });
+
+    test('creating with utc and no arguments', function (assert) {
+        var startOfTest = new Date().valueOf(),
+            momentDefaultUtcTime = moment.utc().valueOf(),
+            afterMomentCreationTime = new Date().valueOf();
+
+        assert.ok(startOfTest <= momentDefaultUtcTime, 'moment UTC default time should be now, not in the past');
+        assert.ok(momentDefaultUtcTime <= afterMomentCreationTime, 'moment UTC default time should be now, not in the future');
+    });
+
+    test('creating with utc and a date parameter array', function (assert) {
+        var m = moment.utc([2011, 1, 2, 3, 4, 5, 6]);
+        assert.equal(m.date(), 2, 'the day should be correct for utc array');
+        assert.equal(m.hours(), 3, 'the hours should be correct for utc array');
+
+        m = moment.utc('2011-02-02 3:04:05', 'YYYY-MM-DD HH:mm:ss');
+        assert.equal(m.date(), 2, 'the day should be correct for utc parsing format');
+        assert.equal(m.hours(), 3, 'the hours should be correct for utc parsing format');
+
+        m = moment.utc('2011-02-02T03:04:05+00:00');
+        assert.equal(m.date(), 2, 'the day should be correct for utc parsing iso');
+        assert.equal(m.hours(), 3, 'the hours should be correct for utc parsing iso');
+    });
+
+    test('creating with utc without timezone', function (assert) {
+        var m = moment.utc('2012-01-02T08:20:00');
+        assert.equal(m.date(), 2, 'the day should be correct for utc parse without timezone');
+        assert.equal(m.hours(), 8, 'the hours should be correct for utc parse without timezone');
+
+        m = moment.utc('2012-01-02T08:20:00+09:00');
+        assert.equal(m.date(), 1, 'the day should be correct for utc parse with timezone');
+        assert.equal(m.hours(), 23, 'the hours should be correct for utc parse with timezone');
+    });
+
+    test('cloning with utc offset', function (assert) {
+        var m = moment.utc('2012-01-02T08:20:00');
+        assert.equal(moment.utc(m)._isUTC, true, 'the local offset should be converted to UTC');
+        assert.equal(moment.utc(m.clone().utc())._isUTC, true, 'the local offset should stay in UTC');
+
+        m.utcOffset(120);
+        assert.equal(moment.utc(m)._isUTC, true, 'the explicit utc offset should stay in UTC');
+        assert.equal(moment.utc(m).utcOffset(), 0, 'the explicit utc offset should have an offset of 0');
+    });
+
+    test('weekday with utc', function (assert) {
+        assert.equal(
+            moment('2013-09-15T00:00:00Z').utc().weekday(), // first minute of the day
+            moment('2013-09-15T23:59:00Z').utc().weekday(), // last minute of the day
+            'a UTC-moment\'s .weekday() should not be affected by the local timezone'
+        );
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('utc offset');
+
+    test('setter / getter blackbox', function (assert) {
+        var m = moment([2010]);
+
+        assert.equal(m.clone().utcOffset(0).utcOffset(), 0, 'utcOffset 0');
+
+        assert.equal(m.clone().utcOffset(1).utcOffset(), 60, 'utcOffset 1 is 60');
+        assert.equal(m.clone().utcOffset(60).utcOffset(), 60, 'utcOffset 60');
+        assert.equal(m.clone().utcOffset('+01:00').utcOffset(), 60, 'utcOffset +01:00 is 60');
+        assert.equal(m.clone().utcOffset('+0100').utcOffset(), 60, 'utcOffset +0100 is 60');
+
+        assert.equal(m.clone().utcOffset(-1).utcOffset(), -60, 'utcOffset -1 is -60');
+        assert.equal(m.clone().utcOffset(-60).utcOffset(), -60, 'utcOffset -60');
+        assert.equal(m.clone().utcOffset('-01:00').utcOffset(), -60, 'utcOffset -01:00 is -60');
+        assert.equal(m.clone().utcOffset('-0100').utcOffset(), -60, 'utcOffset -0100 is -60');
+
+        assert.equal(m.clone().utcOffset(1.5).utcOffset(), 90, 'utcOffset 1.5 is 90');
+        assert.equal(m.clone().utcOffset(90).utcOffset(), 90, 'utcOffset 1.5 is 90');
+        assert.equal(m.clone().utcOffset('+01:30').utcOffset(), 90, 'utcOffset +01:30 is 90');
+        assert.equal(m.clone().utcOffset('+0130').utcOffset(), 90, 'utcOffset +0130 is 90');
+
+        assert.equal(m.clone().utcOffset(-1.5).utcOffset(), -90, 'utcOffset -1.5');
+        assert.equal(m.clone().utcOffset(-90).utcOffset(), -90, 'utcOffset -90');
+        assert.equal(m.clone().utcOffset('-01:30').utcOffset(), -90, 'utcOffset +01:30 is 90');
+        assert.equal(m.clone().utcOffset('-0130').utcOffset(), -90, 'utcOffset +0130 is 90');
+    });
+
+    test('utcOffset shorthand hours -> minutes', function (assert) {
+        var i;
+        for (i = -15; i <= 15; ++i) {
+            assert.equal(moment().utcOffset(i).utcOffset(), i * 60,
+                    '' + i + ' -> ' + i * 60);
+        }
+        assert.equal(moment().utcOffset(-16).utcOffset(), -16, '-16 -> -16');
+        assert.equal(moment().utcOffset(16).utcOffset(), 16, '16 -> 16');
+    });
+
+    test('isLocal, isUtc, isUtcOffset', function (assert) {
+        assert.ok(moment().isLocal(), 'moment() creates objects in local time');
+        assert.ok(!moment.utc().isLocal(), 'moment.utc creates objects NOT in local time');
+        assert.ok(moment.utc().local().isLocal(), 'moment.fn.local() converts to local time');
+        assert.ok(!moment().utcOffset(5).isLocal(), 'moment.fn.utcOffset(N) puts objects NOT in local time');
+        assert.ok(moment().utcOffset(5).local().isLocal(), 'moment.fn.local() converts to local time');
+
+        assert.ok(moment.utc().isUtc(), 'moment.utc() creates objects in utc time');
+        assert.ok(moment().utcOffset(0).isUtc(), 'utcOffset(0) is equivalent to utc mode');
+        assert.ok(!moment().utcOffset(1).isUtc(), 'utcOffset(1) is NOT equivalent to utc mode');
+
+        assert.ok(!moment().isUtcOffset(), 'moment() creates objects NOT in utc-offset mode');
+        assert.ok(moment.utc().isUtcOffset(), 'moment.utc() creates objects in utc-offset mode');
+        assert.ok(moment().utcOffset(3).isUtcOffset(), 'utcOffset(N != 0) creates objects in utc-offset mode');
+        assert.ok(moment().utcOffset(0).isUtcOffset(), 'utcOffset(0) creates objects in utc-offset mode');
+    });
+
+    test('isUTC', function (assert) {
+        assert.ok(moment.utc().isUTC(), 'moment.utc() creates objects in utc time');
+        assert.ok(moment().utcOffset(0).isUTC(), 'utcOffset(0) is equivalent to utc mode');
+        assert.ok(!moment().utcOffset(1).isUTC(), 'utcOffset(1) is NOT equivalent to utc mode');
+    });
+
+    test('change hours when changing the utc offset', function (assert) {
+        var m = moment.utc([2000, 0, 1, 6]);
+        assert.equal(m.hour(), 6, 'UTC 6AM should be 6AM at +0000');
+
+        // sanity check
+        m.utcOffset(0);
+        assert.equal(m.hour(), 6, 'UTC 6AM should be 6AM at +0000');
+
+        m.utcOffset(-60);
+        assert.equal(m.hour(), 5, 'UTC 6AM should be 5AM at -0100');
+
+        m.utcOffset(60);
+        assert.equal(m.hour(), 7, 'UTC 6AM should be 7AM at +0100');
+    });
+
+    test('change minutes when changing the utc offset', function (assert) {
+        var m = moment.utc([2000, 0, 1, 6, 31]);
+
+        m.utcOffset(0);
+        assert.equal(m.format('HH:mm'), '06:31', 'UTC 6:31AM should be 6:31AM at +0000');
+
+        m.utcOffset(-30);
+        assert.equal(m.format('HH:mm'), '06:01', 'UTC 6:31AM should be 6:01AM at -0030');
+
+        m.utcOffset(30);
+        assert.equal(m.format('HH:mm'), '07:01', 'UTC 6:31AM should be 7:01AM at +0030');
+
+        m.utcOffset(-1380);
+        assert.equal(m.format('HH:mm'), '07:31', 'UTC 6:31AM should be 7:31AM at +1380');
+    });
+
+    test('distance from the unix epoch', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA),
+            zoneC = moment(zoneA),
+            zoneD = moment(zoneA),
+            zoneE = moment(zoneA);
+
+        zoneB.utc();
+        assert.equal(+zoneA, +zoneB, 'moment should equal moment.utc');
+
+        zoneC.utcOffset(60);
+        assert.equal(+zoneA, +zoneC, 'moment should equal moment.utcOffset(60)');
+
+        zoneD.utcOffset(-480);
+        assert.equal(+zoneA, +zoneD,
+                'moment should equal moment.utcOffset(-480)');
+
+        zoneE.utcOffset(-1000);
+        assert.equal(+zoneA, +zoneE,
+                'moment should equal moment.utcOffset(-1000)');
+    });
+
+    test('update offset after changing any values', function (assert) {
+        var oldOffset = moment.updateOffset,
+            m = moment.utc([2000, 6, 1]);
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.__doChange) {
+                if (+mom > 962409600000) {
+                    mom.utcOffset(-120, keepTime);
+                } else {
+                    mom.utcOffset(-60, keepTime);
+                }
+            }
+        };
+
+        assert.equal(m.format('ZZ'), '+0000', 'should be at +0000');
+        assert.equal(m.format('HH:mm'), '00:00', 'should start 12AM at +0000 timezone');
+
+        m.__doChange = true;
+        m.add(1, 'h');
+
+        assert.equal(m.format('ZZ'), '-0200', 'should be at -0200');
+        assert.equal(m.format('HH:mm'), '23:00', '1AM at +0000 should be 11PM at -0200 timezone');
+
+        m.subtract(1, 'h');
+
+        assert.equal(m.format('ZZ'), '-0100', 'should be at -0100');
+        assert.equal(m.format('HH:mm'), '23:00', '12AM at +0000 should be 11PM at -0100 timezone');
+
+        moment.updateOffset = oldOffset;
+    });
+
+    //////////////////
+    test('getters and setters', function (assert) {
+        var a = moment([2011, 5, 20]);
+
+        assert.equal(a.clone().utcOffset(-120).year(2012).year(), 2012, 'should get and set year correctly');
+        assert.equal(a.clone().utcOffset(-120).month(1).month(), 1, 'should get and set month correctly');
+        assert.equal(a.clone().utcOffset(-120).date(2).date(), 2, 'should get and set date correctly');
+        assert.equal(a.clone().utcOffset(-120).day(1).day(), 1, 'should get and set day correctly');
+        assert.equal(a.clone().utcOffset(-120).hour(1).hour(), 1, 'should get and set hour correctly');
+        assert.equal(a.clone().utcOffset(-120).minute(1).minute(), 1, 'should get and set minute correctly');
+    });
+
+    test('getters', function (assert) {
+        var a = moment.utc([2012, 0, 1, 0, 0, 0]);
+
+        assert.equal(a.clone().utcOffset(-120).year(),  2011, 'should get year correctly');
+        assert.equal(a.clone().utcOffset(-120).month(),   11, 'should get month correctly');
+        assert.equal(a.clone().utcOffset(-120).date(),    31, 'should get date correctly');
+        assert.equal(a.clone().utcOffset(-120).hour(),    22, 'should get hour correctly');
+        assert.equal(a.clone().utcOffset(-120).minute(),   0, 'should get minute correctly');
+
+        assert.equal(a.clone().utcOffset(120).year(),  2012, 'should get year correctly');
+        assert.equal(a.clone().utcOffset(120).month(),    0, 'should get month correctly');
+        assert.equal(a.clone().utcOffset(120).date(),     1, 'should get date correctly');
+        assert.equal(a.clone().utcOffset(120).hour(),     2, 'should get hour correctly');
+        assert.equal(a.clone().utcOffset(120).minute(),   0, 'should get minute correctly');
+
+        assert.equal(a.clone().utcOffset(90).year(),  2012, 'should get year correctly');
+        assert.equal(a.clone().utcOffset(90).month(),    0, 'should get month correctly');
+        assert.equal(a.clone().utcOffset(90).date(),     1, 'should get date correctly');
+        assert.equal(a.clone().utcOffset(90).hour(),     1, 'should get hour correctly');
+        assert.equal(a.clone().utcOffset(90).minute(),  30, 'should get minute correctly');
+    });
+
+    test('from', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA).utcOffset(-720),
+            zoneC = moment(zoneA).utcOffset(-360),
+            zoneD = moment(zoneA).utcOffset(690),
+            other = moment(zoneA).add(35, 'm');
+
+        assert.equal(zoneA.from(other), zoneB.from(other), 'moment#from should be the same in all zones');
+        assert.equal(zoneA.from(other), zoneC.from(other), 'moment#from should be the same in all zones');
+        assert.equal(zoneA.from(other), zoneD.from(other), 'moment#from should be the same in all zones');
+    });
+
+    test('diff', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA).utcOffset(-720),
+            zoneC = moment(zoneA).utcOffset(-360),
+            zoneD = moment(zoneA).utcOffset(690),
+            other = moment(zoneA).add(35, 'm');
+
+        assert.equal(zoneA.diff(other), zoneB.diff(other), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other), zoneC.diff(other), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other), zoneD.diff(other), 'moment#diff should be the same in all zones');
+
+        assert.equal(zoneA.diff(other, 'minute', true), zoneB.diff(other, 'minute', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'minute', true), zoneC.diff(other, 'minute', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'minute', true), zoneD.diff(other, 'minute', true), 'moment#diff should be the same in all zones');
+
+        assert.equal(zoneA.diff(other, 'hour', true), zoneB.diff(other, 'hour', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'hour', true), zoneC.diff(other, 'hour', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'hour', true), zoneD.diff(other, 'hour', true), 'moment#diff should be the same in all zones');
+    });
+
+    test('unix offset and timestamp', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA).utcOffset(-720),
+            zoneC = moment(zoneA).utcOffset(-360),
+            zoneD = moment(zoneA).utcOffset(690);
+
+        assert.equal(zoneA.unix(), zoneB.unix(), 'moment#unix should be the same in all zones');
+        assert.equal(zoneA.unix(), zoneC.unix(), 'moment#unix should be the same in all zones');
+        assert.equal(zoneA.unix(), zoneD.unix(), 'moment#unix should be the same in all zones');
+
+        assert.equal(+zoneA, +zoneB, 'moment#valueOf should be the same in all zones');
+        assert.equal(+zoneA, +zoneC, 'moment#valueOf should be the same in all zones');
+        assert.equal(+zoneA, +zoneD, 'moment#valueOf should be the same in all zones');
+    });
+
+    test('cloning', function (assert) {
+        assert.equal(moment().utcOffset(-120).clone().utcOffset(), -120,
+                'explicit cloning should retain the offset');
+        assert.equal(moment().utcOffset(120).clone().utcOffset(), 120,
+                'explicit cloning should retain the offset');
+        assert.equal(moment(moment().utcOffset(-120)).utcOffset(), -120,
+                'implicit cloning should retain the offset');
+        assert.equal(moment(moment().utcOffset(120)).utcOffset(), 120,
+                'implicit cloning should retain the offset');
+    });
+
+    test('start of / end of', function (assert) {
+        var a = moment.utc([2010, 1, 2, 0, 0, 0]).utcOffset(-450);
+
+        assert.equal(a.clone().startOf('day').hour(), 0,
+                'start of day should work on moments with utc offset');
+        assert.equal(a.clone().startOf('day').minute(), 0,
+                'start of day should work on moments with utc offset');
+        assert.equal(a.clone().startOf('hour').minute(), 0,
+                'start of hour should work on moments with utc offset');
+
+        assert.equal(a.clone().endOf('day').hour(), 23,
+                'end of day should work on moments with utc offset');
+        assert.equal(a.clone().endOf('day').minute(), 59,
+                'end of day should work on moments with utc offset');
+        assert.equal(a.clone().endOf('hour').minute(), 59,
+                'end of hour should work on moments with utc offset');
+    });
+
+    test('reset offset with moment#utc', function (assert) {
+        var a = moment.utc([2012]).utcOffset(-480);
+
+        assert.equal(a.clone().hour(),      16, 'different utc offset should have different hour');
+        assert.equal(a.clone().utc().hour(), 0, 'calling moment#utc should reset the offset');
+    });
+
+    test('reset offset with moment#local', function (assert) {
+        var a = moment([2012]).utcOffset(-480);
+
+        assert.equal(a.clone().local().hour(), 0, 'calling moment#local should reset the offset');
+    });
+
+    test('toDate', function (assert) {
+        var zoneA = new Date(),
+            zoneB = moment(zoneA).utcOffset(-720).toDate(),
+            zoneC = moment(zoneA).utcOffset(-360).toDate(),
+            zoneD = moment(zoneA).utcOffset(690).toDate();
+
+        assert.equal(+zoneA, +zoneB, 'moment#toDate should output a date with the right unix timestamp');
+        assert.equal(+zoneA, +zoneC, 'moment#toDate should output a date with the right unix timestamp');
+        assert.equal(+zoneA, +zoneD, 'moment#toDate should output a date with the right unix timestamp');
+    });
+
+    test('same / before / after', function (assert) {
+        var zoneA = moment().utc(),
+            zoneB = moment(zoneA).utcOffset(-120),
+            zoneC = moment(zoneA).utcOffset(120);
+
+        assert.ok(zoneA.isSame(zoneB), 'two moments with different offsets should be the same');
+        assert.ok(zoneA.isSame(zoneC), 'two moments with different offsets should be the same');
+
+        assert.ok(zoneA.isSame(zoneB, 'hour'), 'two moments with different offsets should be the same hour');
+        assert.ok(zoneA.isSame(zoneC, 'hour'), 'two moments with different offsets should be the same hour');
+
+        zoneA.add(1, 'hour');
+
+        assert.ok(zoneA.isAfter(zoneB), 'isAfter should work with two moments with different offsets');
+        assert.ok(zoneA.isAfter(zoneC), 'isAfter should work with two moments with different offsets');
+
+        assert.ok(zoneA.isAfter(zoneB, 'hour'), 'isAfter:hour should work with two moments with different offsets');
+        assert.ok(zoneA.isAfter(zoneC, 'hour'), 'isAfter:hour should work with two moments with different offsets');
+
+        zoneA.subtract(2, 'hour');
+
+        assert.ok(zoneA.isBefore(zoneB), 'isBefore should work with two moments with different offsets');
+        assert.ok(zoneA.isBefore(zoneC), 'isBefore should work with two moments with different offsets');
+
+        assert.ok(zoneA.isBefore(zoneB, 'hour'), 'isBefore:hour should work with two moments with different offsets');
+        assert.ok(zoneA.isBefore(zoneC, 'hour'), 'isBefore:hour should work with two moments with different offsets');
+    });
+
+    test('add / subtract over dst', function (assert) {
+        var oldOffset = moment.updateOffset,
+            m = moment.utc([2000, 2, 31, 3]);
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.clone().utc().month() > 2) {
+                mom.utcOffset(60, keepTime);
+            } else {
+                mom.utcOffset(0, keepTime);
+            }
+        };
+
+        assert.equal(m.hour(), 3, 'should start at 00:00');
+
+        m.add(24, 'hour');
+
+        assert.equal(m.hour(), 4, 'adding 24 hours should disregard dst');
+
+        m.subtract(24, 'hour');
+
+        assert.equal(m.hour(), 3, 'subtracting 24 hours should disregard dst');
+
+        m.add(1, 'day');
+
+        assert.equal(m.hour(), 3, 'adding 1 day should have the same hour');
+
+        m.subtract(1, 'day');
+
+        assert.equal(m.hour(), 3, 'subtracting 1 day should have the same hour');
+
+        m.add(1, 'month');
+
+        assert.equal(m.hour(), 3, 'adding 1 month should have the same hour');
+
+        m.subtract(1, 'month');
+
+        assert.equal(m.hour(), 3, 'subtracting 1 month should have the same hour');
+
+        moment.updateOffset = oldOffset;
+    });
+
+    test('isDST', function (assert) {
+        var oldOffset = moment.updateOffset;
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.month() > 2 && mom.month() < 9) {
+                mom.utcOffset(60, keepTime);
+            } else {
+                mom.utcOffset(0, keepTime);
+            }
+        };
+
+        assert.ok(!moment().month(0).isDST(),  'Jan should not be summer dst');
+        assert.ok(moment().month(6).isDST(),   'Jul should be summer dst');
+        assert.ok(!moment().month(11).isDST(), 'Dec should not be summer dst');
+
+        moment.updateOffset = function (mom) {
+            if (mom.month() > 2 && mom.month() < 9) {
+                mom.utcOffset(0);
+            } else {
+                mom.utcOffset(60);
+            }
+        };
+
+        assert.ok(moment().month(0).isDST(),  'Jan should be winter dst');
+        assert.ok(!moment().month(6).isDST(), 'Jul should not be winter dst');
+        assert.ok(moment().month(11).isDST(), 'Dec should be winter dst');
+
+        moment.updateOffset = oldOffset;
+    });
+
+    test('zone names', function (assert) {
+        assert.equal(moment().zoneAbbr(),   '', 'Local zone abbr should be empty');
+        assert.equal(moment().format('z'),  '', 'Local zone formatted abbr should be empty');
+        assert.equal(moment().zoneName(),   '', 'Local zone name should be empty');
+        assert.equal(moment().format('zz'), '', 'Local zone formatted name should be empty');
+
+        assert.equal(moment.utc().zoneAbbr(),   'UTC', 'UTC zone abbr should be UTC');
+        assert.equal(moment.utc().format('z'),  'UTC', 'UTC zone formatted abbr should be UTC');
+        assert.equal(moment.utc().zoneName(),   'Coordinated Universal Time', 'UTC zone abbr should be Coordinated Universal Time');
+        assert.equal(moment.utc().format('zz'), 'Coordinated Universal Time', 'UTC zone formatted abbr should be Coordinated Universal Time');
+    });
+
+    test('hours alignment with UTC', function (assert) {
+        assert.equal(moment().utcOffset(-120).hasAlignedHourOffset(), true);
+        assert.equal(moment().utcOffset(180).hasAlignedHourOffset(), true);
+        assert.equal(moment().utcOffset(-90).hasAlignedHourOffset(), false);
+        assert.equal(moment().utcOffset(90).hasAlignedHourOffset(), false);
+    });
+
+    test('hours alignment with other zone', function (assert) {
+        var m = moment().utcOffset(-120);
+
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-90)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(90)), false);
+
+        m = moment().utcOffset(-90);
+
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-180)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(180)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-30)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(30)), true);
+
+        m = moment().utcOffset(60);
+
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-90)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(90)), false);
+
+        m = moment().utcOffset(-25);
+
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(35)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-85)), true);
+
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(-35)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().utcOffset(85)), false);
+    });
+
+    test('parse zone', function (assert) {
+        var m = moment('2013-01-01T00:00:00-13:00').parseZone();
+        assert.equal(m.utcOffset(), -13 * 60);
+        assert.equal(m.hours(), 0);
+    });
+
+    test('parse zone static', function (assert) {
+        var m = moment.parseZone('2013-01-01T00:00:00-13:00');
+        assert.equal(m.utcOffset(), -13 * 60);
+        assert.equal(m.hours(), 0);
+    });
+
+    test('parse zone with more arguments', function (assert) {
+        var m;
+        m = moment.parseZone('2013 01 01 05 -13:00', 'YYYY MM DD HH ZZ');
+        assert.equal(m.format(), '2013-01-01T05:00:00-13:00', 'accept input and format');
+        m = moment.parseZone('2013-01-01-13:00', 'YYYY MM DD ZZ', true);
+        assert.equal(m.isValid(), false, 'accept input, format and strict flag');
+        m = moment.parseZone('2013-01-01-13:00', ['DD MM YYYY ZZ', 'YYYY MM DD ZZ']);
+        assert.equal(m.format(), '2013-01-01T00:00:00-13:00', 'accept input and array of formats');
+    });
+
+    test('parse zone with a timezone from the format string', function (assert) {
+        var m = moment('11-12-2013 -0400 +1100', 'DD-MM-YYYY ZZ #####').parseZone();
+
+        assert.equal(m.utcOffset(), -4 * 60);
+    });
+
+    test('parse zone without a timezone included in the format string', function (assert) {
+        var m = moment('11-12-2013 -0400 +1100', 'DD-MM-YYYY').parseZone();
+
+        assert.equal(m.utcOffset(), 11 * 60);
+    });
+
+    test('timezone format', function (assert) {
+        assert.equal(moment().utcOffset(60).format('ZZ'), '+0100', '-60 -> +0100');
+        assert.equal(moment().utcOffset(90).format('ZZ'), '+0130', '-90 -> +0130');
+        assert.equal(moment().utcOffset(120).format('ZZ'), '+0200', '-120 -> +0200');
+
+        assert.equal(moment().utcOffset(-60).format('ZZ'), '-0100', '+60 -> -0100');
+        assert.equal(moment().utcOffset(-90).format('ZZ'), '-0130', '+90 -> -0130');
+        assert.equal(moment().utcOffset(-120).format('ZZ'), '-0200', '+120 -> -0200');
+    });
+
+    test('local to utc, keepLocalTime = true', function (assert) {
+        var m = moment(),
+            fmt = 'YYYY-DD-MM HH:mm:ss';
+        assert.equal(m.clone().utc(true).format(fmt), m.format(fmt), 'local to utc failed to keep local time');
+    });
+
+    test('local to utc, keepLocalTime = false', function (assert) {
+        var m = moment();
+        assert.equal(m.clone().utc().valueOf(), m.valueOf(), 'local to utc failed to keep utc time (implicit)');
+        assert.equal(m.clone().utc(false).valueOf(), m.valueOf(), 'local to utc failed to keep utc time (explicit)');
+    });
+
+    test('local to zone, keepLocalTime = true', function (assert) {
+        var m = moment(),
+            fmt = 'YYYY-DD-MM HH:mm:ss',
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            assert.equal(m.clone().utcOffset(z * 60, true).format(fmt),
+                    m.format(fmt),
+                    'local to utcOffset(' + z + ':00) failed to keep local time');
+        }
+    });
+
+    test('local to zone, keepLocalTime = false', function (assert) {
+        var m = moment(),
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            assert.equal(m.clone().utcOffset(z * 60).valueOf(),
+                    m.valueOf(),
+                    'local to utcOffset(' + z + ':00) failed to keep utc time (implicit)');
+            assert.equal(m.clone().utcOffset(z * 60, false).valueOf(),
+                    m.valueOf(),
+                    'local to utcOffset(' + z + ':00) failed to keep utc time (explicit)');
+        }
+    });
+
+    test('utc to local, keepLocalTime = true', function (assert) {
+        var um = moment.utc(),
+            fmt = 'YYYY-DD-MM HH:mm:ss';
+
+        assert.equal(um.clone().local(true).format(fmt), um.format(fmt), 'utc to local failed to keep local time');
+    });
+
+    test('utc to local, keepLocalTime = false', function (assert) {
+        var um = moment.utc();
+        assert.equal(um.clone().local().valueOf(), um.valueOf(), 'utc to local failed to keep utc time (implicit)');
+        assert.equal(um.clone().local(false).valueOf(), um.valueOf(), 'utc to local failed to keep utc time (explicit)');
+    });
+
+    test('zone to local, keepLocalTime = true', function (assert) {
+        var m = moment(),
+            fmt = 'YYYY-DD-MM HH:mm:ss',
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            m.utcOffset(z * 60);
+
+            assert.equal(m.clone().local(true).format(fmt),
+                    m.format(fmt),
+                    'utcOffset(' + z + ':00) to local failed to keep local time');
+        }
+    });
+
+    test('zone to local, keepLocalTime = false', function (assert) {
+        var m = moment(),
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            m.utcOffset(z * 60);
+
+            assert.equal(m.clone().local(false).valueOf(), m.valueOf(),
+                    'utcOffset(' + z + ':00) to local failed to keep utc time (explicit)');
+            assert.equal(m.clone().local().valueOf(), m.valueOf(),
+                    'utcOffset(' + z + ':00) to local failed to keep utc time (implicit)');
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('week year');
+
+    test('iso week year', function (assert) {
+        // Some examples taken from http://en.wikipedia.org/wiki/ISO_week
+        assert.equal(moment([2005, 0, 1]).isoWeekYear(), 2004);
+        assert.equal(moment([2005, 0, 2]).isoWeekYear(), 2004);
+        assert.equal(moment([2005, 0, 3]).isoWeekYear(), 2005);
+        assert.equal(moment([2005, 11, 31]).isoWeekYear(), 2005);
+        assert.equal(moment([2006, 0, 1]).isoWeekYear(), 2005);
+        assert.equal(moment([2006, 0, 2]).isoWeekYear(), 2006);
+        assert.equal(moment([2007, 0, 1]).isoWeekYear(), 2007);
+        assert.equal(moment([2007, 11, 30]).isoWeekYear(), 2007);
+        assert.equal(moment([2007, 11, 31]).isoWeekYear(), 2008);
+        assert.equal(moment([2008, 0, 1]).isoWeekYear(), 2008);
+        assert.equal(moment([2008, 11, 28]).isoWeekYear(), 2008);
+        assert.equal(moment([2008, 11, 29]).isoWeekYear(), 2009);
+        assert.equal(moment([2008, 11, 30]).isoWeekYear(), 2009);
+        assert.equal(moment([2008, 11, 31]).isoWeekYear(), 2009);
+        assert.equal(moment([2009, 0, 1]).isoWeekYear(), 2009);
+        assert.equal(moment([2010, 0, 1]).isoWeekYear(), 2009);
+        assert.equal(moment([2010, 0, 2]).isoWeekYear(), 2009);
+        assert.equal(moment([2010, 0, 3]).isoWeekYear(), 2009);
+        assert.equal(moment([2010, 0, 4]).isoWeekYear(), 2010);
+    });
+
+    test('week year', function (assert) {
+        // Some examples taken from http://en.wikipedia.org/wiki/ISO_week
+        moment.locale('dow: 1,doy: 4', {week: {dow: 1, doy: 4}}); // like iso
+        assert.equal(moment([2005, 0, 1]).weekYear(), 2004);
+        assert.equal(moment([2005, 0, 2]).weekYear(), 2004);
+        assert.equal(moment([2005, 0, 3]).weekYear(), 2005);
+        assert.equal(moment([2005, 11, 31]).weekYear(), 2005);
+        assert.equal(moment([2006, 0, 1]).weekYear(), 2005);
+        assert.equal(moment([2006, 0, 2]).weekYear(), 2006);
+        assert.equal(moment([2007, 0, 1]).weekYear(), 2007);
+        assert.equal(moment([2007, 11, 30]).weekYear(), 2007);
+        assert.equal(moment([2007, 11, 31]).weekYear(), 2008);
+        assert.equal(moment([2008, 0, 1]).weekYear(), 2008);
+        assert.equal(moment([2008, 11, 28]).weekYear(), 2008);
+        assert.equal(moment([2008, 11, 29]).weekYear(), 2009);
+        assert.equal(moment([2008, 11, 30]).weekYear(), 2009);
+        assert.equal(moment([2008, 11, 31]).weekYear(), 2009);
+        assert.equal(moment([2009, 0, 1]).weekYear(), 2009);
+        assert.equal(moment([2010, 0, 1]).weekYear(), 2009);
+        assert.equal(moment([2010, 0, 2]).weekYear(), 2009);
+        assert.equal(moment([2010, 0, 3]).weekYear(), 2009);
+        assert.equal(moment([2010, 0, 4]).weekYear(), 2010);
+
+        moment.locale('dow: 1,doy: 7', {week: {dow: 1, doy: 7}});
+        assert.equal(moment([2004, 11, 26]).weekYear(), 2004);
+        assert.equal(moment([2004, 11, 27]).weekYear(), 2005);
+        assert.equal(moment([2005, 11, 25]).weekYear(), 2005);
+        assert.equal(moment([2005, 11, 26]).weekYear(), 2006);
+        assert.equal(moment([2006, 11, 31]).weekYear(), 2006);
+        assert.equal(moment([2007,  0,  1]).weekYear(), 2007);
+        assert.equal(moment([2007, 11, 30]).weekYear(), 2007);
+        assert.equal(moment([2007, 11, 31]).weekYear(), 2008);
+        assert.equal(moment([2008, 11, 28]).weekYear(), 2008);
+        assert.equal(moment([2008, 11, 29]).weekYear(), 2009);
+        assert.equal(moment([2009, 11, 27]).weekYear(), 2009);
+        assert.equal(moment([2009, 11, 28]).weekYear(), 2010);
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('week day');
+
+    test('iso weekday', function (assert) {
+        var i;
+
+        for (i = 0; i < 7; ++i) {
+            moment.locale('dow:' + i + ',doy: 6', {week: {dow: i, doy: 6}});
+            assert.equal(moment([1985, 1,  4]).isoWeekday(), 1, 'Feb  4 1985 is Monday    -- 1st day');
+            assert.equal(moment([2029, 8, 18]).isoWeekday(), 2, 'Sep 18 2029 is Tuesday   -- 2nd day');
+            assert.equal(moment([2013, 3, 24]).isoWeekday(), 3, 'Apr 24 2013 is Wednesday -- 3rd day');
+            assert.equal(moment([2015, 2,  5]).isoWeekday(), 4, 'Mar  5 2015 is Thursday  -- 4th day');
+            assert.equal(moment([1970, 0,  2]).isoWeekday(), 5, 'Jan  2 1970 is Friday    -- 5th day');
+            assert.equal(moment([2001, 4, 12]).isoWeekday(), 6, 'May 12 2001 is Saturday  -- 6th day');
+            assert.equal(moment([2000, 0,  2]).isoWeekday(), 7, 'Jan  2 2000 is Sunday    -- 7th day');
+        }
+    });
+
+    test('iso weekday setter', function (assert) {
+        var a = moment([2011, 0, 10]);
+        assert.equal(moment(a).isoWeekday(1).date(),  10, 'set from mon to mon');
+        assert.equal(moment(a).isoWeekday(4).date(),  13, 'set from mon to thu');
+        assert.equal(moment(a).isoWeekday(7).date(),  16, 'set from mon to sun');
+        assert.equal(moment(a).isoWeekday(-6).date(),  3, 'set from mon to last mon');
+        assert.equal(moment(a).isoWeekday(-3).date(),  6, 'set from mon to last thu');
+        assert.equal(moment(a).isoWeekday(0).date(),   9, 'set from mon to last sun');
+        assert.equal(moment(a).isoWeekday(8).date(),  17, 'set from mon to next mon');
+        assert.equal(moment(a).isoWeekday(11).date(), 20, 'set from mon to next thu');
+        assert.equal(moment(a).isoWeekday(14).date(), 23, 'set from mon to next sun');
+
+        a = moment([2011, 0, 13]);
+        assert.equal(moment(a).isoWeekday(1).date(), 10, 'set from thu to mon');
+        assert.equal(moment(a).isoWeekday(4).date(), 13, 'set from thu to thu');
+        assert.equal(moment(a).isoWeekday(7).date(), 16, 'set from thu to sun');
+        assert.equal(moment(a).isoWeekday(-6).date(),  3, 'set from thu to last mon');
+        assert.equal(moment(a).isoWeekday(-3).date(),  6, 'set from thu to last thu');
+        assert.equal(moment(a).isoWeekday(0).date(),   9, 'set from thu to last sun');
+        assert.equal(moment(a).isoWeekday(8).date(),  17, 'set from thu to next mon');
+        assert.equal(moment(a).isoWeekday(11).date(), 20, 'set from thu to next thu');
+        assert.equal(moment(a).isoWeekday(14).date(), 23, 'set from thu to next sun');
+
+        a = moment([2011, 0, 16]);
+        assert.equal(moment(a).isoWeekday(1).date(), 10, 'set from sun to mon');
+        assert.equal(moment(a).isoWeekday(4).date(), 13, 'set from sun to thu');
+        assert.equal(moment(a).isoWeekday(7).date(), 16, 'set from sun to sun');
+        assert.equal(moment(a).isoWeekday(-6).date(),  3, 'set from sun to last mon');
+        assert.equal(moment(a).isoWeekday(-3).date(),  6, 'set from sun to last thu');
+        assert.equal(moment(a).isoWeekday(0).date(),   9, 'set from sun to last sun');
+        assert.equal(moment(a).isoWeekday(8).date(),  17, 'set from sun to next mon');
+        assert.equal(moment(a).isoWeekday(11).date(), 20, 'set from sun to next thu');
+        assert.equal(moment(a).isoWeekday(14).date(), 23, 'set from sun to next sun');
+    });
+
+    test('weekday first day of week Sunday (dow 0)', function (assert) {
+        moment.locale('dow: 0,doy: 6', {week: {dow: 0, doy: 6}});
+        assert.equal(moment([1985, 1,  3]).weekday(), 0, 'Feb  3 1985 is Sunday    -- 0th day');
+        assert.equal(moment([2029, 8, 17]).weekday(), 1, 'Sep 17 2029 is Monday    -- 1st day');
+        assert.equal(moment([2013, 3, 23]).weekday(), 2, 'Apr 23 2013 is Tuesday   -- 2nd day');
+        assert.equal(moment([2015, 2,  4]).weekday(), 3, 'Mar  4 2015 is Wednesday -- 3nd day');
+        assert.equal(moment([1970, 0,  1]).weekday(), 4, 'Jan  1 1970 is Thursday  -- 4th day');
+        assert.equal(moment([2001, 4, 11]).weekday(), 5, 'May 11 2001 is Friday    -- 5th day');
+        assert.equal(moment([2000, 0,  1]).weekday(), 6, 'Jan  1 2000 is Saturday  -- 6th day');
+    });
+
+    test('weekday first day of week Monday (dow 1)', function (assert) {
+        moment.locale('dow: 1,doy: 6', {week: {dow: 1, doy: 6}});
+        assert.equal(moment([1985, 1,  4]).weekday(), 0, 'Feb  4 1985 is Monday    -- 0th day');
+        assert.equal(moment([2029, 8, 18]).weekday(), 1, 'Sep 18 2029 is Tuesday   -- 1st day');
+        assert.equal(moment([2013, 3, 24]).weekday(), 2, 'Apr 24 2013 is Wednesday -- 2nd day');
+        assert.equal(moment([2015, 2,  5]).weekday(), 3, 'Mar  5 2015 is Thursday  -- 3nd day');
+        assert.equal(moment([1970, 0,  2]).weekday(), 4, 'Jan  2 1970 is Friday    -- 4th day');
+        assert.equal(moment([2001, 4, 12]).weekday(), 5, 'May 12 2001 is Saturday  -- 5th day');
+        assert.equal(moment([2000, 0,  2]).weekday(), 6, 'Jan  2 2000 is Sunday    -- 6th day');
+    });
+
+    test('weekday first day of week Tuesday (dow 2)', function (assert) {
+        moment.locale('dow: 2,doy: 6', {week: {dow: 2, doy: 6}});
+        assert.equal(moment([1985, 1,  5]).weekday(), 0, 'Feb  5 1985 is Tuesday   -- 0th day');
+        assert.equal(moment([2029, 8, 19]).weekday(), 1, 'Sep 19 2029 is Wednesday -- 1st day');
+        assert.equal(moment([2013, 3, 25]).weekday(), 2, 'Apr 25 2013 is Thursday  -- 2nd day');
+        assert.equal(moment([2015, 2,  6]).weekday(), 3, 'Mar  6 2015 is Friday    -- 3nd day');
+        assert.equal(moment([1970, 0,  3]).weekday(), 4, 'Jan  3 1970 is Staturday -- 4th day');
+        assert.equal(moment([2001, 4, 13]).weekday(), 5, 'May 13 2001 is Sunday    -- 5th day');
+        assert.equal(moment([2000, 0,  3]).weekday(), 6, 'Jan  3 2000 is Monday    -- 6th day');
+    });
+
+    test('weekday first day of week Wednesday (dow 3)', function (assert) {
+        moment.locale('dow: 3,doy: 6', {week: {dow: 3, doy: 6}});
+        assert.equal(moment([1985, 1,  6]).weekday(), 0, 'Feb  6 1985 is Wednesday -- 0th day');
+        assert.equal(moment([2029, 8, 20]).weekday(), 1, 'Sep 20 2029 is Thursday  -- 1st day');
+        assert.equal(moment([2013, 3, 26]).weekday(), 2, 'Apr 26 2013 is Friday    -- 2nd day');
+        assert.equal(moment([2015, 2,  7]).weekday(), 3, 'Mar  7 2015 is Saturday  -- 3nd day');
+        assert.equal(moment([1970, 0,  4]).weekday(), 4, 'Jan  4 1970 is Sunday    -- 4th day');
+        assert.equal(moment([2001, 4, 14]).weekday(), 5, 'May 14 2001 is Monday    -- 5th day');
+        assert.equal(moment([2000, 0,  4]).weekday(), 6, 'Jan  4 2000 is Tuesday   -- 6th day');
+        moment.locale('dow:3,doy:6', null);
+    });
+
+    test('weekday first day of week Thursday (dow 4)', function (assert) {
+        moment.locale('dow: 4,doy: 6', {week: {dow: 4, doy: 6}});
+        assert.equal(moment([1985, 1,  7]).weekday(), 0, 'Feb  7 1985 is Thursday  -- 0th day');
+        assert.equal(moment([2029, 8, 21]).weekday(), 1, 'Sep 21 2029 is Friday    -- 1st day');
+        assert.equal(moment([2013, 3, 27]).weekday(), 2, 'Apr 27 2013 is Saturday  -- 2nd day');
+        assert.equal(moment([2015, 2,  8]).weekday(), 3, 'Mar  8 2015 is Sunday    -- 3nd day');
+        assert.equal(moment([1970, 0,  5]).weekday(), 4, 'Jan  5 1970 is Monday    -- 4th day');
+        assert.equal(moment([2001, 4, 15]).weekday(), 5, 'May 15 2001 is Tuesday   -- 5th day');
+        assert.equal(moment([2000, 0,  5]).weekday(), 6, 'Jan  5 2000 is Wednesday -- 6th day');
+    });
+
+    test('weekday first day of week Friday (dow 5)', function (assert) {
+        moment.locale('dow: 5,doy: 6', {week: {dow: 5, doy: 6}});
+        assert.equal(moment([1985, 1,  8]).weekday(), 0, 'Feb  8 1985 is Friday    -- 0th day');
+        assert.equal(moment([2029, 8, 22]).weekday(), 1, 'Sep 22 2029 is Staturday -- 1st day');
+        assert.equal(moment([2013, 3, 28]).weekday(), 2, 'Apr 28 2013 is Sunday    -- 2nd day');
+        assert.equal(moment([2015, 2,  9]).weekday(), 3, 'Mar  9 2015 is Monday    -- 3nd day');
+        assert.equal(moment([1970, 0,  6]).weekday(), 4, 'Jan  6 1970 is Tuesday   -- 4th day');
+        assert.equal(moment([2001, 4, 16]).weekday(), 5, 'May 16 2001 is Wednesday -- 5th day');
+        assert.equal(moment([2000, 0,  6]).weekday(), 6, 'Jan  6 2000 is Thursday  -- 6th day');
+    });
+
+    test('weekday first day of week Saturday (dow 6)', function (assert) {
+        moment.locale('dow: 6,doy: 6', {week: {dow: 6, doy: 6}});
+        assert.equal(moment([1985, 1,  9]).weekday(), 0, 'Feb  9 1985 is Staturday -- 0th day');
+        assert.equal(moment([2029, 8, 23]).weekday(), 1, 'Sep 23 2029 is Sunday    -- 1st day');
+        assert.equal(moment([2013, 3, 29]).weekday(), 2, 'Apr 29 2013 is Monday    -- 2nd day');
+        assert.equal(moment([2015, 2, 10]).weekday(), 3, 'Mar 10 2015 is Tuesday   -- 3nd day');
+        assert.equal(moment([1970, 0,  7]).weekday(), 4, 'Jan  7 1970 is Wednesday -- 4th day');
+        assert.equal(moment([2001, 4, 17]).weekday(), 5, 'May 17 2001 is Thursday  -- 5th day');
+        assert.equal(moment([2000, 0,  7]).weekday(), 6, 'Jan  7 2000 is Friday    -- 6th day');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('weeks');
+
+    test('day of year', function (assert) {
+        assert.equal(moment([2000,  0,  1]).dayOfYear(),   1, 'Jan  1 2000 should be day 1 of the year');
+        assert.equal(moment([2000,  1, 28]).dayOfYear(),  59, 'Feb 28 2000 should be day 59 of the year');
+        assert.equal(moment([2000,  1, 29]).dayOfYear(),  60, 'Feb 28 2000 should be day 60 of the year');
+        assert.equal(moment([2000, 11, 31]).dayOfYear(), 366, 'Dec 31 2000 should be day 366 of the year');
+        assert.equal(moment([2001,  0,  1]).dayOfYear(),   1, 'Jan  1 2001 should be day 1 of the year');
+        assert.equal(moment([2001,  1, 28]).dayOfYear(),  59, 'Feb 28 2001 should be day 59 of the year');
+        assert.equal(moment([2001,  2,  1]).dayOfYear(),  60, 'Mar  1 2001 should be day 60 of the year');
+        assert.equal(moment([2001, 11, 31]).dayOfYear(), 365, 'Dec 31 2001 should be day 365 of the year');
+    });
+
+    test('day of year setters', function (assert) {
+        assert.equal(moment([2000,  0,  1]).dayOfYear(200).dayOfYear(), 200, 'Setting Jan  1 2000 day of the year to 200 should work');
+        assert.equal(moment([2000,  1, 28]).dayOfYear(200).dayOfYear(), 200, 'Setting Feb 28 2000 day of the year to 200 should work');
+        assert.equal(moment([2000,  1, 29]).dayOfYear(200).dayOfYear(), 200, 'Setting Feb 28 2000 day of the year to 200 should work');
+        assert.equal(moment([2000, 11, 31]).dayOfYear(200).dayOfYear(), 200, 'Setting Dec 31 2000 day of the year to 200 should work');
+        assert.equal(moment().dayOfYear(1).dayOfYear(),   1, 'Setting day of the year to 1 should work');
+        assert.equal(moment().dayOfYear(59).dayOfYear(),  59, 'Setting day of the year to 59 should work');
+        assert.equal(moment().dayOfYear(60).dayOfYear(),  60, 'Setting day of the year to 60 should work');
+        assert.equal(moment().dayOfYear(365).dayOfYear(), 365, 'Setting day of the year to 365 should work');
+    });
+
+    test('iso weeks year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).isoWeek(), 52, 'Jan  1 2012 should be iso week 52');
+        assert.equal(moment([2012, 0, 2]).isoWeek(),  1, 'Jan  2 2012 should be iso week 1');
+        assert.equal(moment([2012, 0, 8]).isoWeek(),  1, 'Jan  8 2012 should be iso week 1');
+        assert.equal(moment([2012, 0, 9]).isoWeek(),  2, 'Jan  9 2012 should be iso week 2');
+        assert.equal(moment([2012, 0, 15]).isoWeek(), 2, 'Jan 15 2012 should be iso week 2');
+    });
+
+    test('iso weeks year starting monday', function (assert) {
+        assert.equal(moment([2007, 0, 1]).isoWeek(),  1, 'Jan  1 2007 should be iso week 1');
+        assert.equal(moment([2007, 0, 7]).isoWeek(),  1, 'Jan  7 2007 should be iso week 1');
+        assert.equal(moment([2007, 0, 8]).isoWeek(),  2, 'Jan  8 2007 should be iso week 2');
+        assert.equal(moment([2007, 0, 14]).isoWeek(), 2, 'Jan 14 2007 should be iso week 2');
+        assert.equal(moment([2007, 0, 15]).isoWeek(), 3, 'Jan 15 2007 should be iso week 3');
+    });
+
+    test('iso weeks year starting tuesday', function (assert) {
+        assert.equal(moment([2007, 11, 31]).isoWeek(), 1, 'Dec 31 2007 should be iso week 1');
+        assert.equal(moment([2008,  0,  1]).isoWeek(), 1, 'Jan  1 2008 should be iso week 1');
+        assert.equal(moment([2008,  0,  6]).isoWeek(), 1, 'Jan  6 2008 should be iso week 1');
+        assert.equal(moment([2008,  0,  7]).isoWeek(), 2, 'Jan  7 2008 should be iso week 2');
+        assert.equal(moment([2008,  0, 13]).isoWeek(), 2, 'Jan 13 2008 should be iso week 2');
+        assert.equal(moment([2008,  0, 14]).isoWeek(), 3, 'Jan 14 2008 should be iso week 3');
+    });
+
+    test('iso weeks year starting wednesday', function (assert) {
+        assert.equal(moment([2002, 11, 30]).isoWeek(), 1, 'Dec 30 2002 should be iso week 1');
+        assert.equal(moment([2003,  0,  1]).isoWeek(), 1, 'Jan  1 2003 should be iso week 1');
+        assert.equal(moment([2003,  0,  5]).isoWeek(), 1, 'Jan  5 2003 should be iso week 1');
+        assert.equal(moment([2003,  0,  6]).isoWeek(), 2, 'Jan  6 2003 should be iso week 2');
+        assert.equal(moment([2003,  0, 12]).isoWeek(), 2, 'Jan 12 2003 should be iso week 2');
+        assert.equal(moment([2003,  0, 13]).isoWeek(), 3, 'Jan 13 2003 should be iso week 3');
+    });
+
+    test('iso weeks year starting thursday', function (assert) {
+        assert.equal(moment([2008, 11, 29]).isoWeek(), 1, 'Dec 29 2008 should be iso week 1');
+        assert.equal(moment([2009,  0,  1]).isoWeek(), 1, 'Jan  1 2009 should be iso week 1');
+        assert.equal(moment([2009,  0,  4]).isoWeek(), 1, 'Jan  4 2009 should be iso week 1');
+        assert.equal(moment([2009,  0,  5]).isoWeek(), 2, 'Jan  5 2009 should be iso week 2');
+        assert.equal(moment([2009,  0, 11]).isoWeek(), 2, 'Jan 11 2009 should be iso week 2');
+        assert.equal(moment([2009,  0, 13]).isoWeek(), 3, 'Jan 12 2009 should be iso week 3');
+    });
+
+    test('iso weeks year starting friday', function (assert) {
+        assert.equal(moment([2009, 11, 28]).isoWeek(), 53, 'Dec 28 2009 should be iso week 53');
+        assert.equal(moment([2010,  0,  1]).isoWeek(), 53, 'Jan  1 2010 should be iso week 53');
+        assert.equal(moment([2010,  0,  3]).isoWeek(), 53, 'Jan  3 2010 should be iso week 53');
+        assert.equal(moment([2010,  0,  4]).isoWeek(),  1, 'Jan  4 2010 should be iso week 1');
+        assert.equal(moment([2010,  0, 10]).isoWeek(),  1, 'Jan 10 2010 should be iso week 1');
+        assert.equal(moment([2010,  0, 11]).isoWeek(),  2, 'Jan 11 2010 should be iso week 2');
+    });
+
+    test('iso weeks year starting saturday', function (assert) {
+        assert.equal(moment([2010, 11, 27]).isoWeek(), 52, 'Dec 27 2010 should be iso week 52');
+        assert.equal(moment([2011,  0,  1]).isoWeek(), 52, 'Jan  1 2011 should be iso week 52');
+        assert.equal(moment([2011,  0,  2]).isoWeek(), 52, 'Jan  2 2011 should be iso week 52');
+        assert.equal(moment([2011,  0,  3]).isoWeek(),  1, 'Jan  3 2011 should be iso week 1');
+        assert.equal(moment([2011,  0,  9]).isoWeek(),  1, 'Jan  9 2011 should be iso week 1');
+        assert.equal(moment([2011,  0, 10]).isoWeek(),  2, 'Jan 10 2011 should be iso week 2');
+    });
+
+    test('iso weeks year starting sunday formatted', function (assert) {
+        assert.equal(moment([2012, 0,  1]).format('W WW Wo'), '52 52 52nd', 'Jan  1 2012 should be iso week 52');
+        assert.equal(moment([2012, 0,  2]).format('W WW Wo'),   '1 01 1st', 'Jan  2 2012 should be iso week 1');
+        assert.equal(moment([2012, 0,  8]).format('W WW Wo'),   '1 01 1st', 'Jan  8 2012 should be iso week 1');
+        assert.equal(moment([2012, 0,  9]).format('W WW Wo'),   '2 02 2nd', 'Jan  9 2012 should be iso week 2');
+        assert.equal(moment([2012, 0, 15]).format('W WW Wo'),   '2 02 2nd', 'Jan 15 2012 should be iso week 2');
+    });
+
+    test('weeks plural year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0,  1]).weeks(), 1, 'Jan  1 2012 should be week 1');
+        assert.equal(moment([2012, 0,  7]).weeks(), 1, 'Jan  7 2012 should be week 1');
+        assert.equal(moment([2012, 0,  8]).weeks(), 2, 'Jan  8 2012 should be week 2');
+        assert.equal(moment([2012, 0, 14]).weeks(), 2, 'Jan 14 2012 should be week 2');
+        assert.equal(moment([2012, 0, 15]).weeks(), 3, 'Jan 15 2012 should be week 3');
+    });
+
+    test('iso weeks plural year starting sunday', function (assert) {
+        assert.equal(moment([2012, 0, 1]).isoWeeks(), 52, 'Jan  1 2012 should be iso week 52');
+        assert.equal(moment([2012, 0, 2]).isoWeeks(),  1, 'Jan  2 2012 should be iso week 1');
+        assert.equal(moment([2012, 0, 8]).isoWeeks(),  1, 'Jan  8 2012 should be iso week 1');
+        assert.equal(moment([2012, 0, 9]).isoWeeks(),  2, 'Jan  9 2012 should be iso week 2');
+        assert.equal(moment([2012, 0, 15]).isoWeeks(), 2, 'Jan 15 2012 should be iso week 2');
+    });
+
+    test('weeks setter', function (assert) {
+        assert.equal(moment([2012, 0,  1]).week(30).week(), 30, 'Setting Jan 1 2012 to week 30 should work');
+        assert.equal(moment([2012, 0,  7]).week(30).week(), 30, 'Setting Jan 7 2012 to week 30 should work');
+        assert.equal(moment([2012, 0,  8]).week(30).week(), 30, 'Setting Jan 8 2012 to week 30 should work');
+        assert.equal(moment([2012, 0, 14]).week(30).week(), 30, 'Setting Jan 14 2012 to week 30 should work');
+        assert.equal(moment([2012, 0, 15]).week(30).week(), 30, 'Setting Jan 15 2012 to week 30 should work');
+    });
+
+    test('iso weeks setter', function (assert) {
+        assert.equal(moment([2012, 0,  1]).isoWeeks(25).isoWeeks(), 25, 'Setting Jan  1 2012 to week 25 should work');
+        assert.equal(moment([2012, 0,  2]).isoWeeks(24).isoWeeks(), 24, 'Setting Jan  2 2012 to week 24 should work');
+        assert.equal(moment([2012, 0,  8]).isoWeeks(23).isoWeeks(), 23, 'Setting Jan  8 2012 to week 23 should work');
+        assert.equal(moment([2012, 0,  9]).isoWeeks(22).isoWeeks(), 22, 'Setting Jan  9 2012 to week 22 should work');
+        assert.equal(moment([2012, 0, 15]).isoWeeks(21).isoWeeks(), 21, 'Setting Jan 15 2012 to week 21 should work');
+    });
+
+    test('iso weeks setter day of year', function (assert) {
+        assert.equal(moment([2012, 0,  1]).isoWeek(1).dayOfYear(), 9, 'Setting Jan  1 2012 to week 1 should be day of year 8');
+        assert.equal(moment([2012, 0,  1]).isoWeek(1).year(),   2011, 'Setting Jan  1 2012 to week 1 should be year 2011');
+        assert.equal(moment([2012, 0,  2]).isoWeek(1).dayOfYear(), 2, 'Setting Jan  2 2012 to week 1 should be day of year 2');
+        assert.equal(moment([2012, 0,  8]).isoWeek(1).dayOfYear(), 8, 'Setting Jan  8 2012 to week 1 should be day of year 8');
+        assert.equal(moment([2012, 0,  9]).isoWeek(1).dayOfYear(), 2, 'Setting Jan  9 2012 to week 1 should be day of year 2');
+        assert.equal(moment([2012, 0, 15]).isoWeek(1).dayOfYear(), 8, 'Setting Jan 15 2012 to week 1 should be day of year 8');
+    });
+
+    test('years with iso week 53', function (assert) {
+        // Based on a table taken from http://en.wikipedia.org/wiki/ISO_week_date
+        // (as downloaded on 2014-01-06) listing the 71 years in a 400-year cycle
+        // that have 53 weeks; in this case reflecting the 2000 based cycle
+        assert.equal(moment([2004, 11, 31]).isoWeek(), 53, 'Dec 31 2004 should be iso week 53');
+        assert.equal(moment([2009, 11, 31]).isoWeek(), 53, 'Dec 31 2009 should be iso week 53');
+        assert.equal(moment([2015, 11, 31]).isoWeek(), 53, 'Dec 31 2015 should be iso week 53');
+        assert.equal(moment([2020, 11, 31]).isoWeek(), 53, 'Dec 31 2020 should be iso week 53');
+        assert.equal(moment([2026, 11, 31]).isoWeek(), 53, 'Dec 31 2026 should be iso week 53');
+        assert.equal(moment([2032, 11, 31]).isoWeek(), 53, 'Dec 31 2032 should be iso week 53');
+        assert.equal(moment([2037, 11, 31]).isoWeek(), 53, 'Dec 31 2037 should be iso week 53');
+        assert.equal(moment([2043, 11, 31]).isoWeek(), 53, 'Dec 31 2043 should be iso week 53');
+        assert.equal(moment([2048, 11, 31]).isoWeek(), 53, 'Dec 31 2048 should be iso week 53');
+        assert.equal(moment([2054, 11, 31]).isoWeek(), 53, 'Dec 31 2054 should be iso week 53');
+        assert.equal(moment([2060, 11, 31]).isoWeek(), 53, 'Dec 31 2060 should be iso week 53');
+        assert.equal(moment([2065, 11, 31]).isoWeek(), 53, 'Dec 31 2065 should be iso week 53');
+        assert.equal(moment([2071, 11, 31]).isoWeek(), 53, 'Dec 31 2071 should be iso week 53');
+        assert.equal(moment([2076, 11, 31]).isoWeek(), 53, 'Dec 31 2076 should be iso week 53');
+        assert.equal(moment([2082, 11, 31]).isoWeek(), 53, 'Dec 31 2082 should be iso week 53');
+        assert.equal(moment([2088, 11, 31]).isoWeek(), 53, 'Dec 31 2088 should be iso week 53');
+        assert.equal(moment([2093, 11, 31]).isoWeek(), 53, 'Dec 31 2093 should be iso week 53');
+        assert.equal(moment([2099, 11, 31]).isoWeek(), 53, 'Dec 31 2099 should be iso week 53');
+        assert.equal(moment([2105, 11, 31]).isoWeek(), 53, 'Dec 31 2105 should be iso week 53');
+        assert.equal(moment([2111, 11, 31]).isoWeek(), 53, 'Dec 31 2111 should be iso week 53');
+        assert.equal(moment([2116, 11, 31]).isoWeek(), 53, 'Dec 31 2116 should be iso week 53');
+        assert.equal(moment([2122, 11, 31]).isoWeek(), 53, 'Dec 31 2122 should be iso week 53');
+        assert.equal(moment([2128, 11, 31]).isoWeek(), 53, 'Dec 31 2128 should be iso week 53');
+        assert.equal(moment([2133, 11, 31]).isoWeek(), 53, 'Dec 31 2133 should be iso week 53');
+        assert.equal(moment([2139, 11, 31]).isoWeek(), 53, 'Dec 31 2139 should be iso week 53');
+        assert.equal(moment([2144, 11, 31]).isoWeek(), 53, 'Dec 31 2144 should be iso week 53');
+        assert.equal(moment([2150, 11, 31]).isoWeek(), 53, 'Dec 31 2150 should be iso week 53');
+        assert.equal(moment([2156, 11, 31]).isoWeek(), 53, 'Dec 31 2156 should be iso week 53');
+        assert.equal(moment([2161, 11, 31]).isoWeek(), 53, 'Dec 31 2161 should be iso week 53');
+        assert.equal(moment([2167, 11, 31]).isoWeek(), 53, 'Dec 31 2167 should be iso week 53');
+        assert.equal(moment([2172, 11, 31]).isoWeek(), 53, 'Dec 31 2172 should be iso week 53');
+        assert.equal(moment([2178, 11, 31]).isoWeek(), 53, 'Dec 31 2178 should be iso week 53');
+        assert.equal(moment([2184, 11, 31]).isoWeek(), 53, 'Dec 31 2184 should be iso week 53');
+        assert.equal(moment([2189, 11, 31]).isoWeek(), 53, 'Dec 31 2189 should be iso week 53');
+        assert.equal(moment([2195, 11, 31]).isoWeek(), 53, 'Dec 31 2195 should be iso week 53');
+        assert.equal(moment([2201, 11, 31]).isoWeek(), 53, 'Dec 31 2201 should be iso week 53');
+        assert.equal(moment([2207, 11, 31]).isoWeek(), 53, 'Dec 31 2207 should be iso week 53');
+        assert.equal(moment([2212, 11, 31]).isoWeek(), 53, 'Dec 31 2212 should be iso week 53');
+        assert.equal(moment([2218, 11, 31]).isoWeek(), 53, 'Dec 31 2218 should be iso week 53');
+        assert.equal(moment([2224, 11, 31]).isoWeek(), 53, 'Dec 31 2224 should be iso week 53');
+        assert.equal(moment([2229, 11, 31]).isoWeek(), 53, 'Dec 31 2229 should be iso week 53');
+        assert.equal(moment([2235, 11, 31]).isoWeek(), 53, 'Dec 31 2235 should be iso week 53');
+        assert.equal(moment([2240, 11, 31]).isoWeek(), 53, 'Dec 31 2240 should be iso week 53');
+        assert.equal(moment([2246, 11, 31]).isoWeek(), 53, 'Dec 31 2246 should be iso week 53');
+        assert.equal(moment([2252, 11, 31]).isoWeek(), 53, 'Dec 31 2252 should be iso week 53');
+        assert.equal(moment([2257, 11, 31]).isoWeek(), 53, 'Dec 31 2257 should be iso week 53');
+        assert.equal(moment([2263, 11, 31]).isoWeek(), 53, 'Dec 31 2263 should be iso week 53');
+        assert.equal(moment([2268, 11, 31]).isoWeek(), 53, 'Dec 31 2268 should be iso week 53');
+        assert.equal(moment([2274, 11, 31]).isoWeek(), 53, 'Dec 31 2274 should be iso week 53');
+        assert.equal(moment([2280, 11, 31]).isoWeek(), 53, 'Dec 31 2280 should be iso week 53');
+        assert.equal(moment([2285, 11, 31]).isoWeek(), 53, 'Dec 31 2285 should be iso week 53');
+        assert.equal(moment([2291, 11, 31]).isoWeek(), 53, 'Dec 31 2291 should be iso week 53');
+        assert.equal(moment([2296, 11, 31]).isoWeek(), 53, 'Dec 31 2296 should be iso week 53');
+        assert.equal(moment([2303, 11, 31]).isoWeek(), 53, 'Dec 31 2303 should be iso week 53');
+        assert.equal(moment([2308, 11, 31]).isoWeek(), 53, 'Dec 31 2308 should be iso week 53');
+        assert.equal(moment([2314, 11, 31]).isoWeek(), 53, 'Dec 31 2314 should be iso week 53');
+        assert.equal(moment([2320, 11, 31]).isoWeek(), 53, 'Dec 31 2320 should be iso week 53');
+        assert.equal(moment([2325, 11, 31]).isoWeek(), 53, 'Dec 31 2325 should be iso week 53');
+        assert.equal(moment([2331, 11, 31]).isoWeek(), 53, 'Dec 31 2331 should be iso week 53');
+        assert.equal(moment([2336, 11, 31]).isoWeek(), 53, 'Dec 31 2336 should be iso week 53');
+        assert.equal(moment([2342, 11, 31]).isoWeek(), 53, 'Dec 31 2342 should be iso week 53');
+        assert.equal(moment([2348, 11, 31]).isoWeek(), 53, 'Dec 31 2348 should be iso week 53');
+        assert.equal(moment([2353, 11, 31]).isoWeek(), 53, 'Dec 31 2353 should be iso week 53');
+        assert.equal(moment([2359, 11, 31]).isoWeek(), 53, 'Dec 31 2359 should be iso week 53');
+        assert.equal(moment([2364, 11, 31]).isoWeek(), 53, 'Dec 31 2364 should be iso week 53');
+        assert.equal(moment([2370, 11, 31]).isoWeek(), 53, 'Dec 31 2370 should be iso week 53');
+        assert.equal(moment([2376, 11, 31]).isoWeek(), 53, 'Dec 31 2376 should be iso week 53');
+        assert.equal(moment([2381, 11, 31]).isoWeek(), 53, 'Dec 31 2381 should be iso week 53');
+        assert.equal(moment([2387, 11, 31]).isoWeek(), 53, 'Dec 31 2387 should be iso week 53');
+        assert.equal(moment([2392, 11, 31]).isoWeek(), 53, 'Dec 31 2392 should be iso week 53');
+        assert.equal(moment([2398, 11, 31]).isoWeek(), 53, 'Dec 31 2398 should be iso week 53');
+    });
+
+    test('count years with iso week 53', function (assert) {
+        // Based on http://en.wikipedia.org/wiki/ISO_week_date (as seen on 2014-01-06)
+        // stating that there are 71 years in a 400-year cycle that have 53 weeks;
+        // in this case reflecting the 2000 based cycle
+        var count = 0, i;
+        for (i = 0; i < 400; i++) {
+            count += (moment([2000 + i, 11, 31]).isoWeek() === 53) ? 1 : 0;
+        }
+        assert.equal(count, 71, 'Should have 71 years in 400-year cycle with iso week 53');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('weeks in year');
+
+    test('isoWeeksInYear', function (assert) {
+        assert.equal(moment([2004]).isoWeeksInYear(), 53, '2004 has 53 iso weeks');
+        assert.equal(moment([2005]).isoWeeksInYear(), 52, '2005 has 53 iso weeks');
+        assert.equal(moment([2006]).isoWeeksInYear(), 52, '2006 has 53 iso weeks');
+        assert.equal(moment([2007]).isoWeeksInYear(), 52, '2007 has 52 iso weeks');
+        assert.equal(moment([2008]).isoWeeksInYear(), 52, '2008 has 53 iso weeks');
+        assert.equal(moment([2009]).isoWeeksInYear(), 53, '2009 has 53 iso weeks');
+        assert.equal(moment([2010]).isoWeeksInYear(), 52, '2010 has 52 iso weeks');
+        assert.equal(moment([2011]).isoWeeksInYear(), 52, '2011 has 52 iso weeks');
+        assert.equal(moment([2012]).isoWeeksInYear(), 52, '2012 has 52 iso weeks');
+        assert.equal(moment([2013]).isoWeeksInYear(), 52, '2013 has 52 iso weeks');
+        assert.equal(moment([2014]).isoWeeksInYear(), 52, '2014 has 52 iso weeks');
+        assert.equal(moment([2015]).isoWeeksInYear(), 53, '2015 has 53 iso weeks');
+    });
+
+    test('weeksInYear doy/dow = 1/4', function (assert) {
+        moment.locale('1/4', {week: {dow: 1, doy: 4}});
+
+        assert.equal(moment([2004]).weeksInYear(), 53, '2004 has 53 weeks');
+        assert.equal(moment([2005]).weeksInYear(), 52, '2005 has 53 weeks');
+        assert.equal(moment([2006]).weeksInYear(), 52, '2006 has 53 weeks');
+        assert.equal(moment([2007]).weeksInYear(), 52, '2007 has 52 weeks');
+        assert.equal(moment([2008]).weeksInYear(), 52, '2008 has 53 weeks');
+        assert.equal(moment([2009]).weeksInYear(), 53, '2009 has 53 weeks');
+        assert.equal(moment([2010]).weeksInYear(), 52, '2010 has 52 weeks');
+        assert.equal(moment([2011]).weeksInYear(), 52, '2011 has 52 weeks');
+        assert.equal(moment([2012]).weeksInYear(), 52, '2012 has 52 weeks');
+        assert.equal(moment([2013]).weeksInYear(), 52, '2013 has 52 weeks');
+        assert.equal(moment([2014]).weeksInYear(), 52, '2014 has 52 weeks');
+        assert.equal(moment([2015]).weeksInYear(), 53, '2015 has 53 weeks');
+    });
+
+    test('weeksInYear doy/dow = 6/12', function (assert) {
+        moment.locale('6/12', {week: {dow: 6, doy: 12}});
+
+        assert.equal(moment([2004]).weeksInYear(), 53, '2004 has 53 weeks');
+        assert.equal(moment([2005]).weeksInYear(), 52, '2005 has 53 weeks');
+        assert.equal(moment([2006]).weeksInYear(), 52, '2006 has 53 weeks');
+        assert.equal(moment([2007]).weeksInYear(), 52, '2007 has 52 weeks');
+        assert.equal(moment([2008]).weeksInYear(), 52, '2008 has 53 weeks');
+        assert.equal(moment([2009]).weeksInYear(), 52, '2009 has 53 weeks');
+        assert.equal(moment([2010]).weeksInYear(), 53, '2010 has 52 weeks');
+        assert.equal(moment([2011]).weeksInYear(), 52, '2011 has 52 weeks');
+        assert.equal(moment([2012]).weeksInYear(), 52, '2012 has 52 weeks');
+        assert.equal(moment([2013]).weeksInYear(), 52, '2013 has 52 weeks');
+        assert.equal(moment([2014]).weeksInYear(), 52, '2014 has 52 weeks');
+        assert.equal(moment([2015]).weeksInYear(), 52, '2015 has 53 weeks');
+    });
+
+    test('weeksInYear doy/dow = 1/7', function (assert) {
+        moment.locale('1/7', {week: {dow: 1, doy: 7}});
+
+        assert.equal(moment([2004]).weeksInYear(), 52, '2004 has 53 weeks');
+        assert.equal(moment([2005]).weeksInYear(), 52, '2005 has 53 weeks');
+        assert.equal(moment([2006]).weeksInYear(), 53, '2006 has 53 weeks');
+        assert.equal(moment([2007]).weeksInYear(), 52, '2007 has 52 weeks');
+        assert.equal(moment([2008]).weeksInYear(), 52, '2008 has 53 weeks');
+        assert.equal(moment([2009]).weeksInYear(), 52, '2009 has 53 weeks');
+        assert.equal(moment([2010]).weeksInYear(), 52, '2010 has 52 weeks');
+        assert.equal(moment([2011]).weeksInYear(), 52, '2011 has 52 weeks');
+        assert.equal(moment([2012]).weeksInYear(), 53, '2012 has 52 weeks');
+        assert.equal(moment([2013]).weeksInYear(), 52, '2013 has 52 weeks');
+        assert.equal(moment([2014]).weeksInYear(), 52, '2014 has 52 weeks');
+        assert.equal(moment([2015]).weeksInYear(), 52, '2015 has 53 weeks');
+    });
+
+    test('weeksInYear doy/dow = 0/6', function (assert) {
+        moment.locale('0/6', {week: {dow: 0, doy: 6}});
+
+        assert.equal(moment([2004]).weeksInYear(), 52, '2004 has 53 weeks');
+        assert.equal(moment([2005]).weeksInYear(), 53, '2005 has 53 weeks');
+        assert.equal(moment([2006]).weeksInYear(), 52, '2006 has 53 weeks');
+        assert.equal(moment([2007]).weeksInYear(), 52, '2007 has 52 weeks');
+        assert.equal(moment([2008]).weeksInYear(), 52, '2008 has 53 weeks');
+        assert.equal(moment([2009]).weeksInYear(), 52, '2009 has 53 weeks');
+        assert.equal(moment([2010]).weeksInYear(), 52, '2010 has 52 weeks');
+        assert.equal(moment([2011]).weeksInYear(), 53, '2011 has 52 weeks');
+        assert.equal(moment([2012]).weeksInYear(), 52, '2012 has 52 weeks');
+        assert.equal(moment([2013]).weeksInYear(), 52, '2013 has 52 weeks');
+        assert.equal(moment([2014]).weeksInYear(), 52, '2014 has 52 weeks');
+        assert.equal(moment([2015]).weeksInYear(), 52, '2015 has 53 weeks');
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('zone switching');
+
+    test('local to utc, keepLocalTime = true', function (assert) {
+        var m = moment(),
+            fmt = 'YYYY-DD-MM HH:mm:ss';
+        assert.equal(m.clone().utc(true).format(fmt), m.format(fmt), 'local to utc failed to keep local time');
+    });
+
+    test('local to utc, keepLocalTime = false', function (assert) {
+        var m = moment();
+        assert.equal(m.clone().utc().valueOf(), m.valueOf(), 'local to utc failed to keep utc time (implicit)');
+        assert.equal(m.clone().utc(false).valueOf(), m.valueOf(), 'local to utc failed to keep utc time (explicit)');
+    });
+
+    test('local to zone, keepLocalTime = true', function (assert) {
+        var m = moment(),
+            fmt = 'YYYY-DD-MM HH:mm:ss',
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            assert.equal(m.clone().zone(z * 60, true).format(fmt), m.format(fmt),
+                    'local to zone(' + z + ':00) failed to keep local time');
+        }
+    });
+
+    test('local to zone, keepLocalTime = false', function (assert) {
+        var m = moment(),
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            assert.equal(m.clone().zone(z * 60).valueOf(), m.valueOf(),
+                    'local to zone(' + z + ':00) failed to keep utc time (implicit)');
+            assert.equal(m.clone().zone(z * 60, false).valueOf(), m.valueOf(),
+                    'local to zone(' + z + ':00) failed to keep utc time (explicit)');
+        }
+    });
+
+    test('utc to local, keepLocalTime = true', function (assert) {
+        var um = moment.utc(),
+            fmt = 'YYYY-DD-MM HH:mm:ss';
+
+        assert.equal(um.clone().local(true).format(fmt), um.format(fmt), 'utc to local failed to keep local time');
+    });
+
+    test('utc to local, keepLocalTime = false', function (assert) {
+        var um = moment.utc();
+        assert.equal(um.clone().local().valueOf(), um.valueOf(), 'utc to local failed to keep utc time (implicit)');
+        assert.equal(um.clone().local(false).valueOf(), um.valueOf(), 'utc to local failed to keep utc time (explicit)');
+    });
+
+    test('zone to local, keepLocalTime = true', function (assert) {
+        var m = moment(),
+            fmt = 'YYYY-DD-MM HH:mm:ss',
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            m.zone(z * 60);
+
+            assert.equal(m.clone().local(true).format(fmt), m.format(fmt),
+                    'zone(' + z + ':00) to local failed to keep local time');
+        }
+    });
+
+    test('zone to local, keepLocalTime = false', function (assert) {
+        var m = moment(),
+            z;
+
+        // Apparently there is -12:00 and +14:00
+        // http://en.wikipedia.org/wiki/UTC+14:00
+        // http://en.wikipedia.org/wiki/UTC-12:00
+        for (z = -12; z <= 14; ++z) {
+            m.zone(z * 60);
+
+            assert.equal(m.clone().local(false).valueOf(), m.valueOf(),
+                    'zone(' + z + ':00) to local failed to keep utc time (explicit)');
+            assert.equal(m.clone().local().valueOf(), m.valueOf(),
+                    'zone(' + z + ':00) to local failed to keep utc time (implicit)');
+        }
+    });
+
+}));
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+    /*global QUnit:false*/
+
+    var test = QUnit.test;
+
+    function module (name, lifecycle) {
+        QUnit.module(name, {
+            setup : function () {
+                moment.locale('en');
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    function localeModule (name, lifecycle) {
+        QUnit.module('locale:' + name, {
+            setup : function () {
+                moment.locale(name);
+                moment.createFromInputFallback = function () {
+                    throw new Error('input not handled by moment');
+                };
+                if (lifecycle && lifecycle.setup) {
+                    lifecycle.setup();
+                }
+            },
+            teardown : function () {
+                moment.locale('en');
+                if (lifecycle && lifecycle.teardown) {
+                    lifecycle.teardown();
+                }
+            }
+        });
+    }
+
+    module('zones');
+
+    test('set zone', function (assert) {
+        var zone = moment();
+
+        zone.zone(0);
+        assert.equal(zone.zone(), 0, 'should be able to set the zone to 0');
+
+        zone.zone(60);
+        assert.equal(zone.zone(), 60, 'should be able to set the zone to 60');
+
+        zone.zone(-60);
+        assert.equal(zone.zone(), -60, 'should be able to set the zone to -60');
+    });
+
+    test('set zone shorthand', function (assert) {
+        var zone = moment();
+
+        zone.zone(1);
+        assert.equal(zone.zone(), 60, 'setting the zone to 1 should imply hours and convert to 60');
+
+        zone.zone(-1);
+        assert.equal(zone.zone(), -60, 'setting the zone to -1 should imply hours and convert to -60');
+
+        zone.zone(15);
+        assert.equal(zone.zone(), 900, 'setting the zone to 15 should imply hours and convert to 900');
+
+        zone.zone(-15);
+        assert.equal(zone.zone(), -900, 'setting the zone to -15 should imply hours and convert to -900');
+
+        zone.zone(16);
+        assert.equal(zone.zone(), 16, 'setting the zone to 16 should imply minutes');
+
+        zone.zone(-16);
+        assert.equal(zone.zone(), -16, 'setting the zone to -16 should imply minutes');
+    });
+
+    test('set zone with string', function (assert) {
+        var zone = moment();
+
+        zone.zone('+00:00');
+        assert.equal(zone.zone(), 0, 'set the zone with a timezone string');
+
+        zone.zone('2013-03-07T07:00:00-08:00');
+        assert.equal(zone.zone(), 480, 'set the zone with a string that does not begin with the timezone');
+
+        zone.zone('2013-03-07T07:00:00+0100');
+        assert.equal(zone.zone(), -60, 'set the zone with a string that uses the +0000 syntax');
+
+        zone.zone('03-07-2013T07:00:00-08:00');
+        assert.equal(zone.zone(), 480, 'set the zone with a string with a non-ISO 8601 date');
+    });
+
+    test('change hours when changing the zone', function (assert) {
+        var zone = moment.utc([2000, 0, 1, 6]);
+
+        zone.zone(0);
+        assert.equal(zone.hour(), 6, 'UTC 6AM should be 6AM at +0000');
+
+        zone.zone(60);
+        assert.equal(zone.hour(), 5, 'UTC 6AM should be 5AM at -0100');
+
+        zone.zone(-60);
+        assert.equal(zone.hour(), 7, 'UTC 6AM should be 7AM at +0100');
+    });
+
+    test('change minutes when changing the zone', function (assert) {
+        var zone = moment.utc([2000, 0, 1, 6, 31]);
+
+        zone.zone(0);
+        assert.equal(zone.format('HH:mm'), '06:31', 'UTC 6:31AM should be 6:31AM at +0000');
+
+        zone.zone(30);
+        assert.equal(zone.format('HH:mm'), '06:01', 'UTC 6:31AM should be 6:01AM at -0030');
+
+        zone.zone(-30);
+        assert.equal(zone.format('HH:mm'), '07:01', 'UTC 6:31AM should be 7:01AM at +0030');
+
+        zone.zone(1380);
+        assert.equal(zone.format('HH:mm'), '07:31', 'UTC 6:31AM should be 7:31AM at +1380');
+    });
+
+    test('distance from the unix epoch', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA),
+            zoneC = moment(zoneA),
+            zoneD = moment(zoneA),
+            zoneE = moment(zoneA);
+
+        zoneB.utc();
+        assert.equal(+zoneA, +zoneB, 'moment should equal moment.utc');
+
+        zoneC.zone(-60);
+        assert.equal(+zoneA, +zoneC, 'moment should equal moment.zone(-60)');
+
+        zoneD.zone(480);
+        assert.equal(+zoneA, +zoneD, 'moment should equal moment.zone(480)');
+
+        zoneE.zone(1000);
+        assert.equal(+zoneA, +zoneE, 'moment should equal moment.zone(1000)');
+    });
+
+    test('update offset after changing any values', function (assert) {
+        var oldOffset = moment.updateOffset,
+            m = moment.utc([2000, 6, 1]);
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.__doChange) {
+                if (+mom > 962409600000) {
+                    mom.zone(120, keepTime);
+                } else {
+                    mom.zone(60, keepTime);
+                }
+            }
+        };
+
+        assert.equal(m.format('ZZ'), '+0000', 'should be at +0000');
+        assert.equal(m.format('HH:mm'), '00:00', 'should start 12AM at +0000 timezone');
+
+        m.__doChange = true;
+        m.add(1, 'h');
+
+        assert.equal(m.format('ZZ'), '-0200', 'should be at -0200');
+        assert.equal(m.format('HH:mm'), '23:00', '1AM at +0000 should be 11PM at -0200 timezone');
+
+        m.subtract(1, 'h');
+
+        assert.equal(m.format('ZZ'), '-0100', 'should be at -0100');
+        assert.equal(m.format('HH:mm'), '23:00', '12AM at +0000 should be 11PM at -0100 timezone');
+
+        moment.updateOffset = oldOffset;
+    });
+
+    test('getters and setters', function (assert) {
+        var a = moment([2011, 5, 20]);
+
+        assert.equal(a.clone().zone(120).year(2012).year(), 2012, 'should get and set year correctly');
+        assert.equal(a.clone().zone(120).month(1).month(), 1, 'should get and set month correctly');
+        assert.equal(a.clone().zone(120).date(2).date(), 2, 'should get and set date correctly');
+        assert.equal(a.clone().zone(120).day(1).day(), 1, 'should get and set day correctly');
+        assert.equal(a.clone().zone(120).hour(1).hour(), 1, 'should get and set hour correctly');
+        assert.equal(a.clone().zone(120).minute(1).minute(), 1, 'should get and set minute correctly');
+    });
+
+    test('getters', function (assert) {
+        var a = moment.utc([2012, 0, 1, 0, 0, 0]);
+
+        assert.equal(a.clone().zone(120).year(),  2011, 'should get year correctly');
+        assert.equal(a.clone().zone(120).month(),   11, 'should get month correctly');
+        assert.equal(a.clone().zone(120).date(),    31, 'should get date correctly');
+        assert.equal(a.clone().zone(120).hour(),    22, 'should get hour correctly');
+        assert.equal(a.clone().zone(120).minute(),   0, 'should get minute correctly');
+
+        assert.equal(a.clone().zone(-120).year(),  2012, 'should get year correctly');
+        assert.equal(a.clone().zone(-120).month(),    0, 'should get month correctly');
+        assert.equal(a.clone().zone(-120).date(),     1, 'should get date correctly');
+        assert.equal(a.clone().zone(-120).hour(),     2, 'should get hour correctly');
+        assert.equal(a.clone().zone(-120).minute(),   0, 'should get minute correctly');
+
+        assert.equal(a.clone().zone(-90).year(),  2012, 'should get year correctly');
+        assert.equal(a.clone().zone(-90).month(),    0, 'should get month correctly');
+        assert.equal(a.clone().zone(-90).date(),     1, 'should get date correctly');
+        assert.equal(a.clone().zone(-90).hour(),     1, 'should get hour correctly');
+        assert.equal(a.clone().zone(-90).minute(),  30, 'should get minute correctly');
+    });
+
+    test('from', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA).zone(720),
+            zoneC = moment(zoneA).zone(360),
+            zoneD = moment(zoneA).zone(-690),
+            other = moment(zoneA).add(35, 'm');
+
+        assert.equal(zoneA.from(other), zoneB.from(other), 'moment#from should be the same in all zones');
+        assert.equal(zoneA.from(other), zoneC.from(other), 'moment#from should be the same in all zones');
+        assert.equal(zoneA.from(other), zoneD.from(other), 'moment#from should be the same in all zones');
+    });
+
+    test('diff', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA).zone(720),
+            zoneC = moment(zoneA).zone(360),
+            zoneD = moment(zoneA).zone(-690),
+            other = moment(zoneA).add(35, 'm');
+
+        assert.equal(zoneA.diff(other), zoneB.diff(other), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other), zoneC.diff(other), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other), zoneD.diff(other), 'moment#diff should be the same in all zones');
+
+        assert.equal(zoneA.diff(other, 'minute', true), zoneB.diff(other, 'minute', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'minute', true), zoneC.diff(other, 'minute', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'minute', true), zoneD.diff(other, 'minute', true), 'moment#diff should be the same in all zones');
+
+        assert.equal(zoneA.diff(other, 'hour', true), zoneB.diff(other, 'hour', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'hour', true), zoneC.diff(other, 'hour', true), 'moment#diff should be the same in all zones');
+        assert.equal(zoneA.diff(other, 'hour', true), zoneD.diff(other, 'hour', true), 'moment#diff should be the same in all zones');
+    });
+
+    test('unix offset and timestamp', function (assert) {
+        var zoneA = moment(),
+            zoneB = moment(zoneA).zone(720),
+            zoneC = moment(zoneA).zone(360),
+            zoneD = moment(zoneA).zone(-690);
+
+        assert.equal(zoneA.unix(), zoneB.unix(), 'moment#unix should be the same in all zones');
+        assert.equal(zoneA.unix(), zoneC.unix(), 'moment#unix should be the same in all zones');
+        assert.equal(zoneA.unix(), zoneD.unix(), 'moment#unix should be the same in all zones');
+
+        assert.equal(+zoneA, +zoneB, 'moment#valueOf should be the same in all zones');
+        assert.equal(+zoneA, +zoneC, 'moment#valueOf should be the same in all zones');
+        assert.equal(+zoneA, +zoneD, 'moment#valueOf should be the same in all zones');
+    });
+
+    test('cloning', function (assert) {
+        assert.equal(moment().zone(120).clone().zone(),   120, 'explicit cloning should retain the zone');
+        assert.equal(moment().zone(-120).clone().zone(), -120, 'explicit cloning should retain the zone');
+        assert.equal(moment(moment().zone(120)).zone(),   120, 'implicit cloning should retain the zone');
+        assert.equal(moment(moment().zone(-120)).zone(), -120, 'implicit cloning should retain the zone');
+    });
+
+    test('start of / end of', function (assert) {
+        var a = moment.utc([2010, 1, 2, 0, 0, 0]).zone(450);
+
+        assert.equal(a.clone().startOf('day').hour(), 0, 'start of day should work on moments with a zone');
+        assert.equal(a.clone().startOf('day').minute(), 0, 'start of day should work on moments with a zone');
+        assert.equal(a.clone().startOf('hour').minute(), 0, 'start of hour should work on moments with a zone');
+
+        assert.equal(a.clone().endOf('day').hour(), 23, 'end of day should work on moments with a zone');
+        assert.equal(a.clone().endOf('day').minute(), 59, 'end of day should work on moments with a zone');
+        assert.equal(a.clone().endOf('hour').minute(), 59, 'end of hour should work on moments with a zone');
+    });
+
+    test('reset zone with moment#utc', function (assert) {
+        var a = moment.utc([2012]).zone(480);
+
+        assert.equal(a.clone().hour(),      16, 'different zone should have different hour');
+        assert.equal(a.clone().utc().hour(), 0, 'calling moment#utc should reset the offset');
+    });
+
+    test('reset zone with moment#local', function (assert) {
+        var a = moment([2012]).zone(480);
+
+        assert.equal(a.clone().local().hour(), 0, 'calling moment#local should reset the offset');
+    });
+
+    test('toDate', function (assert) {
+        var zoneA = new Date(),
+            zoneB = moment(zoneA).zone(720).toDate(),
+            zoneC = moment(zoneA).zone(360).toDate(),
+            zoneD = moment(zoneA).zone(-690).toDate();
+
+        assert.equal(+zoneA, +zoneB, 'moment#toDate should output a date with the right unix timestamp');
+        assert.equal(+zoneA, +zoneC, 'moment#toDate should output a date with the right unix timestamp');
+        assert.equal(+zoneA, +zoneD, 'moment#toDate should output a date with the right unix timestamp');
+    });
+
+    test('same / before / after', function (assert) {
+        var zoneA = moment().utc(),
+            zoneB = moment(zoneA).zone(120),
+            zoneC = moment(zoneA).zone(-120);
+
+        assert.ok(zoneA.isSame(zoneB), 'two moments with different offsets should be the same');
+        assert.ok(zoneA.isSame(zoneC), 'two moments with different offsets should be the same');
+
+        assert.ok(zoneA.isSame(zoneB, 'hour'), 'two moments with different offsets should be the same hour');
+        assert.ok(zoneA.isSame(zoneC, 'hour'), 'two moments with different offsets should be the same hour');
+
+        zoneA.add(1, 'hour');
+
+        assert.ok(zoneA.isAfter(zoneB), 'isAfter should work with two moments with different offsets');
+        assert.ok(zoneA.isAfter(zoneC), 'isAfter should work with two moments with different offsets');
+
+        assert.ok(zoneA.isAfter(zoneB, 'hour'), 'isAfter:hour should work with two moments with different offsets');
+        assert.ok(zoneA.isAfter(zoneC, 'hour'), 'isAfter:hour should work with two moments with different offsets');
+
+        zoneA.subtract(2, 'hour');
+
+        assert.ok(zoneA.isBefore(zoneB), 'isBefore should work with two moments with different offsets');
+        assert.ok(zoneA.isBefore(zoneC), 'isBefore should work with two moments with different offsets');
+
+        assert.ok(zoneA.isBefore(zoneB, 'hour'), 'isBefore:hour should work with two moments with different offsets');
+        assert.ok(zoneA.isBefore(zoneC, 'hour'), 'isBefore:hour should work with two moments with different offsets');
+    });
+
+    test('add / subtract over dst', function (assert) {
+        var oldOffset = moment.updateOffset,
+            m = moment.utc([2000, 2, 31, 3]);
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.clone().utc().month() > 2) {
+                mom.zone(-60, keepTime);
+            } else {
+                mom.zone(0, keepTime);
+            }
+        };
+
+        assert.equal(m.hour(), 3, 'should start at 00:00');
+
+        m.add(24, 'hour');
+
+        assert.equal(m.hour(), 4, 'adding 24 hours should disregard dst');
+
+        m.subtract(24, 'hour');
+
+        assert.equal(m.hour(), 3, 'subtracting 24 hours should disregard dst');
+
+        m.add(1, 'day');
+
+        assert.equal(m.hour(), 3, 'adding 1 day should have the same hour');
+
+        m.subtract(1, 'day');
+
+        assert.equal(m.hour(), 3, 'subtracting 1 day should have the same hour');
+
+        m.add(1, 'month');
+
+        assert.equal(m.hour(), 3, 'adding 1 month should have the same hour');
+
+        m.subtract(1, 'month');
+
+        assert.equal(m.hour(), 3, 'subtracting 1 month should have the same hour');
+
+        moment.updateOffset = oldOffset;
+    });
+
+    test('isDST', function (assert) {
+        var oldOffset = moment.updateOffset;
+
+        moment.updateOffset = function (mom, keepTime) {
+            if (mom.month() > 2 && mom.month() < 9) {
+                mom.zone(-60, keepTime);
+            } else {
+                mom.zone(0, keepTime);
+            }
+        };
+
+        assert.ok(!moment().month(0).isDST(),  'Jan should not be summer dst');
+        assert.ok(moment().month(6).isDST(),   'Jul should be summer dst');
+        assert.ok(!moment().month(11).isDST(), 'Dec should not be summer dst');
+
+        moment.updateOffset = function (mom) {
+            if (mom.month() > 2 && mom.month() < 9) {
+                mom.zone(0);
+            } else {
+                mom.zone(-60);
+            }
+        };
+
+        assert.ok(moment().month(0).isDST(),  'Jan should be winter dst');
+        assert.ok(!moment().month(6).isDST(), 'Jul should not be winter dst');
+        assert.ok(moment().month(11).isDST(), 'Dec should be winter dst');
+
+        moment.updateOffset = oldOffset;
+    });
+
+    test('zone names', function (assert) {
+        assert.equal(moment().zoneAbbr(),   '', 'Local zone abbr should be empty');
+        assert.equal(moment().format('z'),  '', 'Local zone formatted abbr should be empty');
+        assert.equal(moment().zoneName(),   '', 'Local zone name should be empty');
+        assert.equal(moment().format('zz'), '', 'Local zone formatted name should be empty');
+
+        assert.equal(moment.utc().zoneAbbr(),   'UTC', 'UTC zone abbr should be UTC');
+        assert.equal(moment.utc().format('z'),  'UTC', 'UTC zone formatted abbr should be UTC');
+        assert.equal(moment.utc().zoneName(),   'Coordinated Universal Time', 'UTC zone abbr should be Coordinated Universal Time');
+        assert.equal(moment.utc().format('zz'), 'Coordinated Universal Time', 'UTC zone formatted abbr should be Coordinated Universal Time');
+    });
+
+    test('hours alignment with UTC', function (assert) {
+        assert.equal(moment().zone(120).hasAlignedHourOffset(), true);
+        assert.equal(moment().zone(-180).hasAlignedHourOffset(), true);
+        assert.equal(moment().zone(90).hasAlignedHourOffset(), false);
+        assert.equal(moment().zone(-90).hasAlignedHourOffset(), false);
+    });
+
+    test('hours alignment with other zone', function (assert) {
+        var m = moment().zone(120);
+
+        assert.equal(m.hasAlignedHourOffset(moment().zone(180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(90)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-90)), false);
+
+        m = moment().zone(90);
+
+        assert.equal(m.hasAlignedHourOffset(moment().zone(180)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-180)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(30)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-30)), true);
+
+        m = moment().zone(-60);
+
+        assert.equal(m.hasAlignedHourOffset(moment().zone(180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-180)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(90)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-90)), false);
+
+        m = moment().zone(25);
+
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-35)), true);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(85)), true);
+
+        assert.equal(m.hasAlignedHourOffset(moment().zone(35)), false);
+        assert.equal(m.hasAlignedHourOffset(moment().zone(-85)), false);
+    });
+
+    test('parse zone', function (assert) {
+        var m = moment('2013-01-01T00:00:00-13:00').parseZone();
+        assert.equal(m.zone(), 13 * 60);
+        assert.equal(m.hours(), 0);
+    });
+
+    test('parse zone static', function (assert) {
+        var m = moment.parseZone('2013-01-01T00:00:00-13:00');
+        assert.equal(m.zone(), 13 * 60);
+        assert.equal(m.hours(), 0);
+    });
+
+    test('parse zone with more arguments', function (assert) {
+        var m;
+        m = moment.parseZone('2013 01 01 05 -13:00', 'YYYY MM DD HH ZZ');
+        assert.equal(m.format(), '2013-01-01T05:00:00-13:00', 'accept input and format');
+        m = moment.parseZone('2013-01-01-13:00', 'YYYY MM DD ZZ', true);
+        assert.equal(m.isValid(), false, 'accept input, format and strict flag');
+        m = moment.parseZone('2013-01-01-13:00', ['DD MM YYYY ZZ', 'YYYY MM DD ZZ']);
+        assert.equal(m.format(), '2013-01-01T00:00:00-13:00', 'accept input and array of formats');
+    });
+
+    test('parse zone with a timezone from the format string', function (assert) {
+        var m = moment('11-12-2013 -0400 +1100', 'DD-MM-YYYY ZZ #####').parseZone();
+
+        assert.equal(m.zone(), 4 * 60);
+    });
+
+    test('parse zone without a timezone included in the format string', function (assert) {
+        var m = moment('11-12-2013 -0400 +1100', 'DD-MM-YYYY').parseZone();
+
+        assert.equal(m.zone(), -11 * 60);
+    });
+
+    test('timezone format', function (assert) {
+        assert.equal(moment().zone(-60).format('ZZ'), '+0100', '-60 -> +0100');
+        assert.equal(moment().zone(-90).format('ZZ'), '+0130', '-90 -> +0130');
+        assert.equal(moment().zone(-120).format('ZZ'), '+0200', '-120 -> +0200');
+
+        assert.equal(moment().zone(+60).format('ZZ'), '-0100', '+60 -> -0100');
+        assert.equal(moment().zone(+90).format('ZZ'), '-0130', '+90 -> -0130');
+        assert.equal(moment().zone(+120).format('ZZ'), '-0200', '+120 -> -0200');
+    });
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/moment.js b/turtles/app/lib/bower_components/momentjs/moment.js
new file mode 100644
index 000000000..275a3c324
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/moment.js
@@ -0,0 +1,3111 @@
+//! moment.js
+//! version : 2.10.3
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+
+(function (global, factory) {
+    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+    typeof define === 'function' && define.amd ? define(factory) :
+    global.moment = factory()
+}(this, function () { 'use strict';
+
+    var hookCallback;
+
+    function utils_hooks__hooks () {
+        return hookCallback.apply(null, arguments);
+    }
+
+    // This is done to register the method called with moment()
+    // without creating circular dependencies.
+    function setHookCallback (callback) {
+        hookCallback = callback;
+    }
+
+    function isArray(input) {
+        return Object.prototype.toString.call(input) === '[object Array]';
+    }
+
+    function isDate(input) {
+        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+    }
+
+    function map(arr, fn) {
+        var res = [], i;
+        for (i = 0; i < arr.length; ++i) {
+            res.push(fn(arr[i], i));
+        }
+        return res;
+    }
+
+    function hasOwnProp(a, b) {
+        return Object.prototype.hasOwnProperty.call(a, b);
+    }
+
+    function extend(a, b) {
+        for (var i in b) {
+            if (hasOwnProp(b, i)) {
+                a[i] = b[i];
+            }
+        }
+
+        if (hasOwnProp(b, 'toString')) {
+            a.toString = b.toString;
+        }
+
+        if (hasOwnProp(b, 'valueOf')) {
+            a.valueOf = b.valueOf;
+        }
+
+        return a;
+    }
+
+    function create_utc__createUTC (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, true).utc();
+    }
+
+    function defaultParsingFlags() {
+        // We need to deep clone this object.
+        return {
+            empty           : false,
+            unusedTokens    : [],
+            unusedInput     : [],
+            overflow        : -2,
+            charsLeftOver   : 0,
+            nullInput       : false,
+            invalidMonth    : null,
+            invalidFormat   : false,
+            userInvalidated : false,
+            iso             : false
+        };
+    }
+
+    function getParsingFlags(m) {
+        if (m._pf == null) {
+            m._pf = defaultParsingFlags();
+        }
+        return m._pf;
+    }
+
+    function valid__isValid(m) {
+        if (m._isValid == null) {
+            var flags = getParsingFlags(m);
+            m._isValid = !isNaN(m._d.getTime()) &&
+                flags.overflow < 0 &&
+                !flags.empty &&
+                !flags.invalidMonth &&
+                !flags.nullInput &&
+                !flags.invalidFormat &&
+                !flags.userInvalidated;
+
+            if (m._strict) {
+                m._isValid = m._isValid &&
+                    flags.charsLeftOver === 0 &&
+                    flags.unusedTokens.length === 0 &&
+                    flags.bigHour === undefined;
+            }
+        }
+        return m._isValid;
+    }
+
+    function valid__createInvalid (flags) {
+        var m = create_utc__createUTC(NaN);
+        if (flags != null) {
+            extend(getParsingFlags(m), flags);
+        }
+        else {
+            getParsingFlags(m).userInvalidated = true;
+        }
+
+        return m;
+    }
+
+    var momentProperties = utils_hooks__hooks.momentProperties = [];
+
+    function copyConfig(to, from) {
+        var i, prop, val;
+
+        if (typeof from._isAMomentObject !== 'undefined') {
+            to._isAMomentObject = from._isAMomentObject;
+        }
+        if (typeof from._i !== 'undefined') {
+            to._i = from._i;
+        }
+        if (typeof from._f !== 'undefined') {
+            to._f = from._f;
+        }
+        if (typeof from._l !== 'undefined') {
+            to._l = from._l;
+        }
+        if (typeof from._strict !== 'undefined') {
+            to._strict = from._strict;
+        }
+        if (typeof from._tzm !== 'undefined') {
+            to._tzm = from._tzm;
+        }
+        if (typeof from._isUTC !== 'undefined') {
+            to._isUTC = from._isUTC;
+        }
+        if (typeof from._offset !== 'undefined') {
+            to._offset = from._offset;
+        }
+        if (typeof from._pf !== 'undefined') {
+            to._pf = getParsingFlags(from);
+        }
+        if (typeof from._locale !== 'undefined') {
+            to._locale = from._locale;
+        }
+
+        if (momentProperties.length > 0) {
+            for (i in momentProperties) {
+                prop = momentProperties[i];
+                val = from[prop];
+                if (typeof val !== 'undefined') {
+                    to[prop] = val;
+                }
+            }
+        }
+
+        return to;
+    }
+
+    var updateInProgress = false;
+
+    // Moment prototype object
+    function Moment(config) {
+        copyConfig(this, config);
+        this._d = new Date(+config._d);
+        // Prevent infinite loop in case updateOffset creates new moment
+        // objects.
+        if (updateInProgress === false) {
+            updateInProgress = true;
+            utils_hooks__hooks.updateOffset(this);
+            updateInProgress = false;
+        }
+    }
+
+    function isMoment (obj) {
+        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
+    }
+
+    function toInt(argumentForCoercion) {
+        var coercedNumber = +argumentForCoercion,
+            value = 0;
+
+        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+            if (coercedNumber >= 0) {
+                value = Math.floor(coercedNumber);
+            } else {
+                value = Math.ceil(coercedNumber);
+            }
+        }
+
+        return value;
+    }
+
+    function compareArrays(array1, array2, dontConvert) {
+        var len = Math.min(array1.length, array2.length),
+            lengthDiff = Math.abs(array1.length - array2.length),
+            diffs = 0,
+            i;
+        for (i = 0; i < len; i++) {
+            if ((dontConvert && array1[i] !== array2[i]) ||
+                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+                diffs++;
+            }
+        }
+        return diffs + lengthDiff;
+    }
+
+    function Locale() {
+    }
+
+    var locales = {};
+    var globalLocale;
+
+    function normalizeLocale(key) {
+        return key ? key.toLowerCase().replace('_', '-') : key;
+    }
+
+    // pick the locale from the array
+    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+    function chooseLocale(names) {
+        var i = 0, j, next, locale, split;
+
+        while (i < names.length) {
+            split = normalizeLocale(names[i]).split('-');
+            j = split.length;
+            next = normalizeLocale(names[i + 1]);
+            next = next ? next.split('-') : null;
+            while (j > 0) {
+                locale = loadLocale(split.slice(0, j).join('-'));
+                if (locale) {
+                    return locale;
+                }
+                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+                    //the next array item is better than a shallower substring of this one
+                    break;
+                }
+                j--;
+            }
+            i++;
+        }
+        return null;
+    }
+
+    function loadLocale(name) {
+        var oldLocale = null;
+        // TODO: Find a better way to register and load all the locales in Node
+        if (!locales[name] && typeof module !== 'undefined' &&
+                module && module.exports) {
+            try {
+                oldLocale = globalLocale._abbr;
+                require('./locale/' + name);
+                // because defineLocale currently also sets the global locale, we
+                // want to undo that for lazy loaded locales
+                locale_locales__getSetGlobalLocale(oldLocale);
+            } catch (e) { }
+        }
+        return locales[name];
+    }
+
+    // This function will load locale and then set the global locale.  If
+    // no arguments are passed in, it will simply return the current global
+    // locale key.
+    function locale_locales__getSetGlobalLocale (key, values) {
+        var data;
+        if (key) {
+            if (typeof values === 'undefined') {
+                data = locale_locales__getLocale(key);
+            }
+            else {
+                data = defineLocale(key, values);
+            }
+
+            if (data) {
+                // moment.duration._locale = moment._locale = data;
+                globalLocale = data;
+            }
+        }
+
+        return globalLocale._abbr;
+    }
+
+    function defineLocale (name, values) {
+        if (values !== null) {
+            values.abbr = name;
+            if (!locales[name]) {
+                locales[name] = new Locale();
+            }
+            locales[name].set(values);
+
+            // backwards compat for now: also set the locale
+            locale_locales__getSetGlobalLocale(name);
+
+            return locales[name];
+        } else {
+            // useful for testing
+            delete locales[name];
+            return null;
+        }
+    }
+
+    // returns locale data
+    function locale_locales__getLocale (key) {
+        var locale;
+
+        if (key && key._locale && key._locale._abbr) {
+            key = key._locale._abbr;
+        }
+
+        if (!key) {
+            return globalLocale;
+        }
+
+        if (!isArray(key)) {
+            //short-circuit everything else
+            locale = loadLocale(key);
+            if (locale) {
+                return locale;
+            }
+            key = [key];
+        }
+
+        return chooseLocale(key);
+    }
+
+    var aliases = {};
+
+    function addUnitAlias (unit, shorthand) {
+        var lowerCase = unit.toLowerCase();
+        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+    }
+
+    function normalizeUnits(units) {
+        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
+    }
+
+    function normalizeObjectUnits(inputObject) {
+        var normalizedInput = {},
+            normalizedProp,
+            prop;
+
+        for (prop in inputObject) {
+            if (hasOwnProp(inputObject, prop)) {
+                normalizedProp = normalizeUnits(prop);
+                if (normalizedProp) {
+                    normalizedInput[normalizedProp] = inputObject[prop];
+                }
+            }
+        }
+
+        return normalizedInput;
+    }
+
+    function makeGetSet (unit, keepTime) {
+        return function (value) {
+            if (value != null) {
+                get_set__set(this, unit, value);
+                utils_hooks__hooks.updateOffset(this, keepTime);
+                return this;
+            } else {
+                return get_set__get(this, unit);
+            }
+        };
+    }
+
+    function get_set__get (mom, unit) {
+        return mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]();
+    }
+
+    function get_set__set (mom, unit, value) {
+        return mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
+    }
+
+    // MOMENTS
+
+    function getSet (units, value) {
+        var unit;
+        if (typeof units === 'object') {
+            for (unit in units) {
+                this.set(unit, units[unit]);
+            }
+        } else {
+            units = normalizeUnits(units);
+            if (typeof this[units] === 'function') {
+                return this[units](value);
+            }
+        }
+        return this;
+    }
+
+    function zeroFill(number, targetLength, forceSign) {
+        var output = '' + Math.abs(number),
+            sign = number >= 0;
+
+        while (output.length < targetLength) {
+            output = '0' + output;
+        }
+        return (sign ? (forceSign ? '+' : '') : '-') + output;
+    }
+
+    var formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g;
+
+    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
+
+    var formatFunctions = {};
+
+    var formatTokenFunctions = {};
+
+    // token:    'M'
+    // padded:   ['MM', 2]
+    // ordinal:  'Mo'
+    // callback: function () { this.month() + 1 }
+    function addFormatToken (token, padded, ordinal, callback) {
+        var func = callback;
+        if (typeof callback === 'string') {
+            func = function () {
+                return this[callback]();
+            };
+        }
+        if (token) {
+            formatTokenFunctions[token] = func;
+        }
+        if (padded) {
+            formatTokenFunctions[padded[0]] = function () {
+                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+            };
+        }
+        if (ordinal) {
+            formatTokenFunctions[ordinal] = function () {
+                return this.localeData().ordinal(func.apply(this, arguments), token);
+            };
+        }
+    }
+
+    function removeFormattingTokens(input) {
+        if (input.match(/\[[\s\S]/)) {
+            return input.replace(/^\[|\]$/g, '');
+        }
+        return input.replace(/\\/g, '');
+    }
+
+    function makeFormatFunction(format) {
+        var array = format.match(formattingTokens), i, length;
+
+        for (i = 0, length = array.length; i < length; i++) {
+            if (formatTokenFunctions[array[i]]) {
+                array[i] = formatTokenFunctions[array[i]];
+            } else {
+                array[i] = removeFormattingTokens(array[i]);
+            }
+        }
+
+        return function (mom) {
+            var output = '';
+            for (i = 0; i < length; i++) {
+                output += array[i] instanceof Function ? array[i].call(mom, format) : array[i];
+            }
+            return output;
+        };
+    }
+
+    // format date using native date object
+    function formatMoment(m, format) {
+        if (!m.isValid()) {
+            return m.localeData().invalidDate();
+        }
+
+        format = expandFormat(format, m.localeData());
+
+        if (!formatFunctions[format]) {
+            formatFunctions[format] = makeFormatFunction(format);
+        }
+
+        return formatFunctions[format](m);
+    }
+
+    function expandFormat(format, locale) {
+        var i = 5;
+
+        function replaceLongDateFormatTokens(input) {
+            return locale.longDateFormat(input) || input;
+        }
+
+        localFormattingTokens.lastIndex = 0;
+        while (i >= 0 && localFormattingTokens.test(format)) {
+            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+            localFormattingTokens.lastIndex = 0;
+            i -= 1;
+        }
+
+        return format;
+    }
+
+    var match1         = /\d/;            //       0 - 9
+    var match2         = /\d\d/;          //      00 - 99
+    var match3         = /\d{3}/;         //     000 - 999
+    var match4         = /\d{4}/;         //    0000 - 9999
+    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
+    var match1to2      = /\d\d?/;         //       0 - 99
+    var match1to3      = /\d{1,3}/;       //       0 - 999
+    var match1to4      = /\d{1,4}/;       //       0 - 9999
+    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
+
+    var matchUnsigned  = /\d+/;           //       0 - inf
+    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
+
+    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
+
+    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
+
+    // any word (or two) characters or numbers including two/three word month in arabic.
+    var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
+
+    var regexes = {};
+
+    function addRegexToken (token, regex, strictRegex) {
+        regexes[token] = typeof regex === 'function' ? regex : function (isStrict) {
+            return (isStrict && strictRegex) ? strictRegex : regex;
+        };
+    }
+
+    function getParseRegexForToken (token, config) {
+        if (!hasOwnProp(regexes, token)) {
+            return new RegExp(unescapeFormat(token));
+        }
+
+        return regexes[token](config._strict, config._locale);
+    }
+
+    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+    function unescapeFormat(s) {
+        return s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+            return p1 || p2 || p3 || p4;
+        }).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+
+    var tokens = {};
+
+    function addParseToken (token, callback) {
+        var i, func = callback;
+        if (typeof token === 'string') {
+            token = [token];
+        }
+        if (typeof callback === 'number') {
+            func = function (input, array) {
+                array[callback] = toInt(input);
+            };
+        }
+        for (i = 0; i < token.length; i++) {
+            tokens[token[i]] = func;
+        }
+    }
+
+    function addWeekParseToken (token, callback) {
+        addParseToken(token, function (input, array, config, token) {
+            config._w = config._w || {};
+            callback(input, config._w, config, token);
+        });
+    }
+
+    function addTimeToArrayFromToken(token, input, config) {
+        if (input != null && hasOwnProp(tokens, token)) {
+            tokens[token](input, config._a, config, token);
+        }
+    }
+
+    var YEAR = 0;
+    var MONTH = 1;
+    var DATE = 2;
+    var HOUR = 3;
+    var MINUTE = 4;
+    var SECOND = 5;
+    var MILLISECOND = 6;
+
+    function daysInMonth(year, month) {
+        return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+    }
+
+    // FORMATTING
+
+    addFormatToken('M', ['MM', 2], 'Mo', function () {
+        return this.month() + 1;
+    });
+
+    addFormatToken('MMM', 0, 0, function (format) {
+        return this.localeData().monthsShort(this, format);
+    });
+
+    addFormatToken('MMMM', 0, 0, function (format) {
+        return this.localeData().months(this, format);
+    });
+
+    // ALIASES
+
+    addUnitAlias('month', 'M');
+
+    // PARSING
+
+    addRegexToken('M',    match1to2);
+    addRegexToken('MM',   match1to2, match2);
+    addRegexToken('MMM',  matchWord);
+    addRegexToken('MMMM', matchWord);
+
+    addParseToken(['M', 'MM'], function (input, array) {
+        array[MONTH] = toInt(input) - 1;
+    });
+
+    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+        var month = config._locale.monthsParse(input, token, config._strict);
+        // if we didn't find a month name, mark the date as invalid.
+        if (month != null) {
+            array[MONTH] = month;
+        } else {
+            getParsingFlags(config).invalidMonth = input;
+        }
+    });
+
+    // LOCALES
+
+    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
+    function localeMonths (m) {
+        return this._months[m.month()];
+    }
+
+    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
+    function localeMonthsShort (m) {
+        return this._monthsShort[m.month()];
+    }
+
+    function localeMonthsParse (monthName, format, strict) {
+        var i, mom, regex;
+
+        if (!this._monthsParse) {
+            this._monthsParse = [];
+            this._longMonthsParse = [];
+            this._shortMonthsParse = [];
+        }
+
+        for (i = 0; i < 12; i++) {
+            // make the regex if we don't have it already
+            mom = create_utc__createUTC([2000, i]);
+            if (strict && !this._longMonthsParse[i]) {
+                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
+                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
+            }
+            if (!strict && !this._monthsParse[i]) {
+                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
+                return i;
+            } else if (!strict && this._monthsParse[i].test(monthName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function setMonth (mom, value) {
+        var dayOfMonth;
+
+        // TODO: Move this out of here!
+        if (typeof value === 'string') {
+            value = mom.localeData().monthsParse(value);
+            // TODO: Another silent failure?
+            if (typeof value !== 'number') {
+                return mom;
+            }
+        }
+
+        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
+        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
+        return mom;
+    }
+
+    function getSetMonth (value) {
+        if (value != null) {
+            setMonth(this, value);
+            utils_hooks__hooks.updateOffset(this, true);
+            return this;
+        } else {
+            return get_set__get(this, 'Month');
+        }
+    }
+
+    function getDaysInMonth () {
+        return daysInMonth(this.year(), this.month());
+    }
+
+    function checkOverflow (m) {
+        var overflow;
+        var a = m._a;
+
+        if (a && getParsingFlags(m).overflow === -2) {
+            overflow =
+                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
+                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
+                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
+                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
+                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
+                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
+                -1;
+
+            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+                overflow = DATE;
+            }
+
+            getParsingFlags(m).overflow = overflow;
+        }
+
+        return m;
+    }
+
+    function warn(msg) {
+        if (utils_hooks__hooks.suppressDeprecationWarnings === false && typeof console !== 'undefined' && console.warn) {
+            console.warn('Deprecation warning: ' + msg);
+        }
+    }
+
+    function deprecate(msg, fn) {
+        var firstTime = true,
+            msgWithStack = msg + '\n' + (new Error()).stack;
+
+        return extend(function () {
+            if (firstTime) {
+                warn(msgWithStack);
+                firstTime = false;
+            }
+            return fn.apply(this, arguments);
+        }, fn);
+    }
+
+    var deprecations = {};
+
+    function deprecateSimple(name, msg) {
+        if (!deprecations[name]) {
+            warn(msg);
+            deprecations[name] = true;
+        }
+    }
+
+    utils_hooks__hooks.suppressDeprecationWarnings = false;
+
+    var from_string__isoRegex = /^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+
+    var isoDates = [
+        ['YYYYYY-MM-DD', /[+-]\d{6}-\d{2}-\d{2}/],
+        ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/],
+        ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/],
+        ['GGGG-[W]WW', /\d{4}-W\d{2}/],
+        ['YYYY-DDD', /\d{4}-\d{3}/]
+    ];
+
+    // iso time formats and regexes
+    var isoTimes = [
+        ['HH:mm:ss.SSSS', /(T| )\d\d:\d\d:\d\d\.\d+/],
+        ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/],
+        ['HH:mm', /(T| )\d\d:\d\d/],
+        ['HH', /(T| )\d\d/]
+    ];
+
+    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
+
+    // date from iso format
+    function configFromISO(config) {
+        var i, l,
+            string = config._i,
+            match = from_string__isoRegex.exec(string);
+
+        if (match) {
+            getParsingFlags(config).iso = true;
+            for (i = 0, l = isoDates.length; i < l; i++) {
+                if (isoDates[i][1].exec(string)) {
+                    // match[5] should be 'T' or undefined
+                    config._f = isoDates[i][0] + (match[6] || ' ');
+                    break;
+                }
+            }
+            for (i = 0, l = isoTimes.length; i < l; i++) {
+                if (isoTimes[i][1].exec(string)) {
+                    config._f += isoTimes[i][0];
+                    break;
+                }
+            }
+            if (string.match(matchOffset)) {
+                config._f += 'Z';
+            }
+            configFromStringAndFormat(config);
+        } else {
+            config._isValid = false;
+        }
+    }
+
+    // date from iso format or fallback
+    function configFromString(config) {
+        var matched = aspNetJsonRegex.exec(config._i);
+
+        if (matched !== null) {
+            config._d = new Date(+matched[1]);
+            return;
+        }
+
+        configFromISO(config);
+        if (config._isValid === false) {
+            delete config._isValid;
+            utils_hooks__hooks.createFromInputFallback(config);
+        }
+    }
+
+    utils_hooks__hooks.createFromInputFallback = deprecate(
+        'moment construction falls back to js Date. This is ' +
+        'discouraged and will be removed in upcoming major ' +
+        'release. Please refer to ' +
+        'https://github.com/moment/moment/issues/1407 for more info.',
+        function (config) {
+            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
+        }
+    );
+
+    function createDate (y, m, d, h, M, s, ms) {
+        //can't just apply() to create a date:
+        //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply
+        var date = new Date(y, m, d, h, M, s, ms);
+
+        //the date constructor doesn't accept years < 1970
+        if (y < 1970) {
+            date.setFullYear(y);
+        }
+        return date;
+    }
+
+    function createUTCDate (y) {
+        var date = new Date(Date.UTC.apply(null, arguments));
+        if (y < 1970) {
+            date.setUTCFullYear(y);
+        }
+        return date;
+    }
+
+    addFormatToken(0, ['YY', 2], 0, function () {
+        return this.year() % 100;
+    });
+
+    addFormatToken(0, ['YYYY',   4],       0, 'year');
+    addFormatToken(0, ['YYYYY',  5],       0, 'year');
+    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
+
+    // ALIASES
+
+    addUnitAlias('year', 'y');
+
+    // PARSING
+
+    addRegexToken('Y',      matchSigned);
+    addRegexToken('YY',     match1to2, match2);
+    addRegexToken('YYYY',   match1to4, match4);
+    addRegexToken('YYYYY',  match1to6, match6);
+    addRegexToken('YYYYYY', match1to6, match6);
+
+    addParseToken(['YYYY', 'YYYYY', 'YYYYYY'], YEAR);
+    addParseToken('YY', function (input, array) {
+        array[YEAR] = utils_hooks__hooks.parseTwoDigitYear(input);
+    });
+
+    // HELPERS
+
+    function daysInYear(year) {
+        return isLeapYear(year) ? 366 : 365;
+    }
+
+    function isLeapYear(year) {
+        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+    }
+
+    // HOOKS
+
+    utils_hooks__hooks.parseTwoDigitYear = function (input) {
+        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+    };
+
+    // MOMENTS
+
+    var getSetYear = makeGetSet('FullYear', false);
+
+    function getIsLeapYear () {
+        return isLeapYear(this.year());
+    }
+
+    addFormatToken('w', ['ww', 2], 'wo', 'week');
+    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
+
+    // ALIASES
+
+    addUnitAlias('week', 'w');
+    addUnitAlias('isoWeek', 'W');
+
+    // PARSING
+
+    addRegexToken('w',  match1to2);
+    addRegexToken('ww', match1to2, match2);
+    addRegexToken('W',  match1to2);
+    addRegexToken('WW', match1to2, match2);
+
+    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
+        week[token.substr(0, 1)] = toInt(input);
+    });
+
+    // HELPERS
+
+    // firstDayOfWeek       0 = sun, 6 = sat
+    //                      the day of the week that starts the week
+    //                      (usually sunday or monday)
+    // firstDayOfWeekOfYear 0 = sun, 6 = sat
+    //                      the first week is the week that contains the first
+    //                      of this day of the week
+    //                      (eg. ISO weeks use thursday (4))
+    function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) {
+        var end = firstDayOfWeekOfYear - firstDayOfWeek,
+            daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(),
+            adjustedMoment;
+
+
+        if (daysToDayOfWeek > end) {
+            daysToDayOfWeek -= 7;
+        }
+
+        if (daysToDayOfWeek < end - 7) {
+            daysToDayOfWeek += 7;
+        }
+
+        adjustedMoment = local__createLocal(mom).add(daysToDayOfWeek, 'd');
+        return {
+            week: Math.ceil(adjustedMoment.dayOfYear() / 7),
+            year: adjustedMoment.year()
+        };
+    }
+
+    // LOCALES
+
+    function localeWeek (mom) {
+        return weekOfYear(mom, this._week.dow, this._week.doy).week;
+    }
+
+    var defaultLocaleWeek = {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    };
+
+    function localeFirstDayOfWeek () {
+        return this._week.dow;
+    }
+
+    function localeFirstDayOfYear () {
+        return this._week.doy;
+    }
+
+    // MOMENTS
+
+    function getSetWeek (input) {
+        var week = this.localeData().week(this);
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    function getSetISOWeek (input) {
+        var week = weekOfYear(this, 1, 4).week;
+        return input == null ? week : this.add((input - week) * 7, 'd');
+    }
+
+    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
+
+    // ALIASES
+
+    addUnitAlias('dayOfYear', 'DDD');
+
+    // PARSING
+
+    addRegexToken('DDD',  match1to3);
+    addRegexToken('DDDD', match3);
+    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+        config._dayOfYear = toInt(input);
+    });
+
+    // HELPERS
+
+    //http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+    function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) {
+        var d = createUTCDate(year, 0, 1).getUTCDay();
+        var daysToAdd;
+        var dayOfYear;
+
+        d = d === 0 ? 7 : d;
+        weekday = weekday != null ? weekday : firstDayOfWeek;
+        daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0) - (d < firstDayOfWeek ? 7 : 0);
+        dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1;
+
+        return {
+            year      : dayOfYear > 0 ? year      : year - 1,
+            dayOfYear : dayOfYear > 0 ? dayOfYear : daysInYear(year - 1) + dayOfYear
+        };
+    }
+
+    // MOMENTS
+
+    function getSetDayOfYear (input) {
+        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
+        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
+    }
+
+    // Pick the first defined of two or three arguments.
+    function defaults(a, b, c) {
+        if (a != null) {
+            return a;
+        }
+        if (b != null) {
+            return b;
+        }
+        return c;
+    }
+
+    function currentDateArray(config) {
+        var now = new Date();
+        if (config._useUTC) {
+            return [now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()];
+        }
+        return [now.getFullYear(), now.getMonth(), now.getDate()];
+    }
+
+    // convert an array to a date.
+    // the array should mirror the parameters below
+    // note: all values past the year are optional and will default to the lowest possible value.
+    // [year, month, day , hour, minute, second, millisecond]
+    function configFromArray (config) {
+        var i, date, input = [], currentDate, yearToUse;
+
+        if (config._d) {
+            return;
+        }
+
+        currentDate = currentDateArray(config);
+
+        //compute day of the year from weeks and weekdays
+        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+            dayOfYearFromWeekInfo(config);
+        }
+
+        //if the day of the year is set, figure out what it is
+        if (config._dayOfYear) {
+            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
+
+            if (config._dayOfYear > daysInYear(yearToUse)) {
+                getParsingFlags(config)._overflowDayOfYear = true;
+            }
+
+            date = createUTCDate(yearToUse, 0, config._dayOfYear);
+            config._a[MONTH] = date.getUTCMonth();
+            config._a[DATE] = date.getUTCDate();
+        }
+
+        // Default to current date.
+        // * if no year, month, day of month are given, default to today
+        // * if day of month is given, default month and year
+        // * if month is given, default only year
+        // * if year is given, don't default anything
+        for (i = 0; i < 3 && config._a[i] == null; ++i) {
+            config._a[i] = input[i] = currentDate[i];
+        }
+
+        // Zero out whatever was not defaulted, including time
+        for (; i < 7; i++) {
+            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+        }
+
+        // Check for 24:00:00.000
+        if (config._a[HOUR] === 24 &&
+                config._a[MINUTE] === 0 &&
+                config._a[SECOND] === 0 &&
+                config._a[MILLISECOND] === 0) {
+            config._nextDay = true;
+            config._a[HOUR] = 0;
+        }
+
+        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
+        // Apply timezone offset from input. The actual utcOffset can be changed
+        // with parseZone.
+        if (config._tzm != null) {
+            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+        }
+
+        if (config._nextDay) {
+            config._a[HOUR] = 24;
+        }
+    }
+
+    function dayOfYearFromWeekInfo(config) {
+        var w, weekYear, week, weekday, dow, doy, temp;
+
+        w = config._w;
+        if (w.GG != null || w.W != null || w.E != null) {
+            dow = 1;
+            doy = 4;
+
+            // TODO: We need to take the current isoWeekYear, but that depends on
+            // how we interpret now (local, utc, fixed offset). So create
+            // a now version of current config (take local/utc/offset flags, and
+            // create now).
+            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(local__createLocal(), 1, 4).year);
+            week = defaults(w.W, 1);
+            weekday = defaults(w.E, 1);
+        } else {
+            dow = config._locale._week.dow;
+            doy = config._locale._week.doy;
+
+            weekYear = defaults(w.gg, config._a[YEAR], weekOfYear(local__createLocal(), dow, doy).year);
+            week = defaults(w.w, 1);
+
+            if (w.d != null) {
+                // weekday -- low day numbers are considered next week
+                weekday = w.d;
+                if (weekday < dow) {
+                    ++week;
+                }
+            } else if (w.e != null) {
+                // local weekday -- counting starts from begining of week
+                weekday = w.e + dow;
+            } else {
+                // default to begining of week
+                weekday = dow;
+            }
+        }
+        temp = dayOfYearFromWeeks(weekYear, week, weekday, doy, dow);
+
+        config._a[YEAR] = temp.year;
+        config._dayOfYear = temp.dayOfYear;
+    }
+
+    utils_hooks__hooks.ISO_8601 = function () {};
+
+    // date from string and format string
+    function configFromStringAndFormat(config) {
+        // TODO: Move this to another part of the creation flow to prevent circular deps
+        if (config._f === utils_hooks__hooks.ISO_8601) {
+            configFromISO(config);
+            return;
+        }
+
+        config._a = [];
+        getParsingFlags(config).empty = true;
+
+        // This array is used to make a Date, either with `new Date` or `Date.UTC`
+        var string = '' + config._i,
+            i, parsedInput, tokens, token, skipped,
+            stringLength = string.length,
+            totalParsedInputLength = 0;
+
+        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
+
+        for (i = 0; i < tokens.length; i++) {
+            token = tokens[i];
+            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+            if (parsedInput) {
+                skipped = string.substr(0, string.indexOf(parsedInput));
+                if (skipped.length > 0) {
+                    getParsingFlags(config).unusedInput.push(skipped);
+                }
+                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+                totalParsedInputLength += parsedInput.length;
+            }
+            // don't parse if it's not a known token
+            if (formatTokenFunctions[token]) {
+                if (parsedInput) {
+                    getParsingFlags(config).empty = false;
+                }
+                else {
+                    getParsingFlags(config).unusedTokens.push(token);
+                }
+                addTimeToArrayFromToken(token, parsedInput, config);
+            }
+            else if (config._strict && !parsedInput) {
+                getParsingFlags(config).unusedTokens.push(token);
+            }
+        }
+
+        // add remaining unparsed input length to the string
+        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
+        if (string.length > 0) {
+            getParsingFlags(config).unusedInput.push(string);
+        }
+
+        // clear _12h flag if hour is <= 12
+        if (getParsingFlags(config).bigHour === true &&
+                config._a[HOUR] <= 12 &&
+                config._a[HOUR] > 0) {
+            getParsingFlags(config).bigHour = undefined;
+        }
+        // handle meridiem
+        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
+
+        configFromArray(config);
+        checkOverflow(config);
+    }
+
+
+    function meridiemFixWrap (locale, hour, meridiem) {
+        var isPm;
+
+        if (meridiem == null) {
+            // nothing to do
+            return hour;
+        }
+        if (locale.meridiemHour != null) {
+            return locale.meridiemHour(hour, meridiem);
+        } else if (locale.isPM != null) {
+            // Fallback
+            isPm = locale.isPM(meridiem);
+            if (isPm && hour < 12) {
+                hour += 12;
+            }
+            if (!isPm && hour === 12) {
+                hour = 0;
+            }
+            return hour;
+        } else {
+            // this is not supposed to happen
+            return hour;
+        }
+    }
+
+    function configFromStringAndArray(config) {
+        var tempConfig,
+            bestMoment,
+
+            scoreToBeat,
+            i,
+            currentScore;
+
+        if (config._f.length === 0) {
+            getParsingFlags(config).invalidFormat = true;
+            config._d = new Date(NaN);
+            return;
+        }
+
+        for (i = 0; i < config._f.length; i++) {
+            currentScore = 0;
+            tempConfig = copyConfig({}, config);
+            if (config._useUTC != null) {
+                tempConfig._useUTC = config._useUTC;
+            }
+            tempConfig._f = config._f[i];
+            configFromStringAndFormat(tempConfig);
+
+            if (!valid__isValid(tempConfig)) {
+                continue;
+            }
+
+            // if there is any input that was not parsed add a penalty for that format
+            currentScore += getParsingFlags(tempConfig).charsLeftOver;
+
+            //or tokens
+            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
+
+            getParsingFlags(tempConfig).score = currentScore;
+
+            if (scoreToBeat == null || currentScore < scoreToBeat) {
+                scoreToBeat = currentScore;
+                bestMoment = tempConfig;
+            }
+        }
+
+        extend(config, bestMoment || tempConfig);
+    }
+
+    function configFromObject(config) {
+        if (config._d) {
+            return;
+        }
+
+        var i = normalizeObjectUnits(config._i);
+        config._a = [i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond];
+
+        configFromArray(config);
+    }
+
+    function createFromConfig (config) {
+        var input = config._i,
+            format = config._f,
+            res;
+
+        config._locale = config._locale || locale_locales__getLocale(config._l);
+
+        if (input === null || (format === undefined && input === '')) {
+            return valid__createInvalid({nullInput: true});
+        }
+
+        if (typeof input === 'string') {
+            config._i = input = config._locale.preparse(input);
+        }
+
+        if (isMoment(input)) {
+            return new Moment(checkOverflow(input));
+        } else if (isArray(format)) {
+            configFromStringAndArray(config);
+        } else if (format) {
+            configFromStringAndFormat(config);
+        } else if (isDate(input)) {
+            config._d = input;
+        } else {
+            configFromInput(config);
+        }
+
+        res = new Moment(checkOverflow(config));
+        if (res._nextDay) {
+            // Adding is smart enough around DST
+            res.add(1, 'd');
+            res._nextDay = undefined;
+        }
+
+        return res;
+    }
+
+    function configFromInput(config) {
+        var input = config._i;
+        if (input === undefined) {
+            config._d = new Date();
+        } else if (isDate(input)) {
+            config._d = new Date(+input);
+        } else if (typeof input === 'string') {
+            configFromString(config);
+        } else if (isArray(input)) {
+            config._a = map(input.slice(0), function (obj) {
+                return parseInt(obj, 10);
+            });
+            configFromArray(config);
+        } else if (typeof(input) === 'object') {
+            configFromObject(config);
+        } else if (typeof(input) === 'number') {
+            // from milliseconds
+            config._d = new Date(input);
+        } else {
+            utils_hooks__hooks.createFromInputFallback(config);
+        }
+    }
+
+    function createLocalOrUTC (input, format, locale, strict, isUTC) {
+        var c = {};
+
+        if (typeof(locale) === 'boolean') {
+            strict = locale;
+            locale = undefined;
+        }
+        // object construction must be done this way.
+        // https://github.com/moment/moment/issues/1423
+        c._isAMomentObject = true;
+        c._useUTC = c._isUTC = isUTC;
+        c._l = locale;
+        c._i = input;
+        c._f = format;
+        c._strict = strict;
+
+        return createFromConfig(c);
+    }
+
+    function local__createLocal (input, format, locale, strict) {
+        return createLocalOrUTC(input, format, locale, strict, false);
+    }
+
+    var prototypeMin = deprecate(
+         'moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548',
+         function () {
+             var other = local__createLocal.apply(null, arguments);
+             return other < this ? this : other;
+         }
+     );
+
+    var prototypeMax = deprecate(
+        'moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548',
+        function () {
+            var other = local__createLocal.apply(null, arguments);
+            return other > this ? this : other;
+        }
+    );
+
+    // Pick a moment m from moments so that m[fn](other) is true for all
+    // other. This relies on the function fn to be transitive.
+    //
+    // moments should either be an array of moment objects or an array, whose
+    // first element is an array of moment objects.
+    function pickBy(fn, moments) {
+        var res, i;
+        if (moments.length === 1 && isArray(moments[0])) {
+            moments = moments[0];
+        }
+        if (!moments.length) {
+            return local__createLocal();
+        }
+        res = moments[0];
+        for (i = 1; i < moments.length; ++i) {
+            if (moments[i][fn](res)) {
+                res = moments[i];
+            }
+        }
+        return res;
+    }
+
+    // TODO: Use [].sort instead?
+    function min () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isBefore', args);
+    }
+
+    function max () {
+        var args = [].slice.call(arguments, 0);
+
+        return pickBy('isAfter', args);
+    }
+
+    function Duration (duration) {
+        var normalizedInput = normalizeObjectUnits(duration),
+            years = normalizedInput.year || 0,
+            quarters = normalizedInput.quarter || 0,
+            months = normalizedInput.month || 0,
+            weeks = normalizedInput.week || 0,
+            days = normalizedInput.day || 0,
+            hours = normalizedInput.hour || 0,
+            minutes = normalizedInput.minute || 0,
+            seconds = normalizedInput.second || 0,
+            milliseconds = normalizedInput.millisecond || 0;
+
+        // representation for dateAddRemove
+        this._milliseconds = +milliseconds +
+            seconds * 1e3 + // 1000
+            minutes * 6e4 + // 1000 * 60
+            hours * 36e5; // 1000 * 60 * 60
+        // Because of dateAddRemove treats 24 hours as different from a
+        // day when working around DST, we need to store them separately
+        this._days = +days +
+            weeks * 7;
+        // It is impossible translate months into days without knowing
+        // which months you are are talking about, so we have to store
+        // it separately.
+        this._months = +months +
+            quarters * 3 +
+            years * 12;
+
+        this._data = {};
+
+        this._locale = locale_locales__getLocale();
+
+        this._bubble();
+    }
+
+    function isDuration (obj) {
+        return obj instanceof Duration;
+    }
+
+    function offset (token, separator) {
+        addFormatToken(token, 0, 0, function () {
+            var offset = this.utcOffset();
+            var sign = '+';
+            if (offset < 0) {
+                offset = -offset;
+                sign = '-';
+            }
+            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
+        });
+    }
+
+    offset('Z', ':');
+    offset('ZZ', '');
+
+    // PARSING
+
+    addRegexToken('Z',  matchOffset);
+    addRegexToken('ZZ', matchOffset);
+    addParseToken(['Z', 'ZZ'], function (input, array, config) {
+        config._useUTC = true;
+        config._tzm = offsetFromString(input);
+    });
+
+    // HELPERS
+
+    // timezone chunker
+    // '+10:00' > ['10',  '00']
+    // '-1530'  > ['-15', '30']
+    var chunkOffset = /([\+\-]|\d\d)/gi;
+
+    function offsetFromString(string) {
+        var matches = ((string || '').match(matchOffset) || []);
+        var chunk   = matches[matches.length - 1] || [];
+        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+        var minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+        return parts[0] === '+' ? minutes : -minutes;
+    }
+
+    // Return a moment from input, that is local/utc/zone equivalent to model.
+    function cloneWithOffset(input, model) {
+        var res, diff;
+        if (model._isUTC) {
+            res = model.clone();
+            diff = (isMoment(input) || isDate(input) ? +input : +local__createLocal(input)) - (+res);
+            // Use low-level api, because this fn is low-level api.
+            res._d.setTime(+res._d + diff);
+            utils_hooks__hooks.updateOffset(res, false);
+            return res;
+        } else {
+            return local__createLocal(input).local();
+        }
+        return model._isUTC ? local__createLocal(input).zone(model._offset || 0) : local__createLocal(input).local();
+    }
+
+    function getDateOffset (m) {
+        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+        // https://github.com/moment/moment/pull/1871
+        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
+    }
+
+    // HOOKS
+
+    // This function will be called whenever a moment is mutated.
+    // It is intended to keep the offset in sync with the timezone.
+    utils_hooks__hooks.updateOffset = function () {};
+
+    // MOMENTS
+
+    // keepLocalTime = true means only change the timezone, without
+    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+    // +0200, so we adjust the time as needed, to be valid.
+    //
+    // Keeping the time actually adds/subtracts (one hour)
+    // from the actual represented time. That is why we call updateOffset
+    // a second time. In case it wants us to change the offset again
+    // _changeInProgress == true case, then we have to adjust, because
+    // there is no such time in the given timezone.
+    function getSetOffset (input, keepLocalTime) {
+        var offset = this._offset || 0,
+            localAdjust;
+        if (input != null) {
+            if (typeof input === 'string') {
+                input = offsetFromString(input);
+            }
+            if (Math.abs(input) < 16) {
+                input = input * 60;
+            }
+            if (!this._isUTC && keepLocalTime) {
+                localAdjust = getDateOffset(this);
+            }
+            this._offset = input;
+            this._isUTC = true;
+            if (localAdjust != null) {
+                this.add(localAdjust, 'm');
+            }
+            if (offset !== input) {
+                if (!keepLocalTime || this._changeInProgress) {
+                    add_subtract__addSubtract(this, create__createDuration(input - offset, 'm'), 1, false);
+                } else if (!this._changeInProgress) {
+                    this._changeInProgress = true;
+                    utils_hooks__hooks.updateOffset(this, true);
+                    this._changeInProgress = null;
+                }
+            }
+            return this;
+        } else {
+            return this._isUTC ? offset : getDateOffset(this);
+        }
+    }
+
+    function getSetZone (input, keepLocalTime) {
+        if (input != null) {
+            if (typeof input !== 'string') {
+                input = -input;
+            }
+
+            this.utcOffset(input, keepLocalTime);
+
+            return this;
+        } else {
+            return -this.utcOffset();
+        }
+    }
+
+    function setOffsetToUTC (keepLocalTime) {
+        return this.utcOffset(0, keepLocalTime);
+    }
+
+    function setOffsetToLocal (keepLocalTime) {
+        if (this._isUTC) {
+            this.utcOffset(0, keepLocalTime);
+            this._isUTC = false;
+
+            if (keepLocalTime) {
+                this.subtract(getDateOffset(this), 'm');
+            }
+        }
+        return this;
+    }
+
+    function setOffsetToParsedOffset () {
+        if (this._tzm) {
+            this.utcOffset(this._tzm);
+        } else if (typeof this._i === 'string') {
+            this.utcOffset(offsetFromString(this._i));
+        }
+        return this;
+    }
+
+    function hasAlignedHourOffset (input) {
+        if (!input) {
+            input = 0;
+        }
+        else {
+            input = local__createLocal(input).utcOffset();
+        }
+
+        return (this.utcOffset() - input) % 60 === 0;
+    }
+
+    function isDaylightSavingTime () {
+        return (
+            this.utcOffset() > this.clone().month(0).utcOffset() ||
+            this.utcOffset() > this.clone().month(5).utcOffset()
+        );
+    }
+
+    function isDaylightSavingTimeShifted () {
+        if (this._a) {
+            var other = this._isUTC ? create_utc__createUTC(this._a) : local__createLocal(this._a);
+            return this.isValid() && compareArrays(this._a, other.toArray()) > 0;
+        }
+
+        return false;
+    }
+
+    function isLocal () {
+        return !this._isUTC;
+    }
+
+    function isUtcOffset () {
+        return this._isUTC;
+    }
+
+    function isUtc () {
+        return this._isUTC && this._offset === 0;
+    }
+
+    var aspNetRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/;
+
+    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+    var create__isoRegex = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;
+
+    function create__createDuration (input, key) {
+        var duration = input,
+            // matching against regexp is expensive, do it on demand
+            match = null,
+            sign,
+            ret,
+            diffRes;
+
+        if (isDuration(input)) {
+            duration = {
+                ms : input._milliseconds,
+                d  : input._days,
+                M  : input._months
+            };
+        } else if (typeof input === 'number') {
+            duration = {};
+            if (key) {
+                duration[key] = input;
+            } else {
+                duration.milliseconds = input;
+            }
+        } else if (!!(match = aspNetRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y  : 0,
+                d  : toInt(match[DATE])        * sign,
+                h  : toInt(match[HOUR])        * sign,
+                m  : toInt(match[MINUTE])      * sign,
+                s  : toInt(match[SECOND])      * sign,
+                ms : toInt(match[MILLISECOND]) * sign
+            };
+        } else if (!!(match = create__isoRegex.exec(input))) {
+            sign = (match[1] === '-') ? -1 : 1;
+            duration = {
+                y : parseIso(match[2], sign),
+                M : parseIso(match[3], sign),
+                d : parseIso(match[4], sign),
+                h : parseIso(match[5], sign),
+                m : parseIso(match[6], sign),
+                s : parseIso(match[7], sign),
+                w : parseIso(match[8], sign)
+            };
+        } else if (duration == null) {// checks for null or undefined
+            duration = {};
+        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
+            diffRes = momentsDifference(local__createLocal(duration.from), local__createLocal(duration.to));
+
+            duration = {};
+            duration.ms = diffRes.milliseconds;
+            duration.M = diffRes.months;
+        }
+
+        ret = new Duration(duration);
+
+        if (isDuration(input) && hasOwnProp(input, '_locale')) {
+            ret._locale = input._locale;
+        }
+
+        return ret;
+    }
+
+    create__createDuration.fn = Duration.prototype;
+
+    function parseIso (inp, sign) {
+        // We'd normally use ~~inp for this, but unfortunately it also
+        // converts floats to ints.
+        // inp may be undefined, so careful calling replace on it.
+        var res = inp && parseFloat(inp.replace(',', '.'));
+        // apply sign while we're at it
+        return (isNaN(res) ? 0 : res) * sign;
+    }
+
+    function positiveMomentsDifference(base, other) {
+        var res = {milliseconds: 0, months: 0};
+
+        res.months = other.month() - base.month() +
+            (other.year() - base.year()) * 12;
+        if (base.clone().add(res.months, 'M').isAfter(other)) {
+            --res.months;
+        }
+
+        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
+
+        return res;
+    }
+
+    function momentsDifference(base, other) {
+        var res;
+        other = cloneWithOffset(other, base);
+        if (base.isBefore(other)) {
+            res = positiveMomentsDifference(base, other);
+        } else {
+            res = positiveMomentsDifference(other, base);
+            res.milliseconds = -res.milliseconds;
+            res.months = -res.months;
+        }
+
+        return res;
+    }
+
+    function createAdder(direction, name) {
+        return function (val, period) {
+            var dur, tmp;
+            //invert the arguments, but complain about it
+            if (period !== null && !isNaN(+period)) {
+                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period).');
+                tmp = val; val = period; period = tmp;
+            }
+
+            val = typeof val === 'string' ? +val : val;
+            dur = create__createDuration(val, period);
+            add_subtract__addSubtract(this, dur, direction);
+            return this;
+        };
+    }
+
+    function add_subtract__addSubtract (mom, duration, isAdding, updateOffset) {
+        var milliseconds = duration._milliseconds,
+            days = duration._days,
+            months = duration._months;
+        updateOffset = updateOffset == null ? true : updateOffset;
+
+        if (milliseconds) {
+            mom._d.setTime(+mom._d + milliseconds * isAdding);
+        }
+        if (days) {
+            get_set__set(mom, 'Date', get_set__get(mom, 'Date') + days * isAdding);
+        }
+        if (months) {
+            setMonth(mom, get_set__get(mom, 'Month') + months * isAdding);
+        }
+        if (updateOffset) {
+            utils_hooks__hooks.updateOffset(mom, days || months);
+        }
+    }
+
+    var add_subtract__add      = createAdder(1, 'add');
+    var add_subtract__subtract = createAdder(-1, 'subtract');
+
+    function moment_calendar__calendar (time) {
+        // We want to compare the start of today, vs this.
+        // Getting start-of-today depends on whether we're local/utc/offset or not.
+        var now = time || local__createLocal(),
+            sod = cloneWithOffset(now, this).startOf('day'),
+            diff = this.diff(sod, 'days', true),
+            format = diff < -6 ? 'sameElse' :
+                diff < -1 ? 'lastWeek' :
+                diff < 0 ? 'lastDay' :
+                diff < 1 ? 'sameDay' :
+                diff < 2 ? 'nextDay' :
+                diff < 7 ? 'nextWeek' : 'sameElse';
+        return this.format(this.localeData().calendar(format, this, local__createLocal(now)));
+    }
+
+    function clone () {
+        return new Moment(this);
+    }
+
+    function isAfter (input, units) {
+        var inputMs;
+        units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+        if (units === 'millisecond') {
+            input = isMoment(input) ? input : local__createLocal(input);
+            return +this > +input;
+        } else {
+            inputMs = isMoment(input) ? +input : +local__createLocal(input);
+            return inputMs < +this.clone().startOf(units);
+        }
+    }
+
+    function isBefore (input, units) {
+        var inputMs;
+        units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+        if (units === 'millisecond') {
+            input = isMoment(input) ? input : local__createLocal(input);
+            return +this < +input;
+        } else {
+            inputMs = isMoment(input) ? +input : +local__createLocal(input);
+            return +this.clone().endOf(units) < inputMs;
+        }
+    }
+
+    function isBetween (from, to, units) {
+        return this.isAfter(from, units) && this.isBefore(to, units);
+    }
+
+    function isSame (input, units) {
+        var inputMs;
+        units = normalizeUnits(units || 'millisecond');
+        if (units === 'millisecond') {
+            input = isMoment(input) ? input : local__createLocal(input);
+            return +this === +input;
+        } else {
+            inputMs = +local__createLocal(input);
+            return +(this.clone().startOf(units)) <= inputMs && inputMs <= +(this.clone().endOf(units));
+        }
+    }
+
+    function absFloor (number) {
+        if (number < 0) {
+            return Math.ceil(number);
+        } else {
+            return Math.floor(number);
+        }
+    }
+
+    function diff (input, units, asFloat) {
+        var that = cloneWithOffset(input, this),
+            zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4,
+            delta, output;
+
+        units = normalizeUnits(units);
+
+        if (units === 'year' || units === 'month' || units === 'quarter') {
+            output = monthDiff(this, that);
+            if (units === 'quarter') {
+                output = output / 3;
+            } else if (units === 'year') {
+                output = output / 12;
+            }
+        } else {
+            delta = this - that;
+            output = units === 'second' ? delta / 1e3 : // 1000
+                units === 'minute' ? delta / 6e4 : // 1000 * 60
+                units === 'hour' ? delta / 36e5 : // 1000 * 60 * 60
+                units === 'day' ? (delta - zoneDelta) / 864e5 : // 1000 * 60 * 60 * 24, negate dst
+                units === 'week' ? (delta - zoneDelta) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst
+                delta;
+        }
+        return asFloat ? output : absFloor(output);
+    }
+
+    function monthDiff (a, b) {
+        // difference in months
+        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
+            // b is in (anchor - 1 month, anchor + 1 month)
+            anchor = a.clone().add(wholeMonthDiff, 'months'),
+            anchor2, adjust;
+
+        if (b - anchor < 0) {
+            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor - anchor2);
+        } else {
+            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+            // linear across the month
+            adjust = (b - anchor) / (anchor2 - anchor);
+        }
+
+        return -(wholeMonthDiff + adjust);
+    }
+
+    utils_hooks__hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+
+    function toString () {
+        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+    }
+
+    function moment_format__toISOString () {
+        var m = this.clone().utc();
+        if (0 < m.year() && m.year() <= 9999) {
+            if ('function' === typeof Date.prototype.toISOString) {
+                // native implementation is ~50x faster, use it when we can
+                return this.toDate().toISOString();
+            } else {
+                return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+            }
+        } else {
+            return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+        }
+    }
+
+    function format (inputString) {
+        var output = formatMoment(this, inputString || utils_hooks__hooks.defaultFormat);
+        return this.localeData().postformat(output);
+    }
+
+    function from (time, withoutSuffix) {
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+        return create__createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
+    }
+
+    function fromNow (withoutSuffix) {
+        return this.from(local__createLocal(), withoutSuffix);
+    }
+
+    function to (time, withoutSuffix) {
+        if (!this.isValid()) {
+            return this.localeData().invalidDate();
+        }
+        return create__createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
+    }
+
+    function toNow (withoutSuffix) {
+        return this.to(local__createLocal(), withoutSuffix);
+    }
+
+    function locale (key) {
+        var newLocaleData;
+
+        if (key === undefined) {
+            return this._locale._abbr;
+        } else {
+            newLocaleData = locale_locales__getLocale(key);
+            if (newLocaleData != null) {
+                this._locale = newLocaleData;
+            }
+            return this;
+        }
+    }
+
+    var lang = deprecate(
+        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+        function (key) {
+            if (key === undefined) {
+                return this.localeData();
+            } else {
+                return this.locale(key);
+            }
+        }
+    );
+
+    function localeData () {
+        return this._locale;
+    }
+
+    function startOf (units) {
+        units = normalizeUnits(units);
+        // the following switch intentionally omits break keywords
+        // to utilize falling through the cases.
+        switch (units) {
+        case 'year':
+            this.month(0);
+            /* falls through */
+        case 'quarter':
+        case 'month':
+            this.date(1);
+            /* falls through */
+        case 'week':
+        case 'isoWeek':
+        case 'day':
+            this.hours(0);
+            /* falls through */
+        case 'hour':
+            this.minutes(0);
+            /* falls through */
+        case 'minute':
+            this.seconds(0);
+            /* falls through */
+        case 'second':
+            this.milliseconds(0);
+        }
+
+        // weeks are a special case
+        if (units === 'week') {
+            this.weekday(0);
+        }
+        if (units === 'isoWeek') {
+            this.isoWeekday(1);
+        }
+
+        // quarters are also special
+        if (units === 'quarter') {
+            this.month(Math.floor(this.month() / 3) * 3);
+        }
+
+        return this;
+    }
+
+    function endOf (units) {
+        units = normalizeUnits(units);
+        if (units === undefined || units === 'millisecond') {
+            return this;
+        }
+        return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
+    }
+
+    function to_type__valueOf () {
+        return +this._d - ((this._offset || 0) * 60000);
+    }
+
+    function unix () {
+        return Math.floor(+this / 1000);
+    }
+
+    function toDate () {
+        return this._offset ? new Date(+this) : this._d;
+    }
+
+    function toArray () {
+        var m = this;
+        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
+    }
+
+    function moment_valid__isValid () {
+        return valid__isValid(this);
+    }
+
+    function parsingFlags () {
+        return extend({}, getParsingFlags(this));
+    }
+
+    function invalidAt () {
+        return getParsingFlags(this).overflow;
+    }
+
+    addFormatToken(0, ['gg', 2], 0, function () {
+        return this.weekYear() % 100;
+    });
+
+    addFormatToken(0, ['GG', 2], 0, function () {
+        return this.isoWeekYear() % 100;
+    });
+
+    function addWeekYearFormatToken (token, getter) {
+        addFormatToken(0, [token, token.length], 0, getter);
+    }
+
+    addWeekYearFormatToken('gggg',     'weekYear');
+    addWeekYearFormatToken('ggggg',    'weekYear');
+    addWeekYearFormatToken('GGGG',  'isoWeekYear');
+    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
+
+    // ALIASES
+
+    addUnitAlias('weekYear', 'gg');
+    addUnitAlias('isoWeekYear', 'GG');
+
+    // PARSING
+
+    addRegexToken('G',      matchSigned);
+    addRegexToken('g',      matchSigned);
+    addRegexToken('GG',     match1to2, match2);
+    addRegexToken('gg',     match1to2, match2);
+    addRegexToken('GGGG',   match1to4, match4);
+    addRegexToken('gggg',   match1to4, match4);
+    addRegexToken('GGGGG',  match1to6, match6);
+    addRegexToken('ggggg',  match1to6, match6);
+
+    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
+        week[token.substr(0, 2)] = toInt(input);
+    });
+
+    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+        week[token] = utils_hooks__hooks.parseTwoDigitYear(input);
+    });
+
+    // HELPERS
+
+    function weeksInYear(year, dow, doy) {
+        return weekOfYear(local__createLocal([year, 11, 31 + dow - doy]), dow, doy).week;
+    }
+
+    // MOMENTS
+
+    function getSetWeekYear (input) {
+        var year = weekOfYear(this, this.localeData()._week.dow, this.localeData()._week.doy).year;
+        return input == null ? year : this.add((input - year), 'y');
+    }
+
+    function getSetISOWeekYear (input) {
+        var year = weekOfYear(this, 1, 4).year;
+        return input == null ? year : this.add((input - year), 'y');
+    }
+
+    function getISOWeeksInYear () {
+        return weeksInYear(this.year(), 1, 4);
+    }
+
+    function getWeeksInYear () {
+        var weekInfo = this.localeData()._week;
+        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+    }
+
+    addFormatToken('Q', 0, 0, 'quarter');
+
+    // ALIASES
+
+    addUnitAlias('quarter', 'Q');
+
+    // PARSING
+
+    addRegexToken('Q', match1);
+    addParseToken('Q', function (input, array) {
+        array[MONTH] = (toInt(input) - 1) * 3;
+    });
+
+    // MOMENTS
+
+    function getSetQuarter (input) {
+        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
+    }
+
+    addFormatToken('D', ['DD', 2], 'Do', 'date');
+
+    // ALIASES
+
+    addUnitAlias('date', 'D');
+
+    // PARSING
+
+    addRegexToken('D',  match1to2);
+    addRegexToken('DD', match1to2, match2);
+    addRegexToken('Do', function (isStrict, locale) {
+        return isStrict ? locale._ordinalParse : locale._ordinalParseLenient;
+    });
+
+    addParseToken(['D', 'DD'], DATE);
+    addParseToken('Do', function (input, array) {
+        array[DATE] = toInt(input.match(match1to2)[0], 10);
+    });
+
+    // MOMENTS
+
+    var getSetDayOfMonth = makeGetSet('Date', true);
+
+    addFormatToken('d', 0, 'do', 'day');
+
+    addFormatToken('dd', 0, 0, function (format) {
+        return this.localeData().weekdaysMin(this, format);
+    });
+
+    addFormatToken('ddd', 0, 0, function (format) {
+        return this.localeData().weekdaysShort(this, format);
+    });
+
+    addFormatToken('dddd', 0, 0, function (format) {
+        return this.localeData().weekdays(this, format);
+    });
+
+    addFormatToken('e', 0, 0, 'weekday');
+    addFormatToken('E', 0, 0, 'isoWeekday');
+
+    // ALIASES
+
+    addUnitAlias('day', 'd');
+    addUnitAlias('weekday', 'e');
+    addUnitAlias('isoWeekday', 'E');
+
+    // PARSING
+
+    addRegexToken('d',    match1to2);
+    addRegexToken('e',    match1to2);
+    addRegexToken('E',    match1to2);
+    addRegexToken('dd',   matchWord);
+    addRegexToken('ddd',  matchWord);
+    addRegexToken('dddd', matchWord);
+
+    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config) {
+        var weekday = config._locale.weekdaysParse(input);
+        // if we didn't get a weekday name, mark the date as invalid
+        if (weekday != null) {
+            week.d = weekday;
+        } else {
+            getParsingFlags(config).invalidWeekday = input;
+        }
+    });
+
+    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+        week[token] = toInt(input);
+    });
+
+    // HELPERS
+
+    function parseWeekday(input, locale) {
+        if (typeof input === 'string') {
+            if (!isNaN(input)) {
+                input = parseInt(input, 10);
+            }
+            else {
+                input = locale.weekdaysParse(input);
+                if (typeof input !== 'number') {
+                    return null;
+                }
+            }
+        }
+        return input;
+    }
+
+    // LOCALES
+
+    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
+    function localeWeekdays (m) {
+        return this._weekdays[m.day()];
+    }
+
+    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
+    function localeWeekdaysShort (m) {
+        return this._weekdaysShort[m.day()];
+    }
+
+    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
+    function localeWeekdaysMin (m) {
+        return this._weekdaysMin[m.day()];
+    }
+
+    function localeWeekdaysParse (weekdayName) {
+        var i, mom, regex;
+
+        if (!this._weekdaysParse) {
+            this._weekdaysParse = [];
+        }
+
+        for (i = 0; i < 7; i++) {
+            // make the regex if we don't have it already
+            if (!this._weekdaysParse[i]) {
+                mom = local__createLocal([2000, 1]).day(i);
+                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+            }
+            // test the regex
+            if (this._weekdaysParse[i].test(weekdayName)) {
+                return i;
+            }
+        }
+    }
+
+    // MOMENTS
+
+    function getSetDayOfWeek (input) {
+        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+        if (input != null) {
+            input = parseWeekday(input, this.localeData());
+            return this.add(input - day, 'd');
+        } else {
+            return day;
+        }
+    }
+
+    function getSetLocaleDayOfWeek (input) {
+        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+        return input == null ? weekday : this.add(input - weekday, 'd');
+    }
+
+    function getSetISODayOfWeek (input) {
+        // behaves the same as moment#day except
+        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+        // as a setter, sunday should belong to the previous week.
+        return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
+    }
+
+    addFormatToken('H', ['HH', 2], 0, 'hour');
+    addFormatToken('h', ['hh', 2], 0, function () {
+        return this.hours() % 12 || 12;
+    });
+
+    function meridiem (token, lowercase) {
+        addFormatToken(token, 0, 0, function () {
+            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
+        });
+    }
+
+    meridiem('a', true);
+    meridiem('A', false);
+
+    // ALIASES
+
+    addUnitAlias('hour', 'h');
+
+    // PARSING
+
+    function matchMeridiem (isStrict, locale) {
+        return locale._meridiemParse;
+    }
+
+    addRegexToken('a',  matchMeridiem);
+    addRegexToken('A',  matchMeridiem);
+    addRegexToken('H',  match1to2);
+    addRegexToken('h',  match1to2);
+    addRegexToken('HH', match1to2, match2);
+    addRegexToken('hh', match1to2, match2);
+
+    addParseToken(['H', 'HH'], HOUR);
+    addParseToken(['a', 'A'], function (input, array, config) {
+        config._isPm = config._locale.isPM(input);
+        config._meridiem = input;
+    });
+    addParseToken(['h', 'hh'], function (input, array, config) {
+        array[HOUR] = toInt(input);
+        getParsingFlags(config).bigHour = true;
+    });
+
+    // LOCALES
+
+    function localeIsPM (input) {
+        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+        // Using charAt should be more compatible.
+        return ((input + '').toLowerCase().charAt(0) === 'p');
+    }
+
+    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+    function localeMeridiem (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'pm' : 'PM';
+        } else {
+            return isLower ? 'am' : 'AM';
+        }
+    }
+
+
+    // MOMENTS
+
+    // Setting the hour should keep the time, because the user explicitly
+    // specified which hour he wants. So trying to maintain the same hour (in
+    // a new timezone) makes sense. Adding/subtracting hours does not follow
+    // this rule.
+    var getSetHour = makeGetSet('Hours', true);
+
+    addFormatToken('m', ['mm', 2], 0, 'minute');
+
+    // ALIASES
+
+    addUnitAlias('minute', 'm');
+
+    // PARSING
+
+    addRegexToken('m',  match1to2);
+    addRegexToken('mm', match1to2, match2);
+    addParseToken(['m', 'mm'], MINUTE);
+
+    // MOMENTS
+
+    var getSetMinute = makeGetSet('Minutes', false);
+
+    addFormatToken('s', ['ss', 2], 0, 'second');
+
+    // ALIASES
+
+    addUnitAlias('second', 's');
+
+    // PARSING
+
+    addRegexToken('s',  match1to2);
+    addRegexToken('ss', match1to2, match2);
+    addParseToken(['s', 'ss'], SECOND);
+
+    // MOMENTS
+
+    var getSetSecond = makeGetSet('Seconds', false);
+
+    addFormatToken('S', 0, 0, function () {
+        return ~~(this.millisecond() / 100);
+    });
+
+    addFormatToken(0, ['SS', 2], 0, function () {
+        return ~~(this.millisecond() / 10);
+    });
+
+    function millisecond__milliseconds (token) {
+        addFormatToken(0, [token, 3], 0, 'millisecond');
+    }
+
+    millisecond__milliseconds('SSS');
+    millisecond__milliseconds('SSSS');
+
+    // ALIASES
+
+    addUnitAlias('millisecond', 'ms');
+
+    // PARSING
+
+    addRegexToken('S',    match1to3, match1);
+    addRegexToken('SS',   match1to3, match2);
+    addRegexToken('SSS',  match1to3, match3);
+    addRegexToken('SSSS', matchUnsigned);
+    addParseToken(['S', 'SS', 'SSS', 'SSSS'], function (input, array) {
+        array[MILLISECOND] = toInt(('0.' + input) * 1000);
+    });
+
+    // MOMENTS
+
+    var getSetMillisecond = makeGetSet('Milliseconds', false);
+
+    addFormatToken('z',  0, 0, 'zoneAbbr');
+    addFormatToken('zz', 0, 0, 'zoneName');
+
+    // MOMENTS
+
+    function getZoneAbbr () {
+        return this._isUTC ? 'UTC' : '';
+    }
+
+    function getZoneName () {
+        return this._isUTC ? 'Coordinated Universal Time' : '';
+    }
+
+    var momentPrototype__proto = Moment.prototype;
+
+    momentPrototype__proto.add          = add_subtract__add;
+    momentPrototype__proto.calendar     = moment_calendar__calendar;
+    momentPrototype__proto.clone        = clone;
+    momentPrototype__proto.diff         = diff;
+    momentPrototype__proto.endOf        = endOf;
+    momentPrototype__proto.format       = format;
+    momentPrototype__proto.from         = from;
+    momentPrototype__proto.fromNow      = fromNow;
+    momentPrototype__proto.to           = to;
+    momentPrototype__proto.toNow        = toNow;
+    momentPrototype__proto.get          = getSet;
+    momentPrototype__proto.invalidAt    = invalidAt;
+    momentPrototype__proto.isAfter      = isAfter;
+    momentPrototype__proto.isBefore     = isBefore;
+    momentPrototype__proto.isBetween    = isBetween;
+    momentPrototype__proto.isSame       = isSame;
+    momentPrototype__proto.isValid      = moment_valid__isValid;
+    momentPrototype__proto.lang         = lang;
+    momentPrototype__proto.locale       = locale;
+    momentPrototype__proto.localeData   = localeData;
+    momentPrototype__proto.max          = prototypeMax;
+    momentPrototype__proto.min          = prototypeMin;
+    momentPrototype__proto.parsingFlags = parsingFlags;
+    momentPrototype__proto.set          = getSet;
+    momentPrototype__proto.startOf      = startOf;
+    momentPrototype__proto.subtract     = add_subtract__subtract;
+    momentPrototype__proto.toArray      = toArray;
+    momentPrototype__proto.toDate       = toDate;
+    momentPrototype__proto.toISOString  = moment_format__toISOString;
+    momentPrototype__proto.toJSON       = moment_format__toISOString;
+    momentPrototype__proto.toString     = toString;
+    momentPrototype__proto.unix         = unix;
+    momentPrototype__proto.valueOf      = to_type__valueOf;
+
+    // Year
+    momentPrototype__proto.year       = getSetYear;
+    momentPrototype__proto.isLeapYear = getIsLeapYear;
+
+    // Week Year
+    momentPrototype__proto.weekYear    = getSetWeekYear;
+    momentPrototype__proto.isoWeekYear = getSetISOWeekYear;
+
+    // Quarter
+    momentPrototype__proto.quarter = momentPrototype__proto.quarters = getSetQuarter;
+
+    // Month
+    momentPrototype__proto.month       = getSetMonth;
+    momentPrototype__proto.daysInMonth = getDaysInMonth;
+
+    // Week
+    momentPrototype__proto.week           = momentPrototype__proto.weeks        = getSetWeek;
+    momentPrototype__proto.isoWeek        = momentPrototype__proto.isoWeeks     = getSetISOWeek;
+    momentPrototype__proto.weeksInYear    = getWeeksInYear;
+    momentPrototype__proto.isoWeeksInYear = getISOWeeksInYear;
+
+    // Day
+    momentPrototype__proto.date       = getSetDayOfMonth;
+    momentPrototype__proto.day        = momentPrototype__proto.days             = getSetDayOfWeek;
+    momentPrototype__proto.weekday    = getSetLocaleDayOfWeek;
+    momentPrototype__proto.isoWeekday = getSetISODayOfWeek;
+    momentPrototype__proto.dayOfYear  = getSetDayOfYear;
+
+    // Hour
+    momentPrototype__proto.hour = momentPrototype__proto.hours = getSetHour;
+
+    // Minute
+    momentPrototype__proto.minute = momentPrototype__proto.minutes = getSetMinute;
+
+    // Second
+    momentPrototype__proto.second = momentPrototype__proto.seconds = getSetSecond;
+
+    // Millisecond
+    momentPrototype__proto.millisecond = momentPrototype__proto.milliseconds = getSetMillisecond;
+
+    // Offset
+    momentPrototype__proto.utcOffset            = getSetOffset;
+    momentPrototype__proto.utc                  = setOffsetToUTC;
+    momentPrototype__proto.local                = setOffsetToLocal;
+    momentPrototype__proto.parseZone            = setOffsetToParsedOffset;
+    momentPrototype__proto.hasAlignedHourOffset = hasAlignedHourOffset;
+    momentPrototype__proto.isDST                = isDaylightSavingTime;
+    momentPrototype__proto.isDSTShifted         = isDaylightSavingTimeShifted;
+    momentPrototype__proto.isLocal              = isLocal;
+    momentPrototype__proto.isUtcOffset          = isUtcOffset;
+    momentPrototype__proto.isUtc                = isUtc;
+    momentPrototype__proto.isUTC                = isUtc;
+
+    // Timezone
+    momentPrototype__proto.zoneAbbr = getZoneAbbr;
+    momentPrototype__proto.zoneName = getZoneName;
+
+    // Deprecations
+    momentPrototype__proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
+    momentPrototype__proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
+    momentPrototype__proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
+    momentPrototype__proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779', getSetZone);
+
+    var momentPrototype = momentPrototype__proto;
+
+    function moment__createUnix (input) {
+        return local__createLocal(input * 1000);
+    }
+
+    function moment__createInZone () {
+        return local__createLocal.apply(null, arguments).parseZone();
+    }
+
+    var defaultCalendar = {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
+    };
+
+    function locale_calendar__calendar (key, mom, now) {
+        var output = this._calendar[key];
+        return typeof output === 'function' ? output.call(mom, now) : output;
+    }
+
+    var defaultLongDateFormat = {
+        LTS  : 'h:mm:ss A',
+        LT   : 'h:mm A',
+        L    : 'MM/DD/YYYY',
+        LL   : 'MMMM D, YYYY',
+        LLL  : 'MMMM D, YYYY LT',
+        LLLL : 'dddd, MMMM D, YYYY LT'
+    };
+
+    function longDateFormat (key) {
+        var output = this._longDateFormat[key];
+        if (!output && this._longDateFormat[key.toUpperCase()]) {
+            output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) {
+                return val.slice(1);
+            });
+            this._longDateFormat[key] = output;
+        }
+        return output;
+    }
+
+    var defaultInvalidDate = 'Invalid date';
+
+    function invalidDate () {
+        return this._invalidDate;
+    }
+
+    var defaultOrdinal = '%d';
+    var defaultOrdinalParse = /\d{1,2}/;
+
+    function ordinal (number) {
+        return this._ordinal.replace('%d', number);
+    }
+
+    function preParsePostFormat (string) {
+        return string;
+    }
+
+    var defaultRelativeTime = {
+        future : 'in %s',
+        past   : '%s ago',
+        s  : 'a few seconds',
+        m  : 'a minute',
+        mm : '%d minutes',
+        h  : 'an hour',
+        hh : '%d hours',
+        d  : 'a day',
+        dd : '%d days',
+        M  : 'a month',
+        MM : '%d months',
+        y  : 'a year',
+        yy : '%d years'
+    };
+
+    function relative__relativeTime (number, withoutSuffix, string, isFuture) {
+        var output = this._relativeTime[string];
+        return (typeof output === 'function') ?
+            output(number, withoutSuffix, string, isFuture) :
+            output.replace(/%d/i, number);
+    }
+
+    function pastFuture (diff, output) {
+        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+        return typeof format === 'function' ? format(output) : format.replace(/%s/i, output);
+    }
+
+    function locale_set__set (config) {
+        var prop, i;
+        for (i in config) {
+            prop = config[i];
+            if (typeof prop === 'function') {
+                this[i] = prop;
+            } else {
+                this['_' + i] = prop;
+            }
+        }
+        // Lenient ordinal parsing accepts just a number in addition to
+        // number + (possibly) stuff coming from _ordinalParseLenient.
+        this._ordinalParseLenient = new RegExp(this._ordinalParse.source + '|' + (/\d{1,2}/).source);
+    }
+
+    var prototype__proto = Locale.prototype;
+
+    prototype__proto._calendar       = defaultCalendar;
+    prototype__proto.calendar        = locale_calendar__calendar;
+    prototype__proto._longDateFormat = defaultLongDateFormat;
+    prototype__proto.longDateFormat  = longDateFormat;
+    prototype__proto._invalidDate    = defaultInvalidDate;
+    prototype__proto.invalidDate     = invalidDate;
+    prototype__proto._ordinal        = defaultOrdinal;
+    prototype__proto.ordinal         = ordinal;
+    prototype__proto._ordinalParse   = defaultOrdinalParse;
+    prototype__proto.preparse        = preParsePostFormat;
+    prototype__proto.postformat      = preParsePostFormat;
+    prototype__proto._relativeTime   = defaultRelativeTime;
+    prototype__proto.relativeTime    = relative__relativeTime;
+    prototype__proto.pastFuture      = pastFuture;
+    prototype__proto.set             = locale_set__set;
+
+    // Month
+    prototype__proto.months       =        localeMonths;
+    prototype__proto._months      = defaultLocaleMonths;
+    prototype__proto.monthsShort  =        localeMonthsShort;
+    prototype__proto._monthsShort = defaultLocaleMonthsShort;
+    prototype__proto.monthsParse  =        localeMonthsParse;
+
+    // Week
+    prototype__proto.week = localeWeek;
+    prototype__proto._week = defaultLocaleWeek;
+    prototype__proto.firstDayOfYear = localeFirstDayOfYear;
+    prototype__proto.firstDayOfWeek = localeFirstDayOfWeek;
+
+    // Day of Week
+    prototype__proto.weekdays       =        localeWeekdays;
+    prototype__proto._weekdays      = defaultLocaleWeekdays;
+    prototype__proto.weekdaysMin    =        localeWeekdaysMin;
+    prototype__proto._weekdaysMin   = defaultLocaleWeekdaysMin;
+    prototype__proto.weekdaysShort  =        localeWeekdaysShort;
+    prototype__proto._weekdaysShort = defaultLocaleWeekdaysShort;
+    prototype__proto.weekdaysParse  =        localeWeekdaysParse;
+
+    // Hours
+    prototype__proto.isPM = localeIsPM;
+    prototype__proto._meridiemParse = defaultLocaleMeridiemParse;
+    prototype__proto.meridiem = localeMeridiem;
+
+    function lists__get (format, index, field, setter) {
+        var locale = locale_locales__getLocale();
+        var utc = create_utc__createUTC().set(setter, index);
+        return locale[field](utc, format);
+    }
+
+    function list (format, index, field, count, setter) {
+        if (typeof format === 'number') {
+            index = format;
+            format = undefined;
+        }
+
+        format = format || '';
+
+        if (index != null) {
+            return lists__get(format, index, field, setter);
+        }
+
+        var i;
+        var out = [];
+        for (i = 0; i < count; i++) {
+            out[i] = lists__get(format, i, field, setter);
+        }
+        return out;
+    }
+
+    function lists__listMonths (format, index) {
+        return list(format, index, 'months', 12, 'month');
+    }
+
+    function lists__listMonthsShort (format, index) {
+        return list(format, index, 'monthsShort', 12, 'month');
+    }
+
+    function lists__listWeekdays (format, index) {
+        return list(format, index, 'weekdays', 7, 'day');
+    }
+
+    function lists__listWeekdaysShort (format, index) {
+        return list(format, index, 'weekdaysShort', 7, 'day');
+    }
+
+    function lists__listWeekdaysMin (format, index) {
+        return list(format, index, 'weekdaysMin', 7, 'day');
+    }
+
+    locale_locales__getSetGlobalLocale('en', {
+        ordinalParse: /\d{1,2}(th|st|nd|rd)/,
+        ordinal : function (number) {
+            var b = number % 10,
+                output = (toInt(number % 100 / 10) === 1) ? 'th' :
+                (b === 1) ? 'st' :
+                (b === 2) ? 'nd' :
+                (b === 3) ? 'rd' : 'th';
+            return number + output;
+        }
+    });
+
+    // Side effect imports
+    utils_hooks__hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', locale_locales__getSetGlobalLocale);
+    utils_hooks__hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', locale_locales__getLocale);
+
+    var mathAbs = Math.abs;
+
+    function duration_abs__abs () {
+        var data           = this._data;
+
+        this._milliseconds = mathAbs(this._milliseconds);
+        this._days         = mathAbs(this._days);
+        this._months       = mathAbs(this._months);
+
+        data.milliseconds  = mathAbs(data.milliseconds);
+        data.seconds       = mathAbs(data.seconds);
+        data.minutes       = mathAbs(data.minutes);
+        data.hours         = mathAbs(data.hours);
+        data.months        = mathAbs(data.months);
+        data.years         = mathAbs(data.years);
+
+        return this;
+    }
+
+    function duration_add_subtract__addSubtract (duration, input, value, direction) {
+        var other = create__createDuration(input, value);
+
+        duration._milliseconds += direction * other._milliseconds;
+        duration._days         += direction * other._days;
+        duration._months       += direction * other._months;
+
+        return duration._bubble();
+    }
+
+    // supports only 2.0-style add(1, 's') or add(duration)
+    function duration_add_subtract__add (input, value) {
+        return duration_add_subtract__addSubtract(this, input, value, 1);
+    }
+
+    // supports only 2.0-style subtract(1, 's') or subtract(duration)
+    function duration_add_subtract__subtract (input, value) {
+        return duration_add_subtract__addSubtract(this, input, value, -1);
+    }
+
+    function bubble () {
+        var milliseconds = this._milliseconds;
+        var days         = this._days;
+        var months       = this._months;
+        var data         = this._data;
+        var seconds, minutes, hours, years = 0;
+
+        // The following code bubbles up values, see the tests for
+        // examples of what that means.
+        data.milliseconds = milliseconds % 1000;
+
+        seconds           = absFloor(milliseconds / 1000);
+        data.seconds      = seconds % 60;
+
+        minutes           = absFloor(seconds / 60);
+        data.minutes      = minutes % 60;
+
+        hours             = absFloor(minutes / 60);
+        data.hours        = hours % 24;
+
+        days += absFloor(hours / 24);
+
+        // Accurately convert days to years, assume start from year 0.
+        years = absFloor(daysToYears(days));
+        days -= absFloor(yearsToDays(years));
+
+        // 30 days to a month
+        // TODO (iskren): Use anchor date (like 1st Jan) to compute this.
+        months += absFloor(days / 30);
+        days   %= 30;
+
+        // 12 months -> 1 year
+        years  += absFloor(months / 12);
+        months %= 12;
+
+        data.days   = days;
+        data.months = months;
+        data.years  = years;
+
+        return this;
+    }
+
+    function daysToYears (days) {
+        // 400 years have 146097 days (taking into account leap year rules)
+        return days * 400 / 146097;
+    }
+
+    function yearsToDays (years) {
+        // years * 365 + absFloor(years / 4) -
+        //     absFloor(years / 100) + absFloor(years / 400);
+        return years * 146097 / 400;
+    }
+
+    function as (units) {
+        var days;
+        var months;
+        var milliseconds = this._milliseconds;
+
+        units = normalizeUnits(units);
+
+        if (units === 'month' || units === 'year') {
+            days   = this._days   + milliseconds / 864e5;
+            months = this._months + daysToYears(days) * 12;
+            return units === 'month' ? months : months / 12;
+        } else {
+            // handle milliseconds separately because of floating point math errors (issue #1867)
+            days = this._days + Math.round(yearsToDays(this._months / 12));
+            switch (units) {
+                case 'week'   : return days / 7     + milliseconds / 6048e5;
+                case 'day'    : return days         + milliseconds / 864e5;
+                case 'hour'   : return days * 24    + milliseconds / 36e5;
+                case 'minute' : return days * 1440  + milliseconds / 6e4;
+                case 'second' : return days * 86400 + milliseconds / 1000;
+                // Math.floor prevents floating point math errors here
+                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
+                default: throw new Error('Unknown unit ' + units);
+            }
+        }
+    }
+
+    // TODO: Use this.as('ms')?
+    function duration_as__valueOf () {
+        return (
+            this._milliseconds +
+            this._days * 864e5 +
+            (this._months % 12) * 2592e6 +
+            toInt(this._months / 12) * 31536e6
+        );
+    }
+
+    function makeAs (alias) {
+        return function () {
+            return this.as(alias);
+        };
+    }
+
+    var asMilliseconds = makeAs('ms');
+    var asSeconds      = makeAs('s');
+    var asMinutes      = makeAs('m');
+    var asHours        = makeAs('h');
+    var asDays         = makeAs('d');
+    var asWeeks        = makeAs('w');
+    var asMonths       = makeAs('M');
+    var asYears        = makeAs('y');
+
+    function duration_get__get (units) {
+        units = normalizeUnits(units);
+        return this[units + 's']();
+    }
+
+    function makeGetter(name) {
+        return function () {
+            return this._data[name];
+        };
+    }
+
+    var duration_get__milliseconds = makeGetter('milliseconds');
+    var seconds      = makeGetter('seconds');
+    var minutes      = makeGetter('minutes');
+    var hours        = makeGetter('hours');
+    var days         = makeGetter('days');
+    var months       = makeGetter('months');
+    var years        = makeGetter('years');
+
+    function weeks () {
+        return absFloor(this.days() / 7);
+    }
+
+    var round = Math.round;
+    var thresholds = {
+        s: 45,  // seconds to minute
+        m: 45,  // minutes to hour
+        h: 22,  // hours to day
+        d: 26,  // days to month
+        M: 11   // months to year
+    };
+
+    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+    }
+
+    function duration_humanize__relativeTime (posNegDuration, withoutSuffix, locale) {
+        var duration = create__createDuration(posNegDuration).abs();
+        var seconds  = round(duration.as('s'));
+        var minutes  = round(duration.as('m'));
+        var hours    = round(duration.as('h'));
+        var days     = round(duration.as('d'));
+        var months   = round(duration.as('M'));
+        var years    = round(duration.as('y'));
+
+        var a = seconds < thresholds.s && ['s', seconds]  ||
+                minutes === 1          && ['m']           ||
+                minutes < thresholds.m && ['mm', minutes] ||
+                hours   === 1          && ['h']           ||
+                hours   < thresholds.h && ['hh', hours]   ||
+                days    === 1          && ['d']           ||
+                days    < thresholds.d && ['dd', days]    ||
+                months  === 1          && ['M']           ||
+                months  < thresholds.M && ['MM', months]  ||
+                years   === 1          && ['y']           || ['yy', years];
+
+        a[2] = withoutSuffix;
+        a[3] = +posNegDuration > 0;
+        a[4] = locale;
+        return substituteTimeAgo.apply(null, a);
+    }
+
+    // This function allows you to set a threshold for relative time strings
+    function duration_humanize__getSetRelativeTimeThreshold (threshold, limit) {
+        if (thresholds[threshold] === undefined) {
+            return false;
+        }
+        if (limit === undefined) {
+            return thresholds[threshold];
+        }
+        thresholds[threshold] = limit;
+        return true;
+    }
+
+    function humanize (withSuffix) {
+        var locale = this.localeData();
+        var output = duration_humanize__relativeTime(this, !withSuffix, locale);
+
+        if (withSuffix) {
+            output = locale.pastFuture(+this, output);
+        }
+
+        return locale.postformat(output);
+    }
+
+    var iso_string__abs = Math.abs;
+
+    function iso_string__toISOString() {
+        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+        var Y = iso_string__abs(this.years());
+        var M = iso_string__abs(this.months());
+        var D = iso_string__abs(this.days());
+        var h = iso_string__abs(this.hours());
+        var m = iso_string__abs(this.minutes());
+        var s = iso_string__abs(this.seconds() + this.milliseconds() / 1000);
+        var total = this.asSeconds();
+
+        if (!total) {
+            // this is the same as C#'s (Noda) and python (isodate)...
+            // but not other JS (goog.date)
+            return 'P0D';
+        }
+
+        return (total < 0 ? '-' : '') +
+            'P' +
+            (Y ? Y + 'Y' : '') +
+            (M ? M + 'M' : '') +
+            (D ? D + 'D' : '') +
+            ((h || m || s) ? 'T' : '') +
+            (h ? h + 'H' : '') +
+            (m ? m + 'M' : '') +
+            (s ? s + 'S' : '');
+    }
+
+    var duration_prototype__proto = Duration.prototype;
+
+    duration_prototype__proto.abs            = duration_abs__abs;
+    duration_prototype__proto.add            = duration_add_subtract__add;
+    duration_prototype__proto.subtract       = duration_add_subtract__subtract;
+    duration_prototype__proto.as             = as;
+    duration_prototype__proto.asMilliseconds = asMilliseconds;
+    duration_prototype__proto.asSeconds      = asSeconds;
+    duration_prototype__proto.asMinutes      = asMinutes;
+    duration_prototype__proto.asHours        = asHours;
+    duration_prototype__proto.asDays         = asDays;
+    duration_prototype__proto.asWeeks        = asWeeks;
+    duration_prototype__proto.asMonths       = asMonths;
+    duration_prototype__proto.asYears        = asYears;
+    duration_prototype__proto.valueOf        = duration_as__valueOf;
+    duration_prototype__proto._bubble        = bubble;
+    duration_prototype__proto.get            = duration_get__get;
+    duration_prototype__proto.milliseconds   = duration_get__milliseconds;
+    duration_prototype__proto.seconds        = seconds;
+    duration_prototype__proto.minutes        = minutes;
+    duration_prototype__proto.hours          = hours;
+    duration_prototype__proto.days           = days;
+    duration_prototype__proto.weeks          = weeks;
+    duration_prototype__proto.months         = months;
+    duration_prototype__proto.years          = years;
+    duration_prototype__proto.humanize       = humanize;
+    duration_prototype__proto.toISOString    = iso_string__toISOString;
+    duration_prototype__proto.toString       = iso_string__toISOString;
+    duration_prototype__proto.toJSON         = iso_string__toISOString;
+    duration_prototype__proto.locale         = locale;
+    duration_prototype__proto.localeData     = localeData;
+
+    // Deprecations
+    duration_prototype__proto.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', iso_string__toISOString);
+    duration_prototype__proto.lang = lang;
+
+    // Side effect imports
+
+    addFormatToken('X', 0, 0, 'unix');
+    addFormatToken('x', 0, 0, 'valueOf');
+
+    // PARSING
+
+    addRegexToken('x', matchSigned);
+    addRegexToken('X', matchTimestamp);
+    addParseToken('X', function (input, array, config) {
+        config._d = new Date(parseFloat(input, 10) * 1000);
+    });
+    addParseToken('x', function (input, array, config) {
+        config._d = new Date(toInt(input));
+    });
+
+    // Side effect imports
+
+
+    utils_hooks__hooks.version = '2.10.3';
+
+    setHookCallback(local__createLocal);
+
+    utils_hooks__hooks.fn                    = momentPrototype;
+    utils_hooks__hooks.min                   = min;
+    utils_hooks__hooks.max                   = max;
+    utils_hooks__hooks.utc                   = create_utc__createUTC;
+    utils_hooks__hooks.unix                  = moment__createUnix;
+    utils_hooks__hooks.months                = lists__listMonths;
+    utils_hooks__hooks.isDate                = isDate;
+    utils_hooks__hooks.locale                = locale_locales__getSetGlobalLocale;
+    utils_hooks__hooks.invalid               = valid__createInvalid;
+    utils_hooks__hooks.duration              = create__createDuration;
+    utils_hooks__hooks.isMoment              = isMoment;
+    utils_hooks__hooks.weekdays              = lists__listWeekdays;
+    utils_hooks__hooks.parseZone             = moment__createInZone;
+    utils_hooks__hooks.localeData            = locale_locales__getLocale;
+    utils_hooks__hooks.isDuration            = isDuration;
+    utils_hooks__hooks.monthsShort           = lists__listMonthsShort;
+    utils_hooks__hooks.weekdaysMin           = lists__listWeekdaysMin;
+    utils_hooks__hooks.defineLocale          = defineLocale;
+    utils_hooks__hooks.weekdaysShort         = lists__listWeekdaysShort;
+    utils_hooks__hooks.normalizeUnits        = normalizeUnits;
+    utils_hooks__hooks.relativeTimeThreshold = duration_humanize__getSetRelativeTimeThreshold;
+
+    var _moment = utils_hooks__hooks;
+
+    return _moment;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/check-overflow.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/check-overflow.js
new file mode 100644
index 000000000..88a62ae54
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/check-overflow.js
@@ -0,0 +1,28 @@
+import { daysInMonth } from '../units/month';
+import { YEAR, MONTH, DATE, HOUR, MINUTE, SECOND, MILLISECOND } from '../units/constants';
+import getParsingFlags from '../create/parsing-flags';
+
+export default function checkOverflow (m) {
+    var overflow;
+    var a = m._a;
+
+    if (a && getParsingFlags(m).overflow === -2) {
+        overflow =
+            a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
+            a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
+            a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
+            a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
+            a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
+            a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
+            -1;
+
+        if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+            overflow = DATE;
+        }
+
+        getParsingFlags(m).overflow = overflow;
+    }
+
+    return m;
+}
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/date-from-array.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/date-from-array.js
new file mode 100644
index 000000000..349eebcc4
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/date-from-array.js
@@ -0,0 +1,19 @@
+export function createDate (y, m, d, h, M, s, ms) {
+    //can't just apply() to create a date:
+    //http://stackoverflow.com/questions/181348/instantiating-a-javascript-object-by-calling-prototype-constructor-apply
+    var date = new Date(y, m, d, h, M, s, ms);
+
+    //the date constructor doesn't accept years < 1970
+    if (y < 1970) {
+        date.setFullYear(y);
+    }
+    return date;
+}
+
+export function createUTCDate (y) {
+    var date = new Date(Date.UTC.apply(null, arguments));
+    if (y < 1970) {
+        date.setUTCFullYear(y);
+    }
+    return date;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/from-anything.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-anything.js
new file mode 100644
index 000000000..4b836c0fa
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-anything.js
@@ -0,0 +1,93 @@
+import isArray from '../utils/is-array';
+import isDate from '../utils/is-date';
+import map from '../utils/map';
+import { createInvalid } from './valid';
+import { Moment, isMoment } from '../moment/constructor';
+import { getLocale } from '../locale/locales';
+import { hooks } from '../utils/hooks';
+import checkOverflow from './check-overflow';
+
+import { configFromStringAndArray }  from './from-string-and-array';
+import { configFromStringAndFormat } from './from-string-and-format';
+import { configFromString }          from './from-string';
+import { configFromArray }           from './from-array';
+import { configFromObject }          from './from-object';
+
+function createFromConfig (config) {
+    var input = config._i,
+        format = config._f,
+        res;
+
+    config._locale = config._locale || getLocale(config._l);
+
+    if (input === null || (format === undefined && input === '')) {
+        return createInvalid({nullInput: true});
+    }
+
+    if (typeof input === 'string') {
+        config._i = input = config._locale.preparse(input);
+    }
+
+    if (isMoment(input)) {
+        return new Moment(checkOverflow(input));
+    } else if (isArray(format)) {
+        configFromStringAndArray(config);
+    } else if (format) {
+        configFromStringAndFormat(config);
+    } else if (isDate(input)) {
+        config._d = input;
+    } else {
+        configFromInput(config);
+    }
+
+    res = new Moment(checkOverflow(config));
+    if (res._nextDay) {
+        // Adding is smart enough around DST
+        res.add(1, 'd');
+        res._nextDay = undefined;
+    }
+
+    return res;
+}
+
+function configFromInput(config) {
+    var input = config._i;
+    if (input === undefined) {
+        config._d = new Date();
+    } else if (isDate(input)) {
+        config._d = new Date(+input);
+    } else if (typeof input === 'string') {
+        configFromString(config);
+    } else if (isArray(input)) {
+        config._a = map(input.slice(0), function (obj) {
+            return parseInt(obj, 10);
+        });
+        configFromArray(config);
+    } else if (typeof(input) === 'object') {
+        configFromObject(config);
+    } else if (typeof(input) === 'number') {
+        // from milliseconds
+        config._d = new Date(input);
+    } else {
+        hooks.createFromInputFallback(config);
+    }
+}
+
+export function createLocalOrUTC (input, format, locale, strict, isUTC) {
+    var c = {};
+
+    if (typeof(locale) === 'boolean') {
+        strict = locale;
+        locale = undefined;
+    }
+    // object construction must be done this way.
+    // https://github.com/moment/moment/issues/1423
+    c._isAMomentObject = true;
+    c._useUTC = c._isUTC = isUTC;
+    c._l = locale;
+    c._i = input;
+    c._f = format;
+    c._strict = strict;
+
+    return createFromConfig(c);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/from-array.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-array.js
new file mode 100644
index 000000000..c4239cb72
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-array.js
@@ -0,0 +1,124 @@
+import { createDate, createUTCDate } from './date-from-array';
+import { daysInYear } from '../units/year';
+import { weekOfYear } from '../units/week';
+import { dayOfYearFromWeeks } from '../units/day-of-year';
+import { YEAR, MONTH, DATE, HOUR, MINUTE, SECOND, MILLISECOND } from '../units/constants';
+import { createLocal } from './local';
+import defaults from '../utils/defaults';
+import getParsingFlags from './parsing-flags';
+
+function currentDateArray(config) {
+    var now = new Date();
+    if (config._useUTC) {
+        return [now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()];
+    }
+    return [now.getFullYear(), now.getMonth(), now.getDate()];
+}
+
+// convert an array to a date.
+// the array should mirror the parameters below
+// note: all values past the year are optional and will default to the lowest possible value.
+// [year, month, day , hour, minute, second, millisecond]
+export function configFromArray (config) {
+    var i, date, input = [], currentDate, yearToUse;
+
+    if (config._d) {
+        return;
+    }
+
+    currentDate = currentDateArray(config);
+
+    //compute day of the year from weeks and weekdays
+    if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+        dayOfYearFromWeekInfo(config);
+    }
+
+    //if the day of the year is set, figure out what it is
+    if (config._dayOfYear) {
+        yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
+
+        if (config._dayOfYear > daysInYear(yearToUse)) {
+            getParsingFlags(config)._overflowDayOfYear = true;
+        }
+
+        date = createUTCDate(yearToUse, 0, config._dayOfYear);
+        config._a[MONTH] = date.getUTCMonth();
+        config._a[DATE] = date.getUTCDate();
+    }
+
+    // Default to current date.
+    // * if no year, month, day of month are given, default to today
+    // * if day of month is given, default month and year
+    // * if month is given, default only year
+    // * if year is given, don't default anything
+    for (i = 0; i < 3 && config._a[i] == null; ++i) {
+        config._a[i] = input[i] = currentDate[i];
+    }
+
+    // Zero out whatever was not defaulted, including time
+    for (; i < 7; i++) {
+        config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+    }
+
+    // Check for 24:00:00.000
+    if (config._a[HOUR] === 24 &&
+            config._a[MINUTE] === 0 &&
+            config._a[SECOND] === 0 &&
+            config._a[MILLISECOND] === 0) {
+        config._nextDay = true;
+        config._a[HOUR] = 0;
+    }
+
+    config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
+    // Apply timezone offset from input. The actual utcOffset can be changed
+    // with parseZone.
+    if (config._tzm != null) {
+        config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+    }
+
+    if (config._nextDay) {
+        config._a[HOUR] = 24;
+    }
+}
+
+function dayOfYearFromWeekInfo(config) {
+    var w, weekYear, week, weekday, dow, doy, temp;
+
+    w = config._w;
+    if (w.GG != null || w.W != null || w.E != null) {
+        dow = 1;
+        doy = 4;
+
+        // TODO: We need to take the current isoWeekYear, but that depends on
+        // how we interpret now (local, utc, fixed offset). So create
+        // a now version of current config (take local/utc/offset flags, and
+        // create now).
+        weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
+        week = defaults(w.W, 1);
+        weekday = defaults(w.E, 1);
+    } else {
+        dow = config._locale._week.dow;
+        doy = config._locale._week.doy;
+
+        weekYear = defaults(w.gg, config._a[YEAR], weekOfYear(createLocal(), dow, doy).year);
+        week = defaults(w.w, 1);
+
+        if (w.d != null) {
+            // weekday -- low day numbers are considered next week
+            weekday = w.d;
+            if (weekday < dow) {
+                ++week;
+            }
+        } else if (w.e != null) {
+            // local weekday -- counting starts from begining of week
+            weekday = w.e + dow;
+        } else {
+            // default to begining of week
+            weekday = dow;
+        }
+    }
+    temp = dayOfYearFromWeeks(weekYear, week, weekday, doy, dow);
+
+    config._a[YEAR] = temp.year;
+    config._dayOfYear = temp.dayOfYear;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/from-object.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-object.js
new file mode 100644
index 000000000..af8e082f4
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-object.js
@@ -0,0 +1,13 @@
+import { normalizeObjectUnits } from '../units/aliases';
+import { configFromArray } from './from-array';
+
+export function configFromObject(config) {
+    if (config._d) {
+        return;
+    }
+
+    var i = normalizeObjectUnits(config._i);
+    config._a = [i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond];
+
+    configFromArray(config);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-array.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-array.js
new file mode 100644
index 000000000..1d8a7a806
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-array.js
@@ -0,0 +1,50 @@
+import { copyConfig } from '../moment/constructor';
+import { configFromStringAndFormat } from './from-string-and-format';
+import getParsingFlags from './parsing-flags';
+import { isValid } from './valid';
+import extend from '../utils/extend';
+
+// date from string and array of format strings
+export function configFromStringAndArray(config) {
+    var tempConfig,
+        bestMoment,
+
+        scoreToBeat,
+        i,
+        currentScore;
+
+    if (config._f.length === 0) {
+        getParsingFlags(config).invalidFormat = true;
+        config._d = new Date(NaN);
+        return;
+    }
+
+    for (i = 0; i < config._f.length; i++) {
+        currentScore = 0;
+        tempConfig = copyConfig({}, config);
+        if (config._useUTC != null) {
+            tempConfig._useUTC = config._useUTC;
+        }
+        tempConfig._f = config._f[i];
+        configFromStringAndFormat(tempConfig);
+
+        if (!isValid(tempConfig)) {
+            continue;
+        }
+
+        // if there is any input that was not parsed add a penalty for that format
+        currentScore += getParsingFlags(tempConfig).charsLeftOver;
+
+        //or tokens
+        currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
+
+        getParsingFlags(tempConfig).score = currentScore;
+
+        if (scoreToBeat == null || currentScore < scoreToBeat) {
+            scoreToBeat = currentScore;
+            bestMoment = tempConfig;
+        }
+    }
+
+    extend(config, bestMoment || tempConfig);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-format.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-format.js
new file mode 100644
index 000000000..ae48b9038
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string-and-format.js
@@ -0,0 +1,102 @@
+import { configFromISO } from './from-string';
+import { configFromArray } from './from-array';
+import { getParseRegexForToken }   from '../parse/regex';
+import { addTimeToArrayFromToken } from '../parse/token';
+import { expandFormat, formatTokenFunctions, formattingTokens } from '../format/format';
+import checkOverflow from './check-overflow';
+import { HOUR } from '../units/constants';
+import { hooks } from '../utils/hooks';
+import getParsingFlags from './parsing-flags';
+
+// constant that refers to the ISO standard
+hooks.ISO_8601 = function () {};
+
+// date from string and format string
+export function configFromStringAndFormat(config) {
+    // TODO: Move this to another part of the creation flow to prevent circular deps
+    if (config._f === hooks.ISO_8601) {
+        configFromISO(config);
+        return;
+    }
+
+    config._a = [];
+    getParsingFlags(config).empty = true;
+
+    // This array is used to make a Date, either with `new Date` or `Date.UTC`
+    var string = '' + config._i,
+        i, parsedInput, tokens, token, skipped,
+        stringLength = string.length,
+        totalParsedInputLength = 0;
+
+    tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
+
+    for (i = 0; i < tokens.length; i++) {
+        token = tokens[i];
+        parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+        if (parsedInput) {
+            skipped = string.substr(0, string.indexOf(parsedInput));
+            if (skipped.length > 0) {
+                getParsingFlags(config).unusedInput.push(skipped);
+            }
+            string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+            totalParsedInputLength += parsedInput.length;
+        }
+        // don't parse if it's not a known token
+        if (formatTokenFunctions[token]) {
+            if (parsedInput) {
+                getParsingFlags(config).empty = false;
+            }
+            else {
+                getParsingFlags(config).unusedTokens.push(token);
+            }
+            addTimeToArrayFromToken(token, parsedInput, config);
+        }
+        else if (config._strict && !parsedInput) {
+            getParsingFlags(config).unusedTokens.push(token);
+        }
+    }
+
+    // add remaining unparsed input length to the string
+    getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
+    if (string.length > 0) {
+        getParsingFlags(config).unusedInput.push(string);
+    }
+
+    // clear _12h flag if hour is <= 12
+    if (getParsingFlags(config).bigHour === true &&
+            config._a[HOUR] <= 12 &&
+            config._a[HOUR] > 0) {
+        getParsingFlags(config).bigHour = undefined;
+    }
+    // handle meridiem
+    config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
+
+    configFromArray(config);
+    checkOverflow(config);
+}
+
+
+function meridiemFixWrap (locale, hour, meridiem) {
+    var isPm;
+
+    if (meridiem == null) {
+        // nothing to do
+        return hour;
+    }
+    if (locale.meridiemHour != null) {
+        return locale.meridiemHour(hour, meridiem);
+    } else if (locale.isPM != null) {
+        // Fallback
+        isPm = locale.isPM(meridiem);
+        if (isPm && hour < 12) {
+            hour += 12;
+        }
+        if (!isPm && hour === 12) {
+            hour = 0;
+        }
+        return hour;
+    } else {
+        // this is not supposed to happen
+        return hour;
+    }
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string.js
new file mode 100644
index 000000000..4bd6d5913
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/from-string.js
@@ -0,0 +1,83 @@
+import { matchOffset } from '../parse/regex';
+import { configFromStringAndFormat } from './from-string-and-format';
+import { hooks } from '../utils/hooks';
+import { deprecate } from '../utils/deprecate';
+import getParsingFlags from './parsing-flags';
+
+// iso 8601 regex
+// 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+var isoRegex = /^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+
+var isoDates = [
+    ['YYYYYY-MM-DD', /[+-]\d{6}-\d{2}-\d{2}/],
+    ['YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/],
+    ['GGGG-[W]WW-E', /\d{4}-W\d{2}-\d/],
+    ['GGGG-[W]WW', /\d{4}-W\d{2}/],
+    ['YYYY-DDD', /\d{4}-\d{3}/]
+];
+
+// iso time formats and regexes
+var isoTimes = [
+    ['HH:mm:ss.SSSS', /(T| )\d\d:\d\d:\d\d\.\d+/],
+    ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/],
+    ['HH:mm', /(T| )\d\d:\d\d/],
+    ['HH', /(T| )\d\d/]
+];
+
+var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
+
+// date from iso format
+export function configFromISO(config) {
+    var i, l,
+        string = config._i,
+        match = isoRegex.exec(string);
+
+    if (match) {
+        getParsingFlags(config).iso = true;
+        for (i = 0, l = isoDates.length; i < l; i++) {
+            if (isoDates[i][1].exec(string)) {
+                // match[5] should be 'T' or undefined
+                config._f = isoDates[i][0] + (match[6] || ' ');
+                break;
+            }
+        }
+        for (i = 0, l = isoTimes.length; i < l; i++) {
+            if (isoTimes[i][1].exec(string)) {
+                config._f += isoTimes[i][0];
+                break;
+            }
+        }
+        if (string.match(matchOffset)) {
+            config._f += 'Z';
+        }
+        configFromStringAndFormat(config);
+    } else {
+        config._isValid = false;
+    }
+}
+
+// date from iso format or fallback
+export function configFromString(config) {
+    var matched = aspNetJsonRegex.exec(config._i);
+
+    if (matched !== null) {
+        config._d = new Date(+matched[1]);
+        return;
+    }
+
+    configFromISO(config);
+    if (config._isValid === false) {
+        delete config._isValid;
+        hooks.createFromInputFallback(config);
+    }
+}
+
+hooks.createFromInputFallback = deprecate(
+    'moment construction falls back to js Date. This is ' +
+    'discouraged and will be removed in upcoming major ' +
+    'release. Please refer to ' +
+    'https://github.com/moment/moment/issues/1407 for more info.',
+    function (config) {
+        config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
+    }
+);
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/local.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/local.js
new file mode 100644
index 000000000..88c1e2692
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/local.js
@@ -0,0 +1,5 @@
+import { createLocalOrUTC } from './from-anything';
+
+export function createLocal (input, format, locale, strict) {
+    return createLocalOrUTC(input, format, locale, strict, false);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/parsing-flags.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/parsing-flags.js
new file mode 100644
index 000000000..2bfbcb341
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/parsing-flags.js
@@ -0,0 +1,22 @@
+function defaultParsingFlags() {
+    // We need to deep clone this object.
+    return {
+        empty           : false,
+        unusedTokens    : [],
+        unusedInput     : [],
+        overflow        : -2,
+        charsLeftOver   : 0,
+        nullInput       : false,
+        invalidMonth    : null,
+        invalidFormat   : false,
+        userInvalidated : false,
+        iso             : false
+    };
+}
+
+export default function getParsingFlags(m) {
+    if (m._pf == null) {
+        m._pf = defaultParsingFlags();
+    }
+    return m._pf;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/utc.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/utc.js
new file mode 100644
index 000000000..96139530e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/utc.js
@@ -0,0 +1,5 @@
+import { createLocalOrUTC } from './from-anything';
+
+export function createUTC (input, format, locale, strict) {
+    return createLocalOrUTC(input, format, locale, strict, true).utc();
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/create/valid.js b/turtles/app/lib/bower_components/momentjs/src/lib/create/valid.js
new file mode 100644
index 000000000..89204f85f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/create/valid.js
@@ -0,0 +1,36 @@
+import extend from '../utils/extend';
+import { createUTC } from './utc';
+import getParsingFlags from '../create/parsing-flags';
+
+export function isValid(m) {
+    if (m._isValid == null) {
+        var flags = getParsingFlags(m);
+        m._isValid = !isNaN(m._d.getTime()) &&
+            flags.overflow < 0 &&
+            !flags.empty &&
+            !flags.invalidMonth &&
+            !flags.nullInput &&
+            !flags.invalidFormat &&
+            !flags.userInvalidated;
+
+        if (m._strict) {
+            m._isValid = m._isValid &&
+                flags.charsLeftOver === 0 &&
+                flags.unusedTokens.length === 0 &&
+                flags.bigHour === undefined;
+        }
+    }
+    return m._isValid;
+}
+
+export function createInvalid (flags) {
+    var m = createUTC(NaN);
+    if (flags != null) {
+        extend(getParsingFlags(m), flags);
+    }
+    else {
+        getParsingFlags(m).userInvalidated = true;
+    }
+
+    return m;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/abs.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/abs.js
new file mode 100644
index 000000000..103a4cf9b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/abs.js
@@ -0,0 +1,18 @@
+var mathAbs = Math.abs;
+
+export function abs () {
+    var data           = this._data;
+
+    this._milliseconds = mathAbs(this._milliseconds);
+    this._days         = mathAbs(this._days);
+    this._months       = mathAbs(this._months);
+
+    data.milliseconds  = mathAbs(data.milliseconds);
+    data.seconds       = mathAbs(data.seconds);
+    data.minutes       = mathAbs(data.minutes);
+    data.hours         = mathAbs(data.hours);
+    data.months        = mathAbs(data.months);
+    data.years         = mathAbs(data.years);
+
+    return this;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/add-subtract.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/add-subtract.js
new file mode 100644
index 000000000..3b44e186f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/add-subtract.js
@@ -0,0 +1,21 @@
+import { createDuration } from './create';
+
+function addSubtract (duration, input, value, direction) {
+    var other = createDuration(input, value);
+
+    duration._milliseconds += direction * other._milliseconds;
+    duration._days         += direction * other._days;
+    duration._months       += direction * other._months;
+
+    return duration._bubble();
+}
+
+// supports only 2.0-style add(1, 's') or add(duration)
+export function add (input, value) {
+    return addSubtract(this, input, value, 1);
+}
+
+// supports only 2.0-style subtract(1, 's') or subtract(duration)
+export function subtract (input, value) {
+    return addSubtract(this, input, value, -1);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/as.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/as.js
new file mode 100644
index 000000000..258c501e5
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/as.js
@@ -0,0 +1,55 @@
+import { daysToYears, yearsToDays } from './bubble';
+import { normalizeUnits } from '../units/aliases';
+import toInt from '../utils/to-int';
+
+export function as (units) {
+    var days;
+    var months;
+    var milliseconds = this._milliseconds;
+
+    units = normalizeUnits(units);
+
+    if (units === 'month' || units === 'year') {
+        days   = this._days   + milliseconds / 864e5;
+        months = this._months + daysToYears(days) * 12;
+        return units === 'month' ? months : months / 12;
+    } else {
+        // handle milliseconds separately because of floating point math errors (issue #1867)
+        days = this._days + Math.round(yearsToDays(this._months / 12));
+        switch (units) {
+            case 'week'   : return days / 7     + milliseconds / 6048e5;
+            case 'day'    : return days         + milliseconds / 864e5;
+            case 'hour'   : return days * 24    + milliseconds / 36e5;
+            case 'minute' : return days * 1440  + milliseconds / 6e4;
+            case 'second' : return days * 86400 + milliseconds / 1000;
+            // Math.floor prevents floating point math errors here
+            case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
+            default: throw new Error('Unknown unit ' + units);
+        }
+    }
+}
+
+// TODO: Use this.as('ms')?
+export function valueOf () {
+    return (
+        this._milliseconds +
+        this._days * 864e5 +
+        (this._months % 12) * 2592e6 +
+        toInt(this._months / 12) * 31536e6
+    );
+}
+
+function makeAs (alias) {
+    return function () {
+        return this.as(alias);
+    };
+}
+
+export var asMilliseconds = makeAs('ms');
+export var asSeconds      = makeAs('s');
+export var asMinutes      = makeAs('m');
+export var asHours        = makeAs('h');
+export var asDays         = makeAs('d');
+export var asWeeks        = makeAs('w');
+export var asMonths       = makeAs('M');
+export var asYears        = makeAs('y');
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/bubble.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/bubble.js
new file mode 100644
index 000000000..3dae6b249
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/bubble.js
@@ -0,0 +1,54 @@
+import absFloor from '../utils/abs-floor';
+
+export function bubble () {
+    var milliseconds = this._milliseconds;
+    var days         = this._days;
+    var months       = this._months;
+    var data         = this._data;
+    var seconds, minutes, hours, years = 0;
+
+    // The following code bubbles up values, see the tests for
+    // examples of what that means.
+    data.milliseconds = milliseconds % 1000;
+
+    seconds           = absFloor(milliseconds / 1000);
+    data.seconds      = seconds % 60;
+
+    minutes           = absFloor(seconds / 60);
+    data.minutes      = minutes % 60;
+
+    hours             = absFloor(minutes / 60);
+    data.hours        = hours % 24;
+
+    days += absFloor(hours / 24);
+
+    // Accurately convert days to years, assume start from year 0.
+    years = absFloor(daysToYears(days));
+    days -= absFloor(yearsToDays(years));
+
+    // 30 days to a month
+    // TODO (iskren): Use anchor date (like 1st Jan) to compute this.
+    months += absFloor(days / 30);
+    days   %= 30;
+
+    // 12 months -> 1 year
+    years  += absFloor(months / 12);
+    months %= 12;
+
+    data.days   = days;
+    data.months = months;
+    data.years  = years;
+
+    return this;
+}
+
+export function daysToYears (days) {
+    // 400 years have 146097 days (taking into account leap year rules)
+    return days * 400 / 146097;
+}
+
+export function yearsToDays (years) {
+    // years * 365 + absFloor(years / 4) -
+    //     absFloor(years / 100) + absFloor(years / 400);
+    return years * 146097 / 400;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/constructor.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/constructor.js
new file mode 100644
index 000000000..884c6f8c8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/constructor.js
@@ -0,0 +1,41 @@
+import { normalizeObjectUnits } from '../units/aliases';
+import { getLocale } from '../locale/locales';
+
+export function Duration (duration) {
+    var normalizedInput = normalizeObjectUnits(duration),
+        years = normalizedInput.year || 0,
+        quarters = normalizedInput.quarter || 0,
+        months = normalizedInput.month || 0,
+        weeks = normalizedInput.week || 0,
+        days = normalizedInput.day || 0,
+        hours = normalizedInput.hour || 0,
+        minutes = normalizedInput.minute || 0,
+        seconds = normalizedInput.second || 0,
+        milliseconds = normalizedInput.millisecond || 0;
+
+    // representation for dateAddRemove
+    this._milliseconds = +milliseconds +
+        seconds * 1e3 + // 1000
+        minutes * 6e4 + // 1000 * 60
+        hours * 36e5; // 1000 * 60 * 60
+    // Because of dateAddRemove treats 24 hours as different from a
+    // day when working around DST, we need to store them separately
+    this._days = +days +
+        weeks * 7;
+    // It is impossible translate months into days without knowing
+    // which months you are are talking about, so we have to store
+    // it separately.
+    this._months = +months +
+        quarters * 3 +
+        years * 12;
+
+    this._data = {};
+
+    this._locale = getLocale();
+
+    this._bubble();
+}
+
+export function isDuration (obj) {
+    return obj instanceof Duration;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/create.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/create.js
new file mode 100644
index 000000000..15f05dead
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/create.js
@@ -0,0 +1,113 @@
+import { Duration, isDuration } from './constructor';
+import toInt from '../utils/to-int';
+import hasOwnProp from '../utils/has-own-prop';
+import { DATE, HOUR, MINUTE, SECOND, MILLISECOND } from '../units/constants';
+import { cloneWithOffset } from '../units/offset';
+import { createLocal } from '../create/local';
+
+// ASP.NET json date format regex
+var aspNetRegex = /(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/;
+
+// from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+// somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+var isoRegex = /^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;
+
+export function createDuration (input, key) {
+    var duration = input,
+        // matching against regexp is expensive, do it on demand
+        match = null,
+        sign,
+        ret,
+        diffRes;
+
+    if (isDuration(input)) {
+        duration = {
+            ms : input._milliseconds,
+            d  : input._days,
+            M  : input._months
+        };
+    } else if (typeof input === 'number') {
+        duration = {};
+        if (key) {
+            duration[key] = input;
+        } else {
+            duration.milliseconds = input;
+        }
+    } else if (!!(match = aspNetRegex.exec(input))) {
+        sign = (match[1] === '-') ? -1 : 1;
+        duration = {
+            y  : 0,
+            d  : toInt(match[DATE])        * sign,
+            h  : toInt(match[HOUR])        * sign,
+            m  : toInt(match[MINUTE])      * sign,
+            s  : toInt(match[SECOND])      * sign,
+            ms : toInt(match[MILLISECOND]) * sign
+        };
+    } else if (!!(match = isoRegex.exec(input))) {
+        sign = (match[1] === '-') ? -1 : 1;
+        duration = {
+            y : parseIso(match[2], sign),
+            M : parseIso(match[3], sign),
+            d : parseIso(match[4], sign),
+            h : parseIso(match[5], sign),
+            m : parseIso(match[6], sign),
+            s : parseIso(match[7], sign),
+            w : parseIso(match[8], sign)
+        };
+    } else if (duration == null) {// checks for null or undefined
+        duration = {};
+    } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
+        diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
+
+        duration = {};
+        duration.ms = diffRes.milliseconds;
+        duration.M = diffRes.months;
+    }
+
+    ret = new Duration(duration);
+
+    if (isDuration(input) && hasOwnProp(input, '_locale')) {
+        ret._locale = input._locale;
+    }
+
+    return ret;
+}
+
+createDuration.fn = Duration.prototype;
+
+function parseIso (inp, sign) {
+    // We'd normally use ~~inp for this, but unfortunately it also
+    // converts floats to ints.
+    // inp may be undefined, so careful calling replace on it.
+    var res = inp && parseFloat(inp.replace(',', '.'));
+    // apply sign while we're at it
+    return (isNaN(res) ? 0 : res) * sign;
+}
+
+function positiveMomentsDifference(base, other) {
+    var res = {milliseconds: 0, months: 0};
+
+    res.months = other.month() - base.month() +
+        (other.year() - base.year()) * 12;
+    if (base.clone().add(res.months, 'M').isAfter(other)) {
+        --res.months;
+    }
+
+    res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
+
+    return res;
+}
+
+function momentsDifference(base, other) {
+    var res;
+    other = cloneWithOffset(other, base);
+    if (base.isBefore(other)) {
+        res = positiveMomentsDifference(base, other);
+    } else {
+        res = positiveMomentsDifference(other, base);
+        res.milliseconds = -res.milliseconds;
+        res.months = -res.months;
+    }
+
+    return res;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/duration.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/duration.js
new file mode 100644
index 000000000..24440bb2b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/duration.js
@@ -0,0 +1,12 @@
+// Side effect imports
+import './prototype';
+
+import { createDuration } from './create';
+import { isDuration } from './constructor';
+import { getSetRelativeTimeThreshold } from './humanize';
+
+export {
+    createDuration,
+    isDuration,
+    getSetRelativeTimeThreshold
+};
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/get.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/get.js
new file mode 100644
index 000000000..6dafacdd8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/get.js
@@ -0,0 +1,25 @@
+import { normalizeUnits } from '../units/aliases';
+import absFloor from '../utils/abs-floor';
+
+export function get (units) {
+    units = normalizeUnits(units);
+    return this[units + 's']();
+}
+
+function makeGetter(name) {
+    return function () {
+        return this._data[name];
+    };
+}
+
+export var milliseconds = makeGetter('milliseconds');
+export var seconds      = makeGetter('seconds');
+export var minutes      = makeGetter('minutes');
+export var hours        = makeGetter('hours');
+export var days         = makeGetter('days');
+export var months       = makeGetter('months');
+export var years        = makeGetter('years');
+
+export function weeks () {
+    return absFloor(this.days() / 7);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/humanize.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/humanize.js
new file mode 100644
index 000000000..d6dd83b04
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/humanize.js
@@ -0,0 +1,64 @@
+import { createDuration } from './create';
+
+var round = Math.round;
+var thresholds = {
+    s: 45,  // seconds to minute
+    m: 45,  // minutes to hour
+    h: 22,  // hours to day
+    d: 26,  // days to month
+    M: 11   // months to year
+};
+
+// helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+    return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+}
+
+function relativeTime (posNegDuration, withoutSuffix, locale) {
+    var duration = createDuration(posNegDuration).abs();
+    var seconds  = round(duration.as('s'));
+    var minutes  = round(duration.as('m'));
+    var hours    = round(duration.as('h'));
+    var days     = round(duration.as('d'));
+    var months   = round(duration.as('M'));
+    var years    = round(duration.as('y'));
+
+    var a = seconds < thresholds.s && ['s', seconds]  ||
+            minutes === 1          && ['m']           ||
+            minutes < thresholds.m && ['mm', minutes] ||
+            hours   === 1          && ['h']           ||
+            hours   < thresholds.h && ['hh', hours]   ||
+            days    === 1          && ['d']           ||
+            days    < thresholds.d && ['dd', days]    ||
+            months  === 1          && ['M']           ||
+            months  < thresholds.M && ['MM', months]  ||
+            years   === 1          && ['y']           || ['yy', years];
+
+    a[2] = withoutSuffix;
+    a[3] = +posNegDuration > 0;
+    a[4] = locale;
+    return substituteTimeAgo.apply(null, a);
+}
+
+// This function allows you to set a threshold for relative time strings
+export function getSetRelativeTimeThreshold (threshold, limit) {
+    if (thresholds[threshold] === undefined) {
+        return false;
+    }
+    if (limit === undefined) {
+        return thresholds[threshold];
+    }
+    thresholds[threshold] = limit;
+    return true;
+}
+
+export function humanize (withSuffix) {
+    var locale = this.localeData();
+    var output = relativeTime(this, !withSuffix, locale);
+
+    if (withSuffix) {
+        output = locale.pastFuture(+this, output);
+    }
+
+    return locale.postformat(output);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/iso-string.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/iso-string.js
new file mode 100644
index 000000000..2670a9d33
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/iso-string.js
@@ -0,0 +1,28 @@
+var abs = Math.abs;
+
+export function toISOString() {
+    // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+    var Y = abs(this.years());
+    var M = abs(this.months());
+    var D = abs(this.days());
+    var h = abs(this.hours());
+    var m = abs(this.minutes());
+    var s = abs(this.seconds() + this.milliseconds() / 1000);
+    var total = this.asSeconds();
+
+    if (!total) {
+        // this is the same as C#'s (Noda) and python (isodate)...
+        // but not other JS (goog.date)
+        return 'P0D';
+    }
+
+    return (total < 0 ? '-' : '') +
+        'P' +
+        (Y ? Y + 'Y' : '') +
+        (M ? M + 'M' : '') +
+        (D ? D + 'D' : '') +
+        ((h || m || s) ? 'T' : '') +
+        (h ? h + 'H' : '') +
+        (m ? m + 'M' : '') +
+        (s ? s + 'S' : '');
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/duration/prototype.js b/turtles/app/lib/bower_components/momentjs/src/lib/duration/prototype.js
new file mode 100644
index 000000000..0257ff9b5
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/duration/prototype.js
@@ -0,0 +1,48 @@
+import { Duration } from './constructor';
+
+var proto = Duration.prototype;
+
+import { abs } from './abs';
+import { add, subtract } from './add-subtract';
+import { as, asMilliseconds, asSeconds, asMinutes, asHours, asDays, asWeeks, asMonths, asYears, valueOf } from './as';
+import { bubble } from './bubble';
+import { get, milliseconds, seconds, minutes, hours, days, months, years, weeks } from './get';
+import { humanize } from './humanize';
+import { toISOString } from './iso-string';
+import { lang, locale, localeData } from '../moment/locale';
+
+proto.abs            = abs;
+proto.add            = add;
+proto.subtract       = subtract;
+proto.as             = as;
+proto.asMilliseconds = asMilliseconds;
+proto.asSeconds      = asSeconds;
+proto.asMinutes      = asMinutes;
+proto.asHours        = asHours;
+proto.asDays         = asDays;
+proto.asWeeks        = asWeeks;
+proto.asMonths       = asMonths;
+proto.asYears        = asYears;
+proto.valueOf        = valueOf;
+proto._bubble        = bubble;
+proto.get            = get;
+proto.milliseconds   = milliseconds;
+proto.seconds        = seconds;
+proto.minutes        = minutes;
+proto.hours          = hours;
+proto.days           = days;
+proto.weeks          = weeks;
+proto.months         = months;
+proto.years          = years;
+proto.humanize       = humanize;
+proto.toISOString    = toISOString;
+proto.toString       = toISOString;
+proto.toJSON         = toISOString;
+proto.locale         = locale;
+proto.localeData     = localeData;
+
+// Deprecations
+import { deprecate } from '../utils/deprecate';
+
+proto.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString);
+proto.lang = lang;
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/format/format.js b/turtles/app/lib/bower_components/momentjs/src/lib/format/format.js
new file mode 100644
index 000000000..565da01e2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/format/format.js
@@ -0,0 +1,95 @@
+import zeroFill from '../utils/zero-fill';
+
+export var formattingTokens = /(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g;
+
+var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
+
+var formatFunctions = {};
+
+export var formatTokenFunctions = {};
+
+// token:    'M'
+// padded:   ['MM', 2]
+// ordinal:  'Mo'
+// callback: function () { this.month() + 1 }
+export function addFormatToken (token, padded, ordinal, callback) {
+    var func = callback;
+    if (typeof callback === 'string') {
+        func = function () {
+            return this[callback]();
+        };
+    }
+    if (token) {
+        formatTokenFunctions[token] = func;
+    }
+    if (padded) {
+        formatTokenFunctions[padded[0]] = function () {
+            return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+        };
+    }
+    if (ordinal) {
+        formatTokenFunctions[ordinal] = function () {
+            return this.localeData().ordinal(func.apply(this, arguments), token);
+        };
+    }
+}
+
+function removeFormattingTokens(input) {
+    if (input.match(/\[[\s\S]/)) {
+        return input.replace(/^\[|\]$/g, '');
+    }
+    return input.replace(/\\/g, '');
+}
+
+function makeFormatFunction(format) {
+    var array = format.match(formattingTokens), i, length;
+
+    for (i = 0, length = array.length; i < length; i++) {
+        if (formatTokenFunctions[array[i]]) {
+            array[i] = formatTokenFunctions[array[i]];
+        } else {
+            array[i] = removeFormattingTokens(array[i]);
+        }
+    }
+
+    return function (mom) {
+        var output = '';
+        for (i = 0; i < length; i++) {
+            output += array[i] instanceof Function ? array[i].call(mom, format) : array[i];
+        }
+        return output;
+    };
+}
+
+// format date using native date object
+export function formatMoment(m, format) {
+    if (!m.isValid()) {
+        return m.localeData().invalidDate();
+    }
+
+    format = expandFormat(format, m.localeData());
+
+    if (!formatFunctions[format]) {
+        formatFunctions[format] = makeFormatFunction(format);
+    }
+
+    return formatFunctions[format](m);
+}
+
+export function expandFormat(format, locale) {
+    var i = 5;
+
+    function replaceLongDateFormatTokens(input) {
+        return locale.longDateFormat(input) || input;
+    }
+
+    localFormattingTokens.lastIndex = 0;
+    while (i >= 0 && localFormattingTokens.test(format)) {
+        format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+        localFormattingTokens.lastIndex = 0;
+        i -= 1;
+    }
+
+    return format;
+}
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/calendar.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/calendar.js
new file mode 100644
index 000000000..22545b964
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/calendar.js
@@ -0,0 +1,13 @@
+export var defaultCalendar = {
+    sameDay : '[Today at] LT',
+    nextDay : '[Tomorrow at] LT',
+    nextWeek : 'dddd [at] LT',
+    lastDay : '[Yesterday at] LT',
+    lastWeek : '[Last] dddd [at] LT',
+    sameElse : 'L'
+};
+
+export function calendar (key, mom, now) {
+    var output = this._calendar[key];
+    return typeof output === 'function' ? output.call(mom, now) : output;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/constructor.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/constructor.js
new file mode 100644
index 000000000..2c17b5d00
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/constructor.js
@@ -0,0 +1,2 @@
+export function Locale() {
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/en.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/en.js
new file mode 100644
index 000000000..20964cd9c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/en.js
@@ -0,0 +1,15 @@
+import './prototype';
+import { getSetGlobalLocale } from './locales';
+import toInt from '../utils/to-int';
+
+getSetGlobalLocale('en', {
+    ordinalParse: /\d{1,2}(th|st|nd|rd)/,
+    ordinal : function (number) {
+        var b = number % 10,
+            output = (toInt(number % 100 / 10) === 1) ? 'th' :
+            (b === 1) ? 'st' :
+            (b === 2) ? 'nd' :
+            (b === 3) ? 'rd' : 'th';
+        return number + output;
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/formats.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/formats.js
new file mode 100644
index 000000000..22b75ad34
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/formats.js
@@ -0,0 +1,19 @@
+export var defaultLongDateFormat = {
+    LTS  : 'h:mm:ss A',
+    LT   : 'h:mm A',
+    L    : 'MM/DD/YYYY',
+    LL   : 'MMMM D, YYYY',
+    LLL  : 'MMMM D, YYYY LT',
+    LLLL : 'dddd, MMMM D, YYYY LT'
+};
+
+export function longDateFormat (key) {
+    var output = this._longDateFormat[key];
+    if (!output && this._longDateFormat[key.toUpperCase()]) {
+        output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) {
+            return val.slice(1);
+        });
+        this._longDateFormat[key] = output;
+    }
+    return output;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/invalid.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/invalid.js
new file mode 100644
index 000000000..e9096339b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/invalid.js
@@ -0,0 +1,5 @@
+export var defaultInvalidDate = 'Invalid date';
+
+export function invalidDate () {
+    return this._invalidDate;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/lists.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/lists.js
new file mode 100644
index 000000000..ea0161ab9
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/lists.js
@@ -0,0 +1,48 @@
+import { getLocale } from './locales';
+import { createUTC } from '../create/utc';
+
+function get (format, index, field, setter) {
+    var locale = getLocale();
+    var utc = createUTC().set(setter, index);
+    return locale[field](utc, format);
+}
+
+function list (format, index, field, count, setter) {
+    if (typeof format === 'number') {
+        index = format;
+        format = undefined;
+    }
+
+    format = format || '';
+
+    if (index != null) {
+        return get(format, index, field, setter);
+    }
+
+    var i;
+    var out = [];
+    for (i = 0; i < count; i++) {
+        out[i] = get(format, i, field, setter);
+    }
+    return out;
+}
+
+export function listMonths (format, index) {
+    return list(format, index, 'months', 12, 'month');
+}
+
+export function listMonthsShort (format, index) {
+    return list(format, index, 'monthsShort', 12, 'month');
+}
+
+export function listWeekdays (format, index) {
+    return list(format, index, 'weekdays', 7, 'day');
+}
+
+export function listWeekdaysShort (format, index) {
+    return list(format, index, 'weekdaysShort', 7, 'day');
+}
+
+export function listWeekdaysMin (format, index) {
+    return list(format, index, 'weekdaysMin', 7, 'day');
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/locale.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/locale.js
new file mode 100644
index 000000000..2fc3c46ff
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/locale.js
@@ -0,0 +1,35 @@
+// Side effect imports
+import './prototype';
+
+import {
+    getSetGlobalLocale,
+    defineLocale,
+    getLocale
+} from './locales';
+
+import {
+    listMonths,
+    listMonthsShort,
+    listWeekdays,
+    listWeekdaysShort,
+    listWeekdaysMin
+} from './lists';
+
+export {
+    getSetGlobalLocale,
+    defineLocale,
+    getLocale,
+    listMonths,
+    listMonthsShort,
+    listWeekdays,
+    listWeekdaysShort,
+    listWeekdaysMin
+};
+
+import { deprecate } from '../utils/deprecate';
+import { hooks } from '../utils/hooks';
+
+hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
+hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
+
+import './en';
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/locales.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/locales.js
new file mode 100644
index 000000000..0e58dedfe
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/locales.js
@@ -0,0 +1,119 @@
+import isArray from '../utils/is-array';
+import compareArrays from '../utils/compare-arrays';
+import { Locale } from './constructor';
+
+// internal storage for locale config files
+var locales = {};
+var globalLocale;
+
+function normalizeLocale(key) {
+    return key ? key.toLowerCase().replace('_', '-') : key;
+}
+
+// pick the locale from the array
+// try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+// substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+function chooseLocale(names) {
+    var i = 0, j, next, locale, split;
+
+    while (i < names.length) {
+        split = normalizeLocale(names[i]).split('-');
+        j = split.length;
+        next = normalizeLocale(names[i + 1]);
+        next = next ? next.split('-') : null;
+        while (j > 0) {
+            locale = loadLocale(split.slice(0, j).join('-'));
+            if (locale) {
+                return locale;
+            }
+            if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+                //the next array item is better than a shallower substring of this one
+                break;
+            }
+            j--;
+        }
+        i++;
+    }
+    return null;
+}
+
+function loadLocale(name) {
+    var oldLocale = null;
+    // TODO: Find a better way to register and load all the locales in Node
+    if (!locales[name] && typeof module !== 'undefined' &&
+            module && module.exports) {
+        try {
+            oldLocale = globalLocale._abbr;
+            require('./locale/' + name);
+            // because defineLocale currently also sets the global locale, we
+            // want to undo that for lazy loaded locales
+            getSetGlobalLocale(oldLocale);
+        } catch (e) { }
+    }
+    return locales[name];
+}
+
+// This function will load locale and then set the global locale.  If
+// no arguments are passed in, it will simply return the current global
+// locale key.
+export function getSetGlobalLocale (key, values) {
+    var data;
+    if (key) {
+        if (typeof values === 'undefined') {
+            data = getLocale(key);
+        }
+        else {
+            data = defineLocale(key, values);
+        }
+
+        if (data) {
+            // moment.duration._locale = moment._locale = data;
+            globalLocale = data;
+        }
+    }
+
+    return globalLocale._abbr;
+}
+
+export function defineLocale (name, values) {
+    if (values !== null) {
+        values.abbr = name;
+        if (!locales[name]) {
+            locales[name] = new Locale();
+        }
+        locales[name].set(values);
+
+        // backwards compat for now: also set the locale
+        getSetGlobalLocale(name);
+
+        return locales[name];
+    } else {
+        // useful for testing
+        delete locales[name];
+        return null;
+    }
+}
+
+// returns locale data
+export function getLocale (key) {
+    var locale;
+
+    if (key && key._locale && key._locale._abbr) {
+        key = key._locale._abbr;
+    }
+
+    if (!key) {
+        return globalLocale;
+    }
+
+    if (!isArray(key)) {
+        //short-circuit everything else
+        locale = loadLocale(key);
+        if (locale) {
+            return locale;
+        }
+        key = [key];
+    }
+
+    return chooseLocale(key);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/ordinal.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/ordinal.js
new file mode 100644
index 000000000..0028aca02
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/ordinal.js
@@ -0,0 +1,7 @@
+export var defaultOrdinal = '%d';
+export var defaultOrdinalParse = /\d{1,2}/;
+
+export function ordinal (number) {
+    return this._ordinal.replace('%d', number);
+}
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/pre-post-format.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/pre-post-format.js
new file mode 100644
index 000000000..10ed20584
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/pre-post-format.js
@@ -0,0 +1,3 @@
+export function preParsePostFormat (string) {
+    return string;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/prototype.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/prototype.js
new file mode 100644
index 000000000..ed02d4f3b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/prototype.js
@@ -0,0 +1,70 @@
+import { Locale } from './constructor';
+
+var proto = Locale.prototype;
+
+import { defaultCalendar, calendar } from './calendar';
+import { defaultLongDateFormat, longDateFormat } from './formats';
+import { defaultInvalidDate, invalidDate } from './invalid';
+import { defaultOrdinal, ordinal, defaultOrdinalParse } from './ordinal';
+import { preParsePostFormat } from './pre-post-format';
+import { defaultRelativeTime, relativeTime, pastFuture } from './relative';
+import { set } from './set';
+
+proto._calendar       = defaultCalendar;
+proto.calendar        = calendar;
+proto._longDateFormat = defaultLongDateFormat;
+proto.longDateFormat  = longDateFormat;
+proto._invalidDate    = defaultInvalidDate;
+proto.invalidDate     = invalidDate;
+proto._ordinal        = defaultOrdinal;
+proto.ordinal         = ordinal;
+proto._ordinalParse   = defaultOrdinalParse;
+proto.preparse        = preParsePostFormat;
+proto.postformat      = preParsePostFormat;
+proto._relativeTime   = defaultRelativeTime;
+proto.relativeTime    = relativeTime;
+proto.pastFuture      = pastFuture;
+proto.set             = set;
+
+// Month
+import {
+    localeMonthsParse,
+    defaultLocaleMonths,      localeMonths,
+    defaultLocaleMonthsShort, localeMonthsShort
+} from '../units/month';
+
+proto.months       =        localeMonths;
+proto._months      = defaultLocaleMonths;
+proto.monthsShort  =        localeMonthsShort;
+proto._monthsShort = defaultLocaleMonthsShort;
+proto.monthsParse  =        localeMonthsParse;
+
+// Week
+import { localeWeek, defaultLocaleWeek, localeFirstDayOfYear, localeFirstDayOfWeek } from '../units/week';
+proto.week = localeWeek;
+proto._week = defaultLocaleWeek;
+proto.firstDayOfYear = localeFirstDayOfYear;
+proto.firstDayOfWeek = localeFirstDayOfWeek;
+
+// Day of Week
+import {
+    localeWeekdaysParse,
+    defaultLocaleWeekdays,      localeWeekdays,
+    defaultLocaleWeekdaysMin,   localeWeekdaysMin,
+    defaultLocaleWeekdaysShort, localeWeekdaysShort
+} from '../units/day-of-week';
+
+proto.weekdays       =        localeWeekdays;
+proto._weekdays      = defaultLocaleWeekdays;
+proto.weekdaysMin    =        localeWeekdaysMin;
+proto._weekdaysMin   = defaultLocaleWeekdaysMin;
+proto.weekdaysShort  =        localeWeekdaysShort;
+proto._weekdaysShort = defaultLocaleWeekdaysShort;
+proto.weekdaysParse  =        localeWeekdaysParse;
+
+// Hours
+import { localeIsPM, defaultLocaleMeridiemParse, localeMeridiem } from '../units/hour';
+
+proto.isPM = localeIsPM;
+proto._meridiemParse = defaultLocaleMeridiemParse;
+proto.meridiem = localeMeridiem;
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/relative.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/relative.js
new file mode 100644
index 000000000..5986a6754
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/relative.js
@@ -0,0 +1,27 @@
+export var defaultRelativeTime = {
+    future : 'in %s',
+    past   : '%s ago',
+    s  : 'a few seconds',
+    m  : 'a minute',
+    mm : '%d minutes',
+    h  : 'an hour',
+    hh : '%d hours',
+    d  : 'a day',
+    dd : '%d days',
+    M  : 'a month',
+    MM : '%d months',
+    y  : 'a year',
+    yy : '%d years'
+};
+
+export function relativeTime (number, withoutSuffix, string, isFuture) {
+    var output = this._relativeTime[string];
+    return (typeof output === 'function') ?
+        output(number, withoutSuffix, string, isFuture) :
+        output.replace(/%d/i, number);
+}
+
+export function pastFuture (diff, output) {
+    var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+    return typeof format === 'function' ? format(output) : format.replace(/%s/i, output);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/locale/set.js b/turtles/app/lib/bower_components/momentjs/src/lib/locale/set.js
new file mode 100644
index 000000000..32db2ad79
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/locale/set.js
@@ -0,0 +1,14 @@
+export function set (config) {
+    var prop, i;
+    for (i in config) {
+        prop = config[i];
+        if (typeof prop === 'function') {
+            this[i] = prop;
+        } else {
+            this['_' + i] = prop;
+        }
+    }
+    // Lenient ordinal parsing accepts just a number in addition to
+    // number + (possibly) stuff coming from _ordinalParseLenient.
+    this._ordinalParseLenient = new RegExp(this._ordinalParse.source + '|' + (/\d{1,2}/).source);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/add-subtract.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/add-subtract.js
new file mode 100644
index 000000000..ebfe674b2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/add-subtract.js
@@ -0,0 +1,46 @@
+import { get, set } from './get-set';
+import { setMonth } from '../units/month';
+import { createDuration } from '../duration/create';
+import { deprecateSimple } from '../utils/deprecate';
+import { hooks } from '../utils/hooks';
+
+// TODO: remove 'name' arg after deprecation is removed
+function createAdder(direction, name) {
+    return function (val, period) {
+        var dur, tmp;
+        //invert the arguments, but complain about it
+        if (period !== null && !isNaN(+period)) {
+            deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period).');
+            tmp = val; val = period; period = tmp;
+        }
+
+        val = typeof val === 'string' ? +val : val;
+        dur = createDuration(val, period);
+        addSubtract(this, dur, direction);
+        return this;
+    };
+}
+
+export function addSubtract (mom, duration, isAdding, updateOffset) {
+    var milliseconds = duration._milliseconds,
+        days = duration._days,
+        months = duration._months;
+    updateOffset = updateOffset == null ? true : updateOffset;
+
+    if (milliseconds) {
+        mom._d.setTime(+mom._d + milliseconds * isAdding);
+    }
+    if (days) {
+        set(mom, 'Date', get(mom, 'Date') + days * isAdding);
+    }
+    if (months) {
+        setMonth(mom, get(mom, 'Month') + months * isAdding);
+    }
+    if (updateOffset) {
+        hooks.updateOffset(mom, days || months);
+    }
+}
+
+export var add      = createAdder(1, 'add');
+export var subtract = createAdder(-1, 'subtract');
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/calendar.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/calendar.js
new file mode 100644
index 000000000..66d70adcc
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/calendar.js
@@ -0,0 +1,17 @@
+import { createLocal } from '../create/local';
+import { cloneWithOffset } from '../units/offset';
+
+export function calendar (time) {
+    // We want to compare the start of today, vs this.
+    // Getting start-of-today depends on whether we're local/utc/offset or not.
+    var now = time || createLocal(),
+        sod = cloneWithOffset(now, this).startOf('day'),
+        diff = this.diff(sod, 'days', true),
+        format = diff < -6 ? 'sameElse' :
+            diff < -1 ? 'lastWeek' :
+            diff < 0 ? 'lastDay' :
+            diff < 1 ? 'sameDay' :
+            diff < 2 ? 'nextDay' :
+            diff < 7 ? 'nextWeek' : 'sameElse';
+    return this.format(this.localeData().calendar(format, this, createLocal(now)));
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/clone.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/clone.js
new file mode 100644
index 000000000..d96b328b2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/clone.js
@@ -0,0 +1,5 @@
+import { Moment } from './constructor';
+
+export function clone () {
+    return new Moment(this);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/compare.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/compare.js
new file mode 100644
index 000000000..b6634737a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/compare.js
@@ -0,0 +1,43 @@
+import { isMoment } from './constructor';
+import { normalizeUnits } from '../units/aliases';
+import { createLocal } from '../create/local';
+
+export function isAfter (input, units) {
+    var inputMs;
+    units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+    if (units === 'millisecond') {
+        input = isMoment(input) ? input : createLocal(input);
+        return +this > +input;
+    } else {
+        inputMs = isMoment(input) ? +input : +createLocal(input);
+        return inputMs < +this.clone().startOf(units);
+    }
+}
+
+export function isBefore (input, units) {
+    var inputMs;
+    units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+    if (units === 'millisecond') {
+        input = isMoment(input) ? input : createLocal(input);
+        return +this < +input;
+    } else {
+        inputMs = isMoment(input) ? +input : +createLocal(input);
+        return +this.clone().endOf(units) < inputMs;
+    }
+}
+
+export function isBetween (from, to, units) {
+    return this.isAfter(from, units) && this.isBefore(to, units);
+}
+
+export function isSame (input, units) {
+    var inputMs;
+    units = normalizeUnits(units || 'millisecond');
+    if (units === 'millisecond') {
+        input = isMoment(input) ? input : createLocal(input);
+        return +this === +input;
+    } else {
+        inputMs = +createLocal(input);
+        return +(this.clone().startOf(units)) <= inputMs && inputMs <= +(this.clone().endOf(units));
+    }
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/constructor.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/constructor.js
new file mode 100644
index 000000000..f73559393
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/constructor.js
@@ -0,0 +1,73 @@
+import { hooks } from '../utils/hooks';
+import hasOwnProp from '../utils/has-own-prop';
+import getParsingFlags from '../create/parsing-flags';
+
+// Plugins that add properties should also add the key here (null value),
+// so we can properly clone ourselves.
+var momentProperties = hooks.momentProperties = [];
+
+export function copyConfig(to, from) {
+    var i, prop, val;
+
+    if (typeof from._isAMomentObject !== 'undefined') {
+        to._isAMomentObject = from._isAMomentObject;
+    }
+    if (typeof from._i !== 'undefined') {
+        to._i = from._i;
+    }
+    if (typeof from._f !== 'undefined') {
+        to._f = from._f;
+    }
+    if (typeof from._l !== 'undefined') {
+        to._l = from._l;
+    }
+    if (typeof from._strict !== 'undefined') {
+        to._strict = from._strict;
+    }
+    if (typeof from._tzm !== 'undefined') {
+        to._tzm = from._tzm;
+    }
+    if (typeof from._isUTC !== 'undefined') {
+        to._isUTC = from._isUTC;
+    }
+    if (typeof from._offset !== 'undefined') {
+        to._offset = from._offset;
+    }
+    if (typeof from._pf !== 'undefined') {
+        to._pf = getParsingFlags(from);
+    }
+    if (typeof from._locale !== 'undefined') {
+        to._locale = from._locale;
+    }
+
+    if (momentProperties.length > 0) {
+        for (i in momentProperties) {
+            prop = momentProperties[i];
+            val = from[prop];
+            if (typeof val !== 'undefined') {
+                to[prop] = val;
+            }
+        }
+    }
+
+    return to;
+}
+
+var updateInProgress = false;
+
+// Moment prototype object
+export function Moment(config) {
+    copyConfig(this, config);
+    this._d = new Date(+config._d);
+    // Prevent infinite loop in case updateOffset creates new moment
+    // objects.
+    if (updateInProgress === false) {
+        updateInProgress = true;
+        hooks.updateOffset(this);
+        updateInProgress = false;
+    }
+}
+
+export function isMoment (obj) {
+    return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/diff.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/diff.js
new file mode 100644
index 000000000..2c16d1dc7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/diff.js
@@ -0,0 +1,49 @@
+import absFloor from '../utils/abs-floor';
+import { cloneWithOffset } from '../units/offset';
+import { normalizeUnits } from '../units/aliases';
+
+export function diff (input, units, asFloat) {
+    var that = cloneWithOffset(input, this),
+        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4,
+        delta, output;
+
+    units = normalizeUnits(units);
+
+    if (units === 'year' || units === 'month' || units === 'quarter') {
+        output = monthDiff(this, that);
+        if (units === 'quarter') {
+            output = output / 3;
+        } else if (units === 'year') {
+            output = output / 12;
+        }
+    } else {
+        delta = this - that;
+        output = units === 'second' ? delta / 1e3 : // 1000
+            units === 'minute' ? delta / 6e4 : // 1000 * 60
+            units === 'hour' ? delta / 36e5 : // 1000 * 60 * 60
+            units === 'day' ? (delta - zoneDelta) / 864e5 : // 1000 * 60 * 60 * 24, negate dst
+            units === 'week' ? (delta - zoneDelta) / 6048e5 : // 1000 * 60 * 60 * 24 * 7, negate dst
+            delta;
+    }
+    return asFloat ? output : absFloor(output);
+}
+
+function monthDiff (a, b) {
+    // difference in months
+    var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
+        // b is in (anchor - 1 month, anchor + 1 month)
+        anchor = a.clone().add(wholeMonthDiff, 'months'),
+        anchor2, adjust;
+
+    if (b - anchor < 0) {
+        anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+        // linear across the month
+        adjust = (b - anchor) / (anchor - anchor2);
+    } else {
+        anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+        // linear across the month
+        adjust = (b - anchor) / (anchor2 - anchor);
+    }
+
+    return -(wholeMonthDiff + adjust);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/format.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/format.js
new file mode 100644
index 000000000..4939f389d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/format.js
@@ -0,0 +1,27 @@
+import { formatMoment } from '../format/format';
+import { hooks } from '../utils/hooks';
+
+hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+
+export function toString () {
+    return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+}
+
+export function toISOString () {
+    var m = this.clone().utc();
+    if (0 < m.year() && m.year() <= 9999) {
+        if ('function' === typeof Date.prototype.toISOString) {
+            // native implementation is ~50x faster, use it when we can
+            return this.toDate().toISOString();
+        } else {
+            return formatMoment(m, 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+        }
+    } else {
+        return formatMoment(m, 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]');
+    }
+}
+
+export function format (inputString) {
+    var output = formatMoment(this, inputString || hooks.defaultFormat);
+    return this.localeData().postformat(output);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/from.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/from.js
new file mode 100644
index 000000000..c6a5449ff
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/from.js
@@ -0,0 +1,13 @@
+import { createDuration } from '../duration/create';
+import { createLocal } from '../create/local';
+
+export function from (time, withoutSuffix) {
+    if (!this.isValid()) {
+        return this.localeData().invalidDate();
+    }
+    return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
+}
+
+export function fromNow (withoutSuffix) {
+    return this.from(createLocal(), withoutSuffix);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/get-set.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/get-set.js
new file mode 100644
index 000000000..0f2be6045
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/get-set.js
@@ -0,0 +1,39 @@
+import { normalizeUnits } from '../units/aliases';
+import { hooks } from '../utils/hooks';
+
+export function makeGetSet (unit, keepTime) {
+    return function (value) {
+        if (value != null) {
+            set(this, unit, value);
+            hooks.updateOffset(this, keepTime);
+            return this;
+        } else {
+            return get(this, unit);
+        }
+    };
+}
+
+export function get (mom, unit) {
+    return mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]();
+}
+
+export function set (mom, unit, value) {
+    return mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
+}
+
+// MOMENTS
+
+export function getSet (units, value) {
+    var unit;
+    if (typeof units === 'object') {
+        for (unit in units) {
+            this.set(unit, units[unit]);
+        }
+    } else {
+        units = normalizeUnits(units);
+        if (typeof this[units] === 'function') {
+            return this[units](value);
+        }
+    }
+    return this;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/locale.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/locale.js
new file mode 100644
index 000000000..fb46e6569
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/locale.js
@@ -0,0 +1,34 @@
+import { getLocale } from '../locale/locales';
+import { deprecate } from '../utils/deprecate';
+
+// If passed a locale key, it will set the locale for this
+// instance.  Otherwise, it will return the locale configuration
+// variables for this instance.
+export function locale (key) {
+    var newLocaleData;
+
+    if (key === undefined) {
+        return this._locale._abbr;
+    } else {
+        newLocaleData = getLocale(key);
+        if (newLocaleData != null) {
+            this._locale = newLocaleData;
+        }
+        return this;
+    }
+}
+
+export var lang = deprecate(
+    'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+    function (key) {
+        if (key === undefined) {
+            return this.localeData();
+        } else {
+            return this.locale(key);
+        }
+    }
+);
+
+export function localeData () {
+    return this._locale;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/min-max.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/min-max.js
new file mode 100644
index 000000000..c4a88d24e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/min-max.js
@@ -0,0 +1,54 @@
+import { deprecate } from '../utils/deprecate';
+import isArray from '../utils/is-array';
+import { createLocal } from '../create/local';
+
+export var prototypeMin = deprecate(
+     'moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548',
+     function () {
+         var other = createLocal.apply(null, arguments);
+         return other < this ? this : other;
+     }
+ );
+
+export var prototypeMax = deprecate(
+    'moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548',
+    function () {
+        var other = createLocal.apply(null, arguments);
+        return other > this ? this : other;
+    }
+);
+
+// Pick a moment m from moments so that m[fn](other) is true for all
+// other. This relies on the function fn to be transitive.
+//
+// moments should either be an array of moment objects or an array, whose
+// first element is an array of moment objects.
+function pickBy(fn, moments) {
+    var res, i;
+    if (moments.length === 1 && isArray(moments[0])) {
+        moments = moments[0];
+    }
+    if (!moments.length) {
+        return createLocal();
+    }
+    res = moments[0];
+    for (i = 1; i < moments.length; ++i) {
+        if (moments[i][fn](res)) {
+            res = moments[i];
+        }
+    }
+    return res;
+}
+
+// TODO: Use [].sort instead?
+export function min () {
+    var args = [].slice.call(arguments, 0);
+
+    return pickBy('isBefore', args);
+}
+
+export function max () {
+    var args = [].slice.call(arguments, 0);
+
+    return pickBy('isAfter', args);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/moment.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/moment.js
new file mode 100644
index 000000000..cf73b9f71
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/moment.js
@@ -0,0 +1,26 @@
+import { createLocal } from '../create/local';
+import { createUTC } from '../create/utc';
+import { createInvalid } from '../create/valid';
+import { isMoment } from './constructor';
+import { min, max } from './min-max';
+import momentPrototype from './prototype';
+
+function createUnix (input) {
+    return createLocal(input * 1000);
+}
+
+function createInZone () {
+    return createLocal.apply(null, arguments).parseZone();
+}
+
+export {
+    min,
+    max,
+    isMoment,
+    createUTC,
+    createUnix,
+    createLocal,
+    createInZone,
+    createInvalid,
+    momentPrototype
+};
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/prototype.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/prototype.js
new file mode 100644
index 000000000..5601bc0bf
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/prototype.js
@@ -0,0 +1,144 @@
+import { Moment } from './constructor';
+
+var proto = Moment.prototype;
+
+import { add, subtract } from './add-subtract';
+import { calendar } from './calendar';
+import { clone } from './clone';
+import { isBefore, isBetween, isSame, isAfter } from './compare';
+import { diff } from './diff';
+import { format, toString, toISOString } from './format';
+import { from, fromNow } from './from';
+import { to, toNow } from './to';
+import { getSet } from './get-set';
+import { locale, localeData, lang } from './locale';
+import { prototypeMin, prototypeMax } from './min-max';
+import { startOf, endOf } from './start-end-of';
+import { valueOf, toDate, toArray, unix } from './to-type';
+import { isValid, parsingFlags, invalidAt } from './valid';
+
+proto.add          = add;
+proto.calendar     = calendar;
+proto.clone        = clone;
+proto.diff         = diff;
+proto.endOf        = endOf;
+proto.format       = format;
+proto.from         = from;
+proto.fromNow      = fromNow;
+proto.to           = to;
+proto.toNow        = toNow;
+proto.get          = getSet;
+proto.invalidAt    = invalidAt;
+proto.isAfter      = isAfter;
+proto.isBefore     = isBefore;
+proto.isBetween    = isBetween;
+proto.isSame       = isSame;
+proto.isValid      = isValid;
+proto.lang         = lang;
+proto.locale       = locale;
+proto.localeData   = localeData;
+proto.max          = prototypeMax;
+proto.min          = prototypeMin;
+proto.parsingFlags = parsingFlags;
+proto.set          = getSet;
+proto.startOf      = startOf;
+proto.subtract     = subtract;
+proto.toArray      = toArray;
+proto.toDate       = toDate;
+proto.toISOString  = toISOString;
+proto.toJSON       = toISOString;
+proto.toString     = toString;
+proto.unix         = unix;
+proto.valueOf      = valueOf;
+
+// Year
+import { getSetYear, getIsLeapYear } from '../units/year';
+proto.year       = getSetYear;
+proto.isLeapYear = getIsLeapYear;
+
+// Week Year
+import { getSetWeekYear, getSetISOWeekYear, getWeeksInYear, getISOWeeksInYear } from '../units/week-year';
+proto.weekYear    = getSetWeekYear;
+proto.isoWeekYear = getSetISOWeekYear;
+
+// Quarter
+import { getSetQuarter } from '../units/quarter';
+proto.quarter = proto.quarters = getSetQuarter;
+
+// Month
+import { getSetMonth, getDaysInMonth } from '../units/month';
+proto.month       = getSetMonth;
+proto.daysInMonth = getDaysInMonth;
+
+// Week
+import { getSetWeek, getSetISOWeek } from '../units/week';
+proto.week           = proto.weeks        = getSetWeek;
+proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
+proto.weeksInYear    = getWeeksInYear;
+proto.isoWeeksInYear = getISOWeeksInYear;
+
+// Day
+import { getSetDayOfMonth } from '../units/day-of-month';
+import { getSetDayOfWeek, getSetISODayOfWeek, getSetLocaleDayOfWeek } from '../units/day-of-week';
+import { getSetDayOfYear } from '../units/day-of-year';
+proto.date       = getSetDayOfMonth;
+proto.day        = proto.days             = getSetDayOfWeek;
+proto.weekday    = getSetLocaleDayOfWeek;
+proto.isoWeekday = getSetISODayOfWeek;
+proto.dayOfYear  = getSetDayOfYear;
+
+// Hour
+import { getSetHour } from '../units/hour';
+proto.hour = proto.hours = getSetHour;
+
+// Minute
+import { getSetMinute } from '../units/minute';
+proto.minute = proto.minutes = getSetMinute;
+
+// Second
+import { getSetSecond } from '../units/second';
+proto.second = proto.seconds = getSetSecond;
+
+// Millisecond
+import { getSetMillisecond } from '../units/millisecond';
+proto.millisecond = proto.milliseconds = getSetMillisecond;
+
+// Offset
+import {
+    getSetOffset,
+    setOffsetToUTC,
+    setOffsetToLocal,
+    setOffsetToParsedOffset,
+    hasAlignedHourOffset,
+    isDaylightSavingTime,
+    isDaylightSavingTimeShifted,
+    getSetZone,
+    isLocal,
+    isUtcOffset,
+    isUtc
+} from '../units/offset';
+proto.utcOffset            = getSetOffset;
+proto.utc                  = setOffsetToUTC;
+proto.local                = setOffsetToLocal;
+proto.parseZone            = setOffsetToParsedOffset;
+proto.hasAlignedHourOffset = hasAlignedHourOffset;
+proto.isDST                = isDaylightSavingTime;
+proto.isDSTShifted         = isDaylightSavingTimeShifted;
+proto.isLocal              = isLocal;
+proto.isUtcOffset          = isUtcOffset;
+proto.isUtc                = isUtc;
+proto.isUTC                = isUtc;
+
+// Timezone
+import { getZoneAbbr, getZoneName } from '../units/timezone';
+proto.zoneAbbr = getZoneAbbr;
+proto.zoneName = getZoneName;
+
+// Deprecations
+import { deprecate } from '../utils/deprecate';
+proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
+proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
+proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
+proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779', getSetZone);
+
+export default proto;
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/start-end-of.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/start-end-of.js
new file mode 100644
index 000000000..193c8b4a2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/start-end-of.js
@@ -0,0 +1,52 @@
+import { normalizeUnits } from '../units/aliases';
+
+export function startOf (units) {
+    units = normalizeUnits(units);
+    // the following switch intentionally omits break keywords
+    // to utilize falling through the cases.
+    switch (units) {
+    case 'year':
+        this.month(0);
+        /* falls through */
+    case 'quarter':
+    case 'month':
+        this.date(1);
+        /* falls through */
+    case 'week':
+    case 'isoWeek':
+    case 'day':
+        this.hours(0);
+        /* falls through */
+    case 'hour':
+        this.minutes(0);
+        /* falls through */
+    case 'minute':
+        this.seconds(0);
+        /* falls through */
+    case 'second':
+        this.milliseconds(0);
+    }
+
+    // weeks are a special case
+    if (units === 'week') {
+        this.weekday(0);
+    }
+    if (units === 'isoWeek') {
+        this.isoWeekday(1);
+    }
+
+    // quarters are also special
+    if (units === 'quarter') {
+        this.month(Math.floor(this.month() / 3) * 3);
+    }
+
+    return this;
+}
+
+export function endOf (units) {
+    units = normalizeUnits(units);
+    if (units === undefined || units === 'millisecond') {
+        return this;
+    }
+    return this.startOf(units).add(1, (units === 'isoWeek' ? 'week' : units)).subtract(1, 'ms');
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/to-type.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/to-type.js
new file mode 100644
index 000000000..edc1338d1
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/to-type.js
@@ -0,0 +1,16 @@
+export function valueOf () {
+    return +this._d - ((this._offset || 0) * 60000);
+}
+
+export function unix () {
+    return Math.floor(+this / 1000);
+}
+
+export function toDate () {
+    return this._offset ? new Date(+this) : this._d;
+}
+
+export function toArray () {
+    var m = this;
+    return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/to.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/to.js
new file mode 100644
index 000000000..d9eccfde7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/to.js
@@ -0,0 +1,13 @@
+import { createDuration } from '../duration/create';
+import { createLocal } from '../create/local';
+
+export function to (time, withoutSuffix) {
+    if (!this.isValid()) {
+        return this.localeData().invalidDate();
+    }
+    return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
+}
+
+export function toNow (withoutSuffix) {
+    return this.to(createLocal(), withoutSuffix);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/moment/valid.js b/turtles/app/lib/bower_components/momentjs/src/lib/moment/valid.js
new file mode 100644
index 000000000..6c0074293
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/moment/valid.js
@@ -0,0 +1,15 @@
+import { isValid as _isValid } from '../create/valid';
+import extend from '../utils/extend';
+import getParsingFlags from '../create/parsing-flags';
+
+export function isValid () {
+    return _isValid(this);
+}
+
+export function parsingFlags () {
+    return extend({}, getParsingFlags(this));
+}
+
+export function invalidAt () {
+    return getParsingFlags(this).overflow;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/parse/regex.js b/turtles/app/lib/bower_components/momentjs/src/lib/parse/regex.js
new file mode 100644
index 000000000..23091a083
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/parse/regex.js
@@ -0,0 +1,44 @@
+export var match1         = /\d/;            //       0 - 9
+export var match2         = /\d\d/;          //      00 - 99
+export var match3         = /\d{3}/;         //     000 - 999
+export var match4         = /\d{4}/;         //    0000 - 9999
+export var match6         = /[+-]?\d{6}/;    // -999999 - 999999
+export var match1to2      = /\d\d?/;         //       0 - 99
+export var match1to3      = /\d{1,3}/;       //       0 - 999
+export var match1to4      = /\d{1,4}/;       //       0 - 9999
+export var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
+
+export var matchUnsigned  = /\d+/;           //       0 - inf
+export var matchSigned    = /[+-]?\d+/;      //    -inf - inf
+
+export var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
+
+export var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
+
+// any word (or two) characters or numbers including two/three word month in arabic.
+export var matchWord = /[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i;
+
+import hasOwnProp from '../utils/has-own-prop';
+
+var regexes = {};
+
+export function addRegexToken (token, regex, strictRegex) {
+    regexes[token] = typeof regex === 'function' ? regex : function (isStrict) {
+        return (isStrict && strictRegex) ? strictRegex : regex;
+    };
+}
+
+export function getParseRegexForToken (token, config) {
+    if (!hasOwnProp(regexes, token)) {
+        return new RegExp(unescapeFormat(token));
+    }
+
+    return regexes[token](config._strict, config._locale);
+}
+
+// Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+function unescapeFormat(s) {
+    return s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+        return p1 || p2 || p3 || p4;
+    }).replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/parse/token.js b/turtles/app/lib/bower_components/momentjs/src/lib/parse/token.js
new file mode 100644
index 000000000..781b9cf3a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/parse/token.js
@@ -0,0 +1,32 @@
+import hasOwnProp from '../utils/has-own-prop';
+import toInt from '../utils/to-int';
+
+var tokens = {};
+
+export function addParseToken (token, callback) {
+    var i, func = callback;
+    if (typeof token === 'string') {
+        token = [token];
+    }
+    if (typeof callback === 'number') {
+        func = function (input, array) {
+            array[callback] = toInt(input);
+        };
+    }
+    for (i = 0; i < token.length; i++) {
+        tokens[token[i]] = func;
+    }
+}
+
+export function addWeekParseToken (token, callback) {
+    addParseToken(token, function (input, array, config, token) {
+        config._w = config._w || {};
+        callback(input, config._w, config, token);
+    });
+}
+
+export function addTimeToArrayFromToken(token, input, config) {
+    if (input != null && hasOwnProp(tokens, token)) {
+        tokens[token](input, config._a, config, token);
+    }
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/aliases.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/aliases.js
new file mode 100644
index 000000000..4ad513384
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/aliases.js
@@ -0,0 +1,29 @@
+import hasOwnProp from '../utils/has-own-prop';
+
+var aliases = {};
+
+export function addUnitAlias (unit, shorthand) {
+    var lowerCase = unit.toLowerCase();
+    aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+}
+
+export function normalizeUnits(units) {
+    return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
+}
+
+export function normalizeObjectUnits(inputObject) {
+    var normalizedInput = {},
+        normalizedProp,
+        prop;
+
+    for (prop in inputObject) {
+        if (hasOwnProp(inputObject, prop)) {
+            normalizedProp = normalizeUnits(prop);
+            if (normalizedProp) {
+                normalizedInput[normalizedProp] = inputObject[prop];
+            }
+        }
+    }
+
+    return normalizedInput;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/constants.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/constants.js
new file mode 100644
index 000000000..588e70db5
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/constants.js
@@ -0,0 +1,7 @@
+export var YEAR = 0;
+export var MONTH = 1;
+export var DATE = 2;
+export var HOUR = 3;
+export var MINUTE = 4;
+export var SECOND = 5;
+export var MILLISECOND = 6;
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-month.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-month.js
new file mode 100644
index 000000000..dc32acc24
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-month.js
@@ -0,0 +1,32 @@
+import { makeGetSet } from '../moment/get-set';
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match2 } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { DATE } from './constants';
+import toInt from '../utils/to-int';
+
+// FORMATTING
+
+addFormatToken('D', ['DD', 2], 'Do', 'date');
+
+// ALIASES
+
+addUnitAlias('date', 'D');
+
+// PARSING
+
+addRegexToken('D',  match1to2);
+addRegexToken('DD', match1to2, match2);
+addRegexToken('Do', function (isStrict, locale) {
+    return isStrict ? locale._ordinalParse : locale._ordinalParseLenient;
+});
+
+addParseToken(['D', 'DD'], DATE);
+addParseToken('Do', function (input, array) {
+    array[DATE] = toInt(input.match(match1to2)[0], 10);
+});
+
+// MOMENTS
+
+export var getSetDayOfMonth = makeGetSet('Date', true);
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-week.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-week.js
new file mode 100644
index 000000000..7af240837
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-week.js
@@ -0,0 +1,134 @@
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, matchWord } from '../parse/regex';
+import { addWeekParseToken } from '../parse/token';
+import toInt from '../utils/to-int';
+import { createLocal } from '../create/local';
+import getParsingFlags from '../create/parsing-flags';
+
+// FORMATTING
+
+addFormatToken('d', 0, 'do', 'day');
+
+addFormatToken('dd', 0, 0, function (format) {
+    return this.localeData().weekdaysMin(this, format);
+});
+
+addFormatToken('ddd', 0, 0, function (format) {
+    return this.localeData().weekdaysShort(this, format);
+});
+
+addFormatToken('dddd', 0, 0, function (format) {
+    return this.localeData().weekdays(this, format);
+});
+
+addFormatToken('e', 0, 0, 'weekday');
+addFormatToken('E', 0, 0, 'isoWeekday');
+
+// ALIASES
+
+addUnitAlias('day', 'd');
+addUnitAlias('weekday', 'e');
+addUnitAlias('isoWeekday', 'E');
+
+// PARSING
+
+addRegexToken('d',    match1to2);
+addRegexToken('e',    match1to2);
+addRegexToken('E',    match1to2);
+addRegexToken('dd',   matchWord);
+addRegexToken('ddd',  matchWord);
+addRegexToken('dddd', matchWord);
+
+addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config) {
+    var weekday = config._locale.weekdaysParse(input);
+    // if we didn't get a weekday name, mark the date as invalid
+    if (weekday != null) {
+        week.d = weekday;
+    } else {
+        getParsingFlags(config).invalidWeekday = input;
+    }
+});
+
+addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+    week[token] = toInt(input);
+});
+
+// HELPERS
+
+function parseWeekday(input, locale) {
+    if (typeof input === 'string') {
+        if (!isNaN(input)) {
+            input = parseInt(input, 10);
+        }
+        else {
+            input = locale.weekdaysParse(input);
+            if (typeof input !== 'number') {
+                return null;
+            }
+        }
+    }
+    return input;
+}
+
+// LOCALES
+
+export var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
+export function localeWeekdays (m) {
+    return this._weekdays[m.day()];
+}
+
+export var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
+export function localeWeekdaysShort (m) {
+    return this._weekdaysShort[m.day()];
+}
+
+export var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
+export function localeWeekdaysMin (m) {
+    return this._weekdaysMin[m.day()];
+}
+
+export function localeWeekdaysParse (weekdayName) {
+    var i, mom, regex;
+
+    if (!this._weekdaysParse) {
+        this._weekdaysParse = [];
+    }
+
+    for (i = 0; i < 7; i++) {
+        // make the regex if we don't have it already
+        if (!this._weekdaysParse[i]) {
+            mom = createLocal([2000, 1]).day(i);
+            regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+            this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+        }
+        // test the regex
+        if (this._weekdaysParse[i].test(weekdayName)) {
+            return i;
+        }
+    }
+}
+
+// MOMENTS
+
+export function getSetDayOfWeek (input) {
+    var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+    if (input != null) {
+        input = parseWeekday(input, this.localeData());
+        return this.add(input - day, 'd');
+    } else {
+        return day;
+    }
+}
+
+export function getSetLocaleDayOfWeek (input) {
+    var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+    return input == null ? weekday : this.add(input - weekday, 'd');
+}
+
+export function getSetISODayOfWeek (input) {
+    // behaves the same as moment#day except
+    // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+    // as a setter, sunday should belong to the previous week.
+    return input == null ? this.day() || 7 : this.day(this.day() % 7 ? input : input - 7);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-year.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-year.js
new file mode 100644
index 000000000..7c4d2860b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/day-of-year.js
@@ -0,0 +1,49 @@
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match3, match1to3 } from '../parse/regex';
+import { daysInYear } from './year';
+import { createUTCDate } from '../create/date-from-array';
+import { addParseToken } from '../parse/token';
+import toInt from '../utils/to-int';
+
+// FORMATTING
+
+addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
+
+// ALIASES
+
+addUnitAlias('dayOfYear', 'DDD');
+
+// PARSING
+
+addRegexToken('DDD',  match1to3);
+addRegexToken('DDDD', match3);
+addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+    config._dayOfYear = toInt(input);
+});
+
+// HELPERS
+
+//http://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+export function dayOfYearFromWeeks(year, week, weekday, firstDayOfWeekOfYear, firstDayOfWeek) {
+    var d = createUTCDate(year, 0, 1).getUTCDay();
+    var daysToAdd;
+    var dayOfYear;
+
+    d = d === 0 ? 7 : d;
+    weekday = weekday != null ? weekday : firstDayOfWeek;
+    daysToAdd = firstDayOfWeek - d + (d > firstDayOfWeekOfYear ? 7 : 0) - (d < firstDayOfWeek ? 7 : 0);
+    dayOfYear = 7 * (week - 1) + (weekday - firstDayOfWeek) + daysToAdd + 1;
+
+    return {
+        year      : dayOfYear > 0 ? year      : year - 1,
+        dayOfYear : dayOfYear > 0 ? dayOfYear : daysInYear(year - 1) + dayOfYear
+    };
+}
+
+// MOMENTS
+
+export function getSetDayOfYear (input) {
+    var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
+    return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/hour.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/hour.js
new file mode 100644
index 000000000..356c74d23
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/hour.js
@@ -0,0 +1,77 @@
+import { makeGetSet } from '../moment/get-set';
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match2 } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { HOUR } from './constants';
+import toInt from '../utils/to-int';
+import getParsingFlags from '../create/parsing-flags';
+
+// FORMATTING
+
+addFormatToken('H', ['HH', 2], 0, 'hour');
+addFormatToken('h', ['hh', 2], 0, function () {
+    return this.hours() % 12 || 12;
+});
+
+function meridiem (token, lowercase) {
+    addFormatToken(token, 0, 0, function () {
+        return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
+    });
+}
+
+meridiem('a', true);
+meridiem('A', false);
+
+// ALIASES
+
+addUnitAlias('hour', 'h');
+
+// PARSING
+
+function matchMeridiem (isStrict, locale) {
+    return locale._meridiemParse;
+}
+
+addRegexToken('a',  matchMeridiem);
+addRegexToken('A',  matchMeridiem);
+addRegexToken('H',  match1to2);
+addRegexToken('h',  match1to2);
+addRegexToken('HH', match1to2, match2);
+addRegexToken('hh', match1to2, match2);
+
+addParseToken(['H', 'HH'], HOUR);
+addParseToken(['a', 'A'], function (input, array, config) {
+    config._isPm = config._locale.isPM(input);
+    config._meridiem = input;
+});
+addParseToken(['h', 'hh'], function (input, array, config) {
+    array[HOUR] = toInt(input);
+    getParsingFlags(config).bigHour = true;
+});
+
+// LOCALES
+
+export function localeIsPM (input) {
+    // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+    // Using charAt should be more compatible.
+    return ((input + '').toLowerCase().charAt(0) === 'p');
+}
+
+export var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+export function localeMeridiem (hours, minutes, isLower) {
+    if (hours > 11) {
+        return isLower ? 'pm' : 'PM';
+    } else {
+        return isLower ? 'am' : 'AM';
+    }
+}
+
+
+// MOMENTS
+
+// Setting the hour should keep the time, because the user explicitly
+// specified which hour he wants. So trying to maintain the same hour (in
+// a new timezone) makes sense. Adding/subtracting hours does not follow
+// this rule.
+export var getSetHour = makeGetSet('Hours', true);
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/millisecond.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/millisecond.js
new file mode 100644
index 000000000..2fb73af08
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/millisecond.js
@@ -0,0 +1,42 @@
+import { makeGetSet } from '../moment/get-set';
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1, match2, match3, match1to3, matchUnsigned } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { MILLISECOND } from './constants';
+import toInt from '../utils/to-int';
+
+// FORMATTING
+
+addFormatToken('S', 0, 0, function () {
+    return ~~(this.millisecond() / 100);
+});
+
+addFormatToken(0, ['SS', 2], 0, function () {
+    return ~~(this.millisecond() / 10);
+});
+
+function milliseconds (token) {
+    addFormatToken(0, [token, 3], 0, 'millisecond');
+}
+
+milliseconds('SSS');
+milliseconds('SSSS');
+
+// ALIASES
+
+addUnitAlias('millisecond', 'ms');
+
+// PARSING
+
+addRegexToken('S',    match1to3, match1);
+addRegexToken('SS',   match1to3, match2);
+addRegexToken('SSS',  match1to3, match3);
+addRegexToken('SSSS', matchUnsigned);
+addParseToken(['S', 'SS', 'SSS', 'SSSS'], function (input, array) {
+    array[MILLISECOND] = toInt(('0.' + input) * 1000);
+});
+
+// MOMENTS
+
+export var getSetMillisecond = makeGetSet('Milliseconds', false);
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/minute.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/minute.js
new file mode 100644
index 000000000..e9473b863
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/minute.js
@@ -0,0 +1,24 @@
+import { makeGetSet } from '../moment/get-set';
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match2 } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { MINUTE } from './constants';
+
+// FORMATTING
+
+addFormatToken('m', ['mm', 2], 0, 'minute');
+
+// ALIASES
+
+addUnitAlias('minute', 'm');
+
+// PARSING
+
+addRegexToken('m',  match1to2);
+addRegexToken('mm', match1to2, match2);
+addParseToken(['m', 'mm'], MINUTE);
+
+// MOMENTS
+
+export var getSetMinute = makeGetSet('Minutes', false);
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/month.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/month.js
new file mode 100644
index 000000000..63d18b47f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/month.js
@@ -0,0 +1,129 @@
+import { get } from '../moment/get-set';
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match2, matchWord } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { hooks } from '../utils/hooks';
+import { MONTH } from './constants';
+import toInt from '../utils/to-int';
+import { createUTC } from '../create/utc';
+import getParsingFlags from '../create/parsing-flags';
+
+export function daysInMonth(year, month) {
+    return new Date(Date.UTC(year, month + 1, 0)).getUTCDate();
+}
+
+// FORMATTING
+
+addFormatToken('M', ['MM', 2], 'Mo', function () {
+    return this.month() + 1;
+});
+
+addFormatToken('MMM', 0, 0, function (format) {
+    return this.localeData().monthsShort(this, format);
+});
+
+addFormatToken('MMMM', 0, 0, function (format) {
+    return this.localeData().months(this, format);
+});
+
+// ALIASES
+
+addUnitAlias('month', 'M');
+
+// PARSING
+
+addRegexToken('M',    match1to2);
+addRegexToken('MM',   match1to2, match2);
+addRegexToken('MMM',  matchWord);
+addRegexToken('MMMM', matchWord);
+
+addParseToken(['M', 'MM'], function (input, array) {
+    array[MONTH] = toInt(input) - 1;
+});
+
+addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+    var month = config._locale.monthsParse(input, token, config._strict);
+    // if we didn't find a month name, mark the date as invalid.
+    if (month != null) {
+        array[MONTH] = month;
+    } else {
+        getParsingFlags(config).invalidMonth = input;
+    }
+});
+
+// LOCALES
+
+export var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
+export function localeMonths (m) {
+    return this._months[m.month()];
+}
+
+export var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
+export function localeMonthsShort (m) {
+    return this._monthsShort[m.month()];
+}
+
+export function localeMonthsParse (monthName, format, strict) {
+    var i, mom, regex;
+
+    if (!this._monthsParse) {
+        this._monthsParse = [];
+        this._longMonthsParse = [];
+        this._shortMonthsParse = [];
+    }
+
+    for (i = 0; i < 12; i++) {
+        // make the regex if we don't have it already
+        mom = createUTC([2000, i]);
+        if (strict && !this._longMonthsParse[i]) {
+            this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
+            this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
+        }
+        if (!strict && !this._monthsParse[i]) {
+            regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+            this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+        }
+        // test the regex
+        if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
+            return i;
+        } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
+            return i;
+        } else if (!strict && this._monthsParse[i].test(monthName)) {
+            return i;
+        }
+    }
+}
+
+// MOMENTS
+
+export function setMonth (mom, value) {
+    var dayOfMonth;
+
+    // TODO: Move this out of here!
+    if (typeof value === 'string') {
+        value = mom.localeData().monthsParse(value);
+        // TODO: Another silent failure?
+        if (typeof value !== 'number') {
+            return mom;
+        }
+    }
+
+    dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
+    mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
+    return mom;
+}
+
+export function getSetMonth (value) {
+    if (value != null) {
+        setMonth(this, value);
+        hooks.updateOffset(this, true);
+        return this;
+    } else {
+        return get(this, 'Month');
+    }
+}
+
+export function getDaysInMonth () {
+    return daysInMonth(this.year(), this.month());
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/offset.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/offset.js
new file mode 100644
index 000000000..75aeb0211
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/offset.js
@@ -0,0 +1,206 @@
+import zeroFill from '../utils/zero-fill';
+import { createDuration } from '../duration/create';
+import { addSubtract } from '../moment/add-subtract';
+import { isMoment } from '../moment/constructor';
+import { addFormatToken } from '../format/format';
+import { addRegexToken, matchOffset } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { createLocal } from '../create/local';
+import { createUTC } from '../create/utc';
+import isDate from '../utils/is-date';
+import toInt from '../utils/to-int';
+import compareArrays from '../utils/compare-arrays';
+import { hooks } from '../utils/hooks';
+
+// FORMATTING
+
+function offset (token, separator) {
+    addFormatToken(token, 0, 0, function () {
+        var offset = this.utcOffset();
+        var sign = '+';
+        if (offset < 0) {
+            offset = -offset;
+            sign = '-';
+        }
+        return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
+    });
+}
+
+offset('Z', ':');
+offset('ZZ', '');
+
+// PARSING
+
+addRegexToken('Z',  matchOffset);
+addRegexToken('ZZ', matchOffset);
+addParseToken(['Z', 'ZZ'], function (input, array, config) {
+    config._useUTC = true;
+    config._tzm = offsetFromString(input);
+});
+
+// HELPERS
+
+// timezone chunker
+// '+10:00' > ['10',  '00']
+// '-1530'  > ['-15', '30']
+var chunkOffset = /([\+\-]|\d\d)/gi;
+
+function offsetFromString(string) {
+    var matches = ((string || '').match(matchOffset) || []);
+    var chunk   = matches[matches.length - 1] || [];
+    var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+    var minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+    return parts[0] === '+' ? minutes : -minutes;
+}
+
+// Return a moment from input, that is local/utc/zone equivalent to model.
+export function cloneWithOffset(input, model) {
+    var res, diff;
+    if (model._isUTC) {
+        res = model.clone();
+        diff = (isMoment(input) || isDate(input) ? +input : +createLocal(input)) - (+res);
+        // Use low-level api, because this fn is low-level api.
+        res._d.setTime(+res._d + diff);
+        hooks.updateOffset(res, false);
+        return res;
+    } else {
+        return createLocal(input).local();
+    }
+    return model._isUTC ? createLocal(input).zone(model._offset || 0) : createLocal(input).local();
+}
+
+function getDateOffset (m) {
+    // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+    // https://github.com/moment/moment/pull/1871
+    return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
+}
+
+// HOOKS
+
+// This function will be called whenever a moment is mutated.
+// It is intended to keep the offset in sync with the timezone.
+hooks.updateOffset = function () {};
+
+// MOMENTS
+
+// keepLocalTime = true means only change the timezone, without
+// affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+// 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+// +0200, so we adjust the time as needed, to be valid.
+//
+// Keeping the time actually adds/subtracts (one hour)
+// from the actual represented time. That is why we call updateOffset
+// a second time. In case it wants us to change the offset again
+// _changeInProgress == true case, then we have to adjust, because
+// there is no such time in the given timezone.
+export function getSetOffset (input, keepLocalTime) {
+    var offset = this._offset || 0,
+        localAdjust;
+    if (input != null) {
+        if (typeof input === 'string') {
+            input = offsetFromString(input);
+        }
+        if (Math.abs(input) < 16) {
+            input = input * 60;
+        }
+        if (!this._isUTC && keepLocalTime) {
+            localAdjust = getDateOffset(this);
+        }
+        this._offset = input;
+        this._isUTC = true;
+        if (localAdjust != null) {
+            this.add(localAdjust, 'm');
+        }
+        if (offset !== input) {
+            if (!keepLocalTime || this._changeInProgress) {
+                addSubtract(this, createDuration(input - offset, 'm'), 1, false);
+            } else if (!this._changeInProgress) {
+                this._changeInProgress = true;
+                hooks.updateOffset(this, true);
+                this._changeInProgress = null;
+            }
+        }
+        return this;
+    } else {
+        return this._isUTC ? offset : getDateOffset(this);
+    }
+}
+
+export function getSetZone (input, keepLocalTime) {
+    if (input != null) {
+        if (typeof input !== 'string') {
+            input = -input;
+        }
+
+        this.utcOffset(input, keepLocalTime);
+
+        return this;
+    } else {
+        return -this.utcOffset();
+    }
+}
+
+export function setOffsetToUTC (keepLocalTime) {
+    return this.utcOffset(0, keepLocalTime);
+}
+
+export function setOffsetToLocal (keepLocalTime) {
+    if (this._isUTC) {
+        this.utcOffset(0, keepLocalTime);
+        this._isUTC = false;
+
+        if (keepLocalTime) {
+            this.subtract(getDateOffset(this), 'm');
+        }
+    }
+    return this;
+}
+
+export function setOffsetToParsedOffset () {
+    if (this._tzm) {
+        this.utcOffset(this._tzm);
+    } else if (typeof this._i === 'string') {
+        this.utcOffset(offsetFromString(this._i));
+    }
+    return this;
+}
+
+export function hasAlignedHourOffset (input) {
+    if (!input) {
+        input = 0;
+    }
+    else {
+        input = createLocal(input).utcOffset();
+    }
+
+    return (this.utcOffset() - input) % 60 === 0;
+}
+
+export function isDaylightSavingTime () {
+    return (
+        this.utcOffset() > this.clone().month(0).utcOffset() ||
+        this.utcOffset() > this.clone().month(5).utcOffset()
+    );
+}
+
+export function isDaylightSavingTimeShifted () {
+    if (this._a) {
+        var other = this._isUTC ? createUTC(this._a) : createLocal(this._a);
+        return this.isValid() && compareArrays(this._a, other.toArray()) > 0;
+    }
+
+    return false;
+}
+
+export function isLocal () {
+    return !this._isUTC;
+}
+
+export function isUtcOffset () {
+    return this._isUTC;
+}
+
+export function isUtc () {
+    return this._isUTC && this._offset === 0;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/quarter.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/quarter.js
new file mode 100644
index 000000000..d383f561e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/quarter.js
@@ -0,0 +1,27 @@
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1 } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { MONTH } from './constants';
+import toInt from '../utils/to-int';
+
+// FORMATTING
+
+addFormatToken('Q', 0, 0, 'quarter');
+
+// ALIASES
+
+addUnitAlias('quarter', 'Q');
+
+// PARSING
+
+addRegexToken('Q', match1);
+addParseToken('Q', function (input, array) {
+    array[MONTH] = (toInt(input) - 1) * 3;
+});
+
+// MOMENTS
+
+export function getSetQuarter (input) {
+    return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/second.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/second.js
new file mode 100644
index 000000000..118fe3083
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/second.js
@@ -0,0 +1,24 @@
+import { makeGetSet } from '../moment/get-set';
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match2 } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { SECOND } from './constants';
+
+// FORMATTING
+
+addFormatToken('s', ['ss', 2], 0, 'second');
+
+// ALIASES
+
+addUnitAlias('second', 's');
+
+// PARSING
+
+addRegexToken('s',  match1to2);
+addRegexToken('ss', match1to2, match2);
+addParseToken(['s', 'ss'], SECOND);
+
+// MOMENTS
+
+export var getSetSecond = makeGetSet('Seconds', false);
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/timestamp.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/timestamp.js
new file mode 100644
index 000000000..a49e1e4b8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/timestamp.js
@@ -0,0 +1,20 @@
+import { addFormatToken } from '../format/format';
+import { addRegexToken, matchTimestamp, matchSigned } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import toInt from '../utils/to-int';
+
+// FORMATTING
+
+addFormatToken('X', 0, 0, 'unix');
+addFormatToken('x', 0, 0, 'valueOf');
+
+// PARSING
+
+addRegexToken('x', matchSigned);
+addRegexToken('X', matchTimestamp);
+addParseToken('X', function (input, array, config) {
+    config._d = new Date(parseFloat(input, 10) * 1000);
+});
+addParseToken('x', function (input, array, config) {
+    config._d = new Date(toInt(input));
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/timezone.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/timezone.js
new file mode 100644
index 000000000..20c81cd2c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/timezone.js
@@ -0,0 +1,16 @@
+import { addFormatToken } from '../format/format';
+
+// FORMATTING
+
+addFormatToken('z',  0, 0, 'zoneAbbr');
+addFormatToken('zz', 0, 0, 'zoneName');
+
+// MOMENTS
+
+export function getZoneAbbr () {
+    return this._isUTC ? 'UTC' : '';
+}
+
+export function getZoneName () {
+    return this._isUTC ? 'Coordinated Universal Time' : '';
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/units.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/units.js
new file mode 100644
index 000000000..6f45f1c04
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/units.js
@@ -0,0 +1,20 @@
+// Side effect imports
+import './day-of-month';
+import './day-of-week';
+import './day-of-year';
+import './hour';
+import './millisecond';
+import './minute';
+import './month';
+import './offset';
+import './quarter';
+import './second';
+import './timestamp';
+import './timezone';
+import './week-year';
+import './week';
+import './year';
+
+import { normalizeUnits } from './aliases';
+
+export { normalizeUnits };
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/week-year.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/week-year.js
new file mode 100644
index 000000000..8ecfce754
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/week-year.js
@@ -0,0 +1,78 @@
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match1to4, match1to6, match2, match4, match6, matchSigned } from '../parse/regex';
+import { addWeekParseToken } from '../parse/token';
+import { weekOfYear } from './week';
+import toInt from '../utils/to-int';
+import { hooks } from '../utils/hooks';
+import { createLocal } from '../create/local';
+
+// FORMATTING
+
+addFormatToken(0, ['gg', 2], 0, function () {
+    return this.weekYear() % 100;
+});
+
+addFormatToken(0, ['GG', 2], 0, function () {
+    return this.isoWeekYear() % 100;
+});
+
+function addWeekYearFormatToken (token, getter) {
+    addFormatToken(0, [token, token.length], 0, getter);
+}
+
+addWeekYearFormatToken('gggg',     'weekYear');
+addWeekYearFormatToken('ggggg',    'weekYear');
+addWeekYearFormatToken('GGGG',  'isoWeekYear');
+addWeekYearFormatToken('GGGGG', 'isoWeekYear');
+
+// ALIASES
+
+addUnitAlias('weekYear', 'gg');
+addUnitAlias('isoWeekYear', 'GG');
+
+// PARSING
+
+addRegexToken('G',      matchSigned);
+addRegexToken('g',      matchSigned);
+addRegexToken('GG',     match1to2, match2);
+addRegexToken('gg',     match1to2, match2);
+addRegexToken('GGGG',   match1to4, match4);
+addRegexToken('gggg',   match1to4, match4);
+addRegexToken('GGGGG',  match1to6, match6);
+addRegexToken('ggggg',  match1to6, match6);
+
+addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
+    week[token.substr(0, 2)] = toInt(input);
+});
+
+addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+    week[token] = hooks.parseTwoDigitYear(input);
+});
+
+// HELPERS
+
+function weeksInYear(year, dow, doy) {
+    return weekOfYear(createLocal([year, 11, 31 + dow - doy]), dow, doy).week;
+}
+
+// MOMENTS
+
+export function getSetWeekYear (input) {
+    var year = weekOfYear(this, this.localeData()._week.dow, this.localeData()._week.doy).year;
+    return input == null ? year : this.add((input - year), 'y');
+}
+
+export function getSetISOWeekYear (input) {
+    var year = weekOfYear(this, 1, 4).year;
+    return input == null ? year : this.add((input - year), 'y');
+}
+
+export function getISOWeeksInYear () {
+    return weeksInYear(this.year(), 1, 4);
+}
+
+export function getWeeksInYear () {
+    var weekInfo = this.localeData()._week;
+    return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/week.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/week.js
new file mode 100644
index 000000000..178f6b551
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/week.js
@@ -0,0 +1,88 @@
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match2 } from '../parse/regex';
+import { addWeekParseToken } from '../parse/token';
+import toInt from '../utils/to-int';
+import { createLocal } from '../create/local';
+
+// FORMATTING
+
+addFormatToken('w', ['ww', 2], 'wo', 'week');
+addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
+
+// ALIASES
+
+addUnitAlias('week', 'w');
+addUnitAlias('isoWeek', 'W');
+
+// PARSING
+
+addRegexToken('w',  match1to2);
+addRegexToken('ww', match1to2, match2);
+addRegexToken('W',  match1to2);
+addRegexToken('WW', match1to2, match2);
+
+addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
+    week[token.substr(0, 1)] = toInt(input);
+});
+
+// HELPERS
+
+// firstDayOfWeek       0 = sun, 6 = sat
+//                      the day of the week that starts the week
+//                      (usually sunday or monday)
+// firstDayOfWeekOfYear 0 = sun, 6 = sat
+//                      the first week is the week that contains the first
+//                      of this day of the week
+//                      (eg. ISO weeks use thursday (4))
+export function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) {
+    var end = firstDayOfWeekOfYear - firstDayOfWeek,
+        daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(),
+        adjustedMoment;
+
+
+    if (daysToDayOfWeek > end) {
+        daysToDayOfWeek -= 7;
+    }
+
+    if (daysToDayOfWeek < end - 7) {
+        daysToDayOfWeek += 7;
+    }
+
+    adjustedMoment = createLocal(mom).add(daysToDayOfWeek, 'd');
+    return {
+        week: Math.ceil(adjustedMoment.dayOfYear() / 7),
+        year: adjustedMoment.year()
+    };
+}
+
+// LOCALES
+
+export function localeWeek (mom) {
+    return weekOfYear(mom, this._week.dow, this._week.doy).week;
+}
+
+export var defaultLocaleWeek = {
+    dow : 0, // Sunday is the first day of the week.
+    doy : 6  // The week that contains Jan 1st is the first week of the year.
+};
+
+export function localeFirstDayOfWeek () {
+    return this._week.dow;
+}
+
+export function localeFirstDayOfYear () {
+    return this._week.doy;
+}
+
+// MOMENTS
+
+export function getSetWeek (input) {
+    var week = this.localeData().week(this);
+    return input == null ? week : this.add((input - week) * 7, 'd');
+}
+
+export function getSetISOWeek (input) {
+    var week = weekOfYear(this, 1, 4).week;
+    return input == null ? week : this.add((input - week) * 7, 'd');
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/units/year.js b/turtles/app/lib/bower_components/momentjs/src/lib/units/year.js
new file mode 100644
index 000000000..4d8a03b14
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/units/year.js
@@ -0,0 +1,60 @@
+import { makeGetSet } from '../moment/get-set';
+import { addFormatToken } from '../format/format';
+import { addUnitAlias } from './aliases';
+import { addRegexToken, match1to2, match1to4, match1to6, match2, match4, match6, matchSigned } from '../parse/regex';
+import { addParseToken } from '../parse/token';
+import { hooks } from '../utils/hooks';
+import { YEAR } from './constants';
+import toInt from '../utils/to-int';
+
+// FORMATTING
+
+addFormatToken(0, ['YY', 2], 0, function () {
+    return this.year() % 100;
+});
+
+addFormatToken(0, ['YYYY',   4],       0, 'year');
+addFormatToken(0, ['YYYYY',  5],       0, 'year');
+addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
+
+// ALIASES
+
+addUnitAlias('year', 'y');
+
+// PARSING
+
+addRegexToken('Y',      matchSigned);
+addRegexToken('YY',     match1to2, match2);
+addRegexToken('YYYY',   match1to4, match4);
+addRegexToken('YYYYY',  match1to6, match6);
+addRegexToken('YYYYYY', match1to6, match6);
+
+addParseToken(['YYYY', 'YYYYY', 'YYYYYY'], YEAR);
+addParseToken('YY', function (input, array) {
+    array[YEAR] = hooks.parseTwoDigitYear(input);
+});
+
+// HELPERS
+
+export function daysInYear(year) {
+    return isLeapYear(year) ? 366 : 365;
+}
+
+function isLeapYear(year) {
+    return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+}
+
+// HOOKS
+
+hooks.parseTwoDigitYear = function (input) {
+    return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+};
+
+// MOMENTS
+
+export var getSetYear = makeGetSet('FullYear', false);
+
+export function getIsLeapYear () {
+    return isLeapYear(this.year());
+}
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/abs-floor.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/abs-floor.js
new file mode 100644
index 000000000..8ba131831
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/abs-floor.js
@@ -0,0 +1,7 @@
+export default function absFloor (number) {
+    if (number < 0) {
+        return Math.ceil(number);
+    } else {
+        return Math.floor(number);
+    }
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/compare-arrays.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/compare-arrays.js
new file mode 100644
index 000000000..2eb274bef
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/compare-arrays.js
@@ -0,0 +1,16 @@
+import toInt from './to-int';
+
+// compare two arrays, return the number of differences
+export default function compareArrays(array1, array2, dontConvert) {
+    var len = Math.min(array1.length, array2.length),
+        lengthDiff = Math.abs(array1.length - array2.length),
+        diffs = 0,
+        i;
+    for (i = 0; i < len; i++) {
+        if ((dontConvert && array1[i] !== array2[i]) ||
+            (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+            diffs++;
+        }
+    }
+    return diffs + lengthDiff;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/defaults.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/defaults.js
new file mode 100644
index 000000000..45c5e8794
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/defaults.js
@@ -0,0 +1,10 @@
+// Pick the first defined of two or three arguments.
+export default function defaults(a, b, c) {
+    if (a != null) {
+        return a;
+    }
+    if (b != null) {
+        return b;
+    }
+    return c;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/deprecate.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/deprecate.js
new file mode 100644
index 000000000..a076ad719
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/deprecate.js
@@ -0,0 +1,33 @@
+import extend from './extend';
+import { hooks } from './hooks';
+
+function warn(msg) {
+    if (hooks.suppressDeprecationWarnings === false && typeof console !== 'undefined' && console.warn) {
+        console.warn('Deprecation warning: ' + msg);
+    }
+}
+
+export function deprecate(msg, fn) {
+    var firstTime = true,
+        msgWithStack = msg + '\n' + (new Error()).stack;
+
+    return extend(function () {
+        if (firstTime) {
+            warn(msgWithStack);
+            firstTime = false;
+        }
+        return fn.apply(this, arguments);
+    }, fn);
+}
+
+var deprecations = {};
+
+export function deprecateSimple(name, msg) {
+    if (!deprecations[name]) {
+        warn(msg);
+        deprecations[name] = true;
+    }
+}
+
+hooks.suppressDeprecationWarnings = false;
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/extend.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/extend.js
new file mode 100644
index 000000000..ba74a0bf1
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/extend.js
@@ -0,0 +1,19 @@
+import hasOwnProp from './has-own-prop';
+
+export default function extend(a, b) {
+    for (var i in b) {
+        if (hasOwnProp(b, i)) {
+            a[i] = b[i];
+        }
+    }
+
+    if (hasOwnProp(b, 'toString')) {
+        a.toString = b.toString;
+    }
+
+    if (hasOwnProp(b, 'valueOf')) {
+        a.valueOf = b.valueOf;
+    }
+
+    return a;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/has-own-prop.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/has-own-prop.js
new file mode 100644
index 000000000..4d2403ccb
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/has-own-prop.js
@@ -0,0 +1,3 @@
+export default function hasOwnProp(a, b) {
+    return Object.prototype.hasOwnProperty.call(a, b);
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/hooks.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/hooks.js
new file mode 100644
index 000000000..02a5bd3da
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/hooks.js
@@ -0,0 +1,13 @@
+export { hooks, setHookCallback };
+
+var hookCallback;
+
+function hooks () {
+    return hookCallback.apply(null, arguments);
+}
+
+// This is done to register the method called with moment()
+// without creating circular dependencies.
+function setHookCallback (callback) {
+    hookCallback = callback;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/is-array.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/is-array.js
new file mode 100644
index 000000000..46bd6c68b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/is-array.js
@@ -0,0 +1,3 @@
+export default function isArray(input) {
+    return Object.prototype.toString.call(input) === '[object Array]';
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/is-date.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/is-date.js
new file mode 100644
index 000000000..69c4d0e9c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/is-date.js
@@ -0,0 +1,3 @@
+export default function isDate(input) {
+    return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/map.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/map.js
new file mode 100644
index 000000000..1cbc5639f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/map.js
@@ -0,0 +1,7 @@
+export default function map(arr, fn) {
+    var res = [], i;
+    for (i = 0; i < arr.length; ++i) {
+        res.push(fn(arr[i], i));
+    }
+    return res;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/to-int.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/to-int.js
new file mode 100644
index 000000000..945e0198f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/to-int.js
@@ -0,0 +1,14 @@
+export default function toInt(argumentForCoercion) {
+    var coercedNumber = +argumentForCoercion,
+        value = 0;
+
+    if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+        if (coercedNumber >= 0) {
+            value = Math.floor(coercedNumber);
+        } else {
+            value = Math.ceil(coercedNumber);
+        }
+    }
+
+    return value;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/lib/utils/zero-fill.js b/turtles/app/lib/bower_components/momentjs/src/lib/utils/zero-fill.js
new file mode 100644
index 000000000..af45dd90e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/lib/utils/zero-fill.js
@@ -0,0 +1,9 @@
+export default function zeroFill(number, targetLength, forceSign) {
+    var output = '' + Math.abs(number),
+        sign = number >= 0;
+
+    while (output.length < targetLength) {
+        output = '0' + output;
+    }
+    return (sign ? (forceSign ? '+' : '') : '-') + output;
+}
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/af.js b/turtles/app/lib/bower_components/momentjs/src/locale/af.js
new file mode 100644
index 000000000..8a490ef19
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/af.js
@@ -0,0 +1,63 @@
+//! moment.js locale configuration
+//! locale : afrikaans (af)
+//! author : Werner Mollentze : https://github.com/wernerm
+
+import moment from '../moment';
+
+export default moment.defineLocale('af', {
+    months : 'Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember'.split('_'),
+    monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des'.split('_'),
+    weekdays : 'Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag'.split('_'),
+    weekdaysShort : 'Son_Maa_Din_Woe_Don_Vry_Sat'.split('_'),
+    weekdaysMin : 'So_Ma_Di_Wo_Do_Vr_Sa'.split('_'),
+    meridiemParse: /vm|nm/i,
+    isPM : function (input) {
+        return /^nm$/i.test(input);
+    },
+    meridiem : function (hours, minutes, isLower) {
+        if (hours < 12) {
+            return isLower ? 'vm' : 'VM';
+        } else {
+            return isLower ? 'nm' : 'NM';
+        }
+    },
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Vandag om] LT',
+        nextDay : '[Môre om] LT',
+        nextWeek : 'dddd [om] LT',
+        lastDay : '[Gister om] LT',
+        lastWeek : '[Laas] dddd [om] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'oor %s',
+        past : '%s gelede',
+        s : '\'n paar sekondes',
+        m : '\'n minuut',
+        mm : '%d minute',
+        h : '\'n uur',
+        hh : '%d ure',
+        d : '\'n dag',
+        dd : '%d dae',
+        M : '\'n maand',
+        MM : '%d maande',
+        y : '\'n jaar',
+        yy : '%d jaar'
+    },
+    ordinalParse: /\d{1,2}(ste|de)/,
+    ordinal : function (number) {
+        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de'); // Thanks to Joris Röling : https://github.com/jjupiter
+    },
+    week : {
+        dow : 1, // Maandag is die eerste dag van die week.
+        doy : 4  // Die week wat die 4de Januarie bevat is die eerste week van die jaar.
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ar-ma.js b/turtles/app/lib/bower_components/momentjs/src/locale/ar-ma.js
new file mode 100644
index 000000000..374468ebd
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ar-ma.js
@@ -0,0 +1,50 @@
+//! moment.js locale configuration
+//! locale : Moroccan Arabic (ar-ma)
+//! author : ElFadili Yassine : https://github.com/ElFadiliY
+//! author : Abdel Said : https://github.com/abdelsaid
+
+import moment from '../moment';
+
+export default moment.defineLocale('ar-ma', {
+    months : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+    monthsShort : 'يناير_فبراير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر'.split('_'),
+    weekdays : 'الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+    weekdaysShort : 'احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت'.split('_'),
+    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[اليوم على الساعة] LT',
+        nextDay: '[غدا على الساعة] LT',
+        nextWeek: 'dddd [على الساعة] LT',
+        lastDay: '[أمس على الساعة] LT',
+        lastWeek: 'dddd [على الساعة] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'في %s',
+        past : 'منذ %s',
+        s : 'ثوان',
+        m : 'دقيقة',
+        mm : '%d دقائق',
+        h : 'ساعة',
+        hh : '%d ساعات',
+        d : 'يوم',
+        dd : '%d أيام',
+        M : 'شهر',
+        MM : '%d أشهر',
+        y : 'سنة',
+        yy : '%d سنوات'
+    },
+    week : {
+        dow : 6, // Saturday is the first day of the week.
+        doy : 12  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ar-sa.js b/turtles/app/lib/bower_components/momentjs/src/locale/ar-sa.js
new file mode 100644
index 000000000..a0ef282d9
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ar-sa.js
@@ -0,0 +1,94 @@
+//! moment.js locale configuration
+//! locale : Arabic Saudi Arabia (ar-sa)
+//! author : Suhail Alkowaileet : https://github.com/xsoh
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '١',
+    '2': '٢',
+    '3': '٣',
+    '4': '٤',
+    '5': '٥',
+    '6': '٦',
+    '7': '٧',
+    '8': '٨',
+    '9': '٩',
+    '0': '٠'
+}, numberMap = {
+    '١': '1',
+    '٢': '2',
+    '٣': '3',
+    '٤': '4',
+    '٥': '5',
+    '٦': '6',
+    '٧': '7',
+    '٨': '8',
+    '٩': '9',
+    '٠': '0'
+};
+
+export default moment.defineLocale('ar-sa', {
+    months : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+    monthsShort : 'يناير_فبراير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+    weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+    weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    meridiemParse: /ص|م/,
+    isPM : function (input) {
+        return 'م' === input;
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 12) {
+            return 'ص';
+        } else {
+            return 'م';
+        }
+    },
+    calendar : {
+        sameDay: '[اليوم على الساعة] LT',
+        nextDay: '[غدا على الساعة] LT',
+        nextWeek: 'dddd [على الساعة] LT',
+        lastDay: '[أمس على الساعة] LT',
+        lastWeek: 'dddd [على الساعة] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'في %s',
+        past : 'منذ %s',
+        s : 'ثوان',
+        m : 'دقيقة',
+        mm : '%d دقائق',
+        h : 'ساعة',
+        hh : '%d ساعات',
+        d : 'يوم',
+        dd : '%d أيام',
+        M : 'شهر',
+        MM : '%d أشهر',
+        y : 'سنة',
+        yy : '%d سنوات'
+    },
+    preparse: function (string) {
+        return string.replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+            return numberMap[match];
+        }).replace(/،/g, ',');
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        }).replace(/,/g, '،');
+    },
+    week : {
+        dow : 6, // Saturday is the first day of the week.
+        doy : 12  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ar-tn.js b/turtles/app/lib/bower_components/momentjs/src/locale/ar-tn.js
new file mode 100644
index 000000000..acb3e0890
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ar-tn.js
@@ -0,0 +1,48 @@
+//! moment.js locale configuration
+//! locale  : Tunisian Arabic (ar-tn)
+
+import moment from '../moment';
+
+export default moment.defineLocale('ar-tn', {
+    months: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+    monthsShort: 'جانفي_فيفري_مارس_أفريل_ماي_جوان_جويلية_أوت_سبتمبر_أكتوبر_نوفمبر_ديسمبر'.split('_'),
+    weekdays: 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+    weekdaysShort: 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+    weekdaysMin: 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+    longDateFormat: {
+        LT: 'HH:mm',
+        LTS: 'LT:ss',
+        L: 'DD/MM/YYYY',
+        LL: 'D MMMM YYYY',
+        LLL: 'D MMMM YYYY LT',
+        LLLL: 'dddd D MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[اليوم على الساعة] LT',
+        nextDay: '[غدا على الساعة] LT',
+        nextWeek: 'dddd [على الساعة] LT',
+        lastDay: '[أمس على الساعة] LT',
+        lastWeek: 'dddd [على الساعة] LT',
+        sameElse: 'L'
+    },
+    relativeTime: {
+        future: 'في %s',
+        past: 'منذ %s',
+        s: 'ثوان',
+        m: 'دقيقة',
+        mm: '%d دقائق',
+        h: 'ساعة',
+        hh: '%d ساعات',
+        d: 'يوم',
+        dd: '%d أيام',
+        M: 'شهر',
+        MM: '%d أشهر',
+        y: 'سنة',
+        yy: '%d سنوات'
+    },
+    week: {
+        dow: 1, // Monday is the first day of the week.
+        doy: 4 // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ar.js b/turtles/app/lib/bower_components/momentjs/src/locale/ar.js
new file mode 100644
index 000000000..689bc8f6a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ar.js
@@ -0,0 +1,127 @@
+//! moment.js locale configuration
+//! Locale: Arabic (ar)
+//! Author: Abdel Said: https://github.com/abdelsaid
+//! Changes in months, weekdays: Ahmed Elkhatib
+//! Native plural forms: forabi https://github.com/forabi
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '١',
+    '2': '٢',
+    '3': '٣',
+    '4': '٤',
+    '5': '٥',
+    '6': '٦',
+    '7': '٧',
+    '8': '٨',
+    '9': '٩',
+    '0': '٠'
+}, numberMap = {
+    '١': '1',
+    '٢': '2',
+    '٣': '3',
+    '٤': '4',
+    '٥': '5',
+    '٦': '6',
+    '٧': '7',
+    '٨': '8',
+    '٩': '9',
+    '٠': '0'
+}, pluralForm = function (n) {
+    return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+}, plurals = {
+    s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+    m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+    h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+    d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+    M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+    y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+}, pluralize = function (u) {
+    return function (number, withoutSuffix, string, isFuture) {
+        var f = pluralForm(number),
+            str = plurals[u][pluralForm(number)];
+        if (f === 2) {
+            str = str[withoutSuffix ? 0 : 1];
+        }
+        return str.replace(/%d/i, number);
+    };
+}, months = [
+    'كانون الثاني يناير',
+    'شباط فبراير',
+    'آذار مارس',
+    'نيسان أبريل',
+    'أيار مايو',
+    'حزيران يونيو',
+    'تموز يوليو',
+    'آب أغسطس',
+    'أيلول سبتمبر',
+    'تشرين الأول أكتوبر',
+    'تشرين الثاني نوفمبر',
+    'كانون الأول ديسمبر'
+];
+
+export default moment.defineLocale('ar', {
+    months : months,
+    monthsShort : months,
+    weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
+    weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
+    weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'D/\u200FM/\u200FYYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    meridiemParse: /ص|م/,
+    isPM : function (input) {
+        return 'م' === input;
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 12) {
+            return 'ص';
+        } else {
+            return 'م';
+        }
+    },
+    calendar : {
+        sameDay: '[اليوم عند الساعة] LT',
+        nextDay: '[غدًا عند الساعة] LT',
+        nextWeek: 'dddd [عند الساعة] LT',
+        lastDay: '[أمس عند الساعة] LT',
+        lastWeek: 'dddd [عند الساعة] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'بعد %s',
+        past : 'منذ %s',
+        s : pluralize('s'),
+        m : pluralize('m'),
+        mm : pluralize('m'),
+        h : pluralize('h'),
+        hh : pluralize('h'),
+        d : pluralize('d'),
+        dd : pluralize('d'),
+        M : pluralize('M'),
+        MM : pluralize('M'),
+        y : pluralize('y'),
+        yy : pluralize('y')
+    },
+    preparse: function (string) {
+        return string.replace(/\u200f/g, '').replace(/[١٢٣٤٥٦٧٨٩٠]/g, function (match) {
+            return numberMap[match];
+        }).replace(/،/g, ',');
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        }).replace(/,/g, '،');
+    },
+    week : {
+        dow : 6, // Saturday is the first day of the week.
+        doy : 12  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/az.js b/turtles/app/lib/bower_components/momentjs/src/locale/az.js
new file mode 100644
index 000000000..ecf93523c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/az.js
@@ -0,0 +1,95 @@
+//! moment.js locale configuration
+//! locale : azerbaijani (az)
+//! author : topchiyev : https://github.com/topchiyev
+
+import moment from '../moment';
+
+var suffixes = {
+    1: '-inci',
+    5: '-inci',
+    8: '-inci',
+    70: '-inci',
+    80: '-inci',
+    2: '-nci',
+    7: '-nci',
+    20: '-nci',
+    50: '-nci',
+    3: '-üncü',
+    4: '-üncü',
+    100: '-üncü',
+    6: '-ncı',
+    9: '-uncu',
+    10: '-uncu',
+    30: '-uncu',
+    60: '-ıncı',
+    90: '-ıncı'
+};
+
+export default moment.defineLocale('az', {
+    months : 'yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr'.split('_'),
+    monthsShort : 'yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek'.split('_'),
+    weekdays : 'Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə'.split('_'),
+    weekdaysShort : 'Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən'.split('_'),
+    weekdaysMin : 'Bz_BE_ÇA_Çə_CA_Cü_Şə'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[bugün saat] LT',
+        nextDay : '[sabah saat] LT',
+        nextWeek : '[gələn həftə] dddd [saat] LT',
+        lastDay : '[dünən] LT',
+        lastWeek : '[keçən həftə] dddd [saat] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s sonra',
+        past : '%s əvvəl',
+        s : 'birneçə saniyyə',
+        m : 'bir dəqiqə',
+        mm : '%d dəqiqə',
+        h : 'bir saat',
+        hh : '%d saat',
+        d : 'bir gün',
+        dd : '%d gün',
+        M : 'bir ay',
+        MM : '%d ay',
+        y : 'bir il',
+        yy : '%d il'
+    },
+    meridiemParse: /gecə|səhər|gündüz|axşam/,
+    isPM : function (input) {
+        return /^(gündüz|axşam)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'gecə';
+        } else if (hour < 12) {
+            return 'səhər';
+        } else if (hour < 17) {
+            return 'gündüz';
+        } else {
+            return 'axşam';
+        }
+    },
+    ordinalParse: /\d{1,2}-(ıncı|inci|nci|üncü|ncı|uncu)/,
+    ordinal : function (number) {
+        if (number === 0) {  // special case for zero
+            return number + '-ıncı';
+        }
+        var a = number % 10,
+            b = number % 100 - a,
+            c = number >= 100 ? 100 : null;
+        return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/be.js b/turtles/app/lib/bower_components/momentjs/src/locale/be.js
new file mode 100644
index 000000000..c14511663
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/be.js
@@ -0,0 +1,138 @@
+//! moment.js locale configuration
+//! locale : belarusian (be)
+//! author : Dmitry Demidov : https://github.com/demidov91
+//! author: Praleska: http://praleska.pro/
+//! Author : Menelion Elensúle : https://github.com/Oire
+
+import moment from '../moment';
+
+function plural(word, num) {
+    var forms = word.split('_');
+    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+}
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+    var format = {
+        'mm': withoutSuffix ? 'хвіліна_хвіліны_хвілін' : 'хвіліну_хвіліны_хвілін',
+        'hh': withoutSuffix ? 'гадзіна_гадзіны_гадзін' : 'гадзіну_гадзіны_гадзін',
+        'dd': 'дзень_дні_дзён',
+        'MM': 'месяц_месяцы_месяцаў',
+        'yy': 'год_гады_гадоў'
+    };
+    if (key === 'm') {
+        return withoutSuffix ? 'хвіліна' : 'хвіліну';
+    }
+    else if (key === 'h') {
+        return withoutSuffix ? 'гадзіна' : 'гадзіну';
+    }
+    else {
+        return number + ' ' + plural(format[key], +number);
+    }
+}
+function monthsCaseReplace(m, format) {
+    var months = {
+        'nominative': 'студзень_люты_сакавік_красавік_травень_чэрвень_ліпень_жнівень_верасень_кастрычнік_лістапад_снежань'.split('_'),
+        'accusative': 'студзеня_лютага_сакавіка_красавіка_траўня_чэрвеня_ліпеня_жніўня_верасня_кастрычніка_лістапада_снежня'.split('_')
+    },
+    nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+        'accusative' :
+        'nominative';
+    return months[nounCase][m.month()];
+}
+function weekdaysCaseReplace(m, format) {
+    var weekdays = {
+        'nominative': 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
+        'accusative': 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_')
+    },
+    nounCase = (/\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/).test(format) ?
+        'accusative' :
+        'nominative';
+    return weekdays[nounCase][m.day()];
+}
+
+export default moment.defineLocale('be', {
+    months : monthsCaseReplace,
+    monthsShort : 'студ_лют_сак_крас_трав_чэрв_ліп_жнів_вер_каст_ліст_снеж'.split('_'),
+    weekdays : weekdaysCaseReplace,
+    weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+    weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY г.',
+        LLL : 'D MMMM YYYY г., LT',
+        LLLL : 'dddd, D MMMM YYYY г., LT'
+    },
+    calendar : {
+        sameDay: '[Сёння ў] LT',
+        nextDay: '[Заўтра ў] LT',
+        lastDay: '[Учора ў] LT',
+        nextWeek: function () {
+            return '[У] dddd [ў] LT';
+        },
+        lastWeek: function () {
+            switch (this.day()) {
+            case 0:
+            case 3:
+            case 5:
+            case 6:
+                return '[У мінулую] dddd [ў] LT';
+            case 1:
+            case 2:
+            case 4:
+                return '[У мінулы] dddd [ў] LT';
+            }
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'праз %s',
+        past : '%s таму',
+        s : 'некалькі секунд',
+        m : relativeTimeWithPlural,
+        mm : relativeTimeWithPlural,
+        h : relativeTimeWithPlural,
+        hh : relativeTimeWithPlural,
+        d : 'дзень',
+        dd : relativeTimeWithPlural,
+        M : 'месяц',
+        MM : relativeTimeWithPlural,
+        y : 'год',
+        yy : relativeTimeWithPlural
+    },
+    meridiemParse: /ночы|раніцы|дня|вечара/,
+    isPM : function (input) {
+        return /^(дня|вечара)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'ночы';
+        } else if (hour < 12) {
+            return 'раніцы';
+        } else if (hour < 17) {
+            return 'дня';
+        } else {
+            return 'вечара';
+        }
+    },
+    ordinalParse: /\d{1,2}-(і|ы|га)/,
+    ordinal: function (number, period) {
+        switch (period) {
+        case 'M':
+        case 'd':
+        case 'DDD':
+        case 'w':
+        case 'W':
+            return (number % 10 === 2 || number % 10 === 3) && (number % 100 !== 12 && number % 100 !== 13) ? number + '-і' : number + '-ы';
+        case 'D':
+            return number + '-га';
+        default:
+            return number;
+        }
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/bg.js b/turtles/app/lib/bower_components/momentjs/src/locale/bg.js
new file mode 100644
index 000000000..a1f1f7283
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/bg.js
@@ -0,0 +1,81 @@
+//! moment.js locale configuration
+//! locale : bulgarian (bg)
+//! author : Krasen Borisov : https://github.com/kraz
+
+import moment from '../moment';
+
+export default moment.defineLocale('bg', {
+    months : 'януари_февруари_март_април_май_юни_юли_август_септември_октомври_ноември_декември'.split('_'),
+    monthsShort : 'янр_фев_мар_апр_май_юни_юли_авг_сеп_окт_ное_дек'.split('_'),
+    weekdays : 'неделя_понеделник_вторник_сряда_четвъртък_петък_събота'.split('_'),
+    weekdaysShort : 'нед_пон_вто_сря_чет_пет_съб'.split('_'),
+    weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'D.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Днес в] LT',
+        nextDay : '[Утре в] LT',
+        nextWeek : 'dddd [в] LT',
+        lastDay : '[Вчера в] LT',
+        lastWeek : function () {
+            switch (this.day()) {
+            case 0:
+            case 3:
+            case 6:
+                return '[В изминалата] dddd [в] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[В изминалия] dddd [в] LT';
+            }
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'след %s',
+        past : 'преди %s',
+        s : 'няколко секунди',
+        m : 'минута',
+        mm : '%d минути',
+        h : 'час',
+        hh : '%d часа',
+        d : 'ден',
+        dd : '%d дни',
+        M : 'месец',
+        MM : '%d месеца',
+        y : 'година',
+        yy : '%d години'
+    },
+    ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+    ordinal : function (number) {
+        var lastDigit = number % 10,
+            last2Digits = number % 100;
+        if (number === 0) {
+            return number + '-ев';
+        } else if (last2Digits === 0) {
+            return number + '-ен';
+        } else if (last2Digits > 10 && last2Digits < 20) {
+            return number + '-ти';
+        } else if (lastDigit === 1) {
+            return number + '-ви';
+        } else if (lastDigit === 2) {
+            return number + '-ри';
+        } else if (lastDigit === 7 || lastDigit === 8) {
+            return number + '-ми';
+        } else {
+            return number + '-ти';
+        }
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/bn.js b/turtles/app/lib/bower_components/momentjs/src/locale/bn.js
new file mode 100644
index 000000000..3a16085c7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/bn.js
@@ -0,0 +1,104 @@
+//! moment.js locale configuration
+//! locale : Bengali (bn)
+//! author : Kaushik Gandhi : https://github.com/kaushikgandhi
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '১',
+    '2': '২',
+    '3': '৩',
+    '4': '৪',
+    '5': '৫',
+    '6': '৬',
+    '7': '৭',
+    '8': '৮',
+    '9': '৯',
+    '0': '০'
+},
+numberMap = {
+    '১': '1',
+    '২': '2',
+    '৩': '3',
+    '৪': '4',
+    '৫': '5',
+    '৬': '6',
+    '৭': '7',
+    '৮': '8',
+    '৯': '9',
+    '০': '0'
+};
+
+export default moment.defineLocale('bn', {
+    months : 'জানুয়ারী_ফেবুয়ারী_মার্চ_এপ্রিল_মে_জুন_জুলাই_অগাস্ট_সেপ্টেম্বর_অক্টোবর_নভেম্বর_ডিসেম্বর'.split('_'),
+    monthsShort : 'জানু_ফেব_মার্চ_এপর_মে_জুন_জুল_অগ_সেপ্ট_অক্টো_নভ_ডিসেম্'.split('_'),
+    weekdays : 'রবিবার_সোমবার_মঙ্গলবার_বুধবার_বৃহস্পত্তিবার_শুক্রুবার_শনিবার'.split('_'),
+    weekdaysShort : 'রবি_সোম_মঙ্গল_বুধ_বৃহস্পত্তি_শুক্রু_শনি'.split('_'),
+    weekdaysMin : 'রব_সম_মঙ্গ_বু_ব্রিহ_শু_শনি'.split('_'),
+    longDateFormat : {
+        LT : 'A h:mm সময়',
+        LTS : 'A h:mm:ss সময়',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY, LT',
+        LLLL : 'dddd, D MMMM YYYY, LT'
+    },
+    calendar : {
+        sameDay : '[আজ] LT',
+        nextDay : '[আগামীকাল] LT',
+        nextWeek : 'dddd, LT',
+        lastDay : '[গতকাল] LT',
+        lastWeek : '[গত] dddd, LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s পরে',
+        past : '%s আগে',
+        s : 'কএক সেকেন্ড',
+        m : 'এক মিনিট',
+        mm : '%d মিনিট',
+        h : 'এক ঘন্টা',
+        hh : '%d ঘন্টা',
+        d : 'এক দিন',
+        dd : '%d দিন',
+        M : 'এক মাস',
+        MM : '%d মাস',
+        y : 'এক বছর',
+        yy : '%d বছর'
+    },
+    preparse: function (string) {
+        return string.replace(/[১২৩৪৫৬৭৮৯০]/g, function (match) {
+            return numberMap[match];
+        });
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        });
+    },
+    meridiemParse: /রাত|শকাল|দুপুর|বিকেল|রাত/,
+    isPM: function (input) {
+        return /^(দুপুর|বিকেল|রাত)$/.test(input);
+    },
+    //Bengali is a vast language its spoken
+    //in different forms in various parts of the world.
+    //I have just generalized with most common one used
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'রাত';
+        } else if (hour < 10) {
+            return 'শকাল';
+        } else if (hour < 17) {
+            return 'দুপুর';
+        } else if (hour < 20) {
+            return 'বিকেল';
+        } else {
+            return 'রাত';
+        }
+    },
+    week : {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/bo.js b/turtles/app/lib/bower_components/momentjs/src/locale/bo.js
new file mode 100644
index 000000000..102bf3af3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/bo.js
@@ -0,0 +1,101 @@
+//! moment.js locale configuration
+//! locale : tibetan (bo)
+//! author : Thupten N. Chakrishar : https://github.com/vajradog
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '༡',
+    '2': '༢',
+    '3': '༣',
+    '4': '༤',
+    '5': '༥',
+    '6': '༦',
+    '7': '༧',
+    '8': '༨',
+    '9': '༩',
+    '0': '༠'
+},
+numberMap = {
+    '༡': '1',
+    '༢': '2',
+    '༣': '3',
+    '༤': '4',
+    '༥': '5',
+    '༦': '6',
+    '༧': '7',
+    '༨': '8',
+    '༩': '9',
+    '༠': '0'
+};
+
+export default moment.defineLocale('bo', {
+    months : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+    monthsShort : 'ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ'.split('_'),
+    weekdays : 'གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་'.split('_'),
+    weekdaysShort : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+    weekdaysMin : 'ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་'.split('_'),
+    longDateFormat : {
+        LT : 'A h:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY, LT',
+        LLLL : 'dddd, D MMMM YYYY, LT'
+    },
+    calendar : {
+        sameDay : '[དི་རིང] LT',
+        nextDay : '[སང་ཉིན] LT',
+        nextWeek : '[བདུན་ཕྲག་རྗེས་མ], LT',
+        lastDay : '[ཁ་སང] LT',
+        lastWeek : '[བདུན་ཕྲག་མཐའ་མ] dddd, LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s ལ་',
+        past : '%s སྔན་ལ',
+        s : 'ལམ་སང',
+        m : 'སྐར་མ་གཅིག',
+        mm : '%d སྐར་མ',
+        h : 'ཆུ་ཚོད་གཅིག',
+        hh : '%d ཆུ་ཚོད',
+        d : 'ཉིན་གཅིག',
+        dd : '%d ཉིན་',
+        M : 'ཟླ་བ་གཅིག',
+        MM : '%d ཟླ་བ',
+        y : 'ལོ་གཅིག',
+        yy : '%d ལོ'
+    },
+    preparse: function (string) {
+        return string.replace(/[༡༢༣༤༥༦༧༨༩༠]/g, function (match) {
+            return numberMap[match];
+        });
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        });
+    },
+    meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
+    isPM: function (input) {
+        return /^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'མཚན་མོ';
+        } else if (hour < 10) {
+            return 'ཞོགས་ཀས';
+        } else if (hour < 17) {
+            return 'ཉིན་གུང';
+        } else if (hour < 20) {
+            return 'དགོང་དག';
+        } else {
+            return 'མཚན་མོ';
+        }
+    },
+    week : {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/br.js b/turtles/app/lib/bower_components/momentjs/src/locale/br.js
new file mode 100644
index 000000000..d6b501d16
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/br.js
@@ -0,0 +1,98 @@
+//! moment.js locale configuration
+//! locale : breton (br)
+//! author : Jean-Baptiste Le Duigou : https://github.com/jbleduigou
+
+import moment from '../moment';
+
+function relativeTimeWithMutation(number, withoutSuffix, key) {
+    var format = {
+        'mm': 'munutenn',
+        'MM': 'miz',
+        'dd': 'devezh'
+    };
+    return number + ' ' + mutation(format[key], number);
+}
+function specialMutationForYears(number) {
+    switch (lastNumber(number)) {
+    case 1:
+    case 3:
+    case 4:
+    case 5:
+    case 9:
+        return number + ' bloaz';
+    default:
+        return number + ' vloaz';
+    }
+}
+function lastNumber(number) {
+    if (number > 9) {
+        return lastNumber(number % 10);
+    }
+    return number;
+}
+function mutation(text, number) {
+    if (number === 2) {
+        return softMutation(text);
+    }
+    return text;
+}
+function softMutation(text) {
+    var mutationTable = {
+        'm': 'v',
+        'b': 'v',
+        'd': 'z'
+    };
+    if (mutationTable[text.charAt(0)] === undefined) {
+        return text;
+    }
+    return mutationTable[text.charAt(0)] + text.substring(1);
+}
+
+export default moment.defineLocale('br', {
+    months : 'Genver_C\'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu'.split('_'),
+    monthsShort : 'Gen_C\'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker'.split('_'),
+    weekdays : 'Sul_Lun_Meurzh_Merc\'her_Yaou_Gwener_Sadorn'.split('_'),
+    weekdaysShort : 'Sul_Lun_Meu_Mer_Yao_Gwe_Sad'.split('_'),
+    weekdaysMin : 'Su_Lu_Me_Mer_Ya_Gw_Sa'.split('_'),
+    longDateFormat : {
+        LT : 'h[e]mm A',
+        LTS : 'h[e]mm:ss A',
+        L : 'DD/MM/YYYY',
+        LL : 'D [a viz] MMMM YYYY',
+        LLL : 'D [a viz] MMMM YYYY LT',
+        LLLL : 'dddd, D [a viz] MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Hiziv da] LT',
+        nextDay : '[Warc\'hoazh da] LT',
+        nextWeek : 'dddd [da] LT',
+        lastDay : '[Dec\'h da] LT',
+        lastWeek : 'dddd [paset da] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'a-benn %s',
+        past : '%s \'zo',
+        s : 'un nebeud segondennoù',
+        m : 'ur vunutenn',
+        mm : relativeTimeWithMutation,
+        h : 'un eur',
+        hh : '%d eur',
+        d : 'un devezh',
+        dd : relativeTimeWithMutation,
+        M : 'ur miz',
+        MM : relativeTimeWithMutation,
+        y : 'ur bloaz',
+        yy : specialMutationForYears
+    },
+    ordinalParse: /\d{1,2}(añ|vet)/,
+    ordinal : function (number) {
+        var output = (number === 1) ? 'añ' : 'vet';
+        return number + output;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/bs.js b/turtles/app/lib/bower_components/momentjs/src/locale/bs.js
new file mode 100644
index 000000000..62b7f8ed5
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/bs.js
@@ -0,0 +1,132 @@
+//! moment.js locale configuration
+//! locale : bosnian (bs)
+//! author : Nedim Cholich : https://github.com/frontyard
+//! based on (hr) translation by Bojan Marković
+
+import moment from '../moment';
+
+function translate(number, withoutSuffix, key) {
+    var result = number + ' ';
+    switch (key) {
+    case 'm':
+        return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+    case 'mm':
+        if (number === 1) {
+            result += 'minuta';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'minute';
+        } else {
+            result += 'minuta';
+        }
+        return result;
+    case 'h':
+        return withoutSuffix ? 'jedan sat' : 'jednog sata';
+    case 'hh':
+        if (number === 1) {
+            result += 'sat';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'sata';
+        } else {
+            result += 'sati';
+        }
+        return result;
+    case 'dd':
+        if (number === 1) {
+            result += 'dan';
+        } else {
+            result += 'dana';
+        }
+        return result;
+    case 'MM':
+        if (number === 1) {
+            result += 'mjesec';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'mjeseca';
+        } else {
+            result += 'mjeseci';
+        }
+        return result;
+    case 'yy':
+        if (number === 1) {
+            result += 'godina';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'godine';
+        } else {
+            result += 'godina';
+        }
+        return result;
+    }
+}
+
+export default moment.defineLocale('bs', {
+    months : 'januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar'.split('_'),
+    monthsShort : 'jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+    weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+    weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+    weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD. MM. YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd, D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay  : '[danas u] LT',
+        nextDay  : '[sutra u] LT',
+        nextWeek : function () {
+            switch (this.day()) {
+            case 0:
+                return '[u] [nedjelju] [u] LT';
+            case 3:
+                return '[u] [srijedu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        },
+        lastDay  : '[jučer u] LT',
+        lastWeek : function () {
+            switch (this.day()) {
+            case 0:
+            case 3:
+                return '[prošlu] dddd [u] LT';
+            case 6:
+                return '[prošle] [subote] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[prošli] dddd [u] LT';
+            }
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past   : 'prije %s',
+        s      : 'par sekundi',
+        m      : translate,
+        mm     : translate,
+        h      : translate,
+        hh     : translate,
+        d      : 'dan',
+        dd     : translate,
+        M      : 'mjesec',
+        MM     : translate,
+        y      : 'godinu',
+        yy     : translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ca.js b/turtles/app/lib/bower_components/momentjs/src/locale/ca.js
new file mode 100644
index 000000000..f03f4501f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ca.js
@@ -0,0 +1,70 @@
+//! moment.js locale configuration
+//! locale : catalan (ca)
+//! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+import moment from '../moment';
+
+export default moment.defineLocale('ca', {
+    months : 'gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre'.split('_'),
+    monthsShort : 'gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.'.split('_'),
+    weekdays : 'diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte'.split('_'),
+    weekdaysShort : 'dg._dl._dt._dc._dj._dv._ds.'.split('_'),
+    weekdaysMin : 'Dg_Dl_Dt_Dc_Dj_Dv_Ds'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : function () {
+            return '[avui a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        },
+        nextDay : function () {
+            return '[demà a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        },
+        nextWeek : function () {
+            return 'dddd [a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        },
+        lastDay : function () {
+            return '[ahir a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        },
+        lastWeek : function () {
+            return '[el] dddd [passat a ' + ((this.hours() !== 1) ? 'les' : 'la') + '] LT';
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'en %s',
+        past : 'fa %s',
+        s : 'uns segons',
+        m : 'un minut',
+        mm : '%d minuts',
+        h : 'una hora',
+        hh : '%d hores',
+        d : 'un dia',
+        dd : '%d dies',
+        M : 'un mes',
+        MM : '%d mesos',
+        y : 'un any',
+        yy : '%d anys'
+    },
+    ordinalParse: /\d{1,2}(r|n|t|è|a)/,
+    ordinal : function (number, period) {
+        var output = (number === 1) ? 'r' :
+            (number === 2) ? 'n' :
+            (number === 3) ? 'r' :
+            (number === 4) ? 't' : 'è';
+        if (period === 'w' || period === 'W') {
+            output = 'a';
+        }
+        return number + output;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/cs.js b/turtles/app/lib/bower_components/momentjs/src/locale/cs.js
new file mode 100644
index 000000000..9388ee88e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/cs.js
@@ -0,0 +1,148 @@
+//! moment.js locale configuration
+//! locale : czech (cs)
+//! author : petrbela : https://github.com/petrbela
+
+import moment from '../moment';
+
+var months = 'leden_únor_březen_duben_květen_červen_červenec_srpen_září_říjen_listopad_prosinec'.split('_'),
+    monthsShort = 'led_úno_bře_dub_kvě_čvn_čvc_srp_zář_říj_lis_pro'.split('_');
+function plural(n) {
+    return (n > 1) && (n < 5) && (~~(n / 10) !== 1);
+}
+function translate(number, withoutSuffix, key, isFuture) {
+    var result = number + ' ';
+    switch (key) {
+    case 's':  // a few seconds / in a few seconds / a few seconds ago
+        return (withoutSuffix || isFuture) ? 'pár sekund' : 'pár sekundami';
+    case 'm':  // a minute / in a minute / a minute ago
+        return withoutSuffix ? 'minuta' : (isFuture ? 'minutu' : 'minutou');
+    case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'minuty' : 'minut');
+        } else {
+            return result + 'minutami';
+        }
+        break;
+    case 'h':  // an hour / in an hour / an hour ago
+        return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+    case 'hh': // 9 hours / in 9 hours / 9 hours ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'hodiny' : 'hodin');
+        } else {
+            return result + 'hodinami';
+        }
+        break;
+    case 'd':  // a day / in a day / a day ago
+        return (withoutSuffix || isFuture) ? 'den' : 'dnem';
+    case 'dd': // 9 days / in 9 days / 9 days ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'dny' : 'dní');
+        } else {
+            return result + 'dny';
+        }
+        break;
+    case 'M':  // a month / in a month / a month ago
+        return (withoutSuffix || isFuture) ? 'měsíc' : 'měsícem';
+    case 'MM': // 9 months / in 9 months / 9 months ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'měsíce' : 'měsíců');
+        } else {
+            return result + 'měsíci';
+        }
+        break;
+    case 'y':  // a year / in a year / a year ago
+        return (withoutSuffix || isFuture) ? 'rok' : 'rokem';
+    case 'yy': // 9 years / in 9 years / 9 years ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'roky' : 'let');
+        } else {
+            return result + 'lety';
+        }
+        break;
+    }
+}
+
+export default moment.defineLocale('cs', {
+    months : months,
+    monthsShort : monthsShort,
+    monthsParse : (function (months, monthsShort) {
+        var i, _monthsParse = [];
+        for (i = 0; i < 12; i++) {
+            // use custom parser to solve problem with July (červenec)
+            _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+        }
+        return _monthsParse;
+    }(months, monthsShort)),
+    weekdays : 'neděle_pondělí_úterý_středa_čtvrtek_pátek_sobota'.split('_'),
+    weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
+    weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
+    longDateFormat : {
+        LT: 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[dnes v] LT',
+        nextDay: '[zítra v] LT',
+        nextWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[v neděli v] LT';
+            case 1:
+            case 2:
+                return '[v] dddd [v] LT';
+            case 3:
+                return '[ve středu v] LT';
+            case 4:
+                return '[ve čtvrtek v] LT';
+            case 5:
+                return '[v pátek v] LT';
+            case 6:
+                return '[v sobotu v] LT';
+            }
+        },
+        lastDay: '[včera v] LT',
+        lastWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[minulou neděli v] LT';
+            case 1:
+            case 2:
+                return '[minulé] dddd [v] LT';
+            case 3:
+                return '[minulou středu v] LT';
+            case 4:
+            case 5:
+                return '[minulý] dddd [v] LT';
+            case 6:
+                return '[minulou sobotu v] LT';
+            }
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past : 'před %s',
+        s : translate,
+        m : translate,
+        mm : translate,
+        h : translate,
+        hh : translate,
+        d : translate,
+        dd : translate,
+        M : translate,
+        MM : translate,
+        y : translate,
+        yy : translate
+    },
+    ordinalParse : /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/cv.js b/turtles/app/lib/bower_components/momentjs/src/locale/cv.js
new file mode 100644
index 000000000..09db067db
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/cv.js
@@ -0,0 +1,53 @@
+//! moment.js locale configuration
+//! locale : chuvash (cv)
+//! author : Anatoly Mironov : https://github.com/mirontoli
+
+import moment from '../moment';
+
+export default moment.defineLocale('cv', {
+    months : 'кӑрлач_нарӑс_пуш_ака_май_ҫӗртме_утӑ_ҫурла_авӑн_юпа_чӳк_раштав'.split('_'),
+    monthsShort : 'кӑр_нар_пуш_ака_май_ҫӗр_утӑ_ҫур_авн_юпа_чӳк_раш'.split('_'),
+    weekdays : 'вырсарникун_тунтикун_ытларикун_юнкун_кӗҫнерникун_эрнекун_шӑматкун'.split('_'),
+    weekdaysShort : 'выр_тун_ытл_юн_кӗҫ_эрн_шӑм'.split('_'),
+    weekdaysMin : 'вр_тн_ыт_юн_кҫ_эр_шм'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD-MM-YYYY',
+        LL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ]',
+        LLL : 'YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT',
+        LLLL : 'dddd, YYYY [ҫулхи] MMMM [уйӑхӗн] D[-мӗшӗ], LT'
+    },
+    calendar : {
+        sameDay: '[Паян] LT [сехетре]',
+        nextDay: '[Ыран] LT [сехетре]',
+        lastDay: '[Ӗнер] LT [сехетре]',
+        nextWeek: '[Ҫитес] dddd LT [сехетре]',
+        lastWeek: '[Иртнӗ] dddd LT [сехетре]',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : function (output) {
+            var affix = /сехет$/i.exec(output) ? 'рен' : /ҫул$/i.exec(output) ? 'тан' : 'ран';
+            return output + affix;
+        },
+        past : '%s каялла',
+        s : 'пӗр-ик ҫеккунт',
+        m : 'пӗр минут',
+        mm : '%d минут',
+        h : 'пӗр сехет',
+        hh : '%d сехет',
+        d : 'пӗр кун',
+        dd : '%d кун',
+        M : 'пӗр уйӑх',
+        MM : '%d уйӑх',
+        y : 'пӗр ҫул',
+        yy : '%d ҫул'
+    },
+    ordinalParse: /\d{1,2}-мӗш/,
+    ordinal : '%d-мӗш',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/cy.js b/turtles/app/lib/bower_components/momentjs/src/locale/cy.js
new file mode 100644
index 000000000..2d574a6e2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/cy.js
@@ -0,0 +1,70 @@
+//! moment.js locale configuration
+//! locale : Welsh (cy)
+//! author : Robert Allen
+
+import moment from '../moment';
+
+export default moment.defineLocale('cy', {
+    months: 'Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr'.split('_'),
+    monthsShort: 'Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag'.split('_'),
+    weekdays: 'Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn'.split('_'),
+    weekdaysShort: 'Sul_Llun_Maw_Mer_Iau_Gwe_Sad'.split('_'),
+    weekdaysMin: 'Su_Ll_Ma_Me_Ia_Gw_Sa'.split('_'),
+    // time formats are the same as en-gb
+    longDateFormat: {
+        LT: 'HH:mm',
+        LTS : 'LT:ss',
+        L: 'DD/MM/YYYY',
+        LL: 'D MMMM YYYY',
+        LLL: 'D MMMM YYYY LT',
+        LLLL: 'dddd, D MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[Heddiw am] LT',
+        nextDay: '[Yfory am] LT',
+        nextWeek: 'dddd [am] LT',
+        lastDay: '[Ddoe am] LT',
+        lastWeek: 'dddd [diwethaf am] LT',
+        sameElse: 'L'
+    },
+    relativeTime: {
+        future: 'mewn %s',
+        past: '%s yn ôl',
+        s: 'ychydig eiliadau',
+        m: 'munud',
+        mm: '%d munud',
+        h: 'awr',
+        hh: '%d awr',
+        d: 'diwrnod',
+        dd: '%d diwrnod',
+        M: 'mis',
+        MM: '%d mis',
+        y: 'blwyddyn',
+        yy: '%d flynedd'
+    },
+    ordinalParse: /\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,
+    // traditional ordinal numbers above 31 are not commonly used in colloquial Welsh
+    ordinal: function (number) {
+        var b = number,
+            output = '',
+            lookup = [
+                '', 'af', 'il', 'ydd', 'ydd', 'ed', 'ed', 'ed', 'fed', 'fed', 'fed', // 1af to 10fed
+                'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'eg', 'fed', 'eg', 'fed' // 11eg to 20fed
+            ];
+        if (b > 20) {
+            if (b === 40 || b === 50 || b === 60 || b === 80 || b === 100) {
+                output = 'fed'; // not 30ain, 70ain or 90ain
+            } else {
+                output = 'ain';
+            }
+        } else if (b > 0) {
+            output = lookup[b];
+        }
+        return number + output;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/da.js b/turtles/app/lib/bower_components/momentjs/src/locale/da.js
new file mode 100644
index 000000000..9ee01132a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/da.js
@@ -0,0 +1,51 @@
+//! moment.js locale configuration
+//! locale : danish (da)
+//! author : Ulrik Nielsen : https://github.com/mrbase
+
+import moment from '../moment';
+
+export default moment.defineLocale('da', {
+    months : 'januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+    weekdaysShort : 'søn_man_tir_ons_tor_fre_lør'.split('_'),
+    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd [d.] D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[I dag kl.] LT',
+        nextDay : '[I morgen kl.] LT',
+        nextWeek : 'dddd [kl.] LT',
+        lastDay : '[I går kl.] LT',
+        lastWeek : '[sidste] dddd [kl] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'om %s',
+        past : '%s siden',
+        s : 'få sekunder',
+        m : 'et minut',
+        mm : '%d minutter',
+        h : 'en time',
+        hh : '%d timer',
+        d : 'en dag',
+        dd : '%d dage',
+        M : 'en måned',
+        MM : '%d måneder',
+        y : 'et år',
+        yy : '%d år'
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/de-at.js b/turtles/app/lib/bower_components/momentjs/src/locale/de-at.js
new file mode 100644
index 000000000..4aae191bd
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/de-at.js
@@ -0,0 +1,67 @@
+//! moment.js locale configuration
+//! locale : austrian german (de-at)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+//! author : Martin Groller : https://github.com/MadMG
+
+import moment from '../moment';
+
+function processRelativeTime(number, withoutSuffix, key, isFuture) {
+    var format = {
+        'm': ['eine Minute', 'einer Minute'],
+        'h': ['eine Stunde', 'einer Stunde'],
+        'd': ['ein Tag', 'einem Tag'],
+        'dd': [number + ' Tage', number + ' Tagen'],
+        'M': ['ein Monat', 'einem Monat'],
+        'MM': [number + ' Monate', number + ' Monaten'],
+        'y': ['ein Jahr', 'einem Jahr'],
+        'yy': [number + ' Jahre', number + ' Jahren']
+    };
+    return withoutSuffix ? format[key][0] : format[key][1];
+}
+
+export default moment.defineLocale('de-at', {
+    months : 'Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+    monthsShort : 'Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+    weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+    weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+    longDateFormat : {
+        LT: 'HH:mm',
+        LTS: 'HH:mm:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd, D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Heute um] LT [Uhr]',
+        sameElse: 'L',
+        nextDay: '[Morgen um] LT [Uhr]',
+        nextWeek: 'dddd [um] LT [Uhr]',
+        lastDay: '[Gestern um] LT [Uhr]',
+        lastWeek: '[letzten] dddd [um] LT [Uhr]'
+    },
+    relativeTime : {
+        future : 'in %s',
+        past : 'vor %s',
+        s : 'ein paar Sekunden',
+        m : processRelativeTime,
+        mm : '%d Minuten',
+        h : processRelativeTime,
+        hh : '%d Stunden',
+        d : processRelativeTime,
+        dd : processRelativeTime,
+        M : processRelativeTime,
+        MM : processRelativeTime,
+        y : processRelativeTime,
+        yy : processRelativeTime
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/de.js b/turtles/app/lib/bower_components/momentjs/src/locale/de.js
new file mode 100644
index 000000000..58c0c30e3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/de.js
@@ -0,0 +1,66 @@
+//! moment.js locale configuration
+//! locale : german (de)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+
+import moment from '../moment';
+
+function processRelativeTime(number, withoutSuffix, key, isFuture) {
+    var format = {
+        'm': ['eine Minute', 'einer Minute'],
+        'h': ['eine Stunde', 'einer Stunde'],
+        'd': ['ein Tag', 'einem Tag'],
+        'dd': [number + ' Tage', number + ' Tagen'],
+        'M': ['ein Monat', 'einem Monat'],
+        'MM': [number + ' Monate', number + ' Monaten'],
+        'y': ['ein Jahr', 'einem Jahr'],
+        'yy': [number + ' Jahre', number + ' Jahren']
+    };
+    return withoutSuffix ? format[key][0] : format[key][1];
+}
+
+export default moment.defineLocale('de', {
+    months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+    monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+    weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+    weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+    weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+    longDateFormat : {
+        LT: 'HH:mm',
+        LTS: 'HH:mm:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd, D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Heute um] LT [Uhr]',
+        sameElse: 'L',
+        nextDay: '[Morgen um] LT [Uhr]',
+        nextWeek: 'dddd [um] LT [Uhr]',
+        lastDay: '[Gestern um] LT [Uhr]',
+        lastWeek: '[letzten] dddd [um] LT [Uhr]'
+    },
+    relativeTime : {
+        future : 'in %s',
+        past : 'vor %s',
+        s : 'ein paar Sekunden',
+        m : processRelativeTime,
+        mm : '%d Minuten',
+        h : processRelativeTime,
+        hh : '%d Stunden',
+        d : processRelativeTime,
+        dd : processRelativeTime,
+        M : processRelativeTime,
+        MM : processRelativeTime,
+        y : processRelativeTime,
+        yy : processRelativeTime
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/el.js b/turtles/app/lib/bower_components/momentjs/src/locale/el.js
new file mode 100644
index 000000000..8830ada00
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/el.js
@@ -0,0 +1,85 @@
+//! moment.js locale configuration
+//! locale : modern greek (el)
+//! author : Aggelos Karalias : https://github.com/mehiel
+
+import moment from '../moment';
+
+export default moment.defineLocale('el', {
+    monthsNominativeEl : 'Ιανουάριος_Φεβρουάριος_Μάρτιος_Απρίλιος_Μάιος_Ιούνιος_Ιούλιος_Αύγουστος_Σεπτέμβριος_Οκτώβριος_Νοέμβριος_Δεκέμβριος'.split('_'),
+    monthsGenitiveEl : 'Ιανουαρίου_Φεβρουαρίου_Μαρτίου_Απριλίου_Μαΐου_Ιουνίου_Ιουλίου_Αυγούστου_Σεπτεμβρίου_Οκτωβρίου_Νοεμβρίου_Δεκεμβρίου'.split('_'),
+    months : function (momentToFormat, format) {
+        if (/D/.test(format.substring(0, format.indexOf('MMMM')))) { // if there is a day number before 'MMMM'
+            return this._monthsGenitiveEl[momentToFormat.month()];
+        } else {
+            return this._monthsNominativeEl[momentToFormat.month()];
+        }
+    },
+    monthsShort : 'Ιαν_Φεβ_Μαρ_Απρ_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_Νοε_Δεκ'.split('_'),
+    weekdays : 'Κυριακή_Δευτέρα_Τρίτη_Τετάρτη_Πέμπτη_Παρασκευή_Σάββατο'.split('_'),
+    weekdaysShort : 'Κυρ_Δευ_Τρι_Τετ_Πεμ_Παρ_Σαβ'.split('_'),
+    weekdaysMin : 'Κυ_Δε_Τρ_Τε_Πε_Πα_Σα'.split('_'),
+    meridiem : function (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'μμ' : 'ΜΜ';
+        } else {
+            return isLower ? 'πμ' : 'ΠΜ';
+        }
+    },
+    isPM : function (input) {
+        return ((input + '').toLowerCase()[0] === 'μ');
+    },
+    meridiemParse : /[ΠΜ]\.?Μ?\.?/i,
+    longDateFormat : {
+        LT : 'h:mm A',
+        LTS : 'h:mm:ss A',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendarEl : {
+        sameDay : '[Σήμερα {}] LT',
+        nextDay : '[Αύριο {}] LT',
+        nextWeek : 'dddd [{}] LT',
+        lastDay : '[Χθες {}] LT',
+        lastWeek : function () {
+            switch (this.day()) {
+                case 6:
+                    return '[το προηγούμενο] dddd [{}] LT';
+                default:
+                    return '[την προηγούμενη] dddd [{}] LT';
+            }
+        },
+        sameElse : 'L'
+    },
+    calendar : function (key, mom) {
+        var output = this._calendarEl[key],
+            hours = mom && mom.hours();
+        if (typeof output === 'function') {
+            output = output.apply(mom);
+        }
+        return output.replace('{}', (hours % 12 === 1 ? 'στη' : 'στις'));
+    },
+    relativeTime : {
+        future : 'σε %s',
+        past : '%s πριν',
+        s : 'λίγα δευτερόλεπτα',
+        m : 'ένα λεπτό',
+        mm : '%d λεπτά',
+        h : 'μία ώρα',
+        hh : '%d ώρες',
+        d : 'μία μέρα',
+        dd : '%d μέρες',
+        M : 'ένας μήνας',
+        MM : '%d μήνες',
+        y : 'ένας χρόνος',
+        yy : '%d χρόνια'
+    },
+    ordinalParse: /\d{1,2}η/,
+    ordinal: '%dη',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/en-au.js b/turtles/app/lib/bower_components/momentjs/src/locale/en-au.js
new file mode 100644
index 000000000..a06b6cb71
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/en-au.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+//! locale : australian english (en-au)
+
+import moment from '../moment';
+
+export default moment.defineLocale('en-au', {
+    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+    longDateFormat : {
+        LT : 'h:mm A',
+        LTS : 'h:mm:ss A',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'in %s',
+        past : '%s ago',
+        s : 'a few seconds',
+        m : 'a minute',
+        mm : '%d minutes',
+        h : 'an hour',
+        hh : '%d hours',
+        d : 'a day',
+        dd : '%d days',
+        M : 'a month',
+        MM : '%d months',
+        y : 'a year',
+        yy : '%d years'
+    },
+    ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+    ordinal : function (number) {
+        var b = number % 10,
+            output = (~~(number % 100 / 10) === 1) ? 'th' :
+            (b === 1) ? 'st' :
+            (b === 2) ? 'nd' :
+            (b === 3) ? 'rd' : 'th';
+        return number + output;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/en-ca.js b/turtles/app/lib/bower_components/momentjs/src/locale/en-ca.js
new file mode 100644
index 000000000..b33f8ab74
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/en-ca.js
@@ -0,0 +1,54 @@
+//! moment.js locale configuration
+//! locale : canadian english (en-ca)
+//! author : Jonathan Abourbih : https://github.com/jonbca
+
+import moment from '../moment';
+
+export default moment.defineLocale('en-ca', {
+    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+    longDateFormat : {
+        LT : 'h:mm A',
+        LTS : 'h:mm:ss A',
+        L : 'YYYY-MM-DD',
+        LL : 'D MMMM, YYYY',
+        LLL : 'D MMMM, YYYY LT',
+        LLLL : 'dddd, D MMMM, YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'in %s',
+        past : '%s ago',
+        s : 'a few seconds',
+        m : 'a minute',
+        mm : '%d minutes',
+        h : 'an hour',
+        hh : '%d hours',
+        d : 'a day',
+        dd : '%d days',
+        M : 'a month',
+        MM : '%d months',
+        y : 'a year',
+        yy : '%d years'
+    },
+    ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+    ordinal : function (number) {
+        var b = number % 10,
+            output = (~~(number % 100 / 10) === 1) ? 'th' :
+            (b === 1) ? 'st' :
+            (b === 2) ? 'nd' :
+            (b === 3) ? 'rd' : 'th';
+        return number + output;
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/en-gb.js b/turtles/app/lib/bower_components/momentjs/src/locale/en-gb.js
new file mode 100644
index 000000000..09961dd8e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/en-gb.js
@@ -0,0 +1,58 @@
+//! moment.js locale configuration
+//! locale : great britain english (en-gb)
+//! author : Chris Gedrim : https://github.com/chrisgedrim
+
+import moment from '../moment';
+
+export default moment.defineLocale('en-gb', {
+    months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'),
+    monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'),
+    weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'),
+    weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'),
+    weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'HH:mm:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Today at] LT',
+        nextDay : '[Tomorrow at] LT',
+        nextWeek : 'dddd [at] LT',
+        lastDay : '[Yesterday at] LT',
+        lastWeek : '[Last] dddd [at] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'in %s',
+        past : '%s ago',
+        s : 'a few seconds',
+        m : 'a minute',
+        mm : '%d minutes',
+        h : 'an hour',
+        hh : '%d hours',
+        d : 'a day',
+        dd : '%d days',
+        M : 'a month',
+        MM : '%d months',
+        y : 'a year',
+        yy : '%d years'
+    },
+    ordinalParse: /\d{1,2}(st|nd|rd|th)/,
+    ordinal : function (number) {
+        var b = number % 10,
+            output = (~~(number % 100 / 10) === 1) ? 'th' :
+            (b === 1) ? 'st' :
+            (b === 2) ? 'nd' :
+            (b === 3) ? 'rd' : 'th';
+        return number + output;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/eo.js b/turtles/app/lib/bower_components/momentjs/src/locale/eo.js
new file mode 100644
index 000000000..54ecf793a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/eo.js
@@ -0,0 +1,64 @@
+//! moment.js locale configuration
+//! locale : esperanto (eo)
+//! author : Colin Dean : https://github.com/colindean
+//! komento: Mi estas malcerta se mi korekte traktis akuzativojn en tiu traduko.
+//!          Se ne, bonvolu korekti kaj avizi min por ke mi povas lerni!
+
+import moment from '../moment';
+
+export default moment.defineLocale('eo', {
+    months : 'januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec'.split('_'),
+    weekdays : 'Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato'.split('_'),
+    weekdaysShort : 'Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab'.split('_'),
+    weekdaysMin : 'Di_Lu_Ma_Me_Ĵa_Ve_Sa'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'YYYY-MM-DD',
+        LL : 'D[-an de] MMMM, YYYY',
+        LLL : 'D[-an de] MMMM, YYYY LT',
+        LLLL : 'dddd, [la] D[-an de] MMMM, YYYY LT'
+    },
+    meridiemParse: /[ap]\.t\.m/i,
+    isPM: function (input) {
+        return input.charAt(0).toLowerCase() === 'p';
+    },
+    meridiem : function (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'p.t.m.' : 'P.T.M.';
+        } else {
+            return isLower ? 'a.t.m.' : 'A.T.M.';
+        }
+    },
+    calendar : {
+        sameDay : '[Hodiaŭ je] LT',
+        nextDay : '[Morgaŭ je] LT',
+        nextWeek : 'dddd [je] LT',
+        lastDay : '[Hieraŭ je] LT',
+        lastWeek : '[pasinta] dddd [je] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'je %s',
+        past : 'antaŭ %s',
+        s : 'sekundoj',
+        m : 'minuto',
+        mm : '%d minutoj',
+        h : 'horo',
+        hh : '%d horoj',
+        d : 'tago',//ne 'diurno', ĉar estas uzita por proksimumo
+        dd : '%d tagoj',
+        M : 'monato',
+        MM : '%d monatoj',
+        y : 'jaro',
+        yy : '%d jaroj'
+    },
+    ordinalParse: /\d{1,2}a/,
+    ordinal : '%da',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/es.js b/turtles/app/lib/bower_components/momentjs/src/locale/es.js
new file mode 100644
index 000000000..c9ea1f5e0
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/es.js
@@ -0,0 +1,70 @@
+//! moment.js locale configuration
+//! locale : spanish (es)
+//! author : Julio Napurí : https://github.com/julionc
+
+import moment from '../moment';
+
+var monthsShortDot = 'Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.'.split('_'),
+    monthsShort = 'Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic'.split('_');
+
+export default moment.defineLocale('es', {
+    months : 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'),
+    monthsShort : function (m, format) {
+        if (/-MMM-/.test(format)) {
+            return monthsShort[m.month()];
+        } else {
+            return monthsShortDot[m.month()];
+        }
+    },
+    weekdays : 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'),
+    weekdaysShort : 'Dom._Lun._Mar._Mié._Jue._Vie._Sáb.'.split('_'),
+    weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D [de] MMMM [de] YYYY',
+        LLL : 'D [de] MMMM [de] YYYY LT',
+        LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+    },
+    calendar : {
+        sameDay : function () {
+            return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        nextDay : function () {
+            return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        nextWeek : function () {
+            return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        lastDay : function () {
+            return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        lastWeek : function () {
+            return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'en %s',
+        past : 'hace %s',
+        s : 'unos segundos',
+        m : 'un minuto',
+        mm : '%d minutos',
+        h : 'una hora',
+        hh : '%d horas',
+        d : 'un día',
+        dd : '%d días',
+        M : 'un mes',
+        MM : '%d meses',
+        y : 'un año',
+        yy : '%d años'
+    },
+    ordinalParse : /\d{1,2}º/,
+    ordinal : '%dº',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/et.js b/turtles/app/lib/bower_components/momentjs/src/locale/et.js
new file mode 100644
index 000000000..68cbad949
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/et.js
@@ -0,0 +1,71 @@
+//! moment.js locale configuration
+//! locale : estonian (et)
+//! author : Henry Kehlmann : https://github.com/madhenry
+//! improvements : Illimar Tambek : https://github.com/ragulka
+
+import moment from '../moment';
+
+function processRelativeTime(number, withoutSuffix, key, isFuture) {
+    var format = {
+        's' : ['mõne sekundi', 'mõni sekund', 'paar sekundit'],
+        'm' : ['ühe minuti', 'üks minut'],
+        'mm': [number + ' minuti', number + ' minutit'],
+        'h' : ['ühe tunni', 'tund aega', 'üks tund'],
+        'hh': [number + ' tunni', number + ' tundi'],
+        'd' : ['ühe päeva', 'üks päev'],
+        'M' : ['kuu aja', 'kuu aega', 'üks kuu'],
+        'MM': [number + ' kuu', number + ' kuud'],
+        'y' : ['ühe aasta', 'aasta', 'üks aasta'],
+        'yy': [number + ' aasta', number + ' aastat']
+    };
+    if (withoutSuffix) {
+        return format[key][2] ? format[key][2] : format[key][1];
+    }
+    return isFuture ? format[key][0] : format[key][1];
+}
+
+export default moment.defineLocale('et', {
+    months        : 'jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember'.split('_'),
+    monthsShort   : 'jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets'.split('_'),
+    weekdays      : 'pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev'.split('_'),
+    weekdaysShort : 'P_E_T_K_N_R_L'.split('_'),
+    weekdaysMin   : 'P_E_T_K_N_R_L'.split('_'),
+    longDateFormat : {
+        LT   : 'H:mm',
+        LTS : 'LT:ss',
+        L    : 'DD.MM.YYYY',
+        LL   : 'D. MMMM YYYY',
+        LLL  : 'D. MMMM YYYY LT',
+        LLLL : 'dddd, D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay  : '[Täna,] LT',
+        nextDay  : '[Homme,] LT',
+        nextWeek : '[Järgmine] dddd LT',
+        lastDay  : '[Eile,] LT',
+        lastWeek : '[Eelmine] dddd LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s pärast',
+        past   : '%s tagasi',
+        s      : processRelativeTime,
+        m      : processRelativeTime,
+        mm     : processRelativeTime,
+        h      : processRelativeTime,
+        hh     : processRelativeTime,
+        d      : processRelativeTime,
+        dd     : '%d päeva',
+        M      : processRelativeTime,
+        MM     : processRelativeTime,
+        y      : processRelativeTime,
+        yy     : processRelativeTime
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/eu.js b/turtles/app/lib/bower_components/momentjs/src/locale/eu.js
new file mode 100644
index 000000000..2a05907b3
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/eu.js
@@ -0,0 +1,55 @@
+//! moment.js locale configuration
+//! locale : euskara (eu)
+//! author : Eneko Illarramendi : https://github.com/eillarra
+
+import moment from '../moment';
+
+export default moment.defineLocale('eu', {
+    months : 'urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua'.split('_'),
+    monthsShort : 'urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.'.split('_'),
+    weekdays : 'igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata'.split('_'),
+    weekdaysShort : 'ig._al._ar._az._og._ol._lr.'.split('_'),
+    weekdaysMin : 'ig_al_ar_az_og_ol_lr'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'YYYY-MM-DD',
+        LL : 'YYYY[ko] MMMM[ren] D[a]',
+        LLL : 'YYYY[ko] MMMM[ren] D[a] LT',
+        LLLL : 'dddd, YYYY[ko] MMMM[ren] D[a] LT',
+        l : 'YYYY-M-D',
+        ll : 'YYYY[ko] MMM D[a]',
+        lll : 'YYYY[ko] MMM D[a] LT',
+        llll : 'ddd, YYYY[ko] MMM D[a] LT'
+    },
+    calendar : {
+        sameDay : '[gaur] LT[etan]',
+        nextDay : '[bihar] LT[etan]',
+        nextWeek : 'dddd LT[etan]',
+        lastDay : '[atzo] LT[etan]',
+        lastWeek : '[aurreko] dddd LT[etan]',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s barru',
+        past : 'duela %s',
+        s : 'segundo batzuk',
+        m : 'minutu bat',
+        mm : '%d minutu',
+        h : 'ordu bat',
+        hh : '%d ordu',
+        d : 'egun bat',
+        dd : '%d egun',
+        M : 'hilabete bat',
+        MM : '%d hilabete',
+        y : 'urte bat',
+        yy : '%d urte'
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/fa.js b/turtles/app/lib/bower_components/momentjs/src/locale/fa.js
new file mode 100644
index 000000000..e898adfaf
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/fa.js
@@ -0,0 +1,96 @@
+//! moment.js locale configuration
+//! locale : Persian (fa)
+//! author : Ebrahim Byagowi : https://github.com/ebraminio
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '۱',
+    '2': '۲',
+    '3': '۳',
+    '4': '۴',
+    '5': '۵',
+    '6': '۶',
+    '7': '۷',
+    '8': '۸',
+    '9': '۹',
+    '0': '۰'
+}, numberMap = {
+    '۱': '1',
+    '۲': '2',
+    '۳': '3',
+    '۴': '4',
+    '۵': '5',
+    '۶': '6',
+    '۷': '7',
+    '۸': '8',
+    '۹': '9',
+    '۰': '0'
+};
+
+export default moment.defineLocale('fa', {
+    months : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+    monthsShort : 'ژانویه_فوریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر'.split('_'),
+    weekdays : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+    weekdaysShort : 'یک\u200cشنبه_دوشنبه_سه\u200cشنبه_چهارشنبه_پنج\u200cشنبه_جمعه_شنبه'.split('_'),
+    weekdaysMin : 'ی_د_س_چ_پ_ج_ش'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    meridiemParse: /قبل از ظهر|بعد از ظهر/,
+    isPM: function (input) {
+        return /بعد از ظهر/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 12) {
+            return 'قبل از ظهر';
+        } else {
+            return 'بعد از ظهر';
+        }
+    },
+    calendar : {
+        sameDay : '[امروز ساعت] LT',
+        nextDay : '[فردا ساعت] LT',
+        nextWeek : 'dddd [ساعت] LT',
+        lastDay : '[دیروز ساعت] LT',
+        lastWeek : 'dddd [پیش] [ساعت] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'در %s',
+        past : '%s پیش',
+        s : 'چندین ثانیه',
+        m : 'یک دقیقه',
+        mm : '%d دقیقه',
+        h : 'یک ساعت',
+        hh : '%d ساعت',
+        d : 'یک روز',
+        dd : '%d روز',
+        M : 'یک ماه',
+        MM : '%d ماه',
+        y : 'یک سال',
+        yy : '%d سال'
+    },
+    preparse: function (string) {
+        return string.replace(/[۰-۹]/g, function (match) {
+            return numberMap[match];
+        }).replace(/،/g, ',');
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        }).replace(/,/g, '،');
+    },
+    ordinalParse: /\d{1,2}م/,
+    ordinal : '%dم',
+    week : {
+        dow : 6, // Saturday is the first day of the week.
+        doy : 12 // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/fi.js b/turtles/app/lib/bower_components/momentjs/src/locale/fi.js
new file mode 100644
index 000000000..ee3851611
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/fi.js
@@ -0,0 +1,98 @@
+//! moment.js locale configuration
+//! locale : finnish (fi)
+//! author : Tarmo Aidantausta : https://github.com/bleadof
+
+import moment from '../moment';
+
+var numbersPast = 'nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän'.split(' '),
+    numbersFuture = [
+        'nolla', 'yhden', 'kahden', 'kolmen', 'neljän', 'viiden', 'kuuden',
+        numbersPast[7], numbersPast[8], numbersPast[9]
+    ];
+function translate(number, withoutSuffix, key, isFuture) {
+    var result = '';
+    switch (key) {
+    case 's':
+        return isFuture ? 'muutaman sekunnin' : 'muutama sekunti';
+    case 'm':
+        return isFuture ? 'minuutin' : 'minuutti';
+    case 'mm':
+        result = isFuture ? 'minuutin' : 'minuuttia';
+        break;
+    case 'h':
+        return isFuture ? 'tunnin' : 'tunti';
+    case 'hh':
+        result = isFuture ? 'tunnin' : 'tuntia';
+        break;
+    case 'd':
+        return isFuture ? 'päivän' : 'päivä';
+    case 'dd':
+        result = isFuture ? 'päivän' : 'päivää';
+        break;
+    case 'M':
+        return isFuture ? 'kuukauden' : 'kuukausi';
+    case 'MM':
+        result = isFuture ? 'kuukauden' : 'kuukautta';
+        break;
+    case 'y':
+        return isFuture ? 'vuoden' : 'vuosi';
+    case 'yy':
+        result = isFuture ? 'vuoden' : 'vuotta';
+        break;
+    }
+    result = verbalNumber(number, isFuture) + ' ' + result;
+    return result;
+}
+function verbalNumber(number, isFuture) {
+    return number < 10 ? (isFuture ? numbersFuture[number] : numbersPast[number]) : number;
+}
+
+export default moment.defineLocale('fi', {
+    months : 'tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu'.split('_'),
+    monthsShort : 'tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu'.split('_'),
+    weekdays : 'sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai'.split('_'),
+    weekdaysShort : 'su_ma_ti_ke_to_pe_la'.split('_'),
+    weekdaysMin : 'su_ma_ti_ke_to_pe_la'.split('_'),
+    longDateFormat : {
+        LT : 'HH.mm',
+        LTS : 'HH.mm.ss',
+        L : 'DD.MM.YYYY',
+        LL : 'Do MMMM[ta] YYYY',
+        LLL : 'Do MMMM[ta] YYYY, [klo] LT',
+        LLLL : 'dddd, Do MMMM[ta] YYYY, [klo] LT',
+        l : 'D.M.YYYY',
+        ll : 'Do MMM YYYY',
+        lll : 'Do MMM YYYY, [klo] LT',
+        llll : 'ddd, Do MMM YYYY, [klo] LT'
+    },
+    calendar : {
+        sameDay : '[tänään] [klo] LT',
+        nextDay : '[huomenna] [klo] LT',
+        nextWeek : 'dddd [klo] LT',
+        lastDay : '[eilen] [klo] LT',
+        lastWeek : '[viime] dddd[na] [klo] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s päästä',
+        past : '%s sitten',
+        s : translate,
+        m : translate,
+        mm : translate,
+        h : translate,
+        hh : translate,
+        d : translate,
+        dd : translate,
+        M : translate,
+        MM : translate,
+        y : translate,
+        yy : translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/fo.js b/turtles/app/lib/bower_components/momentjs/src/locale/fo.js
new file mode 100644
index 000000000..28a8e17af
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/fo.js
@@ -0,0 +1,51 @@
+//! moment.js locale configuration
+//! locale : faroese (fo)
+//! author : Ragnar Johannesen : https://github.com/ragnar123
+
+import moment from '../moment';
+
+export default moment.defineLocale('fo', {
+    months : 'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+    weekdays : 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
+    weekdaysShort : 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
+    weekdaysMin : 'su_má_tý_mi_hó_fr_le'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D. MMMM, YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Í dag kl.] LT',
+        nextDay : '[Í morgin kl.] LT',
+        nextWeek : 'dddd [kl.] LT',
+        lastDay : '[Í gjár kl.] LT',
+        lastWeek : '[síðstu] dddd [kl] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'um %s',
+        past : '%s síðani',
+        s : 'fá sekund',
+        m : 'ein minutt',
+        mm : '%d minuttir',
+        h : 'ein tími',
+        hh : '%d tímar',
+        d : 'ein dagur',
+        dd : '%d dagar',
+        M : 'ein mánaði',
+        MM : '%d mánaðir',
+        y : 'eitt ár',
+        yy : '%d ár'
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/fr-ca.js b/turtles/app/lib/bower_components/momentjs/src/locale/fr-ca.js
new file mode 100644
index 000000000..ef95bd2e6
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/fr-ca.js
@@ -0,0 +1,49 @@
+//! moment.js locale configuration
+//! locale : canadian french (fr-ca)
+//! author : Jonathan Abourbih : https://github.com/jonbca
+
+import moment from '../moment';
+
+export default moment.defineLocale('fr-ca', {
+    months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+    monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+    weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+    weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+    weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'YYYY-MM-DD',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Aujourd\'hui à] LT',
+        nextDay: '[Demain à] LT',
+        nextWeek: 'dddd [à] LT',
+        lastDay: '[Hier à] LT',
+        lastWeek: 'dddd [dernier à] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'dans %s',
+        past : 'il y a %s',
+        s : 'quelques secondes',
+        m : 'une minute',
+        mm : '%d minutes',
+        h : 'une heure',
+        hh : '%d heures',
+        d : 'un jour',
+        dd : '%d jours',
+        M : 'un mois',
+        MM : '%d mois',
+        y : 'un an',
+        yy : '%d ans'
+    },
+    ordinalParse: /\d{1,2}(er|)/,
+    ordinal : function (number) {
+        return number + (number === 1 ? 'er' : '');
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/fr.js b/turtles/app/lib/bower_components/momentjs/src/locale/fr.js
new file mode 100644
index 000000000..7492f85bf
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/fr.js
@@ -0,0 +1,53 @@
+//! moment.js locale configuration
+//! locale : french (fr)
+//! author : John Fischer : https://github.com/jfroffice
+
+import moment from '../moment';
+
+export default moment.defineLocale('fr', {
+    months : 'janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre'.split('_'),
+    monthsShort : 'janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.'.split('_'),
+    weekdays : 'dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi'.split('_'),
+    weekdaysShort : 'dim._lun._mar._mer._jeu._ven._sam.'.split('_'),
+    weekdaysMin : 'Di_Lu_Ma_Me_Je_Ve_Sa'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Aujourd\'hui à] LT',
+        nextDay: '[Demain à] LT',
+        nextWeek: 'dddd [à] LT',
+        lastDay: '[Hier à] LT',
+        lastWeek: 'dddd [dernier à] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'dans %s',
+        past : 'il y a %s',
+        s : 'quelques secondes',
+        m : 'une minute',
+        mm : '%d minutes',
+        h : 'une heure',
+        hh : '%d heures',
+        d : 'un jour',
+        dd : '%d jours',
+        M : 'un mois',
+        MM : '%d mois',
+        y : 'un an',
+        yy : '%d ans'
+    },
+    ordinalParse: /\d{1,2}(er|)/,
+    ordinal : function (number) {
+        return number + (number === 1 ? 'er' : '');
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/fy.js b/turtles/app/lib/bower_components/momentjs/src/locale/fy.js
new file mode 100644
index 000000000..2ccf17905
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/fy.js
@@ -0,0 +1,62 @@
+//! moment.js locale configuration
+//! locale : frisian (fy)
+//! author : Robin van der Vliet : https://github.com/robin0van0der0v
+
+import moment from '../moment';
+
+var monthsShortWithDots = 'jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.'.split('_'),
+    monthsShortWithoutDots = 'jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_');
+
+export default moment.defineLocale('fy', {
+    months : 'jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber'.split('_'),
+    monthsShort : function (m, format) {
+        if (/-MMM-/.test(format)) {
+            return monthsShortWithoutDots[m.month()];
+        } else {
+            return monthsShortWithDots[m.month()];
+        }
+    },
+    weekdays : 'snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon'.split('_'),
+    weekdaysShort : 'si._mo._ti._wo._to._fr._so.'.split('_'),
+    weekdaysMin : 'Si_Mo_Ti_Wo_To_Fr_So'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD-MM-YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[hjoed om] LT',
+        nextDay: '[moarn om] LT',
+        nextWeek: 'dddd [om] LT',
+        lastDay: '[juster om] LT',
+        lastWeek: '[ôfrûne] dddd [om] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'oer %s',
+        past : '%s lyn',
+        s : 'in pear sekonden',
+        m : 'ien minút',
+        mm : '%d minuten',
+        h : 'ien oere',
+        hh : '%d oeren',
+        d : 'ien dei',
+        dd : '%d dagen',
+        M : 'ien moanne',
+        MM : '%d moannen',
+        y : 'ien jier',
+        yy : '%d jierren'
+    },
+    ordinalParse: /\d{1,2}(ste|de)/,
+    ordinal : function (number) {
+        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/gl.js b/turtles/app/lib/bower_components/momentjs/src/locale/gl.js
new file mode 100644
index 000000000..44138096d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/gl.js
@@ -0,0 +1,66 @@
+//! moment.js locale configuration
+//! locale : galician (gl)
+//! author : Juan G. Hurtado : https://github.com/juanghurtado
+
+import moment from '../moment';
+
+export default moment.defineLocale('gl', {
+    months : 'Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro'.split('_'),
+    monthsShort : 'Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.'.split('_'),
+    weekdays : 'Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado'.split('_'),
+    weekdaysShort : 'Dom._Lun._Mar._Mér._Xov._Ven._Sáb.'.split('_'),
+    weekdaysMin : 'Do_Lu_Ma_Mé_Xo_Ve_Sá'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : function () {
+            return '[hoxe ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+        },
+        nextDay : function () {
+            return '[mañá ' + ((this.hours() !== 1) ? 'ás' : 'á') + '] LT';
+        },
+        nextWeek : function () {
+            return 'dddd [' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+        },
+        lastDay : function () {
+            return '[onte ' + ((this.hours() !== 1) ? 'á' : 'a') + '] LT';
+        },
+        lastWeek : function () {
+            return '[o] dddd [pasado ' + ((this.hours() !== 1) ? 'ás' : 'a') + '] LT';
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : function (str) {
+            if (str === 'uns segundos') {
+                return 'nuns segundos';
+            }
+            return 'en ' + str;
+        },
+        past : 'hai %s',
+        s : 'uns segundos',
+        m : 'un minuto',
+        mm : '%d minutos',
+        h : 'unha hora',
+        hh : '%d horas',
+        d : 'un día',
+        dd : '%d días',
+        M : 'un mes',
+        MM : '%d meses',
+        y : 'un ano',
+        yy : '%d anos'
+    },
+    ordinalParse : /\d{1,2}º/,
+    ordinal : '%dº',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/he.js b/turtles/app/lib/bower_components/momentjs/src/locale/he.js
new file mode 100644
index 000000000..dd4f2d2ce
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/he.js
@@ -0,0 +1,73 @@
+//! moment.js locale configuration
+//! locale : Hebrew (he)
+//! author : Tomer Cohen : https://github.com/tomer
+//! author : Moshe Simantov : https://github.com/DevelopmentIL
+//! author : Tal Ater : https://github.com/TalAter
+
+import moment from '../moment';
+
+export default moment.defineLocale('he', {
+    months : 'ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר'.split('_'),
+    monthsShort : 'ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳'.split('_'),
+    weekdays : 'ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת'.split('_'),
+    weekdaysShort : 'א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳'.split('_'),
+    weekdaysMin : 'א_ב_ג_ד_ה_ו_ש'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D [ב]MMMM YYYY',
+        LLL : 'D [ב]MMMM YYYY LT',
+        LLLL : 'dddd, D [ב]MMMM YYYY LT',
+        l : 'D/M/YYYY',
+        ll : 'D MMM YYYY',
+        lll : 'D MMM YYYY LT',
+        llll : 'ddd, D MMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[היום ב־]LT',
+        nextDay : '[מחר ב־]LT',
+        nextWeek : 'dddd [בשעה] LT',
+        lastDay : '[אתמול ב־]LT',
+        lastWeek : '[ביום] dddd [האחרון בשעה] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'בעוד %s',
+        past : 'לפני %s',
+        s : 'מספר שניות',
+        m : 'דקה',
+        mm : '%d דקות',
+        h : 'שעה',
+        hh : function (number) {
+            if (number === 2) {
+                return 'שעתיים';
+            }
+            return number + ' שעות';
+        },
+        d : 'יום',
+        dd : function (number) {
+            if (number === 2) {
+                return 'יומיים';
+            }
+            return number + ' ימים';
+        },
+        M : 'חודש',
+        MM : function (number) {
+            if (number === 2) {
+                return 'חודשיים';
+            }
+            return number + ' חודשים';
+        },
+        y : 'שנה',
+        yy : function (number) {
+            if (number === 2) {
+                return 'שנתיים';
+            } else if (number % 10 === 0 && number !== 10) {
+                return number + ' שנה';
+            }
+            return number + ' שנים';
+        }
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/hi.js b/turtles/app/lib/bower_components/momentjs/src/locale/hi.js
new file mode 100644
index 000000000..3d568395b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/hi.js
@@ -0,0 +1,114 @@
+//! moment.js locale configuration
+//! locale : hindi (hi)
+//! author : Mayank Singhal : https://github.com/mayanksinghal
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '१',
+    '2': '२',
+    '3': '३',
+    '4': '४',
+    '5': '५',
+    '6': '६',
+    '7': '७',
+    '8': '८',
+    '9': '९',
+    '0': '०'
+},
+numberMap = {
+    '१': '1',
+    '२': '2',
+    '३': '3',
+    '४': '4',
+    '५': '5',
+    '६': '6',
+    '७': '7',
+    '८': '8',
+    '९': '9',
+    '०': '0'
+};
+
+export default moment.defineLocale('hi', {
+    months : 'जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर'.split('_'),
+    monthsShort : 'जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.'.split('_'),
+    weekdays : 'रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+    weekdaysShort : 'रवि_सोम_मंगल_बुध_गुरू_शुक्र_शनि'.split('_'),
+    weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+    longDateFormat : {
+        LT : 'A h:mm बजे',
+        LTS : 'A h:mm:ss बजे',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY, LT',
+        LLLL : 'dddd, D MMMM YYYY, LT'
+    },
+    calendar : {
+        sameDay : '[आज] LT',
+        nextDay : '[कल] LT',
+        nextWeek : 'dddd, LT',
+        lastDay : '[कल] LT',
+        lastWeek : '[पिछले] dddd, LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s में',
+        past : '%s पहले',
+        s : 'कुछ ही क्षण',
+        m : 'एक मिनट',
+        mm : '%d मिनट',
+        h : 'एक घंटा',
+        hh : '%d घंटे',
+        d : 'एक दिन',
+        dd : '%d दिन',
+        M : 'एक महीने',
+        MM : '%d महीने',
+        y : 'एक वर्ष',
+        yy : '%d वर्ष'
+    },
+    preparse: function (string) {
+        return string.replace(/[१२३४५६७८९०]/g, function (match) {
+            return numberMap[match];
+        });
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        });
+    },
+    // Hindi notation for meridiems are quite fuzzy in practice. While there exists
+    // a rigid notion of a 'Pahar' it is not used as rigidly in modern Hindi.
+    meridiemParse: /रात|सुबह|दोपहर|शाम/,
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === 'रात') {
+            return hour < 4 ? hour : hour + 12;
+        } else if (meridiem === 'सुबह') {
+            return hour;
+        } else if (meridiem === 'दोपहर') {
+            return hour >= 10 ? hour : hour + 12;
+        } else if (meridiem === 'शाम') {
+            return hour + 12;
+        }
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'रात';
+        } else if (hour < 10) {
+            return 'सुबह';
+        } else if (hour < 17) {
+            return 'दोपहर';
+        } else if (hour < 20) {
+            return 'शाम';
+        } else {
+            return 'रात';
+        }
+    },
+    week : {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/hr.js b/turtles/app/lib/bower_components/momentjs/src/locale/hr.js
new file mode 100644
index 000000000..eab62dfb1
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/hr.js
@@ -0,0 +1,131 @@
+//! moment.js locale configuration
+//! locale : hrvatski (hr)
+//! author : Bojan Marković : https://github.com/bmarkovic
+
+import moment from '../moment';
+
+function translate(number, withoutSuffix, key) {
+    var result = number + ' ';
+    switch (key) {
+    case 'm':
+        return withoutSuffix ? 'jedna minuta' : 'jedne minute';
+    case 'mm':
+        if (number === 1) {
+            result += 'minuta';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'minute';
+        } else {
+            result += 'minuta';
+        }
+        return result;
+    case 'h':
+        return withoutSuffix ? 'jedan sat' : 'jednog sata';
+    case 'hh':
+        if (number === 1) {
+            result += 'sat';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'sata';
+        } else {
+            result += 'sati';
+        }
+        return result;
+    case 'dd':
+        if (number === 1) {
+            result += 'dan';
+        } else {
+            result += 'dana';
+        }
+        return result;
+    case 'MM':
+        if (number === 1) {
+            result += 'mjesec';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'mjeseca';
+        } else {
+            result += 'mjeseci';
+        }
+        return result;
+    case 'yy':
+        if (number === 1) {
+            result += 'godina';
+        } else if (number === 2 || number === 3 || number === 4) {
+            result += 'godine';
+        } else {
+            result += 'godina';
+        }
+        return result;
+    }
+}
+
+export default moment.defineLocale('hr', {
+    months : 'siječanj_veljača_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac'.split('_'),
+    monthsShort : 'sij._velj._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.'.split('_'),
+    weekdays : 'nedjelja_ponedjeljak_utorak_srijeda_četvrtak_petak_subota'.split('_'),
+    weekdaysShort : 'ned._pon._uto._sri._čet._pet._sub.'.split('_'),
+    weekdaysMin : 'ne_po_ut_sr_če_pe_su'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD. MM. YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd, D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay  : '[danas u] LT',
+        nextDay  : '[sutra u] LT',
+        nextWeek : function () {
+            switch (this.day()) {
+            case 0:
+                return '[u] [nedjelju] [u] LT';
+            case 3:
+                return '[u] [srijedu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        },
+        lastDay  : '[jučer u] LT',
+        lastWeek : function () {
+            switch (this.day()) {
+            case 0:
+            case 3:
+                return '[prošlu] dddd [u] LT';
+            case 6:
+                return '[prošle] [subote] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[prošli] dddd [u] LT';
+            }
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past   : 'prije %s',
+        s      : 'par sekundi',
+        m      : translate,
+        mm     : translate,
+        h      : translate,
+        hh     : translate,
+        d      : 'dan',
+        dd     : translate,
+        M      : 'mjesec',
+        MM     : translate,
+        y      : 'godinu',
+        yy     : translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/hu.js b/turtles/app/lib/bower_components/momentjs/src/locale/hu.js
new file mode 100644
index 000000000..9359a3cfd
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/hu.js
@@ -0,0 +1,100 @@
+//! moment.js locale configuration
+//! locale : hungarian (hu)
+//! author : Adam Brunner : https://github.com/adambrunner
+
+import moment from '../moment';
+
+var weekEndings = 'vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton'.split(' ');
+function translate(number, withoutSuffix, key, isFuture) {
+    var num = number,
+        suffix;
+    switch (key) {
+    case 's':
+        return (isFuture || withoutSuffix) ? 'néhány másodperc' : 'néhány másodperce';
+    case 'm':
+        return 'egy' + (isFuture || withoutSuffix ? ' perc' : ' perce');
+    case 'mm':
+        return num + (isFuture || withoutSuffix ? ' perc' : ' perce');
+    case 'h':
+        return 'egy' + (isFuture || withoutSuffix ? ' óra' : ' órája');
+    case 'hh':
+        return num + (isFuture || withoutSuffix ? ' óra' : ' órája');
+    case 'd':
+        return 'egy' + (isFuture || withoutSuffix ? ' nap' : ' napja');
+    case 'dd':
+        return num + (isFuture || withoutSuffix ? ' nap' : ' napja');
+    case 'M':
+        return 'egy' + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+    case 'MM':
+        return num + (isFuture || withoutSuffix ? ' hónap' : ' hónapja');
+    case 'y':
+        return 'egy' + (isFuture || withoutSuffix ? ' év' : ' éve');
+    case 'yy':
+        return num + (isFuture || withoutSuffix ? ' év' : ' éve');
+    }
+    return '';
+}
+function week(isFuture) {
+    return (isFuture ? '' : '[múlt] ') + '[' + weekEndings[this.day()] + '] LT[-kor]';
+}
+
+export default moment.defineLocale('hu', {
+    months : 'január_február_március_április_május_június_július_augusztus_szeptember_október_november_december'.split('_'),
+    monthsShort : 'jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec'.split('_'),
+    weekdays : 'vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat'.split('_'),
+    weekdaysShort : 'vas_hét_kedd_sze_csüt_pén_szo'.split('_'),
+    weekdaysMin : 'v_h_k_sze_cs_p_szo'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'YYYY.MM.DD.',
+        LL : 'YYYY. MMMM D.',
+        LLL : 'YYYY. MMMM D., LT',
+        LLLL : 'YYYY. MMMM D., dddd LT'
+    },
+    meridiemParse: /de|du/i,
+    isPM: function (input) {
+        return input.charAt(1).toLowerCase() === 'u';
+    },
+    meridiem : function (hours, minutes, isLower) {
+        if (hours < 12) {
+            return isLower === true ? 'de' : 'DE';
+        } else {
+            return isLower === true ? 'du' : 'DU';
+        }
+    },
+    calendar : {
+        sameDay : '[ma] LT[-kor]',
+        nextDay : '[holnap] LT[-kor]',
+        nextWeek : function () {
+            return week.call(this, true);
+        },
+        lastDay : '[tegnap] LT[-kor]',
+        lastWeek : function () {
+            return week.call(this, false);
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s múlva',
+        past : '%s',
+        s : translate,
+        m : translate,
+        mm : translate,
+        h : translate,
+        hh : translate,
+        d : translate,
+        dd : translate,
+        M : translate,
+        MM : translate,
+        y : translate,
+        yy : translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/hy-am.js b/turtles/app/lib/bower_components/momentjs/src/locale/hy-am.js
new file mode 100644
index 000000000..fdaac2f98
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/hy-am.js
@@ -0,0 +1,102 @@
+//! moment.js locale configuration
+//! locale : Armenian (hy-am)
+//! author : Armendarabyan : https://github.com/armendarabyan
+
+import moment from '../moment';
+
+function monthsCaseReplace(m, format) {
+    var months = {
+        'nominative': 'հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր'.split('_'),
+        'accusative': 'հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի'.split('_')
+    },
+    nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+        'accusative' :
+        'nominative';
+    return months[nounCase][m.month()];
+}
+function monthsShortCaseReplace(m, format) {
+    var monthsShort = 'հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ'.split('_');
+    return monthsShort[m.month()];
+}
+function weekdaysCaseReplace(m, format) {
+    var weekdays = 'կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ'.split('_');
+    return weekdays[m.day()];
+}
+
+export default moment.defineLocale('hy-am', {
+    months : monthsCaseReplace,
+    monthsShort : monthsShortCaseReplace,
+    weekdays : weekdaysCaseReplace,
+    weekdaysShort : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+    weekdaysMin : 'կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY թ.',
+        LLL : 'D MMMM YYYY թ., LT',
+        LLLL : 'dddd, D MMMM YYYY թ., LT'
+    },
+    calendar : {
+        sameDay: '[այսօր] LT',
+        nextDay: '[վաղը] LT',
+        lastDay: '[երեկ] LT',
+        nextWeek: function () {
+            return 'dddd [օրը ժամը] LT';
+        },
+        lastWeek: function () {
+            return '[անցած] dddd [օրը ժամը] LT';
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : '%s հետո',
+        past : '%s առաջ',
+        s : 'մի քանի վայրկյան',
+        m : 'րոպե',
+        mm : '%d րոպե',
+        h : 'ժամ',
+        hh : '%d ժամ',
+        d : 'օր',
+        dd : '%d օր',
+        M : 'ամիս',
+        MM : '%d ամիս',
+        y : 'տարի',
+        yy : '%d տարի'
+    },
+    meridiemParse: /գիշերվա|առավոտվա|ցերեկվա|երեկոյան/,
+    isPM: function (input) {
+        return /^(ցերեկվա|երեկոյան)$/.test(input);
+    },
+    meridiem : function (hour) {
+        if (hour < 4) {
+            return 'գիշերվա';
+        } else if (hour < 12) {
+            return 'առավոտվա';
+        } else if (hour < 17) {
+            return 'ցերեկվա';
+        } else {
+            return 'երեկոյան';
+        }
+    },
+    ordinalParse: /\d{1,2}|\d{1,2}-(ին|րդ)/,
+    ordinal: function (number, period) {
+        switch (period) {
+        case 'DDD':
+        case 'w':
+        case 'W':
+        case 'DDDo':
+            if (number === 1) {
+                return number + '-ին';
+            }
+            return number + '-րդ';
+        default:
+            return number;
+        }
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/id.js b/turtles/app/lib/bower_components/momentjs/src/locale/id.js
new file mode 100644
index 000000000..8af7f0252
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/id.js
@@ -0,0 +1,74 @@
+//! moment.js locale configuration
+//! locale : Bahasa Indonesia (id)
+//! author : Mohammad Satrio Utomo : https://github.com/tyok
+//! reference: http://id.wikisource.org/wiki/Pedoman_Umum_Ejaan_Bahasa_Indonesia_yang_Disempurnakan
+
+import moment from '../moment';
+
+export default moment.defineLocale('id', {
+    months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember'.split('_'),
+    monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des'.split('_'),
+    weekdays : 'Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu'.split('_'),
+    weekdaysShort : 'Min_Sen_Sel_Rab_Kam_Jum_Sab'.split('_'),
+    weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sb'.split('_'),
+    longDateFormat : {
+        LT : 'HH.mm',
+        LTS : 'LT.ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY [pukul] LT',
+        LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+    },
+    meridiemParse: /pagi|siang|sore|malam/,
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === 'pagi') {
+            return hour;
+        } else if (meridiem === 'siang') {
+            return hour >= 11 ? hour : hour + 12;
+        } else if (meridiem === 'sore' || meridiem === 'malam') {
+            return hour + 12;
+        }
+    },
+    meridiem : function (hours, minutes, isLower) {
+        if (hours < 11) {
+            return 'pagi';
+        } else if (hours < 15) {
+            return 'siang';
+        } else if (hours < 19) {
+            return 'sore';
+        } else {
+            return 'malam';
+        }
+    },
+    calendar : {
+        sameDay : '[Hari ini pukul] LT',
+        nextDay : '[Besok pukul] LT',
+        nextWeek : 'dddd [pukul] LT',
+        lastDay : '[Kemarin pukul] LT',
+        lastWeek : 'dddd [lalu pukul] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'dalam %s',
+        past : '%s yang lalu',
+        s : 'beberapa detik',
+        m : 'semenit',
+        mm : '%d menit',
+        h : 'sejam',
+        hh : '%d jam',
+        d : 'sehari',
+        dd : '%d hari',
+        M : 'sebulan',
+        MM : '%d bulan',
+        y : 'setahun',
+        yy : '%d tahun'
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/is.js b/turtles/app/lib/bower_components/momentjs/src/locale/is.js
new file mode 100644
index 000000000..13b8815cd
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/is.js
@@ -0,0 +1,118 @@
+//! moment.js locale configuration
+//! locale : icelandic (is)
+//! author : Hinrik Örn Sigurðsson : https://github.com/hinrik
+
+import moment from '../moment';
+
+function plural(n) {
+    if (n % 100 === 11) {
+        return true;
+    } else if (n % 10 === 1) {
+        return false;
+    }
+    return true;
+}
+function translate(number, withoutSuffix, key, isFuture) {
+    var result = number + ' ';
+    switch (key) {
+    case 's':
+        return withoutSuffix || isFuture ? 'nokkrar sekúndur' : 'nokkrum sekúndum';
+    case 'm':
+        return withoutSuffix ? 'mínúta' : 'mínútu';
+    case 'mm':
+        if (plural(number)) {
+            return result + (withoutSuffix || isFuture ? 'mínútur' : 'mínútum');
+        } else if (withoutSuffix) {
+            return result + 'mínúta';
+        }
+        return result + 'mínútu';
+    case 'hh':
+        if (plural(number)) {
+            return result + (withoutSuffix || isFuture ? 'klukkustundir' : 'klukkustundum');
+        }
+        return result + 'klukkustund';
+    case 'd':
+        if (withoutSuffix) {
+            return 'dagur';
+        }
+        return isFuture ? 'dag' : 'degi';
+    case 'dd':
+        if (plural(number)) {
+            if (withoutSuffix) {
+                return result + 'dagar';
+            }
+            return result + (isFuture ? 'daga' : 'dögum');
+        } else if (withoutSuffix) {
+            return result + 'dagur';
+        }
+        return result + (isFuture ? 'dag' : 'degi');
+    case 'M':
+        if (withoutSuffix) {
+            return 'mánuður';
+        }
+        return isFuture ? 'mánuð' : 'mánuði';
+    case 'MM':
+        if (plural(number)) {
+            if (withoutSuffix) {
+                return result + 'mánuðir';
+            }
+            return result + (isFuture ? 'mánuði' : 'mánuðum');
+        } else if (withoutSuffix) {
+            return result + 'mánuður';
+        }
+        return result + (isFuture ? 'mánuð' : 'mánuði');
+    case 'y':
+        return withoutSuffix || isFuture ? 'ár' : 'ári';
+    case 'yy':
+        if (plural(number)) {
+            return result + (withoutSuffix || isFuture ? 'ár' : 'árum');
+        }
+        return result + (withoutSuffix || isFuture ? 'ár' : 'ári');
+    }
+}
+
+export default moment.defineLocale('is', {
+    months : 'janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des'.split('_'),
+    weekdays : 'sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur'.split('_'),
+    weekdaysShort : 'sun_mán_þri_mið_fim_fös_lau'.split('_'),
+    weekdaysMin : 'Su_Má_Þr_Mi_Fi_Fö_La'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY [kl.] LT',
+        LLLL : 'dddd, D. MMMM YYYY [kl.] LT'
+    },
+    calendar : {
+        sameDay : '[í dag kl.] LT',
+        nextDay : '[á morgun kl.] LT',
+        nextWeek : 'dddd [kl.] LT',
+        lastDay : '[í gær kl.] LT',
+        lastWeek : '[síðasta] dddd [kl.] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'eftir %s',
+        past : 'fyrir %s síðan',
+        s : translate,
+        m : translate,
+        mm : translate,
+        h : 'klukkustund',
+        hh : translate,
+        d : translate,
+        dd : translate,
+        M : translate,
+        MM : translate,
+        y : translate,
+        yy : translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/it.js b/turtles/app/lib/bower_components/momentjs/src/locale/it.js
new file mode 100644
index 000000000..63f34ac5c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/it.js
@@ -0,0 +1,61 @@
+//! moment.js locale configuration
+//! locale : italian (it)
+//! author : Lorenzo : https://github.com/aliem
+//! author: Mattia Larentis: https://github.com/nostalgiaz
+
+import moment from '../moment';
+
+export default moment.defineLocale('it', {
+    months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+    monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+    weekdays : 'Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato'.split('_'),
+    weekdaysShort : 'Dom_Lun_Mar_Mer_Gio_Ven_Sab'.split('_'),
+    weekdaysMin : 'D_L_Ma_Me_G_V_S'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Oggi alle] LT',
+        nextDay: '[Domani alle] LT',
+        nextWeek: 'dddd [alle] LT',
+        lastDay: '[Ieri alle] LT',
+        lastWeek: function () {
+            switch (this.day()) {
+                case 0:
+                    return '[la scorsa] dddd [alle] LT';
+                default:
+                    return '[lo scorso] dddd [alle] LT';
+            }
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : function (s) {
+            return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+        },
+        past : '%s fa',
+        s : 'alcuni secondi',
+        m : 'un minuto',
+        mm : '%d minuti',
+        h : 'un\'ora',
+        hh : '%d ore',
+        d : 'un giorno',
+        dd : '%d giorni',
+        M : 'un mese',
+        MM : '%d mesi',
+        y : 'un anno',
+        yy : '%d anni'
+    },
+    ordinalParse : /\d{1,2}º/,
+    ordinal: '%dº',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ja.js b/turtles/app/lib/bower_components/momentjs/src/locale/ja.js
new file mode 100644
index 000000000..1f9b865fa
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ja.js
@@ -0,0 +1,56 @@
+//! moment.js locale configuration
+//! locale : japanese (ja)
+//! author : LI Long : https://github.com/baryon
+
+import moment from '../moment';
+
+export default moment.defineLocale('ja', {
+    months : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+    weekdays : '日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日'.split('_'),
+    weekdaysShort : '日_月_火_水_木_金_土'.split('_'),
+    weekdaysMin : '日_月_火_水_木_金_土'.split('_'),
+    longDateFormat : {
+        LT : 'Ah時m分',
+        LTS : 'LTs秒',
+        L : 'YYYY/MM/DD',
+        LL : 'YYYY年M月D日',
+        LLL : 'YYYY年M月D日LT',
+        LLLL : 'YYYY年M月D日LT dddd'
+    },
+    meridiemParse: /午前|午後/i,
+    isPM : function (input) {
+        return input === '午後';
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 12) {
+            return '午前';
+        } else {
+            return '午後';
+        }
+    },
+    calendar : {
+        sameDay : '[今日] LT',
+        nextDay : '[明日] LT',
+        nextWeek : '[来週]dddd LT',
+        lastDay : '[昨日] LT',
+        lastWeek : '[前週]dddd LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s後',
+        past : '%s前',
+        s : '数秒',
+        m : '1分',
+        mm : '%d分',
+        h : '1時間',
+        hh : '%d時間',
+        d : '1日',
+        dd : '%d日',
+        M : '1ヶ月',
+        MM : '%dヶ月',
+        y : '1年',
+        yy : '%d年'
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/jv.js b/turtles/app/lib/bower_components/momentjs/src/locale/jv.js
new file mode 100644
index 000000000..b5401a0a1
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/jv.js
@@ -0,0 +1,73 @@
+//! moment.js locale configuration
+//! locale : Boso Jowo (jv)
+//! author : Rony Lantip : https://github.com/lantip
+//! reference: http://jv.wikipedia.org/wiki/Basa_Jawa
+
+import moment from '../moment';
+
+export default moment.defineLocale('jv', {
+    months : 'Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember'.split('_'),
+    monthsShort : 'Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des'.split('_'),
+    weekdays : 'Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu'.split('_'),
+    weekdaysShort : 'Min_Sen_Sel_Reb_Kem_Jem_Sep'.split('_'),
+    weekdaysMin : 'Mg_Sn_Sl_Rb_Km_Jm_Sp'.split('_'),
+    longDateFormat : {
+        LT : 'HH.mm',
+        LTS : 'LT.ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY [pukul] LT',
+        LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+    },
+    meridiemParse: /enjing|siyang|sonten|ndalu/,
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === 'enjing') {
+            return hour;
+        } else if (meridiem === 'siyang') {
+            return hour >= 11 ? hour : hour + 12;
+        } else if (meridiem === 'sonten' || meridiem === 'ndalu') {
+            return hour + 12;
+        }
+    },
+    meridiem : function (hours, minutes, isLower) {
+        if (hours < 11) {
+            return 'enjing';
+        } else if (hours < 15) {
+            return 'siyang';
+        } else if (hours < 19) {
+            return 'sonten';
+        } else {
+            return 'ndalu';
+        }
+    },
+    calendar : {
+        sameDay : '[Dinten puniko pukul] LT',
+        nextDay : '[Mbenjang pukul] LT',
+        nextWeek : 'dddd [pukul] LT',
+        lastDay : '[Kala wingi pukul] LT',
+        lastWeek : 'dddd [kepengker pukul] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'wonten ing %s',
+        past : '%s ingkang kepengker',
+        s : 'sawetawis detik',
+        m : 'setunggal menit',
+        mm : '%d menit',
+        h : 'setunggal jam',
+        hh : '%d jam',
+        d : 'sedinten',
+        dd : '%d dinten',
+        M : 'sewulan',
+        MM : '%d wulan',
+        y : 'setaun',
+        yy : '%d taun'
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ka.js b/turtles/app/lib/bower_components/momentjs/src/locale/ka.js
new file mode 100644
index 000000000..a750b2a9a
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ka.js
@@ -0,0 +1,94 @@
+//! moment.js locale configuration
+//! locale : Georgian (ka)
+//! author : Irakli Janiashvili : https://github.com/irakli-janiashvili
+
+import moment from '../moment';
+
+function monthsCaseReplace(m, format) {
+    var months = {
+        'nominative': 'იანვარი_თებერვალი_მარტი_აპრილი_მაისი_ივნისი_ივლისი_აგვისტო_სექტემბერი_ოქტომბერი_ნოემბერი_დეკემბერი'.split('_'),
+        'accusative': 'იანვარს_თებერვალს_მარტს_აპრილის_მაისს_ივნისს_ივლისს_აგვისტს_სექტემბერს_ოქტომბერს_ნოემბერს_დეკემბერს'.split('_')
+    },
+    nounCase = (/D[oD] *MMMM?/).test(format) ?
+        'accusative' :
+        'nominative';
+    return months[nounCase][m.month()];
+}
+function weekdaysCaseReplace(m, format) {
+    var weekdays = {
+        'nominative': 'კვირა_ორშაბათი_სამშაბათი_ოთხშაბათი_ხუთშაბათი_პარასკევი_შაბათი'.split('_'),
+        'accusative': 'კვირას_ორშაბათს_სამშაბათს_ოთხშაბათს_ხუთშაბათს_პარასკევს_შაბათს'.split('_')
+    },
+    nounCase = (/(წინა|შემდეგ)/).test(format) ?
+        'accusative' :
+        'nominative';
+    return weekdays[nounCase][m.day()];
+}
+
+export default moment.defineLocale('ka', {
+    months : monthsCaseReplace,
+    monthsShort : 'იან_თებ_მარ_აპრ_მაი_ივნ_ივლ_აგვ_სექ_ოქტ_ნოე_დეკ'.split('_'),
+    weekdays : weekdaysCaseReplace,
+    weekdaysShort : 'კვი_ორშ_სამ_ოთხ_ხუთ_პარ_შაბ'.split('_'),
+    weekdaysMin : 'კვ_ორ_სა_ოთ_ხუ_პა_შა'.split('_'),
+    longDateFormat : {
+        LT : 'h:mm A',
+        LTS : 'h:mm:ss A',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[დღეს] LT[-ზე]',
+        nextDay : '[ხვალ] LT[-ზე]',
+        lastDay : '[გუშინ] LT[-ზე]',
+        nextWeek : '[შემდეგ] dddd LT[-ზე]',
+        lastWeek : '[წინა] dddd LT-ზე',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : function (s) {
+            return (/(წამი|წუთი|საათი|წელი)/).test(s) ?
+                s.replace(/ი$/, 'ში') :
+                s + 'ში';
+        },
+        past : function (s) {
+            if ((/(წამი|წუთი|საათი|დღე|თვე)/).test(s)) {
+                return s.replace(/(ი|ე)$/, 'ის წინ');
+            }
+            if ((/წელი/).test(s)) {
+                return s.replace(/წელი$/, 'წლის წინ');
+            }
+        },
+        s : 'რამდენიმე წამი',
+        m : 'წუთი',
+        mm : '%d წუთი',
+        h : 'საათი',
+        hh : '%d საათი',
+        d : 'დღე',
+        dd : '%d დღე',
+        M : 'თვე',
+        MM : '%d თვე',
+        y : 'წელი',
+        yy : '%d წელი'
+    },
+    ordinalParse: /0|1-ლი|მე-\d{1,2}|\d{1,2}-ე/,
+    ordinal : function (number) {
+        if (number === 0) {
+            return number;
+        }
+        if (number === 1) {
+            return number + '-ლი';
+        }
+        if ((number < 20) || (number <= 100 && (number % 20 === 0)) || (number % 100 === 0)) {
+            return 'მე-' + number;
+        }
+        return number + '-ე';
+    },
+    week : {
+        dow : 1,
+        doy : 7
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/km.js b/turtles/app/lib/bower_components/momentjs/src/locale/km.js
new file mode 100644
index 000000000..db9147ec9
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/km.js
@@ -0,0 +1,49 @@
+//! moment.js locale configuration
+//! locale : khmer (km)
+//! author : Kruy Vanna : https://github.com/kruyvanna
+
+import moment from '../moment';
+
+export default moment.defineLocale('km', {
+    months: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+    monthsShort: 'មករា_កុម្ភៈ_មិនា_មេសា_ឧសភា_មិថុនា_កក្កដា_សីហា_កញ្ញា_តុលា_វិច្ឆិកា_ធ្នូ'.split('_'),
+    weekdays: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+    weekdaysShort: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+    weekdaysMin: 'អាទិត្យ_ច័ន្ទ_អង្គារ_ពុធ_ព្រហស្បតិ៍_សុក្រ_សៅរ៍'.split('_'),
+    longDateFormat: {
+        LT: 'HH:mm',
+        LTS : 'LT:ss',
+        L: 'DD/MM/YYYY',
+        LL: 'D MMMM YYYY',
+        LLL: 'D MMMM YYYY LT',
+        LLLL: 'dddd, D MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[ថ្ងៃនៈ ម៉ោង] LT',
+        nextDay: '[ស្អែក ម៉ោង] LT',
+        nextWeek: 'dddd [ម៉ោង] LT',
+        lastDay: '[ម្សិលមិញ ម៉ោង] LT',
+        lastWeek: 'dddd [សប្តាហ៍មុន] [ម៉ោង] LT',
+        sameElse: 'L'
+    },
+    relativeTime: {
+        future: '%sទៀត',
+        past: '%sមុន',
+        s: 'ប៉ុន្មានវិនាទី',
+        m: 'មួយនាទី',
+        mm: '%d នាទី',
+        h: 'មួយម៉ោង',
+        hh: '%d ម៉ោង',
+        d: 'មួយថ្ងៃ',
+        dd: '%d ថ្ងៃ',
+        M: 'មួយខែ',
+        MM: '%d ខែ',
+        y: 'មួយឆ្នាំ',
+        yy: '%d ឆ្នាំ'
+    },
+    week: {
+        dow: 1, // Monday is the first day of the week.
+        doy: 4 // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ko.js b/turtles/app/lib/bower_components/momentjs/src/locale/ko.js
new file mode 100644
index 000000000..a56aee0bc
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ko.js
@@ -0,0 +1,59 @@
+//! moment.js locale configuration
+//! locale : korean (ko)
+//!
+//! authors
+//!
+//! - Kyungwook, Park : https://github.com/kyungw00k
+//! - Jeeeyul Lee <jeeeyul@gmail.com>
+
+import moment from '../moment';
+
+export default moment.defineLocale('ko', {
+    months : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+    monthsShort : '1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월'.split('_'),
+    weekdays : '일요일_월요일_화요일_수요일_목요일_금요일_토요일'.split('_'),
+    weekdaysShort : '일_월_화_수_목_금_토'.split('_'),
+    weekdaysMin : '일_월_화_수_목_금_토'.split('_'),
+    longDateFormat : {
+        LT : 'A h시 m분',
+        LTS : 'A h시 m분 s초',
+        L : 'YYYY.MM.DD',
+        LL : 'YYYY년 MMMM D일',
+        LLL : 'YYYY년 MMMM D일 LT',
+        LLLL : 'YYYY년 MMMM D일 dddd LT'
+    },
+    calendar : {
+        sameDay : '오늘 LT',
+        nextDay : '내일 LT',
+        nextWeek : 'dddd LT',
+        lastDay : '어제 LT',
+        lastWeek : '지난주 dddd LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s 후',
+        past : '%s 전',
+        s : '몇초',
+        ss : '%d초',
+        m : '일분',
+        mm : '%d분',
+        h : '한시간',
+        hh : '%d시간',
+        d : '하루',
+        dd : '%d일',
+        M : '한달',
+        MM : '%d달',
+        y : '일년',
+        yy : '%d년'
+    },
+    ordinalParse : /\d{1,2}일/,
+    ordinal : '%d일',
+    meridiemParse : /오전|오후/,
+    isPM : function (token) {
+        return token === '오후';
+    },
+    meridiem : function (hour, minute, isUpper) {
+        return hour < 12 ? '오전' : '오후';
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/lb.js b/turtles/app/lib/bower_components/momentjs/src/locale/lb.js
new file mode 100644
index 000000000..6cc6d5558
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/lb.js
@@ -0,0 +1,125 @@
+//! moment.js locale configuration
+//! locale : Luxembourgish (lb)
+//! author : mweimerskirch : https://github.com/mweimerskirch, David Raison : https://github.com/kwisatz
+
+import moment from '../moment';
+
+function processRelativeTime(number, withoutSuffix, key, isFuture) {
+    var format = {
+        'm': ['eng Minutt', 'enger Minutt'],
+        'h': ['eng Stonn', 'enger Stonn'],
+        'd': ['een Dag', 'engem Dag'],
+        'M': ['ee Mount', 'engem Mount'],
+        'y': ['ee Joer', 'engem Joer']
+    };
+    return withoutSuffix ? format[key][0] : format[key][1];
+}
+function processFutureTime(string) {
+    var number = string.substr(0, string.indexOf(' '));
+    if (eifelerRegelAppliesToNumber(number)) {
+        return 'a ' + string;
+    }
+    return 'an ' + string;
+}
+function processPastTime(string) {
+    var number = string.substr(0, string.indexOf(' '));
+    if (eifelerRegelAppliesToNumber(number)) {
+        return 'viru ' + string;
+    }
+    return 'virun ' + string;
+}
+/**
+ * Returns true if the word before the given number loses the '-n' ending.
+ * e.g. 'an 10 Deeg' but 'a 5 Deeg'
+ *
+ * @param number {integer}
+ * @returns {boolean}
+ */
+function eifelerRegelAppliesToNumber(number) {
+    number = parseInt(number, 10);
+    if (isNaN(number)) {
+        return false;
+    }
+    if (number < 0) {
+        // Negative Number --> always true
+        return true;
+    } else if (number < 10) {
+        // Only 1 digit
+        if (4 <= number && number <= 7) {
+            return true;
+        }
+        return false;
+    } else if (number < 100) {
+        // 2 digits
+        var lastDigit = number % 10, firstDigit = number / 10;
+        if (lastDigit === 0) {
+            return eifelerRegelAppliesToNumber(firstDigit);
+        }
+        return eifelerRegelAppliesToNumber(lastDigit);
+    } else if (number < 10000) {
+        // 3 or 4 digits --> recursively check first digit
+        while (number >= 10) {
+            number = number / 10;
+        }
+        return eifelerRegelAppliesToNumber(number);
+    } else {
+        // Anything larger than 4 digits: recursively check first n-3 digits
+        number = number / 1000;
+        return eifelerRegelAppliesToNumber(number);
+    }
+}
+
+export default moment.defineLocale('lb', {
+    months: 'Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+    monthsShort: 'Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+    weekdays: 'Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg'.split('_'),
+    weekdaysShort: 'So._Mé._Dë._Më._Do._Fr._Sa.'.split('_'),
+    weekdaysMin: 'So_Mé_Dë_Më_Do_Fr_Sa'.split('_'),
+    longDateFormat: {
+        LT: 'H:mm [Auer]',
+        LTS: 'H:mm:ss [Auer]',
+        L: 'DD.MM.YYYY',
+        LL: 'D. MMMM YYYY',
+        LLL: 'D. MMMM YYYY LT',
+        LLLL: 'dddd, D. MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[Haut um] LT',
+        sameElse: 'L',
+        nextDay: '[Muer um] LT',
+        nextWeek: 'dddd [um] LT',
+        lastDay: '[Gëschter um] LT',
+        lastWeek: function () {
+            // Different date string for 'Dënschdeg' (Tuesday) and 'Donneschdeg' (Thursday) due to phonological rule
+            switch (this.day()) {
+                case 2:
+                case 4:
+                    return '[Leschten] dddd [um] LT';
+                default:
+                    return '[Leschte] dddd [um] LT';
+            }
+        }
+    },
+    relativeTime : {
+        future : processFutureTime,
+        past : processPastTime,
+        s : 'e puer Sekonnen',
+        m : processRelativeTime,
+        mm : '%d Minutten',
+        h : processRelativeTime,
+        hh : '%d Stonnen',
+        d : processRelativeTime,
+        dd : '%d Deeg',
+        M : processRelativeTime,
+        MM : '%d Méint',
+        y : processRelativeTime,
+        yy : '%d Joer'
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal: '%d.',
+    week: {
+        dow: 1, // Monday is the first day of the week.
+        doy: 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/lt.js b/turtles/app/lib/bower_components/momentjs/src/locale/lt.js
new file mode 100644
index 000000000..809516382
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/lt.js
@@ -0,0 +1,106 @@
+//! moment.js locale configuration
+//! locale : Lithuanian (lt)
+//! author : Mindaugas Mozūras : https://github.com/mmozuras
+
+import moment from '../moment';
+
+var units = {
+    'm' : 'minutė_minutės_minutę',
+    'mm': 'minutės_minučių_minutes',
+    'h' : 'valanda_valandos_valandą',
+    'hh': 'valandos_valandų_valandas',
+    'd' : 'diena_dienos_dieną',
+    'dd': 'dienos_dienų_dienas',
+    'M' : 'mėnuo_mėnesio_mėnesį',
+    'MM': 'mėnesiai_mėnesių_mėnesius',
+    'y' : 'metai_metų_metus',
+    'yy': 'metai_metų_metus'
+},
+weekDays = 'sekmadienis_pirmadienis_antradienis_trečiadienis_ketvirtadienis_penktadienis_šeštadienis'.split('_');
+function translateSeconds(number, withoutSuffix, key, isFuture) {
+    if (withoutSuffix) {
+        return 'kelios sekundės';
+    } else {
+        return isFuture ? 'kelių sekundžių' : 'kelias sekundes';
+    }
+}
+function translateSingular(number, withoutSuffix, key, isFuture) {
+    return withoutSuffix ? forms(key)[0] : (isFuture ? forms(key)[1] : forms(key)[2]);
+}
+function special(number) {
+    return number % 10 === 0 || (number > 10 && number < 20);
+}
+function forms(key) {
+    return units[key].split('_');
+}
+function translate(number, withoutSuffix, key, isFuture) {
+    var result = number + ' ';
+    if (number === 1) {
+        return result + translateSingular(number, withoutSuffix, key[0], isFuture);
+    } else if (withoutSuffix) {
+        return result + (special(number) ? forms(key)[1] : forms(key)[0]);
+    } else {
+        if (isFuture) {
+            return result + forms(key)[1];
+        } else {
+            return result + (special(number) ? forms(key)[1] : forms(key)[2]);
+        }
+    }
+}
+function relativeWeekDay(moment, format) {
+    var nominative = format.indexOf('dddd HH:mm') === -1,
+        weekDay = weekDays[moment.day()];
+    return nominative ? weekDay : weekDay.substring(0, weekDay.length - 2) + 'į';
+}
+
+export default moment.defineLocale('lt', {
+    months : 'sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjūčio_rugsėjo_spalio_lapkričio_gruodžio'.split('_'),
+    monthsShort : 'sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd'.split('_'),
+    weekdays : relativeWeekDay,
+    weekdaysShort : 'Sek_Pir_Ant_Tre_Ket_Pen_Šeš'.split('_'),
+    weekdaysMin : 'S_P_A_T_K_Pn_Š'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'YYYY-MM-DD',
+        LL : 'YYYY [m.] MMMM D [d.]',
+        LLL : 'YYYY [m.] MMMM D [d.], LT [val.]',
+        LLLL : 'YYYY [m.] MMMM D [d.], dddd, LT [val.]',
+        l : 'YYYY-MM-DD',
+        ll : 'YYYY [m.] MMMM D [d.]',
+        lll : 'YYYY [m.] MMMM D [d.], LT [val.]',
+        llll : 'YYYY [m.] MMMM D [d.], ddd, LT [val.]'
+    },
+    calendar : {
+        sameDay : '[Šiandien] LT',
+        nextDay : '[Rytoj] LT',
+        nextWeek : 'dddd LT',
+        lastDay : '[Vakar] LT',
+        lastWeek : '[Praėjusį] dddd LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'po %s',
+        past : 'prieš %s',
+        s : translateSeconds,
+        m : translateSingular,
+        mm : translate,
+        h : translateSingular,
+        hh : translate,
+        d : translateSingular,
+        dd : translate,
+        M : translateSingular,
+        MM : translate,
+        y : translateSingular,
+        yy : translate
+    },
+    ordinalParse: /\d{1,2}-oji/,
+    ordinal : function (number) {
+        return number + '-oji';
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/lv.js b/turtles/app/lib/bower_components/momentjs/src/locale/lv.js
new file mode 100644
index 000000000..b37cb5cfa
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/lv.js
@@ -0,0 +1,87 @@
+//! moment.js locale configuration
+//! locale : latvian (lv)
+//! author : Kristaps Karlsons : https://github.com/skakri
+//! author : Jānis Elmeris : https://github.com/JanisE
+
+import moment from '../moment';
+
+var units = {
+    'm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+    'mm': 'minūtes_minūtēm_minūte_minūtes'.split('_'),
+    'h': 'stundas_stundām_stunda_stundas'.split('_'),
+    'hh': 'stundas_stundām_stunda_stundas'.split('_'),
+    'd': 'dienas_dienām_diena_dienas'.split('_'),
+    'dd': 'dienas_dienām_diena_dienas'.split('_'),
+    'M': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+    'MM': 'mēneša_mēnešiem_mēnesis_mēneši'.split('_'),
+    'y': 'gada_gadiem_gads_gadi'.split('_'),
+    'yy': 'gada_gadiem_gads_gadi'.split('_')
+};
+/**
+ * @param withoutSuffix boolean true = a length of time; false = before/after a period of time.
+ */
+function format(forms, number, withoutSuffix) {
+    if (withoutSuffix) {
+        // E.g. "21 minūte", "3 minūtes".
+        return number % 10 === 1 && number !== 11 ? forms[2] : forms[3];
+    } else {
+        // E.g. "21 minūtes" as in "pēc 21 minūtes".
+        // E.g. "3 minūtēm" as in "pēc 3 minūtēm".
+        return number % 10 === 1 && number !== 11 ? forms[0] : forms[1];
+    }
+}
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+    return number + ' ' + format(units[key], number, withoutSuffix);
+}
+function relativeTimeWithSingular(number, withoutSuffix, key) {
+    return format(units[key], number, withoutSuffix);
+}
+function relativeSeconds(number, withoutSuffix) {
+    return withoutSuffix ? 'dažas sekundes' : 'dažām sekundēm';
+}
+
+export default moment.defineLocale('lv', {
+    months : 'janvāris_februāris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec'.split('_'),
+    weekdays : 'svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena'.split('_'),
+    weekdaysShort : 'Sv_P_O_T_C_Pk_S'.split('_'),
+    weekdaysMin : 'Sv_P_O_T_C_Pk_S'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY.',
+        LL : 'YYYY. [gada] D. MMMM',
+        LLL : 'YYYY. [gada] D. MMMM, LT',
+        LLLL : 'YYYY. [gada] D. MMMM, dddd, LT'
+    },
+    calendar : {
+        sameDay : '[Šodien pulksten] LT',
+        nextDay : '[Rīt pulksten] LT',
+        nextWeek : 'dddd [pulksten] LT',
+        lastDay : '[Vakar pulksten] LT',
+        lastWeek : '[Pagājušā] dddd [pulksten] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'pēc %s',
+        past : 'pirms %s',
+        s : relativeSeconds,
+        m : relativeTimeWithSingular,
+        mm : relativeTimeWithPlural,
+        h : relativeTimeWithSingular,
+        hh : relativeTimeWithPlural,
+        d : relativeTimeWithSingular,
+        dd : relativeTimeWithPlural,
+        M : relativeTimeWithSingular,
+        MM : relativeTimeWithPlural,
+        y : relativeTimeWithSingular,
+        yy : relativeTimeWithPlural
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/me.js b/turtles/app/lib/bower_components/momentjs/src/locale/me.js
new file mode 100644
index 000000000..2c356dab6
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/me.js
@@ -0,0 +1,99 @@
+//! moment.js locale configuration
+//! locale : Montenegrin (me)
+//! author : Miodrag Nikač <miodrag@restartit.me> : https://github.com/miodragnikac
+
+import moment from '../moment';
+
+var translator = {
+    words: { //Different grammatical cases
+        m: ['jedan minut', 'jednog minuta'],
+        mm: ['minut', 'minuta', 'minuta'],
+        h: ['jedan sat', 'jednog sata'],
+        hh: ['sat', 'sata', 'sati'],
+        dd: ['dan', 'dana', 'dana'],
+        MM: ['mjesec', 'mjeseca', 'mjeseci'],
+        yy: ['godina', 'godine', 'godina']
+    },
+    correctGrammaticalCase: function (number, wordKey) {
+        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+    },
+    translate: function (number, withoutSuffix, key) {
+        var wordKey = translator.words[key];
+        if (key.length === 1) {
+            return withoutSuffix ? wordKey[0] : wordKey[1];
+        } else {
+            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+        }
+    }
+};
+
+export default moment.defineLocale('me', {
+    months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+    monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+    weekdays: ['nedjelja', 'ponedjeljak', 'utorak', 'srijeda', 'četvrtak', 'petak', 'subota'],
+    weekdaysShort: ['ned.', 'pon.', 'uto.', 'sri.', 'čet.', 'pet.', 'sub.'],
+    weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+    longDateFormat: {
+        LT: 'H:mm',
+        LTS : 'LT:ss',
+        L: 'DD. MM. YYYY',
+        LL: 'D. MMMM YYYY',
+        LLL: 'D. MMMM YYYY LT',
+        LLLL: 'dddd, D. MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[danas u] LT',
+        nextDay: '[sjutra u] LT',
+
+        nextWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[u] [nedjelju] [u] LT';
+            case 3:
+                return '[u] [srijedu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        },
+        lastDay  : '[juče u] LT',
+        lastWeek : function () {
+            var lastWeekDays = [
+                '[prošle] [nedjelje] [u] LT',
+                '[prošlog] [ponedjeljka] [u] LT',
+                '[prošlog] [utorka] [u] LT',
+                '[prošle] [srijede] [u] LT',
+                '[prošlog] [četvrtka] [u] LT',
+                '[prošlog] [petka] [u] LT',
+                '[prošle] [subote] [u] LT'
+            ];
+            return lastWeekDays[this.day()];
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past   : 'prije %s',
+        s      : 'nekoliko sekundi',
+        m      : translator.translate,
+        mm     : translator.translate,
+        h      : translator.translate,
+        hh     : translator.translate,
+        d      : 'dan',
+        dd     : translator.translate,
+        M      : 'mjesec',
+        MM     : translator.translate,
+        y      : 'godinu',
+        yy     : translator.translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/mk.js b/turtles/app/lib/bower_components/momentjs/src/locale/mk.js
new file mode 100644
index 000000000..80c522d41
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/mk.js
@@ -0,0 +1,81 @@
+//! moment.js locale configuration
+//! locale : macedonian (mk)
+//! author : Borislav Mickov : https://github.com/B0k0
+
+import moment from '../moment';
+
+export default moment.defineLocale('mk', {
+    months : 'јануари_февруари_март_април_мај_јуни_јули_август_септември_октомври_ноември_декември'.split('_'),
+    monthsShort : 'јан_фев_мар_апр_мај_јун_јул_авг_сеп_окт_ное_дек'.split('_'),
+    weekdays : 'недела_понеделник_вторник_среда_четврток_петок_сабота'.split('_'),
+    weekdaysShort : 'нед_пон_вто_сре_чет_пет_саб'.split('_'),
+    weekdaysMin : 'нe_пo_вт_ср_че_пе_сa'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'D.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Денес во] LT',
+        nextDay : '[Утре во] LT',
+        nextWeek : 'dddd [во] LT',
+        lastDay : '[Вчера во] LT',
+        lastWeek : function () {
+            switch (this.day()) {
+            case 0:
+            case 3:
+            case 6:
+                return '[Во изминатата] dddd [во] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[Во изминатиот] dddd [во] LT';
+            }
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'после %s',
+        past : 'пред %s',
+        s : 'неколку секунди',
+        m : 'минута',
+        mm : '%d минути',
+        h : 'час',
+        hh : '%d часа',
+        d : 'ден',
+        dd : '%d дена',
+        M : 'месец',
+        MM : '%d месеци',
+        y : 'година',
+        yy : '%d години'
+    },
+    ordinalParse: /\d{1,2}-(ев|ен|ти|ви|ри|ми)/,
+    ordinal : function (number) {
+        var lastDigit = number % 10,
+            last2Digits = number % 100;
+        if (number === 0) {
+            return number + '-ев';
+        } else if (last2Digits === 0) {
+            return number + '-ен';
+        } else if (last2Digits > 10 && last2Digits < 20) {
+            return number + '-ти';
+        } else if (lastDigit === 1) {
+            return number + '-ви';
+        } else if (lastDigit === 2) {
+            return number + '-ри';
+        } else if (lastDigit === 7 || lastDigit === 8) {
+            return number + '-ми';
+        } else {
+            return number + '-ти';
+        }
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ml.js b/turtles/app/lib/bower_components/momentjs/src/locale/ml.js
new file mode 100644
index 000000000..cbb90562e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ml.js
@@ -0,0 +1,62 @@
+//! moment.js locale configuration
+//! locale : malayalam (ml)
+//! author : Floyd Pink : https://github.com/floydpink
+
+import moment from '../moment';
+
+export default moment.defineLocale('ml', {
+    months : 'ജനുവരി_ഫെബ്രുവരി_മാർച്ച്_ഏപ്രിൽ_മേയ്_ജൂൺ_ജൂലൈ_ഓഗസ്റ്റ്_സെപ്റ്റംബർ_ഒക്ടോബർ_നവംബർ_ഡിസംബർ'.split('_'),
+    monthsShort : 'ജനു._ഫെബ്രു._മാർ._ഏപ്രി._മേയ്_ജൂൺ_ജൂലൈ._ഓഗ._സെപ്റ്റ._ഒക്ടോ._നവം._ഡിസം.'.split('_'),
+    weekdays : 'ഞായറാഴ്ച_തിങ്കളാഴ്ച_ചൊവ്വാഴ്ച_ബുധനാഴ്ച_വ്യാഴാഴ്ച_വെള്ളിയാഴ്ച_ശനിയാഴ്ച'.split('_'),
+    weekdaysShort : 'ഞായർ_തിങ്കൾ_ചൊവ്വ_ബുധൻ_വ്യാഴം_വെള്ളി_ശനി'.split('_'),
+    weekdaysMin : 'ഞാ_തി_ചൊ_ബു_വ്യാ_വെ_ശ'.split('_'),
+    longDateFormat : {
+        LT : 'A h:mm -നു',
+        LTS : 'A h:mm:ss -നു',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY, LT',
+        LLLL : 'dddd, D MMMM YYYY, LT'
+    },
+    calendar : {
+        sameDay : '[ഇന്ന്] LT',
+        nextDay : '[നാളെ] LT',
+        nextWeek : 'dddd, LT',
+        lastDay : '[ഇന്നലെ] LT',
+        lastWeek : '[കഴിഞ്ഞ] dddd, LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s കഴിഞ്ഞ്',
+        past : '%s മുൻപ്',
+        s : 'അൽപ നിമിഷങ്ങൾ',
+        m : 'ഒരു മിനിറ്റ്',
+        mm : '%d മിനിറ്റ്',
+        h : 'ഒരു മണിക്കൂർ',
+        hh : '%d മണിക്കൂർ',
+        d : 'ഒരു ദിവസം',
+        dd : '%d ദിവസം',
+        M : 'ഒരു മാസം',
+        MM : '%d മാസം',
+        y : 'ഒരു വർഷം',
+        yy : '%d വർഷം'
+    },
+    meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
+    isPM : function (input) {
+        return /^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'രാത്രി';
+        } else if (hour < 12) {
+            return 'രാവിലെ';
+        } else if (hour < 17) {
+            return 'ഉച്ച കഴിഞ്ഞ്';
+        } else if (hour < 20) {
+            return 'വൈകുന്നേരം';
+        } else {
+            return 'രാത്രി';
+        }
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/mr.js b/turtles/app/lib/bower_components/momentjs/src/locale/mr.js
new file mode 100644
index 000000000..24011a377
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/mr.js
@@ -0,0 +1,112 @@
+//! moment.js locale configuration
+//! locale : Marathi (mr)
+//! author : Harshad Kale : https://github.com/kalehv
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '१',
+    '2': '२',
+    '3': '३',
+    '4': '४',
+    '5': '५',
+    '6': '६',
+    '7': '७',
+    '8': '८',
+    '9': '९',
+    '0': '०'
+},
+numberMap = {
+    '१': '1',
+    '२': '2',
+    '३': '3',
+    '४': '4',
+    '५': '5',
+    '६': '6',
+    '७': '7',
+    '८': '8',
+    '९': '9',
+    '०': '0'
+};
+
+export default moment.defineLocale('mr', {
+    months : 'जानेवारी_फेब्रुवारी_मार्च_एप्रिल_मे_जून_जुलै_ऑगस्ट_सप्टेंबर_ऑक्टोबर_नोव्हेंबर_डिसेंबर'.split('_'),
+    monthsShort: 'जाने._फेब्रु._मार्च._एप्रि._मे._जून._जुलै._ऑग._सप्टें._ऑक्टो._नोव्हें._डिसें.'.split('_'),
+    weekdays : 'रविवार_सोमवार_मंगळवार_बुधवार_गुरूवार_शुक्रवार_शनिवार'.split('_'),
+    weekdaysShort : 'रवि_सोम_मंगळ_बुध_गुरू_शुक्र_शनि'.split('_'),
+    weekdaysMin : 'र_सो_मं_बु_गु_शु_श'.split('_'),
+    longDateFormat : {
+        LT : 'A h:mm वाजता',
+        LTS : 'A h:mm:ss वाजता',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY, LT',
+        LLLL : 'dddd, D MMMM YYYY, LT'
+    },
+    calendar : {
+        sameDay : '[आज] LT',
+        nextDay : '[उद्या] LT',
+        nextWeek : 'dddd, LT',
+        lastDay : '[काल] LT',
+        lastWeek: '[मागील] dddd, LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s नंतर',
+        past : '%s पूर्वी',
+        s : 'सेकंद',
+        m: 'एक मिनिट',
+        mm: '%d मिनिटे',
+        h : 'एक तास',
+        hh : '%d तास',
+        d : 'एक दिवस',
+        dd : '%d दिवस',
+        M : 'एक महिना',
+        MM : '%d महिने',
+        y : 'एक वर्ष',
+        yy : '%d वर्षे'
+    },
+    preparse: function (string) {
+        return string.replace(/[१२३४५६७८९०]/g, function (match) {
+            return numberMap[match];
+        });
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        });
+    },
+    meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === 'रात्री') {
+            return hour < 4 ? hour : hour + 12;
+        } else if (meridiem === 'सकाळी') {
+            return hour;
+        } else if (meridiem === 'दुपारी') {
+            return hour >= 10 ? hour : hour + 12;
+        } else if (meridiem === 'सायंकाळी') {
+            return hour + 12;
+        }
+    },
+    meridiem: function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'रात्री';
+        } else if (hour < 10) {
+            return 'सकाळी';
+        } else if (hour < 17) {
+            return 'दुपारी';
+        } else if (hour < 20) {
+            return 'सायंकाळी';
+        } else {
+            return 'रात्री';
+        }
+    },
+    week : {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ms-my.js b/turtles/app/lib/bower_components/momentjs/src/locale/ms-my.js
new file mode 100644
index 000000000..10bce036b
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ms-my.js
@@ -0,0 +1,73 @@
+//! moment.js locale configuration
+//! locale : Bahasa Malaysia (ms-MY)
+//! author : Weldan Jamili : https://github.com/weldan
+
+import moment from '../moment';
+
+export default moment.defineLocale('ms-my', {
+    months : 'Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember'.split('_'),
+    monthsShort : 'Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis'.split('_'),
+    weekdays : 'Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu'.split('_'),
+    weekdaysShort : 'Ahd_Isn_Sel_Rab_Kha_Jum_Sab'.split('_'),
+    weekdaysMin : 'Ah_Is_Sl_Rb_Km_Jm_Sb'.split('_'),
+    longDateFormat : {
+        LT : 'HH.mm',
+        LTS : 'LT.ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY [pukul] LT',
+        LLLL : 'dddd, D MMMM YYYY [pukul] LT'
+    },
+    meridiemParse: /pagi|tengahari|petang|malam/,
+    meridiemHour: function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === 'pagi') {
+            return hour;
+        } else if (meridiem === 'tengahari') {
+            return hour >= 11 ? hour : hour + 12;
+        } else if (meridiem === 'petang' || meridiem === 'malam') {
+            return hour + 12;
+        }
+    },
+    meridiem : function (hours, minutes, isLower) {
+        if (hours < 11) {
+            return 'pagi';
+        } else if (hours < 15) {
+            return 'tengahari';
+        } else if (hours < 19) {
+            return 'petang';
+        } else {
+            return 'malam';
+        }
+    },
+    calendar : {
+        sameDay : '[Hari ini pukul] LT',
+        nextDay : '[Esok pukul] LT',
+        nextWeek : 'dddd [pukul] LT',
+        lastDay : '[Kelmarin pukul] LT',
+        lastWeek : 'dddd [lepas pukul] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'dalam %s',
+        past : '%s yang lepas',
+        s : 'beberapa saat',
+        m : 'seminit',
+        mm : '%d minit',
+        h : 'sejam',
+        hh : '%d jam',
+        d : 'sehari',
+        dd : '%d hari',
+        M : 'sebulan',
+        MM : '%d bulan',
+        y : 'setahun',
+        yy : '%d tahun'
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/my.js b/turtles/app/lib/bower_components/momentjs/src/locale/my.js
new file mode 100644
index 000000000..54af14002
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/my.js
@@ -0,0 +1,84 @@
+//! moment.js locale configuration
+//! locale : Burmese (my)
+//! author : Squar team, mysquar.com
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '၁',
+    '2': '၂',
+    '3': '၃',
+    '4': '၄',
+    '5': '၅',
+    '6': '၆',
+    '7': '၇',
+    '8': '၈',
+    '9': '၉',
+    '0': '၀'
+}, numberMap = {
+    '၁': '1',
+    '၂': '2',
+    '၃': '3',
+    '၄': '4',
+    '၅': '5',
+    '၆': '6',
+    '၇': '7',
+    '၈': '8',
+    '၉': '9',
+    '၀': '0'
+};
+
+export default moment.defineLocale('my', {
+    months: 'ဇန်နဝါရီ_ဖေဖော်ဝါရီ_မတ်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂုတ်_စက်တင်ဘာ_အောက်တိုဘာ_နိုဝင်ဘာ_ဒီဇင်ဘာ'.split('_'),
+    monthsShort: 'ဇန်_ဖေ_မတ်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ'.split('_'),
+    weekdays: 'တနင်္ဂနွေ_တနင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပတေး_သောကြာ_စနေ'.split('_'),
+    weekdaysShort: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+    weekdaysMin: 'နွေ_လာ_ဂါ_ဟူး_ကြာ_သော_နေ'.split('_'),
+
+    longDateFormat: {
+        LT: 'HH:mm',
+        LTS: 'HH:mm:ss',
+        L: 'DD/MM/YYYY',
+        LL: 'D MMMM YYYY',
+        LLL: 'D MMMM YYYY LT',
+        LLLL: 'dddd D MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[ယနေ.] LT [မှာ]',
+        nextDay: '[မနက်ဖြန်] LT [မှာ]',
+        nextWeek: 'dddd LT [မှာ]',
+        lastDay: '[မနေ.က] LT [မှာ]',
+        lastWeek: '[ပြီးခဲ့သော] dddd LT [မှာ]',
+        sameElse: 'L'
+    },
+    relativeTime: {
+        future: 'လာမည့် %s မှာ',
+        past: 'လွန်ခဲ့သော %s က',
+        s: 'စက္ကန်.အနည်းငယ်',
+        m: 'တစ်မိနစ်',
+        mm: '%d မိနစ်',
+        h: 'တစ်နာရီ',
+        hh: '%d နာရီ',
+        d: 'တစ်ရက်',
+        dd: '%d ရက်',
+        M: 'တစ်လ',
+        MM: '%d လ',
+        y: 'တစ်နှစ်',
+        yy: '%d နှစ်'
+    },
+    preparse: function (string) {
+        return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
+            return numberMap[match];
+        });
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        });
+    },
+    week: {
+        dow: 1, // Monday is the first day of the week.
+        doy: 4 // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/nb.js b/turtles/app/lib/bower_components/momentjs/src/locale/nb.js
new file mode 100644
index 000000000..cadc224d6
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/nb.js
@@ -0,0 +1,52 @@
+//! moment.js locale configuration
+//! locale : norwegian bokmål (nb)
+//! authors : Espen Hovlandsdal : https://github.com/rexxars
+//!           Sigurd Gartmann : https://github.com/sigurdga
+
+import moment from '../moment';
+
+export default moment.defineLocale('nb', {
+    months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+    weekdays : 'søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag'.split('_'),
+    weekdaysShort : 'søn_man_tirs_ons_tors_fre_lør'.split('_'),
+    weekdaysMin : 'sø_ma_ti_on_to_fr_lø'.split('_'),
+    longDateFormat : {
+        LT : 'H.mm',
+        LTS : 'LT.ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY [kl.] LT',
+        LLLL : 'dddd D. MMMM YYYY [kl.] LT'
+    },
+    calendar : {
+        sameDay: '[i dag kl.] LT',
+        nextDay: '[i morgen kl.] LT',
+        nextWeek: 'dddd [kl.] LT',
+        lastDay: '[i går kl.] LT',
+        lastWeek: '[forrige] dddd [kl.] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'om %s',
+        past : 'for %s siden',
+        s : 'noen sekunder',
+        m : 'ett minutt',
+        mm : '%d minutter',
+        h : 'en time',
+        hh : '%d timer',
+        d : 'en dag',
+        dd : '%d dager',
+        M : 'en måned',
+        MM : '%d måneder',
+        y : 'ett år',
+        yy : '%d år'
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ne.js b/turtles/app/lib/bower_components/momentjs/src/locale/ne.js
new file mode 100644
index 000000000..966db269d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ne.js
@@ -0,0 +1,114 @@
+//! moment.js locale configuration
+//! locale : nepali/nepalese
+//! author : suvash : https://github.com/suvash
+
+import moment from '../moment';
+
+var symbolMap = {
+    '1': '१',
+    '2': '२',
+    '3': '३',
+    '4': '४',
+    '5': '५',
+    '6': '६',
+    '7': '७',
+    '8': '८',
+    '9': '९',
+    '0': '०'
+},
+numberMap = {
+    '१': '1',
+    '२': '2',
+    '३': '3',
+    '४': '4',
+    '५': '5',
+    '६': '6',
+    '७': '7',
+    '८': '8',
+    '९': '9',
+    '०': '0'
+};
+
+export default moment.defineLocale('ne', {
+    months : 'जनवरी_फेब्रुवरी_मार्च_अप्रिल_मई_जुन_जुलाई_अगष्ट_सेप्टेम्बर_अक्टोबर_नोभेम्बर_डिसेम्बर'.split('_'),
+    monthsShort : 'जन._फेब्रु._मार्च_अप्रि._मई_जुन_जुलाई._अग._सेप्ट._अक्टो._नोभे._डिसे.'.split('_'),
+    weekdays : 'आइतबार_सोमबार_मङ्गलबार_बुधबार_बिहिबार_शुक्रबार_शनिबार'.split('_'),
+    weekdaysShort : 'आइत._सोम._मङ्गल._बुध._बिहि._शुक्र._शनि.'.split('_'),
+    weekdaysMin : 'आइ._सो._मङ्_बु._बि._शु._श.'.split('_'),
+    longDateFormat : {
+        LT : 'Aको h:mm बजे',
+        LTS : 'Aको h:mm:ss बजे',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY, LT',
+        LLLL : 'dddd, D MMMM YYYY, LT'
+    },
+    preparse: function (string) {
+        return string.replace(/[१२३४५६७८९०]/g, function (match) {
+            return numberMap[match];
+        });
+    },
+    postformat: function (string) {
+        return string.replace(/\d/g, function (match) {
+            return symbolMap[match];
+        });
+    },
+    meridiemParse: /राती|बिहान|दिउँसो|बेलुका|साँझ|राती/,
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === 'राती') {
+            return hour < 3 ? hour : hour + 12;
+        } else if (meridiem === 'बिहान') {
+            return hour;
+        } else if (meridiem === 'दिउँसो') {
+            return hour >= 10 ? hour : hour + 12;
+        } else if (meridiem === 'बेलुका' || meridiem === 'साँझ') {
+            return hour + 12;
+        }
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 3) {
+            return 'राती';
+        } else if (hour < 10) {
+            return 'बिहान';
+        } else if (hour < 15) {
+            return 'दिउँसो';
+        } else if (hour < 18) {
+            return 'बेलुका';
+        } else if (hour < 20) {
+            return 'साँझ';
+        } else {
+            return 'राती';
+        }
+    },
+    calendar : {
+        sameDay : '[आज] LT',
+        nextDay : '[भोली] LT',
+        nextWeek : '[आउँदो] dddd[,] LT',
+        lastDay : '[हिजो] LT',
+        lastWeek : '[गएको] dddd[,] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%sमा',
+        past : '%s अगाडी',
+        s : 'केही समय',
+        m : 'एक मिनेट',
+        mm : '%d मिनेट',
+        h : 'एक घण्टा',
+        hh : '%d घण्टा',
+        d : 'एक दिन',
+        dd : '%d दिन',
+        M : 'एक महिना',
+        MM : '%d महिना',
+        y : 'एक बर्ष',
+        yy : '%d बर्ष'
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/nl.js b/turtles/app/lib/bower_components/momentjs/src/locale/nl.js
new file mode 100644
index 000000000..f493a7673
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/nl.js
@@ -0,0 +1,62 @@
+//! moment.js locale configuration
+//! locale : dutch (nl)
+//! author : Joris Röling : https://github.com/jjupiter
+
+import moment from '../moment';
+
+var monthsShortWithDots = 'jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.'.split('_'),
+    monthsShortWithoutDots = 'jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec'.split('_');
+
+export default moment.defineLocale('nl', {
+    months : 'januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december'.split('_'),
+    monthsShort : function (m, format) {
+        if (/-MMM-/.test(format)) {
+            return monthsShortWithoutDots[m.month()];
+        } else {
+            return monthsShortWithDots[m.month()];
+        }
+    },
+    weekdays : 'zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag'.split('_'),
+    weekdaysShort : 'zo._ma._di._wo._do._vr._za.'.split('_'),
+    weekdaysMin : 'Zo_Ma_Di_Wo_Do_Vr_Za'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD-MM-YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[vandaag om] LT',
+        nextDay: '[morgen om] LT',
+        nextWeek: 'dddd [om] LT',
+        lastDay: '[gisteren om] LT',
+        lastWeek: '[afgelopen] dddd [om] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'over %s',
+        past : '%s geleden',
+        s : 'een paar seconden',
+        m : 'één minuut',
+        mm : '%d minuten',
+        h : 'één uur',
+        hh : '%d uur',
+        d : 'één dag',
+        dd : '%d dagen',
+        M : 'één maand',
+        MM : '%d maanden',
+        y : 'één jaar',
+        yy : '%d jaar'
+    },
+    ordinalParse: /\d{1,2}(ste|de)/,
+    ordinal : function (number) {
+        return number + ((number === 1 || number === 8 || number >= 20) ? 'ste' : 'de');
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/nn.js b/turtles/app/lib/bower_components/momentjs/src/locale/nn.js
new file mode 100644
index 000000000..b3f76c56e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/nn.js
@@ -0,0 +1,51 @@
+//! moment.js locale configuration
+//! locale : norwegian nynorsk (nn)
+//! author : https://github.com/mechuwind
+
+import moment from '../moment';
+
+export default moment.defineLocale('nn', {
+    months : 'januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
+    weekdays : 'sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag'.split('_'),
+    weekdaysShort : 'sun_mån_tys_ons_tor_fre_lau'.split('_'),
+    weekdaysMin : 'su_må_ty_on_to_fr_lø'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[I dag klokka] LT',
+        nextDay: '[I morgon klokka] LT',
+        nextWeek: 'dddd [klokka] LT',
+        lastDay: '[I går klokka] LT',
+        lastWeek: '[Føregåande] dddd [klokka] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'om %s',
+        past : 'for %s sidan',
+        s : 'nokre sekund',
+        m : 'eit minutt',
+        mm : '%d minutt',
+        h : 'ein time',
+        hh : '%d timar',
+        d : 'ein dag',
+        dd : '%d dagar',
+        M : 'ein månad',
+        MM : '%d månader',
+        y : 'eit år',
+        yy : '%d år'
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/pl.js b/turtles/app/lib/bower_components/momentjs/src/locale/pl.js
new file mode 100644
index 000000000..e458ea5a2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/pl.js
@@ -0,0 +1,95 @@
+//! moment.js locale configuration
+//! locale : polish (pl)
+//! author : Rafal Hirsz : https://github.com/evoL
+
+import moment from '../moment';
+
+var monthsNominative = 'styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień'.split('_'),
+    monthsSubjective = 'stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia'.split('_');
+function plural(n) {
+    return (n % 10 < 5) && (n % 10 > 1) && ((~~(n / 10) % 10) !== 1);
+}
+function translate(number, withoutSuffix, key) {
+    var result = number + ' ';
+    switch (key) {
+    case 'm':
+        return withoutSuffix ? 'minuta' : 'minutę';
+    case 'mm':
+        return result + (plural(number) ? 'minuty' : 'minut');
+    case 'h':
+        return withoutSuffix  ? 'godzina'  : 'godzinę';
+    case 'hh':
+        return result + (plural(number) ? 'godziny' : 'godzin');
+    case 'MM':
+        return result + (plural(number) ? 'miesiące' : 'miesięcy');
+    case 'yy':
+        return result + (plural(number) ? 'lata' : 'lat');
+    }
+}
+
+export default moment.defineLocale('pl', {
+    months : function (momentToFormat, format) {
+        if (format === '') {
+            // Hack: if format empty we know this is used to generate
+            // RegExp by moment. Give then back both valid forms of months
+            // in RegExp ready format.
+            return '(' + monthsSubjective[momentToFormat.month()] + '|' + monthsNominative[momentToFormat.month()] + ')';
+        } else if (/D MMMM/.test(format)) {
+            return monthsSubjective[momentToFormat.month()];
+        } else {
+            return monthsNominative[momentToFormat.month()];
+        }
+    },
+    monthsShort : 'sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru'.split('_'),
+    weekdays : 'niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota'.split('_'),
+    weekdaysShort : 'nie_pon_wt_śr_czw_pt_sb'.split('_'),
+    weekdaysMin : 'N_Pn_Wt_Śr_Cz_Pt_So'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Dziś o] LT',
+        nextDay: '[Jutro o] LT',
+        nextWeek: '[W] dddd [o] LT',
+        lastDay: '[Wczoraj o] LT',
+        lastWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[W zeszłą niedzielę o] LT';
+            case 3:
+                return '[W zeszłą środę o] LT';
+            case 6:
+                return '[W zeszłą sobotę o] LT';
+            default:
+                return '[W zeszły] dddd [o] LT';
+            }
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past : '%s temu',
+        s : 'kilka sekund',
+        m : translate,
+        mm : translate,
+        h : translate,
+        hh : translate,
+        d : '1 dzień',
+        dd : '%d dni',
+        M : 'miesiąc',
+        MM : translate,
+        y : 'rok',
+        yy : translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/pt-br.js b/turtles/app/lib/bower_components/momentjs/src/locale/pt-br.js
new file mode 100644
index 000000000..e08e84706
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/pt-br.js
@@ -0,0 +1,51 @@
+//! moment.js locale configuration
+//! locale : brazilian portuguese (pt-br)
+//! author : Caio Ribeiro Pereira : https://github.com/caio-ribeiro-pereira
+
+import moment from '../moment';
+
+export default moment.defineLocale('pt-br', {
+    months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+    weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+    weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+    weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D [de] MMMM [de] YYYY',
+        LLL : 'D [de] MMMM [de] YYYY [às] LT',
+        LLLL : 'dddd, D [de] MMMM [de] YYYY [às] LT'
+    },
+    calendar : {
+        sameDay: '[Hoje às] LT',
+        nextDay: '[Amanhã às] LT',
+        nextWeek: 'dddd [às] LT',
+        lastDay: '[Ontem às] LT',
+        lastWeek: function () {
+            return (this.day() === 0 || this.day() === 6) ?
+                '[Último] dddd [às] LT' : // Saturday + Sunday
+                '[Última] dddd [às] LT'; // Monday - Friday
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'em %s',
+        past : '%s atrás',
+        s : 'segundos',
+        m : 'um minuto',
+        mm : '%d minutos',
+        h : 'uma hora',
+        hh : '%d horas',
+        d : 'um dia',
+        dd : '%d dias',
+        M : 'um mês',
+        MM : '%d meses',
+        y : 'um ano',
+        yy : '%d anos'
+    },
+    ordinalParse: /\d{1,2}º/,
+    ordinal : '%dº'
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/pt.js b/turtles/app/lib/bower_components/momentjs/src/locale/pt.js
new file mode 100644
index 000000000..71e37c697
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/pt.js
@@ -0,0 +1,55 @@
+//! moment.js locale configuration
+//! locale : portuguese (pt)
+//! author : Jefferson : https://github.com/jalex79
+
+import moment from '../moment';
+
+export default moment.defineLocale('pt', {
+    months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
+    monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
+    weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),
+    weekdaysShort : 'Dom_Seg_Ter_Qua_Qui_Sex_Sáb'.split('_'),
+    weekdaysMin : 'Dom_2ª_3ª_4ª_5ª_6ª_Sáb'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D [de] MMMM [de] YYYY',
+        LLL : 'D [de] MMMM [de] YYYY LT',
+        LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Hoje às] LT',
+        nextDay: '[Amanhã às] LT',
+        nextWeek: 'dddd [às] LT',
+        lastDay: '[Ontem às] LT',
+        lastWeek: function () {
+            return (this.day() === 0 || this.day() === 6) ?
+                '[Último] dddd [às] LT' : // Saturday + Sunday
+                '[Última] dddd [às] LT'; // Monday - Friday
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'em %s',
+        past : 'há %s',
+        s : 'segundos',
+        m : 'um minuto',
+        mm : '%d minutos',
+        h : 'uma hora',
+        hh : '%d horas',
+        d : 'um dia',
+        dd : '%d dias',
+        M : 'um mês',
+        MM : '%d meses',
+        y : 'um ano',
+        yy : '%d anos'
+    },
+    ordinalParse: /\d{1,2}º/,
+    ordinal : '%dº',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ro.js b/turtles/app/lib/bower_components/momentjs/src/locale/ro.js
new file mode 100644
index 000000000..de6cebf0c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ro.js
@@ -0,0 +1,65 @@
+//! moment.js locale configuration
+//! locale : romanian (ro)
+//! author : Vlad Gurdiga : https://github.com/gurdiga
+//! author : Valentin Agachi : https://github.com/avaly
+
+import moment from '../moment';
+
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+    var format = {
+            'mm': 'minute',
+            'hh': 'ore',
+            'dd': 'zile',
+            'MM': 'luni',
+            'yy': 'ani'
+        },
+        separator = ' ';
+    if (number % 100 >= 20 || (number >= 100 && number % 100 === 0)) {
+        separator = ' de ';
+    }
+    return number + separator + format[key];
+}
+
+export default moment.defineLocale('ro', {
+    months : 'ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie'.split('_'),
+    monthsShort : 'ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.'.split('_'),
+    weekdays : 'duminică_luni_marți_miercuri_joi_vineri_sâmbătă'.split('_'),
+    weekdaysShort : 'Dum_Lun_Mar_Mie_Joi_Vin_Sâm'.split('_'),
+    weekdaysMin : 'Du_Lu_Ma_Mi_Jo_Vi_Sâ'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY H:mm',
+        LLLL : 'dddd, D MMMM YYYY H:mm'
+    },
+    calendar : {
+        sameDay: '[azi la] LT',
+        nextDay: '[mâine la] LT',
+        nextWeek: 'dddd [la] LT',
+        lastDay: '[ieri la] LT',
+        lastWeek: '[fosta] dddd [la] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'peste %s',
+        past : '%s în urmă',
+        s : 'câteva secunde',
+        m : 'un minut',
+        mm : relativeTimeWithPlural,
+        h : 'o oră',
+        hh : relativeTimeWithPlural,
+        d : 'o zi',
+        dd : relativeTimeWithPlural,
+        M : 'o lună',
+        MM : relativeTimeWithPlural,
+        y : 'un an',
+        yy : relativeTimeWithPlural
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ru.js b/turtles/app/lib/bower_components/momentjs/src/locale/ru.js
new file mode 100644
index 000000000..8a210a46e
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ru.js
@@ -0,0 +1,155 @@
+//! moment.js locale configuration
+//! locale : russian (ru)
+//! author : Viktorminator : https://github.com/Viktorminator
+//! Author : Menelion Elensúle : https://github.com/Oire
+
+import moment from '../moment';
+
+function plural(word, num) {
+    var forms = word.split('_');
+    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+}
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+    var format = {
+        'mm': withoutSuffix ? 'минута_минуты_минут' : 'минуту_минуты_минут',
+        'hh': 'час_часа_часов',
+        'dd': 'день_дня_дней',
+        'MM': 'месяц_месяца_месяцев',
+        'yy': 'год_года_лет'
+    };
+    if (key === 'm') {
+        return withoutSuffix ? 'минута' : 'минуту';
+    }
+    else {
+        return number + ' ' + plural(format[key], +number);
+    }
+}
+function monthsCaseReplace(m, format) {
+    var months = {
+        'nominative': 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+        'accusative': 'января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря'.split('_')
+    },
+    nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+        'accusative' :
+        'nominative';
+    return months[nounCase][m.month()];
+}
+function monthsShortCaseReplace(m, format) {
+    var monthsShort = {
+        'nominative': 'янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек'.split('_'),
+        'accusative': 'янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек'.split('_')
+    },
+    nounCase = (/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/).test(format) ?
+        'accusative' :
+        'nominative';
+    return monthsShort[nounCase][m.month()];
+}
+function weekdaysCaseReplace(m, format) {
+    var weekdays = {
+        'nominative': 'воскресенье_понедельник_вторник_среда_четверг_пятница_суббота'.split('_'),
+        'accusative': 'воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу'.split('_')
+    },
+    nounCase = (/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/).test(format) ?
+        'accusative' :
+        'nominative';
+    return weekdays[nounCase][m.day()];
+}
+
+export default moment.defineLocale('ru', {
+    months : monthsCaseReplace,
+    monthsShort : monthsShortCaseReplace,
+    weekdays : weekdaysCaseReplace,
+    weekdaysShort : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+    weekdaysMin : 'вс_пн_вт_ср_чт_пт_сб'.split('_'),
+    monthsParse : [/^янв/i, /^фев/i, /^мар/i, /^апр/i, /^ма[й|я]/i, /^июн/i, /^июл/i, /^авг/i, /^сен/i, /^окт/i, /^ноя/i, /^дек/i],
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY г.',
+        LLL : 'D MMMM YYYY г., LT',
+        LLLL : 'dddd, D MMMM YYYY г., LT'
+    },
+    calendar : {
+        sameDay: '[Сегодня в] LT',
+        nextDay: '[Завтра в] LT',
+        lastDay: '[Вчера в] LT',
+        nextWeek: function () {
+            return this.day() === 2 ? '[Во] dddd [в] LT' : '[В] dddd [в] LT';
+        },
+        lastWeek: function (now) {
+            if (now.week() !== this.week()) {
+                switch (this.day()) {
+                case 0:
+                    return '[В прошлое] dddd [в] LT';
+                case 1:
+                case 2:
+                case 4:
+                    return '[В прошлый] dddd [в] LT';
+                case 3:
+                case 5:
+                case 6:
+                    return '[В прошлую] dddd [в] LT';
+                }
+            } else {
+                if (this.day() === 2) {
+                    return '[Во] dddd [в] LT';
+                } else {
+                    return '[В] dddd [в] LT';
+                }
+            }
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'через %s',
+        past : '%s назад',
+        s : 'несколько секунд',
+        m : relativeTimeWithPlural,
+        mm : relativeTimeWithPlural,
+        h : 'час',
+        hh : relativeTimeWithPlural,
+        d : 'день',
+        dd : relativeTimeWithPlural,
+        M : 'месяц',
+        MM : relativeTimeWithPlural,
+        y : 'год',
+        yy : relativeTimeWithPlural
+    },
+    meridiemParse: /ночи|утра|дня|вечера/i,
+    isPM : function (input) {
+        return /^(дня|вечера)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'ночи';
+        } else if (hour < 12) {
+            return 'утра';
+        } else if (hour < 17) {
+            return 'дня';
+        } else {
+            return 'вечера';
+        }
+    },
+    ordinalParse: /\d{1,2}-(й|го|я)/,
+    ordinal: function (number, period) {
+        switch (period) {
+        case 'M':
+        case 'd':
+        case 'DDD':
+            return number + '-й';
+        case 'D':
+            return number + '-го';
+        case 'w':
+        case 'W':
+            return number + '-я';
+        default:
+            return number;
+        }
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/si.js b/turtles/app/lib/bower_components/momentjs/src/locale/si.js
new file mode 100644
index 000000000..4f5995c43
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/si.js
@@ -0,0 +1,56 @@
+//! moment.js locale configuration
+//! locale : Sinhalese (si)
+//! author : Sampath Sitinamaluwa : https://github.com/sampathsris
+
+import moment from '../moment';
+
+/*jshint -W100*/
+export default moment.defineLocale('si', {
+    months : 'ජනවාරි_පෙබරවාරි_මාර්තු_අප්‍රේල්_මැයි_ජූනි_ජූලි_අගෝස්තු_සැප්තැම්බර්_ඔක්තෝබර්_නොවැම්බර්_දෙසැම්බර්'.split('_'),
+    monthsShort : 'ජන_පෙබ_මාර්_අප්_මැයි_ජූනි_ජූලි_අගෝ_සැප්_ඔක්_නොවැ_දෙසැ'.split('_'),
+    weekdays : 'ඉරිදා_සඳුදා_අඟහරුවාදා_බදාදා_බ්‍රහස්පතින්දා_සිකුරාදා_සෙනසුරාදා'.split('_'),
+    weekdaysShort : 'ඉරි_සඳු_අඟ_බදා_බ්‍රහ_සිකු_සෙන'.split('_'),
+    weekdaysMin : 'ඉ_ස_අ_බ_බ්‍ර_සි_සෙ'.split('_'),
+    longDateFormat : {
+        LT : 'a h:mm',
+        LTS : 'a h:mm:ss',
+        L : 'YYYY/MM/DD',
+        LL : 'YYYY MMMM D',
+        LLL : 'YYYY MMMM D, LT',
+        LLLL : 'YYYY MMMM D [වැනි] dddd, LTS'
+    },
+    calendar : {
+        sameDay : '[අද] LT[ට]',
+        nextDay : '[හෙට] LT[ට]',
+        nextWeek : 'dddd LT[ට]',
+        lastDay : '[ඊයේ] LT[ට]',
+        lastWeek : '[පසුගිය] dddd LT[ට]',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%sකින්',
+        past : '%sකට පෙර',
+        s : 'තත්පර කිහිපය',
+        m : 'මිනිත්තුව',
+        mm : 'මිනිත්තු %d',
+        h : 'පැය',
+        hh : 'පැය %d',
+        d : 'දිනය',
+        dd : 'දින %d',
+        M : 'මාසය',
+        MM : 'මාස %d',
+        y : 'වසර',
+        yy : 'වසර %d'
+    },
+    ordinalParse: /\d{1,2} වැනි/,
+    ordinal : function (number) {
+        return number + ' වැනි';
+    },
+    meridiem : function (hours, minutes, isLower) {
+        if (hours > 11) {
+            return isLower ? 'ප.ව.' : 'පස් වරු';
+        } else {
+            return isLower ? 'පෙ.ව.' : 'පෙර වරු';
+        }
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/sk.js b/turtles/app/lib/bower_components/momentjs/src/locale/sk.js
new file mode 100644
index 000000000..4ac38c302
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/sk.js
@@ -0,0 +1,149 @@
+//! moment.js locale configuration
+//! locale : slovak (sk)
+//! author : Martin Minka : https://github.com/k2s
+//! based on work of petrbela : https://github.com/petrbela
+
+import moment from '../moment';
+
+var months = 'január_február_marec_apríl_máj_jún_júl_august_september_október_november_december'.split('_'),
+    monthsShort = 'jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec'.split('_');
+function plural(n) {
+    return (n > 1) && (n < 5);
+}
+function translate(number, withoutSuffix, key, isFuture) {
+    var result = number + ' ';
+    switch (key) {
+    case 's':  // a few seconds / in a few seconds / a few seconds ago
+        return (withoutSuffix || isFuture) ? 'pár sekúnd' : 'pár sekundami';
+    case 'm':  // a minute / in a minute / a minute ago
+        return withoutSuffix ? 'minúta' : (isFuture ? 'minútu' : 'minútou');
+    case 'mm': // 9 minutes / in 9 minutes / 9 minutes ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'minúty' : 'minút');
+        } else {
+            return result + 'minútami';
+        }
+        break;
+    case 'h':  // an hour / in an hour / an hour ago
+        return withoutSuffix ? 'hodina' : (isFuture ? 'hodinu' : 'hodinou');
+    case 'hh': // 9 hours / in 9 hours / 9 hours ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'hodiny' : 'hodín');
+        } else {
+            return result + 'hodinami';
+        }
+        break;
+    case 'd':  // a day / in a day / a day ago
+        return (withoutSuffix || isFuture) ? 'deň' : 'dňom';
+    case 'dd': // 9 days / in 9 days / 9 days ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'dni' : 'dní');
+        } else {
+            return result + 'dňami';
+        }
+        break;
+    case 'M':  // a month / in a month / a month ago
+        return (withoutSuffix || isFuture) ? 'mesiac' : 'mesiacom';
+    case 'MM': // 9 months / in 9 months / 9 months ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'mesiace' : 'mesiacov');
+        } else {
+            return result + 'mesiacmi';
+        }
+        break;
+    case 'y':  // a year / in a year / a year ago
+        return (withoutSuffix || isFuture) ? 'rok' : 'rokom';
+    case 'yy': // 9 years / in 9 years / 9 years ago
+        if (withoutSuffix || isFuture) {
+            return result + (plural(number) ? 'roky' : 'rokov');
+        } else {
+            return result + 'rokmi';
+        }
+        break;
+    }
+}
+
+export default moment.defineLocale('sk', {
+    months : months,
+    monthsShort : monthsShort,
+    monthsParse : (function (months, monthsShort) {
+        var i, _monthsParse = [];
+        for (i = 0; i < 12; i++) {
+            // use custom parser to solve problem with July (červenec)
+            _monthsParse[i] = new RegExp('^' + months[i] + '$|^' + monthsShort[i] + '$', 'i');
+        }
+        return _monthsParse;
+    }(months, monthsShort)),
+    weekdays : 'nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota'.split('_'),
+    weekdaysShort : 'ne_po_ut_st_št_pi_so'.split('_'),
+    weekdaysMin : 'ne_po_ut_st_št_pi_so'.split('_'),
+    longDateFormat : {
+        LT: 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[dnes o] LT',
+        nextDay: '[zajtra o] LT',
+        nextWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[v nedeľu o] LT';
+            case 1:
+            case 2:
+                return '[v] dddd [o] LT';
+            case 3:
+                return '[v stredu o] LT';
+            case 4:
+                return '[vo štvrtok o] LT';
+            case 5:
+                return '[v piatok o] LT';
+            case 6:
+                return '[v sobotu o] LT';
+            }
+        },
+        lastDay: '[včera o] LT',
+        lastWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[minulú nedeľu o] LT';
+            case 1:
+            case 2:
+                return '[minulý] dddd [o] LT';
+            case 3:
+                return '[minulú stredu o] LT';
+            case 4:
+            case 5:
+                return '[minulý] dddd [o] LT';
+            case 6:
+                return '[minulú sobotu o] LT';
+            }
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past : 'pred %s',
+        s : translate,
+        m : translate,
+        mm : translate,
+        h : translate,
+        hh : translate,
+        d : translate,
+        dd : translate,
+        M : translate,
+        MM : translate,
+        y : translate,
+        yy : translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/sl.js b/turtles/app/lib/bower_components/momentjs/src/locale/sl.js
new file mode 100644
index 000000000..e5723389d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/sl.js
@@ -0,0 +1,150 @@
+//! moment.js locale configuration
+//! locale : slovenian (sl)
+//! author : Robert Sedovšek : https://github.com/sedovsek
+
+import moment from '../moment';
+
+function processRelativeTime(number, withoutSuffix, key, isFuture) {
+    var result = number + ' ';
+    switch (key) {
+    case 's':
+        return withoutSuffix || isFuture ? 'nekaj sekund' : 'nekaj sekundami';
+    case 'm':
+        return withoutSuffix ? 'ena minuta' : 'eno minuto';
+    case 'mm':
+        if (number === 1) {
+            result += withoutSuffix ? 'minuta' : 'minuto';
+        } else if (number === 2) {
+            result += withoutSuffix || isFuture ? 'minuti' : 'minutama';
+        } else if (number < 5) {
+            result += withoutSuffix || isFuture ? 'minute' : 'minutami';
+        } else {
+            result += withoutSuffix || isFuture ? 'minut' : 'minutami';
+        }
+        return result;
+    case 'h':
+        return withoutSuffix ? 'ena ura' : 'eno uro';
+    case 'hh':
+        if (number === 1) {
+            result += withoutSuffix ? 'ura' : 'uro';
+        } else if (number === 2) {
+            result += withoutSuffix || isFuture ? 'uri' : 'urama';
+        } else if (number < 5) {
+            result += withoutSuffix || isFuture ? 'ure' : 'urami';
+        } else {
+            result += withoutSuffix || isFuture ? 'ur' : 'urami';
+        }
+        return result;
+    case 'd':
+        return withoutSuffix || isFuture ? 'en dan' : 'enim dnem';
+    case 'dd':
+        if (number === 1) {
+            result += withoutSuffix || isFuture ? 'dan' : 'dnem';
+        } else if (number === 2) {
+            result += withoutSuffix || isFuture ? 'dni' : 'dnevoma';
+        } else {
+            result += withoutSuffix || isFuture ? 'dni' : 'dnevi';
+        }
+        return result;
+    case 'M':
+        return withoutSuffix || isFuture ? 'en mesec' : 'enim mesecem';
+    case 'MM':
+        if (number === 1) {
+            result += withoutSuffix || isFuture ? 'mesec' : 'mesecem';
+        } else if (number === 2) {
+            result += withoutSuffix || isFuture ? 'meseca' : 'mesecema';
+        } else if (number < 5) {
+            result += withoutSuffix || isFuture ? 'mesece' : 'meseci';
+        } else {
+            result += withoutSuffix || isFuture ? 'mesecev' : 'meseci';
+        }
+        return result;
+    case 'y':
+        return withoutSuffix || isFuture ? 'eno leto' : 'enim letom';
+    case 'yy':
+        if (number === 1) {
+            result += withoutSuffix || isFuture ? 'leto' : 'letom';
+        } else if (number === 2) {
+            result += withoutSuffix || isFuture ? 'leti' : 'letoma';
+        } else if (number < 5) {
+            result += withoutSuffix || isFuture ? 'leta' : 'leti';
+        } else {
+            result += withoutSuffix || isFuture ? 'let' : 'leti';
+        }
+        return result;
+    }
+}
+
+export default moment.defineLocale('sl', {
+    months : 'januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december'.split('_'),
+    monthsShort : 'jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.'.split('_'),
+    weekdays : 'nedelja_ponedeljek_torek_sreda_četrtek_petek_sobota'.split('_'),
+    weekdaysShort : 'ned._pon._tor._sre._čet._pet._sob.'.split('_'),
+    weekdaysMin : 'ne_po_to_sr_če_pe_so'.split('_'),
+    longDateFormat : {
+        LT : 'H:mm',
+        LTS : 'LT:ss',
+        L : 'DD. MM. YYYY',
+        LL : 'D. MMMM YYYY',
+        LLL : 'D. MMMM YYYY LT',
+        LLLL : 'dddd, D. MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay  : '[danes ob] LT',
+        nextDay  : '[jutri ob] LT',
+
+        nextWeek : function () {
+            switch (this.day()) {
+            case 0:
+                return '[v] [nedeljo] [ob] LT';
+            case 3:
+                return '[v] [sredo] [ob] LT';
+            case 6:
+                return '[v] [soboto] [ob] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[v] dddd [ob] LT';
+            }
+        },
+        lastDay  : '[včeraj ob] LT',
+        lastWeek : function () {
+            switch (this.day()) {
+            case 0:
+                return '[prejšnjo] [nedeljo] [ob] LT';
+            case 3:
+                return '[prejšnjo] [sredo] [ob] LT';
+            case 6:
+                return '[prejšnjo] [soboto] [ob] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[prejšnji] dddd [ob] LT';
+            }
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'čez %s',
+        past   : 'pred %s',
+        s      : processRelativeTime,
+        m      : processRelativeTime,
+        mm     : processRelativeTime,
+        h      : processRelativeTime,
+        hh     : processRelativeTime,
+        d      : processRelativeTime,
+        dd     : processRelativeTime,
+        M      : processRelativeTime,
+        MM     : processRelativeTime,
+        y      : processRelativeTime,
+        yy     : processRelativeTime
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/sq.js b/turtles/app/lib/bower_components/momentjs/src/locale/sq.js
new file mode 100644
index 000000000..76172b467
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/sq.js
@@ -0,0 +1,60 @@
+//! moment.js locale configuration
+//! locale : Albanian (sq)
+//! author : Flakërim Ismani : https://github.com/flakerimi
+//! author: Menelion Elensúle: https://github.com/Oire (tests)
+//! author : Oerd Cukalla : https://github.com/oerd (fixes)
+
+import moment from '../moment';
+
+export default moment.defineLocale('sq', {
+    months : 'Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor'.split('_'),
+    monthsShort : 'Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj'.split('_'),
+    weekdays : 'E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë'.split('_'),
+    weekdaysShort : 'Die_Hën_Mar_Mër_Enj_Pre_Sht'.split('_'),
+    weekdaysMin : 'D_H_Ma_Më_E_P_Sh'.split('_'),
+    meridiemParse: /PD|MD/,
+    isPM: function (input) {
+        return input.charAt(0) === 'M';
+    },
+    meridiem : function (hours, minutes, isLower) {
+        return hours < 12 ? 'PD' : 'MD';
+    },
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[Sot në] LT',
+        nextDay : '[Nesër në] LT',
+        nextWeek : 'dddd [në] LT',
+        lastDay : '[Dje në] LT',
+        lastWeek : 'dddd [e kaluar në] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'në %s',
+        past : '%s më parë',
+        s : 'disa sekonda',
+        m : 'një minutë',
+        mm : '%d minuta',
+        h : 'një orë',
+        hh : '%d orë',
+        d : 'një ditë',
+        dd : '%d ditë',
+        M : 'një muaj',
+        MM : '%d muaj',
+        y : 'një vit',
+        yy : '%d vite'
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/sr-cyrl.js b/turtles/app/lib/bower_components/momentjs/src/locale/sr-cyrl.js
new file mode 100644
index 000000000..1da53e3f2
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/sr-cyrl.js
@@ -0,0 +1,99 @@
+//! moment.js locale configuration
+//! locale : Serbian-cyrillic (sr-cyrl)
+//! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+import moment from '../moment';
+
+var translator = {
+    words: { //Different grammatical cases
+        m: ['један минут', 'једне минуте'],
+        mm: ['минут', 'минуте', 'минута'],
+        h: ['један сат', 'једног сата'],
+        hh: ['сат', 'сата', 'сати'],
+        dd: ['дан', 'дана', 'дана'],
+        MM: ['месец', 'месеца', 'месеци'],
+        yy: ['година', 'године', 'година']
+    },
+    correctGrammaticalCase: function (number, wordKey) {
+        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+    },
+    translate: function (number, withoutSuffix, key) {
+        var wordKey = translator.words[key];
+        if (key.length === 1) {
+            return withoutSuffix ? wordKey[0] : wordKey[1];
+        } else {
+            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+        }
+    }
+};
+
+export default moment.defineLocale('sr-cyrl', {
+    months: ['јануар', 'фебруар', 'март', 'април', 'мај', 'јун', 'јул', 'август', 'септембар', 'октобар', 'новембар', 'децембар'],
+    monthsShort: ['јан.', 'феб.', 'мар.', 'апр.', 'мај', 'јун', 'јул', 'авг.', 'сеп.', 'окт.', 'нов.', 'дец.'],
+    weekdays: ['недеља', 'понедељак', 'уторак', 'среда', 'четвртак', 'петак', 'субота'],
+    weekdaysShort: ['нед.', 'пон.', 'уто.', 'сре.', 'чет.', 'пет.', 'суб.'],
+    weekdaysMin: ['не', 'по', 'ут', 'ср', 'че', 'пе', 'су'],
+    longDateFormat: {
+        LT: 'H:mm',
+        LTS : 'LT:ss',
+        L: 'DD. MM. YYYY',
+        LL: 'D. MMMM YYYY',
+        LLL: 'D. MMMM YYYY LT',
+        LLLL: 'dddd, D. MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[данас у] LT',
+        nextDay: '[сутра у] LT',
+        nextWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[у] [недељу] [у] LT';
+            case 3:
+                return '[у] [среду] [у] LT';
+            case 6:
+                return '[у] [суботу] [у] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[у] dddd [у] LT';
+            }
+        },
+        lastDay  : '[јуче у] LT',
+        lastWeek : function () {
+            var lastWeekDays = [
+                '[прошле] [недеље] [у] LT',
+                '[прошлог] [понедељка] [у] LT',
+                '[прошлог] [уторка] [у] LT',
+                '[прошле] [среде] [у] LT',
+                '[прошлог] [четвртка] [у] LT',
+                '[прошлог] [петка] [у] LT',
+                '[прошле] [суботе] [у] LT'
+            ];
+            return lastWeekDays[this.day()];
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'за %s',
+        past   : 'пре %s',
+        s      : 'неколико секунди',
+        m      : translator.translate,
+        mm     : translator.translate,
+        h      : translator.translate,
+        hh     : translator.translate,
+        d      : 'дан',
+        dd     : translator.translate,
+        M      : 'месец',
+        MM     : translator.translate,
+        y      : 'годину',
+        yy     : translator.translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/sr.js b/turtles/app/lib/bower_components/momentjs/src/locale/sr.js
new file mode 100644
index 000000000..210c7398f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/sr.js
@@ -0,0 +1,99 @@
+//! moment.js locale configuration
+//! locale : Serbian-latin (sr)
+//! author : Milan Janačković<milanjanackovic@gmail.com> : https://github.com/milan-j
+
+import moment from '../moment';
+
+var translator = {
+    words: { //Different grammatical cases
+        m: ['jedan minut', 'jedne minute'],
+        mm: ['minut', 'minute', 'minuta'],
+        h: ['jedan sat', 'jednog sata'],
+        hh: ['sat', 'sata', 'sati'],
+        dd: ['dan', 'dana', 'dana'],
+        MM: ['mesec', 'meseca', 'meseci'],
+        yy: ['godina', 'godine', 'godina']
+    },
+    correctGrammaticalCase: function (number, wordKey) {
+        return number === 1 ? wordKey[0] : (number >= 2 && number <= 4 ? wordKey[1] : wordKey[2]);
+    },
+    translate: function (number, withoutSuffix, key) {
+        var wordKey = translator.words[key];
+        if (key.length === 1) {
+            return withoutSuffix ? wordKey[0] : wordKey[1];
+        } else {
+            return number + ' ' + translator.correctGrammaticalCase(number, wordKey);
+        }
+    }
+};
+
+export default moment.defineLocale('sr', {
+    months: ['januar', 'februar', 'mart', 'april', 'maj', 'jun', 'jul', 'avgust', 'septembar', 'oktobar', 'novembar', 'decembar'],
+    monthsShort: ['jan.', 'feb.', 'mar.', 'apr.', 'maj', 'jun', 'jul', 'avg.', 'sep.', 'okt.', 'nov.', 'dec.'],
+    weekdays: ['nedelja', 'ponedeljak', 'utorak', 'sreda', 'četvrtak', 'petak', 'subota'],
+    weekdaysShort: ['ned.', 'pon.', 'uto.', 'sre.', 'čet.', 'pet.', 'sub.'],
+    weekdaysMin: ['ne', 'po', 'ut', 'sr', 'če', 'pe', 'su'],
+    longDateFormat: {
+        LT: 'H:mm',
+        LTS : 'LT:ss',
+        L: 'DD. MM. YYYY',
+        LL: 'D. MMMM YYYY',
+        LLL: 'D. MMMM YYYY LT',
+        LLLL: 'dddd, D. MMMM YYYY LT'
+    },
+    calendar: {
+        sameDay: '[danas u] LT',
+        nextDay: '[sutra u] LT',
+        nextWeek: function () {
+            switch (this.day()) {
+            case 0:
+                return '[u] [nedelju] [u] LT';
+            case 3:
+                return '[u] [sredu] [u] LT';
+            case 6:
+                return '[u] [subotu] [u] LT';
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                return '[u] dddd [u] LT';
+            }
+        },
+        lastDay  : '[juče u] LT',
+        lastWeek : function () {
+            var lastWeekDays = [
+                '[prošle] [nedelje] [u] LT',
+                '[prošlog] [ponedeljka] [u] LT',
+                '[prošlog] [utorka] [u] LT',
+                '[prošle] [srede] [u] LT',
+                '[prošlog] [četvrtka] [u] LT',
+                '[prošlog] [petka] [u] LT',
+                '[prošle] [subote] [u] LT'
+            ];
+            return lastWeekDays[this.day()];
+        },
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'za %s',
+        past   : 'pre %s',
+        s      : 'nekoliko sekundi',
+        m      : translator.translate,
+        mm     : translator.translate,
+        h      : translator.translate,
+        hh     : translator.translate,
+        d      : 'dan',
+        dd     : translator.translate,
+        M      : 'mesec',
+        MM     : translator.translate,
+        y      : 'godinu',
+        yy     : translator.translate
+    },
+    ordinalParse: /\d{1,2}\./,
+    ordinal : '%d.',
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/sv.js b/turtles/app/lib/bower_components/momentjs/src/locale/sv.js
new file mode 100644
index 000000000..6fc1c2680
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/sv.js
@@ -0,0 +1,58 @@
+//! moment.js locale configuration
+//! locale : swedish (sv)
+//! author : Jens Alm : https://github.com/ulmus
+
+import moment from '../moment';
+
+export default moment.defineLocale('sv', {
+    months : 'januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december'.split('_'),
+    monthsShort : 'jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec'.split('_'),
+    weekdays : 'söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag'.split('_'),
+    weekdaysShort : 'sön_mån_tis_ons_tor_fre_lör'.split('_'),
+    weekdaysMin : 'sö_må_ti_on_to_fr_lö'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'YYYY-MM-DD',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Idag] LT',
+        nextDay: '[Imorgon] LT',
+        lastDay: '[Igår] LT',
+        nextWeek: '[På] dddd LT',
+        lastWeek: '[I] dddd[s] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'om %s',
+        past : 'för %s sedan',
+        s : 'några sekunder',
+        m : 'en minut',
+        mm : '%d minuter',
+        h : 'en timme',
+        hh : '%d timmar',
+        d : 'en dag',
+        dd : '%d dagar',
+        M : 'en månad',
+        MM : '%d månader',
+        y : 'ett år',
+        yy : '%d år'
+    },
+    ordinalParse: /\d{1,2}(e|a)/,
+    ordinal : function (number) {
+        var b = number % 10,
+            output = (~~(number % 100 / 10) === 1) ? 'e' :
+            (b === 1) ? 'a' :
+            (b === 2) ? 'a' :
+            (b === 3) ? 'e' : 'e';
+        return number + output;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/ta.js b/turtles/app/lib/bower_components/momentjs/src/locale/ta.js
new file mode 100644
index 000000000..4341c3e72
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/ta.js
@@ -0,0 +1,86 @@
+//! moment.js locale configuration
+//! locale : tamil (ta)
+//! author : Arjunkumar Krishnamoorthy : https://github.com/tk120404
+
+import moment from '../moment';
+
+export default moment.defineLocale('ta', {
+    months : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+    monthsShort : 'ஜனவரி_பிப்ரவரி_மார்ச்_ஏப்ரல்_மே_ஜூன்_ஜூலை_ஆகஸ்ட்_செப்டெம்பர்_அக்டோபர்_நவம்பர்_டிசம்பர்'.split('_'),
+    weekdays : 'ஞாயிற்றுக்கிழமை_திங்கட்கிழமை_செவ்வாய்கிழமை_புதன்கிழமை_வியாழக்கிழமை_வெள்ளிக்கிழமை_சனிக்கிழமை'.split('_'),
+    weekdaysShort : 'ஞாயிறு_திங்கள்_செவ்வாய்_புதன்_வியாழன்_வெள்ளி_சனி'.split('_'),
+    weekdaysMin : 'ஞா_தி_செ_பு_வி_வெ_ச'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY, LT',
+        LLLL : 'dddd, D MMMM YYYY, LT'
+    },
+    calendar : {
+        sameDay : '[இன்று] LT',
+        nextDay : '[நாளை] LT',
+        nextWeek : 'dddd, LT',
+        lastDay : '[நேற்று] LT',
+        lastWeek : '[கடந்த வாரம்] dddd, LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s இல்',
+        past : '%s முன்',
+        s : 'ஒரு சில விநாடிகள்',
+        m : 'ஒரு நிமிடம்',
+        mm : '%d நிமிடங்கள்',
+        h : 'ஒரு மணி நேரம்',
+        hh : '%d மணி நேரம்',
+        d : 'ஒரு நாள்',
+        dd : '%d நாட்கள்',
+        M : 'ஒரு மாதம்',
+        MM : '%d மாதங்கள்',
+        y : 'ஒரு வருடம்',
+        yy : '%d ஆண்டுகள்'
+    },
+    ordinalParse: /\d{1,2}வது/,
+    ordinal : function (number) {
+        return number + 'வது';
+    },
+    // refer http://ta.wikipedia.org/s/1er1
+    meridiemParse: /யாமம்|வைகறை|காலை|நண்பகல்|எற்பாடு|மாலை/,
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 2) {
+            return ' யாமம்';
+        } else if (hour < 6) {
+            return ' வைகறை';  // வைகறை
+        } else if (hour < 10) {
+            return ' காலை'; // காலை
+        } else if (hour < 14) {
+            return ' நண்பகல்'; // நண்பகல்
+        } else if (hour < 18) {
+            return ' எற்பாடு'; // எற்பாடு
+        } else if (hour < 22) {
+            return ' மாலை'; // மாலை
+        } else {
+            return ' யாமம்';
+        }
+    },
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === 'யாமம்') {
+            return hour < 2 ? hour : hour + 12;
+        } else if (meridiem === 'வைகறை' || meridiem === 'காலை') {
+            return hour;
+        } else if (meridiem === 'நண்பகல்') {
+            return hour >= 10 ? hour : hour + 12;
+        } else {
+            return hour + 12;
+        }
+    },
+    week : {
+        dow : 0, // Sunday is the first day of the week.
+        doy : 6  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/th.js b/turtles/app/lib/bower_components/momentjs/src/locale/th.js
new file mode 100644
index 000000000..2382d2541
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/th.js
@@ -0,0 +1,56 @@
+//! moment.js locale configuration
+//! locale : thai (th)
+//! author : Kridsada Thanabulpong : https://github.com/sirn
+
+import moment from '../moment';
+
+export default moment.defineLocale('th', {
+    months : 'มกราคม_กุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_กรกฎาคม_สิงหาคม_กันยายน_ตุลาคม_พฤศจิกายน_ธันวาคม'.split('_'),
+    monthsShort : 'มกรา_กุมภา_มีนา_เมษา_พฤษภา_มิถุนา_กรกฎา_สิงหา_กันยา_ตุลา_พฤศจิกา_ธันวา'.split('_'),
+    weekdays : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุกร์_เสาร์'.split('_'),
+    weekdaysShort : 'อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุกร์_เสาร์'.split('_'), // yes, three characters difference
+    weekdaysMin : 'อา._จ._อ._พ._พฤ._ศ._ส.'.split('_'),
+    longDateFormat : {
+        LT : 'H นาฬิกา m นาที',
+        LTS : 'LT s วินาที',
+        L : 'YYYY/MM/DD',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY เวลา LT',
+        LLLL : 'วันddddที่ D MMMM YYYY เวลา LT'
+    },
+    meridiemParse: /ก่อนเที่ยง|หลังเที่ยง/,
+    isPM: function (input) {
+        return input === 'หลังเที่ยง';
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 12) {
+            return 'ก่อนเที่ยง';
+        } else {
+            return 'หลังเที่ยง';
+        }
+    },
+    calendar : {
+        sameDay : '[วันนี้ เวลา] LT',
+        nextDay : '[พรุ่งนี้ เวลา] LT',
+        nextWeek : 'dddd[หน้า เวลา] LT',
+        lastDay : '[เมื่อวานนี้ เวลา] LT',
+        lastWeek : '[วัน]dddd[ที่แล้ว เวลา] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'อีก %s',
+        past : '%sที่แล้ว',
+        s : 'ไม่กี่วินาที',
+        m : '1 นาที',
+        mm : '%d นาที',
+        h : '1 ชั่วโมง',
+        hh : '%d ชั่วโมง',
+        d : '1 วัน',
+        dd : '%d วัน',
+        M : '1 เดือน',
+        MM : '%d เดือน',
+        y : '1 ปี',
+        yy : '%d ปี'
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/tl-ph.js b/turtles/app/lib/bower_components/momentjs/src/locale/tl-ph.js
new file mode 100644
index 000000000..a1b24a710
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/tl-ph.js
@@ -0,0 +1,53 @@
+//! moment.js locale configuration
+//! locale : Tagalog/Filipino (tl-ph)
+//! author : Dan Hagman
+
+import moment from '../moment';
+
+export default moment.defineLocale('tl-ph', {
+    months : 'Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre'.split('_'),
+    monthsShort : 'Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis'.split('_'),
+    weekdays : 'Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado'.split('_'),
+    weekdaysShort : 'Lin_Lun_Mar_Miy_Huw_Biy_Sab'.split('_'),
+    weekdaysMin : 'Li_Lu_Ma_Mi_Hu_Bi_Sab'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'MM/D/YYYY',
+        LL : 'MMMM D, YYYY',
+        LLL : 'MMMM D, YYYY LT',
+        LLLL : 'dddd, MMMM DD, YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Ngayon sa] LT',
+        nextDay: '[Bukas sa] LT',
+        nextWeek: 'dddd [sa] LT',
+        lastDay: '[Kahapon sa] LT',
+        lastWeek: 'dddd [huling linggo] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'sa loob ng %s',
+        past : '%s ang nakalipas',
+        s : 'ilang segundo',
+        m : 'isang minuto',
+        mm : '%d minuto',
+        h : 'isang oras',
+        hh : '%d oras',
+        d : 'isang araw',
+        dd : '%d araw',
+        M : 'isang buwan',
+        MM : '%d buwan',
+        y : 'isang taon',
+        yy : '%d taon'
+    },
+    ordinalParse: /\d{1,2}/,
+    ordinal : function (number) {
+        return number;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/tr.js b/turtles/app/lib/bower_components/momentjs/src/locale/tr.js
new file mode 100644
index 000000000..78f2b6978
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/tr.js
@@ -0,0 +1,81 @@
+//! moment.js locale configuration
+//! locale : turkish (tr)
+//! authors : Erhan Gundogan : https://github.com/erhangundogan,
+//!           Burak Yiğit Kaya: https://github.com/BYK
+
+import moment from '../moment';
+
+var suffixes = {
+    1: '\'inci',
+    5: '\'inci',
+    8: '\'inci',
+    70: '\'inci',
+    80: '\'inci',
+    2: '\'nci',
+    7: '\'nci',
+    20: '\'nci',
+    50: '\'nci',
+    3: '\'üncü',
+    4: '\'üncü',
+    100: '\'üncü',
+    6: '\'ncı',
+    9: '\'uncu',
+    10: '\'uncu',
+    30: '\'uncu',
+    60: '\'ıncı',
+    90: '\'ıncı'
+};
+
+export default moment.defineLocale('tr', {
+    months : 'Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık'.split('_'),
+    monthsShort : 'Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara'.split('_'),
+    weekdays : 'Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi'.split('_'),
+    weekdaysShort : 'Paz_Pts_Sal_Çar_Per_Cum_Cts'.split('_'),
+    weekdaysMin : 'Pz_Pt_Sa_Ça_Pe_Cu_Ct'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd, D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay : '[bugün saat] LT',
+        nextDay : '[yarın saat] LT',
+        nextWeek : '[haftaya] dddd [saat] LT',
+        lastDay : '[dün] LT',
+        lastWeek : '[geçen hafta] dddd [saat] LT',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : '%s sonra',
+        past : '%s önce',
+        s : 'birkaç saniye',
+        m : 'bir dakika',
+        mm : '%d dakika',
+        h : 'bir saat',
+        hh : '%d saat',
+        d : 'bir gün',
+        dd : '%d gün',
+        M : 'bir ay',
+        MM : '%d ay',
+        y : 'bir yıl',
+        yy : '%d yıl'
+    },
+    ordinalParse: /\d{1,2}'(inci|nci|üncü|ncı|uncu|ıncı)/,
+    ordinal : function (number) {
+        if (number === 0) {  // special case for zero
+            return number + '\'ıncı';
+        }
+        var a = number % 10,
+            b = number % 100 - a,
+            c = number >= 100 ? 100 : null;
+        return number + (suffixes[a] || suffixes[b] || suffixes[c]);
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/tzm-latn.js b/turtles/app/lib/bower_components/momentjs/src/locale/tzm-latn.js
new file mode 100644
index 000000000..153e51f99
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/tzm-latn.js
@@ -0,0 +1,49 @@
+//! moment.js locale configuration
+//! locale : Morocco Central Atlas Tamaziɣt in Latin (tzm-latn)
+//! author : Abdel Said : https://github.com/abdelsaid
+
+import moment from '../moment';
+
+export default moment.defineLocale('tzm-latn', {
+    months : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+    monthsShort : 'innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir'.split('_'),
+    weekdays : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+    weekdaysShort : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+    weekdaysMin : 'asamas_aynas_asinas_akras_akwas_asimwas_asiḍyas'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[asdkh g] LT',
+        nextDay: '[aska g] LT',
+        nextWeek: 'dddd [g] LT',
+        lastDay: '[assant g] LT',
+        lastWeek: 'dddd [g] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'dadkh s yan %s',
+        past : 'yan %s',
+        s : 'imik',
+        m : 'minuḍ',
+        mm : '%d minuḍ',
+        h : 'saɛa',
+        hh : '%d tassaɛin',
+        d : 'ass',
+        dd : '%d ossan',
+        M : 'ayowr',
+        MM : '%d iyyirn',
+        y : 'asgas',
+        yy : '%d isgasn'
+    },
+    week : {
+        dow : 6, // Saturday is the first day of the week.
+        doy : 12  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/tzm.js b/turtles/app/lib/bower_components/momentjs/src/locale/tzm.js
new file mode 100644
index 000000000..b53adb06d
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/tzm.js
@@ -0,0 +1,49 @@
+//! moment.js locale configuration
+//! locale : Morocco Central Atlas Tamaziɣt (tzm)
+//! author : Abdel Said : https://github.com/abdelsaid
+
+import moment from '../moment';
+
+export default moment.defineLocale('tzm', {
+    months : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+    monthsShort : 'ⵉⵏⵏⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓⵏⵢⵓ_ⵢⵓⵍⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰⵏⴱⵉⵔ_ⴽⵟⵓⴱⵕ_ⵏⵓⵡⴰⵏⴱⵉⵔ_ⴷⵓⵊⵏⴱⵉⵔ'.split('_'),
+    weekdays : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+    weekdaysShort : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+    weekdaysMin : 'ⴰⵙⴰⵎⴰⵙ_ⴰⵢⵏⴰⵙ_ⴰⵙⵉⵏⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS: 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'dddd D MMMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[ⴰⵙⴷⵅ ⴴ] LT',
+        nextDay: '[ⴰⵙⴽⴰ ⴴ] LT',
+        nextWeek: 'dddd [ⴴ] LT',
+        lastDay: '[ⴰⵚⴰⵏⵜ ⴴ] LT',
+        lastWeek: 'dddd [ⴴ] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'ⴷⴰⴷⵅ ⵙ ⵢⴰⵏ %s',
+        past : 'ⵢⴰⵏ %s',
+        s : 'ⵉⵎⵉⴽ',
+        m : 'ⵎⵉⵏⵓⴺ',
+        mm : '%d ⵎⵉⵏⵓⴺ',
+        h : 'ⵙⴰⵄⴰ',
+        hh : '%d ⵜⴰⵙⵙⴰⵄⵉⵏ',
+        d : 'ⴰⵙⵙ',
+        dd : '%d oⵙⵙⴰⵏ',
+        M : 'ⴰⵢoⵓⵔ',
+        MM : '%d ⵉⵢⵢⵉⵔⵏ',
+        y : 'ⴰⵙⴳⴰⵙ',
+        yy : '%d ⵉⵙⴳⴰⵙⵏ'
+    },
+    week : {
+        dow : 6, // Saturday is the first day of the week.
+        doy : 12  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/uk.js b/turtles/app/lib/bower_components/momentjs/src/locale/uk.js
new file mode 100644
index 000000000..6fd7a1ef9
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/uk.js
@@ -0,0 +1,144 @@
+//! moment.js locale configuration
+//! locale : ukrainian (uk)
+//! author : zemlanin : https://github.com/zemlanin
+//! Author : Menelion Elensúle : https://github.com/Oire
+
+import moment from '../moment';
+
+function plural(word, num) {
+    var forms = word.split('_');
+    return num % 10 === 1 && num % 100 !== 11 ? forms[0] : (num % 10 >= 2 && num % 10 <= 4 && (num % 100 < 10 || num % 100 >= 20) ? forms[1] : forms[2]);
+}
+function relativeTimeWithPlural(number, withoutSuffix, key) {
+    var format = {
+        'mm': 'хвилина_хвилини_хвилин',
+        'hh': 'година_години_годин',
+        'dd': 'день_дні_днів',
+        'MM': 'місяць_місяці_місяців',
+        'yy': 'рік_роки_років'
+    };
+    if (key === 'm') {
+        return withoutSuffix ? 'хвилина' : 'хвилину';
+    }
+    else if (key === 'h') {
+        return withoutSuffix ? 'година' : 'годину';
+    }
+    else {
+        return number + ' ' + plural(format[key], +number);
+    }
+}
+function monthsCaseReplace(m, format) {
+    var months = {
+        'nominative': 'січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень'.split('_'),
+        'accusative': 'січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня'.split('_')
+    },
+    nounCase = (/D[oD]? *MMMM?/).test(format) ?
+        'accusative' :
+        'nominative';
+    return months[nounCase][m.month()];
+}
+function weekdaysCaseReplace(m, format) {
+    var weekdays = {
+        'nominative': 'неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота'.split('_'),
+        'accusative': 'неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу'.split('_'),
+        'genitive': 'неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи'.split('_')
+    },
+    nounCase = (/(\[[ВвУу]\]) ?dddd/).test(format) ?
+        'accusative' :
+        ((/\[?(?:минулої|наступної)? ?\] ?dddd/).test(format) ?
+            'genitive' :
+            'nominative');
+    return weekdays[nounCase][m.day()];
+}
+function processHoursFunction(str) {
+    return function () {
+        return str + 'о' + (this.hours() === 11 ? 'б' : '') + '] LT';
+    };
+}
+
+export default moment.defineLocale('uk', {
+    months : monthsCaseReplace,
+    monthsShort : 'січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд'.split('_'),
+    weekdays : weekdaysCaseReplace,
+    weekdaysShort : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+    weekdaysMin : 'нд_пн_вт_ср_чт_пт_сб'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD.MM.YYYY',
+        LL : 'D MMMM YYYY р.',
+        LLL : 'D MMMM YYYY р., LT',
+        LLLL : 'dddd, D MMMM YYYY р., LT'
+    },
+    calendar : {
+        sameDay: processHoursFunction('[Сьогодні '),
+        nextDay: processHoursFunction('[Завтра '),
+        lastDay: processHoursFunction('[Вчора '),
+        nextWeek: processHoursFunction('[У] dddd ['),
+        lastWeek: function () {
+            switch (this.day()) {
+            case 0:
+            case 3:
+            case 5:
+            case 6:
+                return processHoursFunction('[Минулої] dddd [').call(this);
+            case 1:
+            case 2:
+            case 4:
+                return processHoursFunction('[Минулого] dddd [').call(this);
+            }
+        },
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : 'за %s',
+        past : '%s тому',
+        s : 'декілька секунд',
+        m : relativeTimeWithPlural,
+        mm : relativeTimeWithPlural,
+        h : 'годину',
+        hh : relativeTimeWithPlural,
+        d : 'день',
+        dd : relativeTimeWithPlural,
+        M : 'місяць',
+        MM : relativeTimeWithPlural,
+        y : 'рік',
+        yy : relativeTimeWithPlural
+    },
+    // M. E.: those two are virtually unused but a user might want to implement them for his/her website for some reason
+    meridiemParse: /ночі|ранку|дня|вечора/,
+    isPM: function (input) {
+        return /^(дня|вечора)$/.test(input);
+    },
+    meridiem : function (hour, minute, isLower) {
+        if (hour < 4) {
+            return 'ночі';
+        } else if (hour < 12) {
+            return 'ранку';
+        } else if (hour < 17) {
+            return 'дня';
+        } else {
+            return 'вечора';
+        }
+    },
+    ordinalParse: /\d{1,2}-(й|го)/,
+    ordinal: function (number, period) {
+        switch (period) {
+        case 'M':
+        case 'd':
+        case 'DDD':
+        case 'w':
+        case 'W':
+            return number + '-й';
+        case 'D':
+            return number + '-го';
+        default:
+            return number;
+        }
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 1st is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/uz.js b/turtles/app/lib/bower_components/momentjs/src/locale/uz.js
new file mode 100644
index 000000000..3732bfd8c
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/uz.js
@@ -0,0 +1,49 @@
+//! moment.js locale configuration
+//! locale : uzbek (uz)
+//! author : Sardor Muminov : https://github.com/muminoff
+
+import moment from '../moment';
+
+export default moment.defineLocale('uz', {
+    months : 'январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь'.split('_'),
+    monthsShort : 'янв_фев_мар_апр_май_июн_июл_авг_сен_окт_ноя_дек'.split('_'),
+    weekdays : 'Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба'.split('_'),
+    weekdaysShort : 'Якш_Душ_Сеш_Чор_Пай_Жум_Шан'.split('_'),
+    weekdaysMin : 'Як_Ду_Се_Чо_Па_Жу_Ша'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM YYYY',
+        LLL : 'D MMMM YYYY LT',
+        LLLL : 'D MMMM YYYY, dddd LT'
+    },
+    calendar : {
+        sameDay : '[Бугун соат] LT [да]',
+        nextDay : '[Эртага] LT [да]',
+        nextWeek : 'dddd [куни соат] LT [да]',
+        lastDay : '[Кеча соат] LT [да]',
+        lastWeek : '[Утган] dddd [куни соат] LT [да]',
+        sameElse : 'L'
+    },
+    relativeTime : {
+        future : 'Якин %s ичида',
+        past : 'Бир неча %s олдин',
+        s : 'фурсат',
+        m : 'бир дакика',
+        mm : '%d дакика',
+        h : 'бир соат',
+        hh : '%d соат',
+        d : 'бир кун',
+        dd : '%d кун',
+        M : 'бир ой',
+        MM : '%d ой',
+        y : 'бир йил',
+        yy : '%d йил'
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 7  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/vi.js b/turtles/app/lib/bower_components/momentjs/src/locale/vi.js
new file mode 100644
index 000000000..18ca9f3ed
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/vi.js
@@ -0,0 +1,57 @@
+//! moment.js locale configuration
+//! locale : vietnamese (vi)
+//! author : Bang Nguyen : https://github.com/bangnk
+
+import moment from '../moment';
+
+export default moment.defineLocale('vi', {
+    months : 'tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12'.split('_'),
+    monthsShort : 'Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12'.split('_'),
+    weekdays : 'chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy'.split('_'),
+    weekdaysShort : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+    weekdaysMin : 'CN_T2_T3_T4_T5_T6_T7'.split('_'),
+    longDateFormat : {
+        LT : 'HH:mm',
+        LTS : 'LT:ss',
+        L : 'DD/MM/YYYY',
+        LL : 'D MMMM [năm] YYYY',
+        LLL : 'D MMMM [năm] YYYY LT',
+        LLLL : 'dddd, D MMMM [năm] YYYY LT',
+        l : 'DD/M/YYYY',
+        ll : 'D MMM YYYY',
+        lll : 'D MMM YYYY LT',
+        llll : 'ddd, D MMM YYYY LT'
+    },
+    calendar : {
+        sameDay: '[Hôm nay lúc] LT',
+        nextDay: '[Ngày mai lúc] LT',
+        nextWeek: 'dddd [tuần tới lúc] LT',
+        lastDay: '[Hôm qua lúc] LT',
+        lastWeek: 'dddd [tuần rồi lúc] LT',
+        sameElse: 'L'
+    },
+    relativeTime : {
+        future : '%s tới',
+        past : '%s trước',
+        s : 'vài giây',
+        m : 'một phút',
+        mm : '%d phút',
+        h : 'một giờ',
+        hh : '%d giờ',
+        d : 'một ngày',
+        dd : '%d ngày',
+        M : 'một tháng',
+        MM : '%d tháng',
+        y : 'một năm',
+        yy : '%d năm'
+    },
+    ordinalParse: /\d{1,2}/,
+    ordinal : function (number) {
+        return number;
+    },
+    week : {
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/zh-cn.js b/turtles/app/lib/bower_components/momentjs/src/locale/zh-cn.js
new file mode 100644
index 000000000..dfc0d0496
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/zh-cn.js
@@ -0,0 +1,118 @@
+//! moment.js locale configuration
+//! locale : chinese (zh-cn)
+//! author : suupic : https://github.com/suupic
+//! author : Zeno Zeng : https://github.com/zenozeng
+
+import moment from '../moment';
+
+export default moment.defineLocale('zh-cn', {
+    months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+    weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+    weekdaysShort : '周日_周一_周二_周三_周四_周五_周六'.split('_'),
+    weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+    longDateFormat : {
+        LT : 'Ah点mm分',
+        LTS : 'Ah点m分s秒',
+        L : 'YYYY-MM-DD',
+        LL : 'YYYY年MMMD日',
+        LLL : 'YYYY年MMMD日LT',
+        LLLL : 'YYYY年MMMD日ddddLT',
+        l : 'YYYY-MM-DD',
+        ll : 'YYYY年MMMD日',
+        lll : 'YYYY年MMMD日LT',
+        llll : 'YYYY年MMMD日ddddLT'
+    },
+    meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
+    meridiemHour: function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === '凌晨' || meridiem === '早上' ||
+                meridiem === '上午') {
+            return hour;
+        } else if (meridiem === '下午' || meridiem === '晚上') {
+            return hour + 12;
+        } else {
+            // '中午'
+            return hour >= 11 ? hour : hour + 12;
+        }
+    },
+    meridiem : function (hour, minute, isLower) {
+        var hm = hour * 100 + minute;
+        if (hm < 600) {
+            return '凌晨';
+        } else if (hm < 900) {
+            return '早上';
+        } else if (hm < 1130) {
+            return '上午';
+        } else if (hm < 1230) {
+            return '中午';
+        } else if (hm < 1800) {
+            return '下午';
+        } else {
+            return '晚上';
+        }
+    },
+    calendar : {
+        sameDay : function () {
+            return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
+        },
+        nextDay : function () {
+            return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
+        },
+        lastDay : function () {
+            return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
+        },
+        nextWeek : function () {
+            var startOfWeek, prefix;
+            startOfWeek = moment().startOf('week');
+            prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
+            return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+        },
+        lastWeek : function () {
+            var startOfWeek, prefix;
+            startOfWeek = moment().startOf('week');
+            prefix = this.unix() < startOfWeek.unix()  ? '[上]' : '[本]';
+            return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
+        },
+        sameElse : 'LL'
+    },
+    ordinalParse: /\d{1,2}(日|月|周)/,
+    ordinal : function (number, period) {
+        switch (period) {
+        case 'd':
+        case 'D':
+        case 'DDD':
+            return number + '日';
+        case 'M':
+            return number + '月';
+        case 'w':
+        case 'W':
+            return number + '周';
+        default:
+            return number;
+        }
+    },
+    relativeTime : {
+        future : '%s内',
+        past : '%s前',
+        s : '几秒',
+        m : '1 分钟',
+        mm : '%d 分钟',
+        h : '1 小时',
+        hh : '%d 小时',
+        d : '1 天',
+        dd : '%d 天',
+        M : '1 个月',
+        MM : '%d 个月',
+        y : '1 年',
+        yy : '%d 年'
+    },
+    week : {
+        // GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
+        dow : 1, // Monday is the first day of the week.
+        doy : 4  // The week that contains Jan 4th is the first week of the year.
+    }
+});
+
diff --git a/turtles/app/lib/bower_components/momentjs/src/locale/zh-tw.js b/turtles/app/lib/bower_components/momentjs/src/locale/zh-tw.js
new file mode 100644
index 000000000..918700ae7
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/locale/zh-tw.js
@@ -0,0 +1,91 @@
+//! moment.js locale configuration
+//! locale : traditional chinese (zh-tw)
+//! author : Ben : https://github.com/ben-lin
+
+import moment from '../moment';
+
+export default moment.defineLocale('zh-tw', {
+    months : '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
+    monthsShort : '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
+    weekdays : '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
+    weekdaysShort : '週日_週一_週二_週三_週四_週五_週六'.split('_'),
+    weekdaysMin : '日_一_二_三_四_五_六'.split('_'),
+    longDateFormat : {
+        LT : 'Ah點mm分',
+        LTS : 'Ah點m分s秒',
+        L : 'YYYY年MMMD日',
+        LL : 'YYYY年MMMD日',
+        LLL : 'YYYY年MMMD日LT',
+        LLLL : 'YYYY年MMMD日ddddLT',
+        l : 'YYYY年MMMD日',
+        ll : 'YYYY年MMMD日',
+        lll : 'YYYY年MMMD日LT',
+        llll : 'YYYY年MMMD日ddddLT'
+    },
+    meridiemParse: /早上|上午|中午|下午|晚上/,
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if (meridiem === '早上' || meridiem === '上午') {
+            return hour;
+        } else if (meridiem === '中午') {
+            return hour >= 11 ? hour : hour + 12;
+        } else if (meridiem === '下午' || meridiem === '晚上') {
+            return hour + 12;
+        }
+    },
+    meridiem : function (hour, minute, isLower) {
+        var hm = hour * 100 + minute;
+        if (hm < 900) {
+            return '早上';
+        } else if (hm < 1130) {
+            return '上午';
+        } else if (hm < 1230) {
+            return '中午';
+        } else if (hm < 1800) {
+            return '下午';
+        } else {
+            return '晚上';
+        }
+    },
+    calendar : {
+        sameDay : '[今天]LT',
+        nextDay : '[明天]LT',
+        nextWeek : '[下]ddddLT',
+        lastDay : '[昨天]LT',
+        lastWeek : '[上]ddddLT',
+        sameElse : 'L'
+    },
+    ordinalParse: /\d{1,2}(日|月|週)/,
+    ordinal : function (number, period) {
+        switch (period) {
+        case 'd' :
+        case 'D' :
+        case 'DDD' :
+            return number + '日';
+        case 'M' :
+            return number + '月';
+        case 'w' :
+        case 'W' :
+            return number + '週';
+        default :
+            return number;
+        }
+    },
+    relativeTime : {
+        future : '%s內',
+        past : '%s前',
+        s : '幾秒',
+        m : '一分鐘',
+        mm : '%d分鐘',
+        h : '一小時',
+        hh : '%d小時',
+        d : '一天',
+        dd : '%d天',
+        M : '一個月',
+        MM : '%d個月',
+        y : '一年',
+        yy : '%d年'
+    }
+});
diff --git a/turtles/app/lib/bower_components/momentjs/src/moment.js b/turtles/app/lib/bower_components/momentjs/src/moment.js
new file mode 100644
index 000000000..4407eb97f
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/src/moment.js
@@ -0,0 +1,68 @@
+//! moment.js
+//! version : 2.10.3
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+
+import { hooks as moment, setHookCallback } from './lib/utils/hooks';
+
+moment.version = '2.10.3';
+
+import {
+    min,
+    max,
+    isMoment,
+    momentPrototype as fn,
+    createUTC       as utc,
+    createUnix      as unix,
+    createLocal     as local,
+    createInvalid   as invalid,
+    createInZone    as parseZone
+} from './lib/moment/moment';
+
+import {
+    defineLocale,
+    getSetGlobalLocale as locale,
+    getLocale          as localeData,
+    listMonths         as months,
+    listMonthsShort    as monthsShort,
+    listWeekdays       as weekdays,
+    listWeekdaysMin    as weekdaysMin,
+    listWeekdaysShort  as weekdaysShort
+} from './lib/locale/locale';
+
+import {
+    isDuration,
+    createDuration as duration,
+    getSetRelativeTimeThreshold as relativeTimeThreshold
+} from './lib/duration/duration';
+
+import { normalizeUnits } from './lib/units/units';
+
+import isDate from './lib/utils/is-date';
+
+setHookCallback(local);
+
+moment.fn                    = fn;
+moment.min                   = min;
+moment.max                   = max;
+moment.utc                   = utc;
+moment.unix                  = unix;
+moment.months                = months;
+moment.isDate                = isDate;
+moment.locale                = locale;
+moment.invalid               = invalid;
+moment.duration              = duration;
+moment.isMoment              = isMoment;
+moment.weekdays              = weekdays;
+moment.parseZone             = parseZone;
+moment.localeData            = localeData;
+moment.isDuration            = isDuration;
+moment.monthsShort           = monthsShort;
+moment.weekdaysMin           = weekdaysMin;
+moment.defineLocale          = defineLocale;
+moment.weekdaysShort         = weekdaysShort;
+moment.normalizeUnits        = normalizeUnits;
+moment.relativeTimeThreshold = relativeTimeThreshold;
+
+export default moment;
diff --git a/turtles/app/lib/bower_components/momentjs/templates/amd-named.js b/turtles/app/lib/bower_components/momentjs/templates/amd-named.js
new file mode 100644
index 000000000..761045644
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/templates/amd-named.js
@@ -0,0 +1,7 @@
+/*global define:false*/
+
+import moment from "./moment";
+
+define("moment", [], function () {
+    return moment;
+});
diff --git a/turtles/app/lib/bower_components/momentjs/templates/amd.js b/turtles/app/lib/bower_components/momentjs/templates/amd.js
new file mode 100644
index 000000000..847bcefa8
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/templates/amd.js
@@ -0,0 +1,7 @@
+/*global define:false*/
+
+import moment from "./moment";
+
+define([], function () {
+    return moment;
+});
diff --git a/turtles/app/lib/bower_components/momentjs/templates/globals.js b/turtles/app/lib/bower_components/momentjs/templates/globals.js
new file mode 100644
index 000000000..5ac160f12
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/templates/globals.js
@@ -0,0 +1,5 @@
+/*global window:false*/
+
+import moment from "./moment";
+
+window.moment = moment;
diff --git a/turtles/app/lib/bower_components/momentjs/templates/locale-header.js b/turtles/app/lib/bower_components/momentjs/templates/locale-header.js
new file mode 100644
index 000000000..f304506e6
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/templates/locale-header.js
@@ -0,0 +1,5 @@
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
diff --git a/turtles/app/lib/bower_components/momentjs/templates/test-header.js b/turtles/app/lib/bower_components/momentjs/templates/test-header.js
new file mode 100644
index 000000000..38940c3ec
--- /dev/null
+++ b/turtles/app/lib/bower_components/momentjs/templates/test-header.js
@@ -0,0 +1,5 @@
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../../moment')) :
+   typeof define === 'function' && define.amd ? define(['../../moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
diff --git a/turtles/app/lib/humanize-duration.js b/turtles/app/lib/humanize-duration.js
new file mode 100644
index 000000000..f1286d64f
--- /dev/null
+++ b/turtles/app/lib/humanize-duration.js
@@ -0,0 +1,329 @@
+// HumanizeDuration.js - http://git.io/j0HgmQ
+
+(function() {
+
+  var UNITS = {
+    year: 31557600000,
+    month: 2629800000,
+    week: 604800000,
+    day: 86400000,
+    hour: 3600000,
+    minute: 60000,
+    second: 1000,
+    millisecond: 1
+  };
+
+  var languages = {
+    ca: {
+      year: function(c) { return "any" + ((c !== 1) ? "s" : ""); },
+      month: function(c) { return "mes" + ((c !== 1) ? "os" : ""); },
+      week: function(c) { return "setman" + ((c !== 1) ? "es" :"a"); },
+      day: function(c) { return "di" + ((c !== 1) ? "es" :"a"); },
+      hour: function(c) { return "hor" + ((c !== 1) ? "es" :"a"); },
+      minute: function(c) { return "minut" + ((c !== 1) ? "s" : ""); },
+      second: function(c) { return "segon" + ((c !== 1) ? "s" : ""); },
+      millisecond: function(c) { return "milisegon" + ((c !== 1) ? "s" : "" ); }
+    },
+    da: {
+      year: "år",
+      month: function(c) { return "måned" + ((c !== 1) ? "er" : ""); },
+      week: function(c) { return "uge" + ((c !== 1) ? "r" : ""); },
+      day: function(c) { return "dag" + ((c !== 1) ? "e" : ""); },
+      hour: function(c) { return "time" + ((c !== 1) ? "r" : ""); },
+      minute: function(c) { return "minut" + ((c !== 1) ? "ter" : ""); },
+      second: function(c) { return "sekund" + ((c !== 1) ? "er" : ""); },
+      millisecond: function(c) { return "millisekund" + ((c !== 1) ? "er" : ""); }
+    },
+    de: {
+      year: function(c) { return "jahr" + ((c !== 1) ? "e" : ""); },
+      month: function(c) { return "monat" + ((c !== 1) ? "e" : ""); },
+      week: function(c) { return "woche" + ((c !== 1) ? "n" : ""); },
+      day: function(c) { return "tag" + ((c !== 1) ? "e" : ""); },
+      hour: function(c) { return "stunde" + ((c !== 1) ? "n" : ""); },
+      minute: function(c) { return "minute" + ((c !== 1) ? "n" : ""); },
+      second: function(c) { return "sekunde" + ((c !== 1) ? "n" : ""); },
+      millisecond: function(c) { return "millisekunde" + ((c !== 1) ? "n" : ""); }
+    },
+    en: {
+      year: function(c) { return "year" + ((c !== 1) ? "s" : ""); },
+      month: function(c) { return "month" + ((c !== 1) ? "s" : ""); },
+      week: function(c) { return "week" + ((c !== 1) ? "s" : ""); },
+      day: function(c) { return "day" + ((c !== 1) ? "s" : ""); },
+      hour: function(c) { return "hour" + ((c !== 1) ? "s" : ""); },
+      minute: function(c) { return "minute" + ((c !== 1) ? "s" : ""); },
+      second: function(c) { return "second" + ((c !== 1) ? "s" : ""); },
+      millisecond: function(c) { return "millisecond" + ((c !== 1) ? "s" : ""); }
+    },
+    nl: {
+      year: "jaar",
+      month: function(c) { return (c === 1) ? "maand" : "maanden"; },
+      week: function(c) { return (c === 1) ? "week" : "weken"; },
+      day: function(c) { return (c === 1) ? "dag" : "dagen"; },
+      hour: "uur",
+      minute: function(c) { return (c === 1) ? "minuut" : "minuten"; },
+      second: function(c) { return (c === 1) ? "seconde" : "seconden"; },
+      millisecond: function(c) { return (c === 1) ? "milliseconde" : "milliseconden"; }
+    },
+    es: {
+      year: function(c) { return "año" + ((c !== 1) ? "s" : ""); },
+      month: function(c) { return "mes" + ((c !== 1) ? "es" : ""); },
+      week: function(c) { return "semana" + ((c !== 1) ? "s" : ""); },
+      day: function(c) { return "día" + ((c !== 1) ? "s" : ""); },
+      hour: function(c) { return "hora" + ((c !== 1) ? "s" : ""); },
+      minute: function(c) { return "minuto" + ((c !== 1) ? "s" : ""); },
+      second: function(c) { return "segundo" + ((c !== 1) ? "s" : ""); },
+      millisecond: function(c) { return "milisegundo" + ((c !== 1) ? "s" : "" ); }
+    },
+    fr: {
+      year: function(c) { return "an" + ((c !== 1) ? "s" : ""); },
+      month: "mois",
+      week: function(c) { return "semaine" + ((c !== 1) ? "s" : ""); },
+      day: function(c) { return "jour" + ((c !== 1) ? "s" : ""); },
+      hour: function(c) { return "heure" + ((c !== 1) ? "s" : ""); },
+      minute: function(c) { return "minute" + ((c !== 1) ? "s" : ""); },
+      second: function(c) { return "seconde" + ((c !== 1) ? "s" : ""); },
+      millisecond: function(c) { return "milliseconde" + ((c !== 1) ? "s" : ""); }
+    },
+    ja: {
+      year: "年",
+      month: "月",
+      week: "週",
+      day: "日",
+      hour: "時間",
+      minute: "分",
+      second: "秒",
+      millisecond: "ミリ秒"
+    },
+    ko: {
+      year: "년",
+      month: "개월",
+      week: "주일",
+      day: "일",
+      hour: "시간",
+      minute: "분",
+      second: "초",
+      millisecond: "밀리 초"
+    },
+    nob: {
+      year: "år",
+      month: function(c) { return "måned" + ((c !== 1) ? "er" : ""); },
+      week: function(c) { return "uke" + ((c !== 1) ? "r" : ""); },
+      day: function(c) { return "dag" + ((c !== 1) ? "er" : ""); },
+      hour: function(c) { return "time" + ((c !== 1) ? "r" : ""); },
+      minute: function(c) { return "minutt" + ((c !== 1) ? "er" : ""); },
+      second: function(c) { return "sekund" + ((c !== 1) ? "er" : ""); },
+      millisecond: function(c) { return "millisekund" + ((c !== 1) ? "er" : ""); }
+    },
+    pl: {
+      year: function(c) { return ["rok", "roku", "lata", "lat"][getPolishForm(c)]; },
+      month: function(c) { return ["miesiąc", "miesiąca", "miesiące", "miesięcy"][getPolishForm(c)]; },
+      week: function(c) { return ["tydzień", "tygodnia", "tygodnie", "tygodni"][getPolishForm(c)]; },
+      day: function(c) { return ["dzień", "dnia", "dni", "dni"][getPolishForm(c)]; },
+      hour: function(c) { return ["godzina", "godziny", "godziny", "godzin"][getPolishForm(c)]; },
+      minute: function(c) { return ["minuta", "minuty", "minuty", "minut"][getPolishForm(c)]; },
+      second: function(c) { return ["sekunda", "sekundy", "sekundy", "sekund"][getPolishForm(c)]; },
+      millisecond: function(c) { return ["milisekunda", "milisekundy", "milisekundy", "milisekund"][getPolishForm(c)]; }
+    },
+    pt: {
+      year: function(c) { return "ano" + ((c !== 1) ? "s" : ""); },
+      month: function(c) { return (c !== 1) ? "meses" : "mês"; },
+      week: function(c) { return "semana" + ((c !== 1) ? "s" : ""); },
+      day: function(c) { return "dia" + ((c !== 1) ? "s" : ""); },
+      hour: function(c) { return "hora" + ((c !== 1) ? "s" : ""); },
+      minute: function(c) { return "minuto" + ((c !== 1) ? "s" : ""); },
+      second: function(c) { return "segundo" + ((c !== 1) ? "s" : ""); },
+      millisecond: function(c) { return "milissegundo" + ((c !== 1) ? "s" : ""); }
+    },
+    ru: {
+      year: function(c) { return ["лет", "год", "года"][getRussianForm(c)]; },
+      month: function(c) { return ["месяцев", "месяц", "месяца"][getRussianForm(c)]; },
+      week: function(c) { return ["недель", "неделя", "недели"][getRussianForm(c)]; },
+      day: function(c) { return ["дней", "день", "дня"][getRussianForm(c)]; },
+      hour: function(c) { return ["часов", "час", "часа"][getRussianForm(c)]; },
+      minute: function(c) { return ["минут", "минута", "минуты"][getRussianForm(c)]; },
+      second: function(c) { return ["секунд", "секунда", "секунды"][getRussianForm(c)]; },
+      millisecond: function(c) { return ["миллисекунд", "миллисекунда", "миллисекунды"][getRussianForm(c)]; }
+    },
+    sv: {
+      year: "år",
+      month: function(c) { return "månad" + ((c !== 1) ? "er" : ""); },
+      week: function(c) { return "veck" + ((c !== 1) ? "or" : "a"); },
+      day: function(c) { return "dag" + ((c !== 1) ? "ar" : ""); },
+      hour: function(c) { return "timm" + ((c !== 1) ? "ar" : "e"); },
+      minute: function(c) { return "minut" + ((c !== 1) ? "er" : ""); },
+      second: function(c) { return "sekund" + ((c !== 1) ? "er" : ""); },
+      millisecond: function(c) { return "millisekund" + ((c !== 1) ? "er" : ""); }
+    },
+    tr: {
+      year: "yıl",
+      month: "ay",
+      week: "hafta",
+      day: "gün",
+      hour: "saat",
+      minute: "dakika",
+      second: "saniye",
+      millisecond: "milisaniye"
+    },
+    "zh-CN": {
+      year: "年",
+      month: "个月",
+      week: "周",
+      day: "天",
+      hour: "小时",
+      minute: "分钟",
+      second: "秒",
+      millisecond: "毫秒"
+    },
+    "zh-TW": {
+      year: "年",
+      month: "個月",
+      week: "周",
+      day: "天",
+      hour: "小時",
+      minute: "分鐘",
+      second: "秒",
+      millisecond: "毫秒"
+    }
+  };
+
+  // You can create a humanizer, which returns a function with defaults
+  // parameters.
+  function humanizer(passedOptions) {
+
+    var result = function humanizer(ms, passedOptions) {
+      var options = extend({}, result, passedOptions || {});
+      return doHumanization(ms, options);
+    };
+
+    return extend(result, {
+      language: "en",
+      delimiter: ", ",
+      spacer: " ",
+      units: ["year", "month", "week", "day", "hour", "minute", "second"],
+      languages: {},
+      halfUnit: true
+    }, passedOptions);
+
+  }
+
+  // The main function is just a wrapper around a default humanizer.
+  var defaultHumanizer = humanizer({});
+  function humanizeDuration(ms, passedOptions) {
+    return defaultHumanizer(ms, passedOptions);
+  }
+
+  // doHumanization does the bulk of the work.
+  function doHumanization(ms, options) {
+
+    // Make sure we have a positive number.
+    // Has the nice sideffect of turning Number objects into primitives.
+    ms = Math.abs(ms);
+
+    if (ms === 0) {
+      return "0";
+    }
+
+    var dictionary = options.languages[options.language] || languages[options.language];
+    if (!dictionary) {
+      throw new Error("No language " + dictionary + ".");
+    }
+
+    var result = [];
+
+    // Start at the top and keep removing units, bit by bit.
+    var unitName, unitMS, unitCount, mightBeHalfUnit;
+    for (var i = 0, len = options.units.length; i < len; i ++) {
+
+      unitName = options.units[i];
+      if (unitName[unitName.length - 1] === "s") { // strip plurals
+        unitName = unitName.substring(0, unitName.length - 1);
+      }
+      unitMS = UNITS[unitName];
+
+      // If it's a half-unit interval, we're done.
+      if (result.length === 0 && options.halfUnit) {
+        mightBeHalfUnit = (ms / unitMS) * 2;
+        if (mightBeHalfUnit === Math.floor(mightBeHalfUnit)) {
+          return render(mightBeHalfUnit / 2, unitName, dictionary, options.spacer);
+        }
+      }
+
+      // What's the number of full units we can fit?
+      if ((i + 1) === len) {
+        unitCount = ms / unitMS;
+      } else {
+        unitCount = Math.floor(ms / unitMS);
+      }
+
+      // Add the string.
+      if (unitCount) {
+        result.push(render(unitCount, unitName, dictionary, options.spacer));
+      }
+
+      // Remove what we just figured out.
+      ms -= unitCount * unitMS;
+
+    }
+
+    return result.join(options.delimiter);
+
+  }
+
+  humanizeDuration.humanizer = humanizer;
+  if (typeof module !== "undefined") {
+    module.exports = humanizeDuration;
+  } else {
+    this.humanizeDuration = humanizeDuration;
+  }
+
+  function render(count, type, dictionary, spacer) {
+    var dictionaryValue = dictionary[type];
+    var word;
+    if (typeof dictionaryValue === "function") {
+      word = dictionaryValue(count);
+    } else {
+      word = dictionaryValue;
+    }
+    return count + spacer + word;
+  }
+
+  function extend(destination) {
+    var source;
+    for (var i = 1; i < arguments.length; i ++) {
+      source = arguments[i];
+      for (var prop in source) {
+        destination[prop] = source[prop];
+      }
+    }
+    return destination;
+  }
+
+  // Internal helper function for Polish language.
+  function getPolishForm(c) {
+    if (c === 1) {
+      return 0;
+    } else if (Math.floor(c) !== c) {
+      return 1;
+    } else if (2 <= c % 10 && c % 10 <= 4 && !(10 < c % 100 && c % 100 < 20)) {
+      return 2;
+    } else {
+      return 3;
+    }
+  }
+
+  // Internal helper function for Russian language.
+  function getRussianForm(c) {
+    if (Math.floor(c) !== c) {
+      return 2;
+    } else if (c === 0 || (c >= 5 && c <= 20) || (c % 10 >= 5 && c % 10 <= 9) || (c % 10 === 0)) {
+      return 0;
+    } else if (c === 1 || c % 10 === 1) {
+      return 1;
+    } else if (c > 1) {
+      return 2;
+    } else {
+      return 0;
+    }
+  }
+
+})();
diff --git a/turtles/app/lib/ics.js b/turtles/app/lib/ics.js
new file mode 100644
index 000000000..de18a6425
--- /dev/null
+++ b/turtles/app/lib/ics.js
@@ -0,0 +1,128 @@
+/* global saveAs, Blob, BlobBuilder, console */
+/* exported ics */
+
+var ics = function() {
+    'use strict';
+
+    if (navigator.userAgent.indexOf('MSIE') > -1 && navigator.userAgent.indexOf('MSIE 10') == -1) {
+        console.log('Unsupported Browser');
+        return;
+    }
+
+    var SEPARATOR = (navigator.appVersion.indexOf('Win') !== -1) ? '\r\n' : '\n';
+    var calendarEvents = [];
+    var calendarStart = [
+        'BEGIN:VCALENDAR',
+        'VERSION:2.0'
+    ].join(SEPARATOR);
+    var calendarEnd = SEPARATOR + 'END:VCALENDAR';
+
+    return {
+        /**
+         * Returns events array
+         * @return {array} Events
+         */
+        'events': function() {
+            return calendarEvents;
+        },
+
+        /**
+         * Returns calendar
+         * @return {string} Calendar in iCalendar format
+         */
+        'calendar': function() {
+            return calendarStart + SEPARATOR + calendarEvents.join(SEPARATOR) + calendarEnd;
+        },
+
+        /**
+         * Add event to the calendar
+         * @param  {string} subject     Subject/Title of event
+         * @param  {string} description Description of event
+         * @param  {string} location    Location of event
+         * @param  {string} begin       Beginning date of event
+         * @param  {string} stop        Ending date of event
+         */
+        'addEvent': function(subject, description, location, begin, stop) {
+            // I'm not in the mood to make these optional... So they are all required
+            if (typeof subject === 'undefined' ||
+                typeof description === 'undefined' ||
+                typeof location === 'undefined' ||
+                typeof begin === 'undefined' ||
+                typeof stop === 'undefined'
+            ) {
+                return false;
+            }
+
+            //TODO add time and time zone? use moment to format?
+            var start_date = new Date(begin);
+            var end_date = new Date(stop);
+
+            var start_year = ("0000" + (start_date.getFullYear().toString())).slice(-4);
+            var start_month = ("00" + ((start_date.getMonth() + 1).toString())).slice(-2);
+            var start_day = ("00" + ((start_date.getDate()).toString())).slice(-2);
+            var start_hours = ("00" + (start_date.getHours().toString())).slice(-2);
+            var start_minutes = ("00" + (start_date.getMinutes().toString())).slice(-2);
+            var start_seconds = ("00" + (start_date.getSeconds().toString())).slice(-2);
+
+            var end_year = ("0000" + (end_date.getFullYear().toString())).slice(-4);
+            var end_month = ("00" + ((end_date.getMonth() + 1).toString())).slice(-2);
+            var end_day = ("00" + ((end_date.getDate()).toString())).slice(-2);
+            var end_hours = ("00" + (end_date.getHours().toString())).slice(-2);
+            var end_minutes = ("00" + (end_date.getMinutes().toString())).slice(-2);
+            var end_seconds = ("00" + (end_date.getSeconds().toString())).slice(-2);
+
+
+            var start_time = 'T' + start_hours + start_minutes + start_seconds;
+            var end_time = 'T' + end_hours + end_minutes + end_seconds;
+
+            if (end_date-start_date === 0) {
+                start_time = '';
+                end_time = '';
+            }
+
+            var start = start_year + start_month + start_day + start_time;
+            var end = end_year + end_month + end_day + end_time;
+
+            var calendarEvent = [
+                'BEGIN:VEVENT',
+                'CLASS:PUBLIC',
+                'DESCRIPTION:' + description,
+                'DTSTART:' + start,
+                'DTEND:' + end,
+                // 'LOCATION:' + location,
+                'SUMMARY;LANGUAGE=en-us:' + subject,
+                'TRANSP:TRANSPARENT',
+                'END:VEVENT'
+            ].join(SEPARATOR);
+
+            calendarEvents.push(calendarEvent);
+            return calendarEvent;
+        },
+
+        /**
+         * Download calendar using the saveAs function from filesave.js
+         * @param  {string} filename Filename
+         * @param  {string} ext      Extention
+         */
+        'download': function(filename, ext) {
+            if (calendarEvents.length < 1) {
+                return false;
+            }
+
+            ext = (typeof ext !== 'undefined') ? ext : '.ics';
+            filename = (typeof filename !== 'undefined') ? filename : 'calendar';
+            var calendar = calendarStart + SEPARATOR + calendarEvents.join(SEPARATOR) + calendarEnd;
+
+            var blob;
+            if (navigator.userAgent.indexOf('MSIE 10') === -1) { // chrome or firefox
+                blob = new Blob([calendar]);
+            } else { // ie
+                var bb = new BlobBuilder();
+                bb.append(calendar);
+                blob = bb.getBlob('text/x-vCalendar;charset=' + document.characterSet);
+            }
+            saveAs(blob, filename + ext);
+            return calendar;
+        }
+    };
+};
\ No newline at end of file
diff --git a/turtles/app/lib/moment.min.js b/turtles/app/lib/moment.min.js
new file mode 100644
index 000000000..d0b48f73e
--- /dev/null
+++ b/turtles/app/lib/moment.min.js
@@ -0,0 +1,7 @@
+//! moment.js
+//! version : 2.10.2
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+!function(a,b){"object"==typeof exports&&"undefined"!=typeof module?module.exports=b():"function"==typeof define&&define.amd?define(b):a.moment=b()}(this,function(){"use strict";function a(){return Ac.apply(null,arguments)}function b(a){Ac=a}function c(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function d(a){return"[object Array]"===Object.prototype.toString.call(a)}function e(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function f(a,b){var c,d=[];for(c=0;c<a.length;++c)d.push(b(a[c],c));return d}function g(a,b){return Object.prototype.hasOwnProperty.call(a,b)}function h(a,b){for(var c in b)g(b,c)&&(a[c]=b[c]);return g(b,"toString")&&(a.toString=b.toString),g(b,"valueOf")&&(a.valueOf=b.valueOf),a}function i(a,b,c,d){return ya(a,b,c,d,!0).utc()}function j(a){return null==a._isValid&&(a._isValid=!isNaN(a._d.getTime())&&a._pf.overflow<0&&!a._pf.empty&&!a._pf.invalidMonth&&!a._pf.nullInput&&!a._pf.invalidFormat&&!a._pf.userInvalidated,a._strict&&(a._isValid=a._isValid&&0===a._pf.charsLeftOver&&0===a._pf.unusedTokens.length&&void 0===a._pf.bigHour)),a._isValid}function k(a){var b=i(0/0);return null!=a?h(b._pf,a):b._pf.userInvalidated=!0,b}function l(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=b._pf),"undefined"!=typeof b._locale&&(a._locale=b._locale),Cc.length>0)for(c in Cc)d=Cc[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function m(b){l(this,b),this._d=new Date(+b._d),Dc===!1&&(Dc=!0,a.updateOffset(this),Dc=!1)}function n(a){return a instanceof m||null!=a&&g(a,"_isAMomentObject")}function o(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function p(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&o(a[d])!==o(b[d]))&&g++;return g+f}function q(){}function r(a){return a?a.toLowerCase().replace("_","-"):a}function s(a){for(var b,c,d,e,f=0;f<a.length;){for(e=r(a[f]).split("-"),b=e.length,c=r(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=t(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&p(e,c,!0)>=b-1)break;b--}f++}return null}function t(a){var b=null;if(!Ec[a]&&"undefined"!=typeof module&&module&&module.exports)try{b=Bc._abbr,require("./locale/"+a),u(b)}catch(c){}return Ec[a]}function u(a,b){var c;return a&&(c="undefined"==typeof b?w(a):v(a,b),c&&(Bc=c)),Bc._abbr}function v(a,b){return null!==b?(b.abbr=a,Ec[a]||(Ec[a]=new q),Ec[a].set(b),u(a),Ec[a]):(delete Ec[a],null)}function w(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return Bc;if(!d(a)){if(b=t(a))return b;a=[a]}return s(a)}function x(a,b){var c=a.toLowerCase();Fc[c]=Fc[c+"s"]=Fc[b]=a}function y(a){return"string"==typeof a?Fc[a]||Fc[a.toLowerCase()]:void 0}function z(a){var b,c,d={};for(c in a)g(a,c)&&(b=y(c),b&&(d[b]=a[c]));return d}function A(b,c){return function(d){return null!=d?(C(this,b,d),a.updateOffset(this,c),this):B(this,b)}}function B(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function C(a,b,c){return a._d["set"+(a._isUTC?"UTC":"")+b](c)}function D(a,b){var c;if("object"==typeof a)for(c in a)this.set(c,a[c]);else if(a=y(a),"function"==typeof this[a])return this[a](b);return this}function E(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function F(a,b,c,d){var e=d;"string"==typeof d&&(e=function(){return this[d]()}),a&&(Jc[a]=e),b&&(Jc[b[0]]=function(){return E(e.apply(this,arguments),b[1],b[2])}),c&&(Jc[c]=function(){return this.localeData().ordinal(e.apply(this,arguments),a)})}function G(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function H(a){var b,c,d=a.match(Gc);for(b=0,c=d.length;c>b;b++)d[b]=Jc[d[b]]?Jc[d[b]]:G(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function I(a,b){return a.isValid()?(b=J(b,a.localeData()),Ic[b]||(Ic[b]=H(b)),Ic[b](a)):a.localeData().invalidDate()}function J(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Hc.lastIndex=0;d>=0&&Hc.test(a);)a=a.replace(Hc,c),Hc.lastIndex=0,d-=1;return a}function K(a,b,c){Yc[a]="function"==typeof b?b:function(a){return a&&c?c:b}}function L(a,b){return g(Yc,a)?Yc[a](b._strict,b._locale):new RegExp(M(a))}function M(a){return a.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e}).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function N(a,b){var c,d=b;for("string"==typeof a&&(a=[a]),"number"==typeof b&&(d=function(a,c){c[b]=o(a)}),c=0;c<a.length;c++)Zc[a[c]]=d}function O(a,b){N(a,function(a,c,d,e){d._w=d._w||{},b(a,d._w,d,e)})}function P(a,b,c){null!=b&&g(Zc,a)&&Zc[a](b,c._a,c,a)}function Q(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function R(a){return this._months[a.month()]}function S(a){return this._monthsShort[a.month()]}function T(a,b,c){var d,e,f;for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),d=0;12>d;d++){if(e=i([2e3,d]),c&&!this._longMonthsParse[d]&&(this._longMonthsParse[d]=new RegExp("^"+this.months(e,"").replace(".","")+"$","i"),this._shortMonthsParse[d]=new RegExp("^"+this.monthsShort(e,"").replace(".","")+"$","i")),c||this._monthsParse[d]||(f="^"+this.months(e,"")+"|^"+this.monthsShort(e,""),this._monthsParse[d]=new RegExp(f.replace(".",""),"i")),c&&"MMMM"===b&&this._longMonthsParse[d].test(a))return d;if(c&&"MMM"===b&&this._shortMonthsParse[d].test(a))return d;if(!c&&this._monthsParse[d].test(a))return d}}function U(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),Q(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function V(b){return null!=b?(U(this,b),a.updateOffset(this,!0),this):B(this,"Month")}function W(){return Q(this.year(),this.month())}function X(a){var b,c=a._a;return c&&-2===a._pf.overflow&&(b=c[_c]<0||c[_c]>11?_c:c[ad]<1||c[ad]>Q(c[$c],c[_c])?ad:c[bd]<0||c[bd]>24||24===c[bd]&&(0!==c[cd]||0!==c[dd]||0!==c[ed])?bd:c[cd]<0||c[cd]>59?cd:c[dd]<0||c[dd]>59?dd:c[ed]<0||c[ed]>999?ed:-1,a._pf._overflowDayOfYear&&($c>b||b>ad)&&(b=ad),a._pf.overflow=b),a}function Y(b){a.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+b)}function Z(a,b){var c=!0;return h(function(){return c&&(Y(a),c=!1),b.apply(this,arguments)},b)}function $(a,b){hd[a]||(Y(b),hd[a]=!0)}function _(a){var b,c,d=a._i,e=id.exec(d);if(e){for(a._pf.iso=!0,b=0,c=jd.length;c>b;b++)if(jd[b][1].exec(d)){a._f=jd[b][0]+(e[6]||" ");break}for(b=0,c=kd.length;c>b;b++)if(kd[b][1].exec(d)){a._f+=kd[b][0];break}d.match(Vc)&&(a._f+="Z"),sa(a)}else a._isValid=!1}function aa(b){var c=ld.exec(b._i);return null!==c?void(b._d=new Date(+c[1])):(_(b),void(b._isValid===!1&&(delete b._isValid,a.createFromInputFallback(b))))}function ba(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function ca(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function da(a){return ea(a)?366:365}function ea(a){return a%4===0&&a%100!==0||a%400===0}function fa(){return ea(this.year())}function ga(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=za(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function ha(a){return ga(a,this._week.dow,this._week.doy).week}function ia(){return this._week.dow}function ja(){return this._week.doy}function ka(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")}function la(a){var b=ga(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")}function ma(a,b,c,d,e){var f,g,h=ca(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:da(a-1)+g}}function na(a){var b=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")}function oa(a,b,c){return null!=a?a:null!=b?b:c}function pa(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function qa(a){var b,c,d,e,f=[];if(!a._d){for(d=pa(a),a._w&&null==a._a[ad]&&null==a._a[_c]&&ra(a),a._dayOfYear&&(e=oa(a._a[$c],d[$c]),a._dayOfYear>da(e)&&(a._pf._overflowDayOfYear=!0),c=ca(e,0,a._dayOfYear),a._a[_c]=c.getUTCMonth(),a._a[ad]=c.getUTCDate()),b=0;3>b&&null==a._a[b];++b)a._a[b]=f[b]=d[b];for(;7>b;b++)a._a[b]=f[b]=null==a._a[b]?2===b?1:0:a._a[b];24===a._a[bd]&&0===a._a[cd]&&0===a._a[dd]&&0===a._a[ed]&&(a._nextDay=!0,a._a[bd]=0),a._d=(a._useUTC?ca:ba).apply(null,f),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()-a._tzm),a._nextDay&&(a._a[bd]=24)}}function ra(a){var b,c,d,e,f,g,h;b=a._w,null!=b.GG||null!=b.W||null!=b.E?(f=1,g=4,c=oa(b.GG,a._a[$c],ga(za(),1,4).year),d=oa(b.W,1),e=oa(b.E,1)):(f=a._locale._week.dow,g=a._locale._week.doy,c=oa(b.gg,a._a[$c],ga(za(),f,g).year),d=oa(b.w,1),null!=b.d?(e=b.d,f>e&&++d):e=null!=b.e?b.e+f:f),h=ma(c,d,e,g,f),a._a[$c]=h.year,a._dayOfYear=h.dayOfYear}function sa(b){if(b._f===a.ISO_8601)return void _(b);b._a=[],b._pf.empty=!0;var c,d,e,f,g,h=""+b._i,i=h.length,j=0;for(e=J(b._f,b._locale).match(Gc)||[],c=0;c<e.length;c++)f=e[c],d=(h.match(L(f,b))||[])[0],d&&(g=h.substr(0,h.indexOf(d)),g.length>0&&b._pf.unusedInput.push(g),h=h.slice(h.indexOf(d)+d.length),j+=d.length),Jc[f]?(d?b._pf.empty=!1:b._pf.unusedTokens.push(f),P(f,d,b)):b._strict&&!d&&b._pf.unusedTokens.push(f);b._pf.charsLeftOver=i-j,h.length>0&&b._pf.unusedInput.push(h),b._pf.bigHour===!0&&b._a[bd]<=12&&(b._pf.bigHour=void 0),b._a[bd]=ta(b._locale,b._a[bd],b._meridiem),qa(b),X(b)}function ta(a,b,c){var d;return null==c?b:null!=a.meridiemHour?a.meridiemHour(b,c):null!=a.isPM?(d=a.isPM(c),d&&12>b&&(b+=12),d||12!==b||(b=0),b):b}function ua(a){var b,d,e,f,g;if(0===a._f.length)return a._pf.invalidFormat=!0,void(a._d=new Date(0/0));for(f=0;f<a._f.length;f++)g=0,b=l({},a),null!=a._useUTC&&(b._useUTC=a._useUTC),b._pf=c(),b._f=a._f[f],sa(b),j(b)&&(g+=b._pf.charsLeftOver,g+=10*b._pf.unusedTokens.length,b._pf.score=g,(null==e||e>g)&&(e=g,d=b));h(a,d||b)}function va(a){if(!a._d){var b=z(a._i);a._a=[b.year,b.month,b.day||b.date,b.hour,b.minute,b.second,b.millisecond],qa(a)}}function wa(a){var b,c=a._i,e=a._f;return a._locale=a._locale||w(a._l),null===c||void 0===e&&""===c?k({nullInput:!0}):("string"==typeof c&&(a._i=c=a._locale.preparse(c)),n(c)?new m(X(c)):(d(e)?ua(a):e?sa(a):xa(a),b=new m(X(a)),b._nextDay&&(b.add(1,"d"),b._nextDay=void 0),b))}function xa(b){var c=b._i;void 0===c?b._d=new Date:e(c)?b._d=new Date(+c):"string"==typeof c?aa(b):d(c)?(b._a=f(c.slice(0),function(a){return parseInt(a,10)}),qa(b)):"object"==typeof c?va(b):"number"==typeof c?b._d=new Date(c):a.createFromInputFallback(b)}function ya(a,b,d,e,f){var g={};return"boolean"==typeof d&&(e=d,d=void 0),g._isAMomentObject=!0,g._useUTC=g._isUTC=f,g._l=d,g._i=a,g._f=b,g._strict=e,g._pf=c(),wa(g)}function za(a,b,c,d){return ya(a,b,c,d,!1)}function Aa(a,b){var c,e;if(1===b.length&&d(b[0])&&(b=b[0]),!b.length)return za();for(c=b[0],e=1;e<b.length;++e)b[e][a](c)&&(c=b[e]);return c}function Ba(){var a=[].slice.call(arguments,0);return Aa("isBefore",a)}function Ca(){var a=[].slice.call(arguments,0);return Aa("isAfter",a)}function Da(a){var b=z(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=w(),this._bubble()}function Ea(a){return a instanceof Da}function Fa(a,b){F(a,0,0,function(){var a=this.utcOffset(),c="+";return 0>a&&(a=-a,c="-"),c+E(~~(a/60),2)+b+E(~~a%60,2)})}function Ga(a){var b=(a||"").match(Vc)||[],c=b[b.length-1]||[],d=(c+"").match(qd)||["-",0,0],e=+(60*d[1])+o(d[2]);return"+"===d[0]?e:-e}function Ha(b,c){var d,f;return c._isUTC?(d=c.clone(),f=(n(b)||e(b)?+b:+za(b))-+d,d._d.setTime(+d._d+f),a.updateOffset(d,!1),d):za(b).local();return c._isUTC?za(b).zone(c._offset||0):za(b).local()}function Ia(a){return 15*-Math.round(a._d.getTimezoneOffset()/15)}function Ja(b,c){var d,e=this._offset||0;return null!=b?("string"==typeof b&&(b=Ga(b)),Math.abs(b)<16&&(b=60*b),!this._isUTC&&c&&(d=Ia(this)),this._offset=b,this._isUTC=!0,null!=d&&this.add(d,"m"),e!==b&&(!c||this._changeInProgress?Za(this,Ua(b-e,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?e:Ia(this)}function Ka(a,b){return null!=a?("string"!=typeof a&&(a=-a),this.utcOffset(a,b),this):-this.utcOffset()}function La(a){return this.utcOffset(0,a)}function Ma(a){return this._isUTC&&(this.utcOffset(0,a),this._isUTC=!1,a&&this.subtract(Ia(this),"m")),this}function Na(){return this._tzm?this.utcOffset(this._tzm):"string"==typeof this._i&&this.utcOffset(Ga(this._i)),this}function Oa(a){return a=a?za(a).utcOffset():0,(this.utcOffset()-a)%60===0}function Pa(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Qa(){if(this._a){var a=this._isUTC?i(this._a):za(this._a);return this.isValid()&&p(this._a,a.toArray())>0}return!1}function Ra(){return!this._isUTC}function Sa(){return this._isUTC}function Ta(){return this._isUTC&&0===this._offset}function Ua(a,b){var c,d,e,f=a,h=null;return Ea(a)?f={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(f={},b?f[b]=a:f.milliseconds=a):(h=rd.exec(a))?(c="-"===h[1]?-1:1,f={y:0,d:o(h[ad])*c,h:o(h[bd])*c,m:o(h[cd])*c,s:o(h[dd])*c,ms:o(h[ed])*c}):(h=sd.exec(a))?(c="-"===h[1]?-1:1,f={y:Va(h[2],c),M:Va(h[3],c),d:Va(h[4],c),h:Va(h[5],c),m:Va(h[6],c),s:Va(h[7],c),w:Va(h[8],c)}):null==f?f={}:"object"==typeof f&&("from"in f||"to"in f)&&(e=Xa(za(f.from),za(f.to)),f={},f.ms=e.milliseconds,f.M=e.months),d=new Da(f),Ea(a)&&g(a,"_locale")&&(d._locale=a._locale),d}function Va(a,b){var c=a&&parseFloat(a.replace(",","."));return(isNaN(c)?0:c)*b}function Wa(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function Xa(a,b){var c;return b=Ha(b,a),a.isBefore(b)?c=Wa(a,b):(c=Wa(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function Ya(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||($(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=Ua(c,d),Za(this,e,a),this}}function Za(b,c,d,e){var f=c._milliseconds,g=c._days,h=c._months;e=null==e?!0:e,f&&b._d.setTime(+b._d+f*d),g&&C(b,"Date",B(b,"Date")+g*d),h&&U(b,B(b,"Month")+h*d),e&&a.updateOffset(b,g||h)}function $a(a){var b=a||za(),c=Ha(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this,za(b)))}function _a(){return new m(this)}function ab(a,b){var c;return b=y("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=n(a)?a:za(a),+this>+a):(c=n(a)?+a:+za(a),c<+this.clone().startOf(b))}function bb(a,b){var c;return b=y("undefined"!=typeof b?b:"millisecond"),"millisecond"===b?(a=n(a)?a:za(a),+a>+this):(c=n(a)?+a:+za(a),+this.clone().endOf(b)<c)}function cb(a,b,c){return this.isAfter(a,c)&&this.isBefore(b,c)}function db(a,b){var c;return b=y(b||"millisecond"),"millisecond"===b?(a=n(a)?a:za(a),+this===+a):(c=+za(a),+this.clone().startOf(b)<=c&&c<=+this.clone().endOf(b))}function eb(a){return 0>a?Math.ceil(a):Math.floor(a)}function fb(a,b,c){var d,e,f=Ha(a,this),g=6e4*(f.utcOffset()-this.utcOffset());return b=y(b),"year"===b||"month"===b||"quarter"===b?(e=gb(this,f),"quarter"===b?e/=3:"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:eb(e)}function gb(a,b){var c,d,e=12*(b.year()-a.year())+(b.month()-a.month()),f=a.clone().add(e,"months");return 0>b-f?(c=a.clone().add(e-1,"months"),d=(b-f)/(f-c)):(c=a.clone().add(e+1,"months"),d=(b-f)/(c-f)),-(e+d)}function hb(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function ib(){var a=this.clone().utc();return 0<a.year()&&a.year()<=9999?"function"==typeof Date.prototype.toISOString?this.toDate().toISOString():I(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):I(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}function jb(b){var c=I(this,b||a.defaultFormat);return this.localeData().postformat(c)}function kb(a,b){return Ua({to:this,from:a}).locale(this.locale()).humanize(!b)}function lb(a){return this.from(za(),a)}function mb(a){var b;return void 0===a?this._locale._abbr:(b=w(a),null!=b&&(this._locale=b),this)}function nb(){return this._locale}function ob(a){switch(a=y(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a&&this.weekday(0),"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this}function pb(a){return a=y(a),void 0===a||"millisecond"===a?this:this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")}function qb(){return+this._d-6e4*(this._offset||0)}function rb(){return Math.floor(+this/1e3)}function sb(){return this._offset?new Date(+this):this._d}function tb(){var a=this;return[a.year(),a.month(),a.date(),a.hour(),a.minute(),a.second(),a.millisecond()]}function ub(){return j(this)}function vb(){return h({},this._pf)}function wb(){return this._pf.overflow}function xb(a,b){F(0,[a,a.length],0,b)}function yb(a,b,c){return ga(za([a,11,31+b-c]),b,c).week}function zb(a){var b=ga(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")}function Ab(a){var b=ga(this,1,4).year;return null==a?b:this.add(a-b,"y")}function Bb(){return yb(this.year(),1,4)}function Cb(){var a=this.localeData()._week;return yb(this.year(),a.dow,a.doy)}function Db(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)}function Eb(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function Fb(a){return this._weekdays[a.day()]}function Gb(a){return this._weekdaysShort[a.day()]}function Hb(a){return this._weekdaysMin[a.day()]}function Ib(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=za([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b}function Jb(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=Eb(a,this.localeData()),this.add(a-b,"d")):b}function Kb(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")}function Lb(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)}function Mb(a,b){F(a,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),b)})}function Nb(a,b){return b._meridiemParse}function Ob(a){return"p"===(a+"").toLowerCase().charAt(0)}function Pb(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"}function Qb(a){F(0,[a,3],0,"millisecond")}function Rb(){return this._isUTC?"UTC":""}function Sb(){return this._isUTC?"Coordinated Universal Time":""}function Tb(a){return za(1e3*a)}function Ub(){return za.apply(null,arguments).parseZone()}function Vb(a,b,c){var d=this._calendar[a];return"function"==typeof d?d.call(b,c):d}function Wb(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b}function Xb(){return this._invalidDate}function Yb(a){return this._ordinal.replace("%d",a)}function Zb(a){return a}function $b(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)}function _b(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)}function ac(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function bc(a,b,c,d){var e=w(),f=i().set(d,b);return e[c](f,a)}function cc(a,b,c,d,e){if("number"==typeof a&&(b=a,a=void 0),a=a||"",null!=b)return bc(a,b,c,e);var f,g=[];for(f=0;d>f;f++)g[f]=bc(a,f,c,e);return g}function dc(a,b){return cc(a,b,"months",12,"month")}function ec(a,b){return cc(a,b,"monthsShort",12,"month")}function fc(a,b){return cc(a,b,"weekdays",7,"day")}function gc(a,b){return cc(a,b,"weekdaysShort",7,"day")}function hc(a,b){return cc(a,b,"weekdaysMin",7,"day")}function ic(){var a=this._data;return this._milliseconds=Od(this._milliseconds),this._days=Od(this._days),this._months=Od(this._months),a.milliseconds=Od(a.milliseconds),a.seconds=Od(a.seconds),a.minutes=Od(a.minutes),a.hours=Od(a.hours),a.months=Od(a.months),a.years=Od(a.years),this}function jc(a,b,c,d){var e=Ua(b,c);return a._milliseconds+=d*e._milliseconds,a._days+=d*e._days,a._months+=d*e._months,a._bubble()}function kc(a,b){return jc(this,a,b,1)}function lc(a,b){return jc(this,a,b,-1)}function mc(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;return g.milliseconds=d%1e3,a=eb(d/1e3),g.seconds=a%60,b=eb(a/60),g.minutes=b%60,c=eb(b/60),g.hours=c%24,e+=eb(c/24),h=eb(nc(e)),e-=eb(oc(h)),f+=eb(e/30),e%=30,h+=eb(f/12),f%=12,g.days=e,g.months=f,g.years=h,this}function nc(a){return 400*a/146097}function oc(a){return 146097*a/400}function pc(a){var b,c,d=this._milliseconds;if(a=y(a),"month"===a||"year"===a)return b=this._days+d/864e5,c=this._months+12*nc(b),"month"===a?c:c/12;switch(b=this._days+Math.round(oc(this._months/12)),a){case"week":return b/7+d/6048e5;case"day":return b+d/864e5;case"hour":return 24*b+d/36e5;case"minute":return 24*b*60+d/6e4;case"second":return 24*b*60*60+d/1e3;case"millisecond":return Math.floor(24*b*60*60*1e3)+d;default:throw new Error("Unknown unit "+a)}}function qc(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*o(this._months/12)}function rc(a){return function(){return this.as(a)}}function sc(a){return a=y(a),this[a+"s"]()}function tc(a){return function(){return this._data[a]}}function uc(){return eb(this.days()/7)}function vc(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function wc(a,b,c){var d=Ua(a).abs(),e=ce(d.as("s")),f=ce(d.as("m")),g=ce(d.as("h")),h=ce(d.as("d")),i=ce(d.as("M")),j=ce(d.as("y")),k=e<de.s&&["s",e]||1===f&&["m"]||f<de.m&&["mm",f]||1===g&&["h"]||g<de.h&&["hh",g]||1===h&&["d"]||h<de.d&&["dd",h]||1===i&&["M"]||i<de.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,vc.apply(null,k)}function xc(a,b){return void 0===de[a]?!1:void 0===b?de[a]:(de[a]=b,!0)}function yc(a){var b=this.localeData(),c=wc(this,!a,b);return a&&(c=b.pastFuture(+this,c)),b.postformat(c)}function zc(){var a=ee(this.years()),b=ee(this.months()),c=ee(this.days()),d=ee(this.hours()),e=ee(this.minutes()),f=ee(this.seconds()+this.milliseconds()/1e3),g=this.asSeconds();return g?(0>g?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"}var Ac,Bc,Cc=a.momentProperties=[],Dc=!1,Ec={},Fc={},Gc=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|x|X|zz?|ZZ?|.)/g,Hc=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,Ic={},Jc={},Kc=/\d/,Lc=/\d\d/,Mc=/\d{3}/,Nc=/\d{4}/,Oc=/[+-]?\d{6}/,Pc=/\d\d?/,Qc=/\d{1,3}/,Rc=/\d{1,4}/,Sc=/[+-]?\d{1,6}/,Tc=/\d+/,Uc=/[+-]?\d+/,Vc=/Z|[+-]\d\d:?\d\d/gi,Wc=/[+-]?\d+(\.\d{1,3})?/,Xc=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Yc={},Zc={},$c=0,_c=1,ad=2,bd=3,cd=4,dd=5,ed=6;F("M",["MM",2],"Mo",function(){return this.month()+1}),F("MMM",0,0,function(a){return this.localeData().monthsShort(this,a)}),F("MMMM",0,0,function(a){return this.localeData().months(this,a)}),x("month","M"),K("M",Pc),K("MM",Pc,Lc),K("MMM",Xc),K("MMMM",Xc),N(["M","MM"],function(a,b){b[_c]=o(a)-1}),N(["MMM","MMMM"],function(a,b,c,d){var e=c._locale.monthsParse(a,d,c._strict);null!=e?b[_c]=e:c._pf.invalidMonth=a});var fd="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),gd="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),hd={};a.suppressDeprecationWarnings=!1;var id=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,jd=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],kd=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],ld=/^\/?Date\((\-?\d+)/i;a.createFromInputFallback=Z("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i+(a._useUTC?" UTC":""))}),F(0,["YY",2],0,function(){return this.year()%100}),F(0,["YYYY",4],0,"year"),F(0,["YYYYY",5],0,"year"),F(0,["YYYYYY",6,!0],0,"year"),x("year","y"),K("Y",Uc),K("YY",Pc,Lc),K("YYYY",Rc,Nc),K("YYYYY",Sc,Oc),K("YYYYYY",Sc,Oc),N(["YYYY","YYYYY","YYYYYY"],$c),N("YY",function(b,c){c[$c]=a.parseTwoDigitYear(b)}),a.parseTwoDigitYear=function(a){return o(a)+(o(a)>68?1900:2e3)};var md=A("FullYear",!1);F("w",["ww",2],"wo","week"),F("W",["WW",2],"Wo","isoWeek"),x("week","w"),x("isoWeek","W"),K("w",Pc),K("ww",Pc,Lc),K("W",Pc),K("WW",Pc,Lc),O(["w","ww","W","WW"],function(a,b,c,d){b[d.substr(0,1)]=o(a)});var nd={dow:0,doy:6};F("DDD",["DDDD",3],"DDDo","dayOfYear"),x("dayOfYear","DDD"),K("DDD",Qc),K("DDDD",Mc),N(["DDD","DDDD"],function(a,b,c){c._dayOfYear=o(a)}),a.ISO_8601=function(){};var od=Z("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var a=za.apply(null,arguments);return this>a?this:a}),pd=Z("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var a=za.apply(null,arguments);return a>this?this:a});Fa("Z",":"),Fa("ZZ",""),K("Z",Vc),K("ZZ",Vc),N(["Z","ZZ"],function(a,b,c){c._useUTC=!0,c._tzm=Ga(a)});var qd=/([\+\-]|\d\d)/gi;a.updateOffset=function(){};var rd=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,sd=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;Ua.fn=Da.prototype;var td=Ya(1,"add"),ud=Ya(-1,"subtract");a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ";var vd=Z("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(a){return void 0===a?this.localeData():this.locale(a)});F(0,["gg",2],0,function(){return this.weekYear()%100}),F(0,["GG",2],0,function(){return this.isoWeekYear()%100}),xb("gggg","weekYear"),xb("ggggg","weekYear"),xb("GGGG","isoWeekYear"),xb("GGGGG","isoWeekYear"),x("weekYear","gg"),x("isoWeekYear","GG"),K("G",Uc),K("g",Uc),K("GG",Pc,Lc),K("gg",Pc,Lc),K("GGGG",Rc,Nc),K("gggg",Rc,Nc),K("GGGGG",Sc,Oc),K("ggggg",Sc,Oc),O(["gggg","ggggg","GGGG","GGGGG"],function(a,b,c,d){b[d.substr(0,2)]=o(a)}),O(["gg","GG"],function(b,c,d,e){c[e]=a.parseTwoDigitYear(b)}),F("Q",0,0,"quarter"),x("quarter","Q"),K("Q",Kc),N("Q",function(a,b){b[_c]=3*(o(a)-1)}),F("D",["DD",2],"Do","date"),x("date","D"),K("D",Pc),K("DD",Pc,Lc),K("Do",function(a,b){return a?b._ordinalParse:b._ordinalParseLenient}),N(["D","DD"],ad),N("Do",function(a,b){b[ad]=o(a.match(Pc)[0],10)});var wd=A("Date",!0);F("d",0,"do","day"),F("dd",0,0,function(a){return this.localeData().weekdaysMin(this,a)}),F("ddd",0,0,function(a){return this.localeData().weekdaysShort(this,a)}),F("dddd",0,0,function(a){return this.localeData().weekdays(this,a)}),F("e",0,0,"weekday"),F("E",0,0,"isoWeekday"),x("day","d"),x("weekday","e"),x("isoWeekday","E"),K("d",Pc),K("e",Pc),K("E",Pc),K("dd",Xc),K("ddd",Xc),K("dddd",Xc),O(["dd","ddd","dddd"],function(a,b,c){var d=c._locale.weekdaysParse(a);null!=d?b.d=d:c._pf.invalidWeekday=a}),O(["d","e","E"],function(a,b,c,d){b[d]=o(a)});var xd="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),yd="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),zd="Su_Mo_Tu_We_Th_Fr_Sa".split("_");F("H",["HH",2],0,"hour"),F("h",["hh",2],0,function(){return this.hours()%12||12}),Mb("a",!0),Mb("A",!1),x("hour","h"),K("a",Nb),K("A",Nb),K("H",Pc),K("h",Pc),K("HH",Pc,Lc),K("hh",Pc,Lc),N(["H","HH"],bd),N(["a","A"],function(a,b,c){c._isPm=c._locale.isPM(a),c._meridiem=a}),N(["h","hh"],function(a,b,c){b[bd]=o(a),c._pf.bigHour=!0});var Ad=/[ap]\.?m?\.?/i,Bd=A("Hours",!0);F("m",["mm",2],0,"minute"),x("minute","m"),K("m",Pc),K("mm",Pc,Lc),N(["m","mm"],cd);var Cd=A("Minutes",!1);F("s",["ss",2],0,"second"),x("second","s"),K("s",Pc),K("ss",Pc,Lc),N(["s","ss"],dd);var Dd=A("Seconds",!1);F("S",0,0,function(){return~~(this.millisecond()/100)}),F(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),Qb("SSS"),Qb("SSSS"),x("millisecond","ms"),K("S",Qc,Kc),K("SS",Qc,Lc),K("SSS",Qc,Mc),K("SSSS",Tc),N(["S","SS","SSS","SSSS"],function(a,b){b[ed]=o(1e3*("0."+a))});var Ed=A("Milliseconds",!1);F("z",0,0,"zoneAbbr"),F("zz",0,0,"zoneName");var Fd=m.prototype;Fd.add=td,Fd.calendar=$a,Fd.clone=_a,Fd.diff=fb,Fd.endOf=pb,Fd.format=jb,Fd.from=kb,Fd.fromNow=lb,Fd.get=D,Fd.invalidAt=wb,Fd.isAfter=ab,Fd.isBefore=bb,Fd.isBetween=cb,Fd.isSame=db,Fd.isValid=ub,Fd.lang=vd,Fd.locale=mb,Fd.localeData=nb,Fd.max=pd,Fd.min=od,Fd.parsingFlags=vb,Fd.set=D,Fd.startOf=ob,Fd.subtract=ud,Fd.toArray=tb,Fd.toDate=sb,Fd.toISOString=ib,Fd.toJSON=ib,Fd.toString=hb,Fd.unix=rb,Fd.valueOf=qb,Fd.year=md,Fd.isLeapYear=fa,Fd.weekYear=zb,Fd.isoWeekYear=Ab,Fd.quarter=Fd.quarters=Db,Fd.month=V,Fd.daysInMonth=W,Fd.week=Fd.weeks=ka,Fd.isoWeek=Fd.isoWeeks=la,Fd.weeksInYear=Cb,Fd.isoWeeksInYear=Bb,Fd.date=wd,Fd.day=Fd.days=Jb,Fd.weekday=Kb,Fd.isoWeekday=Lb,Fd.dayOfYear=na,Fd.hour=Fd.hours=Bd,Fd.minute=Fd.minutes=Cd,Fd.second=Fd.seconds=Dd,Fd.millisecond=Fd.milliseconds=Ed,Fd.utcOffset=Ja,Fd.utc=La,Fd.local=Ma,Fd.parseZone=Na,Fd.hasAlignedHourOffset=Oa,Fd.isDST=Pa,Fd.isDSTShifted=Qa,Fd.isLocal=Ra,Fd.isUtcOffset=Sa,Fd.isUtc=Ta,Fd.isUTC=Ta,Fd.zoneAbbr=Rb,Fd.zoneName=Sb,Fd.dates=Z("dates accessor is deprecated. Use date instead.",wd),Fd.months=Z("months accessor is deprecated. Use month instead",V),Fd.years=Z("years accessor is deprecated. Use year instead",md),Fd.zone=Z("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",Ka);var Gd=Fd,Hd={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},Id={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},Jd="Invalid date",Kd="%d",Ld=/\d{1,2}/,Md={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Nd=q.prototype;Nd._calendar=Hd,Nd.calendar=Vb,Nd._longDateFormat=Id,Nd.longDateFormat=Wb,Nd._invalidDate=Jd,Nd.invalidDate=Xb,Nd._ordinal=Kd,Nd.ordinal=Yb,Nd._ordinalParse=Ld,
+Nd.preparse=Zb,Nd.postformat=Zb,Nd._relativeTime=Md,Nd.relativeTime=$b,Nd.pastFuture=_b,Nd.set=ac,Nd.months=R,Nd._months=fd,Nd.monthsShort=S,Nd._monthsShort=gd,Nd.monthsParse=T,Nd.week=ha,Nd._week=nd,Nd.firstDayOfYear=ja,Nd.firstDayOfWeek=ia,Nd.weekdays=Fb,Nd._weekdays=xd,Nd.weekdaysMin=Hb,Nd._weekdaysMin=zd,Nd.weekdaysShort=Gb,Nd._weekdaysShort=yd,Nd.weekdaysParse=Ib,Nd.isPM=Ob,Nd._meridiemParse=Ad,Nd.meridiem=Pb,u("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(a){var b=a%10,c=1===o(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),a.lang=Z("moment.lang is deprecated. Use moment.locale instead.",u),a.langData=Z("moment.langData is deprecated. Use moment.localeData instead.",w);var Od=Math.abs,Pd=rc("ms"),Qd=rc("s"),Rd=rc("m"),Sd=rc("h"),Td=rc("d"),Ud=rc("w"),Vd=rc("M"),Wd=rc("y"),Xd=tc("milliseconds"),Yd=tc("seconds"),Zd=tc("minutes"),$d=tc("hours"),_d=tc("days"),ae=tc("months"),be=tc("years"),ce=Math.round,de={s:45,m:45,h:22,d:26,M:11},ee=Math.abs,fe=Da.prototype;fe.abs=ic,fe.add=kc,fe.subtract=lc,fe.as=pc,fe.asMilliseconds=Pd,fe.asSeconds=Qd,fe.asMinutes=Rd,fe.asHours=Sd,fe.asDays=Td,fe.asWeeks=Ud,fe.asMonths=Vd,fe.asYears=Wd,fe.valueOf=qc,fe._bubble=mc,fe.get=sc,fe.milliseconds=Xd,fe.seconds=Yd,fe.minutes=Zd,fe.hours=$d,fe.days=_d,fe.weeks=uc,fe.months=ae,fe.years=be,fe.humanize=yc,fe.toISOString=zc,fe.toString=zc,fe.toJSON=zc,fe.locale=mb,fe.localeData=nb,fe.toIsoString=Z("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",zc),fe.lang=vd,F("X",0,0,"unix"),F("x",0,0,"valueOf"),K("x",Uc),K("X",Wc),N("X",function(a,b,c){c._d=new Date(1e3*parseFloat(a,10))}),N("x",function(a,b,c){c._d=new Date(o(a))}),a.version="2.10.2",b(za),a.fn=Gd,a.min=Ba,a.max=Ca,a.utc=i,a.unix=Tb,a.months=dc,a.isDate=e,a.locale=u,a.invalid=k,a.duration=Ua,a.isMoment=n,a.weekdays=fc,a.parseZone=Ub,a.localeData=w,a.isDuration=Ea,a.monthsShort=ec,a.weekdaysMin=hc,a.defineLocale=v,a.weekdaysShort=gc,a.normalizeUnits=y,a.relativeTimeThreshold=xc;var ge=a;return ge});
\ No newline at end of file
diff --git a/turtles/app/lib/momentjs/locale/de.js b/turtles/app/lib/momentjs/locale/de.js
new file mode 100644
index 000000000..30a9b1e10
--- /dev/null
+++ b/turtles/app/lib/momentjs/locale/de.js
@@ -0,0 +1,74 @@
+//! moment.js locale configuration
+//! locale : german (de)
+//! author : lluchs : https://github.com/lluchs
+//! author: Menelion Elensúle: https://github.com/Oire
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    function processRelativeTime(number, withoutSuffix, key, isFuture) {
+        var format = {
+            'm': ['eine Minute', 'einer Minute'],
+            'h': ['eine Stunde', 'einer Stunde'],
+            'd': ['ein Tag', 'einem Tag'],
+            'dd': [number + ' Tage', number + ' Tagen'],
+            'M': ['ein Monat', 'einem Monat'],
+            'MM': [number + ' Monate', number + ' Monaten'],
+            'y': ['ein Jahr', 'einem Jahr'],
+            'yy': [number + ' Jahre', number + ' Jahren']
+        };
+        return withoutSuffix ? format[key][0] : format[key][1];
+    }
+
+    var de = moment.defineLocale('de', {
+        months : 'Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember'.split('_'),
+        monthsShort : 'Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.'.split('_'),
+        weekdays : 'Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag'.split('_'),
+        weekdaysShort : 'So._Mo._Di._Mi._Do._Fr._Sa.'.split('_'),
+        weekdaysMin : 'So_Mo_Di_Mi_Do_Fr_Sa'.split('_'),
+        longDateFormat : {
+            LT: 'HH:mm',
+            LTS: 'HH:mm:ss',
+            L : 'DD.MM.YYYY',
+            LL : 'D. MMMM YYYY',
+            LLL : 'D. MMMM YYYY LT',
+            LLLL : 'dddd, D. MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Heute um] LT [Uhr]',
+            sameElse: 'L',
+            nextDay: '[Morgen um] LT [Uhr]',
+            nextWeek: 'dddd [um] LT [Uhr]',
+            lastDay: '[Gestern um] LT [Uhr]',
+            lastWeek: '[letzten] dddd [um] LT [Uhr]'
+        },
+        relativeTime : {
+            future : 'in %s',
+            past : 'vor %s',
+            s : 'ein paar Sekunden',
+            m : processRelativeTime,
+            mm : '%d Minuten',
+            h : processRelativeTime,
+            hh : '%d Stunden',
+            d : processRelativeTime,
+            dd : processRelativeTime,
+            M : processRelativeTime,
+            MM : processRelativeTime,
+            y : processRelativeTime,
+            yy : processRelativeTime
+        },
+        ordinalParse: /\d{1,2}\./,
+        ordinal : '%d.',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return de;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/momentjs/locale/es.js b/turtles/app/lib/momentjs/locale/es.js
new file mode 100644
index 000000000..4349217c2
--- /dev/null
+++ b/turtles/app/lib/momentjs/locale/es.js
@@ -0,0 +1,78 @@
+//! moment.js locale configuration
+//! locale : spanish (es)
+//! author : Julio Napurí : https://github.com/julionc
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var monthsShortDot = 'Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.'.split('_'),
+        monthsShort = 'Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic'.split('_');
+
+    var es = moment.defineLocale('es', {
+        months : 'Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre'.split('_'),
+        monthsShort : function (m, format) {
+            if (/-MMM-/.test(format)) {
+                return monthsShort[m.month()];
+            } else {
+                return monthsShortDot[m.month()];
+            }
+        },
+        weekdays : 'Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado'.split('_'),
+        weekdaysShort : 'Dom._Lun._Mar._Mié._Jue._Vie._Sáb.'.split('_'),
+        weekdaysMin : 'Do_Lu_Ma_Mi_Ju_Vi_Sá'.split('_'),
+        longDateFormat : {
+            LT : 'H:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D [de] MMMM [de] YYYY',
+            LLL : 'D [de] MMMM [de] YYYY LT',
+            LLLL : 'dddd, D [de] MMMM [de] YYYY LT'
+        },
+        calendar : {
+            sameDay : function () {
+                return '[hoy a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextDay : function () {
+                return '[mañana a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            nextWeek : function () {
+                return 'dddd [a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastDay : function () {
+                return '[ayer a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            lastWeek : function () {
+                return '[el] dddd [pasado a la' + ((this.hours() !== 1) ? 's' : '') + '] LT';
+            },
+            sameElse : 'L'
+        },
+        relativeTime : {
+            future : 'en %s',
+            past : 'hace %s',
+            s : 'unos segundos',
+            m : 'un minuto',
+            mm : '%d minutos',
+            h : 'una hora',
+            hh : '%d horas',
+            d : 'un día',
+            dd : '%d días',
+            M : 'un mes',
+            MM : '%d meses',
+            y : 'un año',
+            yy : '%d años'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal : '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return es;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/momentjs/locale/it.js b/turtles/app/lib/momentjs/locale/it.js
new file mode 100644
index 000000000..84fe3894b
--- /dev/null
+++ b/turtles/app/lib/momentjs/locale/it.js
@@ -0,0 +1,69 @@
+//! moment.js locale configuration
+//! locale : italian (it)
+//! author : Lorenzo : https://github.com/aliem
+//! author: Mattia Larentis: https://github.com/nostalgiaz
+
+(function (global, factory) {
+   typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('../moment')) :
+   typeof define === 'function' && define.amd ? define(['moment'], factory) :
+   factory(global.moment)
+}(this, function (moment) { 'use strict';
+
+
+    var it = moment.defineLocale('it', {
+        months : 'gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre'.split('_'),
+        monthsShort : 'gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic'.split('_'),
+        weekdays : 'Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato'.split('_'),
+        weekdaysShort : 'Dom_Lun_Mar_Mer_Gio_Ven_Sab'.split('_'),
+        weekdaysMin : 'D_L_Ma_Me_G_V_S'.split('_'),
+        longDateFormat : {
+            LT : 'HH:mm',
+            LTS : 'LT:ss',
+            L : 'DD/MM/YYYY',
+            LL : 'D MMMM YYYY',
+            LLL : 'D MMMM YYYY LT',
+            LLLL : 'dddd, D MMMM YYYY LT'
+        },
+        calendar : {
+            sameDay: '[Oggi alle] LT',
+            nextDay: '[Domani alle] LT',
+            nextWeek: 'dddd [alle] LT',
+            lastDay: '[Ieri alle] LT',
+            lastWeek: function () {
+                switch (this.day()) {
+                    case 0:
+                        return '[la scorsa] dddd [alle] LT';
+                    default:
+                        return '[lo scorso] dddd [alle] LT';
+                }
+            },
+            sameElse: 'L'
+        },
+        relativeTime : {
+            future : function (s) {
+                return ((/^[0-9].+$/).test(s) ? 'tra' : 'in') + ' ' + s;
+            },
+            past : '%s fa',
+            s : 'alcuni secondi',
+            m : 'un minuto',
+            mm : '%d minuti',
+            h : 'un\'ora',
+            hh : '%d ore',
+            d : 'un giorno',
+            dd : '%d giorni',
+            M : 'un mese',
+            MM : '%d mesi',
+            y : 'un anno',
+            yy : '%d anni'
+        },
+        ordinalParse : /\d{1,2}º/,
+        ordinal: '%dº',
+        week : {
+            dow : 1, // Monday is the first day of the week.
+            doy : 4  // The week that contains Jan 4th is the first week of the year.
+        }
+    });
+
+    return it;
+
+}));
\ No newline at end of file
diff --git a/turtles/app/lib/ng-table.min.js b/turtles/app/lib/ng-table.min.js
new file mode 100644
index 000000000..6de33203b
--- /dev/null
+++ b/turtles/app/lib/ng-table.min.js
@@ -0,0 +1,4 @@
+/*! ngTable v0.5.3 by Vitalii Savchuk(esvit666@gmail.com) - https://github.com/esvit/ng-table - New BSD License */
+
+!function(a,b){"use strict";return"function"==typeof define&&define.amd?void define(["angular"],function(a){return b(a)}):b(a)}(angular||null,function(a){"use strict";var b=a.module("ngTable",[]);return b.value("ngTableDefaults",{params:{},settings:{}}),b.factory("NgTableParams",["$q","$log","ngTableDefaults",function(b,c,d){var e=function(a){return!isNaN(parseFloat(a))&&isFinite(a)},f=function(f,g){var h=this,i=function(){k.debugMode&&c.debug&&c.debug.apply(this,arguments)};this.data=[],this.parameters=function(b,c){if(c=c||!1,a.isDefined(b)){for(var d in b){var f=b[d];if(c&&d.indexOf("[")>=0){for(var g=d.split(/\[(.*)\]/).reverse(),h="",k=0,l=g.length;l>k;k++){var m=g[k];if(""!==m){var n=f;f={},f[h=m]=e(n)?parseFloat(n):n}}"sorting"===h&&(j[h]={}),j[h]=a.extend(j[h]||{},f[h])}else j[d]=e(b[d])?parseFloat(b[d]):b[d]}return i("ngTable: set parameters",j),this}return j},this.settings=function(b){return a.isDefined(b)?(a.isArray(b.data)&&(b.total=b.data.length),k=a.extend(k,b),i("ngTable: set settings",k),this):k},this.page=function(b){return a.isDefined(b)?this.parameters({page:b}):j.page},this.total=function(b){return a.isDefined(b)?this.settings({total:b}):k.total},this.count=function(b){return a.isDefined(b)?this.parameters({count:b,page:1}):j.count},this.filter=function(b){return a.isDefined(b)?this.parameters({filter:b,page:1}):j.filter},this.sorting=function(b){if(2==arguments.length){var c={};return c[b]=arguments[1],this.parameters({sorting:c}),this}return a.isDefined(b)?this.parameters({sorting:b}):j.sorting},this.isSortBy=function(b,c){return a.isDefined(j.sorting[b])&&a.equals(j.sorting[b],c)},this.orderBy=function(){var a=[];for(var b in j.sorting)a.push(("asc"===j.sorting[b]?"+":"-")+b);return a},this.getData=function(b,c){return b.resolve(a.isArray(this.data)&&a.isObject(c)?this.data.slice((c.page()-1)*c.count(),c.page()*c.count()):[]),b.promise},this.getGroups=function(c,d){var e=b.defer();return e.promise.then(function(b){var e={};a.forEach(b,function(b){var c=a.isFunction(d)?d(b):b[d];e[c]=e[c]||{data:[]},e[c].value=c,e[c].data.push(b)});var f=[];for(var g in e)f.push(e[g]);i("ngTable: refresh groups",f),c.resolve(f)}),this.getData(e,h)},this.generatePagesArray=function(a,b,c){var d,e,f,g,h,i;if(d=11,i=[],h=Math.ceil(b/c),h>1){i.push({type:"prev",number:Math.max(1,a-1),active:a>1}),i.push({type:"first",number:1,active:a>1,current:1===a}),f=Math.round((d-5)/2),g=Math.max(2,a-f),e=Math.min(h-1,a+2*f-(a-g)),g=Math.max(2,g-(2*f-(e-g)));for(var j=g;e>=j;)i.push(j===g&&2!==j||j===e&&j!==h-1?{type:"more",active:!1}:{type:"page",number:j,active:a!==j,current:a===j}),j++;i.push({type:"last",number:h,active:a!==h,current:a===h}),i.push({type:"next",number:Math.min(h,a+1),active:h>a})}return i},this.url=function(b){b=b||!1;var c=b?[]:{};for(var d in j)if(j.hasOwnProperty(d)){var e=j[d],f=encodeURIComponent(d);if("object"==typeof e){for(var g in e)if(!a.isUndefined(e[g])&&""!==e[g]){var h=f+"["+encodeURIComponent(g)+"]";b?c.push(h+"="+e[g]):c[h]=e[g]}}else a.isFunction(e)||a.isUndefined(e)||""===e||(b?c.push(f+"="+encodeURIComponent(e)):c[f]=encodeURIComponent(e))}return c},this.reload=function(){var a=b.defer(),c=this,d=null;if(k.$scope)return k.$loading=!0,d=k.groupBy?k.getGroups(a,k.groupBy,this):k.getData(a,this),i("ngTable: reload data"),d||(d=a.promise),d.then(function(a){return k.$loading=!1,i("ngTable: current scope",k.$scope),k.groupBy?(c.data=a,k.$scope&&(k.$scope.$groups=a)):(c.data=a,k.$scope&&(k.$scope.$data=a)),k.$scope&&(k.$scope.pages=c.generatePagesArray(c.page(),c.total(),c.count())),k.$scope.$emit("ngTableAfterReloadData"),a})},this.reloadPages=function(){var a=this;k.$scope.pages=a.generatePagesArray(a.page(),a.total(),a.count())};var j=this.$params={page:1,count:1,filter:{},sorting:{},group:{},groupBy:null};a.extend(j,d.params);var k={$scope:null,$loading:!1,data:null,total:0,defaultSort:"desc",filterDelay:750,counts:[10,25,50,100],sortingIndicator:"span",getGroups:this.getGroups,getData:this.getData};return a.extend(k,d.settings),this.settings(g),this.parameters(f,!0),this};return f}]),b.factory("ngTableParams",["NgTableParams",function(a){return a}]),b.controller("ngTableController",["$scope","NgTableParams","$timeout","$parse","$compile","$attrs","$element","ngTableColumn",function(b,c,d,e,f,g,h,i){function j(){b.params.$params.page=1}var k=!0;b.$filterRow={},b.$loading=!1,b.hasOwnProperty("params")||(b.params=new c,b.params.isNullInstance=!0),b.params.settings().$scope=b;var l=function(){var a=0;return function(b,c){d.cancel(a),a=d(b,c)}}();b.$watch("params.$params",function(c,d){if(c!==d){if(b.params.settings().$scope=b,a.equals(c.filter,d.filter))b.params.reload();else{var e=k?a.noop:j;l(function(){e(),b.params.reload()},b.params.settings().filterDelay)}b.params.isNullInstance||(k=!1)}},!0),this.compileDirectiveTemplates=function(){if(!h.hasClass("ng-table")){b.templates={header:g.templateHeader?g.templateHeader:"ng-table/header.html",pagination:g.templatePagination?g.templatePagination:"ng-table/pager.html"},h.addClass("ng-table");var c=null;0===h.find("> thead").length&&(c=a.element(document.createElement("thead")).attr("ng-include","templates.header"),h.prepend(c));var d=a.element(document.createElement("div")).attr({"ng-table-pagination":"params","template-url":"templates.pagination"});h.after(d),c&&f(c)(b),f(d)(b)}},this.loadFilterData=function(c){a.forEach(c,function(c){var d;return d=c.filterData(b,{$column:c}),d?a.isObject(d)&&a.isObject(d.promise)?(delete c.filterData,d.promise.then(function(b){a.isArray(b)||a.isFunction(b)||a.isObject(b)?a.isArray(b)&&b.unshift({title:"-",id:""}):b=[],c.data=b})):c.data=d:void delete c.filterData})},this.buildColumns=function(a){return a.map(function(a){return i.buildColumn(a,b)})},this.setupBindingsToInternalScope=function(c){var d=e(c);b.$watch(d,function(c){a.isUndefined(c)||(b.paramsModel=d,b.params=c)},!1),g.showFilter&&b.$parent.$watch(g.showFilter,function(a){b.show_filter=a}),g.disableFilter&&b.$parent.$watch(g.disableFilter,function(a){b.$filterRow.disabled=a})},b.sortBy=function(a,c){var d=a.sortable&&a.sortable();if(d){var e=b.params.settings().defaultSort,f="asc"===e?"desc":"asc",g=b.params.sorting()&&b.params.sorting()[d]&&b.params.sorting()[d]===e,h=c.ctrlKey||c.metaKey?b.params.sorting():{};h[d]=g?f:e,b.params.parameters({sorting:h})}}}]),b.factory("ngTableColumn",[function(){function b(b,d){var e=Object.create(b);for(var f in c)void 0===e[f]&&(e[f]=c[f]),a.isFunction(e[f])||!function(a){e[a]=function(){return b[a]}}(f),function(a){var c=e[a];e[a]=function(){return 0===arguments.length?c.call(b,d):c.apply(b,arguments)}}(f);return e}var c={"class":function(){return""},filter:function(){return!1},filterData:a.noop,headerTemplateURL:function(){return!1},headerTitle:function(){return" "},sortable:function(){return!1},show:function(){return!0},title:function(){return" "},titleAlt:function(){return""}};return{buildColumn:b}}]),b.directive("ngTable",["$q","$parse",function(b,c){return{restrict:"A",priority:1001,scope:!0,controller:"ngTableController",compile:function(b){var d=[],e=0,f=null;return a.forEach(a.element(b.find("tr")),function(b){b=a.element(b),b.hasClass("ng-table-group")||f||(f=b)}),f?(a.forEach(f.find("td"),function(b){var f=a.element(b);if(!f.attr("ignore-cell")||"true"!==f.attr("ignore-cell")){var g=function(a){return f.attr("x-data-"+a)||f.attr("data-"+a)||f.attr(a)},h=function(b){var e=g(b);return e?function(b,f){return c(e)(b,a.extend(f||{},{$columns:d}))}:void 0},i=g("title-alt")||g("title");i&&f.attr("data-title-text","{{"+i+"}}"),d.push({id:e++,title:h("title"),titleAlt:h("title-alt"),headerTitle:h("header-title"),sortable:h("sortable"),"class":h("header-class"),filter:h("filter"),headerTemplateURL:h("header"),filterData:h("filter-data"),show:f.attr("ng-show")?function(a){return c(f.attr("ng-show"))(a)}:void 0})}}),function(a,b,c,e){a.$columns=d=e.buildColumns(d),e.setupBindingsToInternalScope(c.ngTable),e.loadFilterData(d),e.compileDirectiveTemplates()}):void 0}}}]),b.directive("ngTableDynamic",["$parse",function(b){function c(a){if(!a||a.indexOf(" with ")>-1){var b=a.split(/\s+with\s+/);return{tableParams:b[0],columns:b[1]}}throw new Error("Parse error (expected example: ng-table-dynamic='tableParams with cols')")}return{restrict:"A",priority:1001,scope:!0,controller:"ngTableController",compile:function(d){var e;return a.forEach(a.element(d.find("tr")),function(b){b=a.element(b),b.hasClass("ng-table-group")||e||(e=b)}),e?(a.forEach(e.find("td"),function(b){var c=a.element(b),d=function(a){return c.attr("x-data-"+a)||c.attr("data-"+a)||c.attr(a)},e=d("title");e||c.attr("data-title-text","{{$columns[$index].titleAlt(this) || $columns[$index].title(this)}}");var f=c.attr("ng-show");f||c.attr("ng-show","$columns[$index].show(this)")}),function(a,d,e,f){var g=c(e.ngTableDynamic),h=b(g.columns)(a)||[];a.$columns=f.buildColumns(h),f.setupBindingsToInternalScope(g.tableParams),f.loadFilterData(a.$columns),f.compileDirectiveTemplates()}):void 0}}}]),b.directive("ngTablePagination",["$compile",function(b){return{restrict:"A",scope:{params:"=ngTablePagination",templateUrl:"="},replace:!1,link:function(c,d){c.params.settings().$scope.$on("ngTableAfterReloadData",function(){c.pages=c.params.generatePagesArray(c.params.page(),c.params.total(),c.params.count())},!0),c.$watch("templateUrl",function(e){if(!a.isUndefined(e)){var f=a.element(document.createElement("div"));f.attr({"ng-include":"templateUrl"}),d.append(f),b(f)(c)}})}}}]),a.module("ngTable").run(["$templateCache",function(a){a.put("ng-table/filters/select-multiple.html",'<select ng-options="data.id as data.title for data in $column.data" ng-disabled="$filterRow.disabled" multiple ng-multiple="true" ng-model="params.filter()[name]" ng-show="filter==\'select-multiple\'" class="filter filter-select-multiple form-control" name="{{name}}"> </select>'),a.put("ng-table/filters/select.html",'<select ng-options="data.id as data.title for data in $column.data" ng-disabled="$filterRow.disabled" ng-model="params.filter()[name]" ng-show="filter==\'select\'" class="filter filter-select form-control" name="{{name}}"> </select>'),a.put("ng-table/filters/text.html",'<input type="text" name="{{name}}" ng-disabled="$filterRow.disabled" ng-model="params.filter()[name]" ng-if="filter==\'text\'" class="input-filter form-control"/>'),a.put("ng-table/header.html",'<tr> <th title="{{$column.headerTitle(this)}}" ng-repeat="$column in $columns" ng-class="{ \'sortable\': $column.sortable(this), \'sort-asc\': params.sorting()[$column.sortable(this)]==\'asc\', \'sort-desc\': params.sorting()[$column.sortable(this)]==\'desc\' }" ng-click="sortBy($column, $event)" ng-show="$column.show(this)" ng-init="template=$column.headerTemplateURL(this)" class="header {{$column.class(this)}}"> <div ng-if="!template" ng-show="!template" class="ng-table-header" ng-class="{\'sort-indicator\': params.settings().sortingIndicator==\'div\'}"> <span ng-bind="$column.title(this)" ng-class="{\'sort-indicator\': params.settings().sortingIndicator==\'span\'}"></span> </div> <div ng-if="template" ng-show="template" ng-include="template"></div> </th> </tr> <tr ng-show="show_filter" class="ng-table-filters"> <th data-title-text="{{$column.titleAlt(this) || $column.title(this)}}" ng-repeat="$column in $columns" ng-show="$column.show(this)" class="filter"> <div ng-repeat="(name, filter) in $column.filter(this)"> <div ng-if="filter.indexOf(\'/\') !==-1" ng-include="filter"></div> <div ng-if="filter.indexOf(\'/\')===-1" ng-include="\'ng-table/filters/\' + filter + \'.html\'"></div> </div> </th> </tr> '),a.put("ng-table/pager.html",'<div class="ng-cloak ng-table-pager" ng-if="params.data.length"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active && !page.current, \'active\': page.current}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)" href="">&laquo;</a> <a ng-switch-when="first" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)" href="">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)" href="">&raquo;</a> </li> </ul> </div> ')}]),b});
+//# sourceMappingURL=ng-table.min.js.map
\ No newline at end of file
diff --git a/turtles/app/lib/promise-tracker.js b/turtles/app/lib/promise-tracker.js
new file mode 100644
index 000000000..c3e2fc616
--- /dev/null
+++ b/turtles/app/lib/promise-tracker.js
@@ -0,0 +1,134 @@
+/*
+ * promise-tracker - v2.1.0 - 2014-11-15
+ * http://github.com/ajoslin/angular-promise-tracker
+ * Created by Andy Joslin; Licensed under Public Domain
+ */
+
+(function() {
+
+angular.module('ajoslin.promise-tracker', [])
+
+.provider('promiseTracker', function() {
+  var trackers = {};
+
+  this.$get = ['$q', '$timeout', function($q, $timeout) {
+    function cancelTimeout(promise) {
+      if (promise) {
+        $timeout.cancel(promise);
+      }
+    }
+
+    return function PromiseTracker(options) {
+      //do new if user doesn't
+      if (!(this instanceof PromiseTracker)) {
+        return new PromiseTracker(options);
+      }
+
+      options = options || {};
+
+      //Array of promises being tracked
+      var tracked = [];
+      var self = this;
+
+      //Allow an optional "minimum duration" that the tracker has to stay active for.
+      var minDuration = options.minDuration;
+      //Allow a delay that will stop the tracker from activating until that time is reached
+      var activationDelay = options.activationDelay;
+
+      var minDurationPromise;
+      var activationDelayPromise;
+
+      self.active = function() {
+        //Even if we have a promise in our tracker, we aren't active until delay is elapsed
+        if (activationDelayPromise) {
+          return false;
+        }
+        return tracked.length > 0;
+      };
+
+      self.tracking = function() {
+        //Even if we aren't active, we could still have a promise in our tracker
+        return tracked.length > 0;
+      };
+
+      self.destroy = self.cancel = function() {
+        minDurationPromise = cancelTimeout(minDurationPromise);
+        activationDelayPromise = cancelTimeout(activationDelayPromise);
+        for (var i=tracked.length-1; i>=0; i--) {
+          tracked[i].resolve();
+        }
+        tracked.length = 0;
+      };
+
+      //Create a promise that will make our tracker active until it is resolved.
+      // @return deferred - our deferred object that is being tracked
+      self.createPromise = function() {
+        var deferred = $q.defer();
+        tracked.push(deferred);
+
+        //If the tracker was just inactive and this the first in the list of
+        //promises, we reset our delay and minDuration
+        //again.
+        if (tracked.length === 1) {
+          if (activationDelay) {
+            activationDelayPromise = $timeout(function() {
+              activationDelayPromise = cancelTimeout(activationDelayPromise);
+              startMinDuration();
+            }, activationDelay);
+          } else {
+            startMinDuration();
+          }
+        }
+
+        deferred.promise.then(onDone(false), onDone(true));
+
+        return deferred;
+
+        function startMinDuration() {
+          if (minDuration) {
+            minDurationPromise = $timeout(angular.noop, minDuration);
+          }
+        }
+
+        //Create a callback for when this promise is done. It will remove our
+        //tracked promise from the array if once minDuration is complete
+        function onDone(isError) {
+          return function(value) {
+            (minDurationPromise || $q.when()).then(function() {
+              var index = tracked.indexOf(deferred);
+              tracked.splice(index, 1);
+
+              //If this is the last promise, cleanup the timeouts
+              //for activationDelay
+              if (tracked.length === 0) {
+                activationDelayPromise = cancelTimeout(activationDelayPromise);
+              }
+            });
+          };
+        }
+      };
+
+      self.addPromise = function(promise) {
+        promise = promise && (promise.$promise || promise) || {};
+        if (!promise.then) {
+          throw new Error("promiseTracker#addPromise expects a promise object!");
+        }
+        var deferred = self.createPromise();
+
+        //When given promise is done, resolve our created promise
+        //Allow $then for angular-resource objects
+        promise.then(function success(value) {
+          deferred.resolve(value);
+          return value;
+        }, function error(value) {
+          deferred.reject(value);
+          return $q.reject(value);
+        });
+
+        return deferred;
+      };
+    };
+  }];
+});
+
+}());
\ No newline at end of file
diff --git a/turtles/app/lib/ui-bootstrap-tpls-0.13.0.min.js b/turtles/app/lib/ui-bootstrap-tpls-0.13.0.min.js
new file mode 100644
index 000000000..6d2486283
--- /dev/null
+++ b/turtles/app/lib/ui-bootstrap-tpls-0.13.0.min.js
@@ -0,0 +1,10 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 0.13.0 - 2015-05-02
+ * License: MIT
+ */
+angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.bindHtml","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.dropdown","ui.bootstrap.modal","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.transition","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/carousel/carousel.html","template/carousel/slide.html","template/datepicker/datepicker.html","template/datepicker/day.html","template/datepicker/month.html","template/datepicker/popup.html","template/datepicker/year.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-popup.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/tooltip/tooltip-template-popup.html","template/popover/popover-template.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/timepicker/timepicker.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]),angular.module("ui.bootstrap.collapse",[]).directive("collapse",["$animate",function(a){return{link:function(b,c,d){function e(){c.removeClass("collapse").addClass("collapsing"),a.addClass(c,"in",{to:{height:c[0].scrollHeight+"px"}}).then(f)}function f(){c.removeClass("collapsing"),c.css({height:"auto"})}function g(){c.css({height:c[0].scrollHeight+"px"}).removeClass("collapse").addClass("collapsing"),a.removeClass(c,"in",{to:{height:"0"}}).then(h)}function h(){c.css({height:"0"}),c.removeClass("collapsing"),c.addClass("collapse")}b.$watch(d.collapse,function(a){a?g():e()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",function(){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.$watch("isOpen",function(b){b&&d.closeOthers(a)}),a.toggleOpen=function(){a.isDisabled||(a.isOpen=!a.isOpen)}}}}).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,angular.noop))}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b,this.close=a.close}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}).directive("dismissOnTimeout",["$timeout",function(a){return{require:"alert",link:function(b,c,d,e){a(function(){e.close()},parseInt(d.dismissOnTimeout,10))}}}]),angular.module("ui.bootstrap.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("ui.bootstrap.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){var d=b.hasClass(e.activeClass);(!d||angular.isDefined(c.uncheckable))&&a.$apply(function(){f.$setViewValue(d?null:a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",[]).controller("CarouselController",["$scope","$interval","$animate",function(a,b,c){function d(a){if(angular.isUndefined(k[a].index))return k[a];{var b;k.length}for(b=0;b<k.length;++b)if(k[b].index==a)return k[b]}function e(){f();var c=+a.interval;!isNaN(c)&&c>0&&(h=b(g,c))}function f(){h&&(b.cancel(h),h=null)}function g(){var b=+a.interval;i&&!isNaN(b)&&b>0?a.next():a.pause()}var h,i,j=this,k=j.slides=a.slides=[],l=-1;j.currentSlide=null;var m=!1;j.select=a.select=function(b,d){function f(){m||(angular.extend(b,{direction:d,active:!0}),angular.extend(j.currentSlide||{},{direction:d,active:!1}),c.enabled()&&!a.noTransition&&b.$element&&(a.$currentTransition=!0,b.$element.one("$animate:close",function(){a.$currentTransition=null})),j.currentSlide=b,l=g,e())}var g=j.indexOfSlide(b);void 0===d&&(d=g>j.getCurrentIndex()?"next":"prev"),b&&b!==j.currentSlide&&f()},a.$on("$destroy",function(){m=!0}),j.getCurrentIndex=function(){return j.currentSlide&&angular.isDefined(j.currentSlide.index)?+j.currentSlide.index:l},j.indexOfSlide=function(a){return angular.isDefined(a.index)?+a.index:k.indexOf(a)},a.next=function(){var b=(j.getCurrentIndex()+1)%k.length;return a.$currentTransition?void 0:j.select(d(b),"next")},a.prev=function(){var b=j.getCurrentIndex()-1<0?k.length-1:j.getCurrentIndex()-1;return a.$currentTransition?void 0:j.select(d(b),"prev")},a.isActive=function(a){return j.currentSlide===a},a.$watch("interval",e),a.$on("$destroy",f),a.play=function(){i||(i=!0,e())},a.pause=function(){a.noPause||(i=!1,f())},j.addSlide=function(b,c){b.$element=c,k.push(b),1===k.length||b.active?(j.select(k[k.length-1]),1==k.length&&a.play()):b.active=!1},j.removeSlide=function(a){angular.isDefined(a.index)&&k.sort(function(a,b){return+a.index>+b.index});var b=k.indexOf(a);k.splice(b,1),k.length>0&&a.active?j.select(b>=k.length?k[b-1]:k[b]):l>b&&l--}}]).directive("carousel",[function(){return{restrict:"EA",transclude:!0,replace:!0,controller:"CarouselController",require:"carousel",templateUrl:"template/carousel/carousel.html",scope:{interval:"=",noTransition:"=",noPause:"="}}}]).directive("slide",function(){return{require:"^carousel",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/carousel/slide.html",scope:{active:"=?",index:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}).animation(".item",["$animate",function(a){return{beforeAddClass:function(b,c,d){if("active"==c&&b.parent()&&!b.parent().scope().noTransition){var e=!1,f=b.isolateScope().direction,g="next"==f?"left":"right";return b.addClass(f),a.addClass(b,g).then(function(){e||b.removeClass(g+" "+f),d()}),function(){e=!0}}d()},beforeRemoveClass:function(b,c,d){if("active"==c&&b.parent()&&!b.parent().scope().noTransition){var e=!1,f=b.isolateScope().direction,g="next"==f?"left":"right";return a.addClass(b,g).then(function(){e||b.removeClass(g),d()}),function(){e=!0}}d()}}}]),angular.module("ui.bootstrap.dateparser",[]).service("dateParser",["$locale","orderByFilter",function(a,b){function c(a){var c=[],d=a.split("");return angular.forEach(f,function(b,e){var f=a.indexOf(e);if(f>-1){a=a.split(""),d[f]="("+b.regex+")",a[f]="$";for(var g=f+1,h=f+e.length;h>g;g++)d[g]="",a[g]="$";a=a.join(""),c.push({index:f,apply:b.apply})}}),{regex:new RegExp("^"+d.join("")+"$"),map:b(c,"index")}}function d(a,b,c){return 1>c?!1:1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}var e=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;this.parsers={};var f={yyyy:{regex:"\\d{4}",apply:function(a){this.year=+a}},yy:{regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},y:{regex:"\\d{1,4}",apply:function(a){this.year=+a}},MMMM:{regex:a.DATETIME_FORMATS.MONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.MONTH.indexOf(b)}},MMM:{regex:a.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(b){this.month=a.DATETIME_FORMATS.SHORTMONTH.indexOf(b)}},MM:{regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},M:{regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},dd:{regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},d:{regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},EEEE:{regex:a.DATETIME_FORMATS.DAY.join("|")},EEE:{regex:a.DATETIME_FORMATS.SHORTDAY.join("|")},HH:{regex:"(?:0|1)[0-9]|2[0-3]",apply:function(a){this.hours=+a}},H:{regex:"1?[0-9]|2[0-3]",apply:function(a){this.hours=+a}},mm:{regex:"[0-5][0-9]",apply:function(a){this.minutes=+a}},m:{regex:"[0-9]|[1-5][0-9]",apply:function(a){this.minutes=+a}},sss:{regex:"[0-9][0-9][0-9]",apply:function(a){this.milliseconds=+a}},ss:{regex:"[0-5][0-9]",apply:function(a){this.seconds=+a}},s:{regex:"[0-9]|[1-5][0-9]",apply:function(a){this.seconds=+a}}};this.parse=function(b,f,g){if(!angular.isString(b)||!f)return b;f=a.DATETIME_FORMATS[f]||f,f=f.replace(e,"\\$&"),this.parsers[f]||(this.parsers[f]=c(f));var h=this.parsers[f],i=h.regex,j=h.map,k=b.match(i);if(k&&k.length){var l,m;l=g?{year:g.getFullYear(),month:g.getMonth(),date:g.getDate(),hours:g.getHours(),minutes:g.getMinutes(),seconds:g.getSeconds(),milliseconds:g.getMilliseconds()}:{year:1900,month:0,date:1,hours:0,minutes:0,seconds:0,milliseconds:0};for(var n=1,o=k.length;o>n;n++){var p=j[n-1];p.apply&&p.apply.call(l,k[n])}return d(l.year,l.month,l.date)&&(m=new Date(l.year,l.month,l.date,l.hours,l.minutes,l.seconds,l.milliseconds||0)),m}}}]),angular.module("ui.bootstrap.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].documentElement.scrollLeft)}},positionElements:function(a,b,c,d){var e,f,g,h,i=c.split("-"),j=i[0],k=i[1]||"center";e=d?this.offset(a):this.position(a),f=b.prop("offsetWidth"),g=b.prop("offsetHeight");var l={center:function(){return e.left+e.width/2-f/2},left:function(){return e.left},right:function(){return e.left+e.width}},m={center:function(){return e.top+e.height/2-g/2},top:function(){return e.top},bottom:function(){return e.top+e.height}};switch(j){case"right":h={top:m[k](),left:l[j]()};break;case"left":h={top:m[k](),left:e.left-f};break;case"bottom":h={top:m[j](),left:l[k]()};break;default:h={top:e.top-g,left:l[k]()}}return h}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.position"]).constant("datepickerConfig",{formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",datepickerMode:"day",minMode:"day",maxMode:"year",showWeeks:!0,startingDay:0,yearRange:20,minDate:null,maxDate:null,shortcutPropagation:!1}).controller("DatepickerController",["$scope","$attrs","$parse","$interpolate","$timeout","$log","dateFilter","datepickerConfig",function(a,b,c,d,e,f,g,h){var i=this,j={$setViewValue:angular.noop};this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","minMode","maxMode","showWeeks","startingDay","yearRange","shortcutPropagation"],function(c,e){i[c]=angular.isDefined(b[c])?8>e?d(b[c])(a.$parent):a.$parent.$eval(b[c]):h[c]}),angular.forEach(["minDate","maxDate"],function(d){b[d]?a.$parent.$watch(c(b[d]),function(a){i[d]=a?new Date(a):null,i.refreshView()}):i[d]=h[d]?new Date(h[d]):null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.maxMode=i.maxMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),angular.isDefined(b.initDate)?(this.activeDate=a.$parent.$eval(b.initDate)||new Date,a.$parent.$watch(b.initDate,function(a){a&&(j.$isEmpty(j.$modelValue)||j.$invalid)&&(i.activeDate=a,i.refreshView())})):this.activeDate=new Date,a.isActive=function(b){return 0===i.compare(b.date,i.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){j=a,j.$render=function(){i.render()}},this.render=function(){if(j.$viewValue){var a=new Date(j.$viewValue),b=!isNaN(a);b?this.activeDate=a:f.error('Datepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.'),j.$setValidity("date",b)}this.refreshView()},this.refreshView=function(){if(this.element){this._refreshView();var a=j.$viewValue?new Date(j.$viewValue):null;j.$setValidity("date-disabled",!a||this.element&&!this.isDisabled(a))}},this.createDateObject=function(a,b){var c=j.$viewValue?new Date(j.$viewValue):null;return{date:a,label:g(a,b),selected:c&&0===this.compare(a,c),disabled:this.isDisabled(a),current:0===this.compare(a,new Date),customClass:this.customClass(a)}},this.isDisabled=function(c){return this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.customClass=function(b){return a.customClass({date:b,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===i.minMode){var c=j.$viewValue?new Date(j.$viewValue):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),j.$setViewValue(c),j.$render()}else i.activeDate=b,a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=i.activeDate.getFullYear()+a*(i.step.years||0),c=i.activeDate.getMonth()+a*(i.step.months||0);i.activeDate.setFullYear(b,c,1),i.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===i.maxMode&&1===b||a.datepickerMode===i.minMode&&-1===b||(a.datepickerMode=i.modes[i.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var k=function(){e(function(){i.element[0].focus()},0,!1)};a.$on("datepicker.focus",k),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey)if(b.preventDefault(),i.shortcutPropagation||b.stopPropagation(),"enter"===c||"space"===c){if(i.isDisabled(i.activeDate))return;a.select(i.activeDate),k()}else!b.ctrlKey||"up"!==c&&"down"!==c?(i.handleKeyDown(c,b),i.refreshView()):(a.toggleMode("up"===c?1:-1),k())}}]).directive("datepicker",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/datepicker.html",scope:{datepickerMode:"=?",dateDisabled:"&",customClass:"&",shortcutPropagation:"&?"},require:["datepicker","?^ngModel"],controller:"DatepickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f)}}}).directive("daypicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/day.html",require:"^datepicker",link:function(b,c,d,e){function f(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?i[b]:29}function g(a,b){var c=new Array(b),d=new Date(a),e=0;for(d.setHours(12);b>e;)c[e++]=new Date(d),d.setDate(d.getDate()+1);return c}function h(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}b.showWeeks=e.showWeeks,e.step={months:1},e.element=c;var i=[31,28,31,30,31,30,31,31,30,31,30,31];e._refreshView=function(){var c=e.activeDate.getFullYear(),d=e.activeDate.getMonth(),f=new Date(c,d,1),i=e.startingDay-f.getDay(),j=i>0?7-i:-i,k=new Date(f);j>0&&k.setDate(-j+1);for(var l=g(k,42),m=0;42>m;m++)l[m]=angular.extend(e.createDateObject(l[m],e.formatDay),{secondary:l[m].getMonth()!==d,uid:b.uniqueId+"-"+m});b.labels=new Array(7);for(var n=0;7>n;n++)b.labels[n]={abbr:a(l[n].date,e.formatDayHeader),full:a(l[n].date,"EEEE")};if(b.title=a(e.activeDate,e.formatDayTitle),b.rows=e.split(l,7),b.showWeeks){b.weekNumbers=[];for(var o=(11-e.startingDay)%7,p=b.rows.length,q=0;p>q;q++)b.weekNumbers.push(h(b.rows[q][o].date))}},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},e.handleKeyDown=function(a){var b=e.activeDate.getDate();if("left"===a)b-=1;else if("up"===a)b-=7;else if("right"===a)b+=1;else if("down"===a)b+=7;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getMonth()+("pageup"===a?-1:1);e.activeDate.setMonth(c,1),b=Math.min(f(e.activeDate.getFullYear(),e.activeDate.getMonth()),b)}else"home"===a?b=1:"end"===a&&(b=f(e.activeDate.getFullYear(),e.activeDate.getMonth()));e.activeDate.setDate(b)},e.refreshView()}}}]).directive("monthpicker",["dateFilter",function(a){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/month.html",require:"^datepicker",link:function(b,c,d,e){e.step={years:1},e.element=c,e._refreshView=function(){for(var c=new Array(12),d=e.activeDate.getFullYear(),f=0;12>f;f++)c[f]=angular.extend(e.createDateObject(new Date(d,f,1),e.formatMonth),{uid:b.uniqueId+"-"+f});b.title=a(e.activeDate,e.formatMonthTitle),b.rows=e.split(c,3)},e.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth())-new Date(b.getFullYear(),b.getMonth())},e.handleKeyDown=function(a){var b=e.activeDate.getMonth();if("left"===a)b-=1;else if("up"===a)b-=3;else if("right"===a)b+=1;else if("down"===a)b+=3;else if("pageup"===a||"pagedown"===a){var c=e.activeDate.getFullYear()+("pageup"===a?-1:1);e.activeDate.setFullYear(c)}else"home"===a?b=0:"end"===a&&(b=11);e.activeDate.setMonth(b)},e.refreshView()}}}]).directive("yearpicker",["dateFilter",function(){return{restrict:"EA",replace:!0,templateUrl:"template/datepicker/year.html",require:"^datepicker",link:function(a,b,c,d){function e(a){return parseInt((a-1)/f,10)*f+1}var f=d.yearRange;d.step={years:f},d.element=b,d._refreshView=function(){for(var b=new Array(f),c=0,g=e(d.activeDate.getFullYear());f>c;c++)b[c]=angular.extend(d.createDateObject(new Date(g+c,0,1),d.formatYear),{uid:a.uniqueId+"-"+c});a.title=[b[0].label,b[f-1].label].join(" - "),a.rows=d.split(b,5)},d.compare=function(a,b){return a.getFullYear()-b.getFullYear()},d.handleKeyDown=function(a){var b=d.activeDate.getFullYear();"left"===a?b-=1:"up"===a?b-=5:"right"===a?b+=1:"down"===a?b+=5:"pageup"===a||"pagedown"===a?b+=("pageup"===a?-1:1)*d.step.years:"home"===a?b=e(d.activeDate.getFullYear()):"end"===a&&(b=e(d.activeDate.getFullYear())+f-1),d.activeDate.setFullYear(b)},d.refreshView()}}}]).constant("datepickerPopupConfig",{datepickerPopup:"yyyy-MM-dd",html5Types:{date:"yyyy-MM-dd","datetime-local":"yyyy-MM-ddTHH:mm:ss.sss",month:"yyyy-MM"},currentText:"Today",clearText:"Clear",closeText:"Done",closeOnDateSelection:!0,appendToBody:!1,showButtonBar:!0}).directive("datepickerPopup",["$compile","$parse","$document","$position","dateFilter","dateParser","datepickerPopupConfig",function(a,b,c,d,e,f,g){return{restrict:"EA",require:"ngModel",scope:{isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&",customClass:"&"},link:function(h,i,j,k){function l(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function m(a){if(angular.isNumber(a)&&(a=new Date(a)),a){if(angular.isDate(a)&&!isNaN(a))return a;if(angular.isString(a)){var b=f.parse(a,o,h.date)||new Date(a);return isNaN(b)?void 0:b}return void 0}return null}function n(a,b){var c=a||b;if(angular.isNumber(c)&&(c=new Date(c)),c){if(angular.isDate(c)&&!isNaN(c))return!0;if(angular.isString(c)){var d=f.parse(c,o)||new Date(c);return!isNaN(d)}return!1}return!0}var o,p=angular.isDefined(j.closeOnDateSelection)?h.$parent.$eval(j.closeOnDateSelection):g.closeOnDateSelection,q=angular.isDefined(j.datepickerAppendToBody)?h.$parent.$eval(j.datepickerAppendToBody):g.appendToBody;h.showButtonBar=angular.isDefined(j.showButtonBar)?h.$parent.$eval(j.showButtonBar):g.showButtonBar,h.getText=function(a){return h[a+"Text"]||g[a+"Text"]};var r=!1;if(g.html5Types[j.type]?(o=g.html5Types[j.type],r=!0):(o=j.datepickerPopup||g.datepickerPopup,j.$observe("datepickerPopup",function(a){var b=a||g.datepickerPopup;if(b!==o&&(o=b,k.$modelValue=null,!o))throw new Error("datepickerPopup must have a date format specified.")})),!o)throw new Error("datepickerPopup must have a date format specified.");if(r&&j.datepickerPopup)throw new Error("HTML5 date input types do not support custom formats.");var s=angular.element("<div datepicker-popup-wrap><div datepicker></div></div>");s.attr({"ng-model":"date","ng-change":"dateSelection()"});var t=angular.element(s.children()[0]);if(r&&"month"==j.type&&(t.attr("datepicker-mode",'"month"'),t.attr("min-mode","month")),j.datepickerOptions){var u=h.$parent.$eval(j.datepickerOptions);u.initDate&&(h.initDate=u.initDate,t.attr("init-date","initDate"),delete u.initDate),angular.forEach(u,function(a,b){t.attr(l(b),a)})}h.watchData={},angular.forEach(["minDate","maxDate","datepickerMode","initDate","shortcutPropagation"],function(a){if(j[a]){var c=b(j[a]);if(h.$parent.$watch(c,function(b){h.watchData[a]=b}),t.attr(l(a),"watchData."+a),"datepickerMode"===a){var d=c.assign;h.$watch("watchData."+a,function(a,b){a!==b&&d(h.$parent,a)})}}}),j.dateDisabled&&t.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),j.showWeeks&&t.attr("show-weeks",j.showWeeks),j.customClass&&t.attr("custom-class","customClass({ date: date, mode: mode })"),r?k.$formatters.push(function(a){return h.date=a,a}):(k.$$parserName="date",k.$validators.date=n,k.$parsers.unshift(m),k.$formatters.push(function(a){return h.date=a,k.$isEmpty(a)?a:e(a,o)})),h.dateSelection=function(a){angular.isDefined(a)&&(h.date=a);var b=h.date?e(h.date,o):"";i.val(b),k.$setViewValue(b),p&&(h.isOpen=!1,i[0].focus())},k.$viewChangeListeners.push(function(){h.date=f.parse(k.$viewValue,o,h.date)||new Date(k.$viewValue)});var v=function(a){h.isOpen&&a.target!==i[0]&&h.$apply(function(){h.isOpen=!1})},w=function(a){h.keydown(a)};i.bind("keydown",w),h.keydown=function(a){27===a.which?(a.preventDefault(),h.isOpen&&a.stopPropagation(),h.close()):40!==a.which||h.isOpen||(h.isOpen=!0)},h.$watch("isOpen",function(a){a?(h.$broadcast("datepicker.focus"),h.position=q?d.offset(i):d.position(i),h.position.top=h.position.top+i.prop("offsetHeight"),c.bind("click",v)):c.unbind("click",v)}),h.select=function(a){if("today"===a){var b=new Date;angular.isDate(h.date)?(a=new Date(h.date),a.setFullYear(b.getFullYear(),b.getMonth(),b.getDate())):a=new Date(b.setHours(0,0,0,0))}h.dateSelection(a)},h.close=function(){h.isOpen=!1,i[0].focus()};var x=a(s)(h);s.remove(),q?c.find("body").append(x):i.after(x),h.$on("$destroy",function(){x.remove(),i.unbind("keydown",w),c.unbind("click",v)})}}}]).directive("datepickerPopupWrap",function(){return{restrict:"EA",replace:!0,transclude:!0,templateUrl:"template/datepicker/popup.html",link:function(a,b){b.bind("click",function(a){a.preventDefault(),a.stopPropagation()})}}}),angular.module("ui.bootstrap.dropdown",["ui.bootstrap.position"]).constant("dropdownConfig",{openClass:"open"}).service("dropdownService",["$document","$rootScope",function(a,b){var c=null;this.open=function(b){c||(a.bind("click",d),a.bind("keydown",e)),c&&c!==b&&(c.isOpen=!1),c=b},this.close=function(b){c===b&&(c=null,a.unbind("click",d),a.unbind("keydown",e))};var d=function(a){if(c&&(!a||"disabled"!==c.getAutoClose())){var d=c.getToggleElement();if(!(a&&d&&d[0].contains(a.target))){var e=c.getElement();a&&"outsideClick"===c.getAutoClose()&&e&&e[0].contains(a.target)||(c.isOpen=!1,b.$$phase||c.$apply())}}},e=function(a){27===a.which&&(c.focusToggleElement(),d())}}]).controller("DropdownController",["$scope","$attrs","$parse","dropdownConfig","dropdownService","$animate","$position","$document",function(a,b,c,d,e,f,g,h){var i,j=this,k=a.$new(),l=d.openClass,m=angular.noop,n=b.onToggle?c(b.onToggle):angular.noop,o=!1;this.init=function(d){j.$element=d,b.isOpen&&(i=c(b.isOpen),m=i.assign,a.$watch(i,function(a){k.isOpen=!!a})),o=angular.isDefined(b.dropdownAppendToBody),o&&j.dropdownMenu&&(h.find("body").append(j.dropdownMenu),d.on("$destroy",function(){j.dropdownMenu.remove()}))},this.toggle=function(a){return k.isOpen=arguments.length?!!a:!k.isOpen},this.isOpen=function(){return k.isOpen},k.getToggleElement=function(){return j.toggleElement},k.getAutoClose=function(){return b.autoClose||"always"},k.getElement=function(){return j.$element},k.focusToggleElement=function(){j.toggleElement&&j.toggleElement[0].focus()},k.$watch("isOpen",function(b,c){if(o&&j.dropdownMenu){var d=g.positionElements(j.$element,j.dropdownMenu,"bottom-left",!0);j.dropdownMenu.css({top:d.top+"px",left:d.left+"px",display:b?"block":"none"})}f[b?"addClass":"removeClass"](j.$element,l),b?(k.focusToggleElement(),e.open(k)):e.close(k),m(a,b),angular.isDefined(b)&&b!==c&&n(a,{open:!!b})}),a.$on("$locationChangeSuccess",function(){k.isOpen=!1}),a.$on("$destroy",function(){k.$destroy()})}]).directive("dropdown",function(){return{controller:"DropdownController",link:function(a,b,c,d){d.init(b)}}}).directive("dropdownMenu",function(){return{restrict:"AC",require:"?^dropdown",link:function(a,b,c,d){d&&(d.dropdownMenu=b)}}}).directive("dropdownToggle",function(){return{require:"?^dropdown",link:function(a,b,c,d){if(d){d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.modal",[]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$timeout",function(a){function b(b){b.animate=!1,a(function(){b.animate=!0})}return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",compile:function(a,c){return a.addClass(c.backdropClass),b}}}]).directive("modalWindow",["$modalStack","$q",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"template/modal/window.html"},link:function(c,d,e){d.addClass(e.windowClass||""),c.size=e.size,c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))},c.$isRendered=!0;var f=b.defer();e.$observe("modalRender",function(a){"true"==a&&f.resolve()}),f.promise.then(function(){c.animate=!0;var b=d[0].querySelectorAll("[autofocus]");b.length?b[0].focus():d[0].focus();var e=a.getTop();e&&a.modalRendered(e.key)})}}}]).directive("modalAnimationClass",[function(){return{compile:function(a,b){b.modalAnimation&&a.addClass(b.modalAnimationClass)}}}]).directive("modalTransclude",function(){return{link:function(a,b,c,d,e){e(a.$parent,function(a){b.empty(),b.append(a)})}}}).factory("$modalStack",["$animate","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=o.keys(),c=0;c<b.length;c++)o.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("body").eq(0),d=o.get(a).value;o.remove(a),j(d.modalDomEl,d.modalScope,function(){b.toggleClass(n,o.length()>0),i()})}function i(){if(l&&-1==g()){var a=m;j(l,m,function(){a=null}),l=void 0,m=void 0}}function j(c,d,f){function g(){g.done||(g.done=!0,c.remove(),d.$destroy(),f&&f())}d.animate=!1,c.attr("modal-animation")&&a.enabled()?c.one("$animate:close",function(){e.$evalAsync(g)}):b(g)}function k(a,b,c){return!a.value.modalScope.$broadcast("modal.closing",b,c).defaultPrevented}var l,m,n="modal-open",o=f.createNew(),p={};return e.$watch(g,function(a){m&&(m.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=o.top(),b&&b.value.keyboard&&(a.preventDefault(),e.$apply(function(){p.dismiss(b.key,"escape key press")})))}),p.open=function(a,b){var f=c[0].activeElement;o.add(a,{deferred:b.deferred,renderDeferred:b.renderDeferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var h=c.find("body").eq(0),i=g();if(i>=0&&!l){m=e.$new(!0),m.index=i;var j=angular.element('<div modal-backdrop="modal-backdrop"></div>');j.attr("backdrop-class",b.backdropClass),b.animation&&j.attr("modal-animation","true"),l=d(j)(m),h.append(l)}var k=angular.element('<div modal-window="modal-window"></div>');k.attr({"template-url":b.windowTemplateUrl,"window-class":b.windowClass,size:b.size,index:o.length()-1,animate:"animate"}).html(b.content),b.animation&&k.attr("modal-animation","true");var p=d(k)(b.scope);o.top().value.modalDomEl=p,o.top().value.modalOpener=f,h.append(p),h.addClass(n)},p.close=function(a,b){var c=o.get(a);return c&&k(c,b,!0)?(c.value.deferred.resolve(b),h(a),c.value.modalOpener.focus(),!0):!c},p.dismiss=function(a,b){var c=o.get(a);return c&&k(c,b,!1)?(c.value.deferred.reject(b),h(a),c.value.modalOpener.focus(),!0):!c},p.dismissAll=function(a){for(var b=this.getTop();b&&this.dismiss(b.key,a);)b=this.getTop()},p.getTop=function(){return o.top()},p.modalRendered=function(a){var b=o.get(a);b&&b.value.renderDeferred.resolve()},p}]).provider("$modal",function(){var a={options:{animation:!0,backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$templateRequest","$controller","$modalStack",function(b,c,d,e,f,g){function h(a){return a.template?d.when(a.template):e(angular.isFunction(a.templateUrl)?a.templateUrl():a.templateUrl)}function i(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))
+}),c}var j={};return j.open=function(b){var e=d.defer(),j=d.defer(),k=d.defer(),l={result:e.promise,opened:j.promise,rendered:k.promise,close:function(a){return g.close(l,a)},dismiss:function(a){return g.dismiss(l,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var m=d.all([h(b)].concat(i(b.resolve)));return m.then(function(a){var d=(b.scope||c).$new();d.$close=l.close,d.$dismiss=l.dismiss;var h,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=l,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),h=f(b.controller,i),b.controllerAs&&(d[b.controllerAs]=h)),g.open(l,{scope:d,deferred:e,renderDeferred:k,content:a[0],animation:b.animation,backdrop:b.backdrop,keyboard:b.keyboard,backdropClass:b.backdropClass,windowClass:b.windowClass,windowTemplateUrl:b.windowTemplateUrl,size:b.size})},function(a){e.reject(a)}),m.then(function(){j.resolve(!0)},function(a){j.reject(a)}),l},j}]};return a}),angular.module("ui.bootstrap.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse",function(a,b,c){var d=this,e={$setViewValue:angular.noop},f=b.numPages?c(b.numPages).assign:angular.noop;this.init=function(g,h){e=g,this.config=h,e.$render=function(){d.render()},b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){d.itemsPerPage=parseInt(b,10),a.totalPages=d.calculateTotalPages()}):this.itemsPerPage=h.itemsPerPage,a.$watch("totalItems",function(){a.totalPages=d.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),a.page>b?a.selectPage(b):e.$render()})},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.render=function(){a.page=parseInt(e.$viewValue,10)||1},a.selectPage=function(b,c){a.page!==b&&b>0&&b<=a.totalPages&&(c&&c.target&&c.target.blur(),e.$setViewValue(b),e.$render())},a.getText=function(b){return a[b+"Text"]||d.config[b+"Text"]},a.noPrevious=function(){return 1===a.page},a.noNext=function(){return a.page===a.totalPages}}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@"},require:["pagination","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c){return{number:a,text:b,active:c}}function h(a,b){var c=[],d=1,e=b,f=angular.isDefined(k)&&b>k;f&&(l?(d=Math.max(a-Math.floor(k/2),1),e=d+k-1,e>b&&(e=b,d=e-k+1)):(d=(Math.ceil(a/k)-1)*k+1,e=Math.min(d+k-1,b)));for(var h=d;e>=h;h++){var i=g(h,h,h===a);c.push(i)}if(f&&!l){if(d>1){var j=g(d-1,"...",!1);c.unshift(j)}if(b>e){var m=g(e+1,"...",!1);c.push(m)}}return c}var i=f[0],j=f[1];if(j){var k=angular.isDefined(e.maxSize)?c.$parent.$eval(e.maxSize):b.maxSize,l=angular.isDefined(e.rotate)?c.$parent.$eval(e.rotate):b.rotate;c.boundaryLinks=angular.isDefined(e.boundaryLinks)?c.$parent.$eval(e.boundaryLinks):b.boundaryLinks,c.directionLinks=angular.isDefined(e.directionLinks)?c.$parent.$eval(e.directionLinks):b.directionLinks,i.init(j,b),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){k=parseInt(a,10),i.render()});var m=i.render;i.render=function(){m(),c.page>0&&c.page<=c.totalPages&&(c.pages=h(c.page,c.totalPages))}}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{totalItems:"=",previousText:"@",nextText:"@"},require:["pager","?ngModel"],controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&(b.align=angular.isDefined(d.align)?b.$parent.$eval(d.align):a.align,f.init(g,a))}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0,useContentExp:!1},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$document","$position","$interpolate",function(e,f,g,h,i,j){return function(e,k,l,m){function n(a){var b=a||m.trigger||l,d=c[b]||b;return{show:b,hide:d}}m=angular.extend({},b,d,m);var o=a(e),p=j.startSymbol(),q=j.endSymbol(),r="<div "+o+'-popup title="'+p+"title"+q+'" '+(m.useContentExp?'content-exp="contentExp()" ':'content="'+p+"content"+q+'" ')+'placement="'+p+"placement"+q+'" popup-class="'+p+"popupClass"+q+'" animation="animation" is-open="isOpen"origin-scope="origScope" ></div>';return{restrict:"EA",compile:function(){var a=f(r);return function(b,c,d){function f(){E.isOpen?l():j()}function j(){(!D||b.$eval(d[k+"Enable"]))&&(s(),E.popupDelay?A||(A=g(o,E.popupDelay,!1),A.then(function(a){a()})):o()())}function l(){b.$apply(function(){p()})}function o(){return A=null,z&&(g.cancel(z),z=null),(m.useContentExp?E.contentExp():E.content)?(q(),x.css({top:0,left:0,display:"block"}),E.$digest(),F(),E.isOpen=!0,E.$apply(),F):angular.noop}function p(){E.isOpen=!1,g.cancel(A),A=null,E.animation?z||(z=g(r,500)):r()}function q(){x&&r(),y=E.$new(),x=a(y,function(a){B?h.find("body").append(a):c.after(a)}),y.$watch(function(){g(F,0,!1)}),m.useContentExp&&y.$watch("contentExp()",function(a){!a&&E.isOpen&&p()})}function r(){z=null,x&&(x.remove(),x=null),y&&(y.$destroy(),y=null)}function s(){t(),u(),v()}function t(){E.popupClass=d[k+"Class"]}function u(){var a=d[k+"Placement"];E.placement=angular.isDefined(a)?a:m.placement}function v(){var a=d[k+"PopupDelay"],b=parseInt(a,10);E.popupDelay=isNaN(b)?m.popupDelay:b}function w(){var a=d[k+"Trigger"];G(),C=n(a),C.show===C.hide?c.bind(C.show,f):(c.bind(C.show,j),c.bind(C.hide,l))}var x,y,z,A,B=angular.isDefined(m.appendToBody)?m.appendToBody:!1,C=n(void 0),D=angular.isDefined(d[k+"Enable"]),E=b.$new(!0),F=function(){if(x){var a=i.positionElements(c,x,E.placement,B);a.top+="px",a.left+="px",x.css(a)}};E.origScope=b,E.isOpen=!1,E.contentExp=function(){return b.$eval(d[e])},m.useContentExp||d.$observe(e,function(a){E.content=a,!a&&E.isOpen&&p()}),d.$observe("disabled",function(a){a&&E.isOpen&&p()}),d.$observe(k+"Title",function(a){E.title=a});var G=function(){c.unbind(C.show,j),c.unbind(C.hide,l)};w();var H=b.$eval(d[k+"Animation"]);E.animation=angular.isDefined(H)?!!H:m.animation;var I=b.$eval(d[k+"AppendToBody"]);B=angular.isDefined(I)?I:B,B&&b.$on("$locationChangeSuccess",function(){E.isOpen&&p()}),b.$on("$destroy",function(){g.cancel(z),g.cancel(A),G(),r(),E=null})}}}}}]}).directive("tooltipTemplateTransclude",["$animate","$sce","$compile","$templateRequest",function(a,b,c,d){return{link:function(e,f,g){var h,i,j,k=e.$eval(g.tooltipTemplateTranscludeScope),l=0,m=function(){i&&(i.remove(),i=null),h&&(h.$destroy(),h=null),j&&(a.leave(j).then(function(){i=null}),i=j,j=null)};e.$watch(b.parseAsResourceUrl(g.tooltipTemplateTransclude),function(b){var g=++l;b?(d(b,!0).then(function(d){if(g===l){var e=k.$new(),i=d,n=c(i)(e,function(b){m(),a.enter(b,f)});h=e,j=n,h.$emit("$includeContentLoaded",b)}},function(){g===l&&(m(),e.$emit("$includeContentError",b))}),e.$emit("$includeContentRequested",b)):m()}),e.$on("$destroy",m)}}}]).directive("tooltipClasses",function(){return{restrict:"A",link:function(a,b,c){a.placement&&b.addClass(a.placement),a.popupClass&&b.addClass(a.popupClass),a.animation()&&b.addClass(c.tooltipAnimationClass)}}}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipTemplatePopup",function(){return{restrict:"EA",replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"template/tooltip/tooltip-template-popup.html"}}).directive("tooltipTemplate",["$tooltip",function(a){return a("tooltipTemplate","tooltip","mouseenter",{useContentExp:!0})}]).directive("tooltipHtmlPopup",function(){return{restrict:"EA",replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-popup.html"}}).directive("tooltipHtml",["$tooltip",function(a){return a("tooltipHtml","tooltip","mouseenter",{useContentExp:!0})}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).value("tooltipHtmlUnsafeSuppressDeprecated",!1).directive("tooltipHtmlUnsafe",["$tooltip","tooltipHtmlUnsafeSuppressDeprecated","$log",function(a,b,c){return b||c.warn("tooltip-html-unsafe is now deprecated. Use tooltip-html or tooltip-template instead."),a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("popoverTemplatePopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"template/popover/popover-template.html"}}).directive("popoverTemplate",["$tooltip",function(a){return a("popoverTemplate","popover","click",{useContentExp:!0})}]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(a.max)?a.max:c.max,this.addBar=function(b,c){e||c.css({transition:"none"}),this.bars.push(b),b.$watch("value",function(c){b.percent=+(100*c/a.max).toFixed(2)}),b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},templateUrl:"template/progressbar/progress.html"}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",max:"=?",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",max:"=?",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("ui.bootstrap.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","ratingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,d.$formatters.push(function(a){return angular.isNumber(a)&&a<<0!==a&&(a=Math.round(a)),a}),this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(f)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff},a[b]);return a},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("rating",function(){return{restrict:"EA",require:["rating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect())}),a.active=!0,a.onSelect()},b.addTab=function(a){c.push(a),1===c.length&&a.active!==!1?a.active=!0:a.active?b.select(a):a.active=!1},b.removeTab=function(a){var e=c.indexOf(a);if(a.active&&c.length>1&&!d){var f=e==c.length-1?e-1:e+1;b.select(c[f])}c.splice(e,1)};var d;a.$on("$destroy",function(){d=!0})}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{type:"@"},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("tab",["$parse","$log",function(a,b){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(c,d,e){return function(c,d,f,g){c.$watch("active",function(a){a&&g.select(c)}),c.disabled=!1,f.disable&&c.$parent.$watch(a(f.disable),function(a){c.disabled=!!a}),f.disabled&&(b.warn('Use of "disabled" attribute has been deprecated, please use "disable"'),c.$parent.$watch(a(f.disabled),function(a){c.disabled=!!a})),c.select=function(){c.disabled||(c.active=!0)},g.addTab(c),c.$on("$destroy",function(){g.removeTab(c)}),c.$transcludeFn=e}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("timepickerConfig",{hourStep:1,minuteStep:1,showMeridian:!0,meridians:null,readonlyInput:!1,mousewheel:!0,arrowkeys:!0}).controller("TimepickerController",["$scope","$attrs","$parse","$log","$locale","timepickerConfig",function(a,b,c,d,e,f){function g(){var b=parseInt(a.hours,10),c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===p[1]&&(b+=12)),b):void 0}function h(){var b=parseInt(a.minutes,10);return b>=0&&60>b?b:void 0}function i(a){return angular.isDefined(a)&&a.toString().length<2?"0"+a:a.toString()}function j(a){k(),o.$setViewValue(new Date(n)),l(a)}function k(){o.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1}function l(b){var c=n.getHours(),d=n.getMinutes();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:i(c),"m"!==b&&(a.minutes=i(d)),a.meridian=n.getHours()<12?p[0]:p[1]}function m(a){var b=new Date(n.getTime()+6e4*a);n.setHours(b.getHours(),b.getMinutes()),j()}var n=new Date,o={$setViewValue:angular.noop},p=angular.isDefined(b.meridians)?a.$parent.$eval(b.meridians):f.meridians||e.DATETIME_FORMATS.AMPMS;this.init=function(c,d){o=c,o.$render=this.render,o.$formatters.unshift(function(a){return a?new Date(a):null});var e=d.eq(0),g=d.eq(1),h=angular.isDefined(b.mousewheel)?a.$parent.$eval(b.mousewheel):f.mousewheel;h&&this.setupMousewheelEvents(e,g);var i=angular.isDefined(b.arrowkeys)?a.$parent.$eval(b.arrowkeys):f.arrowkeys;i&&this.setupArrowkeyEvents(e,g),a.readonlyInput=angular.isDefined(b.readonlyInput)?a.$parent.$eval(b.readonlyInput):f.readonlyInput,this.setupInputEvents(e,g)};var q=f.hourStep;b.hourStep&&a.$parent.$watch(c(b.hourStep),function(a){q=parseInt(a,10)});var r=f.minuteStep;b.minuteStep&&a.$parent.$watch(c(b.minuteStep),function(a){r=parseInt(a,10)}),a.showMeridian=f.showMeridian,b.showMeridian&&a.$parent.$watch(c(b.showMeridian),function(b){if(a.showMeridian=!!b,o.$error.time){var c=g(),d=h();angular.isDefined(c)&&angular.isDefined(d)&&(n.setHours(c),j())}else l()}),this.setupMousewheelEvents=function(b,c){var d=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){a.$apply(d(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()})},this.setupArrowkeyEvents=function(b,c){b.bind("keydown",function(b){38===b.which?(b.preventDefault(),a.incrementHours(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementHours(),a.$apply())}),c.bind("keydown",function(b){38===b.which?(b.preventDefault(),a.incrementMinutes(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementMinutes(),a.$apply())})},this.setupInputEvents=function(b,c){if(a.readonlyInput)return a.updateHours=angular.noop,void(a.updateMinutes=angular.noop);var d=function(b,c){o.$setViewValue(null),o.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c)};a.updateHours=function(){var a=g();angular.isDefined(a)?(n.setHours(a),j("h")):d(!0)},b.bind("blur",function(){!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=i(a.hours)})}),a.updateMinutes=function(){var a=h();angular.isDefined(a)?(n.setMinutes(a),j("m")):d(void 0,!0)},c.bind("blur",function(){!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=i(a.minutes)})})},this.render=function(){var a=o.$viewValue;isNaN(a)?(o.$setValidity("time",!1),d.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(a&&(n=a),k(),l())},a.incrementHours=function(){m(60*q)},a.decrementHours=function(){m(60*-q)},a.incrementMinutes=function(){m(r)},a.decrementMinutes=function(){m(-r)},a.toggleMeridian=function(){m(720*(n.getHours()<12?1:-1))}}]).directive("timepicker",function(){return{restrict:"EA",require:["timepicker","?^ngModel"],controller:"TimepickerController",replace:!0,scope:{},templateUrl:"template/timepicker/timepicker.html",link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}),angular.module("ui.bootstrap.transition",[]).value("$transitionSuppressDeprecated",!1).factory("$transition",["$q","$timeout","$rootScope","$log","$transitionSuppressDeprecated",function(a,b,c,d,e){function f(a){for(var b in a)if(void 0!==h.style[b])return a[b]}e||d.warn("$transition is now deprecated. Use $animate from ngAnimate instead.");var g=function(d,e,f){f=f||{};var h=a.defer(),i=g[f.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(e)?d.addClass(e):angular.isFunction(e)?e(d):angular.isObject(e)&&d.css(e),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},h=document.createElement("trans"),i={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},j={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return g.transitionEndEventName=f(i),g.animationEndEventName=f(j),g}]),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.position","ui.bootstrap.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?i.$eval(k.typeaheadAppendToBody):!1,u=i.$eval(k.typeaheadFocusFirst)!==!1,v=b(k.ngModel).assign,w=g.parse(k.typeahead),x=i.$new();i.$on("$destroy",function(){x.$destroy()});var y="typeahead-"+x.$id+"-"+Math.floor(1e4*Math.random());j.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":y});var z=angular.element("<div typeahead-popup></div>");z.attr({id:y,matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&z.attr("template-url",k.typeaheadTemplateUrl);var A=function(){x.matches=[],x.activeIdx=-1,j.attr("aria-expanded",!1)},B=function(a){return y+"-option-"+a};x.$watch("activeIdx",function(a){0>a?j.removeAttr("aria-activedescendant"):j.attr("aria-activedescendant",B(a))});var C=function(a){var b={$viewValue:a};q(i,!0),c.when(w.source(i,b)).then(function(c){var d=a===l.$viewValue;if(d&&m)if(c&&c.length>0){x.activeIdx=u?0:-1,x.matches.length=0;for(var e=0;e<c.length;e++)b[w.itemName]=c[e],x.matches.push({id:B(e),label:w.viewMapper(x,b),model:c[e]});x.query=a,x.position=t?f.offset(j):f.position(j),x.position.top=x.position.top+j.prop("offsetHeight"),j.attr("aria-expanded",!0)}else A();d&&q(i,!1)},function(){A(),q(i,!1)})};A(),x.query=void 0;var D,E=function(a){D=d(function(){C(a)},o)},F=function(){D&&d.cancel(D)};l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(F(),E(a)):C(a):(q(i,!1),F(),A()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return p||l.$setValidity("editable",!0),s?(d.$model=a,s(i,d)):(d[w.itemName]=a,b=w.viewMapper(i,d),d[w.itemName]=void 0,c=w.viewMapper(i,d),b!==c?b:a)}),x.select=function(a){var b,c,e={};e[w.itemName]=c=x.matches[a].model,b=w.modelMapper(i,e),v(i,b),l.$setValidity("editable",!0),l.$setValidity("parse",!0),r(i,{$item:c,$model:b,$label:w.viewMapper(i,e)}),A(),d(function(){j[0].focus()},0,!1)},j.bind("keydown",function(a){0!==x.matches.length&&-1!==h.indexOf(a.which)&&(-1!=x.activeIdx||13!==a.which&&9!==a.which)&&(a.preventDefault(),40===a.which?(x.activeIdx=(x.activeIdx+1)%x.matches.length,x.$digest()):38===a.which?(x.activeIdx=(x.activeIdx>0?x.activeIdx:x.matches.length)-1,x.$digest()):13===a.which||9===a.which?x.$apply(function(){x.select(x.activeIdx)}):27===a.which&&(a.stopPropagation(),A(),x.$digest()))}),j.bind("blur",function(){m=!1});var G=function(a){j[0]!==a.target&&(A(),x.$digest())};e.bind("click",G),i.$on("$destroy",function(){e.unbind("click",G),t&&H.remove(),z.remove()});var H=a(z)(x);t?e.find("body").append(H):j.after(H)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$templateRequest","$compile","$parse",function(a,b,c){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(d,e,f){var g=c(f.templateUrl)(d.$parent)||"template/typeahead/typeahead-match.html";a(g).then(function(a){b(a.trim())(d,function(a){e.replaceWith(a)})})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?(""+b).replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<div class="panel panel-default">\n  <div class="panel-heading">\n    <h4 class="panel-title">\n      <a href="javascript:void(0)" tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse collapse" collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>\n')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html",'<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissable\' : null]" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close()">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n    <ol class="carousel-indicators" ng-show="slides.length > 1">\n        <li ng-repeat="slide in slides | orderBy:\'index\' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>\n    </ol>\n    <div class="carousel-inner" ng-transclude></div>\n    <a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>\n    <a class="right carousel-control" ng-click="next()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-right"></span></a>\n</div>\n')}]),angular.module("template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("template/carousel/slide.html",'<div ng-class="{\n    \'active\': active\n  }" class="item text-center" ng-transclude></div>\n')}]),angular.module("template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/datepicker.html",'<div ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <daypicker ng-switch-when="day" tabindex="0"></daypicker>\n  <monthpicker ng-switch-when="month" tabindex="0"></monthpicker>\n  <yearpicker ng-switch-when="year" tabindex="0"></yearpicker>\n</div>')}]),angular.module("template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/day.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{5 + showWeeks}}"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-show="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in labels track by $index" class="text-center"><small aria-label="{{label.full}}">{{label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-show="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}" ng-class="dt.customClass">\n        <button type="button" style="width:100%;" class="btn btn-default btn-sm" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/month.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/popup.html",'<ul class="dropdown-menu" ng-style="{display: (isOpen && \'block\') || \'none\', top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)">\n	<li ng-transclude></li>\n	<li ng-if="showButtonBar" style="padding:10px 9px 2px">\n		<span class="btn-group pull-left">\n			<button type="button" class="btn btn-sm btn-info" ng-click="select(\'today\')">{{ getText(\'current\') }}</button>\n			<button type="button" class="btn btn-sm btn-danger" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n		</span>\n		<button type="button" class="btn btn-sm btn-success pull-right" ng-click="close()">{{ getText(\'close\') }}</button>\n	</li>\n</ul>\n')}]),angular.module("template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("template/datepicker/year.html",'<table role="grid" aria-labelledby="{{uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="3"><button id="{{uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1" style="width:100%;"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row track by dt.date" class="text-center" role="gridcell" id="{{dt.uid}}" aria-disabled="{{!!dt.disabled}}">\n        <button type="button" style="width:100%;" class="btn btn-default" ng-class="{\'btn-info\': dt.selected, active: isActive(dt)}" ng-click="select(dt.date)" ng-disabled="dt.disabled" tabindex="-1"><span ng-class="{\'text-info\': dt.current}">{{dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')
+}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="modal-backdrop"\n     modal-animation-class="fade"\n     ng-class="{in: animate}"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n    modal-animation-class="fade"\n	ng-class="{in: animate}" ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}" ng-click="close($event)">\n    <div class="modal-dialog" ng-class="size ? \'modal-\' + size : \'\'"><div class="modal-content" modal-transclude></div></div>\n</div>\n')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious(), previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext(), next: align}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n</ul>')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="boundaryLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(1, $event)">{{getText(\'first\')}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noPrevious()}"><a href ng-click="selectPage(page - 1, $event)">{{getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active}"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n  <li ng-if="directionLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(page + 1, $event)">{{getText(\'next\')}}</a></li>\n  <li ng-if="boundaryLinks" ng-class="{disabled: noNext()}"><a href ng-click="selectPage(totalPages, $event)">{{getText(\'last\')}}</a></li>\n</ul>')}]),angular.module("template/tooltip/tooltip-html-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" bind-html-unsafe="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("template/tooltip/tooltip-template-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-template-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner"\n    tooltip-template-transclude="contentExp()"\n    tooltip-template-transclude-scope="originScope()"></div>\n</div>\n')}]),angular.module("template/popover/popover-template.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover-template.html",'<div class="popover"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n      <div class="popover-content"\n        tooltip-template-transclude="contentExp()"\n        tooltip-template-transclude-scope="originScope()"></div>\n  </div>\n</div>\n')}]),angular.module("template/popover/popover-window.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover-window.html",'<div class="popover {{placement}}" ng-class="{ in: isOpen, fade: animation }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>\n      <div class="popover-content" tooltip-template-transclude></div>\n  </div>\n</div>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="popover"\n  tooltip-animation-class="fade"\n  tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n')}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-transclude></div>')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" ng-transclude></div>\n</div>\n')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <i ng-repeat="r in range track by $index" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')">\n        <span class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    </i>\n</span>')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}">\n  <a href ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("template/timepicker/timepicker.html",'<table>\n	<tbody>\n		<tr class="text-center">\n			<td><a ng-click="incrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="incrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n		<tr>\n			<td class="form-group" ng-class="{\'has-error\': invalidHours}">\n				<input style="width:50px;" type="text" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td>:</td>\n			<td class="form-group" ng-class="{\'has-error\': invalidMinutes}">\n				<input style="width:50px;" type="text" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2">\n			</td>\n			<td ng-show="showMeridian"><button type="button" class="btn btn-default text-center" ng-click="toggleMeridian()">{{meridian}}</button></td>\n		</tr>\n		<tr class="text-center">\n			<td><a ng-click="decrementHours()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td>&nbsp;</td>\n			<td><a ng-click="decrementMinutes()" class="btn btn-link"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n			<td ng-show="showMeridian"></td>\n		</tr>\n	</tbody>\n</table>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-show="isOpen()" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" style="display: block;" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)" role="option" id="{{match.id}}">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>\n')}]),!angular.$$csp()&&angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>');
\ No newline at end of file
diff --git a/turtles/app/services/turtleFact.js b/turtles/app/services/turtleFact.js
new file mode 100644
index 000000000..d61248235
--- /dev/null
+++ b/turtles/app/services/turtleFact.js
@@ -0,0 +1,253 @@
+(function () {
+	'use strict';
+
+	angular.module('app')
+		.factory('turtleFact', turtleFact);
+
+	function turtleFact() {
+		var ttimes = [];
+		var id, my_time;
+		var notifications = [];
+		var notif_time, notif_sound;
+		var notif_audio = new Audio('sounds/notification.mp3');
+		var version, jpn_monday;
+		var hotfix = false;
+		var jpn_hotfix = false;
+
+		var services = {
+			set_id: set_id,
+			get_ttimes: get_ttimes,
+			get_cal: get_cal,
+			example_notification: example_notification,
+			set_notif_time: set_notif_time,
+			set_notif_sound: set_notif_sound,
+			set_version: set_version
+		};
+
+		return services;
+
+		function set_id(i) {
+			id = i % 5;
+			get_ttimes();
+		}
+
+		function get_ttimes() {
+			get_current_time();
+			ttimes = [];
+			calc_ttimes_all();
+			return ttimes;
+		}
+
+		function get_current_time() {
+			var end;
+			if (version === 'global') {
+				if (!hotfix) {
+					my_time = moment.utc().startOf('isoWeek').add(13, 'hours');
+					end = my_time.clone().add(18, 'hours');
+					if (moment().isAfter(end))
+						my_time.add(1, 'week');
+				}
+				// set hotfix time
+				else {
+					my_time = moment.utc('2016-01-04 13:00');
+				}
+			}
+			else {
+				if (!jpn_hotfix) {
+					my_time = moment.utc().startOf('isoWeek');
+					jpn_monday = true;
+
+					var now = moment();
+					end = my_time.clone().add(18, 'hours');
+					
+					if (now.isAfter(end)) {
+						my_time.add(4, 'days');
+						end.add(4, 'days');
+						jpn_monday = false;
+					}
+
+					if (now.isAfter(end)) {
+						my_time.add(3, 'days');
+						jpn_monday = true;
+					}
+				}
+				else 
+					my_time = moment.utc('2015-09-25 00:00');
+			}
+		}
+
+		function calc_ttimes_all() {
+			var NUM_WEEKS = 7;
+			var i = 0;
+			var second_time = false;
+
+			// if jpn, double for twice a week and treat as num_days
+			if (version !== 'global') {
+				if (!hotfix)
+					NUM_WEEKS *= 4;
+				else
+					NUM_WEEKS = 10;
+			}
+
+			while (i<NUM_WEEKS) {
+				ttimes.push(calc_ttime(i, second_time));
+				if (version === 'global'){
+					if (second_time)
+						i++;
+					second_time = !second_time;
+				}
+				else
+					i++;
+			}
+
+			set_notifications();
+		}
+
+		function calc_ttime(week_num, second_time) {
+			var weekly_order = [0,1,2,3,4];
+			var ttime = my_time.clone();
+			var offset, i, day_num, day_offset, monday;
+
+			if (version === 'global') {
+					if (!hotfix) {
+					offset = week_num + my_time.isoWeek() + 3;
+
+					offset = offset % 5;
+
+					for (i=0; i<offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					for (i=0; i<week_num; i++)
+						ttime.add(1, 'week');
+
+				}
+
+				// set hotfix offsets
+				else {
+					day_num = week_num;
+					day_offset = [2,1,2,7,0,0,0,0,0,0];
+
+					offset = week_num + 1;
+
+					for (i=0; i<offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					for (i=0; i<day_num; i++)
+						ttime.add(day_offset[i], 'days');
+				}
+
+				ttime.add(weekly_order[id]*2, 'hours');
+				if (second_time)
+					ttime.add(10,'hours');
+			}
+			else {
+				day_num = week_num;
+				monday = jpn_monday;
+
+				if (!jpn_hotfix) {
+					offset = day_num + my_time.isoWeek()*2 + 2;
+					if (!monday)
+						offset += 1;
+					offset = offset % 5;
+					for (i=0; i<offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					for (i=0; i<day_num; i++) {
+						if (monday)
+							ttime.add(4, 'days');
+						else
+							ttime.add(3, 'days');
+						monday = !monday;
+					}
+				}
+				else {
+					day_offset = [1,10,10,10,10];
+
+					offset = day_num + 4;
+
+					for (i=0; i<offset; i++)
+						weekly_order.unshift(weekly_order.pop());
+
+					for (i=0; i<day_num; i++)
+						ttime.add(day_offset[i], 'days');
+				}
+
+				ttime.add(weekly_order[id]*3, 'hours');
+			}
+
+			return ttime;
+		}
+
+		function set_version(v) {
+			version = v;
+		}
+
+		function get_cal() {
+			var cal = ics();
+
+			var subject = "OPTC Turtle Time";
+			var description = "One Piece Treasure Cruise Turtle Time";
+			var location = "OPTC";
+			var begin, end;
+
+			for (var i=0; i<2; i++) {
+				begin = ttimes[i].format();
+				end = ttimes[i].clone().add(30, 'minutes').format();
+				cal.addEvent(subject, description, location, begin, end);
+			}
+
+			cal.download('turtle_time', '.ics');
+		}
+
+		function set_notifications() {
+			var now = moment();
+			var minutes = notif_time / 1000 / 60;
+			var options = {
+				body: minutes + ' minutes till Turtle Time!',
+				icon: 'favicon.ico'
+			};
+			var time_until;
+			var end = moment().add(3,'days');
+
+			for (var i=0; i<ttimes.length; i++) {
+				if (now.isAfter(ttimes[i]) || ttimes[i].isAfter(end))
+					continue;
+
+				time_until = ttimes[i].format('x') - now.format('x');
+				time_until -= notif_time;
+				if (time_until < 0 || isNaN(time_until))
+					continue;
+				if (notifications[i] !== undefined)
+					clearTimeout(notifications[i]);
+
+				notifications[i] = setTimeout(function() {
+					var instance = new Notification("OPTC Turtle Time", options);
+					if (notif_sound)
+						notif_audio.play();
+				}, time_until);
+			}
+		}
+
+		function example_notification() {
+			var minutes = notif_time / 1000 / 60;
+			var options = {
+				body: minutes + ' minutes till Turtle Time!',
+				icon: 'favicon.ico'
+			};
+
+			var instance = new Notification("OPTC Turtle Time", options);
+			if (notif_sound)
+				notif_audio.play();
+		}
+
+		function set_notif_time(minutes) {
+			notif_time = 1000 * 60 * minutes;
+			set_notifications();
+		}
+
+		function set_notif_sound(sound) {
+			notif_sound = sound;
+			set_notifications();
+		}
+	}
+})();
\ No newline at end of file
diff --git a/turtles/barrel.html b/turtles/barrel.html
new file mode 100644
index 000000000..088658f9e
--- /dev/null
+++ b/turtles/barrel.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>Turtle Time Calc</title>
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/main.css">
+		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
+		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
+		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
+		<script src="app/lib/moment.min.js"></script>
+		<script src="app/lib/angular-local-storage.min.js"></script>
+		<script src="app/lib/angular-translate.min.js"></script>
+		<script src="app/lib/angular-timer.min.js"></script>
+		<script src="app/lib/humanize-duration.js"></script>
+		<script src="app/lib/ng-table.min.js"></script>
+		<script src="app/lib/ui-bootstrap-tpls-0.13.0.min.js"></script>
+		<script src="app/lib/angular-polyglot.language.switcher.js"></script>
+		<script src="app/lib/momentjs/locale/de.js"></script>
+		<script src="app/lib/momentjs/locale/es.js"></script>
+		<script src="app/lib/bower_components/angular-animate/angular-animate.min.js"></script>
+		<script src="app/app.js"></script>
+		<script src="app/controllers/barrelCtrl.js"></script>
+		<script src="app/controllers/localeCtrl.js"></script>
+		<script src="app/controllers/navbarCtrl.js"></script>
+		<script src="app/directives/barrelDirective.js"></script>
+		<script src="app/directives/collapseDirective.js"></script>
+		<script src="app/config/localizeConfig.js"></script>
+	</head>
+
+	<body ng-app="app" ng-controller="LocaleCtrl as locale" ng-cloak>
+		
+		<nav class="navbar navbar-default" ng-controller="NavbarCtrl" ng-click="$event.stopPropagation()">
+				<div class="container">
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle" ng-click="isCollapsed=!isCollapsed">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						</button>
+					</div>
+					<div class="navbar-collapse init" collapse="isCollapsed">
+						<ul class="nav navbar-nav">
+							<li><a href="index.html">{{ 'NAV_TURTLE' | translate }}</a></li>
+							<li class="active"><a href="barrel.html">{{ 'NAV_BARREL' | translate }}</a></li>
+							<li id="settings"><a href="settings.html">{{ 'NAV_SETTINGS' | translate }}</a></li>
+						</ul>
+						<div class="language-picker nav pull-right">
+							<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" selected-lang="{{locale.flag}}" language-changed-callback="onLanguageChanged(lang)"></pls>
+						</div>
+					</div>
+				</div>
+		</nav>
+
+		<div class="jumbotron">
+			<div class="container">
+				<h1>{{'BB_TITLE' | translate}}</h1>
+				<div ng-controller="BarrelCtrl as barrel">
+					<h2>{{'BB_TIME' | translate}}
+						<barrel-time day="barrel.day"></barrel-time>
+					</h2>
+					<div class="bb-hours">
+						<input type="checkbox" name="bbAlt" ng-model="barrel.show_hours">{{'BB_ALT' | translate}}
+					</div>
+					<table ng-table class="table table-bordered table-striped">
+						<tr>
+							<th>{{'BB_DATE' | translate}}</th>
+							<th ng-show="!barrel.show_hours">{{'BB_WOODEN' | translate}}</th>
+							<th>{{'BB_SILVER' | translate}}</th>
+							<th>{{'BB_GOLD' | translate}}</th>
+						</tr>
+						<tr ng-repeat="day in barrel.times">
+							<td data-title="'Date'">{{day.date}}</td>
+							<td data-title="'Wooden'" ng-show="!barrel.show_hours">{{day.wooden}}</td>
+							<td data-title="'Silver'">{{day.silver}}</td>
+							<td data-title="'Gold'">{{day.gold}}</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+		</div>
+
+	</body>
+
+</html>
diff --git a/turtles/bower_components/angular-bootstrap/.bower.json b/turtles/bower_components/angular-bootstrap/.bower.json
new file mode 100644
index 000000000..ad979e5f0
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/.bower.json
@@ -0,0 +1,32 @@
+{
+  "author": {
+    "name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
+  },
+  "name": "angular-bootstrap",
+  "keywords": [
+    "angular",
+    "angular-ui",
+    "bootstrap"
+  ],
+  "license": "MIT",
+  "ignore": [],
+  "description": "Native AngularJS (Angular) directives for Bootstrap.",
+  "version": "1.1.1",
+  "main": [
+    "./ui-bootstrap-tpls.js"
+  ],
+  "dependencies": {
+    "angular": ">=1.4.0"
+  },
+  "homepage": "https://github.com/angular-ui/bootstrap-bower",
+  "_release": "1.1.1",
+  "_resolution": {
+    "type": "version",
+    "tag": "1.1.1",
+    "commit": "c6234d0f802e43cbaef96b5d6efc17528d27965b"
+  },
+  "_source": "git://github.com/angular-ui/bootstrap-bower.git",
+  "_target": "^1.1.1",
+  "_originalSource": "angular-bootstrap",
+  "_direct": true
+}
\ No newline at end of file
diff --git a/turtles/bower_components/angular-bootstrap/.gitignore b/turtles/bower_components/angular-bootstrap/.gitignore
new file mode 100644
index 000000000..496ee2ca6
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
diff --git a/turtles/bower_components/angular-bootstrap/.npmignore b/turtles/bower_components/angular-bootstrap/.npmignore
new file mode 100644
index 000000000..d62f9b6e0
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/.npmignore
@@ -0,0 +1 @@
+bower.json
\ No newline at end of file
diff --git a/turtles/bower_components/angular-bootstrap/README.md b/turtles/bower_components/angular-bootstrap/README.md
new file mode 100644
index 000000000..9607c65f6
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/README.md
@@ -0,0 +1,120 @@
+### UI Bootstrap - [AngularJS](http://angularjs.org/) directives specific to [Bootstrap](http://getbootstrap.com)
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/bootstrap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Build Status](https://secure.travis-ci.org/angular-ui/bootstrap.svg)](http://travis-ci.org/angular-ui/bootstrap)
+[![devDependency Status](https://david-dm.org/angular-ui/bootstrap/dev-status.svg?branch=master)](https://david-dm.org/angular-ui/bootstrap#info=devDependencies)
+
+### Quick links
+- [Demo](#demo)
+- [Installation](#installation)
+    - [NPM](#install-with-npm)
+    - [Bower](#install-with-bower)
+    - [NuGet](#install-with-nuget)
+    - [Custom](#custom-build)
+    - [Manual](#manual-download)
+- [Support](#support)
+    - [FAQ](#faq)
+    - [Supported browsers](#supported-browsers)
+    - [Need help?](#need-help)
+    - [Found a bug?](#found-a-bug)
+- [Contributing to the project](#contributing-to-the-project)
+- [Development, meeting minutes, roadmap and more.](#development-meeting-minutes-roadmap-and-more)
+
+
+# Demo
+
+Do you want to see directives in action? Visit http://angular-ui.github.io/bootstrap/!
+
+# Installation
+
+Installation is easy as UI Bootstrap has minimal dependencies - only the AngularJS and Twitter Bootstrap's CSS are required.
+Note: Since version 0.13.0, UI Bootstrap depends on [ngAnimate](https://docs.angularjs.org/api/ngAnimate) for transitions and animations, such as the accordion, carousel, etc. Include `ngAnimate` in the module dependencies for your app in order to enable animation.
+
+#### Install with NPM
+
+```sh
+$ npm install angular-ui-bootstrap
+```
+
+This will install AngularJS and Bootstrap NPM packages.
+
+#### Install with Bower
+```sh
+$ bower install angular-bootstrap
+```
+
+Note: do not install 'angular-ui-bootstrap'.  A separate repository - [bootstrap-bower](https://github.com/angular-ui/bootstrap-bower) - hosts the compiled javascript file and bower.json.
+
+#### Install with NuGet
+To install AngularJS UI Bootstrap, run the following command in the Package Manager Console
+
+```sh
+PM> Install-Package Angular.UI.Bootstrap
+```
+
+#### Custom build
+
+Head over to http://angular-ui.github.io/bootstrap/ and hit the *Custom build* button to create your own custom UI Bootstrap build, just the way you like it.
+
+#### Manual download
+
+After downloading dependencies (or better yet, referencing them from your favorite CDN) you need to download build version of this project. All the files and their purposes are described here:
+https://github.com/angular-ui/bootstrap/tree/gh-pages#build-files
+Don't worry, if you are not sure which file to take, opt for `ui-bootstrap-tpls-[version].min.js`.
+
+### Adding dependency to your project
+
+When you are done downloading all the dependencies and project files the only remaining part is to add dependencies on the `ui.bootstrap` AngularJS module:
+
+```js
+angular.module('myModule', ['ui.bootstrap']);
+```
+
+If you're a Browserify or Webpack user, you can do:
+
+```js
+var uibs = require('angular-ui-bootstrap');
+
+angular.module('myModule', [uibs]);
+```
+
+# Support
+
+## FAQ
+
+https://github.com/angular-ui/bootstrap/wiki/FAQ
+
+## Supported browsers
+
+Directives from this repository are automatically tested with the following browsers:
+* Chrome (stable and canary channel)
+* Firefox
+* IE 9 and 10
+* Opera
+* Safari
+
+Modern mobile browsers should work without problems.
+
+
+## Need help?
+Need help using UI Bootstrap?
+
+* Live help in the IRC (`#angularjs` channel at the `freenode` network). Use this [webchat](https://webchat.freenode.net/) or your own IRC client.
+* Ask a question in [StackOverflow](http://stackoverflow.com/) under the [angular-ui-bootstrap](http://stackoverflow.com/questions/tagged/angular-ui-bootstrap) tag.
+
+**Please do not create new issues in this repository to ask questions about using UI Bootstrap**
+
+## Found a bug?
+Please take a look at [CONTRIBUTING.md](CONTRIBUTING.md#you-think-youve-found-a-bug) and submit your issue [here](https://github.com/angular-ui/bootstrap/issues/new).
+
+
+----
+
+
+# Contributing to the project
+
+We are always looking for the quality contributions! Please check the [CONTRIBUTING.md](CONTRIBUTING.md) for the contribution guidelines.
+
+# Development, meeting minutes, roadmap and more.
+
+Head over to the [Wiki](https://github.com/angular-ui/bootstrap/wiki) for notes on development for UI Bootstrap, meeting minutes from the UI Bootstrap team, roadmap plans, project philosophy and more.
diff --git a/turtles/bower_components/angular-bootstrap/bower.json b/turtles/bower_components/angular-bootstrap/bower.json
new file mode 100644
index 000000000..9777af77d
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/bower.json
@@ -0,0 +1,19 @@
+{
+    "author": {
+        "name": "https://github.com/angular-ui/bootstrap/graphs/contributors"
+    },
+    "name": "angular-bootstrap",
+    "keywords": [
+        "angular",
+        "angular-ui",
+        "bootstrap"
+    ],
+    "license": "MIT",
+    "ignore": [],
+    "description": "Native AngularJS (Angular) directives for Bootstrap.",
+    "version": "1.1.1",
+    "main": ["./ui-bootstrap-tpls.js"],
+    "dependencies": {
+        "angular": ">=1.4.0"
+    }
+}
diff --git a/turtles/bower_components/angular-bootstrap/index.js b/turtles/bower_components/angular-bootstrap/index.js
new file mode 100644
index 000000000..a174f26d4
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/index.js
@@ -0,0 +1,2 @@
+require('./ui-bootstrap-tpls');
+module.exports = 'ui.bootstrap';
diff --git a/turtles/bower_components/angular-bootstrap/package.json b/turtles/bower_components/angular-bootstrap/package.json
new file mode 100644
index 000000000..ec378442b
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "angular-ui-bootstrap",
+  "version": "1.1.1",
+  "description": "Bootstrap widgets for Angular",
+  "main": "index.js",
+  "homepage": "http://angular-ui.github.io/bootstrap/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular-ui/bootstrap.git"
+  },
+  "keywords": [
+    "angular",
+    "bootstrap",
+    "angular-ui",
+    "components",
+    "client-side"
+  ],
+  "author": "https://github.com/angular-ui/bootstrap/graphs/contributors",
+  "peerDependencies": {
+    "angular": ">= 1.4.0-beta.0 || >= 1.5.0-beta.0"
+  },
+  "license": "MIT"
+}
diff --git a/turtles/bower_components/angular-bootstrap/ui-bootstrap-csp.css b/turtles/bower_components/angular-bootstrap/ui-bootstrap-csp.css
new file mode 100644
index 000000000..2d2dab539
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/ui-bootstrap-csp.css
@@ -0,0 +1,29 @@
+/* Include this file in your html if you are using the CSP mode. */
+
+.ng-animate.item:not(.left):not(.right) {
+  -webkit-transition: 0s ease-in-out left;
+  transition: 0s ease-in-out left
+}
+.uib-datepicker .uib-title {
+  width: 100%;
+}
+
+.uib-day button, .uib-month button, .uib-year button {
+  min-width: 100%;
+}
+
+.uib-datepicker-popup.dropdown-menu {
+  display: block;
+}
+
+.uib-button-bar {
+  padding: 10px 9px 2px;
+}
+
+.uib-time input {
+  width: 50px;
+}
+
+[uib-typeahead-popup].dropdown-menu {
+  display: block;
+}
diff --git a/turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.js b/turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.js
new file mode 100644
index 000000000..083f1ac1f
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.js
@@ -0,0 +1,6870 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 1.1.1 - 2016-01-25
+ * License: MIT
+ */angular.module("ui.bootstrap", ["ui.bootstrap.tpls", "ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.debounce","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
+angular.module("ui.bootstrap.tpls", ["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/popup.html","uib/template/datepicker/year.html","uib/template/modal/backdrop.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]);
+angular.module('ui.bootstrap.collapse', [])
+
+  .directive('uibCollapse', ['$animate', '$q', '$parse', '$injector', function($animate, $q, $parse, $injector) {
+    var $animateCss = $injector.has('$animateCss') ? $injector.get('$animateCss') : null;
+    return {
+      link: function(scope, element, attrs) {
+        var expandingExpr = $parse(attrs.expanding),
+            expandedExpr = $parse(attrs.expanded),
+            collapsingExpr = $parse(attrs.collapsing),
+            collapsedExpr = $parse(attrs.collapsed);
+
+        if (!scope.$eval(attrs.uibCollapse)) {
+          element.addClass('in')
+            .addClass('collapse')
+            .attr('aria-expanded', true)
+            .attr('aria-hidden', false)
+            .css({height: 'auto'});
+        }
+
+        function expand() {
+          if (element.hasClass('collapse') && element.hasClass('in')) {
+            return;
+          }
+
+          $q.resolve(expandingExpr(scope))
+            .then(function() {
+              element.removeClass('collapse')
+                .addClass('collapsing')
+                .attr('aria-expanded', true)
+                .attr('aria-hidden', false);
+
+              if ($animateCss) {
+                $animateCss(element, {
+                  addClass: 'in',
+                  easing: 'ease',
+                  to: { height: element[0].scrollHeight + 'px' }
+                }).start()['finally'](expandDone);
+              } else {
+                $animate.addClass(element, 'in', {
+                  to: { height: element[0].scrollHeight + 'px' }
+                }).then(expandDone);
+              }
+            });
+        }
+
+        function expandDone() {
+          element.removeClass('collapsing')
+            .addClass('collapse')
+            .css({height: 'auto'});
+          expandedExpr(scope);
+        }
+
+        function collapse() {
+          if (!element.hasClass('collapse') && !element.hasClass('in')) {
+            return collapseDone();
+          }
+
+          $q.resolve(collapsingExpr(scope))
+            .then(function() {
+              element
+                // IMPORTANT: The height must be set before adding "collapsing" class.
+                // Otherwise, the browser attempts to animate from height 0 (in
+                // collapsing class) to the given height here.
+                .css({height: element[0].scrollHeight + 'px'})
+                // initially all panel collapse have the collapse class, this removal
+                // prevents the animation from jumping to collapsed state
+                .removeClass('collapse')
+                .addClass('collapsing')
+                .attr('aria-expanded', false)
+                .attr('aria-hidden', true);
+
+              if ($animateCss) {
+                $animateCss(element, {
+                  removeClass: 'in',
+                  to: {height: '0'}
+                }).start()['finally'](collapseDone);
+              } else {
+                $animate.removeClass(element, 'in', {
+                  to: {height: '0'}
+                }).then(collapseDone);
+              }
+            });
+        }
+
+        function collapseDone() {
+          element.css({height: '0'}); // Required so that collapse works when animation is disabled
+          element.removeClass('collapsing')
+            .addClass('collapse');
+          collapsedExpr(scope);
+        }
+
+        scope.$watch(attrs.uibCollapse, function(shouldCollapse) {
+          if (shouldCollapse) {
+            collapse();
+          } else {
+            expand();
+          }
+        });
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
+
+.constant('uibAccordionConfig', {
+  closeOthers: true
+})
+
+.controller('UibAccordionController', ['$scope', '$attrs', 'uibAccordionConfig', function($scope, $attrs, accordionConfig) {
+  // This array keeps track of the accordion groups
+  this.groups = [];
+
+  // Ensure that all the groups in this accordion are closed, unless close-others explicitly says not to
+  this.closeOthers = function(openGroup) {
+    var closeOthers = angular.isDefined($attrs.closeOthers) ?
+      $scope.$eval($attrs.closeOthers) : accordionConfig.closeOthers;
+    if (closeOthers) {
+      angular.forEach(this.groups, function(group) {
+        if (group !== openGroup) {
+          group.isOpen = false;
+        }
+      });
+    }
+  };
+
+  // This is called from the accordion-group directive to add itself to the accordion
+  this.addGroup = function(groupScope) {
+    var that = this;
+    this.groups.push(groupScope);
+
+    groupScope.$on('$destroy', function(event) {
+      that.removeGroup(groupScope);
+    });
+  };
+
+  // This is called from the accordion-group directive when to remove itself
+  this.removeGroup = function(group) {
+    var index = this.groups.indexOf(group);
+    if (index !== -1) {
+      this.groups.splice(index, 1);
+    }
+  };
+}])
+
+// The accordion directive simply sets up the directive controller
+// and adds an accordion CSS class to itself element.
+.directive('uibAccordion', function() {
+  return {
+    controller: 'UibAccordionController',
+    controllerAs: 'accordion',
+    transclude: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/accordion/accordion.html';
+    }
+  };
+})
+
+// The accordion-group directive indicates a block of html that will expand and collapse in an accordion
+.directive('uibAccordionGroup', function() {
+  return {
+    require: '^uibAccordion',         // We need this directive to be inside an accordion
+    transclude: true,              // It transcludes the contents of the directive into the template
+    replace: true,                // The element containing the directive will be replaced with the template
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/accordion/accordion-group.html';
+    },
+    scope: {
+      heading: '@',               // Interpolate the heading attribute onto this scope
+      isOpen: '=?',
+      isDisabled: '=?'
+    },
+    controller: function() {
+      this.setHeading = function(element) {
+        this.heading = element;
+      };
+    },
+    link: function(scope, element, attrs, accordionCtrl) {
+      accordionCtrl.addGroup(scope);
+
+      scope.openClass = attrs.openClass || 'panel-open';
+      scope.panelClass = attrs.panelClass || 'panel-default';
+      scope.$watch('isOpen', function(value) {
+        element.toggleClass(scope.openClass, !!value);
+        if (value) {
+          accordionCtrl.closeOthers(scope);
+        }
+      });
+
+      scope.toggleOpen = function($event) {
+        if (!scope.isDisabled) {
+          if (!$event || $event.which === 32) {
+            scope.isOpen = !scope.isOpen;
+          }
+        }
+      };
+    }
+  };
+})
+
+// Use accordion-heading below an accordion-group to provide a heading containing HTML
+.directive('uibAccordionHeading', function() {
+  return {
+    transclude: true,   // Grab the contents to be used as the heading
+    template: '',       // In effect remove this element!
+    replace: true,
+    require: '^uibAccordionGroup',
+    link: function(scope, element, attrs, accordionGroupCtrl, transclude) {
+      // Pass the heading to the accordion-group controller
+      // so that it can be transcluded into the right place in the template
+      // [The second parameter to transclude causes the elements to be cloned so that they work in ng-repeat]
+      accordionGroupCtrl.setHeading(transclude(scope, angular.noop));
+    }
+  };
+})
+
+// Use in the accordion-group template to indicate where you want the heading to be transcluded
+// You must provide the property on the accordion-group controller that will hold the transcluded element
+.directive('uibAccordionTransclude', function() {
+  return {
+    require: '^uibAccordionGroup',
+    link: function(scope, element, attrs, controller) {
+      scope.$watch(function() { return controller[attrs.uibAccordionTransclude]; }, function(heading) {
+        if (heading) {
+          element.find('span').html('');
+          element.find('span').append(heading);
+        }
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.alert', [])
+
+.controller('UibAlertController', ['$scope', '$attrs', '$interpolate', '$timeout', function($scope, $attrs, $interpolate, $timeout) {
+  $scope.closeable = !!$attrs.close;
+
+  var dismissOnTimeout = angular.isDefined($attrs.dismissOnTimeout) ?
+    $interpolate($attrs.dismissOnTimeout)($scope.$parent) : null;
+
+  if (dismissOnTimeout) {
+    $timeout(function() {
+      $scope.close();
+    }, parseInt(dismissOnTimeout, 10));
+  }
+}])
+
+.directive('uibAlert', function() {
+  return {
+    controller: 'UibAlertController',
+    controllerAs: 'alert',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/alert/alert.html';
+    },
+    transclude: true,
+    replace: true,
+    scope: {
+      type: '@',
+      close: '&'
+    }
+  };
+});
+
+angular.module('ui.bootstrap.buttons', [])
+
+.constant('uibButtonConfig', {
+  activeClass: 'active',
+  toggleEvent: 'click'
+})
+
+.controller('UibButtonsController', ['uibButtonConfig', function(buttonConfig) {
+  this.activeClass = buttonConfig.activeClass || 'active';
+  this.toggleEvent = buttonConfig.toggleEvent || 'click';
+}])
+
+.directive('uibBtnRadio', ['$parse', function($parse) {
+  return {
+    require: ['uibBtnRadio', 'ngModel'],
+    controller: 'UibButtonsController',
+    controllerAs: 'buttons',
+    link: function(scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+      var uncheckableExpr = $parse(attrs.uibUncheckable);
+
+      element.find('input').css({display: 'none'});
+
+      //model -> UI
+      ngModelCtrl.$render = function() {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, scope.$eval(attrs.uibBtnRadio)));
+      };
+
+      //ui->model
+      element.on(buttonsCtrl.toggleEvent, function() {
+        if (attrs.disabled) {
+          return;
+        }
+
+        var isActive = element.hasClass(buttonsCtrl.activeClass);
+
+        if (!isActive || angular.isDefined(attrs.uncheckable)) {
+          scope.$apply(function() {
+            ngModelCtrl.$setViewValue(isActive ? null : scope.$eval(attrs.uibBtnRadio));
+            ngModelCtrl.$render();
+          });
+        }
+      });
+
+      if (attrs.uibUncheckable) {
+        scope.$watch(uncheckableExpr, function(uncheckable) {
+          attrs.$set('uncheckable', uncheckable ? '' : null);
+        });
+      }
+    }
+  };
+}])
+
+.directive('uibBtnCheckbox', function() {
+  return {
+    require: ['uibBtnCheckbox', 'ngModel'],
+    controller: 'UibButtonsController',
+    controllerAs: 'button',
+    link: function(scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      element.find('input').css({display: 'none'});
+
+      function getTrueValue() {
+        return getCheckboxValue(attrs.btnCheckboxTrue, true);
+      }
+
+      function getFalseValue() {
+        return getCheckboxValue(attrs.btnCheckboxFalse, false);
+      }
+
+      function getCheckboxValue(attribute, defaultValue) {
+        return angular.isDefined(attribute) ? scope.$eval(attribute) : defaultValue;
+      }
+
+      //model -> UI
+      ngModelCtrl.$render = function() {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, getTrueValue()));
+      };
+
+      //ui->model
+      element.on(buttonsCtrl.toggleEvent, function() {
+        if (attrs.disabled) {
+          return;
+        }
+
+        scope.$apply(function() {
+          ngModelCtrl.$setViewValue(element.hasClass(buttonsCtrl.activeClass) ? getFalseValue() : getTrueValue());
+          ngModelCtrl.$render();
+        });
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.carousel', [])
+
+.controller('UibCarouselController', ['$scope', '$element', '$interval', '$timeout', '$animate', function($scope, $element, $interval, $timeout, $animate) {
+  var self = this,
+    slides = self.slides = $scope.slides = [],
+    SLIDE_DIRECTION = 'uib-slideDirection',
+    currentIndex = -1,
+    currentInterval, isPlaying, bufferedTransitions = [];
+  self.currentSlide = null;
+
+  var destroyed = false;
+
+  self.addSlide = function(slide, element) {
+    slide.$element = element;
+    slides.push(slide);
+    //if this is the first slide or the slide is set to active, select it
+    if (slides.length === 1 || slide.active) {
+      if ($scope.$currentTransition) {
+        $scope.$currentTransition = null;
+      }
+
+      self.select(slides[slides.length - 1]);
+      if (slides.length === 1) {
+        $scope.play();
+      }
+    } else {
+      slide.active = false;
+    }
+  };
+
+  self.getCurrentIndex = function() {
+    if (self.currentSlide && angular.isDefined(self.currentSlide.index)) {
+      return +self.currentSlide.index;
+    }
+    return currentIndex;
+  };
+
+  self.next = $scope.next = function() {
+    var newIndex = (self.getCurrentIndex() + 1) % slides.length;
+
+    if (newIndex === 0 && $scope.noWrap()) {
+      $scope.pause();
+      return;
+    }
+
+    return self.select(getSlideByIndex(newIndex), 'next');
+  };
+
+  self.prev = $scope.prev = function() {
+    var newIndex = self.getCurrentIndex() - 1 < 0 ? slides.length - 1 : self.getCurrentIndex() - 1;
+
+    if ($scope.noWrap() && newIndex === slides.length - 1) {
+      $scope.pause();
+      return;
+    }
+
+    return self.select(getSlideByIndex(newIndex), 'prev');
+  };
+
+  self.removeSlide = function(slide) {
+    if (angular.isDefined(slide.index)) {
+      slides.sort(function(a, b) {
+        return +a.index > +b.index;
+      });
+    }
+
+    var bufferedIndex = bufferedTransitions.indexOf(slide);
+    if (bufferedIndex !== -1) {
+      bufferedTransitions.splice(bufferedIndex, 1);
+    }
+    //get the index of the slide inside the carousel
+    var index = slides.indexOf(slide);
+    slides.splice(index, 1);
+    $timeout(function() {
+      if (slides.length > 0 && slide.active) {
+        if (index >= slides.length) {
+          self.select(slides[index - 1]);
+        } else {
+          self.select(slides[index]);
+        }
+      } else if (currentIndex > index) {
+        currentIndex--;
+      }
+    });
+
+    //clean the currentSlide when no more slide
+    if (slides.length === 0) {
+      self.currentSlide = null;
+      clearBufferedTransitions();
+    }
+  };
+
+  /* direction: "prev" or "next" */
+  self.select = $scope.select = function(nextSlide, direction) {
+    var nextIndex = $scope.indexOfSlide(nextSlide);
+    //Decide direction if it's not given
+    if (direction === undefined) {
+      direction = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
+    }
+    //Prevent this user-triggered transition from occurring if there is already one in progress
+    if (nextSlide && nextSlide !== self.currentSlide && !$scope.$currentTransition) {
+      goNext(nextSlide, nextIndex, direction);
+    } else if (nextSlide && nextSlide !== self.currentSlide && $scope.$currentTransition) {
+      bufferedTransitions.push(nextSlide);
+      nextSlide.active = false;
+    }
+  };
+
+  /* Allow outside people to call indexOf on slides array */
+  $scope.indexOfSlide = function(slide) {
+    return angular.isDefined(slide.index) ? +slide.index : slides.indexOf(slide);
+  };
+
+  $scope.isActive = function(slide) {
+    return self.currentSlide === slide;
+  };
+
+  $scope.pause = function() {
+    if (!$scope.noPause) {
+      isPlaying = false;
+      resetTimer();
+    }
+  };
+
+  $scope.play = function() {
+    if (!isPlaying) {
+      isPlaying = true;
+      restartTimer();
+    }
+  };
+
+  $scope.$on('$destroy', function() {
+    destroyed = true;
+    resetTimer();
+  });
+
+  $scope.$watch('noTransition', function(noTransition) {
+    $animate.enabled($element, !noTransition);
+  });
+
+  $scope.$watch('interval', restartTimer);
+
+  $scope.$watchCollection('slides', resetTransition);
+
+  function clearBufferedTransitions() {
+    while (bufferedTransitions.length) {
+      bufferedTransitions.shift();
+    }
+  }
+
+  function getSlideByIndex(index) {
+    if (angular.isUndefined(slides[index].index)) {
+      return slides[index];
+    }
+    for (var i = 0, l = slides.length; i < l; ++i) {
+      if (slides[i].index === index) {
+        return slides[i];
+      }
+    }
+  }
+
+  function goNext(slide, index, direction) {
+    if (destroyed) { return; }
+
+    angular.extend(slide, {direction: direction, active: true});
+    angular.extend(self.currentSlide || {}, {direction: direction, active: false});
+    if ($animate.enabled($element) && !$scope.$currentTransition &&
+      slide.$element && self.slides.length > 1) {
+      slide.$element.data(SLIDE_DIRECTION, slide.direction);
+      if (self.currentSlide && self.currentSlide.$element) {
+        self.currentSlide.$element.data(SLIDE_DIRECTION, slide.direction);
+      }
+
+      $scope.$currentTransition = true;
+      $animate.on('addClass', slide.$element, function(element, phase) {
+        if (phase === 'close') {
+          $scope.$currentTransition = null;
+          $animate.off('addClass', element);
+          if (bufferedTransitions.length) {
+            var nextSlide = bufferedTransitions.pop();
+            var nextIndex = $scope.indexOfSlide(nextSlide);
+            var nextDirection = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
+            clearBufferedTransitions();
+
+            goNext(nextSlide, nextIndex, nextDirection);
+          }
+        }
+      });
+    }
+
+    self.currentSlide = slide;
+    currentIndex = index;
+
+    //every time you change slides, reset the timer
+    restartTimer();
+  }
+
+  function resetTimer() {
+    if (currentInterval) {
+      $interval.cancel(currentInterval);
+      currentInterval = null;
+    }
+  }
+
+  function resetTransition(slides) {
+    if (!slides.length) {
+      $scope.$currentTransition = null;
+      clearBufferedTransitions();
+    }
+  }
+
+  function restartTimer() {
+    resetTimer();
+    var interval = +$scope.interval;
+    if (!isNaN(interval) && interval > 0) {
+      currentInterval = $interval(timerFn, interval);
+    }
+  }
+
+  function timerFn() {
+    var interval = +$scope.interval;
+    if (isPlaying && !isNaN(interval) && interval > 0 && slides.length) {
+      $scope.next();
+    } else {
+      $scope.pause();
+    }
+  }
+}])
+
+.directive('uibCarousel', function() {
+  return {
+    transclude: true,
+    replace: true,
+    controller: 'UibCarouselController',
+    controllerAs: 'carousel',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/carousel/carousel.html';
+    },
+    scope: {
+      interval: '=',
+      noTransition: '=',
+      noPause: '=',
+      noWrap: '&'
+    }
+  };
+})
+
+.directive('uibSlide', function() {
+  return {
+    require: '^uibCarousel',
+    transclude: true,
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/carousel/slide.html';
+    },
+    scope: {
+      active: '=?',
+      actual: '=?',
+      index: '=?'
+    },
+    link: function (scope, element, attrs, carouselCtrl) {
+      carouselCtrl.addSlide(scope, element);
+      //when the scope is destroyed then remove the slide from the current slides array
+      scope.$on('$destroy', function() {
+        carouselCtrl.removeSlide(scope);
+      });
+
+      scope.$watch('active', function(active) {
+        if (active) {
+          carouselCtrl.select(scope);
+        }
+      });
+    }
+  };
+})
+
+.animation('.item', ['$animateCss',
+function($animateCss) {
+  var SLIDE_DIRECTION = 'uib-slideDirection';
+
+  function removeClass(element, className, callback) {
+    element.removeClass(className);
+    if (callback) {
+      callback();
+    }
+  }
+
+  return {
+    beforeAddClass: function(element, className, done) {
+      if (className === 'active') {
+        var stopped = false;
+        var direction = element.data(SLIDE_DIRECTION);
+        var directionClass = direction === 'next' ? 'left' : 'right';
+        var removeClassFn = removeClass.bind(this, element,
+          directionClass + ' ' + direction, done);
+        element.addClass(direction);
+
+        $animateCss(element, {addClass: directionClass})
+          .start()
+          .done(removeClassFn);
+
+        return function() {
+          stopped = true;
+        };
+      }
+      done();
+    },
+    beforeRemoveClass: function (element, className, done) {
+      if (className === 'active') {
+        var stopped = false;
+        var direction = element.data(SLIDE_DIRECTION);
+        var directionClass = direction === 'next' ? 'left' : 'right';
+        var removeClassFn = removeClass.bind(this, element, directionClass, done);
+
+        $animateCss(element, {addClass: directionClass})
+          .start()
+          .done(removeClassFn);
+
+        return function() {
+          stopped = true;
+        };
+      }
+      done();
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.dateparser', [])
+
+.service('uibDateParser', ['$log', '$locale', 'orderByFilter', function($log, $locale, orderByFilter) {
+  // Pulled from https://github.com/mbostock/d3/blob/master/src/format/requote.js
+  var SPECIAL_CHARACTERS_REGEXP = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
+
+  var localeId;
+  var formatCodeToRegex;
+
+  this.init = function() {
+    localeId = $locale.id;
+
+    this.parsers = {};
+
+    formatCodeToRegex = [
+      {
+        key: 'yyyy',
+        regex: '\\d{4}',
+        apply: function(value) { this.year = +value; }
+      },
+      {
+        key: 'yy',
+        regex: '\\d{2}',
+        apply: function(value) { this.year = +value + 2000; }
+      },
+      {
+        key: 'y',
+        regex: '\\d{1,4}',
+        apply: function(value) { this.year = +value; }
+      },
+      {
+        key: 'M!',
+        regex: '0?[1-9]|1[0-2]',
+        apply: function(value) { this.month = value - 1; }
+      },
+      {
+        key: 'MMMM',
+        regex: $locale.DATETIME_FORMATS.MONTH.join('|'),
+        apply: function(value) { this.month = $locale.DATETIME_FORMATS.MONTH.indexOf(value); }
+      },
+      {
+        key: 'MMM',
+        regex: $locale.DATETIME_FORMATS.SHORTMONTH.join('|'),
+        apply: function(value) { this.month = $locale.DATETIME_FORMATS.SHORTMONTH.indexOf(value); }
+      },
+      {
+        key: 'MM',
+        regex: '0[1-9]|1[0-2]',
+        apply: function(value) { this.month = value - 1; }
+      },
+      {
+        key: 'M',
+        regex: '[1-9]|1[0-2]',
+        apply: function(value) { this.month = value - 1; }
+      },
+      {
+        key: 'd!',
+        regex: '[0-2]?[0-9]{1}|3[0-1]{1}',
+        apply: function(value) { this.date = +value; }
+      },
+      {
+        key: 'dd',
+        regex: '[0-2][0-9]{1}|3[0-1]{1}',
+        apply: function(value) { this.date = +value; }
+      },
+      {
+        key: 'd',
+        regex: '[1-2]?[0-9]{1}|3[0-1]{1}',
+        apply: function(value) { this.date = +value; }
+      },
+      {
+        key: 'EEEE',
+        regex: $locale.DATETIME_FORMATS.DAY.join('|')
+      },
+      {
+        key: 'EEE',
+        regex: $locale.DATETIME_FORMATS.SHORTDAY.join('|')
+      },
+      {
+        key: 'HH',
+        regex: '(?:0|1)[0-9]|2[0-3]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'hh',
+        regex: '0[0-9]|1[0-2]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'H',
+        regex: '1?[0-9]|2[0-3]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'h',
+        regex: '[0-9]|1[0-2]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'mm',
+        regex: '[0-5][0-9]',
+        apply: function(value) { this.minutes = +value; }
+      },
+      {
+        key: 'm',
+        regex: '[0-9]|[1-5][0-9]',
+        apply: function(value) { this.minutes = +value; }
+      },
+      {
+        key: 'sss',
+        regex: '[0-9][0-9][0-9]',
+        apply: function(value) { this.milliseconds = +value; }
+      },
+      {
+        key: 'ss',
+        regex: '[0-5][0-9]',
+        apply: function(value) { this.seconds = +value; }
+      },
+      {
+        key: 's',
+        regex: '[0-9]|[1-5][0-9]',
+        apply: function(value) { this.seconds = +value; }
+      },
+      {
+        key: 'a',
+        regex: $locale.DATETIME_FORMATS.AMPMS.join('|'),
+        apply: function(value) {
+          if (this.hours === 12) {
+            this.hours = 0;
+          }
+
+          if (value === 'PM') {
+            this.hours += 12;
+          }
+        }
+      },
+      {
+        key: 'Z',
+        regex: '[+-]\\d{4}',
+        apply: function(value) {
+          var matches = value.match(/([+-])(\d{2})(\d{2})/),
+            sign = matches[1],
+            hours = matches[2],
+            minutes = matches[3];
+          this.hours += toInt(sign + hours);
+          this.minutes += toInt(sign + minutes);
+        }
+      },
+      {
+        key: 'ww',
+        regex: '[0-4][0-9]|5[0-3]'
+      },
+      {
+        key: 'w',
+        regex: '[0-9]|[1-4][0-9]|5[0-3]'
+      },
+      {
+        key: 'GGGG',
+        regex: $locale.DATETIME_FORMATS.ERANAMES.join('|').replace(/\s/g, '\\s')
+      },
+      {
+        key: 'GGG',
+        regex: $locale.DATETIME_FORMATS.ERAS.join('|')
+      },
+      {
+        key: 'GG',
+        regex: $locale.DATETIME_FORMATS.ERAS.join('|')
+      },
+      {
+        key: 'G',
+        regex: $locale.DATETIME_FORMATS.ERAS.join('|')
+      }
+    ];
+  };
+
+  this.init();
+
+  function createParser(format) {
+    var map = [], regex = format.split('');
+
+    // check for literal values
+    var quoteIndex = format.indexOf('\'');
+    if (quoteIndex > -1) {
+      var inLiteral = false;
+      format = format.split('');
+      for (var i = quoteIndex; i < format.length; i++) {
+        if (inLiteral) {
+          if (format[i] === '\'') {
+            if (i + 1 < format.length && format[i+1] === '\'') { // escaped single quote
+              format[i+1] = '$';
+              regex[i+1] = '';
+            } else { // end of literal
+              regex[i] = '';
+              inLiteral = false;
+            }
+          }
+          format[i] = '$';
+        } else {
+          if (format[i] === '\'') { // start of literal
+            format[i] = '$';
+            regex[i] = '';
+            inLiteral = true;
+          }
+        }
+      }
+
+      format = format.join('');
+    }
+
+    angular.forEach(formatCodeToRegex, function(data) {
+      var index = format.indexOf(data.key);
+
+      if (index > -1) {
+        format = format.split('');
+
+        regex[index] = '(' + data.regex + ')';
+        format[index] = '$'; // Custom symbol to define consumed part of format
+        for (var i = index + 1, n = index + data.key.length; i < n; i++) {
+          regex[i] = '';
+          format[i] = '$';
+        }
+        format = format.join('');
+
+        map.push({
+          index: index,
+          apply: data.apply,
+          matcher: data.regex
+        });
+      }
+    });
+
+    return {
+      regex: new RegExp('^' + regex.join('') + '$'),
+      map: orderByFilter(map, 'index')
+    };
+  }
+
+  this.parse = function(input, format, baseDate) {
+    if (!angular.isString(input) || !format) {
+      return input;
+    }
+
+    format = $locale.DATETIME_FORMATS[format] || format;
+    format = format.replace(SPECIAL_CHARACTERS_REGEXP, '\\$&');
+
+    if ($locale.id !== localeId) {
+      this.init();
+    }
+
+    if (!this.parsers[format]) {
+      this.parsers[format] = createParser(format);
+    }
+
+    var parser = this.parsers[format],
+        regex = parser.regex,
+        map = parser.map,
+        results = input.match(regex),
+        tzOffset = false;
+    if (results && results.length) {
+      var fields, dt;
+      if (angular.isDate(baseDate) && !isNaN(baseDate.getTime())) {
+        fields = {
+          year: baseDate.getFullYear(),
+          month: baseDate.getMonth(),
+          date: baseDate.getDate(),
+          hours: baseDate.getHours(),
+          minutes: baseDate.getMinutes(),
+          seconds: baseDate.getSeconds(),
+          milliseconds: baseDate.getMilliseconds()
+        };
+      } else {
+        if (baseDate) {
+          $log.warn('dateparser:', 'baseDate is not a valid date');
+        }
+        fields = { year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0 };
+      }
+
+      for (var i = 1, n = results.length; i < n; i++) {
+        var mapper = map[i - 1];
+        if (mapper.matcher === 'Z') {
+          tzOffset = true;
+        }
+
+        if (mapper.apply) {
+          mapper.apply.call(fields, results[i]);
+        }
+      }
+
+      var datesetter = tzOffset ? Date.prototype.setUTCFullYear :
+        Date.prototype.setFullYear;
+      var timesetter = tzOffset ? Date.prototype.setUTCHours :
+        Date.prototype.setHours;
+
+      if (isValid(fields.year, fields.month, fields.date)) {
+        if (angular.isDate(baseDate) && !isNaN(baseDate.getTime()) && !tzOffset) {
+          dt = new Date(baseDate);
+          datesetter.call(dt, fields.year, fields.month, fields.date);
+          timesetter.call(dt, fields.hours, fields.minutes,
+            fields.seconds, fields.milliseconds);
+        } else {
+          dt = new Date(0);
+          datesetter.call(dt, fields.year, fields.month, fields.date);
+          timesetter.call(dt, fields.hours || 0, fields.minutes || 0,
+            fields.seconds || 0, fields.milliseconds || 0);
+        }
+      }
+
+      return dt;
+    }
+  };
+
+  // Check if date is valid for specific month (and year for February).
+  // Month: 0 = Jan, 1 = Feb, etc
+  function isValid(year, month, date) {
+    if (date < 1) {
+      return false;
+    }
+
+    if (month === 1 && date > 28) {
+      return date === 29 && (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0);
+    }
+
+    if (month === 3 || month === 5 || month === 8 || month === 10) {
+      return date < 31;
+    }
+
+    return true;
+  }
+
+  function toInt(str) {
+    return parseInt(str, 10);
+  }
+
+  this.toTimezone = toTimezone;
+  this.fromTimezone = fromTimezone;
+  this.timezoneToOffset = timezoneToOffset;
+  this.addDateMinutes = addDateMinutes;
+  this.convertTimezoneToLocal = convertTimezoneToLocal;
+  
+  function toTimezone(date, timezone) {
+    return date && timezone ? convertTimezoneToLocal(date, timezone) : date;
+  }
+
+  function fromTimezone(date, timezone) {
+    return date && timezone ? convertTimezoneToLocal(date, timezone, true) : date;
+  }
+
+  //https://github.com/angular/angular.js/blob/4daafd3dbe6a80d578f5a31df1bb99c77559543e/src/Angular.js#L1207
+  function timezoneToOffset(timezone, fallback) {
+    var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+    return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+  }
+
+  function addDateMinutes(date, minutes) {
+    date = new Date(date.getTime());
+    date.setMinutes(date.getMinutes() + minutes);
+    return date;
+  }
+
+  function convertTimezoneToLocal(date, timezone, reverse) {
+    reverse = reverse ? -1 : 1;
+    var timezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+    return addDateMinutes(date, reverse * (timezoneOffset - date.getTimezoneOffset()));
+  }
+}]);
+
+// Avoiding use of ng-class as it creates a lot of watchers when a class is to be applied to
+// at most one element.
+angular.module('ui.bootstrap.isClass', [])
+.directive('uibIsClass', [
+         '$animate',
+function ($animate) {
+  //                    11111111          22222222
+  var ON_REGEXP = /^\s*([\s\S]+?)\s+on\s+([\s\S]+?)\s*$/;
+  //                    11111111           22222222
+  var IS_REGEXP = /^\s*([\s\S]+?)\s+for\s+([\s\S]+?)\s*$/;
+
+  var dataPerTracked = {};
+
+  return {
+    restrict: 'A',
+    compile: function (tElement, tAttrs) {
+      var linkedScopes = [];
+      var instances = [];
+      var expToData = {};
+      var lastActivated = null;
+      var onExpMatches = tAttrs.uibIsClass.match(ON_REGEXP);
+      var onExp = onExpMatches[2];
+      var expsStr = onExpMatches[1];
+      var exps = expsStr.split(',');
+
+      return linkFn;
+
+      function linkFn(scope, element, attrs) {
+        linkedScopes.push(scope);
+        instances.push({
+          scope: scope,
+          element: element
+        });
+
+        exps.forEach(function (exp, k) {
+          addForExp(exp, scope);
+        });
+
+        scope.$on('$destroy', removeScope);
+      }
+
+      function addForExp(exp, scope) {
+        var matches = exp.match(IS_REGEXP);
+        var clazz = scope.$eval(matches[1]);
+        var compareWithExp = matches[2];
+        var data = expToData[exp];
+        if (!data) {
+          var watchFn = function (compareWithVal) {
+            var newActivated = null;
+            instances.some(function (instance) {
+              var thisVal = instance.scope.$eval(onExp);
+              if (thisVal === compareWithVal) {
+                newActivated = instance;
+                return true;
+              }
+            });
+            if (data.lastActivated !== newActivated) {
+              if (data.lastActivated) {
+                $animate.removeClass(data.lastActivated.element, clazz);
+              }
+              if (newActivated) {
+                $animate.addClass(newActivated.element, clazz);
+              }
+              data.lastActivated = newActivated;
+            }
+          };
+          expToData[exp] = data = {
+            lastActivated: null,
+            scope: scope,
+            watchFn: watchFn,
+            compareWithExp: compareWithExp,
+            watcher: scope.$watch(compareWithExp, watchFn)
+          };
+        }
+        data.watchFn(scope.$eval(compareWithExp));
+      }
+
+      function removeScope(e) {
+        var removedScope = e.targetScope;
+        var index = linkedScopes.indexOf(removedScope);
+        linkedScopes.splice(index, 1);
+        instances.splice(index, 1);
+        if (linkedScopes.length) {
+          var newWatchScope = linkedScopes[0];
+          angular.forEach(expToData, function (data) {
+            if (data.scope === removedScope) {
+              data.watcher = newWatchScope.$watch(data.compareWithExp, data.watchFn);
+              data.scope = newWatchScope;
+            }
+          });
+        }
+        else {
+          expToData = {};
+        }
+      }
+    }
+  };
+}]);
+angular.module('ui.bootstrap.position', [])
+
+/**
+ * A set of utility methods for working with the DOM.
+ * It is meant to be used where we need to absolute-position elements in
+ * relation to another element (this is the case for tooltips, popovers,
+ * typeahead suggestions etc.).
+ */
+  .factory('$uibPosition', ['$document', '$window', function($document, $window) {
+    /**
+     * Used by scrollbarWidth() function to cache scrollbar's width.
+     * Do not access this variable directly, use scrollbarWidth() instead.
+     */
+    var SCROLLBAR_WIDTH;
+    var OVERFLOW_REGEX = {
+      normal: /(auto|scroll)/,
+      hidden: /(auto|scroll|hidden)/
+    };
+    var PLACEMENT_REGEX = {
+      auto: /\s?auto?\s?/i,
+      primary: /^(top|bottom|left|right)$/,
+      secondary: /^(top|bottom|left|right|center)$/,
+      vertical: /^(top|bottom)$/
+    };
+
+    return {
+
+      /**
+       * Provides a raw DOM element from a jQuery/jQLite element.
+       *
+       * @param {element} elem - The element to convert.
+       *
+       * @returns {element} A HTML element.
+       */
+      getRawNode: function(elem) {
+        return elem[0] || elem;
+      },
+
+      /**
+       * Provides a parsed number for a style property.  Strips
+       * units and casts invalid numbers to 0.
+       *
+       * @param {string} value - The style value to parse.
+       *
+       * @returns {number} A valid number.
+       */
+      parseStyle: function(value) {
+        value = parseFloat(value);
+        return isFinite(value) ? value : 0;
+      },
+
+      /**
+       * Provides the closest positioned ancestor.
+       *
+       * @param {element} element - The element to get the offest parent for.
+       *
+       * @returns {element} The closest positioned ancestor.
+       */
+      offsetParent: function(elem) {
+        elem = this.getRawNode(elem);
+
+        var offsetParent = elem.offsetParent || $document[0].documentElement;
+
+        function isStaticPositioned(el) {
+          return ($window.getComputedStyle(el).position || 'static') === 'static';
+        }
+
+        while (offsetParent && offsetParent !== $document[0].documentElement && isStaticPositioned(offsetParent)) {
+          offsetParent = offsetParent.offsetParent;
+        }
+
+        return offsetParent || $document[0].documentElement;
+      },
+
+      /**
+       * Provides the scrollbar width, concept from TWBS measureScrollbar()
+       * function in https://github.com/twbs/bootstrap/blob/master/js/modal.js
+       *
+       * @returns {number} The width of the browser scollbar.
+       */
+      scrollbarWidth: function() {
+        if (angular.isUndefined(SCROLLBAR_WIDTH)) {
+          var scrollElem = angular.element('<div style="position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll;"></div>');
+          $document.find('body').append(scrollElem);
+          SCROLLBAR_WIDTH = scrollElem[0].offsetWidth - scrollElem[0].clientWidth;
+          SCROLLBAR_WIDTH = isFinite(SCROLLBAR_WIDTH) ? SCROLLBAR_WIDTH : 0;
+          scrollElem.remove();
+        }
+
+        return SCROLLBAR_WIDTH;
+      },
+
+      /**
+       * Provides the closest scrollable ancestor.
+       * A port of the jQuery UI scrollParent method:
+       * https://github.com/jquery/jquery-ui/blob/master/ui/scroll-parent.js
+       *
+       * @param {element} elem - The element to find the scroll parent of.
+       * @param {boolean=} [includeHidden=false] - Should scroll style of 'hidden' be considered,
+       *   default is false.
+       *
+       * @returns {element} A HTML element.
+       */
+      scrollParent: function(elem, includeHidden) {
+        elem = this.getRawNode(elem);
+
+        var overflowRegex = includeHidden ? OVERFLOW_REGEX.hidden : OVERFLOW_REGEX.normal;
+        var documentEl = $document[0].documentElement;
+        var elemStyle = $window.getComputedStyle(elem);
+        var excludeStatic = elemStyle.position === 'absolute';
+        var scrollParent = elem.parentElement || documentEl;
+
+        if (scrollParent === documentEl || elemStyle.position === 'fixed') {
+          return documentEl;
+        }
+
+        while (scrollParent.parentElement && scrollParent !== documentEl) {
+          var spStyle = $window.getComputedStyle(scrollParent);
+          if (excludeStatic && spStyle.position !== 'static') {
+            excludeStatic = false;
+          }
+
+          if (!excludeStatic && overflowRegex.test(spStyle.overflow + spStyle.overflowY + spStyle.overflowX)) {
+            break;
+          }
+          scrollParent = scrollParent.parentElement;
+        }
+
+        return scrollParent;
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's position function:
+       * http://api.jquery.com/position/ - distance to closest positioned
+       * ancestor.  Does not account for margins by default like jQuery position.
+       *
+       * @param {element} elem - The element to caclulate the position on.
+       * @param {boolean=} [includeMargins=false] - Should margins be accounted
+       * for, default is false.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**width**: the width of the element</li>
+       *     <li>**height**: the height of the element</li>
+       *     <li>**top**: distance to top edge of offset parent</li>
+       *     <li>**left**: distance to left edge of offset parent</li>
+       *   </ul>
+       */
+      position: function(elem, includeMagins) {
+        elem = this.getRawNode(elem);
+
+        var elemOffset = this.offset(elem);
+        if (includeMagins) {
+          var elemStyle = $window.getComputedStyle(elem);
+          elemOffset.top -= this.parseStyle(elemStyle.marginTop);
+          elemOffset.left -= this.parseStyle(elemStyle.marginLeft);
+        }
+        var parent = this.offsetParent(elem);
+        var parentOffset = {top: 0, left: 0};
+
+        if (parent !== $document[0].documentElement) {
+          parentOffset = this.offset(parent);
+          parentOffset.top += parent.clientTop - parent.scrollTop;
+          parentOffset.left += parent.clientLeft - parent.scrollLeft;
+        }
+
+        return {
+          width: Math.round(angular.isNumber(elemOffset.width) ? elemOffset.width : elem.offsetWidth),
+          height: Math.round(angular.isNumber(elemOffset.height) ? elemOffset.height : elem.offsetHeight),
+          top: Math.round(elemOffset.top - parentOffset.top),
+          left: Math.round(elemOffset.left - parentOffset.left)
+        };
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's offset function:
+       * http://api.jquery.com/offset/ - distance to viewport.  Does
+       * not account for borders, margins, or padding on the body
+       * element.
+       *
+       * @param {element} elem - The element to calculate the offset on.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**width**: the width of the element</li>
+       *     <li>**height**: the height of the element</li>
+       *     <li>**top**: distance to top edge of viewport</li>
+       *     <li>**right**: distance to bottom edge of viewport</li>
+       *   </ul>
+       */
+      offset: function(elem) {
+        elem = this.getRawNode(elem);
+
+        var elemBCR = elem.getBoundingClientRect();
+        return {
+          width: Math.round(angular.isNumber(elemBCR.width) ? elemBCR.width : elem.offsetWidth),
+          height: Math.round(angular.isNumber(elemBCR.height) ? elemBCR.height : elem.offsetHeight),
+          top: Math.round(elemBCR.top + ($window.pageYOffset || $document[0].documentElement.scrollTop)),
+          left: Math.round(elemBCR.left + ($window.pageXOffset || $document[0].documentElement.scrollLeft))
+        };
+      },
+
+      /**
+       * Provides offset distance to the closest scrollable ancestor
+       * or viewport.  Accounts for border and scrollbar width.
+       *
+       * Right and bottom dimensions represent the distance to the
+       * respective edge of the viewport element.  If the element
+       * edge extends beyond the viewport, a negative value will be
+       * reported.
+       *
+       * @param {element} elem - The element to get the viewport offset for.
+       * @param {boolean=} [useDocument=false] - Should the viewport be the document element instead
+       * of the first scrollable element, default is false.
+       * @param {boolean=} [includePadding=true] - Should the padding on the offset parent element
+       * be accounted for, default is true.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**top**: distance to the top content edge of viewport element</li>
+       *     <li>**bottom**: distance to the bottom content edge of viewport element</li>
+       *     <li>**left**: distance to the left content edge of viewport element</li>
+       *     <li>**right**: distance to the right content edge of viewport element</li>
+       *   </ul>
+       */
+      viewportOffset: function(elem, useDocument, includePadding) {
+        elem = this.getRawNode(elem);
+        includePadding = includePadding !== false ? true : false;
+
+        var elemBCR = elem.getBoundingClientRect();
+        var offsetBCR = {top: 0, left: 0, bottom: 0, right: 0};
+
+        var offsetParent = useDocument ? $document[0].documentElement : this.scrollParent(elem);
+        var offsetParentBCR = offsetParent.getBoundingClientRect();
+
+        offsetBCR.top = offsetParentBCR.top + offsetParent.clientTop;
+        offsetBCR.left = offsetParentBCR.left + offsetParent.clientLeft;
+        if (offsetParent === $document[0].documentElement) {
+          offsetBCR.top += $window.pageYOffset;
+          offsetBCR.left += $window.pageXOffset;
+        }
+        offsetBCR.bottom = offsetBCR.top + offsetParent.clientHeight;
+        offsetBCR.right = offsetBCR.left + offsetParent.clientWidth;
+
+        if (includePadding) {
+          var offsetParentStyle = $window.getComputedStyle(offsetParent);
+          offsetBCR.top += this.parseStyle(offsetParentStyle.paddingTop);
+          offsetBCR.bottom -= this.parseStyle(offsetParentStyle.paddingBottom);
+          offsetBCR.left += this.parseStyle(offsetParentStyle.paddingLeft);
+          offsetBCR.right -= this.parseStyle(offsetParentStyle.paddingRight);
+        }
+
+        return {
+          top: Math.round(elemBCR.top - offsetBCR.top),
+          bottom: Math.round(offsetBCR.bottom - elemBCR.bottom),
+          left: Math.round(elemBCR.left - offsetBCR.left),
+          right: Math.round(offsetBCR.right - elemBCR.right)
+        };
+      },
+
+      /**
+       * Provides an array of placement values parsed from a placement string.
+       * Along with the 'auto' indicator, supported placement strings are:
+       *   <ul>
+       *     <li>top: element on top, horizontally centered on host element.</li>
+       *     <li>top-left: element on top, left edge aligned with host element left edge.</li>
+       *     <li>top-right: element on top, lerightft edge aligned with host element right edge.</li>
+       *     <li>bottom: element on bottom, horizontally centered on host element.</li>
+       *     <li>bottom-left: element on bottom, left edge aligned with host element left edge.</li>
+       *     <li>bottom-right: element on bottom, right edge aligned with host element right edge.</li>
+       *     <li>left: element on left, vertically centered on host element.</li>
+       *     <li>left-top: element on left, top edge aligned with host element top edge.</li>
+       *     <li>left-bottom: element on left, bottom edge aligned with host element bottom edge.</li>
+       *     <li>right: element on right, vertically centered on host element.</li>
+       *     <li>right-top: element on right, top edge aligned with host element top edge.</li>
+       *     <li>right-bottom: element on right, bottom edge aligned with host element bottom edge.</li>
+       *   </ul>
+       * A placement string with an 'auto' indicator is expected to be
+       * space separated from the placement, i.e: 'auto bottom-left'  If
+       * the primary and secondary placement values do not match 'top,
+       * bottom, left, right' then 'top' will be the primary placement and
+       * 'center' will be the secondary placement.  If 'auto' is passed, true
+       * will be returned as the 3rd value of the array.
+       *
+       * @param {string} placement - The placement string to parse.
+       *
+       * @returns {array} An array with the following values
+       * <ul>
+       *   <li>**[0]**: The primary placement.</li>
+       *   <li>**[1]**: The secondary placement.</li>
+       *   <li>**[2]**: If auto is passed: true, else undefined.</li>
+       * </ul>
+       */
+      parsePlacement: function(placement) {
+        var autoPlace = PLACEMENT_REGEX.auto.test(placement);
+        if (autoPlace) {
+          placement = placement.replace(PLACEMENT_REGEX.auto, '');
+        }
+
+        placement = placement.split('-');
+
+        placement[0] = placement[0] || 'top';
+        if (!PLACEMENT_REGEX.primary.test(placement[0])) {
+          placement[0] = 'top';
+        }
+
+        placement[1] = placement[1] || 'center';
+        if (!PLACEMENT_REGEX.secondary.test(placement[1])) {
+          placement[1] = 'center';
+        }
+
+        if (autoPlace) {
+          placement[2] = true;
+        } else {
+          placement[2] = false;
+        }
+
+        return placement;
+      },
+
+      /**
+       * Provides coordinates for an element to be positioned relative to
+       * another element.  Passing 'auto' as part of the placement parameter
+       * will enable smart placement - where the element fits. i.e:
+       * 'auto left-top' will check to see if there is enough space to the left
+       * of the hostElem to fit the targetElem, if not place right (same for secondary
+       * top placement).  Available space is calculated using the viewportOffset
+       * function.
+       *
+       * @param {element} hostElem - The element to position against.
+       * @param {element} targetElem - The element to position.
+       * @param {string=} [placement=top] - The placement for the targetElem,
+       *   default is 'top'. 'center' is assumed as secondary placement for
+       *   'top', 'left', 'right', and 'bottom' placements.  Available placements are:
+       *   <ul>
+       *     <li>top</li>
+       *     <li>top-right</li>
+       *     <li>top-left</li>
+       *     <li>bottom</li>
+       *     <li>bottom-left</li>
+       *     <li>bottom-right</li>
+       *     <li>left</li>
+       *     <li>left-top</li>
+       *     <li>left-bottom</li>
+       *     <li>right</li>
+       *     <li>right-top</li>
+       *     <li>right-bottom</li>
+       *   </ul>
+       * @param {boolean=} [appendToBody=false] - Should the top and left values returned
+       *   be calculated from the body element, default is false.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**top**: Value for targetElem top.</li>
+       *     <li>**left**: Value for targetElem left.</li>
+       *     <li>**placement**: The resolved placement.</li>
+       *   </ul>
+       */
+      positionElements: function(hostElem, targetElem, placement, appendToBody) {
+        hostElem = this.getRawNode(hostElem);
+        targetElem = this.getRawNode(targetElem);
+
+        // need to read from prop to support tests.
+        var targetWidth = angular.isDefined(targetElem.offsetWidth) ? targetElem.offsetWidth : targetElem.prop('offsetWidth');
+        var targetHeight = angular.isDefined(targetElem.offsetHeight) ? targetElem.offsetHeight : targetElem.prop('offsetHeight');
+
+        placement = this.parsePlacement(placement);
+
+        var hostElemPos = appendToBody ? this.offset(hostElem) : this.position(hostElem);
+        var targetElemPos = {top: 0, left: 0, placement: ''};
+
+        if (placement[2]) {
+          var viewportOffset = this.viewportOffset(hostElem);
+
+          var targetElemStyle = $window.getComputedStyle(targetElem);
+          var adjustedSize = {
+            width: targetWidth + Math.round(Math.abs(this.parseStyle(targetElemStyle.marginLeft) + this.parseStyle(targetElemStyle.marginRight))),
+            height: targetHeight + Math.round(Math.abs(this.parseStyle(targetElemStyle.marginTop) + this.parseStyle(targetElemStyle.marginBottom)))
+          };
+
+          placement[0] = placement[0] === 'top' && adjustedSize.height > viewportOffset.top && adjustedSize.height <= viewportOffset.bottom ? 'bottom' :
+                         placement[0] === 'bottom' && adjustedSize.height > viewportOffset.bottom && adjustedSize.height <= viewportOffset.top ? 'top' :
+                         placement[0] === 'left' && adjustedSize.width > viewportOffset.left && adjustedSize.width <= viewportOffset.right ? 'right' :
+                         placement[0] === 'right' && adjustedSize.width > viewportOffset.right && adjustedSize.width <= viewportOffset.left ? 'left' :
+                         placement[0];
+
+          placement[1] = placement[1] === 'top' && adjustedSize.height - hostElemPos.height > viewportOffset.bottom && adjustedSize.height - hostElemPos.height <= viewportOffset.top ? 'bottom' :
+                         placement[1] === 'bottom' && adjustedSize.height - hostElemPos.height > viewportOffset.top && adjustedSize.height - hostElemPos.height <= viewportOffset.bottom ? 'top' :
+                         placement[1] === 'left' && adjustedSize.width - hostElemPos.width > viewportOffset.right && adjustedSize.width - hostElemPos.width <= viewportOffset.left ? 'right' :
+                         placement[1] === 'right' && adjustedSize.width - hostElemPos.width > viewportOffset.left && adjustedSize.width - hostElemPos.width <= viewportOffset.right ? 'left' :
+                         placement[1];
+
+          if (placement[1] === 'center') {
+            if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+              var xOverflow = hostElemPos.width / 2 - targetWidth / 2;
+              if (viewportOffset.left + xOverflow < 0 && adjustedSize.width - hostElemPos.width <= viewportOffset.right) {
+                placement[1] = 'left';
+              } else if (viewportOffset.right + xOverflow < 0 && adjustedSize.width - hostElemPos.width <= viewportOffset.left) {
+                placement[1] = 'right';
+              }
+            } else {
+              var yOverflow = hostElemPos.height / 2 - adjustedSize.height / 2;
+              if (viewportOffset.top + yOverflow < 0 && adjustedSize.height - hostElemPos.height <= viewportOffset.bottom) {
+                placement[1] = 'top';
+              } else if (viewportOffset.bottom + yOverflow < 0 && adjustedSize.height - hostElemPos.height <= viewportOffset.top) {
+                placement[1] = 'bottom';
+              }
+            }
+          }
+        }
+
+        switch (placement[0]) {
+          case 'top':
+            targetElemPos.top = hostElemPos.top - targetHeight;
+            break;
+          case 'bottom':
+            targetElemPos.top = hostElemPos.top + hostElemPos.height;
+            break;
+          case 'left':
+            targetElemPos.left = hostElemPos.left - targetWidth;
+            break;
+          case 'right':
+            targetElemPos.left = hostElemPos.left + hostElemPos.width;
+            break;
+        }
+
+        switch (placement[1]) {
+          case 'top':
+            targetElemPos.top = hostElemPos.top;
+            break;
+          case 'bottom':
+            targetElemPos.top = hostElemPos.top + hostElemPos.height - targetHeight;
+            break;
+          case 'left':
+            targetElemPos.left = hostElemPos.left;
+            break;
+          case 'right':
+            targetElemPos.left = hostElemPos.left + hostElemPos.width - targetWidth;
+            break;
+          case 'center':
+            if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+              targetElemPos.left = hostElemPos.left + hostElemPos.width / 2 - targetWidth / 2;
+            } else {
+              targetElemPos.top = hostElemPos.top + hostElemPos.height / 2 - targetHeight / 2;
+            }
+            break;
+        }
+
+        targetElemPos.top = Math.round(targetElemPos.top);
+        targetElemPos.left = Math.round(targetElemPos.left);
+        targetElemPos.placement = placement[1] === 'center' ? placement[0] : placement[0] + '-' + placement[1];
+
+        return targetElemPos;
+      },
+
+      /**
+      * Provides a way for positioning tooltip & dropdown
+      * arrows when using placement options beyond the standard
+      * left, right, top, or bottom.
+      *
+      * @param {element} elem - The tooltip/dropdown element.
+      * @param {string} placement - The placement for the elem.
+      */
+      positionArrow: function(elem, placement) {
+        elem = this.getRawNode(elem);
+
+        var innerElem = elem.querySelector('.tooltip-inner, .popover-inner');
+        if (!innerElem) {
+          return;
+        }
+
+        var isTooltip = angular.element(innerElem).hasClass('tooltip-inner');
+
+        var arrowElem = isTooltip ? elem.querySelector('.tooltip-arrow') : elem.querySelector('.arrow');
+        if (!arrowElem) {
+          return;
+        }
+
+        placement = this.parsePlacement(placement);
+        if (placement[1] === 'center') {
+          // no adjustment necessary - just reset styles
+          angular.element(arrowElem).css({top: '', bottom: '', right: '', left: '', margin: ''});
+          return;
+        }
+
+        var borderProp = 'border-' + placement[0] + '-width';
+        var borderWidth = $window.getComputedStyle(arrowElem)[borderProp];
+
+        var borderRadiusProp = 'border-';
+        if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+          borderRadiusProp += placement[0] + '-' + placement[1];
+        } else {
+          borderRadiusProp += placement[1] + '-' + placement[0];
+        }
+        borderRadiusProp += '-radius';
+        var borderRadius = $window.getComputedStyle(isTooltip ? innerElem : elem)[borderRadiusProp];
+
+        var arrowCss = {
+          top: 'auto',
+          bottom: 'auto',
+          left: 'auto',
+          right: 'auto',
+          margin: 0
+        };
+
+        switch (placement[0]) {
+          case 'top':
+            arrowCss.bottom = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'bottom':
+            arrowCss.top = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'left':
+            arrowCss.right = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'right':
+            arrowCss.left = isTooltip ? '0' : '-' + borderWidth;
+            break;
+        }
+
+        arrowCss[placement[1]] = borderRadius;
+
+        angular.element(arrowElem).css(arrowCss);
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.isClass', 'ui.bootstrap.position'])
+
+.value('$datepickerSuppressError', false)
+
+.constant('uibDatepickerConfig', {
+  datepickerMode: 'day',
+  formatDay: 'dd',
+  formatMonth: 'MMMM',
+  formatYear: 'yyyy',
+  formatDayHeader: 'EEE',
+  formatDayTitle: 'MMMM yyyy',
+  formatMonthTitle: 'yyyy',
+  maxDate: null,
+  maxMode: 'year',
+  minDate: null,
+  minMode: 'day',
+  ngModelOptions: {},
+  shortcutPropagation: false,
+  showWeeks: true,
+  yearColumns: 5,
+  yearRows: 4
+})
+
+.controller('UibDatepickerController', ['$scope', '$attrs', '$parse', '$interpolate', '$locale', '$log', 'dateFilter', 'uibDatepickerConfig', '$datepickerSuppressError', 'uibDateParser',
+  function($scope, $attrs, $parse, $interpolate, $locale, $log, dateFilter, datepickerConfig, $datepickerSuppressError, dateParser) {
+  var self = this,
+      ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl;
+      ngModelOptions = {},
+      watchListeners = [];
+
+  // Modes chain
+  this.modes = ['day', 'month', 'year'];
+
+  // Interpolated configuration attributes
+  angular.forEach(['formatDay', 'formatMonth', 'formatYear', 'formatDayHeader', 'formatDayTitle', 'formatMonthTitle'], function(key) {
+    self[key] = angular.isDefined($attrs[key]) ? $interpolate($attrs[key])($scope.$parent) : datepickerConfig[key];
+  });
+
+  // Evaled configuration attributes
+  angular.forEach(['showWeeks', 'yearRows', 'yearColumns', 'shortcutPropagation'], function(key) {
+    self[key] = angular.isDefined($attrs[key]) ?
+      $scope.$parent.$eval($attrs[key]) : datepickerConfig[key];
+  });
+
+  if (angular.isDefined($attrs.startingDay)) {
+    self.startingDay = $scope.$parent.$eval($attrs.startingDay);
+  } else if (angular.isNumber(datepickerConfig.startingDay)) {
+    self.startingDay = datepickerConfig.startingDay;
+  } else {
+    self.startingDay = ($locale.DATETIME_FORMATS.FIRSTDAYOFWEEK + 8) % 7;
+  }
+
+  // Watchable date attributes
+  angular.forEach(['minDate', 'maxDate'], function(key) {
+    if ($attrs[key]) {
+      watchListeners.push($scope.$parent.$watch($attrs[key], function(value) {
+        self[key] = value ? angular.isDate(value) ? dateParser.fromTimezone(new Date(value), ngModelOptions.timezone) : new Date(dateFilter(value, 'medium')) : null;
+        self.refreshView();
+      }));
+    } else {
+      self[key] = datepickerConfig[key] ? dateParser.fromTimezone(new Date(datepickerConfig[key]), ngModelOptions.timezone) : null;
+    }
+  });
+
+  angular.forEach(['minMode', 'maxMode'], function(key) {
+    if ($attrs[key]) {
+      watchListeners.push($scope.$parent.$watch($attrs[key], function(value) {
+        self[key] = $scope[key] = angular.isDefined(value) ? value : $attrs[key];
+        if (key === 'minMode' && self.modes.indexOf($scope.datepickerMode) < self.modes.indexOf(self[key]) ||
+          key === 'maxMode' && self.modes.indexOf($scope.datepickerMode) > self.modes.indexOf(self[key])) {
+          $scope.datepickerMode = self[key];
+        }
+      }));
+    } else {
+      self[key] = $scope[key] = datepickerConfig[key] || null;
+    }
+  });
+
+  $scope.datepickerMode = $scope.datepickerMode || datepickerConfig.datepickerMode;
+  $scope.uniqueId = 'datepicker-' + $scope.$id + '-' + Math.floor(Math.random() * 10000);
+
+  if (angular.isDefined($attrs.initDate)) {
+    this.activeDate = dateParser.fromTimezone($scope.$parent.$eval($attrs.initDate), ngModelOptions.timezone) || new Date();
+    watchListeners.push($scope.$parent.$watch($attrs.initDate, function(initDate) {
+      if (initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)) {
+        self.activeDate = dateParser.fromTimezone(initDate, ngModelOptions.timezone);
+        self.refreshView();
+      }
+    }));
+  } else {
+    this.activeDate = new Date();
+  }
+
+  $scope.disabled = angular.isDefined($attrs.disabled) || false;
+  if (angular.isDefined($attrs.ngDisabled)) {
+    watchListeners.push($scope.$parent.$watch($attrs.ngDisabled, function(disabled) {
+      $scope.disabled = disabled;
+      self.refreshView();
+    }));
+  }
+
+  $scope.isActive = function(dateObject) {
+    if (self.compare(dateObject.date, self.activeDate) === 0) {
+      $scope.activeDateId = dateObject.uid;
+      return true;
+    }
+    return false;
+  };
+
+  this.init = function(ngModelCtrl_) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelOptions = ngModelCtrl_.$options || datepickerConfig.ngModelOptions;
+
+    if (ngModelCtrl.$modelValue) {
+      this.activeDate = ngModelCtrl.$modelValue;
+    }
+
+    ngModelCtrl.$render = function() {
+      self.render();
+    };
+  };
+
+  this.render = function() {
+    if (ngModelCtrl.$viewValue) {
+      var date = new Date(ngModelCtrl.$viewValue),
+          isValid = !isNaN(date);
+
+      if (isValid) {
+        this.activeDate = dateParser.fromTimezone(date, ngModelOptions.timezone);
+      } else if (!$datepickerSuppressError) {
+        $log.error('Datepicker directive: "ng-model" value must be a Date object');
+      }
+    }
+    this.refreshView();
+  };
+
+  this.refreshView = function() {
+    if (this.element) {
+      $scope.selectedDt = null;
+      this._refreshView();
+      if ($scope.activeDt) {
+        $scope.activeDateId = $scope.activeDt.uid;
+      }
+
+      var date = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+      date = dateParser.fromTimezone(date, ngModelOptions.timezone);
+      ngModelCtrl.$setValidity('dateDisabled', !date ||
+        this.element && !this.isDisabled(date));
+    }
+  };
+
+  this.createDateObject = function(date, format) {
+    var model = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+    model = dateParser.fromTimezone(model, ngModelOptions.timezone);
+    var dt = {
+      date: date,
+      label: dateFilter(date, format.replace(/d!/, 'dd')).replace(/M!/, 'MM'),
+      selected: model && this.compare(date, model) === 0,
+      disabled: this.isDisabled(date),
+      current: this.compare(date, new Date()) === 0,
+      customClass: this.customClass(date) || null
+    };
+
+    if (model && this.compare(date, model) === 0) {
+      $scope.selectedDt = dt;
+    }
+
+    if (self.activeDate && this.compare(dt.date, self.activeDate) === 0) {
+      $scope.activeDt = dt;
+    }
+
+    return dt;
+  };
+
+  this.isDisabled = function(date) {
+    return $scope.disabled ||
+      this.minDate && this.compare(date, this.minDate) < 0 ||
+      this.maxDate && this.compare(date, this.maxDate) > 0 ||
+      $attrs.dateDisabled && $scope.dateDisabled({date: date, mode: $scope.datepickerMode});
+  };
+
+  this.customClass = function(date) {
+    return $scope.customClass({date: date, mode: $scope.datepickerMode});
+  };
+
+  // Split array into smaller arrays
+  this.split = function(arr, size) {
+    var arrays = [];
+    while (arr.length > 0) {
+      arrays.push(arr.splice(0, size));
+    }
+    return arrays;
+  };
+
+  $scope.select = function(date) {
+    if ($scope.datepickerMode === self.minMode) {
+      var dt = ngModelCtrl.$viewValue ? dateParser.fromTimezone(new Date(ngModelCtrl.$viewValue), ngModelOptions.timezone) : new Date(0, 0, 0, 0, 0, 0, 0);
+      dt.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
+      dt = dateParser.toTimezone(dt, ngModelOptions.timezone);
+      ngModelCtrl.$setViewValue(dt);
+      ngModelCtrl.$render();
+    } else {
+      self.activeDate = date;
+      $scope.datepickerMode = self.modes[self.modes.indexOf($scope.datepickerMode) - 1];
+    }
+  };
+
+  $scope.move = function(direction) {
+    var year = self.activeDate.getFullYear() + direction * (self.step.years || 0),
+        month = self.activeDate.getMonth() + direction * (self.step.months || 0);
+    self.activeDate.setFullYear(year, month, 1);
+    self.refreshView();
+  };
+
+  $scope.toggleMode = function(direction) {
+    direction = direction || 1;
+
+    if ($scope.datepickerMode === self.maxMode && direction === 1 ||
+      $scope.datepickerMode === self.minMode && direction === -1) {
+      return;
+    }
+
+    $scope.datepickerMode = self.modes[self.modes.indexOf($scope.datepickerMode) + direction];
+  };
+
+  // Key event mapper
+  $scope.keys = { 13: 'enter', 32: 'space', 33: 'pageup', 34: 'pagedown', 35: 'end', 36: 'home', 37: 'left', 38: 'up', 39: 'right', 40: 'down' };
+
+  var focusElement = function() {
+    self.element[0].focus();
+  };
+
+  // Listen for focus requests from popup directive
+  $scope.$on('uib:datepicker.focus', focusElement);
+
+  $scope.keydown = function(evt) {
+    var key = $scope.keys[evt.which];
+
+    if (!key || evt.shiftKey || evt.altKey || $scope.disabled) {
+      return;
+    }
+
+    evt.preventDefault();
+    if (!self.shortcutPropagation) {
+      evt.stopPropagation();
+    }
+
+    if (key === 'enter' || key === 'space') {
+      if (self.isDisabled(self.activeDate)) {
+        return; // do nothing
+      }
+      $scope.select(self.activeDate);
+    } else if (evt.ctrlKey && (key === 'up' || key === 'down')) {
+      $scope.toggleMode(key === 'up' ? 1 : -1);
+    } else {
+      self.handleKeyDown(key, evt);
+      self.refreshView();
+    }
+  };
+
+  $scope.$on("$destroy", function() {
+    //Clear all watch listeners on destroy
+    while (watchListeners.length) {
+      watchListeners.shift()();
+    }
+  });
+}])
+
+.controller('UibDaypickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+  var DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+  this.step = { months: 1 };
+  this.element = $element;
+  function getDaysInMonth(year, month) {
+    return month === 1 && year % 4 === 0 &&
+      (year % 100 !== 0 || year % 400 === 0) ? 29 : DAYS_IN_MONTH[month];
+  }
+
+  this.init = function(ctrl) {
+    angular.extend(ctrl, this);
+    scope.showWeeks = ctrl.showWeeks;
+    ctrl.refreshView();
+  };
+
+  this.getDates = function(startDate, n) {
+    var dates = new Array(n), current = new Date(startDate), i = 0, date;
+    while (i < n) {
+      date = new Date(current);
+      dates[i++] = date;
+      current.setDate(current.getDate() + 1);
+    }
+    return dates;
+  };
+
+  this._refreshView = function() {
+    var year = this.activeDate.getFullYear(),
+      month = this.activeDate.getMonth(),
+      firstDayOfMonth = new Date(this.activeDate);
+
+    firstDayOfMonth.setFullYear(year, month, 1);
+
+    var difference = this.startingDay - firstDayOfMonth.getDay(),
+      numDisplayedFromPreviousMonth = difference > 0 ?
+        7 - difference : - difference,
+      firstDate = new Date(firstDayOfMonth);
+
+    if (numDisplayedFromPreviousMonth > 0) {
+      firstDate.setDate(-numDisplayedFromPreviousMonth + 1);
+    }
+
+    // 42 is the number of days on a six-week calendar
+    var days = this.getDates(firstDate, 42);
+    for (var i = 0; i < 42; i ++) {
+      days[i] = angular.extend(this.createDateObject(days[i], this.formatDay), {
+        secondary: days[i].getMonth() !== month,
+        uid: scope.uniqueId + '-' + i
+      });
+    }
+
+    scope.labels = new Array(7);
+    for (var j = 0; j < 7; j++) {
+      scope.labels[j] = {
+        abbr: dateFilter(days[j].date, this.formatDayHeader),
+        full: dateFilter(days[j].date, 'EEEE')
+      };
+    }
+
+    scope.title = dateFilter(this.activeDate, this.formatDayTitle);
+    scope.rows = this.split(days, 7);
+
+    if (scope.showWeeks) {
+      scope.weekNumbers = [];
+      var thursdayIndex = (4 + 7 - this.startingDay) % 7,
+          numWeeks = scope.rows.length;
+      for (var curWeek = 0; curWeek < numWeeks; curWeek++) {
+        scope.weekNumbers.push(
+          getISO8601WeekNumber(scope.rows[curWeek][thursdayIndex].date));
+      }
+    }
+  };
+
+  this.compare = function(date1, date2) {
+    var _date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+    var _date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+    _date1.setFullYear(date1.getFullYear());
+    _date2.setFullYear(date2.getFullYear());
+    return _date1 - _date2;
+  };
+
+  function getISO8601WeekNumber(date) {
+    var checkDate = new Date(date);
+    checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); // Thursday
+    var time = checkDate.getTime();
+    checkDate.setMonth(0); // Compare with Jan 1
+    checkDate.setDate(1);
+    return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+  }
+
+  this.handleKeyDown = function(key, evt) {
+    var date = this.activeDate.getDate();
+
+    if (key === 'left') {
+      date = date - 1;
+    } else if (key === 'up') {
+      date = date - 7;
+    } else if (key === 'right') {
+      date = date + 1;
+    } else if (key === 'down') {
+      date = date + 7;
+    } else if (key === 'pageup' || key === 'pagedown') {
+      var month = this.activeDate.getMonth() + (key === 'pageup' ? - 1 : 1);
+      this.activeDate.setMonth(month, 1);
+      date = Math.min(getDaysInMonth(this.activeDate.getFullYear(), this.activeDate.getMonth()), date);
+    } else if (key === 'home') {
+      date = 1;
+    } else if (key === 'end') {
+      date = getDaysInMonth(this.activeDate.getFullYear(), this.activeDate.getMonth());
+    }
+    this.activeDate.setDate(date);
+  };
+}])
+
+.controller('UibMonthpickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+  this.step = { years: 1 };
+  this.element = $element;
+
+  this.init = function(ctrl) {
+    angular.extend(ctrl, this);
+    ctrl.refreshView();
+  };
+
+  this._refreshView = function() {
+    var months = new Array(12),
+        year = this.activeDate.getFullYear(),
+        date;
+
+    for (var i = 0; i < 12; i++) {
+      date = new Date(this.activeDate);
+      date.setFullYear(year, i, 1);
+      months[i] = angular.extend(this.createDateObject(date, this.formatMonth), {
+        uid: scope.uniqueId + '-' + i
+      });
+    }
+
+    scope.title = dateFilter(this.activeDate, this.formatMonthTitle);
+    scope.rows = this.split(months, 3);
+  };
+
+  this.compare = function(date1, date2) {
+    var _date1 = new Date(date1.getFullYear(), date1.getMonth());
+    var _date2 = new Date(date2.getFullYear(), date2.getMonth());
+    _date1.setFullYear(date1.getFullYear());
+    _date2.setFullYear(date2.getFullYear());
+    return _date1 - _date2;
+  };
+
+  this.handleKeyDown = function(key, evt) {
+    var date = this.activeDate.getMonth();
+
+    if (key === 'left') {
+      date = date - 1;
+    } else if (key === 'up') {
+      date = date - 3;
+    } else if (key === 'right') {
+      date = date + 1;
+    } else if (key === 'down') {
+      date = date + 3;
+    } else if (key === 'pageup' || key === 'pagedown') {
+      var year = this.activeDate.getFullYear() + (key === 'pageup' ? - 1 : 1);
+      this.activeDate.setFullYear(year);
+    } else if (key === 'home') {
+      date = 0;
+    } else if (key === 'end') {
+      date = 11;
+    }
+    this.activeDate.setMonth(date);
+  };
+}])
+
+.controller('UibYearpickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+  var columns, range;
+  this.element = $element;
+
+  function getStartingYear(year) {
+    return parseInt((year - 1) / range, 10) * range + 1;
+  }
+
+  this.yearpickerInit = function() {
+    columns = this.yearColumns;
+    range = this.yearRows * columns;
+    this.step = { years: range };
+  };
+
+  this._refreshView = function() {
+    var years = new Array(range), date;
+
+    for (var i = 0, start = getStartingYear(this.activeDate.getFullYear()); i < range; i++) {
+      date = new Date(this.activeDate);
+      date.setFullYear(start + i, 0, 1);
+      years[i] = angular.extend(this.createDateObject(date, this.formatYear), {
+        uid: scope.uniqueId + '-' + i
+      });
+    }
+
+    scope.title = [years[0].label, years[range - 1].label].join(' - ');
+    scope.rows = this.split(years, columns);
+    scope.columns = columns;
+  };
+
+  this.compare = function(date1, date2) {
+    return date1.getFullYear() - date2.getFullYear();
+  };
+
+  this.handleKeyDown = function(key, evt) {
+    var date = this.activeDate.getFullYear();
+
+    if (key === 'left') {
+      date = date - 1;
+    } else if (key === 'up') {
+      date = date - columns;
+    } else if (key === 'right') {
+      date = date + 1;
+    } else if (key === 'down') {
+      date = date + columns;
+    } else if (key === 'pageup' || key === 'pagedown') {
+      date += (key === 'pageup' ? - 1 : 1) * range;
+    } else if (key === 'home') {
+      date = getStartingYear(this.activeDate.getFullYear());
+    } else if (key === 'end') {
+      date = getStartingYear(this.activeDate.getFullYear()) + range - 1;
+    }
+    this.activeDate.setFullYear(date);
+  };
+}])
+
+.directive('uibDatepicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/datepicker.html';
+    },
+    scope: {
+      datepickerMode: '=?',
+      dateDisabled: '&',
+      customClass: '&',
+      shortcutPropagation: '&?'
+    },
+    require: ['uibDatepicker', '^ngModel'],
+    controller: 'UibDatepickerController',
+    controllerAs: 'datepicker',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      datepickerCtrl.init(ngModelCtrl);
+    }
+  };
+})
+
+.directive('uibDaypicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/day.html';
+    },
+    require: ['^uibDatepicker', 'uibDaypicker'],
+    controller: 'UibDaypickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0],
+        daypickerCtrl = ctrls[1];
+
+      daypickerCtrl.init(datepickerCtrl);
+    }
+  };
+})
+
+.directive('uibMonthpicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/month.html';
+    },
+    require: ['^uibDatepicker', 'uibMonthpicker'],
+    controller: 'UibMonthpickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0],
+        monthpickerCtrl = ctrls[1];
+
+      monthpickerCtrl.init(datepickerCtrl);
+    }
+  };
+})
+
+.directive('uibYearpicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/year.html';
+    },
+    require: ['^uibDatepicker', 'uibYearpicker'],
+    controller: 'UibYearpickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var ctrl = ctrls[0];
+      angular.extend(ctrl, ctrls[1]);
+      ctrl.yearpickerInit();
+
+      ctrl.refreshView();
+    }
+  };
+})
+
+.constant('uibDatepickerPopupConfig', {
+  altInputFormats: [],
+  appendToBody: false,
+  clearText: 'Clear',
+  closeOnDateSelection: true,
+  closeText: 'Done',
+  currentText: 'Today',
+  datepickerPopup: 'yyyy-MM-dd',
+  datepickerPopupTemplateUrl: 'uib/template/datepicker/popup.html',
+  datepickerTemplateUrl: 'uib/template/datepicker/datepicker.html',
+  html5Types: {
+    date: 'yyyy-MM-dd',
+    'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
+    'month': 'yyyy-MM'
+  },
+  onOpenFocus: true,
+  showButtonBar: true
+})
+
+.controller('UibDatepickerPopupController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$document', '$rootScope', '$uibPosition', 'dateFilter', 'uibDateParser', 'uibDatepickerPopupConfig', '$timeout', 'uibDatepickerConfig',
+function(scope, element, attrs, $compile, $parse, $document, $rootScope, $position, dateFilter, dateParser, datepickerPopupConfig, $timeout, datepickerConfig) {
+  var cache = {},
+    isHtml5DateInput = false;
+  var dateFormat, closeOnDateSelection, appendToBody, onOpenFocus,
+    datepickerPopupTemplateUrl, datepickerTemplateUrl, popupEl, datepickerEl,
+    ngModel, ngModelOptions, $popup, altInputFormats, watchListeners = [];
+
+  scope.watchData = {};
+
+  this.init = function(_ngModel_) {
+    ngModel = _ngModel_;
+    ngModelOptions = _ngModel_.$options || datepickerConfig.ngModelOptions;
+    closeOnDateSelection = angular.isDefined(attrs.closeOnDateSelection) ? scope.$parent.$eval(attrs.closeOnDateSelection) : datepickerPopupConfig.closeOnDateSelection;
+    appendToBody = angular.isDefined(attrs.datepickerAppendToBody) ? scope.$parent.$eval(attrs.datepickerAppendToBody) : datepickerPopupConfig.appendToBody;
+    onOpenFocus = angular.isDefined(attrs.onOpenFocus) ? scope.$parent.$eval(attrs.onOpenFocus) : datepickerPopupConfig.onOpenFocus;
+    datepickerPopupTemplateUrl = angular.isDefined(attrs.datepickerPopupTemplateUrl) ? attrs.datepickerPopupTemplateUrl : datepickerPopupConfig.datepickerPopupTemplateUrl;
+    datepickerTemplateUrl = angular.isDefined(attrs.datepickerTemplateUrl) ? attrs.datepickerTemplateUrl : datepickerPopupConfig.datepickerTemplateUrl;
+    altInputFormats = angular.isDefined(attrs.altInputFormats) ? scope.$parent.$eval(attrs.altInputFormats) : datepickerPopupConfig.altInputFormats;
+
+    scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? scope.$parent.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
+
+    if (datepickerPopupConfig.html5Types[attrs.type]) {
+      dateFormat = datepickerPopupConfig.html5Types[attrs.type];
+      isHtml5DateInput = true;
+    } else {
+      dateFormat = attrs.uibDatepickerPopup || datepickerPopupConfig.datepickerPopup;
+      attrs.$observe('uibDatepickerPopup', function(value, oldValue) {
+        var newDateFormat = value || datepickerPopupConfig.datepickerPopup;
+        // Invalidate the $modelValue to ensure that formatters re-run
+        // FIXME: Refactor when PR is merged: https://github.com/angular/angular.js/pull/10764
+        if (newDateFormat !== dateFormat) {
+          dateFormat = newDateFormat;
+          ngModel.$modelValue = null;
+
+          if (!dateFormat) {
+            throw new Error('uibDatepickerPopup must have a date format specified.');
+          }
+        }
+      });
+    }
+
+    if (!dateFormat) {
+      throw new Error('uibDatepickerPopup must have a date format specified.');
+    }
+
+    if (isHtml5DateInput && attrs.uibDatepickerPopup) {
+      throw new Error('HTML5 date input types do not support custom formats.');
+    }
+
+    // popup element used to display calendar
+    popupEl = angular.element('<div uib-datepicker-popup-wrap><div uib-datepicker></div></div>');
+    scope.ngModelOptions = angular.copy(ngModelOptions);
+    scope.ngModelOptions.timezone = null;
+    popupEl.attr({
+      'ng-model': 'date',
+      'ng-model-options': 'ngModelOptions',
+      'ng-change': 'dateSelection(date)',
+      'template-url': datepickerPopupTemplateUrl
+    });
+
+    // datepicker element
+    datepickerEl = angular.element(popupEl.children()[0]);
+    datepickerEl.attr('template-url', datepickerTemplateUrl);
+
+    if (isHtml5DateInput) {
+      if (attrs.type === 'month') {
+        datepickerEl.attr('datepicker-mode', '"month"');
+        datepickerEl.attr('min-mode', 'month');
+      }
+    }
+
+    if (scope.datepickerOptions) {
+      angular.forEach(scope.datepickerOptions, function(value, option) {
+        // Ignore this options, will be managed later
+        if (['minDate', 'maxDate', 'minMode', 'maxMode', 'initDate', 'datepickerMode'].indexOf(option) === -1) {
+          datepickerEl.attr(cameltoDash(option), value);
+        } else {
+          datepickerEl.attr(cameltoDash(option), 'datepickerOptions.' + option);
+        }
+      });
+    }
+
+    angular.forEach(['minMode', 'maxMode', 'datepickerMode', 'shortcutPropagation'], function(key) {
+      if (attrs[key]) {
+        var getAttribute = $parse(attrs[key]);
+        var propConfig = {
+          get: function() {
+            return getAttribute(scope.$parent);
+          }
+        };
+
+        datepickerEl.attr(cameltoDash(key), 'watchData.' + key);
+
+        // Propagate changes from datepicker to outside
+        if (key === 'datepickerMode') {
+          var setAttribute = getAttribute.assign;
+          propConfig.set = function(v) {
+            setAttribute(scope.$parent, v);
+          };
+        }
+
+        Object.defineProperty(scope.watchData, key, propConfig);
+      }
+    });
+
+    angular.forEach(['minDate', 'maxDate', 'initDate'], function(key) {
+      if (attrs[key]) {
+        var getAttribute = $parse(attrs[key]);
+
+        watchListeners.push(scope.$parent.$watch(getAttribute, function(value) {
+          if (key === 'minDate' || key === 'maxDate') {
+            if (value === null) {
+              cache[key] = null;
+            } else if (angular.isDate(value)) {
+              cache[key] = dateParser.fromTimezone(new Date(value), ngModelOptions.timezone);
+            } else {
+              cache[key] = new Date(dateFilter(value, 'medium'));
+            }
+
+            scope.watchData[key] = value === null ? null : cache[key];
+          } else {
+            scope.watchData[key] = dateParser.fromTimezone(new Date(value), ngModelOptions.timezone);
+          }
+        }));
+
+        datepickerEl.attr(cameltoDash(key), 'watchData.' + key);
+      }
+    });
+
+    if (attrs.dateDisabled) {
+      datepickerEl.attr('date-disabled', 'dateDisabled({ date: date, mode: mode })');
+    }
+
+    angular.forEach(['formatDay', 'formatMonth', 'formatYear', 'formatDayHeader', 'formatDayTitle', 'formatMonthTitle', 'showWeeks', 'startingDay', 'yearRows', 'yearColumns'], function(key) {
+      if (angular.isDefined(attrs[key])) {
+        datepickerEl.attr(cameltoDash(key), attrs[key]);
+      }
+    });
+
+    if (attrs.customClass) {
+      datepickerEl.attr('custom-class', 'customClass({ date: date, mode: mode })');
+    }
+
+    if (!isHtml5DateInput) {
+      // Internal API to maintain the correct ng-invalid-[key] class
+      ngModel.$$parserName = 'date';
+      ngModel.$validators.date = validator;
+      ngModel.$parsers.unshift(parseDate);
+      ngModel.$formatters.push(function(value) {
+        if (ngModel.$isEmpty(value)) {
+          scope.date = value;
+          return value;
+        }
+        scope.date = dateParser.fromTimezone(value, ngModelOptions.timezone);
+        dateFormat = dateFormat.replace(/M!/, 'MM')
+            .replace(/d!/, 'dd');
+
+        return dateFilter(scope.date, dateFormat);
+      });
+    } else {
+      ngModel.$formatters.push(function(value) {
+        scope.date = dateParser.fromTimezone(value, ngModelOptions.timezone);
+        return value;
+      });
+    }
+
+    // Detect changes in the view from the text box
+    ngModel.$viewChangeListeners.push(function() {
+      scope.date = parseDateString(ngModel.$viewValue);
+    });
+
+    element.on('keydown', inputKeydownBind);
+
+    $popup = $compile(popupEl)(scope);
+    // Prevent jQuery cache memory leak (template is now redundant after linking)
+    popupEl.remove();
+
+    if (appendToBody) {
+      $document.find('body').append($popup);
+    } else {
+      element.after($popup);
+    }
+
+    scope.$on('$destroy', function() {
+      if (scope.isOpen === true) {
+        if (!$rootScope.$$phase) {
+          scope.$apply(function() {
+            scope.isOpen = false;
+          });
+        }
+      }
+
+      $popup.remove();
+      element.off('keydown', inputKeydownBind);
+      $document.off('click', documentClickBind);
+
+      //Clear all watch listeners on destroy
+      while (watchListeners.length) {
+        watchListeners.shift()();
+      }
+    });
+  };
+
+  scope.getText = function(key) {
+    return scope[key + 'Text'] || datepickerPopupConfig[key + 'Text'];
+  };
+
+  scope.isDisabled = function(date) {
+    if (date === 'today') {
+      date = new Date();
+    }
+
+    return scope.watchData.minDate && scope.compare(date, cache.minDate) < 0 ||
+        scope.watchData.maxDate && scope.compare(date, cache.maxDate) > 0;
+  };
+
+  scope.compare = function(date1, date2) {
+    return new Date(date1.getFullYear(), date1.getMonth(), date1.getDate()) - new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+  };
+
+  // Inner change
+  scope.dateSelection = function(dt) {
+    if (angular.isDefined(dt)) {
+      scope.date = dt;
+    }
+    var date = scope.date ? dateFilter(scope.date, dateFormat) : null; // Setting to NULL is necessary for form validators to function
+    element.val(date);
+    ngModel.$setViewValue(date);
+
+    if (closeOnDateSelection) {
+      scope.isOpen = false;
+      element[0].focus();
+    }
+  };
+
+  scope.keydown = function(evt) {
+    if (evt.which === 27) {
+      evt.stopPropagation();
+      scope.isOpen = false;
+      element[0].focus();
+    }
+  };
+
+  scope.select = function(date) {
+    if (date === 'today') {
+      var today = new Date();
+      if (angular.isDate(scope.date)) {
+        date = new Date(scope.date);
+        date.setFullYear(today.getFullYear(), today.getMonth(), today.getDate());
+      } else {
+        date = new Date(today.setHours(0, 0, 0, 0));
+      }
+    }
+    scope.dateSelection(date);
+  };
+
+  scope.close = function() {
+    scope.isOpen = false;
+    element[0].focus();
+  };
+
+  scope.disabled = angular.isDefined(attrs.disabled) || false;
+  if (attrs.ngDisabled) {
+    watchListeners.push(scope.$parent.$watch($parse(attrs.ngDisabled), function(disabled) {
+      scope.disabled = disabled;
+    }));
+  }
+
+  scope.$watch('isOpen', function(value) {
+    if (value) {
+      if (!scope.disabled) {
+        scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+        scope.position.top = scope.position.top + element.prop('offsetHeight');
+
+        $timeout(function() {
+          if (onOpenFocus) {
+            scope.$broadcast('uib:datepicker.focus');
+          }
+          $document.on('click', documentClickBind);
+        }, 0, false);
+      } else {
+        scope.isOpen = false;
+      }
+    } else {
+      $document.off('click', documentClickBind);
+    }
+  });
+
+  function cameltoDash(string) {
+    return string.replace(/([A-Z])/g, function($1) { return '-' + $1.toLowerCase(); });
+  }
+
+  function parseDateString(viewValue) {
+    var date = dateParser.parse(viewValue, dateFormat, scope.date);
+    if (isNaN(date)) {
+      for (var i = 0; i < altInputFormats.length; i++) {
+        date = dateParser.parse(viewValue, altInputFormats[i], scope.date);
+        if (!isNaN(date)) {
+          return date;
+        }
+      }
+    }
+    return date;
+  }
+
+  function parseDate(viewValue) {
+    if (angular.isNumber(viewValue)) {
+      // presumably timestamp to date object
+      viewValue = new Date(viewValue);
+    }
+
+    if (!viewValue) {
+      return null;
+    }
+
+    if (angular.isDate(viewValue) && !isNaN(viewValue)) {
+      return viewValue;
+    }
+
+    if (angular.isString(viewValue)) {
+      var date = parseDateString(viewValue);
+      if (!isNaN(date)) {
+        return dateParser.toTimezone(date, ngModelOptions.timezone);
+      }
+    }
+
+    return ngModel.$options && ngModel.$options.allowInvalid ? viewValue : undefined;
+  }
+
+  function validator(modelValue, viewValue) {
+    var value = modelValue || viewValue;
+
+    if (!attrs.ngRequired && !value) {
+      return true;
+    }
+
+    if (angular.isNumber(value)) {
+      value = new Date(value);
+    }
+
+    if (!value) {
+      return true;
+    }
+
+    if (angular.isDate(value) && !isNaN(value)) {
+      return true;
+    }
+
+    if (angular.isString(value)) {
+      return !isNaN(parseDateString(viewValue));
+    }
+
+    return false;
+  }
+
+  function documentClickBind(event) {
+    if (!scope.isOpen && scope.disabled) {
+      return;
+    }
+
+    var popup = $popup[0];
+    var dpContainsTarget = element[0].contains(event.target);
+    // The popup node may not be an element node
+    // In some browsers (IE) only element nodes have the 'contains' function
+    var popupContainsTarget = popup.contains !== undefined && popup.contains(event.target);
+    if (scope.isOpen && !(dpContainsTarget || popupContainsTarget)) {
+      scope.$apply(function() {
+        scope.isOpen = false;
+      });
+    }
+  }
+
+  function inputKeydownBind(evt) {
+    if (evt.which === 27 && scope.isOpen) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      scope.$apply(function() {
+        scope.isOpen = false;
+      });
+      element[0].focus();
+    } else if (evt.which === 40 && !scope.isOpen) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      scope.$apply(function() {
+        scope.isOpen = true;
+      });
+    }
+  }
+}])
+
+.directive('uibDatepickerPopup', function() {
+  return {
+    require: ['ngModel', 'uibDatepickerPopup'],
+    controller: 'UibDatepickerPopupController',
+    scope: {
+      datepickerOptions: '=?',
+      isOpen: '=?',
+      currentText: '@',
+      clearText: '@',
+      closeText: '@',
+      dateDisabled: '&',
+      customClass: '&'
+    },
+    link: function(scope, element, attrs, ctrls) {
+      var ngModel = ctrls[0],
+        ctrl = ctrls[1];
+
+      ctrl.init(ngModel);
+    }
+  };
+})
+
+.directive('uibDatepickerPopupWrap', function() {
+  return {
+    replace: true,
+    transclude: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/popup.html';
+    }
+  };
+});
+
+angular.module('ui.bootstrap.debounce', [])
+/**
+ * A helper, internal service that debounces a function
+ */
+  .factory('$$debounce', ['$timeout', function($timeout) {
+    return function(callback, debounceTime) {
+      var timeoutPromise;
+
+      return function() {
+        var self = this;
+        var args = Array.prototype.slice.call(arguments);
+        if (timeoutPromise) {
+          $timeout.cancel(timeoutPromise);
+        }
+
+        timeoutPromise = $timeout(function() {
+          callback.apply(self, args);
+        }, debounceTime);
+      };
+    };
+  }]);
+
+angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
+
+.constant('uibDropdownConfig', {
+  appendToOpenClass: 'uib-dropdown-open',
+  openClass: 'open'
+})
+
+.service('uibDropdownService', ['$document', '$rootScope', function($document, $rootScope) {
+  var openScope = null;
+
+  this.open = function(dropdownScope) {
+    if (!openScope) {
+      $document.on('click', closeDropdown);
+      $document.on('keydown', keybindFilter);
+    }
+
+    if (openScope && openScope !== dropdownScope) {
+      openScope.isOpen = false;
+    }
+
+    openScope = dropdownScope;
+  };
+
+  this.close = function(dropdownScope) {
+    if (openScope === dropdownScope) {
+      openScope = null;
+      $document.off('click', closeDropdown);
+      $document.off('keydown', keybindFilter);
+    }
+  };
+
+  var closeDropdown = function(evt) {
+    // This method may still be called during the same mouse event that
+    // unbound this event handler. So check openScope before proceeding.
+    if (!openScope) { return; }
+
+    if (evt && openScope.getAutoClose() === 'disabled') { return; }
+
+    if (evt && evt.which === 3) { return; }
+
+    var toggleElement = openScope.getToggleElement();
+    if (evt && toggleElement && toggleElement[0].contains(evt.target)) {
+      return;
+    }
+
+    var dropdownElement = openScope.getDropdownElement();
+    if (evt && openScope.getAutoClose() === 'outsideClick' &&
+      dropdownElement && dropdownElement[0].contains(evt.target)) {
+      return;
+    }
+
+    openScope.isOpen = false;
+
+    if (!$rootScope.$$phase) {
+      openScope.$apply();
+    }
+  };
+
+  var keybindFilter = function(evt) {
+    if (evt.which === 27) {
+      openScope.focusToggleElement();
+      closeDropdown();
+    } else if (openScope.isKeynavEnabled() && [38, 40].indexOf(evt.which) !== -1 && openScope.isOpen) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      openScope.focusDropdownEntry(evt.which);
+    }
+  };
+}])
+
+.controller('UibDropdownController', ['$scope', '$element', '$attrs', '$parse', 'uibDropdownConfig', 'uibDropdownService', '$animate', '$uibPosition', '$document', '$compile', '$templateRequest', function($scope, $element, $attrs, $parse, dropdownConfig, uibDropdownService, $animate, $position, $document, $compile, $templateRequest) {
+  var self = this,
+    scope = $scope.$new(), // create a child scope so we are not polluting original one
+    templateScope,
+    appendToOpenClass = dropdownConfig.appendToOpenClass,
+    openClass = dropdownConfig.openClass,
+    getIsOpen,
+    setIsOpen = angular.noop,
+    toggleInvoker = $attrs.onToggle ? $parse($attrs.onToggle) : angular.noop,
+    appendToBody = false,
+    appendTo = null,
+    keynavEnabled = false,
+    selectedOption = null,
+    body = $document.find('body');
+
+  $element.addClass('dropdown');
+
+  this.init = function() {
+    if ($attrs.isOpen) {
+      getIsOpen = $parse($attrs.isOpen);
+      setIsOpen = getIsOpen.assign;
+
+      $scope.$watch(getIsOpen, function(value) {
+        scope.isOpen = !!value;
+      });
+    }
+
+    if (angular.isDefined($attrs.dropdownAppendTo)) {
+      var appendToEl = $parse($attrs.dropdownAppendTo)(scope);
+      if (appendToEl) {
+        appendTo = angular.element(appendToEl);
+      }
+    }
+
+    appendToBody = angular.isDefined($attrs.dropdownAppendToBody);
+    keynavEnabled = angular.isDefined($attrs.keyboardNav);
+
+    if (appendToBody && !appendTo) {
+      appendTo = body;
+    }
+
+    if (appendTo && self.dropdownMenu) {
+      appendTo.append(self.dropdownMenu);
+      $element.on('$destroy', function handleDestroyEvent() {
+        self.dropdownMenu.remove();
+      });
+    }
+  };
+
+  this.toggle = function(open) {
+    return scope.isOpen = arguments.length ? !!open : !scope.isOpen;
+  };
+
+  // Allow other directives to watch status
+  this.isOpen = function() {
+    return scope.isOpen;
+  };
+
+  scope.getToggleElement = function() {
+    return self.toggleElement;
+  };
+
+  scope.getAutoClose = function() {
+    return $attrs.autoClose || 'always'; //or 'outsideClick' or 'disabled'
+  };
+
+  scope.getElement = function() {
+    return $element;
+  };
+
+  scope.isKeynavEnabled = function() {
+    return keynavEnabled;
+  };
+
+  scope.focusDropdownEntry = function(keyCode) {
+    var elems = self.dropdownMenu ? //If append to body is used.
+      angular.element(self.dropdownMenu).find('a') :
+      $element.find('ul').eq(0).find('a');
+
+    switch (keyCode) {
+      case 40: {
+        if (!angular.isNumber(self.selectedOption)) {
+          self.selectedOption = 0;
+        } else {
+          self.selectedOption = self.selectedOption === elems.length - 1 ?
+            self.selectedOption :
+            self.selectedOption + 1;
+        }
+        break;
+      }
+      case 38: {
+        if (!angular.isNumber(self.selectedOption)) {
+          self.selectedOption = elems.length - 1;
+        } else {
+          self.selectedOption = self.selectedOption === 0 ?
+            0 : self.selectedOption - 1;
+        }
+        break;
+      }
+    }
+    elems[self.selectedOption].focus();
+  };
+
+  scope.getDropdownElement = function() {
+    return self.dropdownMenu;
+  };
+
+  scope.focusToggleElement = function() {
+    if (self.toggleElement) {
+      self.toggleElement[0].focus();
+    }
+  };
+
+  scope.$watch('isOpen', function(isOpen, wasOpen) {
+    if (appendTo && self.dropdownMenu) {
+      var pos = $position.positionElements($element, self.dropdownMenu, 'bottom-left', true),
+        css,
+        rightalign;
+
+      css = {
+        top: pos.top + 'px',
+        display: isOpen ? 'block' : 'none'
+      };
+
+      rightalign = self.dropdownMenu.hasClass('dropdown-menu-right');
+      if (!rightalign) {
+        css.left = pos.left + 'px';
+        css.right = 'auto';
+      } else {
+        css.left = 'auto';
+        css.right = window.innerWidth -
+          (pos.left + $element.prop('offsetWidth')) + 'px';
+      }
+
+      // Need to adjust our positioning to be relative to the appendTo container
+      // if it's not the body element
+      if (!appendToBody) {
+        var appendOffset = $position.offset(appendTo);
+
+        css.top = pos.top - appendOffset.top + 'px';
+
+        if (!rightalign) {
+          css.left = pos.left - appendOffset.left + 'px';
+        } else {
+          css.right = window.innerWidth -
+            (pos.left - appendOffset.left + $element.prop('offsetWidth')) + 'px';
+        }
+      }
+
+      self.dropdownMenu.css(css);
+    }
+
+    var openContainer = appendTo ? appendTo : $element;
+
+    $animate[isOpen ? 'addClass' : 'removeClass'](openContainer, appendTo ? appendToOpenClass : openClass).then(function() {
+      if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
+        toggleInvoker($scope, { open: !!isOpen });
+      }
+    });
+
+    if (isOpen) {
+      if (self.dropdownMenuTemplateUrl) {
+        $templateRequest(self.dropdownMenuTemplateUrl).then(function(tplContent) {
+          templateScope = scope.$new();
+          $compile(tplContent.trim())(templateScope, function(dropdownElement) {
+            var newEl = dropdownElement;
+            self.dropdownMenu.replaceWith(newEl);
+            self.dropdownMenu = newEl;
+          });
+        });
+      }
+
+      scope.focusToggleElement();
+      uibDropdownService.open(scope);
+    } else {
+      if (self.dropdownMenuTemplateUrl) {
+        if (templateScope) {
+          templateScope.$destroy();
+        }
+        var newEl = angular.element('<ul class="dropdown-menu"></ul>');
+        self.dropdownMenu.replaceWith(newEl);
+        self.dropdownMenu = newEl;
+      }
+
+      uibDropdownService.close(scope);
+      self.selectedOption = null;
+    }
+
+    if (angular.isFunction(setIsOpen)) {
+      setIsOpen($scope, isOpen);
+    }
+  });
+
+  $scope.$on('$locationChangeSuccess', function() {
+    if (scope.getAutoClose() !== 'disabled') {
+      scope.isOpen = false;
+    }
+  });
+}])
+
+.directive('uibDropdown', function() {
+  return {
+    controller: 'UibDropdownController',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      dropdownCtrl.init();
+    }
+  };
+})
+
+.directive('uibDropdownMenu', function() {
+  return {
+    restrict: 'A',
+    require: '?^uibDropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if (!dropdownCtrl || angular.isDefined(attrs.dropdownNested)) {
+        return;
+      }
+
+      element.addClass('dropdown-menu');
+
+      var tplUrl = attrs.templateUrl;
+      if (tplUrl) {
+        dropdownCtrl.dropdownMenuTemplateUrl = tplUrl;
+      }
+
+      if (!dropdownCtrl.dropdownMenu) {
+        dropdownCtrl.dropdownMenu = element;
+      }
+    }
+  };
+})
+
+.directive('uibDropdownToggle', function() {
+  return {
+    require: '?^uibDropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if (!dropdownCtrl) {
+        return;
+      }
+
+      element.addClass('dropdown-toggle');
+
+      dropdownCtrl.toggleElement = element;
+
+      var toggleDropdown = function(event) {
+        event.preventDefault();
+
+        if (!element.hasClass('disabled') && !attrs.disabled) {
+          scope.$apply(function() {
+            dropdownCtrl.toggle();
+          });
+        }
+      };
+
+      element.bind('click', toggleDropdown);
+
+      // WAI-ARIA
+      element.attr({ 'aria-haspopup': true, 'aria-expanded': false });
+      scope.$watch(dropdownCtrl.isOpen, function(isOpen) {
+        element.attr('aria-expanded', !!isOpen);
+      });
+
+      scope.$on('$destroy', function() {
+        element.unbind('click', toggleDropdown);
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.stackedMap', [])
+/**
+ * A helper, internal data structure that acts as a map but also allows getting / removing
+ * elements in the LIFO order
+ */
+  .factory('$$stackedMap', function() {
+    return {
+      createNew: function() {
+        var stack = [];
+
+        return {
+          add: function(key, value) {
+            stack.push({
+              key: key,
+              value: value
+            });
+          },
+          get: function(key) {
+            for (var i = 0; i < stack.length; i++) {
+              if (key === stack[i].key) {
+                return stack[i];
+              }
+            }
+          },
+          keys: function() {
+            var keys = [];
+            for (var i = 0; i < stack.length; i++) {
+              keys.push(stack[i].key);
+            }
+            return keys;
+          },
+          top: function() {
+            return stack[stack.length - 1];
+          },
+          remove: function(key) {
+            var idx = -1;
+            for (var i = 0; i < stack.length; i++) {
+              if (key === stack[i].key) {
+                idx = i;
+                break;
+              }
+            }
+            return stack.splice(idx, 1)[0];
+          },
+          removeTop: function() {
+            return stack.splice(stack.length - 1, 1)[0];
+          },
+          length: function() {
+            return stack.length;
+          }
+        };
+      }
+    };
+  });
+angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap'])
+/**
+ * A helper, internal data structure that stores all references attached to key
+ */
+  .factory('$$multiMap', function() {
+    return {
+      createNew: function() {
+        var map = {};
+
+        return {
+          entries: function() {
+            return Object.keys(map).map(function(key) {
+              return {
+                key: key,
+                value: map[key]
+              };
+            });
+          },
+          get: function(key) {
+            return map[key];
+          },
+          hasKey: function(key) {
+            return !!map[key];
+          },
+          keys: function() {
+            return Object.keys(map);
+          },
+          put: function(key, value) {
+            if (!map[key]) {
+              map[key] = [];
+            }
+
+            map[key].push(value);
+          },
+          remove: function(key, value) {
+            var values = map[key];
+
+            if (!values) {
+              return;
+            }
+
+            var idx = values.indexOf(value);
+
+            if (idx !== -1) {
+              values.splice(idx, 1);
+            }
+
+            if (!values.length) {
+              delete map[key];
+            }
+          }
+        };
+      }
+    };
+  })
+
+/**
+ * Pluggable resolve mechanism for the modal resolve resolution
+ * Supports UI Router's $resolve service
+ */
+  .provider('$uibResolve', function() {
+    var resolve = this;
+    this.resolver = null;
+
+    this.setResolver = function(resolver) {
+      this.resolver = resolver;
+    };
+
+    this.$get = ['$injector', '$q', function($injector, $q) {
+      var resolver = resolve.resolver ? $injector.get(resolve.resolver) : null;
+      return {
+        resolve: function(invocables, locals, parent, self) {
+          if (resolver) {
+            return resolver.resolve(invocables, locals, parent, self);
+          }
+
+          var promises = [];
+
+          angular.forEach(invocables, function(value) {
+            if (angular.isFunction(value) || angular.isArray(value)) {
+              promises.push($q.resolve($injector.invoke(value)));
+            } else if (angular.isString(value)) {
+              promises.push($q.resolve($injector.get(value)));
+            } else {
+              promises.push($q.resolve(value));
+            }
+          });
+
+          return $q.all(promises).then(function(resolves) {
+            var resolveObj = {};
+            var resolveIter = 0;
+            angular.forEach(invocables, function(value, key) {
+              resolveObj[key] = resolves[resolveIter++];
+            });
+
+            return resolveObj;
+          });
+        }
+      };
+    }];
+  })
+
+/**
+ * A helper directive for the $modal service. It creates a backdrop element.
+ */
+  .directive('uibModalBackdrop', ['$animateCss', '$injector', '$uibModalStack',
+  function($animateCss, $injector, $modalStack) {
+    return {
+      replace: true,
+      templateUrl: 'uib/template/modal/backdrop.html',
+      compile: function(tElement, tAttrs) {
+        tElement.addClass(tAttrs.backdropClass);
+        return linkFn;
+      }
+    };
+
+    function linkFn(scope, element, attrs) {
+      if (attrs.modalInClass) {
+        $animateCss(element, {
+          addClass: attrs.modalInClass
+        }).start();
+
+        scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) {
+          var done = setIsAsync();
+          if (scope.modalOptions.animation) {
+            $animateCss(element, {
+              removeClass: attrs.modalInClass
+            }).start().then(done);
+          } else {
+            done();
+          }
+        });
+      }
+    }
+  }])
+
+  .directive('uibModalWindow', ['$uibModalStack', '$q', '$animate', '$animateCss', '$document',
+  function($modalStack, $q, $animate, $animateCss, $document) {
+    return {
+      scope: {
+        index: '@'
+      },
+      replace: true,
+      transclude: true,
+      templateUrl: function(tElement, tAttrs) {
+        return tAttrs.templateUrl || 'uib/template/modal/window.html';
+      },
+      link: function(scope, element, attrs) {
+        element.addClass(attrs.windowClass || '');
+        element.addClass(attrs.windowTopClass || '');
+        scope.size = attrs.size;
+
+        scope.close = function(evt) {
+          var modal = $modalStack.getTop();
+          if (modal && modal.value.backdrop &&
+            modal.value.backdrop !== 'static' &&
+            evt.target === evt.currentTarget) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            $modalStack.dismiss(modal.key, 'backdrop click');
+          }
+        };
+
+        // moved from template to fix issue #2280
+        element.on('click', scope.close);
+
+        // This property is only added to the scope for the purpose of detecting when this directive is rendered.
+        // We can detect that by using this property in the template associated with this directive and then use
+        // {@link Attribute#$observe} on it. For more details please see {@link TableColumnResize}.
+        scope.$isRendered = true;
+
+        // Deferred object that will be resolved when this modal is render.
+        var modalRenderDeferObj = $q.defer();
+        // Observe function will be called on next digest cycle after compilation, ensuring that the DOM is ready.
+        // In order to use this way of finding whether DOM is ready, we need to observe a scope property used in modal's template.
+        attrs.$observe('modalRender', function(value) {
+          if (value === 'true') {
+            modalRenderDeferObj.resolve();
+          }
+        });
+
+        modalRenderDeferObj.promise.then(function() {
+          var animationPromise = null;
+
+          if (attrs.modalInClass) {
+            animationPromise = $animateCss(element, {
+              addClass: attrs.modalInClass
+            }).start();
+
+            scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) {
+              var done = setIsAsync();
+              if ($animateCss) {
+                $animateCss(element, {
+                  removeClass: attrs.modalInClass
+                }).start().then(done);
+              } else {
+                $animate.removeClass(element, attrs.modalInClass).then(done);
+              }
+            });
+          }
+
+
+          $q.when(animationPromise).then(function() {
+            /**
+             * If something within the freshly-opened modal already has focus (perhaps via a
+             * directive that causes focus). then no need to try and focus anything.
+             */
+            if (!($document[0].activeElement && element[0].contains($document[0].activeElement))) {
+              var inputWithAutofocus = element[0].querySelector('[autofocus]');
+              /**
+               * Auto-focusing of a freshly-opened modal element causes any child elements
+               * with the autofocus attribute to lose focus. This is an issue on touch
+               * based devices which will show and then hide the onscreen keyboard.
+               * Attempts to refocus the autofocus element via JavaScript will not reopen
+               * the onscreen keyboard. Fixed by updated the focusing logic to only autofocus
+               * the modal element if the modal does not contain an autofocus element.
+               */
+              if (inputWithAutofocus) {
+                inputWithAutofocus.focus();
+              } else {
+                element[0].focus();
+              }
+            }
+          });
+
+          // Notify {@link $modalStack} that modal is rendered.
+          var modal = $modalStack.getTop();
+          if (modal) {
+            $modalStack.modalRendered(modal.key);
+          }
+        });
+      }
+    };
+  }])
+
+  .directive('uibModalAnimationClass', function() {
+    return {
+      compile: function(tElement, tAttrs) {
+        if (tAttrs.modalAnimation) {
+          tElement.addClass(tAttrs.uibModalAnimationClass);
+        }
+      }
+    };
+  })
+
+  .directive('uibModalTransclude', function() {
+    return {
+      link: function(scope, element, attrs, controller, transclude) {
+        transclude(scope.$parent, function(clone) {
+          element.empty();
+          element.append(clone);
+        });
+      }
+    };
+  })
+
+  .factory('$uibModalStack', ['$animate', '$animateCss', '$document',
+    '$compile', '$rootScope', '$q', '$$multiMap', '$$stackedMap',
+    function($animate, $animateCss, $document, $compile, $rootScope, $q, $$multiMap, $$stackedMap) {
+      var OPENED_MODAL_CLASS = 'modal-open';
+
+      var backdropDomEl, backdropScope;
+      var openedWindows = $$stackedMap.createNew();
+      var openedClasses = $$multiMap.createNew();
+      var $modalStack = {
+        NOW_CLOSING_EVENT: 'modal.stack.now-closing'
+      };
+
+      //Modal focus behavior
+      var focusableElementList;
+      var focusIndex = 0;
+      var tababbleSelector = 'a[href], area[href], input:not([disabled]), ' +
+        'button:not([disabled]),select:not([disabled]), textarea:not([disabled]), ' +
+        'iframe, object, embed, *[tabindex], *[contenteditable=true]';
+
+      function backdropIndex() {
+        var topBackdropIndex = -1;
+        var opened = openedWindows.keys();
+        for (var i = 0; i < opened.length; i++) {
+          if (openedWindows.get(opened[i]).value.backdrop) {
+            topBackdropIndex = i;
+          }
+        }
+        return topBackdropIndex;
+      }
+
+      $rootScope.$watch(backdropIndex, function(newBackdropIndex) {
+        if (backdropScope) {
+          backdropScope.index = newBackdropIndex;
+        }
+      });
+
+      function removeModalWindow(modalInstance, elementToReceiveFocus) {
+        var modalWindow = openedWindows.get(modalInstance).value;
+        var appendToElement = modalWindow.appendTo;
+
+        //clean up the stack
+        openedWindows.remove(modalInstance);
+
+        removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
+          var modalBodyClass = modalWindow.openedClass || OPENED_MODAL_CLASS;
+          openedClasses.remove(modalBodyClass, modalInstance);
+          appendToElement.toggleClass(modalBodyClass, openedClasses.hasKey(modalBodyClass));
+          toggleTopWindowClass(true);
+        }, modalWindow.closedDeferred);
+        checkRemoveBackdrop();
+
+        //move focus to specified element if available, or else to body
+        if (elementToReceiveFocus && elementToReceiveFocus.focus) {
+          elementToReceiveFocus.focus();
+        } else if (appendToElement.focus) {
+          appendToElement.focus();
+        }
+      }
+
+      // Add or remove "windowTopClass" from the top window in the stack
+      function toggleTopWindowClass(toggleSwitch) {
+        var modalWindow;
+
+        if (openedWindows.length() > 0) {
+          modalWindow = openedWindows.top().value;
+          modalWindow.modalDomEl.toggleClass(modalWindow.windowTopClass || '', toggleSwitch);
+        }
+      }
+
+      function checkRemoveBackdrop() {
+        //remove backdrop if no longer needed
+        if (backdropDomEl && backdropIndex() === -1) {
+          var backdropScopeRef = backdropScope;
+          removeAfterAnimate(backdropDomEl, backdropScope, function() {
+            backdropScopeRef = null;
+          });
+          backdropDomEl = undefined;
+          backdropScope = undefined;
+        }
+      }
+
+      function removeAfterAnimate(domEl, scope, done, closedDeferred) {
+        var asyncDeferred;
+        var asyncPromise = null;
+        var setIsAsync = function() {
+          if (!asyncDeferred) {
+            asyncDeferred = $q.defer();
+            asyncPromise = asyncDeferred.promise;
+          }
+
+          return function asyncDone() {
+            asyncDeferred.resolve();
+          };
+        };
+        scope.$broadcast($modalStack.NOW_CLOSING_EVENT, setIsAsync);
+
+        // Note that it's intentional that asyncPromise might be null.
+        // That's when setIsAsync has not been called during the
+        // NOW_CLOSING_EVENT broadcast.
+        return $q.when(asyncPromise).then(afterAnimating);
+
+        function afterAnimating() {
+          if (afterAnimating.done) {
+            return;
+          }
+          afterAnimating.done = true;
+
+          $animateCss(domEl, {
+            event: 'leave'
+          }).start().then(function() {
+            domEl.remove();
+            if (closedDeferred) {
+              closedDeferred.resolve();
+            }
+          });
+
+          scope.$destroy();
+          if (done) {
+            done();
+          }
+        }
+      }
+
+      $document.on('keydown', keydownListener);
+
+      $rootScope.$on('$destroy', function() {
+        $document.off('keydown', keydownListener);
+      });
+
+      function keydownListener(evt) {
+        if (evt.isDefaultPrevented()) {
+          return evt;
+        }
+
+        var modal = openedWindows.top();
+        if (modal) {
+          switch (evt.which) {
+            case 27: {
+              if (modal.value.keyboard) {
+                evt.preventDefault();
+                $rootScope.$apply(function() {
+                  $modalStack.dismiss(modal.key, 'escape key press');
+                });
+              }
+              break;
+            }
+            case 9: {
+              $modalStack.loadFocusElementList(modal);
+              var focusChanged = false;
+              if (evt.shiftKey) {
+                if ($modalStack.isFocusInFirstItem(evt)) {
+                  focusChanged = $modalStack.focusLastFocusableElement();
+                }
+              } else {
+                if ($modalStack.isFocusInLastItem(evt)) {
+                  focusChanged = $modalStack.focusFirstFocusableElement();
+                }
+              }
+
+              if (focusChanged) {
+                evt.preventDefault();
+                evt.stopPropagation();
+              }
+              break;
+            }
+          }
+        }
+      }
+
+      $modalStack.open = function(modalInstance, modal) {
+        var modalOpener = $document[0].activeElement,
+          modalBodyClass = modal.openedClass || OPENED_MODAL_CLASS;
+
+        toggleTopWindowClass(false);
+
+        openedWindows.add(modalInstance, {
+          deferred: modal.deferred,
+          renderDeferred: modal.renderDeferred,
+          closedDeferred: modal.closedDeferred,
+          modalScope: modal.scope,
+          backdrop: modal.backdrop,
+          keyboard: modal.keyboard,
+          openedClass: modal.openedClass,
+          windowTopClass: modal.windowTopClass,
+          animation: modal.animation,
+          appendTo: modal.appendTo
+        });
+
+        openedClasses.put(modalBodyClass, modalInstance);
+
+        var appendToElement = modal.appendTo,
+            currBackdropIndex = backdropIndex();
+
+        if (!appendToElement.length) {
+          throw new Error('appendTo element not found. Make sure that the element passed is in DOM.');
+        }
+
+        if (currBackdropIndex >= 0 && !backdropDomEl) {
+          backdropScope = $rootScope.$new(true);
+          backdropScope.modalOptions = modal;
+          backdropScope.index = currBackdropIndex;
+          backdropDomEl = angular.element('<div uib-modal-backdrop="modal-backdrop"></div>');
+          backdropDomEl.attr('backdrop-class', modal.backdropClass);
+          if (modal.animation) {
+            backdropDomEl.attr('modal-animation', 'true');
+          }
+          $compile(backdropDomEl)(backdropScope);
+          $animate.enter(backdropDomEl, appendToElement);
+        }
+
+        var angularDomEl = angular.element('<div uib-modal-window="modal-window"></div>');
+        angularDomEl.attr({
+          'template-url': modal.windowTemplateUrl,
+          'window-class': modal.windowClass,
+          'window-top-class': modal.windowTopClass,
+          'size': modal.size,
+          'index': openedWindows.length() - 1,
+          'animate': 'animate'
+        }).html(modal.content);
+        if (modal.animation) {
+          angularDomEl.attr('modal-animation', 'true');
+        }
+
+        $animate.enter($compile(angularDomEl)(modal.scope), appendToElement)
+          .then(function() {
+            $animate.addClass(appendToElement, modalBodyClass);
+          });
+
+        openedWindows.top().value.modalDomEl = angularDomEl;
+        openedWindows.top().value.modalOpener = modalOpener;
+
+        $modalStack.clearFocusListCache();
+      };
+
+      function broadcastClosing(modalWindow, resultOrReason, closing) {
+        return !modalWindow.value.modalScope.$broadcast('modal.closing', resultOrReason, closing).defaultPrevented;
+      }
+
+      $modalStack.close = function(modalInstance, result) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, result, true)) {
+          modalWindow.value.modalScope.$$uibDestructionScheduled = true;
+          modalWindow.value.deferred.resolve(result);
+          removeModalWindow(modalInstance, modalWindow.value.modalOpener);
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismiss = function(modalInstance, reason) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, reason, false)) {
+          modalWindow.value.modalScope.$$uibDestructionScheduled = true;
+          modalWindow.value.deferred.reject(reason);
+          removeModalWindow(modalInstance, modalWindow.value.modalOpener);
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismissAll = function(reason) {
+        var topModal = this.getTop();
+        while (topModal && this.dismiss(topModal.key, reason)) {
+          topModal = this.getTop();
+        }
+      };
+
+      $modalStack.getTop = function() {
+        return openedWindows.top();
+      };
+
+      $modalStack.modalRendered = function(modalInstance) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow) {
+          modalWindow.value.renderDeferred.resolve();
+        }
+      };
+
+      $modalStack.focusFirstFocusableElement = function() {
+        if (focusableElementList.length > 0) {
+          focusableElementList[0].focus();
+          return true;
+        }
+        return false;
+      };
+      $modalStack.focusLastFocusableElement = function() {
+        if (focusableElementList.length > 0) {
+          focusableElementList[focusableElementList.length - 1].focus();
+          return true;
+        }
+        return false;
+      };
+
+      $modalStack.isFocusInFirstItem = function(evt) {
+        if (focusableElementList.length > 0) {
+          return (evt.target || evt.srcElement) === focusableElementList[0];
+        }
+        return false;
+      };
+
+      $modalStack.isFocusInLastItem = function(evt) {
+        if (focusableElementList.length > 0) {
+          return (evt.target || evt.srcElement) === focusableElementList[focusableElementList.length - 1];
+        }
+        return false;
+      };
+
+      $modalStack.clearFocusListCache = function() {
+        focusableElementList = [];
+        focusIndex = 0;
+      };
+
+      $modalStack.loadFocusElementList = function(modalWindow) {
+        if (focusableElementList === undefined || !focusableElementList.length) {
+          if (modalWindow) {
+            var modalDomE1 = modalWindow.value.modalDomEl;
+            if (modalDomE1 && modalDomE1.length) {
+              focusableElementList = modalDomE1[0].querySelectorAll(tababbleSelector);
+            }
+          }
+        }
+      };
+
+      return $modalStack;
+    }])
+
+  .provider('$uibModal', function() {
+    var $modalProvider = {
+      options: {
+        animation: true,
+        backdrop: true, //can also be false or 'static'
+        keyboard: true
+      },
+      $get: ['$rootScope', '$q', '$document', '$templateRequest', '$controller', '$uibResolve', '$uibModalStack',
+        function ($rootScope, $q, $document, $templateRequest, $controller, $uibResolve, $modalStack) {
+          var $modal = {};
+
+          function getTemplatePromise(options) {
+            return options.template ? $q.when(options.template) :
+              $templateRequest(angular.isFunction(options.templateUrl) ?
+                options.templateUrl() : options.templateUrl);
+          }
+
+          var promiseChain = null;
+          $modal.getPromiseChain = function() {
+            return promiseChain;
+          };
+
+          $modal.open = function(modalOptions) {
+            var modalResultDeferred = $q.defer();
+            var modalOpenedDeferred = $q.defer();
+            var modalClosedDeferred = $q.defer();
+            var modalRenderDeferred = $q.defer();
+
+            //prepare an instance of a modal to be injected into controllers and returned to a caller
+            var modalInstance = {
+              result: modalResultDeferred.promise,
+              opened: modalOpenedDeferred.promise,
+              closed: modalClosedDeferred.promise,
+              rendered: modalRenderDeferred.promise,
+              close: function (result) {
+                return $modalStack.close(modalInstance, result);
+              },
+              dismiss: function (reason) {
+                return $modalStack.dismiss(modalInstance, reason);
+              }
+            };
+
+            //merge and clean up options
+            modalOptions = angular.extend({}, $modalProvider.options, modalOptions);
+            modalOptions.resolve = modalOptions.resolve || {};
+            modalOptions.appendTo = modalOptions.appendTo || $document.find('body').eq(0);
+
+            //verify options
+            if (!modalOptions.template && !modalOptions.templateUrl) {
+              throw new Error('One of template or templateUrl options is required.');
+            }
+
+            var templateAndResolvePromise =
+              $q.all([getTemplatePromise(modalOptions), $uibResolve.resolve(modalOptions.resolve, {}, null, null)]);
+
+            function resolveWithTemplate() {
+              return templateAndResolvePromise;
+            }
+
+            // Wait for the resolution of the existing promise chain.
+            // Then switch to our own combined promise dependency (regardless of how the previous modal fared).
+            // Then add to $modalStack and resolve opened.
+            // Finally clean up the chain variable if no subsequent modal has overwritten it.
+            var samePromise;
+            samePromise = promiseChain = $q.all([promiseChain])
+              .then(resolveWithTemplate, resolveWithTemplate)
+              .then(function resolveSuccess(tplAndVars) {
+                var providedScope = modalOptions.scope || $rootScope;
+
+                var modalScope = providedScope.$new();
+                modalScope.$close = modalInstance.close;
+                modalScope.$dismiss = modalInstance.dismiss;
+
+                modalScope.$on('$destroy', function() {
+                  if (!modalScope.$$uibDestructionScheduled) {
+                    modalScope.$dismiss('$uibUnscheduledDestruction');
+                  }
+                });
+
+                var ctrlInstance, ctrlLocals = {};
+
+                //controllers
+                if (modalOptions.controller) {
+                  ctrlLocals.$scope = modalScope;
+                  ctrlLocals.$uibModalInstance = modalInstance;
+                  angular.forEach(tplAndVars[1], function(value, key) {
+                    ctrlLocals[key] = value;
+                  });
+
+                  ctrlInstance = $controller(modalOptions.controller, ctrlLocals);
+                  if (modalOptions.controllerAs) {
+                    if (modalOptions.bindToController) {
+                      ctrlInstance.$close = modalScope.$close;
+                      ctrlInstance.$dismiss = modalScope.$dismiss;
+                      angular.extend(ctrlInstance, providedScope);
+                    }
+
+                    modalScope[modalOptions.controllerAs] = ctrlInstance;
+                  }
+                }
+
+                $modalStack.open(modalInstance, {
+                  scope: modalScope,
+                  deferred: modalResultDeferred,
+                  renderDeferred: modalRenderDeferred,
+                  closedDeferred: modalClosedDeferred,
+                  content: tplAndVars[0],
+                  animation: modalOptions.animation,
+                  backdrop: modalOptions.backdrop,
+                  keyboard: modalOptions.keyboard,
+                  backdropClass: modalOptions.backdropClass,
+                  windowTopClass: modalOptions.windowTopClass,
+                  windowClass: modalOptions.windowClass,
+                  windowTemplateUrl: modalOptions.windowTemplateUrl,
+                  size: modalOptions.size,
+                  openedClass: modalOptions.openedClass,
+                  appendTo: modalOptions.appendTo
+                });
+                modalOpenedDeferred.resolve(true);
+
+            }, function resolveError(reason) {
+              modalOpenedDeferred.reject(reason);
+              modalResultDeferred.reject(reason);
+            })['finally'](function() {
+              if (promiseChain === samePromise) {
+                promiseChain = null;
+              }
+            });
+
+            return modalInstance;
+          };
+
+          return $modal;
+        }
+      ]
+    };
+
+    return $modalProvider;
+  });
+
+angular.module('ui.bootstrap.paging', [])
+/**
+ * Helper internal service for generating common controller code between the
+ * pager and pagination components
+ */
+.factory('uibPaging', ['$parse', function($parse) {
+  return {
+    create: function(ctrl, $scope, $attrs) {
+      ctrl.setNumPages = $attrs.numPages ? $parse($attrs.numPages).assign : angular.noop;
+      ctrl.ngModelCtrl = { $setViewValue: angular.noop }; // nullModelCtrl
+      ctrl._watchers = [];
+
+      ctrl.init = function(ngModelCtrl, config) {
+        ctrl.ngModelCtrl = ngModelCtrl;
+        ctrl.config = config;
+
+        ngModelCtrl.$render = function() {
+          ctrl.render();
+        };
+
+        if ($attrs.itemsPerPage) {
+          ctrl._watchers.push($scope.$parent.$watch($parse($attrs.itemsPerPage), function(value) {
+            ctrl.itemsPerPage = parseInt(value, 10);
+            $scope.totalPages = ctrl.calculateTotalPages();
+            ctrl.updatePage();
+          }));
+        } else {
+          ctrl.itemsPerPage = config.itemsPerPage;
+        }
+
+        $scope.$watch('totalItems', function(newTotal, oldTotal) {
+          if (angular.isDefined(newTotal) || newTotal !== oldTotal) {
+            $scope.totalPages = ctrl.calculateTotalPages();
+            ctrl.updatePage();
+          }
+        });
+      };
+
+      ctrl.calculateTotalPages = function() {
+        var totalPages = ctrl.itemsPerPage < 1 ? 1 : Math.ceil($scope.totalItems / ctrl.itemsPerPage);
+        return Math.max(totalPages || 0, 1);
+      };
+
+      ctrl.render = function() {
+        $scope.page = parseInt(ctrl.ngModelCtrl.$viewValue, 10) || 1;
+      };
+
+      $scope.selectPage = function(page, evt) {
+        if (evt) {
+          evt.preventDefault();
+        }
+
+        var clickAllowed = !$scope.ngDisabled || !evt;
+        if (clickAllowed && $scope.page !== page && page > 0 && page <= $scope.totalPages) {
+          if (evt && evt.target) {
+            evt.target.blur();
+          }
+          ctrl.ngModelCtrl.$setViewValue(page);
+          ctrl.ngModelCtrl.$render();
+        }
+      };
+
+      $scope.getText = function(key) {
+        return $scope[key + 'Text'] || ctrl.config[key + 'Text'];
+      };
+
+      $scope.noPrevious = function() {
+        return $scope.page === 1;
+      };
+
+      $scope.noNext = function() {
+        return $scope.page === $scope.totalPages;
+      };
+
+      ctrl.updatePage = function() {
+        ctrl.setNumPages($scope.$parent, $scope.totalPages); // Readonly variable
+
+        if ($scope.page > $scope.totalPages) {
+          $scope.selectPage($scope.totalPages);
+        } else {
+          ctrl.ngModelCtrl.$render();
+        }
+      };
+
+      $scope.$on('$destroy', function() {
+        while (ctrl._watchers.length) {
+          ctrl._watchers.shift()();
+        }
+      });
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.pager', ['ui.bootstrap.paging'])
+
+.controller('UibPagerController', ['$scope', '$attrs', 'uibPaging', 'uibPagerConfig', function($scope, $attrs, uibPaging, uibPagerConfig) {
+  $scope.align = angular.isDefined($attrs.align) ? $scope.$parent.$eval($attrs.align) : uibPagerConfig.align;
+
+  uibPaging.create(this, $scope, $attrs);
+}])
+
+.constant('uibPagerConfig', {
+  itemsPerPage: 10,
+  previousText: '« Previous',
+  nextText: 'Next »',
+  align: true
+})
+
+.directive('uibPager', ['uibPagerConfig', function(uibPagerConfig) {
+  return {
+    scope: {
+      totalItems: '=',
+      previousText: '@',
+      nextText: '@',
+      ngDisabled: '='
+    },
+    require: ['uibPager', '?ngModel'],
+    controller: 'UibPagerController',
+    controllerAs: 'pager',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/pager/pager.html';
+    },
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+        return; // do nothing if no ng-model
+      }
+
+      paginationCtrl.init(ngModelCtrl, uibPagerConfig);
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.pagination', ['ui.bootstrap.paging'])
+.controller('UibPaginationController', ['$scope', '$attrs', '$parse', 'uibPaging', 'uibPaginationConfig', function($scope, $attrs, $parse, uibPaging, uibPaginationConfig) {
+  var ctrl = this;
+  // Setup configuration parameters
+  var maxSize = angular.isDefined($attrs.maxSize) ? $scope.$parent.$eval($attrs.maxSize) : uibPaginationConfig.maxSize,
+    rotate = angular.isDefined($attrs.rotate) ? $scope.$parent.$eval($attrs.rotate) : uibPaginationConfig.rotate,
+    forceEllipses = angular.isDefined($attrs.forceEllipses) ? $scope.$parent.$eval($attrs.forceEllipses) : uibPaginationConfig.forceEllipses,
+    boundaryLinkNumbers = angular.isDefined($attrs.boundaryLinkNumbers) ? $scope.$parent.$eval($attrs.boundaryLinkNumbers) : uibPaginationConfig.boundaryLinkNumbers;
+  $scope.boundaryLinks = angular.isDefined($attrs.boundaryLinks) ? $scope.$parent.$eval($attrs.boundaryLinks) : uibPaginationConfig.boundaryLinks;
+  $scope.directionLinks = angular.isDefined($attrs.directionLinks) ? $scope.$parent.$eval($attrs.directionLinks) : uibPaginationConfig.directionLinks;
+
+  uibPaging.create(this, $scope, $attrs);
+
+  if ($attrs.maxSize) {
+    ctrl._watchers.push($scope.$parent.$watch($parse($attrs.maxSize), function(value) {
+      maxSize = parseInt(value, 10);
+      ctrl.render();
+    }));
+  }
+
+  // Create page object used in template
+  function makePage(number, text, isActive) {
+    return {
+      number: number,
+      text: text,
+      active: isActive
+    };
+  }
+
+  function getPages(currentPage, totalPages) {
+    var pages = [];
+
+    // Default page limits
+    var startPage = 1, endPage = totalPages;
+    var isMaxSized = angular.isDefined(maxSize) && maxSize < totalPages;
+
+    // recompute if maxSize
+    if (isMaxSized) {
+      if (rotate) {
+        // Current page is displayed in the middle of the visible ones
+        startPage = Math.max(currentPage - Math.floor(maxSize / 2), 1);
+        endPage = startPage + maxSize - 1;
+
+        // Adjust if limit is exceeded
+        if (endPage > totalPages) {
+          endPage = totalPages;
+          startPage = endPage - maxSize + 1;
+        }
+      } else {
+        // Visible pages are paginated with maxSize
+        startPage = (Math.ceil(currentPage / maxSize) - 1) * maxSize + 1;
+
+        // Adjust last page if limit is exceeded
+        endPage = Math.min(startPage + maxSize - 1, totalPages);
+      }
+    }
+
+    // Add page number links
+    for (var number = startPage; number <= endPage; number++) {
+      var page = makePage(number, number, number === currentPage);
+      pages.push(page);
+    }
+
+    // Add links to move between page sets
+    if (isMaxSized && maxSize > 0 && (!rotate || forceEllipses || boundaryLinkNumbers)) {
+      if (startPage > 1) {
+        if (!boundaryLinkNumbers || startPage > 3) { //need ellipsis for all options unless range is too close to beginning
+        var previousPageSet = makePage(startPage - 1, '...', false);
+        pages.unshift(previousPageSet);
+      }
+        if (boundaryLinkNumbers) {
+          if (startPage === 3) { //need to replace ellipsis when the buttons would be sequential
+            var secondPageLink = makePage(2, '2', false);
+            pages.unshift(secondPageLink);
+          }
+          //add the first page
+          var firstPageLink = makePage(1, '1', false);
+          pages.unshift(firstPageLink);
+        }
+      }
+
+      if (endPage < totalPages) {
+        if (!boundaryLinkNumbers || endPage < totalPages - 2) { //need ellipsis for all options unless range is too close to end
+        var nextPageSet = makePage(endPage + 1, '...', false);
+        pages.push(nextPageSet);
+      }
+        if (boundaryLinkNumbers) {
+          if (endPage === totalPages - 2) { //need to replace ellipsis when the buttons would be sequential
+            var secondToLastPageLink = makePage(totalPages - 1, totalPages - 1, false);
+            pages.push(secondToLastPageLink);
+          }
+          //add the last page
+          var lastPageLink = makePage(totalPages, totalPages, false);
+          pages.push(lastPageLink);
+        }
+      }
+    }
+    return pages;
+  }
+
+  var originalRender = this.render;
+  this.render = function() {
+    originalRender();
+    if ($scope.page > 0 && $scope.page <= $scope.totalPages) {
+      $scope.pages = getPages($scope.page, $scope.totalPages);
+    }
+  };
+}])
+
+.constant('uibPaginationConfig', {
+  itemsPerPage: 10,
+  boundaryLinks: false,
+  boundaryLinkNumbers: false,
+  directionLinks: true,
+  firstText: 'First',
+  previousText: 'Previous',
+  nextText: 'Next',
+  lastText: 'Last',
+  rotate: true,
+  forceEllipses: false
+})
+
+.directive('uibPagination', ['$parse', 'uibPaginationConfig', function($parse, uibPaginationConfig) {
+  return {
+    scope: {
+      totalItems: '=',
+      firstText: '@',
+      previousText: '@',
+      nextText: '@',
+      lastText: '@',
+      ngDisabled:'='
+    },
+    require: ['uibPagination', '?ngModel'],
+    controller: 'UibPaginationController',
+    controllerAs: 'pagination',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/pagination/pagination.html';
+    },
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+         return; // do nothing if no ng-model
+      }
+
+      paginationCtrl.init(ngModelCtrl, uibPaginationConfig);
+    }
+  };
+}]);
+
+/**
+ * The following features are still outstanding: animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, html tooltips, and selector delegation.
+ */
+angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.stackedMap'])
+
+/**
+ * The $tooltip service creates tooltip- and popover-like directives as well as
+ * houses global options for them.
+ */
+.provider('$uibTooltip', function() {
+  // The default options tooltip and popover.
+  var defaultOptions = {
+    placement: 'top',
+    placementClassPrefix: '',
+    animation: true,
+    popupDelay: 0,
+    popupCloseDelay: 0,
+    useContentExp: false
+  };
+
+  // Default hide triggers for each show trigger
+  var triggerMap = {
+    'mouseenter': 'mouseleave',
+    'click': 'click',
+    'outsideClick': 'outsideClick',
+    'focus': 'blur',
+    'none': ''
+  };
+
+  // The options specified to the provider globally.
+  var globalOptions = {};
+
+  /**
+   * `options({})` allows global configuration of all tooltips in the
+   * application.
+   *
+   *   var app = angular.module( 'App', ['ui.bootstrap.tooltip'], function( $tooltipProvider ) {
+   *     // place tooltips left instead of top by default
+   *     $tooltipProvider.options( { placement: 'left' } );
+   *   });
+   */
+	this.options = function(value) {
+		angular.extend(globalOptions, value);
+	};
+
+  /**
+   * This allows you to extend the set of trigger mappings available. E.g.:
+   *
+   *   $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' );
+   */
+  this.setTriggers = function setTriggers(triggers) {
+    angular.extend(triggerMap, triggers);
+  };
+
+  /**
+   * This is a helper function for translating camel-case to snake_case.
+   */
+  function snake_case(name) {
+    var regexp = /[A-Z]/g;
+    var separator = '-';
+    return name.replace(regexp, function(letter, pos) {
+      return (pos ? separator : '') + letter.toLowerCase();
+    });
+  }
+
+  /**
+   * Returns the actual instance of the $tooltip service.
+   * TODO support multiple triggers
+   */
+  this.$get = ['$window', '$compile', '$timeout', '$document', '$uibPosition', '$interpolate', '$rootScope', '$parse', '$$stackedMap', function($window, $compile, $timeout, $document, $position, $interpolate, $rootScope, $parse, $$stackedMap) {
+    var openedTooltips = $$stackedMap.createNew();
+    $document.on('keypress', keypressListener);
+
+    $rootScope.$on('$destroy', function() {
+      $document.off('keypress', keypressListener);
+    });
+
+    function keypressListener(e) {
+      if (e.which === 27) {
+        var last = openedTooltips.top();
+        if (last) {
+          last.value.close();
+          openedTooltips.removeTop();
+          last = null;
+        }
+      }
+    }
+
+    return function $tooltip(ttType, prefix, defaultTriggerShow, options) {
+      options = angular.extend({}, defaultOptions, globalOptions, options);
+
+      /**
+       * Returns an object of show and hide triggers.
+       *
+       * If a trigger is supplied,
+       * it is used to show the tooltip; otherwise, it will use the `trigger`
+       * option passed to the `$tooltipProvider.options` method; else it will
+       * default to the trigger supplied to this directive factory.
+       *
+       * The hide trigger is based on the show trigger. If the `trigger` option
+       * was passed to the `$tooltipProvider.options` method, it will use the
+       * mapped trigger from `triggerMap` or the passed trigger if the map is
+       * undefined; otherwise, it uses the `triggerMap` value of the show
+       * trigger; else it will just use the show trigger.
+       */
+      function getTriggers(trigger) {
+        var show = (trigger || options.trigger || defaultTriggerShow).split(' ');
+        var hide = show.map(function(trigger) {
+          return triggerMap[trigger] || trigger;
+        });
+        return {
+          show: show,
+          hide: hide
+        };
+      }
+
+      var directiveName = snake_case(ttType);
+
+      var startSym = $interpolate.startSymbol();
+      var endSym = $interpolate.endSymbol();
+      var template =
+        '<div '+ directiveName + '-popup '+
+          'title="' + startSym + 'title' + endSym + '" '+
+          (options.useContentExp ?
+            'content-exp="contentExp()" ' :
+            'content="' + startSym + 'content' + endSym + '" ') +
+          'placement="' + startSym + 'placement' + endSym + '" '+
+          'popup-class="' + startSym + 'popupClass' + endSym + '" '+
+          'animation="animation" ' +
+          'is-open="isOpen"' +
+          'origin-scope="origScope" ' +
+          'style="visibility: hidden; display: block; top: -9999px; left: -9999px;"' +
+          '>' +
+        '</div>';
+
+      return {
+        compile: function(tElem, tAttrs) {
+          var tooltipLinker = $compile(template);
+
+          return function link(scope, element, attrs, tooltipCtrl) {
+            var tooltip;
+            var tooltipLinkedScope;
+            var transitionTimeout;
+            var showTimeout;
+            var hideTimeout;
+            var positionTimeout;
+            var appendToBody = angular.isDefined(options.appendToBody) ? options.appendToBody : false;
+            var triggers = getTriggers(undefined);
+            var hasEnableExp = angular.isDefined(attrs[prefix + 'Enable']);
+            var ttScope = scope.$new(true);
+            var repositionScheduled = false;
+            var isOpenParse = angular.isDefined(attrs[prefix + 'IsOpen']) ? $parse(attrs[prefix + 'IsOpen']) : false;
+            var contentParse = options.useContentExp ? $parse(attrs[ttType]) : false;
+            var observers = [];
+
+            var positionTooltip = function() {
+              // check if tooltip exists and is not empty
+              if (!tooltip || !tooltip.html()) { return; }
+
+              if (!positionTimeout) {
+                positionTimeout = $timeout(function() {
+                  // Reset the positioning.
+                  tooltip.css({ top: 0, left: 0 });
+
+                  // Now set the calculated positioning.
+                  var ttPosition = $position.positionElements(element, tooltip, ttScope.placement, appendToBody);
+                  tooltip.css({ top: ttPosition.top + 'px', left: ttPosition.left + 'px', visibility: 'visible' });
+
+                  // If the placement class is prefixed, still need
+                  // to remove the TWBS standard class.
+                  if (options.placementClassPrefix) {
+                    tooltip.removeClass('top bottom left right');
+                  }
+
+                  tooltip.removeClass(
+                    options.placementClassPrefix + 'top ' +
+                    options.placementClassPrefix + 'top-left ' +
+                    options.placementClassPrefix + 'top-right ' +
+                    options.placementClassPrefix + 'bottom ' +
+                    options.placementClassPrefix + 'bottom-left ' +
+                    options.placementClassPrefix + 'bottom-right ' +
+                    options.placementClassPrefix + 'left ' +
+                    options.placementClassPrefix + 'left-top ' +
+                    options.placementClassPrefix + 'left-bottom ' +
+                    options.placementClassPrefix + 'right ' +
+                    options.placementClassPrefix + 'right-top ' +
+                    options.placementClassPrefix + 'right-bottom');
+
+                  var placement = ttPosition.placement.split('-');
+                  tooltip.addClass(placement[0] + ' ' + options.placementClassPrefix + ttPosition.placement);
+                  $position.positionArrow(tooltip, ttPosition.placement);
+
+                  positionTimeout = null;
+                }, 0, false);
+              }
+            };
+
+            // Set up the correct scope to allow transclusion later
+            ttScope.origScope = scope;
+
+            // By default, the tooltip is not open.
+            // TODO add ability to start tooltip opened
+            ttScope.isOpen = false;
+            openedTooltips.add(ttScope, {
+              close: hide
+            });
+
+            function toggleTooltipBind() {
+              if (!ttScope.isOpen) {
+                showTooltipBind();
+              } else {
+                hideTooltipBind();
+              }
+            }
+
+            // Show the tooltip with delay if specified, otherwise show it immediately
+            function showTooltipBind() {
+              if (hasEnableExp && !scope.$eval(attrs[prefix + 'Enable'])) {
+                return;
+              }
+
+              cancelHide();
+              prepareTooltip();
+
+              if (ttScope.popupDelay) {
+                // Do nothing if the tooltip was already scheduled to pop-up.
+                // This happens if show is triggered multiple times before any hide is triggered.
+                if (!showTimeout) {
+                  showTimeout = $timeout(show, ttScope.popupDelay, false);
+                }
+              } else {
+                show();
+              }
+            }
+
+            function hideTooltipBind() {
+              cancelShow();
+
+              if (ttScope.popupCloseDelay) {
+                if (!hideTimeout) {
+                  hideTimeout = $timeout(hide, ttScope.popupCloseDelay, false);
+                }
+              } else {
+                hide();
+              }
+            }
+
+            // Show the tooltip popup element.
+            function show() {
+              cancelShow();
+              cancelHide();
+
+              // Don't show empty tooltips.
+              if (!ttScope.content) {
+                return angular.noop;
+              }
+
+              createTooltip();
+
+              // And show the tooltip.
+              ttScope.$evalAsync(function() {
+                ttScope.isOpen = true;
+                assignIsOpen(true);
+                positionTooltip();
+              });
+            }
+
+            function cancelShow() {
+              if (showTimeout) {
+                $timeout.cancel(showTimeout);
+                showTimeout = null;
+              }
+
+              if (positionTimeout) {
+                $timeout.cancel(positionTimeout);
+                positionTimeout = null;
+              }
+            }
+
+            // Hide the tooltip popup element.
+            function hide() {
+              if (!ttScope) {
+                return;
+              }
+
+              // First things first: we don't show it anymore.
+              ttScope.$evalAsync(function() {
+                if (ttScope) {
+                  ttScope.isOpen = false;
+                  assignIsOpen(false);
+                  // And now we remove it from the DOM. However, if we have animation, we
+                  // need to wait for it to expire beforehand.
+                  // FIXME: this is a placeholder for a port of the transitions library.
+                  // The fade transition in TWBS is 150ms.
+                  if (ttScope.animation) {
+                    if (!transitionTimeout) {
+                      transitionTimeout = $timeout(removeTooltip, 150, false);
+                    }
+                  } else {
+                    removeTooltip();
+                  }
+                }
+              });
+            }
+
+            function cancelHide() {
+              if (hideTimeout) {
+                $timeout.cancel(hideTimeout);
+                hideTimeout = null;
+              }
+
+              if (transitionTimeout) {
+                $timeout.cancel(transitionTimeout);
+                transitionTimeout = null;
+              }
+            }
+
+            function createTooltip() {
+              // There can only be one tooltip element per directive shown at once.
+              if (tooltip) {
+                return;
+              }
+
+              tooltipLinkedScope = ttScope.$new();
+              tooltip = tooltipLinker(tooltipLinkedScope, function(tooltip) {
+                if (appendToBody) {
+                  $document.find('body').append(tooltip);
+                } else {
+                  element.after(tooltip);
+                }
+              });
+
+              prepObservers();
+            }
+
+            function removeTooltip() {
+              cancelShow();
+              cancelHide();
+              unregisterObservers();
+
+              if (tooltip) {
+                tooltip.remove();
+                tooltip = null;
+              }
+              if (tooltipLinkedScope) {
+                tooltipLinkedScope.$destroy();
+                tooltipLinkedScope = null;
+              }
+            }
+
+            /**
+             * Set the initial scope values. Once
+             * the tooltip is created, the observers
+             * will be added to keep things in sync.
+             */
+            function prepareTooltip() {
+              ttScope.title = attrs[prefix + 'Title'];
+              if (contentParse) {
+                ttScope.content = contentParse(scope);
+              } else {
+                ttScope.content = attrs[ttType];
+              }
+
+              ttScope.popupClass = attrs[prefix + 'Class'];
+              ttScope.placement = angular.isDefined(attrs[prefix + 'Placement']) ? attrs[prefix + 'Placement'] : options.placement;
+
+              var delay = parseInt(attrs[prefix + 'PopupDelay'], 10);
+              var closeDelay = parseInt(attrs[prefix + 'PopupCloseDelay'], 10);
+              ttScope.popupDelay = !isNaN(delay) ? delay : options.popupDelay;
+              ttScope.popupCloseDelay = !isNaN(closeDelay) ? closeDelay : options.popupCloseDelay;
+            }
+
+            function assignIsOpen(isOpen) {
+              if (isOpenParse && angular.isFunction(isOpenParse.assign)) {
+                isOpenParse.assign(scope, isOpen);
+              }
+            }
+
+            ttScope.contentExp = function() {
+              return ttScope.content;
+            };
+
+            /**
+             * Observe the relevant attributes.
+             */
+            attrs.$observe('disabled', function(val) {
+              if (val) {
+                cancelShow();
+              }
+
+              if (val && ttScope.isOpen) {
+                hide();
+              }
+            });
+
+            if (isOpenParse) {
+              scope.$watch(isOpenParse, function(val) {
+                if (ttScope && !val === ttScope.isOpen) {
+                  toggleTooltipBind();
+                }
+              });
+            }
+
+            function prepObservers() {
+              observers.length = 0;
+
+              if (contentParse) {
+                observers.push(
+                  scope.$watch(contentParse, function(val) {
+                    ttScope.content = val;
+                    if (!val && ttScope.isOpen) {
+                      hide();
+                    }
+                  })
+                );
+
+                observers.push(
+                  tooltipLinkedScope.$watch(function() {
+                    if (!repositionScheduled) {
+                      repositionScheduled = true;
+                      tooltipLinkedScope.$$postDigest(function() {
+                        repositionScheduled = false;
+                        if (ttScope && ttScope.isOpen) {
+                          positionTooltip();
+                        }
+                      });
+                    }
+                  })
+                );
+              } else {
+                observers.push(
+                  attrs.$observe(ttType, function(val) {
+                    ttScope.content = val;
+                    if (!val && ttScope.isOpen) {
+                      hide();
+                    } else {
+                      positionTooltip();
+                    }
+                  })
+                );
+              }
+
+              observers.push(
+                attrs.$observe(prefix + 'Title', function(val) {
+                  ttScope.title = val;
+                  if (ttScope.isOpen) {
+                    positionTooltip();
+                  }
+                })
+              );
+
+              observers.push(
+                attrs.$observe(prefix + 'Placement', function(val) {
+                  ttScope.placement = val ? val : options.placement;
+                  if (ttScope.isOpen) {
+                    positionTooltip();
+                  }
+                })
+              );
+            }
+
+            function unregisterObservers() {
+              if (observers.length) {
+                angular.forEach(observers, function(observer) {
+                  observer();
+                });
+                observers.length = 0;
+              }
+            }
+
+            // hide tooltips/popovers for outsideClick trigger
+            function bodyHideTooltipBind(e) {
+              if (!ttScope || !ttScope.isOpen || !tooltip) {
+                return;
+              }
+              // make sure the tooltip/popover link or tool tooltip/popover itself were not clicked
+              if (!element[0].contains(e.target) && !tooltip[0].contains(e.target)) {
+                hideTooltipBind();
+              }
+            }
+
+            var unregisterTriggers = function() {
+              triggers.show.forEach(function(trigger) {
+                if (trigger === 'outsideClick') {
+                  element.off('click', toggleTooltipBind);
+                } else {
+                  element.off(trigger, showTooltipBind);
+                  element.off(trigger, toggleTooltipBind);
+                }
+              });
+              triggers.hide.forEach(function(trigger) {
+                if (trigger === 'outsideClick') {
+                  $document.off('click', bodyHideTooltipBind);
+                } else {
+                  element.off(trigger, hideTooltipBind);
+                }
+              });
+            };
+
+            function prepTriggers() {
+              var val = attrs[prefix + 'Trigger'];
+              unregisterTriggers();
+
+              triggers = getTriggers(val);
+
+              if (triggers.show !== 'none') {
+                triggers.show.forEach(function(trigger, idx) {
+                  if (trigger === 'outsideClick') {
+                    element.on('click', toggleTooltipBind);
+                    $document.on('click', bodyHideTooltipBind);
+                  } else if (trigger === triggers.hide[idx]) {
+                    element.on(trigger, toggleTooltipBind);
+                  } else if (trigger) {
+                    element.on(trigger, showTooltipBind);
+                    element.on(triggers.hide[idx], hideTooltipBind);
+                  }
+
+                  element.on('keypress', function(e) {
+                    if (e.which === 27) {
+                      hideTooltipBind();
+                    }
+                  });
+                });
+              }
+            }
+
+            prepTriggers();
+
+            var animation = scope.$eval(attrs[prefix + 'Animation']);
+            ttScope.animation = angular.isDefined(animation) ? !!animation : options.animation;
+
+            var appendToBodyVal;
+            var appendKey = prefix + 'AppendToBody';
+            if (appendKey in attrs && attrs[appendKey] === undefined) {
+              appendToBodyVal = true;
+            } else {
+              appendToBodyVal = scope.$eval(attrs[appendKey]);
+            }
+
+            appendToBody = angular.isDefined(appendToBodyVal) ? appendToBodyVal : appendToBody;
+
+            // if a tooltip is attached to <body> we need to remove it on
+            // location change as its parent scope will probably not be destroyed
+            // by the change.
+            if (appendToBody) {
+              scope.$on('$locationChangeSuccess', function closeTooltipOnLocationChangeSuccess() {
+                if (ttScope.isOpen) {
+                  hide();
+                }
+              });
+            }
+
+            // Make sure tooltip is destroyed and removed.
+            scope.$on('$destroy', function onDestroyTooltip() {
+              unregisterTriggers();
+              removeTooltip();
+              openedTooltips.remove(ttScope);
+              ttScope = null;
+            });
+          };
+        }
+      };
+    };
+  }];
+})
+
+// This is mostly ngInclude code but with a custom scope
+.directive('uibTooltipTemplateTransclude', [
+         '$animate', '$sce', '$compile', '$templateRequest',
+function ($animate, $sce, $compile, $templateRequest) {
+  return {
+    link: function(scope, elem, attrs) {
+      var origScope = scope.$eval(attrs.tooltipTemplateTranscludeScope);
+
+      var changeCounter = 0,
+        currentScope,
+        previousElement,
+        currentElement;
+
+      var cleanupLastIncludeContent = function() {
+        if (previousElement) {
+          previousElement.remove();
+          previousElement = null;
+        }
+
+        if (currentScope) {
+          currentScope.$destroy();
+          currentScope = null;
+        }
+
+        if (currentElement) {
+          $animate.leave(currentElement).then(function() {
+            previousElement = null;
+          });
+          previousElement = currentElement;
+          currentElement = null;
+        }
+      };
+
+      scope.$watch($sce.parseAsResourceUrl(attrs.uibTooltipTemplateTransclude), function(src) {
+        var thisChangeId = ++changeCounter;
+
+        if (src) {
+          //set the 2nd param to true to ignore the template request error so that the inner
+          //contents and scope can be cleaned up.
+          $templateRequest(src, true).then(function(response) {
+            if (thisChangeId !== changeCounter) { return; }
+            var newScope = origScope.$new();
+            var template = response;
+
+            var clone = $compile(template)(newScope, function(clone) {
+              cleanupLastIncludeContent();
+              $animate.enter(clone, elem);
+            });
+
+            currentScope = newScope;
+            currentElement = clone;
+
+            currentScope.$emit('$includeContentLoaded', src);
+          }, function() {
+            if (thisChangeId === changeCounter) {
+              cleanupLastIncludeContent();
+              scope.$emit('$includeContentError', src);
+            }
+          });
+          scope.$emit('$includeContentRequested', src);
+        } else {
+          cleanupLastIncludeContent();
+        }
+      });
+
+      scope.$on('$destroy', cleanupLastIncludeContent);
+    }
+  };
+}])
+
+/**
+ * Note that it's intentional that these classes are *not* applied through $animate.
+ * They must not be animated as they're expected to be present on the tooltip on
+ * initialization.
+ */
+.directive('uibTooltipClasses', ['$uibPosition', function($uibPosition) {
+  return {
+    restrict: 'A',
+    link: function(scope, element, attrs) {
+      // need to set the primary position so the
+      // arrow has space during position measure.
+      // tooltip.positionTooltip()
+      if (scope.placement) {
+        // // There are no top-left etc... classes
+        // // in TWBS, so we need the primary position.
+        var position = $uibPosition.parsePlacement(scope.placement);
+        element.addClass(position[0]);
+      } else {
+        element.addClass('top');
+      }
+
+      if (scope.popupClass) {
+        element.addClass(scope.popupClass);
+      }
+
+      if (scope.animation()) {
+        element.addClass(attrs.tooltipAnimationClass);
+      }
+    }
+  };
+}])
+
+.directive('uibTooltipPopup', function() {
+  return {
+    replace: true,
+    scope: { content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/tooltip/tooltip-popup.html'
+  };
+})
+
+.directive('uibTooltip', [ '$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibTooltip', 'tooltip', 'mouseenter');
+}])
+
+.directive('uibTooltipTemplatePopup', function() {
+  return {
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'uib/template/tooltip/tooltip-template-popup.html'
+  };
+})
+
+.directive('uibTooltipTemplate', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibTooltipTemplate', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}])
+
+.directive('uibTooltipHtmlPopup', function() {
+  return {
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/tooltip/tooltip-html-popup.html'
+  };
+})
+
+.directive('uibTooltipHtml', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibTooltipHtml', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}]);
+
+/**
+ * The following features are still outstanding: popup delay, animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, and selector delegatation.
+ */
+angular.module('ui.bootstrap.popover', ['ui.bootstrap.tooltip'])
+
+.directive('uibPopoverTemplatePopup', function() {
+  return {
+    replace: true,
+    scope: { title: '@', contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'uib/template/popover/popover-template.html'
+  };
+})
+
+.directive('uibPopoverTemplate', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibPopoverTemplate', 'popover', 'click', {
+    useContentExp: true
+  });
+}])
+
+.directive('uibPopoverHtmlPopup', function() {
+  return {
+    replace: true,
+    scope: { contentExp: '&', title: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/popover/popover-html.html'
+  };
+})
+
+.directive('uibPopoverHtml', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibPopoverHtml', 'popover', 'click', {
+    useContentExp: true
+  });
+}])
+
+.directive('uibPopoverPopup', function() {
+  return {
+    replace: true,
+    scope: { title: '@', content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/popover/popover.html'
+  };
+})
+
+.directive('uibPopover', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibPopover', 'popover', 'click');
+}]);
+
+angular.module('ui.bootstrap.progressbar', [])
+
+.constant('uibProgressConfig', {
+  animate: true,
+  max: 100
+})
+
+.controller('UibProgressController', ['$scope', '$attrs', 'uibProgressConfig', function($scope, $attrs, progressConfig) {
+  var self = this,
+      animate = angular.isDefined($attrs.animate) ? $scope.$parent.$eval($attrs.animate) : progressConfig.animate;
+
+  this.bars = [];
+  $scope.max = angular.isDefined($scope.max) ? $scope.max : progressConfig.max;
+
+  this.addBar = function(bar, element, attrs) {
+    if (!animate) {
+      element.css({'transition': 'none'});
+    }
+
+    this.bars.push(bar);
+
+    bar.max = $scope.max;
+    bar.title = attrs && angular.isDefined(attrs.title) ? attrs.title : 'progressbar';
+
+    bar.$watch('value', function(value) {
+      bar.recalculatePercentage();
+    });
+
+    bar.recalculatePercentage = function() {
+      var totalPercentage = self.bars.reduce(function(total, bar) {
+        bar.percent = +(100 * bar.value / bar.max).toFixed(2);
+        return total + bar.percent;
+      }, 0);
+
+      if (totalPercentage > 100) {
+        bar.percent -= totalPercentage - 100;
+      }
+    };
+
+    bar.$on('$destroy', function() {
+      element = null;
+      self.removeBar(bar);
+    });
+  };
+
+  this.removeBar = function(bar) {
+    this.bars.splice(this.bars.indexOf(bar), 1);
+    this.bars.forEach(function (bar) {
+      bar.recalculatePercentage();
+    });
+  };
+
+  $scope.$watch('max', function(max) {
+    self.bars.forEach(function(bar) {
+      bar.max = $scope.max;
+      bar.recalculatePercentage();
+    });
+  });
+}])
+
+.directive('uibProgress', function() {
+  return {
+    replace: true,
+    transclude: true,
+    controller: 'UibProgressController',
+    require: 'uibProgress',
+    scope: {
+      max: '=?'
+    },
+    templateUrl: 'uib/template/progressbar/progress.html'
+  };
+})
+
+.directive('uibBar', function() {
+  return {
+    replace: true,
+    transclude: true,
+    require: '^uibProgress',
+    scope: {
+      value: '=',
+      type: '@'
+    },
+    templateUrl: 'uib/template/progressbar/bar.html',
+    link: function(scope, element, attrs, progressCtrl) {
+      progressCtrl.addBar(scope, element, attrs);
+    }
+  };
+})
+
+.directive('uibProgressbar', function() {
+  return {
+    replace: true,
+    transclude: true,
+    controller: 'UibProgressController',
+    scope: {
+      value: '=',
+      max: '=?',
+      type: '@'
+    },
+    templateUrl: 'uib/template/progressbar/progressbar.html',
+    link: function(scope, element, attrs, progressCtrl) {
+      progressCtrl.addBar(scope, angular.element(element.children()[0]), {title: attrs.title});
+    }
+  };
+});
+
+angular.module('ui.bootstrap.rating', [])
+
+.constant('uibRatingConfig', {
+  max: 5,
+  stateOn: null,
+  stateOff: null,
+  titles : ['one', 'two', 'three', 'four', 'five']
+})
+
+.controller('UibRatingController', ['$scope', '$attrs', 'uibRatingConfig', function($scope, $attrs, ratingConfig) {
+  var ngModelCtrl = { $setViewValue: angular.noop };
+
+  this.init = function(ngModelCtrl_) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.push(function(value) {
+      if (angular.isNumber(value) && value << 0 !== value) {
+        value = Math.round(value);
+      }
+
+      return value;
+    });
+
+    this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
+    this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
+    var tmpTitles = angular.isDefined($attrs.titles) ? $scope.$parent.$eval($attrs.titles) : ratingConfig.titles ;
+    this.titles = angular.isArray(tmpTitles) && tmpTitles.length > 0 ?
+      tmpTitles : ratingConfig.titles;
+
+    var ratingStates = angular.isDefined($attrs.ratingStates) ?
+      $scope.$parent.$eval($attrs.ratingStates) :
+      new Array(angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max);
+    $scope.range = this.buildTemplateObjects(ratingStates);
+  };
+
+  this.buildTemplateObjects = function(states) {
+    for (var i = 0, n = states.length; i < n; i++) {
+      states[i] = angular.extend({ index: i }, { stateOn: this.stateOn, stateOff: this.stateOff, title: this.getTitle(i) }, states[i]);
+    }
+    return states;
+  };
+
+  this.getTitle = function(index) {
+    if (index >= this.titles.length) {
+      return index + 1;
+    }
+
+    return this.titles[index];
+  };
+
+  $scope.rate = function(value) {
+    if (!$scope.readonly && value >= 0 && value <= $scope.range.length) {
+      ngModelCtrl.$setViewValue(ngModelCtrl.$viewValue === value ? 0 : value);
+      ngModelCtrl.$render();
+    }
+  };
+
+  $scope.enter = function(value) {
+    if (!$scope.readonly) {
+      $scope.value = value;
+    }
+    $scope.onHover({value: value});
+  };
+
+  $scope.reset = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+    $scope.onLeave();
+  };
+
+  $scope.onKeydown = function(evt) {
+    if (/(37|38|39|40)/.test(evt.which)) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      $scope.rate($scope.value + (evt.which === 38 || evt.which === 39 ? 1 : -1));
+    }
+  };
+
+  this.render = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+  };
+}])
+
+.directive('uibRating', function() {
+  return {
+    require: ['uibRating', 'ngModel'],
+    scope: {
+      readonly: '=?',
+      onHover: '&',
+      onLeave: '&'
+    },
+    controller: 'UibRatingController',
+    templateUrl: 'uib/template/rating/rating.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var ratingCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+      ratingCtrl.init(ngModelCtrl);
+    }
+  };
+});
+
+angular.module('ui.bootstrap.tabs', [])
+
+.controller('UibTabsetController', ['$scope', function ($scope) {
+  var ctrl = this,
+      tabs = ctrl.tabs = $scope.tabs = [];
+
+  ctrl.select = function(selectedTab) {
+    angular.forEach(tabs, function(tab) {
+      if (tab.active && tab !== selectedTab) {
+        tab.active = false;
+        tab.onDeselect();
+        selectedTab.selectCalled = false;
+      }
+    });
+    selectedTab.active = true;
+    // only call select if it has not already been called
+    if (!selectedTab.selectCalled) {
+      selectedTab.onSelect();
+      selectedTab.selectCalled = true;
+    }
+  };
+
+  ctrl.addTab = function addTab(tab) {
+    tabs.push(tab);
+    // we can't run the select function on the first tab
+    // since that would select it twice
+    if (tabs.length === 1 && tab.active !== false) {
+      tab.active = true;
+    } else if (tab.active) {
+      ctrl.select(tab);
+    } else {
+      tab.active = false;
+    }
+  };
+
+  ctrl.removeTab = function removeTab(tab) {
+    var index = tabs.indexOf(tab);
+    //Select a new tab if the tab to be removed is selected and not destroyed
+    if (tab.active && tabs.length > 1 && !destroyed) {
+      //If this is the last tab, select the previous tab. else, the next tab.
+      var newActiveIndex = index === tabs.length - 1 ? index - 1 : index + 1;
+      ctrl.select(tabs[newActiveIndex]);
+    }
+    tabs.splice(index, 1);
+  };
+
+  var destroyed;
+  $scope.$on('$destroy', function() {
+    destroyed = true;
+  });
+}])
+
+.directive('uibTabset', function() {
+  return {
+    transclude: true,
+    replace: true,
+    scope: {
+      type: '@'
+    },
+    controller: 'UibTabsetController',
+    templateUrl: 'uib/template/tabs/tabset.html',
+    link: function(scope, element, attrs) {
+      scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical) : false;
+      scope.justified = angular.isDefined(attrs.justified) ? scope.$parent.$eval(attrs.justified) : false;
+    }
+  };
+})
+
+.directive('uibTab', ['$parse', function($parse) {
+  return {
+    require: '^uibTabset',
+    replace: true,
+    templateUrl: 'uib/template/tabs/tab.html',
+    transclude: true,
+    scope: {
+      active: '=?',
+      heading: '@',
+      onSelect: '&select', //This callback is called in contentHeadingTransclude
+                          //once it inserts the tab's content into the dom
+      onDeselect: '&deselect'
+    },
+    controller: function() {
+      //Empty controller so other directives can require being 'under' a tab
+    },
+    controllerAs: 'tab',
+    link: function(scope, elm, attrs, tabsetCtrl, transclude) {
+      scope.$watch('active', function(active) {
+        if (active) {
+          tabsetCtrl.select(scope);
+        }
+      });
+
+      scope.disabled = false;
+      if (attrs.disable) {
+        scope.$parent.$watch($parse(attrs.disable), function(value) {
+          scope.disabled = !! value;
+        });
+      }
+
+      scope.select = function() {
+        if (!scope.disabled) {
+          scope.active = true;
+        }
+      };
+
+      tabsetCtrl.addTab(scope);
+      scope.$on('$destroy', function() {
+        tabsetCtrl.removeTab(scope);
+      });
+
+      //We need to transclude later, once the content container is ready.
+      //when this link happens, we're inside a tab heading.
+      scope.$transcludeFn = transclude;
+    }
+  };
+}])
+
+.directive('uibTabHeadingTransclude', function() {
+  return {
+    restrict: 'A',
+    require: '^uibTab',
+    link: function(scope, elm) {
+      scope.$watch('headingElement', function updateHeadingElement(heading) {
+        if (heading) {
+          elm.html('');
+          elm.append(heading);
+        }
+      });
+    }
+  };
+})
+
+.directive('uibTabContentTransclude', function() {
+  return {
+    restrict: 'A',
+    require: '^uibTabset',
+    link: function(scope, elm, attrs) {
+      var tab = scope.$eval(attrs.uibTabContentTransclude);
+
+      //Now our tab is ready to be transcluded: both the tab heading area
+      //and the tab content area are loaded.  Transclude 'em both.
+      tab.$transcludeFn(tab.$parent, function(contents) {
+        angular.forEach(contents, function(node) {
+          if (isTabHeading(node)) {
+            //Let tabHeadingTransclude know.
+            tab.headingElement = node;
+          } else {
+            elm.append(node);
+          }
+        });
+      });
+    }
+  };
+
+  function isTabHeading(node) {
+    return node.tagName && (
+      node.hasAttribute('uib-tab-heading') ||
+      node.hasAttribute('data-uib-tab-heading') ||
+      node.hasAttribute('x-uib-tab-heading') ||
+      node.tagName.toLowerCase() === 'uib-tab-heading' ||
+      node.tagName.toLowerCase() === 'data-uib-tab-heading' ||
+      node.tagName.toLowerCase() === 'x-uib-tab-heading'
+    );
+  }
+});
+
+angular.module('ui.bootstrap.timepicker', [])
+
+.constant('uibTimepickerConfig', {
+  hourStep: 1,
+  minuteStep: 1,
+  secondStep: 1,
+  showMeridian: true,
+  showSeconds: false,
+  meridians: null,
+  readonlyInput: false,
+  mousewheel: true,
+  arrowkeys: true,
+  showSpinners: true,
+  templateUrl: 'uib/template/timepicker/timepicker.html'
+})
+
+.controller('UibTimepickerController', ['$scope', '$element', '$attrs', '$parse', '$log', '$locale', 'uibTimepickerConfig', function($scope, $element, $attrs, $parse, $log, $locale, timepickerConfig) {
+  var selected = new Date(),
+    watchers = [],
+    ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl
+    meridians = angular.isDefined($attrs.meridians) ? $scope.$parent.$eval($attrs.meridians) : timepickerConfig.meridians || $locale.DATETIME_FORMATS.AMPMS;
+
+  $scope.tabindex = angular.isDefined($attrs.tabindex) ? $attrs.tabindex : 0;
+  $element.removeAttr('tabindex');
+
+  this.init = function(ngModelCtrl_, inputs) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.unshift(function(modelValue) {
+      return modelValue ? new Date(modelValue) : null;
+    });
+
+    var hoursInputEl = inputs.eq(0),
+        minutesInputEl = inputs.eq(1),
+        secondsInputEl = inputs.eq(2);
+
+    var mousewheel = angular.isDefined($attrs.mousewheel) ? $scope.$parent.$eval($attrs.mousewheel) : timepickerConfig.mousewheel;
+
+    if (mousewheel) {
+      this.setupMousewheelEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+    }
+
+    var arrowkeys = angular.isDefined($attrs.arrowkeys) ? $scope.$parent.$eval($attrs.arrowkeys) : timepickerConfig.arrowkeys;
+    if (arrowkeys) {
+      this.setupArrowkeyEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+    }
+
+    $scope.readonlyInput = angular.isDefined($attrs.readonlyInput) ? $scope.$parent.$eval($attrs.readonlyInput) : timepickerConfig.readonlyInput;
+    this.setupInputEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+  };
+
+  var hourStep = timepickerConfig.hourStep;
+  if ($attrs.hourStep) {
+    watchers.push($scope.$parent.$watch($parse($attrs.hourStep), function(value) {
+      hourStep = +value;
+    }));
+  }
+
+  var minuteStep = timepickerConfig.minuteStep;
+  if ($attrs.minuteStep) {
+    watchers.push($scope.$parent.$watch($parse($attrs.minuteStep), function(value) {
+      minuteStep = +value;
+    }));
+  }
+
+  var min;
+  watchers.push($scope.$parent.$watch($parse($attrs.min), function(value) {
+    var dt = new Date(value);
+    min = isNaN(dt) ? undefined : dt;
+  }));
+
+  var max;
+  watchers.push($scope.$parent.$watch($parse($attrs.max), function(value) {
+    var dt = new Date(value);
+    max = isNaN(dt) ? undefined : dt;
+  }));
+
+  var disabled = false;
+  if ($attrs.ngDisabled) {
+    watchers.push($scope.$parent.$watch($parse($attrs.ngDisabled), function(value) {
+      disabled = value;
+    }));
+  }
+
+  $scope.noIncrementHours = function() {
+    var incrementedSelected = addMinutes(selected, hourStep * 60);
+    return disabled || incrementedSelected > max ||
+      incrementedSelected < selected && incrementedSelected < min;
+  };
+
+  $scope.noDecrementHours = function() {
+    var decrementedSelected = addMinutes(selected, -hourStep * 60);
+    return disabled || decrementedSelected < min ||
+      decrementedSelected > selected && decrementedSelected > max;
+  };
+
+  $scope.noIncrementMinutes = function() {
+    var incrementedSelected = addMinutes(selected, minuteStep);
+    return disabled || incrementedSelected > max ||
+      incrementedSelected < selected && incrementedSelected < min;
+  };
+
+  $scope.noDecrementMinutes = function() {
+    var decrementedSelected = addMinutes(selected, -minuteStep);
+    return disabled || decrementedSelected < min ||
+      decrementedSelected > selected && decrementedSelected > max;
+  };
+
+  $scope.noIncrementSeconds = function() {
+    var incrementedSelected = addSeconds(selected, secondStep);
+    return disabled || incrementedSelected > max ||
+      incrementedSelected < selected && incrementedSelected < min;
+  };
+
+  $scope.noDecrementSeconds = function() {
+    var decrementedSelected = addSeconds(selected, -secondStep);
+    return disabled || decrementedSelected < min ||
+      decrementedSelected > selected && decrementedSelected > max;
+  };
+
+  $scope.noToggleMeridian = function() {
+    if (selected.getHours() < 12) {
+      return disabled || addMinutes(selected, 12 * 60) > max;
+    }
+
+    return disabled || addMinutes(selected, -12 * 60) < min;
+  };
+
+  var secondStep = timepickerConfig.secondStep;
+  if ($attrs.secondStep) {
+    watchers.push($scope.$parent.$watch($parse($attrs.secondStep), function(value) {
+      secondStep = +value;
+    }));
+  }
+
+  $scope.showSeconds = timepickerConfig.showSeconds;
+  if ($attrs.showSeconds) {
+    watchers.push($scope.$parent.$watch($parse($attrs.showSeconds), function(value) {
+      $scope.showSeconds = !!value;
+    }));
+  }
+
+  // 12H / 24H mode
+  $scope.showMeridian = timepickerConfig.showMeridian;
+  if ($attrs.showMeridian) {
+    watchers.push($scope.$parent.$watch($parse($attrs.showMeridian), function(value) {
+      $scope.showMeridian = !!value;
+
+      if (ngModelCtrl.$error.time) {
+        // Evaluate from template
+        var hours = getHoursFromTemplate(), minutes = getMinutesFromTemplate();
+        if (angular.isDefined(hours) && angular.isDefined(minutes)) {
+          selected.setHours(hours);
+          refresh();
+        }
+      } else {
+        updateTemplate();
+      }
+    }));
+  }
+
+  // Get $scope.hours in 24H mode if valid
+  function getHoursFromTemplate() {
+    var hours = +$scope.hours;
+    var valid = $scope.showMeridian ? hours > 0 && hours < 13 :
+      hours >= 0 && hours < 24;
+    if (!valid) {
+      return undefined;
+    }
+
+    if ($scope.showMeridian) {
+      if (hours === 12) {
+        hours = 0;
+      }
+      if ($scope.meridian === meridians[1]) {
+        hours = hours + 12;
+      }
+    }
+    return hours;
+  }
+
+  function getMinutesFromTemplate() {
+    var minutes = +$scope.minutes;
+    return minutes >= 0 && minutes < 60 ? minutes : undefined;
+  }
+
+  function getSecondsFromTemplate() {
+    var seconds = +$scope.seconds;
+    return seconds >= 0 && seconds < 60 ? seconds : undefined;
+  }
+
+  function pad(value) {
+    if (value === null) {
+      return '';
+    }
+
+    return angular.isDefined(value) && value.toString().length < 2 ?
+      '0' + value : value.toString();
+  }
+
+  // Respond on mousewheel spin
+  this.setupMousewheelEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+    var isScrollingUp = function(e) {
+      if (e.originalEvent) {
+        e = e.originalEvent;
+      }
+      //pick correct delta variable depending on event
+      var delta = e.wheelDelta ? e.wheelDelta : -e.deltaY;
+      return e.detail || delta > 0;
+    };
+
+    hoursInputEl.bind('mousewheel wheel', function(e) {
+      if (!disabled) {
+        $scope.$apply(isScrollingUp(e) ? $scope.incrementHours() : $scope.decrementHours());
+      }
+      e.preventDefault();
+    });
+
+    minutesInputEl.bind('mousewheel wheel', function(e) {
+      if (!disabled) {
+        $scope.$apply(isScrollingUp(e) ? $scope.incrementMinutes() : $scope.decrementMinutes());
+      }
+      e.preventDefault();
+    });
+
+     secondsInputEl.bind('mousewheel wheel', function(e) {
+      if (!disabled) {
+        $scope.$apply(isScrollingUp(e) ? $scope.incrementSeconds() : $scope.decrementSeconds());
+      }
+      e.preventDefault();
+    });
+  };
+
+  // Respond on up/down arrowkeys
+  this.setupArrowkeyEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+    hoursInputEl.bind('keydown', function(e) {
+      if (!disabled) {
+        if (e.which === 38) { // up
+          e.preventDefault();
+          $scope.incrementHours();
+          $scope.$apply();
+        } else if (e.which === 40) { // down
+          e.preventDefault();
+          $scope.decrementHours();
+          $scope.$apply();
+        }
+      }
+    });
+
+    minutesInputEl.bind('keydown', function(e) {
+      if (!disabled) {
+        if (e.which === 38) { // up
+          e.preventDefault();
+          $scope.incrementMinutes();
+          $scope.$apply();
+        } else if (e.which === 40) { // down
+          e.preventDefault();
+          $scope.decrementMinutes();
+          $scope.$apply();
+        }
+      }
+    });
+
+    secondsInputEl.bind('keydown', function(e) {
+      if (!disabled) {
+        if (e.which === 38) { // up
+          e.preventDefault();
+          $scope.incrementSeconds();
+          $scope.$apply();
+        } else if (e.which === 40) { // down
+          e.preventDefault();
+          $scope.decrementSeconds();
+          $scope.$apply();
+        }
+      }
+    });
+  };
+
+  this.setupInputEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+    if ($scope.readonlyInput) {
+      $scope.updateHours = angular.noop;
+      $scope.updateMinutes = angular.noop;
+      $scope.updateSeconds = angular.noop;
+      return;
+    }
+
+    var invalidate = function(invalidHours, invalidMinutes, invalidSeconds) {
+      ngModelCtrl.$setViewValue(null);
+      ngModelCtrl.$setValidity('time', false);
+      if (angular.isDefined(invalidHours)) {
+        $scope.invalidHours = invalidHours;
+      }
+
+      if (angular.isDefined(invalidMinutes)) {
+        $scope.invalidMinutes = invalidMinutes;
+      }
+
+      if (angular.isDefined(invalidSeconds)) {
+        $scope.invalidSeconds = invalidSeconds;
+      }
+    };
+
+    $scope.updateHours = function() {
+      var hours = getHoursFromTemplate(),
+        minutes = getMinutesFromTemplate();
+
+      ngModelCtrl.$setDirty();
+
+      if (angular.isDefined(hours) && angular.isDefined(minutes)) {
+        selected.setHours(hours);
+        selected.setMinutes(minutes);
+        if (selected < min || selected > max) {
+          invalidate(true);
+        } else {
+          refresh('h');
+        }
+      } else {
+        invalidate(true);
+      }
+    };
+
+    hoursInputEl.bind('blur', function(e) {
+      ngModelCtrl.$setTouched();
+      if ($scope.hours === null || $scope.hours === '') {
+        invalidate(true);
+      } else if (!$scope.invalidHours && $scope.hours < 10) {
+        $scope.$apply(function() {
+          $scope.hours = pad($scope.hours);
+        });
+      }
+    });
+
+    $scope.updateMinutes = function() {
+      var minutes = getMinutesFromTemplate(),
+        hours = getHoursFromTemplate();
+
+      ngModelCtrl.$setDirty();
+
+      if (angular.isDefined(minutes) && angular.isDefined(hours)) {
+        selected.setHours(hours);
+        selected.setMinutes(minutes);
+        if (selected < min || selected > max) {
+          invalidate(undefined, true);
+        } else {
+          refresh('m');
+        }
+      } else {
+        invalidate(undefined, true);
+      }
+    };
+
+    minutesInputEl.bind('blur', function(e) {
+      ngModelCtrl.$setTouched();
+      if ($scope.minutes === null) {
+        invalidate(undefined, true);
+      } else if (!$scope.invalidMinutes && $scope.minutes < 10) {
+        $scope.$apply(function() {
+          $scope.minutes = pad($scope.minutes);
+        });
+      }
+    });
+
+    $scope.updateSeconds = function() {
+      var seconds = getSecondsFromTemplate();
+
+      ngModelCtrl.$setDirty();
+
+      if (angular.isDefined(seconds)) {
+        selected.setSeconds(seconds);
+        refresh('s');
+      } else {
+        invalidate(undefined, undefined, true);
+      }
+    };
+
+    secondsInputEl.bind('blur', function(e) {
+      if (!$scope.invalidSeconds && $scope.seconds < 10) {
+        $scope.$apply( function() {
+          $scope.seconds = pad($scope.seconds);
+        });
+      }
+    });
+
+  };
+
+  this.render = function() {
+    var date = ngModelCtrl.$viewValue;
+
+    if (isNaN(date)) {
+      ngModelCtrl.$setValidity('time', false);
+      $log.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
+    } else {
+      if (date) {
+        selected = date;
+      }
+
+      if (selected < min || selected > max) {
+        ngModelCtrl.$setValidity('time', false);
+        $scope.invalidHours = true;
+        $scope.invalidMinutes = true;
+      } else {
+        makeValid();
+      }
+      updateTemplate();
+    }
+  };
+
+  // Call internally when we know that model is valid.
+  function refresh(keyboardChange) {
+    makeValid();
+    ngModelCtrl.$setViewValue(new Date(selected));
+    updateTemplate(keyboardChange);
+  }
+
+  function makeValid() {
+    ngModelCtrl.$setValidity('time', true);
+    $scope.invalidHours = false;
+    $scope.invalidMinutes = false;
+    $scope.invalidSeconds = false;
+  }
+
+  function updateTemplate(keyboardChange) {
+    if (!ngModelCtrl.$modelValue) {
+      $scope.hours = null;
+      $scope.minutes = null;
+      $scope.seconds = null;
+      $scope.meridian = meridians[0];
+    } else {
+      var hours = selected.getHours(),
+        minutes = selected.getMinutes(),
+        seconds = selected.getSeconds();
+
+      if ($scope.showMeridian) {
+        hours = hours === 0 || hours === 12 ? 12 : hours % 12; // Convert 24 to 12 hour system
+      }
+
+      $scope.hours = keyboardChange === 'h' ? hours : pad(hours);
+      if (keyboardChange !== 'm') {
+        $scope.minutes = pad(minutes);
+      }
+      $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+
+      if (keyboardChange !== 's') {
+        $scope.seconds = pad(seconds);
+      }
+      $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+    }
+  }
+
+  function addSecondsToSelected(seconds) {
+    selected = addSeconds(selected, seconds);
+    refresh();
+  }
+
+  function addMinutes(selected, minutes) {
+    return addSeconds(selected, minutes*60);
+  }
+
+  function addSeconds(date, seconds) {
+    var dt = new Date(date.getTime() + seconds * 1000);
+    var newDate = new Date(date);
+    newDate.setHours(dt.getHours(), dt.getMinutes(), dt.getSeconds());
+    return newDate;
+  }
+
+  $scope.showSpinners = angular.isDefined($attrs.showSpinners) ?
+    $scope.$parent.$eval($attrs.showSpinners) : timepickerConfig.showSpinners;
+
+  $scope.incrementHours = function() {
+    if (!$scope.noIncrementHours()) {
+      addSecondsToSelected(hourStep * 60 * 60);
+    }
+  };
+
+  $scope.decrementHours = function() {
+    if (!$scope.noDecrementHours()) {
+      addSecondsToSelected(-hourStep * 60 * 60);
+    }
+  };
+
+  $scope.incrementMinutes = function() {
+    if (!$scope.noIncrementMinutes()) {
+      addSecondsToSelected(minuteStep * 60);
+    }
+  };
+
+  $scope.decrementMinutes = function() {
+    if (!$scope.noDecrementMinutes()) {
+      addSecondsToSelected(-minuteStep * 60);
+    }
+  };
+
+  $scope.incrementSeconds = function() {
+    if (!$scope.noIncrementSeconds()) {
+      addSecondsToSelected(secondStep);
+    }
+  };
+
+  $scope.decrementSeconds = function() {
+    if (!$scope.noDecrementSeconds()) {
+      addSecondsToSelected(-secondStep);
+    }
+  };
+
+  $scope.toggleMeridian = function() {
+    var minutes = getMinutesFromTemplate(),
+        hours = getHoursFromTemplate();
+
+    if (!$scope.noToggleMeridian()) {
+      if (angular.isDefined(minutes) && angular.isDefined(hours)) {
+        addSecondsToSelected(12 * 60 * (selected.getHours() < 12 ? 60 : -60));
+      } else {
+        $scope.meridian = $scope.meridian === meridians[0] ? meridians[1] : meridians[0];
+      }
+    }
+  };
+
+  $scope.blur = function() {
+    ngModelCtrl.$setTouched();
+  };
+
+  $scope.$on('$destroy', function() {
+    while (watchers.length) {
+      watchers.shift()();
+    }
+  });
+}])
+
+.directive('uibTimepicker', ['uibTimepickerConfig', function(uibTimepickerConfig) {
+  return {
+    require: ['uibTimepicker', '?^ngModel'],
+    controller: 'UibTimepickerController',
+    controllerAs: 'timepicker',
+    replace: true,
+    scope: {},
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || uibTimepickerConfig.templateUrl;
+    },
+    link: function(scope, element, attrs, ctrls) {
+      var timepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (ngModelCtrl) {
+        timepickerCtrl.init(ngModelCtrl, element.find('input'));
+      }
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap.position'])
+
+/**
+ * A helper service that can parse typeahead's syntax (string provided by users)
+ * Extracted to a separate service for ease of unit testing
+ */
+  .factory('uibTypeaheadParser', ['$parse', function($parse) {
+    //                      00000111000000000000022200000000000000003333333333333330000000000044000
+    var TYPEAHEAD_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
+    return {
+      parse: function(input) {
+        var match = input.match(TYPEAHEAD_REGEXP);
+        if (!match) {
+          throw new Error(
+            'Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_"' +
+              ' but got "' + input + '".');
+        }
+
+        return {
+          itemName: match[3],
+          source: $parse(match[4]),
+          viewMapper: $parse(match[2] || match[1]),
+          modelMapper: $parse(match[1])
+        };
+      }
+    };
+  }])
+
+  .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser',
+    function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser) {
+    var HOT_KEYS = [9, 13, 27, 38, 40];
+    var eventDebounceTime = 200;
+    var modelCtrl, ngModelOptions;
+    //SUPPORTED ATTRIBUTES (OPTIONS)
+
+    //minimal no of characters that needs to be entered before typeahead kicks-in
+    var minLength = originalScope.$eval(attrs.typeaheadMinLength);
+    if (!minLength && minLength !== 0) {
+      minLength = 1;
+    }
+
+    //minimal wait time after last character typed before typeahead kicks-in
+    var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
+
+    //should it restrict model values to the ones selected from the popup only?
+    var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
+    originalScope.$watch(attrs.typeaheadEditable, function (newVal) {
+      isEditable = newVal !== false;
+    });
+
+    //binding to a variable that indicates if matches are being retrieved asynchronously
+    var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
+
+    //a callback executed when a match is selected
+    var onSelectCallback = $parse(attrs.typeaheadOnSelect);
+
+    //should it select highlighted popup value when losing focus?
+    var isSelectOnBlur = angular.isDefined(attrs.typeaheadSelectOnBlur) ? originalScope.$eval(attrs.typeaheadSelectOnBlur) : false;
+
+    //binding to a variable that indicates if there were no results after the query is completed
+    var isNoResultsSetter = $parse(attrs.typeaheadNoResults).assign || angular.noop;
+
+    var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
+
+    var appendToBody = attrs.typeaheadAppendToBody ? originalScope.$eval(attrs.typeaheadAppendToBody) : false;
+
+    var appendTo = attrs.typeaheadAppendTo ?
+      originalScope.$eval(attrs.typeaheadAppendTo) : null;
+
+    var focusFirst = originalScope.$eval(attrs.typeaheadFocusFirst) !== false;
+
+    //If input matches an item of the list exactly, select it automatically
+    var selectOnExact = attrs.typeaheadSelectOnExact ? originalScope.$eval(attrs.typeaheadSelectOnExact) : false;
+
+    //binding to a variable that indicates if dropdown is open
+    var isOpenSetter = $parse(attrs.typeaheadIsOpen).assign || angular.noop;
+
+    var showHint = originalScope.$eval(attrs.typeaheadShowHint) || false;
+
+    //INTERNAL VARIABLES
+
+    //model setter executed upon match selection
+    var parsedModel = $parse(attrs.ngModel);
+    var invokeModelSetter = $parse(attrs.ngModel + '($$$p)');
+    var $setModelValue = function(scope, newValue) {
+      if (angular.isFunction(parsedModel(originalScope)) &&
+        ngModelOptions && ngModelOptions.$options && ngModelOptions.$options.getterSetter) {
+        return invokeModelSetter(scope, {$$$p: newValue});
+      }
+
+      return parsedModel.assign(scope, newValue);
+    };
+
+    //expressions used by typeahead
+    var parserResult = typeaheadParser.parse(attrs.uibTypeahead);
+
+    var hasFocus;
+
+    //Used to avoid bug in iOS webview where iOS keyboard does not fire
+    //mousedown & mouseup events
+    //Issue #3699
+    var selected;
+
+    //create a child scope for the typeahead directive so we are not polluting original scope
+    //with typeahead-specific data (matches, query etc.)
+    var scope = originalScope.$new();
+    var offDestroy = originalScope.$on('$destroy', function() {
+      scope.$destroy();
+    });
+    scope.$on('$destroy', offDestroy);
+
+    // WAI-ARIA
+    var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+    element.attr({
+      'aria-autocomplete': 'list',
+      'aria-expanded': false,
+      'aria-owns': popupId
+    });
+
+    var inputsContainer, hintInputElem;
+    //add read-only input to show hint
+    if (showHint) {
+      inputsContainer = angular.element('<div></div>');
+      inputsContainer.css('position', 'relative');
+      element.after(inputsContainer);
+      hintInputElem = element.clone();
+      hintInputElem.attr('placeholder', '');
+      hintInputElem.val('');
+      hintInputElem.css({
+        'position': 'absolute',
+        'top': '0px',
+        'left': '0px',
+        'border-color': 'transparent',
+        'box-shadow': 'none',
+        'opacity': 1,
+        'background': 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)',
+        'color': '#999'
+      });
+      element.css({
+        'position': 'relative',
+        'vertical-align': 'top',
+        'background-color': 'transparent'
+      });
+      inputsContainer.append(hintInputElem);
+      hintInputElem.after(element);
+    }
+
+    //pop-up element used to display matches
+    var popUpEl = angular.element('<div uib-typeahead-popup></div>');
+    popUpEl.attr({
+      id: popupId,
+      matches: 'matches',
+      active: 'activeIdx',
+      select: 'select(activeIdx, evt)',
+      'move-in-progress': 'moveInProgress',
+      query: 'query',
+      position: 'position',
+      'assign-is-open': 'assignIsOpen(isOpen)',
+      debounce: 'debounceUpdate'
+    });
+    //custom item template
+    if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
+      popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
+    }
+
+    if (angular.isDefined(attrs.typeaheadPopupTemplateUrl)) {
+      popUpEl.attr('popup-template-url', attrs.typeaheadPopupTemplateUrl);
+    }
+
+    var resetHint = function() {
+      if (showHint) {
+        hintInputElem.val('');
+      }
+    };
+
+    var resetMatches = function() {
+      scope.matches = [];
+      scope.activeIdx = -1;
+      element.attr('aria-expanded', false);
+      resetHint();
+    };
+
+    var getMatchId = function(index) {
+      return popupId + '-option-' + index;
+    };
+
+    // Indicate that the specified match is the active (pre-selected) item in the list owned by this typeahead.
+    // This attribute is added or removed automatically when the `activeIdx` changes.
+    scope.$watch('activeIdx', function(index) {
+      if (index < 0) {
+        element.removeAttr('aria-activedescendant');
+      } else {
+        element.attr('aria-activedescendant', getMatchId(index));
+      }
+    });
+
+    var inputIsExactMatch = function(inputValue, index) {
+      if (scope.matches.length > index && inputValue) {
+        return inputValue.toUpperCase() === scope.matches[index].label.toUpperCase();
+      }
+
+      return false;
+    };
+
+    var getMatchesAsync = function(inputValue, evt) {
+      var locals = {$viewValue: inputValue};
+      isLoadingSetter(originalScope, true);
+      isNoResultsSetter(originalScope, false);
+      $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
+        //it might happen that several async queries were in progress if a user were typing fast
+        //but we are interested only in responses that correspond to the current view value
+        var onCurrentRequest = inputValue === modelCtrl.$viewValue;
+        if (onCurrentRequest && hasFocus) {
+          if (matches && matches.length > 0) {
+            scope.activeIdx = focusFirst ? 0 : -1;
+            isNoResultsSetter(originalScope, false);
+            scope.matches.length = 0;
+
+            //transform labels
+            for (var i = 0; i < matches.length; i++) {
+              locals[parserResult.itemName] = matches[i];
+              scope.matches.push({
+                id: getMatchId(i),
+                label: parserResult.viewMapper(scope, locals),
+                model: matches[i]
+              });
+            }
+
+            scope.query = inputValue;
+            //position pop-up with matches - we need to re-calculate its position each time we are opening a window
+            //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
+            //due to other elements being rendered
+            recalculatePosition();
+
+            element.attr('aria-expanded', true);
+
+            //Select the single remaining option if user input matches
+            if (selectOnExact && scope.matches.length === 1 && inputIsExactMatch(inputValue, 0)) {
+              if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                $$debounce(function() {
+                  scope.select(0, evt);
+                }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+              } else {
+                scope.select(0, evt);
+              }
+            }
+
+            if (showHint) {
+              var firstLabel = scope.matches[0].label;
+              if (inputValue.length > 0 && firstLabel.slice(0, inputValue.length).toUpperCase() === inputValue.toUpperCase()) {
+                hintInputElem.val(inputValue + firstLabel.slice(inputValue.length));
+              }
+              else {
+                hintInputElem.val('');
+              }
+            }
+          } else {
+            resetMatches();
+            isNoResultsSetter(originalScope, true);
+          }
+        }
+        if (onCurrentRequest) {
+          isLoadingSetter(originalScope, false);
+        }
+      }, function() {
+        resetMatches();
+        isLoadingSetter(originalScope, false);
+        isNoResultsSetter(originalScope, true);
+      });
+    };
+
+    // bind events only if appendToBody params exist - performance feature
+    if (appendToBody) {
+      angular.element($window).on('resize', fireRecalculating);
+      $document.find('body').on('scroll', fireRecalculating);
+    }
+
+    // Declare the debounced function outside recalculating for
+    // proper debouncing
+    var debouncedRecalculate = $$debounce(function() {
+      // if popup is visible
+      if (scope.matches.length) {
+        recalculatePosition();
+      }
+
+      scope.moveInProgress = false;
+    }, eventDebounceTime);
+
+    // Default progress type
+    scope.moveInProgress = false;
+
+    function fireRecalculating() {
+      if (!scope.moveInProgress) {
+        scope.moveInProgress = true;
+        scope.$digest();
+      }
+
+      debouncedRecalculate();
+    }
+
+    // recalculate actual position and set new values to scope
+    // after digest loop is popup in right position
+    function recalculatePosition() {
+      scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+      scope.position.top += element.prop('offsetHeight');
+    }
+
+    //we need to propagate user's query so we can higlight matches
+    scope.query = undefined;
+
+    //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
+    var timeoutPromise;
+
+    var scheduleSearchWithTimeout = function(inputValue) {
+      timeoutPromise = $timeout(function() {
+        getMatchesAsync(inputValue);
+      }, waitTime);
+    };
+
+    var cancelPreviousTimeout = function() {
+      if (timeoutPromise) {
+        $timeout.cancel(timeoutPromise);
+      }
+    };
+
+    resetMatches();
+
+    scope.assignIsOpen = function (isOpen) {
+      isOpenSetter(originalScope, isOpen);
+    };
+
+    scope.select = function(activeIdx, evt) {
+      //called from within the $digest() cycle
+      var locals = {};
+      var model, item;
+
+      selected = true;
+      locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
+      model = parserResult.modelMapper(originalScope, locals);
+      $setModelValue(originalScope, model);
+      modelCtrl.$setValidity('editable', true);
+      modelCtrl.$setValidity('parse', true);
+
+      onSelectCallback(originalScope, {
+        $item: item,
+        $model: model,
+        $label: parserResult.viewMapper(originalScope, locals),
+        $event: evt
+      });
+
+      resetMatches();
+
+      //return focus to the input element if a match was selected via a mouse click event
+      // use timeout to avoid $rootScope:inprog error
+      if (scope.$eval(attrs.typeaheadFocusOnSelect) !== false) {
+        $timeout(function() { element[0].focus(); }, 0, false);
+      }
+    };
+
+    //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
+    element.on('keydown', function(evt) {
+      //typeahead is open and an "interesting" key was pressed
+      if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
+        return;
+      }
+
+      // if there's nothing selected (i.e. focusFirst) and enter or tab is hit, clear the results
+      if (scope.activeIdx === -1 && (evt.which === 9 || evt.which === 13)) {
+        resetMatches();
+        scope.$digest();
+        return;
+      }
+
+      evt.preventDefault();
+      var target;
+      switch (evt.which) {
+        case 9:
+        case 13:
+          scope.$apply(function () {
+            if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+              $$debounce(function() {
+                scope.select(scope.activeIdx, evt);
+              }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+            } else {
+              scope.select(scope.activeIdx, evt);
+            }
+          });
+          break;
+        case 27:
+          evt.stopPropagation();
+
+          resetMatches();
+          scope.$digest();
+          break;
+        case 38:
+          scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
+          scope.$digest();
+          target = popUpEl.find('li')[scope.activeIdx];
+          target.parentNode.scrollTop = target.offsetTop;
+          break;
+        case 40:
+          scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
+          scope.$digest();
+          target = popUpEl.find('li')[scope.activeIdx];
+          target.parentNode.scrollTop = target.offsetTop;
+          break;
+      }
+    });
+
+    element.bind('focus', function (evt) {
+      hasFocus = true;
+      if (minLength === 0 && !modelCtrl.$viewValue) {
+        $timeout(function() {
+          getMatchesAsync(modelCtrl.$viewValue, evt);
+        }, 0);
+      }
+    });
+
+    element.bind('blur', function(evt) {
+      if (isSelectOnBlur && scope.matches.length && scope.activeIdx !== -1 && !selected) {
+        selected = true;
+        scope.$apply(function() {
+          if (angular.isObject(scope.debounceUpdate) && angular.isNumber(scope.debounceUpdate.blur)) {
+            $$debounce(function() {
+              scope.select(scope.activeIdx, evt);
+            }, scope.debounceUpdate.blur);
+          } else {
+            scope.select(scope.activeIdx, evt);
+          }
+        });
+      }
+      if (!isEditable && modelCtrl.$error.editable) {
+        modelCtrl.$viewValue = '';
+        element.val('');
+      }
+      hasFocus = false;
+      selected = false;
+    });
+
+    // Keep reference to click handler to unbind it.
+    var dismissClickHandler = function(evt) {
+      // Issue #3973
+      // Firefox treats right click as a click on document
+      if (element[0] !== evt.target && evt.which !== 3 && scope.matches.length !== 0) {
+        resetMatches();
+        if (!$rootScope.$$phase) {
+          scope.$digest();
+        }
+      }
+    };
+
+    $document.on('click', dismissClickHandler);
+
+    originalScope.$on('$destroy', function() {
+      $document.off('click', dismissClickHandler);
+      if (appendToBody || appendTo) {
+        $popup.remove();
+      }
+
+      if (appendToBody) {
+        angular.element($window).off('resize', fireRecalculating);
+        $document.find('body').off('scroll', fireRecalculating);
+      }
+      // Prevent jQuery cache memory leak
+      popUpEl.remove();
+
+      if (showHint) {
+          inputsContainer.remove();
+      }
+    });
+
+    var $popup = $compile(popUpEl)(scope);
+
+    if (appendToBody) {
+      $document.find('body').append($popup);
+    } else if (appendTo) {
+      angular.element(appendTo).eq(0).append($popup);
+    } else {
+      element.after($popup);
+    }
+
+    this.init = function(_modelCtrl, _ngModelOptions) {
+      modelCtrl = _modelCtrl;
+      ngModelOptions = _ngModelOptions;
+
+      scope.debounceUpdate = modelCtrl.$options && $parse(modelCtrl.$options.debounce)(originalScope);
+
+      //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
+      //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
+      modelCtrl.$parsers.unshift(function(inputValue) {
+        hasFocus = true;
+
+        if (minLength === 0 || inputValue && inputValue.length >= minLength) {
+          if (waitTime > 0) {
+            cancelPreviousTimeout();
+            scheduleSearchWithTimeout(inputValue);
+          } else {
+            getMatchesAsync(inputValue);
+          }
+        } else {
+          isLoadingSetter(originalScope, false);
+          cancelPreviousTimeout();
+          resetMatches();
+        }
+
+        if (isEditable) {
+          return inputValue;
+        }
+
+        if (!inputValue) {
+          // Reset in case user had typed something previously.
+          modelCtrl.$setValidity('editable', true);
+          return null;
+        }
+
+        modelCtrl.$setValidity('editable', false);
+        return undefined;
+      });
+
+      modelCtrl.$formatters.push(function(modelValue) {
+        var candidateViewValue, emptyViewValue;
+        var locals = {};
+
+        // The validity may be set to false via $parsers (see above) if
+        // the model is restricted to selected values. If the model
+        // is set manually it is considered to be valid.
+        if (!isEditable) {
+          modelCtrl.$setValidity('editable', true);
+        }
+
+        if (inputFormatter) {
+          locals.$model = modelValue;
+          return inputFormatter(originalScope, locals);
+        }
+
+        //it might happen that we don't have enough info to properly render input value
+        //we need to check for this situation and simply return model value if we can't apply custom formatting
+        locals[parserResult.itemName] = modelValue;
+        candidateViewValue = parserResult.viewMapper(originalScope, locals);
+        locals[parserResult.itemName] = undefined;
+        emptyViewValue = parserResult.viewMapper(originalScope, locals);
+
+        return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
+      });
+    };
+  }])
+
+  .directive('uibTypeahead', function() {
+    return {
+      controller: 'UibTypeaheadController',
+      require: ['ngModel', '^?ngModelOptions', 'uibTypeahead'],
+      link: function(originalScope, element, attrs, ctrls) {
+        ctrls[2].init(ctrls[0], ctrls[1]);
+      }
+    };
+  })
+
+  .directive('uibTypeaheadPopup', ['$$debounce', function($$debounce) {
+    return {
+      scope: {
+        matches: '=',
+        query: '=',
+        active: '=',
+        position: '&',
+        moveInProgress: '=',
+        select: '&',
+        assignIsOpen: '&',
+        debounce: '&'
+      },
+      replace: true,
+      templateUrl: function(element, attrs) {
+        return attrs.popupTemplateUrl || 'uib/template/typeahead/typeahead-popup.html';
+      },
+      link: function(scope, element, attrs) {
+        scope.templateUrl = attrs.templateUrl;
+
+        scope.isOpen = function() {
+          var isDropdownOpen = scope.matches.length > 0;
+          scope.assignIsOpen({ isOpen: isDropdownOpen });
+          return isDropdownOpen;
+        };
+
+        scope.isActive = function(matchIdx) {
+          return scope.active === matchIdx;
+        };
+
+        scope.selectActive = function(matchIdx) {
+          scope.active = matchIdx;
+        };
+
+        scope.selectMatch = function(activeIdx, evt) {
+          var debounce = scope.debounce();
+          if (angular.isNumber(debounce) || angular.isObject(debounce)) {
+            $$debounce(function() {
+              scope.select({activeIdx: activeIdx, evt: evt});
+            }, angular.isNumber(debounce) ? debounce : debounce['default']);
+          } else {
+            scope.select({activeIdx: activeIdx, evt: evt});
+          }
+        };
+      }
+    };
+  }])
+
+  .directive('uibTypeaheadMatch', ['$templateRequest', '$compile', '$parse', function($templateRequest, $compile, $parse) {
+    return {
+      scope: {
+        index: '=',
+        match: '=',
+        query: '='
+      },
+      link: function(scope, element, attrs) {
+        var tplUrl = $parse(attrs.templateUrl)(scope.$parent) || 'uib/template/typeahead/typeahead-match.html';
+        $templateRequest(tplUrl).then(function(tplContent) {
+          var tplEl = angular.element(tplContent.trim());
+          element.replaceWith(tplEl);
+          $compile(tplEl)(scope);
+        });
+      }
+    };
+  }])
+
+  .filter('uibTypeaheadHighlight', ['$sce', '$injector', '$log', function($sce, $injector, $log) {
+    var isSanitizePresent;
+    isSanitizePresent = $injector.has('$sanitize');
+
+    function escapeRegexp(queryToEscape) {
+      // Regex: capture the whole query string and replace it with the string that will be used to match
+      // the results, for example if the capture is "a" the result will be \a
+      return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
+    }
+
+    function containsHtml(matchItem) {
+      return /<.*>/g.test(matchItem);
+    }
+
+    return function(matchItem, query) {
+      if (!isSanitizePresent && containsHtml(matchItem)) {
+        $log.warn('Unsafe use of typeahead please use ngSanitize'); // Warn the user about the danger
+      }
+      matchItem = query ? ('' + matchItem).replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : matchItem; // Replaces the capture string with a the same string inside of a "strong" tag
+      if (!isSanitizePresent) {
+        matchItem = $sce.trustAsHtml(matchItem); // If $sanitize is not present we pack the string in a $sce object for the ng-bind-html directive
+      }
+      return matchItem;
+    };
+  }]);
+
+angular.module("uib/template/accordion/accordion-group.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/accordion/accordion-group.html",
+    "<div class=\"panel\" ng-class=\"panelClass || 'panel-default'\">\n" +
+    "  <div class=\"panel-heading\" ng-keypress=\"toggleOpen($event)\">\n" +
+    "    <h4 class=\"panel-title\">\n" +
+    "      <a href tabindex=\"0\" class=\"accordion-toggle\" ng-click=\"toggleOpen()\" uib-accordion-transclude=\"heading\"><span ng-class=\"{'text-muted': isDisabled}\">{{heading}}</span></a>\n" +
+    "    </h4>\n" +
+    "  </div>\n" +
+    "  <div class=\"panel-collapse collapse\" uib-collapse=\"!isOpen\">\n" +
+    "	  <div class=\"panel-body\" ng-transclude></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/accordion/accordion.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/accordion/accordion.html",
+    "<div class=\"panel-group\" ng-transclude></div>");
+}]);
+
+angular.module("uib/template/alert/alert.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/alert/alert.html",
+    "<div class=\"alert\" ng-class=\"['alert-' + (type || 'warning'), closeable ? 'alert-dismissible' : null]\" role=\"alert\">\n" +
+    "    <button ng-show=\"closeable\" type=\"button\" class=\"close\" ng-click=\"close({$event: $event})\">\n" +
+    "        <span aria-hidden=\"true\">&times;</span>\n" +
+    "        <span class=\"sr-only\">Close</span>\n" +
+    "    </button>\n" +
+    "    <div ng-transclude></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/carousel/carousel.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/carousel/carousel.html",
+    "<div ng-mouseenter=\"pause()\" ng-mouseleave=\"play()\" class=\"carousel\" ng-swipe-right=\"prev()\" ng-swipe-left=\"next()\">\n" +
+    "  <div class=\"carousel-inner\" ng-transclude></div>\n" +
+    "  <a role=\"button\" href class=\"left carousel-control\" ng-click=\"prev()\" ng-show=\"slides.length > 1\">\n" +
+    "    <span aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-left\"></span>\n" +
+    "    <span class=\"sr-only\">previous</span>\n" +
+    "  </a>\n" +
+    "  <a role=\"button\" href class=\"right carousel-control\" ng-click=\"next()\" ng-show=\"slides.length > 1\">\n" +
+    "    <span aria-hidden=\"true\" class=\"glyphicon glyphicon-chevron-right\"></span>\n" +
+    "    <span class=\"sr-only\">next</span>\n" +
+    "  </a>\n" +
+    "  <ol class=\"carousel-indicators\" ng-show=\"slides.length > 1\">\n" +
+    "    <li ng-repeat=\"slide in slides | orderBy:indexOfSlide track by $index\" ng-class=\"{ active: isActive(slide) }\" ng-click=\"select(slide)\">\n" +
+    "      <span class=\"sr-only\">slide {{ $index + 1 }} of {{ slides.length }}<span ng-if=\"isActive(slide)\">, currently active</span></span>\n" +
+    "    </li>\n" +
+    "  </ol>\n" +
+    "</div>");
+}]);
+
+angular.module("uib/template/carousel/slide.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/carousel/slide.html",
+    "<div ng-class=\"{\n" +
+    "    'active': active\n" +
+    "  }\" class=\"item text-center\" ng-transclude></div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/datepicker/datepicker.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/datepicker.html",
+    "<div class=\"uib-datepicker\" ng-switch=\"datepickerMode\" role=\"application\" ng-keydown=\"keydown($event)\">\n" +
+    "  <uib-daypicker ng-switch-when=\"day\" tabindex=\"0\"></uib-daypicker>\n" +
+    "  <uib-monthpicker ng-switch-when=\"month\" tabindex=\"0\"></uib-monthpicker>\n" +
+    "  <uib-yearpicker ng-switch-when=\"year\" tabindex=\"0\"></uib-yearpicker>\n" +
+    "</div>");
+}]);
+
+angular.module("uib/template/datepicker/day.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/day.html",
+    "<table class=\"uib-daypicker\" role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left uib-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-left\"></i></button></th>\n" +
+    "      <th colspan=\"{{::5 + showWeeks}}\"><button id=\"{{::uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm uib-title\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right uib-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-right\"></i></button></th>\n" +
+    "    </tr>\n" +
+    "    <tr>\n" +
+    "      <th ng-if=\"showWeeks\" class=\"text-center\"></th>\n" +
+    "      <th ng-repeat=\"label in ::labels track by $index\" class=\"text-center\"><small aria-label=\"{{::label.full}}\">{{::label.abbr}}</small></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"uib-weeks\" ng-repeat=\"row in rows track by $index\">\n" +
+    "      <td ng-if=\"showWeeks\" class=\"text-center h6\"><em>{{ weekNumbers[$index] }}</em></td>\n" +
+    "      <td ng-repeat=\"dt in row\" class=\"uib-day text-center\" role=\"gridcell\"\n" +
+    "        id=\"{{::dt.uid}}\"\n" +
+    "        ng-class=\"::dt.customClass\">\n" +
+    "        <button type=\"button\" class=\"btn btn-default btn-sm\"\n" +
+    "          uib-is-class=\"\n" +
+    "            'btn-info' for selectedDt,\n" +
+    "            'active' for activeDt\n" +
+    "            on dt\"\n" +
+    "          ng-click=\"select(dt.date)\"\n" +
+    "          ng-disabled=\"::dt.disabled\"\n" +
+    "          tabindex=\"-1\"><span ng-class=\"::{'text-muted': dt.secondary, 'text-info': dt.current}\">{{::dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("uib/template/datepicker/month.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/month.html",
+    "<table class=\"uib-monthpicker\" role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left uib-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-left\"></i></button></th>\n" +
+    "      <th><button id=\"{{::uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm uib-title\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right uib-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-right\"></i></button></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"uib-months\" ng-repeat=\"row in rows track by $index\">\n" +
+    "      <td ng-repeat=\"dt in row\" class=\"uib-month text-center\" role=\"gridcell\"\n" +
+    "        id=\"{{::dt.uid}}\"\n" +
+    "        ng-class=\"::dt.customClass\">\n" +
+    "        <button type=\"button\" class=\"btn btn-default\"\n" +
+    "          uib-is-class=\"\n" +
+    "            'btn-info' for selectedDt,\n" +
+    "            'active' for activeDt\n" +
+    "            on dt\"\n" +
+    "          ng-click=\"select(dt.date)\"\n" +
+    "          ng-disabled=\"::dt.disabled\"\n" +
+    "          tabindex=\"-1\"><span ng-class=\"::{'text-info': dt.current}\">{{::dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("uib/template/datepicker/popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/popup.html",
+    "<div>\n" +
+    "  <ul class=\"uib-datepicker-popup dropdown-menu\" dropdown-nested ng-if=\"isOpen\" ng-style=\"{top: position.top+'px', left: position.left+'px'}\" ng-keydown=\"keydown($event)\" ng-click=\"$event.stopPropagation()\">\n" +
+    "    <li ng-transclude></li>\n" +
+    "    <li ng-if=\"showButtonBar\" class=\"uib-button-bar\">\n" +
+    "    <span class=\"btn-group pull-left\">\n" +
+    "      <button type=\"button\" class=\"btn btn-sm btn-info uib-datepicker-current\" ng-click=\"select('today')\" ng-disabled=\"isDisabled('today')\">{{ getText('current') }}</button>\n" +
+    "      <button type=\"button\" class=\"btn btn-sm btn-danger uib-clear\" ng-click=\"select(null)\">{{ getText('clear') }}</button>\n" +
+    "    </span>\n" +
+    "      <button type=\"button\" class=\"btn btn-sm btn-success pull-right uib-close\" ng-click=\"close()\">{{ getText('close') }}</button>\n" +
+    "    </li>\n" +
+    "  </ul>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/datepicker/year.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/datepicker/year.html",
+    "<table class=\"uib-yearpicker\" role=\"grid\" aria-labelledby=\"{{::uniqueId}}-title\" aria-activedescendant=\"{{activeDateId}}\">\n" +
+    "  <thead>\n" +
+    "    <tr>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-left uib-left\" ng-click=\"move(-1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-left\"></i></button></th>\n" +
+    "      <th colspan=\"{{::columns - 2}}\"><button id=\"{{::uniqueId}}-title\" role=\"heading\" aria-live=\"assertive\" aria-atomic=\"true\" type=\"button\" class=\"btn btn-default btn-sm uib-title\" ng-click=\"toggleMode()\" ng-disabled=\"datepickerMode === maxMode\" tabindex=\"-1\"><strong>{{title}}</strong></button></th>\n" +
+    "      <th><button type=\"button\" class=\"btn btn-default btn-sm pull-right uib-right\" ng-click=\"move(1)\" tabindex=\"-1\"><i class=\"glyphicon glyphicon-chevron-right\"></i></button></th>\n" +
+    "    </tr>\n" +
+    "  </thead>\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"uib-years\" ng-repeat=\"row in rows track by $index\">\n" +
+    "      <td ng-repeat=\"dt in row\" class=\"uib-year text-center\" role=\"gridcell\"\n" +
+    "        id=\"{{::dt.uid}}\"\n" +
+    "        ng-class=\"::dt.customClass\">\n" +
+    "        <button type=\"button\" class=\"btn btn-default\"\n" +
+    "          uib-is-class=\"\n" +
+    "            'btn-info' for selectedDt,\n" +
+    "            'active' for activeDt\n" +
+    "            on dt\"\n" +
+    "          ng-click=\"select(dt.date)\"\n" +
+    "          ng-disabled=\"::dt.disabled\"\n" +
+    "          tabindex=\"-1\"><span ng-class=\"::{'text-info': dt.current}\">{{::dt.label}}</span></button>\n" +
+    "      </td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("uib/template/modal/backdrop.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/modal/backdrop.html",
+    "<div class=\"modal-backdrop\"\n" +
+    "     uib-modal-animation-class=\"fade\"\n" +
+    "     modal-in-class=\"in\"\n" +
+    "     ng-style=\"{'z-index': 1040 + (index && 1 || 0) + index*10}\"\n" +
+    "></div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/modal/window.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/modal/window.html",
+    "<div modal-render=\"{{$isRendered}}\" tabindex=\"-1\" role=\"dialog\" class=\"modal\"\n" +
+    "    uib-modal-animation-class=\"fade\"\n" +
+    "    modal-in-class=\"in\"\n" +
+    "    ng-style=\"{'z-index': 1050 + index*10, display: 'block'}\">\n" +
+    "    <div class=\"modal-dialog {{size ? 'modal-' + size : ''}}\"><div class=\"modal-content\" uib-modal-transclude></div></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/pager/pager.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/pager/pager.html",
+    "<ul class=\"pager\">\n" +
+    "  <li ng-class=\"{disabled: noPrevious()||ngDisabled, previous: align}\"><a href ng-click=\"selectPage(page - 1, $event)\">{{::getText('previous')}}</a></li>\n" +
+    "  <li ng-class=\"{disabled: noNext()||ngDisabled, next: align}\"><a href ng-click=\"selectPage(page + 1, $event)\">{{::getText('next')}}</a></li>\n" +
+    "</ul>\n" +
+    "");
+}]);
+
+angular.module("uib/template/pagination/pagination.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/pagination/pagination.html",
+    "<ul class=\"pagination\">\n" +
+    "  <li ng-if=\"::boundaryLinks\" ng-class=\"{disabled: noPrevious()||ngDisabled}\" class=\"pagination-first\"><a href ng-click=\"selectPage(1, $event)\">{{::getText('first')}}</a></li>\n" +
+    "  <li ng-if=\"::directionLinks\" ng-class=\"{disabled: noPrevious()||ngDisabled}\" class=\"pagination-prev\"><a href ng-click=\"selectPage(page - 1, $event)\">{{::getText('previous')}}</a></li>\n" +
+    "  <li ng-repeat=\"page in pages track by $index\" ng-class=\"{active: page.active,disabled: ngDisabled&&!page.active}\" class=\"pagination-page\"><a href ng-click=\"selectPage(page.number, $event)\">{{page.text}}</a></li>\n" +
+    "  <li ng-if=\"::directionLinks\" ng-class=\"{disabled: noNext()||ngDisabled}\" class=\"pagination-next\"><a href ng-click=\"selectPage(page + 1, $event)\">{{::getText('next')}}</a></li>\n" +
+    "  <li ng-if=\"::boundaryLinks\" ng-class=\"{disabled: noNext()||ngDisabled}\" class=\"pagination-last\"><a href ng-click=\"selectPage(totalPages, $event)\">{{::getText('last')}}</a></li>\n" +
+    "</ul>\n" +
+    "");
+}]);
+
+angular.module("uib/template/tooltip/tooltip-html-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tooltip/tooltip-html-popup.html",
+    "<div class=\"tooltip\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  uib-tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"tooltip-arrow\"></div>\n" +
+    "  <div class=\"tooltip-inner\" ng-bind-html=\"contentExp()\"></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/tooltip/tooltip-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tooltip/tooltip-popup.html",
+    "<div class=\"tooltip\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  uib-tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"tooltip-arrow\"></div>\n" +
+    "  <div class=\"tooltip-inner\" ng-bind=\"content\"></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/tooltip/tooltip-template-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tooltip/tooltip-template-popup.html",
+    "<div class=\"tooltip\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  uib-tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"tooltip-arrow\"></div>\n" +
+    "  <div class=\"tooltip-inner\"\n" +
+    "    uib-tooltip-template-transclude=\"contentExp()\"\n" +
+    "    tooltip-template-transclude-scope=\"originScope()\"></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/popover/popover-html.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/popover/popover-html.html",
+    "<div class=\"popover\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  uib-tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"arrow\"></div>\n" +
+    "\n" +
+    "  <div class=\"popover-inner\">\n" +
+    "      <h3 class=\"popover-title\" ng-bind=\"title\" ng-if=\"title\"></h3>\n" +
+    "      <div class=\"popover-content\" ng-bind-html=\"contentExp()\"></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/popover/popover-template.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/popover/popover-template.html",
+    "<div class=\"popover\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  uib-tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"arrow\"></div>\n" +
+    "\n" +
+    "  <div class=\"popover-inner\">\n" +
+    "      <h3 class=\"popover-title\" ng-bind=\"title\" ng-if=\"title\"></h3>\n" +
+    "      <div class=\"popover-content\"\n" +
+    "        uib-tooltip-template-transclude=\"contentExp()\"\n" +
+    "        tooltip-template-transclude-scope=\"originScope()\"></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/popover/popover.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/popover/popover.html",
+    "<div class=\"popover\"\n" +
+    "  tooltip-animation-class=\"fade\"\n" +
+    "  uib-tooltip-classes\n" +
+    "  ng-class=\"{ in: isOpen() }\">\n" +
+    "  <div class=\"arrow\"></div>\n" +
+    "\n" +
+    "  <div class=\"popover-inner\">\n" +
+    "      <h3 class=\"popover-title\" ng-bind=\"title\" ng-if=\"title\"></h3>\n" +
+    "      <div class=\"popover-content\" ng-bind=\"content\"></div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/progressbar/bar.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/progressbar/bar.html",
+    "<div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" aria-labelledby=\"{{::title}}\" ng-transclude></div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/progressbar/progress.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/progressbar/progress.html",
+    "<div class=\"progress\" ng-transclude aria-labelledby=\"{{::title}}\"></div>");
+}]);
+
+angular.module("uib/template/progressbar/progressbar.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/progressbar/progressbar.html",
+    "<div class=\"progress\">\n" +
+    "  <div class=\"progress-bar\" ng-class=\"type && 'progress-bar-' + type\" role=\"progressbar\" aria-valuenow=\"{{value}}\" aria-valuemin=\"0\" aria-valuemax=\"{{max}}\" ng-style=\"{width: (percent < 100 ? percent : 100) + '%'}\" aria-valuetext=\"{{percent | number:0}}%\" aria-labelledby=\"{{::title}}\" ng-transclude></div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/rating/rating.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/rating/rating.html",
+    "<span ng-mouseleave=\"reset()\" ng-keydown=\"onKeydown($event)\" tabindex=\"0\" role=\"slider\" aria-valuemin=\"0\" aria-valuemax=\"{{range.length}}\" aria-valuenow=\"{{value}}\">\n" +
+    "    <span ng-repeat-start=\"r in range track by $index\" class=\"sr-only\">({{ $index < value ? '*' : ' ' }})</span>\n" +
+    "    <i ng-repeat-end ng-mouseenter=\"enter($index + 1)\" ng-click=\"rate($index + 1)\" class=\"glyphicon\" ng-class=\"$index < value && (r.stateOn || 'glyphicon-star') || (r.stateOff || 'glyphicon-star-empty')\" ng-attr-title=\"{{r.title}}\" aria-valuetext=\"{{r.title}}\"></i>\n" +
+    "</span>\n" +
+    "");
+}]);
+
+angular.module("uib/template/tabs/tab.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tabs/tab.html",
+    "<li ng-class=\"{active: active, disabled: disabled}\" class=\"uib-tab\">\n" +
+    "  <a href ng-click=\"select()\" uib-tab-heading-transclude>{{heading}}</a>\n" +
+    "</li>\n" +
+    "");
+}]);
+
+angular.module("uib/template/tabs/tabset.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/tabs/tabset.html",
+    "<div>\n" +
+    "  <ul class=\"nav nav-{{type || 'tabs'}}\" ng-class=\"{'nav-stacked': vertical, 'nav-justified': justified}\" ng-transclude></ul>\n" +
+    "  <div class=\"tab-content\">\n" +
+    "    <div class=\"tab-pane\" \n" +
+    "         ng-repeat=\"tab in tabs\" \n" +
+    "         ng-class=\"{active: tab.active}\"\n" +
+    "         uib-tab-content-transclude=\"tab\">\n" +
+    "    </div>\n" +
+    "  </div>\n" +
+    "</div>\n" +
+    "");
+}]);
+
+angular.module("uib/template/timepicker/timepicker.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/timepicker/timepicker.html",
+    "<table class=\"uib-timepicker\">\n" +
+    "  <tbody>\n" +
+    "    <tr class=\"text-center\" ng-show=\"::showSpinners\">\n" +
+    "      <td class=\"uib-increment hours\"><a ng-click=\"incrementHours()\" ng-class=\"{disabled: noIncrementHours()}\" class=\"btn btn-link\" ng-disabled=\"noIncrementHours()\" tabindex=\"{{::tabindex}}\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "      <td>&nbsp;</td>\n" +
+    "      <td class=\"uib-increment minutes\"><a ng-click=\"incrementMinutes()\" ng-class=\"{disabled: noIncrementMinutes()}\" class=\"btn btn-link\" ng-disabled=\"noIncrementMinutes()\" tabindex=\"{{::tabindex}}\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "      <td ng-show=\"showSeconds\">&nbsp;</td>\n" +
+    "      <td ng-show=\"showSeconds\" class=\"uib-increment seconds\"><a ng-click=\"incrementSeconds()\" ng-class=\"{disabled: noIncrementSeconds()}\" class=\"btn btn-link\" ng-disabled=\"noIncrementSeconds()\" tabindex=\"{{::tabindex}}\"><span class=\"glyphicon glyphicon-chevron-up\"></span></a></td>\n" +
+    "      <td ng-show=\"showMeridian\"></td>\n" +
+    "    </tr>\n" +
+    "    <tr>\n" +
+    "      <td class=\"form-group uib-time hours\" ng-class=\"{'has-error': invalidHours}\">\n" +
+    "        <input style=\"width:50px;\" type=\"text\" placeholder=\"HH\" ng-model=\"hours\" ng-change=\"updateHours()\" class=\"form-control text-center\" ng-readonly=\"::readonlyInput\" maxlength=\"2\" tabindex=\"{{::tabindex}}\" ng-disabled=\"noIncrementHours()\" ng-blur=\"blur()\">\n" +
+    "      </td>\n" +
+    "      <td class=\"uib-separator\">:</td>\n" +
+    "      <td class=\"form-group uib-time minutes\" ng-class=\"{'has-error': invalidMinutes}\">\n" +
+    "        <input style=\"width:50px;\" type=\"text\" placeholder=\"MM\" ng-model=\"minutes\" ng-change=\"updateMinutes()\" class=\"form-control text-center\" ng-readonly=\"::readonlyInput\" maxlength=\"2\" tabindex=\"{{::tabindex}}\" ng-disabled=\"noIncrementMinutes()\" ng-blur=\"blur()\">\n" +
+    "      </td>\n" +
+    "      <td ng-show=\"showSeconds\" class=\"uib-separator\">:</td>\n" +
+    "      <td class=\"form-group uib-time seconds\" ng-class=\"{'has-error': invalidSeconds}\" ng-show=\"showSeconds\">\n" +
+    "        <input style=\"width:50px;\" type=\"text\" placeholder=\"SS\" ng-model=\"seconds\" ng-change=\"updateSeconds()\" class=\"form-control text-center\" ng-readonly=\"readonlyInput\" maxlength=\"2\" tabindex=\"{{::tabindex}}\" ng-disabled=\"noIncrementSeconds()\" ng-blur=\"blur()\">\n" +
+    "      </td>\n" +
+    "      <td ng-show=\"showMeridian\" class=\"uib-time am-pm\"><button type=\"button\" ng-class=\"{disabled: noToggleMeridian()}\" class=\"btn btn-default text-center\" ng-click=\"toggleMeridian()\" ng-disabled=\"noToggleMeridian()\" tabindex=\"{{::tabindex}}\">{{meridian}}</button></td>\n" +
+    "    </tr>\n" +
+    "    <tr class=\"text-center\" ng-show=\"::showSpinners\">\n" +
+    "      <td class=\"uib-decrement hours\"><a ng-click=\"decrementHours()\" ng-class=\"{disabled: noDecrementHours()}\" class=\"btn btn-link\" ng-disabled=\"noDecrementHours()\" tabindex=\"{{::tabindex}}\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "      <td>&nbsp;</td>\n" +
+    "      <td class=\"uib-decrement minutes\"><a ng-click=\"decrementMinutes()\" ng-class=\"{disabled: noDecrementMinutes()}\" class=\"btn btn-link\" ng-disabled=\"noDecrementMinutes()\" tabindex=\"{{::tabindex}}\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "      <td ng-show=\"showSeconds\">&nbsp;</td>\n" +
+    "      <td ng-show=\"showSeconds\" class=\"uib-decrement seconds\"><a ng-click=\"decrementSeconds()\" ng-class=\"{disabled: noDecrementSeconds()}\" class=\"btn btn-link\" ng-disabled=\"noDecrementSeconds()\" tabindex=\"{{::tabindex}}\"><span class=\"glyphicon glyphicon-chevron-down\"></span></a></td>\n" +
+    "      <td ng-show=\"showMeridian\"></td>\n" +
+    "    </tr>\n" +
+    "  </tbody>\n" +
+    "</table>\n" +
+    "");
+}]);
+
+angular.module("uib/template/typeahead/typeahead-match.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/typeahead/typeahead-match.html",
+    "<a href\n" +
+    "   tabindex=\"-1\"\n" +
+    "   ng-bind-html=\"match.label | uibTypeaheadHighlight:query\"\n" +
+    "   ng-attr-title=\"{{match.label}}\"></a>\n" +
+    "");
+}]);
+
+angular.module("uib/template/typeahead/typeahead-popup.html", []).run(["$templateCache", function($templateCache) {
+  $templateCache.put("uib/template/typeahead/typeahead-popup.html",
+    "<ul class=\"dropdown-menu\" ng-show=\"isOpen() && !moveInProgress\" ng-style=\"{top: position().top+'px', left: position().left+'px'}\" role=\"listbox\" aria-hidden=\"{{!isOpen()}}\">\n" +
+    "    <li ng-repeat=\"match in matches track by $index\" ng-class=\"{active: isActive($index) }\" ng-mouseenter=\"selectActive($index)\" ng-click=\"selectMatch($index, $event)\" role=\"option\" id=\"{{::match.id}}\">\n" +
+    "        <div uib-typeahead-match index=\"$index\" match=\"match\" query=\"query\" template-url=\"templateUrl\"></div>\n" +
+    "    </li>\n" +
+    "</ul>\n" +
+    "");
+}]);
+angular.module('ui.bootstrap.carousel').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>'); });
+angular.module('ui.bootstrap.datepicker').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker .uib-title{width:100%;}.uib-day button,.uib-month button,.uib-year button{min-width:100%;}.uib-datepicker-popup.dropdown-menu{display:block;}.uib-button-bar{padding:10px 9px 2px;}</style>'); });
+angular.module('ui.bootstrap.timepicker').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">.uib-time input{width:50px;}</style>'); });
+angular.module('ui.bootstrap.typeahead').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">[uib-typeahead-popup].dropdown-menu{display:block;}</style>'); });
\ No newline at end of file
diff --git a/turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js b/turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
new file mode 100644
index 000000000..afe44fc5f
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js
@@ -0,0 +1,10 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 1.1.1 - 2016-01-25
+ * License: MIT
+ */angular.module("ui.bootstrap",["ui.bootstrap.tpls","ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.debounce","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.tpls",["uib/template/accordion/accordion-group.html","uib/template/accordion/accordion.html","uib/template/alert/alert.html","uib/template/carousel/carousel.html","uib/template/carousel/slide.html","uib/template/datepicker/datepicker.html","uib/template/datepicker/day.html","uib/template/datepicker/month.html","uib/template/datepicker/popup.html","uib/template/datepicker/year.html","uib/template/modal/backdrop.html","uib/template/modal/window.html","uib/template/pager/pager.html","uib/template/pagination/pagination.html","uib/template/tooltip/tooltip-html-popup.html","uib/template/tooltip/tooltip-popup.html","uib/template/tooltip/tooltip-template-popup.html","uib/template/popover/popover-html.html","uib/template/popover/popover-template.html","uib/template/popover/popover.html","uib/template/progressbar/bar.html","uib/template/progressbar/progress.html","uib/template/progressbar/progressbar.html","uib/template/rating/rating.html","uib/template/tabs/tab.html","uib/template/tabs/tabset.html","uib/template/timepicker/timepicker.html","uib/template/typeahead/typeahead-match.html","uib/template/typeahead/typeahead-popup.html"]),angular.module("ui.bootstrap.collapse",[]).directive("uibCollapse",["$animate","$q","$parse","$injector",function(a,b,c,d){var e=d.has("$animateCss")?d.get("$animateCss"):null;return{link:function(d,f,g){function h(){f.hasClass("collapse")&&f.hasClass("in")||b.resolve(l(d)).then(function(){f.removeClass("collapse").addClass("collapsing").attr("aria-expanded",!0).attr("aria-hidden",!1),e?e(f,{addClass:"in",easing:"ease",to:{height:f[0].scrollHeight+"px"}}).start()["finally"](i):a.addClass(f,"in",{to:{height:f[0].scrollHeight+"px"}}).then(i)})}function i(){f.removeClass("collapsing").addClass("collapse").css({height:"auto"}),m(d)}function j(){return f.hasClass("collapse")||f.hasClass("in")?void b.resolve(n(d)).then(function(){f.css({height:f[0].scrollHeight+"px"}).removeClass("collapse").addClass("collapsing").attr("aria-expanded",!1).attr("aria-hidden",!0),e?e(f,{removeClass:"in",to:{height:"0"}}).start()["finally"](k):a.removeClass(f,"in",{to:{height:"0"}}).then(k)}):k()}function k(){f.css({height:"0"}),f.removeClass("collapsing").addClass("collapse"),o(d)}var l=c(g.expanding),m=c(g.expanded),n=c(g.collapsing),o=c(g.collapsed);d.$eval(g.uibCollapse)||f.addClass("in").addClass("collapse").attr("aria-expanded",!0).attr("aria-hidden",!1).css({height:"auto"}),d.$watch(g.uibCollapse,function(a){a?j():h()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("uibAccordionConfig",{closeOthers:!0}).controller("UibAccordionController",["$scope","$attrs","uibAccordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(c){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("uibAccordion",function(){return{controller:"UibAccordionController",controllerAs:"accordion",transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/accordion/accordion.html"}}}).directive("uibAccordionGroup",function(){return{require:"^uibAccordion",transclude:!0,replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/accordion/accordion-group.html"},scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.openClass=c.openClass||"panel-open",a.panelClass=c.panelClass||"panel-default",a.$watch("isOpen",function(c){b.toggleClass(a.openClass,!!c),c&&d.closeOthers(a)}),a.toggleOpen=function(b){a.isDisabled||b&&32!==b.which||(a.isOpen=!a.isOpen)}}}}).directive("uibAccordionHeading",function(){return{transclude:!0,template:"",replace:!0,require:"^uibAccordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,angular.noop))}}}).directive("uibAccordionTransclude",function(){return{require:"^uibAccordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.uibAccordionTransclude]},function(a){a&&(b.find("span").html(""),b.find("span").append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("UibAlertController",["$scope","$attrs","$interpolate","$timeout",function(a,b,c,d){a.closeable=!!b.close;var e=angular.isDefined(b.dismissOnTimeout)?c(b.dismissOnTimeout)(a.$parent):null;e&&d(function(){a.close()},parseInt(e,10))}]).directive("uibAlert",function(){return{controller:"UibAlertController",controllerAs:"alert",templateUrl:function(a,b){return b.templateUrl||"uib/template/alert/alert.html"},transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}),angular.module("ui.bootstrap.buttons",[]).constant("uibButtonConfig",{activeClass:"active",toggleEvent:"click"}).controller("UibButtonsController",["uibButtonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("uibBtnRadio",["$parse",function(a){return{require:["uibBtnRadio","ngModel"],controller:"UibButtonsController",controllerAs:"buttons",link:function(b,c,d,e){var f=e[0],g=e[1],h=a(d.uibUncheckable);c.find("input").css({display:"none"}),g.$render=function(){c.toggleClass(f.activeClass,angular.equals(g.$modelValue,b.$eval(d.uibBtnRadio)))},c.on(f.toggleEvent,function(){if(!d.disabled){var a=c.hasClass(f.activeClass);(!a||angular.isDefined(d.uncheckable))&&b.$apply(function(){g.$setViewValue(a?null:b.$eval(d.uibBtnRadio)),g.$render()})}}),d.uibUncheckable&&b.$watch(h,function(a){d.$set("uncheckable",a?"":null)})}}}]).directive("uibBtnCheckbox",function(){return{require:["uibBtnCheckbox","ngModel"],controller:"UibButtonsController",controllerAs:"button",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){return angular.isDefined(b)?a.$eval(b):c}var h=d[0],i=d[1];b.find("input").css({display:"none"}),i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.on(h.toggleEvent,function(){c.disabled||a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",[]).controller("UibCarouselController",["$scope","$element","$interval","$timeout","$animate",function(a,b,c,d,e){function f(){for(;s.length;)s.shift()}function g(a){if(angular.isUndefined(p[a].index))return p[a];for(var b=0,c=p.length;c>b;++b)if(p[b].index===a)return p[b]}function h(c,d,g){t||(angular.extend(c,{direction:g,active:!0}),angular.extend(o.currentSlide||{},{direction:g,active:!1}),e.enabled(b)&&!a.$currentTransition&&c.$element&&o.slides.length>1&&(c.$element.data(q,c.direction),o.currentSlide&&o.currentSlide.$element&&o.currentSlide.$element.data(q,c.direction),a.$currentTransition=!0,e.on("addClass",c.$element,function(b,c){if("close"===c&&(a.$currentTransition=null,e.off("addClass",b),s.length)){var d=s.pop(),g=a.indexOfSlide(d),i=g>o.getCurrentIndex()?"next":"prev";f(),h(d,g,i)}})),o.currentSlide=c,r=d,k())}function i(){m&&(c.cancel(m),m=null)}function j(b){b.length||(a.$currentTransition=null,f())}function k(){i();var b=+a.interval;!isNaN(b)&&b>0&&(m=c(l,b))}function l(){var b=+a.interval;n&&!isNaN(b)&&b>0&&p.length?a.next():a.pause()}var m,n,o=this,p=o.slides=a.slides=[],q="uib-slideDirection",r=-1,s=[];o.currentSlide=null;var t=!1;o.addSlide=function(b,c){b.$element=c,p.push(b),1===p.length||b.active?(a.$currentTransition&&(a.$currentTransition=null),o.select(p[p.length-1]),1===p.length&&a.play()):b.active=!1},o.getCurrentIndex=function(){return o.currentSlide&&angular.isDefined(o.currentSlide.index)?+o.currentSlide.index:r},o.next=a.next=function(){var b=(o.getCurrentIndex()+1)%p.length;return 0===b&&a.noWrap()?void a.pause():o.select(g(b),"next")},o.prev=a.prev=function(){var b=o.getCurrentIndex()-1<0?p.length-1:o.getCurrentIndex()-1;return a.noWrap()&&b===p.length-1?void a.pause():o.select(g(b),"prev")},o.removeSlide=function(a){angular.isDefined(a.index)&&p.sort(function(a,b){return+a.index>+b.index});var b=s.indexOf(a);-1!==b&&s.splice(b,1);var c=p.indexOf(a);p.splice(c,1),d(function(){p.length>0&&a.active?c>=p.length?o.select(p[c-1]):o.select(p[c]):r>c&&r--}),0===p.length&&(o.currentSlide=null,f())},o.select=a.select=function(b,c){var d=a.indexOfSlide(b);void 0===c&&(c=d>o.getCurrentIndex()?"next":"prev"),b&&b!==o.currentSlide&&!a.$currentTransition?h(b,d,c):b&&b!==o.currentSlide&&a.$currentTransition&&(s.push(b),b.active=!1)},a.indexOfSlide=function(a){return angular.isDefined(a.index)?+a.index:p.indexOf(a)},a.isActive=function(a){return o.currentSlide===a},a.pause=function(){a.noPause||(n=!1,i())},a.play=function(){n||(n=!0,k())},a.$on("$destroy",function(){t=!0,i()}),a.$watch("noTransition",function(a){e.enabled(b,!a)}),a.$watch("interval",k),a.$watchCollection("slides",j)}]).directive("uibCarousel",function(){return{transclude:!0,replace:!0,controller:"UibCarouselController",controllerAs:"carousel",templateUrl:function(a,b){return b.templateUrl||"uib/template/carousel/carousel.html"},scope:{interval:"=",noTransition:"=",noPause:"=",noWrap:"&"}}}).directive("uibSlide",function(){return{require:"^uibCarousel",transclude:!0,replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/carousel/slide.html"},scope:{active:"=?",actual:"=?",index:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}).animation(".item",["$animateCss",function(a){function b(a,b,c){a.removeClass(b),c&&c()}var c="uib-slideDirection";return{beforeAddClass:function(d,e,f){if("active"===e){var g=!1,h=d.data(c),i="next"===h?"left":"right",j=b.bind(this,d,i+" "+h,f);return d.addClass(h),a(d,{addClass:i}).start().done(j),function(){g=!0}}f()},beforeRemoveClass:function(d,e,f){if("active"===e){var g=!1,h=d.data(c),i="next"===h?"left":"right",j=b.bind(this,d,i,f);return a(d,{addClass:i}).start().done(j),function(){g=!0}}f()}}}]),angular.module("ui.bootstrap.dateparser",[]).service("uibDateParser",["$log","$locale","orderByFilter",function(a,b,c){function d(a){var b=[],d=a.split(""),e=a.indexOf("'");if(e>-1){var f=!1;a=a.split("");for(var g=e;g<a.length;g++)f?("'"===a[g]&&(g+1<a.length&&"'"===a[g+1]?(a[g+1]="$",d[g+1]=""):(d[g]="",f=!1)),a[g]="$"):"'"===a[g]&&(a[g]="$",d[g]="",f=!0);a=a.join("")}return angular.forEach(m,function(c){var e=a.indexOf(c.key);if(e>-1){a=a.split(""),d[e]="("+c.regex+")",a[e]="$";for(var f=e+1,g=e+c.key.length;g>f;f++)d[f]="",a[f]="$";a=a.join(""),b.push({index:e,apply:c.apply,matcher:c.regex})}}),{regex:new RegExp("^"+d.join("")+"$"),map:c(b,"index")}}function e(a,b,c){return 1>c?!1:1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}function f(a){return parseInt(a,10)}function g(a,b){return a&&b?k(a,b):a}function h(a,b){return a&&b?k(a,b,!0):a}function i(a,b){var c=Date.parse("Jan 01, 1970 00:00:00 "+a)/6e4;return isNaN(c)?b:c}function j(a,b){return a=new Date(a.getTime()),a.setMinutes(a.getMinutes()+b),a}function k(a,b,c){c=c?-1:1;var d=i(b,a.getTimezoneOffset());return j(a,c*(d-a.getTimezoneOffset()))}var l,m,n=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;this.init=function(){l=b.id,this.parsers={},m=[{key:"yyyy",regex:"\\d{4}",apply:function(a){this.year=+a}},{key:"yy",regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},{key:"y",regex:"\\d{1,4}",apply:function(a){this.year=+a}},{key:"M!",regex:"0?[1-9]|1[0-2]",apply:function(a){this.month=a-1}},{key:"MMMM",regex:b.DATETIME_FORMATS.MONTH.join("|"),apply:function(a){this.month=b.DATETIME_FORMATS.MONTH.indexOf(a)}},{key:"MMM",regex:b.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(a){this.month=b.DATETIME_FORMATS.SHORTMONTH.indexOf(a)}},{key:"MM",regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},{key:"M",regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},{key:"d!",regex:"[0-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},{key:"dd",regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},{key:"d",regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},{key:"EEEE",regex:b.DATETIME_FORMATS.DAY.join("|")},{key:"EEE",regex:b.DATETIME_FORMATS.SHORTDAY.join("|")},{key:"HH",regex:"(?:0|1)[0-9]|2[0-3]",apply:function(a){this.hours=+a}},{key:"hh",regex:"0[0-9]|1[0-2]",apply:function(a){this.hours=+a}},{key:"H",regex:"1?[0-9]|2[0-3]",apply:function(a){this.hours=+a}},{key:"h",regex:"[0-9]|1[0-2]",apply:function(a){this.hours=+a}},{key:"mm",regex:"[0-5][0-9]",apply:function(a){this.minutes=+a}},{key:"m",regex:"[0-9]|[1-5][0-9]",apply:function(a){this.minutes=+a}},{key:"sss",regex:"[0-9][0-9][0-9]",apply:function(a){this.milliseconds=+a}},{key:"ss",regex:"[0-5][0-9]",apply:function(a){this.seconds=+a}},{key:"s",regex:"[0-9]|[1-5][0-9]",apply:function(a){this.seconds=+a}},{key:"a",regex:b.DATETIME_FORMATS.AMPMS.join("|"),apply:function(a){12===this.hours&&(this.hours=0),"PM"===a&&(this.hours+=12)}},{key:"Z",regex:"[+-]\\d{4}",apply:function(a){var b=a.match(/([+-])(\d{2})(\d{2})/),c=b[1],d=b[2],e=b[3];this.hours+=f(c+d),this.minutes+=f(c+e)}},{key:"ww",regex:"[0-4][0-9]|5[0-3]"},{key:"w",regex:"[0-9]|[1-4][0-9]|5[0-3]"},{key:"GGGG",regex:b.DATETIME_FORMATS.ERANAMES.join("|").replace(/\s/g,"\\s")},{key:"GGG",regex:b.DATETIME_FORMATS.ERAS.join("|")},{key:"GG",regex:b.DATETIME_FORMATS.ERAS.join("|")},{key:"G",regex:b.DATETIME_FORMATS.ERAS.join("|")}]},this.init(),this.parse=function(c,f,g){if(!angular.isString(c)||!f)return c;f=b.DATETIME_FORMATS[f]||f,f=f.replace(n,"\\$&"),b.id!==l&&this.init(),this.parsers[f]||(this.parsers[f]=d(f));var h=this.parsers[f],i=h.regex,j=h.map,k=c.match(i),m=!1;if(k&&k.length){var o,p;angular.isDate(g)&&!isNaN(g.getTime())?o={year:g.getFullYear(),month:g.getMonth(),date:g.getDate(),hours:g.getHours(),minutes:g.getMinutes(),seconds:g.getSeconds(),milliseconds:g.getMilliseconds()}:(g&&a.warn("dateparser:","baseDate is not a valid date"),o={year:1900,month:0,date:1,hours:0,minutes:0,seconds:0,milliseconds:0});for(var q=1,r=k.length;r>q;q++){var s=j[q-1];"Z"===s.matcher&&(m=!0),s.apply&&s.apply.call(o,k[q])}var t=m?Date.prototype.setUTCFullYear:Date.prototype.setFullYear,u=m?Date.prototype.setUTCHours:Date.prototype.setHours;return e(o.year,o.month,o.date)&&(!angular.isDate(g)||isNaN(g.getTime())||m?(p=new Date(0),t.call(p,o.year,o.month,o.date),u.call(p,o.hours||0,o.minutes||0,o.seconds||0,o.milliseconds||0)):(p=new Date(g),t.call(p,o.year,o.month,o.date),u.call(p,o.hours,o.minutes,o.seconds,o.milliseconds))),p}},this.toTimezone=g,this.fromTimezone=h,this.timezoneToOffset=i,this.addDateMinutes=j,this.convertTimezoneToLocal=k}]),angular.module("ui.bootstrap.isClass",[]).directive("uibIsClass",["$animate",function(a){var b=/^\s*([\s\S]+?)\s+on\s+([\s\S]+?)\s*$/,c=/^\s*([\s\S]+?)\s+for\s+([\s\S]+?)\s*$/;return{restrict:"A",compile:function(d,e){function f(a,b,c){i.push(a),j.push({scope:a,element:b}),o.forEach(function(b,c){g(b,a)}),a.$on("$destroy",h)}function g(b,d){var e=b.match(c),f=d.$eval(e[1]),g=e[2],h=k[b];if(!h){var i=function(b){var c=null;j.some(function(a){var d=a.scope.$eval(m);return d===b?(c=a,!0):void 0}),h.lastActivated!==c&&(h.lastActivated&&a.removeClass(h.lastActivated.element,f),c&&a.addClass(c.element,f),h.lastActivated=c)};k[b]=h={lastActivated:null,scope:d,watchFn:i,compareWithExp:g,watcher:d.$watch(g,i)}}h.watchFn(d.$eval(g))}function h(a){var b=a.targetScope,c=i.indexOf(b);if(i.splice(c,1),j.splice(c,1),i.length){var d=i[0];angular.forEach(k,function(a){a.scope===b&&(a.watcher=d.$watch(a.compareWithExp,a.watchFn),a.scope=d)})}else k={}}var i=[],j=[],k={},l=e.uibIsClass.match(b),m=l[2],n=l[1],o=n.split(",");return f}}}]),angular.module("ui.bootstrap.position",[]).factory("$uibPosition",["$document","$window",function(a,b){var c,d={normal:/(auto|scroll)/,hidden:/(auto|scroll|hidden)/},e={auto:/\s?auto?\s?/i,primary:/^(top|bottom|left|right)$/,secondary:/^(top|bottom|left|right|center)$/,vertical:/^(top|bottom)$/};return{getRawNode:function(a){return a[0]||a},parseStyle:function(a){return a=parseFloat(a),isFinite(a)?a:0},offsetParent:function(c){function d(a){return"static"===(b.getComputedStyle(a).position||"static")}c=this.getRawNode(c);for(var e=c.offsetParent||a[0].documentElement;e&&e!==a[0].documentElement&&d(e);)e=e.offsetParent;return e||a[0].documentElement},scrollbarWidth:function(){if(angular.isUndefined(c)){var b=angular.element('<div style="position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll;"></div>');a.find("body").append(b),c=b[0].offsetWidth-b[0].clientWidth,c=isFinite(c)?c:0,b.remove()}return c},scrollParent:function(c,e){c=this.getRawNode(c);var f=e?d.hidden:d.normal,g=a[0].documentElement,h=b.getComputedStyle(c),i="absolute"===h.position,j=c.parentElement||g;if(j===g||"fixed"===h.position)return g;for(;j.parentElement&&j!==g;){var k=b.getComputedStyle(j);if(i&&"static"!==k.position&&(i=!1),!i&&f.test(k.overflow+k.overflowY+k.overflowX))break;j=j.parentElement}return j},position:function(c,d){c=this.getRawNode(c);var e=this.offset(c);if(d){var f=b.getComputedStyle(c);e.top-=this.parseStyle(f.marginTop),e.left-=this.parseStyle(f.marginLeft)}var g=this.offsetParent(c),h={top:0,left:0};return g!==a[0].documentElement&&(h=this.offset(g),h.top+=g.clientTop-g.scrollTop,h.left+=g.clientLeft-g.scrollLeft),{width:Math.round(angular.isNumber(e.width)?e.width:c.offsetWidth),height:Math.round(angular.isNumber(e.height)?e.height:c.offsetHeight),top:Math.round(e.top-h.top),left:Math.round(e.left-h.left)}},offset:function(c){c=this.getRawNode(c);var d=c.getBoundingClientRect();return{width:Math.round(angular.isNumber(d.width)?d.width:c.offsetWidth),height:Math.round(angular.isNumber(d.height)?d.height:c.offsetHeight),top:Math.round(d.top+(b.pageYOffset||a[0].documentElement.scrollTop)),left:Math.round(d.left+(b.pageXOffset||a[0].documentElement.scrollLeft))}},viewportOffset:function(c,d,e){c=this.getRawNode(c),e=e!==!1?!0:!1;var f=c.getBoundingClientRect(),g={top:0,left:0,bottom:0,right:0},h=d?a[0].documentElement:this.scrollParent(c),i=h.getBoundingClientRect();if(g.top=i.top+h.clientTop,g.left=i.left+h.clientLeft,h===a[0].documentElement&&(g.top+=b.pageYOffset,g.left+=b.pageXOffset),g.bottom=g.top+h.clientHeight,g.right=g.left+h.clientWidth,e){var j=b.getComputedStyle(h);g.top+=this.parseStyle(j.paddingTop),g.bottom-=this.parseStyle(j.paddingBottom),g.left+=this.parseStyle(j.paddingLeft),g.right-=this.parseStyle(j.paddingRight)}return{top:Math.round(f.top-g.top),bottom:Math.round(g.bottom-f.bottom),left:Math.round(f.left-g.left),right:Math.round(g.right-f.right)}},parsePlacement:function(a){var b=e.auto.test(a);return b&&(a=a.replace(e.auto,"")),a=a.split("-"),a[0]=a[0]||"top",e.primary.test(a[0])||(a[0]="top"),a[1]=a[1]||"center",e.secondary.test(a[1])||(a[1]="center"),b?a[2]=!0:a[2]=!1,a},positionElements:function(a,c,d,f){a=this.getRawNode(a),c=this.getRawNode(c);var g=angular.isDefined(c.offsetWidth)?c.offsetWidth:c.prop("offsetWidth"),h=angular.isDefined(c.offsetHeight)?c.offsetHeight:c.prop("offsetHeight");d=this.parsePlacement(d);var i=f?this.offset(a):this.position(a),j={top:0,left:0,placement:""};if(d[2]){var k=this.viewportOffset(a),l=b.getComputedStyle(c),m={width:g+Math.round(Math.abs(this.parseStyle(l.marginLeft)+this.parseStyle(l.marginRight))),height:h+Math.round(Math.abs(this.parseStyle(l.marginTop)+this.parseStyle(l.marginBottom)))};if(d[0]="top"===d[0]&&m.height>k.top&&m.height<=k.bottom?"bottom":"bottom"===d[0]&&m.height>k.bottom&&m.height<=k.top?"top":"left"===d[0]&&m.width>k.left&&m.width<=k.right?"right":"right"===d[0]&&m.width>k.right&&m.width<=k.left?"left":d[0],d[1]="top"===d[1]&&m.height-i.height>k.bottom&&m.height-i.height<=k.top?"bottom":"bottom"===d[1]&&m.height-i.height>k.top&&m.height-i.height<=k.bottom?"top":"left"===d[1]&&m.width-i.width>k.right&&m.width-i.width<=k.left?"right":"right"===d[1]&&m.width-i.width>k.left&&m.width-i.width<=k.right?"left":d[1],"center"===d[1])if(e.vertical.test(d[0])){var n=i.width/2-g/2;k.left+n<0&&m.width-i.width<=k.right?d[1]="left":k.right+n<0&&m.width-i.width<=k.left&&(d[1]="right")}else{var o=i.height/2-m.height/2;k.top+o<0&&m.height-i.height<=k.bottom?d[1]="top":k.bottom+o<0&&m.height-i.height<=k.top&&(d[1]="bottom")}}switch(d[0]){case"top":j.top=i.top-h;break;case"bottom":j.top=i.top+i.height;break;case"left":j.left=i.left-g;break;case"right":j.left=i.left+i.width}switch(d[1]){case"top":j.top=i.top;break;case"bottom":j.top=i.top+i.height-h;break;case"left":j.left=i.left;break;case"right":j.left=i.left+i.width-g;break;case"center":e.vertical.test(d[0])?j.left=i.left+i.width/2-g/2:j.top=i.top+i.height/2-h/2}return j.top=Math.round(j.top),j.left=Math.round(j.left),j.placement="center"===d[1]?d[0]:d[0]+"-"+d[1],j},positionArrow:function(a,c){a=this.getRawNode(a);var d=a.querySelector(".tooltip-inner, .popover-inner");if(d){var f=angular.element(d).hasClass("tooltip-inner"),g=f?a.querySelector(".tooltip-arrow"):a.querySelector(".arrow");if(g){if(c=this.parsePlacement(c),"center"===c[1])return void angular.element(g).css({top:"",bottom:"",right:"",left:"",margin:""});var h="border-"+c[0]+"-width",i=b.getComputedStyle(g)[h],j="border-";j+=e.vertical.test(c[0])?c[0]+"-"+c[1]:c[1]+"-"+c[0],j+="-radius";var k=b.getComputedStyle(f?d:a)[j],l={top:"auto",bottom:"auto",left:"auto",right:"auto",margin:0};switch(c[0]){case"top":l.bottom=f?"0":"-"+i;break;case"bottom":l.top=f?"0":"-"+i;break;case"left":l.right=f?"0":"-"+i;break;case"right":l.left=f?"0":"-"+i}l[c[1]]=k,angular.element(g).css(l)}}}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position"]).value("$datepickerSuppressError",!1).constant("uibDatepickerConfig",{datepickerMode:"day",formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",maxDate:null,maxMode:"year",minDate:null,minMode:"day",ngModelOptions:{},shortcutPropagation:!1,showWeeks:!0,yearColumns:5,yearRows:4}).controller("UibDatepickerController",["$scope","$attrs","$parse","$interpolate","$locale","$log","dateFilter","uibDatepickerConfig","$datepickerSuppressError","uibDateParser",function(a,b,c,d,e,f,g,h,i,j){var k=this,l={$setViewValue:angular.noop},m={},n=[];this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle"],function(c){k[c]=angular.isDefined(b[c])?d(b[c])(a.$parent):h[c]}),angular.forEach(["showWeeks","yearRows","yearColumns","shortcutPropagation"],function(c){k[c]=angular.isDefined(b[c])?a.$parent.$eval(b[c]):h[c]}),angular.isDefined(b.startingDay)?k.startingDay=a.$parent.$eval(b.startingDay):angular.isNumber(h.startingDay)?k.startingDay=h.startingDay:k.startingDay=(e.DATETIME_FORMATS.FIRSTDAYOFWEEK+8)%7,angular.forEach(["minDate","maxDate"],function(c){b[c]?n.push(a.$parent.$watch(b[c],function(a){k[c]=a?angular.isDate(a)?j.fromTimezone(new Date(a),m.timezone):new Date(g(a,"medium")):null,k.refreshView()})):k[c]=h[c]?j.fromTimezone(new Date(h[c]),m.timezone):null}),angular.forEach(["minMode","maxMode"],function(c){b[c]?n.push(a.$parent.$watch(b[c],function(d){k[c]=a[c]=angular.isDefined(d)?d:b[c],("minMode"===c&&k.modes.indexOf(a.datepickerMode)<k.modes.indexOf(k[c])||"maxMode"===c&&k.modes.indexOf(a.datepickerMode)>k.modes.indexOf(k[c]))&&(a.datepickerMode=k[c])})):k[c]=a[c]=h[c]||null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),angular.isDefined(b.initDate)?(this.activeDate=j.fromTimezone(a.$parent.$eval(b.initDate),m.timezone)||new Date,n.push(a.$parent.$watch(b.initDate,function(a){a&&(l.$isEmpty(l.$modelValue)||l.$invalid)&&(k.activeDate=j.fromTimezone(a,m.timezone),k.refreshView())}))):this.activeDate=new Date,a.disabled=angular.isDefined(b.disabled)||!1,angular.isDefined(b.ngDisabled)&&n.push(a.$parent.$watch(b.ngDisabled,function(b){a.disabled=b,k.refreshView()})),a.isActive=function(b){return 0===k.compare(b.date,k.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){l=a,m=a.$options||h.ngModelOptions,l.$modelValue&&(this.activeDate=l.$modelValue),l.$render=function(){k.render()}},this.render=function(){if(l.$viewValue){var a=new Date(l.$viewValue),b=!isNaN(a);b?this.activeDate=j.fromTimezone(a,m.timezone):i||f.error('Datepicker directive: "ng-model" value must be a Date object')}this.refreshView()},this.refreshView=function(){if(this.element){a.selectedDt=null,this._refreshView(),a.activeDt&&(a.activeDateId=a.activeDt.uid);var b=l.$viewValue?new Date(l.$viewValue):null;b=j.fromTimezone(b,m.timezone),l.$setValidity("dateDisabled",!b||this.element&&!this.isDisabled(b))}},this.createDateObject=function(b,c){var d=l.$viewValue?new Date(l.$viewValue):null;d=j.fromTimezone(d,m.timezone);var e={date:b,label:g(b,c.replace(/d!/,"dd")).replace(/M!/,"MM"),selected:d&&0===this.compare(b,d),disabled:this.isDisabled(b),current:0===this.compare(b,new Date),customClass:this.customClass(b)||null};return d&&0===this.compare(b,d)&&(a.selectedDt=e),k.activeDate&&0===this.compare(e.date,k.activeDate)&&(a.activeDt=e),e},this.isDisabled=function(c){return a.disabled||this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.customClass=function(b){return a.customClass({date:b,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===k.minMode){var c=l.$viewValue?j.fromTimezone(new Date(l.$viewValue),m.timezone):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),c=j.toTimezone(c,m.timezone),l.$setViewValue(c),l.$render()}else k.activeDate=b,a.datepickerMode=k.modes[k.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=k.activeDate.getFullYear()+a*(k.step.years||0),c=k.activeDate.getMonth()+a*(k.step.months||0);k.activeDate.setFullYear(b,c,1),k.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===k.maxMode&&1===b||a.datepickerMode===k.minMode&&-1===b||(a.datepickerMode=k.modes[k.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var o=function(){k.element[0].focus()};a.$on("uib:datepicker.focus",o),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey&&!a.disabled)if(b.preventDefault(),k.shortcutPropagation||b.stopPropagation(),"enter"===c||"space"===c){if(k.isDisabled(k.activeDate))return;a.select(k.activeDate)}else!b.ctrlKey||"up"!==c&&"down"!==c?(k.handleKeyDown(c,b),k.refreshView()):a.toggleMode("up"===c?1:-1)},a.$on("$destroy",function(){for(;n.length;)n.shift()()})}]).controller("UibDaypickerController",["$scope","$element","dateFilter",function(a,b,c){function d(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?f[b]:29}function e(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}var f=[31,28,31,30,31,30,31,31,30,31,30,31];this.step={months:1},this.element=b,this.init=function(b){angular.extend(b,this),a.showWeeks=b.showWeeks,b.refreshView()},this.getDates=function(a,b){for(var c,d=new Array(b),e=new Date(a),f=0;b>f;)c=new Date(e),d[f++]=c,e.setDate(e.getDate()+1);return d},this._refreshView=function(){var b=this.activeDate.getFullYear(),d=this.activeDate.getMonth(),f=new Date(this.activeDate);f.setFullYear(b,d,1);var g=this.startingDay-f.getDay(),h=g>0?7-g:-g,i=new Date(f);h>0&&i.setDate(-h+1);for(var j=this.getDates(i,42),k=0;42>k;k++)j[k]=angular.extend(this.createDateObject(j[k],this.formatDay),{secondary:j[k].getMonth()!==d,uid:a.uniqueId+"-"+k});a.labels=new Array(7);for(var l=0;7>l;l++)a.labels[l]={abbr:c(j[l].date,this.formatDayHeader),full:c(j[l].date,"EEEE")};if(a.title=c(this.activeDate,this.formatDayTitle),a.rows=this.split(j,7),a.showWeeks){a.weekNumbers=[];for(var m=(11-this.startingDay)%7,n=a.rows.length,o=0;n>o;o++)a.weekNumbers.push(e(a.rows[o][m].date))}},this.compare=function(a,b){var c=new Date(a.getFullYear(),a.getMonth(),a.getDate()),d=new Date(b.getFullYear(),b.getMonth(),b.getDate());return c.setFullYear(a.getFullYear()),d.setFullYear(b.getFullYear()),c-d},this.handleKeyDown=function(a,b){var c=this.activeDate.getDate();if("left"===a)c-=1;else if("up"===a)c-=7;else if("right"===a)c+=1;else if("down"===a)c+=7;else if("pageup"===a||"pagedown"===a){var e=this.activeDate.getMonth()+("pageup"===a?-1:1);this.activeDate.setMonth(e,1),c=Math.min(d(this.activeDate.getFullYear(),this.activeDate.getMonth()),c)}else"home"===a?c=1:"end"===a&&(c=d(this.activeDate.getFullYear(),this.activeDate.getMonth()));this.activeDate.setDate(c)}}]).controller("UibMonthpickerController",["$scope","$element","dateFilter",function(a,b,c){this.step={years:1},this.element=b,this.init=function(a){angular.extend(a,this),a.refreshView()},this._refreshView=function(){for(var b,d=new Array(12),e=this.activeDate.getFullYear(),f=0;12>f;f++)b=new Date(this.activeDate),b.setFullYear(e,f,1),d[f]=angular.extend(this.createDateObject(b,this.formatMonth),{uid:a.uniqueId+"-"+f});a.title=c(this.activeDate,this.formatMonthTitle),a.rows=this.split(d,3)},this.compare=function(a,b){var c=new Date(a.getFullYear(),a.getMonth()),d=new Date(b.getFullYear(),b.getMonth());return c.setFullYear(a.getFullYear()),d.setFullYear(b.getFullYear()),c-d},this.handleKeyDown=function(a,b){var c=this.activeDate.getMonth();if("left"===a)c-=1;else if("up"===a)c-=3;else if("right"===a)c+=1;else if("down"===a)c+=3;else if("pageup"===a||"pagedown"===a){var d=this.activeDate.getFullYear()+("pageup"===a?-1:1);this.activeDate.setFullYear(d)}else"home"===a?c=0:"end"===a&&(c=11);this.activeDate.setMonth(c)}}]).controller("UibYearpickerController",["$scope","$element","dateFilter",function(a,b,c){function d(a){return parseInt((a-1)/f,10)*f+1}var e,f;this.element=b,this.yearpickerInit=function(){e=this.yearColumns,f=this.yearRows*e,this.step={years:f}},this._refreshView=function(){for(var b,c=new Array(f),g=0,h=d(this.activeDate.getFullYear());f>g;g++)b=new Date(this.activeDate),b.setFullYear(h+g,0,1),c[g]=angular.extend(this.createDateObject(b,this.formatYear),{uid:a.uniqueId+"-"+g});a.title=[c[0].label,c[f-1].label].join(" - "),a.rows=this.split(c,e),a.columns=e},this.compare=function(a,b){return a.getFullYear()-b.getFullYear()},this.handleKeyDown=function(a,b){var c=this.activeDate.getFullYear();"left"===a?c-=1:"up"===a?c-=e:"right"===a?c+=1:"down"===a?c+=e:"pageup"===a||"pagedown"===a?c+=("pageup"===a?-1:1)*f:"home"===a?c=d(this.activeDate.getFullYear()):"end"===a&&(c=d(this.activeDate.getFullYear())+f-1),this.activeDate.setFullYear(c)}}]).directive("uibDatepicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/datepicker.html"},scope:{datepickerMode:"=?",dateDisabled:"&",customClass:"&",shortcutPropagation:"&?"},require:["uibDatepicker","^ngModel"],controller:"UibDatepickerController",controllerAs:"datepicker",link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}).directive("uibDaypicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/day.html";
+},require:["^uibDatepicker","uibDaypicker"],controller:"UibDaypickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibMonthpicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/month.html"},require:["^uibDatepicker","uibMonthpicker"],controller:"UibMonthpickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibYearpicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/year.html"},require:["^uibDatepicker","uibYearpicker"],controller:"UibYearpickerController",link:function(a,b,c,d){var e=d[0];angular.extend(e,d[1]),e.yearpickerInit(),e.refreshView()}}}).constant("uibDatepickerPopupConfig",{altInputFormats:[],appendToBody:!1,clearText:"Clear",closeOnDateSelection:!0,closeText:"Done",currentText:"Today",datepickerPopup:"yyyy-MM-dd",datepickerPopupTemplateUrl:"uib/template/datepicker/popup.html",datepickerTemplateUrl:"uib/template/datepicker/datepicker.html",html5Types:{date:"yyyy-MM-dd","datetime-local":"yyyy-MM-ddTHH:mm:ss.sss",month:"yyyy-MM"},onOpenFocus:!0,showButtonBar:!0}).controller("UibDatepickerPopupController",["$scope","$element","$attrs","$compile","$parse","$document","$rootScope","$uibPosition","dateFilter","uibDateParser","uibDatepickerPopupConfig","$timeout","uibDatepickerConfig",function(a,b,c,d,e,f,g,h,i,j,k,l,m){function n(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function o(b){var c=j.parse(b,t,a.date);if(isNaN(c))for(var d=0;d<E.length;d++)if(c=j.parse(b,E[d],a.date),!isNaN(c))return c;return c}function p(a){if(angular.isNumber(a)&&(a=new Date(a)),!a)return null;if(angular.isDate(a)&&!isNaN(a))return a;if(angular.isString(a)){var b=o(a);if(!isNaN(b))return j.toTimezone(b,C.timezone)}return B.$options&&B.$options.allowInvalid?a:void 0}function q(a,b){var d=a||b;return c.ngRequired||d?(angular.isNumber(d)&&(d=new Date(d)),d?angular.isDate(d)&&!isNaN(d)?!0:angular.isString(d)?!isNaN(o(b)):!1:!0):!0}function r(c){if(a.isOpen||!a.disabled){var d=D[0],e=b[0].contains(c.target),f=void 0!==d.contains&&d.contains(c.target);!a.isOpen||e||f||a.$apply(function(){a.isOpen=!1})}}function s(c){27===c.which&&a.isOpen?(c.preventDefault(),c.stopPropagation(),a.$apply(function(){a.isOpen=!1}),b[0].focus()):40!==c.which||a.isOpen||(c.preventDefault(),c.stopPropagation(),a.$apply(function(){a.isOpen=!0}))}var t,u,v,w,x,y,z,A,B,C,D,E,F={},G=!1,H=[];a.watchData={},this.init=function(h){if(B=h,C=h.$options||m.ngModelOptions,u=angular.isDefined(c.closeOnDateSelection)?a.$parent.$eval(c.closeOnDateSelection):k.closeOnDateSelection,v=angular.isDefined(c.datepickerAppendToBody)?a.$parent.$eval(c.datepickerAppendToBody):k.appendToBody,w=angular.isDefined(c.onOpenFocus)?a.$parent.$eval(c.onOpenFocus):k.onOpenFocus,x=angular.isDefined(c.datepickerPopupTemplateUrl)?c.datepickerPopupTemplateUrl:k.datepickerPopupTemplateUrl,y=angular.isDefined(c.datepickerTemplateUrl)?c.datepickerTemplateUrl:k.datepickerTemplateUrl,E=angular.isDefined(c.altInputFormats)?a.$parent.$eval(c.altInputFormats):k.altInputFormats,a.showButtonBar=angular.isDefined(c.showButtonBar)?a.$parent.$eval(c.showButtonBar):k.showButtonBar,k.html5Types[c.type]?(t=k.html5Types[c.type],G=!0):(t=c.uibDatepickerPopup||k.datepickerPopup,c.$observe("uibDatepickerPopup",function(a,b){var c=a||k.datepickerPopup;if(c!==t&&(t=c,B.$modelValue=null,!t))throw new Error("uibDatepickerPopup must have a date format specified.")})),!t)throw new Error("uibDatepickerPopup must have a date format specified.");if(G&&c.uibDatepickerPopup)throw new Error("HTML5 date input types do not support custom formats.");z=angular.element("<div uib-datepicker-popup-wrap><div uib-datepicker></div></div>"),a.ngModelOptions=angular.copy(C),a.ngModelOptions.timezone=null,z.attr({"ng-model":"date","ng-model-options":"ngModelOptions","ng-change":"dateSelection(date)","template-url":x}),A=angular.element(z.children()[0]),A.attr("template-url",y),G&&"month"===c.type&&(A.attr("datepicker-mode",'"month"'),A.attr("min-mode","month")),a.datepickerOptions&&angular.forEach(a.datepickerOptions,function(a,b){-1===["minDate","maxDate","minMode","maxMode","initDate","datepickerMode"].indexOf(b)?A.attr(n(b),a):A.attr(n(b),"datepickerOptions."+b)}),angular.forEach(["minMode","maxMode","datepickerMode","shortcutPropagation"],function(b){if(c[b]){var d=e(c[b]),f={get:function(){return d(a.$parent)}};if(A.attr(n(b),"watchData."+b),"datepickerMode"===b){var g=d.assign;f.set=function(b){g(a.$parent,b)}}Object.defineProperty(a.watchData,b,f)}}),angular.forEach(["minDate","maxDate","initDate"],function(b){if(c[b]){var d=e(c[b]);H.push(a.$parent.$watch(d,function(c){"minDate"===b||"maxDate"===b?(null===c?F[b]=null:angular.isDate(c)?F[b]=j.fromTimezone(new Date(c),C.timezone):F[b]=new Date(i(c,"medium")),a.watchData[b]=null===c?null:F[b]):a.watchData[b]=j.fromTimezone(new Date(c),C.timezone)})),A.attr(n(b),"watchData."+b)}}),c.dateDisabled&&A.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","showWeeks","startingDay","yearRows","yearColumns"],function(a){angular.isDefined(c[a])&&A.attr(n(a),c[a])}),c.customClass&&A.attr("custom-class","customClass({ date: date, mode: mode })"),G?B.$formatters.push(function(b){return a.date=j.fromTimezone(b,C.timezone),b}):(B.$$parserName="date",B.$validators.date=q,B.$parsers.unshift(p),B.$formatters.push(function(b){return B.$isEmpty(b)?(a.date=b,b):(a.date=j.fromTimezone(b,C.timezone),t=t.replace(/M!/,"MM").replace(/d!/,"dd"),i(a.date,t))})),B.$viewChangeListeners.push(function(){a.date=o(B.$viewValue)}),b.on("keydown",s),D=d(z)(a),z.remove(),v?f.find("body").append(D):b.after(D),a.$on("$destroy",function(){for(a.isOpen===!0&&(g.$$phase||a.$apply(function(){a.isOpen=!1})),D.remove(),b.off("keydown",s),f.off("click",r);H.length;)H.shift()()})},a.getText=function(b){return a[b+"Text"]||k[b+"Text"]},a.isDisabled=function(b){return"today"===b&&(b=new Date),a.watchData.minDate&&a.compare(b,F.minDate)<0||a.watchData.maxDate&&a.compare(b,F.maxDate)>0},a.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},a.dateSelection=function(c){angular.isDefined(c)&&(a.date=c);var d=a.date?i(a.date,t):null;b.val(d),B.$setViewValue(d),u&&(a.isOpen=!1,b[0].focus())},a.keydown=function(c){27===c.which&&(c.stopPropagation(),a.isOpen=!1,b[0].focus())},a.select=function(b){if("today"===b){var c=new Date;angular.isDate(a.date)?(b=new Date(a.date),b.setFullYear(c.getFullYear(),c.getMonth(),c.getDate())):b=new Date(c.setHours(0,0,0,0))}a.dateSelection(b)},a.close=function(){a.isOpen=!1,b[0].focus()},a.disabled=angular.isDefined(c.disabled)||!1,c.ngDisabled&&H.push(a.$parent.$watch(e(c.ngDisabled),function(b){a.disabled=b})),a.$watch("isOpen",function(c){c?a.disabled?a.isOpen=!1:(a.position=v?h.offset(b):h.position(b),a.position.top=a.position.top+b.prop("offsetHeight"),l(function(){w&&a.$broadcast("uib:datepicker.focus"),f.on("click",r)},0,!1)):f.off("click",r)})}]).directive("uibDatepickerPopup",function(){return{require:["ngModel","uibDatepickerPopup"],controller:"UibDatepickerPopupController",scope:{datepickerOptions:"=?",isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&",customClass:"&"},link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibDatepickerPopupWrap",function(){return{replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/popup.html"}}}),angular.module("ui.bootstrap.debounce",[]).factory("$$debounce",["$timeout",function(a){return function(b,c){var d;return function(){var e=this,f=Array.prototype.slice.call(arguments);d&&a.cancel(d),d=a(function(){b.apply(e,f)},c)}}}]),angular.module("ui.bootstrap.dropdown",["ui.bootstrap.position"]).constant("uibDropdownConfig",{appendToOpenClass:"uib-dropdown-open",openClass:"open"}).service("uibDropdownService",["$document","$rootScope",function(a,b){var c=null;this.open=function(b){c||(a.on("click",d),a.on("keydown",e)),c&&c!==b&&(c.isOpen=!1),c=b},this.close=function(b){c===b&&(c=null,a.off("click",d),a.off("keydown",e))};var d=function(a){if(c&&!(a&&"disabled"===c.getAutoClose()||a&&3===a.which)){var d=c.getToggleElement();if(!(a&&d&&d[0].contains(a.target))){var e=c.getDropdownElement();a&&"outsideClick"===c.getAutoClose()&&e&&e[0].contains(a.target)||(c.isOpen=!1,b.$$phase||c.$apply())}}},e=function(a){27===a.which?(c.focusToggleElement(),d()):c.isKeynavEnabled()&&-1!==[38,40].indexOf(a.which)&&c.isOpen&&(a.preventDefault(),a.stopPropagation(),c.focusDropdownEntry(a.which))}}]).controller("UibDropdownController",["$scope","$element","$attrs","$parse","uibDropdownConfig","uibDropdownService","$animate","$uibPosition","$document","$compile","$templateRequest",function(a,b,c,d,e,f,g,h,i,j,k){var l,m,n=this,o=a.$new(),p=e.appendToOpenClass,q=e.openClass,r=angular.noop,s=c.onToggle?d(c.onToggle):angular.noop,t=!1,u=null,v=!1,w=i.find("body");b.addClass("dropdown"),this.init=function(){if(c.isOpen&&(m=d(c.isOpen),r=m.assign,a.$watch(m,function(a){o.isOpen=!!a})),angular.isDefined(c.dropdownAppendTo)){var e=d(c.dropdownAppendTo)(o);e&&(u=angular.element(e))}t=angular.isDefined(c.dropdownAppendToBody),v=angular.isDefined(c.keyboardNav),t&&!u&&(u=w),u&&n.dropdownMenu&&(u.append(n.dropdownMenu),b.on("$destroy",function(){n.dropdownMenu.remove()}))},this.toggle=function(a){return o.isOpen=arguments.length?!!a:!o.isOpen},this.isOpen=function(){return o.isOpen},o.getToggleElement=function(){return n.toggleElement},o.getAutoClose=function(){return c.autoClose||"always"},o.getElement=function(){return b},o.isKeynavEnabled=function(){return v},o.focusDropdownEntry=function(a){var c=n.dropdownMenu?angular.element(n.dropdownMenu).find("a"):b.find("ul").eq(0).find("a");switch(a){case 40:angular.isNumber(n.selectedOption)?n.selectedOption=n.selectedOption===c.length-1?n.selectedOption:n.selectedOption+1:n.selectedOption=0;break;case 38:angular.isNumber(n.selectedOption)?n.selectedOption=0===n.selectedOption?0:n.selectedOption-1:n.selectedOption=c.length-1}c[n.selectedOption].focus()},o.getDropdownElement=function(){return n.dropdownMenu},o.focusToggleElement=function(){n.toggleElement&&n.toggleElement[0].focus()},o.$watch("isOpen",function(c,d){if(u&&n.dropdownMenu){var e,i,m=h.positionElements(b,n.dropdownMenu,"bottom-left",!0);if(e={top:m.top+"px",display:c?"block":"none"},i=n.dropdownMenu.hasClass("dropdown-menu-right"),i?(e.left="auto",e.right=window.innerWidth-(m.left+b.prop("offsetWidth"))+"px"):(e.left=m.left+"px",e.right="auto"),!t){var v=h.offset(u);e.top=m.top-v.top+"px",i?e.right=window.innerWidth-(m.left-v.left+b.prop("offsetWidth"))+"px":e.left=m.left-v.left+"px"}n.dropdownMenu.css(e)}var w=u?u:b;if(g[c?"addClass":"removeClass"](w,u?p:q).then(function(){angular.isDefined(c)&&c!==d&&s(a,{open:!!c})}),c)n.dropdownMenuTemplateUrl&&k(n.dropdownMenuTemplateUrl).then(function(a){l=o.$new(),j(a.trim())(l,function(a){var b=a;n.dropdownMenu.replaceWith(b),n.dropdownMenu=b})}),o.focusToggleElement(),f.open(o);else{if(n.dropdownMenuTemplateUrl){l&&l.$destroy();var x=angular.element('<ul class="dropdown-menu"></ul>');n.dropdownMenu.replaceWith(x),n.dropdownMenu=x}f.close(o),n.selectedOption=null}angular.isFunction(r)&&r(a,c)}),a.$on("$locationChangeSuccess",function(){"disabled"!==o.getAutoClose()&&(o.isOpen=!1)})}]).directive("uibDropdown",function(){return{controller:"UibDropdownController",link:function(a,b,c,d){d.init()}}}).directive("uibDropdownMenu",function(){return{restrict:"A",require:"?^uibDropdown",link:function(a,b,c,d){if(d&&!angular.isDefined(c.dropdownNested)){b.addClass("dropdown-menu");var e=c.templateUrl;e&&(d.dropdownMenuTemplateUrl=e),d.dropdownMenu||(d.dropdownMenu=b)}}}}).directive("uibDropdownToggle",function(){return{require:"?^uibDropdown",link:function(a,b,c,d){if(d){b.addClass("dropdown-toggle"),d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.stackedMap",[]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b===a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b===a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}),angular.module("ui.bootstrap.modal",["ui.bootstrap.stackedMap"]).factory("$$multiMap",function(){return{createNew:function(){var a={};return{entries:function(){return Object.keys(a).map(function(b){return{key:b,value:a[b]}})},get:function(b){return a[b]},hasKey:function(b){return!!a[b]},keys:function(){return Object.keys(a)},put:function(b,c){a[b]||(a[b]=[]),a[b].push(c)},remove:function(b,c){var d=a[b];if(d){var e=d.indexOf(c);-1!==e&&d.splice(e,1),d.length||delete a[b]}}}}}}).provider("$uibResolve",function(){var a=this;this.resolver=null,this.setResolver=function(a){this.resolver=a},this.$get=["$injector","$q",function(b,c){var d=a.resolver?b.get(a.resolver):null;return{resolve:function(a,e,f,g){if(d)return d.resolve(a,e,f,g);var h=[];return angular.forEach(a,function(a){angular.isFunction(a)||angular.isArray(a)?h.push(c.resolve(b.invoke(a))):angular.isString(a)?h.push(c.resolve(b.get(a))):h.push(c.resolve(a))}),c.all(h).then(function(b){var c={},d=0;return angular.forEach(a,function(a,e){c[e]=b[d++]}),c})}}}]}).directive("uibModalBackdrop",["$animateCss","$injector","$uibModalStack",function(a,b,c){function d(b,d,e){e.modalInClass&&(a(d,{addClass:e.modalInClass}).start(),b.$on(c.NOW_CLOSING_EVENT,function(c,f){var g=f();b.modalOptions.animation?a(d,{removeClass:e.modalInClass}).start().then(g):g()}))}return{replace:!0,templateUrl:"uib/template/modal/backdrop.html",compile:function(a,b){return a.addClass(b.backdropClass),d}}}]).directive("uibModalWindow",["$uibModalStack","$q","$animate","$animateCss","$document",function(a,b,c,d,e){return{scope:{index:"@"},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/modal/window.html"},link:function(f,g,h){g.addClass(h.windowClass||""),g.addClass(h.windowTopClass||""),f.size=h.size,f.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!==c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))},g.on("click",f.close),f.$isRendered=!0;var i=b.defer();h.$observe("modalRender",function(a){"true"===a&&i.resolve()}),i.promise.then(function(){var i=null;h.modalInClass&&(i=d(g,{addClass:h.modalInClass}).start(),f.$on(a.NOW_CLOSING_EVENT,function(a,b){var e=b();d?d(g,{removeClass:h.modalInClass}).start().then(e):c.removeClass(g,h.modalInClass).then(e)})),b.when(i).then(function(){if(!e[0].activeElement||!g[0].contains(e[0].activeElement)){var a=g[0].querySelector("[autofocus]");a?a.focus():g[0].focus()}});var j=a.getTop();j&&a.modalRendered(j.key)})}}}]).directive("uibModalAnimationClass",function(){return{compile:function(a,b){b.modalAnimation&&a.addClass(b.uibModalAnimationClass)}}}).directive("uibModalTransclude",function(){return{link:function(a,b,c,d,e){e(a.$parent,function(a){b.empty(),b.append(a)})}}}).factory("$uibModalStack",["$animate","$animateCss","$document","$compile","$rootScope","$q","$$multiMap","$$stackedMap",function(a,b,c,d,e,f,g,h){function i(){for(var a=-1,b=t.keys(),c=0;c<b.length;c++)t.get(b[c]).value.backdrop&&(a=c);return a}function j(a,b){var c=t.get(a).value,d=c.appendTo;t.remove(a),m(c.modalDomEl,c.modalScope,function(){var b=c.openedClass||s;u.remove(b,a),d.toggleClass(b,u.hasKey(b)),k(!0)},c.closedDeferred),l(),b&&b.focus?b.focus():d.focus&&d.focus()}function k(a){var b;t.length()>0&&(b=t.top().value,b.modalDomEl.toggleClass(b.windowTopClass||"",a))}function l(){if(p&&-1===i()){var a=q;m(p,q,function(){a=null}),p=void 0,q=void 0}}function m(a,c,d,e){function g(){g.done||(g.done=!0,b(a,{event:"leave"}).start().then(function(){a.remove(),e&&e.resolve()}),c.$destroy(),d&&d())}var h,i=null,j=function(){return h||(h=f.defer(),i=h.promise),function(){h.resolve()}};return c.$broadcast(v.NOW_CLOSING_EVENT,j),f.when(i).then(g)}function n(a){if(a.isDefaultPrevented())return a;var b=t.top();if(b)switch(a.which){case 27:b.value.keyboard&&(a.preventDefault(),e.$apply(function(){v.dismiss(b.key,"escape key press")}));break;case 9:v.loadFocusElementList(b);var c=!1;a.shiftKey?v.isFocusInFirstItem(a)&&(c=v.focusLastFocusableElement()):v.isFocusInLastItem(a)&&(c=v.focusFirstFocusableElement()),c&&(a.preventDefault(),a.stopPropagation())}}function o(a,b,c){return!a.value.modalScope.$broadcast("modal.closing",b,c).defaultPrevented}var p,q,r,s="modal-open",t=h.createNew(),u=g.createNew(),v={NOW_CLOSING_EVENT:"modal.stack.now-closing"},w=0,x="a[href], area[href], input:not([disabled]), button:not([disabled]),select:not([disabled]), textarea:not([disabled]), iframe, object, embed, *[tabindex], *[contenteditable=true]";return e.$watch(i,function(a){q&&(q.index=a)}),c.on("keydown",n),e.$on("$destroy",function(){c.off("keydown",n)}),v.open=function(b,f){var g=c[0].activeElement,h=f.openedClass||s;k(!1),t.add(b,{deferred:f.deferred,renderDeferred:f.renderDeferred,closedDeferred:f.closedDeferred,modalScope:f.scope,backdrop:f.backdrop,keyboard:f.keyboard,openedClass:f.openedClass,windowTopClass:f.windowTopClass,animation:f.animation,appendTo:f.appendTo}),u.put(h,b);var j=f.appendTo,l=i();if(!j.length)throw new Error("appendTo element not found. Make sure that the element passed is in DOM.");l>=0&&!p&&(q=e.$new(!0),q.modalOptions=f,q.index=l,p=angular.element('<div uib-modal-backdrop="modal-backdrop"></div>'),p.attr("backdrop-class",f.backdropClass),f.animation&&p.attr("modal-animation","true"),d(p)(q),a.enter(p,j));var m=angular.element('<div uib-modal-window="modal-window"></div>');m.attr({"template-url":f.windowTemplateUrl,"window-class":f.windowClass,"window-top-class":f.windowTopClass,size:f.size,index:t.length()-1,animate:"animate"}).html(f.content),f.animation&&m.attr("modal-animation","true"),a.enter(d(m)(f.scope),j).then(function(){a.addClass(j,h)}),t.top().value.modalDomEl=m,t.top().value.modalOpener=g,v.clearFocusListCache()},v.close=function(a,b){var c=t.get(a);return c&&o(c,b,!0)?(c.value.modalScope.$$uibDestructionScheduled=!0,c.value.deferred.resolve(b),j(a,c.value.modalOpener),!0):!c},v.dismiss=function(a,b){var c=t.get(a);return c&&o(c,b,!1)?(c.value.modalScope.$$uibDestructionScheduled=!0,c.value.deferred.reject(b),j(a,c.value.modalOpener),!0):!c},v.dismissAll=function(a){for(var b=this.getTop();b&&this.dismiss(b.key,a);)b=this.getTop()},v.getTop=function(){return t.top()},v.modalRendered=function(a){var b=t.get(a);b&&b.value.renderDeferred.resolve()},v.focusFirstFocusableElement=function(){return r.length>0?(r[0].focus(),!0):!1},v.focusLastFocusableElement=function(){return r.length>0?(r[r.length-1].focus(),!0):!1},v.isFocusInFirstItem=function(a){return r.length>0?(a.target||a.srcElement)===r[0]:!1},v.isFocusInLastItem=function(a){return r.length>0?(a.target||a.srcElement)===r[r.length-1]:!1},v.clearFocusListCache=function(){r=[],w=0},v.loadFocusElementList=function(a){if((void 0===r||!r.length)&&a){var b=a.value.modalDomEl;b&&b.length&&(r=b[0].querySelectorAll(x))}},v}]).provider("$uibModal",function(){var a={options:{animation:!0,backdrop:!0,keyboard:!0},$get:["$rootScope","$q","$document","$templateRequest","$controller","$uibResolve","$uibModalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?c.when(a.template):e(angular.isFunction(a.templateUrl)?a.templateUrl():a.templateUrl)}var j={},k=null;return j.getPromiseChain=function(){return k},j.open=function(e){function j(){return r}var l=c.defer(),m=c.defer(),n=c.defer(),o=c.defer(),p={result:l.promise,opened:m.promise,closed:n.promise,rendered:o.promise,close:function(a){return h.close(p,a)},dismiss:function(a){return h.dismiss(p,a)}};if(e=angular.extend({},a.options,e),e.resolve=e.resolve||{},e.appendTo=e.appendTo||d.find("body").eq(0),!e.template&&!e.templateUrl)throw new Error("One of template or templateUrl options is required.");var q,r=c.all([i(e),g.resolve(e.resolve,{},null,null)]);return q=k=c.all([k]).then(j,j).then(function(a){var c=e.scope||b,d=c.$new();d.$close=p.close,d.$dismiss=p.dismiss,d.$on("$destroy",function(){d.$$uibDestructionScheduled||d.$dismiss("$uibUnscheduledDestruction")});var g,i={};e.controller&&(i.$scope=d,i.$uibModalInstance=p,angular.forEach(a[1],function(a,b){i[b]=a}),g=f(e.controller,i),e.controllerAs&&(e.bindToController&&(g.$close=d.$close,g.$dismiss=d.$dismiss,angular.extend(g,c)),d[e.controllerAs]=g)),h.open(p,{scope:d,deferred:l,renderDeferred:o,closedDeferred:n,content:a[0],animation:e.animation,backdrop:e.backdrop,keyboard:e.keyboard,backdropClass:e.backdropClass,windowTopClass:e.windowTopClass,windowClass:e.windowClass,windowTemplateUrl:e.windowTemplateUrl,size:e.size,openedClass:e.openedClass,appendTo:e.appendTo}),m.resolve(!0)},function(a){m.reject(a),l.reject(a)})["finally"](function(){k===q&&(k=null)}),p},j}]};return a}),angular.module("ui.bootstrap.paging",[]).factory("uibPaging",["$parse",function(a){return{create:function(b,c,d){b.setNumPages=d.numPages?a(d.numPages).assign:angular.noop,b.ngModelCtrl={$setViewValue:angular.noop},b._watchers=[],b.init=function(e,f){b.ngModelCtrl=e,b.config=f,e.$render=function(){b.render()},d.itemsPerPage?b._watchers.push(c.$parent.$watch(a(d.itemsPerPage),function(a){b.itemsPerPage=parseInt(a,10),c.totalPages=b.calculateTotalPages(),b.updatePage()})):b.itemsPerPage=f.itemsPerPage,c.$watch("totalItems",function(a,d){(angular.isDefined(a)||a!==d)&&(c.totalPages=b.calculateTotalPages(),b.updatePage())})},b.calculateTotalPages=function(){var a=b.itemsPerPage<1?1:Math.ceil(c.totalItems/b.itemsPerPage);return Math.max(a||0,1)},b.render=function(){c.page=parseInt(b.ngModelCtrl.$viewValue,10)||1},c.selectPage=function(a,d){d&&d.preventDefault();var e=!c.ngDisabled||!d;e&&c.page!==a&&a>0&&a<=c.totalPages&&(d&&d.target&&d.target.blur(),b.ngModelCtrl.$setViewValue(a),b.ngModelCtrl.$render())},c.getText=function(a){return c[a+"Text"]||b.config[a+"Text"]},c.noPrevious=function(){return 1===c.page},c.noNext=function(){return c.page===c.totalPages},b.updatePage=function(){b.setNumPages(c.$parent,c.totalPages),c.page>c.totalPages?c.selectPage(c.totalPages):b.ngModelCtrl.$render()},c.$on("$destroy",function(){for(;b._watchers.length;)b._watchers.shift()()})}}}]),angular.module("ui.bootstrap.pager",["ui.bootstrap.paging"]).controller("UibPagerController",["$scope","$attrs","uibPaging","uibPagerConfig",function(a,b,c,d){a.align=angular.isDefined(b.align)?a.$parent.$eval(b.align):d.align,c.create(this,a,b)}]).constant("uibPagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("uibPager",["uibPagerConfig",function(a){return{scope:{totalItems:"=",previousText:"@",nextText:"@",ngDisabled:"="},require:["uibPager","?ngModel"],controller:"UibPagerController",controllerAs:"pager",templateUrl:function(a,b){return b.templateUrl||"uib/template/pager/pager.html"},replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&f.init(g,a)}}}]),angular.module("ui.bootstrap.pagination",["ui.bootstrap.paging"]).controller("UibPaginationController",["$scope","$attrs","$parse","uibPaging","uibPaginationConfig",function(a,b,c,d,e){function f(a,b,c){return{number:a,text:b,active:c}}function g(a,b){var c=[],d=1,e=b,g=angular.isDefined(i)&&b>i;g&&(j?(d=Math.max(a-Math.floor(i/2),1),e=d+i-1,e>b&&(e=b,d=e-i+1)):(d=(Math.ceil(a/i)-1)*i+1,e=Math.min(d+i-1,b)));for(var h=d;e>=h;h++){var m=f(h,h,h===a);c.push(m)}if(g&&i>0&&(!j||k||l)){if(d>1){if(!l||d>3){var n=f(d-1,"...",!1);c.unshift(n)}if(l){if(3===d){var o=f(2,"2",!1);c.unshift(o)}var p=f(1,"1",!1);c.unshift(p)}}if(b>e){if(!l||b-2>e){var q=f(e+1,"...",!1);c.push(q)}if(l){if(e===b-2){var r=f(b-1,b-1,!1);c.push(r)}var s=f(b,b,!1);c.push(s)}}}return c}var h=this,i=angular.isDefined(b.maxSize)?a.$parent.$eval(b.maxSize):e.maxSize,j=angular.isDefined(b.rotate)?a.$parent.$eval(b.rotate):e.rotate,k=angular.isDefined(b.forceEllipses)?a.$parent.$eval(b.forceEllipses):e.forceEllipses,l=angular.isDefined(b.boundaryLinkNumbers)?a.$parent.$eval(b.boundaryLinkNumbers):e.boundaryLinkNumbers;a.boundaryLinks=angular.isDefined(b.boundaryLinks)?a.$parent.$eval(b.boundaryLinks):e.boundaryLinks,a.directionLinks=angular.isDefined(b.directionLinks)?a.$parent.$eval(b.directionLinks):e.directionLinks,d.create(this,a,b),b.maxSize&&h._watchers.push(a.$parent.$watch(c(b.maxSize),function(a){i=parseInt(a,10),h.render()}));var m=this.render;this.render=function(){m(),a.page>0&&a.page<=a.totalPages&&(a.pages=g(a.page,a.totalPages))}}]).constant("uibPaginationConfig",{itemsPerPage:10,boundaryLinks:!1,boundaryLinkNumbers:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0,forceEllipses:!1}).directive("uibPagination",["$parse","uibPaginationConfig",function(a,b){return{scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@",ngDisabled:"="},require:["uibPagination","?ngModel"],controller:"UibPaginationController",controllerAs:"pagination",templateUrl:function(a,b){return b.templateUrl||"uib/template/pagination/pagination.html"},replace:!0,link:function(a,c,d,e){var f=e[0],g=e[1];g&&f.init(g,b)}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.stackedMap"]).provider("$uibTooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",placementClassPrefix:"",animation:!0,popupDelay:0,popupCloseDelay:0,useContentExp:!1},c={mouseenter:"mouseleave",click:"click",outsideClick:"outsideClick",focus:"blur",none:""},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$document","$uibPosition","$interpolate","$rootScope","$parse","$$stackedMap",function(e,f,g,h,i,j,k,l,m){function n(a){if(27===a.which){var b=o.top();b&&(b.value.close(),o.removeTop(),b=null)}}var o=m.createNew();return h.on("keypress",n),k.$on("$destroy",function(){h.off("keypress",n)}),function(e,k,m,n){function p(a){var b=(a||n.trigger||m).split(" "),d=b.map(function(a){return c[a]||a});return{show:b,hide:d}}n=angular.extend({},b,d,n);var q=a(e),r=j.startSymbol(),s=j.endSymbol(),t="<div "+q+'-popup title="'+r+"title"+s+'" '+(n.useContentExp?'content-exp="contentExp()" ':'content="'+r+"content"+s+'" ')+'placement="'+r+"placement"+s+'" popup-class="'+r+"popupClass"+s+'" animation="animation" is-open="isOpen"origin-scope="origScope" style="visibility: hidden; display: block; top: -9999px; left: -9999px;"></div>';return{compile:function(a,b){var c=f(t);return function(a,b,d,f){function j(){M.isOpen?q():m()}function m(){(!L||a.$eval(d[k+"Enable"]))&&(u(),x(),M.popupDelay?G||(G=g(r,M.popupDelay,!1)):r())}function q(){s(),M.popupCloseDelay?H||(H=g(t,M.popupCloseDelay,!1)):t()}function r(){return s(),u(),M.content?(v(),void M.$evalAsync(function(){M.isOpen=!0,y(!0),R()})):angular.noop}function s(){G&&(g.cancel(G),G=null),I&&(g.cancel(I),I=null)}function t(){M&&M.$evalAsync(function(){M&&(M.isOpen=!1,y(!1),M.animation?F||(F=g(w,150,!1)):w())})}function u(){H&&(g.cancel(H),H=null),F&&(g.cancel(F),F=null)}function v(){D||(E=M.$new(),D=c(E,function(a){J?h.find("body").append(a):b.after(a)}),z())}function w(){s(),u(),A(),D&&(D.remove(),D=null),E&&(E.$destroy(),E=null)}function x(){M.title=d[k+"Title"],P?M.content=P(a):M.content=d[e],M.popupClass=d[k+"Class"],M.placement=angular.isDefined(d[k+"Placement"])?d[k+"Placement"]:n.placement;var b=parseInt(d[k+"PopupDelay"],10),c=parseInt(d[k+"PopupCloseDelay"],10);M.popupDelay=isNaN(b)?n.popupDelay:b,M.popupCloseDelay=isNaN(c)?n.popupCloseDelay:c}function y(b){O&&angular.isFunction(O.assign)&&O.assign(a,b)}function z(){Q.length=0,P?(Q.push(a.$watch(P,function(a){M.content=a,!a&&M.isOpen&&t()})),Q.push(E.$watch(function(){N||(N=!0,E.$$postDigest(function(){N=!1,M&&M.isOpen&&R()}))}))):Q.push(d.$observe(e,function(a){M.content=a,!a&&M.isOpen?t():R()})),Q.push(d.$observe(k+"Title",function(a){M.title=a,M.isOpen&&R()})),Q.push(d.$observe(k+"Placement",function(a){M.placement=a?a:n.placement,M.isOpen&&R()}))}function A(){Q.length&&(angular.forEach(Q,function(a){a()}),Q.length=0)}function B(a){M&&M.isOpen&&D&&(b[0].contains(a.target)||D[0].contains(a.target)||q())}function C(){var a=d[k+"Trigger"];S(),K=p(a),"none"!==K.show&&K.show.forEach(function(a,c){"outsideClick"===a?(b.on("click",j),h.on("click",B)):a===K.hide[c]?b.on(a,j):a&&(b.on(a,m),b.on(K.hide[c],q)),b.on("keypress",function(a){27===a.which&&q()})})}var D,E,F,G,H,I,J=angular.isDefined(n.appendToBody)?n.appendToBody:!1,K=p(void 0),L=angular.isDefined(d[k+"Enable"]),M=a.$new(!0),N=!1,O=angular.isDefined(d[k+"IsOpen"])?l(d[k+"IsOpen"]):!1,P=n.useContentExp?l(d[e]):!1,Q=[],R=function(){D&&D.html()&&(I||(I=g(function(){D.css({top:0,left:0});var a=i.positionElements(b,D,M.placement,J);D.css({top:a.top+"px",left:a.left+"px",visibility:"visible"}),n.placementClassPrefix&&D.removeClass("top bottom left right"),D.removeClass(n.placementClassPrefix+"top "+n.placementClassPrefix+"top-left "+n.placementClassPrefix+"top-right "+n.placementClassPrefix+"bottom "+n.placementClassPrefix+"bottom-left "+n.placementClassPrefix+"bottom-right "+n.placementClassPrefix+"left "+n.placementClassPrefix+"left-top "+n.placementClassPrefix+"left-bottom "+n.placementClassPrefix+"right "+n.placementClassPrefix+"right-top "+n.placementClassPrefix+"right-bottom");var c=a.placement.split("-");D.addClass(c[0]+" "+n.placementClassPrefix+a.placement),i.positionArrow(D,a.placement),I=null},0,!1)))};M.origScope=a,M.isOpen=!1,o.add(M,{close:t}),M.contentExp=function(){return M.content},d.$observe("disabled",function(a){a&&s(),a&&M.isOpen&&t()}),O&&a.$watch(O,function(a){M&&!a===M.isOpen&&j()});var S=function(){K.show.forEach(function(a){"outsideClick"===a?b.off("click",j):(b.off(a,m),b.off(a,j))}),K.hide.forEach(function(a){"outsideClick"===a?h.off("click",B):b.off(a,q)})};C();var T=a.$eval(d[k+"Animation"]);M.animation=angular.isDefined(T)?!!T:n.animation;var U,V=k+"AppendToBody";U=V in d&&void 0===d[V]?!0:a.$eval(d[V]),J=angular.isDefined(U)?U:J,J&&a.$on("$locationChangeSuccess",function(){M.isOpen&&t()}),a.$on("$destroy",function(){S(),w(),o.remove(M),M=null})}}}}}]}).directive("uibTooltipTemplateTransclude",["$animate","$sce","$compile","$templateRequest",function(a,b,c,d){return{link:function(e,f,g){var h,i,j,k=e.$eval(g.tooltipTemplateTranscludeScope),l=0,m=function(){i&&(i.remove(),i=null),h&&(h.$destroy(),h=null),j&&(a.leave(j).then(function(){i=null}),i=j,j=null)};e.$watch(b.parseAsResourceUrl(g.uibTooltipTemplateTransclude),function(b){var g=++l;b?(d(b,!0).then(function(d){if(g===l){var e=k.$new(),i=d,n=c(i)(e,function(b){m(),a.enter(b,f)});h=e,j=n,h.$emit("$includeContentLoaded",b)}},function(){g===l&&(m(),e.$emit("$includeContentError",b))}),e.$emit("$includeContentRequested",b)):m()}),e.$on("$destroy",m)}}}]).directive("uibTooltipClasses",["$uibPosition",function(a){return{restrict:"A",link:function(b,c,d){if(b.placement){var e=a.parsePlacement(b.placement);c.addClass(e[0])}else c.addClass("top");b.popupClass&&c.addClass(b.popupClass),b.animation()&&c.addClass(d.tooltipAnimationClass)}}}]).directive("uibTooltipPopup",function(){return{replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"
+},templateUrl:"uib/template/tooltip/tooltip-popup.html"}}).directive("uibTooltip",["$uibTooltip",function(a){return a("uibTooltip","tooltip","mouseenter")}]).directive("uibTooltipTemplatePopup",function(){return{replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"uib/template/tooltip/tooltip-template-popup.html"}}).directive("uibTooltipTemplate",["$uibTooltip",function(a){return a("uibTooltipTemplate","tooltip","mouseenter",{useContentExp:!0})}]).directive("uibTooltipHtmlPopup",function(){return{replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/tooltip/tooltip-html-popup.html"}}).directive("uibTooltipHtml",["$uibTooltip",function(a){return a("uibTooltipHtml","tooltip","mouseenter",{useContentExp:!0})}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("uibPopoverTemplatePopup",function(){return{replace:!0,scope:{title:"@",contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"uib/template/popover/popover-template.html"}}).directive("uibPopoverTemplate",["$uibTooltip",function(a){return a("uibPopoverTemplate","popover","click",{useContentExp:!0})}]).directive("uibPopoverHtmlPopup",function(){return{replace:!0,scope:{contentExp:"&",title:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/popover/popover-html.html"}}).directive("uibPopoverHtml",["$uibTooltip",function(a){return a("uibPopoverHtml","popover","click",{useContentExp:!0})}]).directive("uibPopoverPopup",function(){return{replace:!0,scope:{title:"@",content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/popover/popover.html"}}).directive("uibPopover",["$uibTooltip",function(a){return a("uibPopover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("uibProgressConfig",{animate:!0,max:100}).controller("UibProgressController",["$scope","$attrs","uibProgressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(a.max)?a.max:c.max,this.addBar=function(b,c,f){e||c.css({transition:"none"}),this.bars.push(b),b.max=a.max,b.title=f&&angular.isDefined(f.title)?f.title:"progressbar",b.$watch("value",function(a){b.recalculatePercentage()}),b.recalculatePercentage=function(){var a=d.bars.reduce(function(a,b){return b.percent=+(100*b.value/b.max).toFixed(2),a+b.percent},0);a>100&&(b.percent-=a-100)},b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1),this.bars.forEach(function(a){a.recalculatePercentage()})},a.$watch("max",function(b){d.bars.forEach(function(b){b.max=a.max,b.recalculatePercentage()})})}]).directive("uibProgress",function(){return{replace:!0,transclude:!0,controller:"UibProgressController",require:"uibProgress",scope:{max:"=?"},templateUrl:"uib/template/progressbar/progress.html"}}).directive("uibBar",function(){return{replace:!0,transclude:!0,require:"^uibProgress",scope:{value:"=",type:"@"},templateUrl:"uib/template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b,c)}}}).directive("uibProgressbar",function(){return{replace:!0,transclude:!0,controller:"UibProgressController",scope:{value:"=",max:"=?",type:"@"},templateUrl:"uib/template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]),{title:c.title})}}}),angular.module("ui.bootstrap.rating",[]).constant("uibRatingConfig",{max:5,stateOn:null,stateOff:null,titles:["one","two","three","four","five"]}).controller("UibRatingController",["$scope","$attrs","uibRatingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,d.$formatters.push(function(a){return angular.isNumber(a)&&a<<0!==a&&(a=Math.round(a)),a}),this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.titles)?a.$parent.$eval(b.titles):c.titles;this.titles=angular.isArray(f)&&f.length>0?f:c.titles;var g=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(g)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff,title:this.getTitle(b)},a[b]);return a},this.getTitle=function(a){return a>=this.titles.length?a+1:this.titles[a]},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(d.$viewValue===b?0:b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("uibRating",function(){return{require:["uibRating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"UibRatingController",templateUrl:"uib/template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("UibTabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect(),a.selectCalled=!1)}),a.active=!0,a.selectCalled||(a.onSelect(),a.selectCalled=!0)},b.addTab=function(a){c.push(a),1===c.length&&a.active!==!1?a.active=!0:a.active?b.select(a):a.active=!1},b.removeTab=function(a){var e=c.indexOf(a);if(a.active&&c.length>1&&!d){var f=e===c.length-1?e-1:e+1;b.select(c[f])}c.splice(e,1)};var d;a.$on("$destroy",function(){d=!0})}]).directive("uibTabset",function(){return{transclude:!0,replace:!0,scope:{type:"@"},controller:"UibTabsetController",templateUrl:"uib/template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("uibTab",["$parse",function(a){return{require:"^uibTabset",replace:!0,templateUrl:"uib/template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},controllerAs:"tab",link:function(b,c,d,e,f){b.$watch("active",function(a){a&&e.select(b)}),b.disabled=!1,d.disable&&b.$parent.$watch(a(d.disable),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},e.addTab(b),b.$on("$destroy",function(){e.removeTab(b)}),b.$transcludeFn=f}}}]).directive("uibTabHeadingTransclude",function(){return{restrict:"A",require:"^uibTab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}).directive("uibTabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("uib-tab-heading")||a.hasAttribute("data-uib-tab-heading")||a.hasAttribute("x-uib-tab-heading")||"uib-tab-heading"===a.tagName.toLowerCase()||"data-uib-tab-heading"===a.tagName.toLowerCase()||"x-uib-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^uibTabset",link:function(b,c,d){var e=b.$eval(d.uibTabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("uibTimepickerConfig",{hourStep:1,minuteStep:1,secondStep:1,showMeridian:!0,showSeconds:!1,meridians:null,readonlyInput:!1,mousewheel:!0,arrowkeys:!0,showSpinners:!0,templateUrl:"uib/template/timepicker/timepicker.html"}).controller("UibTimepickerController",["$scope","$element","$attrs","$parse","$log","$locale","uibTimepickerConfig",function(a,b,c,d,e,f,g){function h(){var b=+a.hours,c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===u[1]&&(b+=12)),b):void 0}function i(){var b=+a.minutes;return b>=0&&60>b?b:void 0}function j(){var b=+a.seconds;return b>=0&&60>b?b:void 0}function k(a){return null===a?"":angular.isDefined(a)&&a.toString().length<2?"0"+a:a.toString()}function l(a){m(),t.$setViewValue(new Date(r)),n(a)}function m(){t.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1,a.invalidSeconds=!1}function n(b){if(t.$modelValue){var c=r.getHours(),d=r.getMinutes(),e=r.getSeconds();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:k(c),"m"!==b&&(a.minutes=k(d)),a.meridian=r.getHours()<12?u[0]:u[1],"s"!==b&&(a.seconds=k(e)),a.meridian=r.getHours()<12?u[0]:u[1]}else a.hours=null,a.minutes=null,a.seconds=null,a.meridian=u[0]}function o(a){r=q(r,a),l()}function p(a,b){return q(a,60*b)}function q(a,b){var c=new Date(a.getTime()+1e3*b),d=new Date(a);return d.setHours(c.getHours(),c.getMinutes(),c.getSeconds()),d}var r=new Date,s=[],t={$setViewValue:angular.noop},u=angular.isDefined(c.meridians)?a.$parent.$eval(c.meridians):g.meridians||f.DATETIME_FORMATS.AMPMS;a.tabindex=angular.isDefined(c.tabindex)?c.tabindex:0,b.removeAttr("tabindex"),this.init=function(b,d){t=b,t.$render=this.render,t.$formatters.unshift(function(a){return a?new Date(a):null});var e=d.eq(0),f=d.eq(1),h=d.eq(2),i=angular.isDefined(c.mousewheel)?a.$parent.$eval(c.mousewheel):g.mousewheel;i&&this.setupMousewheelEvents(e,f,h);var j=angular.isDefined(c.arrowkeys)?a.$parent.$eval(c.arrowkeys):g.arrowkeys;j&&this.setupArrowkeyEvents(e,f,h),a.readonlyInput=angular.isDefined(c.readonlyInput)?a.$parent.$eval(c.readonlyInput):g.readonlyInput,this.setupInputEvents(e,f,h)};var v=g.hourStep;c.hourStep&&s.push(a.$parent.$watch(d(c.hourStep),function(a){v=+a}));var w=g.minuteStep;c.minuteStep&&s.push(a.$parent.$watch(d(c.minuteStep),function(a){w=+a}));var x;s.push(a.$parent.$watch(d(c.min),function(a){var b=new Date(a);x=isNaN(b)?void 0:b}));var y;s.push(a.$parent.$watch(d(c.max),function(a){var b=new Date(a);y=isNaN(b)?void 0:b}));var z=!1;c.ngDisabled&&s.push(a.$parent.$watch(d(c.ngDisabled),function(a){z=a})),a.noIncrementHours=function(){var a=p(r,60*v);return z||a>y||r>a&&x>a},a.noDecrementHours=function(){var a=p(r,60*-v);return z||x>a||a>r&&a>y},a.noIncrementMinutes=function(){var a=p(r,w);return z||a>y||r>a&&x>a},a.noDecrementMinutes=function(){var a=p(r,-w);return z||x>a||a>r&&a>y},a.noIncrementSeconds=function(){var a=q(r,A);return z||a>y||r>a&&x>a},a.noDecrementSeconds=function(){var a=q(r,-A);return z||x>a||a>r&&a>y},a.noToggleMeridian=function(){return r.getHours()<12?z||p(r,720)>y:z||p(r,-720)<x};var A=g.secondStep;c.secondStep&&s.push(a.$parent.$watch(d(c.secondStep),function(a){A=+a})),a.showSeconds=g.showSeconds,c.showSeconds&&s.push(a.$parent.$watch(d(c.showSeconds),function(b){a.showSeconds=!!b})),a.showMeridian=g.showMeridian,c.showMeridian&&s.push(a.$parent.$watch(d(c.showMeridian),function(b){if(a.showMeridian=!!b,t.$error.time){var c=h(),d=i();angular.isDefined(c)&&angular.isDefined(d)&&(r.setHours(c),l())}else n()})),this.setupMousewheelEvents=function(b,c,d){var e=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()}),d.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementSeconds():a.decrementSeconds()),b.preventDefault()})},this.setupArrowkeyEvents=function(b,c,d){b.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementHours(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementHours(),a.$apply()))}),c.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementMinutes(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementMinutes(),a.$apply()))}),d.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementSeconds(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementSeconds(),a.$apply()))})},this.setupInputEvents=function(b,c,d){if(a.readonlyInput)return a.updateHours=angular.noop,a.updateMinutes=angular.noop,void(a.updateSeconds=angular.noop);var e=function(b,c,d){t.$setViewValue(null),t.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c),angular.isDefined(d)&&(a.invalidSeconds=d)};a.updateHours=function(){var a=h(),b=i();t.$setDirty(),angular.isDefined(a)&&angular.isDefined(b)?(r.setHours(a),r.setMinutes(b),x>r||r>y?e(!0):l("h")):e(!0)},b.bind("blur",function(b){t.$setTouched(),null===a.hours||""===a.hours?e(!0):!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=k(a.hours)})}),a.updateMinutes=function(){var a=i(),b=h();t.$setDirty(),angular.isDefined(a)&&angular.isDefined(b)?(r.setHours(b),r.setMinutes(a),x>r||r>y?e(void 0,!0):l("m")):e(void 0,!0)},c.bind("blur",function(b){t.$setTouched(),null===a.minutes?e(void 0,!0):!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=k(a.minutes)})}),a.updateSeconds=function(){var a=j();t.$setDirty(),angular.isDefined(a)?(r.setSeconds(a),l("s")):e(void 0,void 0,!0)},d.bind("blur",function(b){!a.invalidSeconds&&a.seconds<10&&a.$apply(function(){a.seconds=k(a.seconds)})})},this.render=function(){var b=t.$viewValue;isNaN(b)?(t.$setValidity("time",!1),e.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(b&&(r=b),x>r||r>y?(t.$setValidity("time",!1),a.invalidHours=!0,a.invalidMinutes=!0):m(),n())},a.showSpinners=angular.isDefined(c.showSpinners)?a.$parent.$eval(c.showSpinners):g.showSpinners,a.incrementHours=function(){a.noIncrementHours()||o(60*v*60)},a.decrementHours=function(){a.noDecrementHours()||o(60*-v*60)},a.incrementMinutes=function(){a.noIncrementMinutes()||o(60*w)},a.decrementMinutes=function(){a.noDecrementMinutes()||o(60*-w)},a.incrementSeconds=function(){a.noIncrementSeconds()||o(A)},a.decrementSeconds=function(){a.noDecrementSeconds()||o(-A)},a.toggleMeridian=function(){var b=i(),c=h();a.noToggleMeridian()||(angular.isDefined(b)&&angular.isDefined(c)?o(720*(r.getHours()<12?60:-60)):a.meridian=a.meridian===u[0]?u[1]:u[0])},a.blur=function(){t.$setTouched()},a.$on("$destroy",function(){for(;s.length;)s.shift()()})}]).directive("uibTimepicker",["uibTimepickerConfig",function(a){return{require:["uibTimepicker","?^ngModel"],controller:"UibTimepickerController",controllerAs:"timepicker",replace:!0,scope:{},templateUrl:function(b,c){return c.templateUrl||a.templateUrl},link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}]),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.debounce","ui.bootstrap.position"]).factory("uibTypeaheadParser",["$parse",function(a){var b=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).controller("UibTypeaheadController",["$scope","$element","$attrs","$compile","$parse","$q","$timeout","$document","$window","$rootScope","$$debounce","$uibPosition","uibTypeaheadParser",function(a,b,c,d,e,f,g,h,i,j,k,l,m){function n(){N.moveInProgress||(N.moveInProgress=!0,N.$digest()),Y()}function o(){N.position=D?l.offset(b):l.position(b),N.position.top+=b.prop("offsetHeight")}var p,q,r=[9,13,27,38,40],s=200,t=a.$eval(c.typeaheadMinLength);t||0===t||(t=1);var u=a.$eval(c.typeaheadWaitMs)||0,v=a.$eval(c.typeaheadEditable)!==!1;a.$watch(c.typeaheadEditable,function(a){v=a!==!1});var w,x,y=e(c.typeaheadLoading).assign||angular.noop,z=e(c.typeaheadOnSelect),A=angular.isDefined(c.typeaheadSelectOnBlur)?a.$eval(c.typeaheadSelectOnBlur):!1,B=e(c.typeaheadNoResults).assign||angular.noop,C=c.typeaheadInputFormatter?e(c.typeaheadInputFormatter):void 0,D=c.typeaheadAppendToBody?a.$eval(c.typeaheadAppendToBody):!1,E=c.typeaheadAppendTo?a.$eval(c.typeaheadAppendTo):null,F=a.$eval(c.typeaheadFocusFirst)!==!1,G=c.typeaheadSelectOnExact?a.$eval(c.typeaheadSelectOnExact):!1,H=e(c.typeaheadIsOpen).assign||angular.noop,I=a.$eval(c.typeaheadShowHint)||!1,J=e(c.ngModel),K=e(c.ngModel+"($$$p)"),L=function(b,c){return angular.isFunction(J(a))&&q&&q.$options&&q.$options.getterSetter?K(b,{$$$p:c}):J.assign(b,c)},M=m.parse(c.uibTypeahead),N=a.$new(),O=a.$on("$destroy",function(){N.$destroy()});N.$on("$destroy",O);var P="typeahead-"+N.$id+"-"+Math.floor(1e4*Math.random());b.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":P});var Q,R;I&&(Q=angular.element("<div></div>"),Q.css("position","relative"),b.after(Q),R=b.clone(),R.attr("placeholder",""),R.val(""),R.css({position:"absolute",top:"0px",left:"0px","border-color":"transparent","box-shadow":"none",opacity:1,background:"none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)",color:"#999"}),b.css({position:"relative","vertical-align":"top","background-color":"transparent"}),Q.append(R),R.after(b));var S=angular.element("<div uib-typeahead-popup></div>");S.attr({id:P,matches:"matches",active:"activeIdx",select:"select(activeIdx, evt)","move-in-progress":"moveInProgress",query:"query",position:"position","assign-is-open":"assignIsOpen(isOpen)",debounce:"debounceUpdate"}),angular.isDefined(c.typeaheadTemplateUrl)&&S.attr("template-url",c.typeaheadTemplateUrl),angular.isDefined(c.typeaheadPopupTemplateUrl)&&S.attr("popup-template-url",c.typeaheadPopupTemplateUrl);var T=function(){I&&R.val("")},U=function(){N.matches=[],N.activeIdx=-1,b.attr("aria-expanded",!1),T()},V=function(a){return P+"-option-"+a};N.$watch("activeIdx",function(a){0>a?b.removeAttr("aria-activedescendant"):b.attr("aria-activedescendant",V(a))});var W=function(a,b){return N.matches.length>b&&a?a.toUpperCase()===N.matches[b].label.toUpperCase():!1},X=function(c,d){var e={$viewValue:c};y(a,!0),B(a,!1),f.when(M.source(a,e)).then(function(f){var g=c===p.$viewValue;if(g&&w)if(f&&f.length>0){N.activeIdx=F?0:-1,B(a,!1),N.matches.length=0;for(var h=0;h<f.length;h++)e[M.itemName]=f[h],N.matches.push({id:V(h),label:M.viewMapper(N,e),model:f[h]});if(N.query=c,o(),b.attr("aria-expanded",!0),G&&1===N.matches.length&&W(c,0)&&(angular.isNumber(N.debounceUpdate)||angular.isObject(N.debounceUpdate)?k(function(){N.select(0,d)},angular.isNumber(N.debounceUpdate)?N.debounceUpdate:N.debounceUpdate["default"]):N.select(0,d)),I){var i=N.matches[0].label;c.length>0&&i.slice(0,c.length).toUpperCase()===c.toUpperCase()?R.val(c+i.slice(c.length)):R.val("")}}else U(),B(a,!0);g&&y(a,!1)},function(){U(),y(a,!1),B(a,!0)})};D&&(angular.element(i).on("resize",n),h.find("body").on("scroll",n));var Y=k(function(){N.matches.length&&o(),N.moveInProgress=!1},s);N.moveInProgress=!1,N.query=void 0;var Z,$=function(a){Z=g(function(){X(a)},u)},_=function(){Z&&g.cancel(Z)};U(),N.assignIsOpen=function(b){H(a,b)},N.select=function(d,e){var f,h,i={};x=!0,i[M.itemName]=h=N.matches[d].model,f=M.modelMapper(a,i),L(a,f),p.$setValidity("editable",!0),p.$setValidity("parse",!0),z(a,{$item:h,$model:f,$label:M.viewMapper(a,i),$event:e}),U(),N.$eval(c.typeaheadFocusOnSelect)!==!1&&g(function(){b[0].focus()},0,!1)},b.on("keydown",function(a){if(0!==N.matches.length&&-1!==r.indexOf(a.which)){if(-1===N.activeIdx&&(9===a.which||13===a.which))return U(),void N.$digest();a.preventDefault();var b;switch(a.which){case 9:case 13:N.$apply(function(){angular.isNumber(N.debounceUpdate)||angular.isObject(N.debounceUpdate)?k(function(){N.select(N.activeIdx,a)},angular.isNumber(N.debounceUpdate)?N.debounceUpdate:N.debounceUpdate["default"]):N.select(N.activeIdx,a)});break;case 27:a.stopPropagation(),U(),N.$digest();break;case 38:N.activeIdx=(N.activeIdx>0?N.activeIdx:N.matches.length)-1,N.$digest(),b=S.find("li")[N.activeIdx],b.parentNode.scrollTop=b.offsetTop;break;case 40:N.activeIdx=(N.activeIdx+1)%N.matches.length,N.$digest(),b=S.find("li")[N.activeIdx],b.parentNode.scrollTop=b.offsetTop}}}),b.bind("focus",function(a){w=!0,0!==t||p.$viewValue||g(function(){X(p.$viewValue,a)},0)}),b.bind("blur",function(a){A&&N.matches.length&&-1!==N.activeIdx&&!x&&(x=!0,N.$apply(function(){angular.isObject(N.debounceUpdate)&&angular.isNumber(N.debounceUpdate.blur)?k(function(){N.select(N.activeIdx,a)},N.debounceUpdate.blur):N.select(N.activeIdx,a)})),!v&&p.$error.editable&&(p.$viewValue="",b.val("")),w=!1,x=!1});var aa=function(a){b[0]!==a.target&&3!==a.which&&0!==N.matches.length&&(U(),j.$$phase||N.$digest())};h.on("click",aa),a.$on("$destroy",function(){h.off("click",aa),(D||E)&&ba.remove(),D&&(angular.element(i).off("resize",n),h.find("body").off("scroll",n)),S.remove(),I&&Q.remove()});var ba=d(S)(N);D?h.find("body").append(ba):E?angular.element(E).eq(0).append(ba):b.after(ba),this.init=function(b,c){p=b,q=c,N.debounceUpdate=p.$options&&e(p.$options.debounce)(a),p.$parsers.unshift(function(b){return w=!0,0===t||b&&b.length>=t?u>0?(_(),$(b)):X(b):(y(a,!1),_(),U()),v?b:b?void p.$setValidity("editable",!1):(p.$setValidity("editable",!0),null)}),p.$formatters.push(function(b){var c,d,e={};return v||p.$setValidity("editable",!0),C?(e.$model=b,C(a,e)):(e[M.itemName]=b,c=M.viewMapper(a,e),e[M.itemName]=void 0,d=M.viewMapper(a,e),c!==d?c:b)})}}]).directive("uibTypeahead",function(){return{controller:"UibTypeaheadController",require:["ngModel","^?ngModelOptions","uibTypeahead"],link:function(a,b,c,d){d[2].init(d[0],d[1])}}}).directive("uibTypeaheadPopup",["$$debounce",function(a){return{scope:{matches:"=",query:"=",active:"=",position:"&",moveInProgress:"=",select:"&",assignIsOpen:"&",debounce:"&"},replace:!0,templateUrl:function(a,b){return b.popupTemplateUrl||"uib/template/typeahead/typeahead-popup.html"},link:function(b,c,d){b.templateUrl=d.templateUrl,b.isOpen=function(){var a=b.matches.length>0;return b.assignIsOpen({isOpen:a}),a},b.isActive=function(a){return b.active===a},b.selectActive=function(a){b.active=a},b.selectMatch=function(c,d){var e=b.debounce();angular.isNumber(e)||angular.isObject(e)?a(function(){b.select({activeIdx:c,evt:d})},angular.isNumber(e)?e:e["default"]):b.select({activeIdx:c,evt:d})}}}}]).directive("uibTypeaheadMatch",["$templateRequest","$compile","$parse",function(a,b,c){return{scope:{index:"=",match:"=",query:"="},link:function(d,e,f){var g=c(f.templateUrl)(d.$parent)||"uib/template/typeahead/typeahead-match.html";a(g).then(function(a){var c=angular.element(a.trim());e.replaceWith(c),b(c)(d)})}}}]).filter("uibTypeaheadHighlight",["$sce","$injector","$log",function(a,b,c){function d(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}function e(a){return/<.*>/g.test(a)}var f;return f=b.has("$sanitize"),function(b,g){return!f&&e(b)&&c.warn("Unsafe use of typeahead please use ngSanitize"),b=g?(""+b).replace(new RegExp(d(g),"gi"),"<strong>$&</strong>"):b,f||(b=a.trustAsHtml(b)),b}}]),angular.module("uib/template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("uib/template/accordion/accordion-group.html",'<div class="panel" ng-class="panelClass || \'panel-default\'">\n  <div class="panel-heading" ng-keypress="toggleOpen($event)">\n    <h4 class="panel-title">\n      <a href tabindex="0" class="accordion-toggle" ng-click="toggleOpen()" uib-accordion-transclude="heading"><span ng-class="{\'text-muted\': isDisabled}">{{heading}}</span></a>\n    </h4>\n  </div>\n  <div class="panel-collapse collapse" uib-collapse="!isOpen">\n	  <div class="panel-body" ng-transclude></div>\n  </div>\n</div>\n')}]),angular.module("uib/template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("uib/template/accordion/accordion.html",'<div class="panel-group" ng-transclude></div>')}]),angular.module("uib/template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("uib/template/alert/alert.html",'<div class="alert" ng-class="[\'alert-\' + (type || \'warning\'), closeable ? \'alert-dismissible\' : null]" role="alert">\n    <button ng-show="closeable" type="button" class="close" ng-click="close({$event: $event})">\n        <span aria-hidden="true">&times;</span>\n        <span class="sr-only">Close</span>\n    </button>\n    <div ng-transclude></div>\n</div>\n')}]),angular.module("uib/template/carousel/carousel.html",[]).run(["$templateCache",function(a){a.put("uib/template/carousel/carousel.html",'<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">\n  <div class="carousel-inner" ng-transclude></div>\n  <a role="button" href class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1">\n    <span aria-hidden="true" class="glyphicon glyphicon-chevron-left"></span>\n    <span class="sr-only">previous</span>\n  </a>\n  <a role="button" href class="right carousel-control" ng-click="next()" ng-show="slides.length > 1">\n    <span aria-hidden="true" class="glyphicon glyphicon-chevron-right"></span>\n    <span class="sr-only">next</span>\n  </a>\n  <ol class="carousel-indicators" ng-show="slides.length > 1">\n    <li ng-repeat="slide in slides | orderBy:indexOfSlide track by $index" ng-class="{ active: isActive(slide) }" ng-click="select(slide)">\n      <span class="sr-only">slide {{ $index + 1 }} of {{ slides.length }}<span ng-if="isActive(slide)">, currently active</span></span>\n    </li>\n  </ol>\n</div>')}]),angular.module("uib/template/carousel/slide.html",[]).run(["$templateCache",function(a){a.put("uib/template/carousel/slide.html",'<div ng-class="{\n    \'active\': active\n  }" class="item text-center" ng-transclude></div>\n')}]),angular.module("uib/template/datepicker/datepicker.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/datepicker.html",'<div class="uib-datepicker" ng-switch="datepickerMode" role="application" ng-keydown="keydown($event)">\n  <uib-daypicker ng-switch-when="day" tabindex="0"></uib-daypicker>\n  <uib-monthpicker ng-switch-when="month" tabindex="0"></uib-monthpicker>\n  <uib-yearpicker ng-switch-when="year" tabindex="0"></uib-yearpicker>\n</div>')}]),angular.module("uib/template/datepicker/day.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/day.html",'<table class="uib-daypicker" role="grid" aria-labelledby="{{::uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left uib-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{::5 + showWeeks}}"><button id="{{::uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm uib-title" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right uib-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n    <tr>\n      <th ng-if="showWeeks" class="text-center"></th>\n      <th ng-repeat="label in ::labels track by $index" class="text-center"><small aria-label="{{::label.full}}">{{::label.abbr}}</small></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr class="uib-weeks" ng-repeat="row in rows track by $index">\n      <td ng-if="showWeeks" class="text-center h6"><em>{{ weekNumbers[$index] }}</em></td>\n      <td ng-repeat="dt in row" class="uib-day text-center" role="gridcell"\n        id="{{::dt.uid}}"\n        ng-class="::dt.customClass">\n        <button type="button" class="btn btn-default btn-sm"\n          uib-is-class="\n            \'btn-info\' for selectedDt,\n            \'active\' for activeDt\n            on dt"\n          ng-click="select(dt.date)"\n          ng-disabled="::dt.disabled"\n          tabindex="-1"><span ng-class="::{\'text-muted\': dt.secondary, \'text-info\': dt.current}">{{::dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("uib/template/datepicker/month.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/month.html",'<table class="uib-monthpicker" role="grid" aria-labelledby="{{::uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left uib-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th><button id="{{::uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm uib-title" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right uib-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr class="uib-months" ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row" class="uib-month text-center" role="gridcell"\n        id="{{::dt.uid}}"\n        ng-class="::dt.customClass">\n        <button type="button" class="btn btn-default"\n          uib-is-class="\n            \'btn-info\' for selectedDt,\n            \'active\' for activeDt\n            on dt"\n          ng-click="select(dt.date)"\n          ng-disabled="::dt.disabled"\n          tabindex="-1"><span ng-class="::{\'text-info\': dt.current}">{{::dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("uib/template/datepicker/popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/popup.html",'<div>\n  <ul class="uib-datepicker-popup dropdown-menu" dropdown-nested ng-if="isOpen" ng-style="{top: position.top+\'px\', left: position.left+\'px\'}" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">\n    <li ng-transclude></li>\n    <li ng-if="showButtonBar" class="uib-button-bar">\n    <span class="btn-group pull-left">\n      <button type="button" class="btn btn-sm btn-info uib-datepicker-current" ng-click="select(\'today\')" ng-disabled="isDisabled(\'today\')">{{ getText(\'current\') }}</button>\n      <button type="button" class="btn btn-sm btn-danger uib-clear" ng-click="select(null)">{{ getText(\'clear\') }}</button>\n    </span>\n      <button type="button" class="btn btn-sm btn-success pull-right uib-close" ng-click="close()">{{ getText(\'close\') }}</button>\n    </li>\n  </ul>\n</div>\n')}]),angular.module("uib/template/datepicker/year.html",[]).run(["$templateCache",function(a){a.put("uib/template/datepicker/year.html",'<table class="uib-yearpicker" role="grid" aria-labelledby="{{::uniqueId}}-title" aria-activedescendant="{{activeDateId}}">\n  <thead>\n    <tr>\n      <th><button type="button" class="btn btn-default btn-sm pull-left uib-left" ng-click="move(-1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-left"></i></button></th>\n      <th colspan="{{::columns - 2}}"><button id="{{::uniqueId}}-title" role="heading" aria-live="assertive" aria-atomic="true" type="button" class="btn btn-default btn-sm uib-title" ng-click="toggleMode()" ng-disabled="datepickerMode === maxMode" tabindex="-1"><strong>{{title}}</strong></button></th>\n      <th><button type="button" class="btn btn-default btn-sm pull-right uib-right" ng-click="move(1)" tabindex="-1"><i class="glyphicon glyphicon-chevron-right"></i></button></th>\n    </tr>\n  </thead>\n  <tbody>\n    <tr class="uib-years" ng-repeat="row in rows track by $index">\n      <td ng-repeat="dt in row" class="uib-year text-center" role="gridcell"\n        id="{{::dt.uid}}"\n        ng-class="::dt.customClass">\n        <button type="button" class="btn btn-default"\n          uib-is-class="\n            \'btn-info\' for selectedDt,\n            \'active\' for activeDt\n            on dt"\n          ng-click="select(dt.date)"\n          ng-disabled="::dt.disabled"\n          tabindex="-1"><span ng-class="::{\'text-info\': dt.current}">{{::dt.label}}</span></button>\n      </td>\n    </tr>\n  </tbody>\n</table>\n');
+}]),angular.module("uib/template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("uib/template/modal/backdrop.html",'<div class="modal-backdrop"\n     uib-modal-animation-class="fade"\n     modal-in-class="in"\n     ng-style="{\'z-index\': 1040 + (index && 1 || 0) + index*10}"\n></div>\n')}]),angular.module("uib/template/modal/window.html",[]).run(["$templateCache",function(a){a.put("uib/template/modal/window.html",'<div modal-render="{{$isRendered}}" tabindex="-1" role="dialog" class="modal"\n    uib-modal-animation-class="fade"\n    modal-in-class="in"\n    ng-style="{\'z-index\': 1050 + index*10, display: \'block\'}">\n    <div class="modal-dialog {{size ? \'modal-\' + size : \'\'}}"><div class="modal-content" uib-modal-transclude></div></div>\n</div>\n')}]),angular.module("uib/template/pager/pager.html",[]).run(["$templateCache",function(a){a.put("uib/template/pager/pager.html",'<ul class="pager">\n  <li ng-class="{disabled: noPrevious()||ngDisabled, previous: align}"><a href ng-click="selectPage(page - 1, $event)">{{::getText(\'previous\')}}</a></li>\n  <li ng-class="{disabled: noNext()||ngDisabled, next: align}"><a href ng-click="selectPage(page + 1, $event)">{{::getText(\'next\')}}</a></li>\n</ul>\n')}]),angular.module("uib/template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("uib/template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-if="::boundaryLinks" ng-class="{disabled: noPrevious()||ngDisabled}" class="pagination-first"><a href ng-click="selectPage(1, $event)">{{::getText(\'first\')}}</a></li>\n  <li ng-if="::directionLinks" ng-class="{disabled: noPrevious()||ngDisabled}" class="pagination-prev"><a href ng-click="selectPage(page - 1, $event)">{{::getText(\'previous\')}}</a></li>\n  <li ng-repeat="page in pages track by $index" ng-class="{active: page.active,disabled: ngDisabled&&!page.active}" class="pagination-page"><a href ng-click="selectPage(page.number, $event)">{{page.text}}</a></li>\n  <li ng-if="::directionLinks" ng-class="{disabled: noNext()||ngDisabled}" class="pagination-next"><a href ng-click="selectPage(page + 1, $event)">{{::getText(\'next\')}}</a></li>\n  <li ng-if="::boundaryLinks" ng-class="{disabled: noNext()||ngDisabled}" class="pagination-last"><a href ng-click="selectPage(totalPages, $event)">{{::getText(\'last\')}}</a></li>\n</ul>\n')}]),angular.module("uib/template/tooltip/tooltip-html-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-html-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  uib-tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind-html="contentExp()"></div>\n</div>\n')}]),angular.module("uib/template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  uib-tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner" ng-bind="content"></div>\n</div>\n')}]),angular.module("uib/template/tooltip/tooltip-template-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/tooltip/tooltip-template-popup.html",'<div class="tooltip"\n  tooltip-animation-class="fade"\n  uib-tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="tooltip-arrow"></div>\n  <div class="tooltip-inner"\n    uib-tooltip-template-transclude="contentExp()"\n    tooltip-template-transclude-scope="originScope()"></div>\n</div>\n')}]),angular.module("uib/template/popover/popover-html.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover-html.html",'<div class="popover"\n  tooltip-animation-class="fade"\n  uib-tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n      <div class="popover-content" ng-bind-html="contentExp()"></div>\n  </div>\n</div>\n')}]),angular.module("uib/template/popover/popover-template.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover-template.html",'<div class="popover"\n  tooltip-animation-class="fade"\n  uib-tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n      <div class="popover-content"\n        uib-tooltip-template-transclude="contentExp()"\n        tooltip-template-transclude-scope="originScope()"></div>\n  </div>\n</div>\n')}]),angular.module("uib/template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("uib/template/popover/popover.html",'<div class="popover"\n  tooltip-animation-class="fade"\n  uib-tooltip-classes\n  ng-class="{ in: isOpen() }">\n  <div class="arrow"></div>\n\n  <div class="popover-inner">\n      <h3 class="popover-title" ng-bind="title" ng-if="title"></h3>\n      <div class="popover-content" ng-bind="content"></div>\n  </div>\n</div>\n')}]),angular.module("uib/template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/bar.html",'<div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" aria-labelledby="{{::title}}" ng-transclude></div>\n')}]),angular.module("uib/template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/progress.html",'<div class="progress" ng-transclude aria-labelledby="{{::title}}"></div>')}]),angular.module("uib/template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("uib/template/progressbar/progressbar.html",'<div class="progress">\n  <div class="progress-bar" ng-class="type && \'progress-bar-\' + type" role="progressbar" aria-valuenow="{{value}}" aria-valuemin="0" aria-valuemax="{{max}}" ng-style="{width: (percent < 100 ? percent : 100) + \'%\'}" aria-valuetext="{{percent | number:0}}%" aria-labelledby="{{::title}}" ng-transclude></div>\n</div>\n')}]),angular.module("uib/template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("uib/template/rating/rating.html",'<span ng-mouseleave="reset()" ng-keydown="onKeydown($event)" tabindex="0" role="slider" aria-valuemin="0" aria-valuemax="{{range.length}}" aria-valuenow="{{value}}">\n    <span ng-repeat-start="r in range track by $index" class="sr-only">({{ $index < value ? \'*\' : \' \' }})</span>\n    <i ng-repeat-end ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="glyphicon" ng-class="$index < value && (r.stateOn || \'glyphicon-star\') || (r.stateOff || \'glyphicon-star-empty\')" ng-attr-title="{{r.title}}" aria-valuetext="{{r.title}}"></i>\n</span>\n')}]),angular.module("uib/template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("uib/template/tabs/tab.html",'<li ng-class="{active: active, disabled: disabled}" class="uib-tab">\n  <a href ng-click="select()" uib-tab-heading-transclude>{{heading}}</a>\n</li>\n')}]),angular.module("uib/template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("uib/template/tabs/tabset.html",'<div>\n  <ul class="nav nav-{{type || \'tabs\'}}" ng-class="{\'nav-stacked\': vertical, \'nav-justified\': justified}" ng-transclude></ul>\n  <div class="tab-content">\n    <div class="tab-pane" \n         ng-repeat="tab in tabs" \n         ng-class="{active: tab.active}"\n         uib-tab-content-transclude="tab">\n    </div>\n  </div>\n</div>\n')}]),angular.module("uib/template/timepicker/timepicker.html",[]).run(["$templateCache",function(a){a.put("uib/template/timepicker/timepicker.html",'<table class="uib-timepicker">\n  <tbody>\n    <tr class="text-center" ng-show="::showSpinners">\n      <td class="uib-increment hours"><a ng-click="incrementHours()" ng-class="{disabled: noIncrementHours()}" class="btn btn-link" ng-disabled="noIncrementHours()" tabindex="{{::tabindex}}"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n      <td>&nbsp;</td>\n      <td class="uib-increment minutes"><a ng-click="incrementMinutes()" ng-class="{disabled: noIncrementMinutes()}" class="btn btn-link" ng-disabled="noIncrementMinutes()" tabindex="{{::tabindex}}"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n      <td ng-show="showSeconds">&nbsp;</td>\n      <td ng-show="showSeconds" class="uib-increment seconds"><a ng-click="incrementSeconds()" ng-class="{disabled: noIncrementSeconds()}" class="btn btn-link" ng-disabled="noIncrementSeconds()" tabindex="{{::tabindex}}"><span class="glyphicon glyphicon-chevron-up"></span></a></td>\n      <td ng-show="showMeridian"></td>\n    </tr>\n    <tr>\n      <td class="form-group uib-time hours" ng-class="{\'has-error\': invalidHours}">\n        <input style="width:50px;" type="text" placeholder="HH" ng-model="hours" ng-change="updateHours()" class="form-control text-center" ng-readonly="::readonlyInput" maxlength="2" tabindex="{{::tabindex}}" ng-disabled="noIncrementHours()" ng-blur="blur()">\n      </td>\n      <td class="uib-separator">:</td>\n      <td class="form-group uib-time minutes" ng-class="{\'has-error\': invalidMinutes}">\n        <input style="width:50px;" type="text" placeholder="MM" ng-model="minutes" ng-change="updateMinutes()" class="form-control text-center" ng-readonly="::readonlyInput" maxlength="2" tabindex="{{::tabindex}}" ng-disabled="noIncrementMinutes()" ng-blur="blur()">\n      </td>\n      <td ng-show="showSeconds" class="uib-separator">:</td>\n      <td class="form-group uib-time seconds" ng-class="{\'has-error\': invalidSeconds}" ng-show="showSeconds">\n        <input style="width:50px;" type="text" placeholder="SS" ng-model="seconds" ng-change="updateSeconds()" class="form-control text-center" ng-readonly="readonlyInput" maxlength="2" tabindex="{{::tabindex}}" ng-disabled="noIncrementSeconds()" ng-blur="blur()">\n      </td>\n      <td ng-show="showMeridian" class="uib-time am-pm"><button type="button" ng-class="{disabled: noToggleMeridian()}" class="btn btn-default text-center" ng-click="toggleMeridian()" ng-disabled="noToggleMeridian()" tabindex="{{::tabindex}}">{{meridian}}</button></td>\n    </tr>\n    <tr class="text-center" ng-show="::showSpinners">\n      <td class="uib-decrement hours"><a ng-click="decrementHours()" ng-class="{disabled: noDecrementHours()}" class="btn btn-link" ng-disabled="noDecrementHours()" tabindex="{{::tabindex}}"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n      <td>&nbsp;</td>\n      <td class="uib-decrement minutes"><a ng-click="decrementMinutes()" ng-class="{disabled: noDecrementMinutes()}" class="btn btn-link" ng-disabled="noDecrementMinutes()" tabindex="{{::tabindex}}"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n      <td ng-show="showSeconds">&nbsp;</td>\n      <td ng-show="showSeconds" class="uib-decrement seconds"><a ng-click="decrementSeconds()" ng-class="{disabled: noDecrementSeconds()}" class="btn btn-link" ng-disabled="noDecrementSeconds()" tabindex="{{::tabindex}}"><span class="glyphicon glyphicon-chevron-down"></span></a></td>\n      <td ng-show="showMeridian"></td>\n    </tr>\n  </tbody>\n</table>\n')}]),angular.module("uib/template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("uib/template/typeahead/typeahead-match.html",'<a href\n   tabindex="-1"\n   ng-bind-html="match.label | uibTypeaheadHighlight:query"\n   ng-attr-title="{{match.label}}"></a>\n')}]),angular.module("uib/template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("uib/template/typeahead/typeahead-popup.html",'<ul class="dropdown-menu" ng-show="isOpen() && !moveInProgress" ng-style="{top: position().top+\'px\', left: position().left+\'px\'}" role="listbox" aria-hidden="{{!isOpen()}}">\n    <li ng-repeat="match in matches track by $index" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index, $event)" role="option" id="{{::match.id}}">\n        <div uib-typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>\n')}]),angular.module("ui.bootstrap.carousel").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>')}),angular.module("ui.bootstrap.datepicker").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">.uib-datepicker .uib-title{width:100%;}.uib-day button,.uib-month button,.uib-year button{min-width:100%;}.uib-datepicker-popup.dropdown-menu{display:block;}.uib-button-bar{padding:10px 9px 2px;}</style>')}),angular.module("ui.bootstrap.timepicker").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">.uib-time input{width:50px;}</style>')}),angular.module("ui.bootstrap.typeahead").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">[uib-typeahead-popup].dropdown-menu{display:block;}</style>')});
\ No newline at end of file
diff --git a/turtles/bower_components/angular-bootstrap/ui-bootstrap.js b/turtles/bower_components/angular-bootstrap/ui-bootstrap.js
new file mode 100644
index 000000000..5721411aa
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/ui-bootstrap.js
@@ -0,0 +1,6449 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 1.1.1 - 2016-01-25
+ * License: MIT
+ */angular.module("ui.bootstrap", ["ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.debounce","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]);
+angular.module('ui.bootstrap.collapse', [])
+
+  .directive('uibCollapse', ['$animate', '$q', '$parse', '$injector', function($animate, $q, $parse, $injector) {
+    var $animateCss = $injector.has('$animateCss') ? $injector.get('$animateCss') : null;
+    return {
+      link: function(scope, element, attrs) {
+        var expandingExpr = $parse(attrs.expanding),
+            expandedExpr = $parse(attrs.expanded),
+            collapsingExpr = $parse(attrs.collapsing),
+            collapsedExpr = $parse(attrs.collapsed);
+
+        if (!scope.$eval(attrs.uibCollapse)) {
+          element.addClass('in')
+            .addClass('collapse')
+            .attr('aria-expanded', true)
+            .attr('aria-hidden', false)
+            .css({height: 'auto'});
+        }
+
+        function expand() {
+          if (element.hasClass('collapse') && element.hasClass('in')) {
+            return;
+          }
+
+          $q.resolve(expandingExpr(scope))
+            .then(function() {
+              element.removeClass('collapse')
+                .addClass('collapsing')
+                .attr('aria-expanded', true)
+                .attr('aria-hidden', false);
+
+              if ($animateCss) {
+                $animateCss(element, {
+                  addClass: 'in',
+                  easing: 'ease',
+                  to: { height: element[0].scrollHeight + 'px' }
+                }).start()['finally'](expandDone);
+              } else {
+                $animate.addClass(element, 'in', {
+                  to: { height: element[0].scrollHeight + 'px' }
+                }).then(expandDone);
+              }
+            });
+        }
+
+        function expandDone() {
+          element.removeClass('collapsing')
+            .addClass('collapse')
+            .css({height: 'auto'});
+          expandedExpr(scope);
+        }
+
+        function collapse() {
+          if (!element.hasClass('collapse') && !element.hasClass('in')) {
+            return collapseDone();
+          }
+
+          $q.resolve(collapsingExpr(scope))
+            .then(function() {
+              element
+                // IMPORTANT: The height must be set before adding "collapsing" class.
+                // Otherwise, the browser attempts to animate from height 0 (in
+                // collapsing class) to the given height here.
+                .css({height: element[0].scrollHeight + 'px'})
+                // initially all panel collapse have the collapse class, this removal
+                // prevents the animation from jumping to collapsed state
+                .removeClass('collapse')
+                .addClass('collapsing')
+                .attr('aria-expanded', false)
+                .attr('aria-hidden', true);
+
+              if ($animateCss) {
+                $animateCss(element, {
+                  removeClass: 'in',
+                  to: {height: '0'}
+                }).start()['finally'](collapseDone);
+              } else {
+                $animate.removeClass(element, 'in', {
+                  to: {height: '0'}
+                }).then(collapseDone);
+              }
+            });
+        }
+
+        function collapseDone() {
+          element.css({height: '0'}); // Required so that collapse works when animation is disabled
+          element.removeClass('collapsing')
+            .addClass('collapse');
+          collapsedExpr(scope);
+        }
+
+        scope.$watch(attrs.uibCollapse, function(shouldCollapse) {
+          if (shouldCollapse) {
+            collapse();
+          } else {
+            expand();
+          }
+        });
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.accordion', ['ui.bootstrap.collapse'])
+
+.constant('uibAccordionConfig', {
+  closeOthers: true
+})
+
+.controller('UibAccordionController', ['$scope', '$attrs', 'uibAccordionConfig', function($scope, $attrs, accordionConfig) {
+  // This array keeps track of the accordion groups
+  this.groups = [];
+
+  // Ensure that all the groups in this accordion are closed, unless close-others explicitly says not to
+  this.closeOthers = function(openGroup) {
+    var closeOthers = angular.isDefined($attrs.closeOthers) ?
+      $scope.$eval($attrs.closeOthers) : accordionConfig.closeOthers;
+    if (closeOthers) {
+      angular.forEach(this.groups, function(group) {
+        if (group !== openGroup) {
+          group.isOpen = false;
+        }
+      });
+    }
+  };
+
+  // This is called from the accordion-group directive to add itself to the accordion
+  this.addGroup = function(groupScope) {
+    var that = this;
+    this.groups.push(groupScope);
+
+    groupScope.$on('$destroy', function(event) {
+      that.removeGroup(groupScope);
+    });
+  };
+
+  // This is called from the accordion-group directive when to remove itself
+  this.removeGroup = function(group) {
+    var index = this.groups.indexOf(group);
+    if (index !== -1) {
+      this.groups.splice(index, 1);
+    }
+  };
+}])
+
+// The accordion directive simply sets up the directive controller
+// and adds an accordion CSS class to itself element.
+.directive('uibAccordion', function() {
+  return {
+    controller: 'UibAccordionController',
+    controllerAs: 'accordion',
+    transclude: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/accordion/accordion.html';
+    }
+  };
+})
+
+// The accordion-group directive indicates a block of html that will expand and collapse in an accordion
+.directive('uibAccordionGroup', function() {
+  return {
+    require: '^uibAccordion',         // We need this directive to be inside an accordion
+    transclude: true,              // It transcludes the contents of the directive into the template
+    replace: true,                // The element containing the directive will be replaced with the template
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/accordion/accordion-group.html';
+    },
+    scope: {
+      heading: '@',               // Interpolate the heading attribute onto this scope
+      isOpen: '=?',
+      isDisabled: '=?'
+    },
+    controller: function() {
+      this.setHeading = function(element) {
+        this.heading = element;
+      };
+    },
+    link: function(scope, element, attrs, accordionCtrl) {
+      accordionCtrl.addGroup(scope);
+
+      scope.openClass = attrs.openClass || 'panel-open';
+      scope.panelClass = attrs.panelClass || 'panel-default';
+      scope.$watch('isOpen', function(value) {
+        element.toggleClass(scope.openClass, !!value);
+        if (value) {
+          accordionCtrl.closeOthers(scope);
+        }
+      });
+
+      scope.toggleOpen = function($event) {
+        if (!scope.isDisabled) {
+          if (!$event || $event.which === 32) {
+            scope.isOpen = !scope.isOpen;
+          }
+        }
+      };
+    }
+  };
+})
+
+// Use accordion-heading below an accordion-group to provide a heading containing HTML
+.directive('uibAccordionHeading', function() {
+  return {
+    transclude: true,   // Grab the contents to be used as the heading
+    template: '',       // In effect remove this element!
+    replace: true,
+    require: '^uibAccordionGroup',
+    link: function(scope, element, attrs, accordionGroupCtrl, transclude) {
+      // Pass the heading to the accordion-group controller
+      // so that it can be transcluded into the right place in the template
+      // [The second parameter to transclude causes the elements to be cloned so that they work in ng-repeat]
+      accordionGroupCtrl.setHeading(transclude(scope, angular.noop));
+    }
+  };
+})
+
+// Use in the accordion-group template to indicate where you want the heading to be transcluded
+// You must provide the property on the accordion-group controller that will hold the transcluded element
+.directive('uibAccordionTransclude', function() {
+  return {
+    require: '^uibAccordionGroup',
+    link: function(scope, element, attrs, controller) {
+      scope.$watch(function() { return controller[attrs.uibAccordionTransclude]; }, function(heading) {
+        if (heading) {
+          element.find('span').html('');
+          element.find('span').append(heading);
+        }
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.alert', [])
+
+.controller('UibAlertController', ['$scope', '$attrs', '$interpolate', '$timeout', function($scope, $attrs, $interpolate, $timeout) {
+  $scope.closeable = !!$attrs.close;
+
+  var dismissOnTimeout = angular.isDefined($attrs.dismissOnTimeout) ?
+    $interpolate($attrs.dismissOnTimeout)($scope.$parent) : null;
+
+  if (dismissOnTimeout) {
+    $timeout(function() {
+      $scope.close();
+    }, parseInt(dismissOnTimeout, 10));
+  }
+}])
+
+.directive('uibAlert', function() {
+  return {
+    controller: 'UibAlertController',
+    controllerAs: 'alert',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/alert/alert.html';
+    },
+    transclude: true,
+    replace: true,
+    scope: {
+      type: '@',
+      close: '&'
+    }
+  };
+});
+
+angular.module('ui.bootstrap.buttons', [])
+
+.constant('uibButtonConfig', {
+  activeClass: 'active',
+  toggleEvent: 'click'
+})
+
+.controller('UibButtonsController', ['uibButtonConfig', function(buttonConfig) {
+  this.activeClass = buttonConfig.activeClass || 'active';
+  this.toggleEvent = buttonConfig.toggleEvent || 'click';
+}])
+
+.directive('uibBtnRadio', ['$parse', function($parse) {
+  return {
+    require: ['uibBtnRadio', 'ngModel'],
+    controller: 'UibButtonsController',
+    controllerAs: 'buttons',
+    link: function(scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+      var uncheckableExpr = $parse(attrs.uibUncheckable);
+
+      element.find('input').css({display: 'none'});
+
+      //model -> UI
+      ngModelCtrl.$render = function() {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, scope.$eval(attrs.uibBtnRadio)));
+      };
+
+      //ui->model
+      element.on(buttonsCtrl.toggleEvent, function() {
+        if (attrs.disabled) {
+          return;
+        }
+
+        var isActive = element.hasClass(buttonsCtrl.activeClass);
+
+        if (!isActive || angular.isDefined(attrs.uncheckable)) {
+          scope.$apply(function() {
+            ngModelCtrl.$setViewValue(isActive ? null : scope.$eval(attrs.uibBtnRadio));
+            ngModelCtrl.$render();
+          });
+        }
+      });
+
+      if (attrs.uibUncheckable) {
+        scope.$watch(uncheckableExpr, function(uncheckable) {
+          attrs.$set('uncheckable', uncheckable ? '' : null);
+        });
+      }
+    }
+  };
+}])
+
+.directive('uibBtnCheckbox', function() {
+  return {
+    require: ['uibBtnCheckbox', 'ngModel'],
+    controller: 'UibButtonsController',
+    controllerAs: 'button',
+    link: function(scope, element, attrs, ctrls) {
+      var buttonsCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      element.find('input').css({display: 'none'});
+
+      function getTrueValue() {
+        return getCheckboxValue(attrs.btnCheckboxTrue, true);
+      }
+
+      function getFalseValue() {
+        return getCheckboxValue(attrs.btnCheckboxFalse, false);
+      }
+
+      function getCheckboxValue(attribute, defaultValue) {
+        return angular.isDefined(attribute) ? scope.$eval(attribute) : defaultValue;
+      }
+
+      //model -> UI
+      ngModelCtrl.$render = function() {
+        element.toggleClass(buttonsCtrl.activeClass, angular.equals(ngModelCtrl.$modelValue, getTrueValue()));
+      };
+
+      //ui->model
+      element.on(buttonsCtrl.toggleEvent, function() {
+        if (attrs.disabled) {
+          return;
+        }
+
+        scope.$apply(function() {
+          ngModelCtrl.$setViewValue(element.hasClass(buttonsCtrl.activeClass) ? getFalseValue() : getTrueValue());
+          ngModelCtrl.$render();
+        });
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.carousel', [])
+
+.controller('UibCarouselController', ['$scope', '$element', '$interval', '$timeout', '$animate', function($scope, $element, $interval, $timeout, $animate) {
+  var self = this,
+    slides = self.slides = $scope.slides = [],
+    SLIDE_DIRECTION = 'uib-slideDirection',
+    currentIndex = -1,
+    currentInterval, isPlaying, bufferedTransitions = [];
+  self.currentSlide = null;
+
+  var destroyed = false;
+
+  self.addSlide = function(slide, element) {
+    slide.$element = element;
+    slides.push(slide);
+    //if this is the first slide or the slide is set to active, select it
+    if (slides.length === 1 || slide.active) {
+      if ($scope.$currentTransition) {
+        $scope.$currentTransition = null;
+      }
+
+      self.select(slides[slides.length - 1]);
+      if (slides.length === 1) {
+        $scope.play();
+      }
+    } else {
+      slide.active = false;
+    }
+  };
+
+  self.getCurrentIndex = function() {
+    if (self.currentSlide && angular.isDefined(self.currentSlide.index)) {
+      return +self.currentSlide.index;
+    }
+    return currentIndex;
+  };
+
+  self.next = $scope.next = function() {
+    var newIndex = (self.getCurrentIndex() + 1) % slides.length;
+
+    if (newIndex === 0 && $scope.noWrap()) {
+      $scope.pause();
+      return;
+    }
+
+    return self.select(getSlideByIndex(newIndex), 'next');
+  };
+
+  self.prev = $scope.prev = function() {
+    var newIndex = self.getCurrentIndex() - 1 < 0 ? slides.length - 1 : self.getCurrentIndex() - 1;
+
+    if ($scope.noWrap() && newIndex === slides.length - 1) {
+      $scope.pause();
+      return;
+    }
+
+    return self.select(getSlideByIndex(newIndex), 'prev');
+  };
+
+  self.removeSlide = function(slide) {
+    if (angular.isDefined(slide.index)) {
+      slides.sort(function(a, b) {
+        return +a.index > +b.index;
+      });
+    }
+
+    var bufferedIndex = bufferedTransitions.indexOf(slide);
+    if (bufferedIndex !== -1) {
+      bufferedTransitions.splice(bufferedIndex, 1);
+    }
+    //get the index of the slide inside the carousel
+    var index = slides.indexOf(slide);
+    slides.splice(index, 1);
+    $timeout(function() {
+      if (slides.length > 0 && slide.active) {
+        if (index >= slides.length) {
+          self.select(slides[index - 1]);
+        } else {
+          self.select(slides[index]);
+        }
+      } else if (currentIndex > index) {
+        currentIndex--;
+      }
+    });
+
+    //clean the currentSlide when no more slide
+    if (slides.length === 0) {
+      self.currentSlide = null;
+      clearBufferedTransitions();
+    }
+  };
+
+  /* direction: "prev" or "next" */
+  self.select = $scope.select = function(nextSlide, direction) {
+    var nextIndex = $scope.indexOfSlide(nextSlide);
+    //Decide direction if it's not given
+    if (direction === undefined) {
+      direction = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
+    }
+    //Prevent this user-triggered transition from occurring if there is already one in progress
+    if (nextSlide && nextSlide !== self.currentSlide && !$scope.$currentTransition) {
+      goNext(nextSlide, nextIndex, direction);
+    } else if (nextSlide && nextSlide !== self.currentSlide && $scope.$currentTransition) {
+      bufferedTransitions.push(nextSlide);
+      nextSlide.active = false;
+    }
+  };
+
+  /* Allow outside people to call indexOf on slides array */
+  $scope.indexOfSlide = function(slide) {
+    return angular.isDefined(slide.index) ? +slide.index : slides.indexOf(slide);
+  };
+
+  $scope.isActive = function(slide) {
+    return self.currentSlide === slide;
+  };
+
+  $scope.pause = function() {
+    if (!$scope.noPause) {
+      isPlaying = false;
+      resetTimer();
+    }
+  };
+
+  $scope.play = function() {
+    if (!isPlaying) {
+      isPlaying = true;
+      restartTimer();
+    }
+  };
+
+  $scope.$on('$destroy', function() {
+    destroyed = true;
+    resetTimer();
+  });
+
+  $scope.$watch('noTransition', function(noTransition) {
+    $animate.enabled($element, !noTransition);
+  });
+
+  $scope.$watch('interval', restartTimer);
+
+  $scope.$watchCollection('slides', resetTransition);
+
+  function clearBufferedTransitions() {
+    while (bufferedTransitions.length) {
+      bufferedTransitions.shift();
+    }
+  }
+
+  function getSlideByIndex(index) {
+    if (angular.isUndefined(slides[index].index)) {
+      return slides[index];
+    }
+    for (var i = 0, l = slides.length; i < l; ++i) {
+      if (slides[i].index === index) {
+        return slides[i];
+      }
+    }
+  }
+
+  function goNext(slide, index, direction) {
+    if (destroyed) { return; }
+
+    angular.extend(slide, {direction: direction, active: true});
+    angular.extend(self.currentSlide || {}, {direction: direction, active: false});
+    if ($animate.enabled($element) && !$scope.$currentTransition &&
+      slide.$element && self.slides.length > 1) {
+      slide.$element.data(SLIDE_DIRECTION, slide.direction);
+      if (self.currentSlide && self.currentSlide.$element) {
+        self.currentSlide.$element.data(SLIDE_DIRECTION, slide.direction);
+      }
+
+      $scope.$currentTransition = true;
+      $animate.on('addClass', slide.$element, function(element, phase) {
+        if (phase === 'close') {
+          $scope.$currentTransition = null;
+          $animate.off('addClass', element);
+          if (bufferedTransitions.length) {
+            var nextSlide = bufferedTransitions.pop();
+            var nextIndex = $scope.indexOfSlide(nextSlide);
+            var nextDirection = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
+            clearBufferedTransitions();
+
+            goNext(nextSlide, nextIndex, nextDirection);
+          }
+        }
+      });
+    }
+
+    self.currentSlide = slide;
+    currentIndex = index;
+
+    //every time you change slides, reset the timer
+    restartTimer();
+  }
+
+  function resetTimer() {
+    if (currentInterval) {
+      $interval.cancel(currentInterval);
+      currentInterval = null;
+    }
+  }
+
+  function resetTransition(slides) {
+    if (!slides.length) {
+      $scope.$currentTransition = null;
+      clearBufferedTransitions();
+    }
+  }
+
+  function restartTimer() {
+    resetTimer();
+    var interval = +$scope.interval;
+    if (!isNaN(interval) && interval > 0) {
+      currentInterval = $interval(timerFn, interval);
+    }
+  }
+
+  function timerFn() {
+    var interval = +$scope.interval;
+    if (isPlaying && !isNaN(interval) && interval > 0 && slides.length) {
+      $scope.next();
+    } else {
+      $scope.pause();
+    }
+  }
+}])
+
+.directive('uibCarousel', function() {
+  return {
+    transclude: true,
+    replace: true,
+    controller: 'UibCarouselController',
+    controllerAs: 'carousel',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/carousel/carousel.html';
+    },
+    scope: {
+      interval: '=',
+      noTransition: '=',
+      noPause: '=',
+      noWrap: '&'
+    }
+  };
+})
+
+.directive('uibSlide', function() {
+  return {
+    require: '^uibCarousel',
+    transclude: true,
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/carousel/slide.html';
+    },
+    scope: {
+      active: '=?',
+      actual: '=?',
+      index: '=?'
+    },
+    link: function (scope, element, attrs, carouselCtrl) {
+      carouselCtrl.addSlide(scope, element);
+      //when the scope is destroyed then remove the slide from the current slides array
+      scope.$on('$destroy', function() {
+        carouselCtrl.removeSlide(scope);
+      });
+
+      scope.$watch('active', function(active) {
+        if (active) {
+          carouselCtrl.select(scope);
+        }
+      });
+    }
+  };
+})
+
+.animation('.item', ['$animateCss',
+function($animateCss) {
+  var SLIDE_DIRECTION = 'uib-slideDirection';
+
+  function removeClass(element, className, callback) {
+    element.removeClass(className);
+    if (callback) {
+      callback();
+    }
+  }
+
+  return {
+    beforeAddClass: function(element, className, done) {
+      if (className === 'active') {
+        var stopped = false;
+        var direction = element.data(SLIDE_DIRECTION);
+        var directionClass = direction === 'next' ? 'left' : 'right';
+        var removeClassFn = removeClass.bind(this, element,
+          directionClass + ' ' + direction, done);
+        element.addClass(direction);
+
+        $animateCss(element, {addClass: directionClass})
+          .start()
+          .done(removeClassFn);
+
+        return function() {
+          stopped = true;
+        };
+      }
+      done();
+    },
+    beforeRemoveClass: function (element, className, done) {
+      if (className === 'active') {
+        var stopped = false;
+        var direction = element.data(SLIDE_DIRECTION);
+        var directionClass = direction === 'next' ? 'left' : 'right';
+        var removeClassFn = removeClass.bind(this, element, directionClass, done);
+
+        $animateCss(element, {addClass: directionClass})
+          .start()
+          .done(removeClassFn);
+
+        return function() {
+          stopped = true;
+        };
+      }
+      done();
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.dateparser', [])
+
+.service('uibDateParser', ['$log', '$locale', 'orderByFilter', function($log, $locale, orderByFilter) {
+  // Pulled from https://github.com/mbostock/d3/blob/master/src/format/requote.js
+  var SPECIAL_CHARACTERS_REGEXP = /[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;
+
+  var localeId;
+  var formatCodeToRegex;
+
+  this.init = function() {
+    localeId = $locale.id;
+
+    this.parsers = {};
+
+    formatCodeToRegex = [
+      {
+        key: 'yyyy',
+        regex: '\\d{4}',
+        apply: function(value) { this.year = +value; }
+      },
+      {
+        key: 'yy',
+        regex: '\\d{2}',
+        apply: function(value) { this.year = +value + 2000; }
+      },
+      {
+        key: 'y',
+        regex: '\\d{1,4}',
+        apply: function(value) { this.year = +value; }
+      },
+      {
+        key: 'M!',
+        regex: '0?[1-9]|1[0-2]',
+        apply: function(value) { this.month = value - 1; }
+      },
+      {
+        key: 'MMMM',
+        regex: $locale.DATETIME_FORMATS.MONTH.join('|'),
+        apply: function(value) { this.month = $locale.DATETIME_FORMATS.MONTH.indexOf(value); }
+      },
+      {
+        key: 'MMM',
+        regex: $locale.DATETIME_FORMATS.SHORTMONTH.join('|'),
+        apply: function(value) { this.month = $locale.DATETIME_FORMATS.SHORTMONTH.indexOf(value); }
+      },
+      {
+        key: 'MM',
+        regex: '0[1-9]|1[0-2]',
+        apply: function(value) { this.month = value - 1; }
+      },
+      {
+        key: 'M',
+        regex: '[1-9]|1[0-2]',
+        apply: function(value) { this.month = value - 1; }
+      },
+      {
+        key: 'd!',
+        regex: '[0-2]?[0-9]{1}|3[0-1]{1}',
+        apply: function(value) { this.date = +value; }
+      },
+      {
+        key: 'dd',
+        regex: '[0-2][0-9]{1}|3[0-1]{1}',
+        apply: function(value) { this.date = +value; }
+      },
+      {
+        key: 'd',
+        regex: '[1-2]?[0-9]{1}|3[0-1]{1}',
+        apply: function(value) { this.date = +value; }
+      },
+      {
+        key: 'EEEE',
+        regex: $locale.DATETIME_FORMATS.DAY.join('|')
+      },
+      {
+        key: 'EEE',
+        regex: $locale.DATETIME_FORMATS.SHORTDAY.join('|')
+      },
+      {
+        key: 'HH',
+        regex: '(?:0|1)[0-9]|2[0-3]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'hh',
+        regex: '0[0-9]|1[0-2]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'H',
+        regex: '1?[0-9]|2[0-3]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'h',
+        regex: '[0-9]|1[0-2]',
+        apply: function(value) { this.hours = +value; }
+      },
+      {
+        key: 'mm',
+        regex: '[0-5][0-9]',
+        apply: function(value) { this.minutes = +value; }
+      },
+      {
+        key: 'm',
+        regex: '[0-9]|[1-5][0-9]',
+        apply: function(value) { this.minutes = +value; }
+      },
+      {
+        key: 'sss',
+        regex: '[0-9][0-9][0-9]',
+        apply: function(value) { this.milliseconds = +value; }
+      },
+      {
+        key: 'ss',
+        regex: '[0-5][0-9]',
+        apply: function(value) { this.seconds = +value; }
+      },
+      {
+        key: 's',
+        regex: '[0-9]|[1-5][0-9]',
+        apply: function(value) { this.seconds = +value; }
+      },
+      {
+        key: 'a',
+        regex: $locale.DATETIME_FORMATS.AMPMS.join('|'),
+        apply: function(value) {
+          if (this.hours === 12) {
+            this.hours = 0;
+          }
+
+          if (value === 'PM') {
+            this.hours += 12;
+          }
+        }
+      },
+      {
+        key: 'Z',
+        regex: '[+-]\\d{4}',
+        apply: function(value) {
+          var matches = value.match(/([+-])(\d{2})(\d{2})/),
+            sign = matches[1],
+            hours = matches[2],
+            minutes = matches[3];
+          this.hours += toInt(sign + hours);
+          this.minutes += toInt(sign + minutes);
+        }
+      },
+      {
+        key: 'ww',
+        regex: '[0-4][0-9]|5[0-3]'
+      },
+      {
+        key: 'w',
+        regex: '[0-9]|[1-4][0-9]|5[0-3]'
+      },
+      {
+        key: 'GGGG',
+        regex: $locale.DATETIME_FORMATS.ERANAMES.join('|').replace(/\s/g, '\\s')
+      },
+      {
+        key: 'GGG',
+        regex: $locale.DATETIME_FORMATS.ERAS.join('|')
+      },
+      {
+        key: 'GG',
+        regex: $locale.DATETIME_FORMATS.ERAS.join('|')
+      },
+      {
+        key: 'G',
+        regex: $locale.DATETIME_FORMATS.ERAS.join('|')
+      }
+    ];
+  };
+
+  this.init();
+
+  function createParser(format) {
+    var map = [], regex = format.split('');
+
+    // check for literal values
+    var quoteIndex = format.indexOf('\'');
+    if (quoteIndex > -1) {
+      var inLiteral = false;
+      format = format.split('');
+      for (var i = quoteIndex; i < format.length; i++) {
+        if (inLiteral) {
+          if (format[i] === '\'') {
+            if (i + 1 < format.length && format[i+1] === '\'') { // escaped single quote
+              format[i+1] = '$';
+              regex[i+1] = '';
+            } else { // end of literal
+              regex[i] = '';
+              inLiteral = false;
+            }
+          }
+          format[i] = '$';
+        } else {
+          if (format[i] === '\'') { // start of literal
+            format[i] = '$';
+            regex[i] = '';
+            inLiteral = true;
+          }
+        }
+      }
+
+      format = format.join('');
+    }
+
+    angular.forEach(formatCodeToRegex, function(data) {
+      var index = format.indexOf(data.key);
+
+      if (index > -1) {
+        format = format.split('');
+
+        regex[index] = '(' + data.regex + ')';
+        format[index] = '$'; // Custom symbol to define consumed part of format
+        for (var i = index + 1, n = index + data.key.length; i < n; i++) {
+          regex[i] = '';
+          format[i] = '$';
+        }
+        format = format.join('');
+
+        map.push({
+          index: index,
+          apply: data.apply,
+          matcher: data.regex
+        });
+      }
+    });
+
+    return {
+      regex: new RegExp('^' + regex.join('') + '$'),
+      map: orderByFilter(map, 'index')
+    };
+  }
+
+  this.parse = function(input, format, baseDate) {
+    if (!angular.isString(input) || !format) {
+      return input;
+    }
+
+    format = $locale.DATETIME_FORMATS[format] || format;
+    format = format.replace(SPECIAL_CHARACTERS_REGEXP, '\\$&');
+
+    if ($locale.id !== localeId) {
+      this.init();
+    }
+
+    if (!this.parsers[format]) {
+      this.parsers[format] = createParser(format);
+    }
+
+    var parser = this.parsers[format],
+        regex = parser.regex,
+        map = parser.map,
+        results = input.match(regex),
+        tzOffset = false;
+    if (results && results.length) {
+      var fields, dt;
+      if (angular.isDate(baseDate) && !isNaN(baseDate.getTime())) {
+        fields = {
+          year: baseDate.getFullYear(),
+          month: baseDate.getMonth(),
+          date: baseDate.getDate(),
+          hours: baseDate.getHours(),
+          minutes: baseDate.getMinutes(),
+          seconds: baseDate.getSeconds(),
+          milliseconds: baseDate.getMilliseconds()
+        };
+      } else {
+        if (baseDate) {
+          $log.warn('dateparser:', 'baseDate is not a valid date');
+        }
+        fields = { year: 1900, month: 0, date: 1, hours: 0, minutes: 0, seconds: 0, milliseconds: 0 };
+      }
+
+      for (var i = 1, n = results.length; i < n; i++) {
+        var mapper = map[i - 1];
+        if (mapper.matcher === 'Z') {
+          tzOffset = true;
+        }
+
+        if (mapper.apply) {
+          mapper.apply.call(fields, results[i]);
+        }
+      }
+
+      var datesetter = tzOffset ? Date.prototype.setUTCFullYear :
+        Date.prototype.setFullYear;
+      var timesetter = tzOffset ? Date.prototype.setUTCHours :
+        Date.prototype.setHours;
+
+      if (isValid(fields.year, fields.month, fields.date)) {
+        if (angular.isDate(baseDate) && !isNaN(baseDate.getTime()) && !tzOffset) {
+          dt = new Date(baseDate);
+          datesetter.call(dt, fields.year, fields.month, fields.date);
+          timesetter.call(dt, fields.hours, fields.minutes,
+            fields.seconds, fields.milliseconds);
+        } else {
+          dt = new Date(0);
+          datesetter.call(dt, fields.year, fields.month, fields.date);
+          timesetter.call(dt, fields.hours || 0, fields.minutes || 0,
+            fields.seconds || 0, fields.milliseconds || 0);
+        }
+      }
+
+      return dt;
+    }
+  };
+
+  // Check if date is valid for specific month (and year for February).
+  // Month: 0 = Jan, 1 = Feb, etc
+  function isValid(year, month, date) {
+    if (date < 1) {
+      return false;
+    }
+
+    if (month === 1 && date > 28) {
+      return date === 29 && (year % 4 === 0 && year % 100 !== 0 || year % 400 === 0);
+    }
+
+    if (month === 3 || month === 5 || month === 8 || month === 10) {
+      return date < 31;
+    }
+
+    return true;
+  }
+
+  function toInt(str) {
+    return parseInt(str, 10);
+  }
+
+  this.toTimezone = toTimezone;
+  this.fromTimezone = fromTimezone;
+  this.timezoneToOffset = timezoneToOffset;
+  this.addDateMinutes = addDateMinutes;
+  this.convertTimezoneToLocal = convertTimezoneToLocal;
+  
+  function toTimezone(date, timezone) {
+    return date && timezone ? convertTimezoneToLocal(date, timezone) : date;
+  }
+
+  function fromTimezone(date, timezone) {
+    return date && timezone ? convertTimezoneToLocal(date, timezone, true) : date;
+  }
+
+  //https://github.com/angular/angular.js/blob/4daafd3dbe6a80d578f5a31df1bb99c77559543e/src/Angular.js#L1207
+  function timezoneToOffset(timezone, fallback) {
+    var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+    return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+  }
+
+  function addDateMinutes(date, minutes) {
+    date = new Date(date.getTime());
+    date.setMinutes(date.getMinutes() + minutes);
+    return date;
+  }
+
+  function convertTimezoneToLocal(date, timezone, reverse) {
+    reverse = reverse ? -1 : 1;
+    var timezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+    return addDateMinutes(date, reverse * (timezoneOffset - date.getTimezoneOffset()));
+  }
+}]);
+
+// Avoiding use of ng-class as it creates a lot of watchers when a class is to be applied to
+// at most one element.
+angular.module('ui.bootstrap.isClass', [])
+.directive('uibIsClass', [
+         '$animate',
+function ($animate) {
+  //                    11111111          22222222
+  var ON_REGEXP = /^\s*([\s\S]+?)\s+on\s+([\s\S]+?)\s*$/;
+  //                    11111111           22222222
+  var IS_REGEXP = /^\s*([\s\S]+?)\s+for\s+([\s\S]+?)\s*$/;
+
+  var dataPerTracked = {};
+
+  return {
+    restrict: 'A',
+    compile: function (tElement, tAttrs) {
+      var linkedScopes = [];
+      var instances = [];
+      var expToData = {};
+      var lastActivated = null;
+      var onExpMatches = tAttrs.uibIsClass.match(ON_REGEXP);
+      var onExp = onExpMatches[2];
+      var expsStr = onExpMatches[1];
+      var exps = expsStr.split(',');
+
+      return linkFn;
+
+      function linkFn(scope, element, attrs) {
+        linkedScopes.push(scope);
+        instances.push({
+          scope: scope,
+          element: element
+        });
+
+        exps.forEach(function (exp, k) {
+          addForExp(exp, scope);
+        });
+
+        scope.$on('$destroy', removeScope);
+      }
+
+      function addForExp(exp, scope) {
+        var matches = exp.match(IS_REGEXP);
+        var clazz = scope.$eval(matches[1]);
+        var compareWithExp = matches[2];
+        var data = expToData[exp];
+        if (!data) {
+          var watchFn = function (compareWithVal) {
+            var newActivated = null;
+            instances.some(function (instance) {
+              var thisVal = instance.scope.$eval(onExp);
+              if (thisVal === compareWithVal) {
+                newActivated = instance;
+                return true;
+              }
+            });
+            if (data.lastActivated !== newActivated) {
+              if (data.lastActivated) {
+                $animate.removeClass(data.lastActivated.element, clazz);
+              }
+              if (newActivated) {
+                $animate.addClass(newActivated.element, clazz);
+              }
+              data.lastActivated = newActivated;
+            }
+          };
+          expToData[exp] = data = {
+            lastActivated: null,
+            scope: scope,
+            watchFn: watchFn,
+            compareWithExp: compareWithExp,
+            watcher: scope.$watch(compareWithExp, watchFn)
+          };
+        }
+        data.watchFn(scope.$eval(compareWithExp));
+      }
+
+      function removeScope(e) {
+        var removedScope = e.targetScope;
+        var index = linkedScopes.indexOf(removedScope);
+        linkedScopes.splice(index, 1);
+        instances.splice(index, 1);
+        if (linkedScopes.length) {
+          var newWatchScope = linkedScopes[0];
+          angular.forEach(expToData, function (data) {
+            if (data.scope === removedScope) {
+              data.watcher = newWatchScope.$watch(data.compareWithExp, data.watchFn);
+              data.scope = newWatchScope;
+            }
+          });
+        }
+        else {
+          expToData = {};
+        }
+      }
+    }
+  };
+}]);
+angular.module('ui.bootstrap.position', [])
+
+/**
+ * A set of utility methods for working with the DOM.
+ * It is meant to be used where we need to absolute-position elements in
+ * relation to another element (this is the case for tooltips, popovers,
+ * typeahead suggestions etc.).
+ */
+  .factory('$uibPosition', ['$document', '$window', function($document, $window) {
+    /**
+     * Used by scrollbarWidth() function to cache scrollbar's width.
+     * Do not access this variable directly, use scrollbarWidth() instead.
+     */
+    var SCROLLBAR_WIDTH;
+    var OVERFLOW_REGEX = {
+      normal: /(auto|scroll)/,
+      hidden: /(auto|scroll|hidden)/
+    };
+    var PLACEMENT_REGEX = {
+      auto: /\s?auto?\s?/i,
+      primary: /^(top|bottom|left|right)$/,
+      secondary: /^(top|bottom|left|right|center)$/,
+      vertical: /^(top|bottom)$/
+    };
+
+    return {
+
+      /**
+       * Provides a raw DOM element from a jQuery/jQLite element.
+       *
+       * @param {element} elem - The element to convert.
+       *
+       * @returns {element} A HTML element.
+       */
+      getRawNode: function(elem) {
+        return elem[0] || elem;
+      },
+
+      /**
+       * Provides a parsed number for a style property.  Strips
+       * units and casts invalid numbers to 0.
+       *
+       * @param {string} value - The style value to parse.
+       *
+       * @returns {number} A valid number.
+       */
+      parseStyle: function(value) {
+        value = parseFloat(value);
+        return isFinite(value) ? value : 0;
+      },
+
+      /**
+       * Provides the closest positioned ancestor.
+       *
+       * @param {element} element - The element to get the offest parent for.
+       *
+       * @returns {element} The closest positioned ancestor.
+       */
+      offsetParent: function(elem) {
+        elem = this.getRawNode(elem);
+
+        var offsetParent = elem.offsetParent || $document[0].documentElement;
+
+        function isStaticPositioned(el) {
+          return ($window.getComputedStyle(el).position || 'static') === 'static';
+        }
+
+        while (offsetParent && offsetParent !== $document[0].documentElement && isStaticPositioned(offsetParent)) {
+          offsetParent = offsetParent.offsetParent;
+        }
+
+        return offsetParent || $document[0].documentElement;
+      },
+
+      /**
+       * Provides the scrollbar width, concept from TWBS measureScrollbar()
+       * function in https://github.com/twbs/bootstrap/blob/master/js/modal.js
+       *
+       * @returns {number} The width of the browser scollbar.
+       */
+      scrollbarWidth: function() {
+        if (angular.isUndefined(SCROLLBAR_WIDTH)) {
+          var scrollElem = angular.element('<div style="position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll;"></div>');
+          $document.find('body').append(scrollElem);
+          SCROLLBAR_WIDTH = scrollElem[0].offsetWidth - scrollElem[0].clientWidth;
+          SCROLLBAR_WIDTH = isFinite(SCROLLBAR_WIDTH) ? SCROLLBAR_WIDTH : 0;
+          scrollElem.remove();
+        }
+
+        return SCROLLBAR_WIDTH;
+      },
+
+      /**
+       * Provides the closest scrollable ancestor.
+       * A port of the jQuery UI scrollParent method:
+       * https://github.com/jquery/jquery-ui/blob/master/ui/scroll-parent.js
+       *
+       * @param {element} elem - The element to find the scroll parent of.
+       * @param {boolean=} [includeHidden=false] - Should scroll style of 'hidden' be considered,
+       *   default is false.
+       *
+       * @returns {element} A HTML element.
+       */
+      scrollParent: function(elem, includeHidden) {
+        elem = this.getRawNode(elem);
+
+        var overflowRegex = includeHidden ? OVERFLOW_REGEX.hidden : OVERFLOW_REGEX.normal;
+        var documentEl = $document[0].documentElement;
+        var elemStyle = $window.getComputedStyle(elem);
+        var excludeStatic = elemStyle.position === 'absolute';
+        var scrollParent = elem.parentElement || documentEl;
+
+        if (scrollParent === documentEl || elemStyle.position === 'fixed') {
+          return documentEl;
+        }
+
+        while (scrollParent.parentElement && scrollParent !== documentEl) {
+          var spStyle = $window.getComputedStyle(scrollParent);
+          if (excludeStatic && spStyle.position !== 'static') {
+            excludeStatic = false;
+          }
+
+          if (!excludeStatic && overflowRegex.test(spStyle.overflow + spStyle.overflowY + spStyle.overflowX)) {
+            break;
+          }
+          scrollParent = scrollParent.parentElement;
+        }
+
+        return scrollParent;
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's position function:
+       * http://api.jquery.com/position/ - distance to closest positioned
+       * ancestor.  Does not account for margins by default like jQuery position.
+       *
+       * @param {element} elem - The element to caclulate the position on.
+       * @param {boolean=} [includeMargins=false] - Should margins be accounted
+       * for, default is false.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**width**: the width of the element</li>
+       *     <li>**height**: the height of the element</li>
+       *     <li>**top**: distance to top edge of offset parent</li>
+       *     <li>**left**: distance to left edge of offset parent</li>
+       *   </ul>
+       */
+      position: function(elem, includeMagins) {
+        elem = this.getRawNode(elem);
+
+        var elemOffset = this.offset(elem);
+        if (includeMagins) {
+          var elemStyle = $window.getComputedStyle(elem);
+          elemOffset.top -= this.parseStyle(elemStyle.marginTop);
+          elemOffset.left -= this.parseStyle(elemStyle.marginLeft);
+        }
+        var parent = this.offsetParent(elem);
+        var parentOffset = {top: 0, left: 0};
+
+        if (parent !== $document[0].documentElement) {
+          parentOffset = this.offset(parent);
+          parentOffset.top += parent.clientTop - parent.scrollTop;
+          parentOffset.left += parent.clientLeft - parent.scrollLeft;
+        }
+
+        return {
+          width: Math.round(angular.isNumber(elemOffset.width) ? elemOffset.width : elem.offsetWidth),
+          height: Math.round(angular.isNumber(elemOffset.height) ? elemOffset.height : elem.offsetHeight),
+          top: Math.round(elemOffset.top - parentOffset.top),
+          left: Math.round(elemOffset.left - parentOffset.left)
+        };
+      },
+
+      /**
+       * Provides read-only equivalent of jQuery's offset function:
+       * http://api.jquery.com/offset/ - distance to viewport.  Does
+       * not account for borders, margins, or padding on the body
+       * element.
+       *
+       * @param {element} elem - The element to calculate the offset on.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**width**: the width of the element</li>
+       *     <li>**height**: the height of the element</li>
+       *     <li>**top**: distance to top edge of viewport</li>
+       *     <li>**right**: distance to bottom edge of viewport</li>
+       *   </ul>
+       */
+      offset: function(elem) {
+        elem = this.getRawNode(elem);
+
+        var elemBCR = elem.getBoundingClientRect();
+        return {
+          width: Math.round(angular.isNumber(elemBCR.width) ? elemBCR.width : elem.offsetWidth),
+          height: Math.round(angular.isNumber(elemBCR.height) ? elemBCR.height : elem.offsetHeight),
+          top: Math.round(elemBCR.top + ($window.pageYOffset || $document[0].documentElement.scrollTop)),
+          left: Math.round(elemBCR.left + ($window.pageXOffset || $document[0].documentElement.scrollLeft))
+        };
+      },
+
+      /**
+       * Provides offset distance to the closest scrollable ancestor
+       * or viewport.  Accounts for border and scrollbar width.
+       *
+       * Right and bottom dimensions represent the distance to the
+       * respective edge of the viewport element.  If the element
+       * edge extends beyond the viewport, a negative value will be
+       * reported.
+       *
+       * @param {element} elem - The element to get the viewport offset for.
+       * @param {boolean=} [useDocument=false] - Should the viewport be the document element instead
+       * of the first scrollable element, default is false.
+       * @param {boolean=} [includePadding=true] - Should the padding on the offset parent element
+       * be accounted for, default is true.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**top**: distance to the top content edge of viewport element</li>
+       *     <li>**bottom**: distance to the bottom content edge of viewport element</li>
+       *     <li>**left**: distance to the left content edge of viewport element</li>
+       *     <li>**right**: distance to the right content edge of viewport element</li>
+       *   </ul>
+       */
+      viewportOffset: function(elem, useDocument, includePadding) {
+        elem = this.getRawNode(elem);
+        includePadding = includePadding !== false ? true : false;
+
+        var elemBCR = elem.getBoundingClientRect();
+        var offsetBCR = {top: 0, left: 0, bottom: 0, right: 0};
+
+        var offsetParent = useDocument ? $document[0].documentElement : this.scrollParent(elem);
+        var offsetParentBCR = offsetParent.getBoundingClientRect();
+
+        offsetBCR.top = offsetParentBCR.top + offsetParent.clientTop;
+        offsetBCR.left = offsetParentBCR.left + offsetParent.clientLeft;
+        if (offsetParent === $document[0].documentElement) {
+          offsetBCR.top += $window.pageYOffset;
+          offsetBCR.left += $window.pageXOffset;
+        }
+        offsetBCR.bottom = offsetBCR.top + offsetParent.clientHeight;
+        offsetBCR.right = offsetBCR.left + offsetParent.clientWidth;
+
+        if (includePadding) {
+          var offsetParentStyle = $window.getComputedStyle(offsetParent);
+          offsetBCR.top += this.parseStyle(offsetParentStyle.paddingTop);
+          offsetBCR.bottom -= this.parseStyle(offsetParentStyle.paddingBottom);
+          offsetBCR.left += this.parseStyle(offsetParentStyle.paddingLeft);
+          offsetBCR.right -= this.parseStyle(offsetParentStyle.paddingRight);
+        }
+
+        return {
+          top: Math.round(elemBCR.top - offsetBCR.top),
+          bottom: Math.round(offsetBCR.bottom - elemBCR.bottom),
+          left: Math.round(elemBCR.left - offsetBCR.left),
+          right: Math.round(offsetBCR.right - elemBCR.right)
+        };
+      },
+
+      /**
+       * Provides an array of placement values parsed from a placement string.
+       * Along with the 'auto' indicator, supported placement strings are:
+       *   <ul>
+       *     <li>top: element on top, horizontally centered on host element.</li>
+       *     <li>top-left: element on top, left edge aligned with host element left edge.</li>
+       *     <li>top-right: element on top, lerightft edge aligned with host element right edge.</li>
+       *     <li>bottom: element on bottom, horizontally centered on host element.</li>
+       *     <li>bottom-left: element on bottom, left edge aligned with host element left edge.</li>
+       *     <li>bottom-right: element on bottom, right edge aligned with host element right edge.</li>
+       *     <li>left: element on left, vertically centered on host element.</li>
+       *     <li>left-top: element on left, top edge aligned with host element top edge.</li>
+       *     <li>left-bottom: element on left, bottom edge aligned with host element bottom edge.</li>
+       *     <li>right: element on right, vertically centered on host element.</li>
+       *     <li>right-top: element on right, top edge aligned with host element top edge.</li>
+       *     <li>right-bottom: element on right, bottom edge aligned with host element bottom edge.</li>
+       *   </ul>
+       * A placement string with an 'auto' indicator is expected to be
+       * space separated from the placement, i.e: 'auto bottom-left'  If
+       * the primary and secondary placement values do not match 'top,
+       * bottom, left, right' then 'top' will be the primary placement and
+       * 'center' will be the secondary placement.  If 'auto' is passed, true
+       * will be returned as the 3rd value of the array.
+       *
+       * @param {string} placement - The placement string to parse.
+       *
+       * @returns {array} An array with the following values
+       * <ul>
+       *   <li>**[0]**: The primary placement.</li>
+       *   <li>**[1]**: The secondary placement.</li>
+       *   <li>**[2]**: If auto is passed: true, else undefined.</li>
+       * </ul>
+       */
+      parsePlacement: function(placement) {
+        var autoPlace = PLACEMENT_REGEX.auto.test(placement);
+        if (autoPlace) {
+          placement = placement.replace(PLACEMENT_REGEX.auto, '');
+        }
+
+        placement = placement.split('-');
+
+        placement[0] = placement[0] || 'top';
+        if (!PLACEMENT_REGEX.primary.test(placement[0])) {
+          placement[0] = 'top';
+        }
+
+        placement[1] = placement[1] || 'center';
+        if (!PLACEMENT_REGEX.secondary.test(placement[1])) {
+          placement[1] = 'center';
+        }
+
+        if (autoPlace) {
+          placement[2] = true;
+        } else {
+          placement[2] = false;
+        }
+
+        return placement;
+      },
+
+      /**
+       * Provides coordinates for an element to be positioned relative to
+       * another element.  Passing 'auto' as part of the placement parameter
+       * will enable smart placement - where the element fits. i.e:
+       * 'auto left-top' will check to see if there is enough space to the left
+       * of the hostElem to fit the targetElem, if not place right (same for secondary
+       * top placement).  Available space is calculated using the viewportOffset
+       * function.
+       *
+       * @param {element} hostElem - The element to position against.
+       * @param {element} targetElem - The element to position.
+       * @param {string=} [placement=top] - The placement for the targetElem,
+       *   default is 'top'. 'center' is assumed as secondary placement for
+       *   'top', 'left', 'right', and 'bottom' placements.  Available placements are:
+       *   <ul>
+       *     <li>top</li>
+       *     <li>top-right</li>
+       *     <li>top-left</li>
+       *     <li>bottom</li>
+       *     <li>bottom-left</li>
+       *     <li>bottom-right</li>
+       *     <li>left</li>
+       *     <li>left-top</li>
+       *     <li>left-bottom</li>
+       *     <li>right</li>
+       *     <li>right-top</li>
+       *     <li>right-bottom</li>
+       *   </ul>
+       * @param {boolean=} [appendToBody=false] - Should the top and left values returned
+       *   be calculated from the body element, default is false.
+       *
+       * @returns {object} An object with the following properties:
+       *   <ul>
+       *     <li>**top**: Value for targetElem top.</li>
+       *     <li>**left**: Value for targetElem left.</li>
+       *     <li>**placement**: The resolved placement.</li>
+       *   </ul>
+       */
+      positionElements: function(hostElem, targetElem, placement, appendToBody) {
+        hostElem = this.getRawNode(hostElem);
+        targetElem = this.getRawNode(targetElem);
+
+        // need to read from prop to support tests.
+        var targetWidth = angular.isDefined(targetElem.offsetWidth) ? targetElem.offsetWidth : targetElem.prop('offsetWidth');
+        var targetHeight = angular.isDefined(targetElem.offsetHeight) ? targetElem.offsetHeight : targetElem.prop('offsetHeight');
+
+        placement = this.parsePlacement(placement);
+
+        var hostElemPos = appendToBody ? this.offset(hostElem) : this.position(hostElem);
+        var targetElemPos = {top: 0, left: 0, placement: ''};
+
+        if (placement[2]) {
+          var viewportOffset = this.viewportOffset(hostElem);
+
+          var targetElemStyle = $window.getComputedStyle(targetElem);
+          var adjustedSize = {
+            width: targetWidth + Math.round(Math.abs(this.parseStyle(targetElemStyle.marginLeft) + this.parseStyle(targetElemStyle.marginRight))),
+            height: targetHeight + Math.round(Math.abs(this.parseStyle(targetElemStyle.marginTop) + this.parseStyle(targetElemStyle.marginBottom)))
+          };
+
+          placement[0] = placement[0] === 'top' && adjustedSize.height > viewportOffset.top && adjustedSize.height <= viewportOffset.bottom ? 'bottom' :
+                         placement[0] === 'bottom' && adjustedSize.height > viewportOffset.bottom && adjustedSize.height <= viewportOffset.top ? 'top' :
+                         placement[0] === 'left' && adjustedSize.width > viewportOffset.left && adjustedSize.width <= viewportOffset.right ? 'right' :
+                         placement[0] === 'right' && adjustedSize.width > viewportOffset.right && adjustedSize.width <= viewportOffset.left ? 'left' :
+                         placement[0];
+
+          placement[1] = placement[1] === 'top' && adjustedSize.height - hostElemPos.height > viewportOffset.bottom && adjustedSize.height - hostElemPos.height <= viewportOffset.top ? 'bottom' :
+                         placement[1] === 'bottom' && adjustedSize.height - hostElemPos.height > viewportOffset.top && adjustedSize.height - hostElemPos.height <= viewportOffset.bottom ? 'top' :
+                         placement[1] === 'left' && adjustedSize.width - hostElemPos.width > viewportOffset.right && adjustedSize.width - hostElemPos.width <= viewportOffset.left ? 'right' :
+                         placement[1] === 'right' && adjustedSize.width - hostElemPos.width > viewportOffset.left && adjustedSize.width - hostElemPos.width <= viewportOffset.right ? 'left' :
+                         placement[1];
+
+          if (placement[1] === 'center') {
+            if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+              var xOverflow = hostElemPos.width / 2 - targetWidth / 2;
+              if (viewportOffset.left + xOverflow < 0 && adjustedSize.width - hostElemPos.width <= viewportOffset.right) {
+                placement[1] = 'left';
+              } else if (viewportOffset.right + xOverflow < 0 && adjustedSize.width - hostElemPos.width <= viewportOffset.left) {
+                placement[1] = 'right';
+              }
+            } else {
+              var yOverflow = hostElemPos.height / 2 - adjustedSize.height / 2;
+              if (viewportOffset.top + yOverflow < 0 && adjustedSize.height - hostElemPos.height <= viewportOffset.bottom) {
+                placement[1] = 'top';
+              } else if (viewportOffset.bottom + yOverflow < 0 && adjustedSize.height - hostElemPos.height <= viewportOffset.top) {
+                placement[1] = 'bottom';
+              }
+            }
+          }
+        }
+
+        switch (placement[0]) {
+          case 'top':
+            targetElemPos.top = hostElemPos.top - targetHeight;
+            break;
+          case 'bottom':
+            targetElemPos.top = hostElemPos.top + hostElemPos.height;
+            break;
+          case 'left':
+            targetElemPos.left = hostElemPos.left - targetWidth;
+            break;
+          case 'right':
+            targetElemPos.left = hostElemPos.left + hostElemPos.width;
+            break;
+        }
+
+        switch (placement[1]) {
+          case 'top':
+            targetElemPos.top = hostElemPos.top;
+            break;
+          case 'bottom':
+            targetElemPos.top = hostElemPos.top + hostElemPos.height - targetHeight;
+            break;
+          case 'left':
+            targetElemPos.left = hostElemPos.left;
+            break;
+          case 'right':
+            targetElemPos.left = hostElemPos.left + hostElemPos.width - targetWidth;
+            break;
+          case 'center':
+            if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+              targetElemPos.left = hostElemPos.left + hostElemPos.width / 2 - targetWidth / 2;
+            } else {
+              targetElemPos.top = hostElemPos.top + hostElemPos.height / 2 - targetHeight / 2;
+            }
+            break;
+        }
+
+        targetElemPos.top = Math.round(targetElemPos.top);
+        targetElemPos.left = Math.round(targetElemPos.left);
+        targetElemPos.placement = placement[1] === 'center' ? placement[0] : placement[0] + '-' + placement[1];
+
+        return targetElemPos;
+      },
+
+      /**
+      * Provides a way for positioning tooltip & dropdown
+      * arrows when using placement options beyond the standard
+      * left, right, top, or bottom.
+      *
+      * @param {element} elem - The tooltip/dropdown element.
+      * @param {string} placement - The placement for the elem.
+      */
+      positionArrow: function(elem, placement) {
+        elem = this.getRawNode(elem);
+
+        var innerElem = elem.querySelector('.tooltip-inner, .popover-inner');
+        if (!innerElem) {
+          return;
+        }
+
+        var isTooltip = angular.element(innerElem).hasClass('tooltip-inner');
+
+        var arrowElem = isTooltip ? elem.querySelector('.tooltip-arrow') : elem.querySelector('.arrow');
+        if (!arrowElem) {
+          return;
+        }
+
+        placement = this.parsePlacement(placement);
+        if (placement[1] === 'center') {
+          // no adjustment necessary - just reset styles
+          angular.element(arrowElem).css({top: '', bottom: '', right: '', left: '', margin: ''});
+          return;
+        }
+
+        var borderProp = 'border-' + placement[0] + '-width';
+        var borderWidth = $window.getComputedStyle(arrowElem)[borderProp];
+
+        var borderRadiusProp = 'border-';
+        if (PLACEMENT_REGEX.vertical.test(placement[0])) {
+          borderRadiusProp += placement[0] + '-' + placement[1];
+        } else {
+          borderRadiusProp += placement[1] + '-' + placement[0];
+        }
+        borderRadiusProp += '-radius';
+        var borderRadius = $window.getComputedStyle(isTooltip ? innerElem : elem)[borderRadiusProp];
+
+        var arrowCss = {
+          top: 'auto',
+          bottom: 'auto',
+          left: 'auto',
+          right: 'auto',
+          margin: 0
+        };
+
+        switch (placement[0]) {
+          case 'top':
+            arrowCss.bottom = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'bottom':
+            arrowCss.top = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'left':
+            arrowCss.right = isTooltip ? '0' : '-' + borderWidth;
+            break;
+          case 'right':
+            arrowCss.left = isTooltip ? '0' : '-' + borderWidth;
+            break;
+        }
+
+        arrowCss[placement[1]] = borderRadius;
+
+        angular.element(arrowElem).css(arrowCss);
+      }
+    };
+  }]);
+
+angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.isClass', 'ui.bootstrap.position'])
+
+.value('$datepickerSuppressError', false)
+
+.constant('uibDatepickerConfig', {
+  datepickerMode: 'day',
+  formatDay: 'dd',
+  formatMonth: 'MMMM',
+  formatYear: 'yyyy',
+  formatDayHeader: 'EEE',
+  formatDayTitle: 'MMMM yyyy',
+  formatMonthTitle: 'yyyy',
+  maxDate: null,
+  maxMode: 'year',
+  minDate: null,
+  minMode: 'day',
+  ngModelOptions: {},
+  shortcutPropagation: false,
+  showWeeks: true,
+  yearColumns: 5,
+  yearRows: 4
+})
+
+.controller('UibDatepickerController', ['$scope', '$attrs', '$parse', '$interpolate', '$locale', '$log', 'dateFilter', 'uibDatepickerConfig', '$datepickerSuppressError', 'uibDateParser',
+  function($scope, $attrs, $parse, $interpolate, $locale, $log, dateFilter, datepickerConfig, $datepickerSuppressError, dateParser) {
+  var self = this,
+      ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl;
+      ngModelOptions = {},
+      watchListeners = [];
+
+  // Modes chain
+  this.modes = ['day', 'month', 'year'];
+
+  // Interpolated configuration attributes
+  angular.forEach(['formatDay', 'formatMonth', 'formatYear', 'formatDayHeader', 'formatDayTitle', 'formatMonthTitle'], function(key) {
+    self[key] = angular.isDefined($attrs[key]) ? $interpolate($attrs[key])($scope.$parent) : datepickerConfig[key];
+  });
+
+  // Evaled configuration attributes
+  angular.forEach(['showWeeks', 'yearRows', 'yearColumns', 'shortcutPropagation'], function(key) {
+    self[key] = angular.isDefined($attrs[key]) ?
+      $scope.$parent.$eval($attrs[key]) : datepickerConfig[key];
+  });
+
+  if (angular.isDefined($attrs.startingDay)) {
+    self.startingDay = $scope.$parent.$eval($attrs.startingDay);
+  } else if (angular.isNumber(datepickerConfig.startingDay)) {
+    self.startingDay = datepickerConfig.startingDay;
+  } else {
+    self.startingDay = ($locale.DATETIME_FORMATS.FIRSTDAYOFWEEK + 8) % 7;
+  }
+
+  // Watchable date attributes
+  angular.forEach(['minDate', 'maxDate'], function(key) {
+    if ($attrs[key]) {
+      watchListeners.push($scope.$parent.$watch($attrs[key], function(value) {
+        self[key] = value ? angular.isDate(value) ? dateParser.fromTimezone(new Date(value), ngModelOptions.timezone) : new Date(dateFilter(value, 'medium')) : null;
+        self.refreshView();
+      }));
+    } else {
+      self[key] = datepickerConfig[key] ? dateParser.fromTimezone(new Date(datepickerConfig[key]), ngModelOptions.timezone) : null;
+    }
+  });
+
+  angular.forEach(['minMode', 'maxMode'], function(key) {
+    if ($attrs[key]) {
+      watchListeners.push($scope.$parent.$watch($attrs[key], function(value) {
+        self[key] = $scope[key] = angular.isDefined(value) ? value : $attrs[key];
+        if (key === 'minMode' && self.modes.indexOf($scope.datepickerMode) < self.modes.indexOf(self[key]) ||
+          key === 'maxMode' && self.modes.indexOf($scope.datepickerMode) > self.modes.indexOf(self[key])) {
+          $scope.datepickerMode = self[key];
+        }
+      }));
+    } else {
+      self[key] = $scope[key] = datepickerConfig[key] || null;
+    }
+  });
+
+  $scope.datepickerMode = $scope.datepickerMode || datepickerConfig.datepickerMode;
+  $scope.uniqueId = 'datepicker-' + $scope.$id + '-' + Math.floor(Math.random() * 10000);
+
+  if (angular.isDefined($attrs.initDate)) {
+    this.activeDate = dateParser.fromTimezone($scope.$parent.$eval($attrs.initDate), ngModelOptions.timezone) || new Date();
+    watchListeners.push($scope.$parent.$watch($attrs.initDate, function(initDate) {
+      if (initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)) {
+        self.activeDate = dateParser.fromTimezone(initDate, ngModelOptions.timezone);
+        self.refreshView();
+      }
+    }));
+  } else {
+    this.activeDate = new Date();
+  }
+
+  $scope.disabled = angular.isDefined($attrs.disabled) || false;
+  if (angular.isDefined($attrs.ngDisabled)) {
+    watchListeners.push($scope.$parent.$watch($attrs.ngDisabled, function(disabled) {
+      $scope.disabled = disabled;
+      self.refreshView();
+    }));
+  }
+
+  $scope.isActive = function(dateObject) {
+    if (self.compare(dateObject.date, self.activeDate) === 0) {
+      $scope.activeDateId = dateObject.uid;
+      return true;
+    }
+    return false;
+  };
+
+  this.init = function(ngModelCtrl_) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelOptions = ngModelCtrl_.$options || datepickerConfig.ngModelOptions;
+
+    if (ngModelCtrl.$modelValue) {
+      this.activeDate = ngModelCtrl.$modelValue;
+    }
+
+    ngModelCtrl.$render = function() {
+      self.render();
+    };
+  };
+
+  this.render = function() {
+    if (ngModelCtrl.$viewValue) {
+      var date = new Date(ngModelCtrl.$viewValue),
+          isValid = !isNaN(date);
+
+      if (isValid) {
+        this.activeDate = dateParser.fromTimezone(date, ngModelOptions.timezone);
+      } else if (!$datepickerSuppressError) {
+        $log.error('Datepicker directive: "ng-model" value must be a Date object');
+      }
+    }
+    this.refreshView();
+  };
+
+  this.refreshView = function() {
+    if (this.element) {
+      $scope.selectedDt = null;
+      this._refreshView();
+      if ($scope.activeDt) {
+        $scope.activeDateId = $scope.activeDt.uid;
+      }
+
+      var date = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+      date = dateParser.fromTimezone(date, ngModelOptions.timezone);
+      ngModelCtrl.$setValidity('dateDisabled', !date ||
+        this.element && !this.isDisabled(date));
+    }
+  };
+
+  this.createDateObject = function(date, format) {
+    var model = ngModelCtrl.$viewValue ? new Date(ngModelCtrl.$viewValue) : null;
+    model = dateParser.fromTimezone(model, ngModelOptions.timezone);
+    var dt = {
+      date: date,
+      label: dateFilter(date, format.replace(/d!/, 'dd')).replace(/M!/, 'MM'),
+      selected: model && this.compare(date, model) === 0,
+      disabled: this.isDisabled(date),
+      current: this.compare(date, new Date()) === 0,
+      customClass: this.customClass(date) || null
+    };
+
+    if (model && this.compare(date, model) === 0) {
+      $scope.selectedDt = dt;
+    }
+
+    if (self.activeDate && this.compare(dt.date, self.activeDate) === 0) {
+      $scope.activeDt = dt;
+    }
+
+    return dt;
+  };
+
+  this.isDisabled = function(date) {
+    return $scope.disabled ||
+      this.minDate && this.compare(date, this.minDate) < 0 ||
+      this.maxDate && this.compare(date, this.maxDate) > 0 ||
+      $attrs.dateDisabled && $scope.dateDisabled({date: date, mode: $scope.datepickerMode});
+  };
+
+  this.customClass = function(date) {
+    return $scope.customClass({date: date, mode: $scope.datepickerMode});
+  };
+
+  // Split array into smaller arrays
+  this.split = function(arr, size) {
+    var arrays = [];
+    while (arr.length > 0) {
+      arrays.push(arr.splice(0, size));
+    }
+    return arrays;
+  };
+
+  $scope.select = function(date) {
+    if ($scope.datepickerMode === self.minMode) {
+      var dt = ngModelCtrl.$viewValue ? dateParser.fromTimezone(new Date(ngModelCtrl.$viewValue), ngModelOptions.timezone) : new Date(0, 0, 0, 0, 0, 0, 0);
+      dt.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
+      dt = dateParser.toTimezone(dt, ngModelOptions.timezone);
+      ngModelCtrl.$setViewValue(dt);
+      ngModelCtrl.$render();
+    } else {
+      self.activeDate = date;
+      $scope.datepickerMode = self.modes[self.modes.indexOf($scope.datepickerMode) - 1];
+    }
+  };
+
+  $scope.move = function(direction) {
+    var year = self.activeDate.getFullYear() + direction * (self.step.years || 0),
+        month = self.activeDate.getMonth() + direction * (self.step.months || 0);
+    self.activeDate.setFullYear(year, month, 1);
+    self.refreshView();
+  };
+
+  $scope.toggleMode = function(direction) {
+    direction = direction || 1;
+
+    if ($scope.datepickerMode === self.maxMode && direction === 1 ||
+      $scope.datepickerMode === self.minMode && direction === -1) {
+      return;
+    }
+
+    $scope.datepickerMode = self.modes[self.modes.indexOf($scope.datepickerMode) + direction];
+  };
+
+  // Key event mapper
+  $scope.keys = { 13: 'enter', 32: 'space', 33: 'pageup', 34: 'pagedown', 35: 'end', 36: 'home', 37: 'left', 38: 'up', 39: 'right', 40: 'down' };
+
+  var focusElement = function() {
+    self.element[0].focus();
+  };
+
+  // Listen for focus requests from popup directive
+  $scope.$on('uib:datepicker.focus', focusElement);
+
+  $scope.keydown = function(evt) {
+    var key = $scope.keys[evt.which];
+
+    if (!key || evt.shiftKey || evt.altKey || $scope.disabled) {
+      return;
+    }
+
+    evt.preventDefault();
+    if (!self.shortcutPropagation) {
+      evt.stopPropagation();
+    }
+
+    if (key === 'enter' || key === 'space') {
+      if (self.isDisabled(self.activeDate)) {
+        return; // do nothing
+      }
+      $scope.select(self.activeDate);
+    } else if (evt.ctrlKey && (key === 'up' || key === 'down')) {
+      $scope.toggleMode(key === 'up' ? 1 : -1);
+    } else {
+      self.handleKeyDown(key, evt);
+      self.refreshView();
+    }
+  };
+
+  $scope.$on("$destroy", function() {
+    //Clear all watch listeners on destroy
+    while (watchListeners.length) {
+      watchListeners.shift()();
+    }
+  });
+}])
+
+.controller('UibDaypickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+  var DAYS_IN_MONTH = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+
+  this.step = { months: 1 };
+  this.element = $element;
+  function getDaysInMonth(year, month) {
+    return month === 1 && year % 4 === 0 &&
+      (year % 100 !== 0 || year % 400 === 0) ? 29 : DAYS_IN_MONTH[month];
+  }
+
+  this.init = function(ctrl) {
+    angular.extend(ctrl, this);
+    scope.showWeeks = ctrl.showWeeks;
+    ctrl.refreshView();
+  };
+
+  this.getDates = function(startDate, n) {
+    var dates = new Array(n), current = new Date(startDate), i = 0, date;
+    while (i < n) {
+      date = new Date(current);
+      dates[i++] = date;
+      current.setDate(current.getDate() + 1);
+    }
+    return dates;
+  };
+
+  this._refreshView = function() {
+    var year = this.activeDate.getFullYear(),
+      month = this.activeDate.getMonth(),
+      firstDayOfMonth = new Date(this.activeDate);
+
+    firstDayOfMonth.setFullYear(year, month, 1);
+
+    var difference = this.startingDay - firstDayOfMonth.getDay(),
+      numDisplayedFromPreviousMonth = difference > 0 ?
+        7 - difference : - difference,
+      firstDate = new Date(firstDayOfMonth);
+
+    if (numDisplayedFromPreviousMonth > 0) {
+      firstDate.setDate(-numDisplayedFromPreviousMonth + 1);
+    }
+
+    // 42 is the number of days on a six-week calendar
+    var days = this.getDates(firstDate, 42);
+    for (var i = 0; i < 42; i ++) {
+      days[i] = angular.extend(this.createDateObject(days[i], this.formatDay), {
+        secondary: days[i].getMonth() !== month,
+        uid: scope.uniqueId + '-' + i
+      });
+    }
+
+    scope.labels = new Array(7);
+    for (var j = 0; j < 7; j++) {
+      scope.labels[j] = {
+        abbr: dateFilter(days[j].date, this.formatDayHeader),
+        full: dateFilter(days[j].date, 'EEEE')
+      };
+    }
+
+    scope.title = dateFilter(this.activeDate, this.formatDayTitle);
+    scope.rows = this.split(days, 7);
+
+    if (scope.showWeeks) {
+      scope.weekNumbers = [];
+      var thursdayIndex = (4 + 7 - this.startingDay) % 7,
+          numWeeks = scope.rows.length;
+      for (var curWeek = 0; curWeek < numWeeks; curWeek++) {
+        scope.weekNumbers.push(
+          getISO8601WeekNumber(scope.rows[curWeek][thursdayIndex].date));
+      }
+    }
+  };
+
+  this.compare = function(date1, date2) {
+    var _date1 = new Date(date1.getFullYear(), date1.getMonth(), date1.getDate());
+    var _date2 = new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+    _date1.setFullYear(date1.getFullYear());
+    _date2.setFullYear(date2.getFullYear());
+    return _date1 - _date2;
+  };
+
+  function getISO8601WeekNumber(date) {
+    var checkDate = new Date(date);
+    checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7)); // Thursday
+    var time = checkDate.getTime();
+    checkDate.setMonth(0); // Compare with Jan 1
+    checkDate.setDate(1);
+    return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+  }
+
+  this.handleKeyDown = function(key, evt) {
+    var date = this.activeDate.getDate();
+
+    if (key === 'left') {
+      date = date - 1;
+    } else if (key === 'up') {
+      date = date - 7;
+    } else if (key === 'right') {
+      date = date + 1;
+    } else if (key === 'down') {
+      date = date + 7;
+    } else if (key === 'pageup' || key === 'pagedown') {
+      var month = this.activeDate.getMonth() + (key === 'pageup' ? - 1 : 1);
+      this.activeDate.setMonth(month, 1);
+      date = Math.min(getDaysInMonth(this.activeDate.getFullYear(), this.activeDate.getMonth()), date);
+    } else if (key === 'home') {
+      date = 1;
+    } else if (key === 'end') {
+      date = getDaysInMonth(this.activeDate.getFullYear(), this.activeDate.getMonth());
+    }
+    this.activeDate.setDate(date);
+  };
+}])
+
+.controller('UibMonthpickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+  this.step = { years: 1 };
+  this.element = $element;
+
+  this.init = function(ctrl) {
+    angular.extend(ctrl, this);
+    ctrl.refreshView();
+  };
+
+  this._refreshView = function() {
+    var months = new Array(12),
+        year = this.activeDate.getFullYear(),
+        date;
+
+    for (var i = 0; i < 12; i++) {
+      date = new Date(this.activeDate);
+      date.setFullYear(year, i, 1);
+      months[i] = angular.extend(this.createDateObject(date, this.formatMonth), {
+        uid: scope.uniqueId + '-' + i
+      });
+    }
+
+    scope.title = dateFilter(this.activeDate, this.formatMonthTitle);
+    scope.rows = this.split(months, 3);
+  };
+
+  this.compare = function(date1, date2) {
+    var _date1 = new Date(date1.getFullYear(), date1.getMonth());
+    var _date2 = new Date(date2.getFullYear(), date2.getMonth());
+    _date1.setFullYear(date1.getFullYear());
+    _date2.setFullYear(date2.getFullYear());
+    return _date1 - _date2;
+  };
+
+  this.handleKeyDown = function(key, evt) {
+    var date = this.activeDate.getMonth();
+
+    if (key === 'left') {
+      date = date - 1;
+    } else if (key === 'up') {
+      date = date - 3;
+    } else if (key === 'right') {
+      date = date + 1;
+    } else if (key === 'down') {
+      date = date + 3;
+    } else if (key === 'pageup' || key === 'pagedown') {
+      var year = this.activeDate.getFullYear() + (key === 'pageup' ? - 1 : 1);
+      this.activeDate.setFullYear(year);
+    } else if (key === 'home') {
+      date = 0;
+    } else if (key === 'end') {
+      date = 11;
+    }
+    this.activeDate.setMonth(date);
+  };
+}])
+
+.controller('UibYearpickerController', ['$scope', '$element', 'dateFilter', function(scope, $element, dateFilter) {
+  var columns, range;
+  this.element = $element;
+
+  function getStartingYear(year) {
+    return parseInt((year - 1) / range, 10) * range + 1;
+  }
+
+  this.yearpickerInit = function() {
+    columns = this.yearColumns;
+    range = this.yearRows * columns;
+    this.step = { years: range };
+  };
+
+  this._refreshView = function() {
+    var years = new Array(range), date;
+
+    for (var i = 0, start = getStartingYear(this.activeDate.getFullYear()); i < range; i++) {
+      date = new Date(this.activeDate);
+      date.setFullYear(start + i, 0, 1);
+      years[i] = angular.extend(this.createDateObject(date, this.formatYear), {
+        uid: scope.uniqueId + '-' + i
+      });
+    }
+
+    scope.title = [years[0].label, years[range - 1].label].join(' - ');
+    scope.rows = this.split(years, columns);
+    scope.columns = columns;
+  };
+
+  this.compare = function(date1, date2) {
+    return date1.getFullYear() - date2.getFullYear();
+  };
+
+  this.handleKeyDown = function(key, evt) {
+    var date = this.activeDate.getFullYear();
+
+    if (key === 'left') {
+      date = date - 1;
+    } else if (key === 'up') {
+      date = date - columns;
+    } else if (key === 'right') {
+      date = date + 1;
+    } else if (key === 'down') {
+      date = date + columns;
+    } else if (key === 'pageup' || key === 'pagedown') {
+      date += (key === 'pageup' ? - 1 : 1) * range;
+    } else if (key === 'home') {
+      date = getStartingYear(this.activeDate.getFullYear());
+    } else if (key === 'end') {
+      date = getStartingYear(this.activeDate.getFullYear()) + range - 1;
+    }
+    this.activeDate.setFullYear(date);
+  };
+}])
+
+.directive('uibDatepicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/datepicker.html';
+    },
+    scope: {
+      datepickerMode: '=?',
+      dateDisabled: '&',
+      customClass: '&',
+      shortcutPropagation: '&?'
+    },
+    require: ['uibDatepicker', '^ngModel'],
+    controller: 'UibDatepickerController',
+    controllerAs: 'datepicker',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      datepickerCtrl.init(ngModelCtrl);
+    }
+  };
+})
+
+.directive('uibDaypicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/day.html';
+    },
+    require: ['^uibDatepicker', 'uibDaypicker'],
+    controller: 'UibDaypickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0],
+        daypickerCtrl = ctrls[1];
+
+      daypickerCtrl.init(datepickerCtrl);
+    }
+  };
+})
+
+.directive('uibMonthpicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/month.html';
+    },
+    require: ['^uibDatepicker', 'uibMonthpicker'],
+    controller: 'UibMonthpickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var datepickerCtrl = ctrls[0],
+        monthpickerCtrl = ctrls[1];
+
+      monthpickerCtrl.init(datepickerCtrl);
+    }
+  };
+})
+
+.directive('uibYearpicker', function() {
+  return {
+    replace: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/year.html';
+    },
+    require: ['^uibDatepicker', 'uibYearpicker'],
+    controller: 'UibYearpickerController',
+    link: function(scope, element, attrs, ctrls) {
+      var ctrl = ctrls[0];
+      angular.extend(ctrl, ctrls[1]);
+      ctrl.yearpickerInit();
+
+      ctrl.refreshView();
+    }
+  };
+})
+
+.constant('uibDatepickerPopupConfig', {
+  altInputFormats: [],
+  appendToBody: false,
+  clearText: 'Clear',
+  closeOnDateSelection: true,
+  closeText: 'Done',
+  currentText: 'Today',
+  datepickerPopup: 'yyyy-MM-dd',
+  datepickerPopupTemplateUrl: 'uib/template/datepicker/popup.html',
+  datepickerTemplateUrl: 'uib/template/datepicker/datepicker.html',
+  html5Types: {
+    date: 'yyyy-MM-dd',
+    'datetime-local': 'yyyy-MM-ddTHH:mm:ss.sss',
+    'month': 'yyyy-MM'
+  },
+  onOpenFocus: true,
+  showButtonBar: true
+})
+
+.controller('UibDatepickerPopupController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$document', '$rootScope', '$uibPosition', 'dateFilter', 'uibDateParser', 'uibDatepickerPopupConfig', '$timeout', 'uibDatepickerConfig',
+function(scope, element, attrs, $compile, $parse, $document, $rootScope, $position, dateFilter, dateParser, datepickerPopupConfig, $timeout, datepickerConfig) {
+  var cache = {},
+    isHtml5DateInput = false;
+  var dateFormat, closeOnDateSelection, appendToBody, onOpenFocus,
+    datepickerPopupTemplateUrl, datepickerTemplateUrl, popupEl, datepickerEl,
+    ngModel, ngModelOptions, $popup, altInputFormats, watchListeners = [];
+
+  scope.watchData = {};
+
+  this.init = function(_ngModel_) {
+    ngModel = _ngModel_;
+    ngModelOptions = _ngModel_.$options || datepickerConfig.ngModelOptions;
+    closeOnDateSelection = angular.isDefined(attrs.closeOnDateSelection) ? scope.$parent.$eval(attrs.closeOnDateSelection) : datepickerPopupConfig.closeOnDateSelection;
+    appendToBody = angular.isDefined(attrs.datepickerAppendToBody) ? scope.$parent.$eval(attrs.datepickerAppendToBody) : datepickerPopupConfig.appendToBody;
+    onOpenFocus = angular.isDefined(attrs.onOpenFocus) ? scope.$parent.$eval(attrs.onOpenFocus) : datepickerPopupConfig.onOpenFocus;
+    datepickerPopupTemplateUrl = angular.isDefined(attrs.datepickerPopupTemplateUrl) ? attrs.datepickerPopupTemplateUrl : datepickerPopupConfig.datepickerPopupTemplateUrl;
+    datepickerTemplateUrl = angular.isDefined(attrs.datepickerTemplateUrl) ? attrs.datepickerTemplateUrl : datepickerPopupConfig.datepickerTemplateUrl;
+    altInputFormats = angular.isDefined(attrs.altInputFormats) ? scope.$parent.$eval(attrs.altInputFormats) : datepickerPopupConfig.altInputFormats;
+
+    scope.showButtonBar = angular.isDefined(attrs.showButtonBar) ? scope.$parent.$eval(attrs.showButtonBar) : datepickerPopupConfig.showButtonBar;
+
+    if (datepickerPopupConfig.html5Types[attrs.type]) {
+      dateFormat = datepickerPopupConfig.html5Types[attrs.type];
+      isHtml5DateInput = true;
+    } else {
+      dateFormat = attrs.uibDatepickerPopup || datepickerPopupConfig.datepickerPopup;
+      attrs.$observe('uibDatepickerPopup', function(value, oldValue) {
+        var newDateFormat = value || datepickerPopupConfig.datepickerPopup;
+        // Invalidate the $modelValue to ensure that formatters re-run
+        // FIXME: Refactor when PR is merged: https://github.com/angular/angular.js/pull/10764
+        if (newDateFormat !== dateFormat) {
+          dateFormat = newDateFormat;
+          ngModel.$modelValue = null;
+
+          if (!dateFormat) {
+            throw new Error('uibDatepickerPopup must have a date format specified.');
+          }
+        }
+      });
+    }
+
+    if (!dateFormat) {
+      throw new Error('uibDatepickerPopup must have a date format specified.');
+    }
+
+    if (isHtml5DateInput && attrs.uibDatepickerPopup) {
+      throw new Error('HTML5 date input types do not support custom formats.');
+    }
+
+    // popup element used to display calendar
+    popupEl = angular.element('<div uib-datepicker-popup-wrap><div uib-datepicker></div></div>');
+    scope.ngModelOptions = angular.copy(ngModelOptions);
+    scope.ngModelOptions.timezone = null;
+    popupEl.attr({
+      'ng-model': 'date',
+      'ng-model-options': 'ngModelOptions',
+      'ng-change': 'dateSelection(date)',
+      'template-url': datepickerPopupTemplateUrl
+    });
+
+    // datepicker element
+    datepickerEl = angular.element(popupEl.children()[0]);
+    datepickerEl.attr('template-url', datepickerTemplateUrl);
+
+    if (isHtml5DateInput) {
+      if (attrs.type === 'month') {
+        datepickerEl.attr('datepicker-mode', '"month"');
+        datepickerEl.attr('min-mode', 'month');
+      }
+    }
+
+    if (scope.datepickerOptions) {
+      angular.forEach(scope.datepickerOptions, function(value, option) {
+        // Ignore this options, will be managed later
+        if (['minDate', 'maxDate', 'minMode', 'maxMode', 'initDate', 'datepickerMode'].indexOf(option) === -1) {
+          datepickerEl.attr(cameltoDash(option), value);
+        } else {
+          datepickerEl.attr(cameltoDash(option), 'datepickerOptions.' + option);
+        }
+      });
+    }
+
+    angular.forEach(['minMode', 'maxMode', 'datepickerMode', 'shortcutPropagation'], function(key) {
+      if (attrs[key]) {
+        var getAttribute = $parse(attrs[key]);
+        var propConfig = {
+          get: function() {
+            return getAttribute(scope.$parent);
+          }
+        };
+
+        datepickerEl.attr(cameltoDash(key), 'watchData.' + key);
+
+        // Propagate changes from datepicker to outside
+        if (key === 'datepickerMode') {
+          var setAttribute = getAttribute.assign;
+          propConfig.set = function(v) {
+            setAttribute(scope.$parent, v);
+          };
+        }
+
+        Object.defineProperty(scope.watchData, key, propConfig);
+      }
+    });
+
+    angular.forEach(['minDate', 'maxDate', 'initDate'], function(key) {
+      if (attrs[key]) {
+        var getAttribute = $parse(attrs[key]);
+
+        watchListeners.push(scope.$parent.$watch(getAttribute, function(value) {
+          if (key === 'minDate' || key === 'maxDate') {
+            if (value === null) {
+              cache[key] = null;
+            } else if (angular.isDate(value)) {
+              cache[key] = dateParser.fromTimezone(new Date(value), ngModelOptions.timezone);
+            } else {
+              cache[key] = new Date(dateFilter(value, 'medium'));
+            }
+
+            scope.watchData[key] = value === null ? null : cache[key];
+          } else {
+            scope.watchData[key] = dateParser.fromTimezone(new Date(value), ngModelOptions.timezone);
+          }
+        }));
+
+        datepickerEl.attr(cameltoDash(key), 'watchData.' + key);
+      }
+    });
+
+    if (attrs.dateDisabled) {
+      datepickerEl.attr('date-disabled', 'dateDisabled({ date: date, mode: mode })');
+    }
+
+    angular.forEach(['formatDay', 'formatMonth', 'formatYear', 'formatDayHeader', 'formatDayTitle', 'formatMonthTitle', 'showWeeks', 'startingDay', 'yearRows', 'yearColumns'], function(key) {
+      if (angular.isDefined(attrs[key])) {
+        datepickerEl.attr(cameltoDash(key), attrs[key]);
+      }
+    });
+
+    if (attrs.customClass) {
+      datepickerEl.attr('custom-class', 'customClass({ date: date, mode: mode })');
+    }
+
+    if (!isHtml5DateInput) {
+      // Internal API to maintain the correct ng-invalid-[key] class
+      ngModel.$$parserName = 'date';
+      ngModel.$validators.date = validator;
+      ngModel.$parsers.unshift(parseDate);
+      ngModel.$formatters.push(function(value) {
+        if (ngModel.$isEmpty(value)) {
+          scope.date = value;
+          return value;
+        }
+        scope.date = dateParser.fromTimezone(value, ngModelOptions.timezone);
+        dateFormat = dateFormat.replace(/M!/, 'MM')
+            .replace(/d!/, 'dd');
+
+        return dateFilter(scope.date, dateFormat);
+      });
+    } else {
+      ngModel.$formatters.push(function(value) {
+        scope.date = dateParser.fromTimezone(value, ngModelOptions.timezone);
+        return value;
+      });
+    }
+
+    // Detect changes in the view from the text box
+    ngModel.$viewChangeListeners.push(function() {
+      scope.date = parseDateString(ngModel.$viewValue);
+    });
+
+    element.on('keydown', inputKeydownBind);
+
+    $popup = $compile(popupEl)(scope);
+    // Prevent jQuery cache memory leak (template is now redundant after linking)
+    popupEl.remove();
+
+    if (appendToBody) {
+      $document.find('body').append($popup);
+    } else {
+      element.after($popup);
+    }
+
+    scope.$on('$destroy', function() {
+      if (scope.isOpen === true) {
+        if (!$rootScope.$$phase) {
+          scope.$apply(function() {
+            scope.isOpen = false;
+          });
+        }
+      }
+
+      $popup.remove();
+      element.off('keydown', inputKeydownBind);
+      $document.off('click', documentClickBind);
+
+      //Clear all watch listeners on destroy
+      while (watchListeners.length) {
+        watchListeners.shift()();
+      }
+    });
+  };
+
+  scope.getText = function(key) {
+    return scope[key + 'Text'] || datepickerPopupConfig[key + 'Text'];
+  };
+
+  scope.isDisabled = function(date) {
+    if (date === 'today') {
+      date = new Date();
+    }
+
+    return scope.watchData.minDate && scope.compare(date, cache.minDate) < 0 ||
+        scope.watchData.maxDate && scope.compare(date, cache.maxDate) > 0;
+  };
+
+  scope.compare = function(date1, date2) {
+    return new Date(date1.getFullYear(), date1.getMonth(), date1.getDate()) - new Date(date2.getFullYear(), date2.getMonth(), date2.getDate());
+  };
+
+  // Inner change
+  scope.dateSelection = function(dt) {
+    if (angular.isDefined(dt)) {
+      scope.date = dt;
+    }
+    var date = scope.date ? dateFilter(scope.date, dateFormat) : null; // Setting to NULL is necessary for form validators to function
+    element.val(date);
+    ngModel.$setViewValue(date);
+
+    if (closeOnDateSelection) {
+      scope.isOpen = false;
+      element[0].focus();
+    }
+  };
+
+  scope.keydown = function(evt) {
+    if (evt.which === 27) {
+      evt.stopPropagation();
+      scope.isOpen = false;
+      element[0].focus();
+    }
+  };
+
+  scope.select = function(date) {
+    if (date === 'today') {
+      var today = new Date();
+      if (angular.isDate(scope.date)) {
+        date = new Date(scope.date);
+        date.setFullYear(today.getFullYear(), today.getMonth(), today.getDate());
+      } else {
+        date = new Date(today.setHours(0, 0, 0, 0));
+      }
+    }
+    scope.dateSelection(date);
+  };
+
+  scope.close = function() {
+    scope.isOpen = false;
+    element[0].focus();
+  };
+
+  scope.disabled = angular.isDefined(attrs.disabled) || false;
+  if (attrs.ngDisabled) {
+    watchListeners.push(scope.$parent.$watch($parse(attrs.ngDisabled), function(disabled) {
+      scope.disabled = disabled;
+    }));
+  }
+
+  scope.$watch('isOpen', function(value) {
+    if (value) {
+      if (!scope.disabled) {
+        scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+        scope.position.top = scope.position.top + element.prop('offsetHeight');
+
+        $timeout(function() {
+          if (onOpenFocus) {
+            scope.$broadcast('uib:datepicker.focus');
+          }
+          $document.on('click', documentClickBind);
+        }, 0, false);
+      } else {
+        scope.isOpen = false;
+      }
+    } else {
+      $document.off('click', documentClickBind);
+    }
+  });
+
+  function cameltoDash(string) {
+    return string.replace(/([A-Z])/g, function($1) { return '-' + $1.toLowerCase(); });
+  }
+
+  function parseDateString(viewValue) {
+    var date = dateParser.parse(viewValue, dateFormat, scope.date);
+    if (isNaN(date)) {
+      for (var i = 0; i < altInputFormats.length; i++) {
+        date = dateParser.parse(viewValue, altInputFormats[i], scope.date);
+        if (!isNaN(date)) {
+          return date;
+        }
+      }
+    }
+    return date;
+  }
+
+  function parseDate(viewValue) {
+    if (angular.isNumber(viewValue)) {
+      // presumably timestamp to date object
+      viewValue = new Date(viewValue);
+    }
+
+    if (!viewValue) {
+      return null;
+    }
+
+    if (angular.isDate(viewValue) && !isNaN(viewValue)) {
+      return viewValue;
+    }
+
+    if (angular.isString(viewValue)) {
+      var date = parseDateString(viewValue);
+      if (!isNaN(date)) {
+        return dateParser.toTimezone(date, ngModelOptions.timezone);
+      }
+    }
+
+    return ngModel.$options && ngModel.$options.allowInvalid ? viewValue : undefined;
+  }
+
+  function validator(modelValue, viewValue) {
+    var value = modelValue || viewValue;
+
+    if (!attrs.ngRequired && !value) {
+      return true;
+    }
+
+    if (angular.isNumber(value)) {
+      value = new Date(value);
+    }
+
+    if (!value) {
+      return true;
+    }
+
+    if (angular.isDate(value) && !isNaN(value)) {
+      return true;
+    }
+
+    if (angular.isString(value)) {
+      return !isNaN(parseDateString(viewValue));
+    }
+
+    return false;
+  }
+
+  function documentClickBind(event) {
+    if (!scope.isOpen && scope.disabled) {
+      return;
+    }
+
+    var popup = $popup[0];
+    var dpContainsTarget = element[0].contains(event.target);
+    // The popup node may not be an element node
+    // In some browsers (IE) only element nodes have the 'contains' function
+    var popupContainsTarget = popup.contains !== undefined && popup.contains(event.target);
+    if (scope.isOpen && !(dpContainsTarget || popupContainsTarget)) {
+      scope.$apply(function() {
+        scope.isOpen = false;
+      });
+    }
+  }
+
+  function inputKeydownBind(evt) {
+    if (evt.which === 27 && scope.isOpen) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      scope.$apply(function() {
+        scope.isOpen = false;
+      });
+      element[0].focus();
+    } else if (evt.which === 40 && !scope.isOpen) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      scope.$apply(function() {
+        scope.isOpen = true;
+      });
+    }
+  }
+}])
+
+.directive('uibDatepickerPopup', function() {
+  return {
+    require: ['ngModel', 'uibDatepickerPopup'],
+    controller: 'UibDatepickerPopupController',
+    scope: {
+      datepickerOptions: '=?',
+      isOpen: '=?',
+      currentText: '@',
+      clearText: '@',
+      closeText: '@',
+      dateDisabled: '&',
+      customClass: '&'
+    },
+    link: function(scope, element, attrs, ctrls) {
+      var ngModel = ctrls[0],
+        ctrl = ctrls[1];
+
+      ctrl.init(ngModel);
+    }
+  };
+})
+
+.directive('uibDatepickerPopupWrap', function() {
+  return {
+    replace: true,
+    transclude: true,
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/datepicker/popup.html';
+    }
+  };
+});
+
+angular.module('ui.bootstrap.debounce', [])
+/**
+ * A helper, internal service that debounces a function
+ */
+  .factory('$$debounce', ['$timeout', function($timeout) {
+    return function(callback, debounceTime) {
+      var timeoutPromise;
+
+      return function() {
+        var self = this;
+        var args = Array.prototype.slice.call(arguments);
+        if (timeoutPromise) {
+          $timeout.cancel(timeoutPromise);
+        }
+
+        timeoutPromise = $timeout(function() {
+          callback.apply(self, args);
+        }, debounceTime);
+      };
+    };
+  }]);
+
+angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
+
+.constant('uibDropdownConfig', {
+  appendToOpenClass: 'uib-dropdown-open',
+  openClass: 'open'
+})
+
+.service('uibDropdownService', ['$document', '$rootScope', function($document, $rootScope) {
+  var openScope = null;
+
+  this.open = function(dropdownScope) {
+    if (!openScope) {
+      $document.on('click', closeDropdown);
+      $document.on('keydown', keybindFilter);
+    }
+
+    if (openScope && openScope !== dropdownScope) {
+      openScope.isOpen = false;
+    }
+
+    openScope = dropdownScope;
+  };
+
+  this.close = function(dropdownScope) {
+    if (openScope === dropdownScope) {
+      openScope = null;
+      $document.off('click', closeDropdown);
+      $document.off('keydown', keybindFilter);
+    }
+  };
+
+  var closeDropdown = function(evt) {
+    // This method may still be called during the same mouse event that
+    // unbound this event handler. So check openScope before proceeding.
+    if (!openScope) { return; }
+
+    if (evt && openScope.getAutoClose() === 'disabled') { return; }
+
+    if (evt && evt.which === 3) { return; }
+
+    var toggleElement = openScope.getToggleElement();
+    if (evt && toggleElement && toggleElement[0].contains(evt.target)) {
+      return;
+    }
+
+    var dropdownElement = openScope.getDropdownElement();
+    if (evt && openScope.getAutoClose() === 'outsideClick' &&
+      dropdownElement && dropdownElement[0].contains(evt.target)) {
+      return;
+    }
+
+    openScope.isOpen = false;
+
+    if (!$rootScope.$$phase) {
+      openScope.$apply();
+    }
+  };
+
+  var keybindFilter = function(evt) {
+    if (evt.which === 27) {
+      openScope.focusToggleElement();
+      closeDropdown();
+    } else if (openScope.isKeynavEnabled() && [38, 40].indexOf(evt.which) !== -1 && openScope.isOpen) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      openScope.focusDropdownEntry(evt.which);
+    }
+  };
+}])
+
+.controller('UibDropdownController', ['$scope', '$element', '$attrs', '$parse', 'uibDropdownConfig', 'uibDropdownService', '$animate', '$uibPosition', '$document', '$compile', '$templateRequest', function($scope, $element, $attrs, $parse, dropdownConfig, uibDropdownService, $animate, $position, $document, $compile, $templateRequest) {
+  var self = this,
+    scope = $scope.$new(), // create a child scope so we are not polluting original one
+    templateScope,
+    appendToOpenClass = dropdownConfig.appendToOpenClass,
+    openClass = dropdownConfig.openClass,
+    getIsOpen,
+    setIsOpen = angular.noop,
+    toggleInvoker = $attrs.onToggle ? $parse($attrs.onToggle) : angular.noop,
+    appendToBody = false,
+    appendTo = null,
+    keynavEnabled = false,
+    selectedOption = null,
+    body = $document.find('body');
+
+  $element.addClass('dropdown');
+
+  this.init = function() {
+    if ($attrs.isOpen) {
+      getIsOpen = $parse($attrs.isOpen);
+      setIsOpen = getIsOpen.assign;
+
+      $scope.$watch(getIsOpen, function(value) {
+        scope.isOpen = !!value;
+      });
+    }
+
+    if (angular.isDefined($attrs.dropdownAppendTo)) {
+      var appendToEl = $parse($attrs.dropdownAppendTo)(scope);
+      if (appendToEl) {
+        appendTo = angular.element(appendToEl);
+      }
+    }
+
+    appendToBody = angular.isDefined($attrs.dropdownAppendToBody);
+    keynavEnabled = angular.isDefined($attrs.keyboardNav);
+
+    if (appendToBody && !appendTo) {
+      appendTo = body;
+    }
+
+    if (appendTo && self.dropdownMenu) {
+      appendTo.append(self.dropdownMenu);
+      $element.on('$destroy', function handleDestroyEvent() {
+        self.dropdownMenu.remove();
+      });
+    }
+  };
+
+  this.toggle = function(open) {
+    return scope.isOpen = arguments.length ? !!open : !scope.isOpen;
+  };
+
+  // Allow other directives to watch status
+  this.isOpen = function() {
+    return scope.isOpen;
+  };
+
+  scope.getToggleElement = function() {
+    return self.toggleElement;
+  };
+
+  scope.getAutoClose = function() {
+    return $attrs.autoClose || 'always'; //or 'outsideClick' or 'disabled'
+  };
+
+  scope.getElement = function() {
+    return $element;
+  };
+
+  scope.isKeynavEnabled = function() {
+    return keynavEnabled;
+  };
+
+  scope.focusDropdownEntry = function(keyCode) {
+    var elems = self.dropdownMenu ? //If append to body is used.
+      angular.element(self.dropdownMenu).find('a') :
+      $element.find('ul').eq(0).find('a');
+
+    switch (keyCode) {
+      case 40: {
+        if (!angular.isNumber(self.selectedOption)) {
+          self.selectedOption = 0;
+        } else {
+          self.selectedOption = self.selectedOption === elems.length - 1 ?
+            self.selectedOption :
+            self.selectedOption + 1;
+        }
+        break;
+      }
+      case 38: {
+        if (!angular.isNumber(self.selectedOption)) {
+          self.selectedOption = elems.length - 1;
+        } else {
+          self.selectedOption = self.selectedOption === 0 ?
+            0 : self.selectedOption - 1;
+        }
+        break;
+      }
+    }
+    elems[self.selectedOption].focus();
+  };
+
+  scope.getDropdownElement = function() {
+    return self.dropdownMenu;
+  };
+
+  scope.focusToggleElement = function() {
+    if (self.toggleElement) {
+      self.toggleElement[0].focus();
+    }
+  };
+
+  scope.$watch('isOpen', function(isOpen, wasOpen) {
+    if (appendTo && self.dropdownMenu) {
+      var pos = $position.positionElements($element, self.dropdownMenu, 'bottom-left', true),
+        css,
+        rightalign;
+
+      css = {
+        top: pos.top + 'px',
+        display: isOpen ? 'block' : 'none'
+      };
+
+      rightalign = self.dropdownMenu.hasClass('dropdown-menu-right');
+      if (!rightalign) {
+        css.left = pos.left + 'px';
+        css.right = 'auto';
+      } else {
+        css.left = 'auto';
+        css.right = window.innerWidth -
+          (pos.left + $element.prop('offsetWidth')) + 'px';
+      }
+
+      // Need to adjust our positioning to be relative to the appendTo container
+      // if it's not the body element
+      if (!appendToBody) {
+        var appendOffset = $position.offset(appendTo);
+
+        css.top = pos.top - appendOffset.top + 'px';
+
+        if (!rightalign) {
+          css.left = pos.left - appendOffset.left + 'px';
+        } else {
+          css.right = window.innerWidth -
+            (pos.left - appendOffset.left + $element.prop('offsetWidth')) + 'px';
+        }
+      }
+
+      self.dropdownMenu.css(css);
+    }
+
+    var openContainer = appendTo ? appendTo : $element;
+
+    $animate[isOpen ? 'addClass' : 'removeClass'](openContainer, appendTo ? appendToOpenClass : openClass).then(function() {
+      if (angular.isDefined(isOpen) && isOpen !== wasOpen) {
+        toggleInvoker($scope, { open: !!isOpen });
+      }
+    });
+
+    if (isOpen) {
+      if (self.dropdownMenuTemplateUrl) {
+        $templateRequest(self.dropdownMenuTemplateUrl).then(function(tplContent) {
+          templateScope = scope.$new();
+          $compile(tplContent.trim())(templateScope, function(dropdownElement) {
+            var newEl = dropdownElement;
+            self.dropdownMenu.replaceWith(newEl);
+            self.dropdownMenu = newEl;
+          });
+        });
+      }
+
+      scope.focusToggleElement();
+      uibDropdownService.open(scope);
+    } else {
+      if (self.dropdownMenuTemplateUrl) {
+        if (templateScope) {
+          templateScope.$destroy();
+        }
+        var newEl = angular.element('<ul class="dropdown-menu"></ul>');
+        self.dropdownMenu.replaceWith(newEl);
+        self.dropdownMenu = newEl;
+      }
+
+      uibDropdownService.close(scope);
+      self.selectedOption = null;
+    }
+
+    if (angular.isFunction(setIsOpen)) {
+      setIsOpen($scope, isOpen);
+    }
+  });
+
+  $scope.$on('$locationChangeSuccess', function() {
+    if (scope.getAutoClose() !== 'disabled') {
+      scope.isOpen = false;
+    }
+  });
+}])
+
+.directive('uibDropdown', function() {
+  return {
+    controller: 'UibDropdownController',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      dropdownCtrl.init();
+    }
+  };
+})
+
+.directive('uibDropdownMenu', function() {
+  return {
+    restrict: 'A',
+    require: '?^uibDropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if (!dropdownCtrl || angular.isDefined(attrs.dropdownNested)) {
+        return;
+      }
+
+      element.addClass('dropdown-menu');
+
+      var tplUrl = attrs.templateUrl;
+      if (tplUrl) {
+        dropdownCtrl.dropdownMenuTemplateUrl = tplUrl;
+      }
+
+      if (!dropdownCtrl.dropdownMenu) {
+        dropdownCtrl.dropdownMenu = element;
+      }
+    }
+  };
+})
+
+.directive('uibDropdownToggle', function() {
+  return {
+    require: '?^uibDropdown',
+    link: function(scope, element, attrs, dropdownCtrl) {
+      if (!dropdownCtrl) {
+        return;
+      }
+
+      element.addClass('dropdown-toggle');
+
+      dropdownCtrl.toggleElement = element;
+
+      var toggleDropdown = function(event) {
+        event.preventDefault();
+
+        if (!element.hasClass('disabled') && !attrs.disabled) {
+          scope.$apply(function() {
+            dropdownCtrl.toggle();
+          });
+        }
+      };
+
+      element.bind('click', toggleDropdown);
+
+      // WAI-ARIA
+      element.attr({ 'aria-haspopup': true, 'aria-expanded': false });
+      scope.$watch(dropdownCtrl.isOpen, function(isOpen) {
+        element.attr('aria-expanded', !!isOpen);
+      });
+
+      scope.$on('$destroy', function() {
+        element.unbind('click', toggleDropdown);
+      });
+    }
+  };
+});
+
+angular.module('ui.bootstrap.stackedMap', [])
+/**
+ * A helper, internal data structure that acts as a map but also allows getting / removing
+ * elements in the LIFO order
+ */
+  .factory('$$stackedMap', function() {
+    return {
+      createNew: function() {
+        var stack = [];
+
+        return {
+          add: function(key, value) {
+            stack.push({
+              key: key,
+              value: value
+            });
+          },
+          get: function(key) {
+            for (var i = 0; i < stack.length; i++) {
+              if (key === stack[i].key) {
+                return stack[i];
+              }
+            }
+          },
+          keys: function() {
+            var keys = [];
+            for (var i = 0; i < stack.length; i++) {
+              keys.push(stack[i].key);
+            }
+            return keys;
+          },
+          top: function() {
+            return stack[stack.length - 1];
+          },
+          remove: function(key) {
+            var idx = -1;
+            for (var i = 0; i < stack.length; i++) {
+              if (key === stack[i].key) {
+                idx = i;
+                break;
+              }
+            }
+            return stack.splice(idx, 1)[0];
+          },
+          removeTop: function() {
+            return stack.splice(stack.length - 1, 1)[0];
+          },
+          length: function() {
+            return stack.length;
+          }
+        };
+      }
+    };
+  });
+angular.module('ui.bootstrap.modal', ['ui.bootstrap.stackedMap'])
+/**
+ * A helper, internal data structure that stores all references attached to key
+ */
+  .factory('$$multiMap', function() {
+    return {
+      createNew: function() {
+        var map = {};
+
+        return {
+          entries: function() {
+            return Object.keys(map).map(function(key) {
+              return {
+                key: key,
+                value: map[key]
+              };
+            });
+          },
+          get: function(key) {
+            return map[key];
+          },
+          hasKey: function(key) {
+            return !!map[key];
+          },
+          keys: function() {
+            return Object.keys(map);
+          },
+          put: function(key, value) {
+            if (!map[key]) {
+              map[key] = [];
+            }
+
+            map[key].push(value);
+          },
+          remove: function(key, value) {
+            var values = map[key];
+
+            if (!values) {
+              return;
+            }
+
+            var idx = values.indexOf(value);
+
+            if (idx !== -1) {
+              values.splice(idx, 1);
+            }
+
+            if (!values.length) {
+              delete map[key];
+            }
+          }
+        };
+      }
+    };
+  })
+
+/**
+ * Pluggable resolve mechanism for the modal resolve resolution
+ * Supports UI Router's $resolve service
+ */
+  .provider('$uibResolve', function() {
+    var resolve = this;
+    this.resolver = null;
+
+    this.setResolver = function(resolver) {
+      this.resolver = resolver;
+    };
+
+    this.$get = ['$injector', '$q', function($injector, $q) {
+      var resolver = resolve.resolver ? $injector.get(resolve.resolver) : null;
+      return {
+        resolve: function(invocables, locals, parent, self) {
+          if (resolver) {
+            return resolver.resolve(invocables, locals, parent, self);
+          }
+
+          var promises = [];
+
+          angular.forEach(invocables, function(value) {
+            if (angular.isFunction(value) || angular.isArray(value)) {
+              promises.push($q.resolve($injector.invoke(value)));
+            } else if (angular.isString(value)) {
+              promises.push($q.resolve($injector.get(value)));
+            } else {
+              promises.push($q.resolve(value));
+            }
+          });
+
+          return $q.all(promises).then(function(resolves) {
+            var resolveObj = {};
+            var resolveIter = 0;
+            angular.forEach(invocables, function(value, key) {
+              resolveObj[key] = resolves[resolveIter++];
+            });
+
+            return resolveObj;
+          });
+        }
+      };
+    }];
+  })
+
+/**
+ * A helper directive for the $modal service. It creates a backdrop element.
+ */
+  .directive('uibModalBackdrop', ['$animateCss', '$injector', '$uibModalStack',
+  function($animateCss, $injector, $modalStack) {
+    return {
+      replace: true,
+      templateUrl: 'uib/template/modal/backdrop.html',
+      compile: function(tElement, tAttrs) {
+        tElement.addClass(tAttrs.backdropClass);
+        return linkFn;
+      }
+    };
+
+    function linkFn(scope, element, attrs) {
+      if (attrs.modalInClass) {
+        $animateCss(element, {
+          addClass: attrs.modalInClass
+        }).start();
+
+        scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) {
+          var done = setIsAsync();
+          if (scope.modalOptions.animation) {
+            $animateCss(element, {
+              removeClass: attrs.modalInClass
+            }).start().then(done);
+          } else {
+            done();
+          }
+        });
+      }
+    }
+  }])
+
+  .directive('uibModalWindow', ['$uibModalStack', '$q', '$animate', '$animateCss', '$document',
+  function($modalStack, $q, $animate, $animateCss, $document) {
+    return {
+      scope: {
+        index: '@'
+      },
+      replace: true,
+      transclude: true,
+      templateUrl: function(tElement, tAttrs) {
+        return tAttrs.templateUrl || 'uib/template/modal/window.html';
+      },
+      link: function(scope, element, attrs) {
+        element.addClass(attrs.windowClass || '');
+        element.addClass(attrs.windowTopClass || '');
+        scope.size = attrs.size;
+
+        scope.close = function(evt) {
+          var modal = $modalStack.getTop();
+          if (modal && modal.value.backdrop &&
+            modal.value.backdrop !== 'static' &&
+            evt.target === evt.currentTarget) {
+            evt.preventDefault();
+            evt.stopPropagation();
+            $modalStack.dismiss(modal.key, 'backdrop click');
+          }
+        };
+
+        // moved from template to fix issue #2280
+        element.on('click', scope.close);
+
+        // This property is only added to the scope for the purpose of detecting when this directive is rendered.
+        // We can detect that by using this property in the template associated with this directive and then use
+        // {@link Attribute#$observe} on it. For more details please see {@link TableColumnResize}.
+        scope.$isRendered = true;
+
+        // Deferred object that will be resolved when this modal is render.
+        var modalRenderDeferObj = $q.defer();
+        // Observe function will be called on next digest cycle after compilation, ensuring that the DOM is ready.
+        // In order to use this way of finding whether DOM is ready, we need to observe a scope property used in modal's template.
+        attrs.$observe('modalRender', function(value) {
+          if (value === 'true') {
+            modalRenderDeferObj.resolve();
+          }
+        });
+
+        modalRenderDeferObj.promise.then(function() {
+          var animationPromise = null;
+
+          if (attrs.modalInClass) {
+            animationPromise = $animateCss(element, {
+              addClass: attrs.modalInClass
+            }).start();
+
+            scope.$on($modalStack.NOW_CLOSING_EVENT, function(e, setIsAsync) {
+              var done = setIsAsync();
+              if ($animateCss) {
+                $animateCss(element, {
+                  removeClass: attrs.modalInClass
+                }).start().then(done);
+              } else {
+                $animate.removeClass(element, attrs.modalInClass).then(done);
+              }
+            });
+          }
+
+
+          $q.when(animationPromise).then(function() {
+            /**
+             * If something within the freshly-opened modal already has focus (perhaps via a
+             * directive that causes focus). then no need to try and focus anything.
+             */
+            if (!($document[0].activeElement && element[0].contains($document[0].activeElement))) {
+              var inputWithAutofocus = element[0].querySelector('[autofocus]');
+              /**
+               * Auto-focusing of a freshly-opened modal element causes any child elements
+               * with the autofocus attribute to lose focus. This is an issue on touch
+               * based devices which will show and then hide the onscreen keyboard.
+               * Attempts to refocus the autofocus element via JavaScript will not reopen
+               * the onscreen keyboard. Fixed by updated the focusing logic to only autofocus
+               * the modal element if the modal does not contain an autofocus element.
+               */
+              if (inputWithAutofocus) {
+                inputWithAutofocus.focus();
+              } else {
+                element[0].focus();
+              }
+            }
+          });
+
+          // Notify {@link $modalStack} that modal is rendered.
+          var modal = $modalStack.getTop();
+          if (modal) {
+            $modalStack.modalRendered(modal.key);
+          }
+        });
+      }
+    };
+  }])
+
+  .directive('uibModalAnimationClass', function() {
+    return {
+      compile: function(tElement, tAttrs) {
+        if (tAttrs.modalAnimation) {
+          tElement.addClass(tAttrs.uibModalAnimationClass);
+        }
+      }
+    };
+  })
+
+  .directive('uibModalTransclude', function() {
+    return {
+      link: function(scope, element, attrs, controller, transclude) {
+        transclude(scope.$parent, function(clone) {
+          element.empty();
+          element.append(clone);
+        });
+      }
+    };
+  })
+
+  .factory('$uibModalStack', ['$animate', '$animateCss', '$document',
+    '$compile', '$rootScope', '$q', '$$multiMap', '$$stackedMap',
+    function($animate, $animateCss, $document, $compile, $rootScope, $q, $$multiMap, $$stackedMap) {
+      var OPENED_MODAL_CLASS = 'modal-open';
+
+      var backdropDomEl, backdropScope;
+      var openedWindows = $$stackedMap.createNew();
+      var openedClasses = $$multiMap.createNew();
+      var $modalStack = {
+        NOW_CLOSING_EVENT: 'modal.stack.now-closing'
+      };
+
+      //Modal focus behavior
+      var focusableElementList;
+      var focusIndex = 0;
+      var tababbleSelector = 'a[href], area[href], input:not([disabled]), ' +
+        'button:not([disabled]),select:not([disabled]), textarea:not([disabled]), ' +
+        'iframe, object, embed, *[tabindex], *[contenteditable=true]';
+
+      function backdropIndex() {
+        var topBackdropIndex = -1;
+        var opened = openedWindows.keys();
+        for (var i = 0; i < opened.length; i++) {
+          if (openedWindows.get(opened[i]).value.backdrop) {
+            topBackdropIndex = i;
+          }
+        }
+        return topBackdropIndex;
+      }
+
+      $rootScope.$watch(backdropIndex, function(newBackdropIndex) {
+        if (backdropScope) {
+          backdropScope.index = newBackdropIndex;
+        }
+      });
+
+      function removeModalWindow(modalInstance, elementToReceiveFocus) {
+        var modalWindow = openedWindows.get(modalInstance).value;
+        var appendToElement = modalWindow.appendTo;
+
+        //clean up the stack
+        openedWindows.remove(modalInstance);
+
+        removeAfterAnimate(modalWindow.modalDomEl, modalWindow.modalScope, function() {
+          var modalBodyClass = modalWindow.openedClass || OPENED_MODAL_CLASS;
+          openedClasses.remove(modalBodyClass, modalInstance);
+          appendToElement.toggleClass(modalBodyClass, openedClasses.hasKey(modalBodyClass));
+          toggleTopWindowClass(true);
+        }, modalWindow.closedDeferred);
+        checkRemoveBackdrop();
+
+        //move focus to specified element if available, or else to body
+        if (elementToReceiveFocus && elementToReceiveFocus.focus) {
+          elementToReceiveFocus.focus();
+        } else if (appendToElement.focus) {
+          appendToElement.focus();
+        }
+      }
+
+      // Add or remove "windowTopClass" from the top window in the stack
+      function toggleTopWindowClass(toggleSwitch) {
+        var modalWindow;
+
+        if (openedWindows.length() > 0) {
+          modalWindow = openedWindows.top().value;
+          modalWindow.modalDomEl.toggleClass(modalWindow.windowTopClass || '', toggleSwitch);
+        }
+      }
+
+      function checkRemoveBackdrop() {
+        //remove backdrop if no longer needed
+        if (backdropDomEl && backdropIndex() === -1) {
+          var backdropScopeRef = backdropScope;
+          removeAfterAnimate(backdropDomEl, backdropScope, function() {
+            backdropScopeRef = null;
+          });
+          backdropDomEl = undefined;
+          backdropScope = undefined;
+        }
+      }
+
+      function removeAfterAnimate(domEl, scope, done, closedDeferred) {
+        var asyncDeferred;
+        var asyncPromise = null;
+        var setIsAsync = function() {
+          if (!asyncDeferred) {
+            asyncDeferred = $q.defer();
+            asyncPromise = asyncDeferred.promise;
+          }
+
+          return function asyncDone() {
+            asyncDeferred.resolve();
+          };
+        };
+        scope.$broadcast($modalStack.NOW_CLOSING_EVENT, setIsAsync);
+
+        // Note that it's intentional that asyncPromise might be null.
+        // That's when setIsAsync has not been called during the
+        // NOW_CLOSING_EVENT broadcast.
+        return $q.when(asyncPromise).then(afterAnimating);
+
+        function afterAnimating() {
+          if (afterAnimating.done) {
+            return;
+          }
+          afterAnimating.done = true;
+
+          $animateCss(domEl, {
+            event: 'leave'
+          }).start().then(function() {
+            domEl.remove();
+            if (closedDeferred) {
+              closedDeferred.resolve();
+            }
+          });
+
+          scope.$destroy();
+          if (done) {
+            done();
+          }
+        }
+      }
+
+      $document.on('keydown', keydownListener);
+
+      $rootScope.$on('$destroy', function() {
+        $document.off('keydown', keydownListener);
+      });
+
+      function keydownListener(evt) {
+        if (evt.isDefaultPrevented()) {
+          return evt;
+        }
+
+        var modal = openedWindows.top();
+        if (modal) {
+          switch (evt.which) {
+            case 27: {
+              if (modal.value.keyboard) {
+                evt.preventDefault();
+                $rootScope.$apply(function() {
+                  $modalStack.dismiss(modal.key, 'escape key press');
+                });
+              }
+              break;
+            }
+            case 9: {
+              $modalStack.loadFocusElementList(modal);
+              var focusChanged = false;
+              if (evt.shiftKey) {
+                if ($modalStack.isFocusInFirstItem(evt)) {
+                  focusChanged = $modalStack.focusLastFocusableElement();
+                }
+              } else {
+                if ($modalStack.isFocusInLastItem(evt)) {
+                  focusChanged = $modalStack.focusFirstFocusableElement();
+                }
+              }
+
+              if (focusChanged) {
+                evt.preventDefault();
+                evt.stopPropagation();
+              }
+              break;
+            }
+          }
+        }
+      }
+
+      $modalStack.open = function(modalInstance, modal) {
+        var modalOpener = $document[0].activeElement,
+          modalBodyClass = modal.openedClass || OPENED_MODAL_CLASS;
+
+        toggleTopWindowClass(false);
+
+        openedWindows.add(modalInstance, {
+          deferred: modal.deferred,
+          renderDeferred: modal.renderDeferred,
+          closedDeferred: modal.closedDeferred,
+          modalScope: modal.scope,
+          backdrop: modal.backdrop,
+          keyboard: modal.keyboard,
+          openedClass: modal.openedClass,
+          windowTopClass: modal.windowTopClass,
+          animation: modal.animation,
+          appendTo: modal.appendTo
+        });
+
+        openedClasses.put(modalBodyClass, modalInstance);
+
+        var appendToElement = modal.appendTo,
+            currBackdropIndex = backdropIndex();
+
+        if (!appendToElement.length) {
+          throw new Error('appendTo element not found. Make sure that the element passed is in DOM.');
+        }
+
+        if (currBackdropIndex >= 0 && !backdropDomEl) {
+          backdropScope = $rootScope.$new(true);
+          backdropScope.modalOptions = modal;
+          backdropScope.index = currBackdropIndex;
+          backdropDomEl = angular.element('<div uib-modal-backdrop="modal-backdrop"></div>');
+          backdropDomEl.attr('backdrop-class', modal.backdropClass);
+          if (modal.animation) {
+            backdropDomEl.attr('modal-animation', 'true');
+          }
+          $compile(backdropDomEl)(backdropScope);
+          $animate.enter(backdropDomEl, appendToElement);
+        }
+
+        var angularDomEl = angular.element('<div uib-modal-window="modal-window"></div>');
+        angularDomEl.attr({
+          'template-url': modal.windowTemplateUrl,
+          'window-class': modal.windowClass,
+          'window-top-class': modal.windowTopClass,
+          'size': modal.size,
+          'index': openedWindows.length() - 1,
+          'animate': 'animate'
+        }).html(modal.content);
+        if (modal.animation) {
+          angularDomEl.attr('modal-animation', 'true');
+        }
+
+        $animate.enter($compile(angularDomEl)(modal.scope), appendToElement)
+          .then(function() {
+            $animate.addClass(appendToElement, modalBodyClass);
+          });
+
+        openedWindows.top().value.modalDomEl = angularDomEl;
+        openedWindows.top().value.modalOpener = modalOpener;
+
+        $modalStack.clearFocusListCache();
+      };
+
+      function broadcastClosing(modalWindow, resultOrReason, closing) {
+        return !modalWindow.value.modalScope.$broadcast('modal.closing', resultOrReason, closing).defaultPrevented;
+      }
+
+      $modalStack.close = function(modalInstance, result) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, result, true)) {
+          modalWindow.value.modalScope.$$uibDestructionScheduled = true;
+          modalWindow.value.deferred.resolve(result);
+          removeModalWindow(modalInstance, modalWindow.value.modalOpener);
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismiss = function(modalInstance, reason) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow && broadcastClosing(modalWindow, reason, false)) {
+          modalWindow.value.modalScope.$$uibDestructionScheduled = true;
+          modalWindow.value.deferred.reject(reason);
+          removeModalWindow(modalInstance, modalWindow.value.modalOpener);
+          return true;
+        }
+        return !modalWindow;
+      };
+
+      $modalStack.dismissAll = function(reason) {
+        var topModal = this.getTop();
+        while (topModal && this.dismiss(topModal.key, reason)) {
+          topModal = this.getTop();
+        }
+      };
+
+      $modalStack.getTop = function() {
+        return openedWindows.top();
+      };
+
+      $modalStack.modalRendered = function(modalInstance) {
+        var modalWindow = openedWindows.get(modalInstance);
+        if (modalWindow) {
+          modalWindow.value.renderDeferred.resolve();
+        }
+      };
+
+      $modalStack.focusFirstFocusableElement = function() {
+        if (focusableElementList.length > 0) {
+          focusableElementList[0].focus();
+          return true;
+        }
+        return false;
+      };
+      $modalStack.focusLastFocusableElement = function() {
+        if (focusableElementList.length > 0) {
+          focusableElementList[focusableElementList.length - 1].focus();
+          return true;
+        }
+        return false;
+      };
+
+      $modalStack.isFocusInFirstItem = function(evt) {
+        if (focusableElementList.length > 0) {
+          return (evt.target || evt.srcElement) === focusableElementList[0];
+        }
+        return false;
+      };
+
+      $modalStack.isFocusInLastItem = function(evt) {
+        if (focusableElementList.length > 0) {
+          return (evt.target || evt.srcElement) === focusableElementList[focusableElementList.length - 1];
+        }
+        return false;
+      };
+
+      $modalStack.clearFocusListCache = function() {
+        focusableElementList = [];
+        focusIndex = 0;
+      };
+
+      $modalStack.loadFocusElementList = function(modalWindow) {
+        if (focusableElementList === undefined || !focusableElementList.length) {
+          if (modalWindow) {
+            var modalDomE1 = modalWindow.value.modalDomEl;
+            if (modalDomE1 && modalDomE1.length) {
+              focusableElementList = modalDomE1[0].querySelectorAll(tababbleSelector);
+            }
+          }
+        }
+      };
+
+      return $modalStack;
+    }])
+
+  .provider('$uibModal', function() {
+    var $modalProvider = {
+      options: {
+        animation: true,
+        backdrop: true, //can also be false or 'static'
+        keyboard: true
+      },
+      $get: ['$rootScope', '$q', '$document', '$templateRequest', '$controller', '$uibResolve', '$uibModalStack',
+        function ($rootScope, $q, $document, $templateRequest, $controller, $uibResolve, $modalStack) {
+          var $modal = {};
+
+          function getTemplatePromise(options) {
+            return options.template ? $q.when(options.template) :
+              $templateRequest(angular.isFunction(options.templateUrl) ?
+                options.templateUrl() : options.templateUrl);
+          }
+
+          var promiseChain = null;
+          $modal.getPromiseChain = function() {
+            return promiseChain;
+          };
+
+          $modal.open = function(modalOptions) {
+            var modalResultDeferred = $q.defer();
+            var modalOpenedDeferred = $q.defer();
+            var modalClosedDeferred = $q.defer();
+            var modalRenderDeferred = $q.defer();
+
+            //prepare an instance of a modal to be injected into controllers and returned to a caller
+            var modalInstance = {
+              result: modalResultDeferred.promise,
+              opened: modalOpenedDeferred.promise,
+              closed: modalClosedDeferred.promise,
+              rendered: modalRenderDeferred.promise,
+              close: function (result) {
+                return $modalStack.close(modalInstance, result);
+              },
+              dismiss: function (reason) {
+                return $modalStack.dismiss(modalInstance, reason);
+              }
+            };
+
+            //merge and clean up options
+            modalOptions = angular.extend({}, $modalProvider.options, modalOptions);
+            modalOptions.resolve = modalOptions.resolve || {};
+            modalOptions.appendTo = modalOptions.appendTo || $document.find('body').eq(0);
+
+            //verify options
+            if (!modalOptions.template && !modalOptions.templateUrl) {
+              throw new Error('One of template or templateUrl options is required.');
+            }
+
+            var templateAndResolvePromise =
+              $q.all([getTemplatePromise(modalOptions), $uibResolve.resolve(modalOptions.resolve, {}, null, null)]);
+
+            function resolveWithTemplate() {
+              return templateAndResolvePromise;
+            }
+
+            // Wait for the resolution of the existing promise chain.
+            // Then switch to our own combined promise dependency (regardless of how the previous modal fared).
+            // Then add to $modalStack and resolve opened.
+            // Finally clean up the chain variable if no subsequent modal has overwritten it.
+            var samePromise;
+            samePromise = promiseChain = $q.all([promiseChain])
+              .then(resolveWithTemplate, resolveWithTemplate)
+              .then(function resolveSuccess(tplAndVars) {
+                var providedScope = modalOptions.scope || $rootScope;
+
+                var modalScope = providedScope.$new();
+                modalScope.$close = modalInstance.close;
+                modalScope.$dismiss = modalInstance.dismiss;
+
+                modalScope.$on('$destroy', function() {
+                  if (!modalScope.$$uibDestructionScheduled) {
+                    modalScope.$dismiss('$uibUnscheduledDestruction');
+                  }
+                });
+
+                var ctrlInstance, ctrlLocals = {};
+
+                //controllers
+                if (modalOptions.controller) {
+                  ctrlLocals.$scope = modalScope;
+                  ctrlLocals.$uibModalInstance = modalInstance;
+                  angular.forEach(tplAndVars[1], function(value, key) {
+                    ctrlLocals[key] = value;
+                  });
+
+                  ctrlInstance = $controller(modalOptions.controller, ctrlLocals);
+                  if (modalOptions.controllerAs) {
+                    if (modalOptions.bindToController) {
+                      ctrlInstance.$close = modalScope.$close;
+                      ctrlInstance.$dismiss = modalScope.$dismiss;
+                      angular.extend(ctrlInstance, providedScope);
+                    }
+
+                    modalScope[modalOptions.controllerAs] = ctrlInstance;
+                  }
+                }
+
+                $modalStack.open(modalInstance, {
+                  scope: modalScope,
+                  deferred: modalResultDeferred,
+                  renderDeferred: modalRenderDeferred,
+                  closedDeferred: modalClosedDeferred,
+                  content: tplAndVars[0],
+                  animation: modalOptions.animation,
+                  backdrop: modalOptions.backdrop,
+                  keyboard: modalOptions.keyboard,
+                  backdropClass: modalOptions.backdropClass,
+                  windowTopClass: modalOptions.windowTopClass,
+                  windowClass: modalOptions.windowClass,
+                  windowTemplateUrl: modalOptions.windowTemplateUrl,
+                  size: modalOptions.size,
+                  openedClass: modalOptions.openedClass,
+                  appendTo: modalOptions.appendTo
+                });
+                modalOpenedDeferred.resolve(true);
+
+            }, function resolveError(reason) {
+              modalOpenedDeferred.reject(reason);
+              modalResultDeferred.reject(reason);
+            })['finally'](function() {
+              if (promiseChain === samePromise) {
+                promiseChain = null;
+              }
+            });
+
+            return modalInstance;
+          };
+
+          return $modal;
+        }
+      ]
+    };
+
+    return $modalProvider;
+  });
+
+angular.module('ui.bootstrap.paging', [])
+/**
+ * Helper internal service for generating common controller code between the
+ * pager and pagination components
+ */
+.factory('uibPaging', ['$parse', function($parse) {
+  return {
+    create: function(ctrl, $scope, $attrs) {
+      ctrl.setNumPages = $attrs.numPages ? $parse($attrs.numPages).assign : angular.noop;
+      ctrl.ngModelCtrl = { $setViewValue: angular.noop }; // nullModelCtrl
+      ctrl._watchers = [];
+
+      ctrl.init = function(ngModelCtrl, config) {
+        ctrl.ngModelCtrl = ngModelCtrl;
+        ctrl.config = config;
+
+        ngModelCtrl.$render = function() {
+          ctrl.render();
+        };
+
+        if ($attrs.itemsPerPage) {
+          ctrl._watchers.push($scope.$parent.$watch($parse($attrs.itemsPerPage), function(value) {
+            ctrl.itemsPerPage = parseInt(value, 10);
+            $scope.totalPages = ctrl.calculateTotalPages();
+            ctrl.updatePage();
+          }));
+        } else {
+          ctrl.itemsPerPage = config.itemsPerPage;
+        }
+
+        $scope.$watch('totalItems', function(newTotal, oldTotal) {
+          if (angular.isDefined(newTotal) || newTotal !== oldTotal) {
+            $scope.totalPages = ctrl.calculateTotalPages();
+            ctrl.updatePage();
+          }
+        });
+      };
+
+      ctrl.calculateTotalPages = function() {
+        var totalPages = ctrl.itemsPerPage < 1 ? 1 : Math.ceil($scope.totalItems / ctrl.itemsPerPage);
+        return Math.max(totalPages || 0, 1);
+      };
+
+      ctrl.render = function() {
+        $scope.page = parseInt(ctrl.ngModelCtrl.$viewValue, 10) || 1;
+      };
+
+      $scope.selectPage = function(page, evt) {
+        if (evt) {
+          evt.preventDefault();
+        }
+
+        var clickAllowed = !$scope.ngDisabled || !evt;
+        if (clickAllowed && $scope.page !== page && page > 0 && page <= $scope.totalPages) {
+          if (evt && evt.target) {
+            evt.target.blur();
+          }
+          ctrl.ngModelCtrl.$setViewValue(page);
+          ctrl.ngModelCtrl.$render();
+        }
+      };
+
+      $scope.getText = function(key) {
+        return $scope[key + 'Text'] || ctrl.config[key + 'Text'];
+      };
+
+      $scope.noPrevious = function() {
+        return $scope.page === 1;
+      };
+
+      $scope.noNext = function() {
+        return $scope.page === $scope.totalPages;
+      };
+
+      ctrl.updatePage = function() {
+        ctrl.setNumPages($scope.$parent, $scope.totalPages); // Readonly variable
+
+        if ($scope.page > $scope.totalPages) {
+          $scope.selectPage($scope.totalPages);
+        } else {
+          ctrl.ngModelCtrl.$render();
+        }
+      };
+
+      $scope.$on('$destroy', function() {
+        while (ctrl._watchers.length) {
+          ctrl._watchers.shift()();
+        }
+      });
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.pager', ['ui.bootstrap.paging'])
+
+.controller('UibPagerController', ['$scope', '$attrs', 'uibPaging', 'uibPagerConfig', function($scope, $attrs, uibPaging, uibPagerConfig) {
+  $scope.align = angular.isDefined($attrs.align) ? $scope.$parent.$eval($attrs.align) : uibPagerConfig.align;
+
+  uibPaging.create(this, $scope, $attrs);
+}])
+
+.constant('uibPagerConfig', {
+  itemsPerPage: 10,
+  previousText: '« Previous',
+  nextText: 'Next »',
+  align: true
+})
+
+.directive('uibPager', ['uibPagerConfig', function(uibPagerConfig) {
+  return {
+    scope: {
+      totalItems: '=',
+      previousText: '@',
+      nextText: '@',
+      ngDisabled: '='
+    },
+    require: ['uibPager', '?ngModel'],
+    controller: 'UibPagerController',
+    controllerAs: 'pager',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/pager/pager.html';
+    },
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+        return; // do nothing if no ng-model
+      }
+
+      paginationCtrl.init(ngModelCtrl, uibPagerConfig);
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.pagination', ['ui.bootstrap.paging'])
+.controller('UibPaginationController', ['$scope', '$attrs', '$parse', 'uibPaging', 'uibPaginationConfig', function($scope, $attrs, $parse, uibPaging, uibPaginationConfig) {
+  var ctrl = this;
+  // Setup configuration parameters
+  var maxSize = angular.isDefined($attrs.maxSize) ? $scope.$parent.$eval($attrs.maxSize) : uibPaginationConfig.maxSize,
+    rotate = angular.isDefined($attrs.rotate) ? $scope.$parent.$eval($attrs.rotate) : uibPaginationConfig.rotate,
+    forceEllipses = angular.isDefined($attrs.forceEllipses) ? $scope.$parent.$eval($attrs.forceEllipses) : uibPaginationConfig.forceEllipses,
+    boundaryLinkNumbers = angular.isDefined($attrs.boundaryLinkNumbers) ? $scope.$parent.$eval($attrs.boundaryLinkNumbers) : uibPaginationConfig.boundaryLinkNumbers;
+  $scope.boundaryLinks = angular.isDefined($attrs.boundaryLinks) ? $scope.$parent.$eval($attrs.boundaryLinks) : uibPaginationConfig.boundaryLinks;
+  $scope.directionLinks = angular.isDefined($attrs.directionLinks) ? $scope.$parent.$eval($attrs.directionLinks) : uibPaginationConfig.directionLinks;
+
+  uibPaging.create(this, $scope, $attrs);
+
+  if ($attrs.maxSize) {
+    ctrl._watchers.push($scope.$parent.$watch($parse($attrs.maxSize), function(value) {
+      maxSize = parseInt(value, 10);
+      ctrl.render();
+    }));
+  }
+
+  // Create page object used in template
+  function makePage(number, text, isActive) {
+    return {
+      number: number,
+      text: text,
+      active: isActive
+    };
+  }
+
+  function getPages(currentPage, totalPages) {
+    var pages = [];
+
+    // Default page limits
+    var startPage = 1, endPage = totalPages;
+    var isMaxSized = angular.isDefined(maxSize) && maxSize < totalPages;
+
+    // recompute if maxSize
+    if (isMaxSized) {
+      if (rotate) {
+        // Current page is displayed in the middle of the visible ones
+        startPage = Math.max(currentPage - Math.floor(maxSize / 2), 1);
+        endPage = startPage + maxSize - 1;
+
+        // Adjust if limit is exceeded
+        if (endPage > totalPages) {
+          endPage = totalPages;
+          startPage = endPage - maxSize + 1;
+        }
+      } else {
+        // Visible pages are paginated with maxSize
+        startPage = (Math.ceil(currentPage / maxSize) - 1) * maxSize + 1;
+
+        // Adjust last page if limit is exceeded
+        endPage = Math.min(startPage + maxSize - 1, totalPages);
+      }
+    }
+
+    // Add page number links
+    for (var number = startPage; number <= endPage; number++) {
+      var page = makePage(number, number, number === currentPage);
+      pages.push(page);
+    }
+
+    // Add links to move between page sets
+    if (isMaxSized && maxSize > 0 && (!rotate || forceEllipses || boundaryLinkNumbers)) {
+      if (startPage > 1) {
+        if (!boundaryLinkNumbers || startPage > 3) { //need ellipsis for all options unless range is too close to beginning
+        var previousPageSet = makePage(startPage - 1, '...', false);
+        pages.unshift(previousPageSet);
+      }
+        if (boundaryLinkNumbers) {
+          if (startPage === 3) { //need to replace ellipsis when the buttons would be sequential
+            var secondPageLink = makePage(2, '2', false);
+            pages.unshift(secondPageLink);
+          }
+          //add the first page
+          var firstPageLink = makePage(1, '1', false);
+          pages.unshift(firstPageLink);
+        }
+      }
+
+      if (endPage < totalPages) {
+        if (!boundaryLinkNumbers || endPage < totalPages - 2) { //need ellipsis for all options unless range is too close to end
+        var nextPageSet = makePage(endPage + 1, '...', false);
+        pages.push(nextPageSet);
+      }
+        if (boundaryLinkNumbers) {
+          if (endPage === totalPages - 2) { //need to replace ellipsis when the buttons would be sequential
+            var secondToLastPageLink = makePage(totalPages - 1, totalPages - 1, false);
+            pages.push(secondToLastPageLink);
+          }
+          //add the last page
+          var lastPageLink = makePage(totalPages, totalPages, false);
+          pages.push(lastPageLink);
+        }
+      }
+    }
+    return pages;
+  }
+
+  var originalRender = this.render;
+  this.render = function() {
+    originalRender();
+    if ($scope.page > 0 && $scope.page <= $scope.totalPages) {
+      $scope.pages = getPages($scope.page, $scope.totalPages);
+    }
+  };
+}])
+
+.constant('uibPaginationConfig', {
+  itemsPerPage: 10,
+  boundaryLinks: false,
+  boundaryLinkNumbers: false,
+  directionLinks: true,
+  firstText: 'First',
+  previousText: 'Previous',
+  nextText: 'Next',
+  lastText: 'Last',
+  rotate: true,
+  forceEllipses: false
+})
+
+.directive('uibPagination', ['$parse', 'uibPaginationConfig', function($parse, uibPaginationConfig) {
+  return {
+    scope: {
+      totalItems: '=',
+      firstText: '@',
+      previousText: '@',
+      nextText: '@',
+      lastText: '@',
+      ngDisabled:'='
+    },
+    require: ['uibPagination', '?ngModel'],
+    controller: 'UibPaginationController',
+    controllerAs: 'pagination',
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || 'uib/template/pagination/pagination.html';
+    },
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var paginationCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (!ngModelCtrl) {
+         return; // do nothing if no ng-model
+      }
+
+      paginationCtrl.init(ngModelCtrl, uibPaginationConfig);
+    }
+  };
+}]);
+
+/**
+ * The following features are still outstanding: animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, html tooltips, and selector delegation.
+ */
+angular.module('ui.bootstrap.tooltip', ['ui.bootstrap.position', 'ui.bootstrap.stackedMap'])
+
+/**
+ * The $tooltip service creates tooltip- and popover-like directives as well as
+ * houses global options for them.
+ */
+.provider('$uibTooltip', function() {
+  // The default options tooltip and popover.
+  var defaultOptions = {
+    placement: 'top',
+    placementClassPrefix: '',
+    animation: true,
+    popupDelay: 0,
+    popupCloseDelay: 0,
+    useContentExp: false
+  };
+
+  // Default hide triggers for each show trigger
+  var triggerMap = {
+    'mouseenter': 'mouseleave',
+    'click': 'click',
+    'outsideClick': 'outsideClick',
+    'focus': 'blur',
+    'none': ''
+  };
+
+  // The options specified to the provider globally.
+  var globalOptions = {};
+
+  /**
+   * `options({})` allows global configuration of all tooltips in the
+   * application.
+   *
+   *   var app = angular.module( 'App', ['ui.bootstrap.tooltip'], function( $tooltipProvider ) {
+   *     // place tooltips left instead of top by default
+   *     $tooltipProvider.options( { placement: 'left' } );
+   *   });
+   */
+	this.options = function(value) {
+		angular.extend(globalOptions, value);
+	};
+
+  /**
+   * This allows you to extend the set of trigger mappings available. E.g.:
+   *
+   *   $tooltipProvider.setTriggers( 'openTrigger': 'closeTrigger' );
+   */
+  this.setTriggers = function setTriggers(triggers) {
+    angular.extend(triggerMap, triggers);
+  };
+
+  /**
+   * This is a helper function for translating camel-case to snake_case.
+   */
+  function snake_case(name) {
+    var regexp = /[A-Z]/g;
+    var separator = '-';
+    return name.replace(regexp, function(letter, pos) {
+      return (pos ? separator : '') + letter.toLowerCase();
+    });
+  }
+
+  /**
+   * Returns the actual instance of the $tooltip service.
+   * TODO support multiple triggers
+   */
+  this.$get = ['$window', '$compile', '$timeout', '$document', '$uibPosition', '$interpolate', '$rootScope', '$parse', '$$stackedMap', function($window, $compile, $timeout, $document, $position, $interpolate, $rootScope, $parse, $$stackedMap) {
+    var openedTooltips = $$stackedMap.createNew();
+    $document.on('keypress', keypressListener);
+
+    $rootScope.$on('$destroy', function() {
+      $document.off('keypress', keypressListener);
+    });
+
+    function keypressListener(e) {
+      if (e.which === 27) {
+        var last = openedTooltips.top();
+        if (last) {
+          last.value.close();
+          openedTooltips.removeTop();
+          last = null;
+        }
+      }
+    }
+
+    return function $tooltip(ttType, prefix, defaultTriggerShow, options) {
+      options = angular.extend({}, defaultOptions, globalOptions, options);
+
+      /**
+       * Returns an object of show and hide triggers.
+       *
+       * If a trigger is supplied,
+       * it is used to show the tooltip; otherwise, it will use the `trigger`
+       * option passed to the `$tooltipProvider.options` method; else it will
+       * default to the trigger supplied to this directive factory.
+       *
+       * The hide trigger is based on the show trigger. If the `trigger` option
+       * was passed to the `$tooltipProvider.options` method, it will use the
+       * mapped trigger from `triggerMap` or the passed trigger if the map is
+       * undefined; otherwise, it uses the `triggerMap` value of the show
+       * trigger; else it will just use the show trigger.
+       */
+      function getTriggers(trigger) {
+        var show = (trigger || options.trigger || defaultTriggerShow).split(' ');
+        var hide = show.map(function(trigger) {
+          return triggerMap[trigger] || trigger;
+        });
+        return {
+          show: show,
+          hide: hide
+        };
+      }
+
+      var directiveName = snake_case(ttType);
+
+      var startSym = $interpolate.startSymbol();
+      var endSym = $interpolate.endSymbol();
+      var template =
+        '<div '+ directiveName + '-popup '+
+          'title="' + startSym + 'title' + endSym + '" '+
+          (options.useContentExp ?
+            'content-exp="contentExp()" ' :
+            'content="' + startSym + 'content' + endSym + '" ') +
+          'placement="' + startSym + 'placement' + endSym + '" '+
+          'popup-class="' + startSym + 'popupClass' + endSym + '" '+
+          'animation="animation" ' +
+          'is-open="isOpen"' +
+          'origin-scope="origScope" ' +
+          'style="visibility: hidden; display: block; top: -9999px; left: -9999px;"' +
+          '>' +
+        '</div>';
+
+      return {
+        compile: function(tElem, tAttrs) {
+          var tooltipLinker = $compile(template);
+
+          return function link(scope, element, attrs, tooltipCtrl) {
+            var tooltip;
+            var tooltipLinkedScope;
+            var transitionTimeout;
+            var showTimeout;
+            var hideTimeout;
+            var positionTimeout;
+            var appendToBody = angular.isDefined(options.appendToBody) ? options.appendToBody : false;
+            var triggers = getTriggers(undefined);
+            var hasEnableExp = angular.isDefined(attrs[prefix + 'Enable']);
+            var ttScope = scope.$new(true);
+            var repositionScheduled = false;
+            var isOpenParse = angular.isDefined(attrs[prefix + 'IsOpen']) ? $parse(attrs[prefix + 'IsOpen']) : false;
+            var contentParse = options.useContentExp ? $parse(attrs[ttType]) : false;
+            var observers = [];
+
+            var positionTooltip = function() {
+              // check if tooltip exists and is not empty
+              if (!tooltip || !tooltip.html()) { return; }
+
+              if (!positionTimeout) {
+                positionTimeout = $timeout(function() {
+                  // Reset the positioning.
+                  tooltip.css({ top: 0, left: 0 });
+
+                  // Now set the calculated positioning.
+                  var ttPosition = $position.positionElements(element, tooltip, ttScope.placement, appendToBody);
+                  tooltip.css({ top: ttPosition.top + 'px', left: ttPosition.left + 'px', visibility: 'visible' });
+
+                  // If the placement class is prefixed, still need
+                  // to remove the TWBS standard class.
+                  if (options.placementClassPrefix) {
+                    tooltip.removeClass('top bottom left right');
+                  }
+
+                  tooltip.removeClass(
+                    options.placementClassPrefix + 'top ' +
+                    options.placementClassPrefix + 'top-left ' +
+                    options.placementClassPrefix + 'top-right ' +
+                    options.placementClassPrefix + 'bottom ' +
+                    options.placementClassPrefix + 'bottom-left ' +
+                    options.placementClassPrefix + 'bottom-right ' +
+                    options.placementClassPrefix + 'left ' +
+                    options.placementClassPrefix + 'left-top ' +
+                    options.placementClassPrefix + 'left-bottom ' +
+                    options.placementClassPrefix + 'right ' +
+                    options.placementClassPrefix + 'right-top ' +
+                    options.placementClassPrefix + 'right-bottom');
+
+                  var placement = ttPosition.placement.split('-');
+                  tooltip.addClass(placement[0] + ' ' + options.placementClassPrefix + ttPosition.placement);
+                  $position.positionArrow(tooltip, ttPosition.placement);
+
+                  positionTimeout = null;
+                }, 0, false);
+              }
+            };
+
+            // Set up the correct scope to allow transclusion later
+            ttScope.origScope = scope;
+
+            // By default, the tooltip is not open.
+            // TODO add ability to start tooltip opened
+            ttScope.isOpen = false;
+            openedTooltips.add(ttScope, {
+              close: hide
+            });
+
+            function toggleTooltipBind() {
+              if (!ttScope.isOpen) {
+                showTooltipBind();
+              } else {
+                hideTooltipBind();
+              }
+            }
+
+            // Show the tooltip with delay if specified, otherwise show it immediately
+            function showTooltipBind() {
+              if (hasEnableExp && !scope.$eval(attrs[prefix + 'Enable'])) {
+                return;
+              }
+
+              cancelHide();
+              prepareTooltip();
+
+              if (ttScope.popupDelay) {
+                // Do nothing if the tooltip was already scheduled to pop-up.
+                // This happens if show is triggered multiple times before any hide is triggered.
+                if (!showTimeout) {
+                  showTimeout = $timeout(show, ttScope.popupDelay, false);
+                }
+              } else {
+                show();
+              }
+            }
+
+            function hideTooltipBind() {
+              cancelShow();
+
+              if (ttScope.popupCloseDelay) {
+                if (!hideTimeout) {
+                  hideTimeout = $timeout(hide, ttScope.popupCloseDelay, false);
+                }
+              } else {
+                hide();
+              }
+            }
+
+            // Show the tooltip popup element.
+            function show() {
+              cancelShow();
+              cancelHide();
+
+              // Don't show empty tooltips.
+              if (!ttScope.content) {
+                return angular.noop;
+              }
+
+              createTooltip();
+
+              // And show the tooltip.
+              ttScope.$evalAsync(function() {
+                ttScope.isOpen = true;
+                assignIsOpen(true);
+                positionTooltip();
+              });
+            }
+
+            function cancelShow() {
+              if (showTimeout) {
+                $timeout.cancel(showTimeout);
+                showTimeout = null;
+              }
+
+              if (positionTimeout) {
+                $timeout.cancel(positionTimeout);
+                positionTimeout = null;
+              }
+            }
+
+            // Hide the tooltip popup element.
+            function hide() {
+              if (!ttScope) {
+                return;
+              }
+
+              // First things first: we don't show it anymore.
+              ttScope.$evalAsync(function() {
+                if (ttScope) {
+                  ttScope.isOpen = false;
+                  assignIsOpen(false);
+                  // And now we remove it from the DOM. However, if we have animation, we
+                  // need to wait for it to expire beforehand.
+                  // FIXME: this is a placeholder for a port of the transitions library.
+                  // The fade transition in TWBS is 150ms.
+                  if (ttScope.animation) {
+                    if (!transitionTimeout) {
+                      transitionTimeout = $timeout(removeTooltip, 150, false);
+                    }
+                  } else {
+                    removeTooltip();
+                  }
+                }
+              });
+            }
+
+            function cancelHide() {
+              if (hideTimeout) {
+                $timeout.cancel(hideTimeout);
+                hideTimeout = null;
+              }
+
+              if (transitionTimeout) {
+                $timeout.cancel(transitionTimeout);
+                transitionTimeout = null;
+              }
+            }
+
+            function createTooltip() {
+              // There can only be one tooltip element per directive shown at once.
+              if (tooltip) {
+                return;
+              }
+
+              tooltipLinkedScope = ttScope.$new();
+              tooltip = tooltipLinker(tooltipLinkedScope, function(tooltip) {
+                if (appendToBody) {
+                  $document.find('body').append(tooltip);
+                } else {
+                  element.after(tooltip);
+                }
+              });
+
+              prepObservers();
+            }
+
+            function removeTooltip() {
+              cancelShow();
+              cancelHide();
+              unregisterObservers();
+
+              if (tooltip) {
+                tooltip.remove();
+                tooltip = null;
+              }
+              if (tooltipLinkedScope) {
+                tooltipLinkedScope.$destroy();
+                tooltipLinkedScope = null;
+              }
+            }
+
+            /**
+             * Set the initial scope values. Once
+             * the tooltip is created, the observers
+             * will be added to keep things in sync.
+             */
+            function prepareTooltip() {
+              ttScope.title = attrs[prefix + 'Title'];
+              if (contentParse) {
+                ttScope.content = contentParse(scope);
+              } else {
+                ttScope.content = attrs[ttType];
+              }
+
+              ttScope.popupClass = attrs[prefix + 'Class'];
+              ttScope.placement = angular.isDefined(attrs[prefix + 'Placement']) ? attrs[prefix + 'Placement'] : options.placement;
+
+              var delay = parseInt(attrs[prefix + 'PopupDelay'], 10);
+              var closeDelay = parseInt(attrs[prefix + 'PopupCloseDelay'], 10);
+              ttScope.popupDelay = !isNaN(delay) ? delay : options.popupDelay;
+              ttScope.popupCloseDelay = !isNaN(closeDelay) ? closeDelay : options.popupCloseDelay;
+            }
+
+            function assignIsOpen(isOpen) {
+              if (isOpenParse && angular.isFunction(isOpenParse.assign)) {
+                isOpenParse.assign(scope, isOpen);
+              }
+            }
+
+            ttScope.contentExp = function() {
+              return ttScope.content;
+            };
+
+            /**
+             * Observe the relevant attributes.
+             */
+            attrs.$observe('disabled', function(val) {
+              if (val) {
+                cancelShow();
+              }
+
+              if (val && ttScope.isOpen) {
+                hide();
+              }
+            });
+
+            if (isOpenParse) {
+              scope.$watch(isOpenParse, function(val) {
+                if (ttScope && !val === ttScope.isOpen) {
+                  toggleTooltipBind();
+                }
+              });
+            }
+
+            function prepObservers() {
+              observers.length = 0;
+
+              if (contentParse) {
+                observers.push(
+                  scope.$watch(contentParse, function(val) {
+                    ttScope.content = val;
+                    if (!val && ttScope.isOpen) {
+                      hide();
+                    }
+                  })
+                );
+
+                observers.push(
+                  tooltipLinkedScope.$watch(function() {
+                    if (!repositionScheduled) {
+                      repositionScheduled = true;
+                      tooltipLinkedScope.$$postDigest(function() {
+                        repositionScheduled = false;
+                        if (ttScope && ttScope.isOpen) {
+                          positionTooltip();
+                        }
+                      });
+                    }
+                  })
+                );
+              } else {
+                observers.push(
+                  attrs.$observe(ttType, function(val) {
+                    ttScope.content = val;
+                    if (!val && ttScope.isOpen) {
+                      hide();
+                    } else {
+                      positionTooltip();
+                    }
+                  })
+                );
+              }
+
+              observers.push(
+                attrs.$observe(prefix + 'Title', function(val) {
+                  ttScope.title = val;
+                  if (ttScope.isOpen) {
+                    positionTooltip();
+                  }
+                })
+              );
+
+              observers.push(
+                attrs.$observe(prefix + 'Placement', function(val) {
+                  ttScope.placement = val ? val : options.placement;
+                  if (ttScope.isOpen) {
+                    positionTooltip();
+                  }
+                })
+              );
+            }
+
+            function unregisterObservers() {
+              if (observers.length) {
+                angular.forEach(observers, function(observer) {
+                  observer();
+                });
+                observers.length = 0;
+              }
+            }
+
+            // hide tooltips/popovers for outsideClick trigger
+            function bodyHideTooltipBind(e) {
+              if (!ttScope || !ttScope.isOpen || !tooltip) {
+                return;
+              }
+              // make sure the tooltip/popover link or tool tooltip/popover itself were not clicked
+              if (!element[0].contains(e.target) && !tooltip[0].contains(e.target)) {
+                hideTooltipBind();
+              }
+            }
+
+            var unregisterTriggers = function() {
+              triggers.show.forEach(function(trigger) {
+                if (trigger === 'outsideClick') {
+                  element.off('click', toggleTooltipBind);
+                } else {
+                  element.off(trigger, showTooltipBind);
+                  element.off(trigger, toggleTooltipBind);
+                }
+              });
+              triggers.hide.forEach(function(trigger) {
+                if (trigger === 'outsideClick') {
+                  $document.off('click', bodyHideTooltipBind);
+                } else {
+                  element.off(trigger, hideTooltipBind);
+                }
+              });
+            };
+
+            function prepTriggers() {
+              var val = attrs[prefix + 'Trigger'];
+              unregisterTriggers();
+
+              triggers = getTriggers(val);
+
+              if (triggers.show !== 'none') {
+                triggers.show.forEach(function(trigger, idx) {
+                  if (trigger === 'outsideClick') {
+                    element.on('click', toggleTooltipBind);
+                    $document.on('click', bodyHideTooltipBind);
+                  } else if (trigger === triggers.hide[idx]) {
+                    element.on(trigger, toggleTooltipBind);
+                  } else if (trigger) {
+                    element.on(trigger, showTooltipBind);
+                    element.on(triggers.hide[idx], hideTooltipBind);
+                  }
+
+                  element.on('keypress', function(e) {
+                    if (e.which === 27) {
+                      hideTooltipBind();
+                    }
+                  });
+                });
+              }
+            }
+
+            prepTriggers();
+
+            var animation = scope.$eval(attrs[prefix + 'Animation']);
+            ttScope.animation = angular.isDefined(animation) ? !!animation : options.animation;
+
+            var appendToBodyVal;
+            var appendKey = prefix + 'AppendToBody';
+            if (appendKey in attrs && attrs[appendKey] === undefined) {
+              appendToBodyVal = true;
+            } else {
+              appendToBodyVal = scope.$eval(attrs[appendKey]);
+            }
+
+            appendToBody = angular.isDefined(appendToBodyVal) ? appendToBodyVal : appendToBody;
+
+            // if a tooltip is attached to <body> we need to remove it on
+            // location change as its parent scope will probably not be destroyed
+            // by the change.
+            if (appendToBody) {
+              scope.$on('$locationChangeSuccess', function closeTooltipOnLocationChangeSuccess() {
+                if (ttScope.isOpen) {
+                  hide();
+                }
+              });
+            }
+
+            // Make sure tooltip is destroyed and removed.
+            scope.$on('$destroy', function onDestroyTooltip() {
+              unregisterTriggers();
+              removeTooltip();
+              openedTooltips.remove(ttScope);
+              ttScope = null;
+            });
+          };
+        }
+      };
+    };
+  }];
+})
+
+// This is mostly ngInclude code but with a custom scope
+.directive('uibTooltipTemplateTransclude', [
+         '$animate', '$sce', '$compile', '$templateRequest',
+function ($animate, $sce, $compile, $templateRequest) {
+  return {
+    link: function(scope, elem, attrs) {
+      var origScope = scope.$eval(attrs.tooltipTemplateTranscludeScope);
+
+      var changeCounter = 0,
+        currentScope,
+        previousElement,
+        currentElement;
+
+      var cleanupLastIncludeContent = function() {
+        if (previousElement) {
+          previousElement.remove();
+          previousElement = null;
+        }
+
+        if (currentScope) {
+          currentScope.$destroy();
+          currentScope = null;
+        }
+
+        if (currentElement) {
+          $animate.leave(currentElement).then(function() {
+            previousElement = null;
+          });
+          previousElement = currentElement;
+          currentElement = null;
+        }
+      };
+
+      scope.$watch($sce.parseAsResourceUrl(attrs.uibTooltipTemplateTransclude), function(src) {
+        var thisChangeId = ++changeCounter;
+
+        if (src) {
+          //set the 2nd param to true to ignore the template request error so that the inner
+          //contents and scope can be cleaned up.
+          $templateRequest(src, true).then(function(response) {
+            if (thisChangeId !== changeCounter) { return; }
+            var newScope = origScope.$new();
+            var template = response;
+
+            var clone = $compile(template)(newScope, function(clone) {
+              cleanupLastIncludeContent();
+              $animate.enter(clone, elem);
+            });
+
+            currentScope = newScope;
+            currentElement = clone;
+
+            currentScope.$emit('$includeContentLoaded', src);
+          }, function() {
+            if (thisChangeId === changeCounter) {
+              cleanupLastIncludeContent();
+              scope.$emit('$includeContentError', src);
+            }
+          });
+          scope.$emit('$includeContentRequested', src);
+        } else {
+          cleanupLastIncludeContent();
+        }
+      });
+
+      scope.$on('$destroy', cleanupLastIncludeContent);
+    }
+  };
+}])
+
+/**
+ * Note that it's intentional that these classes are *not* applied through $animate.
+ * They must not be animated as they're expected to be present on the tooltip on
+ * initialization.
+ */
+.directive('uibTooltipClasses', ['$uibPosition', function($uibPosition) {
+  return {
+    restrict: 'A',
+    link: function(scope, element, attrs) {
+      // need to set the primary position so the
+      // arrow has space during position measure.
+      // tooltip.positionTooltip()
+      if (scope.placement) {
+        // // There are no top-left etc... classes
+        // // in TWBS, so we need the primary position.
+        var position = $uibPosition.parsePlacement(scope.placement);
+        element.addClass(position[0]);
+      } else {
+        element.addClass('top');
+      }
+
+      if (scope.popupClass) {
+        element.addClass(scope.popupClass);
+      }
+
+      if (scope.animation()) {
+        element.addClass(attrs.tooltipAnimationClass);
+      }
+    }
+  };
+}])
+
+.directive('uibTooltipPopup', function() {
+  return {
+    replace: true,
+    scope: { content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/tooltip/tooltip-popup.html'
+  };
+})
+
+.directive('uibTooltip', [ '$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibTooltip', 'tooltip', 'mouseenter');
+}])
+
+.directive('uibTooltipTemplatePopup', function() {
+  return {
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'uib/template/tooltip/tooltip-template-popup.html'
+  };
+})
+
+.directive('uibTooltipTemplate', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibTooltipTemplate', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}])
+
+.directive('uibTooltipHtmlPopup', function() {
+  return {
+    replace: true,
+    scope: { contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/tooltip/tooltip-html-popup.html'
+  };
+})
+
+.directive('uibTooltipHtml', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibTooltipHtml', 'tooltip', 'mouseenter', {
+    useContentExp: true
+  });
+}]);
+
+/**
+ * The following features are still outstanding: popup delay, animation as a
+ * function, placement as a function, inside, support for more triggers than
+ * just mouse enter/leave, and selector delegatation.
+ */
+angular.module('ui.bootstrap.popover', ['ui.bootstrap.tooltip'])
+
+.directive('uibPopoverTemplatePopup', function() {
+  return {
+    replace: true,
+    scope: { title: '@', contentExp: '&', placement: '@', popupClass: '@', animation: '&', isOpen: '&',
+      originScope: '&' },
+    templateUrl: 'uib/template/popover/popover-template.html'
+  };
+})
+
+.directive('uibPopoverTemplate', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibPopoverTemplate', 'popover', 'click', {
+    useContentExp: true
+  });
+}])
+
+.directive('uibPopoverHtmlPopup', function() {
+  return {
+    replace: true,
+    scope: { contentExp: '&', title: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/popover/popover-html.html'
+  };
+})
+
+.directive('uibPopoverHtml', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibPopoverHtml', 'popover', 'click', {
+    useContentExp: true
+  });
+}])
+
+.directive('uibPopoverPopup', function() {
+  return {
+    replace: true,
+    scope: { title: '@', content: '@', placement: '@', popupClass: '@', animation: '&', isOpen: '&' },
+    templateUrl: 'uib/template/popover/popover.html'
+  };
+})
+
+.directive('uibPopover', ['$uibTooltip', function($uibTooltip) {
+  return $uibTooltip('uibPopover', 'popover', 'click');
+}]);
+
+angular.module('ui.bootstrap.progressbar', [])
+
+.constant('uibProgressConfig', {
+  animate: true,
+  max: 100
+})
+
+.controller('UibProgressController', ['$scope', '$attrs', 'uibProgressConfig', function($scope, $attrs, progressConfig) {
+  var self = this,
+      animate = angular.isDefined($attrs.animate) ? $scope.$parent.$eval($attrs.animate) : progressConfig.animate;
+
+  this.bars = [];
+  $scope.max = angular.isDefined($scope.max) ? $scope.max : progressConfig.max;
+
+  this.addBar = function(bar, element, attrs) {
+    if (!animate) {
+      element.css({'transition': 'none'});
+    }
+
+    this.bars.push(bar);
+
+    bar.max = $scope.max;
+    bar.title = attrs && angular.isDefined(attrs.title) ? attrs.title : 'progressbar';
+
+    bar.$watch('value', function(value) {
+      bar.recalculatePercentage();
+    });
+
+    bar.recalculatePercentage = function() {
+      var totalPercentage = self.bars.reduce(function(total, bar) {
+        bar.percent = +(100 * bar.value / bar.max).toFixed(2);
+        return total + bar.percent;
+      }, 0);
+
+      if (totalPercentage > 100) {
+        bar.percent -= totalPercentage - 100;
+      }
+    };
+
+    bar.$on('$destroy', function() {
+      element = null;
+      self.removeBar(bar);
+    });
+  };
+
+  this.removeBar = function(bar) {
+    this.bars.splice(this.bars.indexOf(bar), 1);
+    this.bars.forEach(function (bar) {
+      bar.recalculatePercentage();
+    });
+  };
+
+  $scope.$watch('max', function(max) {
+    self.bars.forEach(function(bar) {
+      bar.max = $scope.max;
+      bar.recalculatePercentage();
+    });
+  });
+}])
+
+.directive('uibProgress', function() {
+  return {
+    replace: true,
+    transclude: true,
+    controller: 'UibProgressController',
+    require: 'uibProgress',
+    scope: {
+      max: '=?'
+    },
+    templateUrl: 'uib/template/progressbar/progress.html'
+  };
+})
+
+.directive('uibBar', function() {
+  return {
+    replace: true,
+    transclude: true,
+    require: '^uibProgress',
+    scope: {
+      value: '=',
+      type: '@'
+    },
+    templateUrl: 'uib/template/progressbar/bar.html',
+    link: function(scope, element, attrs, progressCtrl) {
+      progressCtrl.addBar(scope, element, attrs);
+    }
+  };
+})
+
+.directive('uibProgressbar', function() {
+  return {
+    replace: true,
+    transclude: true,
+    controller: 'UibProgressController',
+    scope: {
+      value: '=',
+      max: '=?',
+      type: '@'
+    },
+    templateUrl: 'uib/template/progressbar/progressbar.html',
+    link: function(scope, element, attrs, progressCtrl) {
+      progressCtrl.addBar(scope, angular.element(element.children()[0]), {title: attrs.title});
+    }
+  };
+});
+
+angular.module('ui.bootstrap.rating', [])
+
+.constant('uibRatingConfig', {
+  max: 5,
+  stateOn: null,
+  stateOff: null,
+  titles : ['one', 'two', 'three', 'four', 'five']
+})
+
+.controller('UibRatingController', ['$scope', '$attrs', 'uibRatingConfig', function($scope, $attrs, ratingConfig) {
+  var ngModelCtrl = { $setViewValue: angular.noop };
+
+  this.init = function(ngModelCtrl_) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.push(function(value) {
+      if (angular.isNumber(value) && value << 0 !== value) {
+        value = Math.round(value);
+      }
+
+      return value;
+    });
+
+    this.stateOn = angular.isDefined($attrs.stateOn) ? $scope.$parent.$eval($attrs.stateOn) : ratingConfig.stateOn;
+    this.stateOff = angular.isDefined($attrs.stateOff) ? $scope.$parent.$eval($attrs.stateOff) : ratingConfig.stateOff;
+    var tmpTitles = angular.isDefined($attrs.titles) ? $scope.$parent.$eval($attrs.titles) : ratingConfig.titles ;
+    this.titles = angular.isArray(tmpTitles) && tmpTitles.length > 0 ?
+      tmpTitles : ratingConfig.titles;
+
+    var ratingStates = angular.isDefined($attrs.ratingStates) ?
+      $scope.$parent.$eval($attrs.ratingStates) :
+      new Array(angular.isDefined($attrs.max) ? $scope.$parent.$eval($attrs.max) : ratingConfig.max);
+    $scope.range = this.buildTemplateObjects(ratingStates);
+  };
+
+  this.buildTemplateObjects = function(states) {
+    for (var i = 0, n = states.length; i < n; i++) {
+      states[i] = angular.extend({ index: i }, { stateOn: this.stateOn, stateOff: this.stateOff, title: this.getTitle(i) }, states[i]);
+    }
+    return states;
+  };
+
+  this.getTitle = function(index) {
+    if (index >= this.titles.length) {
+      return index + 1;
+    }
+
+    return this.titles[index];
+  };
+
+  $scope.rate = function(value) {
+    if (!$scope.readonly && value >= 0 && value <= $scope.range.length) {
+      ngModelCtrl.$setViewValue(ngModelCtrl.$viewValue === value ? 0 : value);
+      ngModelCtrl.$render();
+    }
+  };
+
+  $scope.enter = function(value) {
+    if (!$scope.readonly) {
+      $scope.value = value;
+    }
+    $scope.onHover({value: value});
+  };
+
+  $scope.reset = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+    $scope.onLeave();
+  };
+
+  $scope.onKeydown = function(evt) {
+    if (/(37|38|39|40)/.test(evt.which)) {
+      evt.preventDefault();
+      evt.stopPropagation();
+      $scope.rate($scope.value + (evt.which === 38 || evt.which === 39 ? 1 : -1));
+    }
+  };
+
+  this.render = function() {
+    $scope.value = ngModelCtrl.$viewValue;
+  };
+}])
+
+.directive('uibRating', function() {
+  return {
+    require: ['uibRating', 'ngModel'],
+    scope: {
+      readonly: '=?',
+      onHover: '&',
+      onLeave: '&'
+    },
+    controller: 'UibRatingController',
+    templateUrl: 'uib/template/rating/rating.html',
+    replace: true,
+    link: function(scope, element, attrs, ctrls) {
+      var ratingCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+      ratingCtrl.init(ngModelCtrl);
+    }
+  };
+});
+
+angular.module('ui.bootstrap.tabs', [])
+
+.controller('UibTabsetController', ['$scope', function ($scope) {
+  var ctrl = this,
+      tabs = ctrl.tabs = $scope.tabs = [];
+
+  ctrl.select = function(selectedTab) {
+    angular.forEach(tabs, function(tab) {
+      if (tab.active && tab !== selectedTab) {
+        tab.active = false;
+        tab.onDeselect();
+        selectedTab.selectCalled = false;
+      }
+    });
+    selectedTab.active = true;
+    // only call select if it has not already been called
+    if (!selectedTab.selectCalled) {
+      selectedTab.onSelect();
+      selectedTab.selectCalled = true;
+    }
+  };
+
+  ctrl.addTab = function addTab(tab) {
+    tabs.push(tab);
+    // we can't run the select function on the first tab
+    // since that would select it twice
+    if (tabs.length === 1 && tab.active !== false) {
+      tab.active = true;
+    } else if (tab.active) {
+      ctrl.select(tab);
+    } else {
+      tab.active = false;
+    }
+  };
+
+  ctrl.removeTab = function removeTab(tab) {
+    var index = tabs.indexOf(tab);
+    //Select a new tab if the tab to be removed is selected and not destroyed
+    if (tab.active && tabs.length > 1 && !destroyed) {
+      //If this is the last tab, select the previous tab. else, the next tab.
+      var newActiveIndex = index === tabs.length - 1 ? index - 1 : index + 1;
+      ctrl.select(tabs[newActiveIndex]);
+    }
+    tabs.splice(index, 1);
+  };
+
+  var destroyed;
+  $scope.$on('$destroy', function() {
+    destroyed = true;
+  });
+}])
+
+.directive('uibTabset', function() {
+  return {
+    transclude: true,
+    replace: true,
+    scope: {
+      type: '@'
+    },
+    controller: 'UibTabsetController',
+    templateUrl: 'uib/template/tabs/tabset.html',
+    link: function(scope, element, attrs) {
+      scope.vertical = angular.isDefined(attrs.vertical) ? scope.$parent.$eval(attrs.vertical) : false;
+      scope.justified = angular.isDefined(attrs.justified) ? scope.$parent.$eval(attrs.justified) : false;
+    }
+  };
+})
+
+.directive('uibTab', ['$parse', function($parse) {
+  return {
+    require: '^uibTabset',
+    replace: true,
+    templateUrl: 'uib/template/tabs/tab.html',
+    transclude: true,
+    scope: {
+      active: '=?',
+      heading: '@',
+      onSelect: '&select', //This callback is called in contentHeadingTransclude
+                          //once it inserts the tab's content into the dom
+      onDeselect: '&deselect'
+    },
+    controller: function() {
+      //Empty controller so other directives can require being 'under' a tab
+    },
+    controllerAs: 'tab',
+    link: function(scope, elm, attrs, tabsetCtrl, transclude) {
+      scope.$watch('active', function(active) {
+        if (active) {
+          tabsetCtrl.select(scope);
+        }
+      });
+
+      scope.disabled = false;
+      if (attrs.disable) {
+        scope.$parent.$watch($parse(attrs.disable), function(value) {
+          scope.disabled = !! value;
+        });
+      }
+
+      scope.select = function() {
+        if (!scope.disabled) {
+          scope.active = true;
+        }
+      };
+
+      tabsetCtrl.addTab(scope);
+      scope.$on('$destroy', function() {
+        tabsetCtrl.removeTab(scope);
+      });
+
+      //We need to transclude later, once the content container is ready.
+      //when this link happens, we're inside a tab heading.
+      scope.$transcludeFn = transclude;
+    }
+  };
+}])
+
+.directive('uibTabHeadingTransclude', function() {
+  return {
+    restrict: 'A',
+    require: '^uibTab',
+    link: function(scope, elm) {
+      scope.$watch('headingElement', function updateHeadingElement(heading) {
+        if (heading) {
+          elm.html('');
+          elm.append(heading);
+        }
+      });
+    }
+  };
+})
+
+.directive('uibTabContentTransclude', function() {
+  return {
+    restrict: 'A',
+    require: '^uibTabset',
+    link: function(scope, elm, attrs) {
+      var tab = scope.$eval(attrs.uibTabContentTransclude);
+
+      //Now our tab is ready to be transcluded: both the tab heading area
+      //and the tab content area are loaded.  Transclude 'em both.
+      tab.$transcludeFn(tab.$parent, function(contents) {
+        angular.forEach(contents, function(node) {
+          if (isTabHeading(node)) {
+            //Let tabHeadingTransclude know.
+            tab.headingElement = node;
+          } else {
+            elm.append(node);
+          }
+        });
+      });
+    }
+  };
+
+  function isTabHeading(node) {
+    return node.tagName && (
+      node.hasAttribute('uib-tab-heading') ||
+      node.hasAttribute('data-uib-tab-heading') ||
+      node.hasAttribute('x-uib-tab-heading') ||
+      node.tagName.toLowerCase() === 'uib-tab-heading' ||
+      node.tagName.toLowerCase() === 'data-uib-tab-heading' ||
+      node.tagName.toLowerCase() === 'x-uib-tab-heading'
+    );
+  }
+});
+
+angular.module('ui.bootstrap.timepicker', [])
+
+.constant('uibTimepickerConfig', {
+  hourStep: 1,
+  minuteStep: 1,
+  secondStep: 1,
+  showMeridian: true,
+  showSeconds: false,
+  meridians: null,
+  readonlyInput: false,
+  mousewheel: true,
+  arrowkeys: true,
+  showSpinners: true,
+  templateUrl: 'uib/template/timepicker/timepicker.html'
+})
+
+.controller('UibTimepickerController', ['$scope', '$element', '$attrs', '$parse', '$log', '$locale', 'uibTimepickerConfig', function($scope, $element, $attrs, $parse, $log, $locale, timepickerConfig) {
+  var selected = new Date(),
+    watchers = [],
+    ngModelCtrl = { $setViewValue: angular.noop }, // nullModelCtrl
+    meridians = angular.isDefined($attrs.meridians) ? $scope.$parent.$eval($attrs.meridians) : timepickerConfig.meridians || $locale.DATETIME_FORMATS.AMPMS;
+
+  $scope.tabindex = angular.isDefined($attrs.tabindex) ? $attrs.tabindex : 0;
+  $element.removeAttr('tabindex');
+
+  this.init = function(ngModelCtrl_, inputs) {
+    ngModelCtrl = ngModelCtrl_;
+    ngModelCtrl.$render = this.render;
+
+    ngModelCtrl.$formatters.unshift(function(modelValue) {
+      return modelValue ? new Date(modelValue) : null;
+    });
+
+    var hoursInputEl = inputs.eq(0),
+        minutesInputEl = inputs.eq(1),
+        secondsInputEl = inputs.eq(2);
+
+    var mousewheel = angular.isDefined($attrs.mousewheel) ? $scope.$parent.$eval($attrs.mousewheel) : timepickerConfig.mousewheel;
+
+    if (mousewheel) {
+      this.setupMousewheelEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+    }
+
+    var arrowkeys = angular.isDefined($attrs.arrowkeys) ? $scope.$parent.$eval($attrs.arrowkeys) : timepickerConfig.arrowkeys;
+    if (arrowkeys) {
+      this.setupArrowkeyEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+    }
+
+    $scope.readonlyInput = angular.isDefined($attrs.readonlyInput) ? $scope.$parent.$eval($attrs.readonlyInput) : timepickerConfig.readonlyInput;
+    this.setupInputEvents(hoursInputEl, minutesInputEl, secondsInputEl);
+  };
+
+  var hourStep = timepickerConfig.hourStep;
+  if ($attrs.hourStep) {
+    watchers.push($scope.$parent.$watch($parse($attrs.hourStep), function(value) {
+      hourStep = +value;
+    }));
+  }
+
+  var minuteStep = timepickerConfig.minuteStep;
+  if ($attrs.minuteStep) {
+    watchers.push($scope.$parent.$watch($parse($attrs.minuteStep), function(value) {
+      minuteStep = +value;
+    }));
+  }
+
+  var min;
+  watchers.push($scope.$parent.$watch($parse($attrs.min), function(value) {
+    var dt = new Date(value);
+    min = isNaN(dt) ? undefined : dt;
+  }));
+
+  var max;
+  watchers.push($scope.$parent.$watch($parse($attrs.max), function(value) {
+    var dt = new Date(value);
+    max = isNaN(dt) ? undefined : dt;
+  }));
+
+  var disabled = false;
+  if ($attrs.ngDisabled) {
+    watchers.push($scope.$parent.$watch($parse($attrs.ngDisabled), function(value) {
+      disabled = value;
+    }));
+  }
+
+  $scope.noIncrementHours = function() {
+    var incrementedSelected = addMinutes(selected, hourStep * 60);
+    return disabled || incrementedSelected > max ||
+      incrementedSelected < selected && incrementedSelected < min;
+  };
+
+  $scope.noDecrementHours = function() {
+    var decrementedSelected = addMinutes(selected, -hourStep * 60);
+    return disabled || decrementedSelected < min ||
+      decrementedSelected > selected && decrementedSelected > max;
+  };
+
+  $scope.noIncrementMinutes = function() {
+    var incrementedSelected = addMinutes(selected, minuteStep);
+    return disabled || incrementedSelected > max ||
+      incrementedSelected < selected && incrementedSelected < min;
+  };
+
+  $scope.noDecrementMinutes = function() {
+    var decrementedSelected = addMinutes(selected, -minuteStep);
+    return disabled || decrementedSelected < min ||
+      decrementedSelected > selected && decrementedSelected > max;
+  };
+
+  $scope.noIncrementSeconds = function() {
+    var incrementedSelected = addSeconds(selected, secondStep);
+    return disabled || incrementedSelected > max ||
+      incrementedSelected < selected && incrementedSelected < min;
+  };
+
+  $scope.noDecrementSeconds = function() {
+    var decrementedSelected = addSeconds(selected, -secondStep);
+    return disabled || decrementedSelected < min ||
+      decrementedSelected > selected && decrementedSelected > max;
+  };
+
+  $scope.noToggleMeridian = function() {
+    if (selected.getHours() < 12) {
+      return disabled || addMinutes(selected, 12 * 60) > max;
+    }
+
+    return disabled || addMinutes(selected, -12 * 60) < min;
+  };
+
+  var secondStep = timepickerConfig.secondStep;
+  if ($attrs.secondStep) {
+    watchers.push($scope.$parent.$watch($parse($attrs.secondStep), function(value) {
+      secondStep = +value;
+    }));
+  }
+
+  $scope.showSeconds = timepickerConfig.showSeconds;
+  if ($attrs.showSeconds) {
+    watchers.push($scope.$parent.$watch($parse($attrs.showSeconds), function(value) {
+      $scope.showSeconds = !!value;
+    }));
+  }
+
+  // 12H / 24H mode
+  $scope.showMeridian = timepickerConfig.showMeridian;
+  if ($attrs.showMeridian) {
+    watchers.push($scope.$parent.$watch($parse($attrs.showMeridian), function(value) {
+      $scope.showMeridian = !!value;
+
+      if (ngModelCtrl.$error.time) {
+        // Evaluate from template
+        var hours = getHoursFromTemplate(), minutes = getMinutesFromTemplate();
+        if (angular.isDefined(hours) && angular.isDefined(minutes)) {
+          selected.setHours(hours);
+          refresh();
+        }
+      } else {
+        updateTemplate();
+      }
+    }));
+  }
+
+  // Get $scope.hours in 24H mode if valid
+  function getHoursFromTemplate() {
+    var hours = +$scope.hours;
+    var valid = $scope.showMeridian ? hours > 0 && hours < 13 :
+      hours >= 0 && hours < 24;
+    if (!valid) {
+      return undefined;
+    }
+
+    if ($scope.showMeridian) {
+      if (hours === 12) {
+        hours = 0;
+      }
+      if ($scope.meridian === meridians[1]) {
+        hours = hours + 12;
+      }
+    }
+    return hours;
+  }
+
+  function getMinutesFromTemplate() {
+    var minutes = +$scope.minutes;
+    return minutes >= 0 && minutes < 60 ? minutes : undefined;
+  }
+
+  function getSecondsFromTemplate() {
+    var seconds = +$scope.seconds;
+    return seconds >= 0 && seconds < 60 ? seconds : undefined;
+  }
+
+  function pad(value) {
+    if (value === null) {
+      return '';
+    }
+
+    return angular.isDefined(value) && value.toString().length < 2 ?
+      '0' + value : value.toString();
+  }
+
+  // Respond on mousewheel spin
+  this.setupMousewheelEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+    var isScrollingUp = function(e) {
+      if (e.originalEvent) {
+        e = e.originalEvent;
+      }
+      //pick correct delta variable depending on event
+      var delta = e.wheelDelta ? e.wheelDelta : -e.deltaY;
+      return e.detail || delta > 0;
+    };
+
+    hoursInputEl.bind('mousewheel wheel', function(e) {
+      if (!disabled) {
+        $scope.$apply(isScrollingUp(e) ? $scope.incrementHours() : $scope.decrementHours());
+      }
+      e.preventDefault();
+    });
+
+    minutesInputEl.bind('mousewheel wheel', function(e) {
+      if (!disabled) {
+        $scope.$apply(isScrollingUp(e) ? $scope.incrementMinutes() : $scope.decrementMinutes());
+      }
+      e.preventDefault();
+    });
+
+     secondsInputEl.bind('mousewheel wheel', function(e) {
+      if (!disabled) {
+        $scope.$apply(isScrollingUp(e) ? $scope.incrementSeconds() : $scope.decrementSeconds());
+      }
+      e.preventDefault();
+    });
+  };
+
+  // Respond on up/down arrowkeys
+  this.setupArrowkeyEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+    hoursInputEl.bind('keydown', function(e) {
+      if (!disabled) {
+        if (e.which === 38) { // up
+          e.preventDefault();
+          $scope.incrementHours();
+          $scope.$apply();
+        } else if (e.which === 40) { // down
+          e.preventDefault();
+          $scope.decrementHours();
+          $scope.$apply();
+        }
+      }
+    });
+
+    minutesInputEl.bind('keydown', function(e) {
+      if (!disabled) {
+        if (e.which === 38) { // up
+          e.preventDefault();
+          $scope.incrementMinutes();
+          $scope.$apply();
+        } else if (e.which === 40) { // down
+          e.preventDefault();
+          $scope.decrementMinutes();
+          $scope.$apply();
+        }
+      }
+    });
+
+    secondsInputEl.bind('keydown', function(e) {
+      if (!disabled) {
+        if (e.which === 38) { // up
+          e.preventDefault();
+          $scope.incrementSeconds();
+          $scope.$apply();
+        } else if (e.which === 40) { // down
+          e.preventDefault();
+          $scope.decrementSeconds();
+          $scope.$apply();
+        }
+      }
+    });
+  };
+
+  this.setupInputEvents = function(hoursInputEl, minutesInputEl, secondsInputEl) {
+    if ($scope.readonlyInput) {
+      $scope.updateHours = angular.noop;
+      $scope.updateMinutes = angular.noop;
+      $scope.updateSeconds = angular.noop;
+      return;
+    }
+
+    var invalidate = function(invalidHours, invalidMinutes, invalidSeconds) {
+      ngModelCtrl.$setViewValue(null);
+      ngModelCtrl.$setValidity('time', false);
+      if (angular.isDefined(invalidHours)) {
+        $scope.invalidHours = invalidHours;
+      }
+
+      if (angular.isDefined(invalidMinutes)) {
+        $scope.invalidMinutes = invalidMinutes;
+      }
+
+      if (angular.isDefined(invalidSeconds)) {
+        $scope.invalidSeconds = invalidSeconds;
+      }
+    };
+
+    $scope.updateHours = function() {
+      var hours = getHoursFromTemplate(),
+        minutes = getMinutesFromTemplate();
+
+      ngModelCtrl.$setDirty();
+
+      if (angular.isDefined(hours) && angular.isDefined(minutes)) {
+        selected.setHours(hours);
+        selected.setMinutes(minutes);
+        if (selected < min || selected > max) {
+          invalidate(true);
+        } else {
+          refresh('h');
+        }
+      } else {
+        invalidate(true);
+      }
+    };
+
+    hoursInputEl.bind('blur', function(e) {
+      ngModelCtrl.$setTouched();
+      if ($scope.hours === null || $scope.hours === '') {
+        invalidate(true);
+      } else if (!$scope.invalidHours && $scope.hours < 10) {
+        $scope.$apply(function() {
+          $scope.hours = pad($scope.hours);
+        });
+      }
+    });
+
+    $scope.updateMinutes = function() {
+      var minutes = getMinutesFromTemplate(),
+        hours = getHoursFromTemplate();
+
+      ngModelCtrl.$setDirty();
+
+      if (angular.isDefined(minutes) && angular.isDefined(hours)) {
+        selected.setHours(hours);
+        selected.setMinutes(minutes);
+        if (selected < min || selected > max) {
+          invalidate(undefined, true);
+        } else {
+          refresh('m');
+        }
+      } else {
+        invalidate(undefined, true);
+      }
+    };
+
+    minutesInputEl.bind('blur', function(e) {
+      ngModelCtrl.$setTouched();
+      if ($scope.minutes === null) {
+        invalidate(undefined, true);
+      } else if (!$scope.invalidMinutes && $scope.minutes < 10) {
+        $scope.$apply(function() {
+          $scope.minutes = pad($scope.minutes);
+        });
+      }
+    });
+
+    $scope.updateSeconds = function() {
+      var seconds = getSecondsFromTemplate();
+
+      ngModelCtrl.$setDirty();
+
+      if (angular.isDefined(seconds)) {
+        selected.setSeconds(seconds);
+        refresh('s');
+      } else {
+        invalidate(undefined, undefined, true);
+      }
+    };
+
+    secondsInputEl.bind('blur', function(e) {
+      if (!$scope.invalidSeconds && $scope.seconds < 10) {
+        $scope.$apply( function() {
+          $scope.seconds = pad($scope.seconds);
+        });
+      }
+    });
+
+  };
+
+  this.render = function() {
+    var date = ngModelCtrl.$viewValue;
+
+    if (isNaN(date)) {
+      ngModelCtrl.$setValidity('time', false);
+      $log.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.');
+    } else {
+      if (date) {
+        selected = date;
+      }
+
+      if (selected < min || selected > max) {
+        ngModelCtrl.$setValidity('time', false);
+        $scope.invalidHours = true;
+        $scope.invalidMinutes = true;
+      } else {
+        makeValid();
+      }
+      updateTemplate();
+    }
+  };
+
+  // Call internally when we know that model is valid.
+  function refresh(keyboardChange) {
+    makeValid();
+    ngModelCtrl.$setViewValue(new Date(selected));
+    updateTemplate(keyboardChange);
+  }
+
+  function makeValid() {
+    ngModelCtrl.$setValidity('time', true);
+    $scope.invalidHours = false;
+    $scope.invalidMinutes = false;
+    $scope.invalidSeconds = false;
+  }
+
+  function updateTemplate(keyboardChange) {
+    if (!ngModelCtrl.$modelValue) {
+      $scope.hours = null;
+      $scope.minutes = null;
+      $scope.seconds = null;
+      $scope.meridian = meridians[0];
+    } else {
+      var hours = selected.getHours(),
+        minutes = selected.getMinutes(),
+        seconds = selected.getSeconds();
+
+      if ($scope.showMeridian) {
+        hours = hours === 0 || hours === 12 ? 12 : hours % 12; // Convert 24 to 12 hour system
+      }
+
+      $scope.hours = keyboardChange === 'h' ? hours : pad(hours);
+      if (keyboardChange !== 'm') {
+        $scope.minutes = pad(minutes);
+      }
+      $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+
+      if (keyboardChange !== 's') {
+        $scope.seconds = pad(seconds);
+      }
+      $scope.meridian = selected.getHours() < 12 ? meridians[0] : meridians[1];
+    }
+  }
+
+  function addSecondsToSelected(seconds) {
+    selected = addSeconds(selected, seconds);
+    refresh();
+  }
+
+  function addMinutes(selected, minutes) {
+    return addSeconds(selected, minutes*60);
+  }
+
+  function addSeconds(date, seconds) {
+    var dt = new Date(date.getTime() + seconds * 1000);
+    var newDate = new Date(date);
+    newDate.setHours(dt.getHours(), dt.getMinutes(), dt.getSeconds());
+    return newDate;
+  }
+
+  $scope.showSpinners = angular.isDefined($attrs.showSpinners) ?
+    $scope.$parent.$eval($attrs.showSpinners) : timepickerConfig.showSpinners;
+
+  $scope.incrementHours = function() {
+    if (!$scope.noIncrementHours()) {
+      addSecondsToSelected(hourStep * 60 * 60);
+    }
+  };
+
+  $scope.decrementHours = function() {
+    if (!$scope.noDecrementHours()) {
+      addSecondsToSelected(-hourStep * 60 * 60);
+    }
+  };
+
+  $scope.incrementMinutes = function() {
+    if (!$scope.noIncrementMinutes()) {
+      addSecondsToSelected(minuteStep * 60);
+    }
+  };
+
+  $scope.decrementMinutes = function() {
+    if (!$scope.noDecrementMinutes()) {
+      addSecondsToSelected(-minuteStep * 60);
+    }
+  };
+
+  $scope.incrementSeconds = function() {
+    if (!$scope.noIncrementSeconds()) {
+      addSecondsToSelected(secondStep);
+    }
+  };
+
+  $scope.decrementSeconds = function() {
+    if (!$scope.noDecrementSeconds()) {
+      addSecondsToSelected(-secondStep);
+    }
+  };
+
+  $scope.toggleMeridian = function() {
+    var minutes = getMinutesFromTemplate(),
+        hours = getHoursFromTemplate();
+
+    if (!$scope.noToggleMeridian()) {
+      if (angular.isDefined(minutes) && angular.isDefined(hours)) {
+        addSecondsToSelected(12 * 60 * (selected.getHours() < 12 ? 60 : -60));
+      } else {
+        $scope.meridian = $scope.meridian === meridians[0] ? meridians[1] : meridians[0];
+      }
+    }
+  };
+
+  $scope.blur = function() {
+    ngModelCtrl.$setTouched();
+  };
+
+  $scope.$on('$destroy', function() {
+    while (watchers.length) {
+      watchers.shift()();
+    }
+  });
+}])
+
+.directive('uibTimepicker', ['uibTimepickerConfig', function(uibTimepickerConfig) {
+  return {
+    require: ['uibTimepicker', '?^ngModel'],
+    controller: 'UibTimepickerController',
+    controllerAs: 'timepicker',
+    replace: true,
+    scope: {},
+    templateUrl: function(element, attrs) {
+      return attrs.templateUrl || uibTimepickerConfig.templateUrl;
+    },
+    link: function(scope, element, attrs, ctrls) {
+      var timepickerCtrl = ctrls[0], ngModelCtrl = ctrls[1];
+
+      if (ngModelCtrl) {
+        timepickerCtrl.init(ngModelCtrl, element.find('input'));
+      }
+    }
+  };
+}]);
+
+angular.module('ui.bootstrap.typeahead', ['ui.bootstrap.debounce', 'ui.bootstrap.position'])
+
+/**
+ * A helper service that can parse typeahead's syntax (string provided by users)
+ * Extracted to a separate service for ease of unit testing
+ */
+  .factory('uibTypeaheadParser', ['$parse', function($parse) {
+    //                      00000111000000000000022200000000000000003333333333333330000000000044000
+    var TYPEAHEAD_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;
+    return {
+      parse: function(input) {
+        var match = input.match(TYPEAHEAD_REGEXP);
+        if (!match) {
+          throw new Error(
+            'Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_"' +
+              ' but got "' + input + '".');
+        }
+
+        return {
+          itemName: match[3],
+          source: $parse(match[4]),
+          viewMapper: $parse(match[2] || match[1]),
+          modelMapper: $parse(match[1])
+        };
+      }
+    };
+  }])
+
+  .controller('UibTypeaheadController', ['$scope', '$element', '$attrs', '$compile', '$parse', '$q', '$timeout', '$document', '$window', '$rootScope', '$$debounce', '$uibPosition', 'uibTypeaheadParser',
+    function(originalScope, element, attrs, $compile, $parse, $q, $timeout, $document, $window, $rootScope, $$debounce, $position, typeaheadParser) {
+    var HOT_KEYS = [9, 13, 27, 38, 40];
+    var eventDebounceTime = 200;
+    var modelCtrl, ngModelOptions;
+    //SUPPORTED ATTRIBUTES (OPTIONS)
+
+    //minimal no of characters that needs to be entered before typeahead kicks-in
+    var minLength = originalScope.$eval(attrs.typeaheadMinLength);
+    if (!minLength && minLength !== 0) {
+      minLength = 1;
+    }
+
+    //minimal wait time after last character typed before typeahead kicks-in
+    var waitTime = originalScope.$eval(attrs.typeaheadWaitMs) || 0;
+
+    //should it restrict model values to the ones selected from the popup only?
+    var isEditable = originalScope.$eval(attrs.typeaheadEditable) !== false;
+    originalScope.$watch(attrs.typeaheadEditable, function (newVal) {
+      isEditable = newVal !== false;
+    });
+
+    //binding to a variable that indicates if matches are being retrieved asynchronously
+    var isLoadingSetter = $parse(attrs.typeaheadLoading).assign || angular.noop;
+
+    //a callback executed when a match is selected
+    var onSelectCallback = $parse(attrs.typeaheadOnSelect);
+
+    //should it select highlighted popup value when losing focus?
+    var isSelectOnBlur = angular.isDefined(attrs.typeaheadSelectOnBlur) ? originalScope.$eval(attrs.typeaheadSelectOnBlur) : false;
+
+    //binding to a variable that indicates if there were no results after the query is completed
+    var isNoResultsSetter = $parse(attrs.typeaheadNoResults).assign || angular.noop;
+
+    var inputFormatter = attrs.typeaheadInputFormatter ? $parse(attrs.typeaheadInputFormatter) : undefined;
+
+    var appendToBody = attrs.typeaheadAppendToBody ? originalScope.$eval(attrs.typeaheadAppendToBody) : false;
+
+    var appendTo = attrs.typeaheadAppendTo ?
+      originalScope.$eval(attrs.typeaheadAppendTo) : null;
+
+    var focusFirst = originalScope.$eval(attrs.typeaheadFocusFirst) !== false;
+
+    //If input matches an item of the list exactly, select it automatically
+    var selectOnExact = attrs.typeaheadSelectOnExact ? originalScope.$eval(attrs.typeaheadSelectOnExact) : false;
+
+    //binding to a variable that indicates if dropdown is open
+    var isOpenSetter = $parse(attrs.typeaheadIsOpen).assign || angular.noop;
+
+    var showHint = originalScope.$eval(attrs.typeaheadShowHint) || false;
+
+    //INTERNAL VARIABLES
+
+    //model setter executed upon match selection
+    var parsedModel = $parse(attrs.ngModel);
+    var invokeModelSetter = $parse(attrs.ngModel + '($$$p)');
+    var $setModelValue = function(scope, newValue) {
+      if (angular.isFunction(parsedModel(originalScope)) &&
+        ngModelOptions && ngModelOptions.$options && ngModelOptions.$options.getterSetter) {
+        return invokeModelSetter(scope, {$$$p: newValue});
+      }
+
+      return parsedModel.assign(scope, newValue);
+    };
+
+    //expressions used by typeahead
+    var parserResult = typeaheadParser.parse(attrs.uibTypeahead);
+
+    var hasFocus;
+
+    //Used to avoid bug in iOS webview where iOS keyboard does not fire
+    //mousedown & mouseup events
+    //Issue #3699
+    var selected;
+
+    //create a child scope for the typeahead directive so we are not polluting original scope
+    //with typeahead-specific data (matches, query etc.)
+    var scope = originalScope.$new();
+    var offDestroy = originalScope.$on('$destroy', function() {
+      scope.$destroy();
+    });
+    scope.$on('$destroy', offDestroy);
+
+    // WAI-ARIA
+    var popupId = 'typeahead-' + scope.$id + '-' + Math.floor(Math.random() * 10000);
+    element.attr({
+      'aria-autocomplete': 'list',
+      'aria-expanded': false,
+      'aria-owns': popupId
+    });
+
+    var inputsContainer, hintInputElem;
+    //add read-only input to show hint
+    if (showHint) {
+      inputsContainer = angular.element('<div></div>');
+      inputsContainer.css('position', 'relative');
+      element.after(inputsContainer);
+      hintInputElem = element.clone();
+      hintInputElem.attr('placeholder', '');
+      hintInputElem.val('');
+      hintInputElem.css({
+        'position': 'absolute',
+        'top': '0px',
+        'left': '0px',
+        'border-color': 'transparent',
+        'box-shadow': 'none',
+        'opacity': 1,
+        'background': 'none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)',
+        'color': '#999'
+      });
+      element.css({
+        'position': 'relative',
+        'vertical-align': 'top',
+        'background-color': 'transparent'
+      });
+      inputsContainer.append(hintInputElem);
+      hintInputElem.after(element);
+    }
+
+    //pop-up element used to display matches
+    var popUpEl = angular.element('<div uib-typeahead-popup></div>');
+    popUpEl.attr({
+      id: popupId,
+      matches: 'matches',
+      active: 'activeIdx',
+      select: 'select(activeIdx, evt)',
+      'move-in-progress': 'moveInProgress',
+      query: 'query',
+      position: 'position',
+      'assign-is-open': 'assignIsOpen(isOpen)',
+      debounce: 'debounceUpdate'
+    });
+    //custom item template
+    if (angular.isDefined(attrs.typeaheadTemplateUrl)) {
+      popUpEl.attr('template-url', attrs.typeaheadTemplateUrl);
+    }
+
+    if (angular.isDefined(attrs.typeaheadPopupTemplateUrl)) {
+      popUpEl.attr('popup-template-url', attrs.typeaheadPopupTemplateUrl);
+    }
+
+    var resetHint = function() {
+      if (showHint) {
+        hintInputElem.val('');
+      }
+    };
+
+    var resetMatches = function() {
+      scope.matches = [];
+      scope.activeIdx = -1;
+      element.attr('aria-expanded', false);
+      resetHint();
+    };
+
+    var getMatchId = function(index) {
+      return popupId + '-option-' + index;
+    };
+
+    // Indicate that the specified match is the active (pre-selected) item in the list owned by this typeahead.
+    // This attribute is added or removed automatically when the `activeIdx` changes.
+    scope.$watch('activeIdx', function(index) {
+      if (index < 0) {
+        element.removeAttr('aria-activedescendant');
+      } else {
+        element.attr('aria-activedescendant', getMatchId(index));
+      }
+    });
+
+    var inputIsExactMatch = function(inputValue, index) {
+      if (scope.matches.length > index && inputValue) {
+        return inputValue.toUpperCase() === scope.matches[index].label.toUpperCase();
+      }
+
+      return false;
+    };
+
+    var getMatchesAsync = function(inputValue, evt) {
+      var locals = {$viewValue: inputValue};
+      isLoadingSetter(originalScope, true);
+      isNoResultsSetter(originalScope, false);
+      $q.when(parserResult.source(originalScope, locals)).then(function(matches) {
+        //it might happen that several async queries were in progress if a user were typing fast
+        //but we are interested only in responses that correspond to the current view value
+        var onCurrentRequest = inputValue === modelCtrl.$viewValue;
+        if (onCurrentRequest && hasFocus) {
+          if (matches && matches.length > 0) {
+            scope.activeIdx = focusFirst ? 0 : -1;
+            isNoResultsSetter(originalScope, false);
+            scope.matches.length = 0;
+
+            //transform labels
+            for (var i = 0; i < matches.length; i++) {
+              locals[parserResult.itemName] = matches[i];
+              scope.matches.push({
+                id: getMatchId(i),
+                label: parserResult.viewMapper(scope, locals),
+                model: matches[i]
+              });
+            }
+
+            scope.query = inputValue;
+            //position pop-up with matches - we need to re-calculate its position each time we are opening a window
+            //with matches as a pop-up might be absolute-positioned and position of an input might have changed on a page
+            //due to other elements being rendered
+            recalculatePosition();
+
+            element.attr('aria-expanded', true);
+
+            //Select the single remaining option if user input matches
+            if (selectOnExact && scope.matches.length === 1 && inputIsExactMatch(inputValue, 0)) {
+              if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+                $$debounce(function() {
+                  scope.select(0, evt);
+                }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+              } else {
+                scope.select(0, evt);
+              }
+            }
+
+            if (showHint) {
+              var firstLabel = scope.matches[0].label;
+              if (inputValue.length > 0 && firstLabel.slice(0, inputValue.length).toUpperCase() === inputValue.toUpperCase()) {
+                hintInputElem.val(inputValue + firstLabel.slice(inputValue.length));
+              }
+              else {
+                hintInputElem.val('');
+              }
+            }
+          } else {
+            resetMatches();
+            isNoResultsSetter(originalScope, true);
+          }
+        }
+        if (onCurrentRequest) {
+          isLoadingSetter(originalScope, false);
+        }
+      }, function() {
+        resetMatches();
+        isLoadingSetter(originalScope, false);
+        isNoResultsSetter(originalScope, true);
+      });
+    };
+
+    // bind events only if appendToBody params exist - performance feature
+    if (appendToBody) {
+      angular.element($window).on('resize', fireRecalculating);
+      $document.find('body').on('scroll', fireRecalculating);
+    }
+
+    // Declare the debounced function outside recalculating for
+    // proper debouncing
+    var debouncedRecalculate = $$debounce(function() {
+      // if popup is visible
+      if (scope.matches.length) {
+        recalculatePosition();
+      }
+
+      scope.moveInProgress = false;
+    }, eventDebounceTime);
+
+    // Default progress type
+    scope.moveInProgress = false;
+
+    function fireRecalculating() {
+      if (!scope.moveInProgress) {
+        scope.moveInProgress = true;
+        scope.$digest();
+      }
+
+      debouncedRecalculate();
+    }
+
+    // recalculate actual position and set new values to scope
+    // after digest loop is popup in right position
+    function recalculatePosition() {
+      scope.position = appendToBody ? $position.offset(element) : $position.position(element);
+      scope.position.top += element.prop('offsetHeight');
+    }
+
+    //we need to propagate user's query so we can higlight matches
+    scope.query = undefined;
+
+    //Declare the timeout promise var outside the function scope so that stacked calls can be cancelled later
+    var timeoutPromise;
+
+    var scheduleSearchWithTimeout = function(inputValue) {
+      timeoutPromise = $timeout(function() {
+        getMatchesAsync(inputValue);
+      }, waitTime);
+    };
+
+    var cancelPreviousTimeout = function() {
+      if (timeoutPromise) {
+        $timeout.cancel(timeoutPromise);
+      }
+    };
+
+    resetMatches();
+
+    scope.assignIsOpen = function (isOpen) {
+      isOpenSetter(originalScope, isOpen);
+    };
+
+    scope.select = function(activeIdx, evt) {
+      //called from within the $digest() cycle
+      var locals = {};
+      var model, item;
+
+      selected = true;
+      locals[parserResult.itemName] = item = scope.matches[activeIdx].model;
+      model = parserResult.modelMapper(originalScope, locals);
+      $setModelValue(originalScope, model);
+      modelCtrl.$setValidity('editable', true);
+      modelCtrl.$setValidity('parse', true);
+
+      onSelectCallback(originalScope, {
+        $item: item,
+        $model: model,
+        $label: parserResult.viewMapper(originalScope, locals),
+        $event: evt
+      });
+
+      resetMatches();
+
+      //return focus to the input element if a match was selected via a mouse click event
+      // use timeout to avoid $rootScope:inprog error
+      if (scope.$eval(attrs.typeaheadFocusOnSelect) !== false) {
+        $timeout(function() { element[0].focus(); }, 0, false);
+      }
+    };
+
+    //bind keyboard events: arrows up(38) / down(40), enter(13) and tab(9), esc(27)
+    element.on('keydown', function(evt) {
+      //typeahead is open and an "interesting" key was pressed
+      if (scope.matches.length === 0 || HOT_KEYS.indexOf(evt.which) === -1) {
+        return;
+      }
+
+      // if there's nothing selected (i.e. focusFirst) and enter or tab is hit, clear the results
+      if (scope.activeIdx === -1 && (evt.which === 9 || evt.which === 13)) {
+        resetMatches();
+        scope.$digest();
+        return;
+      }
+
+      evt.preventDefault();
+      var target;
+      switch (evt.which) {
+        case 9:
+        case 13:
+          scope.$apply(function () {
+            if (angular.isNumber(scope.debounceUpdate) || angular.isObject(scope.debounceUpdate)) {
+              $$debounce(function() {
+                scope.select(scope.activeIdx, evt);
+              }, angular.isNumber(scope.debounceUpdate) ? scope.debounceUpdate : scope.debounceUpdate['default']);
+            } else {
+              scope.select(scope.activeIdx, evt);
+            }
+          });
+          break;
+        case 27:
+          evt.stopPropagation();
+
+          resetMatches();
+          scope.$digest();
+          break;
+        case 38:
+          scope.activeIdx = (scope.activeIdx > 0 ? scope.activeIdx : scope.matches.length) - 1;
+          scope.$digest();
+          target = popUpEl.find('li')[scope.activeIdx];
+          target.parentNode.scrollTop = target.offsetTop;
+          break;
+        case 40:
+          scope.activeIdx = (scope.activeIdx + 1) % scope.matches.length;
+          scope.$digest();
+          target = popUpEl.find('li')[scope.activeIdx];
+          target.parentNode.scrollTop = target.offsetTop;
+          break;
+      }
+    });
+
+    element.bind('focus', function (evt) {
+      hasFocus = true;
+      if (minLength === 0 && !modelCtrl.$viewValue) {
+        $timeout(function() {
+          getMatchesAsync(modelCtrl.$viewValue, evt);
+        }, 0);
+      }
+    });
+
+    element.bind('blur', function(evt) {
+      if (isSelectOnBlur && scope.matches.length && scope.activeIdx !== -1 && !selected) {
+        selected = true;
+        scope.$apply(function() {
+          if (angular.isObject(scope.debounceUpdate) && angular.isNumber(scope.debounceUpdate.blur)) {
+            $$debounce(function() {
+              scope.select(scope.activeIdx, evt);
+            }, scope.debounceUpdate.blur);
+          } else {
+            scope.select(scope.activeIdx, evt);
+          }
+        });
+      }
+      if (!isEditable && modelCtrl.$error.editable) {
+        modelCtrl.$viewValue = '';
+        element.val('');
+      }
+      hasFocus = false;
+      selected = false;
+    });
+
+    // Keep reference to click handler to unbind it.
+    var dismissClickHandler = function(evt) {
+      // Issue #3973
+      // Firefox treats right click as a click on document
+      if (element[0] !== evt.target && evt.which !== 3 && scope.matches.length !== 0) {
+        resetMatches();
+        if (!$rootScope.$$phase) {
+          scope.$digest();
+        }
+      }
+    };
+
+    $document.on('click', dismissClickHandler);
+
+    originalScope.$on('$destroy', function() {
+      $document.off('click', dismissClickHandler);
+      if (appendToBody || appendTo) {
+        $popup.remove();
+      }
+
+      if (appendToBody) {
+        angular.element($window).off('resize', fireRecalculating);
+        $document.find('body').off('scroll', fireRecalculating);
+      }
+      // Prevent jQuery cache memory leak
+      popUpEl.remove();
+
+      if (showHint) {
+          inputsContainer.remove();
+      }
+    });
+
+    var $popup = $compile(popUpEl)(scope);
+
+    if (appendToBody) {
+      $document.find('body').append($popup);
+    } else if (appendTo) {
+      angular.element(appendTo).eq(0).append($popup);
+    } else {
+      element.after($popup);
+    }
+
+    this.init = function(_modelCtrl, _ngModelOptions) {
+      modelCtrl = _modelCtrl;
+      ngModelOptions = _ngModelOptions;
+
+      scope.debounceUpdate = modelCtrl.$options && $parse(modelCtrl.$options.debounce)(originalScope);
+
+      //plug into $parsers pipeline to open a typeahead on view changes initiated from DOM
+      //$parsers kick-in on all the changes coming from the view as well as manually triggered by $setViewValue
+      modelCtrl.$parsers.unshift(function(inputValue) {
+        hasFocus = true;
+
+        if (minLength === 0 || inputValue && inputValue.length >= minLength) {
+          if (waitTime > 0) {
+            cancelPreviousTimeout();
+            scheduleSearchWithTimeout(inputValue);
+          } else {
+            getMatchesAsync(inputValue);
+          }
+        } else {
+          isLoadingSetter(originalScope, false);
+          cancelPreviousTimeout();
+          resetMatches();
+        }
+
+        if (isEditable) {
+          return inputValue;
+        }
+
+        if (!inputValue) {
+          // Reset in case user had typed something previously.
+          modelCtrl.$setValidity('editable', true);
+          return null;
+        }
+
+        modelCtrl.$setValidity('editable', false);
+        return undefined;
+      });
+
+      modelCtrl.$formatters.push(function(modelValue) {
+        var candidateViewValue, emptyViewValue;
+        var locals = {};
+
+        // The validity may be set to false via $parsers (see above) if
+        // the model is restricted to selected values. If the model
+        // is set manually it is considered to be valid.
+        if (!isEditable) {
+          modelCtrl.$setValidity('editable', true);
+        }
+
+        if (inputFormatter) {
+          locals.$model = modelValue;
+          return inputFormatter(originalScope, locals);
+        }
+
+        //it might happen that we don't have enough info to properly render input value
+        //we need to check for this situation and simply return model value if we can't apply custom formatting
+        locals[parserResult.itemName] = modelValue;
+        candidateViewValue = parserResult.viewMapper(originalScope, locals);
+        locals[parserResult.itemName] = undefined;
+        emptyViewValue = parserResult.viewMapper(originalScope, locals);
+
+        return candidateViewValue !== emptyViewValue ? candidateViewValue : modelValue;
+      });
+    };
+  }])
+
+  .directive('uibTypeahead', function() {
+    return {
+      controller: 'UibTypeaheadController',
+      require: ['ngModel', '^?ngModelOptions', 'uibTypeahead'],
+      link: function(originalScope, element, attrs, ctrls) {
+        ctrls[2].init(ctrls[0], ctrls[1]);
+      }
+    };
+  })
+
+  .directive('uibTypeaheadPopup', ['$$debounce', function($$debounce) {
+    return {
+      scope: {
+        matches: '=',
+        query: '=',
+        active: '=',
+        position: '&',
+        moveInProgress: '=',
+        select: '&',
+        assignIsOpen: '&',
+        debounce: '&'
+      },
+      replace: true,
+      templateUrl: function(element, attrs) {
+        return attrs.popupTemplateUrl || 'uib/template/typeahead/typeahead-popup.html';
+      },
+      link: function(scope, element, attrs) {
+        scope.templateUrl = attrs.templateUrl;
+
+        scope.isOpen = function() {
+          var isDropdownOpen = scope.matches.length > 0;
+          scope.assignIsOpen({ isOpen: isDropdownOpen });
+          return isDropdownOpen;
+        };
+
+        scope.isActive = function(matchIdx) {
+          return scope.active === matchIdx;
+        };
+
+        scope.selectActive = function(matchIdx) {
+          scope.active = matchIdx;
+        };
+
+        scope.selectMatch = function(activeIdx, evt) {
+          var debounce = scope.debounce();
+          if (angular.isNumber(debounce) || angular.isObject(debounce)) {
+            $$debounce(function() {
+              scope.select({activeIdx: activeIdx, evt: evt});
+            }, angular.isNumber(debounce) ? debounce : debounce['default']);
+          } else {
+            scope.select({activeIdx: activeIdx, evt: evt});
+          }
+        };
+      }
+    };
+  }])
+
+  .directive('uibTypeaheadMatch', ['$templateRequest', '$compile', '$parse', function($templateRequest, $compile, $parse) {
+    return {
+      scope: {
+        index: '=',
+        match: '=',
+        query: '='
+      },
+      link: function(scope, element, attrs) {
+        var tplUrl = $parse(attrs.templateUrl)(scope.$parent) || 'uib/template/typeahead/typeahead-match.html';
+        $templateRequest(tplUrl).then(function(tplContent) {
+          var tplEl = angular.element(tplContent.trim());
+          element.replaceWith(tplEl);
+          $compile(tplEl)(scope);
+        });
+      }
+    };
+  }])
+
+  .filter('uibTypeaheadHighlight', ['$sce', '$injector', '$log', function($sce, $injector, $log) {
+    var isSanitizePresent;
+    isSanitizePresent = $injector.has('$sanitize');
+
+    function escapeRegexp(queryToEscape) {
+      // Regex: capture the whole query string and replace it with the string that will be used to match
+      // the results, for example if the capture is "a" the result will be \a
+      return queryToEscape.replace(/([.?*+^$[\]\\(){}|-])/g, '\\$1');
+    }
+
+    function containsHtml(matchItem) {
+      return /<.*>/g.test(matchItem);
+    }
+
+    return function(matchItem, query) {
+      if (!isSanitizePresent && containsHtml(matchItem)) {
+        $log.warn('Unsafe use of typeahead please use ngSanitize'); // Warn the user about the danger
+      }
+      matchItem = query ? ('' + matchItem).replace(new RegExp(escapeRegexp(query), 'gi'), '<strong>$&</strong>') : matchItem; // Replaces the capture string with a the same string inside of a "strong" tag
+      if (!isSanitizePresent) {
+        matchItem = $sce.trustAsHtml(matchItem); // If $sanitize is not present we pack the string in a $sce object for the ng-bind-html directive
+      }
+      return matchItem;
+    };
+  }]);
+angular.module('ui.bootstrap.carousel').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>'); });
+angular.module('ui.bootstrap.datepicker').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">.uib-datepicker .uib-title{width:100%;}.uib-day button,.uib-month button,.uib-year button{min-width:100%;}.uib-datepicker-popup.dropdown-menu{display:block;}.uib-button-bar{padding:10px 9px 2px;}</style>'); });
+angular.module('ui.bootstrap.timepicker').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">.uib-time input{width:50px;}</style>'); });
+angular.module('ui.bootstrap.typeahead').run(function() {!angular.$$csp().noInlineStyle && angular.element(document).find('head').prepend('<style type="text/css">[uib-typeahead-popup].dropdown-menu{display:block;}</style>'); });
\ No newline at end of file
diff --git a/turtles/bower_components/angular-bootstrap/ui-bootstrap.min.js b/turtles/bower_components/angular-bootstrap/ui-bootstrap.min.js
new file mode 100644
index 000000000..6743ae6a6
--- /dev/null
+++ b/turtles/bower_components/angular-bootstrap/ui-bootstrap.min.js
@@ -0,0 +1,9 @@
+/*
+ * angular-ui-bootstrap
+ * http://angular-ui.github.io/bootstrap/
+
+ * Version: 1.1.1 - 2016-01-25
+ * License: MIT
+ */angular.module("ui.bootstrap",["ui.bootstrap.collapse","ui.bootstrap.accordion","ui.bootstrap.alert","ui.bootstrap.buttons","ui.bootstrap.carousel","ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position","ui.bootstrap.datepicker","ui.bootstrap.debounce","ui.bootstrap.dropdown","ui.bootstrap.stackedMap","ui.bootstrap.modal","ui.bootstrap.paging","ui.bootstrap.pager","ui.bootstrap.pagination","ui.bootstrap.tooltip","ui.bootstrap.popover","ui.bootstrap.progressbar","ui.bootstrap.rating","ui.bootstrap.tabs","ui.bootstrap.timepicker","ui.bootstrap.typeahead"]),angular.module("ui.bootstrap.collapse",[]).directive("uibCollapse",["$animate","$q","$parse","$injector",function(a,b,c,d){var e=d.has("$animateCss")?d.get("$animateCss"):null;return{link:function(d,f,g){function h(){f.hasClass("collapse")&&f.hasClass("in")||b.resolve(l(d)).then(function(){f.removeClass("collapse").addClass("collapsing").attr("aria-expanded",!0).attr("aria-hidden",!1),e?e(f,{addClass:"in",easing:"ease",to:{height:f[0].scrollHeight+"px"}}).start()["finally"](i):a.addClass(f,"in",{to:{height:f[0].scrollHeight+"px"}}).then(i)})}function i(){f.removeClass("collapsing").addClass("collapse").css({height:"auto"}),m(d)}function j(){return f.hasClass("collapse")||f.hasClass("in")?void b.resolve(n(d)).then(function(){f.css({height:f[0].scrollHeight+"px"}).removeClass("collapse").addClass("collapsing").attr("aria-expanded",!1).attr("aria-hidden",!0),e?e(f,{removeClass:"in",to:{height:"0"}}).start()["finally"](k):a.removeClass(f,"in",{to:{height:"0"}}).then(k)}):k()}function k(){f.css({height:"0"}),f.removeClass("collapsing").addClass("collapse"),o(d)}var l=c(g.expanding),m=c(g.expanded),n=c(g.collapsing),o=c(g.collapsed);d.$eval(g.uibCollapse)||f.addClass("in").addClass("collapse").attr("aria-expanded",!0).attr("aria-hidden",!1).css({height:"auto"}),d.$watch(g.uibCollapse,function(a){a?j():h()})}}}]),angular.module("ui.bootstrap.accordion",["ui.bootstrap.collapse"]).constant("uibAccordionConfig",{closeOthers:!0}).controller("UibAccordionController",["$scope","$attrs","uibAccordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(c){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(b,1)}}]).directive("uibAccordion",function(){return{controller:"UibAccordionController",controllerAs:"accordion",transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/accordion/accordion.html"}}}).directive("uibAccordionGroup",function(){return{require:"^uibAccordion",transclude:!0,replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/accordion/accordion-group.html"},scope:{heading:"@",isOpen:"=?",isDisabled:"=?"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(a,b,c,d){d.addGroup(a),a.openClass=c.openClass||"panel-open",a.panelClass=c.panelClass||"panel-default",a.$watch("isOpen",function(c){b.toggleClass(a.openClass,!!c),c&&d.closeOthers(a)}),a.toggleOpen=function(b){a.isDisabled||b&&32!==b.which||(a.isOpen=!a.isOpen)}}}}).directive("uibAccordionHeading",function(){return{transclude:!0,template:"",replace:!0,require:"^uibAccordionGroup",link:function(a,b,c,d,e){d.setHeading(e(a,angular.noop))}}}).directive("uibAccordionTransclude",function(){return{require:"^uibAccordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.uibAccordionTransclude]},function(a){a&&(b.find("span").html(""),b.find("span").append(a))})}}}),angular.module("ui.bootstrap.alert",[]).controller("UibAlertController",["$scope","$attrs","$interpolate","$timeout",function(a,b,c,d){a.closeable=!!b.close;var e=angular.isDefined(b.dismissOnTimeout)?c(b.dismissOnTimeout)(a.$parent):null;e&&d(function(){a.close()},parseInt(e,10))}]).directive("uibAlert",function(){return{controller:"UibAlertController",controllerAs:"alert",templateUrl:function(a,b){return b.templateUrl||"uib/template/alert/alert.html"},transclude:!0,replace:!0,scope:{type:"@",close:"&"}}}),angular.module("ui.bootstrap.buttons",[]).constant("uibButtonConfig",{activeClass:"active",toggleEvent:"click"}).controller("UibButtonsController",["uibButtonConfig",function(a){this.activeClass=a.activeClass||"active",this.toggleEvent=a.toggleEvent||"click"}]).directive("uibBtnRadio",["$parse",function(a){return{require:["uibBtnRadio","ngModel"],controller:"UibButtonsController",controllerAs:"buttons",link:function(b,c,d,e){var f=e[0],g=e[1],h=a(d.uibUncheckable);c.find("input").css({display:"none"}),g.$render=function(){c.toggleClass(f.activeClass,angular.equals(g.$modelValue,b.$eval(d.uibBtnRadio)))},c.on(f.toggleEvent,function(){if(!d.disabled){var a=c.hasClass(f.activeClass);(!a||angular.isDefined(d.uncheckable))&&b.$apply(function(){g.$setViewValue(a?null:b.$eval(d.uibBtnRadio)),g.$render()})}}),d.uibUncheckable&&b.$watch(h,function(a){d.$set("uncheckable",a?"":null)})}}}]).directive("uibBtnCheckbox",function(){return{require:["uibBtnCheckbox","ngModel"],controller:"UibButtonsController",controllerAs:"button",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){return angular.isDefined(b)?a.$eval(b):c}var h=d[0],i=d[1];b.find("input").css({display:"none"}),i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.on(h.toggleEvent,function(){c.disabled||a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("ui.bootstrap.carousel",[]).controller("UibCarouselController",["$scope","$element","$interval","$timeout","$animate",function(a,b,c,d,e){function f(){for(;s.length;)s.shift()}function g(a){if(angular.isUndefined(p[a].index))return p[a];for(var b=0,c=p.length;c>b;++b)if(p[b].index===a)return p[b]}function h(c,d,g){t||(angular.extend(c,{direction:g,active:!0}),angular.extend(o.currentSlide||{},{direction:g,active:!1}),e.enabled(b)&&!a.$currentTransition&&c.$element&&o.slides.length>1&&(c.$element.data(q,c.direction),o.currentSlide&&o.currentSlide.$element&&o.currentSlide.$element.data(q,c.direction),a.$currentTransition=!0,e.on("addClass",c.$element,function(b,c){if("close"===c&&(a.$currentTransition=null,e.off("addClass",b),s.length)){var d=s.pop(),g=a.indexOfSlide(d),i=g>o.getCurrentIndex()?"next":"prev";f(),h(d,g,i)}})),o.currentSlide=c,r=d,k())}function i(){m&&(c.cancel(m),m=null)}function j(b){b.length||(a.$currentTransition=null,f())}function k(){i();var b=+a.interval;!isNaN(b)&&b>0&&(m=c(l,b))}function l(){var b=+a.interval;n&&!isNaN(b)&&b>0&&p.length?a.next():a.pause()}var m,n,o=this,p=o.slides=a.slides=[],q="uib-slideDirection",r=-1,s=[];o.currentSlide=null;var t=!1;o.addSlide=function(b,c){b.$element=c,p.push(b),1===p.length||b.active?(a.$currentTransition&&(a.$currentTransition=null),o.select(p[p.length-1]),1===p.length&&a.play()):b.active=!1},o.getCurrentIndex=function(){return o.currentSlide&&angular.isDefined(o.currentSlide.index)?+o.currentSlide.index:r},o.next=a.next=function(){var b=(o.getCurrentIndex()+1)%p.length;return 0===b&&a.noWrap()?void a.pause():o.select(g(b),"next")},o.prev=a.prev=function(){var b=o.getCurrentIndex()-1<0?p.length-1:o.getCurrentIndex()-1;return a.noWrap()&&b===p.length-1?void a.pause():o.select(g(b),"prev")},o.removeSlide=function(a){angular.isDefined(a.index)&&p.sort(function(a,b){return+a.index>+b.index});var b=s.indexOf(a);-1!==b&&s.splice(b,1);var c=p.indexOf(a);p.splice(c,1),d(function(){p.length>0&&a.active?c>=p.length?o.select(p[c-1]):o.select(p[c]):r>c&&r--}),0===p.length&&(o.currentSlide=null,f())},o.select=a.select=function(b,c){var d=a.indexOfSlide(b);void 0===c&&(c=d>o.getCurrentIndex()?"next":"prev"),b&&b!==o.currentSlide&&!a.$currentTransition?h(b,d,c):b&&b!==o.currentSlide&&a.$currentTransition&&(s.push(b),b.active=!1)},a.indexOfSlide=function(a){return angular.isDefined(a.index)?+a.index:p.indexOf(a)},a.isActive=function(a){return o.currentSlide===a},a.pause=function(){a.noPause||(n=!1,i())},a.play=function(){n||(n=!0,k())},a.$on("$destroy",function(){t=!0,i()}),a.$watch("noTransition",function(a){e.enabled(b,!a)}),a.$watch("interval",k),a.$watchCollection("slides",j)}]).directive("uibCarousel",function(){return{transclude:!0,replace:!0,controller:"UibCarouselController",controllerAs:"carousel",templateUrl:function(a,b){return b.templateUrl||"uib/template/carousel/carousel.html"},scope:{interval:"=",noTransition:"=",noPause:"=",noWrap:"&"}}}).directive("uibSlide",function(){return{require:"^uibCarousel",transclude:!0,replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/carousel/slide.html"},scope:{active:"=?",actual:"=?",index:"=?"},link:function(a,b,c,d){d.addSlide(a,b),a.$on("$destroy",function(){d.removeSlide(a)}),a.$watch("active",function(b){b&&d.select(a)})}}}).animation(".item",["$animateCss",function(a){function b(a,b,c){a.removeClass(b),c&&c()}var c="uib-slideDirection";return{beforeAddClass:function(d,e,f){if("active"===e){var g=!1,h=d.data(c),i="next"===h?"left":"right",j=b.bind(this,d,i+" "+h,f);return d.addClass(h),a(d,{addClass:i}).start().done(j),function(){g=!0}}f()},beforeRemoveClass:function(d,e,f){if("active"===e){var g=!1,h=d.data(c),i="next"===h?"left":"right",j=b.bind(this,d,i,f);return a(d,{addClass:i}).start().done(j),function(){g=!0}}f()}}}]),angular.module("ui.bootstrap.dateparser",[]).service("uibDateParser",["$log","$locale","orderByFilter",function(a,b,c){function d(a){var b=[],d=a.split(""),e=a.indexOf("'");if(e>-1){var f=!1;a=a.split("");for(var g=e;g<a.length;g++)f?("'"===a[g]&&(g+1<a.length&&"'"===a[g+1]?(a[g+1]="$",d[g+1]=""):(d[g]="",f=!1)),a[g]="$"):"'"===a[g]&&(a[g]="$",d[g]="",f=!0);a=a.join("")}return angular.forEach(m,function(c){var e=a.indexOf(c.key);if(e>-1){a=a.split(""),d[e]="("+c.regex+")",a[e]="$";for(var f=e+1,g=e+c.key.length;g>f;f++)d[f]="",a[f]="$";a=a.join(""),b.push({index:e,apply:c.apply,matcher:c.regex})}}),{regex:new RegExp("^"+d.join("")+"$"),map:c(b,"index")}}function e(a,b,c){return 1>c?!1:1===b&&c>28?29===c&&(a%4===0&&a%100!==0||a%400===0):3===b||5===b||8===b||10===b?31>c:!0}function f(a){return parseInt(a,10)}function g(a,b){return a&&b?k(a,b):a}function h(a,b){return a&&b?k(a,b,!0):a}function i(a,b){var c=Date.parse("Jan 01, 1970 00:00:00 "+a)/6e4;return isNaN(c)?b:c}function j(a,b){return a=new Date(a.getTime()),a.setMinutes(a.getMinutes()+b),a}function k(a,b,c){c=c?-1:1;var d=i(b,a.getTimezoneOffset());return j(a,c*(d-a.getTimezoneOffset()))}var l,m,n=/[\\\^\$\*\+\?\|\[\]\(\)\.\{\}]/g;this.init=function(){l=b.id,this.parsers={},m=[{key:"yyyy",regex:"\\d{4}",apply:function(a){this.year=+a}},{key:"yy",regex:"\\d{2}",apply:function(a){this.year=+a+2e3}},{key:"y",regex:"\\d{1,4}",apply:function(a){this.year=+a}},{key:"M!",regex:"0?[1-9]|1[0-2]",apply:function(a){this.month=a-1}},{key:"MMMM",regex:b.DATETIME_FORMATS.MONTH.join("|"),apply:function(a){this.month=b.DATETIME_FORMATS.MONTH.indexOf(a)}},{key:"MMM",regex:b.DATETIME_FORMATS.SHORTMONTH.join("|"),apply:function(a){this.month=b.DATETIME_FORMATS.SHORTMONTH.indexOf(a)}},{key:"MM",regex:"0[1-9]|1[0-2]",apply:function(a){this.month=a-1}},{key:"M",regex:"[1-9]|1[0-2]",apply:function(a){this.month=a-1}},{key:"d!",regex:"[0-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},{key:"dd",regex:"[0-2][0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},{key:"d",regex:"[1-2]?[0-9]{1}|3[0-1]{1}",apply:function(a){this.date=+a}},{key:"EEEE",regex:b.DATETIME_FORMATS.DAY.join("|")},{key:"EEE",regex:b.DATETIME_FORMATS.SHORTDAY.join("|")},{key:"HH",regex:"(?:0|1)[0-9]|2[0-3]",apply:function(a){this.hours=+a}},{key:"hh",regex:"0[0-9]|1[0-2]",apply:function(a){this.hours=+a}},{key:"H",regex:"1?[0-9]|2[0-3]",apply:function(a){this.hours=+a}},{key:"h",regex:"[0-9]|1[0-2]",apply:function(a){this.hours=+a}},{key:"mm",regex:"[0-5][0-9]",apply:function(a){this.minutes=+a}},{key:"m",regex:"[0-9]|[1-5][0-9]",apply:function(a){this.minutes=+a}},{key:"sss",regex:"[0-9][0-9][0-9]",apply:function(a){this.milliseconds=+a}},{key:"ss",regex:"[0-5][0-9]",apply:function(a){this.seconds=+a}},{key:"s",regex:"[0-9]|[1-5][0-9]",apply:function(a){this.seconds=+a}},{key:"a",regex:b.DATETIME_FORMATS.AMPMS.join("|"),apply:function(a){12===this.hours&&(this.hours=0),"PM"===a&&(this.hours+=12)}},{key:"Z",regex:"[+-]\\d{4}",apply:function(a){var b=a.match(/([+-])(\d{2})(\d{2})/),c=b[1],d=b[2],e=b[3];this.hours+=f(c+d),this.minutes+=f(c+e)}},{key:"ww",regex:"[0-4][0-9]|5[0-3]"},{key:"w",regex:"[0-9]|[1-4][0-9]|5[0-3]"},{key:"GGGG",regex:b.DATETIME_FORMATS.ERANAMES.join("|").replace(/\s/g,"\\s")},{key:"GGG",regex:b.DATETIME_FORMATS.ERAS.join("|")},{key:"GG",regex:b.DATETIME_FORMATS.ERAS.join("|")},{key:"G",regex:b.DATETIME_FORMATS.ERAS.join("|")}]},this.init(),this.parse=function(c,f,g){if(!angular.isString(c)||!f)return c;f=b.DATETIME_FORMATS[f]||f,f=f.replace(n,"\\$&"),b.id!==l&&this.init(),this.parsers[f]||(this.parsers[f]=d(f));var h=this.parsers[f],i=h.regex,j=h.map,k=c.match(i),m=!1;if(k&&k.length){var o,p;angular.isDate(g)&&!isNaN(g.getTime())?o={year:g.getFullYear(),month:g.getMonth(),date:g.getDate(),hours:g.getHours(),minutes:g.getMinutes(),seconds:g.getSeconds(),milliseconds:g.getMilliseconds()}:(g&&a.warn("dateparser:","baseDate is not a valid date"),o={year:1900,month:0,date:1,hours:0,minutes:0,seconds:0,milliseconds:0});for(var q=1,r=k.length;r>q;q++){var s=j[q-1];"Z"===s.matcher&&(m=!0),s.apply&&s.apply.call(o,k[q])}var t=m?Date.prototype.setUTCFullYear:Date.prototype.setFullYear,u=m?Date.prototype.setUTCHours:Date.prototype.setHours;return e(o.year,o.month,o.date)&&(!angular.isDate(g)||isNaN(g.getTime())||m?(p=new Date(0),t.call(p,o.year,o.month,o.date),u.call(p,o.hours||0,o.minutes||0,o.seconds||0,o.milliseconds||0)):(p=new Date(g),t.call(p,o.year,o.month,o.date),u.call(p,o.hours,o.minutes,o.seconds,o.milliseconds))),p}},this.toTimezone=g,this.fromTimezone=h,this.timezoneToOffset=i,this.addDateMinutes=j,this.convertTimezoneToLocal=k}]),angular.module("ui.bootstrap.isClass",[]).directive("uibIsClass",["$animate",function(a){var b=/^\s*([\s\S]+?)\s+on\s+([\s\S]+?)\s*$/,c=/^\s*([\s\S]+?)\s+for\s+([\s\S]+?)\s*$/;return{restrict:"A",compile:function(d,e){function f(a,b,c){i.push(a),j.push({scope:a,element:b}),o.forEach(function(b,c){g(b,a)}),a.$on("$destroy",h)}function g(b,d){var e=b.match(c),f=d.$eval(e[1]),g=e[2],h=k[b];if(!h){var i=function(b){var c=null;j.some(function(a){var d=a.scope.$eval(m);return d===b?(c=a,!0):void 0}),h.lastActivated!==c&&(h.lastActivated&&a.removeClass(h.lastActivated.element,f),c&&a.addClass(c.element,f),h.lastActivated=c)};k[b]=h={lastActivated:null,scope:d,watchFn:i,compareWithExp:g,watcher:d.$watch(g,i)}}h.watchFn(d.$eval(g))}function h(a){var b=a.targetScope,c=i.indexOf(b);if(i.splice(c,1),j.splice(c,1),i.length){var d=i[0];angular.forEach(k,function(a){a.scope===b&&(a.watcher=d.$watch(a.compareWithExp,a.watchFn),a.scope=d)})}else k={}}var i=[],j=[],k={},l=e.uibIsClass.match(b),m=l[2],n=l[1],o=n.split(",");return f}}}]),angular.module("ui.bootstrap.position",[]).factory("$uibPosition",["$document","$window",function(a,b){var c,d={normal:/(auto|scroll)/,hidden:/(auto|scroll|hidden)/},e={auto:/\s?auto?\s?/i,primary:/^(top|bottom|left|right)$/,secondary:/^(top|bottom|left|right|center)$/,vertical:/^(top|bottom)$/};return{getRawNode:function(a){return a[0]||a},parseStyle:function(a){return a=parseFloat(a),isFinite(a)?a:0},offsetParent:function(c){function d(a){return"static"===(b.getComputedStyle(a).position||"static")}c=this.getRawNode(c);for(var e=c.offsetParent||a[0].documentElement;e&&e!==a[0].documentElement&&d(e);)e=e.offsetParent;return e||a[0].documentElement},scrollbarWidth:function(){if(angular.isUndefined(c)){var b=angular.element('<div style="position: absolute; top: -9999px; width: 50px; height: 50px; overflow: scroll;"></div>');a.find("body").append(b),c=b[0].offsetWidth-b[0].clientWidth,c=isFinite(c)?c:0,b.remove()}return c},scrollParent:function(c,e){c=this.getRawNode(c);var f=e?d.hidden:d.normal,g=a[0].documentElement,h=b.getComputedStyle(c),i="absolute"===h.position,j=c.parentElement||g;if(j===g||"fixed"===h.position)return g;for(;j.parentElement&&j!==g;){var k=b.getComputedStyle(j);if(i&&"static"!==k.position&&(i=!1),!i&&f.test(k.overflow+k.overflowY+k.overflowX))break;j=j.parentElement}return j},position:function(c,d){c=this.getRawNode(c);var e=this.offset(c);if(d){var f=b.getComputedStyle(c);e.top-=this.parseStyle(f.marginTop),e.left-=this.parseStyle(f.marginLeft)}var g=this.offsetParent(c),h={top:0,left:0};return g!==a[0].documentElement&&(h=this.offset(g),h.top+=g.clientTop-g.scrollTop,h.left+=g.clientLeft-g.scrollLeft),{width:Math.round(angular.isNumber(e.width)?e.width:c.offsetWidth),height:Math.round(angular.isNumber(e.height)?e.height:c.offsetHeight),top:Math.round(e.top-h.top),left:Math.round(e.left-h.left)}},offset:function(c){c=this.getRawNode(c);var d=c.getBoundingClientRect();return{width:Math.round(angular.isNumber(d.width)?d.width:c.offsetWidth),height:Math.round(angular.isNumber(d.height)?d.height:c.offsetHeight),top:Math.round(d.top+(b.pageYOffset||a[0].documentElement.scrollTop)),left:Math.round(d.left+(b.pageXOffset||a[0].documentElement.scrollLeft))}},viewportOffset:function(c,d,e){c=this.getRawNode(c),e=e!==!1?!0:!1;var f=c.getBoundingClientRect(),g={top:0,left:0,bottom:0,right:0},h=d?a[0].documentElement:this.scrollParent(c),i=h.getBoundingClientRect();if(g.top=i.top+h.clientTop,g.left=i.left+h.clientLeft,h===a[0].documentElement&&(g.top+=b.pageYOffset,g.left+=b.pageXOffset),g.bottom=g.top+h.clientHeight,g.right=g.left+h.clientWidth,e){var j=b.getComputedStyle(h);g.top+=this.parseStyle(j.paddingTop),g.bottom-=this.parseStyle(j.paddingBottom),g.left+=this.parseStyle(j.paddingLeft),g.right-=this.parseStyle(j.paddingRight)}return{top:Math.round(f.top-g.top),bottom:Math.round(g.bottom-f.bottom),left:Math.round(f.left-g.left),right:Math.round(g.right-f.right)}},parsePlacement:function(a){var b=e.auto.test(a);return b&&(a=a.replace(e.auto,"")),a=a.split("-"),a[0]=a[0]||"top",e.primary.test(a[0])||(a[0]="top"),a[1]=a[1]||"center",e.secondary.test(a[1])||(a[1]="center"),b?a[2]=!0:a[2]=!1,a},positionElements:function(a,c,d,f){a=this.getRawNode(a),c=this.getRawNode(c);var g=angular.isDefined(c.offsetWidth)?c.offsetWidth:c.prop("offsetWidth"),h=angular.isDefined(c.offsetHeight)?c.offsetHeight:c.prop("offsetHeight");d=this.parsePlacement(d);var i=f?this.offset(a):this.position(a),j={top:0,left:0,placement:""};if(d[2]){var k=this.viewportOffset(a),l=b.getComputedStyle(c),m={width:g+Math.round(Math.abs(this.parseStyle(l.marginLeft)+this.parseStyle(l.marginRight))),height:h+Math.round(Math.abs(this.parseStyle(l.marginTop)+this.parseStyle(l.marginBottom)))};if(d[0]="top"===d[0]&&m.height>k.top&&m.height<=k.bottom?"bottom":"bottom"===d[0]&&m.height>k.bottom&&m.height<=k.top?"top":"left"===d[0]&&m.width>k.left&&m.width<=k.right?"right":"right"===d[0]&&m.width>k.right&&m.width<=k.left?"left":d[0],d[1]="top"===d[1]&&m.height-i.height>k.bottom&&m.height-i.height<=k.top?"bottom":"bottom"===d[1]&&m.height-i.height>k.top&&m.height-i.height<=k.bottom?"top":"left"===d[1]&&m.width-i.width>k.right&&m.width-i.width<=k.left?"right":"right"===d[1]&&m.width-i.width>k.left&&m.width-i.width<=k.right?"left":d[1],"center"===d[1])if(e.vertical.test(d[0])){var n=i.width/2-g/2;k.left+n<0&&m.width-i.width<=k.right?d[1]="left":k.right+n<0&&m.width-i.width<=k.left&&(d[1]="right")}else{var o=i.height/2-m.height/2;k.top+o<0&&m.height-i.height<=k.bottom?d[1]="top":k.bottom+o<0&&m.height-i.height<=k.top&&(d[1]="bottom")}}switch(d[0]){case"top":j.top=i.top-h;break;case"bottom":j.top=i.top+i.height;break;case"left":j.left=i.left-g;break;case"right":j.left=i.left+i.width}switch(d[1]){case"top":j.top=i.top;break;case"bottom":j.top=i.top+i.height-h;break;case"left":j.left=i.left;break;case"right":j.left=i.left+i.width-g;break;case"center":e.vertical.test(d[0])?j.left=i.left+i.width/2-g/2:j.top=i.top+i.height/2-h/2}return j.top=Math.round(j.top),j.left=Math.round(j.left),j.placement="center"===d[1]?d[0]:d[0]+"-"+d[1],j},positionArrow:function(a,c){a=this.getRawNode(a);var d=a.querySelector(".tooltip-inner, .popover-inner");if(d){var f=angular.element(d).hasClass("tooltip-inner"),g=f?a.querySelector(".tooltip-arrow"):a.querySelector(".arrow");if(g){if(c=this.parsePlacement(c),"center"===c[1])return void angular.element(g).css({top:"",bottom:"",right:"",left:"",margin:""});var h="border-"+c[0]+"-width",i=b.getComputedStyle(g)[h],j="border-";j+=e.vertical.test(c[0])?c[0]+"-"+c[1]:c[1]+"-"+c[0],j+="-radius";var k=b.getComputedStyle(f?d:a)[j],l={top:"auto",bottom:"auto",left:"auto",right:"auto",margin:0};switch(c[0]){case"top":l.bottom=f?"0":"-"+i;break;case"bottom":l.top=f?"0":"-"+i;break;case"left":l.right=f?"0":"-"+i;break;case"right":l.left=f?"0":"-"+i}l[c[1]]=k,angular.element(g).css(l)}}}}}]),angular.module("ui.bootstrap.datepicker",["ui.bootstrap.dateparser","ui.bootstrap.isClass","ui.bootstrap.position"]).value("$datepickerSuppressError",!1).constant("uibDatepickerConfig",{datepickerMode:"day",formatDay:"dd",formatMonth:"MMMM",formatYear:"yyyy",formatDayHeader:"EEE",formatDayTitle:"MMMM yyyy",formatMonthTitle:"yyyy",maxDate:null,maxMode:"year",minDate:null,minMode:"day",ngModelOptions:{},shortcutPropagation:!1,showWeeks:!0,yearColumns:5,yearRows:4}).controller("UibDatepickerController",["$scope","$attrs","$parse","$interpolate","$locale","$log","dateFilter","uibDatepickerConfig","$datepickerSuppressError","uibDateParser",function(a,b,c,d,e,f,g,h,i,j){var k=this,l={$setViewValue:angular.noop},m={},n=[];this.modes=["day","month","year"],angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle"],function(c){k[c]=angular.isDefined(b[c])?d(b[c])(a.$parent):h[c]}),angular.forEach(["showWeeks","yearRows","yearColumns","shortcutPropagation"],function(c){k[c]=angular.isDefined(b[c])?a.$parent.$eval(b[c]):h[c]}),angular.isDefined(b.startingDay)?k.startingDay=a.$parent.$eval(b.startingDay):angular.isNumber(h.startingDay)?k.startingDay=h.startingDay:k.startingDay=(e.DATETIME_FORMATS.FIRSTDAYOFWEEK+8)%7,angular.forEach(["minDate","maxDate"],function(c){b[c]?n.push(a.$parent.$watch(b[c],function(a){k[c]=a?angular.isDate(a)?j.fromTimezone(new Date(a),m.timezone):new Date(g(a,"medium")):null,k.refreshView()})):k[c]=h[c]?j.fromTimezone(new Date(h[c]),m.timezone):null}),angular.forEach(["minMode","maxMode"],function(c){b[c]?n.push(a.$parent.$watch(b[c],function(d){k[c]=a[c]=angular.isDefined(d)?d:b[c],("minMode"===c&&k.modes.indexOf(a.datepickerMode)<k.modes.indexOf(k[c])||"maxMode"===c&&k.modes.indexOf(a.datepickerMode)>k.modes.indexOf(k[c]))&&(a.datepickerMode=k[c])})):k[c]=a[c]=h[c]||null}),a.datepickerMode=a.datepickerMode||h.datepickerMode,a.uniqueId="datepicker-"+a.$id+"-"+Math.floor(1e4*Math.random()),angular.isDefined(b.initDate)?(this.activeDate=j.fromTimezone(a.$parent.$eval(b.initDate),m.timezone)||new Date,n.push(a.$parent.$watch(b.initDate,function(a){a&&(l.$isEmpty(l.$modelValue)||l.$invalid)&&(k.activeDate=j.fromTimezone(a,m.timezone),k.refreshView())}))):this.activeDate=new Date,a.disabled=angular.isDefined(b.disabled)||!1,angular.isDefined(b.ngDisabled)&&n.push(a.$parent.$watch(b.ngDisabled,function(b){a.disabled=b,k.refreshView()})),a.isActive=function(b){return 0===k.compare(b.date,k.activeDate)?(a.activeDateId=b.uid,!0):!1},this.init=function(a){l=a,m=a.$options||h.ngModelOptions,l.$modelValue&&(this.activeDate=l.$modelValue),l.$render=function(){k.render()}},this.render=function(){if(l.$viewValue){var a=new Date(l.$viewValue),b=!isNaN(a);b?this.activeDate=j.fromTimezone(a,m.timezone):i||f.error('Datepicker directive: "ng-model" value must be a Date object')}this.refreshView()},this.refreshView=function(){if(this.element){a.selectedDt=null,this._refreshView(),a.activeDt&&(a.activeDateId=a.activeDt.uid);var b=l.$viewValue?new Date(l.$viewValue):null;b=j.fromTimezone(b,m.timezone),l.$setValidity("dateDisabled",!b||this.element&&!this.isDisabled(b))}},this.createDateObject=function(b,c){var d=l.$viewValue?new Date(l.$viewValue):null;d=j.fromTimezone(d,m.timezone);var e={date:b,label:g(b,c.replace(/d!/,"dd")).replace(/M!/,"MM"),selected:d&&0===this.compare(b,d),disabled:this.isDisabled(b),current:0===this.compare(b,new Date),customClass:this.customClass(b)||null};return d&&0===this.compare(b,d)&&(a.selectedDt=e),k.activeDate&&0===this.compare(e.date,k.activeDate)&&(a.activeDt=e),e},this.isDisabled=function(c){return a.disabled||this.minDate&&this.compare(c,this.minDate)<0||this.maxDate&&this.compare(c,this.maxDate)>0||b.dateDisabled&&a.dateDisabled({date:c,mode:a.datepickerMode})},this.customClass=function(b){return a.customClass({date:b,mode:a.datepickerMode})},this.split=function(a,b){for(var c=[];a.length>0;)c.push(a.splice(0,b));return c},a.select=function(b){if(a.datepickerMode===k.minMode){var c=l.$viewValue?j.fromTimezone(new Date(l.$viewValue),m.timezone):new Date(0,0,0,0,0,0,0);c.setFullYear(b.getFullYear(),b.getMonth(),b.getDate()),c=j.toTimezone(c,m.timezone),l.$setViewValue(c),l.$render()}else k.activeDate=b,a.datepickerMode=k.modes[k.modes.indexOf(a.datepickerMode)-1]},a.move=function(a){var b=k.activeDate.getFullYear()+a*(k.step.years||0),c=k.activeDate.getMonth()+a*(k.step.months||0);k.activeDate.setFullYear(b,c,1),k.refreshView()},a.toggleMode=function(b){b=b||1,a.datepickerMode===k.maxMode&&1===b||a.datepickerMode===k.minMode&&-1===b||(a.datepickerMode=k.modes[k.modes.indexOf(a.datepickerMode)+b])},a.keys={13:"enter",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down"};var o=function(){k.element[0].focus()};a.$on("uib:datepicker.focus",o),a.keydown=function(b){var c=a.keys[b.which];if(c&&!b.shiftKey&&!b.altKey&&!a.disabled)if(b.preventDefault(),k.shortcutPropagation||b.stopPropagation(),"enter"===c||"space"===c){if(k.isDisabled(k.activeDate))return;a.select(k.activeDate)}else!b.ctrlKey||"up"!==c&&"down"!==c?(k.handleKeyDown(c,b),k.refreshView()):a.toggleMode("up"===c?1:-1)},a.$on("$destroy",function(){for(;n.length;)n.shift()()})}]).controller("UibDaypickerController",["$scope","$element","dateFilter",function(a,b,c){function d(a,b){return 1!==b||a%4!==0||a%100===0&&a%400!==0?f[b]:29}function e(a){var b=new Date(a);b.setDate(b.getDate()+4-(b.getDay()||7));var c=b.getTime();return b.setMonth(0),b.setDate(1),Math.floor(Math.round((c-b)/864e5)/7)+1}var f=[31,28,31,30,31,30,31,31,30,31,30,31];this.step={months:1},this.element=b,this.init=function(b){angular.extend(b,this),a.showWeeks=b.showWeeks,b.refreshView()},this.getDates=function(a,b){for(var c,d=new Array(b),e=new Date(a),f=0;b>f;)c=new Date(e),d[f++]=c,e.setDate(e.getDate()+1);return d},this._refreshView=function(){var b=this.activeDate.getFullYear(),d=this.activeDate.getMonth(),f=new Date(this.activeDate);f.setFullYear(b,d,1);var g=this.startingDay-f.getDay(),h=g>0?7-g:-g,i=new Date(f);h>0&&i.setDate(-h+1);for(var j=this.getDates(i,42),k=0;42>k;k++)j[k]=angular.extend(this.createDateObject(j[k],this.formatDay),{secondary:j[k].getMonth()!==d,uid:a.uniqueId+"-"+k});a.labels=new Array(7);for(var l=0;7>l;l++)a.labels[l]={abbr:c(j[l].date,this.formatDayHeader),full:c(j[l].date,"EEEE")};if(a.title=c(this.activeDate,this.formatDayTitle),a.rows=this.split(j,7),a.showWeeks){a.weekNumbers=[];for(var m=(11-this.startingDay)%7,n=a.rows.length,o=0;n>o;o++)a.weekNumbers.push(e(a.rows[o][m].date))}},this.compare=function(a,b){var c=new Date(a.getFullYear(),a.getMonth(),a.getDate()),d=new Date(b.getFullYear(),b.getMonth(),b.getDate());return c.setFullYear(a.getFullYear()),d.setFullYear(b.getFullYear()),c-d},this.handleKeyDown=function(a,b){var c=this.activeDate.getDate();if("left"===a)c-=1;else if("up"===a)c-=7;else if("right"===a)c+=1;else if("down"===a)c+=7;else if("pageup"===a||"pagedown"===a){var e=this.activeDate.getMonth()+("pageup"===a?-1:1);this.activeDate.setMonth(e,1),c=Math.min(d(this.activeDate.getFullYear(),this.activeDate.getMonth()),c)}else"home"===a?c=1:"end"===a&&(c=d(this.activeDate.getFullYear(),this.activeDate.getMonth()));this.activeDate.setDate(c)}}]).controller("UibMonthpickerController",["$scope","$element","dateFilter",function(a,b,c){this.step={years:1},this.element=b,this.init=function(a){angular.extend(a,this),a.refreshView()},this._refreshView=function(){for(var b,d=new Array(12),e=this.activeDate.getFullYear(),f=0;12>f;f++)b=new Date(this.activeDate),b.setFullYear(e,f,1),d[f]=angular.extend(this.createDateObject(b,this.formatMonth),{uid:a.uniqueId+"-"+f});a.title=c(this.activeDate,this.formatMonthTitle),a.rows=this.split(d,3)},this.compare=function(a,b){var c=new Date(a.getFullYear(),a.getMonth()),d=new Date(b.getFullYear(),b.getMonth());return c.setFullYear(a.getFullYear()),d.setFullYear(b.getFullYear()),c-d},this.handleKeyDown=function(a,b){var c=this.activeDate.getMonth();if("left"===a)c-=1;else if("up"===a)c-=3;else if("right"===a)c+=1;else if("down"===a)c+=3;else if("pageup"===a||"pagedown"===a){var d=this.activeDate.getFullYear()+("pageup"===a?-1:1);this.activeDate.setFullYear(d)}else"home"===a?c=0:"end"===a&&(c=11);this.activeDate.setMonth(c)}}]).controller("UibYearpickerController",["$scope","$element","dateFilter",function(a,b,c){function d(a){return parseInt((a-1)/f,10)*f+1}var e,f;this.element=b,this.yearpickerInit=function(){e=this.yearColumns,f=this.yearRows*e,this.step={years:f}},this._refreshView=function(){for(var b,c=new Array(f),g=0,h=d(this.activeDate.getFullYear());f>g;g++)b=new Date(this.activeDate),b.setFullYear(h+g,0,1),c[g]=angular.extend(this.createDateObject(b,this.formatYear),{uid:a.uniqueId+"-"+g});a.title=[c[0].label,c[f-1].label].join(" - "),a.rows=this.split(c,e),a.columns=e},this.compare=function(a,b){return a.getFullYear()-b.getFullYear()},this.handleKeyDown=function(a,b){var c=this.activeDate.getFullYear();"left"===a?c-=1:"up"===a?c-=e:"right"===a?c+=1:"down"===a?c+=e:"pageup"===a||"pagedown"===a?c+=("pageup"===a?-1:1)*f:"home"===a?c=d(this.activeDate.getFullYear()):"end"===a&&(c=d(this.activeDate.getFullYear())+f-1),this.activeDate.setFullYear(c)}}]).directive("uibDatepicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/datepicker.html"},scope:{datepickerMode:"=?",dateDisabled:"&",customClass:"&",shortcutPropagation:"&?"},require:["uibDatepicker","^ngModel"],controller:"UibDatepickerController",controllerAs:"datepicker",link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}).directive("uibDaypicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/day.html"},require:["^uibDatepicker","uibDaypicker"],controller:"UibDaypickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibMonthpicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/month.html"},require:["^uibDatepicker","uibMonthpicker"],controller:"UibMonthpickerController",link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibYearpicker",function(){return{replace:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/year.html"},require:["^uibDatepicker","uibYearpicker"],controller:"UibYearpickerController",link:function(a,b,c,d){var e=d[0];angular.extend(e,d[1]),e.yearpickerInit(),e.refreshView()}}}).constant("uibDatepickerPopupConfig",{altInputFormats:[],appendToBody:!1,clearText:"Clear",closeOnDateSelection:!0,closeText:"Done",currentText:"Today",datepickerPopup:"yyyy-MM-dd",datepickerPopupTemplateUrl:"uib/template/datepicker/popup.html",datepickerTemplateUrl:"uib/template/datepicker/datepicker.html",html5Types:{date:"yyyy-MM-dd","datetime-local":"yyyy-MM-ddTHH:mm:ss.sss",month:"yyyy-MM"},onOpenFocus:!0,showButtonBar:!0
+}).controller("UibDatepickerPopupController",["$scope","$element","$attrs","$compile","$parse","$document","$rootScope","$uibPosition","dateFilter","uibDateParser","uibDatepickerPopupConfig","$timeout","uibDatepickerConfig",function(a,b,c,d,e,f,g,h,i,j,k,l,m){function n(a){return a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()})}function o(b){var c=j.parse(b,t,a.date);if(isNaN(c))for(var d=0;d<E.length;d++)if(c=j.parse(b,E[d],a.date),!isNaN(c))return c;return c}function p(a){if(angular.isNumber(a)&&(a=new Date(a)),!a)return null;if(angular.isDate(a)&&!isNaN(a))return a;if(angular.isString(a)){var b=o(a);if(!isNaN(b))return j.toTimezone(b,C.timezone)}return B.$options&&B.$options.allowInvalid?a:void 0}function q(a,b){var d=a||b;return c.ngRequired||d?(angular.isNumber(d)&&(d=new Date(d)),d?angular.isDate(d)&&!isNaN(d)?!0:angular.isString(d)?!isNaN(o(b)):!1:!0):!0}function r(c){if(a.isOpen||!a.disabled){var d=D[0],e=b[0].contains(c.target),f=void 0!==d.contains&&d.contains(c.target);!a.isOpen||e||f||a.$apply(function(){a.isOpen=!1})}}function s(c){27===c.which&&a.isOpen?(c.preventDefault(),c.stopPropagation(),a.$apply(function(){a.isOpen=!1}),b[0].focus()):40!==c.which||a.isOpen||(c.preventDefault(),c.stopPropagation(),a.$apply(function(){a.isOpen=!0}))}var t,u,v,w,x,y,z,A,B,C,D,E,F={},G=!1,H=[];a.watchData={},this.init=function(h){if(B=h,C=h.$options||m.ngModelOptions,u=angular.isDefined(c.closeOnDateSelection)?a.$parent.$eval(c.closeOnDateSelection):k.closeOnDateSelection,v=angular.isDefined(c.datepickerAppendToBody)?a.$parent.$eval(c.datepickerAppendToBody):k.appendToBody,w=angular.isDefined(c.onOpenFocus)?a.$parent.$eval(c.onOpenFocus):k.onOpenFocus,x=angular.isDefined(c.datepickerPopupTemplateUrl)?c.datepickerPopupTemplateUrl:k.datepickerPopupTemplateUrl,y=angular.isDefined(c.datepickerTemplateUrl)?c.datepickerTemplateUrl:k.datepickerTemplateUrl,E=angular.isDefined(c.altInputFormats)?a.$parent.$eval(c.altInputFormats):k.altInputFormats,a.showButtonBar=angular.isDefined(c.showButtonBar)?a.$parent.$eval(c.showButtonBar):k.showButtonBar,k.html5Types[c.type]?(t=k.html5Types[c.type],G=!0):(t=c.uibDatepickerPopup||k.datepickerPopup,c.$observe("uibDatepickerPopup",function(a,b){var c=a||k.datepickerPopup;if(c!==t&&(t=c,B.$modelValue=null,!t))throw new Error("uibDatepickerPopup must have a date format specified.")})),!t)throw new Error("uibDatepickerPopup must have a date format specified.");if(G&&c.uibDatepickerPopup)throw new Error("HTML5 date input types do not support custom formats.");z=angular.element("<div uib-datepicker-popup-wrap><div uib-datepicker></div></div>"),a.ngModelOptions=angular.copy(C),a.ngModelOptions.timezone=null,z.attr({"ng-model":"date","ng-model-options":"ngModelOptions","ng-change":"dateSelection(date)","template-url":x}),A=angular.element(z.children()[0]),A.attr("template-url",y),G&&"month"===c.type&&(A.attr("datepicker-mode",'"month"'),A.attr("min-mode","month")),a.datepickerOptions&&angular.forEach(a.datepickerOptions,function(a,b){-1===["minDate","maxDate","minMode","maxMode","initDate","datepickerMode"].indexOf(b)?A.attr(n(b),a):A.attr(n(b),"datepickerOptions."+b)}),angular.forEach(["minMode","maxMode","datepickerMode","shortcutPropagation"],function(b){if(c[b]){var d=e(c[b]),f={get:function(){return d(a.$parent)}};if(A.attr(n(b),"watchData."+b),"datepickerMode"===b){var g=d.assign;f.set=function(b){g(a.$parent,b)}}Object.defineProperty(a.watchData,b,f)}}),angular.forEach(["minDate","maxDate","initDate"],function(b){if(c[b]){var d=e(c[b]);H.push(a.$parent.$watch(d,function(c){"minDate"===b||"maxDate"===b?(null===c?F[b]=null:angular.isDate(c)?F[b]=j.fromTimezone(new Date(c),C.timezone):F[b]=new Date(i(c,"medium")),a.watchData[b]=null===c?null:F[b]):a.watchData[b]=j.fromTimezone(new Date(c),C.timezone)})),A.attr(n(b),"watchData."+b)}}),c.dateDisabled&&A.attr("date-disabled","dateDisabled({ date: date, mode: mode })"),angular.forEach(["formatDay","formatMonth","formatYear","formatDayHeader","formatDayTitle","formatMonthTitle","showWeeks","startingDay","yearRows","yearColumns"],function(a){angular.isDefined(c[a])&&A.attr(n(a),c[a])}),c.customClass&&A.attr("custom-class","customClass({ date: date, mode: mode })"),G?B.$formatters.push(function(b){return a.date=j.fromTimezone(b,C.timezone),b}):(B.$$parserName="date",B.$validators.date=q,B.$parsers.unshift(p),B.$formatters.push(function(b){return B.$isEmpty(b)?(a.date=b,b):(a.date=j.fromTimezone(b,C.timezone),t=t.replace(/M!/,"MM").replace(/d!/,"dd"),i(a.date,t))})),B.$viewChangeListeners.push(function(){a.date=o(B.$viewValue)}),b.on("keydown",s),D=d(z)(a),z.remove(),v?f.find("body").append(D):b.after(D),a.$on("$destroy",function(){for(a.isOpen===!0&&(g.$$phase||a.$apply(function(){a.isOpen=!1})),D.remove(),b.off("keydown",s),f.off("click",r);H.length;)H.shift()()})},a.getText=function(b){return a[b+"Text"]||k[b+"Text"]},a.isDisabled=function(b){return"today"===b&&(b=new Date),a.watchData.minDate&&a.compare(b,F.minDate)<0||a.watchData.maxDate&&a.compare(b,F.maxDate)>0},a.compare=function(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate())-new Date(b.getFullYear(),b.getMonth(),b.getDate())},a.dateSelection=function(c){angular.isDefined(c)&&(a.date=c);var d=a.date?i(a.date,t):null;b.val(d),B.$setViewValue(d),u&&(a.isOpen=!1,b[0].focus())},a.keydown=function(c){27===c.which&&(c.stopPropagation(),a.isOpen=!1,b[0].focus())},a.select=function(b){if("today"===b){var c=new Date;angular.isDate(a.date)?(b=new Date(a.date),b.setFullYear(c.getFullYear(),c.getMonth(),c.getDate())):b=new Date(c.setHours(0,0,0,0))}a.dateSelection(b)},a.close=function(){a.isOpen=!1,b[0].focus()},a.disabled=angular.isDefined(c.disabled)||!1,c.ngDisabled&&H.push(a.$parent.$watch(e(c.ngDisabled),function(b){a.disabled=b})),a.$watch("isOpen",function(c){c?a.disabled?a.isOpen=!1:(a.position=v?h.offset(b):h.position(b),a.position.top=a.position.top+b.prop("offsetHeight"),l(function(){w&&a.$broadcast("uib:datepicker.focus"),f.on("click",r)},0,!1)):f.off("click",r)})}]).directive("uibDatepickerPopup",function(){return{require:["ngModel","uibDatepickerPopup"],controller:"UibDatepickerPopupController",scope:{datepickerOptions:"=?",isOpen:"=?",currentText:"@",clearText:"@",closeText:"@",dateDisabled:"&",customClass:"&"},link:function(a,b,c,d){var e=d[0],f=d[1];f.init(e)}}}).directive("uibDatepickerPopupWrap",function(){return{replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/datepicker/popup.html"}}}),angular.module("ui.bootstrap.debounce",[]).factory("$$debounce",["$timeout",function(a){return function(b,c){var d;return function(){var e=this,f=Array.prototype.slice.call(arguments);d&&a.cancel(d),d=a(function(){b.apply(e,f)},c)}}}]),angular.module("ui.bootstrap.dropdown",["ui.bootstrap.position"]).constant("uibDropdownConfig",{appendToOpenClass:"uib-dropdown-open",openClass:"open"}).service("uibDropdownService",["$document","$rootScope",function(a,b){var c=null;this.open=function(b){c||(a.on("click",d),a.on("keydown",e)),c&&c!==b&&(c.isOpen=!1),c=b},this.close=function(b){c===b&&(c=null,a.off("click",d),a.off("keydown",e))};var d=function(a){if(c&&!(a&&"disabled"===c.getAutoClose()||a&&3===a.which)){var d=c.getToggleElement();if(!(a&&d&&d[0].contains(a.target))){var e=c.getDropdownElement();a&&"outsideClick"===c.getAutoClose()&&e&&e[0].contains(a.target)||(c.isOpen=!1,b.$$phase||c.$apply())}}},e=function(a){27===a.which?(c.focusToggleElement(),d()):c.isKeynavEnabled()&&-1!==[38,40].indexOf(a.which)&&c.isOpen&&(a.preventDefault(),a.stopPropagation(),c.focusDropdownEntry(a.which))}}]).controller("UibDropdownController",["$scope","$element","$attrs","$parse","uibDropdownConfig","uibDropdownService","$animate","$uibPosition","$document","$compile","$templateRequest",function(a,b,c,d,e,f,g,h,i,j,k){var l,m,n=this,o=a.$new(),p=e.appendToOpenClass,q=e.openClass,r=angular.noop,s=c.onToggle?d(c.onToggle):angular.noop,t=!1,u=null,v=!1,w=i.find("body");b.addClass("dropdown"),this.init=function(){if(c.isOpen&&(m=d(c.isOpen),r=m.assign,a.$watch(m,function(a){o.isOpen=!!a})),angular.isDefined(c.dropdownAppendTo)){var e=d(c.dropdownAppendTo)(o);e&&(u=angular.element(e))}t=angular.isDefined(c.dropdownAppendToBody),v=angular.isDefined(c.keyboardNav),t&&!u&&(u=w),u&&n.dropdownMenu&&(u.append(n.dropdownMenu),b.on("$destroy",function(){n.dropdownMenu.remove()}))},this.toggle=function(a){return o.isOpen=arguments.length?!!a:!o.isOpen},this.isOpen=function(){return o.isOpen},o.getToggleElement=function(){return n.toggleElement},o.getAutoClose=function(){return c.autoClose||"always"},o.getElement=function(){return b},o.isKeynavEnabled=function(){return v},o.focusDropdownEntry=function(a){var c=n.dropdownMenu?angular.element(n.dropdownMenu).find("a"):b.find("ul").eq(0).find("a");switch(a){case 40:angular.isNumber(n.selectedOption)?n.selectedOption=n.selectedOption===c.length-1?n.selectedOption:n.selectedOption+1:n.selectedOption=0;break;case 38:angular.isNumber(n.selectedOption)?n.selectedOption=0===n.selectedOption?0:n.selectedOption-1:n.selectedOption=c.length-1}c[n.selectedOption].focus()},o.getDropdownElement=function(){return n.dropdownMenu},o.focusToggleElement=function(){n.toggleElement&&n.toggleElement[0].focus()},o.$watch("isOpen",function(c,d){if(u&&n.dropdownMenu){var e,i,m=h.positionElements(b,n.dropdownMenu,"bottom-left",!0);if(e={top:m.top+"px",display:c?"block":"none"},i=n.dropdownMenu.hasClass("dropdown-menu-right"),i?(e.left="auto",e.right=window.innerWidth-(m.left+b.prop("offsetWidth"))+"px"):(e.left=m.left+"px",e.right="auto"),!t){var v=h.offset(u);e.top=m.top-v.top+"px",i?e.right=window.innerWidth-(m.left-v.left+b.prop("offsetWidth"))+"px":e.left=m.left-v.left+"px"}n.dropdownMenu.css(e)}var w=u?u:b;if(g[c?"addClass":"removeClass"](w,u?p:q).then(function(){angular.isDefined(c)&&c!==d&&s(a,{open:!!c})}),c)n.dropdownMenuTemplateUrl&&k(n.dropdownMenuTemplateUrl).then(function(a){l=o.$new(),j(a.trim())(l,function(a){var b=a;n.dropdownMenu.replaceWith(b),n.dropdownMenu=b})}),o.focusToggleElement(),f.open(o);else{if(n.dropdownMenuTemplateUrl){l&&l.$destroy();var x=angular.element('<ul class="dropdown-menu"></ul>');n.dropdownMenu.replaceWith(x),n.dropdownMenu=x}f.close(o),n.selectedOption=null}angular.isFunction(r)&&r(a,c)}),a.$on("$locationChangeSuccess",function(){"disabled"!==o.getAutoClose()&&(o.isOpen=!1)})}]).directive("uibDropdown",function(){return{controller:"UibDropdownController",link:function(a,b,c,d){d.init()}}}).directive("uibDropdownMenu",function(){return{restrict:"A",require:"?^uibDropdown",link:function(a,b,c,d){if(d&&!angular.isDefined(c.dropdownNested)){b.addClass("dropdown-menu");var e=c.templateUrl;e&&(d.dropdownMenuTemplateUrl=e),d.dropdownMenu||(d.dropdownMenu=b)}}}}).directive("uibDropdownToggle",function(){return{require:"?^uibDropdown",link:function(a,b,c,d){if(d){b.addClass("dropdown-toggle"),d.toggleElement=b;var e=function(e){e.preventDefault(),b.hasClass("disabled")||c.disabled||a.$apply(function(){d.toggle()})};b.bind("click",e),b.attr({"aria-haspopup":!0,"aria-expanded":!1}),a.$watch(d.isOpen,function(a){b.attr("aria-expanded",!!a)}),a.$on("$destroy",function(){b.unbind("click",e)})}}}}),angular.module("ui.bootstrap.stackedMap",[]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b===a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b===a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}),angular.module("ui.bootstrap.modal",["ui.bootstrap.stackedMap"]).factory("$$multiMap",function(){return{createNew:function(){var a={};return{entries:function(){return Object.keys(a).map(function(b){return{key:b,value:a[b]}})},get:function(b){return a[b]},hasKey:function(b){return!!a[b]},keys:function(){return Object.keys(a)},put:function(b,c){a[b]||(a[b]=[]),a[b].push(c)},remove:function(b,c){var d=a[b];if(d){var e=d.indexOf(c);-1!==e&&d.splice(e,1),d.length||delete a[b]}}}}}}).provider("$uibResolve",function(){var a=this;this.resolver=null,this.setResolver=function(a){this.resolver=a},this.$get=["$injector","$q",function(b,c){var d=a.resolver?b.get(a.resolver):null;return{resolve:function(a,e,f,g){if(d)return d.resolve(a,e,f,g);var h=[];return angular.forEach(a,function(a){angular.isFunction(a)||angular.isArray(a)?h.push(c.resolve(b.invoke(a))):angular.isString(a)?h.push(c.resolve(b.get(a))):h.push(c.resolve(a))}),c.all(h).then(function(b){var c={},d=0;return angular.forEach(a,function(a,e){c[e]=b[d++]}),c})}}}]}).directive("uibModalBackdrop",["$animateCss","$injector","$uibModalStack",function(a,b,c){function d(b,d,e){e.modalInClass&&(a(d,{addClass:e.modalInClass}).start(),b.$on(c.NOW_CLOSING_EVENT,function(c,f){var g=f();b.modalOptions.animation?a(d,{removeClass:e.modalInClass}).start().then(g):g()}))}return{replace:!0,templateUrl:"uib/template/modal/backdrop.html",compile:function(a,b){return a.addClass(b.backdropClass),d}}}]).directive("uibModalWindow",["$uibModalStack","$q","$animate","$animateCss","$document",function(a,b,c,d,e){return{scope:{index:"@"},replace:!0,transclude:!0,templateUrl:function(a,b){return b.templateUrl||"uib/template/modal/window.html"},link:function(f,g,h){g.addClass(h.windowClass||""),g.addClass(h.windowTopClass||""),f.size=h.size,f.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!==c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))},g.on("click",f.close),f.$isRendered=!0;var i=b.defer();h.$observe("modalRender",function(a){"true"===a&&i.resolve()}),i.promise.then(function(){var i=null;h.modalInClass&&(i=d(g,{addClass:h.modalInClass}).start(),f.$on(a.NOW_CLOSING_EVENT,function(a,b){var e=b();d?d(g,{removeClass:h.modalInClass}).start().then(e):c.removeClass(g,h.modalInClass).then(e)})),b.when(i).then(function(){if(!e[0].activeElement||!g[0].contains(e[0].activeElement)){var a=g[0].querySelector("[autofocus]");a?a.focus():g[0].focus()}});var j=a.getTop();j&&a.modalRendered(j.key)})}}}]).directive("uibModalAnimationClass",function(){return{compile:function(a,b){b.modalAnimation&&a.addClass(b.uibModalAnimationClass)}}}).directive("uibModalTransclude",function(){return{link:function(a,b,c,d,e){e(a.$parent,function(a){b.empty(),b.append(a)})}}}).factory("$uibModalStack",["$animate","$animateCss","$document","$compile","$rootScope","$q","$$multiMap","$$stackedMap",function(a,b,c,d,e,f,g,h){function i(){for(var a=-1,b=t.keys(),c=0;c<b.length;c++)t.get(b[c]).value.backdrop&&(a=c);return a}function j(a,b){var c=t.get(a).value,d=c.appendTo;t.remove(a),m(c.modalDomEl,c.modalScope,function(){var b=c.openedClass||s;u.remove(b,a),d.toggleClass(b,u.hasKey(b)),k(!0)},c.closedDeferred),l(),b&&b.focus?b.focus():d.focus&&d.focus()}function k(a){var b;t.length()>0&&(b=t.top().value,b.modalDomEl.toggleClass(b.windowTopClass||"",a))}function l(){if(p&&-1===i()){var a=q;m(p,q,function(){a=null}),p=void 0,q=void 0}}function m(a,c,d,e){function g(){g.done||(g.done=!0,b(a,{event:"leave"}).start().then(function(){a.remove(),e&&e.resolve()}),c.$destroy(),d&&d())}var h,i=null,j=function(){return h||(h=f.defer(),i=h.promise),function(){h.resolve()}};return c.$broadcast(v.NOW_CLOSING_EVENT,j),f.when(i).then(g)}function n(a){if(a.isDefaultPrevented())return a;var b=t.top();if(b)switch(a.which){case 27:b.value.keyboard&&(a.preventDefault(),e.$apply(function(){v.dismiss(b.key,"escape key press")}));break;case 9:v.loadFocusElementList(b);var c=!1;a.shiftKey?v.isFocusInFirstItem(a)&&(c=v.focusLastFocusableElement()):v.isFocusInLastItem(a)&&(c=v.focusFirstFocusableElement()),c&&(a.preventDefault(),a.stopPropagation())}}function o(a,b,c){return!a.value.modalScope.$broadcast("modal.closing",b,c).defaultPrevented}var p,q,r,s="modal-open",t=h.createNew(),u=g.createNew(),v={NOW_CLOSING_EVENT:"modal.stack.now-closing"},w=0,x="a[href], area[href], input:not([disabled]), button:not([disabled]),select:not([disabled]), textarea:not([disabled]), iframe, object, embed, *[tabindex], *[contenteditable=true]";return e.$watch(i,function(a){q&&(q.index=a)}),c.on("keydown",n),e.$on("$destroy",function(){c.off("keydown",n)}),v.open=function(b,f){var g=c[0].activeElement,h=f.openedClass||s;k(!1),t.add(b,{deferred:f.deferred,renderDeferred:f.renderDeferred,closedDeferred:f.closedDeferred,modalScope:f.scope,backdrop:f.backdrop,keyboard:f.keyboard,openedClass:f.openedClass,windowTopClass:f.windowTopClass,animation:f.animation,appendTo:f.appendTo}),u.put(h,b);var j=f.appendTo,l=i();if(!j.length)throw new Error("appendTo element not found. Make sure that the element passed is in DOM.");l>=0&&!p&&(q=e.$new(!0),q.modalOptions=f,q.index=l,p=angular.element('<div uib-modal-backdrop="modal-backdrop"></div>'),p.attr("backdrop-class",f.backdropClass),f.animation&&p.attr("modal-animation","true"),d(p)(q),a.enter(p,j));var m=angular.element('<div uib-modal-window="modal-window"></div>');m.attr({"template-url":f.windowTemplateUrl,"window-class":f.windowClass,"window-top-class":f.windowTopClass,size:f.size,index:t.length()-1,animate:"animate"}).html(f.content),f.animation&&m.attr("modal-animation","true"),a.enter(d(m)(f.scope),j).then(function(){a.addClass(j,h)}),t.top().value.modalDomEl=m,t.top().value.modalOpener=g,v.clearFocusListCache()},v.close=function(a,b){var c=t.get(a);return c&&o(c,b,!0)?(c.value.modalScope.$$uibDestructionScheduled=!0,c.value.deferred.resolve(b),j(a,c.value.modalOpener),!0):!c},v.dismiss=function(a,b){var c=t.get(a);return c&&o(c,b,!1)?(c.value.modalScope.$$uibDestructionScheduled=!0,c.value.deferred.reject(b),j(a,c.value.modalOpener),!0):!c},v.dismissAll=function(a){for(var b=this.getTop();b&&this.dismiss(b.key,a);)b=this.getTop()},v.getTop=function(){return t.top()},v.modalRendered=function(a){var b=t.get(a);b&&b.value.renderDeferred.resolve()},v.focusFirstFocusableElement=function(){return r.length>0?(r[0].focus(),!0):!1},v.focusLastFocusableElement=function(){return r.length>0?(r[r.length-1].focus(),!0):!1},v.isFocusInFirstItem=function(a){return r.length>0?(a.target||a.srcElement)===r[0]:!1},v.isFocusInLastItem=function(a){return r.length>0?(a.target||a.srcElement)===r[r.length-1]:!1},v.clearFocusListCache=function(){r=[],w=0},v.loadFocusElementList=function(a){if((void 0===r||!r.length)&&a){var b=a.value.modalDomEl;b&&b.length&&(r=b[0].querySelectorAll(x))}},v}]).provider("$uibModal",function(){var a={options:{animation:!0,backdrop:!0,keyboard:!0},$get:["$rootScope","$q","$document","$templateRequest","$controller","$uibResolve","$uibModalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?c.when(a.template):e(angular.isFunction(a.templateUrl)?a.templateUrl():a.templateUrl)}var j={},k=null;return j.getPromiseChain=function(){return k},j.open=function(e){function j(){return r}var l=c.defer(),m=c.defer(),n=c.defer(),o=c.defer(),p={result:l.promise,opened:m.promise,closed:n.promise,rendered:o.promise,close:function(a){return h.close(p,a)},dismiss:function(a){return h.dismiss(p,a)}};if(e=angular.extend({},a.options,e),e.resolve=e.resolve||{},e.appendTo=e.appendTo||d.find("body").eq(0),!e.template&&!e.templateUrl)throw new Error("One of template or templateUrl options is required.");var q,r=c.all([i(e),g.resolve(e.resolve,{},null,null)]);return q=k=c.all([k]).then(j,j).then(function(a){var c=e.scope||b,d=c.$new();d.$close=p.close,d.$dismiss=p.dismiss,d.$on("$destroy",function(){d.$$uibDestructionScheduled||d.$dismiss("$uibUnscheduledDestruction")});var g,i={};e.controller&&(i.$scope=d,i.$uibModalInstance=p,angular.forEach(a[1],function(a,b){i[b]=a}),g=f(e.controller,i),e.controllerAs&&(e.bindToController&&(g.$close=d.$close,g.$dismiss=d.$dismiss,angular.extend(g,c)),d[e.controllerAs]=g)),h.open(p,{scope:d,deferred:l,renderDeferred:o,closedDeferred:n,content:a[0],animation:e.animation,backdrop:e.backdrop,keyboard:e.keyboard,backdropClass:e.backdropClass,windowTopClass:e.windowTopClass,windowClass:e.windowClass,windowTemplateUrl:e.windowTemplateUrl,size:e.size,openedClass:e.openedClass,appendTo:e.appendTo}),m.resolve(!0)},function(a){m.reject(a),l.reject(a)})["finally"](function(){k===q&&(k=null)}),p},j}]};return a}),angular.module("ui.bootstrap.paging",[]).factory("uibPaging",["$parse",function(a){return{create:function(b,c,d){b.setNumPages=d.numPages?a(d.numPages).assign:angular.noop,b.ngModelCtrl={$setViewValue:angular.noop},b._watchers=[],b.init=function(e,f){b.ngModelCtrl=e,b.config=f,e.$render=function(){b.render()},d.itemsPerPage?b._watchers.push(c.$parent.$watch(a(d.itemsPerPage),function(a){b.itemsPerPage=parseInt(a,10),c.totalPages=b.calculateTotalPages(),b.updatePage()})):b.itemsPerPage=f.itemsPerPage,c.$watch("totalItems",function(a,d){(angular.isDefined(a)||a!==d)&&(c.totalPages=b.calculateTotalPages(),b.updatePage())})},b.calculateTotalPages=function(){var a=b.itemsPerPage<1?1:Math.ceil(c.totalItems/b.itemsPerPage);return Math.max(a||0,1)},b.render=function(){c.page=parseInt(b.ngModelCtrl.$viewValue,10)||1},c.selectPage=function(a,d){d&&d.preventDefault();var e=!c.ngDisabled||!d;e&&c.page!==a&&a>0&&a<=c.totalPages&&(d&&d.target&&d.target.blur(),b.ngModelCtrl.$setViewValue(a),b.ngModelCtrl.$render())},c.getText=function(a){return c[a+"Text"]||b.config[a+"Text"]},c.noPrevious=function(){return 1===c.page},c.noNext=function(){return c.page===c.totalPages},b.updatePage=function(){b.setNumPages(c.$parent,c.totalPages),c.page>c.totalPages?c.selectPage(c.totalPages):b.ngModelCtrl.$render()},c.$on("$destroy",function(){for(;b._watchers.length;)b._watchers.shift()()})}}}]),angular.module("ui.bootstrap.pager",["ui.bootstrap.paging"]).controller("UibPagerController",["$scope","$attrs","uibPaging","uibPagerConfig",function(a,b,c,d){a.align=angular.isDefined(b.align)?a.$parent.$eval(b.align):d.align,c.create(this,a,b)}]).constant("uibPagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("uibPager",["uibPagerConfig",function(a){return{scope:{totalItems:"=",previousText:"@",nextText:"@",ngDisabled:"="},require:["uibPager","?ngModel"],controller:"UibPagerController",controllerAs:"pager",templateUrl:function(a,b){return b.templateUrl||"uib/template/pager/pager.html"},replace:!0,link:function(b,c,d,e){var f=e[0],g=e[1];g&&f.init(g,a)}}}]),angular.module("ui.bootstrap.pagination",["ui.bootstrap.paging"]).controller("UibPaginationController",["$scope","$attrs","$parse","uibPaging","uibPaginationConfig",function(a,b,c,d,e){function f(a,b,c){return{number:a,text:b,active:c}}function g(a,b){var c=[],d=1,e=b,g=angular.isDefined(i)&&b>i;g&&(j?(d=Math.max(a-Math.floor(i/2),1),e=d+i-1,e>b&&(e=b,d=e-i+1)):(d=(Math.ceil(a/i)-1)*i+1,e=Math.min(d+i-1,b)));for(var h=d;e>=h;h++){var m=f(h,h,h===a);c.push(m)}if(g&&i>0&&(!j||k||l)){if(d>1){if(!l||d>3){var n=f(d-1,"...",!1);c.unshift(n)}if(l){if(3===d){var o=f(2,"2",!1);c.unshift(o)}var p=f(1,"1",!1);c.unshift(p)}}if(b>e){if(!l||b-2>e){var q=f(e+1,"...",!1);c.push(q)}if(l){if(e===b-2){var r=f(b-1,b-1,!1);c.push(r)}var s=f(b,b,!1);c.push(s)}}}return c}var h=this,i=angular.isDefined(b.maxSize)?a.$parent.$eval(b.maxSize):e.maxSize,j=angular.isDefined(b.rotate)?a.$parent.$eval(b.rotate):e.rotate,k=angular.isDefined(b.forceEllipses)?a.$parent.$eval(b.forceEllipses):e.forceEllipses,l=angular.isDefined(b.boundaryLinkNumbers)?a.$parent.$eval(b.boundaryLinkNumbers):e.boundaryLinkNumbers;a.boundaryLinks=angular.isDefined(b.boundaryLinks)?a.$parent.$eval(b.boundaryLinks):e.boundaryLinks,a.directionLinks=angular.isDefined(b.directionLinks)?a.$parent.$eval(b.directionLinks):e.directionLinks,d.create(this,a,b),b.maxSize&&h._watchers.push(a.$parent.$watch(c(b.maxSize),function(a){i=parseInt(a,10),h.render()}));var m=this.render;this.render=function(){m(),a.page>0&&a.page<=a.totalPages&&(a.pages=g(a.page,a.totalPages))}}]).constant("uibPaginationConfig",{itemsPerPage:10,boundaryLinks:!1,boundaryLinkNumbers:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0,forceEllipses:!1}).directive("uibPagination",["$parse","uibPaginationConfig",function(a,b){return{scope:{totalItems:"=",firstText:"@",previousText:"@",nextText:"@",lastText:"@",ngDisabled:"="},require:["uibPagination","?ngModel"],controller:"UibPaginationController",controllerAs:"pagination",templateUrl:function(a,b){return b.templateUrl||"uib/template/pagination/pagination.html"},replace:!0,link:function(a,c,d,e){var f=e[0],g=e[1];g&&f.init(g,b)}}}]),angular.module("ui.bootstrap.tooltip",["ui.bootstrap.position","ui.bootstrap.stackedMap"]).provider("$uibTooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",placementClassPrefix:"",animation:!0,popupDelay:0,popupCloseDelay:0,useContentExp:!1},c={mouseenter:"mouseleave",click:"click",outsideClick:"outsideClick",focus:"blur",none:""},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$document","$uibPosition","$interpolate","$rootScope","$parse","$$stackedMap",function(e,f,g,h,i,j,k,l,m){function n(a){if(27===a.which){var b=o.top();b&&(b.value.close(),o.removeTop(),b=null)}}var o=m.createNew();return h.on("keypress",n),k.$on("$destroy",function(){h.off("keypress",n)}),function(e,k,m,n){function p(a){var b=(a||n.trigger||m).split(" "),d=b.map(function(a){return c[a]||a});return{show:b,hide:d}}n=angular.extend({},b,d,n);var q=a(e),r=j.startSymbol(),s=j.endSymbol(),t="<div "+q+'-popup title="'+r+"title"+s+'" '+(n.useContentExp?'content-exp="contentExp()" ':'content="'+r+"content"+s+'" ')+'placement="'+r+"placement"+s+'" popup-class="'+r+"popupClass"+s+'" animation="animation" is-open="isOpen"origin-scope="origScope" style="visibility: hidden; display: block; top: -9999px; left: -9999px;"></div>';return{compile:function(a,b){var c=f(t);return function(a,b,d,f){function j(){M.isOpen?q():m()}function m(){(!L||a.$eval(d[k+"Enable"]))&&(u(),x(),M.popupDelay?G||(G=g(r,M.popupDelay,!1)):r())}function q(){s(),M.popupCloseDelay?H||(H=g(t,M.popupCloseDelay,!1)):t()}function r(){return s(),u(),M.content?(v(),void M.$evalAsync(function(){M.isOpen=!0,y(!0),R()})):angular.noop}function s(){G&&(g.cancel(G),G=null),I&&(g.cancel(I),I=null)}function t(){M&&M.$evalAsync(function(){M&&(M.isOpen=!1,y(!1),M.animation?F||(F=g(w,150,!1)):w())})}function u(){H&&(g.cancel(H),H=null),F&&(g.cancel(F),F=null)}function v(){D||(E=M.$new(),D=c(E,function(a){J?h.find("body").append(a):b.after(a)}),z())}function w(){s(),u(),A(),D&&(D.remove(),D=null),E&&(E.$destroy(),E=null)}function x(){M.title=d[k+"Title"],P?M.content=P(a):M.content=d[e],M.popupClass=d[k+"Class"],M.placement=angular.isDefined(d[k+"Placement"])?d[k+"Placement"]:n.placement;var b=parseInt(d[k+"PopupDelay"],10),c=parseInt(d[k+"PopupCloseDelay"],10);M.popupDelay=isNaN(b)?n.popupDelay:b,M.popupCloseDelay=isNaN(c)?n.popupCloseDelay:c}function y(b){O&&angular.isFunction(O.assign)&&O.assign(a,b)}function z(){Q.length=0,P?(Q.push(a.$watch(P,function(a){M.content=a,!a&&M.isOpen&&t()})),Q.push(E.$watch(function(){N||(N=!0,E.$$postDigest(function(){N=!1,M&&M.isOpen&&R()}))}))):Q.push(d.$observe(e,function(a){M.content=a,!a&&M.isOpen?t():R()})),Q.push(d.$observe(k+"Title",function(a){M.title=a,M.isOpen&&R()})),Q.push(d.$observe(k+"Placement",function(a){M.placement=a?a:n.placement,M.isOpen&&R()}))}function A(){Q.length&&(angular.forEach(Q,function(a){a()}),Q.length=0)}function B(a){M&&M.isOpen&&D&&(b[0].contains(a.target)||D[0].contains(a.target)||q())}function C(){var a=d[k+"Trigger"];S(),K=p(a),"none"!==K.show&&K.show.forEach(function(a,c){"outsideClick"===a?(b.on("click",j),h.on("click",B)):a===K.hide[c]?b.on(a,j):a&&(b.on(a,m),b.on(K.hide[c],q)),b.on("keypress",function(a){27===a.which&&q()})})}var D,E,F,G,H,I,J=angular.isDefined(n.appendToBody)?n.appendToBody:!1,K=p(void 0),L=angular.isDefined(d[k+"Enable"]),M=a.$new(!0),N=!1,O=angular.isDefined(d[k+"IsOpen"])?l(d[k+"IsOpen"]):!1,P=n.useContentExp?l(d[e]):!1,Q=[],R=function(){D&&D.html()&&(I||(I=g(function(){D.css({top:0,left:0});var a=i.positionElements(b,D,M.placement,J);D.css({top:a.top+"px",left:a.left+"px",visibility:"visible"}),n.placementClassPrefix&&D.removeClass("top bottom left right"),D.removeClass(n.placementClassPrefix+"top "+n.placementClassPrefix+"top-left "+n.placementClassPrefix+"top-right "+n.placementClassPrefix+"bottom "+n.placementClassPrefix+"bottom-left "+n.placementClassPrefix+"bottom-right "+n.placementClassPrefix+"left "+n.placementClassPrefix+"left-top "+n.placementClassPrefix+"left-bottom "+n.placementClassPrefix+"right "+n.placementClassPrefix+"right-top "+n.placementClassPrefix+"right-bottom");var c=a.placement.split("-");D.addClass(c[0]+" "+n.placementClassPrefix+a.placement),i.positionArrow(D,a.placement),I=null},0,!1)))};M.origScope=a,M.isOpen=!1,o.add(M,{close:t}),M.contentExp=function(){return M.content},d.$observe("disabled",function(a){a&&s(),a&&M.isOpen&&t()}),O&&a.$watch(O,function(a){M&&!a===M.isOpen&&j()});var S=function(){K.show.forEach(function(a){"outsideClick"===a?b.off("click",j):(b.off(a,m),b.off(a,j))}),K.hide.forEach(function(a){"outsideClick"===a?h.off("click",B):b.off(a,q)})};C();var T=a.$eval(d[k+"Animation"]);M.animation=angular.isDefined(T)?!!T:n.animation;var U,V=k+"AppendToBody";U=V in d&&void 0===d[V]?!0:a.$eval(d[V]),J=angular.isDefined(U)?U:J,J&&a.$on("$locationChangeSuccess",function(){M.isOpen&&t()}),a.$on("$destroy",function(){S(),w(),o.remove(M),M=null})}}}}}]}).directive("uibTooltipTemplateTransclude",["$animate","$sce","$compile","$templateRequest",function(a,b,c,d){return{link:function(e,f,g){var h,i,j,k=e.$eval(g.tooltipTemplateTranscludeScope),l=0,m=function(){i&&(i.remove(),i=null),h&&(h.$destroy(),h=null),j&&(a.leave(j).then(function(){i=null}),i=j,j=null)};e.$watch(b.parseAsResourceUrl(g.uibTooltipTemplateTransclude),function(b){var g=++l;b?(d(b,!0).then(function(d){if(g===l){var e=k.$new(),i=d,n=c(i)(e,function(b){m(),a.enter(b,f)});h=e,j=n,h.$emit("$includeContentLoaded",b)}},function(){g===l&&(m(),e.$emit("$includeContentError",b))}),e.$emit("$includeContentRequested",b)):m()}),e.$on("$destroy",m)}}}]).directive("uibTooltipClasses",["$uibPosition",function(a){return{restrict:"A",link:function(b,c,d){if(b.placement){var e=a.parsePlacement(b.placement);c.addClass(e[0])}else c.addClass("top");b.popupClass&&c.addClass(b.popupClass),b.animation()&&c.addClass(d.tooltipAnimationClass)}}}]).directive("uibTooltipPopup",function(){return{replace:!0,scope:{content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/tooltip/tooltip-popup.html"}}).directive("uibTooltip",["$uibTooltip",function(a){return a("uibTooltip","tooltip","mouseenter")}]).directive("uibTooltipTemplatePopup",function(){return{replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"uib/template/tooltip/tooltip-template-popup.html"}}).directive("uibTooltipTemplate",["$uibTooltip",function(a){return a("uibTooltipTemplate","tooltip","mouseenter",{useContentExp:!0})}]).directive("uibTooltipHtmlPopup",function(){return{replace:!0,scope:{contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/tooltip/tooltip-html-popup.html"}}).directive("uibTooltipHtml",["$uibTooltip",function(a){return a("uibTooltipHtml","tooltip","mouseenter",{useContentExp:!0})}]),angular.module("ui.bootstrap.popover",["ui.bootstrap.tooltip"]).directive("uibPopoverTemplatePopup",function(){return{replace:!0,scope:{title:"@",contentExp:"&",placement:"@",popupClass:"@",animation:"&",isOpen:"&",originScope:"&"},templateUrl:"uib/template/popover/popover-template.html"}}).directive("uibPopoverTemplate",["$uibTooltip",function(a){
+return a("uibPopoverTemplate","popover","click",{useContentExp:!0})}]).directive("uibPopoverHtmlPopup",function(){return{replace:!0,scope:{contentExp:"&",title:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/popover/popover-html.html"}}).directive("uibPopoverHtml",["$uibTooltip",function(a){return a("uibPopoverHtml","popover","click",{useContentExp:!0})}]).directive("uibPopoverPopup",function(){return{replace:!0,scope:{title:"@",content:"@",placement:"@",popupClass:"@",animation:"&",isOpen:"&"},templateUrl:"uib/template/popover/popover.html"}}).directive("uibPopover",["$uibTooltip",function(a){return a("uibPopover","popover","click")}]),angular.module("ui.bootstrap.progressbar",[]).constant("uibProgressConfig",{animate:!0,max:100}).controller("UibProgressController",["$scope","$attrs","uibProgressConfig",function(a,b,c){var d=this,e=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.bars=[],a.max=angular.isDefined(a.max)?a.max:c.max,this.addBar=function(b,c,f){e||c.css({transition:"none"}),this.bars.push(b),b.max=a.max,b.title=f&&angular.isDefined(f.title)?f.title:"progressbar",b.$watch("value",function(a){b.recalculatePercentage()}),b.recalculatePercentage=function(){var a=d.bars.reduce(function(a,b){return b.percent=+(100*b.value/b.max).toFixed(2),a+b.percent},0);a>100&&(b.percent-=a-100)},b.$on("$destroy",function(){c=null,d.removeBar(b)})},this.removeBar=function(a){this.bars.splice(this.bars.indexOf(a),1),this.bars.forEach(function(a){a.recalculatePercentage()})},a.$watch("max",function(b){d.bars.forEach(function(b){b.max=a.max,b.recalculatePercentage()})})}]).directive("uibProgress",function(){return{replace:!0,transclude:!0,controller:"UibProgressController",require:"uibProgress",scope:{max:"=?"},templateUrl:"uib/template/progressbar/progress.html"}}).directive("uibBar",function(){return{replace:!0,transclude:!0,require:"^uibProgress",scope:{value:"=",type:"@"},templateUrl:"uib/template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b,c)}}}).directive("uibProgressbar",function(){return{replace:!0,transclude:!0,controller:"UibProgressController",scope:{value:"=",max:"=?",type:"@"},templateUrl:"uib/template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]),{title:c.title})}}}),angular.module("ui.bootstrap.rating",[]).constant("uibRatingConfig",{max:5,stateOn:null,stateOff:null,titles:["one","two","three","four","five"]}).controller("UibRatingController",["$scope","$attrs","uibRatingConfig",function(a,b,c){var d={$setViewValue:angular.noop};this.init=function(e){d=e,d.$render=this.render,d.$formatters.push(function(a){return angular.isNumber(a)&&a<<0!==a&&(a=Math.round(a)),a}),this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):c.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):c.stateOff;var f=angular.isDefined(b.titles)?a.$parent.$eval(b.titles):c.titles;this.titles=angular.isArray(f)&&f.length>0?f:c.titles;var g=angular.isDefined(b.ratingStates)?a.$parent.$eval(b.ratingStates):new Array(angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max);a.range=this.buildTemplateObjects(g)},this.buildTemplateObjects=function(a){for(var b=0,c=a.length;c>b;b++)a[b]=angular.extend({index:b},{stateOn:this.stateOn,stateOff:this.stateOff,title:this.getTitle(b)},a[b]);return a},this.getTitle=function(a){return a>=this.titles.length?a+1:this.titles[a]},a.rate=function(b){!a.readonly&&b>=0&&b<=a.range.length&&(d.$setViewValue(d.$viewValue===b?0:b),d.$render())},a.enter=function(b){a.readonly||(a.value=b),a.onHover({value:b})},a.reset=function(){a.value=d.$viewValue,a.onLeave()},a.onKeydown=function(b){/(37|38|39|40)/.test(b.which)&&(b.preventDefault(),b.stopPropagation(),a.rate(a.value+(38===b.which||39===b.which?1:-1)))},this.render=function(){a.value=d.$viewValue}}]).directive("uibRating",function(){return{require:["uibRating","ngModel"],scope:{readonly:"=?",onHover:"&",onLeave:"&"},controller:"UibRatingController",templateUrl:"uib/template/rating/rating.html",replace:!0,link:function(a,b,c,d){var e=d[0],f=d[1];e.init(f)}}}),angular.module("ui.bootstrap.tabs",[]).controller("UibTabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(b){b.active&&b!==a&&(b.active=!1,b.onDeselect(),a.selectCalled=!1)}),a.active=!0,a.selectCalled||(a.onSelect(),a.selectCalled=!0)},b.addTab=function(a){c.push(a),1===c.length&&a.active!==!1?a.active=!0:a.active?b.select(a):a.active=!1},b.removeTab=function(a){var e=c.indexOf(a);if(a.active&&c.length>1&&!d){var f=e===c.length-1?e-1:e+1;b.select(c[f])}c.splice(e,1)};var d;a.$on("$destroy",function(){d=!0})}]).directive("uibTabset",function(){return{transclude:!0,replace:!0,scope:{type:"@"},controller:"UibTabsetController",templateUrl:"uib/template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1}}}).directive("uibTab",["$parse",function(a){return{require:"^uibTabset",replace:!0,templateUrl:"uib/template/tabs/tab.html",transclude:!0,scope:{active:"=?",heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},controllerAs:"tab",link:function(b,c,d,e,f){b.$watch("active",function(a){a&&e.select(b)}),b.disabled=!1,d.disable&&b.$parent.$watch(a(d.disable),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},e.addTab(b),b.$on("$destroy",function(){e.removeTab(b)}),b.$transcludeFn=f}}}]).directive("uibTabHeadingTransclude",function(){return{restrict:"A",require:"^uibTab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}).directive("uibTabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("uib-tab-heading")||a.hasAttribute("data-uib-tab-heading")||a.hasAttribute("x-uib-tab-heading")||"uib-tab-heading"===a.tagName.toLowerCase()||"data-uib-tab-heading"===a.tagName.toLowerCase()||"x-uib-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^uibTabset",link:function(b,c,d){var e=b.$eval(d.uibTabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("ui.bootstrap.timepicker",[]).constant("uibTimepickerConfig",{hourStep:1,minuteStep:1,secondStep:1,showMeridian:!0,showSeconds:!1,meridians:null,readonlyInput:!1,mousewheel:!0,arrowkeys:!0,showSpinners:!0,templateUrl:"uib/template/timepicker/timepicker.html"}).controller("UibTimepickerController",["$scope","$element","$attrs","$parse","$log","$locale","uibTimepickerConfig",function(a,b,c,d,e,f,g){function h(){var b=+a.hours,c=a.showMeridian?b>0&&13>b:b>=0&&24>b;return c?(a.showMeridian&&(12===b&&(b=0),a.meridian===u[1]&&(b+=12)),b):void 0}function i(){var b=+a.minutes;return b>=0&&60>b?b:void 0}function j(){var b=+a.seconds;return b>=0&&60>b?b:void 0}function k(a){return null===a?"":angular.isDefined(a)&&a.toString().length<2?"0"+a:a.toString()}function l(a){m(),t.$setViewValue(new Date(r)),n(a)}function m(){t.$setValidity("time",!0),a.invalidHours=!1,a.invalidMinutes=!1,a.invalidSeconds=!1}function n(b){if(t.$modelValue){var c=r.getHours(),d=r.getMinutes(),e=r.getSeconds();a.showMeridian&&(c=0===c||12===c?12:c%12),a.hours="h"===b?c:k(c),"m"!==b&&(a.minutes=k(d)),a.meridian=r.getHours()<12?u[0]:u[1],"s"!==b&&(a.seconds=k(e)),a.meridian=r.getHours()<12?u[0]:u[1]}else a.hours=null,a.minutes=null,a.seconds=null,a.meridian=u[0]}function o(a){r=q(r,a),l()}function p(a,b){return q(a,60*b)}function q(a,b){var c=new Date(a.getTime()+1e3*b),d=new Date(a);return d.setHours(c.getHours(),c.getMinutes(),c.getSeconds()),d}var r=new Date,s=[],t={$setViewValue:angular.noop},u=angular.isDefined(c.meridians)?a.$parent.$eval(c.meridians):g.meridians||f.DATETIME_FORMATS.AMPMS;a.tabindex=angular.isDefined(c.tabindex)?c.tabindex:0,b.removeAttr("tabindex"),this.init=function(b,d){t=b,t.$render=this.render,t.$formatters.unshift(function(a){return a?new Date(a):null});var e=d.eq(0),f=d.eq(1),h=d.eq(2),i=angular.isDefined(c.mousewheel)?a.$parent.$eval(c.mousewheel):g.mousewheel;i&&this.setupMousewheelEvents(e,f,h);var j=angular.isDefined(c.arrowkeys)?a.$parent.$eval(c.arrowkeys):g.arrowkeys;j&&this.setupArrowkeyEvents(e,f,h),a.readonlyInput=angular.isDefined(c.readonlyInput)?a.$parent.$eval(c.readonlyInput):g.readonlyInput,this.setupInputEvents(e,f,h)};var v=g.hourStep;c.hourStep&&s.push(a.$parent.$watch(d(c.hourStep),function(a){v=+a}));var w=g.minuteStep;c.minuteStep&&s.push(a.$parent.$watch(d(c.minuteStep),function(a){w=+a}));var x;s.push(a.$parent.$watch(d(c.min),function(a){var b=new Date(a);x=isNaN(b)?void 0:b}));var y;s.push(a.$parent.$watch(d(c.max),function(a){var b=new Date(a);y=isNaN(b)?void 0:b}));var z=!1;c.ngDisabled&&s.push(a.$parent.$watch(d(c.ngDisabled),function(a){z=a})),a.noIncrementHours=function(){var a=p(r,60*v);return z||a>y||r>a&&x>a},a.noDecrementHours=function(){var a=p(r,60*-v);return z||x>a||a>r&&a>y},a.noIncrementMinutes=function(){var a=p(r,w);return z||a>y||r>a&&x>a},a.noDecrementMinutes=function(){var a=p(r,-w);return z||x>a||a>r&&a>y},a.noIncrementSeconds=function(){var a=q(r,A);return z||a>y||r>a&&x>a},a.noDecrementSeconds=function(){var a=q(r,-A);return z||x>a||a>r&&a>y},a.noToggleMeridian=function(){return r.getHours()<12?z||p(r,720)>y:z||p(r,-720)<x};var A=g.secondStep;c.secondStep&&s.push(a.$parent.$watch(d(c.secondStep),function(a){A=+a})),a.showSeconds=g.showSeconds,c.showSeconds&&s.push(a.$parent.$watch(d(c.showSeconds),function(b){a.showSeconds=!!b})),a.showMeridian=g.showMeridian,c.showMeridian&&s.push(a.$parent.$watch(d(c.showMeridian),function(b){if(a.showMeridian=!!b,t.$error.time){var c=h(),d=i();angular.isDefined(c)&&angular.isDefined(d)&&(r.setHours(c),l())}else n()})),this.setupMousewheelEvents=function(b,c,d){var e=function(a){a.originalEvent&&(a=a.originalEvent);var b=a.wheelDelta?a.wheelDelta:-a.deltaY;return a.detail||b>0};b.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementHours():a.decrementHours()),b.preventDefault()}),c.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementMinutes():a.decrementMinutes()),b.preventDefault()}),d.bind("mousewheel wheel",function(b){z||a.$apply(e(b)?a.incrementSeconds():a.decrementSeconds()),b.preventDefault()})},this.setupArrowkeyEvents=function(b,c,d){b.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementHours(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementHours(),a.$apply()))}),c.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementMinutes(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementMinutes(),a.$apply()))}),d.bind("keydown",function(b){z||(38===b.which?(b.preventDefault(),a.incrementSeconds(),a.$apply()):40===b.which&&(b.preventDefault(),a.decrementSeconds(),a.$apply()))})},this.setupInputEvents=function(b,c,d){if(a.readonlyInput)return a.updateHours=angular.noop,a.updateMinutes=angular.noop,void(a.updateSeconds=angular.noop);var e=function(b,c,d){t.$setViewValue(null),t.$setValidity("time",!1),angular.isDefined(b)&&(a.invalidHours=b),angular.isDefined(c)&&(a.invalidMinutes=c),angular.isDefined(d)&&(a.invalidSeconds=d)};a.updateHours=function(){var a=h(),b=i();t.$setDirty(),angular.isDefined(a)&&angular.isDefined(b)?(r.setHours(a),r.setMinutes(b),x>r||r>y?e(!0):l("h")):e(!0)},b.bind("blur",function(b){t.$setTouched(),null===a.hours||""===a.hours?e(!0):!a.invalidHours&&a.hours<10&&a.$apply(function(){a.hours=k(a.hours)})}),a.updateMinutes=function(){var a=i(),b=h();t.$setDirty(),angular.isDefined(a)&&angular.isDefined(b)?(r.setHours(b),r.setMinutes(a),x>r||r>y?e(void 0,!0):l("m")):e(void 0,!0)},c.bind("blur",function(b){t.$setTouched(),null===a.minutes?e(void 0,!0):!a.invalidMinutes&&a.minutes<10&&a.$apply(function(){a.minutes=k(a.minutes)})}),a.updateSeconds=function(){var a=j();t.$setDirty(),angular.isDefined(a)?(r.setSeconds(a),l("s")):e(void 0,void 0,!0)},d.bind("blur",function(b){!a.invalidSeconds&&a.seconds<10&&a.$apply(function(){a.seconds=k(a.seconds)})})},this.render=function(){var b=t.$viewValue;isNaN(b)?(t.$setValidity("time",!1),e.error('Timepicker directive: "ng-model" value must be a Date object, a number of milliseconds since 01.01.1970 or a string representing an RFC2822 or ISO 8601 date.')):(b&&(r=b),x>r||r>y?(t.$setValidity("time",!1),a.invalidHours=!0,a.invalidMinutes=!0):m(),n())},a.showSpinners=angular.isDefined(c.showSpinners)?a.$parent.$eval(c.showSpinners):g.showSpinners,a.incrementHours=function(){a.noIncrementHours()||o(60*v*60)},a.decrementHours=function(){a.noDecrementHours()||o(60*-v*60)},a.incrementMinutes=function(){a.noIncrementMinutes()||o(60*w)},a.decrementMinutes=function(){a.noDecrementMinutes()||o(60*-w)},a.incrementSeconds=function(){a.noIncrementSeconds()||o(A)},a.decrementSeconds=function(){a.noDecrementSeconds()||o(-A)},a.toggleMeridian=function(){var b=i(),c=h();a.noToggleMeridian()||(angular.isDefined(b)&&angular.isDefined(c)?o(720*(r.getHours()<12?60:-60)):a.meridian=a.meridian===u[0]?u[1]:u[0])},a.blur=function(){t.$setTouched()},a.$on("$destroy",function(){for(;s.length;)s.shift()()})}]).directive("uibTimepicker",["uibTimepickerConfig",function(a){return{require:["uibTimepicker","?^ngModel"],controller:"UibTimepickerController",controllerAs:"timepicker",replace:!0,scope:{},templateUrl:function(b,c){return c.templateUrl||a.templateUrl},link:function(a,b,c,d){var e=d[0],f=d[1];f&&e.init(f,b.find("input"))}}}]),angular.module("ui.bootstrap.typeahead",["ui.bootstrap.debounce","ui.bootstrap.position"]).factory("uibTypeaheadParser",["$parse",function(a){var b=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+([\s\S]+?)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error('Expected typeahead specification in form of "_modelValue_ (as _label_)? for _item_ in _collection_" but got "'+c+'".');return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).controller("UibTypeaheadController",["$scope","$element","$attrs","$compile","$parse","$q","$timeout","$document","$window","$rootScope","$$debounce","$uibPosition","uibTypeaheadParser",function(a,b,c,d,e,f,g,h,i,j,k,l,m){function n(){N.moveInProgress||(N.moveInProgress=!0,N.$digest()),Y()}function o(){N.position=D?l.offset(b):l.position(b),N.position.top+=b.prop("offsetHeight")}var p,q,r=[9,13,27,38,40],s=200,t=a.$eval(c.typeaheadMinLength);t||0===t||(t=1);var u=a.$eval(c.typeaheadWaitMs)||0,v=a.$eval(c.typeaheadEditable)!==!1;a.$watch(c.typeaheadEditable,function(a){v=a!==!1});var w,x,y=e(c.typeaheadLoading).assign||angular.noop,z=e(c.typeaheadOnSelect),A=angular.isDefined(c.typeaheadSelectOnBlur)?a.$eval(c.typeaheadSelectOnBlur):!1,B=e(c.typeaheadNoResults).assign||angular.noop,C=c.typeaheadInputFormatter?e(c.typeaheadInputFormatter):void 0,D=c.typeaheadAppendToBody?a.$eval(c.typeaheadAppendToBody):!1,E=c.typeaheadAppendTo?a.$eval(c.typeaheadAppendTo):null,F=a.$eval(c.typeaheadFocusFirst)!==!1,G=c.typeaheadSelectOnExact?a.$eval(c.typeaheadSelectOnExact):!1,H=e(c.typeaheadIsOpen).assign||angular.noop,I=a.$eval(c.typeaheadShowHint)||!1,J=e(c.ngModel),K=e(c.ngModel+"($$$p)"),L=function(b,c){return angular.isFunction(J(a))&&q&&q.$options&&q.$options.getterSetter?K(b,{$$$p:c}):J.assign(b,c)},M=m.parse(c.uibTypeahead),N=a.$new(),O=a.$on("$destroy",function(){N.$destroy()});N.$on("$destroy",O);var P="typeahead-"+N.$id+"-"+Math.floor(1e4*Math.random());b.attr({"aria-autocomplete":"list","aria-expanded":!1,"aria-owns":P});var Q,R;I&&(Q=angular.element("<div></div>"),Q.css("position","relative"),b.after(Q),R=b.clone(),R.attr("placeholder",""),R.val(""),R.css({position:"absolute",top:"0px",left:"0px","border-color":"transparent","box-shadow":"none",opacity:1,background:"none 0% 0% / auto repeat scroll padding-box border-box rgb(255, 255, 255)",color:"#999"}),b.css({position:"relative","vertical-align":"top","background-color":"transparent"}),Q.append(R),R.after(b));var S=angular.element("<div uib-typeahead-popup></div>");S.attr({id:P,matches:"matches",active:"activeIdx",select:"select(activeIdx, evt)","move-in-progress":"moveInProgress",query:"query",position:"position","assign-is-open":"assignIsOpen(isOpen)",debounce:"debounceUpdate"}),angular.isDefined(c.typeaheadTemplateUrl)&&S.attr("template-url",c.typeaheadTemplateUrl),angular.isDefined(c.typeaheadPopupTemplateUrl)&&S.attr("popup-template-url",c.typeaheadPopupTemplateUrl);var T=function(){I&&R.val("")},U=function(){N.matches=[],N.activeIdx=-1,b.attr("aria-expanded",!1),T()},V=function(a){return P+"-option-"+a};N.$watch("activeIdx",function(a){0>a?b.removeAttr("aria-activedescendant"):b.attr("aria-activedescendant",V(a))});var W=function(a,b){return N.matches.length>b&&a?a.toUpperCase()===N.matches[b].label.toUpperCase():!1},X=function(c,d){var e={$viewValue:c};y(a,!0),B(a,!1),f.when(M.source(a,e)).then(function(f){var g=c===p.$viewValue;if(g&&w)if(f&&f.length>0){N.activeIdx=F?0:-1,B(a,!1),N.matches.length=0;for(var h=0;h<f.length;h++)e[M.itemName]=f[h],N.matches.push({id:V(h),label:M.viewMapper(N,e),model:f[h]});if(N.query=c,o(),b.attr("aria-expanded",!0),G&&1===N.matches.length&&W(c,0)&&(angular.isNumber(N.debounceUpdate)||angular.isObject(N.debounceUpdate)?k(function(){N.select(0,d)},angular.isNumber(N.debounceUpdate)?N.debounceUpdate:N.debounceUpdate["default"]):N.select(0,d)),I){var i=N.matches[0].label;c.length>0&&i.slice(0,c.length).toUpperCase()===c.toUpperCase()?R.val(c+i.slice(c.length)):R.val("")}}else U(),B(a,!0);g&&y(a,!1)},function(){U(),y(a,!1),B(a,!0)})};D&&(angular.element(i).on("resize",n),h.find("body").on("scroll",n));var Y=k(function(){N.matches.length&&o(),N.moveInProgress=!1},s);N.moveInProgress=!1,N.query=void 0;var Z,$=function(a){Z=g(function(){X(a)},u)},_=function(){Z&&g.cancel(Z)};U(),N.assignIsOpen=function(b){H(a,b)},N.select=function(d,e){var f,h,i={};x=!0,i[M.itemName]=h=N.matches[d].model,f=M.modelMapper(a,i),L(a,f),p.$setValidity("editable",!0),p.$setValidity("parse",!0),z(a,{$item:h,$model:f,$label:M.viewMapper(a,i),$event:e}),U(),N.$eval(c.typeaheadFocusOnSelect)!==!1&&g(function(){b[0].focus()},0,!1)},b.on("keydown",function(a){if(0!==N.matches.length&&-1!==r.indexOf(a.which)){if(-1===N.activeIdx&&(9===a.which||13===a.which))return U(),void N.$digest();a.preventDefault();var b;switch(a.which){case 9:case 13:N.$apply(function(){angular.isNumber(N.debounceUpdate)||angular.isObject(N.debounceUpdate)?k(function(){N.select(N.activeIdx,a)},angular.isNumber(N.debounceUpdate)?N.debounceUpdate:N.debounceUpdate["default"]):N.select(N.activeIdx,a)});break;case 27:a.stopPropagation(),U(),N.$digest();break;case 38:N.activeIdx=(N.activeIdx>0?N.activeIdx:N.matches.length)-1,N.$digest(),b=S.find("li")[N.activeIdx],b.parentNode.scrollTop=b.offsetTop;break;case 40:N.activeIdx=(N.activeIdx+1)%N.matches.length,N.$digest(),b=S.find("li")[N.activeIdx],b.parentNode.scrollTop=b.offsetTop}}}),b.bind("focus",function(a){w=!0,0!==t||p.$viewValue||g(function(){X(p.$viewValue,a)},0)}),b.bind("blur",function(a){A&&N.matches.length&&-1!==N.activeIdx&&!x&&(x=!0,N.$apply(function(){angular.isObject(N.debounceUpdate)&&angular.isNumber(N.debounceUpdate.blur)?k(function(){N.select(N.activeIdx,a)},N.debounceUpdate.blur):N.select(N.activeIdx,a)})),!v&&p.$error.editable&&(p.$viewValue="",b.val("")),w=!1,x=!1});var aa=function(a){b[0]!==a.target&&3!==a.which&&0!==N.matches.length&&(U(),j.$$phase||N.$digest())};h.on("click",aa),a.$on("$destroy",function(){h.off("click",aa),(D||E)&&ba.remove(),D&&(angular.element(i).off("resize",n),h.find("body").off("scroll",n)),S.remove(),I&&Q.remove()});var ba=d(S)(N);D?h.find("body").append(ba):E?angular.element(E).eq(0).append(ba):b.after(ba),this.init=function(b,c){p=b,q=c,N.debounceUpdate=p.$options&&e(p.$options.debounce)(a),p.$parsers.unshift(function(b){return w=!0,0===t||b&&b.length>=t?u>0?(_(),$(b)):X(b):(y(a,!1),_(),U()),v?b:b?void p.$setValidity("editable",!1):(p.$setValidity("editable",!0),null)}),p.$formatters.push(function(b){var c,d,e={};return v||p.$setValidity("editable",!0),C?(e.$model=b,C(a,e)):(e[M.itemName]=b,c=M.viewMapper(a,e),e[M.itemName]=void 0,d=M.viewMapper(a,e),c!==d?c:b)})}}]).directive("uibTypeahead",function(){return{controller:"UibTypeaheadController",require:["ngModel","^?ngModelOptions","uibTypeahead"],link:function(a,b,c,d){d[2].init(d[0],d[1])}}}).directive("uibTypeaheadPopup",["$$debounce",function(a){return{scope:{matches:"=",query:"=",active:"=",position:"&",moveInProgress:"=",select:"&",assignIsOpen:"&",debounce:"&"},replace:!0,templateUrl:function(a,b){return b.popupTemplateUrl||"uib/template/typeahead/typeahead-popup.html"},link:function(b,c,d){b.templateUrl=d.templateUrl,b.isOpen=function(){var a=b.matches.length>0;return b.assignIsOpen({isOpen:a}),a},b.isActive=function(a){return b.active===a},b.selectActive=function(a){b.active=a},b.selectMatch=function(c,d){var e=b.debounce();angular.isNumber(e)||angular.isObject(e)?a(function(){b.select({activeIdx:c,evt:d})},angular.isNumber(e)?e:e["default"]):b.select({activeIdx:c,evt:d})}}}}]).directive("uibTypeaheadMatch",["$templateRequest","$compile","$parse",function(a,b,c){return{scope:{index:"=",match:"=",query:"="},link:function(d,e,f){var g=c(f.templateUrl)(d.$parent)||"uib/template/typeahead/typeahead-match.html";a(g).then(function(a){var c=angular.element(a.trim());e.replaceWith(c),b(c)(d)})}}}]).filter("uibTypeaheadHighlight",["$sce","$injector","$log",function(a,b,c){function d(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}function e(a){return/<.*>/g.test(a)}var f;return f=b.has("$sanitize"),function(b,g){return!f&&e(b)&&c.warn("Unsafe use of typeahead please use ngSanitize"),b=g?(""+b).replace(new RegExp(d(g),"gi"),"<strong>$&</strong>"):b,f||(b=a.trustAsHtml(b)),b}}]),angular.module("ui.bootstrap.carousel").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">.ng-animate.item:not(.left):not(.right){-webkit-transition:0s ease-in-out left;transition:0s ease-in-out left}</style>')}),angular.module("ui.bootstrap.datepicker").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">.uib-datepicker .uib-title{width:100%;}.uib-day button,.uib-month button,.uib-year button{min-width:100%;}.uib-datepicker-popup.dropdown-menu{display:block;}.uib-button-bar{padding:10px 9px 2px;}</style>')}),angular.module("ui.bootstrap.timepicker").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">.uib-time input{width:50px;}</style>')}),angular.module("ui.bootstrap.typeahead").run(function(){!angular.$$csp().noInlineStyle&&angular.element(document).find("head").prepend('<style type="text/css">[uib-typeahead-popup].dropdown-menu{display:block;}</style>')});
\ No newline at end of file
diff --git a/turtles/bower_components/angular/.bower.json b/turtles/bower_components/angular/.bower.json
new file mode 100644
index 000000000..3f3cebddf
--- /dev/null
+++ b/turtles/bower_components/angular/.bower.json
@@ -0,0 +1,17 @@
+{
+  "name": "angular",
+  "version": "1.4.9",
+  "main": "./angular.js",
+  "ignore": [],
+  "dependencies": {},
+  "homepage": "https://github.com/angular/bower-angular",
+  "_release": "1.4.9",
+  "_resolution": {
+    "type": "version",
+    "tag": "v1.4.9",
+    "commit": "a69eba562dc18df13f27ca0274c90ee26c29004e"
+  },
+  "_source": "git://github.com/angular/bower-angular.git",
+  "_target": ">=1.4.0",
+  "_originalSource": "angular"
+}
\ No newline at end of file
diff --git a/turtles/bower_components/angular/README.md b/turtles/bower_components/angular/README.md
new file mode 100644
index 000000000..d1bc0eddf
--- /dev/null
+++ b/turtles/bower_components/angular/README.md
@@ -0,0 +1,64 @@
+# packaged angular
+
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
+[main AngularJS repo](https://github.com/angular/angular.js).
+Please file issues and pull requests against that repo.
+
+## Install
+
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/node_modules/angular/angular.js"></script>
+```
+
+Or `require('angular')` from your code.
+
+### bower
+
+```shell
+bower install angular
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/bower_components/angular/angular.js"></script>
+```
+
+## Documentation
+
+Documentation is available on the
+[AngularJS docs site](http://docs.angularjs.org/).
+
+## License
+
+The MIT License
+
+Copyright (c) 2010-2015 Google, Inc. http://angularjs.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/turtles/bower_components/angular/angular-csp.css b/turtles/bower_components/angular/angular-csp.css
new file mode 100644
index 000000000..f3cd926cb
--- /dev/null
+++ b/turtles/bower_components/angular/angular-csp.css
@@ -0,0 +1,21 @@
+/* Include this file in your html if you are using the CSP mode. */
+
+@charset "UTF-8";
+
+[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak],
+.ng-cloak, .x-ng-cloak,
+.ng-hide:not(.ng-hide-animate) {
+  display: none !important;
+}
+
+ng\:form {
+  display: block;
+}
+
+.ng-animate-shim {
+  visibility:hidden;
+}
+
+.ng-anchor {
+  position:absolute;
+}
diff --git a/turtles/bower_components/angular/angular.js b/turtles/bower_components/angular/angular.js
new file mode 100644
index 000000000..62ac1853b
--- /dev/null
+++ b/turtles/bower_components/angular/angular.js
@@ -0,0 +1,29657 @@
+/**
+ * @license AngularJS v1.4.9
+ * (c) 2010-2015 Google, Inc. http://angularjs.org
+ * License: MIT
+ */
+(function(window, document, undefined) {'use strict';
+
+/**
+ * @description
+ *
+ * This object provides a utility for producing rich Error messages within
+ * Angular. It can be called as follows:
+ *
+ * var exampleMinErr = minErr('example');
+ * throw exampleMinErr('one', 'This {0} is {1}', foo, bar);
+ *
+ * The above creates an instance of minErr in the example namespace. The
+ * resulting error will have a namespaced error code of example.one.  The
+ * resulting error will replace {0} with the value of foo, and {1} with the
+ * value of bar. The object is not restricted in the number of arguments it can
+ * take.
+ *
+ * If fewer arguments are specified than necessary for interpolation, the extra
+ * interpolation markers will be preserved in the final string.
+ *
+ * Since data will be parsed statically during a build step, some restrictions
+ * are applied with respect to how minErr instances are created and called.
+ * Instances should have names of the form namespaceMinErr for a minErr created
+ * using minErr('namespace') . Error codes, namespaces and template strings
+ * should all be static strings, not variables or general expressions.
+ *
+ * @param {string} module The namespace to use for the new minErr instance.
+ * @param {function} ErrorConstructor Custom error constructor to be instantiated when returning
+ *   error from returned function, for cases when a particular type of error is useful.
+ * @returns {function(code:string, template:string, ...templateArgs): Error} minErr instance
+ */
+
+function minErr(module, ErrorConstructor) {
+  ErrorConstructor = ErrorConstructor || Error;
+  return function() {
+    var SKIP_INDEXES = 2;
+
+    var templateArgs = arguments,
+      code = templateArgs[0],
+      message = '[' + (module ? module + ':' : '') + code + '] ',
+      template = templateArgs[1],
+      paramPrefix, i;
+
+    message += template.replace(/\{\d+\}/g, function(match) {
+      var index = +match.slice(1, -1),
+        shiftedIndex = index + SKIP_INDEXES;
+
+      if (shiftedIndex < templateArgs.length) {
+        return toDebugString(templateArgs[shiftedIndex]);
+      }
+
+      return match;
+    });
+
+    message += '\nhttp://errors.angularjs.org/1.4.9/' +
+      (module ? module + '/' : '') + code;
+
+    for (i = SKIP_INDEXES, paramPrefix = '?'; i < templateArgs.length; i++, paramPrefix = '&') {
+      message += paramPrefix + 'p' + (i - SKIP_INDEXES) + '=' +
+        encodeURIComponent(toDebugString(templateArgs[i]));
+    }
+
+    return new ErrorConstructor(message);
+  };
+}
+
+/* We need to tell jshint what variables are being exported */
+/* global angular: true,
+  msie: true,
+  jqLite: true,
+  jQuery: true,
+  slice: true,
+  splice: true,
+  push: true,
+  toString: true,
+  ngMinErr: true,
+  angularModule: true,
+  uid: true,
+  REGEX_STRING_REGEXP: true,
+  VALIDITY_STATE_PROPERTY: true,
+
+  lowercase: true,
+  uppercase: true,
+  manualLowercase: true,
+  manualUppercase: true,
+  nodeName_: true,
+  isArrayLike: true,
+  forEach: true,
+  forEachSorted: true,
+  reverseParams: true,
+  nextUid: true,
+  setHashKey: true,
+  extend: true,
+  toInt: true,
+  inherit: true,
+  merge: true,
+  noop: true,
+  identity: true,
+  valueFn: true,
+  isUndefined: true,
+  isDefined: true,
+  isObject: true,
+  isBlankObject: true,
+  isString: true,
+  isNumber: true,
+  isDate: true,
+  isArray: true,
+  isFunction: true,
+  isRegExp: true,
+  isWindow: true,
+  isScope: true,
+  isFile: true,
+  isFormData: true,
+  isBlob: true,
+  isBoolean: true,
+  isPromiseLike: true,
+  trim: true,
+  escapeForRegexp: true,
+  isElement: true,
+  makeMap: true,
+  includes: true,
+  arrayRemove: true,
+  copy: true,
+  shallowCopy: true,
+  equals: true,
+  csp: true,
+  jq: true,
+  concat: true,
+  sliceArgs: true,
+  bind: true,
+  toJsonReplacer: true,
+  toJson: true,
+  fromJson: true,
+  convertTimezoneToLocal: true,
+  timezoneToOffset: true,
+  startingTag: true,
+  tryDecodeURIComponent: true,
+  parseKeyValue: true,
+  toKeyValue: true,
+  encodeUriSegment: true,
+  encodeUriQuery: true,
+  angularInit: true,
+  bootstrap: true,
+  getTestability: true,
+  snake_case: true,
+  bindJQuery: true,
+  assertArg: true,
+  assertArgFn: true,
+  assertNotHasOwnProperty: true,
+  getter: true,
+  getBlockNodes: true,
+  hasOwnProperty: true,
+  createMap: true,
+
+  NODE_TYPE_ELEMENT: true,
+  NODE_TYPE_ATTRIBUTE: true,
+  NODE_TYPE_TEXT: true,
+  NODE_TYPE_COMMENT: true,
+  NODE_TYPE_DOCUMENT: true,
+  NODE_TYPE_DOCUMENT_FRAGMENT: true,
+*/
+
+////////////////////////////////////
+
+/**
+ * @ngdoc module
+ * @name ng
+ * @module ng
+ * @description
+ *
+ * # ng (core module)
+ * The ng module is loaded by default when an AngularJS application is started. The module itself
+ * contains the essential components for an AngularJS application to function. The table below
+ * lists a high level breakdown of each of the services/factories, filters, directives and testing
+ * components available within this core module.
+ *
+ * <div doc-module-components="ng"></div>
+ */
+
+var REGEX_STRING_REGEXP = /^\/(.+)\/([a-z]*)$/;
+
+// The name of a form control's ValidityState property.
+// This is used so that it's possible for internal tests to create mock ValidityStates.
+var VALIDITY_STATE_PROPERTY = 'validity';
+
+/**
+ * @ngdoc function
+ * @name angular.lowercase
+ * @module ng
+ * @kind function
+ *
+ * @description Converts the specified string to lowercase.
+ * @param {string} string String to be converted to lowercase.
+ * @returns {string} Lowercased string.
+ */
+var lowercase = function(string) {return isString(string) ? string.toLowerCase() : string;};
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+/**
+ * @ngdoc function
+ * @name angular.uppercase
+ * @module ng
+ * @kind function
+ *
+ * @description Converts the specified string to uppercase.
+ * @param {string} string String to be converted to uppercase.
+ * @returns {string} Uppercased string.
+ */
+var uppercase = function(string) {return isString(string) ? string.toUpperCase() : string;};
+
+
+var manualLowercase = function(s) {
+  /* jshint bitwise: false */
+  return isString(s)
+      ? s.replace(/[A-Z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) | 32);})
+      : s;
+};
+var manualUppercase = function(s) {
+  /* jshint bitwise: false */
+  return isString(s)
+      ? s.replace(/[a-z]/g, function(ch) {return String.fromCharCode(ch.charCodeAt(0) & ~32);})
+      : s;
+};
+
+
+// String#toLowerCase and String#toUpperCase don't produce correct results in browsers with Turkish
+// locale, for this reason we need to detect this case and redefine lowercase/uppercase methods
+// with correct but slower alternatives.
+if ('i' !== 'I'.toLowerCase()) {
+  lowercase = manualLowercase;
+  uppercase = manualUppercase;
+}
+
+
+var
+    msie,             // holds major version number for IE, or NaN if UA is not IE.
+    jqLite,           // delay binding since jQuery could be loaded after us.
+    jQuery,           // delay binding
+    slice             = [].slice,
+    splice            = [].splice,
+    push              = [].push,
+    toString          = Object.prototype.toString,
+    getPrototypeOf    = Object.getPrototypeOf,
+    ngMinErr          = minErr('ng'),
+
+    /** @name angular */
+    angular           = window.angular || (window.angular = {}),
+    angularModule,
+    uid               = 0;
+
+/**
+ * documentMode is an IE-only property
+ * http://msdn.microsoft.com/en-us/library/ie/cc196988(v=vs.85).aspx
+ */
+msie = document.documentMode;
+
+
+/**
+ * @private
+ * @param {*} obj
+ * @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments,
+ *                   String ...)
+ */
+function isArrayLike(obj) {
+
+  // `null`, `undefined` and `window` are not array-like
+  if (obj == null || isWindow(obj)) return false;
+
+  // arrays, strings and jQuery/jqLite objects are array like
+  // * jqLite is either the jQuery or jqLite constructor function
+  // * we have to check the existance of jqLite first as this method is called
+  //   via the forEach method when constructing the jqLite object in the first place
+  if (isArray(obj) || isString(obj) || (jqLite && obj instanceof jqLite)) return true;
+
+  // Support: iOS 8.2 (not reproducible in simulator)
+  // "length" in obj used to prevent JIT error (gh-11508)
+  var length = "length" in Object(obj) && obj.length;
+
+  // NodeList objects (with `item` method) and
+  // other objects with suitable length characteristics are array-like
+  return isNumber(length) &&
+    (length >= 0 && ((length - 1) in obj || obj instanceof Array) || typeof obj.item == 'function');
+
+}
+
+/**
+ * @ngdoc function
+ * @name angular.forEach
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Invokes the `iterator` function once for each item in `obj` collection, which can be either an
+ * object or an array. The `iterator` function is invoked with `iterator(value, key, obj)`, where `value`
+ * is the value of an object property or an array element, `key` is the object property key or
+ * array element index and obj is the `obj` itself. Specifying a `context` for the function is optional.
+ *
+ * It is worth noting that `.forEach` does not iterate over inherited properties because it filters
+ * using the `hasOwnProperty` method.
+ *
+ * Unlike ES262's
+ * [Array.prototype.forEach](http://www.ecma-international.org/ecma-262/5.1/#sec-15.4.4.18),
+ * Providing 'undefined' or 'null' values for `obj` will not throw a TypeError, but rather just
+ * return the value provided.
+ *
+   ```js
+     var values = {name: 'misko', gender: 'male'};
+     var log = [];
+     angular.forEach(values, function(value, key) {
+       this.push(key + ': ' + value);
+     }, log);
+     expect(log).toEqual(['name: misko', 'gender: male']);
+   ```
+ *
+ * @param {Object|Array} obj Object to iterate over.
+ * @param {Function} iterator Iterator function.
+ * @param {Object=} context Object to become context (`this`) for the iterator function.
+ * @returns {Object|Array} Reference to `obj`.
+ */
+
+function forEach(obj, iterator, context) {
+  var key, length;
+  if (obj) {
+    if (isFunction(obj)) {
+      for (key in obj) {
+        // Need to check if hasOwnProperty exists,
+        // as on IE8 the result of querySelectorAll is an object without a hasOwnProperty function
+        if (key != 'prototype' && key != 'length' && key != 'name' && (!obj.hasOwnProperty || obj.hasOwnProperty(key))) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    } else if (isArray(obj) || isArrayLike(obj)) {
+      var isPrimitive = typeof obj !== 'object';
+      for (key = 0, length = obj.length; key < length; key++) {
+        if (isPrimitive || key in obj) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    } else if (obj.forEach && obj.forEach !== forEach) {
+        obj.forEach(iterator, context, obj);
+    } else if (isBlankObject(obj)) {
+      // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+      for (key in obj) {
+        iterator.call(context, obj[key], key, obj);
+      }
+    } else if (typeof obj.hasOwnProperty === 'function') {
+      // Slow path for objects inheriting Object.prototype, hasOwnProperty check needed
+      for (key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    } else {
+      // Slow path for objects which do not have a method `hasOwnProperty`
+      for (key in obj) {
+        if (hasOwnProperty.call(obj, key)) {
+          iterator.call(context, obj[key], key, obj);
+        }
+      }
+    }
+  }
+  return obj;
+}
+
+function forEachSorted(obj, iterator, context) {
+  var keys = Object.keys(obj).sort();
+  for (var i = 0; i < keys.length; i++) {
+    iterator.call(context, obj[keys[i]], keys[i]);
+  }
+  return keys;
+}
+
+
+/**
+ * when using forEach the params are value, key, but it is often useful to have key, value.
+ * @param {function(string, *)} iteratorFn
+ * @returns {function(*, string)}
+ */
+function reverseParams(iteratorFn) {
+  return function(value, key) { iteratorFn(key, value); };
+}
+
+/**
+ * A consistent way of creating unique IDs in angular.
+ *
+ * Using simple numbers allows us to generate 28.6 million unique ids per second for 10 years before
+ * we hit number precision issues in JavaScript.
+ *
+ * Math.pow(2,53) / 60 / 60 / 24 / 365 / 10 = 28.6M
+ *
+ * @returns {number} an unique alpha-numeric string
+ */
+function nextUid() {
+  return ++uid;
+}
+
+
+/**
+ * Set or clear the hashkey for an object.
+ * @param obj object
+ * @param h the hashkey (!truthy to delete the hashkey)
+ */
+function setHashKey(obj, h) {
+  if (h) {
+    obj.$$hashKey = h;
+  } else {
+    delete obj.$$hashKey;
+  }
+}
+
+
+function baseExtend(dst, objs, deep) {
+  var h = dst.$$hashKey;
+
+  for (var i = 0, ii = objs.length; i < ii; ++i) {
+    var obj = objs[i];
+    if (!isObject(obj) && !isFunction(obj)) continue;
+    var keys = Object.keys(obj);
+    for (var j = 0, jj = keys.length; j < jj; j++) {
+      var key = keys[j];
+      var src = obj[key];
+
+      if (deep && isObject(src)) {
+        if (isDate(src)) {
+          dst[key] = new Date(src.valueOf());
+        } else if (isRegExp(src)) {
+          dst[key] = new RegExp(src);
+        } else if (src.nodeName) {
+          dst[key] = src.cloneNode(true);
+        } else if (isElement(src)) {
+          dst[key] = src.clone();
+        } else {
+          if (!isObject(dst[key])) dst[key] = isArray(src) ? [] : {};
+          baseExtend(dst[key], [src], true);
+        }
+      } else {
+        dst[key] = src;
+      }
+    }
+  }
+
+  setHashKey(dst, h);
+  return dst;
+}
+
+/**
+ * @ngdoc function
+ * @name angular.extend
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+ * to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+ * by passing an empty object as the target: `var object = angular.extend({}, object1, object2)`.
+ *
+ * **Note:** Keep in mind that `angular.extend` does not support recursive merge (deep copy). Use
+ * {@link angular.merge} for this.
+ *
+ * @param {Object} dst Destination object.
+ * @param {...Object} src Source object(s).
+ * @returns {Object} Reference to `dst`.
+ */
+function extend(dst) {
+  return baseExtend(dst, slice.call(arguments, 1), false);
+}
+
+
+/**
+* @ngdoc function
+* @name angular.merge
+* @module ng
+* @kind function
+*
+* @description
+* Deeply extends the destination object `dst` by copying own enumerable properties from the `src` object(s)
+* to `dst`. You can specify multiple `src` objects. If you want to preserve original objects, you can do so
+* by passing an empty object as the target: `var object = angular.merge({}, object1, object2)`.
+*
+* Unlike {@link angular.extend extend()}, `merge()` recursively descends into object properties of source
+* objects, performing a deep copy.
+*
+* @param {Object} dst Destination object.
+* @param {...Object} src Source object(s).
+* @returns {Object} Reference to `dst`.
+*/
+function merge(dst) {
+  return baseExtend(dst, slice.call(arguments, 1), true);
+}
+
+
+
+function toInt(str) {
+  return parseInt(str, 10);
+}
+
+
+function inherit(parent, extra) {
+  return extend(Object.create(parent), extra);
+}
+
+/**
+ * @ngdoc function
+ * @name angular.noop
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * A function that performs no operations. This function can be useful when writing code in the
+ * functional style.
+   ```js
+     function foo(callback) {
+       var result = calculateResult();
+       (callback || angular.noop)(result);
+     }
+   ```
+ */
+function noop() {}
+noop.$inject = [];
+
+
+/**
+ * @ngdoc function
+ * @name angular.identity
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * A function that returns its first argument. This function is useful when writing code in the
+ * functional style.
+ *
+   ```js
+     function transformer(transformationFn, value) {
+       return (transformationFn || angular.identity)(value);
+     };
+   ```
+  * @param {*} value to be returned.
+  * @returns {*} the value passed in.
+ */
+function identity($) {return $;}
+identity.$inject = [];
+
+
+function valueFn(value) {return function() {return value;};}
+
+function hasCustomToString(obj) {
+  return isFunction(obj.toString) && obj.toString !== toString;
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isUndefined
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is undefined.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is undefined.
+ */
+function isUndefined(value) {return typeof value === 'undefined';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isDefined
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is defined.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is defined.
+ */
+function isDefined(value) {return typeof value !== 'undefined';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isObject
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is an `Object`. Unlike `typeof` in JavaScript, `null`s are not
+ * considered to be objects. Note that JavaScript arrays are objects.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is an `Object` but not `null`.
+ */
+function isObject(value) {
+  // http://jsperf.com/isobject4
+  return value !== null && typeof value === 'object';
+}
+
+
+/**
+ * Determine if a value is an object with a null prototype
+ *
+ * @returns {boolean} True if `value` is an `Object` with a null prototype
+ */
+function isBlankObject(value) {
+  return value !== null && typeof value === 'object' && !getPrototypeOf(value);
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isString
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a `String`.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `String`.
+ */
+function isString(value) {return typeof value === 'string';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isNumber
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a `Number`.
+ *
+ * This includes the "special" numbers `NaN`, `+Infinity` and `-Infinity`.
+ *
+ * If you wish to exclude these then you can use the native
+ * [`isFinite'](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/isFinite)
+ * method.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `Number`.
+ */
+function isNumber(value) {return typeof value === 'number';}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isDate
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a value is a date.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `Date`.
+ */
+function isDate(value) {
+  return toString.call(value) === '[object Date]';
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.isArray
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is an `Array`.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is an `Array`.
+ */
+var isArray = Array.isArray;
+
+/**
+ * @ngdoc function
+ * @name angular.isFunction
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a `Function`.
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `Function`.
+ */
+function isFunction(value) {return typeof value === 'function';}
+
+
+/**
+ * Determines if a value is a regular expression object.
+ *
+ * @private
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a `RegExp`.
+ */
+function isRegExp(value) {
+  return toString.call(value) === '[object RegExp]';
+}
+
+
+/**
+ * Checks if `obj` is a window object.
+ *
+ * @private
+ * @param {*} obj Object to check
+ * @returns {boolean} True if `obj` is a window obj.
+ */
+function isWindow(obj) {
+  return obj && obj.window === obj;
+}
+
+
+function isScope(obj) {
+  return obj && obj.$evalAsync && obj.$watch;
+}
+
+
+function isFile(obj) {
+  return toString.call(obj) === '[object File]';
+}
+
+
+function isFormData(obj) {
+  return toString.call(obj) === '[object FormData]';
+}
+
+
+function isBlob(obj) {
+  return toString.call(obj) === '[object Blob]';
+}
+
+
+function isBoolean(value) {
+  return typeof value === 'boolean';
+}
+
+
+function isPromiseLike(obj) {
+  return obj && isFunction(obj.then);
+}
+
+
+var TYPED_ARRAY_REGEXP = /^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array\]$/;
+function isTypedArray(value) {
+  return value && isNumber(value.length) && TYPED_ARRAY_REGEXP.test(toString.call(value));
+}
+
+
+var trim = function(value) {
+  return isString(value) ? value.trim() : value;
+};
+
+// Copied from:
+// http://docs.closure-library.googlecode.com/git/local_closure_goog_string_string.js.source.html#line1021
+// Prereq: s is a string.
+var escapeForRegexp = function(s) {
+  return s.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g, '\\$1').
+           replace(/\x08/g, '\\x08');
+};
+
+
+/**
+ * @ngdoc function
+ * @name angular.isElement
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if a reference is a DOM element (or wrapped jQuery element).
+ *
+ * @param {*} value Reference to check.
+ * @returns {boolean} True if `value` is a DOM element (or wrapped jQuery element).
+ */
+function isElement(node) {
+  return !!(node &&
+    (node.nodeName  // we are a direct element
+    || (node.prop && node.attr && node.find)));  // we have an on and find method part of jQuery API
+}
+
+/**
+ * @param str 'key1,key2,...'
+ * @returns {object} in the form of {key1:true, key2:true, ...}
+ */
+function makeMap(str) {
+  var obj = {}, items = str.split(","), i;
+  for (i = 0; i < items.length; i++) {
+    obj[items[i]] = true;
+  }
+  return obj;
+}
+
+
+function nodeName_(element) {
+  return lowercase(element.nodeName || (element[0] && element[0].nodeName));
+}
+
+function includes(array, obj) {
+  return Array.prototype.indexOf.call(array, obj) != -1;
+}
+
+function arrayRemove(array, value) {
+  var index = array.indexOf(value);
+  if (index >= 0) {
+    array.splice(index, 1);
+  }
+  return index;
+}
+
+/**
+ * @ngdoc function
+ * @name angular.copy
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Creates a deep copy of `source`, which should be an object or an array.
+ *
+ * * If no destination is supplied, a copy of the object or array is created.
+ * * If a destination is provided, all of its elements (for arrays) or properties (for objects)
+ *   are deleted and then all elements/properties from the source are copied to it.
+ * * If `source` is not an object or array (inc. `null` and `undefined`), `source` is returned.
+ * * If `source` is identical to 'destination' an exception will be thrown.
+ *
+ * @param {*} source The source that will be used to make a copy.
+ *                   Can be any type, including primitives, `null`, and `undefined`.
+ * @param {(Object|Array)=} destination Destination into which the source is copied. If
+ *     provided, must be of the same type as `source`.
+ * @returns {*} The copy or updated `destination`, if `destination` was specified.
+ *
+ * @example
+ <example module="copyExample">
+ <file name="index.html">
+ <div ng-controller="ExampleController">
+ <form novalidate class="simple-form">
+ Name: <input type="text" ng-model="user.name" /><br />
+ E-mail: <input type="email" ng-model="user.email" /><br />
+ Gender: <input type="radio" ng-model="user.gender" value="male" />male
+ <input type="radio" ng-model="user.gender" value="female" />female<br />
+ <button ng-click="reset()">RESET</button>
+ <button ng-click="update(user)">SAVE</button>
+ </form>
+ <pre>form = {{user | json}}</pre>
+ <pre>master = {{master | json}}</pre>
+ </div>
+
+ <script>
+  angular.module('copyExample', [])
+    .controller('ExampleController', ['$scope', function($scope) {
+      $scope.master= {};
+
+      $scope.update = function(user) {
+        // Example with 1 argument
+        $scope.master= angular.copy(user);
+      };
+
+      $scope.reset = function() {
+        // Example with 2 arguments
+        angular.copy($scope.master, $scope.user);
+      };
+
+      $scope.reset();
+    }]);
+ </script>
+ </file>
+ </example>
+ */
+function copy(source, destination) {
+  var stackSource = [];
+  var stackDest = [];
+
+  if (destination) {
+    if (isTypedArray(destination)) {
+      throw ngMinErr('cpta', "Can't copy! TypedArray destination cannot be mutated.");
+    }
+    if (source === destination) {
+      throw ngMinErr('cpi', "Can't copy! Source and destination are identical.");
+    }
+
+    // Empty the destination object
+    if (isArray(destination)) {
+      destination.length = 0;
+    } else {
+      forEach(destination, function(value, key) {
+        if (key !== '$$hashKey') {
+          delete destination[key];
+        }
+      });
+    }
+
+    stackSource.push(source);
+    stackDest.push(destination);
+    return copyRecurse(source, destination);
+  }
+
+  return copyElement(source);
+
+  function copyRecurse(source, destination) {
+    var h = destination.$$hashKey;
+    var result, key;
+    if (isArray(source)) {
+      for (var i = 0, ii = source.length; i < ii; i++) {
+        destination.push(copyElement(source[i]));
+      }
+    } else if (isBlankObject(source)) {
+      // createMap() fast path --- Safe to avoid hasOwnProperty check because prototype chain is empty
+      for (key in source) {
+        destination[key] = copyElement(source[key]);
+      }
+    } else if (source && typeof source.hasOwnProperty === 'function') {
+      // Slow path, which must rely on hasOwnProperty
+      for (key in source) {
+        if (source.hasOwnProperty(key)) {
+          destination[key] = copyElement(source[key]);
+        }
+      }
+    } else {
+      // Slowest path --- hasOwnProperty can't be called as a method
+      for (key in source) {
+        if (hasOwnProperty.call(source, key)) {
+          destination[key] = copyElement(source[key]);
+        }
+      }
+    }
+    setHashKey(destination, h);
+    return destination;
+  }
+
+  function copyElement(source) {
+    // Simple values
+    if (!isObject(source)) {
+      return source;
+    }
+
+    // Already copied values
+    var index = stackSource.indexOf(source);
+    if (index !== -1) {
+      return stackDest[index];
+    }
+
+    if (isWindow(source) || isScope(source)) {
+      throw ngMinErr('cpws',
+        "Can't copy! Making copies of Window or Scope instances is not supported.");
+    }
+
+    var needsRecurse = false;
+    var destination;
+
+    if (isArray(source)) {
+      destination = [];
+      needsRecurse = true;
+    } else if (isTypedArray(source)) {
+      destination = new source.constructor(source);
+    } else if (isDate(source)) {
+      destination = new Date(source.getTime());
+    } else if (isRegExp(source)) {
+      destination = new RegExp(source.source, source.toString().match(/[^\/]*$/)[0]);
+      destination.lastIndex = source.lastIndex;
+    } else if (isFunction(source.cloneNode)) {
+        destination = source.cloneNode(true);
+    } else {
+      destination = Object.create(getPrototypeOf(source));
+      needsRecurse = true;
+    }
+
+    stackSource.push(source);
+    stackDest.push(destination);
+
+    return needsRecurse
+      ? copyRecurse(source, destination)
+      : destination;
+  }
+}
+
+/**
+ * Creates a shallow copy of an object, an array or a primitive.
+ *
+ * Assumes that there are no proto properties for objects.
+ */
+function shallowCopy(src, dst) {
+  if (isArray(src)) {
+    dst = dst || [];
+
+    for (var i = 0, ii = src.length; i < ii; i++) {
+      dst[i] = src[i];
+    }
+  } else if (isObject(src)) {
+    dst = dst || {};
+
+    for (var key in src) {
+      if (!(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+        dst[key] = src[key];
+      }
+    }
+  }
+
+  return dst || src;
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.equals
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Determines if two objects or two values are equivalent. Supports value types, regular
+ * expressions, arrays and objects.
+ *
+ * Two objects or values are considered equivalent if at least one of the following is true:
+ *
+ * * Both objects or values pass `===` comparison.
+ * * Both objects or values are of the same type and all of their properties are equal by
+ *   comparing them with `angular.equals`.
+ * * Both values are NaN. (In JavaScript, NaN == NaN => false. But we consider two NaN as equal)
+ * * Both values represent the same regular expression (In JavaScript,
+ *   /abc/ == /abc/ => false. But we consider two regular expressions as equal when their textual
+ *   representation matches).
+ *
+ * During a property comparison, properties of `function` type and properties with names
+ * that begin with `$` are ignored.
+ *
+ * Scope and DOMWindow objects are being compared only by identify (`===`).
+ *
+ * @param {*} o1 Object or value to compare.
+ * @param {*} o2 Object or value to compare.
+ * @returns {boolean} True if arguments are equal.
+ */
+function equals(o1, o2) {
+  if (o1 === o2) return true;
+  if (o1 === null || o2 === null) return false;
+  if (o1 !== o1 && o2 !== o2) return true; // NaN === NaN
+  var t1 = typeof o1, t2 = typeof o2, length, key, keySet;
+  if (t1 == t2) {
+    if (t1 == 'object') {
+      if (isArray(o1)) {
+        if (!isArray(o2)) return false;
+        if ((length = o1.length) == o2.length) {
+          for (key = 0; key < length; key++) {
+            if (!equals(o1[key], o2[key])) return false;
+          }
+          return true;
+        }
+      } else if (isDate(o1)) {
+        if (!isDate(o2)) return false;
+        return equals(o1.getTime(), o2.getTime());
+      } else if (isRegExp(o1)) {
+        return isRegExp(o2) ? o1.toString() == o2.toString() : false;
+      } else {
+        if (isScope(o1) || isScope(o2) || isWindow(o1) || isWindow(o2) ||
+          isArray(o2) || isDate(o2) || isRegExp(o2)) return false;
+        keySet = createMap();
+        for (key in o1) {
+          if (key.charAt(0) === '$' || isFunction(o1[key])) continue;
+          if (!equals(o1[key], o2[key])) return false;
+          keySet[key] = true;
+        }
+        for (key in o2) {
+          if (!(key in keySet) &&
+              key.charAt(0) !== '$' &&
+              isDefined(o2[key]) &&
+              !isFunction(o2[key])) return false;
+        }
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+var csp = function() {
+  if (!isDefined(csp.rules)) {
+
+
+    var ngCspElement = (document.querySelector('[ng-csp]') ||
+                    document.querySelector('[data-ng-csp]'));
+
+    if (ngCspElement) {
+      var ngCspAttribute = ngCspElement.getAttribute('ng-csp') ||
+                    ngCspElement.getAttribute('data-ng-csp');
+      csp.rules = {
+        noUnsafeEval: !ngCspAttribute || (ngCspAttribute.indexOf('no-unsafe-eval') !== -1),
+        noInlineStyle: !ngCspAttribute || (ngCspAttribute.indexOf('no-inline-style') !== -1)
+      };
+    } else {
+      csp.rules = {
+        noUnsafeEval: noUnsafeEval(),
+        noInlineStyle: false
+      };
+    }
+  }
+
+  return csp.rules;
+
+  function noUnsafeEval() {
+    try {
+      /* jshint -W031, -W054 */
+      new Function('');
+      /* jshint +W031, +W054 */
+      return false;
+    } catch (e) {
+      return true;
+    }
+  }
+};
+
+/**
+ * @ngdoc directive
+ * @module ng
+ * @name ngJq
+ *
+ * @element ANY
+ * @param {string=} ngJq the name of the library available under `window`
+ * to be used for angular.element
+ * @description
+ * Use this directive to force the angular.element library.  This should be
+ * used to force either jqLite by leaving ng-jq blank or setting the name of
+ * the jquery variable under window (eg. jQuery).
+ *
+ * Since angular looks for this directive when it is loaded (doesn't wait for the
+ * DOMContentLoaded event), it must be placed on an element that comes before the script
+ * which loads angular. Also, only the first instance of `ng-jq` will be used and all
+ * others ignored.
+ *
+ * @example
+ * This example shows how to force jqLite using the `ngJq` directive to the `html` tag.
+ ```html
+ <!doctype html>
+ <html ng-app ng-jq>
+ ...
+ ...
+ </html>
+ ```
+ * @example
+ * This example shows how to use a jQuery based library of a different name.
+ * The library name must be available at the top most 'window'.
+ ```html
+ <!doctype html>
+ <html ng-app ng-jq="jQueryLib">
+ ...
+ ...
+ </html>
+ ```
+ */
+var jq = function() {
+  if (isDefined(jq.name_)) return jq.name_;
+  var el;
+  var i, ii = ngAttrPrefixes.length, prefix, name;
+  for (i = 0; i < ii; ++i) {
+    prefix = ngAttrPrefixes[i];
+    if (el = document.querySelector('[' + prefix.replace(':', '\\:') + 'jq]')) {
+      name = el.getAttribute(prefix + 'jq');
+      break;
+    }
+  }
+
+  return (jq.name_ = name);
+};
+
+function concat(array1, array2, index) {
+  return array1.concat(slice.call(array2, index));
+}
+
+function sliceArgs(args, startIndex) {
+  return slice.call(args, startIndex || 0);
+}
+
+
+/* jshint -W101 */
+/**
+ * @ngdoc function
+ * @name angular.bind
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Returns a function which calls function `fn` bound to `self` (`self` becomes the `this` for
+ * `fn`). You can supply optional `args` that are prebound to the function. This feature is also
+ * known as [partial application](http://en.wikipedia.org/wiki/Partial_application), as
+ * distinguished from [function currying](http://en.wikipedia.org/wiki/Currying#Contrast_with_partial_function_application).
+ *
+ * @param {Object} self Context which `fn` should be evaluated in.
+ * @param {function()} fn Function to be bound.
+ * @param {...*} args Optional arguments to be prebound to the `fn` function call.
+ * @returns {function()} Function that wraps the `fn` with all the specified bindings.
+ */
+/* jshint +W101 */
+function bind(self, fn) {
+  var curryArgs = arguments.length > 2 ? sliceArgs(arguments, 2) : [];
+  if (isFunction(fn) && !(fn instanceof RegExp)) {
+    return curryArgs.length
+      ? function() {
+          return arguments.length
+            ? fn.apply(self, concat(curryArgs, arguments, 0))
+            : fn.apply(self, curryArgs);
+        }
+      : function() {
+          return arguments.length
+            ? fn.apply(self, arguments)
+            : fn.call(self);
+        };
+  } else {
+    // in IE, native methods are not functions so they cannot be bound (note: they don't need to be)
+    return fn;
+  }
+}
+
+
+function toJsonReplacer(key, value) {
+  var val = value;
+
+  if (typeof key === 'string' && key.charAt(0) === '$' && key.charAt(1) === '$') {
+    val = undefined;
+  } else if (isWindow(value)) {
+    val = '$WINDOW';
+  } else if (value &&  document === value) {
+    val = '$DOCUMENT';
+  } else if (isScope(value)) {
+    val = '$SCOPE';
+  }
+
+  return val;
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.toJson
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Serializes input into a JSON-formatted string. Properties with leading $$ characters will be
+ * stripped since angular uses this notation internally.
+ *
+ * @param {Object|Array|Date|string|number} obj Input to be serialized into JSON.
+ * @param {boolean|number} [pretty=2] If set to true, the JSON output will contain newlines and whitespace.
+ *    If set to an integer, the JSON output will contain that many spaces per indentation.
+ * @returns {string|undefined} JSON-ified string representing `obj`.
+ */
+function toJson(obj, pretty) {
+  if (typeof obj === 'undefined') return undefined;
+  if (!isNumber(pretty)) {
+    pretty = pretty ? 2 : null;
+  }
+  return JSON.stringify(obj, toJsonReplacer, pretty);
+}
+
+
+/**
+ * @ngdoc function
+ * @name angular.fromJson
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Deserializes a JSON string.
+ *
+ * @param {string} json JSON string to deserialize.
+ * @returns {Object|Array|string|number} Deserialized JSON string.
+ */
+function fromJson(json) {
+  return isString(json)
+      ? JSON.parse(json)
+      : json;
+}
+
+
+function timezoneToOffset(timezone, fallback) {
+  var requestedTimezoneOffset = Date.parse('Jan 01, 1970 00:00:00 ' + timezone) / 60000;
+  return isNaN(requestedTimezoneOffset) ? fallback : requestedTimezoneOffset;
+}
+
+
+function addDateMinutes(date, minutes) {
+  date = new Date(date.getTime());
+  date.setMinutes(date.getMinutes() + minutes);
+  return date;
+}
+
+
+function convertTimezoneToLocal(date, timezone, reverse) {
+  reverse = reverse ? -1 : 1;
+  var timezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+  return addDateMinutes(date, reverse * (timezoneOffset - date.getTimezoneOffset()));
+}
+
+
+/**
+ * @returns {string} Returns the string representation of the element.
+ */
+function startingTag(element) {
+  element = jqLite(element).clone();
+  try {
+    // turns out IE does not let you set .html() on elements which
+    // are not allowed to have children. So we just ignore it.
+    element.empty();
+  } catch (e) {}
+  var elemHtml = jqLite('<div>').append(element).html();
+  try {
+    return element[0].nodeType === NODE_TYPE_TEXT ? lowercase(elemHtml) :
+        elemHtml.
+          match(/^(<[^>]+>)/)[1].
+          replace(/^<([\w\-]+)/, function(match, nodeName) { return '<' + lowercase(nodeName); });
+  } catch (e) {
+    return lowercase(elemHtml);
+  }
+
+}
+
+
+/////////////////////////////////////////////////
+
+/**
+ * Tries to decode the URI component without throwing an exception.
+ *
+ * @private
+ * @param str value potential URI component to check.
+ * @returns {boolean} True if `value` can be decoded
+ * with the decodeURIComponent function.
+ */
+function tryDecodeURIComponent(value) {
+  try {
+    return decodeURIComponent(value);
+  } catch (e) {
+    // Ignore any invalid uri component
+  }
+}
+
+
+/**
+ * Parses an escaped url query string into key-value pairs.
+ * @returns {Object.<string,boolean|Array>}
+ */
+function parseKeyValue(/**string*/keyValue) {
+  var obj = {};
+  forEach((keyValue || "").split('&'), function(keyValue) {
+    var splitPoint, key, val;
+    if (keyValue) {
+      key = keyValue = keyValue.replace(/\+/g,'%20');
+      splitPoint = keyValue.indexOf('=');
+      if (splitPoint !== -1) {
+        key = keyValue.substring(0, splitPoint);
+        val = keyValue.substring(splitPoint + 1);
+      }
+      key = tryDecodeURIComponent(key);
+      if (isDefined(key)) {
+        val = isDefined(val) ? tryDecodeURIComponent(val) : true;
+        if (!hasOwnProperty.call(obj, key)) {
+          obj[key] = val;
+        } else if (isArray(obj[key])) {
+          obj[key].push(val);
+        } else {
+          obj[key] = [obj[key],val];
+        }
+      }
+    }
+  });
+  return obj;
+}
+
+function toKeyValue(obj) {
+  var parts = [];
+  forEach(obj, function(value, key) {
+    if (isArray(value)) {
+      forEach(value, function(arrayValue) {
+        parts.push(encodeUriQuery(key, true) +
+                   (arrayValue === true ? '' : '=' + encodeUriQuery(arrayValue, true)));
+      });
+    } else {
+    parts.push(encodeUriQuery(key, true) +
+               (value === true ? '' : '=' + encodeUriQuery(value, true)));
+    }
+  });
+  return parts.length ? parts.join('&') : '';
+}
+
+
+/**
+ * We need our custom method because encodeURIComponent is too aggressive and doesn't follow
+ * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path
+ * segments:
+ *    segment       = *pchar
+ *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+ *    pct-encoded   = "%" HEXDIG HEXDIG
+ *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+ *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+ *                     / "*" / "+" / "," / ";" / "="
+ */
+function encodeUriSegment(val) {
+  return encodeUriQuery(val, true).
+             replace(/%26/gi, '&').
+             replace(/%3D/gi, '=').
+             replace(/%2B/gi, '+');
+}
+
+
+/**
+ * This method is intended for encoding *key* or *value* parts of query component. We need a custom
+ * method because encodeURIComponent is too aggressive and encodes stuff that doesn't have to be
+ * encoded per http://tools.ietf.org/html/rfc3986:
+ *    query       = *( pchar / "/" / "?" )
+ *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+ *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+ *    pct-encoded   = "%" HEXDIG HEXDIG
+ *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+ *                     / "*" / "+" / "," / ";" / "="
+ */
+function encodeUriQuery(val, pctEncodeSpaces) {
+  return encodeURIComponent(val).
+             replace(/%40/gi, '@').
+             replace(/%3A/gi, ':').
+             replace(/%24/g, '$').
+             replace(/%2C/gi, ',').
+             replace(/%3B/gi, ';').
+             replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+}
+
+var ngAttrPrefixes = ['ng-', 'data-ng-', 'ng:', 'x-ng-'];
+
+function getNgAttribute(element, ngAttr) {
+  var attr, i, ii = ngAttrPrefixes.length;
+  for (i = 0; i < ii; ++i) {
+    attr = ngAttrPrefixes[i] + ngAttr;
+    if (isString(attr = element.getAttribute(attr))) {
+      return attr;
+    }
+  }
+  return null;
+}
+
+/**
+ * @ngdoc directive
+ * @name ngApp
+ * @module ng
+ *
+ * @element ANY
+ * @param {angular.Module} ngApp an optional application
+ *   {@link angular.module module} name to load.
+ * @param {boolean=} ngStrictDi if this attribute is present on the app element, the injector will be
+ *   created in "strict-di" mode. This means that the application will fail to invoke functions which
+ *   do not use explicit function annotation (and are thus unsuitable for minification), as described
+ *   in {@link guide/di the Dependency Injection guide}, and useful debugging info will assist in
+ *   tracking down the root of these bugs.
+ *
+ * @description
+ *
+ * Use this directive to **auto-bootstrap** an AngularJS application. The `ngApp` directive
+ * designates the **root element** of the application and is typically placed near the root element
+ * of the page - e.g. on the `<body>` or `<html>` tags.
+ *
+ * Only one AngularJS application can be auto-bootstrapped per HTML document. The first `ngApp`
+ * found in the document will be used to define the root element to auto-bootstrap as an
+ * application. To run multiple applications in an HTML document you must manually bootstrap them using
+ * {@link angular.bootstrap} instead. AngularJS applications cannot be nested within each other.
+ *
+ * You can specify an **AngularJS module** to be used as the root module for the application.  This
+ * module will be loaded into the {@link auto.$injector} when the application is bootstrapped. It
+ * should contain the application code needed or have dependencies on other modules that will
+ * contain the code. See {@link angular.module} for more information.
+ *
+ * In the example below if the `ngApp` directive were not placed on the `html` element then the
+ * document would not be compiled, the `AppController` would not be instantiated and the `{{ a+b }}`
+ * would not be resolved to `3`.
+ *
+ * `ngApp` is the easiest, and most common way to bootstrap an application.
+ *
+ <example module="ngAppDemo">
+   <file name="index.html">
+   <div ng-controller="ngAppDemoController">
+     I can add: {{a}} + {{b}} =  {{ a+b }}
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('ngAppDemo', []).controller('ngAppDemoController', function($scope) {
+     $scope.a = 1;
+     $scope.b = 2;
+   });
+   </file>
+ </example>
+ *
+ * Using `ngStrictDi`, you would see something like this:
+ *
+ <example ng-app-included="true">
+   <file name="index.html">
+   <div ng-app="ngAppStrictDemo" ng-strict-di>
+       <div ng-controller="GoodController1">
+           I can add: {{a}} + {{b}} =  {{ a+b }}
+
+           <p>This renders because the controller does not fail to
+              instantiate, by using explicit annotation style (see
+              script.js for details)
+           </p>
+       </div>
+
+       <div ng-controller="GoodController2">
+           Name: <input ng-model="name"><br />
+           Hello, {{name}}!
+
+           <p>This renders because the controller does not fail to
+              instantiate, by using explicit annotation style
+              (see script.js for details)
+           </p>
+       </div>
+
+       <div ng-controller="BadController">
+           I can add: {{a}} + {{b}} =  {{ a+b }}
+
+           <p>The controller could not be instantiated, due to relying
+              on automatic function annotations (which are disabled in
+              strict mode). As such, the content of this section is not
+              interpolated, and there should be an error in your web console.
+           </p>
+       </div>
+   </div>
+   </file>
+   <file name="script.js">
+   angular.module('ngAppStrictDemo', [])
+     // BadController will fail to instantiate, due to relying on automatic function annotation,
+     // rather than an explicit annotation
+     .controller('BadController', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     })
+     // Unlike BadController, GoodController1 and GoodController2 will not fail to be instantiated,
+     // due to using explicit annotations using the array style and $inject property, respectively.
+     .controller('GoodController1', ['$scope', function($scope) {
+       $scope.a = 1;
+       $scope.b = 2;
+     }])
+     .controller('GoodController2', GoodController2);
+     function GoodController2($scope) {
+       $scope.name = "World";
+     }
+     GoodController2.$inject = ['$scope'];
+   </file>
+   <file name="style.css">
+   div[ng-controller] {
+       margin-bottom: 1em;
+       -webkit-border-radius: 4px;
+       border-radius: 4px;
+       border: 1px solid;
+       padding: .5em;
+   }
+   div[ng-controller^=Good] {
+       border-color: #d6e9c6;
+       background-color: #dff0d8;
+       color: #3c763d;
+   }
+   div[ng-controller^=Bad] {
+       border-color: #ebccd1;
+       background-color: #f2dede;
+       color: #a94442;
+       margin-bottom: 0;
+   }
+   </file>
+ </example>
+ */
+function angularInit(element, bootstrap) {
+  var appElement,
+      module,
+      config = {};
+
+  // The element `element` has priority over any other element
+  forEach(ngAttrPrefixes, function(prefix) {
+    var name = prefix + 'app';
+
+    if (!appElement && element.hasAttribute && element.hasAttribute(name)) {
+      appElement = element;
+      module = element.getAttribute(name);
+    }
+  });
+  forEach(ngAttrPrefixes, function(prefix) {
+    var name = prefix + 'app';
+    var candidate;
+
+    if (!appElement && (candidate = element.querySelector('[' + name.replace(':', '\\:') + ']'))) {
+      appElement = candidate;
+      module = candidate.getAttribute(name);
+    }
+  });
+  if (appElement) {
+    config.strictDi = getNgAttribute(appElement, "strict-di") !== null;
+    bootstrap(appElement, module ? [module] : [], config);
+  }
+}
+
+/**
+ * @ngdoc function
+ * @name angular.bootstrap
+ * @module ng
+ * @description
+ * Use this function to manually start up angular application.
+ *
+ * See: {@link guide/bootstrap Bootstrap}
+ *
+ * Note that Protractor based end-to-end tests cannot use this function to bootstrap manually.
+ * They must use {@link ng.directive:ngApp ngApp}.
+ *
+ * Angular will detect if it has been loaded into the browser more than once and only allow the
+ * first loaded script to be bootstrapped and will report a warning to the browser console for
+ * each of the subsequent scripts. This prevents strange results in applications, where otherwise
+ * multiple instances of Angular try to work on the DOM.
+ *
+ * ```html
+ * <!doctype html>
+ * <html>
+ * <body>
+ * <div ng-controller="WelcomeController">
+ *   {{greeting}}
+ * </div>
+ *
+ * <script src="angular.js"></script>
+ * <script>
+ *   var app = angular.module('demo', [])
+ *   .controller('WelcomeController', function($scope) {
+ *       $scope.greeting = 'Welcome!';
+ *   });
+ *   angular.bootstrap(document, ['demo']);
+ * </script>
+ * </body>
+ * </html>
+ * ```
+ *
+ * @param {DOMElement} element DOM element which is the root of angular application.
+ * @param {Array<String|Function|Array>=} modules an array of modules to load into the application.
+ *     Each item in the array should be the name of a predefined module or a (DI annotated)
+ *     function that will be invoked by the injector as a `config` block.
+ *     See: {@link angular.module modules}
+ * @param {Object=} config an object for defining configuration options for the application. The
+ *     following keys are supported:
+ *
+ * * `strictDi` - disable automatic function annotation for the application. This is meant to
+ *   assist in finding bugs which break minified code. Defaults to `false`.
+ *
+ * @returns {auto.$injector} Returns the newly created injector for this app.
+ */
+function bootstrap(element, modules, config) {
+  if (!isObject(config)) config = {};
+  var defaultConfig = {
+    strictDi: false
+  };
+  config = extend(defaultConfig, config);
+  var doBootstrap = function() {
+    element = jqLite(element);
+
+    if (element.injector()) {
+      var tag = (element[0] === document) ? 'document' : startingTag(element);
+      //Encode angle brackets to prevent input from being sanitized to empty string #8683
+      throw ngMinErr(
+          'btstrpd',
+          "App Already Bootstrapped with this Element '{0}'",
+          tag.replace(/</,'&lt;').replace(/>/,'&gt;'));
+    }
+
+    modules = modules || [];
+    modules.unshift(['$provide', function($provide) {
+      $provide.value('$rootElement', element);
+    }]);
+
+    if (config.debugInfoEnabled) {
+      // Pushing so that this overrides `debugInfoEnabled` setting defined in user's `modules`.
+      modules.push(['$compileProvider', function($compileProvider) {
+        $compileProvider.debugInfoEnabled(true);
+      }]);
+    }
+
+    modules.unshift('ng');
+    var injector = createInjector(modules, config.strictDi);
+    injector.invoke(['$rootScope', '$rootElement', '$compile', '$injector',
+       function bootstrapApply(scope, element, compile, injector) {
+        scope.$apply(function() {
+          element.data('$injector', injector);
+          compile(element)(scope);
+        });
+      }]
+    );
+    return injector;
+  };
+
+  var NG_ENABLE_DEBUG_INFO = /^NG_ENABLE_DEBUG_INFO!/;
+  var NG_DEFER_BOOTSTRAP = /^NG_DEFER_BOOTSTRAP!/;
+
+  if (window && NG_ENABLE_DEBUG_INFO.test(window.name)) {
+    config.debugInfoEnabled = true;
+    window.name = window.name.replace(NG_ENABLE_DEBUG_INFO, '');
+  }
+
+  if (window && !NG_DEFER_BOOTSTRAP.test(window.name)) {
+    return doBootstrap();
+  }
+
+  window.name = window.name.replace(NG_DEFER_BOOTSTRAP, '');
+  angular.resumeBootstrap = function(extraModules) {
+    forEach(extraModules, function(module) {
+      modules.push(module);
+    });
+    return doBootstrap();
+  };
+
+  if (isFunction(angular.resumeDeferredBootstrap)) {
+    angular.resumeDeferredBootstrap();
+  }
+}
+
+/**
+ * @ngdoc function
+ * @name angular.reloadWithDebugInfo
+ * @module ng
+ * @description
+ * Use this function to reload the current application with debug information turned on.
+ * This takes precedence over a call to `$compileProvider.debugInfoEnabled(false)`.
+ *
+ * See {@link ng.$compileProvider#debugInfoEnabled} for more.
+ */
+function reloadWithDebugInfo() {
+  window.name = 'NG_ENABLE_DEBUG_INFO!' + window.name;
+  window.location.reload();
+}
+
+/**
+ * @name angular.getTestability
+ * @module ng
+ * @description
+ * Get the testability service for the instance of Angular on the given
+ * element.
+ * @param {DOMElement} element DOM element which is the root of angular application.
+ */
+function getTestability(rootElement) {
+  var injector = angular.element(rootElement).injector();
+  if (!injector) {
+    throw ngMinErr('test',
+      'no injector found for element argument to getTestability');
+  }
+  return injector.get('$$testability');
+}
+
+var SNAKE_CASE_REGEXP = /[A-Z]/g;
+function snake_case(name, separator) {
+  separator = separator || '_';
+  return name.replace(SNAKE_CASE_REGEXP, function(letter, pos) {
+    return (pos ? separator : '') + letter.toLowerCase();
+  });
+}
+
+var bindJQueryFired = false;
+var skipDestroyOnNextJQueryCleanData;
+function bindJQuery() {
+  var originalCleanData;
+
+  if (bindJQueryFired) {
+    return;
+  }
+
+  // bind to jQuery if present;
+  var jqName = jq();
+  jQuery = isUndefined(jqName) ? window.jQuery :   // use jQuery (if present)
+           !jqName             ? undefined     :   // use jqLite
+                                 window[jqName];   // use jQuery specified by `ngJq`
+
+  // Use jQuery if it exists with proper functionality, otherwise default to us.
+  // Angular 1.2+ requires jQuery 1.7+ for on()/off() support.
+  // Angular 1.3+ technically requires at least jQuery 2.1+ but it may work with older
+  // versions. It will not work for sure with jQuery <1.7, though.
+  if (jQuery && jQuery.fn.on) {
+    jqLite = jQuery;
+    extend(jQuery.fn, {
+      scope: JQLitePrototype.scope,
+      isolateScope: JQLitePrototype.isolateScope,
+      controller: JQLitePrototype.controller,
+      injector: JQLitePrototype.injector,
+      inheritedData: JQLitePrototype.inheritedData
+    });
+
+    // All nodes removed from the DOM via various jQuery APIs like .remove()
+    // are passed through jQuery.cleanData. Monkey-patch this method to fire
+    // the $destroy event on all removed nodes.
+    originalCleanData = jQuery.cleanData;
+    jQuery.cleanData = function(elems) {
+      var events;
+      if (!skipDestroyOnNextJQueryCleanData) {
+        for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+          events = jQuery._data(elem, "events");
+          if (events && events.$destroy) {
+            jQuery(elem).triggerHandler('$destroy');
+          }
+        }
+      } else {
+        skipDestroyOnNextJQueryCleanData = false;
+      }
+      originalCleanData(elems);
+    };
+  } else {
+    jqLite = JQLite;
+  }
+
+  angular.element = jqLite;
+
+  // Prevent double-proxying.
+  bindJQueryFired = true;
+}
+
+/**
+ * throw error if the argument is falsy.
+ */
+function assertArg(arg, name, reason) {
+  if (!arg) {
+    throw ngMinErr('areq', "Argument '{0}' is {1}", (name || '?'), (reason || "required"));
+  }
+  return arg;
+}
+
+function assertArgFn(arg, name, acceptArrayAnnotation) {
+  if (acceptArrayAnnotation && isArray(arg)) {
+      arg = arg[arg.length - 1];
+  }
+
+  assertArg(isFunction(arg), name, 'not a function, got ' +
+      (arg && typeof arg === 'object' ? arg.constructor.name || 'Object' : typeof arg));
+  return arg;
+}
+
+/**
+ * throw error if the name given is hasOwnProperty
+ * @param  {String} name    the name to test
+ * @param  {String} context the context in which the name is used, such as module or directive
+ */
+function assertNotHasOwnProperty(name, context) {
+  if (name === 'hasOwnProperty') {
+    throw ngMinErr('badname', "hasOwnProperty is not a valid {0} name", context);
+  }
+}
+
+/**
+ * Return the value accessible from the object by path. Any undefined traversals are ignored
+ * @param {Object} obj starting object
+ * @param {String} path path to traverse
+ * @param {boolean} [bindFnToScope=true]
+ * @returns {Object} value as accessible by path
+ */
+//TODO(misko): this function needs to be removed
+function getter(obj, path, bindFnToScope) {
+  if (!path) return obj;
+  var keys = path.split('.');
+  var key;
+  var lastInstance = obj;
+  var len = keys.length;
+
+  for (var i = 0; i < len; i++) {
+    key = keys[i];
+    if (obj) {
+      obj = (lastInstance = obj)[key];
+    }
+  }
+  if (!bindFnToScope && isFunction(obj)) {
+    return bind(lastInstance, obj);
+  }
+  return obj;
+}
+
+/**
+ * Return the DOM siblings between the first and last node in the given array.
+ * @param {Array} array like object
+ * @returns {Array} the inputted object or a jqLite collection containing the nodes
+ */
+function getBlockNodes(nodes) {
+  // TODO(perf): update `nodes` instead of creating a new object?
+  var node = nodes[0];
+  var endNode = nodes[nodes.length - 1];
+  var blockNodes;
+
+  for (var i = 1; node !== endNode && (node = node.nextSibling); i++) {
+    if (blockNodes || nodes[i] !== node) {
+      if (!blockNodes) {
+        blockNodes = jqLite(slice.call(nodes, 0, i));
+      }
+      blockNodes.push(node);
+    }
+  }
+
+  return blockNodes || nodes;
+}
+
+
+/**
+ * Creates a new object without a prototype. This object is useful for lookup without having to
+ * guard against prototypically inherited properties via hasOwnProperty.
+ *
+ * Related micro-benchmarks:
+ * - http://jsperf.com/object-create2
+ * - http://jsperf.com/proto-map-lookup/2
+ * - http://jsperf.com/for-in-vs-object-keys2
+ *
+ * @returns {Object}
+ */
+function createMap() {
+  return Object.create(null);
+}
+
+var NODE_TYPE_ELEMENT = 1;
+var NODE_TYPE_ATTRIBUTE = 2;
+var NODE_TYPE_TEXT = 3;
+var NODE_TYPE_COMMENT = 8;
+var NODE_TYPE_DOCUMENT = 9;
+var NODE_TYPE_DOCUMENT_FRAGMENT = 11;
+
+/**
+ * @ngdoc type
+ * @name angular.Module
+ * @module ng
+ * @description
+ *
+ * Interface for configuring angular {@link angular.module modules}.
+ */
+
+function setupModuleLoader(window) {
+
+  var $injectorMinErr = minErr('$injector');
+  var ngMinErr = minErr('ng');
+
+  function ensure(obj, name, factory) {
+    return obj[name] || (obj[name] = factory());
+  }
+
+  var angular = ensure(window, 'angular', Object);
+
+  // We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap
+  angular.$$minErr = angular.$$minErr || minErr;
+
+  return ensure(angular, 'module', function() {
+    /** @type {Object.<string, angular.Module>} */
+    var modules = {};
+
+    /**
+     * @ngdoc function
+     * @name angular.module
+     * @module ng
+     * @description
+     *
+     * The `angular.module` is a global place for creating, registering and retrieving Angular
+     * modules.
+     * All modules (angular core or 3rd party) that should be available to an application must be
+     * registered using this mechanism.
+     *
+     * Passing one argument retrieves an existing {@link angular.Module},
+     * whereas passing more than one argument creates a new {@link angular.Module}
+     *
+     *
+     * # Module
+     *
+     * A module is a collection of services, directives, controllers, filters, and configuration information.
+     * `angular.module` is used to configure the {@link auto.$injector $injector}.
+     *
+     * ```js
+     * // Create a new module
+     * var myModule = angular.module('myModule', []);
+     *
+     * // register a new service
+     * myModule.value('appName', 'MyCoolApp');
+     *
+     * // configure existing services inside initialization blocks.
+     * myModule.config(['$locationProvider', function($locationProvider) {
+     *   // Configure existing providers
+     *   $locationProvider.hashPrefix('!');
+     * }]);
+     * ```
+     *
+     * Then you can create an injector and load your modules like this:
+     *
+     * ```js
+     * var injector = angular.injector(['ng', 'myModule'])
+     * ```
+     *
+     * However it's more likely that you'll just use
+     * {@link ng.directive:ngApp ngApp} or
+     * {@link angular.bootstrap} to simplify this process for you.
+     *
+     * @param {!string} name The name of the module to create or retrieve.
+     * @param {!Array.<string>=} requires If specified then new module is being created. If
+     *        unspecified then the module is being retrieved for further configuration.
+     * @param {Function=} configFn Optional configuration function for the module. Same as
+     *        {@link angular.Module#config Module#config()}.
+     * @returns {angular.Module} new module with the {@link angular.Module} api.
+     */
+    return function module(name, requires, configFn) {
+      var assertNotHasOwnProperty = function(name, context) {
+        if (name === 'hasOwnProperty') {
+          throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
+        }
+      };
+
+      assertNotHasOwnProperty(name, 'module');
+      if (requires && modules.hasOwnProperty(name)) {
+        modules[name] = null;
+      }
+      return ensure(modules, name, function() {
+        if (!requires) {
+          throw $injectorMinErr('nomod', "Module '{0}' is not available! You either misspelled " +
+             "the module name or forgot to load it. If registering a module ensure that you " +
+             "specify the dependencies as the second argument.", name);
+        }
+
+        /** @type {!Array.<Array.<*>>} */
+        var invokeQueue = [];
+
+        /** @type {!Array.<Function>} */
+        var configBlocks = [];
+
+        /** @type {!Array.<Function>} */
+        var runBlocks = [];
+
+        var config = invokeLater('$injector', 'invoke', 'push', configBlocks);
+
+        /** @type {angular.Module} */
+        var moduleInstance = {
+          // Private state
+          _invokeQueue: invokeQueue,
+          _configBlocks: configBlocks,
+          _runBlocks: runBlocks,
+
+          /**
+           * @ngdoc property
+           * @name angular.Module#requires
+           * @module ng
+           *
+           * @description
+           * Holds the list of modules which the injector will load before the current module is
+           * loaded.
+           */
+          requires: requires,
+
+          /**
+           * @ngdoc property
+           * @name angular.Module#name
+           * @module ng
+           *
+           * @description
+           * Name of the module.
+           */
+          name: name,
+
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#provider
+           * @module ng
+           * @param {string} name service name
+           * @param {Function} providerType Construction function for creating new instance of the
+           *                                service.
+           * @description
+           * See {@link auto.$provide#provider $provide.provider()}.
+           */
+          provider: invokeLaterAndSetModuleName('$provide', 'provider'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#factory
+           * @module ng
+           * @param {string} name service name
+           * @param {Function} providerFunction Function for creating new instance of the service.
+           * @description
+           * See {@link auto.$provide#factory $provide.factory()}.
+           */
+          factory: invokeLaterAndSetModuleName('$provide', 'factory'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#service
+           * @module ng
+           * @param {string} name service name
+           * @param {Function} constructor A constructor function that will be instantiated.
+           * @description
+           * See {@link auto.$provide#service $provide.service()}.
+           */
+          service: invokeLaterAndSetModuleName('$provide', 'service'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#value
+           * @module ng
+           * @param {string} name service name
+           * @param {*} object Service instance object.
+           * @description
+           * See {@link auto.$provide#value $provide.value()}.
+           */
+          value: invokeLater('$provide', 'value'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#constant
+           * @module ng
+           * @param {string} name constant name
+           * @param {*} object Constant value.
+           * @description
+           * Because the constants are fixed, they get applied before other provide methods.
+           * See {@link auto.$provide#constant $provide.constant()}.
+           */
+          constant: invokeLater('$provide', 'constant', 'unshift'),
+
+           /**
+           * @ngdoc method
+           * @name angular.Module#decorator
+           * @module ng
+           * @param {string} The name of the service to decorate.
+           * @param {Function} This function will be invoked when the service needs to be
+           *                                    instantiated and should return the decorated service instance.
+           * @description
+           * See {@link auto.$provide#decorator $provide.decorator()}.
+           */
+          decorator: invokeLaterAndSetModuleName('$provide', 'decorator'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#animation
+           * @module ng
+           * @param {string} name animation name
+           * @param {Function} animationFactory Factory function for creating new instance of an
+           *                                    animation.
+           * @description
+           *
+           * **NOTE**: animations take effect only if the **ngAnimate** module is loaded.
+           *
+           *
+           * Defines an animation hook that can be later used with
+           * {@link $animate $animate} service and directives that use this service.
+           *
+           * ```js
+           * module.animation('.animation-name', function($inject1, $inject2) {
+           *   return {
+           *     eventName : function(element, done) {
+           *       //code to run the animation
+           *       //once complete, then run done()
+           *       return function cancellationFunction(element) {
+           *         //code to cancel the animation
+           *       }
+           *     }
+           *   }
+           * })
+           * ```
+           *
+           * See {@link ng.$animateProvider#register $animateProvider.register()} and
+           * {@link ngAnimate ngAnimate module} for more information.
+           */
+          animation: invokeLaterAndSetModuleName('$animateProvider', 'register'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#filter
+           * @module ng
+           * @param {string} name Filter name - this must be a valid angular expression identifier
+           * @param {Function} filterFactory Factory function for creating new instance of filter.
+           * @description
+           * See {@link ng.$filterProvider#register $filterProvider.register()}.
+           *
+           * <div class="alert alert-warning">
+           * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+           * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+           * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+           * (`myapp_subsection_filterx`).
+           * </div>
+           */
+          filter: invokeLaterAndSetModuleName('$filterProvider', 'register'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#controller
+           * @module ng
+           * @param {string|Object} name Controller name, or an object map of controllers where the
+           *    keys are the names and the values are the constructors.
+           * @param {Function} constructor Controller constructor function.
+           * @description
+           * See {@link ng.$controllerProvider#register $controllerProvider.register()}.
+           */
+          controller: invokeLaterAndSetModuleName('$controllerProvider', 'register'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#directive
+           * @module ng
+           * @param {string|Object} name Directive name, or an object map of directives where the
+           *    keys are the names and the values are the factories.
+           * @param {Function} directiveFactory Factory function for creating new instance of
+           * directives.
+           * @description
+           * See {@link ng.$compileProvider#directive $compileProvider.directive()}.
+           */
+          directive: invokeLaterAndSetModuleName('$compileProvider', 'directive'),
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#config
+           * @module ng
+           * @param {Function} configFn Execute this function on module load. Useful for service
+           *    configuration.
+           * @description
+           * Use this method to register work which needs to be performed on module loading.
+           * For more about how to configure services, see
+           * {@link providers#provider-recipe Provider Recipe}.
+           */
+          config: config,
+
+          /**
+           * @ngdoc method
+           * @name angular.Module#run
+           * @module ng
+           * @param {Function} initializationFn Execute this function after injector creation.
+           *    Useful for application initialization.
+           * @description
+           * Use this method to register work which should be performed when the injector is done
+           * loading all modules.
+           */
+          run: function(block) {
+            runBlocks.push(block);
+            return this;
+          }
+        };
+
+        if (configFn) {
+          config(configFn);
+        }
+
+        return moduleInstance;
+
+        /**
+         * @param {string} provider
+         * @param {string} method
+         * @param {String=} insertMethod
+         * @returns {angular.Module}
+         */
+        function invokeLater(provider, method, insertMethod, queue) {
+          if (!queue) queue = invokeQueue;
+          return function() {
+            queue[insertMethod || 'push']([provider, method, arguments]);
+            return moduleInstance;
+          };
+        }
+
+        /**
+         * @param {string} provider
+         * @param {string} method
+         * @returns {angular.Module}
+         */
+        function invokeLaterAndSetModuleName(provider, method) {
+          return function(recipeName, factoryFunction) {
+            if (factoryFunction && isFunction(factoryFunction)) factoryFunction.$$moduleName = name;
+            invokeQueue.push([provider, method, arguments]);
+            return moduleInstance;
+          };
+        }
+      });
+    };
+  });
+
+}
+
+/* global: toDebugString: true */
+
+function serializeObject(obj) {
+  var seen = [];
+
+  return JSON.stringify(obj, function(key, val) {
+    val = toJsonReplacer(key, val);
+    if (isObject(val)) {
+
+      if (seen.indexOf(val) >= 0) return '...';
+
+      seen.push(val);
+    }
+    return val;
+  });
+}
+
+function toDebugString(obj) {
+  if (typeof obj === 'function') {
+    return obj.toString().replace(/ \{[\s\S]*$/, '');
+  } else if (isUndefined(obj)) {
+    return 'undefined';
+  } else if (typeof obj !== 'string') {
+    return serializeObject(obj);
+  }
+  return obj;
+}
+
+/* global angularModule: true,
+  version: true,
+
+  $CompileProvider,
+
+  htmlAnchorDirective,
+  inputDirective,
+  inputDirective,
+  formDirective,
+  scriptDirective,
+  selectDirective,
+  styleDirective,
+  optionDirective,
+  ngBindDirective,
+  ngBindHtmlDirective,
+  ngBindTemplateDirective,
+  ngClassDirective,
+  ngClassEvenDirective,
+  ngClassOddDirective,
+  ngCloakDirective,
+  ngControllerDirective,
+  ngFormDirective,
+  ngHideDirective,
+  ngIfDirective,
+  ngIncludeDirective,
+  ngIncludeFillContentDirective,
+  ngInitDirective,
+  ngNonBindableDirective,
+  ngPluralizeDirective,
+  ngRepeatDirective,
+  ngShowDirective,
+  ngStyleDirective,
+  ngSwitchDirective,
+  ngSwitchWhenDirective,
+  ngSwitchDefaultDirective,
+  ngOptionsDirective,
+  ngTranscludeDirective,
+  ngModelDirective,
+  ngListDirective,
+  ngChangeDirective,
+  patternDirective,
+  patternDirective,
+  requiredDirective,
+  requiredDirective,
+  minlengthDirective,
+  minlengthDirective,
+  maxlengthDirective,
+  maxlengthDirective,
+  ngValueDirective,
+  ngModelOptionsDirective,
+  ngAttributeAliasDirectives,
+  ngEventDirectives,
+
+  $AnchorScrollProvider,
+  $AnimateProvider,
+  $CoreAnimateCssProvider,
+  $$CoreAnimateJsProvider,
+  $$CoreAnimateQueueProvider,
+  $$AnimateRunnerFactoryProvider,
+  $$AnimateAsyncRunFactoryProvider,
+  $BrowserProvider,
+  $CacheFactoryProvider,
+  $ControllerProvider,
+  $DocumentProvider,
+  $ExceptionHandlerProvider,
+  $FilterProvider,
+  $$ForceReflowProvider,
+  $InterpolateProvider,
+  $IntervalProvider,
+  $$HashMapProvider,
+  $HttpProvider,
+  $HttpParamSerializerProvider,
+  $HttpParamSerializerJQLikeProvider,
+  $HttpBackendProvider,
+  $xhrFactoryProvider,
+  $LocationProvider,
+  $LogProvider,
+  $ParseProvider,
+  $RootScopeProvider,
+  $QProvider,
+  $$QProvider,
+  $$SanitizeUriProvider,
+  $SceProvider,
+  $SceDelegateProvider,
+  $SnifferProvider,
+  $TemplateCacheProvider,
+  $TemplateRequestProvider,
+  $$TestabilityProvider,
+  $TimeoutProvider,
+  $$RAFProvider,
+  $WindowProvider,
+  $$jqLiteProvider,
+  $$CookieReaderProvider
+*/
+
+
+/**
+ * @ngdoc object
+ * @name angular.version
+ * @module ng
+ * @description
+ * An object that contains information about the current AngularJS version.
+ *
+ * This object has the following properties:
+ *
+ * - `full` – `{string}` – Full version string, such as "0.9.18".
+ * - `major` – `{number}` – Major version number, such as "0".
+ * - `minor` – `{number}` – Minor version number, such as "9".
+ * - `dot` – `{number}` – Dot version number, such as "18".
+ * - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
+ */
+var version = {
+  full: '1.4.9',    // all of these placeholder strings will be replaced by grunt's
+  major: 1,    // package task
+  minor: 4,
+  dot: 9,
+  codeName: 'implicit-superannuation'
+};
+
+
+function publishExternalAPI(angular) {
+  extend(angular, {
+    'bootstrap': bootstrap,
+    'copy': copy,
+    'extend': extend,
+    'merge': merge,
+    'equals': equals,
+    'element': jqLite,
+    'forEach': forEach,
+    'injector': createInjector,
+    'noop': noop,
+    'bind': bind,
+    'toJson': toJson,
+    'fromJson': fromJson,
+    'identity': identity,
+    'isUndefined': isUndefined,
+    'isDefined': isDefined,
+    'isString': isString,
+    'isFunction': isFunction,
+    'isObject': isObject,
+    'isNumber': isNumber,
+    'isElement': isElement,
+    'isArray': isArray,
+    'version': version,
+    'isDate': isDate,
+    'lowercase': lowercase,
+    'uppercase': uppercase,
+    'callbacks': {counter: 0},
+    'getTestability': getTestability,
+    '$$minErr': minErr,
+    '$$csp': csp,
+    'reloadWithDebugInfo': reloadWithDebugInfo
+  });
+
+  angularModule = setupModuleLoader(window);
+
+  angularModule('ng', ['ngLocale'], ['$provide',
+    function ngModule($provide) {
+      // $$sanitizeUriProvider needs to be before $compileProvider as it is used by it.
+      $provide.provider({
+        $$sanitizeUri: $$SanitizeUriProvider
+      });
+      $provide.provider('$compile', $CompileProvider).
+        directive({
+            a: htmlAnchorDirective,
+            input: inputDirective,
+            textarea: inputDirective,
+            form: formDirective,
+            script: scriptDirective,
+            select: selectDirective,
+            style: styleDirective,
+            option: optionDirective,
+            ngBind: ngBindDirective,
+            ngBindHtml: ngBindHtmlDirective,
+            ngBindTemplate: ngBindTemplateDirective,
+            ngClass: ngClassDirective,
+            ngClassEven: ngClassEvenDirective,
+            ngClassOdd: ngClassOddDirective,
+            ngCloak: ngCloakDirective,
+            ngController: ngControllerDirective,
+            ngForm: ngFormDirective,
+            ngHide: ngHideDirective,
+            ngIf: ngIfDirective,
+            ngInclude: ngIncludeDirective,
+            ngInit: ngInitDirective,
+            ngNonBindable: ngNonBindableDirective,
+            ngPluralize: ngPluralizeDirective,
+            ngRepeat: ngRepeatDirective,
+            ngShow: ngShowDirective,
+            ngStyle: ngStyleDirective,
+            ngSwitch: ngSwitchDirective,
+            ngSwitchWhen: ngSwitchWhenDirective,
+            ngSwitchDefault: ngSwitchDefaultDirective,
+            ngOptions: ngOptionsDirective,
+            ngTransclude: ngTranscludeDirective,
+            ngModel: ngModelDirective,
+            ngList: ngListDirective,
+            ngChange: ngChangeDirective,
+            pattern: patternDirective,
+            ngPattern: patternDirective,
+            required: requiredDirective,
+            ngRequired: requiredDirective,
+            minlength: minlengthDirective,
+            ngMinlength: minlengthDirective,
+            maxlength: maxlengthDirective,
+            ngMaxlength: maxlengthDirective,
+            ngValue: ngValueDirective,
+            ngModelOptions: ngModelOptionsDirective
+        }).
+        directive({
+          ngInclude: ngIncludeFillContentDirective
+        }).
+        directive(ngAttributeAliasDirectives).
+        directive(ngEventDirectives);
+      $provide.provider({
+        $anchorScroll: $AnchorScrollProvider,
+        $animate: $AnimateProvider,
+        $animateCss: $CoreAnimateCssProvider,
+        $$animateJs: $$CoreAnimateJsProvider,
+        $$animateQueue: $$CoreAnimateQueueProvider,
+        $$AnimateRunner: $$AnimateRunnerFactoryProvider,
+        $$animateAsyncRun: $$AnimateAsyncRunFactoryProvider,
+        $browser: $BrowserProvider,
+        $cacheFactory: $CacheFactoryProvider,
+        $controller: $ControllerProvider,
+        $document: $DocumentProvider,
+        $exceptionHandler: $ExceptionHandlerProvider,
+        $filter: $FilterProvider,
+        $$forceReflow: $$ForceReflowProvider,
+        $interpolate: $InterpolateProvider,
+        $interval: $IntervalProvider,
+        $http: $HttpProvider,
+        $httpParamSerializer: $HttpParamSerializerProvider,
+        $httpParamSerializerJQLike: $HttpParamSerializerJQLikeProvider,
+        $httpBackend: $HttpBackendProvider,
+        $xhrFactory: $xhrFactoryProvider,
+        $location: $LocationProvider,
+        $log: $LogProvider,
+        $parse: $ParseProvider,
+        $rootScope: $RootScopeProvider,
+        $q: $QProvider,
+        $$q: $$QProvider,
+        $sce: $SceProvider,
+        $sceDelegate: $SceDelegateProvider,
+        $sniffer: $SnifferProvider,
+        $templateCache: $TemplateCacheProvider,
+        $templateRequest: $TemplateRequestProvider,
+        $$testability: $$TestabilityProvider,
+        $timeout: $TimeoutProvider,
+        $window: $WindowProvider,
+        $$rAF: $$RAFProvider,
+        $$jqLite: $$jqLiteProvider,
+        $$HashMap: $$HashMapProvider,
+        $$cookieReader: $$CookieReaderProvider
+      });
+    }
+  ]);
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* global JQLitePrototype: true,
+  addEventListenerFn: true,
+  removeEventListenerFn: true,
+  BOOLEAN_ATTR: true,
+  ALIASED_ATTR: true,
+*/
+
+//////////////////////////////////
+//JQLite
+//////////////////////////////////
+
+/**
+ * @ngdoc function
+ * @name angular.element
+ * @module ng
+ * @kind function
+ *
+ * @description
+ * Wraps a raw DOM element or HTML string as a [jQuery](http://jquery.com) element.
+ *
+ * If jQuery is available, `angular.element` is an alias for the
+ * [jQuery](http://api.jquery.com/jQuery/) function. If jQuery is not available, `angular.element`
+ * delegates to Angular's built-in subset of jQuery, called "jQuery lite" or **jqLite**.
+ *
+ * jqLite is a tiny, API-compatible subset of jQuery that allows
+ * Angular to manipulate the DOM in a cross-browser compatible way. jqLite implements only the most
+ * commonly needed functionality with the goal of having a very small footprint.
+ *
+ * To use `jQuery`, simply ensure it is loaded before the `angular.js` file. You can also use the
+ * {@link ngJq `ngJq`} directive to specify that jqlite should be used over jQuery, or to use a
+ * specific version of jQuery if multiple versions exist on the page.
+ *
+ * <div class="alert alert-info">**Note:** All element references in Angular are always wrapped with jQuery or
+ * jqLite (such as the element argument in a directive's compile / link function). They are never raw DOM references.</div>
+ *
+ * <div class="alert alert-warning">**Note:** Keep in mind that this function will not find elements
+ * by tag name / CSS selector. For lookups by tag name, try instead `angular.element(document).find(...)`
+ * or `$document.find()`, or use the standard DOM APIs, e.g. `document.querySelectorAll()`.</div>
+ *
+ * ## Angular's jqLite
+ * jqLite provides only the following jQuery methods:
+ *
+ * - [`addClass()`](http://api.jquery.com/addClass/)
+ * - [`after()`](http://api.jquery.com/after/)
+ * - [`append()`](http://api.jquery.com/append/)
+ * - [`attr()`](http://api.jquery.com/attr/) - Does not support functions as parameters
+ * - [`bind()`](http://api.jquery.com/bind/) - Does not support namespaces, selectors or eventData
+ * - [`children()`](http://api.jquery.com/children/) - Does not support selectors
+ * - [`clone()`](http://api.jquery.com/clone/)
+ * - [`contents()`](http://api.jquery.com/contents/)
+ * - [`css()`](http://api.jquery.com/css/) - Only retrieves inline-styles, does not call `getComputedStyle()`.
+ *   As a setter, does not convert numbers to strings or append 'px', and also does not have automatic property prefixing.
+ * - [`data()`](http://api.jquery.com/data/)
+ * - [`detach()`](http://api.jquery.com/detach/)
+ * - [`empty()`](http://api.jquery.com/empty/)
+ * - [`eq()`](http://api.jquery.com/eq/)
+ * - [`find()`](http://api.jquery.com/find/) - Limited to lookups by tag name
+ * - [`hasClass()`](http://api.jquery.com/hasClass/)
+ * - [`html()`](http://api.jquery.com/html/)
+ * - [`next()`](http://api.jquery.com/next/) - Does not support selectors
+ * - [`on()`](http://api.jquery.com/on/) - Does not support namespaces, selectors or eventData
+ * - [`off()`](http://api.jquery.com/off/) - Does not support namespaces, selectors or event object as parameter
+ * - [`one()`](http://api.jquery.com/one/) - Does not support namespaces or selectors
+ * - [`parent()`](http://api.jquery.com/parent/) - Does not support selectors
+ * - [`prepend()`](http://api.jquery.com/prepend/)
+ * - [`prop()`](http://api.jquery.com/prop/)
+ * - [`ready()`](http://api.jquery.com/ready/)
+ * - [`remove()`](http://api.jquery.com/remove/)
+ * - [`removeAttr()`](http://api.jquery.com/removeAttr/)
+ * - [`removeClass()`](http://api.jquery.com/removeClass/)
+ * - [`removeData()`](http://api.jquery.com/removeData/)
+ * - [`replaceWith()`](http://api.jquery.com/replaceWith/)
+ * - [`text()`](http://api.jquery.com/text/)
+ * - [`toggleClass()`](http://api.jquery.com/toggleClass/)
+ * - [`triggerHandler()`](http://api.jquery.com/triggerHandler/) - Passes a dummy event object to handlers.
+ * - [`unbind()`](http://api.jquery.com/unbind/) - Does not support namespaces or event object as parameter
+ * - [`val()`](http://api.jquery.com/val/)
+ * - [`wrap()`](http://api.jquery.com/wrap/)
+ *
+ * ## jQuery/jqLite Extras
+ * Angular also provides the following additional methods and events to both jQuery and jqLite:
+ *
+ * ### Events
+ * - `$destroy` - AngularJS intercepts all jqLite/jQuery's DOM destruction apis and fires this event
+ *    on all DOM nodes being removed.  This can be used to clean up any 3rd party bindings to the DOM
+ *    element before it is removed.
+ *
+ * ### Methods
+ * - `controller(name)` - retrieves the controller of the current element or its parent. By default
+ *   retrieves controller associated with the `ngController` directive. If `name` is provided as
+ *   camelCase directive name, then the controller for this directive will be retrieved (e.g.
+ *   `'ngModel'`).
+ * - `injector()` - retrieves the injector of the current element or its parent.
+ * - `scope()` - retrieves the {@link ng.$rootScope.Scope scope} of the current
+ *   element or its parent. Requires {@link guide/production#disabling-debug-data Debug Data} to
+ *   be enabled.
+ * - `isolateScope()` - retrieves an isolate {@link ng.$rootScope.Scope scope} if one is attached directly to the
+ *   current element. This getter should be used only on elements that contain a directive which starts a new isolate
+ *   scope. Calling `scope()` on this element always returns the original non-isolate scope.
+ *   Requires {@link guide/production#disabling-debug-data Debug Data} to be enabled.
+ * - `inheritedData()` - same as `data()`, but walks up the DOM until a value is found or the top
+ *   parent element is reached.
+ *
+ * @param {string|DOMElement} element HTML string or DOMElement to be wrapped into jQuery.
+ * @returns {Object} jQuery object.
+ */
+
+JQLite.expando = 'ng339';
+
+var jqCache = JQLite.cache = {},
+    jqId = 1,
+    addEventListenerFn = function(element, type, fn) {
+      element.addEventListener(type, fn, false);
+    },
+    removeEventListenerFn = function(element, type, fn) {
+      element.removeEventListener(type, fn, false);
+    };
+
+/*
+ * !!! This is an undocumented "private" function !!!
+ */
+JQLite._data = function(node) {
+  //jQuery always returns an object on cache miss
+  return this.cache[node[this.expando]] || {};
+};
+
+function jqNextId() { return ++jqId; }
+
+
+var SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g;
+var MOZ_HACK_REGEXP = /^moz([A-Z])/;
+var MOUSE_EVENT_MAP= { mouseleave: "mouseout", mouseenter: "mouseover"};
+var jqLiteMinErr = minErr('jqLite');
+
+/**
+ * Converts snake_case to camelCase.
+ * Also there is special case for Moz prefix starting with upper case letter.
+ * @param name Name to normalize
+ */
+function camelCase(name) {
+  return name.
+    replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) {
+      return offset ? letter.toUpperCase() : letter;
+    }).
+    replace(MOZ_HACK_REGEXP, 'Moz$1');
+}
+
+var SINGLE_TAG_REGEXP = /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/;
+var HTML_REGEXP = /<|&#?\w+;/;
+var TAG_NAME_REGEXP = /<([\w:-]+)/;
+var XHTML_TAG_REGEXP = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi;
+
+var wrapMap = {
+  'option': [1, '<select multiple="multiple">', '</select>'],
+
+  'thead': [1, '<table>', '</table>'],
+  'col': [2, '<table><colgroup>', '</colgroup></table>'],
+  'tr': [2, '<table><tbody>', '</tbody></table>'],
+  'td': [3, '<table><tbody><tr>', '</tr></tbody></table>'],
+  '_default': [0, "", ""]
+};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+
+function jqLiteIsTextNode(html) {
+  return !HTML_REGEXP.test(html);
+}
+
+function jqLiteAcceptsData(node) {
+  // The window object can accept data but has no nodeType
+  // Otherwise we are only interested in elements (1) and documents (9)
+  var nodeType = node.nodeType;
+  return nodeType === NODE_TYPE_ELEMENT || !nodeType || nodeType === NODE_TYPE_DOCUMENT;
+}
+
+function jqLiteHasData(node) {
+  for (var key in jqCache[node.ng339]) {
+    return true;
+  }
+  return false;
+}
+
+function jqLiteBuildFragment(html, context) {
+  var tmp, tag, wrap,
+      fragment = context.createDocumentFragment(),
+      nodes = [], i;
+
+  if (jqLiteIsTextNode(html)) {
+    // Convert non-html into a text node
+    nodes.push(context.createTextNode(html));
+  } else {
+    // Convert html into DOM nodes
+    tmp = tmp || fragment.appendChild(context.createElement("div"));
+    tag = (TAG_NAME_REGEXP.exec(html) || ["", ""])[1].toLowerCase();
+    wrap = wrapMap[tag] || wrapMap._default;
+    tmp.innerHTML = wrap[1] + html.replace(XHTML_TAG_REGEXP, "<$1></$2>") + wrap[2];
+
+    // Descend through wrappers to the right content
+    i = wrap[0];
+    while (i--) {
+      tmp = tmp.lastChild;
+    }
+
+    nodes = concat(nodes, tmp.childNodes);
+
+    tmp = fragment.firstChild;
+    tmp.textContent = "";
+  }
+
+  // Remove wrapper from fragment
+  fragment.textContent = "";
+  fragment.innerHTML = ""; // Clear inner HTML
+  forEach(nodes, function(node) {
+    fragment.appendChild(node);
+  });
+
+  return fragment;
+}
+
+function jqLiteParseHTML(html, context) {
+  context = context || document;
+  var parsed;
+
+  if ((parsed = SINGLE_TAG_REGEXP.exec(html))) {
+    return [context.createElement(parsed[1])];
+  }
+
+  if ((parsed = jqLiteBuildFragment(html, context))) {
+    return parsed.childNodes;
+  }
+
+  return [];
+}
+
+
+// IE9-11 has no method "contains" in SVG element and in Node.prototype. Bug #10259.
+var jqLiteContains = Node.prototype.contains || function(arg) {
+  // jshint bitwise: false
+  return !!(this.compareDocumentPosition(arg) & 16);
+  // jshint bitwise: true
+};
+
+/////////////////////////////////////////////
+function JQLite(element) {
+  if (element instanceof JQLite) {
+    return element;
+  }
+
+  var argIsString;
+
+  if (isString(element)) {
+    element = trim(element);
+    argIsString = true;
+  }
+  if (!(this instanceof JQLite)) {
+    if (argIsString && element.charAt(0) != '<') {
+      throw jqLiteMinErr('nosel', 'Looking up elements via selectors is not supported by jqLite! See: http://docs.angularjs.org/api/angular.element');
+    }
+    return new JQLite(element);
+  }
+
+  if (argIsString) {
+    jqLiteAddNodes(this, jqLiteParseHTML(element));
+  } else {
+    jqLiteAddNodes(this, element);
+  }
+}
+
+function jqLiteClone(element) {
+  return element.cloneNode(true);
+}
+
+function jqLiteDealoc(element, onlyDescendants) {
+  if (!onlyDescendants) jqLiteRemoveData(element);
+
+  if (element.querySelectorAll) {
+    var descendants = element.querySelectorAll('*');
+    for (var i = 0, l = descendants.length; i < l; i++) {
+      jqLiteRemoveData(descendants[i]);
+    }
+  }
+}
+
+function jqLiteOff(element, type, fn, unsupported) {
+  if (isDefined(unsupported)) throw jqLiteMinErr('offargs', 'jqLite#off() does not support the `selector` argument');
+
+  var expandoStore = jqLiteExpandoStore(element);
+  var events = expandoStore && expandoStore.events;
+  var handle = expandoStore && expandoStore.handle;
+
+  if (!handle) return; //no listeners registered
+
+  if (!type) {
+    for (type in events) {
+      if (type !== '$destroy') {
+        removeEventListenerFn(element, type, handle);
+      }
+      delete events[type];
+    }
+  } else {
+
+    var removeHandler = function(type) {
+      var listenerFns = events[type];
+      if (isDefined(fn)) {
+        arrayRemove(listenerFns || [], fn);
+      }
+      if (!(isDefined(fn) && listenerFns && listenerFns.length > 0)) {
+        removeEventListenerFn(element, type, handle);
+        delete events[type];
+      }
+    };
+
+    forEach(type.split(' '), function(type) {
+      removeHandler(type);
+      if (MOUSE_EVENT_MAP[type]) {
+        removeHandler(MOUSE_EVENT_MAP[type]);
+      }
+    });
+  }
+}
+
+function jqLiteRemoveData(element, name) {
+  var expandoId = element.ng339;
+  var expandoStore = expandoId && jqCache[expandoId];
+
+  if (expandoStore) {
+    if (name) {
+      delete expandoStore.data[name];
+      return;
+    }
+
+    if (expandoStore.handle) {
+      if (expandoStore.events.$destroy) {
+        expandoStore.handle({}, '$destroy');
+      }
+      jqLiteOff(element);
+    }
+    delete jqCache[expandoId];
+    element.ng339 = undefined; // don't delete DOM expandos. IE and Chrome don't like it
+  }
+}
+
+
+function jqLiteExpandoStore(element, createIfNecessary) {
+  var expandoId = element.ng339,
+      expandoStore = expandoId && jqCache[expandoId];
+
+  if (createIfNecessary && !expandoStore) {
+    element.ng339 = expandoId = jqNextId();
+    expandoStore = jqCache[expandoId] = {events: {}, data: {}, handle: undefined};
+  }
+
+  return expandoStore;
+}
+
+
+function jqLiteData(element, key, value) {
+  if (jqLiteAcceptsData(element)) {
+
+    var isSimpleSetter = isDefined(value);
+    var isSimpleGetter = !isSimpleSetter && key && !isObject(key);
+    var massGetter = !key;
+    var expandoStore = jqLiteExpandoStore(element, !isSimpleGetter);
+    var data = expandoStore && expandoStore.data;
+
+    if (isSimpleSetter) { // data('key', value)
+      data[key] = value;
+    } else {
+      if (massGetter) {  // data()
+        return data;
+      } else {
+        if (isSimpleGetter) { // data('key')
+          // don't force creation of expandoStore if it doesn't exist yet
+          return data && data[key];
+        } else { // mass-setter: data({key1: val1, key2: val2})
+          extend(data, key);
+        }
+      }
+    }
+  }
+}
+
+function jqLiteHasClass(element, selector) {
+  if (!element.getAttribute) return false;
+  return ((" " + (element.getAttribute('class') || '') + " ").replace(/[\n\t]/g, " ").
+      indexOf(" " + selector + " ") > -1);
+}
+
+function jqLiteRemoveClass(element, cssClasses) {
+  if (cssClasses && element.setAttribute) {
+    forEach(cssClasses.split(' '), function(cssClass) {
+      element.setAttribute('class', trim(
+          (" " + (element.getAttribute('class') || '') + " ")
+          .replace(/[\n\t]/g, " ")
+          .replace(" " + trim(cssClass) + " ", " "))
+      );
+    });
+  }
+}
+
+function jqLiteAddClass(element, cssClasses) {
+  if (cssClasses && element.setAttribute) {
+    var existingClasses = (' ' + (element.getAttribute('class') || '') + ' ')
+                            .replace(/[\n\t]/g, " ");
+
+    forEach(cssClasses.split(' '), function(cssClass) {
+      cssClass = trim(cssClass);
+      if (existingClasses.indexOf(' ' + cssClass + ' ') === -1) {
+        existingClasses += cssClass + ' ';
+      }
+    });
+
+    element.setAttribute('class', trim(existingClasses));
+  }
+}
+
+
+function jqLiteAddNodes(root, elements) {
+  // THIS CODE IS VERY HOT. Don't make changes without benchmarking.
+
+  if (elements) {
+
+    // if a Node (the most common case)
+    if (elements.nodeType) {
+      root[root.length++] = elements;
+    } else {
+      var length = elements.length;
+
+      // if an Array or NodeList and not a Window
+      if (typeof length === 'number' && elements.window !== elements) {
+        if (length) {
+          for (var i = 0; i < length; i++) {
+            root[root.length++] = elements[i];
+          }
+        }
+      } else {
+        root[root.length++] = elements;
+      }
+    }
+  }
+}
+
+
+function jqLiteController(element, name) {
+  return jqLiteInheritedData(element, '$' + (name || 'ngController') + 'Controller');
+}
+
+function jqLiteInheritedData(element, name, value) {
+  // if element is the document object work with the html element instead
+  // this makes $(document).scope() possible
+  if (element.nodeType == NODE_TYPE_DOCUMENT) {
+    element = element.documentElement;
+  }
+  var names = isArray(name) ? name : [name];
+
+  while (element) {
+    for (var i = 0, ii = names.length; i < ii; i++) {
+      if (isDefined(value = jqLite.data(element, names[i]))) return value;
+    }
+
+    // If dealing with a document fragment node with a host element, and no parent, use the host
+    // element as the parent. This enables directives within a Shadow DOM or polyfilled Shadow DOM
+    // to lookup parent controllers.
+    element = element.parentNode || (element.nodeType === NODE_TYPE_DOCUMENT_FRAGMENT && element.host);
+  }
+}
+
+function jqLiteEmpty(element) {
+  jqLiteDealoc(element, true);
+  while (element.firstChild) {
+    element.removeChild(element.firstChild);
+  }
+}
+
+function jqLiteRemove(element, keepData) {
+  if (!keepData) jqLiteDealoc(element);
+  var parent = element.parentNode;
+  if (parent) parent.removeChild(element);
+}
+
+
+function jqLiteDocumentLoaded(action, win) {
+  win = win || window;
+  if (win.document.readyState === 'complete') {
+    // Force the action to be run async for consistent behaviour
+    // from the action's point of view
+    // i.e. it will definitely not be in a $apply
+    win.setTimeout(action);
+  } else {
+    // No need to unbind this handler as load is only ever called once
+    jqLite(win).on('load', action);
+  }
+}
+
+//////////////////////////////////////////
+// Functions which are declared directly.
+//////////////////////////////////////////
+var JQLitePrototype = JQLite.prototype = {
+  ready: function(fn) {
+    var fired = false;
+
+    function trigger() {
+      if (fired) return;
+      fired = true;
+      fn();
+    }
+
+    // check if document is already loaded
+    if (document.readyState === 'complete') {
+      setTimeout(trigger);
+    } else {
+      this.on('DOMContentLoaded', trigger); // works for modern browsers and IE9
+      // we can not use jqLite since we are not done loading and jQuery could be loaded later.
+      // jshint -W064
+      JQLite(window).on('load', trigger); // fallback to window.onload for others
+      // jshint +W064
+    }
+  },
+  toString: function() {
+    var value = [];
+    forEach(this, function(e) { value.push('' + e);});
+    return '[' + value.join(', ') + ']';
+  },
+
+  eq: function(index) {
+      return (index >= 0) ? jqLite(this[index]) : jqLite(this[this.length + index]);
+  },
+
+  length: 0,
+  push: push,
+  sort: [].sort,
+  splice: [].splice
+};
+
+//////////////////////////////////////////
+// Functions iterating getter/setters.
+// these functions return self on setter and
+// value on get.
+//////////////////////////////////////////
+var BOOLEAN_ATTR = {};
+forEach('multiple,selected,checked,disabled,readOnly,required,open'.split(','), function(value) {
+  BOOLEAN_ATTR[lowercase(value)] = value;
+});
+var BOOLEAN_ELEMENTS = {};
+forEach('input,select,option,textarea,button,form,details'.split(','), function(value) {
+  BOOLEAN_ELEMENTS[value] = true;
+});
+var ALIASED_ATTR = {
+  'ngMinlength': 'minlength',
+  'ngMaxlength': 'maxlength',
+  'ngMin': 'min',
+  'ngMax': 'max',
+  'ngPattern': 'pattern'
+};
+
+function getBooleanAttrName(element, name) {
+  // check dom last since we will most likely fail on name
+  var booleanAttr = BOOLEAN_ATTR[name.toLowerCase()];
+
+  // booleanAttr is here twice to minimize DOM access
+  return booleanAttr && BOOLEAN_ELEMENTS[nodeName_(element)] && booleanAttr;
+}
+
+function getAliasedAttrName(name) {
+  return ALIASED_ATTR[name];
+}
+
+forEach({
+  data: jqLiteData,
+  removeData: jqLiteRemoveData,
+  hasData: jqLiteHasData
+}, function(fn, name) {
+  JQLite[name] = fn;
+});
+
+forEach({
+  data: jqLiteData,
+  inheritedData: jqLiteInheritedData,
+
+  scope: function(element) {
+    // Can't use jqLiteData here directly so we stay compatible with jQuery!
+    return jqLite.data(element, '$scope') || jqLiteInheritedData(element.parentNode || element, ['$isolateScope', '$scope']);
+  },
+
+  isolateScope: function(element) {
+    // Can't use jqLiteData here directly so we stay compatible with jQuery!
+    return jqLite.data(element, '$isolateScope') || jqLite.data(element, '$isolateScopeNoTemplate');
+  },
+
+  controller: jqLiteController,
+
+  injector: function(element) {
+    return jqLiteInheritedData(element, '$injector');
+  },
+
+  removeAttr: function(element, name) {
+    element.removeAttribute(name);
+  },
+
+  hasClass: jqLiteHasClass,
+
+  css: function(element, name, value) {
+    name = camelCase(name);
+
+    if (isDefined(value)) {
+      element.style[name] = value;
+    } else {
+      return element.style[name];
+    }
+  },
+
+  attr: function(element, name, value) {
+    var nodeType = element.nodeType;
+    if (nodeType === NODE_TYPE_TEXT || nodeType === NODE_TYPE_ATTRIBUTE || nodeType === NODE_TYPE_COMMENT) {
+      return;
+    }
+    var lowercasedName = lowercase(name);
+    if (BOOLEAN_ATTR[lowercasedName]) {
+      if (isDefined(value)) {
+        if (!!value) {
+          element[name] = true;
+          element.setAttribute(name, lowercasedName);
+        } else {
+          element[name] = false;
+          element.removeAttribute(lowercasedName);
+        }
+      } else {
+        return (element[name] ||
+                 (element.attributes.getNamedItem(name) || noop).specified)
+               ? lowercasedName
+               : undefined;
+      }
+    } else if (isDefined(value)) {
+      element.setAttribute(name, value);
+    } else if (element.getAttribute) {
+      // the extra argument "2" is to get the right thing for a.href in IE, see jQuery code
+      // some elements (e.g. Document) don't have get attribute, so return undefined
+      var ret = element.getAttribute(name, 2);
+      // normalize non-existing attributes to undefined (as jQuery)
+      return ret === null ? undefined : ret;
+    }
+  },
+
+  prop: function(element, name, value) {
+    if (isDefined(value)) {
+      element[name] = value;
+    } else {
+      return element[name];
+    }
+  },
+
+  text: (function() {
+    getText.$dv = '';
+    return getText;
+
+    function getText(element, value) {
+      if (isUndefined(value)) {
+        var nodeType = element.nodeType;
+        return (nodeType === NODE_TYPE_ELEMENT || nodeType === NODE_TYPE_TEXT) ? element.textContent : '';
+      }
+      element.textContent = value;
+    }
+  })(),
+
+  val: function(element, value) {
+    if (isUndefined(value)) {
+      if (element.multiple && nodeName_(element) === 'select') {
+        var result = [];
+        forEach(element.options, function(option) {
+          if (option.selected) {
+            result.push(option.value || option.text);
+          }
+        });
+        return result.length === 0 ? null : result;
+      }
+      return element.value;
+    }
+    element.value = value;
+  },
+
+  html: function(element, value) {
+    if (isUndefined(value)) {
+      return element.innerHTML;
+    }
+    jqLiteDealoc(element, true);
+    element.innerHTML = value;
+  },
+
+  empty: jqLiteEmpty
+}, function(fn, name) {
+  /**
+   * Properties: writes return selection, reads return first value
+   */
+  JQLite.prototype[name] = function(arg1, arg2) {
+    var i, key;
+    var nodeCount = this.length;
+
+    // jqLiteHasClass has only two arguments, but is a getter-only fn, so we need to special-case it
+    // in a way that survives minification.
+    // jqLiteEmpty takes no arguments but is a setter.
+    if (fn !== jqLiteEmpty &&
+        (isUndefined((fn.length == 2 && (fn !== jqLiteHasClass && fn !== jqLiteController)) ? arg1 : arg2))) {
+      if (isObject(arg1)) {
+
+        // we are a write, but the object properties are the key/values
+        for (i = 0; i < nodeCount; i++) {
+          if (fn === jqLiteData) {
+            // data() takes the whole object in jQuery
+            fn(this[i], arg1);
+          } else {
+            for (key in arg1) {
+              fn(this[i], key, arg1[key]);
+            }
+          }
+        }
+        // return self for chaining
+        return this;
+      } else {
+        // we are a read, so read the first child.
+        // TODO: do we still need this?
+        var value = fn.$dv;
+        // Only if we have $dv do we iterate over all, otherwise it is just the first element.
+        var jj = (isUndefined(value)) ? Math.min(nodeCount, 1) : nodeCount;
+        for (var j = 0; j < jj; j++) {
+          var nodeValue = fn(this[j], arg1, arg2);
+          value = value ? value + nodeValue : nodeValue;
+        }
+        return value;
+      }
+    } else {
+      // we are a write, so apply to all children
+      for (i = 0; i < nodeCount; i++) {
+        fn(this[i], arg1, arg2);
+      }
+      // return self for chaining
+      return this;
+    }
+  };
+});
+
+function createEventHandler(element, events) {
+  var eventHandler = function(event, type) {
+    // jQuery specific api
+    event.isDefaultPrevented = function() {
+      return event.defaultPrevented;
+    };
+
+    var eventFns = events[type || event.type];
+    var eventFnsLength = eventFns ? eventFns.length : 0;
+
+    if (!eventFnsLength) return;
+
+    if (isUndefined(event.immediatePropagationStopped)) {
+      var originalStopImmediatePropagation = event.stopImmediatePropagation;
+      event.stopImmediatePropagation = function() {
+        event.immediatePropagationStopped = true;
+
+        if (event.stopPropagation) {
+          event.stopPropagation();
+        }
+
+        if (originalStopImmediatePropagation) {
+          originalStopImmediatePropagation.call(event);
+        }
+      };
+    }
+
+    event.isImmediatePropagationStopped = function() {
+      return event.immediatePropagationStopped === true;
+    };
+
+    // Some events have special handlers that wrap the real handler
+    var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper;
+
+    // Copy event handlers in case event handlers array is modified during execution.
+    if ((eventFnsLength > 1)) {
+      eventFns = shallowCopy(eventFns);
+    }
+
+    for (var i = 0; i < eventFnsLength; i++) {
+      if (!event.isImmediatePropagationStopped()) {
+        handlerWrapper(element, event, eventFns[i]);
+      }
+    }
+  };
+
+  // TODO: this is a hack for angularMocks/clearDataCache that makes it possible to deregister all
+  //       events on `element`
+  eventHandler.elem = element;
+  return eventHandler;
+}
+
+function defaultHandlerWrapper(element, event, handler) {
+  handler.call(element, event);
+}
+
+function specialMouseHandlerWrapper(target, event, handler) {
+  // Refer to jQuery's implementation of mouseenter & mouseleave
+  // Read about mouseenter and mouseleave:
+  // http://www.quirksmode.org/js/events_mouse.html#link8
+  var related = event.relatedTarget;
+  // For mousenter/leave call the handler if related is outside the target.
+  // NB: No relatedTarget if the mouse left/entered the browser window
+  if (!related || (related !== target && !jqLiteContains.call(target, related))) {
+    handler.call(target, event);
+  }
+}
+
+//////////////////////////////////////////
+// Functions iterating traversal.
+// These functions chain results into a single
+// selector.
+//////////////////////////////////////////
+forEach({
+  removeData: jqLiteRemoveData,
+
+  on: function jqLiteOn(element, type, fn, unsupported) {
+    if (isDefined(unsupported)) throw jqLiteMinErr('onargs', 'jqLite#on() does not support the `selector` or `eventData` parameters');
+
+    // Do not add event handlers to non-elements because they will not be cleaned up.
+    if (!jqLiteAcceptsData(element)) {
+      return;
+    }
+
+    var expandoStore = jqLiteExpandoStore(element, true);
+    var events = expandoStore.events;
+    var handle = expandoStore.handle;
+
+    if (!handle) {
+      handle = expandoStore.handle = createEventHandler(element, events);
+    }
+
+    // http://jsperf.com/string-indexof-vs-split
+    var types = type.indexOf(' ') >= 0 ? type.split(' ') : [type];
+    var i = types.length;
+
+    var addHandler = function(type, specialHandlerWrapper, noEventListener) {
+      var eventFns = events[type];
+
+      if (!eventFns) {
+        eventFns = events[type] = [];
+        eventFns.specialHandlerWrapper = specialHandlerWrapper;
+        if (type !== '$destroy' && !noEventListener) {
+          addEventListenerFn(element, type, handle);
+        }
+      }
+
+      eventFns.push(fn);
+    };
+
+    while (i--) {
+      type = types[i];
+      if (MOUSE_EVENT_MAP[type]) {
+        addHandler(MOUSE_EVENT_MAP[type], specialMouseHandlerWrapper);
+        addHandler(type, undefined, true);
+      } else {
+        addHandler(type);
+      }
+    }
+  },
+
+  off: jqLiteOff,
+
+  one: function(element, type, fn) {
+    element = jqLite(element);
+
+    //add the listener twice so that when it is called
+    //you can remove the original function and still be
+    //able to call element.off(ev, fn) normally
+    element.on(type, function onFn() {
+      element.off(type, fn);
+      element.off(type, onFn);
+    });
+    element.on(type, fn);
+  },
+
+  replaceWith: function(element, replaceNode) {
+    var index, parent = element.parentNode;
+    jqLiteDealoc(element);
+    forEach(new JQLite(replaceNode), function(node) {
+      if (index) {
+        parent.insertBefore(node, index.nextSibling);
+      } else {
+        parent.replaceChild(node, element);
+      }
+      index = node;
+    });
+  },
+
+  children: function(element) {
+    var children = [];
+    forEach(element.childNodes, function(element) {
+      if (element.nodeType === NODE_TYPE_ELEMENT) {
+        children.push(element);
+      }
+    });
+    return children;
+  },
+
+  contents: function(element) {
+    return element.contentDocument || element.childNodes || [];
+  },
+
+  append: function(element, node) {
+    var nodeType = element.nodeType;
+    if (nodeType !== NODE_TYPE_ELEMENT && nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT) return;
+
+    node = new JQLite(node);
+
+    for (var i = 0, ii = node.length; i < ii; i++) {
+      var child = node[i];
+      element.appendChild(child);
+    }
+  },
+
+  prepend: function(element, node) {
+    if (element.nodeType === NODE_TYPE_ELEMENT) {
+      var index = element.firstChild;
+      forEach(new JQLite(node), function(child) {
+        element.insertBefore(child, index);
+      });
+    }
+  },
+
+  wrap: function(element, wrapNode) {
+    wrapNode = jqLite(wrapNode).eq(0).clone()[0];
+    var parent = element.parentNode;
+    if (parent) {
+      parent.replaceChild(wrapNode, element);
+    }
+    wrapNode.appendChild(element);
+  },
+
+  remove: jqLiteRemove,
+
+  detach: function(element) {
+    jqLiteRemove(element, true);
+  },
+
+  after: function(element, newElement) {
+    var index = element, parent = element.parentNode;
+    newElement = new JQLite(newElement);
+
+    for (var i = 0, ii = newElement.length; i < ii; i++) {
+      var node = newElement[i];
+      parent.insertBefore(node, index.nextSibling);
+      index = node;
+    }
+  },
+
+  addClass: jqLiteAddClass,
+  removeClass: jqLiteRemoveClass,
+
+  toggleClass: function(element, selector, condition) {
+    if (selector) {
+      forEach(selector.split(' '), function(className) {
+        var classCondition = condition;
+        if (isUndefined(classCondition)) {
+          classCondition = !jqLiteHasClass(element, className);
+        }
+        (classCondition ? jqLiteAddClass : jqLiteRemoveClass)(element, className);
+      });
+    }
+  },
+
+  parent: function(element) {
+    var parent = element.parentNode;
+    return parent && parent.nodeType !== NODE_TYPE_DOCUMENT_FRAGMENT ? parent : null;
+  },
+
+  next: function(element) {
+    return element.nextElementSibling;
+  },
+
+  find: function(element, selector) {
+    if (element.getElementsByTagName) {
+      return element.getElementsByTagName(selector);
+    } else {
+      return [];
+    }
+  },
+
+  clone: jqLiteClone,
+
+  triggerHandler: function(element, event, extraParameters) {
+
+    var dummyEvent, eventFnsCopy, handlerArgs;
+    var eventName = event.type || event;
+    var expandoStore = jqLiteExpandoStore(element);
+    var events = expandoStore && expandoStore.events;
+    var eventFns = events && events[eventName];
+
+    if (eventFns) {
+      // Create a dummy event to pass to the handlers
+      dummyEvent = {
+        preventDefault: function() { this.defaultPrevented = true; },
+        isDefaultPrevented: function() { return this.defaultPrevented === true; },
+        stopImmediatePropagation: function() { this.immediatePropagationStopped = true; },
+        isImmediatePropagationStopped: function() { return this.immediatePropagationStopped === true; },
+        stopPropagation: noop,
+        type: eventName,
+        target: element
+      };
+
+      // If a custom event was provided then extend our dummy event with it
+      if (event.type) {
+        dummyEvent = extend(dummyEvent, event);
+      }
+
+      // Copy event handlers in case event handlers array is modified during execution.
+      eventFnsCopy = shallowCopy(eventFns);
+      handlerArgs = extraParameters ? [dummyEvent].concat(extraParameters) : [dummyEvent];
+
+      forEach(eventFnsCopy, function(fn) {
+        if (!dummyEvent.isImmediatePropagationStopped()) {
+          fn.apply(element, handlerArgs);
+        }
+      });
+    }
+  }
+}, function(fn, name) {
+  /**
+   * chaining functions
+   */
+  JQLite.prototype[name] = function(arg1, arg2, arg3) {
+    var value;
+
+    for (var i = 0, ii = this.length; i < ii; i++) {
+      if (isUndefined(value)) {
+        value = fn(this[i], arg1, arg2, arg3);
+        if (isDefined(value)) {
+          // any function which returns a value needs to be wrapped
+          value = jqLite(value);
+        }
+      } else {
+        jqLiteAddNodes(value, fn(this[i], arg1, arg2, arg3));
+      }
+    }
+    return isDefined(value) ? value : this;
+  };
+
+  // bind legacy bind/unbind to on/off
+  JQLite.prototype.bind = JQLite.prototype.on;
+  JQLite.prototype.unbind = JQLite.prototype.off;
+});
+
+
+// Provider for private $$jqLite service
+function $$jqLiteProvider() {
+  this.$get = function $$jqLite() {
+    return extend(JQLite, {
+      hasClass: function(node, classes) {
+        if (node.attr) node = node[0];
+        return jqLiteHasClass(node, classes);
+      },
+      addClass: function(node, classes) {
+        if (node.attr) node = node[0];
+        return jqLiteAddClass(node, classes);
+      },
+      removeClass: function(node, classes) {
+        if (node.attr) node = node[0];
+        return jqLiteRemoveClass(node, classes);
+      }
+    });
+  };
+}
+
+/**
+ * Computes a hash of an 'obj'.
+ * Hash of a:
+ *  string is string
+ *  number is number as string
+ *  object is either result of calling $$hashKey function on the object or uniquely generated id,
+ *         that is also assigned to the $$hashKey property of the object.
+ *
+ * @param obj
+ * @returns {string} hash string such that the same input will have the same hash string.
+ *         The resulting string key is in 'type:hashKey' format.
+ */
+function hashKey(obj, nextUidFn) {
+  var key = obj && obj.$$hashKey;
+
+  if (key) {
+    if (typeof key === 'function') {
+      key = obj.$$hashKey();
+    }
+    return key;
+  }
+
+  var objType = typeof obj;
+  if (objType == 'function' || (objType == 'object' && obj !== null)) {
+    key = obj.$$hashKey = objType + ':' + (nextUidFn || nextUid)();
+  } else {
+    key = objType + ':' + obj;
+  }
+
+  return key;
+}
+
+/**
+ * HashMap which can use objects as keys
+ */
+function HashMap(array, isolatedUid) {
+  if (isolatedUid) {
+    var uid = 0;
+    this.nextUid = function() {
+      return ++uid;
+    };
+  }
+  forEach(array, this.put, this);
+}
+HashMap.prototype = {
+  /**
+   * Store key value pair
+   * @param key key to store can be any type
+   * @param value value to store can be any type
+   */
+  put: function(key, value) {
+    this[hashKey(key, this.nextUid)] = value;
+  },
+
+  /**
+   * @param key
+   * @returns {Object} the value for the key
+   */
+  get: function(key) {
+    return this[hashKey(key, this.nextUid)];
+  },
+
+  /**
+   * Remove the key/value pair
+   * @param key
+   */
+  remove: function(key) {
+    var value = this[key = hashKey(key, this.nextUid)];
+    delete this[key];
+    return value;
+  }
+};
+
+var $$HashMapProvider = [function() {
+  this.$get = [function() {
+    return HashMap;
+  }];
+}];
+
+/**
+ * @ngdoc function
+ * @module ng
+ * @name angular.injector
+ * @kind function
+ *
+ * @description
+ * Creates an injector object that can be used for retrieving services as well as for
+ * dependency injection (see {@link guide/di dependency injection}).
+ *
+ * @param {Array.<string|Function>} modules A list of module functions or their aliases. See
+ *     {@link angular.module}. The `ng` module must be explicitly added.
+ * @param {boolean=} [strictDi=false] Whether the injector should be in strict mode, which
+ *     disallows argument name annotation inference.
+ * @returns {injector} Injector object. See {@link auto.$injector $injector}.
+ *
+ * @example
+ * Typical usage
+ * ```js
+ *   // create an injector
+ *   var $injector = angular.injector(['ng']);
+ *
+ *   // use the injector to kick off your application
+ *   // use the type inference to auto inject arguments, or use implicit injection
+ *   $injector.invoke(function($rootScope, $compile, $document) {
+ *     $compile($document)($rootScope);
+ *     $rootScope.$digest();
+ *   });
+ * ```
+ *
+ * Sometimes you want to get access to the injector of a currently running Angular app
+ * from outside Angular. Perhaps, you want to inject and compile some markup after the
+ * application has been bootstrapped. You can do this using the extra `injector()` added
+ * to JQuery/jqLite elements. See {@link angular.element}.
+ *
+ * *This is fairly rare but could be the case if a third party library is injecting the
+ * markup.*
+ *
+ * In the following example a new block of HTML containing a `ng-controller`
+ * directive is added to the end of the document body by JQuery. We then compile and link
+ * it into the current AngularJS scope.
+ *
+ * ```js
+ * var $div = $('<div ng-controller="MyCtrl">{{content.label}}</div>');
+ * $(document.body).append($div);
+ *
+ * angular.element(document).injector().invoke(function($compile) {
+ *   var scope = angular.element($div).scope();
+ *   $compile($div)(scope);
+ * });
+ * ```
+ */
+
+
+/**
+ * @ngdoc module
+ * @name auto
+ * @description
+ *
+ * Implicit module which gets automatically added to each {@link auto.$injector $injector}.
+ */
+
+var FN_ARGS = /^[^\(]*\(\s*([^\)]*)\)/m;
+var FN_ARG_SPLIT = /,/;
+var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
+var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
+var $injectorMinErr = minErr('$injector');
+
+function anonFn(fn) {
+  // For anonymous functions, showing at the very least the function signature can help in
+  // debugging.
+  var fnText = fn.toString().replace(STRIP_COMMENTS, ''),
+      args = fnText.match(FN_ARGS);
+  if (args) {
+    return 'function(' + (args[1] || '').replace(/[\s\r\n]+/, ' ') + ')';
+  }
+  return 'fn';
+}
+
+function annotate(fn, strictDi, name) {
+  var $inject,
+      fnText,
+      argDecl,
+      last;
+
+  if (typeof fn === 'function') {
+    if (!($inject = fn.$inject)) {
+      $inject = [];
+      if (fn.length) {
+        if (strictDi) {
+          if (!isString(name) || !name) {
+            name = fn.name || anonFn(fn);
+          }
+          throw $injectorMinErr('strictdi',
+            '{0} is not using explicit annotation and cannot be invoked in strict mode', name);
+        }
+        fnText = fn.toString().replace(STRIP_COMMENTS, '');
+        argDecl = fnText.match(FN_ARGS);
+        forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg) {
+          arg.replace(FN_ARG, function(all, underscore, name) {
+            $inject.push(name);
+          });
+        });
+      }
+      fn.$inject = $inject;
+    }
+  } else if (isArray(fn)) {
+    last = fn.length - 1;
+    assertArgFn(fn[last], 'fn');
+    $inject = fn.slice(0, last);
+  } else {
+    assertArgFn(fn, 'fn', true);
+  }
+  return $inject;
+}
+
+///////////////////////////////////////
+
+/**
+ * @ngdoc service
+ * @name $injector
+ *
+ * @description
+ *
+ * `$injector` is used to retrieve object instances as defined by
+ * {@link auto.$provide provider}, instantiate types, invoke methods,
+ * and load modules.
+ *
+ * The following always holds true:
+ *
+ * ```js
+ *   var $injector = angular.injector();
+ *   expect($injector.get('$injector')).toBe($injector);
+ *   expect($injector.invoke(function($injector) {
+ *     return $injector;
+ *   })).toBe($injector);
+ * ```
+ *
+ * # Injection Function Annotation
+ *
+ * JavaScript does not have annotations, and annotations are needed for dependency injection. The
+ * following are all valid ways of annotating function with injection arguments and are equivalent.
+ *
+ * ```js
+ *   // inferred (only works if code not minified/obfuscated)
+ *   $injector.invoke(function(serviceA){});
+ *
+ *   // annotated
+ *   function explicit(serviceA) {};
+ *   explicit.$inject = ['serviceA'];
+ *   $injector.invoke(explicit);
+ *
+ *   // inline
+ *   $injector.invoke(['serviceA', function(serviceA){}]);
+ * ```
+ *
+ * ## Inference
+ *
+ * In JavaScript calling `toString()` on a function returns the function definition. The definition
+ * can then be parsed and the function arguments can be extracted. This method of discovering
+ * annotations is disallowed when the injector is in strict mode.
+ * *NOTE:* This does not work with minification, and obfuscation tools since these tools change the
+ * argument names.
+ *
+ * ## `$inject` Annotation
+ * By adding an `$inject` property onto a function the injection parameters can be specified.
+ *
+ * ## Inline
+ * As an array of injection names, where the last item in the array is the function to call.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#get
+ *
+ * @description
+ * Return an instance of the service.
+ *
+ * @param {string} name The name of the instance to retrieve.
+ * @param {string=} caller An optional string to provide the origin of the function call for error messages.
+ * @return {*} The instance.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#invoke
+ *
+ * @description
+ * Invoke the method and supply the method arguments from the `$injector`.
+ *
+ * @param {Function|Array.<string|Function>} fn The injectable function to invoke. Function parameters are
+ *   injected according to the {@link guide/di $inject Annotation} rules.
+ * @param {Object=} self The `this` for the invoked method.
+ * @param {Object=} locals Optional object. If preset then any argument names are read from this
+ *                         object first, before the `$injector` is consulted.
+ * @returns {*} the value returned by the invoked `fn` function.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#has
+ *
+ * @description
+ * Allows the user to query if the particular service exists.
+ *
+ * @param {string} name Name of the service to query.
+ * @returns {boolean} `true` if injector has given service.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#instantiate
+ * @description
+ * Create a new instance of JS type. The method takes a constructor function, invokes the new
+ * operator, and supplies all of the arguments to the constructor function as specified by the
+ * constructor annotation.
+ *
+ * @param {Function} Type Annotated constructor function.
+ * @param {Object=} locals Optional object. If preset then any argument names are read from this
+ * object first, before the `$injector` is consulted.
+ * @returns {Object} new instance of `Type`.
+ */
+
+/**
+ * @ngdoc method
+ * @name $injector#annotate
+ *
+ * @description
+ * Returns an array of service names which the function is requesting for injection. This API is
+ * used by the injector to determine which services need to be injected into the function when the
+ * function is invoked. There are three ways in which the function can be annotated with the needed
+ * dependencies.
+ *
+ * # Argument names
+ *
+ * The simplest form is to extract the dependencies from the arguments of the function. This is done
+ * by converting the function into a string using `toString()` method and extracting the argument
+ * names.
+ * ```js
+ *   // Given
+ *   function MyController($scope, $route) {
+ *     // ...
+ *   }
+ *
+ *   // Then
+ *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
+ * ```
+ *
+ * You can disallow this method by using strict injection mode.
+ *
+ * This method does not work with code minification / obfuscation. For this reason the following
+ * annotation strategies are supported.
+ *
+ * # The `$inject` property
+ *
+ * If a function has an `$inject` property and its value is an array of strings, then the strings
+ * represent names of services to be injected into the function.
+ * ```js
+ *   // Given
+ *   var MyController = function(obfuscatedScope, obfuscatedRoute) {
+ *     // ...
+ *   }
+ *   // Define function dependencies
+ *   MyController['$inject'] = ['$scope', '$route'];
+ *
+ *   // Then
+ *   expect(injector.annotate(MyController)).toEqual(['$scope', '$route']);
+ * ```
+ *
+ * # The array notation
+ *
+ * It is often desirable to inline Injected functions and that's when setting the `$inject` property
+ * is very inconvenient. In these situations using the array notation to specify the dependencies in
+ * a way that survives minification is a better choice:
+ *
+ * ```js
+ *   // We wish to write this (not minification / obfuscation safe)
+ *   injector.invoke(function($compile, $rootScope) {
+ *     // ...
+ *   });
+ *
+ *   // We are forced to write break inlining
+ *   var tmpFn = function(obfuscatedCompile, obfuscatedRootScope) {
+ *     // ...
+ *   };
+ *   tmpFn.$inject = ['$compile', '$rootScope'];
+ *   injector.invoke(tmpFn);
+ *
+ *   // To better support inline function the inline annotation is supported
+ *   injector.invoke(['$compile', '$rootScope', function(obfCompile, obfRootScope) {
+ *     // ...
+ *   }]);
+ *
+ *   // Therefore
+ *   expect(injector.annotate(
+ *      ['$compile', '$rootScope', function(obfus_$compile, obfus_$rootScope) {}])
+ *    ).toEqual(['$compile', '$rootScope']);
+ * ```
+ *
+ * @param {Function|Array.<string|Function>} fn Function for which dependent service names need to
+ * be retrieved as described above.
+ *
+ * @param {boolean=} [strictDi=false] Disallow argument name annotation inference.
+ *
+ * @returns {Array.<string>} The names of the services which the function requires.
+ */
+
+
+
+
+/**
+ * @ngdoc service
+ * @name $provide
+ *
+ * @description
+ *
+ * The {@link auto.$provide $provide} service has a number of methods for registering components
+ * with the {@link auto.$injector $injector}. Many of these functions are also exposed on
+ * {@link angular.Module}.
+ *
+ * An Angular **service** is a singleton object created by a **service factory**.  These **service
+ * factories** are functions which, in turn, are created by a **service provider**.
+ * The **service providers** are constructor functions. When instantiated they must contain a
+ * property called `$get`, which holds the **service factory** function.
+ *
+ * When you request a service, the {@link auto.$injector $injector} is responsible for finding the
+ * correct **service provider**, instantiating it and then calling its `$get` **service factory**
+ * function to get the instance of the **service**.
+ *
+ * Often services have no configuration options and there is no need to add methods to the service
+ * provider.  The provider will be no more than a constructor function with a `$get` property. For
+ * these cases the {@link auto.$provide $provide} service has additional helper methods to register
+ * services without specifying a provider.
+ *
+ * * {@link auto.$provide#provider provider(provider)} - registers a **service provider** with the
+ *     {@link auto.$injector $injector}
+ * * {@link auto.$provide#constant constant(obj)} - registers a value/object that can be accessed by
+ *     providers and services.
+ * * {@link auto.$provide#value value(obj)} - registers a value/object that can only be accessed by
+ *     services, not providers.
+ * * {@link auto.$provide#factory factory(fn)} - registers a service **factory function**, `fn`,
+ *     that will be wrapped in a **service provider** object, whose `$get` property will contain the
+ *     given factory function.
+ * * {@link auto.$provide#service service(class)} - registers a **constructor function**, `class`
+ *     that will be wrapped in a **service provider** object, whose `$get` property will instantiate
+ *      a new object using the given constructor function.
+ *
+ * See the individual methods for more information and examples.
+ */
+
+/**
+ * @ngdoc method
+ * @name $provide#provider
+ * @description
+ *
+ * Register a **provider function** with the {@link auto.$injector $injector}. Provider functions
+ * are constructor functions, whose instances are responsible for "providing" a factory for a
+ * service.
+ *
+ * Service provider names start with the name of the service they provide followed by `Provider`.
+ * For example, the {@link ng.$log $log} service has a provider called
+ * {@link ng.$logProvider $logProvider}.
+ *
+ * Service provider objects can have additional methods which allow configuration of the provider
+ * and its service. Importantly, you can configure what kind of service is created by the `$get`
+ * method, or how that service will act. For example, the {@link ng.$logProvider $logProvider} has a
+ * method {@link ng.$logProvider#debugEnabled debugEnabled}
+ * which lets you specify whether the {@link ng.$log $log} service will log debug messages to the
+ * console or not.
+ *
+ * @param {string} name The name of the instance. NOTE: the provider will be available under `name +
+                        'Provider'` key.
+ * @param {(Object|function())} provider If the provider is:
+ *
+ *   - `Object`: then it should have a `$get` method. The `$get` method will be invoked using
+ *     {@link auto.$injector#invoke $injector.invoke()} when an instance needs to be created.
+ *   - `Constructor`: a new instance of the provider will be created using
+ *     {@link auto.$injector#instantiate $injector.instantiate()}, then treated as `object`.
+ *
+ * @returns {Object} registered provider instance
+
+ * @example
+ *
+ * The following example shows how to create a simple event tracking service and register it using
+ * {@link auto.$provide#provider $provide.provider()}.
+ *
+ * ```js
+ *  // Define the eventTracker provider
+ *  function EventTrackerProvider() {
+ *    var trackingUrl = '/track';
+ *
+ *    // A provider method for configuring where the tracked events should been saved
+ *    this.setTrackingUrl = function(url) {
+ *      trackingUrl = url;
+ *    };
+ *
+ *    // The service factory function
+ *    this.$get = ['$http', function($http) {
+ *      var trackedEvents = {};
+ *      return {
+ *        // Call this to track an event
+ *        event: function(event) {
+ *          var count = trackedEvents[event] || 0;
+ *          count += 1;
+ *          trackedEvents[event] = count;
+ *          return count;
+ *        },
+ *        // Call this to save the tracked events to the trackingUrl
+ *        save: function() {
+ *          $http.post(trackingUrl, trackedEvents);
+ *        }
+ *      };
+ *    }];
+ *  }
+ *
+ *  describe('eventTracker', function() {
+ *    var postSpy;
+ *
+ *    beforeEach(module(function($provide) {
+ *      // Register the eventTracker provider
+ *      $provide.provider('eventTracker', EventTrackerProvider);
+ *    }));
+ *
+ *    beforeEach(module(function(eventTrackerProvider) {
+ *      // Configure eventTracker provider
+ *      eventTrackerProvider.setTrackingUrl('/custom-track');
+ *    }));
+ *
+ *    it('tracks events', inject(function(eventTracker) {
+ *      expect(eventTracker.event('login')).toEqual(1);
+ *      expect(eventTracker.event('login')).toEqual(2);
+ *    }));
+ *
+ *    it('saves to the tracking url', inject(function(eventTracker, $http) {
+ *      postSpy = spyOn($http, 'post');
+ *      eventTracker.event('login');
+ *      eventTracker.save();
+ *      expect(postSpy).toHaveBeenCalled();
+ *      expect(postSpy.mostRecentCall.args[0]).not.toEqual('/track');
+ *      expect(postSpy.mostRecentCall.args[0]).toEqual('/custom-track');
+ *      expect(postSpy.mostRecentCall.args[1]).toEqual({ 'login': 1 });
+ *    }));
+ *  });
+ * ```
+ */
+
+/**
+ * @ngdoc method
+ * @name $provide#factory
+ * @description
+ *
+ * Register a **service factory**, which will be called to return the service instance.
+ * This is short for registering a service where its provider consists of only a `$get` property,
+ * which is the given service factory function.
+ * You should use {@link auto.$provide#factory $provide.factory(getFn)} if you do not need to
+ * configure your service in a provider.
+ *
+ * @param {string} name The name of the instance.
+ * @param {Function|Array.<string|Function>} $getFn The injectable $getFn for the instance creation.
+ *                      Internally this is a short hand for `$provide.provider(name, {$get: $getFn})`.
+ * @returns {Object} registered provider instance
+ *
+ * @example
+ * Here is an example of registering a service
+ * ```js
+ *   $provide.factory('ping', ['$http', function($http) {
+ *     return function ping() {
+ *       return $http.send('/ping');
+ *     };
+ *   }]);
+ * ```
+ * You would then inject and use this service like this:
+ * ```js
+ *   someModule.controller('Ctrl', ['ping', function(ping) {
+ *     ping();
+ *   }]);
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#service
+ * @description
+ *
+ * Register a **service constructor**, which will be invoked with `new` to create the service
+ * instance.
+ * This is short for registering a service where its provider's `$get` property is the service
+ * constructor function that will be used to instantiate the service instance.
+ *
+ * You should use {@link auto.$provide#service $provide.service(class)} if you define your service
+ * as a type/class.
+ *
+ * @param {string} name The name of the instance.
+ * @param {Function|Array.<string|Function>} constructor An injectable class (constructor function)
+ *     that will be instantiated.
+ * @returns {Object} registered provider instance
+ *
+ * @example
+ * Here is an example of registering a service using
+ * {@link auto.$provide#service $provide.service(class)}.
+ * ```js
+ *   var Ping = function($http) {
+ *     this.$http = $http;
+ *   };
+ *
+ *   Ping.$inject = ['$http'];
+ *
+ *   Ping.prototype.send = function() {
+ *     return this.$http.get('/ping');
+ *   };
+ *   $provide.service('ping', Ping);
+ * ```
+ * You would then inject and use this service like this:
+ * ```js
+ *   someModule.controller('Ctrl', ['ping', function(ping) {
+ *     ping.send();
+ *   }]);
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#value
+ * @description
+ *
+ * Register a **value service** with the {@link auto.$injector $injector}, such as a string, a
+ * number, an array, an object or a function.  This is short for registering a service where its
+ * provider's `$get` property is a factory function that takes no arguments and returns the **value
+ * service**.
+ *
+ * Value services are similar to constant services, except that they cannot be injected into a
+ * module configuration function (see {@link angular.Module#config}) but they can be overridden by
+ * an Angular
+ * {@link auto.$provide#decorator decorator}.
+ *
+ * @param {string} name The name of the instance.
+ * @param {*} value The value.
+ * @returns {Object} registered provider instance
+ *
+ * @example
+ * Here are some examples of creating value services.
+ * ```js
+ *   $provide.value('ADMIN_USER', 'admin');
+ *
+ *   $provide.value('RoleLookup', { admin: 0, writer: 1, reader: 2 });
+ *
+ *   $provide.value('halfOf', function(value) {
+ *     return value / 2;
+ *   });
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#constant
+ * @description
+ *
+ * Register a **constant service**, such as a string, a number, an array, an object or a function,
+ * with the {@link auto.$injector $injector}. Unlike {@link auto.$provide#value value} it can be
+ * injected into a module configuration function (see {@link angular.Module#config}) and it cannot
+ * be overridden by an Angular {@link auto.$provide#decorator decorator}.
+ *
+ * @param {string} name The name of the constant.
+ * @param {*} value The constant value.
+ * @returns {Object} registered instance
+ *
+ * @example
+ * Here a some examples of creating constants:
+ * ```js
+ *   $provide.constant('SHARD_HEIGHT', 306);
+ *
+ *   $provide.constant('MY_COLOURS', ['red', 'blue', 'grey']);
+ *
+ *   $provide.constant('double', function(value) {
+ *     return value * 2;
+ *   });
+ * ```
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $provide#decorator
+ * @description
+ *
+ * Register a **service decorator** with the {@link auto.$injector $injector}. A service decorator
+ * intercepts the creation of a service, allowing it to override or modify the behavior of the
+ * service. The object returned by the decorator may be the original service, or a new service
+ * object which replaces or wraps and delegates to the original service.
+ *
+ * @param {string} name The name of the service to decorate.
+ * @param {Function|Array.<string|Function>} decorator This function will be invoked when the service needs to be
+ *    instantiated and should return the decorated service instance. The function is called using
+ *    the {@link auto.$injector#invoke injector.invoke} method and is therefore fully injectable.
+ *    Local injection arguments:
+ *
+ *    * `$delegate` - The original service instance, which can be monkey patched, configured,
+ *      decorated or delegated to.
+ *
+ * @example
+ * Here we decorate the {@link ng.$log $log} service to convert warnings to errors by intercepting
+ * calls to {@link ng.$log#error $log.warn()}.
+ * ```js
+ *   $provide.decorator('$log', ['$delegate', function($delegate) {
+ *     $delegate.warn = $delegate.error;
+ *     return $delegate;
+ *   }]);
+ * ```
+ */
+
+
+function createInjector(modulesToLoad, strictDi) {
+  strictDi = (strictDi === true);
+  var INSTANTIATING = {},
+      providerSuffix = 'Provider',
+      path = [],
+      loadedModules = new HashMap([], true),
+      providerCache = {
+        $provide: {
+            provider: supportObject(provider),
+            factory: supportObject(factory),
+            service: supportObject(service),
+            value: supportObject(value),
+            constant: supportObject(constant),
+            decorator: decorator
+          }
+      },
+      providerInjector = (providerCache.$injector =
+          createInternalInjector(providerCache, function(serviceName, caller) {
+            if (angular.isString(caller)) {
+              path.push(caller);
+            }
+            throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
+          })),
+      instanceCache = {},
+      instanceInjector = (instanceCache.$injector =
+          createInternalInjector(instanceCache, function(serviceName, caller) {
+            var provider = providerInjector.get(serviceName + providerSuffix, caller);
+            return instanceInjector.invoke(provider.$get, provider, undefined, serviceName);
+          }));
+
+
+  forEach(loadModules(modulesToLoad), function(fn) { if (fn) instanceInjector.invoke(fn); });
+
+  return instanceInjector;
+
+  ////////////////////////////////////
+  // $provider
+  ////////////////////////////////////
+
+  function supportObject(delegate) {
+    return function(key, value) {
+      if (isObject(key)) {
+        forEach(key, reverseParams(delegate));
+      } else {
+        return delegate(key, value);
+      }
+    };
+  }
+
+  function provider(name, provider_) {
+    assertNotHasOwnProperty(name, 'service');
+    if (isFunction(provider_) || isArray(provider_)) {
+      provider_ = providerInjector.instantiate(provider_);
+    }
+    if (!provider_.$get) {
+      throw $injectorMinErr('pget', "Provider '{0}' must define $get factory method.", name);
+    }
+    return providerCache[name + providerSuffix] = provider_;
+  }
+
+  function enforceReturnValue(name, factory) {
+    return function enforcedReturnValue() {
+      var result = instanceInjector.invoke(factory, this);
+      if (isUndefined(result)) {
+        throw $injectorMinErr('undef', "Provider '{0}' must return a value from $get factory method.", name);
+      }
+      return result;
+    };
+  }
+
+  function factory(name, factoryFn, enforce) {
+    return provider(name, {
+      $get: enforce !== false ? enforceReturnValue(name, factoryFn) : factoryFn
+    });
+  }
+
+  function service(name, constructor) {
+    return factory(name, ['$injector', function($injector) {
+      return $injector.instantiate(constructor);
+    }]);
+  }
+
+  function value(name, val) { return factory(name, valueFn(val), false); }
+
+  function constant(name, value) {
+    assertNotHasOwnProperty(name, 'constant');
+    providerCache[name] = value;
+    instanceCache[name] = value;
+  }
+
+  function decorator(serviceName, decorFn) {
+    var origProvider = providerInjector.get(serviceName + providerSuffix),
+        orig$get = origProvider.$get;
+
+    origProvider.$get = function() {
+      var origInstance = instanceInjector.invoke(orig$get, origProvider);
+      return instanceInjector.invoke(decorFn, null, {$delegate: origInstance});
+    };
+  }
+
+  ////////////////////////////////////
+  // Module Loading
+  ////////////////////////////////////
+  function loadModules(modulesToLoad) {
+    assertArg(isUndefined(modulesToLoad) || isArray(modulesToLoad), 'modulesToLoad', 'not an array');
+    var runBlocks = [], moduleFn;
+    forEach(modulesToLoad, function(module) {
+      if (loadedModules.get(module)) return;
+      loadedModules.put(module, true);
+
+      function runInvokeQueue(queue) {
+        var i, ii;
+        for (i = 0, ii = queue.length; i < ii; i++) {
+          var invokeArgs = queue[i],
+              provider = providerInjector.get(invokeArgs[0]);
+
+          provider[invokeArgs[1]].apply(provider, invokeArgs[2]);
+        }
+      }
+
+      try {
+        if (isString(module)) {
+          moduleFn = angularModule(module);
+          runBlocks = runBlocks.concat(loadModules(moduleFn.requires)).concat(moduleFn._runBlocks);
+          runInvokeQueue(moduleFn._invokeQueue);
+          runInvokeQueue(moduleFn._configBlocks);
+        } else if (isFunction(module)) {
+            runBlocks.push(providerInjector.invoke(module));
+        } else if (isArray(module)) {
+            runBlocks.push(providerInjector.invoke(module));
+        } else {
+          assertArgFn(module, 'module');
+        }
+      } catch (e) {
+        if (isArray(module)) {
+          module = module[module.length - 1];
+        }
+        if (e.message && e.stack && e.stack.indexOf(e.message) == -1) {
+          // Safari & FF's stack traces don't contain error.message content
+          // unlike those of Chrome and IE
+          // So if stack doesn't contain message, we create a new string that contains both.
+          // Since error.stack is read-only in Safari, I'm overriding e and not e.stack here.
+          /* jshint -W022 */
+          e = e.message + '\n' + e.stack;
+        }
+        throw $injectorMinErr('modulerr', "Failed to instantiate module {0} due to:\n{1}",
+                  module, e.stack || e.message || e);
+      }
+    });
+    return runBlocks;
+  }
+
+  ////////////////////////////////////
+  // internal Injector
+  ////////////////////////////////////
+
+  function createInternalInjector(cache, factory) {
+
+    function getService(serviceName, caller) {
+      if (cache.hasOwnProperty(serviceName)) {
+        if (cache[serviceName] === INSTANTIATING) {
+          throw $injectorMinErr('cdep', 'Circular dependency found: {0}',
+                    serviceName + ' <- ' + path.join(' <- '));
+        }
+        return cache[serviceName];
+      } else {
+        try {
+          path.unshift(serviceName);
+          cache[serviceName] = INSTANTIATING;
+          return cache[serviceName] = factory(serviceName, caller);
+        } catch (err) {
+          if (cache[serviceName] === INSTANTIATING) {
+            delete cache[serviceName];
+          }
+          throw err;
+        } finally {
+          path.shift();
+        }
+      }
+    }
+
+    function invoke(fn, self, locals, serviceName) {
+      if (typeof locals === 'string') {
+        serviceName = locals;
+        locals = null;
+      }
+
+      var args = [],
+          $inject = createInjector.$$annotate(fn, strictDi, serviceName),
+          length, i,
+          key;
+
+      for (i = 0, length = $inject.length; i < length; i++) {
+        key = $inject[i];
+        if (typeof key !== 'string') {
+          throw $injectorMinErr('itkn',
+                  'Incorrect injection token! Expected service name as string, got {0}', key);
+        }
+        args.push(
+          locals && locals.hasOwnProperty(key)
+          ? locals[key]
+          : getService(key, serviceName)
+        );
+      }
+      if (isArray(fn)) {
+        fn = fn[length];
+      }
+
+      // http://jsperf.com/angularjs-invoke-apply-vs-switch
+      // #5388
+      return fn.apply(self, args);
+    }
+
+    function instantiate(Type, locals, serviceName) {
+      // Check if Type is annotated and use just the given function at n-1 as parameter
+      // e.g. someModule.factory('greeter', ['$window', function(renamed$window) {}]);
+      // Object creation: http://jsperf.com/create-constructor/2
+      var instance = Object.create((isArray(Type) ? Type[Type.length - 1] : Type).prototype || null);
+      var returnedValue = invoke(Type, instance, locals, serviceName);
+
+      return isObject(returnedValue) || isFunction(returnedValue) ? returnedValue : instance;
+    }
+
+    return {
+      invoke: invoke,
+      instantiate: instantiate,
+      get: getService,
+      annotate: createInjector.$$annotate,
+      has: function(name) {
+        return providerCache.hasOwnProperty(name + providerSuffix) || cache.hasOwnProperty(name);
+      }
+    };
+  }
+}
+
+createInjector.$$annotate = annotate;
+
+/**
+ * @ngdoc provider
+ * @name $anchorScrollProvider
+ *
+ * @description
+ * Use `$anchorScrollProvider` to disable automatic scrolling whenever
+ * {@link ng.$location#hash $location.hash()} changes.
+ */
+function $AnchorScrollProvider() {
+
+  var autoScrollingEnabled = true;
+
+  /**
+   * @ngdoc method
+   * @name $anchorScrollProvider#disableAutoScrolling
+   *
+   * @description
+   * By default, {@link ng.$anchorScroll $anchorScroll()} will automatically detect changes to
+   * {@link ng.$location#hash $location.hash()} and scroll to the element matching the new hash.<br />
+   * Use this method to disable automatic scrolling.
+   *
+   * If automatic scrolling is disabled, one must explicitly call
+   * {@link ng.$anchorScroll $anchorScroll()} in order to scroll to the element related to the
+   * current hash.
+   */
+  this.disableAutoScrolling = function() {
+    autoScrollingEnabled = false;
+  };
+
+  /**
+   * @ngdoc service
+   * @name $anchorScroll
+   * @kind function
+   * @requires $window
+   * @requires $location
+   * @requires $rootScope
+   *
+   * @description
+   * When called, it scrolls to the element related to the specified `hash` or (if omitted) to the
+   * current value of {@link ng.$location#hash $location.hash()}, according to the rules specified
+   * in the
+   * [HTML5 spec](http://www.w3.org/html/wg/drafts/html/master/browsers.html#the-indicated-part-of-the-document).
+   *
+   * It also watches the {@link ng.$location#hash $location.hash()} and automatically scrolls to
+   * match any anchor whenever it changes. This can be disabled by calling
+   * {@link ng.$anchorScrollProvider#disableAutoScrolling $anchorScrollProvider.disableAutoScrolling()}.
+   *
+   * Additionally, you can use its {@link ng.$anchorScroll#yOffset yOffset} property to specify a
+   * vertical scroll-offset (either fixed or dynamic).
+   *
+   * @param {string=} hash The hash specifying the element to scroll to. If omitted, the value of
+   *                       {@link ng.$location#hash $location.hash()} will be used.
+   *
+   * @property {(number|function|jqLite)} yOffset
+   * If set, specifies a vertical scroll-offset. This is often useful when there are fixed
+   * positioned elements at the top of the page, such as navbars, headers etc.
+   *
+   * `yOffset` can be specified in various ways:
+   * - **number**: A fixed number of pixels to be used as offset.<br /><br />
+   * - **function**: A getter function called everytime `$anchorScroll()` is executed. Must return
+   *   a number representing the offset (in pixels).<br /><br />
+   * - **jqLite**: A jqLite/jQuery element to be used for specifying the offset. The distance from
+   *   the top of the page to the element's bottom will be used as offset.<br />
+   *   **Note**: The element will be taken into account only as long as its `position` is set to
+   *   `fixed`. This option is useful, when dealing with responsive navbars/headers that adjust
+   *   their height and/or positioning according to the viewport's size.
+   *
+   * <br />
+   * <div class="alert alert-warning">
+   * In order for `yOffset` to work properly, scrolling should take place on the document's root and
+   * not some child element.
+   * </div>
+   *
+   * @example
+     <example module="anchorScrollExample">
+       <file name="index.html">
+         <div id="scrollArea" ng-controller="ScrollController">
+           <a ng-click="gotoBottom()">Go to bottom</a>
+           <a id="bottom"></a> You're at the bottom!
+         </div>
+       </file>
+       <file name="script.js">
+         angular.module('anchorScrollExample', [])
+           .controller('ScrollController', ['$scope', '$location', '$anchorScroll',
+             function ($scope, $location, $anchorScroll) {
+               $scope.gotoBottom = function() {
+                 // set the location.hash to the id of
+                 // the element you wish to scroll to.
+                 $location.hash('bottom');
+
+                 // call $anchorScroll()
+                 $anchorScroll();
+               };
+             }]);
+       </file>
+       <file name="style.css">
+         #scrollArea {
+           height: 280px;
+           overflow: auto;
+         }
+
+         #bottom {
+           display: block;
+           margin-top: 2000px;
+         }
+       </file>
+     </example>
+   *
+   * <hr />
+   * The example below illustrates the use of a vertical scroll-offset (specified as a fixed value).
+   * See {@link ng.$anchorScroll#yOffset $anchorScroll.yOffset} for more details.
+   *
+   * @example
+     <example module="anchorScrollOffsetExample">
+       <file name="index.html">
+         <div class="fixed-header" ng-controller="headerCtrl">
+           <a href="" ng-click="gotoAnchor(x)" ng-repeat="x in [1,2,3,4,5]">
+             Go to anchor {{x}}
+           </a>
+         </div>
+         <div id="anchor{{x}}" class="anchor" ng-repeat="x in [1,2,3,4,5]">
+           Anchor {{x}} of 5
+         </div>
+       </file>
+       <file name="script.js">
+         angular.module('anchorScrollOffsetExample', [])
+           .run(['$anchorScroll', function($anchorScroll) {
+             $anchorScroll.yOffset = 50;   // always scroll by 50 extra pixels
+           }])
+           .controller('headerCtrl', ['$anchorScroll', '$location', '$scope',
+             function ($anchorScroll, $location, $scope) {
+               $scope.gotoAnchor = function(x) {
+                 var newHash = 'anchor' + x;
+                 if ($location.hash() !== newHash) {
+                   // set the $location.hash to `newHash` and
+                   // $anchorScroll will automatically scroll to it
+                   $location.hash('anchor' + x);
+                 } else {
+                   // call $anchorScroll() explicitly,
+                   // since $location.hash hasn't changed
+                   $anchorScroll();
+                 }
+               };
+             }
+           ]);
+       </file>
+       <file name="style.css">
+         body {
+           padding-top: 50px;
+         }
+
+         .anchor {
+           border: 2px dashed DarkOrchid;
+           padding: 10px 10px 200px 10px;
+         }
+
+         .fixed-header {
+           background-color: rgba(0, 0, 0, 0.2);
+           height: 50px;
+           position: fixed;
+           top: 0; left: 0; right: 0;
+         }
+
+         .fixed-header > a {
+           display: inline-block;
+           margin: 5px 15px;
+         }
+       </file>
+     </example>
+   */
+  this.$get = ['$window', '$location', '$rootScope', function($window, $location, $rootScope) {
+    var document = $window.document;
+
+    // Helper function to get first anchor from a NodeList
+    // (using `Array#some()` instead of `angular#forEach()` since it's more performant
+    //  and working in all supported browsers.)
+    function getFirstAnchor(list) {
+      var result = null;
+      Array.prototype.some.call(list, function(element) {
+        if (nodeName_(element) === 'a') {
+          result = element;
+          return true;
+        }
+      });
+      return result;
+    }
+
+    function getYOffset() {
+
+      var offset = scroll.yOffset;
+
+      if (isFunction(offset)) {
+        offset = offset();
+      } else if (isElement(offset)) {
+        var elem = offset[0];
+        var style = $window.getComputedStyle(elem);
+        if (style.position !== 'fixed') {
+          offset = 0;
+        } else {
+          offset = elem.getBoundingClientRect().bottom;
+        }
+      } else if (!isNumber(offset)) {
+        offset = 0;
+      }
+
+      return offset;
+    }
+
+    function scrollTo(elem) {
+      if (elem) {
+        elem.scrollIntoView();
+
+        var offset = getYOffset();
+
+        if (offset) {
+          // `offset` is the number of pixels we should scroll UP in order to align `elem` properly.
+          // This is true ONLY if the call to `elem.scrollIntoView()` initially aligns `elem` at the
+          // top of the viewport.
+          //
+          // IF the number of pixels from the top of `elem` to the end of the page's content is less
+          // than the height of the viewport, then `elem.scrollIntoView()` will align the `elem` some
+          // way down the page.
+          //
+          // This is often the case for elements near the bottom of the page.
+          //
+          // In such cases we do not need to scroll the whole `offset` up, just the difference between
+          // the top of the element and the offset, which is enough to align the top of `elem` at the
+          // desired position.
+          var elemTop = elem.getBoundingClientRect().top;
+          $window.scrollBy(0, elemTop - offset);
+        }
+      } else {
+        $window.scrollTo(0, 0);
+      }
+    }
+
+    function scroll(hash) {
+      hash = isString(hash) ? hash : $location.hash();
+      var elm;
+
+      // empty hash, scroll to the top of the page
+      if (!hash) scrollTo(null);
+
+      // element with given id
+      else if ((elm = document.getElementById(hash))) scrollTo(elm);
+
+      // first anchor with given name :-D
+      else if ((elm = getFirstAnchor(document.getElementsByName(hash)))) scrollTo(elm);
+
+      // no element and hash == 'top', scroll to the top of the page
+      else if (hash === 'top') scrollTo(null);
+    }
+
+    // does not scroll when user clicks on anchor link that is currently on
+    // (no url change, no $location.hash() change), browser native does scroll
+    if (autoScrollingEnabled) {
+      $rootScope.$watch(function autoScrollWatch() {return $location.hash();},
+        function autoScrollWatchAction(newVal, oldVal) {
+          // skip the initial scroll if $location.hash is empty
+          if (newVal === oldVal && newVal === '') return;
+
+          jqLiteDocumentLoaded(function() {
+            $rootScope.$evalAsync(scroll);
+          });
+        });
+    }
+
+    return scroll;
+  }];
+}
+
+var $animateMinErr = minErr('$animate');
+var ELEMENT_NODE = 1;
+var NG_ANIMATE_CLASSNAME = 'ng-animate';
+
+function mergeClasses(a,b) {
+  if (!a && !b) return '';
+  if (!a) return b;
+  if (!b) return a;
+  if (isArray(a)) a = a.join(' ');
+  if (isArray(b)) b = b.join(' ');
+  return a + ' ' + b;
+}
+
+function extractElementNode(element) {
+  for (var i = 0; i < element.length; i++) {
+    var elm = element[i];
+    if (elm.nodeType === ELEMENT_NODE) {
+      return elm;
+    }
+  }
+}
+
+function splitClasses(classes) {
+  if (isString(classes)) {
+    classes = classes.split(' ');
+  }
+
+  // Use createMap() to prevent class assumptions involving property names in
+  // Object.prototype
+  var obj = createMap();
+  forEach(classes, function(klass) {
+    // sometimes the split leaves empty string values
+    // incase extra spaces were applied to the options
+    if (klass.length) {
+      obj[klass] = true;
+    }
+  });
+  return obj;
+}
+
+// if any other type of options value besides an Object value is
+// passed into the $animate.method() animation then this helper code
+// will be run which will ignore it. While this patch is not the
+// greatest solution to this, a lot of existing plugins depend on
+// $animate to either call the callback (< 1.2) or return a promise
+// that can be changed. This helper function ensures that the options
+// are wiped clean incase a callback function is provided.
+function prepareAnimateOptions(options) {
+  return isObject(options)
+      ? options
+      : {};
+}
+
+var $$CoreAnimateJsProvider = function() {
+  this.$get = function() {};
+};
+
+// this is prefixed with Core since it conflicts with
+// the animateQueueProvider defined in ngAnimate/animateQueue.js
+var $$CoreAnimateQueueProvider = function() {
+  var postDigestQueue = new HashMap();
+  var postDigestElements = [];
+
+  this.$get = ['$$AnimateRunner', '$rootScope',
+       function($$AnimateRunner,   $rootScope) {
+    return {
+      enabled: noop,
+      on: noop,
+      off: noop,
+      pin: noop,
+
+      push: function(element, event, options, domOperation) {
+        domOperation        && domOperation();
+
+        options = options || {};
+        options.from        && element.css(options.from);
+        options.to          && element.css(options.to);
+
+        if (options.addClass || options.removeClass) {
+          addRemoveClassesPostDigest(element, options.addClass, options.removeClass);
+        }
+
+        var runner = new $$AnimateRunner(); // jshint ignore:line
+
+        // since there are no animations to run the runner needs to be
+        // notified that the animation call is complete.
+        runner.complete();
+        return runner;
+      }
+    };
+
+
+    function updateData(data, classes, value) {
+      var changed = false;
+      if (classes) {
+        classes = isString(classes) ? classes.split(' ') :
+                  isArray(classes) ? classes : [];
+        forEach(classes, function(className) {
+          if (className) {
+            changed = true;
+            data[className] = value;
+          }
+        });
+      }
+      return changed;
+    }
+
+    function handleCSSClassChanges() {
+      forEach(postDigestElements, function(element) {
+        var data = postDigestQueue.get(element);
+        if (data) {
+          var existing = splitClasses(element.attr('class'));
+          var toAdd = '';
+          var toRemove = '';
+          forEach(data, function(status, className) {
+            var hasClass = !!existing[className];
+            if (status !== hasClass) {
+              if (status) {
+                toAdd += (toAdd.length ? ' ' : '') + className;
+              } else {
+                toRemove += (toRemove.length ? ' ' : '') + className;
+              }
+            }
+          });
+
+          forEach(element, function(elm) {
+            toAdd    && jqLiteAddClass(elm, toAdd);
+            toRemove && jqLiteRemoveClass(elm, toRemove);
+          });
+          postDigestQueue.remove(element);
+        }
+      });
+      postDigestElements.length = 0;
+    }
+
+
+    function addRemoveClassesPostDigest(element, add, remove) {
+      var data = postDigestQueue.get(element) || {};
+
+      var classesAdded = updateData(data, add, true);
+      var classesRemoved = updateData(data, remove, false);
+
+      if (classesAdded || classesRemoved) {
+
+        postDigestQueue.put(element, data);
+        postDigestElements.push(element);
+
+        if (postDigestElements.length === 1) {
+          $rootScope.$$postDigest(handleCSSClassChanges);
+        }
+      }
+    }
+  }];
+};
+
+/**
+ * @ngdoc provider
+ * @name $animateProvider
+ *
+ * @description
+ * Default implementation of $animate that doesn't perform any animations, instead just
+ * synchronously performs DOM updates and resolves the returned runner promise.
+ *
+ * In order to enable animations the `ngAnimate` module has to be loaded.
+ *
+ * To see the functional implementation check out `src/ngAnimate/animate.js`.
+ */
+var $AnimateProvider = ['$provide', function($provide) {
+  var provider = this;
+
+  this.$$registeredAnimations = Object.create(null);
+
+   /**
+   * @ngdoc method
+   * @name $animateProvider#register
+   *
+   * @description
+   * Registers a new injectable animation factory function. The factory function produces the
+   * animation object which contains callback functions for each event that is expected to be
+   * animated.
+   *
+   *   * `eventFn`: `function(element, ... , doneFunction, options)`
+   *   The element to animate, the `doneFunction` and the options fed into the animation. Depending
+   *   on the type of animation additional arguments will be injected into the animation function. The
+   *   list below explains the function signatures for the different animation methods:
+   *
+   *   - setClass: function(element, addedClasses, removedClasses, doneFunction, options)
+   *   - addClass: function(element, addedClasses, doneFunction, options)
+   *   - removeClass: function(element, removedClasses, doneFunction, options)
+   *   - enter, leave, move: function(element, doneFunction, options)
+   *   - animate: function(element, fromStyles, toStyles, doneFunction, options)
+   *
+   *   Make sure to trigger the `doneFunction` once the animation is fully complete.
+   *
+   * ```js
+   *   return {
+   *     //enter, leave, move signature
+   *     eventFn : function(element, done, options) {
+   *       //code to run the animation
+   *       //once complete, then run done()
+   *       return function endFunction(wasCancelled) {
+   *         //code to cancel the animation
+   *       }
+   *     }
+   *   }
+   * ```
+   *
+   * @param {string} name The name of the animation (this is what the class-based CSS value will be compared to).
+   * @param {Function} factory The factory function that will be executed to return the animation
+   *                           object.
+   */
+  this.register = function(name, factory) {
+    if (name && name.charAt(0) !== '.') {
+      throw $animateMinErr('notcsel', "Expecting class selector starting with '.' got '{0}'.", name);
+    }
+
+    var key = name + '-animation';
+    provider.$$registeredAnimations[name.substr(1)] = key;
+    $provide.factory(key, factory);
+  };
+
+  /**
+   * @ngdoc method
+   * @name $animateProvider#classNameFilter
+   *
+   * @description
+   * Sets and/or returns the CSS class regular expression that is checked when performing
+   * an animation. Upon bootstrap the classNameFilter value is not set at all and will
+   * therefore enable $animate to attempt to perform an animation on any element that is triggered.
+   * When setting the `classNameFilter` value, animations will only be performed on elements
+   * that successfully match the filter expression. This in turn can boost performance
+   * for low-powered devices as well as applications containing a lot of structural operations.
+   * @param {RegExp=} expression The className expression which will be checked against all animations
+   * @return {RegExp} The current CSS className expression value. If null then there is no expression value
+   */
+  this.classNameFilter = function(expression) {
+    if (arguments.length === 1) {
+      this.$$classNameFilter = (expression instanceof RegExp) ? expression : null;
+      if (this.$$classNameFilter) {
+        var reservedRegex = new RegExp("(\\s+|\\/)" + NG_ANIMATE_CLASSNAME + "(\\s+|\\/)");
+        if (reservedRegex.test(this.$$classNameFilter.toString())) {
+          throw $animateMinErr('nongcls','$animateProvider.classNameFilter(regex) prohibits accepting a regex value which matches/contains the "{0}" CSS class.', NG_ANIMATE_CLASSNAME);
+
+        }
+      }
+    }
+    return this.$$classNameFilter;
+  };
+
+  this.$get = ['$$animateQueue', function($$animateQueue) {
+    function domInsert(element, parentElement, afterElement) {
+      // if for some reason the previous element was removed
+      // from the dom sometime before this code runs then let's
+      // just stick to using the parent element as the anchor
+      if (afterElement) {
+        var afterNode = extractElementNode(afterElement);
+        if (afterNode && !afterNode.parentNode && !afterNode.previousElementSibling) {
+          afterElement = null;
+        }
+      }
+      afterElement ? afterElement.after(element) : parentElement.prepend(element);
+    }
+
+    /**
+     * @ngdoc service
+     * @name $animate
+     * @description The $animate service exposes a series of DOM utility methods that provide support
+     * for animation hooks. The default behavior is the application of DOM operations, however,
+     * when an animation is detected (and animations are enabled), $animate will do the heavy lifting
+     * to ensure that animation runs with the triggered DOM operation.
+     *
+     * By default $animate doesn't trigger any animations. This is because the `ngAnimate` module isn't
+     * included and only when it is active then the animation hooks that `$animate` triggers will be
+     * functional. Once active then all structural `ng-` directives will trigger animations as they perform
+     * their DOM-related operations (enter, leave and move). Other directives such as `ngClass`,
+     * `ngShow`, `ngHide` and `ngMessages` also provide support for animations.
+     *
+     * It is recommended that the`$animate` service is always used when executing DOM-related procedures within directives.
+     *
+     * To learn more about enabling animation support, click here to visit the
+     * {@link ngAnimate ngAnimate module page}.
+     */
+    return {
+      // we don't call it directly since non-existant arguments may
+      // be interpreted as null within the sub enabled function
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#on
+       * @kind function
+       * @description Sets up an event listener to fire whenever the animation event (enter, leave, move, etc...)
+       *    has fired on the given element or among any of its children. Once the listener is fired, the provided callback
+       *    is fired with the following params:
+       *
+       * ```js
+       * $animate.on('enter', container,
+       *    function callback(element, phase) {
+       *      // cool we detected an enter animation within the container
+       *    }
+       * );
+       * ```
+       *
+       * @param {string} event the animation event that will be captured (e.g. enter, leave, move, addClass, removeClass, etc...)
+       * @param {DOMElement} container the container element that will capture each of the animation events that are fired on itself
+       *     as well as among its children
+       * @param {Function} callback the callback function that will be fired when the listener is triggered
+       *
+       * The arguments present in the callback function are:
+       * * `element` - The captured DOM element that the animation was fired on.
+       * * `phase` - The phase of the animation. The two possible phases are **start** (when the animation starts) and **close** (when it ends).
+       */
+      on: $$animateQueue.on,
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#off
+       * @kind function
+       * @description Deregisters an event listener based on the event which has been associated with the provided element. This method
+       * can be used in three different ways depending on the arguments:
+       *
+       * ```js
+       * // remove all the animation event listeners listening for `enter`
+       * $animate.off('enter');
+       *
+       * // remove all the animation event listeners listening for `enter` on the given element and its children
+       * $animate.off('enter', container);
+       *
+       * // remove the event listener function provided by `listenerFn` that is set
+       * // to listen for `enter` on the given `element` as well as its children
+       * $animate.off('enter', container, callback);
+       * ```
+       *
+       * @param {string} event the animation event (e.g. enter, leave, move, addClass, removeClass, etc...)
+       * @param {DOMElement=} container the container element the event listener was placed on
+       * @param {Function=} callback the callback function that was registered as the listener
+       */
+      off: $$animateQueue.off,
+
+      /**
+       * @ngdoc method
+       * @name $animate#pin
+       * @kind function
+       * @description Associates the provided element with a host parent element to allow the element to be animated even if it exists
+       *    outside of the DOM structure of the Angular application. By doing so, any animation triggered via `$animate` can be issued on the
+       *    element despite being outside the realm of the application or within another application. Say for example if the application
+       *    was bootstrapped on an element that is somewhere inside of the `<body>` tag, but we wanted to allow for an element to be situated
+       *    as a direct child of `document.body`, then this can be achieved by pinning the element via `$animate.pin(element)`. Keep in mind
+       *    that calling `$animate.pin(element, parentElement)` will not actually insert into the DOM anywhere; it will just create the association.
+       *
+       *    Note that this feature is only active when the `ngAnimate` module is used.
+       *
+       * @param {DOMElement} element the external element that will be pinned
+       * @param {DOMElement} parentElement the host parent element that will be associated with the external element
+       */
+      pin: $$animateQueue.pin,
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#enabled
+       * @kind function
+       * @description Used to get and set whether animations are enabled or not on the entire application or on an element and its children. This
+       * function can be called in four ways:
+       *
+       * ```js
+       * // returns true or false
+       * $animate.enabled();
+       *
+       * // changes the enabled state for all animations
+       * $animate.enabled(false);
+       * $animate.enabled(true);
+       *
+       * // returns true or false if animations are enabled for an element
+       * $animate.enabled(element);
+       *
+       * // changes the enabled state for an element and its children
+       * $animate.enabled(element, true);
+       * $animate.enabled(element, false);
+       * ```
+       *
+       * @param {DOMElement=} element the element that will be considered for checking/setting the enabled state
+       * @param {boolean=} enabled whether or not the animations will be enabled for the element
+       *
+       * @return {boolean} whether or not animations are enabled
+       */
+      enabled: $$animateQueue.enabled,
+
+      /**
+       * @ngdoc method
+       * @name $animate#cancel
+       * @kind function
+       * @description Cancels the provided animation.
+       *
+       * @param {Promise} animationPromise The animation promise that is returned when an animation is started.
+       */
+      cancel: function(runner) {
+        runner.end && runner.end();
+      },
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#enter
+       * @kind function
+       * @description Inserts the element into the DOM either after the `after` element (if provided) or
+       *   as the first child within the `parent` element and then triggers an animation.
+       *   A promise is returned that will be resolved during the next digest once the animation
+       *   has completed.
+       *
+       * @param {DOMElement} element the element which will be inserted into the DOM
+       * @param {DOMElement} parent the parent element which will append the element as
+       *   a child (so long as the after element is not present)
+       * @param {DOMElement=} after the sibling element after which the element will be appended
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      enter: function(element, parent, after, options) {
+        parent = parent && jqLite(parent);
+        after = after && jqLite(after);
+        parent = parent || after.parent();
+        domInsert(element, parent, after);
+        return $$animateQueue.push(element, 'enter', prepareAnimateOptions(options));
+      },
+
+      /**
+       *
+       * @ngdoc method
+       * @name $animate#move
+       * @kind function
+       * @description Inserts (moves) the element into its new position in the DOM either after
+       *   the `after` element (if provided) or as the first child within the `parent` element
+       *   and then triggers an animation. A promise is returned that will be resolved
+       *   during the next digest once the animation has completed.
+       *
+       * @param {DOMElement} element the element which will be moved into the new DOM position
+       * @param {DOMElement} parent the parent element which will append the element as
+       *   a child (so long as the after element is not present)
+       * @param {DOMElement=} after the sibling element after which the element will be appended
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      move: function(element, parent, after, options) {
+        parent = parent && jqLite(parent);
+        after = after && jqLite(after);
+        parent = parent || after.parent();
+        domInsert(element, parent, after);
+        return $$animateQueue.push(element, 'move', prepareAnimateOptions(options));
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#leave
+       * @kind function
+       * @description Triggers an animation and then removes the element from the DOM.
+       * When the function is called a promise is returned that will be resolved during the next
+       * digest once the animation has completed.
+       *
+       * @param {DOMElement} element the element which will be removed from the DOM
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      leave: function(element, options) {
+        return $$animateQueue.push(element, 'leave', prepareAnimateOptions(options), function() {
+          element.remove();
+        });
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#addClass
+       * @kind function
+       *
+       * @description Triggers an addClass animation surrounding the addition of the provided CSS class(es). Upon
+       *   execution, the addClass operation will only be handled after the next digest and it will not trigger an
+       *   animation if element already contains the CSS class or if the class is removed at a later step.
+       *   Note that class-based animations are treated differently compared to structural animations
+       *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *   depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} className the CSS class(es) that will be added (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      addClass: function(element, className, options) {
+        options = prepareAnimateOptions(options);
+        options.addClass = mergeClasses(options.addclass, className);
+        return $$animateQueue.push(element, 'addClass', options);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#removeClass
+       * @kind function
+       *
+       * @description Triggers a removeClass animation surrounding the removal of the provided CSS class(es). Upon
+       *   execution, the removeClass operation will only be handled after the next digest and it will not trigger an
+       *   animation if element does not contain the CSS class or if the class is added at a later step.
+       *   Note that class-based animations are treated differently compared to structural animations
+       *   (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *   depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} className the CSS class(es) that will be removed (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      removeClass: function(element, className, options) {
+        options = prepareAnimateOptions(options);
+        options.removeClass = mergeClasses(options.removeClass, className);
+        return $$animateQueue.push(element, 'removeClass', options);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#setClass
+       * @kind function
+       *
+       * @description Performs both the addition and removal of a CSS classes on an element and (during the process)
+       *    triggers an animation surrounding the class addition/removal. Much like `$animate.addClass` and
+       *    `$animate.removeClass`, `setClass` will only evaluate the classes being added/removed once a digest has
+       *    passed. Note that class-based animations are treated differently compared to structural animations
+       *    (like enter, move and leave) since the CSS classes may be added/removed at different points
+       *    depending if CSS or JavaScript animations are used.
+       *
+       * @param {DOMElement} element the element which the CSS classes will be applied to
+       * @param {string} add the CSS class(es) that will be added (multiple classes are separated via spaces)
+       * @param {string} remove the CSS class(es) that will be removed (multiple classes are separated via spaces)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      setClass: function(element, add, remove, options) {
+        options = prepareAnimateOptions(options);
+        options.addClass = mergeClasses(options.addClass, add);
+        options.removeClass = mergeClasses(options.removeClass, remove);
+        return $$animateQueue.push(element, 'setClass', options);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $animate#animate
+       * @kind function
+       *
+       * @description Performs an inline animation on the element which applies the provided to and from CSS styles to the element.
+       * If any detected CSS transition, keyframe or JavaScript matches the provided className value, then the animation will take
+       * on the provided styles. For example, if a transition animation is set for the given className, then the provided `from` and
+       * `to` styles will be applied alongside the given transition. If the CSS style provided in `from` does not have a corresponding
+       * style in `to`, the style in `from` is applied immediately, and no animation is run.
+       * If a JavaScript animation is detected then the provided styles will be given in as function parameters into the `animate`
+       * method (or as part of the `options` parameter):
+       *
+       * ```js
+       * ngModule.animation('.my-inline-animation', function() {
+       *   return {
+       *     animate : function(element, from, to, done, options) {
+       *       //animation
+       *       done();
+       *     }
+       *   }
+       * });
+       * ```
+       *
+       * @param {DOMElement} element the element which the CSS styles will be applied to
+       * @param {object} from the from (starting) CSS styles that will be applied to the element and across the animation.
+       * @param {object} to the to (destination) CSS styles that will be applied to the element and across the animation.
+       * @param {string=} className an optional CSS class that will be applied to the element for the duration of the animation. If
+       *    this value is left as empty then a CSS class of `ng-inline-animate` will be applied to the element.
+       *    (Note that if no animation is detected then this value will not be appplied to the element.)
+       * @param {object=} options an optional collection of options/styles that will be applied to the element
+       *
+       * @return {Promise} the animation callback promise
+       */
+      animate: function(element, from, to, className, options) {
+        options = prepareAnimateOptions(options);
+        options.from = options.from ? extend(options.from, from) : from;
+        options.to   = options.to   ? extend(options.to, to)     : to;
+
+        className = className || 'ng-inline-animate';
+        options.tempClasses = mergeClasses(options.tempClasses, className);
+        return $$animateQueue.push(element, 'animate', options);
+      }
+    };
+  }];
+}];
+
+var $$AnimateAsyncRunFactoryProvider = function() {
+  this.$get = ['$$rAF', function($$rAF) {
+    var waitQueue = [];
+
+    function waitForTick(fn) {
+      waitQueue.push(fn);
+      if (waitQueue.length > 1) return;
+      $$rAF(function() {
+        for (var i = 0; i < waitQueue.length; i++) {
+          waitQueue[i]();
+        }
+        waitQueue = [];
+      });
+    }
+
+    return function() {
+      var passed = false;
+      waitForTick(function() {
+        passed = true;
+      });
+      return function(callback) {
+        passed ? callback() : waitForTick(callback);
+      };
+    };
+  }];
+};
+
+var $$AnimateRunnerFactoryProvider = function() {
+  this.$get = ['$q', '$sniffer', '$$animateAsyncRun', '$document', '$timeout',
+       function($q,   $sniffer,   $$animateAsyncRun,   $document,   $timeout) {
+
+    var INITIAL_STATE = 0;
+    var DONE_PENDING_STATE = 1;
+    var DONE_COMPLETE_STATE = 2;
+
+    AnimateRunner.chain = function(chain, callback) {
+      var index = 0;
+
+      next();
+      function next() {
+        if (index === chain.length) {
+          callback(true);
+          return;
+        }
+
+        chain[index](function(response) {
+          if (response === false) {
+            callback(false);
+            return;
+          }
+          index++;
+          next();
+        });
+      }
+    };
+
+    AnimateRunner.all = function(runners, callback) {
+      var count = 0;
+      var status = true;
+      forEach(runners, function(runner) {
+        runner.done(onProgress);
+      });
+
+      function onProgress(response) {
+        status = status && response;
+        if (++count === runners.length) {
+          callback(status);
+        }
+      }
+    };
+
+    function AnimateRunner(host) {
+      this.setHost(host);
+
+      var rafTick = $$animateAsyncRun();
+      var timeoutTick = function(fn) {
+        $timeout(fn, 0, false);
+      };
+
+      this._doneCallbacks = [];
+      this._tick = function(fn) {
+        var doc = $document[0];
+
+        // the document may not be ready or attached
+        // to the module for some internal tests
+        if (doc && doc.hidden) {
+          timeoutTick(fn);
+        } else {
+          rafTick(fn);
+        }
+      };
+      this._state = 0;
+    }
+
+    AnimateRunner.prototype = {
+      setHost: function(host) {
+        this.host = host || {};
+      },
+
+      done: function(fn) {
+        if (this._state === DONE_COMPLETE_STATE) {
+          fn();
+        } else {
+          this._doneCallbacks.push(fn);
+        }
+      },
+
+      progress: noop,
+
+      getPromise: function() {
+        if (!this.promise) {
+          var self = this;
+          this.promise = $q(function(resolve, reject) {
+            self.done(function(status) {
+              status === false ? reject() : resolve();
+            });
+          });
+        }
+        return this.promise;
+      },
+
+      then: function(resolveHandler, rejectHandler) {
+        return this.getPromise().then(resolveHandler, rejectHandler);
+      },
+
+      'catch': function(handler) {
+        return this.getPromise()['catch'](handler);
+      },
+
+      'finally': function(handler) {
+        return this.getPromise()['finally'](handler);
+      },
+
+      pause: function() {
+        if (this.host.pause) {
+          this.host.pause();
+        }
+      },
+
+      resume: function() {
+        if (this.host.resume) {
+          this.host.resume();
+        }
+      },
+
+      end: function() {
+        if (this.host.end) {
+          this.host.end();
+        }
+        this._resolve(true);
+      },
+
+      cancel: function() {
+        if (this.host.cancel) {
+          this.host.cancel();
+        }
+        this._resolve(false);
+      },
+
+      complete: function(response) {
+        var self = this;
+        if (self._state === INITIAL_STATE) {
+          self._state = DONE_PENDING_STATE;
+          self._tick(function() {
+            self._resolve(response);
+          });
+        }
+      },
+
+      _resolve: function(response) {
+        if (this._state !== DONE_COMPLETE_STATE) {
+          forEach(this._doneCallbacks, function(fn) {
+            fn(response);
+          });
+          this._doneCallbacks.length = 0;
+          this._state = DONE_COMPLETE_STATE;
+        }
+      }
+    };
+
+    return AnimateRunner;
+  }];
+};
+
+/**
+ * @ngdoc service
+ * @name $animateCss
+ * @kind object
+ *
+ * @description
+ * This is the core version of `$animateCss`. By default, only when the `ngAnimate` is included,
+ * then the `$animateCss` service will actually perform animations.
+ *
+ * Click here {@link ngAnimate.$animateCss to read the documentation for $animateCss}.
+ */
+var $CoreAnimateCssProvider = function() {
+  this.$get = ['$$rAF', '$q', '$$AnimateRunner', function($$rAF, $q, $$AnimateRunner) {
+
+    return function(element, initialOptions) {
+      // all of the animation functions should create
+      // a copy of the options data, however, if a
+      // parent service has already created a copy then
+      // we should stick to using that
+      var options = initialOptions || {};
+      if (!options.$$prepared) {
+        options = copy(options);
+      }
+
+      // there is no point in applying the styles since
+      // there is no animation that goes on at all in
+      // this version of $animateCss.
+      if (options.cleanupStyles) {
+        options.from = options.to = null;
+      }
+
+      if (options.from) {
+        element.css(options.from);
+        options.from = null;
+      }
+
+      /* jshint newcap: false*/
+      var closed, runner = new $$AnimateRunner();
+      return {
+        start: run,
+        end: run
+      };
+
+      function run() {
+        $$rAF(function() {
+          applyAnimationContents();
+          if (!closed) {
+            runner.complete();
+          }
+          closed = true;
+        });
+        return runner;
+      }
+
+      function applyAnimationContents() {
+        if (options.addClass) {
+          element.addClass(options.addClass);
+          options.addClass = null;
+        }
+        if (options.removeClass) {
+          element.removeClass(options.removeClass);
+          options.removeClass = null;
+        }
+        if (options.to) {
+          element.css(options.to);
+          options.to = null;
+        }
+      }
+    };
+  }];
+};
+
+/* global stripHash: true */
+
+/**
+ * ! This is a private undocumented service !
+ *
+ * @name $browser
+ * @requires $log
+ * @description
+ * This object has two goals:
+ *
+ * - hide all the global state in the browser caused by the window object
+ * - abstract away all the browser specific features and inconsistencies
+ *
+ * For tests we provide {@link ngMock.$browser mock implementation} of the `$browser`
+ * service, which can be used for convenient testing of the application without the interaction with
+ * the real browser apis.
+ */
+/**
+ * @param {object} window The global window object.
+ * @param {object} document jQuery wrapped document.
+ * @param {object} $log window.console or an object with the same interface.
+ * @param {object} $sniffer $sniffer service
+ */
+function Browser(window, document, $log, $sniffer) {
+  var self = this,
+      rawDocument = document[0],
+      location = window.location,
+      history = window.history,
+      setTimeout = window.setTimeout,
+      clearTimeout = window.clearTimeout,
+      pendingDeferIds = {};
+
+  self.isMock = false;
+
+  var outstandingRequestCount = 0;
+  var outstandingRequestCallbacks = [];
+
+  // TODO(vojta): remove this temporary api
+  self.$$completeOutstandingRequest = completeOutstandingRequest;
+  self.$$incOutstandingRequestCount = function() { outstandingRequestCount++; };
+
+  /**
+   * Executes the `fn` function(supports currying) and decrements the `outstandingRequestCallbacks`
+   * counter. If the counter reaches 0, all the `outstandingRequestCallbacks` are executed.
+   */
+  function completeOutstandingRequest(fn) {
+    try {
+      fn.apply(null, sliceArgs(arguments, 1));
+    } finally {
+      outstandingRequestCount--;
+      if (outstandingRequestCount === 0) {
+        while (outstandingRequestCallbacks.length) {
+          try {
+            outstandingRequestCallbacks.pop()();
+          } catch (e) {
+            $log.error(e);
+          }
+        }
+      }
+    }
+  }
+
+  function getHash(url) {
+    var index = url.indexOf('#');
+    return index === -1 ? '' : url.substr(index);
+  }
+
+  /**
+   * @private
+   * Note: this method is used only by scenario runner
+   * TODO(vojta): prefix this method with $$ ?
+   * @param {function()} callback Function that will be called when no outstanding request
+   */
+  self.notifyWhenNoOutstandingRequests = function(callback) {
+    if (outstandingRequestCount === 0) {
+      callback();
+    } else {
+      outstandingRequestCallbacks.push(callback);
+    }
+  };
+
+  //////////////////////////////////////////////////////////////
+  // URL API
+  //////////////////////////////////////////////////////////////
+
+  var cachedState, lastHistoryState,
+      lastBrowserUrl = location.href,
+      baseElement = document.find('base'),
+      pendingLocation = null;
+
+  cacheState();
+  lastHistoryState = cachedState;
+
+  /**
+   * @name $browser#url
+   *
+   * @description
+   * GETTER:
+   * Without any argument, this method just returns current value of location.href.
+   *
+   * SETTER:
+   * With at least one argument, this method sets url to new value.
+   * If html5 history api supported, pushState/replaceState is used, otherwise
+   * location.href/location.replace is used.
+   * Returns its own instance to allow chaining
+   *
+   * NOTE: this api is intended for use only by the $location service. Please use the
+   * {@link ng.$location $location service} to change url.
+   *
+   * @param {string} url New url (when used as setter)
+   * @param {boolean=} replace Should new url replace current history record?
+   * @param {object=} state object to use with pushState/replaceState
+   */
+  self.url = function(url, replace, state) {
+    // In modern browsers `history.state` is `null` by default; treating it separately
+    // from `undefined` would cause `$browser.url('/foo')` to change `history.state`
+    // to undefined via `pushState`. Instead, let's change `undefined` to `null` here.
+    if (isUndefined(state)) {
+      state = null;
+    }
+
+    // Android Browser BFCache causes location, history reference to become stale.
+    if (location !== window.location) location = window.location;
+    if (history !== window.history) history = window.history;
+
+    // setter
+    if (url) {
+      var sameState = lastHistoryState === state;
+
+      // Don't change anything if previous and current URLs and states match. This also prevents
+      // IE<10 from getting into redirect loop when in LocationHashbangInHtml5Url mode.
+      // See https://github.com/angular/angular.js/commit/ffb2701
+      if (lastBrowserUrl === url && (!$sniffer.history || sameState)) {
+        return self;
+      }
+      var sameBase = lastBrowserUrl && stripHash(lastBrowserUrl) === stripHash(url);
+      lastBrowserUrl = url;
+      lastHistoryState = state;
+      // Don't use history API if only the hash changed
+      // due to a bug in IE10/IE11 which leads
+      // to not firing a `hashchange` nor `popstate` event
+      // in some cases (see #9143).
+      if ($sniffer.history && (!sameBase || !sameState)) {
+        history[replace ? 'replaceState' : 'pushState'](state, '', url);
+        cacheState();
+        // Do the assignment again so that those two variables are referentially identical.
+        lastHistoryState = cachedState;
+      } else {
+        if (!sameBase || pendingLocation) {
+          pendingLocation = url;
+        }
+        if (replace) {
+          location.replace(url);
+        } else if (!sameBase) {
+          location.href = url;
+        } else {
+          location.hash = getHash(url);
+        }
+        if (location.href !== url) {
+          pendingLocation = url;
+        }
+      }
+      return self;
+    // getter
+    } else {
+      // - pendingLocation is needed as browsers don't allow to read out
+      //   the new location.href if a reload happened or if there is a bug like in iOS 9 (see
+      //   https://openradar.appspot.com/22186109).
+      // - the replacement is a workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=407172
+      return pendingLocation || location.href.replace(/%27/g,"'");
+    }
+  };
+
+  /**
+   * @name $browser#state
+   *
+   * @description
+   * This method is a getter.
+   *
+   * Return history.state or null if history.state is undefined.
+   *
+   * @returns {object} state
+   */
+  self.state = function() {
+    return cachedState;
+  };
+
+  var urlChangeListeners = [],
+      urlChangeInit = false;
+
+  function cacheStateAndFireUrlChange() {
+    pendingLocation = null;
+    cacheState();
+    fireUrlChange();
+  }
+
+  function getCurrentState() {
+    try {
+      return history.state;
+    } catch (e) {
+      // MSIE can reportedly throw when there is no state (UNCONFIRMED).
+    }
+  }
+
+  // This variable should be used *only* inside the cacheState function.
+  var lastCachedState = null;
+  function cacheState() {
+    // This should be the only place in $browser where `history.state` is read.
+    cachedState = getCurrentState();
+    cachedState = isUndefined(cachedState) ? null : cachedState;
+
+    // Prevent callbacks fo fire twice if both hashchange & popstate were fired.
+    if (equals(cachedState, lastCachedState)) {
+      cachedState = lastCachedState;
+    }
+    lastCachedState = cachedState;
+  }
+
+  function fireUrlChange() {
+    if (lastBrowserUrl === self.url() && lastHistoryState === cachedState) {
+      return;
+    }
+
+    lastBrowserUrl = self.url();
+    lastHistoryState = cachedState;
+    forEach(urlChangeListeners, function(listener) {
+      listener(self.url(), cachedState);
+    });
+  }
+
+  /**
+   * @name $browser#onUrlChange
+   *
+   * @description
+   * Register callback function that will be called, when url changes.
+   *
+   * It's only called when the url is changed from outside of angular:
+   * - user types different url into address bar
+   * - user clicks on history (forward/back) button
+   * - user clicks on a link
+   *
+   * It's not called when url is changed by $browser.url() method
+   *
+   * The listener gets called with new url as parameter.
+   *
+   * NOTE: this api is intended for use only by the $location service. Please use the
+   * {@link ng.$location $location service} to monitor url changes in angular apps.
+   *
+   * @param {function(string)} listener Listener function to be called when url changes.
+   * @return {function(string)} Returns the registered listener fn - handy if the fn is anonymous.
+   */
+  self.onUrlChange = function(callback) {
+    // TODO(vojta): refactor to use node's syntax for events
+    if (!urlChangeInit) {
+      // We listen on both (hashchange/popstate) when available, as some browsers (e.g. Opera)
+      // don't fire popstate when user change the address bar and don't fire hashchange when url
+      // changed by push/replaceState
+
+      // html5 history api - popstate event
+      if ($sniffer.history) jqLite(window).on('popstate', cacheStateAndFireUrlChange);
+      // hashchange event
+      jqLite(window).on('hashchange', cacheStateAndFireUrlChange);
+
+      urlChangeInit = true;
+    }
+
+    urlChangeListeners.push(callback);
+    return callback;
+  };
+
+  /**
+   * @private
+   * Remove popstate and hashchange handler from window.
+   *
+   * NOTE: this api is intended for use only by $rootScope.
+   */
+  self.$$applicationDestroyed = function() {
+    jqLite(window).off('hashchange popstate', cacheStateAndFireUrlChange);
+  };
+
+  /**
+   * Checks whether the url has changed outside of Angular.
+   * Needs to be exported to be able to check for changes that have been done in sync,
+   * as hashchange/popstate events fire in async.
+   */
+  self.$$checkUrlChange = fireUrlChange;
+
+  //////////////////////////////////////////////////////////////
+  // Misc API
+  //////////////////////////////////////////////////////////////
+
+  /**
+   * @name $browser#baseHref
+   *
+   * @description
+   * Returns current <base href>
+   * (always relative - without domain)
+   *
+   * @returns {string} The current base href
+   */
+  self.baseHref = function() {
+    var href = baseElement.attr('href');
+    return href ? href.replace(/^(https?\:)?\/\/[^\/]*/, '') : '';
+  };
+
+  /**
+   * @name $browser#defer
+   * @param {function()} fn A function, who's execution should be deferred.
+   * @param {number=} [delay=0] of milliseconds to defer the function execution.
+   * @returns {*} DeferId that can be used to cancel the task via `$browser.defer.cancel()`.
+   *
+   * @description
+   * Executes a fn asynchronously via `setTimeout(fn, delay)`.
+   *
+   * Unlike when calling `setTimeout` directly, in test this function is mocked and instead of using
+   * `setTimeout` in tests, the fns are queued in an array, which can be programmatically flushed
+   * via `$browser.defer.flush()`.
+   *
+   */
+  self.defer = function(fn, delay) {
+    var timeoutId;
+    outstandingRequestCount++;
+    timeoutId = setTimeout(function() {
+      delete pendingDeferIds[timeoutId];
+      completeOutstandingRequest(fn);
+    }, delay || 0);
+    pendingDeferIds[timeoutId] = true;
+    return timeoutId;
+  };
+
+
+  /**
+   * @name $browser#defer.cancel
+   *
+   * @description
+   * Cancels a deferred task identified with `deferId`.
+   *
+   * @param {*} deferId Token returned by the `$browser.defer` function.
+   * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
+   *                    canceled.
+   */
+  self.defer.cancel = function(deferId) {
+    if (pendingDeferIds[deferId]) {
+      delete pendingDeferIds[deferId];
+      clearTimeout(deferId);
+      completeOutstandingRequest(noop);
+      return true;
+    }
+    return false;
+  };
+
+}
+
+function $BrowserProvider() {
+  this.$get = ['$window', '$log', '$sniffer', '$document',
+      function($window, $log, $sniffer, $document) {
+        return new Browser($window, $document, $log, $sniffer);
+      }];
+}
+
+/**
+ * @ngdoc service
+ * @name $cacheFactory
+ *
+ * @description
+ * Factory that constructs {@link $cacheFactory.Cache Cache} objects and gives access to
+ * them.
+ *
+ * ```js
+ *
+ *  var cache = $cacheFactory('cacheId');
+ *  expect($cacheFactory.get('cacheId')).toBe(cache);
+ *  expect($cacheFactory.get('noSuchCacheId')).not.toBeDefined();
+ *
+ *  cache.put("key", "value");
+ *  cache.put("another key", "another value");
+ *
+ *  // We've specified no options on creation
+ *  expect(cache.info()).toEqual({id: 'cacheId', size: 2});
+ *
+ * ```
+ *
+ *
+ * @param {string} cacheId Name or id of the newly created cache.
+ * @param {object=} options Options object that specifies the cache behavior. Properties:
+ *
+ *   - `{number=}` `capacity` — turns the cache into LRU cache.
+ *
+ * @returns {object} Newly created cache object with the following set of methods:
+ *
+ * - `{object}` `info()` — Returns id, size, and options of cache.
+ * - `{{*}}` `put({string} key, {*} value)` — Puts a new key-value pair into the cache and returns
+ *   it.
+ * - `{{*}}` `get({string} key)` — Returns cached value for `key` or undefined for cache miss.
+ * - `{void}` `remove({string} key)` — Removes a key-value pair from the cache.
+ * - `{void}` `removeAll()` — Removes all cached values.
+ * - `{void}` `destroy()` — Removes references to this cache from $cacheFactory.
+ *
+ * @example
+   <example module="cacheExampleApp">
+     <file name="index.html">
+       <div ng-controller="CacheController">
+         <input ng-model="newCacheKey" placeholder="Key">
+         <input ng-model="newCacheValue" placeholder="Value">
+         <button ng-click="put(newCacheKey, newCacheValue)">Cache</button>
+
+         <p ng-if="keys.length">Cached Values</p>
+         <div ng-repeat="key in keys">
+           <span ng-bind="key"></span>
+           <span>: </span>
+           <b ng-bind="cache.get(key)"></b>
+         </div>
+
+         <p>Cache Info</p>
+         <div ng-repeat="(key, value) in cache.info()">
+           <span ng-bind="key"></span>
+           <span>: </span>
+           <b ng-bind="value"></b>
+         </div>
+       </div>
+     </file>
+     <file name="script.js">
+       angular.module('cacheExampleApp', []).
+         controller('CacheController', ['$scope', '$cacheFactory', function($scope, $cacheFactory) {
+           $scope.keys = [];
+           $scope.cache = $cacheFactory('cacheId');
+           $scope.put = function(key, value) {
+             if (angular.isUndefined($scope.cache.get(key))) {
+               $scope.keys.push(key);
+             }
+             $scope.cache.put(key, angular.isUndefined(value) ? null : value);
+           };
+         }]);
+     </file>
+     <file name="style.css">
+       p {
+         margin: 10px 0 3px;
+       }
+     </file>
+   </example>
+ */
+function $CacheFactoryProvider() {
+
+  this.$get = function() {
+    var caches = {};
+
+    function cacheFactory(cacheId, options) {
+      if (cacheId in caches) {
+        throw minErr('$cacheFactory')('iid', "CacheId '{0}' is already taken!", cacheId);
+      }
+
+      var size = 0,
+          stats = extend({}, options, {id: cacheId}),
+          data = createMap(),
+          capacity = (options && options.capacity) || Number.MAX_VALUE,
+          lruHash = createMap(),
+          freshEnd = null,
+          staleEnd = null;
+
+      /**
+       * @ngdoc type
+       * @name $cacheFactory.Cache
+       *
+       * @description
+       * A cache object used to store and retrieve data, primarily used by
+       * {@link $http $http} and the {@link ng.directive:script script} directive to cache
+       * templates and other data.
+       *
+       * ```js
+       *  angular.module('superCache')
+       *    .factory('superCache', ['$cacheFactory', function($cacheFactory) {
+       *      return $cacheFactory('super-cache');
+       *    }]);
+       * ```
+       *
+       * Example test:
+       *
+       * ```js
+       *  it('should behave like a cache', inject(function(superCache) {
+       *    superCache.put('key', 'value');
+       *    superCache.put('another key', 'another value');
+       *
+       *    expect(superCache.info()).toEqual({
+       *      id: 'super-cache',
+       *      size: 2
+       *    });
+       *
+       *    superCache.remove('another key');
+       *    expect(superCache.get('another key')).toBeUndefined();
+       *
+       *    superCache.removeAll();
+       *    expect(superCache.info()).toEqual({
+       *      id: 'super-cache',
+       *      size: 0
+       *    });
+       *  }));
+       * ```
+       */
+      return caches[cacheId] = {
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#put
+         * @kind function
+         *
+         * @description
+         * Inserts a named entry into the {@link $cacheFactory.Cache Cache} object to be
+         * retrieved later, and incrementing the size of the cache if the key was not already
+         * present in the cache. If behaving like an LRU cache, it will also remove stale
+         * entries from the set.
+         *
+         * It will not insert undefined values into the cache.
+         *
+         * @param {string} key the key under which the cached data is stored.
+         * @param {*} value the value to store alongside the key. If it is undefined, the key
+         *    will not be stored.
+         * @returns {*} the value stored.
+         */
+        put: function(key, value) {
+          if (isUndefined(value)) return;
+          if (capacity < Number.MAX_VALUE) {
+            var lruEntry = lruHash[key] || (lruHash[key] = {key: key});
+
+            refresh(lruEntry);
+          }
+
+          if (!(key in data)) size++;
+          data[key] = value;
+
+          if (size > capacity) {
+            this.remove(staleEnd.key);
+          }
+
+          return value;
+        },
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#get
+         * @kind function
+         *
+         * @description
+         * Retrieves named data stored in the {@link $cacheFactory.Cache Cache} object.
+         *
+         * @param {string} key the key of the data to be retrieved
+         * @returns {*} the value stored.
+         */
+        get: function(key) {
+          if (capacity < Number.MAX_VALUE) {
+            var lruEntry = lruHash[key];
+
+            if (!lruEntry) return;
+
+            refresh(lruEntry);
+          }
+
+          return data[key];
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#remove
+         * @kind function
+         *
+         * @description
+         * Removes an entry from the {@link $cacheFactory.Cache Cache} object.
+         *
+         * @param {string} key the key of the entry to be removed
+         */
+        remove: function(key) {
+          if (capacity < Number.MAX_VALUE) {
+            var lruEntry = lruHash[key];
+
+            if (!lruEntry) return;
+
+            if (lruEntry == freshEnd) freshEnd = lruEntry.p;
+            if (lruEntry == staleEnd) staleEnd = lruEntry.n;
+            link(lruEntry.n,lruEntry.p);
+
+            delete lruHash[key];
+          }
+
+          if (!(key in data)) return;
+
+          delete data[key];
+          size--;
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#removeAll
+         * @kind function
+         *
+         * @description
+         * Clears the cache object of any entries.
+         */
+        removeAll: function() {
+          data = createMap();
+          size = 0;
+          lruHash = createMap();
+          freshEnd = staleEnd = null;
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#destroy
+         * @kind function
+         *
+         * @description
+         * Destroys the {@link $cacheFactory.Cache Cache} object entirely,
+         * removing it from the {@link $cacheFactory $cacheFactory} set.
+         */
+        destroy: function() {
+          data = null;
+          stats = null;
+          lruHash = null;
+          delete caches[cacheId];
+        },
+
+
+        /**
+         * @ngdoc method
+         * @name $cacheFactory.Cache#info
+         * @kind function
+         *
+         * @description
+         * Retrieve information regarding a particular {@link $cacheFactory.Cache Cache}.
+         *
+         * @returns {object} an object with the following properties:
+         *   <ul>
+         *     <li>**id**: the id of the cache instance</li>
+         *     <li>**size**: the number of entries kept in the cache instance</li>
+         *     <li>**...**: any additional properties from the options object when creating the
+         *       cache.</li>
+         *   </ul>
+         */
+        info: function() {
+          return extend({}, stats, {size: size});
+        }
+      };
+
+
+      /**
+       * makes the `entry` the freshEnd of the LRU linked list
+       */
+      function refresh(entry) {
+        if (entry != freshEnd) {
+          if (!staleEnd) {
+            staleEnd = entry;
+          } else if (staleEnd == entry) {
+            staleEnd = entry.n;
+          }
+
+          link(entry.n, entry.p);
+          link(entry, freshEnd);
+          freshEnd = entry;
+          freshEnd.n = null;
+        }
+      }
+
+
+      /**
+       * bidirectionally links two entries of the LRU linked list
+       */
+      function link(nextEntry, prevEntry) {
+        if (nextEntry != prevEntry) {
+          if (nextEntry) nextEntry.p = prevEntry; //p stands for previous, 'prev' didn't minify
+          if (prevEntry) prevEntry.n = nextEntry; //n stands for next, 'next' didn't minify
+        }
+      }
+    }
+
+
+  /**
+   * @ngdoc method
+   * @name $cacheFactory#info
+   *
+   * @description
+   * Get information about all the caches that have been created
+   *
+   * @returns {Object} - key-value map of `cacheId` to the result of calling `cache#info`
+   */
+    cacheFactory.info = function() {
+      var info = {};
+      forEach(caches, function(cache, cacheId) {
+        info[cacheId] = cache.info();
+      });
+      return info;
+    };
+
+
+  /**
+   * @ngdoc method
+   * @name $cacheFactory#get
+   *
+   * @description
+   * Get access to a cache object by the `cacheId` used when it was created.
+   *
+   * @param {string} cacheId Name or id of a cache to access.
+   * @returns {object} Cache object identified by the cacheId or undefined if no such cache.
+   */
+    cacheFactory.get = function(cacheId) {
+      return caches[cacheId];
+    };
+
+
+    return cacheFactory;
+  };
+}
+
+/**
+ * @ngdoc service
+ * @name $templateCache
+ *
+ * @description
+ * The first time a template is used, it is loaded in the template cache for quick retrieval. You
+ * can load templates directly into the cache in a `script` tag, or by consuming the
+ * `$templateCache` service directly.
+ *
+ * Adding via the `script` tag:
+ *
+ * ```html
+ *   <script type="text/ng-template" id="templateId.html">
+ *     <p>This is the content of the template</p>
+ *   </script>
+ * ```
+ *
+ * **Note:** the `script` tag containing the template does not need to be included in the `head` of
+ * the document, but it must be a descendent of the {@link ng.$rootElement $rootElement} (IE,
+ * element with ng-app attribute), otherwise the template will be ignored.
+ *
+ * Adding via the `$templateCache` service:
+ *
+ * ```js
+ * var myApp = angular.module('myApp', []);
+ * myApp.run(function($templateCache) {
+ *   $templateCache.put('templateId.html', 'This is the content of the template');
+ * });
+ * ```
+ *
+ * To retrieve the template later, simply use it in your HTML:
+ * ```html
+ * <div ng-include=" 'templateId.html' "></div>
+ * ```
+ *
+ * or get it via Javascript:
+ * ```js
+ * $templateCache.get('templateId.html')
+ * ```
+ *
+ * See {@link ng.$cacheFactory $cacheFactory}.
+ *
+ */
+function $TemplateCacheProvider() {
+  this.$get = ['$cacheFactory', function($cacheFactory) {
+    return $cacheFactory('templates');
+  }];
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* ! VARIABLE/FUNCTION NAMING CONVENTIONS THAT APPLY TO THIS FILE!
+ *
+ * DOM-related variables:
+ *
+ * - "node" - DOM Node
+ * - "element" - DOM Element or Node
+ * - "$node" or "$element" - jqLite-wrapped node or element
+ *
+ *
+ * Compiler related stuff:
+ *
+ * - "linkFn" - linking fn of a single directive
+ * - "nodeLinkFn" - function that aggregates all linking fns for a particular node
+ * - "childLinkFn" -  function that aggregates all linking fns for child nodes of a particular node
+ * - "compositeLinkFn" - function that aggregates all linking fns for a compilation root (nodeList)
+ */
+
+
+/**
+ * @ngdoc service
+ * @name $compile
+ * @kind function
+ *
+ * @description
+ * Compiles an HTML string or DOM into a template and produces a template function, which
+ * can then be used to link {@link ng.$rootScope.Scope `scope`} and the template together.
+ *
+ * The compilation is a process of walking the DOM tree and matching DOM elements to
+ * {@link ng.$compileProvider#directive directives}.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** This document is an in-depth reference of all directive options.
+ * For a gentle introduction to directives with examples of common use cases,
+ * see the {@link guide/directive directive guide}.
+ * </div>
+ *
+ * ## Comprehensive Directive API
+ *
+ * There are many different options for a directive.
+ *
+ * The difference resides in the return value of the factory function.
+ * You can either return a "Directive Definition Object" (see below) that defines the directive properties,
+ * or just the `postLink` function (all other properties will have the default values).
+ *
+ * <div class="alert alert-success">
+ * **Best Practice:** It's recommended to use the "directive definition object" form.
+ * </div>
+ *
+ * Here's an example directive declared with a Directive Definition Object:
+ *
+ * ```js
+ *   var myModule = angular.module(...);
+ *
+ *   myModule.directive('directiveName', function factory(injectables) {
+ *     var directiveDefinitionObject = {
+ *       priority: 0,
+ *       template: '<div></div>', // or // function(tElement, tAttrs) { ... },
+ *       // or
+ *       // templateUrl: 'directive.html', // or // function(tElement, tAttrs) { ... },
+ *       transclude: false,
+ *       restrict: 'A',
+ *       templateNamespace: 'html',
+ *       scope: false,
+ *       controller: function($scope, $element, $attrs, $transclude, otherInjectables) { ... },
+ *       controllerAs: 'stringIdentifier',
+ *       bindToController: false,
+ *       require: 'siblingDirectiveName', // or // ['^parentDirectiveName', '?optionalDirectiveName', '?^optionalParent'],
+ *       compile: function compile(tElement, tAttrs, transclude) {
+ *         return {
+ *           pre: function preLink(scope, iElement, iAttrs, controller) { ... },
+ *           post: function postLink(scope, iElement, iAttrs, controller) { ... }
+ *         }
+ *         // or
+ *         // return function postLink( ... ) { ... }
+ *       },
+ *       // or
+ *       // link: {
+ *       //  pre: function preLink(scope, iElement, iAttrs, controller) { ... },
+ *       //  post: function postLink(scope, iElement, iAttrs, controller) { ... }
+ *       // }
+ *       // or
+ *       // link: function postLink( ... ) { ... }
+ *     };
+ *     return directiveDefinitionObject;
+ *   });
+ * ```
+ *
+ * <div class="alert alert-warning">
+ * **Note:** Any unspecified options will use the default value. You can see the default values below.
+ * </div>
+ *
+ * Therefore the above can be simplified as:
+ *
+ * ```js
+ *   var myModule = angular.module(...);
+ *
+ *   myModule.directive('directiveName', function factory(injectables) {
+ *     var directiveDefinitionObject = {
+ *       link: function postLink(scope, iElement, iAttrs) { ... }
+ *     };
+ *     return directiveDefinitionObject;
+ *     // or
+ *     // return function postLink(scope, iElement, iAttrs) { ... }
+ *   });
+ * ```
+ *
+ *
+ *
+ * ### Directive Definition Object
+ *
+ * The directive definition object provides instructions to the {@link ng.$compile
+ * compiler}. The attributes are:
+ *
+ * #### `multiElement`
+ * When this property is set to true, the HTML compiler will collect DOM nodes between
+ * nodes with the attributes `directive-name-start` and `directive-name-end`, and group them
+ * together as the directive elements. It is recommended that this feature be used on directives
+ * which are not strictly behavioural (such as {@link ngClick}), and which
+ * do not manipulate or replace child nodes (such as {@link ngInclude}).
+ *
+ * #### `priority`
+ * When there are multiple directives defined on a single DOM element, sometimes it
+ * is necessary to specify the order in which the directives are applied. The `priority` is used
+ * to sort the directives before their `compile` functions get called. Priority is defined as a
+ * number. Directives with greater numerical `priority` are compiled first. Pre-link functions
+ * are also run in priority order, but post-link functions are run in reverse order. The order
+ * of directives with the same priority is undefined. The default priority is `0`.
+ *
+ * #### `terminal`
+ * If set to true then the current `priority` will be the last set of directives
+ * which will execute (any directives at the current priority will still execute
+ * as the order of execution on same `priority` is undefined). Note that expressions
+ * and other directives used in the directive's template will also be excluded from execution.
+ *
+ * #### `scope`
+ * The scope property can be `true`, an object or a falsy value:
+ *
+ * * **falsy:** No scope will be created for the directive. The directive will use its parent's scope.
+ *
+ * * **`true`:** A new child scope that prototypically inherits from its parent will be created for
+ * the directive's element. If multiple directives on the same element request a new scope,
+ * only one new scope is created. The new scope rule does not apply for the root of the template
+ * since the root of the template always gets a new scope.
+ *
+ * * **`{...}` (an object hash):** A new "isolate" scope is created for the directive's element. The
+ * 'isolate' scope differs from normal scope in that it does not prototypically inherit from its parent
+ * scope. This is useful when creating reusable components, which should not accidentally read or modify
+ * data in the parent scope.
+ *
+ * The 'isolate' scope object hash defines a set of local scope properties derived from attributes on the
+ * directive's element. These local properties are useful for aliasing values for templates. The keys in
+ * the object hash map to the name of the property on the isolate scope; the values define how the property
+ * is bound to the parent scope, via matching attributes on the directive's element:
+ *
+ * * `@` or `@attr` - bind a local scope property to the value of DOM attribute. The result is
+ *   always a string since DOM attributes are strings. If no `attr` name is specified  then the
+ *   attribute name is assumed to be the same as the local name.
+ *   Given `<widget my-attr="hello {{name}}">` and widget definition
+ *   of `scope: { localName:'@myAttr' }`, then widget scope property `localName` will reflect
+ *   the interpolated value of `hello {{name}}`. As the `name` attribute changes so will the
+ *   `localName` property on the widget scope. The `name` is read from the parent scope (not
+ *   component scope).
+ *
+ * * `=` or `=attr` - set up bi-directional binding between a local scope property and the
+ *   parent scope property of name defined via the value of the `attr` attribute. If no `attr`
+ *   name is specified then the attribute name is assumed to be the same as the local name.
+ *   Given `<widget my-attr="parentModel">` and widget definition of
+ *   `scope: { localModel:'=myAttr' }`, then widget scope property `localModel` will reflect the
+ *   value of `parentModel` on the parent scope. Any changes to `parentModel` will be reflected
+ *   in `localModel` and any changes in `localModel` will reflect in `parentModel`. If the parent
+ *   scope property doesn't exist, it will throw a NON_ASSIGNABLE_MODEL_EXPRESSION exception. You
+ *   can avoid this behavior using `=?` or `=?attr` in order to flag the property as optional. If
+ *   you want to shallow watch for changes (i.e. $watchCollection instead of $watch) you can use
+ *   `=*` or `=*attr` (`=*?` or `=*?attr` if the property is optional).
+ *
+ * * `&` or `&attr` - provides a way to execute an expression in the context of the parent scope.
+ *   If no `attr` name is specified then the attribute name is assumed to be the same as the
+ *   local name. Given `<widget my-attr="count = count + value">` and widget definition of
+ *   `scope: { localFn:'&myAttr' }`, then isolate scope property `localFn` will point to
+ *   a function wrapper for the `count = count + value` expression. Often it's desirable to
+ *   pass data from the isolated scope via an expression to the parent scope, this can be
+ *   done by passing a map of local variable names and values into the expression wrapper fn.
+ *   For example, if the expression is `increment(amount)` then we can specify the amount value
+ *   by calling the `localFn` as `localFn({amount: 22})`.
+ *
+ * In general it's possible to apply more than one directive to one element, but there might be limitations
+ * depending on the type of scope required by the directives. The following points will help explain these limitations.
+ * For simplicity only two directives are taken into account, but it is also applicable for several directives:
+ *
+ * * **no scope** + **no scope** => Two directives which don't require their own scope will use their parent's scope
+ * * **child scope** + **no scope** =>  Both directives will share one single child scope
+ * * **child scope** + **child scope** =>  Both directives will share one single child scope
+ * * **isolated scope** + **no scope** =>  The isolated directive will use it's own created isolated scope. The other directive will use
+ * its parent's scope
+ * * **isolated scope** + **child scope** =>  **Won't work!** Only one scope can be related to one element. Therefore these directives cannot
+ * be applied to the same element.
+ * * **isolated scope** + **isolated scope**  =>  **Won't work!** Only one scope can be related to one element. Therefore these directives
+ * cannot be applied to the same element.
+ *
+ *
+ * #### `bindToController`
+ * This property is used to bind scope properties directly to the controller. It can be either
+ * `true` or an object hash with the same format as the `scope` property. Additionally, a controller
+ * alias must be set, either by using `controllerAs: 'myAlias'` or by specifying the alias in the controller
+ * definition: `controller: 'myCtrl as myAlias'`.
+ *
+ * When an isolate scope is used for a directive (see above), `bindToController: true` will
+ * allow a component to have its properties bound to the controller, rather than to scope. When the controller
+ * is instantiated, the initial values of the isolate scope bindings are already available.
+ *
+ * It is also possible to set `bindToController` to an object hash with the same format as the `scope` property.
+ * This will set up the scope bindings to the controller directly. Note that `scope` can still be used
+ * to define which kind of scope is created. By default, no scope is created. Use `scope: {}` to create an isolate
+ * scope (useful for component directives).
+ *
+ * If both `bindToController` and `scope` are defined and have object hashes, `bindToController` overrides `scope`.
+ *
+ *
+ * #### `controller`
+ * Controller constructor function. The controller is instantiated before the
+ * pre-linking phase and can be accessed by other directives (see
+ * `require` attribute). This allows the directives to communicate with each other and augment
+ * each other's behavior. The controller is injectable (and supports bracket notation) with the following locals:
+ *
+ * * `$scope` - Current scope associated with the element
+ * * `$element` - Current element
+ * * `$attrs` - Current attributes object for the element
+ * * `$transclude` - A transclude linking function pre-bound to the correct transclusion scope:
+ *   `function([scope], cloneLinkingFn, futureParentElement)`.
+ *    * `scope`: optional argument to override the scope.
+ *    * `cloneLinkingFn`: optional argument to create clones of the original transcluded content.
+ *    * `futureParentElement`:
+ *        * defines the parent to which the `cloneLinkingFn` will add the cloned elements.
+ *        * default: `$element.parent()` resp. `$element` for `transclude:'element'` resp. `transclude:true`.
+ *        * only needed for transcludes that are allowed to contain non html elements (e.g. SVG elements)
+ *          and when the `cloneLinkinFn` is passed,
+ *          as those elements need to created and cloned in a special way when they are defined outside their
+ *          usual containers (e.g. like `<svg>`).
+ *        * See also the `directive.templateNamespace` property.
+ *
+ *
+ * #### `require`
+ * Require another directive and inject its controller as the fourth argument to the linking function. The
+ * `require` takes a string name (or array of strings) of the directive(s) to pass in. If an array is used, the
+ * injected argument will be an array in corresponding order. If no such directive can be
+ * found, or if the directive does not have a controller, then an error is raised (unless no link function
+ * is specified, in which case error checking is skipped). The name can be prefixed with:
+ *
+ * * (no prefix) - Locate the required controller on the current element. Throw an error if not found.
+ * * `?` - Attempt to locate the required controller or pass `null` to the `link` fn if not found.
+ * * `^` - Locate the required controller by searching the element and its parents. Throw an error if not found.
+ * * `^^` - Locate the required controller by searching the element's parents. Throw an error if not found.
+ * * `?^` - Attempt to locate the required controller by searching the element and its parents or pass
+ *   `null` to the `link` fn if not found.
+ * * `?^^` - Attempt to locate the required controller by searching the element's parents, or pass
+ *   `null` to the `link` fn if not found.
+ *
+ *
+ * #### `controllerAs`
+ * Identifier name for a reference to the controller in the directive's scope.
+ * This allows the controller to be referenced from the directive template. This is especially
+ * useful when a directive is used as component, i.e. with an `isolate` scope. It's also possible
+ * to use it in a directive without an `isolate` / `new` scope, but you need to be aware that the
+ * `controllerAs` reference might overwrite a property that already exists on the parent scope.
+ *
+ *
+ * #### `restrict`
+ * String of subset of `EACM` which restricts the directive to a specific directive
+ * declaration style. If omitted, the defaults (elements and attributes) are used.
+ *
+ * * `E` - Element name (default): `<my-directive></my-directive>`
+ * * `A` - Attribute (default): `<div my-directive="exp"></div>`
+ * * `C` - Class: `<div class="my-directive: exp;"></div>`
+ * * `M` - Comment: `<!-- directive: my-directive exp -->`
+ *
+ *
+ * #### `templateNamespace`
+ * String representing the document type used by the markup in the template.
+ * AngularJS needs this information as those elements need to be created and cloned
+ * in a special way when they are defined outside their usual containers like `<svg>` and `<math>`.
+ *
+ * * `html` - All root nodes in the template are HTML. Root nodes may also be
+ *   top-level elements such as `<svg>` or `<math>`.
+ * * `svg` - The root nodes in the template are SVG elements (excluding `<math>`).
+ * * `math` - The root nodes in the template are MathML elements (excluding `<svg>`).
+ *
+ * If no `templateNamespace` is specified, then the namespace is considered to be `html`.
+ *
+ * #### `template`
+ * HTML markup that may:
+ * * Replace the contents of the directive's element (default).
+ * * Replace the directive's element itself (if `replace` is true - DEPRECATED).
+ * * Wrap the contents of the directive's element (if `transclude` is true).
+ *
+ * Value may be:
+ *
+ * * A string. For example `<div red-on-hover>{{delete_str}}</div>`.
+ * * A function which takes two arguments `tElement` and `tAttrs` (described in the `compile`
+ *   function api below) and returns a string value.
+ *
+ *
+ * #### `templateUrl`
+ * This is similar to `template` but the template is loaded from the specified URL, asynchronously.
+ *
+ * Because template loading is asynchronous the compiler will suspend compilation of directives on that element
+ * for later when the template has been resolved.  In the meantime it will continue to compile and link
+ * sibling and parent elements as though this element had not contained any directives.
+ *
+ * The compiler does not suspend the entire compilation to wait for templates to be loaded because this
+ * would result in the whole app "stalling" until all templates are loaded asynchronously - even in the
+ * case when only one deeply nested directive has `templateUrl`.
+ *
+ * Template loading is asynchronous even if the template has been preloaded into the {@link $templateCache}
+ *
+ * You can specify `templateUrl` as a string representing the URL or as a function which takes two
+ * arguments `tElement` and `tAttrs` (described in the `compile` function api below) and returns
+ * a string value representing the url.  In either case, the template URL is passed through {@link
+ * $sce#getTrustedResourceUrl $sce.getTrustedResourceUrl}.
+ *
+ *
+ * #### `replace` ([*DEPRECATED*!], will be removed in next major release - i.e. v2.0)
+ * specify what the template should replace. Defaults to `false`.
+ *
+ * * `true` - the template will replace the directive's element.
+ * * `false` - the template will replace the contents of the directive's element.
+ *
+ * The replacement process migrates all of the attributes / classes from the old element to the new
+ * one. See the {@link guide/directive#template-expanding-directive
+ * Directives Guide} for an example.
+ *
+ * There are very few scenarios where element replacement is required for the application function,
+ * the main one being reusable custom components that are used within SVG contexts
+ * (because SVG doesn't work with custom elements in the DOM tree).
+ *
+ * #### `transclude`
+ * Extract the contents of the element where the directive appears and make it available to the directive.
+ * The contents are compiled and provided to the directive as a **transclusion function**. See the
+ * {@link $compile#transclusion Transclusion} section below.
+ *
+ * There are two kinds of transclusion depending upon whether you want to transclude just the contents of the
+ * directive's element or the entire element:
+ *
+ * * `true` - transclude the content (i.e. the child nodes) of the directive's element.
+ * * `'element'` - transclude the whole of the directive's element including any directives on this
+ *   element that defined at a lower priority than this directive. When used, the `template`
+ *   property is ignored.
+ *
+ *
+ * #### `compile`
+ *
+ * ```js
+ *   function compile(tElement, tAttrs, transclude) { ... }
+ * ```
+ *
+ * The compile function deals with transforming the template DOM. Since most directives do not do
+ * template transformation, it is not used often. The compile function takes the following arguments:
+ *
+ *   * `tElement` - template element - The element where the directive has been declared. It is
+ *     safe to do template transformation on the element and child elements only.
+ *
+ *   * `tAttrs` - template attributes - Normalized list of attributes declared on this element shared
+ *     between all directive compile functions.
+ *
+ *   * `transclude` -  [*DEPRECATED*!] A transclude linking function: `function(scope, cloneLinkingFn)`
+ *
+ * <div class="alert alert-warning">
+ * **Note:** The template instance and the link instance may be different objects if the template has
+ * been cloned. For this reason it is **not** safe to do anything other than DOM transformations that
+ * apply to all cloned DOM nodes within the compile function. Specifically, DOM listener registration
+ * should be done in a linking function rather than in a compile function.
+ * </div>
+
+ * <div class="alert alert-warning">
+ * **Note:** The compile function cannot handle directives that recursively use themselves in their
+ * own templates or compile functions. Compiling these directives results in an infinite loop and a
+ * stack overflow errors.
+ *
+ * This can be avoided by manually using $compile in the postLink function to imperatively compile
+ * a directive's template instead of relying on automatic template compilation via `template` or
+ * `templateUrl` declaration or manual compilation inside the compile function.
+ * </div>
+ *
+ * <div class="alert alert-danger">
+ * **Note:** The `transclude` function that is passed to the compile function is deprecated, as it
+ *   e.g. does not know about the right outer scope. Please use the transclude function that is passed
+ *   to the link function instead.
+ * </div>
+
+ * A compile function can have a return value which can be either a function or an object.
+ *
+ * * returning a (post-link) function - is equivalent to registering the linking function via the
+ *   `link` property of the config object when the compile function is empty.
+ *
+ * * returning an object with function(s) registered via `pre` and `post` properties - allows you to
+ *   control when a linking function should be called during the linking phase. See info about
+ *   pre-linking and post-linking functions below.
+ *
+ *
+ * #### `link`
+ * This property is used only if the `compile` property is not defined.
+ *
+ * ```js
+ *   function link(scope, iElement, iAttrs, controller, transcludeFn) { ... }
+ * ```
+ *
+ * The link function is responsible for registering DOM listeners as well as updating the DOM. It is
+ * executed after the template has been cloned. This is where most of the directive logic will be
+ * put.
+ *
+ *   * `scope` - {@link ng.$rootScope.Scope Scope} - The scope to be used by the
+ *     directive for registering {@link ng.$rootScope.Scope#$watch watches}.
+ *
+ *   * `iElement` - instance element - The element where the directive is to be used. It is safe to
+ *     manipulate the children of the element only in `postLink` function since the children have
+ *     already been linked.
+ *
+ *   * `iAttrs` - instance attributes - Normalized list of attributes declared on this element shared
+ *     between all directive linking functions.
+ *
+ *   * `controller` - the directive's required controller instance(s) - Instances are shared
+ *     among all directives, which allows the directives to use the controllers as a communication
+ *     channel. The exact value depends on the directive's `require` property:
+ *       * no controller(s) required: the directive's own controller, or `undefined` if it doesn't have one
+ *       * `string`: the controller instance
+ *       * `array`: array of controller instances
+ *
+ *     If a required controller cannot be found, and it is optional, the instance is `null`,
+ *     otherwise the {@link error:$compile:ctreq Missing Required Controller} error is thrown.
+ *
+ *     Note that you can also require the directive's own controller - it will be made available like
+ *     any other controller.
+ *
+ *   * `transcludeFn` - A transclude linking function pre-bound to the correct transclusion scope.
+ *     This is the same as the `$transclude`
+ *     parameter of directive controllers, see there for details.
+ *     `function([scope], cloneLinkingFn, futureParentElement)`.
+ *
+ * #### Pre-linking function
+ *
+ * Executed before the child elements are linked. Not safe to do DOM transformation since the
+ * compiler linking function will fail to locate the correct elements for linking.
+ *
+ * #### Post-linking function
+ *
+ * Executed after the child elements are linked.
+ *
+ * Note that child elements that contain `templateUrl` directives will not have been compiled
+ * and linked since they are waiting for their template to load asynchronously and their own
+ * compilation and linking has been suspended until that occurs.
+ *
+ * It is safe to do DOM transformation in the post-linking function on elements that are not waiting
+ * for their async templates to be resolved.
+ *
+ *
+ * ### Transclusion
+ *
+ * Transclusion is the process of extracting a collection of DOM elements from one part of the DOM and
+ * copying them to another part of the DOM, while maintaining their connection to the original AngularJS
+ * scope from where they were taken.
+ *
+ * Transclusion is used (often with {@link ngTransclude}) to insert the
+ * original contents of a directive's element into a specified place in the template of the directive.
+ * The benefit of transclusion, over simply moving the DOM elements manually, is that the transcluded
+ * content has access to the properties on the scope from which it was taken, even if the directive
+ * has isolated scope.
+ * See the {@link guide/directive#creating-a-directive-that-wraps-other-elements Directives Guide}.
+ *
+ * This makes it possible for the widget to have private state for its template, while the transcluded
+ * content has access to its originating scope.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** When testing an element transclude directive you must not place the directive at the root of the
+ * DOM fragment that is being compiled. See {@link guide/unit-testing#testing-transclusion-directives
+ * Testing Transclusion Directives}.
+ * </div>
+ *
+ * #### Transclusion Functions
+ *
+ * When a directive requests transclusion, the compiler extracts its contents and provides a **transclusion
+ * function** to the directive's `link` function and `controller`. This transclusion function is a special
+ * **linking function** that will return the compiled contents linked to a new transclusion scope.
+ *
+ * <div class="alert alert-info">
+ * If you are just using {@link ngTransclude} then you don't need to worry about this function, since
+ * ngTransclude will deal with it for us.
+ * </div>
+ *
+ * If you want to manually control the insertion and removal of the transcluded content in your directive
+ * then you must use this transclude function. When you call a transclude function it returns a a jqLite/JQuery
+ * object that contains the compiled DOM, which is linked to the correct transclusion scope.
+ *
+ * When you call a transclusion function you can pass in a **clone attach function**. This function accepts
+ * two parameters, `function(clone, scope) { ... }`, where the `clone` is a fresh compiled copy of your transcluded
+ * content and the `scope` is the newly created transclusion scope, to which the clone is bound.
+ *
+ * <div class="alert alert-info">
+ * **Best Practice**: Always provide a `cloneFn` (clone attach function) when you call a translude function
+ * since you then get a fresh clone of the original DOM and also have access to the new transclusion scope.
+ * </div>
+ *
+ * It is normal practice to attach your transcluded content (`clone`) to the DOM inside your **clone
+ * attach function**:
+ *
+ * ```js
+ * var transcludedContent, transclusionScope;
+ *
+ * $transclude(function(clone, scope) {
+ *   element.append(clone);
+ *   transcludedContent = clone;
+ *   transclusionScope = scope;
+ * });
+ * ```
+ *
+ * Later, if you want to remove the transcluded content from your DOM then you should also destroy the
+ * associated transclusion scope:
+ *
+ * ```js
+ * transcludedContent.remove();
+ * transclusionScope.$destroy();
+ * ```
+ *
+ * <div class="alert alert-info">
+ * **Best Practice**: if you intend to add and remove transcluded content manually in your directive
+ * (by calling the transclude function to get the DOM and calling `element.remove()` to remove it),
+ * then you are also responsible for calling `$destroy` on the transclusion scope.
+ * </div>
+ *
+ * The built-in DOM manipulation directives, such as {@link ngIf}, {@link ngSwitch} and {@link ngRepeat}
+ * automatically destroy their transluded clones as necessary so you do not need to worry about this if
+ * you are simply using {@link ngTransclude} to inject the transclusion into your directive.
+ *
+ *
+ * #### Transclusion Scopes
+ *
+ * When you call a transclude function it returns a DOM fragment that is pre-bound to a **transclusion
+ * scope**. This scope is special, in that it is a child of the directive's scope (and so gets destroyed
+ * when the directive's scope gets destroyed) but it inherits the properties of the scope from which it
+ * was taken.
+ *
+ * For example consider a directive that uses transclusion and isolated scope. The DOM hierarchy might look
+ * like this:
+ *
+ * ```html
+ * <div ng-app>
+ *   <div isolate>
+ *     <div transclusion>
+ *     </div>
+ *   </div>
+ * </div>
+ * ```
+ *
+ * The `$parent` scope hierarchy will look like this:
+ *
+   ```
+   - $rootScope
+     - isolate
+       - transclusion
+   ```
+ *
+ * but the scopes will inherit prototypically from different scopes to their `$parent`.
+ *
+   ```
+   - $rootScope
+     - transclusion
+   - isolate
+   ```
+ *
+ *
+ * ### Attributes
+ *
+ * The {@link ng.$compile.directive.Attributes Attributes} object - passed as a parameter in the
+ * `link()` or `compile()` functions. It has a variety of uses.
+ *
+ * accessing *Normalized attribute names:*
+ * Directives like 'ngBind' can be expressed in many ways: 'ng:bind', `data-ng-bind`, or 'x-ng-bind'.
+ * the attributes object allows for normalized access to
+ *   the attributes.
+ *
+ * * *Directive inter-communication:* All directives share the same instance of the attributes
+ *   object which allows the directives to use the attributes object as inter directive
+ *   communication.
+ *
+ * * *Supports interpolation:* Interpolation attributes are assigned to the attribute object
+ *   allowing other directives to read the interpolated value.
+ *
+ * * *Observing interpolated attributes:* Use `$observe` to observe the value changes of attributes
+ *   that contain interpolation (e.g. `src="{{bar}}"`). Not only is this very efficient but it's also
+ *   the only way to easily get the actual value because during the linking phase the interpolation
+ *   hasn't been evaluated yet and so the value is at this time set to `undefined`.
+ *
+ * ```js
+ * function linkingFn(scope, elm, attrs, ctrl) {
+ *   // get the attribute value
+ *   console.log(attrs.ngModel);
+ *
+ *   // change the attribute
+ *   attrs.$set('ngModel', 'new value');
+ *
+ *   // observe changes to interpolated attribute
+ *   attrs.$observe('ngModel', function(value) {
+ *     console.log('ngModel has changed value to ' + value);
+ *   });
+ * }
+ * ```
+ *
+ * ## Example
+ *
+ * <div class="alert alert-warning">
+ * **Note**: Typically directives are registered with `module.directive`. The example below is
+ * to illustrate how `$compile` works.
+ * </div>
+ *
+ <example module="compileExample">
+   <file name="index.html">
+    <script>
+      angular.module('compileExample', [], function($compileProvider) {
+        // configure new 'compile' directive by passing a directive
+        // factory function. The factory function injects the '$compile'
+        $compileProvider.directive('compile', function($compile) {
+          // directive factory creates a link function
+          return function(scope, element, attrs) {
+            scope.$watch(
+              function(scope) {
+                 // watch the 'compile' expression for changes
+                return scope.$eval(attrs.compile);
+              },
+              function(value) {
+                // when the 'compile' expression changes
+                // assign it into the current DOM
+                element.html(value);
+
+                // compile the new DOM and link it to the current
+                // scope.
+                // NOTE: we only compile .childNodes so that
+                // we don't get into infinite loop compiling ourselves
+                $compile(element.contents())(scope);
+              }
+            );
+          };
+        });
+      })
+      .controller('GreeterController', ['$scope', function($scope) {
+        $scope.name = 'Angular';
+        $scope.html = 'Hello {{name}}';
+      }]);
+    </script>
+    <div ng-controller="GreeterController">
+      <input ng-model="name"> <br/>
+      <textarea ng-model="html"></textarea> <br/>
+      <div compile="html"></div>
+    </div>
+   </file>
+   <file name="protractor.js" type="protractor">
+     it('should auto compile', function() {
+       var textarea = $('textarea');
+       var output = $('div[compile]');
+       // The initial state reads 'Hello Angular'.
+       expect(output.getText()).toBe('Hello Angular');
+       textarea.clear();
+       textarea.sendKeys('{{name}}!');
+       expect(output.getText()).toBe('Angular!');
+     });
+   </file>
+ </example>
+
+ *
+ *
+ * @param {string|DOMElement} element Element or HTML string to compile into a template function.
+ * @param {function(angular.Scope, cloneAttachFn=)} transclude function available to directives - DEPRECATED.
+ *
+ * <div class="alert alert-danger">
+ * **Note:** Passing a `transclude` function to the $compile function is deprecated, as it
+ *   e.g. will not use the right outer scope. Please pass the transclude function as a
+ *   `parentBoundTranscludeFn` to the link function instead.
+ * </div>
+ *
+ * @param {number} maxPriority only apply directives lower than given priority (Only effects the
+ *                 root element(s), not their children)
+ * @returns {function(scope, cloneAttachFn=, options=)} a link function which is used to bind template
+ * (a DOM element/tree) to a scope. Where:
+ *
+ *  * `scope` - A {@link ng.$rootScope.Scope Scope} to bind to.
+ *  * `cloneAttachFn` - If `cloneAttachFn` is provided, then the link function will clone the
+ *  `template` and call the `cloneAttachFn` function allowing the caller to attach the
+ *  cloned elements to the DOM document at the appropriate place. The `cloneAttachFn` is
+ *  called as: <br/> `cloneAttachFn(clonedElement, scope)` where:
+ *
+ *      * `clonedElement` - is a clone of the original `element` passed into the compiler.
+ *      * `scope` - is the current scope with which the linking function is working with.
+ *
+ *  * `options` - An optional object hash with linking options. If `options` is provided, then the following
+ *  keys may be used to control linking behavior:
+ *
+ *      * `parentBoundTranscludeFn` - the transclude function made available to
+ *        directives; if given, it will be passed through to the link functions of
+ *        directives found in `element` during compilation.
+ *      * `transcludeControllers` - an object hash with keys that map controller names
+ *        to a hash with the key `instance`, which maps to the controller instance;
+ *        if given, it will make the controllers available to directives on the compileNode:
+ *        ```
+ *        {
+ *          parent: {
+ *            instance: parentControllerInstance
+ *          }
+ *        }
+ *        ```
+ *      * `futureParentElement` - defines the parent to which the `cloneAttachFn` will add
+ *        the cloned elements; only needed for transcludes that are allowed to contain non html
+ *        elements (e.g. SVG elements). See also the directive.controller property.
+ *
+ * Calling the linking function returns the element of the template. It is either the original
+ * element passed in, or the clone of the element if the `cloneAttachFn` is provided.
+ *
+ * After linking the view is not updated until after a call to $digest which typically is done by
+ * Angular automatically.
+ *
+ * If you need access to the bound view, there are two ways to do it:
+ *
+ * - If you are not asking the linking function to clone the template, create the DOM element(s)
+ *   before you send them to the compiler and keep this reference around.
+ *   ```js
+ *     var element = $compile('<p>{{total}}</p>')(scope);
+ *   ```
+ *
+ * - if on the other hand, you need the element to be cloned, the view reference from the original
+ *   example would not point to the clone, but rather to the original template that was cloned. In
+ *   this case, you can access the clone via the cloneAttachFn:
+ *   ```js
+ *     var templateElement = angular.element('<p>{{total}}</p>'),
+ *         scope = ....;
+ *
+ *     var clonedElement = $compile(templateElement)(scope, function(clonedElement, scope) {
+ *       //attach the clone to DOM document at the right place
+ *     });
+ *
+ *     //now we have reference to the cloned DOM via `clonedElement`
+ *   ```
+ *
+ *
+ * For information on how the compiler works, see the
+ * {@link guide/compiler Angular HTML Compiler} section of the Developer Guide.
+ */
+
+var $compileMinErr = minErr('$compile');
+
+/**
+ * @ngdoc provider
+ * @name $compileProvider
+ *
+ * @description
+ */
+$CompileProvider.$inject = ['$provide', '$$sanitizeUriProvider'];
+function $CompileProvider($provide, $$sanitizeUriProvider) {
+  var hasDirectives = {},
+      Suffix = 'Directive',
+      COMMENT_DIRECTIVE_REGEXP = /^\s*directive\:\s*([\w\-]+)\s+(.*)$/,
+      CLASS_DIRECTIVE_REGEXP = /(([\w\-]+)(?:\:([^;]+))?;?)/,
+      ALL_OR_NOTHING_ATTRS = makeMap('ngSrc,ngSrcset,src,srcset'),
+      REQUIRE_PREFIX_REGEXP = /^(?:(\^\^?)?(\?)?(\^\^?)?)?/;
+
+  // Ref: http://developers.whatwg.org/webappapis.html#event-handler-idl-attributes
+  // The assumption is that future DOM event attribute names will begin with
+  // 'on' and be composed of only English letters.
+  var EVENT_HANDLER_ATTR_REGEXP = /^(on[a-z]+|formaction)$/;
+
+  function parseIsolateBindings(scope, directiveName, isController) {
+    var LOCAL_REGEXP = /^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/;
+
+    var bindings = {};
+
+    forEach(scope, function(definition, scopeName) {
+      var match = definition.match(LOCAL_REGEXP);
+
+      if (!match) {
+        throw $compileMinErr('iscp',
+            "Invalid {3} for directive '{0}'." +
+            " Definition: {... {1}: '{2}' ...}",
+            directiveName, scopeName, definition,
+            (isController ? "controller bindings definition" :
+            "isolate scope definition"));
+      }
+
+      bindings[scopeName] = {
+        mode: match[1][0],
+        collection: match[2] === '*',
+        optional: match[3] === '?',
+        attrName: match[4] || scopeName
+      };
+    });
+
+    return bindings;
+  }
+
+  function parseDirectiveBindings(directive, directiveName) {
+    var bindings = {
+      isolateScope: null,
+      bindToController: null
+    };
+    if (isObject(directive.scope)) {
+      if (directive.bindToController === true) {
+        bindings.bindToController = parseIsolateBindings(directive.scope,
+                                                         directiveName, true);
+        bindings.isolateScope = {};
+      } else {
+        bindings.isolateScope = parseIsolateBindings(directive.scope,
+                                                     directiveName, false);
+      }
+    }
+    if (isObject(directive.bindToController)) {
+      bindings.bindToController =
+          parseIsolateBindings(directive.bindToController, directiveName, true);
+    }
+    if (isObject(bindings.bindToController)) {
+      var controller = directive.controller;
+      var controllerAs = directive.controllerAs;
+      if (!controller) {
+        // There is no controller, there may or may not be a controllerAs property
+        throw $compileMinErr('noctrl',
+              "Cannot bind to controller without directive '{0}'s controller.",
+              directiveName);
+      } else if (!identifierForController(controller, controllerAs)) {
+        // There is a controller, but no identifier or controllerAs property
+        throw $compileMinErr('noident',
+              "Cannot bind to controller without identifier for directive '{0}'.",
+              directiveName);
+      }
+    }
+    return bindings;
+  }
+
+  function assertValidDirectiveName(name) {
+    var letter = name.charAt(0);
+    if (!letter || letter !== lowercase(letter)) {
+      throw $compileMinErr('baddir', "Directive name '{0}' is invalid. The first character must be a lowercase letter", name);
+    }
+    if (name !== name.trim()) {
+      throw $compileMinErr('baddir',
+            "Directive name '{0}' is invalid. The name should not contain leading or trailing whitespaces",
+            name);
+    }
+  }
+
+  /**
+   * @ngdoc method
+   * @name $compileProvider#directive
+   * @kind function
+   *
+   * @description
+   * Register a new directive with the compiler.
+   *
+   * @param {string|Object} name Name of the directive in camel-case (i.e. <code>ngBind</code> which
+   *    will match as <code>ng-bind</code>), or an object map of directives where the keys are the
+   *    names and the values are the factories.
+   * @param {Function|Array} directiveFactory An injectable directive factory function. See
+   *    {@link guide/directive} for more info.
+   * @returns {ng.$compileProvider} Self for chaining.
+   */
+   this.directive = function registerDirective(name, directiveFactory) {
+    assertNotHasOwnProperty(name, 'directive');
+    if (isString(name)) {
+      assertValidDirectiveName(name);
+      assertArg(directiveFactory, 'directiveFactory');
+      if (!hasDirectives.hasOwnProperty(name)) {
+        hasDirectives[name] = [];
+        $provide.factory(name + Suffix, ['$injector', '$exceptionHandler',
+          function($injector, $exceptionHandler) {
+            var directives = [];
+            forEach(hasDirectives[name], function(directiveFactory, index) {
+              try {
+                var directive = $injector.invoke(directiveFactory);
+                if (isFunction(directive)) {
+                  directive = { compile: valueFn(directive) };
+                } else if (!directive.compile && directive.link) {
+                  directive.compile = valueFn(directive.link);
+                }
+                directive.priority = directive.priority || 0;
+                directive.index = index;
+                directive.name = directive.name || name;
+                directive.require = directive.require || (directive.controller && directive.name);
+                directive.restrict = directive.restrict || 'EA';
+                var bindings = directive.$$bindings =
+                    parseDirectiveBindings(directive, directive.name);
+                if (isObject(bindings.isolateScope)) {
+                  directive.$$isolateBindings = bindings.isolateScope;
+                }
+                directive.$$moduleName = directiveFactory.$$moduleName;
+                directives.push(directive);
+              } catch (e) {
+                $exceptionHandler(e);
+              }
+            });
+            return directives;
+          }]);
+      }
+      hasDirectives[name].push(directiveFactory);
+    } else {
+      forEach(name, reverseParams(registerDirective));
+    }
+    return this;
+  };
+
+
+  /**
+   * @ngdoc method
+   * @name $compileProvider#aHrefSanitizationWhitelist
+   * @kind function
+   *
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during a[href] sanitization.
+   *
+   * The sanitization is a security measure aimed at preventing XSS attacks via html links.
+   *
+   * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.aHrefSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      $$sanitizeUriProvider.aHrefSanitizationWhitelist(regexp);
+      return this;
+    } else {
+      return $$sanitizeUriProvider.aHrefSanitizationWhitelist();
+    }
+  };
+
+
+  /**
+   * @ngdoc method
+   * @name $compileProvider#imgSrcSanitizationWhitelist
+   * @kind function
+   *
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during img[src] sanitization.
+   *
+   * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+   *
+   * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.imgSrcSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      $$sanitizeUriProvider.imgSrcSanitizationWhitelist(regexp);
+      return this;
+    } else {
+      return $$sanitizeUriProvider.imgSrcSanitizationWhitelist();
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name  $compileProvider#debugInfoEnabled
+   *
+   * @param {boolean=} enabled update the debugInfoEnabled state if provided, otherwise just return the
+   * current debugInfoEnabled state
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
+   *
+   * @kind function
+   *
+   * @description
+   * Call this method to enable/disable various debug runtime information in the compiler such as adding
+   * binding information and a reference to the current scope on to DOM elements.
+   * If enabled, the compiler will add the following to DOM elements that have been bound to the scope
+   * * `ng-binding` CSS class
+   * * `$binding` data property containing an array of the binding expressions
+   *
+   * You may want to disable this in production for a significant performance boost. See
+   * {@link guide/production#disabling-debug-data Disabling Debug Data} for more.
+   *
+   * The default value is true.
+   */
+  var debugInfoEnabled = true;
+  this.debugInfoEnabled = function(enabled) {
+    if (isDefined(enabled)) {
+      debugInfoEnabled = enabled;
+      return this;
+    }
+    return debugInfoEnabled;
+  };
+
+  this.$get = [
+            '$injector', '$interpolate', '$exceptionHandler', '$templateRequest', '$parse',
+            '$controller', '$rootScope', '$sce', '$animate', '$$sanitizeUri',
+    function($injector,   $interpolate,   $exceptionHandler,   $templateRequest,   $parse,
+             $controller,   $rootScope,   $sce,   $animate,   $$sanitizeUri) {
+
+    var Attributes = function(element, attributesToCopy) {
+      if (attributesToCopy) {
+        var keys = Object.keys(attributesToCopy);
+        var i, l, key;
+
+        for (i = 0, l = keys.length; i < l; i++) {
+          key = keys[i];
+          this[key] = attributesToCopy[key];
+        }
+      } else {
+        this.$attr = {};
+      }
+
+      this.$$element = element;
+    };
+
+    Attributes.prototype = {
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$normalize
+       * @kind function
+       *
+       * @description
+       * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with `x-` or
+       * `data-`) to its normalized, camelCase form.
+       *
+       * Also there is special case for Moz prefix starting with upper case letter.
+       *
+       * For further information check out the guide on {@link guide/directive#matching-directives Matching Directives}
+       *
+       * @param {string} name Name to normalize
+       */
+      $normalize: directiveNormalize,
+
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$addClass
+       * @kind function
+       *
+       * @description
+       * Adds the CSS class value specified by the classVal parameter to the element. If animations
+       * are enabled then an animation will be triggered for the class addition.
+       *
+       * @param {string} classVal The className value that will be added to the element
+       */
+      $addClass: function(classVal) {
+        if (classVal && classVal.length > 0) {
+          $animate.addClass(this.$$element, classVal);
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$removeClass
+       * @kind function
+       *
+       * @description
+       * Removes the CSS class value specified by the classVal parameter from the element. If
+       * animations are enabled then an animation will be triggered for the class removal.
+       *
+       * @param {string} classVal The className value that will be removed from the element
+       */
+      $removeClass: function(classVal) {
+        if (classVal && classVal.length > 0) {
+          $animate.removeClass(this.$$element, classVal);
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$updateClass
+       * @kind function
+       *
+       * @description
+       * Adds and removes the appropriate CSS class values to the element based on the difference
+       * between the new and old CSS class values (specified as newClasses and oldClasses).
+       *
+       * @param {string} newClasses The current CSS className value
+       * @param {string} oldClasses The former CSS className value
+       */
+      $updateClass: function(newClasses, oldClasses) {
+        var toAdd = tokenDifference(newClasses, oldClasses);
+        if (toAdd && toAdd.length) {
+          $animate.addClass(this.$$element, toAdd);
+        }
+
+        var toRemove = tokenDifference(oldClasses, newClasses);
+        if (toRemove && toRemove.length) {
+          $animate.removeClass(this.$$element, toRemove);
+        }
+      },
+
+      /**
+       * Set a normalized attribute on the element in a way such that all directives
+       * can share the attribute. This function properly handles boolean attributes.
+       * @param {string} key Normalized key. (ie ngAttribute)
+       * @param {string|boolean} value The value to set. If `null` attribute will be deleted.
+       * @param {boolean=} writeAttr If false, does not write the value to DOM element attribute.
+       *     Defaults to true.
+       * @param {string=} attrName Optional none normalized name. Defaults to key.
+       */
+      $set: function(key, value, writeAttr, attrName) {
+        // TODO: decide whether or not to throw an error if "class"
+        //is set through this function since it may cause $updateClass to
+        //become unstable.
+
+        var node = this.$$element[0],
+            booleanKey = getBooleanAttrName(node, key),
+            aliasedKey = getAliasedAttrName(key),
+            observer = key,
+            nodeName;
+
+        if (booleanKey) {
+          this.$$element.prop(key, value);
+          attrName = booleanKey;
+        } else if (aliasedKey) {
+          this[aliasedKey] = value;
+          observer = aliasedKey;
+        }
+
+        this[key] = value;
+
+        // translate normalized key to actual key
+        if (attrName) {
+          this.$attr[key] = attrName;
+        } else {
+          attrName = this.$attr[key];
+          if (!attrName) {
+            this.$attr[key] = attrName = snake_case(key, '-');
+          }
+        }
+
+        nodeName = nodeName_(this.$$element);
+
+        if ((nodeName === 'a' && key === 'href') ||
+            (nodeName === 'img' && key === 'src')) {
+          // sanitize a[href] and img[src] values
+          this[key] = value = $$sanitizeUri(value, key === 'src');
+        } else if (nodeName === 'img' && key === 'srcset') {
+          // sanitize img[srcset] values
+          var result = "";
+
+          // first check if there are spaces because it's not the same pattern
+          var trimmedSrcset = trim(value);
+          //                (   999x   ,|   999w   ,|   ,|,   )
+          var srcPattern = /(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/;
+          var pattern = /\s/.test(trimmedSrcset) ? srcPattern : /(,)/;
+
+          // split srcset into tuple of uri and descriptor except for the last item
+          var rawUris = trimmedSrcset.split(pattern);
+
+          // for each tuples
+          var nbrUrisWith2parts = Math.floor(rawUris.length / 2);
+          for (var i = 0; i < nbrUrisWith2parts; i++) {
+            var innerIdx = i * 2;
+            // sanitize the uri
+            result += $$sanitizeUri(trim(rawUris[innerIdx]), true);
+            // add the descriptor
+            result += (" " + trim(rawUris[innerIdx + 1]));
+          }
+
+          // split the last item into uri and descriptor
+          var lastTuple = trim(rawUris[i * 2]).split(/\s/);
+
+          // sanitize the last uri
+          result += $$sanitizeUri(trim(lastTuple[0]), true);
+
+          // and add the last descriptor if any
+          if (lastTuple.length === 2) {
+            result += (" " + trim(lastTuple[1]));
+          }
+          this[key] = value = result;
+        }
+
+        if (writeAttr !== false) {
+          if (value === null || isUndefined(value)) {
+            this.$$element.removeAttr(attrName);
+          } else {
+            this.$$element.attr(attrName, value);
+          }
+        }
+
+        // fire observers
+        var $$observers = this.$$observers;
+        $$observers && forEach($$observers[observer], function(fn) {
+          try {
+            fn(value);
+          } catch (e) {
+            $exceptionHandler(e);
+          }
+        });
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $compile.directive.Attributes#$observe
+       * @kind function
+       *
+       * @description
+       * Observes an interpolated attribute.
+       *
+       * The observer function will be invoked once during the next `$digest` following
+       * compilation. The observer is then invoked whenever the interpolated value
+       * changes.
+       *
+       * @param {string} key Normalized key. (ie ngAttribute) .
+       * @param {function(interpolatedValue)} fn Function that will be called whenever
+                the interpolated value of the attribute changes.
+       *        See the {@link guide/interpolation#how-text-and-attribute-bindings-work Interpolation
+       *        guide} for more info.
+       * @returns {function()} Returns a deregistration function for this observer.
+       */
+      $observe: function(key, fn) {
+        var attrs = this,
+            $$observers = (attrs.$$observers || (attrs.$$observers = createMap())),
+            listeners = ($$observers[key] || ($$observers[key] = []));
+
+        listeners.push(fn);
+        $rootScope.$evalAsync(function() {
+          if (!listeners.$$inter && attrs.hasOwnProperty(key) && !isUndefined(attrs[key])) {
+            // no one registered attribute interpolation function, so lets call it manually
+            fn(attrs[key]);
+          }
+        });
+
+        return function() {
+          arrayRemove(listeners, fn);
+        };
+      }
+    };
+
+
+    function safeAddClass($element, className) {
+      try {
+        $element.addClass(className);
+      } catch (e) {
+        // ignore, since it means that we are trying to set class on
+        // SVG element, where class name is read-only.
+      }
+    }
+
+
+    var startSymbol = $interpolate.startSymbol(),
+        endSymbol = $interpolate.endSymbol(),
+        denormalizeTemplate = (startSymbol == '{{' || endSymbol  == '}}')
+            ? identity
+            : function denormalizeTemplate(template) {
+              return template.replace(/\{\{/g, startSymbol).replace(/}}/g, endSymbol);
+        },
+        NG_ATTR_BINDING = /^ngAttr[A-Z]/;
+    var MULTI_ELEMENT_DIR_RE = /^(.+)Start$/;
+
+    compile.$$addBindingInfo = debugInfoEnabled ? function $$addBindingInfo($element, binding) {
+      var bindings = $element.data('$binding') || [];
+
+      if (isArray(binding)) {
+        bindings = bindings.concat(binding);
+      } else {
+        bindings.push(binding);
+      }
+
+      $element.data('$binding', bindings);
+    } : noop;
+
+    compile.$$addBindingClass = debugInfoEnabled ? function $$addBindingClass($element) {
+      safeAddClass($element, 'ng-binding');
+    } : noop;
+
+    compile.$$addScopeInfo = debugInfoEnabled ? function $$addScopeInfo($element, scope, isolated, noTemplate) {
+      var dataName = isolated ? (noTemplate ? '$isolateScopeNoTemplate' : '$isolateScope') : '$scope';
+      $element.data(dataName, scope);
+    } : noop;
+
+    compile.$$addScopeClass = debugInfoEnabled ? function $$addScopeClass($element, isolated) {
+      safeAddClass($element, isolated ? 'ng-isolate-scope' : 'ng-scope');
+    } : noop;
+
+    return compile;
+
+    //================================
+
+    function compile($compileNodes, transcludeFn, maxPriority, ignoreDirective,
+                        previousCompileContext) {
+      if (!($compileNodes instanceof jqLite)) {
+        // jquery always rewraps, whereas we need to preserve the original selector so that we can
+        // modify it.
+        $compileNodes = jqLite($compileNodes);
+      }
+      // We can not compile top level text elements since text nodes can be merged and we will
+      // not be able to attach scope data to them, so we will wrap them in <span>
+      forEach($compileNodes, function(node, index) {
+        if (node.nodeType == NODE_TYPE_TEXT && node.nodeValue.match(/\S+/) /* non-empty */ ) {
+          $compileNodes[index] = jqLite(node).wrap('<span></span>').parent()[0];
+        }
+      });
+      var compositeLinkFn =
+              compileNodes($compileNodes, transcludeFn, $compileNodes,
+                           maxPriority, ignoreDirective, previousCompileContext);
+      compile.$$addScopeClass($compileNodes);
+      var namespace = null;
+      return function publicLinkFn(scope, cloneConnectFn, options) {
+        assertArg(scope, 'scope');
+
+        if (previousCompileContext && previousCompileContext.needsNewScope) {
+          // A parent directive did a replace and a directive on this element asked
+          // for transclusion, which caused us to lose a layer of element on which
+          // we could hold the new transclusion scope, so we will create it manually
+          // here.
+          scope = scope.$parent.$new();
+        }
+
+        options = options || {};
+        var parentBoundTranscludeFn = options.parentBoundTranscludeFn,
+          transcludeControllers = options.transcludeControllers,
+          futureParentElement = options.futureParentElement;
+
+        // When `parentBoundTranscludeFn` is passed, it is a
+        // `controllersBoundTransclude` function (it was previously passed
+        // as `transclude` to directive.link) so we must unwrap it to get
+        // its `boundTranscludeFn`
+        if (parentBoundTranscludeFn && parentBoundTranscludeFn.$$boundTransclude) {
+          parentBoundTranscludeFn = parentBoundTranscludeFn.$$boundTransclude;
+        }
+
+        if (!namespace) {
+          namespace = detectNamespaceForChildElements(futureParentElement);
+        }
+        var $linkNode;
+        if (namespace !== 'html') {
+          // When using a directive with replace:true and templateUrl the $compileNodes
+          // (or a child element inside of them)
+          // might change, so we need to recreate the namespace adapted compileNodes
+          // for call to the link function.
+          // Note: This will already clone the nodes...
+          $linkNode = jqLite(
+            wrapTemplate(namespace, jqLite('<div>').append($compileNodes).html())
+          );
+        } else if (cloneConnectFn) {
+          // important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
+          // and sometimes changes the structure of the DOM.
+          $linkNode = JQLitePrototype.clone.call($compileNodes);
+        } else {
+          $linkNode = $compileNodes;
+        }
+
+        if (transcludeControllers) {
+          for (var controllerName in transcludeControllers) {
+            $linkNode.data('$' + controllerName + 'Controller', transcludeControllers[controllerName].instance);
+          }
+        }
+
+        compile.$$addScopeInfo($linkNode, scope);
+
+        if (cloneConnectFn) cloneConnectFn($linkNode, scope);
+        if (compositeLinkFn) compositeLinkFn(scope, $linkNode, $linkNode, parentBoundTranscludeFn);
+        return $linkNode;
+      };
+    }
+
+    function detectNamespaceForChildElements(parentElement) {
+      // TODO: Make this detect MathML as well...
+      var node = parentElement && parentElement[0];
+      if (!node) {
+        return 'html';
+      } else {
+        return nodeName_(node) !== 'foreignobject' && node.toString().match(/SVG/) ? 'svg' : 'html';
+      }
+    }
+
+    /**
+     * Compile function matches each node in nodeList against the directives. Once all directives
+     * for a particular node are collected their compile functions are executed. The compile
+     * functions return values - the linking functions - are combined into a composite linking
+     * function, which is the a linking function for the node.
+     *
+     * @param {NodeList} nodeList an array of nodes or NodeList to compile
+     * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the
+     *        scope argument is auto-generated to the new child of the transcluded parent scope.
+     * @param {DOMElement=} $rootElement If the nodeList is the root of the compilation tree then
+     *        the rootElement must be set the jqLite collection of the compile root. This is
+     *        needed so that the jqLite collection items can be replaced with widgets.
+     * @param {number=} maxPriority Max directive priority.
+     * @returns {Function} A composite linking function of all of the matched directives or null.
+     */
+    function compileNodes(nodeList, transcludeFn, $rootElement, maxPriority, ignoreDirective,
+                            previousCompileContext) {
+      var linkFns = [],
+          attrs, directives, nodeLinkFn, childNodes, childLinkFn, linkFnFound, nodeLinkFnFound;
+
+      for (var i = 0; i < nodeList.length; i++) {
+        attrs = new Attributes();
+
+        // we must always refer to nodeList[i] since the nodes can be replaced underneath us.
+        directives = collectDirectives(nodeList[i], [], attrs, i === 0 ? maxPriority : undefined,
+                                        ignoreDirective);
+
+        nodeLinkFn = (directives.length)
+            ? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement,
+                                      null, [], [], previousCompileContext)
+            : null;
+
+        if (nodeLinkFn && nodeLinkFn.scope) {
+          compile.$$addScopeClass(attrs.$$element);
+        }
+
+        childLinkFn = (nodeLinkFn && nodeLinkFn.terminal ||
+                      !(childNodes = nodeList[i].childNodes) ||
+                      !childNodes.length)
+            ? null
+            : compileNodes(childNodes,
+                 nodeLinkFn ? (
+                  (nodeLinkFn.transcludeOnThisElement || !nodeLinkFn.templateOnThisElement)
+                     && nodeLinkFn.transclude) : transcludeFn);
+
+        if (nodeLinkFn || childLinkFn) {
+          linkFns.push(i, nodeLinkFn, childLinkFn);
+          linkFnFound = true;
+          nodeLinkFnFound = nodeLinkFnFound || nodeLinkFn;
+        }
+
+        //use the previous context only for the first element in the virtual group
+        previousCompileContext = null;
+      }
+
+      // return a linking function if we have found anything, null otherwise
+      return linkFnFound ? compositeLinkFn : null;
+
+      function compositeLinkFn(scope, nodeList, $rootElement, parentBoundTranscludeFn) {
+        var nodeLinkFn, childLinkFn, node, childScope, i, ii, idx, childBoundTranscludeFn;
+        var stableNodeList;
+
+
+        if (nodeLinkFnFound) {
+          // copy nodeList so that if a nodeLinkFn removes or adds an element at this DOM level our
+          // offsets don't get screwed up
+          var nodeListLength = nodeList.length;
+          stableNodeList = new Array(nodeListLength);
+
+          // create a sparse array by only copying the elements which have a linkFn
+          for (i = 0; i < linkFns.length; i+=3) {
+            idx = linkFns[i];
+            stableNodeList[idx] = nodeList[idx];
+          }
+        } else {
+          stableNodeList = nodeList;
+        }
+
+        for (i = 0, ii = linkFns.length; i < ii;) {
+          node = stableNodeList[linkFns[i++]];
+          nodeLinkFn = linkFns[i++];
+          childLinkFn = linkFns[i++];
+
+          if (nodeLinkFn) {
+            if (nodeLinkFn.scope) {
+              childScope = scope.$new();
+              compile.$$addScopeInfo(jqLite(node), childScope);
+            } else {
+              childScope = scope;
+            }
+
+            if (nodeLinkFn.transcludeOnThisElement) {
+              childBoundTranscludeFn = createBoundTranscludeFn(
+                  scope, nodeLinkFn.transclude, parentBoundTranscludeFn);
+
+            } else if (!nodeLinkFn.templateOnThisElement && parentBoundTranscludeFn) {
+              childBoundTranscludeFn = parentBoundTranscludeFn;
+
+            } else if (!parentBoundTranscludeFn && transcludeFn) {
+              childBoundTranscludeFn = createBoundTranscludeFn(scope, transcludeFn);
+
+            } else {
+              childBoundTranscludeFn = null;
+            }
+
+            nodeLinkFn(childLinkFn, childScope, node, $rootElement, childBoundTranscludeFn);
+
+          } else if (childLinkFn) {
+            childLinkFn(scope, node.childNodes, undefined, parentBoundTranscludeFn);
+          }
+        }
+      }
+    }
+
+    function createBoundTranscludeFn(scope, transcludeFn, previousBoundTranscludeFn) {
+
+      var boundTranscludeFn = function(transcludedScope, cloneFn, controllers, futureParentElement, containingScope) {
+
+        if (!transcludedScope) {
+          transcludedScope = scope.$new(false, containingScope);
+          transcludedScope.$$transcluded = true;
+        }
+
+        return transcludeFn(transcludedScope, cloneFn, {
+          parentBoundTranscludeFn: previousBoundTranscludeFn,
+          transcludeControllers: controllers,
+          futureParentElement: futureParentElement
+        });
+      };
+
+      return boundTranscludeFn;
+    }
+
+    /**
+     * Looks for directives on the given node and adds them to the directive collection which is
+     * sorted.
+     *
+     * @param node Node to search.
+     * @param directives An array to which the directives are added to. This array is sorted before
+     *        the function returns.
+     * @param attrs The shared attrs object which is used to populate the normalized attributes.
+     * @param {number=} maxPriority Max directive priority.
+     */
+    function collectDirectives(node, directives, attrs, maxPriority, ignoreDirective) {
+      var nodeType = node.nodeType,
+          attrsMap = attrs.$attr,
+          match,
+          className;
+
+      switch (nodeType) {
+        case NODE_TYPE_ELEMENT: /* Element */
+          // use the node name: <directive>
+          addDirective(directives,
+              directiveNormalize(nodeName_(node)), 'E', maxPriority, ignoreDirective);
+
+          // iterate over the attributes
+          for (var attr, name, nName, ngAttrName, value, isNgAttr, nAttrs = node.attributes,
+                   j = 0, jj = nAttrs && nAttrs.length; j < jj; j++) {
+            var attrStartName = false;
+            var attrEndName = false;
+
+            attr = nAttrs[j];
+            name = attr.name;
+            value = trim(attr.value);
+
+            // support ngAttr attribute binding
+            ngAttrName = directiveNormalize(name);
+            if (isNgAttr = NG_ATTR_BINDING.test(ngAttrName)) {
+              name = name.replace(PREFIX_REGEXP, '')
+                .substr(8).replace(/_(.)/g, function(match, letter) {
+                  return letter.toUpperCase();
+                });
+            }
+
+            var multiElementMatch = ngAttrName.match(MULTI_ELEMENT_DIR_RE);
+            if (multiElementMatch && directiveIsMultiElement(multiElementMatch[1])) {
+              attrStartName = name;
+              attrEndName = name.substr(0, name.length - 5) + 'end';
+              name = name.substr(0, name.length - 6);
+            }
+
+            nName = directiveNormalize(name.toLowerCase());
+            attrsMap[nName] = name;
+            if (isNgAttr || !attrs.hasOwnProperty(nName)) {
+                attrs[nName] = value;
+                if (getBooleanAttrName(node, nName)) {
+                  attrs[nName] = true; // presence means true
+                }
+            }
+            addAttrInterpolateDirective(node, directives, value, nName, isNgAttr);
+            addDirective(directives, nName, 'A', maxPriority, ignoreDirective, attrStartName,
+                          attrEndName);
+          }
+
+          // use class as directive
+          className = node.className;
+          if (isObject(className)) {
+              // Maybe SVGAnimatedString
+              className = className.animVal;
+          }
+          if (isString(className) && className !== '') {
+            while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) {
+              nName = directiveNormalize(match[2]);
+              if (addDirective(directives, nName, 'C', maxPriority, ignoreDirective)) {
+                attrs[nName] = trim(match[3]);
+              }
+              className = className.substr(match.index + match[0].length);
+            }
+          }
+          break;
+        case NODE_TYPE_TEXT: /* Text Node */
+          if (msie === 11) {
+            // Workaround for #11781
+            while (node.parentNode && node.nextSibling && node.nextSibling.nodeType === NODE_TYPE_TEXT) {
+              node.nodeValue = node.nodeValue + node.nextSibling.nodeValue;
+              node.parentNode.removeChild(node.nextSibling);
+            }
+          }
+          addTextInterpolateDirective(directives, node.nodeValue);
+          break;
+        case NODE_TYPE_COMMENT: /* Comment */
+          try {
+            match = COMMENT_DIRECTIVE_REGEXP.exec(node.nodeValue);
+            if (match) {
+              nName = directiveNormalize(match[1]);
+              if (addDirective(directives, nName, 'M', maxPriority, ignoreDirective)) {
+                attrs[nName] = trim(match[2]);
+              }
+            }
+          } catch (e) {
+            // turns out that under some circumstances IE9 throws errors when one attempts to read
+            // comment's node value.
+            // Just ignore it and continue. (Can't seem to reproduce in test case.)
+          }
+          break;
+      }
+
+      directives.sort(byPriority);
+      return directives;
+    }
+
+    /**
+     * Given a node with an directive-start it collects all of the siblings until it finds
+     * directive-end.
+     * @param node
+     * @param attrStart
+     * @param attrEnd
+     * @returns {*}
+     */
+    function groupScan(node, attrStart, attrEnd) {
+      var nodes = [];
+      var depth = 0;
+      if (attrStart && node.hasAttribute && node.hasAttribute(attrStart)) {
+        do {
+          if (!node) {
+            throw $compileMinErr('uterdir',
+                      "Unterminated attribute, found '{0}' but no matching '{1}' found.",
+                      attrStart, attrEnd);
+          }
+          if (node.nodeType == NODE_TYPE_ELEMENT) {
+            if (node.hasAttribute(attrStart)) depth++;
+            if (node.hasAttribute(attrEnd)) depth--;
+          }
+          nodes.push(node);
+          node = node.nextSibling;
+        } while (depth > 0);
+      } else {
+        nodes.push(node);
+      }
+
+      return jqLite(nodes);
+    }
+
+    /**
+     * Wrapper for linking function which converts normal linking function into a grouped
+     * linking function.
+     * @param linkFn
+     * @param attrStart
+     * @param attrEnd
+     * @returns {Function}
+     */
+    function groupElementsLinkFnWrapper(linkFn, attrStart, attrEnd) {
+      return function(scope, element, attrs, controllers, transcludeFn) {
+        element = groupScan(element[0], attrStart, attrEnd);
+        return linkFn(scope, element, attrs, controllers, transcludeFn);
+      };
+    }
+
+    /**
+     * Once the directives have been collected, their compile functions are executed. This method
+     * is responsible for inlining directive templates as well as terminating the application
+     * of the directives if the terminal directive has been reached.
+     *
+     * @param {Array} directives Array of collected directives to execute their compile function.
+     *        this needs to be pre-sorted by priority order.
+     * @param {Node} compileNode The raw DOM node to apply the compile functions to
+     * @param {Object} templateAttrs The shared attribute function
+     * @param {function(angular.Scope, cloneAttachFn=)} transcludeFn A linking function, where the
+     *                                                  scope argument is auto-generated to the new
+     *                                                  child of the transcluded parent scope.
+     * @param {JQLite} jqCollection If we are working on the root of the compile tree then this
+     *                              argument has the root jqLite array so that we can replace nodes
+     *                              on it.
+     * @param {Object=} originalReplaceDirective An optional directive that will be ignored when
+     *                                           compiling the transclusion.
+     * @param {Array.<Function>} preLinkFns
+     * @param {Array.<Function>} postLinkFns
+     * @param {Object} previousCompileContext Context used for previous compilation of the current
+     *                                        node
+     * @returns {Function} linkFn
+     */
+    function applyDirectivesToNode(directives, compileNode, templateAttrs, transcludeFn,
+                                   jqCollection, originalReplaceDirective, preLinkFns, postLinkFns,
+                                   previousCompileContext) {
+      previousCompileContext = previousCompileContext || {};
+
+      var terminalPriority = -Number.MAX_VALUE,
+          newScopeDirective = previousCompileContext.newScopeDirective,
+          controllerDirectives = previousCompileContext.controllerDirectives,
+          newIsolateScopeDirective = previousCompileContext.newIsolateScopeDirective,
+          templateDirective = previousCompileContext.templateDirective,
+          nonTlbTranscludeDirective = previousCompileContext.nonTlbTranscludeDirective,
+          hasTranscludeDirective = false,
+          hasTemplate = false,
+          hasElementTranscludeDirective = previousCompileContext.hasElementTranscludeDirective,
+          $compileNode = templateAttrs.$$element = jqLite(compileNode),
+          directive,
+          directiveName,
+          $template,
+          replaceDirective = originalReplaceDirective,
+          childTranscludeFn = transcludeFn,
+          linkFn,
+          directiveValue;
+
+      // executes all directives on the current element
+      for (var i = 0, ii = directives.length; i < ii; i++) {
+        directive = directives[i];
+        var attrStart = directive.$$start;
+        var attrEnd = directive.$$end;
+
+        // collect multiblock sections
+        if (attrStart) {
+          $compileNode = groupScan(compileNode, attrStart, attrEnd);
+        }
+        $template = undefined;
+
+        if (terminalPriority > directive.priority) {
+          break; // prevent further processing of directives
+        }
+
+        if (directiveValue = directive.scope) {
+
+          // skip the check for directives with async templates, we'll check the derived sync
+          // directive when the template arrives
+          if (!directive.templateUrl) {
+            if (isObject(directiveValue)) {
+              // This directive is trying to add an isolated scope.
+              // Check that there is no scope of any kind already
+              assertNoDuplicate('new/isolated scope', newIsolateScopeDirective || newScopeDirective,
+                                directive, $compileNode);
+              newIsolateScopeDirective = directive;
+            } else {
+              // This directive is trying to add a child scope.
+              // Check that there is no isolated scope already
+              assertNoDuplicate('new/isolated scope', newIsolateScopeDirective, directive,
+                                $compileNode);
+            }
+          }
+
+          newScopeDirective = newScopeDirective || directive;
+        }
+
+        directiveName = directive.name;
+
+        if (!directive.templateUrl && directive.controller) {
+          directiveValue = directive.controller;
+          controllerDirectives = controllerDirectives || createMap();
+          assertNoDuplicate("'" + directiveName + "' controller",
+              controllerDirectives[directiveName], directive, $compileNode);
+          controllerDirectives[directiveName] = directive;
+        }
+
+        if (directiveValue = directive.transclude) {
+          hasTranscludeDirective = true;
+
+          // Special case ngIf and ngRepeat so that we don't complain about duplicate transclusion.
+          // This option should only be used by directives that know how to safely handle element transclusion,
+          // where the transcluded nodes are added or replaced after linking.
+          if (!directive.$$tlb) {
+            assertNoDuplicate('transclusion', nonTlbTranscludeDirective, directive, $compileNode);
+            nonTlbTranscludeDirective = directive;
+          }
+
+          if (directiveValue == 'element') {
+            hasElementTranscludeDirective = true;
+            terminalPriority = directive.priority;
+            $template = $compileNode;
+            $compileNode = templateAttrs.$$element =
+                jqLite(document.createComment(' ' + directiveName + ': ' +
+                                              templateAttrs[directiveName] + ' '));
+            compileNode = $compileNode[0];
+            replaceWith(jqCollection, sliceArgs($template), compileNode);
+
+            childTranscludeFn = compile($template, transcludeFn, terminalPriority,
+                                        replaceDirective && replaceDirective.name, {
+                                          // Don't pass in:
+                                          // - controllerDirectives - otherwise we'll create duplicates controllers
+                                          // - newIsolateScopeDirective or templateDirective - combining templates with
+                                          //   element transclusion doesn't make sense.
+                                          //
+                                          // We need only nonTlbTranscludeDirective so that we prevent putting transclusion
+                                          // on the same element more than once.
+                                          nonTlbTranscludeDirective: nonTlbTranscludeDirective
+                                        });
+          } else {
+            $template = jqLite(jqLiteClone(compileNode)).contents();
+            $compileNode.empty(); // clear contents
+            childTranscludeFn = compile($template, transcludeFn, undefined,
+                undefined, { needsNewScope: directive.$$isolateScope || directive.$$newScope});
+          }
+        }
+
+        if (directive.template) {
+          hasTemplate = true;
+          assertNoDuplicate('template', templateDirective, directive, $compileNode);
+          templateDirective = directive;
+
+          directiveValue = (isFunction(directive.template))
+              ? directive.template($compileNode, templateAttrs)
+              : directive.template;
+
+          directiveValue = denormalizeTemplate(directiveValue);
+
+          if (directive.replace) {
+            replaceDirective = directive;
+            if (jqLiteIsTextNode(directiveValue)) {
+              $template = [];
+            } else {
+              $template = removeComments(wrapTemplate(directive.templateNamespace, trim(directiveValue)));
+            }
+            compileNode = $template[0];
+
+            if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
+              throw $compileMinErr('tplrt',
+                  "Template for directive '{0}' must have exactly one root element. {1}",
+                  directiveName, '');
+            }
+
+            replaceWith(jqCollection, $compileNode, compileNode);
+
+            var newTemplateAttrs = {$attr: {}};
+
+            // combine directives from the original node and from the template:
+            // - take the array of directives for this element
+            // - split it into two parts, those that already applied (processed) and those that weren't (unprocessed)
+            // - collect directives from the template and sort them by priority
+            // - combine directives as: processed + template + unprocessed
+            var templateDirectives = collectDirectives(compileNode, [], newTemplateAttrs);
+            var unprocessedDirectives = directives.splice(i + 1, directives.length - (i + 1));
+
+            if (newIsolateScopeDirective || newScopeDirective) {
+              // The original directive caused the current element to be replaced but this element
+              // also needs to have a new scope, so we need to tell the template directives
+              // that they would need to get their scope from further up, if they require transclusion
+              markDirectiveScope(templateDirectives, newIsolateScopeDirective, newScopeDirective);
+            }
+            directives = directives.concat(templateDirectives).concat(unprocessedDirectives);
+            mergeTemplateAttributes(templateAttrs, newTemplateAttrs);
+
+            ii = directives.length;
+          } else {
+            $compileNode.html(directiveValue);
+          }
+        }
+
+        if (directive.templateUrl) {
+          hasTemplate = true;
+          assertNoDuplicate('template', templateDirective, directive, $compileNode);
+          templateDirective = directive;
+
+          if (directive.replace) {
+            replaceDirective = directive;
+          }
+
+          nodeLinkFn = compileTemplateUrl(directives.splice(i, directives.length - i), $compileNode,
+              templateAttrs, jqCollection, hasTranscludeDirective && childTranscludeFn, preLinkFns, postLinkFns, {
+                controllerDirectives: controllerDirectives,
+                newScopeDirective: (newScopeDirective !== directive) && newScopeDirective,
+                newIsolateScopeDirective: newIsolateScopeDirective,
+                templateDirective: templateDirective,
+                nonTlbTranscludeDirective: nonTlbTranscludeDirective
+              });
+          ii = directives.length;
+        } else if (directive.compile) {
+          try {
+            linkFn = directive.compile($compileNode, templateAttrs, childTranscludeFn);
+            if (isFunction(linkFn)) {
+              addLinkFns(null, linkFn, attrStart, attrEnd);
+            } else if (linkFn) {
+              addLinkFns(linkFn.pre, linkFn.post, attrStart, attrEnd);
+            }
+          } catch (e) {
+            $exceptionHandler(e, startingTag($compileNode));
+          }
+        }
+
+        if (directive.terminal) {
+          nodeLinkFn.terminal = true;
+          terminalPriority = Math.max(terminalPriority, directive.priority);
+        }
+
+      }
+
+      nodeLinkFn.scope = newScopeDirective && newScopeDirective.scope === true;
+      nodeLinkFn.transcludeOnThisElement = hasTranscludeDirective;
+      nodeLinkFn.templateOnThisElement = hasTemplate;
+      nodeLinkFn.transclude = childTranscludeFn;
+
+      previousCompileContext.hasElementTranscludeDirective = hasElementTranscludeDirective;
+
+      // might be normal or delayed nodeLinkFn depending on if templateUrl is present
+      return nodeLinkFn;
+
+      ////////////////////
+
+      function addLinkFns(pre, post, attrStart, attrEnd) {
+        if (pre) {
+          if (attrStart) pre = groupElementsLinkFnWrapper(pre, attrStart, attrEnd);
+          pre.require = directive.require;
+          pre.directiveName = directiveName;
+          if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
+            pre = cloneAndAnnotateFn(pre, {isolateScope: true});
+          }
+          preLinkFns.push(pre);
+        }
+        if (post) {
+          if (attrStart) post = groupElementsLinkFnWrapper(post, attrStart, attrEnd);
+          post.require = directive.require;
+          post.directiveName = directiveName;
+          if (newIsolateScopeDirective === directive || directive.$$isolateScope) {
+            post = cloneAndAnnotateFn(post, {isolateScope: true});
+          }
+          postLinkFns.push(post);
+        }
+      }
+
+
+      function getControllers(directiveName, require, $element, elementControllers) {
+        var value;
+
+        if (isString(require)) {
+          var match = require.match(REQUIRE_PREFIX_REGEXP);
+          var name = require.substring(match[0].length);
+          var inheritType = match[1] || match[3];
+          var optional = match[2] === '?';
+
+          //If only parents then start at the parent element
+          if (inheritType === '^^') {
+            $element = $element.parent();
+          //Otherwise attempt getting the controller from elementControllers in case
+          //the element is transcluded (and has no data) and to avoid .data if possible
+          } else {
+            value = elementControllers && elementControllers[name];
+            value = value && value.instance;
+          }
+
+          if (!value) {
+            var dataName = '$' + name + 'Controller';
+            value = inheritType ? $element.inheritedData(dataName) : $element.data(dataName);
+          }
+
+          if (!value && !optional) {
+            throw $compileMinErr('ctreq',
+                "Controller '{0}', required by directive '{1}', can't be found!",
+                name, directiveName);
+          }
+        } else if (isArray(require)) {
+          value = [];
+          for (var i = 0, ii = require.length; i < ii; i++) {
+            value[i] = getControllers(directiveName, require[i], $element, elementControllers);
+          }
+        }
+
+        return value || null;
+      }
+
+      function setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope) {
+        var elementControllers = createMap();
+        for (var controllerKey in controllerDirectives) {
+          var directive = controllerDirectives[controllerKey];
+          var locals = {
+            $scope: directive === newIsolateScopeDirective || directive.$$isolateScope ? isolateScope : scope,
+            $element: $element,
+            $attrs: attrs,
+            $transclude: transcludeFn
+          };
+
+          var controller = directive.controller;
+          if (controller == '@') {
+            controller = attrs[directive.name];
+          }
+
+          var controllerInstance = $controller(controller, locals, true, directive.controllerAs);
+
+          // For directives with element transclusion the element is a comment,
+          // but jQuery .data doesn't support attaching data to comment nodes as it's hard to
+          // clean up (http://bugs.jquery.com/ticket/8335).
+          // Instead, we save the controllers for the element in a local hash and attach to .data
+          // later, once we have the actual element.
+          elementControllers[directive.name] = controllerInstance;
+          if (!hasElementTranscludeDirective) {
+            $element.data('$' + directive.name + 'Controller', controllerInstance.instance);
+          }
+        }
+        return elementControllers;
+      }
+
+      function nodeLinkFn(childLinkFn, scope, linkNode, $rootElement, boundTranscludeFn) {
+        var linkFn, isolateScope, controllerScope, elementControllers, transcludeFn, $element,
+            attrs, removeScopeBindingWatches, removeControllerBindingWatches;
+
+        if (compileNode === linkNode) {
+          attrs = templateAttrs;
+          $element = templateAttrs.$$element;
+        } else {
+          $element = jqLite(linkNode);
+          attrs = new Attributes($element, templateAttrs);
+        }
+
+        controllerScope = scope;
+        if (newIsolateScopeDirective) {
+          isolateScope = scope.$new(true);
+        } else if (newScopeDirective) {
+          controllerScope = scope.$parent;
+        }
+
+        if (boundTranscludeFn) {
+          // track `boundTranscludeFn` so it can be unwrapped if `transcludeFn`
+          // is later passed as `parentBoundTranscludeFn` to `publicLinkFn`
+          transcludeFn = controllersBoundTransclude;
+          transcludeFn.$$boundTransclude = boundTranscludeFn;
+        }
+
+        if (controllerDirectives) {
+          elementControllers = setupControllers($element, attrs, transcludeFn, controllerDirectives, isolateScope, scope);
+        }
+
+        if (newIsolateScopeDirective) {
+          // Initialize isolate scope bindings for new isolate scope directive.
+          compile.$$addScopeInfo($element, isolateScope, true, !(templateDirective && (templateDirective === newIsolateScopeDirective ||
+              templateDirective === newIsolateScopeDirective.$$originalDirective)));
+          compile.$$addScopeClass($element, true);
+          isolateScope.$$isolateBindings =
+              newIsolateScopeDirective.$$isolateBindings;
+          removeScopeBindingWatches = initializeDirectiveBindings(scope, attrs, isolateScope,
+                                        isolateScope.$$isolateBindings,
+                                        newIsolateScopeDirective);
+          if (removeScopeBindingWatches) {
+            isolateScope.$on('$destroy', removeScopeBindingWatches);
+          }
+        }
+
+        // Initialize bindToController bindings
+        for (var name in elementControllers) {
+          var controllerDirective = controllerDirectives[name];
+          var controller = elementControllers[name];
+          var bindings = controllerDirective.$$bindings.bindToController;
+
+          if (controller.identifier && bindings) {
+            removeControllerBindingWatches =
+              initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+          }
+
+          var controllerResult = controller();
+          if (controllerResult !== controller.instance) {
+            // If the controller constructor has a return value, overwrite the instance
+            // from setupControllers
+            controller.instance = controllerResult;
+            $element.data('$' + controllerDirective.name + 'Controller', controllerResult);
+            removeControllerBindingWatches && removeControllerBindingWatches();
+            removeControllerBindingWatches =
+              initializeDirectiveBindings(controllerScope, attrs, controller.instance, bindings, controllerDirective);
+          }
+        }
+
+        // PRELINKING
+        for (i = 0, ii = preLinkFns.length; i < ii; i++) {
+          linkFn = preLinkFns[i];
+          invokeLinkFn(linkFn,
+              linkFn.isolateScope ? isolateScope : scope,
+              $element,
+              attrs,
+              linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+              transcludeFn
+          );
+        }
+
+        // RECURSION
+        // We only pass the isolate scope, if the isolate directive has a template,
+        // otherwise the child elements do not belong to the isolate directive.
+        var scopeToChild = scope;
+        if (newIsolateScopeDirective && (newIsolateScopeDirective.template || newIsolateScopeDirective.templateUrl === null)) {
+          scopeToChild = isolateScope;
+        }
+        childLinkFn && childLinkFn(scopeToChild, linkNode.childNodes, undefined, boundTranscludeFn);
+
+        // POSTLINKING
+        for (i = postLinkFns.length - 1; i >= 0; i--) {
+          linkFn = postLinkFns[i];
+          invokeLinkFn(linkFn,
+              linkFn.isolateScope ? isolateScope : scope,
+              $element,
+              attrs,
+              linkFn.require && getControllers(linkFn.directiveName, linkFn.require, $element, elementControllers),
+              transcludeFn
+          );
+        }
+
+        // This is the function that is injected as `$transclude`.
+        // Note: all arguments are optional!
+        function controllersBoundTransclude(scope, cloneAttachFn, futureParentElement) {
+          var transcludeControllers;
+
+          // No scope passed in:
+          if (!isScope(scope)) {
+            futureParentElement = cloneAttachFn;
+            cloneAttachFn = scope;
+            scope = undefined;
+          }
+
+          if (hasElementTranscludeDirective) {
+            transcludeControllers = elementControllers;
+          }
+          if (!futureParentElement) {
+            futureParentElement = hasElementTranscludeDirective ? $element.parent() : $element;
+          }
+          return boundTranscludeFn(scope, cloneAttachFn, transcludeControllers, futureParentElement, scopeToChild);
+        }
+      }
+    }
+
+    // Depending upon the context in which a directive finds itself it might need to have a new isolated
+    // or child scope created. For instance:
+    // * if the directive has been pulled into a template because another directive with a higher priority
+    // asked for element transclusion
+    // * if the directive itself asks for transclusion but it is at the root of a template and the original
+    // element was replaced. See https://github.com/angular/angular.js/issues/12936
+    function markDirectiveScope(directives, isolateScope, newScope) {
+      for (var j = 0, jj = directives.length; j < jj; j++) {
+        directives[j] = inherit(directives[j], {$$isolateScope: isolateScope, $$newScope: newScope});
+      }
+    }
+
+    /**
+     * looks up the directive and decorates it with exception handling and proper parameters. We
+     * call this the boundDirective.
+     *
+     * @param {string} name name of the directive to look up.
+     * @param {string} location The directive must be found in specific format.
+     *   String containing any of theses characters:
+     *
+     *   * `E`: element name
+     *   * `A': attribute
+     *   * `C`: class
+     *   * `M`: comment
+     * @returns {boolean} true if directive was added.
+     */
+    function addDirective(tDirectives, name, location, maxPriority, ignoreDirective, startAttrName,
+                          endAttrName) {
+      if (name === ignoreDirective) return null;
+      var match = null;
+      if (hasDirectives.hasOwnProperty(name)) {
+        for (var directive, directives = $injector.get(name + Suffix),
+            i = 0, ii = directives.length; i < ii; i++) {
+          try {
+            directive = directives[i];
+            if ((isUndefined(maxPriority) || maxPriority > directive.priority) &&
+                 directive.restrict.indexOf(location) != -1) {
+              if (startAttrName) {
+                directive = inherit(directive, {$$start: startAttrName, $$end: endAttrName});
+              }
+              tDirectives.push(directive);
+              match = directive;
+            }
+          } catch (e) { $exceptionHandler(e); }
+        }
+      }
+      return match;
+    }
+
+
+    /**
+     * looks up the directive and returns true if it is a multi-element directive,
+     * and therefore requires DOM nodes between -start and -end markers to be grouped
+     * together.
+     *
+     * @param {string} name name of the directive to look up.
+     * @returns true if directive was registered as multi-element.
+     */
+    function directiveIsMultiElement(name) {
+      if (hasDirectives.hasOwnProperty(name)) {
+        for (var directive, directives = $injector.get(name + Suffix),
+            i = 0, ii = directives.length; i < ii; i++) {
+          directive = directives[i];
+          if (directive.multiElement) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
+    /**
+     * When the element is replaced with HTML template then the new attributes
+     * on the template need to be merged with the existing attributes in the DOM.
+     * The desired effect is to have both of the attributes present.
+     *
+     * @param {object} dst destination attributes (original DOM)
+     * @param {object} src source attributes (from the directive template)
+     */
+    function mergeTemplateAttributes(dst, src) {
+      var srcAttr = src.$attr,
+          dstAttr = dst.$attr,
+          $element = dst.$$element;
+
+      // reapply the old attributes to the new element
+      forEach(dst, function(value, key) {
+        if (key.charAt(0) != '$') {
+          if (src[key] && src[key] !== value) {
+            value += (key === 'style' ? ';' : ' ') + src[key];
+          }
+          dst.$set(key, value, true, srcAttr[key]);
+        }
+      });
+
+      // copy the new attributes on the old attrs object
+      forEach(src, function(value, key) {
+        if (key == 'class') {
+          safeAddClass($element, value);
+          dst['class'] = (dst['class'] ? dst['class'] + ' ' : '') + value;
+        } else if (key == 'style') {
+          $element.attr('style', $element.attr('style') + ';' + value);
+          dst['style'] = (dst['style'] ? dst['style'] + ';' : '') + value;
+          // `dst` will never contain hasOwnProperty as DOM parser won't let it.
+          // You will get an "InvalidCharacterError: DOM Exception 5" error if you
+          // have an attribute like "has-own-property" or "data-has-own-property", etc.
+        } else if (key.charAt(0) != '$' && !dst.hasOwnProperty(key)) {
+          dst[key] = value;
+          dstAttr[key] = srcAttr[key];
+        }
+      });
+    }
+
+
+    function compileTemplateUrl(directives, $compileNode, tAttrs,
+        $rootElement, childTranscludeFn, preLinkFns, postLinkFns, previousCompileContext) {
+      var linkQueue = [],
+          afterTemplateNodeLinkFn,
+          afterTemplateChildLinkFn,
+          beforeTemplateCompileNode = $compileNode[0],
+          origAsyncDirective = directives.shift(),
+          derivedSyncDirective = inherit(origAsyncDirective, {
+            templateUrl: null, transclude: null, replace: null, $$originalDirective: origAsyncDirective
+          }),
+          templateUrl = (isFunction(origAsyncDirective.templateUrl))
+              ? origAsyncDirective.templateUrl($compileNode, tAttrs)
+              : origAsyncDirective.templateUrl,
+          templateNamespace = origAsyncDirective.templateNamespace;
+
+      $compileNode.empty();
+
+      $templateRequest(templateUrl)
+        .then(function(content) {
+          var compileNode, tempTemplateAttrs, $template, childBoundTranscludeFn;
+
+          content = denormalizeTemplate(content);
+
+          if (origAsyncDirective.replace) {
+            if (jqLiteIsTextNode(content)) {
+              $template = [];
+            } else {
+              $template = removeComments(wrapTemplate(templateNamespace, trim(content)));
+            }
+            compileNode = $template[0];
+
+            if ($template.length != 1 || compileNode.nodeType !== NODE_TYPE_ELEMENT) {
+              throw $compileMinErr('tplrt',
+                  "Template for directive '{0}' must have exactly one root element. {1}",
+                  origAsyncDirective.name, templateUrl);
+            }
+
+            tempTemplateAttrs = {$attr: {}};
+            replaceWith($rootElement, $compileNode, compileNode);
+            var templateDirectives = collectDirectives(compileNode, [], tempTemplateAttrs);
+
+            if (isObject(origAsyncDirective.scope)) {
+              // the original directive that caused the template to be loaded async required
+              // an isolate scope
+              markDirectiveScope(templateDirectives, true);
+            }
+            directives = templateDirectives.concat(directives);
+            mergeTemplateAttributes(tAttrs, tempTemplateAttrs);
+          } else {
+            compileNode = beforeTemplateCompileNode;
+            $compileNode.html(content);
+          }
+
+          directives.unshift(derivedSyncDirective);
+
+          afterTemplateNodeLinkFn = applyDirectivesToNode(directives, compileNode, tAttrs,
+              childTranscludeFn, $compileNode, origAsyncDirective, preLinkFns, postLinkFns,
+              previousCompileContext);
+          forEach($rootElement, function(node, i) {
+            if (node == compileNode) {
+              $rootElement[i] = $compileNode[0];
+            }
+          });
+          afterTemplateChildLinkFn = compileNodes($compileNode[0].childNodes, childTranscludeFn);
+
+          while (linkQueue.length) {
+            var scope = linkQueue.shift(),
+                beforeTemplateLinkNode = linkQueue.shift(),
+                linkRootElement = linkQueue.shift(),
+                boundTranscludeFn = linkQueue.shift(),
+                linkNode = $compileNode[0];
+
+            if (scope.$$destroyed) continue;
+
+            if (beforeTemplateLinkNode !== beforeTemplateCompileNode) {
+              var oldClasses = beforeTemplateLinkNode.className;
+
+              if (!(previousCompileContext.hasElementTranscludeDirective &&
+                  origAsyncDirective.replace)) {
+                // it was cloned therefore we have to clone as well.
+                linkNode = jqLiteClone(compileNode);
+              }
+              replaceWith(linkRootElement, jqLite(beforeTemplateLinkNode), linkNode);
+
+              // Copy in CSS classes from original node
+              safeAddClass(jqLite(linkNode), oldClasses);
+            }
+            if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+              childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+            } else {
+              childBoundTranscludeFn = boundTranscludeFn;
+            }
+            afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, linkNode, $rootElement,
+              childBoundTranscludeFn);
+          }
+          linkQueue = null;
+        });
+
+      return function delayedNodeLinkFn(ignoreChildLinkFn, scope, node, rootElement, boundTranscludeFn) {
+        var childBoundTranscludeFn = boundTranscludeFn;
+        if (scope.$$destroyed) return;
+        if (linkQueue) {
+          linkQueue.push(scope,
+                         node,
+                         rootElement,
+                         childBoundTranscludeFn);
+        } else {
+          if (afterTemplateNodeLinkFn.transcludeOnThisElement) {
+            childBoundTranscludeFn = createBoundTranscludeFn(scope, afterTemplateNodeLinkFn.transclude, boundTranscludeFn);
+          }
+          afterTemplateNodeLinkFn(afterTemplateChildLinkFn, scope, node, rootElement, childBoundTranscludeFn);
+        }
+      };
+    }
+
+
+    /**
+     * Sorting function for bound directives.
+     */
+    function byPriority(a, b) {
+      var diff = b.priority - a.priority;
+      if (diff !== 0) return diff;
+      if (a.name !== b.name) return (a.name < b.name) ? -1 : 1;
+      return a.index - b.index;
+    }
+
+    function assertNoDuplicate(what, previousDirective, directive, element) {
+
+      function wrapModuleNameIfDefined(moduleName) {
+        return moduleName ?
+          (' (module: ' + moduleName + ')') :
+          '';
+      }
+
+      if (previousDirective) {
+        throw $compileMinErr('multidir', 'Multiple directives [{0}{1}, {2}{3}] asking for {4} on: {5}',
+            previousDirective.name, wrapModuleNameIfDefined(previousDirective.$$moduleName),
+            directive.name, wrapModuleNameIfDefined(directive.$$moduleName), what, startingTag(element));
+      }
+    }
+
+
+    function addTextInterpolateDirective(directives, text) {
+      var interpolateFn = $interpolate(text, true);
+      if (interpolateFn) {
+        directives.push({
+          priority: 0,
+          compile: function textInterpolateCompileFn(templateNode) {
+            var templateNodeParent = templateNode.parent(),
+                hasCompileParent = !!templateNodeParent.length;
+
+            // When transcluding a template that has bindings in the root
+            // we don't have a parent and thus need to add the class during linking fn.
+            if (hasCompileParent) compile.$$addBindingClass(templateNodeParent);
+
+            return function textInterpolateLinkFn(scope, node) {
+              var parent = node.parent();
+              if (!hasCompileParent) compile.$$addBindingClass(parent);
+              compile.$$addBindingInfo(parent, interpolateFn.expressions);
+              scope.$watch(interpolateFn, function interpolateFnWatchAction(value) {
+                node[0].nodeValue = value;
+              });
+            };
+          }
+        });
+      }
+    }
+
+
+    function wrapTemplate(type, template) {
+      type = lowercase(type || 'html');
+      switch (type) {
+      case 'svg':
+      case 'math':
+        var wrapper = document.createElement('div');
+        wrapper.innerHTML = '<' + type + '>' + template + '</' + type + '>';
+        return wrapper.childNodes[0].childNodes;
+      default:
+        return template;
+      }
+    }
+
+
+    function getTrustedContext(node, attrNormalizedName) {
+      if (attrNormalizedName == "srcdoc") {
+        return $sce.HTML;
+      }
+      var tag = nodeName_(node);
+      // maction[xlink:href] can source SVG.  It's not limited to <maction>.
+      if (attrNormalizedName == "xlinkHref" ||
+          (tag == "form" && attrNormalizedName == "action") ||
+          (tag != "img" && (attrNormalizedName == "src" ||
+                            attrNormalizedName == "ngSrc"))) {
+        return $sce.RESOURCE_URL;
+      }
+    }
+
+
+    function addAttrInterpolateDirective(node, directives, value, name, allOrNothing) {
+      var trustedContext = getTrustedContext(node, name);
+      allOrNothing = ALL_OR_NOTHING_ATTRS[name] || allOrNothing;
+
+      var interpolateFn = $interpolate(value, true, trustedContext, allOrNothing);
+
+      // no interpolation found -> ignore
+      if (!interpolateFn) return;
+
+
+      if (name === "multiple" && nodeName_(node) === "select") {
+        throw $compileMinErr("selmulti",
+            "Binding to the 'multiple' attribute is not supported. Element: {0}",
+            startingTag(node));
+      }
+
+      directives.push({
+        priority: 100,
+        compile: function() {
+            return {
+              pre: function attrInterpolatePreLinkFn(scope, element, attr) {
+                var $$observers = (attr.$$observers || (attr.$$observers = createMap()));
+
+                if (EVENT_HANDLER_ATTR_REGEXP.test(name)) {
+                  throw $compileMinErr('nodomevents',
+                      "Interpolations for HTML DOM event attributes are disallowed.  Please use the " +
+                          "ng- versions (such as ng-click instead of onclick) instead.");
+                }
+
+                // If the attribute has changed since last $interpolate()ed
+                var newValue = attr[name];
+                if (newValue !== value) {
+                  // we need to interpolate again since the attribute value has been updated
+                  // (e.g. by another directive's compile function)
+                  // ensure unset/empty values make interpolateFn falsy
+                  interpolateFn = newValue && $interpolate(newValue, true, trustedContext, allOrNothing);
+                  value = newValue;
+                }
+
+                // if attribute was updated so that there is no interpolation going on we don't want to
+                // register any observers
+                if (!interpolateFn) return;
+
+                // initialize attr object so that it's ready in case we need the value for isolate
+                // scope initialization, otherwise the value would not be available from isolate
+                // directive's linking fn during linking phase
+                attr[name] = interpolateFn(scope);
+
+                ($$observers[name] || ($$observers[name] = [])).$$inter = true;
+                (attr.$$observers && attr.$$observers[name].$$scope || scope).
+                  $watch(interpolateFn, function interpolateFnWatchAction(newValue, oldValue) {
+                    //special case for class attribute addition + removal
+                    //so that class changes can tap into the animation
+                    //hooks provided by the $animate service. Be sure to
+                    //skip animations when the first digest occurs (when
+                    //both the new and the old values are the same) since
+                    //the CSS classes are the non-interpolated values
+                    if (name === 'class' && newValue != oldValue) {
+                      attr.$updateClass(newValue, oldValue);
+                    } else {
+                      attr.$set(name, newValue);
+                    }
+                  });
+              }
+            };
+          }
+      });
+    }
+
+
+    /**
+     * This is a special jqLite.replaceWith, which can replace items which
+     * have no parents, provided that the containing jqLite collection is provided.
+     *
+     * @param {JqLite=} $rootElement The root of the compile tree. Used so that we can replace nodes
+     *                               in the root of the tree.
+     * @param {JqLite} elementsToRemove The jqLite element which we are going to replace. We keep
+     *                                  the shell, but replace its DOM node reference.
+     * @param {Node} newNode The new DOM node.
+     */
+    function replaceWith($rootElement, elementsToRemove, newNode) {
+      var firstElementToRemove = elementsToRemove[0],
+          removeCount = elementsToRemove.length,
+          parent = firstElementToRemove.parentNode,
+          i, ii;
+
+      if ($rootElement) {
+        for (i = 0, ii = $rootElement.length; i < ii; i++) {
+          if ($rootElement[i] == firstElementToRemove) {
+            $rootElement[i++] = newNode;
+            for (var j = i, j2 = j + removeCount - 1,
+                     jj = $rootElement.length;
+                 j < jj; j++, j2++) {
+              if (j2 < jj) {
+                $rootElement[j] = $rootElement[j2];
+              } else {
+                delete $rootElement[j];
+              }
+            }
+            $rootElement.length -= removeCount - 1;
+
+            // If the replaced element is also the jQuery .context then replace it
+            // .context is a deprecated jQuery api, so we should set it only when jQuery set it
+            // http://api.jquery.com/context/
+            if ($rootElement.context === firstElementToRemove) {
+              $rootElement.context = newNode;
+            }
+            break;
+          }
+        }
+      }
+
+      if (parent) {
+        parent.replaceChild(newNode, firstElementToRemove);
+      }
+
+      // TODO(perf): what's this document fragment for? is it needed? can we at least reuse it?
+      var fragment = document.createDocumentFragment();
+      fragment.appendChild(firstElementToRemove);
+
+      if (jqLite.hasData(firstElementToRemove)) {
+        // Copy over user data (that includes Angular's $scope etc.). Don't copy private
+        // data here because there's no public interface in jQuery to do that and copying over
+        // event listeners (which is the main use of private data) wouldn't work anyway.
+        jqLite.data(newNode, jqLite.data(firstElementToRemove));
+
+        // Remove data of the replaced element. We cannot just call .remove()
+        // on the element it since that would deallocate scope that is needed
+        // for the new node. Instead, remove the data "manually".
+        if (!jQuery) {
+          delete jqLite.cache[firstElementToRemove[jqLite.expando]];
+        } else {
+          // jQuery 2.x doesn't expose the data storage. Use jQuery.cleanData to clean up after
+          // the replaced element. The cleanData version monkey-patched by Angular would cause
+          // the scope to be trashed and we do need the very same scope to work with the new
+          // element. However, we cannot just cache the non-patched version and use it here as
+          // that would break if another library patches the method after Angular does (one
+          // example is jQuery UI). Instead, set a flag indicating scope destroying should be
+          // skipped this one time.
+          skipDestroyOnNextJQueryCleanData = true;
+          jQuery.cleanData([firstElementToRemove]);
+        }
+      }
+
+      for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
+        var element = elementsToRemove[k];
+        jqLite(element).remove(); // must do this way to clean up expando
+        fragment.appendChild(element);
+        delete elementsToRemove[k];
+      }
+
+      elementsToRemove[0] = newNode;
+      elementsToRemove.length = 1;
+    }
+
+
+    function cloneAndAnnotateFn(fn, annotation) {
+      return extend(function() { return fn.apply(null, arguments); }, fn, annotation);
+    }
+
+
+    function invokeLinkFn(linkFn, scope, $element, attrs, controllers, transcludeFn) {
+      try {
+        linkFn(scope, $element, attrs, controllers, transcludeFn);
+      } catch (e) {
+        $exceptionHandler(e, startingTag($element));
+      }
+    }
+
+
+    // Set up $watches for isolate scope and controller bindings. This process
+    // only occurs for isolate scopes and new scopes with controllerAs.
+    function initializeDirectiveBindings(scope, attrs, destination, bindings, directive) {
+      var removeWatchCollection = [];
+      forEach(bindings, function(definition, scopeName) {
+        var attrName = definition.attrName,
+        optional = definition.optional,
+        mode = definition.mode, // @, =, or &
+        lastValue,
+        parentGet, parentSet, compare;
+
+        switch (mode) {
+
+          case '@':
+            if (!optional && !hasOwnProperty.call(attrs, attrName)) {
+              destination[scopeName] = attrs[attrName] = void 0;
+            }
+            attrs.$observe(attrName, function(value) {
+              if (isString(value)) {
+                destination[scopeName] = value;
+              }
+            });
+            attrs.$$observers[attrName].$$scope = scope;
+            if (isString(attrs[attrName])) {
+              // If the attribute has been provided then we trigger an interpolation to ensure
+              // the value is there for use in the link fn
+              destination[scopeName] = $interpolate(attrs[attrName])(scope);
+            }
+            break;
+
+          case '=':
+            if (!hasOwnProperty.call(attrs, attrName)) {
+              if (optional) break;
+              attrs[attrName] = void 0;
+            }
+            if (optional && !attrs[attrName]) break;
+
+            parentGet = $parse(attrs[attrName]);
+            if (parentGet.literal) {
+              compare = equals;
+            } else {
+              compare = function(a, b) { return a === b || (a !== a && b !== b); };
+            }
+            parentSet = parentGet.assign || function() {
+              // reset the change, or we will throw this exception on every $digest
+              lastValue = destination[scopeName] = parentGet(scope);
+              throw $compileMinErr('nonassign',
+                  "Expression '{0}' used with directive '{1}' is non-assignable!",
+                  attrs[attrName], directive.name);
+            };
+            lastValue = destination[scopeName] = parentGet(scope);
+            var parentValueWatch = function parentValueWatch(parentValue) {
+              if (!compare(parentValue, destination[scopeName])) {
+                // we are out of sync and need to copy
+                if (!compare(parentValue, lastValue)) {
+                  // parent changed and it has precedence
+                  destination[scopeName] = parentValue;
+                } else {
+                  // if the parent can be assigned then do so
+                  parentSet(scope, parentValue = destination[scopeName]);
+                }
+              }
+              return lastValue = parentValue;
+            };
+            parentValueWatch.$stateful = true;
+            var removeWatch;
+            if (definition.collection) {
+              removeWatch = scope.$watchCollection(attrs[attrName], parentValueWatch);
+            } else {
+              removeWatch = scope.$watch($parse(attrs[attrName], parentValueWatch), null, parentGet.literal);
+            }
+            removeWatchCollection.push(removeWatch);
+            break;
+
+          case '&':
+            // Don't assign Object.prototype method to scope
+            parentGet = attrs.hasOwnProperty(attrName) ? $parse(attrs[attrName]) : noop;
+
+            // Don't assign noop to destination if expression is not valid
+            if (parentGet === noop && optional) break;
+
+            destination[scopeName] = function(locals) {
+              return parentGet(scope, locals);
+            };
+            break;
+        }
+      });
+
+      return removeWatchCollection.length && function removeWatches() {
+        for (var i = 0, ii = removeWatchCollection.length; i < ii; ++i) {
+          removeWatchCollection[i]();
+        }
+      };
+    }
+  }];
+}
+
+var PREFIX_REGEXP = /^((?:x|data)[\:\-_])/i;
+/**
+ * Converts all accepted directives format into proper directive name.
+ * @param name Name to normalize
+ */
+function directiveNormalize(name) {
+  return camelCase(name.replace(PREFIX_REGEXP, ''));
+}
+
+/**
+ * @ngdoc type
+ * @name $compile.directive.Attributes
+ *
+ * @description
+ * A shared object between directive compile / linking functions which contains normalized DOM
+ * element attributes. The values reflect current binding state `{{ }}`. The normalization is
+ * needed since all of these are treated as equivalent in Angular:
+ *
+ * ```
+ *    <span ng:bind="a" ng-bind="a" data-ng-bind="a" x-ng-bind="a">
+ * ```
+ */
+
+/**
+ * @ngdoc property
+ * @name $compile.directive.Attributes#$attr
+ *
+ * @description
+ * A map of DOM element attribute names to the normalized name. This is
+ * needed to do reverse lookup from normalized name back to actual name.
+ */
+
+
+/**
+ * @ngdoc method
+ * @name $compile.directive.Attributes#$set
+ * @kind function
+ *
+ * @description
+ * Set DOM element attribute value.
+ *
+ *
+ * @param {string} name Normalized element attribute name of the property to modify. The name is
+ *          reverse-translated using the {@link ng.$compile.directive.Attributes#$attr $attr}
+ *          property to the original name.
+ * @param {string} value Value to set the attribute to. The value can be an interpolated string.
+ */
+
+
+
+/**
+ * Closure compiler type information
+ */
+
+function nodesetLinkingFn(
+  /* angular.Scope */ scope,
+  /* NodeList */ nodeList,
+  /* Element */ rootElement,
+  /* function(Function) */ boundTranscludeFn
+) {}
+
+function directiveLinkingFn(
+  /* nodesetLinkingFn */ nodesetLinkingFn,
+  /* angular.Scope */ scope,
+  /* Node */ node,
+  /* Element */ rootElement,
+  /* function(Function) */ boundTranscludeFn
+) {}
+
+function tokenDifference(str1, str2) {
+  var values = '',
+      tokens1 = str1.split(/\s+/),
+      tokens2 = str2.split(/\s+/);
+
+  outer:
+  for (var i = 0; i < tokens1.length; i++) {
+    var token = tokens1[i];
+    for (var j = 0; j < tokens2.length; j++) {
+      if (token == tokens2[j]) continue outer;
+    }
+    values += (values.length > 0 ? ' ' : '') + token;
+  }
+  return values;
+}
+
+function removeComments(jqNodes) {
+  jqNodes = jqLite(jqNodes);
+  var i = jqNodes.length;
+
+  if (i <= 1) {
+    return jqNodes;
+  }
+
+  while (i--) {
+    var node = jqNodes[i];
+    if (node.nodeType === NODE_TYPE_COMMENT) {
+      splice.call(jqNodes, i, 1);
+    }
+  }
+  return jqNodes;
+}
+
+var $controllerMinErr = minErr('$controller');
+
+
+var CNTRL_REG = /^(\S+)(\s+as\s+([\w$]+))?$/;
+function identifierForController(controller, ident) {
+  if (ident && isString(ident)) return ident;
+  if (isString(controller)) {
+    var match = CNTRL_REG.exec(controller);
+    if (match) return match[3];
+  }
+}
+
+
+/**
+ * @ngdoc provider
+ * @name $controllerProvider
+ * @description
+ * The {@link ng.$controller $controller service} is used by Angular to create new
+ * controllers.
+ *
+ * This provider allows controller registration via the
+ * {@link ng.$controllerProvider#register register} method.
+ */
+function $ControllerProvider() {
+  var controllers = {},
+      globals = false;
+
+  /**
+   * @ngdoc method
+   * @name $controllerProvider#register
+   * @param {string|Object} name Controller name, or an object map of controllers where the keys are
+   *    the names and the values are the constructors.
+   * @param {Function|Array} constructor Controller constructor fn (optionally decorated with DI
+   *    annotations in the array notation).
+   */
+  this.register = function(name, constructor) {
+    assertNotHasOwnProperty(name, 'controller');
+    if (isObject(name)) {
+      extend(controllers, name);
+    } else {
+      controllers[name] = constructor;
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $controllerProvider#allowGlobals
+   * @description If called, allows `$controller` to find controller constructors on `window`
+   */
+  this.allowGlobals = function() {
+    globals = true;
+  };
+
+
+  this.$get = ['$injector', '$window', function($injector, $window) {
+
+    /**
+     * @ngdoc service
+     * @name $controller
+     * @requires $injector
+     *
+     * @param {Function|string} constructor If called with a function then it's considered to be the
+     *    controller constructor function. Otherwise it's considered to be a string which is used
+     *    to retrieve the controller constructor using the following steps:
+     *
+     *    * check if a controller with given name is registered via `$controllerProvider`
+     *    * check if evaluating the string on the current scope returns a constructor
+     *    * if $controllerProvider#allowGlobals, check `window[constructor]` on the global
+     *      `window` object (not recommended)
+     *
+     *    The string can use the `controller as property` syntax, where the controller instance is published
+     *    as the specified property on the `scope`; the `scope` must be injected into `locals` param for this
+     *    to work correctly.
+     *
+     * @param {Object} locals Injection locals for Controller.
+     * @return {Object} Instance of given controller.
+     *
+     * @description
+     * `$controller` service is responsible for instantiating controllers.
+     *
+     * It's just a simple call to {@link auto.$injector $injector}, but extracted into
+     * a service, so that one can override this service with [BC version](https://gist.github.com/1649788).
+     */
+    return function(expression, locals, later, ident) {
+      // PRIVATE API:
+      //   param `later` --- indicates that the controller's constructor is invoked at a later time.
+      //                     If true, $controller will allocate the object with the correct
+      //                     prototype chain, but will not invoke the controller until a returned
+      //                     callback is invoked.
+      //   param `ident` --- An optional label which overrides the label parsed from the controller
+      //                     expression, if any.
+      var instance, match, constructor, identifier;
+      later = later === true;
+      if (ident && isString(ident)) {
+        identifier = ident;
+      }
+
+      if (isString(expression)) {
+        match = expression.match(CNTRL_REG);
+        if (!match) {
+          throw $controllerMinErr('ctrlfmt',
+            "Badly formed controller string '{0}'. " +
+            "Must match `__name__ as __id__` or `__name__`.", expression);
+        }
+        constructor = match[1],
+        identifier = identifier || match[3];
+        expression = controllers.hasOwnProperty(constructor)
+            ? controllers[constructor]
+            : getter(locals.$scope, constructor, true) ||
+                (globals ? getter($window, constructor, true) : undefined);
+
+        assertArgFn(expression, constructor, true);
+      }
+
+      if (later) {
+        // Instantiate controller later:
+        // This machinery is used to create an instance of the object before calling the
+        // controller's constructor itself.
+        //
+        // This allows properties to be added to the controller before the constructor is
+        // invoked. Primarily, this is used for isolate scope bindings in $compile.
+        //
+        // This feature is not intended for use by applications, and is thus not documented
+        // publicly.
+        // Object creation: http://jsperf.com/create-constructor/2
+        var controllerPrototype = (isArray(expression) ?
+          expression[expression.length - 1] : expression).prototype;
+        instance = Object.create(controllerPrototype || null);
+
+        if (identifier) {
+          addIdentifier(locals, identifier, instance, constructor || expression.name);
+        }
+
+        var instantiate;
+        return instantiate = extend(function() {
+          var result = $injector.invoke(expression, instance, locals, constructor);
+          if (result !== instance && (isObject(result) || isFunction(result))) {
+            instance = result;
+            if (identifier) {
+              // If result changed, re-assign controllerAs value to scope.
+              addIdentifier(locals, identifier, instance, constructor || expression.name);
+            }
+          }
+          return instance;
+        }, {
+          instance: instance,
+          identifier: identifier
+        });
+      }
+
+      instance = $injector.instantiate(expression, locals, constructor);
+
+      if (identifier) {
+        addIdentifier(locals, identifier, instance, constructor || expression.name);
+      }
+
+      return instance;
+    };
+
+    function addIdentifier(locals, identifier, instance, name) {
+      if (!(locals && isObject(locals.$scope))) {
+        throw minErr('$controller')('noscp',
+          "Cannot export controller '{0}' as '{1}'! No $scope object provided via `locals`.",
+          name, identifier);
+      }
+
+      locals.$scope[identifier] = instance;
+    }
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $document
+ * @requires $window
+ *
+ * @description
+ * A {@link angular.element jQuery or jqLite} wrapper for the browser's `window.document` object.
+ *
+ * @example
+   <example module="documentExample">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+         <p>$document title: <b ng-bind="title"></b></p>
+         <p>window.document title: <b ng-bind="windowTitle"></b></p>
+       </div>
+     </file>
+     <file name="script.js">
+       angular.module('documentExample', [])
+         .controller('ExampleController', ['$scope', '$document', function($scope, $document) {
+           $scope.title = $document[0].title;
+           $scope.windowTitle = angular.element(window.document)[0].title;
+         }]);
+     </file>
+   </example>
+ */
+function $DocumentProvider() {
+  this.$get = ['$window', function(window) {
+    return jqLite(window.document);
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $exceptionHandler
+ * @requires ng.$log
+ *
+ * @description
+ * Any uncaught exception in angular expressions is delegated to this service.
+ * The default implementation simply delegates to `$log.error` which logs it into
+ * the browser console.
+ *
+ * In unit tests, if `angular-mocks.js` is loaded, this service is overridden by
+ * {@link ngMock.$exceptionHandler mock $exceptionHandler} which aids in testing.
+ *
+ * ## Example:
+ *
+ * ```js
+ *   angular.module('exceptionOverride', []).factory('$exceptionHandler', function() {
+ *     return function(exception, cause) {
+ *       exception.message += ' (caused by "' + cause + '")';
+ *       throw exception;
+ *     };
+ *   });
+ * ```
+ *
+ * This example will override the normal action of `$exceptionHandler`, to make angular
+ * exceptions fail hard when they happen, instead of just logging to the console.
+ *
+ * <hr />
+ * Note, that code executed in event-listeners (even those registered using jqLite's `on`/`bind`
+ * methods) does not delegate exceptions to the {@link ng.$exceptionHandler $exceptionHandler}
+ * (unless executed during a digest).
+ *
+ * If you wish, you can manually delegate exceptions, e.g.
+ * `try { ... } catch(e) { $exceptionHandler(e); }`
+ *
+ * @param {Error} exception Exception associated with the error.
+ * @param {string=} cause optional information about the context in which
+ *       the error was thrown.
+ *
+ */
+function $ExceptionHandlerProvider() {
+  this.$get = ['$log', function($log) {
+    return function(exception, cause) {
+      $log.error.apply($log, arguments);
+    };
+  }];
+}
+
+var $$ForceReflowProvider = function() {
+  this.$get = ['$document', function($document) {
+    return function(domNode) {
+      //the line below will force the browser to perform a repaint so
+      //that all the animated elements within the animation frame will
+      //be properly updated and drawn on screen. This is required to
+      //ensure that the preparation animation is properly flushed so that
+      //the active state picks up from there. DO NOT REMOVE THIS LINE.
+      //DO NOT OPTIMIZE THIS LINE. THE MINIFIER WILL REMOVE IT OTHERWISE WHICH
+      //WILL RESULT IN AN UNPREDICTABLE BUG THAT IS VERY HARD TO TRACK DOWN AND
+      //WILL TAKE YEARS AWAY FROM YOUR LIFE.
+      if (domNode) {
+        if (!domNode.nodeType && domNode instanceof jqLite) {
+          domNode = domNode[0];
+        }
+      } else {
+        domNode = $document[0].body;
+      }
+      return domNode.offsetWidth + 1;
+    };
+  }];
+};
+
+var APPLICATION_JSON = 'application/json';
+var CONTENT_TYPE_APPLICATION_JSON = {'Content-Type': APPLICATION_JSON + ';charset=utf-8'};
+var JSON_START = /^\[|^\{(?!\{)/;
+var JSON_ENDS = {
+  '[': /]$/,
+  '{': /}$/
+};
+var JSON_PROTECTION_PREFIX = /^\)\]\}',?\n/;
+var $httpMinErr = minErr('$http');
+var $httpMinErrLegacyFn = function(method) {
+  return function() {
+    throw $httpMinErr('legacy', 'The method `{0}` on the promise returned from `$http` has been disabled.', method);
+  };
+};
+
+function serializeValue(v) {
+  if (isObject(v)) {
+    return isDate(v) ? v.toISOString() : toJson(v);
+  }
+  return v;
+}
+
+
+function $HttpParamSerializerProvider() {
+  /**
+   * @ngdoc service
+   * @name $httpParamSerializer
+   * @description
+   *
+   * Default {@link $http `$http`} params serializer that converts objects to strings
+   * according to the following rules:
+   *
+   * * `{'foo': 'bar'}` results in `foo=bar`
+   * * `{'foo': Date.now()}` results in `foo=2015-04-01T09%3A50%3A49.262Z` (`toISOString()` and encoded representation of a Date object)
+   * * `{'foo': ['bar', 'baz']}` results in `foo=bar&foo=baz` (repeated key for each array element)
+   * * `{'foo': {'bar':'baz'}}` results in `foo=%7B%22bar%22%3A%22baz%22%7D"` (stringified and encoded representation of an object)
+   *
+   * Note that serializer will sort the request parameters alphabetically.
+   * */
+
+  this.$get = function() {
+    return function ngParamSerializer(params) {
+      if (!params) return '';
+      var parts = [];
+      forEachSorted(params, function(value, key) {
+        if (value === null || isUndefined(value)) return;
+        if (isArray(value)) {
+          forEach(value, function(v, k) {
+            parts.push(encodeUriQuery(key)  + '=' + encodeUriQuery(serializeValue(v)));
+          });
+        } else {
+          parts.push(encodeUriQuery(key) + '=' + encodeUriQuery(serializeValue(value)));
+        }
+      });
+
+      return parts.join('&');
+    };
+  };
+}
+
+function $HttpParamSerializerJQLikeProvider() {
+  /**
+   * @ngdoc service
+   * @name $httpParamSerializerJQLike
+   * @description
+   *
+   * Alternative {@link $http `$http`} params serializer that follows
+   * jQuery's [`param()`](http://api.jquery.com/jquery.param/) method logic.
+   * The serializer will also sort the params alphabetically.
+   *
+   * To use it for serializing `$http` request parameters, set it as the `paramSerializer` property:
+   *
+   * ```js
+   * $http({
+   *   url: myUrl,
+   *   method: 'GET',
+   *   params: myParams,
+   *   paramSerializer: '$httpParamSerializerJQLike'
+   * });
+   * ```
+   *
+   * It is also possible to set it as the default `paramSerializer` in the
+   * {@link $httpProvider#defaults `$httpProvider`}.
+   *
+   * Additionally, you can inject the serializer and use it explicitly, for example to serialize
+   * form data for submission:
+   *
+   * ```js
+   * .controller(function($http, $httpParamSerializerJQLike) {
+   *   //...
+   *
+   *   $http({
+   *     url: myUrl,
+   *     method: 'POST',
+   *     data: $httpParamSerializerJQLike(myData),
+   *     headers: {
+   *       'Content-Type': 'application/x-www-form-urlencoded'
+   *     }
+   *   });
+   *
+   * });
+   * ```
+   *
+   * */
+  this.$get = function() {
+    return function jQueryLikeParamSerializer(params) {
+      if (!params) return '';
+      var parts = [];
+      serialize(params, '', true);
+      return parts.join('&');
+
+      function serialize(toSerialize, prefix, topLevel) {
+        if (toSerialize === null || isUndefined(toSerialize)) return;
+        if (isArray(toSerialize)) {
+          forEach(toSerialize, function(value, index) {
+            serialize(value, prefix + '[' + (isObject(value) ? index : '') + ']');
+          });
+        } else if (isObject(toSerialize) && !isDate(toSerialize)) {
+          forEachSorted(toSerialize, function(value, key) {
+            serialize(value, prefix +
+                (topLevel ? '' : '[') +
+                key +
+                (topLevel ? '' : ']'));
+          });
+        } else {
+          parts.push(encodeUriQuery(prefix) + '=' + encodeUriQuery(serializeValue(toSerialize)));
+        }
+      }
+    };
+  };
+}
+
+function defaultHttpResponseTransform(data, headers) {
+  if (isString(data)) {
+    // Strip json vulnerability protection prefix and trim whitespace
+    var tempData = data.replace(JSON_PROTECTION_PREFIX, '').trim();
+
+    if (tempData) {
+      var contentType = headers('Content-Type');
+      if ((contentType && (contentType.indexOf(APPLICATION_JSON) === 0)) || isJsonLike(tempData)) {
+        data = fromJson(tempData);
+      }
+    }
+  }
+
+  return data;
+}
+
+function isJsonLike(str) {
+    var jsonStart = str.match(JSON_START);
+    return jsonStart && JSON_ENDS[jsonStart[0]].test(str);
+}
+
+/**
+ * Parse headers into key value object
+ *
+ * @param {string} headers Raw headers as a string
+ * @returns {Object} Parsed headers as key value object
+ */
+function parseHeaders(headers) {
+  var parsed = createMap(), i;
+
+  function fillInParsed(key, val) {
+    if (key) {
+      parsed[key] = parsed[key] ? parsed[key] + ', ' + val : val;
+    }
+  }
+
+  if (isString(headers)) {
+    forEach(headers.split('\n'), function(line) {
+      i = line.indexOf(':');
+      fillInParsed(lowercase(trim(line.substr(0, i))), trim(line.substr(i + 1)));
+    });
+  } else if (isObject(headers)) {
+    forEach(headers, function(headerVal, headerKey) {
+      fillInParsed(lowercase(headerKey), trim(headerVal));
+    });
+  }
+
+  return parsed;
+}
+
+
+/**
+ * Returns a function that provides access to parsed headers.
+ *
+ * Headers are lazy parsed when first requested.
+ * @see parseHeaders
+ *
+ * @param {(string|Object)} headers Headers to provide access to.
+ * @returns {function(string=)} Returns a getter function which if called with:
+ *
+ *   - if called with single an argument returns a single header value or null
+ *   - if called with no arguments returns an object containing all headers.
+ */
+function headersGetter(headers) {
+  var headersObj;
+
+  return function(name) {
+    if (!headersObj) headersObj =  parseHeaders(headers);
+
+    if (name) {
+      var value = headersObj[lowercase(name)];
+      if (value === void 0) {
+        value = null;
+      }
+      return value;
+    }
+
+    return headersObj;
+  };
+}
+
+
+/**
+ * Chain all given functions
+ *
+ * This function is used for both request and response transforming
+ *
+ * @param {*} data Data to transform.
+ * @param {function(string=)} headers HTTP headers getter fn.
+ * @param {number} status HTTP status code of the response.
+ * @param {(Function|Array.<Function>)} fns Function or an array of functions.
+ * @returns {*} Transformed data.
+ */
+function transformData(data, headers, status, fns) {
+  if (isFunction(fns)) {
+    return fns(data, headers, status);
+  }
+
+  forEach(fns, function(fn) {
+    data = fn(data, headers, status);
+  });
+
+  return data;
+}
+
+
+function isSuccess(status) {
+  return 200 <= status && status < 300;
+}
+
+
+/**
+ * @ngdoc provider
+ * @name $httpProvider
+ * @description
+ * Use `$httpProvider` to change the default behavior of the {@link ng.$http $http} service.
+ * */
+function $HttpProvider() {
+  /**
+   * @ngdoc property
+   * @name $httpProvider#defaults
+   * @description
+   *
+   * Object containing default values for all {@link ng.$http $http} requests.
+   *
+   * - **`defaults.cache`** - {Object} - an object built with {@link ng.$cacheFactory `$cacheFactory`}
+   * that will provide the cache for all requests who set their `cache` property to `true`.
+   * If you set the `defaults.cache = false` then only requests that specify their own custom
+   * cache object will be cached. See {@link $http#caching $http Caching} for more information.
+   *
+   * - **`defaults.xsrfCookieName`** - {string} - Name of cookie containing the XSRF token.
+   * Defaults value is `'XSRF-TOKEN'`.
+   *
+   * - **`defaults.xsrfHeaderName`** - {string} - Name of HTTP header to populate with the
+   * XSRF token. Defaults value is `'X-XSRF-TOKEN'`.
+   *
+   * - **`defaults.headers`** - {Object} - Default headers for all $http requests.
+   * Refer to {@link ng.$http#setting-http-headers $http} for documentation on
+   * setting default headers.
+   *     - **`defaults.headers.common`**
+   *     - **`defaults.headers.post`**
+   *     - **`defaults.headers.put`**
+   *     - **`defaults.headers.patch`**
+   *
+   *
+   * - **`defaults.paramSerializer`** - `{string|function(Object<string,string>):string}` - A function
+   *  used to the prepare string representation of request parameters (specified as an object).
+   *  If specified as string, it is interpreted as a function registered with the {@link auto.$injector $injector}.
+   *  Defaults to {@link ng.$httpParamSerializer $httpParamSerializer}.
+   *
+   **/
+  var defaults = this.defaults = {
+    // transform incoming response data
+    transformResponse: [defaultHttpResponseTransform],
+
+    // transform outgoing request data
+    transformRequest: [function(d) {
+      return isObject(d) && !isFile(d) && !isBlob(d) && !isFormData(d) ? toJson(d) : d;
+    }],
+
+    // default headers
+    headers: {
+      common: {
+        'Accept': 'application/json, text/plain, */*'
+      },
+      post:   shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+      put:    shallowCopy(CONTENT_TYPE_APPLICATION_JSON),
+      patch:  shallowCopy(CONTENT_TYPE_APPLICATION_JSON)
+    },
+
+    xsrfCookieName: 'XSRF-TOKEN',
+    xsrfHeaderName: 'X-XSRF-TOKEN',
+
+    paramSerializer: '$httpParamSerializer'
+  };
+
+  var useApplyAsync = false;
+  /**
+   * @ngdoc method
+   * @name $httpProvider#useApplyAsync
+   * @description
+   *
+   * Configure $http service to combine processing of multiple http responses received at around
+   * the same time via {@link ng.$rootScope.Scope#$applyAsync $rootScope.$applyAsync}. This can result in
+   * significant performance improvement for bigger applications that make many HTTP requests
+   * concurrently (common during application bootstrap).
+   *
+   * Defaults to false. If no value is specified, returns the current configured value.
+   *
+   * @param {boolean=} value If true, when requests are loaded, they will schedule a deferred
+   *    "apply" on the next tick, giving time for subsequent requests in a roughly ~10ms window
+   *    to load and share the same digest cycle.
+   *
+   * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+   *    otherwise, returns the current configured value.
+   **/
+  this.useApplyAsync = function(value) {
+    if (isDefined(value)) {
+      useApplyAsync = !!value;
+      return this;
+    }
+    return useApplyAsync;
+  };
+
+  var useLegacyPromise = true;
+  /**
+   * @ngdoc method
+   * @name $httpProvider#useLegacyPromiseExtensions
+   * @description
+   *
+   * Configure `$http` service to return promises without the shorthand methods `success` and `error`.
+   * This should be used to make sure that applications work without these methods.
+   *
+   * Defaults to true. If no value is specified, returns the current configured value.
+   *
+   * @param {boolean=} value If true, `$http` will return a promise with the deprecated legacy `success` and `error` methods.
+   *
+   * @returns {boolean|Object} If a value is specified, returns the $httpProvider for chaining.
+   *    otherwise, returns the current configured value.
+   **/
+  this.useLegacyPromiseExtensions = function(value) {
+    if (isDefined(value)) {
+      useLegacyPromise = !!value;
+      return this;
+    }
+    return useLegacyPromise;
+  };
+
+  /**
+   * @ngdoc property
+   * @name $httpProvider#interceptors
+   * @description
+   *
+   * Array containing service factories for all synchronous or asynchronous {@link ng.$http $http}
+   * pre-processing of request or postprocessing of responses.
+   *
+   * These service factories are ordered by request, i.e. they are applied in the same order as the
+   * array, on request, but reverse order, on response.
+   *
+   * {@link ng.$http#interceptors Interceptors detailed info}
+   **/
+  var interceptorFactories = this.interceptors = [];
+
+  this.$get = ['$httpBackend', '$$cookieReader', '$cacheFactory', '$rootScope', '$q', '$injector',
+      function($httpBackend, $$cookieReader, $cacheFactory, $rootScope, $q, $injector) {
+
+    var defaultCache = $cacheFactory('$http');
+
+    /**
+     * Make sure that default param serializer is exposed as a function
+     */
+    defaults.paramSerializer = isString(defaults.paramSerializer) ?
+      $injector.get(defaults.paramSerializer) : defaults.paramSerializer;
+
+    /**
+     * Interceptors stored in reverse order. Inner interceptors before outer interceptors.
+     * The reversal is needed so that we can build up the interception chain around the
+     * server request.
+     */
+    var reversedInterceptors = [];
+
+    forEach(interceptorFactories, function(interceptorFactory) {
+      reversedInterceptors.unshift(isString(interceptorFactory)
+          ? $injector.get(interceptorFactory) : $injector.invoke(interceptorFactory));
+    });
+
+    /**
+     * @ngdoc service
+     * @kind function
+     * @name $http
+     * @requires ng.$httpBackend
+     * @requires $cacheFactory
+     * @requires $rootScope
+     * @requires $q
+     * @requires $injector
+     *
+     * @description
+     * The `$http` service is a core Angular service that facilitates communication with the remote
+     * HTTP servers via the browser's [XMLHttpRequest](https://developer.mozilla.org/en/xmlhttprequest)
+     * object or via [JSONP](http://en.wikipedia.org/wiki/JSONP).
+     *
+     * For unit testing applications that use `$http` service, see
+     * {@link ngMock.$httpBackend $httpBackend mock}.
+     *
+     * For a higher level of abstraction, please check out the {@link ngResource.$resource
+     * $resource} service.
+     *
+     * The $http API is based on the {@link ng.$q deferred/promise APIs} exposed by
+     * the $q service. While for simple usage patterns this doesn't matter much, for advanced usage
+     * it is important to familiarize yourself with these APIs and the guarantees they provide.
+     *
+     *
+     * ## General usage
+     * The `$http` service is a function which takes a single argument — a {@link $http#usage configuration object} —
+     * that is used to generate an HTTP request and returns  a {@link ng.$q promise}.
+     *
+     * ```js
+     *   // Simple GET request example:
+     *   $http({
+     *     method: 'GET',
+     *     url: '/someUrl'
+     *   }).then(function successCallback(response) {
+     *       // this callback will be called asynchronously
+     *       // when the response is available
+     *     }, function errorCallback(response) {
+     *       // called asynchronously if an error occurs
+     *       // or server returns response with an error status.
+     *     });
+     * ```
+     *
+     * The response object has these properties:
+     *
+     *   - **data** – `{string|Object}` – The response body transformed with the transform
+     *     functions.
+     *   - **status** – `{number}` – HTTP status code of the response.
+     *   - **headers** – `{function([headerName])}` – Header getter function.
+     *   - **config** – `{Object}` – The configuration object that was used to generate the request.
+     *   - **statusText** – `{string}` – HTTP status text of the response.
+     *
+     * A response status code between 200 and 299 is considered a success status and
+     * will result in the success callback being called. Note that if the response is a redirect,
+     * XMLHttpRequest will transparently follow it, meaning that the error callback will not be
+     * called for such responses.
+     *
+     *
+     * ## Shortcut methods
+     *
+     * Shortcut methods are also available. All shortcut methods require passing in the URL, and
+     * request data must be passed in for POST/PUT requests. An optional config can be passed as the
+     * last argument.
+     *
+     * ```js
+     *   $http.get('/someUrl', config).then(successCallback, errorCallback);
+     *   $http.post('/someUrl', data, config).then(successCallback, errorCallback);
+     * ```
+     *
+     * Complete list of shortcut methods:
+     *
+     * - {@link ng.$http#get $http.get}
+     * - {@link ng.$http#head $http.head}
+     * - {@link ng.$http#post $http.post}
+     * - {@link ng.$http#put $http.put}
+     * - {@link ng.$http#delete $http.delete}
+     * - {@link ng.$http#jsonp $http.jsonp}
+     * - {@link ng.$http#patch $http.patch}
+     *
+     *
+     * ## Writing Unit Tests that use $http
+     * When unit testing (using {@link ngMock ngMock}), it is necessary to call
+     * {@link ngMock.$httpBackend#flush $httpBackend.flush()} to flush each pending
+     * request using trained responses.
+     *
+     * ```
+     * $httpBackend.expectGET(...);
+     * $http.get(...);
+     * $httpBackend.flush();
+     * ```
+     *
+     * ## Deprecation Notice
+     * <div class="alert alert-danger">
+     *   The `$http` legacy promise methods `success` and `error` have been deprecated.
+     *   Use the standard `then` method instead.
+     *   If {@link $httpProvider#useLegacyPromiseExtensions `$httpProvider.useLegacyPromiseExtensions`} is set to
+     *   `false` then these methods will throw {@link $http:legacy `$http/legacy`} error.
+     * </div>
+     *
+     * ## Setting HTTP Headers
+     *
+     * The $http service will automatically add certain HTTP headers to all requests. These defaults
+     * can be fully configured by accessing the `$httpProvider.defaults.headers` configuration
+     * object, which currently contains this default configuration:
+     *
+     * - `$httpProvider.defaults.headers.common` (headers that are common for all requests):
+     *   - `Accept: application/json, text/plain, * / *`
+     * - `$httpProvider.defaults.headers.post`: (header defaults for POST requests)
+     *   - `Content-Type: application/json`
+     * - `$httpProvider.defaults.headers.put` (header defaults for PUT requests)
+     *   - `Content-Type: application/json`
+     *
+     * To add or overwrite these defaults, simply add or remove a property from these configuration
+     * objects. To add headers for an HTTP method other than POST or PUT, simply add a new object
+     * with the lowercased HTTP method name as the key, e.g.
+     * `$httpProvider.defaults.headers.get = { 'My-Header' : 'value' }`.
+     *
+     * The defaults can also be set at runtime via the `$http.defaults` object in the same
+     * fashion. For example:
+     *
+     * ```
+     * module.run(function($http) {
+     *   $http.defaults.headers.common.Authorization = 'Basic YmVlcDpib29w'
+     * });
+     * ```
+     *
+     * In addition, you can supply a `headers` property in the config object passed when
+     * calling `$http(config)`, which overrides the defaults without changing them globally.
+     *
+     * To explicitly remove a header automatically added via $httpProvider.defaults.headers on a per request basis,
+     * Use the `headers` property, setting the desired header to `undefined`. For example:
+     *
+     * ```js
+     * var req = {
+     *  method: 'POST',
+     *  url: 'http://example.com',
+     *  headers: {
+     *    'Content-Type': undefined
+     *  },
+     *  data: { test: 'test' }
+     * }
+     *
+     * $http(req).then(function(){...}, function(){...});
+     * ```
+     *
+     * ## Transforming Requests and Responses
+     *
+     * Both requests and responses can be transformed using transformation functions: `transformRequest`
+     * and `transformResponse`. These properties can be a single function that returns
+     * the transformed value (`function(data, headersGetter, status)`) or an array of such transformation functions,
+     * which allows you to `push` or `unshift` a new transformation function into the transformation chain.
+     *
+     * ### Default Transformations
+     *
+     * The `$httpProvider` provider and `$http` service expose `defaults.transformRequest` and
+     * `defaults.transformResponse` properties. If a request does not provide its own transformations
+     * then these will be applied.
+     *
+     * You can augment or replace the default transformations by modifying these properties by adding to or
+     * replacing the array.
+     *
+     * Angular provides the following default transformations:
+     *
+     * Request transformations (`$httpProvider.defaults.transformRequest` and `$http.defaults.transformRequest`):
+     *
+     * - If the `data` property of the request configuration object contains an object, serialize it
+     *   into JSON format.
+     *
+     * Response transformations (`$httpProvider.defaults.transformResponse` and `$http.defaults.transformResponse`):
+     *
+     *  - If XSRF prefix is detected, strip it (see Security Considerations section below).
+     *  - If JSON response is detected, deserialize it using a JSON parser.
+     *
+     *
+     * ### Overriding the Default Transformations Per Request
+     *
+     * If you wish override the request/response transformations only for a single request then provide
+     * `transformRequest` and/or `transformResponse` properties on the configuration object passed
+     * into `$http`.
+     *
+     * Note that if you provide these properties on the config object the default transformations will be
+     * overwritten. If you wish to augment the default transformations then you must include them in your
+     * local transformation array.
+     *
+     * The following code demonstrates adding a new response transformation to be run after the default response
+     * transformations have been run.
+     *
+     * ```js
+     * function appendTransform(defaults, transform) {
+     *
+     *   // We can't guarantee that the default transformation is an array
+     *   defaults = angular.isArray(defaults) ? defaults : [defaults];
+     *
+     *   // Append the new transformation to the defaults
+     *   return defaults.concat(transform);
+     * }
+     *
+     * $http({
+     *   url: '...',
+     *   method: 'GET',
+     *   transformResponse: appendTransform($http.defaults.transformResponse, function(value) {
+     *     return doTransform(value);
+     *   })
+     * });
+     * ```
+     *
+     *
+     * ## Caching
+     *
+     * To enable caching, set the request configuration `cache` property to `true` (to use default
+     * cache) or to a custom cache object (built with {@link ng.$cacheFactory `$cacheFactory`}).
+     * When the cache is enabled, `$http` stores the response from the server in the specified
+     * cache. The next time the same request is made, the response is served from the cache without
+     * sending a request to the server.
+     *
+     * Note that even if the response is served from cache, delivery of the data is asynchronous in
+     * the same way that real requests are.
+     *
+     * If there are multiple GET requests for the same URL that should be cached using the same
+     * cache, but the cache is not populated yet, only one request to the server will be made and
+     * the remaining requests will be fulfilled using the response from the first request.
+     *
+     * You can change the default cache to a new object (built with
+     * {@link ng.$cacheFactory `$cacheFactory`}) by updating the
+     * {@link ng.$http#defaults `$http.defaults.cache`} property. All requests who set
+     * their `cache` property to `true` will now use this cache object.
+     *
+     * If you set the default cache to `false` then only requests that specify their own custom
+     * cache object will be cached.
+     *
+     * ## Interceptors
+     *
+     * Before you start creating interceptors, be sure to understand the
+     * {@link ng.$q $q and deferred/promise APIs}.
+     *
+     * For purposes of global error handling, authentication, or any kind of synchronous or
+     * asynchronous pre-processing of request or postprocessing of responses, it is desirable to be
+     * able to intercept requests before they are handed to the server and
+     * responses before they are handed over to the application code that
+     * initiated these requests. The interceptors leverage the {@link ng.$q
+     * promise APIs} to fulfill this need for both synchronous and asynchronous pre-processing.
+     *
+     * The interceptors are service factories that are registered with the `$httpProvider` by
+     * adding them to the `$httpProvider.interceptors` array. The factory is called and
+     * injected with dependencies (if specified) and returns the interceptor.
+     *
+     * There are two kinds of interceptors (and two kinds of rejection interceptors):
+     *
+     *   * `request`: interceptors get called with a http {@link $http#usage config} object. The function is free to
+     *     modify the `config` object or create a new one. The function needs to return the `config`
+     *     object directly, or a promise containing the `config` or a new `config` object.
+     *   * `requestError`: interceptor gets called when a previous interceptor threw an error or
+     *     resolved with a rejection.
+     *   * `response`: interceptors get called with http `response` object. The function is free to
+     *     modify the `response` object or create a new one. The function needs to return the `response`
+     *     object directly, or as a promise containing the `response` or a new `response` object.
+     *   * `responseError`: interceptor gets called when a previous interceptor threw an error or
+     *     resolved with a rejection.
+     *
+     *
+     * ```js
+     *   // register the interceptor as a service
+     *   $provide.factory('myHttpInterceptor', function($q, dependency1, dependency2) {
+     *     return {
+     *       // optional method
+     *       'request': function(config) {
+     *         // do something on success
+     *         return config;
+     *       },
+     *
+     *       // optional method
+     *      'requestError': function(rejection) {
+     *         // do something on error
+     *         if (canRecover(rejection)) {
+     *           return responseOrNewPromise
+     *         }
+     *         return $q.reject(rejection);
+     *       },
+     *
+     *
+     *
+     *       // optional method
+     *       'response': function(response) {
+     *         // do something on success
+     *         return response;
+     *       },
+     *
+     *       // optional method
+     *      'responseError': function(rejection) {
+     *         // do something on error
+     *         if (canRecover(rejection)) {
+     *           return responseOrNewPromise
+     *         }
+     *         return $q.reject(rejection);
+     *       }
+     *     };
+     *   });
+     *
+     *   $httpProvider.interceptors.push('myHttpInterceptor');
+     *
+     *
+     *   // alternatively, register the interceptor via an anonymous factory
+     *   $httpProvider.interceptors.push(function($q, dependency1, dependency2) {
+     *     return {
+     *      'request': function(config) {
+     *          // same as above
+     *       },
+     *
+     *       'response': function(response) {
+     *          // same as above
+     *       }
+     *     };
+     *   });
+     * ```
+     *
+     * ## Security Considerations
+     *
+     * When designing web applications, consider security threats from:
+     *
+     * - [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+     * - [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery)
+     *
+     * Both server and the client must cooperate in order to eliminate these threats. Angular comes
+     * pre-configured with strategies that address these issues, but for this to work backend server
+     * cooperation is required.
+     *
+     * ### JSON Vulnerability Protection
+     *
+     * A [JSON vulnerability](http://haacked.com/archive/2008/11/20/anatomy-of-a-subtle-json-vulnerability.aspx)
+     * allows third party website to turn your JSON resource URL into
+     * [JSONP](http://en.wikipedia.org/wiki/JSONP) request under some conditions. To
+     * counter this your server can prefix all JSON requests with following string `")]}',\n"`.
+     * Angular will automatically strip the prefix before processing it as JSON.
+     *
+     * For example if your server needs to return:
+     * ```js
+     * ['one','two']
+     * ```
+     *
+     * which is vulnerable to attack, your server can return:
+     * ```js
+     * )]}',
+     * ['one','two']
+     * ```
+     *
+     * Angular will strip the prefix, before processing the JSON.
+     *
+     *
+     * ### Cross Site Request Forgery (XSRF) Protection
+     *
+     * [XSRF](http://en.wikipedia.org/wiki/Cross-site_request_forgery) is a technique by which
+     * an unauthorized site can gain your user's private data. Angular provides a mechanism
+     * to counter XSRF. When performing XHR requests, the $http service reads a token from a cookie
+     * (by default, `XSRF-TOKEN`) and sets it as an HTTP header (`X-XSRF-TOKEN`). Since only
+     * JavaScript that runs on your domain could read the cookie, your server can be assured that
+     * the XHR came from JavaScript running on your domain. The header will not be set for
+     * cross-domain requests.
+     *
+     * To take advantage of this, your server needs to set a token in a JavaScript readable session
+     * cookie called `XSRF-TOKEN` on the first HTTP GET request. On subsequent XHR requests the
+     * server can verify that the cookie matches `X-XSRF-TOKEN` HTTP header, and therefore be sure
+     * that only JavaScript running on your domain could have sent the request. The token must be
+     * unique for each user and must be verifiable by the server (to prevent the JavaScript from
+     * making up its own tokens). We recommend that the token is a digest of your site's
+     * authentication cookie with a [salt](https://en.wikipedia.org/wiki/Salt_(cryptography&#41;)
+     * for added security.
+     *
+     * The name of the headers can be specified using the xsrfHeaderName and xsrfCookieName
+     * properties of either $httpProvider.defaults at config-time, $http.defaults at run-time,
+     * or the per-request config object.
+     *
+     * In order to prevent collisions in environments where multiple Angular apps share the
+     * same domain or subdomain, we recommend that each application uses unique cookie name.
+     *
+     * @param {object} config Object describing the request to be made and how it should be
+     *    processed. The object has following properties:
+     *
+     *    - **method** – `{string}` – HTTP method (e.g. 'GET', 'POST', etc)
+     *    - **url** – `{string}` – Absolute or relative URL of the resource that is being requested.
+     *    - **params** – `{Object.<string|Object>}` – Map of strings or objects which will be serialized
+     *      with the `paramSerializer` and appended as GET parameters.
+     *    - **data** – `{string|Object}` – Data to be sent as the request message data.
+     *    - **headers** – `{Object}` – Map of strings or functions which return strings representing
+     *      HTTP headers to send to the server. If the return value of a function is null, the
+     *      header will not be sent. Functions accept a config object as an argument.
+     *    - **xsrfHeaderName** – `{string}` – Name of HTTP header to populate with the XSRF token.
+     *    - **xsrfCookieName** – `{string}` – Name of cookie containing the XSRF token.
+     *    - **transformRequest** –
+     *      `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+     *      transform function or an array of such functions. The transform function takes the http
+     *      request body and headers and returns its transformed (typically serialized) version.
+     *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default Transformations}
+     *    - **transformResponse** –
+     *      `{function(data, headersGetter, status)|Array.<function(data, headersGetter, status)>}` –
+     *      transform function or an array of such functions. The transform function takes the http
+     *      response body, headers and status and returns its transformed (typically deserialized) version.
+     *      See {@link ng.$http#overriding-the-default-transformations-per-request
+     *      Overriding the Default TransformationjqLiks}
+     *    - **paramSerializer** - `{string|function(Object<string,string>):string}` - A function used to
+     *      prepare the string representation of request parameters (specified as an object).
+     *      If specified as string, it is interpreted as function registered with the
+     *      {@link $injector $injector}, which means you can create your own serializer
+     *      by registering it as a {@link auto.$provide#service service}.
+     *      The default serializer is the {@link $httpParamSerializer $httpParamSerializer};
+     *      alternatively, you can use the {@link $httpParamSerializerJQLike $httpParamSerializerJQLike}
+     *    - **cache** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
+     *      GET request, otherwise if a cache instance built with
+     *      {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
+     *      caching.
+     *    - **timeout** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise}
+     *      that should abort the request when resolved.
+     *    - **withCredentials** - `{boolean}` - whether to set the `withCredentials` flag on the
+     *      XHR object. See [requests with credentials](https://developer.mozilla.org/docs/Web/HTTP/Access_control_CORS#Requests_with_credentials)
+     *      for more information.
+     *    - **responseType** - `{string}` - see
+     *      [XMLHttpRequest.responseType](https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest#xmlhttprequest-responsetype).
+     *
+     * @returns {HttpPromise} Returns a {@link ng.$q `Promise}` that will be resolved to a response object
+     *                        when the request succeeds or fails.
+     *
+     *
+     * @property {Array.<Object>} pendingRequests Array of config objects for currently pending
+     *   requests. This is primarily meant to be used for debugging purposes.
+     *
+     *
+     * @example
+<example module="httpExample">
+<file name="index.html">
+  <div ng-controller="FetchController">
+    <select ng-model="method" aria-label="Request method">
+      <option>GET</option>
+      <option>JSONP</option>
+    </select>
+    <input type="text" ng-model="url" size="80" aria-label="URL" />
+    <button id="fetchbtn" ng-click="fetch()">fetch</button><br>
+    <button id="samplegetbtn" ng-click="updateModel('GET', 'http-hello.html')">Sample GET</button>
+    <button id="samplejsonpbtn"
+      ng-click="updateModel('JSONP',
+                    'https://angularjs.org/greet.php?callback=JSON_CALLBACK&name=Super%20Hero')">
+      Sample JSONP
+    </button>
+    <button id="invalidjsonpbtn"
+      ng-click="updateModel('JSONP', 'https://angularjs.org/doesntexist&callback=JSON_CALLBACK')">
+        Invalid JSONP
+      </button>
+    <pre>http status code: {{status}}</pre>
+    <pre>http response data: {{data}}</pre>
+  </div>
+</file>
+<file name="script.js">
+  angular.module('httpExample', [])
+    .controller('FetchController', ['$scope', '$http', '$templateCache',
+      function($scope, $http, $templateCache) {
+        $scope.method = 'GET';
+        $scope.url = 'http-hello.html';
+
+        $scope.fetch = function() {
+          $scope.code = null;
+          $scope.response = null;
+
+          $http({method: $scope.method, url: $scope.url, cache: $templateCache}).
+            then(function(response) {
+              $scope.status = response.status;
+              $scope.data = response.data;
+            }, function(response) {
+              $scope.data = response.data || "Request failed";
+              $scope.status = response.status;
+          });
+        };
+
+        $scope.updateModel = function(method, url) {
+          $scope.method = method;
+          $scope.url = url;
+        };
+      }]);
+</file>
+<file name="http-hello.html">
+  Hello, $http!
+</file>
+<file name="protractor.js" type="protractor">
+  var status = element(by.binding('status'));
+  var data = element(by.binding('data'));
+  var fetchBtn = element(by.id('fetchbtn'));
+  var sampleGetBtn = element(by.id('samplegetbtn'));
+  var sampleJsonpBtn = element(by.id('samplejsonpbtn'));
+  var invalidJsonpBtn = element(by.id('invalidjsonpbtn'));
+
+  it('should make an xhr GET request', function() {
+    sampleGetBtn.click();
+    fetchBtn.click();
+    expect(status.getText()).toMatch('200');
+    expect(data.getText()).toMatch(/Hello, \$http!/);
+  });
+
+// Commented out due to flakes. See https://github.com/angular/angular.js/issues/9185
+// it('should make a JSONP request to angularjs.org', function() {
+//   sampleJsonpBtn.click();
+//   fetchBtn.click();
+//   expect(status.getText()).toMatch('200');
+//   expect(data.getText()).toMatch(/Super Hero!/);
+// });
+
+  it('should make JSONP request to invalid URL and invoke the error handler',
+      function() {
+    invalidJsonpBtn.click();
+    fetchBtn.click();
+    expect(status.getText()).toMatch('0');
+    expect(data.getText()).toMatch('Request failed');
+  });
+</file>
+</example>
+     */
+    function $http(requestConfig) {
+
+      if (!angular.isObject(requestConfig)) {
+        throw minErr('$http')('badreq', 'Http request configuration must be an object.  Received: {0}', requestConfig);
+      }
+
+      if (!isString(requestConfig.url)) {
+        throw minErr('$http')('badreq', 'Http request configuration url must be a string.  Received: {0}', requestConfig.url);
+      }
+
+      var config = extend({
+        method: 'get',
+        transformRequest: defaults.transformRequest,
+        transformResponse: defaults.transformResponse,
+        paramSerializer: defaults.paramSerializer
+      }, requestConfig);
+
+      config.headers = mergeHeaders(requestConfig);
+      config.method = uppercase(config.method);
+      config.paramSerializer = isString(config.paramSerializer) ?
+        $injector.get(config.paramSerializer) : config.paramSerializer;
+
+      var serverRequest = function(config) {
+        var headers = config.headers;
+        var reqData = transformData(config.data, headersGetter(headers), undefined, config.transformRequest);
+
+        // strip content-type if data is undefined
+        if (isUndefined(reqData)) {
+          forEach(headers, function(value, header) {
+            if (lowercase(header) === 'content-type') {
+                delete headers[header];
+            }
+          });
+        }
+
+        if (isUndefined(config.withCredentials) && !isUndefined(defaults.withCredentials)) {
+          config.withCredentials = defaults.withCredentials;
+        }
+
+        // send request
+        return sendReq(config, reqData).then(transformResponse, transformResponse);
+      };
+
+      var chain = [serverRequest, undefined];
+      var promise = $q.when(config);
+
+      // apply interceptors
+      forEach(reversedInterceptors, function(interceptor) {
+        if (interceptor.request || interceptor.requestError) {
+          chain.unshift(interceptor.request, interceptor.requestError);
+        }
+        if (interceptor.response || interceptor.responseError) {
+          chain.push(interceptor.response, interceptor.responseError);
+        }
+      });
+
+      while (chain.length) {
+        var thenFn = chain.shift();
+        var rejectFn = chain.shift();
+
+        promise = promise.then(thenFn, rejectFn);
+      }
+
+      if (useLegacyPromise) {
+        promise.success = function(fn) {
+          assertArgFn(fn, 'fn');
+
+          promise.then(function(response) {
+            fn(response.data, response.status, response.headers, config);
+          });
+          return promise;
+        };
+
+        promise.error = function(fn) {
+          assertArgFn(fn, 'fn');
+
+          promise.then(null, function(response) {
+            fn(response.data, response.status, response.headers, config);
+          });
+          return promise;
+        };
+      } else {
+        promise.success = $httpMinErrLegacyFn('success');
+        promise.error = $httpMinErrLegacyFn('error');
+      }
+
+      return promise;
+
+      function transformResponse(response) {
+        // make a copy since the response must be cacheable
+        var resp = extend({}, response);
+        resp.data = transformData(response.data, response.headers, response.status,
+                                  config.transformResponse);
+        return (isSuccess(response.status))
+          ? resp
+          : $q.reject(resp);
+      }
+
+      function executeHeaderFns(headers, config) {
+        var headerContent, processedHeaders = {};
+
+        forEach(headers, function(headerFn, header) {
+          if (isFunction(headerFn)) {
+            headerContent = headerFn(config);
+            if (headerContent != null) {
+              processedHeaders[header] = headerContent;
+            }
+          } else {
+            processedHeaders[header] = headerFn;
+          }
+        });
+
+        return processedHeaders;
+      }
+
+      function mergeHeaders(config) {
+        var defHeaders = defaults.headers,
+            reqHeaders = extend({}, config.headers),
+            defHeaderName, lowercaseDefHeaderName, reqHeaderName;
+
+        defHeaders = extend({}, defHeaders.common, defHeaders[lowercase(config.method)]);
+
+        // using for-in instead of forEach to avoid unecessary iteration after header has been found
+        defaultHeadersIteration:
+        for (defHeaderName in defHeaders) {
+          lowercaseDefHeaderName = lowercase(defHeaderName);
+
+          for (reqHeaderName in reqHeaders) {
+            if (lowercase(reqHeaderName) === lowercaseDefHeaderName) {
+              continue defaultHeadersIteration;
+            }
+          }
+
+          reqHeaders[defHeaderName] = defHeaders[defHeaderName];
+        }
+
+        // execute if header value is a function for merged headers
+        return executeHeaderFns(reqHeaders, shallowCopy(config));
+      }
+    }
+
+    $http.pendingRequests = [];
+
+    /**
+     * @ngdoc method
+     * @name $http#get
+     *
+     * @description
+     * Shortcut method to perform `GET` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#delete
+     *
+     * @description
+     * Shortcut method to perform `DELETE` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#head
+     *
+     * @description
+     * Shortcut method to perform `HEAD` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#jsonp
+     *
+     * @description
+     * Shortcut method to perform `JSONP` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request.
+     *                     The name of the callback should be the string `JSON_CALLBACK`.
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+    createShortMethods('get', 'delete', 'head', 'jsonp');
+
+    /**
+     * @ngdoc method
+     * @name $http#post
+     *
+     * @description
+     * Shortcut method to perform `POST` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {*} data Request content
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+    /**
+     * @ngdoc method
+     * @name $http#put
+     *
+     * @description
+     * Shortcut method to perform `PUT` request.
+     *
+     * @param {string} url Relative or absolute URL specifying the destination of the request
+     * @param {*} data Request content
+     * @param {Object=} config Optional configuration object
+     * @returns {HttpPromise} Future object
+     */
+
+     /**
+      * @ngdoc method
+      * @name $http#patch
+      *
+      * @description
+      * Shortcut method to perform `PATCH` request.
+      *
+      * @param {string} url Relative or absolute URL specifying the destination of the request
+      * @param {*} data Request content
+      * @param {Object=} config Optional configuration object
+      * @returns {HttpPromise} Future object
+      */
+    createShortMethodsWithData('post', 'put', 'patch');
+
+        /**
+         * @ngdoc property
+         * @name $http#defaults
+         *
+         * @description
+         * Runtime equivalent of the `$httpProvider.defaults` property. Allows configuration of
+         * default headers, withCredentials as well as request and response transformations.
+         *
+         * See "Setting HTTP Headers" and "Transforming Requests and Responses" sections above.
+         */
+    $http.defaults = defaults;
+
+
+    return $http;
+
+
+    function createShortMethods(names) {
+      forEach(arguments, function(name) {
+        $http[name] = function(url, config) {
+          return $http(extend({}, config || {}, {
+            method: name,
+            url: url
+          }));
+        };
+      });
+    }
+
+
+    function createShortMethodsWithData(name) {
+      forEach(arguments, function(name) {
+        $http[name] = function(url, data, config) {
+          return $http(extend({}, config || {}, {
+            method: name,
+            url: url,
+            data: data
+          }));
+        };
+      });
+    }
+
+
+    /**
+     * Makes the request.
+     *
+     * !!! ACCESSES CLOSURE VARS:
+     * $httpBackend, defaults, $log, $rootScope, defaultCache, $http.pendingRequests
+     */
+    function sendReq(config, reqData) {
+      var deferred = $q.defer(),
+          promise = deferred.promise,
+          cache,
+          cachedResp,
+          reqHeaders = config.headers,
+          url = buildUrl(config.url, config.paramSerializer(config.params));
+
+      $http.pendingRequests.push(config);
+      promise.then(removePendingReq, removePendingReq);
+
+
+      if ((config.cache || defaults.cache) && config.cache !== false &&
+          (config.method === 'GET' || config.method === 'JSONP')) {
+        cache = isObject(config.cache) ? config.cache
+              : isObject(defaults.cache) ? defaults.cache
+              : defaultCache;
+      }
+
+      if (cache) {
+        cachedResp = cache.get(url);
+        if (isDefined(cachedResp)) {
+          if (isPromiseLike(cachedResp)) {
+            // cached request has already been sent, but there is no response yet
+            cachedResp.then(resolvePromiseWithResult, resolvePromiseWithResult);
+          } else {
+            // serving from cache
+            if (isArray(cachedResp)) {
+              resolvePromise(cachedResp[1], cachedResp[0], shallowCopy(cachedResp[2]), cachedResp[3]);
+            } else {
+              resolvePromise(cachedResp, 200, {}, 'OK');
+            }
+          }
+        } else {
+          // put the promise for the non-transformed response into cache as a placeholder
+          cache.put(url, promise);
+        }
+      }
+
+
+      // if we won't have the response in cache, set the xsrf headers and
+      // send the request to the backend
+      if (isUndefined(cachedResp)) {
+        var xsrfValue = urlIsSameOrigin(config.url)
+            ? $$cookieReader()[config.xsrfCookieName || defaults.xsrfCookieName]
+            : undefined;
+        if (xsrfValue) {
+          reqHeaders[(config.xsrfHeaderName || defaults.xsrfHeaderName)] = xsrfValue;
+        }
+
+        $httpBackend(config.method, url, reqData, done, reqHeaders, config.timeout,
+            config.withCredentials, config.responseType);
+      }
+
+      return promise;
+
+
+      /**
+       * Callback registered to $httpBackend():
+       *  - caches the response if desired
+       *  - resolves the raw $http promise
+       *  - calls $apply
+       */
+      function done(status, response, headersString, statusText) {
+        if (cache) {
+          if (isSuccess(status)) {
+            cache.put(url, [status, response, parseHeaders(headersString), statusText]);
+          } else {
+            // remove promise from the cache
+            cache.remove(url);
+          }
+        }
+
+        function resolveHttpPromise() {
+          resolvePromise(response, status, headersString, statusText);
+        }
+
+        if (useApplyAsync) {
+          $rootScope.$applyAsync(resolveHttpPromise);
+        } else {
+          resolveHttpPromise();
+          if (!$rootScope.$$phase) $rootScope.$apply();
+        }
+      }
+
+
+      /**
+       * Resolves the raw $http promise.
+       */
+      function resolvePromise(response, status, headers, statusText) {
+        //status: HTTP response status code, 0, -1 (aborted by timeout / promise)
+        status = status >= -1 ? status : 0;
+
+        (isSuccess(status) ? deferred.resolve : deferred.reject)({
+          data: response,
+          status: status,
+          headers: headersGetter(headers),
+          config: config,
+          statusText: statusText
+        });
+      }
+
+      function resolvePromiseWithResult(result) {
+        resolvePromise(result.data, result.status, shallowCopy(result.headers()), result.statusText);
+      }
+
+      function removePendingReq() {
+        var idx = $http.pendingRequests.indexOf(config);
+        if (idx !== -1) $http.pendingRequests.splice(idx, 1);
+      }
+    }
+
+
+    function buildUrl(url, serializedParams) {
+      if (serializedParams.length > 0) {
+        url += ((url.indexOf('?') == -1) ? '?' : '&') + serializedParams;
+      }
+      return url;
+    }
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $xhrFactory
+ *
+ * @description
+ * Factory function used to create XMLHttpRequest objects.
+ *
+ * Replace or decorate this service to create your own custom XMLHttpRequest objects.
+ *
+ * ```
+ * angular.module('myApp', [])
+ * .factory('$xhrFactory', function() {
+ *   return function createXhr(method, url) {
+ *     return new window.XMLHttpRequest({mozSystem: true});
+ *   };
+ * });
+ * ```
+ *
+ * @param {string} method HTTP method of the request (GET, POST, PUT, ..)
+ * @param {string} url URL of the request.
+ */
+function $xhrFactoryProvider() {
+  this.$get = function() {
+    return function createXhr() {
+      return new window.XMLHttpRequest();
+    };
+  };
+}
+
+/**
+ * @ngdoc service
+ * @name $httpBackend
+ * @requires $window
+ * @requires $document
+ * @requires $xhrFactory
+ *
+ * @description
+ * HTTP backend used by the {@link ng.$http service} that delegates to
+ * XMLHttpRequest object or JSONP and deals with browser incompatibilities.
+ *
+ * You should never need to use this service directly, instead use the higher-level abstractions:
+ * {@link ng.$http $http} or {@link ngResource.$resource $resource}.
+ *
+ * During testing this implementation is swapped with {@link ngMock.$httpBackend mock
+ * $httpBackend} which can be trained with responses.
+ */
+function $HttpBackendProvider() {
+  this.$get = ['$browser', '$window', '$document', '$xhrFactory', function($browser, $window, $document, $xhrFactory) {
+    return createHttpBackend($browser, $xhrFactory, $browser.defer, $window.angular.callbacks, $document[0]);
+  }];
+}
+
+function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDocument) {
+  // TODO(vojta): fix the signature
+  return function(method, url, post, callback, headers, timeout, withCredentials, responseType) {
+    $browser.$$incOutstandingRequestCount();
+    url = url || $browser.url();
+
+    if (lowercase(method) == 'jsonp') {
+      var callbackId = '_' + (callbacks.counter++).toString(36);
+      callbacks[callbackId] = function(data) {
+        callbacks[callbackId].data = data;
+        callbacks[callbackId].called = true;
+      };
+
+      var jsonpDone = jsonpReq(url.replace('JSON_CALLBACK', 'angular.callbacks.' + callbackId),
+          callbackId, function(status, text) {
+        completeRequest(callback, status, callbacks[callbackId].data, "", text);
+        callbacks[callbackId] = noop;
+      });
+    } else {
+
+      var xhr = createXhr(method, url);
+
+      xhr.open(method, url, true);
+      forEach(headers, function(value, key) {
+        if (isDefined(value)) {
+            xhr.setRequestHeader(key, value);
+        }
+      });
+
+      xhr.onload = function requestLoaded() {
+        var statusText = xhr.statusText || '';
+
+        // responseText is the old-school way of retrieving response (supported by IE9)
+        // response/responseType properties were introduced in XHR Level2 spec (supported by IE10)
+        var response = ('response' in xhr) ? xhr.response : xhr.responseText;
+
+        // normalize IE9 bug (http://bugs.jquery.com/ticket/1450)
+        var status = xhr.status === 1223 ? 204 : xhr.status;
+
+        // fix status code when it is 0 (0 status is undocumented).
+        // Occurs when accessing file resources or on Android 4.1 stock browser
+        // while retrieving files from application cache.
+        if (status === 0) {
+          status = response ? 200 : urlResolve(url).protocol == 'file' ? 404 : 0;
+        }
+
+        completeRequest(callback,
+            status,
+            response,
+            xhr.getAllResponseHeaders(),
+            statusText);
+      };
+
+      var requestError = function() {
+        // The response is always empty
+        // See https://xhr.spec.whatwg.org/#request-error-steps and https://fetch.spec.whatwg.org/#concept-network-error
+        completeRequest(callback, -1, null, null, '');
+      };
+
+      xhr.onerror = requestError;
+      xhr.onabort = requestError;
+
+      if (withCredentials) {
+        xhr.withCredentials = true;
+      }
+
+      if (responseType) {
+        try {
+          xhr.responseType = responseType;
+        } catch (e) {
+          // WebKit added support for the json responseType value on 09/03/2013
+          // https://bugs.webkit.org/show_bug.cgi?id=73648. Versions of Safari prior to 7 are
+          // known to throw when setting the value "json" as the response type. Other older
+          // browsers implementing the responseType
+          //
+          // The json response type can be ignored if not supported, because JSON payloads are
+          // parsed on the client-side regardless.
+          if (responseType !== 'json') {
+            throw e;
+          }
+        }
+      }
+
+      xhr.send(isUndefined(post) ? null : post);
+    }
+
+    if (timeout > 0) {
+      var timeoutId = $browserDefer(timeoutRequest, timeout);
+    } else if (isPromiseLike(timeout)) {
+      timeout.then(timeoutRequest);
+    }
+
+
+    function timeoutRequest() {
+      jsonpDone && jsonpDone();
+      xhr && xhr.abort();
+    }
+
+    function completeRequest(callback, status, response, headersString, statusText) {
+      // cancel timeout and subsequent timeout promise resolution
+      if (isDefined(timeoutId)) {
+        $browserDefer.cancel(timeoutId);
+      }
+      jsonpDone = xhr = null;
+
+      callback(status, response, headersString, statusText);
+      $browser.$$completeOutstandingRequest(noop);
+    }
+  };
+
+  function jsonpReq(url, callbackId, done) {
+    // we can't use jQuery/jqLite here because jQuery does crazy stuff with script elements, e.g.:
+    // - fetches local scripts via XHR and evals them
+    // - adds and immediately removes script elements from the document
+    var script = rawDocument.createElement('script'), callback = null;
+    script.type = "text/javascript";
+    script.src = url;
+    script.async = true;
+
+    callback = function(event) {
+      removeEventListenerFn(script, "load", callback);
+      removeEventListenerFn(script, "error", callback);
+      rawDocument.body.removeChild(script);
+      script = null;
+      var status = -1;
+      var text = "unknown";
+
+      if (event) {
+        if (event.type === "load" && !callbacks[callbackId].called) {
+          event = { type: "error" };
+        }
+        text = event.type;
+        status = event.type === "error" ? 404 : 200;
+      }
+
+      if (done) {
+        done(status, text);
+      }
+    };
+
+    addEventListenerFn(script, "load", callback);
+    addEventListenerFn(script, "error", callback);
+    rawDocument.body.appendChild(script);
+    return callback;
+  }
+}
+
+var $interpolateMinErr = angular.$interpolateMinErr = minErr('$interpolate');
+$interpolateMinErr.throwNoconcat = function(text) {
+  throw $interpolateMinErr('noconcat',
+      "Error while interpolating: {0}\nStrict Contextual Escaping disallows " +
+      "interpolations that concatenate multiple expressions when a trusted value is " +
+      "required.  See http://docs.angularjs.org/api/ng.$sce", text);
+};
+
+$interpolateMinErr.interr = function(text, err) {
+  return $interpolateMinErr('interr', "Can't interpolate: {0}\n{1}", text, err.toString());
+};
+
+/**
+ * @ngdoc provider
+ * @name $interpolateProvider
+ *
+ * @description
+ *
+ * Used for configuring the interpolation markup. Defaults to `{{` and `}}`.
+ *
+ * @example
+<example name="custom-interpolation-markup" module="customInterpolationApp">
+<file name="index.html">
+<script>
+  var customInterpolationApp = angular.module('customInterpolationApp', []);
+
+  customInterpolationApp.config(function($interpolateProvider) {
+    $interpolateProvider.startSymbol('//');
+    $interpolateProvider.endSymbol('//');
+  });
+
+
+  customInterpolationApp.controller('DemoController', function() {
+      this.label = "This binding is brought you by // interpolation symbols.";
+  });
+</script>
+<div ng-controller="DemoController as demo">
+    //demo.label//
+</div>
+</file>
+<file name="protractor.js" type="protractor">
+  it('should interpolate binding with custom symbols', function() {
+    expect(element(by.binding('demo.label')).getText()).toBe('This binding is brought you by // interpolation symbols.');
+  });
+</file>
+</example>
+ */
+function $InterpolateProvider() {
+  var startSymbol = '{{';
+  var endSymbol = '}}';
+
+  /**
+   * @ngdoc method
+   * @name $interpolateProvider#startSymbol
+   * @description
+   * Symbol to denote start of expression in the interpolated string. Defaults to `{{`.
+   *
+   * @param {string=} value new value to set the starting symbol to.
+   * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
+   */
+  this.startSymbol = function(value) {
+    if (value) {
+      startSymbol = value;
+      return this;
+    } else {
+      return startSymbol;
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $interpolateProvider#endSymbol
+   * @description
+   * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
+   *
+   * @param {string=} value new value to set the ending symbol to.
+   * @returns {string|self} Returns the symbol when used as getter and self if used as setter.
+   */
+  this.endSymbol = function(value) {
+    if (value) {
+      endSymbol = value;
+      return this;
+    } else {
+      return endSymbol;
+    }
+  };
+
+
+  this.$get = ['$parse', '$exceptionHandler', '$sce', function($parse, $exceptionHandler, $sce) {
+    var startSymbolLength = startSymbol.length,
+        endSymbolLength = endSymbol.length,
+        escapedStartRegexp = new RegExp(startSymbol.replace(/./g, escape), 'g'),
+        escapedEndRegexp = new RegExp(endSymbol.replace(/./g, escape), 'g');
+
+    function escape(ch) {
+      return '\\\\\\' + ch;
+    }
+
+    function unescapeText(text) {
+      return text.replace(escapedStartRegexp, startSymbol).
+        replace(escapedEndRegexp, endSymbol);
+    }
+
+    function stringify(value) {
+      if (value == null) { // null || undefined
+        return '';
+      }
+      switch (typeof value) {
+        case 'string':
+          break;
+        case 'number':
+          value = '' + value;
+          break;
+        default:
+          value = toJson(value);
+      }
+
+      return value;
+    }
+
+    /**
+     * @ngdoc service
+     * @name $interpolate
+     * @kind function
+     *
+     * @requires $parse
+     * @requires $sce
+     *
+     * @description
+     *
+     * Compiles a string with markup into an interpolation function. This service is used by the
+     * HTML {@link ng.$compile $compile} service for data binding. See
+     * {@link ng.$interpolateProvider $interpolateProvider} for configuring the
+     * interpolation markup.
+     *
+     *
+     * ```js
+     *   var $interpolate = ...; // injected
+     *   var exp = $interpolate('Hello {{name | uppercase}}!');
+     *   expect(exp({name:'Angular'})).toEqual('Hello ANGULAR!');
+     * ```
+     *
+     * `$interpolate` takes an optional fourth argument, `allOrNothing`. If `allOrNothing` is
+     * `true`, the interpolation function will return `undefined` unless all embedded expressions
+     * evaluate to a value other than `undefined`.
+     *
+     * ```js
+     *   var $interpolate = ...; // injected
+     *   var context = {greeting: 'Hello', name: undefined };
+     *
+     *   // default "forgiving" mode
+     *   var exp = $interpolate('{{greeting}} {{name}}!');
+     *   expect(exp(context)).toEqual('Hello !');
+     *
+     *   // "allOrNothing" mode
+     *   exp = $interpolate('{{greeting}} {{name}}!', false, null, true);
+     *   expect(exp(context)).toBeUndefined();
+     *   context.name = 'Angular';
+     *   expect(exp(context)).toEqual('Hello Angular!');
+     * ```
+     *
+     * `allOrNothing` is useful for interpolating URLs. `ngSrc` and `ngSrcset` use this behavior.
+     *
+     * ####Escaped Interpolation
+     * $interpolate provides a mechanism for escaping interpolation markers. Start and end markers
+     * can be escaped by preceding each of their characters with a REVERSE SOLIDUS U+005C (backslash).
+     * It will be rendered as a regular start/end marker, and will not be interpreted as an expression
+     * or binding.
+     *
+     * This enables web-servers to prevent script injection attacks and defacing attacks, to some
+     * degree, while also enabling code examples to work without relying on the
+     * {@link ng.directive:ngNonBindable ngNonBindable} directive.
+     *
+     * **For security purposes, it is strongly encouraged that web servers escape user-supplied data,
+     * replacing angle brackets (&lt;, &gt;) with &amp;lt; and &amp;gt; respectively, and replacing all
+     * interpolation start/end markers with their escaped counterparts.**
+     *
+     * Escaped interpolation markers are only replaced with the actual interpolation markers in rendered
+     * output when the $interpolate service processes the text. So, for HTML elements interpolated
+     * by {@link ng.$compile $compile}, or otherwise interpolated with the `mustHaveExpression` parameter
+     * set to `true`, the interpolated text must contain an unescaped interpolation expression. As such,
+     * this is typically useful only when user-data is used in rendering a template from the server, or
+     * when otherwise untrusted data is used by a directive.
+     *
+     * <example>
+     *  <file name="index.html">
+     *    <div ng-init="username='A user'">
+     *      <p ng-init="apptitle='Escaping demo'">{{apptitle}}: \{\{ username = "defaced value"; \}\}
+     *        </p>
+     *      <p><strong>{{username}}</strong> attempts to inject code which will deface the
+     *        application, but fails to accomplish their task, because the server has correctly
+     *        escaped the interpolation start/end markers with REVERSE SOLIDUS U+005C (backslash)
+     *        characters.</p>
+     *      <p>Instead, the result of the attempted script injection is visible, and can be removed
+     *        from the database by an administrator.</p>
+     *    </div>
+     *  </file>
+     * </example>
+     *
+     * @param {string} text The text with markup to interpolate.
+     * @param {boolean=} mustHaveExpression if set to true then the interpolation string must have
+     *    embedded expression in order to return an interpolation function. Strings with no
+     *    embedded expression will return null for the interpolation function.
+     * @param {string=} trustedContext when provided, the returned function passes the interpolated
+     *    result through {@link ng.$sce#getTrusted $sce.getTrusted(interpolatedResult,
+     *    trustedContext)} before returning it.  Refer to the {@link ng.$sce $sce} service that
+     *    provides Strict Contextual Escaping for details.
+     * @param {boolean=} allOrNothing if `true`, then the returned function returns undefined
+     *    unless all embedded expressions evaluate to a value other than `undefined`.
+     * @returns {function(context)} an interpolation function which is used to compute the
+     *    interpolated string. The function has these parameters:
+     *
+     * - `context`: evaluation context for all expressions embedded in the interpolated text
+     */
+    function $interpolate(text, mustHaveExpression, trustedContext, allOrNothing) {
+      allOrNothing = !!allOrNothing;
+      var startIndex,
+          endIndex,
+          index = 0,
+          expressions = [],
+          parseFns = [],
+          textLength = text.length,
+          exp,
+          concat = [],
+          expressionPositions = [];
+
+      while (index < textLength) {
+        if (((startIndex = text.indexOf(startSymbol, index)) != -1) &&
+             ((endIndex = text.indexOf(endSymbol, startIndex + startSymbolLength)) != -1)) {
+          if (index !== startIndex) {
+            concat.push(unescapeText(text.substring(index, startIndex)));
+          }
+          exp = text.substring(startIndex + startSymbolLength, endIndex);
+          expressions.push(exp);
+          parseFns.push($parse(exp, parseStringifyInterceptor));
+          index = endIndex + endSymbolLength;
+          expressionPositions.push(concat.length);
+          concat.push('');
+        } else {
+          // we did not find an interpolation, so we have to add the remainder to the separators array
+          if (index !== textLength) {
+            concat.push(unescapeText(text.substring(index)));
+          }
+          break;
+        }
+      }
+
+      // Concatenating expressions makes it hard to reason about whether some combination of
+      // concatenated values are unsafe to use and could easily lead to XSS.  By requiring that a
+      // single expression be used for iframe[src], object[src], etc., we ensure that the value
+      // that's used is assigned or constructed by some JS code somewhere that is more testable or
+      // make it obvious that you bound the value to some user controlled value.  This helps reduce
+      // the load when auditing for XSS issues.
+      if (trustedContext && concat.length > 1) {
+          $interpolateMinErr.throwNoconcat(text);
+      }
+
+      if (!mustHaveExpression || expressions.length) {
+        var compute = function(values) {
+          for (var i = 0, ii = expressions.length; i < ii; i++) {
+            if (allOrNothing && isUndefined(values[i])) return;
+            concat[expressionPositions[i]] = values[i];
+          }
+          return concat.join('');
+        };
+
+        var getValue = function(value) {
+          return trustedContext ?
+            $sce.getTrusted(trustedContext, value) :
+            $sce.valueOf(value);
+        };
+
+        return extend(function interpolationFn(context) {
+            var i = 0;
+            var ii = expressions.length;
+            var values = new Array(ii);
+
+            try {
+              for (; i < ii; i++) {
+                values[i] = parseFns[i](context);
+              }
+
+              return compute(values);
+            } catch (err) {
+              $exceptionHandler($interpolateMinErr.interr(text, err));
+            }
+
+          }, {
+          // all of these properties are undocumented for now
+          exp: text, //just for compatibility with regular watchers created via $watch
+          expressions: expressions,
+          $$watchDelegate: function(scope, listener) {
+            var lastValue;
+            return scope.$watchGroup(parseFns, function interpolateFnWatcher(values, oldValues) {
+              var currValue = compute(values);
+              if (isFunction(listener)) {
+                listener.call(this, currValue, values !== oldValues ? lastValue : currValue, scope);
+              }
+              lastValue = currValue;
+            });
+          }
+        });
+      }
+
+      function parseStringifyInterceptor(value) {
+        try {
+          value = getValue(value);
+          return allOrNothing && !isDefined(value) ? value : stringify(value);
+        } catch (err) {
+          $exceptionHandler($interpolateMinErr.interr(text, err));
+        }
+      }
+    }
+
+
+    /**
+     * @ngdoc method
+     * @name $interpolate#startSymbol
+     * @description
+     * Symbol to denote the start of expression in the interpolated string. Defaults to `{{`.
+     *
+     * Use {@link ng.$interpolateProvider#startSymbol `$interpolateProvider.startSymbol`} to change
+     * the symbol.
+     *
+     * @returns {string} start symbol.
+     */
+    $interpolate.startSymbol = function() {
+      return startSymbol;
+    };
+
+
+    /**
+     * @ngdoc method
+     * @name $interpolate#endSymbol
+     * @description
+     * Symbol to denote the end of expression in the interpolated string. Defaults to `}}`.
+     *
+     * Use {@link ng.$interpolateProvider#endSymbol `$interpolateProvider.endSymbol`} to change
+     * the symbol.
+     *
+     * @returns {string} end symbol.
+     */
+    $interpolate.endSymbol = function() {
+      return endSymbol;
+    };
+
+    return $interpolate;
+  }];
+}
+
+function $IntervalProvider() {
+  this.$get = ['$rootScope', '$window', '$q', '$$q',
+       function($rootScope,   $window,   $q,   $$q) {
+    var intervals = {};
+
+
+     /**
+      * @ngdoc service
+      * @name $interval
+      *
+      * @description
+      * Angular's wrapper for `window.setInterval`. The `fn` function is executed every `delay`
+      * milliseconds.
+      *
+      * The return value of registering an interval function is a promise. This promise will be
+      * notified upon each tick of the interval, and will be resolved after `count` iterations, or
+      * run indefinitely if `count` is not defined. The value of the notification will be the
+      * number of iterations that have run.
+      * To cancel an interval, call `$interval.cancel(promise)`.
+      *
+      * In tests you can use {@link ngMock.$interval#flush `$interval.flush(millis)`} to
+      * move forward by `millis` milliseconds and trigger any functions scheduled to run in that
+      * time.
+      *
+      * <div class="alert alert-warning">
+      * **Note**: Intervals created by this service must be explicitly destroyed when you are finished
+      * with them.  In particular they are not automatically destroyed when a controller's scope or a
+      * directive's element are destroyed.
+      * You should take this into consideration and make sure to always cancel the interval at the
+      * appropriate moment.  See the example below for more details on how and when to do this.
+      * </div>
+      *
+      * @param {function()} fn A function that should be called repeatedly.
+      * @param {number} delay Number of milliseconds between each function call.
+      * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
+      *   indefinitely.
+      * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
+      *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+      * @param {...*=} Pass additional parameters to the executed function.
+      * @returns {promise} A promise which will be notified on each iteration.
+      *
+      * @example
+      * <example module="intervalExample">
+      * <file name="index.html">
+      *   <script>
+      *     angular.module('intervalExample', [])
+      *       .controller('ExampleController', ['$scope', '$interval',
+      *         function($scope, $interval) {
+      *           $scope.format = 'M/d/yy h:mm:ss a';
+      *           $scope.blood_1 = 100;
+      *           $scope.blood_2 = 120;
+      *
+      *           var stop;
+      *           $scope.fight = function() {
+      *             // Don't start a new fight if we are already fighting
+      *             if ( angular.isDefined(stop) ) return;
+      *
+      *             stop = $interval(function() {
+      *               if ($scope.blood_1 > 0 && $scope.blood_2 > 0) {
+      *                 $scope.blood_1 = $scope.blood_1 - 3;
+      *                 $scope.blood_2 = $scope.blood_2 - 4;
+      *               } else {
+      *                 $scope.stopFight();
+      *               }
+      *             }, 100);
+      *           };
+      *
+      *           $scope.stopFight = function() {
+      *             if (angular.isDefined(stop)) {
+      *               $interval.cancel(stop);
+      *               stop = undefined;
+      *             }
+      *           };
+      *
+      *           $scope.resetFight = function() {
+      *             $scope.blood_1 = 100;
+      *             $scope.blood_2 = 120;
+      *           };
+      *
+      *           $scope.$on('$destroy', function() {
+      *             // Make sure that the interval is destroyed too
+      *             $scope.stopFight();
+      *           });
+      *         }])
+      *       // Register the 'myCurrentTime' directive factory method.
+      *       // We inject $interval and dateFilter service since the factory method is DI.
+      *       .directive('myCurrentTime', ['$interval', 'dateFilter',
+      *         function($interval, dateFilter) {
+      *           // return the directive link function. (compile function not needed)
+      *           return function(scope, element, attrs) {
+      *             var format,  // date format
+      *                 stopTime; // so that we can cancel the time updates
+      *
+      *             // used to update the UI
+      *             function updateTime() {
+      *               element.text(dateFilter(new Date(), format));
+      *             }
+      *
+      *             // watch the expression, and update the UI on change.
+      *             scope.$watch(attrs.myCurrentTime, function(value) {
+      *               format = value;
+      *               updateTime();
+      *             });
+      *
+      *             stopTime = $interval(updateTime, 1000);
+      *
+      *             // listen on DOM destroy (removal) event, and cancel the next UI update
+      *             // to prevent updating time after the DOM element was removed.
+      *             element.on('$destroy', function() {
+      *               $interval.cancel(stopTime);
+      *             });
+      *           }
+      *         }]);
+      *   </script>
+      *
+      *   <div>
+      *     <div ng-controller="ExampleController">
+      *       <label>Date format: <input ng-model="format"></label> <hr/>
+      *       Current time is: <span my-current-time="format"></span>
+      *       <hr/>
+      *       Blood 1 : <font color='red'>{{blood_1}}</font>
+      *       Blood 2 : <font color='red'>{{blood_2}}</font>
+      *       <button type="button" data-ng-click="fight()">Fight</button>
+      *       <button type="button" data-ng-click="stopFight()">StopFight</button>
+      *       <button type="button" data-ng-click="resetFight()">resetFight</button>
+      *     </div>
+      *   </div>
+      *
+      * </file>
+      * </example>
+      */
+    function interval(fn, delay, count, invokeApply) {
+      var hasParams = arguments.length > 4,
+          args = hasParams ? sliceArgs(arguments, 4) : [],
+          setInterval = $window.setInterval,
+          clearInterval = $window.clearInterval,
+          iteration = 0,
+          skipApply = (isDefined(invokeApply) && !invokeApply),
+          deferred = (skipApply ? $$q : $q).defer(),
+          promise = deferred.promise;
+
+      count = isDefined(count) ? count : 0;
+
+      promise.then(null, null, (!hasParams) ? fn : function() {
+        fn.apply(null, args);
+      });
+
+      promise.$$intervalId = setInterval(function tick() {
+        deferred.notify(iteration++);
+
+        if (count > 0 && iteration >= count) {
+          deferred.resolve(iteration);
+          clearInterval(promise.$$intervalId);
+          delete intervals[promise.$$intervalId];
+        }
+
+        if (!skipApply) $rootScope.$apply();
+
+      }, delay);
+
+      intervals[promise.$$intervalId] = deferred;
+
+      return promise;
+    }
+
+
+     /**
+      * @ngdoc method
+      * @name $interval#cancel
+      *
+      * @description
+      * Cancels a task associated with the `promise`.
+      *
+      * @param {Promise=} promise returned by the `$interval` function.
+      * @returns {boolean} Returns `true` if the task was successfully canceled.
+      */
+    interval.cancel = function(promise) {
+      if (promise && promise.$$intervalId in intervals) {
+        intervals[promise.$$intervalId].reject('canceled');
+        $window.clearInterval(promise.$$intervalId);
+        delete intervals[promise.$$intervalId];
+        return true;
+      }
+      return false;
+    };
+
+    return interval;
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $locale
+ *
+ * @description
+ * $locale service provides localization rules for various Angular components. As of right now the
+ * only public api is:
+ *
+ * * `id` – `{string}` – locale id formatted as `languageId-countryId` (e.g. `en-us`)
+ */
+
+var PATH_MATCH = /^([^\?#]*)(\?([^#]*))?(#(.*))?$/,
+    DEFAULT_PORTS = {'http': 80, 'https': 443, 'ftp': 21};
+var $locationMinErr = minErr('$location');
+
+
+/**
+ * Encode path using encodeUriSegment, ignoring forward slashes
+ *
+ * @param {string} path Path to encode
+ * @returns {string}
+ */
+function encodePath(path) {
+  var segments = path.split('/'),
+      i = segments.length;
+
+  while (i--) {
+    segments[i] = encodeUriSegment(segments[i]);
+  }
+
+  return segments.join('/');
+}
+
+function parseAbsoluteUrl(absoluteUrl, locationObj) {
+  var parsedUrl = urlResolve(absoluteUrl);
+
+  locationObj.$$protocol = parsedUrl.protocol;
+  locationObj.$$host = parsedUrl.hostname;
+  locationObj.$$port = toInt(parsedUrl.port) || DEFAULT_PORTS[parsedUrl.protocol] || null;
+}
+
+
+function parseAppUrl(relativeUrl, locationObj) {
+  var prefixed = (relativeUrl.charAt(0) !== '/');
+  if (prefixed) {
+    relativeUrl = '/' + relativeUrl;
+  }
+  var match = urlResolve(relativeUrl);
+  locationObj.$$path = decodeURIComponent(prefixed && match.pathname.charAt(0) === '/' ?
+      match.pathname.substring(1) : match.pathname);
+  locationObj.$$search = parseKeyValue(match.search);
+  locationObj.$$hash = decodeURIComponent(match.hash);
+
+  // make sure path starts with '/';
+  if (locationObj.$$path && locationObj.$$path.charAt(0) != '/') {
+    locationObj.$$path = '/' + locationObj.$$path;
+  }
+}
+
+
+/**
+ *
+ * @param {string} begin
+ * @param {string} whole
+ * @returns {string} returns text from whole after begin or undefined if it does not begin with
+ *                   expected string.
+ */
+function beginsWith(begin, whole) {
+  if (whole.indexOf(begin) === 0) {
+    return whole.substr(begin.length);
+  }
+}
+
+
+function stripHash(url) {
+  var index = url.indexOf('#');
+  return index == -1 ? url : url.substr(0, index);
+}
+
+function trimEmptyHash(url) {
+  return url.replace(/(#.+)|#$/, '$1');
+}
+
+
+function stripFile(url) {
+  return url.substr(0, stripHash(url).lastIndexOf('/') + 1);
+}
+
+/* return the server only (scheme://host:port) */
+function serverBase(url) {
+  return url.substring(0, url.indexOf('/', url.indexOf('//') + 2));
+}
+
+
+/**
+ * LocationHtml5Url represents an url
+ * This object is exposed as $location service when HTML5 mode is enabled and supported
+ *
+ * @constructor
+ * @param {string} appBase application base URL
+ * @param {string} appBaseNoFile application base URL stripped of any filename
+ * @param {string} basePrefix url path prefix
+ */
+function LocationHtml5Url(appBase, appBaseNoFile, basePrefix) {
+  this.$$html5 = true;
+  basePrefix = basePrefix || '';
+  parseAbsoluteUrl(appBase, this);
+
+
+  /**
+   * Parse given html5 (regular) url string into properties
+   * @param {string} url HTML5 url
+   * @private
+   */
+  this.$$parse = function(url) {
+    var pathUrl = beginsWith(appBaseNoFile, url);
+    if (!isString(pathUrl)) {
+      throw $locationMinErr('ipthprfx', 'Invalid url "{0}", missing path prefix "{1}".', url,
+          appBaseNoFile);
+    }
+
+    parseAppUrl(pathUrl, this);
+
+    if (!this.$$path) {
+      this.$$path = '/';
+    }
+
+    this.$$compose();
+  };
+
+  /**
+   * Compose url and update `absUrl` property
+   * @private
+   */
+  this.$$compose = function() {
+    var search = toKeyValue(this.$$search),
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+
+    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    this.$$absUrl = appBaseNoFile + this.$$url.substr(1); // first char is always '/'
+  };
+
+  this.$$parseLinkUrl = function(url, relHref) {
+    if (relHref && relHref[0] === '#') {
+      // special case for links to hash fragments:
+      // keep the old url and only replace the hash fragment
+      this.hash(relHref.slice(1));
+      return true;
+    }
+    var appUrl, prevAppUrl;
+    var rewrittenUrl;
+
+    if (isDefined(appUrl = beginsWith(appBase, url))) {
+      prevAppUrl = appUrl;
+      if (isDefined(appUrl = beginsWith(basePrefix, appUrl))) {
+        rewrittenUrl = appBaseNoFile + (beginsWith('/', appUrl) || appUrl);
+      } else {
+        rewrittenUrl = appBase + prevAppUrl;
+      }
+    } else if (isDefined(appUrl = beginsWith(appBaseNoFile, url))) {
+      rewrittenUrl = appBaseNoFile + appUrl;
+    } else if (appBaseNoFile == url + '/') {
+      rewrittenUrl = appBaseNoFile;
+    }
+    if (rewrittenUrl) {
+      this.$$parse(rewrittenUrl);
+    }
+    return !!rewrittenUrl;
+  };
+}
+
+
+/**
+ * LocationHashbangUrl represents url
+ * This object is exposed as $location service when developer doesn't opt into html5 mode.
+ * It also serves as the base class for html5 mode fallback on legacy browsers.
+ *
+ * @constructor
+ * @param {string} appBase application base URL
+ * @param {string} appBaseNoFile application base URL stripped of any filename
+ * @param {string} hashPrefix hashbang prefix
+ */
+function LocationHashbangUrl(appBase, appBaseNoFile, hashPrefix) {
+
+  parseAbsoluteUrl(appBase, this);
+
+
+  /**
+   * Parse given hashbang url into properties
+   * @param {string} url Hashbang url
+   * @private
+   */
+  this.$$parse = function(url) {
+    var withoutBaseUrl = beginsWith(appBase, url) || beginsWith(appBaseNoFile, url);
+    var withoutHashUrl;
+
+    if (!isUndefined(withoutBaseUrl) && withoutBaseUrl.charAt(0) === '#') {
+
+      // The rest of the url starts with a hash so we have
+      // got either a hashbang path or a plain hash fragment
+      withoutHashUrl = beginsWith(hashPrefix, withoutBaseUrl);
+      if (isUndefined(withoutHashUrl)) {
+        // There was no hashbang prefix so we just have a hash fragment
+        withoutHashUrl = withoutBaseUrl;
+      }
+
+    } else {
+      // There was no hashbang path nor hash fragment:
+      // If we are in HTML5 mode we use what is left as the path;
+      // Otherwise we ignore what is left
+      if (this.$$html5) {
+        withoutHashUrl = withoutBaseUrl;
+      } else {
+        withoutHashUrl = '';
+        if (isUndefined(withoutBaseUrl)) {
+          appBase = url;
+          this.replace();
+        }
+      }
+    }
+
+    parseAppUrl(withoutHashUrl, this);
+
+    this.$$path = removeWindowsDriveName(this.$$path, withoutHashUrl, appBase);
+
+    this.$$compose();
+
+    /*
+     * In Windows, on an anchor node on documents loaded from
+     * the filesystem, the browser will return a pathname
+     * prefixed with the drive name ('/C:/path') when a
+     * pathname without a drive is set:
+     *  * a.setAttribute('href', '/foo')
+     *   * a.pathname === '/C:/foo' //true
+     *
+     * Inside of Angular, we're always using pathnames that
+     * do not include drive names for routing.
+     */
+    function removeWindowsDriveName(path, url, base) {
+      /*
+      Matches paths for file protocol on windows,
+      such as /C:/foo/bar, and captures only /foo/bar.
+      */
+      var windowsFilePathExp = /^\/[A-Z]:(\/.*)/;
+
+      var firstPathSegmentMatch;
+
+      //Get the relative path from the input URL.
+      if (url.indexOf(base) === 0) {
+        url = url.replace(base, '');
+      }
+
+      // The input URL intentionally contains a first path segment that ends with a colon.
+      if (windowsFilePathExp.exec(url)) {
+        return path;
+      }
+
+      firstPathSegmentMatch = windowsFilePathExp.exec(path);
+      return firstPathSegmentMatch ? firstPathSegmentMatch[1] : path;
+    }
+  };
+
+  /**
+   * Compose hashbang url and update `absUrl` property
+   * @private
+   */
+  this.$$compose = function() {
+    var search = toKeyValue(this.$$search),
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+
+    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    this.$$absUrl = appBase + (this.$$url ? hashPrefix + this.$$url : '');
+  };
+
+  this.$$parseLinkUrl = function(url, relHref) {
+    if (stripHash(appBase) == stripHash(url)) {
+      this.$$parse(url);
+      return true;
+    }
+    return false;
+  };
+}
+
+
+/**
+ * LocationHashbangUrl represents url
+ * This object is exposed as $location service when html5 history api is enabled but the browser
+ * does not support it.
+ *
+ * @constructor
+ * @param {string} appBase application base URL
+ * @param {string} appBaseNoFile application base URL stripped of any filename
+ * @param {string} hashPrefix hashbang prefix
+ */
+function LocationHashbangInHtml5Url(appBase, appBaseNoFile, hashPrefix) {
+  this.$$html5 = true;
+  LocationHashbangUrl.apply(this, arguments);
+
+  this.$$parseLinkUrl = function(url, relHref) {
+    if (relHref && relHref[0] === '#') {
+      // special case for links to hash fragments:
+      // keep the old url and only replace the hash fragment
+      this.hash(relHref.slice(1));
+      return true;
+    }
+
+    var rewrittenUrl;
+    var appUrl;
+
+    if (appBase == stripHash(url)) {
+      rewrittenUrl = url;
+    } else if ((appUrl = beginsWith(appBaseNoFile, url))) {
+      rewrittenUrl = appBase + hashPrefix + appUrl;
+    } else if (appBaseNoFile === url + '/') {
+      rewrittenUrl = appBaseNoFile;
+    }
+    if (rewrittenUrl) {
+      this.$$parse(rewrittenUrl);
+    }
+    return !!rewrittenUrl;
+  };
+
+  this.$$compose = function() {
+    var search = toKeyValue(this.$$search),
+        hash = this.$$hash ? '#' + encodeUriSegment(this.$$hash) : '';
+
+    this.$$url = encodePath(this.$$path) + (search ? '?' + search : '') + hash;
+    // include hashPrefix in $$absUrl when $$url is empty so IE9 does not reload page because of removal of '#'
+    this.$$absUrl = appBase + hashPrefix + this.$$url;
+  };
+
+}
+
+
+var locationPrototype = {
+
+  /**
+   * Are we in html5 mode?
+   * @private
+   */
+  $$html5: false,
+
+  /**
+   * Has any change been replacing?
+   * @private
+   */
+  $$replace: false,
+
+  /**
+   * @ngdoc method
+   * @name $location#absUrl
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return full url representation with all segments encoded according to rules specified in
+   * [RFC 3986](http://www.ietf.org/rfc/rfc3986.txt).
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var absUrl = $location.absUrl();
+   * // => "http://example.com/#/some/path?foo=bar&baz=xoxo"
+   * ```
+   *
+   * @return {string} full url
+   */
+  absUrl: locationGetter('$$absUrl'),
+
+  /**
+   * @ngdoc method
+   * @name $location#url
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return url (e.g. `/path?a=b#hash`) when called without any parameter.
+   *
+   * Change path, search and hash, when called with parameter and return `$location`.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var url = $location.url();
+   * // => "/some/path?foo=bar&baz=xoxo"
+   * ```
+   *
+   * @param {string=} url New url without base prefix (e.g. `/path?a=b#hash`)
+   * @return {string} url
+   */
+  url: function(url) {
+    if (isUndefined(url)) {
+      return this.$$url;
+    }
+
+    var match = PATH_MATCH.exec(url);
+    if (match[1] || url === '') this.path(decodeURIComponent(match[1]));
+    if (match[2] || match[1] || url === '') this.search(match[3] || '');
+    this.hash(match[5] || '');
+
+    return this;
+  },
+
+  /**
+   * @ngdoc method
+   * @name $location#protocol
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return protocol of current url.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var protocol = $location.protocol();
+   * // => "http"
+   * ```
+   *
+   * @return {string} protocol of current url
+   */
+  protocol: locationGetter('$$protocol'),
+
+  /**
+   * @ngdoc method
+   * @name $location#host
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return host of current url.
+   *
+   * Note: compared to the non-angular version `location.host` which returns `hostname:port`, this returns the `hostname` portion only.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var host = $location.host();
+   * // => "example.com"
+   *
+   * // given url http://user:password@example.com:8080/#/some/path?foo=bar&baz=xoxo
+   * host = $location.host();
+   * // => "example.com"
+   * host = location.host;
+   * // => "example.com:8080"
+   * ```
+   *
+   * @return {string} host of current url.
+   */
+  host: locationGetter('$$host'),
+
+  /**
+   * @ngdoc method
+   * @name $location#port
+   *
+   * @description
+   * This method is getter only.
+   *
+   * Return port of current url.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var port = $location.port();
+   * // => 80
+   * ```
+   *
+   * @return {Number} port
+   */
+  port: locationGetter('$$port'),
+
+  /**
+   * @ngdoc method
+   * @name $location#path
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return path of current url when called without any parameter.
+   *
+   * Change path when called with parameter and return `$location`.
+   *
+   * Note: Path should always begin with forward slash (/), this method will add the forward slash
+   * if it is missing.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var path = $location.path();
+   * // => "/some/path"
+   * ```
+   *
+   * @param {(string|number)=} path New path
+   * @return {string} path
+   */
+  path: locationGetterSetter('$$path', function(path) {
+    path = path !== null ? path.toString() : '';
+    return path.charAt(0) == '/' ? path : '/' + path;
+  }),
+
+  /**
+   * @ngdoc method
+   * @name $location#search
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return search part (as object) of current url when called without any parameter.
+   *
+   * Change search part when called with parameter and return `$location`.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo
+   * var searchObject = $location.search();
+   * // => {foo: 'bar', baz: 'xoxo'}
+   *
+   * // set foo to 'yipee'
+   * $location.search('foo', 'yipee');
+   * // $location.search() => {foo: 'yipee', baz: 'xoxo'}
+   * ```
+   *
+   * @param {string|Object.<string>|Object.<Array.<string>>} search New search params - string or
+   * hash object.
+   *
+   * When called with a single argument the method acts as a setter, setting the `search` component
+   * of `$location` to the specified value.
+   *
+   * If the argument is a hash object containing an array of values, these values will be encoded
+   * as duplicate search parameters in the url.
+   *
+   * @param {(string|Number|Array<string>|boolean)=} paramValue If `search` is a string or number, then `paramValue`
+   * will override only a single search property.
+   *
+   * If `paramValue` is an array, it will override the property of the `search` component of
+   * `$location` specified via the first argument.
+   *
+   * If `paramValue` is `null`, the property specified via the first argument will be deleted.
+   *
+   * If `paramValue` is `true`, the property specified via the first argument will be added with no
+   * value nor trailing equal sign.
+   *
+   * @return {Object} If called with no arguments returns the parsed `search` object. If called with
+   * one or more arguments returns `$location` object itself.
+   */
+  search: function(search, paramValue) {
+    switch (arguments.length) {
+      case 0:
+        return this.$$search;
+      case 1:
+        if (isString(search) || isNumber(search)) {
+          search = search.toString();
+          this.$$search = parseKeyValue(search);
+        } else if (isObject(search)) {
+          search = copy(search, {});
+          // remove object undefined or null properties
+          forEach(search, function(value, key) {
+            if (value == null) delete search[key];
+          });
+
+          this.$$search = search;
+        } else {
+          throw $locationMinErr('isrcharg',
+              'The first argument of the `$location#search()` call must be a string or an object.');
+        }
+        break;
+      default:
+        if (isUndefined(paramValue) || paramValue === null) {
+          delete this.$$search[search];
+        } else {
+          this.$$search[search] = paramValue;
+        }
+    }
+
+    this.$$compose();
+    return this;
+  },
+
+  /**
+   * @ngdoc method
+   * @name $location#hash
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Returns the hash fragment when called without any parameters.
+   *
+   * Changes the hash fragment when called with a parameter and returns `$location`.
+   *
+   *
+   * ```js
+   * // given url http://example.com/#/some/path?foo=bar&baz=xoxo#hashValue
+   * var hash = $location.hash();
+   * // => "hashValue"
+   * ```
+   *
+   * @param {(string|number)=} hash New hash fragment
+   * @return {string} hash
+   */
+  hash: locationGetterSetter('$$hash', function(hash) {
+    return hash !== null ? hash.toString() : '';
+  }),
+
+  /**
+   * @ngdoc method
+   * @name $location#replace
+   *
+   * @description
+   * If called, all changes to $location during the current `$digest` will replace the current history
+   * record, instead of adding a new one.
+   */
+  replace: function() {
+    this.$$replace = true;
+    return this;
+  }
+};
+
+forEach([LocationHashbangInHtml5Url, LocationHashbangUrl, LocationHtml5Url], function(Location) {
+  Location.prototype = Object.create(locationPrototype);
+
+  /**
+   * @ngdoc method
+   * @name $location#state
+   *
+   * @description
+   * This method is getter / setter.
+   *
+   * Return the history state object when called without any parameter.
+   *
+   * Change the history state object when called with one parameter and return `$location`.
+   * The state object is later passed to `pushState` or `replaceState`.
+   *
+   * NOTE: This method is supported only in HTML5 mode and only in browsers supporting
+   * the HTML5 History API (i.e. methods `pushState` and `replaceState`). If you need to support
+   * older browsers (like IE9 or Android < 4.0), don't use this method.
+   *
+   * @param {object=} state State object for pushState or replaceState
+   * @return {object} state
+   */
+  Location.prototype.state = function(state) {
+    if (!arguments.length) {
+      return this.$$state;
+    }
+
+    if (Location !== LocationHtml5Url || !this.$$html5) {
+      throw $locationMinErr('nostate', 'History API state support is available only ' +
+        'in HTML5 mode and only in browsers supporting HTML5 History API');
+    }
+    // The user might modify `stateObject` after invoking `$location.state(stateObject)`
+    // but we're changing the $$state reference to $browser.state() during the $digest
+    // so the modification window is narrow.
+    this.$$state = isUndefined(state) ? null : state;
+
+    return this;
+  };
+});
+
+
+function locationGetter(property) {
+  return function() {
+    return this[property];
+  };
+}
+
+
+function locationGetterSetter(property, preprocess) {
+  return function(value) {
+    if (isUndefined(value)) {
+      return this[property];
+    }
+
+    this[property] = preprocess(value);
+    this.$$compose();
+
+    return this;
+  };
+}
+
+
+/**
+ * @ngdoc service
+ * @name $location
+ *
+ * @requires $rootElement
+ *
+ * @description
+ * The $location service parses the URL in the browser address bar (based on the
+ * [window.location](https://developer.mozilla.org/en/window.location)) and makes the URL
+ * available to your application. Changes to the URL in the address bar are reflected into
+ * $location service and changes to $location are reflected into the browser address bar.
+ *
+ * **The $location service:**
+ *
+ * - Exposes the current URL in the browser address bar, so you can
+ *   - Watch and observe the URL.
+ *   - Change the URL.
+ * - Synchronizes the URL with the browser when the user
+ *   - Changes the address bar.
+ *   - Clicks the back or forward button (or clicks a History link).
+ *   - Clicks on a link.
+ * - Represents the URL object as a set of methods (protocol, host, port, path, search, hash).
+ *
+ * For more information see {@link guide/$location Developer Guide: Using $location}
+ */
+
+/**
+ * @ngdoc provider
+ * @name $locationProvider
+ * @description
+ * Use the `$locationProvider` to configure how the application deep linking paths are stored.
+ */
+function $LocationProvider() {
+  var hashPrefix = '',
+      html5Mode = {
+        enabled: false,
+        requireBase: true,
+        rewriteLinks: true
+      };
+
+  /**
+   * @ngdoc method
+   * @name $locationProvider#hashPrefix
+   * @description
+   * @param {string=} prefix Prefix for hash part (containing path and search)
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
+   */
+  this.hashPrefix = function(prefix) {
+    if (isDefined(prefix)) {
+      hashPrefix = prefix;
+      return this;
+    } else {
+      return hashPrefix;
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $locationProvider#html5Mode
+   * @description
+   * @param {(boolean|Object)=} mode If boolean, sets `html5Mode.enabled` to value.
+   *   If object, sets `enabled`, `requireBase` and `rewriteLinks` to respective values. Supported
+   *   properties:
+   *   - **enabled** – `{boolean}` – (default: false) If true, will rely on `history.pushState` to
+   *     change urls where supported. Will fall back to hash-prefixed paths in browsers that do not
+   *     support `pushState`.
+   *   - **requireBase** - `{boolean}` - (default: `true`) When html5Mode is enabled, specifies
+   *     whether or not a <base> tag is required to be present. If `enabled` and `requireBase` are
+   *     true, and a base tag is not present, an error will be thrown when `$location` is injected.
+   *     See the {@link guide/$location $location guide for more information}
+   *   - **rewriteLinks** - `{boolean}` - (default: `true`) When html5Mode is enabled,
+   *     enables/disables url rewriting for relative links.
+   *
+   * @returns {Object} html5Mode object if used as getter or itself (chaining) if used as setter
+   */
+  this.html5Mode = function(mode) {
+    if (isBoolean(mode)) {
+      html5Mode.enabled = mode;
+      return this;
+    } else if (isObject(mode)) {
+
+      if (isBoolean(mode.enabled)) {
+        html5Mode.enabled = mode.enabled;
+      }
+
+      if (isBoolean(mode.requireBase)) {
+        html5Mode.requireBase = mode.requireBase;
+      }
+
+      if (isBoolean(mode.rewriteLinks)) {
+        html5Mode.rewriteLinks = mode.rewriteLinks;
+      }
+
+      return this;
+    } else {
+      return html5Mode;
+    }
+  };
+
+  /**
+   * @ngdoc event
+   * @name $location#$locationChangeStart
+   * @eventType broadcast on root scope
+   * @description
+   * Broadcasted before a URL will change.
+   *
+   * This change can be prevented by calling
+   * `preventDefault` method of the event. See {@link ng.$rootScope.Scope#$on} for more
+   * details about event object. Upon successful change
+   * {@link ng.$location#$locationChangeSuccess $locationChangeSuccess} is fired.
+   *
+   * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+   * the browser supports the HTML5 History API.
+   *
+   * @param {Object} angularEvent Synthetic event object.
+   * @param {string} newUrl New URL
+   * @param {string=} oldUrl URL that was before it was changed.
+   * @param {string=} newState New history state object
+   * @param {string=} oldState History state object that was before it was changed.
+   */
+
+  /**
+   * @ngdoc event
+   * @name $location#$locationChangeSuccess
+   * @eventType broadcast on root scope
+   * @description
+   * Broadcasted after a URL was changed.
+   *
+   * The `newState` and `oldState` parameters may be defined only in HTML5 mode and when
+   * the browser supports the HTML5 History API.
+   *
+   * @param {Object} angularEvent Synthetic event object.
+   * @param {string} newUrl New URL
+   * @param {string=} oldUrl URL that was before it was changed.
+   * @param {string=} newState New history state object
+   * @param {string=} oldState History state object that was before it was changed.
+   */
+
+  this.$get = ['$rootScope', '$browser', '$sniffer', '$rootElement', '$window',
+      function($rootScope, $browser, $sniffer, $rootElement, $window) {
+    var $location,
+        LocationMode,
+        baseHref = $browser.baseHref(), // if base[href] is undefined, it defaults to ''
+        initialUrl = $browser.url(),
+        appBase;
+
+    if (html5Mode.enabled) {
+      if (!baseHref && html5Mode.requireBase) {
+        throw $locationMinErr('nobase',
+          "$location in HTML5 mode requires a <base> tag to be present!");
+      }
+      appBase = serverBase(initialUrl) + (baseHref || '/');
+      LocationMode = $sniffer.history ? LocationHtml5Url : LocationHashbangInHtml5Url;
+    } else {
+      appBase = stripHash(initialUrl);
+      LocationMode = LocationHashbangUrl;
+    }
+    var appBaseNoFile = stripFile(appBase);
+
+    $location = new LocationMode(appBase, appBaseNoFile, '#' + hashPrefix);
+    $location.$$parseLinkUrl(initialUrl, initialUrl);
+
+    $location.$$state = $browser.state();
+
+    var IGNORE_URI_REGEXP = /^\s*(javascript|mailto):/i;
+
+    function setBrowserUrlWithFallback(url, replace, state) {
+      var oldUrl = $location.url();
+      var oldState = $location.$$state;
+      try {
+        $browser.url(url, replace, state);
+
+        // Make sure $location.state() returns referentially identical (not just deeply equal)
+        // state object; this makes possible quick checking if the state changed in the digest
+        // loop. Checking deep equality would be too expensive.
+        $location.$$state = $browser.state();
+      } catch (e) {
+        // Restore old values if pushState fails
+        $location.url(oldUrl);
+        $location.$$state = oldState;
+
+        throw e;
+      }
+    }
+
+    $rootElement.on('click', function(event) {
+      // TODO(vojta): rewrite link when opening in new tab/window (in legacy browser)
+      // currently we open nice url link and redirect then
+
+      if (!html5Mode.rewriteLinks || event.ctrlKey || event.metaKey || event.shiftKey || event.which == 2 || event.button == 2) return;
+
+      var elm = jqLite(event.target);
+
+      // traverse the DOM up to find first A tag
+      while (nodeName_(elm[0]) !== 'a') {
+        // ignore rewriting if no A tag (reached root element, or no parent - removed from document)
+        if (elm[0] === $rootElement[0] || !(elm = elm.parent())[0]) return;
+      }
+
+      var absHref = elm.prop('href');
+      // get the actual href attribute - see
+      // http://msdn.microsoft.com/en-us/library/ie/dd347148(v=vs.85).aspx
+      var relHref = elm.attr('href') || elm.attr('xlink:href');
+
+      if (isObject(absHref) && absHref.toString() === '[object SVGAnimatedString]') {
+        // SVGAnimatedString.animVal should be identical to SVGAnimatedString.baseVal, unless during
+        // an animation.
+        absHref = urlResolve(absHref.animVal).href;
+      }
+
+      // Ignore when url is started with javascript: or mailto:
+      if (IGNORE_URI_REGEXP.test(absHref)) return;
+
+      if (absHref && !elm.attr('target') && !event.isDefaultPrevented()) {
+        if ($location.$$parseLinkUrl(absHref, relHref)) {
+          // We do a preventDefault for all urls that are part of the angular application,
+          // in html5mode and also without, so that we are able to abort navigation without
+          // getting double entries in the location history.
+          event.preventDefault();
+          // update location manually
+          if ($location.absUrl() != $browser.url()) {
+            $rootScope.$apply();
+            // hack to work around FF6 bug 684208 when scenario runner clicks on links
+            $window.angular['ff-684208-preventDefault'] = true;
+          }
+        }
+      }
+    });
+
+
+    // rewrite hashbang url <> html5 url
+    if (trimEmptyHash($location.absUrl()) != trimEmptyHash(initialUrl)) {
+      $browser.url($location.absUrl(), true);
+    }
+
+    var initializing = true;
+
+    // update $location when $browser url changes
+    $browser.onUrlChange(function(newUrl, newState) {
+
+      if (isUndefined(beginsWith(appBaseNoFile, newUrl))) {
+        // If we are navigating outside of the app then force a reload
+        $window.location.href = newUrl;
+        return;
+      }
+
+      $rootScope.$evalAsync(function() {
+        var oldUrl = $location.absUrl();
+        var oldState = $location.$$state;
+        var defaultPrevented;
+        newUrl = trimEmptyHash(newUrl);
+        $location.$$parse(newUrl);
+        $location.$$state = newState;
+
+        defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+            newState, oldState).defaultPrevented;
+
+        // if the location was changed by a `$locationChangeStart` handler then stop
+        // processing this location change
+        if ($location.absUrl() !== newUrl) return;
+
+        if (defaultPrevented) {
+          $location.$$parse(oldUrl);
+          $location.$$state = oldState;
+          setBrowserUrlWithFallback(oldUrl, false, oldState);
+        } else {
+          initializing = false;
+          afterLocationChange(oldUrl, oldState);
+        }
+      });
+      if (!$rootScope.$$phase) $rootScope.$digest();
+    });
+
+    // update browser
+    $rootScope.$watch(function $locationWatch() {
+      var oldUrl = trimEmptyHash($browser.url());
+      var newUrl = trimEmptyHash($location.absUrl());
+      var oldState = $browser.state();
+      var currentReplace = $location.$$replace;
+      var urlOrStateChanged = oldUrl !== newUrl ||
+        ($location.$$html5 && $sniffer.history && oldState !== $location.$$state);
+
+      if (initializing || urlOrStateChanged) {
+        initializing = false;
+
+        $rootScope.$evalAsync(function() {
+          var newUrl = $location.absUrl();
+          var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
+              $location.$$state, oldState).defaultPrevented;
+
+          // if the location was changed by a `$locationChangeStart` handler then stop
+          // processing this location change
+          if ($location.absUrl() !== newUrl) return;
+
+          if (defaultPrevented) {
+            $location.$$parse(oldUrl);
+            $location.$$state = oldState;
+          } else {
+            if (urlOrStateChanged) {
+              setBrowserUrlWithFallback(newUrl, currentReplace,
+                                        oldState === $location.$$state ? null : $location.$$state);
+            }
+            afterLocationChange(oldUrl, oldState);
+          }
+        });
+      }
+
+      $location.$$replace = false;
+
+      // we don't need to return anything because $evalAsync will make the digest loop dirty when
+      // there is a change
+    });
+
+    return $location;
+
+    function afterLocationChange(oldUrl, oldState) {
+      $rootScope.$broadcast('$locationChangeSuccess', $location.absUrl(), oldUrl,
+        $location.$$state, oldState);
+    }
+}];
+}
+
+/**
+ * @ngdoc service
+ * @name $log
+ * @requires $window
+ *
+ * @description
+ * Simple service for logging. Default implementation safely writes the message
+ * into the browser's console (if present).
+ *
+ * The main purpose of this service is to simplify debugging and troubleshooting.
+ *
+ * The default is to log `debug` messages. You can use
+ * {@link ng.$logProvider ng.$logProvider#debugEnabled} to change this.
+ *
+ * @example
+   <example module="logExample">
+     <file name="script.js">
+       angular.module('logExample', [])
+         .controller('LogController', ['$scope', '$log', function($scope, $log) {
+           $scope.$log = $log;
+           $scope.message = 'Hello World!';
+         }]);
+     </file>
+     <file name="index.html">
+       <div ng-controller="LogController">
+         <p>Reload this page with open console, enter text and hit the log button...</p>
+         <label>Message:
+         <input type="text" ng-model="message" /></label>
+         <button ng-click="$log.log(message)">log</button>
+         <button ng-click="$log.warn(message)">warn</button>
+         <button ng-click="$log.info(message)">info</button>
+         <button ng-click="$log.error(message)">error</button>
+         <button ng-click="$log.debug(message)">debug</button>
+       </div>
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc provider
+ * @name $logProvider
+ * @description
+ * Use the `$logProvider` to configure how the application logs messages
+ */
+function $LogProvider() {
+  var debug = true,
+      self = this;
+
+  /**
+   * @ngdoc method
+   * @name $logProvider#debugEnabled
+   * @description
+   * @param {boolean=} flag enable or disable debug level messages
+   * @returns {*} current value if used as getter or itself (chaining) if used as setter
+   */
+  this.debugEnabled = function(flag) {
+    if (isDefined(flag)) {
+      debug = flag;
+    return this;
+    } else {
+      return debug;
+    }
+  };
+
+  this.$get = ['$window', function($window) {
+    return {
+      /**
+       * @ngdoc method
+       * @name $log#log
+       *
+       * @description
+       * Write a log message
+       */
+      log: consoleLog('log'),
+
+      /**
+       * @ngdoc method
+       * @name $log#info
+       *
+       * @description
+       * Write an information message
+       */
+      info: consoleLog('info'),
+
+      /**
+       * @ngdoc method
+       * @name $log#warn
+       *
+       * @description
+       * Write a warning message
+       */
+      warn: consoleLog('warn'),
+
+      /**
+       * @ngdoc method
+       * @name $log#error
+       *
+       * @description
+       * Write an error message
+       */
+      error: consoleLog('error'),
+
+      /**
+       * @ngdoc method
+       * @name $log#debug
+       *
+       * @description
+       * Write a debug message
+       */
+      debug: (function() {
+        var fn = consoleLog('debug');
+
+        return function() {
+          if (debug) {
+            fn.apply(self, arguments);
+          }
+        };
+      }())
+    };
+
+    function formatError(arg) {
+      if (arg instanceof Error) {
+        if (arg.stack) {
+          arg = (arg.message && arg.stack.indexOf(arg.message) === -1)
+              ? 'Error: ' + arg.message + '\n' + arg.stack
+              : arg.stack;
+        } else if (arg.sourceURL) {
+          arg = arg.message + '\n' + arg.sourceURL + ':' + arg.line;
+        }
+      }
+      return arg;
+    }
+
+    function consoleLog(type) {
+      var console = $window.console || {},
+          logFn = console[type] || console.log || noop,
+          hasApply = false;
+
+      // Note: reading logFn.apply throws an error in IE11 in IE8 document mode.
+      // The reason behind this is that console.log has type "object" in IE8...
+      try {
+        hasApply = !!logFn.apply;
+      } catch (e) {}
+
+      if (hasApply) {
+        return function() {
+          var args = [];
+          forEach(arguments, function(arg) {
+            args.push(formatError(arg));
+          });
+          return logFn.apply(console, args);
+        };
+      }
+
+      // we are IE which either doesn't have window.console => this is noop and we do nothing,
+      // or we are IE where console.log doesn't have apply so we log at least first 2 args
+      return function(arg1, arg2) {
+        logFn(arg1, arg2 == null ? '' : arg2);
+      };
+    }
+  }];
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+var $parseMinErr = minErr('$parse');
+
+// Sandboxing Angular Expressions
+// ------------------------------
+// Angular expressions are generally considered safe because these expressions only have direct
+// access to `$scope` and locals. However, one can obtain the ability to execute arbitrary JS code by
+// obtaining a reference to native JS functions such as the Function constructor.
+//
+// As an example, consider the following Angular expression:
+//
+//   {}.toString.constructor('alert("evil JS code")')
+//
+// This sandboxing technique is not perfect and doesn't aim to be. The goal is to prevent exploits
+// against the expression language, but not to prevent exploits that were enabled by exposing
+// sensitive JavaScript or browser APIs on Scope. Exposing such objects on a Scope is never a good
+// practice and therefore we are not even trying to protect against interaction with an object
+// explicitly exposed in this way.
+//
+// In general, it is not possible to access a Window object from an angular expression unless a
+// window or some DOM object that has a reference to window is published onto a Scope.
+// Similarly we prevent invocations of function known to be dangerous, as well as assignments to
+// native objects.
+//
+// See https://docs.angularjs.org/guide/security
+
+
+function ensureSafeMemberName(name, fullExpression) {
+  if (name === "__defineGetter__" || name === "__defineSetter__"
+      || name === "__lookupGetter__" || name === "__lookupSetter__"
+      || name === "__proto__") {
+    throw $parseMinErr('isecfld',
+        'Attempting to access a disallowed field in Angular expressions! '
+        + 'Expression: {0}', fullExpression);
+  }
+  return name;
+}
+
+function getStringValue(name, fullExpression) {
+  // From the JavaScript docs:
+  // Property names must be strings. This means that non-string objects cannot be used
+  // as keys in an object. Any non-string object, including a number, is typecasted
+  // into a string via the toString method.
+  //
+  // So, to ensure that we are checking the same `name` that JavaScript would use,
+  // we cast it to a string, if possible.
+  // Doing `name + ''` can cause a repl error if the result to `toString` is not a string,
+  // this is, this will handle objects that misbehave.
+  name = name + '';
+  if (!isString(name)) {
+    throw $parseMinErr('iseccst',
+        'Cannot convert object to primitive value! '
+        + 'Expression: {0}', fullExpression);
+  }
+  return name;
+}
+
+function ensureSafeObject(obj, fullExpression) {
+  // nifty check if obj is Function that is fast and works across iframes and other contexts
+  if (obj) {
+    if (obj.constructor === obj) {
+      throw $parseMinErr('isecfn',
+          'Referencing Function in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    } else if (// isWindow(obj)
+        obj.window === obj) {
+      throw $parseMinErr('isecwindow',
+          'Referencing the Window in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    } else if (// isElement(obj)
+        obj.children && (obj.nodeName || (obj.prop && obj.attr && obj.find))) {
+      throw $parseMinErr('isecdom',
+          'Referencing DOM nodes in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    } else if (// block Object so that we can't get hold of dangerous Object.* methods
+        obj === Object) {
+      throw $parseMinErr('isecobj',
+          'Referencing Object in Angular expressions is disallowed! Expression: {0}',
+          fullExpression);
+    }
+  }
+  return obj;
+}
+
+var CALL = Function.prototype.call;
+var APPLY = Function.prototype.apply;
+var BIND = Function.prototype.bind;
+
+function ensureSafeFunction(obj, fullExpression) {
+  if (obj) {
+    if (obj.constructor === obj) {
+      throw $parseMinErr('isecfn',
+        'Referencing Function in Angular expressions is disallowed! Expression: {0}',
+        fullExpression);
+    } else if (obj === CALL || obj === APPLY || obj === BIND) {
+      throw $parseMinErr('isecff',
+        'Referencing call, apply or bind in Angular expressions is disallowed! Expression: {0}',
+        fullExpression);
+    }
+  }
+}
+
+function ensureSafeAssignContext(obj, fullExpression) {
+  if (obj) {
+    if (obj === (0).constructor || obj === (false).constructor || obj === ''.constructor ||
+        obj === {}.constructor || obj === [].constructor || obj === Function.constructor) {
+      throw $parseMinErr('isecaf',
+        'Assigning to a constructor is disallowed! Expression: {0}', fullExpression);
+    }
+  }
+}
+
+var OPERATORS = createMap();
+forEach('+ - * / % === !== == != < > <= >= && || ! = |'.split(' '), function(operator) { OPERATORS[operator] = true; });
+var ESCAPE = {"n":"\n", "f":"\f", "r":"\r", "t":"\t", "v":"\v", "'":"'", '"':'"'};
+
+
+/////////////////////////////////////////
+
+
+/**
+ * @constructor
+ */
+var Lexer = function(options) {
+  this.options = options;
+};
+
+Lexer.prototype = {
+  constructor: Lexer,
+
+  lex: function(text) {
+    this.text = text;
+    this.index = 0;
+    this.tokens = [];
+
+    while (this.index < this.text.length) {
+      var ch = this.text.charAt(this.index);
+      if (ch === '"' || ch === "'") {
+        this.readString(ch);
+      } else if (this.isNumber(ch) || ch === '.' && this.isNumber(this.peek())) {
+        this.readNumber();
+      } else if (this.isIdent(ch)) {
+        this.readIdent();
+      } else if (this.is(ch, '(){}[].,;:?')) {
+        this.tokens.push({index: this.index, text: ch});
+        this.index++;
+      } else if (this.isWhitespace(ch)) {
+        this.index++;
+      } else {
+        var ch2 = ch + this.peek();
+        var ch3 = ch2 + this.peek(2);
+        var op1 = OPERATORS[ch];
+        var op2 = OPERATORS[ch2];
+        var op3 = OPERATORS[ch3];
+        if (op1 || op2 || op3) {
+          var token = op3 ? ch3 : (op2 ? ch2 : ch);
+          this.tokens.push({index: this.index, text: token, operator: true});
+          this.index += token.length;
+        } else {
+          this.throwError('Unexpected next character ', this.index, this.index + 1);
+        }
+      }
+    }
+    return this.tokens;
+  },
+
+  is: function(ch, chars) {
+    return chars.indexOf(ch) !== -1;
+  },
+
+  peek: function(i) {
+    var num = i || 1;
+    return (this.index + num < this.text.length) ? this.text.charAt(this.index + num) : false;
+  },
+
+  isNumber: function(ch) {
+    return ('0' <= ch && ch <= '9') && typeof ch === "string";
+  },
+
+  isWhitespace: function(ch) {
+    // IE treats non-breaking space as \u00A0
+    return (ch === ' ' || ch === '\r' || ch === '\t' ||
+            ch === '\n' || ch === '\v' || ch === '\u00A0');
+  },
+
+  isIdent: function(ch) {
+    return ('a' <= ch && ch <= 'z' ||
+            'A' <= ch && ch <= 'Z' ||
+            '_' === ch || ch === '$');
+  },
+
+  isExpOperator: function(ch) {
+    return (ch === '-' || ch === '+' || this.isNumber(ch));
+  },
+
+  throwError: function(error, start, end) {
+    end = end || this.index;
+    var colStr = (isDefined(start)
+            ? 's ' + start +  '-' + this.index + ' [' + this.text.substring(start, end) + ']'
+            : ' ' + end);
+    throw $parseMinErr('lexerr', 'Lexer Error: {0} at column{1} in expression [{2}].',
+        error, colStr, this.text);
+  },
+
+  readNumber: function() {
+    var number = '';
+    var start = this.index;
+    while (this.index < this.text.length) {
+      var ch = lowercase(this.text.charAt(this.index));
+      if (ch == '.' || this.isNumber(ch)) {
+        number += ch;
+      } else {
+        var peekCh = this.peek();
+        if (ch == 'e' && this.isExpOperator(peekCh)) {
+          number += ch;
+        } else if (this.isExpOperator(ch) &&
+            peekCh && this.isNumber(peekCh) &&
+            number.charAt(number.length - 1) == 'e') {
+          number += ch;
+        } else if (this.isExpOperator(ch) &&
+            (!peekCh || !this.isNumber(peekCh)) &&
+            number.charAt(number.length - 1) == 'e') {
+          this.throwError('Invalid exponent');
+        } else {
+          break;
+        }
+      }
+      this.index++;
+    }
+    this.tokens.push({
+      index: start,
+      text: number,
+      constant: true,
+      value: Number(number)
+    });
+  },
+
+  readIdent: function() {
+    var start = this.index;
+    while (this.index < this.text.length) {
+      var ch = this.text.charAt(this.index);
+      if (!(this.isIdent(ch) || this.isNumber(ch))) {
+        break;
+      }
+      this.index++;
+    }
+    this.tokens.push({
+      index: start,
+      text: this.text.slice(start, this.index),
+      identifier: true
+    });
+  },
+
+  readString: function(quote) {
+    var start = this.index;
+    this.index++;
+    var string = '';
+    var rawString = quote;
+    var escape = false;
+    while (this.index < this.text.length) {
+      var ch = this.text.charAt(this.index);
+      rawString += ch;
+      if (escape) {
+        if (ch === 'u') {
+          var hex = this.text.substring(this.index + 1, this.index + 5);
+          if (!hex.match(/[\da-f]{4}/i)) {
+            this.throwError('Invalid unicode escape [\\u' + hex + ']');
+          }
+          this.index += 4;
+          string += String.fromCharCode(parseInt(hex, 16));
+        } else {
+          var rep = ESCAPE[ch];
+          string = string + (rep || ch);
+        }
+        escape = false;
+      } else if (ch === '\\') {
+        escape = true;
+      } else if (ch === quote) {
+        this.index++;
+        this.tokens.push({
+          index: start,
+          text: rawString,
+          constant: true,
+          value: string
+        });
+        return;
+      } else {
+        string += ch;
+      }
+      this.index++;
+    }
+    this.throwError('Unterminated quote', start);
+  }
+};
+
+var AST = function(lexer, options) {
+  this.lexer = lexer;
+  this.options = options;
+};
+
+AST.Program = 'Program';
+AST.ExpressionStatement = 'ExpressionStatement';
+AST.AssignmentExpression = 'AssignmentExpression';
+AST.ConditionalExpression = 'ConditionalExpression';
+AST.LogicalExpression = 'LogicalExpression';
+AST.BinaryExpression = 'BinaryExpression';
+AST.UnaryExpression = 'UnaryExpression';
+AST.CallExpression = 'CallExpression';
+AST.MemberExpression = 'MemberExpression';
+AST.Identifier = 'Identifier';
+AST.Literal = 'Literal';
+AST.ArrayExpression = 'ArrayExpression';
+AST.Property = 'Property';
+AST.ObjectExpression = 'ObjectExpression';
+AST.ThisExpression = 'ThisExpression';
+
+// Internal use only
+AST.NGValueParameter = 'NGValueParameter';
+
+AST.prototype = {
+  ast: function(text) {
+    this.text = text;
+    this.tokens = this.lexer.lex(text);
+
+    var value = this.program();
+
+    if (this.tokens.length !== 0) {
+      this.throwError('is an unexpected token', this.tokens[0]);
+    }
+
+    return value;
+  },
+
+  program: function() {
+    var body = [];
+    while (true) {
+      if (this.tokens.length > 0 && !this.peek('}', ')', ';', ']'))
+        body.push(this.expressionStatement());
+      if (!this.expect(';')) {
+        return { type: AST.Program, body: body};
+      }
+    }
+  },
+
+  expressionStatement: function() {
+    return { type: AST.ExpressionStatement, expression: this.filterChain() };
+  },
+
+  filterChain: function() {
+    var left = this.expression();
+    var token;
+    while ((token = this.expect('|'))) {
+      left = this.filter(left);
+    }
+    return left;
+  },
+
+  expression: function() {
+    return this.assignment();
+  },
+
+  assignment: function() {
+    var result = this.ternary();
+    if (this.expect('=')) {
+      result = { type: AST.AssignmentExpression, left: result, right: this.assignment(), operator: '='};
+    }
+    return result;
+  },
+
+  ternary: function() {
+    var test = this.logicalOR();
+    var alternate;
+    var consequent;
+    if (this.expect('?')) {
+      alternate = this.expression();
+      if (this.consume(':')) {
+        consequent = this.expression();
+        return { type: AST.ConditionalExpression, test: test, alternate: alternate, consequent: consequent};
+      }
+    }
+    return test;
+  },
+
+  logicalOR: function() {
+    var left = this.logicalAND();
+    while (this.expect('||')) {
+      left = { type: AST.LogicalExpression, operator: '||', left: left, right: this.logicalAND() };
+    }
+    return left;
+  },
+
+  logicalAND: function() {
+    var left = this.equality();
+    while (this.expect('&&')) {
+      left = { type: AST.LogicalExpression, operator: '&&', left: left, right: this.equality()};
+    }
+    return left;
+  },
+
+  equality: function() {
+    var left = this.relational();
+    var token;
+    while ((token = this.expect('==','!=','===','!=='))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.relational() };
+    }
+    return left;
+  },
+
+  relational: function() {
+    var left = this.additive();
+    var token;
+    while ((token = this.expect('<', '>', '<=', '>='))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.additive() };
+    }
+    return left;
+  },
+
+  additive: function() {
+    var left = this.multiplicative();
+    var token;
+    while ((token = this.expect('+','-'))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.multiplicative() };
+    }
+    return left;
+  },
+
+  multiplicative: function() {
+    var left = this.unary();
+    var token;
+    while ((token = this.expect('*','/','%'))) {
+      left = { type: AST.BinaryExpression, operator: token.text, left: left, right: this.unary() };
+    }
+    return left;
+  },
+
+  unary: function() {
+    var token;
+    if ((token = this.expect('+', '-', '!'))) {
+      return { type: AST.UnaryExpression, operator: token.text, prefix: true, argument: this.unary() };
+    } else {
+      return this.primary();
+    }
+  },
+
+  primary: function() {
+    var primary;
+    if (this.expect('(')) {
+      primary = this.filterChain();
+      this.consume(')');
+    } else if (this.expect('[')) {
+      primary = this.arrayDeclaration();
+    } else if (this.expect('{')) {
+      primary = this.object();
+    } else if (this.constants.hasOwnProperty(this.peek().text)) {
+      primary = copy(this.constants[this.consume().text]);
+    } else if (this.peek().identifier) {
+      primary = this.identifier();
+    } else if (this.peek().constant) {
+      primary = this.constant();
+    } else {
+      this.throwError('not a primary expression', this.peek());
+    }
+
+    var next;
+    while ((next = this.expect('(', '[', '.'))) {
+      if (next.text === '(') {
+        primary = {type: AST.CallExpression, callee: primary, arguments: this.parseArguments() };
+        this.consume(')');
+      } else if (next.text === '[') {
+        primary = { type: AST.MemberExpression, object: primary, property: this.expression(), computed: true };
+        this.consume(']');
+      } else if (next.text === '.') {
+        primary = { type: AST.MemberExpression, object: primary, property: this.identifier(), computed: false };
+      } else {
+        this.throwError('IMPOSSIBLE');
+      }
+    }
+    return primary;
+  },
+
+  filter: function(baseExpression) {
+    var args = [baseExpression];
+    var result = {type: AST.CallExpression, callee: this.identifier(), arguments: args, filter: true};
+
+    while (this.expect(':')) {
+      args.push(this.expression());
+    }
+
+    return result;
+  },
+
+  parseArguments: function() {
+    var args = [];
+    if (this.peekToken().text !== ')') {
+      do {
+        args.push(this.expression());
+      } while (this.expect(','));
+    }
+    return args;
+  },
+
+  identifier: function() {
+    var token = this.consume();
+    if (!token.identifier) {
+      this.throwError('is not a valid identifier', token);
+    }
+    return { type: AST.Identifier, name: token.text };
+  },
+
+  constant: function() {
+    // TODO check that it is a constant
+    return { type: AST.Literal, value: this.consume().value };
+  },
+
+  arrayDeclaration: function() {
+    var elements = [];
+    if (this.peekToken().text !== ']') {
+      do {
+        if (this.peek(']')) {
+          // Support trailing commas per ES5.1.
+          break;
+        }
+        elements.push(this.expression());
+      } while (this.expect(','));
+    }
+    this.consume(']');
+
+    return { type: AST.ArrayExpression, elements: elements };
+  },
+
+  object: function() {
+    var properties = [], property;
+    if (this.peekToken().text !== '}') {
+      do {
+        if (this.peek('}')) {
+          // Support trailing commas per ES5.1.
+          break;
+        }
+        property = {type: AST.Property, kind: 'init'};
+        if (this.peek().constant) {
+          property.key = this.constant();
+        } else if (this.peek().identifier) {
+          property.key = this.identifier();
+        } else {
+          this.throwError("invalid key", this.peek());
+        }
+        this.consume(':');
+        property.value = this.expression();
+        properties.push(property);
+      } while (this.expect(','));
+    }
+    this.consume('}');
+
+    return {type: AST.ObjectExpression, properties: properties };
+  },
+
+  throwError: function(msg, token) {
+    throw $parseMinErr('syntax',
+        'Syntax Error: Token \'{0}\' {1} at column {2} of the expression [{3}] starting at [{4}].',
+          token.text, msg, (token.index + 1), this.text, this.text.substring(token.index));
+  },
+
+  consume: function(e1) {
+    if (this.tokens.length === 0) {
+      throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+    }
+
+    var token = this.expect(e1);
+    if (!token) {
+      this.throwError('is unexpected, expecting [' + e1 + ']', this.peek());
+    }
+    return token;
+  },
+
+  peekToken: function() {
+    if (this.tokens.length === 0) {
+      throw $parseMinErr('ueoe', 'Unexpected end of expression: {0}', this.text);
+    }
+    return this.tokens[0];
+  },
+
+  peek: function(e1, e2, e3, e4) {
+    return this.peekAhead(0, e1, e2, e3, e4);
+  },
+
+  peekAhead: function(i, e1, e2, e3, e4) {
+    if (this.tokens.length > i) {
+      var token = this.tokens[i];
+      var t = token.text;
+      if (t === e1 || t === e2 || t === e3 || t === e4 ||
+          (!e1 && !e2 && !e3 && !e4)) {
+        return token;
+      }
+    }
+    return false;
+  },
+
+  expect: function(e1, e2, e3, e4) {
+    var token = this.peek(e1, e2, e3, e4);
+    if (token) {
+      this.tokens.shift();
+      return token;
+    }
+    return false;
+  },
+
+
+  /* `undefined` is not a constant, it is an identifier,
+   * but using it as an identifier is not supported
+   */
+  constants: {
+    'true': { type: AST.Literal, value: true },
+    'false': { type: AST.Literal, value: false },
+    'null': { type: AST.Literal, value: null },
+    'undefined': {type: AST.Literal, value: undefined },
+    'this': {type: AST.ThisExpression }
+  }
+};
+
+function ifDefined(v, d) {
+  return typeof v !== 'undefined' ? v : d;
+}
+
+function plusFn(l, r) {
+  if (typeof l === 'undefined') return r;
+  if (typeof r === 'undefined') return l;
+  return l + r;
+}
+
+function isStateless($filter, filterName) {
+  var fn = $filter(filterName);
+  return !fn.$stateful;
+}
+
+function findConstantAndWatchExpressions(ast, $filter) {
+  var allConstants;
+  var argsToWatch;
+  switch (ast.type) {
+  case AST.Program:
+    allConstants = true;
+    forEach(ast.body, function(expr) {
+      findConstantAndWatchExpressions(expr.expression, $filter);
+      allConstants = allConstants && expr.expression.constant;
+    });
+    ast.constant = allConstants;
+    break;
+  case AST.Literal:
+    ast.constant = true;
+    ast.toWatch = [];
+    break;
+  case AST.UnaryExpression:
+    findConstantAndWatchExpressions(ast.argument, $filter);
+    ast.constant = ast.argument.constant;
+    ast.toWatch = ast.argument.toWatch;
+    break;
+  case AST.BinaryExpression:
+    findConstantAndWatchExpressions(ast.left, $filter);
+    findConstantAndWatchExpressions(ast.right, $filter);
+    ast.constant = ast.left.constant && ast.right.constant;
+    ast.toWatch = ast.left.toWatch.concat(ast.right.toWatch);
+    break;
+  case AST.LogicalExpression:
+    findConstantAndWatchExpressions(ast.left, $filter);
+    findConstantAndWatchExpressions(ast.right, $filter);
+    ast.constant = ast.left.constant && ast.right.constant;
+    ast.toWatch = ast.constant ? [] : [ast];
+    break;
+  case AST.ConditionalExpression:
+    findConstantAndWatchExpressions(ast.test, $filter);
+    findConstantAndWatchExpressions(ast.alternate, $filter);
+    findConstantAndWatchExpressions(ast.consequent, $filter);
+    ast.constant = ast.test.constant && ast.alternate.constant && ast.consequent.constant;
+    ast.toWatch = ast.constant ? [] : [ast];
+    break;
+  case AST.Identifier:
+    ast.constant = false;
+    ast.toWatch = [ast];
+    break;
+  case AST.MemberExpression:
+    findConstantAndWatchExpressions(ast.object, $filter);
+    if (ast.computed) {
+      findConstantAndWatchExpressions(ast.property, $filter);
+    }
+    ast.constant = ast.object.constant && (!ast.computed || ast.property.constant);
+    ast.toWatch = [ast];
+    break;
+  case AST.CallExpression:
+    allConstants = ast.filter ? isStateless($filter, ast.callee.name) : false;
+    argsToWatch = [];
+    forEach(ast.arguments, function(expr) {
+      findConstantAndWatchExpressions(expr, $filter);
+      allConstants = allConstants && expr.constant;
+      if (!expr.constant) {
+        argsToWatch.push.apply(argsToWatch, expr.toWatch);
+      }
+    });
+    ast.constant = allConstants;
+    ast.toWatch = ast.filter && isStateless($filter, ast.callee.name) ? argsToWatch : [ast];
+    break;
+  case AST.AssignmentExpression:
+    findConstantAndWatchExpressions(ast.left, $filter);
+    findConstantAndWatchExpressions(ast.right, $filter);
+    ast.constant = ast.left.constant && ast.right.constant;
+    ast.toWatch = [ast];
+    break;
+  case AST.ArrayExpression:
+    allConstants = true;
+    argsToWatch = [];
+    forEach(ast.elements, function(expr) {
+      findConstantAndWatchExpressions(expr, $filter);
+      allConstants = allConstants && expr.constant;
+      if (!expr.constant) {
+        argsToWatch.push.apply(argsToWatch, expr.toWatch);
+      }
+    });
+    ast.constant = allConstants;
+    ast.toWatch = argsToWatch;
+    break;
+  case AST.ObjectExpression:
+    allConstants = true;
+    argsToWatch = [];
+    forEach(ast.properties, function(property) {
+      findConstantAndWatchExpressions(property.value, $filter);
+      allConstants = allConstants && property.value.constant;
+      if (!property.value.constant) {
+        argsToWatch.push.apply(argsToWatch, property.value.toWatch);
+      }
+    });
+    ast.constant = allConstants;
+    ast.toWatch = argsToWatch;
+    break;
+  case AST.ThisExpression:
+    ast.constant = false;
+    ast.toWatch = [];
+    break;
+  }
+}
+
+function getInputs(body) {
+  if (body.length != 1) return;
+  var lastExpression = body[0].expression;
+  var candidate = lastExpression.toWatch;
+  if (candidate.length !== 1) return candidate;
+  return candidate[0] !== lastExpression ? candidate : undefined;
+}
+
+function isAssignable(ast) {
+  return ast.type === AST.Identifier || ast.type === AST.MemberExpression;
+}
+
+function assignableAST(ast) {
+  if (ast.body.length === 1 && isAssignable(ast.body[0].expression)) {
+    return {type: AST.AssignmentExpression, left: ast.body[0].expression, right: {type: AST.NGValueParameter}, operator: '='};
+  }
+}
+
+function isLiteral(ast) {
+  return ast.body.length === 0 ||
+      ast.body.length === 1 && (
+      ast.body[0].expression.type === AST.Literal ||
+      ast.body[0].expression.type === AST.ArrayExpression ||
+      ast.body[0].expression.type === AST.ObjectExpression);
+}
+
+function isConstant(ast) {
+  return ast.constant;
+}
+
+function ASTCompiler(astBuilder, $filter) {
+  this.astBuilder = astBuilder;
+  this.$filter = $filter;
+}
+
+ASTCompiler.prototype = {
+  compile: function(expression, expensiveChecks) {
+    var self = this;
+    var ast = this.astBuilder.ast(expression);
+    this.state = {
+      nextId: 0,
+      filters: {},
+      expensiveChecks: expensiveChecks,
+      fn: {vars: [], body: [], own: {}},
+      assign: {vars: [], body: [], own: {}},
+      inputs: []
+    };
+    findConstantAndWatchExpressions(ast, self.$filter);
+    var extra = '';
+    var assignable;
+    this.stage = 'assign';
+    if ((assignable = assignableAST(ast))) {
+      this.state.computing = 'assign';
+      var result = this.nextId();
+      this.recurse(assignable, result);
+      this.return_(result);
+      extra = 'fn.assign=' + this.generateFunction('assign', 's,v,l');
+    }
+    var toWatch = getInputs(ast.body);
+    self.stage = 'inputs';
+    forEach(toWatch, function(watch, key) {
+      var fnKey = 'fn' + key;
+      self.state[fnKey] = {vars: [], body: [], own: {}};
+      self.state.computing = fnKey;
+      var intoId = self.nextId();
+      self.recurse(watch, intoId);
+      self.return_(intoId);
+      self.state.inputs.push(fnKey);
+      watch.watchId = key;
+    });
+    this.state.computing = 'fn';
+    this.stage = 'main';
+    this.recurse(ast);
+    var fnString =
+      // The build and minification steps remove the string "use strict" from the code, but this is done using a regex.
+      // This is a workaround for this until we do a better job at only removing the prefix only when we should.
+      '"' + this.USE + ' ' + this.STRICT + '";\n' +
+      this.filterPrefix() +
+      'var fn=' + this.generateFunction('fn', 's,l,a,i') +
+      extra +
+      this.watchFns() +
+      'return fn;';
+
+    /* jshint -W054 */
+    var fn = (new Function('$filter',
+        'ensureSafeMemberName',
+        'ensureSafeObject',
+        'ensureSafeFunction',
+        'getStringValue',
+        'ensureSafeAssignContext',
+        'ifDefined',
+        'plus',
+        'text',
+        fnString))(
+          this.$filter,
+          ensureSafeMemberName,
+          ensureSafeObject,
+          ensureSafeFunction,
+          getStringValue,
+          ensureSafeAssignContext,
+          ifDefined,
+          plusFn,
+          expression);
+    /* jshint +W054 */
+    this.state = this.stage = undefined;
+    fn.literal = isLiteral(ast);
+    fn.constant = isConstant(ast);
+    return fn;
+  },
+
+  USE: 'use',
+
+  STRICT: 'strict',
+
+  watchFns: function() {
+    var result = [];
+    var fns = this.state.inputs;
+    var self = this;
+    forEach(fns, function(name) {
+      result.push('var ' + name + '=' + self.generateFunction(name, 's'));
+    });
+    if (fns.length) {
+      result.push('fn.inputs=[' + fns.join(',') + '];');
+    }
+    return result.join('');
+  },
+
+  generateFunction: function(name, params) {
+    return 'function(' + params + '){' +
+        this.varsPrefix(name) +
+        this.body(name) +
+        '};';
+  },
+
+  filterPrefix: function() {
+    var parts = [];
+    var self = this;
+    forEach(this.state.filters, function(id, filter) {
+      parts.push(id + '=$filter(' + self.escape(filter) + ')');
+    });
+    if (parts.length) return 'var ' + parts.join(',') + ';';
+    return '';
+  },
+
+  varsPrefix: function(section) {
+    return this.state[section].vars.length ? 'var ' + this.state[section].vars.join(',') + ';' : '';
+  },
+
+  body: function(section) {
+    return this.state[section].body.join('');
+  },
+
+  recurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+    var left, right, self = this, args, expression;
+    recursionFn = recursionFn || noop;
+    if (!skipWatchIdCheck && isDefined(ast.watchId)) {
+      intoId = intoId || this.nextId();
+      this.if_('i',
+        this.lazyAssign(intoId, this.computedMember('i', ast.watchId)),
+        this.lazyRecurse(ast, intoId, nameId, recursionFn, create, true)
+      );
+      return;
+    }
+    switch (ast.type) {
+    case AST.Program:
+      forEach(ast.body, function(expression, pos) {
+        self.recurse(expression.expression, undefined, undefined, function(expr) { right = expr; });
+        if (pos !== ast.body.length - 1) {
+          self.current().body.push(right, ';');
+        } else {
+          self.return_(right);
+        }
+      });
+      break;
+    case AST.Literal:
+      expression = this.escape(ast.value);
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.UnaryExpression:
+      this.recurse(ast.argument, undefined, undefined, function(expr) { right = expr; });
+      expression = ast.operator + '(' + this.ifDefined(right, 0) + ')';
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.BinaryExpression:
+      this.recurse(ast.left, undefined, undefined, function(expr) { left = expr; });
+      this.recurse(ast.right, undefined, undefined, function(expr) { right = expr; });
+      if (ast.operator === '+') {
+        expression = this.plus(left, right);
+      } else if (ast.operator === '-') {
+        expression = this.ifDefined(left, 0) + ast.operator + this.ifDefined(right, 0);
+      } else {
+        expression = '(' + left + ')' + ast.operator + '(' + right + ')';
+      }
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.LogicalExpression:
+      intoId = intoId || this.nextId();
+      self.recurse(ast.left, intoId);
+      self.if_(ast.operator === '&&' ? intoId : self.not(intoId), self.lazyRecurse(ast.right, intoId));
+      recursionFn(intoId);
+      break;
+    case AST.ConditionalExpression:
+      intoId = intoId || this.nextId();
+      self.recurse(ast.test, intoId);
+      self.if_(intoId, self.lazyRecurse(ast.alternate, intoId), self.lazyRecurse(ast.consequent, intoId));
+      recursionFn(intoId);
+      break;
+    case AST.Identifier:
+      intoId = intoId || this.nextId();
+      if (nameId) {
+        nameId.context = self.stage === 'inputs' ? 's' : this.assign(this.nextId(), this.getHasOwnProperty('l', ast.name) + '?l:s');
+        nameId.computed = false;
+        nameId.name = ast.name;
+      }
+      ensureSafeMemberName(ast.name);
+      self.if_(self.stage === 'inputs' || self.not(self.getHasOwnProperty('l', ast.name)),
+        function() {
+          self.if_(self.stage === 'inputs' || 's', function() {
+            if (create && create !== 1) {
+              self.if_(
+                self.not(self.nonComputedMember('s', ast.name)),
+                self.lazyAssign(self.nonComputedMember('s', ast.name), '{}'));
+            }
+            self.assign(intoId, self.nonComputedMember('s', ast.name));
+          });
+        }, intoId && self.lazyAssign(intoId, self.nonComputedMember('l', ast.name))
+        );
+      if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.name)) {
+        self.addEnsureSafeObject(intoId);
+      }
+      recursionFn(intoId);
+      break;
+    case AST.MemberExpression:
+      left = nameId && (nameId.context = this.nextId()) || this.nextId();
+      intoId = intoId || this.nextId();
+      self.recurse(ast.object, left, undefined, function() {
+        self.if_(self.notNull(left), function() {
+          if (ast.computed) {
+            right = self.nextId();
+            self.recurse(ast.property, right);
+            self.getStringValue(right);
+            self.addEnsureSafeMemberName(right);
+            if (create && create !== 1) {
+              self.if_(self.not(self.computedMember(left, right)), self.lazyAssign(self.computedMember(left, right), '{}'));
+            }
+            expression = self.ensureSafeObject(self.computedMember(left, right));
+            self.assign(intoId, expression);
+            if (nameId) {
+              nameId.computed = true;
+              nameId.name = right;
+            }
+          } else {
+            ensureSafeMemberName(ast.property.name);
+            if (create && create !== 1) {
+              self.if_(self.not(self.nonComputedMember(left, ast.property.name)), self.lazyAssign(self.nonComputedMember(left, ast.property.name), '{}'));
+            }
+            expression = self.nonComputedMember(left, ast.property.name);
+            if (self.state.expensiveChecks || isPossiblyDangerousMemberName(ast.property.name)) {
+              expression = self.ensureSafeObject(expression);
+            }
+            self.assign(intoId, expression);
+            if (nameId) {
+              nameId.computed = false;
+              nameId.name = ast.property.name;
+            }
+          }
+        }, function() {
+          self.assign(intoId, 'undefined');
+        });
+        recursionFn(intoId);
+      }, !!create);
+      break;
+    case AST.CallExpression:
+      intoId = intoId || this.nextId();
+      if (ast.filter) {
+        right = self.filter(ast.callee.name);
+        args = [];
+        forEach(ast.arguments, function(expr) {
+          var argument = self.nextId();
+          self.recurse(expr, argument);
+          args.push(argument);
+        });
+        expression = right + '(' + args.join(',') + ')';
+        self.assign(intoId, expression);
+        recursionFn(intoId);
+      } else {
+        right = self.nextId();
+        left = {};
+        args = [];
+        self.recurse(ast.callee, right, left, function() {
+          self.if_(self.notNull(right), function() {
+            self.addEnsureSafeFunction(right);
+            forEach(ast.arguments, function(expr) {
+              self.recurse(expr, self.nextId(), undefined, function(argument) {
+                args.push(self.ensureSafeObject(argument));
+              });
+            });
+            if (left.name) {
+              if (!self.state.expensiveChecks) {
+                self.addEnsureSafeObject(left.context);
+              }
+              expression = self.member(left.context, left.name, left.computed) + '(' + args.join(',') + ')';
+            } else {
+              expression = right + '(' + args.join(',') + ')';
+            }
+            expression = self.ensureSafeObject(expression);
+            self.assign(intoId, expression);
+          }, function() {
+            self.assign(intoId, 'undefined');
+          });
+          recursionFn(intoId);
+        });
+      }
+      break;
+    case AST.AssignmentExpression:
+      right = this.nextId();
+      left = {};
+      if (!isAssignable(ast.left)) {
+        throw $parseMinErr('lval', 'Trying to assign a value to a non l-value');
+      }
+      this.recurse(ast.left, undefined, left, function() {
+        self.if_(self.notNull(left.context), function() {
+          self.recurse(ast.right, right);
+          self.addEnsureSafeObject(self.member(left.context, left.name, left.computed));
+          self.addEnsureSafeAssignContext(left.context);
+          expression = self.member(left.context, left.name, left.computed) + ast.operator + right;
+          self.assign(intoId, expression);
+          recursionFn(intoId || expression);
+        });
+      }, 1);
+      break;
+    case AST.ArrayExpression:
+      args = [];
+      forEach(ast.elements, function(expr) {
+        self.recurse(expr, self.nextId(), undefined, function(argument) {
+          args.push(argument);
+        });
+      });
+      expression = '[' + args.join(',') + ']';
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.ObjectExpression:
+      args = [];
+      forEach(ast.properties, function(property) {
+        self.recurse(property.value, self.nextId(), undefined, function(expr) {
+          args.push(self.escape(
+              property.key.type === AST.Identifier ? property.key.name :
+                ('' + property.key.value)) +
+              ':' + expr);
+        });
+      });
+      expression = '{' + args.join(',') + '}';
+      this.assign(intoId, expression);
+      recursionFn(expression);
+      break;
+    case AST.ThisExpression:
+      this.assign(intoId, 's');
+      recursionFn('s');
+      break;
+    case AST.NGValueParameter:
+      this.assign(intoId, 'v');
+      recursionFn('v');
+      break;
+    }
+  },
+
+  getHasOwnProperty: function(element, property) {
+    var key = element + '.' + property;
+    var own = this.current().own;
+    if (!own.hasOwnProperty(key)) {
+      own[key] = this.nextId(false, element + '&&(' + this.escape(property) + ' in ' + element + ')');
+    }
+    return own[key];
+  },
+
+  assign: function(id, value) {
+    if (!id) return;
+    this.current().body.push(id, '=', value, ';');
+    return id;
+  },
+
+  filter: function(filterName) {
+    if (!this.state.filters.hasOwnProperty(filterName)) {
+      this.state.filters[filterName] = this.nextId(true);
+    }
+    return this.state.filters[filterName];
+  },
+
+  ifDefined: function(id, defaultValue) {
+    return 'ifDefined(' + id + ',' + this.escape(defaultValue) + ')';
+  },
+
+  plus: function(left, right) {
+    return 'plus(' + left + ',' + right + ')';
+  },
+
+  return_: function(id) {
+    this.current().body.push('return ', id, ';');
+  },
+
+  if_: function(test, alternate, consequent) {
+    if (test === true) {
+      alternate();
+    } else {
+      var body = this.current().body;
+      body.push('if(', test, '){');
+      alternate();
+      body.push('}');
+      if (consequent) {
+        body.push('else{');
+        consequent();
+        body.push('}');
+      }
+    }
+  },
+
+  not: function(expression) {
+    return '!(' + expression + ')';
+  },
+
+  notNull: function(expression) {
+    return expression + '!=null';
+  },
+
+  nonComputedMember: function(left, right) {
+    return left + '.' + right;
+  },
+
+  computedMember: function(left, right) {
+    return left + '[' + right + ']';
+  },
+
+  member: function(left, right, computed) {
+    if (computed) return this.computedMember(left, right);
+    return this.nonComputedMember(left, right);
+  },
+
+  addEnsureSafeObject: function(item) {
+    this.current().body.push(this.ensureSafeObject(item), ';');
+  },
+
+  addEnsureSafeMemberName: function(item) {
+    this.current().body.push(this.ensureSafeMemberName(item), ';');
+  },
+
+  addEnsureSafeFunction: function(item) {
+    this.current().body.push(this.ensureSafeFunction(item), ';');
+  },
+
+  addEnsureSafeAssignContext: function(item) {
+    this.current().body.push(this.ensureSafeAssignContext(item), ';');
+  },
+
+  ensureSafeObject: function(item) {
+    return 'ensureSafeObject(' + item + ',text)';
+  },
+
+  ensureSafeMemberName: function(item) {
+    return 'ensureSafeMemberName(' + item + ',text)';
+  },
+
+  ensureSafeFunction: function(item) {
+    return 'ensureSafeFunction(' + item + ',text)';
+  },
+
+  getStringValue: function(item) {
+    this.assign(item, 'getStringValue(' + item + ',text)');
+  },
+
+  ensureSafeAssignContext: function(item) {
+    return 'ensureSafeAssignContext(' + item + ',text)';
+  },
+
+  lazyRecurse: function(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck) {
+    var self = this;
+    return function() {
+      self.recurse(ast, intoId, nameId, recursionFn, create, skipWatchIdCheck);
+    };
+  },
+
+  lazyAssign: function(id, value) {
+    var self = this;
+    return function() {
+      self.assign(id, value);
+    };
+  },
+
+  stringEscapeRegex: /[^ a-zA-Z0-9]/g,
+
+  stringEscapeFn: function(c) {
+    return '\\u' + ('0000' + c.charCodeAt(0).toString(16)).slice(-4);
+  },
+
+  escape: function(value) {
+    if (isString(value)) return "'" + value.replace(this.stringEscapeRegex, this.stringEscapeFn) + "'";
+    if (isNumber(value)) return value.toString();
+    if (value === true) return 'true';
+    if (value === false) return 'false';
+    if (value === null) return 'null';
+    if (typeof value === 'undefined') return 'undefined';
+
+    throw $parseMinErr('esc', 'IMPOSSIBLE');
+  },
+
+  nextId: function(skip, init) {
+    var id = 'v' + (this.state.nextId++);
+    if (!skip) {
+      this.current().vars.push(id + (init ? '=' + init : ''));
+    }
+    return id;
+  },
+
+  current: function() {
+    return this.state[this.state.computing];
+  }
+};
+
+
+function ASTInterpreter(astBuilder, $filter) {
+  this.astBuilder = astBuilder;
+  this.$filter = $filter;
+}
+
+ASTInterpreter.prototype = {
+  compile: function(expression, expensiveChecks) {
+    var self = this;
+    var ast = this.astBuilder.ast(expression);
+    this.expression = expression;
+    this.expensiveChecks = expensiveChecks;
+    findConstantAndWatchExpressions(ast, self.$filter);
+    var assignable;
+    var assign;
+    if ((assignable = assignableAST(ast))) {
+      assign = this.recurse(assignable);
+    }
+    var toWatch = getInputs(ast.body);
+    var inputs;
+    if (toWatch) {
+      inputs = [];
+      forEach(toWatch, function(watch, key) {
+        var input = self.recurse(watch);
+        watch.input = input;
+        inputs.push(input);
+        watch.watchId = key;
+      });
+    }
+    var expressions = [];
+    forEach(ast.body, function(expression) {
+      expressions.push(self.recurse(expression.expression));
+    });
+    var fn = ast.body.length === 0 ? function() {} :
+             ast.body.length === 1 ? expressions[0] :
+             function(scope, locals) {
+               var lastValue;
+               forEach(expressions, function(exp) {
+                 lastValue = exp(scope, locals);
+               });
+               return lastValue;
+             };
+    if (assign) {
+      fn.assign = function(scope, value, locals) {
+        return assign(scope, locals, value);
+      };
+    }
+    if (inputs) {
+      fn.inputs = inputs;
+    }
+    fn.literal = isLiteral(ast);
+    fn.constant = isConstant(ast);
+    return fn;
+  },
+
+  recurse: function(ast, context, create) {
+    var left, right, self = this, args, expression;
+    if (ast.input) {
+      return this.inputs(ast.input, ast.watchId);
+    }
+    switch (ast.type) {
+    case AST.Literal:
+      return this.value(ast.value, context);
+    case AST.UnaryExpression:
+      right = this.recurse(ast.argument);
+      return this['unary' + ast.operator](right, context);
+    case AST.BinaryExpression:
+      left = this.recurse(ast.left);
+      right = this.recurse(ast.right);
+      return this['binary' + ast.operator](left, right, context);
+    case AST.LogicalExpression:
+      left = this.recurse(ast.left);
+      right = this.recurse(ast.right);
+      return this['binary' + ast.operator](left, right, context);
+    case AST.ConditionalExpression:
+      return this['ternary?:'](
+        this.recurse(ast.test),
+        this.recurse(ast.alternate),
+        this.recurse(ast.consequent),
+        context
+      );
+    case AST.Identifier:
+      ensureSafeMemberName(ast.name, self.expression);
+      return self.identifier(ast.name,
+                             self.expensiveChecks || isPossiblyDangerousMemberName(ast.name),
+                             context, create, self.expression);
+    case AST.MemberExpression:
+      left = this.recurse(ast.object, false, !!create);
+      if (!ast.computed) {
+        ensureSafeMemberName(ast.property.name, self.expression);
+        right = ast.property.name;
+      }
+      if (ast.computed) right = this.recurse(ast.property);
+      return ast.computed ?
+        this.computedMember(left, right, context, create, self.expression) :
+        this.nonComputedMember(left, right, self.expensiveChecks, context, create, self.expression);
+    case AST.CallExpression:
+      args = [];
+      forEach(ast.arguments, function(expr) {
+        args.push(self.recurse(expr));
+      });
+      if (ast.filter) right = this.$filter(ast.callee.name);
+      if (!ast.filter) right = this.recurse(ast.callee, true);
+      return ast.filter ?
+        function(scope, locals, assign, inputs) {
+          var values = [];
+          for (var i = 0; i < args.length; ++i) {
+            values.push(args[i](scope, locals, assign, inputs));
+          }
+          var value = right.apply(undefined, values, inputs);
+          return context ? {context: undefined, name: undefined, value: value} : value;
+        } :
+        function(scope, locals, assign, inputs) {
+          var rhs = right(scope, locals, assign, inputs);
+          var value;
+          if (rhs.value != null) {
+            ensureSafeObject(rhs.context, self.expression);
+            ensureSafeFunction(rhs.value, self.expression);
+            var values = [];
+            for (var i = 0; i < args.length; ++i) {
+              values.push(ensureSafeObject(args[i](scope, locals, assign, inputs), self.expression));
+            }
+            value = ensureSafeObject(rhs.value.apply(rhs.context, values), self.expression);
+          }
+          return context ? {value: value} : value;
+        };
+    case AST.AssignmentExpression:
+      left = this.recurse(ast.left, true, 1);
+      right = this.recurse(ast.right);
+      return function(scope, locals, assign, inputs) {
+        var lhs = left(scope, locals, assign, inputs);
+        var rhs = right(scope, locals, assign, inputs);
+        ensureSafeObject(lhs.value, self.expression);
+        ensureSafeAssignContext(lhs.context);
+        lhs.context[lhs.name] = rhs;
+        return context ? {value: rhs} : rhs;
+      };
+    case AST.ArrayExpression:
+      args = [];
+      forEach(ast.elements, function(expr) {
+        args.push(self.recurse(expr));
+      });
+      return function(scope, locals, assign, inputs) {
+        var value = [];
+        for (var i = 0; i < args.length; ++i) {
+          value.push(args[i](scope, locals, assign, inputs));
+        }
+        return context ? {value: value} : value;
+      };
+    case AST.ObjectExpression:
+      args = [];
+      forEach(ast.properties, function(property) {
+        args.push({key: property.key.type === AST.Identifier ?
+                        property.key.name :
+                        ('' + property.key.value),
+                   value: self.recurse(property.value)
+        });
+      });
+      return function(scope, locals, assign, inputs) {
+        var value = {};
+        for (var i = 0; i < args.length; ++i) {
+          value[args[i].key] = args[i].value(scope, locals, assign, inputs);
+        }
+        return context ? {value: value} : value;
+      };
+    case AST.ThisExpression:
+      return function(scope) {
+        return context ? {value: scope} : scope;
+      };
+    case AST.NGValueParameter:
+      return function(scope, locals, assign, inputs) {
+        return context ? {value: assign} : assign;
+      };
+    }
+  },
+
+  'unary+': function(argument, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = argument(scope, locals, assign, inputs);
+      if (isDefined(arg)) {
+        arg = +arg;
+      } else {
+        arg = 0;
+      }
+      return context ? {value: arg} : arg;
+    };
+  },
+  'unary-': function(argument, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = argument(scope, locals, assign, inputs);
+      if (isDefined(arg)) {
+        arg = -arg;
+      } else {
+        arg = 0;
+      }
+      return context ? {value: arg} : arg;
+    };
+  },
+  'unary!': function(argument, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = !argument(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary+': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      var rhs = right(scope, locals, assign, inputs);
+      var arg = plusFn(lhs, rhs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary-': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      var rhs = right(scope, locals, assign, inputs);
+      var arg = (isDefined(lhs) ? lhs : 0) - (isDefined(rhs) ? rhs : 0);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary*': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) * right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary/': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) / right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary%': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) % right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary===': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) === right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary!==': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) !== right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary==': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) == right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary!=': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) != right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary<': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) < right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary>': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) > right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary<=': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) <= right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary>=': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) >= right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary&&': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) && right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'binary||': function(left, right, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = left(scope, locals, assign, inputs) || right(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  'ternary?:': function(test, alternate, consequent, context) {
+    return function(scope, locals, assign, inputs) {
+      var arg = test(scope, locals, assign, inputs) ? alternate(scope, locals, assign, inputs) : consequent(scope, locals, assign, inputs);
+      return context ? {value: arg} : arg;
+    };
+  },
+  value: function(value, context) {
+    return function() { return context ? {context: undefined, name: undefined, value: value} : value; };
+  },
+  identifier: function(name, expensiveChecks, context, create, expression) {
+    return function(scope, locals, assign, inputs) {
+      var base = locals && (name in locals) ? locals : scope;
+      if (create && create !== 1 && base && !(base[name])) {
+        base[name] = {};
+      }
+      var value = base ? base[name] : undefined;
+      if (expensiveChecks) {
+        ensureSafeObject(value, expression);
+      }
+      if (context) {
+        return {context: base, name: name, value: value};
+      } else {
+        return value;
+      }
+    };
+  },
+  computedMember: function(left, right, context, create, expression) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      var rhs;
+      var value;
+      if (lhs != null) {
+        rhs = right(scope, locals, assign, inputs);
+        rhs = getStringValue(rhs);
+        ensureSafeMemberName(rhs, expression);
+        if (create && create !== 1 && lhs && !(lhs[rhs])) {
+          lhs[rhs] = {};
+        }
+        value = lhs[rhs];
+        ensureSafeObject(value, expression);
+      }
+      if (context) {
+        return {context: lhs, name: rhs, value: value};
+      } else {
+        return value;
+      }
+    };
+  },
+  nonComputedMember: function(left, right, expensiveChecks, context, create, expression) {
+    return function(scope, locals, assign, inputs) {
+      var lhs = left(scope, locals, assign, inputs);
+      if (create && create !== 1 && lhs && !(lhs[right])) {
+        lhs[right] = {};
+      }
+      var value = lhs != null ? lhs[right] : undefined;
+      if (expensiveChecks || isPossiblyDangerousMemberName(right)) {
+        ensureSafeObject(value, expression);
+      }
+      if (context) {
+        return {context: lhs, name: right, value: value};
+      } else {
+        return value;
+      }
+    };
+  },
+  inputs: function(input, watchId) {
+    return function(scope, value, locals, inputs) {
+      if (inputs) return inputs[watchId];
+      return input(scope, value, locals);
+    };
+  }
+};
+
+/**
+ * @constructor
+ */
+var Parser = function(lexer, $filter, options) {
+  this.lexer = lexer;
+  this.$filter = $filter;
+  this.options = options;
+  this.ast = new AST(this.lexer);
+  this.astCompiler = options.csp ? new ASTInterpreter(this.ast, $filter) :
+                                   new ASTCompiler(this.ast, $filter);
+};
+
+Parser.prototype = {
+  constructor: Parser,
+
+  parse: function(text) {
+    return this.astCompiler.compile(text, this.options.expensiveChecks);
+  }
+};
+
+function isPossiblyDangerousMemberName(name) {
+  return name == 'constructor';
+}
+
+var objectValueOf = Object.prototype.valueOf;
+
+function getValueOf(value) {
+  return isFunction(value.valueOf) ? value.valueOf() : objectValueOf.call(value);
+}
+
+///////////////////////////////////
+
+/**
+ * @ngdoc service
+ * @name $parse
+ * @kind function
+ *
+ * @description
+ *
+ * Converts Angular {@link guide/expression expression} into a function.
+ *
+ * ```js
+ *   var getter = $parse('user.name');
+ *   var setter = getter.assign;
+ *   var context = {user:{name:'angular'}};
+ *   var locals = {user:{name:'local'}};
+ *
+ *   expect(getter(context)).toEqual('angular');
+ *   setter(context, 'newValue');
+ *   expect(context.user.name).toEqual('newValue');
+ *   expect(getter(context, locals)).toEqual('local');
+ * ```
+ *
+ *
+ * @param {string} expression String expression to compile.
+ * @returns {function(context, locals)} a function which represents the compiled expression:
+ *
+ *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+ *      are evaluated against (typically a scope object).
+ *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+ *      `context`.
+ *
+ *    The returned function also has the following properties:
+ *      * `literal` – `{boolean}` – whether the expression's top-level node is a JavaScript
+ *        literal.
+ *      * `constant` – `{boolean}` – whether the expression is made entirely of JavaScript
+ *        constant literals.
+ *      * `assign` – `{?function(context, value)}` – if the expression is assignable, this will be
+ *        set to a function to change its value on the given context.
+ *
+ */
+
+
+/**
+ * @ngdoc provider
+ * @name $parseProvider
+ *
+ * @description
+ * `$parseProvider` can be used for configuring the default behavior of the {@link ng.$parse $parse}
+ *  service.
+ */
+function $ParseProvider() {
+  var cacheDefault = createMap();
+  var cacheExpensive = createMap();
+
+  this.$get = ['$filter', function($filter) {
+    var noUnsafeEval = csp().noUnsafeEval;
+    var $parseOptions = {
+          csp: noUnsafeEval,
+          expensiveChecks: false
+        },
+        $parseOptionsExpensive = {
+          csp: noUnsafeEval,
+          expensiveChecks: true
+        };
+
+    return function $parse(exp, interceptorFn, expensiveChecks) {
+      var parsedExpression, oneTime, cacheKey;
+
+      switch (typeof exp) {
+        case 'string':
+          exp = exp.trim();
+          cacheKey = exp;
+
+          var cache = (expensiveChecks ? cacheExpensive : cacheDefault);
+          parsedExpression = cache[cacheKey];
+
+          if (!parsedExpression) {
+            if (exp.charAt(0) === ':' && exp.charAt(1) === ':') {
+              oneTime = true;
+              exp = exp.substring(2);
+            }
+            var parseOptions = expensiveChecks ? $parseOptionsExpensive : $parseOptions;
+            var lexer = new Lexer(parseOptions);
+            var parser = new Parser(lexer, $filter, parseOptions);
+            parsedExpression = parser.parse(exp);
+            if (parsedExpression.constant) {
+              parsedExpression.$$watchDelegate = constantWatchDelegate;
+            } else if (oneTime) {
+              parsedExpression.$$watchDelegate = parsedExpression.literal ?
+                  oneTimeLiteralWatchDelegate : oneTimeWatchDelegate;
+            } else if (parsedExpression.inputs) {
+              parsedExpression.$$watchDelegate = inputsWatchDelegate;
+            }
+            cache[cacheKey] = parsedExpression;
+          }
+          return addInterceptor(parsedExpression, interceptorFn);
+
+        case 'function':
+          return addInterceptor(exp, interceptorFn);
+
+        default:
+          return addInterceptor(noop, interceptorFn);
+      }
+    };
+
+    function expressionInputDirtyCheck(newValue, oldValueOfValue) {
+
+      if (newValue == null || oldValueOfValue == null) { // null/undefined
+        return newValue === oldValueOfValue;
+      }
+
+      if (typeof newValue === 'object') {
+
+        // attempt to convert the value to a primitive type
+        // TODO(docs): add a note to docs that by implementing valueOf even objects and arrays can
+        //             be cheaply dirty-checked
+        newValue = getValueOf(newValue);
+
+        if (typeof newValue === 'object') {
+          // objects/arrays are not supported - deep-watching them would be too expensive
+          return false;
+        }
+
+        // fall-through to the primitive equality check
+      }
+
+      //Primitive or NaN
+      return newValue === oldValueOfValue || (newValue !== newValue && oldValueOfValue !== oldValueOfValue);
+    }
+
+    function inputsWatchDelegate(scope, listener, objectEquality, parsedExpression, prettyPrintExpression) {
+      var inputExpressions = parsedExpression.inputs;
+      var lastResult;
+
+      if (inputExpressions.length === 1) {
+        var oldInputValueOf = expressionInputDirtyCheck; // init to something unique so that equals check fails
+        inputExpressions = inputExpressions[0];
+        return scope.$watch(function expressionInputWatch(scope) {
+          var newInputValue = inputExpressions(scope);
+          if (!expressionInputDirtyCheck(newInputValue, oldInputValueOf)) {
+            lastResult = parsedExpression(scope, undefined, undefined, [newInputValue]);
+            oldInputValueOf = newInputValue && getValueOf(newInputValue);
+          }
+          return lastResult;
+        }, listener, objectEquality, prettyPrintExpression);
+      }
+
+      var oldInputValueOfValues = [];
+      var oldInputValues = [];
+      for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+        oldInputValueOfValues[i] = expressionInputDirtyCheck; // init to something unique so that equals check fails
+        oldInputValues[i] = null;
+      }
+
+      return scope.$watch(function expressionInputsWatch(scope) {
+        var changed = false;
+
+        for (var i = 0, ii = inputExpressions.length; i < ii; i++) {
+          var newInputValue = inputExpressions[i](scope);
+          if (changed || (changed = !expressionInputDirtyCheck(newInputValue, oldInputValueOfValues[i]))) {
+            oldInputValues[i] = newInputValue;
+            oldInputValueOfValues[i] = newInputValue && getValueOf(newInputValue);
+          }
+        }
+
+        if (changed) {
+          lastResult = parsedExpression(scope, undefined, undefined, oldInputValues);
+        }
+
+        return lastResult;
+      }, listener, objectEquality, prettyPrintExpression);
+    }
+
+    function oneTimeWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+      var unwatch, lastValue;
+      return unwatch = scope.$watch(function oneTimeWatch(scope) {
+        return parsedExpression(scope);
+      }, function oneTimeListener(value, old, scope) {
+        lastValue = value;
+        if (isFunction(listener)) {
+          listener.apply(this, arguments);
+        }
+        if (isDefined(value)) {
+          scope.$$postDigest(function() {
+            if (isDefined(lastValue)) {
+              unwatch();
+            }
+          });
+        }
+      }, objectEquality);
+    }
+
+    function oneTimeLiteralWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+      var unwatch, lastValue;
+      return unwatch = scope.$watch(function oneTimeWatch(scope) {
+        return parsedExpression(scope);
+      }, function oneTimeListener(value, old, scope) {
+        lastValue = value;
+        if (isFunction(listener)) {
+          listener.call(this, value, old, scope);
+        }
+        if (isAllDefined(value)) {
+          scope.$$postDigest(function() {
+            if (isAllDefined(lastValue)) unwatch();
+          });
+        }
+      }, objectEquality);
+
+      function isAllDefined(value) {
+        var allDefined = true;
+        forEach(value, function(val) {
+          if (!isDefined(val)) allDefined = false;
+        });
+        return allDefined;
+      }
+    }
+
+    function constantWatchDelegate(scope, listener, objectEquality, parsedExpression) {
+      var unwatch;
+      return unwatch = scope.$watch(function constantWatch(scope) {
+        return parsedExpression(scope);
+      }, function constantListener(value, old, scope) {
+        if (isFunction(listener)) {
+          listener.apply(this, arguments);
+        }
+        unwatch();
+      }, objectEquality);
+    }
+
+    function addInterceptor(parsedExpression, interceptorFn) {
+      if (!interceptorFn) return parsedExpression;
+      var watchDelegate = parsedExpression.$$watchDelegate;
+      var useInputs = false;
+
+      var regularWatch =
+          watchDelegate !== oneTimeLiteralWatchDelegate &&
+          watchDelegate !== oneTimeWatchDelegate;
+
+      var fn = regularWatch ? function regularInterceptedExpression(scope, locals, assign, inputs) {
+        var value = useInputs && inputs ? inputs[0] : parsedExpression(scope, locals, assign, inputs);
+        return interceptorFn(value, scope, locals);
+      } : function oneTimeInterceptedExpression(scope, locals, assign, inputs) {
+        var value = parsedExpression(scope, locals, assign, inputs);
+        var result = interceptorFn(value, scope, locals);
+        // we only return the interceptor's result if the
+        // initial value is defined (for bind-once)
+        return isDefined(value) ? result : value;
+      };
+
+      // Propagate $$watchDelegates other then inputsWatchDelegate
+      if (parsedExpression.$$watchDelegate &&
+          parsedExpression.$$watchDelegate !== inputsWatchDelegate) {
+        fn.$$watchDelegate = parsedExpression.$$watchDelegate;
+      } else if (!interceptorFn.$stateful) {
+        // If there is an interceptor, but no watchDelegate then treat the interceptor like
+        // we treat filters - it is assumed to be a pure function unless flagged with $stateful
+        fn.$$watchDelegate = inputsWatchDelegate;
+        useInputs = !parsedExpression.inputs;
+        fn.inputs = parsedExpression.inputs ? parsedExpression.inputs : [parsedExpression];
+      }
+
+      return fn;
+    }
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $q
+ * @requires $rootScope
+ *
+ * @description
+ * A service that helps you run functions asynchronously, and use their return values (or exceptions)
+ * when they are done processing.
+ *
+ * This is an implementation of promises/deferred objects inspired by
+ * [Kris Kowal's Q](https://github.com/kriskowal/q).
+ *
+ * $q can be used in two fashions --- one which is more similar to Kris Kowal's Q or jQuery's Deferred
+ * implementations, and the other which resembles ES6 promises to some degree.
+ *
+ * # $q constructor
+ *
+ * The streamlined ES6 style promise is essentially just using $q as a constructor which takes a `resolver`
+ * function as the first argument. This is similar to the native Promise implementation from ES6 Harmony,
+ * see [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise).
+ *
+ * While the constructor-style use is supported, not all of the supporting methods from ES6 Harmony promises are
+ * available yet.
+ *
+ * It can be used like so:
+ *
+ * ```js
+ *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+ *   // are available in the current lexical scope (they could have been injected or passed in).
+ *
+ *   function asyncGreet(name) {
+ *     // perform some asynchronous operation, resolve or reject the promise when appropriate.
+ *     return $q(function(resolve, reject) {
+ *       setTimeout(function() {
+ *         if (okToGreet(name)) {
+ *           resolve('Hello, ' + name + '!');
+ *         } else {
+ *           reject('Greeting ' + name + ' is not allowed.');
+ *         }
+ *       }, 1000);
+ *     });
+ *   }
+ *
+ *   var promise = asyncGreet('Robin Hood');
+ *   promise.then(function(greeting) {
+ *     alert('Success: ' + greeting);
+ *   }, function(reason) {
+ *     alert('Failed: ' + reason);
+ *   });
+ * ```
+ *
+ * Note: progress/notify callbacks are not currently supported via the ES6-style interface.
+ *
+ * Note: unlike ES6 behaviour, an exception thrown in the constructor function will NOT implicitly reject the promise.
+ *
+ * However, the more traditional CommonJS-style usage is still available, and documented below.
+ *
+ * [The CommonJS Promise proposal](http://wiki.commonjs.org/wiki/Promises) describes a promise as an
+ * interface for interacting with an object that represents the result of an action that is
+ * performed asynchronously, and may or may not be finished at any given point in time.
+ *
+ * From the perspective of dealing with error handling, deferred and promise APIs are to
+ * asynchronous programming what `try`, `catch` and `throw` keywords are to synchronous programming.
+ *
+ * ```js
+ *   // for the purpose of this example let's assume that variables `$q` and `okToGreet`
+ *   // are available in the current lexical scope (they could have been injected or passed in).
+ *
+ *   function asyncGreet(name) {
+ *     var deferred = $q.defer();
+ *
+ *     setTimeout(function() {
+ *       deferred.notify('About to greet ' + name + '.');
+ *
+ *       if (okToGreet(name)) {
+ *         deferred.resolve('Hello, ' + name + '!');
+ *       } else {
+ *         deferred.reject('Greeting ' + name + ' is not allowed.');
+ *       }
+ *     }, 1000);
+ *
+ *     return deferred.promise;
+ *   }
+ *
+ *   var promise = asyncGreet('Robin Hood');
+ *   promise.then(function(greeting) {
+ *     alert('Success: ' + greeting);
+ *   }, function(reason) {
+ *     alert('Failed: ' + reason);
+ *   }, function(update) {
+ *     alert('Got notification: ' + update);
+ *   });
+ * ```
+ *
+ * At first it might not be obvious why this extra complexity is worth the trouble. The payoff
+ * comes in the way of guarantees that promise and deferred APIs make, see
+ * https://github.com/kriskowal/uncommonjs/blob/master/promises/specification.md.
+ *
+ * Additionally the promise api allows for composition that is very hard to do with the
+ * traditional callback ([CPS](http://en.wikipedia.org/wiki/Continuation-passing_style)) approach.
+ * For more on this please see the [Q documentation](https://github.com/kriskowal/q) especially the
+ * section on serial or parallel joining of promises.
+ *
+ * # The Deferred API
+ *
+ * A new instance of deferred is constructed by calling `$q.defer()`.
+ *
+ * The purpose of the deferred object is to expose the associated Promise instance as well as APIs
+ * that can be used for signaling the successful or unsuccessful completion, as well as the status
+ * of the task.
+ *
+ * **Methods**
+ *
+ * - `resolve(value)` – resolves the derived promise with the `value`. If the value is a rejection
+ *   constructed via `$q.reject`, the promise will be rejected instead.
+ * - `reject(reason)` – rejects the derived promise with the `reason`. This is equivalent to
+ *   resolving it with a rejection constructed via `$q.reject`.
+ * - `notify(value)` - provides updates on the status of the promise's execution. This may be called
+ *   multiple times before the promise is either resolved or rejected.
+ *
+ * **Properties**
+ *
+ * - promise – `{Promise}` – promise object associated with this deferred.
+ *
+ *
+ * # The Promise API
+ *
+ * A new promise instance is created when a deferred instance is created and can be retrieved by
+ * calling `deferred.promise`.
+ *
+ * The purpose of the promise object is to allow for interested parties to get access to the result
+ * of the deferred task when it completes.
+ *
+ * **Methods**
+ *
+ * - `then(successCallback, errorCallback, notifyCallback)` – regardless of when the promise was or
+ *   will be resolved or rejected, `then` calls one of the success or error callbacks asynchronously
+ *   as soon as the result is available. The callbacks are called with a single argument: the result
+ *   or rejection reason. Additionally, the notify callback may be called zero or more times to
+ *   provide a progress indication, before the promise is resolved or rejected.
+ *
+ *   This method *returns a new promise* which is resolved or rejected via the return value of the
+ *   `successCallback`, `errorCallback` (unless that value is a promise, in which case it is resolved
+ *   with the value which is resolved in that promise using
+ *   [promise chaining](http://www.html5rocks.com/en/tutorials/es6/promises/#toc-promises-queues)).
+ *   It also notifies via the return value of the `notifyCallback` method. The promise cannot be
+ *   resolved or rejected from the notifyCallback method.
+ *
+ * - `catch(errorCallback)` – shorthand for `promise.then(null, errorCallback)`
+ *
+ * - `finally(callback, notifyCallback)` – allows you to observe either the fulfillment or rejection of a promise,
+ *   but to do so without modifying the final value. This is useful to release resources or do some
+ *   clean-up that needs to be done whether the promise was rejected or resolved. See the [full
+ *   specification](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) for
+ *   more information.
+ *
+ * # Chaining promises
+ *
+ * Because calling the `then` method of a promise returns a new derived promise, it is easily
+ * possible to create a chain of promises:
+ *
+ * ```js
+ *   promiseB = promiseA.then(function(result) {
+ *     return result + 1;
+ *   });
+ *
+ *   // promiseB will be resolved immediately after promiseA is resolved and its value
+ *   // will be the result of promiseA incremented by 1
+ * ```
+ *
+ * It is possible to create chains of any length and since a promise can be resolved with another
+ * promise (which will defer its resolution further), it is possible to pause/defer resolution of
+ * the promises at any point in the chain. This makes it possible to implement powerful APIs like
+ * $http's response interceptors.
+ *
+ *
+ * # Differences between Kris Kowal's Q and $q
+ *
+ *  There are two main differences:
+ *
+ * - $q is integrated with the {@link ng.$rootScope.Scope} Scope model observation
+ *   mechanism in angular, which means faster propagation of resolution or rejection into your
+ *   models and avoiding unnecessary browser repaints, which would result in flickering UI.
+ * - Q has many more features than $q, but that comes at a cost of bytes. $q is tiny, but contains
+ *   all the important functionality needed for common async tasks.
+ *
+ *  # Testing
+ *
+ *  ```js
+ *    it('should simulate promise', inject(function($q, $rootScope) {
+ *      var deferred = $q.defer();
+ *      var promise = deferred.promise;
+ *      var resolvedValue;
+ *
+ *      promise.then(function(value) { resolvedValue = value; });
+ *      expect(resolvedValue).toBeUndefined();
+ *
+ *      // Simulate resolving of promise
+ *      deferred.resolve(123);
+ *      // Note that the 'then' function does not get called synchronously.
+ *      // This is because we want the promise API to always be async, whether or not
+ *      // it got called synchronously or asynchronously.
+ *      expect(resolvedValue).toBeUndefined();
+ *
+ *      // Propagate promise resolution to 'then' functions using $apply().
+ *      $rootScope.$apply();
+ *      expect(resolvedValue).toEqual(123);
+ *    }));
+ *  ```
+ *
+ * @param {function(function, function)} resolver Function which is responsible for resolving or
+ *   rejecting the newly created promise. The first parameter is a function which resolves the
+ *   promise, the second parameter is a function which rejects the promise.
+ *
+ * @returns {Promise} The newly created promise.
+ */
+function $QProvider() {
+
+  this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
+    return qFactory(function(callback) {
+      $rootScope.$evalAsync(callback);
+    }, $exceptionHandler);
+  }];
+}
+
+function $$QProvider() {
+  this.$get = ['$browser', '$exceptionHandler', function($browser, $exceptionHandler) {
+    return qFactory(function(callback) {
+      $browser.defer(callback);
+    }, $exceptionHandler);
+  }];
+}
+
+/**
+ * Constructs a promise manager.
+ *
+ * @param {function(function)} nextTick Function for executing functions in the next turn.
+ * @param {function(...*)} exceptionHandler Function into which unexpected exceptions are passed for
+ *     debugging purposes.
+ * @returns {object} Promise manager.
+ */
+function qFactory(nextTick, exceptionHandler) {
+  var $qMinErr = minErr('$q', TypeError);
+  function callOnce(self, resolveFn, rejectFn) {
+    var called = false;
+    function wrap(fn) {
+      return function(value) {
+        if (called) return;
+        called = true;
+        fn.call(self, value);
+      };
+    }
+
+    return [wrap(resolveFn), wrap(rejectFn)];
+  }
+
+  /**
+   * @ngdoc method
+   * @name ng.$q#defer
+   * @kind function
+   *
+   * @description
+   * Creates a `Deferred` object which represents a task which will finish in the future.
+   *
+   * @returns {Deferred} Returns a new instance of deferred.
+   */
+  var defer = function() {
+    return new Deferred();
+  };
+
+  function Promise() {
+    this.$$state = { status: 0 };
+  }
+
+  extend(Promise.prototype, {
+    then: function(onFulfilled, onRejected, progressBack) {
+      if (isUndefined(onFulfilled) && isUndefined(onRejected) && isUndefined(progressBack)) {
+        return this;
+      }
+      var result = new Deferred();
+
+      this.$$state.pending = this.$$state.pending || [];
+      this.$$state.pending.push([result, onFulfilled, onRejected, progressBack]);
+      if (this.$$state.status > 0) scheduleProcessQueue(this.$$state);
+
+      return result.promise;
+    },
+
+    "catch": function(callback) {
+      return this.then(null, callback);
+    },
+
+    "finally": function(callback, progressBack) {
+      return this.then(function(value) {
+        return handleCallback(value, true, callback);
+      }, function(error) {
+        return handleCallback(error, false, callback);
+      }, progressBack);
+    }
+  });
+
+  //Faster, more basic than angular.bind http://jsperf.com/angular-bind-vs-custom-vs-native
+  function simpleBind(context, fn) {
+    return function(value) {
+      fn.call(context, value);
+    };
+  }
+
+  function processQueue(state) {
+    var fn, deferred, pending;
+
+    pending = state.pending;
+    state.processScheduled = false;
+    state.pending = undefined;
+    for (var i = 0, ii = pending.length; i < ii; ++i) {
+      deferred = pending[i][0];
+      fn = pending[i][state.status];
+      try {
+        if (isFunction(fn)) {
+          deferred.resolve(fn(state.value));
+        } else if (state.status === 1) {
+          deferred.resolve(state.value);
+        } else {
+          deferred.reject(state.value);
+        }
+      } catch (e) {
+        deferred.reject(e);
+        exceptionHandler(e);
+      }
+    }
+  }
+
+  function scheduleProcessQueue(state) {
+    if (state.processScheduled || !state.pending) return;
+    state.processScheduled = true;
+    nextTick(function() { processQueue(state); });
+  }
+
+  function Deferred() {
+    this.promise = new Promise();
+    //Necessary to support unbound execution :/
+    this.resolve = simpleBind(this, this.resolve);
+    this.reject = simpleBind(this, this.reject);
+    this.notify = simpleBind(this, this.notify);
+  }
+
+  extend(Deferred.prototype, {
+    resolve: function(val) {
+      if (this.promise.$$state.status) return;
+      if (val === this.promise) {
+        this.$$reject($qMinErr(
+          'qcycle',
+          "Expected promise to be resolved with value other than itself '{0}'",
+          val));
+      } else {
+        this.$$resolve(val);
+      }
+
+    },
+
+    $$resolve: function(val) {
+      var then, fns;
+
+      fns = callOnce(this, this.$$resolve, this.$$reject);
+      try {
+        if ((isObject(val) || isFunction(val))) then = val && val.then;
+        if (isFunction(then)) {
+          this.promise.$$state.status = -1;
+          then.call(val, fns[0], fns[1], this.notify);
+        } else {
+          this.promise.$$state.value = val;
+          this.promise.$$state.status = 1;
+          scheduleProcessQueue(this.promise.$$state);
+        }
+      } catch (e) {
+        fns[1](e);
+        exceptionHandler(e);
+      }
+    },
+
+    reject: function(reason) {
+      if (this.promise.$$state.status) return;
+      this.$$reject(reason);
+    },
+
+    $$reject: function(reason) {
+      this.promise.$$state.value = reason;
+      this.promise.$$state.status = 2;
+      scheduleProcessQueue(this.promise.$$state);
+    },
+
+    notify: function(progress) {
+      var callbacks = this.promise.$$state.pending;
+
+      if ((this.promise.$$state.status <= 0) && callbacks && callbacks.length) {
+        nextTick(function() {
+          var callback, result;
+          for (var i = 0, ii = callbacks.length; i < ii; i++) {
+            result = callbacks[i][0];
+            callback = callbacks[i][3];
+            try {
+              result.notify(isFunction(callback) ? callback(progress) : progress);
+            } catch (e) {
+              exceptionHandler(e);
+            }
+          }
+        });
+      }
+    }
+  });
+
+  /**
+   * @ngdoc method
+   * @name $q#reject
+   * @kind function
+   *
+   * @description
+   * Creates a promise that is resolved as rejected with the specified `reason`. This api should be
+   * used to forward rejection in a chain of promises. If you are dealing with the last promise in
+   * a promise chain, you don't need to worry about it.
+   *
+   * When comparing deferreds/promises to the familiar behavior of try/catch/throw, think of
+   * `reject` as the `throw` keyword in JavaScript. This also means that if you "catch" an error via
+   * a promise error callback and you want to forward the error to the promise derived from the
+   * current promise, you have to "rethrow" the error by returning a rejection constructed via
+   * `reject`.
+   *
+   * ```js
+   *   promiseB = promiseA.then(function(result) {
+   *     // success: do something and resolve promiseB
+   *     //          with the old or a new result
+   *     return result;
+   *   }, function(reason) {
+   *     // error: handle the error if possible and
+   *     //        resolve promiseB with newPromiseOrValue,
+   *     //        otherwise forward the rejection to promiseB
+   *     if (canHandle(reason)) {
+   *      // handle the error and recover
+   *      return newPromiseOrValue;
+   *     }
+   *     return $q.reject(reason);
+   *   });
+   * ```
+   *
+   * @param {*} reason Constant, message, exception or an object representing the rejection reason.
+   * @returns {Promise} Returns a promise that was already resolved as rejected with the `reason`.
+   */
+  var reject = function(reason) {
+    var result = new Deferred();
+    result.reject(reason);
+    return result.promise;
+  };
+
+  var makePromise = function makePromise(value, resolved) {
+    var result = new Deferred();
+    if (resolved) {
+      result.resolve(value);
+    } else {
+      result.reject(value);
+    }
+    return result.promise;
+  };
+
+  var handleCallback = function handleCallback(value, isResolved, callback) {
+    var callbackOutput = null;
+    try {
+      if (isFunction(callback)) callbackOutput = callback();
+    } catch (e) {
+      return makePromise(e, false);
+    }
+    if (isPromiseLike(callbackOutput)) {
+      return callbackOutput.then(function() {
+        return makePromise(value, isResolved);
+      }, function(error) {
+        return makePromise(error, false);
+      });
+    } else {
+      return makePromise(value, isResolved);
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name $q#when
+   * @kind function
+   *
+   * @description
+   * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise.
+   * This is useful when you are dealing with an object that might or might not be a promise, or if
+   * the promise comes from a source that can't be trusted.
+   *
+   * @param {*} value Value or a promise
+   * @param {Function=} successCallback
+   * @param {Function=} errorCallback
+   * @param {Function=} progressCallback
+   * @returns {Promise} Returns a promise of the passed value or promise
+   */
+
+
+  var when = function(value, callback, errback, progressBack) {
+    var result = new Deferred();
+    result.resolve(value);
+    return result.promise.then(callback, errback, progressBack);
+  };
+
+  /**
+   * @ngdoc method
+   * @name $q#resolve
+   * @kind function
+   *
+   * @description
+   * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6.
+   *
+   * @param {*} value Value or a promise
+   * @param {Function=} successCallback
+   * @param {Function=} errorCallback
+   * @param {Function=} progressCallback
+   * @returns {Promise} Returns a promise of the passed value or promise
+   */
+  var resolve = when;
+
+  /**
+   * @ngdoc method
+   * @name $q#all
+   * @kind function
+   *
+   * @description
+   * Combines multiple promises into a single promise that is resolved when all of the input
+   * promises are resolved.
+   *
+   * @param {Array.<Promise>|Object.<Promise>} promises An array or hash of promises.
+   * @returns {Promise} Returns a single promise that will be resolved with an array/hash of values,
+   *   each value corresponding to the promise at the same index/key in the `promises` array/hash.
+   *   If any of the promises is resolved with a rejection, this resulting promise will be rejected
+   *   with the same rejection value.
+   */
+
+  function all(promises) {
+    var deferred = new Deferred(),
+        counter = 0,
+        results = isArray(promises) ? [] : {};
+
+    forEach(promises, function(promise, key) {
+      counter++;
+      when(promise).then(function(value) {
+        if (results.hasOwnProperty(key)) return;
+        results[key] = value;
+        if (!(--counter)) deferred.resolve(results);
+      }, function(reason) {
+        if (results.hasOwnProperty(key)) return;
+        deferred.reject(reason);
+      });
+    });
+
+    if (counter === 0) {
+      deferred.resolve(results);
+    }
+
+    return deferred.promise;
+  }
+
+  var $Q = function Q(resolver) {
+    if (!isFunction(resolver)) {
+      throw $qMinErr('norslvr', "Expected resolverFn, got '{0}'", resolver);
+    }
+
+    if (!(this instanceof Q)) {
+      // More useful when $Q is the Promise itself.
+      return new Q(resolver);
+    }
+
+    var deferred = new Deferred();
+
+    function resolveFn(value) {
+      deferred.resolve(value);
+    }
+
+    function rejectFn(reason) {
+      deferred.reject(reason);
+    }
+
+    resolver(resolveFn, rejectFn);
+
+    return deferred.promise;
+  };
+
+  $Q.defer = defer;
+  $Q.reject = reject;
+  $Q.when = when;
+  $Q.resolve = resolve;
+  $Q.all = all;
+
+  return $Q;
+}
+
+function $$RAFProvider() { //rAF
+  this.$get = ['$window', '$timeout', function($window, $timeout) {
+    var requestAnimationFrame = $window.requestAnimationFrame ||
+                                $window.webkitRequestAnimationFrame;
+
+    var cancelAnimationFrame = $window.cancelAnimationFrame ||
+                               $window.webkitCancelAnimationFrame ||
+                               $window.webkitCancelRequestAnimationFrame;
+
+    var rafSupported = !!requestAnimationFrame;
+    var raf = rafSupported
+      ? function(fn) {
+          var id = requestAnimationFrame(fn);
+          return function() {
+            cancelAnimationFrame(id);
+          };
+        }
+      : function(fn) {
+          var timer = $timeout(fn, 16.66, false); // 1000 / 60 = 16.666
+          return function() {
+            $timeout.cancel(timer);
+          };
+        };
+
+    raf.supported = rafSupported;
+
+    return raf;
+  }];
+}
+
+/**
+ * DESIGN NOTES
+ *
+ * The design decisions behind the scope are heavily favored for speed and memory consumption.
+ *
+ * The typical use of scope is to watch the expressions, which most of the time return the same
+ * value as last time so we optimize the operation.
+ *
+ * Closures construction is expensive in terms of speed as well as memory:
+ *   - No closures, instead use prototypical inheritance for API
+ *   - Internal state needs to be stored on scope directly, which means that private state is
+ *     exposed as $$____ properties
+ *
+ * Loop operations are optimized by using while(count--) { ... }
+ *   - This means that in order to keep the same order of execution as addition we have to add
+ *     items to the array at the beginning (unshift) instead of at the end (push)
+ *
+ * Child scopes are created and removed often
+ *   - Using an array would be slow since inserts in the middle are expensive; so we use linked lists
+ *
+ * There are fewer watches than observers. This is why you don't want the observer to be implemented
+ * in the same way as watch. Watch requires return of the initialization function which is expensive
+ * to construct.
+ */
+
+
+/**
+ * @ngdoc provider
+ * @name $rootScopeProvider
+ * @description
+ *
+ * Provider for the $rootScope service.
+ */
+
+/**
+ * @ngdoc method
+ * @name $rootScopeProvider#digestTtl
+ * @description
+ *
+ * Sets the number of `$digest` iterations the scope should attempt to execute before giving up and
+ * assuming that the model is unstable.
+ *
+ * The current default is 10 iterations.
+ *
+ * In complex applications it's possible that the dependencies between `$watch`s will result in
+ * several digest iterations. However if an application needs more than the default 10 digest
+ * iterations for its model to stabilize then you should investigate what is causing the model to
+ * continuously change during the digest.
+ *
+ * Increasing the TTL could have performance implications, so you should not change it without
+ * proper justification.
+ *
+ * @param {number} limit The number of digest iterations.
+ */
+
+
+/**
+ * @ngdoc service
+ * @name $rootScope
+ * @description
+ *
+ * Every application has a single root {@link ng.$rootScope.Scope scope}.
+ * All other scopes are descendant scopes of the root scope. Scopes provide separation
+ * between the model and the view, via a mechanism for watching the model for changes.
+ * They also provide event emission/broadcast and subscription facility. See the
+ * {@link guide/scope developer guide on scopes}.
+ */
+function $RootScopeProvider() {
+  var TTL = 10;
+  var $rootScopeMinErr = minErr('$rootScope');
+  var lastDirtyWatch = null;
+  var applyAsyncId = null;
+
+  this.digestTtl = function(value) {
+    if (arguments.length) {
+      TTL = value;
+    }
+    return TTL;
+  };
+
+  function createChildScopeClass(parent) {
+    function ChildScope() {
+      this.$$watchers = this.$$nextSibling =
+          this.$$childHead = this.$$childTail = null;
+      this.$$listeners = {};
+      this.$$listenerCount = {};
+      this.$$watchersCount = 0;
+      this.$id = nextUid();
+      this.$$ChildScope = null;
+    }
+    ChildScope.prototype = parent;
+    return ChildScope;
+  }
+
+  this.$get = ['$injector', '$exceptionHandler', '$parse', '$browser',
+      function($injector, $exceptionHandler, $parse, $browser) {
+
+    function destroyChildScope($event) {
+        $event.currentScope.$$destroyed = true;
+    }
+
+    function cleanUpScope($scope) {
+
+      if (msie === 9) {
+        // There is a memory leak in IE9 if all child scopes are not disconnected
+        // completely when a scope is destroyed. So this code will recurse up through
+        // all this scopes children
+        //
+        // See issue https://github.com/angular/angular.js/issues/10706
+        $scope.$$childHead && cleanUpScope($scope.$$childHead);
+        $scope.$$nextSibling && cleanUpScope($scope.$$nextSibling);
+      }
+
+      // The code below works around IE9 and V8's memory leaks
+      //
+      // See:
+      // - https://code.google.com/p/v8/issues/detail?id=2073#c26
+      // - https://github.com/angular/angular.js/issues/6794#issuecomment-38648909
+      // - https://github.com/angular/angular.js/issues/1313#issuecomment-10378451
+
+      $scope.$parent = $scope.$$nextSibling = $scope.$$prevSibling = $scope.$$childHead =
+          $scope.$$childTail = $scope.$root = $scope.$$watchers = null;
+    }
+
+    /**
+     * @ngdoc type
+     * @name $rootScope.Scope
+     *
+     * @description
+     * A root scope can be retrieved using the {@link ng.$rootScope $rootScope} key from the
+     * {@link auto.$injector $injector}. Child scopes are created using the
+     * {@link ng.$rootScope.Scope#$new $new()} method. (Most scopes are created automatically when
+     * compiled HTML template is executed.) See also the {@link guide/scope Scopes guide} for
+     * an in-depth introduction and usage examples.
+     *
+     *
+     * # Inheritance
+     * A scope can inherit from a parent scope, as in this example:
+     * ```js
+         var parent = $rootScope;
+         var child = parent.$new();
+
+         parent.salutation = "Hello";
+         expect(child.salutation).toEqual('Hello');
+
+         child.salutation = "Welcome";
+         expect(child.salutation).toEqual('Welcome');
+         expect(parent.salutation).toEqual('Hello');
+     * ```
+     *
+     * When interacting with `Scope` in tests, additional helper methods are available on the
+     * instances of `Scope` type. See {@link ngMock.$rootScope.Scope ngMock Scope} for additional
+     * details.
+     *
+     *
+     * @param {Object.<string, function()>=} providers Map of service factory which need to be
+     *                                       provided for the current scope. Defaults to {@link ng}.
+     * @param {Object.<string, *>=} instanceCache Provides pre-instantiated services which should
+     *                              append/override services provided by `providers`. This is handy
+     *                              when unit-testing and having the need to override a default
+     *                              service.
+     * @returns {Object} Newly created scope.
+     *
+     */
+    function Scope() {
+      this.$id = nextUid();
+      this.$$phase = this.$parent = this.$$watchers =
+                     this.$$nextSibling = this.$$prevSibling =
+                     this.$$childHead = this.$$childTail = null;
+      this.$root = this;
+      this.$$destroyed = false;
+      this.$$listeners = {};
+      this.$$listenerCount = {};
+      this.$$watchersCount = 0;
+      this.$$isolateBindings = null;
+    }
+
+    /**
+     * @ngdoc property
+     * @name $rootScope.Scope#$id
+     *
+     * @description
+     * Unique scope ID (monotonically increasing) useful for debugging.
+     */
+
+     /**
+      * @ngdoc property
+      * @name $rootScope.Scope#$parent
+      *
+      * @description
+      * Reference to the parent scope.
+      */
+
+      /**
+       * @ngdoc property
+       * @name $rootScope.Scope#$root
+       *
+       * @description
+       * Reference to the root scope.
+       */
+
+    Scope.prototype = {
+      constructor: Scope,
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$new
+       * @kind function
+       *
+       * @description
+       * Creates a new child {@link ng.$rootScope.Scope scope}.
+       *
+       * The parent scope will propagate the {@link ng.$rootScope.Scope#$digest $digest()} event.
+       * The scope can be removed from the scope hierarchy using {@link ng.$rootScope.Scope#$destroy $destroy()}.
+       *
+       * {@link ng.$rootScope.Scope#$destroy $destroy()} must be called on a scope when it is
+       * desired for the scope and its child scopes to be permanently detached from the parent and
+       * thus stop participating in model change detection and listener notification by invoking.
+       *
+       * @param {boolean} isolate If true, then the scope does not prototypically inherit from the
+       *         parent scope. The scope is isolated, as it can not see parent scope properties.
+       *         When creating widgets, it is useful for the widget to not accidentally read parent
+       *         state.
+       *
+       * @param {Scope} [parent=this] The {@link ng.$rootScope.Scope `Scope`} that will be the `$parent`
+       *                              of the newly created scope. Defaults to `this` scope if not provided.
+       *                              This is used when creating a transclude scope to correctly place it
+       *                              in the scope hierarchy while maintaining the correct prototypical
+       *                              inheritance.
+       *
+       * @returns {Object} The newly created child scope.
+       *
+       */
+      $new: function(isolate, parent) {
+        var child;
+
+        parent = parent || this;
+
+        if (isolate) {
+          child = new Scope();
+          child.$root = this.$root;
+        } else {
+          // Only create a child scope class if somebody asks for one,
+          // but cache it to allow the VM to optimize lookups.
+          if (!this.$$ChildScope) {
+            this.$$ChildScope = createChildScopeClass(this);
+          }
+          child = new this.$$ChildScope();
+        }
+        child.$parent = parent;
+        child.$$prevSibling = parent.$$childTail;
+        if (parent.$$childHead) {
+          parent.$$childTail.$$nextSibling = child;
+          parent.$$childTail = child;
+        } else {
+          parent.$$childHead = parent.$$childTail = child;
+        }
+
+        // When the new scope is not isolated or we inherit from `this`, and
+        // the parent scope is destroyed, the property `$$destroyed` is inherited
+        // prototypically. In all other cases, this property needs to be set
+        // when the parent scope is destroyed.
+        // The listener needs to be added after the parent is set
+        if (isolate || parent != this) child.$on('$destroy', destroyChildScope);
+
+        return child;
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$watch
+       * @kind function
+       *
+       * @description
+       * Registers a `listener` callback to be executed whenever the `watchExpression` changes.
+       *
+       * - The `watchExpression` is called on every call to {@link ng.$rootScope.Scope#$digest
+       *   $digest()} and should return the value that will be watched. (`watchExpression` should not change
+       *   its value when executed multiple times with the same input because it may be executed multiple
+       *   times by {@link ng.$rootScope.Scope#$digest $digest()}. That is, `watchExpression` should be
+       *   [idempotent](http://en.wikipedia.org/wiki/Idempotence).
+       * - The `listener` is called only when the value from the current `watchExpression` and the
+       *   previous call to `watchExpression` are not equal (with the exception of the initial run,
+       *   see below). Inequality is determined according to reference inequality,
+       *   [strict comparison](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Comparison_Operators)
+       *    via the `!==` Javascript operator, unless `objectEquality == true`
+       *   (see next point)
+       * - When `objectEquality == true`, inequality of the `watchExpression` is determined
+       *   according to the {@link angular.equals} function. To save the value of the object for
+       *   later comparison, the {@link angular.copy} function is used. This therefore means that
+       *   watching complex objects will have adverse memory and performance implications.
+       * - The watch `listener` may change the model, which may trigger other `listener`s to fire.
+       *   This is achieved by rerunning the watchers until no changes are detected. The rerun
+       *   iteration limit is 10 to prevent an infinite loop deadlock.
+       *
+       *
+       * If you want to be notified whenever {@link ng.$rootScope.Scope#$digest $digest} is called,
+       * you can register a `watchExpression` function with no `listener`. (Be prepared for
+       * multiple calls to your `watchExpression` because it will execute multiple times in a
+       * single {@link ng.$rootScope.Scope#$digest $digest} cycle if a change is detected.)
+       *
+       * After a watcher is registered with the scope, the `listener` fn is called asynchronously
+       * (via {@link ng.$rootScope.Scope#$evalAsync $evalAsync}) to initialize the
+       * watcher. In rare cases, this is undesirable because the listener is called when the result
+       * of `watchExpression` didn't change. To detect this scenario within the `listener` fn, you
+       * can compare the `newVal` and `oldVal`. If these two values are identical (`===`) then the
+       * listener was called due to initialization.
+       *
+       *
+       *
+       * # Example
+       * ```js
+           // let's assume that scope was dependency injected as the $rootScope
+           var scope = $rootScope;
+           scope.name = 'misko';
+           scope.counter = 0;
+
+           expect(scope.counter).toEqual(0);
+           scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+           expect(scope.counter).toEqual(0);
+
+           scope.$digest();
+           // the listener is always called during the first $digest loop after it was registered
+           expect(scope.counter).toEqual(1);
+
+           scope.$digest();
+           // but now it will not be called unless the value changes
+           expect(scope.counter).toEqual(1);
+
+           scope.name = 'adam';
+           scope.$digest();
+           expect(scope.counter).toEqual(2);
+
+
+
+           // Using a function as a watchExpression
+           var food;
+           scope.foodCounter = 0;
+           expect(scope.foodCounter).toEqual(0);
+           scope.$watch(
+             // This function returns the value being watched. It is called for each turn of the $digest loop
+             function() { return food; },
+             // This is the change listener, called when the value returned from the above function changes
+             function(newValue, oldValue) {
+               if ( newValue !== oldValue ) {
+                 // Only increment the counter if the value changed
+                 scope.foodCounter = scope.foodCounter + 1;
+               }
+             }
+           );
+           // No digest has been run so the counter will be zero
+           expect(scope.foodCounter).toEqual(0);
+
+           // Run the digest but since food has not changed count will still be zero
+           scope.$digest();
+           expect(scope.foodCounter).toEqual(0);
+
+           // Update food and run digest.  Now the counter will increment
+           food = 'cheeseburger';
+           scope.$digest();
+           expect(scope.foodCounter).toEqual(1);
+
+       * ```
+       *
+       *
+       *
+       * @param {(function()|string)} watchExpression Expression that is evaluated on each
+       *    {@link ng.$rootScope.Scope#$digest $digest} cycle. A change in the return value triggers
+       *    a call to the `listener`.
+       *
+       *    - `string`: Evaluated as {@link guide/expression expression}
+       *    - `function(scope)`: called with current `scope` as a parameter.
+       * @param {function(newVal, oldVal, scope)} listener Callback called whenever the value
+       *    of `watchExpression` changes.
+       *
+       *    - `newVal` contains the current value of the `watchExpression`
+       *    - `oldVal` contains the previous value of the `watchExpression`
+       *    - `scope` refers to the current scope
+       * @param {boolean=} objectEquality Compare for object equality using {@link angular.equals} instead of
+       *     comparing for reference equality.
+       * @returns {function()} Returns a deregistration function for this listener.
+       */
+      $watch: function(watchExp, listener, objectEquality, prettyPrintExpression) {
+        var get = $parse(watchExp);
+
+        if (get.$$watchDelegate) {
+          return get.$$watchDelegate(this, listener, objectEquality, get, watchExp);
+        }
+        var scope = this,
+            array = scope.$$watchers,
+            watcher = {
+              fn: listener,
+              last: initWatchVal,
+              get: get,
+              exp: prettyPrintExpression || watchExp,
+              eq: !!objectEquality
+            };
+
+        lastDirtyWatch = null;
+
+        if (!isFunction(listener)) {
+          watcher.fn = noop;
+        }
+
+        if (!array) {
+          array = scope.$$watchers = [];
+        }
+        // we use unshift since we use a while loop in $digest for speed.
+        // the while loop reads in reverse order.
+        array.unshift(watcher);
+        incrementWatchersCount(this, 1);
+
+        return function deregisterWatch() {
+          if (arrayRemove(array, watcher) >= 0) {
+            incrementWatchersCount(scope, -1);
+          }
+          lastDirtyWatch = null;
+        };
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$watchGroup
+       * @kind function
+       *
+       * @description
+       * A variant of {@link ng.$rootScope.Scope#$watch $watch()} where it watches an array of `watchExpressions`.
+       * If any one expression in the collection changes the `listener` is executed.
+       *
+       * - The items in the `watchExpressions` array are observed via standard $watch operation and are examined on every
+       *   call to $digest() to see if any items changes.
+       * - The `listener` is called whenever any expression in the `watchExpressions` array changes.
+       *
+       * @param {Array.<string|Function(scope)>} watchExpressions Array of expressions that will be individually
+       * watched using {@link ng.$rootScope.Scope#$watch $watch()}
+       *
+       * @param {function(newValues, oldValues, scope)} listener Callback called whenever the return value of any
+       *    expression in `watchExpressions` changes
+       *    The `newValues` array contains the current values of the `watchExpressions`, with the indexes matching
+       *    those of `watchExpression`
+       *    and the `oldValues` array contains the previous values of the `watchExpressions`, with the indexes matching
+       *    those of `watchExpression`
+       *    The `scope` refers to the current scope.
+       * @returns {function()} Returns a de-registration function for all listeners.
+       */
+      $watchGroup: function(watchExpressions, listener) {
+        var oldValues = new Array(watchExpressions.length);
+        var newValues = new Array(watchExpressions.length);
+        var deregisterFns = [];
+        var self = this;
+        var changeReactionScheduled = false;
+        var firstRun = true;
+
+        if (!watchExpressions.length) {
+          // No expressions means we call the listener ASAP
+          var shouldCall = true;
+          self.$evalAsync(function() {
+            if (shouldCall) listener(newValues, newValues, self);
+          });
+          return function deregisterWatchGroup() {
+            shouldCall = false;
+          };
+        }
+
+        if (watchExpressions.length === 1) {
+          // Special case size of one
+          return this.$watch(watchExpressions[0], function watchGroupAction(value, oldValue, scope) {
+            newValues[0] = value;
+            oldValues[0] = oldValue;
+            listener(newValues, (value === oldValue) ? newValues : oldValues, scope);
+          });
+        }
+
+        forEach(watchExpressions, function(expr, i) {
+          var unwatchFn = self.$watch(expr, function watchGroupSubAction(value, oldValue) {
+            newValues[i] = value;
+            oldValues[i] = oldValue;
+            if (!changeReactionScheduled) {
+              changeReactionScheduled = true;
+              self.$evalAsync(watchGroupAction);
+            }
+          });
+          deregisterFns.push(unwatchFn);
+        });
+
+        function watchGroupAction() {
+          changeReactionScheduled = false;
+
+          if (firstRun) {
+            firstRun = false;
+            listener(newValues, newValues, self);
+          } else {
+            listener(newValues, oldValues, self);
+          }
+        }
+
+        return function deregisterWatchGroup() {
+          while (deregisterFns.length) {
+            deregisterFns.shift()();
+          }
+        };
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$watchCollection
+       * @kind function
+       *
+       * @description
+       * Shallow watches the properties of an object and fires whenever any of the properties change
+       * (for arrays, this implies watching the array items; for object maps, this implies watching
+       * the properties). If a change is detected, the `listener` callback is fired.
+       *
+       * - The `obj` collection is observed via standard $watch operation and is examined on every
+       *   call to $digest() to see if any items have been added, removed, or moved.
+       * - The `listener` is called whenever anything within the `obj` has changed. Examples include
+       *   adding, removing, and moving items belonging to an object or array.
+       *
+       *
+       * # Example
+       * ```js
+          $scope.names = ['igor', 'matias', 'misko', 'james'];
+          $scope.dataCount = 4;
+
+          $scope.$watchCollection('names', function(newNames, oldNames) {
+            $scope.dataCount = newNames.length;
+          });
+
+          expect($scope.dataCount).toEqual(4);
+          $scope.$digest();
+
+          //still at 4 ... no changes
+          expect($scope.dataCount).toEqual(4);
+
+          $scope.names.pop();
+          $scope.$digest();
+
+          //now there's been a change
+          expect($scope.dataCount).toEqual(3);
+       * ```
+       *
+       *
+       * @param {string|function(scope)} obj Evaluated as {@link guide/expression expression}. The
+       *    expression value should evaluate to an object or an array which is observed on each
+       *    {@link ng.$rootScope.Scope#$digest $digest} cycle. Any shallow change within the
+       *    collection will trigger a call to the `listener`.
+       *
+       * @param {function(newCollection, oldCollection, scope)} listener a callback function called
+       *    when a change is detected.
+       *    - The `newCollection` object is the newly modified data obtained from the `obj` expression
+       *    - The `oldCollection` object is a copy of the former collection data.
+       *      Due to performance considerations, the`oldCollection` value is computed only if the
+       *      `listener` function declares two or more arguments.
+       *    - The `scope` argument refers to the current scope.
+       *
+       * @returns {function()} Returns a de-registration function for this listener. When the
+       *    de-registration function is executed, the internal watch operation is terminated.
+       */
+      $watchCollection: function(obj, listener) {
+        $watchCollectionInterceptor.$stateful = true;
+
+        var self = this;
+        // the current value, updated on each dirty-check run
+        var newValue;
+        // a shallow copy of the newValue from the last dirty-check run,
+        // updated to match newValue during dirty-check run
+        var oldValue;
+        // a shallow copy of the newValue from when the last change happened
+        var veryOldValue;
+        // only track veryOldValue if the listener is asking for it
+        var trackVeryOldValue = (listener.length > 1);
+        var changeDetected = 0;
+        var changeDetector = $parse(obj, $watchCollectionInterceptor);
+        var internalArray = [];
+        var internalObject = {};
+        var initRun = true;
+        var oldLength = 0;
+
+        function $watchCollectionInterceptor(_value) {
+          newValue = _value;
+          var newLength, key, bothNaN, newItem, oldItem;
+
+          // If the new value is undefined, then return undefined as the watch may be a one-time watch
+          if (isUndefined(newValue)) return;
+
+          if (!isObject(newValue)) { // if primitive
+            if (oldValue !== newValue) {
+              oldValue = newValue;
+              changeDetected++;
+            }
+          } else if (isArrayLike(newValue)) {
+            if (oldValue !== internalArray) {
+              // we are transitioning from something which was not an array into array.
+              oldValue = internalArray;
+              oldLength = oldValue.length = 0;
+              changeDetected++;
+            }
+
+            newLength = newValue.length;
+
+            if (oldLength !== newLength) {
+              // if lengths do not match we need to trigger change notification
+              changeDetected++;
+              oldValue.length = oldLength = newLength;
+            }
+            // copy the items to oldValue and look for changes.
+            for (var i = 0; i < newLength; i++) {
+              oldItem = oldValue[i];
+              newItem = newValue[i];
+
+              bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+              if (!bothNaN && (oldItem !== newItem)) {
+                changeDetected++;
+                oldValue[i] = newItem;
+              }
+            }
+          } else {
+            if (oldValue !== internalObject) {
+              // we are transitioning from something which was not an object into object.
+              oldValue = internalObject = {};
+              oldLength = 0;
+              changeDetected++;
+            }
+            // copy the items to oldValue and look for changes.
+            newLength = 0;
+            for (key in newValue) {
+              if (hasOwnProperty.call(newValue, key)) {
+                newLength++;
+                newItem = newValue[key];
+                oldItem = oldValue[key];
+
+                if (key in oldValue) {
+                  bothNaN = (oldItem !== oldItem) && (newItem !== newItem);
+                  if (!bothNaN && (oldItem !== newItem)) {
+                    changeDetected++;
+                    oldValue[key] = newItem;
+                  }
+                } else {
+                  oldLength++;
+                  oldValue[key] = newItem;
+                  changeDetected++;
+                }
+              }
+            }
+            if (oldLength > newLength) {
+              // we used to have more keys, need to find them and destroy them.
+              changeDetected++;
+              for (key in oldValue) {
+                if (!hasOwnProperty.call(newValue, key)) {
+                  oldLength--;
+                  delete oldValue[key];
+                }
+              }
+            }
+          }
+          return changeDetected;
+        }
+
+        function $watchCollectionAction() {
+          if (initRun) {
+            initRun = false;
+            listener(newValue, newValue, self);
+          } else {
+            listener(newValue, veryOldValue, self);
+          }
+
+          // make a copy for the next time a collection is changed
+          if (trackVeryOldValue) {
+            if (!isObject(newValue)) {
+              //primitive
+              veryOldValue = newValue;
+            } else if (isArrayLike(newValue)) {
+              veryOldValue = new Array(newValue.length);
+              for (var i = 0; i < newValue.length; i++) {
+                veryOldValue[i] = newValue[i];
+              }
+            } else { // if object
+              veryOldValue = {};
+              for (var key in newValue) {
+                if (hasOwnProperty.call(newValue, key)) {
+                  veryOldValue[key] = newValue[key];
+                }
+              }
+            }
+          }
+        }
+
+        return this.$watch(changeDetector, $watchCollectionAction);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$digest
+       * @kind function
+       *
+       * @description
+       * Processes all of the {@link ng.$rootScope.Scope#$watch watchers} of the current scope and
+       * its children. Because a {@link ng.$rootScope.Scope#$watch watcher}'s listener can change
+       * the model, the `$digest()` keeps calling the {@link ng.$rootScope.Scope#$watch watchers}
+       * until no more listeners are firing. This means that it is possible to get into an infinite
+       * loop. This function will throw `'Maximum iteration limit exceeded.'` if the number of
+       * iterations exceeds 10.
+       *
+       * Usually, you don't call `$digest()` directly in
+       * {@link ng.directive:ngController controllers} or in
+       * {@link ng.$compileProvider#directive directives}.
+       * Instead, you should call {@link ng.$rootScope.Scope#$apply $apply()} (typically from within
+       * a {@link ng.$compileProvider#directive directive}), which will force a `$digest()`.
+       *
+       * If you want to be notified whenever `$digest()` is called,
+       * you can register a `watchExpression` function with
+       * {@link ng.$rootScope.Scope#$watch $watch()} with no `listener`.
+       *
+       * In unit tests, you may need to call `$digest()` to simulate the scope life cycle.
+       *
+       * # Example
+       * ```js
+           var scope = ...;
+           scope.name = 'misko';
+           scope.counter = 0;
+
+           expect(scope.counter).toEqual(0);
+           scope.$watch('name', function(newValue, oldValue) {
+             scope.counter = scope.counter + 1;
+           });
+           expect(scope.counter).toEqual(0);
+
+           scope.$digest();
+           // the listener is always called during the first $digest loop after it was registered
+           expect(scope.counter).toEqual(1);
+
+           scope.$digest();
+           // but now it will not be called unless the value changes
+           expect(scope.counter).toEqual(1);
+
+           scope.name = 'adam';
+           scope.$digest();
+           expect(scope.counter).toEqual(2);
+       * ```
+       *
+       */
+      $digest: function() {
+        var watch, value, last,
+            watchers,
+            length,
+            dirty, ttl = TTL,
+            next, current, target = this,
+            watchLog = [],
+            logIdx, logMsg, asyncTask;
+
+        beginPhase('$digest');
+        // Check for changes to browser url that happened in sync before the call to $digest
+        $browser.$$checkUrlChange();
+
+        if (this === $rootScope && applyAsyncId !== null) {
+          // If this is the root scope, and $applyAsync has scheduled a deferred $apply(), then
+          // cancel the scheduled $apply and flush the queue of expressions to be evaluated.
+          $browser.defer.cancel(applyAsyncId);
+          flushApplyAsync();
+        }
+
+        lastDirtyWatch = null;
+
+        do { // "while dirty" loop
+          dirty = false;
+          current = target;
+
+          while (asyncQueue.length) {
+            try {
+              asyncTask = asyncQueue.shift();
+              asyncTask.scope.$eval(asyncTask.expression, asyncTask.locals);
+            } catch (e) {
+              $exceptionHandler(e);
+            }
+            lastDirtyWatch = null;
+          }
+
+          traverseScopesLoop:
+          do { // "traverse the scopes" loop
+            if ((watchers = current.$$watchers)) {
+              // process our watches
+              length = watchers.length;
+              while (length--) {
+                try {
+                  watch = watchers[length];
+                  // Most common watches are on primitives, in which case we can short
+                  // circuit it with === operator, only when === fails do we use .equals
+                  if (watch) {
+                    if ((value = watch.get(current)) !== (last = watch.last) &&
+                        !(watch.eq
+                            ? equals(value, last)
+                            : (typeof value === 'number' && typeof last === 'number'
+                               && isNaN(value) && isNaN(last)))) {
+                      dirty = true;
+                      lastDirtyWatch = watch;
+                      watch.last = watch.eq ? copy(value, null) : value;
+                      watch.fn(value, ((last === initWatchVal) ? value : last), current);
+                      if (ttl < 5) {
+                        logIdx = 4 - ttl;
+                        if (!watchLog[logIdx]) watchLog[logIdx] = [];
+                        watchLog[logIdx].push({
+                          msg: isFunction(watch.exp) ? 'fn: ' + (watch.exp.name || watch.exp.toString()) : watch.exp,
+                          newVal: value,
+                          oldVal: last
+                        });
+                      }
+                    } else if (watch === lastDirtyWatch) {
+                      // If the most recently dirty watcher is now clean, short circuit since the remaining watchers
+                      // have already been tested.
+                      dirty = false;
+                      break traverseScopesLoop;
+                    }
+                  }
+                } catch (e) {
+                  $exceptionHandler(e);
+                }
+              }
+            }
+
+            // Insanity Warning: scope depth-first traversal
+            // yes, this code is a bit crazy, but it works and we have tests to prove it!
+            // this piece should be kept in sync with the traversal in $broadcast
+            if (!(next = ((current.$$watchersCount && current.$$childHead) ||
+                (current !== target && current.$$nextSibling)))) {
+              while (current !== target && !(next = current.$$nextSibling)) {
+                current = current.$parent;
+              }
+            }
+          } while ((current = next));
+
+          // `break traverseScopesLoop;` takes us to here
+
+          if ((dirty || asyncQueue.length) && !(ttl--)) {
+            clearPhase();
+            throw $rootScopeMinErr('infdig',
+                '{0} $digest() iterations reached. Aborting!\n' +
+                'Watchers fired in the last 5 iterations: {1}',
+                TTL, watchLog);
+          }
+
+        } while (dirty || asyncQueue.length);
+
+        clearPhase();
+
+        while (postDigestQueue.length) {
+          try {
+            postDigestQueue.shift()();
+          } catch (e) {
+            $exceptionHandler(e);
+          }
+        }
+      },
+
+
+      /**
+       * @ngdoc event
+       * @name $rootScope.Scope#$destroy
+       * @eventType broadcast on scope being destroyed
+       *
+       * @description
+       * Broadcasted when a scope and its children are being destroyed.
+       *
+       * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+       * clean up DOM bindings before an element is removed from the DOM.
+       */
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$destroy
+       * @kind function
+       *
+       * @description
+       * Removes the current scope (and all of its children) from the parent scope. Removal implies
+       * that calls to {@link ng.$rootScope.Scope#$digest $digest()} will no longer
+       * propagate to the current scope and its children. Removal also implies that the current
+       * scope is eligible for garbage collection.
+       *
+       * The `$destroy()` is usually used by directives such as
+       * {@link ng.directive:ngRepeat ngRepeat} for managing the
+       * unrolling of the loop.
+       *
+       * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
+       * Application code can register a `$destroy` event handler that will give it a chance to
+       * perform any necessary cleanup.
+       *
+       * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
+       * clean up DOM bindings before an element is removed from the DOM.
+       */
+      $destroy: function() {
+        // We can't destroy a scope that has been already destroyed.
+        if (this.$$destroyed) return;
+        var parent = this.$parent;
+
+        this.$broadcast('$destroy');
+        this.$$destroyed = true;
+
+        if (this === $rootScope) {
+          //Remove handlers attached to window when $rootScope is removed
+          $browser.$$applicationDestroyed();
+        }
+
+        incrementWatchersCount(this, -this.$$watchersCount);
+        for (var eventName in this.$$listenerCount) {
+          decrementListenerCount(this, this.$$listenerCount[eventName], eventName);
+        }
+
+        // sever all the references to parent scopes (after this cleanup, the current scope should
+        // not be retained by any of our references and should be eligible for garbage collection)
+        if (parent && parent.$$childHead == this) parent.$$childHead = this.$$nextSibling;
+        if (parent && parent.$$childTail == this) parent.$$childTail = this.$$prevSibling;
+        if (this.$$prevSibling) this.$$prevSibling.$$nextSibling = this.$$nextSibling;
+        if (this.$$nextSibling) this.$$nextSibling.$$prevSibling = this.$$prevSibling;
+
+        // Disable listeners, watchers and apply/digest methods
+        this.$destroy = this.$digest = this.$apply = this.$evalAsync = this.$applyAsync = noop;
+        this.$on = this.$watch = this.$watchGroup = function() { return noop; };
+        this.$$listeners = {};
+
+        // Disconnect the next sibling to prevent `cleanUpScope` destroying those too
+        this.$$nextSibling = null;
+        cleanUpScope(this);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$eval
+       * @kind function
+       *
+       * @description
+       * Executes the `expression` on the current scope and returns the result. Any exceptions in
+       * the expression are propagated (uncaught). This is useful when evaluating Angular
+       * expressions.
+       *
+       * # Example
+       * ```js
+           var scope = ng.$rootScope.Scope();
+           scope.a = 1;
+           scope.b = 2;
+
+           expect(scope.$eval('a+b')).toEqual(3);
+           expect(scope.$eval(function(scope){ return scope.a + scope.b; })).toEqual(3);
+       * ```
+       *
+       * @param {(string|function())=} expression An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in  {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with the current `scope` parameter.
+       *
+       * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+       * @returns {*} The result of evaluating the expression.
+       */
+      $eval: function(expr, locals) {
+        return $parse(expr)(this, locals);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$evalAsync
+       * @kind function
+       *
+       * @description
+       * Executes the expression on the current scope at a later point in time.
+       *
+       * The `$evalAsync` makes no guarantees as to when the `expression` will be executed, only
+       * that:
+       *
+       *   - it will execute after the function that scheduled the evaluation (preferably before DOM
+       *     rendering).
+       *   - at least one {@link ng.$rootScope.Scope#$digest $digest cycle} will be performed after
+       *     `expression` execution.
+       *
+       * Any exceptions from the execution of the expression are forwarded to the
+       * {@link ng.$exceptionHandler $exceptionHandler} service.
+       *
+       * __Note:__ if this function is called outside of a `$digest` cycle, a new `$digest` cycle
+       * will be scheduled. However, it is encouraged to always call code that changes the model
+       * from within an `$apply` call. That includes code evaluated via `$evalAsync`.
+       *
+       * @param {(string|function())=} expression An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with the current `scope` parameter.
+       *
+       * @param {(object)=} locals Local variables object, useful for overriding values in scope.
+       */
+      $evalAsync: function(expr, locals) {
+        // if we are outside of an $digest loop and this is the first time we are scheduling async
+        // task also schedule async auto-flush
+        if (!$rootScope.$$phase && !asyncQueue.length) {
+          $browser.defer(function() {
+            if (asyncQueue.length) {
+              $rootScope.$digest();
+            }
+          });
+        }
+
+        asyncQueue.push({scope: this, expression: expr, locals: locals});
+      },
+
+      $$postDigest: function(fn) {
+        postDigestQueue.push(fn);
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$apply
+       * @kind function
+       *
+       * @description
+       * `$apply()` is used to execute an expression in angular from outside of the angular
+       * framework. (For example from browser DOM events, setTimeout, XHR or third party libraries).
+       * Because we are calling into the angular framework we need to perform proper scope life
+       * cycle of {@link ng.$exceptionHandler exception handling},
+       * {@link ng.$rootScope.Scope#$digest executing watches}.
+       *
+       * ## Life cycle
+       *
+       * # Pseudo-Code of `$apply()`
+       * ```js
+           function $apply(expr) {
+             try {
+               return $eval(expr);
+             } catch (e) {
+               $exceptionHandler(e);
+             } finally {
+               $root.$digest();
+             }
+           }
+       * ```
+       *
+       *
+       * Scope's `$apply()` method transitions through the following stages:
+       *
+       * 1. The {@link guide/expression expression} is executed using the
+       *    {@link ng.$rootScope.Scope#$eval $eval()} method.
+       * 2. Any exceptions from the execution of the expression are forwarded to the
+       *    {@link ng.$exceptionHandler $exceptionHandler} service.
+       * 3. The {@link ng.$rootScope.Scope#$watch watch} listeners are fired immediately after the
+       *    expression was executed using the {@link ng.$rootScope.Scope#$digest $digest()} method.
+       *
+       *
+       * @param {(string|function())=} exp An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with current `scope` parameter.
+       *
+       * @returns {*} The result of evaluating the expression.
+       */
+      $apply: function(expr) {
+        try {
+          beginPhase('$apply');
+          try {
+            return this.$eval(expr);
+          } finally {
+            clearPhase();
+          }
+        } catch (e) {
+          $exceptionHandler(e);
+        } finally {
+          try {
+            $rootScope.$digest();
+          } catch (e) {
+            $exceptionHandler(e);
+            throw e;
+          }
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$applyAsync
+       * @kind function
+       *
+       * @description
+       * Schedule the invocation of $apply to occur at a later time. The actual time difference
+       * varies across browsers, but is typically around ~10 milliseconds.
+       *
+       * This can be used to queue up multiple expressions which need to be evaluated in the same
+       * digest.
+       *
+       * @param {(string|function())=} exp An angular expression to be executed.
+       *
+       *    - `string`: execute using the rules as defined in {@link guide/expression expression}.
+       *    - `function(scope)`: execute the function with current `scope` parameter.
+       */
+      $applyAsync: function(expr) {
+        var scope = this;
+        expr && applyAsyncQueue.push($applyAsyncExpression);
+        scheduleApplyAsync();
+
+        function $applyAsyncExpression() {
+          scope.$eval(expr);
+        }
+      },
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$on
+       * @kind function
+       *
+       * @description
+       * Listens on events of a given type. See {@link ng.$rootScope.Scope#$emit $emit} for
+       * discussion of event life cycle.
+       *
+       * The event listener function format is: `function(event, args...)`. The `event` object
+       * passed into the listener has the following attributes:
+       *
+       *   - `targetScope` - `{Scope}`: the scope on which the event was `$emit`-ed or
+       *     `$broadcast`-ed.
+       *   - `currentScope` - `{Scope}`: the scope that is currently handling the event. Once the
+       *     event propagates through the scope hierarchy, this property is set to null.
+       *   - `name` - `{string}`: name of the event.
+       *   - `stopPropagation` - `{function=}`: calling `stopPropagation` function will cancel
+       *     further event propagation (available only for events that were `$emit`-ed).
+       *   - `preventDefault` - `{function}`: calling `preventDefault` sets `defaultPrevented` flag
+       *     to true.
+       *   - `defaultPrevented` - `{boolean}`: true if `preventDefault` was called.
+       *
+       * @param {string} name Event name to listen on.
+       * @param {function(event, ...args)} listener Function to call when the event is emitted.
+       * @returns {function()} Returns a deregistration function for this listener.
+       */
+      $on: function(name, listener) {
+        var namedListeners = this.$$listeners[name];
+        if (!namedListeners) {
+          this.$$listeners[name] = namedListeners = [];
+        }
+        namedListeners.push(listener);
+
+        var current = this;
+        do {
+          if (!current.$$listenerCount[name]) {
+            current.$$listenerCount[name] = 0;
+          }
+          current.$$listenerCount[name]++;
+        } while ((current = current.$parent));
+
+        var self = this;
+        return function() {
+          var indexOfListener = namedListeners.indexOf(listener);
+          if (indexOfListener !== -1) {
+            namedListeners[indexOfListener] = null;
+            decrementListenerCount(self, 1, name);
+          }
+        };
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$emit
+       * @kind function
+       *
+       * @description
+       * Dispatches an event `name` upwards through the scope hierarchy notifying the
+       * registered {@link ng.$rootScope.Scope#$on} listeners.
+       *
+       * The event life cycle starts at the scope on which `$emit` was called. All
+       * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+       * notified. Afterwards, the event traverses upwards toward the root scope and calls all
+       * registered listeners along the way. The event will stop propagating if one of the listeners
+       * cancels it.
+       *
+       * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+       * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+       *
+       * @param {string} name Event name to emit.
+       * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+       * @return {Object} Event object (see {@link ng.$rootScope.Scope#$on}).
+       */
+      $emit: function(name, args) {
+        var empty = [],
+            namedListeners,
+            scope = this,
+            stopPropagation = false,
+            event = {
+              name: name,
+              targetScope: scope,
+              stopPropagation: function() {stopPropagation = true;},
+              preventDefault: function() {
+                event.defaultPrevented = true;
+              },
+              defaultPrevented: false
+            },
+            listenerArgs = concat([event], arguments, 1),
+            i, length;
+
+        do {
+          namedListeners = scope.$$listeners[name] || empty;
+          event.currentScope = scope;
+          for (i = 0, length = namedListeners.length; i < length; i++) {
+
+            // if listeners were deregistered, defragment the array
+            if (!namedListeners[i]) {
+              namedListeners.splice(i, 1);
+              i--;
+              length--;
+              continue;
+            }
+            try {
+              //allow all listeners attached to the current scope to run
+              namedListeners[i].apply(null, listenerArgs);
+            } catch (e) {
+              $exceptionHandler(e);
+            }
+          }
+          //if any listener on the current scope stops propagation, prevent bubbling
+          if (stopPropagation) {
+            event.currentScope = null;
+            return event;
+          }
+          //traverse upwards
+          scope = scope.$parent;
+        } while (scope);
+
+        event.currentScope = null;
+
+        return event;
+      },
+
+
+      /**
+       * @ngdoc method
+       * @name $rootScope.Scope#$broadcast
+       * @kind function
+       *
+       * @description
+       * Dispatches an event `name` downwards to all child scopes (and their children) notifying the
+       * registered {@link ng.$rootScope.Scope#$on} listeners.
+       *
+       * The event life cycle starts at the scope on which `$broadcast` was called. All
+       * {@link ng.$rootScope.Scope#$on listeners} listening for `name` event on this scope get
+       * notified. Afterwards, the event propagates to all direct and indirect scopes of the current
+       * scope and calls all registered listeners along the way. The event cannot be canceled.
+       *
+       * Any exception emitted from the {@link ng.$rootScope.Scope#$on listeners} will be passed
+       * onto the {@link ng.$exceptionHandler $exceptionHandler} service.
+       *
+       * @param {string} name Event name to broadcast.
+       * @param {...*} args Optional one or more arguments which will be passed onto the event listeners.
+       * @return {Object} Event object, see {@link ng.$rootScope.Scope#$on}
+       */
+      $broadcast: function(name, args) {
+        var target = this,
+            current = target,
+            next = target,
+            event = {
+              name: name,
+              targetScope: target,
+              preventDefault: function() {
+                event.defaultPrevented = true;
+              },
+              defaultPrevented: false
+            };
+
+        if (!target.$$listenerCount[name]) return event;
+
+        var listenerArgs = concat([event], arguments, 1),
+            listeners, i, length;
+
+        //down while you can, then up and next sibling or up and next sibling until back at root
+        while ((current = next)) {
+          event.currentScope = current;
+          listeners = current.$$listeners[name] || [];
+          for (i = 0, length = listeners.length; i < length; i++) {
+            // if listeners were deregistered, defragment the array
+            if (!listeners[i]) {
+              listeners.splice(i, 1);
+              i--;
+              length--;
+              continue;
+            }
+
+            try {
+              listeners[i].apply(null, listenerArgs);
+            } catch (e) {
+              $exceptionHandler(e);
+            }
+          }
+
+          // Insanity Warning: scope depth-first traversal
+          // yes, this code is a bit crazy, but it works and we have tests to prove it!
+          // this piece should be kept in sync with the traversal in $digest
+          // (though it differs due to having the extra check for $$listenerCount)
+          if (!(next = ((current.$$listenerCount[name] && current.$$childHead) ||
+              (current !== target && current.$$nextSibling)))) {
+            while (current !== target && !(next = current.$$nextSibling)) {
+              current = current.$parent;
+            }
+          }
+        }
+
+        event.currentScope = null;
+        return event;
+      }
+    };
+
+    var $rootScope = new Scope();
+
+    //The internal queues. Expose them on the $rootScope for debugging/testing purposes.
+    var asyncQueue = $rootScope.$$asyncQueue = [];
+    var postDigestQueue = $rootScope.$$postDigestQueue = [];
+    var applyAsyncQueue = $rootScope.$$applyAsyncQueue = [];
+
+    return $rootScope;
+
+
+    function beginPhase(phase) {
+      if ($rootScope.$$phase) {
+        throw $rootScopeMinErr('inprog', '{0} already in progress', $rootScope.$$phase);
+      }
+
+      $rootScope.$$phase = phase;
+    }
+
+    function clearPhase() {
+      $rootScope.$$phase = null;
+    }
+
+    function incrementWatchersCount(current, count) {
+      do {
+        current.$$watchersCount += count;
+      } while ((current = current.$parent));
+    }
+
+    function decrementListenerCount(current, count, name) {
+      do {
+        current.$$listenerCount[name] -= count;
+
+        if (current.$$listenerCount[name] === 0) {
+          delete current.$$listenerCount[name];
+        }
+      } while ((current = current.$parent));
+    }
+
+    /**
+     * function used as an initial value for watchers.
+     * because it's unique we can easily tell it apart from other values
+     */
+    function initWatchVal() {}
+
+    function flushApplyAsync() {
+      while (applyAsyncQueue.length) {
+        try {
+          applyAsyncQueue.shift()();
+        } catch (e) {
+          $exceptionHandler(e);
+        }
+      }
+      applyAsyncId = null;
+    }
+
+    function scheduleApplyAsync() {
+      if (applyAsyncId === null) {
+        applyAsyncId = $browser.defer(function() {
+          $rootScope.$apply(flushApplyAsync);
+        });
+      }
+    }
+  }];
+}
+
+/**
+ * @ngdoc service
+ * @name $rootElement
+ *
+ * @description
+ * The root element of Angular application. This is either the element where {@link
+ * ng.directive:ngApp ngApp} was declared or the element passed into
+ * {@link angular.bootstrap}. The element represents the root element of application. It is also the
+ * location where the application's {@link auto.$injector $injector} service gets
+ * published, and can be retrieved using `$rootElement.injector()`.
+ */
+
+
+// the implementation is in angular.bootstrap
+
+/**
+ * @description
+ * Private service to sanitize uris for links and images. Used by $compile and $sanitize.
+ */
+function $$SanitizeUriProvider() {
+  var aHrefSanitizationWhitelist = /^\s*(https?|ftp|mailto|tel|file):/,
+    imgSrcSanitizationWhitelist = /^\s*((https?|ftp|file|blob):|data:image\/)/;
+
+  /**
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during a[href] sanitization.
+   *
+   * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+   *
+   * Any url about to be assigned to a[href] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `aHrefSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.aHrefSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      aHrefSanitizationWhitelist = regexp;
+      return this;
+    }
+    return aHrefSanitizationWhitelist;
+  };
+
+
+  /**
+   * @description
+   * Retrieves or overrides the default regular expression that is used for whitelisting of safe
+   * urls during img[src] sanitization.
+   *
+   * The sanitization is a security measure aimed at prevent XSS attacks via html links.
+   *
+   * Any url about to be assigned to img[src] via data-binding is first normalized and turned into
+   * an absolute url. Afterwards, the url is matched against the `imgSrcSanitizationWhitelist`
+   * regular expression. If a match is found, the original url is written into the dom. Otherwise,
+   * the absolute url is prefixed with `'unsafe:'` string and only then is it written into the DOM.
+   *
+   * @param {RegExp=} regexp New regexp to whitelist urls with.
+   * @returns {RegExp|ng.$compileProvider} Current RegExp if called without value or self for
+   *    chaining otherwise.
+   */
+  this.imgSrcSanitizationWhitelist = function(regexp) {
+    if (isDefined(regexp)) {
+      imgSrcSanitizationWhitelist = regexp;
+      return this;
+    }
+    return imgSrcSanitizationWhitelist;
+  };
+
+  this.$get = function() {
+    return function sanitizeUri(uri, isImage) {
+      var regex = isImage ? imgSrcSanitizationWhitelist : aHrefSanitizationWhitelist;
+      var normalizedVal;
+      normalizedVal = urlResolve(uri).href;
+      if (normalizedVal !== '' && !normalizedVal.match(regex)) {
+        return 'unsafe:' + normalizedVal;
+      }
+      return uri;
+    };
+  };
+}
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *     Any commits to this file should be reviewed with security in mind.  *
+ *   Changes to this file can potentially create security vulnerabilities. *
+ *          An approval from 2 Core members with history of modifying      *
+ *                         this file is required.                          *
+ *                                                                         *
+ *  Does the change somehow allow for arbitrary javascript to be executed? *
+ *    Or allows for someone to change the prototype of built-in objects?   *
+ *     Or gives undesired access to variables likes document or window?    *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+var $sceMinErr = minErr('$sce');
+
+var SCE_CONTEXTS = {
+  HTML: 'html',
+  CSS: 'css',
+  URL: 'url',
+  // RESOURCE_URL is a subtype of URL used in contexts where a privileged resource is sourced from a
+  // url.  (e.g. ng-include, script src, templateUrl)
+  RESOURCE_URL: 'resourceUrl',
+  JS: 'js'
+};
+
+// Helper functions follow.
+
+function adjustMatcher(matcher) {
+  if (matcher === 'self') {
+    return matcher;
+  } else if (isString(matcher)) {
+    // Strings match exactly except for 2 wildcards - '*' and '**'.
+    // '*' matches any character except those from the set ':/.?&'.
+    // '**' matches any character (like .* in a RegExp).
+    // More than 2 *'s raises an error as it's ill defined.
+    if (matcher.indexOf('***') > -1) {
+      throw $sceMinErr('iwcard',
+          'Illegal sequence *** in string matcher.  String: {0}', matcher);
+    }
+    matcher = escapeForRegexp(matcher).
+                  replace('\\*\\*', '.*').
+                  replace('\\*', '[^:/.?&;]*');
+    return new RegExp('^' + matcher + '$');
+  } else if (isRegExp(matcher)) {
+    // The only other type of matcher allowed is a Regexp.
+    // Match entire URL / disallow partial matches.
+    // Flags are reset (i.e. no global, ignoreCase or multiline)
+    return new RegExp('^' + matcher.source + '$');
+  } else {
+    throw $sceMinErr('imatcher',
+        'Matchers may only be "self", string patterns or RegExp objects');
+  }
+}
+
+
+function adjustMatchers(matchers) {
+  var adjustedMatchers = [];
+  if (isDefined(matchers)) {
+    forEach(matchers, function(matcher) {
+      adjustedMatchers.push(adjustMatcher(matcher));
+    });
+  }
+  return adjustedMatchers;
+}
+
+
+/**
+ * @ngdoc service
+ * @name $sceDelegate
+ * @kind function
+ *
+ * @description
+ *
+ * `$sceDelegate` is a service that is used by the `$sce` service to provide {@link ng.$sce Strict
+ * Contextual Escaping (SCE)} services to AngularJS.
+ *
+ * Typically, you would configure or override the {@link ng.$sceDelegate $sceDelegate} instead of
+ * the `$sce` service to customize the way Strict Contextual Escaping works in AngularJS.  This is
+ * because, while the `$sce` provides numerous shorthand methods, etc., you really only need to
+ * override 3 core functions (`trustAs`, `getTrusted` and `valueOf`) to replace the way things
+ * work because `$sce` delegates to `$sceDelegate` for these operations.
+ *
+ * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} to configure this service.
+ *
+ * The default instance of `$sceDelegate` should work out of the box with little pain.  While you
+ * can override it completely to change the behavior of `$sce`, the common case would
+ * involve configuring the {@link ng.$sceDelegateProvider $sceDelegateProvider} instead by setting
+ * your own whitelists and blacklists for trusting URLs used for loading AngularJS resources such as
+ * templates.  Refer {@link ng.$sceDelegateProvider#resourceUrlWhitelist
+ * $sceDelegateProvider.resourceUrlWhitelist} and {@link
+ * ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+ */
+
+/**
+ * @ngdoc provider
+ * @name $sceDelegateProvider
+ * @description
+ *
+ * The `$sceDelegateProvider` provider allows developers to configure the {@link ng.$sceDelegate
+ * $sceDelegate} service.  This allows one to get/set the whitelists and blacklists used to ensure
+ * that the URLs used for sourcing Angular templates are safe.  Refer {@link
+ * ng.$sceDelegateProvider#resourceUrlWhitelist $sceDelegateProvider.resourceUrlWhitelist} and
+ * {@link ng.$sceDelegateProvider#resourceUrlBlacklist $sceDelegateProvider.resourceUrlBlacklist}
+ *
+ * For the general details about this service in Angular, read the main page for {@link ng.$sce
+ * Strict Contextual Escaping (SCE)}.
+ *
+ * **Example**:  Consider the following case. <a name="example"></a>
+ *
+ * - your app is hosted at url `http://myapp.example.com/`
+ * - but some of your templates are hosted on other domains you control such as
+ *   `http://srv01.assets.example.com/`,  `http://srv02.assets.example.com/`, etc.
+ * - and you have an open redirect at `http://myapp.example.com/clickThru?...`.
+ *
+ * Here is what a secure configuration for this scenario might look like:
+ *
+ * ```
+ *  angular.module('myApp', []).config(function($sceDelegateProvider) {
+ *    $sceDelegateProvider.resourceUrlWhitelist([
+ *      // Allow same origin resource loads.
+ *      'self',
+ *      // Allow loading from our assets domain.  Notice the difference between * and **.
+ *      'http://srv*.assets.example.com/**'
+ *    ]);
+ *
+ *    // The blacklist overrides the whitelist so the open redirect here is blocked.
+ *    $sceDelegateProvider.resourceUrlBlacklist([
+ *      'http://myapp.example.com/clickThru**'
+ *    ]);
+ *  });
+ * ```
+ */
+
+function $SceDelegateProvider() {
+  this.SCE_CONTEXTS = SCE_CONTEXTS;
+
+  // Resource URLs can also be trusted by policy.
+  var resourceUrlWhitelist = ['self'],
+      resourceUrlBlacklist = [];
+
+  /**
+   * @ngdoc method
+   * @name $sceDelegateProvider#resourceUrlWhitelist
+   * @kind function
+   *
+   * @param {Array=} whitelist When provided, replaces the resourceUrlWhitelist with the value
+   *     provided.  This must be an array or null.  A snapshot of this array is used so further
+   *     changes to the array are ignored.
+   *
+   *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+   *     allowed in this array.
+   *
+   *     Note: **an empty whitelist array will block all URLs**!
+   *
+   * @return {Array} the currently set whitelist array.
+   *
+   * The **default value** when no whitelist has been explicitly set is `['self']` allowing only
+   * same origin resource requests.
+   *
+   * @description
+   * Sets/Gets the whitelist of trusted resource URLs.
+   */
+  this.resourceUrlWhitelist = function(value) {
+    if (arguments.length) {
+      resourceUrlWhitelist = adjustMatchers(value);
+    }
+    return resourceUrlWhitelist;
+  };
+
+  /**
+   * @ngdoc method
+   * @name $sceDelegateProvider#resourceUrlBlacklist
+   * @kind function
+   *
+   * @param {Array=} blacklist When provided, replaces the resourceUrlBlacklist with the value
+   *     provided.  This must be an array or null.  A snapshot of this array is used so further
+   *     changes to the array are ignored.
+   *
+   *     Follow {@link ng.$sce#resourceUrlPatternItem this link} for a description of the items
+   *     allowed in this array.
+   *
+   *     The typical usage for the blacklist is to **block
+   *     [open redirects](http://cwe.mitre.org/data/definitions/601.html)** served by your domain as
+   *     these would otherwise be trusted but actually return content from the redirected domain.
+   *
+   *     Finally, **the blacklist overrides the whitelist** and has the final say.
+   *
+   * @return {Array} the currently set blacklist array.
+   *
+   * The **default value** when no whitelist has been explicitly set is the empty array (i.e. there
+   * is no blacklist.)
+   *
+   * @description
+   * Sets/Gets the blacklist of trusted resource URLs.
+   */
+
+  this.resourceUrlBlacklist = function(value) {
+    if (arguments.length) {
+      resourceUrlBlacklist = adjustMatchers(value);
+    }
+    return resourceUrlBlacklist;
+  };
+
+  this.$get = ['$injector', function($injector) {
+
+    var htmlSanitizer = function htmlSanitizer(html) {
+      throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+    };
+
+    if ($injector.has('$sanitize')) {
+      htmlSanitizer = $injector.get('$sanitize');
+    }
+
+
+    function matchUrl(matcher, parsedUrl) {
+      if (matcher === 'self') {
+        return urlIsSameOrigin(parsedUrl);
+      } else {
+        // definitely a regex.  See adjustMatchers()
+        return !!matcher.exec(parsedUrl.href);
+      }
+    }
+
+    function isResourceUrlAllowedByPolicy(url) {
+      var parsedUrl = urlResolve(url.toString());
+      var i, n, allowed = false;
+      // Ensure that at least one item from the whitelist allows this url.
+      for (i = 0, n = resourceUrlWhitelist.length; i < n; i++) {
+        if (matchUrl(resourceUrlWhitelist[i], parsedUrl)) {
+          allowed = true;
+          break;
+        }
+      }
+      if (allowed) {
+        // Ensure that no item from the blacklist blocked this url.
+        for (i = 0, n = resourceUrlBlacklist.length; i < n; i++) {
+          if (matchUrl(resourceUrlBlacklist[i], parsedUrl)) {
+            allowed = false;
+            break;
+          }
+        }
+      }
+      return allowed;
+    }
+
+    function generateHolderType(Base) {
+      var holderType = function TrustedValueHolderType(trustedValue) {
+        this.$$unwrapTrustedValue = function() {
+          return trustedValue;
+        };
+      };
+      if (Base) {
+        holderType.prototype = new Base();
+      }
+      holderType.prototype.valueOf = function sceValueOf() {
+        return this.$$unwrapTrustedValue();
+      };
+      holderType.prototype.toString = function sceToString() {
+        return this.$$unwrapTrustedValue().toString();
+      };
+      return holderType;
+    }
+
+    var trustedValueHolderBase = generateHolderType(),
+        byType = {};
+
+    byType[SCE_CONTEXTS.HTML] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.CSS] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.URL] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.JS] = generateHolderType(trustedValueHolderBase);
+    byType[SCE_CONTEXTS.RESOURCE_URL] = generateHolderType(byType[SCE_CONTEXTS.URL]);
+
+    /**
+     * @ngdoc method
+     * @name $sceDelegate#trustAs
+     *
+     * @description
+     * Returns an object that is trusted by angular for use in specified strict
+     * contextual escaping contexts (such as ng-bind-html, ng-include, any src
+     * attribute interpolation, any dom event binding attribute interpolation
+     * such as for onclick,  etc.) that uses the provided value.
+     * See {@link ng.$sce $sce} for enabling strict contextual escaping.
+     *
+     * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
+     *   resourceUrl, html, js and css.
+     * @param {*} value The value that that should be considered trusted/safe.
+     * @returns {*} A value that can be used to stand in for the provided `value` in places
+     * where Angular expects a $sce.trustAs() return value.
+     */
+    function trustAs(type, trustedValue) {
+      var Constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+      if (!Constructor) {
+        throw $sceMinErr('icontext',
+            'Attempted to trust a value in invalid context. Context: {0}; Value: {1}',
+            type, trustedValue);
+      }
+      if (trustedValue === null || isUndefined(trustedValue) || trustedValue === '') {
+        return trustedValue;
+      }
+      // All the current contexts in SCE_CONTEXTS happen to be strings.  In order to avoid trusting
+      // mutable objects, we ensure here that the value passed in is actually a string.
+      if (typeof trustedValue !== 'string') {
+        throw $sceMinErr('itype',
+            'Attempted to trust a non-string value in a content requiring a string: Context: {0}',
+            type);
+      }
+      return new Constructor(trustedValue);
+    }
+
+    /**
+     * @ngdoc method
+     * @name $sceDelegate#valueOf
+     *
+     * @description
+     * If the passed parameter had been returned by a prior call to {@link ng.$sceDelegate#trustAs
+     * `$sceDelegate.trustAs`}, returns the value that had been passed to {@link
+     * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.
+     *
+     * If the passed parameter is not a value that had been returned by {@link
+     * ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}, returns it as-is.
+     *
+     * @param {*} value The result of a prior {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}
+     *      call or anything else.
+     * @returns {*} The `value` that was originally provided to {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} if `value` is the result of such a call.  Otherwise, returns
+     *     `value` unchanged.
+     */
+    function valueOf(maybeTrusted) {
+      if (maybeTrusted instanceof trustedValueHolderBase) {
+        return maybeTrusted.$$unwrapTrustedValue();
+      } else {
+        return maybeTrusted;
+      }
+    }
+
+    /**
+     * @ngdoc method
+     * @name $sceDelegate#getTrusted
+     *
+     * @description
+     * Takes the result of a {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`} call and
+     * returns the originally supplied value if the queried context type is a supertype of the
+     * created type.  If this condition isn't satisfied, throws an exception.
+     *
+     * @param {string} type The kind of context in which this value is to be used.
+     * @param {*} maybeTrusted The result of a prior {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} call.
+     * @returns {*} The value the was originally provided to {@link ng.$sceDelegate#trustAs
+     *     `$sceDelegate.trustAs`} if valid in this context.  Otherwise, throws an exception.
+     */
+    function getTrusted(type, maybeTrusted) {
+      if (maybeTrusted === null || isUndefined(maybeTrusted) || maybeTrusted === '') {
+        return maybeTrusted;
+      }
+      var constructor = (byType.hasOwnProperty(type) ? byType[type] : null);
+      if (constructor && maybeTrusted instanceof constructor) {
+        return maybeTrusted.$$unwrapTrustedValue();
+      }
+      // If we get here, then we may only take one of two actions.
+      // 1. sanitize the value for the requested type, or
+      // 2. throw an exception.
+      if (type === SCE_CONTEXTS.RESOURCE_URL) {
+        if (isResourceUrlAllowedByPolicy(maybeTrusted)) {
+          return maybeTrusted;
+        } else {
+          throw $sceMinErr('insecurl',
+              'Blocked loading resource from url not allowed by $sceDelegate policy.  URL: {0}',
+              maybeTrusted.toString());
+        }
+      } else if (type === SCE_CONTEXTS.HTML) {
+        return htmlSanitizer(maybeTrusted);
+      }
+      throw $sceMinErr('unsafe', 'Attempting to use an unsafe value in a safe context.');
+    }
+
+    return { trustAs: trustAs,
+             getTrusted: getTrusted,
+             valueOf: valueOf };
+  }];
+}
+
+
+/**
+ * @ngdoc provider
+ * @name $sceProvider
+ * @description
+ *
+ * The $sceProvider provider allows developers to configure the {@link ng.$sce $sce} service.
+ * -   enable/disable Strict Contextual Escaping (SCE) in a module
+ * -   override the default implementation with a custom delegate
+ *
+ * Read more about {@link ng.$sce Strict Contextual Escaping (SCE)}.
+ */
+
+/* jshint maxlen: false*/
+
+/**
+ * @ngdoc service
+ * @name $sce
+ * @kind function
+ *
+ * @description
+ *
+ * `$sce` is a service that provides Strict Contextual Escaping services to AngularJS.
+ *
+ * # Strict Contextual Escaping
+ *
+ * Strict Contextual Escaping (SCE) is a mode in which AngularJS requires bindings in certain
+ * contexts to result in a value that is marked as safe to use for that context.  One example of
+ * such a context is binding arbitrary html controlled by the user via `ng-bind-html`.  We refer
+ * to these contexts as privileged or SCE contexts.
+ *
+ * As of version 1.2, Angular ships with SCE enabled by default.
+ *
+ * Note:  When enabled (the default), IE<11 in quirks mode is not supported.  In this mode, IE<11 allow
+ * one to execute arbitrary javascript by the use of the expression() syntax.  Refer
+ * <http://blogs.msdn.com/b/ie/archive/2008/10/16/ending-expressions.aspx> to learn more about them.
+ * You can ensure your document is in standards mode and not quirks mode by adding `<!doctype html>`
+ * to the top of your HTML document.
+ *
+ * SCE assists in writing code in way that (a) is secure by default and (b) makes auditing for
+ * security vulnerabilities such as XSS, clickjacking, etc. a lot easier.
+ *
+ * Here's an example of a binding in a privileged context:
+ *
+ * ```
+ * <input ng-model="userHtml" aria-label="User input">
+ * <div ng-bind-html="userHtml"></div>
+ * ```
+ *
+ * Notice that `ng-bind-html` is bound to `userHtml` controlled by the user.  With SCE
+ * disabled, this application allows the user to render arbitrary HTML into the DIV.
+ * In a more realistic example, one may be rendering user comments, blog articles, etc. via
+ * bindings.  (HTML is just one example of a context where rendering user controlled input creates
+ * security vulnerabilities.)
+ *
+ * For the case of HTML, you might use a library, either on the client side, or on the server side,
+ * to sanitize unsafe HTML before binding to the value and rendering it in the document.
+ *
+ * How would you ensure that every place that used these types of bindings was bound to a value that
+ * was sanitized by your library (or returned as safe for rendering by your server?)  How can you
+ * ensure that you didn't accidentally delete the line that sanitized the value, or renamed some
+ * properties/fields and forgot to update the binding to the sanitized value?
+ *
+ * To be secure by default, you want to ensure that any such bindings are disallowed unless you can
+ * determine that something explicitly says it's safe to use a value for binding in that
+ * context.  You can then audit your code (a simple grep would do) to ensure that this is only done
+ * for those values that you can easily tell are safe - because they were received from your server,
+ * sanitized by your library, etc.  You can organize your codebase to help with this - perhaps
+ * allowing only the files in a specific directory to do this.  Ensuring that the internal API
+ * exposed by that code doesn't markup arbitrary values as safe then becomes a more manageable task.
+ *
+ * In the case of AngularJS' SCE service, one uses {@link ng.$sce#trustAs $sce.trustAs}
+ * (and shorthand methods such as {@link ng.$sce#trustAsHtml $sce.trustAsHtml}, etc.) to
+ * obtain values that will be accepted by SCE / privileged contexts.
+ *
+ *
+ * ## How does it work?
+ *
+ * In privileged contexts, directives and code will bind to the result of {@link ng.$sce#getTrusted
+ * $sce.getTrusted(context, value)} rather than to the value directly.  Directives use {@link
+ * ng.$sce#parseAs $sce.parseAs} rather than `$parse` to watch attribute bindings, which performs the
+ * {@link ng.$sce#getTrusted $sce.getTrusted} behind the scenes on non-constant literals.
+ *
+ * As an example, {@link ng.directive:ngBindHtml ngBindHtml} uses {@link
+ * ng.$sce#parseAsHtml $sce.parseAsHtml(binding expression)}.  Here's the actual code (slightly
+ * simplified):
+ *
+ * ```
+ * var ngBindHtmlDirective = ['$sce', function($sce) {
+ *   return function(scope, element, attr) {
+ *     scope.$watch($sce.parseAsHtml(attr.ngBindHtml), function(value) {
+ *       element.html(value || '');
+ *     });
+ *   };
+ * }];
+ * ```
+ *
+ * ## Impact on loading templates
+ *
+ * This applies both to the {@link ng.directive:ngInclude `ng-include`} directive as well as
+ * `templateUrl`'s specified by {@link guide/directive directives}.
+ *
+ * By default, Angular only loads templates from the same domain and protocol as the application
+ * document.  This is done by calling {@link ng.$sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on the template URL.  To load templates from other domains and/or
+ * protocols, you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist
+ * them} or {@link ng.$sce#trustAsResourceUrl wrap it} into a trusted value.
+ *
+ * *Please note*:
+ * The browser's
+ * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+ * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+ * policy apply in addition to this and may further restrict whether the template is successfully
+ * loaded.  This means that without the right CORS policy, loading templates from a different domain
+ * won't work on all browsers.  Also, loading templates from `file://` URL does not work on some
+ * browsers.
+ *
+ * ## This feels like too much overhead
+ *
+ * It's important to remember that SCE only applies to interpolation expressions.
+ *
+ * If your expressions are constant literals, they're automatically trusted and you don't need to
+ * call `$sce.trustAs` on them (remember to include the `ngSanitize` module) (e.g.
+ * `<div ng-bind-html="'<b>implicitly trusted</b>'"></div>`) just works.
+ *
+ * Additionally, `a[href]` and `img[src]` automatically sanitize their URLs and do not pass them
+ * through {@link ng.$sce#getTrusted $sce.getTrusted}.  SCE doesn't play a role here.
+ *
+ * The included {@link ng.$sceDelegate $sceDelegate} comes with sane defaults to allow you to load
+ * templates in `ng-include` from your application's domain without having to even know about SCE.
+ * It blocks loading templates from other domains or loading templates over http from an https
+ * served document.  You can change these by setting your own custom {@link
+ * ng.$sceDelegateProvider#resourceUrlWhitelist whitelists} and {@link
+ * ng.$sceDelegateProvider#resourceUrlBlacklist blacklists} for matching such URLs.
+ *
+ * This significantly reduces the overhead.  It is far easier to pay the small overhead and have an
+ * application that's secure and can be audited to verify that with much more ease than bolting
+ * security onto an application later.
+ *
+ * <a name="contexts"></a>
+ * ## What trusted context types are supported?
+ *
+ * | Context             | Notes          |
+ * |---------------------|----------------|
+ * | `$sce.HTML`         | For HTML that's safe to source into the application.  The {@link ng.directive:ngBindHtml ngBindHtml} directive uses this context for bindings. If an unsafe value is encountered and the {@link ngSanitize $sanitize} module is present this will sanitize the value instead of throwing an error. |
+ * | `$sce.CSS`          | For CSS that's safe to source into the application.  Currently unused.  Feel free to use it in your own directives. |
+ * | `$sce.URL`          | For URLs that are safe to follow as links.  Currently unused (`<a href=` and `<img src=` sanitize their urls and don't constitute an SCE context. |
+ * | `$sce.RESOURCE_URL` | For URLs that are not only safe to follow as links, but whose contents are also safe to include in your application.  Examples include `ng-include`, `src` / `ngSrc` bindings for tags other than `IMG` (e.g. `IFRAME`, `OBJECT`, etc.)  <br><br>Note that `$sce.RESOURCE_URL` makes a stronger statement about the URL than `$sce.URL` does and therefore contexts requiring values trusted for `$sce.RESOURCE_URL` can be used anywhere that values trusted for `$sce.URL` are required. |
+ * | `$sce.JS`           | For JavaScript that is safe to execute in your application's context.  Currently unused.  Feel free to use it in your own directives. |
+ *
+ * ## Format of items in {@link ng.$sceDelegateProvider#resourceUrlWhitelist resourceUrlWhitelist}/{@link ng.$sceDelegateProvider#resourceUrlBlacklist Blacklist} <a name="resourceUrlPatternItem"></a>
+ *
+ *  Each element in these arrays must be one of the following:
+ *
+ *  - **'self'**
+ *    - The special **string**, `'self'`, can be used to match against all URLs of the **same
+ *      domain** as the application document using the **same protocol**.
+ *  - **String** (except the special value `'self'`)
+ *    - The string is matched against the full *normalized / absolute URL* of the resource
+ *      being tested (substring matches are not good enough.)
+ *    - There are exactly **two wildcard sequences** - `*` and `**`.  All other characters
+ *      match themselves.
+ *    - `*`: matches zero or more occurrences of any character other than one of the following 6
+ *      characters: '`:`', '`/`', '`.`', '`?`', '`&`' and '`;`'.  It's a useful wildcard for use
+ *      in a whitelist.
+ *    - `**`: matches zero or more occurrences of *any* character.  As such, it's not
+ *      appropriate for use in a scheme, domain, etc. as it would match too much.  (e.g.
+ *      http://**.example.com/ would match http://evil.com/?ignore=.example.com/ and that might
+ *      not have been the intention.)  Its usage at the very end of the path is ok.  (e.g.
+ *      http://foo.example.com/templates/**).
+ *  - **RegExp** (*see caveat below*)
+ *    - *Caveat*:  While regular expressions are powerful and offer great flexibility,  their syntax
+ *      (and all the inevitable escaping) makes them *harder to maintain*.  It's easy to
+ *      accidentally introduce a bug when one updates a complex expression (imho, all regexes should
+ *      have good test coverage).  For instance, the use of `.` in the regex is correct only in a
+ *      small number of cases.  A `.` character in the regex used when matching the scheme or a
+ *      subdomain could be matched against a `:` or literal `.` that was likely not intended.   It
+ *      is highly recommended to use the string patterns and only fall back to regular expressions
+ *      as a last resort.
+ *    - The regular expression must be an instance of RegExp (i.e. not a string.)  It is
+ *      matched against the **entire** *normalized / absolute URL* of the resource being tested
+ *      (even when the RegExp did not have the `^` and `$` codes.)  In addition, any flags
+ *      present on the RegExp (such as multiline, global, ignoreCase) are ignored.
+ *    - If you are generating your JavaScript from some other templating engine (not
+ *      recommended, e.g. in issue [#4006](https://github.com/angular/angular.js/issues/4006)),
+ *      remember to escape your regular expression (and be aware that you might need more than
+ *      one level of escaping depending on your templating engine and the way you interpolated
+ *      the value.)  Do make use of your platform's escaping mechanism as it might be good
+ *      enough before coding your own.  E.g. Ruby has
+ *      [Regexp.escape(str)](http://www.ruby-doc.org/core-2.0.0/Regexp.html#method-c-escape)
+ *      and Python has [re.escape](http://docs.python.org/library/re.html#re.escape).
+ *      Javascript lacks a similar built in function for escaping.  Take a look at Google
+ *      Closure library's [goog.string.regExpEscape(s)](
+ *      http://docs.closure-library.googlecode.com/git/closure_goog_string_string.js.source.html#line962).
+ *
+ * Refer {@link ng.$sceDelegateProvider $sceDelegateProvider} for an example.
+ *
+ * ## Show me an example using SCE.
+ *
+ * <example module="mySceApp" deps="angular-sanitize.js">
+ * <file name="index.html">
+ *   <div ng-controller="AppController as myCtrl">
+ *     <i ng-bind-html="myCtrl.explicitlyTrustedHtml" id="explicitlyTrustedHtml"></i><br><br>
+ *     <b>User comments</b><br>
+ *     By default, HTML that isn't explicitly trusted (e.g. Alice's comment) is sanitized when
+ *     $sanitize is available.  If $sanitize isn't available, this results in an error instead of an
+ *     exploit.
+ *     <div class="well">
+ *       <div ng-repeat="userComment in myCtrl.userComments">
+ *         <b>{{userComment.name}}</b>:
+ *         <span ng-bind-html="userComment.htmlComment" class="htmlComment"></span>
+ *         <br>
+ *       </div>
+ *     </div>
+ *   </div>
+ * </file>
+ *
+ * <file name="script.js">
+ *   angular.module('mySceApp', ['ngSanitize'])
+ *     .controller('AppController', ['$http', '$templateCache', '$sce',
+ *       function($http, $templateCache, $sce) {
+ *         var self = this;
+ *         $http.get("test_data.json", {cache: $templateCache}).success(function(userComments) {
+ *           self.userComments = userComments;
+ *         });
+ *         self.explicitlyTrustedHtml = $sce.trustAsHtml(
+ *             '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+ *             'sanitization.&quot;">Hover over this text.</span>');
+ *       }]);
+ * </file>
+ *
+ * <file name="test_data.json">
+ * [
+ *   { "name": "Alice",
+ *     "htmlComment":
+ *         "<span onmouseover='this.textContent=\"PWN3D!\"'>Is <i>anyone</i> reading this?</span>"
+ *   },
+ *   { "name": "Bob",
+ *     "htmlComment": "<i>Yes!</i>  Am I the only other one?"
+ *   }
+ * ]
+ * </file>
+ *
+ * <file name="protractor.js" type="protractor">
+ *   describe('SCE doc demo', function() {
+ *     it('should sanitize untrusted values', function() {
+ *       expect(element.all(by.css('.htmlComment')).first().getInnerHtml())
+ *           .toBe('<span>Is <i>anyone</i> reading this?</span>');
+ *     });
+ *
+ *     it('should NOT sanitize explicitly trusted values', function() {
+ *       expect(element(by.id('explicitlyTrustedHtml')).getInnerHtml()).toBe(
+ *           '<span onmouseover="this.textContent=&quot;Explicitly trusted HTML bypasses ' +
+ *           'sanitization.&quot;">Hover over this text.</span>');
+ *     });
+ *   });
+ * </file>
+ * </example>
+ *
+ *
+ *
+ * ## Can I disable SCE completely?
+ *
+ * Yes, you can.  However, this is strongly discouraged.  SCE gives you a lot of security benefits
+ * for little coding overhead.  It will be much harder to take an SCE disabled application and
+ * either secure it on your own or enable SCE at a later stage.  It might make sense to disable SCE
+ * for cases where you have a lot of existing code that was written before SCE was introduced and
+ * you're migrating them a module at a time.
+ *
+ * That said, here's how you can completely disable SCE:
+ *
+ * ```
+ * angular.module('myAppWithSceDisabledmyApp', []).config(function($sceProvider) {
+ *   // Completely disable SCE.  For demonstration purposes only!
+ *   // Do not use in new projects.
+ *   $sceProvider.enabled(false);
+ * });
+ * ```
+ *
+ */
+/* jshint maxlen: 100 */
+
+function $SceProvider() {
+  var enabled = true;
+
+  /**
+   * @ngdoc method
+   * @name $sceProvider#enabled
+   * @kind function
+   *
+   * @param {boolean=} value If provided, then enables/disables SCE.
+   * @return {boolean} true if SCE is enabled, false otherwise.
+   *
+   * @description
+   * Enables/disables SCE and returns the current value.
+   */
+  this.enabled = function(value) {
+    if (arguments.length) {
+      enabled = !!value;
+    }
+    return enabled;
+  };
+
+
+  /* Design notes on the default implementation for SCE.
+   *
+   * The API contract for the SCE delegate
+   * -------------------------------------
+   * The SCE delegate object must provide the following 3 methods:
+   *
+   * - trustAs(contextEnum, value)
+   *     This method is used to tell the SCE service that the provided value is OK to use in the
+   *     contexts specified by contextEnum.  It must return an object that will be accepted by
+   *     getTrusted() for a compatible contextEnum and return this value.
+   *
+   * - valueOf(value)
+   *     For values that were not produced by trustAs(), return them as is.  For values that were
+   *     produced by trustAs(), return the corresponding input value to trustAs.  Basically, if
+   *     trustAs is wrapping the given values into some type, this operation unwraps it when given
+   *     such a value.
+   *
+   * - getTrusted(contextEnum, value)
+   *     This function should return the a value that is safe to use in the context specified by
+   *     contextEnum or throw and exception otherwise.
+   *
+   * NOTE: This contract deliberately does NOT state that values returned by trustAs() must be
+   * opaque or wrapped in some holder object.  That happens to be an implementation detail.  For
+   * instance, an implementation could maintain a registry of all trusted objects by context.  In
+   * such a case, trustAs() would return the same object that was passed in.  getTrusted() would
+   * return the same object passed in if it was found in the registry under a compatible context or
+   * throw an exception otherwise.  An implementation might only wrap values some of the time based
+   * on some criteria.  getTrusted() might return a value and not throw an exception for special
+   * constants or objects even if not wrapped.  All such implementations fulfill this contract.
+   *
+   *
+   * A note on the inheritance model for SCE contexts
+   * ------------------------------------------------
+   * I've used inheritance and made RESOURCE_URL wrapped types a subtype of URL wrapped types.  This
+   * is purely an implementation details.
+   *
+   * The contract is simply this:
+   *
+   *     getTrusted($sce.RESOURCE_URL, value) succeeding implies that getTrusted($sce.URL, value)
+   *     will also succeed.
+   *
+   * Inheritance happens to capture this in a natural way.  In some future, we
+   * may not use inheritance anymore.  That is OK because no code outside of
+   * sce.js and sceSpecs.js would need to be aware of this detail.
+   */
+
+  this.$get = ['$parse', '$sceDelegate', function(
+                $parse,   $sceDelegate) {
+    // Prereq: Ensure that we're not running in IE<11 quirks mode.  In that mode, IE < 11 allow
+    // the "expression(javascript expression)" syntax which is insecure.
+    if (enabled && msie < 8) {
+      throw $sceMinErr('iequirks',
+        'Strict Contextual Escaping does not support Internet Explorer version < 11 in quirks ' +
+        'mode.  You can fix this by adding the text <!doctype html> to the top of your HTML ' +
+        'document.  See http://docs.angularjs.org/api/ng.$sce for more information.');
+    }
+
+    var sce = shallowCopy(SCE_CONTEXTS);
+
+    /**
+     * @ngdoc method
+     * @name $sce#isEnabled
+     * @kind function
+     *
+     * @return {Boolean} true if SCE is enabled, false otherwise.  If you want to set the value, you
+     * have to do it at module config time on {@link ng.$sceProvider $sceProvider}.
+     *
+     * @description
+     * Returns a boolean indicating if SCE is enabled.
+     */
+    sce.isEnabled = function() {
+      return enabled;
+    };
+    sce.trustAs = $sceDelegate.trustAs;
+    sce.getTrusted = $sceDelegate.getTrusted;
+    sce.valueOf = $sceDelegate.valueOf;
+
+    if (!enabled) {
+      sce.trustAs = sce.getTrusted = function(type, value) { return value; };
+      sce.valueOf = identity;
+    }
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAs
+     *
+     * @description
+     * Converts Angular {@link guide/expression expression} into a function.  This is like {@link
+     * ng.$parse $parse} and is identical when the expression is a literal constant.  Otherwise, it
+     * wraps the expression in a call to {@link ng.$sce#getTrusted $sce.getTrusted(*type*,
+     * *result*)}
+     *
+     * @param {string} type The kind of SCE context in which this result will be used.
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+    sce.parseAs = function sceParseAs(type, expr) {
+      var parsed = $parse(expr);
+      if (parsed.literal && parsed.constant) {
+        return parsed;
+      } else {
+        return $parse(expr, function(value) {
+          return sce.getTrusted(type, value);
+        });
+      }
+    };
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAs
+     *
+     * @description
+     * Delegates to {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs`}.  As such,
+     * returns an object that is trusted by angular for use in specified strict contextual
+     * escaping contexts (such as ng-bind-html, ng-include, any src attribute
+     * interpolation, any dom event binding attribute interpolation such as for onclick,  etc.)
+     * that uses the provided value.  See * {@link ng.$sce $sce} for enabling strict contextual
+     * escaping.
+     *
+     * @param {string} type The kind of context in which this value is safe for use.  e.g. url,
+     *   resourceUrl, html, js and css.
+     * @param {*} value The value that that should be considered trusted/safe.
+     * @returns {*} A value that can be used to stand in for the provided `value` in places
+     * where Angular expects a $sce.trustAs() return value.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsHtml
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsHtml(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.HTML, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedHtml
+     *     $sce.getTrustedHtml(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the
+     *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsUrl(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.URL, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedUrl
+     *     $sce.getTrustedUrl(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the
+     *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsResourceUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsResourceUrl(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.RESOURCE_URL, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedResourceUrl
+     *     $sce.getTrustedResourceUrl(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the return
+     *     value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#trustAsJs
+     *
+     * @description
+     * Shorthand method.  `$sce.trustAsJs(value)` →
+     *     {@link ng.$sceDelegate#trustAs `$sceDelegate.trustAs($sce.JS, value)`}
+     *
+     * @param {*} value The value to trustAs.
+     * @returns {*} An object that can be passed to {@link ng.$sce#getTrustedJs
+     *     $sce.getTrustedJs(value)} to obtain the original value.  (privileged directives
+     *     only accept expressions that are either literal constants or are the
+     *     return value of {@link ng.$sce#trustAs $sce.trustAs}.)
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrusted
+     *
+     * @description
+     * Delegates to {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted`}.  As such,
+     * takes the result of a {@link ng.$sce#trustAs `$sce.trustAs`}() call and returns the
+     * originally supplied value if the queried context type is a supertype of the created type.
+     * If this condition isn't satisfied, throws an exception.
+     *
+     * @param {string} type The kind of context in which this value is to be used.
+     * @param {*} maybeTrusted The result of a prior {@link ng.$sce#trustAs `$sce.trustAs`}
+     *                         call.
+     * @returns {*} The value the was originally provided to
+     *              {@link ng.$sce#trustAs `$sce.trustAs`} if valid in this context.
+     *              Otherwise, throws an exception.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedHtml
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedHtml(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.HTML, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.HTML, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedCss
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedCss(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.CSS, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.CSS, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedUrl(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.URL, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.URL, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedResourceUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedResourceUrl(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.RESOURCE_URL, value)`}
+     *
+     * @param {*} value The value to pass to `$sceDelegate.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.RESOURCE_URL, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#getTrustedJs
+     *
+     * @description
+     * Shorthand method.  `$sce.getTrustedJs(value)` →
+     *     {@link ng.$sceDelegate#getTrusted `$sceDelegate.getTrusted($sce.JS, value)`}
+     *
+     * @param {*} value The value to pass to `$sce.getTrusted`.
+     * @returns {*} The return value of `$sce.getTrusted($sce.JS, value)`
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsHtml
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsHtml(expression string)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.HTML, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsCss
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsCss(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.CSS, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsUrl(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.URL, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsResourceUrl
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsResourceUrl(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.RESOURCE_URL, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    /**
+     * @ngdoc method
+     * @name $sce#parseAsJs
+     *
+     * @description
+     * Shorthand method.  `$sce.parseAsJs(value)` →
+     *     {@link ng.$sce#parseAs `$sce.parseAs($sce.JS, value)`}
+     *
+     * @param {string} expression String expression to compile.
+     * @returns {function(context, locals)} a function which represents the compiled expression:
+     *
+     *    * `context` – `{object}` – an object against which any expressions embedded in the strings
+     *      are evaluated against (typically a scope object).
+     *    * `locals` – `{object=}` – local variables context object, useful for overriding values in
+     *      `context`.
+     */
+
+    // Shorthand delegations.
+    var parse = sce.parseAs,
+        getTrusted = sce.getTrusted,
+        trustAs = sce.trustAs;
+
+    forEach(SCE_CONTEXTS, function(enumValue, name) {
+      var lName = lowercase(name);
+      sce[camelCase("parse_as_" + lName)] = function(expr) {
+        return parse(enumValue, expr);
+      };
+      sce[camelCase("get_trusted_" + lName)] = function(value) {
+        return getTrusted(enumValue, value);
+      };
+      sce[camelCase("trust_as_" + lName)] = function(value) {
+        return trustAs(enumValue, value);
+      };
+    });
+
+    return sce;
+  }];
+}
+
+/**
+ * !!! This is an undocumented "private" service !!!
+ *
+ * @name $sniffer
+ * @requires $window
+ * @requires $document
+ *
+ * @property {boolean} history Does the browser support html5 history api ?
+ * @property {boolean} transitions Does the browser support CSS transition events ?
+ * @property {boolean} animations Does the browser support CSS animation events ?
+ *
+ * @description
+ * This is very simple implementation of testing browser's features.
+ */
+function $SnifferProvider() {
+  this.$get = ['$window', '$document', function($window, $document) {
+    var eventSupport = {},
+        android =
+          toInt((/android (\d+)/.exec(lowercase(($window.navigator || {}).userAgent)) || [])[1]),
+        boxee = /Boxee/i.test(($window.navigator || {}).userAgent),
+        document = $document[0] || {},
+        vendorPrefix,
+        vendorRegex = /^(Moz|webkit|ms)(?=[A-Z])/,
+        bodyStyle = document.body && document.body.style,
+        transitions = false,
+        animations = false,
+        match;
+
+    if (bodyStyle) {
+      for (var prop in bodyStyle) {
+        if (match = vendorRegex.exec(prop)) {
+          vendorPrefix = match[0];
+          vendorPrefix = vendorPrefix.substr(0, 1).toUpperCase() + vendorPrefix.substr(1);
+          break;
+        }
+      }
+
+      if (!vendorPrefix) {
+        vendorPrefix = ('WebkitOpacity' in bodyStyle) && 'webkit';
+      }
+
+      transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle));
+      animations  = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle));
+
+      if (android && (!transitions ||  !animations)) {
+        transitions = isString(bodyStyle.webkitTransition);
+        animations = isString(bodyStyle.webkitAnimation);
+      }
+    }
+
+
+    return {
+      // Android has history.pushState, but it does not update location correctly
+      // so let's not use the history API at all.
+      // http://code.google.com/p/android/issues/detail?id=17471
+      // https://github.com/angular/angular.js/issues/904
+
+      // older webkit browser (533.9) on Boxee box has exactly the same problem as Android has
+      // so let's not use the history API also
+      // We are purposefully using `!(android < 4)` to cover the case when `android` is undefined
+      // jshint -W018
+      history: !!($window.history && $window.history.pushState && !(android < 4) && !boxee),
+      // jshint +W018
+      hasEvent: function(event) {
+        // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
+        // it. In particular the event is not fired when backspace or delete key are pressed or
+        // when cut operation is performed.
+        // IE10+ implements 'input' event but it erroneously fires under various situations,
+        // e.g. when placeholder changes, or a form is focused.
+        if (event === 'input' && msie <= 11) return false;
+
+        if (isUndefined(eventSupport[event])) {
+          var divElm = document.createElement('div');
+          eventSupport[event] = 'on' + event in divElm;
+        }
+
+        return eventSupport[event];
+      },
+      csp: csp(),
+      vendorPrefix: vendorPrefix,
+      transitions: transitions,
+      animations: animations,
+      android: android
+    };
+  }];
+}
+
+var $compileMinErr = minErr('$compile');
+
+/**
+ * @ngdoc service
+ * @name $templateRequest
+ *
+ * @description
+ * The `$templateRequest` service runs security checks then downloads the provided template using
+ * `$http` and, upon success, stores the contents inside of `$templateCache`. If the HTTP request
+ * fails or the response data of the HTTP request is empty, a `$compile` error will be thrown (the
+ * exception can be thwarted by setting the 2nd parameter of the function to true). Note that the
+ * contents of `$templateCache` are trusted, so the call to `$sce.getTrustedUrl(tpl)` is omitted
+ * when `tpl` is of type string and `$templateCache` has the matching entry.
+ *
+ * @param {string|TrustedResourceUrl} tpl The HTTP request template URL
+ * @param {boolean=} ignoreRequestError Whether or not to ignore the exception when the request fails or the template is empty
+ *
+ * @return {Promise} a promise for the HTTP response data of the given URL.
+ *
+ * @property {number} totalPendingRequests total amount of pending template requests being downloaded.
+ */
+function $TemplateRequestProvider() {
+  this.$get = ['$templateCache', '$http', '$q', '$sce', function($templateCache, $http, $q, $sce) {
+    function handleRequestFn(tpl, ignoreRequestError) {
+      handleRequestFn.totalPendingRequests++;
+
+      // We consider the template cache holds only trusted templates, so
+      // there's no need to go through whitelisting again for keys that already
+      // are included in there. This also makes Angular accept any script
+      // directive, no matter its name. However, we still need to unwrap trusted
+      // types.
+      if (!isString(tpl) || !$templateCache.get(tpl)) {
+        tpl = $sce.getTrustedResourceUrl(tpl);
+      }
+
+      var transformResponse = $http.defaults && $http.defaults.transformResponse;
+
+      if (isArray(transformResponse)) {
+        transformResponse = transformResponse.filter(function(transformer) {
+          return transformer !== defaultHttpResponseTransform;
+        });
+      } else if (transformResponse === defaultHttpResponseTransform) {
+        transformResponse = null;
+      }
+
+      var httpOptions = {
+        cache: $templateCache,
+        transformResponse: transformResponse
+      };
+
+      return $http.get(tpl, httpOptions)
+        ['finally'](function() {
+          handleRequestFn.totalPendingRequests--;
+        })
+        .then(function(response) {
+          $templateCache.put(tpl, response.data);
+          return response.data;
+        }, handleError);
+
+      function handleError(resp) {
+        if (!ignoreRequestError) {
+          throw $compileMinErr('tpload', 'Failed to load template: {0} (HTTP status: {1} {2})',
+            tpl, resp.status, resp.statusText);
+        }
+        return $q.reject(resp);
+      }
+    }
+
+    handleRequestFn.totalPendingRequests = 0;
+
+    return handleRequestFn;
+  }];
+}
+
+function $$TestabilityProvider() {
+  this.$get = ['$rootScope', '$browser', '$location',
+       function($rootScope,   $browser,   $location) {
+
+    /**
+     * @name $testability
+     *
+     * @description
+     * The private $$testability service provides a collection of methods for use when debugging
+     * or by automated test and debugging tools.
+     */
+    var testability = {};
+
+    /**
+     * @name $$testability#findBindings
+     *
+     * @description
+     * Returns an array of elements that are bound (via ng-bind or {{}})
+     * to expressions matching the input.
+     *
+     * @param {Element} element The element root to search from.
+     * @param {string} expression The binding expression to match.
+     * @param {boolean} opt_exactMatch If true, only returns exact matches
+     *     for the expression. Filters and whitespace are ignored.
+     */
+    testability.findBindings = function(element, expression, opt_exactMatch) {
+      var bindings = element.getElementsByClassName('ng-binding');
+      var matches = [];
+      forEach(bindings, function(binding) {
+        var dataBinding = angular.element(binding).data('$binding');
+        if (dataBinding) {
+          forEach(dataBinding, function(bindingName) {
+            if (opt_exactMatch) {
+              var matcher = new RegExp('(^|\\s)' + escapeForRegexp(expression) + '(\\s|\\||$)');
+              if (matcher.test(bindingName)) {
+                matches.push(binding);
+              }
+            } else {
+              if (bindingName.indexOf(expression) != -1) {
+                matches.push(binding);
+              }
+            }
+          });
+        }
+      });
+      return matches;
+    };
+
+    /**
+     * @name $$testability#findModels
+     *
+     * @description
+     * Returns an array of elements that are two-way found via ng-model to
+     * expressions matching the input.
+     *
+     * @param {Element} element The element root to search from.
+     * @param {string} expression The model expression to match.
+     * @param {boolean} opt_exactMatch If true, only returns exact matches
+     *     for the expression.
+     */
+    testability.findModels = function(element, expression, opt_exactMatch) {
+      var prefixes = ['ng-', 'data-ng-', 'ng\\:'];
+      for (var p = 0; p < prefixes.length; ++p) {
+        var attributeEquals = opt_exactMatch ? '=' : '*=';
+        var selector = '[' + prefixes[p] + 'model' + attributeEquals + '"' + expression + '"]';
+        var elements = element.querySelectorAll(selector);
+        if (elements.length) {
+          return elements;
+        }
+      }
+    };
+
+    /**
+     * @name $$testability#getLocation
+     *
+     * @description
+     * Shortcut for getting the location in a browser agnostic way. Returns
+     *     the path, search, and hash. (e.g. /path?a=b#hash)
+     */
+    testability.getLocation = function() {
+      return $location.url();
+    };
+
+    /**
+     * @name $$testability#setLocation
+     *
+     * @description
+     * Shortcut for navigating to a location without doing a full page reload.
+     *
+     * @param {string} url The location url (path, search and hash,
+     *     e.g. /path?a=b#hash) to go to.
+     */
+    testability.setLocation = function(url) {
+      if (url !== $location.url()) {
+        $location.url(url);
+        $rootScope.$digest();
+      }
+    };
+
+    /**
+     * @name $$testability#whenStable
+     *
+     * @description
+     * Calls the callback when $timeout and $http requests are completed.
+     *
+     * @param {function} callback
+     */
+    testability.whenStable = function(callback) {
+      $browser.notifyWhenNoOutstandingRequests(callback);
+    };
+
+    return testability;
+  }];
+}
+
+function $TimeoutProvider() {
+  this.$get = ['$rootScope', '$browser', '$q', '$$q', '$exceptionHandler',
+       function($rootScope,   $browser,   $q,   $$q,   $exceptionHandler) {
+
+    var deferreds = {};
+
+
+     /**
+      * @ngdoc service
+      * @name $timeout
+      *
+      * @description
+      * Angular's wrapper for `window.setTimeout`. The `fn` function is wrapped into a try/catch
+      * block and delegates any exceptions to
+      * {@link ng.$exceptionHandler $exceptionHandler} service.
+      *
+      * The return value of calling `$timeout` is a promise, which will be resolved when
+      * the delay has passed and the timeout function, if provided, is executed.
+      *
+      * To cancel a timeout request, call `$timeout.cancel(promise)`.
+      *
+      * In tests you can use {@link ngMock.$timeout `$timeout.flush()`} to
+      * synchronously flush the queue of deferred functions.
+      *
+      * If you only want a promise that will be resolved after some specified delay
+      * then you can call `$timeout` without the `fn` function.
+      *
+      * @param {function()=} fn A function, whose execution should be delayed.
+      * @param {number=} [delay=0] Delay in milliseconds.
+      * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
+      *   will invoke `fn` within the {@link ng.$rootScope.Scope#$apply $apply} block.
+      * @param {...*=} Pass additional parameters to the executed function.
+      * @returns {Promise} Promise that will be resolved when the timeout is reached. The promise
+      *   will be resolved with the return value of the `fn` function.
+      *
+      */
+    function timeout(fn, delay, invokeApply) {
+      if (!isFunction(fn)) {
+        invokeApply = delay;
+        delay = fn;
+        fn = noop;
+      }
+
+      var args = sliceArgs(arguments, 3),
+          skipApply = (isDefined(invokeApply) && !invokeApply),
+          deferred = (skipApply ? $$q : $q).defer(),
+          promise = deferred.promise,
+          timeoutId;
+
+      timeoutId = $browser.defer(function() {
+        try {
+          deferred.resolve(fn.apply(null, args));
+        } catch (e) {
+          deferred.reject(e);
+          $exceptionHandler(e);
+        }
+        finally {
+          delete deferreds[promise.$$timeoutId];
+        }
+
+        if (!skipApply) $rootScope.$apply();
+      }, delay);
+
+      promise.$$timeoutId = timeoutId;
+      deferreds[timeoutId] = deferred;
+
+      return promise;
+    }
+
+
+     /**
+      * @ngdoc method
+      * @name $timeout#cancel
+      *
+      * @description
+      * Cancels a task associated with the `promise`. As a result of this, the promise will be
+      * resolved with a rejection.
+      *
+      * @param {Promise=} promise Promise returned by the `$timeout` function.
+      * @returns {boolean} Returns `true` if the task hasn't executed yet and was successfully
+      *   canceled.
+      */
+    timeout.cancel = function(promise) {
+      if (promise && promise.$$timeoutId in deferreds) {
+        deferreds[promise.$$timeoutId].reject('canceled');
+        delete deferreds[promise.$$timeoutId];
+        return $browser.defer.cancel(promise.$$timeoutId);
+      }
+      return false;
+    };
+
+    return timeout;
+  }];
+}
+
+// NOTE:  The usage of window and document instead of $window and $document here is
+// deliberate.  This service depends on the specific behavior of anchor nodes created by the
+// browser (resolving and parsing URLs) that is unlikely to be provided by mock objects and
+// cause us to break tests.  In addition, when the browser resolves a URL for XHR, it
+// doesn't know about mocked locations and resolves URLs to the real document - which is
+// exactly the behavior needed here.  There is little value is mocking these out for this
+// service.
+var urlParsingNode = document.createElement("a");
+var originUrl = urlResolve(window.location.href);
+
+
+/**
+ *
+ * Implementation Notes for non-IE browsers
+ * ----------------------------------------
+ * Assigning a URL to the href property of an anchor DOM node, even one attached to the DOM,
+ * results both in the normalizing and parsing of the URL.  Normalizing means that a relative
+ * URL will be resolved into an absolute URL in the context of the application document.
+ * Parsing means that the anchor node's host, hostname, protocol, port, pathname and related
+ * properties are all populated to reflect the normalized URL.  This approach has wide
+ * compatibility - Safari 1+, Mozilla 1+, Opera 7+,e etc.  See
+ * http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+ *
+ * Implementation Notes for IE
+ * ---------------------------
+ * IE <= 10 normalizes the URL when assigned to the anchor node similar to the other
+ * browsers.  However, the parsed components will not be set if the URL assigned did not specify
+ * them.  (e.g. if you assign a.href = "foo", then a.protocol, a.host, etc. will be empty.)  We
+ * work around that by performing the parsing in a 2nd step by taking a previously normalized
+ * URL (e.g. by assigning to a.href) and assigning it a.href again.  This correctly populates the
+ * properties such as protocol, hostname, port, etc.
+ *
+ * References:
+ *   http://developer.mozilla.org/en-US/docs/Web/API/HTMLAnchorElement
+ *   http://www.aptana.com/reference/html/api/HTMLAnchorElement.html
+ *   http://url.spec.whatwg.org/#urlutils
+ *   https://github.com/angular/angular.js/pull/2902
+ *   http://james.padolsey.com/javascript/parsing-urls-with-the-dom/
+ *
+ * @kind function
+ * @param {string} url The URL to be parsed.
+ * @description Normalizes and parses a URL.
+ * @returns {object} Returns the normalized URL as a dictionary.
+ *
+ *   | member name   | Description    |
+ *   |---------------|----------------|
+ *   | href          | A normalized version of the provided URL if it was not an absolute URL |
+ *   | protocol      | The protocol including the trailing colon                              |
+ *   | host          | The host and port (if the port is non-default) of the normalizedUrl    |
+ *   | search        | The search params, minus the question mark                             |
+ *   | hash          | The hash string, minus the hash symbol
+ *   | hostname      | The hostname
+ *   | port          | The port, without ":"
+ *   | pathname      | The pathname, beginning with "/"
+ *
+ */
+function urlResolve(url) {
+  var href = url;
+
+  if (msie) {
+    // Normalize before parse.  Refer Implementation Notes on why this is
+    // done in two steps on IE.
+    urlParsingNode.setAttribute("href", href);
+    href = urlParsingNode.href;
+  }
+
+  urlParsingNode.setAttribute('href', href);
+
+  // urlParsingNode provides the UrlUtils interface - http://url.spec.whatwg.org/#urlutils
+  return {
+    href: urlParsingNode.href,
+    protocol: urlParsingNode.protocol ? urlParsingNode.protocol.replace(/:$/, '') : '',
+    host: urlParsingNode.host,
+    search: urlParsingNode.search ? urlParsingNode.search.replace(/^\?/, '') : '',
+    hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '',
+    hostname: urlParsingNode.hostname,
+    port: urlParsingNode.port,
+    pathname: (urlParsingNode.pathname.charAt(0) === '/')
+      ? urlParsingNode.pathname
+      : '/' + urlParsingNode.pathname
+  };
+}
+
+/**
+ * Parse a request URL and determine whether this is a same-origin request as the application document.
+ *
+ * @param {string|object} requestUrl The url of the request as a string that will be resolved
+ * or a parsed URL object.
+ * @returns {boolean} Whether the request is for the same origin as the application document.
+ */
+function urlIsSameOrigin(requestUrl) {
+  var parsed = (isString(requestUrl)) ? urlResolve(requestUrl) : requestUrl;
+  return (parsed.protocol === originUrl.protocol &&
+          parsed.host === originUrl.host);
+}
+
+/**
+ * @ngdoc service
+ * @name $window
+ *
+ * @description
+ * A reference to the browser's `window` object. While `window`
+ * is globally available in JavaScript, it causes testability problems, because
+ * it is a global variable. In angular we always refer to it through the
+ * `$window` service, so it may be overridden, removed or mocked for testing.
+ *
+ * Expressions, like the one defined for the `ngClick` directive in the example
+ * below, are evaluated with respect to the current scope.  Therefore, there is
+ * no risk of inadvertently coding in a dependency on a global value in such an
+ * expression.
+ *
+ * @example
+   <example module="windowExample">
+     <file name="index.html">
+       <script>
+         angular.module('windowExample', [])
+           .controller('ExampleController', ['$scope', '$window', function($scope, $window) {
+             $scope.greeting = 'Hello, World!';
+             $scope.doGreeting = function(greeting) {
+               $window.alert(greeting);
+             };
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <input type="text" ng-model="greeting" aria-label="greeting" />
+         <button ng-click="doGreeting(greeting)">ALERT</button>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+      it('should display the greeting in the input box', function() {
+       element(by.model('greeting')).sendKeys('Hello, E2E Tests');
+       // If we click the button it will block the test runner
+       // element(':button').click();
+      });
+     </file>
+   </example>
+ */
+function $WindowProvider() {
+  this.$get = valueFn(window);
+}
+
+/**
+ * @name $$cookieReader
+ * @requires $document
+ *
+ * @description
+ * This is a private service for reading cookies used by $http and ngCookies
+ *
+ * @return {Object} a key/value map of the current cookies
+ */
+function $$CookieReader($document) {
+  var rawDocument = $document[0] || {};
+  var lastCookies = {};
+  var lastCookieString = '';
+
+  function safeDecodeURIComponent(str) {
+    try {
+      return decodeURIComponent(str);
+    } catch (e) {
+      return str;
+    }
+  }
+
+  return function() {
+    var cookieArray, cookie, i, index, name;
+    var currentCookieString = rawDocument.cookie || '';
+
+    if (currentCookieString !== lastCookieString) {
+      lastCookieString = currentCookieString;
+      cookieArray = lastCookieString.split('; ');
+      lastCookies = {};
+
+      for (i = 0; i < cookieArray.length; i++) {
+        cookie = cookieArray[i];
+        index = cookie.indexOf('=');
+        if (index > 0) { //ignore nameless cookies
+          name = safeDecodeURIComponent(cookie.substring(0, index));
+          // the first value that is seen for a cookie is the most
+          // specific one.  values for the same cookie name that
+          // follow are for less specific paths.
+          if (isUndefined(lastCookies[name])) {
+            lastCookies[name] = safeDecodeURIComponent(cookie.substring(index + 1));
+          }
+        }
+      }
+    }
+    return lastCookies;
+  };
+}
+
+$$CookieReader.$inject = ['$document'];
+
+function $$CookieReaderProvider() {
+  this.$get = $$CookieReader;
+}
+
+/* global currencyFilter: true,
+ dateFilter: true,
+ filterFilter: true,
+ jsonFilter: true,
+ limitToFilter: true,
+ lowercaseFilter: true,
+ numberFilter: true,
+ orderByFilter: true,
+ uppercaseFilter: true,
+ */
+
+/**
+ * @ngdoc provider
+ * @name $filterProvider
+ * @description
+ *
+ * Filters are just functions which transform input to an output. However filters need to be
+ * Dependency Injected. To achieve this a filter definition consists of a factory function which is
+ * annotated with dependencies and is responsible for creating a filter function.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+ * Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+ * your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+ * (`myapp_subsection_filterx`).
+ * </div>
+ *
+ * ```js
+ *   // Filter registration
+ *   function MyModule($provide, $filterProvider) {
+ *     // create a service to demonstrate injection (not always needed)
+ *     $provide.value('greet', function(name){
+ *       return 'Hello ' + name + '!';
+ *     });
+ *
+ *     // register a filter factory which uses the
+ *     // greet service to demonstrate DI.
+ *     $filterProvider.register('greet', function(greet){
+ *       // return the filter function which uses the greet service
+ *       // to generate salutation
+ *       return function(text) {
+ *         // filters need to be forgiving so check input validity
+ *         return text && greet(text) || text;
+ *       };
+ *     });
+ *   }
+ * ```
+ *
+ * The filter function is registered with the `$injector` under the filter name suffix with
+ * `Filter`.
+ *
+ * ```js
+ *   it('should be the same instance', inject(
+ *     function($filterProvider) {
+ *       $filterProvider.register('reverse', function(){
+ *         return ...;
+ *       });
+ *     },
+ *     function($filter, reverseFilter) {
+ *       expect($filter('reverse')).toBe(reverseFilter);
+ *     });
+ * ```
+ *
+ *
+ * For more information about how angular filters work, and how to create your own filters, see
+ * {@link guide/filter Filters} in the Angular Developer Guide.
+ */
+
+/**
+ * @ngdoc service
+ * @name $filter
+ * @kind function
+ * @description
+ * Filters are used for formatting data displayed to the user.
+ *
+ * The general syntax in templates is as follows:
+ *
+ *         {{ expression [| filter_name[:parameter_value] ... ] }}
+ *
+ * @param {String} name Name of the filter function to retrieve
+ * @return {Function} the filter function
+ * @example
+   <example name="$filter" module="filterExample">
+     <file name="index.html">
+       <div ng-controller="MainCtrl">
+        <h3>{{ originalText }}</h3>
+        <h3>{{ filteredText }}</h3>
+       </div>
+     </file>
+
+     <file name="script.js">
+      angular.module('filterExample', [])
+      .controller('MainCtrl', function($scope, $filter) {
+        $scope.originalText = 'hello';
+        $scope.filteredText = $filter('uppercase')($scope.originalText);
+      });
+     </file>
+   </example>
+  */
+$FilterProvider.$inject = ['$provide'];
+function $FilterProvider($provide) {
+  var suffix = 'Filter';
+
+  /**
+   * @ngdoc method
+   * @name $filterProvider#register
+   * @param {string|Object} name Name of the filter function, or an object map of filters where
+   *    the keys are the filter names and the values are the filter factories.
+   *
+   *    <div class="alert alert-warning">
+   *    **Note:** Filter names must be valid angular {@link expression} identifiers, such as `uppercase` or `orderBy`.
+   *    Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace
+   *    your filters, then you can use capitalization (`myappSubsectionFilterx`) or underscores
+   *    (`myapp_subsection_filterx`).
+   *    </div>
+    * @param {Function} factory If the first argument was a string, a factory function for the filter to be registered.
+   * @returns {Object} Registered filter instance, or if a map of filters was provided then a map
+   *    of the registered filter instances.
+   */
+  function register(name, factory) {
+    if (isObject(name)) {
+      var filters = {};
+      forEach(name, function(filter, key) {
+        filters[key] = register(key, filter);
+      });
+      return filters;
+    } else {
+      return $provide.factory(name + suffix, factory);
+    }
+  }
+  this.register = register;
+
+  this.$get = ['$injector', function($injector) {
+    return function(name) {
+      return $injector.get(name + suffix);
+    };
+  }];
+
+  ////////////////////////////////////////
+
+  /* global
+    currencyFilter: false,
+    dateFilter: false,
+    filterFilter: false,
+    jsonFilter: false,
+    limitToFilter: false,
+    lowercaseFilter: false,
+    numberFilter: false,
+    orderByFilter: false,
+    uppercaseFilter: false,
+  */
+
+  register('currency', currencyFilter);
+  register('date', dateFilter);
+  register('filter', filterFilter);
+  register('json', jsonFilter);
+  register('limitTo', limitToFilter);
+  register('lowercase', lowercaseFilter);
+  register('number', numberFilter);
+  register('orderBy', orderByFilter);
+  register('uppercase', uppercaseFilter);
+}
+
+/**
+ * @ngdoc filter
+ * @name filter
+ * @kind function
+ *
+ * @description
+ * Selects a subset of items from `array` and returns it as a new array.
+ *
+ * @param {Array} array The source array.
+ * @param {string|Object|function()} expression The predicate to be used for selecting items from
+ *   `array`.
+ *
+ *   Can be one of:
+ *
+ *   - `string`: The string is used for matching against the contents of the `array`. All strings or
+ *     objects with string properties in `array` that match this string will be returned. This also
+ *     applies to nested object properties.
+ *     The predicate can be negated by prefixing the string with `!`.
+ *
+ *   - `Object`: A pattern object can be used to filter specific properties on objects contained
+ *     by `array`. For example `{name:"M", phone:"1"}` predicate will return an array of items
+ *     which have property `name` containing "M" and property `phone` containing "1". A special
+ *     property name `$` can be used (as in `{$:"text"}`) to accept a match against any
+ *     property of the object or its nested object properties. That's equivalent to the simple
+ *     substring match with a `string` as described above. The predicate can be negated by prefixing
+ *     the string with `!`.
+ *     For example `{name: "!M"}` predicate will return an array of items which have property `name`
+ *     not containing "M".
+ *
+ *     Note that a named property will match properties on the same level only, while the special
+ *     `$` property will match properties on the same level or deeper. E.g. an array item like
+ *     `{name: {first: 'John', last: 'Doe'}}` will **not** be matched by `{name: 'John'}`, but
+ *     **will** be matched by `{$: 'John'}`.
+ *
+ *   - `function(value, index, array)`: A predicate function can be used to write arbitrary filters.
+ *     The function is called for each element of the array, with the element, its index, and
+ *     the entire array itself as arguments.
+ *
+ *     The final result is an array of those elements that the predicate returned true for.
+ *
+ * @param {function(actual, expected)|true|undefined} comparator Comparator which is used in
+ *     determining if the expected value (from the filter expression) and actual value (from
+ *     the object in the array) should be considered a match.
+ *
+ *   Can be one of:
+ *
+ *   - `function(actual, expected)`:
+ *     The function will be given the object value and the predicate value to compare and
+ *     should return true if both values should be considered equal.
+ *
+ *   - `true`: A shorthand for `function(actual, expected) { return angular.equals(actual, expected)}`.
+ *     This is essentially strict comparison of expected and actual.
+ *
+ *   - `false|undefined`: A short hand for a function which will look for a substring match in case
+ *     insensitive way.
+ *
+ *     Primitive values are converted to strings. Objects are not compared against primitives,
+ *     unless they have a custom `toString` method (e.g. `Date` objects).
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <div ng-init="friends = [{name:'John', phone:'555-1276'},
+                                {name:'Mary', phone:'800-BIG-MARY'},
+                                {name:'Mike', phone:'555-4321'},
+                                {name:'Adam', phone:'555-5678'},
+                                {name:'Julie', phone:'555-8765'},
+                                {name:'Juliette', phone:'555-5678'}]"></div>
+
+       <label>Search: <input ng-model="searchText"></label>
+       <table id="searchTextResults">
+         <tr><th>Name</th><th>Phone</th></tr>
+         <tr ng-repeat="friend in friends | filter:searchText">
+           <td>{{friend.name}}</td>
+           <td>{{friend.phone}}</td>
+         </tr>
+       </table>
+       <hr>
+       <label>Any: <input ng-model="search.$"></label> <br>
+       <label>Name only <input ng-model="search.name"></label><br>
+       <label>Phone only <input ng-model="search.phone"></label><br>
+       <label>Equality <input type="checkbox" ng-model="strict"></label><br>
+       <table id="searchObjResults">
+         <tr><th>Name</th><th>Phone</th></tr>
+         <tr ng-repeat="friendObj in friends | filter:search:strict">
+           <td>{{friendObj.name}}</td>
+           <td>{{friendObj.phone}}</td>
+         </tr>
+       </table>
+     </file>
+     <file name="protractor.js" type="protractor">
+       var expectFriendNames = function(expectedNames, key) {
+         element.all(by.repeater(key + ' in friends').column(key + '.name')).then(function(arr) {
+           arr.forEach(function(wd, i) {
+             expect(wd.getText()).toMatch(expectedNames[i]);
+           });
+         });
+       };
+
+       it('should search across all fields when filtering with a string', function() {
+         var searchText = element(by.model('searchText'));
+         searchText.clear();
+         searchText.sendKeys('m');
+         expectFriendNames(['Mary', 'Mike', 'Adam'], 'friend');
+
+         searchText.clear();
+         searchText.sendKeys('76');
+         expectFriendNames(['John', 'Julie'], 'friend');
+       });
+
+       it('should search in specific fields when filtering with a predicate object', function() {
+         var searchAny = element(by.model('search.$'));
+         searchAny.clear();
+         searchAny.sendKeys('i');
+         expectFriendNames(['Mary', 'Mike', 'Julie', 'Juliette'], 'friendObj');
+       });
+       it('should use a equal comparison when comparator is true', function() {
+         var searchName = element(by.model('search.name'));
+         var strict = element(by.model('strict'));
+         searchName.clear();
+         searchName.sendKeys('Julie');
+         strict.click();
+         expectFriendNames(['Julie'], 'friendObj');
+       });
+     </file>
+   </example>
+ */
+function filterFilter() {
+  return function(array, expression, comparator) {
+    if (!isArrayLike(array)) {
+      if (array == null) {
+        return array;
+      } else {
+        throw minErr('filter')('notarray', 'Expected array but received: {0}', array);
+      }
+    }
+
+    var expressionType = getTypeForFilter(expression);
+    var predicateFn;
+    var matchAgainstAnyProp;
+
+    switch (expressionType) {
+      case 'function':
+        predicateFn = expression;
+        break;
+      case 'boolean':
+      case 'null':
+      case 'number':
+      case 'string':
+        matchAgainstAnyProp = true;
+        //jshint -W086
+      case 'object':
+        //jshint +W086
+        predicateFn = createPredicateFn(expression, comparator, matchAgainstAnyProp);
+        break;
+      default:
+        return array;
+    }
+
+    return Array.prototype.filter.call(array, predicateFn);
+  };
+}
+
+// Helper functions for `filterFilter`
+function createPredicateFn(expression, comparator, matchAgainstAnyProp) {
+  var shouldMatchPrimitives = isObject(expression) && ('$' in expression);
+  var predicateFn;
+
+  if (comparator === true) {
+    comparator = equals;
+  } else if (!isFunction(comparator)) {
+    comparator = function(actual, expected) {
+      if (isUndefined(actual)) {
+        // No substring matching against `undefined`
+        return false;
+      }
+      if ((actual === null) || (expected === null)) {
+        // No substring matching against `null`; only match against `null`
+        return actual === expected;
+      }
+      if (isObject(expected) || (isObject(actual) && !hasCustomToString(actual))) {
+        // Should not compare primitives against objects, unless they have custom `toString` method
+        return false;
+      }
+
+      actual = lowercase('' + actual);
+      expected = lowercase('' + expected);
+      return actual.indexOf(expected) !== -1;
+    };
+  }
+
+  predicateFn = function(item) {
+    if (shouldMatchPrimitives && !isObject(item)) {
+      return deepCompare(item, expression.$, comparator, false);
+    }
+    return deepCompare(item, expression, comparator, matchAgainstAnyProp);
+  };
+
+  return predicateFn;
+}
+
+function deepCompare(actual, expected, comparator, matchAgainstAnyProp, dontMatchWholeObject) {
+  var actualType = getTypeForFilter(actual);
+  var expectedType = getTypeForFilter(expected);
+
+  if ((expectedType === 'string') && (expected.charAt(0) === '!')) {
+    return !deepCompare(actual, expected.substring(1), comparator, matchAgainstAnyProp);
+  } else if (isArray(actual)) {
+    // In case `actual` is an array, consider it a match
+    // if ANY of it's items matches `expected`
+    return actual.some(function(item) {
+      return deepCompare(item, expected, comparator, matchAgainstAnyProp);
+    });
+  }
+
+  switch (actualType) {
+    case 'object':
+      var key;
+      if (matchAgainstAnyProp) {
+        for (key in actual) {
+          if ((key.charAt(0) !== '$') && deepCompare(actual[key], expected, comparator, true)) {
+            return true;
+          }
+        }
+        return dontMatchWholeObject ? false : deepCompare(actual, expected, comparator, false);
+      } else if (expectedType === 'object') {
+        for (key in expected) {
+          var expectedVal = expected[key];
+          if (isFunction(expectedVal) || isUndefined(expectedVal)) {
+            continue;
+          }
+
+          var matchAnyProperty = key === '$';
+          var actualVal = matchAnyProperty ? actual : actual[key];
+          if (!deepCompare(actualVal, expectedVal, comparator, matchAnyProperty, matchAnyProperty)) {
+            return false;
+          }
+        }
+        return true;
+      } else {
+        return comparator(actual, expected);
+      }
+      break;
+    case 'function':
+      return false;
+    default:
+      return comparator(actual, expected);
+  }
+}
+
+// Used for easily differentiating between `null` and actual `object`
+function getTypeForFilter(val) {
+  return (val === null) ? 'null' : typeof val;
+}
+
+var MAX_DIGITS = 22;
+var DECIMAL_SEP = '.';
+var ZERO_CHAR = '0';
+
+/**
+ * @ngdoc filter
+ * @name currency
+ * @kind function
+ *
+ * @description
+ * Formats a number as a currency (ie $1,234.56). When no currency symbol is provided, default
+ * symbol for current locale is used.
+ *
+ * @param {number} amount Input to filter.
+ * @param {string=} symbol Currency symbol or identifier to be displayed.
+ * @param {number=} fractionSize Number of decimal places to round the amount to, defaults to default max fraction size for current locale
+ * @returns {string} Formatted number.
+ *
+ *
+ * @example
+   <example module="currencyExample">
+     <file name="index.html">
+       <script>
+         angular.module('currencyExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.amount = 1234.56;
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <input type="number" ng-model="amount" aria-label="amount"> <br>
+         default currency symbol ($): <span id="currency-default">{{amount | currency}}</span><br>
+         custom currency identifier (USD$): <span id="currency-custom">{{amount | currency:"USD$"}}</span>
+         no fractions (0): <span id="currency-no-fractions">{{amount | currency:"USD$":0}}</span>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should init with 1234.56', function() {
+         expect(element(by.id('currency-default')).getText()).toBe('$1,234.56');
+         expect(element(by.id('currency-custom')).getText()).toBe('USD$1,234.56');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('USD$1,235');
+       });
+       it('should update', function() {
+         if (browser.params.browser == 'safari') {
+           // Safari does not understand the minus key. See
+           // https://github.com/angular/protractor/issues/481
+           return;
+         }
+         element(by.model('amount')).clear();
+         element(by.model('amount')).sendKeys('-1234');
+         expect(element(by.id('currency-default')).getText()).toBe('-$1,234.00');
+         expect(element(by.id('currency-custom')).getText()).toBe('-USD$1,234.00');
+         expect(element(by.id('currency-no-fractions')).getText()).toBe('-USD$1,234');
+       });
+     </file>
+   </example>
+ */
+currencyFilter.$inject = ['$locale'];
+function currencyFilter($locale) {
+  var formats = $locale.NUMBER_FORMATS;
+  return function(amount, currencySymbol, fractionSize) {
+    if (isUndefined(currencySymbol)) {
+      currencySymbol = formats.CURRENCY_SYM;
+    }
+
+    if (isUndefined(fractionSize)) {
+      fractionSize = formats.PATTERNS[1].maxFrac;
+    }
+
+    // if null or undefined pass it through
+    return (amount == null)
+        ? amount
+        : formatNumber(amount, formats.PATTERNS[1], formats.GROUP_SEP, formats.DECIMAL_SEP, fractionSize).
+            replace(/\u00A4/g, currencySymbol);
+  };
+}
+
+/**
+ * @ngdoc filter
+ * @name number
+ * @kind function
+ *
+ * @description
+ * Formats a number as text.
+ *
+ * If the input is null or undefined, it will just be returned.
+ * If the input is infinite (Infinity/-Infinity) the Infinity symbol '∞' is returned.
+ * If the input is not a number an empty string is returned.
+ *
+ *
+ * @param {number|string} number Number to format.
+ * @param {(number|string)=} fractionSize Number of decimal places to round the number to.
+ * If this is not provided then the fraction size is computed from the current locale's number
+ * formatting pattern. In the case of the default locale, it will be 3.
+ * @returns {string} Number rounded to fractionSize and places a “,” after each third digit.
+ *
+ * @example
+   <example module="numberFilterExample">
+     <file name="index.html">
+       <script>
+         angular.module('numberFilterExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.val = 1234.56789;
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <label>Enter number: <input ng-model='val'></label><br>
+         Default formatting: <span id='number-default'>{{val | number}}</span><br>
+         No fractions: <span>{{val | number:0}}</span><br>
+         Negative number: <span>{{-val | number:4}}</span>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should format numbers', function() {
+         expect(element(by.id('number-default')).getText()).toBe('1,234.568');
+         expect(element(by.binding('val | number:0')).getText()).toBe('1,235');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-1,234.5679');
+       });
+
+       it('should update', function() {
+         element(by.model('val')).clear();
+         element(by.model('val')).sendKeys('3374.333');
+         expect(element(by.id('number-default')).getText()).toBe('3,374.333');
+         expect(element(by.binding('val | number:0')).getText()).toBe('3,374');
+         expect(element(by.binding('-val | number:4')).getText()).toBe('-3,374.3330');
+      });
+     </file>
+   </example>
+ */
+numberFilter.$inject = ['$locale'];
+function numberFilter($locale) {
+  var formats = $locale.NUMBER_FORMATS;
+  return function(number, fractionSize) {
+
+    // if null or undefined pass it through
+    return (number == null)
+        ? number
+        : formatNumber(number, formats.PATTERNS[0], formats.GROUP_SEP, formats.DECIMAL_SEP,
+                       fractionSize);
+  };
+}
+
+/**
+ * Parse a number (as a string) into three components that can be used
+ * for formatting the number.
+ *
+ * (Significant bits of this parse algorithm came from https://github.com/MikeMcl/big.js/)
+ *
+ * @param  {string} numStr The number to parse
+ * @return {object} An object describing this number, containing the following keys:
+ *  - d : an array of digits containing leading zeros as necessary
+ *  - i : the number of the digits in `d` that are to the left of the decimal point
+ *  - e : the exponent for numbers that would need more than `MAX_DIGITS` digits in `d`
+ *
+ */
+function parse(numStr) {
+  var exponent = 0, digits, numberOfIntegerDigits;
+  var i, j, zeros;
+
+  // Decimal point?
+  if ((numberOfIntegerDigits = numStr.indexOf(DECIMAL_SEP)) > -1) {
+    numStr = numStr.replace(DECIMAL_SEP, '');
+  }
+
+  // Exponential form?
+  if ((i = numStr.search(/e/i)) > 0) {
+    // Work out the exponent.
+    if (numberOfIntegerDigits < 0) numberOfIntegerDigits = i;
+    numberOfIntegerDigits += +numStr.slice(i + 1);
+    numStr = numStr.substring(0, i);
+  } else if (numberOfIntegerDigits < 0) {
+    // There was no decimal point or exponent so it is an integer.
+    numberOfIntegerDigits = numStr.length;
+  }
+
+  // Count the number of leading zeros.
+  for (i = 0; numStr.charAt(i) == ZERO_CHAR; i++);
+
+  if (i == (zeros = numStr.length)) {
+    // The digits are all zero.
+    digits = [0];
+    numberOfIntegerDigits = 1;
+  } else {
+    // Count the number of trailing zeros
+    zeros--;
+    while (numStr.charAt(zeros) == ZERO_CHAR) zeros--;
+
+    // Trailing zeros are insignificant so ignore them
+    numberOfIntegerDigits -= i;
+    digits = [];
+    // Convert string to array of digits without leading/trailing zeros.
+    for (j = 0; i <= zeros; i++, j++) {
+      digits[j] = +numStr.charAt(i);
+    }
+  }
+
+  // If the number overflows the maximum allowed digits then use an exponent.
+  if (numberOfIntegerDigits > MAX_DIGITS) {
+    digits = digits.splice(0, MAX_DIGITS - 1);
+    exponent = numberOfIntegerDigits - 1;
+    numberOfIntegerDigits = 1;
+  }
+
+  return { d: digits, e: exponent, i: numberOfIntegerDigits };
+}
+
+/**
+ * Round the parsed number to the specified number of decimal places
+ * This function changed the parsedNumber in-place
+ */
+function roundNumber(parsedNumber, fractionSize, minFrac, maxFrac) {
+    var digits = parsedNumber.d;
+    var fractionLen = digits.length - parsedNumber.i;
+
+    // determine fractionSize if it is not specified; `+fractionSize` converts it to a number
+    fractionSize = (isUndefined(fractionSize)) ? Math.min(Math.max(minFrac, fractionLen), maxFrac) : +fractionSize;
+
+    // The index of the digit to where rounding is to occur
+    var roundAt = fractionSize + parsedNumber.i;
+    var digit = digits[roundAt];
+
+    if (roundAt > 0) {
+      digits.splice(roundAt);
+    } else {
+      // We rounded to zero so reset the parsedNumber
+      parsedNumber.i = 1;
+      digits.length = roundAt = fractionSize + 1;
+      for (var i=0; i < roundAt; i++) digits[i] = 0;
+    }
+
+    if (digit >= 5) digits[roundAt - 1]++;
+
+    // Pad out with zeros to get the required fraction length
+    for (; fractionLen < fractionSize; fractionLen++) digits.push(0);
+
+
+    // Do any carrying, e.g. a digit was rounded up to 10
+    var carry = digits.reduceRight(function(carry, d, i, digits) {
+      d = d + carry;
+      digits[i] = d % 10;
+      return Math.floor(d / 10);
+    }, 0);
+    if (carry) {
+      digits.unshift(carry);
+      parsedNumber.i++;
+    }
+}
+
+/**
+ * Format a number into a string
+ * @param  {number} number       The number to format
+ * @param  {{
+ *           minFrac, // the minimum number of digits required in the fraction part of the number
+ *           maxFrac, // the maximum number of digits required in the fraction part of the number
+ *           gSize,   // number of digits in each group of separated digits
+ *           lgSize,  // number of digits in the last group of digits before the decimal separator
+ *           negPre,  // the string to go in front of a negative number (e.g. `-` or `(`))
+ *           posPre,  // the string to go in front of a positive number
+ *           negSuf,  // the string to go after a negative number (e.g. `)`)
+ *           posSuf   // the string to go after a positive number
+ *         }} pattern
+ * @param  {string} groupSep     The string to separate groups of number (e.g. `,`)
+ * @param  {string} decimalSep   The string to act as the decimal separator (e.g. `.`)
+ * @param  {[type]} fractionSize The size of the fractional part of the number
+ * @return {string}              The number formatted as a string
+ */
+function formatNumber(number, pattern, groupSep, decimalSep, fractionSize) {
+
+  if (!(isString(number) || isNumber(number)) || isNaN(number)) return '';
+
+  var isInfinity = !isFinite(number);
+  var isZero = false;
+  var numStr = Math.abs(number) + '',
+      formattedText = '',
+      parsedNumber;
+
+  if (isInfinity) {
+    formattedText = '\u221e';
+  } else {
+    parsedNumber = parse(numStr);
+
+    roundNumber(parsedNumber, fractionSize, pattern.minFrac, pattern.maxFrac);
+
+    var digits = parsedNumber.d;
+    var integerLen = parsedNumber.i;
+    var exponent = parsedNumber.e;
+    var decimals = [];
+    isZero = digits.reduce(function(isZero, d) { return isZero && !d; }, true);
+
+    // pad zeros for small numbers
+    while (integerLen < 0) {
+      digits.unshift(0);
+      integerLen++;
+    }
+
+    // extract decimals digits
+    if (integerLen > 0) {
+      decimals = digits.splice(integerLen);
+    } else {
+      decimals = digits;
+      digits = [0];
+    }
+
+    // format the integer digits with grouping separators
+    var groups = [];
+    if (digits.length > pattern.lgSize) {
+      groups.unshift(digits.splice(-pattern.lgSize).join(''));
+    }
+    while (digits.length > pattern.gSize) {
+      groups.unshift(digits.splice(-pattern.gSize).join(''));
+    }
+    if (digits.length) {
+      groups.unshift(digits.join(''));
+    }
+    formattedText = groups.join(groupSep);
+
+    // append the decimal digits
+    if (decimals.length) {
+      formattedText += decimalSep + decimals.join('');
+    }
+
+    if (exponent) {
+      formattedText += 'e+' + exponent;
+    }
+  }
+  if (number < 0 && !isZero) {
+    return pattern.negPre + formattedText + pattern.negSuf;
+  } else {
+    return pattern.posPre + formattedText + pattern.posSuf;
+  }
+}
+
+function padNumber(num, digits, trim) {
+  var neg = '';
+  if (num < 0) {
+    neg =  '-';
+    num = -num;
+  }
+  num = '' + num;
+  while (num.length < digits) num = ZERO_CHAR + num;
+  if (trim) {
+    num = num.substr(num.length - digits);
+  }
+  return neg + num;
+}
+
+
+function dateGetter(name, size, offset, trim) {
+  offset = offset || 0;
+  return function(date) {
+    var value = date['get' + name]();
+    if (offset > 0 || value > -offset) {
+      value += offset;
+    }
+    if (value === 0 && offset == -12) value = 12;
+    return padNumber(value, size, trim);
+  };
+}
+
+function dateStrGetter(name, shortForm) {
+  return function(date, formats) {
+    var value = date['get' + name]();
+    var get = uppercase(shortForm ? ('SHORT' + name) : name);
+
+    return formats[get][value];
+  };
+}
+
+function timeZoneGetter(date, formats, offset) {
+  var zone = -1 * offset;
+  var paddedZone = (zone >= 0) ? "+" : "";
+
+  paddedZone += padNumber(Math[zone > 0 ? 'floor' : 'ceil'](zone / 60), 2) +
+                padNumber(Math.abs(zone % 60), 2);
+
+  return paddedZone;
+}
+
+function getFirstThursdayOfYear(year) {
+    // 0 = index of January
+    var dayOfWeekOnFirst = (new Date(year, 0, 1)).getDay();
+    // 4 = index of Thursday (+1 to account for 1st = 5)
+    // 11 = index of *next* Thursday (+1 account for 1st = 12)
+    return new Date(year, 0, ((dayOfWeekOnFirst <= 4) ? 5 : 12) - dayOfWeekOnFirst);
+}
+
+function getThursdayThisWeek(datetime) {
+    return new Date(datetime.getFullYear(), datetime.getMonth(),
+      // 4 = index of Thursday
+      datetime.getDate() + (4 - datetime.getDay()));
+}
+
+function weekGetter(size) {
+   return function(date) {
+      var firstThurs = getFirstThursdayOfYear(date.getFullYear()),
+         thisThurs = getThursdayThisWeek(date);
+
+      var diff = +thisThurs - +firstThurs,
+         result = 1 + Math.round(diff / 6.048e8); // 6.048e8 ms per week
+
+      return padNumber(result, size);
+   };
+}
+
+function ampmGetter(date, formats) {
+  return date.getHours() < 12 ? formats.AMPMS[0] : formats.AMPMS[1];
+}
+
+function eraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERAS[0] : formats.ERAS[1];
+}
+
+function longEraGetter(date, formats) {
+  return date.getFullYear() <= 0 ? formats.ERANAMES[0] : formats.ERANAMES[1];
+}
+
+var DATE_FORMATS = {
+  yyyy: dateGetter('FullYear', 4),
+    yy: dateGetter('FullYear', 2, 0, true),
+     y: dateGetter('FullYear', 1),
+  MMMM: dateStrGetter('Month'),
+   MMM: dateStrGetter('Month', true),
+    MM: dateGetter('Month', 2, 1),
+     M: dateGetter('Month', 1, 1),
+    dd: dateGetter('Date', 2),
+     d: dateGetter('Date', 1),
+    HH: dateGetter('Hours', 2),
+     H: dateGetter('Hours', 1),
+    hh: dateGetter('Hours', 2, -12),
+     h: dateGetter('Hours', 1, -12),
+    mm: dateGetter('Minutes', 2),
+     m: dateGetter('Minutes', 1),
+    ss: dateGetter('Seconds', 2),
+     s: dateGetter('Seconds', 1),
+     // while ISO 8601 requires fractions to be prefixed with `.` or `,`
+     // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions
+   sss: dateGetter('Milliseconds', 3),
+  EEEE: dateStrGetter('Day'),
+   EEE: dateStrGetter('Day', true),
+     a: ampmGetter,
+     Z: timeZoneGetter,
+    ww: weekGetter(2),
+     w: weekGetter(1),
+     G: eraGetter,
+     GG: eraGetter,
+     GGG: eraGetter,
+     GGGG: longEraGetter
+};
+
+var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,
+    NUMBER_STRING = /^\-?\d+$/;
+
+/**
+ * @ngdoc filter
+ * @name date
+ * @kind function
+ *
+ * @description
+ *   Formats `date` to a string based on the requested `format`.
+ *
+ *   `format` string can be composed of the following elements:
+ *
+ *   * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010)
+ *   * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10)
+ *   * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199)
+ *   * `'MMMM'`: Month in year (January-December)
+ *   * `'MMM'`: Month in year (Jan-Dec)
+ *   * `'MM'`: Month in year, padded (01-12)
+ *   * `'M'`: Month in year (1-12)
+ *   * `'dd'`: Day in month, padded (01-31)
+ *   * `'d'`: Day in month (1-31)
+ *   * `'EEEE'`: Day in Week,(Sunday-Saturday)
+ *   * `'EEE'`: Day in Week, (Sun-Sat)
+ *   * `'HH'`: Hour in day, padded (00-23)
+ *   * `'H'`: Hour in day (0-23)
+ *   * `'hh'`: Hour in AM/PM, padded (01-12)
+ *   * `'h'`: Hour in AM/PM, (1-12)
+ *   * `'mm'`: Minute in hour, padded (00-59)
+ *   * `'m'`: Minute in hour (0-59)
+ *   * `'ss'`: Second in minute, padded (00-59)
+ *   * `'s'`: Second in minute (0-59)
+ *   * `'sss'`: Millisecond in second, padded (000-999)
+ *   * `'a'`: AM/PM marker
+ *   * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-+1200)
+ *   * `'ww'`: Week of year, padded (00-53). Week 01 is the week with the first Thursday of the year
+ *   * `'w'`: Week of year (0-53). Week 1 is the week with the first Thursday of the year
+ *   * `'G'`, `'GG'`, `'GGG'`: The abbreviated form of the era string (e.g. 'AD')
+ *   * `'GGGG'`: The long form of the era string (e.g. 'Anno Domini')
+ *
+ *   `format` string can also be one of the following predefined
+ *   {@link guide/i18n localizable formats}:
+ *
+ *   * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale
+ *     (e.g. Sep 3, 2010 12:05:08 PM)
+ *   * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US  locale (e.g. 9/3/10 12:05 PM)
+ *   * `'fullDate'`: equivalent to `'EEEE, MMMM d, y'` for en_US  locale
+ *     (e.g. Friday, September 3, 2010)
+ *   * `'longDate'`: equivalent to `'MMMM d, y'` for en_US  locale (e.g. September 3, 2010)
+ *   * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US  locale (e.g. Sep 3, 2010)
+ *   * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10)
+ *   * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 PM)
+ *   * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 PM)
+ *
+ *   `format` string can contain literal values. These need to be escaped by surrounding with single quotes (e.g.
+ *   `"h 'in the morning'"`). In order to output a single quote, escape it - i.e., two single quotes in a sequence
+ *   (e.g. `"h 'o''clock'"`).
+ *
+ * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
+ *    number) or various ISO 8601 datetime string formats (e.g. yyyy-MM-ddTHH:mm:ss.sssZ and its
+ *    shorter versions like yyyy-MM-ddTHH:mmZ, yyyy-MM-dd or yyyyMMddTHHmmssZ). If no timezone is
+ *    specified in the string input, the time is considered to be in the local timezone.
+ * @param {string=} format Formatting rules (see Description). If not specified,
+ *    `mediumDate` is used.
+ * @param {string=} timezone Timezone to be used for formatting. It understands UTC/GMT and the
+ *    continental US time zone abbreviations, but for general use, use a time zone offset, for
+ *    example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+ *    If not specified, the timezone of the browser will be used.
+ * @returns {string} Formatted string or the input if input is not recognized as date/millis.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <span ng-non-bindable>{{1288323623006 | date:'medium'}}</span>:
+           <span>{{1288323623006 | date:'medium'}}</span><br>
+       <span ng-non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>:
+          <span>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span><br>
+       <span ng-non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>:
+          <span>{{'1288323623006' | date:'MM/dd/yyyy @ h:mma'}}</span><br>
+       <span ng-non-bindable>{{1288323623006 | date:"MM/dd/yyyy 'at' h:mma"}}</span>:
+          <span>{{'1288323623006' | date:"MM/dd/yyyy 'at' h:mma"}}</span><br>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should format date', function() {
+         expect(element(by.binding("1288323623006 | date:'medium'")).getText()).
+            toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} (AM|PM)/);
+         expect(element(by.binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")).getText()).
+            toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} (\-|\+)?\d{4}/);
+         expect(element(by.binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")).getText()).
+            toMatch(/10\/2\d\/2010 @ \d{1,2}:\d{2}(AM|PM)/);
+         expect(element(by.binding("'1288323623006' | date:\"MM/dd/yyyy 'at' h:mma\"")).getText()).
+            toMatch(/10\/2\d\/2010 at \d{1,2}:\d{2}(AM|PM)/);
+       });
+     </file>
+   </example>
+ */
+dateFilter.$inject = ['$locale'];
+function dateFilter($locale) {
+
+
+  var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
+                     // 1        2       3         4          5          6          7          8  9     10      11
+  function jsonStringToDate(string) {
+    var match;
+    if (match = string.match(R_ISO8601_STR)) {
+      var date = new Date(0),
+          tzHour = 0,
+          tzMin  = 0,
+          dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
+          timeSetter = match[8] ? date.setUTCHours : date.setHours;
+
+      if (match[9]) {
+        tzHour = toInt(match[9] + match[10]);
+        tzMin = toInt(match[9] + match[11]);
+      }
+      dateSetter.call(date, toInt(match[1]), toInt(match[2]) - 1, toInt(match[3]));
+      var h = toInt(match[4] || 0) - tzHour;
+      var m = toInt(match[5] || 0) - tzMin;
+      var s = toInt(match[6] || 0);
+      var ms = Math.round(parseFloat('0.' + (match[7] || 0)) * 1000);
+      timeSetter.call(date, h, m, s, ms);
+      return date;
+    }
+    return string;
+  }
+
+
+  return function(date, format, timezone) {
+    var text = '',
+        parts = [],
+        fn, match;
+
+    format = format || 'mediumDate';
+    format = $locale.DATETIME_FORMATS[format] || format;
+    if (isString(date)) {
+      date = NUMBER_STRING.test(date) ? toInt(date) : jsonStringToDate(date);
+    }
+
+    if (isNumber(date)) {
+      date = new Date(date);
+    }
+
+    if (!isDate(date) || !isFinite(date.getTime())) {
+      return date;
+    }
+
+    while (format) {
+      match = DATE_FORMATS_SPLIT.exec(format);
+      if (match) {
+        parts = concat(parts, match, 1);
+        format = parts.pop();
+      } else {
+        parts.push(format);
+        format = null;
+      }
+    }
+
+    var dateTimezoneOffset = date.getTimezoneOffset();
+    if (timezone) {
+      dateTimezoneOffset = timezoneToOffset(timezone, date.getTimezoneOffset());
+      date = convertTimezoneToLocal(date, timezone, true);
+    }
+    forEach(parts, function(value) {
+      fn = DATE_FORMATS[value];
+      text += fn ? fn(date, $locale.DATETIME_FORMATS, dateTimezoneOffset)
+                 : value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
+    });
+
+    return text;
+  };
+}
+
+
+/**
+ * @ngdoc filter
+ * @name json
+ * @kind function
+ *
+ * @description
+ *   Allows you to convert a JavaScript object into JSON string.
+ *
+ *   This filter is mostly useful for debugging. When using the double curly {{value}} notation
+ *   the binding is automatically converted to JSON.
+ *
+ * @param {*} object Any JavaScript object (including arrays and primitive types) to filter.
+ * @param {number=} spacing The number of spaces to use per indentation, defaults to 2.
+ * @returns {string} JSON string.
+ *
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <pre id="default-spacing">{{ {'name':'value'} | json }}</pre>
+       <pre id="custom-spacing">{{ {'name':'value'} | json:4 }}</pre>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should jsonify filtered objects', function() {
+         expect(element(by.id('default-spacing')).getText()).toMatch(/\{\n  "name": ?"value"\n}/);
+         expect(element(by.id('custom-spacing')).getText()).toMatch(/\{\n    "name": ?"value"\n}/);
+       });
+     </file>
+   </example>
+ *
+ */
+function jsonFilter() {
+  return function(object, spacing) {
+    if (isUndefined(spacing)) {
+        spacing = 2;
+    }
+    return toJson(object, spacing);
+  };
+}
+
+
+/**
+ * @ngdoc filter
+ * @name lowercase
+ * @kind function
+ * @description
+ * Converts string to lowercase.
+ * @see angular.lowercase
+ */
+var lowercaseFilter = valueFn(lowercase);
+
+
+/**
+ * @ngdoc filter
+ * @name uppercase
+ * @kind function
+ * @description
+ * Converts string to uppercase.
+ * @see angular.uppercase
+ */
+var uppercaseFilter = valueFn(uppercase);
+
+/**
+ * @ngdoc filter
+ * @name limitTo
+ * @kind function
+ *
+ * @description
+ * Creates a new array or string containing only a specified number of elements. The elements
+ * are taken from either the beginning or the end of the source array, string or number, as specified by
+ * the value and sign (positive or negative) of `limit`. If a number is used as input, it is
+ * converted to a string.
+ *
+ * @param {Array|string|number} input Source array, string or number to be limited.
+ * @param {string|number} limit The length of the returned array or string. If the `limit` number
+ *     is positive, `limit` number of items from the beginning of the source array/string are copied.
+ *     If the number is negative, `limit` number  of items from the end of the source array/string
+ *     are copied. The `limit` will be trimmed if it exceeds `array.length`. If `limit` is undefined,
+ *     the input will be returned unchanged.
+ * @param {(string|number)=} begin Index at which to begin limitation. As a negative index, `begin`
+ *     indicates an offset from the end of `input`. Defaults to `0`.
+ * @returns {Array|string} A new sub-array or substring of length `limit` or less if input array
+ *     had less than `limit` elements.
+ *
+ * @example
+   <example module="limitToExample">
+     <file name="index.html">
+       <script>
+         angular.module('limitToExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.numbers = [1,2,3,4,5,6,7,8,9];
+             $scope.letters = "abcdefghi";
+             $scope.longNumber = 2345432342;
+             $scope.numLimit = 3;
+             $scope.letterLimit = 3;
+             $scope.longNumberLimit = 3;
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <label>
+            Limit {{numbers}} to:
+            <input type="number" step="1" ng-model="numLimit">
+         </label>
+         <p>Output numbers: {{ numbers | limitTo:numLimit }}</p>
+         <label>
+            Limit {{letters}} to:
+            <input type="number" step="1" ng-model="letterLimit">
+         </label>
+         <p>Output letters: {{ letters | limitTo:letterLimit }}</p>
+         <label>
+            Limit {{longNumber}} to:
+            <input type="number" step="1" ng-model="longNumberLimit">
+         </label>
+         <p>Output long number: {{ longNumber | limitTo:longNumberLimit }}</p>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       var numLimitInput = element(by.model('numLimit'));
+       var letterLimitInput = element(by.model('letterLimit'));
+       var longNumberLimitInput = element(by.model('longNumberLimit'));
+       var limitedNumbers = element(by.binding('numbers | limitTo:numLimit'));
+       var limitedLetters = element(by.binding('letters | limitTo:letterLimit'));
+       var limitedLongNumber = element(by.binding('longNumber | limitTo:longNumberLimit'));
+
+       it('should limit the number array to first three items', function() {
+         expect(numLimitInput.getAttribute('value')).toBe('3');
+         expect(letterLimitInput.getAttribute('value')).toBe('3');
+         expect(longNumberLimitInput.getAttribute('value')).toBe('3');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abc');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 234');
+       });
+
+       // There is a bug in safari and protractor that doesn't like the minus key
+       // it('should update the output when -3 is entered', function() {
+       //   numLimitInput.clear();
+       //   numLimitInput.sendKeys('-3');
+       //   letterLimitInput.clear();
+       //   letterLimitInput.sendKeys('-3');
+       //   longNumberLimitInput.clear();
+       //   longNumberLimitInput.sendKeys('-3');
+       //   expect(limitedNumbers.getText()).toEqual('Output numbers: [7,8,9]');
+       //   expect(limitedLetters.getText()).toEqual('Output letters: ghi');
+       //   expect(limitedLongNumber.getText()).toEqual('Output long number: 342');
+       // });
+
+       it('should not exceed the maximum size of input array', function() {
+         numLimitInput.clear();
+         numLimitInput.sendKeys('100');
+         letterLimitInput.clear();
+         letterLimitInput.sendKeys('100');
+         longNumberLimitInput.clear();
+         longNumberLimitInput.sendKeys('100');
+         expect(limitedNumbers.getText()).toEqual('Output numbers: [1,2,3,4,5,6,7,8,9]');
+         expect(limitedLetters.getText()).toEqual('Output letters: abcdefghi');
+         expect(limitedLongNumber.getText()).toEqual('Output long number: 2345432342');
+       });
+     </file>
+   </example>
+*/
+function limitToFilter() {
+  return function(input, limit, begin) {
+    if (Math.abs(Number(limit)) === Infinity) {
+      limit = Number(limit);
+    } else {
+      limit = toInt(limit);
+    }
+    if (isNaN(limit)) return input;
+
+    if (isNumber(input)) input = input.toString();
+    if (!isArray(input) && !isString(input)) return input;
+
+    begin = (!begin || isNaN(begin)) ? 0 : toInt(begin);
+    begin = (begin < 0) ? Math.max(0, input.length + begin) : begin;
+
+    if (limit >= 0) {
+      return input.slice(begin, begin + limit);
+    } else {
+      if (begin === 0) {
+        return input.slice(limit, input.length);
+      } else {
+        return input.slice(Math.max(0, begin + limit), begin);
+      }
+    }
+  };
+}
+
+/**
+ * @ngdoc filter
+ * @name orderBy
+ * @kind function
+ *
+ * @description
+ * Orders a specified `array` by the `expression` predicate. It is ordered alphabetically
+ * for strings and numerically for numbers. Note: if you notice numbers are not being sorted
+ * as expected, make sure they are actually being saved as numbers and not strings.
+ *
+ * @param {Array} array The array to sort.
+ * @param {function(*)|string|Array.<(function(*)|string)>=} expression A predicate to be
+ *    used by the comparator to determine the order of elements.
+ *
+ *    Can be one of:
+ *
+ *    - `function`: Getter function. The result of this function will be sorted using the
+ *      `<`, `===`, `>` operator.
+ *    - `string`: An Angular expression. The result of this expression is used to compare elements
+ *      (for example `name` to sort by a property called `name` or `name.substr(0, 3)` to sort by
+ *      3 first characters of a property called `name`). The result of a constant expression
+ *      is interpreted as a property name to be used in comparisons (for example `"special name"`
+ *      to sort object by the value of their `special name` property). An expression can be
+ *      optionally prefixed with `+` or `-` to control ascending or descending sort order
+ *      (for example, `+name` or `-name`). If no property is provided, (e.g. `'+'`) then the array
+ *      element itself is used to compare where sorting.
+ *    - `Array`: An array of function or string predicates. The first predicate in the array
+ *      is used for sorting, but when two items are equivalent, the next predicate is used.
+ *
+ *    If the predicate is missing or empty then it defaults to `'+'`.
+ *
+ * @param {boolean=} reverse Reverse the order of the array.
+ * @returns {Array} Sorted copy of the source array.
+ *
+ *
+ * @example
+ * The example below demonstrates a simple ngRepeat, where the data is sorted
+ * by age in descending order (predicate is set to `'-age'`).
+ * `reverse` is not set, which means it defaults to `false`.
+   <example module="orderByExample">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+         <table class="friend">
+           <tr>
+             <th>Name</th>
+             <th>Phone Number</th>
+             <th>Age</th>
+           </tr>
+           <tr ng-repeat="friend in friends | orderBy:'-age'">
+             <td>{{friend.name}}</td>
+             <td>{{friend.phone}}</td>
+             <td>{{friend.age}}</td>
+           </tr>
+         </table>
+       </div>
+     </file>
+     <file name="script.js">
+       angular.module('orderByExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends =
+               [{name:'John', phone:'555-1212', age:10},
+                {name:'Mary', phone:'555-9876', age:19},
+                {name:'Mike', phone:'555-4321', age:21},
+                {name:'Adam', phone:'555-5678', age:35},
+                {name:'Julie', phone:'555-8765', age:29}];
+         }]);
+     </file>
+   </example>
+ *
+ * The predicate and reverse parameters can be controlled dynamically through scope properties,
+ * as shown in the next example.
+ * @example
+   <example module="orderByExample">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+         <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
+         <hr/>
+         <button ng-click="predicate=''">Set to unsorted</button>
+         <table class="friend">
+           <tr>
+            <th>
+                <button ng-click="order('name')">Name</button>
+                <span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
+            </th>
+            <th>
+                <button ng-click="order('phone')">Phone Number</button>
+                <span class="sortorder" ng-show="predicate === 'phone'" ng-class="{reverse:reverse}"></span>
+            </th>
+            <th>
+                <button ng-click="order('age')">Age</button>
+                <span class="sortorder" ng-show="predicate === 'age'" ng-class="{reverse:reverse}"></span>
+            </th>
+           </tr>
+           <tr ng-repeat="friend in friends | orderBy:predicate:reverse">
+             <td>{{friend.name}}</td>
+             <td>{{friend.phone}}</td>
+             <td>{{friend.age}}</td>
+           </tr>
+         </table>
+       </div>
+     </file>
+     <file name="script.js">
+       angular.module('orderByExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+           $scope.friends =
+               [{name:'John', phone:'555-1212', age:10},
+                {name:'Mary', phone:'555-9876', age:19},
+                {name:'Mike', phone:'555-4321', age:21},
+                {name:'Adam', phone:'555-5678', age:35},
+                {name:'Julie', phone:'555-8765', age:29}];
+           $scope.predicate = 'age';
+           $scope.reverse = true;
+           $scope.order = function(predicate) {
+             $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
+             $scope.predicate = predicate;
+           };
+         }]);
+      </file>
+     <file name="style.css">
+       .sortorder:after {
+         content: '\25b2';
+       }
+       .sortorder.reverse:after {
+         content: '\25bc';
+       }
+     </file>
+   </example>
+ *
+ * It's also possible to call the orderBy filter manually, by injecting `$filter`, retrieving the
+ * filter routine with `$filter('orderBy')`, and calling the returned filter routine with the
+ * desired parameters.
+ *
+ * Example:
+ *
+ * @example
+  <example module="orderByExample">
+    <file name="index.html">
+    <div ng-controller="ExampleController">
+      <pre>Sorting predicate = {{predicate}}; reverse = {{reverse}}</pre>
+      <table class="friend">
+        <tr>
+          <th>
+              <button ng-click="order('name')">Name</button>
+              <span class="sortorder" ng-show="predicate === 'name'" ng-class="{reverse:reverse}"></span>
+          </th>
+          <th>
+              <button ng-click="order('phone')">Phone Number</button>
+              <span class="sortorder" ng-show="predicate === 'phone'" ng-class="{reverse:reverse}"></span>
+          </th>
+          <th>
+              <button ng-click="order('age')">Age</button>
+              <span class="sortorder" ng-show="predicate === 'age'" ng-class="{reverse:reverse}"></span>
+          </th>
+        </tr>
+        <tr ng-repeat="friend in friends">
+          <td>{{friend.name}}</td>
+          <td>{{friend.phone}}</td>
+          <td>{{friend.age}}</td>
+        </tr>
+      </table>
+    </div>
+    </file>
+
+    <file name="script.js">
+      angular.module('orderByExample', [])
+        .controller('ExampleController', ['$scope', '$filter', function($scope, $filter) {
+          var orderBy = $filter('orderBy');
+          $scope.friends = [
+            { name: 'John',    phone: '555-1212',    age: 10 },
+            { name: 'Mary',    phone: '555-9876',    age: 19 },
+            { name: 'Mike',    phone: '555-4321',    age: 21 },
+            { name: 'Adam',    phone: '555-5678',    age: 35 },
+            { name: 'Julie',   phone: '555-8765',    age: 29 }
+          ];
+          $scope.order = function(predicate) {
+            $scope.predicate = predicate;
+            $scope.reverse = ($scope.predicate === predicate) ? !$scope.reverse : false;
+            $scope.friends = orderBy($scope.friends, predicate, $scope.reverse);
+          };
+          $scope.order('age', true);
+        }]);
+    </file>
+
+    <file name="style.css">
+       .sortorder:after {
+         content: '\25b2';
+       }
+       .sortorder.reverse:after {
+         content: '\25bc';
+       }
+    </file>
+</example>
+ */
+orderByFilter.$inject = ['$parse'];
+function orderByFilter($parse) {
+  return function(array, sortPredicate, reverseOrder) {
+
+    if (!(isArrayLike(array))) return array;
+
+    if (!isArray(sortPredicate)) { sortPredicate = [sortPredicate]; }
+    if (sortPredicate.length === 0) { sortPredicate = ['+']; }
+
+    var predicates = processPredicates(sortPredicate, reverseOrder);
+    // Add a predicate at the end that evaluates to the element index. This makes the
+    // sort stable as it works as a tie-breaker when all the input predicates cannot
+    // distinguish between two elements.
+    predicates.push({ get: function() { return {}; }, descending: reverseOrder ? -1 : 1});
+
+    // The next three lines are a version of a Swartzian Transform idiom from Perl
+    // (sometimes called the Decorate-Sort-Undecorate idiom)
+    // See https://en.wikipedia.org/wiki/Schwartzian_transform
+    var compareValues = Array.prototype.map.call(array, getComparisonObject);
+    compareValues.sort(doComparison);
+    array = compareValues.map(function(item) { return item.value; });
+
+    return array;
+
+    function getComparisonObject(value, index) {
+      return {
+        value: value,
+        predicateValues: predicates.map(function(predicate) {
+          return getPredicateValue(predicate.get(value), index);
+        })
+      };
+    }
+
+    function doComparison(v1, v2) {
+      var result = 0;
+      for (var index=0, length = predicates.length; index < length; ++index) {
+        result = compare(v1.predicateValues[index], v2.predicateValues[index]) * predicates[index].descending;
+        if (result) break;
+      }
+      return result;
+    }
+  };
+
+  function processPredicates(sortPredicate, reverseOrder) {
+    reverseOrder = reverseOrder ? -1 : 1;
+    return sortPredicate.map(function(predicate) {
+      var descending = 1, get = identity;
+
+      if (isFunction(predicate)) {
+        get = predicate;
+      } else if (isString(predicate)) {
+        if ((predicate.charAt(0) == '+' || predicate.charAt(0) == '-')) {
+          descending = predicate.charAt(0) == '-' ? -1 : 1;
+          predicate = predicate.substring(1);
+        }
+        if (predicate !== '') {
+          get = $parse(predicate);
+          if (get.constant) {
+            var key = get();
+            get = function(value) { return value[key]; };
+          }
+        }
+      }
+      return { get: get, descending: descending * reverseOrder };
+    });
+  }
+
+  function isPrimitive(value) {
+    switch (typeof value) {
+      case 'number': /* falls through */
+      case 'boolean': /* falls through */
+      case 'string':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  function objectValue(value, index) {
+    // If `valueOf` is a valid function use that
+    if (typeof value.valueOf === 'function') {
+      value = value.valueOf();
+      if (isPrimitive(value)) return value;
+    }
+    // If `toString` is a valid function and not the one from `Object.prototype` use that
+    if (hasCustomToString(value)) {
+      value = value.toString();
+      if (isPrimitive(value)) return value;
+    }
+    // We have a basic object so we use the position of the object in the collection
+    return index;
+  }
+
+  function getPredicateValue(value, index) {
+    var type = typeof value;
+    if (value === null) {
+      type = 'string';
+      value = 'null';
+    } else if (type === 'string') {
+      value = value.toLowerCase();
+    } else if (type === 'object') {
+      value = objectValue(value, index);
+    }
+    return { value: value, type: type };
+  }
+
+  function compare(v1, v2) {
+    var result = 0;
+    if (v1.type === v2.type) {
+      if (v1.value !== v2.value) {
+        result = v1.value < v2.value ? -1 : 1;
+      }
+    } else {
+      result = v1.type < v2.type ? -1 : 1;
+    }
+    return result;
+  }
+}
+
+function ngDirective(directive) {
+  if (isFunction(directive)) {
+    directive = {
+      link: directive
+    };
+  }
+  directive.restrict = directive.restrict || 'AC';
+  return valueFn(directive);
+}
+
+/**
+ * @ngdoc directive
+ * @name a
+ * @restrict E
+ *
+ * @description
+ * Modifies the default behavior of the html A tag so that the default action is prevented when
+ * the href attribute is empty.
+ *
+ * This change permits the easy creation of action links with the `ngClick` directive
+ * without changing the location or causing page reloads, e.g.:
+ * `<a href="" ng-click="list.addItem()">Add Item</a>`
+ */
+var htmlAnchorDirective = valueFn({
+  restrict: 'E',
+  compile: function(element, attr) {
+    if (!attr.href && !attr.xlinkHref) {
+      return function(scope, element) {
+        // If the linked element is not an anchor tag anymore, do nothing
+        if (element[0].nodeName.toLowerCase() !== 'a') return;
+
+        // SVGAElement does not use the href attribute, but rather the 'xlinkHref' attribute.
+        var href = toString.call(element.prop('href')) === '[object SVGAnimatedString]' ?
+                   'xlink:href' : 'href';
+        element.on('click', function(event) {
+          // if we have no href url, then don't navigate anywhere.
+          if (!element.attr(href)) {
+            event.preventDefault();
+          }
+        });
+      };
+    }
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngHref
+ * @restrict A
+ * @priority 99
+ *
+ * @description
+ * Using Angular markup like `{{hash}}` in an href attribute will
+ * make the link go to the wrong URL if the user clicks it before
+ * Angular has a chance to replace the `{{hash}}` markup with its
+ * value. Until Angular replaces the markup the link will be broken
+ * and will most likely return a 404 error. The `ngHref` directive
+ * solves this problem.
+ *
+ * The wrong way to write it:
+ * ```html
+ * <a href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+ * ```
+ *
+ * The correct way to write it:
+ * ```html
+ * <a ng-href="http://www.gravatar.com/avatar/{{hash}}">link1</a>
+ * ```
+ *
+ * @element A
+ * @param {template} ngHref any string which can contain `{{}}` markup.
+ *
+ * @example
+ * This example shows various combinations of `href`, `ng-href` and `ng-click` attributes
+ * in links and their different behaviors:
+    <example>
+      <file name="index.html">
+        <input ng-model="value" /><br />
+        <a id="link-1" href ng-click="value = 1">link 1</a> (link, don't reload)<br />
+        <a id="link-2" href="" ng-click="value = 2">link 2</a> (link, don't reload)<br />
+        <a id="link-3" ng-href="/{{'123'}}">link 3</a> (link, reload!)<br />
+        <a id="link-4" href="" name="xx" ng-click="value = 4">anchor</a> (link, don't reload)<br />
+        <a id="link-5" name="xxx" ng-click="value = 5">anchor</a> (no link)<br />
+        <a id="link-6" ng-href="{{value}}">link</a> (link, change location)
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should execute ng-click but not reload when href without value', function() {
+          element(by.id('link-1')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('1');
+          expect(element(by.id('link-1')).getAttribute('href')).toBe('');
+        });
+
+        it('should execute ng-click but not reload when href empty string', function() {
+          element(by.id('link-2')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('2');
+          expect(element(by.id('link-2')).getAttribute('href')).toBe('');
+        });
+
+        it('should execute ng-click and change url when ng-href specified', function() {
+          expect(element(by.id('link-3')).getAttribute('href')).toMatch(/\/123$/);
+
+          element(by.id('link-3')).click();
+
+          // At this point, we navigate away from an Angular page, so we need
+          // to use browser.driver to get the base webdriver.
+
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/123$/);
+            });
+          }, 5000, 'page should navigate to /123');
+        });
+
+        it('should execute ng-click but not reload when href empty string and name specified', function() {
+          element(by.id('link-4')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('4');
+          expect(element(by.id('link-4')).getAttribute('href')).toBe('');
+        });
+
+        it('should execute ng-click but not reload when no href but name specified', function() {
+          element(by.id('link-5')).click();
+          expect(element(by.model('value')).getAttribute('value')).toEqual('5');
+          expect(element(by.id('link-5')).getAttribute('href')).toBe(null);
+        });
+
+        it('should only change url when only ng-href', function() {
+          element(by.model('value')).clear();
+          element(by.model('value')).sendKeys('6');
+          expect(element(by.id('link-6')).getAttribute('href')).toMatch(/\/6$/);
+
+          element(by.id('link-6')).click();
+
+          // At this point, we navigate away from an Angular page, so we need
+          // to use browser.driver to get the base webdriver.
+          browser.wait(function() {
+            return browser.driver.getCurrentUrl().then(function(url) {
+              return url.match(/\/6$/);
+            });
+          }, 5000, 'page should navigate to /6');
+        });
+      </file>
+    </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngSrc
+ * @restrict A
+ * @priority 99
+ *
+ * @description
+ * Using Angular markup like `{{hash}}` in a `src` attribute doesn't
+ * work right: The browser will fetch from the URL with the literal
+ * text `{{hash}}` until Angular replaces the expression inside
+ * `{{hash}}`. The `ngSrc` directive solves this problem.
+ *
+ * The buggy way to write it:
+ * ```html
+ * <img src="http://www.gravatar.com/avatar/{{hash}}" alt="Description"/>
+ * ```
+ *
+ * The correct way to write it:
+ * ```html
+ * <img ng-src="http://www.gravatar.com/avatar/{{hash}}" alt="Description" />
+ * ```
+ *
+ * @element IMG
+ * @param {template} ngSrc any string which can contain `{{}}` markup.
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngSrcset
+ * @restrict A
+ * @priority 99
+ *
+ * @description
+ * Using Angular markup like `{{hash}}` in a `srcset` attribute doesn't
+ * work right: The browser will fetch from the URL with the literal
+ * text `{{hash}}` until Angular replaces the expression inside
+ * `{{hash}}`. The `ngSrcset` directive solves this problem.
+ *
+ * The buggy way to write it:
+ * ```html
+ * <img srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description"/>
+ * ```
+ *
+ * The correct way to write it:
+ * ```html
+ * <img ng-srcset="http://www.gravatar.com/avatar/{{hash}} 2x" alt="Description" />
+ * ```
+ *
+ * @element IMG
+ * @param {template} ngSrcset any string which can contain `{{}}` markup.
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngDisabled
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ *
+ * This directive sets the `disabled` attribute on the element if the
+ * {@link guide/expression expression} inside `ngDisabled` evaluates to truthy.
+ *
+ * A special directive is necessary because we cannot use interpolation inside the `disabled`
+ * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Click me to toggle: <input type="checkbox" ng-model="checked"></label><br/>
+        <button ng-model="button" ng-disabled="checked">Button</button>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should toggle button', function() {
+          expect(element(by.css('button')).getAttribute('disabled')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('button')).getAttribute('disabled')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element INPUT
+ * @param {expression} ngDisabled If the {@link guide/expression expression} is truthy,
+ *     then the `disabled` attribute will be set on the element
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngChecked
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ * Sets the `checked` attribute on the element, if the expression inside `ngChecked` is truthy.
+ *
+ * Note that this directive should not be used together with {@link ngModel `ngModel`},
+ * as this can lead to unexpected behavior.
+ *
+ * A special directive is necessary because we cannot use interpolation inside the `checked`
+ * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Check me to check both: <input type="checkbox" ng-model="master"></label><br/>
+        <input id="checkSlave" type="checkbox" ng-checked="master" aria-label="Slave input">
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should check both checkBoxes', function() {
+          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeFalsy();
+          element(by.model('master')).click();
+          expect(element(by.id('checkSlave')).getAttribute('checked')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element INPUT
+ * @param {expression} ngChecked If the {@link guide/expression expression} is truthy,
+ *     then the `checked` attribute will be set on the element
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngReadonly
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ *
+ * Sets the `readOnly` attribute on the element, if the expression inside `ngReadonly` is truthy.
+ *
+ * A special directive is necessary because we cannot use interpolation inside the `readOnly`
+ * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Check me to make text readonly: <input type="checkbox" ng-model="checked"></label><br/>
+        <input type="text" ng-readonly="checked" value="I'm Angular" aria-label="Readonly field" />
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should toggle readonly attr', function() {
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeFalsy();
+          element(by.model('checked')).click();
+          expect(element(by.css('[type="text"]')).getAttribute('readonly')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element INPUT
+ * @param {expression} ngReadonly If the {@link guide/expression expression} is truthy,
+ *     then special attribute "readonly" will be set on the element
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngSelected
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ *
+ * Sets the `selected` attribute on the element, if the expression inside `ngSelected` is truthy.
+ *
+ * A special directive is necessary because we cannot use interpolation inside the `selected`
+ * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <label>Check me to select: <input type="checkbox" ng-model="selected"></label><br/>
+        <select aria-label="ngSelected demo">
+          <option>Hello!</option>
+          <option id="greet" ng-selected="selected">Greetings!</option>
+        </select>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should select Greetings!', function() {
+          expect(element(by.id('greet')).getAttribute('selected')).toBeFalsy();
+          element(by.model('selected')).click();
+          expect(element(by.id('greet')).getAttribute('selected')).toBeTruthy();
+        });
+      </file>
+    </example>
+ *
+ * @element OPTION
+ * @param {expression} ngSelected If the {@link guide/expression expression} is truthy,
+ *     then special attribute "selected" will be set on the element
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngOpen
+ * @restrict A
+ * @priority 100
+ *
+ * @description
+ *
+ * Sets the `open` attribute on the element, if the expression inside `ngOpen` is truthy.
+ *
+ * A special directive is necessary because we cannot use interpolation inside the `open`
+ * attribute. See the {@link guide/interpolation interpolation guide} for more info.
+ *
+ * @example
+     <example>
+       <file name="index.html">
+         <label>Check me check multiple: <input type="checkbox" ng-model="open"></label><br/>
+         <details id="details" ng-open="open">
+            <summary>Show/Hide me</summary>
+         </details>
+       </file>
+       <file name="protractor.js" type="protractor">
+         it('should toggle open', function() {
+           expect(element(by.id('details')).getAttribute('open')).toBeFalsy();
+           element(by.model('open')).click();
+           expect(element(by.id('details')).getAttribute('open')).toBeTruthy();
+         });
+       </file>
+     </example>
+ *
+ * @element DETAILS
+ * @param {expression} ngOpen If the {@link guide/expression expression} is truthy,
+ *     then special attribute "open" will be set on the element
+ */
+
+var ngAttributeAliasDirectives = {};
+
+// boolean attrs are evaluated
+forEach(BOOLEAN_ATTR, function(propName, attrName) {
+  // binding to multiple is not supported
+  if (propName == "multiple") return;
+
+  function defaultLinkFn(scope, element, attr) {
+    scope.$watch(attr[normalized], function ngBooleanAttrWatchAction(value) {
+      attr.$set(attrName, !!value);
+    });
+  }
+
+  var normalized = directiveNormalize('ng-' + attrName);
+  var linkFn = defaultLinkFn;
+
+  if (propName === 'checked') {
+    linkFn = function(scope, element, attr) {
+      // ensuring ngChecked doesn't interfere with ngModel when both are set on the same input
+      if (attr.ngModel !== attr[normalized]) {
+        defaultLinkFn(scope, element, attr);
+      }
+    };
+  }
+
+  ngAttributeAliasDirectives[normalized] = function() {
+    return {
+      restrict: 'A',
+      priority: 100,
+      link: linkFn
+    };
+  };
+});
+
+// aliased input attrs are evaluated
+forEach(ALIASED_ATTR, function(htmlAttr, ngAttr) {
+  ngAttributeAliasDirectives[ngAttr] = function() {
+    return {
+      priority: 100,
+      link: function(scope, element, attr) {
+        //special case ngPattern when a literal regular expression value
+        //is used as the expression (this way we don't have to watch anything).
+        if (ngAttr === "ngPattern" && attr.ngPattern.charAt(0) == "/") {
+          var match = attr.ngPattern.match(REGEX_STRING_REGEXP);
+          if (match) {
+            attr.$set("ngPattern", new RegExp(match[1], match[2]));
+            return;
+          }
+        }
+
+        scope.$watch(attr[ngAttr], function ngAttrAliasWatchAction(value) {
+          attr.$set(ngAttr, value);
+        });
+      }
+    };
+  };
+});
+
+// ng-src, ng-srcset, ng-href are interpolated
+forEach(['src', 'srcset', 'href'], function(attrName) {
+  var normalized = directiveNormalize('ng-' + attrName);
+  ngAttributeAliasDirectives[normalized] = function() {
+    return {
+      priority: 99, // it needs to run after the attributes are interpolated
+      link: function(scope, element, attr) {
+        var propName = attrName,
+            name = attrName;
+
+        if (attrName === 'href' &&
+            toString.call(element.prop('href')) === '[object SVGAnimatedString]') {
+          name = 'xlinkHref';
+          attr.$attr[name] = 'xlink:href';
+          propName = null;
+        }
+
+        attr.$observe(normalized, function(value) {
+          if (!value) {
+            if (attrName === 'href') {
+              attr.$set(name, null);
+            }
+            return;
+          }
+
+          attr.$set(name, value);
+
+          // on IE, if "ng:src" directive declaration is used and "src" attribute doesn't exist
+          // then calling element.setAttribute('src', 'foo') doesn't do anything, so we need
+          // to set the property as well to achieve the desired effect.
+          // we use attr[attrName] value since $set can sanitize the url.
+          if (msie && propName) element.prop(propName, attr[name]);
+        });
+      }
+    };
+  };
+});
+
+/* global -nullFormCtrl, -SUBMITTED_CLASS, addSetValidityMethod: true
+ */
+var nullFormCtrl = {
+  $addControl: noop,
+  $$renameControl: nullFormRenameControl,
+  $removeControl: noop,
+  $setValidity: noop,
+  $setDirty: noop,
+  $setPristine: noop,
+  $setSubmitted: noop
+},
+SUBMITTED_CLASS = 'ng-submitted';
+
+function nullFormRenameControl(control, name) {
+  control.$name = name;
+}
+
+/**
+ * @ngdoc type
+ * @name form.FormController
+ *
+ * @property {boolean} $pristine True if user has not interacted with the form yet.
+ * @property {boolean} $dirty True if user has already interacted with the form.
+ * @property {boolean} $valid True if all of the containing forms and controls are valid.
+ * @property {boolean} $invalid True if at least one containing control or form is invalid.
+ * @property {boolean} $pending True if at least one containing control or form is pending.
+ * @property {boolean} $submitted True if user has submitted the form even if its invalid.
+ *
+ * @property {Object} $error Is an object hash, containing references to controls or
+ *  forms with failing validators, where:
+ *
+ *  - keys are validation tokens (error names),
+ *  - values are arrays of controls or forms that have a failing validator for given error name.
+ *
+ *  Built-in validation tokens:
+ *
+ *  - `email`
+ *  - `max`
+ *  - `maxlength`
+ *  - `min`
+ *  - `minlength`
+ *  - `number`
+ *  - `pattern`
+ *  - `required`
+ *  - `url`
+ *  - `date`
+ *  - `datetimelocal`
+ *  - `time`
+ *  - `week`
+ *  - `month`
+ *
+ * @description
+ * `FormController` keeps track of all its controls and nested forms as well as the state of them,
+ * such as being valid/invalid or dirty/pristine.
+ *
+ * Each {@link ng.directive:form form} directive creates an instance
+ * of `FormController`.
+ *
+ */
+//asks for $scope to fool the BC controller module
+FormController.$inject = ['$element', '$attrs', '$scope', '$animate', '$interpolate'];
+function FormController(element, attrs, $scope, $animate, $interpolate) {
+  var form = this,
+      controls = [];
+
+  // init state
+  form.$error = {};
+  form.$$success = {};
+  form.$pending = undefined;
+  form.$name = $interpolate(attrs.name || attrs.ngForm || '')($scope);
+  form.$dirty = false;
+  form.$pristine = true;
+  form.$valid = true;
+  form.$invalid = false;
+  form.$submitted = false;
+  form.$$parentForm = nullFormCtrl;
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$rollbackViewValue
+   *
+   * @description
+   * Rollback all form controls pending updates to the `$modelValue`.
+   *
+   * Updates may be pending by a debounced event or because the input is waiting for a some future
+   * event defined in `ng-model-options`. This method is typically needed by the reset button of
+   * a form that uses `ng-model-options` to pend updates.
+   */
+  form.$rollbackViewValue = function() {
+    forEach(controls, function(control) {
+      control.$rollbackViewValue();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$commitViewValue
+   *
+   * @description
+   * Commit all form controls pending updates to the `$modelValue`.
+   *
+   * Updates may be pending by a debounced event or because the input is waiting for a some future
+   * event defined in `ng-model-options`. This method is rarely needed as `NgModelController`
+   * usually handles calling this in response to input events.
+   */
+  form.$commitViewValue = function() {
+    forEach(controls, function(control) {
+      control.$commitViewValue();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$addControl
+   * @param {object} control control object, either a {@link form.FormController} or an
+   * {@link ngModel.NgModelController}
+   *
+   * @description
+   * Register a control with the form. Input elements using ngModelController do this automatically
+   * when they are linked.
+   *
+   * Note that the current state of the control will not be reflected on the new parent form. This
+   * is not an issue with normal use, as freshly compiled and linked controls are in a `$pristine`
+   * state.
+   *
+   * However, if the method is used programmatically, for example by adding dynamically created controls,
+   * or controls that have been previously removed without destroying their corresponding DOM element,
+   * it's the developers responsiblity to make sure the current state propagates to the parent form.
+   *
+   * For example, if an input control is added that is already `$dirty` and has `$error` properties,
+   * calling `$setDirty()` and `$validate()` afterwards will propagate the state to the parent form.
+   */
+  form.$addControl = function(control) {
+    // Breaking change - before, inputs whose name was "hasOwnProperty" were quietly ignored
+    // and not added to the scope.  Now we throw an error.
+    assertNotHasOwnProperty(control.$name, 'input');
+    controls.push(control);
+
+    if (control.$name) {
+      form[control.$name] = control;
+    }
+
+    control.$$parentForm = form;
+  };
+
+  // Private API: rename a form control
+  form.$$renameControl = function(control, newName) {
+    var oldName = control.$name;
+
+    if (form[oldName] === control) {
+      delete form[oldName];
+    }
+    form[newName] = control;
+    control.$name = newName;
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$removeControl
+   * @param {object} control control object, either a {@link form.FormController} or an
+   * {@link ngModel.NgModelController}
+   *
+   * @description
+   * Deregister a control from the form.
+   *
+   * Input elements using ngModelController do this automatically when they are destroyed.
+   *
+   * Note that only the removed control's validation state (`$errors`etc.) will be removed from the
+   * form. `$dirty`, `$submitted` states will not be changed, because the expected behavior can be
+   * different from case to case. For example, removing the only `$dirty` control from a form may or
+   * may not mean that the form is still `$dirty`.
+   */
+  form.$removeControl = function(control) {
+    if (control.$name && form[control.$name] === control) {
+      delete form[control.$name];
+    }
+    forEach(form.$pending, function(value, name) {
+      form.$setValidity(name, null, control);
+    });
+    forEach(form.$error, function(value, name) {
+      form.$setValidity(name, null, control);
+    });
+    forEach(form.$$success, function(value, name) {
+      form.$setValidity(name, null, control);
+    });
+
+    arrayRemove(controls, control);
+    control.$$parentForm = nullFormCtrl;
+  };
+
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setValidity
+   *
+   * @description
+   * Sets the validity of a form control.
+   *
+   * This method will also propagate to parent forms.
+   */
+  addSetValidityMethod({
+    ctrl: this,
+    $element: element,
+    set: function(object, property, controller) {
+      var list = object[property];
+      if (!list) {
+        object[property] = [controller];
+      } else {
+        var index = list.indexOf(controller);
+        if (index === -1) {
+          list.push(controller);
+        }
+      }
+    },
+    unset: function(object, property, controller) {
+      var list = object[property];
+      if (!list) {
+        return;
+      }
+      arrayRemove(list, controller);
+      if (list.length === 0) {
+        delete object[property];
+      }
+    },
+    $animate: $animate
+  });
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setDirty
+   *
+   * @description
+   * Sets the form to a dirty state.
+   *
+   * This method can be called to add the 'ng-dirty' class and set the form to a dirty
+   * state (ng-dirty class). This method will also propagate to parent forms.
+   */
+  form.$setDirty = function() {
+    $animate.removeClass(element, PRISTINE_CLASS);
+    $animate.addClass(element, DIRTY_CLASS);
+    form.$dirty = true;
+    form.$pristine = false;
+    form.$$parentForm.$setDirty();
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setPristine
+   *
+   * @description
+   * Sets the form to its pristine state.
+   *
+   * This method can be called to remove the 'ng-dirty' class and set the form to its pristine
+   * state (ng-pristine class). This method will also propagate to all the controls contained
+   * in this form.
+   *
+   * Setting a form back to a pristine state is often useful when we want to 'reuse' a form after
+   * saving or resetting it.
+   */
+  form.$setPristine = function() {
+    $animate.setClass(element, PRISTINE_CLASS, DIRTY_CLASS + ' ' + SUBMITTED_CLASS);
+    form.$dirty = false;
+    form.$pristine = true;
+    form.$submitted = false;
+    forEach(controls, function(control) {
+      control.$setPristine();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setUntouched
+   *
+   * @description
+   * Sets the form to its untouched state.
+   *
+   * This method can be called to remove the 'ng-touched' class and set the form controls to their
+   * untouched state (ng-untouched class).
+   *
+   * Setting a form controls back to their untouched state is often useful when setting the form
+   * back to its pristine state.
+   */
+  form.$setUntouched = function() {
+    forEach(controls, function(control) {
+      control.$setUntouched();
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name form.FormController#$setSubmitted
+   *
+   * @description
+   * Sets the form to its submitted state.
+   */
+  form.$setSubmitted = function() {
+    $animate.addClass(element, SUBMITTED_CLASS);
+    form.$submitted = true;
+    form.$$parentForm.$setSubmitted();
+  };
+}
+
+/**
+ * @ngdoc directive
+ * @name ngForm
+ * @restrict EAC
+ *
+ * @description
+ * Nestable alias of {@link ng.directive:form `form`} directive. HTML
+ * does not allow nesting of form elements. It is useful to nest forms, for example if the validity of a
+ * sub-group of controls needs to be determined.
+ *
+ * Note: the purpose of `ngForm` is to group controls,
+ * but not to be a replacement for the `<form>` tag with all of its capabilities
+ * (e.g. posting to the server, ...).
+ *
+ * @param {string=} ngForm|name Name of the form. If specified, the form controller will be published into
+ *                       related scope, under this name.
+ *
+ */
+
+ /**
+ * @ngdoc directive
+ * @name form
+ * @restrict E
+ *
+ * @description
+ * Directive that instantiates
+ * {@link form.FormController FormController}.
+ *
+ * If the `name` attribute is specified, the form controller is published onto the current scope under
+ * this name.
+ *
+ * # Alias: {@link ng.directive:ngForm `ngForm`}
+ *
+ * In Angular, forms can be nested. This means that the outer form is valid when all of the child
+ * forms are valid as well. However, browsers do not allow nesting of `<form>` elements, so
+ * Angular provides the {@link ng.directive:ngForm `ngForm`} directive, which behaves identically to
+ * `form` but can be nested. Nested forms can be useful, for example, if the validity of a sub-group
+ * of controls needs to be determined.
+ *
+ * # CSS classes
+ *  - `ng-valid` is set if the form is valid.
+ *  - `ng-invalid` is set if the form is invalid.
+ *  - `ng-pending` is set if the form is pending.
+ *  - `ng-pristine` is set if the form is pristine.
+ *  - `ng-dirty` is set if the form is dirty.
+ *  - `ng-submitted` is set if the form was submitted.
+ *
+ * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+ *
+ *
+ * # Submitting a form and preventing the default action
+ *
+ * Since the role of forms in client-side Angular applications is different than in classical
+ * roundtrip apps, it is desirable for the browser not to translate the form submission into a full
+ * page reload that sends the data to the server. Instead some javascript logic should be triggered
+ * to handle the form submission in an application-specific way.
+ *
+ * For this reason, Angular prevents the default action (form submission to the server) unless the
+ * `<form>` element has an `action` attribute specified.
+ *
+ * You can use one of the following two ways to specify what javascript method should be called when
+ * a form is submitted:
+ *
+ * - {@link ng.directive:ngSubmit ngSubmit} directive on the form element
+ * - {@link ng.directive:ngClick ngClick} directive on the first
+  *  button or input field of type submit (input[type=submit])
+ *
+ * To prevent double execution of the handler, use only one of the {@link ng.directive:ngSubmit ngSubmit}
+ * or {@link ng.directive:ngClick ngClick} directives.
+ * This is because of the following form submission rules in the HTML specification:
+ *
+ * - If a form has only one input field then hitting enter in this field triggers form submit
+ * (`ngSubmit`)
+ * - if a form has 2+ input fields and no buttons or input[type=submit] then hitting enter
+ * doesn't trigger submit
+ * - if a form has one or more input fields and one or more buttons or input[type=submit] then
+ * hitting enter in any of the input fields will trigger the click handler on the *first* button or
+ * input[type=submit] (`ngClick`) *and* a submit handler on the enclosing form (`ngSubmit`)
+ *
+ * Any pending `ngModelOptions` changes will take place immediately when an enclosing form is
+ * submitted. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+ * to have access to the updated model.
+ *
+ * ## Animation Hooks
+ *
+ * Animations in ngForm are triggered when any of the associated CSS classes are added and removed.
+ * These classes are: `.ng-pristine`, `.ng-dirty`, `.ng-invalid` and `.ng-valid` as well as any
+ * other validations that are performed within the form. Animations in ngForm are similar to how
+ * they work in ngClass and animations can be hooked into using CSS transitions, keyframes as well
+ * as JS animations.
+ *
+ * The following example shows a simple way to utilize CSS transitions to style a form element
+ * that has been rendered as invalid after it has been validated:
+ *
+ * <pre>
+ * //be sure to include ngAnimate as a module to hook into more
+ * //advanced animations
+ * .my-form {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+ * .my-form.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+ * </pre>
+ *
+ * @example
+    <example deps="angular-animate.js" animations="true" fixBase="true" module="formExample">
+      <file name="index.html">
+       <script>
+         angular.module('formExample', [])
+           .controller('FormController', ['$scope', function($scope) {
+             $scope.userType = 'guest';
+           }]);
+       </script>
+       <style>
+        .my-form {
+          transition:all linear 0.5s;
+          background: transparent;
+        }
+        .my-form.ng-invalid {
+          background: red;
+        }
+       </style>
+       <form name="myForm" ng-controller="FormController" class="my-form">
+         userType: <input name="input" ng-model="userType" required>
+         <span class="error" ng-show="myForm.input.$error.required">Required!</span><br>
+         <code>userType = {{userType}}</code><br>
+         <code>myForm.input.$valid = {{myForm.input.$valid}}</code><br>
+         <code>myForm.input.$error = {{myForm.input.$error}}</code><br>
+         <code>myForm.$valid = {{myForm.$valid}}</code><br>
+         <code>myForm.$error.required = {{!!myForm.$error.required}}</code><br>
+        </form>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should initialize to model', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+
+          expect(userType.getText()).toContain('guest');
+          expect(valid.getText()).toContain('true');
+        });
+
+        it('should be invalid if empty', function() {
+          var userType = element(by.binding('userType'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var userInput = element(by.model('userType'));
+
+          userInput.clear();
+          userInput.sendKeys('');
+
+          expect(userType.getText()).toEqual('userType =');
+          expect(valid.getText()).toContain('false');
+        });
+      </file>
+    </example>
+ *
+ * @param {string=} name Name of the form. If specified, the form controller will be published into
+ *                       related scope, under this name.
+ */
+var formDirectiveFactory = function(isNgForm) {
+  return ['$timeout', '$parse', function($timeout, $parse) {
+    var formDirective = {
+      name: 'form',
+      restrict: isNgForm ? 'EAC' : 'E',
+      require: ['form', '^^?form'], //first is the form's own ctrl, second is an optional parent form
+      controller: FormController,
+      compile: function ngFormCompile(formElement, attr) {
+        // Setup initial state of the control
+        formElement.addClass(PRISTINE_CLASS).addClass(VALID_CLASS);
+
+        var nameAttr = attr.name ? 'name' : (isNgForm && attr.ngForm ? 'ngForm' : false);
+
+        return {
+          pre: function ngFormPreLink(scope, formElement, attr, ctrls) {
+            var controller = ctrls[0];
+
+            // if `action` attr is not present on the form, prevent the default action (submission)
+            if (!('action' in attr)) {
+              // we can't use jq events because if a form is destroyed during submission the default
+              // action is not prevented. see #1238
+              //
+              // IE 9 is not affected because it doesn't fire a submit event and try to do a full
+              // page reload if the form was destroyed by submission of the form via a click handler
+              // on a button in the form. Looks like an IE9 specific bug.
+              var handleFormSubmission = function(event) {
+                scope.$apply(function() {
+                  controller.$commitViewValue();
+                  controller.$setSubmitted();
+                });
+
+                event.preventDefault();
+              };
+
+              addEventListenerFn(formElement[0], 'submit', handleFormSubmission);
+
+              // unregister the preventDefault listener so that we don't not leak memory but in a
+              // way that will achieve the prevention of the default action.
+              formElement.on('$destroy', function() {
+                $timeout(function() {
+                  removeEventListenerFn(formElement[0], 'submit', handleFormSubmission);
+                }, 0, false);
+              });
+            }
+
+            var parentFormCtrl = ctrls[1] || controller.$$parentForm;
+            parentFormCtrl.$addControl(controller);
+
+            var setter = nameAttr ? getSetter(controller.$name) : noop;
+
+            if (nameAttr) {
+              setter(scope, controller);
+              attr.$observe(nameAttr, function(newValue) {
+                if (controller.$name === newValue) return;
+                setter(scope, undefined);
+                controller.$$parentForm.$$renameControl(controller, newValue);
+                setter = getSetter(controller.$name);
+                setter(scope, controller);
+              });
+            }
+            formElement.on('$destroy', function() {
+              controller.$$parentForm.$removeControl(controller);
+              setter(scope, undefined);
+              extend(controller, nullFormCtrl); //stop propagating child destruction handlers upwards
+            });
+          }
+        };
+      }
+    };
+
+    return formDirective;
+
+    function getSetter(expression) {
+      if (expression === '') {
+        //create an assignable expression, so forms with an empty name can be renamed later
+        return $parse('this[""]').assign;
+      }
+      return $parse(expression).assign || noop;
+    }
+  }];
+};
+
+var formDirective = formDirectiveFactory();
+var ngFormDirective = formDirectiveFactory(true);
+
+/* global VALID_CLASS: false,
+  INVALID_CLASS: false,
+  PRISTINE_CLASS: false,
+  DIRTY_CLASS: false,
+  UNTOUCHED_CLASS: false,
+  TOUCHED_CLASS: false,
+  ngModelMinErr: false,
+*/
+
+// Regex code is obtained from SO: https://stackoverflow.com/questions/3143070/javascript-regex-iso-datetime#answer-3143231
+var ISO_DATE_REGEXP = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/;
+// See valid URLs in RFC3987 (http://tools.ietf.org/html/rfc3987)
+// Note: We are being more lenient, because browsers are too.
+//   1. Scheme
+//   2. Slashes
+//   3. Username
+//   4. Password
+//   5. Hostname
+//   6. Port
+//   7. Path
+//   8. Query
+//   9. Fragment
+//                 1111111111111111 222   333333    44444        555555555555555555555555    666     77777777     8888888     999
+var URL_REGEXP = /^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i;
+var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
+var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/;
+var DATE_REGEXP = /^(\d{4})-(\d{2})-(\d{2})$/;
+var DATETIMELOCAL_REGEXP = /^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+var WEEK_REGEXP = /^(\d{4})-W(\d\d)$/;
+var MONTH_REGEXP = /^(\d{4})-(\d\d)$/;
+var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
+
+var inputType = {
+
+  /**
+   * @ngdoc input
+   * @name input[text]
+   *
+   * @description
+   * Standard HTML text input with angular data binding, inherited by most of the `input` elements.
+   *
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} required Adds `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+   *    This parameter is ignored for input[type=password] controls, which will never trim the
+   *    input.
+   *
+   * @example
+      <example name="text-input-directive" module="textInputExample">
+        <file name="index.html">
+         <script>
+           angular.module('textInputExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 text: 'guest',
+                 word: /^\s*\w*\s*$/
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>Single word:
+             <input type="text" name="input" ng-model="example.text"
+                    ng-pattern="example.word" required ng-trim="false">
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.pattern">
+               Single word only!</span>
+           </div>
+           <tt>text = {{example.text}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          var text = element(by.binding('example.text'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('example.text'));
+
+          it('should initialize to model', function() {
+            expect(text.getText()).toContain('guest');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if multi word', function() {
+            input.clear();
+            input.sendKeys('hello world');
+
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'text': textInputType,
+
+    /**
+     * @ngdoc input
+     * @name input[date]
+     *
+     * @description
+     * Input with date validation and transformation. In browsers that do not yet support
+     * the HTML5 date input, a text element will be used. In that case, text must be entered in a valid ISO-8601
+     * date format (yyyy-MM-dd), for example: `2009-01-06`. Since many
+     * modern browsers do not yet support this input type, it is important to provide cues to users on the
+     * expected input format via a placeholder or label.
+     *
+     * The model must always be a Date object, otherwise Angular will throw an error.
+     * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+     *
+     * The timezone to be used to read/write the `Date` instance in the model can be defined using
+     * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+     *
+     * @param {string} ngModel Assignable angular expression to data-bind to.
+     * @param {string=} name Property name of the form under which the control is published.
+     * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`. This must be a
+     *   valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+     *   (e.g. `min="{{minDate | date:'yyyy-MM-dd'}}"`). Note that `min` will also add native HTML5
+     *   constraint validation.
+     * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`. This must be
+     *   a valid ISO date string (yyyy-MM-dd). You can also use interpolation inside this attribute
+     *   (e.g. `max="{{maxDate | date:'yyyy-MM-dd'}}"`). Note that `max` will also add native HTML5
+     *   constraint validation.
+     * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO date string
+     *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+     * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO date string
+     *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+     * @param {string=} required Sets `required` validation error key if the value is not entered.
+     * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+     *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+     *    `required` when you want to data-bind to the `required` attribute.
+     * @param {string=} ngChange Angular expression to be executed when input changes due to user
+     *    interaction with the input element.
+     *
+     * @example
+     <example name="date-input-directive" module="dateInputExample">
+     <file name="index.html">
+       <script>
+          angular.module('dateInputExample', [])
+            .controller('DateController', ['$scope', function($scope) {
+              $scope.example = {
+                value: new Date(2013, 9, 22)
+              };
+            }]);
+       </script>
+       <form name="myForm" ng-controller="DateController as dateCtrl">
+          <label for="exampleInput">Pick a date in 2013:</label>
+          <input type="date" id="exampleInput" name="input" ng-model="example.value"
+              placeholder="yyyy-MM-dd" min="2013-01-01" max="2013-12-31" required />
+          <div role="alert">
+            <span class="error" ng-show="myForm.input.$error.required">
+                Required!</span>
+            <span class="error" ng-show="myForm.input.$error.date">
+                Not a valid date!</span>
+           </div>
+           <tt>value = {{example.value | date: "yyyy-MM-dd"}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+       </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+        var value = element(by.binding('example.value | date: "yyyy-MM-dd"'));
+        var valid = element(by.binding('myForm.input.$valid'));
+        var input = element(by.model('example.value'));
+
+        // currently protractor/webdriver does not support
+        // sending keys to all known HTML5 input controls
+        // for various browsers (see https://github.com/angular/protractor/issues/562).
+        function setInput(val) {
+          // set the value of the element and force validation.
+          var scr = "var ipt = document.getElementById('exampleInput'); " +
+          "ipt.value = '" + val + "';" +
+          "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+          browser.executeScript(scr);
+        }
+
+        it('should initialize to model', function() {
+          expect(value.getText()).toContain('2013-10-22');
+          expect(valid.getText()).toContain('myForm.input.$valid = true');
+        });
+
+        it('should be invalid if empty', function() {
+          setInput('');
+          expect(value.getText()).toEqual('value =');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
+
+        it('should be invalid if over max', function() {
+          setInput('2015-01-01');
+          expect(value.getText()).toContain('');
+          expect(valid.getText()).toContain('myForm.input.$valid = false');
+        });
+     </file>
+     </example>
+     */
+  'date': createDateInputType('date', DATE_REGEXP,
+         createDateParser(DATE_REGEXP, ['yyyy', 'MM', 'dd']),
+         'yyyy-MM-dd'),
+
+   /**
+    * @ngdoc input
+    * @name input[datetime-local]
+    *
+    * @description
+    * Input with datetime validation and transformation. In browsers that do not yet support
+    * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+    * local datetime format (yyyy-MM-ddTHH:mm:ss), for example: `2010-12-28T14:57:00`.
+    *
+    * The model must always be a Date object, otherwise Angular will throw an error.
+    * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+    *
+    * The timezone to be used to read/write the `Date` instance in the model can be defined using
+    * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+    *
+    * @param {string} ngModel Assignable angular expression to data-bind to.
+    * @param {string=} name Property name of the form under which the control is published.
+    * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+    *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+    *   inside this attribute (e.g. `min="{{minDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+    *   Note that `min` will also add native HTML5 constraint validation.
+    * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+    *   This must be a valid ISO datetime format (yyyy-MM-ddTHH:mm:ss). You can also use interpolation
+    *   inside this attribute (e.g. `max="{{maxDatetimeLocal | date:'yyyy-MM-ddTHH:mm:ss'}}"`).
+    *   Note that `max` will also add native HTML5 constraint validation.
+    * @param {(date|string)=} ngMin Sets the `min` validation error key to the Date / ISO datetime string
+    *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+    * @param {(date|string)=} ngMax Sets the `max` validation error key to the Date / ISO datetime string
+    *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+    * @param {string=} required Sets `required` validation error key if the value is not entered.
+    * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+    *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+    *    `required` when you want to data-bind to the `required` attribute.
+    * @param {string=} ngChange Angular expression to be executed when input changes due to user
+    *    interaction with the input element.
+    *
+    * @example
+    <example name="datetimelocal-input-directive" module="dateExample">
+    <file name="index.html">
+      <script>
+        angular.module('dateExample', [])
+          .controller('DateController', ['$scope', function($scope) {
+            $scope.example = {
+              value: new Date(2010, 11, 28, 14, 57)
+            };
+          }]);
+      </script>
+      <form name="myForm" ng-controller="DateController as dateCtrl">
+        <label for="exampleInput">Pick a date between in 2013:</label>
+        <input type="datetime-local" id="exampleInput" name="input" ng-model="example.value"
+            placeholder="yyyy-MM-ddTHH:mm:ss" min="2001-01-01T00:00:00" max="2013-12-31T00:00:00" required />
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.datetimelocal">
+              Not a valid date!</span>
+        </div>
+        <tt>value = {{example.value | date: "yyyy-MM-ddTHH:mm:ss"}}</tt><br/>
+        <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+        <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+        <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+        <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+      </form>
+    </file>
+    <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "yyyy-MM-ddTHH:mm:ss"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('2010-12-28T14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('2015-01-01T23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+    </file>
+    </example>
+    */
+  'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
+      createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
+      'yyyy-MM-ddTHH:mm:ss.sss'),
+
+  /**
+   * @ngdoc input
+   * @name input[time]
+   *
+   * @description
+   * Input with time validation and transformation. In browsers that do not yet support
+   * the HTML5 date input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+   * local time format (HH:mm:ss), for example: `14:57:00`. Model must be a Date object. This binding will always output a
+   * Date object to the model of January 1, 1970, or local date `new Date(1970, 0, 1, HH, mm, ss)`.
+   *
+   * The model must always be a Date object, otherwise Angular will throw an error.
+   * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+   *
+   * The timezone to be used to read/write the `Date` instance in the model can be defined using
+   * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+   *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+   *   attribute (e.g. `min="{{minTime | date:'HH:mm:ss'}}"`). Note that `min` will also add
+   *   native HTML5 constraint validation.
+   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+   *   This must be a valid ISO time format (HH:mm:ss). You can also use interpolation inside this
+   *   attribute (e.g. `max="{{maxTime | date:'HH:mm:ss'}}"`). Note that `max` will also add
+   *   native HTML5 constraint validation.
+   * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO time string the
+   *   `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+   * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO time string the
+   *   `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+   <example name="time-input-directive" module="timeExample">
+   <file name="index.html">
+     <script>
+      angular.module('timeExample', [])
+        .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(1970, 0, 1, 14, 57, 0)
+          };
+        }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+        <label for="exampleInput">Pick a between 8am and 5pm:</label>
+        <input type="time" id="exampleInput" name="input" ng-model="example.value"
+            placeholder="HH:mm:ss" min="08:00:00" max="17:00:00" required />
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.time">
+              Not a valid date!</span>
+        </div>
+        <tt>value = {{example.value | date: "HH:mm:ss"}}</tt><br/>
+        <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+        <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+        <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+        <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+   </file>
+   <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "HH:mm:ss"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('14:57:00');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('23:59:00');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+   </file>
+   </example>
+   */
+  'time': createDateInputType('time', TIME_REGEXP,
+      createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
+     'HH:mm:ss.sss'),
+
+   /**
+    * @ngdoc input
+    * @name input[week]
+    *
+    * @description
+    * Input with week-of-the-year validation and transformation to Date. In browsers that do not yet support
+    * the HTML5 week input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+    * week format (yyyy-W##), for example: `2013-W02`.
+    *
+    * The model must always be a Date object, otherwise Angular will throw an error.
+    * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+    *
+    * The timezone to be used to read/write the `Date` instance in the model can be defined using
+    * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+    *
+    * @param {string} ngModel Assignable angular expression to data-bind to.
+    * @param {string=} name Property name of the form under which the control is published.
+    * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+    *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+    *   attribute (e.g. `min="{{minWeek | date:'yyyy-Www'}}"`). Note that `min` will also add
+    *   native HTML5 constraint validation.
+    * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+    *   This must be a valid ISO week format (yyyy-W##). You can also use interpolation inside this
+    *   attribute (e.g. `max="{{maxWeek | date:'yyyy-Www'}}"`). Note that `max` will also add
+    *   native HTML5 constraint validation.
+    * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+    *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+    * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+    *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+    * @param {string=} required Sets `required` validation error key if the value is not entered.
+    * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+    *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+    *    `required` when you want to data-bind to the `required` attribute.
+    * @param {string=} ngChange Angular expression to be executed when input changes due to user
+    *    interaction with the input element.
+    *
+    * @example
+    <example name="week-input-directive" module="weekExample">
+    <file name="index.html">
+      <script>
+      angular.module('weekExample', [])
+        .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 0, 3)
+          };
+        }]);
+      </script>
+      <form name="myForm" ng-controller="DateController as dateCtrl">
+        <label>Pick a date between in 2013:
+          <input id="exampleInput" type="week" name="input" ng-model="example.value"
+                 placeholder="YYYY-W##" min="2012-W32"
+                 max="2013-W52" required />
+        </label>
+        <div role="alert">
+          <span class="error" ng-show="myForm.input.$error.required">
+              Required!</span>
+          <span class="error" ng-show="myForm.input.$error.week">
+              Not a valid date!</span>
+        </div>
+        <tt>value = {{example.value | date: "yyyy-Www"}}</tt><br/>
+        <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+        <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+        <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+        <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+      </form>
+    </file>
+    <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "yyyy-Www"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-W01');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('2015-W01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+    </file>
+    </example>
+    */
+  'week': createDateInputType('week', WEEK_REGEXP, weekParser, 'yyyy-Www'),
+
+  /**
+   * @ngdoc input
+   * @name input[month]
+   *
+   * @description
+   * Input with month validation and transformation. In browsers that do not yet support
+   * the HTML5 month input, a text element will be used. In that case, the text must be entered in a valid ISO-8601
+   * month format (yyyy-MM), for example: `2009-01`.
+   *
+   * The model must always be a Date object, otherwise Angular will throw an error.
+   * Invalid `Date` objects (dates whose `getTime()` is `NaN`) will be rendered as an empty string.
+   * If the model is not set to the first of the month, the next view to model update will set it
+   * to the first of the month.
+   *
+   * The timezone to be used to read/write the `Date` instance in the model can be defined using
+   * {@link ng.directive:ngModelOptions ngModelOptions}. By default, this is the timezone of the browser.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+   *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+   *   attribute (e.g. `min="{{minMonth | date:'yyyy-MM'}}"`). Note that `min` will also add
+   *   native HTML5 constraint validation.
+   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+   *   This must be a valid ISO month format (yyyy-MM). You can also use interpolation inside this
+   *   attribute (e.g. `max="{{maxMonth | date:'yyyy-MM'}}"`). Note that `max` will also add
+   *   native HTML5 constraint validation.
+   * @param {(date|string)=} ngMin Sets the `min` validation constraint to the Date / ISO week string
+   *   the `ngMin` expression evaluates to. Note that it does not set the `min` attribute.
+   * @param {(date|string)=} ngMax Sets the `max` validation constraint to the Date / ISO week string
+   *   the `ngMax` expression evaluates to. Note that it does not set the `max` attribute.
+
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+   <example name="month-input-directive" module="monthExample">
+   <file name="index.html">
+     <script>
+      angular.module('monthExample', [])
+        .controller('DateController', ['$scope', function($scope) {
+          $scope.example = {
+            value: new Date(2013, 9, 1)
+          };
+        }]);
+     </script>
+     <form name="myForm" ng-controller="DateController as dateCtrl">
+       <label for="exampleInput">Pick a month in 2013:</label>
+       <input id="exampleInput" type="month" name="input" ng-model="example.value"
+          placeholder="yyyy-MM" min="2013-01" max="2013-12" required />
+       <div role="alert">
+         <span class="error" ng-show="myForm.input.$error.required">
+            Required!</span>
+         <span class="error" ng-show="myForm.input.$error.month">
+            Not a valid month!</span>
+       </div>
+       <tt>value = {{example.value | date: "yyyy-MM"}}</tt><br/>
+       <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+       <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+       <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+       <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+     </form>
+   </file>
+   <file name="protractor.js" type="protractor">
+      var value = element(by.binding('example.value | date: "yyyy-MM"'));
+      var valid = element(by.binding('myForm.input.$valid'));
+      var input = element(by.model('example.value'));
+
+      // currently protractor/webdriver does not support
+      // sending keys to all known HTML5 input controls
+      // for various browsers (https://github.com/angular/protractor/issues/562).
+      function setInput(val) {
+        // set the value of the element and force validation.
+        var scr = "var ipt = document.getElementById('exampleInput'); " +
+        "ipt.value = '" + val + "';" +
+        "angular.element(ipt).scope().$apply(function(s) { s.myForm[ipt.name].$setViewValue('" + val + "'); });";
+        browser.executeScript(scr);
+      }
+
+      it('should initialize to model', function() {
+        expect(value.getText()).toContain('2013-10');
+        expect(valid.getText()).toContain('myForm.input.$valid = true');
+      });
+
+      it('should be invalid if empty', function() {
+        setInput('');
+        expect(value.getText()).toEqual('value =');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+
+      it('should be invalid if over max', function() {
+        setInput('2015-01');
+        expect(value.getText()).toContain('');
+        expect(valid.getText()).toContain('myForm.input.$valid = false');
+      });
+   </file>
+   </example>
+   */
+  'month': createDateInputType('month', MONTH_REGEXP,
+     createDateParser(MONTH_REGEXP, ['yyyy', 'MM']),
+     'yyyy-MM'),
+
+  /**
+   * @ngdoc input
+   * @name input[number]
+   *
+   * @description
+   * Text input with number validation and transformation. Sets the `number` validation
+   * error if not a valid number.
+   *
+   * <div class="alert alert-warning">
+   * The model must always be of type `number` otherwise Angular will throw an error.
+   * Be aware that a string containing a number is not enough. See the {@link ngModel:numfmt}
+   * error docs for more information and an example of how to convert your model if necessary.
+   * </div>
+   *
+   * ## Issues with HTML5 constraint validation
+   *
+   * In browsers that follow the
+   * [HTML5 specification](https://html.spec.whatwg.org/multipage/forms.html#number-state-%28type=number%29),
+   * `input[number]` does not work as expected with {@link ngModelOptions `ngModelOptions.allowInvalid`}.
+   * If a non-number is entered in the input, the browser will report the value as an empty string,
+   * which means the view / model values in `ngModel` and subsequently the scope value
+   * will also be an empty string.
+   *
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} min Sets the `min` validation error key if the value entered is less than `min`.
+   * @param {string=} max Sets the `max` validation error key if the value entered is greater than `max`.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="number-input-directive" module="numberExample">
+        <file name="index.html">
+         <script>
+           angular.module('numberExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.example = {
+                 value: 12
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>Number:
+             <input type="number" name="input" ng-model="example.value"
+                    min="0" max="99" required>
+          </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.number">
+               Not valid number!</span>
+           </div>
+           <tt>value = {{example.value}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          var value = element(by.binding('example.value'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('example.value'));
+
+          it('should initialize to model', function() {
+            expect(value.getText()).toContain('12');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if over max', function() {
+            input.clear();
+            input.sendKeys('123');
+            expect(value.getText()).toEqual('value =');
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'number': numberInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[url]
+   *
+   * @description
+   * Text input with URL validation. Sets the `url` validation error key if the content is not a
+   * valid URL.
+   *
+   * <div class="alert alert-warning">
+   * **Note:** `input[url]` uses a regex to validate urls that is derived from the regex
+   * used in Chromium. If you need stricter validation, you can use `ng-pattern` or modify
+   * the built-in validators (see the {@link guide/forms Forms guide})
+   * </div>
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="url-input-directive" module="urlExample">
+        <file name="index.html">
+         <script>
+           angular.module('urlExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.url = {
+                 text: 'http://google.com'
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>URL:
+             <input type="url" name="input" ng-model="url.text" required>
+           <label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.input.$error.required">
+               Required!</span>
+             <span class="error" ng-show="myForm.input.$error.url">
+               Not valid url!</span>
+           </div>
+           <tt>text = {{url.text}}</tt><br/>
+           <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+           <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+           <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+           <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+           <tt>myForm.$error.url = {{!!myForm.$error.url}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          var text = element(by.binding('url.text'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('url.text'));
+
+          it('should initialize to model', function() {
+            expect(text.getText()).toContain('http://google.com');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if not url', function() {
+            input.clear();
+            input.sendKeys('box');
+
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'url': urlInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[email]
+   *
+   * @description
+   * Text input with email validation. Sets the `email` validation error key if not a valid email
+   * address.
+   *
+   * <div class="alert alert-warning">
+   * **Note:** `input[email]` uses a regex to validate email addresses that is derived from the regex
+   * used in Chromium. If you need stricter validation (e.g. requiring a top-level domain), you can
+   * use `ng-pattern` or modify the built-in validators (see the {@link guide/forms Forms guide})
+   * </div>
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} required Sets `required` validation error key if the value is not entered.
+   * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+   *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+   *    `required` when you want to data-bind to the `required` attribute.
+   * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+   *    minlength.
+   * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+   *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of
+   *    any length.
+   * @param {string=} pattern Similar to `ngPattern` except that the attribute value is the actual string
+   *    that contains the regular expression body that will be converted to a regular expression
+   *    as in the ngPattern directive.
+   * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+   *    a RegExp found by evaluating the Angular expression given in the attribute value.
+   *    If the expression evaluates to a RegExp object, then this is used directly.
+   *    If the expression evaluates to a string, then it will be converted to a RegExp
+   *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+   *    `new RegExp('^abc$')`.<br />
+   *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+   *    start at the index of the last search's match, thus not taking the whole input value into
+   *    account.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="email-input-directive" module="emailExample">
+        <file name="index.html">
+         <script>
+           angular.module('emailExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.email = {
+                 text: 'me@example.com'
+               };
+             }]);
+         </script>
+           <form name="myForm" ng-controller="ExampleController">
+             <label>Email:
+               <input type="email" name="input" ng-model="email.text" required>
+             </label>
+             <div role="alert">
+               <span class="error" ng-show="myForm.input.$error.required">
+                 Required!</span>
+               <span class="error" ng-show="myForm.input.$error.email">
+                 Not valid email!</span>
+             </div>
+             <tt>text = {{email.text}}</tt><br/>
+             <tt>myForm.input.$valid = {{myForm.input.$valid}}</tt><br/>
+             <tt>myForm.input.$error = {{myForm.input.$error}}</tt><br/>
+             <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+             <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+             <tt>myForm.$error.email = {{!!myForm.$error.email}}</tt><br/>
+           </form>
+         </file>
+        <file name="protractor.js" type="protractor">
+          var text = element(by.binding('email.text'));
+          var valid = element(by.binding('myForm.input.$valid'));
+          var input = element(by.model('email.text'));
+
+          it('should initialize to model', function() {
+            expect(text.getText()).toContain('me@example.com');
+            expect(valid.getText()).toContain('true');
+          });
+
+          it('should be invalid if empty', function() {
+            input.clear();
+            input.sendKeys('');
+            expect(text.getText()).toEqual('text =');
+            expect(valid.getText()).toContain('false');
+          });
+
+          it('should be invalid if not email', function() {
+            input.clear();
+            input.sendKeys('xxx');
+
+            expect(valid.getText()).toContain('false');
+          });
+        </file>
+      </example>
+   */
+  'email': emailInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[radio]
+   *
+   * @description
+   * HTML radio button.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string} value The value to which the `ngModel` expression should be set when selected.
+   *    Note that `value` only supports `string` values, i.e. the scope model needs to be a string,
+   *    too. Use `ngValue` if you need complex models (`number`, `object`, ...).
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   * @param {string} ngValue Angular expression to which `ngModel` will be be set when the radio
+   *    is selected. Should be used instead of the `value` attribute if you need
+   *    a non-string `ngModel` (`boolean`, `array`, ...).
+   *
+   * @example
+      <example name="radio-input-directive" module="radioExample">
+        <file name="index.html">
+         <script>
+           angular.module('radioExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.color = {
+                 name: 'blue'
+               };
+               $scope.specialValue = {
+                 "id": "12345",
+                 "value": "green"
+               };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>
+             <input type="radio" ng-model="color.name" value="red">
+             Red
+           </label><br/>
+           <label>
+             <input type="radio" ng-model="color.name" ng-value="specialValue">
+             Green
+           </label><br/>
+           <label>
+             <input type="radio" ng-model="color.name" value="blue">
+             Blue
+           </label><br/>
+           <tt>color = {{color.name | json}}</tt><br/>
+          </form>
+          Note that `ng-value="specialValue"` sets radio item's value to be the value of `$scope.specialValue`.
+        </file>
+        <file name="protractor.js" type="protractor">
+          it('should change state', function() {
+            var color = element(by.binding('color.name'));
+
+            expect(color.getText()).toContain('blue');
+
+            element.all(by.model('color.name')).get(0).click();
+
+            expect(color.getText()).toContain('red');
+          });
+        </file>
+      </example>
+   */
+  'radio': radioInputType,
+
+
+  /**
+   * @ngdoc input
+   * @name input[checkbox]
+   *
+   * @description
+   * HTML checkbox.
+   *
+   * @param {string} ngModel Assignable angular expression to data-bind to.
+   * @param {string=} name Property name of the form under which the control is published.
+   * @param {expression=} ngTrueValue The value to which the expression should be set when selected.
+   * @param {expression=} ngFalseValue The value to which the expression should be set when not selected.
+   * @param {string=} ngChange Angular expression to be executed when input changes due to user
+   *    interaction with the input element.
+   *
+   * @example
+      <example name="checkbox-input-directive" module="checkboxExample">
+        <file name="index.html">
+         <script>
+           angular.module('checkboxExample', [])
+             .controller('ExampleController', ['$scope', function($scope) {
+               $scope.checkboxModel = {
+                value1 : true,
+                value2 : 'YES'
+              };
+             }]);
+         </script>
+         <form name="myForm" ng-controller="ExampleController">
+           <label>Value1:
+             <input type="checkbox" ng-model="checkboxModel.value1">
+           </label><br/>
+           <label>Value2:
+             <input type="checkbox" ng-model="checkboxModel.value2"
+                    ng-true-value="'YES'" ng-false-value="'NO'">
+            </label><br/>
+           <tt>value1 = {{checkboxModel.value1}}</tt><br/>
+           <tt>value2 = {{checkboxModel.value2}}</tt><br/>
+          </form>
+        </file>
+        <file name="protractor.js" type="protractor">
+          it('should change state', function() {
+            var value1 = element(by.binding('checkboxModel.value1'));
+            var value2 = element(by.binding('checkboxModel.value2'));
+
+            expect(value1.getText()).toContain('true');
+            expect(value2.getText()).toContain('YES');
+
+            element(by.model('checkboxModel.value1')).click();
+            element(by.model('checkboxModel.value2')).click();
+
+            expect(value1.getText()).toContain('false');
+            expect(value2.getText()).toContain('NO');
+          });
+        </file>
+      </example>
+   */
+  'checkbox': checkboxInputType,
+
+  'hidden': noop,
+  'button': noop,
+  'submit': noop,
+  'reset': noop,
+  'file': noop
+};
+
+function stringBasedInputType(ctrl) {
+  ctrl.$formatters.push(function(value) {
+    return ctrl.$isEmpty(value) ? value : value.toString();
+  });
+}
+
+function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+  stringBasedInputType(ctrl);
+}
+
+function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  var type = lowercase(element[0].type);
+
+  // In composition mode, users are still inputing intermediate text buffer,
+  // hold the listener until composition is done.
+  // More about composition events: https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent
+  if (!$sniffer.android) {
+    var composing = false;
+
+    element.on('compositionstart', function(data) {
+      composing = true;
+    });
+
+    element.on('compositionend', function() {
+      composing = false;
+      listener();
+    });
+  }
+
+  var listener = function(ev) {
+    if (timeout) {
+      $browser.defer.cancel(timeout);
+      timeout = null;
+    }
+    if (composing) return;
+    var value = element.val(),
+        event = ev && ev.type;
+
+    // By default we will trim the value
+    // If the attribute ng-trim exists we will avoid trimming
+    // If input type is 'password', the value is never trimmed
+    if (type !== 'password' && (!attr.ngTrim || attr.ngTrim !== 'false')) {
+      value = trim(value);
+    }
+
+    // If a control is suffering from bad input (due to native validators), browsers discard its
+    // value, so it may be necessary to revalidate (by calling $setViewValue again) even if the
+    // control's value is the same empty value twice in a row.
+    if (ctrl.$viewValue !== value || (value === '' && ctrl.$$hasNativeValidators)) {
+      ctrl.$setViewValue(value, event);
+    }
+  };
+
+  // if the browser does support "input" event, we are fine - except on IE9 which doesn't fire the
+  // input event on backspace, delete or cut
+  if ($sniffer.hasEvent('input')) {
+    element.on('input', listener);
+  } else {
+    var timeout;
+
+    var deferListener = function(ev, input, origValue) {
+      if (!timeout) {
+        timeout = $browser.defer(function() {
+          timeout = null;
+          if (!input || input.value !== origValue) {
+            listener(ev);
+          }
+        });
+      }
+    };
+
+    element.on('keydown', function(event) {
+      var key = event.keyCode;
+
+      // ignore
+      //    command            modifiers                   arrows
+      if (key === 91 || (15 < key && key < 19) || (37 <= key && key <= 40)) return;
+
+      deferListener(event, this, this.value);
+    });
+
+    // if user modifies input value using context menu in IE, we need "paste" and "cut" events to catch it
+    if ($sniffer.hasEvent('paste')) {
+      element.on('paste cut', deferListener);
+    }
+  }
+
+  // if user paste into input using mouse on older browser
+  // or form autocomplete on newer browser, we need "change" event to catch it
+  element.on('change', listener);
+
+  ctrl.$render = function() {
+    // Workaround for Firefox validation #12102.
+    var value = ctrl.$isEmpty(ctrl.$viewValue) ? '' : ctrl.$viewValue;
+    if (element.val() !== value) {
+      element.val(value);
+    }
+  };
+}
+
+function weekParser(isoWeek, existingDate) {
+  if (isDate(isoWeek)) {
+    return isoWeek;
+  }
+
+  if (isString(isoWeek)) {
+    WEEK_REGEXP.lastIndex = 0;
+    var parts = WEEK_REGEXP.exec(isoWeek);
+    if (parts) {
+      var year = +parts[1],
+          week = +parts[2],
+          hours = 0,
+          minutes = 0,
+          seconds = 0,
+          milliseconds = 0,
+          firstThurs = getFirstThursdayOfYear(year),
+          addDays = (week - 1) * 7;
+
+      if (existingDate) {
+        hours = existingDate.getHours();
+        minutes = existingDate.getMinutes();
+        seconds = existingDate.getSeconds();
+        milliseconds = existingDate.getMilliseconds();
+      }
+
+      return new Date(year, 0, firstThurs.getDate() + addDays, hours, minutes, seconds, milliseconds);
+    }
+  }
+
+  return NaN;
+}
+
+function createDateParser(regexp, mapping) {
+  return function(iso, date) {
+    var parts, map;
+
+    if (isDate(iso)) {
+      return iso;
+    }
+
+    if (isString(iso)) {
+      // When a date is JSON'ified to wraps itself inside of an extra
+      // set of double quotes. This makes the date parsing code unable
+      // to match the date string and parse it as a date.
+      if (iso.charAt(0) == '"' && iso.charAt(iso.length - 1) == '"') {
+        iso = iso.substring(1, iso.length - 1);
+      }
+      if (ISO_DATE_REGEXP.test(iso)) {
+        return new Date(iso);
+      }
+      regexp.lastIndex = 0;
+      parts = regexp.exec(iso);
+
+      if (parts) {
+        parts.shift();
+        if (date) {
+          map = {
+            yyyy: date.getFullYear(),
+            MM: date.getMonth() + 1,
+            dd: date.getDate(),
+            HH: date.getHours(),
+            mm: date.getMinutes(),
+            ss: date.getSeconds(),
+            sss: date.getMilliseconds() / 1000
+          };
+        } else {
+          map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
+        }
+
+        forEach(parts, function(part, index) {
+          if (index < mapping.length) {
+            map[mapping[index]] = +part;
+          }
+        });
+        return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
+      }
+    }
+
+    return NaN;
+  };
+}
+
+function createDateInputType(type, regexp, parseDate, format) {
+  return function dynamicDateInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter) {
+    badInputChecker(scope, element, attr, ctrl);
+    baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+    var timezone = ctrl && ctrl.$options && ctrl.$options.timezone;
+    var previousDate;
+
+    ctrl.$$parserName = type;
+    ctrl.$parsers.push(function(value) {
+      if (ctrl.$isEmpty(value)) return null;
+      if (regexp.test(value)) {
+        // Note: We cannot read ctrl.$modelValue, as there might be a different
+        // parser/formatter in the processing chain so that the model
+        // contains some different data format!
+        var parsedDate = parseDate(value, previousDate);
+        if (timezone) {
+          parsedDate = convertTimezoneToLocal(parsedDate, timezone);
+        }
+        return parsedDate;
+      }
+      return undefined;
+    });
+
+    ctrl.$formatters.push(function(value) {
+      if (value && !isDate(value)) {
+        throw ngModelMinErr('datefmt', 'Expected `{0}` to be a date', value);
+      }
+      if (isValidDate(value)) {
+        previousDate = value;
+        if (previousDate && timezone) {
+          previousDate = convertTimezoneToLocal(previousDate, timezone, true);
+        }
+        return $filter('date')(value, format, timezone);
+      } else {
+        previousDate = null;
+        return '';
+      }
+    });
+
+    if (isDefined(attr.min) || attr.ngMin) {
+      var minVal;
+      ctrl.$validators.min = function(value) {
+        return !isValidDate(value) || isUndefined(minVal) || parseDate(value) >= minVal;
+      };
+      attr.$observe('min', function(val) {
+        minVal = parseObservedDateValue(val);
+        ctrl.$validate();
+      });
+    }
+
+    if (isDefined(attr.max) || attr.ngMax) {
+      var maxVal;
+      ctrl.$validators.max = function(value) {
+        return !isValidDate(value) || isUndefined(maxVal) || parseDate(value) <= maxVal;
+      };
+      attr.$observe('max', function(val) {
+        maxVal = parseObservedDateValue(val);
+        ctrl.$validate();
+      });
+    }
+
+    function isValidDate(value) {
+      // Invalid Date: getTime() returns NaN
+      return value && !(value.getTime && value.getTime() !== value.getTime());
+    }
+
+    function parseObservedDateValue(val) {
+      return isDefined(val) && !isDate(val) ? parseDate(val) || undefined : val;
+    }
+  };
+}
+
+function badInputChecker(scope, element, attr, ctrl) {
+  var node = element[0];
+  var nativeValidation = ctrl.$$hasNativeValidators = isObject(node.validity);
+  if (nativeValidation) {
+    ctrl.$parsers.push(function(value) {
+      var validity = element.prop(VALIDITY_STATE_PROPERTY) || {};
+      // Detect bug in FF35 for input[email] (https://bugzilla.mozilla.org/show_bug.cgi?id=1064430):
+      // - also sets validity.badInput (should only be validity.typeMismatch).
+      // - see http://www.whatwg.org/specs/web-apps/current-work/multipage/forms.html#e-mail-state-(type=email)
+      // - can ignore this case as we can still read out the erroneous email...
+      return validity.badInput && !validity.typeMismatch ? undefined : value;
+    });
+  }
+}
+
+function numberInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  badInputChecker(scope, element, attr, ctrl);
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+
+  ctrl.$$parserName = 'number';
+  ctrl.$parsers.push(function(value) {
+    if (ctrl.$isEmpty(value))      return null;
+    if (NUMBER_REGEXP.test(value)) return parseFloat(value);
+    return undefined;
+  });
+
+  ctrl.$formatters.push(function(value) {
+    if (!ctrl.$isEmpty(value)) {
+      if (!isNumber(value)) {
+        throw ngModelMinErr('numfmt', 'Expected `{0}` to be a number', value);
+      }
+      value = value.toString();
+    }
+    return value;
+  });
+
+  if (isDefined(attr.min) || attr.ngMin) {
+    var minVal;
+    ctrl.$validators.min = function(value) {
+      return ctrl.$isEmpty(value) || isUndefined(minVal) || value >= minVal;
+    };
+
+    attr.$observe('min', function(val) {
+      if (isDefined(val) && !isNumber(val)) {
+        val = parseFloat(val, 10);
+      }
+      minVal = isNumber(val) && !isNaN(val) ? val : undefined;
+      // TODO(matsko): implement validateLater to reduce number of validations
+      ctrl.$validate();
+    });
+  }
+
+  if (isDefined(attr.max) || attr.ngMax) {
+    var maxVal;
+    ctrl.$validators.max = function(value) {
+      return ctrl.$isEmpty(value) || isUndefined(maxVal) || value <= maxVal;
+    };
+
+    attr.$observe('max', function(val) {
+      if (isDefined(val) && !isNumber(val)) {
+        val = parseFloat(val, 10);
+      }
+      maxVal = isNumber(val) && !isNaN(val) ? val : undefined;
+      // TODO(matsko): implement validateLater to reduce number of validations
+      ctrl.$validate();
+    });
+  }
+}
+
+function urlInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  // Note: no badInputChecker here by purpose as `url` is only a validation
+  // in browsers, i.e. we can always read out input.value even if it is not valid!
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+  stringBasedInputType(ctrl);
+
+  ctrl.$$parserName = 'url';
+  ctrl.$validators.url = function(modelValue, viewValue) {
+    var value = modelValue || viewValue;
+    return ctrl.$isEmpty(value) || URL_REGEXP.test(value);
+  };
+}
+
+function emailInputType(scope, element, attr, ctrl, $sniffer, $browser) {
+  // Note: no badInputChecker here by purpose as `url` is only a validation
+  // in browsers, i.e. we can always read out input.value even if it is not valid!
+  baseInputType(scope, element, attr, ctrl, $sniffer, $browser);
+  stringBasedInputType(ctrl);
+
+  ctrl.$$parserName = 'email';
+  ctrl.$validators.email = function(modelValue, viewValue) {
+    var value = modelValue || viewValue;
+    return ctrl.$isEmpty(value) || EMAIL_REGEXP.test(value);
+  };
+}
+
+function radioInputType(scope, element, attr, ctrl) {
+  // make the name unique, if not defined
+  if (isUndefined(attr.name)) {
+    element.attr('name', nextUid());
+  }
+
+  var listener = function(ev) {
+    if (element[0].checked) {
+      ctrl.$setViewValue(attr.value, ev && ev.type);
+    }
+  };
+
+  element.on('click', listener);
+
+  ctrl.$render = function() {
+    var value = attr.value;
+    element[0].checked = (value == ctrl.$viewValue);
+  };
+
+  attr.$observe('value', ctrl.$render);
+}
+
+function parseConstantExpr($parse, context, name, expression, fallback) {
+  var parseFn;
+  if (isDefined(expression)) {
+    parseFn = $parse(expression);
+    if (!parseFn.constant) {
+      throw ngModelMinErr('constexpr', 'Expected constant expression for `{0}`, but saw ' +
+                                   '`{1}`.', name, expression);
+    }
+    return parseFn(context);
+  }
+  return fallback;
+}
+
+function checkboxInputType(scope, element, attr, ctrl, $sniffer, $browser, $filter, $parse) {
+  var trueValue = parseConstantExpr($parse, scope, 'ngTrueValue', attr.ngTrueValue, true);
+  var falseValue = parseConstantExpr($parse, scope, 'ngFalseValue', attr.ngFalseValue, false);
+
+  var listener = function(ev) {
+    ctrl.$setViewValue(element[0].checked, ev && ev.type);
+  };
+
+  element.on('click', listener);
+
+  ctrl.$render = function() {
+    element[0].checked = ctrl.$viewValue;
+  };
+
+  // Override the standard `$isEmpty` because the $viewValue of an empty checkbox is always set to `false`
+  // This is because of the parser below, which compares the `$modelValue` with `trueValue` to convert
+  // it to a boolean.
+  ctrl.$isEmpty = function(value) {
+    return value === false;
+  };
+
+  ctrl.$formatters.push(function(value) {
+    return equals(value, trueValue);
+  });
+
+  ctrl.$parsers.push(function(value) {
+    return value ? trueValue : falseValue;
+  });
+}
+
+
+/**
+ * @ngdoc directive
+ * @name textarea
+ * @restrict E
+ *
+ * @description
+ * HTML textarea element control with angular data-binding. The data-binding and validation
+ * properties of this element are exactly the same as those of the
+ * {@link ng.directive:input input element}.
+ *
+ * @param {string} ngModel Assignable angular expression to data-bind to.
+ * @param {string=} name Property name of the form under which the control is published.
+ * @param {string=} required Sets `required` validation error key if the value is not entered.
+ * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+ *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+ *    `required` when you want to data-bind to the `required` attribute.
+ * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+ *    minlength.
+ * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+ *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+ *    length.
+ * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+ *    a RegExp found by evaluating the Angular expression given in the attribute value.
+ *    If the expression evaluates to a RegExp object, then this is used directly.
+ *    If the expression evaluates to a string, then it will be converted to a RegExp
+ *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+ *    `new RegExp('^abc$')`.<br />
+ *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+ *    start at the index of the last search's match, thus not taking the whole input value into
+ *    account.
+ * @param {string=} ngChange Angular expression to be executed when input changes due to user
+ *    interaction with the input element.
+ * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name input
+ * @restrict E
+ *
+ * @description
+ * HTML input element control. When used together with {@link ngModel `ngModel`}, it provides data-binding,
+ * input state control, and validation.
+ * Input control follows HTML5 input types and polyfills the HTML5 validation behavior for older browsers.
+ *
+ * <div class="alert alert-warning">
+ * **Note:** Not every feature offered is available for all input types.
+ * Specifically, data binding and event handling via `ng-model` is unsupported for `input[file]`.
+ * </div>
+ *
+ * @param {string} ngModel Assignable angular expression to data-bind to.
+ * @param {string=} name Property name of the form under which the control is published.
+ * @param {string=} required Sets `required` validation error key if the value is not entered.
+ * @param {boolean=} ngRequired Sets `required` attribute if set to true
+ * @param {number=} ngMinlength Sets `minlength` validation error key if the value is shorter than
+ *    minlength.
+ * @param {number=} ngMaxlength Sets `maxlength` validation error key if the value is longer than
+ *    maxlength. Setting the attribute to a negative or non-numeric value, allows view values of any
+ *    length.
+ * @param {string=} ngPattern Sets `pattern` validation error key if the ngModel value does not match
+ *    a RegExp found by evaluating the Angular expression given in the attribute value.
+ *    If the expression evaluates to a RegExp object, then this is used directly.
+ *    If the expression evaluates to a string, then it will be converted to a RegExp
+ *    after wrapping it in `^` and `$` characters. For instance, `"abc"` will be converted to
+ *    `new RegExp('^abc$')`.<br />
+ *    **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+ *    start at the index of the last search's match, thus not taking the whole input value into
+ *    account.
+ * @param {string=} ngChange Angular expression to be executed when input changes due to user
+ *    interaction with the input element.
+ * @param {boolean=} [ngTrim=true] If set to false Angular will not automatically trim the input.
+ *    This parameter is ignored for input[type=password] controls, which will never trim the
+ *    input.
+ *
+ * @example
+    <example name="input-directive" module="inputExample">
+      <file name="index.html">
+       <script>
+          angular.module('inputExample', [])
+            .controller('ExampleController', ['$scope', function($scope) {
+              $scope.user = {name: 'guest', last: 'visitor'};
+            }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <form name="myForm">
+           <label>
+              User name:
+              <input type="text" name="userName" ng-model="user.name" required>
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.userName.$error.required">
+              Required!</span>
+           </div>
+           <label>
+              Last name:
+              <input type="text" name="lastName" ng-model="user.last"
+              ng-minlength="3" ng-maxlength="10">
+           </label>
+           <div role="alert">
+             <span class="error" ng-show="myForm.lastName.$error.minlength">
+               Too short!</span>
+             <span class="error" ng-show="myForm.lastName.$error.maxlength">
+               Too long!</span>
+           </div>
+         </form>
+         <hr>
+         <tt>user = {{user}}</tt><br/>
+         <tt>myForm.userName.$valid = {{myForm.userName.$valid}}</tt><br/>
+         <tt>myForm.userName.$error = {{myForm.userName.$error}}</tt><br/>
+         <tt>myForm.lastName.$valid = {{myForm.lastName.$valid}}</tt><br/>
+         <tt>myForm.lastName.$error = {{myForm.lastName.$error}}</tt><br/>
+         <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+         <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+         <tt>myForm.$error.minlength = {{!!myForm.$error.minlength}}</tt><br/>
+         <tt>myForm.$error.maxlength = {{!!myForm.$error.maxlength}}</tt><br/>
+       </div>
+      </file>
+      <file name="protractor.js" type="protractor">
+        var user = element(by.exactBinding('user'));
+        var userNameValid = element(by.binding('myForm.userName.$valid'));
+        var lastNameValid = element(by.binding('myForm.lastName.$valid'));
+        var lastNameError = element(by.binding('myForm.lastName.$error'));
+        var formValid = element(by.binding('myForm.$valid'));
+        var userNameInput = element(by.model('user.name'));
+        var userLastInput = element(by.model('user.last'));
+
+        it('should initialize to model', function() {
+          expect(user.getText()).toContain('{"name":"guest","last":"visitor"}');
+          expect(userNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+        it('should be invalid if empty when required', function() {
+          userNameInput.clear();
+          userNameInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"last":"visitor"}');
+          expect(userNameValid.getText()).toContain('false');
+          expect(formValid.getText()).toContain('false');
+        });
+
+        it('should be valid if empty when min length is set', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('');
+
+          expect(user.getText()).toContain('{"name":"guest","last":""}');
+          expect(lastNameValid.getText()).toContain('true');
+          expect(formValid.getText()).toContain('true');
+        });
+
+        it('should be invalid if less than required min length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('xx');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('minlength');
+          expect(formValid.getText()).toContain('false');
+        });
+
+        it('should be invalid if longer than max length', function() {
+          userLastInput.clear();
+          userLastInput.sendKeys('some ridiculously long name');
+
+          expect(user.getText()).toContain('{"name":"guest"}');
+          expect(lastNameValid.getText()).toContain('false');
+          expect(lastNameError.getText()).toContain('maxlength');
+          expect(formValid.getText()).toContain('false');
+        });
+      </file>
+    </example>
+ */
+var inputDirective = ['$browser', '$sniffer', '$filter', '$parse',
+    function($browser, $sniffer, $filter, $parse) {
+  return {
+    restrict: 'E',
+    require: ['?ngModel'],
+    link: {
+      pre: function(scope, element, attr, ctrls) {
+        if (ctrls[0]) {
+          (inputType[lowercase(attr.type)] || inputType.text)(scope, element, attr, ctrls[0], $sniffer,
+                                                              $browser, $filter, $parse);
+        }
+      }
+    }
+  };
+}];
+
+
+
+var CONSTANT_VALUE_REGEXP = /^(true|false|\d+)$/;
+/**
+ * @ngdoc directive
+ * @name ngValue
+ *
+ * @description
+ * Binds the given expression to the value of `<option>` or {@link input[radio] `input[radio]`},
+ * so that when the element is selected, the {@link ngModel `ngModel`} of that element is set to
+ * the bound value.
+ *
+ * `ngValue` is useful when dynamically generating lists of radio buttons using
+ * {@link ngRepeat `ngRepeat`}, as shown below.
+ *
+ * Likewise, `ngValue` can be used to generate `<option>` elements for
+ * the {@link select `select`} element. In that case however, only strings are supported
+ * for the `value `attribute, so the resulting `ngModel` will always be a string.
+ * Support for `select` models with non-string values is available via `ngOptions`.
+ *
+ * @element input
+ * @param {string=} ngValue angular expression, whose value will be bound to the `value` attribute
+ *   of the `input` element
+ *
+ * @example
+    <example name="ngValue-directive" module="valueExample">
+      <file name="index.html">
+       <script>
+          angular.module('valueExample', [])
+            .controller('ExampleController', ['$scope', function($scope) {
+              $scope.names = ['pizza', 'unicorns', 'robots'];
+              $scope.my = { favorite: 'unicorns' };
+            }]);
+       </script>
+        <form ng-controller="ExampleController">
+          <h2>Which is your favorite?</h2>
+            <label ng-repeat="name in names" for="{{name}}">
+              {{name}}
+              <input type="radio"
+                     ng-model="my.favorite"
+                     ng-value="name"
+                     id="{{name}}"
+                     name="favorite">
+            </label>
+          <div>You chose {{my.favorite}}</div>
+        </form>
+      </file>
+      <file name="protractor.js" type="protractor">
+        var favorite = element(by.binding('my.favorite'));
+
+        it('should initialize to model', function() {
+          expect(favorite.getText()).toContain('unicorns');
+        });
+        it('should bind the values to the inputs', function() {
+          element.all(by.model('my.favorite')).get(0).click();
+          expect(favorite.getText()).toContain('pizza');
+        });
+      </file>
+    </example>
+ */
+var ngValueDirective = function() {
+  return {
+    restrict: 'A',
+    priority: 100,
+    compile: function(tpl, tplAttr) {
+      if (CONSTANT_VALUE_REGEXP.test(tplAttr.ngValue)) {
+        return function ngValueConstantLink(scope, elm, attr) {
+          attr.$set('value', scope.$eval(attr.ngValue));
+        };
+      } else {
+        return function ngValueLink(scope, elm, attr) {
+          scope.$watch(attr.ngValue, function valueWatchAction(value) {
+            attr.$set('value', value);
+          });
+        };
+      }
+    }
+  };
+};
+
+/**
+ * @ngdoc directive
+ * @name ngBind
+ * @restrict AC
+ *
+ * @description
+ * The `ngBind` attribute tells Angular to replace the text content of the specified HTML element
+ * with the value of a given expression, and to update the text content when the value of that
+ * expression changes.
+ *
+ * Typically, you don't use `ngBind` directly, but instead you use the double curly markup like
+ * `{{ expression }}` which is similar but less verbose.
+ *
+ * It is preferable to use `ngBind` instead of `{{ expression }}` if a template is momentarily
+ * displayed by the browser in its raw state before Angular compiles it. Since `ngBind` is an
+ * element attribute, it makes the bindings invisible to the user while the page is loading.
+ *
+ * An alternative solution to this problem would be using the
+ * {@link ng.directive:ngCloak ngCloak} directive.
+ *
+ *
+ * @element ANY
+ * @param {expression} ngBind {@link guide/expression Expression} to evaluate.
+ *
+ * @example
+ * Enter a name in the Live Preview text box; the greeting below the text box changes instantly.
+   <example module="bindExample">
+     <file name="index.html">
+       <script>
+         angular.module('bindExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.name = 'Whirled';
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <label>Enter name: <input type="text" ng-model="name"></label><br>
+         Hello <span ng-bind="name"></span>!
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-bind', function() {
+         var nameInput = element(by.model('name'));
+
+         expect(element(by.binding('name')).getText()).toBe('Whirled');
+         nameInput.clear();
+         nameInput.sendKeys('world');
+         expect(element(by.binding('name')).getText()).toBe('world');
+       });
+     </file>
+   </example>
+ */
+var ngBindDirective = ['$compile', function($compile) {
+  return {
+    restrict: 'AC',
+    compile: function ngBindCompile(templateElement) {
+      $compile.$$addBindingClass(templateElement);
+      return function ngBindLink(scope, element, attr) {
+        $compile.$$addBindingInfo(element, attr.ngBind);
+        element = element[0];
+        scope.$watch(attr.ngBind, function ngBindWatchAction(value) {
+          element.textContent = isUndefined(value) ? '' : value;
+        });
+      };
+    }
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngBindTemplate
+ *
+ * @description
+ * The `ngBindTemplate` directive specifies that the element
+ * text content should be replaced with the interpolation of the template
+ * in the `ngBindTemplate` attribute.
+ * Unlike `ngBind`, the `ngBindTemplate` can contain multiple `{{` `}}`
+ * expressions. This directive is needed since some HTML elements
+ * (such as TITLE and OPTION) cannot contain SPAN elements.
+ *
+ * @element ANY
+ * @param {string} ngBindTemplate template of form
+ *   <tt>{{</tt> <tt>expression</tt> <tt>}}</tt> to eval.
+ *
+ * @example
+ * Try it here: enter text in text box and watch the greeting change.
+   <example module="bindExample">
+     <file name="index.html">
+       <script>
+         angular.module('bindExample', [])
+           .controller('ExampleController', ['$scope', function($scope) {
+             $scope.salutation = 'Hello';
+             $scope.name = 'World';
+           }]);
+       </script>
+       <div ng-controller="ExampleController">
+        <label>Salutation: <input type="text" ng-model="salutation"></label><br>
+        <label>Name: <input type="text" ng-model="name"></label><br>
+        <pre ng-bind-template="{{salutation}} {{name}}!"></pre>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-bind', function() {
+         var salutationElem = element(by.binding('salutation'));
+         var salutationInput = element(by.model('salutation'));
+         var nameInput = element(by.model('name'));
+
+         expect(salutationElem.getText()).toBe('Hello World!');
+
+         salutationInput.clear();
+         salutationInput.sendKeys('Greetings');
+         nameInput.clear();
+         nameInput.sendKeys('user');
+
+         expect(salutationElem.getText()).toBe('Greetings user!');
+       });
+     </file>
+   </example>
+ */
+var ngBindTemplateDirective = ['$interpolate', '$compile', function($interpolate, $compile) {
+  return {
+    compile: function ngBindTemplateCompile(templateElement) {
+      $compile.$$addBindingClass(templateElement);
+      return function ngBindTemplateLink(scope, element, attr) {
+        var interpolateFn = $interpolate(element.attr(attr.$attr.ngBindTemplate));
+        $compile.$$addBindingInfo(element, interpolateFn.expressions);
+        element = element[0];
+        attr.$observe('ngBindTemplate', function(value) {
+          element.textContent = isUndefined(value) ? '' : value;
+        });
+      };
+    }
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngBindHtml
+ *
+ * @description
+ * Evaluates the expression and inserts the resulting HTML into the element in a secure way. By default,
+ * the resulting HTML content will be sanitized using the {@link ngSanitize.$sanitize $sanitize} service.
+ * To utilize this functionality, ensure that `$sanitize` is available, for example, by including {@link
+ * ngSanitize} in your module's dependencies (not in core Angular). In order to use {@link ngSanitize}
+ * in your module's dependencies, you need to include "angular-sanitize.js" in your application.
+ *
+ * You may also bypass sanitization for values you know are safe. To do so, bind to
+ * an explicitly trusted value via {@link ng.$sce#trustAsHtml $sce.trustAsHtml}.  See the example
+ * under {@link ng.$sce#show-me-an-example-using-sce- Strict Contextual Escaping (SCE)}.
+ *
+ * Note: If a `$sanitize` service is unavailable and the bound value isn't explicitly trusted, you
+ * will have an exception (instead of an exploit.)
+ *
+ * @element ANY
+ * @param {expression} ngBindHtml {@link guide/expression Expression} to evaluate.
+ *
+ * @example
+
+   <example module="bindHtmlExample" deps="angular-sanitize.js">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+        <p ng-bind-html="myHTML"></p>
+       </div>
+     </file>
+
+     <file name="script.js">
+       angular.module('bindHtmlExample', ['ngSanitize'])
+         .controller('ExampleController', ['$scope', function($scope) {
+           $scope.myHTML =
+              'I am an <code>HTML</code>string with ' +
+              '<a href="#">links!</a> and other <em>stuff</em>';
+         }]);
+     </file>
+
+     <file name="protractor.js" type="protractor">
+       it('should check ng-bind-html', function() {
+         expect(element(by.binding('myHTML')).getText()).toBe(
+             'I am an HTMLstring with links! and other stuff');
+       });
+     </file>
+   </example>
+ */
+var ngBindHtmlDirective = ['$sce', '$parse', '$compile', function($sce, $parse, $compile) {
+  return {
+    restrict: 'A',
+    compile: function ngBindHtmlCompile(tElement, tAttrs) {
+      var ngBindHtmlGetter = $parse(tAttrs.ngBindHtml);
+      var ngBindHtmlWatch = $parse(tAttrs.ngBindHtml, function getStringValue(value) {
+        return (value || '').toString();
+      });
+      $compile.$$addBindingClass(tElement);
+
+      return function ngBindHtmlLink(scope, element, attr) {
+        $compile.$$addBindingInfo(element, attr.ngBindHtml);
+
+        scope.$watch(ngBindHtmlWatch, function ngBindHtmlWatchAction() {
+          // we re-evaluate the expr because we want a TrustedValueHolderType
+          // for $sce, not a string
+          element.html($sce.getTrustedHtml(ngBindHtmlGetter(scope)) || '');
+        });
+      };
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngChange
+ *
+ * @description
+ * Evaluate the given expression when the user changes the input.
+ * The expression is evaluated immediately, unlike the JavaScript onchange event
+ * which only triggers at the end of a change (usually, when the user leaves the
+ * form element or presses the return key).
+ *
+ * The `ngChange` expression is only evaluated when a change in the input value causes
+ * a new value to be committed to the model.
+ *
+ * It will not be evaluated:
+ * * if the value returned from the `$parsers` transformation pipeline has not changed
+ * * if the input has continued to be invalid since the model will stay `null`
+ * * if the model is changed programmatically and not by a change to the input value
+ *
+ *
+ * Note, this directive requires `ngModel` to be present.
+ *
+ * @element input
+ * @param {expression} ngChange {@link guide/expression Expression} to evaluate upon change
+ * in input value.
+ *
+ * @example
+ * <example name="ngChange-directive" module="changeExample">
+ *   <file name="index.html">
+ *     <script>
+ *       angular.module('changeExample', [])
+ *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.counter = 0;
+ *           $scope.change = function() {
+ *             $scope.counter++;
+ *           };
+ *         }]);
+ *     </script>
+ *     <div ng-controller="ExampleController">
+ *       <input type="checkbox" ng-model="confirmed" ng-change="change()" id="ng-change-example1" />
+ *       <input type="checkbox" ng-model="confirmed" id="ng-change-example2" />
+ *       <label for="ng-change-example2">Confirmed</label><br />
+ *       <tt>debug = {{confirmed}}</tt><br/>
+ *       <tt>counter = {{counter}}</tt><br/>
+ *     </div>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     var counter = element(by.binding('counter'));
+ *     var debug = element(by.binding('confirmed'));
+ *
+ *     it('should evaluate the expression if changing from view', function() {
+ *       expect(counter.getText()).toContain('0');
+ *
+ *       element(by.id('ng-change-example1')).click();
+ *
+ *       expect(counter.getText()).toContain('1');
+ *       expect(debug.getText()).toContain('true');
+ *     });
+ *
+ *     it('should not evaluate the expression if changing from model', function() {
+ *       element(by.id('ng-change-example2')).click();
+
+ *       expect(counter.getText()).toContain('0');
+ *       expect(debug.getText()).toContain('true');
+ *     });
+ *   </file>
+ * </example>
+ */
+var ngChangeDirective = valueFn({
+  restrict: 'A',
+  require: 'ngModel',
+  link: function(scope, element, attr, ctrl) {
+    ctrl.$viewChangeListeners.push(function() {
+      scope.$eval(attr.ngChange);
+    });
+  }
+});
+
+function classDirective(name, selector) {
+  name = 'ngClass' + name;
+  return ['$animate', function($animate) {
+    return {
+      restrict: 'AC',
+      link: function(scope, element, attr) {
+        var oldVal;
+
+        scope.$watch(attr[name], ngClassWatchAction, true);
+
+        attr.$observe('class', function(value) {
+          ngClassWatchAction(scope.$eval(attr[name]));
+        });
+
+
+        if (name !== 'ngClass') {
+          scope.$watch('$index', function($index, old$index) {
+            // jshint bitwise: false
+            var mod = $index & 1;
+            if (mod !== (old$index & 1)) {
+              var classes = arrayClasses(scope.$eval(attr[name]));
+              mod === selector ?
+                addClasses(classes) :
+                removeClasses(classes);
+            }
+          });
+        }
+
+        function addClasses(classes) {
+          var newClasses = digestClassCounts(classes, 1);
+          attr.$addClass(newClasses);
+        }
+
+        function removeClasses(classes) {
+          var newClasses = digestClassCounts(classes, -1);
+          attr.$removeClass(newClasses);
+        }
+
+        function digestClassCounts(classes, count) {
+          // Use createMap() to prevent class assumptions involving property
+          // names in Object.prototype
+          var classCounts = element.data('$classCounts') || createMap();
+          var classesToUpdate = [];
+          forEach(classes, function(className) {
+            if (count > 0 || classCounts[className]) {
+              classCounts[className] = (classCounts[className] || 0) + count;
+              if (classCounts[className] === +(count > 0)) {
+                classesToUpdate.push(className);
+              }
+            }
+          });
+          element.data('$classCounts', classCounts);
+          return classesToUpdate.join(' ');
+        }
+
+        function updateClasses(oldClasses, newClasses) {
+          var toAdd = arrayDifference(newClasses, oldClasses);
+          var toRemove = arrayDifference(oldClasses, newClasses);
+          toAdd = digestClassCounts(toAdd, 1);
+          toRemove = digestClassCounts(toRemove, -1);
+          if (toAdd && toAdd.length) {
+            $animate.addClass(element, toAdd);
+          }
+          if (toRemove && toRemove.length) {
+            $animate.removeClass(element, toRemove);
+          }
+        }
+
+        function ngClassWatchAction(newVal) {
+          if (selector === true || scope.$index % 2 === selector) {
+            var newClasses = arrayClasses(newVal || []);
+            if (!oldVal) {
+              addClasses(newClasses);
+            } else if (!equals(newVal,oldVal)) {
+              var oldClasses = arrayClasses(oldVal);
+              updateClasses(oldClasses, newClasses);
+            }
+          }
+          oldVal = shallowCopy(newVal);
+        }
+      }
+    };
+
+    function arrayDifference(tokens1, tokens2) {
+      var values = [];
+
+      outer:
+      for (var i = 0; i < tokens1.length; i++) {
+        var token = tokens1[i];
+        for (var j = 0; j < tokens2.length; j++) {
+          if (token == tokens2[j]) continue outer;
+        }
+        values.push(token);
+      }
+      return values;
+    }
+
+    function arrayClasses(classVal) {
+      var classes = [];
+      if (isArray(classVal)) {
+        forEach(classVal, function(v) {
+          classes = classes.concat(arrayClasses(v));
+        });
+        return classes;
+      } else if (isString(classVal)) {
+        return classVal.split(' ');
+      } else if (isObject(classVal)) {
+        forEach(classVal, function(v, k) {
+          if (v) {
+            classes = classes.concat(k.split(' '));
+          }
+        });
+        return classes;
+      }
+      return classVal;
+    }
+  }];
+}
+
+/**
+ * @ngdoc directive
+ * @name ngClass
+ * @restrict AC
+ *
+ * @description
+ * The `ngClass` directive allows you to dynamically set CSS classes on an HTML element by databinding
+ * an expression that represents all classes to be added.
+ *
+ * The directive operates in three different ways, depending on which of three types the expression
+ * evaluates to:
+ *
+ * 1. If the expression evaluates to a string, the string should be one or more space-delimited class
+ * names.
+ *
+ * 2. If the expression evaluates to an object, then for each key-value pair of the
+ * object with a truthy value the corresponding key is used as a class name.
+ *
+ * 3. If the expression evaluates to an array, each element of the array should either be a string as in
+ * type 1 or an object as in type 2. This means that you can mix strings and objects together in an array
+ * to give you more control over what CSS classes appear. See the code below for an example of this.
+ *
+ *
+ * The directive won't add duplicate classes if a particular class was already set.
+ *
+ * When the expression changes, the previously added classes are removed and only then are the
+ * new classes added.
+ *
+ * @animations
+ * **add** - happens just before the class is applied to the elements
+ *
+ * **remove** - happens just before the class is removed from the element
+ *
+ * @element ANY
+ * @param {expression} ngClass {@link guide/expression Expression} to eval. The result
+ *   of the evaluation can be a string representing space delimited class
+ *   names, an array, or a map of class names to boolean values. In the case of a map, the
+ *   names of the properties whose values are truthy will be added as css classes to the
+ *   element.
+ *
+ * @example Example that demonstrates basic bindings via ngClass directive.
+   <example>
+     <file name="index.html">
+       <p ng-class="{strike: deleted, bold: important, 'has-error': error}">Map Syntax Example</p>
+       <label>
+          <input type="checkbox" ng-model="deleted">
+          deleted (apply "strike" class)
+       </label><br>
+       <label>
+          <input type="checkbox" ng-model="important">
+          important (apply "bold" class)
+       </label><br>
+       <label>
+          <input type="checkbox" ng-model="error">
+          error (apply "has-error" class)
+       </label>
+       <hr>
+       <p ng-class="style">Using String Syntax</p>
+       <input type="text" ng-model="style"
+              placeholder="Type: bold strike red" aria-label="Type: bold strike red">
+       <hr>
+       <p ng-class="[style1, style2, style3]">Using Array Syntax</p>
+       <input ng-model="style1"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red"><br>
+       <input ng-model="style2"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 2"><br>
+       <input ng-model="style3"
+              placeholder="Type: bold, strike or red" aria-label="Type: bold, strike or red 3"><br>
+       <hr>
+       <p ng-class="[style4, {orange: warning}]">Using Array and Map Syntax</p>
+       <input ng-model="style4" placeholder="Type: bold, strike" aria-label="Type: bold, strike"><br>
+       <label><input type="checkbox" ng-model="warning"> warning (apply "orange" class)</label>
+     </file>
+     <file name="style.css">
+       .strike {
+           text-decoration: line-through;
+       }
+       .bold {
+           font-weight: bold;
+       }
+       .red {
+           color: red;
+       }
+       .has-error {
+           color: red;
+           background-color: yellow;
+       }
+       .orange {
+           color: orange;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       var ps = element.all(by.css('p'));
+
+       it('should let you toggle the class', function() {
+
+         expect(ps.first().getAttribute('class')).not.toMatch(/bold/);
+         expect(ps.first().getAttribute('class')).not.toMatch(/has-error/);
+
+         element(by.model('important')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/bold/);
+
+         element(by.model('error')).click();
+         expect(ps.first().getAttribute('class')).toMatch(/has-error/);
+       });
+
+       it('should let you toggle string example', function() {
+         expect(ps.get(1).getAttribute('class')).toBe('');
+         element(by.model('style')).clear();
+         element(by.model('style')).sendKeys('red');
+         expect(ps.get(1).getAttribute('class')).toBe('red');
+       });
+
+       it('array example should have 3 classes', function() {
+         expect(ps.get(2).getAttribute('class')).toBe('');
+         element(by.model('style1')).sendKeys('bold');
+         element(by.model('style2')).sendKeys('strike');
+         element(by.model('style3')).sendKeys('red');
+         expect(ps.get(2).getAttribute('class')).toBe('bold strike red');
+       });
+
+       it('array with map example should have 2 classes', function() {
+         expect(ps.last().getAttribute('class')).toBe('');
+         element(by.model('style4')).sendKeys('bold');
+         element(by.model('warning')).click();
+         expect(ps.last().getAttribute('class')).toBe('bold orange');
+       });
+     </file>
+   </example>
+
+   ## Animations
+
+   The example below demonstrates how to perform animations using ngClass.
+
+   <example module="ngAnimate" deps="angular-animate.js" animations="true">
+     <file name="index.html">
+      <input id="setbtn" type="button" value="set" ng-click="myVar='my-class'">
+      <input id="clearbtn" type="button" value="clear" ng-click="myVar=''">
+      <br>
+      <span class="base-class" ng-class="myVar">Sample Text</span>
+     </file>
+     <file name="style.css">
+       .base-class {
+         transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+       }
+
+       .base-class.my-class {
+         color: red;
+         font-size:3em;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-class', function() {
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+
+         element(by.id('setbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).
+           toMatch(/my-class/);
+
+         element(by.id('clearbtn')).click();
+
+         expect(element(by.css('.base-class')).getAttribute('class')).not.
+           toMatch(/my-class/);
+       });
+     </file>
+   </example>
+
+
+   ## ngClass and pre-existing CSS3 Transitions/Animations
+   The ngClass directive still supports CSS3 Transitions/Animations even if they do not follow the ngAnimate CSS naming structure.
+   Upon animation ngAnimate will apply supplementary CSS classes to track the start and end of an animation, but this will not hinder
+   any pre-existing CSS transitions already on the element. To get an idea of what happens during a class-based animation, be sure
+   to view the step by step details of {@link $animate#addClass $animate.addClass} and
+   {@link $animate#removeClass $animate.removeClass}.
+ */
+var ngClassDirective = classDirective('', true);
+
+/**
+ * @ngdoc directive
+ * @name ngClassOdd
+ * @restrict AC
+ *
+ * @description
+ * The `ngClassOdd` and `ngClassEven` directives work exactly as
+ * {@link ng.directive:ngClass ngClass}, except they work in
+ * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+ *
+ * This directive can be applied only within the scope of an
+ * {@link ng.directive:ngRepeat ngRepeat}.
+ *
+ * @element ANY
+ * @param {expression} ngClassOdd {@link guide/expression Expression} to eval. The result
+ *   of the evaluation can be a string representing space delimited class names or an array.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+          <li ng-repeat="name in names">
+           <span ng-class-odd="'odd'" ng-class-even="'even'">
+             {{name}}
+           </span>
+          </li>
+        </ol>
+     </file>
+     <file name="style.css">
+       .odd {
+         color: red;
+       }
+       .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+   </example>
+ */
+var ngClassOddDirective = classDirective('Odd', 0);
+
+/**
+ * @ngdoc directive
+ * @name ngClassEven
+ * @restrict AC
+ *
+ * @description
+ * The `ngClassOdd` and `ngClassEven` directives work exactly as
+ * {@link ng.directive:ngClass ngClass}, except they work in
+ * conjunction with `ngRepeat` and take effect only on odd (even) rows.
+ *
+ * This directive can be applied only within the scope of an
+ * {@link ng.directive:ngRepeat ngRepeat}.
+ *
+ * @element ANY
+ * @param {expression} ngClassEven {@link guide/expression Expression} to eval. The
+ *   result of the evaluation can be a string representing space delimited class names or an array.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <ol ng-init="names=['John', 'Mary', 'Cate', 'Suz']">
+          <li ng-repeat="name in names">
+           <span ng-class-odd="'odd'" ng-class-even="'even'">
+             {{name}} &nbsp; &nbsp; &nbsp;
+           </span>
+          </li>
+        </ol>
+     </file>
+     <file name="style.css">
+       .odd {
+         color: red;
+       }
+       .even {
+         color: blue;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-class-odd and ng-class-even', function() {
+         expect(element(by.repeater('name in names').row(0).column('name')).getAttribute('class')).
+           toMatch(/odd/);
+         expect(element(by.repeater('name in names').row(1).column('name')).getAttribute('class')).
+           toMatch(/even/);
+       });
+     </file>
+   </example>
+ */
+var ngClassEvenDirective = classDirective('Even', 1);
+
+/**
+ * @ngdoc directive
+ * @name ngCloak
+ * @restrict AC
+ *
+ * @description
+ * The `ngCloak` directive is used to prevent the Angular html template from being briefly
+ * displayed by the browser in its raw (uncompiled) form while your application is loading. Use this
+ * directive to avoid the undesirable flicker effect caused by the html template display.
+ *
+ * The directive can be applied to the `<body>` element, but the preferred usage is to apply
+ * multiple `ngCloak` directives to small portions of the page to permit progressive rendering
+ * of the browser view.
+ *
+ * `ngCloak` works in cooperation with the following css rule embedded within `angular.js` and
+ * `angular.min.js`.
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```css
+ * [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak {
+ *   display: none !important;
+ * }
+ * ```
+ *
+ * When this css rule is loaded by the browser, all html elements (including their children) that
+ * are tagged with the `ngCloak` directive are hidden. When Angular encounters this directive
+ * during the compilation of the template it deletes the `ngCloak` element attribute, making
+ * the compiled element visible.
+ *
+ * For the best result, the `angular.js` script must be loaded in the head section of the html
+ * document; alternatively, the css rule above must be included in the external stylesheet of the
+ * application.
+ *
+ * @element ANY
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <div id="template1" ng-cloak>{{ 'hello' }}</div>
+        <div id="template2" class="ng-cloak">{{ 'world' }}</div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should remove the template directive and css class', function() {
+         expect($('#template1').getAttribute('ng-cloak')).
+           toBeNull();
+         expect($('#template2').getAttribute('ng-cloak')).
+           toBeNull();
+       });
+     </file>
+   </example>
+ *
+ */
+var ngCloakDirective = ngDirective({
+  compile: function(element, attr) {
+    attr.$set('ngCloak', undefined);
+    element.removeClass('ng-cloak');
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngController
+ *
+ * @description
+ * The `ngController` directive attaches a controller class to the view. This is a key aspect of how angular
+ * supports the principles behind the Model-View-Controller design pattern.
+ *
+ * MVC components in angular:
+ *
+ * * Model — Models are the properties of a scope; scopes are attached to the DOM where scope properties
+ *   are accessed through bindings.
+ * * View — The template (HTML with data bindings) that is rendered into the View.
+ * * Controller — The `ngController` directive specifies a Controller class; the class contains business
+ *   logic behind the application to decorate the scope with functions and values
+ *
+ * Note that you can also attach controllers to the DOM by declaring it in a route definition
+ * via the {@link ngRoute.$route $route} service. A common mistake is to declare the controller
+ * again using `ng-controller` in the template itself.  This will cause the controller to be attached
+ * and executed twice.
+ *
+ * @element ANY
+ * @scope
+ * @priority 500
+ * @param {expression} ngController Name of a constructor function registered with the current
+ * {@link ng.$controllerProvider $controllerProvider} or an {@link guide/expression expression}
+ * that on the current scope evaluates to a constructor function.
+ *
+ * The controller instance can be published into a scope property by specifying
+ * `ng-controller="as propertyName"`.
+ *
+ * If the current `$controllerProvider` is configured to use globals (via
+ * {@link ng.$controllerProvider#allowGlobals `$controllerProvider.allowGlobals()` }), this may
+ * also be the name of a globally accessible constructor function (not recommended).
+ *
+ * @example
+ * Here is a simple form for editing user contact information. Adding, removing, clearing, and
+ * greeting are methods declared on the controller (see source tab). These methods can
+ * easily be called from the angular markup. Any changes to the data are automatically reflected
+ * in the View without the need for a manual update.
+ *
+ * Two different declaration styles are included below:
+ *
+ * * one binds methods and properties directly onto the controller using `this`:
+ * `ng-controller="SettingsController1 as settings"`
+ * * one injects `$scope` into the controller:
+ * `ng-controller="SettingsController2"`
+ *
+ * The second option is more common in the Angular community, and is generally used in boilerplates
+ * and in this guide. However, there are advantages to binding properties directly to the controller
+ * and avoiding scope.
+ *
+ * * Using `controller as` makes it obvious which controller you are accessing in the template when
+ * multiple controllers apply to an element.
+ * * If you are writing your controllers as classes you have easier access to the properties and
+ * methods, which will appear on the scope, from inside the controller code.
+ * * Since there is always a `.` in the bindings, you don't have to worry about prototypal
+ * inheritance masking primitives.
+ *
+ * This example demonstrates the `controller as` syntax.
+ *
+ * <example name="ngControllerAs" module="controllerAsExample">
+ *   <file name="index.html">
+ *    <div id="ctrl-as-exmpl" ng-controller="SettingsController1 as settings">
+ *      <label>Name: <input type="text" ng-model="settings.name"/></label>
+ *      <button ng-click="settings.greet()">greet</button><br/>
+ *      Contact:
+ *      <ul>
+ *        <li ng-repeat="contact in settings.contacts">
+ *          <select ng-model="contact.type" aria-label="Contact method" id="select_{{$index}}">
+ *             <option>phone</option>
+ *             <option>email</option>
+ *          </select>
+ *          <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+ *          <button ng-click="settings.clearContact(contact)">clear</button>
+ *          <button ng-click="settings.removeContact(contact)" aria-label="Remove">X</button>
+ *        </li>
+ *        <li><button ng-click="settings.addContact()">add</button></li>
+ *     </ul>
+ *    </div>
+ *   </file>
+ *   <file name="app.js">
+ *    angular.module('controllerAsExample', [])
+ *      .controller('SettingsController1', SettingsController1);
+ *
+ *    function SettingsController1() {
+ *      this.name = "John Smith";
+ *      this.contacts = [
+ *        {type: 'phone', value: '408 555 1212'},
+ *        {type: 'email', value: 'john.smith@example.org'} ];
+ *    }
+ *
+ *    SettingsController1.prototype.greet = function() {
+ *      alert(this.name);
+ *    };
+ *
+ *    SettingsController1.prototype.addContact = function() {
+ *      this.contacts.push({type: 'email', value: 'yourname@example.org'});
+ *    };
+ *
+ *    SettingsController1.prototype.removeContact = function(contactToRemove) {
+ *     var index = this.contacts.indexOf(contactToRemove);
+ *      this.contacts.splice(index, 1);
+ *    };
+ *
+ *    SettingsController1.prototype.clearContact = function(contact) {
+ *      contact.type = 'phone';
+ *      contact.value = '';
+ *    };
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     it('should check controller as', function() {
+ *       var container = element(by.id('ctrl-as-exmpl'));
+ *         expect(container.element(by.model('settings.name'))
+ *           .getAttribute('value')).toBe('John Smith');
+ *
+ *       var firstRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(0));
+ *       var secondRepeat =
+ *           container.element(by.repeater('contact in settings.contacts').row(1));
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('408 555 1212');
+ *
+ *       expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('john.smith@example.org');
+ *
+ *       firstRepeat.element(by.buttonText('clear')).click();
+ *
+ *       expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *           .toBe('');
+ *
+ *       container.element(by.buttonText('add')).click();
+ *
+ *       expect(container.element(by.repeater('contact in settings.contacts').row(2))
+ *           .element(by.model('contact.value'))
+ *           .getAttribute('value'))
+ *           .toBe('yourname@example.org');
+ *     });
+ *   </file>
+ * </example>
+ *
+ * This example demonstrates the "attach to `$scope`" style of controller.
+ *
+ * <example name="ngController" module="controllerExample">
+ *  <file name="index.html">
+ *   <div id="ctrl-exmpl" ng-controller="SettingsController2">
+ *     <label>Name: <input type="text" ng-model="name"/></label>
+ *     <button ng-click="greet()">greet</button><br/>
+ *     Contact:
+ *     <ul>
+ *       <li ng-repeat="contact in contacts">
+ *         <select ng-model="contact.type" id="select_{{$index}}">
+ *            <option>phone</option>
+ *            <option>email</option>
+ *         </select>
+ *         <input type="text" ng-model="contact.value" aria-labelledby="select_{{$index}}" />
+ *         <button ng-click="clearContact(contact)">clear</button>
+ *         <button ng-click="removeContact(contact)">X</button>
+ *       </li>
+ *       <li>[ <button ng-click="addContact()">add</button> ]</li>
+ *    </ul>
+ *   </div>
+ *  </file>
+ *  <file name="app.js">
+ *   angular.module('controllerExample', [])
+ *     .controller('SettingsController2', ['$scope', SettingsController2]);
+ *
+ *   function SettingsController2($scope) {
+ *     $scope.name = "John Smith";
+ *     $scope.contacts = [
+ *       {type:'phone', value:'408 555 1212'},
+ *       {type:'email', value:'john.smith@example.org'} ];
+ *
+ *     $scope.greet = function() {
+ *       alert($scope.name);
+ *     };
+ *
+ *     $scope.addContact = function() {
+ *       $scope.contacts.push({type:'email', value:'yourname@example.org'});
+ *     };
+ *
+ *     $scope.removeContact = function(contactToRemove) {
+ *       var index = $scope.contacts.indexOf(contactToRemove);
+ *       $scope.contacts.splice(index, 1);
+ *     };
+ *
+ *     $scope.clearContact = function(contact) {
+ *       contact.type = 'phone';
+ *       contact.value = '';
+ *     };
+ *   }
+ *  </file>
+ *  <file name="protractor.js" type="protractor">
+ *    it('should check controller', function() {
+ *      var container = element(by.id('ctrl-exmpl'));
+ *
+ *      expect(container.element(by.model('name'))
+ *          .getAttribute('value')).toBe('John Smith');
+ *
+ *      var firstRepeat =
+ *          container.element(by.repeater('contact in contacts').row(0));
+ *      var secondRepeat =
+ *          container.element(by.repeater('contact in contacts').row(1));
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('408 555 1212');
+ *      expect(secondRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('john.smith@example.org');
+ *
+ *      firstRepeat.element(by.buttonText('clear')).click();
+ *
+ *      expect(firstRepeat.element(by.model('contact.value')).getAttribute('value'))
+ *          .toBe('');
+ *
+ *      container.element(by.buttonText('add')).click();
+ *
+ *      expect(container.element(by.repeater('contact in contacts').row(2))
+ *          .element(by.model('contact.value'))
+ *          .getAttribute('value'))
+ *          .toBe('yourname@example.org');
+ *    });
+ *  </file>
+ *</example>
+
+ */
+var ngControllerDirective = [function() {
+  return {
+    restrict: 'A',
+    scope: true,
+    controller: '@',
+    priority: 500
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngCsp
+ *
+ * @element html
+ * @description
+ *
+ * Angular has some features that can break certain
+ * [CSP (Content Security Policy)](https://developer.mozilla.org/en/Security/CSP) rules.
+ *
+ * If you intend to implement these rules then you must tell Angular not to use these features.
+ *
+ * This is necessary when developing things like Google Chrome Extensions or Universal Windows Apps.
+ *
+ *
+ * The following rules affect Angular:
+ *
+ * * `unsafe-eval`: this rule forbids apps to use `eval` or `Function(string)` generated functions
+ * (among other things). Angular makes use of this in the {@link $parse} service to provide a 30%
+ * increase in the speed of evaluating Angular expressions.
+ *
+ * * `unsafe-inline`: this rule forbids apps from inject custom styles into the document. Angular
+ * makes use of this to include some CSS rules (e.g. {@link ngCloak} and {@link ngHide}).
+ * To make these directives work when a CSP rule is blocking inline styles, you must link to the
+ * `angular-csp.css` in your HTML manually.
+ *
+ * If you do not provide `ngCsp` then Angular tries to autodetect if CSP is blocking unsafe-eval
+ * and automatically deactivates this feature in the {@link $parse} service. This autodetection,
+ * however, triggers a CSP error to be logged in the console:
+ *
+ * ```
+ * Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of
+ * script in the following Content Security Policy directive: "default-src 'self'". Note that
+ * 'script-src' was not explicitly set, so 'default-src' is used as a fallback.
+ * ```
+ *
+ * This error is harmless but annoying. To prevent the error from showing up, put the `ngCsp`
+ * directive on an element of the HTML document that appears before the `<script>` tag that loads
+ * the `angular.js` file.
+ *
+ * *Note: This directive is only available in the `ng-csp` and `data-ng-csp` attribute form.*
+ *
+ * You can specify which of the CSP related Angular features should be deactivated by providing
+ * a value for the `ng-csp` attribute. The options are as follows:
+ *
+ * * no-inline-style: this stops Angular from injecting CSS styles into the DOM
+ *
+ * * no-unsafe-eval: this stops Angular from optimising $parse with unsafe eval of strings
+ *
+ * You can use these values in the following combinations:
+ *
+ *
+ * * No declaration means that Angular will assume that you can do inline styles, but it will do
+ * a runtime check for unsafe-eval. E.g. `<body>`. This is backwardly compatible with previous versions
+ * of Angular.
+ *
+ * * A simple `ng-csp` (or `data-ng-csp`) attribute will tell Angular to deactivate both inline
+ * styles and unsafe eval. E.g. `<body ng-csp>`. This is backwardly compatible with previous versions
+ * of Angular.
+ *
+ * * Specifying only `no-unsafe-eval` tells Angular that we must not use eval, but that we can inject
+ * inline styles. E.g. `<body ng-csp="no-unsafe-eval">`.
+ *
+ * * Specifying only `no-inline-style` tells Angular that we must not inject styles, but that we can
+ * run eval - no automcatic check for unsafe eval will occur. E.g. `<body ng-csp="no-inline-style">`
+ *
+ * * Specifying both `no-unsafe-eval` and `no-inline-style` tells Angular that we must not inject
+ * styles nor use eval, which is the same as an empty: ng-csp.
+ * E.g.`<body ng-csp="no-inline-style;no-unsafe-eval">`
+ *
+ * @example
+ * This example shows how to apply the `ngCsp` directive to the `html` tag.
+   ```html
+     <!doctype html>
+     <html ng-app ng-csp>
+     ...
+     ...
+     </html>
+   ```
+  * @example
+      // Note: the suffix `.csp` in the example name triggers
+      // csp mode in our http server!
+      <example name="example.csp" module="cspExample" ng-csp="true">
+        <file name="index.html">
+          <div ng-controller="MainController as ctrl">
+            <div>
+              <button ng-click="ctrl.inc()" id="inc">Increment</button>
+              <span id="counter">
+                {{ctrl.counter}}
+              </span>
+            </div>
+
+            <div>
+              <button ng-click="ctrl.evil()" id="evil">Evil</button>
+              <span id="evilError">
+                {{ctrl.evilError}}
+              </span>
+            </div>
+          </div>
+        </file>
+        <file name="script.js">
+           angular.module('cspExample', [])
+             .controller('MainController', function() {
+                this.counter = 0;
+                this.inc = function() {
+                  this.counter++;
+                };
+                this.evil = function() {
+                  // jshint evil:true
+                  try {
+                    eval('1+2');
+                  } catch (e) {
+                    this.evilError = e.message;
+                  }
+                };
+              });
+        </file>
+        <file name="protractor.js" type="protractor">
+          var util, webdriver;
+
+          var incBtn = element(by.id('inc'));
+          var counter = element(by.id('counter'));
+          var evilBtn = element(by.id('evil'));
+          var evilError = element(by.id('evilError'));
+
+          function getAndClearSevereErrors() {
+            return browser.manage().logs().get('browser').then(function(browserLog) {
+              return browserLog.filter(function(logEntry) {
+                return logEntry.level.value > webdriver.logging.Level.WARNING.value;
+              });
+            });
+          }
+
+          function clearErrors() {
+            getAndClearSevereErrors();
+          }
+
+          function expectNoErrors() {
+            getAndClearSevereErrors().then(function(filteredLog) {
+              expect(filteredLog.length).toEqual(0);
+              if (filteredLog.length) {
+                console.log('browser console errors: ' + util.inspect(filteredLog));
+              }
+            });
+          }
+
+          function expectError(regex) {
+            getAndClearSevereErrors().then(function(filteredLog) {
+              var found = false;
+              filteredLog.forEach(function(log) {
+                if (log.message.match(regex)) {
+                  found = true;
+                }
+              });
+              if (!found) {
+                throw new Error('expected an error that matches ' + regex);
+              }
+            });
+          }
+
+          beforeEach(function() {
+            util = require('util');
+            webdriver = require('protractor/node_modules/selenium-webdriver');
+          });
+
+          // For now, we only test on Chrome,
+          // as Safari does not load the page with Protractor's injected scripts,
+          // and Firefox webdriver always disables content security policy (#6358)
+          if (browser.params.browser !== 'chrome') {
+            return;
+          }
+
+          it('should not report errors when the page is loaded', function() {
+            // clear errors so we are not dependent on previous tests
+            clearErrors();
+            // Need to reload the page as the page is already loaded when
+            // we come here
+            browser.driver.getCurrentUrl().then(function(url) {
+              browser.get(url);
+            });
+            expectNoErrors();
+          });
+
+          it('should evaluate expressions', function() {
+            expect(counter.getText()).toEqual('0');
+            incBtn.click();
+            expect(counter.getText()).toEqual('1');
+            expectNoErrors();
+          });
+
+          it('should throw and report an error when using "eval"', function() {
+            evilBtn.click();
+            expect(evilError.getText()).toMatch(/Content Security Policy/);
+            expectError(/Content Security Policy/);
+          });
+        </file>
+      </example>
+  */
+
+// ngCsp is not implemented as a proper directive any more, because we need it be processed while we
+// bootstrap the system (before $parse is instantiated), for this reason we just have
+// the csp() fn that looks for the `ng-csp` attribute anywhere in the current doc
+
+/**
+ * @ngdoc directive
+ * @name ngClick
+ *
+ * @description
+ * The ngClick directive allows you to specify custom behavior when
+ * an element is clicked.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngClick {@link guide/expression Expression} to evaluate upon
+ * click. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-click="count = count + 1" ng-init="count=0">
+        Increment
+      </button>
+      <span>
+        count: {{count}}
+      </span>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-click', function() {
+         expect(element(by.binding('count')).getText()).toMatch('0');
+         element(by.css('button')).click();
+         expect(element(by.binding('count')).getText()).toMatch('1');
+       });
+     </file>
+   </example>
+ */
+/*
+ * A collection of directives that allows creation of custom event handlers that are defined as
+ * angular expressions and are compiled and executed within the current scope.
+ */
+var ngEventDirectives = {};
+
+// For events that might fire synchronously during DOM manipulation
+// we need to execute their event handlers asynchronously using $evalAsync,
+// so that they are not executed in an inconsistent state.
+var forceAsyncEvents = {
+  'blur': true,
+  'focus': true
+};
+forEach(
+  'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
+  function(eventName) {
+    var directiveName = directiveNormalize('ng-' + eventName);
+    ngEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse, $rootScope) {
+      return {
+        restrict: 'A',
+        compile: function($element, attr) {
+          // We expose the powerful $event object on the scope that provides access to the Window,
+          // etc. that isn't protected by the fast paths in $parse.  We explicitly request better
+          // checks at the cost of speed since event handler expressions are not executed as
+          // frequently as regular change detection.
+          var fn = $parse(attr[directiveName], /* interceptorFn */ null, /* expensiveChecks */ true);
+          return function ngEventHandler(scope, element) {
+            element.on(eventName, function(event) {
+              var callback = function() {
+                fn(scope, {$event:event});
+              };
+              if (forceAsyncEvents[eventName] && $rootScope.$$phase) {
+                scope.$evalAsync(callback);
+              } else {
+                scope.$apply(callback);
+              }
+            });
+          };
+        }
+      };
+    }];
+  }
+);
+
+/**
+ * @ngdoc directive
+ * @name ngDblclick
+ *
+ * @description
+ * The `ngDblclick` directive allows you to specify custom behavior on a dblclick event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngDblclick {@link guide/expression Expression} to evaluate upon
+ * a dblclick. (The Event object is available as `$event`)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-dblclick="count = count + 1" ng-init="count=0">
+        Increment (on double click)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMousedown
+ *
+ * @description
+ * The ngMousedown directive allows you to specify custom behavior on mousedown event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMousedown {@link guide/expression Expression} to evaluate upon
+ * mousedown. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mousedown="count = count + 1" ng-init="count=0">
+        Increment (on mouse down)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseup
+ *
+ * @description
+ * Specify custom behavior on mouseup event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseup {@link guide/expression Expression} to evaluate upon
+ * mouseup. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseup="count = count + 1" ng-init="count=0">
+        Increment (on mouse up)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngMouseover
+ *
+ * @description
+ * Specify custom behavior on mouseover event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseover {@link guide/expression Expression} to evaluate upon
+ * mouseover. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseover="count = count + 1" ng-init="count=0">
+        Increment (when mouse is over)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseenter
+ *
+ * @description
+ * Specify custom behavior on mouseenter event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseenter {@link guide/expression Expression} to evaluate upon
+ * mouseenter. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseenter="count = count + 1" ng-init="count=0">
+        Increment (when mouse enters)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMouseleave
+ *
+ * @description
+ * Specify custom behavior on mouseleave event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMouseleave {@link guide/expression Expression} to evaluate upon
+ * mouseleave. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mouseleave="count = count + 1" ng-init="count=0">
+        Increment (when mouse leaves)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngMousemove
+ *
+ * @description
+ * Specify custom behavior on mousemove event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngMousemove {@link guide/expression Expression} to evaluate upon
+ * mousemove. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <button ng-mousemove="count = count + 1" ng-init="count=0">
+        Increment (when mouse moves)
+      </button>
+      count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeydown
+ *
+ * @description
+ * Specify custom behavior on keydown event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngKeydown {@link guide/expression Expression} to evaluate upon
+ * keydown. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-keydown="count = count + 1" ng-init="count=0">
+      key down count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeyup
+ *
+ * @description
+ * Specify custom behavior on keyup event.
+ *
+ * @element ANY
+ * @priority 0
+ * @param {expression} ngKeyup {@link guide/expression Expression} to evaluate upon
+ * keyup. (Event object is available as `$event` and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+       <p>Typing in the input box below updates the key count</p>
+       <input ng-keyup="count = count + 1" ng-init="count=0"> key up count: {{count}}
+
+       <p>Typing in the input box below updates the keycode</p>
+       <input ng-keyup="event=$event">
+       <p>event keyCode: {{ event.keyCode }}</p>
+       <p>event altKey: {{ event.altKey }}</p>
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngKeypress
+ *
+ * @description
+ * Specify custom behavior on keypress event.
+ *
+ * @element ANY
+ * @param {expression} ngKeypress {@link guide/expression Expression} to evaluate upon
+ * keypress. ({@link guide/expression#-event- Event object is available as `$event`}
+ * and can be interrogated for keyCode, altKey, etc.)
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-keypress="count = count + 1" ng-init="count=0">
+      key press count: {{count}}
+     </file>
+   </example>
+ */
+
+
+/**
+ * @ngdoc directive
+ * @name ngSubmit
+ *
+ * @description
+ * Enables binding angular expressions to onsubmit events.
+ *
+ * Additionally it prevents the default action (which for form means sending the request to the
+ * server and reloading the current page), but only if the form does not contain `action`,
+ * `data-action`, or `x-action` attributes.
+ *
+ * <div class="alert alert-warning">
+ * **Warning:** Be careful not to cause "double-submission" by using both the `ngClick` and
+ * `ngSubmit` handlers together. See the
+ * {@link form#submitting-a-form-and-preventing-the-default-action `form` directive documentation}
+ * for a detailed discussion of when `ngSubmit` may be triggered.
+ * </div>
+ *
+ * @element form
+ * @priority 0
+ * @param {expression} ngSubmit {@link guide/expression Expression} to eval.
+ * ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example module="submitExample">
+     <file name="index.html">
+      <script>
+        angular.module('submitExample', [])
+          .controller('ExampleController', ['$scope', function($scope) {
+            $scope.list = [];
+            $scope.text = 'hello';
+            $scope.submit = function() {
+              if ($scope.text) {
+                $scope.list.push(this.text);
+                $scope.text = '';
+              }
+            };
+          }]);
+      </script>
+      <form ng-submit="submit()" ng-controller="ExampleController">
+        Enter text and hit enter:
+        <input type="text" ng-model="text" name="text" />
+        <input type="submit" id="submit" value="Submit" />
+        <pre>list={{list}}</pre>
+      </form>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should check ng-submit', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+         expect(element(by.model('text')).getAttribute('value')).toBe('');
+       });
+       it('should ignore empty strings', function() {
+         expect(element(by.binding('list')).getText()).toBe('list=[]');
+         element(by.css('#submit')).click();
+         element(by.css('#submit')).click();
+         expect(element(by.binding('list')).getText()).toContain('hello');
+        });
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngFocus
+ *
+ * @description
+ * Specify custom behavior on focus event.
+ *
+ * Note: As the `focus` event is executed synchronously when calling `input.focus()`
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngFocus {@link guide/expression Expression} to evaluate upon
+ * focus. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+ * See {@link ng.directive:ngClick ngClick}
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngBlur
+ *
+ * @description
+ * Specify custom behavior on blur event.
+ *
+ * A [blur event](https://developer.mozilla.org/en-US/docs/Web/Events/blur) fires when
+ * an element has lost focus.
+ *
+ * Note: As the `blur` event is executed synchronously also during DOM manipulations
+ * (e.g. removing a focussed input),
+ * AngularJS executes the expression using `scope.$evalAsync` if the event is fired
+ * during an `$apply` to ensure a consistent state.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngBlur {@link guide/expression Expression} to evaluate upon
+ * blur. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+ * See {@link ng.directive:ngClick ngClick}
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngCopy
+ *
+ * @description
+ * Specify custom behavior on copy event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngCopy {@link guide/expression Expression} to evaluate upon
+ * copy. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-copy="copied=true" ng-init="copied=false; value='copy me'" ng-model="value">
+      copied: {{copied}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngCut
+ *
+ * @description
+ * Specify custom behavior on cut event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngCut {@link guide/expression Expression} to evaluate upon
+ * cut. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-cut="cut=true" ng-init="cut=false; value='cut me'" ng-model="value">
+      cut: {{cut}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngPaste
+ *
+ * @description
+ * Specify custom behavior on paste event.
+ *
+ * @element window, input, select, textarea, a
+ * @priority 0
+ * @param {expression} ngPaste {@link guide/expression Expression} to evaluate upon
+ * paste. ({@link guide/expression#-event- Event object is available as `$event`})
+ *
+ * @example
+   <example>
+     <file name="index.html">
+      <input ng-paste="paste=true" ng-init="paste=false" placeholder='paste here'>
+      pasted: {{paste}}
+     </file>
+   </example>
+ */
+
+/**
+ * @ngdoc directive
+ * @name ngIf
+ * @restrict A
+ * @multiElement
+ *
+ * @description
+ * The `ngIf` directive removes or recreates a portion of the DOM tree based on an
+ * {expression}. If the expression assigned to `ngIf` evaluates to a false
+ * value then the element is removed from the DOM, otherwise a clone of the
+ * element is reinserted into the DOM.
+ *
+ * `ngIf` differs from `ngShow` and `ngHide` in that `ngIf` completely removes and recreates the
+ * element in the DOM rather than changing its visibility via the `display` css property.  A common
+ * case when this difference is significant is when using css selectors that rely on an element's
+ * position within the DOM, such as the `:first-child` or `:last-child` pseudo-classes.
+ *
+ * Note that when an element is removed using `ngIf` its scope is destroyed and a new scope
+ * is created when the element is restored.  The scope created within `ngIf` inherits from
+ * its parent scope using
+ * [prototypal inheritance](https://github.com/angular/angular.js/wiki/Understanding-Scopes#javascript-prototypal-inheritance).
+ * An important implication of this is if `ngModel` is used within `ngIf` to bind to
+ * a javascript primitive defined in the parent scope. In this case any modifications made to the
+ * variable within the child scope will override (hide) the value in the parent scope.
+ *
+ * Also, `ngIf` recreates elements using their compiled state. An example of this behavior
+ * is if an element's class attribute is directly modified after it's compiled, using something like
+ * jQuery's `.addClass()` method, and the element is later removed. When `ngIf` recreates the element
+ * the added class will be lost because the original compiled state is used to regenerate the element.
+ *
+ * Additionally, you can provide animations via the `ngAnimate` module to animate the `enter`
+ * and `leave` effects.
+ *
+ * @animations
+ * enter - happens just after the `ngIf` contents change and a new DOM element is created and injected into the `ngIf` container
+ * leave - happens just before the `ngIf` contents are removed from the DOM
+ *
+ * @element ANY
+ * @scope
+ * @priority 600
+ * @param {expression} ngIf If the {@link guide/expression expression} is falsy then
+ *     the element is removed from the DOM tree. If it is truthy a copy of the compiled
+ *     element is added to the DOM tree.
+ *
+ * @example
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      <label>Click me: <input type="checkbox" ng-model="checked" ng-init="checked=true" /></label><br/>
+      Show when checked:
+      <span ng-if="checked" class="animate-if">
+        This is removed when the checkbox is unchecked.
+      </span>
+    </file>
+    <file name="animations.css">
+      .animate-if {
+        background:white;
+        border:1px solid black;
+        padding:10px;
+      }
+
+      .animate-if.ng-enter, .animate-if.ng-leave {
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+      }
+
+      .animate-if.ng-enter,
+      .animate-if.ng-leave.ng-leave-active {
+        opacity:0;
+      }
+
+      .animate-if.ng-leave,
+      .animate-if.ng-enter.ng-enter-active {
+        opacity:1;
+      }
+    </file>
+  </example>
+ */
+var ngIfDirective = ['$animate', function($animate) {
+  return {
+    multiElement: true,
+    transclude: 'element',
+    priority: 600,
+    terminal: true,
+    restrict: 'A',
+    $$tlb: true,
+    link: function($scope, $element, $attr, ctrl, $transclude) {
+        var block, childScope, previousElements;
+        $scope.$watch($attr.ngIf, function ngIfWatchAction(value) {
+
+          if (value) {
+            if (!childScope) {
+              $transclude(function(clone, newScope) {
+                childScope = newScope;
+                clone[clone.length++] = document.createComment(' end ngIf: ' + $attr.ngIf + ' ');
+                // Note: We only need the first/last node of the cloned nodes.
+                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                // by a directive with templateUrl when its template arrives.
+                block = {
+                  clone: clone
+                };
+                $animate.enter(clone, $element.parent(), $element);
+              });
+            }
+          } else {
+            if (previousElements) {
+              previousElements.remove();
+              previousElements = null;
+            }
+            if (childScope) {
+              childScope.$destroy();
+              childScope = null;
+            }
+            if (block) {
+              previousElements = getBlockNodes(block.clone);
+              $animate.leave(previousElements).then(function() {
+                previousElements = null;
+              });
+              block = null;
+            }
+          }
+        });
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngInclude
+ * @restrict ECA
+ *
+ * @description
+ * Fetches, compiles and includes an external HTML fragment.
+ *
+ * By default, the template URL is restricted to the same domain and protocol as the
+ * application document. This is done by calling {@link $sce#getTrustedResourceUrl
+ * $sce.getTrustedResourceUrl} on it. To load templates from other domains or protocols
+ * you may either {@link ng.$sceDelegateProvider#resourceUrlWhitelist whitelist them} or
+ * {@link $sce#trustAsResourceUrl wrap them} as trusted values. Refer to Angular's {@link
+ * ng.$sce Strict Contextual Escaping}.
+ *
+ * In addition, the browser's
+ * [Same Origin Policy](https://code.google.com/p/browsersec/wiki/Part2#Same-origin_policy_for_XMLHttpRequest)
+ * and [Cross-Origin Resource Sharing (CORS)](http://www.w3.org/TR/cors/)
+ * policy may further restrict whether the template is successfully loaded.
+ * For example, `ngInclude` won't work for cross-domain requests on all browsers and for `file://`
+ * access on some browsers.
+ *
+ * @animations
+ * enter - animation is used to bring new content into the browser.
+ * leave - animation is used to animate existing content away.
+ *
+ * The enter and leave animation occur concurrently.
+ *
+ * @scope
+ * @priority 400
+ *
+ * @param {string} ngInclude|src angular expression evaluating to URL. If the source is a string constant,
+ *                 make sure you wrap it in **single** quotes, e.g. `src="'myPartialTemplate.html'"`.
+ * @param {string=} onload Expression to evaluate when a new partial is loaded.
+ *                  <div class="alert alert-warning">
+ *                  **Note:** When using onload on SVG elements in IE11, the browser will try to call
+ *                  a function with the name on the window element, which will usually throw a
+ *                  "function is undefined" error. To fix this, you can instead use `data-onload` or a
+ *                  different form that {@link guide/directive#normalization matches} `onload`.
+ *                  </div>
+   *
+ * @param {string=} autoscroll Whether `ngInclude` should call {@link ng.$anchorScroll
+ *                  $anchorScroll} to scroll the viewport after the content is loaded.
+ *
+ *                  - If the attribute is not set, disable scrolling.
+ *                  - If the attribute is set without value, enable scrolling.
+ *                  - Otherwise enable scrolling only if the expression evaluates to truthy value.
+ *
+ * @example
+  <example module="includeExample" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+     <div ng-controller="ExampleController">
+       <select ng-model="template" ng-options="t.name for t in templates">
+        <option value="">(blank)</option>
+       </select>
+       url of the template: <code>{{template.url}}</code>
+       <hr/>
+       <div class="slide-animate-container">
+         <div class="slide-animate" ng-include="template.url"></div>
+       </div>
+     </div>
+    </file>
+    <file name="script.js">
+      angular.module('includeExample', ['ngAnimate'])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.templates =
+            [ { name: 'template1.html', url: 'template1.html'},
+              { name: 'template2.html', url: 'template2.html'} ];
+          $scope.template = $scope.templates[0];
+        }]);
+     </file>
+    <file name="template1.html">
+      Content of template1.html
+    </file>
+    <file name="template2.html">
+      Content of template2.html
+    </file>
+    <file name="animations.css">
+      .slide-animate-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+      .slide-animate {
+        padding:10px;
+      }
+
+      .slide-animate.ng-enter, .slide-animate.ng-leave {
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+        display:block;
+        padding:10px;
+      }
+
+      .slide-animate.ng-enter {
+        top:-50px;
+      }
+      .slide-animate.ng-enter.ng-enter-active {
+        top:0;
+      }
+
+      .slide-animate.ng-leave {
+        top:0;
+      }
+      .slide-animate.ng-leave.ng-leave-active {
+        top:50px;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var templateSelect = element(by.model('template'));
+      var includeElem = element(by.css('[ng-include]'));
+
+      it('should load template1.html', function() {
+        expect(includeElem.getText()).toMatch(/Content of template1.html/);
+      });
+
+      it('should load template2.html', function() {
+        if (browser.params.browser == 'firefox') {
+          // Firefox can't handle using selects
+          // See https://github.com/angular/protractor/issues/480
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(2).click();
+        expect(includeElem.getText()).toMatch(/Content of template2.html/);
+      });
+
+      it('should change to blank', function() {
+        if (browser.params.browser == 'firefox') {
+          // Firefox can't handle using selects
+          return;
+        }
+        templateSelect.click();
+        templateSelect.all(by.css('option')).get(0).click();
+        expect(includeElem.isPresent()).toBe(false);
+      });
+    </file>
+  </example>
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentRequested
+ * @eventType emit on the scope ngInclude was declared in
+ * @description
+ * Emitted every time the ngInclude content is requested.
+ *
+ * @param {Object} angularEvent Synthetic event object.
+ * @param {String} src URL of content to load.
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentLoaded
+ * @eventType emit on the current ngInclude scope
+ * @description
+ * Emitted every time the ngInclude content is reloaded.
+ *
+ * @param {Object} angularEvent Synthetic event object.
+ * @param {String} src URL of content to load.
+ */
+
+
+/**
+ * @ngdoc event
+ * @name ngInclude#$includeContentError
+ * @eventType emit on the scope ngInclude was declared in
+ * @description
+ * Emitted when a template HTTP request yields an erroneous response (status < 200 || status > 299)
+ *
+ * @param {Object} angularEvent Synthetic event object.
+ * @param {String} src URL of content to load.
+ */
+var ngIncludeDirective = ['$templateRequest', '$anchorScroll', '$animate',
+                  function($templateRequest,   $anchorScroll,   $animate) {
+  return {
+    restrict: 'ECA',
+    priority: 400,
+    terminal: true,
+    transclude: 'element',
+    controller: angular.noop,
+    compile: function(element, attr) {
+      var srcExp = attr.ngInclude || attr.src,
+          onloadExp = attr.onload || '',
+          autoScrollExp = attr.autoscroll;
+
+      return function(scope, $element, $attr, ctrl, $transclude) {
+        var changeCounter = 0,
+            currentScope,
+            previousElement,
+            currentElement;
+
+        var cleanupLastIncludeContent = function() {
+          if (previousElement) {
+            previousElement.remove();
+            previousElement = null;
+          }
+          if (currentScope) {
+            currentScope.$destroy();
+            currentScope = null;
+          }
+          if (currentElement) {
+            $animate.leave(currentElement).then(function() {
+              previousElement = null;
+            });
+            previousElement = currentElement;
+            currentElement = null;
+          }
+        };
+
+        scope.$watch(srcExp, function ngIncludeWatchAction(src) {
+          var afterAnimation = function() {
+            if (isDefined(autoScrollExp) && (!autoScrollExp || scope.$eval(autoScrollExp))) {
+              $anchorScroll();
+            }
+          };
+          var thisChangeId = ++changeCounter;
+
+          if (src) {
+            //set the 2nd param to true to ignore the template request error so that the inner
+            //contents and scope can be cleaned up.
+            $templateRequest(src, true).then(function(response) {
+              if (scope.$$destroyed) return;
+
+              if (thisChangeId !== changeCounter) return;
+              var newScope = scope.$new();
+              ctrl.template = response;
+
+              // Note: This will also link all children of ng-include that were contained in the original
+              // html. If that content contains controllers, ... they could pollute/change the scope.
+              // However, using ng-include on an element with additional content does not make sense...
+              // Note: We can't remove them in the cloneAttchFn of $transclude as that
+              // function is called before linking the content, which would apply child
+              // directives to non existing elements.
+              var clone = $transclude(newScope, function(clone) {
+                cleanupLastIncludeContent();
+                $animate.enter(clone, null, $element).then(afterAnimation);
+              });
+
+              currentScope = newScope;
+              currentElement = clone;
+
+              currentScope.$emit('$includeContentLoaded', src);
+              scope.$eval(onloadExp);
+            }, function() {
+              if (scope.$$destroyed) return;
+
+              if (thisChangeId === changeCounter) {
+                cleanupLastIncludeContent();
+                scope.$emit('$includeContentError', src);
+              }
+            });
+            scope.$emit('$includeContentRequested', src);
+          } else {
+            cleanupLastIncludeContent();
+            ctrl.template = null;
+          }
+        });
+      };
+    }
+  };
+}];
+
+// This directive is called during the $transclude call of the first `ngInclude` directive.
+// It will replace and compile the content of the element with the loaded template.
+// We need this directive so that the element content is already filled when
+// the link function of another directive on the same element as ngInclude
+// is called.
+var ngIncludeFillContentDirective = ['$compile',
+  function($compile) {
+    return {
+      restrict: 'ECA',
+      priority: -400,
+      require: 'ngInclude',
+      link: function(scope, $element, $attr, ctrl) {
+        if (/SVG/.test($element[0].toString())) {
+          // WebKit: https://bugs.webkit.org/show_bug.cgi?id=135698 --- SVG elements do not
+          // support innerHTML, so detect this here and try to generate the contents
+          // specially.
+          $element.empty();
+          $compile(jqLiteBuildFragment(ctrl.template, document).childNodes)(scope,
+              function namespaceAdaptedClone(clone) {
+            $element.append(clone);
+          }, {futureParentElement: $element});
+          return;
+        }
+
+        $element.html(ctrl.template);
+        $compile($element.contents())(scope);
+      }
+    };
+  }];
+
+/**
+ * @ngdoc directive
+ * @name ngInit
+ * @restrict AC
+ *
+ * @description
+ * The `ngInit` directive allows you to evaluate an expression in the
+ * current scope.
+ *
+ * <div class="alert alert-danger">
+ * This directive can be abused to add unnecessary amounts of logic into your templates.
+ * There are only a few appropriate uses of `ngInit`, such as for aliasing special properties of
+ * {@link ng.directive:ngRepeat `ngRepeat`}, as seen in the demo below; and for injecting data via
+ * server side scripting. Besides these few cases, you should use {@link guide/controller controllers}
+ * rather than `ngInit` to initialize values on a scope.
+ * </div>
+ *
+ * <div class="alert alert-warning">
+ * **Note**: If you have assignment in `ngInit` along with a {@link ng.$filter `filter`}, make
+ * sure you have parentheses to ensure correct operator precedence:
+ * <pre class="prettyprint">
+ * `<div ng-init="test1 = ($index | toString)"></div>`
+ * </pre>
+ * </div>
+ *
+ * @priority 450
+ *
+ * @element ANY
+ * @param {expression} ngInit {@link guide/expression Expression} to eval.
+ *
+ * @example
+   <example module="initExample">
+     <file name="index.html">
+   <script>
+     angular.module('initExample', [])
+       .controller('ExampleController', ['$scope', function($scope) {
+         $scope.list = [['a', 'b'], ['c', 'd']];
+       }]);
+   </script>
+   <div ng-controller="ExampleController">
+     <div ng-repeat="innerList in list" ng-init="outerIndex = $index">
+       <div ng-repeat="value in innerList" ng-init="innerIndex = $index">
+          <span class="example-init">list[ {{outerIndex}} ][ {{innerIndex}} ] = {{value}};</span>
+       </div>
+     </div>
+   </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+       it('should alias index positions', function() {
+         var elements = element.all(by.css('.example-init'));
+         expect(elements.get(0).getText()).toBe('list[ 0 ][ 0 ] = a;');
+         expect(elements.get(1).getText()).toBe('list[ 0 ][ 1 ] = b;');
+         expect(elements.get(2).getText()).toBe('list[ 1 ][ 0 ] = c;');
+         expect(elements.get(3).getText()).toBe('list[ 1 ][ 1 ] = d;');
+       });
+     </file>
+   </example>
+ */
+var ngInitDirective = ngDirective({
+  priority: 450,
+  compile: function() {
+    return {
+      pre: function(scope, element, attrs) {
+        scope.$eval(attrs.ngInit);
+      }
+    };
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngList
+ *
+ * @description
+ * Text input that converts between a delimited string and an array of strings. The default
+ * delimiter is a comma followed by a space - equivalent to `ng-list=", "`. You can specify a custom
+ * delimiter as the value of the `ngList` attribute - for example, `ng-list=" | "`.
+ *
+ * The behaviour of the directive is affected by the use of the `ngTrim` attribute.
+ * * If `ngTrim` is set to `"false"` then whitespace around both the separator and each
+ *   list item is respected. This implies that the user of the directive is responsible for
+ *   dealing with whitespace but also allows you to use whitespace as a delimiter, such as a
+ *   tab or newline character.
+ * * Otherwise whitespace around the delimiter is ignored when splitting (although it is respected
+ *   when joining the list items back together) and whitespace around each list item is stripped
+ *   before it is added to the model.
+ *
+ * ### Example with Validation
+ *
+ * <example name="ngList-directive" module="listExample">
+ *   <file name="app.js">
+ *      angular.module('listExample', [])
+ *        .controller('ExampleController', ['$scope', function($scope) {
+ *          $scope.names = ['morpheus', 'neo', 'trinity'];
+ *        }]);
+ *   </file>
+ *   <file name="index.html">
+ *    <form name="myForm" ng-controller="ExampleController">
+ *      <label>List: <input name="namesInput" ng-model="names" ng-list required></label>
+ *      <span role="alert">
+ *        <span class="error" ng-show="myForm.namesInput.$error.required">
+ *        Required!</span>
+ *      </span>
+ *      <br>
+ *      <tt>names = {{names}}</tt><br/>
+ *      <tt>myForm.namesInput.$valid = {{myForm.namesInput.$valid}}</tt><br/>
+ *      <tt>myForm.namesInput.$error = {{myForm.namesInput.$error}}</tt><br/>
+ *      <tt>myForm.$valid = {{myForm.$valid}}</tt><br/>
+ *      <tt>myForm.$error.required = {{!!myForm.$error.required}}</tt><br/>
+ *     </form>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     var listInput = element(by.model('names'));
+ *     var names = element(by.exactBinding('names'));
+ *     var valid = element(by.binding('myForm.namesInput.$valid'));
+ *     var error = element(by.css('span.error'));
+ *
+ *     it('should initialize to model', function() {
+ *       expect(names.getText()).toContain('["morpheus","neo","trinity"]');
+ *       expect(valid.getText()).toContain('true');
+ *       expect(error.getCssValue('display')).toBe('none');
+ *     });
+ *
+ *     it('should be invalid if empty', function() {
+ *       listInput.clear();
+ *       listInput.sendKeys('');
+ *
+ *       expect(names.getText()).toContain('');
+ *       expect(valid.getText()).toContain('false');
+ *       expect(error.getCssValue('display')).not.toBe('none');
+ *     });
+ *   </file>
+ * </example>
+ *
+ * ### Example - splitting on newline
+ * <example name="ngList-directive-newlines">
+ *   <file name="index.html">
+ *    <textarea ng-model="list" ng-list="&#10;" ng-trim="false"></textarea>
+ *    <pre>{{ list | json }}</pre>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     it("should split the text by newlines", function() {
+ *       var listInput = element(by.model('list'));
+ *       var output = element(by.binding('list | json'));
+ *       listInput.sendKeys('abc\ndef\nghi');
+ *       expect(output.getText()).toContain('[\n  "abc",\n  "def",\n  "ghi"\n]');
+ *     });
+ *   </file>
+ * </example>
+ *
+ * @element input
+ * @param {string=} ngList optional delimiter that should be used to split the value.
+ */
+var ngListDirective = function() {
+  return {
+    restrict: 'A',
+    priority: 100,
+    require: 'ngModel',
+    link: function(scope, element, attr, ctrl) {
+      // We want to control whitespace trimming so we use this convoluted approach
+      // to access the ngList attribute, which doesn't pre-trim the attribute
+      var ngList = element.attr(attr.$attr.ngList) || ', ';
+      var trimValues = attr.ngTrim !== 'false';
+      var separator = trimValues ? trim(ngList) : ngList;
+
+      var parse = function(viewValue) {
+        // If the viewValue is invalid (say required but empty) it will be `undefined`
+        if (isUndefined(viewValue)) return;
+
+        var list = [];
+
+        if (viewValue) {
+          forEach(viewValue.split(separator), function(value) {
+            if (value) list.push(trimValues ? trim(value) : value);
+          });
+        }
+
+        return list;
+      };
+
+      ctrl.$parsers.push(parse);
+      ctrl.$formatters.push(function(value) {
+        if (isArray(value)) {
+          return value.join(ngList);
+        }
+
+        return undefined;
+      });
+
+      // Override the standard $isEmpty because an empty array means the input is empty.
+      ctrl.$isEmpty = function(value) {
+        return !value || !value.length;
+      };
+    }
+  };
+};
+
+/* global VALID_CLASS: true,
+  INVALID_CLASS: true,
+  PRISTINE_CLASS: true,
+  DIRTY_CLASS: true,
+  UNTOUCHED_CLASS: true,
+  TOUCHED_CLASS: true,
+*/
+
+var VALID_CLASS = 'ng-valid',
+    INVALID_CLASS = 'ng-invalid',
+    PRISTINE_CLASS = 'ng-pristine',
+    DIRTY_CLASS = 'ng-dirty',
+    UNTOUCHED_CLASS = 'ng-untouched',
+    TOUCHED_CLASS = 'ng-touched',
+    PENDING_CLASS = 'ng-pending';
+
+var ngModelMinErr = minErr('ngModel');
+
+/**
+ * @ngdoc type
+ * @name ngModel.NgModelController
+ *
+ * @property {*} $viewValue The actual value from the control's view. For `input` elements, this is a
+ * String. See {@link ngModel.NgModelController#$setViewValue} for information about when the $viewValue
+ * is set.
+ * @property {*} $modelValue The value in the model that the control is bound to.
+ * @property {Array.<Function>} $parsers Array of functions to execute, as a pipeline, whenever
+       the control reads value from the DOM. The functions are called in array order, each passing
+       its return value through to the next. The last return value is forwarded to the
+       {@link ngModel.NgModelController#$validators `$validators`} collection.
+
+Parsers are used to sanitize / convert the {@link ngModel.NgModelController#$viewValue
+`$viewValue`}.
+
+Returning `undefined` from a parser means a parse error occurred. In that case,
+no {@link ngModel.NgModelController#$validators `$validators`} will run and the `ngModel`
+will be set to `undefined` unless {@link ngModelOptions `ngModelOptions.allowInvalid`}
+is set to `true`. The parse error is stored in `ngModel.$error.parse`.
+
+ *
+ * @property {Array.<Function>} $formatters Array of functions to execute, as a pipeline, whenever
+       the model value changes. The functions are called in reverse array order, each passing the value through to the
+       next. The last return value is used as the actual DOM value.
+       Used to format / convert values for display in the control.
+ * ```js
+ * function formatter(value) {
+ *   if (value) {
+ *     return value.toUpperCase();
+ *   }
+ * }
+ * ngModel.$formatters.push(formatter);
+ * ```
+ *
+ * @property {Object.<string, function>} $validators A collection of validators that are applied
+ *      whenever the model value changes. The key value within the object refers to the name of the
+ *      validator while the function refers to the validation operation. The validation operation is
+ *      provided with the model value as an argument and must return a true or false value depending
+ *      on the response of that validation.
+ *
+ * ```js
+ * ngModel.$validators.validCharacters = function(modelValue, viewValue) {
+ *   var value = modelValue || viewValue;
+ *   return /[0-9]+/.test(value) &&
+ *          /[a-z]+/.test(value) &&
+ *          /[A-Z]+/.test(value) &&
+ *          /\W+/.test(value);
+ * };
+ * ```
+ *
+ * @property {Object.<string, function>} $asyncValidators A collection of validations that are expected to
+ *      perform an asynchronous validation (e.g. a HTTP request). The validation function that is provided
+ *      is expected to return a promise when it is run during the model validation process. Once the promise
+ *      is delivered then the validation status will be set to true when fulfilled and false when rejected.
+ *      When the asynchronous validators are triggered, each of the validators will run in parallel and the model
+ *      value will only be updated once all validators have been fulfilled. As long as an asynchronous validator
+ *      is unfulfilled, its key will be added to the controllers `$pending` property. Also, all asynchronous validators
+ *      will only run once all synchronous validators have passed.
+ *
+ * Please note that if $http is used then it is important that the server returns a success HTTP response code
+ * in order to fulfill the validation and a status level of `4xx` in order to reject the validation.
+ *
+ * ```js
+ * ngModel.$asyncValidators.uniqueUsername = function(modelValue, viewValue) {
+ *   var value = modelValue || viewValue;
+ *
+ *   // Lookup user by username
+ *   return $http.get('/api/users/' + value).
+ *      then(function resolved() {
+ *        //username exists, this means validation fails
+ *        return $q.reject('exists');
+ *      }, function rejected() {
+ *        //username does not exist, therefore this validation passes
+ *        return true;
+ *      });
+ * };
+ * ```
+ *
+ * @property {Array.<Function>} $viewChangeListeners Array of functions to execute whenever the
+ *     view value has changed. It is called with no arguments, and its return value is ignored.
+ *     This can be used in place of additional $watches against the model value.
+ *
+ * @property {Object} $error An object hash with all failing validator ids as keys.
+ * @property {Object} $pending An object hash with all pending validator ids as keys.
+ *
+ * @property {boolean} $untouched True if control has not lost focus yet.
+ * @property {boolean} $touched True if control has lost focus.
+ * @property {boolean} $pristine True if user has not interacted with the control yet.
+ * @property {boolean} $dirty True if user has already interacted with the control.
+ * @property {boolean} $valid True if there is no error.
+ * @property {boolean} $invalid True if at least one error on the control.
+ * @property {string} $name The name attribute of the control.
+ *
+ * @description
+ *
+ * `NgModelController` provides API for the {@link ngModel `ngModel`} directive.
+ * The controller contains services for data-binding, validation, CSS updates, and value formatting
+ * and parsing. It purposefully does not contain any logic which deals with DOM rendering or
+ * listening to DOM events.
+ * Such DOM related logic should be provided by other directives which make use of
+ * `NgModelController` for data-binding to control elements.
+ * Angular provides this DOM logic for most {@link input `input`} elements.
+ * At the end of this page you can find a {@link ngModel.NgModelController#custom-control-example
+ * custom control example} that uses `ngModelController` to bind to `contenteditable` elements.
+ *
+ * @example
+ * ### Custom Control Example
+ * This example shows how to use `NgModelController` with a custom control to achieve
+ * data-binding. Notice how different directives (`contenteditable`, `ng-model`, and `required`)
+ * collaborate together to achieve the desired result.
+ *
+ * `contenteditable` is an HTML5 attribute, which tells the browser to let the element
+ * contents be edited in place by the user.
+ *
+ * We are using the {@link ng.service:$sce $sce} service here and include the {@link ngSanitize $sanitize}
+ * module to automatically remove "bad" content like inline event listener (e.g. `<span onclick="...">`).
+ * However, as we are using `$sce` the model can still decide to provide unsafe content if it marks
+ * that content using the `$sce` service.
+ *
+ * <example name="NgModelController" module="customControl" deps="angular-sanitize.js">
+    <file name="style.css">
+      [contenteditable] {
+        border: 1px solid black;
+        background-color: white;
+        min-height: 20px;
+      }
+
+      .ng-invalid {
+        border: 1px solid red;
+      }
+
+    </file>
+    <file name="script.js">
+      angular.module('customControl', ['ngSanitize']).
+        directive('contenteditable', ['$sce', function($sce) {
+          return {
+            restrict: 'A', // only activate on element attribute
+            require: '?ngModel', // get a hold of NgModelController
+            link: function(scope, element, attrs, ngModel) {
+              if (!ngModel) return; // do nothing if no ng-model
+
+              // Specify how UI should be updated
+              ngModel.$render = function() {
+                element.html($sce.getTrustedHtml(ngModel.$viewValue || ''));
+              };
+
+              // Listen for change events to enable binding
+              element.on('blur keyup change', function() {
+                scope.$evalAsync(read);
+              });
+              read(); // initialize
+
+              // Write data to the model
+              function read() {
+                var html = element.html();
+                // When we clear the content editable the browser leaves a <br> behind
+                // If strip-br attribute is provided then we strip this out
+                if ( attrs.stripBr && html == '<br>' ) {
+                  html = '';
+                }
+                ngModel.$setViewValue(html);
+              }
+            }
+          };
+        }]);
+    </file>
+    <file name="index.html">
+      <form name="myForm">
+       <div contenteditable
+            name="myWidget" ng-model="userContent"
+            strip-br="true"
+            required>Change me!</div>
+        <span ng-show="myForm.myWidget.$error.required">Required!</span>
+       <hr>
+       <textarea ng-model="userContent" aria-label="Dynamic textarea"></textarea>
+      </form>
+    </file>
+    <file name="protractor.js" type="protractor">
+    it('should data-bind and become invalid', function() {
+      if (browser.params.browser == 'safari' || browser.params.browser == 'firefox') {
+        // SafariDriver can't handle contenteditable
+        // and Firefox driver can't clear contenteditables very well
+        return;
+      }
+      var contentEditable = element(by.css('[contenteditable]'));
+      var content = 'Change me!';
+
+      expect(contentEditable.getText()).toEqual(content);
+
+      contentEditable.clear();
+      contentEditable.sendKeys(protractor.Key.BACK_SPACE);
+      expect(contentEditable.getText()).toEqual('');
+      expect(contentEditable.getAttribute('class')).toMatch(/ng-invalid-required/);
+    });
+    </file>
+ * </example>
+ *
+ *
+ */
+var NgModelController = ['$scope', '$exceptionHandler', '$attrs', '$element', '$parse', '$animate', '$timeout', '$rootScope', '$q', '$interpolate',
+    function($scope, $exceptionHandler, $attr, $element, $parse, $animate, $timeout, $rootScope, $q, $interpolate) {
+  this.$viewValue = Number.NaN;
+  this.$modelValue = Number.NaN;
+  this.$$rawModelValue = undefined; // stores the parsed modelValue / model set from scope regardless of validity.
+  this.$validators = {};
+  this.$asyncValidators = {};
+  this.$parsers = [];
+  this.$formatters = [];
+  this.$viewChangeListeners = [];
+  this.$untouched = true;
+  this.$touched = false;
+  this.$pristine = true;
+  this.$dirty = false;
+  this.$valid = true;
+  this.$invalid = false;
+  this.$error = {}; // keep invalid keys here
+  this.$$success = {}; // keep valid keys here
+  this.$pending = undefined; // keep pending keys here
+  this.$name = $interpolate($attr.name || '', false)($scope);
+  this.$$parentForm = nullFormCtrl;
+
+  var parsedNgModel = $parse($attr.ngModel),
+      parsedNgModelAssign = parsedNgModel.assign,
+      ngModelGet = parsedNgModel,
+      ngModelSet = parsedNgModelAssign,
+      pendingDebounce = null,
+      parserValid,
+      ctrl = this;
+
+  this.$$setOptions = function(options) {
+    ctrl.$options = options;
+    if (options && options.getterSetter) {
+      var invokeModelGetter = $parse($attr.ngModel + '()'),
+          invokeModelSetter = $parse($attr.ngModel + '($$$p)');
+
+      ngModelGet = function($scope) {
+        var modelValue = parsedNgModel($scope);
+        if (isFunction(modelValue)) {
+          modelValue = invokeModelGetter($scope);
+        }
+        return modelValue;
+      };
+      ngModelSet = function($scope, newValue) {
+        if (isFunction(parsedNgModel($scope))) {
+          invokeModelSetter($scope, {$$$p: ctrl.$modelValue});
+        } else {
+          parsedNgModelAssign($scope, ctrl.$modelValue);
+        }
+      };
+    } else if (!parsedNgModel.assign) {
+      throw ngModelMinErr('nonassign', "Expression '{0}' is non-assignable. Element: {1}",
+          $attr.ngModel, startingTag($element));
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$render
+   *
+   * @description
+   * Called when the view needs to be updated. It is expected that the user of the ng-model
+   * directive will implement this method.
+   *
+   * The `$render()` method is invoked in the following situations:
+   *
+   * * `$rollbackViewValue()` is called.  If we are rolling back the view value to the last
+   *   committed value then `$render()` is called to update the input control.
+   * * The value referenced by `ng-model` is changed programmatically and both the `$modelValue` and
+   *   the `$viewValue` are different from last time.
+   *
+   * Since `ng-model` does not do a deep watch, `$render()` is only invoked if the values of
+   * `$modelValue` and `$viewValue` are actually different from their previous value. If `$modelValue`
+   * or `$viewValue` are objects (rather than a string or number) then `$render()` will not be
+   * invoked if you only change a property on the objects.
+   */
+  this.$render = noop;
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$isEmpty
+   *
+   * @description
+   * This is called when we need to determine if the value of an input is empty.
+   *
+   * For instance, the required directive does this to work out if the input has data or not.
+   *
+   * The default `$isEmpty` function checks whether the value is `undefined`, `''`, `null` or `NaN`.
+   *
+   * You can override this for input directives whose concept of being empty is different from the
+   * default. The `checkboxInputType` directive does this because in its case a value of `false`
+   * implies empty.
+   *
+   * @param {*} value The value of the input to check for emptiness.
+   * @returns {boolean} True if `value` is "empty".
+   */
+  this.$isEmpty = function(value) {
+    return isUndefined(value) || value === '' || value === null || value !== value;
+  };
+
+  var currentValidationRunId = 0;
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setValidity
+   *
+   * @description
+   * Change the validity state, and notify the form.
+   *
+   * This method can be called within $parsers/$formatters or a custom validation implementation.
+   * However, in most cases it should be sufficient to use the `ngModel.$validators` and
+   * `ngModel.$asyncValidators` collections which will call `$setValidity` automatically.
+   *
+   * @param {string} validationErrorKey Name of the validator. The `validationErrorKey` will be assigned
+   *        to either `$error[validationErrorKey]` or `$pending[validationErrorKey]`
+   *        (for unfulfilled `$asyncValidators`), so that it is available for data-binding.
+   *        The `validationErrorKey` should be in camelCase and will get converted into dash-case
+   *        for class name. Example: `myError` will result in `ng-valid-my-error` and `ng-invalid-my-error`
+   *        class and can be bound to as  `{{someForm.someControl.$error.myError}}` .
+   * @param {boolean} isValid Whether the current state is valid (true), invalid (false), pending (undefined),
+   *                          or skipped (null). Pending is used for unfulfilled `$asyncValidators`.
+   *                          Skipped is used by Angular when validators do not run because of parse errors and
+   *                          when `$asyncValidators` do not run because any of the `$validators` failed.
+   */
+  addSetValidityMethod({
+    ctrl: this,
+    $element: $element,
+    set: function(object, property) {
+      object[property] = true;
+    },
+    unset: function(object, property) {
+      delete object[property];
+    },
+    $animate: $animate
+  });
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setPristine
+   *
+   * @description
+   * Sets the control to its pristine state.
+   *
+   * This method can be called to remove the `ng-dirty` class and set the control to its pristine
+   * state (`ng-pristine` class). A model is considered to be pristine when the control
+   * has not been changed from when first compiled.
+   */
+  this.$setPristine = function() {
+    ctrl.$dirty = false;
+    ctrl.$pristine = true;
+    $animate.removeClass($element, DIRTY_CLASS);
+    $animate.addClass($element, PRISTINE_CLASS);
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setDirty
+   *
+   * @description
+   * Sets the control to its dirty state.
+   *
+   * This method can be called to remove the `ng-pristine` class and set the control to its dirty
+   * state (`ng-dirty` class). A model is considered to be dirty when the control has been changed
+   * from when first compiled.
+   */
+  this.$setDirty = function() {
+    ctrl.$dirty = true;
+    ctrl.$pristine = false;
+    $animate.removeClass($element, PRISTINE_CLASS);
+    $animate.addClass($element, DIRTY_CLASS);
+    ctrl.$$parentForm.$setDirty();
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setUntouched
+   *
+   * @description
+   * Sets the control to its untouched state.
+   *
+   * This method can be called to remove the `ng-touched` class and set the control to its
+   * untouched state (`ng-untouched` class). Upon compilation, a model is set as untouched
+   * by default, however this function can be used to restore that state if the model has
+   * already been touched by the user.
+   */
+  this.$setUntouched = function() {
+    ctrl.$touched = false;
+    ctrl.$untouched = true;
+    $animate.setClass($element, UNTOUCHED_CLASS, TOUCHED_CLASS);
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setTouched
+   *
+   * @description
+   * Sets the control to its touched state.
+   *
+   * This method can be called to remove the `ng-untouched` class and set the control to its
+   * touched state (`ng-touched` class). A model is considered to be touched when the user has
+   * first focused the control element and then shifted focus away from the control (blur event).
+   */
+  this.$setTouched = function() {
+    ctrl.$touched = true;
+    ctrl.$untouched = false;
+    $animate.setClass($element, TOUCHED_CLASS, UNTOUCHED_CLASS);
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$rollbackViewValue
+   *
+   * @description
+   * Cancel an update and reset the input element's value to prevent an update to the `$modelValue`,
+   * which may be caused by a pending debounced event or because the input is waiting for a some
+   * future event.
+   *
+   * If you have an input that uses `ng-model-options` to set up debounced updates or updates that
+   * depend on special events such as blur, you can have a situation where there is a period when
+   * the `$viewValue` is out of sync with the ngModel's `$modelValue`.
+   *
+   * In this case, you can use `$rollbackViewValue()` to manually cancel the debounced / future update
+   * and reset the input to the last committed view value.
+   *
+   * It is also possible that you run into difficulties if you try to update the ngModel's `$modelValue`
+   * programmatically before these debounced/future events have resolved/occurred, because Angular's
+   * dirty checking mechanism is not able to tell whether the model has actually changed or not.
+   *
+   * The `$rollbackViewValue()` method should be called before programmatically changing the model of an
+   * input which may have such events pending. This is important in order to make sure that the
+   * input field will be updated with the new model value and any pending operations are cancelled.
+   *
+   * <example name="ng-model-cancel-update" module="cancel-update-example">
+   *   <file name="app.js">
+   *     angular.module('cancel-update-example', [])
+   *
+   *     .controller('CancelUpdateController', ['$scope', function($scope) {
+   *       $scope.model = {};
+   *
+   *       $scope.setEmpty = function(e, value, rollback) {
+   *         if (e.keyCode == 27) {
+   *           e.preventDefault();
+   *           if (rollback) {
+   *             $scope.myForm[value].$rollbackViewValue();
+   *           }
+   *           $scope.model[value] = '';
+   *         }
+   *       };
+   *     }]);
+   *   </file>
+   *   <file name="index.html">
+   *     <div ng-controller="CancelUpdateController">
+   *        <p>Both of these inputs are only updated if they are blurred. Hitting escape should
+   *        empty them. Follow these steps and observe the difference:</p>
+   *       <ol>
+   *         <li>Type something in the input. You will see that the model is not yet updated</li>
+   *         <li>Press the Escape key.
+   *           <ol>
+   *             <li> In the first example, nothing happens, because the model is already '', and no
+   *             update is detected. If you blur the input, the model will be set to the current view.
+   *             </li>
+   *             <li> In the second example, the pending update is cancelled, and the input is set back
+   *             to the last committed view value (''). Blurring the input does nothing.
+   *             </li>
+   *           </ol>
+   *         </li>
+   *       </ol>
+   *
+   *       <form name="myForm" ng-model-options="{ updateOn: 'blur' }">
+   *         <div>
+   *        <p id="inputDescription1">Without $rollbackViewValue():</p>
+   *         <input name="value1" aria-describedby="inputDescription1" ng-model="model.value1"
+   *                ng-keydown="setEmpty($event, 'value1')">
+   *         value1: "{{ model.value1 }}"
+   *         </div>
+   *
+   *         <div>
+   *        <p id="inputDescription2">With $rollbackViewValue():</p>
+   *         <input name="value2" aria-describedby="inputDescription2" ng-model="model.value2"
+   *                ng-keydown="setEmpty($event, 'value2', true)">
+   *         value2: "{{ model.value2 }}"
+   *         </div>
+   *       </form>
+   *     </div>
+   *   </file>
+       <file name="style.css">
+          div {
+            display: table-cell;
+          }
+          div:nth-child(1) {
+            padding-right: 30px;
+          }
+
+        </file>
+   * </example>
+   */
+  this.$rollbackViewValue = function() {
+    $timeout.cancel(pendingDebounce);
+    ctrl.$viewValue = ctrl.$$lastCommittedViewValue;
+    ctrl.$render();
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$validate
+   *
+   * @description
+   * Runs each of the registered validators (first synchronous validators and then
+   * asynchronous validators).
+   * If the validity changes to invalid, the model will be set to `undefined`,
+   * unless {@link ngModelOptions `ngModelOptions.allowInvalid`} is `true`.
+   * If the validity changes to valid, it will set the model to the last available valid
+   * `$modelValue`, i.e. either the last parsed value or the last value set from the scope.
+   */
+  this.$validate = function() {
+    // ignore $validate before model is initialized
+    if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) {
+      return;
+    }
+
+    var viewValue = ctrl.$$lastCommittedViewValue;
+    // Note: we use the $$rawModelValue as $modelValue might have been
+    // set to undefined during a view -> model update that found validation
+    // errors. We can't parse the view here, since that could change
+    // the model although neither viewValue nor the model on the scope changed
+    var modelValue = ctrl.$$rawModelValue;
+
+    var prevValid = ctrl.$valid;
+    var prevModelValue = ctrl.$modelValue;
+
+    var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
+
+    ctrl.$$runValidators(modelValue, viewValue, function(allValid) {
+      // If there was no change in validity, don't update the model
+      // This prevents changing an invalid modelValue to undefined
+      if (!allowInvalid && prevValid !== allValid) {
+        // Note: Don't check ctrl.$valid here, as we could have
+        // external validators (e.g. calculated on the server),
+        // that just call $setValidity and need the model value
+        // to calculate their validity.
+        ctrl.$modelValue = allValid ? modelValue : undefined;
+
+        if (ctrl.$modelValue !== prevModelValue) {
+          ctrl.$$writeModelToScope();
+        }
+      }
+    });
+
+  };
+
+  this.$$runValidators = function(modelValue, viewValue, doneCallback) {
+    currentValidationRunId++;
+    var localValidationRunId = currentValidationRunId;
+
+    // check parser error
+    if (!processParseErrors()) {
+      validationDone(false);
+      return;
+    }
+    if (!processSyncValidators()) {
+      validationDone(false);
+      return;
+    }
+    processAsyncValidators();
+
+    function processParseErrors() {
+      var errorKey = ctrl.$$parserName || 'parse';
+      if (isUndefined(parserValid)) {
+        setValidity(errorKey, null);
+      } else {
+        if (!parserValid) {
+          forEach(ctrl.$validators, function(v, name) {
+            setValidity(name, null);
+          });
+          forEach(ctrl.$asyncValidators, function(v, name) {
+            setValidity(name, null);
+          });
+        }
+        // Set the parse error last, to prevent unsetting it, should a $validators key == parserName
+        setValidity(errorKey, parserValid);
+        return parserValid;
+      }
+      return true;
+    }
+
+    function processSyncValidators() {
+      var syncValidatorsValid = true;
+      forEach(ctrl.$validators, function(validator, name) {
+        var result = validator(modelValue, viewValue);
+        syncValidatorsValid = syncValidatorsValid && result;
+        setValidity(name, result);
+      });
+      if (!syncValidatorsValid) {
+        forEach(ctrl.$asyncValidators, function(v, name) {
+          setValidity(name, null);
+        });
+        return false;
+      }
+      return true;
+    }
+
+    function processAsyncValidators() {
+      var validatorPromises = [];
+      var allValid = true;
+      forEach(ctrl.$asyncValidators, function(validator, name) {
+        var promise = validator(modelValue, viewValue);
+        if (!isPromiseLike(promise)) {
+          throw ngModelMinErr('nopromise',
+            "Expected asynchronous validator to return a promise but got '{0}' instead.", promise);
+        }
+        setValidity(name, undefined);
+        validatorPromises.push(promise.then(function() {
+          setValidity(name, true);
+        }, function(error) {
+          allValid = false;
+          setValidity(name, false);
+        }));
+      });
+      if (!validatorPromises.length) {
+        validationDone(true);
+      } else {
+        $q.all(validatorPromises).then(function() {
+          validationDone(allValid);
+        }, noop);
+      }
+    }
+
+    function setValidity(name, isValid) {
+      if (localValidationRunId === currentValidationRunId) {
+        ctrl.$setValidity(name, isValid);
+      }
+    }
+
+    function validationDone(allValid) {
+      if (localValidationRunId === currentValidationRunId) {
+
+        doneCallback(allValid);
+      }
+    }
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$commitViewValue
+   *
+   * @description
+   * Commit a pending update to the `$modelValue`.
+   *
+   * Updates may be pending by a debounced event or because the input is waiting for a some future
+   * event defined in `ng-model-options`. this method is rarely needed as `NgModelController`
+   * usually handles calling this in response to input events.
+   */
+  this.$commitViewValue = function() {
+    var viewValue = ctrl.$viewValue;
+
+    $timeout.cancel(pendingDebounce);
+
+    // If the view value has not changed then we should just exit, except in the case where there is
+    // a native validator on the element. In this case the validation state may have changed even though
+    // the viewValue has stayed empty.
+    if (ctrl.$$lastCommittedViewValue === viewValue && (viewValue !== '' || !ctrl.$$hasNativeValidators)) {
+      return;
+    }
+    ctrl.$$lastCommittedViewValue = viewValue;
+
+    // change to dirty
+    if (ctrl.$pristine) {
+      this.$setDirty();
+    }
+    this.$$parseAndValidate();
+  };
+
+  this.$$parseAndValidate = function() {
+    var viewValue = ctrl.$$lastCommittedViewValue;
+    var modelValue = viewValue;
+    parserValid = isUndefined(modelValue) ? undefined : true;
+
+    if (parserValid) {
+      for (var i = 0; i < ctrl.$parsers.length; i++) {
+        modelValue = ctrl.$parsers[i](modelValue);
+        if (isUndefined(modelValue)) {
+          parserValid = false;
+          break;
+        }
+      }
+    }
+    if (isNumber(ctrl.$modelValue) && isNaN(ctrl.$modelValue)) {
+      // ctrl.$modelValue has not been touched yet...
+      ctrl.$modelValue = ngModelGet($scope);
+    }
+    var prevModelValue = ctrl.$modelValue;
+    var allowInvalid = ctrl.$options && ctrl.$options.allowInvalid;
+    ctrl.$$rawModelValue = modelValue;
+
+    if (allowInvalid) {
+      ctrl.$modelValue = modelValue;
+      writeToModelIfNeeded();
+    }
+
+    // Pass the $$lastCommittedViewValue here, because the cached viewValue might be out of date.
+    // This can happen if e.g. $setViewValue is called from inside a parser
+    ctrl.$$runValidators(modelValue, ctrl.$$lastCommittedViewValue, function(allValid) {
+      if (!allowInvalid) {
+        // Note: Don't check ctrl.$valid here, as we could have
+        // external validators (e.g. calculated on the server),
+        // that just call $setValidity and need the model value
+        // to calculate their validity.
+        ctrl.$modelValue = allValid ? modelValue : undefined;
+        writeToModelIfNeeded();
+      }
+    });
+
+    function writeToModelIfNeeded() {
+      if (ctrl.$modelValue !== prevModelValue) {
+        ctrl.$$writeModelToScope();
+      }
+    }
+  };
+
+  this.$$writeModelToScope = function() {
+    ngModelSet($scope, ctrl.$modelValue);
+    forEach(ctrl.$viewChangeListeners, function(listener) {
+      try {
+        listener();
+      } catch (e) {
+        $exceptionHandler(e);
+      }
+    });
+  };
+
+  /**
+   * @ngdoc method
+   * @name ngModel.NgModelController#$setViewValue
+   *
+   * @description
+   * Update the view value.
+   *
+   * This method should be called when a control wants to change the view value; typically,
+   * this is done from within a DOM event handler. For example, the {@link ng.directive:input input}
+   * directive calls it when the value of the input changes and {@link ng.directive:select select}
+   * calls it when an option is selected.
+   *
+   * When `$setViewValue` is called, the new `value` will be staged for committing through the `$parsers`
+   * and `$validators` pipelines. If there are no special {@link ngModelOptions} specified then the staged
+   * value sent directly for processing, finally to be applied to `$modelValue` and then the
+   * **expression** specified in the `ng-model` attribute. Lastly, all the registered change listeners,
+   * in the `$viewChangeListeners` list, are called.
+   *
+   * In case the {@link ng.directive:ngModelOptions ngModelOptions} directive is used with `updateOn`
+   * and the `default` trigger is not listed, all those actions will remain pending until one of the
+   * `updateOn` events is triggered on the DOM element.
+   * All these actions will be debounced if the {@link ng.directive:ngModelOptions ngModelOptions}
+   * directive is used with a custom debounce for this particular event.
+   * Note that a `$digest` is only triggered once the `updateOn` events are fired, or if `debounce`
+   * is specified, once the timer runs out.
+   *
+   * When used with standard inputs, the view value will always be a string (which is in some cases
+   * parsed into another type, such as a `Date` object for `input[date]`.)
+   * However, custom controls might also pass objects to this method. In this case, we should make
+   * a copy of the object before passing it to `$setViewValue`. This is because `ngModel` does not
+   * perform a deep watch of objects, it only looks for a change of identity. If you only change
+   * the property of the object then ngModel will not realise that the object has changed and
+   * will not invoke the `$parsers` and `$validators` pipelines. For this reason, you should
+   * not change properties of the copy once it has been passed to `$setViewValue`.
+   * Otherwise you may cause the model value on the scope to change incorrectly.
+   *
+   * <div class="alert alert-info">
+   * In any case, the value passed to the method should always reflect the current value
+   * of the control. For example, if you are calling `$setViewValue` for an input element,
+   * you should pass the input DOM value. Otherwise, the control and the scope model become
+   * out of sync. It's also important to note that `$setViewValue` does not call `$render` or change
+   * the control's DOM value in any way. If we want to change the control's DOM value
+   * programmatically, we should update the `ngModel` scope expression. Its new value will be
+   * picked up by the model controller, which will run it through the `$formatters`, `$render` it
+   * to update the DOM, and finally call `$validate` on it.
+   * </div>
+   *
+   * @param {*} value value from the view.
+   * @param {string} trigger Event that triggered the update.
+   */
+  this.$setViewValue = function(value, trigger) {
+    ctrl.$viewValue = value;
+    if (!ctrl.$options || ctrl.$options.updateOnDefault) {
+      ctrl.$$debounceViewValueCommit(trigger);
+    }
+  };
+
+  this.$$debounceViewValueCommit = function(trigger) {
+    var debounceDelay = 0,
+        options = ctrl.$options,
+        debounce;
+
+    if (options && isDefined(options.debounce)) {
+      debounce = options.debounce;
+      if (isNumber(debounce)) {
+        debounceDelay = debounce;
+      } else if (isNumber(debounce[trigger])) {
+        debounceDelay = debounce[trigger];
+      } else if (isNumber(debounce['default'])) {
+        debounceDelay = debounce['default'];
+      }
+    }
+
+    $timeout.cancel(pendingDebounce);
+    if (debounceDelay) {
+      pendingDebounce = $timeout(function() {
+        ctrl.$commitViewValue();
+      }, debounceDelay);
+    } else if ($rootScope.$$phase) {
+      ctrl.$commitViewValue();
+    } else {
+      $scope.$apply(function() {
+        ctrl.$commitViewValue();
+      });
+    }
+  };
+
+  // model -> value
+  // Note: we cannot use a normal scope.$watch as we want to detect the following:
+  // 1. scope value is 'a'
+  // 2. user enters 'b'
+  // 3. ng-change kicks in and reverts scope value to 'a'
+  //    -> scope value did not change since the last digest as
+  //       ng-change executes in apply phase
+  // 4. view should be changed back to 'a'
+  $scope.$watch(function ngModelWatch() {
+    var modelValue = ngModelGet($scope);
+
+    // if scope model value and ngModel value are out of sync
+    // TODO(perf): why not move this to the action fn?
+    if (modelValue !== ctrl.$modelValue &&
+       // checks for NaN is needed to allow setting the model to NaN when there's an asyncValidator
+       (ctrl.$modelValue === ctrl.$modelValue || modelValue === modelValue)
+    ) {
+      ctrl.$modelValue = ctrl.$$rawModelValue = modelValue;
+      parserValid = undefined;
+
+      var formatters = ctrl.$formatters,
+          idx = formatters.length;
+
+      var viewValue = modelValue;
+      while (idx--) {
+        viewValue = formatters[idx](viewValue);
+      }
+      if (ctrl.$viewValue !== viewValue) {
+        ctrl.$viewValue = ctrl.$$lastCommittedViewValue = viewValue;
+        ctrl.$render();
+
+        ctrl.$$runValidators(modelValue, viewValue, noop);
+      }
+    }
+
+    return modelValue;
+  });
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngModel
+ *
+ * @element input
+ * @priority 1
+ *
+ * @description
+ * The `ngModel` directive binds an `input`,`select`, `textarea` (or custom form control) to a
+ * property on the scope using {@link ngModel.NgModelController NgModelController},
+ * which is created and exposed by this directive.
+ *
+ * `ngModel` is responsible for:
+ *
+ * - Binding the view into the model, which other directives such as `input`, `textarea` or `select`
+ *   require.
+ * - Providing validation behavior (i.e. required, number, email, url).
+ * - Keeping the state of the control (valid/invalid, dirty/pristine, touched/untouched, validation errors).
+ * - Setting related css classes on the element (`ng-valid`, `ng-invalid`, `ng-dirty`, `ng-pristine`, `ng-touched`, `ng-untouched`) including animations.
+ * - Registering the control with its parent {@link ng.directive:form form}.
+ *
+ * Note: `ngModel` will try to bind to the property given by evaluating the expression on the
+ * current scope. If the property doesn't already exist on this scope, it will be created
+ * implicitly and added to the scope.
+ *
+ * For best practices on using `ngModel`, see:
+ *
+ *  - [Understanding Scopes](https://github.com/angular/angular.js/wiki/Understanding-Scopes)
+ *
+ * For basic examples, how to use `ngModel`, see:
+ *
+ *  - {@link ng.directive:input input}
+ *    - {@link input[text] text}
+ *    - {@link input[checkbox] checkbox}
+ *    - {@link input[radio] radio}
+ *    - {@link input[number] number}
+ *    - {@link input[email] email}
+ *    - {@link input[url] url}
+ *    - {@link input[date] date}
+ *    - {@link input[datetime-local] datetime-local}
+ *    - {@link input[time] time}
+ *    - {@link input[month] month}
+ *    - {@link input[week] week}
+ *  - {@link ng.directive:select select}
+ *  - {@link ng.directive:textarea textarea}
+ *
+ * # CSS classes
+ * The following CSS classes are added and removed on the associated input/select/textarea element
+ * depending on the validity of the model.
+ *
+ *  - `ng-valid`: the model is valid
+ *  - `ng-invalid`: the model is invalid
+ *  - `ng-valid-[key]`: for each valid key added by `$setValidity`
+ *  - `ng-invalid-[key]`: for each invalid key added by `$setValidity`
+ *  - `ng-pristine`: the control hasn't been interacted with yet
+ *  - `ng-dirty`: the control has been interacted with
+ *  - `ng-touched`: the control has been blurred
+ *  - `ng-untouched`: the control hasn't been blurred
+ *  - `ng-pending`: any `$asyncValidators` are unfulfilled
+ *
+ * Keep in mind that ngAnimate can detect each of these classes when added and removed.
+ *
+ * ## Animation Hooks
+ *
+ * Animations within models are triggered when any of the associated CSS classes are added and removed
+ * on the input element which is attached to the model. These classes are: `.ng-pristine`, `.ng-dirty`,
+ * `.ng-invalid` and `.ng-valid` as well as any other validations that are performed on the model itself.
+ * The animations that are triggered within ngModel are similar to how they work in ngClass and
+ * animations can be hooked into using CSS transitions, keyframes as well as JS animations.
+ *
+ * The following example shows a simple way to utilize CSS transitions to style an input element
+ * that has been rendered as invalid after it has been validated:
+ *
+ * <pre>
+ * //be sure to include ngAnimate as a module to hook into more
+ * //advanced animations
+ * .my-input {
+ *   transition:0.5s linear all;
+ *   background: white;
+ * }
+ * .my-input.ng-invalid {
+ *   background: red;
+ *   color:white;
+ * }
+ * </pre>
+ *
+ * @example
+ * <example deps="angular-animate.js" animations="true" fixBase="true" module="inputExample">
+     <file name="index.html">
+       <script>
+        angular.module('inputExample', [])
+          .controller('ExampleController', ['$scope', function($scope) {
+            $scope.val = '1';
+          }]);
+       </script>
+       <style>
+         .my-input {
+           transition:all linear 0.5s;
+           background: transparent;
+         }
+         .my-input.ng-invalid {
+           color:white;
+           background: red;
+         }
+       </style>
+       <p id="inputDescription">
+        Update input to see transitions when valid/invalid.
+        Integer is a valid value.
+       </p>
+       <form name="testForm" ng-controller="ExampleController">
+         <input ng-model="val" ng-pattern="/^\d+$/" name="anim" class="my-input"
+                aria-describedby="inputDescription" />
+       </form>
+     </file>
+ * </example>
+ *
+ * ## Binding to a getter/setter
+ *
+ * Sometimes it's helpful to bind `ngModel` to a getter/setter function.  A getter/setter is a
+ * function that returns a representation of the model when called with zero arguments, and sets
+ * the internal state of a model when called with an argument. It's sometimes useful to use this
+ * for models that have an internal representation that's different from what the model exposes
+ * to the view.
+ *
+ * <div class="alert alert-success">
+ * **Best Practice:** It's best to keep getters fast because Angular is likely to call them more
+ * frequently than other parts of your code.
+ * </div>
+ *
+ * You use this behavior by adding `ng-model-options="{ getterSetter: true }"` to an element that
+ * has `ng-model` attached to it. You can also add `ng-model-options="{ getterSetter: true }"` to
+ * a `<form>`, which will enable this behavior for all `<input>`s within it. See
+ * {@link ng.directive:ngModelOptions `ngModelOptions`} for more.
+ *
+ * The following example shows how to use `ngModel` with a getter/setter:
+ *
+ * @example
+ * <example name="ngModel-getter-setter" module="getterSetterExample">
+     <file name="index.html">
+       <div ng-controller="ExampleController">
+         <form name="userForm">
+           <label>Name:
+             <input type="text" name="userName"
+                    ng-model="user.name"
+                    ng-model-options="{ getterSetter: true }" />
+           </label>
+         </form>
+         <pre>user.name = <span ng-bind="user.name()"></span></pre>
+       </div>
+     </file>
+     <file name="app.js">
+       angular.module('getterSetterExample', [])
+         .controller('ExampleController', ['$scope', function($scope) {
+           var _name = 'Brian';
+           $scope.user = {
+             name: function(newName) {
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
+             }
+           };
+         }]);
+     </file>
+ * </example>
+ */
+var ngModelDirective = ['$rootScope', function($rootScope) {
+  return {
+    restrict: 'A',
+    require: ['ngModel', '^?form', '^?ngModelOptions'],
+    controller: NgModelController,
+    // Prelink needs to run before any input directive
+    // so that we can set the NgModelOptions in NgModelController
+    // before anyone else uses it.
+    priority: 1,
+    compile: function ngModelCompile(element) {
+      // Setup initial state of the control
+      element.addClass(PRISTINE_CLASS).addClass(UNTOUCHED_CLASS).addClass(VALID_CLASS);
+
+      return {
+        pre: function ngModelPreLink(scope, element, attr, ctrls) {
+          var modelCtrl = ctrls[0],
+              formCtrl = ctrls[1] || modelCtrl.$$parentForm;
+
+          modelCtrl.$$setOptions(ctrls[2] && ctrls[2].$options);
+
+          // notify others, especially parent forms
+          formCtrl.$addControl(modelCtrl);
+
+          attr.$observe('name', function(newValue) {
+            if (modelCtrl.$name !== newValue) {
+              modelCtrl.$$parentForm.$$renameControl(modelCtrl, newValue);
+            }
+          });
+
+          scope.$on('$destroy', function() {
+            modelCtrl.$$parentForm.$removeControl(modelCtrl);
+          });
+        },
+        post: function ngModelPostLink(scope, element, attr, ctrls) {
+          var modelCtrl = ctrls[0];
+          if (modelCtrl.$options && modelCtrl.$options.updateOn) {
+            element.on(modelCtrl.$options.updateOn, function(ev) {
+              modelCtrl.$$debounceViewValueCommit(ev && ev.type);
+            });
+          }
+
+          element.on('blur', function(ev) {
+            if (modelCtrl.$touched) return;
+
+            if ($rootScope.$$phase) {
+              scope.$evalAsync(modelCtrl.$setTouched);
+            } else {
+              scope.$apply(modelCtrl.$setTouched);
+            }
+          });
+        }
+      };
+    }
+  };
+}];
+
+var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;
+
+/**
+ * @ngdoc directive
+ * @name ngModelOptions
+ *
+ * @description
+ * Allows tuning how model updates are done. Using `ngModelOptions` you can specify a custom list of
+ * events that will trigger a model update and/or a debouncing delay so that the actual update only
+ * takes place when a timer expires; this timer will be reset after another change takes place.
+ *
+ * Given the nature of `ngModelOptions`, the value displayed inside input fields in the view might
+ * be different from the value in the actual model. This means that if you update the model you
+ * should also invoke {@link ngModel.NgModelController `$rollbackViewValue`} on the relevant input field in
+ * order to make sure it is synchronized with the model and that any debounced action is canceled.
+ *
+ * The easiest way to reference the control's {@link ngModel.NgModelController `$rollbackViewValue`}
+ * method is by making sure the input is placed inside a form that has a `name` attribute. This is
+ * important because `form` controllers are published to the related scope under the name in their
+ * `name` attribute.
+ *
+ * Any pending changes will take place immediately when an enclosing form is submitted via the
+ * `submit` event. Note that `ngClick` events will occur before the model is updated. Use `ngSubmit`
+ * to have access to the updated model.
+ *
+ * `ngModelOptions` has an effect on the element it's declared on and its descendants.
+ *
+ * @param {Object} ngModelOptions options to apply to the current model. Valid keys are:
+ *   - `updateOn`: string specifying which event should the input be bound to. You can set several
+ *     events using an space delimited list. There is a special event called `default` that
+ *     matches the default events belonging of the control.
+ *   - `debounce`: integer value which contains the debounce model update value in milliseconds. A
+ *     value of 0 triggers an immediate update. If an object is supplied instead, you can specify a
+ *     custom value for each event. For example:
+ *     `ng-model-options="{ updateOn: 'default blur', debounce: { 'default': 500, 'blur': 0 } }"`
+ *   - `allowInvalid`: boolean value which indicates that the model can be set with values that did
+ *     not validate correctly instead of the default behavior of setting the model to undefined.
+ *   - `getterSetter`: boolean value which determines whether or not to treat functions bound to
+       `ngModel` as getters/setters.
+ *   - `timezone`: Defines the timezone to be used to read/write the `Date` instance in the model for
+ *     `<input type="date">`, `<input type="time">`, ... . It understands UTC/GMT and the
+ *     continental US time zone abbreviations, but for general use, use a time zone offset, for
+ *     example, `'+0430'` (4 hours, 30 minutes east of the Greenwich meridian)
+ *     If not specified, the timezone of the browser will be used.
+ *
+ * @example
+
+  The following example shows how to override immediate updates. Changes on the inputs within the
+  form will update the model only when the control loses focus (blur event). If `escape` key is
+  pressed while the input field is focused, the value is reset to the value in the current model.
+
+  <example name="ngModelOptions-directive-blur" module="optionsExample">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <form name="userForm">
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ updateOn: 'blur' }"
+                   ng-keyup="cancel($event)" />
+          </label><br />
+          <label>Other data:
+            <input type="text" ng-model="user.data" />
+          </label><br />
+        </form>
+        <pre>user.name = <span ng-bind="user.name"></span></pre>
+        <pre>user.data = <span ng-bind="user.data"></span></pre>
+      </div>
+    </file>
+    <file name="app.js">
+      angular.module('optionsExample', [])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.user = { name: 'John', data: '' };
+
+          $scope.cancel = function(e) {
+            if (e.keyCode == 27) {
+              $scope.userForm.userName.$rollbackViewValue();
+            }
+          };
+        }]);
+    </file>
+    <file name="protractor.js" type="protractor">
+      var model = element(by.binding('user.name'));
+      var input = element(by.model('user.name'));
+      var other = element(by.model('user.data'));
+
+      it('should allow custom events', function() {
+        input.sendKeys(' Doe');
+        input.click();
+        expect(model.getText()).toEqual('John');
+        other.click();
+        expect(model.getText()).toEqual('John Doe');
+      });
+
+      it('should $rollbackViewValue when model changes', function() {
+        input.sendKeys(' Doe');
+        expect(input.getAttribute('value')).toEqual('John Doe');
+        input.sendKeys(protractor.Key.ESCAPE);
+        expect(input.getAttribute('value')).toEqual('John');
+        other.click();
+        expect(model.getText()).toEqual('John');
+      });
+    </file>
+  </example>
+
+  This one shows how to debounce model changes. Model will be updated only 1 sec after last change.
+  If the `Clear` button is pressed, any debounced action is canceled and the value becomes empty.
+
+  <example name="ngModelOptions-directive-debounce" module="optionsExample">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <form name="userForm">
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ debounce: 1000 }" />
+          </label>
+          <button ng-click="userForm.userName.$rollbackViewValue(); user.name=''">Clear</button>
+          <br />
+        </form>
+        <pre>user.name = <span ng-bind="user.name"></span></pre>
+      </div>
+    </file>
+    <file name="app.js">
+      angular.module('optionsExample', [])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.user = { name: 'Igor' };
+        }]);
+    </file>
+  </example>
+
+  This one shows how to bind to getter/setters:
+
+  <example name="ngModelOptions-directive-getter-setter" module="getterSetterExample">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <form name="userForm">
+          <label>Name:
+            <input type="text" name="userName"
+                   ng-model="user.name"
+                   ng-model-options="{ getterSetter: true }" />
+          </label>
+        </form>
+        <pre>user.name = <span ng-bind="user.name()"></span></pre>
+      </div>
+    </file>
+    <file name="app.js">
+      angular.module('getterSetterExample', [])
+        .controller('ExampleController', ['$scope', function($scope) {
+          var _name = 'Brian';
+          $scope.user = {
+            name: function(newName) {
+              // Note that newName can be undefined for two reasons:
+              // 1. Because it is called as a getter and thus called with no arguments
+              // 2. Because the property should actually be set to undefined. This happens e.g. if the
+              //    input is invalid
+              return arguments.length ? (_name = newName) : _name;
+            }
+          };
+        }]);
+    </file>
+  </example>
+ */
+var ngModelOptionsDirective = function() {
+  return {
+    restrict: 'A',
+    controller: ['$scope', '$attrs', function($scope, $attrs) {
+      var that = this;
+      this.$options = copy($scope.$eval($attrs.ngModelOptions));
+      // Allow adding/overriding bound events
+      if (isDefined(this.$options.updateOn)) {
+        this.$options.updateOnDefault = false;
+        // extract "default" pseudo-event from list of events that can trigger a model update
+        this.$options.updateOn = trim(this.$options.updateOn.replace(DEFAULT_REGEXP, function() {
+          that.$options.updateOnDefault = true;
+          return ' ';
+        }));
+      } else {
+        this.$options.updateOnDefault = true;
+      }
+    }]
+  };
+};
+
+
+
+// helper methods
+function addSetValidityMethod(context) {
+  var ctrl = context.ctrl,
+      $element = context.$element,
+      classCache = {},
+      set = context.set,
+      unset = context.unset,
+      $animate = context.$animate;
+
+  classCache[INVALID_CLASS] = !(classCache[VALID_CLASS] = $element.hasClass(VALID_CLASS));
+
+  ctrl.$setValidity = setValidity;
+
+  function setValidity(validationErrorKey, state, controller) {
+    if (isUndefined(state)) {
+      createAndSet('$pending', validationErrorKey, controller);
+    } else {
+      unsetAndCleanup('$pending', validationErrorKey, controller);
+    }
+    if (!isBoolean(state)) {
+      unset(ctrl.$error, validationErrorKey, controller);
+      unset(ctrl.$$success, validationErrorKey, controller);
+    } else {
+      if (state) {
+        unset(ctrl.$error, validationErrorKey, controller);
+        set(ctrl.$$success, validationErrorKey, controller);
+      } else {
+        set(ctrl.$error, validationErrorKey, controller);
+        unset(ctrl.$$success, validationErrorKey, controller);
+      }
+    }
+    if (ctrl.$pending) {
+      cachedToggleClass(PENDING_CLASS, true);
+      ctrl.$valid = ctrl.$invalid = undefined;
+      toggleValidationCss('', null);
+    } else {
+      cachedToggleClass(PENDING_CLASS, false);
+      ctrl.$valid = isObjectEmpty(ctrl.$error);
+      ctrl.$invalid = !ctrl.$valid;
+      toggleValidationCss('', ctrl.$valid);
+    }
+
+    // re-read the state as the set/unset methods could have
+    // combined state in ctrl.$error[validationError] (used for forms),
+    // where setting/unsetting only increments/decrements the value,
+    // and does not replace it.
+    var combinedState;
+    if (ctrl.$pending && ctrl.$pending[validationErrorKey]) {
+      combinedState = undefined;
+    } else if (ctrl.$error[validationErrorKey]) {
+      combinedState = false;
+    } else if (ctrl.$$success[validationErrorKey]) {
+      combinedState = true;
+    } else {
+      combinedState = null;
+    }
+
+    toggleValidationCss(validationErrorKey, combinedState);
+    ctrl.$$parentForm.$setValidity(validationErrorKey, combinedState, ctrl);
+  }
+
+  function createAndSet(name, value, controller) {
+    if (!ctrl[name]) {
+      ctrl[name] = {};
+    }
+    set(ctrl[name], value, controller);
+  }
+
+  function unsetAndCleanup(name, value, controller) {
+    if (ctrl[name]) {
+      unset(ctrl[name], value, controller);
+    }
+    if (isObjectEmpty(ctrl[name])) {
+      ctrl[name] = undefined;
+    }
+  }
+
+  function cachedToggleClass(className, switchValue) {
+    if (switchValue && !classCache[className]) {
+      $animate.addClass($element, className);
+      classCache[className] = true;
+    } else if (!switchValue && classCache[className]) {
+      $animate.removeClass($element, className);
+      classCache[className] = false;
+    }
+  }
+
+  function toggleValidationCss(validationErrorKey, isValid) {
+    validationErrorKey = validationErrorKey ? '-' + snake_case(validationErrorKey, '-') : '';
+
+    cachedToggleClass(VALID_CLASS + validationErrorKey, isValid === true);
+    cachedToggleClass(INVALID_CLASS + validationErrorKey, isValid === false);
+  }
+}
+
+function isObjectEmpty(obj) {
+  if (obj) {
+    for (var prop in obj) {
+      if (obj.hasOwnProperty(prop)) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+/**
+ * @ngdoc directive
+ * @name ngNonBindable
+ * @restrict AC
+ * @priority 1000
+ *
+ * @description
+ * The `ngNonBindable` directive tells Angular not to compile or bind the contents of the current
+ * DOM element. This is useful if the element contains what appears to be Angular directives and
+ * bindings but which should be ignored by Angular. This could be the case if you have a site that
+ * displays snippets of code, for instance.
+ *
+ * @element ANY
+ *
+ * @example
+ * In this example there are two locations where a simple interpolation binding (`{{}}`) is present,
+ * but the one wrapped in `ngNonBindable` is left alone.
+ *
+ * @example
+    <example>
+      <file name="index.html">
+        <div>Normal: {{1 + 2}}</div>
+        <div ng-non-bindable>Ignored: {{1 + 2}}</div>
+      </file>
+      <file name="protractor.js" type="protractor">
+       it('should check ng-non-bindable', function() {
+         expect(element(by.binding('1 + 2')).getText()).toContain('3');
+         expect(element.all(by.css('div')).last().getText()).toMatch(/1 \+ 2/);
+       });
+      </file>
+    </example>
+ */
+var ngNonBindableDirective = ngDirective({ terminal: true, priority: 1000 });
+
+/* global jqLiteRemove */
+
+var ngOptionsMinErr = minErr('ngOptions');
+
+/**
+ * @ngdoc directive
+ * @name ngOptions
+ * @restrict A
+ *
+ * @description
+ *
+ * The `ngOptions` attribute can be used to dynamically generate a list of `<option>`
+ * elements for the `<select>` element using the array or object obtained by evaluating the
+ * `ngOptions` comprehension expression.
+ *
+ * In many cases, `ngRepeat` can be used on `<option>` elements instead of `ngOptions` to achieve a
+ * similar result. However, `ngOptions` provides some benefits such as reducing memory and
+ * increasing speed by not creating a new scope for each repeated instance, as well as providing
+ * more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+ * comprehension expression. `ngOptions` should be used when the `<select>` model needs to be bound
+ *  to a non-string value. This is because an option element can only be bound to string values at
+ * present.
+ *
+ * When an item in the `<select>` menu is selected, the array element or object property
+ * represented by the selected option will be bound to the model identified by the `ngModel`
+ * directive.
+ *
+ * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+ * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+ * option. See example below for demonstration.
+ *
+ * ## Complex Models (objects or collections)
+ *
+ * By default, `ngModel` watches the model by reference, not value. This is important to know when
+ * binding the select to a model that is an object or a collection.
+ *
+ * One issue occurs if you want to preselect an option. For example, if you set
+ * the model to an object that is equal to an object in your collection, `ngOptions` won't be able to set the selection,
+ * because the objects are not identical. So by default, you should always reference the item in your collection
+ * for preselections, e.g.: `$scope.selected = $scope.collection[3]`.
+ *
+ * Another solution is to use a `track by` clause, because then `ngOptions` will track the identity
+ * of the item not by reference, but by the result of the `track by` expression. For example, if your
+ * collection items have an id property, you would `track by item.id`.
+ *
+ * A different issue with objects or collections is that ngModel won't detect if an object property or
+ * a collection item changes. For that reason, `ngOptions` additionally watches the model using
+ * `$watchCollection`, when the expression contains a `track by` clause or the the select has the `multiple` attribute.
+ * This allows ngOptions to trigger a re-rendering of the options even if the actual object/collection
+ * has not changed identity, but only a property on the object or an item in the collection changes.
+ *
+ * Note that `$watchCollection` does a shallow comparison of the properties of the object (or the items in the collection
+ * if the model is an array). This means that changing a property deeper than the first level inside the
+ * object/collection will not trigger a re-rendering.
+ *
+ * ## `select` **`as`**
+ *
+ * Using `select` **`as`** will bind the result of the `select` expression to the model, but
+ * the value of the `<select>` and `<option>` html elements will be either the index (for array data sources)
+ * or property name (for object data sources) of the value within the collection. If a **`track by`** expression
+ * is used, the result of that expression will be set as the value of the `option` and `select` elements.
+ *
+ *
+ * ### `select` **`as`** and **`track by`**
+ *
+ * <div class="alert alert-warning">
+ * Be careful when using `select` **`as`** and **`track by`** in the same expression.
+ * </div>
+ *
+ * Given this array of items on the $scope:
+ *
+ * ```js
+ * $scope.items = [{
+ *   id: 1,
+ *   label: 'aLabel',
+ *   subItem: { name: 'aSubItem' }
+ * }, {
+ *   id: 2,
+ *   label: 'bLabel',
+ *   subItem: { name: 'bSubItem' }
+ * }];
+ * ```
+ *
+ * This will work:
+ *
+ * ```html
+ * <select ng-options="item as item.label for item in items track by item.id" ng-model="selected"></select>
+ * ```
+ * ```js
+ * $scope.selected = $scope.items[0];
+ * ```
+ *
+ * but this will not work:
+ *
+ * ```html
+ * <select ng-options="item.subItem as item.label for item in items track by item.id" ng-model="selected"></select>
+ * ```
+ * ```js
+ * $scope.selected = $scope.items[0].subItem;
+ * ```
+ *
+ * In both examples, the **`track by`** expression is applied successfully to each `item` in the
+ * `items` array. Because the selected option has been set programmatically in the controller, the
+ * **`track by`** expression is also applied to the `ngModel` value. In the first example, the
+ * `ngModel` value is `items[0]` and the **`track by`** expression evaluates to `items[0].id` with
+ * no issue. In the second example, the `ngModel` value is `items[0].subItem` and the **`track by`**
+ * expression evaluates to `items[0].subItem.id` (which is undefined). As a result, the model value
+ * is not matched against any `<option>` and the `<select>` appears as having no selected value.
+ *
+ *
+ * @param {string} ngModel Assignable angular expression to data-bind to.
+ * @param {string=} name Property name of the form under which the control is published.
+ * @param {string=} required The control is considered valid only if value is entered.
+ * @param {string=} ngRequired Adds `required` attribute and `required` validation constraint to
+ *    the element when the ngRequired expression evaluates to true. Use `ngRequired` instead of
+ *    `required` when you want to data-bind to the `required` attribute.
+ * @param {comprehension_expression=} ngOptions in one of the following forms:
+ *
+ *   * for array data sources:
+ *     * `label` **`for`** `value` **`in`** `array`
+ *     * `select` **`as`** `label` **`for`** `value` **`in`** `array`
+ *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array`
+ *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array`
+ *     * `label` **`group by`** `group` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+ *     * `label` **`disable when`** `disable` **`for`** `value` **`in`** `array` **`track by`** `trackexpr`
+ *     * `label` **`for`** `value` **`in`** `array` | orderBy:`orderexpr` **`track by`** `trackexpr`
+ *        (for including a filter with `track by`)
+ *   * for object data sources:
+ *     * `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+ *     * `select` **`as`** `label` **`for (`**`key` **`,`** `value`**`) in`** `object`
+ *     * `label` **`group by`** `group` **`for (`**`key`**`,`** `value`**`) in`** `object`
+ *     * `label` **`disable when`** `disable` **`for (`**`key`**`,`** `value`**`) in`** `object`
+ *     * `select` **`as`** `label` **`group by`** `group`
+ *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+ *     * `select` **`as`** `label` **`disable when`** `disable`
+ *         **`for` `(`**`key`**`,`** `value`**`) in`** `object`
+ *
+ * Where:
+ *
+ *   * `array` / `object`: an expression which evaluates to an array / object to iterate over.
+ *   * `value`: local variable which will refer to each item in the `array` or each property value
+ *      of `object` during iteration.
+ *   * `key`: local variable which will refer to a property name in `object` during iteration.
+ *   * `label`: The result of this expression will be the label for `<option>` element. The
+ *     `expression` will most likely refer to the `value` variable (e.g. `value.propertyName`).
+ *   * `select`: The result of this expression will be bound to the model of the parent `<select>`
+ *      element. If not specified, `select` expression will default to `value`.
+ *   * `group`: The result of this expression will be used to group options using the `<optgroup>`
+ *      DOM element.
+ *   * `disable`: The result of this expression will be used to disable the rendered `<option>`
+ *      element. Return `true` to disable.
+ *   * `trackexpr`: Used when working with an array of objects. The result of this expression will be
+ *      used to identify the objects in the array. The `trackexpr` will most likely refer to the
+ *     `value` variable (e.g. `value.propertyName`). With this the selection is preserved
+ *      even when the options are recreated (e.g. reloaded from the server).
+ *
+ * @example
+    <example module="selectExample">
+      <file name="index.html">
+        <script>
+        angular.module('selectExample', [])
+          .controller('ExampleController', ['$scope', function($scope) {
+            $scope.colors = [
+              {name:'black', shade:'dark'},
+              {name:'white', shade:'light', notAnOption: true},
+              {name:'red', shade:'dark'},
+              {name:'blue', shade:'dark', notAnOption: true},
+              {name:'yellow', shade:'light', notAnOption: false}
+            ];
+            $scope.myColor = $scope.colors[2]; // red
+          }]);
+        </script>
+        <div ng-controller="ExampleController">
+          <ul>
+            <li ng-repeat="color in colors">
+              <label>Name: <input ng-model="color.name"></label>
+              <label><input type="checkbox" ng-model="color.notAnOption"> Disabled?</label>
+              <button ng-click="colors.splice($index, 1)" aria-label="Remove">X</button>
+            </li>
+            <li>
+              <button ng-click="colors.push({})">add</button>
+            </li>
+          </ul>
+          <hr/>
+          <label>Color (null not allowed):
+            <select ng-model="myColor" ng-options="color.name for color in colors"></select>
+          </label><br/>
+          <label>Color (null allowed):
+          <span  class="nullable">
+            <select ng-model="myColor" ng-options="color.name for color in colors">
+              <option value="">-- choose color --</option>
+            </select>
+          </span></label><br/>
+
+          <label>Color grouped by shade:
+            <select ng-model="myColor" ng-options="color.name group by color.shade for color in colors">
+            </select>
+          </label><br/>
+
+          <label>Color grouped by shade, with some disabled:
+            <select ng-model="myColor"
+                  ng-options="color.name group by color.shade disable when color.notAnOption for color in colors">
+            </select>
+          </label><br/>
+
+
+
+          Select <button ng-click="myColor = { name:'not in list', shade: 'other' }">bogus</button>.
+          <br/>
+          <hr/>
+          Currently selected: {{ {selected_color:myColor} }}
+          <div style="border:solid 1px black; height:20px"
+               ng-style="{'background-color':myColor.name}">
+          </div>
+        </div>
+      </file>
+      <file name="protractor.js" type="protractor">
+         it('should check ng-options', function() {
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('red');
+           element.all(by.model('myColor')).first().click();
+           element.all(by.css('select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('black');
+           element(by.css('.nullable select[ng-model="myColor"]')).click();
+           element.all(by.css('.nullable select[ng-model="myColor"] option')).first().click();
+           expect(element(by.binding('{selected_color:myColor}')).getText()).toMatch('null');
+         });
+      </file>
+    </example>
+ */
+
+// jshint maxlen: false
+//                     //00001111111111000000000002222222222000000000000000000000333333333300000000000000000000000004444444444400000000000005555555555555550000000006666666666666660000000777777777777777000000000000000888888888800000000000000000009999999999
+var NG_OPTIONS_REGEXP = /^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/;
+                        // 1: value expression (valueFn)
+                        // 2: label expression (displayFn)
+                        // 3: group by expression (groupByFn)
+                        // 4: disable when expression (disableWhenFn)
+                        // 5: array item variable name
+                        // 6: object item key variable name
+                        // 7: object item value variable name
+                        // 8: collection expression
+                        // 9: track by expression
+// jshint maxlen: 100
+
+
+var ngOptionsDirective = ['$compile', '$parse', function($compile, $parse) {
+
+  function parseOptionsExpression(optionsExp, selectElement, scope) {
+
+    var match = optionsExp.match(NG_OPTIONS_REGEXP);
+    if (!(match)) {
+      throw ngOptionsMinErr('iexp',
+        "Expected expression in form of " +
+        "'_select_ (as _label_)? for (_key_,)?_value_ in _collection_'" +
+        " but got '{0}'. Element: {1}",
+        optionsExp, startingTag(selectElement));
+    }
+
+    // Extract the parts from the ngOptions expression
+
+    // The variable name for the value of the item in the collection
+    var valueName = match[5] || match[7];
+    // The variable name for the key of the item in the collection
+    var keyName = match[6];
+
+    // An expression that generates the viewValue for an option if there is a label expression
+    var selectAs = / as /.test(match[0]) && match[1];
+    // An expression that is used to track the id of each object in the options collection
+    var trackBy = match[9];
+    // An expression that generates the viewValue for an option if there is no label expression
+    var valueFn = $parse(match[2] ? match[1] : valueName);
+    var selectAsFn = selectAs && $parse(selectAs);
+    var viewValueFn = selectAsFn || valueFn;
+    var trackByFn = trackBy && $parse(trackBy);
+
+    // Get the value by which we are going to track the option
+    // if we have a trackFn then use that (passing scope and locals)
+    // otherwise just hash the given viewValue
+    var getTrackByValueFn = trackBy ?
+                              function(value, locals) { return trackByFn(scope, locals); } :
+                              function getHashOfValue(value) { return hashKey(value); };
+    var getTrackByValue = function(value, key) {
+      return getTrackByValueFn(value, getLocals(value, key));
+    };
+
+    var displayFn = $parse(match[2] || match[1]);
+    var groupByFn = $parse(match[3] || '');
+    var disableWhenFn = $parse(match[4] || '');
+    var valuesFn = $parse(match[8]);
+
+    var locals = {};
+    var getLocals = keyName ? function(value, key) {
+      locals[keyName] = key;
+      locals[valueName] = value;
+      return locals;
+    } : function(value) {
+      locals[valueName] = value;
+      return locals;
+    };
+
+
+    function Option(selectValue, viewValue, label, group, disabled) {
+      this.selectValue = selectValue;
+      this.viewValue = viewValue;
+      this.label = label;
+      this.group = group;
+      this.disabled = disabled;
+    }
+
+    function getOptionValuesKeys(optionValues) {
+      var optionValuesKeys;
+
+      if (!keyName && isArrayLike(optionValues)) {
+        optionValuesKeys = optionValues;
+      } else {
+        // if object, extract keys, in enumeration order, unsorted
+        optionValuesKeys = [];
+        for (var itemKey in optionValues) {
+          if (optionValues.hasOwnProperty(itemKey) && itemKey.charAt(0) !== '$') {
+            optionValuesKeys.push(itemKey);
+          }
+        }
+      }
+      return optionValuesKeys;
+    }
+
+    return {
+      trackBy: trackBy,
+      getTrackByValue: getTrackByValue,
+      getWatchables: $parse(valuesFn, function(optionValues) {
+        // Create a collection of things that we would like to watch (watchedArray)
+        // so that they can all be watched using a single $watchCollection
+        // that only runs the handler once if anything changes
+        var watchedArray = [];
+        optionValues = optionValues || [];
+
+        var optionValuesKeys = getOptionValuesKeys(optionValues);
+        var optionValuesLength = optionValuesKeys.length;
+        for (var index = 0; index < optionValuesLength; index++) {
+          var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+          var value = optionValues[key];
+
+          var locals = getLocals(optionValues[key], key);
+          var selectValue = getTrackByValueFn(optionValues[key], locals);
+          watchedArray.push(selectValue);
+
+          // Only need to watch the displayFn if there is a specific label expression
+          if (match[2] || match[1]) {
+            var label = displayFn(scope, locals);
+            watchedArray.push(label);
+          }
+
+          // Only need to watch the disableWhenFn if there is a specific disable expression
+          if (match[4]) {
+            var disableWhen = disableWhenFn(scope, locals);
+            watchedArray.push(disableWhen);
+          }
+        }
+        return watchedArray;
+      }),
+
+      getOptions: function() {
+
+        var optionItems = [];
+        var selectValueMap = {};
+
+        // The option values were already computed in the `getWatchables` fn,
+        // which must have been called to trigger `getOptions`
+        var optionValues = valuesFn(scope) || [];
+        var optionValuesKeys = getOptionValuesKeys(optionValues);
+        var optionValuesLength = optionValuesKeys.length;
+
+        for (var index = 0; index < optionValuesLength; index++) {
+          var key = (optionValues === optionValuesKeys) ? index : optionValuesKeys[index];
+          var value = optionValues[key];
+          var locals = getLocals(value, key);
+          var viewValue = viewValueFn(scope, locals);
+          var selectValue = getTrackByValueFn(viewValue, locals);
+          var label = displayFn(scope, locals);
+          var group = groupByFn(scope, locals);
+          var disabled = disableWhenFn(scope, locals);
+          var optionItem = new Option(selectValue, viewValue, label, group, disabled);
+
+          optionItems.push(optionItem);
+          selectValueMap[selectValue] = optionItem;
+        }
+
+        return {
+          items: optionItems,
+          selectValueMap: selectValueMap,
+          getOptionFromViewValue: function(value) {
+            return selectValueMap[getTrackByValue(value)];
+          },
+          getViewValueFromOption: function(option) {
+            // If the viewValue could be an object that may be mutated by the application,
+            // we need to make a copy and not return the reference to the value on the option.
+            return trackBy ? angular.copy(option.viewValue) : option.viewValue;
+          }
+        };
+      }
+    };
+  }
+
+
+  // we can't just jqLite('<option>') since jqLite is not smart enough
+  // to create it in <select> and IE barfs otherwise.
+  var optionTemplate = document.createElement('option'),
+      optGroupTemplate = document.createElement('optgroup');
+
+
+    function ngOptionsPostLink(scope, selectElement, attr, ctrls) {
+
+      // if ngModel is not defined, we don't need to do anything
+      var ngModelCtrl = ctrls[1];
+      if (!ngModelCtrl) return;
+
+      var selectCtrl = ctrls[0];
+      var multiple = attr.multiple;
+
+      // The emptyOption allows the application developer to provide their own custom "empty"
+      // option when the viewValue does not match any of the option values.
+      var emptyOption;
+      for (var i = 0, children = selectElement.children(), ii = children.length; i < ii; i++) {
+        if (children[i].value === '') {
+          emptyOption = children.eq(i);
+          break;
+        }
+      }
+
+      var providedEmptyOption = !!emptyOption;
+
+      var unknownOption = jqLite(optionTemplate.cloneNode(false));
+      unknownOption.val('?');
+
+      var options;
+      var ngOptions = parseOptionsExpression(attr.ngOptions, selectElement, scope);
+
+
+      var renderEmptyOption = function() {
+        if (!providedEmptyOption) {
+          selectElement.prepend(emptyOption);
+        }
+        selectElement.val('');
+        emptyOption.prop('selected', true); // needed for IE
+        emptyOption.attr('selected', true);
+      };
+
+      var removeEmptyOption = function() {
+        if (!providedEmptyOption) {
+          emptyOption.remove();
+        }
+      };
+
+
+      var renderUnknownOption = function() {
+        selectElement.prepend(unknownOption);
+        selectElement.val('?');
+        unknownOption.prop('selected', true); // needed for IE
+        unknownOption.attr('selected', true);
+      };
+
+      var removeUnknownOption = function() {
+        unknownOption.remove();
+      };
+
+      // Update the controller methods for multiple selectable options
+      if (!multiple) {
+
+        selectCtrl.writeValue = function writeNgOptionsValue(value) {
+          var option = options.getOptionFromViewValue(value);
+
+          if (option && !option.disabled) {
+            if (selectElement[0].value !== option.selectValue) {
+              removeUnknownOption();
+              removeEmptyOption();
+
+              selectElement[0].value = option.selectValue;
+              option.element.selected = true;
+              option.element.setAttribute('selected', 'selected');
+            }
+          } else {
+            if (value === null || providedEmptyOption) {
+              removeUnknownOption();
+              renderEmptyOption();
+            } else {
+              removeEmptyOption();
+              renderUnknownOption();
+            }
+          }
+        };
+
+        selectCtrl.readValue = function readNgOptionsValue() {
+
+          var selectedOption = options.selectValueMap[selectElement.val()];
+
+          if (selectedOption && !selectedOption.disabled) {
+            removeEmptyOption();
+            removeUnknownOption();
+            return options.getViewValueFromOption(selectedOption);
+          }
+          return null;
+        };
+
+        // If we are using `track by` then we must watch the tracked value on the model
+        // since ngModel only watches for object identity change
+        if (ngOptions.trackBy) {
+          scope.$watch(
+            function() { return ngOptions.getTrackByValue(ngModelCtrl.$viewValue); },
+            function() { ngModelCtrl.$render(); }
+          );
+        }
+
+      } else {
+
+        ngModelCtrl.$isEmpty = function(value) {
+          return !value || value.length === 0;
+        };
+
+
+        selectCtrl.writeValue = function writeNgOptionsMultiple(value) {
+          options.items.forEach(function(option) {
+            option.element.selected = false;
+          });
+
+          if (value) {
+            value.forEach(function(item) {
+              var option = options.getOptionFromViewValue(item);
+              if (option && !option.disabled) option.element.selected = true;
+            });
+          }
+        };
+
+
+        selectCtrl.readValue = function readNgOptionsMultiple() {
+          var selectedValues = selectElement.val() || [],
+              selections = [];
+
+          forEach(selectedValues, function(value) {
+            var option = options.selectValueMap[value];
+            if (option && !option.disabled) selections.push(options.getViewValueFromOption(option));
+          });
+
+          return selections;
+        };
+
+        // If we are using `track by` then we must watch these tracked values on the model
+        // since ngModel only watches for object identity change
+        if (ngOptions.trackBy) {
+
+          scope.$watchCollection(function() {
+            if (isArray(ngModelCtrl.$viewValue)) {
+              return ngModelCtrl.$viewValue.map(function(value) {
+                return ngOptions.getTrackByValue(value);
+              });
+            }
+          }, function() {
+            ngModelCtrl.$render();
+          });
+
+        }
+      }
+
+
+      if (providedEmptyOption) {
+
+        // we need to remove it before calling selectElement.empty() because otherwise IE will
+        // remove the label from the element. wtf?
+        emptyOption.remove();
+
+        // compile the element since there might be bindings in it
+        $compile(emptyOption)(scope);
+
+        // remove the class, which is added automatically because we recompile the element and it
+        // becomes the compilation root
+        emptyOption.removeClass('ng-scope');
+      } else {
+        emptyOption = jqLite(optionTemplate.cloneNode(false));
+      }
+
+      // We need to do this here to ensure that the options object is defined
+      // when we first hit it in writeNgOptionsValue
+      updateOptions();
+
+      // We will re-render the option elements if the option values or labels change
+      scope.$watchCollection(ngOptions.getWatchables, updateOptions);
+
+      // ------------------------------------------------------------------ //
+
+
+      function updateOptionElement(option, element) {
+        option.element = element;
+        element.disabled = option.disabled;
+        // NOTE: The label must be set before the value, otherwise IE10/11/EDGE create unresponsive
+        // selects in certain circumstances when multiple selects are next to each other and display
+        // the option list in listbox style, i.e. the select is [multiple], or specifies a [size].
+        // See https://github.com/angular/angular.js/issues/11314 for more info.
+        // This is unfortunately untestable with unit / e2e tests
+        if (option.label !== element.label) {
+          element.label = option.label;
+          element.textContent = option.label;
+        }
+        if (option.value !== element.value) element.value = option.selectValue;
+      }
+
+      function addOrReuseElement(parent, current, type, templateElement) {
+        var element;
+        // Check whether we can reuse the next element
+        if (current && lowercase(current.nodeName) === type) {
+          // The next element is the right type so reuse it
+          element = current;
+        } else {
+          // The next element is not the right type so create a new one
+          element = templateElement.cloneNode(false);
+          if (!current) {
+            // There are no more elements so just append it to the select
+            parent.appendChild(element);
+          } else {
+            // The next element is not a group so insert the new one
+            parent.insertBefore(element, current);
+          }
+        }
+        return element;
+      }
+
+
+      function removeExcessElements(current) {
+        var next;
+        while (current) {
+          next = current.nextSibling;
+          jqLiteRemove(current);
+          current = next;
+        }
+      }
+
+
+      function skipEmptyAndUnknownOptions(current) {
+        var emptyOption_ = emptyOption && emptyOption[0];
+        var unknownOption_ = unknownOption && unknownOption[0];
+
+        // We cannot rely on the extracted empty option being the same as the compiled empty option,
+        // because the compiled empty option might have been replaced by a comment because
+        // it had an "element" transclusion directive on it (such as ngIf)
+        if (emptyOption_ || unknownOption_) {
+          while (current &&
+                (current === emptyOption_ ||
+                current === unknownOption_ ||
+                current.nodeType === NODE_TYPE_COMMENT ||
+                (nodeName_(current) === 'option' && current.value === ''))) {
+            current = current.nextSibling;
+          }
+        }
+        return current;
+      }
+
+
+      function updateOptions() {
+
+        var previousValue = options && selectCtrl.readValue();
+
+        options = ngOptions.getOptions();
+
+        var groupMap = {};
+        var currentElement = selectElement[0].firstChild;
+
+        // Ensure that the empty option is always there if it was explicitly provided
+        if (providedEmptyOption) {
+          selectElement.prepend(emptyOption);
+        }
+
+        currentElement = skipEmptyAndUnknownOptions(currentElement);
+
+        options.items.forEach(function updateOption(option) {
+          var group;
+          var groupElement;
+          var optionElement;
+
+          if (option.group) {
+
+            // This option is to live in a group
+            // See if we have already created this group
+            group = groupMap[option.group];
+
+            if (!group) {
+
+              // We have not already created this group
+              groupElement = addOrReuseElement(selectElement[0],
+                                               currentElement,
+                                               'optgroup',
+                                               optGroupTemplate);
+              // Move to the next element
+              currentElement = groupElement.nextSibling;
+
+              // Update the label on the group element
+              groupElement.label = option.group;
+
+              // Store it for use later
+              group = groupMap[option.group] = {
+                groupElement: groupElement,
+                currentOptionElement: groupElement.firstChild
+              };
+
+            }
+
+            // So now we have a group for this option we add the option to the group
+            optionElement = addOrReuseElement(group.groupElement,
+                                              group.currentOptionElement,
+                                              'option',
+                                              optionTemplate);
+            updateOptionElement(option, optionElement);
+            // Move to the next element
+            group.currentOptionElement = optionElement.nextSibling;
+
+          } else {
+
+            // This option is not in a group
+            optionElement = addOrReuseElement(selectElement[0],
+                                              currentElement,
+                                              'option',
+                                              optionTemplate);
+            updateOptionElement(option, optionElement);
+            // Move to the next element
+            currentElement = optionElement.nextSibling;
+          }
+        });
+
+
+        // Now remove all excess options and group
+        Object.keys(groupMap).forEach(function(key) {
+          removeExcessElements(groupMap[key].currentOptionElement);
+        });
+        removeExcessElements(currentElement);
+
+        ngModelCtrl.$render();
+
+        // Check to see if the value has changed due to the update to the options
+        if (!ngModelCtrl.$isEmpty(previousValue)) {
+          var nextValue = selectCtrl.readValue();
+          var isNotPrimitive = ngOptions.trackBy || multiple;
+          if (isNotPrimitive ? !equals(previousValue, nextValue) : previousValue !== nextValue) {
+            ngModelCtrl.$setViewValue(nextValue);
+            ngModelCtrl.$render();
+          }
+        }
+
+      }
+  }
+
+  return {
+    restrict: 'A',
+    terminal: true,
+    require: ['select', '?ngModel'],
+    link: {
+      pre: function ngOptionsPreLink(scope, selectElement, attr, ctrls) {
+        // Deactivate the SelectController.register method to prevent
+        // option directives from accidentally registering themselves
+        // (and unwanted $destroy handlers etc.)
+        ctrls[0].registerOption = noop;
+      },
+      post: ngOptionsPostLink
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngPluralize
+ * @restrict EA
+ *
+ * @description
+ * `ngPluralize` is a directive that displays messages according to en-US localization rules.
+ * These rules are bundled with angular.js, but can be overridden
+ * (see {@link guide/i18n Angular i18n} dev guide). You configure ngPluralize directive
+ * by specifying the mappings between
+ * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+ * and the strings to be displayed.
+ *
+ * # Plural categories and explicit number rules
+ * There are two
+ * [plural categories](http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html)
+ * in Angular's default en-US locale: "one" and "other".
+ *
+ * While a plural category may match many numbers (for example, in en-US locale, "other" can match
+ * any number that is not 1), an explicit number rule can only match one number. For example, the
+ * explicit number rule for "3" matches the number 3. There are examples of plural categories
+ * and explicit number rules throughout the rest of this documentation.
+ *
+ * # Configuring ngPluralize
+ * You configure ngPluralize by providing 2 attributes: `count` and `when`.
+ * You can also provide an optional attribute, `offset`.
+ *
+ * The value of the `count` attribute can be either a string or an {@link guide/expression
+ * Angular expression}; these are evaluated on the current scope for its bound value.
+ *
+ * The `when` attribute specifies the mappings between plural categories and the actual
+ * string to be displayed. The value of the attribute should be a JSON object.
+ *
+ * The following example shows how to configure ngPluralize:
+ *
+ * ```html
+ * <ng-pluralize count="personCount"
+                 when="{'0': 'Nobody is viewing.',
+ *                      'one': '1 person is viewing.',
+ *                      'other': '{} people are viewing.'}">
+ * </ng-pluralize>
+ *```
+ *
+ * In the example, `"0: Nobody is viewing."` is an explicit number rule. If you did not
+ * specify this rule, 0 would be matched to the "other" category and "0 people are viewing"
+ * would be shown instead of "Nobody is viewing". You can specify an explicit number rule for
+ * other numbers, for example 12, so that instead of showing "12 people are viewing", you can
+ * show "a dozen people are viewing".
+ *
+ * You can use a set of closed braces (`{}`) as a placeholder for the number that you want substituted
+ * into pluralized strings. In the previous example, Angular will replace `{}` with
+ * <span ng-non-bindable>`{{personCount}}`</span>. The closed braces `{}` is a placeholder
+ * for <span ng-non-bindable>{{numberExpression}}</span>.
+ *
+ * If no rule is defined for a category, then an empty string is displayed and a warning is generated.
+ * Note that some locales define more categories than `one` and `other`. For example, fr-fr defines `few` and `many`.
+ *
+ * # Configuring ngPluralize with offset
+ * The `offset` attribute allows further customization of pluralized text, which can result in
+ * a better user experience. For example, instead of the message "4 people are viewing this document",
+ * you might display "John, Kate and 2 others are viewing this document".
+ * The offset attribute allows you to offset a number by any desired value.
+ * Let's take a look at an example:
+ *
+ * ```html
+ * <ng-pluralize count="personCount" offset=2
+ *               when="{'0': 'Nobody is viewing.',
+ *                      '1': '{{person1}} is viewing.',
+ *                      '2': '{{person1}} and {{person2}} are viewing.',
+ *                      'one': '{{person1}}, {{person2}} and one other person are viewing.',
+ *                      'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
+ * </ng-pluralize>
+ * ```
+ *
+ * Notice that we are still using two plural categories(one, other), but we added
+ * three explicit number rules 0, 1 and 2.
+ * When one person, perhaps John, views the document, "John is viewing" will be shown.
+ * When three people view the document, no explicit number rule is found, so
+ * an offset of 2 is taken off 3, and Angular uses 1 to decide the plural category.
+ * In this case, plural category 'one' is matched and "John, Mary and one other person are viewing"
+ * is shown.
+ *
+ * Note that when you specify offsets, you must provide explicit number rules for
+ * numbers from 0 up to and including the offset. If you use an offset of 3, for example,
+ * you must provide explicit number rules for 0, 1, 2 and 3. You must also provide plural strings for
+ * plural categories "one" and "other".
+ *
+ * @param {string|expression} count The variable to be bound to.
+ * @param {string} when The mapping between plural category to its corresponding strings.
+ * @param {number=} offset Offset to deduct from the total number.
+ *
+ * @example
+    <example module="pluralizeExample">
+      <file name="index.html">
+        <script>
+          angular.module('pluralizeExample', [])
+            .controller('ExampleController', ['$scope', function($scope) {
+              $scope.person1 = 'Igor';
+              $scope.person2 = 'Misko';
+              $scope.personCount = 1;
+            }]);
+        </script>
+        <div ng-controller="ExampleController">
+          <label>Person 1:<input type="text" ng-model="person1" value="Igor" /></label><br/>
+          <label>Person 2:<input type="text" ng-model="person2" value="Misko" /></label><br/>
+          <label>Number of People:<input type="text" ng-model="personCount" value="1" /></label><br/>
+
+          <!--- Example with simple pluralization rules for en locale --->
+          Without Offset:
+          <ng-pluralize count="personCount"
+                        when="{'0': 'Nobody is viewing.',
+                               'one': '1 person is viewing.',
+                               'other': '{} people are viewing.'}">
+          </ng-pluralize><br>
+
+          <!--- Example with offset --->
+          With Offset(2):
+          <ng-pluralize count="personCount" offset=2
+                        when="{'0': 'Nobody is viewing.',
+                               '1': '{{person1}} is viewing.',
+                               '2': '{{person1}} and {{person2}} are viewing.',
+                               'one': '{{person1}}, {{person2}} and one other person are viewing.',
+                               'other': '{{person1}}, {{person2}} and {} other people are viewing.'}">
+          </ng-pluralize>
+        </div>
+      </file>
+      <file name="protractor.js" type="protractor">
+        it('should show correct pluralized string', function() {
+          var withoutOffset = element.all(by.css('ng-pluralize')).get(0);
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var countInput = element(by.model('personCount'));
+
+          expect(withoutOffset.getText()).toEqual('1 person is viewing.');
+          expect(withOffset.getText()).toEqual('Igor is viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('0');
+
+          expect(withoutOffset.getText()).toEqual('Nobody is viewing.');
+          expect(withOffset.getText()).toEqual('Nobody is viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('2');
+
+          expect(withoutOffset.getText()).toEqual('2 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor and Misko are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('3');
+
+          expect(withoutOffset.getText()).toEqual('3 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and one other person are viewing.');
+
+          countInput.clear();
+          countInput.sendKeys('4');
+
+          expect(withoutOffset.getText()).toEqual('4 people are viewing.');
+          expect(withOffset.getText()).toEqual('Igor, Misko and 2 other people are viewing.');
+        });
+        it('should show data-bound names', function() {
+          var withOffset = element.all(by.css('ng-pluralize')).get(1);
+          var personCount = element(by.model('personCount'));
+          var person1 = element(by.model('person1'));
+          var person2 = element(by.model('person2'));
+          personCount.clear();
+          personCount.sendKeys('4');
+          person1.clear();
+          person1.sendKeys('Di');
+          person2.clear();
+          person2.sendKeys('Vojta');
+          expect(withOffset.getText()).toEqual('Di, Vojta and 2 other people are viewing.');
+        });
+      </file>
+    </example>
+ */
+var ngPluralizeDirective = ['$locale', '$interpolate', '$log', function($locale, $interpolate, $log) {
+  var BRACE = /{}/g,
+      IS_WHEN = /^when(Minus)?(.+)$/;
+
+  return {
+    link: function(scope, element, attr) {
+      var numberExp = attr.count,
+          whenExp = attr.$attr.when && element.attr(attr.$attr.when), // we have {{}} in attrs
+          offset = attr.offset || 0,
+          whens = scope.$eval(whenExp) || {},
+          whensExpFns = {},
+          startSymbol = $interpolate.startSymbol(),
+          endSymbol = $interpolate.endSymbol(),
+          braceReplacement = startSymbol + numberExp + '-' + offset + endSymbol,
+          watchRemover = angular.noop,
+          lastCount;
+
+      forEach(attr, function(expression, attributeName) {
+        var tmpMatch = IS_WHEN.exec(attributeName);
+        if (tmpMatch) {
+          var whenKey = (tmpMatch[1] ? '-' : '') + lowercase(tmpMatch[2]);
+          whens[whenKey] = element.attr(attr.$attr[attributeName]);
+        }
+      });
+      forEach(whens, function(expression, key) {
+        whensExpFns[key] = $interpolate(expression.replace(BRACE, braceReplacement));
+
+      });
+
+      scope.$watch(numberExp, function ngPluralizeWatchAction(newVal) {
+        var count = parseFloat(newVal);
+        var countIsNaN = isNaN(count);
+
+        if (!countIsNaN && !(count in whens)) {
+          // If an explicit number rule such as 1, 2, 3... is defined, just use it.
+          // Otherwise, check it against pluralization rules in $locale service.
+          count = $locale.pluralCat(count - offset);
+        }
+
+        // If both `count` and `lastCount` are NaN, we don't need to re-register a watch.
+        // In JS `NaN !== NaN`, so we have to exlicitly check.
+        if ((count !== lastCount) && !(countIsNaN && isNumber(lastCount) && isNaN(lastCount))) {
+          watchRemover();
+          var whenExpFn = whensExpFns[count];
+          if (isUndefined(whenExpFn)) {
+            if (newVal != null) {
+              $log.debug("ngPluralize: no rule defined for '" + count + "' in " + whenExp);
+            }
+            watchRemover = noop;
+            updateElementText();
+          } else {
+            watchRemover = scope.$watch(whenExpFn, updateElementText);
+          }
+          lastCount = count;
+        }
+      });
+
+      function updateElementText(newText) {
+        element.text(newText || '');
+      }
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngRepeat
+ * @multiElement
+ *
+ * @description
+ * The `ngRepeat` directive instantiates a template once per item from a collection. Each template
+ * instance gets its own scope, where the given loop variable is set to the current collection item,
+ * and `$index` is set to the item index or key.
+ *
+ * Special properties are exposed on the local scope of each template instance, including:
+ *
+ * | Variable  | Type            | Details                                                                     |
+ * |-----------|-----------------|-----------------------------------------------------------------------------|
+ * | `$index`  | {@type number}  | iterator offset of the repeated element (0..length-1)                       |
+ * | `$first`  | {@type boolean} | true if the repeated element is first in the iterator.                      |
+ * | `$middle` | {@type boolean} | true if the repeated element is between the first and last in the iterator. |
+ * | `$last`   | {@type boolean} | true if the repeated element is last in the iterator.                       |
+ * | `$even`   | {@type boolean} | true if the iterator position `$index` is even (otherwise false).           |
+ * | `$odd`    | {@type boolean} | true if the iterator position `$index` is odd (otherwise false).            |
+ *
+ * <div class="alert alert-info">
+ *   Creating aliases for these properties is possible with {@link ng.directive:ngInit `ngInit`}.
+ *   This may be useful when, for instance, nesting ngRepeats.
+ * </div>
+ *
+ *
+ * # Iterating over object properties
+ *
+ * It is possible to get `ngRepeat` to iterate over the properties of an object using the following
+ * syntax:
+ *
+ * ```js
+ * <div ng-repeat="(key, value) in myObj"> ... </div>
+ * ```
+ *
+ * You need to be aware that the JavaScript specification does not define the order of keys
+ * returned for an object. (To mitigate this in Angular 1.3 the `ngRepeat` directive
+ * used to sort the keys alphabetically.)
+ *
+ * Version 1.4 removed the alphabetic sorting. We now rely on the order returned by the browser
+ * when running `for key in myObj`. It seems that browsers generally follow the strategy of providing
+ * keys in the order in which they were defined, although there are exceptions when keys are deleted
+ * and reinstated. See the [MDN page on `delete` for more info](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/delete#Cross-browser_notes).
+ *
+ * If this is not desired, the recommended workaround is to convert your object into an array
+ * that is sorted into the order that you prefer before providing it to `ngRepeat`.  You could
+ * do this with a filter such as [toArrayFilter](http://ngmodules.org/modules/angular-toArrayFilter)
+ * or implement a `$watch` on the object yourself.
+ *
+ *
+ * # Tracking and Duplicates
+ *
+ * `ngRepeat` uses {@link $rootScope.Scope#$watchCollection $watchCollection} to detect changes in
+ * the collection. When a change happens, ngRepeat then makes the corresponding changes to the DOM:
+ *
+ * * When an item is added, a new instance of the template is added to the DOM.
+ * * When an item is removed, its template instance is removed from the DOM.
+ * * When items are reordered, their respective templates are reordered in the DOM.
+ *
+ * To minimize creation of DOM elements, `ngRepeat` uses a function
+ * to "keep track" of all items in the collection and their corresponding DOM elements.
+ * For example, if an item is added to the collection, ngRepeat will know that all other items
+ * already have DOM elements, and will not re-render them.
+ *
+ * The default tracking function (which tracks items by their identity) does not allow
+ * duplicate items in arrays. This is because when there are duplicates, it is not possible
+ * to maintain a one-to-one mapping between collection items and DOM elements.
+ *
+ * If you do need to repeat duplicate items, you can substitute the default tracking behavior
+ * with your own using the `track by` expression.
+ *
+ * For example, you may track items by the index of each item in the collection, using the
+ * special scope property `$index`:
+ * ```html
+ *    <div ng-repeat="n in [42, 42, 43, 43] track by $index">
+ *      {{n}}
+ *    </div>
+ * ```
+ *
+ * You may also use arbitrary expressions in `track by`, including references to custom functions
+ * on the scope:
+ * ```html
+ *    <div ng-repeat="n in [42, 42, 43, 43] track by myTrackingFunction(n)">
+ *      {{n}}
+ *    </div>
+ * ```
+ *
+ * <div class="alert alert-success">
+ * If you are working with objects that have an identifier property, you should track
+ * by the identifier instead of the whole object. Should you reload your data later, `ngRepeat`
+ * will not have to rebuild the DOM elements for items it has already rendered, even if the
+ * JavaScript objects in the collection have been substituted for new ones. For large collections,
+ * this signifincantly improves rendering performance. If you don't have a unique identifier,
+ * `track by $index` can also provide a performance boost.
+ * </div>
+ * ```html
+ *    <div ng-repeat="model in collection track by model.id">
+ *      {{model.name}}
+ *    </div>
+ * ```
+ *
+ * When no `track by` expression is provided, it is equivalent to tracking by the built-in
+ * `$id` function, which tracks items by their identity:
+ * ```html
+ *    <div ng-repeat="obj in collection track by $id(obj)">
+ *      {{obj.prop}}
+ *    </div>
+ * ```
+ *
+ * <div class="alert alert-warning">
+ * **Note:** `track by` must always be the last expression:
+ * </div>
+ * ```
+ * <div ng-repeat="model in collection | orderBy: 'id' as filtered_result track by model.id">
+ *     {{model.name}}
+ * </div>
+ * ```
+ *
+ * # Special repeat start and end points
+ * To repeat a series of elements instead of just one parent element, ngRepeat (as well as other ng directives) supports extending
+ * the range of the repeater by defining explicit start and end points by using **ng-repeat-start** and **ng-repeat-end** respectively.
+ * The **ng-repeat-start** directive works the same as **ng-repeat**, but will repeat all the HTML code (including the tag it's defined on)
+ * up to and including the ending HTML tag where **ng-repeat-end** is placed.
+ *
+ * The example below makes use of this feature:
+ * ```html
+ *   <header ng-repeat-start="item in items">
+ *     Header {{ item }}
+ *   </header>
+ *   <div class="body">
+ *     Body {{ item }}
+ *   </div>
+ *   <footer ng-repeat-end>
+ *     Footer {{ item }}
+ *   </footer>
+ * ```
+ *
+ * And with an input of {@type ['A','B']} for the items variable in the example above, the output will evaluate to:
+ * ```html
+ *   <header>
+ *     Header A
+ *   </header>
+ *   <div class="body">
+ *     Body A
+ *   </div>
+ *   <footer>
+ *     Footer A
+ *   </footer>
+ *   <header>
+ *     Header B
+ *   </header>
+ *   <div class="body">
+ *     Body B
+ *   </div>
+ *   <footer>
+ *     Footer B
+ *   </footer>
+ * ```
+ *
+ * The custom start and end points for ngRepeat also support all other HTML directive syntax flavors provided in AngularJS (such
+ * as **data-ng-repeat-start**, **x-ng-repeat-start** and **ng:repeat-start**).
+ *
+ * @animations
+ * **.enter** - when a new item is added to the list or when an item is revealed after a filter
+ *
+ * **.leave** - when an item is removed from the list or when an item is filtered out
+ *
+ * **.move** - when an adjacent item is filtered out causing a reorder or when the item contents are reordered
+ *
+ * @element ANY
+ * @scope
+ * @priority 1000
+ * @param {repeat_expression} ngRepeat The expression indicating how to enumerate a collection. These
+ *   formats are currently supported:
+ *
+ *   * `variable in expression` – where variable is the user defined loop variable and `expression`
+ *     is a scope expression giving the collection to enumerate.
+ *
+ *     For example: `album in artist.albums`.
+ *
+ *   * `(key, value) in expression` – where `key` and `value` can be any user defined identifiers,
+ *     and `expression` is the scope expression giving the collection to enumerate.
+ *
+ *     For example: `(name, age) in {'adam':10, 'amalie':12}`.
+ *
+ *   * `variable in expression track by tracking_expression` – You can also provide an optional tracking expression
+ *     which can be used to associate the objects in the collection with the DOM elements. If no tracking expression
+ *     is specified, ng-repeat associates elements by identity. It is an error to have
+ *     more than one tracking expression value resolve to the same key. (This would mean that two distinct objects are
+ *     mapped to the same DOM element, which is not possible.)
+ *
+ *     Note that the tracking expression must come last, after any filters, and the alias expression.
+ *
+ *     For example: `item in items` is equivalent to `item in items track by $id(item)`. This implies that the DOM elements
+ *     will be associated by item identity in the array.
+ *
+ *     For example: `item in items track by $id(item)`. A built in `$id()` function can be used to assign a unique
+ *     `$$hashKey` property to each item in the array. This property is then used as a key to associated DOM elements
+ *     with the corresponding item in the array by identity. Moving the same object in array would move the DOM
+ *     element in the same way in the DOM.
+ *
+ *     For example: `item in items track by item.id` is a typical pattern when the items come from the database. In this
+ *     case the object identity does not matter. Two objects are considered equivalent as long as their `id`
+ *     property is same.
+ *
+ *     For example: `item in items | filter:searchText track by item.id` is a pattern that might be used to apply a filter
+ *     to items in conjunction with a tracking expression.
+ *
+ *   * `variable in expression as alias_expression` – You can also provide an optional alias expression which will then store the
+ *     intermediate results of the repeater after the filters have been applied. Typically this is used to render a special message
+ *     when a filter is active on the repeater, but the filtered result set is empty.
+ *
+ *     For example: `item in items | filter:x as results` will store the fragment of the repeated items as `results`, but only after
+ *     the items have been processed through the filter.
+ *
+ *     Please note that `as [variable name] is not an operator but rather a part of ngRepeat micro-syntax so it can be used only at the end
+ *     (and not as operator, inside an expression).
+ *
+ *     For example: `item in items | filter : x | orderBy : order | limitTo : limit as results` .
+ *
+ * @example
+ * This example initializes the scope to a list of names and
+ * then uses `ngRepeat` to display every person:
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      <div ng-init="friends = [
+        {name:'John', age:25, gender:'boy'},
+        {name:'Jessie', age:30, gender:'girl'},
+        {name:'Johanna', age:28, gender:'girl'},
+        {name:'Joy', age:15, gender:'girl'},
+        {name:'Mary', age:28, gender:'girl'},
+        {name:'Peter', age:95, gender:'boy'},
+        {name:'Sebastian', age:50, gender:'boy'},
+        {name:'Erika', age:27, gender:'girl'},
+        {name:'Patrick', age:40, gender:'boy'},
+        {name:'Samantha', age:60, gender:'girl'}
+      ]">
+        I have {{friends.length}} friends. They are:
+        <input type="search" ng-model="q" placeholder="filter friends..." aria-label="filter friends" />
+        <ul class="example-animate-container">
+          <li class="animate-repeat" ng-repeat="friend in friends | filter:q as results">
+            [{{$index + 1}}] {{friend.name}} who is {{friend.age}} years old.
+          </li>
+          <li class="animate-repeat" ng-if="results.length == 0">
+            <strong>No results found...</strong>
+          </li>
+        </ul>
+      </div>
+    </file>
+    <file name="animations.css">
+      .example-animate-container {
+        background:white;
+        border:1px solid black;
+        list-style:none;
+        margin:0;
+        padding:0 10px;
+      }
+
+      .animate-repeat {
+        line-height:40px;
+        list-style:none;
+        box-sizing:border-box;
+      }
+
+      .animate-repeat.ng-move,
+      .animate-repeat.ng-enter,
+      .animate-repeat.ng-leave {
+        transition:all linear 0.5s;
+      }
+
+      .animate-repeat.ng-leave.ng-leave-active,
+      .animate-repeat.ng-move,
+      .animate-repeat.ng-enter {
+        opacity:0;
+        max-height:0;
+      }
+
+      .animate-repeat.ng-leave,
+      .animate-repeat.ng-move.ng-move-active,
+      .animate-repeat.ng-enter.ng-enter-active {
+        opacity:1;
+        max-height:40px;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var friends = element.all(by.repeater('friend in friends'));
+
+      it('should render initial data set', function() {
+        expect(friends.count()).toBe(10);
+        expect(friends.get(0).getText()).toEqual('[1] John who is 25 years old.');
+        expect(friends.get(1).getText()).toEqual('[2] Jessie who is 30 years old.');
+        expect(friends.last().getText()).toEqual('[10] Samantha who is 60 years old.');
+        expect(element(by.binding('friends.length')).getText())
+            .toMatch("I have 10 friends. They are:");
+      });
+
+       it('should update repeater when filter predicate changes', function() {
+         expect(friends.count()).toBe(10);
+
+         element(by.model('q')).sendKeys('ma');
+
+         expect(friends.count()).toBe(2);
+         expect(friends.get(0).getText()).toEqual('[1] Mary who is 28 years old.');
+         expect(friends.last().getText()).toEqual('[2] Samantha who is 60 years old.');
+       });
+      </file>
+    </example>
+ */
+var ngRepeatDirective = ['$parse', '$animate', function($parse, $animate) {
+  var NG_REMOVED = '$$NG_REMOVED';
+  var ngRepeatMinErr = minErr('ngRepeat');
+
+  var updateScope = function(scope, index, valueIdentifier, value, keyIdentifier, key, arrayLength) {
+    // TODO(perf): generate setters to shave off ~40ms or 1-1.5%
+    scope[valueIdentifier] = value;
+    if (keyIdentifier) scope[keyIdentifier] = key;
+    scope.$index = index;
+    scope.$first = (index === 0);
+    scope.$last = (index === (arrayLength - 1));
+    scope.$middle = !(scope.$first || scope.$last);
+    // jshint bitwise: false
+    scope.$odd = !(scope.$even = (index&1) === 0);
+    // jshint bitwise: true
+  };
+
+  var getBlockStart = function(block) {
+    return block.clone[0];
+  };
+
+  var getBlockEnd = function(block) {
+    return block.clone[block.clone.length - 1];
+  };
+
+
+  return {
+    restrict: 'A',
+    multiElement: true,
+    transclude: 'element',
+    priority: 1000,
+    terminal: true,
+    $$tlb: true,
+    compile: function ngRepeatCompile($element, $attr) {
+      var expression = $attr.ngRepeat;
+      var ngRepeatEndComment = document.createComment(' end ngRepeat: ' + expression + ' ');
+
+      var match = expression.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
+
+      if (!match) {
+        throw ngRepeatMinErr('iexp', "Expected expression in form of '_item_ in _collection_[ track by _id_]' but got '{0}'.",
+            expression);
+      }
+
+      var lhs = match[1];
+      var rhs = match[2];
+      var aliasAs = match[3];
+      var trackByExp = match[4];
+
+      match = lhs.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/);
+
+      if (!match) {
+        throw ngRepeatMinErr('iidexp', "'_item_' in '_item_ in _collection_' should be an identifier or '(_key_, _value_)' expression, but got '{0}'.",
+            lhs);
+      }
+      var valueIdentifier = match[3] || match[1];
+      var keyIdentifier = match[2];
+
+      if (aliasAs && (!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(aliasAs) ||
+          /^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(aliasAs))) {
+        throw ngRepeatMinErr('badident', "alias '{0}' is invalid --- must be a valid JS identifier which is not a reserved name.",
+          aliasAs);
+      }
+
+      var trackByExpGetter, trackByIdExpFn, trackByIdArrayFn, trackByIdObjFn;
+      var hashFnLocals = {$id: hashKey};
+
+      if (trackByExp) {
+        trackByExpGetter = $parse(trackByExp);
+      } else {
+        trackByIdArrayFn = function(key, value) {
+          return hashKey(value);
+        };
+        trackByIdObjFn = function(key) {
+          return key;
+        };
+      }
+
+      return function ngRepeatLink($scope, $element, $attr, ctrl, $transclude) {
+
+        if (trackByExpGetter) {
+          trackByIdExpFn = function(key, value, index) {
+            // assign key, value, and $index to the locals so that they can be used in hash functions
+            if (keyIdentifier) hashFnLocals[keyIdentifier] = key;
+            hashFnLocals[valueIdentifier] = value;
+            hashFnLocals.$index = index;
+            return trackByExpGetter($scope, hashFnLocals);
+          };
+        }
+
+        // Store a list of elements from previous run. This is a hash where key is the item from the
+        // iterator, and the value is objects with following properties.
+        //   - scope: bound scope
+        //   - element: previous element.
+        //   - index: position
+        //
+        // We are using no-proto object so that we don't need to guard against inherited props via
+        // hasOwnProperty.
+        var lastBlockMap = createMap();
+
+        //watch props
+        $scope.$watchCollection(rhs, function ngRepeatAction(collection) {
+          var index, length,
+              previousNode = $element[0],     // node that cloned nodes should be inserted after
+                                              // initialized to the comment node anchor
+              nextNode,
+              // Same as lastBlockMap but it has the current state. It will become the
+              // lastBlockMap on the next iteration.
+              nextBlockMap = createMap(),
+              collectionLength,
+              key, value, // key/value of iteration
+              trackById,
+              trackByIdFn,
+              collectionKeys,
+              block,       // last object information {scope, element, id}
+              nextBlockOrder,
+              elementsToRemove;
+
+          if (aliasAs) {
+            $scope[aliasAs] = collection;
+          }
+
+          if (isArrayLike(collection)) {
+            collectionKeys = collection;
+            trackByIdFn = trackByIdExpFn || trackByIdArrayFn;
+          } else {
+            trackByIdFn = trackByIdExpFn || trackByIdObjFn;
+            // if object, extract keys, in enumeration order, unsorted
+            collectionKeys = [];
+            for (var itemKey in collection) {
+              if (hasOwnProperty.call(collection, itemKey) && itemKey.charAt(0) !== '$') {
+                collectionKeys.push(itemKey);
+              }
+            }
+          }
+
+          collectionLength = collectionKeys.length;
+          nextBlockOrder = new Array(collectionLength);
+
+          // locate existing items
+          for (index = 0; index < collectionLength; index++) {
+            key = (collection === collectionKeys) ? index : collectionKeys[index];
+            value = collection[key];
+            trackById = trackByIdFn(key, value, index);
+            if (lastBlockMap[trackById]) {
+              // found previously seen block
+              block = lastBlockMap[trackById];
+              delete lastBlockMap[trackById];
+              nextBlockMap[trackById] = block;
+              nextBlockOrder[index] = block;
+            } else if (nextBlockMap[trackById]) {
+              // if collision detected. restore lastBlockMap and throw an error
+              forEach(nextBlockOrder, function(block) {
+                if (block && block.scope) lastBlockMap[block.id] = block;
+              });
+              throw ngRepeatMinErr('dupes',
+                  "Duplicates in a repeater are not allowed. Use 'track by' expression to specify unique keys. Repeater: {0}, Duplicate key: {1}, Duplicate value: {2}",
+                  expression, trackById, value);
+            } else {
+              // new never before seen block
+              nextBlockOrder[index] = {id: trackById, scope: undefined, clone: undefined};
+              nextBlockMap[trackById] = true;
+            }
+          }
+
+          // remove leftover items
+          for (var blockKey in lastBlockMap) {
+            block = lastBlockMap[blockKey];
+            elementsToRemove = getBlockNodes(block.clone);
+            $animate.leave(elementsToRemove);
+            if (elementsToRemove[0].parentNode) {
+              // if the element was not removed yet because of pending animation, mark it as deleted
+              // so that we can ignore it later
+              for (index = 0, length = elementsToRemove.length; index < length; index++) {
+                elementsToRemove[index][NG_REMOVED] = true;
+              }
+            }
+            block.scope.$destroy();
+          }
+
+          // we are not using forEach for perf reasons (trying to avoid #call)
+          for (index = 0; index < collectionLength; index++) {
+            key = (collection === collectionKeys) ? index : collectionKeys[index];
+            value = collection[key];
+            block = nextBlockOrder[index];
+
+            if (block.scope) {
+              // if we have already seen this object, then we need to reuse the
+              // associated scope/element
+
+              nextNode = previousNode;
+
+              // skip nodes that are already pending removal via leave animation
+              do {
+                nextNode = nextNode.nextSibling;
+              } while (nextNode && nextNode[NG_REMOVED]);
+
+              if (getBlockStart(block) != nextNode) {
+                // existing item which got moved
+                $animate.move(getBlockNodes(block.clone), null, jqLite(previousNode));
+              }
+              previousNode = getBlockEnd(block);
+              updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+            } else {
+              // new item which we don't know about
+              $transclude(function ngRepeatTransclude(clone, scope) {
+                block.scope = scope;
+                // http://jsperf.com/clone-vs-createcomment
+                var endNode = ngRepeatEndComment.cloneNode(false);
+                clone[clone.length++] = endNode;
+
+                // TODO(perf): support naked previousNode in `enter` to avoid creation of jqLite wrapper?
+                $animate.enter(clone, null, jqLite(previousNode));
+                previousNode = endNode;
+                // Note: We only need the first/last node of the cloned nodes.
+                // However, we need to keep the reference to the jqlite wrapper as it might be changed later
+                // by a directive with templateUrl when its template arrives.
+                block.clone = clone;
+                nextBlockMap[block.id] = block;
+                updateScope(block.scope, index, valueIdentifier, value, keyIdentifier, key, collectionLength);
+              });
+            }
+          }
+          lastBlockMap = nextBlockMap;
+        });
+      };
+    }
+  };
+}];
+
+var NG_HIDE_CLASS = 'ng-hide';
+var NG_HIDE_IN_PROGRESS_CLASS = 'ng-hide-animate';
+/**
+ * @ngdoc directive
+ * @name ngShow
+ * @multiElement
+ *
+ * @description
+ * The `ngShow` directive shows or hides the given HTML element based on the expression
+ * provided to the `ngShow` attribute. The element is shown or hidden by removing or adding
+ * the `.ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
+ * in AngularJS and sets the display style to none (using an !important flag).
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```html
+ * <!-- when $scope.myValue is truthy (element is visible) -->
+ * <div ng-show="myValue"></div>
+ *
+ * <!-- when $scope.myValue is falsy (element is hidden) -->
+ * <div ng-show="myValue" class="ng-hide"></div>
+ * ```
+ *
+ * When the `ngShow` expression evaluates to a falsy value then the `.ng-hide` CSS class is added to the class
+ * attribute on the element causing it to become hidden. When truthy, the `.ng-hide` CSS class is removed
+ * from the element causing the element not to appear hidden.
+ *
+ * ## Why is !important used?
+ *
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
+ * can be easily overridden by heavier selectors. For example, something as simple
+ * as changing the display style on a HTML list item would make hidden elements appear visible.
+ * This also becomes a bigger issue when dealing with CSS frameworks.
+ *
+ * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
+ * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
+ * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+ *
+ * ### Overriding `.ng-hide`
+ *
+ * By default, the `.ng-hide` class will style the element with `display: none!important`. If you wish to change
+ * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
+ * class CSS. Note that the selector that needs to be used is actually `.ng-hide:not(.ng-hide-animate)` to cope
+ * with extra animation classes that can be added.
+ *
+ * ```css
+ * .ng-hide:not(.ng-hide-animate) {
+ *   /&#42; this is just another form of hiding an element &#42;/
+ *   display: block!important;
+ *   position: absolute;
+ *   top: -9999px;
+ *   left: -9999px;
+ * }
+ * ```
+ *
+ * By default you don't need to override in CSS anything and the animations will work around the display style.
+ *
+ * ## A note about animations with `ngShow`
+ *
+ * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
+ * is true and false. This system works like the animation system present with ngClass except that
+ * you must also include the !important flag to override the display property
+ * so that you can perform an animation when the element is hidden during the time of the animation.
+ *
+ * ```css
+ * //
+ * //a working example can be found at the bottom of this page
+ * //
+ * .my-element.ng-hide-add, .my-element.ng-hide-remove {
+ *   /&#42; this is required as of 1.3x to properly
+ *      apply all styling in a show/hide animation &#42;/
+ *   transition: 0s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add-active,
+ * .my-element.ng-hide-remove-active {
+ *   /&#42; the transition is defined in the active class &#42;/
+ *   transition: 1s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add { ... }
+ * .my-element.ng-hide-add.ng-hide-add-active { ... }
+ * .my-element.ng-hide-remove { ... }
+ * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
+ * ```
+ *
+ * Keep in mind that, as of AngularJS version 1.3.0-beta.11, there is no need to change the display
+ * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
+ *
+ * @animations
+ * addClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a truthy value and the just before contents are set to visible
+ * removeClass: `.ng-hide` - happens after the `ngShow` expression evaluates to a non truthy value and just before the contents are set to hidden
+ *
+ * @element ANY
+ * @param {expression} ngShow If the {@link guide/expression expression} is truthy
+ *     then the element is shown or hidden respectively.
+ *
+ * @example
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      Click me: <input type="checkbox" ng-model="checked" aria-label="Toggle ngHide"><br/>
+      <div>
+        Show:
+        <div class="check-element animate-show" ng-show="checked">
+          <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
+        </div>
+      </div>
+      <div>
+        Hide:
+        <div class="check-element animate-show" ng-hide="checked">
+          <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
+        </div>
+      </div>
+    </file>
+    <file name="glyphicons.css">
+      @import url(../../components/bootstrap-3.1.1/css/bootstrap.css);
+    </file>
+    <file name="animations.css">
+      .animate-show {
+        line-height: 20px;
+        opacity: 1;
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+
+      .animate-show.ng-hide-add, .animate-show.ng-hide-remove {
+        transition: all linear 0.5s;
+      }
+
+      .animate-show.ng-hide {
+        line-height: 0;
+        opacity: 0;
+        padding: 0 10px;
+      }
+
+      .check-element {
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
+      var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
+
+      it('should check ng-show / ng-hide', function() {
+        expect(thumbsUp.isDisplayed()).toBeFalsy();
+        expect(thumbsDown.isDisplayed()).toBeTruthy();
+
+        element(by.model('checked')).click();
+
+        expect(thumbsUp.isDisplayed()).toBeTruthy();
+        expect(thumbsDown.isDisplayed()).toBeFalsy();
+      });
+    </file>
+  </example>
+ */
+var ngShowDirective = ['$animate', function($animate) {
+  return {
+    restrict: 'A',
+    multiElement: true,
+    link: function(scope, element, attr) {
+      scope.$watch(attr.ngShow, function ngShowWatchAction(value) {
+        // we're adding a temporary, animation-specific class for ng-hide since this way
+        // we can control when the element is actually displayed on screen without having
+        // to have a global/greedy CSS selector that breaks when other animations are run.
+        // Read: https://github.com/angular/angular.js/issues/9103#issuecomment-58335845
+        $animate[value ? 'removeClass' : 'addClass'](element, NG_HIDE_CLASS, {
+          tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+        });
+      });
+    }
+  };
+}];
+
+
+/**
+ * @ngdoc directive
+ * @name ngHide
+ * @multiElement
+ *
+ * @description
+ * The `ngHide` directive shows or hides the given HTML element based on the expression
+ * provided to the `ngHide` attribute. The element is shown or hidden by removing or adding
+ * the `ng-hide` CSS class onto the element. The `.ng-hide` CSS class is predefined
+ * in AngularJS and sets the display style to none (using an !important flag).
+ * For CSP mode please add `angular-csp.css` to your html file (see {@link ng.directive:ngCsp ngCsp}).
+ *
+ * ```html
+ * <!-- when $scope.myValue is truthy (element is hidden) -->
+ * <div ng-hide="myValue" class="ng-hide"></div>
+ *
+ * <!-- when $scope.myValue is falsy (element is visible) -->
+ * <div ng-hide="myValue"></div>
+ * ```
+ *
+ * When the `ngHide` expression evaluates to a truthy value then the `.ng-hide` CSS class is added to the class
+ * attribute on the element causing it to become hidden. When falsy, the `.ng-hide` CSS class is removed
+ * from the element causing the element not to appear hidden.
+ *
+ * ## Why is !important used?
+ *
+ * You may be wondering why !important is used for the `.ng-hide` CSS class. This is because the `.ng-hide` selector
+ * can be easily overridden by heavier selectors. For example, something as simple
+ * as changing the display style on a HTML list item would make hidden elements appear visible.
+ * This also becomes a bigger issue when dealing with CSS frameworks.
+ *
+ * By using !important, the show and hide behavior will work as expected despite any clash between CSS selector
+ * specificity (when !important isn't used with any conflicting styles). If a developer chooses to override the
+ * styling to change how to hide an element then it is just a matter of using !important in their own CSS code.
+ *
+ * ### Overriding `.ng-hide`
+ *
+ * By default, the `.ng-hide` class will style the element with `display: none!important`. If you wish to change
+ * the hide behavior with ngShow/ngHide then this can be achieved by restating the styles for the `.ng-hide`
+ * class in CSS:
+ *
+ * ```css
+ * .ng-hide {
+ *   /&#42; this is just another form of hiding an element &#42;/
+ *   display: block!important;
+ *   position: absolute;
+ *   top: -9999px;
+ *   left: -9999px;
+ * }
+ * ```
+ *
+ * By default you don't need to override in CSS anything and the animations will work around the display style.
+ *
+ * ## A note about animations with `ngHide`
+ *
+ * Animations in ngShow/ngHide work with the show and hide events that are triggered when the directive expression
+ * is true and false. This system works like the animation system present with ngClass, except that the `.ng-hide`
+ * CSS class is added and removed for you instead of your own CSS class.
+ *
+ * ```css
+ * //
+ * //a working example can be found at the bottom of this page
+ * //
+ * .my-element.ng-hide-add, .my-element.ng-hide-remove {
+ *   transition: 0.5s linear all;
+ * }
+ *
+ * .my-element.ng-hide-add { ... }
+ * .my-element.ng-hide-add.ng-hide-add-active { ... }
+ * .my-element.ng-hide-remove { ... }
+ * .my-element.ng-hide-remove.ng-hide-remove-active { ... }
+ * ```
+ *
+ * Keep in mind that, as of AngularJS version 1.3.0-beta.11, there is no need to change the display
+ * property to block during animation states--ngAnimate will handle the style toggling automatically for you.
+ *
+ * @animations
+ * removeClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a truthy value and just before the contents are set to hidden
+ * addClass: `.ng-hide` - happens after the `ngHide` expression evaluates to a non truthy value and just before the contents are set to visible
+ *
+ * @element ANY
+ * @param {expression} ngHide If the {@link guide/expression expression} is truthy then
+ *     the element is shown or hidden respectively.
+ *
+ * @example
+  <example module="ngAnimate" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      Click me: <input type="checkbox" ng-model="checked" aria-label="Toggle ngShow"><br/>
+      <div>
+        Show:
+        <div class="check-element animate-hide" ng-show="checked">
+          <span class="glyphicon glyphicon-thumbs-up"></span> I show up when your checkbox is checked.
+        </div>
+      </div>
+      <div>
+        Hide:
+        <div class="check-element animate-hide" ng-hide="checked">
+          <span class="glyphicon glyphicon-thumbs-down"></span> I hide when your checkbox is checked.
+        </div>
+      </div>
+    </file>
+    <file name="glyphicons.css">
+      @import url(../../components/bootstrap-3.1.1/css/bootstrap.css);
+    </file>
+    <file name="animations.css">
+      .animate-hide {
+        transition: all linear 0.5s;
+        line-height: 20px;
+        opacity: 1;
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+
+      .animate-hide.ng-hide {
+        line-height: 0;
+        opacity: 0;
+        padding: 0 10px;
+      }
+
+      .check-element {
+        padding: 10px;
+        border: 1px solid black;
+        background: white;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var thumbsUp = element(by.css('span.glyphicon-thumbs-up'));
+      var thumbsDown = element(by.css('span.glyphicon-thumbs-down'));
+
+      it('should check ng-show / ng-hide', function() {
+        expect(thumbsUp.isDisplayed()).toBeFalsy();
+        expect(thumbsDown.isDisplayed()).toBeTruthy();
+
+        element(by.model('checked')).click();
+
+        expect(thumbsUp.isDisplayed()).toBeTruthy();
+        expect(thumbsDown.isDisplayed()).toBeFalsy();
+      });
+    </file>
+  </example>
+ */
+var ngHideDirective = ['$animate', function($animate) {
+  return {
+    restrict: 'A',
+    multiElement: true,
+    link: function(scope, element, attr) {
+      scope.$watch(attr.ngHide, function ngHideWatchAction(value) {
+        // The comment inside of the ngShowDirective explains why we add and
+        // remove a temporary class for the show/hide animation
+        $animate[value ? 'addClass' : 'removeClass'](element,NG_HIDE_CLASS, {
+          tempClasses: NG_HIDE_IN_PROGRESS_CLASS
+        });
+      });
+    }
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name ngStyle
+ * @restrict AC
+ *
+ * @description
+ * The `ngStyle` directive allows you to set CSS style on an HTML element conditionally.
+ *
+ * @element ANY
+ * @param {expression} ngStyle
+ *
+ * {@link guide/expression Expression} which evals to an
+ * object whose keys are CSS style names and values are corresponding values for those CSS
+ * keys.
+ *
+ * Since some CSS style names are not valid keys for an object, they must be quoted.
+ * See the 'background-color' style in the example below.
+ *
+ * @example
+   <example>
+     <file name="index.html">
+        <input type="button" value="set color" ng-click="myStyle={color:'red'}">
+        <input type="button" value="set background" ng-click="myStyle={'background-color':'blue'}">
+        <input type="button" value="clear" ng-click="myStyle={}">
+        <br/>
+        <span ng-style="myStyle">Sample Text</span>
+        <pre>myStyle={{myStyle}}</pre>
+     </file>
+     <file name="style.css">
+       span {
+         color: black;
+       }
+     </file>
+     <file name="protractor.js" type="protractor">
+       var colorSpan = element(by.css('span'));
+
+       it('should check ng-style', function() {
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
+         element(by.css('input[value=\'set color\']')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(255, 0, 0, 1)');
+         element(by.css('input[value=clear]')).click();
+         expect(colorSpan.getCssValue('color')).toBe('rgba(0, 0, 0, 1)');
+       });
+     </file>
+   </example>
+ */
+var ngStyleDirective = ngDirective(function(scope, element, attr) {
+  scope.$watch(attr.ngStyle, function ngStyleWatchAction(newStyles, oldStyles) {
+    if (oldStyles && (newStyles !== oldStyles)) {
+      forEach(oldStyles, function(val, style) { element.css(style, '');});
+    }
+    if (newStyles) element.css(newStyles);
+  }, true);
+});
+
+/**
+ * @ngdoc directive
+ * @name ngSwitch
+ * @restrict EA
+ *
+ * @description
+ * The `ngSwitch` directive is used to conditionally swap DOM structure on your template based on a scope expression.
+ * Elements within `ngSwitch` but without `ngSwitchWhen` or `ngSwitchDefault` directives will be preserved at the location
+ * as specified in the template.
+ *
+ * The directive itself works similar to ngInclude, however, instead of downloading template code (or loading it
+ * from the template cache), `ngSwitch` simply chooses one of the nested elements and makes it visible based on which element
+ * matches the value obtained from the evaluated expression. In other words, you define a container element
+ * (where you place the directive), place an expression on the **`on="..."` attribute**
+ * (or the **`ng-switch="..."` attribute**), define any inner elements inside of the directive and place
+ * a when attribute per element. The when attribute is used to inform ngSwitch which element to display when the on
+ * expression is evaluated. If a matching expression is not found via a when attribute then an element with the default
+ * attribute is displayed.
+ *
+ * <div class="alert alert-info">
+ * Be aware that the attribute values to match against cannot be expressions. They are interpreted
+ * as literal string values to match against.
+ * For example, **`ng-switch-when="someVal"`** will match against the string `"someVal"` not against the
+ * value of the expression `$scope.someVal`.
+ * </div>
+
+ * @animations
+ * enter - happens after the ngSwitch contents change and the matched child element is placed inside the container
+ * leave - happens just after the ngSwitch contents change and just before the former contents are removed from the DOM
+ *
+ * @usage
+ *
+ * ```
+ * <ANY ng-switch="expression">
+ *   <ANY ng-switch-when="matchValue1">...</ANY>
+ *   <ANY ng-switch-when="matchValue2">...</ANY>
+ *   <ANY ng-switch-default>...</ANY>
+ * </ANY>
+ * ```
+ *
+ *
+ * @scope
+ * @priority 1200
+ * @param {*} ngSwitch|on expression to match against <code>ng-switch-when</code>.
+ * On child elements add:
+ *
+ * * `ngSwitchWhen`: the case statement to match against. If match then this
+ *   case will be displayed. If the same match appears multiple times, all the
+ *   elements will be displayed.
+ * * `ngSwitchDefault`: the default case when no other case match. If there
+ *   are multiple default cases, all of them will be displayed when no other
+ *   case match.
+ *
+ *
+ * @example
+  <example module="switchExample" deps="angular-animate.js" animations="true">
+    <file name="index.html">
+      <div ng-controller="ExampleController">
+        <select ng-model="selection" ng-options="item for item in items">
+        </select>
+        <code>selection={{selection}}</code>
+        <hr/>
+        <div class="animate-switch-container"
+          ng-switch on="selection">
+            <div class="animate-switch" ng-switch-when="settings">Settings Div</div>
+            <div class="animate-switch" ng-switch-when="home">Home Span</div>
+            <div class="animate-switch" ng-switch-default>default</div>
+        </div>
+      </div>
+    </file>
+    <file name="script.js">
+      angular.module('switchExample', ['ngAnimate'])
+        .controller('ExampleController', ['$scope', function($scope) {
+          $scope.items = ['settings', 'home', 'other'];
+          $scope.selection = $scope.items[0];
+        }]);
+    </file>
+    <file name="animations.css">
+      .animate-switch-container {
+        position:relative;
+        background:white;
+        border:1px solid black;
+        height:40px;
+        overflow:hidden;
+      }
+
+      .animate-switch {
+        padding:10px;
+      }
+
+      .animate-switch.ng-animate {
+        transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
+
+        position:absolute;
+        top:0;
+        left:0;
+        right:0;
+        bottom:0;
+      }
+
+      .animate-switch.ng-leave.ng-leave-active,
+      .animate-switch.ng-enter {
+        top:-50px;
+      }
+      .animate-switch.ng-leave,
+      .animate-switch.ng-enter.ng-enter-active {
+        top:0;
+      }
+    </file>
+    <file name="protractor.js" type="protractor">
+      var switchElem = element(by.css('[ng-switch]'));
+      var select = element(by.model('selection'));
+
+      it('should start in settings', function() {
+        expect(switchElem.getText()).toMatch(/Settings Div/);
+      });
+      it('should change to home', function() {
+        select.all(by.css('option')).get(1).click();
+        expect(switchElem.getText()).toMatch(/Home Span/);
+      });
+      it('should select default', function() {
+        select.all(by.css('option')).get(2).click();
+        expect(switchElem.getText()).toMatch(/default/);
+      });
+    </file>
+  </example>
+ */
+var ngSwitchDirective = ['$animate', function($animate) {
+  return {
+    require: 'ngSwitch',
+
+    // asks for $scope to fool the BC controller module
+    controller: ['$scope', function ngSwitchController() {
+     this.cases = {};
+    }],
+    link: function(scope, element, attr, ngSwitchController) {
+      var watchExpr = attr.ngSwitch || attr.on,
+          selectedTranscludes = [],
+          selectedElements = [],
+          previousLeaveAnimations = [],
+          selectedScopes = [];
+
+      var spliceFactory = function(array, index) {
+          return function() { array.splice(index, 1); };
+      };
+
+      scope.$watch(watchExpr, function ngSwitchWatchAction(value) {
+        var i, ii;
+        for (i = 0, ii = previousLeaveAnimations.length; i < ii; ++i) {
+          $animate.cancel(previousLeaveAnimations[i]);
+        }
+        previousLeaveAnimations.length = 0;
+
+        for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
+          var selected = getBlockNodes(selectedElements[i].clone);
+          selectedScopes[i].$destroy();
+          var promise = previousLeaveAnimations[i] = $animate.leave(selected);
+          promise.then(spliceFactory(previousLeaveAnimations, i));
+        }
+
+        selectedElements.length = 0;
+        selectedScopes.length = 0;
+
+        if ((selectedTranscludes = ngSwitchController.cases['!' + value] || ngSwitchController.cases['?'])) {
+          forEach(selectedTranscludes, function(selectedTransclude) {
+            selectedTransclude.transclude(function(caseElement, selectedScope) {
+              selectedScopes.push(selectedScope);
+              var anchor = selectedTransclude.element;
+              caseElement[caseElement.length++] = document.createComment(' end ngSwitchWhen: ');
+              var block = { clone: caseElement };
+
+              selectedElements.push(block);
+              $animate.enter(caseElement, anchor.parent(), anchor);
+            });
+          });
+        }
+      });
+    }
+  };
+}];
+
+var ngSwitchWhenDirective = ngDirective({
+  transclude: 'element',
+  priority: 1200,
+  require: '^ngSwitch',
+  multiElement: true,
+  link: function(scope, element, attrs, ctrl, $transclude) {
+    ctrl.cases['!' + attrs.ngSwitchWhen] = (ctrl.cases['!' + attrs.ngSwitchWhen] || []);
+    ctrl.cases['!' + attrs.ngSwitchWhen].push({ transclude: $transclude, element: element });
+  }
+});
+
+var ngSwitchDefaultDirective = ngDirective({
+  transclude: 'element',
+  priority: 1200,
+  require: '^ngSwitch',
+  multiElement: true,
+  link: function(scope, element, attr, ctrl, $transclude) {
+    ctrl.cases['?'] = (ctrl.cases['?'] || []);
+    ctrl.cases['?'].push({ transclude: $transclude, element: element });
+   }
+});
+
+/**
+ * @ngdoc directive
+ * @name ngTransclude
+ * @restrict EAC
+ *
+ * @description
+ * Directive that marks the insertion point for the transcluded DOM of the nearest parent directive that uses transclusion.
+ *
+ * Any existing content of the element that this directive is placed on will be removed before the transcluded content is inserted.
+ *
+ * @element ANY
+ *
+ * @example
+   <example module="transcludeExample">
+     <file name="index.html">
+       <script>
+         angular.module('transcludeExample', [])
+          .directive('pane', function(){
+             return {
+               restrict: 'E',
+               transclude: true,
+               scope: { title:'@' },
+               template: '<div style="border: 1px solid black;">' +
+                           '<div style="background-color: gray">{{title}}</div>' +
+                           '<ng-transclude></ng-transclude>' +
+                         '</div>'
+             };
+         })
+         .controller('ExampleController', ['$scope', function($scope) {
+           $scope.title = 'Lorem Ipsum';
+           $scope.text = 'Neque porro quisquam est qui dolorem ipsum quia dolor...';
+         }]);
+       </script>
+       <div ng-controller="ExampleController">
+         <input ng-model="title" aria-label="title"> <br/>
+         <textarea ng-model="text" aria-label="text"></textarea> <br/>
+         <pane title="{{title}}">{{text}}</pane>
+       </div>
+     </file>
+     <file name="protractor.js" type="protractor">
+        it('should have transcluded', function() {
+          var titleElement = element(by.model('title'));
+          titleElement.clear();
+          titleElement.sendKeys('TITLE');
+          var textElement = element(by.model('text'));
+          textElement.clear();
+          textElement.sendKeys('TEXT');
+          expect(element(by.binding('title')).getText()).toEqual('TITLE');
+          expect(element(by.binding('text')).getText()).toEqual('TEXT');
+        });
+     </file>
+   </example>
+ *
+ */
+var ngTranscludeDirective = ngDirective({
+  restrict: 'EAC',
+  link: function($scope, $element, $attrs, controller, $transclude) {
+    if (!$transclude) {
+      throw minErr('ngTransclude')('orphan',
+       'Illegal use of ngTransclude directive in the template! ' +
+       'No parent directive that requires a transclusion found. ' +
+       'Element: {0}',
+       startingTag($element));
+    }
+
+    $transclude(function(clone) {
+      $element.empty();
+      $element.append(clone);
+    });
+  }
+});
+
+/**
+ * @ngdoc directive
+ * @name script
+ * @restrict E
+ *
+ * @description
+ * Load the content of a `<script>` element into {@link ng.$templateCache `$templateCache`}, so that the
+ * template can be used by {@link ng.directive:ngInclude `ngInclude`},
+ * {@link ngRoute.directive:ngView `ngView`}, or {@link guide/directive directives}. The type of the
+ * `<script>` element must be specified as `text/ng-template`, and a cache name for the template must be
+ * assigned through the element's `id`, which can then be used as a directive's `templateUrl`.
+ *
+ * @param {string} type Must be set to `'text/ng-template'`.
+ * @param {string} id Cache name of the template.
+ *
+ * @example
+  <example>
+    <file name="index.html">
+      <script type="text/ng-template" id="/tpl.html">
+        Content of the template.
+      </script>
+
+      <a ng-click="currentTpl='/tpl.html'" id="tpl-link">Load inlined template</a>
+      <div id="tpl-content" ng-include src="currentTpl"></div>
+    </file>
+    <file name="protractor.js" type="protractor">
+      it('should load template defined inside script tag', function() {
+        element(by.css('#tpl-link')).click();
+        expect(element(by.css('#tpl-content')).getText()).toMatch(/Content of the template/);
+      });
+    </file>
+  </example>
+ */
+var scriptDirective = ['$templateCache', function($templateCache) {
+  return {
+    restrict: 'E',
+    terminal: true,
+    compile: function(element, attr) {
+      if (attr.type == 'text/ng-template') {
+        var templateUrl = attr.id,
+            text = element[0].text;
+
+        $templateCache.put(templateUrl, text);
+      }
+    }
+  };
+}];
+
+var noopNgModelController = { $setViewValue: noop, $render: noop };
+
+function chromeHack(optionElement) {
+  // Workaround for https://code.google.com/p/chromium/issues/detail?id=381459
+  // Adding an <option selected="selected"> element to a <select required="required"> should
+  // automatically select the new element
+  if (optionElement[0].hasAttribute('selected')) {
+    optionElement[0].selected = true;
+  }
+}
+
+/**
+ * @ngdoc type
+ * @name  select.SelectController
+ * @description
+ * The controller for the `<select>` directive. This provides support for reading
+ * and writing the selected value(s) of the control and also coordinates dynamically
+ * added `<option>` elements, perhaps by an `ngRepeat` directive.
+ */
+var SelectController =
+        ['$element', '$scope', '$attrs', function($element, $scope, $attrs) {
+
+  var self = this,
+      optionsMap = new HashMap();
+
+  // If the ngModel doesn't get provided then provide a dummy noop version to prevent errors
+  self.ngModelCtrl = noopNgModelController;
+
+  // The "unknown" option is one that is prepended to the list if the viewValue
+  // does not match any of the options. When it is rendered the value of the unknown
+  // option is '? XXX ?' where XXX is the hashKey of the value that is not known.
+  //
+  // We can't just jqLite('<option>') since jqLite is not smart enough
+  // to create it in <select> and IE barfs otherwise.
+  self.unknownOption = jqLite(document.createElement('option'));
+  self.renderUnknownOption = function(val) {
+    var unknownVal = '? ' + hashKey(val) + ' ?';
+    self.unknownOption.val(unknownVal);
+    $element.prepend(self.unknownOption);
+    $element.val(unknownVal);
+  };
+
+  $scope.$on('$destroy', function() {
+    // disable unknown option so that we don't do work when the whole select is being destroyed
+    self.renderUnknownOption = noop;
+  });
+
+  self.removeUnknownOption = function() {
+    if (self.unknownOption.parent()) self.unknownOption.remove();
+  };
+
+
+  // Read the value of the select control, the implementation of this changes depending
+  // upon whether the select can have multiple values and whether ngOptions is at work.
+  self.readValue = function readSingleValue() {
+    self.removeUnknownOption();
+    return $element.val();
+  };
+
+
+  // Write the value to the select control, the implementation of this changes depending
+  // upon whether the select can have multiple values and whether ngOptions is at work.
+  self.writeValue = function writeSingleValue(value) {
+    if (self.hasOption(value)) {
+      self.removeUnknownOption();
+      $element.val(value);
+      if (value === '') self.emptyOption.prop('selected', true); // to make IE9 happy
+    } else {
+      if (value == null && self.emptyOption) {
+        self.removeUnknownOption();
+        $element.val('');
+      } else {
+        self.renderUnknownOption(value);
+      }
+    }
+  };
+
+
+  // Tell the select control that an option, with the given value, has been added
+  self.addOption = function(value, element) {
+    assertNotHasOwnProperty(value, '"option value"');
+    if (value === '') {
+      self.emptyOption = element;
+    }
+    var count = optionsMap.get(value) || 0;
+    optionsMap.put(value, count + 1);
+    self.ngModelCtrl.$render();
+    chromeHack(element);
+  };
+
+  // Tell the select control that an option, with the given value, has been removed
+  self.removeOption = function(value) {
+    var count = optionsMap.get(value);
+    if (count) {
+      if (count === 1) {
+        optionsMap.remove(value);
+        if (value === '') {
+          self.emptyOption = undefined;
+        }
+      } else {
+        optionsMap.put(value, count - 1);
+      }
+    }
+  };
+
+  // Check whether the select control has an option matching the given value
+  self.hasOption = function(value) {
+    return !!optionsMap.get(value);
+  };
+
+
+  self.registerOption = function(optionScope, optionElement, optionAttrs, interpolateValueFn, interpolateTextFn) {
+
+    if (interpolateValueFn) {
+      // The value attribute is interpolated
+      var oldVal;
+      optionAttrs.$observe('value', function valueAttributeObserveAction(newVal) {
+        if (isDefined(oldVal)) {
+          self.removeOption(oldVal);
+        }
+        oldVal = newVal;
+        self.addOption(newVal, optionElement);
+      });
+    } else if (interpolateTextFn) {
+      // The text content is interpolated
+      optionScope.$watch(interpolateTextFn, function interpolateWatchAction(newVal, oldVal) {
+        optionAttrs.$set('value', newVal);
+        if (oldVal !== newVal) {
+          self.removeOption(oldVal);
+        }
+        self.addOption(newVal, optionElement);
+      });
+    } else {
+      // The value attribute is static
+      self.addOption(optionAttrs.value, optionElement);
+    }
+
+    optionElement.on('$destroy', function() {
+      self.removeOption(optionAttrs.value);
+      self.ngModelCtrl.$render();
+    });
+  };
+}];
+
+/**
+ * @ngdoc directive
+ * @name select
+ * @restrict E
+ *
+ * @description
+ * HTML `SELECT` element with angular data-binding.
+ *
+ * The `select` directive is used together with {@link ngModel `ngModel`} to provide data-binding
+ * between the scope and the `<select>` control (including setting default values).
+ * It also handles dynamic `<option>` elements, which can be added using the {@link ngRepeat `ngRepeat}` or
+ * {@link ngOptions `ngOptions`} directives.
+ *
+ * When an item in the `<select>` menu is selected, the value of the selected option will be bound
+ * to the model identified by the `ngModel` directive. With static or repeated options, this is
+ * the content of the `value` attribute or the textContent of the `<option>`, if the value attribute is missing.
+ * If you want dynamic value attributes, you can use interpolation inside the value attribute.
+ *
+ * <div class="alert alert-warning">
+ * Note that the value of a `select` directive used without `ngOptions` is always a string.
+ * When the model needs to be bound to a non-string value, you must either explictly convert it
+ * using a directive (see example below) or use `ngOptions` to specify the set of options.
+ * This is because an option element can only be bound to string values at present.
+ * </div>
+ *
+ * If the viewValue of `ngModel` does not match any of the options, then the control
+ * will automatically add an "unknown" option, which it then removes when the mismatch is resolved.
+ *
+ * Optionally, a single hard-coded `<option>` element, with the value set to an empty string, can
+ * be nested into the `<select>` element. This element will then represent the `null` or "not selected"
+ * option. See example below for demonstration.
+ *
+ * <div class="alert alert-info">
+ * In many cases, `ngRepeat` can be used on `<option>` elements instead of {@link ng.directive:ngOptions
+ * ngOptions} to achieve a similar result. However, `ngOptions` provides some benefits, such as
+ * more flexibility in how the `<select>`'s model is assigned via the `select` **`as`** part of the
+ * comprehension expression, and additionally in reducing memory and increasing speed by not creating
+ * a new scope for each repeated instance.
+ * </div>
+ *
+ *
+ * @param {string} ngModel Assignable angular expression to data-bind to.
+ * @param {string=} name Property name of the form under which the control is published.
+ * @param {string=} multiple Allows multiple options to be selected. The selected values will be
+ *     bound to the model as an array.
+ * @param {string=} required Sets `required` validation error key if the value is not entered.
+ * @param {string=} ngRequired Adds required attribute and required validation constraint to
+ * the element when the ngRequired expression evaluates to true. Use ngRequired instead of required
+ * when you want to data-bind to the required attribute.
+ * @param {string=} ngChange Angular expression to be executed when selected option(s) changes due to user
+ *    interaction with the select element.
+ * @param {string=} ngOptions sets the options that the select is populated with and defines what is
+ * set on the model on selection. See {@link ngOptions `ngOptions`}.
+ *
+ * @example
+ * ### Simple `select` elements with static options
+ *
+ * <example name="static-select" module="staticSelect">
+ * <file name="index.html">
+ * <div ng-controller="ExampleController">
+ *   <form name="myForm">
+ *     <label for="singleSelect"> Single select: </label><br>
+ *     <select name="singleSelect" ng-model="data.singleSelect">
+ *       <option value="option-1">Option 1</option>
+ *       <option value="option-2">Option 2</option>
+ *     </select><br>
+ *
+ *     <label for="singleSelect"> Single select with "not selected" option and dynamic option values: </label><br>
+ *     <select name="singleSelect" id="singleSelect" ng-model="data.singleSelect">
+ *       <option value="">---Please select---</option> <!-- not selected / blank option -->
+ *       <option value="{{data.option1}}">Option 1</option> <!-- interpolation -->
+ *       <option value="option-2">Option 2</option>
+ *     </select><br>
+ *     <button ng-click="forceUnknownOption()">Force unknown option</button><br>
+ *     <tt>singleSelect = {{data.singleSelect}}</tt>
+ *
+ *     <hr>
+ *     <label for="multipleSelect"> Multiple select: </label><br>
+ *     <select name="multipleSelect" id="multipleSelect" ng-model="data.multipleSelect" multiple>
+ *       <option value="option-1">Option 1</option>
+ *       <option value="option-2">Option 2</option>
+ *       <option value="option-3">Option 3</option>
+ *     </select><br>
+ *     <tt>multipleSelect = {{data.multipleSelect}}</tt><br/>
+ *   </form>
+ * </div>
+ * </file>
+ * <file name="app.js">
+ *  angular.module('staticSelect', [])
+ *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.data = {
+ *       singleSelect: null,
+ *       multipleSelect: [],
+ *       option1: 'option-1',
+ *      };
+ *
+ *      $scope.forceUnknownOption = function() {
+ *        $scope.data.singleSelect = 'nonsense';
+ *      };
+ *   }]);
+ * </file>
+ *</example>
+ *
+ * ### Using `ngRepeat` to generate `select` options
+ * <example name="ngrepeat-select" module="ngrepeatSelect">
+ * <file name="index.html">
+ * <div ng-controller="ExampleController">
+ *   <form name="myForm">
+ *     <label for="repeatSelect"> Repeat select: </label>
+ *     <select name="repeatSelect" id="repeatSelect" ng-model="data.repeatSelect">
+ *       <option ng-repeat="option in data.availableOptions" value="{{option.id}}">{{option.name}}</option>
+ *     </select>
+ *   </form>
+ *   <hr>
+ *   <tt>repeatSelect = {{data.repeatSelect}}</tt><br/>
+ * </div>
+ * </file>
+ * <file name="app.js">
+ *  angular.module('ngrepeatSelect', [])
+ *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.data = {
+ *       repeatSelect: null,
+ *       availableOptions: [
+ *         {id: '1', name: 'Option A'},
+ *         {id: '2', name: 'Option B'},
+ *         {id: '3', name: 'Option C'}
+ *       ],
+ *      };
+ *   }]);
+ * </file>
+ *</example>
+ *
+ *
+ * ### Using `select` with `ngOptions` and setting a default value
+ * See the {@link ngOptions ngOptions documentation} for more `ngOptions` usage examples.
+ *
+ * <example name="select-with-default-values" module="defaultValueSelect">
+ * <file name="index.html">
+ * <div ng-controller="ExampleController">
+ *   <form name="myForm">
+ *     <label for="mySelect">Make a choice:</label>
+ *     <select name="mySelect" id="mySelect"
+ *       ng-options="option.name for option in data.availableOptions track by option.id"
+ *       ng-model="data.selectedOption"></select>
+ *   </form>
+ *   <hr>
+ *   <tt>option = {{data.selectedOption}}</tt><br/>
+ * </div>
+ * </file>
+ * <file name="app.js">
+ *  angular.module('defaultValueSelect', [])
+ *    .controller('ExampleController', ['$scope', function($scope) {
+ *      $scope.data = {
+ *       availableOptions: [
+ *         {id: '1', name: 'Option A'},
+ *         {id: '2', name: 'Option B'},
+ *         {id: '3', name: 'Option C'}
+ *       ],
+ *       selectedOption: {id: '3', name: 'Option C'} //This sets the default value of the select in the ui
+ *       };
+ *   }]);
+ * </file>
+ *</example>
+ *
+ *
+ * ### Binding `select` to a non-string value via `ngModel` parsing / formatting
+ *
+ * <example name="select-with-non-string-options" module="nonStringSelect">
+ *   <file name="index.html">
+ *     <select ng-model="model.id" convert-to-number>
+ *       <option value="0">Zero</option>
+ *       <option value="1">One</option>
+ *       <option value="2">Two</option>
+ *     </select>
+ *     {{ model }}
+ *   </file>
+ *   <file name="app.js">
+ *     angular.module('nonStringSelect', [])
+ *       .run(function($rootScope) {
+ *         $rootScope.model = { id: 2 };
+ *       })
+ *       .directive('convertToNumber', function() {
+ *         return {
+ *           require: 'ngModel',
+ *           link: function(scope, element, attrs, ngModel) {
+ *             ngModel.$parsers.push(function(val) {
+ *               return parseInt(val, 10);
+ *             });
+ *             ngModel.$formatters.push(function(val) {
+ *               return '' + val;
+ *             });
+ *           }
+ *         };
+ *       });
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+ *     it('should initialize to model', function() {
+ *       var select = element(by.css('select'));
+ *       expect(element(by.model('model.id')).$('option:checked').getText()).toEqual('Two');
+ *     });
+ *   </file>
+ * </example>
+ *
+ */
+var selectDirective = function() {
+
+  return {
+    restrict: 'E',
+    require: ['select', '?ngModel'],
+    controller: SelectController,
+    priority: 1,
+    link: {
+      pre: selectPreLink,
+      post: selectPostLink
+    }
+  };
+
+  function selectPreLink(scope, element, attr, ctrls) {
+
+      // if ngModel is not defined, we don't need to do anything
+      var ngModelCtrl = ctrls[1];
+      if (!ngModelCtrl) return;
+
+      var selectCtrl = ctrls[0];
+
+      selectCtrl.ngModelCtrl = ngModelCtrl;
+
+      // When the selected item(s) changes we delegate getting the value of the select control
+      // to the `readValue` method, which can be changed if the select can have multiple
+      // selected values or if the options are being generated by `ngOptions`
+      element.on('change', function() {
+        scope.$apply(function() {
+          ngModelCtrl.$setViewValue(selectCtrl.readValue());
+        });
+      });
+
+      // If the select allows multiple values then we need to modify how we read and write
+      // values from and to the control; also what it means for the value to be empty and
+      // we have to add an extra watch since ngModel doesn't work well with arrays - it
+      // doesn't trigger rendering if only an item in the array changes.
+      if (attr.multiple) {
+
+        // Read value now needs to check each option to see if it is selected
+        selectCtrl.readValue = function readMultipleValue() {
+          var array = [];
+          forEach(element.find('option'), function(option) {
+            if (option.selected) {
+              array.push(option.value);
+            }
+          });
+          return array;
+        };
+
+        // Write value now needs to set the selected property of each matching option
+        selectCtrl.writeValue = function writeMultipleValue(value) {
+          var items = new HashMap(value);
+          forEach(element.find('option'), function(option) {
+            option.selected = isDefined(items.get(option.value));
+          });
+        };
+
+        // we have to do it on each watch since ngModel watches reference, but
+        // we need to work of an array, so we need to see if anything was inserted/removed
+        var lastView, lastViewRef = NaN;
+        scope.$watch(function selectMultipleWatch() {
+          if (lastViewRef === ngModelCtrl.$viewValue && !equals(lastView, ngModelCtrl.$viewValue)) {
+            lastView = shallowCopy(ngModelCtrl.$viewValue);
+            ngModelCtrl.$render();
+          }
+          lastViewRef = ngModelCtrl.$viewValue;
+        });
+
+        // If we are a multiple select then value is now a collection
+        // so the meaning of $isEmpty changes
+        ngModelCtrl.$isEmpty = function(value) {
+          return !value || value.length === 0;
+        };
+
+      }
+    }
+
+    function selectPostLink(scope, element, attrs, ctrls) {
+      // if ngModel is not defined, we don't need to do anything
+      var ngModelCtrl = ctrls[1];
+      if (!ngModelCtrl) return;
+
+      var selectCtrl = ctrls[0];
+
+      // We delegate rendering to the `writeValue` method, which can be changed
+      // if the select can have multiple selected values or if the options are being
+      // generated by `ngOptions`.
+      // This must be done in the postLink fn to prevent $render to be called before
+      // all nodes have been linked correctly.
+      ngModelCtrl.$render = function() {
+        selectCtrl.writeValue(ngModelCtrl.$viewValue);
+      };
+    }
+};
+
+
+// The option directive is purely designed to communicate the existence (or lack of)
+// of dynamically created (and destroyed) option elements to their containing select
+// directive via its controller.
+var optionDirective = ['$interpolate', function($interpolate) {
+  return {
+    restrict: 'E',
+    priority: 100,
+    compile: function(element, attr) {
+
+      if (isDefined(attr.value)) {
+        // If the value attribute is defined, check if it contains an interpolation
+        var interpolateValueFn = $interpolate(attr.value, true);
+      } else {
+        // If the value attribute is not defined then we fall back to the
+        // text content of the option element, which may be interpolated
+        var interpolateTextFn = $interpolate(element.text(), true);
+        if (!interpolateTextFn) {
+          attr.$set('value', element.text());
+        }
+      }
+
+      return function(scope, element, attr) {
+
+        // This is an optimization over using ^^ since we don't want to have to search
+        // all the way to the root of the DOM for every single option element
+        var selectCtrlName = '$selectController',
+            parent = element.parent(),
+            selectCtrl = parent.data(selectCtrlName) ||
+              parent.parent().data(selectCtrlName); // in case we are in optgroup
+
+        if (selectCtrl) {
+          selectCtrl.registerOption(scope, element, attr, interpolateValueFn, interpolateTextFn);
+        }
+      };
+    }
+  };
+}];
+
+var styleDirective = valueFn({
+  restrict: 'E',
+  terminal: false
+});
+
+/**
+ * @ngdoc directive
+ * @name ngRequired
+ *
+ * @description
+ *
+ * ngRequired adds the required {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+ * It is most often used for {@link input `input`} and {@link select `select`} controls, but can also be
+ * applied to custom controls.
+ *
+ * The directive sets the `required` attribute on the element if the Angular expression inside
+ * `ngRequired` evaluates to true. A special directive for setting `required` is necessary because we
+ * cannot use interpolation inside `required`. See the {@link guide/interpolation interpolation guide}
+ * for more info.
+ *
+ * The validator will set the `required` error key to true if the `required` attribute is set and
+ * calling {@link ngModel.NgModelController#$isEmpty `NgModelController.$isEmpty` with the
+ * {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`} returns `true`. For example, the
+ * `$isEmpty()` implementation for `input[text]` checks the length of the `$viewValue`. When developing
+ * custom controls, `$isEmpty()` can be overwritten to account for a $viewValue that is not string-based.
+ *
+ * @example
+ * <example name="ngRequiredDirective" module="ngRequiredExample">
+ *   <file name="index.html">
+ *     <script>
+ *       angular.module('ngRequiredExample', [])
+ *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.required = true;
+ *         }]);
+ *     </script>
+ *     <div ng-controller="ExampleController">
+ *       <form name="form">
+ *         <label for="required">Toggle required: </label>
+ *         <input type="checkbox" ng-model="required" id="required" />
+ *         <br>
+ *         <label for="input">This input must be filled if `required` is true: </label>
+ *         <input type="text" ng-model="model" id="input" name="input" ng-required="required" /><br>
+ *         <hr>
+ *         required error set? = <code>{{form.input.$error.required}}</code><br>
+ *         model = <code>{{model}}</code>
+ *       </form>
+ *     </div>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+       var required = element(by.binding('form.input.$error.required'));
+       var model = element(by.binding('model'));
+       var input = element(by.id('input'));
+
+       it('should set the required error', function() {
+         expect(required.getText()).toContain('true');
+
+         input.sendKeys('123');
+         expect(required.getText()).not.toContain('true');
+         expect(model.getText()).toContain('123');
+       });
+ *   </file>
+ * </example>
+ */
+var requiredDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+      attr.required = true; // force truthy in case we are on non input element
+
+      ctrl.$validators.required = function(modelValue, viewValue) {
+        return !attr.required || !ctrl.$isEmpty(viewValue);
+      };
+
+      attr.$observe('required', function() {
+        ctrl.$validate();
+      });
+    }
+  };
+};
+
+/**
+ * @ngdoc directive
+ * @name ngPattern
+ *
+ * @description
+ *
+ * ngPattern adds the pattern {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+ * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+ *
+ * The validator sets the `pattern` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+ * does not match a RegExp which is obtained by evaluating the Angular expression given in the
+ * `ngPattern` attribute value:
+ * * If the expression evaluates to a RegExp object, then this is used directly.
+ * * If the expression evaluates to a string, then it will be converted to a RegExp after wrapping it
+ * in `^` and `$` characters. For instance, `"abc"` will be converted to `new RegExp('^abc$')`.
+ *
+ * <div class="alert alert-info">
+ * **Note:** Avoid using the `g` flag on the RegExp, as it will cause each successive search to
+ * start at the index of the last search's match, thus not taking the whole input value into
+ * account.
+ * </div>
+ *
+ * <div class="alert alert-info">
+ * **Note:** This directive is also added when the plain `pattern` attribute is used, with two
+ * differences:
+ * <ol>
+ *   <li>
+ *     `ngPattern` does not set the `pattern` attribute and therefore HTML5 constraint validation is
+ *     not available.
+ *   </li>
+ *   <li>
+ *     The `ngPattern` attribute must be an expression, while the `pattern` value must be
+ *     interpolated.
+ *   </li>
+ * </ol>
+ * </div>
+ *
+ * @example
+ * <example name="ngPatternDirective" module="ngPatternExample">
+ *   <file name="index.html">
+ *     <script>
+ *       angular.module('ngPatternExample', [])
+ *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.regex = '\\d+';
+ *         }]);
+ *     </script>
+ *     <div ng-controller="ExampleController">
+ *       <form name="form">
+ *         <label for="regex">Set a pattern (regex string): </label>
+ *         <input type="text" ng-model="regex" id="regex" />
+ *         <br>
+ *         <label for="input">This input is restricted by the current pattern: </label>
+ *         <input type="text" ng-model="model" id="input" name="input" ng-pattern="regex" /><br>
+ *         <hr>
+ *         input valid? = <code>{{form.input.$valid}}</code><br>
+ *         model = <code>{{model}}</code>
+ *       </form>
+ *     </div>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+       var model = element(by.binding('model'));
+       var input = element(by.id('input'));
+
+       it('should validate the input with the default pattern', function() {
+         input.sendKeys('aaa');
+         expect(model.getText()).not.toContain('aaa');
+
+         input.clear().then(function() {
+           input.sendKeys('123');
+           expect(model.getText()).toContain('123');
+         });
+       });
+ *   </file>
+ * </example>
+ */
+var patternDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+
+      var regexp, patternExp = attr.ngPattern || attr.pattern;
+      attr.$observe('pattern', function(regex) {
+        if (isString(regex) && regex.length > 0) {
+          regex = new RegExp('^' + regex + '$');
+        }
+
+        if (regex && !regex.test) {
+          throw minErr('ngPattern')('noregexp',
+            'Expected {0} to be a RegExp but was {1}. Element: {2}', patternExp,
+            regex, startingTag(elm));
+        }
+
+        regexp = regex || undefined;
+        ctrl.$validate();
+      });
+
+      ctrl.$validators.pattern = function(modelValue, viewValue) {
+        // HTML5 pattern constraint validates the input value, so we validate the viewValue
+        return ctrl.$isEmpty(viewValue) || isUndefined(regexp) || regexp.test(viewValue);
+      };
+    }
+  };
+};
+
+/**
+ * @ngdoc directive
+ * @name ngMaxlength
+ *
+ * @description
+ *
+ * ngMaxlength adds the maxlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+ * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+ *
+ * The validator sets the `maxlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+ * is longer than the integer obtained by evaluating the Angular expression given in the
+ * `ngMaxlength` attribute value.
+ *
+ * <div class="alert alert-info">
+ * **Note:** This directive is also added when the plain `maxlength` attribute is used, with two
+ * differences:
+ * <ol>
+ *   <li>
+ *     `ngMaxlength` does not set the `maxlength` attribute and therefore HTML5 constraint
+ *     validation is not available.
+ *   </li>
+ *   <li>
+ *     The `ngMaxlength` attribute must be an expression, while the `maxlength` value must be
+ *     interpolated.
+ *   </li>
+ * </ol>
+ * </div>
+ *
+ * @example
+ * <example name="ngMaxlengthDirective" module="ngMaxlengthExample">
+ *   <file name="index.html">
+ *     <script>
+ *       angular.module('ngMaxlengthExample', [])
+ *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.maxlength = 5;
+ *         }]);
+ *     </script>
+ *     <div ng-controller="ExampleController">
+ *       <form name="form">
+ *         <label for="maxlength">Set a maxlength: </label>
+ *         <input type="number" ng-model="maxlength" id="maxlength" />
+ *         <br>
+ *         <label for="input">This input is restricted by the current maxlength: </label>
+ *         <input type="text" ng-model="model" id="input" name="input" ng-maxlength="maxlength" /><br>
+ *         <hr>
+ *         input valid? = <code>{{form.input.$valid}}</code><br>
+ *         model = <code>{{model}}</code>
+ *       </form>
+ *     </div>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+       var model = element(by.binding('model'));
+       var input = element(by.id('input'));
+
+       it('should validate the input with the default maxlength', function() {
+         input.sendKeys('abcdef');
+         expect(model.getText()).not.toContain('abcdef');
+
+         input.clear().then(function() {
+           input.sendKeys('abcde');
+           expect(model.getText()).toContain('abcde');
+         });
+       });
+ *   </file>
+ * </example>
+ */
+var maxlengthDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+
+      var maxlength = -1;
+      attr.$observe('maxlength', function(value) {
+        var intVal = toInt(value);
+        maxlength = isNaN(intVal) ? -1 : intVal;
+        ctrl.$validate();
+      });
+      ctrl.$validators.maxlength = function(modelValue, viewValue) {
+        return (maxlength < 0) || ctrl.$isEmpty(viewValue) || (viewValue.length <= maxlength);
+      };
+    }
+  };
+};
+
+/**
+ * @ngdoc directive
+ * @name ngMinlength
+ *
+ * @description
+ *
+ * ngMinlength adds the minlength {@link ngModel.NgModelController#$validators `validator`} to {@link ngModel `ngModel`}.
+ * It is most often used for text-based {@link input `input`} controls, but can also be applied to custom text-based controls.
+ *
+ * The validator sets the `minlength` error key if the {@link ngModel.NgModelController#$viewValue `ngModel.$viewValue`}
+ * is shorter than the integer obtained by evaluating the Angular expression given in the
+ * `ngMinlength` attribute value.
+ *
+ * <div class="alert alert-info">
+ * **Note:** This directive is also added when the plain `minlength` attribute is used, with two
+ * differences:
+ * <ol>
+ *   <li>
+ *     `ngMinlength` does not set the `minlength` attribute and therefore HTML5 constraint
+ *     validation is not available.
+ *   </li>
+ *   <li>
+ *     The `ngMinlength` value must be an expression, while the `minlength` value must be
+ *     interpolated.
+ *   </li>
+ * </ol>
+ * </div>
+ *
+ * @example
+ * <example name="ngMinlengthDirective" module="ngMinlengthExample">
+ *   <file name="index.html">
+ *     <script>
+ *       angular.module('ngMinlengthExample', [])
+ *         .controller('ExampleController', ['$scope', function($scope) {
+ *           $scope.minlength = 3;
+ *         }]);
+ *     </script>
+ *     <div ng-controller="ExampleController">
+ *       <form name="form">
+ *         <label for="minlength">Set a minlength: </label>
+ *         <input type="number" ng-model="minlength" id="minlength" />
+ *         <br>
+ *         <label for="input">This input is restricted by the current minlength: </label>
+ *         <input type="text" ng-model="model" id="input" name="input" ng-minlength="minlength" /><br>
+ *         <hr>
+ *         input valid? = <code>{{form.input.$valid}}</code><br>
+ *         model = <code>{{model}}</code>
+ *       </form>
+ *     </div>
+ *   </file>
+ *   <file name="protractor.js" type="protractor">
+       var model = element(by.binding('model'));
+       var input = element(by.id('input'));
+
+       it('should validate the input with the default minlength', function() {
+         input.sendKeys('ab');
+         expect(model.getText()).not.toContain('ab');
+
+         input.sendKeys('abc');
+         expect(model.getText()).toContain('abc');
+       });
+ *   </file>
+ * </example>
+ */
+var minlengthDirective = function() {
+  return {
+    restrict: 'A',
+    require: '?ngModel',
+    link: function(scope, elm, attr, ctrl) {
+      if (!ctrl) return;
+
+      var minlength = 0;
+      attr.$observe('minlength', function(value) {
+        minlength = toInt(value) || 0;
+        ctrl.$validate();
+      });
+      ctrl.$validators.minlength = function(modelValue, viewValue) {
+        return ctrl.$isEmpty(viewValue) || viewValue.length >= minlength;
+      };
+    }
+  };
+};
+
+if (window.angular.bootstrap) {
+  //AngularJS is already loaded, so we can return here...
+  console.log('WARNING: Tried to load angular more than once.');
+  return;
+}
+
+//try to bind to jquery now so that one can write jqLite(document).ready()
+//but we will rebind on bootstrap again.
+bindJQuery();
+
+publishExternalAPI(angular);
+
+angular.module("ngLocale", [], ["$provide", function($provide) {
+var PLURAL_CATEGORY = {ZERO: "zero", ONE: "one", TWO: "two", FEW: "few", MANY: "many", OTHER: "other"};
+function getDecimals(n) {
+  n = n + '';
+  var i = n.indexOf('.');
+  return (i == -1) ? 0 : n.length - i - 1;
+}
+
+function getVF(n, opt_precision) {
+  var v = opt_precision;
+
+  if (undefined === v) {
+    v = Math.min(getDecimals(n), 3);
+  }
+
+  var base = Math.pow(10, v);
+  var f = ((n * base) | 0) % base;
+  return {v: v, f: f};
+}
+
+$provide.value("$locale", {
+  "DATETIME_FORMATS": {
+    "AMPMS": [
+      "AM",
+      "PM"
+    ],
+    "DAY": [
+      "Sunday",
+      "Monday",
+      "Tuesday",
+      "Wednesday",
+      "Thursday",
+      "Friday",
+      "Saturday"
+    ],
+    "ERANAMES": [
+      "Before Christ",
+      "Anno Domini"
+    ],
+    "ERAS": [
+      "BC",
+      "AD"
+    ],
+    "FIRSTDAYOFWEEK": 6,
+    "MONTH": [
+      "January",
+      "February",
+      "March",
+      "April",
+      "May",
+      "June",
+      "July",
+      "August",
+      "September",
+      "October",
+      "November",
+      "December"
+    ],
+    "SHORTDAY": [
+      "Sun",
+      "Mon",
+      "Tue",
+      "Wed",
+      "Thu",
+      "Fri",
+      "Sat"
+    ],
+    "SHORTMONTH": [
+      "Jan",
+      "Feb",
+      "Mar",
+      "Apr",
+      "May",
+      "Jun",
+      "Jul",
+      "Aug",
+      "Sep",
+      "Oct",
+      "Nov",
+      "Dec"
+    ],
+    "STANDALONEMONTH": [
+      "January",
+      "February",
+      "March",
+      "April",
+      "May",
+      "June",
+      "July",
+      "August",
+      "September",
+      "October",
+      "November",
+      "December"
+    ],
+    "WEEKENDRANGE": [
+      5,
+      6
+    ],
+    "fullDate": "EEEE, MMMM d, y",
+    "longDate": "MMMM d, y",
+    "medium": "MMM d, y h:mm:ss a",
+    "mediumDate": "MMM d, y",
+    "mediumTime": "h:mm:ss a",
+    "short": "M/d/yy h:mm a",
+    "shortDate": "M/d/yy",
+    "shortTime": "h:mm a"
+  },
+  "NUMBER_FORMATS": {
+    "CURRENCY_SYM": "$",
+    "DECIMAL_SEP": ".",
+    "GROUP_SEP": ",",
+    "PATTERNS": [
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 3,
+        "minFrac": 0,
+        "minInt": 1,
+        "negPre": "-",
+        "negSuf": "",
+        "posPre": "",
+        "posSuf": ""
+      },
+      {
+        "gSize": 3,
+        "lgSize": 3,
+        "maxFrac": 2,
+        "minFrac": 2,
+        "minInt": 1,
+        "negPre": "-\u00a4",
+        "negSuf": "",
+        "posPre": "\u00a4",
+        "posSuf": ""
+      }
+    ]
+  },
+  "id": "en-us",
+  "pluralCat": function(n, opt_precision) {  var i = n | 0;  var vf = getVF(n, opt_precision);  if (i == 1 && vf.v == 0) {    return PLURAL_CATEGORY.ONE;  }  return PLURAL_CATEGORY.OTHER;}
+});
+}]);
+
+  jqLite(document).ready(function() {
+    angularInit(document, bootstrap);
+  });
+
+})(window, document);
+
+!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
\ No newline at end of file
diff --git a/turtles/bower_components/angular/angular.min.js b/turtles/bower_components/angular/angular.min.js
new file mode 100644
index 000000000..91af11c8e
--- /dev/null
+++ b/turtles/bower_components/angular/angular.min.js
@@ -0,0 +1,298 @@
+/*
+ AngularJS v1.4.9
+ (c) 2010-2015 Google, Inc. http://angularjs.org
+ License: MIT
+*/
+(function(S,W,w){'use strict';function M(a){return function(){var b=arguments[0],d;d="["+(a?a+":":"")+b+"] http://errors.angularjs.org/1.4.9/"+(a?a+"/":"")+b;for(b=1;b<arguments.length;b++){d=d+(1==b?"?":"&")+"p"+(b-1)+"=";var c=encodeURIComponent,e;e=arguments[b];e="function"==typeof e?e.toString().replace(/ \{[\s\S]*$/,""):"undefined"==typeof e?"undefined":"string"!=typeof e?JSON.stringify(e):e;d+=c(e)}return Error(d)}}function Aa(a){if(null==a||Xa(a))return!1;if(E(a)||F(a)||A&&a instanceof A)return!0;
+var b="length"in Object(a)&&a.length;return Q(b)&&(0<=b&&(b-1 in a||a instanceof Array)||"function"==typeof a.item)}function n(a,b,d){var c,e;if(a)if(B(a))for(c in a)"prototype"==c||"length"==c||"name"==c||a.hasOwnProperty&&!a.hasOwnProperty(c)||b.call(d,a[c],c,a);else if(E(a)||Aa(a)){var f="object"!==typeof a;c=0;for(e=a.length;c<e;c++)(f||c in a)&&b.call(d,a[c],c,a)}else if(a.forEach&&a.forEach!==n)a.forEach(b,d,a);else if(oc(a))for(c in a)b.call(d,a[c],c,a);else if("function"===typeof a.hasOwnProperty)for(c in a)a.hasOwnProperty(c)&&
+b.call(d,a[c],c,a);else for(c in a)ra.call(a,c)&&b.call(d,a[c],c,a);return a}function pc(a,b,d){for(var c=Object.keys(a).sort(),e=0;e<c.length;e++)b.call(d,a[c[e]],c[e]);return c}function qc(a){return function(b,d){a(d,b)}}function Xd(){return++ob}function Ob(a,b,d){for(var c=a.$$hashKey,e=0,f=b.length;e<f;++e){var g=b[e];if(G(g)||B(g))for(var h=Object.keys(g),k=0,l=h.length;k<l;k++){var m=h[k],r=g[m];d&&G(r)?da(r)?a[m]=new Date(r.valueOf()):La(r)?a[m]=new RegExp(r):r.nodeName?a[m]=r.cloneNode(!0):
+Pb(r)?a[m]=r.clone():(G(a[m])||(a[m]=E(r)?[]:{}),Ob(a[m],[r],!0)):a[m]=r}}c?a.$$hashKey=c:delete a.$$hashKey;return a}function N(a){return Ob(a,sa.call(arguments,1),!1)}function Yd(a){return Ob(a,sa.call(arguments,1),!0)}function Z(a){return parseInt(a,10)}function Qb(a,b){return N(Object.create(a),b)}function z(){}function Ya(a){return a}function na(a){return function(){return a}}function rc(a){return B(a.toString)&&a.toString!==ta}function q(a){return"undefined"===typeof a}function u(a){return"undefined"!==
+typeof a}function G(a){return null!==a&&"object"===typeof a}function oc(a){return null!==a&&"object"===typeof a&&!sc(a)}function F(a){return"string"===typeof a}function Q(a){return"number"===typeof a}function da(a){return"[object Date]"===ta.call(a)}function B(a){return"function"===typeof a}function La(a){return"[object RegExp]"===ta.call(a)}function Xa(a){return a&&a.window===a}function Za(a){return a&&a.$evalAsync&&a.$watch}function $a(a){return"boolean"===typeof a}function tc(a){return a&&Q(a.length)&&
+Zd.test(ta.call(a))}function Pb(a){return!(!a||!(a.nodeName||a.prop&&a.attr&&a.find))}function $d(a){var b={};a=a.split(",");var d;for(d=0;d<a.length;d++)b[a[d]]=!0;return b}function oa(a){return K(a.nodeName||a[0]&&a[0].nodeName)}function ab(a,b){var d=a.indexOf(b);0<=d&&a.splice(d,1);return d}function Ma(a,b){function d(a,b){var d=b.$$hashKey,e;if(E(a)){e=0;for(var f=a.length;e<f;e++)b.push(c(a[e]))}else if(oc(a))for(e in a)b[e]=c(a[e]);else if(a&&"function"===typeof a.hasOwnProperty)for(e in a)a.hasOwnProperty(e)&&
+(b[e]=c(a[e]));else for(e in a)ra.call(a,e)&&(b[e]=c(a[e]));d?b.$$hashKey=d:delete b.$$hashKey;return b}function c(a){if(!G(a))return a;var b=e.indexOf(a);if(-1!==b)return f[b];if(Xa(a)||Za(a))throw Ba("cpws");var b=!1,c;E(a)?(c=[],b=!0):tc(a)?c=new a.constructor(a):da(a)?c=new Date(a.getTime()):La(a)?(c=new RegExp(a.source,a.toString().match(/[^\/]*$/)[0]),c.lastIndex=a.lastIndex):B(a.cloneNode)?c=a.cloneNode(!0):(c=Object.create(sc(a)),b=!0);e.push(a);f.push(c);return b?d(a,c):c}var e=[],f=[];if(b){if(tc(b))throw Ba("cpta");
+if(a===b)throw Ba("cpi");E(b)?b.length=0:n(b,function(a,c){"$$hashKey"!==c&&delete b[c]});e.push(a);f.push(b);return d(a,b)}return c(a)}function ha(a,b){if(E(a)){b=b||[];for(var d=0,c=a.length;d<c;d++)b[d]=a[d]}else if(G(a))for(d in b=b||{},a)if("$"!==d.charAt(0)||"$"!==d.charAt(1))b[d]=a[d];return b||a}function ka(a,b){if(a===b)return!0;if(null===a||null===b)return!1;if(a!==a&&b!==b)return!0;var d=typeof a,c;if(d==typeof b&&"object"==d)if(E(a)){if(!E(b))return!1;if((d=a.length)==b.length){for(c=
+0;c<d;c++)if(!ka(a[c],b[c]))return!1;return!0}}else{if(da(a))return da(b)?ka(a.getTime(),b.getTime()):!1;if(La(a))return La(b)?a.toString()==b.toString():!1;if(Za(a)||Za(b)||Xa(a)||Xa(b)||E(b)||da(b)||La(b))return!1;d=ea();for(c in a)if("$"!==c.charAt(0)&&!B(a[c])){if(!ka(a[c],b[c]))return!1;d[c]=!0}for(c in b)if(!(c in d)&&"$"!==c.charAt(0)&&u(b[c])&&!B(b[c]))return!1;return!0}return!1}function bb(a,b,d){return a.concat(sa.call(b,d))}function uc(a,b){var d=2<arguments.length?sa.call(arguments,2):
+[];return!B(b)||b instanceof RegExp?b:d.length?function(){return arguments.length?b.apply(a,bb(d,arguments,0)):b.apply(a,d)}:function(){return arguments.length?b.apply(a,arguments):b.call(a)}}function ae(a,b){var d=b;"string"===typeof a&&"$"===a.charAt(0)&&"$"===a.charAt(1)?d=w:Xa(b)?d="$WINDOW":b&&W===b?d="$DOCUMENT":Za(b)&&(d="$SCOPE");return d}function cb(a,b){if("undefined"===typeof a)return w;Q(b)||(b=b?2:null);return JSON.stringify(a,ae,b)}function vc(a){return F(a)?JSON.parse(a):a}function wc(a,
+b){var d=Date.parse("Jan 01, 1970 00:00:00 "+a)/6E4;return isNaN(d)?b:d}function Rb(a,b,d){d=d?-1:1;var c=wc(b,a.getTimezoneOffset());b=a;a=d*(c-a.getTimezoneOffset());b=new Date(b.getTime());b.setMinutes(b.getMinutes()+a);return b}function ua(a){a=A(a).clone();try{a.empty()}catch(b){}var d=A("<div>").append(a).html();try{return a[0].nodeType===Na?K(d):d.match(/^(<[^>]+>)/)[1].replace(/^<([\w\-]+)/,function(a,b){return"<"+K(b)})}catch(c){return K(d)}}function xc(a){try{return decodeURIComponent(a)}catch(b){}}
+function yc(a){var b={};n((a||"").split("&"),function(a){var c,e,f;a&&(e=a=a.replace(/\+/g,"%20"),c=a.indexOf("="),-1!==c&&(e=a.substring(0,c),f=a.substring(c+1)),e=xc(e),u(e)&&(f=u(f)?xc(f):!0,ra.call(b,e)?E(b[e])?b[e].push(f):b[e]=[b[e],f]:b[e]=f))});return b}function Sb(a){var b=[];n(a,function(a,c){E(a)?n(a,function(a){b.push(ia(c,!0)+(!0===a?"":"="+ia(a,!0)))}):b.push(ia(c,!0)+(!0===a?"":"="+ia(a,!0)))});return b.length?b.join("&"):""}function pb(a){return ia(a,!0).replace(/%26/gi,"&").replace(/%3D/gi,
+"=").replace(/%2B/gi,"+")}function ia(a,b){return encodeURIComponent(a).replace(/%40/gi,"@").replace(/%3A/gi,":").replace(/%24/g,"$").replace(/%2C/gi,",").replace(/%3B/gi,";").replace(/%20/g,b?"%20":"+")}function be(a,b){var d,c,e=Oa.length;for(c=0;c<e;++c)if(d=Oa[c]+b,F(d=a.getAttribute(d)))return d;return null}function ce(a,b){var d,c,e={};n(Oa,function(b){b+="app";!d&&a.hasAttribute&&a.hasAttribute(b)&&(d=a,c=a.getAttribute(b))});n(Oa,function(b){b+="app";var e;!d&&(e=a.querySelector("["+b.replace(":",
+"\\:")+"]"))&&(d=e,c=e.getAttribute(b))});d&&(e.strictDi=null!==be(d,"strict-di"),b(d,c?[c]:[],e))}function zc(a,b,d){G(d)||(d={});d=N({strictDi:!1},d);var c=function(){a=A(a);if(a.injector()){var c=a[0]===W?"document":ua(a);throw Ba("btstrpd",c.replace(/</,"&lt;").replace(/>/,"&gt;"));}b=b||[];b.unshift(["$provide",function(b){b.value("$rootElement",a)}]);d.debugInfoEnabled&&b.push(["$compileProvider",function(a){a.debugInfoEnabled(!0)}]);b.unshift("ng");c=db(b,d.strictDi);c.invoke(["$rootScope",
+"$rootElement","$compile","$injector",function(a,b,c,d){a.$apply(function(){b.data("$injector",d);c(b)(a)})}]);return c},e=/^NG_ENABLE_DEBUG_INFO!/,f=/^NG_DEFER_BOOTSTRAP!/;S&&e.test(S.name)&&(d.debugInfoEnabled=!0,S.name=S.name.replace(e,""));if(S&&!f.test(S.name))return c();S.name=S.name.replace(f,"");$.resumeBootstrap=function(a){n(a,function(a){b.push(a)});return c()};B($.resumeDeferredBootstrap)&&$.resumeDeferredBootstrap()}function de(){S.name="NG_ENABLE_DEBUG_INFO!"+S.name;S.location.reload()}
+function ee(a){a=$.element(a).injector();if(!a)throw Ba("test");return a.get("$$testability")}function Ac(a,b){b=b||"_";return a.replace(fe,function(a,c){return(c?b:"")+a.toLowerCase()})}function ge(){var a;if(!Bc){var b=qb();(pa=q(b)?S.jQuery:b?S[b]:w)&&pa.fn.on?(A=pa,N(pa.fn,{scope:Pa.scope,isolateScope:Pa.isolateScope,controller:Pa.controller,injector:Pa.injector,inheritedData:Pa.inheritedData}),a=pa.cleanData,pa.cleanData=function(b){var c;if(Tb)Tb=!1;else for(var e=0,f;null!=(f=b[e]);e++)(c=
+pa._data(f,"events"))&&c.$destroy&&pa(f).triggerHandler("$destroy");a(b)}):A=P;$.element=A;Bc=!0}}function rb(a,b,d){if(!a)throw Ba("areq",b||"?",d||"required");return a}function Qa(a,b,d){d&&E(a)&&(a=a[a.length-1]);rb(B(a),b,"not a function, got "+(a&&"object"===typeof a?a.constructor.name||"Object":typeof a));return a}function Ra(a,b){if("hasOwnProperty"===a)throw Ba("badname",b);}function Cc(a,b,d){if(!b)return a;b=b.split(".");for(var c,e=a,f=b.length,g=0;g<f;g++)c=b[g],a&&(a=(e=a)[c]);return!d&&
+B(a)?uc(e,a):a}function sb(a){for(var b=a[0],d=a[a.length-1],c,e=1;b!==d&&(b=b.nextSibling);e++)if(c||a[e]!==b)c||(c=A(sa.call(a,0,e))),c.push(b);return c||a}function ea(){return Object.create(null)}function he(a){function b(a,b,c){return a[b]||(a[b]=c())}var d=M("$injector"),c=M("ng");a=b(a,"angular",Object);a.$$minErr=a.$$minErr||M;return b(a,"module",function(){var a={};return function(f,g,h){if("hasOwnProperty"===f)throw c("badname","module");g&&a.hasOwnProperty(f)&&(a[f]=null);return b(a,f,function(){function a(b,
+d,e,f){f||(f=c);return function(){f[e||"push"]([b,d,arguments]);return y}}function b(a,d){return function(b,e){e&&B(e)&&(e.$$moduleName=f);c.push([a,d,arguments]);return y}}if(!g)throw d("nomod",f);var c=[],e=[],t=[],C=a("$injector","invoke","push",e),y={_invokeQueue:c,_configBlocks:e,_runBlocks:t,requires:g,name:f,provider:b("$provide","provider"),factory:b("$provide","factory"),service:b("$provide","service"),value:a("$provide","value"),constant:a("$provide","constant","unshift"),decorator:b("$provide",
+"decorator"),animation:b("$animateProvider","register"),filter:b("$filterProvider","register"),controller:b("$controllerProvider","register"),directive:b("$compileProvider","directive"),config:C,run:function(a){t.push(a);return this}};h&&C(h);return y})}})}function ie(a){N(a,{bootstrap:zc,copy:Ma,extend:N,merge:Yd,equals:ka,element:A,forEach:n,injector:db,noop:z,bind:uc,toJson:cb,fromJson:vc,identity:Ya,isUndefined:q,isDefined:u,isString:F,isFunction:B,isObject:G,isNumber:Q,isElement:Pb,isArray:E,
+version:je,isDate:da,lowercase:K,uppercase:tb,callbacks:{counter:0},getTestability:ee,$$minErr:M,$$csp:Ca,reloadWithDebugInfo:de});Ub=he(S);Ub("ng",["ngLocale"],["$provide",function(a){a.provider({$$sanitizeUri:ke});a.provider("$compile",Dc).directive({a:le,input:Ec,textarea:Ec,form:me,script:ne,select:oe,style:pe,option:qe,ngBind:re,ngBindHtml:se,ngBindTemplate:te,ngClass:ue,ngClassEven:ve,ngClassOdd:we,ngCloak:xe,ngController:ye,ngForm:ze,ngHide:Ae,ngIf:Be,ngInclude:Ce,ngInit:De,ngNonBindable:Ee,
+ngPluralize:Fe,ngRepeat:Ge,ngShow:He,ngStyle:Ie,ngSwitch:Je,ngSwitchWhen:Ke,ngSwitchDefault:Le,ngOptions:Me,ngTransclude:Ne,ngModel:Oe,ngList:Pe,ngChange:Qe,pattern:Fc,ngPattern:Fc,required:Gc,ngRequired:Gc,minlength:Hc,ngMinlength:Hc,maxlength:Ic,ngMaxlength:Ic,ngValue:Re,ngModelOptions:Se}).directive({ngInclude:Te}).directive(ub).directive(Jc);a.provider({$anchorScroll:Ue,$animate:Ve,$animateCss:We,$$animateJs:Xe,$$animateQueue:Ye,$$AnimateRunner:Ze,$$animateAsyncRun:$e,$browser:af,$cacheFactory:bf,
+$controller:cf,$document:df,$exceptionHandler:ef,$filter:Kc,$$forceReflow:ff,$interpolate:gf,$interval:hf,$http:jf,$httpParamSerializer:kf,$httpParamSerializerJQLike:lf,$httpBackend:mf,$xhrFactory:nf,$location:of,$log:pf,$parse:qf,$rootScope:rf,$q:sf,$$q:tf,$sce:uf,$sceDelegate:vf,$sniffer:wf,$templateCache:xf,$templateRequest:yf,$$testability:zf,$timeout:Af,$window:Bf,$$rAF:Cf,$$jqLite:Df,$$HashMap:Ef,$$cookieReader:Ff})}])}function eb(a){return a.replace(Gf,function(a,d,c,e){return e?c.toUpperCase():
+c}).replace(Hf,"Moz$1")}function Lc(a){a=a.nodeType;return 1===a||!a||9===a}function Mc(a,b){var d,c,e=b.createDocumentFragment(),f=[];if(Vb.test(a)){d=d||e.appendChild(b.createElement("div"));c=(If.exec(a)||["",""])[1].toLowerCase();c=ja[c]||ja._default;d.innerHTML=c[1]+a.replace(Jf,"<$1></$2>")+c[2];for(c=c[0];c--;)d=d.lastChild;f=bb(f,d.childNodes);d=e.firstChild;d.textContent=""}else f.push(b.createTextNode(a));e.textContent="";e.innerHTML="";n(f,function(a){e.appendChild(a)});return e}function P(a){if(a instanceof
+P)return a;var b;F(a)&&(a=T(a),b=!0);if(!(this instanceof P)){if(b&&"<"!=a.charAt(0))throw Wb("nosel");return new P(a)}if(b){b=W;var d;a=(d=Kf.exec(a))?[b.createElement(d[1])]:(d=Mc(a,b))?d.childNodes:[]}Nc(this,a)}function Xb(a){return a.cloneNode(!0)}function vb(a,b){b||wb(a);if(a.querySelectorAll)for(var d=a.querySelectorAll("*"),c=0,e=d.length;c<e;c++)wb(d[c])}function Oc(a,b,d,c){if(u(c))throw Wb("offargs");var e=(c=xb(a))&&c.events,f=c&&c.handle;if(f)if(b){var g=function(b){var c=e[b];u(d)&&
+ab(c||[],d);u(d)&&c&&0<c.length||(a.removeEventListener(b,f,!1),delete e[b])};n(b.split(" "),function(a){g(a);yb[a]&&g(yb[a])})}else for(b in e)"$destroy"!==b&&a.removeEventListener(b,f,!1),delete e[b]}function wb(a,b){var d=a.ng339,c=d&&fb[d];c&&(b?delete c.data[b]:(c.handle&&(c.events.$destroy&&c.handle({},"$destroy"),Oc(a)),delete fb[d],a.ng339=w))}function xb(a,b){var d=a.ng339,d=d&&fb[d];b&&!d&&(a.ng339=d=++Lf,d=fb[d]={events:{},data:{},handle:w});return d}function Yb(a,b,d){if(Lc(a)){var c=
+u(d),e=!c&&b&&!G(b),f=!b;a=(a=xb(a,!e))&&a.data;if(c)a[b]=d;else{if(f)return a;if(e)return a&&a[b];N(a,b)}}}function zb(a,b){return a.getAttribute?-1<(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").indexOf(" "+b+" "):!1}function Ab(a,b){b&&a.setAttribute&&n(b.split(" "),function(b){a.setAttribute("class",T((" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g," ").replace(" "+T(b)+" "," ")))})}function Bb(a,b){if(b&&a.setAttribute){var d=(" "+(a.getAttribute("class")||"")+" ").replace(/[\n\t]/g,
+" ");n(b.split(" "),function(a){a=T(a);-1===d.indexOf(" "+a+" ")&&(d+=a+" ")});a.setAttribute("class",T(d))}}function Nc(a,b){if(b)if(b.nodeType)a[a.length++]=b;else{var d=b.length;if("number"===typeof d&&b.window!==b){if(d)for(var c=0;c<d;c++)a[a.length++]=b[c]}else a[a.length++]=b}}function Pc(a,b){return Cb(a,"$"+(b||"ngController")+"Controller")}function Cb(a,b,d){9==a.nodeType&&(a=a.documentElement);for(b=E(b)?b:[b];a;){for(var c=0,e=b.length;c<e;c++)if(u(d=A.data(a,b[c])))return d;a=a.parentNode||
+11===a.nodeType&&a.host}}function Qc(a){for(vb(a,!0);a.firstChild;)a.removeChild(a.firstChild)}function Zb(a,b){b||vb(a);var d=a.parentNode;d&&d.removeChild(a)}function Mf(a,b){b=b||S;if("complete"===b.document.readyState)b.setTimeout(a);else A(b).on("load",a)}function Rc(a,b){var d=Db[b.toLowerCase()];return d&&Sc[oa(a)]&&d}function Nf(a,b){var d=function(c,d){c.isDefaultPrevented=function(){return c.defaultPrevented};var f=b[d||c.type],g=f?f.length:0;if(g){if(q(c.immediatePropagationStopped)){var h=
+c.stopImmediatePropagation;c.stopImmediatePropagation=function(){c.immediatePropagationStopped=!0;c.stopPropagation&&c.stopPropagation();h&&h.call(c)}}c.isImmediatePropagationStopped=function(){return!0===c.immediatePropagationStopped};var k=f.specialHandlerWrapper||Of;1<g&&(f=ha(f));for(var l=0;l<g;l++)c.isImmediatePropagationStopped()||k(a,c,f[l])}};d.elem=a;return d}function Of(a,b,d){d.call(a,b)}function Pf(a,b,d){var c=b.relatedTarget;c&&(c===a||Qf.call(a,c))||d.call(a,b)}function Df(){this.$get=
+function(){return N(P,{hasClass:function(a,b){a.attr&&(a=a[0]);return zb(a,b)},addClass:function(a,b){a.attr&&(a=a[0]);return Bb(a,b)},removeClass:function(a,b){a.attr&&(a=a[0]);return Ab(a,b)}})}}function Da(a,b){var d=a&&a.$$hashKey;if(d)return"function"===typeof d&&(d=a.$$hashKey()),d;d=typeof a;return d="function"==d||"object"==d&&null!==a?a.$$hashKey=d+":"+(b||Xd)():d+":"+a}function Sa(a,b){if(b){var d=0;this.nextUid=function(){return++d}}n(a,this.put,this)}function Rf(a){return(a=a.toString().replace(Tc,
+"").match(Uc))?"function("+(a[1]||"").replace(/[\s\r\n]+/," ")+")":"fn"}function db(a,b){function d(a){return function(b,c){if(G(b))n(b,qc(a));else return a(b,c)}}function c(a,b){Ra(a,"service");if(B(b)||E(b))b=t.instantiate(b);if(!b.$get)throw Ea("pget",a);return r[a+"Provider"]=b}function e(a,b){return function(){var c=y.invoke(b,this);if(q(c))throw Ea("undef",a);return c}}function f(a,b,d){return c(a,{$get:!1!==d?e(a,b):b})}function g(a){rb(q(a)||E(a),"modulesToLoad","not an array");var b=[],c;
+n(a,function(a){function d(a){var b,c;b=0;for(c=a.length;b<c;b++){var e=a[b],f=t.get(e[0]);f[e[1]].apply(f,e[2])}}if(!m.get(a)){m.put(a,!0);try{F(a)?(c=Ub(a),b=b.concat(g(c.requires)).concat(c._runBlocks),d(c._invokeQueue),d(c._configBlocks)):B(a)?b.push(t.invoke(a)):E(a)?b.push(t.invoke(a)):Qa(a,"module")}catch(e){throw E(a)&&(a=a[a.length-1]),e.message&&e.stack&&-1==e.stack.indexOf(e.message)&&(e=e.message+"\n"+e.stack),Ea("modulerr",a,e.stack||e.message||e);}}});return b}function h(a,c){function d(b,
+e){if(a.hasOwnProperty(b)){if(a[b]===k)throw Ea("cdep",b+" <- "+l.join(" <- "));return a[b]}try{return l.unshift(b),a[b]=k,a[b]=c(b,e)}catch(f){throw a[b]===k&&delete a[b],f;}finally{l.shift()}}function e(a,c,f,g){"string"===typeof f&&(g=f,f=null);var k=[],h=db.$$annotate(a,b,g),l,m,t;m=0;for(l=h.length;m<l;m++){t=h[m];if("string"!==typeof t)throw Ea("itkn",t);k.push(f&&f.hasOwnProperty(t)?f[t]:d(t,g))}E(a)&&(a=a[l]);return a.apply(c,k)}return{invoke:e,instantiate:function(a,b,c){var d=Object.create((E(a)?
+a[a.length-1]:a).prototype||null);a=e(a,d,b,c);return G(a)||B(a)?a:d},get:d,annotate:db.$$annotate,has:function(b){return r.hasOwnProperty(b+"Provider")||a.hasOwnProperty(b)}}}b=!0===b;var k={},l=[],m=new Sa([],!0),r={$provide:{provider:d(c),factory:d(f),service:d(function(a,b){return f(a,["$injector",function(a){return a.instantiate(b)}])}),value:d(function(a,b){return f(a,na(b),!1)}),constant:d(function(a,b){Ra(a,"constant");r[a]=b;C[a]=b}),decorator:function(a,b){var c=t.get(a+"Provider"),d=c.$get;
+c.$get=function(){var a=y.invoke(d,c);return y.invoke(b,null,{$delegate:a})}}}},t=r.$injector=h(r,function(a,b){$.isString(b)&&l.push(b);throw Ea("unpr",l.join(" <- "));}),C={},y=C.$injector=h(C,function(a,b){var c=t.get(a+"Provider",b);return y.invoke(c.$get,c,w,a)});n(g(a),function(a){a&&y.invoke(a)});return y}function Ue(){var a=!0;this.disableAutoScrolling=function(){a=!1};this.$get=["$window","$location","$rootScope",function(b,d,c){function e(a){var b=null;Array.prototype.some.call(a,function(a){if("a"===
+oa(a))return b=a,!0});return b}function f(a){if(a){a.scrollIntoView();var c;c=g.yOffset;B(c)?c=c():Pb(c)?(c=c[0],c="fixed"!==b.getComputedStyle(c).position?0:c.getBoundingClientRect().bottom):Q(c)||(c=0);c&&(a=a.getBoundingClientRect().top,b.scrollBy(0,a-c))}else b.scrollTo(0,0)}function g(a){a=F(a)?a:d.hash();var b;a?(b=h.getElementById(a))?f(b):(b=e(h.getElementsByName(a)))?f(b):"top"===a&&f(null):f(null)}var h=b.document;a&&c.$watch(function(){return d.hash()},function(a,b){a===b&&""===a||Mf(function(){c.$evalAsync(g)})});
+return g}]}function gb(a,b){if(!a&&!b)return"";if(!a)return b;if(!b)return a;E(a)&&(a=a.join(" "));E(b)&&(b=b.join(" "));return a+" "+b}function Sf(a){F(a)&&(a=a.split(" "));var b=ea();n(a,function(a){a.length&&(b[a]=!0)});return b}function Fa(a){return G(a)?a:{}}function Tf(a,b,d,c){function e(a){try{a.apply(null,sa.call(arguments,1))}finally{if(y--,0===y)for(;R.length;)try{R.pop()()}catch(b){d.error(b)}}}function f(){H=null;g();h()}function g(){a:{try{p=m.state;break a}catch(a){}p=void 0}p=q(p)?
+null:p;ka(p,D)&&(p=D);D=p}function h(){if(v!==k.url()||x!==p)v=k.url(),x=p,n(la,function(a){a(k.url(),p)})}var k=this,l=a.location,m=a.history,r=a.setTimeout,t=a.clearTimeout,C={};k.isMock=!1;var y=0,R=[];k.$$completeOutstandingRequest=e;k.$$incOutstandingRequestCount=function(){y++};k.notifyWhenNoOutstandingRequests=function(a){0===y?a():R.push(a)};var p,x,v=l.href,Y=b.find("base"),H=null;g();x=p;k.url=function(b,d,e){q(e)&&(e=null);l!==a.location&&(l=a.location);m!==a.history&&(m=a.history);if(b){var f=
+x===e;if(v===b&&(!c.history||f))return k;var h=v&&Ga(v)===Ga(b);v=b;x=e;if(!c.history||h&&f){if(!h||H)H=b;d?l.replace(b):h?(d=l,e=b.indexOf("#"),e=-1===e?"":b.substr(e),d.hash=e):l.href=b;l.href!==b&&(H=b)}else m[d?"replaceState":"pushState"](e,"",b),g(),x=p;return k}return H||l.href.replace(/%27/g,"'")};k.state=function(){return p};var la=[],I=!1,D=null;k.onUrlChange=function(b){if(!I){if(c.history)A(a).on("popstate",f);A(a).on("hashchange",f);I=!0}la.push(b);return b};k.$$applicationDestroyed=function(){A(a).off("hashchange popstate",
+f)};k.$$checkUrlChange=h;k.baseHref=function(){var a=Y.attr("href");return a?a.replace(/^(https?\:)?\/\/[^\/]*/,""):""};k.defer=function(a,b){var c;y++;c=r(function(){delete C[c];e(a)},b||0);C[c]=!0;return c};k.defer.cancel=function(a){return C[a]?(delete C[a],t(a),e(z),!0):!1}}function af(){this.$get=["$window","$log","$sniffer","$document",function(a,b,d,c){return new Tf(a,c,b,d)}]}function bf(){this.$get=function(){function a(a,c){function e(a){a!=r&&(t?t==a&&(t=a.n):t=a,f(a.n,a.p),f(a,r),r=a,
+r.n=null)}function f(a,b){a!=b&&(a&&(a.p=b),b&&(b.n=a))}if(a in b)throw M("$cacheFactory")("iid",a);var g=0,h=N({},c,{id:a}),k=ea(),l=c&&c.capacity||Number.MAX_VALUE,m=ea(),r=null,t=null;return b[a]={put:function(a,b){if(!q(b)){if(l<Number.MAX_VALUE){var c=m[a]||(m[a]={key:a});e(c)}a in k||g++;k[a]=b;g>l&&this.remove(t.key);return b}},get:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;e(b)}return k[a]},remove:function(a){if(l<Number.MAX_VALUE){var b=m[a];if(!b)return;b==r&&(r=b.p);b==
+t&&(t=b.n);f(b.n,b.p);delete m[a]}a in k&&(delete k[a],g--)},removeAll:function(){k=ea();g=0;m=ea();r=t=null},destroy:function(){m=h=k=null;delete b[a]},info:function(){return N({},h,{size:g})}}}var b={};a.info=function(){var a={};n(b,function(b,e){a[e]=b.info()});return a};a.get=function(a){return b[a]};return a}}function xf(){this.$get=["$cacheFactory",function(a){return a("templates")}]}function Dc(a,b){function d(a,b,c){var d=/^\s*([@&]|=(\*?))(\??)\s*(\w*)\s*$/,e={};n(a,function(a,f){var g=a.match(d);
+if(!g)throw ga("iscp",b,f,a,c?"controller bindings definition":"isolate scope definition");e[f]={mode:g[1][0],collection:"*"===g[2],optional:"?"===g[3],attrName:g[4]||f}});return e}function c(a){var b=a.charAt(0);if(!b||b!==K(b))throw ga("baddir",a);if(a!==a.trim())throw ga("baddir",a);}var e={},f=/^\s*directive\:\s*([\w\-]+)\s+(.*)$/,g=/(([\w\-]+)(?:\:([^;]+))?;?)/,h=$d("ngSrc,ngSrcset,src,srcset"),k=/^(?:(\^\^?)?(\?)?(\^\^?)?)?/,l=/^(on[a-z]+|formaction)$/;this.directive=function t(b,f){Ra(b,"directive");
+F(b)?(c(b),rb(f,"directiveFactory"),e.hasOwnProperty(b)||(e[b]=[],a.factory(b+"Directive",["$injector","$exceptionHandler",function(a,c){var f=[];n(e[b],function(e,g){try{var h=a.invoke(e);B(h)?h={compile:na(h)}:!h.compile&&h.link&&(h.compile=na(h.link));h.priority=h.priority||0;h.index=g;h.name=h.name||b;h.require=h.require||h.controller&&h.name;h.restrict=h.restrict||"EA";var k=h,l=h,m=h.name,t={isolateScope:null,bindToController:null};G(l.scope)&&(!0===l.bindToController?(t.bindToController=d(l.scope,
+m,!0),t.isolateScope={}):t.isolateScope=d(l.scope,m,!1));G(l.bindToController)&&(t.bindToController=d(l.bindToController,m,!0));if(G(t.bindToController)){var y=l.controller,X=l.controllerAs;if(!y)throw ga("noctrl",m);var U;a:if(X&&F(X))U=X;else{if(F(y)){var n=Vc.exec(y);if(n){U=n[3];break a}}U=void 0}if(!U)throw ga("noident",m);}var s=k.$$bindings=t;G(s.isolateScope)&&(h.$$isolateBindings=s.isolateScope);h.$$moduleName=e.$$moduleName;f.push(h)}catch(w){c(w)}});return f}])),e[b].push(f)):n(b,qc(t));
+return this};this.aHrefSanitizationWhitelist=function(a){return u(a)?(b.aHrefSanitizationWhitelist(a),this):b.aHrefSanitizationWhitelist()};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b.imgSrcSanitizationWhitelist(a),this):b.imgSrcSanitizationWhitelist()};var m=!0;this.debugInfoEnabled=function(a){return u(a)?(m=a,this):m};this.$get=["$injector","$interpolate","$exceptionHandler","$templateRequest","$parse","$controller","$rootScope","$sce","$animate","$$sanitizeUri",function(a,b,c,
+d,p,x,v,Y,H,la){function I(a,b){try{a.addClass(b)}catch(c){}}function D(a,b,c,d,e){a instanceof A||(a=A(a));n(a,function(b,c){b.nodeType==Na&&b.nodeValue.match(/\S+/)&&(a[c]=A(b).wrap("<span></span>").parent()[0])});var f=L(a,b,a,c,d,e);D.$$addScopeClass(a);var g=null;return function(b,c,d){rb(b,"scope");e&&e.needsNewScope&&(b=b.$parent.$new());d=d||{};var h=d.parentBoundTranscludeFn,k=d.transcludeControllers;d=d.futureParentElement;h&&h.$$boundTransclude&&(h=h.$$boundTransclude);g||(g=(d=d&&d[0])?
+"foreignobject"!==oa(d)&&d.toString().match(/SVG/)?"svg":"html":"html");d="html"!==g?A(Q(g,A("<div>").append(a).html())):c?Pa.clone.call(a):a;if(k)for(var l in k)d.data("$"+l+"Controller",k[l].instance);D.$$addScopeInfo(d,b);c&&c(d,b);f&&f(b,d,d,h);return d}}function L(a,b,c,d,e,f){function g(a,c,d,e){var f,k,l,m,t,v,I;if(p)for(I=Array(c.length),m=0;m<h.length;m+=3)f=h[m],I[f]=c[f];else I=c;m=0;for(t=h.length;m<t;)k=I[h[m++]],c=h[m++],f=h[m++],c?(c.scope?(l=a.$new(),D.$$addScopeInfo(A(k),l)):l=a,
+v=c.transcludeOnThisElement?O(a,c.transclude,e):!c.templateOnThisElement&&e?e:!e&&b?O(a,b):null,c(f,l,k,d,v)):f&&f(a,k.childNodes,w,e)}for(var h=[],k,l,m,t,p,v=0;v<a.length;v++){k=new aa;l=X(a[v],[],k,0===v?d:w,e);(f=l.length?s(l,a[v],k,b,c,null,[],[],f):null)&&f.scope&&D.$$addScopeClass(k.$$element);k=f&&f.terminal||!(m=a[v].childNodes)||!m.length?null:L(m,f?(f.transcludeOnThisElement||!f.templateOnThisElement)&&f.transclude:b);if(f||k)h.push(v,f,k),t=!0,p=p||f;f=null}return t?g:null}function O(a,
+b,c){return function(d,e,f,g,h){d||(d=a.$new(!1,h),d.$$transcluded=!0);return b(d,e,{parentBoundTranscludeFn:c,transcludeControllers:f,futureParentElement:g})}}function X(a,b,c,d,e){var h=c.$attr,k;switch(a.nodeType){case 1:u(b,va(oa(a)),"E",d,e);for(var l,m,t,p=a.attributes,v=0,I=p&&p.length;v<I;v++){var L=!1,C=!1;l=p[v];k=l.name;m=T(l.value);l=va(k);if(t=ia.test(l))k=k.replace(Yc,"").substr(8).replace(/_(.)/g,function(a,b){return b.toUpperCase()});(l=l.match(ja))&&fa(l[1])&&(L=k,C=k.substr(0,k.length-
+5)+"end",k=k.substr(0,k.length-6));l=va(k.toLowerCase());h[l]=k;if(t||!c.hasOwnProperty(l))c[l]=m,Rc(a,l)&&(c[l]=!0);P(a,b,m,l,t);u(b,l,"A",d,e,L,C)}a=a.className;G(a)&&(a=a.animVal);if(F(a)&&""!==a)for(;k=g.exec(a);)l=va(k[2]),u(b,l,"C",d,e)&&(c[l]=T(k[3])),a=a.substr(k.index+k[0].length);break;case Na:if(11===Ha)for(;a.parentNode&&a.nextSibling&&a.nextSibling.nodeType===Na;)a.nodeValue+=a.nextSibling.nodeValue,a.parentNode.removeChild(a.nextSibling);J(b,a.nodeValue);break;case 8:try{if(k=f.exec(a.nodeValue))l=
+va(k[1]),u(b,l,"M",d,e)&&(c[l]=T(k[2]))}catch(X){}}b.sort(wa);return b}function U(a,b,c){var d=[],e=0;if(b&&a.hasAttribute&&a.hasAttribute(b)){do{if(!a)throw ga("uterdir",b,c);1==a.nodeType&&(a.hasAttribute(b)&&e++,a.hasAttribute(c)&&e--);d.push(a);a=a.nextSibling}while(0<e)}else d.push(a);return A(d)}function Ta(a,b,c){return function(d,e,f,g,h){e=U(e[0],b,c);return a(d,e,f,g,h)}}function s(a,b,d,e,f,g,h,l,m){function t(a,b,c,d){if(a){c&&(a=Ta(a,c,d));a.require=q.require;a.directiveName=z;if(O===
+q||q.$$isolateScope)a=ba(a,{isolateScope:!0});h.push(a)}if(b){c&&(b=Ta(b,c,d));b.require=q.require;b.directiveName=z;if(O===q||q.$$isolateScope)b=ba(b,{isolateScope:!0});l.push(b)}}function p(a,b,c,d){var e;if(F(b)){var f=b.match(k);b=b.substring(f[0].length);var g=f[1]||f[3],f="?"===f[2];"^^"===g?c=c.parent():e=(e=d&&d[b])&&e.instance;e||(d="$"+b+"Controller",e=g?c.inheritedData(d):c.data(d));if(!e&&!f)throw ga("ctreq",b,a);}else if(E(b))for(e=[],g=0,f=b.length;g<f;g++)e[g]=p(a,b[g],c,d);return e||
+null}function v(a,b,c,d,e,f){var g=ea(),h;for(h in d){var k=d[h],l={$scope:k===O||k.$$isolateScope?e:f,$element:a,$attrs:b,$transclude:c},m=k.controller;"@"==m&&(m=b[k.name]);l=x(m,l,!0,k.controllerAs);g[k.name]=l;hb||a.data("$"+k.name+"Controller",l.instance)}return g}function I(a,c,e,f,g){function k(a,b,c){var d;Za(a)||(c=b,b=a,a=w);hb&&(d=X);c||(c=hb?x.parent():x);return g(a,b,d,c,Ta)}var m,t,L,X,y,x,U;b===e?(f=d,x=d.$$element):(x=A(e),f=new aa(x,d));L=c;O?t=c.$new(!0):C&&(L=c.$parent);g&&(y=k,
+y.$$boundTransclude=g);R&&(X=v(x,f,y,R,t,c));O&&(D.$$addScopeInfo(x,t,!0,!(n&&(n===O||n===O.$$originalDirective))),D.$$addScopeClass(x,!0),t.$$isolateBindings=O.$$isolateBindings,(U=Z(c,f,t,t.$$isolateBindings,O))&&t.$on("$destroy",U));for(var Xc in X){U=R[Xc];var Y=X[Xc],H=U.$$bindings.bindToController;Y.identifier&&H&&(m=Z(L,f,Y.instance,H,U));var q=Y();q!==Y.instance&&(Y.instance=q,x.data("$"+U.name+"Controller",q),m&&m(),m=Z(L,f,Y.instance,H,U))}fa=0;for(K=h.length;fa<K;fa++)m=h[fa],ca(m,m.isolateScope?
+t:c,x,f,m.require&&p(m.directiveName,m.require,x,X),y);var Ta=c;O&&(O.template||null===O.templateUrl)&&(Ta=t);a&&a(Ta,e.childNodes,w,g);for(fa=l.length-1;0<=fa;fa--)m=l[fa],ca(m,m.isolateScope?t:c,x,f,m.require&&p(m.directiveName,m.require,x,X),y)}m=m||{};for(var L=-Number.MAX_VALUE,C=m.newScopeDirective,R=m.controllerDirectives,O=m.newIsolateScopeDirective,n=m.templateDirective,Y=m.nonTlbTranscludeDirective,H=!1,la=!1,hb=m.hasElementTranscludeDirective,u=d.$$element=A(b),q,z,J,ib=e,wa,fa=0,K=a.length;fa<
+K;fa++){q=a[fa];var N=q.$$start,P=q.$$end;N&&(u=U(b,N,P));J=w;if(L>q.priority)break;if(J=q.scope)q.templateUrl||(G(J)?(Ua("new/isolated scope",O||C,q,u),O=q):Ua("new/isolated scope",O,q,u)),C=C||q;z=q.name;!q.templateUrl&&q.controller&&(J=q.controller,R=R||ea(),Ua("'"+z+"' controller",R[z],q,u),R[z]=q);if(J=q.transclude)H=!0,q.$$tlb||(Ua("transclusion",Y,q,u),Y=q),"element"==J?(hb=!0,L=q.priority,J=u,u=d.$$element=A(W.createComment(" "+z+": "+d[z]+" ")),b=u[0],V(f,sa.call(J,0),b),ib=D(J,e,L,g&&g.name,
+{nonTlbTranscludeDirective:Y})):(J=A(Xb(b)).contents(),u.empty(),ib=D(J,e,w,w,{needsNewScope:q.$$isolateScope||q.$$newScope}));if(q.template)if(la=!0,Ua("template",n,q,u),n=q,J=B(q.template)?q.template(u,d):q.template,J=ha(J),q.replace){g=q;J=Vb.test(J)?Zc(Q(q.templateNamespace,T(J))):[];b=J[0];if(1!=J.length||1!==b.nodeType)throw ga("tplrt",z,"");V(f,u,b);J={$attr:{}};var Eb=X(b,[],J),$=a.splice(fa+1,a.length-(fa+1));(O||C)&&Wc(Eb,O,C);a=a.concat(Eb).concat($);M(d,J);K=a.length}else u.html(J);if(q.templateUrl)la=
+!0,Ua("template",n,q,u),n=q,q.replace&&(g=q),I=S(a.splice(fa,a.length-fa),u,d,f,H&&ib,h,l,{controllerDirectives:R,newScopeDirective:C!==q&&C,newIsolateScopeDirective:O,templateDirective:n,nonTlbTranscludeDirective:Y}),K=a.length;else if(q.compile)try{wa=q.compile(u,d,ib),B(wa)?t(null,wa,N,P):wa&&t(wa.pre,wa.post,N,P)}catch(da){c(da,ua(u))}q.terminal&&(I.terminal=!0,L=Math.max(L,q.priority))}I.scope=C&&!0===C.scope;I.transcludeOnThisElement=H;I.templateOnThisElement=la;I.transclude=ib;m.hasElementTranscludeDirective=
+hb;return I}function Wc(a,b,c){for(var d=0,e=a.length;d<e;d++)a[d]=Qb(a[d],{$$isolateScope:b,$$newScope:c})}function u(b,d,f,g,h,k,l){if(d===h)return null;h=null;if(e.hasOwnProperty(d)){var m;d=a.get(d+"Directive");for(var p=0,v=d.length;p<v;p++)try{m=d[p],(q(g)||g>m.priority)&&-1!=m.restrict.indexOf(f)&&(k&&(m=Qb(m,{$$start:k,$$end:l})),b.push(m),h=m)}catch(I){c(I)}}return h}function fa(b){if(e.hasOwnProperty(b))for(var c=a.get(b+"Directive"),d=0,f=c.length;d<f;d++)if(b=c[d],b.multiElement)return!0;
+return!1}function M(a,b){var c=b.$attr,d=a.$attr,e=a.$$element;n(a,function(d,e){"$"!=e.charAt(0)&&(b[e]&&b[e]!==d&&(d+=("style"===e?";":" ")+b[e]),a.$set(e,d,!0,c[e]))});n(b,function(b,f){"class"==f?(I(e,b),a["class"]=(a["class"]?a["class"]+" ":"")+b):"style"==f?(e.attr("style",e.attr("style")+";"+b),a.style=(a.style?a.style+";":"")+b):"$"==f.charAt(0)||a.hasOwnProperty(f)||(a[f]=b,d[f]=c[f])})}function S(a,b,c,e,f,g,h,k){var l=[],m,t,p=b[0],v=a.shift(),C=Qb(v,{templateUrl:null,transclude:null,replace:null,
+$$originalDirective:v}),x=B(v.templateUrl)?v.templateUrl(b,c):v.templateUrl,y=v.templateNamespace;b.empty();d(x).then(function(d){var R,D;d=ha(d);if(v.replace){d=Vb.test(d)?Zc(Q(y,T(d))):[];R=d[0];if(1!=d.length||1!==R.nodeType)throw ga("tplrt",v.name,x);d={$attr:{}};V(e,b,R);var U=X(R,[],d);G(v.scope)&&Wc(U,!0);a=U.concat(a);M(c,d)}else R=p,b.html(d);a.unshift(C);m=s(a,R,c,f,b,v,g,h,k);n(e,function(a,c){a==R&&(e[c]=b[0])});for(t=L(b[0].childNodes,f);l.length;){d=l.shift();D=l.shift();var Y=l.shift(),
+H=l.shift(),U=b[0];if(!d.$$destroyed){if(D!==p){var q=D.className;k.hasElementTranscludeDirective&&v.replace||(U=Xb(R));V(Y,A(D),U);I(A(U),q)}D=m.transcludeOnThisElement?O(d,m.transclude,H):H;m(t,d,U,e,D)}}l=null});return function(a,b,c,d,e){a=e;b.$$destroyed||(l?l.push(b,c,d,a):(m.transcludeOnThisElement&&(a=O(b,m.transclude,e)),m(t,b,c,d,a)))}}function wa(a,b){var c=b.priority-a.priority;return 0!==c?c:a.name!==b.name?a.name<b.name?-1:1:a.index-b.index}function Ua(a,b,c,d){function e(a){return a?
+" (module: "+a+")":""}if(b)throw ga("multidir",b.name,e(b.$$moduleName),c.name,e(c.$$moduleName),a,ua(d));}function J(a,c){var d=b(c,!0);d&&a.push({priority:0,compile:function(a){a=a.parent();var b=!!a.length;b&&D.$$addBindingClass(a);return function(a,c){var e=c.parent();b||D.$$addBindingClass(e);D.$$addBindingInfo(e,d.expressions);a.$watch(d,function(a){c[0].nodeValue=a})}}})}function Q(a,b){a=K(a||"html");switch(a){case "svg":case "math":var c=W.createElement("div");c.innerHTML="<"+a+">"+b+"</"+
+a+">";return c.childNodes[0].childNodes;default:return b}}function Eb(a,b){if("srcdoc"==b)return Y.HTML;var c=oa(a);if("xlinkHref"==b||"form"==c&&"action"==b||"img"!=c&&("src"==b||"ngSrc"==b))return Y.RESOURCE_URL}function P(a,c,d,e,f){var g=Eb(a,e);f=h[e]||f;var k=b(d,!0,g,f);if(k){if("multiple"===e&&"select"===oa(a))throw ga("selmulti",ua(a));c.push({priority:100,compile:function(){return{pre:function(a,c,h){c=h.$$observers||(h.$$observers=ea());if(l.test(e))throw ga("nodomevents");var m=h[e];m!==
+d&&(k=m&&b(m,!0,g,f),d=m);k&&(h[e]=k(a),(c[e]||(c[e]=[])).$$inter=!0,(h.$$observers&&h.$$observers[e].$$scope||a).$watch(k,function(a,b){"class"===e&&a!=b?h.$updateClass(a,b):h.$set(e,a)}))}}}})}}function V(a,b,c){var d=b[0],e=b.length,f=d.parentNode,g,h;if(a)for(g=0,h=a.length;g<h;g++)if(a[g]==d){a[g++]=c;h=g+e-1;for(var k=a.length;g<k;g++,h++)h<k?a[g]=a[h]:delete a[g];a.length-=e-1;a.context===d&&(a.context=c);break}f&&f.replaceChild(c,d);a=W.createDocumentFragment();a.appendChild(d);A.hasData(d)&&
+(A.data(c,A.data(d)),pa?(Tb=!0,pa.cleanData([d])):delete A.cache[d[A.expando]]);d=1;for(e=b.length;d<e;d++)f=b[d],A(f).remove(),a.appendChild(f),delete b[d];b[0]=c;b.length=1}function ba(a,b){return N(function(){return a.apply(null,arguments)},a,b)}function ca(a,b,d,e,f,g){try{a(b,d,e,f,g)}catch(h){c(h,ua(d))}}function Z(a,c,d,e,f){var g=[];n(e,function(e,h){var k=e.attrName,l=e.optional,m,t,v,I;switch(e.mode){case "@":l||ra.call(c,k)||(d[h]=c[k]=void 0);c.$observe(k,function(a){F(a)&&(d[h]=a)});
+c.$$observers[k].$$scope=a;F(c[k])&&(d[h]=b(c[k])(a));break;case "=":if(!ra.call(c,k)){if(l)break;c[k]=void 0}if(l&&!c[k])break;t=p(c[k]);I=t.literal?ka:function(a,b){return a===b||a!==a&&b!==b};v=t.assign||function(){m=d[h]=t(a);throw ga("nonassign",c[k],f.name);};m=d[h]=t(a);l=function(b){I(b,d[h])||(I(b,m)?v(a,b=d[h]):d[h]=b);return m=b};l.$stateful=!0;l=e.collection?a.$watchCollection(c[k],l):a.$watch(p(c[k],l),null,t.literal);g.push(l);break;case "&":t=c.hasOwnProperty(k)?p(c[k]):z;if(t===z&&
+l)break;d[h]=function(b){return t(a,b)}}});return g.length&&function(){for(var a=0,b=g.length;a<b;++a)g[a]()}}var aa=function(a,b){if(b){var c=Object.keys(b),d,e,f;d=0;for(e=c.length;d<e;d++)f=c[d],this[f]=b[f]}else this.$attr={};this.$$element=a};aa.prototype={$normalize:va,$addClass:function(a){a&&0<a.length&&H.addClass(this.$$element,a)},$removeClass:function(a){a&&0<a.length&&H.removeClass(this.$$element,a)},$updateClass:function(a,b){var c=$c(a,b);c&&c.length&&H.addClass(this.$$element,c);(c=
+$c(b,a))&&c.length&&H.removeClass(this.$$element,c)},$set:function(a,b,d,e){var f=Rc(this.$$element[0],a),g=ad[a],h=a;f?(this.$$element.prop(a,b),e=f):g&&(this[g]=b,h=g);this[a]=b;e?this.$attr[a]=e:(e=this.$attr[a])||(this.$attr[a]=e=Ac(a,"-"));f=oa(this.$$element);if("a"===f&&"href"===a||"img"===f&&"src"===a)this[a]=b=la(b,"src"===a);else if("img"===f&&"srcset"===a){for(var f="",g=T(b),k=/(\s+\d+x\s*,|\s+\d+w\s*,|\s+,|,\s+)/,k=/\s/.test(g)?k:/(,)/,g=g.split(k),k=Math.floor(g.length/2),l=0;l<k;l++)var m=
+2*l,f=f+la(T(g[m]),!0),f=f+(" "+T(g[m+1]));g=T(g[2*l]).split(/\s/);f+=la(T(g[0]),!0);2===g.length&&(f+=" "+T(g[1]));this[a]=b=f}!1!==d&&(null===b||q(b)?this.$$element.removeAttr(e):this.$$element.attr(e,b));(a=this.$$observers)&&n(a[h],function(a){try{a(b)}catch(d){c(d)}})},$observe:function(a,b){var c=this,d=c.$$observers||(c.$$observers=ea()),e=d[a]||(d[a]=[]);e.push(b);v.$evalAsync(function(){e.$$inter||!c.hasOwnProperty(a)||q(c[a])||b(c[a])});return function(){ab(e,b)}}};var $=b.startSymbol(),
+da=b.endSymbol(),ha="{{"==$||"}}"==da?Ya:function(a){return a.replace(/\{\{/g,$).replace(/}}/g,da)},ia=/^ngAttr[A-Z]/,ja=/^(.+)Start$/;D.$$addBindingInfo=m?function(a,b){var c=a.data("$binding")||[];E(b)?c=c.concat(b):c.push(b);a.data("$binding",c)}:z;D.$$addBindingClass=m?function(a){I(a,"ng-binding")}:z;D.$$addScopeInfo=m?function(a,b,c,d){a.data(c?d?"$isolateScopeNoTemplate":"$isolateScope":"$scope",b)}:z;D.$$addScopeClass=m?function(a,b){I(a,b?"ng-isolate-scope":"ng-scope")}:z;return D}]}function va(a){return eb(a.replace(Yc,
+""))}function $c(a,b){var d="",c=a.split(/\s+/),e=b.split(/\s+/),f=0;a:for(;f<c.length;f++){for(var g=c[f],h=0;h<e.length;h++)if(g==e[h])continue a;d+=(0<d.length?" ":"")+g}return d}function Zc(a){a=A(a);var b=a.length;if(1>=b)return a;for(;b--;)8===a[b].nodeType&&Uf.call(a,b,1);return a}function cf(){var a={},b=!1;this.register=function(b,c){Ra(b,"controller");G(b)?N(a,b):a[b]=c};this.allowGlobals=function(){b=!0};this.$get=["$injector","$window",function(d,c){function e(a,b,c,d){if(!a||!G(a.$scope))throw M("$controller")("noscp",
+d,b);a.$scope[b]=c}return function(f,g,h,k){var l,m,r;h=!0===h;k&&F(k)&&(r=k);if(F(f)){k=f.match(Vc);if(!k)throw Vf("ctrlfmt",f);m=k[1];r=r||k[3];f=a.hasOwnProperty(m)?a[m]:Cc(g.$scope,m,!0)||(b?Cc(c,m,!0):w);Qa(f,m,!0)}if(h)return h=(E(f)?f[f.length-1]:f).prototype,l=Object.create(h||null),r&&e(g,r,l,m||f.name),N(function(){var a=d.invoke(f,l,g,m);a!==l&&(G(a)||B(a))&&(l=a,r&&e(g,r,l,m||f.name));return l},{instance:l,identifier:r});l=d.instantiate(f,g,m);r&&e(g,r,l,m||f.name);return l}}]}function df(){this.$get=
+["$window",function(a){return A(a.document)}]}function ef(){this.$get=["$log",function(a){return function(b,d){a.error.apply(a,arguments)}}]}function $b(a){return G(a)?da(a)?a.toISOString():cb(a):a}function kf(){this.$get=function(){return function(a){if(!a)return"";var b=[];pc(a,function(a,c){null===a||q(a)||(E(a)?n(a,function(a,d){b.push(ia(c)+"="+ia($b(a)))}):b.push(ia(c)+"="+ia($b(a))))});return b.join("&")}}}function lf(){this.$get=function(){return function(a){function b(a,e,f){null===a||q(a)||
+(E(a)?n(a,function(a,c){b(a,e+"["+(G(a)?c:"")+"]")}):G(a)&&!da(a)?pc(a,function(a,c){b(a,e+(f?"":"[")+c+(f?"":"]"))}):d.push(ia(e)+"="+ia($b(a))))}if(!a)return"";var d=[];b(a,"",!0);return d.join("&")}}}function ac(a,b){if(F(a)){var d=a.replace(Wf,"").trim();if(d){var c=b("Content-Type");(c=c&&0===c.indexOf(bd))||(c=(c=d.match(Xf))&&Yf[c[0]].test(d));c&&(a=vc(d))}}return a}function cd(a){var b=ea(),d;F(a)?n(a.split("\n"),function(a){d=a.indexOf(":");var e=K(T(a.substr(0,d)));a=T(a.substr(d+1));e&&
+(b[e]=b[e]?b[e]+", "+a:a)}):G(a)&&n(a,function(a,d){var f=K(d),g=T(a);f&&(b[f]=b[f]?b[f]+", "+g:g)});return b}function dd(a){var b;return function(d){b||(b=cd(a));return d?(d=b[K(d)],void 0===d&&(d=null),d):b}}function ed(a,b,d,c){if(B(c))return c(a,b,d);n(c,function(c){a=c(a,b,d)});return a}function jf(){var a=this.defaults={transformResponse:[ac],transformRequest:[function(a){return G(a)&&"[object File]"!==ta.call(a)&&"[object Blob]"!==ta.call(a)&&"[object FormData]"!==ta.call(a)?cb(a):a}],headers:{common:{Accept:"application/json, text/plain, */*"},
+post:ha(bc),put:ha(bc),patch:ha(bc)},xsrfCookieName:"XSRF-TOKEN",xsrfHeaderName:"X-XSRF-TOKEN",paramSerializer:"$httpParamSerializer"},b=!1;this.useApplyAsync=function(a){return u(a)?(b=!!a,this):b};var d=!0;this.useLegacyPromiseExtensions=function(a){return u(a)?(d=!!a,this):d};var c=this.interceptors=[];this.$get=["$httpBackend","$$cookieReader","$cacheFactory","$rootScope","$q","$injector",function(e,f,g,h,k,l){function m(b){function c(a){var b=N({},a);b.data=ed(a.data,a.headers,a.status,f.transformResponse);
+a=a.status;return 200<=a&&300>a?b:k.reject(b)}function e(a,b){var c,d={};n(a,function(a,e){B(a)?(c=a(b),null!=c&&(d[e]=c)):d[e]=a});return d}if(!$.isObject(b))throw M("$http")("badreq",b);if(!F(b.url))throw M("$http")("badreq",b.url);var f=N({method:"get",transformRequest:a.transformRequest,transformResponse:a.transformResponse,paramSerializer:a.paramSerializer},b);f.headers=function(b){var c=a.headers,d=N({},b.headers),f,g,h,c=N({},c.common,c[K(b.method)]);a:for(f in c){g=K(f);for(h in d)if(K(h)===
+g)continue a;d[f]=c[f]}return e(d,ha(b))}(b);f.method=tb(f.method);f.paramSerializer=F(f.paramSerializer)?l.get(f.paramSerializer):f.paramSerializer;var g=[function(b){var d=b.headers,e=ed(b.data,dd(d),w,b.transformRequest);q(e)&&n(d,function(a,b){"content-type"===K(b)&&delete d[b]});q(b.withCredentials)&&!q(a.withCredentials)&&(b.withCredentials=a.withCredentials);return r(b,e).then(c,c)},w],h=k.when(f);for(n(y,function(a){(a.request||a.requestError)&&g.unshift(a.request,a.requestError);(a.response||
+a.responseError)&&g.push(a.response,a.responseError)});g.length;){b=g.shift();var m=g.shift(),h=h.then(b,m)}d?(h.success=function(a){Qa(a,"fn");h.then(function(b){a(b.data,b.status,b.headers,f)});return h},h.error=function(a){Qa(a,"fn");h.then(null,function(b){a(b.data,b.status,b.headers,f)});return h}):(h.success=fd("success"),h.error=fd("error"));return h}function r(c,d){function g(a,c,d,e){function f(){l(c,a,d,e)}D&&(200<=a&&300>a?D.put(X,[a,c,cd(d),e]):D.remove(X));b?h.$applyAsync(f):(f(),h.$$phase||
+h.$apply())}function l(a,b,d,e){b=-1<=b?b:0;(200<=b&&300>b?n.resolve:n.reject)({data:a,status:b,headers:dd(d),config:c,statusText:e})}function r(a){l(a.data,a.status,ha(a.headers()),a.statusText)}function y(){var a=m.pendingRequests.indexOf(c);-1!==a&&m.pendingRequests.splice(a,1)}var n=k.defer(),I=n.promise,D,L,O=c.headers,X=t(c.url,c.paramSerializer(c.params));m.pendingRequests.push(c);I.then(y,y);!c.cache&&!a.cache||!1===c.cache||"GET"!==c.method&&"JSONP"!==c.method||(D=G(c.cache)?c.cache:G(a.cache)?
+a.cache:C);D&&(L=D.get(X),u(L)?L&&B(L.then)?L.then(r,r):E(L)?l(L[1],L[0],ha(L[2]),L[3]):l(L,200,{},"OK"):D.put(X,I));q(L)&&((L=gd(c.url)?f()[c.xsrfCookieName||a.xsrfCookieName]:w)&&(O[c.xsrfHeaderName||a.xsrfHeaderName]=L),e(c.method,X,d,g,O,c.timeout,c.withCredentials,c.responseType));return I}function t(a,b){0<b.length&&(a+=(-1==a.indexOf("?")?"?":"&")+b);return a}var C=g("$http");a.paramSerializer=F(a.paramSerializer)?l.get(a.paramSerializer):a.paramSerializer;var y=[];n(c,function(a){y.unshift(F(a)?
+l.get(a):l.invoke(a))});m.pendingRequests=[];(function(a){n(arguments,function(a){m[a]=function(b,c){return m(N({},c||{},{method:a,url:b}))}})})("get","delete","head","jsonp");(function(a){n(arguments,function(a){m[a]=function(b,c,d){return m(N({},d||{},{method:a,url:b,data:c}))}})})("post","put","patch");m.defaults=a;return m}]}function nf(){this.$get=function(){return function(){return new S.XMLHttpRequest}}}function mf(){this.$get=["$browser","$window","$document","$xhrFactory",function(a,b,d,
+c){return Zf(a,c,a.defer,b.angular.callbacks,d[0])}]}function Zf(a,b,d,c,e){function f(a,b,d){var f=e.createElement("script"),m=null;f.type="text/javascript";f.src=a;f.async=!0;m=function(a){f.removeEventListener("load",m,!1);f.removeEventListener("error",m,!1);e.body.removeChild(f);f=null;var g=-1,C="unknown";a&&("load"!==a.type||c[b].called||(a={type:"error"}),C=a.type,g="error"===a.type?404:200);d&&d(g,C)};f.addEventListener("load",m,!1);f.addEventListener("error",m,!1);e.body.appendChild(f);return m}
+return function(e,h,k,l,m,r,t,C){function y(){x&&x();v&&v.abort()}function R(b,c,e,f,g){u(H)&&d.cancel(H);x=v=null;b(c,e,f,g);a.$$completeOutstandingRequest(z)}a.$$incOutstandingRequestCount();h=h||a.url();if("jsonp"==K(e)){var p="_"+(c.counter++).toString(36);c[p]=function(a){c[p].data=a;c[p].called=!0};var x=f(h.replace("JSON_CALLBACK","angular.callbacks."+p),p,function(a,b){R(l,a,c[p].data,"",b);c[p]=z})}else{var v=b(e,h);v.open(e,h,!0);n(m,function(a,b){u(a)&&v.setRequestHeader(b,a)});v.onload=
+function(){var a=v.statusText||"",b="response"in v?v.response:v.responseText,c=1223===v.status?204:v.status;0===c&&(c=b?200:"file"==xa(h).protocol?404:0);R(l,c,b,v.getAllResponseHeaders(),a)};e=function(){R(l,-1,null,null,"")};v.onerror=e;v.onabort=e;t&&(v.withCredentials=!0);if(C)try{v.responseType=C}catch(Y){if("json"!==C)throw Y;}v.send(q(k)?null:k)}if(0<r)var H=d(y,r);else r&&B(r.then)&&r.then(y)}}function gf(){var a="{{",b="}}";this.startSymbol=function(b){return b?(a=b,this):a};this.endSymbol=
+function(a){return a?(b=a,this):b};this.$get=["$parse","$exceptionHandler","$sce",function(d,c,e){function f(a){return"\\\\\\"+a}function g(c){return c.replace(m,a).replace(r,b)}function h(f,h,m,r){function p(a){try{var b=a;a=m?e.getTrusted(m,b):e.valueOf(b);var d;if(r&&!u(a))d=a;else if(null==a)d="";else{switch(typeof a){case "string":break;case "number":a=""+a;break;default:a=cb(a)}d=a}return d}catch(g){c(Ia.interr(f,g))}}r=!!r;for(var x,v,n=0,H=[],s=[],I=f.length,D=[],L=[];n<I;)if(-1!=(x=f.indexOf(a,
+n))&&-1!=(v=f.indexOf(b,x+k)))n!==x&&D.push(g(f.substring(n,x))),n=f.substring(x+k,v),H.push(n),s.push(d(n,p)),n=v+l,L.push(D.length),D.push("");else{n!==I&&D.push(g(f.substring(n)));break}m&&1<D.length&&Ia.throwNoconcat(f);if(!h||H.length){var O=function(a){for(var b=0,c=H.length;b<c;b++){if(r&&q(a[b]))return;D[L[b]]=a[b]}return D.join("")};return N(function(a){var b=0,d=H.length,e=Array(d);try{for(;b<d;b++)e[b]=s[b](a);return O(e)}catch(g){c(Ia.interr(f,g))}},{exp:f,expressions:H,$$watchDelegate:function(a,
+b){var c;return a.$watchGroup(s,function(d,e){var f=O(d);B(b)&&b.call(this,f,d!==e?c:f,a);c=f})}})}}var k=a.length,l=b.length,m=new RegExp(a.replace(/./g,f),"g"),r=new RegExp(b.replace(/./g,f),"g");h.startSymbol=function(){return a};h.endSymbol=function(){return b};return h}]}function hf(){this.$get=["$rootScope","$window","$q","$$q",function(a,b,d,c){function e(e,h,k,l){var m=4<arguments.length,r=m?sa.call(arguments,4):[],t=b.setInterval,C=b.clearInterval,y=0,n=u(l)&&!l,p=(n?c:d).defer(),x=p.promise;
+k=u(k)?k:0;x.then(null,null,m?function(){e.apply(null,r)}:e);x.$$intervalId=t(function(){p.notify(y++);0<k&&y>=k&&(p.resolve(y),C(x.$$intervalId),delete f[x.$$intervalId]);n||a.$apply()},h);f[x.$$intervalId]=p;return x}var f={};e.cancel=function(a){return a&&a.$$intervalId in f?(f[a.$$intervalId].reject("canceled"),b.clearInterval(a.$$intervalId),delete f[a.$$intervalId],!0):!1};return e}]}function cc(a){a=a.split("/");for(var b=a.length;b--;)a[b]=pb(a[b]);return a.join("/")}function hd(a,b){var d=
+xa(a);b.$$protocol=d.protocol;b.$$host=d.hostname;b.$$port=Z(d.port)||$f[d.protocol]||null}function id(a,b){var d="/"!==a.charAt(0);d&&(a="/"+a);var c=xa(a);b.$$path=decodeURIComponent(d&&"/"===c.pathname.charAt(0)?c.pathname.substring(1):c.pathname);b.$$search=yc(c.search);b.$$hash=decodeURIComponent(c.hash);b.$$path&&"/"!=b.$$path.charAt(0)&&(b.$$path="/"+b.$$path)}function qa(a,b){if(0===b.indexOf(a))return b.substr(a.length)}function Ga(a){var b=a.indexOf("#");return-1==b?a:a.substr(0,b)}function jb(a){return a.replace(/(#.+)|#$/,
+"$1")}function dc(a,b,d){this.$$html5=!0;d=d||"";hd(a,this);this.$$parse=function(a){var d=qa(b,a);if(!F(d))throw Fb("ipthprfx",a,b);id(d,this);this.$$path||(this.$$path="/");this.$$compose()};this.$$compose=function(){var a=Sb(this.$$search),d=this.$$hash?"#"+pb(this.$$hash):"";this.$$url=cc(this.$$path)+(a?"?"+a:"")+d;this.$$absUrl=b+this.$$url.substr(1)};this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;u(f=qa(a,c))?(g=f,g=u(f=qa(d,f))?b+(qa("/",f)||f):
+a+g):u(f=qa(b,c))?g=b+f:b==c+"/"&&(g=b);g&&this.$$parse(g);return!!g}}function ec(a,b,d){hd(a,this);this.$$parse=function(c){var e=qa(a,c)||qa(b,c),f;q(e)||"#"!==e.charAt(0)?this.$$html5?f=e:(f="",q(e)&&(a=c,this.replace())):(f=qa(d,e),q(f)&&(f=e));id(f,this);c=this.$$path;var e=a,g=/^\/[A-Z]:(\/.*)/;0===f.indexOf(e)&&(f=f.replace(e,""));g.exec(f)||(c=(f=g.exec(c))?f[1]:c);this.$$path=c;this.$$compose()};this.$$compose=function(){var b=Sb(this.$$search),e=this.$$hash?"#"+pb(this.$$hash):"";this.$$url=
+cc(this.$$path)+(b?"?"+b:"")+e;this.$$absUrl=a+(this.$$url?d+this.$$url:"")};this.$$parseLinkUrl=function(b,d){return Ga(a)==Ga(b)?(this.$$parse(b),!0):!1}}function jd(a,b,d){this.$$html5=!0;ec.apply(this,arguments);this.$$parseLinkUrl=function(c,e){if(e&&"#"===e[0])return this.hash(e.slice(1)),!0;var f,g;a==Ga(c)?f=c:(g=qa(b,c))?f=a+d+g:b===c+"/"&&(f=b);f&&this.$$parse(f);return!!f};this.$$compose=function(){var b=Sb(this.$$search),e=this.$$hash?"#"+pb(this.$$hash):"";this.$$url=cc(this.$$path)+
+(b?"?"+b:"")+e;this.$$absUrl=a+d+this.$$url}}function Gb(a){return function(){return this[a]}}function kd(a,b){return function(d){if(q(d))return this[a];this[a]=b(d);this.$$compose();return this}}function of(){var a="",b={enabled:!1,requireBase:!0,rewriteLinks:!0};this.hashPrefix=function(b){return u(b)?(a=b,this):a};this.html5Mode=function(a){return $a(a)?(b.enabled=a,this):G(a)?($a(a.enabled)&&(b.enabled=a.enabled),$a(a.requireBase)&&(b.requireBase=a.requireBase),$a(a.rewriteLinks)&&(b.rewriteLinks=
+a.rewriteLinks),this):b};this.$get=["$rootScope","$browser","$sniffer","$rootElement","$window",function(d,c,e,f,g){function h(a,b,d){var e=l.url(),f=l.$$state;try{c.url(a,b,d),l.$$state=c.state()}catch(g){throw l.url(e),l.$$state=f,g;}}function k(a,b){d.$broadcast("$locationChangeSuccess",l.absUrl(),a,l.$$state,b)}var l,m;m=c.baseHref();var r=c.url(),t;if(b.enabled){if(!m&&b.requireBase)throw Fb("nobase");t=r.substring(0,r.indexOf("/",r.indexOf("//")+2))+(m||"/");m=e.history?dc:jd}else t=Ga(r),m=
+ec;var C=t.substr(0,Ga(t).lastIndexOf("/")+1);l=new m(t,C,"#"+a);l.$$parseLinkUrl(r,r);l.$$state=c.state();var y=/^\s*(javascript|mailto):/i;f.on("click",function(a){if(b.rewriteLinks&&!a.ctrlKey&&!a.metaKey&&!a.shiftKey&&2!=a.which&&2!=a.button){for(var e=A(a.target);"a"!==oa(e[0]);)if(e[0]===f[0]||!(e=e.parent())[0])return;var h=e.prop("href"),k=e.attr("href")||e.attr("xlink:href");G(h)&&"[object SVGAnimatedString]"===h.toString()&&(h=xa(h.animVal).href);y.test(h)||!h||e.attr("target")||a.isDefaultPrevented()||
+!l.$$parseLinkUrl(h,k)||(a.preventDefault(),l.absUrl()!=c.url()&&(d.$apply(),g.angular["ff-684208-preventDefault"]=!0))}});jb(l.absUrl())!=jb(r)&&c.url(l.absUrl(),!0);var n=!0;c.onUrlChange(function(a,b){q(qa(C,a))?g.location.href=a:(d.$evalAsync(function(){var c=l.absUrl(),e=l.$$state,f;a=jb(a);l.$$parse(a);l.$$state=b;f=d.$broadcast("$locationChangeStart",a,c,b,e).defaultPrevented;l.absUrl()===a&&(f?(l.$$parse(c),l.$$state=e,h(c,!1,e)):(n=!1,k(c,e)))}),d.$$phase||d.$digest())});d.$watch(function(){var a=
+jb(c.url()),b=jb(l.absUrl()),f=c.state(),g=l.$$replace,m=a!==b||l.$$html5&&e.history&&f!==l.$$state;if(n||m)n=!1,d.$evalAsync(function(){var b=l.absUrl(),c=d.$broadcast("$locationChangeStart",b,a,l.$$state,f).defaultPrevented;l.absUrl()===b&&(c?(l.$$parse(a),l.$$state=f):(m&&h(b,g,f===l.$$state?null:l.$$state),k(a,f)))});l.$$replace=!1});return l}]}function pf(){var a=!0,b=this;this.debugEnabled=function(b){return u(b)?(a=b,this):a};this.$get=["$window",function(d){function c(a){a instanceof Error&&
+(a.stack?a=a.message&&-1===a.stack.indexOf(a.message)?"Error: "+a.message+"\n"+a.stack:a.stack:a.sourceURL&&(a=a.message+"\n"+a.sourceURL+":"+a.line));return a}function e(a){var b=d.console||{},e=b[a]||b.log||z;a=!1;try{a=!!e.apply}catch(k){}return a?function(){var a=[];n(arguments,function(b){a.push(c(b))});return e.apply(b,a)}:function(a,b){e(a,null==b?"":b)}}return{log:e("log"),info:e("info"),warn:e("warn"),error:e("error"),debug:function(){var c=e("debug");return function(){a&&c.apply(b,arguments)}}()}}]}
+function Va(a,b){if("__defineGetter__"===a||"__defineSetter__"===a||"__lookupGetter__"===a||"__lookupSetter__"===a||"__proto__"===a)throw aa("isecfld",b);return a}function ld(a,b){a+="";if(!F(a))throw aa("iseccst",b);return a}function ya(a,b){if(a){if(a.constructor===a)throw aa("isecfn",b);if(a.window===a)throw aa("isecwindow",b);if(a.children&&(a.nodeName||a.prop&&a.attr&&a.find))throw aa("isecdom",b);if(a===Object)throw aa("isecobj",b);}return a}function md(a,b){if(a){if(a.constructor===a)throw aa("isecfn",
+b);if(a===ag||a===bg||a===cg)throw aa("isecff",b);}}function nd(a,b){if(a&&(a===(0).constructor||a===(!1).constructor||a==="".constructor||a==={}.constructor||a===[].constructor||a===Function.constructor))throw aa("isecaf",b);}function dg(a,b){return"undefined"!==typeof a?a:b}function od(a,b){return"undefined"===typeof a?b:"undefined"===typeof b?a:a+b}function V(a,b){var d,c;switch(a.type){case s.Program:d=!0;n(a.body,function(a){V(a.expression,b);d=d&&a.expression.constant});a.constant=d;break;case s.Literal:a.constant=
+!0;a.toWatch=[];break;case s.UnaryExpression:V(a.argument,b);a.constant=a.argument.constant;a.toWatch=a.argument.toWatch;break;case s.BinaryExpression:V(a.left,b);V(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.left.toWatch.concat(a.right.toWatch);break;case s.LogicalExpression:V(a.left,b);V(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=a.constant?[]:[a];break;case s.ConditionalExpression:V(a.test,b);V(a.alternate,b);V(a.consequent,b);a.constant=a.test.constant&&
+a.alternate.constant&&a.consequent.constant;a.toWatch=a.constant?[]:[a];break;case s.Identifier:a.constant=!1;a.toWatch=[a];break;case s.MemberExpression:V(a.object,b);a.computed&&V(a.property,b);a.constant=a.object.constant&&(!a.computed||a.property.constant);a.toWatch=[a];break;case s.CallExpression:d=a.filter?!b(a.callee.name).$stateful:!1;c=[];n(a.arguments,function(a){V(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=d;a.toWatch=a.filter&&!b(a.callee.name).$stateful?c:
+[a];break;case s.AssignmentExpression:V(a.left,b);V(a.right,b);a.constant=a.left.constant&&a.right.constant;a.toWatch=[a];break;case s.ArrayExpression:d=!0;c=[];n(a.elements,function(a){V(a,b);d=d&&a.constant;a.constant||c.push.apply(c,a.toWatch)});a.constant=d;a.toWatch=c;break;case s.ObjectExpression:d=!0;c=[];n(a.properties,function(a){V(a.value,b);d=d&&a.value.constant;a.value.constant||c.push.apply(c,a.value.toWatch)});a.constant=d;a.toWatch=c;break;case s.ThisExpression:a.constant=!1,a.toWatch=
+[]}}function pd(a){if(1==a.length){a=a[0].expression;var b=a.toWatch;return 1!==b.length?b:b[0]!==a?b:w}}function qd(a){return a.type===s.Identifier||a.type===s.MemberExpression}function rd(a){if(1===a.body.length&&qd(a.body[0].expression))return{type:s.AssignmentExpression,left:a.body[0].expression,right:{type:s.NGValueParameter},operator:"="}}function sd(a){return 0===a.body.length||1===a.body.length&&(a.body[0].expression.type===s.Literal||a.body[0].expression.type===s.ArrayExpression||a.body[0].expression.type===
+s.ObjectExpression)}function td(a,b){this.astBuilder=a;this.$filter=b}function ud(a,b){this.astBuilder=a;this.$filter=b}function Hb(a){return"constructor"==a}function fc(a){return B(a.valueOf)?a.valueOf():eg.call(a)}function qf(){var a=ea(),b=ea();this.$get=["$filter",function(d){function c(a,b){return null==a||null==b?a===b:"object"===typeof a&&(a=fc(a),"object"===typeof a)?!1:a===b||a!==a&&b!==b}function e(a,b,d,e,f){var g=e.inputs,h;if(1===g.length){var k=c,g=g[0];return a.$watch(function(a){var b=
+g(a);c(b,k)||(h=e(a,w,w,[b]),k=b&&fc(b));return h},b,d,f)}for(var l=[],m=[],r=0,n=g.length;r<n;r++)l[r]=c,m[r]=null;return a.$watch(function(a){for(var b=!1,d=0,f=g.length;d<f;d++){var k=g[d](a);if(b||(b=!c(k,l[d])))m[d]=k,l[d]=k&&fc(k)}b&&(h=e(a,w,w,m));return h},b,d,f)}function f(a,b,c,d){var e,f;return e=a.$watch(function(a){return d(a)},function(a,c,d){f=a;B(b)&&b.apply(this,arguments);u(a)&&d.$$postDigest(function(){u(f)&&e()})},c)}function g(a,b,c,d){function e(a){var b=!0;n(a,function(a){u(a)||
+(b=!1)});return b}var f,g;return f=a.$watch(function(a){return d(a)},function(a,c,d){g=a;B(b)&&b.call(this,a,c,d);e(a)&&d.$$postDigest(function(){e(g)&&f()})},c)}function h(a,b,c,d){var e;return e=a.$watch(function(a){return d(a)},function(a,c,d){B(b)&&b.apply(this,arguments);e()},c)}function k(a,b){if(!b)return a;var c=a.$$watchDelegate,d=!1,c=c!==g&&c!==f?function(c,e,f,g){f=d&&g?g[0]:a(c,e,f,g);return b(f,c,e)}:function(c,d,e,f){e=a(c,d,e,f);c=b(e,c,d);return u(e)?c:e};a.$$watchDelegate&&a.$$watchDelegate!==
+e?c.$$watchDelegate=a.$$watchDelegate:b.$stateful||(c.$$watchDelegate=e,d=!a.inputs,c.inputs=a.inputs?a.inputs:[a]);return c}var l=Ca().noUnsafeEval,m={csp:l,expensiveChecks:!1},r={csp:l,expensiveChecks:!0};return function(c,l,y){var n,p,x;switch(typeof c){case "string":x=c=c.trim();var v=y?b:a;n=v[x];n||(":"===c.charAt(0)&&":"===c.charAt(1)&&(p=!0,c=c.substring(2)),y=y?r:m,n=new gc(y),n=(new hc(n,d,y)).parse(c),n.constant?n.$$watchDelegate=h:p?n.$$watchDelegate=n.literal?g:f:n.inputs&&(n.$$watchDelegate=
+e),v[x]=n);return k(n,l);case "function":return k(c,l);default:return k(z,l)}}}]}function sf(){this.$get=["$rootScope","$exceptionHandler",function(a,b){return vd(function(b){a.$evalAsync(b)},b)}]}function tf(){this.$get=["$browser","$exceptionHandler",function(a,b){return vd(function(b){a.defer(b)},b)}]}function vd(a,b){function d(a,b,c){function d(b){return function(c){e||(e=!0,b.call(a,c))}}var e=!1;return[d(b),d(c)]}function c(){this.$$state={status:0}}function e(a,b){return function(c){b.call(a,
+c)}}function f(c){!c.processScheduled&&c.pending&&(c.processScheduled=!0,a(function(){var a,d,e;e=c.pending;c.processScheduled=!1;c.pending=w;for(var f=0,g=e.length;f<g;++f){d=e[f][0];a=e[f][c.status];try{B(a)?d.resolve(a(c.value)):1===c.status?d.resolve(c.value):d.reject(c.value)}catch(h){d.reject(h),b(h)}}}))}function g(){this.promise=new c;this.resolve=e(this,this.resolve);this.reject=e(this,this.reject);this.notify=e(this,this.notify)}var h=M("$q",TypeError);N(c.prototype,{then:function(a,b,c){if(q(a)&&
+q(b)&&q(c))return this;var d=new g;this.$$state.pending=this.$$state.pending||[];this.$$state.pending.push([d,a,b,c]);0<this.$$state.status&&f(this.$$state);return d.promise},"catch":function(a){return this.then(null,a)},"finally":function(a,b){return this.then(function(b){return l(b,!0,a)},function(b){return l(b,!1,a)},b)}});N(g.prototype,{resolve:function(a){this.promise.$$state.status||(a===this.promise?this.$$reject(h("qcycle",a)):this.$$resolve(a))},$$resolve:function(a){var c,e;e=d(this,this.$$resolve,
+this.$$reject);try{if(G(a)||B(a))c=a&&a.then;B(c)?(this.promise.$$state.status=-1,c.call(a,e[0],e[1],this.notify)):(this.promise.$$state.value=a,this.promise.$$state.status=1,f(this.promise.$$state))}catch(g){e[1](g),b(g)}},reject:function(a){this.promise.$$state.status||this.$$reject(a)},$$reject:function(a){this.promise.$$state.value=a;this.promise.$$state.status=2;f(this.promise.$$state)},notify:function(c){var d=this.promise.$$state.pending;0>=this.promise.$$state.status&&d&&d.length&&a(function(){for(var a,
+e,f=0,g=d.length;f<g;f++){e=d[f][0];a=d[f][3];try{e.notify(B(a)?a(c):c)}catch(h){b(h)}}})}});var k=function(a,b){var c=new g;b?c.resolve(a):c.reject(a);return c.promise},l=function(a,b,c){var d=null;try{B(c)&&(d=c())}catch(e){return k(e,!1)}return d&&B(d.then)?d.then(function(){return k(a,b)},function(a){return k(a,!1)}):k(a,b)},m=function(a,b,c,d){var e=new g;e.resolve(a);return e.promise.then(b,c,d)},r=function C(a){if(!B(a))throw h("norslvr",a);if(!(this instanceof C))return new C(a);var b=new g;
+a(function(a){b.resolve(a)},function(a){b.reject(a)});return b.promise};r.defer=function(){return new g};r.reject=function(a){var b=new g;b.reject(a);return b.promise};r.when=m;r.resolve=m;r.all=function(a){var b=new g,c=0,d=E(a)?[]:{};n(a,function(a,e){c++;m(a).then(function(a){d.hasOwnProperty(e)||(d[e]=a,--c||b.resolve(d))},function(a){d.hasOwnProperty(e)||b.reject(a)})});0===c&&b.resolve(d);return b.promise};return r}function Cf(){this.$get=["$window","$timeout",function(a,b){var d=a.requestAnimationFrame||
+a.webkitRequestAnimationFrame,c=a.cancelAnimationFrame||a.webkitCancelAnimationFrame||a.webkitCancelRequestAnimationFrame,e=!!d,f=e?function(a){var b=d(a);return function(){c(b)}}:function(a){var c=b(a,16.66,!1);return function(){b.cancel(c)}};f.supported=e;return f}]}function rf(){function a(a){function b(){this.$$watchers=this.$$nextSibling=this.$$childHead=this.$$childTail=null;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$id=++ob;this.$$ChildScope=null}b.prototype=a;
+return b}var b=10,d=M("$rootScope"),c=null,e=null;this.digestTtl=function(a){arguments.length&&(b=a);return b};this.$get=["$injector","$exceptionHandler","$parse","$browser",function(f,g,h,k){function l(a){a.currentScope.$$destroyed=!0}function m(a){9===Ha&&(a.$$childHead&&m(a.$$childHead),a.$$nextSibling&&m(a.$$nextSibling));a.$parent=a.$$nextSibling=a.$$prevSibling=a.$$childHead=a.$$childTail=a.$root=a.$$watchers=null}function r(){this.$id=++ob;this.$$phase=this.$parent=this.$$watchers=this.$$nextSibling=
+this.$$prevSibling=this.$$childHead=this.$$childTail=null;this.$root=this;this.$$destroyed=!1;this.$$listeners={};this.$$listenerCount={};this.$$watchersCount=0;this.$$isolateBindings=null}function t(a){if(v.$$phase)throw d("inprog",v.$$phase);v.$$phase=a}function C(a,b){do a.$$watchersCount+=b;while(a=a.$parent)}function y(a,b,c){do a.$$listenerCount[c]-=b,0===a.$$listenerCount[c]&&delete a.$$listenerCount[c];while(a=a.$parent)}function s(){}function p(){for(;w.length;)try{w.shift()()}catch(a){g(a)}e=
+null}function x(){null===e&&(e=k.defer(function(){v.$apply(p)}))}r.prototype={constructor:r,$new:function(b,c){var d;c=c||this;b?(d=new r,d.$root=this.$root):(this.$$ChildScope||(this.$$ChildScope=a(this)),d=new this.$$ChildScope);d.$parent=c;d.$$prevSibling=c.$$childTail;c.$$childHead?(c.$$childTail.$$nextSibling=d,c.$$childTail=d):c.$$childHead=c.$$childTail=d;(b||c!=this)&&d.$on("$destroy",l);return d},$watch:function(a,b,d,e){var f=h(a);if(f.$$watchDelegate)return f.$$watchDelegate(this,b,d,f,
+a);var g=this,k=g.$$watchers,l={fn:b,last:s,get:f,exp:e||a,eq:!!d};c=null;B(b)||(l.fn=z);k||(k=g.$$watchers=[]);k.unshift(l);C(this,1);return function(){0<=ab(k,l)&&C(g,-1);c=null}},$watchGroup:function(a,b){function c(){h=!1;k?(k=!1,b(e,e,g)):b(e,d,g)}var d=Array(a.length),e=Array(a.length),f=[],g=this,h=!1,k=!0;if(!a.length){var l=!0;g.$evalAsync(function(){l&&b(e,e,g)});return function(){l=!1}}if(1===a.length)return this.$watch(a[0],function(a,c,f){e[0]=a;d[0]=c;b(e,a===c?e:d,f)});n(a,function(a,
+b){var k=g.$watch(a,function(a,f){e[b]=a;d[b]=f;h||(h=!0,g.$evalAsync(c))});f.push(k)});return function(){for(;f.length;)f.shift()()}},$watchCollection:function(a,b){function c(a){e=a;var b,d,g,h;if(!q(e)){if(G(e))if(Aa(e))for(f!==r&&(f=r,p=f.length=0,l++),a=e.length,p!==a&&(l++,f.length=p=a),b=0;b<a;b++)h=f[b],g=e[b],d=h!==h&&g!==g,d||h===g||(l++,f[b]=g);else{f!==t&&(f=t={},p=0,l++);a=0;for(b in e)ra.call(e,b)&&(a++,g=e[b],h=f[b],b in f?(d=h!==h&&g!==g,d||h===g||(l++,f[b]=g)):(p++,f[b]=g,l++));if(p>
+a)for(b in l++,f)ra.call(e,b)||(p--,delete f[b])}else f!==e&&(f=e,l++);return l}}c.$stateful=!0;var d=this,e,f,g,k=1<b.length,l=0,m=h(a,c),r=[],t={},n=!0,p=0;return this.$watch(m,function(){n?(n=!1,b(e,e,d)):b(e,g,d);if(k)if(G(e))if(Aa(e)){g=Array(e.length);for(var a=0;a<e.length;a++)g[a]=e[a]}else for(a in g={},e)ra.call(e,a)&&(g[a]=e[a]);else g=e})},$digest:function(){var a,f,h,l,m,r,n=b,C,x=[],q,y;t("$digest");k.$$checkUrlChange();this===v&&null!==e&&(k.defer.cancel(e),p());c=null;do{r=!1;for(C=
+this;u.length;){try{y=u.shift(),y.scope.$eval(y.expression,y.locals)}catch(w){g(w)}c=null}a:do{if(l=C.$$watchers)for(m=l.length;m--;)try{if(a=l[m])if((f=a.get(C))!==(h=a.last)&&!(a.eq?ka(f,h):"number"===typeof f&&"number"===typeof h&&isNaN(f)&&isNaN(h)))r=!0,c=a,a.last=a.eq?Ma(f,null):f,a.fn(f,h===s?f:h,C),5>n&&(q=4-n,x[q]||(x[q]=[]),x[q].push({msg:B(a.exp)?"fn: "+(a.exp.name||a.exp.toString()):a.exp,newVal:f,oldVal:h}));else if(a===c){r=!1;break a}}catch(la){g(la)}if(!(l=C.$$watchersCount&&C.$$childHead||
+C!==this&&C.$$nextSibling))for(;C!==this&&!(l=C.$$nextSibling);)C=C.$parent}while(C=l);if((r||u.length)&&!n--)throw v.$$phase=null,d("infdig",b,x);}while(r||u.length);for(v.$$phase=null;H.length;)try{H.shift()()}catch(A){g(A)}},$destroy:function(){if(!this.$$destroyed){var a=this.$parent;this.$broadcast("$destroy");this.$$destroyed=!0;this===v&&k.$$applicationDestroyed();C(this,-this.$$watchersCount);for(var b in this.$$listenerCount)y(this,this.$$listenerCount[b],b);a&&a.$$childHead==this&&(a.$$childHead=
+this.$$nextSibling);a&&a.$$childTail==this&&(a.$$childTail=this.$$prevSibling);this.$$prevSibling&&(this.$$prevSibling.$$nextSibling=this.$$nextSibling);this.$$nextSibling&&(this.$$nextSibling.$$prevSibling=this.$$prevSibling);this.$destroy=this.$digest=this.$apply=this.$evalAsync=this.$applyAsync=z;this.$on=this.$watch=this.$watchGroup=function(){return z};this.$$listeners={};this.$$nextSibling=null;m(this)}},$eval:function(a,b){return h(a)(this,b)},$evalAsync:function(a,b){v.$$phase||u.length||
+k.defer(function(){u.length&&v.$digest()});u.push({scope:this,expression:a,locals:b})},$$postDigest:function(a){H.push(a)},$apply:function(a){try{t("$apply");try{return this.$eval(a)}finally{v.$$phase=null}}catch(b){g(b)}finally{try{v.$digest()}catch(c){throw g(c),c;}}},$applyAsync:function(a){function b(){c.$eval(a)}var c=this;a&&w.push(b);x()},$on:function(a,b){var c=this.$$listeners[a];c||(this.$$listeners[a]=c=[]);c.push(b);var d=this;do d.$$listenerCount[a]||(d.$$listenerCount[a]=0),d.$$listenerCount[a]++;
+while(d=d.$parent);var e=this;return function(){var d=c.indexOf(b);-1!==d&&(c[d]=null,y(e,1,a))}},$emit:function(a,b){var c=[],d,e=this,f=!1,h={name:a,targetScope:e,stopPropagation:function(){f=!0},preventDefault:function(){h.defaultPrevented=!0},defaultPrevented:!1},k=bb([h],arguments,1),l,m;do{d=e.$$listeners[a]||c;h.currentScope=e;l=0;for(m=d.length;l<m;l++)if(d[l])try{d[l].apply(null,k)}catch(r){g(r)}else d.splice(l,1),l--,m--;if(f)return h.currentScope=null,h;e=e.$parent}while(e);h.currentScope=
+null;return h},$broadcast:function(a,b){var c=this,d=this,e={name:a,targetScope:this,preventDefault:function(){e.defaultPrevented=!0},defaultPrevented:!1};if(!this.$$listenerCount[a])return e;for(var f=bb([e],arguments,1),h,k;c=d;){e.currentScope=c;d=c.$$listeners[a]||[];h=0;for(k=d.length;h<k;h++)if(d[h])try{d[h].apply(null,f)}catch(l){g(l)}else d.splice(h,1),h--,k--;if(!(d=c.$$listenerCount[a]&&c.$$childHead||c!==this&&c.$$nextSibling))for(;c!==this&&!(d=c.$$nextSibling);)c=c.$parent}e.currentScope=
+null;return e}};var v=new r,u=v.$$asyncQueue=[],H=v.$$postDigestQueue=[],w=v.$$applyAsyncQueue=[];return v}]}function ke(){var a=/^\s*(https?|ftp|mailto|tel|file):/,b=/^\s*((https?|ftp|file|blob):|data:image\/)/;this.aHrefSanitizationWhitelist=function(b){return u(b)?(a=b,this):a};this.imgSrcSanitizationWhitelist=function(a){return u(a)?(b=a,this):b};this.$get=function(){return function(d,c){var e=c?b:a,f;f=xa(d).href;return""===f||f.match(e)?d:"unsafe:"+f}}}function fg(a){if("self"===a)return a;
+if(F(a)){if(-1<a.indexOf("***"))throw za("iwcard",a);a=wd(a).replace("\\*\\*",".*").replace("\\*","[^:/.?&;]*");return new RegExp("^"+a+"$")}if(La(a))return new RegExp("^"+a.source+"$");throw za("imatcher");}function xd(a){var b=[];u(a)&&n(a,function(a){b.push(fg(a))});return b}function vf(){this.SCE_CONTEXTS=ma;var a=["self"],b=[];this.resourceUrlWhitelist=function(b){arguments.length&&(a=xd(b));return a};this.resourceUrlBlacklist=function(a){arguments.length&&(b=xd(a));return b};this.$get=["$injector",
+function(d){function c(a,b){return"self"===a?gd(b):!!a.exec(b.href)}function e(a){var b=function(a){this.$$unwrapTrustedValue=function(){return a}};a&&(b.prototype=new a);b.prototype.valueOf=function(){return this.$$unwrapTrustedValue()};b.prototype.toString=function(){return this.$$unwrapTrustedValue().toString()};return b}var f=function(a){throw za("unsafe");};d.has("$sanitize")&&(f=d.get("$sanitize"));var g=e(),h={};h[ma.HTML]=e(g);h[ma.CSS]=e(g);h[ma.URL]=e(g);h[ma.JS]=e(g);h[ma.RESOURCE_URL]=
+e(h[ma.URL]);return{trustAs:function(a,b){var c=h.hasOwnProperty(a)?h[a]:null;if(!c)throw za("icontext",a,b);if(null===b||q(b)||""===b)return b;if("string"!==typeof b)throw za("itype",a);return new c(b)},getTrusted:function(d,e){if(null===e||q(e)||""===e)return e;var g=h.hasOwnProperty(d)?h[d]:null;if(g&&e instanceof g)return e.$$unwrapTrustedValue();if(d===ma.RESOURCE_URL){var g=xa(e.toString()),r,t,n=!1;r=0;for(t=a.length;r<t;r++)if(c(a[r],g)){n=!0;break}if(n)for(r=0,t=b.length;r<t;r++)if(c(b[r],
+g)){n=!1;break}if(n)return e;throw za("insecurl",e.toString());}if(d===ma.HTML)return f(e);throw za("unsafe");},valueOf:function(a){return a instanceof g?a.$$unwrapTrustedValue():a}}}]}function uf(){var a=!0;this.enabled=function(b){arguments.length&&(a=!!b);return a};this.$get=["$parse","$sceDelegate",function(b,d){if(a&&8>Ha)throw za("iequirks");var c=ha(ma);c.isEnabled=function(){return a};c.trustAs=d.trustAs;c.getTrusted=d.getTrusted;c.valueOf=d.valueOf;a||(c.trustAs=c.getTrusted=function(a,b){return b},
+c.valueOf=Ya);c.parseAs=function(a,d){var e=b(d);return e.literal&&e.constant?e:b(d,function(b){return c.getTrusted(a,b)})};var e=c.parseAs,f=c.getTrusted,g=c.trustAs;n(ma,function(a,b){var d=K(b);c[eb("parse_as_"+d)]=function(b){return e(a,b)};c[eb("get_trusted_"+d)]=function(b){return f(a,b)};c[eb("trust_as_"+d)]=function(b){return g(a,b)}});return c}]}function wf(){this.$get=["$window","$document",function(a,b){var d={},c=Z((/android (\d+)/.exec(K((a.navigator||{}).userAgent))||[])[1]),e=/Boxee/i.test((a.navigator||
+{}).userAgent),f=b[0]||{},g,h=/^(Moz|webkit|ms)(?=[A-Z])/,k=f.body&&f.body.style,l=!1,m=!1;if(k){for(var r in k)if(l=h.exec(r)){g=l[0];g=g.substr(0,1).toUpperCase()+g.substr(1);break}g||(g="WebkitOpacity"in k&&"webkit");l=!!("transition"in k||g+"Transition"in k);m=!!("animation"in k||g+"Animation"in k);!c||l&&m||(l=F(k.webkitTransition),m=F(k.webkitAnimation))}return{history:!(!a.history||!a.history.pushState||4>c||e),hasEvent:function(a){if("input"===a&&11>=Ha)return!1;if(q(d[a])){var b=f.createElement("div");
+d[a]="on"+a in b}return d[a]},csp:Ca(),vendorPrefix:g,transitions:l,animations:m,android:c}}]}function yf(){this.$get=["$templateCache","$http","$q","$sce",function(a,b,d,c){function e(f,g){e.totalPendingRequests++;F(f)&&a.get(f)||(f=c.getTrustedResourceUrl(f));var h=b.defaults&&b.defaults.transformResponse;E(h)?h=h.filter(function(a){return a!==ac}):h===ac&&(h=null);return b.get(f,{cache:a,transformResponse:h})["finally"](function(){e.totalPendingRequests--}).then(function(b){a.put(f,b.data);return b.data},
+function(a){if(!g)throw ga("tpload",f,a.status,a.statusText);return d.reject(a)})}e.totalPendingRequests=0;return e}]}function zf(){this.$get=["$rootScope","$browser","$location",function(a,b,d){return{findBindings:function(a,b,d){a=a.getElementsByClassName("ng-binding");var g=[];n(a,function(a){var c=$.element(a).data("$binding");c&&n(c,function(c){d?(new RegExp("(^|\\s)"+wd(b)+"(\\s|\\||$)")).test(c)&&g.push(a):-1!=c.indexOf(b)&&g.push(a)})});return g},findModels:function(a,b,d){for(var g=["ng-",
+"data-ng-","ng\\:"],h=0;h<g.length;++h){var k=a.querySelectorAll("["+g[h]+"model"+(d?"=":"*=")+'"'+b+'"]');if(k.length)return k}},getLocation:function(){return d.url()},setLocation:function(b){b!==d.url()&&(d.url(b),a.$digest())},whenStable:function(a){b.notifyWhenNoOutstandingRequests(a)}}}]}function Af(){this.$get=["$rootScope","$browser","$q","$$q","$exceptionHandler",function(a,b,d,c,e){function f(f,k,l){B(f)||(l=k,k=f,f=z);var m=sa.call(arguments,3),r=u(l)&&!l,t=(r?c:d).defer(),n=t.promise,q;
+q=b.defer(function(){try{t.resolve(f.apply(null,m))}catch(b){t.reject(b),e(b)}finally{delete g[n.$$timeoutId]}r||a.$apply()},k);n.$$timeoutId=q;g[q]=t;return n}var g={};f.cancel=function(a){return a&&a.$$timeoutId in g?(g[a.$$timeoutId].reject("canceled"),delete g[a.$$timeoutId],b.defer.cancel(a.$$timeoutId)):!1};return f}]}function xa(a){Ha&&(ba.setAttribute("href",a),a=ba.href);ba.setAttribute("href",a);return{href:ba.href,protocol:ba.protocol?ba.protocol.replace(/:$/,""):"",host:ba.host,search:ba.search?
+ba.search.replace(/^\?/,""):"",hash:ba.hash?ba.hash.replace(/^#/,""):"",hostname:ba.hostname,port:ba.port,pathname:"/"===ba.pathname.charAt(0)?ba.pathname:"/"+ba.pathname}}function gd(a){a=F(a)?xa(a):a;return a.protocol===yd.protocol&&a.host===yd.host}function Bf(){this.$get=na(S)}function zd(a){function b(a){try{return decodeURIComponent(a)}catch(b){return a}}var d=a[0]||{},c={},e="";return function(){var a,g,h,k,l;a=d.cookie||"";if(a!==e)for(e=a,a=e.split("; "),c={},h=0;h<a.length;h++)g=a[h],k=
+g.indexOf("="),0<k&&(l=b(g.substring(0,k)),q(c[l])&&(c[l]=b(g.substring(k+1))));return c}}function Ff(){this.$get=zd}function Kc(a){function b(d,c){if(G(d)){var e={};n(d,function(a,c){e[c]=b(c,a)});return e}return a.factory(d+"Filter",c)}this.register=b;this.$get=["$injector",function(a){return function(b){return a.get(b+"Filter")}}];b("currency",Ad);b("date",Bd);b("filter",gg);b("json",hg);b("limitTo",ig);b("lowercase",jg);b("number",Cd);b("orderBy",Dd);b("uppercase",kg)}function gg(){return function(a,
+b,d){if(!Aa(a)){if(null==a)return a;throw M("filter")("notarray",a);}var c;switch(ic(b)){case "function":break;case "boolean":case "null":case "number":case "string":c=!0;case "object":b=lg(b,d,c);break;default:return a}return Array.prototype.filter.call(a,b)}}function lg(a,b,d){var c=G(a)&&"$"in a;!0===b?b=ka:B(b)||(b=function(a,b){if(q(a))return!1;if(null===a||null===b)return a===b;if(G(b)||G(a)&&!rc(a))return!1;a=K(""+a);b=K(""+b);return-1!==a.indexOf(b)});return function(e){return c&&!G(e)?Ja(e,
+a.$,b,!1):Ja(e,a,b,d)}}function Ja(a,b,d,c,e){var f=ic(a),g=ic(b);if("string"===g&&"!"===b.charAt(0))return!Ja(a,b.substring(1),d,c);if(E(a))return a.some(function(a){return Ja(a,b,d,c)});switch(f){case "object":var h;if(c){for(h in a)if("$"!==h.charAt(0)&&Ja(a[h],b,d,!0))return!0;return e?!1:Ja(a,b,d,!1)}if("object"===g){for(h in b)if(e=b[h],!B(e)&&!q(e)&&(f="$"===h,!Ja(f?a:a[h],e,d,f,f)))return!1;return!0}return d(a,b);case "function":return!1;default:return d(a,b)}}function ic(a){return null===
+a?"null":typeof a}function Ad(a){var b=a.NUMBER_FORMATS;return function(a,c,e){q(c)&&(c=b.CURRENCY_SYM);q(e)&&(e=b.PATTERNS[1].maxFrac);return null==a?a:Ed(a,b.PATTERNS[1],b.GROUP_SEP,b.DECIMAL_SEP,e).replace(/\u00A4/g,c)}}function Cd(a){var b=a.NUMBER_FORMATS;return function(a,c){return null==a?a:Ed(a,b.PATTERNS[0],b.GROUP_SEP,b.DECIMAL_SEP,c)}}function mg(a){var b=0,d,c,e,f,g;-1<(c=a.indexOf(Fd))&&(a=a.replace(Fd,""));0<(e=a.search(/e/i))?(0>c&&(c=e),c+=+a.slice(e+1),a=a.substring(0,e)):0>c&&(c=
+a.length);for(e=0;a.charAt(e)==jc;e++);if(e==(g=a.length))d=[0],c=1;else{for(g--;a.charAt(g)==jc;)g--;c-=e;d=[];for(f=0;e<=g;e++,f++)d[f]=+a.charAt(e)}c>Gd&&(d=d.splice(0,Gd-1),b=c-1,c=1);return{d:d,e:b,i:c}}function ng(a,b,d,c){var e=a.d,f=e.length-a.i;b=q(b)?Math.min(Math.max(d,f),c):+b;d=b+a.i;c=e[d];if(0<d)e.splice(d);else{a.i=1;e.length=d=b+1;for(var g=0;g<d;g++)e[g]=0}for(5<=c&&e[d-1]++;f<b;f++)e.push(0);if(b=e.reduceRight(function(a,b,c,d){b+=a;d[c]=b%10;return Math.floor(b/10)},0))e.unshift(b),
+a.i++}function Ed(a,b,d,c,e){if(!F(a)&&!Q(a)||isNaN(a))return"";var f=!isFinite(a),g=!1,h=Math.abs(a)+"",k="";if(f)k="\u221e";else{g=mg(h);ng(g,e,b.minFrac,b.maxFrac);k=g.d;h=g.i;e=g.e;f=[];for(g=k.reduce(function(a,b){return a&&!b},!0);0>h;)k.unshift(0),h++;0<h?f=k.splice(h):(f=k,k=[0]);h=[];for(k.length>b.lgSize&&h.unshift(k.splice(-b.lgSize).join(""));k.length>b.gSize;)h.unshift(k.splice(-b.gSize).join(""));k.length&&h.unshift(k.join(""));k=h.join(d);f.length&&(k+=c+f.join(""));e&&(k+="e+"+e)}return 0>
+a&&!g?b.negPre+k+b.negSuf:b.posPre+k+b.posSuf}function Ib(a,b,d){var c="";0>a&&(c="-",a=-a);for(a=""+a;a.length<b;)a=jc+a;d&&(a=a.substr(a.length-b));return c+a}function ca(a,b,d,c){d=d||0;return function(e){e=e["get"+a]();if(0<d||e>-d)e+=d;0===e&&-12==d&&(e=12);return Ib(e,b,c)}}function Jb(a,b){return function(d,c){var e=d["get"+a](),f=tb(b?"SHORT"+a:a);return c[f][e]}}function Hd(a){var b=(new Date(a,0,1)).getDay();return new Date(a,0,(4>=b?5:12)-b)}function Id(a){return function(b){var d=Hd(b.getFullYear());
+b=+new Date(b.getFullYear(),b.getMonth(),b.getDate()+(4-b.getDay()))-+d;b=1+Math.round(b/6048E5);return Ib(b,a)}}function kc(a,b){return 0>=a.getFullYear()?b.ERAS[0]:b.ERAS[1]}function Bd(a){function b(a){var b;if(b=a.match(d)){a=new Date(0);var f=0,g=0,h=b[8]?a.setUTCFullYear:a.setFullYear,k=b[8]?a.setUTCHours:a.setHours;b[9]&&(f=Z(b[9]+b[10]),g=Z(b[9]+b[11]));h.call(a,Z(b[1]),Z(b[2])-1,Z(b[3]));f=Z(b[4]||0)-f;g=Z(b[5]||0)-g;h=Z(b[6]||0);b=Math.round(1E3*parseFloat("0."+(b[7]||0)));k.call(a,f,g,
+h,b)}return a}var d=/^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;return function(c,d,f){var g="",h=[],k,l;d=d||"mediumDate";d=a.DATETIME_FORMATS[d]||d;F(c)&&(c=og.test(c)?Z(c):b(c));Q(c)&&(c=new Date(c));if(!da(c)||!isFinite(c.getTime()))return c;for(;d;)(l=pg.exec(d))?(h=bb(h,l,1),d=h.pop()):(h.push(d),d=null);var m=c.getTimezoneOffset();f&&(m=wc(f,c.getTimezoneOffset()),c=Rb(c,f,!0));n(h,function(b){k=qg[b];g+=k?k(c,a.DATETIME_FORMATS,m):
+b.replace(/(^'|'$)/g,"").replace(/''/g,"'")});return g}}function hg(){return function(a,b){q(b)&&(b=2);return cb(a,b)}}function ig(){return function(a,b,d){b=Infinity===Math.abs(Number(b))?Number(b):Z(b);if(isNaN(b))return a;Q(a)&&(a=a.toString());if(!E(a)&&!F(a))return a;d=!d||isNaN(d)?0:Z(d);d=0>d?Math.max(0,a.length+d):d;return 0<=b?a.slice(d,d+b):0===d?a.slice(b,a.length):a.slice(Math.max(0,d+b),d)}}function Dd(a){function b(b,d){d=d?-1:1;return b.map(function(b){var c=1,h=Ya;if(B(b))h=b;else if(F(b)){if("+"==
+b.charAt(0)||"-"==b.charAt(0))c="-"==b.charAt(0)?-1:1,b=b.substring(1);if(""!==b&&(h=a(b),h.constant))var k=h(),h=function(a){return a[k]}}return{get:h,descending:c*d}})}function d(a){switch(typeof a){case "number":case "boolean":case "string":return!0;default:return!1}}return function(a,e,f){if(!Aa(a))return a;E(e)||(e=[e]);0===e.length&&(e=["+"]);var g=b(e,f);g.push({get:function(){return{}},descending:f?-1:1});a=Array.prototype.map.call(a,function(a,b){return{value:a,predicateValues:g.map(function(c){var e=
+c.get(a);c=typeof e;if(null===e)c="string",e="null";else if("string"===c)e=e.toLowerCase();else if("object"===c)a:{if("function"===typeof e.valueOf&&(e=e.valueOf(),d(e)))break a;if(rc(e)&&(e=e.toString(),d(e)))break a;e=b}return{value:e,type:c}})}});a.sort(function(a,b){for(var c=0,d=0,e=g.length;d<e;++d){var c=a.predicateValues[d],f=b.predicateValues[d],n=0;c.type===f.type?c.value!==f.value&&(n=c.value<f.value?-1:1):n=c.type<f.type?-1:1;if(c=n*g[d].descending)break}return c});return a=a.map(function(a){return a.value})}}
+function Ka(a){B(a)&&(a={link:a});a.restrict=a.restrict||"AC";return na(a)}function Jd(a,b,d,c,e){var f=this,g=[];f.$error={};f.$$success={};f.$pending=w;f.$name=e(b.name||b.ngForm||"")(d);f.$dirty=!1;f.$pristine=!0;f.$valid=!0;f.$invalid=!1;f.$submitted=!1;f.$$parentForm=Kb;f.$rollbackViewValue=function(){n(g,function(a){a.$rollbackViewValue()})};f.$commitViewValue=function(){n(g,function(a){a.$commitViewValue()})};f.$addControl=function(a){Ra(a.$name,"input");g.push(a);a.$name&&(f[a.$name]=a);a.$$parentForm=
+f};f.$$renameControl=function(a,b){var c=a.$name;f[c]===a&&delete f[c];f[b]=a;a.$name=b};f.$removeControl=function(a){a.$name&&f[a.$name]===a&&delete f[a.$name];n(f.$pending,function(b,c){f.$setValidity(c,null,a)});n(f.$error,function(b,c){f.$setValidity(c,null,a)});n(f.$$success,function(b,c){f.$setValidity(c,null,a)});ab(g,a);a.$$parentForm=Kb};Kd({ctrl:this,$element:a,set:function(a,b,c){var d=a[b];d?-1===d.indexOf(c)&&d.push(c):a[b]=[c]},unset:function(a,b,c){var d=a[b];d&&(ab(d,c),0===d.length&&
+delete a[b])},$animate:c});f.$setDirty=function(){c.removeClass(a,Wa);c.addClass(a,Lb);f.$dirty=!0;f.$pristine=!1;f.$$parentForm.$setDirty()};f.$setPristine=function(){c.setClass(a,Wa,Lb+" ng-submitted");f.$dirty=!1;f.$pristine=!0;f.$submitted=!1;n(g,function(a){a.$setPristine()})};f.$setUntouched=function(){n(g,function(a){a.$setUntouched()})};f.$setSubmitted=function(){c.addClass(a,"ng-submitted");f.$submitted=!0;f.$$parentForm.$setSubmitted()}}function lc(a){a.$formatters.push(function(b){return a.$isEmpty(b)?
+b:b.toString()})}function kb(a,b,d,c,e,f){var g=K(b[0].type);if(!e.android){var h=!1;b.on("compositionstart",function(a){h=!0});b.on("compositionend",function(){h=!1;k()})}var k=function(a){l&&(f.defer.cancel(l),l=null);if(!h){var e=b.val();a=a&&a.type;"password"===g||d.ngTrim&&"false"===d.ngTrim||(e=T(e));(c.$viewValue!==e||""===e&&c.$$hasNativeValidators)&&c.$setViewValue(e,a)}};if(e.hasEvent("input"))b.on("input",k);else{var l,m=function(a,b,c){l||(l=f.defer(function(){l=null;b&&b.value===c||k(a)}))};
+b.on("keydown",function(a){var b=a.keyCode;91===b||15<b&&19>b||37<=b&&40>=b||m(a,this,this.value)});if(e.hasEvent("paste"))b.on("paste cut",m)}b.on("change",k);c.$render=function(){var a=c.$isEmpty(c.$viewValue)?"":c.$viewValue;b.val()!==a&&b.val(a)}}function Mb(a,b){return function(d,c){var e,f;if(da(d))return d;if(F(d)){'"'==d.charAt(0)&&'"'==d.charAt(d.length-1)&&(d=d.substring(1,d.length-1));if(rg.test(d))return new Date(d);a.lastIndex=0;if(e=a.exec(d))return e.shift(),f=c?{yyyy:c.getFullYear(),
+MM:c.getMonth()+1,dd:c.getDate(),HH:c.getHours(),mm:c.getMinutes(),ss:c.getSeconds(),sss:c.getMilliseconds()/1E3}:{yyyy:1970,MM:1,dd:1,HH:0,mm:0,ss:0,sss:0},n(e,function(a,c){c<b.length&&(f[b[c]]=+a)}),new Date(f.yyyy,f.MM-1,f.dd,f.HH,f.mm,f.ss||0,1E3*f.sss||0)}return NaN}}function lb(a,b,d,c){return function(e,f,g,h,k,l,m){function r(a){return a&&!(a.getTime&&a.getTime()!==a.getTime())}function n(a){return u(a)&&!da(a)?d(a)||w:a}Ld(e,f,g,h);kb(e,f,g,h,k,l);var C=h&&h.$options&&h.$options.timezone,
+y;h.$$parserName=a;h.$parsers.push(function(a){return h.$isEmpty(a)?null:b.test(a)?(a=d(a,y),C&&(a=Rb(a,C)),a):w});h.$formatters.push(function(a){if(a&&!da(a))throw mb("datefmt",a);if(r(a))return(y=a)&&C&&(y=Rb(y,C,!0)),m("date")(a,c,C);y=null;return""});if(u(g.min)||g.ngMin){var s;h.$validators.min=function(a){return!r(a)||q(s)||d(a)>=s};g.$observe("min",function(a){s=n(a);h.$validate()})}if(u(g.max)||g.ngMax){var p;h.$validators.max=function(a){return!r(a)||q(p)||d(a)<=p};g.$observe("max",function(a){p=
+n(a);h.$validate()})}}}function Ld(a,b,d,c){(c.$$hasNativeValidators=G(b[0].validity))&&c.$parsers.push(function(a){var c=b.prop("validity")||{};return c.badInput&&!c.typeMismatch?w:a})}function Md(a,b,d,c,e){if(u(c)){a=a(c);if(!a.constant)throw mb("constexpr",d,c);return a(b)}return e}function mc(a,b){a="ngClass"+a;return["$animate",function(d){function c(a,b){var c=[],d=0;a:for(;d<a.length;d++){for(var e=a[d],m=0;m<b.length;m++)if(e==b[m])continue a;c.push(e)}return c}function e(a){var b=[];return E(a)?
+(n(a,function(a){b=b.concat(e(a))}),b):F(a)?a.split(" "):G(a)?(n(a,function(a,c){a&&(b=b.concat(c.split(" ")))}),b):a}return{restrict:"AC",link:function(f,g,h){function k(a,b){var c=g.data("$classCounts")||ea(),d=[];n(a,function(a){if(0<b||c[a])c[a]=(c[a]||0)+b,c[a]===+(0<b)&&d.push(a)});g.data("$classCounts",c);return d.join(" ")}function l(a){if(!0===b||f.$index%2===b){var l=e(a||[]);if(!m){var n=k(l,1);h.$addClass(n)}else if(!ka(a,m)){var q=e(m),n=c(l,q),l=c(q,l),n=k(n,1),l=k(l,-1);n&&n.length&&
+d.addClass(g,n);l&&l.length&&d.removeClass(g,l)}}m=ha(a)}var m;f.$watch(h[a],l,!0);h.$observe("class",function(b){l(f.$eval(h[a]))});"ngClass"!==a&&f.$watch("$index",function(c,d){var g=c&1;if(g!==(d&1)){var l=e(f.$eval(h[a]));g===b?(g=k(l,1),h.$addClass(g)):(g=k(l,-1),h.$removeClass(g))}})}}}]}function Kd(a){function b(a,b){b&&!f[a]?(k.addClass(e,a),f[a]=!0):!b&&f[a]&&(k.removeClass(e,a),f[a]=!1)}function d(a,c){a=a?"-"+Ac(a,"-"):"";b(nb+a,!0===c);b(Nd+a,!1===c)}var c=a.ctrl,e=a.$element,f={},g=
+a.set,h=a.unset,k=a.$animate;f[Nd]=!(f[nb]=e.hasClass(nb));c.$setValidity=function(a,e,f){q(e)?(c.$pending||(c.$pending={}),g(c.$pending,a,f)):(c.$pending&&h(c.$pending,a,f),Od(c.$pending)&&(c.$pending=w));$a(e)?e?(h(c.$error,a,f),g(c.$$success,a,f)):(g(c.$error,a,f),h(c.$$success,a,f)):(h(c.$error,a,f),h(c.$$success,a,f));c.$pending?(b(Pd,!0),c.$valid=c.$invalid=w,d("",null)):(b(Pd,!1),c.$valid=Od(c.$error),c.$invalid=!c.$valid,d("",c.$valid));e=c.$pending&&c.$pending[a]?w:c.$error[a]?!1:c.$$success[a]?
+!0:null;d(a,e);c.$$parentForm.$setValidity(a,e,c)}}function Od(a){if(a)for(var b in a)if(a.hasOwnProperty(b))return!1;return!0}var sg=/^\/(.+)\/([a-z]*)$/,K=function(a){return F(a)?a.toLowerCase():a},ra=Object.prototype.hasOwnProperty,tb=function(a){return F(a)?a.toUpperCase():a},Ha,A,pa,sa=[].slice,Uf=[].splice,tg=[].push,ta=Object.prototype.toString,sc=Object.getPrototypeOf,Ba=M("ng"),$=S.angular||(S.angular={}),Ub,ob=0;Ha=W.documentMode;z.$inject=[];Ya.$inject=[];var E=Array.isArray,Zd=/^\[object (?:Uint8|Uint8Clamped|Uint16|Uint32|Int8|Int16|Int32|Float32|Float64)Array\]$/,
+T=function(a){return F(a)?a.trim():a},wd=function(a){return a.replace(/([-()\[\]{}+?*.$\^|,:#<!\\])/g,"\\$1").replace(/\x08/g,"\\x08")},Ca=function(){if(!u(Ca.rules)){var a=W.querySelector("[ng-csp]")||W.querySelector("[data-ng-csp]");if(a){var b=a.getAttribute("ng-csp")||a.getAttribute("data-ng-csp");Ca.rules={noUnsafeEval:!b||-1!==b.indexOf("no-unsafe-eval"),noInlineStyle:!b||-1!==b.indexOf("no-inline-style")}}else{a=Ca;try{new Function(""),b=!1}catch(d){b=!0}a.rules={noUnsafeEval:b,noInlineStyle:!1}}}return Ca.rules},
+qb=function(){if(u(qb.name_))return qb.name_;var a,b,d=Oa.length,c,e;for(b=0;b<d;++b)if(c=Oa[b],a=W.querySelector("["+c.replace(":","\\:")+"jq]")){e=a.getAttribute(c+"jq");break}return qb.name_=e},Oa=["ng-","data-ng-","ng:","x-ng-"],fe=/[A-Z]/g,Bc=!1,Tb,Na=3,je={full:"1.4.9",major:1,minor:4,dot:9,codeName:"implicit-superannuation"};P.expando="ng339";var fb=P.cache={},Lf=1;P._data=function(a){return this.cache[a[this.expando]]||{}};var Gf=/([\:\-\_]+(.))/g,Hf=/^moz([A-Z])/,yb={mouseleave:"mouseout",
+mouseenter:"mouseover"},Wb=M("jqLite"),Kf=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,Vb=/<|&#?\w+;/,If=/<([\w:-]+)/,Jf=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,ja={option:[1,'<select multiple="multiple">',"</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ja.optgroup=ja.option;ja.tbody=ja.tfoot=ja.colgroup=ja.caption=ja.thead;
+ja.th=ja.td;var Qf=Node.prototype.contains||function(a){return!!(this.compareDocumentPosition(a)&16)},Pa=P.prototype={ready:function(a){function b(){d||(d=!0,a())}var d=!1;"complete"===W.readyState?setTimeout(b):(this.on("DOMContentLoaded",b),P(S).on("load",b))},toString:function(){var a=[];n(this,function(b){a.push(""+b)});return"["+a.join(", ")+"]"},eq:function(a){return 0<=a?A(this[a]):A(this[this.length+a])},length:0,push:tg,sort:[].sort,splice:[].splice},Db={};n("multiple selected checked disabled readOnly required open".split(" "),
+function(a){Db[K(a)]=a});var Sc={};n("input select option textarea button form details".split(" "),function(a){Sc[a]=!0});var ad={ngMinlength:"minlength",ngMaxlength:"maxlength",ngMin:"min",ngMax:"max",ngPattern:"pattern"};n({data:Yb,removeData:wb,hasData:function(a){for(var b in fb[a.ng339])return!0;return!1}},function(a,b){P[b]=a});n({data:Yb,inheritedData:Cb,scope:function(a){return A.data(a,"$scope")||Cb(a.parentNode||a,["$isolateScope","$scope"])},isolateScope:function(a){return A.data(a,"$isolateScope")||
+A.data(a,"$isolateScopeNoTemplate")},controller:Pc,injector:function(a){return Cb(a,"$injector")},removeAttr:function(a,b){a.removeAttribute(b)},hasClass:zb,css:function(a,b,d){b=eb(b);if(u(d))a.style[b]=d;else return a.style[b]},attr:function(a,b,d){var c=a.nodeType;if(c!==Na&&2!==c&&8!==c)if(c=K(b),Db[c])if(u(d))d?(a[b]=!0,a.setAttribute(b,c)):(a[b]=!1,a.removeAttribute(c));else return a[b]||(a.attributes.getNamedItem(b)||z).specified?c:w;else if(u(d))a.setAttribute(b,d);else if(a.getAttribute)return a=
+a.getAttribute(b,2),null===a?w:a},prop:function(a,b,d){if(u(d))a[b]=d;else return a[b]},text:function(){function a(a,d){if(q(d)){var c=a.nodeType;return 1===c||c===Na?a.textContent:""}a.textContent=d}a.$dv="";return a}(),val:function(a,b){if(q(b)){if(a.multiple&&"select"===oa(a)){var d=[];n(a.options,function(a){a.selected&&d.push(a.value||a.text)});return 0===d.length?null:d}return a.value}a.value=b},html:function(a,b){if(q(b))return a.innerHTML;vb(a,!0);a.innerHTML=b},empty:Qc},function(a,b){P.prototype[b]=
+function(b,c){var e,f,g=this.length;if(a!==Qc&&q(2==a.length&&a!==zb&&a!==Pc?b:c)){if(G(b)){for(e=0;e<g;e++)if(a===Yb)a(this[e],b);else for(f in b)a(this[e],f,b[f]);return this}e=a.$dv;g=q(e)?Math.min(g,1):g;for(f=0;f<g;f++){var h=a(this[f],b,c);e=e?e+h:h}return e}for(e=0;e<g;e++)a(this[e],b,c);return this}});n({removeData:wb,on:function(a,b,d,c){if(u(c))throw Wb("onargs");if(Lc(a)){c=xb(a,!0);var e=c.events,f=c.handle;f||(f=c.handle=Nf(a,e));c=0<=b.indexOf(" ")?b.split(" "):[b];for(var g=c.length,
+h=function(b,c,g){var h=e[b];h||(h=e[b]=[],h.specialHandlerWrapper=c,"$destroy"===b||g||a.addEventListener(b,f,!1));h.push(d)};g--;)b=c[g],yb[b]?(h(yb[b],Pf),h(b,w,!0)):h(b)}},off:Oc,one:function(a,b,d){a=A(a);a.on(b,function e(){a.off(b,d);a.off(b,e)});a.on(b,d)},replaceWith:function(a,b){var d,c=a.parentNode;vb(a);n(new P(b),function(b){d?c.insertBefore(b,d.nextSibling):c.replaceChild(b,a);d=b})},children:function(a){var b=[];n(a.childNodes,function(a){1===a.nodeType&&b.push(a)});return b},contents:function(a){return a.contentDocument||
+a.childNodes||[]},append:function(a,b){var d=a.nodeType;if(1===d||11===d){b=new P(b);for(var d=0,c=b.length;d<c;d++)a.appendChild(b[d])}},prepend:function(a,b){if(1===a.nodeType){var d=a.firstChild;n(new P(b),function(b){a.insertBefore(b,d)})}},wrap:function(a,b){b=A(b).eq(0).clone()[0];var d=a.parentNode;d&&d.replaceChild(b,a);b.appendChild(a)},remove:Zb,detach:function(a){Zb(a,!0)},after:function(a,b){var d=a,c=a.parentNode;b=new P(b);for(var e=0,f=b.length;e<f;e++){var g=b[e];c.insertBefore(g,
+d.nextSibling);d=g}},addClass:Bb,removeClass:Ab,toggleClass:function(a,b,d){b&&n(b.split(" "),function(b){var e=d;q(e)&&(e=!zb(a,b));(e?Bb:Ab)(a,b)})},parent:function(a){return(a=a.parentNode)&&11!==a.nodeType?a:null},next:function(a){return a.nextElementSibling},find:function(a,b){return a.getElementsByTagName?a.getElementsByTagName(b):[]},clone:Xb,triggerHandler:function(a,b,d){var c,e,f=b.type||b,g=xb(a);if(g=(g=g&&g.events)&&g[f])c={preventDefault:function(){this.defaultPrevented=!0},isDefaultPrevented:function(){return!0===
+this.defaultPrevented},stopImmediatePropagation:function(){this.immediatePropagationStopped=!0},isImmediatePropagationStopped:function(){return!0===this.immediatePropagationStopped},stopPropagation:z,type:f,target:a},b.type&&(c=N(c,b)),b=ha(g),e=d?[c].concat(d):[c],n(b,function(b){c.isImmediatePropagationStopped()||b.apply(a,e)})}},function(a,b){P.prototype[b]=function(b,c,e){for(var f,g=0,h=this.length;g<h;g++)q(f)?(f=a(this[g],b,c,e),u(f)&&(f=A(f))):Nc(f,a(this[g],b,c,e));return u(f)?f:this};P.prototype.bind=
+P.prototype.on;P.prototype.unbind=P.prototype.off});Sa.prototype={put:function(a,b){this[Da(a,this.nextUid)]=b},get:function(a){return this[Da(a,this.nextUid)]},remove:function(a){var b=this[a=Da(a,this.nextUid)];delete this[a];return b}};var Ef=[function(){this.$get=[function(){return Sa}]}],Uc=/^[^\(]*\(\s*([^\)]*)\)/m,ug=/,/,vg=/^\s*(_?)(\S+?)\1\s*$/,Tc=/((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg,Ea=M("$injector");db.$$annotate=function(a,b,d){var c;if("function"===typeof a){if(!(c=a.$inject)){c=[];if(a.length){if(b)throw F(d)&&
+d||(d=a.name||Rf(a)),Ea("strictdi",d);b=a.toString().replace(Tc,"");b=b.match(Uc);n(b[1].split(ug),function(a){a.replace(vg,function(a,b,d){c.push(d)})})}a.$inject=c}}else E(a)?(b=a.length-1,Qa(a[b],"fn"),c=a.slice(0,b)):Qa(a,"fn",!0);return c};var Qd=M("$animate"),Xe=function(){this.$get=function(){}},Ye=function(){var a=new Sa,b=[];this.$get=["$$AnimateRunner","$rootScope",function(d,c){function e(a,b,c){var d=!1;b&&(b=F(b)?b.split(" "):E(b)?b:[],n(b,function(b){b&&(d=!0,a[b]=c)}));return d}function f(){n(b,
+function(b){var c=a.get(b);if(c){var d=Sf(b.attr("class")),e="",f="";n(c,function(a,b){a!==!!d[b]&&(a?e+=(e.length?" ":"")+b:f+=(f.length?" ":"")+b)});n(b,function(a){e&&Bb(a,e);f&&Ab(a,f)});a.remove(b)}});b.length=0}return{enabled:z,on:z,off:z,pin:z,push:function(g,h,k,l){l&&l();k=k||{};k.from&&g.css(k.from);k.to&&g.css(k.to);if(k.addClass||k.removeClass)if(h=k.addClass,l=k.removeClass,k=a.get(g)||{},h=e(k,h,!0),l=e(k,l,!1),h||l)a.put(g,k),b.push(g),1===b.length&&c.$$postDigest(f);g=new d;g.complete();
+return g}}}]},Ve=["$provide",function(a){var b=this;this.$$registeredAnimations=Object.create(null);this.register=function(d,c){if(d&&"."!==d.charAt(0))throw Qd("notcsel",d);var e=d+"-animation";b.$$registeredAnimations[d.substr(1)]=e;a.factory(e,c)};this.classNameFilter=function(a){if(1===arguments.length&&(this.$$classNameFilter=a instanceof RegExp?a:null)&&/(\s+|\/)ng-animate(\s+|\/)/.test(this.$$classNameFilter.toString()))throw Qd("nongcls","ng-animate");return this.$$classNameFilter};this.$get=
+["$$animateQueue",function(a){function b(a,c,d){if(d){var h;a:{for(h=0;h<d.length;h++){var k=d[h];if(1===k.nodeType){h=k;break a}}h=void 0}!h||h.parentNode||h.previousElementSibling||(d=null)}d?d.after(a):c.prepend(a)}return{on:a.on,off:a.off,pin:a.pin,enabled:a.enabled,cancel:function(a){a.end&&a.end()},enter:function(e,f,g,h){f=f&&A(f);g=g&&A(g);f=f||g.parent();b(e,f,g);return a.push(e,"enter",Fa(h))},move:function(e,f,g,h){f=f&&A(f);g=g&&A(g);f=f||g.parent();b(e,f,g);return a.push(e,"move",Fa(h))},
+leave:function(b,c){return a.push(b,"leave",Fa(c),function(){b.remove()})},addClass:function(b,c,g){g=Fa(g);g.addClass=gb(g.addclass,c);return a.push(b,"addClass",g)},removeClass:function(b,c,g){g=Fa(g);g.removeClass=gb(g.removeClass,c);return a.push(b,"removeClass",g)},setClass:function(b,c,g,h){h=Fa(h);h.addClass=gb(h.addClass,c);h.removeClass=gb(h.removeClass,g);return a.push(b,"setClass",h)},animate:function(b,c,g,h,k){k=Fa(k);k.from=k.from?N(k.from,c):c;k.to=k.to?N(k.to,g):g;k.tempClasses=gb(k.tempClasses,
+h||"ng-inline-animate");return a.push(b,"animate",k)}}}]}],$e=function(){this.$get=["$$rAF",function(a){function b(b){d.push(b);1<d.length||a(function(){for(var a=0;a<d.length;a++)d[a]();d=[]})}var d=[];return function(){var a=!1;b(function(){a=!0});return function(d){a?d():b(d)}}}]},Ze=function(){this.$get=["$q","$sniffer","$$animateAsyncRun","$document","$timeout",function(a,b,d,c,e){function f(a){this.setHost(a);var b=d();this._doneCallbacks=[];this._tick=function(a){var d=c[0];d&&d.hidden?e(a,
+0,!1):b(a)};this._state=0}f.chain=function(a,b){function c(){if(d===a.length)b(!0);else a[d](function(a){!1===a?b(!1):(d++,c())})}var d=0;c()};f.all=function(a,b){function c(f){e=e&&f;++d===a.length&&b(e)}var d=0,e=!0;n(a,function(a){a.done(c)})};f.prototype={setHost:function(a){this.host=a||{}},done:function(a){2===this._state?a():this._doneCallbacks.push(a)},progress:z,getPromise:function(){if(!this.promise){var b=this;this.promise=a(function(a,c){b.done(function(b){!1===b?c():a()})})}return this.promise},
+then:function(a,b){return this.getPromise().then(a,b)},"catch":function(a){return this.getPromise()["catch"](a)},"finally":function(a){return this.getPromise()["finally"](a)},pause:function(){this.host.pause&&this.host.pause()},resume:function(){this.host.resume&&this.host.resume()},end:function(){this.host.end&&this.host.end();this._resolve(!0)},cancel:function(){this.host.cancel&&this.host.cancel();this._resolve(!1)},complete:function(a){var b=this;0===b._state&&(b._state=1,b._tick(function(){b._resolve(a)}))},
+_resolve:function(a){2!==this._state&&(n(this._doneCallbacks,function(b){b(a)}),this._doneCallbacks.length=0,this._state=2)}};return f}]},We=function(){this.$get=["$$rAF","$q","$$AnimateRunner",function(a,b,d){return function(b,e){function f(){a(function(){g.addClass&&(b.addClass(g.addClass),g.addClass=null);g.removeClass&&(b.removeClass(g.removeClass),g.removeClass=null);g.to&&(b.css(g.to),g.to=null);h||k.complete();h=!0});return k}var g=e||{};g.$$prepared||(g=Ma(g));g.cleanupStyles&&(g.from=g.to=
+null);g.from&&(b.css(g.from),g.from=null);var h,k=new d;return{start:f,end:f}}}]},ga=M("$compile");Dc.$inject=["$provide","$$sanitizeUriProvider"];var Yc=/^((?:x|data)[\:\-_])/i,Vf=M("$controller"),Vc=/^(\S+)(\s+as\s+([\w$]+))?$/,ff=function(){this.$get=["$document",function(a){return function(b){b?!b.nodeType&&b instanceof A&&(b=b[0]):b=a[0].body;return b.offsetWidth+1}}]},bd="application/json",bc={"Content-Type":bd+";charset=utf-8"},Xf=/^\[|^\{(?!\{)/,Yf={"[":/]$/,"{":/}$/},Wf=/^\)\]\}',?\n/,wg=
+M("$http"),fd=function(a){return function(){throw wg("legacy",a);}},Ia=$.$interpolateMinErr=M("$interpolate");Ia.throwNoconcat=function(a){throw Ia("noconcat",a);};Ia.interr=function(a,b){return Ia("interr",a,b.toString())};var xg=/^([^\?#]*)(\?([^#]*))?(#(.*))?$/,$f={http:80,https:443,ftp:21},Fb=M("$location"),yg={$$html5:!1,$$replace:!1,absUrl:Gb("$$absUrl"),url:function(a){if(q(a))return this.$$url;var b=xg.exec(a);(b[1]||""===a)&&this.path(decodeURIComponent(b[1]));(b[2]||b[1]||""===a)&&this.search(b[3]||
+"");this.hash(b[5]||"");return this},protocol:Gb("$$protocol"),host:Gb("$$host"),port:Gb("$$port"),path:kd("$$path",function(a){a=null!==a?a.toString():"";return"/"==a.charAt(0)?a:"/"+a}),search:function(a,b){switch(arguments.length){case 0:return this.$$search;case 1:if(F(a)||Q(a))a=a.toString(),this.$$search=yc(a);else if(G(a))a=Ma(a,{}),n(a,function(b,c){null==b&&delete a[c]}),this.$$search=a;else throw Fb("isrcharg");break;default:q(b)||null===b?delete this.$$search[a]:this.$$search[a]=b}this.$$compose();
+return this},hash:kd("$$hash",function(a){return null!==a?a.toString():""}),replace:function(){this.$$replace=!0;return this}};n([jd,ec,dc],function(a){a.prototype=Object.create(yg);a.prototype.state=function(b){if(!arguments.length)return this.$$state;if(a!==dc||!this.$$html5)throw Fb("nostate");this.$$state=q(b)?null:b;return this}});var aa=M("$parse"),ag=Function.prototype.call,bg=Function.prototype.apply,cg=Function.prototype.bind,Nb=ea();n("+ - * / % === !== == != < > <= >= && || ! = |".split(" "),
+function(a){Nb[a]=!0});var zg={n:"\n",f:"\f",r:"\r",t:"\t",v:"\v","'":"'",'"':'"'},gc=function(a){this.options=a};gc.prototype={constructor:gc,lex:function(a){this.text=a;this.index=0;for(this.tokens=[];this.index<this.text.length;)if(a=this.text.charAt(this.index),'"'===a||"'"===a)this.readString(a);else if(this.isNumber(a)||"."===a&&this.isNumber(this.peek()))this.readNumber();else if(this.isIdent(a))this.readIdent();else if(this.is(a,"(){}[].,;:?"))this.tokens.push({index:this.index,text:a}),this.index++;
+else if(this.isWhitespace(a))this.index++;else{var b=a+this.peek(),d=b+this.peek(2),c=Nb[b],e=Nb[d];Nb[a]||c||e?(a=e?d:c?b:a,this.tokens.push({index:this.index,text:a,operator:!0}),this.index+=a.length):this.throwError("Unexpected next character ",this.index,this.index+1)}return this.tokens},is:function(a,b){return-1!==b.indexOf(a)},peek:function(a){a=a||1;return this.index+a<this.text.length?this.text.charAt(this.index+a):!1},isNumber:function(a){return"0"<=a&&"9">=a&&"string"===typeof a},isWhitespace:function(a){return" "===
+a||"\r"===a||"\t"===a||"\n"===a||"\v"===a||"\u00a0"===a},isIdent:function(a){return"a"<=a&&"z">=a||"A"<=a&&"Z">=a||"_"===a||"$"===a},isExpOperator:function(a){return"-"===a||"+"===a||this.isNumber(a)},throwError:function(a,b,d){d=d||this.index;b=u(b)?"s "+b+"-"+this.index+" ["+this.text.substring(b,d)+"]":" "+d;throw aa("lexerr",a,b,this.text);},readNumber:function(){for(var a="",b=this.index;this.index<this.text.length;){var d=K(this.text.charAt(this.index));if("."==d||this.isNumber(d))a+=d;else{var c=
+this.peek();if("e"==d&&this.isExpOperator(c))a+=d;else if(this.isExpOperator(d)&&c&&this.isNumber(c)&&"e"==a.charAt(a.length-1))a+=d;else if(!this.isExpOperator(d)||c&&this.isNumber(c)||"e"!=a.charAt(a.length-1))break;else this.throwError("Invalid exponent")}this.index++}this.tokens.push({index:b,text:a,constant:!0,value:Number(a)})},readIdent:function(){for(var a=this.index;this.index<this.text.length;){var b=this.text.charAt(this.index);if(!this.isIdent(b)&&!this.isNumber(b))break;this.index++}this.tokens.push({index:a,
+text:this.text.slice(a,this.index),identifier:!0})},readString:function(a){var b=this.index;this.index++;for(var d="",c=a,e=!1;this.index<this.text.length;){var f=this.text.charAt(this.index),c=c+f;if(e)"u"===f?(e=this.text.substring(this.index+1,this.index+5),e.match(/[\da-f]{4}/i)||this.throwError("Invalid unicode escape [\\u"+e+"]"),this.index+=4,d+=String.fromCharCode(parseInt(e,16))):d+=zg[f]||f,e=!1;else if("\\"===f)e=!0;else{if(f===a){this.index++;this.tokens.push({index:b,text:c,constant:!0,
+value:d});return}d+=f}this.index++}this.throwError("Unterminated quote",b)}};var s=function(a,b){this.lexer=a;this.options=b};s.Program="Program";s.ExpressionStatement="ExpressionStatement";s.AssignmentExpression="AssignmentExpression";s.ConditionalExpression="ConditionalExpression";s.LogicalExpression="LogicalExpression";s.BinaryExpression="BinaryExpression";s.UnaryExpression="UnaryExpression";s.CallExpression="CallExpression";s.MemberExpression="MemberExpression";s.Identifier="Identifier";s.Literal=
+"Literal";s.ArrayExpression="ArrayExpression";s.Property="Property";s.ObjectExpression="ObjectExpression";s.ThisExpression="ThisExpression";s.NGValueParameter="NGValueParameter";s.prototype={ast:function(a){this.text=a;this.tokens=this.lexer.lex(a);a=this.program();0!==this.tokens.length&&this.throwError("is an unexpected token",this.tokens[0]);return a},program:function(){for(var a=[];;)if(0<this.tokens.length&&!this.peek("}",")",";","]")&&a.push(this.expressionStatement()),!this.expect(";"))return{type:s.Program,
+body:a}},expressionStatement:function(){return{type:s.ExpressionStatement,expression:this.filterChain()}},filterChain:function(){for(var a=this.expression();this.expect("|");)a=this.filter(a);return a},expression:function(){return this.assignment()},assignment:function(){var a=this.ternary();this.expect("=")&&(a={type:s.AssignmentExpression,left:a,right:this.assignment(),operator:"="});return a},ternary:function(){var a=this.logicalOR(),b,d;return this.expect("?")&&(b=this.expression(),this.consume(":"))?
+(d=this.expression(),{type:s.ConditionalExpression,test:a,alternate:b,consequent:d}):a},logicalOR:function(){for(var a=this.logicalAND();this.expect("||");)a={type:s.LogicalExpression,operator:"||",left:a,right:this.logicalAND()};return a},logicalAND:function(){for(var a=this.equality();this.expect("&&");)a={type:s.LogicalExpression,operator:"&&",left:a,right:this.equality()};return a},equality:function(){for(var a=this.relational(),b;b=this.expect("==","!=","===","!==");)a={type:s.BinaryExpression,
+operator:b.text,left:a,right:this.relational()};return a},relational:function(){for(var a=this.additive(),b;b=this.expect("<",">","<=",">=");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.additive()};return a},additive:function(){for(var a=this.multiplicative(),b;b=this.expect("+","-");)a={type:s.BinaryExpression,operator:b.text,left:a,right:this.multiplicative()};return a},multiplicative:function(){for(var a=this.unary(),b;b=this.expect("*","/","%");)a={type:s.BinaryExpression,operator:b.text,
+left:a,right:this.unary()};return a},unary:function(){var a;return(a=this.expect("+","-","!"))?{type:s.UnaryExpression,operator:a.text,prefix:!0,argument:this.unary()}:this.primary()},primary:function(){var a;this.expect("(")?(a=this.filterChain(),this.consume(")")):this.expect("[")?a=this.arrayDeclaration():this.expect("{")?a=this.object():this.constants.hasOwnProperty(this.peek().text)?a=Ma(this.constants[this.consume().text]):this.peek().identifier?a=this.identifier():this.peek().constant?a=this.constant():
+this.throwError("not a primary expression",this.peek());for(var b;b=this.expect("(","[",".");)"("===b.text?(a={type:s.CallExpression,callee:a,arguments:this.parseArguments()},this.consume(")")):"["===b.text?(a={type:s.MemberExpression,object:a,property:this.expression(),computed:!0},this.consume("]")):"."===b.text?a={type:s.MemberExpression,object:a,property:this.identifier(),computed:!1}:this.throwError("IMPOSSIBLE");return a},filter:function(a){a=[a];for(var b={type:s.CallExpression,callee:this.identifier(),
+arguments:a,filter:!0};this.expect(":");)a.push(this.expression());return b},parseArguments:function(){var a=[];if(")"!==this.peekToken().text){do a.push(this.expression());while(this.expect(","))}return a},identifier:function(){var a=this.consume();a.identifier||this.throwError("is not a valid identifier",a);return{type:s.Identifier,name:a.text}},constant:function(){return{type:s.Literal,value:this.consume().value}},arrayDeclaration:function(){var a=[];if("]"!==this.peekToken().text){do{if(this.peek("]"))break;
+a.push(this.expression())}while(this.expect(","))}this.consume("]");return{type:s.ArrayExpression,elements:a}},object:function(){var a=[],b;if("}"!==this.peekToken().text){do{if(this.peek("}"))break;b={type:s.Property,kind:"init"};this.peek().constant?b.key=this.constant():this.peek().identifier?b.key=this.identifier():this.throwError("invalid key",this.peek());this.consume(":");b.value=this.expression();a.push(b)}while(this.expect(","))}this.consume("}");return{type:s.ObjectExpression,properties:a}},
+throwError:function(a,b){throw aa("syntax",b.text,a,b.index+1,this.text,this.text.substring(b.index));},consume:function(a){if(0===this.tokens.length)throw aa("ueoe",this.text);var b=this.expect(a);b||this.throwError("is unexpected, expecting ["+a+"]",this.peek());return b},peekToken:function(){if(0===this.tokens.length)throw aa("ueoe",this.text);return this.tokens[0]},peek:function(a,b,d,c){return this.peekAhead(0,a,b,d,c)},peekAhead:function(a,b,d,c,e){if(this.tokens.length>a){a=this.tokens[a];
+var f=a.text;if(f===b||f===d||f===c||f===e||!(b||d||c||e))return a}return!1},expect:function(a,b,d,c){return(a=this.peek(a,b,d,c))?(this.tokens.shift(),a):!1},constants:{"true":{type:s.Literal,value:!0},"false":{type:s.Literal,value:!1},"null":{type:s.Literal,value:null},undefined:{type:s.Literal,value:w},"this":{type:s.ThisExpression}}};td.prototype={compile:function(a,b){var d=this,c=this.astBuilder.ast(a);this.state={nextId:0,filters:{},expensiveChecks:b,fn:{vars:[],body:[],own:{}},assign:{vars:[],
+body:[],own:{}},inputs:[]};V(c,d.$filter);var e="",f;this.stage="assign";if(f=rd(c))this.state.computing="assign",e=this.nextId(),this.recurse(f,e),this.return_(e),e="fn.assign="+this.generateFunction("assign","s,v,l");f=pd(c.body);d.stage="inputs";n(f,function(a,b){var c="fn"+b;d.state[c]={vars:[],body:[],own:{}};d.state.computing=c;var e=d.nextId();d.recurse(a,e);d.return_(e);d.state.inputs.push(c);a.watchId=b});this.state.computing="fn";this.stage="main";this.recurse(c);e='"'+this.USE+" "+this.STRICT+
+'";\n'+this.filterPrefix()+"var fn="+this.generateFunction("fn","s,l,a,i")+e+this.watchFns()+"return fn;";e=(new Function("$filter","ensureSafeMemberName","ensureSafeObject","ensureSafeFunction","getStringValue","ensureSafeAssignContext","ifDefined","plus","text",e))(this.$filter,Va,ya,md,ld,nd,dg,od,a);this.state=this.stage=w;e.literal=sd(c);e.constant=c.constant;return e},USE:"use",STRICT:"strict",watchFns:function(){var a=[],b=this.state.inputs,d=this;n(b,function(b){a.push("var "+b+"="+d.generateFunction(b,
+"s"))});b.length&&a.push("fn.inputs=["+b.join(",")+"];");return a.join("")},generateFunction:function(a,b){return"function("+b+"){"+this.varsPrefix(a)+this.body(a)+"};"},filterPrefix:function(){var a=[],b=this;n(this.state.filters,function(d,c){a.push(d+"=$filter("+b.escape(c)+")")});return a.length?"var "+a.join(",")+";":""},varsPrefix:function(a){return this.state[a].vars.length?"var "+this.state[a].vars.join(",")+";":""},body:function(a){return this.state[a].body.join("")},recurse:function(a,b,
+d,c,e,f){var g,h,k=this,l,m;c=c||z;if(!f&&u(a.watchId))b=b||this.nextId(),this.if_("i",this.lazyAssign(b,this.computedMember("i",a.watchId)),this.lazyRecurse(a,b,d,c,e,!0));else switch(a.type){case s.Program:n(a.body,function(b,c){k.recurse(b.expression,w,w,function(a){h=a});c!==a.body.length-1?k.current().body.push(h,";"):k.return_(h)});break;case s.Literal:m=this.escape(a.value);this.assign(b,m);c(m);break;case s.UnaryExpression:this.recurse(a.argument,w,w,function(a){h=a});m=a.operator+"("+this.ifDefined(h,
+0)+")";this.assign(b,m);c(m);break;case s.BinaryExpression:this.recurse(a.left,w,w,function(a){g=a});this.recurse(a.right,w,w,function(a){h=a});m="+"===a.operator?this.plus(g,h):"-"===a.operator?this.ifDefined(g,0)+a.operator+this.ifDefined(h,0):"("+g+")"+a.operator+"("+h+")";this.assign(b,m);c(m);break;case s.LogicalExpression:b=b||this.nextId();k.recurse(a.left,b);k.if_("&&"===a.operator?b:k.not(b),k.lazyRecurse(a.right,b));c(b);break;case s.ConditionalExpression:b=b||this.nextId();k.recurse(a.test,
+b);k.if_(b,k.lazyRecurse(a.alternate,b),k.lazyRecurse(a.consequent,b));c(b);break;case s.Identifier:b=b||this.nextId();d&&(d.context="inputs"===k.stage?"s":this.assign(this.nextId(),this.getHasOwnProperty("l",a.name)+"?l:s"),d.computed=!1,d.name=a.name);Va(a.name);k.if_("inputs"===k.stage||k.not(k.getHasOwnProperty("l",a.name)),function(){k.if_("inputs"===k.stage||"s",function(){e&&1!==e&&k.if_(k.not(k.nonComputedMember("s",a.name)),k.lazyAssign(k.nonComputedMember("s",a.name),"{}"));k.assign(b,k.nonComputedMember("s",
+a.name))})},b&&k.lazyAssign(b,k.nonComputedMember("l",a.name)));(k.state.expensiveChecks||Hb(a.name))&&k.addEnsureSafeObject(b);c(b);break;case s.MemberExpression:g=d&&(d.context=this.nextId())||this.nextId();b=b||this.nextId();k.recurse(a.object,g,w,function(){k.if_(k.notNull(g),function(){if(a.computed)h=k.nextId(),k.recurse(a.property,h),k.getStringValue(h),k.addEnsureSafeMemberName(h),e&&1!==e&&k.if_(k.not(k.computedMember(g,h)),k.lazyAssign(k.computedMember(g,h),"{}")),m=k.ensureSafeObject(k.computedMember(g,
+h)),k.assign(b,m),d&&(d.computed=!0,d.name=h);else{Va(a.property.name);e&&1!==e&&k.if_(k.not(k.nonComputedMember(g,a.property.name)),k.lazyAssign(k.nonComputedMember(g,a.property.name),"{}"));m=k.nonComputedMember(g,a.property.name);if(k.state.expensiveChecks||Hb(a.property.name))m=k.ensureSafeObject(m);k.assign(b,m);d&&(d.computed=!1,d.name=a.property.name)}},function(){k.assign(b,"undefined")});c(b)},!!e);break;case s.CallExpression:b=b||this.nextId();a.filter?(h=k.filter(a.callee.name),l=[],n(a.arguments,
+function(a){var b=k.nextId();k.recurse(a,b);l.push(b)}),m=h+"("+l.join(",")+")",k.assign(b,m),c(b)):(h=k.nextId(),g={},l=[],k.recurse(a.callee,h,g,function(){k.if_(k.notNull(h),function(){k.addEnsureSafeFunction(h);n(a.arguments,function(a){k.recurse(a,k.nextId(),w,function(a){l.push(k.ensureSafeObject(a))})});g.name?(k.state.expensiveChecks||k.addEnsureSafeObject(g.context),m=k.member(g.context,g.name,g.computed)+"("+l.join(",")+")"):m=h+"("+l.join(",")+")";m=k.ensureSafeObject(m);k.assign(b,m)},
+function(){k.assign(b,"undefined")});c(b)}));break;case s.AssignmentExpression:h=this.nextId();g={};if(!qd(a.left))throw aa("lval");this.recurse(a.left,w,g,function(){k.if_(k.notNull(g.context),function(){k.recurse(a.right,h);k.addEnsureSafeObject(k.member(g.context,g.name,g.computed));k.addEnsureSafeAssignContext(g.context);m=k.member(g.context,g.name,g.computed)+a.operator+h;k.assign(b,m);c(b||m)})},1);break;case s.ArrayExpression:l=[];n(a.elements,function(a){k.recurse(a,k.nextId(),w,function(a){l.push(a)})});
+m="["+l.join(",")+"]";this.assign(b,m);c(m);break;case s.ObjectExpression:l=[];n(a.properties,function(a){k.recurse(a.value,k.nextId(),w,function(b){l.push(k.escape(a.key.type===s.Identifier?a.key.name:""+a.key.value)+":"+b)})});m="{"+l.join(",")+"}";this.assign(b,m);c(m);break;case s.ThisExpression:this.assign(b,"s");c("s");break;case s.NGValueParameter:this.assign(b,"v"),c("v")}},getHasOwnProperty:function(a,b){var d=a+"."+b,c=this.current().own;c.hasOwnProperty(d)||(c[d]=this.nextId(!1,a+"&&("+
+this.escape(b)+" in "+a+")"));return c[d]},assign:function(a,b){if(a)return this.current().body.push(a,"=",b,";"),a},filter:function(a){this.state.filters.hasOwnProperty(a)||(this.state.filters[a]=this.nextId(!0));return this.state.filters[a]},ifDefined:function(a,b){return"ifDefined("+a+","+this.escape(b)+")"},plus:function(a,b){return"plus("+a+","+b+")"},return_:function(a){this.current().body.push("return ",a,";")},if_:function(a,b,d){if(!0===a)b();else{var c=this.current().body;c.push("if(",a,
+"){");b();c.push("}");d&&(c.push("else{"),d(),c.push("}"))}},not:function(a){return"!("+a+")"},notNull:function(a){return a+"!=null"},nonComputedMember:function(a,b){return a+"."+b},computedMember:function(a,b){return a+"["+b+"]"},member:function(a,b,d){return d?this.computedMember(a,b):this.nonComputedMember(a,b)},addEnsureSafeObject:function(a){this.current().body.push(this.ensureSafeObject(a),";")},addEnsureSafeMemberName:function(a){this.current().body.push(this.ensureSafeMemberName(a),";")},
+addEnsureSafeFunction:function(a){this.current().body.push(this.ensureSafeFunction(a),";")},addEnsureSafeAssignContext:function(a){this.current().body.push(this.ensureSafeAssignContext(a),";")},ensureSafeObject:function(a){return"ensureSafeObject("+a+",text)"},ensureSafeMemberName:function(a){return"ensureSafeMemberName("+a+",text)"},ensureSafeFunction:function(a){return"ensureSafeFunction("+a+",text)"},getStringValue:function(a){this.assign(a,"getStringValue("+a+",text)")},ensureSafeAssignContext:function(a){return"ensureSafeAssignContext("+
+a+",text)"},lazyRecurse:function(a,b,d,c,e,f){var g=this;return function(){g.recurse(a,b,d,c,e,f)}},lazyAssign:function(a,b){var d=this;return function(){d.assign(a,b)}},stringEscapeRegex:/[^ a-zA-Z0-9]/g,stringEscapeFn:function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)},escape:function(a){if(F(a))return"'"+a.replace(this.stringEscapeRegex,this.stringEscapeFn)+"'";if(Q(a))return a.toString();if(!0===a)return"true";if(!1===a)return"false";if(null===a)return"null";if("undefined"===
+typeof a)return"undefined";throw aa("esc");},nextId:function(a,b){var d="v"+this.state.nextId++;a||this.current().vars.push(d+(b?"="+b:""));return d},current:function(){return this.state[this.state.computing]}};ud.prototype={compile:function(a,b){var d=this,c=this.astBuilder.ast(a);this.expression=a;this.expensiveChecks=b;V(c,d.$filter);var e,f;if(e=rd(c))f=this.recurse(e);e=pd(c.body);var g;e&&(g=[],n(e,function(a,b){var c=d.recurse(a);a.input=c;g.push(c);a.watchId=b}));var h=[];n(c.body,function(a){h.push(d.recurse(a.expression))});
+e=0===c.body.length?function(){}:1===c.body.length?h[0]:function(a,b){var c;n(h,function(d){c=d(a,b)});return c};f&&(e.assign=function(a,b,c){return f(a,c,b)});g&&(e.inputs=g);e.literal=sd(c);e.constant=c.constant;return e},recurse:function(a,b,d){var c,e,f=this,g;if(a.input)return this.inputs(a.input,a.watchId);switch(a.type){case s.Literal:return this.value(a.value,b);case s.UnaryExpression:return e=this.recurse(a.argument),this["unary"+a.operator](e,b);case s.BinaryExpression:return c=this.recurse(a.left),
+e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case s.LogicalExpression:return c=this.recurse(a.left),e=this.recurse(a.right),this["binary"+a.operator](c,e,b);case s.ConditionalExpression:return this["ternary?:"](this.recurse(a.test),this.recurse(a.alternate),this.recurse(a.consequent),b);case s.Identifier:return Va(a.name,f.expression),f.identifier(a.name,f.expensiveChecks||Hb(a.name),b,d,f.expression);case s.MemberExpression:return c=this.recurse(a.object,!1,!!d),a.computed||(Va(a.property.name,
+f.expression),e=a.property.name),a.computed&&(e=this.recurse(a.property)),a.computed?this.computedMember(c,e,b,d,f.expression):this.nonComputedMember(c,e,f.expensiveChecks,b,d,f.expression);case s.CallExpression:return g=[],n(a.arguments,function(a){g.push(f.recurse(a))}),a.filter&&(e=this.$filter(a.callee.name)),a.filter||(e=this.recurse(a.callee,!0)),a.filter?function(a,c,d,f){for(var r=[],n=0;n<g.length;++n)r.push(g[n](a,c,d,f));a=e.apply(w,r,f);return b?{context:w,name:w,value:a}:a}:function(a,
+c,d,m){var n=e(a,c,d,m),t;if(null!=n.value){ya(n.context,f.expression);md(n.value,f.expression);t=[];for(var q=0;q<g.length;++q)t.push(ya(g[q](a,c,d,m),f.expression));t=ya(n.value.apply(n.context,t),f.expression)}return b?{value:t}:t};case s.AssignmentExpression:return c=this.recurse(a.left,!0,1),e=this.recurse(a.right),function(a,d,g,m){var n=c(a,d,g,m);a=e(a,d,g,m);ya(n.value,f.expression);nd(n.context);n.context[n.name]=a;return b?{value:a}:a};case s.ArrayExpression:return g=[],n(a.elements,function(a){g.push(f.recurse(a))}),
+function(a,c,d,e){for(var f=[],n=0;n<g.length;++n)f.push(g[n](a,c,d,e));return b?{value:f}:f};case s.ObjectExpression:return g=[],n(a.properties,function(a){g.push({key:a.key.type===s.Identifier?a.key.name:""+a.key.value,value:f.recurse(a.value)})}),function(a,c,d,e){for(var f={},n=0;n<g.length;++n)f[g[n].key]=g[n].value(a,c,d,e);return b?{value:f}:f};case s.ThisExpression:return function(a){return b?{value:a}:a};case s.NGValueParameter:return function(a,c,d,e){return b?{value:d}:d}}},"unary+":function(a,
+b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?+d:0;return b?{value:d}:d}},"unary-":function(a,b){return function(d,c,e,f){d=a(d,c,e,f);d=u(d)?-d:0;return b?{value:d}:d}},"unary!":function(a,b){return function(d,c,e,f){d=!a(d,c,e,f);return b?{value:d}:d}},"binary+":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=od(h,c);return d?{value:h}:h}},"binary-":function(a,b,d){return function(c,e,f,g){var h=a(c,e,f,g);c=b(c,e,f,g);h=(u(h)?h:0)-(u(c)?c:0);return d?{value:h}:h}},"binary*":function(a,
+b,d){return function(c,e,f,g){c=a(c,e,f,g)*b(c,e,f,g);return d?{value:c}:c}},"binary/":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)/b(c,e,f,g);return d?{value:c}:c}},"binary%":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)%b(c,e,f,g);return d?{value:c}:c}},"binary===":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)===b(c,e,f,g);return d?{value:c}:c}},"binary!==":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!==b(c,e,f,g);return d?{value:c}:c}},"binary==":function(a,b,
+d){return function(c,e,f,g){c=a(c,e,f,g)==b(c,e,f,g);return d?{value:c}:c}},"binary!=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)!=b(c,e,f,g);return d?{value:c}:c}},"binary<":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<b(c,e,f,g);return d?{value:c}:c}},"binary>":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)>b(c,e,f,g);return d?{value:c}:c}},"binary<=":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)<=b(c,e,f,g);return d?{value:c}:c}},"binary>=":function(a,b,d){return function(c,
+e,f,g){c=a(c,e,f,g)>=b(c,e,f,g);return d?{value:c}:c}},"binary&&":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)&&b(c,e,f,g);return d?{value:c}:c}},"binary||":function(a,b,d){return function(c,e,f,g){c=a(c,e,f,g)||b(c,e,f,g);return d?{value:c}:c}},"ternary?:":function(a,b,d,c){return function(e,f,g,h){e=a(e,f,g,h)?b(e,f,g,h):d(e,f,g,h);return c?{value:e}:e}},value:function(a,b){return function(){return b?{context:w,name:w,value:a}:a}},identifier:function(a,b,d,c,e){return function(f,g,h,k){f=
+g&&a in g?g:f;c&&1!==c&&f&&!f[a]&&(f[a]={});g=f?f[a]:w;b&&ya(g,e);return d?{context:f,name:a,value:g}:g}},computedMember:function(a,b,d,c,e){return function(f,g,h,k){var l=a(f,g,h,k),m,n;null!=l&&(m=b(f,g,h,k),m=ld(m),Va(m,e),c&&1!==c&&l&&!l[m]&&(l[m]={}),n=l[m],ya(n,e));return d?{context:l,name:m,value:n}:n}},nonComputedMember:function(a,b,d,c,e,f){return function(g,h,k,l){g=a(g,h,k,l);e&&1!==e&&g&&!g[b]&&(g[b]={});h=null!=g?g[b]:w;(d||Hb(b))&&ya(h,f);return c?{context:g,name:b,value:h}:h}},inputs:function(a,
+b){return function(d,c,e,f){return f?f[b]:a(d,c,e)}}};var hc=function(a,b,d){this.lexer=a;this.$filter=b;this.options=d;this.ast=new s(this.lexer);this.astCompiler=d.csp?new ud(this.ast,b):new td(this.ast,b)};hc.prototype={constructor:hc,parse:function(a){return this.astCompiler.compile(a,this.options.expensiveChecks)}};var eg=Object.prototype.valueOf,za=M("$sce"),ma={HTML:"html",CSS:"css",URL:"url",RESOURCE_URL:"resourceUrl",JS:"js"},ga=M("$compile"),ba=W.createElement("a"),yd=xa(S.location.href);
+zd.$inject=["$document"];Kc.$inject=["$provide"];var Gd=22,Fd=".",jc="0";Ad.$inject=["$locale"];Cd.$inject=["$locale"];var qg={yyyy:ca("FullYear",4),yy:ca("FullYear",2,0,!0),y:ca("FullYear",1),MMMM:Jb("Month"),MMM:Jb("Month",!0),MM:ca("Month",2,1),M:ca("Month",1,1),dd:ca("Date",2),d:ca("Date",1),HH:ca("Hours",2),H:ca("Hours",1),hh:ca("Hours",2,-12),h:ca("Hours",1,-12),mm:ca("Minutes",2),m:ca("Minutes",1),ss:ca("Seconds",2),s:ca("Seconds",1),sss:ca("Milliseconds",3),EEEE:Jb("Day"),EEE:Jb("Day",!0),
+a:function(a,b){return 12>a.getHours()?b.AMPMS[0]:b.AMPMS[1]},Z:function(a,b,d){a=-1*d;return a=(0<=a?"+":"")+(Ib(Math[0<a?"floor":"ceil"](a/60),2)+Ib(Math.abs(a%60),2))},ww:Id(2),w:Id(1),G:kc,GG:kc,GGG:kc,GGGG:function(a,b){return 0>=a.getFullYear()?b.ERANAMES[0]:b.ERANAMES[1]}},pg=/((?:[^yMdHhmsaZEwG']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+|H+|h+|m+|s+|a|Z|G+|w+))(.*)/,og=/^\-?\d+$/;Bd.$inject=["$locale"];var jg=na(K),kg=na(tb);Dd.$inject=["$parse"];var le=na({restrict:"E",compile:function(a,b){if(!b.href&&
+!b.xlinkHref)return function(a,b){if("a"===b[0].nodeName.toLowerCase()){var e="[object SVGAnimatedString]"===ta.call(b.prop("href"))?"xlink:href":"href";b.on("click",function(a){b.attr(e)||a.preventDefault()})}}}}),ub={};n(Db,function(a,b){function d(a,d,e){a.$watch(e[c],function(a){e.$set(b,!!a)})}if("multiple"!=a){var c=va("ng-"+b),e=d;"checked"===a&&(e=function(a,b,e){e.ngModel!==e[c]&&d(a,b,e)});ub[c]=function(){return{restrict:"A",priority:100,link:e}}}});n(ad,function(a,b){ub[b]=function(){return{priority:100,
+link:function(a,c,e){if("ngPattern"===b&&"/"==e.ngPattern.charAt(0)&&(c=e.ngPattern.match(sg))){e.$set("ngPattern",new RegExp(c[1],c[2]));return}a.$watch(e[b],function(a){e.$set(b,a)})}}}});n(["src","srcset","href"],function(a){var b=va("ng-"+a);ub[b]=function(){return{priority:99,link:function(d,c,e){var f=a,g=a;"href"===a&&"[object SVGAnimatedString]"===ta.call(c.prop("href"))&&(g="xlinkHref",e.$attr[g]="xlink:href",f=null);e.$observe(b,function(b){b?(e.$set(g,b),Ha&&f&&c.prop(f,e[g])):"href"===
+a&&e.$set(g,null)})}}}});var Kb={$addControl:z,$$renameControl:function(a,b){a.$name=b},$removeControl:z,$setValidity:z,$setDirty:z,$setPristine:z,$setSubmitted:z};Jd.$inject=["$element","$attrs","$scope","$animate","$interpolate"];var Rd=function(a){return["$timeout","$parse",function(b,d){function c(a){return""===a?d('this[""]').assign:d(a).assign||z}return{name:"form",restrict:a?"EAC":"E",require:["form","^^?form"],controller:Jd,compile:function(d,f){d.addClass(Wa).addClass(nb);var g=f.name?"name":
+a&&f.ngForm?"ngForm":!1;return{pre:function(a,d,e,f){var n=f[0];if(!("action"in e)){var t=function(b){a.$apply(function(){n.$commitViewValue();n.$setSubmitted()});b.preventDefault()};d[0].addEventListener("submit",t,!1);d.on("$destroy",function(){b(function(){d[0].removeEventListener("submit",t,!1)},0,!1)})}(f[1]||n.$$parentForm).$addControl(n);var q=g?c(n.$name):z;g&&(q(a,n),e.$observe(g,function(b){n.$name!==b&&(q(a,w),n.$$parentForm.$$renameControl(n,b),q=c(n.$name),q(a,n))}));d.on("$destroy",
+function(){n.$$parentForm.$removeControl(n);q(a,w);N(n,Kb)})}}}}}]},me=Rd(),ze=Rd(!0),rg=/\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/,Ag=/^[a-z][a-z\d.+-]*:\/*(?:[^:@]+(?::[^@]+)?@)?(?:[^\s:/?#]+|\[[a-f\d:]+\])(?::\d+)?(?:\/[^?#]*)?(?:\?[^#]*)?(?:#.*)?$/i,Bg=/^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i,Cg=/^\s*(\-|\+)?(\d+|(\d*(\.\d*)))([eE][+-]?\d+)?\s*$/,Sd=/^(\d{4})-(\d{2})-(\d{2})$/,Td=/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,
+nc=/^(\d{4})-W(\d\d)$/,Ud=/^(\d{4})-(\d\d)$/,Vd=/^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/,Wd={text:function(a,b,d,c,e,f){kb(a,b,d,c,e,f);lc(c)},date:lb("date",Sd,Mb(Sd,["yyyy","MM","dd"]),"yyyy-MM-dd"),"datetime-local":lb("datetimelocal",Td,Mb(Td,"yyyy MM dd HH mm ss sss".split(" ")),"yyyy-MM-ddTHH:mm:ss.sss"),time:lb("time",Vd,Mb(Vd,["HH","mm","ss","sss"]),"HH:mm:ss.sss"),week:lb("week",nc,function(a,b){if(da(a))return a;if(F(a)){nc.lastIndex=0;var d=nc.exec(a);if(d){var c=+d[1],e=+d[2],f=d=0,g=
+0,h=0,k=Hd(c),e=7*(e-1);b&&(d=b.getHours(),f=b.getMinutes(),g=b.getSeconds(),h=b.getMilliseconds());return new Date(c,0,k.getDate()+e,d,f,g,h)}}return NaN},"yyyy-Www"),month:lb("month",Ud,Mb(Ud,["yyyy","MM"]),"yyyy-MM"),number:function(a,b,d,c,e,f){Ld(a,b,d,c);kb(a,b,d,c,e,f);c.$$parserName="number";c.$parsers.push(function(a){return c.$isEmpty(a)?null:Cg.test(a)?parseFloat(a):w});c.$formatters.push(function(a){if(!c.$isEmpty(a)){if(!Q(a))throw mb("numfmt",a);a=a.toString()}return a});if(u(d.min)||
+d.ngMin){var g;c.$validators.min=function(a){return c.$isEmpty(a)||q(g)||a>=g};d.$observe("min",function(a){u(a)&&!Q(a)&&(a=parseFloat(a,10));g=Q(a)&&!isNaN(a)?a:w;c.$validate()})}if(u(d.max)||d.ngMax){var h;c.$validators.max=function(a){return c.$isEmpty(a)||q(h)||a<=h};d.$observe("max",function(a){u(a)&&!Q(a)&&(a=parseFloat(a,10));h=Q(a)&&!isNaN(a)?a:w;c.$validate()})}},url:function(a,b,d,c,e,f){kb(a,b,d,c,e,f);lc(c);c.$$parserName="url";c.$validators.url=function(a,b){var d=a||b;return c.$isEmpty(d)||
+Ag.test(d)}},email:function(a,b,d,c,e,f){kb(a,b,d,c,e,f);lc(c);c.$$parserName="email";c.$validators.email=function(a,b){var d=a||b;return c.$isEmpty(d)||Bg.test(d)}},radio:function(a,b,d,c){q(d.name)&&b.attr("name",++ob);b.on("click",function(a){b[0].checked&&c.$setViewValue(d.value,a&&a.type)});c.$render=function(){b[0].checked=d.value==c.$viewValue};d.$observe("value",c.$render)},checkbox:function(a,b,d,c,e,f,g,h){var k=Md(h,a,"ngTrueValue",d.ngTrueValue,!0),l=Md(h,a,"ngFalseValue",d.ngFalseValue,
+!1);b.on("click",function(a){c.$setViewValue(b[0].checked,a&&a.type)});c.$render=function(){b[0].checked=c.$viewValue};c.$isEmpty=function(a){return!1===a};c.$formatters.push(function(a){return ka(a,k)});c.$parsers.push(function(a){return a?k:l})},hidden:z,button:z,submit:z,reset:z,file:z},Ec=["$browser","$sniffer","$filter","$parse",function(a,b,d,c){return{restrict:"E",require:["?ngModel"],link:{pre:function(e,f,g,h){h[0]&&(Wd[K(g.type)]||Wd.text)(e,f,g,h[0],b,a,d,c)}}}}],Dg=/^(true|false|\d+)$/,
+Re=function(){return{restrict:"A",priority:100,compile:function(a,b){return Dg.test(b.ngValue)?function(a,b,e){e.$set("value",a.$eval(e.ngValue))}:function(a,b,e){a.$watch(e.ngValue,function(a){e.$set("value",a)})}}}},re=["$compile",function(a){return{restrict:"AC",compile:function(b){a.$$addBindingClass(b);return function(b,c,e){a.$$addBindingInfo(c,e.ngBind);c=c[0];b.$watch(e.ngBind,function(a){c.textContent=q(a)?"":a})}}}}],te=["$interpolate","$compile",function(a,b){return{compile:function(d){b.$$addBindingClass(d);
+return function(c,d,f){c=a(d.attr(f.$attr.ngBindTemplate));b.$$addBindingInfo(d,c.expressions);d=d[0];f.$observe("ngBindTemplate",function(a){d.textContent=q(a)?"":a})}}}}],se=["$sce","$parse","$compile",function(a,b,d){return{restrict:"A",compile:function(c,e){var f=b(e.ngBindHtml),g=b(e.ngBindHtml,function(a){return(a||"").toString()});d.$$addBindingClass(c);return function(b,c,e){d.$$addBindingInfo(c,e.ngBindHtml);b.$watch(g,function(){c.html(a.getTrustedHtml(f(b))||"")})}}}}],Qe=na({restrict:"A",
+require:"ngModel",link:function(a,b,d,c){c.$viewChangeListeners.push(function(){a.$eval(d.ngChange)})}}),ue=mc("",!0),we=mc("Odd",0),ve=mc("Even",1),xe=Ka({compile:function(a,b){b.$set("ngCloak",w);a.removeClass("ng-cloak")}}),ye=[function(){return{restrict:"A",scope:!0,controller:"@",priority:500}}],Jc={},Eg={blur:!0,focus:!0};n("click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste".split(" "),function(a){var b=
+va("ng-"+a);Jc[b]=["$parse","$rootScope",function(d,c){return{restrict:"A",compile:function(e,f){var g=d(f[b],null,!0);return function(b,d){d.on(a,function(d){var e=function(){g(b,{$event:d})};Eg[a]&&c.$$phase?b.$evalAsync(e):b.$apply(e)})}}}}]});var Be=["$animate",function(a){return{multiElement:!0,transclude:"element",priority:600,terminal:!0,restrict:"A",$$tlb:!0,link:function(b,d,c,e,f){var g,h,k;b.$watch(c.ngIf,function(b){b?h||f(function(b,e){h=e;b[b.length++]=W.createComment(" end ngIf: "+
+c.ngIf+" ");g={clone:b};a.enter(b,d.parent(),d)}):(k&&(k.remove(),k=null),h&&(h.$destroy(),h=null),g&&(k=sb(g.clone),a.leave(k).then(function(){k=null}),g=null))})}}}],Ce=["$templateRequest","$anchorScroll","$animate",function(a,b,d){return{restrict:"ECA",priority:400,terminal:!0,transclude:"element",controller:$.noop,compile:function(c,e){var f=e.ngInclude||e.src,g=e.onload||"",h=e.autoscroll;return function(c,e,m,n,q){var s=0,y,w,p,x=function(){w&&(w.remove(),w=null);y&&(y.$destroy(),y=null);p&&
+(d.leave(p).then(function(){w=null}),w=p,p=null)};c.$watch(f,function(f){var m=function(){!u(h)||h&&!c.$eval(h)||b()},H=++s;f?(a(f,!0).then(function(a){if(!c.$$destroyed&&H===s){var b=c.$new();n.template=a;a=q(b,function(a){x();d.enter(a,null,e).then(m)});y=b;p=a;y.$emit("$includeContentLoaded",f);c.$eval(g)}},function(){c.$$destroyed||H!==s||(x(),c.$emit("$includeContentError",f))}),c.$emit("$includeContentRequested",f)):(x(),n.template=null)})}}}}],Te=["$compile",function(a){return{restrict:"ECA",
+priority:-400,require:"ngInclude",link:function(b,d,c,e){/SVG/.test(d[0].toString())?(d.empty(),a(Mc(e.template,W).childNodes)(b,function(a){d.append(a)},{futureParentElement:d})):(d.html(e.template),a(d.contents())(b))}}}],De=Ka({priority:450,compile:function(){return{pre:function(a,b,d){a.$eval(d.ngInit)}}}}),Pe=function(){return{restrict:"A",priority:100,require:"ngModel",link:function(a,b,d,c){var e=b.attr(d.$attr.ngList)||", ",f="false"!==d.ngTrim,g=f?T(e):e;c.$parsers.push(function(a){if(!q(a)){var b=
+[];a&&n(a.split(g),function(a){a&&b.push(f?T(a):a)});return b}});c.$formatters.push(function(a){return E(a)?a.join(e):w});c.$isEmpty=function(a){return!a||!a.length}}}},nb="ng-valid",Nd="ng-invalid",Wa="ng-pristine",Lb="ng-dirty",Pd="ng-pending",mb=M("ngModel"),Fg=["$scope","$exceptionHandler","$attrs","$element","$parse","$animate","$timeout","$rootScope","$q","$interpolate",function(a,b,d,c,e,f,g,h,k,l){this.$modelValue=this.$viewValue=Number.NaN;this.$$rawModelValue=w;this.$validators={};this.$asyncValidators=
+{};this.$parsers=[];this.$formatters=[];this.$viewChangeListeners=[];this.$untouched=!0;this.$touched=!1;this.$pristine=!0;this.$dirty=!1;this.$valid=!0;this.$invalid=!1;this.$error={};this.$$success={};this.$pending=w;this.$name=l(d.name||"",!1)(a);this.$$parentForm=Kb;var m=e(d.ngModel),r=m.assign,t=m,s=r,y=null,A,p=this;this.$$setOptions=function(a){if((p.$options=a)&&a.getterSetter){var b=e(d.ngModel+"()"),f=e(d.ngModel+"($$$p)");t=function(a){var c=m(a);B(c)&&(c=b(a));return c};s=function(a,
+b){B(m(a))?f(a,{$$$p:p.$modelValue}):r(a,p.$modelValue)}}else if(!m.assign)throw mb("nonassign",d.ngModel,ua(c));};this.$render=z;this.$isEmpty=function(a){return q(a)||""===a||null===a||a!==a};var x=0;Kd({ctrl:this,$element:c,set:function(a,b){a[b]=!0},unset:function(a,b){delete a[b]},$animate:f});this.$setPristine=function(){p.$dirty=!1;p.$pristine=!0;f.removeClass(c,Lb);f.addClass(c,Wa)};this.$setDirty=function(){p.$dirty=!0;p.$pristine=!1;f.removeClass(c,Wa);f.addClass(c,Lb);p.$$parentForm.$setDirty()};
+this.$setUntouched=function(){p.$touched=!1;p.$untouched=!0;f.setClass(c,"ng-untouched","ng-touched")};this.$setTouched=function(){p.$touched=!0;p.$untouched=!1;f.setClass(c,"ng-touched","ng-untouched")};this.$rollbackViewValue=function(){g.cancel(y);p.$viewValue=p.$$lastCommittedViewValue;p.$render()};this.$validate=function(){if(!Q(p.$modelValue)||!isNaN(p.$modelValue)){var a=p.$$rawModelValue,b=p.$valid,c=p.$modelValue,d=p.$options&&p.$options.allowInvalid;p.$$runValidators(a,p.$$lastCommittedViewValue,
+function(e){d||b===e||(p.$modelValue=e?a:w,p.$modelValue!==c&&p.$$writeModelToScope())})}};this.$$runValidators=function(a,b,c){function d(){var c=!0;n(p.$validators,function(d,e){var g=d(a,b);c=c&&g;f(e,g)});return c?!0:(n(p.$asyncValidators,function(a,b){f(b,null)}),!1)}function e(){var c=[],d=!0;n(p.$asyncValidators,function(e,g){var h=e(a,b);if(!h||!B(h.then))throw mb("nopromise",h);f(g,w);c.push(h.then(function(){f(g,!0)},function(a){d=!1;f(g,!1)}))});c.length?k.all(c).then(function(){g(d)},
+z):g(!0)}function f(a,b){h===x&&p.$setValidity(a,b)}function g(a){h===x&&c(a)}x++;var h=x;(function(){var a=p.$$parserName||"parse";if(q(A))f(a,null);else return A||(n(p.$validators,function(a,b){f(b,null)}),n(p.$asyncValidators,function(a,b){f(b,null)})),f(a,A),A;return!0})()?d()?e():g(!1):g(!1)};this.$commitViewValue=function(){var a=p.$viewValue;g.cancel(y);if(p.$$lastCommittedViewValue!==a||""===a&&p.$$hasNativeValidators)p.$$lastCommittedViewValue=a,p.$pristine&&this.$setDirty(),this.$$parseAndValidate()};
+this.$$parseAndValidate=function(){var b=p.$$lastCommittedViewValue;if(A=q(b)?w:!0)for(var c=0;c<p.$parsers.length;c++)if(b=p.$parsers[c](b),q(b)){A=!1;break}Q(p.$modelValue)&&isNaN(p.$modelValue)&&(p.$modelValue=t(a));var d=p.$modelValue,e=p.$options&&p.$options.allowInvalid;p.$$rawModelValue=b;e&&(p.$modelValue=b,p.$modelValue!==d&&p.$$writeModelToScope());p.$$runValidators(b,p.$$lastCommittedViewValue,function(a){e||(p.$modelValue=a?b:w,p.$modelValue!==d&&p.$$writeModelToScope())})};this.$$writeModelToScope=
+function(){s(a,p.$modelValue);n(p.$viewChangeListeners,function(a){try{a()}catch(c){b(c)}})};this.$setViewValue=function(a,b){p.$viewValue=a;p.$options&&!p.$options.updateOnDefault||p.$$debounceViewValueCommit(b)};this.$$debounceViewValueCommit=function(b){var c=0,d=p.$options;d&&u(d.debounce)&&(d=d.debounce,Q(d)?c=d:Q(d[b])?c=d[b]:Q(d["default"])&&(c=d["default"]));g.cancel(y);c?y=g(function(){p.$commitViewValue()},c):h.$$phase?p.$commitViewValue():a.$apply(function(){p.$commitViewValue()})};a.$watch(function(){var b=
+t(a);if(b!==p.$modelValue&&(p.$modelValue===p.$modelValue||b===b)){p.$modelValue=p.$$rawModelValue=b;A=w;for(var c=p.$formatters,d=c.length,e=b;d--;)e=c[d](e);p.$viewValue!==e&&(p.$viewValue=p.$$lastCommittedViewValue=e,p.$render(),p.$$runValidators(b,e,z))}return b})}],Oe=["$rootScope",function(a){return{restrict:"A",require:["ngModel","^?form","^?ngModelOptions"],controller:Fg,priority:1,compile:function(b){b.addClass(Wa).addClass("ng-untouched").addClass(nb);return{pre:function(a,b,e,f){var g=
+f[0];b=f[1]||g.$$parentForm;g.$$setOptions(f[2]&&f[2].$options);b.$addControl(g);e.$observe("name",function(a){g.$name!==a&&g.$$parentForm.$$renameControl(g,a)});a.$on("$destroy",function(){g.$$parentForm.$removeControl(g)})},post:function(b,c,e,f){var g=f[0];if(g.$options&&g.$options.updateOn)c.on(g.$options.updateOn,function(a){g.$$debounceViewValueCommit(a&&a.type)});c.on("blur",function(c){g.$touched||(a.$$phase?b.$evalAsync(g.$setTouched):b.$apply(g.$setTouched))})}}}}}],Gg=/(\s+|^)default(\s+|$)/,
+Se=function(){return{restrict:"A",controller:["$scope","$attrs",function(a,b){var d=this;this.$options=Ma(a.$eval(b.ngModelOptions));u(this.$options.updateOn)?(this.$options.updateOnDefault=!1,this.$options.updateOn=T(this.$options.updateOn.replace(Gg,function(){d.$options.updateOnDefault=!0;return" "}))):this.$options.updateOnDefault=!0}]}},Ee=Ka({terminal:!0,priority:1E3}),Hg=M("ngOptions"),Ig=/^\s*([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+group\s+by\s+([\s\S]+?))?(?:\s+disable\s+when\s+([\s\S]+?))?\s+for\s+(?:([\$\w][\$\w]*)|(?:\(\s*([\$\w][\$\w]*)\s*,\s*([\$\w][\$\w]*)\s*\)))\s+in\s+([\s\S]+?)(?:\s+track\s+by\s+([\s\S]+?))?$/,
+Me=["$compile","$parse",function(a,b){function d(a,c,d){function e(a,b,c,d,f){this.selectValue=a;this.viewValue=b;this.label=c;this.group=d;this.disabled=f}function l(a){var b;if(!q&&Aa(a))b=a;else{b=[];for(var c in a)a.hasOwnProperty(c)&&"$"!==c.charAt(0)&&b.push(c)}return b}var m=a.match(Ig);if(!m)throw Hg("iexp",a,ua(c));var n=m[5]||m[7],q=m[6];a=/ as /.test(m[0])&&m[1];var s=m[9];c=b(m[2]?m[1]:n);var y=a&&b(a)||c,u=s&&b(s),p=s?function(a,b){return u(d,b)}:function(a){return Da(a)},x=function(a,
+b){return p(a,D(a,b))},v=b(m[2]||m[1]),w=b(m[3]||""),H=b(m[4]||""),A=b(m[8]),z={},D=q?function(a,b){z[q]=b;z[n]=a;return z}:function(a){z[n]=a;return z};return{trackBy:s,getTrackByValue:x,getWatchables:b(A,function(a){var b=[];a=a||[];for(var c=l(a),e=c.length,f=0;f<e;f++){var g=a===c?f:c[f],k=D(a[g],g),g=p(a[g],k);b.push(g);if(m[2]||m[1])g=v(d,k),b.push(g);m[4]&&(k=H(d,k),b.push(k))}return b}),getOptions:function(){for(var a=[],b={},c=A(d)||[],f=l(c),g=f.length,m=0;m<g;m++){var n=c===f?m:f[m],r=
+D(c[n],n),q=y(d,r),n=p(q,r),t=v(d,r),u=w(d,r),r=H(d,r),q=new e(n,q,t,u,r);a.push(q);b[n]=q}return{items:a,selectValueMap:b,getOptionFromViewValue:function(a){return b[x(a)]},getViewValueFromOption:function(a){return s?$.copy(a.viewValue):a.viewValue}}}}}var c=W.createElement("option"),e=W.createElement("optgroup");return{restrict:"A",terminal:!0,require:["select","?ngModel"],link:{pre:function(a,b,c,d){d[0].registerOption=z},post:function(b,g,h,k){function l(a,b){a.element=b;b.disabled=a.disabled;
+a.label!==b.label&&(b.label=a.label,b.textContent=a.label);a.value!==b.value&&(b.value=a.selectValue)}function m(a,b,c,d){b&&K(b.nodeName)===c?c=b:(c=d.cloneNode(!1),b?a.insertBefore(c,b):a.appendChild(c));return c}function r(a){for(var b;a;)b=a.nextSibling,Zb(a),a=b}function q(a){var b=x&&x[0],c=z&&z[0];if(b||c)for(;a&&(a===b||a===c||8===a.nodeType||"option"===oa(a)&&""===a.value);)a=a.nextSibling;return a}function s(){var a=B&&u.readValue();B=D.getOptions();var b={},d=g[0].firstChild;H&&g.prepend(x);
+d=q(d);B.items.forEach(function(a){var f,h;a.group?(f=b[a.group],f||(f=m(g[0],d,"optgroup",e),d=f.nextSibling,f.label=a.group,f=b[a.group]={groupElement:f,currentOptionElement:f.firstChild}),h=m(f.groupElement,f.currentOptionElement,"option",c),l(a,h),f.currentOptionElement=h.nextSibling):(h=m(g[0],d,"option",c),l(a,h),d=h.nextSibling)});Object.keys(b).forEach(function(a){r(b[a].currentOptionElement)});r(d);y.$render();if(!y.$isEmpty(a)){var f=u.readValue();(D.trackBy||p?ka(a,f):a===f)||(y.$setViewValue(f),
+y.$render())}}var y=k[1];if(y){var u=k[0],p=h.multiple,x;k=0;for(var v=g.children(),w=v.length;k<w;k++)if(""===v[k].value){x=v.eq(k);break}var H=!!x,z=A(c.cloneNode(!1));z.val("?");var B,D=d(h.ngOptions,g,b);p?(y.$isEmpty=function(a){return!a||0===a.length},u.writeValue=function(a){B.items.forEach(function(a){a.element.selected=!1});a&&a.forEach(function(a){(a=B.getOptionFromViewValue(a))&&!a.disabled&&(a.element.selected=!0)})},u.readValue=function(){var a=g.val()||[],b=[];n(a,function(a){(a=B.selectValueMap[a])&&
+!a.disabled&&b.push(B.getViewValueFromOption(a))});return b},D.trackBy&&b.$watchCollection(function(){if(E(y.$viewValue))return y.$viewValue.map(function(a){return D.getTrackByValue(a)})},function(){y.$render()})):(u.writeValue=function(a){var b=B.getOptionFromViewValue(a);b&&!b.disabled?g[0].value!==b.selectValue&&(z.remove(),H||x.remove(),g[0].value=b.selectValue,b.element.selected=!0,b.element.setAttribute("selected","selected")):null===a||H?(z.remove(),H||g.prepend(x),g.val(""),x.prop("selected",
+!0),x.attr("selected",!0)):(H||x.remove(),g.prepend(z),g.val("?"),z.prop("selected",!0),z.attr("selected",!0))},u.readValue=function(){var a=B.selectValueMap[g.val()];return a&&!a.disabled?(H||x.remove(),z.remove(),B.getViewValueFromOption(a)):null},D.trackBy&&b.$watch(function(){return D.getTrackByValue(y.$viewValue)},function(){y.$render()}));H?(x.remove(),a(x)(b),x.removeClass("ng-scope")):x=A(c.cloneNode(!1));s();b.$watchCollection(D.getWatchables,s)}}}}}],Fe=["$locale","$interpolate","$log",
+function(a,b,d){var c=/{}/g,e=/^when(Minus)?(.+)$/;return{link:function(f,g,h){function k(a){g.text(a||"")}var l=h.count,m=h.$attr.when&&g.attr(h.$attr.when),r=h.offset||0,t=f.$eval(m)||{},s={},u=b.startSymbol(),w=b.endSymbol(),p=u+l+"-"+r+w,x=$.noop,v;n(h,function(a,b){var c=e.exec(b);c&&(c=(c[1]?"-":"")+K(c[2]),t[c]=g.attr(h.$attr[b]))});n(t,function(a,d){s[d]=b(a.replace(c,p))});f.$watch(l,function(b){var c=parseFloat(b),e=isNaN(c);e||c in t||(c=a.pluralCat(c-r));c===v||e&&Q(v)&&isNaN(v)||(x(),
+e=s[c],q(e)?(null!=b&&d.debug("ngPluralize: no rule defined for '"+c+"' in "+m),x=z,k()):x=f.$watch(e,k),v=c)})}}}],Ge=["$parse","$animate",function(a,b){var d=M("ngRepeat"),c=function(a,b,c,d,k,l,m){a[c]=d;k&&(a[k]=l);a.$index=b;a.$first=0===b;a.$last=b===m-1;a.$middle=!(a.$first||a.$last);a.$odd=!(a.$even=0===(b&1))};return{restrict:"A",multiElement:!0,transclude:"element",priority:1E3,terminal:!0,$$tlb:!0,compile:function(e,f){var g=f.ngRepeat,h=W.createComment(" end ngRepeat: "+g+" "),k=g.match(/^\s*([\s\S]+?)\s+in\s+([\s\S]+?)(?:\s+as\s+([\s\S]+?))?(?:\s+track\s+by\s+([\s\S]+?))?\s*$/);
+if(!k)throw d("iexp",g);var l=k[1],m=k[2],r=k[3],q=k[4],k=l.match(/^(?:(\s*[\$\w]+)|\(\s*([\$\w]+)\s*,\s*([\$\w]+)\s*\))$/);if(!k)throw d("iidexp",l);var s=k[3]||k[1],u=k[2];if(r&&(!/^[$a-zA-Z_][$a-zA-Z0-9_]*$/.test(r)||/^(null|undefined|this|\$index|\$first|\$middle|\$last|\$even|\$odd|\$parent|\$root|\$id)$/.test(r)))throw d("badident",r);var z,p,x,v,B={$id:Da};q?z=a(q):(x=function(a,b){return Da(b)},v=function(a){return a});return function(a,e,f,k,l){z&&(p=function(b,c,d){u&&(B[u]=b);B[s]=c;B.$index=
+d;return z(a,B)});var q=ea();a.$watchCollection(m,function(f){var k,m,t=e[0],z,B=ea(),D,F,G,E,I,J,K;r&&(a[r]=f);if(Aa(f))I=f,m=p||x;else for(K in m=p||v,I=[],f)ra.call(f,K)&&"$"!==K.charAt(0)&&I.push(K);D=I.length;K=Array(D);for(k=0;k<D;k++)if(F=f===I?k:I[k],G=f[F],E=m(F,G,k),q[E])J=q[E],delete q[E],B[E]=J,K[k]=J;else{if(B[E])throw n(K,function(a){a&&a.scope&&(q[a.id]=a)}),d("dupes",g,E,G);K[k]={id:E,scope:w,clone:w};B[E]=!0}for(z in q){J=q[z];E=sb(J.clone);b.leave(E);if(E[0].parentNode)for(k=0,m=
+E.length;k<m;k++)E[k].$$NG_REMOVED=!0;J.scope.$destroy()}for(k=0;k<D;k++)if(F=f===I?k:I[k],G=f[F],J=K[k],J.scope){z=t;do z=z.nextSibling;while(z&&z.$$NG_REMOVED);J.clone[0]!=z&&b.move(sb(J.clone),null,A(t));t=J.clone[J.clone.length-1];c(J.scope,k,s,G,u,F,D)}else l(function(a,d){J.scope=d;var e=h.cloneNode(!1);a[a.length++]=e;b.enter(a,null,A(t));t=e;J.clone=a;B[J.id]=J;c(J.scope,k,s,G,u,F,D)});q=B})}}}}],He=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngShow,
+function(b){a[b?"removeClass":"addClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Ae=["$animate",function(a){return{restrict:"A",multiElement:!0,link:function(b,d,c){b.$watch(c.ngHide,function(b){a[b?"addClass":"removeClass"](d,"ng-hide",{tempClasses:"ng-hide-animate"})})}}}],Ie=Ka(function(a,b,d){a.$watch(d.ngStyle,function(a,d){d&&a!==d&&n(d,function(a,c){b.css(c,"")});a&&b.css(a)},!0)}),Je=["$animate",function(a){return{require:"ngSwitch",controller:["$scope",function(){this.cases={}}],
+link:function(b,d,c,e){var f=[],g=[],h=[],k=[],l=function(a,b){return function(){a.splice(b,1)}};b.$watch(c.ngSwitch||c.on,function(b){var c,d;c=0;for(d=h.length;c<d;++c)a.cancel(h[c]);c=h.length=0;for(d=k.length;c<d;++c){var q=sb(g[c].clone);k[c].$destroy();(h[c]=a.leave(q)).then(l(h,c))}g.length=0;k.length=0;(f=e.cases["!"+b]||e.cases["?"])&&n(f,function(b){b.transclude(function(c,d){k.push(d);var e=b.element;c[c.length++]=W.createComment(" end ngSwitchWhen: ");g.push({clone:c});a.enter(c,e.parent(),
+e)})})})}}}],Ke=Ka({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){c.cases["!"+d.ngSwitchWhen]=c.cases["!"+d.ngSwitchWhen]||[];c.cases["!"+d.ngSwitchWhen].push({transclude:e,element:b})}}),Le=Ka({transclude:"element",priority:1200,require:"^ngSwitch",multiElement:!0,link:function(a,b,d,c,e){c.cases["?"]=c.cases["?"]||[];c.cases["?"].push({transclude:e,element:b})}}),Ne=Ka({restrict:"EAC",link:function(a,b,d,c,e){if(!e)throw M("ngTransclude")("orphan",
+ua(b));e(function(a){b.empty();b.append(a)})}}),ne=["$templateCache",function(a){return{restrict:"E",terminal:!0,compile:function(b,d){"text/ng-template"==d.type&&a.put(d.id,b[0].text)}}}],Jg={$setViewValue:z,$render:z},Kg=["$element","$scope","$attrs",function(a,b,d){var c=this,e=new Sa;c.ngModelCtrl=Jg;c.unknownOption=A(W.createElement("option"));c.renderUnknownOption=function(b){b="? "+Da(b)+" ?";c.unknownOption.val(b);a.prepend(c.unknownOption);a.val(b)};b.$on("$destroy",function(){c.renderUnknownOption=
+z});c.removeUnknownOption=function(){c.unknownOption.parent()&&c.unknownOption.remove()};c.readValue=function(){c.removeUnknownOption();return a.val()};c.writeValue=function(b){c.hasOption(b)?(c.removeUnknownOption(),a.val(b),""===b&&c.emptyOption.prop("selected",!0)):null==b&&c.emptyOption?(c.removeUnknownOption(),a.val("")):c.renderUnknownOption(b)};c.addOption=function(a,b){Ra(a,'"option value"');""===a&&(c.emptyOption=b);var d=e.get(a)||0;e.put(a,d+1);c.ngModelCtrl.$render();b[0].hasAttribute("selected")&&
+(b[0].selected=!0)};c.removeOption=function(a){var b=e.get(a);b&&(1===b?(e.remove(a),""===a&&(c.emptyOption=w)):e.put(a,b-1))};c.hasOption=function(a){return!!e.get(a)};c.registerOption=function(a,b,d,e,l){if(e){var m;d.$observe("value",function(a){u(m)&&c.removeOption(m);m=a;c.addOption(a,b)})}else l?a.$watch(l,function(a,e){d.$set("value",a);e!==a&&c.removeOption(e);c.addOption(a,b)}):c.addOption(d.value,b);b.on("$destroy",function(){c.removeOption(d.value);c.ngModelCtrl.$render()})}}],oe=function(){return{restrict:"E",
+require:["select","?ngModel"],controller:Kg,priority:1,link:{pre:function(a,b,d,c){var e=c[1];if(e){var f=c[0];f.ngModelCtrl=e;b.on("change",function(){a.$apply(function(){e.$setViewValue(f.readValue())})});if(d.multiple){f.readValue=function(){var a=[];n(b.find("option"),function(b){b.selected&&a.push(b.value)});return a};f.writeValue=function(a){var c=new Sa(a);n(b.find("option"),function(a){a.selected=u(c.get(a.value))})};var g,h=NaN;a.$watch(function(){h!==e.$viewValue||ka(g,e.$viewValue)||(g=
+ha(e.$viewValue),e.$render());h=e.$viewValue});e.$isEmpty=function(a){return!a||0===a.length}}}},post:function(a,b,d,c){var e=c[1];if(e){var f=c[0];e.$render=function(){f.writeValue(e.$viewValue)}}}}}},qe=["$interpolate",function(a){return{restrict:"E",priority:100,compile:function(b,d){if(u(d.value))var c=a(d.value,!0);else{var e=a(b.text(),!0);e||d.$set("value",b.text())}return function(a,b,d){var k=b.parent();(k=k.data("$selectController")||k.parent().data("$selectController"))&&k.registerOption(a,
+b,d,c,e)}}}}],pe=na({restrict:"E",terminal:!1}),Gc=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){c&&(d.required=!0,c.$validators.required=function(a,b){return!d.required||!c.$isEmpty(b)},d.$observe("required",function(){c.$validate()}))}}},Fc=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e,f=d.ngPattern||d.pattern;d.$observe("pattern",function(a){F(a)&&0<a.length&&(a=new RegExp("^"+a+"$"));if(a&&!a.test)throw M("ngPattern")("noregexp",
+f,a,ua(b));e=a||w;c.$validate()});c.$validators.pattern=function(a,b){return c.$isEmpty(b)||q(e)||e.test(b)}}}}},Ic=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=-1;d.$observe("maxlength",function(a){a=Z(a);e=isNaN(a)?-1:a;c.$validate()});c.$validators.maxlength=function(a,b){return 0>e||c.$isEmpty(b)||b.length<=e}}}}},Hc=function(){return{restrict:"A",require:"?ngModel",link:function(a,b,d,c){if(c){var e=0;d.$observe("minlength",function(a){e=Z(a)||0;c.$validate()});
+c.$validators.minlength=function(a,b){return c.$isEmpty(b)||b.length>=e}}}}};S.angular.bootstrap?console.log("WARNING: Tried to load angular more than once."):(ge(),ie($),$.module("ngLocale",[],["$provide",function(a){function b(a){a+="";var b=a.indexOf(".");return-1==b?0:a.length-b-1}a.value("$locale",{DATETIME_FORMATS:{AMPMS:["AM","PM"],DAY:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),ERANAMES:["Before Christ","Anno Domini"],ERAS:["BC","AD"],FIRSTDAYOFWEEK:6,MONTH:"January February March April May June July August September October November December".split(" "),
+SHORTDAY:"Sun Mon Tue Wed Thu Fri Sat".split(" "),SHORTMONTH:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),STANDALONEMONTH:"January February March April May June July August September October November December".split(" "),WEEKENDRANGE:[5,6],fullDate:"EEEE, MMMM d, y",longDate:"MMMM d, y",medium:"MMM d, y h:mm:ss a",mediumDate:"MMM d, y",mediumTime:"h:mm:ss a","short":"M/d/yy h:mm a",shortDate:"M/d/yy",shortTime:"h:mm a"},NUMBER_FORMATS:{CURRENCY_SYM:"$",DECIMAL_SEP:".",GROUP_SEP:",",
+PATTERNS:[{gSize:3,lgSize:3,maxFrac:3,minFrac:0,minInt:1,negPre:"-",negSuf:"",posPre:"",posSuf:""},{gSize:3,lgSize:3,maxFrac:2,minFrac:2,minInt:1,negPre:"-\u00a4",negSuf:"",posPre:"\u00a4",posSuf:""}]},id:"en-us",pluralCat:function(a,c){var e=a|0,f=c;w===f&&(f=Math.min(b(a),3));Math.pow(10,f);return 1==e&&0==f?"one":"other"}})}]),A(W).ready(function(){ce(W,zc)}))})(window,document);!window.angular.$$csp().noInlineStyle&&window.angular.element(document.head).prepend('<style type="text/css">@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}</style>');
+//# sourceMappingURL=angular.min.js.map
diff --git a/turtles/bower_components/angular/angular.min.js.gzip b/turtles/bower_components/angular/angular.min.js.gzip
new file mode 100644
index 0000000000000000000000000000000000000000..317d3899f86c442ff4c4a9a1d77306a9cda7aca0
GIT binary patch
literal 54311
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

literal 0
HcmV?d00001

diff --git a/turtles/bower_components/angular/angular.min.js.map b/turtles/bower_components/angular/angular.min.js.map
new file mode 100644
index 000000000..207f079e4
--- /dev/null
+++ b/turtles/bower_components/angular/angular.min.js.map
@@ -0,0 +1,8 @@
+{
+"version":3,
+"file":"angular.min.js",
+"lineCount":297,
+"mappings":"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",
+"sources":["angular.js"],
+"names":["window","document","undefined","minErr","isArrayLike","obj","isWindow","isArray","isString","jqLite","length","Object","isNumber","Array","item","forEach","iterator","context","key","isFunction","hasOwnProperty","call","isPrimitive","isBlankObject","forEachSorted","keys","sort","i","reverseParams","iteratorFn","value","nextUid","uid","baseExtend","dst","objs","deep","h","$$hashKey","ii","isObject","j","jj","src","isDate","Date","valueOf","isRegExp","RegExp","nodeName","cloneNode","isElement","clone","extend","slice","arguments","merge","toInt","str","parseInt","inherit","parent","extra","create","noop","identity","$","valueFn","hasCustomToString","toString","isUndefined","isDefined","getPrototypeOf","isScope","$evalAsync","$watch","isBoolean","isTypedArray","TYPED_ARRAY_REGEXP","test","node","prop","attr","find","makeMap","items","split","nodeName_","element","lowercase","arrayRemove","array","index","indexOf","splice","copy","source","destination","copyRecurse","push","copyElement","stackSource","stackDest","ngMinErr","needsRecurse","constructor","getTime","match","lastIndex","shallowCopy","charAt","equals","o1","o2","t1","t2","keySet","createMap","concat","array1","array2","bind","self","fn","curryArgs","startIndex","apply","toJsonReplacer","val","toJson","pretty","JSON","stringify","fromJson","json","parse","timezoneToOffset","timezone","fallback","requestedTimezoneOffset","isNaN","convertTimezoneToLocal","date","reverse","timezoneOffset","getTimezoneOffset","setMinutes","getMinutes","minutes","startingTag","empty","e","elemHtml","append","html","nodeType","NODE_TYPE_TEXT","replace","tryDecodeURIComponent","decodeURIComponent","parseKeyValue","keyValue","splitPoint","substring","toKeyValue","parts","arrayValue","encodeUriQuery","join","encodeUriSegment","pctEncodeSpaces","encodeURIComponent","getNgAttribute","ngAttr","ngAttrPrefixes","getAttribute","angularInit","bootstrap","appElement","module","config","prefix","name","hasAttribute","candidate","querySelector","strictDi","modules","defaultConfig","doBootstrap","injector","tag","unshift","$provide","debugInfoEnabled","$compileProvider","createInjector","invoke","bootstrapApply","scope","compile","$apply","data","NG_ENABLE_DEBUG_INFO","NG_DEFER_BOOTSTRAP","angular","resumeBootstrap","angular.resumeBootstrap","extraModules","resumeDeferredBootstrap","reloadWithDebugInfo","location","reload","getTestability","rootElement","get","snake_case","separator","SNAKE_CASE_REGEXP","letter","pos","toLowerCase","bindJQuery","originalCleanData","bindJQueryFired","jqName","jq","jQuery","on","JQLitePrototype","isolateScope","controller","inheritedData","cleanData","jQuery.cleanData","elems","events","skipDestroyOnNextJQueryCleanData","elem","_data","$destroy","triggerHandler","JQLite","assertArg","arg","reason","assertArgFn","acceptArrayAnnotation","assertNotHasOwnProperty","getter","path","bindFnToScope","lastInstance","len","getBlockNodes","nodes","endNode","blockNodes","nextSibling","setupModuleLoader","ensure","factory","$injectorMinErr","$$minErr","requires","configFn","invokeLater","provider","method","insertMethod","queue","invokeQueue","moduleInstance","invokeLaterAndSetModuleName","recipeName","factoryFunction","$$moduleName","configBlocks","runBlocks","_invokeQueue","_configBlocks","_runBlocks","service","constant","decorator","animation","filter","directive","run","block","publishExternalAPI","version","uppercase","counter","csp","angularModule","ngModule","$$sanitizeUri","$$SanitizeUriProvider","$CompileProvider","a","htmlAnchorDirective","input","inputDirective","textarea","form","formDirective","script","scriptDirective","select","selectDirective","style","styleDirective","option","optionDirective","ngBind","ngBindDirective","ngBindHtml","ngBindHtmlDirective","ngBindTemplate","ngBindTemplateDirective","ngClass","ngClassDirective","ngClassEven","ngClassEvenDirective","ngClassOdd","ngClassOddDirective","ngCloak","ngCloakDirective","ngController","ngControllerDirective","ngForm","ngFormDirective","ngHide","ngHideDirective","ngIf","ngIfDirective","ngInclude","ngIncludeDirective","ngInit","ngInitDirective","ngNonBindable","ngNonBindableDirective","ngPluralize","ngPluralizeDirective","ngRepeat","ngRepeatDirective","ngShow","ngShowDirective","ngStyle","ngStyleDirective","ngSwitch","ngSwitchDirective","ngSwitchWhen","ngSwitchWhenDirective","ngSwitchDefault","ngSwitchDefaultDirective","ngOptions","ngOptionsDirective","ngTransclude","ngTranscludeDirective","ngModel","ngModelDirective","ngList","ngListDirective","ngChange","ngChangeDirective","pattern","patternDirective","ngPattern","required","requiredDirective","ngRequired","minlength","minlengthDirective","ngMinlength","maxlength","maxlengthDirective","ngMaxlength","ngValue","ngValueDirective","ngModelOptions","ngModelOptionsDirective","ngIncludeFillContentDirective","ngAttributeAliasDirectives","ngEventDirectives","$anchorScroll","$AnchorScrollProvider","$animate","$AnimateProvider","$animateCss","$CoreAnimateCssProvider","$$animateJs","$$CoreAnimateJsProvider","$$animateQueue","$$CoreAnimateQueueProvider","$$AnimateRunner","$$AnimateRunnerFactoryProvider","$$animateAsyncRun","$$AnimateAsyncRunFactoryProvider","$browser","$BrowserProvider","$cacheFactory","$CacheFactoryProvider","$controller","$ControllerProvider","$document","$DocumentProvider","$exceptionHandler","$ExceptionHandlerProvider","$filter","$FilterProvider","$$forceReflow","$$ForceReflowProvider","$interpolate","$InterpolateProvider","$interval","$IntervalProvider","$http","$HttpProvider","$httpParamSerializer","$HttpParamSerializerProvider","$httpParamSerializerJQLike","$HttpParamSerializerJQLikeProvider","$httpBackend","$HttpBackendProvider","$xhrFactory","$xhrFactoryProvider","$location","$LocationProvider","$log","$LogProvider","$parse","$ParseProvider","$rootScope","$RootScopeProvider","$q","$QProvider","$$q","$$QProvider","$sce","$SceProvider","$sceDelegate","$SceDelegateProvider","$sniffer","$SnifferProvider","$templateCache","$TemplateCacheProvider","$templateRequest","$TemplateRequestProvider","$$testability","$$TestabilityProvider","$timeout","$TimeoutProvider","$window","$WindowProvider","$$rAF","$$RAFProvider","$$jqLite","$$jqLiteProvider","$$HashMap","$$HashMapProvider","$$cookieReader","$$CookieReaderProvider","camelCase","SPECIAL_CHARS_REGEXP","_","offset","toUpperCase","MOZ_HACK_REGEXP","jqLiteAcceptsData","NODE_TYPE_ELEMENT","NODE_TYPE_DOCUMENT","jqLiteBuildFragment","tmp","fragment","createDocumentFragment","HTML_REGEXP","appendChild","createElement","TAG_NAME_REGEXP","exec","wrap","wrapMap","_default","innerHTML","XHTML_TAG_REGEXP","lastChild","childNodes","firstChild","textContent","createTextNode","argIsString","trim","jqLiteMinErr","parsed","SINGLE_TAG_REGEXP","jqLiteAddNodes","jqLiteClone","jqLiteDealoc","onlyDescendants","jqLiteRemoveData","querySelectorAll","descendants","l","jqLiteOff","type","unsupported","expandoStore","jqLiteExpandoStore","handle","removeHandler","listenerFns","removeEventListener","MOUSE_EVENT_MAP","expandoId","ng339","jqCache","createIfNecessary","jqId","jqLiteData","isSimpleSetter","isSimpleGetter","massGetter","jqLiteHasClass","selector","jqLiteRemoveClass","cssClasses","setAttribute","cssClass","jqLiteAddClass","existingClasses","root","elements","jqLiteController","jqLiteInheritedData","documentElement","names","parentNode","NODE_TYPE_DOCUMENT_FRAGMENT","host","jqLiteEmpty","removeChild","jqLiteRemove","keepData","jqLiteDocumentLoaded","action","win","readyState","setTimeout","getBooleanAttrName","booleanAttr","BOOLEAN_ATTR","BOOLEAN_ELEMENTS","createEventHandler","eventHandler","event","isDefaultPrevented","event.isDefaultPrevented","defaultPrevented","eventFns","eventFnsLength","immediatePropagationStopped","originalStopImmediatePropagation","stopImmediatePropagation","event.stopImmediatePropagation","stopPropagation","isImmediatePropagationStopped","event.isImmediatePropagationStopped","handlerWrapper","specialHandlerWrapper","defaultHandlerWrapper","handler","specialMouseHandlerWrapper","target","related","relatedTarget","jqLiteContains","$get","this.$get","hasClass","classes","addClass","removeClass","hashKey","nextUidFn","objType","HashMap","isolatedUid","this.nextUid","put","anonFn","args","fnText","STRIP_COMMENTS","FN_ARGS","modulesToLoad","supportObject","delegate","provider_","providerInjector","instantiate","providerCache","providerSuffix","enforceReturnValue","enforcedReturnValue","result","instanceInjector","factoryFn","enforce","loadModules","moduleFn","runInvokeQueue","invokeArgs","loadedModules","message","stack","createInternalInjector","cache","getService","serviceName","caller","INSTANTIATING","err","shift","locals","$inject","$$annotate","Type","instance","prototype","returnedValue","annotate","has","$injector","instanceCache","decorFn","origProvider","orig$get","origProvider.$get","origInstance","$delegate","autoScrollingEnabled","disableAutoScrolling","this.disableAutoScrolling","getFirstAnchor","list","some","scrollTo","scrollIntoView","scroll","yOffset","getComputedStyle","position","getBoundingClientRect","bottom","elemTop","top","scrollBy","hash","elm","getElementById","getElementsByName","autoScrollWatch","autoScrollWatchAction","newVal","oldVal","mergeClasses","b","splitClasses","klass","prepareAnimateOptions","options","Browser","completeOutstandingRequest","outstandingRequestCount","outstandingRequestCallbacks","pop","error","cacheStateAndFireUrlChange","pendingLocation","cacheState","fireUrlChange","history","state","cachedState","lastCachedState","lastBrowserUrl","url","lastHistoryState","urlChangeListeners","listener","clearTimeout","pendingDeferIds","isMock","$$completeOutstandingRequest","$$incOutstandingRequestCount","self.$$incOutstandingRequestCount","notifyWhenNoOutstandingRequests","self.notifyWhenNoOutstandingRequests","callback","href","baseElement","self.url","sameState","sameBase","stripHash","substr","self.state","urlChangeInit","onUrlChange","self.onUrlChange","$$applicationDestroyed","self.$$applicationDestroyed","off","$$checkUrlChange","baseHref","self.baseHref","defer","self.defer","delay","timeoutId","cancel","self.defer.cancel","deferId","cacheFactory","cacheId","refresh","entry","freshEnd","staleEnd","n","link","p","nextEntry","prevEntry","caches","size","stats","id","capacity","Number","MAX_VALUE","lruHash","lruEntry","remove","removeAll","destroy","info","cacheFactory.info","cacheFactory.get","$$sanitizeUriProvider","parseIsolateBindings","directiveName","isController","LOCAL_REGEXP","bindings","definition","scopeName","$compileMinErr","mode","collection","optional","attrName","assertValidDirectiveName","hasDirectives","COMMENT_DIRECTIVE_REGEXP","CLASS_DIRECTIVE_REGEXP","ALL_OR_NOTHING_ATTRS","REQUIRE_PREFIX_REGEXP","EVENT_HANDLER_ATTR_REGEXP","this.directive","registerDirective","directiveFactory","Suffix","directives","priority","require","restrict","bindToController","controllerAs","CNTRL_REG","$$bindings","$$isolateBindings","aHrefSanitizationWhitelist","this.aHrefSanitizationWhitelist","regexp","imgSrcSanitizationWhitelist","this.imgSrcSanitizationWhitelist","this.debugInfoEnabled","enabled","safeAddClass","$element","className","$compileNodes","transcludeFn","maxPriority","ignoreDirective","previousCompileContext","nodeValue","compositeLinkFn","compileNodes","$$addScopeClass","namespace","publicLinkFn","cloneConnectFn","needsNewScope","$parent","$new","parentBoundTranscludeFn","transcludeControllers","futureParentElement","$$boundTransclude","$linkNode","wrapTemplate","controllerName","$$addScopeInfo","nodeList","$rootElement","childLinkFn","childScope","childBoundTranscludeFn","stableNodeList","nodeLinkFnFound","linkFns","idx","nodeLinkFn","transcludeOnThisElement","createBoundTranscludeFn","transclude","templateOnThisElement","attrs","linkFnFound","Attributes","collectDirectives","applyDirectivesToNode","$$element","terminal","previousBoundTranscludeFn","boundTranscludeFn","transcludedScope","cloneFn","controllers","containingScope","$$transcluded","attrsMap","$attr","addDirective","directiveNormalize","isNgAttr","nAttrs","attributes","attrStartName","attrEndName","ngAttrName","NG_ATTR_BINDING","PREFIX_REGEXP","multiElementMatch","MULTI_ELEMENT_DIR_RE","directiveIsMultiElement","nName","addAttrInterpolateDirective","animVal","msie","addTextInterpolateDirective","NODE_TYPE_COMMENT","byPriority","groupScan","attrStart","attrEnd","depth","groupElementsLinkFnWrapper","linkFn","compileNode","templateAttrs","jqCollection","originalReplaceDirective","preLinkFns","postLinkFns","addLinkFns","pre","post","newIsolateScopeDirective","$$isolateScope","cloneAndAnnotateFn","getControllers","elementControllers","inheritType","dataName","setupControllers","controllerDirectives","controllerKey","$scope","$attrs","$transclude","controllerInstance","hasElementTranscludeDirective","linkNode","controllersBoundTransclude","cloneAttachFn","scopeToChild","controllerScope","removeScopeBindingWatches","newScopeDirective","templateDirective","$$originalDirective","initializeDirectiveBindings","$on","controllerDirective","identifier","removeControllerBindingWatches","controllerResult","invokeLinkFn","template","templateUrl","terminalPriority","nonTlbTranscludeDirective","hasTranscludeDirective","hasTemplate","$compileNode","$template","childTranscludeFn","$$start","$$end","directiveValue","assertNoDuplicate","$$tlb","createComment","replaceWith","replaceDirective","contents","$$newScope","denormalizeTemplate","removeComments","templateNamespace","newTemplateAttrs","templateDirectives","unprocessedDirectives","markDirectiveScope","mergeTemplateAttributes","compileTemplateUrl","Math","max","newScope","tDirectives","startAttrName","endAttrName","multiElement","srcAttr","dstAttr","$set","tAttrs","linkQueue","afterTemplateNodeLinkFn","afterTemplateChildLinkFn","beforeTemplateCompileNode","origAsyncDirective","derivedSyncDirective","then","content","tempTemplateAttrs","beforeTemplateLinkNode","linkRootElement","$$destroyed","oldClasses","delayedNodeLinkFn","ignoreChildLinkFn","diff","what","previousDirective","wrapModuleNameIfDefined","moduleName","text","interpolateFn","textInterpolateCompileFn","templateNode","templateNodeParent","hasCompileParent","$$addBindingClass","textInterpolateLinkFn","$$addBindingInfo","expressions","interpolateFnWatchAction","wrapper","getTrustedContext","attrNormalizedName","HTML","RESOURCE_URL","allOrNothing","trustedContext","attrInterpolatePreLinkFn","$$observers","newValue","$$inter","$$scope","oldValue","$updateClass","elementsToRemove","newNode","firstElementToRemove","removeCount","j2","replaceChild","hasData","expando","k","kk","annotation","removeWatchCollection","lastValue","parentGet","parentSet","compare","$observe","literal","assign","parentValueWatch","parentValue","$stateful","removeWatch","$watchCollection","removeWatches","attributesToCopy","$normalize","$addClass","classVal","$removeClass","newClasses","toAdd","tokenDifference","toRemove","writeAttr","booleanKey","aliasedKey","ALIASED_ATTR","observer","trimmedSrcset","srcPattern","rawUris","nbrUrisWith2parts","floor","innerIdx","lastTuple","removeAttr","listeners","startSymbol","endSymbol","binding","isolated","noTemplate","str1","str2","values","tokens1","tokens2","token","jqNodes","globals","register","this.register","allowGlobals","this.allowGlobals","addIdentifier","expression","later","ident","$controllerMinErr","controllerPrototype","exception","cause","serializeValue","v","toISOString","ngParamSerializer","params","jQueryLikeParamSerializer","serialize","toSerialize","topLevel","defaultHttpResponseTransform","headers","tempData","JSON_PROTECTION_PREFIX","contentType","jsonStart","JSON_START","JSON_ENDS","parseHeaders","line","headerVal","headerKey","headersGetter","headersObj","transformData","status","fns","defaults","transformResponse","transformRequest","d","common","CONTENT_TYPE_APPLICATION_JSON","patch","xsrfCookieName","xsrfHeaderName","paramSerializer","useApplyAsync","this.useApplyAsync","useLegacyPromise","useLegacyPromiseExtensions","this.useLegacyPromiseExtensions","interceptorFactories","interceptors","requestConfig","response","resp","reject","executeHeaderFns","headerContent","processedHeaders","headerFn","header","mergeHeaders","defHeaders","reqHeaders","defHeaderName","lowercaseDefHeaderName","reqHeaderName","chain","serverRequest","reqData","withCredentials","sendReq","promise","when","reversedInterceptors","interceptor","request","requestError","responseError","thenFn","rejectFn","success","promise.success","promise.error","$httpMinErrLegacyFn","done","headersString","statusText","resolveHttpPromise","resolvePromise","$applyAsync","$$phase","deferred","resolve","resolvePromiseWithResult","removePendingReq","pendingRequests","cachedResp","buildUrl","defaultCache","xsrfValue","urlIsSameOrigin","timeout","responseType","serializedParams","interceptorFactory","createShortMethods","createShortMethodsWithData","createXhr","XMLHttpRequest","createHttpBackend","callbacks","$browserDefer","rawDocument","jsonpReq","callbackId","async","body","called","addEventListener","timeoutRequest","jsonpDone","xhr","abort","completeRequest","open","setRequestHeader","onload","xhr.onload","responseText","urlResolve","protocol","getAllResponseHeaders","onerror","onabort","send","this.startSymbol","this.endSymbol","escape","ch","unescapeText","escapedStartRegexp","escapedEndRegexp","mustHaveExpression","parseStringifyInterceptor","getTrusted","$interpolateMinErr","interr","endIndex","parseFns","textLength","expressionPositions","startSymbolLength","exp","endSymbolLength","throwNoconcat","compute","interpolationFn","$$watchDelegate","$watchGroup","interpolateFnWatcher","oldValues","currValue","$interpolate.startSymbol","$interpolate.endSymbol","interval","count","invokeApply","hasParams","setInterval","clearInterval","iteration","skipApply","$$intervalId","tick","notify","intervals","interval.cancel","encodePath","segments","parseAbsoluteUrl","absoluteUrl","locationObj","parsedUrl","$$protocol","$$host","hostname","$$port","port","DEFAULT_PORTS","parseAppUrl","relativeUrl","prefixed","$$path","pathname","$$search","search","$$hash","beginsWith","begin","whole","trimEmptyHash","LocationHtml5Url","appBase","appBaseNoFile","basePrefix","$$html5","$$parse","this.$$parse","pathUrl","$locationMinErr","$$compose","this.$$compose","$$url","$$absUrl","$$parseLinkUrl","this.$$parseLinkUrl","relHref","appUrl","prevAppUrl","rewrittenUrl","LocationHashbangUrl","hashPrefix","withoutBaseUrl","withoutHashUrl","windowsFilePathExp","base","firstPathSegmentMatch","LocationHashbangInHtml5Url","locationGetter","property","locationGetterSetter","preprocess","html5Mode","requireBase","rewriteLinks","this.hashPrefix","this.html5Mode","setBrowserUrlWithFallback","oldUrl","oldState","$$state","afterLocationChange","$broadcast","absUrl","LocationMode","initialUrl","lastIndexOf","IGNORE_URI_REGEXP","ctrlKey","metaKey","shiftKey","which","button","absHref","preventDefault","initializing","newUrl","newState","$digest","$locationWatch","currentReplace","$$replace","urlOrStateChanged","debug","debugEnabled","this.debugEnabled","flag","formatError","Error","sourceURL","consoleLog","console","logFn","log","hasApply","arg1","arg2","warn","ensureSafeMemberName","fullExpression","$parseMinErr","getStringValue","ensureSafeObject","children","ensureSafeFunction","CALL","APPLY","BIND","ensureSafeAssignContext","Function","ifDefined","plusFn","r","findConstantAndWatchExpressions","ast","allConstants","argsToWatch","AST","Program","expr","Literal","toWatch","UnaryExpression","argument","BinaryExpression","left","right","LogicalExpression","ConditionalExpression","alternate","consequent","Identifier","MemberExpression","object","computed","CallExpression","callee","AssignmentExpression","ArrayExpression","ObjectExpression","properties","ThisExpression","getInputs","lastExpression","isAssignable","assignableAST","NGValueParameter","operator","isLiteral","ASTCompiler","astBuilder","ASTInterpreter","isPossiblyDangerousMemberName","getValueOf","objectValueOf","cacheDefault","cacheExpensive","expressionInputDirtyCheck","oldValueOfValue","inputsWatchDelegate","objectEquality","parsedExpression","prettyPrintExpression","inputExpressions","inputs","lastResult","oldInputValueOf","expressionInputWatch","newInputValue","oldInputValueOfValues","oldInputValues","expressionInputsWatch","changed","oneTimeWatchDelegate","unwatch","oneTimeWatch","oneTimeListener","old","$$postDigest","oneTimeLiteralWatchDelegate","isAllDefined","allDefined","constantWatchDelegate","constantWatch","constantListener","addInterceptor","interceptorFn","watchDelegate","useInputs","regularInterceptedExpression","oneTimeInterceptedExpression","noUnsafeEval","$parseOptions","expensiveChecks","$parseOptionsExpensive","oneTime","cacheKey","parseOptions","lexer","Lexer","parser","Parser","qFactory","nextTick","exceptionHandler","callOnce","resolveFn","Promise","simpleBind","scheduleProcessQueue","processScheduled","pending","Deferred","$qMinErr","TypeError","onFulfilled","onRejected","progressBack","catch","finally","handleCallback","$$reject","$$resolve","progress","makePromise","resolved","isResolved","callbackOutput","errback","$Q","Q","resolver","all","promises","results","requestAnimationFrame","webkitRequestAnimationFrame","cancelAnimationFrame","webkitCancelAnimationFrame","webkitCancelRequestAnimationFrame","rafSupported","raf","timer","supported","createChildScopeClass","ChildScope","$$watchers","$$nextSibling","$$childHead","$$childTail","$$listeners","$$listenerCount","$$watchersCount","$id","$$ChildScope","TTL","$rootScopeMinErr","lastDirtyWatch","applyAsyncId","digestTtl","this.digestTtl","destroyChildScope","$event","currentScope","cleanUpScope","$$prevSibling","$root","Scope","beginPhase","phase","incrementWatchersCount","current","decrementListenerCount","initWatchVal","flushApplyAsync","applyAsyncQueue","scheduleApplyAsync","isolate","child","watchExp","watcher","last","eq","deregisterWatch","watchExpressions","watchGroupAction","changeReactionScheduled","firstRun","newValues","deregisterFns","shouldCall","deregisterWatchGroup","unwatchFn","watchGroupSubAction","$watchCollectionInterceptor","_value","bothNaN","newItem","oldItem","internalArray","oldLength","changeDetected","newLength","internalObject","veryOldValue","trackVeryOldValue","changeDetector","initRun","$watchCollectionAction","watch","watchers","dirty","ttl","watchLog","logIdx","asyncTask","asyncQueue","$eval","msg","next","postDigestQueue","eventName","this.$watchGroup","$applyAsyncExpression","namedListeners","indexOfListener","$emit","targetScope","listenerArgs","$$asyncQueue","$$postDigestQueue","$$applyAsyncQueue","sanitizeUri","uri","isImage","regex","normalizedVal","adjustMatcher","matcher","$sceMinErr","escapeForRegexp","adjustMatchers","matchers","adjustedMatchers","SCE_CONTEXTS","resourceUrlWhitelist","resourceUrlBlacklist","this.resourceUrlWhitelist","this.resourceUrlBlacklist","matchUrl","generateHolderType","Base","holderType","trustedValue","$$unwrapTrustedValue","this.$$unwrapTrustedValue","holderType.prototype.valueOf","holderType.prototype.toString","htmlSanitizer","trustedValueHolderBase","byType","CSS","URL","JS","trustAs","Constructor","maybeTrusted","allowed","this.enabled","sce","isEnabled","sce.isEnabled","sce.getTrusted","parseAs","sce.parseAs","enumValue","lName","eventSupport","android","userAgent","navigator","boxee","vendorPrefix","vendorRegex","bodyStyle","transitions","animations","webkitTransition","webkitAnimation","pushState","hasEvent","divElm","handleRequestFn","tpl","ignoreRequestError","totalPendingRequests","getTrustedResourceUrl","transformer","httpOptions","handleError","testability","testability.findBindings","opt_exactMatch","getElementsByClassName","matches","dataBinding","bindingName","testability.findModels","prefixes","attributeEquals","testability.getLocation","testability.setLocation","testability.whenStable","deferreds","$$timeoutId","timeout.cancel","urlParsingNode","requestUrl","originUrl","$$CookieReader","safeDecodeURIComponent","lastCookies","lastCookieString","cookieArray","cookie","currentCookieString","filters","suffix","currencyFilter","dateFilter","filterFilter","jsonFilter","limitToFilter","lowercaseFilter","numberFilter","orderByFilter","uppercaseFilter","comparator","matchAgainstAnyProp","getTypeForFilter","expressionType","predicateFn","createPredicateFn","shouldMatchPrimitives","actual","expected","deepCompare","dontMatchWholeObject","actualType","expectedType","expectedVal","matchAnyProperty","actualVal","$locale","formats","NUMBER_FORMATS","amount","currencySymbol","fractionSize","CURRENCY_SYM","PATTERNS","maxFrac","formatNumber","GROUP_SEP","DECIMAL_SEP","number","numStr","exponent","digits","numberOfIntegerDigits","zeros","ZERO_CHAR","MAX_DIGITS","roundNumber","parsedNumber","minFrac","fractionLen","min","roundAt","digit","carry","reduceRight","groupSep","decimalSep","isInfinity","isFinite","isZero","abs","formattedText","integerLen","decimals","reduce","groups","lgSize","gSize","negPre","negSuf","posPre","posSuf","padNumber","num","neg","dateGetter","dateStrGetter","shortForm","getFirstThursdayOfYear","year","dayOfWeekOnFirst","getDay","weekGetter","firstThurs","getFullYear","thisThurs","getMonth","getDate","round","eraGetter","ERAS","jsonStringToDate","string","R_ISO8601_STR","tzHour","tzMin","dateSetter","setUTCFullYear","setFullYear","timeSetter","setUTCHours","setHours","m","s","ms","parseFloat","format","DATETIME_FORMATS","NUMBER_STRING","DATE_FORMATS_SPLIT","dateTimezoneOffset","DATE_FORMATS","spacing","limit","Infinity","processPredicates","sortPredicate","reverseOrder","map","predicate","descending","predicates","compareValues","getComparisonObject","predicateValues","doComparison","v1","v2","ngDirective","FormController","controls","$error","$$success","$pending","$name","$dirty","$pristine","$valid","$invalid","$submitted","$$parentForm","nullFormCtrl","$rollbackViewValue","form.$rollbackViewValue","control","$commitViewValue","form.$commitViewValue","$addControl","form.$addControl","$$renameControl","form.$$renameControl","newName","oldName","$removeControl","form.$removeControl","$setValidity","addSetValidityMethod","ctrl","set","unset","$setDirty","form.$setDirty","PRISTINE_CLASS","DIRTY_CLASS","$setPristine","form.$setPristine","setClass","SUBMITTED_CLASS","$setUntouched","form.$setUntouched","$setSubmitted","form.$setSubmitted","stringBasedInputType","$formatters","$isEmpty","baseInputType","composing","ev","ngTrim","$viewValue","$$hasNativeValidators","$setViewValue","deferListener","origValue","keyCode","$render","ctrl.$render","createDateParser","mapping","iso","ISO_DATE_REGEXP","yyyy","MM","dd","HH","getHours","mm","ss","getSeconds","sss","getMilliseconds","part","NaN","createDateInputType","parseDate","dynamicDateInputType","isValidDate","parseObservedDateValue","badInputChecker","$options","previousDate","$$parserName","$parsers","parsedDate","ngModelMinErr","ngMin","minVal","$validators","ctrl.$validators.min","$validate","ngMax","maxVal","ctrl.$validators.max","validity","VALIDITY_STATE_PROPERTY","badInput","typeMismatch","parseConstantExpr","parseFn","classDirective","arrayDifference","arrayClasses","digestClassCounts","classCounts","classesToUpdate","ngClassWatchAction","$index","old$index","mod","cachedToggleClass","switchValue","classCache","toggleValidationCss","validationErrorKey","isValid","VALID_CLASS","INVALID_CLASS","setValidity","isObjectEmpty","PENDING_CLASS","combinedState","REGEX_STRING_REGEXP","documentMode","rules","ngCspElement","ngCspAttribute","noInlineStyle","name_","el","full","major","minor","dot","codeName","JQLite._data","mouseleave","mouseenter","optgroup","tbody","tfoot","colgroup","caption","thead","th","td","Node","contains","compareDocumentPosition","ready","trigger","fired","removeData","jqLiteHasData","removeAttribute","css","NODE_TYPE_ATTRIBUTE","lowercasedName","specified","getNamedItem","ret","getText","$dv","multiple","selected","nodeCount","jqLiteOn","types","addHandler","noEventListener","one","onFn","replaceNode","insertBefore","contentDocument","prepend","wrapNode","detach","after","newElement","toggleClass","condition","classCondition","nextElementSibling","getElementsByTagName","extraParameters","dummyEvent","handlerArgs","eventFnsCopy","arg3","unbind","FN_ARG_SPLIT","FN_ARG","argDecl","underscore","$animateMinErr","postDigestElements","updateData","handleCSSClassChanges","existing","pin","domOperation","from","to","classesAdded","add","classesRemoved","runner","complete","$$registeredAnimations","classNameFilter","this.classNameFilter","$$classNameFilter","reservedRegex","NG_ANIMATE_CLASSNAME","domInsert","parentElement","afterElement","afterNode","ELEMENT_NODE","previousElementSibling","end","enter","move","leave","addclass","animate","tempClasses","waitForTick","waitQueue","passed","AnimateRunner","setHost","rafTick","_doneCallbacks","_tick","this._tick","doc","hidden","_state","AnimateRunner.chain","AnimateRunner.all","runners","onProgress","DONE_COMPLETE_STATE","getPromise","resolveHandler","rejectHandler","pause","resume","_resolve","INITIAL_STATE","DONE_PENDING_STATE","initialOptions","closed","$$prepared","cleanupStyles","start","domNode","offsetWidth","APPLICATION_JSON","$httpMinErr","$interpolateMinErr.throwNoconcat","$interpolateMinErr.interr","PATH_MATCH","locationPrototype","paramValue","Location","Location.prototype.state","OPERATORS","ESCAPE","lex","tokens","readString","peek","readNumber","isIdent","readIdent","is","isWhitespace","ch2","ch3","op2","op3","op1","throwError","chars","isExpOperator","colStr","peekCh","quote","rawString","hex","String","fromCharCode","rep","ExpressionStatement","Property","program","expressionStatement","expect","filterChain","assignment","ternary","logicalOR","consume","logicalAND","equality","relational","additive","multiplicative","unary","primary","arrayDeclaration","constants","parseArguments","baseExpression","peekToken","kind","e1","e2","e3","e4","peekAhead","t","nextId","vars","own","assignable","stage","computing","recurse","return_","generateFunction","fnKey","intoId","watchId","fnString","USE","STRICT","filterPrefix","watchFns","varsPrefix","section","nameId","recursionFn","skipWatchIdCheck","if_","lazyAssign","computedMember","lazyRecurse","plus","not","getHasOwnProperty","nonComputedMember","addEnsureSafeObject","notNull","addEnsureSafeMemberName","addEnsureSafeFunction","member","addEnsureSafeAssignContext","filterName","defaultValue","stringEscapeRegex","stringEscapeFn","c","charCodeAt","skip","init","fn.assign","rhs","lhs","unary+","unary-","unary!","binary+","binary-","binary*","binary/","binary%","binary===","binary!==","binary==","binary!=","binary<","binary>","binary<=","binary>=","binary&&","binary||","ternary?:","astCompiler","yy","y","MMMM","MMM","M","H","hh","EEEE","EEE","ampmGetter","AMPMS","Z","timeZoneGetter","zone","paddedZone","ww","w","G","GG","GGG","GGGG","longEraGetter","ERANAMES","xlinkHref","propName","defaultLinkFn","normalized","ngBooleanAttrWatchAction","htmlAttr","ngAttrAliasWatchAction","nullFormRenameControl","formDirectiveFactory","isNgForm","getSetter","ngFormCompile","formElement","nameAttr","ngFormPreLink","ctrls","handleFormSubmission","setter","URL_REGEXP","EMAIL_REGEXP","NUMBER_REGEXP","DATE_REGEXP","DATETIMELOCAL_REGEXP","WEEK_REGEXP","MONTH_REGEXP","TIME_REGEXP","inputType","textInputType","weekParser","isoWeek","existingDate","week","hours","seconds","milliseconds","addDays","numberInputType","urlInputType","ctrl.$validators.url","modelValue","viewValue","emailInputType","email","ctrl.$validators.email","radioInputType","checked","checkboxInputType","trueValue","ngTrueValue","falseValue","ngFalseValue","ctrl.$isEmpty","CONSTANT_VALUE_REGEXP","tplAttr","ngValueConstantLink","ngValueLink","valueWatchAction","$compile","ngBindCompile","templateElement","ngBindLink","ngBindWatchAction","ngBindTemplateCompile","ngBindTemplateLink","ngBindHtmlCompile","tElement","ngBindHtmlGetter","ngBindHtmlWatch","ngBindHtmlLink","ngBindHtmlWatchAction","getTrustedHtml","$viewChangeListeners","forceAsyncEvents","ngEventHandler","previousElements","ngIfWatchAction","srcExp","onloadExp","autoScrollExp","autoscroll","changeCounter","previousElement","currentElement","cleanupLastIncludeContent","ngIncludeWatchAction","afterAnimation","thisChangeId","namespaceAdaptedClone","trimValues","NgModelController","$modelValue","$$rawModelValue","$asyncValidators","$untouched","$touched","parsedNgModel","parsedNgModelAssign","ngModelGet","ngModelSet","pendingDebounce","parserValid","$$setOptions","this.$$setOptions","getterSetter","invokeModelGetter","invokeModelSetter","$$$p","this.$isEmpty","currentValidationRunId","this.$setPristine","this.$setDirty","this.$setUntouched","UNTOUCHED_CLASS","TOUCHED_CLASS","$setTouched","this.$setTouched","this.$rollbackViewValue","$$lastCommittedViewValue","this.$validate","prevValid","prevModelValue","allowInvalid","$$runValidators","allValid","$$writeModelToScope","this.$$runValidators","doneCallback","processSyncValidators","syncValidatorsValid","validator","processAsyncValidators","validatorPromises","validationDone","localValidationRunId","processParseErrors","errorKey","this.$commitViewValue","$$parseAndValidate","this.$$parseAndValidate","this.$$writeModelToScope","this.$setViewValue","updateOnDefault","$$debounceViewValueCommit","this.$$debounceViewValueCommit","debounceDelay","debounce","ngModelWatch","formatters","ngModelCompile","ngModelPreLink","modelCtrl","formCtrl","ngModelPostLink","updateOn","DEFAULT_REGEXP","that","ngOptionsMinErr","NG_OPTIONS_REGEXP","parseOptionsExpression","optionsExp","selectElement","Option","selectValue","label","group","disabled","getOptionValuesKeys","optionValues","optionValuesKeys","keyName","itemKey","valueName","selectAs","trackBy","viewValueFn","trackByFn","getTrackByValueFn","getHashOfValue","getTrackByValue","getLocals","displayFn","groupByFn","disableWhenFn","valuesFn","getWatchables","watchedArray","optionValuesLength","disableWhen","getOptions","optionItems","selectValueMap","optionItem","getOptionFromViewValue","getViewValueFromOption","optionTemplate","optGroupTemplate","ngOptionsPreLink","registerOption","ngOptionsPostLink","updateOptionElement","addOrReuseElement","removeExcessElements","skipEmptyAndUnknownOptions","emptyOption_","emptyOption","unknownOption_","unknownOption","updateOptions","previousValue","selectCtrl","readValue","groupMap","providedEmptyOption","updateOption","optionElement","groupElement","currentOptionElement","ngModelCtrl","nextValue","ngModelCtrl.$isEmpty","writeValue","selectCtrl.writeValue","selectCtrl.readValue","selectedValues","selections","selectedOption","BRACE","IS_WHEN","updateElementText","newText","numberExp","whenExp","whens","whensExpFns","braceReplacement","watchRemover","lastCount","attributeName","tmpMatch","whenKey","ngPluralizeWatchAction","countIsNaN","pluralCat","whenExpFn","ngRepeatMinErr","updateScope","valueIdentifier","keyIdentifier","arrayLength","$first","$last","$middle","$odd","$even","ngRepeatCompile","ngRepeatEndComment","aliasAs","trackByExp","trackByExpGetter","trackByIdExpFn","trackByIdArrayFn","trackByIdObjFn","hashFnLocals","ngRepeatLink","lastBlockMap","ngRepeatAction","previousNode","nextNode","nextBlockMap","collectionLength","trackById","collectionKeys","nextBlockOrder","trackByIdFn","blockKey","ngRepeatTransclude","ngShowWatchAction","NG_HIDE_CLASS","NG_HIDE_IN_PROGRESS_CLASS","ngHideWatchAction","ngStyleWatchAction","newStyles","oldStyles","ngSwitchController","cases","selectedTranscludes","selectedElements","previousLeaveAnimations","selectedScopes","spliceFactory","ngSwitchWatchAction","selectedTransclude","caseElement","selectedScope","anchor","noopNgModelController","SelectController","optionsMap","renderUnknownOption","self.renderUnknownOption","unknownVal","removeUnknownOption","self.removeUnknownOption","self.readValue","self.writeValue","hasOption","addOption","self.addOption","removeOption","self.removeOption","self.hasOption","self.registerOption","optionScope","optionAttrs","interpolateValueFn","interpolateTextFn","valueAttributeObserveAction","interpolateWatchAction","selectPreLink","lastView","lastViewRef","selectMultipleWatch","selectPostLink","ngModelCtrl.$render","selectCtrlName","ctrl.$validators.required","patternExp","ctrl.$validators.pattern","intVal","ctrl.$validators.maxlength","ctrl.$validators.minlength","getDecimals","opt_precision","pow","ONE","OTHER","$$csp","head"]
+}
diff --git a/turtles/bower_components/angular/bower.json b/turtles/bower_components/angular/bower.json
new file mode 100644
index 000000000..186a90845
--- /dev/null
+++ b/turtles/bower_components/angular/bower.json
@@ -0,0 +1,8 @@
+{
+  "name": "angular",
+  "version": "1.4.9",
+  "main": "./angular.js",
+  "ignore": [],
+  "dependencies": {
+  }
+}
diff --git a/turtles/bower_components/angular/index.js b/turtles/bower_components/angular/index.js
new file mode 100644
index 000000000..5c1aafcca
--- /dev/null
+++ b/turtles/bower_components/angular/index.js
@@ -0,0 +1,2 @@
+require('./angular');
+module.exports = angular;
diff --git a/turtles/bower_components/angular/package.json b/turtles/bower_components/angular/package.json
new file mode 100644
index 000000000..1d6c92c45
--- /dev/null
+++ b/turtles/bower_components/angular/package.json
@@ -0,0 +1,25 @@
+{
+  "name": "angular",
+  "version": "1.4.9",
+  "description": "HTML enhanced for web apps",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.js.git"
+  },
+  "keywords": [
+    "angular",
+    "framework",
+    "browser",
+    "client-side"
+  ],
+  "author": "Angular Core Team <angular-core+npm@google.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/angular.js/issues"
+  },
+  "homepage": "http://angularjs.org"
+}
diff --git a/turtles/contact.html b/turtles/contact.html
new file mode 100644
index 000000000..7ddedad3c
--- /dev/null
+++ b/turtles/contact.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>Turtle Time Calc</title>
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/main.css">
+		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
+		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
+		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
+		<script src="app/lib/moment.min.js"></script>
+		<script src="app/lib/angular-local-storage.min.js"></script>
+		<script src="app/lib/angular-translate.min.js"></script>
+		<script src="app/lib/angular-timer.min.js"></script>
+		<script src="app/lib/humanize-duration.js"></script>
+		<script src="app/lib/ng-table.min.js"></script>
+		<script src="app/lib/ui-bootstrap-tpls-0.13.0.min.js"></script>
+		<script src="app/lib/angular-polyglot.language.switcher.js"></script>
+		<script src="app/lib/momentjs/locale/de.js"></script>
+		<script src="app/lib/momentjs/locale/es.js"></script>
+		<script src="app/lib/bower_components/angular-animate/angular-animate.min.js"></script>
+		<script src="app/app.js"></script>
+		<script src="app/controllers/eventCtrl.js"></script>
+		<script src="app/controllers/localeCtrl.js"></script>
+		<script src="app/controllers/navbarCtrl.js"></script>
+		<script src="app/directives/eventDirective.js"></script>
+		<script src="app/directives/collapseDirective.js"></script>
+		<script src="app/config/localizeConfig.js"></script>
+		<script>
+		  (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-62547536-1', 'auto');
+		  ga('send', 'pageview');
+
+		</script>
+	</head>
+
+	<body ng-app="app" ng-controller="LocaleCtrl as locale" ng-cloak>
+		
+		<nav class="navbar navbar-default" ng-controller="NavbarCtrl" ng-click="$event.stopPropagation()">
+				<div class="container">
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle" ng-click="isCollapsed=!isCollapsed">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						</button>
+					</div>
+					<div class="navbar-collapse init" collapse="isCollapsed">
+						<ul class="nav navbar-nav">
+							<li><a href="index.html">{{ 'NAV_TURTLE' | translate }}</a></li>
+							<li><a href="barrel.html">{{ 'NAV_BARREL' | translate }}</a></li>
+							<li><a href="event.html">{{ 'NAV_EVENT' | translate }}</a></li>
+							<li class="active"><a href="contact.html">{{'NAV_CONTACT' | translate}}</a></li>
+							<li id="settings"><a href="settings.html">{{ 'NAV_SETTINGS' | translate }}</a></li>
+						</ul>
+						<div class="language-picker nav pull-right">
+							<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" selected-lang="{{locale.flag}}" language-changed-callback="onLanguageChanged(lang)"></pls>
+						</div>
+					</div>
+				</div>
+		</nav>
+
+	<div class="container">
+		<iframe src="http://chrisyung.me/contact_layout.html" frameborder="0"></iframe>
+	</div>
+
+	</body>
+
+</html>
diff --git a/turtles/contact_layout.html b/turtles/contact_layout.html
new file mode 100644
index 000000000..0c0cb4704
--- /dev/null
+++ b/turtles/contact_layout.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>Contact</title>
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/contact.css">
+		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
+		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
+		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+		<script src="app/app2.js"></script>
+		<script src="app/controllers/contactCtrl.js"></script>
+		<script src="app/lib/promise-tracker.js"></script>
+
+<!-- 		<script>
+			(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-62547536-1', 'auto');
+			ga('send', 'pageview');
+
+		</script> -->
+	</head>
+
+	<body ng-app="app">
+
+		<div class="container" data-ng-controller="ContactCtrl">
+			<h2>Please read the FAQ first.</h2>
+			<form name="helpForm" novalidate role="form">
+				<div class="form-group">
+					<label for="name">Name </label>
+					<span class="label label-danger" data-ng-show="submitted && helpForm.name.$error.required">Required!</span>
+					<input type="text" name="name" data-ng-model="name" class="form-control" required />
+				</div>
+
+				<div class="form-group">
+					<label for="email">E-mail address (optional)</label>
+					<span class="label label-danger" data-ng-show="submitted && helpForm.email.$error.required">Required!</span>
+					<span class="label label-danger" data-ng-show="submitted && helpForm.$error.email">Invalid email!</span>
+					<input type="email" name="email" data-ng-model="email" class="form-control" />  
+				</div>
+
+				<div class="form-group">
+					<label for="subjectList">Subject</label>
+					<span class="label label-danger" data-ng-show="submitted && helpForm.subjectList.$error.required">Required!</span>
+					<select name="subjectList" data-ng-model="subjectList" data-ng-options="subject for subject in subjectListOptions" class="form-control" required>
+					</select>
+				</div>
+
+				<div class="form-group">
+					<label for="comments">Description</label>
+					<span class="label label-danger" data-ng-show="submitted && helpForm.comments.$error.required">Required!</span>
+					<textarea name="comments" data-ng-model="comments" class="form-control" required></textarea>
+				</div>
+
+				<button data-ng-disabled="progress.active()" data-ng-click="submit(helpForm)" class="btn btn-default">Submit</button>
+			</form>
+			<div id="messages" class="alert alert-success" data-ng-show="messages" data-ng-bind="messages"></div>
+			<div data-ng-show="progress.active()">Sending&hellip;</div>
+			<h2>FAQ</h2>
+			<h3>My time is incorrect and there's no special event going on (such as extra turtle times that need to be updated).</h3>
+			<p>I need to be able to replicate the bug to fix it. Please include your OS, browser, time zone, and perhaps an email so I can follow up.</p>
+			<h3>Do I need to do anything for daylight savings?</h3>
+			<p>No.</p>
+			<h3>When is ______ coming?</h3>
+			<p>For the 24-hour event and fortnight isles, you can see the order <a href="http://optc-guide.com/boss-guides-events/">here</a>. As for everything else(Sugofest, colored turtles, etc.), I find out the same time you do via the in-game news.</p>
+			<h3>Will you release an app for iOS/Android?</h3>
+			<p>Eventually, yes. But it's low on the priority list since I have no experience developing apps.</p>
+			<h3>My time zone is incorrect.</h3>
+			<p>The library I'm using to detect the time zone has a bug where it doesn't detect some places properly such as NZ/Auckland. However, the calculator will still be correct because it doesn't rely on your time zone, but the current time on your computer.</p>
+		</div>
+
+	</body>
+
+</html>
diff --git a/turtles/css/angular-dropdowns.css b/turtles/css/angular-dropdowns.css
new file mode 100644
index 000000000..eb6020102
--- /dev/null
+++ b/turtles/css/angular-dropdowns.css
@@ -0,0 +1,228 @@
+/****** dropdown-select *******/
+
+.wrap-dd-select {
+  /* Size and position */
+  position: relative;
+  width: 200px;
+  margin: 0 auto;
+  padding: 10px;
+
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  user-select:none;
+    
+  /* Styles */
+  background: #fff;
+  border-radius: 7px;
+  border: 1px solid rgba(0,0,0,0.15);
+  box-shadow: 0 1px 1px rgba(50,50,50,0.1);
+  cursor: pointer;
+  outline: none;
+
+  /* Font settings */
+  font-weight: bold;
+  color: #8AA8BD;
+}
+
+.wrap-dd-select:after {
+  content: "";
+  width: 0;
+  height: 0;
+  position: absolute;
+  right: 15px;
+  top: 50%;
+  margin-top: -3px;
+  border-width: 6px 6px 0 6px;
+  border-style: solid;
+  border-color: #8aa8bd transparent;
+}
+
+.wrap-dd-select .dropdown {
+  /* Size & position */
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+
+  /* Styles */
+  background: white;
+  padding: 0;
+  border-radius: inherit;
+  border: 1px solid rgba(0,0,0,0.17);
+  box-shadow: 0 0 5px rgba(0,0,0,0.1);
+  font-weight: normal;
+  list-style: none;
+
+  /* Hiding */
+  visibility: hidden;
+}
+
+.wrap-dd-select .dropdown li.divider {
+  padding: 2px 0;
+  background: #e6e8ea;
+}
+
+.wrap-dd-select .dropdown li.divider-label {
+  background: #e6e8ea;
+  cursor: default;
+  color: #000;
+  padding: 10px 0;
+}
+
+.wrap-dd-select .dropdown li a {
+  display: block;
+  padding: 10px;
+  text-decoration: none;
+  color: #8aa8bd;
+  border-bottom: 1px solid #e6e8ea;
+  box-shadow: inset 0 1px 0 rgba(255,255,255,1);
+  cursor: pointer;
+}
+
+.wrap-dd-select .dropdown li i {
+  float: right;
+  color: inherit;
+}
+
+.wrap-dd-select .dropdown li:first-of-type a {
+  border-radius: 7px 7px 0 0;
+}
+
+.wrap-dd-select .dropdown li:last-of-type a {
+  border-radius: 0 0 7px 7px;
+  border: none;
+}
+
+/* Hover state */
+
+.wrap-dd-select .dropdown li:hover a {
+  background: #f3f8f8;
+}
+
+.wrap-dd-select .dropdown:after {
+  content: "";
+  width: 0;
+  height: 0;
+  position: absolute;
+  bottom: 100%;
+  right: 15px;
+  border-width: 0 6px 6px 6px;
+  border-style: solid;
+  border-color: #fff transparent;
+}
+
+.wrap-dd-select .dropdown:before {
+  content: "";
+  width: 0;
+  height: 0;
+  position: absolute;
+  bottom: 100%;
+  right: 13px;
+  border-width: 0 8px 8px 8px;
+  border-style: solid;
+  border-color: rgba(0,0,0,0.1) transparent;
+}
+
+.wrap-dd-select.active .dropdown {
+  visibility: visible;
+}
+
+/****** dropdown-menu *******/
+.wrap-dd-menu {
+  /* Size and position */
+  position: relative;
+  width: 200px;
+  margin: 0 auto;
+  padding: 10px;
+}
+
+.wrap-dd-menu .dropdown {
+  /* Size & position */
+  position: absolute;
+  z-index: 1;
+  top: 70%;
+  left: 0;
+  right: 0;
+
+  /* Styles */
+  background: white;
+  padding: 0;
+  border-radius: 7px;
+  border: 1px solid rgba(0,0,0,0.17);
+  box-shadow: 0 0 5px rgba(0,0,0,0.1);
+  font-weight: normal;
+  list-style: none;
+
+  /* Hiding */
+  visibility: hidden;
+}
+
+.wrap-dd-menu .dropdown li.divider {
+  padding: 2px 0;
+  background: #e6e8ea;
+}
+
+.wrap-dd-menu .dropdown li.divider-label {
+  background: #e6e8ea;
+  cursor: default;
+  color: #000;
+  padding: 10px 0;
+}
+
+.wrap-dd-menu .dropdown li a {
+  display: block;
+  padding: 10px;
+  text-decoration: none;
+  color: #8aa8bd;
+  border-bottom: 1px solid #e6e8ea;
+  box-shadow: inset 0 1px 0 rgba(255,255,255,1);
+  cursor: pointer;
+}
+
+.wrap-dd-menu .dropdown li i {
+  float: right;
+  color: inherit;
+}
+
+.wrap-dd-menu .dropdown li:first-of-type a {
+  border-radius: 7px 7px 0 0;
+}
+
+.wrap-dd-menu .dropdown li:last-of-type a {
+  border-radius: 0 0 7px 7px;
+  border: none;
+}
+
+/* Hover state */
+
+.wrap-dd-menu .dropdown li:hover a {
+  background: #f3f8f8;
+}
+
+.wrap-dd-menu .dropdown:after {
+  content: "";
+  width: 0;
+  height: 0;
+  position: absolute;
+  bottom: 100%;
+  right: 102px;
+  border-width: 0 6px 6px 6px;
+  border-style: solid;
+  border-color: #fff transparent;
+}
+
+.wrap-dd-menu .dropdown:before {
+  content: "";
+  width: 0;
+  height: 0;
+  position: absolute;
+  bottom: 100%;
+  right: 100px;
+  border-width: 0 8px 8px 8px;
+  border-style: solid;
+  border-color: rgba(0,0,0,0.1) transparent;
+}
+
+.wrap-dd-menu .dropdown.active {
+  visibility: visible;
+}
diff --git a/turtles/css/bootstrap.css b/turtles/css/bootstrap.css
new file mode 100644
index 000000000..fb15e3d69
--- /dev/null
+++ b/turtles/css/bootstrap.css
@@ -0,0 +1,6584 @@
+/*!
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+html {
+  font-family: sans-serif;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+audio,
+canvas,
+progress,
+video {
+  display: inline-block;
+  vertical-align: baseline;
+}
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+[hidden],
+template {
+  display: none;
+}
+a {
+  background-color: transparent;
+}
+a:active,
+a:hover {
+  outline: 0;
+}
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+b,
+strong {
+  font-weight: bold;
+}
+dfn {
+  font-style: italic;
+}
+h1 {
+  margin: .67em 0;
+  font-size: 2em;
+}
+mark {
+  color: #000;
+  background: #ff0;
+}
+small {
+  font-size: 80%;
+}
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+sup {
+  top: -.5em;
+}
+sub {
+  bottom: -.25em;
+}
+img {
+  border: 0;
+}
+svg:not(:root) {
+  overflow: hidden;
+}
+figure {
+  margin: 1em 40px;
+}
+hr {
+  height: 0;
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+}
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+button,
+input,
+optgroup,
+select,
+textarea {
+  margin: 0;
+  font: inherit;
+  color: inherit;
+}
+button {
+  overflow: visible;
+}
+button,
+select {
+  text-transform: none;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button;
+  cursor: pointer;
+}
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+input {
+  line-height: normal;
+}
+input[type="checkbox"],
+input[type="radio"] {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+  padding: 0;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+     -moz-box-sizing: content-box;
+          box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+fieldset {
+  padding: .35em .625em .75em;
+  margin: 0 2px;
+  border: 1px solid #c0c0c0;
+}
+legend {
+  padding: 0;
+  border: 0;
+}
+textarea {
+  overflow: auto;
+}
+optgroup {
+  font-weight: bold;
+}
+table {
+  border-spacing: 0;
+  border-collapse: collapse;
+}
+td,
+th {
+  padding: 0;
+}
+/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
+@media print {
+  *,
+  *:before,
+  *:after {
+    color: #000 !important;
+    text-shadow: none !important;
+    background: transparent !important;
+    -webkit-box-shadow: none !important;
+            box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  a[href^="#"]:after,
+  a[href^="javascript:"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+  select {
+    background: #fff !important;
+  }
+  .navbar {
+    display: none;
+  }
+  .btn > .caret,
+  .dropup > .btn > .caret {
+    border-top-color: #000 !important;
+  }
+  .label {
+    border: 1px solid #000;
+  }
+  .table {
+    border-collapse: collapse !important;
+  }
+  .table td,
+  .table th {
+    background-color: #fff !important;
+  }
+  .table-bordered th,
+  .table-bordered td {
+    border: 1px solid #ddd !important;
+  }
+}
+@font-face {
+  font-family: 'Glyphicons Halflings';
+
+  src: url('../fonts/glyphicons-halflings-regular.eot');
+  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+}
+.glyphicon {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.glyphicon-asterisk:before {
+  content: "\2a";
+}
+.glyphicon-plus:before {
+  content: "\2b";
+}
+.glyphicon-euro:before,
+.glyphicon-eur:before {
+  content: "\20ac";
+}
+.glyphicon-minus:before {
+  content: "\2212";
+}
+.glyphicon-cloud:before {
+  content: "\2601";
+}
+.glyphicon-envelope:before {
+  content: "\2709";
+}
+.glyphicon-pencil:before {
+  content: "\270f";
+}
+.glyphicon-glass:before {
+  content: "\e001";
+}
+.glyphicon-music:before {
+  content: "\e002";
+}
+.glyphicon-search:before {
+  content: "\e003";
+}
+.glyphicon-heart:before {
+  content: "\e005";
+}
+.glyphicon-star:before {
+  content: "\e006";
+}
+.glyphicon-star-empty:before {
+  content: "\e007";
+}
+.glyphicon-user:before {
+  content: "\e008";
+}
+.glyphicon-film:before {
+  content: "\e009";
+}
+.glyphicon-th-large:before {
+  content: "\e010";
+}
+.glyphicon-th:before {
+  content: "\e011";
+}
+.glyphicon-th-list:before {
+  content: "\e012";
+}
+.glyphicon-ok:before {
+  content: "\e013";
+}
+.glyphicon-remove:before {
+  content: "\e014";
+}
+.glyphicon-zoom-in:before {
+  content: "\e015";
+}
+.glyphicon-zoom-out:before {
+  content: "\e016";
+}
+.glyphicon-off:before {
+  content: "\e017";
+}
+.glyphicon-signal:before {
+  content: "\e018";
+}
+.glyphicon-cog:before {
+  content: "\e019";
+}
+.glyphicon-trash:before {
+  content: "\e020";
+}
+.glyphicon-home:before {
+  content: "\e021";
+}
+.glyphicon-file:before {
+  content: "\e022";
+}
+.glyphicon-time:before {
+  content: "\e023";
+}
+.glyphicon-road:before {
+  content: "\e024";
+}
+.glyphicon-download-alt:before {
+  content: "\e025";
+}
+.glyphicon-download:before {
+  content: "\e026";
+}
+.glyphicon-upload:before {
+  content: "\e027";
+}
+.glyphicon-inbox:before {
+  content: "\e028";
+}
+.glyphicon-play-circle:before {
+  content: "\e029";
+}
+.glyphicon-repeat:before {
+  content: "\e030";
+}
+.glyphicon-refresh:before {
+  content: "\e031";
+}
+.glyphicon-list-alt:before {
+  content: "\e032";
+}
+.glyphicon-lock:before {
+  content: "\e033";
+}
+.glyphicon-flag:before {
+  content: "\e034";
+}
+.glyphicon-headphones:before {
+  content: "\e035";
+}
+.glyphicon-volume-off:before {
+  content: "\e036";
+}
+.glyphicon-volume-down:before {
+  content: "\e037";
+}
+.glyphicon-volume-up:before {
+  content: "\e038";
+}
+.glyphicon-qrcode:before {
+  content: "\e039";
+}
+.glyphicon-barcode:before {
+  content: "\e040";
+}
+.glyphicon-tag:before {
+  content: "\e041";
+}
+.glyphicon-tags:before {
+  content: "\e042";
+}
+.glyphicon-book:before {
+  content: "\e043";
+}
+.glyphicon-bookmark:before {
+  content: "\e044";
+}
+.glyphicon-print:before {
+  content: "\e045";
+}
+.glyphicon-camera:before {
+  content: "\e046";
+}
+.glyphicon-font:before {
+  content: "\e047";
+}
+.glyphicon-bold:before {
+  content: "\e048";
+}
+.glyphicon-italic:before {
+  content: "\e049";
+}
+.glyphicon-text-height:before {
+  content: "\e050";
+}
+.glyphicon-text-width:before {
+  content: "\e051";
+}
+.glyphicon-align-left:before {
+  content: "\e052";
+}
+.glyphicon-align-center:before {
+  content: "\e053";
+}
+.glyphicon-align-right:before {
+  content: "\e054";
+}
+.glyphicon-align-justify:before {
+  content: "\e055";
+}
+.glyphicon-list:before {
+  content: "\e056";
+}
+.glyphicon-indent-left:before {
+  content: "\e057";
+}
+.glyphicon-indent-right:before {
+  content: "\e058";
+}
+.glyphicon-facetime-video:before {
+  content: "\e059";
+}
+.glyphicon-picture:before {
+  content: "\e060";
+}
+.glyphicon-map-marker:before {
+  content: "\e062";
+}
+.glyphicon-adjust:before {
+  content: "\e063";
+}
+.glyphicon-tint:before {
+  content: "\e064";
+}
+.glyphicon-edit:before {
+  content: "\e065";
+}
+.glyphicon-share:before {
+  content: "\e066";
+}
+.glyphicon-check:before {
+  content: "\e067";
+}
+.glyphicon-move:before {
+  content: "\e068";
+}
+.glyphicon-step-backward:before {
+  content: "\e069";
+}
+.glyphicon-fast-backward:before {
+  content: "\e070";
+}
+.glyphicon-backward:before {
+  content: "\e071";
+}
+.glyphicon-play:before {
+  content: "\e072";
+}
+.glyphicon-pause:before {
+  content: "\e073";
+}
+.glyphicon-stop:before {
+  content: "\e074";
+}
+.glyphicon-forward:before {
+  content: "\e075";
+}
+.glyphicon-fast-forward:before {
+  content: "\e076";
+}
+.glyphicon-step-forward:before {
+  content: "\e077";
+}
+.glyphicon-eject:before {
+  content: "\e078";
+}
+.glyphicon-chevron-left:before {
+  content: "\e079";
+}
+.glyphicon-chevron-right:before {
+  content: "\e080";
+}
+.glyphicon-plus-sign:before {
+  content: "\e081";
+}
+.glyphicon-minus-sign:before {
+  content: "\e082";
+}
+.glyphicon-remove-sign:before {
+  content: "\e083";
+}
+.glyphicon-ok-sign:before {
+  content: "\e084";
+}
+.glyphicon-question-sign:before {
+  content: "\e085";
+}
+.glyphicon-info-sign:before {
+  content: "\e086";
+}
+.glyphicon-screenshot:before {
+  content: "\e087";
+}
+.glyphicon-remove-circle:before {
+  content: "\e088";
+}
+.glyphicon-ok-circle:before {
+  content: "\e089";
+}
+.glyphicon-ban-circle:before {
+  content: "\e090";
+}
+.glyphicon-arrow-left:before {
+  content: "\e091";
+}
+.glyphicon-arrow-right:before {
+  content: "\e092";
+}
+.glyphicon-arrow-up:before {
+  content: "\e093";
+}
+.glyphicon-arrow-down:before {
+  content: "\e094";
+}
+.glyphicon-share-alt:before {
+  content: "\e095";
+}
+.glyphicon-resize-full:before {
+  content: "\e096";
+}
+.glyphicon-resize-small:before {
+  content: "\e097";
+}
+.glyphicon-exclamation-sign:before {
+  content: "\e101";
+}
+.glyphicon-gift:before {
+  content: "\e102";
+}
+.glyphicon-leaf:before {
+  content: "\e103";
+}
+.glyphicon-fire:before {
+  content: "\e104";
+}
+.glyphicon-eye-open:before {
+  content: "\e105";
+}
+.glyphicon-eye-close:before {
+  content: "\e106";
+}
+.glyphicon-warning-sign:before {
+  content: "\e107";
+}
+.glyphicon-plane:before {
+  content: "\e108";
+}
+.glyphicon-calendar:before {
+  content: "\e109";
+}
+.glyphicon-random:before {
+  content: "\e110";
+}
+.glyphicon-comment:before {
+  content: "\e111";
+}
+.glyphicon-magnet:before {
+  content: "\e112";
+}
+.glyphicon-chevron-up:before {
+  content: "\e113";
+}
+.glyphicon-chevron-down:before {
+  content: "\e114";
+}
+.glyphicon-retweet:before {
+  content: "\e115";
+}
+.glyphicon-shopping-cart:before {
+  content: "\e116";
+}
+.glyphicon-folder-close:before {
+  content: "\e117";
+}
+.glyphicon-folder-open:before {
+  content: "\e118";
+}
+.glyphicon-resize-vertical:before {
+  content: "\e119";
+}
+.glyphicon-resize-horizontal:before {
+  content: "\e120";
+}
+.glyphicon-hdd:before {
+  content: "\e121";
+}
+.glyphicon-bullhorn:before {
+  content: "\e122";
+}
+.glyphicon-bell:before {
+  content: "\e123";
+}
+.glyphicon-certificate:before {
+  content: "\e124";
+}
+.glyphicon-thumbs-up:before {
+  content: "\e125";
+}
+.glyphicon-thumbs-down:before {
+  content: "\e126";
+}
+.glyphicon-hand-right:before {
+  content: "\e127";
+}
+.glyphicon-hand-left:before {
+  content: "\e128";
+}
+.glyphicon-hand-up:before {
+  content: "\e129";
+}
+.glyphicon-hand-down:before {
+  content: "\e130";
+}
+.glyphicon-circle-arrow-right:before {
+  content: "\e131";
+}
+.glyphicon-circle-arrow-left:before {
+  content: "\e132";
+}
+.glyphicon-circle-arrow-up:before {
+  content: "\e133";
+}
+.glyphicon-circle-arrow-down:before {
+  content: "\e134";
+}
+.glyphicon-globe:before {
+  content: "\e135";
+}
+.glyphicon-wrench:before {
+  content: "\e136";
+}
+.glyphicon-tasks:before {
+  content: "\e137";
+}
+.glyphicon-filter:before {
+  content: "\e138";
+}
+.glyphicon-briefcase:before {
+  content: "\e139";
+}
+.glyphicon-fullscreen:before {
+  content: "\e140";
+}
+.glyphicon-dashboard:before {
+  content: "\e141";
+}
+.glyphicon-paperclip:before {
+  content: "\e142";
+}
+.glyphicon-heart-empty:before {
+  content: "\e143";
+}
+.glyphicon-link:before {
+  content: "\e144";
+}
+.glyphicon-phone:before {
+  content: "\e145";
+}
+.glyphicon-pushpin:before {
+  content: "\e146";
+}
+.glyphicon-usd:before {
+  content: "\e148";
+}
+.glyphicon-gbp:before {
+  content: "\e149";
+}
+.glyphicon-sort:before {
+  content: "\e150";
+}
+.glyphicon-sort-by-alphabet:before {
+  content: "\e151";
+}
+.glyphicon-sort-by-alphabet-alt:before {
+  content: "\e152";
+}
+.glyphicon-sort-by-order:before {
+  content: "\e153";
+}
+.glyphicon-sort-by-order-alt:before {
+  content: "\e154";
+}
+.glyphicon-sort-by-attributes:before {
+  content: "\e155";
+}
+.glyphicon-sort-by-attributes-alt:before {
+  content: "\e156";
+}
+.glyphicon-unchecked:before {
+  content: "\e157";
+}
+.glyphicon-expand:before {
+  content: "\e158";
+}
+.glyphicon-collapse-down:before {
+  content: "\e159";
+}
+.glyphicon-collapse-up:before {
+  content: "\e160";
+}
+.glyphicon-log-in:before {
+  content: "\e161";
+}
+.glyphicon-flash:before {
+  content: "\e162";
+}
+.glyphicon-log-out:before {
+  content: "\e163";
+}
+.glyphicon-new-window:before {
+  content: "\e164";
+}
+.glyphicon-record:before {
+  content: "\e165";
+}
+.glyphicon-save:before {
+  content: "\e166";
+}
+.glyphicon-open:before {
+  content: "\e167";
+}
+.glyphicon-saved:before {
+  content: "\e168";
+}
+.glyphicon-import:before {
+  content: "\e169";
+}
+.glyphicon-export:before {
+  content: "\e170";
+}
+.glyphicon-send:before {
+  content: "\e171";
+}
+.glyphicon-floppy-disk:before {
+  content: "\e172";
+}
+.glyphicon-floppy-saved:before {
+  content: "\e173";
+}
+.glyphicon-floppy-remove:before {
+  content: "\e174";
+}
+.glyphicon-floppy-save:before {
+  content: "\e175";
+}
+.glyphicon-floppy-open:before {
+  content: "\e176";
+}
+.glyphicon-credit-card:before {
+  content: "\e177";
+}
+.glyphicon-transfer:before {
+  content: "\e178";
+}
+.glyphicon-cutlery:before {
+  content: "\e179";
+}
+.glyphicon-header:before {
+  content: "\e180";
+}
+.glyphicon-compressed:before {
+  content: "\e181";
+}
+.glyphicon-earphone:before {
+  content: "\e182";
+}
+.glyphicon-phone-alt:before {
+  content: "\e183";
+}
+.glyphicon-tower:before {
+  content: "\e184";
+}
+.glyphicon-stats:before {
+  content: "\e185";
+}
+.glyphicon-sd-video:before {
+  content: "\e186";
+}
+.glyphicon-hd-video:before {
+  content: "\e187";
+}
+.glyphicon-subtitles:before {
+  content: "\e188";
+}
+.glyphicon-sound-stereo:before {
+  content: "\e189";
+}
+.glyphicon-sound-dolby:before {
+  content: "\e190";
+}
+.glyphicon-sound-5-1:before {
+  content: "\e191";
+}
+.glyphicon-sound-6-1:before {
+  content: "\e192";
+}
+.glyphicon-sound-7-1:before {
+  content: "\e193";
+}
+.glyphicon-copyright-mark:before {
+  content: "\e194";
+}
+.glyphicon-registration-mark:before {
+  content: "\e195";
+}
+.glyphicon-cloud-download:before {
+  content: "\e197";
+}
+.glyphicon-cloud-upload:before {
+  content: "\e198";
+}
+.glyphicon-tree-conifer:before {
+  content: "\e199";
+}
+.glyphicon-tree-deciduous:before {
+  content: "\e200";
+}
+.glyphicon-cd:before {
+  content: "\e201";
+}
+.glyphicon-save-file:before {
+  content: "\e202";
+}
+.glyphicon-open-file:before {
+  content: "\e203";
+}
+.glyphicon-level-up:before {
+  content: "\e204";
+}
+.glyphicon-copy:before {
+  content: "\e205";
+}
+.glyphicon-paste:before {
+  content: "\e206";
+}
+.glyphicon-alert:before {
+  content: "\e209";
+}
+.glyphicon-equalizer:before {
+  content: "\e210";
+}
+.glyphicon-king:before {
+  content: "\e211";
+}
+.glyphicon-queen:before {
+  content: "\e212";
+}
+.glyphicon-pawn:before {
+  content: "\e213";
+}
+.glyphicon-bishop:before {
+  content: "\e214";
+}
+.glyphicon-knight:before {
+  content: "\e215";
+}
+.glyphicon-baby-formula:before {
+  content: "\e216";
+}
+.glyphicon-tent:before {
+  content: "\26fa";
+}
+.glyphicon-blackboard:before {
+  content: "\e218";
+}
+.glyphicon-bed:before {
+  content: "\e219";
+}
+.glyphicon-apple:before {
+  content: "\f8ff";
+}
+.glyphicon-erase:before {
+  content: "\e221";
+}
+.glyphicon-hourglass:before {
+  content: "\231b";
+}
+.glyphicon-lamp:before {
+  content: "\e223";
+}
+.glyphicon-duplicate:before {
+  content: "\e224";
+}
+.glyphicon-piggy-bank:before {
+  content: "\e225";
+}
+.glyphicon-scissors:before {
+  content: "\e226";
+}
+.glyphicon-bitcoin:before {
+  content: "\e227";
+}
+.glyphicon-btc:before {
+  content: "\e227";
+}
+.glyphicon-xbt:before {
+  content: "\e227";
+}
+.glyphicon-yen:before {
+  content: "\00a5";
+}
+.glyphicon-jpy:before {
+  content: "\00a5";
+}
+.glyphicon-ruble:before {
+  content: "\20bd";
+}
+.glyphicon-rub:before {
+  content: "\20bd";
+}
+.glyphicon-scale:before {
+  content: "\e230";
+}
+.glyphicon-ice-lolly:before {
+  content: "\e231";
+}
+.glyphicon-ice-lolly-tasted:before {
+  content: "\e232";
+}
+.glyphicon-education:before {
+  content: "\e233";
+}
+.glyphicon-option-horizontal:before {
+  content: "\e234";
+}
+.glyphicon-option-vertical:before {
+  content: "\e235";
+}
+.glyphicon-menu-hamburger:before {
+  content: "\e236";
+}
+.glyphicon-modal-window:before {
+  content: "\e237";
+}
+.glyphicon-oil:before {
+  content: "\e238";
+}
+.glyphicon-grain:before {
+  content: "\e239";
+}
+.glyphicon-sunglasses:before {
+  content: "\e240";
+}
+.glyphicon-text-size:before {
+  content: "\e241";
+}
+.glyphicon-text-color:before {
+  content: "\e242";
+}
+.glyphicon-text-background:before {
+  content: "\e243";
+}
+.glyphicon-object-align-top:before {
+  content: "\e244";
+}
+.glyphicon-object-align-bottom:before {
+  content: "\e245";
+}
+.glyphicon-object-align-horizontal:before {
+  content: "\e246";
+}
+.glyphicon-object-align-left:before {
+  content: "\e247";
+}
+.glyphicon-object-align-vertical:before {
+  content: "\e248";
+}
+.glyphicon-object-align-right:before {
+  content: "\e249";
+}
+.glyphicon-triangle-right:before {
+  content: "\e250";
+}
+.glyphicon-triangle-left:before {
+  content: "\e251";
+}
+.glyphicon-triangle-bottom:before {
+  content: "\e252";
+}
+.glyphicon-triangle-top:before {
+  content: "\e253";
+}
+.glyphicon-console:before {
+  content: "\e254";
+}
+.glyphicon-superscript:before {
+  content: "\e255";
+}
+.glyphicon-subscript:before {
+  content: "\e256";
+}
+.glyphicon-menu-left:before {
+  content: "\e257";
+}
+.glyphicon-menu-right:before {
+  content: "\e258";
+}
+.glyphicon-menu-down:before {
+  content: "\e259";
+}
+.glyphicon-menu-up:before {
+  content: "\e260";
+}
+* {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+*:before,
+*:after {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+html {
+  font-size: 10px;
+
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+body {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 1.42857143;
+  color: #333;
+  background-color: #fff;
+}
+input,
+button,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+a {
+  color: #337ab7;
+  text-decoration: none;
+}
+a:hover,
+a:focus {
+  color: #23527c;
+  text-decoration: underline;
+}
+a:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+figure {
+  margin: 0;
+}
+img {
+  vertical-align: middle;
+}
+.img-responsive,
+.thumbnail > img,
+.thumbnail a > img,
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  max-width: 100%;
+  height: auto;
+}
+.img-rounded {
+  border-radius: 6px;
+}
+.img-thumbnail {
+  display: inline-block;
+  max-width: 100%;
+  height: auto;
+  padding: 4px;
+  line-height: 1.42857143;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  -webkit-transition: all .2s ease-in-out;
+       -o-transition: all .2s ease-in-out;
+          transition: all .2s ease-in-out;
+}
+.img-circle {
+  border-radius: 50%;
+}
+hr {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  border: 0;
+  border-top: 1px solid #eee;
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}
+[role="button"] {
+  cursor: pointer;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+.h1,
+.h2,
+.h3,
+.h4,
+.h5,
+.h6 {
+  font-family: inherit;
+  font-weight: 500;
+  line-height: 1.1;
+  color: inherit;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small,
+.h1 small,
+.h2 small,
+.h3 small,
+.h4 small,
+.h5 small,
+.h6 small,
+h1 .small,
+h2 .small,
+h3 .small,
+h4 .small,
+h5 .small,
+h6 .small,
+.h1 .small,
+.h2 .small,
+.h3 .small,
+.h4 .small,
+.h5 .small,
+.h6 .small {
+  font-weight: normal;
+  line-height: 1;
+  color: #777;
+}
+h1,
+.h1,
+h2,
+.h2,
+h3,
+.h3 {
+  margin-top: 20px;
+  margin-bottom: 10px;
+}
+h1 small,
+.h1 small,
+h2 small,
+.h2 small,
+h3 small,
+.h3 small,
+h1 .small,
+.h1 .small,
+h2 .small,
+.h2 .small,
+h3 .small,
+.h3 .small {
+  font-size: 65%;
+}
+h4,
+.h4,
+h5,
+.h5,
+h6,
+.h6 {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+h4 small,
+.h4 small,
+h5 small,
+.h5 small,
+h6 small,
+.h6 small,
+h4 .small,
+.h4 .small,
+h5 .small,
+.h5 .small,
+h6 .small,
+.h6 .small {
+  font-size: 75%;
+}
+h1,
+.h1 {
+  font-size: 36px;
+}
+h2,
+.h2 {
+  font-size: 30px;
+}
+h3,
+.h3 {
+  font-size: 24px;
+}
+h4,
+.h4 {
+  font-size: 18px;
+}
+h5,
+.h5 {
+  font-size: 14px;
+}
+h6,
+.h6 {
+  font-size: 12px;
+}
+p {
+  margin: 0 0 10px;
+}
+.lead {
+  margin-bottom: 20px;
+  font-size: 16px;
+  font-weight: 300;
+  line-height: 1.4;
+}
+@media (min-width: 768px) {
+  .lead {
+    font-size: 21px;
+  }
+}
+small,
+.small {
+  font-size: 85%;
+}
+mark,
+.mark {
+  padding: .2em;
+  background-color: #fcf8e3;
+}
+.text-left {
+  text-align: left;
+}
+.text-right {
+  text-align: right;
+}
+.text-center {
+  text-align: center;
+}
+.text-justify {
+  text-align: justify;
+}
+.text-nowrap {
+  white-space: nowrap;
+}
+.text-lowercase {
+  text-transform: lowercase;
+}
+.text-uppercase {
+  text-transform: uppercase;
+}
+.text-capitalize {
+  text-transform: capitalize;
+}
+.text-muted {
+  color: #777;
+}
+.text-primary {
+  color: #337ab7;
+}
+a.text-primary:hover {
+  color: #286090;
+}
+.text-success {
+  color: #3c763d;
+}
+a.text-success:hover {
+  color: #2b542c;
+}
+.text-info {
+  color: #31708f;
+}
+a.text-info:hover {
+  color: #245269;
+}
+.text-warning {
+  color: #8a6d3b;
+}
+a.text-warning:hover {
+  color: #66512c;
+}
+.text-danger {
+  color: #a94442;
+}
+a.text-danger:hover {
+  color: #843534;
+}
+.bg-primary {
+  color: #fff;
+  background-color: #337ab7;
+}
+a.bg-primary:hover {
+  background-color: #286090;
+}
+.bg-success {
+  background-color: #dff0d8;
+}
+a.bg-success:hover {
+  background-color: #c1e2b3;
+}
+.bg-info {
+  background-color: #d9edf7;
+}
+a.bg-info:hover {
+  background-color: #afd9ee;
+}
+.bg-warning {
+  background-color: #fcf8e3;
+}
+a.bg-warning:hover {
+  background-color: #f7ecb5;
+}
+.bg-danger {
+  background-color: #f2dede;
+}
+a.bg-danger:hover {
+  background-color: #e4b9b9;
+}
+.page-header {
+  padding-bottom: 9px;
+  margin: 40px 0 20px;
+  border-bottom: 1px solid #eee;
+}
+ul,
+ol {
+  margin-top: 0;
+  margin-bottom: 10px;
+}
+ul ul,
+ol ul,
+ul ol,
+ol ol {
+  margin-bottom: 0;
+}
+.list-unstyled {
+  padding-left: 0;
+  list-style: none;
+}
+.list-inline {
+  padding-left: 0;
+  margin-left: -5px;
+  list-style: none;
+}
+.list-inline > li {
+  display: inline-block;
+  padding-right: 5px;
+  padding-left: 5px;
+}
+dl {
+  margin-top: 0;
+  margin-bottom: 20px;
+}
+dt,
+dd {
+  line-height: 1.42857143;
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin-left: 0;
+}
+@media (min-width: 768px) {
+  .dl-horizontal dt {
+    float: left;
+    width: 160px;
+    overflow: hidden;
+    clear: left;
+    text-align: right;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .dl-horizontal dd {
+    margin-left: 180px;
+  }
+}
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #777;
+}
+.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+blockquote {
+  padding: 10px 20px;
+  margin: 0 0 20px;
+  font-size: 17.5px;
+  border-left: 5px solid #eee;
+}
+blockquote p:last-child,
+blockquote ul:last-child,
+blockquote ol:last-child {
+  margin-bottom: 0;
+}
+blockquote footer,
+blockquote small,
+blockquote .small {
+  display: block;
+  font-size: 80%;
+  line-height: 1.42857143;
+  color: #777;
+}
+blockquote footer:before,
+blockquote small:before,
+blockquote .small:before {
+  content: '\2014 \00A0';
+}
+.blockquote-reverse,
+blockquote.pull-right {
+  padding-right: 15px;
+  padding-left: 0;
+  text-align: right;
+  border-right: 5px solid #eee;
+  border-left: 0;
+}
+.blockquote-reverse footer:before,
+blockquote.pull-right footer:before,
+.blockquote-reverse small:before,
+blockquote.pull-right small:before,
+.blockquote-reverse .small:before,
+blockquote.pull-right .small:before {
+  content: '';
+}
+.blockquote-reverse footer:after,
+blockquote.pull-right footer:after,
+.blockquote-reverse small:after,
+blockquote.pull-right small:after,
+.blockquote-reverse .small:after,
+blockquote.pull-right .small:after {
+  content: '\00A0 \2014';
+}
+address {
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 1.42857143;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+}
+code {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #c7254e;
+  background-color: #f9f2f4;
+  border-radius: 4px;
+}
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #fff;
+  background-color: #333;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+}
+kbd kbd {
+  padding: 0;
+  font-size: 100%;
+  font-weight: bold;
+  -webkit-box-shadow: none;
+          box-shadow: none;
+}
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 1.42857143;
+  color: #333;
+  word-break: break-all;
+  word-wrap: break-word;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+pre code {
+  padding: 0;
+  font-size: inherit;
+  color: inherit;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border-radius: 0;
+}
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+.container {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+}
+@media (min-width: 768px) {
+  .container {
+    width: 750px;
+  }
+}
+@media (min-width: 992px) {
+  .container {
+    width: 970px;
+  }
+}
+@media (min-width: 1200px) {
+  .container {
+    width: 1170px;
+  }
+}
+.container-fluid {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+}
+.row {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
+  position: relative;
+  min-height: 1px;
+  padding-right: 15px;
+  padding-left: 15px;
+}
+.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
+  float: left;
+}
+.col-xs-12 {
+  width: 100%;
+}
+.col-xs-11 {
+  width: 91.66666667%;
+}
+.col-xs-10 {
+  width: 83.33333333%;
+}
+.col-xs-9 {
+  width: 75%;
+}
+.col-xs-8 {
+  width: 66.66666667%;
+}
+.col-xs-7 {
+  width: 58.33333333%;
+}
+.col-xs-6 {
+  width: 50%;
+}
+.col-xs-5 {
+  width: 41.66666667%;
+}
+.col-xs-4 {
+  width: 33.33333333%;
+}
+.col-xs-3 {
+  width: 25%;
+}
+.col-xs-2 {
+  width: 16.66666667%;
+}
+.col-xs-1 {
+  width: 8.33333333%;
+}
+.col-xs-pull-12 {
+  right: 100%;
+}
+.col-xs-pull-11 {
+  right: 91.66666667%;
+}
+.col-xs-pull-10 {
+  right: 83.33333333%;
+}
+.col-xs-pull-9 {
+  right: 75%;
+}
+.col-xs-pull-8 {
+  right: 66.66666667%;
+}
+.col-xs-pull-7 {
+  right: 58.33333333%;
+}
+.col-xs-pull-6 {
+  right: 50%;
+}
+.col-xs-pull-5 {
+  right: 41.66666667%;
+}
+.col-xs-pull-4 {
+  right: 33.33333333%;
+}
+.col-xs-pull-3 {
+  right: 25%;
+}
+.col-xs-pull-2 {
+  right: 16.66666667%;
+}
+.col-xs-pull-1 {
+  right: 8.33333333%;
+}
+.col-xs-pull-0 {
+  right: auto;
+}
+.col-xs-push-12 {
+  left: 100%;
+}
+.col-xs-push-11 {
+  left: 91.66666667%;
+}
+.col-xs-push-10 {
+  left: 83.33333333%;
+}
+.col-xs-push-9 {
+  left: 75%;
+}
+.col-xs-push-8 {
+  left: 66.66666667%;
+}
+.col-xs-push-7 {
+  left: 58.33333333%;
+}
+.col-xs-push-6 {
+  left: 50%;
+}
+.col-xs-push-5 {
+  left: 41.66666667%;
+}
+.col-xs-push-4 {
+  left: 33.33333333%;
+}
+.col-xs-push-3 {
+  left: 25%;
+}
+.col-xs-push-2 {
+  left: 16.66666667%;
+}
+.col-xs-push-1 {
+  left: 8.33333333%;
+}
+.col-xs-push-0 {
+  left: auto;
+}
+.col-xs-offset-12 {
+  margin-left: 100%;
+}
+.col-xs-offset-11 {
+  margin-left: 91.66666667%;
+}
+.col-xs-offset-10 {
+  margin-left: 83.33333333%;
+}
+.col-xs-offset-9 {
+  margin-left: 75%;
+}
+.col-xs-offset-8 {
+  margin-left: 66.66666667%;
+}
+.col-xs-offset-7 {
+  margin-left: 58.33333333%;
+}
+.col-xs-offset-6 {
+  margin-left: 50%;
+}
+.col-xs-offset-5 {
+  margin-left: 41.66666667%;
+}
+.col-xs-offset-4 {
+  margin-left: 33.33333333%;
+}
+.col-xs-offset-3 {
+  margin-left: 25%;
+}
+.col-xs-offset-2 {
+  margin-left: 16.66666667%;
+}
+.col-xs-offset-1 {
+  margin-left: 8.33333333%;
+}
+.col-xs-offset-0 {
+  margin-left: 0;
+}
+@media (min-width: 768px) {
+  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
+    float: left;
+  }
+  .col-sm-12 {
+    width: 100%;
+  }
+  .col-sm-11 {
+    width: 91.66666667%;
+  }
+  .col-sm-10 {
+    width: 83.33333333%;
+  }
+  .col-sm-9 {
+    width: 75%;
+  }
+  .col-sm-8 {
+    width: 66.66666667%;
+  }
+  .col-sm-7 {
+    width: 58.33333333%;
+  }
+  .col-sm-6 {
+    width: 50%;
+  }
+  .col-sm-5 {
+    width: 41.66666667%;
+  }
+  .col-sm-4 {
+    width: 33.33333333%;
+  }
+  .col-sm-3 {
+    width: 25%;
+  }
+  .col-sm-2 {
+    width: 16.66666667%;
+  }
+  .col-sm-1 {
+    width: 8.33333333%;
+  }
+  .col-sm-pull-12 {
+    right: 100%;
+  }
+  .col-sm-pull-11 {
+    right: 91.66666667%;
+  }
+  .col-sm-pull-10 {
+    right: 83.33333333%;
+  }
+  .col-sm-pull-9 {
+    right: 75%;
+  }
+  .col-sm-pull-8 {
+    right: 66.66666667%;
+  }
+  .col-sm-pull-7 {
+    right: 58.33333333%;
+  }
+  .col-sm-pull-6 {
+    right: 50%;
+  }
+  .col-sm-pull-5 {
+    right: 41.66666667%;
+  }
+  .col-sm-pull-4 {
+    right: 33.33333333%;
+  }
+  .col-sm-pull-3 {
+    right: 25%;
+  }
+  .col-sm-pull-2 {
+    right: 16.66666667%;
+  }
+  .col-sm-pull-1 {
+    right: 8.33333333%;
+  }
+  .col-sm-pull-0 {
+    right: auto;
+  }
+  .col-sm-push-12 {
+    left: 100%;
+  }
+  .col-sm-push-11 {
+    left: 91.66666667%;
+  }
+  .col-sm-push-10 {
+    left: 83.33333333%;
+  }
+  .col-sm-push-9 {
+    left: 75%;
+  }
+  .col-sm-push-8 {
+    left: 66.66666667%;
+  }
+  .col-sm-push-7 {
+    left: 58.33333333%;
+  }
+  .col-sm-push-6 {
+    left: 50%;
+  }
+  .col-sm-push-5 {
+    left: 41.66666667%;
+  }
+  .col-sm-push-4 {
+    left: 33.33333333%;
+  }
+  .col-sm-push-3 {
+    left: 25%;
+  }
+  .col-sm-push-2 {
+    left: 16.66666667%;
+  }
+  .col-sm-push-1 {
+    left: 8.33333333%;
+  }
+  .col-sm-push-0 {
+    left: auto;
+  }
+  .col-sm-offset-12 {
+    margin-left: 100%;
+  }
+  .col-sm-offset-11 {
+    margin-left: 91.66666667%;
+  }
+  .col-sm-offset-10 {
+    margin-left: 83.33333333%;
+  }
+  .col-sm-offset-9 {
+    margin-left: 75%;
+  }
+  .col-sm-offset-8 {
+    margin-left: 66.66666667%;
+  }
+  .col-sm-offset-7 {
+    margin-left: 58.33333333%;
+  }
+  .col-sm-offset-6 {
+    margin-left: 50%;
+  }
+  .col-sm-offset-5 {
+    margin-left: 41.66666667%;
+  }
+  .col-sm-offset-4 {
+    margin-left: 33.33333333%;
+  }
+  .col-sm-offset-3 {
+    margin-left: 25%;
+  }
+  .col-sm-offset-2 {
+    margin-left: 16.66666667%;
+  }
+  .col-sm-offset-1 {
+    margin-left: 8.33333333%;
+  }
+  .col-sm-offset-0 {
+    margin-left: 0;
+  }
+}
+@media (min-width: 992px) {
+  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+    float: left;
+  }
+  .col-md-12 {
+    width: 100%;
+  }
+  .col-md-11 {
+    width: 91.66666667%;
+  }
+  .col-md-10 {
+    width: 83.33333333%;
+  }
+  .col-md-9 {
+    width: 75%;
+  }
+  .col-md-8 {
+    width: 66.66666667%;
+  }
+  .col-md-7 {
+    width: 58.33333333%;
+  }
+  .col-md-6 {
+    width: 50%;
+  }
+  .col-md-5 {
+    width: 41.66666667%;
+  }
+  .col-md-4 {
+    width: 33.33333333%;
+  }
+  .col-md-3 {
+    width: 25%;
+  }
+  .col-md-2 {
+    width: 16.66666667%;
+  }
+  .col-md-1 {
+    width: 8.33333333%;
+  }
+  .col-md-pull-12 {
+    right: 100%;
+  }
+  .col-md-pull-11 {
+    right: 91.66666667%;
+  }
+  .col-md-pull-10 {
+    right: 83.33333333%;
+  }
+  .col-md-pull-9 {
+    right: 75%;
+  }
+  .col-md-pull-8 {
+    right: 66.66666667%;
+  }
+  .col-md-pull-7 {
+    right: 58.33333333%;
+  }
+  .col-md-pull-6 {
+    right: 50%;
+  }
+  .col-md-pull-5 {
+    right: 41.66666667%;
+  }
+  .col-md-pull-4 {
+    right: 33.33333333%;
+  }
+  .col-md-pull-3 {
+    right: 25%;
+  }
+  .col-md-pull-2 {
+    right: 16.66666667%;
+  }
+  .col-md-pull-1 {
+    right: 8.33333333%;
+  }
+  .col-md-pull-0 {
+    right: auto;
+  }
+  .col-md-push-12 {
+    left: 100%;
+  }
+  .col-md-push-11 {
+    left: 91.66666667%;
+  }
+  .col-md-push-10 {
+    left: 83.33333333%;
+  }
+  .col-md-push-9 {
+    left: 75%;
+  }
+  .col-md-push-8 {
+    left: 66.66666667%;
+  }
+  .col-md-push-7 {
+    left: 58.33333333%;
+  }
+  .col-md-push-6 {
+    left: 50%;
+  }
+  .col-md-push-5 {
+    left: 41.66666667%;
+  }
+  .col-md-push-4 {
+    left: 33.33333333%;
+  }
+  .col-md-push-3 {
+    left: 25%;
+  }
+  .col-md-push-2 {
+    left: 16.66666667%;
+  }
+  .col-md-push-1 {
+    left: 8.33333333%;
+  }
+  .col-md-push-0 {
+    left: auto;
+  }
+  .col-md-offset-12 {
+    margin-left: 100%;
+  }
+  .col-md-offset-11 {
+    margin-left: 91.66666667%;
+  }
+  .col-md-offset-10 {
+    margin-left: 83.33333333%;
+  }
+  .col-md-offset-9 {
+    margin-left: 75%;
+  }
+  .col-md-offset-8 {
+    margin-left: 66.66666667%;
+  }
+  .col-md-offset-7 {
+    margin-left: 58.33333333%;
+  }
+  .col-md-offset-6 {
+    margin-left: 50%;
+  }
+  .col-md-offset-5 {
+    margin-left: 41.66666667%;
+  }
+  .col-md-offset-4 {
+    margin-left: 33.33333333%;
+  }
+  .col-md-offset-3 {
+    margin-left: 25%;
+  }
+  .col-md-offset-2 {
+    margin-left: 16.66666667%;
+  }
+  .col-md-offset-1 {
+    margin-left: 8.33333333%;
+  }
+  .col-md-offset-0 {
+    margin-left: 0;
+  }
+}
+@media (min-width: 1200px) {
+  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
+    float: left;
+  }
+  .col-lg-12 {
+    width: 100%;
+  }
+  .col-lg-11 {
+    width: 91.66666667%;
+  }
+  .col-lg-10 {
+    width: 83.33333333%;
+  }
+  .col-lg-9 {
+    width: 75%;
+  }
+  .col-lg-8 {
+    width: 66.66666667%;
+  }
+  .col-lg-7 {
+    width: 58.33333333%;
+  }
+  .col-lg-6 {
+    width: 50%;
+  }
+  .col-lg-5 {
+    width: 41.66666667%;
+  }
+  .col-lg-4 {
+    width: 33.33333333%;
+  }
+  .col-lg-3 {
+    width: 25%;
+  }
+  .col-lg-2 {
+    width: 16.66666667%;
+  }
+  .col-lg-1 {
+    width: 8.33333333%;
+  }
+  .col-lg-pull-12 {
+    right: 100%;
+  }
+  .col-lg-pull-11 {
+    right: 91.66666667%;
+  }
+  .col-lg-pull-10 {
+    right: 83.33333333%;
+  }
+  .col-lg-pull-9 {
+    right: 75%;
+  }
+  .col-lg-pull-8 {
+    right: 66.66666667%;
+  }
+  .col-lg-pull-7 {
+    right: 58.33333333%;
+  }
+  .col-lg-pull-6 {
+    right: 50%;
+  }
+  .col-lg-pull-5 {
+    right: 41.66666667%;
+  }
+  .col-lg-pull-4 {
+    right: 33.33333333%;
+  }
+  .col-lg-pull-3 {
+    right: 25%;
+  }
+  .col-lg-pull-2 {
+    right: 16.66666667%;
+  }
+  .col-lg-pull-1 {
+    right: 8.33333333%;
+  }
+  .col-lg-pull-0 {
+    right: auto;
+  }
+  .col-lg-push-12 {
+    left: 100%;
+  }
+  .col-lg-push-11 {
+    left: 91.66666667%;
+  }
+  .col-lg-push-10 {
+    left: 83.33333333%;
+  }
+  .col-lg-push-9 {
+    left: 75%;
+  }
+  .col-lg-push-8 {
+    left: 66.66666667%;
+  }
+  .col-lg-push-7 {
+    left: 58.33333333%;
+  }
+  .col-lg-push-6 {
+    left: 50%;
+  }
+  .col-lg-push-5 {
+    left: 41.66666667%;
+  }
+  .col-lg-push-4 {
+    left: 33.33333333%;
+  }
+  .col-lg-push-3 {
+    left: 25%;
+  }
+  .col-lg-push-2 {
+    left: 16.66666667%;
+  }
+  .col-lg-push-1 {
+    left: 8.33333333%;
+  }
+  .col-lg-push-0 {
+    left: auto;
+  }
+  .col-lg-offset-12 {
+    margin-left: 100%;
+  }
+  .col-lg-offset-11 {
+    margin-left: 91.66666667%;
+  }
+  .col-lg-offset-10 {
+    margin-left: 83.33333333%;
+  }
+  .col-lg-offset-9 {
+    margin-left: 75%;
+  }
+  .col-lg-offset-8 {
+    margin-left: 66.66666667%;
+  }
+  .col-lg-offset-7 {
+    margin-left: 58.33333333%;
+  }
+  .col-lg-offset-6 {
+    margin-left: 50%;
+  }
+  .col-lg-offset-5 {
+    margin-left: 41.66666667%;
+  }
+  .col-lg-offset-4 {
+    margin-left: 33.33333333%;
+  }
+  .col-lg-offset-3 {
+    margin-left: 25%;
+  }
+  .col-lg-offset-2 {
+    margin-left: 16.66666667%;
+  }
+  .col-lg-offset-1 {
+    margin-left: 8.33333333%;
+  }
+  .col-lg-offset-0 {
+    margin-left: 0;
+  }
+}
+table {
+  background-color: transparent;
+}
+caption {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  color: #777;
+  text-align: left;
+}
+th {
+  text-align: left;
+}
+.table {
+  width: 100%;
+  max-width: 100%;
+  margin-bottom: 20px;
+}
+.table > thead > tr > th,
+.table > tbody > tr > th,
+.table > tfoot > tr > th,
+.table > thead > tr > td,
+.table > tbody > tr > td,
+.table > tfoot > tr > td {
+  padding: 8px;
+  line-height: 1.42857143;
+  vertical-align: top;
+  border-top: 1px solid #ddd;
+}
+.table > thead > tr > th {
+  vertical-align: bottom;
+  border-bottom: 2px solid #ddd;
+}
+.table > caption + thead > tr:first-child > th,
+.table > colgroup + thead > tr:first-child > th,
+.table > thead:first-child > tr:first-child > th,
+.table > caption + thead > tr:first-child > td,
+.table > colgroup + thead > tr:first-child > td,
+.table > thead:first-child > tr:first-child > td {
+  border-top: 0;
+}
+.table > tbody + tbody {
+  border-top: 2px solid #ddd;
+}
+.table .table {
+  background-color: #fff;
+}
+.table-condensed > thead > tr > th,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > tbody > tr > td,
+.table-condensed > tfoot > tr > td {
+  padding: 5px;
+}
+.table-bordered {
+  border: 1px solid #ddd;
+}
+.table-bordered > thead > tr > th,
+.table-bordered > tbody > tr > th,
+.table-bordered > tfoot > tr > th,
+.table-bordered > thead > tr > td,
+.table-bordered > tbody > tr > td,
+.table-bordered > tfoot > tr > td {
+  border: 1px solid #ddd;
+}
+.table-bordered > thead > tr > th,
+.table-bordered > thead > tr > td {
+  border-bottom-width: 2px;
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: #f9f9f9;
+}
+.table-hover > tbody > tr:hover {
+  background-color: #f5f5f5;
+}
+table col[class*="col-"] {
+  position: static;
+  display: table-column;
+  float: none;
+}
+table td[class*="col-"],
+table th[class*="col-"] {
+  position: static;
+  display: table-cell;
+  float: none;
+}
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
+  background-color: #f5f5f5;
+}
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr:hover > .active,
+.table-hover > tbody > tr.active:hover > th {
+  background-color: #e8e8e8;
+}
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
+  background-color: #dff0d8;
+}
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr:hover > .success,
+.table-hover > tbody > tr.success:hover > th {
+  background-color: #d0e9c6;
+}
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
+}
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr:hover > .info,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
+  background-color: #fcf8e3;
+}
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr:hover > .warning,
+.table-hover > tbody > tr.warning:hover > th {
+  background-color: #faf2cc;
+}
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr:hover > .danger,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
+.table-responsive {
+  min-height: .01%;
+  overflow-x: auto;
+}
+@media screen and (max-width: 767px) {
+  .table-responsive {
+    width: 100%;
+    margin-bottom: 15px;
+    overflow-y: hidden;
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+    border: 1px solid #ddd;
+  }
+  .table-responsive > .table {
+    margin-bottom: 0;
+  }
+  .table-responsive > .table > thead > tr > th,
+  .table-responsive > .table > tbody > tr > th,
+  .table-responsive > .table > tfoot > tr > th,
+  .table-responsive > .table > thead > tr > td,
+  .table-responsive > .table > tbody > tr > td,
+  .table-responsive > .table > tfoot > tr > td {
+    white-space: nowrap;
+  }
+  .table-responsive > .table-bordered {
+    border: 0;
+  }
+  .table-responsive > .table-bordered > thead > tr > th:first-child,
+  .table-responsive > .table-bordered > tbody > tr > th:first-child,
+  .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+  .table-responsive > .table-bordered > thead > tr > td:first-child,
+  .table-responsive > .table-bordered > tbody > tr > td:first-child,
+  .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+    border-left: 0;
+  }
+  .table-responsive > .table-bordered > thead > tr > th:last-child,
+  .table-responsive > .table-bordered > tbody > tr > th:last-child,
+  .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+  .table-responsive > .table-bordered > thead > tr > td:last-child,
+  .table-responsive > .table-bordered > tbody > tr > td:last-child,
+  .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+    border-right: 0;
+  }
+  .table-responsive > .table-bordered > tbody > tr:last-child > th,
+  .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+  .table-responsive > .table-bordered > tbody > tr:last-child > td,
+  .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+    border-bottom: 0;
+  }
+}
+fieldset {
+  min-width: 0;
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: inherit;
+  color: #333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+label {
+  display: inline-block;
+  max-width: 100%;
+  margin-bottom: 5px;
+  font-weight: bold;
+}
+input[type="search"] {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  margin-top: 1px \9;
+  line-height: normal;
+}
+input[type="file"] {
+  display: block;
+}
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
+select[multiple],
+select[size] {
+  height: auto;
+}
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+output {
+  display: block;
+  padding-top: 7px;
+  font-size: 14px;
+  line-height: 1.42857143;
+  color: #555;
+}
+.form-control {
+  display: block;
+  width: 100%;
+  height: 34px;
+  padding: 6px 12px;
+  font-size: 14px;
+  line-height: 1.42857143;
+  color: #555;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+       -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+.form-control:focus {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+}
+.form-control::-moz-placeholder {
+  color: #999;
+  opacity: 1;
+}
+.form-control:-ms-input-placeholder {
+  color: #999;
+}
+.form-control::-webkit-input-placeholder {
+  color: #999;
+}
+.form-control[disabled],
+.form-control[readonly],
+fieldset[disabled] .form-control {
+  background-color: #eee;
+  opacity: 1;
+}
+.form-control[disabled],
+fieldset[disabled] .form-control {
+  cursor: not-allowed;
+}
+textarea.form-control {
+  height: auto;
+}
+input[type="search"] {
+  -webkit-appearance: none;
+}
+@media screen and (-webkit-min-device-pixel-ratio: 0) {
+  input[type="date"],
+  input[type="time"],
+  input[type="datetime-local"],
+  input[type="month"] {
+    line-height: 34px;
+  }
+  input[type="date"].input-sm,
+  input[type="time"].input-sm,
+  input[type="datetime-local"].input-sm,
+  input[type="month"].input-sm,
+  .input-group-sm input[type="date"],
+  .input-group-sm input[type="time"],
+  .input-group-sm input[type="datetime-local"],
+  .input-group-sm input[type="month"] {
+    line-height: 30px;
+  }
+  input[type="date"].input-lg,
+  input[type="time"].input-lg,
+  input[type="datetime-local"].input-lg,
+  input[type="month"].input-lg,
+  .input-group-lg input[type="date"],
+  .input-group-lg input[type="time"],
+  .input-group-lg input[type="datetime-local"],
+  .input-group-lg input[type="month"] {
+    line-height: 46px;
+  }
+}
+.form-group {
+  margin-bottom: 15px;
+}
+.radio,
+.checkbox {
+  position: relative;
+  display: block;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.radio label,
+.checkbox label {
+  min-height: 20px;
+  padding-left: 20px;
+  margin-bottom: 0;
+  font-weight: normal;
+  cursor: pointer;
+}
+.radio input[type="radio"],
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
+  position: absolute;
+  margin-top: 4px \9;
+  margin-left: -20px;
+}
+.radio + .radio,
+.checkbox + .checkbox {
+  margin-top: -5px;
+}
+.radio-inline,
+.checkbox-inline {
+  position: relative;
+  display: inline-block;
+  padding-left: 20px;
+  margin-bottom: 0;
+  font-weight: normal;
+  vertical-align: middle;
+  cursor: pointer;
+}
+.radio-inline + .radio-inline,
+.checkbox-inline + .checkbox-inline {
+  margin-top: 0;
+  margin-left: 10px;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"].disabled,
+input[type="checkbox"].disabled,
+fieldset[disabled] input[type="radio"],
+fieldset[disabled] input[type="checkbox"] {
+  cursor: not-allowed;
+}
+.radio-inline.disabled,
+.checkbox-inline.disabled,
+fieldset[disabled] .radio-inline,
+fieldset[disabled] .checkbox-inline {
+  cursor: not-allowed;
+}
+.radio.disabled label,
+.checkbox.disabled label,
+fieldset[disabled] .radio label,
+fieldset[disabled] .checkbox label {
+  cursor: not-allowed;
+}
+.form-control-static {
+  min-height: 34px;
+  padding-top: 7px;
+  padding-bottom: 7px;
+  margin-bottom: 0;
+}
+.form-control-static.input-lg,
+.form-control-static.input-sm {
+  padding-right: 0;
+  padding-left: 0;
+}
+.input-sm {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+select.input-sm {
+  height: 30px;
+  line-height: 30px;
+}
+textarea.input-sm,
+select[multiple].input-sm {
+  height: auto;
+}
+.form-group-sm .form-control {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+select.form-group-sm .form-control {
+  height: 30px;
+  line-height: 30px;
+}
+textarea.form-group-sm .form-control,
+select[multiple].form-group-sm .form-control {
+  height: auto;
+}
+.form-group-sm .form-control-static {
+  height: 30px;
+  min-height: 32px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+}
+.input-lg {
+  height: 46px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.3333333;
+  border-radius: 6px;
+}
+select.input-lg {
+  height: 46px;
+  line-height: 46px;
+}
+textarea.input-lg,
+select[multiple].input-lg {
+  height: auto;
+}
+.form-group-lg .form-control {
+  height: 46px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.3333333;
+  border-radius: 6px;
+}
+select.form-group-lg .form-control {
+  height: 46px;
+  line-height: 46px;
+}
+textarea.form-group-lg .form-control,
+select[multiple].form-group-lg .form-control {
+  height: auto;
+}
+.form-group-lg .form-control-static {
+  height: 46px;
+  min-height: 38px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.3333333;
+}
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-right: 42.5px;
+}
+.form-control-feedback {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 2;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+  pointer-events: none;
+}
+.input-lg + .form-control-feedback {
+  width: 46px;
+  height: 46px;
+  line-height: 46px;
+}
+.input-sm + .form-control-feedback {
+  width: 30px;
+  height: 30px;
+  line-height: 30px;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline,
+.has-success.radio label,
+.has-success.checkbox label,
+.has-success.radio-inline label,
+.has-success.checkbox-inline label {
+  color: #3c763d;
+}
+.has-success .form-control {
+  border-color: #3c763d;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-success .form-control:focus {
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+}
+.has-success .input-group-addon {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #3c763d;
+}
+.has-success .form-control-feedback {
+  color: #3c763d;
+}
+.has-warning .help-block,
+.has-warning .control-label,
+.has-warning .radio,
+.has-warning .checkbox,
+.has-warning .radio-inline,
+.has-warning .checkbox-inline,
+.has-warning.radio label,
+.has-warning.checkbox label,
+.has-warning.radio-inline label,
+.has-warning.checkbox-inline label {
+  color: #8a6d3b;
+}
+.has-warning .form-control {
+  border-color: #8a6d3b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-warning .form-control:focus {
+  border-color: #66512c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+}
+.has-warning .input-group-addon {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #8a6d3b;
+}
+.has-warning .form-control-feedback {
+  color: #8a6d3b;
+}
+.has-error .help-block,
+.has-error .control-label,
+.has-error .radio,
+.has-error .checkbox,
+.has-error .radio-inline,
+.has-error .checkbox-inline,
+.has-error.radio label,
+.has-error.checkbox label,
+.has-error.radio-inline label,
+.has-error.checkbox-inline label {
+  color: #a94442;
+}
+.has-error .form-control {
+  border-color: #a94442;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-error .form-control:focus {
+  border-color: #843534;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+}
+.has-error .input-group-addon {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #a94442;
+}
+.has-error .form-control-feedback {
+  color: #a94442;
+}
+.has-feedback label ~ .form-control-feedback {
+  top: 25px;
+}
+.has-feedback label.sr-only ~ .form-control-feedback {
+  top: 0;
+}
+.help-block {
+  display: block;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  color: #737373;
+}
+@media (min-width: 768px) {
+  .form-inline .form-group {
+    display: inline-block;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .form-inline .form-control {
+    display: inline-block;
+    width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .form-control-static {
+    display: inline-block;
+  }
+  .form-inline .input-group {
+    display: inline-table;
+    vertical-align: middle;
+  }
+  .form-inline .input-group .input-group-addon,
+  .form-inline .input-group .input-group-btn,
+  .form-inline .input-group .form-control {
+    width: auto;
+  }
+  .form-inline .input-group > .form-control {
+    width: 100%;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .form-inline .radio,
+  .form-inline .checkbox {
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .form-inline .radio label,
+  .form-inline .checkbox label {
+    padding-left: 0;
+  }
+  .form-inline .radio input[type="radio"],
+  .form-inline .checkbox input[type="checkbox"] {
+    position: relative;
+    margin-left: 0;
+  }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
+}
+.form-horizontal .radio,
+.form-horizontal .checkbox,
+.form-horizontal .radio-inline,
+.form-horizontal .checkbox-inline {
+  padding-top: 7px;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+.form-horizontal .radio,
+.form-horizontal .checkbox {
+  min-height: 27px;
+}
+.form-horizontal .form-group {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+@media (min-width: 768px) {
+  .form-horizontal .control-label {
+    padding-top: 7px;
+    margin-bottom: 0;
+    text-align: right;
+  }
+}
+.form-horizontal .has-feedback .form-control-feedback {
+  right: 15px;
+}
+@media (min-width: 768px) {
+  .form-horizontal .form-group-lg .control-label {
+    padding-top: 14.333333px;
+  }
+}
+@media (min-width: 768px) {
+  .form-horizontal .form-group-sm .control-label {
+    padding-top: 6px;
+  }
+}
+.btn {
+  display: inline-block;
+  padding: 6px 12px;
+  margin-bottom: 0;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 1.42857143;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -ms-touch-action: manipulation;
+      touch-action: manipulation;
+  cursor: pointer;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+  background-image: none;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.btn:focus,
+.btn:active:focus,
+.btn.active:focus,
+.btn.focus,
+.btn:active.focus,
+.btn.active.focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.btn:hover,
+.btn:focus,
+.btn.focus {
+  color: #333;
+  text-decoration: none;
+}
+.btn:active,
+.btn.active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+}
+.btn.disabled,
+.btn[disabled],
+fieldset[disabled] .btn {
+  pointer-events: none;
+  cursor: not-allowed;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+          box-shadow: none;
+  opacity: .65;
+}
+.btn-default {
+  color: #333;
+  background-color: #fff;
+  border-color: #ccc;
+}
+.btn-default:hover,
+.btn-default:focus,
+.btn-default.focus,
+.btn-default:active,
+.btn-default.active,
+.open > .dropdown-toggle.btn-default {
+  color: #333;
+  background-color: #e6e6e6;
+  border-color: #adadad;
+}
+.btn-default:active,
+.btn-default.active,
+.open > .dropdown-toggle.btn-default {
+  background-image: none;
+}
+.btn-default.disabled,
+.btn-default[disabled],
+fieldset[disabled] .btn-default,
+.btn-default.disabled:hover,
+.btn-default[disabled]:hover,
+fieldset[disabled] .btn-default:hover,
+.btn-default.disabled:focus,
+.btn-default[disabled]:focus,
+fieldset[disabled] .btn-default:focus,
+.btn-default.disabled.focus,
+.btn-default[disabled].focus,
+fieldset[disabled] .btn-default.focus,
+.btn-default.disabled:active,
+.btn-default[disabled]:active,
+fieldset[disabled] .btn-default:active,
+.btn-default.disabled.active,
+.btn-default[disabled].active,
+fieldset[disabled] .btn-default.active {
+  background-color: #fff;
+  border-color: #ccc;
+}
+.btn-default .badge {
+  color: #fff;
+  background-color: #333;
+}
+.btn-primary {
+  color: #fff;
+  background-color: #337ab7;
+  border-color: #2e6da4;
+}
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary.focus,
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+  color: #fff;
+  background-color: #286090;
+  border-color: #204d74;
+}
+.btn-primary:active,
+.btn-primary.active,
+.open > .dropdown-toggle.btn-primary {
+  background-image: none;
+}
+.btn-primary.disabled,
+.btn-primary[disabled],
+fieldset[disabled] .btn-primary,
+.btn-primary.disabled:hover,
+.btn-primary[disabled]:hover,
+fieldset[disabled] .btn-primary:hover,
+.btn-primary.disabled:focus,
+.btn-primary[disabled]:focus,
+fieldset[disabled] .btn-primary:focus,
+.btn-primary.disabled.focus,
+.btn-primary[disabled].focus,
+fieldset[disabled] .btn-primary.focus,
+.btn-primary.disabled:active,
+.btn-primary[disabled]:active,
+fieldset[disabled] .btn-primary:active,
+.btn-primary.disabled.active,
+.btn-primary[disabled].active,
+fieldset[disabled] .btn-primary.active {
+  background-color: #337ab7;
+  border-color: #2e6da4;
+}
+.btn-primary .badge {
+  color: #337ab7;
+  background-color: #fff;
+}
+.btn-success {
+  color: #fff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success:hover,
+.btn-success:focus,
+.btn-success.focus,
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+.btn-success:active,
+.btn-success.active,
+.open > .dropdown-toggle.btn-success {
+  background-image: none;
+}
+.btn-success.disabled,
+.btn-success[disabled],
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled.focus,
+.btn-success[disabled].focus,
+fieldset[disabled] .btn-success.focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success .badge {
+  color: #5cb85c;
+  background-color: #fff;
+}
+.btn-info {
+  color: #fff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info:hover,
+.btn-info:focus,
+.btn-info.focus,
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+  color: #fff;
+  background-color: #31b0d5;
+  border-color: #269abc;
+}
+.btn-info:active,
+.btn-info.active,
+.open > .dropdown-toggle.btn-info {
+  background-image: none;
+}
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled.focus,
+.btn-info[disabled].focus,
+fieldset[disabled] .btn-info.focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info .badge {
+  color: #5bc0de;
+  background-color: #fff;
+}
+.btn-warning {
+  color: #fff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning.focus,
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+  color: #fff;
+  background-color: #ec971f;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open > .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled.focus,
+.btn-warning[disabled].focus,
+fieldset[disabled] .btn-warning.focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #fff;
+}
+.btn-danger {
+  color: #fff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger.focus,
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open > .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled.focus,
+.btn-danger[disabled].focus,
+fieldset[disabled] .btn-danger.focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #fff;
+}
+.btn-link {
+  font-weight: normal;
+  color: #337ab7;
+  border-radius: 0;
+}
+.btn-link,
+.btn-link:active,
+.btn-link.active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+  background-color: transparent;
+  -webkit-box-shadow: none;
+          box-shadow: none;
+}
+.btn-link,
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active {
+  border-color: transparent;
+}
+.btn-link:hover,
+.btn-link:focus {
+  color: #23527c;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link[disabled]:hover,
+fieldset[disabled] .btn-link:hover,
+.btn-link[disabled]:focus,
+fieldset[disabled] .btn-link:focus {
+  color: #777;
+  text-decoration: none;
+}
+.btn-lg,
+.btn-group-lg > .btn {
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.3333333;
+  border-radius: 6px;
+}
+.btn-sm,
+.btn-group-sm > .btn {
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+.btn-xs,
+.btn-group-xs > .btn {
+  padding: 1px 5px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+.btn-block {
+  display: block;
+  width: 100%;
+}
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity .15s linear;
+       -o-transition: opacity .15s linear;
+          transition: opacity .15s linear;
+}
+.fade.in {
+  opacity: 1;
+}
+.collapse {
+  display: none;
+}
+.collapse.in {
+  display: block;
+}
+tr.collapse.in {
+  display: table-row;
+}
+tbody.collapse.in {
+  display: table-row-group;
+}
+.collapsing {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition-timing-function: ease;
+       -o-transition-timing-function: ease;
+          transition-timing-function: ease;
+  -webkit-transition-duration: .35s;
+       -o-transition-duration: .35s;
+          transition-duration: .35s;
+  -webkit-transition-property: height, visibility;
+       -o-transition-property: height, visibility;
+          transition-property: height, visibility;
+}
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top: 4px dashed;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+}
+.dropup,
+.dropdown {
+  position: relative;
+}
+.dropdown-toggle:focus {
+  outline: 0;
+}
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  font-size: 14px;
+  text-align: left;
+  list-style: none;
+  background-color: #fff;
+  -webkit-background-clip: padding-box;
+          background-clip: padding-box;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, .15);
+  border-radius: 4px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+}
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+.dropdown-menu .divider {
+  height: 1px;
+  margin: 9px 0;
+  overflow: hidden;
+  background-color: #e5e5e5;
+}
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 1.42857143;
+  color: #333;
+  white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+  color: #262626;
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #fff;
+  text-decoration: none;
+  background-color: #337ab7;
+  outline: 0;
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #777;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: not-allowed;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.open > .dropdown-menu {
+  display: block;
+}
+.open > a {
+  outline: 0;
+}
+.dropdown-menu-right {
+  right: 0;
+  left: auto;
+}
+.dropdown-menu-left {
+  right: auto;
+  left: 0;
+}
+.dropdown-header {
+  display: block;
+  padding: 3px 20px;
+  font-size: 12px;
+  line-height: 1.42857143;
+  color: #777;
+  white-space: nowrap;
+}
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;
+}
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  content: "";
+  border-top: 0;
+  border-bottom: 4px solid;
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 2px;
+}
+@media (min-width: 768px) {
+  .navbar-right .dropdown-menu {
+    right: 0;
+    left: auto;
+  }
+  .navbar-right .dropdown-menu-left {
+    right: auto;
+    left: 0;
+  }
+}
+.btn-group,
+.btn-group-vertical {
+  position: relative;
+  display: inline-block;
+  vertical-align: middle;
+}
+.btn-group > .btn,
+.btn-group-vertical > .btn {
+  position: relative;
+  float: left;
+}
+.btn-group > .btn:hover,
+.btn-group-vertical > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group-vertical > .btn:focus,
+.btn-group > .btn:active,
+.btn-group-vertical > .btn:active,
+.btn-group > .btn.active,
+.btn-group-vertical > .btn.active {
+  z-index: 2;
+}
+.btn-group .btn + .btn,
+.btn-group .btn + .btn-group,
+.btn-group .btn-group + .btn,
+.btn-group .btn-group + .btn-group {
+  margin-left: -1px;
+}
+.btn-toolbar {
+  margin-left: -5px;
+}
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
+  float: left;
+}
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
+  margin-left: 5px;
+}
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+  border-radius: 0;
+}
+.btn-group > .btn:first-child {
+  margin-left: 0;
+}
+.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group > .btn-group {
+  float: left;
+}
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+  padding-right: 8px;
+  padding-left: 8px;
+}
+.btn-group > .btn-lg + .dropdown-toggle {
+  padding-right: 12px;
+  padding-left: 12px;
+}
+.btn-group.open .dropdown-toggle {
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+}
+.btn-group.open .dropdown-toggle.btn-link {
+  -webkit-box-shadow: none;
+          box-shadow: none;
+}
+.btn .caret {
+  margin-left: 0;
+}
+.btn-lg .caret {
+  border-width: 5px 5px 0;
+  border-bottom-width: 0;
+}
+.dropup .btn-lg .caret {
+  border-width: 0 5px 5px;
+}
+.btn-group-vertical > .btn,
+.btn-group-vertical > .btn-group,
+.btn-group-vertical > .btn-group > .btn {
+  display: block;
+  float: none;
+  width: 100%;
+  max-width: 100%;
+}
+.btn-group-vertical > .btn-group > .btn {
+  float: none;
+}
+.btn-group-vertical > .btn + .btn,
+.btn-group-vertical > .btn + .btn-group,
+.btn-group-vertical > .btn-group + .btn,
+.btn-group-vertical > .btn-group + .btn-group {
+  margin-top: -1px;
+  margin-left: 0;
+}
+.btn-group-vertical > .btn:not(:first-child):not(:last-child) {
+  border-radius: 0;
+}
+.btn-group-vertical > .btn:first-child:not(:last-child) {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn:last-child:not(:first-child) {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: 4px;
+}
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
+}
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+.btn-group-justified {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: separate;
+}
+.btn-group-justified > .btn,
+.btn-group-justified > .btn-group {
+  display: table-cell;
+  float: none;
+  width: 1%;
+}
+.btn-group-justified > .btn-group .btn {
+  width: 100%;
+}
+.btn-group-justified > .btn-group .dropdown-menu {
+  left: auto;
+}
+[data-toggle="buttons"] > .btn input[type="radio"],
+[data-toggle="buttons"] > .btn-group > .btn input[type="radio"],
+[data-toggle="buttons"] > .btn input[type="checkbox"],
+[data-toggle="buttons"] > .btn-group > .btn input[type="checkbox"] {
+  position: absolute;
+  clip: rect(0, 0, 0, 0);
+  pointer-events: none;
+}
+.input-group {
+  position: relative;
+  display: table;
+  border-collapse: separate;
+}
+.input-group[class*="col-"] {
+  float: none;
+  padding-right: 0;
+  padding-left: 0;
+}
+.input-group .form-control {
+  position: relative;
+  z-index: 2;
+  float: left;
+  width: 100%;
+  margin-bottom: 0;
+}
+.input-group-lg > .form-control,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn {
+  height: 46px;
+  padding: 10px 16px;
+  font-size: 18px;
+  line-height: 1.3333333;
+  border-radius: 6px;
+}
+select.input-group-lg > .form-control,
+select.input-group-lg > .input-group-addon,
+select.input-group-lg > .input-group-btn > .btn {
+  height: 46px;
+  line-height: 46px;
+}
+textarea.input-group-lg > .form-control,
+textarea.input-group-lg > .input-group-addon,
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
+  height: auto;
+}
+.input-group-sm > .form-control,
+.input-group-sm > .input-group-addon,
+.input-group-sm > .input-group-btn > .btn {
+  height: 30px;
+  padding: 5px 10px;
+  font-size: 12px;
+  line-height: 1.5;
+  border-radius: 3px;
+}
+select.input-group-sm > .form-control,
+select.input-group-sm > .input-group-addon,
+select.input-group-sm > .input-group-btn > .btn {
+  height: 30px;
+  line-height: 30px;
+}
+textarea.input-group-sm > .form-control,
+textarea.input-group-sm > .input-group-addon,
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
+  height: auto;
+}
+.input-group-addon,
+.input-group-btn,
+.input-group .form-control {
+  display: table-cell;
+}
+.input-group-addon:not(:first-child):not(:last-child),
+.input-group-btn:not(:first-child):not(:last-child),
+.input-group .form-control:not(:first-child):not(:last-child) {
+  border-radius: 0;
+}
+.input-group-addon,
+.input-group-btn {
+  width: 1%;
+  white-space: nowrap;
+  vertical-align: middle;
+}
+.input-group-addon {
+  padding: 6px 12px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 1;
+  color: #555;
+  text-align: center;
+  background-color: #eee;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+.input-group-addon.input-sm {
+  padding: 5px 10px;
+  font-size: 12px;
+  border-radius: 3px;
+}
+.input-group-addon.input-lg {
+  padding: 10px 16px;
+  font-size: 18px;
+  border-radius: 6px;
+}
+.input-group-addon input[type="radio"],
+.input-group-addon input[type="checkbox"] {
+  margin-top: 0;
+}
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
+.input-group-btn:first-child > .dropdown-toggle,
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.input-group-addon:first-child {
+  border-right: 0;
+}
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
+.input-group-btn:last-child > .dropdown-toggle,
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.input-group-addon:last-child {
+  border-left: 0;
+}
+.input-group-btn {
+  position: relative;
+  font-size: 0;
+  white-space: nowrap;
+}
+.input-group-btn > .btn {
+  position: relative;
+}
+.input-group-btn > .btn + .btn {
+  margin-left: -1px;
+}
+.input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
+.input-group-btn > .btn:active {
+  z-index: 2;
+}
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-left: -1px;
+}
+.nav {
+  padding-left: 0;
+  margin-bottom: 0;
+  list-style: none;
+}
+.nav > li {
+  position: relative;
+  display: block;
+}
+.nav > li > a {
+  position: relative;
+  display: block;
+  padding: 10px 15px;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eee;
+}
+.nav > li.disabled > a {
+  color: #777;
+}
+.nav > li.disabled > a:hover,
+.nav > li.disabled > a:focus {
+  color: #777;
+  text-decoration: none;
+  cursor: not-allowed;
+  background-color: transparent;
+}
+.nav .open > a,
+.nav .open > a:hover,
+.nav .open > a:focus {
+  background-color: #eee;
+  border-color: #337ab7;
+}
+.nav .nav-divider {
+  height: 1px;
+  margin: 9px 0;
+  overflow: hidden;
+  background-color: #e5e5e5;
+}
+.nav > li > a > img {
+  max-width: none;
+}
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+  float: left;
+  margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+  margin-right: 2px;
+  line-height: 1.42857143;
+  border: 1px solid transparent;
+  border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover {
+  border-color: #eee #eee #ddd;
+}
+.nav-tabs > li.active > a,
+.nav-tabs > li.active > a:hover,
+.nav-tabs > li.active > a:focus {
+  color: #555;
+  cursor: default;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+}
+.nav-tabs.nav-justified {
+  width: 100%;
+  border-bottom: 0;
+}
+.nav-tabs.nav-justified > li {
+  float: none;
+}
+.nav-tabs.nav-justified > li > a {
+  margin-bottom: 5px;
+  text-align: center;
+}
+.nav-tabs.nav-justified > .dropdown .dropdown-menu {
+  top: auto;
+  left: auto;
+}
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li {
+    display: table-cell;
+    width: 1%;
+  }
+  .nav-tabs.nav-justified > li > a {
+    margin-bottom: 0;
+  }
+}
+.nav-tabs.nav-justified > li > a {
+  margin-right: 0;
+  border-radius: 4px;
+}
+.nav-tabs.nav-justified > .active > a,
+.nav-tabs.nav-justified > .active > a:hover,
+.nav-tabs.nav-justified > .active > a:focus {
+  border: 1px solid #ddd;
+}
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid #ddd;
+    border-radius: 4px 4px 0 0;
+  }
+  .nav-tabs.nav-justified > .active > a,
+  .nav-tabs.nav-justified > .active > a:hover,
+  .nav-tabs.nav-justified > .active > a:focus {
+    border-bottom-color: #fff;
+  }
+}
+.nav-pills > li {
+  float: left;
+}
+.nav-pills > li > a {
+  border-radius: 4px;
+}
+.nav-pills > li + li {
+  margin-left: 2px;
+}
+.nav-pills > li.active > a,
+.nav-pills > li.active > a:hover,
+.nav-pills > li.active > a:focus {
+  color: #fff;
+  background-color: #337ab7;
+}
+.nav-stacked > li {
+  float: none;
+}
+.nav-stacked > li + li {
+  margin-top: 2px;
+  margin-left: 0;
+}
+.nav-justified {
+  width: 100%;
+}
+.nav-justified > li {
+  float: none;
+}
+.nav-justified > li > a {
+  margin-bottom: 5px;
+  text-align: center;
+}
+.nav-justified > .dropdown .dropdown-menu {
+  top: auto;
+  left: auto;
+}
+@media (min-width: 768px) {
+  .nav-justified > li {
+    display: table-cell;
+    width: 1%;
+  }
+  .nav-justified > li > a {
+    margin-bottom: 0;
+  }
+}
+.nav-tabs-justified {
+  border-bottom: 0;
+}
+.nav-tabs-justified > li > a {
+  margin-right: 0;
+  border-radius: 4px;
+}
+.nav-tabs-justified > .active > a,
+.nav-tabs-justified > .active > a:hover,
+.nav-tabs-justified > .active > a:focus {
+  border: 1px solid #ddd;
+}
+@media (min-width: 768px) {
+  .nav-tabs-justified > li > a {
+    border-bottom: 1px solid #ddd;
+    border-radius: 4px 4px 0 0;
+  }
+  .nav-tabs-justified > .active > a,
+  .nav-tabs-justified > .active > a:hover,
+  .nav-tabs-justified > .active > a:focus {
+    border-bottom-color: #fff;
+  }
+}
+.tab-content > .tab-pane {
+  display: none;
+}
+.tab-content > .active {
+  display: block;
+}
+.nav-tabs .dropdown-menu {
+  margin-top: -1px;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+.navbar {
+  position: relative;
+  min-height: 50px;
+  margin-bottom: 20px;
+  border: 1px solid transparent;
+}
+@media (min-width: 768px) {
+  .navbar {
+    border-radius: 4px;
+  }
+}
+@media (min-width: 768px) {
+  .navbar-header {
+    float: left;
+  }
+}
+.navbar-collapse {
+  padding-right: 15px;
+  padding-left: 15px;
+  overflow-x: visible;
+  -webkit-overflow-scrolling: touch;
+  border-top: 1px solid transparent;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+}
+.navbar-collapse.in {
+  overflow-y: auto;
+}
+@media (min-width: 768px) {
+  .navbar-collapse {
+    width: auto;
+    border-top: 0;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+  }
+  .navbar-collapse.collapse {
+    display: block !important;
+    height: auto !important;
+    padding-bottom: 0;
+    overflow: visible !important;
+  }
+  .navbar-collapse.in {
+    overflow-y: visible;
+  }
+  .navbar-fixed-top .navbar-collapse,
+  .navbar-static-top .navbar-collapse,
+  .navbar-fixed-bottom .navbar-collapse {
+    padding-right: 0;
+    padding-left: 0;
+  }
+}
+.navbar-fixed-top .navbar-collapse,
+.navbar-fixed-bottom .navbar-collapse {
+  max-height: 340px;
+}
+@media (max-device-width: 480px) and (orientation: landscape) {
+  .navbar-fixed-top .navbar-collapse,
+  .navbar-fixed-bottom .navbar-collapse {
+    max-height: 200px;
+  }
+}
+.container > .navbar-header,
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
+  margin-right: -15px;
+  margin-left: -15px;
+}
+@media (min-width: 768px) {
+  .container > .navbar-header,
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
+    margin-right: 0;
+    margin-left: 0;
+  }
+}
+.navbar-static-top {
+  z-index: 1000;
+  border-width: 0 0 1px;
+}
+@media (min-width: 768px) {
+  .navbar-static-top {
+    border-radius: 0;
+  }
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+@media (min-width: 768px) {
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    border-radius: 0;
+  }
+}
+.navbar-fixed-top {
+  top: 0;
+  border-width: 0 0 1px;
+}
+.navbar-fixed-bottom {
+  bottom: 0;
+  margin-bottom: 0;
+  border-width: 1px 0 0;
+}
+.navbar-brand {
+  float: left;
+  height: 50px;
+  padding: 15px 15px;
+  font-size: 18px;
+  line-height: 20px;
+}
+.navbar-brand:hover,
+.navbar-brand:focus {
+  text-decoration: none;
+}
+.navbar-brand > img {
+  display: block;
+}
+@media (min-width: 768px) {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
+    margin-left: -15px;
+  }
+}
+.navbar-toggle {
+  position: relative;
+  float: right;
+  padding: 9px 10px;
+  margin-top: 8px;
+  margin-right: 15px;
+  margin-bottom: 8px;
+  background-color: transparent;
+  background-image: none;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.navbar-toggle:focus {
+  outline: 0;
+}
+.navbar-toggle .icon-bar {
+  display: block;
+  width: 22px;
+  height: 2px;
+  border-radius: 1px;
+}
+.navbar-toggle .icon-bar + .icon-bar {
+  margin-top: 4px;
+}
+@media (min-width: 768px) {
+  .navbar-toggle {
+    display: none;
+  }
+}
+.navbar-nav {
+  margin: 7.5px -15px;
+}
+.navbar-nav > li > a {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  line-height: 20px;
+}
+@media (max-width: 767px) {
+  .navbar-nav .open .dropdown-menu {
+    position: static;
+    float: none;
+    width: auto;
+    margin-top: 0;
+    background-color: transparent;
+    border: 0;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+  }
+  .navbar-nav .open .dropdown-menu > li > a,
+  .navbar-nav .open .dropdown-menu .dropdown-header {
+    padding: 5px 15px 5px 25px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a {
+    line-height: 20px;
+  }
+  .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-nav .open .dropdown-menu > li > a:focus {
+    background-image: none;
+  }
+}
+@media (min-width: 768px) {
+  .navbar-nav {
+    float: left;
+    margin: 0;
+  }
+  .navbar-nav > li {
+    float: left;
+  }
+  .navbar-nav > li > a {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+}
+.navbar-form {
+  padding: 10px 15px;
+  margin-top: 8px;
+  margin-right: -15px;
+  margin-bottom: 8px;
+  margin-left: -15px;
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+}
+@media (min-width: 768px) {
+  .navbar-form .form-group {
+    display: inline-block;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .navbar-form .form-control {
+    display: inline-block;
+    width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .form-control-static {
+    display: inline-block;
+  }
+  .navbar-form .input-group {
+    display: inline-table;
+    vertical-align: middle;
+  }
+  .navbar-form .input-group .input-group-addon,
+  .navbar-form .input-group .input-group-btn,
+  .navbar-form .input-group .form-control {
+    width: auto;
+  }
+  .navbar-form .input-group > .form-control {
+    width: 100%;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .navbar-form .radio,
+  .navbar-form .checkbox {
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 0;
+    vertical-align: middle;
+  }
+  .navbar-form .radio label,
+  .navbar-form .checkbox label {
+    padding-left: 0;
+  }
+  .navbar-form .radio input[type="radio"],
+  .navbar-form .checkbox input[type="checkbox"] {
+    position: relative;
+    margin-left: 0;
+  }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
+}
+@media (max-width: 767px) {
+  .navbar-form .form-group {
+    margin-bottom: 5px;
+  }
+  .navbar-form .form-group:last-child {
+    margin-bottom: 0;
+  }
+}
+@media (min-width: 768px) {
+  .navbar-form {
+    width: auto;
+    padding-top: 0;
+    padding-bottom: 0;
+    margin-right: 0;
+    margin-left: 0;
+    border: 0;
+    -webkit-box-shadow: none;
+            box-shadow: none;
+  }
+}
+.navbar-nav > li > .dropdown-menu {
+  margin-top: 0;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+}
+.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  margin-bottom: 0;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 0;
+  border-bottom-left-radius: 0;
+}
+.navbar-btn {
+  margin-top: 8px;
+  margin-bottom: 8px;
+}
+.navbar-btn.btn-sm {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.navbar-btn.btn-xs {
+  margin-top: 14px;
+  margin-bottom: 14px;
+}
+.navbar-text {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}
+@media (min-width: 768px) {
+  .navbar-text {
+    float: left;
+    margin-right: 15px;
+    margin-left: 15px;
+  }
+}
+@media (min-width: 768px) {
+  .navbar-left {
+    float: left !important;
+  }
+  .navbar-right {
+    float: right !important;
+    margin-right: -15px;
+  }
+  .navbar-right ~ .navbar-right {
+    margin-right: 0;
+  }
+}
+.navbar-default {
+  background-color: #f8f8f8;
+  border-color: #e7e7e7;
+}
+.navbar-default .navbar-brand {
+  color: #777;
+}
+.navbar-default .navbar-brand:hover,
+.navbar-default .navbar-brand:focus {
+  color: #5e5e5e;
+  background-color: transparent;
+}
+.navbar-default .navbar-text {
+  color: #777;
+}
+.navbar-default .navbar-nav > li > a {
+  color: #777;
+}
+.navbar-default .navbar-nav > li > a:hover,
+.navbar-default .navbar-nav > li > a:focus {
+  color: #333;
+  background-color: transparent;
+}
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:hover,
+.navbar-default .navbar-nav > .active > a:focus {
+  color: #555;
+  background-color: #e7e7e7;
+}
+.navbar-default .navbar-nav > .disabled > a,
+.navbar-default .navbar-nav > .disabled > a:hover,
+.navbar-default .navbar-nav > .disabled > a:focus {
+  color: #ccc;
+  background-color: transparent;
+}
+.navbar-default .navbar-toggle {
+  border-color: #ddd;
+}
+.navbar-default .navbar-toggle:hover,
+.navbar-default .navbar-toggle:focus {
+  background-color: #ddd;
+}
+.navbar-default .navbar-toggle .icon-bar {
+  background-color: #888;
+}
+.navbar-default .navbar-collapse,
+.navbar-default .navbar-form {
+  border-color: #e7e7e7;
+}
+.navbar-default .navbar-nav > .open > a,
+.navbar-default .navbar-nav > .open > a:hover,
+.navbar-default .navbar-nav > .open > a:focus {
+  color: #555;
+  background-color: #e7e7e7;
+}
+@media (max-width: 767px) {
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
+    color: #777;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #333;
+    background-color: transparent;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #555;
+    background-color: #e7e7e7;
+  }
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #ccc;
+    background-color: transparent;
+  }
+}
+.navbar-default .navbar-link {
+  color: #777;
+}
+.navbar-default .navbar-link:hover {
+  color: #333;
+}
+.navbar-default .btn-link {
+  color: #777;
+}
+.navbar-default .btn-link:hover,
+.navbar-default .btn-link:focus {
+  color: #333;
+}
+.navbar-default .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-default .btn-link:hover,
+.navbar-default .btn-link[disabled]:focus,
+fieldset[disabled] .navbar-default .btn-link:focus {
+  color: #ccc;
+}
+.navbar-inverse {
+  background-color: #222;
+  border-color: #080808;
+}
+.navbar-inverse .navbar-brand {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-brand:hover,
+.navbar-inverse .navbar-brand:focus {
+  color: #fff;
+  background-color: transparent;
+}
+.navbar-inverse .navbar-text {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-nav > li > a {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-nav > li > a:hover,
+.navbar-inverse .navbar-nav > li > a:focus {
+  color: #fff;
+  background-color: transparent;
+}
+.navbar-inverse .navbar-nav > .active > a,
+.navbar-inverse .navbar-nav > .active > a:hover,
+.navbar-inverse .navbar-nav > .active > a:focus {
+  color: #fff;
+  background-color: #080808;
+}
+.navbar-inverse .navbar-nav > .disabled > a,
+.navbar-inverse .navbar-nav > .disabled > a:hover,
+.navbar-inverse .navbar-nav > .disabled > a:focus {
+  color: #444;
+  background-color: transparent;
+}
+.navbar-inverse .navbar-toggle {
+  border-color: #333;
+}
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
+  background-color: #333;
+}
+.navbar-inverse .navbar-toggle .icon-bar {
+  background-color: #fff;
+}
+.navbar-inverse .navbar-collapse,
+.navbar-inverse .navbar-form {
+  border-color: #101010;
+}
+.navbar-inverse .navbar-nav > .open > a,
+.navbar-inverse .navbar-nav > .open > a:hover,
+.navbar-inverse .navbar-nav > .open > a:focus {
+  color: #fff;
+  background-color: #080808;
+}
+@media (max-width: 767px) {
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
+    border-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
+    color: #9d9d9d;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
+    color: #fff;
+    background-color: transparent;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
+    color: #fff;
+    background-color: #080808;
+  }
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+    color: #444;
+    background-color: transparent;
+  }
+}
+.navbar-inverse .navbar-link {
+  color: #9d9d9d;
+}
+.navbar-inverse .navbar-link:hover {
+  color: #fff;
+}
+.navbar-inverse .btn-link {
+  color: #9d9d9d;
+}
+.navbar-inverse .btn-link:hover,
+.navbar-inverse .btn-link:focus {
+  color: #fff;
+}
+.navbar-inverse .btn-link[disabled]:hover,
+fieldset[disabled] .navbar-inverse .btn-link:hover,
+.navbar-inverse .btn-link[disabled]:focus,
+fieldset[disabled] .navbar-inverse .btn-link:focus {
+  color: #444;
+}
+.breadcrumb {
+  padding: 8px 15px;
+  margin-bottom: 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  border-radius: 4px;
+}
+.breadcrumb > li {
+  display: inline-block;
+}
+.breadcrumb > li + li:before {
+  padding: 0 5px;
+  color: #ccc;
+  content: "/\00a0";
+}
+.breadcrumb > .active {
+  color: #777;
+}
+.pagination {
+  display: inline-block;
+  padding-left: 0;
+  margin: 20px 0;
+  border-radius: 4px;
+}
+.pagination > li {
+  display: inline;
+}
+.pagination > li > a,
+.pagination > li > span {
+  position: relative;
+  float: left;
+  padding: 6px 12px;
+  margin-left: -1px;
+  line-height: 1.42857143;
+  color: #337ab7;
+  text-decoration: none;
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+.pagination > li:first-child > a,
+.pagination > li:first-child > span {
+  margin-left: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.pagination > li:last-child > a,
+.pagination > li:last-child > span {
+  border-top-right-radius: 4px;
+  border-bottom-right-radius: 4px;
+}
+.pagination > li > a:hover,
+.pagination > li > span:hover,
+.pagination > li > a:focus,
+.pagination > li > span:focus {
+  color: #23527c;
+  background-color: #eee;
+  border-color: #ddd;
+}
+.pagination > .active > a,
+.pagination > .active > span,
+.pagination > .active > a:hover,
+.pagination > .active > span:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span:focus {
+  z-index: 2;
+  color: #fff;
+  cursor: default;
+  background-color: #337ab7;
+  border-color: #337ab7;
+}
+.pagination > .disabled > span,
+.pagination > .disabled > span:hover,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > a,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > a:focus {
+  color: #777;
+  cursor: not-allowed;
+  background-color: #fff;
+  border-color: #ddd;
+}
+.pagination-lg > li > a,
+.pagination-lg > li > span {
+  padding: 10px 16px;
+  font-size: 18px;
+}
+.pagination-lg > li:first-child > a,
+.pagination-lg > li:first-child > span {
+  border-top-left-radius: 6px;
+  border-bottom-left-radius: 6px;
+}
+.pagination-lg > li:last-child > a,
+.pagination-lg > li:last-child > span {
+  border-top-right-radius: 6px;
+  border-bottom-right-radius: 6px;
+}
+.pagination-sm > li > a,
+.pagination-sm > li > span {
+  padding: 5px 10px;
+  font-size: 12px;
+}
+.pagination-sm > li:first-child > a,
+.pagination-sm > li:first-child > span {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+.pagination-sm > li:last-child > a,
+.pagination-sm > li:last-child > span {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+.pager {
+  padding-left: 0;
+  margin: 20px 0;
+  text-align: center;
+  list-style: none;
+}
+.pager li {
+  display: inline;
+}
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 15px;
+}
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #eee;
+}
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #777;
+  cursor: not-allowed;
+  background-color: #fff;
+}
+.label {
+  display: inline;
+  padding: .2em .6em .3em;
+  font-size: 75%;
+  font-weight: bold;
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: .25em;
+}
+a.label:hover,
+a.label:focus {
+  color: #fff;
+  text-decoration: none;
+  cursor: pointer;
+}
+.label:empty {
+  display: none;
+}
+.btn .label {
+  position: relative;
+  top: -1px;
+}
+.label-default {
+  background-color: #777;
+}
+.label-default[href]:hover,
+.label-default[href]:focus {
+  background-color: #5e5e5e;
+}
+.label-primary {
+  background-color: #337ab7;
+}
+.label-primary[href]:hover,
+.label-primary[href]:focus {
+  background-color: #286090;
+}
+.label-success {
+  background-color: #5cb85c;
+}
+.label-success[href]:hover,
+.label-success[href]:focus {
+  background-color: #449d44;
+}
+.label-info {
+  background-color: #5bc0de;
+}
+.label-info[href]:hover,
+.label-info[href]:focus {
+  background-color: #31b0d5;
+}
+.label-warning {
+  background-color: #f0ad4e;
+}
+.label-warning[href]:hover,
+.label-warning[href]:focus {
+  background-color: #ec971f;
+}
+.label-danger {
+  background-color: #d9534f;
+}
+.label-danger[href]:hover,
+.label-danger[href]:focus {
+  background-color: #c9302c;
+}
+.badge {
+  display: inline-block;
+  min-width: 10px;
+  padding: 3px 7px;
+  font-size: 12px;
+  font-weight: bold;
+  line-height: 1;
+  color: #fff;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  background-color: #777;
+  border-radius: 10px;
+}
+.badge:empty {
+  display: none;
+}
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+.btn-xs .badge,
+.btn-group-xs > .btn .badge {
+  top: 0;
+  padding: 1px 5px;
+}
+a.badge:hover,
+a.badge:focus {
+  color: #fff;
+  text-decoration: none;
+  cursor: pointer;
+}
+.list-group-item.active > .badge,
+.nav-pills > .active > a > .badge {
+  color: #337ab7;
+  background-color: #fff;
+}
+.list-group-item > .badge {
+  float: right;
+}
+.list-group-item > .badge + .badge {
+  margin-right: 5px;
+}
+.nav-pills > li > a > .badge {
+  margin-left: 3px;
+}
+.jumbotron {
+  padding: 30px 15px;
+  margin-bottom: 30px;
+  color: inherit;
+  background-color: #eee;
+}
+.jumbotron h1,
+.jumbotron .h1 {
+  color: inherit;
+}
+.jumbotron p {
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
+}
+.jumbotron > hr {
+  border-top-color: #d5d5d5;
+}
+.container .jumbotron,
+.container-fluid .jumbotron {
+  border-radius: 6px;
+}
+.jumbotron .container {
+  max-width: 100%;
+}
+@media screen and (min-width: 768px) {
+  .jumbotron {
+    padding: 48px 0;
+  }
+  .container .jumbotron,
+  .container-fluid .jumbotron {
+    padding-right: 60px;
+    padding-left: 60px;
+  }
+  .jumbotron h1,
+  .jumbotron .h1 {
+    font-size: 63px;
+  }
+}
+.thumbnail {
+  display: block;
+  padding: 4px;
+  margin-bottom: 20px;
+  line-height: 1.42857143;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 4px;
+  -webkit-transition: border .2s ease-in-out;
+       -o-transition: border .2s ease-in-out;
+          transition: border .2s ease-in-out;
+}
+.thumbnail > img,
+.thumbnail a > img {
+  margin-right: auto;
+  margin-left: auto;
+}
+a.thumbnail:hover,
+a.thumbnail:focus,
+a.thumbnail.active {
+  border-color: #337ab7;
+}
+.thumbnail .caption {
+  padding: 9px;
+  color: #333;
+}
+.alert {
+  padding: 15px;
+  margin-bottom: 20px;
+  border: 1px solid transparent;
+  border-radius: 4px;
+}
+.alert h4 {
+  margin-top: 0;
+  color: inherit;
+}
+.alert .alert-link {
+  font-weight: bold;
+}
+.alert > p,
+.alert > ul {
+  margin-bottom: 0;
+}
+.alert > p + p {
+  margin-top: 5px;
+}
+.alert-dismissable,
+.alert-dismissible {
+  padding-right: 35px;
+}
+.alert-dismissable .close,
+.alert-dismissible .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  color: inherit;
+}
+.alert-success {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+.alert-success hr {
+  border-top-color: #c9e2b3;
+}
+.alert-success .alert-link {
+  color: #2b542c;
+}
+.alert-info {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.alert-info hr {
+  border-top-color: #a6e1ec;
+}
+.alert-info .alert-link {
+  color: #245269;
+}
+.alert-warning {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #faebcc;
+}
+.alert-warning hr {
+  border-top-color: #f7e1b5;
+}
+.alert-warning .alert-link {
+  color: #66512c;
+}
+.alert-danger {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #ebccd1;
+}
+.alert-danger hr {
+  border-top-color: #e4b9c0;
+}
+.alert-danger .alert-link {
+  color: #843534;
+}
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+.progress {
+  height: 20px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  background-color: #f5f5f5;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+}
+.progress-bar {
+  float: left;
+  width: 0;
+  height: 100%;
+  font-size: 12px;
+  line-height: 20px;
+  color: #fff;
+  text-align: center;
+  background-color: #337ab7;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+  -webkit-transition: width .6s ease;
+       -o-transition: width .6s ease;
+          transition: width .6s ease;
+}
+.progress-striped .progress-bar,
+.progress-bar-striped {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+          background-size: 40px 40px;
+}
+.progress.active .progress-bar,
+.progress-bar.active {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+       -o-animation: progress-bar-stripes 2s linear infinite;
+          animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-bar-success {
+  background-color: #5cb85c;
+}
+.progress-striped .progress-bar-success {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+}
+.progress-bar-info {
+  background-color: #5bc0de;
+}
+.progress-striped .progress-bar-info {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+}
+.progress-bar-warning {
+  background-color: #f0ad4e;
+}
+.progress-striped .progress-bar-warning {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+}
+.progress-bar-danger {
+  background-color: #d9534f;
+}
+.progress-striped .progress-bar-danger {
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:      -o-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+}
+.media {
+  margin-top: 15px;
+}
+.media:first-child {
+  margin-top: 0;
+}
+.media,
+.media-body {
+  overflow: hidden;
+  zoom: 1;
+}
+.media-body {
+  width: 10000px;
+}
+.media-object {
+  display: block;
+}
+.media-right,
+.media > .pull-right {
+  padding-left: 10px;
+}
+.media-left,
+.media > .pull-left {
+  padding-right: 10px;
+}
+.media-left,
+.media-right,
+.media-body {
+  display: table-cell;
+  vertical-align: top;
+}
+.media-middle {
+  vertical-align: middle;
+}
+.media-bottom {
+  vertical-align: bottom;
+}
+.media-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.media-list {
+  padding-left: 0;
+  list-style: none;
+}
+.list-group {
+  padding-left: 0;
+  margin-bottom: 20px;
+}
+.list-group-item {
+  position: relative;
+  display: block;
+  padding: 10px 15px;
+  margin-bottom: -1px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+.list-group-item:first-child {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+}
+.list-group-item:last-child {
+  margin-bottom: 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+a.list-group-item {
+  color: #555;
+}
+a.list-group-item .list-group-item-heading {
+  color: #333;
+}
+a.list-group-item:hover,
+a.list-group-item:focus {
+  color: #555;
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+.list-group-item.disabled,
+.list-group-item.disabled:hover,
+.list-group-item.disabled:focus {
+  color: #777;
+  cursor: not-allowed;
+  background-color: #eee;
+}
+.list-group-item.disabled .list-group-item-heading,
+.list-group-item.disabled:hover .list-group-item-heading,
+.list-group-item.disabled:focus .list-group-item-heading {
+  color: inherit;
+}
+.list-group-item.disabled .list-group-item-text,
+.list-group-item.disabled:hover .list-group-item-text,
+.list-group-item.disabled:focus .list-group-item-text {
+  color: #777;
+}
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  z-index: 2;
+  color: #fff;
+  background-color: #337ab7;
+  border-color: #337ab7;
+}
+.list-group-item.active .list-group-item-heading,
+.list-group-item.active:hover .list-group-item-heading,
+.list-group-item.active:focus .list-group-item-heading,
+.list-group-item.active .list-group-item-heading > small,
+.list-group-item.active:hover .list-group-item-heading > small,
+.list-group-item.active:focus .list-group-item-heading > small,
+.list-group-item.active .list-group-item-heading > .small,
+.list-group-item.active:hover .list-group-item-heading > .small,
+.list-group-item.active:focus .list-group-item-heading > .small {
+  color: inherit;
+}
+.list-group-item.active .list-group-item-text,
+.list-group-item.active:hover .list-group-item-text,
+.list-group-item.active:focus .list-group-item-text {
+  color: #c7ddef;
+}
+.list-group-item-success {
+  color: #3c763d;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #3c763d;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #3c763d;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #3c763d;
+  border-color: #3c763d;
+}
+.list-group-item-info {
+  color: #31708f;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #31708f;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #31708f;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #31708f;
+  border-color: #31708f;
+}
+.list-group-item-warning {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #8a6d3b;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #8a6d3b;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #8a6d3b;
+  border-color: #8a6d3b;
+}
+.list-group-item-danger {
+  color: #a94442;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #a94442;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #a94442;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #a94442;
+  border-color: #a94442;
+}
+.list-group-item-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.list-group-item-text {
+  margin-bottom: 0;
+  line-height: 1.3;
+}
+.panel {
+  margin-bottom: 20px;
+  background-color: #fff;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+}
+.panel-body {
+  padding: 15px;
+}
+.panel-heading {
+  padding: 10px 15px;
+  border-bottom: 1px solid transparent;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel-heading > .dropdown .dropdown-toggle {
+  color: inherit;
+}
+.panel-title {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: 16px;
+  color: inherit;
+}
+.panel-title > a,
+.panel-title > small,
+.panel-title > .small,
+.panel-title > small > a,
+.panel-title > .small > a {
+  color: inherit;
+}
+.panel-footer {
+  padding: 10px 15px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+.panel > .list-group,
+.panel > .panel-collapse > .list-group {
+  margin-bottom: 0;
+}
+.panel > .list-group .list-group-item,
+.panel > .panel-collapse > .list-group .list-group-item {
+  border-width: 1px 0;
+  border-radius: 0;
+}
+.panel > .list-group:first-child .list-group-item:first-child,
+.panel > .panel-collapse > .list-group:first-child .list-group-item:first-child {
+  border-top: 0;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child,
+.panel > .panel-collapse > .list-group:last-child .list-group-item:last-child {
+  border-bottom: 0;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+.panel-heading + .list-group .list-group-item:first-child {
+  border-top-width: 0;
+}
+.list-group + .panel-footer {
+  border-top-width: 0;
+}
+.panel > .table,
+.panel > .table-responsive > .table,
+.panel > .panel-collapse > .table {
+  margin-bottom: 0;
+}
+.panel > .table caption,
+.panel > .table-responsive > .table caption,
+.panel > .panel-collapse > .table caption {
+  padding-right: 15px;
+  padding-left: 15px;
+}
+.panel > .table:first-child,
+.panel > .table-responsive:first-child > .table:first-child {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:last-child,
+.panel > .table-responsive:last-child > .table:last-child {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-right-radius: 3px;
+}
+.panel > .panel-body + .table,
+.panel > .panel-body + .table-responsive,
+.panel > .table + .panel-body,
+.panel > .table-responsive + .panel-body {
+  border-top: 1px solid #ddd;
+}
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
+  border-top: 0;
+}
+.panel > .table-bordered,
+.panel > .table-responsive > .table-bordered {
+  border: 0;
+}
+.panel > .table-bordered > thead > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
+.panel > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child,
+.panel > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+.panel > .table-bordered > thead > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:first-child,
+.panel > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
+.panel > .table-bordered > tfoot > tr > td:first-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+  border-left: 0;
+}
+.panel > .table-bordered > thead > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
+.panel > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child,
+.panel > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+.panel > .table-bordered > thead > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > thead > tr > td:last-child,
+.panel > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
+.panel > .table-bordered > tfoot > tr > td:last-child,
+.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+  border-right: 0;
+}
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
+  border-bottom: 0;
+}
+.panel > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
+.panel > .table-bordered > tfoot > tr:last-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td,
+.panel > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
+.panel > .table-bordered > tfoot > tr:last-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
+  border-bottom: 0;
+}
+.panel > .table-responsive {
+  margin-bottom: 0;
+  border: 0;
+}
+.panel-group {
+  margin-bottom: 20px;
+}
+.panel-group .panel {
+  margin-bottom: 0;
+  border-radius: 4px;
+}
+.panel-group .panel + .panel {
+  margin-top: 5px;
+}
+.panel-group .panel-heading {
+  border-bottom: 0;
+}
+.panel-group .panel-heading + .panel-collapse > .panel-body,
+.panel-group .panel-heading + .panel-collapse > .list-group {
+  border-top: 1px solid #ddd;
+}
+.panel-group .panel-footer {
+  border-top: 0;
+}
+.panel-group .panel-footer + .panel-collapse .panel-body {
+  border-bottom: 1px solid #ddd;
+}
+.panel-default {
+  border-color: #ddd;
+}
+.panel-default > .panel-heading {
+  color: #333;
+  background-color: #f5f5f5;
+  border-color: #ddd;
+}
+.panel-default > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #ddd;
+}
+.panel-default > .panel-heading .badge {
+  color: #f5f5f5;
+  background-color: #333;
+}
+.panel-default > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #ddd;
+}
+.panel-primary {
+  border-color: #337ab7;
+}
+.panel-primary > .panel-heading {
+  color: #fff;
+  background-color: #337ab7;
+  border-color: #337ab7;
+}
+.panel-primary > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #337ab7;
+}
+.panel-primary > .panel-heading .badge {
+  color: #337ab7;
+  background-color: #fff;
+}
+.panel-primary > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #337ab7;
+}
+.panel-success {
+  border-color: #d6e9c6;
+}
+.panel-success > .panel-heading {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+.panel-success > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #d6e9c6;
+}
+.panel-success > .panel-heading .badge {
+  color: #dff0d8;
+  background-color: #3c763d;
+}
+.panel-success > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #d6e9c6;
+}
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-heading .badge {
+  color: #d9edf7;
+  background-color: #31708f;
+}
+.panel-info > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #bce8f1;
+}
+.panel-warning {
+  border-color: #faebcc;
+}
+.panel-warning > .panel-heading {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+  border-color: #faebcc;
+}
+.panel-warning > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #faebcc;
+}
+.panel-warning > .panel-heading .badge {
+  color: #fcf8e3;
+  background-color: #8a6d3b;
+}
+.panel-warning > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #faebcc;
+}
+.panel-danger {
+  border-color: #ebccd1;
+}
+.panel-danger > .panel-heading {
+  color: #a94442;
+  background-color: #f2dede;
+  border-color: #ebccd1;
+}
+.panel-danger > .panel-heading + .panel-collapse > .panel-body {
+  border-top-color: #ebccd1;
+}
+.panel-danger > .panel-heading .badge {
+  color: #f2dede;
+  background-color: #a94442;
+}
+.panel-danger > .panel-footer + .panel-collapse > .panel-body {
+  border-bottom-color: #ebccd1;
+}
+.embed-responsive {
+  position: relative;
+  display: block;
+  height: 0;
+  padding: 0;
+  overflow: hidden;
+}
+.embed-responsive .embed-responsive-item,
+.embed-responsive iframe,
+.embed-responsive embed,
+.embed-responsive object,
+.embed-responsive video {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: 0;
+}
+.embed-responsive-16by9 {
+  padding-bottom: 56.25%;
+}
+.embed-responsive-4by3 {
+  padding-bottom: 75%;
+}
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, .15);
+}
+.well-lg {
+  padding: 24px;
+  border-radius: 6px;
+}
+.well-sm {
+  padding: 9px;
+  border-radius: 3px;
+}
+.close {
+  float: right;
+  font-size: 21px;
+  font-weight: bold;
+  line-height: 1;
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
+  filter: alpha(opacity=20);
+  opacity: .2;
+}
+.close:hover,
+.close:focus {
+  color: #000;
+  text-decoration: none;
+  cursor: pointer;
+  filter: alpha(opacity=50);
+  opacity: .5;
+}
+button.close {
+  -webkit-appearance: none;
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+}
+.modal-open {
+  overflow: hidden;
+}
+.modal {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1050;
+  display: none;
+  overflow: hidden;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
+}
+.modal.fade .modal-dialog {
+  -webkit-transition: -webkit-transform .3s ease-out;
+       -o-transition:      -o-transform .3s ease-out;
+          transition:         transform .3s ease-out;
+  -webkit-transform: translate(0, -25%);
+      -ms-transform: translate(0, -25%);
+       -o-transform: translate(0, -25%);
+          transform: translate(0, -25%);
+}
+.modal.in .modal-dialog {
+  -webkit-transform: translate(0, 0);
+      -ms-transform: translate(0, 0);
+       -o-transform: translate(0, 0);
+          transform: translate(0, 0);
+}
+.modal-open .modal {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.modal-dialog {
+  position: relative;
+  width: auto;
+  margin: 10px;
+}
+.modal-content {
+  position: relative;
+  background-color: #fff;
+  -webkit-background-clip: padding-box;
+          background-clip: padding-box;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, .2);
+  border-radius: 6px;
+  outline: 0;
+  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+          box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+}
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000;
+}
+.modal-backdrop.fade {
+  filter: alpha(opacity=0);
+  opacity: 0;
+}
+.modal-backdrop.in {
+  filter: alpha(opacity=50);
+  opacity: .5;
+}
+.modal-header {
+  min-height: 16.42857143px;
+  padding: 15px;
+  border-bottom: 1px solid #e5e5e5;
+}
+.modal-header .close {
+  margin-top: -2px;
+}
+.modal-title {
+  margin: 0;
+  line-height: 1.42857143;
+}
+.modal-body {
+  position: relative;
+  padding: 15px;
+}
+.modal-footer {
+  padding: 15px;
+  text-align: right;
+  border-top: 1px solid #e5e5e5;
+}
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
+}
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+.modal-scrollbar-measure {
+  position: absolute;
+  top: -9999px;
+  width: 50px;
+  height: 50px;
+  overflow: scroll;
+}
+@media (min-width: 768px) {
+  .modal-dialog {
+    width: 600px;
+    margin: 30px auto;
+  }
+  .modal-content {
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+            box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+  }
+  .modal-sm {
+    width: 300px;
+  }
+}
+@media (min-width: 992px) {
+  .modal-lg {
+    width: 900px;
+  }
+}
+.tooltip {
+  position: absolute;
+  z-index: 1070;
+  display: block;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 12px;
+  font-weight: normal;
+  line-height: 1.4;
+  filter: alpha(opacity=0);
+  opacity: 0;
+}
+.tooltip.in {
+  filter: alpha(opacity=90);
+  opacity: .9;
+}
+.tooltip.top {
+  padding: 5px 0;
+  margin-top: -3px;
+}
+.tooltip.right {
+  padding: 0 5px;
+  margin-left: 3px;
+}
+.tooltip.bottom {
+  padding: 5px 0;
+  margin-top: 3px;
+}
+.tooltip.left {
+  padding: 0 5px;
+  margin-left: -3px;
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 3px 8px;
+  color: #fff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000;
+  border-radius: 4px;
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #000;
+}
+.tooltip.top-left .tooltip-arrow {
+  right: 5px;
+  bottom: 0;
+  margin-bottom: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #000;
+}
+.tooltip.top-right .tooltip-arrow {
+  bottom: 0;
+  left: 5px;
+  margin-bottom: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #000;
+}
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-width: 5px 5px 5px 0;
+  border-right-color: #000;
+}
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-width: 5px 0 5px 5px;
+  border-left-color: #000;
+}
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #000;
+}
+.tooltip.bottom-left .tooltip-arrow {
+  top: 0;
+  right: 5px;
+  margin-top: -5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #000;
+}
+.tooltip.bottom-right .tooltip-arrow {
+  top: 0;
+  left: 5px;
+  margin-top: -5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #000;
+}
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1060;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 1.42857143;
+  text-align: left;
+  white-space: normal;
+  background-color: #fff;
+  -webkit-background-clip: padding-box;
+          background-clip: padding-box;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, .2);
+  border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+}
+.popover.top {
+  margin-top: -10px;
+}
+.popover.right {
+  margin-left: 10px;
+}
+.popover.bottom {
+  margin-top: 10px;
+}
+.popover.left {
+  margin-left: -10px;
+}
+.popover-title {
+  padding: 8px 14px;
+  margin: 0;
+  font-size: 14px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  border-radius: 5px 5px 0 0;
+}
+.popover-content {
+  padding: 9px 14px;
+}
+.popover > .arrow,
+.popover > .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.popover > .arrow {
+  border-width: 11px;
+}
+.popover > .arrow:after {
+  content: "";
+  border-width: 10px;
+}
+.popover.top > .arrow {
+  bottom: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, .25);
+  border-bottom-width: 0;
+}
+.popover.top > .arrow:after {
+  bottom: 1px;
+  margin-left: -10px;
+  content: " ";
+  border-top-color: #fff;
+  border-bottom-width: 0;
+}
+.popover.right > .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, .25);
+  border-left-width: 0;
+}
+.popover.right > .arrow:after {
+  bottom: -10px;
+  left: 1px;
+  content: " ";
+  border-right-color: #fff;
+  border-left-width: 0;
+}
+.popover.bottom > .arrow {
+  top: -11px;
+  left: 50%;
+  margin-left: -11px;
+  border-top-width: 0;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, .25);
+}
+.popover.bottom > .arrow:after {
+  top: 1px;
+  margin-left: -10px;
+  content: " ";
+  border-top-width: 0;
+  border-bottom-color: #fff;
+}
+.popover.left > .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-right-width: 0;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, .25);
+}
+.popover.left > .arrow:after {
+  right: 1px;
+  bottom: -10px;
+  content: " ";
+  border-right-width: 0;
+  border-left-color: #fff;
+}
+.carousel {
+  position: relative;
+}
+.carousel-inner {
+  position: relative;
+  width: 100%;
+  overflow: hidden;
+}
+.carousel-inner > .item {
+  position: relative;
+  display: none;
+  -webkit-transition: .6s ease-in-out left;
+       -o-transition: .6s ease-in-out left;
+          transition: .6s ease-in-out left;
+}
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  line-height: 1;
+}
+@media all and (transform-3d), (-webkit-transform-3d) {
+  .carousel-inner > .item {
+    -webkit-transition: -webkit-transform .6s ease-in-out;
+         -o-transition:      -o-transform .6s ease-in-out;
+            transition:         transform .6s ease-in-out;
+
+    -webkit-backface-visibility: hidden;
+            backface-visibility: hidden;
+    -webkit-perspective: 1000;
+            perspective: 1000;
+  }
+  .carousel-inner > .item.next,
+  .carousel-inner > .item.active.right {
+    left: 0;
+    -webkit-transform: translate3d(100%, 0, 0);
+            transform: translate3d(100%, 0, 0);
+  }
+  .carousel-inner > .item.prev,
+  .carousel-inner > .item.active.left {
+    left: 0;
+    -webkit-transform: translate3d(-100%, 0, 0);
+            transform: translate3d(-100%, 0, 0);
+  }
+  .carousel-inner > .item.next.left,
+  .carousel-inner > .item.prev.right,
+  .carousel-inner > .item.active {
+    left: 0;
+    -webkit-transform: translate3d(0, 0, 0);
+            transform: translate3d(0, 0, 0);
+  }
+}
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+.carousel-inner > .active {
+  left: 0;
+}
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.carousel-inner > .next {
+  left: 100%;
+}
+.carousel-inner > .prev {
+  left: -100%;
+}
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+.carousel-inner > .active.left {
+  left: -100%;
+}
+.carousel-inner > .active.right {
+  left: 100%;
+}
+.carousel-control {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  width: 15%;
+  font-size: 20px;
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+  filter: alpha(opacity=50);
+  opacity: .5;
+}
+.carousel-control.left {
+  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
+  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
+  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .0001)));
+  background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+  background-repeat: repeat-x;
+}
+.carousel-control.right {
+  right: 0;
+  left: auto;
+  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
+  background-image:      -o-linear-gradient(left, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
+  background-image: -webkit-gradient(linear, left top, right top, from(rgba(0, 0, 0, .0001)), to(rgba(0, 0, 0, .5)));
+  background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+  background-repeat: repeat-x;
+}
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #fff;
+  text-decoration: none;
+  filter: alpha(opacity=90);
+  outline: 0;
+  opacity: .9;
+}
+.carousel-control .icon-prev,
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-left,
+.carousel-control .glyphicon-chevron-right {
+  position: absolute;
+  top: 50%;
+  z-index: 5;
+  display: inline-block;
+}
+.carousel-control .icon-prev,
+.carousel-control .glyphicon-chevron-left {
+  left: 50%;
+  margin-left: -10px;
+}
+.carousel-control .icon-next,
+.carousel-control .glyphicon-chevron-right {
+  right: 50%;
+  margin-right: -10px;
+}
+.carousel-control .icon-prev,
+.carousel-control .icon-next {
+  width: 20px;
+  height: 20px;
+  margin-top: -10px;
+  font-family: serif;
+  line-height: 1;
+}
+.carousel-control .icon-prev:before {
+  content: '\2039';
+}
+.carousel-control .icon-next:before {
+  content: '\203a';
+}
+.carousel-indicators {
+  position: absolute;
+  bottom: 10px;
+  left: 50%;
+  z-index: 15;
+  width: 60%;
+  padding-left: 0;
+  margin-left: -30%;
+  text-align: center;
+  list-style: none;
+}
+.carousel-indicators li {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  margin: 1px;
+  text-indent: -999px;
+  cursor: pointer;
+  background-color: #000 \9;
+  background-color: rgba(0, 0, 0, 0);
+  border: 1px solid #fff;
+  border-radius: 10px;
+}
+.carousel-indicators .active {
+  width: 12px;
+  height: 12px;
+  margin: 0;
+  background-color: #fff;
+}
+.carousel-caption {
+  position: absolute;
+  right: 15%;
+  bottom: 20px;
+  left: 15%;
+  z-index: 10;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  color: #fff;
+  text-align: center;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+}
+.carousel-caption .btn {
+  text-shadow: none;
+}
+@media screen and (min-width: 768px) {
+  .carousel-control .glyphicon-chevron-left,
+  .carousel-control .glyphicon-chevron-right,
+  .carousel-control .icon-prev,
+  .carousel-control .icon-next {
+    width: 30px;
+    height: 30px;
+    margin-top: -15px;
+    font-size: 30px;
+  }
+  .carousel-control .glyphicon-chevron-left,
+  .carousel-control .icon-prev {
+    margin-left: -15px;
+  }
+  .carousel-control .glyphicon-chevron-right,
+  .carousel-control .icon-next {
+    margin-right: -15px;
+  }
+  .carousel-caption {
+    right: 20%;
+    left: 20%;
+    padding-bottom: 30px;
+  }
+  .carousel-indicators {
+    bottom: 20px;
+  }
+}
+.clearfix:before,
+.clearfix:after,
+.dl-horizontal dd:before,
+.dl-horizontal dd:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  content: " ";
+}
+.clearfix:after,
+.dl-horizontal dd:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
+  clear: both;
+}
+.center-block {
+  display: block;
+  margin-right: auto;
+  margin-left: auto;
+}
+.pull-right {
+  float: right !important;
+}
+.pull-left {
+  float: left !important;
+}
+.hide {
+  display: none !important;
+}
+.show {
+  display: block !important;
+}
+.invisible {
+  visibility: hidden;
+}
+.text-hide {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+.hidden {
+  display: none !important;
+}
+.affix {
+  position: fixed;
+}
+@-ms-viewport {
+  width: device-width;
+}
+.visible-xs,
+.visible-sm,
+.visible-md,
+.visible-lg {
+  display: none !important;
+}
+.visible-xs-block,
+.visible-xs-inline,
+.visible-xs-inline-block,
+.visible-sm-block,
+.visible-sm-inline,
+.visible-sm-inline-block,
+.visible-md-block,
+.visible-md-inline,
+.visible-md-inline-block,
+.visible-lg-block,
+.visible-lg-inline,
+.visible-lg-inline-block {
+  display: none !important;
+}
+@media (max-width: 767px) {
+  .visible-xs {
+    display: block !important;
+  }
+  table.visible-xs {
+    display: table;
+  }
+  tr.visible-xs {
+    display: table-row !important;
+  }
+  th.visible-xs,
+  td.visible-xs {
+    display: table-cell !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-block {
+    display: block !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-inline {
+    display: inline !important;
+  }
+}
+@media (max-width: 767px) {
+  .visible-xs-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm {
+    display: block !important;
+  }
+  table.visible-sm {
+    display: table;
+  }
+  tr.visible-sm {
+    display: table-row !important;
+  }
+  th.visible-sm,
+  td.visible-sm {
+    display: table-cell !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm-block {
+    display: block !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm-inline {
+    display: inline !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-sm-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md {
+    display: block !important;
+  }
+  table.visible-md {
+    display: table;
+  }
+  tr.visible-md {
+    display: table-row !important;
+  }
+  th.visible-md,
+  td.visible-md {
+    display: table-cell !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md-block {
+    display: block !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md-inline {
+    display: inline !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .visible-md-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg {
+    display: block !important;
+  }
+  table.visible-lg {
+    display: table;
+  }
+  tr.visible-lg {
+    display: table-row !important;
+  }
+  th.visible-lg,
+  td.visible-lg {
+    display: table-cell !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg-block {
+    display: block !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg-inline {
+    display: inline !important;
+  }
+}
+@media (min-width: 1200px) {
+  .visible-lg-inline-block {
+    display: inline-block !important;
+  }
+}
+@media (max-width: 767px) {
+  .hidden-xs {
+    display: none !important;
+  }
+}
+@media (min-width: 768px) and (max-width: 991px) {
+  .hidden-sm {
+    display: none !important;
+  }
+}
+@media (min-width: 992px) and (max-width: 1199px) {
+  .hidden-md {
+    display: none !important;
+  }
+}
+@media (min-width: 1200px) {
+  .hidden-lg {
+    display: none !important;
+  }
+}
+.visible-print {
+  display: none !important;
+}
+@media print {
+  .visible-print {
+    display: block !important;
+  }
+  table.visible-print {
+    display: table;
+  }
+  tr.visible-print {
+    display: table-row !important;
+  }
+  th.visible-print,
+  td.visible-print {
+    display: table-cell !important;
+  }
+}
+.visible-print-block {
+  display: none !important;
+}
+@media print {
+  .visible-print-block {
+    display: block !important;
+  }
+}
+.visible-print-inline {
+  display: none !important;
+}
+@media print {
+  .visible-print-inline {
+    display: inline !important;
+  }
+}
+.visible-print-inline-block {
+  display: none !important;
+}
+@media print {
+  .visible-print-inline-block {
+    display: inline-block !important;
+  }
+}
+@media print {
+  .hidden-print {
+    display: none !important;
+  }
+}
+/*# sourceMappingURL=bootstrap.css.map */
diff --git a/turtles/css/contact.css b/turtles/css/contact.css
new file mode 100644
index 000000000..c6e69e22f
--- /dev/null
+++ b/turtles/css/contact.css
@@ -0,0 +1,3 @@
+.alert {
+	margin-top: 10px;
+}
\ No newline at end of file
diff --git a/turtles/css/font-awesome.min.css b/turtles/css/font-awesome.min.css
new file mode 100644
index 000000000..24fcc04c4
--- /dev/null
+++ b/turtles/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.3.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.3.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.3.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.3.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.3.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.3.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;transform:translate(0, 0)}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-genderless:before,.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}
\ No newline at end of file
diff --git a/turtles/css/main.css b/turtles/css/main.css
new file mode 100644
index 000000000..03644174a
--- /dev/null
+++ b/turtles/css/main.css
@@ -0,0 +1,135 @@
+/*==============================
+=            NAVBAR            =
+==============================*/
+@media (max-width: 769px) {
+  .language-picker {
+    display: none; }
+
+  #settings {
+    display: block !important; } }
+.navbar-nav {
+  margin-top: -1px !important;
+  overflow-y: hidden; }
+  .navbar-nav li a {
+    font-size: 24px;
+    font-family: 'Squada One', cursive; }
+
+.container {
+  max-width: 900px !important;
+  margin: auto; }
+
+#settings {
+  display: none; }
+
+.jumbotron {
+  background: #fff !important;
+  margin-top: -20px;
+  padding: 0 !important; }
+  .jumbotron h1, .jumbotron h2 {
+    font-family: 'Squada One', cursive; }
+  .jumbotron p {
+    font-family: Lora,sans-serif;
+    margin: 0; }
+  .jumbotron span {
+    font-size: 1.1em;
+    font-family: Lora,sans-serif; }
+  .jumbotron input[type="checkbox"] {
+    margin-left: 20px;
+    margin-right: 5px; }
+
+.id {
+  margin-top: 15px; }
+
+.container {
+  text-align: center; }
+
+.next_week {
+  margin-top: 50px; }
+
+.see-more {
+  margin-top: 20px; }
+
+.input-id {
+  width: 50px; }
+
+.navbar-nav.nav-justified > li {
+  float: none; }
+
+.turtle-day p:first-child {
+  background-color: #eee;
+  margin-bottom: 0; }
+.turtle-day p span {
+  margin-right: 40px; }
+
+.turtle-global, .turtle-jpn {
+  margin-top: 20px; }
+
+.turtle-jpn :nth-child(odd) div p, .event-day :nth-child(odd) div p {
+  background-color: #eee; }
+.turtle-jpn :nth-child(2n) div p, .event-day :nth-child(2n) div p {
+  margin-bottom: 15px !important; }
+
+.turtle-day-jpn p, .event-day-jpn p {
+  margin-bottom: 0 !important; }
+.turtle-day-jpn p span, .event-day-jpn p span {
+  margin-right: 40px; }
+
+.game-version {
+  margin-bottom: -10px; }
+
+.ttc-version {
+  margin-top: -10px; }
+
+.event-version {
+  margin-top: 20px; }
+
+table {
+  margin-top: 20px !important;
+  max-width: 600px !important;
+  margin: auto; }
+  table th {
+    text-align: center; }
+
+.bb-hours {
+  margin-bottom: -5px; }
+
+.timer span {
+  font-family: 'Consolas'; }
+
+.nav, .pagination, .carousel, .panel-title a {
+  cursor: pointer; }
+
+iframe {
+  width: 100%;
+  height: 900px; }
+
+/*==================================
+=            TTIME BETA            =
+==================================*/
+.ttime-day {
+  display: block; }
+  .ttime-day:first-child {
+    margin-top: 20px; }
+  .ttime-day:nth-child(odd) {
+    background-color: #eee; }
+  .ttime-day:nth-child(2n+0) {
+    margin-bottom: 10px; }
+  .ttime-day p {
+    margin-bottom: 0px !important; }
+    .ttime-day p span {
+      margin-right: 15px; }
+
+.btn-notif {
+  margin: 5px 0 5px 0 !important; }
+
+.settings-notif * {
+  text-align: center; }
+.settings-notif div:first-child {
+  margin-bottom: 5px; }
+.settings-notif div > button {
+  margin-left: 20px; }
+
+.alert-site {
+  margin-top: 13px; }
+
+/*# sourceMappingURL=main.css.map */
diff --git a/turtles/css/main.scss b/turtles/css/main.scss
new file mode 100644
index 000000000..1141e83e0
--- /dev/null
+++ b/turtles/css/main.scss
@@ -0,0 +1,201 @@
+/*==============================
+=            NAVBAR            =
+==============================*/
+
+@media (max-width: 640px) {
+	// #bonus-isles {
+	// 	margin-left: -30px !important;
+	// }
+}
+
+@media (max-width: 769px) {
+	.language-picker {
+		display: none;
+	}
+
+	#settings {
+		display: block !important;
+	}
+}
+
+.navbar-nav {
+	margin-top: -1px !important; // remove margin for mobile
+	overflow-y: hidden;
+	li a{
+		font-size: 24px;
+		font-family: 'Squada One', cursive;
+	}
+}
+.container {
+	max-width: 900px !important;
+	margin: auto;
+}
+
+#settings {
+	display: none;
+}
+
+
+.jumbotron {
+	background: #fff !important;
+	margin-top: -20px;
+	padding: 0 !important;
+	h1, h2 {
+		font-family: 'Squada One', cursive;
+	}
+	p {
+		font-family: Lora,sans-serif;
+		margin: 0;
+	}
+	span {
+		font-size: 1.1em;
+		font-family: Lora,sans-serif;
+	}
+	input[type="checkbox"] {
+		margin-left: 20px;
+		margin-right: 5px;
+	}
+}
+
+.id {
+	margin-top: 15px;
+}
+
+.container {
+	text-align: center;
+}
+
+.next_week {
+	margin-top: 50px;
+}
+
+.see-more {
+	margin-top: 20px;
+}
+
+.input-id {
+	width: 50px;
+}
+
+.navbar-nav.nav-justified > li {
+	float: none;
+}
+
+.turtle-day {
+	p {
+		&:first-child{
+			background-color: #eee;
+			margin-bottom: 0;
+		}
+		span {
+		margin-right:40px;
+		}
+	}
+}
+
+.turtle-global, .turtle-jpn {
+	margin-top: 20px;
+}
+
+.turtle-jpn, .event-day {
+	:nth-child(odd) {
+		div p {
+			background-color: #eee;
+		}
+	}
+	:nth-child(2n) {
+		div p {
+			margin-bottom: 15px !important;
+		}
+	}
+}
+.turtle-day-jpn, .event-day-jpn {
+	p {
+		margin-bottom: 0 !important;
+	}
+	p span{
+	margin-right:40px;
+	}
+}
+
+.game-version {
+	margin-bottom: -10px;
+}
+
+.ttc-version {
+	margin-top: -10px;
+}
+
+.event-version {
+	margin-top: 20px;
+}
+
+table {
+	margin-top: 20px !important;
+	max-width: 600px !important;
+	margin: auto;
+	th {
+		text-align: center;
+	}
+}
+
+.bb-hours {
+	margin-bottom: -5px;
+}
+
+.timer span{
+	font-family: 'Consolas';
+}
+
+.nav, .pagination, .carousel, .panel-title a { cursor: pointer; }
+
+iframe {
+	width: 100%;
+	height: 900px;
+}
+
+/*==================================
+=            TTIME BETA            =
+==================================*/
+
+.ttime-day {
+	display: block;
+
+	&:first-child {
+		margin-top: 20px;
+	}
+
+	&:nth-child(odd) {
+		background-color: #eee;
+	}
+
+	&:nth-child(2n+0) {
+		margin-bottom: 10px;
+	}
+
+	p {
+		margin-bottom: 0px !important;
+		span {
+			margin-right: 15px;
+		}
+	}
+}
+
+.btn-notif {
+	margin: 5px 0 5px 0 !important;
+}
+.settings-notif {
+	* {
+		text-align: center;
+	}
+	div:first-child {
+		margin-bottom: 5px;
+	}
+	div>button {
+		margin-left: 20px;
+	}
+}
+
+.alert-site {
+	margin-top: 13px;
+}
\ No newline at end of file
diff --git a/turtles/css/normalize.css b/turtles/css/normalize.css
new file mode 100644
index 000000000..458eea1ea
--- /dev/null
+++ b/turtles/css/normalize.css
@@ -0,0 +1,427 @@
+/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
+
+/**
+ * 1. Set default font family to sans-serif.
+ * 2. Prevent iOS text size adjust after orientation change, without disabling
+ *    user zoom.
+ */
+
+html {
+  font-family: sans-serif; /* 1 */
+  -ms-text-size-adjust: 100%; /* 2 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/**
+ * Remove default margin.
+ */
+
+body {
+  margin: 0;
+}
+
+/* HTML5 display definitions
+   ========================================================================== */
+
+/**
+ * Correct `block` display not defined for any HTML5 element in IE 8/9.
+ * Correct `block` display not defined for `details` or `summary` in IE 10/11
+ * and Firefox.
+ * Correct `block` display not defined for `main` in IE 11.
+ */
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section,
+summary {
+  display: block;
+}
+
+/**
+ * 1. Correct `inline-block` display not defined in IE 8/9.
+ * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+ */
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; /* 1 */
+  vertical-align: baseline; /* 2 */
+}
+
+/**
+ * Prevent modern browsers from displaying `audio` without controls.
+ * Remove excess height in iOS 5 devices.
+ */
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+/**
+ * Address `[hidden]` styling not present in IE 8/9/10.
+ * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+ */
+
+[hidden],
+template {
+  display: none;
+}
+
+/* Links
+   ========================================================================== */
+
+/**
+ * Remove the gray background color from active links in IE 10.
+ */
+
+a {
+  background-color: transparent;
+}
+
+/**
+ * Improve readability when focused and also mouse hovered in all browsers.
+ */
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+/* Text-level semantics
+   ========================================================================== */
+
+/**
+ * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+ */
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+/**
+ * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+ */
+
+b,
+strong {
+  font-weight: bold;
+}
+
+/**
+ * Address styling not present in Safari and Chrome.
+ */
+
+dfn {
+  font-style: italic;
+}
+
+/**
+ * Address variable `h1` font-size and margin within `section` and `article`
+ * contexts in Firefox 4+, Safari, and Chrome.
+ */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/**
+ * Address styling not present in IE 8/9.
+ */
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+/**
+ * Address inconsistent and variable font size in all browsers.
+ */
+
+small {
+  font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+ */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+/* Embedded content
+   ========================================================================== */
+
+/**
+ * Remove border when inside `a` element in IE 8/9/10.
+ */
+
+img {
+  border: 0;
+}
+
+/**
+ * Correct overflow not hidden in IE 9/10/11.
+ */
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+/* Grouping content
+   ========================================================================== */
+
+/**
+ * Address margin not present in IE 8/9 and Safari.
+ */
+
+figure {
+  margin: 1em 40px;
+}
+
+/**
+ * Address differences between Firefox and other browsers.
+ */
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
+
+/**
+ * Contain overflow in all browsers.
+ */
+
+pre {
+  overflow: auto;
+}
+
+/**
+ * Address odd `em`-unit font size rendering in all browsers.
+ */
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+/* Forms
+   ========================================================================== */
+
+/**
+ * Known limitation: by default, Chrome and Safari on OS X allow very limited
+ * styling of `select`, unless a `border` property is set.
+ */
+
+/**
+ * 1. Correct color not being inherited.
+ *    Known issue: affects color of disabled elements.
+ * 2. Correct font properties not being inherited.
+ * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; /* 1 */
+  font: inherit; /* 2 */
+  margin: 0; /* 3 */
+}
+
+/**
+ * Address `overflow` set to `hidden` in IE 8/9/10/11.
+ */
+
+button {
+  overflow: visible;
+}
+
+/**
+ * Address inconsistent `text-transform` inheritance for `button` and `select`.
+ * All other form control elements do not inherit `text-transform` values.
+ * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+ * Correct `select` style inheritance in Firefox.
+ */
+
+button,
+select {
+  text-transform: none;
+}
+
+/**
+ * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+ *    and `video` controls.
+ * 2. Correct inability to style clickable `input` types in iOS.
+ * 3. Improve usability and consistency of cursor style between image-type
+ *    `input` and others.
+ */
+
+button,
+html input[type="button"], /* 1 */
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; /* 2 */
+  cursor: pointer; /* 3 */
+}
+
+/**
+ * Re-set default cursor for disabled elements.
+ */
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+/**
+ * Remove inner padding and border in Firefox 4+.
+ */
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+/**
+ * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+ * the UA stylesheet.
+ */
+
+input {
+  line-height: normal;
+}
+
+/**
+ * It's recommended that you don't attempt to style these elements.
+ * Firefox's implementation doesn't respect box-sizing, padding, or width.
+ *
+ * 1. Address box sizing set to `content-box` in IE 8/9/10.
+ * 2. Remove excess padding in IE 8/9/10.
+ */
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+ * `font-size` values of the `input`, it causes the cursor style of the
+ * decrement button to change from `default` to `text`.
+ */
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+ * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+ * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+ *    (include `-moz` to future-proof).
+ */
+
+input[type="search"] {
+  -webkit-appearance: textfield; /* 1 */
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box; /* 2 */
+  box-sizing: content-box;
+}
+
+/**
+ * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+ * Safari (but not Chrome) clips the cancel button when the search input has
+ * padding (and `textfield` appearance).
+ */
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+ * Define consistent border, margin, and padding.
+ */
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+/**
+ * 1. Correct `color` not being inherited in IE 8/9/10/11.
+ * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+ */
+
+legend {
+  border: 0; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+ * Remove default vertical scrollbar in IE 8/9/10/11.
+ */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+ * Don't inherit the `font-weight` (applied by a rule above).
+ * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+ */
+
+optgroup {
+  font-weight: bold;
+}
+
+/* Tables
+   ========================================================================== */
+
+/**
+ * Remove most spacing between table cells.
+ */
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}
diff --git a/turtles/css/polyglot-language-switcher-2.css b/turtles/css/polyglot-language-switcher-2.css
new file mode 100644
index 000000000..ed5c32fa3
--- /dev/null
+++ b/turtles/css/polyglot-language-switcher-2.css
@@ -0,0 +1,131 @@
+@charset "utf-8";
+/* CSS Document */
+
+
+/* ---------------------------------------------------------------------- */
+/* Polyglot Language Switcher 2
+/* ----------------------------------------------------------------------
+Version: 1.0.0
+Author: Ixtendo
+Author URI: http://www.ixtendo.com
+License: MIT License
+License URI: http://www.opensource.org/licenses/mit-license.php
+------------------------------------------------------------------------- */
+
+
+/* ---------------------------------------------------------------------- */
+/* TABLE OF CONTENTS
+/* ----------------------------------------------------------------------
+-Global Styles
+-Selected Locale (the trigger for the dropdown)
+-Language Container
+------------------------------------------------------------------------- */
+
+
+/* ---------------------------------------------------------------------- */
+/* Global Styles
+/* ---------------------------------------------------------------------- */
+.polyglot-language-switcher {
+	font: 14px/1.5em "Helvetica Neue", Helvetica, Arial, sans-serif; /* edit or delete so that the switcher inherits the font styles of your project */
+}
+
+.polyglot-language-switcher,
+.polyglot-language-switcher * {
+	margin: 0;
+	padding: 0;	
+}
+
+.polyglot-language-switcher {
+	position: relative;	
+}
+
+.polyglot-language-switcher ul {
+	list-style: none;	
+}
+
+.polyglot-language-switcher a {
+	transition: all 0.2s ease-in-out;
+}
+
+.polyglot-language-switcher img {
+	margin-right: 3px;	
+}
+
+/* ---------------------------------------------------------------------- */
+/* Selected Locale (the trigger for the dropdown)
+/* ---------------------------------------------------------------------- */
+.polyglot-language-switcher > .pls-selected-locale {
+	text-decoration: none;
+	color: #333; 
+	position: relative; /* for the arrow */
+
+	/*custom*/
+	top: 13px;
+}
+
+.polyglot-language-switcher > .pls-selected-locale:hover {
+	color: #3a91bd;	
+}
+
+.polyglot-language-switcher > .pls-selected-locale:after { 
+	content: " "; 
+	position: absolute;
+	top: 50%;
+	margin-top: -2px;
+	left: 100%;
+	margin-left: 5px;
+	width: 0; 
+	height: 0; 
+	border-left: 4px solid transparent;
+	border-right: 4px solid transparent;
+	border-top: 4px solid #000;
+}
+
+/* ---------------------------------------------------------------------- */
+/* Language Container
+/* ---------------------------------------------------------------------- */
+.pls-language-container-scrollable {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 10000;
+	/*width: 100%;*/
+	/*overflow-x: auto;	*/
+}
+
+.pls-language-container {
+	margin-top: 10px;
+	padding: 10px 0;
+	border: 1px solid #ccc;	
+	box-shadow: 0 1px 2px rgba(0,0,0,.08);
+	background-color: #fff;
+}
+
+.pls-language-container td {
+	padding: 0 10px;
+	border-right: 1px solid #ccc;
+	vertical-align: top;
+}
+
+.pls-language-container td:last-child {
+	border-right: none;
+}
+
+.pls-language-container a {
+	color: #3a91bd;	
+	text-decoration: none;
+	padding: 5px 10px;
+	display: block;
+	white-space: nowrap;
+}
+
+.pls-language-container a:hover {
+	background-color: #f5f5f5;	
+	color: #333; 
+}
+
+.pls-language-container .pls-selected-locale {
+	color: #333;
+	font-weight: bold;	
+	cursor: default;
+}
\ No newline at end of file
diff --git a/turtles/event-jpn.html b/turtles/event-jpn.html
new file mode 100644
index 000000000..7651e1538
--- /dev/null
+++ b/turtles/event-jpn.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>Turtle Time Calc</title>
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/main.css">
+		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
+		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
+		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
+		<script src="app/lib/moment.min.js"></script>
+		<script src="app/lib/angular-local-storage.min.js"></script>
+		<script src="app/lib/angular-translate.min.js"></script>
+		<script src="app/lib/angular-timer.min.js"></script>
+		<script src="app/lib/humanize-duration.js"></script>
+		<script src="app/lib/ng-table.min.js"></script>
+		<script src="app/lib/ui-bootstrap-tpls-0.13.0.min.js"></script>
+		<script src="app/lib/angular-polyglot.language.switcher.js"></script>
+		<script src="app/lib/momentjs/locale/de.js"></script>
+		<script src="app/lib/momentjs/locale/es.js"></script>
+		<script src="app/lib/bower_components/angular-animate/angular-animate.min.js"></script>
+		<script src="app/app.js"></script>
+		<script src="app/controllers/eventCtrl.js"></script>
+		<script src="app/controllers/localeCtrl.js"></script>
+		<script src="app/controllers/navbarCtrl.js"></script>
+		<script src="app/directives/eventDirective.js"></script>
+		<script src="app/directives/collapseDirective.js"></script>
+		<script src="app/config/localizeConfig.js"></script>
+		<script>
+		  (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-62547536-1', 'auto');
+		  ga('send', 'pageview');
+
+		</script>
+	</head>
+
+	<body ng-app="app" ng-controller="LocaleCtrl as locale" ng-cloak>
+		
+		<nav class="navbar navbar-default" ng-controller="NavbarCtrl" ng-click="$event.stopPropagation()">
+				<div class="container">
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle" ng-click="isCollapsed=!isCollapsed">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span> 
+						</button>
+					</div>
+					<div class="navbar-collapse" collapse="isCollapsed">
+						<ul class="nav navbar-nav">
+							<li><a href="index.html">{{ 'NAV_TURTLE' | translate }}</a></li>
+							<li><a href="barrel.html">{{ 'NAV_BARREL' | translate }}</a></li>
+							<li><a href="event.html">{{ 'NAV_EVENT' | translate }}</a></li>
+							<li class="active"><a href="event-jpn.html">{{ 'NAV_EVENT' | translate }}(JPN)</a></li>
+							<li id="settings"><a href="settings.html">{{ 'NAV_SETTINGS' | translate }}</a></li>
+						</ul>
+						<div class="language-picker nav pull-right">
+							<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" selected-lang="{{locale.flag}}" language-changed-callback="onLanguageChanged(lang)"></pls>
+						</div>
+					</div>
+				</div>
+		</nav>
+
+		<div class="jumbotron" ng-controller="EventCtrl as event">
+			<div class="container">
+				<h1>Cotton Candy Calculator</h1>
+				<div>
+					<div class="id">
+						<span>{{'TT_DIGIT' | translate}}</span>
+						<input type="number" min="0" max="9" ng-model="event.id" class="input-id" select-on-click>
+						<input type="checkbox" name="militaryTime" ng-model="event.military">{{'TT_FORMAT' | translate}}
+					</div>
+					<p>{{'TT_TIMEZONE' | translate}} {{event.timezone}}</p>
+					<div class="event-day">
+						<event-day-jpn
+							military="event.military"
+							index="$index"
+							my-id="event.id"
+							my-time="event.my_time"
+							ng-repeat="t in event.range(3) track by $index"
+							locale="locale.locale"
+							>
+						</event-day-jpn>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	</body>
+
+</html>
diff --git a/turtles/event.html b/turtles/event.html
new file mode 100644
index 000000000..48e48b84f
--- /dev/null
+++ b/turtles/event.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>Turtle Time Calc</title>
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/main.css">
+		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
+		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
+		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
+		<script src="app/lib/moment.min.js"></script>
+		<script src="app/lib/angular-local-storage.min.js"></script>
+		<script src="app/lib/angular-translate.min.js"></script>
+		<script src="app/lib/angular-timer.min.js"></script>
+		<script src="app/lib/humanize-duration.js"></script>
+		<script src="app/lib/ng-table.min.js"></script>
+		<script src="app/lib/ui-bootstrap-tpls-0.13.0.min.js"></script>
+		<script src="app/lib/angular-polyglot.language.switcher.js"></script>
+		<script src="app/lib/momentjs/locale/de.js"></script>
+		<script src="app/lib/momentjs/locale/es.js"></script>
+		<script src="app/lib/bower_components/angular-animate/angular-animate.min.js"></script>
+		<script src="app/app.js"></script>
+		<script src="app/controllers/eventCtrl.js"></script>
+		<script src="app/controllers/localeCtrl.js"></script>
+		<script src="app/controllers/navbarCtrl.js"></script>
+		<script src="app/directives/eventDirective.js"></script>
+		<script src="app/directives/collapseDirective.js"></script>
+		<script src="app/config/localizeConfig.js"></script>
+	</head>
+
+	<body ng-app="app" ng-controller="LocaleCtrl as locale" ng-cloak>
+		
+		<nav class="navbar navbar-default" ng-controller="NavbarCtrl" ng-click="$event.stopPropagation()">
+				<div class="container">
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle" ng-click="isCollapsed=!isCollapsed">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span> 
+						</button>
+					</div>
+					<div class="navbar-collapse init" collapse="isCollapsed">
+						<ul class="nav navbar-nav">
+							<li><a href="index.html">{{ 'NAV_TURTLE' | translate }}</a></li>
+							<li><a href="barrel.html">{{ 'NAV_BARREL' | translate }}</a></li>
+							<li id="settings"><a href="settings.html">{{ 'NAV_SETTINGS' | translate }}</a></li>
+						</ul>
+						<div class="language-picker nav pull-right">
+							<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" selected-lang="{{locale.flag}}" language-changed-callback="onLanguageChanged(lang)"></pls>
+						</div>
+					</div>
+				</div>
+		</nav>
+
+		<div class="jumbotron" ng-controller="EventCtrl as event">
+			<div class="container">
+<!-- 				<h1>{{'TT_TITLE' | translate}}</h1>
+				<div>
+					<div class="id">
+						<span>{{'TT_DIGIT' | translate}}</span>
+						<input type="number" min="0" max="9" ng-model="event.id" class="input-id" select-on-click>
+						<input type="checkbox" name="militaryTime" ng-model="event.military">{{'TT_FORMAT' | translate}}
+					</div>
+					<p>{{'TT_TIMEZONE' | translate}} {{event.timezone}}</p>
+					<event-day 
+						military="event.military"
+						index="$index"
+						my-id="event.id"
+						my-time="event.my_time"
+						ng-repeat="t in event.range(3) track by $index"
+						locale="locale.locale"
+						>
+					</event-day>
+				</div> -->
+<!-- 				<h2><a href="http://robocafaz.com/sugo/">Sugofest</a> 
+					<timer end-time="1436929200000" max-time-unit="'hour'">{{hhours}}:{{mminutes}}:{{sseconds}}</timer>
+				</h2>
+				<hr> -->
+				<div class="btn-group game-version event-version">
+					<label class="btn btn-default" ng-model="event.global" btn-radio="'global'">GLOBAL</label>
+					<label class="btn btn-default" ng-model="event.global" btn-radio="'jpn'">JPN</label>
+				</div>
+				<h2>{{'BB_TIME' | translate}}
+					<isle-time global="true" ng-show="event.version()"></isle-time>
+					<isle-time global="false" ng-show="!event.version()"></isle-time>
+					<!-- <isle-time global="event.next_day_jpn" ng-show="!event.version()"></isle-time> -->
+				</h2>
+				<div class="bb-hours">
+					<input type="checkbox" name="bbAlt" ng-model="event.show_hours">{{'BB_ALT' | translate}}
+				</div>
+				<table ng-table class="table table-bordered table-striped" id="bonus-isles">
+					<tr>
+						<th>{{'BB_DATE' | translate}}</th>
+						<th>2x Drop</th>
+						<th>1/2 Stamina</th>
+						<th ng-show="!event.show_hours">2x Beli</th>
+					</tr>
+					<tr ng-repeat="day in event.times">
+						<td data-title="'Date'">{{day.date}}</td>
+						<td data-title="'2x Drop'">{{day.drop}}</td>
+						<td data-title="'1/2 Stamina'">{{day.stamina}}</td>
+						<td data-title="'2x Beli'" ng-show="!event.show_hours">{{day.beli}}</td>
+					</tr>
+				</table>
+			</div>
+		</div>
+
+	</body>
+
+</html>
diff --git a/turtles/favicon.ico b/turtles/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..cb4f25e6bd779d58abe7929f544da11a41f5c111
GIT binary patch
literal 4286
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

literal 0
HcmV?d00001

diff --git a/turtles/images/demo/angularjs.png b/turtles/images/demo/angularjs.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e72c3fa06ce15391e9571cf19c6e21b814b5a4
GIT binary patch
literal 6554
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
M07*qoM6N<$g2Y~g(*OVf

literal 0
HcmV?d00001

diff --git a/turtles/images/demo/jquery.png b/turtles/images/demo/jquery.png
new file mode 100644
index 0000000000000000000000000000000000000000..56e3cee42bbcb95d2d28ad6f97d7656fa8d6668d
GIT binary patch
literal 5440
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

literal 0
HcmV?d00001

diff --git a/turtles/images/demo/reactjs.png b/turtles/images/demo/reactjs.png
new file mode 100644
index 0000000000000000000000000000000000000000..2805c93ac8d5ca61a3b8b1cabfb7d9aae3e58b9d
GIT binary patch
literal 4368
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
KMNUMnLSTYq@FwN}

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/be.png b/turtles/images/flags/be.png
new file mode 100644
index 0000000000000000000000000000000000000000..d86ebc800a673e6cf357c33d00edef93e2df0787
GIT binary patch
literal 449
zcmV;y0Y3hTP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzQ%OWYRCwBA
zWIzQU-!t(10x|ymWB4b)@b44DKXHbC3<v}eKrBGH>gsB+3J~Dn`pdxgmx19A<NrU*
z41bt-fB%p9^Z)nn|9?Q_mra`h0*D1{?*AuGp8f@cfB$|nF#P@h|2Gu<{r&&;um8V(
z0aY`~$^vZw2p|@)+5dq`{{Rutr2jzGzyAOK1J>{hgns>oXkhsL8>j&wfIu2Rsv+R_
zAB5T1GyoL?1Q1BWpFe+p|Nf1n;TJ-~Kd@?uhChFRHUI<=#0HS!U%!8$YJib28yLY(
z0tg_G2B7i3e*FSj@aq@44gY_`jRywQ69xu=0D?FP=vyd&x*M*V6|CV8P{Uu4OBfgc
z0tjNmA4y3`us8lPG6H?}8%zRafgb(Cp!5f*6oP<G0tg^Rw3xnqm*E!+1JHN>{xAq}
rF#LPR@IoIX4%E%Yz;K6w0U*EtuUcjA`-_J300000NkvXXu0mjf+>pV;

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/bg.png b/turtles/images/flags/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..0469f0607dc76eb60327c29e04d9585f3ef25dc7
GIT binary patch
literal 462
zcmV;<0WtoGP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzU`a$lRCwBA
z{QC7P0}}Z6?;nIjX28LpfBygihy^Ih#l;0A|Ns9F(F3Oc|A$jZ;Khp<00G1TQ}iF1
z@gEytWMl+d0uVqfcRt;bVUqd#|1Uy@;r~A%1cQGt2t=$*EVsVh0tg^RhGvE`m$FBn
zAN~3F2Z(<E`wc>WfB*UmB!B(-`wPhZ^#?@C^U5EbbPyl_g=3Hc01Sh${{P9=HB%4|
z34*<3-m=C?^;L%miR{xQv2*hU;8+Y&0Dxf-W~KjsusWFAC4@j0#9_j;X5z6SjRhH>
zd}sd(7FPhVFdSi!*Zj@;_Sc`kfByUdk|3A-`STmZ_yb~qxIp9o{E-p)bLt=iKmf7)
z+|Ix(`{&<1pm88mK&}8g1WG~}e||Ik`OB#Cw~m1UAb?na(Zlrn4}+v6P!1@{@CT$5
z<gPz|7$77N{rw9;K*az7#0ZS%e@KV{m5U|?1ONdB06frThAL}}IsgCw07*qoM6N<$
Eg5Z+INB{r;

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/br.png b/turtles/images/flags/br.png
new file mode 100644
index 0000000000000000000000000000000000000000..9b1a5538b264a295021f4f717d4299bb8ed98d98
GIT binary patch
literal 593
zcmV-X0<QguP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz<4Ht8RCwBA
zWJqQ}fPV}Oe_-S<FoH86=m!Hp0I>j-HAXl7XJGjM{~r+i{r~sxzrQwG-&h#_Y&p;L
z=ieV7_s^f-zyJOD{rC5(+EoAn1k&)I;s3Kw&;LT?{{2}P{Pq8T&j0^^J4?LvUd;UK
z&+k8ffB*XXONL(tXahh1fi?X94^$0Q>Z$uRRO)Y4)uapmB!2(-ul(c1=C+V!kAF`)
z$PCo;`_FHns{jIs3Fu;wy-Z(c2YwAz{&V4aXk?bejFO*Op&u`@i<P#NM5z2anDp@%
z$W_0AHUI<=6VO{y{6FUU{$~3B`#;0){+-SR)BjJ|$ol6OM|0|bK^^`7|9=6|$@CBU
z(q9<9G5`b+6VR3i@0ilI{`t=Uk}wuL1$4~Cd;i;4vwV2{U!V5`M1#wcUk5J#X5eQ4
z2q2IRfByV=_lYTJDa)3Jzp`T5RX=}y{qq0s&;Jju|Ke_2x8cDr?MbYUUbC`tu`+yQ
z00<x!pbdZigMti*ChuqN;{3XAg2Vsc(*J+|{?C3(Z!*j8e=I;B|M?3F6<`Pf1Q1BW
z?>~PecqBpL@DIoojb8mb+WHGK%fG2>)a3=iVf_~v+`s?*1;!`?Kmai^I3i*ZIYtpN
f{g(k500bBS@<T5{{p$N}00000NkvXXu0mjf4z?hV

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/ca.png b/turtles/images/flags/ca.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f204193ae58c87efdd88d46700ccb48c2e1d0d8
GIT binary patch
literal 628
zcmV-)0*n2LP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!21!IgRCwBA
z{OBG0@52Ws7N#Gso^YQ&&42{{|NjppfBpLPOjwu=$Y5aj!@vL#KrH_rJ>e`b1WGV}
ze#gbd^&bp=ef-GykAYc$@BhDltSqdeSy?RXJpcawy+5fJAb?mHcsPJ&{d@EF@4HtJ
z)qno||1xd*zaM|Ot4f#|8A1AQ-~Pubz$7IBv;-i4SQvovfB*ge{fFVtAE4aNE7yPi
z`^Eg=5yP(^Ur(Q5`TLjM%#`8#_rHuB|9}1hItd_vSpNO`#qjs<|KGp=|NIHm@MXqK
z79K7}ZvOwQ9Df%s{`~lX*xI%KzW-!k{Lc96Cr|@G0I@Lq`0?-epMSr9|NHeD<V$7w
z|L4yAXXRo1@`LH)GiG&-fB*jd`T3oRg%hX%=p=vuV*2yr$NxXSfj0d6`2(ndCn@Qh
zun5r8zkh%EA|%FNUJexe4OH{<*WX_tCjkTy%fByQz^Z?O(7%5S931=&4d3_dVr1tK
zGB;=B;P?x4@Xw!rS${G726~hMAb?o@ynPDxz^{KmxBdGEG>?&umBG}6iH(DSogJte
zDERNk_kV0Zng09%Itd_vSb&=T{rt@+B*66dJ0my{fpNkvBm!jpV_;xnVgd@XDk?Dx
zh=IJyzyJ_HjJJUrz)|>#fr0nRl^;KTz#|yK`2G9$BS%LzureS32rvK^u`=B;c)+&+
O0000<MNUMnLSTZV3pytN

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/catalonia.png b/turtles/images/flags/catalonia.png
new file mode 100644
index 0000000000000000000000000000000000000000..5041e308e3a0f57f5ef9651b574d49d30e5dc635
GIT binary patch
literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzFiAu~RCwA{kxfejK@5hIRf?spRf@%r
zgQvPss1($j7k`Gfe^k5_v7mSn_2fYhRojCrv<gdiG7~d1JM9|6%S#xZOcJDr69~b~
z#+agNt;H-<VpXctId$(1ux8M}#MUTgg-ifyg}qnm<`pOXz2^Q|-a<%P0a;~osU$O|
zObnDO^Sc*J@4Ix^g5|dauRPvmCTgr^2({T@gyY_BW9<kEfi%zA7M$fxq(h}Tdwj#+
z+fM1A0sn)|63@osr2^6V`*4Dv7dxA!cJXyYsp}Bf!DFrd^EATgu+80OVY3!&!T`oM
zv16zR>d94tALrX!<v0xNVUFrHlUGQA(Olg~pU3!p9Y@D;U=s(V`@O7-gl+G`+5jb&
sQ~VmV{Eht~{dE`WPwu@KdHE;60C<>Wj0S6V-v9sr07*qoM6N<$f?*uARsaA1

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/cn.png b/turtles/images/flags/cn.png
new file mode 100644
index 0000000000000000000000000000000000000000..89144146219e6fbec7eaa89e1bf4b073d299569e
GIT binary patch
literal 472
zcmV;}0Vn>6P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzYDq*vRCwBA
zyw1Sz4~&=?KtRBi;ni*s10whbEcgeB4G=&qK$b*(HE%4#=N12075}lD{uOxo_w$B7
z48Q*T|MTbn@8AExB!qo!(<Xob0%_ol`_C-)lsE40+p53+zWru1`OB*Q`^(1PAa%ch
z<gb6fegWAmva&!+00Ic)kS}Zg|NH#+>$bmtfBa_T{rmsVufH!rO2O)W0!b+P{TrwO
zAb?mv&i(NBb<rP&|9?15|FEe1{(j{5_rpNd2($l#RsRQT00<zElm7ku3vuiBlYbaE
ze}CQpR`mNf#8d{D@jwMY4FCZI((wN;$bSsKfBpUT=hHfn!4UWSgPRS}07MK7009Kn
z01*O)1Cj&KRRc`~+W-(iAPqnk#EJjF&VZ_bxf^U2Fj)Wo|N9rH79fCFK#}tM53{5s
zP>u;G`sX*)cv$d*%>MiL-(QdhpkjakVmyu%k;sfcNRj;yhJaxT5MTg0u5&QfH8#Bf
O0000<MNUMnLSTX%SKDF$

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/cz.png b/turtles/images/flags/cz.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8403dd21fd15f46d501a766a7a97733462f3b22
GIT binary patch
literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzZb?KzRCwBA
zWQaf89UzkBCc*#)|Ni}hkjM-;`19`{Kmf4_{`<nlD|_?BUjs!Rh@Sud!33N_0xw>?
z00<x^AmIN0XZ3|IN3MT_sDLX&Gah0gKmf4-8Grx%=lc6|<CTAZ|NXPm68Mh;Kr{dZ
z5X&E+yMTuM|IhvR=emo3|NQ;upe=w)!=FEY00M~R*B`KN{{H{__dn;~pDWJ(72m#E
zNt6x9|M%w)kYxA^mizmcQ9ytpFApGqfHnXP1qlN6{QmpT_re;Pa~ppC`u+dcufM-R
z<p1Bl|A9#sC8ZBPe*y#$%iljhr-PINHQ1fsXm@TSRMGF>48MLcfb{@Lpld*gfdL?Z
zSQvhRtN^J#x6%GQNHxSfxHgc;AD{-1tAIKH0tl!9q}uD*5!1Kl8Kk6va!f$;fJ%WL
z`2Cv^NdEc54D$xi27mx!VfgXqT8ME7!~2)OPy-`SXu#NiAkhzFFflLy1Q-A_8F>@M
S6G{sJ0000<MNUMnLSTYdwbYLQ

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/de.png b/turtles/images/flags/de.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac4a977362738ca7daa20784717f10f9617136b4
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzvq?ljRCwBA
z^zm_K`1_sV-#-RsmS2DV{rdgq|G(c14F4E#0Du5u`ThHQadA12^$!gG{{8d!FNFL9
z1;2m)`3t6g|6aFlH9!EdFflO!Ri8L{2_yj){sja-K@bjp{P+RH{sB%vl>h<6BFn%a
z@b8~2SoNP@zd$;E{sbbRuHQd?{QCI=sNwhbA3*&Qe}GP900=;09NYi^f<O@Dffdn=
z{Wswq2xv6fOjc*mGA*Lr`%B&mEaDA%u^c0|iW~vN^8fd*|9}570M-5a{U4~}*ROw2
z4Pezk^!+<TKS(7513&<=05QYgKL~??j2}OMs-fC|s(=0b3semh|NHwd0|P(+vHZ4T
zU{L%2pZVYazyJRI2BN<Z#(z-o0!fCyzyAZte?ZcN@yB5XfB<6ougCCT=HGuopehjh
z4<vyWf<pKYB$$C>U@pUdVa9*13;+Sd!tjgXKhXQEMobL97(p6<<R6CrzyE{SK=RN3
z|3DpoK(_q)!}OH_Ab?nYyk*!kZ_+=YHfDyO-$60_pO1m*2g5&LKrl1>{RLvMGBN!7
j!N9=G@a-1^K!5=NcXWu!7_DDe00000NkvXXu0mjfeQx^H

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/dk.png b/turtles/images/flags/dk.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2993d3c59ae78855f777c158a6aae6c1fb5c843
GIT binary patch
literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzfk{L`RCwBA
z{K&xYj{ypR41vFY|Gj$kK~nM`n2U`5fYks55DSpSQC$sI{tt*485x;)dAUo9|9$=T
z|IeTQzkf4;Ng(^*@82&sZ2|}&7O=Me|DHT$`1|)i5COs8zklyP{P*QENZqgB|9}7b
z|LYe}HIu9?&~$(REX_d<06+`@K>h!ZNvLM`<}kPiIA3?K?Zl!VJuS0ABN12uI2v;s
z000mK68GQM4oDR3?|C6;zBc4LR82Q1eETXSa+3nD0Ad8%4|Ml`Fn}2U{~ypshW{9V
zk%{T!hYtV&#KHiVV*o?2zW>+&Bgm+K00G4EikX==E9>w5`yf~S`o*<t*Z+?nzxew7
z`}_&w9*75kvMfqUPtKhK2q3Txkbnca6-YuX`}LFI=TE30P{SW!;Qj@A73c?m00MdX
z|L;Fcl9FI!{(=ITnHd;@3}3!5LW2L#AEv)x)qg><00G4K6dZ++hy)_Bw{QPEdi2K7
l5H1Kw2asrHVqgFWFaQRwS@oh;XP^K8002ovPDHLkV1foV*8Tth

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/ee.png b/turtles/images/flags/ee.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c82efb7dde983e6ab0f6bebb3b2eb326ce3874a
GIT binary patch
literal 429
zcmV;e0aE^nP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzKS@MERCwBA
zWN_Zk00;jV7=Ha@_yb12{(#s(^y3eh{fFVlKZf6b00K}b#{>X?Fbu$UU<G+ofGafM
zs%y*k<jU%Ha!*#srreoQ(Zx0}3Nq-M?+YLnh|y2p1I0nAfz;o>AQCA3`wxix_2=I&
zAouq_Sz&ethCcuS!~%52Kai0?gF&VORsRAR2~rJG2PFT1^!)w@)C_d-AAkU2Vc75Z
z*R<@<qep*$;5P_Dz^`9m0!D#^<mDL{4gv%a$Vq?x`~`C18lck1%E2^H9;g@~fIu4l
z{sk%i_4^mhe2@ZUv*AVn6$1ni<I|^4#l^+{|Njr<{KpMIN*Nh1T(|%bKrH`&UIr^A
zr~w@G{{R9AqyerP9)Uo^7*GI^`yZkKAb>y`9z1vevIh)-p7{p`5C+7f|6l;f1_&?!
X)GmJPc-xs)00000NkvXXu0mjfGFPrC

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/es.png b/turtles/images/flags/es.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2de2d7111e3cb59cf6511dd2ab045e824bdb43e
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzXGugsRCwBA
z{Lg>@|4`Xj5kLT%<k$cJ5QG63s9*CHx4F?4b#Td&^)lkpl1oN5XoLe37*!4QcV`{}
z1lGXt|NoPxK&2qnzkfqWDEb8?fBpaU3&>`al?B=W5I`&pe;NKW0^Ri&h`xRJ_x;0v
zUa?=y?0^3M|NZ~}FE9c#{{3cP{Qd6}13&;Vf!z&M{pZWqKYu4MFm$tgedF}w=P#IQ
z7-9gT-$11R0mKA$(qEu4%ok$*y!^wMRm*x;`R7|k6yu?K{s8?55I{^|9{?Tjhec2I
zv+6&FhFWG_BbNVc|Ns94tNRJp!0`V!Py;{!F#$2enB#XZaohg-5%Tlk#oa&nzQW9g
zl0Y{D4gK?n0U&@Fe=;yIr=|V7caH%YEYL84k`Tt9-wc2LGODP&y?7BIfLMT@X8Qey
zK~fSFpuiXa$^k<V#QwtoA%O@S;y?sc3=lw!Ur{3xPaH!4K!5=N30g<Izl*iB00000
LNkvXXu0mjfXaCA;

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/fi.png b/turtles/images/flags/fi.png
new file mode 100644
index 0000000000000000000000000000000000000000..14ec091b802cf24ebd9f8825f81cd2f6e360b46d
GIT binary patch
literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzdr3q=RCwBA
zeERw`0~9bxyPRP7^^bvv>FP2AE)Ir2{}>qlLBSs|`Qg(SfB<4)VqlOE;Q=cD|Nnn$
zna02W|Nj1E&`=Tpav_4q;M$#E00G4E4{SI@`q`VGKvVzz{r4XmU}R+c_2(Zz0I~c7
zs`v*r?Dt<F``@2G|A8dX1Z33=|Nk+7H2?$<BZKk5_7at+Z+-y{{`LF+pT9tDKzIH7
z_2)lO=Wmc8(1?G({{E8@VPDm-8z2A$bZi3v2*W^-g8k<WycPH~uFjI>y(;z&PFFXX
zRA5t=4x{1SIibD)Vqy6A2V^D4P_SySA|L?j2ip1XFA)9%V~_%1r~w2J<L&$J<z#sO
zfgK&!aTjPR5Us6O`G@LrpeKQzK7RfIKmf5YvHW9Z1ag1^3=q{o1Xh8DKmh19fB*tI
z=^s4E#RXZx9sn7}fC3oddH@251?cEI58gl`a#rzC28Lh2D37%K&%*_b>3=}{2Oiu1
f7(RXZ0uW#T>&I!FfdIJb00000NkvXXu0mjfj-u42

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/fr.png b/turtles/images/flags/fr.png
new file mode 100644
index 0000000000000000000000000000000000000000..8332c4ec23c853944c29b02d7b32a88033f48a71
GIT binary patch
literal 545
zcmV++0^a?JP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzvq?ljRCwBA
zES`Fq0S5m4`IqO%_xJDLpFe*B$v=PoFfuYKxfuTY!tm!O!yljm1_potVgafPw37mo
z|Ns5}_wT=?B=7(K|3TdUK<+;v$=cHQ|IhD#zkdDy{rhc26F>lgG%);U`26kn-@hOg
zU%!6+4+cOs(0HIde9xZz`}Onxub&LUB0x(30+2WcIRJn#2ut|?gWYu1Cf+!-K%B8#
zdf?1WA}#uZ8oj7u>$I1i0Al&`=O0k%-@icgAIJnM0xA6maSq6BK-ECw|NZ*S`0Lj%
z1_pot6puj;05Ax`F!=umqj7^frO?t|3^&I1kxUq9yECc+jQpY84SWH_0#pxl$?v~F
z@*hy-KN0|X07U)z`4{NpU%#2aHUI<=%a31wK(7Du52Oc(|3O^?R1IN+RRjI-n*kVB
z3=9AP#PZ|EACPLGJ%9cJNh|>9B%spYzZw7h1%?tp0I_@ndg9MNE>313@6R75NcceF
zkr51-#U+7;F#`Sf7i0rK0I_`g_NQ&Z<sUzOef#m}%a32uoRUDN{s!{@0^RcK$B!R+
jljj4~L82K500ImE?yY-fn+$bC00000NkvXXu0mjf0<ihi

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/gb.png b/turtles/images/flags/gb.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff701e19f6d2c0658fb23b1d94124cba4ce60851
GIT binary patch
literal 599
zcmV-d0;v6oP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz`AI}URCwBAoHTQvnvLG!L$_YOVPIhR
z`}g19iWuE1ZBzdL{i|D>U(k2*|8J(R-+sudaynhucHbwAMTnor{mwqO^w7JHzaBsT
z{O^B8RYf5+LvDs&KmRKVd78=o{`1#HTiEo_OolaGleS)G+IQ#sUI`b*<ttPkoQ(BX
zdH(z-BO?RD#k&lb?f@B&-u_Q#y`y({1!HORg0(k0n@%tR-SPDK`}#L}kNztCZEmQ{
z)B=hyeE-bw{X3BEzCWGY&E{rcl9ShpD>pv<`1zCJ=H0jd{{2S>p`ri%{LsXJ%FbMS
z$#S`6f|?OG!^Jxczkf6Q`UNF{l0Sd`ad7zm>({^EzyAS6{{CgrkluOb3l1A>ZU2~A
zK+FZ=zkmP!`TOVhpFbzBzF<mgJlZ$!LUj7htJgj-ynFjAB?0L4|6jiYZ2)<O;r}yd
zr$cjg$jHr$OxbL1*Ua?e#~*QFwxu)O<=6CooI5XBFdeAs-_M^w$1wc=Z|$&LWbZyx
z#upb{59yi8GyMC*6cei&?XU5pqw<n{Y~wd`A)deg|1&UZN;7Io039Q%E))~L=CG!%
z=$tv3r|Yv5ZCRebeml)AZM~}fxupkx|M~vs@885Q)osT={QvXE{ra1g8}~B&`@4GU
lArU#j%I>aPmD2$N3;+$pK?>zdet`f0002ovPDHLkV1gy;I?Vt8

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/gr.png b/turtles/images/flags/gr.png
new file mode 100644
index 0000000000000000000000000000000000000000..8651ade7cbe030e85efc811a844d8f366c97a50c
GIT binary patch
literal 487
zcmV<D0T}*?P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzc}YY;RCwBA
z<h4J_z`$@~ngEbA$#}=`kMaAjzYM?rfzcl*`2&c+BLDvY1P}{Qos)@xmX_B4|NmV~
zuQUArzot{;|9^)6KnV~9!65MOKf{AZ&j135@zJA4va+%uaWDWfj-G!Hl=}x%@ei!-
zAC%3>!E|`n6Mz6>fhdBj29g(UfB*aM-=Dw#|NaG$fByXc1LXhxFC@THKjjKQ05P&#
zA9gbr+SsEBRPB^?1!&T?30hEBFhHFGv5AR^>DH}B00G4E=NHV45I6k$@0N4rAH*g9
z{zDN+_&*OP%Y{RC0Ro8e#fvv0A_7PTA~XKMG0?q08}8kE2oOLl>koag&}IJi^WT4%
zN&g{c!yE%t3}J9_Fdy0V1t5S}4xV|TB*XjR%dfvcU;YDm6wdeu;Q~GU4<sVQ%i6i=
zCO`l&-n{=&REQnq4oL8Uox=e2D8hvdAipr2I(rKsfEXFXH$x-x=RXF9KN#pA82teU
dJBS1bFaYZtYfz_b#(n?*002ovPDHLkV1jE`)foT)

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/hk.png b/turtles/images/flags/hk.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5c380ca9d84d30674f05b95c2f645b500626c07
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzp-DtRRCwBA
ze9OS_j{yq)!ANBE2Q2sp%w}R>00<x!Ad9EE8m#c&e<1q%m*LOf|9}55{Qdj?_iqsT
z^9N2o-n0oIfLNG7YXARx@)W2Pq#7vq_b-o?^?z=zPixlv`vuhV>;JD`K-EmLvOuK(
z0R&e6?>|)a-@i;iz|8zVIqAQ;I)|_@BNM~FU%wy-s0ZjAfB<3vx(uZH&mV?Ae;64V
zIcsYEzkmP#{)7J<oXnFZaX)|lH7o1amoE_K0TlxT5DUmbe?ZO!YWVm2@Bf=O|2sMT
z-?aHZC+GivfB)~^{qNg1pz#b~ZvZs_1Q5gqknte5{{HiE+B9CEh>;N}0Ju0muUq%~
z^Jl0Zz)k`PASO^y0(FCg{s2v4<LCdcrw8I5JOH$Wm4^qS8e}}!27mwp*#I{F_dl>J
zf4+RlSW)rg;lp2_Kl2?q^5yYkpazCNzyJOD%k=jzP%%INf#Tuc?>~%^l1w0DfWH6z
z1E^V4lvz;l%d1x`a&jQQ{ROE8h7C|LKmaj5WMKG(8n4KVKd5of#=rm&U;y%qJ?5>3
RVzdAN002ovPDHLkV1mTk^F06n

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/hr.png b/turtles/images/flags/hr.png
new file mode 100644
index 0000000000000000000000000000000000000000..696b515460ddb670acb7e9de4438aaf21fc5fb77
GIT binary patch
literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzo=HSORCwBA
z{Lg>@|4`Xj5kLU3fF!G{fyDoR{}_Q36Vv~H|Ns5{^Z)NZrr*Dqe*gae=g)r_`DNuw
zfB*t(VEF(4$y0{Ee}M=nS{mB(NB;kxJOBSE{F_{n`2Y8>|G$0##TjK~fi?gH5EIz!
z|8Uj6|NiY-l-<kmal+h`$s8Yk|NaS5{R^rGr~x2=fXe><0|OxA@1MWlzkmOI;leLR
z$De1;{4g{7^y$;LZ{NOt{rct07a;lk`E!5(f@%OM1_Pk<F9!#R>hC8`eE9egqWbga
z&p;hdpFRZ$Adm)#>fe8W4*Ct02B|hR1*-n0rS<;(dx&bFRY1n$$BzL5h>;=uaC^Mc
z(+@v?|NZ~x@4w%F|9yUZW7+yTpo@LH>e(bUfFghX{rmIxzpNnpimU?w0mQ=a>kp9s
z8>AGffmuv7DrFgv!3yU7{`2q8f1ngFoPlxn4<LYm8h{4;7vW(Ass?%o7!W`bBn@JN
z$iHCK|9~V|13&;VGPv$!`16n9#~+|oK+PcX2aEwkf57a&@Q7vr2rvLRopvQNB_;&`
O0000<MNUMnLSTYG4*f;|

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/hu.png b/turtles/images/flags/hu.png
new file mode 100644
index 0000000000000000000000000000000000000000..7baafe44ddcaec29ad9f187f759a7fa3a1a5df00
GIT binary patch
literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzLP<nHRCwBA
zJj;Lr{(#AUFvcGk8$tpRKmZQJ?F0Z224eki4JYkZ4&p-hsD}_j$jaT_@z|lHqAV6^
za)9|x8@T5@0mK3}=>P90PyYjz{{0J*12TXlP$`i71!VmC|LYf!%PK1iv<D!7Siolg
zM^+7#2AK+03RVr&_6wr_7Xt%805Sgk`<IcC5v1+^e+Dqb1%S#vefk6tKoBQERlylp
z0RtoBzkmM#0*D2n2*3G28~y_W<sU!*F*5iwWTj-?e|P`S-#@?q{`&Rj_piUde*gUq
zL?8x?3zStBQaW334j_P77=8c)@DE7EAE=^Ve||w#gGiv@uRkCSfB*dd3v>=Z0I@Lq
zVgLrRB#$I8Q2qeT`3KSlX8!?(3s3+U9e@9T1Mx3N13&;VGFUSJ^?=Y13<ePWXFvl0
a0R{jf<ZT85e!OP@0000<MNUMnLSTY=@1=<V

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/in.png b/turtles/images/flags/in.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4d7e81a98d705da8d7054e77e7d311805659678
GIT binary patch
literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUziAh93RCwBA
z{J)<84*o$f82$Uh@b4cO{edAc8z2CMa&Q0u1Vb^j#VV$>l^KlW*80IEmzVa(K3*_6
zG7fg0I9Zj&0woGah`r_&Kwu3FK=xChQigwjfh>?7kc!_h@)sEWW@MKI+5iwhEdRtz
z89B8WSj7JS|MwrL=l|b3uZ7Osk^B4auaUxSRgtG4v;Y11_x}$gi|9Y8?EnG9`1|i)
zCPv2p|ADsrhuF4k`@Nr^zUpfTpS$xp!A}Wj4A3Yb2~_s}<0pUsVqyY2p8>1`g1&zJ
zsVvR4Yya)fUw{4wtNss>0tLxGfB<5Gm<mFSV157p>nRH!zxweH8<(Mq0N7e&^ba6_
z7#WHgIs!VLeti1p-=9B!fB*jb=l8$ge}LrQ-#`%%`S%Y9{re-sFSERHIY0ohF#KVF
z2*K4Ml>Ykz*ZJq)UtlmW{9*tIAQm77@<q5sAjUvRFaoLof<OQNfT;gq4gVMb0*H|z
tnE|K=Xb*^lqd!O@e_#ld5EuXg3;_B(O%_D8pez6Y002ovPDHLkV1i)Y+=2iA

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/is.png b/turtles/images/flags/is.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8f6d0f06675a9570c2c6e696ee51282097c3876
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzrb$FWRCwBA
zWYC|<00V!|rQBm?R{HywSz!{xuRkF415Ez?!@%&1fdNDU1Yl5(Z2*9vAb|Rb5o{wd
z7ot(xLSajH_i0}B;(x2<ujFQydJDnEEQCW22y}`Uy40@c2_P1*(f^;n{qgtTKOpPR
zqenpQ<CkB5|M?G8@#oLqUm&G_fjXsxIf3#30mK3{`QKj#pz6PW|AWAv-#`MW=nqH(
z*kG`pzd${I{{x)_5I~GT7SJUiTmJuN_|NbrJVa>4s{hykP}!$Xp8x`g@iqg4NJaUd
z$B+Mm%>4cD_iu*Zzrl=O|9^qF|9<`Y547mdFIIVlOMCYL1Q5sui18rvfj0Ph3vJwt
z)dnUeruXmP0|XEYv&@95W{1bGfWG{@sKWZ+FOVO6s`df7U=M&0&<j9M%ZqdG?41S>
zKrFzJ{`2=AL>j0R<bePG!5)QZ0J`)qM8hADQ~m%15DUXEpwvGxLC!y50TwAKASorn
z1vUi~bfEA7g(1V=|G;qn2M|Dv49xZLh<y9L=8B-O*6Y`zqD5elf3OJt2O}8(0t^6J
WL1vT{W6G=m0000<MNUMnLSTX~F!E{u

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/it.png b/turtles/images/flags/it.png
new file mode 100644
index 0000000000000000000000000000000000000000..89692f74f051cd43503744c3dab65c8ba773b7e2
GIT binary patch
literal 420
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~o!2~3KHq6QcQY`6?zK#qG>ra@ocD)4hB}-f*
zN`mv#O3D+9QW+dm@{>{(JaZG%Q-e|yQz{EjrrIztFq(O~IEGZ*N=lh=;=qSyMwWku
z27eMOW_|f0uQeek^e_9g7KH|eq{JVG0^UaP2Jy4}|L^JL_3uCblfVD@mnS9t`~UCn
z|MT(+KT|KOfz%~1cG~~^_2vEk{SFNQ?Cjg~|NsBWy<%2im{<n01H(p!wT!cPLjJOM
z{QKt?&dcI(HG!9Be?7A)1B<|kKl^#=|1+%p!|wFokZ}^*f+V1Mj8!5T-++ew|D(Eu
zQRDmp1_1{J-ui=S|9^ewUcuha=C)xn15*d*iih9--{1eQDdhjZ-`u;|Hhgpl|DTw^
zz@e~VvV&K>vp^YdeS=hk-Cyo6U`Hgs{l4FR(w#{P`G0<L_c^h-xw)}f1Ozc@vMMhC
znKyCal*Wg`8hwr*|299&xf;3P>;a3G2@YSmzI~fu(Z<lgz|5c*R^AeLsAxVgm>E1>
L{an^LB{Ts58L6#6

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/jp.png b/turtles/images/flags/jp.png
new file mode 100644
index 0000000000000000000000000000000000000000..325fbad3ffd3075a4a84d8d898ad26ef7d3e0d56
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzHc3Q5RCwBA
z{QC7P0}}Z6?;nIjX28LpfBygihy^Ih#l;0A|Ns9F(F3Oc|A$jZ;Khp<00G1TQ}iFf
z*thTh;UoWl|N3uc_TS43u9}gN5oifO0I{H}Uc2`H!iE3;{Q3Xu_y5C(|37{5KRE@W
z0pdb{0Ahl>9whYk?f=!Q|Ns8||JN@lTD;`{<HvAI{`~m^5I{^2&%xdJ|Kmrf(%)e6
z%a{KTAO43~0aOeSKrBEE<Ns$675&e|1Xc>R1ZWk|EGa3dAO8ObDh3E3Cb;oH_5X#1
z|NHy@|M?558b}5Q|Cf`4hZv9q2p|@?lb|{i68>{>{ol0<q}tBze@qPA$3Ot|13&;V
zzJ2?akB<*73S~gt$;kNsKSBnG@7}!&5I`Us-o1MVi%1Z}1t69H1Q-A&lWd>lx`{mi
O0000<MNUMnLSTa2cE7*?

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/kr.png b/turtles/images/flags/kr.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c0a78eb942da568f9cdac7190c17e23cceda7ed
GIT binary patch
literal 592
zcmV-W0<ZmvP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz;z>k7RCwBA
z{P_JV0}}Z6?;n_iu%H+Q{s1vR05Jij`8c?M=-GouSI=K${m;n9!7aeW#m~(x$j!^i
z%zXLG*~fS9it_V|2?zl-00a;V#NgMjUvJ&I^~3uQB4T37ii-d5-u?gQ&wmw_XD?o^
zUAsm=P*7M%NJdr`Xazt3fo%By|Nn;%AAbM-ZD?YwEG7BBxA%WR!T-FR|8><0Vxn$d
zUT@yKdH&)BP#Mq$fB<3y`hl076R7Rgt5;mSyo`Gea7>-}|M%}Nf0%y${3VbO@hKwm
z<Lft4(o&3!j1QhY0SF)#h%bS<MMOk^jGb@zjQ=qIX5wrz%zyTiz54MveRg(kX(^xr
z21Z7plK=t;r~#xJ2;RPZ%frp}Rb4k%y^@)Y^%1++haW%h8oQ}~|NQ3dM@dOZMxdU5
z{{RAr35bEJZ{EB)ZQ3-TzdZ~%RV`GWFbgq!|KY5|=ISK9Z{Pm<`udY6PeS|v5I`*d
zz@fy&#RcRaJakx7OS3ji?UD)mpTGZg71;0HySaMJdSPK<0RaJ^0-%!s0tn;>AWK?W
z+TGp#<;$01Vv<1pdP-ancZ!Qkd3bmLHK?nrgX5I}Ab=R3zkQ1wk#LIP517FKVgLC9
eRt>}e0R{ktF&Q^6#MUGL0000<MNUMnLSTY7u@YSX

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/lt.png b/turtles/images/flags/lt.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8ef0da0919b1e77ca91232de0cdf0d99dc8d68f
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzj!8s8RCwBA
z{C$;y;SU2G{QJZ34@7|wgbgI2Y#?G{00<x!plT+mW}uq?|Nk=l|HsVmm-+uchW~&5
z!x2#7|KC6c!@u93F0TX#AQl!T1_nl;f@h2%4ImW^|Nlayf$G5M*Z+UNfryb+8fY#+
z0I^*9!XWkQ&+lJAGyX!1{P*uS*kF*NfB%2|gE0R6VrBnz{uKj20I}%rVJLI`{^-k>
zKY#!H`S<7dzuzGA_xCRl`Rmu;Um!M^l;`6=xPSp5fLIuQF#P%V7sv;y25A5(1xW+7
z{Q_w~Xakza@Pz>&fLMUe`uqRSpZ|Y=>VQIE8-4+ehiC(l5cdDyKm=3_5I`(zTN!l!
z|Nj0Es0O49Xx6_!5M^MM5b`fj@gGk4KbtNx00a<=83P0Vn?HYFf{Xx4|Nr&tKga?w
z11|FC_y0eCSvdcCFfafF5X&#1lYnMRN&=-B{`>{W0U03nA0WvHB!TYz`<L<W-#>r<
y{$OAL2q4DW;E4VQBmbdt8IZ(*2pDGo0R{jiB6maa(%qQ=0000<MNUMnLSTZO&*O>!

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/lv.png b/turtles/images/flags/lv.png
new file mode 100644
index 0000000000000000000000000000000000000000..49b69981085ff54568907cd51a56a1e5d8b01ada
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzV@X6oRCwBA
zoXEiNg8>TuF);jrk;v#5jAUY900<zKFANN>)zv`N|Ns31p}&9s{rUUv@1OsF{`>=?
z-@pHYNg(_0@82^wZ2|}&78a1v|Gz$Y3Q`J0Kshi8lm?N%fQ(=Ne*FS+xn*U6mIDM3
z3(!4({{8=rtQsf{G!?8Agn$gN2Dab7KQS->1Q6rPlP7uP<bXo||NmzIItl0ph}-`E
zhcf;_IV@~!4~`!P2q4D4fB!NvGX4hxkmGOzMkc0@A3gvC5X+l$=eT8LfHp8d&HVo#
zZUc-Bv5JMA{n5#j00G2U&cNW6mG$xdeNZ_3`UUnV$i;u*46q<jmS0J!{oFZ#0Ac}p
z9LV_(4igai1qu@&<3G?>KoY|E^ZWmwzrbJwx)~sVSb)*-|Mwp*NlCCVfB*i0>4ZfB
zFhYR-gakS;`Tzomv6O+~6D%TsAw}vh)M$o8KMw-~K!5=Nd?<lQMT<~c00000NkvXX
Hu0mjf!bZfZ

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/nl.png b/turtles/images/flags/nl.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe44791e32b790949b0317ab3c258864b9024ebe
GIT binary patch
literal 453
zcmV;$0XqJPP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzS4l)cRCwBA
z{Lg>@|4`Xj5kLTv<lqPZ2nGURg05Ad3pJ?CFLybN&wjSO?Bk+LPZ}wt5e`<M1OzJL
zyVpDd2&{qO&;KXSfl3+v{`>#?55wQzKoX38|NjLffBpXj6#2y{D-E;(Ab?mHL=FGT
z$TP6>fK>na1GWK({(upf0nrSU5*Gz(00<z)j~_qs^74Y5^#4Bt7~%qqjEoN+JOBtF
zmVf{LK~#e@FyK}Wlx1Z6^XCsh0I~doE5dI+&<3!H00G3vpx9qtYyar=*WZ8s{rUUv
z*Pp+?|Ni?8B>%w4e}91F-@gjtJbOE500a;V!?RECzy5mt@dro_q~YJM-#~SLe}OeX
zNT7y4|NilCvNABd0|+1%hF>6clER!2lYo}|1|zVkK=SXOfB*mf{rC6ZKVbL)odgg-
vjKFAPVE6?_e~=h|kVO7~qZmRm0R$KTYszPUy89K;00000NkvXXu0mjfB$dbi

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/no.png b/turtles/images/flags/no.png
new file mode 100644
index 0000000000000000000000000000000000000000..160b6b5b79db15e623fa55e5774e5d160b933180
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl1W5CRCwBA
ze8>O=a{vExMP2%`MCSoB^FIcLe_%lf;|~%E5I`(IQNh}3Ao>6Q|DFUXMn*>AqQd`w
z|1kXd^B;tM|Njjl{{hM0zwd6?1Q0+hV1xeud-4=Wy?p-%sO`^#2S61Jzk!N?s)6X&
zzhA%p|N6}=D+{y%Ab`Lc{sL9~1=0UN4*CD*7s%9KAf+JHKs~=eB-8KTKvw|-5R1&;
zzd&a|ob(5%^Z$Q=wHy9p13+aOpFRNu5F>N&`Tk_-7w>=n{RejQzkfh&Kn{rf10?_b
z{tFTZibx5v&dxav5I~H7|Ney-|DWN1$%1FyagzUW0464;_wU~W1Q5$TW@eGxtUvee
z3vAf*8|<XFcGmxXfqcvW^6qb_H-7(NQC7No`W!$2u>igK9~@*rr66bh|NrkNM8z+V
zAV?>O@ek;bKfu6d00<zkhChFpBtb3_<pTv8vy3d$Ur@j^fP<g;&mWNLzkmOM9S;yd
zj8|b%sPO*1px%kM7tF2+3;%(|F(iT+U?dO#1Q-DHo?4QnY^9|D0000<MNUMnLSTZ4
C8Rb6!

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/pg.png b/turtles/images/flags/pg.png
new file mode 100644
index 0000000000000000000000000000000000000000..10d6233496c10e52ead975c5a504459fad68ffb8
GIT binary patch
literal 593
zcmV-X0<QguP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz<4Ht8RCwA<
z!a)iE5D);s`Jn$l!AX)fNur!gBau1p{w^kipwp-nt^f?jF%bYD3<JQhA_NgwKoS}-
z(*b4Onl^Cv%QpaL?*)u1e3@b*DH5HUp-XxED#Fd40Ac}Zc*pR+<H=LIzkfsj{^k1p
z8>Hv=@BjaQ|F{1AU+wpQ{$Kys{`!CTH>0fVKL!SX0Ad1a`1cQJ=-<7ptZmH9SAnX3
z{Q_yQ`~BbL*ME+m|K)!Dcl`DLKS&U$0U&@t8vg$M`{&P}#F!W*N5{%vzvln`{r&f^
z{||ospYrSf)?fc0{rZ3A*Z(w-2B2bq00L=XVPVP4%$zZO`i8aZ($dmav$E#>{B`Z@
zum6{R{h$5&|A}A!9e(}a_zUO_pbY>4IGm#s06-9cg3a4XeYH!D;D>_*`V5R3;NTtr
z%*@^Mq=>M$LXVh`5jChqDeaf800L?F_U+sH_3M8E<^KOyQ&ao$<qOb=kH3HS{Q8yr
z`}a+tmuCHD_z4QPKMV{20R##qAmjJ%-#IxsckbMoF=GZ$HING-kNo}}^6OXGpWl&x
z{xbaqMh^o(0D(08{{2T%Qu4ur2iLD(mywbA4F(WX{(!;kzkjd%{hRyuFDnBBKmak2
f1o9ae00ImE6ca$b<!3b600000NkvXXu0mjf(4!>p

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/pl.png b/turtles/images/flags/pl.png
new file mode 100644
index 0000000000000000000000000000000000000000..d413d010b5b097c4e0a4604eba86dad79567ed16
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz2uVaiRCwBA
z{QvPI0}T9w<A48v^gnC>Ab?mv3i<ee#Q*>Q8Nu5A{|6C_|Nk>HFfjc`0biay0|+1%
z2B@O{$c+Ek03##gzdwHf0*Hl3)etG5lK=vU1?W~rxN0!OqXDP`Ab?mH`1u+7`u;zA
z_W#cxhChG)!_n{G|9=A+zrl>(AX#bYe+w4^1Q6Is4<G)2@ZkUNUktw?>VEzI_51&?
zUm!LT$@u9L&^Z7B1a=Zw2xL66B2?87%l|Mi00a<712fnG3~)u5+Wr7F{AKw27w8;-
z00L=X`u&GNQW9*;Uxq&*os3{386YGO{rw9;K*az7#P}5)xp2gQ%0-g`0)PMm0MPYZ
UsK>Njp#T5?07*qoM6N<$g4HXSwg3PC

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/ro.png b/turtles/images/flags/ro.png
new file mode 100644
index 0000000000000000000000000000000000000000..57e74a6510dd6a4b29668db181cb94727d1eb4b7
GIT binary patch
literal 495
zcmV<L0TBL)P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzfk{L`RCwBA
zWY9j&@aYc&2rw})u)IHD&cVjO@Q>ji7_t0d_@@ozArL?Su`s;*Q{AKpRQ~TD<G=q*
zoYEDntUnnT{`~*{2Sk4P{Xgc<|KGp={{fL-Hf;h3AQlD|28RC(PhS82`|tnXe@y@W
zJz`+^{{R1PDEjmJ|LtG@fBgcgW|Wl$+5iwhEFiQ0GXPcp`3pioga7~k1tx!k82^B(
ze?v4d{QeEp01!Yd41fNCRsZ|*hXJhN7s7ZD8$|=qbbtV2VfghAsP6Zl|1b@|k@SEW
zzo1TH`11#713&<QH2eh_|Nj?I&tC>44PX+<NsM480R#|8!|%Tgzy5&q{QkoLbq1OZ
zVB>*q00taD0I@Lq1k(S2nt`tR{g)9*1H=ZfhCe_Je;NM%1^NLXfPkU&2dGq1gcanC
zzsyWb(hLmW7#V^70~+_6f#nZ_(jSmgFakOWAb=Pd7`8Gn`~pjZT=;x%FbfOAzdzu3
l1(F{a{)I#17y<wS3;-vsZ=FTY?nM9q002ovPDHLkV1l#N)|LPO

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/ru.png b/turtles/images/flags/ru.png
new file mode 100644
index 0000000000000000000000000000000000000000..47da4214fd9edb383687c1d4f84fe8b42a51ceb2
GIT binary patch
literal 420
zcmV;V0bBlwP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzHc3Q5RCwBA
z{QC7j0|NZ}_YXorSpU$#pMMMh0mK57=Hdb=`u`uOlM&2-@PKUQ|Noi(BY_t$z5oOe
z3&dowY6RmyHo(Zp2($zsfEYbJ|7T?UfBzojjK6>X|NRSO0LlM<{-BURBqYRGSojej
zfLOL~|EH_V_~;P>Nc1<u??3;4{|2F7ztBl}d5{wT0tn=!KYtj2e7FXPG(_DmAmbNQ
z<j)_Vul@l95J&^WQlK1216(PF4L}6c01!Ydn;DojfA@U<_3R%=)1QC8|NQ&)8$|y8
z4Q2fL^B2he^OyUN^k#-d00G3}1`NDExBmUUhuv@p18DW1zl?uX#2FX>0*D0|Jxss<
zFi1)Q<$$6LU}rIc*dU*QNFV}+9T))>0|XG`SD?F)5CbX~O$rDA0t^5@iDe$xIAIn5
O0000<MNUMnLSTaIlB^^E

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/se.png b/turtles/images/flags/se.png
new file mode 100644
index 0000000000000000000000000000000000000000..1994653dac1fc1c6ee3c9fcb35c8af97f16eefc7
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzut`KgRCwBA
zWN>a|fPuet^$h<QfQY%Ql;PJuhF`xJe*Izi@e9HD{R<#~Sb*xPb3K9NzkmN3mA^6k
z`}?2aZ*Ga-pTGbA{QU<+zyJOPk^ex9O}Uc+0*D1{^#3RCzy1C9pW)}D|Nnn8{QrCZ
z_2=I}MSuPR75)12_ZN`;`>(7pHv_{jfB<3vn*8q{15ov!pR5qo|Ns4BVf^v!57RHO
zo?l?}`yWs<(7C?=0*LYNK?X*pGKOD3v;Q#s|MUOfZxH$qCjb2cBQWFtZ$@_cPkRpn
z1P}|u9|n-AAQdnT|9?TXAyk7H4FCQBl>h_~&`AvcLF)bhMS(&{8jwh^2qVzve;5D)
zh>=0RIIAq+{+o}$pxEl(3%2T)`P!1-fBt~{@Pp~sA7J?W`}60ovKZgl)=2;X#KQ37
z&mWM7{{H^+4`$e}UqIEMAo>Rk|KALM|1kdh!vsX^3=B^I0*D0|DL|!?{M^6*VPKPH
z00z{*-?BnHps)wJ`QKllIe-8D1EGJQNCgNWMh3}bctpOPvlbWzK!=K^+cJPc;};D5
g19O2S13-WQ0NlBGh$rR(5C8xG07*qoM6N<$f_QiWUjP6A

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/si.png b/turtles/images/flags/si.png
new file mode 100644
index 0000000000000000000000000000000000000000..bb1476ff5fe8e0d3af4fc6bd11e513d95fd9cccd
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzkV!;ARCwBA
z{QC7P0}}Z6?;nIjX28LpfBygihy^Ih#l`jiKf{k7e;FA6b8#?(HU0+zD1`*ReE9+p
zKr9f0`=>m9@#;PEzrU@Gx(rNA|FHo^Mn<3|00G3vEO>ZAhtlWIf1*N!=PZ8p<;&lH
z{~7-L`S<7dzu$lU0~x=8==VP$LqeQ==EOq)0mSn6{g=m2e$<)X`O9Zpu5&$Np~P<n
zW}u>9Kn=gZ<nMpKegVn9A3ptNV0Z%%KtLz``}3b+(ehU!o0k9i{rC5O>0kf<1I-4a
zUtk1c`~{K>fBu3(0U&^Y8d(1RW7^4V^6LZG89>!QBmXe{`pfY9FT=0Dj8O6)!|#7g
zK*az7#L~(T<NUS$)2A0eXa4;Kax#<zI^x%#zd*MGxj?DkfB6I@Co@b32q2achS$vB
zFa7&=kKy-kpyB_2{Q@Bf11|FCH_$<hKU9nv7ytr@1sFX{KnF@n0_8x?1j_yX%?M)u
zVStc8^!G0W0TlxT5F;?2{~;j;R4$qn5C8-i0A7e(F(6QIEC2ui07*qoM6N<$g8Aa*
AcK`qY

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/sk.png b/turtles/images/flags/sk.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ccbc8274ad8f76f28960b83f2bba2a619029d87
GIT binary patch
literal 562
zcmV-20?qx2P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz#7RU!RCwBA
z{QLDg1H(TCIQaJu#Q6uJ|3Nta;NTCC3lKmoKv^a(E+F~;|9^-UCJ_Cf@&A8juplz{
z^6Cvh0I@)f|2}^)!>2F*|Nr~{=Pyu%qcHbB24G}l{PX7zKmY(S0M7peLS*D^UKK~y
z+6(XH|9gD^r>6bY*OZ>+`2GX^{Qmv@{`~#_{QUm>{r(dW1b1xK0st`p&i@3&%J4-(
z6Giy=|7vRh4-WrbUHx`??d0*<@CX3>{QLa=`~Cm?`~Ld;{u~zu0R89!i0SVi2B1U!
z{r&fU#+3gbKmA|6l!@v8=U+^J{{8>`mjUR&KfnL~{sUtC1qTg400I5L26X!4i0my}
zo;{uZo#CfPX{7DT1DwDAf(-fnkMZ|^ra%9I0mS$d6bftr0mQhUfkCOfi<O`2yS+>E
zM%HqlKU{maemr>kAILSo!3gZ8-+$N@WcKe}3J^dnRtyZx@9+FOdynDWy$P0%j62V;
zZC)?>`}hA}zy1SB2;<Lhpqm(ZJ_s@}00a;V&|yqKH%dzWfAWlT`68g)e_2_^-#`_A
z7$77N{rw9;K*az7#P}5)5pcwS%0-g`0)PMm09-0P6VOeYy#N3J07*qoM6N<$f?%`}
A#{d8T

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/tr.png b/turtles/images/flags/tr.png
new file mode 100644
index 0000000000000000000000000000000000000000..be32f77e9910c0896c1ee8e7ed4f0edf815a517e
GIT binary patch
literal 492
zcmV<I0Tcd-P)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzen~_@RCwBA
z{Lg>@|4`Xj5kLT%<k$uP7=(c!B$=C`m@OT)i73*%PWm%5!pN3f8h}PPuz^+8K>yy%
zCxE~j7#aURc>+`lQtjr(@bBOM9XtMi`UFz<>-YcPzyAOF1!ObI$^vZw2q2J#|6qeb
zs-vSBOie-Rl$HN?bb!_U0_g#3VEFwTr~x2=m_Y6Zss`GqsL0^t^nd#F|4B*zH*EO-
z_3QuT%m4H6g6)A?0#pkSKujPf{rCwIb#eU<wB*<^klg9h|5vQ|FC_GT&6@vaW>5`(
z{s2t}2q2J#|9}60{Pg58FvR|AYlEDjruP5RC6KEgJ^H_IA4CJhNdN)F0>q49OBog~
z{?Etvzo-c07$As@{Qu?4|3!<Sj`;&J^bZ3AKmdU>FoS~(Xu$ujuK&Ki|5;f<uK)ZQ
z<W7hO{s1+ALIvm?fB*t%VEX@`K~fTI%wL9+CxJQ{g@qaT`5C|lgAh0jfe5G=Ab=RZ
iqDCa1IEDa#00RK;*E?KB1HW$o0000<MNUMnLSTX`Cf<<%

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/tw.png b/turtles/images/flags/tw.png
new file mode 100644
index 0000000000000000000000000000000000000000..f31c654c99c023dbed9a7070103c4542326c4464
GIT binary patch
literal 465
zcmV;?0WSWDP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzV@X6oRCwBA
zWKiGC00)2mfzYpi3_t!nd><~s!0-<P0R#{WP+3c@4v;hwW@lz%I`Z_(-+v5$|Na%Y
zP{91>E7R}a|Ns2?4<o;9+5`|lED)nbzW#F#6=!8-d@%dV;Wyv^{Q39i-h+R?KmGsp
z`~UA>|9|}gs%Dgx1=;`*KrBFO{{8#+``2Fv2B6@-@8AFY{`(K80jd<F`Zq)a15lcQ
z0U&@_82<eE`<LOukKZ+O?)~}q@7c$nfByda4KxGEY`6xXTL1!xh2a-a*}uPk{yu;A
z2War`zyE<A05aHre?h2*XaI^bFaQJ)%ipJ=443l%KX?E%kKs4ie@M<iCK<s_0tg@$
zAZ7#$0S!P=gsK`O3v>Yk13&<QG%$mMi~+6)Q`;Y)hQGkT2KoUYfIu3Ue*a;Rlmr{|
zm*EdcCnMNM1_%j6fB!-dP%%INF@8mjNCs@N3zq@{fB*vkNmFLv=8dPY00000NkvXX
Hu0mjf=E=rh

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/ua.png b/turtles/images/flags/ua.png
new file mode 100644
index 0000000000000000000000000000000000000000..09563a21941f2a94c937d43aceda1aa546246302
GIT binary patch
literal 446
zcmV;v0YUzWP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzP)S5VRCwBA
zWN7`*00;m6G5i6N3?TB)KPdVIBY}v40U!W}a&iLz2m>)t0eYh-DxnQ(<CkR3A^A6M
zmq-6I2uq%(2rN`X#gh<zOV->+0I@JIfmA>F`X8wD?>`2h#NWRRzyE`zA&Pzh5tt#%
z!^rUCA3y+sZ1@LM1hf`pHc0ia|NsB|1uKPX0CRu;1-SztfLMSo`wOxir1}rsY$VlC
z667idh7Sw?0mQ-}a!Q0#;n&}vAb0=!_Zy@WNd5!6=O2ju7s{65Vq=gx0uVrqe;+b1
z$mIY3|KLBvF9x7j{{!v#g_UGtQhI;<6hHv607H@yECdWlR7EJN!LomVp$!l~APvkQ
z4p0cL2#YobhQA>6hXEjfKpL3-19eKmL_s<k8GnN#4?_Ndss;x8KL&sRV*Gj&6u<xe
oKuHET8^T~fa6udf27mwq07!>!=;22W8vp<R07*qoM6N<$f=xiHIRF3v

literal 0
HcmV?d00001

diff --git a/turtles/images/flags/us.png b/turtles/images/flags/us.png
new file mode 100644
index 0000000000000000000000000000000000000000..10f451fe85c41c6c9a06d543a57114ae2f87ecc1
GIT binary patch
literal 609
zcmV-n0-pVeP)<h;3K|Lk000e1NJLTq000mG000XJ0ssI2`GA^k00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz^GQTORCwBA
zOin+-00;m6G5q_(!0?NK;Xja^CBNtYx36zrzX0<8fe}y+AOOR1ZUO)Z1VGUKD=-j5
zV;e9~EK2V8xn<G~KHPiiGJR5}scIU=OtG5?dqju`4q&&IzW`zcYOs&ASbpf=-+v51
z^y|<6zyCpuAAkOzWvFI&_krQlM}{w-8NPjEjPks3<_JIl0d3e1G#F@-eci9GU%y&a
z{(S%by?*fzmXaTzK7IP|;lsOk@7}z5^Y?G`moJ}Ao;(N;Kr9UZn1POWZ)W`W@4ssc
z%b(v24lSHl8GioxdYUV43eaGNFJJ!u`0?-8FV3W{KUdEI1Q0`V@(!T8ZL5BM{P@wV
z<mc<xubB&<K7Ra|!G9~n>{qW|y?pud`Sa)3|NY&vWd%S0u>b>P!2!lUe;6EF*#G_c
zFVXVt@6Q{uX@40W{p0iY2Aa+A^Cu7i8KT+YH}2j52q4BskM2rJ$^k9;2Xxc_|Np=M
z&VaLlA*IO5FlECMfB<5VUNC{tBZO(|zW*;@GJN;|bTJ71`0*d;`d`2P!x=ymOA`2>
z+y@9C##^^8%gd{MW@Y91_2d742B2~OQNf=-zkmD?Vqkdk_wPTUNeuu2#KPTG{_;O4
v7C%8E5*DLB7#Kb?Fnj}}-(W6879hX?8lYRg`Y`<~00000NkvXXu0mjfD6Jtx

literal 0
HcmV?d00001

diff --git a/turtles/index.html b/turtles/index.html
new file mode 100644
index 000000000..2400a95cc
--- /dev/null
+++ b/turtles/index.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+        <meta name="description" itemprop="description" content="One Piece Treasure Cruise Turtle Time Calculator">
+        <meta name="author" content="Zeenigami and Mondfischer">
+        <meta name="keywords" content="OPTC, One Piece Treasure Cruise, Database, Calculator, Guides, Help, Walkthroughs, Tutorials, turtle times">
+		<title>Turtle Time Calc</title>
+        <link rel="stylesheet" type="text/css" href="../common/css/links.css" />
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/main.css">
+		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
+		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
+		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
+		<script src="app/lib/moment.min.js"></script>
+		<script src="app/lib/angular-local-storage.min.js"></script>
+		<script src="app/lib/angular-translate.min.js"></script>
+		<script src="app/lib/angular-timer.min.js"></script>
+		<script src="app/lib/humanize-duration.js"></script>
+		<script src="app/lib/ng-table.min.js"></script>
+		<script src="app/lib/ui-bootstrap-tpls-0.13.0.min.js"></script>
+		<script src="app/lib/angular-polyglot.language.switcher.js"></script>
+		<script src="app/lib/ics.js"></script>
+		<script src="app/lib/FileSaver.js"></script>
+		<script src="app/lib/Blob.js"></script>
+		<script src="app/lib/bower_components/momentjs/locale/de.js"></script>
+		<script src="app/lib/bower_components/momentjs/locale/es.js"></script>
+		<script src="app/lib/bower_components/momentjs/locale/fr.js"></script>
+		<script src="app/lib/bower_components/angular-animate/angular-animate.min.js"></script>
+		<script src="app/app.js"></script>
+		<script src="app/controllers/turtleCtrlBeta.js"></script>
+		<script src="app/controllers/localeCtrl.js"></script>
+		<script src="app/controllers/navbarCtrl.js"></script>
+		<script src="app/controllers/modalCtrl.js"></script>
+		<script src="app/directives/collapseDirective.js"></script>
+		<script src="app/directives/turtleBetaDirective.js"></script>
+		<script src="app/services/turtleFact.js"></script>
+		<script src="app/config/localizeConfig.js"></script>
+
+        <script>
+          (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-73715806-1', 'auto');
+          ga('send', 'pageview', '/turtles');
+        </script>
+	</head>
+
+	<body ng-app="app" ng-controller="LocaleCtrl as locale" ng-cloak ng-click="collapse=false">
+		<nav class="navbar navbar-default" ng-controller="NavbarCtrl" ng-click="$event.stopPropagation()">
+			<div class="container">
+				<div class="navbar-header">
+					<button type="button" class="navbar-toggle" ng-click="isCollapsed=!isCollapsed">
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span>
+					<span class="icon-bar"></span> 
+					</button>
+				</div>
+				<div class="navbar-collapse init" collapse="isCollapsed">
+					<ul class="nav navbar-nav">
+						<li class="active"><a href="index.html">{{ 'NAV_TURTLE' | translate }}</a></li>
+						<li><a href="barrel.html">{{ 'NAV_BARREL' | translate }}</a></li>
+						<li id="settings"><a href="settings.html">{{ 'NAV_SETTINGS' | translate }}</a></li>
+					</ul>
+					<div class="language-picker nav pull-right">
+						<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" selected-lang="{{locale.flag}}" language-changed-callback="onLanguageChanged(lang)"></pls>
+					</div>
+				</div>
+			</div>
+		</nav>
+
+		<div class="jumbotron">
+			<div class="container" ng-controller="TurtleCtrlBeta as turtle">
+				<h1 class="page-title">{{'TT_TITLE' | translate}}</h1>
+				<div>
+					<div class="id">
+						<span>{{'TT_DIGIT' | translate}}</span>
+						<input type="number" min="0" max="9" ng-model="turtle.id" class="input-id" select-on-click>
+						<input class="digit" type="checkbox" name="militaryTime" ng-model="turtle.military"><span>{{'TT_FORMAT' | translate}}</span>
+					</div>
+					<p>{{'TT_TIMEZONE' | translate}} {{turtle.timezone}}</p>
+					<div class="btn-group game-version ttc-version">
+						<label class="btn btn-default" ng-model="turtle.version" btn-radio="'global'">GLOBAL</label>
+						<label class="btn btn-default" ng-model="turtle.version" btn-radio="'jpn'">JPN</label>
+					</div>
+					<div class="ttime-global">
+						<turtle-beta 
+							class="ttime-day"
+							military="turtle.military"
+							index="$index"
+							numid="turtle.id"
+							ng-repeat="t in turtle.range(4) track by $index"
+							locale="locale.locale"
+							version="'turtle.version'"
+							ng-show="turtle.version === 'global'"
+							>
+						</turtle-beta>
+						<div>
+						<turtle-beta 
+							class="ttime-day"
+							military="turtle.military"
+							index="$index"
+							numid="turtle.id"
+							ng-repeat="t in turtle.range(4) track by $index"
+							locale="locale.locale"
+							version="turtle.version"
+							ng-show="turtle.version !== 'global'"
+							>
+						</turtle-beta>
+						<!-- <p ng-show="turtle.version !== 'global'">JPN: Fixed! Sorry for the inconvenience. The last two dates are incorrect and will be updated once I know the correct times.</p> -->
+					</div>
+					<div class="add-to-calendar" ng-show="!turtle.iOS">
+						<a class="btn btn-default" ng-click="turtle.get_cal()">
+							{{'TT_ADD_CALENDAR' | translate}}
+						</a>
+					</div>
+				</div>
+
+				<button class="btn btn-info btn-notif" ng-click="isCollapsed1 = !isCollapsed1" ng-show="turtle.notif_support" ng-init="isCollapsed1 = true">{{'TT_NOTIFICATION' | translate}}</button>
+				<div collapse="isCollapsed1" ng-show="turtle.notif_support" class="settings-notif init">
+					<div>
+						<span>{{'TT_NOTIF_MINUTES' | translate}}: </span>
+						<input type="number" min="0" max="999" class="input-id" ng-model="turtle.notif_time" select-on-click>
+					</div>
+					<div>
+						<input type="checkbox" name="sound" ng-model="turtle.notif_sound"> <span>{{'TT_NOTIF_SOUND' | translate}}</span>
+						<button class="btn btn-sm btn-default" ng-click="turtle.example_notification()">{{'TT_NOTIF_EXAMPLE' | translate}}</button>
+					</div>
+				</div>
+
+				
+			</div>
+                Credit to Cyung for original code. We will be updating with Friday dates for Global soon.
+		</div>
+        <error-report></error-report>
+        <link-button exclude="turtles"></link-button>
+	</body>
+</html>
diff --git a/turtles/redirectModal.html b/turtles/redirectModal.html
new file mode 100644
index 000000000..412493ff1
--- /dev/null
+++ b/turtles/redirectModal.html
@@ -0,0 +1,10 @@
+<div class="modal-header">
+    <h3 class="modal-title">Redirecting to new site</h3>
+</div>
+<div class="modal-body">
+<div class="countdown-container">Redirecting to <a href="https://optctimer.com">https://optctimer.com</a> in {{modal.countdown}} seconds.</div>
+</div>
+<div class="modal-footer">
+    <button class="btn btn-primary" type="button" ng-click="modal.ok()">OK</button>
+    <button class="btn btn-warning" type="button" ng-click="modal.cancel()">Cancel</button>
+</div>
\ No newline at end of file
diff --git a/turtles/settings.html b/turtles/settings.html
new file mode 100644
index 000000000..ee709d344
--- /dev/null
+++ b/turtles/settings.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html lang="en">
+
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<title>Turtle Time Calc</title>
+		<link rel="stylesheet" href="css/normalize.css">
+		<link rel="stylesheet" href="css/main.css">
+		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
+		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
+		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
+		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
+		<script src="app/lib/moment.min.js"></script>
+		<script src="app/lib/angular-local-storage.min.js"></script>
+		<script src="app/lib/angular-translate.min.js"></script>
+		<script src="app/lib/angular-timer.min.js"></script>
+		<script src="app/lib/humanize-duration.js"></script>
+		<script src="app/lib/ng-table.min.js"></script>
+		<script src="app/lib/ui-bootstrap-tpls-0.13.0.min.js"></script>
+		<script src="app/lib/angular-polyglot.language.switcher.js"></script>
+		<script src="app/lib/momentjs/locale/de.js"></script>
+		<script src="app/lib/momentjs/locale/es.js"></script>
+		<script src="app/lib/bower_components/angular-animate/angular-animate.min.js"></script>
+		<script src="app/app.js"></script>
+		<script src="app/controllers/eventCtrl.js"></script>
+		<script src="app/controllers/localeCtrl.js"></script>
+		<script src="app/controllers/navbarCtrl.js"></script>
+		<script src="app/directives/eventDirective.js"></script>
+		<script src="app/directives/collapseDirective.js"></script>
+		<script src="app/config/localizeConfig.js"></script>
+		<script>
+		  (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-62547536-1', 'auto');
+		  ga('send', 'pageview');
+
+		</script>
+	</head>
+
+	<body ng-app="app" ng-controller="LocaleCtrl as locale" ng-cloak>
+		
+		<nav class="navbar navbar-default" ng-controller="NavbarCtrl" ng-click="$event.stopPropagation()">
+				<div class="container">
+					<div class="navbar-header">
+						<button type="button" class="navbar-toggle" ng-click="isCollapsed=!isCollapsed">
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span>
+						<span class="icon-bar"></span> 
+						</button>
+					</div>
+					<div class="navbar-collapse init" collapse="isCollapsed">
+						<ul class="nav navbar-nav">
+							<li><a href="index.html">{{ 'NAV_TURTLE' | translate }}</a></li>
+							<li><a href="barrel.html">{{ 'NAV_BARREL' | translate }}</a></li>
+							<li><a href="event.html">{{ 'NAV_EVENT' | translate }}</a></li>
+							<li><a href="contact.html">{{'NAV_CONTACT' | translate}}</a></li>
+							<li id="settings" class="active"><a href="settings.html">{{ 'NAV_SETTINGS' | translate }}</a></li>
+						</ul>
+						<div class="language-picker nav pull-right">
+							<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" selected-lang="{{locale.flag}}" language-changed-callback="onLanguageChanged(lang)"></pls>
+						</div>
+					</div>
+				</div>
+		</nav>
+
+		<div class="jumbotron">
+			<div class="container">
+				<h1>{{ 'NAV_SETTINGS' | translate }}</h1>
+				<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" language-changed-callback="onLanguageChanged(lang)"></pls>
+			</div>
+		</div>
+
+	</body>
+
+</html>
diff --git a/turtles/sounds/notification.mp3 b/turtles/sounds/notification.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..def7692bc2fab042204b698475815f0aa0e4aaae
GIT binary patch
literal 111176
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%0D0(7_6M)RgHW#k^7mV+q$#Kp6w#
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
KCix$p!2bg;X*gj3

literal 0
HcmV?d00001


From a12e483e498e56c97bb19a35dc8aab94c21a8741 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 4 Oct 2016 13:19:32 -0500
Subject: [PATCH 0609/1569] icon fix

---
 common/data/cooldowns.js |   4 +-
 oldIco.ico               | Bin 2238 -> 0 bytes
 turtles/contact.html     |  78 ---------------------------------------
 turtles/favicon.ico      | Bin 4286 -> 0 bytes
 turtles/index.html       |   5 +--
 5 files changed, 4 insertions(+), 83 deletions(-)
 delete mode 100644 oldIco.ico
 delete mode 100644 turtles/contact.html
 delete mode 100644 turtles/favicon.ico

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 50f93fc40..1602e04e3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1072,8 +1072,8 @@ window.cooldowns = [
 	[ 26, 18 ],
 	[ 26, 18 ],
 	[ 15, 6 ],
-	17,
-	17,
+	[ 17, 10],
+	[ 17, 10],
 	[ 20, 16 ], //Leo
 	[ 20, 16 ], //Leo
 	[ 24, 18 ], //Mansherry
diff --git a/oldIco.ico b/oldIco.ico
deleted file mode 100644
index 03e93cb4b9fb92861eb88b8a97ccb67fb860d77e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2238
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

diff --git a/turtles/contact.html b/turtles/contact.html
deleted file mode 100644
index 7ddedad3c..000000000
--- a/turtles/contact.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-	<head>
-		<meta charset="UTF-8">
-		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title>Turtle Time Calc</title>
-		<link rel="stylesheet" href="css/normalize.css">
-		<link rel="stylesheet" href="css/main.css">
-		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
-		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
-		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
-		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>
-		<script src="https://cdnjs.cloudflare.com/ajax/libs/jstimezonedetect/1.0.4/jstz.min.js"></script>
-		<script src="app/lib/moment.min.js"></script>
-		<script src="app/lib/angular-local-storage.min.js"></script>
-		<script src="app/lib/angular-translate.min.js"></script>
-		<script src="app/lib/angular-timer.min.js"></script>
-		<script src="app/lib/humanize-duration.js"></script>
-		<script src="app/lib/ng-table.min.js"></script>
-		<script src="app/lib/ui-bootstrap-tpls-0.13.0.min.js"></script>
-		<script src="app/lib/angular-polyglot.language.switcher.js"></script>
-		<script src="app/lib/momentjs/locale/de.js"></script>
-		<script src="app/lib/momentjs/locale/es.js"></script>
-		<script src="app/lib/bower_components/angular-animate/angular-animate.min.js"></script>
-		<script src="app/app.js"></script>
-		<script src="app/controllers/eventCtrl.js"></script>
-		<script src="app/controllers/localeCtrl.js"></script>
-		<script src="app/controllers/navbarCtrl.js"></script>
-		<script src="app/directives/eventDirective.js"></script>
-		<script src="app/directives/collapseDirective.js"></script>
-		<script src="app/config/localizeConfig.js"></script>
-		<script>
-		  (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-62547536-1', 'auto');
-		  ga('send', 'pageview');
-
-		</script>
-	</head>
-
-	<body ng-app="app" ng-controller="LocaleCtrl as locale" ng-cloak>
-		
-		<nav class="navbar navbar-default" ng-controller="NavbarCtrl" ng-click="$event.stopPropagation()">
-				<div class="container">
-					<div class="navbar-header">
-						<button type="button" class="navbar-toggle" ng-click="isCollapsed=!isCollapsed">
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						</button>
-					</div>
-					<div class="navbar-collapse init" collapse="isCollapsed">
-						<ul class="nav navbar-nav">
-							<li><a href="index.html">{{ 'NAV_TURTLE' | translate }}</a></li>
-							<li><a href="barrel.html">{{ 'NAV_BARREL' | translate }}</a></li>
-							<li><a href="event.html">{{ 'NAV_EVENT' | translate }}</a></li>
-							<li class="active"><a href="contact.html">{{'NAV_CONTACT' | translate}}</a></li>
-							<li id="settings"><a href="settings.html">{{ 'NAV_SETTINGS' | translate }}</a></li>
-						</ul>
-						<div class="language-picker nav pull-right">
-							<pls id="pls1" items="plsModel.languages" open-mode="click" show-flag="true" selected-lang="{{locale.flag}}" language-changed-callback="onLanguageChanged(lang)"></pls>
-						</div>
-					</div>
-				</div>
-		</nav>
-
-	<div class="container">
-		<iframe src="http://chrisyung.me/contact_layout.html" frameborder="0"></iframe>
-	</div>
-
-	</body>
-
-</html>
diff --git a/turtles/favicon.ico b/turtles/favicon.ico
deleted file mode 100644
index cb4f25e6bd779d58abe7929f544da11a41f5c111..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4286
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

diff --git a/turtles/index.html b/turtles/index.html
index 2400a95cc..bd30fe7c9 100644
--- a/turtles/index.html
+++ b/turtles/index.html
@@ -7,12 +7,11 @@
         <meta name="description" itemprop="description" content="One Piece Treasure Cruise Turtle Time Calculator">
         <meta name="author" content="Zeenigami and Mondfischer">
         <meta name="keywords" content="OPTC, One Piece Treasure Cruise, Database, Calculator, Guides, Help, Walkthroughs, Tutorials, turtle times">
-		<title>Turtle Time Calc</title>
-        <link rel="stylesheet" type="text/css" href="../common/css/links.css" />
+		<title>Turtle Time Calculator</title>
+        
 		<link rel="stylesheet" href="css/normalize.css">
 		<link rel="stylesheet" href="css/main.css">
 		<link href="css/polyglot-language-switcher-2.css" rel="stylesheet">
-		<link rel="shortcut icon" type="image/ico" href="favicon.ico">
 		<link href='https://fonts.googleapis.com/css?family=Squada+One|Lora' rel='stylesheet' type='text/css'>
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
 		<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.15/angular.min.js"></script>

From 03d2ad074bb4e6855950caa2c67a568181cc7e45 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 5 Oct 2016 04:40:29 -0500
Subject: [PATCH 0610/1569] names, units, all updated

---
 common/data/aliases.js    | 13 ++++---
 common/data/cooldowns.js  | 17 ++++++---
 common/data/details.js    | 75 +++++++++++++++++++++++++++++++++++++--
 common/data/drops.js      | 13 +++++--
 common/data/evolutions.js | 16 +++++++++
 common/data/families.js   |  9 +++++
 common/data/gw.js         |  9 +++++
 common/data/units.js      | 59 +++++++++++++++++-------------
 index.html                |  9 ++---
 9 files changed, 177 insertions(+), 43 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 83dd8409f..d1a2eda91 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1255,8 +1255,8 @@ window.aliases = {
     1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','',''],
     1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下','',''],
     1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下','',''],
-    1257: ['エドワード・ニューゲート 海賊王のライバル','','Edward Newgate'],
-    1258: ['エドワード・ニューゲート 大海賊“白ひげ”','','Edward Newgate'],
+    1257: ['エドワード・ニューゲート 海賊王のライバル','','Edward Newgate','Young Whitebeard'],
+    1258: ['エドワード・ニューゲート 大海賊“白ひげ”','','Edward Newgate','Young Whitebeard'],
     1259: ['ドンキホーテ・ドフラミンゴ “北の海”の海賊','','Young Doffy','Donquixote Doflamingo'],
     1260: ['ドンキホーテ・ドフラミンゴ “北の海”の闇','','Young Doffy','Donquixote Doflamingo'],
     1261: ['セニョール・ピンク “北の海”の海賊','','Senor Pink', 'Young Senior Pink'],
@@ -1282,6 +1282,11 @@ window.aliases = {
     1281: ['ガープ 海軍本部中将','',''],
     1282: ['センゴク 海軍本部元帥','',''],
     1283: ['赤犬 海軍本部大将','','Sakazuki'],
-    1284: ['','',''],
-    1285: ['','',''],
+    1284: ['モンキー・D・ルフィ 野生の海賊','',''],
+    1285: ['モンキー・D・ルフィ 大地の開拓者','',''],
+    1286: ['ベビー５ スパイダーマイルズの少女','','Kid Baby 5'],
+    1287: ['ベビー５ ドンキホーテファミリーの一員','','Kid Baby 5'],
+    1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law'],
+    1289: ['トラファルガー・ロー ドンキホーテファミリーの一員','','Kid Trafalgar Law'],
+    1290: ['バッファロー ドンキホーテファミリーの一員','','Kid Buffalo'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1602e04e3..2fcfc923e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -961,7 +961,7 @@ window.cooldowns = [
 	[ 22, 14 ],
 	[ 16, 8 ],
 	[ 16, 8 ],
-	23,
+	[ 23, 16 ],
 	[ 23, 17 ],
 	[ 23, 17 ],
 	[ 25, 18 ],
@@ -1060,7 +1060,7 @@ window.cooldowns = [
 	15,
 	15,
 	10,
-	21,
+	[ 21, 15 ],
 	20,
 	28,
 	16,
@@ -1080,8 +1080,8 @@ window.cooldowns = [
 	[ 24, 18 ], //Mansherry
 	[ 18, 12 ],
 	[ 18, 12 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
+	[ 23, 16 ],
+	[ 23, 16 ],
 	[ 24, 17 ],
 	[ 24, 17 ],
 	[ 20, 10 ],
@@ -1284,4 +1284,13 @@ window.cooldowns = [
     25,
     [ 12, 12 ],
     [ 12, 12 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 13, 9 ],
+    [ 13, 9 ],
+    [ 20, 10 ],
+    29,
+    29,
+    null,//Coliseumn Sandersonia
+    null,//Coliseumn Sandersonia
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 3e5886744..495aa7f86 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3576,14 +3576,14 @@ window.details = {
 		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
 		specialName: "Gum-Gum Storm",
 		captain: "Boosts ATK of Powerhouse characters by 3x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters."
+		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters. You will not die to the HP reduction"
 	},
 	795: {
 		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
 		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
 		specialName: "Gum-Gum Storm",
 		captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters."
+		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters. You will not die to the HP reduction"
 	},
 	796: {
 		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
@@ -6665,12 +6665,81 @@ window.details = {
     1284: {//Wild Luffy
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
         special: "Reduces duration of Bind and Silence by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
+        sailor: "Reduces duration of Silence against this character by 3 turns",
         specialName: "Wild Luffy Special",
     },
     1285: {//Wild Luffy Evolved
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 3.375x instead.",
-        special: "Reduces duration of Bind and Silence by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
+        special: "Reduces duration of Despair and Silence by 3 turns. Randomizes Non-Matching orbs. (Including [BLOCK] orb)",
+        sailor: "Reduces duration of Silence against this character by 3 turns",
         specialName: "Wild Luffy Special",
     },
+    1286: {//Kid Baby 5
+        captain: "Boosts ATK and RCV of [PSY] characters by 1.3x",
+        special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
+        specialName: "Kid Baby 5 Special",
+    },
+    1287: {//Kid Baby 5
+        captain: "Boosts ATK and RCV of [PSY] characters by 1.5x",
+        special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
+        specialName: "Kid Baby 5 Special",
+    },
+    1288: {//Kid Law
+        captain: "Boosts ATK of Driven characters by 2.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
+		captainNotes: "His ATK multiplier will be 2.5x on the first turn, 2.4x on the second, 2.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
+        special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
+        specialName: "Kid Law Special",
+    },
+    1289: {//Kid Law
+        captain: "Boosts ATK of Driven characters by 2.75x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
+		captainNotes: "His ATK multiplier will be 2.75x on the first turn, 2.65x on the second, 2.55x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
+        special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
+        specialName: "Kid Law Special",
+    },
+    1290: {//Kid Buffalo
+        captain: "Recovers 500 HP at the end of each turn",
+        special: "Changes own orb into [INT], and Captain orb into [BOMB]",
+        specialName: "Kid Buffalo Special",
+    },
+    1291: {//Lao G, Coliseum
+        captain: "Boosts ATK of Driven characters by 1.75x",
+        special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
+        specialName: "Lao G Special",
+    },
+    1292: {//Lao G, Coliseum
+        captain: "Boosts ATK of Driven characters by 2.5x if they have a matching orb, by 2x otherwise",
+        special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
+        specialName: "Lao G Special",
+    },
+    1293: {//Coliseum Sandersonia
+        captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
+        special: [
+			{
+				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
+				"cooldown": [ 21, 11 ],
+			},
+            {
+				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
+				"cooldown": [ 26, 16 ],
+			},
+		],
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
+        specialName: "Coliseum Sandersonia Special",
+    },
+    1294: {//Coliseum Sandersonia
+        captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
+        special: [
+			{
+				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
+				"cooldown": [ 21, 11 ],
+			},
+            {
+				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
+				"cooldown": [ 26, 16 ],
+			},
+		],
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
+        specialName: "Coliseum Sandersonia Special",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 1d614ff65..47f148236 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1179,6 +1179,13 @@ window.drops = {
             condition: "Driven Characters have their cooldowns reduced by 10 turns at the start of the fight",
             "All Difficulties": [ 1254, 1255, 1256, -669, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },
+        
+        {
+            name: "Young Donquixote Pirates - Baby 5 And Buffalo",
+            thumb: 1287,
+            condition: "Child-like characters get their ATK and HP boosted by 3.5x, RCV by 1.5x, and cooldowns reduced by 7 turns at the start of the fight",
+            "All Difficulties": [ 1286, 1288, 1290, -963, -1045, -251, -760, -1083, -1129, -506, -1062, -702 ]
+        },
 		
     ],
 
@@ -1393,9 +1400,9 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index dd027628c..838eaaf85 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1945,6 +1945,22 @@ window.evolutions = {
     },
     1284: {
         evolution: 1285,
+		evolvers: [ 95, 96, 97, 303, 304 ]
+    },
+    1286: {
+        evolution: 1287,
+		evolvers: [ 116, 117, 81, 98 ]
+    },
+    1288: {
+        evolution: 1289,
+		evolvers: [ 116, 117, 80, 97 ]
+    },
+    1291: {
+        evolution: 1292,
+		evolvers: [  ]
+    },
+    1293: {
+        evolution: 1294,
 		evolvers: [  ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 42c593295..115a31594 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1284,4 +1284,13 @@ window.families = [
     "Akainu",
     "Monkey D. Luffy",
     "Monkey D. Luffy",
+    "Baby 5",
+	"Baby 5",
+    "Trafalgar Law",
+	"Trafalgar Law",
+    "Buffalo",
+    "Lao G",
+    "Lao G",
+    "Boa Sandersonia",
+    "Boa Sandersonia",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 4a2def46e..29473405d 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1284,4 +1284,13 @@ window.gw=[
     38885,
     39075,
     39075,
+    39525,
+    39525,
+    39527,
+    39527,
+    39526,
+    39529,
+    39529,
+    39530,
+    39530,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 0e165ffd3..ca008cfb6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1244,10 +1244,10 @@ window.units = [
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
     [ "'Straw Hat' Monkey D Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
-    [ "Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
-    [ "Ace, Marineford Flight Evolved", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
-    [ "Fluttering in Neck the Autumn Breeze, Marco", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
-    [ "Tipsy Kimono, Marco", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
+    [ "'Fire Fist' Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
+    [ "'Fire Fist' Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
+    [ "Marco, Fluttering in Neck the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
+    [ "Marco, Tipsy Kimono", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
     [ "Marco, Whitebeard Pirates", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
     [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
@@ -1255,35 +1255,44 @@ window.units = [
     [ "Maelstrom Spider Squardo, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
     [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
-    [ "Young Whitebeard", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
-    [ "Young Whitebeard Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
-    [ "Young Doflamingo", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
-    [ "Young Doflamingo Evolved", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
-    [ "Young Señor Pink", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
-    [ "Young Señor Pink Evolved", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
-    [ "Young Vergo", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
-    [ "Young Vergo Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
+    [ "Edward Newgate, Rival of the Pirate King", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
+    [ "'Whitebeard' Edward Newgate, Grand Pirate", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
+    [ "Donquixote Doflamingo, Pirates of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
+    [ "Donquixote Doflamingo, Darkness of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
+    [ "Senior Pink, Pirates of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
+    [ "Senior Pink, Darkness of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
+    [ "Vergo, Pirates of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
+    [ "Vergo, Darkness of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
     [ "Kimono Ace", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, null, 152, 90, 30, 961, 584, 174, null ],
     [ "Kimono Ace Evolved", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, null, 890, 541, 130, null, null, null, null ],
-    [ "Legend Blackbeard", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, 1066998, 429, 287, 39, 1674, 854, 127, 1 ],
-    [ "Legend Blackbeard Evolved", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1600, 789, 73, 3350, 1520, 244, 1 ],
+    [ "Marshall D. Teach, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, 1066998, 429, 287, 39, 1674, 854, 127, 1 ],
+    [ "Blackbeard, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1600, 789, 73, 3350, 1520, 244, 1 ],
     [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, 392109, 109, 92, 51, 995, 506, 202, 1 ],
-    [ "Laffitte Evolved", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 917, 415, 152, 2094, 1132, 406, 1 ],
+    [ "'Demon Sheriff' Laffitte", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 917, 415, 152, 2094, 1132, 406, 1 ],
     [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 99, 130, 48, 903, 620, 183, 1 ],
-    [ "Van Augur Evolved", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
+    [ "'The Supersonic' Van Augur", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
     [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 187, 122, 1, 1520, 603, 1, 1 ],
-    [ "Jesus Burgess Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
+    [ "'Champion' Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
     [ "Shiryu", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 132, 142, -300, 1244, 689, -300, 1 ],
-    [ "Shiryu Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1168, 622, -300, 2500, 1490, -300, 1 ],
+    [ "Shiryu of the Rain", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1168, 622, -300, 2500, 1490, -300, 1 ],
     [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, 4, 3, 50, 392109, 52, 131, 89, 703, 624, 254, 1 ],
-    [ "Doc Q Evolved", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
+    [ "'Grim Reaper' Doc Q", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
     [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, 1066998, 301, 92, 59, 1794, 709, 140, 1 ],
-    [ "Aokiji, of Marineford", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, 3000000, 257, 129, 58, 2206, 1152, 227, 1 ],
-    [ "Garp, of Marineford", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 171, 64, 62, 2094, 1002, 266, 1 ],
-    [ "Sengoku, of Marineford", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 213, 96, 95, 1942, 972, 304, 1 ],
-    [ "Akainu, of Marineford", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 133, 100, 0, 2000, 1381, 0, 1 ],
-    [ "Wild Luffy", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, null, 226, 154, 51, null, null, null, null ],
-    [ "Wild Luffy Evolved", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 3, 99, null, null, null, null, 2491, 1325, 261, null ] 
+    [ "Aokiji, Navy HQ Admiral", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, 3000000, 257, 129, 58, 2206, 1152, 227, 1 ],
+    [ "Garp, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 171, 64, 62, 2094, 1002, 266, 1 ],
+    [ "Sengoku Navy HQ Fleet Admiral", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 213, 96, 95, 1942, 972, 304, 1 ],
+    [ "Akainu Navy HQ Admiral", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 133, 100, 0, 2000, 1381, 0, 1 ],
+    [ "Monkey D. Luffy, Wild Pirate", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 226, 154, 51, 1104, 602, 143, 1 ],
+    [ "Monkey D. Luffy, Pioneer Of Land", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1002, 501, 88, 2491, 1325, 261, 1 ],
+    [ "Baby 5, Girl of Spider Miles", "PSY", [ "Fighter", "Shooter" ], 3, 9, 5, 1, 50, 392109, 19, 29, 35, 399, 204, 194, 1 ],
+    [ "Baby 5, Member of Donquixote Family", "PSY", [ "Striker", "Shooter" ], 4, 15, 4, 3, 99, 3000000, 274, 158, 146, 784, 579, 372, 1 ],
+    [ "Trafalgar Law, Boy of Spider Miles", "DEX", [ "Driven", "Slasher" ], 3, 9, 6, 1, 50, 392109, 28, 64, 14, 368, 493, 90, 1 ],
+    [ "Trafalgar Law, Member of Donquixote Family", "DEX", [ "Driven", "Shooter" ], 4, 15, 4, 3, 99, 3000000, 312, 420, 51, 892, 890, 242, 1 ],
+    [ "Buffalo, Member of Donquixote Family", "INT", [ "Shooter", "Free Spirit" ], 3, 13, 4, 2, 99, 3000000, 69, 22, 30, 1306, 470, 249, 1 ],
+    [ "Lao G", "DEX", [ "Driven", "Fighter" ], 4, 25, 7, 2, 70, null, 210, 222, 49, null, null, null, null ],
+    [ "Lao G, Diamante Military Leader", "DEX", [ "Driven", "Fighter" ], 5, 40, 4, 3, 99, null, 970, 700, 107, null, null, null, null ],
+    [ "Boa Sandersonia, Coliseum", "PSY", "Fighter", 4, 16, 4, 2, 50, 392109, null, null, null, 693, 393, 193, null ],
+    [ "Boa Sandersonia, Coliseum Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 26, null, 3, 99, null, null, null, null, null, null, null, null ],
 	];
 	
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 038276e5d..2670675f1 100644
--- a/index.html
+++ b/index.html
@@ -55,19 +55,20 @@
             <a class="animated zoomInRight button red" href="mats">Evolution Helper</a>
             <a class="animated zoomInLeft button purple" href="slots">Slot Planner</a>
 	    <a class="animated zoomInRight button pink" href="probability">Probability Calculator</a>
+<!--
             <a class="animated zoomInLeft button brown" href="turtles">Turtle Times</a>
-
+-->
         </div> 
         <div id="empty">
         </div>
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>4/10/2016</p>
+            <p>5/10/2016</p>
             <br>
             <ul>
-                <li>Turtle Time Calculator Added!</li>
-                <li>More functionalities will be added soon</li>
+                <li>Turtle Time Calculator removed, original</li>
+                <li>website is back up!</li>
                 <br>
                 <li>Units Updated, Ship Thumbnails updated</li>
                 <li>All units except Tashigi and Combo boosts</li>

From ce2dd9e65541271037e7587f34c38164de93a49d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 7 Oct 2016 19:23:46 +0200
Subject: [PATCH 0611/1569] AffinityMult Specials Added

---
 characters/js/directives.js |  2 +-
 common/data/specials.js     | 24 ++++++------------
 common/js/error.js          |  2 +-
 common/views/links.html     |  2 +-
 damage/js/cruncher.js       | 50 +++++++++++++++++++++++++------------
 index.html                  |  5 ++--
 6 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 0a6da3cf1..593fefcdd 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -56,7 +56,7 @@ directives.characterTable = function($rootScope, $timeout, $compile, $storage) {
             };
             // report link
             var link = $('<span class="help-link">Want to report or request something? Use <a>this form</a>.</span>');
-            link.find('a').attr('href', 'http://goo.gl/forms/4FWGgVOQKh');
+            link.find('a').attr('href', 'https://discord.gg/MRhRrbF');
             link.insertAfter($('.dataTables_length'));
             // pick column link
             var pick = $('<a id="pick-link" popover-placement="bottom" popover-trigger="click" popover-title="Additional Columns" ' +
diff --git a/common/data/specials.js b/common/data/specials.js
index 77a73840a..e347c6c4b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1573,17 +1573,13 @@ window.specials = {
         onDeactivation: function(p) {
             window.specials[1232].turnedOn = false;
         }
-    }, /*
+    },
     1233: {//Tashigi
-        //TODO Slasher/Cerebral
-        affinity: function(p){ return 1.5; },
-        type: "affinity",
+        affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1234: {//Tashigi
-         //TODO Slasher/Cerebral
-        affinity: function(p){ return 1.5; },
-        type: "affinity",
-    },*/
+        affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
     1239: {
         turnedOn: false,
         onActivation: function(p) {
@@ -1675,16 +1671,12 @@ window.specials = {
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
-/*  1261: {//Young Senor Pink
-        //TODO Free Spirit / Shooter
-        affinity: function(p){ return 1.5; },
-        type: "affinity",
+    1261: {//Young Senor Pink
+        affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1262: {//Young Senor Pink
-         //TODO Free Spirit / Shooter
-        affinity: function(p){ return 1.5; },
-        type: "affinity",
-    },*/
+        affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
     1263: {
 		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
 		type: "type"
diff --git a/common/js/error.js b/common/js/error.js
index dd33cd141..6c4cc16d2 100644
--- a/common/js/error.js
+++ b/common/js/error.js
@@ -31,7 +31,7 @@ app.directive('errorReport', function($rootScope, $timeout) {
         replace: true,
         templateUrl: '../common/views/error-report.html',
         link: function(scope, element, attrs) {
-            scope.baseURL = 'https://docs.google.com/forms/d/1w40Pp8uAQm-gekiFfc8VkydmM_PFtM8qZcZokf7IzeE/viewform?entry.1585706216=';
+            scope.baseURL = 'https://discord.gg/MRhRrbF';
             scope.clearError = function() {
                 $timeout(function() {
                     $rootScope.caughtException = null;
diff --git a/common/views/links.html b/common/views/links.html
index cb02b9aad..d49ac3bdb 100644
--- a/common/views/links.html
+++ b/common/views/links.html
@@ -15,7 +15,7 @@
 
         <div class="rotater" id="link-report" title="Bug report">
             <a class="btn btn-icon" target="_blank"
-                    href="http://goo.gl/forms/4FWGgVOQKh">
+                    href="https://discord.gg/MRhRrbF">
                 <i class="fa fa-flag"></i>
             </a>
             <a class="tip">Bug report</a>
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 1a2ed9ee2..c178f4dac 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -180,7 +180,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 'g') orb = 1.5;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
-            multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type), 'type' ]); // type multiplier
+            multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier
             multipliers.push([ getEffectBonus('atk',x.unit), 'map effect' ]); // effect bonus (fixed)
             multipliers.push([ ship, 'ship' ]); // ship bonus (fixed)
             result.push({ unit: x, orb: orb, base: Math.floor(atk), multipliers: multipliers, position: n });
@@ -208,8 +208,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var override = $scope.tdata.typeOverride[type];
             for (var k=0;k<result.length;++k) {
                 if (!override[k]) continue;
-                var currentMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, type);
-                var newMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, override[k]);
+                var currentMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, type, result[k]);
+                var newMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, override[k], result[k]);
                 result[k].multipliers.push([ newMultiplier / currentMultiplier, 'type override' ]);
             }
         }
@@ -381,16 +381,31 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         return effects[$scope.data.effect][type](unit.unit || unit);
     };
 
-    var getTypeMultiplierOfUnit = function(attackerType,attackedType) {
-        if (attackerType == 'STR' && attackedType == 'DEX') return 2;
-        if (attackerType == 'QCK' && attackedType == 'STR') return 2;
-        if (attackerType == 'DEX' && attackedType == 'QCK') return 2;
-        if (attackerType == 'INT' && attackedType == 'PSY') return 2;
-        if (attackerType == 'PSY' && attackedType == 'INT') return 2;
-        if (attackerType == 'STR' && attackedType == 'QCK') return 0.5;
-        if (attackerType == 'QCK' && attackedType == 'DEX') return 0.5;
-        if (attackerType == 'DEX' && attackedType == 'STR') return 0.5;
-        return 1;
+    var getTypeMultiplierOfUnit = function(attackerType,attackedType, unit) {
+        var typeMult = 1, affinityMult = 1;
+        
+        if (attackerType == 'STR' && attackedType == 'DEX') typeMult = 2;
+        if (attackerType == 'QCK' && attackedType == 'STR') typeMult = 2;
+        if (attackerType == 'DEX' && attackedType == 'QCK') typeMult = 2;
+        if (attackerType == 'INT' && attackedType == 'PSY') typeMult = 2;
+        if (attackerType == 'PSY' && attackedType == 'INT') typeMult = 2;
+        if (attackerType == 'STR' && attackedType == 'QCK') typeMult = 0.5;
+        if (attackerType == 'QCK' && attackedType == 'DEX') typeMult = 0.5;
+        if (attackerType == 'DEX' && attackedType == 'STR') typeMult = 0.5;
+        
+        //Get the strongest Color affinity Mult if it exists and apply it
+        affinityMultiplier.forEach(function(special){
+                    if(affinityMult<special.affinityMultiplier(unit))
+                        affinityMult = special.affinityMultiplier(unit);
+                });
+        
+        //Calculate the new Affinity mult
+        if(affinityMult != 1){
+            if(typeMult == 2) typeMult *= affinityMult;
+            if(typeMult == 0.5) typeMult *= (affinityMult-1);
+        }
+        
+        return typeMult;
     };
 
     var getChainMultiplier = function(chainBase, hitModifiers, chainModifier) {
@@ -453,7 +468,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     if(addition<special.chainAddition())
                         addition = special.chainAddition();
                 });
-//        
+        
         chainSpecials.forEach(function(special) {
             var multipliersUsed = [ ], currentHits = 0, overall = 0;
             var i, params = [ ];
@@ -590,6 +605,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         var result = { type: [ ], class: [ ], orb: [ ], affinity: [ ], condition: [ ] };
         chainSpecials = [ ];
         chainAddition = [ ];
+        affinityMultiplier = [ ];
         staticMultiplier = [ ];
         enabledSpecials.forEach(function(data) {
             if (data === null) return;
@@ -603,9 +619,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (data.hasOwnProperty('chain'))
                 chainSpecials.push({ sourceSlot: data.sourceSlot, chain: data.chain, chainLimiter: data.chainLimiter || function() { return Infinity; } });
             if (data.hasOwnProperty('chainAddition'))
-                chainAddition.push({chainAddition: data.chainAddition || function(){ return 0.0;} });
+                chainAddition.push({chainAddition: data.chainAddition || function(){ return 0.0; } });
             if (data.hasOwnProperty('staticMult'))
                 staticMultiplier.push({staticMultiplier: "Yes" });
+            if (data.hasOwnProperty('affinity'))
+                affinityMultiplier.push({affinityMultiplier: data.affinity || function(){ return 1.0; }});
         });
         specialsCombinations = Utils.arrayProduct([ result.type.concat(result.class), result.condition, result.orb ]);
         if (chainSpecials.length === 0) chainSpecials.push({
@@ -728,7 +746,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         hitModifiers = getPossibleHitModifiers(cptsWith.hitModifiers);
         // compute special combinations
         computeSpecialsCombinations();
-        $scope.conflictingSpecials = (specialsCombinations.length > 1 || chainSpecials.length > 1 || chainAddition.length > 1);
+        $scope.conflictingSpecials = (specialsCombinations.length > 1 || chainSpecials.length > 1 || chainAddition.length > 1 || affinityMultiplier.length > 1);
         $scope.conflictingMultipliers = ( staticMultiplier.length > 1 )
         // get ship bonus
         shipBonus = jQuery.extend({ bonus: window.ships[$scope.data.ship[0]] },{ level: $scope.data.ship[1] });
diff --git a/index.html b/index.html
index 2670675f1..1bf79da30 100644
--- a/index.html
+++ b/index.html
@@ -70,9 +70,8 @@
                 <li>Turtle Time Calculator removed, original</li>
                 <li>website is back up!</li>
                 <br>
-                <li>Units Updated, Ship Thumbnails updated</li>
-                <li>All units except Tashigi and Combo boosts</li>
-                <li>Are now active in calculator</li>
+                <li>Added Tashigi/Young Senior Pink Specials</li>
+                <li>Go and try your OP teams</li>
                 <br>
                 <li>Kimono Marco and New Coliseum Units Added</li>
                 <br>

From efb27d92a5e24165ef7d0ce6a7dac3758847cd9e Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 7 Oct 2016 23:18:17 +0200
Subject: [PATCH 0612/1569] Quickfix for switching type in chain

---
 damage/js/cruncher.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index c178f4dac..8ef8840eb 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -208,8 +208,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var override = $scope.tdata.typeOverride[type];
             for (var k=0;k<result.length;++k) {
                 if (!override[k]) continue;
-                var currentMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, type, result[k]);
-                var newMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, override[k], result[k]);
+                var currentMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, type, result[k].unit);
+                var newMultiplier = getTypeMultiplierOfUnit(result[k].unit.unit.type, override[k], result[k].unit);
                 result[k].multipliers.push([ newMultiplier / currentMultiplier, 'type override' ]);
             }
         }

From 2e1cc5bf5e98b17f4105c064deef02f1a18699ad Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 8 Oct 2016 17:05:34 +0200
Subject: [PATCH 0613/1569] Added test Page for DB App

---
 common/data/json.html | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 common/data/json.html

diff --git a/common/data/json.html b/common/data/json.html
new file mode 100644
index 000000000..295044329
--- /dev/null
+++ b/common/data/json.html
@@ -0,0 +1,12 @@
+<html>
+    <head>
+        <script src="units.js"></script>
+        <script>
+            var myJSON = JSON.stringify(window.units);
+            document.write(myJSON);
+        </script>
+    </head>
+    <body>
+        
+    </body>
+</html>
\ No newline at end of file

From 821e3ceac17492cf41b055e8ea78c51945e6bd78 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 8 Oct 2016 18:41:51 +0200
Subject: [PATCH 0614/1569] Improved JSON output

---
 common/data/json.html | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/common/data/json.html b/common/data/json.html
index 295044329..091e5751c 100644
--- a/common/data/json.html
+++ b/common/data/json.html
@@ -1,9 +1,25 @@
 <html>
     <head>
         <script src="units.js"></script>
+        <script src="details.js"></script>
+        <script src="cooldowns.js"></script>
         <script>
-            var myJSON = JSON.stringify(window.units);
-            document.write(myJSON);
+            var getQuery = location.search.replace('?','');
+            var result = "No Correct GET value found <br> Please use one of the following: <br>units<br>details<br>cooldowns";
+            
+            switch(getQuery) {
+                case "units":
+                    result = JSON.stringify(window.units);
+                    break;
+                case "details":
+                    result = JSON.stringify(window.details);
+                    break;
+                case "cooldowns":
+                    result = JSON.stringify(window.cooldowns);
+                    break;
+            }
+            
+            document.write(result);
         </script>
     </head>
     <body>

From 8b9526ebbc554fdde968647bd8c61fb9e2dca6e4 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 8 Oct 2016 19:12:23 +0200
Subject: [PATCH 0615/1569] Tab Char to 4 Spaces

Housekeeping Commit to prevent mixing of indention styles
---
 common/data/aliases.js    |   108 +-
 common/data/captains.js   |  5352 ++++++++---------
 common/data/cooldowns.js  |  2274 +++----
 common/data/defenses.js   |    16 +-
 common/data/details.js    | 11432 ++++++++++++++++++------------------
 common/data/drops.js      |   158 +-
 common/data/effects.js    |     2 +-
 common/data/evolutions.js |  2990 +++++-----
 common/data/families.js   |  2132 +++----
 common/data/flags.js      |  1598 ++---
 common/data/matchers.js   |    26 +-
 common/data/specials.js   |  2768 ++++-----
 common/data/tandems.js    |    10 +-
 common/data/units.js      |  2034 +++----
 common/data/zombies.js    |    38 +-
 15 files changed, 15469 insertions(+), 15469 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d1a2eda91..3852aa05c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -926,7 +926,7 @@ window.aliases = {
     925: ['獄卒長サディちゃん','','Coliseum'],
     926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum'],
     927: ['ドーベルマン 海軍本部中将','','Coliseum'],
-	928: ['ハンニャバル','','Hannibal'],
+    928: ['ハンニャバル','','Hannibal'],
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
     931: ['ブルゴリ ','','Blue Gorilla'],
@@ -942,7 +942,7 @@ window.aliases = {
     941: ['ウソップ おいはぎの森の果敢な戦士','','Timeskip Usopp','3D2Y Usopp'],
     942: ['フランキー メカアニマルと戦う改造人間','','Timeskip Franky','3D2Y Franky'],
     943: ['鉄人（サイボーグ）フランキー バルジモアの霊獣','','Timeskip Franky','3D2Y Franky'],
-	944: ['？？？','','Wedding Perona'],
+    944: ['？？？','','Wedding Perona'],
     945: ['？？？','','Bride Perona'],
     946: ['ラクヨウ 白ひげ海賊団７番隊隊長',''],
     947: ['フォッサ 白ひげ海賊団１５番隊隊長',''],
@@ -952,7 +952,7 @@ window.aliases = {
     951: ['火拳のエース 白ひげ海賊団２番隊隊長',''],
     952: ['ベン・ベックマン',''],
     953: ['ベン・ベックマン 赤髪海賊団',''],
-	954: ['ギャロ',''],
+    954: ['ギャロ',''],
     955: ['マクロ','','Makuro'],
     956: ['タンスイ',''],
     957: ['早業のガンマン 青のボディガード',''],
@@ -960,7 +960,7 @@ window.aliases = {
     959: ['技巧のガンマン 緑のボディガード',''],
     960: ['速攻のガンマン 青のボディガード',''],
     961: ['豪腕のガンマン 赤のボディガード',''],
-	962: ['強心のガンマン 黄のボディガード',''],
+    962: ['強心のガンマン 黄のボディガード',''],
     963: ['チャルロス聖',''],
     964: ['ロズワード聖',''],
     965: ['シャルリア宮',''],
@@ -968,7 +968,7 @@ window.aliases = {
     967: ['トラファルガー・ロー 超新星（スーパールーキー）',''],
     968: ['パシフィスタ　ＰＸ－1',''],
     969: ['パシフィスタ　ＰＸ－2',''],
-	970: ['パシフィスタ　ＰＸ－３',''],
+    970: ['パシフィスタ　ＰＸ－３',''],
     971: ['パシフィスタ　ＰＸ－４',''],
     972: ['パシフィスタ　ＰＸ－５',''],
     973: ['戦桃丸','','Sentoumaru'],
@@ -1000,40 +1000,40 @@ window.aliases = {
     999: ['ディアマンテ ドンキホーテ海賊団',''],
     1000: ['コラソン ドンキホーテ海賊団','','Rocinante','Rosinante'],
     1001: ['ドンキホーテ・ロシナンテ','','Rocinante','Corazon'],
-	1002: ['ベポ ハートの海賊団',''],
-	1003: ['武闘家のベポ ハートの海賊団',''],
-	1004: ['シャチ＆ペンギン ハートの海賊団',''],
-	1005: ['ジャンバール',''],
-	1006: ['ジャンバール ハートの海賊団',''],
-	1007: ['モネ　寒桜','','Sakura Monet'],
-	1008: ['モネ　大寒桜','','Sakura Monet'],
-	1009: ['キズナBOOOOSTルフィ','', 'Afro Luffy', 'Afroluffy' ],
-	1010: ['バトラー伯爵',''],
-	1011: ['バトラー伯爵（王なる力）',''],
-	1012: ['ヘビー総裁',''],
-	1013: ['ホットドッグ将軍',''],
-	1014: ['トニートニー・チョッパー 動物王',''],
-	1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Coliseum'],
-	1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Coliseum'],
-	1017: ['茶ひげ','','Coliseum'],
-	1018: ['茶ひげ ワニのケンタウロス','','Coliseum'],
-	1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum'],
-	1020: ['？？？','','Sakura Sugar'],
-	1021: ['？？？','','Sakura Sugar'],
-	1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
-	1023: ['？？？',''],
-	1024: ['首領・チンジャオ',''],
-	1025: ['首領・チンジャオ 花ノ国のギャング',''],
-	1026: ['ブルーギリー',''],
-	1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）',''],
-	1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ',''],
-	1029: ['ファンク兄弟 モガロ王国の殺し屋',''],
-	1030: ['ハイルディン',''],
-	1031: ['ハイルディン 海賊傭兵',''],
-	1032: ['アブドーラ＆ジェット','','Abdullah and Jeet'],
-	1033: ['アブドーラ＆ジェット 元賞金稼ぎ','','Abdullah and Jeet, Former Bounty Hunters'],
-	1034: ['バルトロメオ',''],
-	1035: ['人食いのバルトロメオ',''],
+    1002: ['ベポ ハートの海賊団',''],
+    1003: ['武闘家のベポ ハートの海賊団',''],
+    1004: ['シャチ＆ペンギン ハートの海賊団',''],
+    1005: ['ジャンバール',''],
+    1006: ['ジャンバール ハートの海賊団',''],
+    1007: ['モネ　寒桜','','Sakura Monet'],
+    1008: ['モネ　大寒桜','','Sakura Monet'],
+    1009: ['キズナBOOOOSTルフィ','', 'Afro Luffy', 'Afroluffy' ],
+    1010: ['バトラー伯爵',''],
+    1011: ['バトラー伯爵（王なる力）',''],
+    1012: ['ヘビー総裁',''],
+    1013: ['ホットドッグ将軍',''],
+    1014: ['トニートニー・チョッパー 動物王',''],
+    1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Coliseum'],
+    1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Coliseum'],
+    1017: ['茶ひげ','','Coliseum'],
+    1018: ['茶ひげ ワニのケンタウロス','','Coliseum'],
+    1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum'],
+    1020: ['？？？','','Sakura Sugar'],
+    1021: ['？？？','','Sakura Sugar'],
+    1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
+    1023: ['？？？',''],
+    1024: ['首領・チンジャオ',''],
+    1025: ['首領・チンジャオ 花ノ国のギャング',''],
+    1026: ['ブルーギリー',''],
+    1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）',''],
+    1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ',''],
+    1029: ['ファンク兄弟 モガロ王国の殺し屋',''],
+    1030: ['ハイルディン',''],
+    1031: ['ハイルディン 海賊傭兵',''],
+    1032: ['アブドーラ＆ジェット','','Abdullah and Jeet'],
+    1033: ['アブドーラ＆ジェット 元賞金稼ぎ','','Abdullah and Jeet, Former Bounty Hunters'],
+    1034: ['バルトロメオ',''],
+    1035: ['人食いのバルトロメオ',''],
     1036: ['エンポリオ・イワンコフ 秘密の花園の女王',''],
     1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
     1038: ['イナズマ 秘密の花園の乙女',''],
@@ -1118,7 +1118,7 @@ window.aliases = {
     1117: [ 'サンジ 信念に生きる麦わらの一味', 'Strong World Sanji' ],
     1118: [ 'ナミ 夢を追い求める冒険者', 'Strong World Nami' ],
     1119: [ 'ナミ 信念に生きる麦わらの一味', 'Strong World Nami' ],
-	1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '' ],
+    1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '' ],
     1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '' ],
     1122: [ 'キャベンディッシュ', '','Hakuba','cabbage' ],
     1123: [ '白馬のキャベンディッシュ', '','Hakuba','cabbage' ],
@@ -1191,27 +1191,27 @@ window.aliases = {
     1190: ['シールドランスのスピード・ジル',''],
     1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
     1192: ['クザン','','Aokiji'],
-	1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
-	1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
-	1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall'],
-	1196: ['ガン・フォール スカイピアの神','','Coliseum Gan Fall'],
-	1197: ['スカイブリーダー・オーム','','Coliseum Ohm'],
+    1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
+    1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
+    1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall'],
+    1196: ['ガン・フォール スカイピアの神','','Coliseum Gan Fall'],
+    1197: ['スカイブリーダー・オーム','','Coliseum Ohm'],
     1198: ['ジュエリー・ボニー 弾けるサファイア','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
-	1199: ['ジュエリー・ボニー パールホワイトの煌き','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
-	1200: ['ヴァイオレット 挑発のバカンス','','Summertime Viola','Swimsuit Viola'],
-	1201: ['ヴァイオレット 紅潮のバカンス','','Summertime Viola','Swimsuit Viola'],
+    1199: ['ジュエリー・ボニー パールホワイトの煌き','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
+    1200: ['ヴァイオレット 挑発のバカンス','','Summertime Viola','Swimsuit Viola'],
+    1201: ['ヴァイオレット 紅潮のバカンス','','Summertime Viola','Swimsuit Viola'],
     1202: ['ヨーキ',''],
-	1203: ['キャラコのヨーキ',''],
+    1203: ['キャラコのヨーキ',''],
     1204: ['ブルック ルンバー海賊団',''],
-	1205: ['“音楽家兼剣士”ブルック ルンバー海賊団',''],
+    1205: ['“音楽家兼剣士”ブルック ルンバー海賊団',''],
     1206: ['ラブーン ルンバー海賊団',''],
-	1207: ['ニコ・ロビン 夢を追い求める冒険者','','New Strong World Robin'],
+    1207: ['ニコ・ロビン 夢を追い求める冒険者','','New Strong World Robin'],
     1208: ['ニコ・ロビン 信念に生きる麦わらの一味','','New Strong World Robin'],
-	1209: ['ウソップ 夢を追い求める冒険者','','New Strong World Usopp'],
+    1209: ['ウソップ 夢を追い求める冒険者','','New Strong World Usopp'],
     1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp'],
-	1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky'],
+    1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky'],
     1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky'],
-	1213: ['ベビー５ ドルフィンフロート','','Summertime Baby 5','Swimsuit Baby 5'],
+    1213: ['ベビー５ ドルフィンフロート','','Summertime Baby 5','Swimsuit Baby 5'],
     1214: ['ベビー５ ドルフィンライダー','','Summertime Baby 5','Swimsuit Baby 5'],
     1215: ['ガイラム ワールド海賊団','',''],
     1216: ['セバスチャン ワールド海賊団','',''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 523516f1f..ac99983e6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1,2345 +1,2345 @@
 window.captains = {
-	2: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	3: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	4: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1.5; }
-	},
-	5: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	6: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	7: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	8: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-		hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	10: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	11: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	12: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	13: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
-	},
-	14: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	15: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	16: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	17: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	18: {
-		hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	19: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	20: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	21: {
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
-	},
-	22: {
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	23: {
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	24: {
-		rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	25: {
-		rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	26: {
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	27: {
-		hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
-	},
-	28: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
-	},
-	35: {
-		hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
-	},
-	36: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	37: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	38: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	39: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	41: {
-		rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
-	},
-	42: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
-	},
-	45: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
-	},
-	46: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	49: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	52: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
-	},
-	59: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
-	},
-	60: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	61: {
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	62: {
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	65: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	66: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	67: {
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	68: {
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	74: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	75: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1; }
-	},
-	76: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	77: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
-	},
-	194: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	195: {
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	196: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	198: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	199: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	200: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	201: {
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	202: {
-		hp: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	205: {
-		hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
-	},
-	206: {
-		hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
-	},
-	209: {
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	210: {
-		rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	211: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-	},
-	212: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	215: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	217: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	220: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	221: {
-		atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
-	},
-	222: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
-	},
-	223: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	224: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	225: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	226: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	227: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
-	},
-	228: {
-		hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	230: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	231: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	232: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	233: {
-		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	234: {
-		hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	235: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
-	},
-	236: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	248: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
-	},
-	249: {
-		atk: function(p) { return p.unit.type == "STR" ? 3 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
-	},
-	250: {
-		atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
-	},
-	251: {
-		atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
-	},
-	252: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-		hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	253: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-		hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	254: {
-		hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	255: {
-		hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	256: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	257: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	258: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	259: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	260: {
-		atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
-	},
-	261: {
-		atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
-	},
-	263: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	265: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	267: {
-		atk: function(p) { return 1.5; },
-		hp: function(p) { return 1.5; },
-		rcv: function(p) { return 1.5; }
-	},
-	290: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	293: {
-		hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	294: {
-		hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	295: {
-		hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	296: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	297: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	298: {
-		hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	299: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	305: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	306: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-		hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	307: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
-	},
-	308: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
-	},
-	311: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
-		},
-		hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
-	},
-	312: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
-		},
-		hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
-	},
-	313: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	314: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	315: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	316: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	319: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	320: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	321: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	322: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	323: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	324: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	328: {
-		rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
-	},
-	329: {
-		rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
-	},
-	332: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-	},
-	333: {
-		atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	336: {
-		atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2 : 0.8); }
-	},
-	337: {
-		atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2.5 : 0.8); }
-	},
-	340: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	341: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	352: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	353: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
-	},
-	356: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	357: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
-	},
-	358: {
-		atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
-	},
-	359: {
-		atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 3 : 1; }
-	},
-	360: {
-		atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
-	},
-	361: {
-		atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
-	},
-	362: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	363: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	364: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	365: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	366: {
-		chainModifier: function(p) { return 4; }
-	},
-	367: {
-		chainModifier: function(p) { return 4; }
-	},
-	373: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	374: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	375: {
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	376: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	377: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	378: {
-		rcv: function(p) { return 1.5; }
-	},
-	380: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	383: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	384: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	385: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	386: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	387: {
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	388: {
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	389: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'DEX',
-				minModifier: 'Good'
-			}, {
-				type: 'INT',
-				minModifier: 'Good'
-			}, {
-				type: 'QCK',
-				minModifier: 'Good'
-			}]) ? 2 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	390: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'DEX',
-				minModifier: 'Good'
-			}, {
-				type: 'INT',
-				minModifier: 'Good'
-			}, {
-				type: 'QCK',
-				minModifier: 'Good'
-			}]) ? 2.75 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	391: {
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	392: {
-		rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	395: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
-	},
-	396: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	397: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition)
-				.subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	398: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition)
-				.subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	399: {
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	400: {
-		hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	401: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	402: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	403: {
-		rcv: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
-	},
-	404: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	405: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	408: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	409: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	410: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
-	},
-	411: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	412: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	413: {
-		atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
-	},
-	414: {
-		atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 3 : 1; }
-	},
-	415: {
-		atk: function(p) {
-			return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-		},
-		rcv: function(p) {
-			return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
-		}
-	},
-	416: {
-		atk: function(p) {
-			return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-		},
-		rcv: function(p) {
-			return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
-		}
-	},
-	417: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	418: {
-		hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	419: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	420: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	421: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	422: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	424: {
-		atk: function(p) { return 1.5; }
-	},
-	425: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	426: {
-		hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	427: {
-		hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	428: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	430: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	431: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	433: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'STR', 'DEX']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'QCK',
-				minModifier: 'Good'
-			}, {
-				type: 'STR',
-				minModifier: 'Good'
-			}, {
-				type: 'DEX',
-				minModifier: 'Good'
-			}]) ? 2 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	434: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['PSY', 'INT', 'INT']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'PSY',
-				minModifier: 'Good'
-			}, {
-				type: 'INT',
-				minModifier: 'Good'
-			}, {
-				type: 'INT',
-				minModifier: 'Good'
-			}]) ? 2 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	435: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'PSY', 'QCK']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'INT',
-				minModifier: 'Good'
-			}, {
-				type: 'PSY',
-				minModifier: 'Good'
-			}, {
-				type: 'QCK',
-				minModifier: 'Good'
-			}]) ? 2 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	437: {
-		rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
-	},
-	438: {
-		rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 5 : 1; }
-	},
-	444: {
-		atk: function(p) {
-			return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2 : 1;
-		}
-	},
-	445: {
-		atk: function(p) {
-			return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2.5 : 1;
-		}
-	},
-	446: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	447: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
-	},
-	448: {
-		atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
-	},
-	449: {
-		atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
-	},
-	450: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	451: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	452: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	453: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	454: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	455: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	456: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	457: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	458: {
-		atk: function(p) { return p.unit.cost <= 20 ? 3 : 1; }
-	},
-	459: {
-		atk: function(p) { return p.unit.number == 458 || p.unit.cost <= 20 ? 3 : 1; }
-	},
-	461: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	462: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	463: {
-		hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	464: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	465: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good", "Below Good"]) ? 3 : 1;
-		},
-		hitModifiers: ["Below Good", "Below Good", "Below Good", "Below Good", "Perfect", "Perfect"]
-	},
-	466: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	467: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	470: {
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	471: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
-		hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
-	},
-	482: {
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-	},
-	483: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
-	},
-	485: {
-		hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
-	},
-	486: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-	},
-	490: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-	},
-	491: {
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	492: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	496: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	497: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	498: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	499: {
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	500: {
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	501: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-		hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
-	},
-	502: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	503: {
-		hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	504: {
-		hp: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	507: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
-	},
-	508: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	509: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	510: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	511: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	513: {
-		atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
-	},
-	514: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	515: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	516: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	517: {
-		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	518: {
-		hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	519: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	520: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
-	},
-	523: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	524: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	525: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	526: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	527: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	528: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	529: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
-	},
-	530: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
-	},
-	533: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	534: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	535: {
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	536: {
-		rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	537: {
-		chainModifier: function(p) { return 2; }
-	},
-	538: {
-		chainModifier: function(p) { return 2; }
-	},
-	541: {
-		atk: function(p) { return p.unit.type == "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
-	},
-	542: {
-		hp: function(p) { return 1.5; }
-	},
-	543: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
-	},
-	544: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
-	},
-	545: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	546: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	548: {
-		atk: function(p) { return 1.2; }
-	},
-	549: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	550: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	553: {
-		atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
-	},
-	554: {
-		atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
-	},
-	555: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	556: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	557: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	558: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	559: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	560: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
-	},
-	561: {
-		atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (p.orb == 2.0 ? 3 : 2); },
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	562: {
-		atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (p.orb == 2.0 ? 3 : 2); },
-		hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	568: {
-		atk: function(p) { return 1.25; },
-		hp: function(p) { return 1.25; },
-		rcv: function(p) { return 1.25; }
-	},
-	569: {
-		atk: function(p) { return 1.5; },
-		hp: function(p) { return 1.5; },
-		rcv: function(p) { return 1.5; }
-	},
-	570: {
-		atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
-				p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
-				1;
-		}
-	},
-	571: {
-		atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
-				p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
-				1;
-		}
-	},
-	572: {
-		atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2.5 : 1; }
-	},
-	573: {
-		rcv: function(p) { return 1.2; }
-	},
-	574: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	575: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	576: {
-		atk: function(p) { return 1.5; },
-		rcv: function(p) { return 1.2; }
-	},
-	577: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	578: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	579: {
-		atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 1.5 : 1; }
-	},
-	580: {
-		atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 2 : 1; }
-	},
-	581: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	582: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	583: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	584: {
-		atk: function(p) { return 0.1; },
-		hp: function(p) { return 0.1; },
-		rcv: function(p) { return 0.1; }
-	},
-	585: {
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	586: {
-		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	589: {
-		atk: function(p) { return 1.5; },
-		hp: function(p) { return 0.2; },
-		rcv: function(p) { return 0.2; }
-	},
-	590: {
-		atk: function(p) { return 1.5; },
-		hp: function(p) { return 0.2; },
-		rcv: function(p) { return 0.2; }
-	},
-	596: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	597: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
-	},
-	598: {
-		atk: function(p) { return p.unit.stars < 3 ? 2.5 : 1; }
-	},
-	599: {
-		atk: function(p) { return p.unit.stars < 3 ? 3 : 1; }
-	},
-	600: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	601: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	602: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	603: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
-	},
-	604: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	605: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	606: {
-		atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	607: {
-		atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2.5 : 1; }
-	},
-	612: {
-		hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	613: {
-		hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	614: {
-		atk: function(p) { return p.unit.cost <= 20 && p.percHP <= 30.0 ? 2.25 : 1; }
-	},
-	629: {
-		atk: function(p) { return p.unit.stars <= 3 ? 2 : 1; }
-	},
-	630: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	631: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	632: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	633: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	634: {
-		atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; }
-	},
-	635: {
-		atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	636: {
-		atk: function(p) { return p.unit.cost <= 2 ? 3 : 1; }
-	},
-	637: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	638: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	639: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	640: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	641: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
-	},
-	642: {
-		atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
-	},
-	643: {
-		atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 3 : 1; }
-	},
-	644: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	645: {
-		atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
-	},
-	646: {
-		atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.5 : 1; }
-	},
-	647: {
-		atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.75 : 1; }
-	},
-	648: {
-		atk: function(p) {
-			return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-		}
-	},
-	649: {
-		atk: function(p) {
-			return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-		}
-	},
-	650: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	651: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	652: {
-		atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2 : 1); }
-	},
-	653: {
-		atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.25 : 1); }
-	},
-	654: {
-		atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.75 : 1); }
-	},
-	655: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	656: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	657: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	658: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	659: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	660: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	661: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	662: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	665: {
-		atk: function(p) { return 1.2; },
-		hp: function(p) { return 0.2; },
-		rcv: function(p) { return 0.2; }
-	},
-	666: {
-		atk: function(p) { return 1.75; },
-		hp: function(p) { return 0.2; },
-		rcv: function(p) { return 0.2; }
-	},
-	667: {
-		atk: function(p) { return 1.75; }
-	},
-	668: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
-		hp: function(p) { return 1.2; },
-		rcv: function(p) { return 1.2; }
-	},
-	669: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
-		hp: function(p) { return 1.2; },
-		rcv: function(p) { return 1.2; }
-	},
-	670: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	671: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
-		rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	672: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	673: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	674: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
-	675: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-	},
-	676: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	677: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	678: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
-	},
-	679: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	681: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	683: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	684: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	686: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	687: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-	},
-	688: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
-	689: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
-	},
-	690: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	696: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
-	},
-	697: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
-	},
-	698: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
-	},
-	699: {
-		atkStatic: function(p) { return p.unit.class.has("Shooter") ? 500 : 0; }
-	},
-	700: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
-	},
-	701: {
-		hp: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; }
-	},
-	702: {
-		hp: function(p) { return p.unit.type == "INT" ? 2.25 : 1; }
-	},
-	705: {
-		atk: function(p) {
-			return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
-		},
-		hp: function(p) {
-			return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
-		}
-	},
-	706: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	707: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	708: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
-	},
-	709: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	710: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	711: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	712: {
-		atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2 : 1; }
-	},
-	713: {
-		atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2.5 : 1; }
-	},
-	715: {
-		rcv: function(p) { return p.percHP <= 30 ? 3 : 1; }
-	},
-	716: {
-		rcv: function(p) { return p.percHP <= 30 ? 5 : 1; }
-	},
-	717: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has('Slasher')) return 1;
-			var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-			return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	718: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has('Slasher')) return 1;
-			var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-			return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	719: {
-		atk: function(p) {
-			return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
-		}
-	},
-	720: {
-		atk: function(p) {
-			return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
-		}
-	},
-	721: {
-		atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 1.5 : 1; }
-	},
-	722: {
-		atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2 : 1; }
-	},
-	723: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	724: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
-	},
-	727: {
-		atk: function(p) {
-			return p.unit.class.has("Free Spirit") || p.unit.class.has("Fighter") ? 1.75 : 1;
-		}
-	},
-	728: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
-	},
-	730: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
-		hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
-	},
-	731: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	732: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	733: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	734: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
-	},
-	735: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	736: {
-		atk: function(p) { return p.unit.class.has("Slasher") && p.percHP >= 50.0 ? 2.5 : 1; }
-	},
-	737: {
-		atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.75 : 1; }
-	},
-	738: {
-		atk: function(p) { return p.unit.cost >= 21 ? 2 : 1; }
-	},
-	739: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
-	742: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
-	},
-	743: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-	},
-	744: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
-	745: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-	},
-	747: {
-		atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
-		rcv: function(p) { return 0; }
-	},
-	748: {
-		atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
-		rcv: function(p) { return 0; }
-	},
-	749: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	750: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
-	751: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	752: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	753: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
-	},
-	754: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
-	},
-	755: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	756: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
-	757: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	758: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	759: {
-		atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
-	},
-	760: {
-		atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 3 : 1; }
-	},
-	761: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	762: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	763: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	764: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	766: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	767: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	768: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	769: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	770: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	771: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
-	},
-	772: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	774: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
-	775: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	776: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; }
-	},
-	777: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
-	},
-	780: {
-		atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
-	},
-	781: {
-		atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
-	},
-	782: {
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	783: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	789: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	791: {
-		atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
-		hp: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
-		rcv: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; }
-	},
-	793: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	794: {
-		atk: function(p) {
-			return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-		}
-	},
-	795: {
-		atk: function(p) {
-			return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
-		}
-	},
-	796: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
-	},
-	797: {
-		atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Powerhouse") ? 2 : 1; }
-	},
-	798: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	801: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	802: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
-	},
-	803: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
-	},
-	804: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	805: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	806: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	807: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	808: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	809: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	810: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	815: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'STR',
-				minModifier: 'Good'
-			}, {
-				type: 'INT',
-				minModifier: 'Good'
-			}, {
-				type: 'DEX',
-				minModifier: 'Good'
-			}]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	816: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'STR',
-				minModifier: 'Good'
-			}, {
-				type: 'INT',
-				minModifier: 'Good'
-			}, {
-				type: 'DEX',
-				minModifier: 'Good'
-			}]) ? 2.75 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	825: {
-		atk: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; }
-	},
-	826: {
-		atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
-	},
-	827: {
-		atk: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; }
-	},
-	830: {
-		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.75 : 1;
-		}
-	},
-	831: {
-		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 2 : 1;
-		}
-	},
-	832: {
-		atk: function(p) {
-			return p.unit.class.has("Free Spirit") ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
-		}
-	},
-	833: {
-		atk: function(p) {
-			return p.unit.class.has("Free Spirit") ? 1 + 1.75 * ((100 - p.percHP) / 100) : 1;
-		}
-	},
-	834: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	835: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
-	},
-	836: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
-	},
-	837: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-	},
-	838: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
-	},
-	839: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	840: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
-	},
-	843: {
-		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
-		}
-	},
-	844: {
-		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 2 : 1;
-		}
-	},
-	845: {
-		hit: function(n) {
-			return n > 22 ? 2.5 :
-				n > 11 ? 1.5 : 1;
-		}
-	},
-	846: {
-		hit: function(n) {
-			return n > 40 ? 3.5 :
-				n > 30 ? 2.75 :
-				n > 22 ? 2.5 :
-				n > 11 ? 1.5 : 1;
-		}
-	},
-	847: {
-		atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
-	},
-	848: {
-		atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
-	},
-	849: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
-	},
-	850: {
-		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
-		}
-	},
-	851: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-	},
-	852: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-	},
-	854: {
-		atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
-	},
-	855: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	856: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
-	},
-	857: {
-		atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
-	},
-	858: {
-		atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
-	},
-	859: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-	},
-	860: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-	},
-	862: {
-		atk: function(p) { return p.unit.type == 'QCK' ? 2 : 1; }
-	},
-	863: {
-		atk: function(p) { return p.unit.type == 'QCK' ? 1.75 : 1; }
-	},
-	864: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
-	865: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-		hp: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
-	866: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
-	},
-	867: {
-		hit: function(n) { return n > 11 ? 1.5 : 1; }
-	},
-	868: {
-		atk: function(p) { return 1.2; }
-	},
-	869: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Driven")) return 1;
-			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	870: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Driven")) return 1;
-			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	871: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	872: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
-	873: {
-		atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.5 : 1; }
-	},
-	874: {
-		atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 3 : 1; }
-	},
-	875: {
-		atk: function(p) {
-			return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
-		}
-	},
-	876: {
-		atk: function(p) {
-			return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.25 : 1;
-		}
-	},
-	878: {
-		atk: function(p) { return 1.5; }
-	},
-	879: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
-	},
-	880: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	881: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Shooter", "Free Spirit" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	882: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter", "Free Spirit" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	883: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
-	},
-	884: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	885: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	886: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	887: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-	},
-	889: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
-	},
-	890: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	891: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	892: {
-		chainModifier: function(p) { return 2; }
-	},
-	893: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Powerhouse")) return 1;
-			return p.modifiers.slice(0, p.chainPosition)
-				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	894: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Driven")) return 1;
-			return p.modifiers.slice(0, p.chainPosition)
-				.subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	895: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-	},
-	896: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	897: {
-		atk: function(p) {
-			return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
-		}
-	},
-	898: {
-		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
-		},
-		hp: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
-		}
-	},
-	899: {
-		atk: function(p) {
-			return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
-		},
-		hp: function(p) {
-			return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1;
-		}
-	},
-	900: {
-		atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2 : 1; }
-	},
-	901: {
-		atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2.75 : 1; }
-	},
-	902: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
-	},
-	903: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
-	},
-	905: {
-		atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.5 : 1; }
-	},
-	906: {
-		atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.75 : 1; }
-	},
-	907: {
-		atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; }
-	},
-	908: {
-		atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 2.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
-	},
-	909: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	910: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	911: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	912: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	913: {
-		atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1); }
-	},
-	914: {
-		atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1.2); }
-	},
-	915: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
-	},
-	916: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
-	},
-	917: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	918: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
-	},
-	921: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
-	},
-	922: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
-	},
-	923: {
-		atk: function(p) {
+    2: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    3: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    4: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1.5; }
+    },
+    5: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    6: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    7: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    8: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    10: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    11: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    12: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    13: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+    },
+    14: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    15: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    16: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    17: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    18: {
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    19: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    20: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    21: {
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+    },
+    22: {
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    23: {
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    24: {
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    25: {
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    26: {
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    27: {
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    28: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
+    35: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+    },
+    36: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    37: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    38: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    39: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    41: {
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+    },
+    42: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+    },
+    45: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    46: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    49: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    52: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+    },
+    59: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+    },
+    60: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    61: {
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    62: {
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    65: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    66: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    67: {
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    68: {
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    74: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    75: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1; }
+    },
+    76: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    77: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+    },
+    194: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    195: {
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    196: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    198: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    199: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    200: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    201: {
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    202: {
+        hp: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    205: {
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    206: {
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    209: {
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    210: {
+        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    211: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    212: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    215: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    217: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    220: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    221: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
+    },
+    222: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+    },
+    223: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    224: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    225: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    226: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    227: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+    },
+    228: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    230: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    231: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    232: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    233: {
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    234: {
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    235: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
+    236: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    248: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
+    },
+    249: {
+        atk: function(p) { return p.unit.type == "STR" ? 3 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
+    },
+    250: {
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    251: {
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    252: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    253: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    254: {
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    255: {
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    256: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    257: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    258: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    259: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    260: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
+    },
+    261: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
+    },
+    263: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    265: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    267: {
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 1.5; },
+        rcv: function(p) { return 1.5; }
+    },
+    290: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    293: {
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    294: {
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    295: {
+        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    296: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    297: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    298: {
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    299: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    305: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    306: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    307: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+    },
+    308: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+    },
+    311: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
+    },
+    312: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
+    },
+    313: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    314: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    315: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    316: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    319: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    320: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    321: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    322: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    323: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    324: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    328: {
+        rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
+    },
+    329: {
+        rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
+    },
+    332: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    333: {
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    336: {
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2 : 0.8); }
+    },
+    337: {
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2.5 : 0.8); }
+    },
+    340: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    341: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    352: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    353: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
+    356: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    357: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+    },
+    358: {
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    359: {
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    360: {
+        atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    361: {
+        atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    362: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    363: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    364: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    365: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    366: {
+        chainModifier: function(p) { return 4; }
+    },
+    367: {
+        chainModifier: function(p) { return 4; }
+    },
+    373: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    374: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    375: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    376: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    377: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    378: {
+        rcv: function(p) { return 1.5; }
+    },
+    380: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    383: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    384: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    385: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    386: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    387: {
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    388: {
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    389: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    390: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    391: {
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    392: {
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    395: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    396: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    397: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    398: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    399: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    400: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    401: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    402: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    403: {
+        rcv: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
+    },
+    404: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    405: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    408: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    409: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    410: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+    },
+    411: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    412: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    413: {
+        atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    414: {
+        atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    415: {
+        atk: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        },
+        rcv: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+        }
+    },
+    416: {
+        atk: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        },
+        rcv: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+        }
+    },
+    417: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    418: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    419: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    420: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    421: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    422: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    424: {
+        atk: function(p) { return 1.5; }
+    },
+    425: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    426: {
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    427: {
+        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    428: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    430: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    431: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    433: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'STR', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'QCK',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    434: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['PSY', 'INT', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'PSY',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    435: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'PSY', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'PSY',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    437: {
+        rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    438: {
+        rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 5 : 1; }
+    },
+    444: {
+        atk: function(p) {
+            return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2 : 1;
+        }
+    },
+    445: {
+        atk: function(p) {
+            return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2.5 : 1;
+        }
+    },
+    446: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    447: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
+    },
+    448: {
+        atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    449: {
+        atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    450: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    451: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    452: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    453: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    454: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    455: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    456: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    457: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    458: {
+        atk: function(p) { return p.unit.cost <= 20 ? 3 : 1; }
+    },
+    459: {
+        atk: function(p) { return p.unit.number == 458 || p.unit.cost <= 20 ? 3 : 1; }
+    },
+    461: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    462: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    463: {
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    464: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    465: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good", "Below Good"]) ? 3 : 1;
+        },
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Below Good", "Perfect", "Perfect"]
+    },
+    466: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    467: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    470: {
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    471: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+    },
+    482: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    483: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    485: {
+        hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+    },
+    486: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    490: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    491: {
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    492: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    496: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    497: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    498: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    499: {
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    500: {
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    501: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+    },
+    502: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    503: {
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    504: {
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    507: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+    },
+    508: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    509: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    510: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    511: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    513: {
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
+    },
+    514: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    515: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    516: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    517: {
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    518: {
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    519: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    520: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+    },
+    523: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    524: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    525: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    526: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    527: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    528: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    529: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+    },
+    530: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+    },
+    533: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    534: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    535: {
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    536: {
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    537: {
+        chainModifier: function(p) { return 2; }
+    },
+    538: {
+        chainModifier: function(p) { return 2; }
+    },
+    541: {
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
+    },
+    542: {
+        hp: function(p) { return 1.5; }
+    },
+    543: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
+    },
+    544: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
+    },
+    545: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    546: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    548: {
+        atk: function(p) { return 1.2; }
+    },
+    549: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    550: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    553: {
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+    },
+    554: {
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    555: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    556: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    557: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    558: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    559: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    560: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
+    },
+    561: {
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (p.orb == 2.0 ? 3 : 2); },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    562: {
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (p.orb == 2.0 ? 3 : 2); },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    568: {
+        atk: function(p) { return 1.25; },
+        hp: function(p) { return 1.25; },
+        rcv: function(p) { return 1.25; }
+    },
+    569: {
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 1.5; },
+        rcv: function(p) { return 1.5; }
+    },
+    570: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
+                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
+                1;
+        }
+    },
+    571: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
+                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
+                1;
+        }
+    },
+    572: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    573: {
+        rcv: function(p) { return 1.2; }
+    },
+    574: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    575: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    576: {
+        atk: function(p) { return 1.5; },
+        rcv: function(p) { return 1.2; }
+    },
+    577: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    578: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    579: {
+        atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 1.5 : 1; }
+    },
+    580: {
+        atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 2 : 1; }
+    },
+    581: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    582: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    583: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    584: {
+        atk: function(p) { return 0.1; },
+        hp: function(p) { return 0.1; },
+        rcv: function(p) { return 0.1; }
+    },
+    585: {
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    586: {
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    589: {
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
+    },
+    590: {
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
+    },
+    596: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    597: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
+    },
+    598: {
+        atk: function(p) { return p.unit.stars < 3 ? 2.5 : 1; }
+    },
+    599: {
+        atk: function(p) { return p.unit.stars < 3 ? 3 : 1; }
+    },
+    600: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    601: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    602: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    603: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+    },
+    604: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    605: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    606: {
+        atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    607: {
+        atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2.5 : 1; }
+    },
+    612: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    613: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    614: {
+        atk: function(p) { return p.unit.cost <= 20 && p.percHP <= 30.0 ? 2.25 : 1; }
+    },
+    629: {
+        atk: function(p) { return p.unit.stars <= 3 ? 2 : 1; }
+    },
+    630: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    631: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    632: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    633: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    634: {
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; }
+    },
+    635: {
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    636: {
+        atk: function(p) { return p.unit.cost <= 2 ? 3 : 1; }
+    },
+    637: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    638: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    639: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    640: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    641: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+    },
+    642: {
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    643: {
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    644: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    645: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
+    },
+    646: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    647: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.75 : 1; }
+    },
+    648: {
+        atk: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        }
+    },
+    649: {
+        atk: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        }
+    },
+    650: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    651: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    652: {
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2 : 1); }
+    },
+    653: {
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.25 : 1); }
+    },
+    654: {
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.75 : 1); }
+    },
+    655: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    656: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    657: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    658: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    659: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    660: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    661: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    662: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    665: {
+        atk: function(p) { return 1.2; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
+    },
+    666: {
+        atk: function(p) { return 1.75; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
+    },
+    667: {
+        atk: function(p) { return 1.75; }
+    },
+    668: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
+    },
+    669: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
+    },
+    670: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    671: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    672: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    673: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    674: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    675: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    676: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    677: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    678: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+    },
+    679: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    681: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    683: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    684: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    686: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    687: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    688: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    689: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+    },
+    690: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    696: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
+    697: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+    },
+    698: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
+    },
+    699: {
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 500 : 0; }
+    },
+    700: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    },
+    701: {
+        hp: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; }
+    },
+    702: {
+        hp: function(p) { return p.unit.type == "INT" ? 2.25 : 1; }
+    },
+    705: {
+        atk: function(p) {
+            return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
+        },
+        hp: function(p) {
+            return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
+        }
+    },
+    706: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    707: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    708: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+    },
+    709: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    710: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    711: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    712: {
+        atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2 : 1; }
+    },
+    713: {
+        atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2.5 : 1; }
+    },
+    715: {
+        rcv: function(p) { return p.percHP <= 30 ? 3 : 1; }
+    },
+    716: {
+        rcv: function(p) { return p.percHP <= 30 ? 5 : 1; }
+    },
+    717: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Slasher')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    718: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Slasher')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    719: {
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
+    720: {
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
+    721: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 1.5 : 1; }
+    },
+    722: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    723: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    724: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
+    },
+    727: {
+        atk: function(p) {
+            return p.unit.class.has("Free Spirit") || p.unit.class.has("Fighter") ? 1.75 : 1;
+        }
+    },
+    728: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    730: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+    },
+    731: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    732: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    733: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    734: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+    },
+    735: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    736: {
+        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP >= 50.0 ? 2.5 : 1; }
+    },
+    737: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.75 : 1; }
+    },
+    738: {
+        atk: function(p) { return p.unit.cost >= 21 ? 2 : 1; }
+    },
+    739: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    742: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
+    743: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    744: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    745: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    747: {
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
+        rcv: function(p) { return 0; }
+    },
+    748: {
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
+        rcv: function(p) { return 0; }
+    },
+    749: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    750: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
+    751: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    752: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    753: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    754: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+    },
+    755: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    756: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    757: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    758: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    759: {
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    760: {
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    761: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    762: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    763: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    764: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    766: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    767: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    768: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    769: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    770: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    771: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+    },
+    772: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    774: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    775: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    776: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; }
+    },
+    777: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+    },
+    780: {
+        atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
+    },
+    781: {
+        atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    782: {
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    783: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    789: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    791: {
+        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
+        hp: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
+        rcv: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; }
+    },
+    793: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    794: {
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    795: {
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    796: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    797: {
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    798: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    801: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    802: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+    },
+    803: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    804: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    805: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    806: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    807: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    808: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    809: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    810: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    815: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    816: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    825: {
+        atk: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; }
+    },
+    826: {
+        atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
+    },
+    827: {
+        atk: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; }
+    },
+    830: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.75 : 1;
+        }
+    },
+    831: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 2 : 1;
+        }
+    },
+    832: {
+        atk: function(p) {
+            return p.unit.class.has("Free Spirit") ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
+    833: {
+        atk: function(p) {
+            return p.unit.class.has("Free Spirit") ? 1 + 1.75 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
+    834: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    835: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    836: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    837: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    838: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+    },
+    839: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    840: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+    },
+    843: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
+        }
+    },
+    844: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 2 : 1;
+        }
+    },
+    845: {
+        hit: function(n) {
+            return n > 22 ? 2.5 :
+                n > 11 ? 1.5 : 1;
+        }
+    },
+    846: {
+        hit: function(n) {
+            return n > 40 ? 3.5 :
+                n > 30 ? 2.75 :
+                n > 22 ? 2.5 :
+                n > 11 ? 1.5 : 1;
+        }
+    },
+    847: {
+        atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
+    },
+    848: {
+        atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
+    },
+    849: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+    },
+    850: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
+        }
+    },
+    851: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    852: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    854: {
+        atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
+    },
+    855: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    856: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+    },
+    857: {
+        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
+    },
+    858: {
+        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
+    },
+    859: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    860: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    862: {
+        atk: function(p) { return p.unit.type == 'QCK' ? 2 : 1; }
+    },
+    863: {
+        atk: function(p) { return p.unit.type == 'QCK' ? 1.75 : 1; }
+    },
+    864: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    865: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    866: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    867: {
+        hit: function(n) { return n > 11 ? 1.5 : 1; }
+    },
+    868: {
+        atk: function(p) { return 1.2; }
+    },
+    869: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    870: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    871: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    872: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    873: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    874: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    875: {
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
+        }
+    },
+    876: {
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.25 : 1;
+        }
+    },
+    878: {
+        atk: function(p) { return 1.5; }
+    },
+    879: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    },
+    880: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    881: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Shooter", "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    882: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter", "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    883: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    884: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    885: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    886: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    887: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    889: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    890: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    891: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    892: {
+        chainModifier: function(p) { return 2; }
+    },
+    893: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    894: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    895: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    896: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    897: {
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
+        }
+    },
+    898: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
+        },
+        hp: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
+        }
+    },
+    899: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        hp: function(p) {
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1;
+        }
+    },
+    900: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    901: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
+    902: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    903: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    905: {
+        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.5 : 1; }
+    },
+    906: {
+        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.75 : 1; }
+    },
+    907: {
+        atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; }
+    },
+    908: {
+        atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
+    },
+    909: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    910: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    911: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    912: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    913: {
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1); }
+    },
+    914: {
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1.2); }
+    },
+    915: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
+    916: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    917: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    918: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+    },
+    921: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
+    922: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+    },
+    923: {
+        atk: function(p) {
             if(p.percHP<30){ 
                 return p.unit.class.has("Driven") ? 2.5 : 1;
             } else {
                 return p.unit.class.has("Driven") ? 2 : 1;
             }	
-		}
-	},
-	924: {
-		atk: function(p) {
-			if(p.percHP<30){
+        }
+    },
+    924: {
+        atk: function(p) {
+            if(p.percHP<30){
                 return p.unit.class.has("Driven") ? 2.75 : 1;
             } else {
                 return p.unit.class.has("Driven") ? 2 : 1;
             }
-		}
-	},
-	925: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
-	},
-	926: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
-	},
-	927: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-		hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-	},
-	928: {
-		atk: function(p) {
-			if(p.percHP<30){
+        }
+    },
+    925: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    926: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+    },
+    927: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    928: {
+        atk: function(p) {
+            if(p.percHP<30){
                 return p.unit.class.has("Driven") ? 1.75 : 1;
             } else {
                 return p.unit.class.has("Striker") ? 1.75 : 1;
             }
-		}
-	},
-	929: {
-		atk: function(p) {
-			if(p.percHP<30){
+        }
+    },
+    929: {
+        atk: function(p) {
+            if(p.percHP<30){
                 return p.unit.class.has("Driven") ? 2.25 : 1;
             } else {
                 return p.unit.class.has("Striker") ? 2.25 : 1;
             }
-		}
-	},
-	930: {
-		chainModifier: function(p) { return 2; }
-	},
-	932: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	933: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-		hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	934: {
-		atk: function(p) {
-			if(p.percHP<30 || p.percHP>70){
+        }
+    },
+    930: {
+        chainModifier: function(p) { return 2; }
+    },
+    932: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    933: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    934: {
+        atk: function(p) {
+            if(p.percHP<30 || p.percHP>70){
                 return p.unit.class.has("Fighter") ? 2.75 : 1;
             } else {
                 return p.unit.class.has("Fighter") ? 2 : 1;
             }
-		},
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	935: {
-		atk: function(p) {
-			if(p.percHP<30 || p.percHP>70){
+        },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    935: {
+        atk: function(p) {
+            if(p.percHP<30 || p.percHP>70){
                 return p.unit.class.has("Fighter") ? 2.75 : 1;
             } else {
                 return p.unit.class.has("Fighter") ? 2 : 1;
             }
-		},
-		hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	936: {
-		chainModifier: function(p) { return 3; }
-	},
-	937: {
-		chainModifier: function(p) { return 3.5; },
-		hp: function(p) { return 1.25; }
-	},
-	938: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	939: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
-	},
-	940: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	941: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
-	},
-	942: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
-	},
-	943: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
-		hp: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
-	},
-	944: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; }
-	},
-	945: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-		rcv: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
-	},
-	946: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
-	},
-	947: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	948: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
-	},
-	949: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-	},
-	950: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
-			return p.modifiers.slice(0, p.chainPosition)
-				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	951: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
-		hitAtk: function(p) {
-			if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
-			return p.modifiers.slice(0, p.chainPosition)
-				.subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	952: {
-		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
-		},
-		hp: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
-		}
-	},
-	953: {
-		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
-		},
-		hp: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
-		}
-	},
-	954: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
-	955: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
-	},
-	956: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	963: {
-		atk: function(p) { 
-			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 2; 
-			return 1;
-		}
-	},
-	964: {
-		atk: function(p) { 
-			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-			return 1;
-		},
-		hp: function(p) { 
-			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-			return 1;
-		},
-		rcv: function(p) { 
-			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-			return 1;
-		}
-	},
-	965: {
-		atk: function(p) { 
-			if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-			return 1;
-		}
-	},
-	966: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
-	},
-	967: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
-	},
-	973: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2 : 1; }
-	},
-	974: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
-	},
-	976: {
-		atk: function(p) {
-			return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1;
-		}
-	},
+        },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    936: {
+        chainModifier: function(p) { return 3; }
+    },
+    937: {
+        chainModifier: function(p) { return 3.5; },
+        hp: function(p) { return 1.25; }
+    },
+    938: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    939: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    940: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    941: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
+    },
+    942: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+    },
+    943: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
+    },
+    944: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; }
+    },
+    945: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
+    },
+    946: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
+    947: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    948: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+    },
+    949: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    950: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    951: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    952: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
+        },
+        hp: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
+        }
+    },
+    953: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
+        },
+        hp: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
+        }
+    },
+    954: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    955: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+    },
+    956: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    963: {
+        atk: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 2; 
+            return 1;
+        }
+    },
+    964: {
+        atk: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
+        },
+        hp: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
+        },
+        rcv: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
+        }
+    },
+    965: {
+        atk: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
+        }
+    },
+    966: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+    },
+    967: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+    },
+    973: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    974: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    976: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1;
+        }
+    },
     977: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
@@ -2402,52 +2402,52 @@ window.captains = {
     1001: {
         atk: function(p) { return  1 + p.percHP / 100; }
     },
-	1002: {
-		atk: function(p) {return p.unit.class.has("Fighter") ? 1.5 : 1; }
-	},
-	1003: {
-		atk: function(p) {return p.unit.class.has("Fighter") ? 2 : 1; }
-	},
-	1004: {
-		rcv: function(p) { return 1.5; }
-	},
-	1005: {
-		atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	1006: {
-		atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-		hp: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-	},
-	1007: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
-	1008: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 2 : 1; }
-	},
-	1009: {
-		atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
-				p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
-				1;
-		}
-	},
-	1010:{
-		atk: function(p) {return p.unit.class.has("Driven") ? 1.5 : 1; }
-	},
-	1011:{
-		atk: function(p) {
-			if (p.unit.class.has("Driven") && p.unit.class.has("Powerhouse")){
-				return 2.625;
-			} else if (p.unit.class.has("Driven")){
-					return 1.75;
-				} else if (p.unit.class.has("Powerhouse")){
-					return 1.5;
-				} return 1;
-		}
-	},
-	1014:{
-		atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
-	},
+    1002: {
+        atk: function(p) {return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    1003: {
+        atk: function(p) {return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    1004: {
+        rcv: function(p) { return 1.5; }
+    },
+    1005: {
+        atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1006: {
+        atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1007: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1008: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    1009: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
+                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
+                1;
+        }
+    },
+    1010:{
+        atk: function(p) {return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    1011:{
+        atk: function(p) {
+            if (p.unit.class.has("Driven") && p.unit.class.has("Powerhouse")){
+                return 2.625;
+            } else if (p.unit.class.has("Driven")){
+                    return 1.75;
+                } else if (p.unit.class.has("Powerhouse")){
+                    return 1.5;
+                } return 1;
+        }
+    },
+    1014:{
+        atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
     1015: {
         atk: function(p) { return !p.unit.type == "INT" ? 1 : (p.orb == 2.0 ? 2.75 : 1); }
     },
@@ -2495,9 +2495,9 @@ window.captains = {
     },
     1029: {
         hit: function(n) {
-			return n > 36 ? 3.5 :
-				n > 21 ? 2.5 : 1;
-		}
+            return n > 36 ? 3.5 :
+                n > 21 ? 2.5 : 1;
+        }
     },
     1030: {
         atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
@@ -2519,19 +2519,19 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
     },
     1036: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Free Spirit" ]); },
-		hitAtk: function(p) {
-			return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1037: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
-		hitAtk: function(p) {
-			return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1038: {
         atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.2 : 1; }
     },
@@ -2555,35 +2555,35 @@ window.captains = {
         rcv: function(p) { return 0; }
     },
     1044: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1045: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1046: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
-		hitAtk: function(p) {
-			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1047: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
-		hitAtk: function(p) {
-			return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1048: {
         atk: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; },
         rcv: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; }
@@ -2639,8 +2639,8 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1;}
     },
     1068: {
-		chainModifier: function(p) { return 1.5; }
-	},
+        chainModifier: function(p) { return 1.5; }
+    },
     1069:{
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
     },
@@ -2648,12 +2648,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1;}
     },
     1071: {
-		atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
-	},
+        atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
+    },
     1072: {
-		atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1;}
-	},
+    },
     1073:{
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
     },
@@ -2672,30 +2672,30 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1080: {
-		atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+    },
     1081: {
-		atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+    },
     1082: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1083: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Striker", "Fighter" ]); },
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Striker", "Fighter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Striker") && !p.unit.class.has("Fighter")) return 1;
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1.5;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1084: {
-		atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
-		hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-	},
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
     1085: {
-		atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
-		hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-	},
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
     1086:{
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;},
         rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
@@ -2712,17 +2712,17 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1;}
     },
     1090: {
-		atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
-	},
+        atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
+    },
     1091: {
-		atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
-	},
-	1092: {
-		rcv: function(p) { return 1 + .5 * ((100 - p.percHP) / 100); }
-	},
-	1093: {
-		rcv: function(p) { return 1 + 1 * ((100 - p.percHP) / 100);	}
-	},
+        atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    1092: {
+        rcv: function(p) { return 1 + .5 * ((100 - p.percHP) / 100); }
+    },
+    1093: {
+        rcv: function(p) { return 1 + 1 * ((100 - p.percHP) / 100);	}
+    },
     1094: {
         atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
     },
@@ -2730,18 +2730,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
     },
     1096: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
         hitAtk: function(p) {
-			return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+            return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1097: {
-		damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Powerhouse" ]); },
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Powerhouse" ]); },
         hitAtk: function(p) {
-			return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+            return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1098: {
         chainModifier: function(p) { return 2; }
@@ -2754,17 +2754,17 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has('Fighter') ? 1.2 : 1.0; }
     },
     1101: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.25 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1102: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1103: {
         atk: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; },
         rcv: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; }
@@ -2801,32 +2801,32 @@ window.captains = {
     1113: {
         atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }  
     },
-	1114: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	1115: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
-	},
-	1118: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	1119: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-	},
-	1120: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
-	1121: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-		},
-		hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+    1114: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    1115: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+    },
+    1118: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1119: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1120: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1121: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1;
         }  
@@ -2835,15 +2835,15 @@ window.captains = {
         atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
     },
     1124: {
-		atk: function(p) {
-			return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-		}
-	},
-	1125: {
-		atk: function(p) {
-			return p.unit.class.has("Slasher") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
-		}
-	},
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1125: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
+        }
+    },
     1126: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
         hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
@@ -2937,54 +2937,54 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
     },
     1162: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+    },
     1163: {
         atk: function(p) { return (p.unit.type == "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type == "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type == "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
     },
     1164: {
-		rcv: function(p) { return 1.2; }
-	},
+        rcv: function(p) { return 1.2; }
+    },
     1165: {
-		rcv: function(p) { return 1.5; }
-	},
+        rcv: function(p) { return 1.5; }
+    },
     1167: {
-		atk: function(p) { return 1.2; }
-	},
+        atk: function(p) { return 1.2; }
+    },
     1168: {
-		atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2 : 1; }
+    },
     1169: {
-		atk: function(p) {
-			return p.unit.type == "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
-		}
-	},
+        atk: function(p) {
+            return p.unit.type == "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
     1170: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
     1171: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
     1172: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
-	1173: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    1173: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
     1174: {
-		atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
-	},
-	1175: {
-		atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+    },
+    1175: {
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+    },
     1176: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
-	},
-	1177: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+    },
+    1177: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+    },
     1178: {
         atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2 : 1; }
     },
@@ -2992,17 +2992,17 @@ window.captains = {
         atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
     },
     1181: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+    },
     1182: {
-		atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+    },
     1183: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+    },
     1184: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+    },
     1185: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
@@ -3010,52 +3010,52 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1187: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+    },
     1188: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+    },
     1189: {
         atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
     },
     1190: {
         atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
     },
-	1191: {
+    1191: {
         atk: function(p) {
-			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
-		},
-		hp: function(p) { return 1.25; }
-	},
-	1192: {
+            return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
+        },
+        hp: function(p) { return 1.25; }
+    },
+    1192: {
         atk: function(p) {
-			return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
-		},
-		hp: function(p) { return 1.25; }
-	},
+            return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
+        },
+        hp: function(p) { return 1.25; }
+    },
     1193: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
     1194: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-	},
-	1195: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    1195: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
     1196: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-	},
-	1197: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (p.orb == 2.0 ? 2.5 : 1) : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1197: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (p.orb == 2.0 ? 2.5 : 1) : 1; }
+    },
     1198: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
     1199: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
     1202: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
@@ -3074,26 +3074,26 @@ window.captains = {
         hp: function(p) { return 1.3; }
     },
     1207: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
-	},
-	1208: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-		rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
-	},
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    1208: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
     1209: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-	},
-	1210: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-		rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-	},
-	1211: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
-	},
-	1212: {
-		atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    1210: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    1211: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    1212: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
+    },
     1213: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
@@ -3105,44 +3105,44 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
     },
     1215: {
-		damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'PSY', 'DEX']); },
-		hitAtk: function(p) {
-			return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-				type: 'QCK',
-				minModifier: 'Good'
-			}, {
-				type: 'PSY',
-				minModifier: 'Good'
-			}, {
-				type: 'DEX',
-				minModifier: 'Good'
-			}]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'PSY', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'QCK',
+                minModifier: 'Good'
+            }, {
+                type: 'PSY',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1216: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
     1217: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-	},
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
     1218: {
-		hitAtk: function(p) {
-			return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-		},
-		hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-	},
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1219: {
         atk: function(p) {
-			return p.unit.class.has("Shooter") ? Math.min(3, 1 + 0.125 * p.turnCounter) : 1;
-		}
-	},
-	1220: {
+            return p.unit.class.has("Shooter") ? Math.min(3, 1 + 0.125 * p.turnCounter) : 1;
+        }
+    },
+    1220: {
         atk: function(p) {
-			return p.unit.class.has("Shooter") ? Math.min(3.25, 1 + 0.225 * p.turnCounter) : 1;
-		}
-	},
+            return p.unit.class.has("Shooter") ? Math.min(3.25, 1 + 0.225 * p.turnCounter) : 1;
+        }
+    },
     1221: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
@@ -3166,38 +3166,38 @@ window.captains = {
         rcv: function(p) { return .5 }
     },
     1233: {
-		atk: function(p) {
-			return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.25 :
-				p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 :
-				1;
-		},
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.25 :
+                p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 :
+                1;
+        },
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; }
-	},
+    },
     1234: {
-		atk: function(p) {
-			return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.56 :
-				p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.6 :
-				1;
-		},
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.56 :
+                p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.6 :
+                1;
+        },
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1; }
-	},
+    },
     1235: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
-	},
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+    },
     1236: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-	},
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+    },
     1237: {
-		hit: function(n) {
-			return n > 15 ? 2 : 1;
-		}
-	},
+        hit: function(n) {
+            return n > 15 ? 2 : 1;
+        }
+    },
     1238: {
-		hit: function(n) {
-			return n > 30 ? 3 :
-				n > 15 ? 2 : 1;
-		}
-	},
+        hit: function(n) {
+            return n > 30 ? 3 :
+                n > 15 ? 2 : 1;
+        }
+    },
     1239: {
         atk: function(p){ 
             return window.specials[1239].turnedOn || window.specials[1240].turnedOn ? 3 : 2; },
@@ -3216,18 +3216,18 @@ window.captains = {
     },
     1243: {
         atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
-				p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
-				1;
-		},
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+                1;
+        },
     },
     1244: {
         atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.276 :
-				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.75 : 
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.276 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.75 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3 :
-				1;
-		},
+                1;
+        },
     },
     1245: {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
@@ -3241,17 +3241,17 @@ window.captains = {
     },
     1248: {
         atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
-				p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
-				1;
-		},
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+                1;
+        },
     },
     1249: {
         atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
-				p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.6 :
-				1;
-		},
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.6 :
+                1;
+        },
     },
     1250: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -3275,10 +3275,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; },
     },
     1257: {
-		atk: function(p) { return p.percHP <= 50.0 ? 2 : 1; }
+        atk: function(p) { return p.percHP <= 50.0 ? 2 : 1; }
     },
     1258: {
-		atk: function(p) { return p.percHP <= 50.0 ? 2.5 : 1; }
+        atk: function(p) { return p.percHP <= 50.0 ? 2.5 : 1; }
     },
     1259: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
@@ -3293,11 +3293,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
     },
     1263: {
-		atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+    },
     1264: {
-		atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
-	},
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+    },
     1265: {
         atk: function(p) { return p.unit.class.has("Shooters") ? 2 : 1; },
     },
@@ -3336,31 +3336,31 @@ window.captains = {
     },
     1273: {
         atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
-				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.5 : 
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.5 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.5 :
-				1;
-		},
+                1;
+        },
         hp: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
-				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.15 :
-				1;
-		},
+                1;
+        },
     },
     1274: {
         atk: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
-				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.6 : 
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.6 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.6 :
-				1;
-		},
+                1;
+        },
         hp: function(p) {
-			return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
-				p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.15 :
-				1;
-		},
+                1;
+        },
     },
     1275: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
@@ -3371,13 +3371,13 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
     },
     1277: {
-		atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.25 : 1; },
         rcv: function(p) { return .01; },
-	},
+    },
     1278: {
-		atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.75 : 1; },
         rcv: function(p) { return .01; },
-	},
+    },
     1279: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
@@ -3400,9 +3400,9 @@ window.captains = {
     },
     1285: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.375, [ "Striker" ]); },
-		hitAtk: function(p) {
-			return !p.unit.class.has("Striker") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.375 : 1.5;
-		},
+        hitAtk: function(p) {
+            return !p.unit.class.has("Striker") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.375 : 1.5;
+        },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
     },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 2fcfc923e..7b689d467 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1,937 +1,937 @@
 window.cooldowns = [
     [ 3, 2 ],
-	[ 12, 9 ],
-	[ 23, 15 ],
-	[ 25, 18 ],
-	[ 12, 9 ],
-	[ 15, 10 ],
-	[ 15, 10 ],
-	[ 25, 20 ],
-	[ 12, 7 ],
-	[ 23, 15 ],
-	[ 15, 8 ],
-	[ 25, 20 ],
-	[ 15, 10 ],
-	[ 15, 10 ],
-	[ 15, 10 ],
-	[ 20, 15 ],
-	[ 23, 15 ],
-	[ 15, 10 ],
-	[ 23, 15 ],
-	[ 15, 10 ],
-	[ 15, 8 ],
-	[ 23, 15 ],
-	[ 15, 8 ],
-	[ 15, 10 ],
-	[ 25, 15 ],
-	[ 22, 15 ],
-	[ 40, 15 ],
-	[ 40, 15 ],
-	[ 15, 9 ],
-	[ 15, 9 ],
-	null,
-	[ 13, 7 ],
-	null,
-	[ 25, 20 ],
-	[ 15, 9 ],
-	[ 15, 10 ],
-	[ 15, 10 ],
-	[ 13, 7 ],
-	[ 13, 7 ],
-	[ 18, 8 ],
-	[ 13, 7 ],
-	[ 10, 5 ],
-	[ 13, 7 ],
-	[ 13, 7 ],
-	[ 15, 8 ],
-	[ 15, 8 ],
-	[ 15, 7 ],
-	[ 18, 8 ],
-	[ 40, 15 ],
-	[ 15, 10 ],
-	null,
-	[ 13, 7 ],
-	null,
-	[ 15, 9 ],
-	null,
-	[ 13, 7 ],
-	[ 15, 9 ],
-	[ 15, 12 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 8 ],
-	[ 15, 9 ],
-	null,
-	[ 15, 10 ],
-	[ 15, 9 ],
-	[ 23, 15 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 22, 15 ],
-	[ 22, 15 ],
-	[ 17, 10 ],
-	[ 12, 6 ],
-	[ 12, 6 ],
-	[ 25, 18 ],
-	[ 25, 20 ],
-	[ 25, 20 ],
-	[ 25, 20 ],
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	[ 40, 15 ],
-	[ 35, 10 ],
-	[ 40, 15 ],
-	[ 25, 10 ],
-	[ 15, 7 ],
-	[ 25, 10 ],
-	[ 40, 15 ],
-	[ 40, 15 ],
-	[ 15, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 40, 15 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 40, 15 ],
-	[ 35, 10 ],
-	[ 15, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 35, 10 ],
-	[ 25, 10 ],
-	[ 40, 15 ],
-	[ 25, 10 ],
-	[ 15, 7 ],
-	[ 25, 10 ],
-	[ 40, 15 ],
-	[ 40, 15 ],
-	[ 15, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 40, 15 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 40, 15 ],
-	[ 35, 10 ],
-	[ 15, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 35, 10 ],
-	[ 25, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 12, 8 ],
-	[ 12, 8 ],
-	[ 12, 8 ],
-	[ 12, 8 ],
-	[ 12, 8 ],
-	[ 25, 10 ],
-	[ 25, 10 ],
-	[ 25, 10 ],
-	[ 25, 10 ],
-	[ 25, 10 ],
-	[ 40, 15 ],
-	[ 40, 15 ],
-	[ 40, 15 ],
-	[ 35, 10 ],
-	[ 15, 7 ],
-	[ 12, 8 ],
-	[ 15, 7 ],
-	[ 12, 8 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 12, 8 ],
-	[ 15, 7 ],
-	[ 12, 8 ],
-	[ 15, 7 ],
-	null,
-	null,
-	null,
-	null,
-	null,
-	[ 15, 7 ],
-	[ 12, 8 ],
-	[ 15, 7 ],
-	[ 12, 8 ],
-	[ 15, 7 ],
-	[ 15, 11 ],
-	[ 20, 14 ],
-	null,
-	[ 15, 6 ],
-	null,
-	[ 13, 9 ],
-	null,
-	[ 15, 10 ],
-	null,
-	[ 13, 7 ],
-	[ 17, 8 ],
-	[ 17, 12 ],
-	null,
-	[ 15, 10 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 15, 12 ],
-	[ 22, 15 ],
-	[ 25, 20 ],
-	[ 15, 8 ],
-	[ 25, 18 ],
-	[ 13, 7 ],
-	[ 13, 7 ],
-	[ 17, 8 ],
-	[ 17, 12 ],
-	[ 15, 11 ],
-	[ 20, 11 ],
-	[ 32, 17 ],
-	[ 32, 17 ],
-	[ 15, 9 ],
-	[ 13, 7 ],
-	[ 10, 5 ],
-	[ 22, 14 ],
-	[ 22, 14 ],
-	null,
-	[ 15, 8 ],
-	null,
-	[ 20, 11 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 10, 10 ],
-	[ 30, 15 ],
-	[ 30, 15 ],
-	[ 30, 20 ],
-	[ 30, 20 ],
-	[ 15, 8 ],
-	[ 15, 8 ],
-	[ 15, 10 ],
-	[ 15, 10 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 25, 17 ],
-	[ 25, 17 ],
-	null,
-	[ 17, 10 ],
-	null,
-	[ 17, 11 ],
-	null,
-	[ 15, 10 ],
-	[ 22, 15 ],
-	[ 40, 15 ],
-	[ 25, 10 ],
-	[ 15, 7 ],
-	[ 25, 10 ],
-	[ 40, 15 ],
-	[ 40, 15 ],
-	[ 15, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 40, 15 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 40, 15 ],
-	[ 35, 10 ],
-	[ 15, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 35, 10 ],
-	[ 25, 10 ],
-	[ 25, 18 ],
-	[ 18, 8 ],
-	[ 18, 8 ],
-	[ 25, 10 ],
-	[ 40, 15 ],
-	[ 15, 10 ],
-	[ 20, 12 ],
-	[ 20, 12 ],
-	[ 25, 18 ],
-	[ 21, 16 ],
-	null,
-	null,
-	null,
-	null,
-	null,
-	[ 28, 13 ],
-	[ 28, 13 ],
-	[ 18, 10 ],
-	[ 18, 10 ],
-	[ 23, 15 ],
-	[ 23, 15 ],
-	[ 35, 25 ],
-	[ 35, 25 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 17, 10 ],
-	[ 17, 10 ],
-	[ 14, 10 ],
-	[ 22, 16 ],
-	[ 22, 16 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	null,
-	null,
-	[ 16, 10 ],
-	[ 20, 15 ],
-	[ 12, 8 ],
-	[ 12, 8 ],
-	[ 14, 6 ],
-	[ 14, 6 ],
-	[ 14, 6 ],
-	[ 14, 6 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	[ 30, 16 ],
-	[ 30, 16 ],
-	[ 22, 15 ],
-	[ 22, 15 ],
-	[ 11, 6 ],
-	[ 11, 6 ],
-	[ 20, 12 ],
-	[ 20, 12 ],
-	[ 28, 20 ],
-	[ 28, 20 ],
-	[ 13, 8 ],
-	[ 13, 8 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 23, 18 ],
-	[ 23, 18 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 10, 5 ],
-	[ 15, 10 ],
-	[ 15, 10 ],
-	[ 25, 10 ],
-	[ 15, 10 ],
-	[ 17, 12 ],
-	[ 17, 12 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 17, 8 ],
-	[ 17, 8 ],
-	[ 23, 14 ],
-	[ 23, 14 ],
-	[ 38, 18 ],
-	[ 17, 8 ],
-	[ 15, 8 ],
-	[ 15, 8 ],
-	[ 25, 20 ],
-	[ 25, 20 ],
-	[ 15, 8 ],
-	[ 15, 8 ],
-	[ 18, 12 ],
-	[ 18, 12 ],
-	[ 20, 20 ],
-	[ 23, 14 ],
-	[ 23, 14 ],
-	[ 30, 15 ],
-	[ 20, 10 ],
-	[ 23, 18 ],
-	[ 11, 6 ],
-	[ 11, 6 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 17, 13 ],
-	[ 17, 13 ],
-	[ 28, 14 ],
-	[ 28, 14 ],
-	[ 15, 15 ],
-	[ 23, 13 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 24, 15 ],
-	[ 24, 15 ],
-	[ 35, 18 ],
-	[ 17, 12 ],
-	[ 21, 16 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 14, 9 ],
-	[ 14, 9 ],
-	[ 25, 18 ],
-	[ 16, 6 ],
-	[ 21, 11 ],
-	[ 12, 8 ],
-	[ 12, 8 ],
-	[ 18, 18 ],
-	[ 18, 18 ],
-	[ 16, 16 ],
-	[ 16, 16 ],
-	null,
-	null,
-	null,
-	null,
-	[ 26, 17 ],
-	[ 30, 15 ],
-	[ 30, 15 ],
-	[ 16, 10 ],
-	[ 16, 10 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 16, 10 ],
-	[ 16, 10 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 18, 10 ],
-	[ 18, 10 ],
-	[ 28, 19 ],
-	[ 28, 19 ],
-	[ 14, 10 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 25, 20 ],
-	[ 20, 15 ],
-	[ 25, 18 ],
-	[ 15, 10 ],
-	[ 15, 10 ],
-	[ 25, 16 ],
-	[ 18, 10 ],
-	[ 25, 16 ],
-	[ 18, 10 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 20, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 11, 11 ],
-	[ 11, 11 ],
-	[ 13, 9 ],
-	[ 13, 9 ],
-	[ 21, 16 ],
-	[ 21, 16 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 21, 15 ],
-	[ 21, 15 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 24, 14 ],
-	[ 24, 14 ],
-	[ 22, 17 ],
-	[ 15, 15 ],
-	[ 15, 15 ],
-	[ 14, 14 ],
-	[ 24, 11 ],
-	[ 24, 11 ],
-	[ 10, 5 ],
-	[ 10, 5 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 23, 16 ],
-	[ 23, 16 ],
-	[ 23, 16 ],
-	[ 23, 16 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 25, 20 ],
-	[ 25, 20 ],
-	[ 16, 16 ],
-	[ 16, 16 ],
-	[ 18, 18 ],
-	[ 18, 18 ],
-	[ 16, 16 ],
-	[ 16, 16 ],
-	[ 25, 16 ],
-	[ 25, 16 ],
-	[ 50, 20 ],
-	[ 16, 12 ],
-	[ 15, 10 ],
-	[ 18, 12 ],
-	[ 25, 20 ],
-	[ 25, 20 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 18, 18 ],
-	[ 18, 18 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 45, 15 ],
-	[ 33, 18 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
-	[ 21, 14 ],
-	[ 21, 14 ],
-	[ 16, 10 ],
-	[ 16, 10 ],
-	[ 17, 11 ],
-	[ 17, 11 ],
-	[ 22, 17 ],
-	[ 22, 17 ],
-	[ 15, 9 ],
-	[ 16, 10 ],
-	[ 18, 10 ],
-	[ 14, 6 ],
-	[ 23, 18 ],
-	[ 25, 20 ],
-	[ 25, 20 ],
-	[ 25, 14 ],
-	[ 25, 14 ],
-	[ 30, 15 ],
-	[ 20, 15 ],
-	[ 33, 18 ],
-	[ 33, 18 ],
-	[ 12, 12 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 20, 17 ],
-	[ 20, 17 ],
-	[ 20, 11 ],
-	[ 26, 17 ],
-	[ 21, 10 ],
-	[ 22, 8 ],
-	[ 20, 13 ],
-	[ 20, 13 ],
-	[ 21, 14 ],
-	[ 21, 14 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	null,
-	null,
-	null,
-	null,
-	null,
-	[ 20, 17 ],
-	[ 20, 17 ],
-	[ 16, 6 ],
-	[ 16, 6 ],
-	[ 18, 10 ],
-	[ 18, 10 ],
-	[ 32, 17 ],
-	[ 32, 17 ],
-	[ 18, 15 ],
-	[ 18, 15 ],
-	[ 23, 13 ],
-	[ 23, 13 ],
-	[ 14, 7 ],
-	[ 15, 8 ],
-	[ 15, 7 ],
-	[ 18, 8 ],
-	[ 13, 10 ],
-	[ 13, 10 ],
-	[ 23, 17 ],
-	[ 20, 15 ],
-	[ 13, 7 ],
-	[ 18, 12 ],
-	[ 33, 18 ],
-	[ 25, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 20, 10 ],
-	[ 28, 18 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 35, 18 ],
-	[ 18, 8 ],
-	[ 20, 14 ],
-	[ 23, 17 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 25, 16 ],
-	[ 25, 16 ],
-	[ 23, 15 ],
-	[ 25, 12 ],
-	[ 20, 11 ],
-	[ 20, 11 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 21, 14 ],
-	[ 21, 14 ],
-	[ 18, 12 ],
-	[ 18, 12 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 15, 12 ],
-	[ 15, 12 ],
-	[ 28, 14 ],
-	[ 28, 14 ],
-	[ 28, 14 ],
-	[ 24, 15 ],
-	[ 24, 15 ],
-	[ 20, 10 ],
-	[ 30, 17 ],
-	[ 20, 15 ],
-	[ 13, 10 ],
-	[ 13, 10 ],
-	[ 15, 15 ],
-	[ 25, 16 ],
-	[ 25, 16 ],
-	[ 19, 10 ],
-	[ 19, 10 ],
-	[ 28, 15 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
-	[ 15, 11 ],
-	[ 15, 11 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 21, 15 ],
-	[ 21, 15 ],
-	[ 18, 14 ],
-	[ 18, 14 ],
-	[ 19, 16 ],
-	[ 19, 16 ],
-	[ 20, 13 ],
-	[ 20, 13 ],
-	[ 22, 15 ],
-	[ 22, 15 ],
-	[ 23, 16 ],
-	[ 23, 16 ],
-	[ 13, 13 ],
-	[ 19, 14 ],
-	[ 19, 14 ],
-	[ 18, 10 ],
-	[ 18, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 35, 18 ],
-	[ 25, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 35, 18 ],
-	[ 25, 10 ],
-	[ 25, 20 ],
-	[ 25, 20 ],
-	[ 12, 5 ],
-	[ 25, 18 ],
-	[ 20, 14 ],
-	[ 18, 10 ],
-	[ 18, 10 ],
-	[ 21, 15 ],
-	[ 21, 15 ],
-	[ 23, 20 ],
-	[ 23, 20 ],
-	[ 22, 14 ],
-	[ 22, 14 ],
-	[ 22, 14 ],
-	[ 27, 14 ],
-	[ 27, 14 ],
-	[ 25, 19 ],
-	[ 25, 19 ],
-	[ 21, 14 ],
-	[ 21, 14 ],
-	[ 16, 7 ],
-	[ 16, 7 ],
-	[ 25, 16 ],
-	[ 25, 16 ],
-	[ 11, 8 ],
-	[ 11, 8 ],
-	[ 15, 15 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 18, 12 ],
-	[ 18, 12 ],
-	[ 14, 7 ],
-	[ 14, 7 ],
-	[ 25, 18 ],
-	[ 18, 12 ],
-	[ 35, 20 ],
-	[ 20, 14 ],
-	[ 23, 15 ],
-	[ 23, 15 ],
-	[ 20, 12 ],
-	[ 20, 12 ],
-	[ 18, 15 ],
-	[ 18, 15 ],
-	[ 20, 20 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 23, 16 ],
-	[ 23, 16 ],
-	[ 21, 14 ],
-	[ 21, 14 ],
-	[ 22, 15 ],
-	[ 22, 15 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
-	[ 18, 10 ],
-	[ 18, 10 ],
-	[ 21, 15 ],
-	[ 21, 15 ],
-	[ 23, 15 ],
-	[ 14, 10 ],
-	[ 15, 7 ],
-	[ 16, 8 ],
-	[ 17, 9 ],
-	[ 18, 10 ],
-	[ 19, 11 ],
-	[ 21, 13 ],
-	[ 23, 15 ],
-	[ 23, 13 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 17, 8 ],
-	[ 20, 11 ],
-	[ 27, 17 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 26, 16 ],
-	[ 26, 16 ],
-	[ 19, 7 ],
-	[ 19, 7 ],
-	[ 11, 11 ],
-	[ 11, 11 ],
-	[ 15, 8 ],
-	[ 15, 8 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 15, 8 ],
-	[ 15, 8 ],
-	[ 17, 10 ],
-	[ 17, 10 ],
-	[ 22, 16 ],
-	[ 22, 16 ],
-	[ 30, 16 ],
-	[ 30, 16 ],
-	[ 22, 14 ],
-	[ 22, 14 ],
-	[ 20, 12 ],
-	[ 20, 12 ],
-	[ 27, 12 ],
-	[ 15, 12 ],
-	[ 15, 12 ],
-	[ 27, 17 ],
-	[ 27, 17 ],
-	[ 27, 15 ],
-	[ 27, 15 ],
-	[ 23, 14 ],
-	[ 23, 14 ],
-	[ 25, 13 ],
-	[ 25, 13 ],
-	[ 20, 6 ],
-	[ 20, 13 ],
-	[ 17, 10 ],
-	[ 18, 11 ],
-	[ 22, 16 ],
-	[ 22, 16 ],
-	[ 15, 7 ],
-	[ 18, 10 ],
-	[ 35, 18 ],
-	[ 15, 7 ],
-	[ 18, 8 ],
-	[ 20, 10 ],
-	[ 25, 15 ],
-	[ 28, 18 ],
-	[ 20, 12 ],
-	[ 16, 9 ],
-	[ 25, 18 ],
-	[ 10, 10 ],
-	[ 10, 10 ],
-	[ 24, 12 ],
-	[ 24, 12 ],
-	[ 28, 18 ],
-	[ 28, 18 ],
-	[ 20, 10 ],
-	[ 28, 14 ],
-	[ 28, 14 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 18, 12 ],
-	[ 18, 12 ],
-	[ 16, 10 ],
-	[ 16, 10 ],
-	[ 25, 19 ],
-	[ 25, 19 ],
-	[ 13, 7 ],
-	[ 13, 7 ],
-	[ 25, 16 ],
-	[ 25, 16 ],
-	[ 25, 12 ],
-	[ 19, 10 ],
-	[ 25, 16 ],
-	[ 25, 16 ],
-	[ 25, 15 ],
-	[ 30, 17 ],
-	[ 15, 15 ],
-	[ 15, 15 ],
-	[ 15, 15 ],
-	[ 15, 15 ],
-	[ 25, 15 ],
-	[ 25, 15 ],
-	[ 23, 14 ],
-	[ 23, 14 ],
-	[ 13, 13 ],
-	[ 28, 14 ],
-	[ 28, 14 ],
-	[ 24, 14 ],
-	[ 24, 14 ],
-	[ 24, 14 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 16, 10 ],
-	[ 16, 10 ],
-	[ 19, 14 ],
-	[ 19, 14 ],
-	[ 21, 15 ],
-	[ 21, 15 ],
-	[ 21, 15 ],
-	[ 21, 15 ],
-	[ 25, 18 ],
-	[ 25, 18 ],
-	[ 22, 10 ],
-	[ 22, 10 ],
-	[ 29, 19 ],
-	[ 29, 19 ],
-	[ 27, 18 ],
-	[ 28, 19 ],
-	[ 32, 18 ],
-	[ 25, 15 ],
-	[ 20, 12 ],
-	[ 20, 12 ],
-	[ 18, 10 ],
-	[ 14, 8 ],
-	[ 28, 22 ],
-	[ 25, 18 ],
-	21,
-	21,
-	[ 27, 18 ],
-	[ 24, 15 ],
-	[ 24, 14 ],
-	[ 28, 16 ],
-	[ 28, 16 ],
-	[ 29, 19 ],
-	[ 29, 19 ],
-	[ 23, 14 ],
-	[ 24, 18 ],
-	[ 24, 18 ],
-	[ 15, 9 ],
-	[ 15, 9 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 25, 18 ], // 3d2y Sanji
-	[ 25, 18 ], // 3d2y Sanji
-	[ 16, 10 ],
-	[ 16, 10 ],
-	[ 13, 13 ],
-	[ 13, 13 ],
-	[ 18, 9 ],
-	[ 18, 9 ],
-	[ 22, 10 ],
-	[ 19, 14 ],
-	[ 15, 15 ],
-	[ 15, 15 ],
-	[ 28, 16 ],
-	[ 28, 16 ],
-	[ 22, 12 ],
-	[ 22, 12 ],
-	[ 18, 8 ],
-	[ 21, 12 ],
-	[ 21, 12 ],
-	[ 16, 11 ],
-	[ 30, 17 ],
-	[ 31, 17 ],
-	[ 31, 17 ],
+    [ 12, 9 ],
+    [ 23, 15 ],
+    [ 25, 18 ],
+    [ 12, 9 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 25, 20 ],
+    [ 12, 7 ],
+    [ 23, 15 ],
+    [ 15, 8 ],
+    [ 25, 20 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 20, 15 ],
+    [ 23, 15 ],
+    [ 15, 10 ],
+    [ 23, 15 ],
+    [ 15, 10 ],
+    [ 15, 8 ],
+    [ 23, 15 ],
+    [ 15, 8 ],
+    [ 15, 10 ],
+    [ 25, 15 ],
+    [ 22, 15 ],
+    [ 40, 15 ],
+    [ 40, 15 ],
+    [ 15, 9 ],
+    [ 15, 9 ],
+    null,
+    [ 13, 7 ],
+    null,
+    [ 25, 20 ],
+    [ 15, 9 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 13, 7 ],
+    [ 13, 7 ],
+    [ 18, 8 ],
+    [ 13, 7 ],
+    [ 10, 5 ],
+    [ 13, 7 ],
+    [ 13, 7 ],
+    [ 15, 8 ],
+    [ 15, 8 ],
+    [ 15, 7 ],
+    [ 18, 8 ],
+    [ 40, 15 ],
+    [ 15, 10 ],
+    null,
+    [ 13, 7 ],
+    null,
+    [ 15, 9 ],
+    null,
+    [ 13, 7 ],
+    [ 15, 9 ],
+    [ 15, 12 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 8 ],
+    [ 15, 9 ],
+    null,
+    [ 15, 10 ],
+    [ 15, 9 ],
+    [ 23, 15 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 22, 15 ],
+    [ 22, 15 ],
+    [ 17, 10 ],
+    [ 12, 6 ],
+    [ 12, 6 ],
+    [ 25, 18 ],
+    [ 25, 20 ],
+    [ 25, 20 ],
+    [ 25, 20 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 40, 15 ],
+    [ 35, 10 ],
+    [ 40, 15 ],
+    [ 25, 10 ],
+    [ 15, 7 ],
+    [ 25, 10 ],
+    [ 40, 15 ],
+    [ 40, 15 ],
+    [ 15, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 40, 15 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 40, 15 ],
+    [ 35, 10 ],
+    [ 15, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 35, 10 ],
+    [ 25, 10 ],
+    [ 40, 15 ],
+    [ 25, 10 ],
+    [ 15, 7 ],
+    [ 25, 10 ],
+    [ 40, 15 ],
+    [ 40, 15 ],
+    [ 15, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 40, 15 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 40, 15 ],
+    [ 35, 10 ],
+    [ 15, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 35, 10 ],
+    [ 25, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 12, 8 ],
+    [ 12, 8 ],
+    [ 12, 8 ],
+    [ 12, 8 ],
+    [ 12, 8 ],
+    [ 25, 10 ],
+    [ 25, 10 ],
+    [ 25, 10 ],
+    [ 25, 10 ],
+    [ 25, 10 ],
+    [ 40, 15 ],
+    [ 40, 15 ],
+    [ 40, 15 ],
+    [ 35, 10 ],
+    [ 15, 7 ],
+    [ 12, 8 ],
+    [ 15, 7 ],
+    [ 12, 8 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 12, 8 ],
+    [ 15, 7 ],
+    [ 12, 8 ],
+    [ 15, 7 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 15, 7 ],
+    [ 12, 8 ],
+    [ 15, 7 ],
+    [ 12, 8 ],
+    [ 15, 7 ],
+    [ 15, 11 ],
+    [ 20, 14 ],
+    null,
+    [ 15, 6 ],
+    null,
+    [ 13, 9 ],
+    null,
+    [ 15, 10 ],
+    null,
+    [ 13, 7 ],
+    [ 17, 8 ],
+    [ 17, 12 ],
+    null,
+    [ 15, 10 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 15, 12 ],
+    [ 22, 15 ],
+    [ 25, 20 ],
+    [ 15, 8 ],
+    [ 25, 18 ],
+    [ 13, 7 ],
+    [ 13, 7 ],
+    [ 17, 8 ],
+    [ 17, 12 ],
+    [ 15, 11 ],
+    [ 20, 11 ],
+    [ 32, 17 ],
+    [ 32, 17 ],
+    [ 15, 9 ],
+    [ 13, 7 ],
+    [ 10, 5 ],
+    [ 22, 14 ],
+    [ 22, 14 ],
+    null,
+    [ 15, 8 ],
+    null,
+    [ 20, 11 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 10, 10 ],
+    [ 30, 15 ],
+    [ 30, 15 ],
+    [ 30, 20 ],
+    [ 30, 20 ],
+    [ 15, 8 ],
+    [ 15, 8 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 25, 17 ],
+    [ 25, 17 ],
+    null,
+    [ 17, 10 ],
+    null,
+    [ 17, 11 ],
+    null,
+    [ 15, 10 ],
+    [ 22, 15 ],
+    [ 40, 15 ],
+    [ 25, 10 ],
+    [ 15, 7 ],
+    [ 25, 10 ],
+    [ 40, 15 ],
+    [ 40, 15 ],
+    [ 15, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 40, 15 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 40, 15 ],
+    [ 35, 10 ],
+    [ 15, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 35, 10 ],
+    [ 25, 10 ],
+    [ 25, 18 ],
+    [ 18, 8 ],
+    [ 18, 8 ],
+    [ 25, 10 ],
+    [ 40, 15 ],
+    [ 15, 10 ],
+    [ 20, 12 ],
+    [ 20, 12 ],
+    [ 25, 18 ],
+    [ 21, 16 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 28, 13 ],
+    [ 28, 13 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 23, 15 ],
+    [ 23, 15 ],
+    [ 35, 25 ],
+    [ 35, 25 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 17, 10 ],
+    [ 17, 10 ],
+    [ 14, 10 ],
+    [ 22, 16 ],
+    [ 22, 16 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    null,
+    null,
+    [ 16, 10 ],
+    [ 20, 15 ],
+    [ 12, 8 ],
+    [ 12, 8 ],
+    [ 14, 6 ],
+    [ 14, 6 ],
+    [ 14, 6 ],
+    [ 14, 6 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 30, 16 ],
+    [ 30, 16 ],
+    [ 22, 15 ],
+    [ 22, 15 ],
+    [ 11, 6 ],
+    [ 11, 6 ],
+    [ 20, 12 ],
+    [ 20, 12 ],
+    [ 28, 20 ],
+    [ 28, 20 ],
+    [ 13, 8 ],
+    [ 13, 8 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 23, 18 ],
+    [ 23, 18 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 10, 5 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 25, 10 ],
+    [ 15, 10 ],
+    [ 17, 12 ],
+    [ 17, 12 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 17, 8 ],
+    [ 17, 8 ],
+    [ 23, 14 ],
+    [ 23, 14 ],
+    [ 38, 18 ],
+    [ 17, 8 ],
+    [ 15, 8 ],
+    [ 15, 8 ],
+    [ 25, 20 ],
+    [ 25, 20 ],
+    [ 15, 8 ],
+    [ 15, 8 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 20, 20 ],
+    [ 23, 14 ],
+    [ 23, 14 ],
+    [ 30, 15 ],
+    [ 20, 10 ],
+    [ 23, 18 ],
+    [ 11, 6 ],
+    [ 11, 6 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 17, 13 ],
+    [ 17, 13 ],
+    [ 28, 14 ],
+    [ 28, 14 ],
+    [ 15, 15 ],
+    [ 23, 13 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 24, 15 ],
+    [ 24, 15 ],
+    [ 35, 18 ],
+    [ 17, 12 ],
+    [ 21, 16 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 14, 9 ],
+    [ 14, 9 ],
+    [ 25, 18 ],
+    [ 16, 6 ],
+    [ 21, 11 ],
+    [ 12, 8 ],
+    [ 12, 8 ],
+    [ 18, 18 ],
+    [ 18, 18 ],
+    [ 16, 16 ],
+    [ 16, 16 ],
+    null,
+    null,
+    null,
+    null,
+    [ 26, 17 ],
+    [ 30, 15 ],
+    [ 30, 15 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 28, 19 ],
+    [ 28, 19 ],
+    [ 14, 10 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 25, 20 ],
+    [ 20, 15 ],
+    [ 25, 18 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 25, 16 ],
+    [ 18, 10 ],
+    [ 25, 16 ],
+    [ 18, 10 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 20, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 11, 11 ],
+    [ 11, 11 ],
+    [ 13, 9 ],
+    [ 13, 9 ],
+    [ 21, 16 ],
+    [ 21, 16 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 24, 14 ],
+    [ 24, 14 ],
+    [ 22, 17 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    [ 14, 14 ],
+    [ 24, 11 ],
+    [ 24, 11 ],
+    [ 10, 5 ],
+    [ 10, 5 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 25, 20 ],
+    [ 25, 20 ],
+    [ 16, 16 ],
+    [ 16, 16 ],
+    [ 18, 18 ],
+    [ 18, 18 ],
+    [ 16, 16 ],
+    [ 16, 16 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
+    [ 50, 20 ],
+    [ 16, 12 ],
+    [ 15, 10 ],
+    [ 18, 12 ],
+    [ 25, 20 ],
+    [ 25, 20 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 18, 18 ],
+    [ 18, 18 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 45, 15 ],
+    [ 33, 18 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 21, 14 ],
+    [ 21, 14 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 17, 11 ],
+    [ 17, 11 ],
+    [ 22, 17 ],
+    [ 22, 17 ],
+    [ 15, 9 ],
+    [ 16, 10 ],
+    [ 18, 10 ],
+    [ 14, 6 ],
+    [ 23, 18 ],
+    [ 25, 20 ],
+    [ 25, 20 ],
+    [ 25, 14 ],
+    [ 25, 14 ],
+    [ 30, 15 ],
+    [ 20, 15 ],
+    [ 33, 18 ],
+    [ 33, 18 ],
+    [ 12, 12 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 20, 17 ],
+    [ 20, 17 ],
+    [ 20, 11 ],
+    [ 26, 17 ],
+    [ 21, 10 ],
+    [ 22, 8 ],
+    [ 20, 13 ],
+    [ 20, 13 ],
+    [ 21, 14 ],
+    [ 21, 14 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 20, 17 ],
+    [ 20, 17 ],
+    [ 16, 6 ],
+    [ 16, 6 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 32, 17 ],
+    [ 32, 17 ],
+    [ 18, 15 ],
+    [ 18, 15 ],
+    [ 23, 13 ],
+    [ 23, 13 ],
+    [ 14, 7 ],
+    [ 15, 8 ],
+    [ 15, 7 ],
+    [ 18, 8 ],
+    [ 13, 10 ],
+    [ 13, 10 ],
+    [ 23, 17 ],
+    [ 20, 15 ],
+    [ 13, 7 ],
+    [ 18, 12 ],
+    [ 33, 18 ],
+    [ 25, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 20, 10 ],
+    [ 28, 18 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 35, 18 ],
+    [ 18, 8 ],
+    [ 20, 14 ],
+    [ 23, 17 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
+    [ 23, 15 ],
+    [ 25, 12 ],
+    [ 20, 11 ],
+    [ 20, 11 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 21, 14 ],
+    [ 21, 14 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 15, 12 ],
+    [ 15, 12 ],
+    [ 28, 14 ],
+    [ 28, 14 ],
+    [ 28, 14 ],
+    [ 24, 15 ],
+    [ 24, 15 ],
+    [ 20, 10 ],
+    [ 30, 17 ],
+    [ 20, 15 ],
+    [ 13, 10 ],
+    [ 13, 10 ],
+    [ 15, 15 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
+    [ 19, 10 ],
+    [ 19, 10 ],
+    [ 28, 15 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 15, 11 ],
+    [ 15, 11 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 18, 14 ],
+    [ 18, 14 ],
+    [ 19, 16 ],
+    [ 19, 16 ],
+    [ 20, 13 ],
+    [ 20, 13 ],
+    [ 22, 15 ],
+    [ 22, 15 ],
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 13, 13 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 35, 18 ],
+    [ 25, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 35, 18 ],
+    [ 25, 10 ],
+    [ 25, 20 ],
+    [ 25, 20 ],
+    [ 12, 5 ],
+    [ 25, 18 ],
+    [ 20, 14 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 23, 20 ],
+    [ 23, 20 ],
+    [ 22, 14 ],
+    [ 22, 14 ],
+    [ 22, 14 ],
+    [ 27, 14 ],
+    [ 27, 14 ],
+    [ 25, 19 ],
+    [ 25, 19 ],
+    [ 21, 14 ],
+    [ 21, 14 ],
+    [ 16, 7 ],
+    [ 16, 7 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
+    [ 11, 8 ],
+    [ 11, 8 ],
+    [ 15, 15 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 14, 7 ],
+    [ 14, 7 ],
+    [ 25, 18 ],
+    [ 18, 12 ],
+    [ 35, 20 ],
+    [ 20, 14 ],
+    [ 23, 15 ],
+    [ 23, 15 ],
+    [ 20, 12 ],
+    [ 20, 12 ],
+    [ 18, 15 ],
+    [ 18, 15 ],
+    [ 20, 20 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 21, 14 ],
+    [ 21, 14 ],
+    [ 22, 15 ],
+    [ 22, 15 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 23, 15 ],
+    [ 14, 10 ],
+    [ 15, 7 ],
+    [ 16, 8 ],
+    [ 17, 9 ],
+    [ 18, 10 ],
+    [ 19, 11 ],
+    [ 21, 13 ],
+    [ 23, 15 ],
+    [ 23, 13 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 17, 8 ],
+    [ 20, 11 ],
+    [ 27, 17 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 26, 16 ],
+    [ 26, 16 ],
+    [ 19, 7 ],
+    [ 19, 7 ],
+    [ 11, 11 ],
+    [ 11, 11 ],
+    [ 15, 8 ],
+    [ 15, 8 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 15, 8 ],
+    [ 15, 8 ],
+    [ 17, 10 ],
+    [ 17, 10 ],
+    [ 22, 16 ],
+    [ 22, 16 ],
+    [ 30, 16 ],
+    [ 30, 16 ],
+    [ 22, 14 ],
+    [ 22, 14 ],
+    [ 20, 12 ],
+    [ 20, 12 ],
+    [ 27, 12 ],
+    [ 15, 12 ],
+    [ 15, 12 ],
+    [ 27, 17 ],
+    [ 27, 17 ],
+    [ 27, 15 ],
+    [ 27, 15 ],
+    [ 23, 14 ],
+    [ 23, 14 ],
+    [ 25, 13 ],
+    [ 25, 13 ],
+    [ 20, 6 ],
+    [ 20, 13 ],
+    [ 17, 10 ],
+    [ 18, 11 ],
+    [ 22, 16 ],
+    [ 22, 16 ],
+    [ 15, 7 ],
+    [ 18, 10 ],
+    [ 35, 18 ],
+    [ 15, 7 ],
+    [ 18, 8 ],
+    [ 20, 10 ],
+    [ 25, 15 ],
+    [ 28, 18 ],
+    [ 20, 12 ],
+    [ 16, 9 ],
+    [ 25, 18 ],
+    [ 10, 10 ],
+    [ 10, 10 ],
+    [ 24, 12 ],
+    [ 24, 12 ],
+    [ 28, 18 ],
+    [ 28, 18 ],
+    [ 20, 10 ],
+    [ 28, 14 ],
+    [ 28, 14 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 25, 19 ],
+    [ 25, 19 ],
+    [ 13, 7 ],
+    [ 13, 7 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
+    [ 25, 12 ],
+    [ 19, 10 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
+    [ 25, 15 ],
+    [ 30, 17 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    [ 23, 14 ],
+    [ 23, 14 ],
+    [ 13, 13 ],
+    [ 28, 14 ],
+    [ 28, 14 ],
+    [ 24, 14 ],
+    [ 24, 14 ],
+    [ 24, 14 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 25, 18 ],
+    [ 25, 18 ],
+    [ 22, 10 ],
+    [ 22, 10 ],
+    [ 29, 19 ],
+    [ 29, 19 ],
+    [ 27, 18 ],
+    [ 28, 19 ],
+    [ 32, 18 ],
+    [ 25, 15 ],
+    [ 20, 12 ],
+    [ 20, 12 ],
+    [ 18, 10 ],
+    [ 14, 8 ],
+    [ 28, 22 ],
+    [ 25, 18 ],
+    21,
+    21,
+    [ 27, 18 ],
+    [ 24, 15 ],
+    [ 24, 14 ],
+    [ 28, 16 ],
+    [ 28, 16 ],
+    [ 29, 19 ],
+    [ 29, 19 ],
+    [ 23, 14 ],
+    [ 24, 18 ],
+    [ 24, 18 ],
+    [ 15, 9 ],
+    [ 15, 9 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 25, 18 ], // 3d2y Sanji
+    [ 25, 18 ], // 3d2y Sanji
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 13, 13 ],
+    [ 13, 13 ],
+    [ 18, 9 ],
+    [ 18, 9 ],
+    [ 22, 10 ],
+    [ 19, 14 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    [ 28, 16 ],
+    [ 28, 16 ],
+    [ 22, 12 ],
+    [ 22, 12 ],
+    [ 18, 8 ],
+    [ 21, 12 ],
+    [ 21, 12 ],
+    [ 16, 11 ],
+    [ 30, 17 ],
+    [ 31, 17 ],
+    [ 31, 17 ],
     [ 19, 14 ],
     [ 19, 14 ],
     [ 19, 14 ],
@@ -941,99 +941,99 @@ window.cooldowns = [
     [ 21, 15 ],
     [ 21, 15 ],
     [ 15, 8 ],
-	[ 15, 8 ],
+    [ 15, 8 ],
+    [ 13, 13 ],
     [ 13, 13 ],
-	[ 13, 13 ],
-	[ 20, 12 ],
-	[ 25, 17 ],
-	[ 25, 18 ],
-	[ 20, 15 ],
-	[ 21, 9 ],
-	[ 21, 9 ],
-	[ 18, 10 ],
+    [ 20, 12 ],
+    [ 25, 17 ],
+    [ 25, 18 ],
+    [ 20, 15 ],
+    [ 21, 9 ],
+    [ 21, 9 ],
+    [ 18, 10 ],
+    [ 18, 10 ],
+    20,
+    [ 16, 10 ],
+    [ 20, 14 ],
+    20,
     [ 18, 10 ],
-	20,
-	[ 16, 10 ],
-	[ 20, 14 ],
-	20,
-	[ 18, 10 ],
-	[ 18, 10 ],
-	[ 22, 14 ],
-	[ 16, 8 ],
-	[ 16, 8 ],
-	[ 23, 16 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 25, 18 ],
-	[ 21, 15 ],
-	[ 28, 20 ],
-	[ 28, 20 ],
-	[ 28, 20 ],
-	[ 28, 20 ],
-	[ 28, 20 ],
-	[ 22, 15 ],
-	[ 22, 15 ],
-	[ 15, 15 ],
-	[ 15, 15 ],
+    [ 18, 10 ],
+    [ 22, 14 ],
+    [ 16, 8 ],
+    [ 16, 8 ],
+    [ 23, 16 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 25, 18 ],
+    [ 21, 15 ],
+    [ 28, 20 ],
+    [ 28, 20 ],
+    [ 28, 20 ],
+    [ 28, 20 ],
+    [ 28, 20 ],
+    [ 22, 15 ],
+    [ 22, 15 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
     [ 25, 11 ],
     [ 25, 11 ],
     [ 25, 18 ],
     [ 15, 7 ],
     [ 16, 8 ],
-	[ 22, 12 ],
-	[ 22, 12 ],
-	[ 22, 14 ],
-	null,
-    null,
-	null,
-    null,
-	[ 19, 12 ],
-	[ 15, 9 ],
-	[ 15, 9 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	null, //Violet
-	null, //Violet
-	null, //Dellinger 
-	null, //Dellinger 
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 20, 12 ],
-	[ 20, 12 ],
-	[ 20, 10 ],
-	[ 15, 7 ],
-	[ 15, 7 ],
-	[ 13, 13 ],
-	[ 13, 13 ],
-	[ 25, 14 ],
-	[ 23, 14 ],
-	[ 23, 14 ],
-	[ 19, 10 ],
-	[ 19, 10 ],
-	[ 16, 6 ],
-	[ 24, 12 ],
-	[ 24, 12 ],
-	[ 26, 14 ],
-	[ 26, 14 ],
-	[ 16, 6],
-	[ 13, 13],
-	[ 13, 13],
-	[ 15, 15 ],
-	[ 17, 17 ],
-	[ 19, 13 ],
-	[ 19, 13 ],
-	[ 11, 5 ],
-	[ 11, 5 ],
-	[ 18, 12 ],
-	[ 18, 12 ],
-	[ 23, 15 ],
-	[ 23, 15 ],
-	[ 11, 5 ],
-	[ 11, 5 ],
-	[ 23, 18 ],
-	[ 23, 18 ],
+    [ 22, 12 ],
+    [ 22, 12 ],
+    [ 22, 14 ],
+    null,
+    null,
+    null,
+    null,
+    [ 19, 12 ],
+    [ 15, 9 ],
+    [ 15, 9 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    null, //Violet
+    null, //Violet
+    null, //Dellinger 
+    null, //Dellinger 
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 20, 12 ],
+    [ 20, 12 ],
+    [ 20, 10 ],
+    [ 15, 7 ],
+    [ 15, 7 ],
+    [ 13, 13 ],
+    [ 13, 13 ],
+    [ 25, 14 ],
+    [ 23, 14 ],
+    [ 23, 14 ],
+    [ 19, 10 ],
+    [ 19, 10 ],
+    [ 16, 6 ],
+    [ 24, 12 ],
+    [ 24, 12 ],
+    [ 26, 14 ],
+    [ 26, 14 ],
+    [ 16, 6],
+    [ 13, 13],
+    [ 13, 13],
+    [ 15, 15 ],
+    [ 17, 17 ],
+    [ 19, 13 ],
+    [ 19, 13 ],
+    [ 11, 5 ],
+    [ 11, 5 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 23, 15 ],
+    [ 23, 15 ],
+    [ 11, 5 ],
+    [ 11, 5 ],
+    [ 23, 18 ],
+    [ 23, 18 ],
     [ 23, 15 ],
     [ 23, 15 ],
     [ 11, 3 ],
@@ -1053,91 +1053,91 @@ window.cooldowns = [
     [ 14, 8 ],
     [ 13, 13 ],
     [ 13, 13 ],
-	21,
-	21,
-	17,
-	17,
-	15,
-	15,
-	10,
-	[ 21, 15 ],
-	20,
-	28,
-	16,
-	13,
-	16,
-	16,
-	[ 13, 6 ],
-	[ 13, 6 ],
-	[ 26, 18 ],
-	[ 26, 18 ],
-	[ 15, 6 ],
-	[ 17, 10],
-	[ 17, 10],
-	[ 20, 16 ], //Leo
-	[ 20, 16 ], //Leo
-	[ 24, 18 ], //Mansherry
-	[ 24, 18 ], //Mansherry
-	[ 18, 12 ],
-	[ 18, 12 ],
-	[ 23, 16 ],
-	[ 23, 16 ],
-	[ 24, 17 ],
-	[ 24, 17 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 20, 10 ],
-	[ 25, 12 ],
-	[ 25, 12 ],
-	[ 13, 13 ],
-	[ 13, 13 ],
-	24,
-	24,
-	[ 20, 11 ],
-	[ 20, 11 ],
-	[ 13, 8 ],
+    21,
+    21,
+    17,
+    17,
+    15,
+    15,
+    10,
+    [ 21, 15 ],
+    20,
+    28,
+    16,
+    13,
+    16,
+    16,
+    [ 13, 6 ],
+    [ 13, 6 ],
+    [ 26, 18 ],
+    [ 26, 18 ],
+    [ 15, 6 ],
+    [ 17, 10],
+    [ 17, 10],
+    [ 20, 16 ], //Leo
+    [ 20, 16 ], //Leo
+    [ 24, 18 ], //Mansherry
+    [ 24, 18 ], //Mansherry
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 24, 17 ],
+    [ 24, 17 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 25, 12 ],
+    [ 25, 12 ],
+    [ 13, 13 ],
+    [ 13, 13 ],
+    24,
+    24,
+    [ 20, 11 ],
+    [ 20, 11 ],
+    [ 13, 8 ],
     [ 11, 11 ],
     [ 11, 11 ],
-	[ 30, 15 ],
-	[ 30, 15 ],
-	[ 27, 17],//Ain
-	[ 27, 17],//Ain
-	[ 23, 12 ],
+    [ 30, 15 ],
+    [ 30, 15 ],
+    [ 27, 17],//Ain
+    [ 27, 17],//Ain
     [ 23, 12 ],
-	[ 30, 15 ],
-	[ 30, 15 ],
+    [ 23, 12 ],
+    [ 30, 15 ],
+    [ 30, 15 ],
     [ 13, 6 ],
     [ 13, 6 ],
     [ 22, 15 ],
     [ 22, 15 ],
     [ 12, 7 ],
     [ 25, 18 ],
-	[ 25, 18 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 23, 16 ],
-	[ 23, 16 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
-	[ 20, 14 ],
+    [ 25, 18 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 23, 16 ],
+    [ 23, 16 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
     [ 20, 14 ],
-	[ 20, 15 ],
-	[ 20, 15 ],
-	null,//Elizabello
-	null,//Elizabello
-	null,//Ideo
-	null,//Ideo
-	[ 6, 6 ],
-	[ 6, 6 ],
-	16,
-	[ 18 , 11 ],
-	19,
-	[ 15, 8 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    null,//Elizabello
+    null,//Elizabello
+    null,//Ideo
+    null,//Ideo
+    [ 6, 6 ],
+    [ 6, 6 ],
+    16,
+    [ 18 , 11 ],
+    19,
+    [ 15, 8 ],
     [ 30, 16 ],
     [ 30, 16 ],
     [ 24, 12 ],
@@ -1178,24 +1178,24 @@ window.cooldowns = [
     [ 23, 17 ],
     [ 17, 17 ],
     [ 17, 17 ],
-	null,
-	[ 19, 13 ],
-	[ 19, 13 ],
-	[ 23, 17 ],
-	[ 23, 17 ],
-	null,// Haruta
-	null,// Haruta
-	23,
-	23,
-	[ 11, 5 ],
-	[ 11, 5 ],
-	[ 19, 13 ],
-	[ 19, 13 ],
+    null,
+    [ 19, 13 ],
+    [ 19, 13 ],
+    [ 23, 17 ],
+    [ 23, 17 ],
+    null,// Haruta
+    null,// Haruta
+    23,
+    23,
+    [ 11, 5 ],
+    [ 11, 5 ],
+    [ 19, 13 ],
+    [ 19, 13 ],
     [ 15, 15 ],
     [ 15, 15 ],
-	[ 29, 15 ],
-	[ 29, 15 ],
-	[ 17, 7 ],
+    [ 29, 15 ],
+    [ 29, 15 ],
+    [ 17, 7 ],
     [ 18, 10 ],
     [ 18, 10 ],
     [ 22, 14 ],
@@ -1213,34 +1213,34 @@ window.cooldowns = [
     [ 17, 11 ],
     [ 15, 15 ],
     [ 15, 15 ],
-	[ 18, 12 ],
-	[ 17, 10 ],
-	[ 17, 11 ],
-	[ 25, 14 ],
-	null, //byrnndi world
-	null,//byrnndi world
-	[ 29, 16 ],
-	[ 29, 16 ],
-	[ 20, 10 ],
-	15,
-	16,
-	17,
-	23,
-	22,
-	[ 22, 15 ],//Sentomaru
-	[ 22, 15 ],//Sentomaru
-	19,
-	19,
-	23,
-	23,
-	20,
-	[ 20, 13 ],
-	22,
-	22,
-	null,//Kizaru
-	null,//Kizaru
-	[ 19, 11 ],
-	[ 19, 11 ],
+    [ 18, 12 ],
+    [ 17, 10 ],
+    [ 17, 11 ],
+    [ 25, 14 ],
+    null, //byrnndi world
+    null,//byrnndi world
+    [ 29, 16 ],
+    [ 29, 16 ],
+    [ 20, 10 ],
+    15,
+    16,
+    17,
+    23,
+    22,
+    [ 22, 15 ],//Sentomaru
+    [ 22, 15 ],//Sentomaru
+    19,
+    19,
+    23,
+    23,
+    20,
+    [ 20, 13 ],
+    22,
+    22,
+    null,//Kizaru
+    null,//Kizaru
+    [ 19, 11 ],
+    [ 19, 11 ],
     [ 20, 15 ],
     [ 20, 15 ],
     [ 23, 17 ],
diff --git a/common/data/defenses.js b/common/data/defenses.js
index 8c60cb897..1f261952d 100644
--- a/common/data/defenses.js
+++ b/common/data/defenses.js
@@ -45,10 +45,10 @@ window.defenses = [
     [ 'Kuma (def up)'                       , 'Kuma Raid'                            , 'Master', 835, 1500 ],
     [ 'Kuma'                                , 'Kuma Raid'                            , 'Ultimate', 836, 1000 ],
     [ 'Kuma (def up)'                       , 'Kuma Raid'                            , 'Ultimate', 836, 2000 ],
-  //[ 'Hancock'                             , 'Hancock Raid'                         , 'Expert', 835, 750 ],
-  //[ 'Hancock (def up)'                    , 'Hancock Raid'                         , 'Expert', 835, 750 ],
-  //[ 'Hancock'                             , 'Hancock Raid'                         , 'Master', 835, 1500 ],
-  //[ 'Hancock (def up)'                    , 'Hancock Raid'                         , 'Master', 835, 1500 ],
+    //[ 'Hancock'                             , 'Hancock Raid'                         , 'Expert', 835, 750 ],
+    //[ 'Hancock (def up)'                    , 'Hancock Raid'                         , 'Expert', 835, 750 ],
+    //[ 'Hancock'                             , 'Hancock Raid'                         , 'Master', 835, 1500 ],
+    //[ 'Hancock (def up)'                    , 'Hancock Raid'                         , 'Master', 835, 1500 ],
     [ 'Giantess'                            , 'Hancock Raid'                         , 'Ultimate', 375, 250 ],
     [ 'Hancock'                             , 'Hancock Raid'                         , 'Ultimate', 865, 260 ],
     [ 'Hancock (def up)'                    , 'Hancock Raid'                         , 'Ultimate', 865, 38850 ],
@@ -130,12 +130,12 @@ window.defenses = [
     [ 'Keimi'                               , 'Keimi Fortnight'                      , 'Expert', 635, 100 ],
     [ 'Keimi (def up)'                      , 'Keimi Fortnight'                      , 'Expert', 635, 1000 ],
     [ 'Young Kuroobi'                       , 'Young Arlong Fortnight'               , 'Expert', 657, 500 ],
-        // [ 'Young Choo'                   , 'Expert', 657, ? ],
+    // [ 'Young Choo'                   , 'Expert', 657, ? ],
     [ 'Young Arlong'                        , 'Young Arlong Fortnight'               , 'Expert', 656, 400 ],
     [ 'Young Kohza'                         , 'Suna Suna Clan Fortnight'             , 'Expert', 665, 50 ],
     [ 'Young Vivi'                          , 'Suna Suna Clan Fortnight, last round' , 'Expert', 664, 1100 ],
     [ 'Young Kohza'                         , 'Suna Suna Clan Fortnight, last round' , 'Expert', 665, 50 ],
-        // [ 'Cobra'                        , 'Fortnight'                            , 'Expert', 666, ? ],
+    // [ 'Cobra'                        , 'Fortnight'                            , 'Expert', 666, ? ],
     [ 'Noland'                              , 'Noland Fortnight, mid round'          , 'Expert', 689, 300 ],
     [ 'Calgara'                             , 'Noland Fortnight, mid round'          , 'Expert', 688, 300 ],
     [ 'Noland (last round)'                 , 'Nolad Fortnight, last round'          , 'Expert', 690, 350 ],
@@ -237,12 +237,12 @@ window.defenses = [
     [ 'Garp'                                , 'Aokiji\'s island, 19th round'         , '', 306, 500 ],
     [ 'Sengoku'                             , 'Aokiji\'s island, 19th round'         , '', 458, 1000 ],
     [ 'Aokiji'                              , 'Aokiji\'s island, 20th round'         , '', 575, 500 ],
-    // Turtles
+    /* * * * * Turtles * * * * */
     [ 'Baby Turtle'                         , ''                                     , '', 109, 10000 ],
     [ 'Adult Turtle'                        , ''                                     , '', 114, 20000 ],
     [ 'Elder Turtle'                        , ''                                     , '', 193, 100000 ],
     [ 'Princess Turtle'                     , ''                                     , '', 595, 500000 ],
-    // Evolvers
+    /* * * * * Evolvers * * * * */
     [ 'Hermit Crab'                         , ''                                     , '', 93, 2000 ],
     [ 'Armored Crab'                        , ''                                     , '', 99, 10000 ],
     [ 'Plated Lobster'                      , ''                                     , '', 304, 100000 ]
diff --git a/common/data/details.js b/common/data/details.js
index 495aa7f86..80f58b9ce 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1,4650 +1,4650 @@
 window.details = {
-	1: {
-		special: "Deals 5x character's ATK in STR damage to one enemy",
-		specialName: "Spinning Gum Punch"
-	},
-	2: {
-		special: "Deals 7x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Pistol",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	3: {
-		special: "Deals 15x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Bazooka",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	4: {
+    1: {
+        special: "Deals 5x character's ATK in STR damage to one enemy",
+        specialName: "Spinning Gum Punch"
+    },
+    2: {
+        special: "Deals 7x character's ATK in STR damage to one enemy",
+        specialName: "Gum-Gum Pistol",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    3: {
+        special: "Deals 15x character's ATK in STR damage to one enemy",
+        specialName: "Gum-Gum Bazooka",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    4: {
         captain: "Boosts ATK of STR characters by 2x, and ATK of all others by 1.5x",
-		special: "Deals 25x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Twin Jet Pistol"
-	},
-	5: {
-		special: "Deals 7x character's ATK in DEX damage to one enemy",
-		specialName: "Oni Giri",
-		captain: "Boosts ATK of DEX characters by 1.5x"
-	},
-	6: {
-		special: "Deals 10x character's ATK in DEX damage to all enemies",
-		specialName: "Three Thousand Worlds",
-		captain: "Boosts ATK of DEX characters by 1.5x"
-	},
-	7: {
-		special: "Deals 10x character's ATK in DEX damage to all enemies",
-		specialName: "108 Pound Phoenix",
-		captain: "Boosts ATK of DEX characters by 1.5x"
-	},
-	8: {
-		special: "Deals 15x character's ATK in DEX damage to all enemies",
-		specialName: "Ashura Ichibugin",
-		captain: "Boosts ATK and HP of DEX characters by 2x"
-	},
-	9: {
-		special: "Recovers 1,000 HP",
-		specialName: "Cat Burglar",
-		captain: "Reduces damage received from INT enemies by 20%"
-	},
-	10: {
-		special: "Deals 15x character's ATK in INT damage to one enemy",
-		specialName: "Tornado Tempo",
-		captain: "Boosts ATK of INT characters by 1.5x"
-	},
-	11: {
-		special: "Reduces damage received from INT enemies by 100% for 1 turn",
-		specialName: "Mirage Tempo",
-		captain: "Boosts ATK of INT characters by 1.5x"
-	},
-	12: {
-		special: "Deals 15x character's ATK in INT damage to all enemies",
-		specialName: "Thunderbolt Tempo",
-		captain: "Boosts ATK and HP of INT characters by 1.5x"
-	},
-	13: {
-		special: "Delays all enemies for 1 turn",
-		specialName: "Liar",
-		captain: "Boosts ATK of Shooter characters by 1.2x"
-	},
-	14: {
-		special: "Delays all enemies for 2 turns",
-		specialName: "Tabasco Star",
-		captain: "Boosts ATK of PSY characters by 1.5x"
-	},
-	15: {
-		special: "Delays all enemies for 3 turns",
-		specialName: "Usopp Golden Pound",
-		captain: "Boosts ATK of PSY characters by 1.5x"
-	},
-	16: {
-		special: "Delays all enemies for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
-		specialName: "Fire Bird Star",
-		captain: "Boosts ATK and HP of PSY characters by 1.5x"
-	},
-	17: {
-		special: "Recovers 10x character's RCV in HP",
-		specialName: "Special Fried Rice",
-		captain: "Boosts ATK of QCK characters by 1.5x"
-	},
-	18: {
-		special: "Reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Plastic Surgery Shot",
-		captain: "Boosts HP of QCK characters by 1.5x"
-	},
-	19: {
-		special: "Recovers 10x character's RCV in HP",
-		specialName: "Hot Rock Stew",
-		captain: "Boosts ATK of QCK characters by 1.5x"
-	},
-	20: {
-		special: "Deals 5,000 fixed damage to all enemies",
-		specialName: "Diable Jambe",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK and HP of QCK characters by 1.5x"
-	},
-	21: {
-		special: "Changes adjacent orbs into [RCV] orbs",
-		specialName: "Hearty Yell",
-		captain: "Boosts RCV of PSY characters by 1.2x"
-	},
-	22: {
-		special: "Deals 15x character's ATK in PSY damage to one enemy",
-		specialName: "Heavy Gong",
-		captain: "Boosts RCV of PSY characters by 1.5x"
-	},
-	23: {
-		special: "Changes adjacent orbs into [RCV] orbs",
-		specialName: "Scope",
-		captain: "Boosts RCV of INT characters by 1.5x"
-	},
-	24: {
-		special: "Reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Hoofprint Roseo",
-		captain: "Boosts RCV of STR characters by 1.5x"
-	},
-	25: {
-		special: "Deals 7x character's ATK in QCK damage to all enemies",
-		specialName: "Horn Point Roseo Colonnade",
-		captain: "Boosts RCV of QCK characters by 1.5x"
-	},
-	26: {
-		special: "Reduces damage received by 50% for 3 turns",
-		specialName: "Guard Point",
-		captain: "Boosts RCV of DEX characters by 1.5x"
-	},
-	27: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash",
-		captain: "Boosts HP of QCK characters by 1.2x"
-	},
-	28: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight",
-		captain: "Boosts ATK of Fighter characters by 1.2x"
-	},
-	29: {
-		special: "Deals 7x character's ATK in STR damage to one enemy",
-		specialName: "Iron Mace Beauty",
-		captain: "Reduces damage received from STR enemies by 30%"
-	},
-	30: {
-		special: "Reduces damage received by 80% for 1 turn",
-		specialName: "Slip-Slip Tracks",
-		captain: "Reduces damage received from STR enemies by 50%"
-	},
-	31: {
-		captain: "Recovers 2x character's RCV in HP at the end of each turn"
-	},
-	32: {
-		special: "Changes [RCV] orbs into [TND] orbs",
-		specialName: "Shooting Spree",
-		captain: "Recovers 2x character's RCV in HP at the end of each turn"
-	},
-	33: {
-		captain: "Reduces damage received from INT enemies by 30%"
-	},
-	34: {
-		special: "Reduces the defense of all enemies by 100% for 1 turn",
-		specialName: "Straw Doll Of Resentment",
-		captain: "Reduces damage received from INT enemies by 30%"
-	},
-	35: {
-		special: "Deals 5x character's ATK in STR damage to one enemy",
-		specialName: "Execution Axe-Hand",
-		captain: "Boosts HP of Slasher characters by 1.2x"
-	},
-	36: {
-		special: "Deals 5x character's ATK in PSY damage to one enemy",
-		specialName: "Fierce Bite",
-		captain: "Boosts ATK of PSY characters by 1.5x"
-	},
-	37: {
-		special: "Deals 5x character's ATK in DEX damage to one enemy",
-		specialName: "The Dance Of A Hundred Kamikaze Tops",
-		captain: "Boosts ATK of DEX characters by 1.5x"
-	},
-	38: {
-		special: "Changes [RCV] orbs into [INT] orbs",
-		specialName: "Chop-Chop Festival",
-		captain: "Boosts ATK of INT characters by 1.5x"
-	},
-	39: {
-		special: "Changes [RCV] orbs into [INT] orbs",
-		specialName: "Chop-Chop Festival",
-		captain: "Boosts ATK of INT characters by 2x"
-	},
-	40: {
-		special: "Changes adjacent orbs into [RCV] orbs",
-		specialName: "[RCV] Slot Storm",
-		captain: "Reduces damage received from Shooter enemies by 30%"
-	},
-	41: {
-		special: "Changes [RCV] orbs into [INT] orbs",
-		specialName: "Cat Snatch",
-		captain: "Boosts RCV of INT characters by 1.2x"
-	},
-	42: {
-		special: "Deals 3x character's ATK in STR damage to all enemies",
-		specialName: "Cat-A-Pult Cat-Astrophe",
-		captain: "Boosts ATK of STR characters by 1.2x"
-	},
-	43: {
-		special: "Changes [RCV] orbs into [DEX] orbs",
-		specialName: "One, Two, Django",
-		captain: "Reduces damage received by 10%"
-	},
-	44: {
-		special: "Changes [RCV] orbs into [DEX] orbs",
-		specialName: "Dance Heaven",
-		captain: "Reduces damage received by 10%"
-	},
-	45: {
-		special: "Deals 5x character's ATK in QCK damage to all enemies",
-		specialName: "Death Scoop",
-		captain: "Boosts ATK of QCK characters by 1.2x"
-	},
-	46: {
-		special: "Deals 5x character's ATK in QCK damage to all enemies",
-		specialName: "Death Scoop",
-		captain: "Boosts ATK of QCK characters by 1.5x"
-	},
-	47: {
-		special: "Changes [TND] orbs into [RCV] orbs",
-		specialName: "[TND] Slot Change [RCV]"
-	},
-	48: {
-		special: "Changes adjacent orbs into [RCV] orbs",
-		specialName: "[RCV] Slot Storm"
-	},
-	49: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	50: {
-		special: "Deals 5x character's ATK in STR damage to one enemy",
-		specialName: "The Meatball Of Doom",
-		captain: "Recovers 4x character's RCV in HP at the end of each turn"
-	},
-	51: {
-		captain: "Recovers 3x character's RCV in HP at the end of each turn"
-	},
-	52: {
-		special: "Changes [STR] orbs into [DEX] orbs",
-		specialName: "Chef Drop",
-		captain: "Boosts ATK of Fighter characters by 2.5x"
-	},
-	53: {
-		captain: "Reduces damage received from QCK enemies by 30%"
-	},
-	54: {
-		special: "Deals 7x character's ATK in QCK damage to one enemy",
-		specialName: "Demonic Dance",
-		captain: "Reduces damage received from QCK enemies by 50%"
-	},
-	55: {
-		captain: "Reduces damage received from STR enemies by 30%"
-	},
-	56: {
-		special: "Changes [RCV] orbs into [STR] orbs",
-		specialName: "Fire Pearl Privilege",
-		captain: "Reduces damage received from STR enemies by 50%"
-	},
-	57: {
-		special: "Deals 7x character's ATK in INT damage to one enemy",
-		specialName: "Chain Hammer",
-		captain: "Reduces damage received by 10%"
-	},
-	58: {
-		special: "Poisons all enemies",
-		specialNotes: "#{poison}",
-		specialName: "MH5",
-		captain: "Reduces damage received by 20%"
-	},
-	59: {
-		special: "Changes [PSY] orbs into [INT] orbs",
-		specialName: "[PSY] Slot Change [INT]",
-		captain: "Boosts ATK of INT characters by 1.2x"
-	},
-	60: {
-		special: "Changes [TND] orbs into [STR] orbs",
-		specialName: "[TND] Slot Change [STR]",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	61: {
-		special: "Deals 5x character's ATK in INT damage to all enemies",
-		specialName: "Lip-O-Cannon",
-		captain: "Boosts HP of Shooter characters by 1.5x"
-	},
-	62: {
-		special: "Deals 7x character's ATK in STR damage to one enemy",
-		specialName: "Guffaw Palm Bomb",
-		captain: "Boosts HP of Fighter characters by 1.5x"
-	},
-	63: {
-		captain: "Reduces damage received from DEX enemies by 30%"
-	},
-	64: {
-		special: "Deals 10x character's ATK in DEX damage to all enemies",
-		specialName: "New Year's Open Body Slam",
-		captain: "Reduces damage received from DEX enemies by 50%"
-	},
-	65: {
-		special: "Deals 7x character's ATK in STR damage to one enemy",
-		specialName: "Shark On Darts",
-		captain: "Boosts ATK of Slasher characters by 2x"
-	},
-	66: {
-		special: "Deals 15x character's ATK in STR damage to one enemy",
-		specialName: "Shark On Tooth",
-		captain: "Boosts ATK of Slasher characters by 2x"
-	},
-	67: {
-		special: "Deals 25x character's ATK in QCK damage to one enemy",
-		specialName: "Quick Draw",
-		captain: "Boosts RCV of Slasher characters by 1.5x"
-	},
-	68: {
-		special: "Deals 25x character's ATK in QCK damage to one enemy",
-		specialName: "Quick Draw",
-		captain: "Boosts RCV of Slasher characters by 2x"
-	},
-	69: {
-		special: "Reduces damage received by 50% for 3 turns",
-		specialName: "White Out",
-		captain: "Reduces damage received by 20%"
-	},
-	70: {
-		special: "Reduces damage received by 50% for 3 turns",
-		specialName: "White Out",
-		captain: "Reduces damage received by 20%"
-	},
-	71: {
-		special: "Reduces damage received by 50% for 1 turn",
-		specialName: "Enchanting Vertigo Dance",
-		captain: "Recovers 2x character's RCV in HP at the end of each turn"
-	},
-	72: {
-		special: "Randomizes all orbs",
-		specialName: "Charge! Supersonic Duck Squadron!",
-		captain: "Recovers 3x character's RCV in HP at the end of each turn"
-	},
-	73: {
-		special: "Randomizes all orbs",
-		specialName: "Charge! Supersonic Duck Squadron!",
-		captain: "Recovers 5x character's RCV in HP at the end of each turn"
-	},
-	74: {
-		special: "Deals 25x character's ATK in QCK damage to one enemy",
-		specialName: "Flame Fist",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	75: {
-		special: "Deals 15x character's ATK in QCK to all enemies",
-		specialName: "Flame Mirror",
-		captain: "Boosts ATK of QCK characters by 2.5x"
-	},
-	76: {
-		special: "Deals 15x character's ATK in PSY damage to all enemies",
-		specialName: "Conqueror's Haki",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	77: {
-		special: "Deals 15x character's ATK in PSY damage to all enemies",
-		specialName: "Conqueror's Haki",
-		captain: "Boosts ATK of PSY characters by 2.5x"
-	},
-	119: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	120: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	121: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight"
-	},
-	122: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	123: {
-		special: "Changes [STR] orbs into [DEX] orbs",
-		specialName: "[STR] Slot Change [DEX]"
-	},
-	124: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	125: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight"
-	},
-	126: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	127: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher"
-	},
-	128: {
-		special: "Changes [QCK] orbs into [DEX] orbs",
-		specialName: "[QCK] Slot Change [DEX]"
-	},
-	129: {
-		special: "Changes [INT] orbs into [PSY] orbs",
-		specialName: "[INT] Slot Change [PSY]"
-	},
-	130: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	131: {
-		special: "Changes [RCV] orbs into [STR] orbs",
-		specialName: "[RCV] Slot Change [STR]"
-	},
-	132: {
-		special: "Changes [DEX] orbs into [QCK] orbs",
-		specialName: "[DEX] Slot Change [QCK]"
-	},
-	133: {
-		special: "Changes [QCK] orbs into [DEX] orbs",
-		specialName: "[QCK] Slot Change [DEX]"
-	},
-	134: {
-		special: "Changes [QCK] orbs into [RCV] orbs",
-		specialName: "[QCK] Slot Change [RCV]"
-	},
-	135: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Spiral"
-	},
-	136: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	137: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher"
-	},
-	138: {
-		special: "Changes [DEX] orbs into [RCV] orbs",
-		specialName: "[DEX] Slot Change [RCV]"
-	},
-	139: {
-		special: "Changes [PSY] orbs into [RCV] orbs",
-		specialName: "[PSY] Slot Change [RCV]"
-	},
-	140: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	141: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	142: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight"
-	},
-	143: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	144: {
-		special: "Changes [STR] orbs into [DEX] orbs",
-		specialName: "[STR] Slot Change [DEX]"
-	},
-	145: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	146: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight"
-	},
-	147: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	148: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher"
-	},
-	149: {
-		special: "Changes [QCK] orbs into [DEX] orbs",
-		specialName: "[QCK] Slot Change [DEX]"
-	},
-	150: {
-		special: "Changes [INT] orbs into [PSY] orbs",
-		specialName: "[INT] Slot Change [PSY]"
-	},
-	151: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	152: {
-		special: "Changes [RCV] orbs into [STR] orbs",
-		specialName: "[RCV] Slot Change [STR]"
-	},
-	153: {
-		special: "Changes [DEX] orbs into [QCK] orbs",
-		specialName: "[DEX] Slot Change [QCK]"
-	},
-	154: {
-		special: "Changes [QCK] orbs into [DEX] orbs",
-		specialName: "[QCK] Slot Change [DEX]"
-	},
-	155: {
-		special: "Changes [QCK] orbs into [RCV] orbs",
-		specialName: "[QCK] Slot Change [RCV]"
-	},
-	156: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Spiral"
-	},
-	157: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	158: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher"
-	},
-	159: {
-		special: "Changes [DEX] orbs into [RCV] orbs",
-		specialName: "[DEX] Slot Change [RCV]"
-	},
-	160: {
-		special: "Changes [PSY] orbs into [RCV] orbs",
-		specialName: "[PSY] Slot Change [RCV]"
-	},
-	161: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	162: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	163: {
-		special: "Changes [DEX] orbs into [TND] orbs",
-		specialName: "[DEX] Slot Change [TND]"
-	},
-	164: {
-		special: "Changes [QCK] orbs into [TND] orbs",
-		specialName: "[QCK] Slot Change [TND]"
-	},
-	165: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	166: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	167: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	168: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	169: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	170: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	171: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	172: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	173: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	174: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	175: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight"
-	},
-	176: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	177: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Spiral"
-	},
-	178: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	179: {
-		special: "Changes [QCK] orbs into [STR] orbs",
-		specialName: "[QCK] Slot Change [STR]"
-	},
-	180: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	181: {
-		special: "Changes [STR] orbs into [QCK] orbs",
-		specialName: "[STR] Slot Change [QCK]"
-	},
-	182: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	183: {
-		special: "Changes [RCV] orbs into [INT] orbs",
-		specialName: "[RCV] Slot Change [INT]"
-	},
-	184: {
-		special: "Changes [QCK] orbs into [STR] orbs",
-		specialName: "[QCK] Slot Change [STR]"
-	},
-	185: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	186: {
-		special: "Changes [STR] orbs into [QCK] orbs",
-		specialName: "[STR] Slot Change [QCK]"
-	},
-	187: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	188: {
-		special: "Changes [RCV] orbs into [INT] orbs",
-		specialName: "[RCV] Slot Change [INT]"
-	},
-	194: {
-		special: "Changes [QCK] orbs into [STR] orbs",
-		specialName: "[QCK] Slot Change [STR]",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	195: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing",
-		captain: "Boosts RCV of DEX characters by 1.5x"
-	},
-	196: {
-		special: "Changes [STR] orbs into [QCK] orbs",
-		specialName: "[STR] Slot Change [QCK]",
-		captain: "Boosts ATK of QCK characters by 1.5x"
-	},
-	197: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing",
-		captain: "Reduces damage received from PSY enemies by 20%"
-	},
-	198: {
-		special: "Changes [RCV] orbs into [INT] orbs",
-		specialName: "[RCV] Slot Change [INT]",
-		captain: "Boosts ATK of Shooter characters by 1.5x"
-	},
-	199: {
-		special: "Deals 15x character's ATK in STR damage to one enemy",
-		specialName: "Nez-Palm Cannon",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	200: {
-		special: "Deals 20x character's ATK in STR damage to one enemy",
-		specialName: "Breeze Breath Bomb",
-		captain: "Boosts ATK of STR characters by 2x"
-	},
-	201: {
-		captain: "Boosts HP of Fighter characters by 1.5x"
-	},
-	202: {
-		special: "Changes [RCV] orbs into [QCK] orbs",
-		specialName: "10,000 Kill-O-Guillotine",
-		captain: "Boosts HP of Fighter characters by 2x"
-	},
-	203: {
-		captain: "Reduces damage received from INT enemies by 10%"
-	},
-	204: {
-		special: "Delays all enemies for 1 turn",
-		specialName: "Extra Special Candelabra",
-		captain: "Reduces damage received from INT enemies by 10%"
-	},
-	205: {
-		captain: "Boosts HP and RCV of DEX characters by 1.2x"
-	},
-	206: {
-		special: "Reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Colors Trap: Calming Green",
-		captain: "Boosts HP and RCV of DEX characters by 1.2x"
-	},
-	207: {
-		captain: "Reduces damage received from PSY enemies by 10%"
-	},
-	208: {
-		special: "Changes [RCV] orbs into [PSY] orbs",
-		specialName: "Bombardier Arabesque",
-		captain: "Reduces damage received from PSY enemies by 20%"
-	},
-	209: {
-		special: "Boosts ATK of INT characters by 1.5x for 1 turn",
-		specialName: "Dieciseis Fleur",
-		captain: "Boosts RCV of INT characters by 1.5x"
-	},
-	210: {
-		special: "Boosts ATK of INT characters by 2x for 1 turn",
-		specialName: "Cien Fleur",
-		captain: "Boosts RCV of INT characters by 2x"
-	},
-	211: {
-		captain: "Boosts ATK of Striker characters by 1.2x"
-	},
-	212: {
-		special: "Deals 5x character's ATK in QCK damage to one enemy",
-		specialName: "Hot Blooded Bat",
-		captain: "Boosts ATK of Striker characters by 1.5x"
-	},
-	213: {
-		special: "Deals 20x character's ATK in STR damage to all enemies",
-		specialName: "Sorrowful Charge",
-		captain: "Protects from defeat as long as HP is above 50%",
-		captainNotes: "#{zombie}"
-	},
-	214: {
-		special: "Deals 20x character's ATK in STR damage to all enemies",
-		specialName: "Sorrowful Charge",
-		captain: "Protects from defeat as long as HP is above 50%",
-		captainNotes: "#{zombie}"
-	},
-	215: {
-		special: "Poisons all enemies",
-		specialNotes: "#{poison}",
-		specialName: "Poison Ink",
-		captain: "Boosts HP of Striker characters by 1.5x"
-	},
-	216: {
-		special: "Reduces damage received by 50% for 3 turns",
-		specialName: "Gum-Gum Balloon",
-		captain: "Reduces damage received by 20%"
-	},
-	217: {
-		special: "Deals 15x character's ATK in STR damage to all enemies",
-		specialName: "Gum-Gum Giant Rifle",
-		captain: "Boosts ATK by 3.5x after scoring 3 Perfects in a row"
-	},
-	218: {
-		special: "Reduces damage received from STR enemies by 100% for 1 turn",
-		specialName: "Streaming Wolf Swords",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
-	},
-	219: {
-		special: "Deals 25x character's ATK in DEX damage to one enemy",
-		specialName: "Lion's Song",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
-	},
-	220: {
-		special: "Changes [PSY] orbs into [INT] orbs",
-		specialName: "Fine Tempo",
-		captain: "Boosts ATK of INT characters by 2x"
-	},
-	221: {
-		special: "Changes [PSY] orbs into [INT] orbs",
-		specialName: "Happiness Punch",
-		captain: "Boosts ATK of INT characters by 2.5x"
-	},
-	222: {
-		special: "Boosts ATK of PSY characters by 1.5x for 1 turn",
-		specialName: "Usopp Hammer",
-		captain: "Boosts ATK of PSY characters by 1.2x"
-	},
-	223: {
-		special: "Boosts ATK of PSY characters by 2x for 1 turn",
-		specialName: "Impact",
-		captain: "Boosts ATK of PSY characters by 1.5x"
-	},
-	224: {
-		special: "Deals 15x character's ATK in QCK damage to one enemy",
-		specialName: "Mutton Shot",
-		captain: "Boosts ATK by 2x after scoring 2 Perfects in a row"
-	},
-	225: {
-		special: "Deals 20x character's ATK in QCK damage to one enemy",
-		specialName: "Veau Shot",
-		captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row"
-	},
-	226: {
-		special: "Cuts the current HP of each enemy by 30%",
-		specialName: "Black Blade Ship Cutter",
-		captain: "Boosts ATK of Slasher characters by 2x"
-	},
-	227: {
-		special: "Cuts the current HP of each enemy by 30%",
-		specialName: "Black Blade Ship Cutter",
-		captain: "Boosts ATK of Slasher characters by 2.5x"
-	},
-	228: {
-		special: "Reduces Bind duration by 2 turns",
-		specialName: "Escapee Axe-Hand",
-		captain: "Boosts HP of Slasher characters by 1.5x"
-	},
-	229: {
-		special: "Changes [INT] orbs into [PSY] orbs",
-		specialName: "Double Cross Dance",
-		captain: "Reduces damage received by 10%"
-	},
-	230: {
-		special: "Deals 200 fixed damage to one enemy",
-		specialName: "Double Hyper Straight",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	231: {
-		special: "Locks all orbs for 1 turn",
-		specialName: "Kimono Sleeve Cage",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	232: {
-		special: "Locks all orbs for 1 turn",
-		specialName: "Kimono Sleeve Cage",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	233: {
-		captain: "Boosts HP of PSY characters by 1.5x"
-	},
-	234: {
-		special: "Deals 5x character's ATK in PSY damage to all enemies",
-		specialName: "Igarappapa",
-		captain: "Boosts HP of PSY characters by 2x"
-	},
-	235: {
-		captain: "Boosts ATK of Fighter characters by 1.2x"
-	},
-	236: {
-		special: "Deals 20x character's ATK in STR damage to one enemy",
-		specialName: "Superhuman Brass Knuckles",
-		captain: "Boosts ATK of Fighter characters by 1.5x"
-	},
-	237: {
-		special: "Changes [DEX] orbs into [STR] orbs",
-		specialName: "[DEX] Slot Change [STR]"
-	},
-	238: {
-		special: "Changes [TND] orbs into [DEX] orbs",
-		specialName: "[TND] Slot Change [DEX]"
-	},
-	239: {
-		special: "Changes [TND] orbs into [QCK] orbs",
-		specialName: "[TND] Slot Change [QCK]"
-	},
-	240: {
-		special: "Changes [STR] orbs into [PSY] orbs",
-		specialName: "[STR] Slot Change [PSY]"
-	},
-	241: {
-		special: "Changes [QCK] orbs into [INT] orbs",
-		specialName: "[QCK] Slot Change [INT]"
-	},
-	242: {
-		special: "Changes [DEX] orbs into [STR] orbs",
-		specialName: "[DEX] Slot Change [STR]"
-	},
-	243: {
-		special: "Changes [TND] orbs into [DEX] orbs",
-		specialName: "[TND] Slot Change [DEX]"
-	},
-	244: {
-		special: "Changes [TND] orbs into [QCK] orbs",
-		specialName: "[TND] Slot Change [QCK]"
-	},
-	245: {
-		special: "Changes [STR] orbs into [PSY] orbs",
-		specialName: "[STR] Slot Change [PSY]"
-	},
-	246: {
-		special: "Changes [QCK] orbs into [INT] orbs",
-		specialName: "[QCK] Slot Change [INT]"
-	},
-	247: {
-		special: "Recovers 1,224 HP",
-		specialName: "Kyuun Spark",
-		captain: "Reduces damage received by 10%"
-	},
-	248: {
-		special: "Deals random STR damage to one enemy",
-		specialName: "Rampage",
-		specialNotes: "#{random : 2,000 : 200,000}",
-		captain: "Boosts ATK of STR characters by 2.5x and reduces their HP by 60%"
-	},
-	249: {
-		special: "Deals random STR damage to one enemy",
-		specialName: "Rampage",
-		specialNotes: "#{random : 2,000 : 200,000}",
-		captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%"
-	},
-	250: {
-		special: "Recovers all HP",
-		specialName: "Blue Flame Rebirth",
-		captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
-	},
-	251: {
-		special: "Recovers all HP",
-		specialName: "Blue Flame Rebirth",
-		captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
-	},
-	252: {
-		special: "Reduces damage received from DEX enemies by 100% for 1 turn",
-		specialName: "Brilliant Punk",
-		captain: "Boosts ATK and HP of QCK characters by 2x"
-	},
-	253: {
-		special: "Reduces damage received from DEX enemies by 100% for 1 turn",
-		specialName: "Brilliant Punk",
-		captain: "Boosts ATK and HP of QCK characters by 2x"
-	},
-	254: {
-		special: "Deals 5,000 fixed damage to all enemies",
-		specialName: "Rose Rondo",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK and HP of INT characters by 2x"
-	},
-	255: {
-		special: "Deals 5,000 fixed damage to all enemies",
-		specialName: "Rose Rondo",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK and HP of INT characters by 2x"
-	},
-	256: {
-		special: "Changes [STR] and [QCK] orbs into [DEX] orbs",
-		specialName: "Beautiful Dual Flintlocks",
-		captain: "Boosts ATK and RCV of DEX characters by 2x"
-	},
-	257: {
-		special: "Changes [STR] and [QCK] orbs into [DEX] orbs",
-		specialName: "Beautiful Dual Flintlocks",
-		captain: "Boosts ATK and RCV of DEX characters by 2x"
-	},
-	258: {
-		special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
-		specialName: "Pocket Mallet",
-		captain: "Boosts ATK and RCV of STR characters by 2x"
-	},
-	259: {
-		special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
-		specialName: "Pocket Mallet",
-		captain: "Boosts ATK and RCV of STR characters by 2x"
-	},
-	260: {
-		special: "Cuts the current HP of each enemy by 30%",
-		specialName: "Seaquake",
-		captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn"
-	},
-	261: {
-		special: "Cuts the current HP of each enemy by 30%",
-		specialName: "Seaquake",
-		captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn"
-	},
-	262: {
-		captain: "Recovers 2x character's RCV in HP at the end of each turn"
-	},
-	263: {
-		special: "Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Shave",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	264: {
-		captain: "Reduces damage received from INT enemies by 30%"
-	},
-	265: {
-		special: "Reduces Bind duration by 3 turns",
-		specialName: "Tempered Kukris",
-		captain: "Boosts ATK and HP of Slasher characters by 1.5x"
-	},
-	267: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher",
-		captain: "Boosts ATK of all characters by 1.5x"
-	},
-	268: {
-		special: "Reduces damage received by 50% for 3 turns",
-		specialName: "White Out",
-		captain: "Reduces damage received by 25%"
-	},
-	269: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight"
-	},
-	270: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	271: {
-		special: "Changes [STR] orbs into [DEX] orbs",
-		specialName: "[STR] Slot Change [DEX]"
-	},
-	272: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	273: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight"
-	},
-	274: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	275: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher"
-	},
-	276: {
-		special: "Changes [QCK] orbs into [DEX] orbs",
-		specialName: "[QCK] Slot Change [DEX]"
-	},
-	277: {
-		special: "Changes [INT] orbs into [PSY] orbs",
-		specialName: "[INT] Slot Change [PSY]"
-	},
-	278: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Slash"
-	},
-	279: {
-		special: "Changes [RCV] orbs into [STR] orbs",
-		specialName: "[RCV] Slot Change [STR]"
-	},
-	280: {
-		special: "Changes [DEX] orbs into [QCK] orbs",
-		specialName: "[DEX] Slot Change [QCK]"
-	},
-	281: {
-		special: "Changes [QCK] orbs into [DEX] orbs",
-		specialName: "[QCK] Slot Change [DEX]"
-	},
-	282: {
-		special: "Changes [QCK] orbs into [RCV] orbs",
-		specialName: "[QCK] Slot Change [RCV]"
-	},
-	283: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Spiral"
-	},
-	284: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	285: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher"
-	},
-	286: {
-		special: "Changes [DEX] orbs into [RCV] orbs",
-		specialName: "[DEX] Slot Change [RCV]"
-	},
-	287: {
-		special: "Changes [PSY] orbs into [RCV] orbs",
-		specialName: "[PSY] Slot Change [RCV]"
-	},
-	288: {
-		special: "Deals 5x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Shot"
-	},
-	289: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	290: {
-		special: "Deals 25x character's ATK in INT damage to one enemy",
-		specialName: "Judgment Bomb",
-		captain: "Boosts ATK of Shooter characters by 1.5x"
-	},
-	291: {
-		special: "Changes adjacent orbs into [RCV] orbs",
-		specialName: "[RCV] Slot Storm",
-		captain: "Reduces damage received from INT enemies by 50%"
-	},
-	292: {
-		special: "Changes adjacent orbs into [RCV] orbs",
-		specialName: "[RCV] Slot Storm",
-		captain: "Reduces damage received from PSY enemies by 50%"
-	},
-	293: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield",
-		captain: "Boosts HP of QCK characters by 2x"
-	},
-	294: {
-		special: "Deals 10x character's ATK in character's type damage to one enemy",
-		specialName: "Hyper Straight",
-		captain: "Boosts HP of STR characters by 2x"
-	},
-	295: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher",
-		captain: "Boosts HP of DEX characters by 2x"
-	},
-	296: {
-		special: "Recovers 2,000 HP, randomizes all orbs",
-		specialName: "Cleansing Wash",
-		captain: "Boosts ATK of Shooter characters by 2x"
-	},
-	297: {
-		special: "Recovers 2,000 HP, randomizes all orbs",
-		specialName: "Cleansing Wash",
-		captain: "Boosts ATK of Shooter characters by 2x"
-	},
-	298: {
-		special: "Deals 25x character's ATK in PSY damage to one enemy",
-		specialName: "Moonwalk",
-		captain: "Boosts HP of PSY characters by 2x"
-	},
-	299: {
-		special: "Cuts the current HP of each enemy by 10%",
-		specialName: "8-Sword Style Onigumo",
-		captain: "Boosts ATK of DEX characters by 2x"
-	},
-	305: {
-		special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
-		specialName: "Meteor Fist Shower",
-		captain: "Boosts ATK and HP of PSY characters by 1.5x"
-	},
-	306: {
-		special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
-		specialName: "Meteor Fist Shower",
-		captain: "Boosts ATK and HP of PSY characters by 2x"
-	},
-	307: {
-		special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
-		specialName: "ROOM – Chambres",
-		captain: "Boosts ATK of DEX characters by 2.5x"
-	},
-	308: {
-		special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
-		specialName: "ROOM – Chambres",
-		captain: "Boosts ATK of DEX characters by 2.5x"
-	},
-	309: {
-		special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% for 3 turns",
-		specialName: "Demon Face",
-		captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%"
-	},
-	310: {
-		special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% for 3 turns",
-		specialName: "Demon Face",
-		captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%"
-	},
-	311: {
-		special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
-		specialName: "Massacre Soldier",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
+        special: "Deals 25x character's ATK in STR damage to one enemy",
+        specialName: "Gum-Gum Twin Jet Pistol"
+    },
+    5: {
+        special: "Deals 7x character's ATK in DEX damage to one enemy",
+        specialName: "Oni Giri",
+        captain: "Boosts ATK of DEX characters by 1.5x"
+    },
+    6: {
+        special: "Deals 10x character's ATK in DEX damage to all enemies",
+        specialName: "Three Thousand Worlds",
+        captain: "Boosts ATK of DEX characters by 1.5x"
+    },
+    7: {
+        special: "Deals 10x character's ATK in DEX damage to all enemies",
+        specialName: "108 Pound Phoenix",
+        captain: "Boosts ATK of DEX characters by 1.5x"
+    },
+    8: {
+        special: "Deals 15x character's ATK in DEX damage to all enemies",
+        specialName: "Ashura Ichibugin",
+        captain: "Boosts ATK and HP of DEX characters by 2x"
+    },
+    9: {
+        special: "Recovers 1,000 HP",
+        specialName: "Cat Burglar",
+        captain: "Reduces damage received from INT enemies by 20%"
+    },
+    10: {
+        special: "Deals 15x character's ATK in INT damage to one enemy",
+        specialName: "Tornado Tempo",
+        captain: "Boosts ATK of INT characters by 1.5x"
+    },
+    11: {
+        special: "Reduces damage received from INT enemies by 100% for 1 turn",
+        specialName: "Mirage Tempo",
+        captain: "Boosts ATK of INT characters by 1.5x"
+    },
+    12: {
+        special: "Deals 15x character's ATK in INT damage to all enemies",
+        specialName: "Thunderbolt Tempo",
+        captain: "Boosts ATK and HP of INT characters by 1.5x"
+    },
+    13: {
+        special: "Delays all enemies for 1 turn",
+        specialName: "Liar",
+        captain: "Boosts ATK of Shooter characters by 1.2x"
+    },
+    14: {
+        special: "Delays all enemies for 2 turns",
+        specialName: "Tabasco Star",
+        captain: "Boosts ATK of PSY characters by 1.5x"
+    },
+    15: {
+        special: "Delays all enemies for 3 turns",
+        specialName: "Usopp Golden Pound",
+        captain: "Boosts ATK of PSY characters by 1.5x"
+    },
+    16: {
+        special: "Delays all enemies for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
+        specialName: "Fire Bird Star",
+        captain: "Boosts ATK and HP of PSY characters by 1.5x"
+    },
+    17: {
+        special: "Recovers 10x character's RCV in HP",
+        specialName: "Special Fried Rice",
+        captain: "Boosts ATK of QCK characters by 1.5x"
+    },
+    18: {
+        special: "Reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Plastic Surgery Shot",
+        captain: "Boosts HP of QCK characters by 1.5x"
+    },
+    19: {
+        special: "Recovers 10x character's RCV in HP",
+        specialName: "Hot Rock Stew",
+        captain: "Boosts ATK of QCK characters by 1.5x"
+    },
+    20: {
+        special: "Deals 5,000 fixed damage to all enemies",
+        specialName: "Diable Jambe",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK and HP of QCK characters by 1.5x"
+    },
+    21: {
+        special: "Changes adjacent orbs into [RCV] orbs",
+        specialName: "Hearty Yell",
+        captain: "Boosts RCV of PSY characters by 1.2x"
+    },
+    22: {
+        special: "Deals 15x character's ATK in PSY damage to one enemy",
+        specialName: "Heavy Gong",
+        captain: "Boosts RCV of PSY characters by 1.5x"
+    },
+    23: {
+        special: "Changes adjacent orbs into [RCV] orbs",
+        specialName: "Scope",
+        captain: "Boosts RCV of INT characters by 1.5x"
+    },
+    24: {
+        special: "Reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Hoofprint Roseo",
+        captain: "Boosts RCV of STR characters by 1.5x"
+    },
+    25: {
+        special: "Deals 7x character's ATK in QCK damage to all enemies",
+        specialName: "Horn Point Roseo Colonnade",
+        captain: "Boosts RCV of QCK characters by 1.5x"
+    },
+    26: {
+        special: "Reduces damage received by 50% for 3 turns",
+        specialName: "Guard Point",
+        captain: "Boosts RCV of DEX characters by 1.5x"
+    },
+    27: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash",
+        captain: "Boosts HP of QCK characters by 1.2x"
+    },
+    28: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight",
+        captain: "Boosts ATK of Fighter characters by 1.2x"
+    },
+    29: {
+        special: "Deals 7x character's ATK in STR damage to one enemy",
+        specialName: "Iron Mace Beauty",
+        captain: "Reduces damage received from STR enemies by 30%"
+    },
+    30: {
+        special: "Reduces damage received by 80% for 1 turn",
+        specialName: "Slip-Slip Tracks",
+        captain: "Reduces damage received from STR enemies by 50%"
+    },
+    31: {
+        captain: "Recovers 2x character's RCV in HP at the end of each turn"
+    },
+    32: {
+        special: "Changes [RCV] orbs into [TND] orbs",
+        specialName: "Shooting Spree",
+        captain: "Recovers 2x character's RCV in HP at the end of each turn"
+    },
+    33: {
+        captain: "Reduces damage received from INT enemies by 30%"
+    },
+    34: {
+        special: "Reduces the defense of all enemies by 100% for 1 turn",
+        specialName: "Straw Doll Of Resentment",
+        captain: "Reduces damage received from INT enemies by 30%"
+    },
+    35: {
+        special: "Deals 5x character's ATK in STR damage to one enemy",
+        specialName: "Execution Axe-Hand",
+        captain: "Boosts HP of Slasher characters by 1.2x"
+    },
+    36: {
+        special: "Deals 5x character's ATK in PSY damage to one enemy",
+        specialName: "Fierce Bite",
+        captain: "Boosts ATK of PSY characters by 1.5x"
+    },
+    37: {
+        special: "Deals 5x character's ATK in DEX damage to one enemy",
+        specialName: "The Dance Of A Hundred Kamikaze Tops",
+        captain: "Boosts ATK of DEX characters by 1.5x"
+    },
+    38: {
+        special: "Changes [RCV] orbs into [INT] orbs",
+        specialName: "Chop-Chop Festival",
+        captain: "Boosts ATK of INT characters by 1.5x"
+    },
+    39: {
+        special: "Changes [RCV] orbs into [INT] orbs",
+        specialName: "Chop-Chop Festival",
+        captain: "Boosts ATK of INT characters by 2x"
+    },
+    40: {
+        special: "Changes adjacent orbs into [RCV] orbs",
+        specialName: "[RCV] Slot Storm",
+        captain: "Reduces damage received from Shooter enemies by 30%"
+    },
+    41: {
+        special: "Changes [RCV] orbs into [INT] orbs",
+        specialName: "Cat Snatch",
+        captain: "Boosts RCV of INT characters by 1.2x"
+    },
+    42: {
+        special: "Deals 3x character's ATK in STR damage to all enemies",
+        specialName: "Cat-A-Pult Cat-Astrophe",
+        captain: "Boosts ATK of STR characters by 1.2x"
+    },
+    43: {
+        special: "Changes [RCV] orbs into [DEX] orbs",
+        specialName: "One, Two, Django",
+        captain: "Reduces damage received by 10%"
+    },
+    44: {
+        special: "Changes [RCV] orbs into [DEX] orbs",
+        specialName: "Dance Heaven",
+        captain: "Reduces damage received by 10%"
+    },
+    45: {
+        special: "Deals 5x character's ATK in QCK damage to all enemies",
+        specialName: "Death Scoop",
+        captain: "Boosts ATK of QCK characters by 1.2x"
+    },
+    46: {
+        special: "Deals 5x character's ATK in QCK damage to all enemies",
+        specialName: "Death Scoop",
+        captain: "Boosts ATK of QCK characters by 1.5x"
+    },
+    47: {
+        special: "Changes [TND] orbs into [RCV] orbs",
+        specialName: "[TND] Slot Change [RCV]"
+    },
+    48: {
+        special: "Changes adjacent orbs into [RCV] orbs",
+        specialName: "[RCV] Slot Storm"
+    },
+    49: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    50: {
+        special: "Deals 5x character's ATK in STR damage to one enemy",
+        specialName: "The Meatball Of Doom",
+        captain: "Recovers 4x character's RCV in HP at the end of each turn"
+    },
+    51: {
+        captain: "Recovers 3x character's RCV in HP at the end of each turn"
+    },
+    52: {
+        special: "Changes [STR] orbs into [DEX] orbs",
+        specialName: "Chef Drop",
+        captain: "Boosts ATK of Fighter characters by 2.5x"
+    },
+    53: {
+        captain: "Reduces damage received from QCK enemies by 30%"
+    },
+    54: {
+        special: "Deals 7x character's ATK in QCK damage to one enemy",
+        specialName: "Demonic Dance",
+        captain: "Reduces damage received from QCK enemies by 50%"
+    },
+    55: {
+        captain: "Reduces damage received from STR enemies by 30%"
+    },
+    56: {
+        special: "Changes [RCV] orbs into [STR] orbs",
+        specialName: "Fire Pearl Privilege",
+        captain: "Reduces damage received from STR enemies by 50%"
+    },
+    57: {
+        special: "Deals 7x character's ATK in INT damage to one enemy",
+        specialName: "Chain Hammer",
+        captain: "Reduces damage received by 10%"
+    },
+    58: {
+        special: "Poisons all enemies",
+        specialNotes: "#{poison}",
+        specialName: "MH5",
+        captain: "Reduces damage received by 20%"
+    },
+    59: {
+        special: "Changes [PSY] orbs into [INT] orbs",
+        specialName: "[PSY] Slot Change [INT]",
+        captain: "Boosts ATK of INT characters by 1.2x"
+    },
+    60: {
+        special: "Changes [TND] orbs into [STR] orbs",
+        specialName: "[TND] Slot Change [STR]",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    61: {
+        special: "Deals 5x character's ATK in INT damage to all enemies",
+        specialName: "Lip-O-Cannon",
+        captain: "Boosts HP of Shooter characters by 1.5x"
+    },
+    62: {
+        special: "Deals 7x character's ATK in STR damage to one enemy",
+        specialName: "Guffaw Palm Bomb",
+        captain: "Boosts HP of Fighter characters by 1.5x"
+    },
+    63: {
+        captain: "Reduces damage received from DEX enemies by 30%"
+    },
+    64: {
+        special: "Deals 10x character's ATK in DEX damage to all enemies",
+        specialName: "New Year's Open Body Slam",
+        captain: "Reduces damage received from DEX enemies by 50%"
+    },
+    65: {
+        special: "Deals 7x character's ATK in STR damage to one enemy",
+        specialName: "Shark On Darts",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    66: {
+        special: "Deals 15x character's ATK in STR damage to one enemy",
+        specialName: "Shark On Tooth",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    67: {
+        special: "Deals 25x character's ATK in QCK damage to one enemy",
+        specialName: "Quick Draw",
+        captain: "Boosts RCV of Slasher characters by 1.5x"
+    },
+    68: {
+        special: "Deals 25x character's ATK in QCK damage to one enemy",
+        specialName: "Quick Draw",
+        captain: "Boosts RCV of Slasher characters by 2x"
+    },
+    69: {
+        special: "Reduces damage received by 50% for 3 turns",
+        specialName: "White Out",
+        captain: "Reduces damage received by 20%"
+    },
+    70: {
+        special: "Reduces damage received by 50% for 3 turns",
+        specialName: "White Out",
+        captain: "Reduces damage received by 20%"
+    },
+    71: {
+        special: "Reduces damage received by 50% for 1 turn",
+        specialName: "Enchanting Vertigo Dance",
+        captain: "Recovers 2x character's RCV in HP at the end of each turn"
+    },
+    72: {
+        special: "Randomizes all orbs",
+        specialName: "Charge! Supersonic Duck Squadron!",
+        captain: "Recovers 3x character's RCV in HP at the end of each turn"
+    },
+    73: {
+        special: "Randomizes all orbs",
+        specialName: "Charge! Supersonic Duck Squadron!",
+        captain: "Recovers 5x character's RCV in HP at the end of each turn"
+    },
+    74: {
+        special: "Deals 25x character's ATK in QCK damage to one enemy",
+        specialName: "Flame Fist",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    75: {
+        special: "Deals 15x character's ATK in QCK to all enemies",
+        specialName: "Flame Mirror",
+        captain: "Boosts ATK of QCK characters by 2.5x"
+    },
+    76: {
+        special: "Deals 15x character's ATK in PSY damage to all enemies",
+        specialName: "Conqueror's Haki",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    77: {
+        special: "Deals 15x character's ATK in PSY damage to all enemies",
+        specialName: "Conqueror's Haki",
+        captain: "Boosts ATK of PSY characters by 2.5x"
+    },
+    119: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    120: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    121: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight"
+    },
+    122: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    123: {
+        special: "Changes [STR] orbs into [DEX] orbs",
+        specialName: "[STR] Slot Change [DEX]"
+    },
+    124: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    125: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight"
+    },
+    126: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    127: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher"
+    },
+    128: {
+        special: "Changes [QCK] orbs into [DEX] orbs",
+        specialName: "[QCK] Slot Change [DEX]"
+    },
+    129: {
+        special: "Changes [INT] orbs into [PSY] orbs",
+        specialName: "[INT] Slot Change [PSY]"
+    },
+    130: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    131: {
+        special: "Changes [RCV] orbs into [STR] orbs",
+        specialName: "[RCV] Slot Change [STR]"
+    },
+    132: {
+        special: "Changes [DEX] orbs into [QCK] orbs",
+        specialName: "[DEX] Slot Change [QCK]"
+    },
+    133: {
+        special: "Changes [QCK] orbs into [DEX] orbs",
+        specialName: "[QCK] Slot Change [DEX]"
+    },
+    134: {
+        special: "Changes [QCK] orbs into [RCV] orbs",
+        specialName: "[QCK] Slot Change [RCV]"
+    },
+    135: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Spiral"
+    },
+    136: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    137: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher"
+    },
+    138: {
+        special: "Changes [DEX] orbs into [RCV] orbs",
+        specialName: "[DEX] Slot Change [RCV]"
+    },
+    139: {
+        special: "Changes [PSY] orbs into [RCV] orbs",
+        specialName: "[PSY] Slot Change [RCV]"
+    },
+    140: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    141: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    142: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight"
+    },
+    143: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    144: {
+        special: "Changes [STR] orbs into [DEX] orbs",
+        specialName: "[STR] Slot Change [DEX]"
+    },
+    145: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    146: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight"
+    },
+    147: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    148: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher"
+    },
+    149: {
+        special: "Changes [QCK] orbs into [DEX] orbs",
+        specialName: "[QCK] Slot Change [DEX]"
+    },
+    150: {
+        special: "Changes [INT] orbs into [PSY] orbs",
+        specialName: "[INT] Slot Change [PSY]"
+    },
+    151: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    152: {
+        special: "Changes [RCV] orbs into [STR] orbs",
+        specialName: "[RCV] Slot Change [STR]"
+    },
+    153: {
+        special: "Changes [DEX] orbs into [QCK] orbs",
+        specialName: "[DEX] Slot Change [QCK]"
+    },
+    154: {
+        special: "Changes [QCK] orbs into [DEX] orbs",
+        specialName: "[QCK] Slot Change [DEX]"
+    },
+    155: {
+        special: "Changes [QCK] orbs into [RCV] orbs",
+        specialName: "[QCK] Slot Change [RCV]"
+    },
+    156: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Spiral"
+    },
+    157: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    158: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher"
+    },
+    159: {
+        special: "Changes [DEX] orbs into [RCV] orbs",
+        specialName: "[DEX] Slot Change [RCV]"
+    },
+    160: {
+        special: "Changes [PSY] orbs into [RCV] orbs",
+        specialName: "[PSY] Slot Change [RCV]"
+    },
+    161: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    162: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    163: {
+        special: "Changes [DEX] orbs into [TND] orbs",
+        specialName: "[DEX] Slot Change [TND]"
+    },
+    164: {
+        special: "Changes [QCK] orbs into [TND] orbs",
+        specialName: "[QCK] Slot Change [TND]"
+    },
+    165: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    166: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    167: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    168: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    169: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    170: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    171: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    172: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    173: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    174: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    175: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight"
+    },
+    176: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    177: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Spiral"
+    },
+    178: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    179: {
+        special: "Changes [QCK] orbs into [STR] orbs",
+        specialName: "[QCK] Slot Change [STR]"
+    },
+    180: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    181: {
+        special: "Changes [STR] orbs into [QCK] orbs",
+        specialName: "[STR] Slot Change [QCK]"
+    },
+    182: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    183: {
+        special: "Changes [RCV] orbs into [INT] orbs",
+        specialName: "[RCV] Slot Change [INT]"
+    },
+    184: {
+        special: "Changes [QCK] orbs into [STR] orbs",
+        specialName: "[QCK] Slot Change [STR]"
+    },
+    185: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    186: {
+        special: "Changes [STR] orbs into [QCK] orbs",
+        specialName: "[STR] Slot Change [QCK]"
+    },
+    187: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    188: {
+        special: "Changes [RCV] orbs into [INT] orbs",
+        specialName: "[RCV] Slot Change [INT]"
+    },
+    194: {
+        special: "Changes [QCK] orbs into [STR] orbs",
+        specialName: "[QCK] Slot Change [STR]",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    195: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing",
+        captain: "Boosts RCV of DEX characters by 1.5x"
+    },
+    196: {
+        special: "Changes [STR] orbs into [QCK] orbs",
+        specialName: "[STR] Slot Change [QCK]",
+        captain: "Boosts ATK of QCK characters by 1.5x"
+    },
+    197: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing",
+        captain: "Reduces damage received from PSY enemies by 20%"
+    },
+    198: {
+        special: "Changes [RCV] orbs into [INT] orbs",
+        specialName: "[RCV] Slot Change [INT]",
+        captain: "Boosts ATK of Shooter characters by 1.5x"
+    },
+    199: {
+        special: "Deals 15x character's ATK in STR damage to one enemy",
+        specialName: "Nez-Palm Cannon",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    200: {
+        special: "Deals 20x character's ATK in STR damage to one enemy",
+        specialName: "Breeze Breath Bomb",
+        captain: "Boosts ATK of STR characters by 2x"
+    },
+    201: {
+        captain: "Boosts HP of Fighter characters by 1.5x"
+    },
+    202: {
+        special: "Changes [RCV] orbs into [QCK] orbs",
+        specialName: "10,000 Kill-O-Guillotine",
+        captain: "Boosts HP of Fighter characters by 2x"
+    },
+    203: {
+        captain: "Reduces damage received from INT enemies by 10%"
+    },
+    204: {
+        special: "Delays all enemies for 1 turn",
+        specialName: "Extra Special Candelabra",
+        captain: "Reduces damage received from INT enemies by 10%"
+    },
+    205: {
+        captain: "Boosts HP and RCV of DEX characters by 1.2x"
+    },
+    206: {
+        special: "Reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Colors Trap: Calming Green",
+        captain: "Boosts HP and RCV of DEX characters by 1.2x"
+    },
+    207: {
+        captain: "Reduces damage received from PSY enemies by 10%"
+    },
+    208: {
+        special: "Changes [RCV] orbs into [PSY] orbs",
+        specialName: "Bombardier Arabesque",
+        captain: "Reduces damage received from PSY enemies by 20%"
+    },
+    209: {
+        special: "Boosts ATK of INT characters by 1.5x for 1 turn",
+        specialName: "Dieciseis Fleur",
+        captain: "Boosts RCV of INT characters by 1.5x"
+    },
+    210: {
+        special: "Boosts ATK of INT characters by 2x for 1 turn",
+        specialName: "Cien Fleur",
+        captain: "Boosts RCV of INT characters by 2x"
+    },
+    211: {
+        captain: "Boosts ATK of Striker characters by 1.2x"
+    },
+    212: {
+        special: "Deals 5x character's ATK in QCK damage to one enemy",
+        specialName: "Hot Blooded Bat",
+        captain: "Boosts ATK of Striker characters by 1.5x"
+    },
+    213: {
+        special: "Deals 20x character's ATK in STR damage to all enemies",
+        specialName: "Sorrowful Charge",
+        captain: "Protects from defeat as long as HP is above 50%",
+        captainNotes: "#{zombie}"
+    },
+    214: {
+        special: "Deals 20x character's ATK in STR damage to all enemies",
+        specialName: "Sorrowful Charge",
+        captain: "Protects from defeat as long as HP is above 50%",
+        captainNotes: "#{zombie}"
+    },
+    215: {
+        special: "Poisons all enemies",
+        specialNotes: "#{poison}",
+        specialName: "Poison Ink",
+        captain: "Boosts HP of Striker characters by 1.5x"
+    },
+    216: {
+        special: "Reduces damage received by 50% for 3 turns",
+        specialName: "Gum-Gum Balloon",
+        captain: "Reduces damage received by 20%"
+    },
+    217: {
+        special: "Deals 15x character's ATK in STR damage to all enemies",
+        specialName: "Gum-Gum Giant Rifle",
+        captain: "Boosts ATK by 3.5x after scoring 3 Perfects in a row"
+    },
+    218: {
+        special: "Reduces damage received from STR enemies by 100% for 1 turn",
+        specialName: "Streaming Wolf Swords",
+        captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+    },
+    219: {
+        special: "Deals 25x character's ATK in DEX damage to one enemy",
+        specialName: "Lion's Song",
+        captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn"
+    },
+    220: {
+        special: "Changes [PSY] orbs into [INT] orbs",
+        specialName: "Fine Tempo",
+        captain: "Boosts ATK of INT characters by 2x"
+    },
+    221: {
+        special: "Changes [PSY] orbs into [INT] orbs",
+        specialName: "Happiness Punch",
+        captain: "Boosts ATK of INT characters by 2.5x"
+    },
+    222: {
+        special: "Boosts ATK of PSY characters by 1.5x for 1 turn",
+        specialName: "Usopp Hammer",
+        captain: "Boosts ATK of PSY characters by 1.2x"
+    },
+    223: {
+        special: "Boosts ATK of PSY characters by 2x for 1 turn",
+        specialName: "Impact",
+        captain: "Boosts ATK of PSY characters by 1.5x"
+    },
+    224: {
+        special: "Deals 15x character's ATK in QCK damage to one enemy",
+        specialName: "Mutton Shot",
+        captain: "Boosts ATK by 2x after scoring 2 Perfects in a row"
+    },
+    225: {
+        special: "Deals 20x character's ATK in QCK damage to one enemy",
+        specialName: "Veau Shot",
+        captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row"
+    },
+    226: {
+        special: "Cuts the current HP of each enemy by 30%",
+        specialName: "Black Blade Ship Cutter",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    227: {
+        special: "Cuts the current HP of each enemy by 30%",
+        specialName: "Black Blade Ship Cutter",
+        captain: "Boosts ATK of Slasher characters by 2.5x"
+    },
+    228: {
+        special: "Reduces Bind duration by 2 turns",
+        specialName: "Escapee Axe-Hand",
+        captain: "Boosts HP of Slasher characters by 1.5x"
+    },
+    229: {
+        special: "Changes [INT] orbs into [PSY] orbs",
+        specialName: "Double Cross Dance",
+        captain: "Reduces damage received by 10%"
+    },
+    230: {
+        special: "Deals 200 fixed damage to one enemy",
+        specialName: "Double Hyper Straight",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    231: {
+        special: "Locks all orbs for 1 turn",
+        specialName: "Kimono Sleeve Cage",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    232: {
+        special: "Locks all orbs for 1 turn",
+        specialName: "Kimono Sleeve Cage",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    233: {
+        captain: "Boosts HP of PSY characters by 1.5x"
+    },
+    234: {
+        special: "Deals 5x character's ATK in PSY damage to all enemies",
+        specialName: "Igarappapa",
+        captain: "Boosts HP of PSY characters by 2x"
+    },
+    235: {
+        captain: "Boosts ATK of Fighter characters by 1.2x"
+    },
+    236: {
+        special: "Deals 20x character's ATK in STR damage to one enemy",
+        specialName: "Superhuman Brass Knuckles",
+        captain: "Boosts ATK of Fighter characters by 1.5x"
+    },
+    237: {
+        special: "Changes [DEX] orbs into [STR] orbs",
+        specialName: "[DEX] Slot Change [STR]"
+    },
+    238: {
+        special: "Changes [TND] orbs into [DEX] orbs",
+        specialName: "[TND] Slot Change [DEX]"
+    },
+    239: {
+        special: "Changes [TND] orbs into [QCK] orbs",
+        specialName: "[TND] Slot Change [QCK]"
+    },
+    240: {
+        special: "Changes [STR] orbs into [PSY] orbs",
+        specialName: "[STR] Slot Change [PSY]"
+    },
+    241: {
+        special: "Changes [QCK] orbs into [INT] orbs",
+        specialName: "[QCK] Slot Change [INT]"
+    },
+    242: {
+        special: "Changes [DEX] orbs into [STR] orbs",
+        specialName: "[DEX] Slot Change [STR]"
+    },
+    243: {
+        special: "Changes [TND] orbs into [DEX] orbs",
+        specialName: "[TND] Slot Change [DEX]"
+    },
+    244: {
+        special: "Changes [TND] orbs into [QCK] orbs",
+        specialName: "[TND] Slot Change [QCK]"
+    },
+    245: {
+        special: "Changes [STR] orbs into [PSY] orbs",
+        specialName: "[STR] Slot Change [PSY]"
+    },
+    246: {
+        special: "Changes [QCK] orbs into [INT] orbs",
+        specialName: "[QCK] Slot Change [INT]"
+    },
+    247: {
+        special: "Recovers 1,224 HP",
+        specialName: "Kyuun Spark",
+        captain: "Reduces damage received by 10%"
+    },
+    248: {
+        special: "Deals random STR damage to one enemy",
+        specialName: "Rampage",
+        specialNotes: "#{random : 2,000 : 200,000}",
+        captain: "Boosts ATK of STR characters by 2.5x and reduces their HP by 60%"
+    },
+    249: {
+        special: "Deals random STR damage to one enemy",
+        specialName: "Rampage",
+        specialNotes: "#{random : 2,000 : 200,000}",
+        captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%"
+    },
+    250: {
+        special: "Recovers all HP",
+        specialName: "Blue Flame Rebirth",
+        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
+    },
+    251: {
+        special: "Recovers all HP",
+        specialName: "Blue Flame Rebirth",
+        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
+    },
+    252: {
+        special: "Reduces damage received from DEX enemies by 100% for 1 turn",
+        specialName: "Brilliant Punk",
+        captain: "Boosts ATK and HP of QCK characters by 2x"
+    },
+    253: {
+        special: "Reduces damage received from DEX enemies by 100% for 1 turn",
+        specialName: "Brilliant Punk",
+        captain: "Boosts ATK and HP of QCK characters by 2x"
+    },
+    254: {
+        special: "Deals 5,000 fixed damage to all enemies",
+        specialName: "Rose Rondo",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK and HP of INT characters by 2x"
+    },
+    255: {
+        special: "Deals 5,000 fixed damage to all enemies",
+        specialName: "Rose Rondo",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK and HP of INT characters by 2x"
+    },
+    256: {
+        special: "Changes [STR] and [QCK] orbs into [DEX] orbs",
+        specialName: "Beautiful Dual Flintlocks",
+        captain: "Boosts ATK and RCV of DEX characters by 2x"
+    },
+    257: {
+        special: "Changes [STR] and [QCK] orbs into [DEX] orbs",
+        specialName: "Beautiful Dual Flintlocks",
+        captain: "Boosts ATK and RCV of DEX characters by 2x"
+    },
+    258: {
+        special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
+        specialName: "Pocket Mallet",
+        captain: "Boosts ATK and RCV of STR characters by 2x"
+    },
+    259: {
+        special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
+        specialName: "Pocket Mallet",
+        captain: "Boosts ATK and RCV of STR characters by 2x"
+    },
+    260: {
+        special: "Cuts the current HP of each enemy by 30%",
+        specialName: "Seaquake",
+        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn"
+    },
+    261: {
+        special: "Cuts the current HP of each enemy by 30%",
+        specialName: "Seaquake",
+        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn"
+    },
+    262: {
+        captain: "Recovers 2x character's RCV in HP at the end of each turn"
+    },
+    263: {
+        special: "Amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Shave",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    264: {
+        captain: "Reduces damage received from INT enemies by 30%"
+    },
+    265: {
+        special: "Reduces Bind duration by 3 turns",
+        specialName: "Tempered Kukris",
+        captain: "Boosts ATK and HP of Slasher characters by 1.5x"
+    },
+    267: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher",
+        captain: "Boosts ATK of all characters by 1.5x"
+    },
+    268: {
+        special: "Reduces damage received by 50% for 3 turns",
+        specialName: "White Out",
+        captain: "Reduces damage received by 25%"
+    },
+    269: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight"
+    },
+    270: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    271: {
+        special: "Changes [STR] orbs into [DEX] orbs",
+        specialName: "[STR] Slot Change [DEX]"
+    },
+    272: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    273: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight"
+    },
+    274: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    275: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher"
+    },
+    276: {
+        special: "Changes [QCK] orbs into [DEX] orbs",
+        specialName: "[QCK] Slot Change [DEX]"
+    },
+    277: {
+        special: "Changes [INT] orbs into [PSY] orbs",
+        specialName: "[INT] Slot Change [PSY]"
+    },
+    278: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Slash"
+    },
+    279: {
+        special: "Changes [RCV] orbs into [STR] orbs",
+        specialName: "[RCV] Slot Change [STR]"
+    },
+    280: {
+        special: "Changes [DEX] orbs into [QCK] orbs",
+        specialName: "[DEX] Slot Change [QCK]"
+    },
+    281: {
+        special: "Changes [QCK] orbs into [DEX] orbs",
+        specialName: "[QCK] Slot Change [DEX]"
+    },
+    282: {
+        special: "Changes [QCK] orbs into [RCV] orbs",
+        specialName: "[QCK] Slot Change [RCV]"
+    },
+    283: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Spiral"
+    },
+    284: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    285: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher"
+    },
+    286: {
+        special: "Changes [DEX] orbs into [RCV] orbs",
+        specialName: "[DEX] Slot Change [RCV]"
+    },
+    287: {
+        special: "Changes [PSY] orbs into [RCV] orbs",
+        specialName: "[PSY] Slot Change [RCV]"
+    },
+    288: {
+        special: "Deals 5x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Shot"
+    },
+    289: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    290: {
+        special: "Deals 25x character's ATK in INT damage to one enemy",
+        specialName: "Judgment Bomb",
+        captain: "Boosts ATK of Shooter characters by 1.5x"
+    },
+    291: {
+        special: "Changes adjacent orbs into [RCV] orbs",
+        specialName: "[RCV] Slot Storm",
+        captain: "Reduces damage received from INT enemies by 50%"
+    },
+    292: {
+        special: "Changes adjacent orbs into [RCV] orbs",
+        specialName: "[RCV] Slot Storm",
+        captain: "Reduces damage received from PSY enemies by 50%"
+    },
+    293: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield",
+        captain: "Boosts HP of QCK characters by 2x"
+    },
+    294: {
+        special: "Deals 10x character's ATK in character's type damage to one enemy",
+        specialName: "Hyper Straight",
+        captain: "Boosts HP of STR characters by 2x"
+    },
+    295: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher",
+        captain: "Boosts HP of DEX characters by 2x"
+    },
+    296: {
+        special: "Recovers 2,000 HP, randomizes all orbs",
+        specialName: "Cleansing Wash",
+        captain: "Boosts ATK of Shooter characters by 2x"
+    },
+    297: {
+        special: "Recovers 2,000 HP, randomizes all orbs",
+        specialName: "Cleansing Wash",
+        captain: "Boosts ATK of Shooter characters by 2x"
+    },
+    298: {
+        special: "Deals 25x character's ATK in PSY damage to one enemy",
+        specialName: "Moonwalk",
+        captain: "Boosts HP of PSY characters by 2x"
+    },
+    299: {
+        special: "Cuts the current HP of each enemy by 10%",
+        specialName: "8-Sword Style Onigumo",
+        captain: "Boosts ATK of DEX characters by 2x"
+    },
+    305: {
+        special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
+        specialName: "Meteor Fist Shower",
+        captain: "Boosts ATK and HP of PSY characters by 1.5x"
+    },
+    306: {
+        special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
+        specialName: "Meteor Fist Shower",
+        captain: "Boosts ATK and HP of PSY characters by 2x"
+    },
+    307: {
+        special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
+        specialName: "ROOM – Chambres",
+        captain: "Boosts ATK of DEX characters by 2.5x"
+    },
+    308: {
+        special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
+        specialName: "ROOM – Chambres",
+        captain: "Boosts ATK of DEX characters by 2.5x"
+    },
+    309: {
+        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% for 3 turns",
+        specialName: "Demon Face",
+        captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%"
+    },
+    310: {
+        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% for 3 turns",
+        specialName: "Demon Face",
+        captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%"
+    },
+    311: {
+        special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
+        specialName: "Massacre Soldier",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
         sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
-	},
-	312: {
-		special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
-		specialName: "Massacre Soldier",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
+    },
+    312: {
+        special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
+        specialName: "Massacre Soldier",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
         sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
-	},
-	313: {
-		special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
-		specialName: "Karmic Punishment",
-		captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x"
-	},
-	314: {
-		special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
-		specialName: "Karmic Punishment",
-		captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x"
-	},
-	315: {
-		special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
-		specialName: "Aye Aye, Captain!",
-		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
+    },
+    313: {
+        special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
+        specialName: "Karmic Punishment",
+        captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x"
+    },
+    314: {
+        special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
+        specialName: "Karmic Punishment",
+        captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x"
+    },
+    315: {
+        special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
+        specialName: "Aye Aye, Captain!",
+        captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
         sailor: "Reduces Paralysis for 2 turns for himself"
-	},
-	316: {
-		special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
-		specialName: "Aye Aye, Captain!",
-		captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
+    },
+    316: {
+        special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
+        specialName: "Aye Aye, Captain!",
+        captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
         sailor: "Reduces Paralysis for 2 turns for himself"
-	},
-	317: {
-		special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
-		specialName: "Beautiful Secretary's Job",
-		specialNotes: "#{random : 1 : 15,000}",
-		captain: "Recovers 500 HP at end of turn, reduces damage received by 10%"
-	},
-	318: {
-		special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
-		specialName: "Beautiful Secretary's Job",
-		specialNotes: "#{random : 1 : 15,000}",
-		captain: "Recovers 1,000 HP at end of turn, reduces damage received by 15%"
-	},
-	319: {
-		special: "Locks all orbs for 1 turn",
-		specialName: "Hook, Line, and Sinker",
-		captain: "Boosts ATK of Striker characters by 1.5x"
-	},
-	320: {
-		special: "Locks all orbs for 1 turn",
-		specialName: "Hook, Line, and Sinker",
-		captain: "Boosts ATK of Striker characters by 2x"
-	},
-	321: {
-		special: "Deals 25x character's ATK in QCK damage to one enemy",
-		specialName: "Taciturn Combo",
-		captain: "Boosts ATK of QCK type characters by 2x"
-	},
-	322: {
-		special: "Deals 25x character's ATK in QCK damage to one enemy",
-		specialName: "Taciturn Combo",
-		captain: "Boosts ATK of QCK type characters by 2x"
-	},
-	323: {
-		special: "Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Mountain Wind",
-		captain: "Boosts HP and RCV of QCK characters by 1.5x"
-	},
-	324: {
-		special: "Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Mountain Wind",
-		captain: "Boosts HP and RCV of QCK characters by 1.5x"
-	},
-	325: {
-		special: "Changes [TND] orbs into [RCV] orbs, changes [RCV] orbs into [QCK] orbs",
-		specialName: "Red-Hot Shipwright Soul"
-	},
-	326: {
-		special: "Empties all slots, deals 25x character's ATK in STR damage to one enemy",
-		specialName: "Munch-Munch Tongue Cannon",
-		captain: "Recovers 10x character's RCV in HP at the end of each turn"
-	},
-	327: {
-		special: "Empties all slots, deals 25x character's ATK in STR damage to one enemy",
-		specialName: "Munch-Munch Tongue Cannon",
-		captain: "Recovers 10x character's RCV in HP at the end of each turn"
-	},
-	328: {
-		special: "Deals 20x character's ATK in QCK damage to all enemies",
-		specialName: "Fiddle Banff",
-		captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
-	},
-	329: {
-		special: "Deals 20x character's ATK in QCK damage to all enemies",
-		specialName: "Fiddle Banff",
-		captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
-	},
-	332: {
-		special: "Changes [STR] orbs into [RCV] orbs, changes [RCV] orbs into [DEX] orbs",
-		specialName: "Snow-Slicing Blade",
-		captain: "Boosts ATK, HP and RCV of Striker characters by 1.2x"
-	},
-	333: {
-		special: "Recovers a random amount of HP",
-		specialName: "Doctor Stop",
-		captain: "Boosts ATK and RCV of PSY and INT characters by 1.5x"
-	},
-	334: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	335: {
-		special: "Recovers 5x character's RCV in HP",
-		specialName: "Light Healing"
-	},
-	336: {
-		special: "Switches orbs between slots twice",
-		specialName: "Franky Centaur",
-		captain: "Reduces damage received by 10% if HP is above 50% at the start of the turn, boosts ATK of PSY characters by 2x and reduces ATK of every other character by 20% if HP is above 50% at the start of the turn"
-	},
-	337: {
-		special: "Switches orbs between slots twice",
-		specialName: "Franky Centaur",
-		captain: "Reduces damage received by 10% if HP is above 50% at the start of the turn, boosts ATK of PSY characters by 2.5x and reduces ATK of every other character by 20% if HP is above 50% at the start of the turn"
-	},
-	338: {
-		special: "Changes [QCK] orbs into [PSY] orbs",
-		specialName: "Wavy Square Hair"
-	},
-	339: {
-		special: "Changes [INT] orbs into [TND] orbs",
-		specialName: "Straight Square Hair"
-	},
-	340: {
-		special: "Randomly changes all orbs into either [STR] or [QCK] orbs, deals random STR damage to all enemies",
-		specialName: "Kraken Tentacle Crush",
-		specialNotes: "#{random : 1 : 15,000}",
-		captain: "Boosts ATK of Striker characters by 2x"
-	},
-	341: {
-		special: "Randomly changes all orbs into either [STR] or [QCK] orbs, deals random STR damage to all enemies",
-		specialName: "Kraken Tentacle Crush",
-		specialNotes: "#{random : 1 : 15,000}",
-		captain: "Boosts ATK of Striker characters by 2x"
-	},
-	352: {
-		special: "Boosts ATK of Shooter characters by 1.75x for 2 turns",
-		specialName: "Smash Buster",
-		captain: "Boosts ATK of Shooter characters by 2x"
-	},
-	353: {
-		special: "Boosts ATK of Shooter characters by 1.75x for 2 turns",
-		specialName: "Smash Buster",
-		captain: "Boosts ATK of Shooter characters by 2.5x"
-	},
-	354: {
-		special: "Reduces Bind and Despair duration by 3 turns",
-		specialName: "Two-Sword Dance"
-	},
-	355: {
-		special: "Reduces Bind and Despair duration by 3 turns",
-		specialName: "Two-Sword Dance"
-	},
-	356: {
-		special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
-		specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
-		specialName: "Steel Magnetic Arm",
-		captain: "Boosts ATK of Striker characters by 2x"
-	},
-	357: {
-		special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
-		specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
-		specialName: "Steel Magnetic Arm",
-		captain: "Boosts ATK of Striker characters by 2.5x"
-	},
-	358: {
-		special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
-		specialName: "Scratch Body",
-		captain: "Boosts ATK of DEX characters by 2.5x if HP is above 99% at the start of the turn",
-		specialNotes: "#{random : 5,000 : 20,000}"
-	},
-	359: {
-		special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
-		specialName: "Scratch Body",
-		specialNotes: "#{random : 5,000 : 20,000}",
-		captain: "Boosts ATK of DEX characters by 3x if HP is above 99% at the start of the turn"
-	},
-	360: {
-		special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Prehistoric Power",
-		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
+    },
+    317: {
+        special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
+        specialName: "Beautiful Secretary's Job",
+        specialNotes: "#{random : 1 : 15,000}",
+        captain: "Recovers 500 HP at end of turn, reduces damage received by 10%"
+    },
+    318: {
+        special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
+        specialName: "Beautiful Secretary's Job",
+        specialNotes: "#{random : 1 : 15,000}",
+        captain: "Recovers 1,000 HP at end of turn, reduces damage received by 15%"
+    },
+    319: {
+        special: "Locks all orbs for 1 turn",
+        specialName: "Hook, Line, and Sinker",
+        captain: "Boosts ATK of Striker characters by 1.5x"
+    },
+    320: {
+        special: "Locks all orbs for 1 turn",
+        specialName: "Hook, Line, and Sinker",
+        captain: "Boosts ATK of Striker characters by 2x"
+    },
+    321: {
+        special: "Deals 25x character's ATK in QCK damage to one enemy",
+        specialName: "Taciturn Combo",
+        captain: "Boosts ATK of QCK type characters by 2x"
+    },
+    322: {
+        special: "Deals 25x character's ATK in QCK damage to one enemy",
+        specialName: "Taciturn Combo",
+        captain: "Boosts ATK of QCK type characters by 2x"
+    },
+    323: {
+        special: "Amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Mountain Wind",
+        captain: "Boosts HP and RCV of QCK characters by 1.5x"
+    },
+    324: {
+        special: "Amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Mountain Wind",
+        captain: "Boosts HP and RCV of QCK characters by 1.5x"
+    },
+    325: {
+        special: "Changes [TND] orbs into [RCV] orbs, changes [RCV] orbs into [QCK] orbs",
+        specialName: "Red-Hot Shipwright Soul"
+    },
+    326: {
+        special: "Empties all slots, deals 25x character's ATK in STR damage to one enemy",
+        specialName: "Munch-Munch Tongue Cannon",
+        captain: "Recovers 10x character's RCV in HP at the end of each turn"
+    },
+    327: {
+        special: "Empties all slots, deals 25x character's ATK in STR damage to one enemy",
+        specialName: "Munch-Munch Tongue Cannon",
+        captain: "Recovers 10x character's RCV in HP at the end of each turn"
+    },
+    328: {
+        special: "Deals 20x character's ATK in QCK damage to all enemies",
+        specialName: "Fiddle Banff",
+        captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
+    },
+    329: {
+        special: "Deals 20x character's ATK in QCK damage to all enemies",
+        specialName: "Fiddle Banff",
+        captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
+    },
+    332: {
+        special: "Changes [STR] orbs into [RCV] orbs, changes [RCV] orbs into [DEX] orbs",
+        specialName: "Snow-Slicing Blade",
+        captain: "Boosts ATK, HP and RCV of Striker characters by 1.2x"
+    },
+    333: {
+        special: "Recovers a random amount of HP",
+        specialName: "Doctor Stop",
+        captain: "Boosts ATK and RCV of PSY and INT characters by 1.5x"
+    },
+    334: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    335: {
+        special: "Recovers 5x character's RCV in HP",
+        specialName: "Light Healing"
+    },
+    336: {
+        special: "Switches orbs between slots twice",
+        specialName: "Franky Centaur",
+        captain: "Reduces damage received by 10% if HP is above 50% at the start of the turn, boosts ATK of PSY characters by 2x and reduces ATK of every other character by 20% if HP is above 50% at the start of the turn"
+    },
+    337: {
+        special: "Switches orbs between slots twice",
+        specialName: "Franky Centaur",
+        captain: "Reduces damage received by 10% if HP is above 50% at the start of the turn, boosts ATK of PSY characters by 2.5x and reduces ATK of every other character by 20% if HP is above 50% at the start of the turn"
+    },
+    338: {
+        special: "Changes [QCK] orbs into [PSY] orbs",
+        specialName: "Wavy Square Hair"
+    },
+    339: {
+        special: "Changes [INT] orbs into [TND] orbs",
+        specialName: "Straight Square Hair"
+    },
+    340: {
+        special: "Randomly changes all orbs into either [STR] or [QCK] orbs, deals random STR damage to all enemies",
+        specialName: "Kraken Tentacle Crush",
+        specialNotes: "#{random : 1 : 15,000}",
+        captain: "Boosts ATK of Striker characters by 2x"
+    },
+    341: {
+        special: "Randomly changes all orbs into either [STR] or [QCK] orbs, deals random STR damage to all enemies",
+        specialName: "Kraken Tentacle Crush",
+        specialNotes: "#{random : 1 : 15,000}",
+        captain: "Boosts ATK of Striker characters by 2x"
+    },
+    352: {
+        special: "Boosts ATK of Shooter characters by 1.75x for 2 turns",
+        specialName: "Smash Buster",
+        captain: "Boosts ATK of Shooter characters by 2x"
+    },
+    353: {
+        special: "Boosts ATK of Shooter characters by 1.75x for 2 turns",
+        specialName: "Smash Buster",
+        captain: "Boosts ATK of Shooter characters by 2.5x"
+    },
+    354: {
+        special: "Reduces Bind and Despair duration by 3 turns",
+        specialName: "Two-Sword Dance"
+    },
+    355: {
+        special: "Reduces Bind and Despair duration by 3 turns",
+        specialName: "Two-Sword Dance"
+    },
+    356: {
+        special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
+        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
+        specialName: "Steel Magnetic Arm",
+        captain: "Boosts ATK of Striker characters by 2x"
+    },
+    357: {
+        special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
+        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
+        specialName: "Steel Magnetic Arm",
+        captain: "Boosts ATK of Striker characters by 2.5x"
+    },
+    358: {
+        special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
+        specialName: "Scratch Body",
+        captain: "Boosts ATK of DEX characters by 2.5x if HP is above 99% at the start of the turn",
+        specialNotes: "#{random : 5,000 : 20,000}"
+    },
+    359: {
+        special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
+        specialName: "Scratch Body",
+        specialNotes: "#{random : 5,000 : 20,000}",
+        captain: "Boosts ATK of DEX characters by 3x if HP is above 99% at the start of the turn"
+    },
+    360: {
+        special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Prehistoric Power",
+        specialNotes: "#{zombie}",
+        captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Boosts HP of Powerhouse characters by 100"
-	},
-	361: {
-		special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Prehistoric Power",
-		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
+    },
+    361: {
+        special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Prehistoric Power",
+        specialNotes: "#{zombie}",
+        captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Boosts HP of Powerhouse characters by 100"
-	},
-	362: {
-		special: "For 2 turns, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
-		specialName: "Big Eater",
-		captain: "Boosts ATK and RCV of PSY characters by 2x"
-	},
-	363: {
-		special: "For 2 turns, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
-		specialName: "Big Eater",
-		captain: "Boosts ATK and RCV of PSY characters by 2x"
-	},
-	364: {
-		special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
-		specialName: "Gang Fortress",
-		captain: "Boosts ATK and RCV of QCK characters by 2x",
+    },
+    362: {
+        special: "For 2 turns, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
+        specialName: "Big Eater",
+        captain: "Boosts ATK and RCV of PSY characters by 2x"
+    },
+    363: {
+        special: "For 2 turns, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
+        specialName: "Big Eater",
+        captain: "Boosts ATK and RCV of PSY characters by 2x"
+    },
+    364: {
+        special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
+        specialName: "Gang Fortress",
+        captain: "Boosts ATK and RCV of QCK characters by 2x",
         sailor: "Boosts RCV of Crew by 10"
-	},
-	365: {
-		special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
-		specialName: "Gang Fortress",
-		captain: "Boosts ATK and RCV of QCK characters by 2x",
+    },
+    365: {
+        special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
+        specialName: "Gang Fortress",
+        captain: "Boosts ATK and RCV of QCK characters by 2x",
         sailor: "Boosts RCV of Crew by 10"
-	},
-	366: {
-		special: "Deals 20x character's ATK in INT damage to all enemies, reduces Bind duration by 5 turns",
-		specialName: "Dark King's Aura",
-		captain: "Boosts chain multiplier by 4x"
-	},
-	367: {
-		special: "Deals 20x character's ATK in INT damage to all enemies, reduces Bind duration by 5 turns",
-		specialName: "Dark King's Aura",
-		captain: "Boosts chain multiplier by 4x"
-	},
-	368: {
-		special: "Reduces damage received from DEX enemies by 50% for 1 turn",
-		specialName: "Crystal Shield DEX"
-	},
-	369: {
-		special: "Reduces damage received from STR enemies by 50% for 1 turn",
-		specialName: "Crystal Shield STR"
-	},
-	370: {
-		special: "Reduces damage received from QCK enemies by 50% for 1 turn",
-		specialName: "Crystal Shield QCK"
-	},
-	371: {
-		special: "Reduces damage received from INT enemies by 50% for 1 turn",
-		specialName: "Crystal Shield INT"
-	},
-	372: {
-		special: "Reduces damage received from PSY enemies by 50% for 1 turn",
-		specialName: "Crystal Shield PSY"
-	},
-	373: {
-		special: "Reduces damage received from DEX enemies by 50% for 1 turn",
-		specialName: "Crystal Shield DEX",
-		captain: "Boosts ATK of Slasher characters by 1.5x"
-	},
-	374: {
-		special: "Reduces damage received from STR enemies by 50% for 1 turn",
-		specialName: "Crystal Shield STR",
-		captain: "Boosts ATK of Shooter characters by 1.5x"
-	},
-	375: {
-		special: "Reduces damage received from QCK enemies by 50% for 1 turn",
-		specialName: "Crystal Shield QCK",
-		captain: "Boosts HP of Striker characters by 1.5x"
-	},
-	376: {
-		special: "Reduces damage received from INT enemies by 50% for 1 turn",
-		specialName: "Crystal Shield INT",
-		captain: "Boosts ATK of Fighter characters by 1.5x"
-	},
-	377: {
-		special: "Reduces damage received from PSY enemies by 50% for 1 turn",
-		specialName: "Crystal Shield PSY",
-		captain: "Boosts ATK of Striker characters by 1.5x"
-	},
-	378: {
-		special: "Recovers 3x character's RCV in HP",
-		specialName: "Quick Healing",
-		captain: "Boosts RCV of all characters by 1.5x"
-	},
-	379: {
-		special: "Removes poison",
-		specialName: "Dugong Kung Fu Fist of Healing"
-	},
-	380: {
-		special: "Removes poison",
-		specialName: "Dugong Kung Fu Fist of Healing",
-		captain: "Boosts ATK and RCV of STR characters by 1.5x"
-	},
-	381: {
-		special: "Reduces damage received by 20% for 1 turn",
-		specialName: "Iron Shield"
-	},
-	382: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Shield Crusher"
-	},
-	383: {
-		special: "Strongly poisons one enemy",
-		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
-		specialName: "Poison Needle",
-		captain: "Reduces damage received by 10%, boosts ATK of INT characters by 2x"
-	},
-	384: {
-		special: "Strongly poisons one enemy",
-		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
-		specialName: "Poison Needle",
-		captain: "Reduces damage received by 20%, boosts ATK of INT characters by 2x"
-	},
-	385: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Fighter characters by 1.25x for 1 turn",
-		specialName: "Zombie Marionette Operation",
-		captain: "Boosts ATK of INT characters by 2x"
-	},
-	386: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Fighter characters by 1.25x for 1 turn",
-		specialName: "Zombie Marionette Operation",
-		captain: "Boosts ATK of INT characters by 2x"
-	},
-	387: {
-		special: "Randomly changes all orbs into either [PSY] or [INT] orbs, deals random PSY damage to all enemies",
-		specialName: "Square Plate Sword",
-		specialNotes: "#{random : 1 : 10,000}",
-		captain: "Boosts RCV of PSY characters by 1.5x"
-	},
-	388: {
-		special: "Randomly changes all orbs into either [PSY] or [INT] orbs, deals random PSY damage to all enemies",
-		specialName: "Square Plate Sword",
-		specialNotes: "#{random : 1 : 10,000}",
-		captain: "Boosts RCV of PSY characters by 1.5x"
-	},
-	389: {
-		special: "Changes own orb into [QCK] and every other orb into either [RCV], [STR], [DEX] or [QCK] orbs",
-		specialName: "Hell Wink",
-		captain: "Boosts ATK by 2.25x following a chain of DEX > INT > QCK attacks no lower than Good"
-	},
-	390: {
-		special: "Changes own orb into [QCK] and every other orb into either [RCV], [STR], [DEX] or [QCK] orbs",
-		specialName: "Hell Wink",
-		captain: "Boosts ATK by 2.75x following a chain of DEX > INT > QCK attacks no lower than Good"
-	},
-	391: {
-		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
-		specialName: "Negative Hollow",
-		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
-		captain: "Boosts RCV of DEX characters by 1.5x"
-	},
-	392: {
-		special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
-		specialName: "Negative Hollow",
-		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
-		captain: "Boosts RCV of DEX characters by 2x"
-	},
-	393: {
-		special: "Deals 35x character's ATK in STR damage to one enemy",
-		specialName: "Kumacy Knuckle"
-	},
-	394: {
-		special: "Deals 500 fixed damage to all enemies",
-		specialName: "The Tempest Called Love",
-		specialNotes: "#{fixed}"
-	},
-	395: {
-		special: "Empties adjacent slots, amplifies the effect of orbs by 1.25x for 1 turn",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "Mole Banana",
-		captain: "Boosts ATK and RCV of QCK characters by 1.2x"
-	},
-	396: {
-		special: "Empties adjacent slots, amplifies the effect of orbs by 1.25x for 1 turn",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "Mole Banana",
-		captain: "Boosts ATK and RCV of QCK characters by 1.2x"
-	},
-	397: {
-		special: "Fills [EMPTY] orbs with [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
-		specialName: "Four Hundred Base Hits",
-		captain: "Boosts ATK by 3x after scoring 5 Perfects in a row"
-	},
-	398: {
-		special: "Fills [EMPTY] orbs with [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
-		specialName: "Four Hundred Base Hits",
-		captain: "Boosts ATK by 4x after scoring 5 Perfects in a row"
-	},
-	399: {
-		special: "Boosts ATK of DEX characters by 1.5x for 1 turn",
-		specialName: "Spike-U-Puncture",
-		captain: "Boosts HP of Striker characters by 1.5x"
-	},
-	400: {
-		special: "Boosts ATK of DEX characters by 1.5x for 1 turn",
-		specialName: "Spike-U-Puncture",
-		captain: "Boosts HP of Striker characters by 2x"
-	},
-	401: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Slasher characters by 1.25x for 1 turn",
-		specialName: "Iron Guard",
-		captain: "Reduces damage received by 10%, boosts ATK of Slasher characters by 1.5x"
-	},
-	402: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Slasher characters by 1.25x for 1 turn",
-		specialName: "Iron Guard",
-		captain: "Reduces damage received by 10%, boosts ATK of Slasher characters by 2x"
-	},
-	403: {
-		special: "Deals several times the character's ATK in QCK damage to all enemies",
-		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Backwater Sword Dance",
-		captain: "Reduces damage received by 50% if HP is low, boosts RCV of all characters by 3x if HP is low"
-	},
-	404: {
-		special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
-		specialName: "Clear-Clear Fruit",
-		captain: "Boosts ATK of Shooter characters by 1.5x"
-	},
-	405: {
-		special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
-		specialName: "Clear-Clear Fruit",
-		captain: "Boosts ATK of Shooter characters by 2x"
-	},
-	406: {
-		special: "Reduces crew's HP to 1, deals 1,000 fixed damage to all enemies, boosts ATK of all characters by 1.2x for 1 turn",
-		specialName: "Skills of the Ancient Warriors",
-		specialNotes: "#{fixed}"
-	},
-	407: {
-		special: "Randomizes all orbs, deals 7x character's ATK in DEX damage to all enemies",
-		specialName: "Zombie-Style 36-Pound Phoenix"
-	},
-	408: {
-		special: "Changes own orb into [INT] and randomizes every other orb, deals 15x character's ATK in INT damage to all enemies",
-		specialName: "Ground Death",
-		captain: "Reduces damage received by 20%, boosts ATK of Slasher characters by 2x"
-	},
-	409: {
-		special: "Changes own orb into [QCK], deals 13x character's ATK in QCK damage to one enemy",
-		specialName: "Ocean Current Shoulder Throw",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	410: {
-		special: "Changes own orb into [QCK], deals 13x character's ATK in QCK damage to one enemy",
-		specialName: "Ocean Current Shoulder Throw",
-		captain: "Boosts ATK of Fighter characters by 2.5x"
-	},
-	411: {
-		special: "Changes adjacent orbs into [STR] orbs, deals 1,000 fixed damage to all enemies",
-		specialName: "Ursa Shock",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK and HP of STR characters by 2x"
-	},
-	412: {
-		special: "Changes adjacent orbs into [STR] orbs, deals 1,000 fixed damage to all enemies",
-		specialName: "Ursa Shock",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK and HP of STR characters by 2x"
-	},
-	413: {
-		special: "Changes [STR] and [DEX] orbs into [INT] orbs",
-		specialName: "Doppelman",
-		captain: "Boosts ATK of INT characters by 2.5x if HP is above 99% at the start of the turn"
-	},
-	414: {
-		special: "Changes [STR] and [DEX] orbs into [INT] orbs",
-		specialName: "Doppelman",
-		captain: "Boosts ATK of INT characters by 3x if HP is above 99% at the start of the turn"
-	},
-	415: {
-		special: "Recovers 15x character's RCV in HP, delays all enemies for 1 turn",
-		specialName: "Love-Love Mellow",
-		captain: "Boosts ATK of QCK and PSY characters by 2.75x and their RCV by 1.5x if HP is above 70% at the start of the turn"
-	},
-	416: {
-		special: "Recovers 15x character's RCV in HP, delays all enemies for 1 turn",
-		specialName: "Love-Love Mellow",
-		captain: "Boosts ATK of QCK and PSY characters by 2.75x and their RCV by 1.5x if HP is above 70% at the start of the turn"
-	},
-	417: {
-		special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
-		specialNotes: "#{orb : 2x}",
-		specialName: "Overheat",
-		captain: "Boosts ATK of Slasher characters by 2x"
-	},
-	418: {
-		special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
-		specialNotes: "#{orb : 2x}",
-		specialName: "Overheat",
-		captain: "Boosts ATK and HP of Slasher characters by 2x"
-	},
-	419: {
-		special: "Reduces the defense of all enemies by 50% for 2 turns, randomizes all orbs",
-		specialName: "Parage Shot: The Storm",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	420: {
-		special: "Reduces Despair duration by 3 turns, deals 15x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Bazooka: Supremacy",
-		captain: "Boosts ATK, HP and RCV of STR characters by 1.5x"
-	},
-	421: {
-		special: "Reduces Bind duration by 2 turns, deals 10x character's ATK in DEX damage to all enemies",
-		specialName: "Three Thousand Worlds: The Final Stroke",
-		captain: "Boosts ATK, HP and RCV of DEX characters by 1.5x"
-	},
-	422: {
-		special: "Reduces damage received from INT enemies by 100% for 1 turn, recovers a random amount of HP",
-		specialName: "Mirage Tempo: The Heavens",
-		specialNotes: "Estimated healing range: between 1,000 HP and 3,000 HP.",
-		captain: "Boosts ATK, HP and RCV of INT characters by 1.5x"
-	},
-	423: {
-		special: "Recovers 4,343 HP, reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Lullaby Parry",
-		captain: "Protects from defeat as long as HP is above 70%",
-		captainNotes: "#{zombie}"
-	},
-	424: {
-		special: "Recovers 4,343 HP, reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Lullaby Parry",
-		captain: "Boosts ATK of the whole crew by 1.5x and protects from defeat as long as HP is above 70%",
-		captainNotes: "#{zombie}"
-	},
-	425: {
-		special: "Deals random PSY damage to all enemies",
-		specialName: "Shusui: Three Verse Arrow Notch Slash",
-		specialNotes: "#{random : 1 : 100,000}",
-		captain: "Boosts ATK and HP of Slasher characters by 1.5x"
-	},
-	426: {
-		special: "Boosts ATK of STR characters by 1.05x for 5 turns",
-		specialName: "Barco Grabber Breath",
-		captain: "Boosts HP of STR characters by 2x"
-	},
-	427: {
-		special: "Reduces Bind and Despair duration by 2 turns",
-		specialName: "Havoc Sonar",
-		captain: "Boosts HP of DEX characters by 2x"
-	},
-	428: {
-		special: "Reduces damage received by 50% for 2 turns",
-		specialName: "Last Boss – Deep Dive of Dreams",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	429: {
-		special: "Deals 7x character's ATK in DEX damage to all enemies, reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "South Bird's Fearless Smile"
-	},
-	430: {
-		special: "Amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Spring Hopper",
-		captain: "Boosts ATK of DEX characters by 1.5x"
-	},
-	431: {
-		special: "Amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Spring Hopper",
-		captain: "Boosts ATK and HP of DEX characters by 1.5x"
-	},
-	432: {
-		special: "Deals 20x character's ATK in QCK damage to one enemy",
-		specialName: "Big Chop"
-	},
-	433: {
-		special: "Reduces Bind and Despair duration by 1 turn",
-		specialName: "New Kama Seduction",
-		captain: "Boosts ATK by 2x following a chain of QCK > STR > DEX attacks no lower than Good"
-	},
-	434: {
-		special: "Amplifies the effect of orbs by 1.25x for 3 turns",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "New Kama Karate Maiden's Awakening",
-		captain: "Boosts ATK by 2x following a chain of PSY > INT > INT attacks no lower than Good"
-	},
-	435: {
-		special: "Randomly changes [RCV], [STR] and [DEX] orbs into either [STR] or [QCK] orbs",
-		specialName: "Maiden's Bloom",
-		captain: "Boosts ATK by 2x following a chain of INT > PSY > QCK attacks no lower than Good"
-	},
-	436: {
-		special: "Randomly changes [RCV], [STR] and [DEX] orbs into either [STR] or [QCK] orbs",
-		specialName: "Maiden's Bloom",
-		captain: "Boosts ATK by 2.25x following a chain of INT > PSY > QCK attacks no lower than Good"
-	},
-	437: {
-		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
-		specialName: "Negative Horo \"Sweet\"",
-		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
-		captain: "Boosts RCV of [DEX] characters by 3x if HP is below 30% at the start of the turn"
-	},
-	438: {
-		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
-		specialName: "Negative Horo \"Sweet\"",
-		specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
-		captain: "Boosts RCV of [DEX] characters by 5x if HP is below 30% at the start of the turn"
-	},
-	439: {
-		special: "Changes adjacent orbs into [RCV] and randomizes every other orb",
-		specialName: "Charge! Supersonic Duck Squadron! \"Love\"",
-		captain: "Recovers 5x character's RCV in HP at the end of each turn"
-	},
-	440: {
-		special: "Changes adjacent orbs into [RCV] and randomizes every other orb",
-		specialName: "Charge! Supersonic Duck Squadron! \"Love\"",
-		captain: "Recovers 7x character's RCV in HP at the end of each turn"
-	},
-	444: {
-		captain: "Boosts ATK of Evolver and Booster characters by 2x if HP is above 50% at the start of the turn"
-	},
-	445: {
-		special: "Randomly changes all orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs, switches orbs between slots 3 times",
-		specialName: "Support Incoming! Supersonic Duck Squadron!",
-		captain: "Boosts ATK of Evolver and Booster characters by 2.5x if HP is above 50% at the start of the turn"
-	},
-	446: {
-		special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
-		specialName: "Black Hole",
-		captain: "Doubles damage received, boosts ATK of STR characters by 2x and their HP by 1.5x"
-	},
-	447: {
-		special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
-		specialName: "Black Hole",
-		captain: "Doubles damage received, boosts ATK of STR characters by 2.5x and their HP by 2.25x"
-	},
-	448: {
-		special: "Boosts chances of getting [QCK] orbs for 3 turns",
-		specialName: "Pirate King's Sword",
-		captain: "Boosts ATK of QCK characters by 3x if HP is above 99% at the start of the turn"
-	},
-	449: {
-		special: "Boosts chances of getting [QCK] orbs for 3 turns",
-		specialName: "Pirate King's Sword",
-		captain: "Boosts ATK of QCK characters by 3x if HP is above 99% at the start of the turn"
-	},
-	450: {
-		special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
-		specialName: "Number Eight's One Hit",
-		captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
+    },
+    366: {
+        special: "Deals 20x character's ATK in INT damage to all enemies, reduces Bind duration by 5 turns",
+        specialName: "Dark King's Aura",
+        captain: "Boosts chain multiplier by 4x"
+    },
+    367: {
+        special: "Deals 20x character's ATK in INT damage to all enemies, reduces Bind duration by 5 turns",
+        specialName: "Dark King's Aura",
+        captain: "Boosts chain multiplier by 4x"
+    },
+    368: {
+        special: "Reduces damage received from DEX enemies by 50% for 1 turn",
+        specialName: "Crystal Shield DEX"
+    },
+    369: {
+        special: "Reduces damage received from STR enemies by 50% for 1 turn",
+        specialName: "Crystal Shield STR"
+    },
+    370: {
+        special: "Reduces damage received from QCK enemies by 50% for 1 turn",
+        specialName: "Crystal Shield QCK"
+    },
+    371: {
+        special: "Reduces damage received from INT enemies by 50% for 1 turn",
+        specialName: "Crystal Shield INT"
+    },
+    372: {
+        special: "Reduces damage received from PSY enemies by 50% for 1 turn",
+        specialName: "Crystal Shield PSY"
+    },
+    373: {
+        special: "Reduces damage received from DEX enemies by 50% for 1 turn",
+        specialName: "Crystal Shield DEX",
+        captain: "Boosts ATK of Slasher characters by 1.5x"
+    },
+    374: {
+        special: "Reduces damage received from STR enemies by 50% for 1 turn",
+        specialName: "Crystal Shield STR",
+        captain: "Boosts ATK of Shooter characters by 1.5x"
+    },
+    375: {
+        special: "Reduces damage received from QCK enemies by 50% for 1 turn",
+        specialName: "Crystal Shield QCK",
+        captain: "Boosts HP of Striker characters by 1.5x"
+    },
+    376: {
+        special: "Reduces damage received from INT enemies by 50% for 1 turn",
+        specialName: "Crystal Shield INT",
+        captain: "Boosts ATK of Fighter characters by 1.5x"
+    },
+    377: {
+        special: "Reduces damage received from PSY enemies by 50% for 1 turn",
+        specialName: "Crystal Shield PSY",
+        captain: "Boosts ATK of Striker characters by 1.5x"
+    },
+    378: {
+        special: "Recovers 3x character's RCV in HP",
+        specialName: "Quick Healing",
+        captain: "Boosts RCV of all characters by 1.5x"
+    },
+    379: {
+        special: "Removes poison",
+        specialName: "Dugong Kung Fu Fist of Healing"
+    },
+    380: {
+        special: "Removes poison",
+        specialName: "Dugong Kung Fu Fist of Healing",
+        captain: "Boosts ATK and RCV of STR characters by 1.5x"
+    },
+    381: {
+        special: "Reduces damage received by 20% for 1 turn",
+        specialName: "Iron Shield"
+    },
+    382: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Shield Crusher"
+    },
+    383: {
+        special: "Strongly poisons one enemy",
+        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        specialName: "Poison Needle",
+        captain: "Reduces damage received by 10%, boosts ATK of INT characters by 2x"
+    },
+    384: {
+        special: "Strongly poisons one enemy",
+        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        specialName: "Poison Needle",
+        captain: "Reduces damage received by 20%, boosts ATK of INT characters by 2x"
+    },
+    385: {
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Fighter characters by 1.25x for 1 turn",
+        specialName: "Zombie Marionette Operation",
+        captain: "Boosts ATK of INT characters by 2x"
+    },
+    386: {
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Fighter characters by 1.25x for 1 turn",
+        specialName: "Zombie Marionette Operation",
+        captain: "Boosts ATK of INT characters by 2x"
+    },
+    387: {
+        special: "Randomly changes all orbs into either [PSY] or [INT] orbs, deals random PSY damage to all enemies",
+        specialName: "Square Plate Sword",
+        specialNotes: "#{random : 1 : 10,000}",
+        captain: "Boosts RCV of PSY characters by 1.5x"
+    },
+    388: {
+        special: "Randomly changes all orbs into either [PSY] or [INT] orbs, deals random PSY damage to all enemies",
+        specialName: "Square Plate Sword",
+        specialNotes: "#{random : 1 : 10,000}",
+        captain: "Boosts RCV of PSY characters by 1.5x"
+    },
+    389: {
+        special: "Changes own orb into [QCK] and every other orb into either [RCV], [STR], [DEX] or [QCK] orbs",
+        specialName: "Hell Wink",
+        captain: "Boosts ATK by 2.25x following a chain of DEX > INT > QCK attacks no lower than Good"
+    },
+    390: {
+        special: "Changes own orb into [QCK] and every other orb into either [RCV], [STR], [DEX] or [QCK] orbs",
+        specialName: "Hell Wink",
+        captain: "Boosts ATK by 2.75x following a chain of DEX > INT > QCK attacks no lower than Good"
+    },
+    391: {
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
+        specialName: "Negative Hollow",
+        specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
+        captain: "Boosts RCV of DEX characters by 1.5x"
+    },
+    392: {
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
+        specialName: "Negative Hollow",
+        specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
+        captain: "Boosts RCV of DEX characters by 2x"
+    },
+    393: {
+        special: "Deals 35x character's ATK in STR damage to one enemy",
+        specialName: "Kumacy Knuckle"
+    },
+    394: {
+        special: "Deals 500 fixed damage to all enemies",
+        specialName: "The Tempest Called Love",
+        specialNotes: "#{fixed}"
+    },
+    395: {
+        special: "Empties adjacent slots, amplifies the effect of orbs by 1.25x for 1 turn",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "Mole Banana",
+        captain: "Boosts ATK and RCV of QCK characters by 1.2x"
+    },
+    396: {
+        special: "Empties adjacent slots, amplifies the effect of orbs by 1.25x for 1 turn",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "Mole Banana",
+        captain: "Boosts ATK and RCV of QCK characters by 1.2x"
+    },
+    397: {
+        special: "Fills [EMPTY] orbs with [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
+        specialName: "Four Hundred Base Hits",
+        captain: "Boosts ATK by 3x after scoring 5 Perfects in a row"
+    },
+    398: {
+        special: "Fills [EMPTY] orbs with [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
+        specialName: "Four Hundred Base Hits",
+        captain: "Boosts ATK by 4x after scoring 5 Perfects in a row"
+    },
+    399: {
+        special: "Boosts ATK of DEX characters by 1.5x for 1 turn",
+        specialName: "Spike-U-Puncture",
+        captain: "Boosts HP of Striker characters by 1.5x"
+    },
+    400: {
+        special: "Boosts ATK of DEX characters by 1.5x for 1 turn",
+        specialName: "Spike-U-Puncture",
+        captain: "Boosts HP of Striker characters by 2x"
+    },
+    401: {
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Slasher characters by 1.25x for 1 turn",
+        specialName: "Iron Guard",
+        captain: "Reduces damage received by 10%, boosts ATK of Slasher characters by 1.5x"
+    },
+    402: {
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Slasher characters by 1.25x for 1 turn",
+        specialName: "Iron Guard",
+        captain: "Reduces damage received by 10%, boosts ATK of Slasher characters by 2x"
+    },
+    403: {
+        special: "Deals several times the character's ATK in QCK damage to all enemies",
+        specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Backwater Sword Dance",
+        captain: "Reduces damage received by 50% if HP is low, boosts RCV of all characters by 3x if HP is low"
+    },
+    404: {
+        special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
+        specialName: "Clear-Clear Fruit",
+        captain: "Boosts ATK of Shooter characters by 1.5x"
+    },
+    405: {
+        special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
+        specialName: "Clear-Clear Fruit",
+        captain: "Boosts ATK of Shooter characters by 2x"
+    },
+    406: {
+        special: "Reduces crew's HP to 1, deals 1,000 fixed damage to all enemies, boosts ATK of all characters by 1.2x for 1 turn",
+        specialName: "Skills of the Ancient Warriors",
+        specialNotes: "#{fixed}"
+    },
+    407: {
+        special: "Randomizes all orbs, deals 7x character's ATK in DEX damage to all enemies",
+        specialName: "Zombie-Style 36-Pound Phoenix"
+    },
+    408: {
+        special: "Changes own orb into [INT] and randomizes every other orb, deals 15x character's ATK in INT damage to all enemies",
+        specialName: "Ground Death",
+        captain: "Reduces damage received by 20%, boosts ATK of Slasher characters by 2x"
+    },
+    409: {
+        special: "Changes own orb into [QCK], deals 13x character's ATK in QCK damage to one enemy",
+        specialName: "Ocean Current Shoulder Throw",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    410: {
+        special: "Changes own orb into [QCK], deals 13x character's ATK in QCK damage to one enemy",
+        specialName: "Ocean Current Shoulder Throw",
+        captain: "Boosts ATK of Fighter characters by 2.5x"
+    },
+    411: {
+        special: "Changes adjacent orbs into [STR] orbs, deals 1,000 fixed damage to all enemies",
+        specialName: "Ursa Shock",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK and HP of STR characters by 2x"
+    },
+    412: {
+        special: "Changes adjacent orbs into [STR] orbs, deals 1,000 fixed damage to all enemies",
+        specialName: "Ursa Shock",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK and HP of STR characters by 2x"
+    },
+    413: {
+        special: "Changes [STR] and [DEX] orbs into [INT] orbs",
+        specialName: "Doppelman",
+        captain: "Boosts ATK of INT characters by 2.5x if HP is above 99% at the start of the turn"
+    },
+    414: {
+        special: "Changes [STR] and [DEX] orbs into [INT] orbs",
+        specialName: "Doppelman",
+        captain: "Boosts ATK of INT characters by 3x if HP is above 99% at the start of the turn"
+    },
+    415: {
+        special: "Recovers 15x character's RCV in HP, delays all enemies for 1 turn",
+        specialName: "Love-Love Mellow",
+        captain: "Boosts ATK of QCK and PSY characters by 2.75x and their RCV by 1.5x if HP is above 70% at the start of the turn"
+    },
+    416: {
+        special: "Recovers 15x character's RCV in HP, delays all enemies for 1 turn",
+        specialName: "Love-Love Mellow",
+        captain: "Boosts ATK of QCK and PSY characters by 2.75x and their RCV by 1.5x if HP is above 70% at the start of the turn"
+    },
+    417: {
+        special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        specialName: "Overheat",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    418: {
+        special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        specialName: "Overheat",
+        captain: "Boosts ATK and HP of Slasher characters by 2x"
+    },
+    419: {
+        special: "Reduces the defense of all enemies by 50% for 2 turns, randomizes all orbs",
+        specialName: "Parage Shot: The Storm",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    420: {
+        special: "Reduces Despair duration by 3 turns, deals 15x character's ATK in STR damage to one enemy",
+        specialName: "Gum-Gum Bazooka: Supremacy",
+        captain: "Boosts ATK, HP and RCV of STR characters by 1.5x"
+    },
+    421: {
+        special: "Reduces Bind duration by 2 turns, deals 10x character's ATK in DEX damage to all enemies",
+        specialName: "Three Thousand Worlds: The Final Stroke",
+        captain: "Boosts ATK, HP and RCV of DEX characters by 1.5x"
+    },
+    422: {
+        special: "Reduces damage received from INT enemies by 100% for 1 turn, recovers a random amount of HP",
+        specialName: "Mirage Tempo: The Heavens",
+        specialNotes: "Estimated healing range: between 1,000 HP and 3,000 HP.",
+        captain: "Boosts ATK, HP and RCV of INT characters by 1.5x"
+    },
+    423: {
+        special: "Recovers 4,343 HP, reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Lullaby Parry",
+        captain: "Protects from defeat as long as HP is above 70%",
+        captainNotes: "#{zombie}"
+    },
+    424: {
+        special: "Recovers 4,343 HP, reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Lullaby Parry",
+        captain: "Boosts ATK of the whole crew by 1.5x and protects from defeat as long as HP is above 70%",
+        captainNotes: "#{zombie}"
+    },
+    425: {
+        special: "Deals random PSY damage to all enemies",
+        specialName: "Shusui: Three Verse Arrow Notch Slash",
+        specialNotes: "#{random : 1 : 100,000}",
+        captain: "Boosts ATK and HP of Slasher characters by 1.5x"
+    },
+    426: {
+        special: "Boosts ATK of STR characters by 1.05x for 5 turns",
+        specialName: "Barco Grabber Breath",
+        captain: "Boosts HP of STR characters by 2x"
+    },
+    427: {
+        special: "Reduces Bind and Despair duration by 2 turns",
+        specialName: "Havoc Sonar",
+        captain: "Boosts HP of DEX characters by 2x"
+    },
+    428: {
+        special: "Reduces damage received by 50% for 2 turns",
+        specialName: "Last Boss – Deep Dive of Dreams",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    429: {
+        special: "Deals 7x character's ATK in DEX damage to all enemies, reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "South Bird's Fearless Smile"
+    },
+    430: {
+        special: "Amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Spring Hopper",
+        captain: "Boosts ATK of DEX characters by 1.5x"
+    },
+    431: {
+        special: "Amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Spring Hopper",
+        captain: "Boosts ATK and HP of DEX characters by 1.5x"
+    },
+    432: {
+        special: "Deals 20x character's ATK in QCK damage to one enemy",
+        specialName: "Big Chop"
+    },
+    433: {
+        special: "Reduces Bind and Despair duration by 1 turn",
+        specialName: "New Kama Seduction",
+        captain: "Boosts ATK by 2x following a chain of QCK > STR > DEX attacks no lower than Good"
+    },
+    434: {
+        special: "Amplifies the effect of orbs by 1.25x for 3 turns",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "New Kama Karate Maiden's Awakening",
+        captain: "Boosts ATK by 2x following a chain of PSY > INT > INT attacks no lower than Good"
+    },
+    435: {
+        special: "Randomly changes [RCV], [STR] and [DEX] orbs into either [STR] or [QCK] orbs",
+        specialName: "Maiden's Bloom",
+        captain: "Boosts ATK by 2x following a chain of INT > PSY > QCK attacks no lower than Good"
+    },
+    436: {
+        special: "Randomly changes [RCV], [STR] and [DEX] orbs into either [STR] or [QCK] orbs",
+        specialName: "Maiden's Bloom",
+        captain: "Boosts ATK by 2.25x following a chain of INT > PSY > QCK attacks no lower than Good"
+    },
+    437: {
+        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
+        specialName: "Negative Horo \"Sweet\"",
+        specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
+        captain: "Boosts RCV of [DEX] characters by 3x if HP is below 30% at the start of the turn"
+    },
+    438: {
+        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
+        specialName: "Negative Horo \"Sweet\"",
+        specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
+        captain: "Boosts RCV of [DEX] characters by 5x if HP is below 30% at the start of the turn"
+    },
+    439: {
+        special: "Changes adjacent orbs into [RCV] and randomizes every other orb",
+        specialName: "Charge! Supersonic Duck Squadron! \"Love\"",
+        captain: "Recovers 5x character's RCV in HP at the end of each turn"
+    },
+    440: {
+        special: "Changes adjacent orbs into [RCV] and randomizes every other orb",
+        specialName: "Charge! Supersonic Duck Squadron! \"Love\"",
+        captain: "Recovers 7x character's RCV in HP at the end of each turn"
+    },
+    444: {
+        captain: "Boosts ATK of Evolver and Booster characters by 2x if HP is above 50% at the start of the turn"
+    },
+    445: {
+        special: "Randomly changes all orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs, switches orbs between slots 3 times",
+        specialName: "Support Incoming! Supersonic Duck Squadron!",
+        captain: "Boosts ATK of Evolver and Booster characters by 2.5x if HP is above 50% at the start of the turn"
+    },
+    446: {
+        special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
+        specialName: "Black Hole",
+        captain: "Doubles damage received, boosts ATK of STR characters by 2x and their HP by 1.5x"
+    },
+    447: {
+        special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
+        specialName: "Black Hole",
+        captain: "Doubles damage received, boosts ATK of STR characters by 2.5x and their HP by 2.25x"
+    },
+    448: {
+        special: "Boosts chances of getting [QCK] orbs for 3 turns",
+        specialName: "Pirate King's Sword",
+        captain: "Boosts ATK of QCK characters by 3x if HP is above 99% at the start of the turn"
+    },
+    449: {
+        special: "Boosts chances of getting [QCK] orbs for 3 turns",
+        specialName: "Pirate King's Sword",
+        captain: "Boosts ATK of QCK characters by 3x if HP is above 99% at the start of the turn"
+    },
+    450: {
+        special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
+        specialName: "Number Eight's One Hit",
+        captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
         sailor: "Boosts ATK of Fighter characters by 20"
-	},
-	451: {
-		special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
-		specialName: "Number Eight's One Hit",
-		captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
+    },
+    451: {
+        special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
+        specialName: "Number Eight's One Hit",
+        captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
         sailor: "Boosts ATK of Fighter characters by 20"
-	},
-	452: {
-		special: "Changes own orb and the captain's orb into [PSY]",
-		specialName: "Dread Morning Star",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Striker characters by 2x"
-	},
-	453: {
-		special: "Changes own orb and the captain's orb into [PSY]",
-		specialName: "Dread Morning Star",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Striker characters by 2x"
-	},
-	454: {
-		special: "Boosts ATK of STR characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
-		specialName: "Manly Flaming Sword",
-		captain: "Boosts ATK of STR characters by 2x, boosts damage of STR specials by 2x",
-		captainNotes: "#{noFixedPerc}"
-	},
-	455: {
-		special: "Boosts ATK of STR characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
-		specialName: "Manly Flaming Sword",
-		captain: "Boosts ATK of STR characters by 2x, boosts damage of STR specials by 2x",
-		captainNotes: "#{noFixedPerc}"
-	},
-	456: {
-		special: "Randomly changes the orbs in the middle row into either [STR] or [DEX] orbs, the orbs in the lower row into either [PSY] or [INT] orbs, switches orbs between slots once",
-		specialName: "Double Cannon",
-		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+    },
+    452: {
+        special: "Changes own orb and the captain's orb into [PSY]",
+        specialName: "Dread Morning Star",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Striker characters by 2x"
+    },
+    453: {
+        special: "Changes own orb and the captain's orb into [PSY]",
+        specialName: "Dread Morning Star",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Striker characters by 2x"
+    },
+    454: {
+        special: "Boosts ATK of STR characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
+        specialName: "Manly Flaming Sword",
+        captain: "Boosts ATK of STR characters by 2x, boosts damage of STR specials by 2x",
+        captainNotes: "#{noFixedPerc}"
+    },
+    455: {
+        special: "Boosts ATK of STR characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
+        specialName: "Manly Flaming Sword",
+        captain: "Boosts ATK of STR characters by 2x, boosts damage of STR specials by 2x",
+        captainNotes: "#{noFixedPerc}"
+    },
+    456: {
+        special: "Randomly changes the orbs in the middle row into either [STR] or [DEX] orbs, the orbs in the lower row into either [PSY] or [INT] orbs, switches orbs between slots once",
+        specialName: "Double Cannon",
+        captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit"
-	},
-	457: {
-		special: "Randomly changes the orbs in the middle row into either [STR] or [DEX] orbs, the orbs in the lower row into either [PSY] or [INT] orbs, switches orbs between slots once",
-		specialName: "Double Cannon",
-		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+    },
+    457: {
+        special: "Randomly changes the orbs in the middle row into either [STR] or [DEX] orbs, the orbs in the lower row into either [PSY] or [INT] orbs, switches orbs between slots once",
+        specialName: "Double Cannon",
+        captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit"
-	},
-	458: {
-		special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
-		specialName: "Zen Shockwave",
-		specialNotes: "#{random : 30,000 : 150,000}",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x"
-	},
-	459: {
-		special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
-		specialName: "Zen Shockwave",
-		specialNotes: "#{random : 30,000 : 150,000}",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x as well as himself",
-		captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku characters in the team are included in the bonus."
-	},
-	460: {
-		special: "Recovers 33 HP after the end of each turn for 999 turns, delays all enemies for 1 turn",
-		specialName: "Extra Large Candle Service Set",
-		captain: "Reduces damage received by 10%"
-	},
-	461: {
-		special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
-		specialName: "Escape Dance: White Swan Arabesque",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	462: {
-		special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
-		specialName: "Escape Dance: White Swan Arabesque",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	463: {
-		special: "Empties all slots, deals 25x character's ATK in PSY damage to one enemy",
-		specialName: "Surprise Ball Dragon",
-		captain: "Boosts HP of PSY characters by 2x"
-	},
-	464: {
-		special: "Deals 20x character's ATK in INT damage to all enemies",
-		specialName: "Roc Rider Fuza's Flame",
-		captain: "Boosts ATK and HP of Striker characters by 1.5x"
-	},
-	465: {
-		special: "Deals 20x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.25x for 2 turns",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "Jet Punch",
-		captain: "Boosts ATK by 3x after scoring 4 hits below Good in a row"
-	},
-	466: {
-		special: "Delays all enemies for 1 turn",
-		specialName: "Double Flash Gun",
-		captain: "Boosts ATK and HP of Shooter characters by 1.5x"
-	},
-	467: {
-		special: "Changes [RCV] orbs into [STR] orbs",
-		specialName: "Mountain Belly",
-		captain: "Boosts ATK and RCV of STR characters by 1.5x"
-	},
-	468: {
-		special: "Boosts RCV of all characters by 1.5x for 1 turn",
-		specialName: "Healing Power"
-	},
-	469: {
-		special: "Switches orbs between slots once",
-		specialName: "Quick Change"
-	},
-	470: {
-		special: "Boosts RCV of all characters by 1.5x for 1 turn",
-		specialName: "Healing Power",
-		captain: "Boosts RCV of PSY characters by 1.5x"
-	},
-	471: {
-		special: "Switches orbs between slots once",
-		specialName: "Quick Change"
-	},
-	472: {
-		special: "Deals 20x character's ATK in STR damage to one enemy",
-		specialName: "Milky Power Axe"
-	},
-	473: {
-		special: "Deals 10x character's ATK in QCK damage to one enemy",
-		specialName: "Milky Quick Axe"
-	},
-	474: {
-		special: "Deals 5x character's ATK in DEX damage to all enemies, reduces Bind duration by 1 turn",
-		specialName: "Milky Technique Axe"
-	},
-	475: {
-		special: "Deals 5x character's ATK in STR damage to all enemies, recovers 500 HP",
-		specialName: "Milky Mind Axe"
-	},
-	476: {
-		special: "Deals 1,000 fixed damage to one enemy",
-		specialName: "Milky Intelligence Axe",
-		specialNotes: "#{fixed}"
-	},
-	477: {
-		special: "Changes [DEX] orbs into [STR] orbs",
-		specialName: "[DEX] Slot Change [STR]"
-	},
-	478: {
-		special: "Changes [PSY] orbs into [QCK] orbs",
-		specialName: "[PSY] Slot Change [QCK]"
-	},
-	479: {
-		special: "Changes [INT] orbs into [DEX] orbs",
-		specialName: "[INT] Slot Change [DEX]"
-	},
-	480: {
-		special: "Changes [TND] orbs into [PSY] orbs",
-		specialName: "[TND] Slot Change [PSY]"
-	},
-	481: {
-		special: "Changes [DEX] orbs into [INT] orbs",
-		specialName: "[DEX] Slot Change [INT]"
-	},
-	482: {
-		special: "Changes [DEX] orbs into [STR] orbs",
-		specialName: "[DEX] Slot Change [STR]",
-		captain: "Boosts HP of Striker characters by 1.5x"
-	},
-	483: {
-		special: "Changes [PSY] orbs into [QCK] orbs",
-		specialName: "[PSY] Slot Change [QCK]",
-		captain: "Boosts ATK and RCV of QCK characters by 1.2x"
-	},
-	484: {
-		special: "Changes [INT] orbs into [DEX] orbs",
-		specialName: "[INT] Slot Change [DEX]",
-		captain: "Reduces damage received by 10%"
-	},
-	485: {
-		special: "Changes [TND] orbs into [PSY] orbs",
-		specialName: "[TND] Slot Change [PSY]",
-		captain: "Boosts HP and RCV of PSY characters by 1.2x"
-	},
-	486: {
-		special: "Changes [DEX] orbs into [INT] orbs",
-		specialName: "[DEX] Slot Change [INT]",
-		captain: "Boosts ATK of Striker characters by 1.5x"
-	},
-	487: {
-		special: "Boosts ATK of STR characters by 1.2x for 1 turn",
-		specialName: "Attack Boost STR"
-	},
-	488: {
-		special: "Boosts ATK of QCK characters by 1.2x for 1 turn",
-		specialName: "Attack Boost QCK"
-	},
-	489: {
-		special: "Boosts ATK of DEX characters by 1.2x for 1 turn",
-		specialName: "Attack Boost DEX"
-	},
-	490: {
-		special: "Boosts ATK of STR characters by 1.2x for 1 turn",
-		specialName: "Attack Boost STR",
-		captain: "Boosts ATK and HP of Striker characters by 1.2x"
-	},
-	491: {
-		special: "Boosts ATK of QCK characters by 1.2x for 1 turn",
-		specialName: "Attack Boost QCK",
-		captain: "Boosts RCV of Striker characters by 1.5x"
-	},
-	492: {
-		special: "Boosts ATK of DEX characters by 1.2x for 1 turn",
-		specialName: "Attack Boost DEX",
-		captain: "Boosts ATK of DEX characters by 1.2x"
-	},
-	493: {
-		special: "Recovers 7x character's RCV in HP",
-		specialName: "Moderate Healing"
-	},
-	494: {
-		special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
-		specialNotes: "#{poison}",
-		specialName: "Poison Attack"
-	},
-	495: {
-		special: "Recovers 7x character's RCV in HP",
-		specialName: "Moderate Healing",
-		captain: "Recovers 500 HP at the end of each turn"
-	},
-	496: {
-		special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
-		specialNotes: "#{poison}",
-		specialName: "Poison Attack",
-		captain: "Boosts ATK of Shooter characters by 1.5x"
-	},
-	497: {
-		special: "Reduces Bind duration by 4 turns, deals 3x character's ATK in QCK damage to one enemy",
-		specialName: "Cheeky Punk Kid Kick",
-		captain: "Boosts ATK of QCK characters by 1.5x"
-	},
-	498: {
-		special: "Reduces Bind duration by 4 turns, deals 3x character's ATK in QCK damage to one enemy",
-		specialName: "Cheeky Punk Kid Kick",
-		captain: "Boosts ATK of QCK characters by 1.5x"
-	},
-	499: {
-		special: "Delays all enemies by 1 turn",
-		specialName: "Women Are Courageous!",
-		captain: "Boosts RCV of Shooter characters by 1.5x"
-	},
-	500: {
-		special: "Delays all enemies by 1 turn",
-		specialName: "Women Are Courageous!",
-		captain: "Boosts RCV of Shooter characters by 2x"
-	},
-	501: {
-		special: "Recovers 5x character's RCV in HP at the end of each turn for 4 turns",
-		specialName: "Studying Medicine",
-		captain: "Boosts ATK, HP and RCV of PSY characters by 1.2x"
-	},
-	502: {
-		special: "Recovers 5x character's RCV in HP at the end of each turn for 4 turns",
-		specialName: "Studying Medicine",
-		captain: "Boosts ATK, HP and RCV of PSY characters by 1.5x"
-	},
-	503: {
-		special: "Deals 5x character's ATK in INT damage to all enemies, boosts ATK of all characters by 5% for 1 turn, reduces the defense of all enemies by 50% for 1 turn, randomizes all orbs",
-		specialName: "Surprise Dial Illusion",
-		captain: "Boosts HP of INT characters by 1.5x"
-	},
-	504: {
-		special: "Deals 5x character's ATK in INT damage to all enemies, boosts ATK of all characters by 5% for 1 turn, reduces the defense of all enemies by 50% for 1 turn, randomizes all orbs",
-		specialName: "Surprise Dial Illusion",
-		captain: "Boosts HP of INT characters by 2x"
-	},
-	505: {
-		special: "Boosts ATK of QCK characters by 1.25x for 3 turns",
-		specialName: "Flying Claw",
-		captain: "Protects from defeat as long as HP is above 50%",
-		captainNotes: "#{zombie}"
-	},
-	506: {
-		special: "Boosts ATK of QCK characters by 1.25x for 3 turns",
-		specialName: "Flying Claw",
-		captain: "Protects from defeat as long as HP is above 30%",
-		captainNotes: "#{zombie}"
-	},
-	507: {
-		special: "Deals 25x character's ATK in STR damage to one enemy",
-		specialName: "Ringing Fang",
-		captain: "Boosts ATK and HP of STR characters by 1.2x"
-	},
-	508: {
-		special: "Deals 25x character's ATK in STR damage to one enemy",
-		specialName: "Ringing Fang",
-		captain: "Boosts ATK and HP of STR characters by 1.5x"
-	},
-	509: {
-		special: "Poisons all enemies, boosts ATK of Striker characters by 1.5x for 1 turn",
-		specialNotes: "#{poison}",
-		specialName: "Merciless Ploy: Poison Needle",
-		captain: "Boosts ATK of Striker characters by 2x"
-	},
-	510: {
-		special: "Poisons all enemies, boosts ATK of Striker characters by 1.5x for 1 turn",
-		specialNotes: "#{poison}",
-		specialName: "Merciless Ploy: Poison Needle",
-		captain: "Reduces damage received by 10%, boosts ATK of Striker characters by 2x"
-	},
-	511: {
-		special: "Reduces damage received by 30% for 2 turns, boosts ATK of Slasher characters by 1.25x for 2 turns",
-		specialName: "Cruel Blade: Iron Guard",
-		captain: "Boosts ATK of Slasher characters by 2x"
-	},
-	512: {
-		special: "Boosts chances of getting [PSY] orbs and reduces chances of getting [INT] orbs for 3 turns",
-		specialName: "Sneaky Punk Kid Strike",
-		captain: "Protects from defeat as long as HP is above 50%",
-		captainNotes: "#{zombie}"
-	},
-	513: {
-		special: "Boosts chances of getting [PSY] orbs and reduces chances of getting [INT] orbs for 3 turns",
-		specialName: "Sneaky Punk Kid Strike",
-		captain: "Protects from defeat as long as HP is above 50%, boosts ATK of PSY characters by 1.5x if HP is above 50% at the start of the turn",
-		captainNotes: "#{zombie}"
-	},
-	514: {
-		special: "Boosts ATK of INT characters by 1.5x for 1 turn, reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Blooming Flower of Everlasting Summer",
-		captain: "Boosts ATK of INT characters by 2x"
-	},
-	515: {
-		special: "Changes the orbs in the left column into [INT], [PSY] and [RCV], the orbs in the right column into [STR], [DEX] and [QCK], switches orbs between slots 3 times",
-		specialNotes: "The special is not based on chance, the orbs are always changed with the same pattern. Starting from the top left orb and proceeding clockwise, after the special is used the orbs will be: [INT], [STR], [DEX], [QCK], [RCV] and [PSY]",
-		specialName: "Pop Green",
-		captain: "Boosts ATK, HP and RCV of Shooter characters by 1.5x"
-	},
-	516: {
-		special: "Changes the orbs in the left column into [INT], [PSY] and [RCV], the orbs in the right column into [STR], [DEX] and [QCK], switches orbs between slots 3 times",
-		specialNotes: "The special is not based on chance, the orbs are always changed with the same pattern. Starting from the top left orb and proceeding clockwise, after the special is used the orbs will be: [INT], [STR], [DEX], [QCK], [RCV] and [PSY]",
-		specialName: "Pop Green",
-		captain: "Boosts ATK, HP and RCV of Shooter characters by 1.5x, recovers 1x character's RCV in HP at the end of each turn"
-	},
-	517: {
-		special: "Empties all slots with [RCV] orbs, boosts ATK of all characters by 5% for 2 turns",
-		specialName: "Overeat! Energy Change",
-		captain: "Boosts HP of PSY characters by 1.5x"
-	},
-	518: {
-		special: "Empties all slots with [RCV] orbs, boosts ATK of all characters by 5% for 2 turns",
-		specialName: "Overeat! Energy Change",
-		captain: "Boosts HP of PSY characters by 2x, boosts chances of getting [RCV] orbs"
-	},
-	519: {
-		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
-		specialName: "Gum-Gum Gigant Thor Axe",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of STR characters by 2x"
-	},
-	520: {
-		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
-		specialName: "Gum-Gum Gigant Thor Axe",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of STR characters by 2.5x"
-	},
-	521: {
-		special: "Deals several times the character's ATK in INT damage to all enemies",
-		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Diable Jambe - Venaison Shot",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+    },
+    458: {
+        special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
+        specialName: "Zen Shockwave",
+        specialNotes: "#{random : 30,000 : 150,000}",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x"
+    },
+    459: {
+        special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
+        specialName: "Zen Shockwave",
+        specialNotes: "#{random : 30,000 : 150,000}",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x as well as himself",
+        captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku characters in the team are included in the bonus."
+    },
+    460: {
+        special: "Recovers 33 HP after the end of each turn for 999 turns, delays all enemies for 1 turn",
+        specialName: "Extra Large Candle Service Set",
+        captain: "Reduces damage received by 10%"
+    },
+    461: {
+        special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
+        specialName: "Escape Dance: White Swan Arabesque",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    462: {
+        special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
+        specialName: "Escape Dance: White Swan Arabesque",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    463: {
+        special: "Empties all slots, deals 25x character's ATK in PSY damage to one enemy",
+        specialName: "Surprise Ball Dragon",
+        captain: "Boosts HP of PSY characters by 2x"
+    },
+    464: {
+        special: "Deals 20x character's ATK in INT damage to all enemies",
+        specialName: "Roc Rider Fuza's Flame",
+        captain: "Boosts ATK and HP of Striker characters by 1.5x"
+    },
+    465: {
+        special: "Deals 20x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.25x for 2 turns",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "Jet Punch",
+        captain: "Boosts ATK by 3x after scoring 4 hits below Good in a row"
+    },
+    466: {
+        special: "Delays all enemies for 1 turn",
+        specialName: "Double Flash Gun",
+        captain: "Boosts ATK and HP of Shooter characters by 1.5x"
+    },
+    467: {
+        special: "Changes [RCV] orbs into [STR] orbs",
+        specialName: "Mountain Belly",
+        captain: "Boosts ATK and RCV of STR characters by 1.5x"
+    },
+    468: {
+        special: "Boosts RCV of all characters by 1.5x for 1 turn",
+        specialName: "Healing Power"
+    },
+    469: {
+        special: "Switches orbs between slots once",
+        specialName: "Quick Change"
+    },
+    470: {
+        special: "Boosts RCV of all characters by 1.5x for 1 turn",
+        specialName: "Healing Power",
+        captain: "Boosts RCV of PSY characters by 1.5x"
+    },
+    471: {
+        special: "Switches orbs between slots once",
+        specialName: "Quick Change"
+    },
+    472: {
+        special: "Deals 20x character's ATK in STR damage to one enemy",
+        specialName: "Milky Power Axe"
+    },
+    473: {
+        special: "Deals 10x character's ATK in QCK damage to one enemy",
+        specialName: "Milky Quick Axe"
+    },
+    474: {
+        special: "Deals 5x character's ATK in DEX damage to all enemies, reduces Bind duration by 1 turn",
+        specialName: "Milky Technique Axe"
+    },
+    475: {
+        special: "Deals 5x character's ATK in STR damage to all enemies, recovers 500 HP",
+        specialName: "Milky Mind Axe"
+    },
+    476: {
+        special: "Deals 1,000 fixed damage to one enemy",
+        specialName: "Milky Intelligence Axe",
+        specialNotes: "#{fixed}"
+    },
+    477: {
+        special: "Changes [DEX] orbs into [STR] orbs",
+        specialName: "[DEX] Slot Change [STR]"
+    },
+    478: {
+        special: "Changes [PSY] orbs into [QCK] orbs",
+        specialName: "[PSY] Slot Change [QCK]"
+    },
+    479: {
+        special: "Changes [INT] orbs into [DEX] orbs",
+        specialName: "[INT] Slot Change [DEX]"
+    },
+    480: {
+        special: "Changes [TND] orbs into [PSY] orbs",
+        specialName: "[TND] Slot Change [PSY]"
+    },
+    481: {
+        special: "Changes [DEX] orbs into [INT] orbs",
+        specialName: "[DEX] Slot Change [INT]"
+    },
+    482: {
+        special: "Changes [DEX] orbs into [STR] orbs",
+        specialName: "[DEX] Slot Change [STR]",
+        captain: "Boosts HP of Striker characters by 1.5x"
+    },
+    483: {
+        special: "Changes [PSY] orbs into [QCK] orbs",
+        specialName: "[PSY] Slot Change [QCK]",
+        captain: "Boosts ATK and RCV of QCK characters by 1.2x"
+    },
+    484: {
+        special: "Changes [INT] orbs into [DEX] orbs",
+        specialName: "[INT] Slot Change [DEX]",
+        captain: "Reduces damage received by 10%"
+    },
+    485: {
+        special: "Changes [TND] orbs into [PSY] orbs",
+        specialName: "[TND] Slot Change [PSY]",
+        captain: "Boosts HP and RCV of PSY characters by 1.2x"
+    },
+    486: {
+        special: "Changes [DEX] orbs into [INT] orbs",
+        specialName: "[DEX] Slot Change [INT]",
+        captain: "Boosts ATK of Striker characters by 1.5x"
+    },
+    487: {
+        special: "Boosts ATK of STR characters by 1.2x for 1 turn",
+        specialName: "Attack Boost STR"
+    },
+    488: {
+        special: "Boosts ATK of QCK characters by 1.2x for 1 turn",
+        specialName: "Attack Boost QCK"
+    },
+    489: {
+        special: "Boosts ATK of DEX characters by 1.2x for 1 turn",
+        specialName: "Attack Boost DEX"
+    },
+    490: {
+        special: "Boosts ATK of STR characters by 1.2x for 1 turn",
+        specialName: "Attack Boost STR",
+        captain: "Boosts ATK and HP of Striker characters by 1.2x"
+    },
+    491: {
+        special: "Boosts ATK of QCK characters by 1.2x for 1 turn",
+        specialName: "Attack Boost QCK",
+        captain: "Boosts RCV of Striker characters by 1.5x"
+    },
+    492: {
+        special: "Boosts ATK of DEX characters by 1.2x for 1 turn",
+        specialName: "Attack Boost DEX",
+        captain: "Boosts ATK of DEX characters by 1.2x"
+    },
+    493: {
+        special: "Recovers 7x character's RCV in HP",
+        specialName: "Moderate Healing"
+    },
+    494: {
+        special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
+        specialNotes: "#{poison}",
+        specialName: "Poison Attack"
+    },
+    495: {
+        special: "Recovers 7x character's RCV in HP",
+        specialName: "Moderate Healing",
+        captain: "Recovers 500 HP at the end of each turn"
+    },
+    496: {
+        special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
+        specialNotes: "#{poison}",
+        specialName: "Poison Attack",
+        captain: "Boosts ATK of Shooter characters by 1.5x"
+    },
+    497: {
+        special: "Reduces Bind duration by 4 turns, deals 3x character's ATK in QCK damage to one enemy",
+        specialName: "Cheeky Punk Kid Kick",
+        captain: "Boosts ATK of QCK characters by 1.5x"
+    },
+    498: {
+        special: "Reduces Bind duration by 4 turns, deals 3x character's ATK in QCK damage to one enemy",
+        specialName: "Cheeky Punk Kid Kick",
+        captain: "Boosts ATK of QCK characters by 1.5x"
+    },
+    499: {
+        special: "Delays all enemies by 1 turn",
+        specialName: "Women Are Courageous!",
+        captain: "Boosts RCV of Shooter characters by 1.5x"
+    },
+    500: {
+        special: "Delays all enemies by 1 turn",
+        specialName: "Women Are Courageous!",
+        captain: "Boosts RCV of Shooter characters by 2x"
+    },
+    501: {
+        special: "Recovers 5x character's RCV in HP at the end of each turn for 4 turns",
+        specialName: "Studying Medicine",
+        captain: "Boosts ATK, HP and RCV of PSY characters by 1.2x"
+    },
+    502: {
+        special: "Recovers 5x character's RCV in HP at the end of each turn for 4 turns",
+        specialName: "Studying Medicine",
+        captain: "Boosts ATK, HP and RCV of PSY characters by 1.5x"
+    },
+    503: {
+        special: "Deals 5x character's ATK in INT damage to all enemies, boosts ATK of all characters by 5% for 1 turn, reduces the defense of all enemies by 50% for 1 turn, randomizes all orbs",
+        specialName: "Surprise Dial Illusion",
+        captain: "Boosts HP of INT characters by 1.5x"
+    },
+    504: {
+        special: "Deals 5x character's ATK in INT damage to all enemies, boosts ATK of all characters by 5% for 1 turn, reduces the defense of all enemies by 50% for 1 turn, randomizes all orbs",
+        specialName: "Surprise Dial Illusion",
+        captain: "Boosts HP of INT characters by 2x"
+    },
+    505: {
+        special: "Boosts ATK of QCK characters by 1.25x for 3 turns",
+        specialName: "Flying Claw",
+        captain: "Protects from defeat as long as HP is above 50%",
+        captainNotes: "#{zombie}"
+    },
+    506: {
+        special: "Boosts ATK of QCK characters by 1.25x for 3 turns",
+        specialName: "Flying Claw",
+        captain: "Protects from defeat as long as HP is above 30%",
+        captainNotes: "#{zombie}"
+    },
+    507: {
+        special: "Deals 25x character's ATK in STR damage to one enemy",
+        specialName: "Ringing Fang",
+        captain: "Boosts ATK and HP of STR characters by 1.2x"
+    },
+    508: {
+        special: "Deals 25x character's ATK in STR damage to one enemy",
+        specialName: "Ringing Fang",
+        captain: "Boosts ATK and HP of STR characters by 1.5x"
+    },
+    509: {
+        special: "Poisons all enemies, boosts ATK of Striker characters by 1.5x for 1 turn",
+        specialNotes: "#{poison}",
+        specialName: "Merciless Ploy: Poison Needle",
+        captain: "Boosts ATK of Striker characters by 2x"
+    },
+    510: {
+        special: "Poisons all enemies, boosts ATK of Striker characters by 1.5x for 1 turn",
+        specialNotes: "#{poison}",
+        specialName: "Merciless Ploy: Poison Needle",
+        captain: "Reduces damage received by 10%, boosts ATK of Striker characters by 2x"
+    },
+    511: {
+        special: "Reduces damage received by 30% for 2 turns, boosts ATK of Slasher characters by 1.25x for 2 turns",
+        specialName: "Cruel Blade: Iron Guard",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    512: {
+        special: "Boosts chances of getting [PSY] orbs and reduces chances of getting [INT] orbs for 3 turns",
+        specialName: "Sneaky Punk Kid Strike",
+        captain: "Protects from defeat as long as HP is above 50%",
+        captainNotes: "#{zombie}"
+    },
+    513: {
+        special: "Boosts chances of getting [PSY] orbs and reduces chances of getting [INT] orbs for 3 turns",
+        specialName: "Sneaky Punk Kid Strike",
+        captain: "Protects from defeat as long as HP is above 50%, boosts ATK of PSY characters by 1.5x if HP is above 50% at the start of the turn",
+        captainNotes: "#{zombie}"
+    },
+    514: {
+        special: "Boosts ATK of INT characters by 1.5x for 1 turn, reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Blooming Flower of Everlasting Summer",
+        captain: "Boosts ATK of INT characters by 2x"
+    },
+    515: {
+        special: "Changes the orbs in the left column into [INT], [PSY] and [RCV], the orbs in the right column into [STR], [DEX] and [QCK], switches orbs between slots 3 times",
+        specialNotes: "The special is not based on chance, the orbs are always changed with the same pattern. Starting from the top left orb and proceeding clockwise, after the special is used the orbs will be: [INT], [STR], [DEX], [QCK], [RCV] and [PSY]",
+        specialName: "Pop Green",
+        captain: "Boosts ATK, HP and RCV of Shooter characters by 1.5x"
+    },
+    516: {
+        special: "Changes the orbs in the left column into [INT], [PSY] and [RCV], the orbs in the right column into [STR], [DEX] and [QCK], switches orbs between slots 3 times",
+        specialNotes: "The special is not based on chance, the orbs are always changed with the same pattern. Starting from the top left orb and proceeding clockwise, after the special is used the orbs will be: [INT], [STR], [DEX], [QCK], [RCV] and [PSY]",
+        specialName: "Pop Green",
+        captain: "Boosts ATK, HP and RCV of Shooter characters by 1.5x, recovers 1x character's RCV in HP at the end of each turn"
+    },
+    517: {
+        special: "Empties all slots with [RCV] orbs, boosts ATK of all characters by 5% for 2 turns",
+        specialName: "Overeat! Energy Change",
+        captain: "Boosts HP of PSY characters by 1.5x"
+    },
+    518: {
+        special: "Empties all slots with [RCV] orbs, boosts ATK of all characters by 5% for 2 turns",
+        specialName: "Overeat! Energy Change",
+        captain: "Boosts HP of PSY characters by 2x, boosts chances of getting [RCV] orbs"
+    },
+    519: {
+        special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
+        specialName: "Gum-Gum Gigant Thor Axe",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of STR characters by 2x"
+    },
+    520: {
+        special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
+        specialName: "Gum-Gum Gigant Thor Axe",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of STR characters by 2.5x"
+    },
+    521: {
+        special: "Deals several times the character's ATK in INT damage to all enemies",
+        specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Diable Jambe - Venaison Shot",
+        captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
         sailor: "Reduces Paralysiss by 3 turns for self"
-	},
-	522: {
-		special: "Deals several times the character's ATK in INT damage to all enemies",
-		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Diable Jambe - Venaison Shot",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+    },
+    522: {
+        special: "Deals several times the character's ATK in INT damage to all enemies",
+        specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Diable Jambe - Venaison Shot",
+        captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
         sailor: "Reduces Paralysiss by 3 turns for self"
-	},
-	523: {
-		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Billy's Electrical Discharge",
-		specialNotes: "#{zombie}",
-		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
+    },
+    523: {
+        special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Billy's Electrical Discharge",
+        specialNotes: "#{zombie}",
+        captain: "Boosts ATK and RCV of Striker characters by 1.5x",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
-	},
-	524: {
-		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Billy's Electrical Discharge",
-		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x",
+    },
+    524: {
+        special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Billy's Electrical Discharge",
+        specialNotes: "#{zombie}",
+        captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
-	},
-	525: {
-		special: "Deals random PSY damage to all enemies, randomizes all orbs",
-		specialName: "Three-Verse Humming: Arrow-Notch Slash",
-		captain: "Boosts ATK of PSY characters by 2x",
+    },
+    525: {
+        special: "Deals random PSY damage to all enemies, randomizes all orbs",
+        specialName: "Three-Verse Humming: Arrow-Notch Slash",
+        captain: "Boosts ATK of PSY characters by 2x",
         sailor: "Boosts RCV of PSY Characters by 15"
-	},
-	526: {
-		special: "Deals random PSY damage to all enemies, randomizes all orbs",
-		specialName: "Three-Verse Humming: Arrow-Notch Slash",
-		captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
+    },
+    526: {
+        special: "Deals random PSY damage to all enemies, randomizes all orbs",
+        specialName: "Three-Verse Humming: Arrow-Notch Slash",
+        captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
         sailor: "Boosts RCV of PSY Characters by 15"
-	},
-	527: {
-		special: "Removes poison, recovers 15x character's RCV in HP",
-		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
-		captain: "Boosts ATK and RCV of DEX characters by 1.5x",
+    },
+    527: {
+        special: "Removes poison, recovers 15x character's RCV in HP",
+        specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
+        captain: "Boosts ATK and RCV of DEX characters by 1.5x",
         sailor: "When HP is below x%, boosts own RCV by 50"
-	},
-	528: {
-		special: "Removes poison, recovers 15x character's RCV in HP",
-		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
-		captain: "Boosts ATK and RCV of DEX characters by 2x",
+    },
+    528: {
+        special: "Removes poison, recovers 15x character's RCV in HP",
+        specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
+        captain: "Boosts ATK and RCV of DEX characters by 2x",
         sailor: "When HP is below x%, boosts own RCV by 50"
-	},
-	529: {
-		special: "Deals 35x character's ATK in PSY damage to all enemies, reduces the defense of all enemies by 100% for 2 turns",
-		specialName: "Conqueror's Haki: Emperor",
-		captain: "Boosts chances of getting [PSY] orbs, boosts ATK of PSY characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
-	},
-	530: {
-		special: "Deals 35x character's ATK in PSY damage to all enemies, reduces the defense of all enemies by 100% for 2 turns",
-		specialName: "Conqueror's Haki: Emperor",
-		captain: "Boosts chances of getting [PSY] orbs, boosts ATK of PSY characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
-	},
-	531: {
-		special: "Reduces damage received by 30% for 4 turns",
-		specialName: "Veinte Fleur Calendula: Blossom",
-		captain: "Reduces damage received from STR, DEX and QCK enemies by 30%"
-	},
-	532: {
-		special: "Reduces damage received by 30% for 4 turns",
-		specialName: "Veinte Fleur Calendula: Blossom",
-		captain: "Reduces damage received from STR, DEX and QCK enemies by 30%"
-	},
-	533: {
-		special: "Amplifies the effect of orbs by 1.5x for 1 turn, deals 20x character's ATK in QCK damage to one enemy",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Swallow Bond En Avant: Blossom",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	534: {
-		special: "Amplifies the effect of orbs by 1.5x for 1 turn, deals 20x character's ATK in QCK damage to one enemy",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Swallow Bond En Avant: Blossom",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	535: {
-		special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
-		specialName: "Mirage Tempo Fata Morgana: Blossom",
-		captain: "Boosts RCV of DEX characters by 1.5x"
-	},
-	536: {
-		special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
-		specialName: "Mirage Tempo Fata Morgana: Blossom",
-		captain: "Boosts RCV of DEX characters by 2x"
-	},
-	537: {
-		special: "Reduces Bind and Despair duration by 1 turn, locks all orbs for 1 turn",
-		specialName: "Sea Stone Handcuffs",
-		captain: "Boosts chain multiplier by 2x"
-	},
-	538: {
-		special: "Reduces Bind and Despair duration by 1 turn, locks all orbs for 1 turn",
-		specialName: "Sea Stone Handcuffs",
-		captain: "Boosts chain multiplier by 2x, recovers 2x character's RCV in HP at the end of each turn"
-	},
-	539: {
-		special: "Changes own orb into [STR], deals 25x character's ATK in STR damage to one enemy",
-		specialName: "Bashful Prison Beast's Metal Rod"
-	},
-	540: {
-		special: "Boosts chances of getting [DEX] orbs for 2 turns",
-		specialName: "Deadly Glare"
-	},
-	541: {
-		special: "Greatly reduces chances of getting [PSY], [INT], [TND] and [RCV] slots for 5 turns",
-		specialName: "White Thorn Deathmatch",
-		captain: "Boosts ATK of STR characters by 2.5x if HP is below 50% at the start of the turn"
-	},
-	542: {
-		special: "Boosts RCV of all characters by 2x for 1 turn",
-		specialName: "Roar of the Ruler of the Sky",
-		captain: "Boosts HP of all characters by 1.5x"
-	},
-	543: {
-		special: "Reduces crew's current HP by 50%, deals 50x character's ATK in DEX damage to one enemy",
-		specialName: "Reject",
-		captain: "Boosts ATK and HP of Shooter characters by 1.5x, reduces crew's RCV to 0"
-	},
-	544: {
-		special: "Reduces crew's current HP by 50%, deals 50x character's ATK in DEX damage to one enemy",
-		specialName: "Reject",
-		captain: "Boosts ATK of Shooter characters by 2.25x and their HP by 1.5x, reduces crew's RCV to 0"
-	},
-	545: {
-		special: "Deals 6,000 fixed damage to all enemies, boosts ATK of PSY characters by 1.5x for 1 turn",
-		specialName: "60,000,000 Volt Jamboule",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	546: {
-		special: "Deals 6,000 fixed damage to all enemies, boosts ATK of PSY characters by 1.5x for 1 turn",
-		specialName: "60,000,000 Volt Jamboule",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of PSY characters by 2x, reduces damage received by 20%"
-	},
-	547: {
-		special: "Reduces crew's current HP by 10%, deals 1x character's ATK in STR damage to one enemy, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Crazy Punk Kid Punch",
-		specialNotes: "#{zombie}",
-		captain: "Boosts chances of getting [RCV] orbs"
-	},
-	548: {
-		special: "Reduces crew's current HP by 10%, deals 1x character's ATK in STR damage to one enemy, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Crazy Punk Kid Punch",
-		specialNotes: "#{zombie}",
-		captain: "Boosts chances of getting [RCV] orbs, boosts ATK of all characters by 1.2x"
-	},
-	549: {
-		special: "Boosts ATK against enemies with reduced defense by 1.3x for 3 turns",
-		specialName: "Arousal Manifesto - Red Demon Whip",
-		captain: "Boosts ATK by 2x after scoring 3 Perfects in a row"
-	},
-	550: {
-		special: "Boosts ATK against enemies with reduced defense by 1.3x for 3 turns",
-		specialName: "Arousal Manifesto - Red Demon Whip",
-		captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
-	},
-	551: {
-		special: "Reduces damage received by 50% for 1 turn, deals 15x character's ATK in STR damage to one enemy",
-		specialName: "Uncompromising Prison Beast's Morning Star"
-	},
-	552: {
-		special: "Reduces the defense of all enemies by 100% for 1 turn",
-		specialName: "Cursed Shout"
-	},
-	553: {
-		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
-		specialName: "Ashura Ugui",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
+    },
+    529: {
+        special: "Deals 35x character's ATK in PSY damage to all enemies, reduces the defense of all enemies by 100% for 2 turns",
+        specialName: "Conqueror's Haki: Emperor",
+        captain: "Boosts chances of getting [PSY] orbs, boosts ATK of PSY characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
+    },
+    530: {
+        special: "Deals 35x character's ATK in PSY damage to all enemies, reduces the defense of all enemies by 100% for 2 turns",
+        specialName: "Conqueror's Haki: Emperor",
+        captain: "Boosts chances of getting [PSY] orbs, boosts ATK of PSY characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
+    },
+    531: {
+        special: "Reduces damage received by 30% for 4 turns",
+        specialName: "Veinte Fleur Calendula: Blossom",
+        captain: "Reduces damage received from STR, DEX and QCK enemies by 30%"
+    },
+    532: {
+        special: "Reduces damage received by 30% for 4 turns",
+        specialName: "Veinte Fleur Calendula: Blossom",
+        captain: "Reduces damage received from STR, DEX and QCK enemies by 30%"
+    },
+    533: {
+        special: "Amplifies the effect of orbs by 1.5x for 1 turn, deals 20x character's ATK in QCK damage to one enemy",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Swallow Bond En Avant: Blossom",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    534: {
+        special: "Amplifies the effect of orbs by 1.5x for 1 turn, deals 20x character's ATK in QCK damage to one enemy",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Swallow Bond En Avant: Blossom",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    535: {
+        special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
+        specialName: "Mirage Tempo Fata Morgana: Blossom",
+        captain: "Boosts RCV of DEX characters by 1.5x"
+    },
+    536: {
+        special: "Reduces damage received by 50% for 2 turns, boosts RCV of all characters by 2x for 2 turns",
+        specialName: "Mirage Tempo Fata Morgana: Blossom",
+        captain: "Boosts RCV of DEX characters by 2x"
+    },
+    537: {
+        special: "Reduces Bind and Despair duration by 1 turn, locks all orbs for 1 turn",
+        specialName: "Sea Stone Handcuffs",
+        captain: "Boosts chain multiplier by 2x"
+    },
+    538: {
+        special: "Reduces Bind and Despair duration by 1 turn, locks all orbs for 1 turn",
+        specialName: "Sea Stone Handcuffs",
+        captain: "Boosts chain multiplier by 2x, recovers 2x character's RCV in HP at the end of each turn"
+    },
+    539: {
+        special: "Changes own orb into [STR], deals 25x character's ATK in STR damage to one enemy",
+        specialName: "Bashful Prison Beast's Metal Rod"
+    },
+    540: {
+        special: "Boosts chances of getting [DEX] orbs for 2 turns",
+        specialName: "Deadly Glare"
+    },
+    541: {
+        special: "Greatly reduces chances of getting [PSY], [INT], [TND] and [RCV] slots for 5 turns",
+        specialName: "White Thorn Deathmatch",
+        captain: "Boosts ATK of STR characters by 2.5x if HP is below 50% at the start of the turn"
+    },
+    542: {
+        special: "Boosts RCV of all characters by 2x for 1 turn",
+        specialName: "Roar of the Ruler of the Sky",
+        captain: "Boosts HP of all characters by 1.5x"
+    },
+    543: {
+        special: "Reduces crew's current HP by 50%, deals 50x character's ATK in DEX damage to one enemy",
+        specialName: "Reject",
+        captain: "Boosts ATK and HP of Shooter characters by 1.5x, reduces crew's RCV to 0"
+    },
+    544: {
+        special: "Reduces crew's current HP by 50%, deals 50x character's ATK in DEX damage to one enemy",
+        specialName: "Reject",
+        captain: "Boosts ATK of Shooter characters by 2.25x and their HP by 1.5x, reduces crew's RCV to 0"
+    },
+    545: {
+        special: "Deals 6,000 fixed damage to all enemies, boosts ATK of PSY characters by 1.5x for 1 turn",
+        specialName: "60,000,000 Volt Jamboule",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    546: {
+        special: "Deals 6,000 fixed damage to all enemies, boosts ATK of PSY characters by 1.5x for 1 turn",
+        specialName: "60,000,000 Volt Jamboule",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of PSY characters by 2x, reduces damage received by 20%"
+    },
+    547: {
+        special: "Reduces crew's current HP by 10%, deals 1x character's ATK in STR damage to one enemy, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Crazy Punk Kid Punch",
+        specialNotes: "#{zombie}",
+        captain: "Boosts chances of getting [RCV] orbs"
+    },
+    548: {
+        special: "Reduces crew's current HP by 10%, deals 1x character's ATK in STR damage to one enemy, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Crazy Punk Kid Punch",
+        specialNotes: "#{zombie}",
+        captain: "Boosts chances of getting [RCV] orbs, boosts ATK of all characters by 1.2x"
+    },
+    549: {
+        special: "Boosts ATK against enemies with reduced defense by 1.3x for 3 turns",
+        specialName: "Arousal Manifesto - Red Demon Whip",
+        captain: "Boosts ATK by 2x after scoring 3 Perfects in a row"
+    },
+    550: {
+        special: "Boosts ATK against enemies with reduced defense by 1.3x for 3 turns",
+        specialName: "Arousal Manifesto - Red Demon Whip",
+        captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
+    },
+    551: {
+        special: "Reduces damage received by 50% for 1 turn, deals 15x character's ATK in STR damage to one enemy",
+        specialName: "Uncompromising Prison Beast's Morning Star"
+    },
+    552: {
+        special: "Reduces the defense of all enemies by 100% for 1 turn",
+        specialName: "Cursed Shout"
+    },
+    553: {
+        special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
+        specialName: "Ashura Ugui",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
         sailor: "Boosts ATK of Slasher Characters by 20"
-	},
-	554: {
-		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
-		specialName: "Ashura Ugui",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
+    },
+    554: {
+        special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
+        specialName: "Ashura Ugui",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Boosts ATK of Slasher Characters by 20"
-	},
-	555: {
-		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
-		specialName: "Heavenly Dragon Star",
-		captain: "Boosts ATK of Shooter characters by 2x",
+    },
+    555: {
+        special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
+        specialName: "Heavenly Dragon Star",
+        captain: "Boosts ATK of Shooter characters by 2x",
         sailor: "Boosts RCV of Shooter Characters by 10"
-	},
-	556: {
-		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
-		specialName: "Heavenly Dragon Star",
-		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+    },
+    556: {
+        special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
+        specialName: "Heavenly Dragon Star",
+        captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
         sailor: "Boosts RCV of Shooter Characters by 10"
-	},
-	557: {
-		special: "Boosts chances of getting [INT] orbs for 3 turns",
-		specialName: "Ochenta Fleur - Cuatro Manus Shock",
-		captain: "Boosts ATK and RCV of INT characters by 1.5x",
+    },
+    557: {
+        special: "Boosts chances of getting [INT] orbs for 3 turns",
+        specialName: "Ochenta Fleur - Cuatro Manus Shock",
+        captain: "Boosts ATK and RCV of INT characters by 1.5x",
         sailor: "Reduces duration of Blindness by 3 turns"
-	},
-	558: {
-		special: "Boosts chances of getting [INT] orbs for 3 turns",
-		specialName: "Ochenta Fleur - Cuatro Manus Shock",
-		captain: "Boosts ATK and RCV of INT characters by 2x",
+    },
+    558: {
+        special: "Boosts chances of getting [INT] orbs for 3 turns",
+        specialName: "Ochenta Fleur - Cuatro Manus Shock",
+        captain: "Boosts ATK and RCV of INT characters by 2x",
         sailor: "Reduces duration of Blindness by 3 turns"
-	},
-	559: {
-		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Roar! Zarley Davison",
-		captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+    },
+    559: {
+        special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Roar! Zarley Davison",
+        captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
         sailor: "Boosts ATK of Shooter Characters by 20"
-	},
-	560: {
-		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Roar! Zarley Davison",
-		captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+    },
+    560: {
+        special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Roar! Zarley Davison",
+        captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
         sailor: "Boosts ATK of Shooter Characters by 20"
-	},
-	561: {
-		special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
-		specialName: "Great Flame Commandment: Flame Emperor",
-		captain: "Boosts HP of Shooter characters by 1.5x and their ATK by 3x if they have a matching orb, by 2x otherwise"
-	},
-	562: {
-		special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
-		specialName: "Great Flame Commandment: Flame Emperor",
-		captain: "Boosts HP of Shooter characters by 1.5x and their ATK by 3x if they have a matching orb, by 2x otherwise"
-	},
-	563: {
-		special: "Deal 3x character's ATK in PSY damage to one enemy, changes [INT] orbs into [RCV] orbs",
-		specialName: "Cutie Baton"
-	},
-	564: {
-		special: "Reduces Bind duration by 2 turns",
-		specialName: "Sea Surface Split"
-	},
-	565: {
-		special: "Deals 5,000 fixed damage to one enemy",
-		specialName: "Hamburger Hammer",
-		specialNotes: "#{fixed}"
-	},
-	566: {
-		special: "Empties all slots with [BLOCK] orbs",
-		specialName: "Wipeout Tackle"
-	},
-	567: {
-		special: "Reduces Bind and Despair duration by 1 turn, deals 15x the character's ATK as STR damage to all enemies",
-		specialName: "Mudfish Coaster"
-	},
-	568: {
-		special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns, switches orbs between slots twice",
-		specialName: "Slow Slow Beam",
-		captain: "Boosts ATK, HP and RCV of all characters by 1.25x"
-	},
-	569: {
-		special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns, switches orbs between slots twice",
-		specialName: "Slow Slow Beam",
-		captain: "Boosts ATK, HP and RCV of all characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight"
-	},
-	570: {
-		special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Flail",
-		captain: "Boosts ATK of STR and Fighter characters by 1.5x",
-		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
-	},
-	571: {
-		special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Flail",
-		captain: "Boosts ATK of STR and Fighter characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight",
-		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
-	},
-	572: {
-		special: "Boosts ATK of Fighter characters by 2x for 1 turn, binds himself for 15 turns",
-		specialName: "Roar of Mettle",
-		captain: "Boosts ATK of Fighter characters by 2.5x if HP is above 99% at the start of the turn"
-	},
-	573: {
-		special: "Reduces Despair duration by 2 turns, recovers 10x character's RCV in HP",
-		specialName: "Manly Support",
-		captain: "Boosts RCV of all characters by 1.2x"
-	},
-	574: {
-		special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
-		specialName: "Ice Block - Pheasant Beak",
-		captain: "Boosts ATK of Striker characters by 2x"
-	},
-	575: {
-		special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
-		specialName: "Ice Block - Pheasant Beak",
-		captain: "Boosts ATK and HP of Striker characters by 2x"
-	},
-	576: {
-		special: "Changes [PSY] orbs into [INT] orbs, boosts RCV of all characters by 1.5x for 1 turn",
-		specialName: "Fine Tempo - Tea Time Show",
-		captain: "Boosts ATK of all characters by 1.5x, boosts RCV of all characters by 1.2x"
-	},
-	577: {
-		special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
-		specialName: "Gum-Gum Jet Gatling",
-		specialNotes: "#{random : 70,000 : 200,000}",
-		captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
-	},
-	578: {
-		special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
-		specialName: "Gum-Gum Jet Gatling",
-		specialNotes: "#{random : 70,000 : 200,000}",
-		captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
-	},
-	579: {
-		special: "Randomly changes [BLOCK] orbs into either [QCK] or [DEX] orbs, deals 15x character's ATK in QCK damage to all enemies",
-		specialName: "Dragon Twister",
-		captain: "Boosts ATK of QCK and DEX characters by 1.5x"
-	},
-	580: {
-		special: "Randomly changes [BLOCK] orbs into either [QCK] or [DEX] orbs, deals 15x character's ATK in QCK damage to all enemies",
-		specialName: "Dragon Twister",
-		captain: "Boosts ATK of QCK and DEX characters by 2x"
-	},
-	581: {
-		special: "Cuts the current HP of each enemy by 7%",
-		specialName: "High-Caliber Bazooka",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	582: {
-		special: "Deals 10x character's ATK in QCK damage to one enemy, boosts ATK of QCK characters by 1.5x for 1 turn",
-		specialName: "Burn Blade",
-		captain: "Boosts ATK and HP of Striker characters by 1.5x"
-	},
-	583: {
-		special: "Changes own orb into [INT] and the captain's orb into [DEX], boosts RCV of Shooter characters by 300 for 3 turns",
-		specialName: "Disrupting Fire",
-		captain: "Boosts ATK and RCV of Shooter characters by 1.5x"
-	},
-	584: {
-		special: "Reduces damage received from PSY enemies by 100% for 1 turn",
-		specialName: "Mantra",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, reduces ATK, HP and RCV of all characters by 90%"
-	},
-	585: {
-		special: "Changes the captain's orb into [PSY], recovers 9x character's RCV in HP",
-		specialName: "The Bond Bellmere Left Us",
-		captain: "Boosts RCV of PSY characters by 1.5x"
-	},
-	586: {
-		special: "Changes the captain's orb into [PSY], recovers 9x character's RCV in HP",
-		specialName: "The Bond Bellmere Left Us",
-		captain: "Boosts HP and RCV of PSY characters by 1.5x"
-	},
-	587: {
-		special: "Removes poison, reduces Bind and Despair duration by 2 turns",
-		specialName: "Merciful Painkiller",
-		captain: "Recovers 3x character's RCV in HP at the end of each turn"
-	},
-	588: {
-		special: "Removes poison, reduces Bind and Despair duration by 2 turns",
-		specialName: "Merciful Painkiller",
-		captain: "Recovers 5x character's RCV in HP at the end of each turn"
-	},
-	589: {
-		special: "Boosts ATK of Slasher characters by 1.5x for 1 turn",
-		specialName: "Flag of the Rebellion",
-		captain: "Boosts ATK of all characters by 1.5x, reduces HP and RCV of all characters by 80%"
-	},
-	590: {
-		special: "Boosts ATK of Slasher characters by 1.5x for 1 turn",
-		specialName: "Flag of the Rebellion",
-		captain: "Boosts ATK of all characters by 2x, reduces HP and RCV of all characters by 80%"
-	},
-	596: {
-		special: "Deals 20x character's ATK in STR damage to one enemy, reduces the defense of all enemies by 50% for 3 turns",
-		specialName: "Rozeo Michelli",
-		captain: "Boosts ATK of STR characters by 1.5x, recovers 500 HP at the end of each turn"
-	},
-	597: {
-		special: "Deals 20x character's ATK in STR damage to one enemy, reduces the defense of all enemies by 50% for 3 turns",
-		specialName: "Rozeo Michelli",
-		captain: "Boosts ATK of STR characters by 1.75x, recovers 750 HP at the end of each turn"
-	},
-	598: {
-		special: "Changes own orb into [INT], switches orbs between slots once",
-		specialName: "Split Split Cannon",
-		captain: "Boosts ATK of characters with fewer than 3 stars by 2.5x"
-	},
-	599: {
-		special: "Changes own orb into [INT], switches orbs between slots once",
-		specialName: "Split Split Cannon",
-		captain: "Boosts ATK of characters with fewer than 3 stars by 3x"
-	},
-	600: {
-		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of PSY characters by 1.3x for 2 turns",
-		specialName: "Sword Draw - Single Flash",
-		captain: "Boosts ATK of PSY characters by 1.5x"
-	},
-	601: {
-		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of PSY characters by 1.3x for 2 turns",
-		specialName: "Sword Draw - Single Flash",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	602: {
-		special: "Reduces crew's current HP by 90%, deals 20,000 fixed damage to all enemies, boosts ATK of QCK characters by 2x for 1 turn",
-		specialName: "200,000,000 Volt Amaru",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	603: {
-		special: "Reduces crew's current HP by 90%, deals 20,000 fixed damage to all enemies, boosts ATK of QCK characters by 2x for 1 turn",
-		specialName: "200,000,000 Volt Amaru",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of QCK characters by 2.25x, recovers 5x character's RCV in HP at the end of each turn"
-	},
-	604: {
-		special: "Cuts the current HP of each enemy by 10%, changes [QCK] orbs into [DEX] orbs",
-		specialName: "Diable Jambe: Extra Hachis Hash",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	605: {
-		special: "Cuts the current HP of each enemy by 10%, changes [QCK] orbs into [DEX] orbs",
-		specialName: "Diable Jambe: Extra Hachis Hash",
-		captain: "Boosts ATK of Fighter characters by 2x, reduces damage received by 20%"
-	},
-	606: {
-		special: "Deals 20x character's ATK in DEX damage to one enemy, changes adjacent orbs into [RCV] orbs",
-		specialName: "Red Leg Kick",
-		captain: "Boosts ATK of Fighter characters by 2x if HP is above 50% at the start of the turn"
-	},
-	607: {
-		special: "Deals 20x character's ATK in DEX damage to one enemy, changes adjacent orbs into [RCV] orbs",
-		specialName: "Red Leg Kick",
-		captain: "Boosts ATK of Fighter characters by 2.5x if HP is above 50% at the start of the turn"
-	},
-	608: {
-		special: "For 1 turn, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
-		specialName: "Wicked Strength"
-	},
-	609: {
-		special: "Changes the captain's orb into [RCV] and randomizes every other orb",
-		specialName: "Wicked Spirit"
-	},
-	610: {
-		special: "Changes [TND] orbs into [RCV] orbs",
-		specialName: "[TND] Slot Change [RCV]"
-	},
-	611: {
-		special: "Changes adjacent orbs into [RCV] orbs",
-		specialName: "[RCV] Slot Storm"
-	},
-	612: {
-		special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
-		specialName: "45-Degree Joy",
-		captain: "Boosts ATK of Slasher characters by 1.5x"
-	},
-	613: {
-		special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
-		specialName: "45-Degree Joy",
-		captain: "Boosts ATK, HP and RCV of Slasher characters by 1.5x"
-	},
-	614: {
-		special: "Reduces the defense of all enemies by 50% for 1 turn, deals 10x character's ATK in PSY damage to all enemies",
-		specialName: "Demolisher Chop",
-		captain: "Boosts ATK of characters with cost 20 or less by 2.25x if HP is below 30% at the start of the turn"
-	},
-	615: {
-		special: "Deals random STR damage to one enemy",
-		specialName: "Demolisher Axe"
-	},
-	616: {
-		special: "Changes the captain's orb into STR",
-		specialName: "Demolisher Spear"
-	},
-	617: {
-		special: "Boosts ATK of Shooter characters by 1.2x for 1 turn",
-		specialName: "Demolisher Cannon"
-	},
-	618: {
-		special: "Deals 20x character's ATK in STR damage to one enemy",
-		specialName: "Mach Punch"
-	},
-	619: {
-		special: "Cuts the current HP of each enemy by 5%",
-		specialName: "Slight Break"
-	},
-	620: {
-		special: "Changes [INT] orbs into [QCK] orbs",
-		specialName: "[INT] Slot Change [QCK]"
-	},
-	621: {
-		special: "Changes [INT] orbs into [STR] orbs",
-		specialName: "[INT] Slot Change [STR]"
-	},
-	622: {
-		special: "Boosts RCV of all characters by 100 for 3 turns",
-		specialName: "Patch Job"
-	},
-	623: {
-		special: "Recovers 3x character's RCV in HP at the end of each turn for 5 turns",
-		specialName: "Auto Repair"
-	},
-	624: {
-		special: "Slightly boosts chances of getting [PSY] orbs for 3 turns",
-		specialName: "Slot Rate Up [PSY]"
-	},
-	625: {
-		special: "Slightly boosts chances of getting [INT] orbs for 3 turns",
-		specialName: "Slot Rate Up [INT]"
-	},
-	626: {
-		special: "Deals 13x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Burst"
-	},
-	627: {
-		special: "Randomizes all orbs",
-		specialName: "Slot Shuffle"
-	},
-	628: {
-		special: "Deals 15,000 fixed damage to one enemy",
-		specialName: "Keel Crusher",
-		specialNotes: "#{fixed}"
-	},
-	629: {
-		special: "Empties all slots including those with [BLOCK] orbs, deals random INT damage to all enemies",
-		specialName: "Master Nail",
-		captain: "Boosts ATK of characters with 3 or fewer stars by 2x"
-	},
-	630: {
-		special: "Randomly changes all orbs into either [QCK] or [DEX] orbs, deals random QCK damage to all enemies",
-		specialName: "Tempest Kick: Slaughter",
-		captain: "Boosts ATK of Slasher characters by 1.5x"
-	},
-	631: {
-		special: "Randomly changes all orbs into either [QCK] or [DEX] orbs, deals random QCK damage to all enemies",
-		specialName: "Tempest Kick: Slaughter",
-		captain: "Boosts ATK of Slasher characters by 2x"
-	},
-	632: {
-		special: "Randomly changes all orbs into either [STR], [PSY] or [INT] orbs, deals random STR damage to all enemies, reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Finger Pistol: Yellow Lotus",
-		captain: "Boosts ATK of Fighter characters by 1.5x",
-		specialNotes: "#{random : 2,000 : 20,000}"
-	},
-	633: {
-		special: "Randomly changes all orbs into either [STR], [PSY] or [INT] orbs, deals random STR damage to all enemies, reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Finger Pistol: Yellow Lotus",
-		captain: "Boosts ATK of Fighter characters by 2x",
-		specialNotes: "#{random : 2,000 : 20,000}"
-	},
-	634: {
-		special: "Boosts chances of getting [QCK] and [PSY] orbs for 3 turns, boosts ATK of QCK and PSY characters by 1.2x for 3 turns",
-		specialName: "Guiding Mermaid Voice",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK and RCV of QCK and PSY characters by 1.25x"
-	},
-	635: {
-		special: "Boosts chances of getting [QCK] and [PSY] orbs for 3 turns, boosts ATK of QCK and PSY characters by 1.2x for 3 turns",
-		specialName: "Guiding Mermaid Voice",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK and RCV of QCK and PSY characters by 1.5x"
-	},
-	636: {
-		special: "Binds himself for 3 turns, reduces damage received by 50% for 3 turns, recovers 3.5x character's RCV in HP at the end of each turn for 3 turns",
-		specialName: "Wretched Ballade",
-		captain: "Boosts ATK of characters with cost 2 or less by 3x"
-	},
-	637: {
-		special: "Cuts the current HP of each enemy by 8%, boosts ATK against enemies with increased defense by 1.3x for 1 turn",
-		specialName: "Hachi Ink Jet",
-		captain: "Recovers 618 HP at the end of each turn, boosts ATK of Slasher characters by 1.5x"
-	},
-	638: {
-		special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
-		specialName: "Bohemian Reverse Slash",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
+    },
+    561: {
+        special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
+        specialName: "Great Flame Commandment: Flame Emperor",
+        captain: "Boosts HP of Shooter characters by 1.5x and their ATK by 3x if they have a matching orb, by 2x otherwise"
+    },
+    562: {
+        special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
+        specialName: "Great Flame Commandment: Flame Emperor",
+        captain: "Boosts HP of Shooter characters by 1.5x and their ATK by 3x if they have a matching orb, by 2x otherwise"
+    },
+    563: {
+        special: "Deal 3x character's ATK in PSY damage to one enemy, changes [INT] orbs into [RCV] orbs",
+        specialName: "Cutie Baton"
+    },
+    564: {
+        special: "Reduces Bind duration by 2 turns",
+        specialName: "Sea Surface Split"
+    },
+    565: {
+        special: "Deals 5,000 fixed damage to one enemy",
+        specialName: "Hamburger Hammer",
+        specialNotes: "#{fixed}"
+    },
+    566: {
+        special: "Empties all slots with [BLOCK] orbs",
+        specialName: "Wipeout Tackle"
+    },
+    567: {
+        special: "Reduces Bind and Despair duration by 1 turn, deals 15x the character's ATK as STR damage to all enemies",
+        specialName: "Mudfish Coaster"
+    },
+    568: {
+        special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns, switches orbs between slots twice",
+        specialName: "Slow Slow Beam",
+        captain: "Boosts ATK, HP and RCV of all characters by 1.25x"
+    },
+    569: {
+        special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns, switches orbs between slots twice",
+        specialName: "Slow Slow Beam",
+        captain: "Boosts ATK, HP and RCV of all characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight"
+    },
+    570: {
+        special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
+        specialName: "Gum-Gum Flail",
+        captain: "Boosts ATK of STR and Fighter characters by 1.5x",
+        captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
+    },
+    571: {
+        special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
+        specialName: "Gum-Gum Flail",
+        captain: "Boosts ATK of STR and Fighter characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight",
+        captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
+    },
+    572: {
+        special: "Boosts ATK of Fighter characters by 2x for 1 turn, binds himself for 15 turns",
+        specialName: "Roar of Mettle",
+        captain: "Boosts ATK of Fighter characters by 2.5x if HP is above 99% at the start of the turn"
+    },
+    573: {
+        special: "Reduces Despair duration by 2 turns, recovers 10x character's RCV in HP",
+        specialName: "Manly Support",
+        captain: "Boosts RCV of all characters by 1.2x"
+    },
+    574: {
+        special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
+        specialName: "Ice Block - Pheasant Beak",
+        captain: "Boosts ATK of Striker characters by 2x"
+    },
+    575: {
+        special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
+        specialName: "Ice Block - Pheasant Beak",
+        captain: "Boosts ATK and HP of Striker characters by 2x"
+    },
+    576: {
+        special: "Changes [PSY] orbs into [INT] orbs, boosts RCV of all characters by 1.5x for 1 turn",
+        specialName: "Fine Tempo - Tea Time Show",
+        captain: "Boosts ATK of all characters by 1.5x, boosts RCV of all characters by 1.2x"
+    },
+    577: {
+        special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
+        specialName: "Gum-Gum Jet Gatling",
+        specialNotes: "#{random : 70,000 : 200,000}",
+        captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
+    },
+    578: {
+        special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
+        specialName: "Gum-Gum Jet Gatling",
+        specialNotes: "#{random : 70,000 : 200,000}",
+        captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
+    },
+    579: {
+        special: "Randomly changes [BLOCK] orbs into either [QCK] or [DEX] orbs, deals 15x character's ATK in QCK damage to all enemies",
+        specialName: "Dragon Twister",
+        captain: "Boosts ATK of QCK and DEX characters by 1.5x"
+    },
+    580: {
+        special: "Randomly changes [BLOCK] orbs into either [QCK] or [DEX] orbs, deals 15x character's ATK in QCK damage to all enemies",
+        specialName: "Dragon Twister",
+        captain: "Boosts ATK of QCK and DEX characters by 2x"
+    },
+    581: {
+        special: "Cuts the current HP of each enemy by 7%",
+        specialName: "High-Caliber Bazooka",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    582: {
+        special: "Deals 10x character's ATK in QCK damage to one enemy, boosts ATK of QCK characters by 1.5x for 1 turn",
+        specialName: "Burn Blade",
+        captain: "Boosts ATK and HP of Striker characters by 1.5x"
+    },
+    583: {
+        special: "Changes own orb into [INT] and the captain's orb into [DEX], boosts RCV of Shooter characters by 300 for 3 turns",
+        specialName: "Disrupting Fire",
+        captain: "Boosts ATK and RCV of Shooter characters by 1.5x"
+    },
+    584: {
+        special: "Reduces damage received from PSY enemies by 100% for 1 turn",
+        specialName: "Mantra",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, reduces ATK, HP and RCV of all characters by 90%"
+    },
+    585: {
+        special: "Changes the captain's orb into [PSY], recovers 9x character's RCV in HP",
+        specialName: "The Bond Bellmere Left Us",
+        captain: "Boosts RCV of PSY characters by 1.5x"
+    },
+    586: {
+        special: "Changes the captain's orb into [PSY], recovers 9x character's RCV in HP",
+        specialName: "The Bond Bellmere Left Us",
+        captain: "Boosts HP and RCV of PSY characters by 1.5x"
+    },
+    587: {
+        special: "Removes poison, reduces Bind and Despair duration by 2 turns",
+        specialName: "Merciful Painkiller",
+        captain: "Recovers 3x character's RCV in HP at the end of each turn"
+    },
+    588: {
+        special: "Removes poison, reduces Bind and Despair duration by 2 turns",
+        specialName: "Merciful Painkiller",
+        captain: "Recovers 5x character's RCV in HP at the end of each turn"
+    },
+    589: {
+        special: "Boosts ATK of Slasher characters by 1.5x for 1 turn",
+        specialName: "Flag of the Rebellion",
+        captain: "Boosts ATK of all characters by 1.5x, reduces HP and RCV of all characters by 80%"
+    },
+    590: {
+        special: "Boosts ATK of Slasher characters by 1.5x for 1 turn",
+        specialName: "Flag of the Rebellion",
+        captain: "Boosts ATK of all characters by 2x, reduces HP and RCV of all characters by 80%"
+    },
+    596: {
+        special: "Deals 20x character's ATK in STR damage to one enemy, reduces the defense of all enemies by 50% for 3 turns",
+        specialName: "Rozeo Michelli",
+        captain: "Boosts ATK of STR characters by 1.5x, recovers 500 HP at the end of each turn"
+    },
+    597: {
+        special: "Deals 20x character's ATK in STR damage to one enemy, reduces the defense of all enemies by 50% for 3 turns",
+        specialName: "Rozeo Michelli",
+        captain: "Boosts ATK of STR characters by 1.75x, recovers 750 HP at the end of each turn"
+    },
+    598: {
+        special: "Changes own orb into [INT], switches orbs between slots once",
+        specialName: "Split Split Cannon",
+        captain: "Boosts ATK of characters with fewer than 3 stars by 2.5x"
+    },
+    599: {
+        special: "Changes own orb into [INT], switches orbs between slots once",
+        specialName: "Split Split Cannon",
+        captain: "Boosts ATK of characters with fewer than 3 stars by 3x"
+    },
+    600: {
+        special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of PSY characters by 1.3x for 2 turns",
+        specialName: "Sword Draw - Single Flash",
+        captain: "Boosts ATK of PSY characters by 1.5x"
+    },
+    601: {
+        special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of PSY characters by 1.3x for 2 turns",
+        specialName: "Sword Draw - Single Flash",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    602: {
+        special: "Reduces crew's current HP by 90%, deals 20,000 fixed damage to all enemies, boosts ATK of QCK characters by 2x for 1 turn",
+        specialName: "200,000,000 Volt Amaru",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    603: {
+        special: "Reduces crew's current HP by 90%, deals 20,000 fixed damage to all enemies, boosts ATK of QCK characters by 2x for 1 turn",
+        specialName: "200,000,000 Volt Amaru",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of QCK characters by 2.25x, recovers 5x character's RCV in HP at the end of each turn"
+    },
+    604: {
+        special: "Cuts the current HP of each enemy by 10%, changes [QCK] orbs into [DEX] orbs",
+        specialName: "Diable Jambe: Extra Hachis Hash",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    605: {
+        special: "Cuts the current HP of each enemy by 10%, changes [QCK] orbs into [DEX] orbs",
+        specialName: "Diable Jambe: Extra Hachis Hash",
+        captain: "Boosts ATK of Fighter characters by 2x, reduces damage received by 20%"
+    },
+    606: {
+        special: "Deals 20x character's ATK in DEX damage to one enemy, changes adjacent orbs into [RCV] orbs",
+        specialName: "Red Leg Kick",
+        captain: "Boosts ATK of Fighter characters by 2x if HP is above 50% at the start of the turn"
+    },
+    607: {
+        special: "Deals 20x character's ATK in DEX damage to one enemy, changes adjacent orbs into [RCV] orbs",
+        specialName: "Red Leg Kick",
+        captain: "Boosts ATK of Fighter characters by 2.5x if HP is above 50% at the start of the turn"
+    },
+    608: {
+        special: "For 1 turn, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
+        specialName: "Wicked Strength"
+    },
+    609: {
+        special: "Changes the captain's orb into [RCV] and randomizes every other orb",
+        specialName: "Wicked Spirit"
+    },
+    610: {
+        special: "Changes [TND] orbs into [RCV] orbs",
+        specialName: "[TND] Slot Change [RCV]"
+    },
+    611: {
+        special: "Changes adjacent orbs into [RCV] orbs",
+        specialName: "[RCV] Slot Storm"
+    },
+    612: {
+        special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
+        specialName: "45-Degree Joy",
+        captain: "Boosts ATK of Slasher characters by 1.5x"
+    },
+    613: {
+        special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
+        specialName: "45-Degree Joy",
+        captain: "Boosts ATK, HP and RCV of Slasher characters by 1.5x"
+    },
+    614: {
+        special: "Reduces the defense of all enemies by 50% for 1 turn, deals 10x character's ATK in PSY damage to all enemies",
+        specialName: "Demolisher Chop",
+        captain: "Boosts ATK of characters with cost 20 or less by 2.25x if HP is below 30% at the start of the turn"
+    },
+    615: {
+        special: "Deals random STR damage to one enemy",
+        specialName: "Demolisher Axe"
+    },
+    616: {
+        special: "Changes the captain's orb into STR",
+        specialName: "Demolisher Spear"
+    },
+    617: {
+        special: "Boosts ATK of Shooter characters by 1.2x for 1 turn",
+        specialName: "Demolisher Cannon"
+    },
+    618: {
+        special: "Deals 20x character's ATK in STR damage to one enemy",
+        specialName: "Mach Punch"
+    },
+    619: {
+        special: "Cuts the current HP of each enemy by 5%",
+        specialName: "Slight Break"
+    },
+    620: {
+        special: "Changes [INT] orbs into [QCK] orbs",
+        specialName: "[INT] Slot Change [QCK]"
+    },
+    621: {
+        special: "Changes [INT] orbs into [STR] orbs",
+        specialName: "[INT] Slot Change [STR]"
+    },
+    622: {
+        special: "Boosts RCV of all characters by 100 for 3 turns",
+        specialName: "Patch Job"
+    },
+    623: {
+        special: "Recovers 3x character's RCV in HP at the end of each turn for 5 turns",
+        specialName: "Auto Repair"
+    },
+    624: {
+        special: "Slightly boosts chances of getting [PSY] orbs for 3 turns",
+        specialName: "Slot Rate Up [PSY]"
+    },
+    625: {
+        special: "Slightly boosts chances of getting [INT] orbs for 3 turns",
+        specialName: "Slot Rate Up [INT]"
+    },
+    626: {
+        special: "Deals 13x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Burst"
+    },
+    627: {
+        special: "Randomizes all orbs",
+        specialName: "Slot Shuffle"
+    },
+    628: {
+        special: "Deals 15,000 fixed damage to one enemy",
+        specialName: "Keel Crusher",
+        specialNotes: "#{fixed}"
+    },
+    629: {
+        special: "Empties all slots including those with [BLOCK] orbs, deals random INT damage to all enemies",
+        specialName: "Master Nail",
+        captain: "Boosts ATK of characters with 3 or fewer stars by 2x"
+    },
+    630: {
+        special: "Randomly changes all orbs into either [QCK] or [DEX] orbs, deals random QCK damage to all enemies",
+        specialName: "Tempest Kick: Slaughter",
+        captain: "Boosts ATK of Slasher characters by 1.5x"
+    },
+    631: {
+        special: "Randomly changes all orbs into either [QCK] or [DEX] orbs, deals random QCK damage to all enemies",
+        specialName: "Tempest Kick: Slaughter",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    632: {
+        special: "Randomly changes all orbs into either [STR], [PSY] or [INT] orbs, deals random STR damage to all enemies, reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Finger Pistol: Yellow Lotus",
+        captain: "Boosts ATK of Fighter characters by 1.5x",
+        specialNotes: "#{random : 2,000 : 20,000}"
+    },
+    633: {
+        special: "Randomly changes all orbs into either [STR], [PSY] or [INT] orbs, deals random STR damage to all enemies, reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Finger Pistol: Yellow Lotus",
+        captain: "Boosts ATK of Fighter characters by 2x",
+        specialNotes: "#{random : 2,000 : 20,000}"
+    },
+    634: {
+        special: "Boosts chances of getting [QCK] and [PSY] orbs for 3 turns, boosts ATK of QCK and PSY characters by 1.2x for 3 turns",
+        specialName: "Guiding Mermaid Voice",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK and RCV of QCK and PSY characters by 1.25x"
+    },
+    635: {
+        special: "Boosts chances of getting [QCK] and [PSY] orbs for 3 turns, boosts ATK of QCK and PSY characters by 1.2x for 3 turns",
+        specialName: "Guiding Mermaid Voice",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK and RCV of QCK and PSY characters by 1.5x"
+    },
+    636: {
+        special: "Binds himself for 3 turns, reduces damage received by 50% for 3 turns, recovers 3.5x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Wretched Ballade",
+        captain: "Boosts ATK of characters with cost 2 or less by 3x"
+    },
+    637: {
+        special: "Cuts the current HP of each enemy by 8%, boosts ATK against enemies with increased defense by 1.3x for 1 turn",
+        specialName: "Hachi Ink Jet",
+        captain: "Recovers 618 HP at the end of each turn, boosts ATK of Slasher characters by 1.5x"
+    },
+    638: {
+        special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
+        specialName: "Bohemian Reverse Slash",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
-	},
-	639: {
-		special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
-		specialName: "Bohemian Reverse Slash",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
+    },
+    639: {
+        special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
+        specialName: "Bohemian Reverse Slash",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
-	},
-	640: {
-		special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
-		specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Pirate Brothers: Twin Strike",
-		captain: "Boosts ATK of Fighter characters by 2x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
+    },
+    640: {
+        special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
+        specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Pirate Brothers: Twin Strike",
+        captain: "Boosts ATK of Fighter characters by 2x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
         sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
-	},
-	641: {
-		special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
-		specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Pirate Brothers: Twin Strike",
-		captain: "Boosts ATK of Fighter characters by 2.25x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
+    },
+    641: {
+        special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
+        specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Pirate Brothers: Twin Strike",
+        captain: "Boosts ATK of Fighter characters by 2.25x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
         sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
-	},
-	642: {
-		special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialNotes: "#{fixed} #{orb : 1.75x}",
-		specialName: "Raging Greatsword",
-		captain: "Boosts ATK of PSY characters by 2.5x if HP is below 30% at the start of the turn",
+    },
+    642: {
+        special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{fixed} #{orb : 1.75x}",
+        specialName: "Raging Greatsword",
+        captain: "Boosts ATK of PSY characters by 2.5x if HP is below 30% at the start of the turn",
         sailor: "Recovers 2 turns of Paralysis on self"
-	},
-	643: {
-		special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialNotes: "#{fixed} #{orb : 1.75x}",
-		specialName: "Raging Greatsword",
-		captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
+    },
+    643: {
+        special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{fixed} #{orb : 1.75x}",
+        specialName: "Raging Greatsword",
+        captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Recovers 2 turns of Paralysis on self"
-	},
-	644: {
-		special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
-		specialName: "Witch's Icebreaker",
-		captain: "Boosts ATK of INT characters by 2x",
+    },
+    644: {
+        special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
+        specialName: "Witch's Icebreaker",
+        captain: "Boosts ATK of INT characters by 2x",
         sailor: "Boosts ATK and RCV of INT characters by 20"
-	},
-	645: {
-		special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
-		specialName: "Witch's Icebreaker",
-		captain: "Boosts ATK of INT characters by 2.5x",
+    },
+    645: {
+        special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
+        specialName: "Witch's Icebreaker",
+        captain: "Boosts ATK of INT characters by 2.5x",
         sailor: "Boosts ATK and RCV of INT characters by 20"
-	},
-	646: {
-		special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
-		specialName: "Vanguard Breaker",
-		captain: "Boosts ATK of Shooter characters by 2.5x if HP is below 30% at the start of the turn",
+    },
+    646: {
+        special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
+        specialName: "Vanguard Breaker",
+        captain: "Boosts ATK of Shooter characters by 2.5x if HP is below 30% at the start of the turn",
         sailor: "Boosts ATK of STR characters by 30"
-	},
-	647: {
-		special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
-		specialName: "Vanguard Breaker",
-		captain: "Boosts ATK of Shooter characters by 2.75x if HP is below 30% at the start of the turn",
+    },
+    647: {
+        special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
+        specialName: "Vanguard Breaker",
+        captain: "Boosts ATK of Shooter characters by 2.75x if HP is below 30% at the start of the turn",
         sailor: "Boosts ATK of STR characters by 30"
-	},
-	648: {
-		special: "Recovers 100x character's RCV in HP, amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Blue Flame Kick",
-		captain: "Reduces damage received by 30% if HP is above 70% at the start of the turn, boosts ATK of QCK and PSY characters by 2.75x if HP is above 70% at the start the turn"
-	},
-	649: {
-		special: "Recovers 100x character's RCV in HP, amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Blue Flame Kick",
-		captain: "Reduces damage received by 30% if HP is above 70% at the start of the turn, boosts ATK of QCK and PSY characters by 2.75x if HP is above 70% at the start the turn"
-	},
-	650: {
-		special: "Deals 5,000 fixed damage to one enemy, amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{fixed} #{orb : 1.5x}",
-		specialName: "Thunder Lance Tempo",
-		captain: "Boosts ATK of INT characters by 2x and their RCV by 1.5x"
-	},
-	651: {
-		special: "Deals 5,000 fixed damage to one enemy, amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{fixed} #{orb : 1.5x}",
-		specialName: "Thunder Lance Tempo",
-		captain: "Boosts ATK of INT characters by 2x and their RCV by 1.5x"
-	},
-	652: {
-		special: "Cuts the current HP of each enemy by 20%, reduces damage received by 50% for 1 turn",
-		specialName: "Heart-Smashing Horn",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of DEX characters by 2x if they have matching orbs"
-	},
-	653: {
-		special: "Cuts the current HP of each enemy by 20%, reduces damage received by 50% for 1 turn",
-		specialName: "Heart-Smashing Horn",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of DEX characters by 2.25x if they have matching orbs"
-	},
-	654: {
-		special: "Cuts the current HP of each enemy by 20%, reduces damage received by 50% for 1 turn",
-		specialName: "Heart-Smashing Horn",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of DEX characters by 2.75x if they have matching orbs"
-	},
-	655: {
-		special: "Changes [EMPTY] and [TND] orbs into [STR] orbs, deals 10x character's ATK in STR damage to one enemy, amplifies the effect of orbs by 1.25x for 2 turns",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "Tooth Gum",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	656: {
-		special: "Changes [EMPTY] and [TND] orbs into [STR] orbs, deals 10x character's ATK in STR damage to one enemy, amplifies the effect of orbs by 1.25x for 2 turns",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "Tooth Gum",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of STR characters by 2x"
-	},
-	657: {
-		special: "Randomly changes [INT] and [PSY] orbs into either [STR] or [EMPTY] orbs",
-		specialName: "Forearm Sledge",
-		captain: "Boosts ATK of Fighter characters by 1.5x"
-	},
-	658: {
-		special: "Randomly changes all orbs into either [INT] or [PSY] orbs",
-		specialName: "Lipowertzer",
-		captain: "Boosts ATK of Shooter characters by 1.5x"
-	},
-	659: {
-		special: "Reduces Bind and Despair duration by 2 turns, reduces damage received by 50% for 2 turns",
-		specialName: "Gum-Gum Balloon Swim",
-		captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
-	},
-	660: {
-		special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Atlas Comet",
-		captain: "Boosts ATK of Shooter characters by 2x"
-	},
-	661: {
-		special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns",
-		specialName: "Atlas Comet",
-		captain: "Boosts ATK of Shooter characters by 2x, reduces cooldown of all specials by 1 turn at the start of the fight"
-	},
-	662: {
-		special: "Deals 13x character's ATK in PSY damage to one enemy, randomizes all orbs other than [PSY]",
-		specialName: "Tornado Tempo - Beach Side",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	663: {
-		special: "Deals PSY damage to one enemy according to HP, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
-		specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the lower the HP is. The formula used is 80000 * (1 - (current HP) / (total HP))",
-		specialName: "Vivi's Important Security Guard",
-		captain: "Recovers 2x character's RCV in HP at the end of each turn"
-	},
-	664: {
-		special: "Deals PSY damage to one enemy according to HP, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
-		specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the lower the HP is. The formula used is 80000 * (1 - (current HP) / (total HP))",
-		specialName: "Vivi's Important Security Guard",
-		captain: "Recovers 3x character's RCV in HP at the end of each turn"
-	},
-	665: {
-		special: "Changes own orb into [QCK], boosts ATK against enemies with reduced defense by 1.3x for 2 turns",
-		specialName: "Let's Go! Suna Suna Clan!!",
-		captain: "Boosts ATK of all characters by 1.2x, reduces HP and RCV of all characters by 80%"
-	},
-	666: {
-		special: "Changes own orb into [QCK], boosts ATK against enemies with reduced defense by 1.3x for 2 turns",
-		specialName: "Let's Go! Suna Suna Clan!!",
-		captain: "Boosts ATK of all characters by 1.75x, reduces HP and RCV of all characters by 80%"
-	},
-	667: {
-		special: "Protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "King's Chopper",
-		specialNotes: "#{zombie}",
-		captain: "Reduces damage received by 10%, boosts ATK of all characters by 1.5x"
-	},
-	668: {
-		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Free Spirit characters by 2x in the following turn.",
-		specialName: "Dragon's Claw",
-		captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
-	},
-	669: {
-		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Free Spirit characters by 2x in the following turn.",
-		specialName: "Dragon's Claw",
-		captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
-	},
-	670: {
-		special: "Boosts ATK of Fighter characters by 1.75x for 1 turn",
-		specialName: "Fishman Karate! True Fist Thrust of the Revolutionaries",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	671: {
-		special: "Boosts ATK of Fighter characters by 1.75x for 1 turn",
-		specialName: "Fishman Karate! True Fist Thrust of the Revolutionaries",
-		captain: "Boosts ATK of Fighter characters by 2.25x and their RCV by 1.5x"
-	},
-	672: {
-		special: "Cuts the current HP of each enemy by 20%, changes own orb into [STR]",
-		specialName: "Four Thousand Tile True Punch",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	673: {
-		special: "Cuts the current HP of each enemy by 20%, changes own orb into [STR]",
-		specialName: "Four Thousand Tile True Punch",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Fighter characters by 2x"
-	},
-	674: {
-		special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
-		specialName: "Emporio Healing Hormone",
-		captain: "Boosts ATK of Free Spirit characters by 2x"
-	},
-	675: {
-		special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
-		specialName: "Emporio Healing Hormone",
-		captain: "Boosts ATK of Free Spirit characters by 2.5x"
-	},
-	676: {
-		special: "Reduces any damage received above 5,000 HP by 97% for 3 turns",
-		specialNotes: "The exact formula for the damage received is: 5000 + ((total damage) - 5000) * 0.03",
-		specialName: "KEEP OUT",
-		captain: "Boosts ATK of Slasher characters by 1.5x, deals 5x character's ATK in QCK damage to all enemies at the end of each turn"
-	},
-	677: {
-		special: "Reduces any damage received above 5,000 HP by 97% for 3 turns",
-		specialNotes: "The exact formula for the damage received is: 5000 + ((total damage) - 5000) * 0.03",
-		specialName: "KEEP OUT",
-		captain: "Boosts ATK of Slasher characters by 1.5x, deals 5x character's ATK in QCK damage to all enemies at the end of each turn"
-	},
-	678: {
-		special: "Reduces damage received by 50% for 1 turn, locks all orbs for 1 turn",
-		specialName: "Cien Fleur Spider Net",
-		captain: "Boosts ATK and RCV of PSY characters by 1.2x, boosts chances of getting [PSY] orbs"
-	},
-	679: {
-		special: "Reduces damage received by 50% for 1 turn, locks all orbs for 1 turn",
-		specialName: "Cien Fleur Spider Net",
-		captain: "Boosts ATK and RCV of PSY characters by 1.5x, boosts chances of getting [PSY] orbs"
-	},
-	680: {
-		special: "Recovers 5x character's RCV in HP, boosts ATK and RCV of DEX characters by 1.25x for 2 turns",
-		specialName: "Midsummer Relax Time"
-	},
-	681: {
-		special: "Recovers 5x character's RCV in HP, boosts ATK and RCV of DEX characters by 1.25x for 2 turns",
-		specialName: "Midsummer Relax Time",
-		captain: "Boosts ATK and RCV of Striker characters by 1.5x"
-	},
-	682: {
-		special: "Recovers 2,561 HP, reduces damage received by 50% for 2 turns",
-		specialName: "Transcendental Serenity Healing"
-	},
-	683: {
-		special: "Recovers 2,561 HP, reduces damage received by 50% for 2 turns",
-		specialName: "Transcendental Serenity Healing",
-		captain: "Boosts ATK and RCV of Fighter characters by 1.5x"
-	},
-	684: {
-		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn",
-		specialName: "Romantic Ghost"
-	},
-	685: {
-		special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn",
-		specialName: "Romantic Ghost",
-		captain: "Boosts ATK and RCV of Shooter characters by 1.5x"
-	},
-	686: {
-		special: "Delays all enemies for 1 turn, recovers 3x character's RCV in HP at the end of each turn for 3 turns",
-		specialName: "Captivating Perfume Dance - Relaxation",
-		captain: "Boosts ATK and RCV of Slasher characters by 1.5x"
-	},
-	687: {
-		special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Free Spirit characters by 1.3x for 1 turn",
-		specialName: "First Spear of the Battle",
-		captain: "Boosts ATK of Free Spirit characters by 1.5x"
-	},
-	688: {
-		special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Free Spirit characters by 1.3x for 1 turn",
-		specialName: "First Spear of the Battle",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Free Spirit characters by 2x"
-	},
-	689: {
-		special: "Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Botanist's Great Discovery",
-		captain: "Boosts ATK and RCV of Slasher characters by 1.2x"
-	},
-	690: {
-		special: "Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Botanist's Great Discovery",
-		captain: "Boosts ATK and RCV of Slasher characters by 1.5x"
-	},
-	691: {
-		special: "Changes [PSY] orbs into [DEX] orbs",
-		specialName: "[PSY] Slot Change [DEX]"
-	},
-	692: {
-		special: "Changes [PSY] orbs into [QCK] orbs",
-		specialName: "[PSY] Slot Change [QCK]"
-	},
-	693: {
-		special: "Changes [DEX] orbs into [PSY] orbs",
-		specialName: "[DEX] Slot Change [PSY]"
-	},
-	694: {
-		special: "Deals 13x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Burst"
-	},
-	695: {
-		special: "Cuts the current HP of each enemy by 5%",
-		specialName: "Slight Break"
-	},
-	696: {
-		special: "Changes [PSY] orbs into [DEX] orbs",
-		specialName: "[PSY] Slot Change [DEX]",
-		captain: "Boosts ATK of Striker characters by 1.75x"
-	},
-	697: {
-		special: "Changes [PSY] orbs into [QCK] orbs",
-		specialName: "[PSY] Slot Change [QCK]",
-		captain: "Boosts ATK of Shooter characters by 1.75x"
-	},
-	698: {
-		special: "Changes [DEX] orbs into [PSY] orbs",
-		specialName: "[DEX] Slot Change [PSY]",
-		captain: "Boosts ATK of Slasher characters by 1.75x"
-	},
-	699: {
-		special: "Deals 13x character's ATK in character's type damage to all enemies",
-		specialName: "Hyper Burst",
-		captain: "Boosts ATK of Shooter characters by 500, reduces damage received by 10%"
-	},
-	700: {
-		special: "Cuts the current HP of each enemy by 5%",
-		specialName: "Slight Break",
-		captain: "Boosts ATK of Fighter characters by 1.75x"
-	},
-	701: {
-		special: "Deals 15x character's ATK in PSY damage to all enemies, changes own orb into [PSY]",
-		specialName: "Oimo Press",
-		captain: "Boosts HP of PSY characters by 2.25x"
-	},
-	702: {
-		special: "Seals himself for 5 turns, reduces damage received by 30% for 5 turns",
-		specialName: "Kashi Swing",
-		captain: "Boosts HP of INT characters by 2.25x"
-	},
-	703: {
-		special: "Deals 5x character's ATK in QCK damage to all enemies",
-		specialName: "Arm Claw of the Watchdog"
-	},
-	704: {
-		special: "Deals 9x character's ATK in STR damage to all enemies, reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Companion's Guilt"
-	},
-	705: {
-		special: "Randomly changes [PSY], [INT], [TND], [RCV] and [EMPTY] orbs into [STR], [DEX] or [QCK] orbs",
-		specialName: "Guilty Verdict - \"Slow Death Penalty\"",
-		captain: "Boosts ATK and HP of STR characters, DEX characters and QCK characters by 1.25x"
-	},
-	706: {
-		special: "Changes own orb and the captain's orb into [STR]",
-		specialName: "Air Door",
-		captain: "Boosts ATK of STR characters by 1.5x"
-	},
-	707: {
-		special: "Changes own orb and the captain's orb into [STR]",
-		specialName: "Air Door",
-		captain: "Boosts ATK and HP of STR characters by 1.5x"
-	},
-	708: {
-		special: "Reduces Bind and Despair duration by 3 turns",
-		specialName: "Cien Fleur - Wing",
-		captain: "Boosts ATK and RCV of PSY characters by 1.2x"
-	},
-	709: {
-		special: "Reduces Bind and Despair duration by 3 turns",
-		specialName: "Cien Fleur - Wing",
-		captain: "Boosts ATK and RCV of PSY characters by 1.5x"
-	},
-	710: {
-		special: "Empties all slots with [BLOCK] orbs, boosts ATK of Shooter characters by 1.25x for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
-		specialName: "Coup de Vent",
-		captain: "Boosts ATK of Shooter characters by 1.5x"
-	},
-	711: {
-		special: "Empties all slots with [BLOCK] orbs, boosts ATK of Shooter characters by 1.25x for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
-		specialName: "Coup de Vent",
-		captain: "Boosts ATK of Shooter characters by 2x"
-	},
-	712: {
-		special: "Deals 15x character's ATK in QCK damage to one enemy, boosts ATK of the characters in the top row by 1.5x for 2 turns",
-		specialNotes: "The special boosts the attack of only the crew's captain and the currently selected friend captain.",
-		specialName: "Sky Knight's Javelin",
-		captain: "Boosts ATK of Striker characters by 2x if HP is above 50% at the start of the turn"
-	},
-	713: {
-		special: "Deals 15x character's ATK in QCK damage to one enemy, boosts ATK of the characters in the top row by 1.5x for 2 turns",
-		specialNotes: "The special boosts the attack of only the crew's captain and the currently selected friend captain.",
-		specialName: "Sky Knight's Javelin",
-		captain: "Boosts ATK of Striker characters by 2.5x if HP is above 50% at the start of the turn"
-	},
-	714: {
-		special: "Randomizes slots with [STR], [QCK], [INT] or [PSY] orbs",
-		specialName: "Pegasus' Neigh"
-	},
-	715: {
-		special: "Boosts ATK and RCV of Free Spirit characters by 1.5x for 2 turns, seals herself for 3 turns",
-		specialName: "Angel's Harp - Healing",
-		captain: "Boosts RCV of all characters by 2x if HP is below 30% at the start of the turn"
-	},
-	716: {
-		special: "Boosts ATK and RCV of Free Spirit characters by 1.5x for 2 turns, seals herself for 3 turns",
-		specialName: "Angel's Harp - Healing",
-		captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
-	},
-	717: {
-		special: "Deals 50% of the damage dealt in the previous turn as typeless damage to all enemies",
-		specialNotes: "The special only includes the damage inflicted through normal attacks.",
-		specialName: "Black Sword - Lightning Slash",
-		captain: "Boosts ATK of Slasher characters by a variable factor between 2x and 2.75x based on the timing of the attack of the previous unit in the chain",
-		captainNotes: "A hit below Good or a Miss will boost the ATK of the next unit by 2x, a Good hit by 2.25x, a Great hit by 2.5x and a Perfect hit by 2.75x. This bonus is applied only to Slasher characters."
-	},
-	718: {
-		special: "Deals 50% of the damage dealt in the previous turn as typeless damage to all enemies",
-		specialNotes: "The special only includes the damage inflicted through normal attacks.",
-		specialName: "Black Sword - Lightning Slash",
-		captain: "Boosts ATK of Slasher characters by a variable factor between 2x and 2.75x based on the timing of the attack of the previous unit in the chain",
-		captainNotes: "A hit below Good or a Miss will boost the ATK of the next unit by 2x, a Good hit by 2.25x, a Great hit by 2.5x and a Perfect hit by 2.75x. This bonus is applied only to Slasher characters."
-	},
-	719: {
-		special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
-		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
-		specialName: "Sables: Pesado",
-		captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
-	},
-	720: {
-		special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
-		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
-		specialName: "Sables: Pesado",
-		captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
-	},
-	721: {
-		special: "Randomizes all orbs, including [BLOCK] orbs",
-		specialName: "Screw Drop Kick",
-		captain: "Boosts ATK of Fighter characters by 1.5x if HP is is above 99% at the start of the turn"
-	},
-	722: {
-		special: "Randomizes all orbs, including [BLOCK] orbs",
-		specialName: "Screw Drop Kick",
-		captain: "Boosts ATK of Fighter characters by 2x if HP is is above 99% at the start of the turn"
-	},
-	723: {
-		special: "Reduces crew's current HP by 80%, deals 5x the amount of HP subtracted in typeless damage to all enemies, reduces damage received by 90% for 1 turn",
-		specialName: "Right Angle Flying Bird: Bone Phoenix",
-		captain: "Boosts ATK of Slasher characters by 1.5x, recovers 1.2x character's RCV in HP at the end of each turn"
-	},
-	724: {
-		special: "Reduces crew's current HP by 80%, deals 5x the amount of HP subtracted in typeless damage to all enemies, reduces damage received by 90% for 1 turn",
-		specialName: "Right Angle Flying Bird: Bone Phoenix",
-		captain: "Boosts ATK of Slasher characters by 1.75x, recovers 1.5x character's RCV in HP at the end of each turn"
-	},
-	725: {
-		special: "Changes [TND] orbs into [QCK] orbs, switches orbs between slots twice",
-		specialName: "Peacock String Slasher",
-		captain: "Recovers 1,000 HP at the end of each turn"
-	},
-	726: {
-		special: "Changes [TND] orbs into [QCK] orbs, switches orbs between slots twice",
-		specialName: "Peacock String Slasher",
-		captain: "Recovers 2,000 HP at the end of each turn"
-	},
-	727: {
-		special: "Deals 10x character's ATK in DEX damage to all enemies, reduces the defense of all enemies by 50% for 1 turn",
-		specialName: "Gum-Gum Gatling",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Free Spirit and Fighter characters by 1.75x"
-	},
-	728: {
-		special: "Randomizes all orbs, recovers 6x character's RCV in HP at the end of each turn for 3 turns",
-		specialName: "Sheep Cloud Relaxing Bubbles",
-		captain: "Boosts ATK and RCV of DEX characters by 1.2x, slightly boosts chances of getting [DEX] orbs"
-	},
-	729: {
-		special: "Randomizes all orbs, recovers 6x character's RCV in HP at the end of each turn for 3 turns",
-		specialName: "Sheep Cloud Relaxing Bubbles",
-		captain: "Boosts ATK and RCV of DEX characters by 1.2x, boosts chances of getting [DEX] orbs"
-	},
-	730: {
-		special: "Reduces crew's current HP by 99%, deals 2x the amount of HP subtracted in INT damage to all enemies, boosts ATK of INT characters by 1.5x for 1 turn",
-		specialName: "Rankyaku - Lupus Fall",
-		captain: "Boosts ATK and HP of INT characters by 1.2x, deals 9 HP as fixed damage to all enemies at the end of each turn",
-		captainNotes: "#{fixed}"
-	},
-	731: {
-		special: "Reduces crew's current HP by 99%, deals 2x the amount of HP subtracted in INT damage to all enemies, boosts ATK of INT characters by 1.5x for 1 turn",
-		specialName: "Rankyaku - Lupus Fall",
-		captain: "Boosts ATK and HP of INT characters by 1.5x, deals 9 HP as fixed damage to all enemies at the end of each turn",
-		captainNotes: "#{fixed}"
-	},
-	732: {
-		special: "Deals 13x character's ATK in STR damage to one enemy, reduces damage received by 50% for 1 turn",
-		specialName: "Tekkai Dama",
-		captain: "Boosts ATK of STR characters by 1.5x, reduces damage received by 10%"
-	},
-	733: {
-		special: "Deals 13x character's ATK in STR damage to one enemy, reduces damage received by 50% for 1 turn",
-		specialName: "Tekkai Dama",
-		captain: "Boosts ATK of STR characters by 1.5x, reduces damage received by 20%"
-	},
-	734: {
-		special: "For 1 turn, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
-		specialName: "Life Return - Digestion, Absorption",
-		captain: "Boosts ATK and RCV of PSY characters by 1.2x"
-	},
-	735: {
-		special: "For 1 turn, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
-		specialName: "Life Return - Digestion, Absorption",
-		captain: "Boosts ATK and RCV of PSY characters by 1.5x"
-	},
-	736: {
-		special: "Deals 20x character's ATK in STR damage to all enemies, changes [QCK] orbs into [STR] orbs",
-		specialName: "Fierce Smash",
-		captain: "Boosts ATK of Slasher characters by 2.5x if HP is above 50% at the start of the turn"
-	},
-	737: {
-		special: "Changes [RCV] orbs into [QCK] orbs, changes adjacent orbs into [QCK] orbs",
-		specialName: "Shigan - Bachi",
-		captain: "Boosts ATK of Fighter characters by 2.75x if HP is below 30% at the start of the turn"
-	},
-	738: {
-		special: "Deals 200x character's ATK in INT damage to one enemy",
-		specialName: "Ivory Rush",
-		captain: "Boosts ATK of characters with cost 21 or more by 2x"
-	},
-	739: {
-		special: "Reduces Bind duration by 5 turns, randomizes all orbs",
-		specialName: "Coup de Boo",
-		captain: "Boosts ATK of Free Spirit characters by 2x"
-	},
-	740: {
-		special: "Deals 10x character's ATK in QCK damage to all enemies, boosts ATK against enemies with increased defense by 1.3x for 2 turns",
-		specialName: "Rankyaku - Sen",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight"
-	},
-	741: {
-		special: "Deals 10x character's ATK in QCK damage to all enemies, boosts ATK against enemies with increased defense by 1.3x for 2 turns",
-		specialName: "Rankyaku - Sen",
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight"
-	},
-	742: {
-		special: "Amplifies the effect of orbs by 1.25x for 2 turns, reduces the defense of all enemies by 80% for 2 turns",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "Ramen Beam",
-		captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x"
-	},
-	743: {
-		special: "Amplifies the effect of orbs by 1.25x for 2 turns, reduces the defense of all enemies by 80% for 2 turns",
-		specialNotes: "#{orb : 1.25x}",
-		specialName: "Ramen Beam",
-		captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x"
-	},
-	744: {
-		special: "Reduces damage received by 50% for 3 turns",
-		specialName: "Flame Fence",
-		captain: "Boosts ATK of Free Spirit characters by 2x"
-	},
-	745: {
-		special: "Reduces damage received by 50% for 3 turns",
-		specialName: "Flame Fence",
-		captain: "Boosts ATK of Free Spirit characters by 2.5x"
-	},
-	746: {
-		special: "Deals 10x character's ATK in QCK damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Megalo Assault!",
-		specialNotes: "#{zombie}",
-		captain: "Protects from defeat as long as HP is above 30%",
-		captainNotes: "#{zombie}"
-	},
-	747: {
-		special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
-		specialName: "Rokuougan",
-		captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
-	},
-	748: {
-		special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
-		specialName: "Rokuougan",
-		captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
-	},
-	749: {
-		special: "Deals random DEX damage to all enemies, randomizes all orbs",
-		specialName: "Tempest Kick: Sky Slicer",
+    },
+    648: {
+        special: "Recovers 100x character's RCV in HP, amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Blue Flame Kick",
+        captain: "Reduces damage received by 30% if HP is above 70% at the start of the turn, boosts ATK of QCK and PSY characters by 2.75x if HP is above 70% at the start the turn"
+    },
+    649: {
+        special: "Recovers 100x character's RCV in HP, amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Blue Flame Kick",
+        captain: "Reduces damage received by 30% if HP is above 70% at the start of the turn, boosts ATK of QCK and PSY characters by 2.75x if HP is above 70% at the start the turn"
+    },
+    650: {
+        special: "Deals 5,000 fixed damage to one enemy, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{fixed} #{orb : 1.5x}",
+        specialName: "Thunder Lance Tempo",
+        captain: "Boosts ATK of INT characters by 2x and their RCV by 1.5x"
+    },
+    651: {
+        special: "Deals 5,000 fixed damage to one enemy, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{fixed} #{orb : 1.5x}",
+        specialName: "Thunder Lance Tempo",
+        captain: "Boosts ATK of INT characters by 2x and their RCV by 1.5x"
+    },
+    652: {
+        special: "Cuts the current HP of each enemy by 20%, reduces damage received by 50% for 1 turn",
+        specialName: "Heart-Smashing Horn",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of DEX characters by 2x if they have matching orbs"
+    },
+    653: {
+        special: "Cuts the current HP of each enemy by 20%, reduces damage received by 50% for 1 turn",
+        specialName: "Heart-Smashing Horn",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of DEX characters by 2.25x if they have matching orbs"
+    },
+    654: {
+        special: "Cuts the current HP of each enemy by 20%, reduces damage received by 50% for 1 turn",
+        specialName: "Heart-Smashing Horn",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of DEX characters by 2.75x if they have matching orbs"
+    },
+    655: {
+        special: "Changes [EMPTY] and [TND] orbs into [STR] orbs, deals 10x character's ATK in STR damage to one enemy, amplifies the effect of orbs by 1.25x for 2 turns",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "Tooth Gum",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    656: {
+        special: "Changes [EMPTY] and [TND] orbs into [STR] orbs, deals 10x character's ATK in STR damage to one enemy, amplifies the effect of orbs by 1.25x for 2 turns",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "Tooth Gum",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of STR characters by 2x"
+    },
+    657: {
+        special: "Randomly changes [INT] and [PSY] orbs into either [STR] or [EMPTY] orbs",
+        specialName: "Forearm Sledge",
+        captain: "Boosts ATK of Fighter characters by 1.5x"
+    },
+    658: {
+        special: "Randomly changes all orbs into either [INT] or [PSY] orbs",
+        specialName: "Lipowertzer",
+        captain: "Boosts ATK of Shooter characters by 1.5x"
+    },
+    659: {
+        special: "Reduces Bind and Despair duration by 2 turns, reduces damage received by 50% for 2 turns",
+        specialName: "Gum-Gum Balloon Swim",
+        captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
+    },
+    660: {
+        special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Atlas Comet",
+        captain: "Boosts ATK of Shooter characters by 2x"
+    },
+    661: {
+        special: "Delays all enemies for 2 turns, reduces the defense of all enemies by 50% for 2 turns",
+        specialName: "Atlas Comet",
+        captain: "Boosts ATK of Shooter characters by 2x, reduces cooldown of all specials by 1 turn at the start of the fight"
+    },
+    662: {
+        special: "Deals 13x character's ATK in PSY damage to one enemy, randomizes all orbs other than [PSY]",
+        specialName: "Tornado Tempo - Beach Side",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    663: {
+        special: "Deals PSY damage to one enemy according to HP, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
+        specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the lower the HP is. The formula used is 80000 * (1 - (current HP) / (total HP))",
+        specialName: "Vivi's Important Security Guard",
+        captain: "Recovers 2x character's RCV in HP at the end of each turn"
+    },
+    664: {
+        special: "Deals PSY damage to one enemy according to HP, recovers 5x character's RCV in HP at the end of each turn for 5 turns",
+        specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the lower the HP is. The formula used is 80000 * (1 - (current HP) / (total HP))",
+        specialName: "Vivi's Important Security Guard",
+        captain: "Recovers 3x character's RCV in HP at the end of each turn"
+    },
+    665: {
+        special: "Changes own orb into [QCK], boosts ATK against enemies with reduced defense by 1.3x for 2 turns",
+        specialName: "Let's Go! Suna Suna Clan!!",
+        captain: "Boosts ATK of all characters by 1.2x, reduces HP and RCV of all characters by 80%"
+    },
+    666: {
+        special: "Changes own orb into [QCK], boosts ATK against enemies with reduced defense by 1.3x for 2 turns",
+        specialName: "Let's Go! Suna Suna Clan!!",
+        captain: "Boosts ATK of all characters by 1.75x, reduces HP and RCV of all characters by 80%"
+    },
+    667: {
+        special: "Protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "King's Chopper",
+        specialNotes: "#{zombie}",
+        captain: "Reduces damage received by 10%, boosts ATK of all characters by 1.5x"
+    },
+    668: {
+        special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Free Spirit characters by 2x in the following turn.",
+        specialName: "Dragon's Claw",
+        captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
+    },
+    669: {
+        special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Free Spirit characters by 2x in the following turn.",
+        specialName: "Dragon's Claw",
+        captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : higher : 2 + 0.75 * (remaining HP) / (total HP) : 2.75 : 2}"
+    },
+    670: {
+        special: "Boosts ATK of Fighter characters by 1.75x for 1 turn",
+        specialName: "Fishman Karate! True Fist Thrust of the Revolutionaries",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    671: {
+        special: "Boosts ATK of Fighter characters by 1.75x for 1 turn",
+        specialName: "Fishman Karate! True Fist Thrust of the Revolutionaries",
+        captain: "Boosts ATK of Fighter characters by 2.25x and their RCV by 1.5x"
+    },
+    672: {
+        special: "Cuts the current HP of each enemy by 20%, changes own orb into [STR]",
+        specialName: "Four Thousand Tile True Punch",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    673: {
+        special: "Cuts the current HP of each enemy by 20%, changes own orb into [STR]",
+        specialName: "Four Thousand Tile True Punch",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Fighter characters by 2x"
+    },
+    674: {
+        special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
+        specialName: "Emporio Healing Hormone",
+        captain: "Boosts ATK of Free Spirit characters by 2x"
+    },
+    675: {
+        special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
+        specialName: "Emporio Healing Hormone",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x"
+    },
+    676: {
+        special: "Reduces any damage received above 5,000 HP by 97% for 3 turns",
+        specialNotes: "The exact formula for the damage received is: 5000 + ((total damage) - 5000) * 0.03",
+        specialName: "KEEP OUT",
+        captain: "Boosts ATK of Slasher characters by 1.5x, deals 5x character's ATK in QCK damage to all enemies at the end of each turn"
+    },
+    677: {
+        special: "Reduces any damage received above 5,000 HP by 97% for 3 turns",
+        specialNotes: "The exact formula for the damage received is: 5000 + ((total damage) - 5000) * 0.03",
+        specialName: "KEEP OUT",
+        captain: "Boosts ATK of Slasher characters by 1.5x, deals 5x character's ATK in QCK damage to all enemies at the end of each turn"
+    },
+    678: {
+        special: "Reduces damage received by 50% for 1 turn, locks all orbs for 1 turn",
+        specialName: "Cien Fleur Spider Net",
+        captain: "Boosts ATK and RCV of PSY characters by 1.2x, boosts chances of getting [PSY] orbs"
+    },
+    679: {
+        special: "Reduces damage received by 50% for 1 turn, locks all orbs for 1 turn",
+        specialName: "Cien Fleur Spider Net",
+        captain: "Boosts ATK and RCV of PSY characters by 1.5x, boosts chances of getting [PSY] orbs"
+    },
+    680: {
+        special: "Recovers 5x character's RCV in HP, boosts ATK and RCV of DEX characters by 1.25x for 2 turns",
+        specialName: "Midsummer Relax Time"
+    },
+    681: {
+        special: "Recovers 5x character's RCV in HP, boosts ATK and RCV of DEX characters by 1.25x for 2 turns",
+        specialName: "Midsummer Relax Time",
+        captain: "Boosts ATK and RCV of Striker characters by 1.5x"
+    },
+    682: {
+        special: "Recovers 2,561 HP, reduces damage received by 50% for 2 turns",
+        specialName: "Transcendental Serenity Healing"
+    },
+    683: {
+        special: "Recovers 2,561 HP, reduces damage received by 50% for 2 turns",
+        specialName: "Transcendental Serenity Healing",
+        captain: "Boosts ATK and RCV of Fighter characters by 1.5x"
+    },
+    684: {
+        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn",
+        specialName: "Romantic Ghost"
+    },
+    685: {
+        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn",
+        specialName: "Romantic Ghost",
+        captain: "Boosts ATK and RCV of Shooter characters by 1.5x"
+    },
+    686: {
+        special: "Delays all enemies for 1 turn, recovers 3x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Captivating Perfume Dance - Relaxation",
+        captain: "Boosts ATK and RCV of Slasher characters by 1.5x"
+    },
+    687: {
+        special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Free Spirit characters by 1.3x for 1 turn",
+        specialName: "First Spear of the Battle",
+        captain: "Boosts ATK of Free Spirit characters by 1.5x"
+    },
+    688: {
+        special: "Deals 13x character's ATK in STR damage to all enemies, boosts ATK of Free Spirit characters by 1.3x for 1 turn",
+        specialName: "First Spear of the Battle",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Free Spirit characters by 2x"
+    },
+    689: {
+        special: "Amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Botanist's Great Discovery",
+        captain: "Boosts ATK and RCV of Slasher characters by 1.2x"
+    },
+    690: {
+        special: "Amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Botanist's Great Discovery",
+        captain: "Boosts ATK and RCV of Slasher characters by 1.5x"
+    },
+    691: {
+        special: "Changes [PSY] orbs into [DEX] orbs",
+        specialName: "[PSY] Slot Change [DEX]"
+    },
+    692: {
+        special: "Changes [PSY] orbs into [QCK] orbs",
+        specialName: "[PSY] Slot Change [QCK]"
+    },
+    693: {
+        special: "Changes [DEX] orbs into [PSY] orbs",
+        specialName: "[DEX] Slot Change [PSY]"
+    },
+    694: {
+        special: "Deals 13x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Burst"
+    },
+    695: {
+        special: "Cuts the current HP of each enemy by 5%",
+        specialName: "Slight Break"
+    },
+    696: {
+        special: "Changes [PSY] orbs into [DEX] orbs",
+        specialName: "[PSY] Slot Change [DEX]",
+        captain: "Boosts ATK of Striker characters by 1.75x"
+    },
+    697: {
+        special: "Changes [PSY] orbs into [QCK] orbs",
+        specialName: "[PSY] Slot Change [QCK]",
+        captain: "Boosts ATK of Shooter characters by 1.75x"
+    },
+    698: {
+        special: "Changes [DEX] orbs into [PSY] orbs",
+        specialName: "[DEX] Slot Change [PSY]",
+        captain: "Boosts ATK of Slasher characters by 1.75x"
+    },
+    699: {
+        special: "Deals 13x character's ATK in character's type damage to all enemies",
+        specialName: "Hyper Burst",
+        captain: "Boosts ATK of Shooter characters by 500, reduces damage received by 10%"
+    },
+    700: {
+        special: "Cuts the current HP of each enemy by 5%",
+        specialName: "Slight Break",
+        captain: "Boosts ATK of Fighter characters by 1.75x"
+    },
+    701: {
+        special: "Deals 15x character's ATK in PSY damage to all enemies, changes own orb into [PSY]",
+        specialName: "Oimo Press",
+        captain: "Boosts HP of PSY characters by 2.25x"
+    },
+    702: {
+        special: "Seals himself for 5 turns, reduces damage received by 30% for 5 turns",
+        specialName: "Kashi Swing",
+        captain: "Boosts HP of INT characters by 2.25x"
+    },
+    703: {
+        special: "Deals 5x character's ATK in QCK damage to all enemies",
+        specialName: "Arm Claw of the Watchdog"
+    },
+    704: {
+        special: "Deals 9x character's ATK in STR damage to all enemies, reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Companion's Guilt"
+    },
+    705: {
+        special: "Randomly changes [PSY], [INT], [TND], [RCV] and [EMPTY] orbs into [STR], [DEX] or [QCK] orbs",
+        specialName: "Guilty Verdict - \"Slow Death Penalty\"",
+        captain: "Boosts ATK and HP of STR characters, DEX characters and QCK characters by 1.25x"
+    },
+    706: {
+        special: "Changes own orb and the captain's orb into [STR]",
+        specialName: "Air Door",
+        captain: "Boosts ATK of STR characters by 1.5x"
+    },
+    707: {
+        special: "Changes own orb and the captain's orb into [STR]",
+        specialName: "Air Door",
+        captain: "Boosts ATK and HP of STR characters by 1.5x"
+    },
+    708: {
+        special: "Reduces Bind and Despair duration by 3 turns",
+        specialName: "Cien Fleur - Wing",
+        captain: "Boosts ATK and RCV of PSY characters by 1.2x"
+    },
+    709: {
+        special: "Reduces Bind and Despair duration by 3 turns",
+        specialName: "Cien Fleur - Wing",
+        captain: "Boosts ATK and RCV of PSY characters by 1.5x"
+    },
+    710: {
+        special: "Empties all slots with [BLOCK] orbs, boosts ATK of Shooter characters by 1.25x for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
+        specialName: "Coup de Vent",
+        captain: "Boosts ATK of Shooter characters by 1.5x"
+    },
+    711: {
+        special: "Empties all slots with [BLOCK] orbs, boosts ATK of Shooter characters by 1.25x for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
+        specialName: "Coup de Vent",
+        captain: "Boosts ATK of Shooter characters by 2x"
+    },
+    712: {
+        special: "Deals 15x character's ATK in QCK damage to one enemy, boosts ATK of the characters in the top row by 1.5x for 2 turns",
+        specialNotes: "The special boosts the attack of only the crew's captain and the currently selected friend captain.",
+        specialName: "Sky Knight's Javelin",
+        captain: "Boosts ATK of Striker characters by 2x if HP is above 50% at the start of the turn"
+    },
+    713: {
+        special: "Deals 15x character's ATK in QCK damage to one enemy, boosts ATK of the characters in the top row by 1.5x for 2 turns",
+        specialNotes: "The special boosts the attack of only the crew's captain and the currently selected friend captain.",
+        specialName: "Sky Knight's Javelin",
+        captain: "Boosts ATK of Striker characters by 2.5x if HP is above 50% at the start of the turn"
+    },
+    714: {
+        special: "Randomizes slots with [STR], [QCK], [INT] or [PSY] orbs",
+        specialName: "Pegasus' Neigh"
+    },
+    715: {
+        special: "Boosts ATK and RCV of Free Spirit characters by 1.5x for 2 turns, seals herself for 3 turns",
+        specialName: "Angel's Harp - Healing",
+        captain: "Boosts RCV of all characters by 2x if HP is below 30% at the start of the turn"
+    },
+    716: {
+        special: "Boosts ATK and RCV of Free Spirit characters by 1.5x for 2 turns, seals herself for 3 turns",
+        specialName: "Angel's Harp - Healing",
+        captain: "Boosts RCV of all characters by 5x if HP is below 30% at the start of the turn"
+    },
+    717: {
+        special: "Deals 50% of the damage dealt in the previous turn as typeless damage to all enemies",
+        specialNotes: "The special only includes the damage inflicted through normal attacks.",
+        specialName: "Black Sword - Lightning Slash",
+        captain: "Boosts ATK of Slasher characters by a variable factor between 2x and 2.75x based on the timing of the attack of the previous unit in the chain",
+        captainNotes: "A hit below Good or a Miss will boost the ATK of the next unit by 2x, a Good hit by 2.25x, a Great hit by 2.5x and a Perfect hit by 2.75x. This bonus is applied only to Slasher characters."
+    },
+    718: {
+        special: "Deals 50% of the damage dealt in the previous turn as typeless damage to all enemies",
+        specialNotes: "The special only includes the damage inflicted through normal attacks.",
+        specialName: "Black Sword - Lightning Slash",
+        captain: "Boosts ATK of Slasher characters by a variable factor between 2x and 2.75x based on the timing of the attack of the previous unit in the chain",
+        captainNotes: "A hit below Good or a Miss will boost the ATK of the next unit by 2x, a Good hit by 2.25x, a Great hit by 2.5x and a Perfect hit by 2.75x. This bonus is applied only to Slasher characters."
+    },
+    719: {
+        special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
+        specialName: "Sables: Pesado",
+        captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
+    },
+    720: {
+        special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
+        specialName: "Sables: Pesado",
+        captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
+    },
+    721: {
+        special: "Randomizes all orbs, including [BLOCK] orbs",
+        specialName: "Screw Drop Kick",
+        captain: "Boosts ATK of Fighter characters by 1.5x if HP is is above 99% at the start of the turn"
+    },
+    722: {
+        special: "Randomizes all orbs, including [BLOCK] orbs",
+        specialName: "Screw Drop Kick",
+        captain: "Boosts ATK of Fighter characters by 2x if HP is is above 99% at the start of the turn"
+    },
+    723: {
+        special: "Reduces crew's current HP by 80%, deals 5x the amount of HP subtracted in typeless damage to all enemies, reduces damage received by 90% for 1 turn",
+        specialName: "Right Angle Flying Bird: Bone Phoenix",
+        captain: "Boosts ATK of Slasher characters by 1.5x, recovers 1.2x character's RCV in HP at the end of each turn"
+    },
+    724: {
+        special: "Reduces crew's current HP by 80%, deals 5x the amount of HP subtracted in typeless damage to all enemies, reduces damage received by 90% for 1 turn",
+        specialName: "Right Angle Flying Bird: Bone Phoenix",
+        captain: "Boosts ATK of Slasher characters by 1.75x, recovers 1.5x character's RCV in HP at the end of each turn"
+    },
+    725: {
+        special: "Changes [TND] orbs into [QCK] orbs, switches orbs between slots twice",
+        specialName: "Peacock String Slasher",
+        captain: "Recovers 1,000 HP at the end of each turn"
+    },
+    726: {
+        special: "Changes [TND] orbs into [QCK] orbs, switches orbs between slots twice",
+        specialName: "Peacock String Slasher",
+        captain: "Recovers 2,000 HP at the end of each turn"
+    },
+    727: {
+        special: "Deals 10x character's ATK in DEX damage to all enemies, reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Gum-Gum Gatling",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Free Spirit and Fighter characters by 1.75x"
+    },
+    728: {
+        special: "Randomizes all orbs, recovers 6x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Sheep Cloud Relaxing Bubbles",
+        captain: "Boosts ATK and RCV of DEX characters by 1.2x, slightly boosts chances of getting [DEX] orbs"
+    },
+    729: {
+        special: "Randomizes all orbs, recovers 6x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Sheep Cloud Relaxing Bubbles",
+        captain: "Boosts ATK and RCV of DEX characters by 1.2x, boosts chances of getting [DEX] orbs"
+    },
+    730: {
+        special: "Reduces crew's current HP by 99%, deals 2x the amount of HP subtracted in INT damage to all enemies, boosts ATK of INT characters by 1.5x for 1 turn",
+        specialName: "Rankyaku - Lupus Fall",
+        captain: "Boosts ATK and HP of INT characters by 1.2x, deals 9 HP as fixed damage to all enemies at the end of each turn",
+        captainNotes: "#{fixed}"
+    },
+    731: {
+        special: "Reduces crew's current HP by 99%, deals 2x the amount of HP subtracted in INT damage to all enemies, boosts ATK of INT characters by 1.5x for 1 turn",
+        specialName: "Rankyaku - Lupus Fall",
+        captain: "Boosts ATK and HP of INT characters by 1.5x, deals 9 HP as fixed damage to all enemies at the end of each turn",
+        captainNotes: "#{fixed}"
+    },
+    732: {
+        special: "Deals 13x character's ATK in STR damage to one enemy, reduces damage received by 50% for 1 turn",
+        specialName: "Tekkai Dama",
+        captain: "Boosts ATK of STR characters by 1.5x, reduces damage received by 10%"
+    },
+    733: {
+        special: "Deals 13x character's ATK in STR damage to one enemy, reduces damage received by 50% for 1 turn",
+        specialName: "Tekkai Dama",
+        captain: "Boosts ATK of STR characters by 1.5x, reduces damage received by 20%"
+    },
+    734: {
+        special: "For 1 turn, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
+        specialName: "Life Return - Digestion, Absorption",
+        captain: "Boosts ATK and RCV of PSY characters by 1.2x"
+    },
+    735: {
+        special: "For 1 turn, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
+        specialName: "Life Return - Digestion, Absorption",
+        captain: "Boosts ATK and RCV of PSY characters by 1.5x"
+    },
+    736: {
+        special: "Deals 20x character's ATK in STR damage to all enemies, changes [QCK] orbs into [STR] orbs",
+        specialName: "Fierce Smash",
+        captain: "Boosts ATK of Slasher characters by 2.5x if HP is above 50% at the start of the turn"
+    },
+    737: {
+        special: "Changes [RCV] orbs into [QCK] orbs, changes adjacent orbs into [QCK] orbs",
+        specialName: "Shigan - Bachi",
+        captain: "Boosts ATK of Fighter characters by 2.75x if HP is below 30% at the start of the turn"
+    },
+    738: {
+        special: "Deals 200x character's ATK in INT damage to one enemy",
+        specialName: "Ivory Rush",
+        captain: "Boosts ATK of characters with cost 21 or more by 2x"
+    },
+    739: {
+        special: "Reduces Bind duration by 5 turns, randomizes all orbs",
+        specialName: "Coup de Boo",
+        captain: "Boosts ATK of Free Spirit characters by 2x"
+    },
+    740: {
+        special: "Deals 10x character's ATK in QCK damage to all enemies, boosts ATK against enemies with increased defense by 1.3x for 2 turns",
+        specialName: "Rankyaku - Sen",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight"
+    },
+    741: {
+        special: "Deals 10x character's ATK in QCK damage to all enemies, boosts ATK against enemies with increased defense by 1.3x for 2 turns",
+        specialName: "Rankyaku - Sen",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight"
+    },
+    742: {
+        special: "Amplifies the effect of orbs by 1.25x for 2 turns, reduces the defense of all enemies by 80% for 2 turns",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "Ramen Beam",
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x"
+    },
+    743: {
+        special: "Amplifies the effect of orbs by 1.25x for 2 turns, reduces the defense of all enemies by 80% for 2 turns",
+        specialNotes: "#{orb : 1.25x}",
+        specialName: "Ramen Beam",
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x"
+    },
+    744: {
+        special: "Reduces damage received by 50% for 3 turns",
+        specialName: "Flame Fence",
+        captain: "Boosts ATK of Free Spirit characters by 2x"
+    },
+    745: {
+        special: "Reduces damage received by 50% for 3 turns",
+        specialName: "Flame Fence",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x"
+    },
+    746: {
+        special: "Deals 10x character's ATK in QCK damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Megalo Assault!",
+        specialNotes: "#{zombie}",
+        captain: "Protects from defeat as long as HP is above 30%",
+        captainNotes: "#{zombie}"
+    },
+    747: {
+        special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
+        specialName: "Rokuougan",
+        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+    },
+    748: {
+        special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
+        specialName: "Rokuougan",
+        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+    },
+    749: {
+        special: "Deals random DEX damage to all enemies, randomizes all orbs",
+        specialName: "Tempest Kick: Sky Slicer",
         specialNotes: "The random damage is between 10,000 and 90,000",
-		captain: "Boosts ATK of DEX characters by 1.5x, boosts damage of DEX specials by 1.5x",
-		captainNotes: "#{noFixedPerc}"
-	},
-	750: {
-		special: "Deals random DEX damage to all enemies, randomizes all orbs",
-		specialName: "Tempest Kick: Sky Slicer",
+        captain: "Boosts ATK of DEX characters by 1.5x, boosts damage of DEX specials by 1.5x",
+        captainNotes: "#{noFixedPerc}"
+    },
+    750: {
+        special: "Deals random DEX damage to all enemies, randomizes all orbs",
+        specialName: "Tempest Kick: Sky Slicer",
         specialNotes: "The random damage is between 10,000 and 90,000",
-		captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
-		captainNotes: "#{noFixedPerc}"
-	},
-	751: {
-		special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
-		specialName: "Sheep Cloud Tidal Wave",
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
-	},
-	752: {
-		special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
-		specialName: "Sheep Cloud Tidal Wave",
-		captain: "Boosts ATK of Cerebral characters by 2.25x and their RCV by 1.5x"
-	},
-	753: {
-		special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialNotes: "#{orb : 1.75x}",
-		specialName: "Moonlight Ten Finger Pistol",
-		captain: "Boosts ATK of Powerhouse characters by 2x"
-	},
-	754: {
-		special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialNotes: "#{orb : 1.75x}",
-		specialName: "Moonlight Ten Finger Pistol",
-		captain: "Boosts ATK of Powerhouse characters by 2.5x"
-	},
-	755: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
-		specialName: "Tekkai - Rin",
-		captain: "Boosts ATK of INT characters by 1.5x, reduces damage received from PSY enemies by 20%"
-	},
-	756: {
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
-		specialName: "Tekkai - Rin",
-		captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%"
-	},
-	757: {
-		special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
-		specialName: "Solid Beast Supreme Technique: Owl Strike",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	758: {
-		special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
-		specialName: "Solid Beast Supreme Technique: Owl Strike",
-		captain: "Boosts ATK of PSY characters by 2x, recovers 3x character's RCV in HP at the end of each turn"
-	},
-	759: {
-		special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
-		specialName: "Life Return: Shishi Finger Pistol",
-		captain: "Boosts ATK of STR characters by 2.5x if HP is below 30% at the start of the turn"
-	},
-	760: {
-		special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
-		specialName: "Life Return: Shishi Finger Pistol",
-		captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn"
-	},
-	761: {
-		special: "Deals 15x character's ATK in DEX damage to one enemy, boosts ATK of all characters by 1.2x for 1 turn",
-		specialName: "Gum-Gum Monster Pistol",
-		captain: "Boosts ATK of Fighter characters by 2x"
-	},
-	762: {
-		special: "Boosts ATK of PSY characters by 1.75x for 1 turn",
-		specialName: "Impact Beast",
-		captain: "Boosts ATK and RCV of PSY characters by 1.5x"
-	},
-	763: {
-		special: "Changes own orb into [STR], switches orbs between slots once",
-		specialName: "Franken-Franky Centaur",
-		captain: "Boosts ATK of STR characters by 2x"
-	},
-	764: {
-		special: "Recovers 3,000 HP",
-		specialName: "Cat Burglar Trick",
-		captain: "Boosts ATK and RCV of Striker characters by 1.5x"
-	},
-	765: {
-		special: "Reduces Despair duration by 3 turns",
-		specialName: "Scope Magic",
-		captain: "Recovers 2x character's RCV in HP at the end of each turn"
-	},
-	766: {
-		special: "Deals 7x character's ATK in QCK damage to all enemies, delays all enemies for 1 turn",
-		specialName: "108 Pound Phoenix: Reaper",
-		captain: "Boosts ATK of QCK characters by 2x"
-	},
-	767: {
-		special: {
-			"japan": "Changes the orbs in the top row into [DEX] orbs, removes blindness",
-			"global": "Changes the orbs in the top row into [DEX] orbs, reduces Despair duration by 1 turn"
-		},
-		specialName: "Ojos Fleur: Thriller",
-		captain: "Boosts ATK and RCV of DEX characters by 1.5x"
-	},
-	768: {
-		special: "Recovers 15x character's RCV in HP, changes [TND] orbs into [RCV] orbs",
-		specialName: "Hot Rock Stew: Party",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	769: {
-		special: "Recovers 4,343 HP, poisons all enemies",
-		specialNotes: "#{poison}",
-		specialName: "Lullaby Parry: Horror",
-		captain: "Boosts ATK and RCV of INT characters by 1.5x"
-	},
-	770: {
-		special: "Deals 15x character's ATK in STR damage to one enemy, boosts ATK against delayed enemies by 1.3x for 2 turns",
-		specialName: "Shigan: Convergence",
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of STR characters by 2x"
-	},
-	771: {
-		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of Cerebral characters by 1.75x for 1 turn",
-		specialName: "Moonwalk: Air Walking",
-		captain: "Boosts ATK of Cerebral characters by 2.5x"
-	},
-	772: {
-		special: "Cuts the current HP of each enemy by 10%, changes [PSY] and [INT] orbs into [DEX] orbs",
-		specialName: "Eight-Sword Style: Brave Warrior's Continuous Attack",
-		captain: "Boosts ATK of Slasher characters by 2x, reduces damage received from QCK enemies by 20%"
-	},
-	773: {
-		special: "Reduces any damage received above 3,000 HP by 80% for 1 turn",
-		specialNotes: "The exact formula for the damage received is: 3000 + ((total damage) - 3000) * 0.2",
-		specialName: "Rust-Rust Fruit",
-		captain: "Reduces damage received by 20%"
-	},
-	774: {
-		special: "Randomly changes [TND], [RCV], [EMPTY], [BLOCK] and [BOMB] orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs, switches orbs between slots 3 times",
-		specialName: "Berry-Berry Fruit",
-		captain: "Boosts ATK of Free Spirit characters by 2x"
-	},
-	775: {
-		special: "Deals several times the character's ATK in PSY damage to one enemy",
-		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Angry Headbutt",
-		captain: "Boosts ATK and HP of Cerebral characters by 1.5x"
-	},
-	776: {
-		specialName: "Boisterous Lucky Shot!!",
-		special: "Recovers 5,000 HP, deals 15x character's ATK in PSY damage to one enemy, seals himself for 3 turns",
-		captain: "Boosts ATK and RCV of PSY characters by 1.25x"
-	},
-	777: {
-		special: "Recovers 5,000 HP, deals 15x character's ATK in PSY damage to one enemy, seals himself for 3 turns",
-		specialName: "Boisterous Lucky Shot!!",
-		captain: "Boosts ATK and RCV of PSY characters by 1.75x"
-	},
-	778: {
-		special: "Deals several times the character's ATK in QCK damage to one enemy, changes own orb into [QCK]",
-		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Undefeated Sword Technique",
-		captain: "Reduces damage received by 20%"
-	},
-	779: {
-		special: "Deals several times the character's ATK in QCK damage to one enemy, changes own orb into [QCK]",
-		specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Undefeated Sword Technique",
-		captain: "Reduces damage received by 25%"
-	},
-	780: {
-		special: "Boosts own ATK by a variable factor for 1 turn",
-		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 1.5x; between 20% HP and 50% HP, it's 1.75x; below 20% HP, it's 2x.",
-		specialName: "Precept Deification",
-		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn"
-	},
-	781: {
-		special: "Boosts own ATK by a variable factor for 1 turn",
-		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 1.5x; between 20% HP and 50% HP, it's 1.75x; below 20% HP, it's 2x.",
-		specialName: "Precept Deification",
-		captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn"
-	},
-	782: {
-		special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
-		specialName: "Smile of a Natural Beauty",
-		captain: "Boosts RCV of Slasher characters by 1.5x"
-	},
-	783: {
-		special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
-		specialName: "Smile of a Natural Beauty",
-		captain: "Boosts ATK of Slasher characters by 2x and their RCV by 1.5x"
-	},
-	784: {
-		special: "Reduces Despair duration by 2 turns, removes blindness",
-		specialName: "Yelling at Lascivious Young Women"
-	},
-	785: {
-		special: "Reduces Despair duration by 2 turns, removes blindness",
-		specialName: "Yelling at Lascivious Young Women",
-		captain: "Reduces damage received by 20%"
-	},
-	786: {
-		special: "Seals himself for 10 turns, delays all enemies for 1 turn, reduces damage received by 50% for 4 turns",
-		specialName: "The Resolve to Face Death! \"Open Mind\""
-	},
-	787: {
-		special: "Seals himself for 10 turns, delays all enemies for 1 turn, reduces damage received by 50% for 4 turns",
-		specialName: "The Resolve to Face Death! \"Open Mind\"",
-		captain: "Reduces damage received by 50%, reduces crew's current HP by 10% at the end of each turn"
-	},
-	788: {
-		special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Slasher characters by 1.75x in the following turn",
-		specialName: "Real Sword Fight with a Girl Swordsman"
-	},
-	789: {
-		special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Slasher characters by 1.75x in the following turn",
-		specialName: "Real Sword Fight with a Girl Swordsman",
-		captain: "Boosts ATK of Slasher characters by 1.5x"
-	},
-	790: {
-		special: "Deals 3x character's ATK in QCK damage to one enemy, boosts ATK of STR, DEX and QCK characters by 1.2x for 3 turns",
-		specialName: "March!! Usopp Pirates"
-	},
-	791: {
-		special: "Deals 3x character's ATK in QCK damage to one enemy, boosts ATK of STR, DEX and QCK characters by 1.2x for 3 turns",
-		specialName: "March!! Usopp Pirates",
-		captain: "Boosts ATK, HP and RCV of STR, DEX and QCK characters by 1.25x"
-	},
-	792: {
-		special: "Randomly changes all orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, switches orbs between slots twice, locks all orbs for 1 turn",
-		specialName: "The Entushiasm to Keep Skilled Workers in Line"
-	},
-	793: {
-		special: "Randomly changes all orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, switches orbs between slots twice, locks all orbs for 1 turn",
-		specialName: "The Entushiasm to Keep Skilled Workers in Line",
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
-	},
-	794: {
-		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
-		specialName: "Gum-Gum Storm",
-		captain: "Boosts ATK of Powerhouse characters by 3x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters. You will not die to the HP reduction"
-	},
-	795: {
-		special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
-		specialName: "Gum-Gum Storm",
-		captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters. You will not die to the HP reduction"
-	},
-	796: {
-		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
-		specialName: "Peto-Peto Fruit, The Greatest Power",
-		captain: "Boosts ATK of Cerebral characters by 2x"
-	},
-	797: {
-		special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
-		specialName: "Peto-Peto Fruit, The Greatest Power",
-		captain: "Boosts ATK of Cerebral and Powerhouse characters by 2x"
-	},
-	798: {
-		special: "Removes poison, following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Fighter characters by 1.75x in the following turn",
-		specialName: "Dugong Secret! Fist of the Black Fin",
-		captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
-	},
-	799: {
-		special: "Randomizes all orbs, recovers 9x character's RCV in HP",
-		specialName: "Sea Animal Healing"
-	},
-	800: {
-		special: "Randomly changes all orbs into either [STR], [DEX] or [QCK] orbs",
-		specialName: "Octopus Tentacle Blow"
-	},
-	801: {
-		special: "Randomly changes [STR], [QCK], [DEX], [INT], [BOMB] and [BLOCK] orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, changes [TND] and [RCV] orbs into [PSY] orbs",
-		specialName: "Clone-Clone Montage",
-		captain: "Boosts ATK of PSY characters by 2x"
-	},
-	802: {
-		special: "Randomly changes [STR], [QCK], [DEX], [INT], [BOMB] and [BLOCK] orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, changes [TND] and [RCV] orbs into [PSY] orbs",
-		specialName: "Clone-Clone Montage",
-		captain: "Boosts ATK of PSY characters by 2.5x"
-	},
-	803: {
-		special: "Deals 8 hits of random DEX damage to random enemies, boosts ATK of all characters by 1.1x for 3 turns",
-		specialNotes: "#{randomHits : 8}",
-		specialName: "Black Spear Formation: All-Out Attack!",
-		captain: "Boosts ATK and RCV of DEX characters by 1.2x"
-	},
-	804: {
-		special: "Deals 8 hits of random DEX damage to random enemies, boosts ATK of all characters by 1.1x for 3 turns",
-		specialNotes: "#{randomHits : 8}",
-		specialName: "Black Spear Formation: All-Out Attack!",
-		captain: "Boosts ATK and RCV of DEX characters by 1.5x, deals 1x character's ATK in DEX damage to all enemies at the end of each turn"
-	},
-	805: {
-		special: "Reduces crew's current HP by 20%, deals 10x the amount of HP subtracted in INT damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialName: "White Vine",
-		captain: "Boosts ATK of Striker characters by 2x",
-		specialNotes: "#{orb : 1.75x}"
-	},
-	806: {
-		special: "Reduces crew's current HP by 20%, deals 10x the amount of HP subtracted in INT damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialName: "White Vine",
-		captain: "Boosts ATK of Striker characters by 2x, reduces damage received up to 30% depending on the crew's current HP",
-		specialNotes: "#{orb : 1.75x}"
-	},
-	807: {
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
-		specialName: "Thunder Charge: Swing Arm",
-		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
-	},
-	808: {
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x, recovers 2x character's RCV in HP at the end of each turn",
-		specialName: "Thunder Charge: Swing Arm",
-		special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
-	},
-	809: {
-		captain: "Boosts ATK and RCV of Powerhouse characters by 1.5x",
-		specialName: "Lola's Attack Chance",
-		special: "Reduces the defense of all enemies by 80% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}"
-	},
-	810: {
-		captain: "Boosts ATK of Powerhouse characters by 2x and their RCV by 1.5x, reduces crew's current HP by 10% at the end of each turn",
-		specialName: "Lola's Attack Chance",
-		special: "Reduces the defense of all enemies by 80% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}"
-	},
-	811: {
-		specialName: "Birdbrain Present",
-		special: "Changes own orb into DEX, switches orbs between slots once"
-	},
-	812: {
-		specialName: "Hell Howl",
-		special: "Sharply reduces the defense of all enemies for 1 turn"
-	},
-	813: {
-		specialName: "Sticky Spider Net",
-		special: "Delays all enemies for 1 turn, amplifies the effect of orbs by 1.25x for 1 turn",
-		specialNotes: "#{orb : 1.25x}"
-	},
-	814: {
-		specialName: "Carpet Scratch",
-		special: "Deals 13x character's ATK in DEX damage to a single enemy, changes captain's orb into [TND]"
-	},
-	815: {
-		captain: "Boosts ATK by 2.5x following a chain of STR > INT > DEX attacks no lower than Good",
-		specialName: "Brick Bat",
-		special: "Deals 10 hits of 5,000 fixed damage to random enemies",
-		specialNotes: "#{fixed} #{randomHits : 10}"
-	},
-	816: {
-		captain: "Boosts ATK by 2.75x following a chain of STR > INT > DEX attacks no lower than Good",
-		specialName: "Brick Bat",
-		special: "Deals 10 hits of 5,000 fixed damage to random enemies",
-		specialNotes: "#{fixed} #{randomHits : 10}"
-	},
-	817: {
-		specialName: "[PSY] Slot Change [STR]",
-		special: "Changes [PSY] orbs into [STR] orbs"
-	},
-	818: {
-		specialName: "Quick Change",
-		special: "Switches orbs between slots once"
-	},
-	819: {
-		specialName: "Hyper Burst",
-		special: "Deals 13x character's ATK in character's type damage to all enemies"
-	},
-	820: {
-		specialName: "[TND] Slot Change [INT]",
-		special: "Changes [TND] orbs into [INT] orbs"
-	},
-	821: {
-		specialName: "Slot Shuffle",
-		special: "Randomizes all orbs"
-	},
-	822: {
-		specialName: "Patch Job",
-		special: "Boosts RCV of all characters by 100 for 3 turns"
-	},
-	823: {
-		specialName: "Slot Rate Up [INT]",
-		special: "Slightly boosts chances of getting [INT] orbs for 3 turns"
-	},
-	824: {
-		specialName: "Auto Repair",
-		special: "Recovers 3x character's RCV in HP at the end of each turn for 5 turns"
-	},
-	825: {
-		captain: "Boosts ATK and HP of STR characters by 1.5x",
-		specialName: "Energy of the Ancient Knight",
-		special: "Boosts ATK of STR characters by 200 for 1 turn"
-	},
-	826: {
-		captain: "Boosts ATK and HP of DEX characters by 1.5x",
-		specialName: "Weakness of the Ancient Knight",
-		special: "Delays all enemies for 1 turn, reduces the ATK of all characters by 80% for 2 turns"
-	},
-	827: {
-		captain: "Boosts ATK and HP of QCK characters by 1.5x",
-		specialName: "Poison of the Ancient Knight",
-		special: "Boosts ATK against poisoned enemies by 1.05x for 999 turns"
-	},
+        captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
+        captainNotes: "#{noFixedPerc}"
+    },
+    751: {
+        special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
+        specialName: "Sheep Cloud Tidal Wave",
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
+    },
+    752: {
+        special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
+        specialName: "Sheep Cloud Tidal Wave",
+        captain: "Boosts ATK of Cerebral characters by 2.25x and their RCV by 1.5x"
+    },
+    753: {
+        special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{orb : 1.75x}",
+        specialName: "Moonlight Ten Finger Pistol",
+        captain: "Boosts ATK of Powerhouse characters by 2x"
+    },
+    754: {
+        special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{orb : 1.75x}",
+        specialName: "Moonlight Ten Finger Pistol",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x"
+    },
+    755: {
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
+        specialName: "Tekkai - Rin",
+        captain: "Boosts ATK of INT characters by 1.5x, reduces damage received from PSY enemies by 20%"
+    },
+    756: {
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
+        specialName: "Tekkai - Rin",
+        captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%"
+    },
+    757: {
+        special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
+        specialName: "Solid Beast Supreme Technique: Owl Strike",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    758: {
+        special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
+        specialName: "Solid Beast Supreme Technique: Owl Strike",
+        captain: "Boosts ATK of PSY characters by 2x, recovers 3x character's RCV in HP at the end of each turn"
+    },
+    759: {
+        special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
+        specialName: "Life Return: Shishi Finger Pistol",
+        captain: "Boosts ATK of STR characters by 2.5x if HP is below 30% at the start of the turn"
+    },
+    760: {
+        special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
+        specialName: "Life Return: Shishi Finger Pistol",
+        captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn"
+    },
+    761: {
+        special: "Deals 15x character's ATK in DEX damage to one enemy, boosts ATK of all characters by 1.2x for 1 turn",
+        specialName: "Gum-Gum Monster Pistol",
+        captain: "Boosts ATK of Fighter characters by 2x"
+    },
+    762: {
+        special: "Boosts ATK of PSY characters by 1.75x for 1 turn",
+        specialName: "Impact Beast",
+        captain: "Boosts ATK and RCV of PSY characters by 1.5x"
+    },
+    763: {
+        special: "Changes own orb into [STR], switches orbs between slots once",
+        specialName: "Franken-Franky Centaur",
+        captain: "Boosts ATK of STR characters by 2x"
+    },
+    764: {
+        special: "Recovers 3,000 HP",
+        specialName: "Cat Burglar Trick",
+        captain: "Boosts ATK and RCV of Striker characters by 1.5x"
+    },
+    765: {
+        special: "Reduces Despair duration by 3 turns",
+        specialName: "Scope Magic",
+        captain: "Recovers 2x character's RCV in HP at the end of each turn"
+    },
+    766: {
+        special: "Deals 7x character's ATK in QCK damage to all enemies, delays all enemies for 1 turn",
+        specialName: "108 Pound Phoenix: Reaper",
+        captain: "Boosts ATK of QCK characters by 2x"
+    },
+    767: {
+        special: {
+            "japan": "Changes the orbs in the top row into [DEX] orbs, removes blindness",
+            "global": "Changes the orbs in the top row into [DEX] orbs, reduces Despair duration by 1 turn"
+        },
+        specialName: "Ojos Fleur: Thriller",
+        captain: "Boosts ATK and RCV of DEX characters by 1.5x"
+    },
+    768: {
+        special: "Recovers 15x character's RCV in HP, changes [TND] orbs into [RCV] orbs",
+        specialName: "Hot Rock Stew: Party",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    769: {
+        special: "Recovers 4,343 HP, poisons all enemies",
+        specialNotes: "#{poison}",
+        specialName: "Lullaby Parry: Horror",
+        captain: "Boosts ATK and RCV of INT characters by 1.5x"
+    },
+    770: {
+        special: "Deals 15x character's ATK in STR damage to one enemy, boosts ATK against delayed enemies by 1.3x for 2 turns",
+        specialName: "Shigan: Convergence",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of STR characters by 2x"
+    },
+    771: {
+        special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK of Cerebral characters by 1.75x for 1 turn",
+        specialName: "Moonwalk: Air Walking",
+        captain: "Boosts ATK of Cerebral characters by 2.5x"
+    },
+    772: {
+        special: "Cuts the current HP of each enemy by 10%, changes [PSY] and [INT] orbs into [DEX] orbs",
+        specialName: "Eight-Sword Style: Brave Warrior's Continuous Attack",
+        captain: "Boosts ATK of Slasher characters by 2x, reduces damage received from QCK enemies by 20%"
+    },
+    773: {
+        special: "Reduces any damage received above 3,000 HP by 80% for 1 turn",
+        specialNotes: "The exact formula for the damage received is: 3000 + ((total damage) - 3000) * 0.2",
+        specialName: "Rust-Rust Fruit",
+        captain: "Reduces damage received by 20%"
+    },
+    774: {
+        special: "Randomly changes [TND], [RCV], [EMPTY], [BLOCK] and [BOMB] orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs, switches orbs between slots 3 times",
+        specialName: "Berry-Berry Fruit",
+        captain: "Boosts ATK of Free Spirit characters by 2x"
+    },
+    775: {
+        special: "Deals several times the character's ATK in PSY damage to one enemy",
+        specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Angry Headbutt",
+        captain: "Boosts ATK and HP of Cerebral characters by 1.5x"
+    },
+    776: {
+        specialName: "Boisterous Lucky Shot!!",
+        special: "Recovers 5,000 HP, deals 15x character's ATK in PSY damage to one enemy, seals himself for 3 turns",
+        captain: "Boosts ATK and RCV of PSY characters by 1.25x"
+    },
+    777: {
+        special: "Recovers 5,000 HP, deals 15x character's ATK in PSY damage to one enemy, seals himself for 3 turns",
+        specialName: "Boisterous Lucky Shot!!",
+        captain: "Boosts ATK and RCV of PSY characters by 1.75x"
+    },
+    778: {
+        special: "Deals several times the character's ATK in QCK damage to one enemy, changes own orb into [QCK]",
+        specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Undefeated Sword Technique",
+        captain: "Reduces damage received by 20%"
+    },
+    779: {
+        special: "Deals several times the character's ATK in QCK damage to one enemy, changes own orb into [QCK]",
+        specialNotes: "#{specialProportional : lower : 125 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Undefeated Sword Technique",
+        captain: "Reduces damage received by 25%"
+    },
+    780: {
+        special: "Boosts own ATK by a variable factor for 1 turn",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 1.5x; between 20% HP and 50% HP, it's 1.75x; below 20% HP, it's 2x.",
+        specialName: "Precept Deification",
+        captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn"
+    },
+    781: {
+        special: "Boosts own ATK by a variable factor for 1 turn",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 1.5x; between 20% HP and 50% HP, it's 1.75x; below 20% HP, it's 2x.",
+        specialName: "Precept Deification",
+        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn"
+    },
+    782: {
+        special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
+        specialName: "Smile of a Natural Beauty",
+        captain: "Boosts RCV of Slasher characters by 1.5x"
+    },
+    783: {
+        special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
+        specialName: "Smile of a Natural Beauty",
+        captain: "Boosts ATK of Slasher characters by 2x and their RCV by 1.5x"
+    },
+    784: {
+        special: "Reduces Despair duration by 2 turns, removes blindness",
+        specialName: "Yelling at Lascivious Young Women"
+    },
+    785: {
+        special: "Reduces Despair duration by 2 turns, removes blindness",
+        specialName: "Yelling at Lascivious Young Women",
+        captain: "Reduces damage received by 20%"
+    },
+    786: {
+        special: "Seals himself for 10 turns, delays all enemies for 1 turn, reduces damage received by 50% for 4 turns",
+        specialName: "The Resolve to Face Death! \"Open Mind\""
+    },
+    787: {
+        special: "Seals himself for 10 turns, delays all enemies for 1 turn, reduces damage received by 50% for 4 turns",
+        specialName: "The Resolve to Face Death! \"Open Mind\"",
+        captain: "Reduces damage received by 50%, reduces crew's current HP by 10% at the end of each turn"
+    },
+    788: {
+        special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Slasher characters by 1.75x in the following turn",
+        specialName: "Real Sword Fight with a Girl Swordsman"
+    },
+    789: {
+        special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Slasher characters by 1.75x in the following turn",
+        specialName: "Real Sword Fight with a Girl Swordsman",
+        captain: "Boosts ATK of Slasher characters by 1.5x"
+    },
+    790: {
+        special: "Deals 3x character's ATK in QCK damage to one enemy, boosts ATK of STR, DEX and QCK characters by 1.2x for 3 turns",
+        specialName: "March!! Usopp Pirates"
+    },
+    791: {
+        special: "Deals 3x character's ATK in QCK damage to one enemy, boosts ATK of STR, DEX and QCK characters by 1.2x for 3 turns",
+        specialName: "March!! Usopp Pirates",
+        captain: "Boosts ATK, HP and RCV of STR, DEX and QCK characters by 1.25x"
+    },
+    792: {
+        special: "Randomly changes all orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, switches orbs between slots twice, locks all orbs for 1 turn",
+        specialName: "The Entushiasm to Keep Skilled Workers in Line"
+    },
+    793: {
+        special: "Randomly changes all orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, switches orbs between slots twice, locks all orbs for 1 turn",
+        specialName: "The Entushiasm to Keep Skilled Workers in Line",
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
+    },
+    794: {
+        special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
+        specialName: "Gum-Gum Storm",
+        captain: "Boosts ATK of Powerhouse characters by 3x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
+        captainNotes: "His ATK multiplier will be 3.0x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters. You will not die to the HP reduction"
+    },
+    795: {
+        special: "Deals 10 hits of random INT damage to random enemies, delays all enemies for 1 turn",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 30,000 : for each hit}",
+        specialName: "Gum-Gum Storm",
+        captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
+        captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Powerhouse characters. You will not die to the HP reduction"
+    },
+    796: {
+        special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
+        specialName: "Peto-Peto Fruit, The Greatest Power",
+        captain: "Boosts ATK of Cerebral characters by 2x"
+    },
+    797: {
+        special: "Slightly boosts chances of getting matching orbs for 3 turns, boosts own ATK by 1.75x for 1 turn",
+        specialName: "Peto-Peto Fruit, The Greatest Power",
+        captain: "Boosts ATK of Cerebral and Powerhouse characters by 2x"
+    },
+    798: {
+        special: "Removes poison, following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Fighter characters by 1.75x in the following turn",
+        specialName: "Dugong Secret! Fist of the Black Fin",
+        captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
+    },
+    799: {
+        special: "Randomizes all orbs, recovers 9x character's RCV in HP",
+        specialName: "Sea Animal Healing"
+    },
+    800: {
+        special: "Randomly changes all orbs into either [STR], [DEX] or [QCK] orbs",
+        specialName: "Octopus Tentacle Blow"
+    },
+    801: {
+        special: "Randomly changes [STR], [QCK], [DEX], [INT], [BOMB] and [BLOCK] orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, changes [TND] and [RCV] orbs into [PSY] orbs",
+        specialName: "Clone-Clone Montage",
+        captain: "Boosts ATK of PSY characters by 2x"
+    },
+    802: {
+        special: "Randomly changes [STR], [QCK], [DEX], [INT], [BOMB] and [BLOCK] orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs, changes [TND] and [RCV] orbs into [PSY] orbs",
+        specialName: "Clone-Clone Montage",
+        captain: "Boosts ATK of PSY characters by 2.5x"
+    },
+    803: {
+        special: "Deals 8 hits of random DEX damage to random enemies, boosts ATK of all characters by 1.1x for 3 turns",
+        specialNotes: "#{randomHits : 8}",
+        specialName: "Black Spear Formation: All-Out Attack!",
+        captain: "Boosts ATK and RCV of DEX characters by 1.2x"
+    },
+    804: {
+        special: "Deals 8 hits of random DEX damage to random enemies, boosts ATK of all characters by 1.1x for 3 turns",
+        specialNotes: "#{randomHits : 8}",
+        specialName: "Black Spear Formation: All-Out Attack!",
+        captain: "Boosts ATK and RCV of DEX characters by 1.5x, deals 1x character's ATK in DEX damage to all enemies at the end of each turn"
+    },
+    805: {
+        special: "Reduces crew's current HP by 20%, deals 10x the amount of HP subtracted in INT damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "White Vine",
+        captain: "Boosts ATK of Striker characters by 2x",
+        specialNotes: "#{orb : 1.75x}"
+    },
+    806: {
+        special: "Reduces crew's current HP by 20%, deals 10x the amount of HP subtracted in INT damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "White Vine",
+        captain: "Boosts ATK of Striker characters by 2x, reduces damage received up to 30% depending on the crew's current HP",
+        specialNotes: "#{orb : 1.75x}"
+    },
+    807: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+        specialName: "Thunder Charge: Swing Arm",
+        special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
+    },
+    808: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x, recovers 2x character's RCV in HP at the end of each turn",
+        specialName: "Thunder Charge: Swing Arm",
+        special: "Deals 15x character's ATK in PSY damage to one enemy, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
+    },
+    809: {
+        captain: "Boosts ATK and RCV of Powerhouse characters by 1.5x",
+        specialName: "Lola's Attack Chance",
+        special: "Reduces the defense of all enemies by 80% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{orb : 1.5x}"
+    },
+    810: {
+        captain: "Boosts ATK of Powerhouse characters by 2x and their RCV by 1.5x, reduces crew's current HP by 10% at the end of each turn",
+        specialName: "Lola's Attack Chance",
+        special: "Reduces the defense of all enemies by 80% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{orb : 1.5x}"
+    },
+    811: {
+        specialName: "Birdbrain Present",
+        special: "Changes own orb into DEX, switches orbs between slots once"
+    },
+    812: {
+        specialName: "Hell Howl",
+        special: "Sharply reduces the defense of all enemies for 1 turn"
+    },
+    813: {
+        specialName: "Sticky Spider Net",
+        special: "Delays all enemies for 1 turn, amplifies the effect of orbs by 1.25x for 1 turn",
+        specialNotes: "#{orb : 1.25x}"
+    },
+    814: {
+        specialName: "Carpet Scratch",
+        special: "Deals 13x character's ATK in DEX damage to a single enemy, changes captain's orb into [TND]"
+    },
+    815: {
+        captain: "Boosts ATK by 2.5x following a chain of STR > INT > DEX attacks no lower than Good",
+        specialName: "Brick Bat",
+        special: "Deals 10 hits of 5,000 fixed damage to random enemies",
+        specialNotes: "#{fixed} #{randomHits : 10}"
+    },
+    816: {
+        captain: "Boosts ATK by 2.75x following a chain of STR > INT > DEX attacks no lower than Good",
+        specialName: "Brick Bat",
+        special: "Deals 10 hits of 5,000 fixed damage to random enemies",
+        specialNotes: "#{fixed} #{randomHits : 10}"
+    },
+    817: {
+        specialName: "[PSY] Slot Change [STR]",
+        special: "Changes [PSY] orbs into [STR] orbs"
+    },
+    818: {
+        specialName: "Quick Change",
+        special: "Switches orbs between slots once"
+    },
+    819: {
+        specialName: "Hyper Burst",
+        special: "Deals 13x character's ATK in character's type damage to all enemies"
+    },
+    820: {
+        specialName: "[TND] Slot Change [INT]",
+        special: "Changes [TND] orbs into [INT] orbs"
+    },
+    821: {
+        specialName: "Slot Shuffle",
+        special: "Randomizes all orbs"
+    },
+    822: {
+        specialName: "Patch Job",
+        special: "Boosts RCV of all characters by 100 for 3 turns"
+    },
+    823: {
+        specialName: "Slot Rate Up [INT]",
+        special: "Slightly boosts chances of getting [INT] orbs for 3 turns"
+    },
+    824: {
+        specialName: "Auto Repair",
+        special: "Recovers 3x character's RCV in HP at the end of each turn for 5 turns"
+    },
+    825: {
+        captain: "Boosts ATK and HP of STR characters by 1.5x",
+        specialName: "Energy of the Ancient Knight",
+        special: "Boosts ATK of STR characters by 200 for 1 turn"
+    },
+    826: {
+        captain: "Boosts ATK and HP of DEX characters by 1.5x",
+        specialName: "Weakness of the Ancient Knight",
+        special: "Delays all enemies for 1 turn, reduces the ATK of all characters by 80% for 2 turns"
+    },
+    827: {
+        captain: "Boosts ATK and HP of QCK characters by 1.5x",
+        specialName: "Poison of the Ancient Knight",
+        special: "Boosts ATK against poisoned enemies by 1.05x for 999 turns"
+    },
     828: {
         specialName: "Surprise Stab",
         special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turns if used below 20% HP",
         captain: "Protects from defeat as long as HP is above 50%",
-		captainNotes: "#{zombie}" 
+        captainNotes: "#{zombie}" 
     },
     829: {
         specialName: "Surprise Stab",
         special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turns if used below 20% HP",
         captain: "Protects from defeat as long as HP is above 30%",
-		captainNotes: "#{zombie}" 
-    },
-	830: {
-		captain: "Boosts ATK of Cerebral and Striker characters by 1.75x, deals 2 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
-		specialName: "Karma Conviction",
-		special: "Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [DEX] orbs, changes the orbs in the bottom row into [QCK] orbs"
-	},
-	831: {
-		captain: "Boosts ATK of Cerebral and Striker characters by 2x, deals 5 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
-		specialName: "Karma Conviction",
-		special: "Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [DEX] orbs, changes the orbs in the bottom row into [QCK] orbs"
-	},
-	832: {
-		captain: "Boosts ATK of Free Spirit characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
-		specialName: "Burn Bazooka",
-		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
-		captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}"
-	},
-	833: {
-		captain: "Boosts ATK of Free Spirit characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
-		specialName: "Burn Bazooka",
-		special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
-		captainNotes: "#{captainProportional : lower : 1 + 1.75 * (1 - (remaining HP) / (total HP)) : 1 : 2.75}"
-	},
-	834: {
-		captain: "Boosts ATK and RCV of Shooter characters by 1.5x",
-		specialName: "Yellow Gun & Gero Gero Gun",
-		special: "Changes own orb into [QCK] and the captain's orb into [PSY]"
-	},
-	835: {
-		captain: "Boosts ATK and HP of Cerebral characters by 2x",
-		specialName: "Thrust Pad Cannon",
-		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialNotes: "#{orb : 1.75x}"
-	},
-	836: {
-		captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in STR damage to all enemies at the end of each turn",
-		specialName: "Thrust Pad Cannon",
-		special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
-		specialNotes: "#{orb : 1.75x}"
-	},
-	837: {
-		captain: "Boosts ATK of Driven characters by 2x",
-		specialName: "Gas Robe",
-		special: "Poisons all enemies, boosts ATK of Driven characters by 1.75x for 2 turns",
-		specialNotes: "#{poison}"
-	},
-	838: {
-		captain: "Boosts ATK of Driven characters by 2.5x",
-		specialName: "Gas Robe",
-		special: "Poisons all enemies, boosts ATK of Driven characters by 1.75x for 2 turns"
-	},
-	839: {
-		captain: "Boosts ATK of Striker characters by 2x",
-		specialName: "Demon Bamboo",
-		special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy"
-	},
-	840: {
-		captain: "Boosts ATK of Striker characters by 2.5x",
-		specialName: "Demon Bamboo",
-		special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy"
-	},
-	841: {
-		captain: "Recovers 3x character's RCV in HP at the end of each turn, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
-		specialName: "Snow Rabbit",
-		special: "Delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.25x for 2 turns"
-	},
-	842: {
-		captain: "Recovers 5x character's RCV in HP at the end of each turn, deals 5x character's ATK in PSY damage to all enemies at the end of each turn",
-		specialName: "Snow Rabbit",
-		special: "Delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.25x for 2 turns"
-	},
-	843: {
-		captain: "Boosts ATK of Slasher, Striker and Shooter characters by 1.5x",
-		specialName: "Arms-Morphosis: Missile Girl",
-		special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Shooter characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Shooter, Striker and Slasher characters by 1.5x in the following turn."
-	},
-	844: {
-		captain: "Boosts ATK of Slasher, Striker and Shooter characters by 2x",
-		specialName: "Arms-Morphosis: Missile Girl",
-		special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Shooter characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Shooter, Striker and Slasher characters by 1.5x in the following turn."
-	},
-	845: {
-		captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit",
-		specialName: "Gust: Matasaburo",
-		special: "Changes own orb into [QCK], randomizes every other orb"
-	},
-	846: {
-		captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 30th hit, by 3.5x after the 40th hit",
-		specialName: "Gust: Matasaburo",
-		special: "Changes own orb into [QCK], randomizes every other orb"
-	},
-	847: {
-		captain: "Boosts ATK of all characters by 1.5x if HP is below 30% at the start of the turn",
-		specialName: "Sturdy Boat: Launch",
-		special: "Reduces Despair duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
-		specialNotes: "#{orb : 1.15x}"
-	},
-	848: {
-		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
-		specialName: "Sturdy Boat: Launch",
-		special: "Reduces Despair duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
-		specialNotes: "#{orb : 1.15x}"
-	},
-	849: {
-		captain: "Boosts ATK of Shooter characters by 1.75x",
-		specialName: "Battle Franky 9",
-		special: "Deals 5 hits of random STR damage to random enemies, reduces the defense of all enemies by 50% for 2 turns"
-	},
-	850: {
-		captain: "Boosts ATK of Striker and Cerebral characters by 1.5x",
-		specialName: "First-class Assistant of the Passionate Worker",
-		special: "Changes the top right orb into [DEX], the middle right orb into [STR] and the bottom right orb into [QCK], seals himself for 3 turns"
-	},
-	851: {
-		captain: "Boosts ATK of Driven characters by 1.5x",
-		specialName: "Snow Country Speciality: Snow Powder Makeup",
-		special: "Deals 20x character's ATK in character's type damage to one enemy, locks all orbs for 1 turn"
-	},
-	852: {
-		captain: "Boosts ATK of Driven characters by 2x",
-		specialName: "Snow Country Speciality: Snow Powder Makeup",
-		special: "Deals 20x character's ATK in character's type damage to one enemy, locks all orbs for 1 turn"
-	},
-	853: {
-		specialName: "Robson: Serious Mode",
-		special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Powerhouse and Fighters characters by 1.2x for 3 turns"
-	},
-	854: {
-		captain: "Boosts ATK of DEX chracters by 1.5x, reduces damage received by 10%",
-		specialName: "Guard Point: Winter Coat",
-		special: "Redues damage received by 50% for 3 turns, slightly boosts chances of getting [DEX] orbs for 3 turns"
-	},
-	855: {
-		captain: "Boosts ATK of Slasher characters by 2x",
-		specialName: "Shambles: Holiday Toast",
-		special: "Changes captain's orb into [RCV], recovers 15x character's RCV in HP"
-	},
-	856: {
-		captain: "Boosts ATK of Slasher characters by 2.5x",
-		specialName: "Shambles: Holiday Toast",
-		special: "Changes captain's orb into [RCV], recovers 15x character's RCV in HP"
-	},
-	857: {
-		captain: "Boosts ATK of PSY characters by 2x",
-		specialName: "Bonney's Holiday Feast",
-		special: "Changes adjacent orbs into [RCV] orbs, boosts RCV of PSY characters by 1.5x for 1 turn"
-	},
-	858: {
-		captain: "Boosts ATK and RCV of PSY characters by 2x",
-		specialName: "Bonney's Holiday Feast",
-		special: "Changes adjacent orbs into [RCV] orbs, boosts RCV of PSY characters by 1.5x for 1 turn"
-	},
-	859: {
-		captain: "Boosts ATK of Driven characters by 1.5x, reduces damage received up to 10% depending on the crew's current HP",
-		specialName: "Pleading at the Risk of One's Life",
-		special: "Changes adjacent orbs into [RCV] orbs; if the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
-		specialNotes: "#{zombie}"
-	},
-	860: {
-		captain: "Boosts ATK of Driven characters by 2x, reduces damage received up to 30% depending on the crew's current HP",
-		specialName: "Pleading at the Risk of One's Life",
-		special: "Changes adjacent orbs into [RCV] orbs; if the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
-		specialNotes: "#{zombie}"
-	},
-	861: {
-		specialName: "Bewitching Lovely Iron Mace",
-		special: "Deals 13x character's ATK in QCK damage to one enemy, reduces damage received by 75% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}",
-		captain: "Reduces damage received by 10%"
-	},
-	862: {
-		captain: "Boosts ATK of QCK characters by 2x, reduces damage received by 10%",
-		specialName: "Bewitching Lovely Iron Mace",
-		special: "Deals 13x character's ATK in QCK damage to one enemy, reduces damage received by 75% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}"
-	},
-	863: {
-		captain: "Boosts ATK of QCK characters by 1.75x, recovers 2x character's RCV in HP at the end of each turn",
-		specialName: "Snow Crystal Clima-Tact",
-		special: "Reduces the defense of all enemies by 50% for 2 turns, reduces the ATK of all enemies by 10% for 2 turns"
-	},
-	864: {
-		captain: "Boosts ATK of Free Spirit characters by 2x",
-		specialName: "Slave Arrow",
-		special: "Locks the chain multiplier at 2.5x for 2 turns, delays all enemies for 1 turn"
-	},
-	865: {
-		captain: "Boosts ATK and HP of Free Spirit characters by 2x",
-		specialName: "Slave Arrow",
-		special: "Locks the chain multiplier at 2.5x for 2 turns, delays all enemies for 1 turn"
-	},
-	866: {
-		captain: "Boosts ATK of Cerebral characters by 2x",
-		specialName: "Cien Fleur Wing: The Storm",
-		special: "Boosts ATK of Slasher and Cerebral characters by 1.3x for 2 turns, reduces Bind duration by 2 turns"
-	},
-	867: {
-		captain: "Boosts ATK of all characters by 1.5x after the 12th hit in the chain",
-		specialName: "Tabasco Star: The Storm",
-		special: "Delays all enemies for 2 turns, deals 9x character's ATK in DEX damage to all enemies"
-	},
-	868: {
-		captain: "Boosts ATK of all characters by 1.2x, recovers 1,000 HP at the end of the turn",
-		specialName: "Heavy Gong: The Storm",
-		special: "Deals 15x character's ATK in STR damage to one enemy, reduces Bind duration by 3 turns"
-	},
-	869: {
-		captain: "Boosts ATK of Driven characters by 3x until the first hit other than Perfect",
-		specialName: "Black Knight",
-		special: "Changes adjacent orbs into matching orbs, amplifies the effect of orbs by 2x for 1 turn",
-		specialNotes: "#{orb : 2x}"
-	},
-	870: {
-		captain: "Boosts ATK of Driven characters by 3x until the first hit other than Perfect",
-		specialName: "Black Knight",
-		special: "Changes adjacent orbs into matching orbs, amplifies the effect of orbs by 2x for 1 turn",
-		specialNotes: "#{orb : 2x}"
-	},
-	871: {
-		captain: "Boosts ATK and RCV of QCK characters by 1.5x",
-		specialName: "Hobby-Hobby Fruit",
-		special: "Removes all enemies with HP below 20%",
-		specialNotes: "The special bypasses all known protective buffs. If the enemy can revive after being defeated, however, the special will only reduce the enemy's HP to 0 and trigger their revive effect."
-	},
-	872: {
-		captain: "Boosts ATK and RCV of QCK characters by 2x",
-		specialName: "Hobby-Hobby Fruit",
-		special: "Removes all enemies with HP below 20%",
-		specialNotes: "The special bypasses all known protective buffs. If the enemy can revive after being defeated, however, the special will only reduce the enemy's HP to 0 and trigger their revive effect."
-	},
-	873: {
-		captain: "Boosts ATK of Fighter characters by 2.5x if HP is below 30% at the start of the turn",
-		specialName: "Nyan Nyan Swim",
-		special: [
-			{
-				"description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.5x for 1 turn",
-				"cooldown": [
-					13,
-					8
-				]
-			},
-			{
-				"description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.75x for 1 turn",
-				"cooldown": [
-					19,
-					14
-				]
-			}
-		],
-		specialNotes: "#{orb: 1.5x or 1.75x} #{stages}"
-	},
-	874: {
-		captain: "Boosts ATK of Fighter characters by 3x if HP is below 30% at the start of the turn",
-		specialName: "Nyan Nyan Swim",
-		special: [
-			{
-				"description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.5x for 1 turn",
-				"cooldown": [
-					13,
-					8
-				]
-			},
-			{
-				"description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.75x for 1 turn",
-				"cooldown": [
-					19,
-					14
-				]
-			}
-		],
-		specialNotes: "#{orb: 1.5x or 1.75x} #{stages}"
-	},
-	875: {
-		captain: "Boosts ATK of Cerebral and Driven characters by 2x",
-		specialName: "Beto Launcher",
-		special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
-	},
-	876: {
-		captain: "Boosts ATK of Cerebral and Driven characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Cerebral and Driven characters",
-		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
-		specialName: "Beto Launcher",
-		special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
-	},
-	877: {
-		captain: "Boosts amount of beli received by 2x",
-		specialName: "Heaven's Do Art",
-		special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
-		specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
-	},
-	878: {
-		captain: "Boosts ATK of all characters by 1.5x, boosts amount of beli received by 2x",
-		specialName: "Heaven's Do Art",
-		special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
-		specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
-	},
-	879: {
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 1.75x",
-		specialName: "Battle Preservation Fist: Manki Kayaku",
-		special: "Changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
-		specialNotes: "#{gOrbs}"
-	},
-	880: {
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Fighter characters by 2x",
-		specialName: "Battle Preservation Fist: Manki Kayaku",
-		special: "Changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
-		specialNotes: "#{gOrbs}"
-	},
-	881: {
-		captain: "Boosts ATK of Shooter and Free Spirit characters by 2x following a chain of Good > Great > Perfect hits",
-		specialName: "Fighting Music: Conflict Chekera",
-		special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
-	},
-	882: {
-		captain: "Boosts ATK of Shooter and Free Spirit characters by 3x following a chain of Good > Great > Perfect hits",
-		specialName: "Fighting Music: Conflict Chekera",
-		special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
-	},
-	883: {
-		captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
-		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
-	},
-	884: {
-		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
-		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
-	},
-	885: {
-		captain: "Boosts ATK of Fighter characters by 2x, reduces damage received by 10%",
-		specialName: "Arabesque Brick Fist: Sun",
-		special: "Cuts the current HP of each enemy by 10%, boosts ATK of Fighter characters by 1.5x for 1 turn if HP is below 30% when the special is activated"
-	},
-	886: {
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
-		specialName: "Daisy Blade: First",
-		special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Slasher characters by 1.5x for 1 turn if HP is below 30% when the special is activated"
-	},
-	887: {
-		captain: "Boosts ATK of Driven characters by 1.5x, boosts amount of beli received by 1.2x",
-		specialName: "Special Muggy Ball: Flashy",
-		special: "Reduces the defense of all enemies by 80% for 1 turn, deals 15x character's ATK in QCK damage to all enemies"
-	},
-	888: {
-		specialName: "Negative Ghost",
-		special: "Slightly reduces the ATK of all enemies by 10% for 3 turns",
-		specialNotes: "The reduction does not apply to damage from specials"
-	},
-	889: {
-		captain: "Boosts ATK and RCV of DEX characters by 1.2x",
-		specialName: "Ghost Rap",
-		special: "Changes [STR] orbs into [DEX] orbs, deals 10x character's ATK in DEX damage to all enemies"
-	},
-	890: {
-		captain: "Boosts ATK and RCV of DEX characters by 1.5x",
-		specialName: "Ghost Rap",
-		special: "Changes [STR] orbs into [DEX] orbs, deals 10x character's ATK in DEX damage to all enemies"
-	},
-	891: {
-		captain: "Boosts ATK and RCV of Powerhouse characters by 1.75x",
-		specialName: "Resurrection of the Dead",
-		special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.25x for 1 turn",
-		},
-	892: {
-		captain: "Boosts chain multiplier by 2x",
-		specialName: "Hands of the Dead",
-		special: "Switches orbs between slots three times"
-	},
-	893: {
-		captain: "Boosts ATK of Powerhouse characters by 3x after scoring 3 Perfects in a row",
-		specialName: "Oars Ball",
-		special: "Reduces damage received by 50% for 1 turn, deals 30x character's ATK in STR damage to all enemies"
-	},
-	894: {
-		captain: "Boosts ATK of Driven characters by 3x following a chain of Good > Great > Perfect hits",
-		specialName: "Brick Bat: Black Box",
-		special: "Empties all slots with [INT] orbs, deals several times the character's ATK in INT damage to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [INT] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [INT] orb."
-	},
-	895: {
-		captain: "Boosts ATK of Slasher characters by 1.5x",
-		specialName: "Dying Chorus: Binks' Sake",
-		special: "Recovers 6x character's RCV in HP at the end of each turn for 3 turns"
-	},
-	896: {
-		captain: "Boosts ATK of Slasher characters by 2x",
-		specialName: "Dying Chorus: Binks' Sake",
-		special: "Recovers 6x character's RCV in HP at the end of each turn for 3 turns"
-	},
-	897: {
-		captain: "Boosts ATK of Cerebral and Driven characters by 2x",
-		specialName: "Ground Death: Thirst",
-		special: "Changes own orb into [STR], randomizes all other orbs, cuts the current HP of all enemies by 10%"
-	},
-	898: {
-		captain: "Boosts ATK and HP of Striker and Cerebral characters by 1.5x",
-		specialName: "Championship Fight: Little Garden Three",
-		special: "Deals 10x character's ATK in QCK damage to all enemies, changes adjacent orbs into [G] orbs",
-		specialNotes: "#{gOrbs}"
-	},
-	899: {
-		captain: "Boosts ATK of Fighter and Free Spirit characters by 1.75x and their RCV by 1.25x",
-		specialName: "Hymn to Friendship: \"Okama Way\" Two",
-		special: "Reduces Despair duration by 5 turns, recovers 10x character's RCV in HP"
-	},
-	900: {
-		captain: "Boosts ATK of Shooter characters by 2x if HP is above 99% at the start of the turn",
-		specialName: "Franky Destroy Gun",
-		special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
-		specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
-	},
-	901: {
-		captain: "Boosts ATK of Shooter characters by 2.75x if HP is above 99% at the start of the turn",
-		specialName: "Franky Destroy Gun",
-		special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
-		specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
-	},
-	902: {
-		captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
-		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
-	},
-	903: {
-		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
-		specialName: "Hakoku Sovereignity",
-		special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
-	},
-	904: {
-		captain: "Protects from defeat as long as HP is above 50%",
-		captainNotes: "#{zombie}",
-		specialName: "Yokozuna Slap!",
-		special: "Deals 20x character's ATK in STR damage to one enemy, delays all enemies for 1 turn"
-	},
-	905: {
-		captain: "Boosts ATK of Slasher characters by 2.5x if HP is below 30% at the start of the turn",
-		specialName: "Two Gorilla Cut",
-		special: [
-			{
-				"description": "Changes own orb into [STR], boosts his own ATK by 1.5x for 2 turns",
-				"cooldown": [ 17, 11 ]
-			},
-			{
-				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.5x for 2 turns",
-				"cooldown": [ 21, 15 ]
-			},
-			{
-				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.75x for 2 turns",
-				"cooldown": [ 24, 18 ]
-			}
-		],
-		specialNotes: "#{stages}"
-	},
-	906: {
-		captain: "Boosts ATK of Slasher characters by 2.75x if HP is below 30% at the start of the turn",
-		specialName: "Two Gorilla Cut",
-		special: [
-			{
-				"description": "Changes own orb into [STR], boosts his own ATK by 1.5x for 2 turns",
-				"cooldown": [ 17, 11 ]
-			},
-			{
-				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.5x for 2 turns",
-				"cooldown": [ 21, 15 ]
-			},
-			{
-				"description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.75x for 2 turns",
-				"cooldown": [ 24, 18 ]
-			}
-		],
-		specialNotes: "#{stages}"
-	},
-	907: {
-		specialName: "Cien Fleur: Big Tree",
-		special: "Delays all enemies for 1 turn, locks all orbs for 1 turn, deals 5,000 fixed damage to all enemies, reduces crew's HP to 1",
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x if HP is below 30% at the start of the turn"
-	},
-	908: {
-		specialName: "Cien Fleur: Big Tree",
-		special: "Delays all enemies for 1 turn, locks all orbs for 1 turn, deals 5,000 fixed damage to all enemies, reduces crew's HP to 1",
-		captain: "Boosts ATK of Cerebral characters by 2.5x and their RCV by 1.75x if HP is below 30% at the start of the turn"
-	},
-	909: {
-		captain: "Boosts ATK and RCV of PSY characters by 1.5x",
-		specialName: "Hero of Justice! Chopper Mask!!",
-		special: "Recovers 5,000 HP, boosts ATK of PSY characters by 1.5x for 2 turns"
-	},
-	910: {
-		specialName: "Hero of Justice! Chopper Mask!!",
-		special: "Recovers 5,000 HP, boosts ATK of PSY characters by 1.5x for 2 turns",
-		captain: "Boosts ATK of PSY characters by 2x, their RCV by 1.5x, makes INT orbs \"beneficial\" to PSY characters",
-		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs."
-	},
-	911: {
-		specialName: "Diable Jambe: Premier Hachis",
-		special: [
-			{
-				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
-				"cooldown": [ 15, 8 ]
-			},
-			{
-				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
-				"cooldown": [ 25, 18 ]
-			}
-		],
-		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
-		specialNotes: "#{stages}"
-	},
-	912: {
-		specialName: "Diable Jambe: Premier Hachis",
-		special: [
-			{
-				"description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
-				"cooldown": [ 15, 8 ]
-			},
-			{
-				"description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
-				"cooldown": [ 25, 18 ]
-			}
-		],
-		captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
-		specialNotes: "#{stages}"
-	},
-	913: {
-		captain: "Boosts ATK of QCK characters by 2.5x if they have a matching orb",
-		specialName: "Black Magic Summoning: Advent of the Demon Lord Satan",
-		special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes opposite orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
-	},
-	914: {
-		captain: "Boosts ATK of QCK characters by 3x if they have a matching orb, by 1.2x otherwise",
-		specialName: "Black Magic Summoning: Advent of the Demon Lord Satan",
-		special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes opposite orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
-	},
-	915: {
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
-		specialName: "Feeling of Mutual Love",
-		special: "Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn"
-	},
-	916: {
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
-		specialName: "Feeling of Mutual Love",
-		special: "Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn"
-	},
-	917: {
-		captain: "Boosts ATK of Shooter characters by 1.5x",
-		specialName: "Kuja's Haki Arrow",
-		special: "Deals 5,000 fixed damage to one enemy, delays all enemies for 1 turn, changes [RCV] orbs on Shooter characters into matching orbs",
-		specialNotes: "The orb shuffle only applies to Shooter characters, other classes are unaffected."
-	},
-	918: {
-		captain: "Boosts ATK of Shooter characters by 1.75x, recovers a small amount of health at the end of each turn",
-		specialName: "Kuja's Haki Arrow",
-		special: "Deals 5,000 fixed damage to one enemy, delays all enemies for 1 turn, changes [RCV] orbs on Shooter characters into matching orbs",
-		specialNotes: "The orb shuffle only applies to Shooter characters, other classes are unaffected."
-	},
-	919: {
-		specialName: "Spike of the Warrior Defending Her Country",
-		special: "Reduces damage received from STR enemies by 50% for 2 turns"
-	},
-	920: {
-		specialName: "Snake Bow of the Warrior Defending Her Country",
-		special: "Changes the orbs in the middle row into [RCV] orbs, changes the orbs in the bottom row into [TND] orbs"
-	},
-	921: {
-		captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x",
-		specialName: "Pure and Beautiful Shyness",
-		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
-	},
-	922: {
-		captain: "Boosts ATK and RCV of Free Spirit characters by 1.75x",
-		specialName: "Pure and Beautiful Shyness",
-		special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
-	},
-	923: {
-		captain: "Boosts ATK of Driven characters by 2x or by 2.5x",
-		captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
-		specialName: "Repel: Weapons Reflect",
-		special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
-		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
-	},
-	924: {
-		captain: "Boosts ATK of Driven characters by 2x or by 2.75x",
-		captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
-		specialName: "Repel: Weapons Reflect",
-		special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
-		specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
-	},
-	925: {
-		captain: "Boosts ATK of Powerhouse characters by 2x",
-		specialName: "Let's go, Jailer Beasts!",
-		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
-	},
-	926: {
-		captain: "Boosts ATK of Powerhouse characters by 2.5x",
-		specialName: "Let's go, Jailer Beasts!",
-		special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
-	},
-	927: {
-		captain: "Boosts ATK and HP of Driven characters by 1.5x",
-		specialName: "Unwavering Hammer of Justice",
-		special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
-	},
-	928: {
-		captain: "Boosts ATK of Driven Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
-		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
-		specialName: "Hell Wisdom Rush"
-	},
-	929: {
-		captain: "Boosts ATK of Driven Characters by 2.25x while above 30% HP and boosts ATK of Striker Characters by 2.25x while below 30% HP",
-		special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
-		specialName: "Hell Wisdom Rush"
-	},
-	930: {
-		captain: "Boosts chain multiplier by 2x",
-		specialName: "Blugori Manipulation Song",
-		special: "Changes orbs in left column to [DEX], then [QCK], then [INT]. Locks himself for 3 turns."
-	},
-	931: {
-		specialName: "Large Axe of Punishment",
-		special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
-	},
-	932: {
-		captain: "Boosts ATK of Powerhouse Characters by 1.5x, and their HP by 1.5x",
-		specialName: "Rock Domination Wall",
-		special: [
-			{
-				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
-				"cooldown": [ 25, 11 ]
-			},
-			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
-				"cooldown": [ 31, 17 ]
-			}
-		],
-		specialNotes: "#{stages}"	
-		},
-	933: {
-		captain: "Boosts ATK of Powerhouse Characters by 2.25x, and their HP by 1.5x",
-		specialName: "Rock Domination Wall",
-		special: [
-			{
-				"description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
-				"cooldown": [ 25, 11 ]
-			},
-			{
-				"description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
-				"cooldown": [ 31, 17 ]
-			}
-		],
-		specialNotes: "#{stages}"
-	},
-	934: {
-		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
-		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
-		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
-	},
-	935: {
-		captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
-		specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-		special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into matching",
-		specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
-	},
-	936: {
-		captain: "Boosts Chain Multiplier by 3x",
-		specialName: "Gum-Gum Giant Jet Shell",
-		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
-		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
-	},
-	937: {
-		captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.25x",
-		specialName: "Gum-Gum Giant Jet Shell",
-		special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
-		specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
-	},
-	938: {
-		captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Cerebral characters by 1.5x",
-		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
-	},
-	939: {
-		captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
-		specialName: "Cyclone Burst",
-		special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
-	},
-	940: {
-		captain: "Boosts ATK and HP of [DEX] Characters by 1.5x",
-		specialName: "Sure Kill! Exploding Star!!",
-		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
-	},
-	941: {
-		captain: "Boosts ATK of [DEX] Characters by 1.75x and their HP by 2.25x",
-		specialName: "Sure Kill! Exploding Star!!",
-		special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
-	},
-	942: {
-		captain: "Boosts ATK and HP of [STR] Characters by 1.5x",
-		specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
-		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
-	},
-	943: {
-		captain: "Boosts ATK of [STR] Characters by 2.25x and their HP by 1.75x",
-		specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
-		special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
-	},
-	944: {
-		captain: "Boosts ATK and RCV of Driven Characters by 1.2x",
-		specialName: "Spiritual Bouquet",
-		special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
-	},
-	945: {
-		captain: "Boosts ATK and RCV of Driven Characters by 1.75x",
-		specialName: "Spiritual Bouquet",
-		special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
-	},
-	946: {
-		specialName: "Lock-on Iron Ball",
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker Characters by 1.75x",
-		special: "Change Friend Captain and changes own orb into [INT]"
-	},
-	947: {
-		captain: "Boosts ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
-		specialName: "Flame Flash",
-		special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals 10x character's ATK in [INT] damage to all enemies",
-		captainNotes: "#{noFixedPerc}"
-	},
-	948: {
-		captain: "Boosts ATK of Shooter Characters by 1.5x and their RCV by 1.2x",
-		specialName: "Twin Cannons",
-		special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage"
-	},
-	949: {
-		captain: "Boosts ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
-		specialName: "Ties with Ace",
-		special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
-		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
-	},
-	950: {
-		captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
-		specialName: "Flame Commandment: Fire Pillar",
-		special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
-		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
-	},
-	951: {
-		captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
-		specialName: "Flame Commandment: Fire Pillar",
-		special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
-		specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
-	},
-	952: {
-		captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.2x",
-		specialName: "Life-saving Gunstock Blow",
-		special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
-	},
-	953: {
-		captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
-		specialName: "Life-saving Gunstock Blow",
-		special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
-	},
-	954:{
-		captain: "Boosts ATK and HP of [QCK] Characters by 1.5x",
-		specialName: "Goldfish Fencing! I'll Dye the Sea Red with Your Blood",
-		special: "Reduces the defense of all enemies by 80% for 2 turns"
-	},
-	955:{
-		captain: "Boosts ATK and HP of [PSY] Characters by 1.5x",
-		specialName: "Get Rich Quick Scheme! We're All Gonna Be Rich",
-		special: "Boosts ATK against enemies with reduced defense by 1.2x for 2 turns"
-	},
-	956:{
-		captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
-		specialName: "Fishman karate! I'll Finish You",
-		special: "Boosts ATK of Powerhouse characters by 1.2x for 2 turns"
-	},
-	957:{
-		specialName: "First Aid",
-		special: "Recover 2,000 HP"
-	},
-	958:{
-		specialName: "Bind Purge",
-		special: "Reduces Bind duration by 2 turns"
-	},
-	959:{
-		specialName: "Captain Soul Recovery",
-		special: "Reduces Despair duration by 2 turns"
-	},
-	960:{
-		specialName: "Slot Color Shuffle",
-		special: "Randomly changes all orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs"
-	},
-	961:{
-		specialName: "Slot Power Light",
-		special: "Amplifies the effect of orbs by 1.25x for 1 turn"
-	},
-	962:{
-		specialName: "Captain Slot Change RCV",
-		special: "Changes captain's orb into [RCV]"
-	},
-	963:{
-		captain: "Boosts ATK of characters with cost between 50 and 55 by 2x",
-		specialName: "Saint Charloss' Stroll",
-		special: "Reduces the defense of all enemies by 100% for 1 turn and randomizes all orbs"
-	},
-	964:{
-		captain: "Boosts ATK, HP, and RCV of characters with cost between 50 and 55 by 1.5x",
-		specialName: "Wrath of the Creator Bloodline",
-		special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
-	},
-	965:{
-		captain: "Boosts ATK of characters with cost between 50 and 55 by 1.5x, recovers 500 HP at the end of each turn",
-		specialName: "Wrath of the Creator Bloodline",
-		special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
-	},
-	966:{
-		captain: "Boosts ATK of Driven Characters by 2.25x",
-		specialName: "Repel",
-		special: "Empties slots with [QCK] orbs, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
-		specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: 0 orbs - Can't activate; 1 orb - 14x ATK; 2 orbs - 21x ATK; 3 orbs - 35x ATK; 4 orbs - 49x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
-	},
-	967:{
-		captain: "Boosts ATK of Free Spirit Characters by 2.25x",
-		specialName: "Surgeon of Death's First Aid Surgery",
-		special: "Recovers 20x character's RCV in HP. Switches orbs between slots twice"
-	},
-	968:{
-		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
-	},
-	969:{
-		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
-	},
-	970:{
-		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
-	},
-	971:{
-		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
-	},
-	972:{
-		specialName: "High Heat Ray Laser",
-		special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
-	},
-	973:{
-		captain: "Boosts ATK of Powerhouse Characters by 2x if HP is above 99% at the start of the turn",
-		specialName: "Ironclad Thrust: Dwarf Guard of the World",
-		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
-	},
-	974:{
-		captain: "Boosts ATK of Powerhouse Characters by 2.5x if HP is above 99% at the start of the turn",
-		specialName: "Ironclad Thrust: Dwarf Guard of the World",
-		special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
-	},
-	975:{
-		captain: "Reduces damage received by 10%",
-		specialName: "A Threat That Puts Adults to Shame",
-		special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
-		specialNotes: "#{zombie}"
-	},
-	976:{
-		captain: "Boosts ATK of Driven Characters by 2x. Reduces damage received by 10%",
-		specialName: "A Threat That Puts Adults to Shame",
-		special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
-		specialNotes: "#{zombie}"
-	},
-	977:{
-		captain: "Boosts ATK of Shooter characters by 2x",
-		specialName: "Yata no Kagami (Sacred Mirror)",
-		special: [
-			{
-				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
-				"cooldown": [ 19, 5 ]
-			},
-			{
-				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
-				"cooldown": [ 25, 11 ]
-			}
-		],
-		specialNotes: "#{stages}"
-	},
-	978:{
-		captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.25x and boosts HP of Shooter characters by 1.5x",
-		specialName: "Yata no Kagami (Sacred Mirror)",
-		special: [
-			{
-				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
-				"cooldown": [19,5]
-			},
-			{
-				"description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
-				"cooldown": [25,11]
-			}
-		],
-		specialNotes: "#{stages}"
-	},
+        captainNotes: "#{zombie}" 
+    },
+    830: {
+        captain: "Boosts ATK of Cerebral and Striker characters by 1.75x, deals 2 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
+        specialName: "Karma Conviction",
+        special: "Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [DEX] orbs, changes the orbs in the bottom row into [QCK] orbs"
+    },
+    831: {
+        captain: "Boosts ATK of Cerebral and Striker characters by 2x, deals 5 times the damage received in the previous turn in DEX damage to all enemies at the end of each turn",
+        specialName: "Karma Conviction",
+        special: "Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [DEX] orbs, changes the orbs in the bottom row into [QCK] orbs"
+    },
+    832: {
+        captain: "Boosts ATK of Free Spirit characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
+        specialName: "Burn Bazooka",
+        special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
+        captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}"
+    },
+    833: {
+        captain: "Boosts ATK of Free Spirit characters proportionally to the crew's current HP, reduces crew's current HP by 10% at the end of each turn",
+        specialName: "Burn Bazooka",
+        special: "Boosts ATK of Free Spirit characters by 1.5x for 1 turn, deals 15x character's ATK in STR damage to all enemies",
+        captainNotes: "#{captainProportional : lower : 1 + 1.75 * (1 - (remaining HP) / (total HP)) : 1 : 2.75}"
+    },
+    834: {
+        captain: "Boosts ATK and RCV of Shooter characters by 1.5x",
+        specialName: "Yellow Gun & Gero Gero Gun",
+        special: "Changes own orb into [QCK] and the captain's orb into [PSY]"
+    },
+    835: {
+        captain: "Boosts ATK and HP of Cerebral characters by 2x",
+        specialName: "Thrust Pad Cannon",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{orb : 1.75x}"
+    },
+    836: {
+        captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in STR damage to all enemies at the end of each turn",
+        specialName: "Thrust Pad Cannon",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{orb : 1.75x}"
+    },
+    837: {
+        captain: "Boosts ATK of Driven characters by 2x",
+        specialName: "Gas Robe",
+        special: "Poisons all enemies, boosts ATK of Driven characters by 1.75x for 2 turns",
+        specialNotes: "#{poison}"
+    },
+    838: {
+        captain: "Boosts ATK of Driven characters by 2.5x",
+        specialName: "Gas Robe",
+        special: "Poisons all enemies, boosts ATK of Driven characters by 1.75x for 2 turns"
+    },
+    839: {
+        captain: "Boosts ATK of Striker characters by 2x",
+        specialName: "Demon Bamboo",
+        special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy"
+    },
+    840: {
+        captain: "Boosts ATK of Striker characters by 2.5x",
+        specialName: "Demon Bamboo",
+        special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy"
+    },
+    841: {
+        captain: "Recovers 3x character's RCV in HP at the end of each turn, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
+        specialName: "Snow Rabbit",
+        special: "Delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.25x for 2 turns"
+    },
+    842: {
+        captain: "Recovers 5x character's RCV in HP at the end of each turn, deals 5x character's ATK in PSY damage to all enemies at the end of each turn",
+        specialName: "Snow Rabbit",
+        special: "Delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.25x for 2 turns"
+    },
+    843: {
+        captain: "Boosts ATK of Slasher, Striker and Shooter characters by 1.5x",
+        specialName: "Arms-Morphosis: Missile Girl",
+        special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Shooter characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Shooter, Striker and Slasher characters by 1.5x in the following turn."
+    },
+    844: {
+        captain: "Boosts ATK of Slasher, Striker and Shooter characters by 2x",
+        specialName: "Arms-Morphosis: Missile Girl",
+        special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Shooter characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of Shooter, Striker and Slasher characters by 1.5x in the following turn."
+    },
+    845: {
+        captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit",
+        specialName: "Gust: Matasaburo",
+        special: "Changes own orb into [QCK], randomizes every other orb"
+    },
+    846: {
+        captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 30th hit, by 3.5x after the 40th hit",
+        specialName: "Gust: Matasaburo",
+        special: "Changes own orb into [QCK], randomizes every other orb"
+    },
+    847: {
+        captain: "Boosts ATK of all characters by 1.5x if HP is below 30% at the start of the turn",
+        specialName: "Sturdy Boat: Launch",
+        special: "Reduces Despair duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
+        specialNotes: "#{orb : 1.15x}"
+    },
+    848: {
+        captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
+        specialName: "Sturdy Boat: Launch",
+        special: "Reduces Despair duration by 5 turns, boosts ATK of all characters by 5% for 3 turns, reduces damage received by 10% for 3 turns, amplifies the effect of orbs by 1.15x for 3 turns, recovers 2x character's RCV in HP at the end of each turn for 3 turns",
+        specialNotes: "#{orb : 1.15x}"
+    },
+    849: {
+        captain: "Boosts ATK of Shooter characters by 1.75x",
+        specialName: "Battle Franky 9",
+        special: "Deals 5 hits of random STR damage to random enemies, reduces the defense of all enemies by 50% for 2 turns"
+    },
+    850: {
+        captain: "Boosts ATK of Striker and Cerebral characters by 1.5x",
+        specialName: "First-class Assistant of the Passionate Worker",
+        special: "Changes the top right orb into [DEX], the middle right orb into [STR] and the bottom right orb into [QCK], seals himself for 3 turns"
+    },
+    851: {
+        captain: "Boosts ATK of Driven characters by 1.5x",
+        specialName: "Snow Country Speciality: Snow Powder Makeup",
+        special: "Deals 20x character's ATK in character's type damage to one enemy, locks all orbs for 1 turn"
+    },
+    852: {
+        captain: "Boosts ATK of Driven characters by 2x",
+        specialName: "Snow Country Speciality: Snow Powder Makeup",
+        special: "Deals 20x character's ATK in character's type damage to one enemy, locks all orbs for 1 turn"
+    },
+    853: {
+        specialName: "Robson: Serious Mode",
+        special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Powerhouse and Fighters characters by 1.2x for 3 turns"
+    },
+    854: {
+        captain: "Boosts ATK of DEX chracters by 1.5x, reduces damage received by 10%",
+        specialName: "Guard Point: Winter Coat",
+        special: "Redues damage received by 50% for 3 turns, slightly boosts chances of getting [DEX] orbs for 3 turns"
+    },
+    855: {
+        captain: "Boosts ATK of Slasher characters by 2x",
+        specialName: "Shambles: Holiday Toast",
+        special: "Changes captain's orb into [RCV], recovers 15x character's RCV in HP"
+    },
+    856: {
+        captain: "Boosts ATK of Slasher characters by 2.5x",
+        specialName: "Shambles: Holiday Toast",
+        special: "Changes captain's orb into [RCV], recovers 15x character's RCV in HP"
+    },
+    857: {
+        captain: "Boosts ATK of PSY characters by 2x",
+        specialName: "Bonney's Holiday Feast",
+        special: "Changes adjacent orbs into [RCV] orbs, boosts RCV of PSY characters by 1.5x for 1 turn"
+    },
+    858: {
+        captain: "Boosts ATK and RCV of PSY characters by 2x",
+        specialName: "Bonney's Holiday Feast",
+        special: "Changes adjacent orbs into [RCV] orbs, boosts RCV of PSY characters by 1.5x for 1 turn"
+    },
+    859: {
+        captain: "Boosts ATK of Driven characters by 1.5x, reduces damage received up to 10% depending on the crew's current HP",
+        specialName: "Pleading at the Risk of One's Life",
+        special: "Changes adjacent orbs into [RCV] orbs; if the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
+        specialNotes: "#{zombie}"
+    },
+    860: {
+        captain: "Boosts ATK of Driven characters by 2x, reduces damage received up to 30% depending on the crew's current HP",
+        specialName: "Pleading at the Risk of One's Life",
+        special: "Changes adjacent orbs into [RCV] orbs; if the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
+        specialNotes: "#{zombie}"
+    },
+    861: {
+        specialName: "Bewitching Lovely Iron Mace",
+        special: "Deals 13x character's ATK in QCK damage to one enemy, reduces damage received by 75% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{orb : 1.5x}",
+        captain: "Reduces damage received by 10%"
+    },
+    862: {
+        captain: "Boosts ATK of QCK characters by 2x, reduces damage received by 10%",
+        specialName: "Bewitching Lovely Iron Mace",
+        special: "Deals 13x character's ATK in QCK damage to one enemy, reduces damage received by 75% for 1 turn, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialNotes: "#{orb : 1.5x}"
+    },
+    863: {
+        captain: "Boosts ATK of QCK characters by 1.75x, recovers 2x character's RCV in HP at the end of each turn",
+        specialName: "Snow Crystal Clima-Tact",
+        special: "Reduces the defense of all enemies by 50% for 2 turns, reduces the ATK of all enemies by 10% for 2 turns"
+    },
+    864: {
+        captain: "Boosts ATK of Free Spirit characters by 2x",
+        specialName: "Slave Arrow",
+        special: "Locks the chain multiplier at 2.5x for 2 turns, delays all enemies for 1 turn"
+    },
+    865: {
+        captain: "Boosts ATK and HP of Free Spirit characters by 2x",
+        specialName: "Slave Arrow",
+        special: "Locks the chain multiplier at 2.5x for 2 turns, delays all enemies for 1 turn"
+    },
+    866: {
+        captain: "Boosts ATK of Cerebral characters by 2x",
+        specialName: "Cien Fleur Wing: The Storm",
+        special: "Boosts ATK of Slasher and Cerebral characters by 1.3x for 2 turns, reduces Bind duration by 2 turns"
+    },
+    867: {
+        captain: "Boosts ATK of all characters by 1.5x after the 12th hit in the chain",
+        specialName: "Tabasco Star: The Storm",
+        special: "Delays all enemies for 2 turns, deals 9x character's ATK in DEX damage to all enemies"
+    },
+    868: {
+        captain: "Boosts ATK of all characters by 1.2x, recovers 1,000 HP at the end of the turn",
+        specialName: "Heavy Gong: The Storm",
+        special: "Deals 15x character's ATK in STR damage to one enemy, reduces Bind duration by 3 turns"
+    },
+    869: {
+        captain: "Boosts ATK of Driven characters by 3x until the first hit other than Perfect",
+        specialName: "Black Knight",
+        special: "Changes adjacent orbs into matching orbs, amplifies the effect of orbs by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}"
+    },
+    870: {
+        captain: "Boosts ATK of Driven characters by 3x until the first hit other than Perfect",
+        specialName: "Black Knight",
+        special: "Changes adjacent orbs into matching orbs, amplifies the effect of orbs by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}"
+    },
+    871: {
+        captain: "Boosts ATK and RCV of QCK characters by 1.5x",
+        specialName: "Hobby-Hobby Fruit",
+        special: "Removes all enemies with HP below 20%",
+        specialNotes: "The special bypasses all known protective buffs. If the enemy can revive after being defeated, however, the special will only reduce the enemy's HP to 0 and trigger their revive effect."
+    },
+    872: {
+        captain: "Boosts ATK and RCV of QCK characters by 2x",
+        specialName: "Hobby-Hobby Fruit",
+        special: "Removes all enemies with HP below 20%",
+        specialNotes: "The special bypasses all known protective buffs. If the enemy can revive after being defeated, however, the special will only reduce the enemy's HP to 0 and trigger their revive effect."
+    },
+    873: {
+        captain: "Boosts ATK of Fighter characters by 2.5x if HP is below 30% at the start of the turn",
+        specialName: "Nyan Nyan Swim",
+        special: [
+            {
+                "description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.5x for 1 turn",
+                "cooldown": [
+                    13,
+                    8
+                ]
+            },
+            {
+                "description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.75x for 1 turn",
+                "cooldown": [
+                    19,
+                    14
+                ]
+            }
+        ],
+        specialNotes: "#{orb: 1.5x or 1.75x} #{stages}"
+    },
+    874: {
+        captain: "Boosts ATK of Fighter characters by 3x if HP is below 30% at the start of the turn",
+        specialName: "Nyan Nyan Swim",
+        special: [
+            {
+                "description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.5x for 1 turn",
+                "cooldown": [
+                    13,
+                    8
+                ]
+            },
+            {
+                "description": "Changes own orb into [PSY], amplifies the effect of orbs by 1.75x for 1 turn",
+                "cooldown": [
+                    19,
+                    14
+                ]
+            }
+        ],
+        specialNotes: "#{orb: 1.5x or 1.75x} #{stages}"
+    },
+    875: {
+        captain: "Boosts ATK of Cerebral and Driven characters by 2x",
+        specialName: "Beto Launcher",
+        special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
+    },
+    876: {
+        captain: "Boosts ATK of Cerebral and Driven characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Cerebral and Driven characters",
+        captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
+        specialName: "Beto Launcher",
+        special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
+    },
+    877: {
+        captain: "Boosts amount of beli received by 2x",
+        specialName: "Heaven's Do Art",
+        special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
+        specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
+    },
+    878: {
+        captain: "Boosts ATK of all characters by 1.5x, boosts amount of beli received by 2x",
+        specialName: "Heaven's Do Art",
+        special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
+        specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
+    },
+    879: {
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 1.75x",
+        specialName: "Battle Preservation Fist: Manki Kayaku",
+        special: "Changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
+        specialNotes: "#{gOrbs}"
+    },
+    880: {
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Fighter characters by 2x",
+        specialName: "Battle Preservation Fist: Manki Kayaku",
+        special: "Changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
+        specialNotes: "#{gOrbs}"
+    },
+    881: {
+        captain: "Boosts ATK of Shooter and Free Spirit characters by 2x following a chain of Good > Great > Perfect hits",
+        specialName: "Fighting Music: Conflict Chekera",
+        special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
+    },
+    882: {
+        captain: "Boosts ATK of Shooter and Free Spirit characters by 3x following a chain of Good > Great > Perfect hits",
+        specialName: "Fighting Music: Conflict Chekera",
+        special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
+    },
+    883: {
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
+        specialName: "Hakoku Sovereignity",
+        special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
+    },
+    884: {
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
+        specialName: "Hakoku Sovereignity",
+        special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
+    },
+    885: {
+        captain: "Boosts ATK of Fighter characters by 2x, reduces damage received by 10%",
+        specialName: "Arabesque Brick Fist: Sun",
+        special: "Cuts the current HP of each enemy by 10%, boosts ATK of Fighter characters by 1.5x for 1 turn if HP is below 30% when the special is activated"
+    },
+    886: {
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
+        specialName: "Daisy Blade: First",
+        special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Slasher characters by 1.5x for 1 turn if HP is below 30% when the special is activated"
+    },
+    887: {
+        captain: "Boosts ATK of Driven characters by 1.5x, boosts amount of beli received by 1.2x",
+        specialName: "Special Muggy Ball: Flashy",
+        special: "Reduces the defense of all enemies by 80% for 1 turn, deals 15x character's ATK in QCK damage to all enemies"
+    },
+    888: {
+        specialName: "Negative Ghost",
+        special: "Slightly reduces the ATK of all enemies by 10% for 3 turns",
+        specialNotes: "The reduction does not apply to damage from specials"
+    },
+    889: {
+        captain: "Boosts ATK and RCV of DEX characters by 1.2x",
+        specialName: "Ghost Rap",
+        special: "Changes [STR] orbs into [DEX] orbs, deals 10x character's ATK in DEX damage to all enemies"
+    },
+    890: {
+        captain: "Boosts ATK and RCV of DEX characters by 1.5x",
+        specialName: "Ghost Rap",
+        special: "Changes [STR] orbs into [DEX] orbs, deals 10x character's ATK in DEX damage to all enemies"
+    },
+    891: {
+        captain: "Boosts ATK and RCV of Powerhouse characters by 1.75x",
+        specialName: "Resurrection of the Dead",
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.25x for 1 turn",
+        },
+    892: {
+        captain: "Boosts chain multiplier by 2x",
+        specialName: "Hands of the Dead",
+        special: "Switches orbs between slots three times"
+    },
+    893: {
+        captain: "Boosts ATK of Powerhouse characters by 3x after scoring 3 Perfects in a row",
+        specialName: "Oars Ball",
+        special: "Reduces damage received by 50% for 1 turn, deals 30x character's ATK in STR damage to all enemies"
+    },
+    894: {
+        captain: "Boosts ATK of Driven characters by 3x following a chain of Good > Great > Perfect hits",
+        specialName: "Brick Bat: Black Box",
+        special: "Empties all slots with [INT] orbs, deals several times the character's ATK in INT damage to one enemy",
+        specialNotes: "The exact multiplier used is chosen based on the number of [INT] orbs consumed: 1 orb will give a 10x multiplier, 2 orbs 15x, 3 orbs 20x, 4 orbs 50x, 5 orbs 100x, 6 orbs 200x. It's not possible to activate the special without consuming at least one [INT] orb."
+    },
+    895: {
+        captain: "Boosts ATK of Slasher characters by 1.5x",
+        specialName: "Dying Chorus: Binks' Sake",
+        special: "Recovers 6x character's RCV in HP at the end of each turn for 3 turns"
+    },
+    896: {
+        captain: "Boosts ATK of Slasher characters by 2x",
+        specialName: "Dying Chorus: Binks' Sake",
+        special: "Recovers 6x character's RCV in HP at the end of each turn for 3 turns"
+    },
+    897: {
+        captain: "Boosts ATK of Cerebral and Driven characters by 2x",
+        specialName: "Ground Death: Thirst",
+        special: "Changes own orb into [STR], randomizes all other orbs, cuts the current HP of all enemies by 10%"
+    },
+    898: {
+        captain: "Boosts ATK and HP of Striker and Cerebral characters by 1.5x",
+        specialName: "Championship Fight: Little Garden Three",
+        special: "Deals 10x character's ATK in QCK damage to all enemies, changes adjacent orbs into [G] orbs",
+        specialNotes: "#{gOrbs}"
+    },
+    899: {
+        captain: "Boosts ATK of Fighter and Free Spirit characters by 1.75x and their RCV by 1.25x",
+        specialName: "Hymn to Friendship: \"Okama Way\" Two",
+        special: "Reduces Despair duration by 5 turns, recovers 10x character's RCV in HP"
+    },
+    900: {
+        captain: "Boosts ATK of Shooter characters by 2x if HP is above 99% at the start of the turn",
+        specialName: "Franky Destroy Gun",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+        specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
+    },
+    901: {
+        captain: "Boosts ATK of Shooter characters by 2.75x if HP is above 99% at the start of the turn",
+        specialName: "Franky Destroy Gun",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+        specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
+    },
+    902: {
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
+        specialName: "Hakoku Sovereignity",
+        special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
+    },
+    903: {
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
+        specialName: "Hakoku Sovereignity",
+        special: "Deals 20x character's ATK in character's type damage to all enemies, boosts ATK of Powerhouse characters by 1.5x for 1 turn. If \"Hakoku Sovereignity\" is used again in the same turn the special is activated in, boosts ATK of Powerhouse characters by 2x instead."
+    },
+    904: {
+        captain: "Protects from defeat as long as HP is above 50%",
+        captainNotes: "#{zombie}",
+        specialName: "Yokozuna Slap!",
+        special: "Deals 20x character's ATK in STR damage to one enemy, delays all enemies for 1 turn"
+    },
+    905: {
+        captain: "Boosts ATK of Slasher characters by 2.5x if HP is below 30% at the start of the turn",
+        specialName: "Two Gorilla Cut",
+        special: [
+            {
+                "description": "Changes own orb into [STR], boosts his own ATK by 1.5x for 2 turns",
+                "cooldown": [ 17, 11 ]
+            },
+            {
+                "description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.5x for 2 turns",
+                "cooldown": [ 21, 15 ]
+            },
+            {
+                "description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.75x for 2 turns",
+                "cooldown": [ 24, 18 ]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
+    906: {
+        captain: "Boosts ATK of Slasher characters by 2.75x if HP is below 30% at the start of the turn",
+        specialName: "Two Gorilla Cut",
+        special: [
+            {
+                "description": "Changes own orb into [STR], boosts his own ATK by 1.5x for 2 turns",
+                "cooldown": [ 17, 11 ]
+            },
+            {
+                "description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.5x for 2 turns",
+                "cooldown": [ 21, 15 ]
+            },
+            {
+                "description": "Changes own orb into [STR], boosts ATK of Slasher characters by 1.75x for 2 turns",
+                "cooldown": [ 24, 18 ]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
+    907: {
+        specialName: "Cien Fleur: Big Tree",
+        special: "Delays all enemies for 1 turn, locks all orbs for 1 turn, deals 5,000 fixed damage to all enemies, reduces crew's HP to 1",
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x if HP is below 30% at the start of the turn"
+    },
+    908: {
+        specialName: "Cien Fleur: Big Tree",
+        special: "Delays all enemies for 1 turn, locks all orbs for 1 turn, deals 5,000 fixed damage to all enemies, reduces crew's HP to 1",
+        captain: "Boosts ATK of Cerebral characters by 2.5x and their RCV by 1.75x if HP is below 30% at the start of the turn"
+    },
+    909: {
+        captain: "Boosts ATK and RCV of PSY characters by 1.5x",
+        specialName: "Hero of Justice! Chopper Mask!!",
+        special: "Recovers 5,000 HP, boosts ATK of PSY characters by 1.5x for 2 turns"
+    },
+    910: {
+        specialName: "Hero of Justice! Chopper Mask!!",
+        special: "Recovers 5,000 HP, boosts ATK of PSY characters by 1.5x for 2 turns",
+        captain: "Boosts ATK of PSY characters by 2x, their RCV by 1.5x, makes INT orbs \"beneficial\" to PSY characters",
+        captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs."
+    },
+    911: {
+        specialName: "Diable Jambe: Premier Hachis",
+        special: [
+            {
+                "description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
+                "cooldown": [ 15, 8 ]
+            },
+            {
+                "description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
+                "cooldown": [ 25, 18 ]
+            }
+        ],
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
+        specialNotes: "#{stages}"
+    },
+    912: {
+        specialName: "Diable Jambe: Premier Hachis",
+        special: [
+            {
+                "description": "Deals 13x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 1.2x for 1 turn",
+                "cooldown": [ 15, 8 ]
+            },
+            {
+                "description": "Deals 20x character's ATK in DEX damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
+                "cooldown": [ 25, 18 ]
+            }
+        ],
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
+        specialNotes: "#{stages}"
+    },
+    913: {
+        captain: "Boosts ATK of QCK characters by 2.5x if they have a matching orb",
+        specialName: "Black Magic Summoning: Advent of the Demon Lord Satan",
+        special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes opposite orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
+    },
+    914: {
+        captain: "Boosts ATK of QCK characters by 3x if they have a matching orb, by 1.2x otherwise",
+        specialName: "Black Magic Summoning: Advent of the Demon Lord Satan",
+        special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes opposite orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
+    },
+    915: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
+        specialName: "Feeling of Mutual Love",
+        special: "Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn"
+    },
+    916: {
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
+        specialName: "Feeling of Mutual Love",
+        special: "Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn"
+    },
+    917: {
+        captain: "Boosts ATK of Shooter characters by 1.5x",
+        specialName: "Kuja's Haki Arrow",
+        special: "Deals 5,000 fixed damage to one enemy, delays all enemies for 1 turn, changes [RCV] orbs on Shooter characters into matching orbs",
+        specialNotes: "The orb shuffle only applies to Shooter characters, other classes are unaffected."
+    },
+    918: {
+        captain: "Boosts ATK of Shooter characters by 1.75x, recovers a small amount of health at the end of each turn",
+        specialName: "Kuja's Haki Arrow",
+        special: "Deals 5,000 fixed damage to one enemy, delays all enemies for 1 turn, changes [RCV] orbs on Shooter characters into matching orbs",
+        specialNotes: "The orb shuffle only applies to Shooter characters, other classes are unaffected."
+    },
+    919: {
+        specialName: "Spike of the Warrior Defending Her Country",
+        special: "Reduces damage received from STR enemies by 50% for 2 turns"
+    },
+    920: {
+        specialName: "Snake Bow of the Warrior Defending Her Country",
+        special: "Changes the orbs in the middle row into [RCV] orbs, changes the orbs in the bottom row into [TND] orbs"
+    },
+    921: {
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x",
+        specialName: "Pure and Beautiful Shyness",
+        special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
+    },
+    922: {
+        captain: "Boosts ATK and RCV of Free Spirit characters by 1.75x",
+        specialName: "Pure and Beautiful Shyness",
+        special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
+    },
+    923: {
+        captain: "Boosts ATK of Driven characters by 2x or by 2.5x",
+        captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
+        specialName: "Repel: Weapons Reflect",
+        special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
+        specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
+    },
+    924: {
+        captain: "Boosts ATK of Driven characters by 2x or by 2.75x",
+        captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
+        specialName: "Repel: Weapons Reflect",
+        special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
+        specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
+    },
+    925: {
+        captain: "Boosts ATK of Powerhouse characters by 2x",
+        specialName: "Let's go, Jailer Beasts!",
+        special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
+    },
+    926: {
+        captain: "Boosts ATK of Powerhouse characters by 2.5x",
+        specialName: "Let's go, Jailer Beasts!",
+        special: "Deals 15x ATK to 1 enemy in [QCK] damage, boosts ATK against enemies with reduced defense by 1.3x for 3 turns"
+    },
+    927: {
+        captain: "Boosts ATK and HP of Driven characters by 1.5x",
+        specialName: "Unwavering Hammer of Justice",
+        special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
+    },
+    928: {
+        captain: "Boosts ATK of Driven Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
+        special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
+        specialName: "Hell Wisdom Rush"
+    },
+    929: {
+        captain: "Boosts ATK of Driven Characters by 2.25x while above 30% HP and boosts ATK of Striker Characters by 2.25x while below 30% HP",
+        special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
+        specialName: "Hell Wisdom Rush"
+    },
+    930: {
+        captain: "Boosts chain multiplier by 2x",
+        specialName: "Blugori Manipulation Song",
+        special: "Changes orbs in left column to [DEX], then [QCK], then [INT]. Locks himself for 3 turns."
+    },
+    931: {
+        specialName: "Large Axe of Punishment",
+        special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
+    },
+    932: {
+        captain: "Boosts ATK of Powerhouse Characters by 1.5x, and their HP by 1.5x",
+        specialName: "Rock Domination Wall",
+        special: [
+            {
+                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
+                "cooldown": [ 25, 11 ]
+            },
+            {
+                "description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
+                "cooldown": [ 31, 17 ]
+            }
+        ],
+        specialNotes: "#{stages}"	
+        },
+    933: {
+        captain: "Boosts ATK of Powerhouse Characters by 2.25x, and their HP by 1.5x",
+        specialName: "Rock Domination Wall",
+        special: [
+            {
+                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
+                "cooldown": [ 25, 11 ]
+            },
+            {
+                "description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
+                "cooldown": [ 31, 17 ]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
+    934: {
+        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
+        specialName: "Fishman Karate!! Shark Fist Tile Breaker",
+        special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
+        specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
+    },
+    935: {
+        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
+        specialName: "Fishman Karate!! Shark Fist Tile Breaker",
+        special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into matching",
+        specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
+    },
+    936: {
+        captain: "Boosts Chain Multiplier by 3x",
+        specialName: "Gum-Gum Giant Jet Shell",
+        special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
+        specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
+    },
+    937: {
+        captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.25x",
+        specialName: "Gum-Gum Giant Jet Shell",
+        special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
+        specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
+    },
+    938: {
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Cerebral characters by 1.5x",
+        specialName: "Cyclone Burst",
+        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
+    },
+    939: {
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
+        specialName: "Cyclone Burst",
+        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
+    },
+    940: {
+        captain: "Boosts ATK and HP of [DEX] Characters by 1.5x",
+        specialName: "Sure Kill! Exploding Star!!",
+        special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
+    },
+    941: {
+        captain: "Boosts ATK of [DEX] Characters by 1.75x and their HP by 2.25x",
+        specialName: "Sure Kill! Exploding Star!!",
+        special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
+    },
+    942: {
+        captain: "Boosts ATK and HP of [STR] Characters by 1.5x",
+        specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
+        special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
+    },
+    943: {
+        captain: "Boosts ATK of [STR] Characters by 2.25x and their HP by 1.75x",
+        specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
+        special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
+    },
+    944: {
+        captain: "Boosts ATK and RCV of Driven Characters by 1.2x",
+        specialName: "Spiritual Bouquet",
+        special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
+    },
+    945: {
+        captain: "Boosts ATK and RCV of Driven Characters by 1.75x",
+        specialName: "Spiritual Bouquet",
+        special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
+    },
+    946: {
+        specialName: "Lock-on Iron Ball",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker Characters by 1.75x",
+        special: "Change Friend Captain and changes own orb into [INT]"
+    },
+    947: {
+        captain: "Boosts ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
+        specialName: "Flame Flash",
+        special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals 10x character's ATK in [INT] damage to all enemies",
+        captainNotes: "#{noFixedPerc}"
+    },
+    948: {
+        captain: "Boosts ATK of Shooter Characters by 1.5x and their RCV by 1.2x",
+        specialName: "Twin Cannons",
+        special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage"
+    },
+    949: {
+        captain: "Boosts ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
+        specialName: "Ties with Ace",
+        special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
+    },
+    950: {
+        captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
+        specialName: "Flame Commandment: Fire Pillar",
+        special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+        specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
+    },
+    951: {
+        captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
+        specialName: "Flame Commandment: Fire Pillar",
+        special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+        specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
+    },
+    952: {
+        captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.2x",
+        specialName: "Life-saving Gunstock Blow",
+        special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
+    },
+    953: {
+        captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
+        specialName: "Life-saving Gunstock Blow",
+        special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
+    },
+    954:{
+        captain: "Boosts ATK and HP of [QCK] Characters by 1.5x",
+        specialName: "Goldfish Fencing! I'll Dye the Sea Red with Your Blood",
+        special: "Reduces the defense of all enemies by 80% for 2 turns"
+    },
+    955:{
+        captain: "Boosts ATK and HP of [PSY] Characters by 1.5x",
+        specialName: "Get Rich Quick Scheme! We're All Gonna Be Rich",
+        special: "Boosts ATK against enemies with reduced defense by 1.2x for 2 turns"
+    },
+    956:{
+        captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
+        specialName: "Fishman karate! I'll Finish You",
+        special: "Boosts ATK of Powerhouse characters by 1.2x for 2 turns"
+    },
+    957:{
+        specialName: "First Aid",
+        special: "Recover 2,000 HP"
+    },
+    958:{
+        specialName: "Bind Purge",
+        special: "Reduces Bind duration by 2 turns"
+    },
+    959:{
+        specialName: "Captain Soul Recovery",
+        special: "Reduces Despair duration by 2 turns"
+    },
+    960:{
+        specialName: "Slot Color Shuffle",
+        special: "Randomly changes all orbs into either [STR], [DEX], [QCK], [PSY] or [INT] orbs"
+    },
+    961:{
+        specialName: "Slot Power Light",
+        special: "Amplifies the effect of orbs by 1.25x for 1 turn"
+    },
+    962:{
+        specialName: "Captain Slot Change RCV",
+        special: "Changes captain's orb into [RCV]"
+    },
+    963:{
+        captain: "Boosts ATK of characters with cost between 50 and 55 by 2x",
+        specialName: "Saint Charloss' Stroll",
+        special: "Reduces the defense of all enemies by 100% for 1 turn and randomizes all orbs"
+    },
+    964:{
+        captain: "Boosts ATK, HP, and RCV of characters with cost between 50 and 55 by 1.5x",
+        specialName: "Wrath of the Creator Bloodline",
+        special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
+    },
+    965:{
+        captain: "Boosts ATK of characters with cost between 50 and 55 by 1.5x, recovers 500 HP at the end of each turn",
+        specialName: "Wrath of the Creator Bloodline",
+        special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
+    },
+    966:{
+        captain: "Boosts ATK of Driven Characters by 2.25x",
+        specialName: "Repel",
+        special: "Empties slots with [QCK] orbs, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
+        specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: 0 orbs - Can't activate; 1 orb - 14x ATK; 2 orbs - 21x ATK; 3 orbs - 35x ATK; 4 orbs - 49x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
+    },
+    967:{
+        captain: "Boosts ATK of Free Spirit Characters by 2.25x",
+        specialName: "Surgeon of Death's First Aid Surgery",
+        special: "Recovers 20x character's RCV in HP. Switches orbs between slots twice"
+    },
+    968:{
+        specialName: "High Heat Ray Laser",
+        special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
+    },
+    969:{
+        specialName: "High Heat Ray Laser",
+        special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
+    },
+    970:{
+        specialName: "High Heat Ray Laser",
+        special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
+    },
+    971:{
+        specialName: "High Heat Ray Laser",
+        special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
+    },
+    972:{
+        specialName: "High Heat Ray Laser",
+        special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
+    },
+    973:{
+        captain: "Boosts ATK of Powerhouse Characters by 2x if HP is above 99% at the start of the turn",
+        specialName: "Ironclad Thrust: Dwarf Guard of the World",
+        special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
+    },
+    974:{
+        captain: "Boosts ATK of Powerhouse Characters by 2.5x if HP is above 99% at the start of the turn",
+        specialName: "Ironclad Thrust: Dwarf Guard of the World",
+        special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
+    },
+    975:{
+        captain: "Reduces damage received by 10%",
+        specialName: "A Threat That Puts Adults to Shame",
+        special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        specialNotes: "#{zombie}"
+    },
+    976:{
+        captain: "Boosts ATK of Driven Characters by 2x. Reduces damage received by 10%",
+        specialName: "A Threat That Puts Adults to Shame",
+        special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        specialNotes: "#{zombie}"
+    },
+    977:{
+        captain: "Boosts ATK of Shooter characters by 2x",
+        specialName: "Yata no Kagami (Sacred Mirror)",
+        special: [
+            {
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
+                "cooldown": [ 19, 5 ]
+            },
+            {
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
+                "cooldown": [ 25, 11 ]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
+    978:{
+        captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.25x and boosts HP of Shooter characters by 1.5x",
+        specialName: "Yata no Kagami (Sacred Mirror)",
+        special: [
+            {
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
+                "cooldown": [19,5]
+            },
+            {
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
+                "cooldown": [25,11]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
     979: {
         captain: "Boosts ATK of [PSY] and [DEX] characters by 1.75x and their RCV by 1.2x",
         specialName: "Flintlock Barrage",
@@ -4665,18 +4665,18 @@ window.details = {
     },
     982: {
         captain: "Boosts ATK of Slasher characters by 2x",
-		specialName: "Flower Sword Straight Cut",
+        specialName: "Flower Sword Straight Cut",
         special: "Deals 25x character's ATK to one enemy, changes bottom row orbs into matching orbs"
     },
     983: {
         captain: "Boosts ATK of Slasher characters by 2.25x, makes [RCV] and [TND] orbs \"beneficial\" to Slasher characters",
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-		specialName: "Flower Sword Straight Cut",
+        specialName: "Flower Sword Straight Cut",
         special: "Deals 25x character's ATK to one enemy, changes bottom row orbs into matching orbs"
     },
     984: {
         captain: "Boosts ATK of Striker characters by 2.25x",
-		specialName: "Shrouds and Rattling Knot",
+        specialName: "Shrouds and Rattling Knot",
         special: "Delays all enemies for 1 turn, Locks all orbs for 1 turn"
     },
     985:{
@@ -4691,215 +4691,215 @@ window.details = {
     988:{
       captainNotes: "Acts as a Daimyo Turtle and thus gives 15k EXP"  
     },
-	989:{
-		captain: "Boosts ATK of characters with cost above 20 and below 30 by 2.5x, but reduces the HP of every character by 90%",
-		special: "Changes the orbs in the left column into [G], [QCK] and [DEX], the orbs in the right column into [STR], [PSY] and [INT]",
-		specialName: "Bluff Piracy"
-	},
+    989:{
+        captain: "Boosts ATK of characters with cost above 20 and below 30 by 2.5x, but reduces the HP of every character by 90%",
+        special: "Changes the orbs in the left column into [G], [QCK] and [DEX], the orbs in the right column into [STR], [PSY] and [INT]",
+        specialName: "Bluff Piracy"
+    },
     990: {
-		captain: "Boosts ATK of Free Spirit characters by 2.5x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
     },
     991: {
-		captain: "Boosts ATK of Free Spirit characters by 2.75x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Free Spirit characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "10,000 Ton Vise of Hell",
         special: "Changes [RCV] orbs into matching orbs"
     },
-	992: {
-		captain: "Boosts ATK of [QCK] characters by 2x",
-		special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
-		specialName: "Punc Rock Fest"
-	},
-	993: {
-		captain: "Boosts ATK of [QCK] characters by 2.5x",
-		special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
-		specialName: "Punc Rock Fest"
-	},
-	994: {
-		captain: "Boosts amount of beli received by 2x",
-		special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
-		specialName: "Peeping Mind",
-		special: [
-			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": [ 13, 7 ]
-			},
-			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": [ 20, 14 ]
-			}
-		],
-		specialNotes: "#{stages}",
+    992: {
+        captain: "Boosts ATK of [QCK] characters by 2x",
+        special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
+        specialName: "Punc Rock Fest"
+    },
+    993: {
+        captain: "Boosts ATK of [QCK] characters by 2.5x",
+        special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
+        specialName: "Punc Rock Fest"
+    },
+    994: {
+        captain: "Boosts amount of beli received by 2x",
+        special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
+        specialName: "Peeping Mind",
+        special: [
+            {
+                "description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "cooldown": [ 13, 7 ]
+            },
+            {
+                "description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "cooldown": [ 20, 14 ]
+            }
+        ],
+        specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
-	},
-	995:{
-		captain: "Boosts amount of beli received by 3x",
-		special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
-		specialName: "Peeping Mind",
-		special: [
-			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": [ 13, 7 ]
-			},
-			{
-				"description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
-				"cooldown": [ 20, 14 ]
-			}
-		],
-		specialNotes: "#{stages}",
+    },
+    995:{
+        captain: "Boosts amount of beli received by 3x",
+        special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
+        specialName: "Peeping Mind",
+        special: [
+            {
+                "description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "cooldown": [ 13, 7 ]
+            },
+            {
+                "description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "cooldown": [ 20, 14 ]
+            }
+        ],
+        specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
-	},
+    },
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
         special: [
-			{
-				"description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
-				"cooldown": 11
-			},
-			{
-				"description": "For all characters, changes Bad orbs into matching orbs.",
-				"cooldown": 20
-			}
-		],
-		specialName: "Decapitation High Heel",
-		specialNotes: "#{stages}"
+            {
+                "description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
+                "cooldown": 11
+            },
+            {
+                "description": "For all characters, changes Bad orbs into matching orbs.",
+                "cooldown": 20
+            }
+        ],
+        specialName: "Decapitation High Heel",
+        specialNotes: "#{stages}"
     },
     997: {
-		captain: "Boosts ATK of Powerhouse characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Powerhouse characters",
-		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, makes [TND] and [RCV] orbs \"beneficial\" to Powerhouse characters",
+        captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         special: [
-			{
-				"description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
-				"cooldown": 11
-			},
-			{
-				"description": "For all characters, changes Bad orbs into matching orbs.",
-				"cooldown": 20
-			}
-		],
-		specialName: "Decapitation High Heel",
-		specialNotes: "#{stages}"
+            {
+                "description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
+                "cooldown": 11
+            },
+            {
+                "description": "For all characters, changes Bad orbs into matching orbs.",
+                "cooldown": 20
+            }
+        ],
+        specialName: "Decapitation High Heel",
+        specialNotes: "#{stages}"
     },
     998: {
-		captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turns at the start of the fight",
+        captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
     999: {
-		captain: "Boosts ATK of Driven characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
+        captain: "Boosts ATK of Driven characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
-	1000: {
-		captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
-		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
-		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
-		specialName: "Love Sacrifice"
-	},
-	1001: {
-		captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
-		captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
-		special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
-		specialName: "Love Sacrifice"
-	},
-	1002: {
-		captain: "Boosts ATK of Fighter characters by 1.5x",
-		special: "Reduces Paralysis duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
-		specialName: "Bepo's Ultimate Fist!!",
-		specialNotes: "Paralysis causes that unit to have a chance of not attacking and breaking chain"
-	},
-	1003: {
-		captain: "Boosts ATK of Fighter characters by 2x",
-		special: "Reduces Paralysis duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
-		specialName: "Bepo's Ultimate Fist!!",
-		specialNotes: "Paralysis causes that unit to have a chance of not attacking and breaking chain"
-	},
-	1004: {
-		captain: "Boosts RCV of all characters by 1.5x",
-		specialName: "Hilarious Combination",
-		special: "Changes the orbs in the left column into [RCV] orbs"
-	},
-	1005: {
-		captain: "Boosts ATK of Powerhouse characters by 1.5x",
-		specialName: "Rush to Freedom",
-		special: "Boosts own ATK by 1.75x for 1 turn"
-	},
-	1006: {
-		captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
-		specialName: "Rush to Freedom",
-		special: "Boosts own ATK by 1.75x for 1 turn"
-	},
-	1007: {
-		captain: "Boosts ATK of Cerebral and Free Spirit characters by 1.5x",
-		specialName: "Cherry Blossom Storm: Spring Pattern",
-		special: "Changes adjacent orbs into [RCV] and recovers 3,000 HP"
-	},
-	1008: {
-		captain: "Boosts ATK of Cerebral and Free Spirit characters by 2x. Recovers 3x character's RCV in HP at the end of each turn",
-		specialName: "Cherry Blossom Storm: Spring Pattern",
-		special: "Changes adjacent orbs into [RCV] and recovers 3,000 HP"
-	},
-	1009: {
-		special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
-		specialName: "Gum-Gum Flail",
-		captain: "Boosts ATK of [STR] and Fighter characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight",
-		captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
-	},
-	1010:{
-		captain: "Boosts ATK of Driven characters by 1.5x",
-		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
-		specialName: "Evil Beast's Horn Pierce"
-	},
-	1011:{
-		captain: "Boosts ATK of Driven characters by 1.75x, and boosts ATK of Powerhouse characters by 1.5x",
-		captainNotes: "The bonus is cumulative. Driven Powerhouse characters get a 2.625x bonus.",
-		special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
-		specialName: "Evil Beast's Horn Pierce"
-	},
-	1012: {
-		specialName: "Phantom Snake Sword",
-		special: "Changes the orbs in the left column into [RCV], [QCK] and [DEX], binds himself for 2 turns"
-	},
-	1013: {
-		specialName: "Binding Iron Chain",
-		special: "Boosts ATK against delayed enemies by 1.2x for 1 turns"
-	},
-	1014: {
-		special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
-		specialName: "Scapegoat Substitute",
-		captain: "Boosts ATK of Powerhouse characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
-	},
-	1015: {
-		captain: "Boosts ATK of [INT] characters by 2.75x if they have a matching orb",
-		special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
-		specialName: "Hollow Eye Killing Shot"
-	},
-	1016: {
-		captain: "Boosts ATK of [INT] characters by 3x if they have a matching orb, by 1.5x otherwise",
-		special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
-		specialName: "Hollow Eye Killing Shot"
-	},
-	1017: {
-		captain: "Boosts HP of Slasher characters by 1.5x",
-		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
-		specialName: "Ravaging Cutlass Dance",
-		specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
-	},
-	1018: {
-		captain: "Boosts ATK of Slasher characters by 1.5x and their HP by 2x",
-		special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
-		specialName: "Ravaging Cutlass Dance",
-		specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
-	},
-	1019: {
-		captain: "Reduces damage received from [QCK] enemies by 50%",
-		special: "Switches orbs between slots 2 times and deals 2000 fixed damage to one enemy",
-		specialName: "Blacksmithing Measurement: Double Slash",
+    1000: {
+        captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
+        captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
+        special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
+        specialName: "Love Sacrifice"
+    },
+    1001: {
+        captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
+        captainNotes: "#{captainProportional : higher : 1 + 1 * (remaining HP) / (total HP) : 2 : 1 }",
+        special: "Recovers 25x character's RCV in HP. Reduces Bind and Despair duration by 3 turns",
+        specialName: "Love Sacrifice"
+    },
+    1002: {
+        captain: "Boosts ATK of Fighter characters by 1.5x",
+        special: "Reduces Paralysis duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
+        specialName: "Bepo's Ultimate Fist!!",
+        specialNotes: "Paralysis causes that unit to have a chance of not attacking and breaking chain"
+    },
+    1003: {
+        captain: "Boosts ATK of Fighter characters by 2x",
+        special: "Reduces Paralysis duration by 3 turns and deals 7x ATK as [STR] damage to one enemy",
+        specialName: "Bepo's Ultimate Fist!!",
+        specialNotes: "Paralysis causes that unit to have a chance of not attacking and breaking chain"
+    },
+    1004: {
+        captain: "Boosts RCV of all characters by 1.5x",
+        specialName: "Hilarious Combination",
+        special: "Changes the orbs in the left column into [RCV] orbs"
+    },
+    1005: {
+        captain: "Boosts ATK of Powerhouse characters by 1.5x",
+        specialName: "Rush to Freedom",
+        special: "Boosts own ATK by 1.75x for 1 turn"
+    },
+    1006: {
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
+        specialName: "Rush to Freedom",
+        special: "Boosts own ATK by 1.75x for 1 turn"
+    },
+    1007: {
+        captain: "Boosts ATK of Cerebral and Free Spirit characters by 1.5x",
+        specialName: "Cherry Blossom Storm: Spring Pattern",
+        special: "Changes adjacent orbs into [RCV] and recovers 3,000 HP"
+    },
+    1008: {
+        captain: "Boosts ATK of Cerebral and Free Spirit characters by 2x. Recovers 3x character's RCV in HP at the end of each turn",
+        specialName: "Cherry Blossom Storm: Spring Pattern",
+        special: "Changes adjacent orbs into [RCV] and recovers 3,000 HP"
+    },
+    1009: {
+        special: "Changes [BLOCK] orbs into [STR], deals 20x character's ATK in STR damage to one enemy",
+        specialName: "Gum-Gum Flail",
+        captain: "Boosts ATK of [STR] and Fighter characters by 1.5x, reduces cooldown of all specials by 1 turn at the start of the fight",
+        captainNotes: "The bonus is cumulative. STR Fighter characters get a 2.25x bonus."
+    },
+    1010:{
+        captain: "Boosts ATK of Driven characters by 1.5x",
+        special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
+        specialName: "Evil Beast's Horn Pierce"
+    },
+    1011:{
+        captain: "Boosts ATK of Driven characters by 1.75x, and boosts ATK of Powerhouse characters by 1.5x",
+        captainNotes: "The bonus is cumulative. Driven Powerhouse characters get a 2.625x bonus.",
+        special: "Boosts own ATK by 1.3x for 5 turns, reduces damage received by 20% for 5 turns, deals 13x character's ATK as [INT] damage to one enemy",
+        specialName: "Evil Beast's Horn Pierce"
+    },
+    1012: {
+        specialName: "Phantom Snake Sword",
+        special: "Changes the orbs in the left column into [RCV], [QCK] and [DEX], binds himself for 2 turns"
+    },
+    1013: {
+        specialName: "Binding Iron Chain",
+        special: "Boosts ATK against delayed enemies by 1.2x for 1 turns"
+    },
+    1014: {
+        special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
+        specialName: "Scapegoat Substitute",
+        captain: "Boosts ATK of Powerhouse characters by 2x, and Recovers 2x character's RCV in HP at the end of each turn"
+    },
+    1015: {
+        captain: "Boosts ATK of [INT] characters by 2.75x if they have a matching orb",
+        special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
+        specialName: "Hollow Eye Killing Shot"
+    },
+    1016: {
+        captain: "Boosts ATK of [INT] characters by 3x if they have a matching orb, by 1.5x otherwise",
+        special: "Randomizes all orbs. Boosts ATK of [INT] characters by 1.5x for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [INT] characters by 1.5x for the next 2 turns",
+        specialName: "Hollow Eye Killing Shot"
+    },
+    1017: {
+        captain: "Boosts HP of Slasher characters by 1.5x",
+        special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
+        specialName: "Ravaging Cutlass Dance",
+        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
+    },
+    1018: {
+        captain: "Boosts ATK of Slasher characters by 1.5x and their HP by 2x",
+        special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
+        specialName: "Ravaging Cutlass Dance",
+        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
+    },
+    1019: {
+        captain: "Reduces damage received from [QCK] enemies by 50%",
+        special: "Switches orbs between slots 2 times and deals 2000 fixed damage to one enemy",
+        specialName: "Blacksmithing Measurement: Double Slash",
         specialNotes: "#{fixed}"
-	},
+    },
     1020: {
         captain: "Boosts ATK and RCV of Shooter and Cerebral characters by 1.5x.",
         captainNotes: "This effect does not stack for characters that have both classes.",
@@ -4912,85 +4912,85 @@ window.details = {
         specialName: "Sweet Fruit Trap",
         special: "Recovers 9x characters RCV in HP. Changes captain's orb into Matching orb"
     },
-	1022: {
-		captain: "Boosts ATK of all characters by 2x and boosts amount of beli received by 1.2x",
-		special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
-		specialName: "Gum-Gum Gigant Rifle: New Star"
-	},
+    1022: {
+        captain: "Boosts ATK of all characters by 2x and boosts amount of beli received by 1.2x",
+        special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
+        specialName: "Gum-Gum Gigant Rifle: New Star"
+    },
     1023: {
         captain: "Boosts ATK of Free Spirit characters by 2.25x",
         special: "Deals 13x characters ATK in INT damage to all enemies, boosts atk of Free Spirit characters by 1.75x for one turn.",
         specialName: "Flame Mirror: Dawn"
     },
-	1024: {
-		captain: "Boosts ATK of Powerhouse characters by 2x",
-		special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
-		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
-		specialName: "Eight-Impact Fist! Blow of Resentment"
-	},
-	1025: {
-		captain: "Boosts ATK of Powerhouse characters by 2x and boosts the HP of Striker characters by 2x",
+    1024: {
+        captain: "Boosts ATK of Powerhouse characters by 2x",
+        special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
+        specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
+        specialName: "Eight-Impact Fist! Blow of Resentment"
+    },
+    1025: {
+        captain: "Boosts ATK of Powerhouse characters by 2x and boosts the HP of Striker characters by 2x",
         captainNotes: "A character with both classes will get both boosts",
-		special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
-		specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
-		specialName: "Eight-Impact Fist! Blow of Resentment"
-	},
-	1026: {
-		captain: "Boosts ATK and RCV of Fighters by 1.5x",
-		specialName: "Shooting Moon",
-		special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
-	},
-	1027: {
-		captain: "Boosts ATK and RCV of Fighters by 2x",
-		specialName: "Shooting Moon",
-		special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
-	},
+        special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
+        specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
+        specialName: "Eight-Impact Fist! Blow of Resentment"
+    },
+    1026: {
+        captain: "Boosts ATK and RCV of Fighters by 1.5x",
+        specialName: "Shooting Moon",
+        special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
+    },
+    1027: {
+        captain: "Boosts ATK and RCV of Fighters by 2x",
+        specialName: "Shooting Moon",
+        special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
+    },
     1028: {
-		captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain",
+        captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain",
         specialName: "Rah-Rah-Rah Rampage",
         special: "Deals random damage to all enemies, boost ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
     },
     1029: {
-		captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain and by 3.5x after the 36th hit",
+        captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain and by 3.5x after the 36th hit",
         specialName: "Rah-Rah-Rah Rampage",
         special: "Deals random damage to all enemies, boost ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
     },
     1030: {
-		captain: "Boosts ATK of Powerhouse characters by 2.5x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
         special: "Reduces crew's HP to 1, deals 10x the removed HP as damage to one enemy. Boosts own ATK by 2.25x for 1 turn."
     },
     1031: {
-		captain: "Boosts ATK of Powerhouse characters by 2.75x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Powerhouse characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "Hero's Gungnir",
         special: "Reduces crew's HP to 1, deals 10x the removed HP as damage to one enemy. Boosts own ATK by 2.25x for 1 turn."
     },
-	1032: {
-		captain: "Boosts ATK of Striker and Slasher characters by 1.5x and reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight",
-		special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
-		specialName: "Surprise Pincer Attack"
-	},
-	1033: {
-		captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turn at the start of the fight",
-		special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
-		specialName: "Surprise Pincer Attack"
-	},
-	1034: {
-		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
-		captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
-		special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
-		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
-		specialName: "Bari Bari No Pistol"
-	},
-	1035: {
-		captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
-		captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
-		special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
-		specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
-		specialName: "Bari Bari No Pistol"
-	},
+    1032: {
+        captain: "Boosts ATK of Striker and Slasher characters by 1.5x and reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight",
+        special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+        specialName: "Surprise Pincer Attack"
+    },
+    1033: {
+        captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turn at the start of the fight",
+        special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+        specialName: "Surprise Pincer Attack"
+    },
+    1034: {
+        captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
+        captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
+        special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
+        specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
+        specialName: "Bari Bari No Pistol"
+    },
+    1035: {
+        captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
+        captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
+        special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
+        specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
+        specialName: "Bari Bari No Pistol"
+    },
     1036: {
         captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
         special: "Deals 13x ATK in QCK Damage to one Enemy, Changes Orbs depending on the current HP",
@@ -5037,31 +5037,31 @@ window.details = {
         captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
         specialName: "Gamma Knife",
         special: [
-			{
-				"description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
-				"cooldown": [ 18, 13 ]
-			},
-			{
-				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
-				"cooldown": [ 25, 20 ]
-			}
-		],
-		specialNotes: "#{stages}"
+            {
+                "description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+                "cooldown": [ 18, 13 ]
+            },
+            {
+                "description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
+                "cooldown": [ 25, 20 ]
+            }
+        ],
+        specialNotes: "#{stages}"
     },
     1045: {
         captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
         specialName: "Gamma Knife",
         special: [
-			{
-				"description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
-				"cooldown": [ 18, 13 ]
-			},
-			{
-				"description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
-				"cooldown": [ 25, 20 ]
-			}
-		],
-		specialNotes: "#{stages}"
+            {
+                "description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+                "cooldown": [ 18, 13 ]
+            },
+            {
+                "description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
+                "cooldown": [ 25, 20 ]
+            }
+        ],
+        specialNotes: "#{stages}"
     },
     1046: {
         captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
@@ -5075,33 +5075,33 @@ window.details = {
         special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
         specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
-	1048: {
-		captain: "Boosts ATK and RCV of [PSY] characters by 1.2x",
-		special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
-		specialName: "Mother's Wish to Fight The World"		
-	},
-	1049: {
-		captain: "Boosts ATK and RCV of [PSY] characters by 1.5x, when HP is low the ATK multiplier becomes 2.25x",
+    1048: {
+        captain: "Boosts ATK and RCV of [PSY] characters by 1.2x",
+        special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Mother's Wish to Fight The World"		
+    },
+    1049: {
+        captain: "Boosts ATK and RCV of [PSY] characters by 1.5x, when HP is low the ATK multiplier becomes 2.25x",
         captainNotes: "The low HP threshold is estimated to be 30%",
-		special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
-		specialName: "Mother's Wish to Fight The World"		
-	},
-	1050: {
-		captain: "Boosts ATK of [PSY] characters by 1.5x",
-		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
-		specialName: "Dereshishishi Towards Hope"
-	},
-	1051: {
-		captain: "Boosts ATK of [PSY] characters by 2x",
-		special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
-		specialName: "Dereshishishi Towards Hope"
-	},
-	1052: {
-		captain: "Recovers 1,000 HP at the end of each turn",
-		special: "Reduces Silence duration by 2 turns",
-		specialName: "Knowledge the World is Afraid of",
-		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
-	},
+        special: "Reduces Paralysis duration by 3 turns and Recovers 4x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Mother's Wish to Fight The World"		
+    },
+    1050: {
+        captain: "Boosts ATK of [PSY] characters by 1.5x",
+        special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
+        specialName: "Dereshishishi Towards Hope"
+    },
+    1051: {
+        captain: "Boosts ATK of [PSY] characters by 2x",
+        special: "Reduces Bind duration by 4 turns, and Reduces damage received by 50% for 2 turns",
+        specialName: "Dereshishishi Towards Hope"
+    },
+    1052: {
+        captain: "Recovers 1,000 HP at the end of each turn",
+        special: "Reduces Silence duration by 2 turns",
+        specialName: "Knowledge the World is Afraid of",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
+    },
     1053: {
         captain: "Boosts RCV of Cerebral characters by 1.5x",
         special: "Reduces Paralysis and Despair duration by 3 turns, removes Blindness",
@@ -5112,285 +5112,285 @@ window.details = {
         special: "Reduces Paralysis and Despair duration by 3 turns, removes Blindness",
         specialName: "Precocious Provocation"
     },
-	1055: {
+    1055: {
         special: "Deals 20x character's ATK in [DEX] damage to one enemy. Boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
         specialName: "Snake Press"
     },
-	1056: {
+    1056: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their RCV by 1.25x",
         special: "Deals 20x character's ATK in [DEX] damage to one enemy. Boosts ATK against Strongly Poisoned enemies by 1.4x for 2 turns ",
         specialName: "Snake Press"
     },
-	1057: {
-		special: "Strongly poisons one enemy",
-		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+    1057: {
+        special: "Strongly poisons one enemy",
+        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
         specialName: "Deadly Poisonous Corrosive Liquid"
     },
-	1058: {
+    1058: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.25x",
-		special: "Strongly poisons one enemy",
-		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        special: "Strongly poisons one enemy",
+        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
         specialName: "Deadly Poisonous Corrosive Liquid"
     },
-	1059: {
+    1059: {
         captain: "Boosts ATK and RCV of Shooter characters by 1.2x",
         special: "Deals 5,000 fixed damage to one enemy. Amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}",
+        specialNotes: "#{orb : 1.5x}",
         specialName: "Strong Bow of Rejection"
     },
-	1060: {
+    1060: {
         captain: "Boosts ATK and RCV of Shooter characters by 1.5x",
         special: "Deals 5,000 fixed damage to one enemy. Amplifies the effect of orbs by 1.5x for 1 turn",
-		specialNotes: "#{orb : 1.5x}",
+        specialNotes: "#{orb : 1.5x}",
         specialName: "Strong Bow of Rejection"
     },
-	1061: {
+    1061: {
         captain: "Boosts ATK of Shooter characters by 2x",
-		special: "Locks the chain multiplier at 2x for 2 turns",
+        special: "Locks the chain multiplier at 2x for 2 turns",
         specialName: "Instructions to the Warriors"
     },
-	1062: {
+    1062: {
         captain: "Boosts ATK of Cerebral characters by 2x and Recovers 2x character's RCV in HP at the end of each turn",
         special: "Recovers 13x character's RCV in HP",
         specialName: "Timeless Art of Self-Defense"
     },
-	1063: {
+    1063: {
         captain: "Boosts ATK and HP of Shooter characters by 1.2x",
         special: "Boosts ATK of Shooter characters by 1.3x for 1 turn",
         specialName: "Shooting Power Light"
     },
-	1064: {
+    1064: {
         captain: "Boosts ATK and HP of [INT] characters by 1.2x",
         special: "Recovers 3x character's RCV in HP at the end of each turn for 5 turns",
         specialName: "Auto Repair"
     },
-	1065: {
+    1065: {
         captain: "Boosts ATK of Slasher characters by 1.5x",
-		special: "Amplifies the effect of orbs by 1.25x for 1 turn",
-		specialNotes: "#{orb : 1.25x}",
+        special: "Amplifies the effect of orbs by 1.25x for 1 turn",
+        specialNotes: "#{orb : 1.25x}",
         specialName: "Slot Power Light"
     },
-	1066: {
+    1066: {
         captain: "Boosts ATK and HP of [PSY] characters by 1.2x",
         special: "Adds .1x to Chain multiplier for 1 turn",
         specialName: "Chain Plus Light"
     },
-	1067: {
+    1067: {
         captain: "Boosts ATK of Fighter characters by 1.5x",
         special: "Boosts own ATK by 1.5x for 1 turn",
         specialName: "Attack Boost Light"
     },
-	1068: {
+    1068: {
         captain: "Boosts chain multiplier by 1.5x",
         special: "Changes captain's orb into [QCK]",
         specialName: "Captain Slot Change QCK"
     },
-	1069: {
+    1069: {
         captain: "Boosts ATK of Driven characters by 1.5x",
         special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
         specialName: "Fighting Method of the Pirate Executioner"
     },
-	1070: {
+    1070: {
         captain: "Boosts ATK of Driven characters by 2.25x",
         special: "Deals 9x ATK in [DEX] damage to one enemy. Changes own orb into [DEX]",
         specialName: "Fighting Method of the Pirate Executioner"
     },
-	1071: {
+    1071: {
         captain: "Boosts ATK of characters with cost 20 or less by 1.5x",
         special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
         specialName: "Emerald Porcupine Robe"
     },
-	1072: {
+    1072: {
         captain: "Boosts ATK of characters with cost 30 or less by 2x and boosts the HP of Powerhouse characters by 1.2x",
         special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
         specialName: "Emerald Porcupine Robe"
     },
-	1073: {
+    1073: {
         captain: "Boosts ATK of Slasher characters by 1.5x",
         special: "Deals 5x ATK in [QCK] damage to all enemies and randomizes all orbs",
         specialName: "Drilling Hooks"
     },
-	1074: {
-		captain: "Boosts ATK of [INT] characters by 2x",
-		special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
-		specialName: "Tenacious Sword of Destruction"
-	},
-	1075: {
-		captain: "Boosts ATK and HP of [INT] characters by 2x",
-		special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
-		specialName: "Tenacious Sword of Destruction"
-	},
-	1076:{
-		captain: "Boosts ATK of Striker and Free Spirit characters by 1.75x",
-		special: [
-			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
-				"cooldown": [ 16, 12 ]
-			},
-			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 20%",
-				"cooldown": [ 20, 16 ]
-			}
-		],
-		specialNotes: "#{stages}",
+    1074: {
+        captain: "Boosts ATK of [INT] characters by 2x",
+        special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
+        specialName: "Tenacious Sword of Destruction"
+    },
+    1075: {
+        captain: "Boosts ATK and HP of [INT] characters by 2x",
+        special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
+        specialName: "Tenacious Sword of Destruction"
+    },
+    1076:{
+        captain: "Boosts ATK of Striker and Free Spirit characters by 1.75x",
+        special: [
+            {
+                "description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
+                "cooldown": [ 16, 12 ]
+            },
+            {
+                "description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 20%",
+                "cooldown": [ 20, 16 ]
+            }
+        ],
+        specialNotes: "#{stages}",
         specialName: "Haute Couture: Patchwork"
-	},
-	1077:{
-		captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their HP by 1.5x",
-		special: [
-			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
-				"cooldown": [ 16, 12 ]
-			},
-			{
-				"description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 20%",
-				"cooldown": [ 20, 16 ]
-			}
-		],
-		specialNotes: "#{stages}",
+    },
+    1077:{
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their HP by 1.5x",
+        special: [
+            {
+                "description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
+                "cooldown": [ 16, 12 ]
+            },
+            {
+                "description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 20%",
+                "cooldown": [ 20, 16 ]
+            }
+        ],
+        specialNotes: "#{stages}",
         specialName: "Haute Couture: Patchwork"
-	},
-	1078: {
-		captain: "Recovers 3x character's RCV in HP at the end of each turn",
-		special: [
-			{
-				"description": "Recovers 6x character's RCV in HP. Removes Paralysis",
-				"cooldown": [ 14, 8 ]
-			},
-			{
-				"description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": [ 19, 13 ]
-			},
-			{
-				"description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": [ 24, 18 ]
-			},
-		],
-		specialNotes: "#{stages}",
-		specialName: "Chiyupopo"
-	},
-	1079: {
-		captain: "Recovers 4x character's RCV in HP at the end of each turn",
-		special: [
-			{
-				"description": "Recovers 6x character's RCV in HP. Removes Paralysis",
-				"cooldown": [ 14, 8 ]
-			},
-			{
-				"description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": [ 19, 13 ]
-			},
-			{
-				"description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-				"cooldown": [ 24, 18 ]
-			},
-		],
-		specialNotes: "#{stages}",
-		specialName: "Chiyupopo"
-	},
-	1080: {
-		captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
-		special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
-		specialName: "Trueno Bastardo"
-	},
-	1081: {
-		captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
-		special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
-		specialName: "Trueno Bastardo"
-	},
-	1082: {
-		captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
-		special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
-		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
-		specialName: "Drill Dragon: Drill Nail"
-	},
-	1083: {
-		captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
-		special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
-		specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
-		specialName: "Drill Dragon: Drill Nail"
-	},
-	1084: {
-		captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
-		special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-		specialNote: "Does not stack with other 'end of turn damage' abilities",
-		specialName: "Gravito: Heavens Fall"
-	},
-	1085: {
-		captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
-		special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-		specialNote: "Does not stack with other 'end of turn damage' abilities",
-		specialName: "Gravito: Heavens Fall"
-	},
-	1086: {
-		captain: "Boosts ATK and RCV of Driven characters by 1.5x",
-		specialNotes: "#{orb : 1.5x}",
-		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialName: "Lot Stiffen"
-	},
-	1087: {
-		captain: "Boosts ATK of Driven characters by 2x and their RCV by 1.5x",
-		specialNotes: "#{orb : 1.5x}",
-		special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
-		specialName: "Lot Stiffen"
-	},
-	1088: {
-		captain: "Boosts ATK of Slasher characters by 2x",
-		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn.",
-		specialName: "Seven Stars Sword of Darkness"
-	},
-	1089: {
-		captain: "Boosts ATK of Slasher characters by 2x and boosts HP of Driven characters by 1.75x",
-		captainNotes: "Slasher + Driven characters gain ATK AND HP",
-		special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn.",
-		specialName: "Seven Stars Sword of Darkness"
-	},
-	1090: {
-		captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
-		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs into matching orbs",
-		specialName: "Double Edge of Revolt"
-	},
-	1091: {
-		captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
-		special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs into matching orbs",
-		specialName: "Double Edge of Revolt"
-	},
+    },
+    1078: {
+        captain: "Recovers 3x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Recovers 6x character's RCV in HP. Removes Paralysis",
+                "cooldown": [ 14, 8 ]
+            },
+            {
+                "description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
+                "cooldown": [ 19, 13 ]
+            },
+            {
+                "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
+                "cooldown": [ 24, 18 ]
+            },
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Chiyupopo"
+    },
+    1079: {
+        captain: "Recovers 4x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Recovers 6x character's RCV in HP. Removes Paralysis",
+                "cooldown": [ 14, 8 ]
+            },
+            {
+                "description": "Recovers 15x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
+                "cooldown": [ 19, 13 ]
+            },
+            {
+                "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
+                "cooldown": [ 24, 18 ]
+            },
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Chiyupopo"
+    },
+    1080: {
+        captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
+        special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
+        specialName: "Trueno Bastardo"
+    },
+    1081: {
+        captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
+        special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
+        specialName: "Trueno Bastardo"
+    },
+    1082: {
+        captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
+        special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+        specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
+        specialName: "Drill Dragon: Drill Nail"
+    },
+    1083: {
+        captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
+        special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
+        specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
+        specialName: "Drill Dragon: Drill Nail"
+    },
+    1084: {
+        captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
+        special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
+        specialNote: "Does not stack with other 'end of turn damage' abilities",
+        specialName: "Gravito: Heavens Fall"
+    },
+    1085: {
+        captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
+        special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
+        specialNote: "Does not stack with other 'end of turn damage' abilities",
+        specialName: "Gravito: Heavens Fall"
+    },
+    1086: {
+        captain: "Boosts ATK and RCV of Driven characters by 1.5x",
+        specialNotes: "#{orb : 1.5x}",
+        special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
+        specialName: "Lot Stiffen"
+    },
+    1087: {
+        captain: "Boosts ATK of Driven characters by 2x and their RCV by 1.5x",
+        specialNotes: "#{orb : 1.5x}",
+        special: "Randomizes all orbs including [BLOCK] orbs. Amplifies the effect of orbs by 1.5x for 2 turns",
+        specialName: "Lot Stiffen"
+    },
+    1088: {
+        captain: "Boosts ATK of Slasher characters by 2x",
+        special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn.",
+        specialName: "Seven Stars Sword of Darkness"
+    },
+    1089: {
+        captain: "Boosts ATK of Slasher characters by 2x and boosts HP of Driven characters by 1.75x",
+        captainNotes: "Slasher + Driven characters gain ATK AND HP",
+        special: "Reduces crew's HP by 70%, deals 15x ATK in [QCK] damage to all enemies. Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn.",
+        specialName: "Seven Stars Sword of Darkness"
+    },
+    1090: {
+        captain: "Boosts ATK of all characters by 2x if HP is below 30% at the start of the turn",
+        special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs into matching orbs",
+        specialName: "Double Edge of Revolt"
+    },
+    1091: {
+        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
+        special: "Deals 25x ATK in [PSY] damage to one enemy. If HP < 30% then changes adjacent orbs into matching orbs",
+        specialName: "Double Edge of Revolt"
+    },
     1092: {
         captain: "Boosts RCV of all characters depending on the current Health.",
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 1.5x",
         special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
-		specialName: "Present After the Rain"
+        specialName: "Present After the Rain"
     },
-	1093: {
+    1093: {
         captain: "Boosts RCV of all characters depending on the current Health.",
         captainNotes: "The Lower the Health the Higher the Bonus, at 1HP the multiplier is 2x",
         special: "Changes the Friend Captains orb into a matching Orb, recovers 3.000HP",
-		specialName: "Present After the Rain"
+        specialName: "Present After the Rain"
     },
-	1094: {
+    1094: {
         captain: "Boosts ATK of Cerebral characters by 2x.",
         special: "Reduces crew's current HP by 80%, deals 6x the removed HP as damage to all enemies. Reduces damage received by 80% for 1 turn.",
-		specialName: "Mass Juggling"
+        specialName: "Mass Juggling"
     },
-	1095: {
+    1095: {
         captain: "Boosts ATK of Cerebral characters by 2x.",
         special: "Reduces crew's current HP by 80%, deals 6x the removed HP as damage to all enemies. Reduces damage received by 80% for 1 turn.",
-		specialName: "Mass Juggling"
+        specialName: "Mass Juggling"
     },
-	1096: {
+    1096: {
         captain: "Boosts ATK of Powerhouse characters by 3x after the 5th Perfect.",
         special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
-		specialName: "Crash Drumming"
+        specialName: "Crash Drumming"
     },
-	1097: {
+    1097: {
         captain: "Boosts ATK of Powerhouse characters by 3.5x after the 5th Perfect.",
         special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
-		specialName: "Crash Drumming"
+        specialName: "Crash Drumming"
     },
-	1098: {
+    1098: {
         captain: "Boosts chain multiplier by 2x",
         special: "Randomizes all orbs including [BLOCK] orbs and switches orbs between slots once.",
-		specialName: "Mutation-Induced Thunder"
+        specialName: "Mutation-Induced Thunder"
     },
     1099: {
         captain: "Boosts ATK of Fighter characters by 2x",
@@ -5402,74 +5402,74 @@ window.details = {
         special: "Changes Bad orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
         specialName: "\"To the End of the Clouds\""
     },
-	1101: {
+    1101: {
         captain: "Boosts ATK of all characters by 2.25x until the first hit other than Perfect. Reduces crew's current HP by 10% at the end of each turn",
         special: "Reduces crew's current HP by 80%, deals 10x the amount of HP subtracted in typeless damage to one enemy. Boosts ATK of [STR] and [INT] characters by 1.75x for 1 turn",
         specialName: "Black Arm's Last Impact"
     },
-	1102: {
+    1102: {
         captain: "Boosts ATK of all characters by 2.75x until the first hit other than Perfect. Reduces crew's current HP by 10% at the end of each turn",
         special: "Reduces crew's current HP by 80%, deals 10x the amount of HP subtracted in typeless damage to one enemy. Boosts ATK of [STR] and [INT] characters by 1.75x for 1 turn",
         specialName: "Black Arm's Last Impact"
     },
-	1103: {
+    1103: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: [
-			{
-				"description": "Recovers 12% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
-				"cooldown": [ 21, 11 ]
-			},
-			{
-				"description": "Recovers 24% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
-				"cooldown": [ 24, 14 ]
-			},
-			{
-				"description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
-				"cooldown": [ 27, 17 ]
-			},
-		],
-		specialNotes: "#{stages}",
+            {
+                "description": "Recovers 12% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
+                "cooldown": [ 21, 11 ]
+            },
+            {
+                "description": "Recovers 24% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
+                "cooldown": [ 24, 14 ]
+            },
+            {
+                "description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
+                "cooldown": [ 27, 17 ]
+            },
+        ],
+        specialNotes: "#{stages}",
         specialName: "Return Return Fruit"
     },
-	1104: {
+    1104: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.75x",
         special: [
-			{
-				"description": "Recovers 12% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
-				"cooldown": [ 21, 11 ]
-			},
-			{
-				"description": "Recovers 24% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
-				"cooldown": [ 24, 14 ]
-			},
-			{
-				"description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
-				"cooldown": [ 27, 17 ]
-			},
-		],
-		specialNotes: "#{stages}",
+            {
+                "description": "Recovers 12% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
+                "cooldown": [ 21, 11 ]
+            },
+            {
+                "description": "Recovers 24% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
+                "cooldown": [ 24, 14 ]
+            },
+            {
+                "description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
+                "cooldown": [ 27, 17 ]
+            },
+        ],
+        specialNotes: "#{stages}",
         specialName: "Return Return Fruit"
     },
-	1105: {
+    1105: {
         captain: "Boosts ATK of Striker and Free Spirit characters by 1.5x, deals 2x character's ATK in typeless damage to all enemies at the end of each turn",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
         specialName: "Mosa Mosa Dance"
     },
-	1106: {
+    1106: {
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x, deals 2x character's ATK in typeless damage to all enemies at the end of each turn",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 2 turns. Makes Perfects easier to hit for 2 turns.",
         specialName: "Mosa Mosa Dance"
     },
-	1107: {
-		captain: "Boosts ATK and HP of Driven characters by 1.5x",
+    1107: {
+        captain: "Boosts ATK and HP of Driven characters by 1.5x",
         special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters into matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
-	},
-	1108: {
-		captain: "Boosts ATK and HP of Driven characters by 2x",
+    },
+    1108: {
+        captain: "Boosts ATK and HP of Driven characters by 2x",
         special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters into matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
-	},
+    },
     1109: {
         captain: "Boosts amount of Beli received by 1.5x",
         special: "Changes [BLOCK] orbs into [PSY] orbs for [PSY] characters",
@@ -5496,310 +5496,310 @@ window.details = {
         specialName: "Fury of the Little Monster: \"This is War!!!\""  
     },
     1114: {
-		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
-		specialName: "Gum-Gum Gigant Axe",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of STR characters by 2x"
-	},
-	1115: {
-		special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
-		specialName: "Gum-Gum Gigant Axe",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of STR characters by 2.5x"
-	},
-	1116: {
-		special: "Deals several times the character's ATK in INT damage to all enemies",
-		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Diable Jambe: Concassé",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+        special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
+        specialName: "Gum-Gum Gigant Axe",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of STR characters by 2x"
+    },
+    1115: {
+        special: "Reduces crew's current HP by 99%, deals 25x character's ATK in fixed damage to all enemies, boosts ATK of STR characters by 2x for 1 turn",
+        specialName: "Gum-Gum Gigant Axe",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of STR characters by 2.5x"
+    },
+    1116: {
+        special: "Deals several times the character's ATK in INT damage to all enemies",
+        specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Diable Jambe: Concassé",
+        captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
         sailor: "Reduces Paralysiss by 3 turns for self"
-	},
-	1117: {
-		special: "Deals several times the character's ATK in INT damage to all enemies",
-		specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
-		specialName: "Diable Jambe: Concassé",
-		captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
+    },
+    1117: {
+        special: "Deals several times the character's ATK in INT damage to all enemies",
+        specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
+        specialName: "Diable Jambe: Concassé",
+        captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
         sailor: "Reduces Paralysiss by 3 turns for self"
-	},
-	1118: {
-		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "10,000-Carat Smile",
-		specialNotes: "#{zombie}",
-		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
+    },
+    1118: {
+        special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "10,000-Carat Smile",
+        specialNotes: "#{zombie}",
+        captain: "Boosts ATK and RCV of Striker characters by 1.5x",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
-	},
-	1119: {
-		special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "10,000-Carat Smile",
-		specialNotes: "#{zombie}",
-		captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x",
+    },
+    1119: {
+        special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "10,000-Carat Smile",
+        specialNotes: "#{zombie}",
+        captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.5x",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit"
-	},
-	1120: {
-		special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
-		specialName: "Gum-Gum JET Gatling",
-		specialNotes: "#{random : 70,000 : 200,000}",
-		captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
-	},
-	1121: {
-		special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
-		specialName: "Gum-Gum JET Gatling",
-		specialNotes: "#{random : 70,000 : 200,000}",
-		captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
-	},
-	1122: {
-		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
-		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
-		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
-		specialName: "Sickle Weasel of Rommel"
-	},
-	1123: {
-		captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
-		captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-		special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
-		specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
-		specialName: "Sickle Weasel of Rommel"
-	},
-	1124: {
-		captain: "Boosts ATK of Slashers characters by 3x, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
-		special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
-	},
-	1125: {
-		captain: "Boosts ATK of Slashers characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
-		special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
-	},
-	1126: {
-		captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
-		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
+    },
+    1120: {
+        special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
+        specialName: "Gum-Gum JET Gatling",
+        specialNotes: "#{random : 70,000 : 200,000}",
+        captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
+    },
+    1121: {
+        special: "Deals random typeless damage to all enemies, changes own orb into [STR]",
+        specialName: "Gum-Gum JET Gatling",
+        specialNotes: "#{random : 70,000 : 200,000}",
+        captain: "Boosts ATK by 4x following a chain of Good > Great > Perfect hits"
+    },
+    1122: {
+        captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
+        captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
+        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
+        specialName: "Sickle Weasel of Rommel"
+    },
+    1123: {
+        captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
+        captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
+        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
+        specialName: "Sickle Weasel of Rommel"
+    },
+    1124: {
+        captain: "Boosts ATK of Slashers characters by 3x, reduces his own ATK multiplier by 0.1x at the end of each turn",
+        captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
+        special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
+    },
+    1125: {
+        captain: "Boosts ATK of Slashers characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
+        captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
+        special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
+    },
+    1126: {
+        captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
+        special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Cannot Activate; 1 orb - 20x ATK; 2 orbs - 40x ATK; 3 orbs - 100x ATK; 4 orbs - 200x ATK; 5 orbs - 300x ATK; 6 orbs - 500x ATK.",
-		specialName: "Admiral Killer Bowling"
-	},
-	1127: {//orlumbus
-		captain: "Boosts ATK of [DEX] characters by 2.25x and their HP by 1.5x",
-		special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
+        specialName: "Admiral Killer Bowling"
+    },
+    1127: {//orlumbus
+        captain: "Boosts ATK of [DEX] characters by 2.25x and their HP by 1.5x",
+        special: "Empties all slots with [BLOCK] orbs, deals severe typeless damage based on number of [BLOCK] slots emptied to all enemies. Changes [EMPTY] orbs into Matching orbs",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Cannot Activate; 1 orb - 20x ATK; 2 orbs - 40x ATK; 3 orbs - 100x ATK; 4 orbs - 200x ATK; 5 orbs - 300x ATK; 6 orbs - 500x ATK.",
-		specialName: "Admiral Killer Bowling"
-	},
-	1128: {
-		captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 1.75x",
-		special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
-		specialName: "Tactician's Savage Cut"
-	},
-	1129: {
-		captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of all characters by 2x",
-		special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
-		specialName: "Tactician's Savage Cut"
-	},
-	1130: {
-		captain: "Boosts ATK and HP of Fighter and Powerhouse characters by 1.5x",
-		special: [
-			{
-				"description": "Deals 7x character's ATK in typeless damage to all enemies",
-				"cooldown": [ 12, 6 ]
-			},
-			{
-				"description": "Deals 15x character's ATK in typeless damage to all enemies",
-				"cooldown": [ 20, 14 ]
-			},
-			{
-				"description": "Deals 25x character's ATK in typeless damage to all enemies",
-				"cooldown": [ 26, 20 ]
-			},
-		],
-		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500xx character's ATK to all enemies.",
-		specialName: "King Punch"
-	},
-	1131: {
-		captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x, and HP of all characters by 2x",
-		special: [
-			{
-				"description": "Deals 7x character's ATK in typeless damage to all enemies",
-				"cooldown": [ 12, 6 ]
-			},
-			{
-				"description": "Deals 15x character's ATK in typeless damage to all enemies",
-				"cooldown": [ 20, 14 ]
-			},
-			{
-				"description": "Deals 25x character's ATK in typeless damage to all enemies",
-				"cooldown": [ 26, 20 ]
-			},
-		],
-		specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.",
-		specialName: "King Punch"
-	},
-	1132: {
-		captain: "Boosts ATK and HP of Fighter characters by 1.5x",
-		special: [
-			{
-				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
-				"cooldown": [ 18, 12 ]
-			},
-			{
-				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.75x for 1 turn",
-				"cooldown": [ 23, 17 ]
-			}
-		],
-		specialNotes: "#{stages}",
-		specialName: "Destruction Cannon"
-	},
-	1133: {
-		captain: "Boosts ATK of Fighter characters by 2.25x and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
-		special: [
-			{
-				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
-				"cooldown": [ 18, 12 ]
-			},
-			{
-				"description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter and Shooter characters by 1.75x for 1 turn",
-				"cooldown": [ 23, 17 ]
-			}
-		],
-		specialNotes: "#{stages}",
-		specialName: "Destruction Cannon"
-	},
-	1134: {
-		captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.2x",
-		special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-		specialName: "Non-Negotiable Quest",
-	},
-	1135: {
-		captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.5x",
-		special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-		specialName: "Non-Negotiable Quest",
-	},
-	1136: { //Fortnight Fukuro
-		captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
-		special: "For [QCK] characters, changes [TND] and [RCV] orbs into [QCK] orbs",
-		specialName: "Stern Beast: Secret Technique: 'Owl Thrasher' Sneak Attack"
-	},
-	1137: { //Fortnight Jabra
-		captain: "Boosts ATK of Powerhouse characters by 2.25x",
-		special: "Deals 13x character's ATK in [STR] damage to one enemy. For Free Spirit characters, amplifies the effects of orbs by 1.5x for 2 turns",
-		specialName: "Fatal Sneak Attack",
-	},
-	1138: {
-		captain: "Reduces damage received by 25%",
-		special: "Reduces damage received by 60%, and boosts ATK of Powerhouse and Fighter characters by 1.3x for 1 turn",
-		specialName: "Iron Mass: Ring Sneak Attack"
-	},
-	1139: {
-		captain: "Boosts ATK and RCV of Striker characters by 1.5x",
-		special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
-		specialName: "Lack of Pure Chi: Lion Finger Gun Sneak Attack"
-	},
-	1140: {// Coliseum Moriah
-		captain: "Boosts ATK of Driven characters by 2x",
-		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
-		specialName: "Horn Blade Shadow"
-	},
-	1141: {// Coliseum Moriah
-		captain: "Boosts ATK of Driven characters by 2.25x, recovers 3x character's RCV in HP at the end of each turn",
-		special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
-		specialName: "Horn Blade Shadow"
-	},
-	1142: {// Coliseum Foxy
-		captain: "Boosts ATK of Free Spirit characters by 1.5x",
-		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 15}",
-		specialName: "Gorilla Punch: Golden Strike"
-	},
-	1143: {// Coliseum Foxy
-		captain: "Boosts ATK of Free Spirit characters by 2x. Reduces cooldown of Free Spirit characters by 2 turns at the start of the fight",
-		special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
-		specialNotes: "#{randomHits : 15}",
-		specialName: "Gorilla Punch: Golden Strike"
-	},
-	1144: {// Coliseum Porche
-		captain: "Boosts ATK of Cerebral characters by 1.75x",
-		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
-		specialName: "Cutie Baton: Flower Shuriken"
-	},
-	1145: {// Coliseum Porche
-		captain: "Boosts ATK of Cerebral characters by 1.75x and their RCV by 1.5x",
-		special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
-		specialName: "Cutie Baton: Flower Shuriken"
-	},
-	1146:{
-		specialName: "Bind Purge",
-		special: "Reduces Bind duration by 2 turns"
-	},
-	1147:{
-		special: "Recovers 7x character's RCV in HP",
-		specialName: "Moderate Healing",
-	},
+        specialName: "Admiral Killer Bowling"
+    },
+    1128: {
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 1.75x",
+        special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
+        specialName: "Tactician's Savage Cut"
+    },
+    1129: {
+        captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of all characters by 2x",
+        special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
+        specialName: "Tactician's Savage Cut"
+    },
+    1130: {
+        captain: "Boosts ATK and HP of Fighter and Powerhouse characters by 1.5x",
+        special: [
+            {
+                "description": "Deals 7x character's ATK in typeless damage to all enemies",
+                "cooldown": [ 12, 6 ]
+            },
+            {
+                "description": "Deals 15x character's ATK in typeless damage to all enemies",
+                "cooldown": [ 20, 14 ]
+            },
+            {
+                "description": "Deals 25x character's ATK in typeless damage to all enemies",
+                "cooldown": [ 26, 20 ]
+            },
+        ],
+        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500xx character's ATK to all enemies.",
+        specialName: "King Punch"
+    },
+    1131: {
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x, and HP of all characters by 2x",
+        special: [
+            {
+                "description": "Deals 7x character's ATK in typeless damage to all enemies",
+                "cooldown": [ 12, 6 ]
+            },
+            {
+                "description": "Deals 15x character's ATK in typeless damage to all enemies",
+                "cooldown": [ 20, 14 ]
+            },
+            {
+                "description": "Deals 25x character's ATK in typeless damage to all enemies",
+                "cooldown": [ 26, 20 ]
+            },
+        ],
+        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.",
+        specialName: "King Punch"
+    },
+    1132: {
+        captain: "Boosts ATK and HP of Fighter characters by 1.5x",
+        special: [
+            {
+                "description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
+                "cooldown": [ 18, 12 ]
+            },
+            {
+                "description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.75x for 1 turn",
+                "cooldown": [ 23, 17 ]
+            }
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Destruction Cannon"
+    },
+    1133: {
+        captain: "Boosts ATK of Fighter characters by 2.25x and their HP by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter characters by 1.5x for 1 turn",
+                "cooldown": [ 18, 12 ]
+            },
+            {
+                "description": "Deals severe [QCK] damage to all enemies, boosts ATK of Fighter and Shooter characters by 1.75x for 1 turn",
+                "cooldown": [ 23, 17 ]
+            }
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Destruction Cannon"
+    },
+    1134: {
+        captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.2x",
+        special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
+        specialName: "Non-Negotiable Quest",
+    },
+    1135: {
+        captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.5x",
+        special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
+        specialName: "Non-Negotiable Quest",
+    },
+    1136: { //Fortnight Fukuro
+        captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
+        special: "For [QCK] characters, changes [TND] and [RCV] orbs into [QCK] orbs",
+        specialName: "Stern Beast: Secret Technique: 'Owl Thrasher' Sneak Attack"
+    },
+    1137: { //Fortnight Jabra
+        captain: "Boosts ATK of Powerhouse characters by 2.25x",
+        special: "Deals 13x character's ATK in [STR] damage to one enemy. For Free Spirit characters, amplifies the effects of orbs by 1.5x for 2 turns",
+        specialName: "Fatal Sneak Attack",
+    },
+    1138: {
+        captain: "Reduces damage received by 25%",
+        special: "Reduces damage received by 60%, and boosts ATK of Powerhouse and Fighter characters by 1.3x for 1 turn",
+        specialName: "Iron Mass: Ring Sneak Attack"
+    },
+    1139: {
+        captain: "Boosts ATK and RCV of Striker characters by 1.5x",
+        special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
+        specialName: "Lack of Pure Chi: Lion Finger Gun Sneak Attack"
+    },
+    1140: {// Coliseum Moriah
+        captain: "Boosts ATK of Driven characters by 2x",
+        special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
+        specialName: "Horn Blade Shadow"
+    },
+    1141: {// Coliseum Moriah
+        captain: "Boosts ATK of Driven characters by 2.25x, recovers 3x character's RCV in HP at the end of each turn",
+        special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
+        specialName: "Horn Blade Shadow"
+    },
+    1142: {// Coliseum Foxy
+        captain: "Boosts ATK of Free Spirit characters by 1.5x",
+        special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
+        specialNotes: "#{randomHits : 15}",
+        specialName: "Gorilla Punch: Golden Strike"
+    },
+    1143: {// Coliseum Foxy
+        captain: "Boosts ATK of Free Spirit characters by 2x. Reduces cooldown of Free Spirit characters by 2 turns at the start of the fight",
+        special: "Deals 15 hits of random [STR] damage to random enemies. Delays all enemies for 1 turn",
+        specialNotes: "#{randomHits : 15}",
+        specialName: "Gorilla Punch: Golden Strike"
+    },
+    1144: {// Coliseum Porche
+        captain: "Boosts ATK of Cerebral characters by 1.75x",
+        special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
+        specialName: "Cutie Baton: Flower Shuriken"
+    },
+    1145: {// Coliseum Porche
+        captain: "Boosts ATK of Cerebral characters by 1.75x and their RCV by 1.5x",
+        special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
+        specialName: "Cutie Baton: Flower Shuriken"
+    },
+    1146:{
+        specialName: "Bind Purge",
+        special: "Reduces Bind duration by 2 turns"
+    },
+    1147:{
+        special: "Recovers 7x character's RCV in HP",
+        specialName: "Moderate Healing",
+    },
     1148:{
-		specialName: "Paralysis Recovery - Light",
-		special: "Reduces Paralysis by 1 turn"
-	},
-	1149:{
-		special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
-		specialNotes: "#{poison}",
-		specialName: "Poison Attack",
-	},
-	1150:{
-		special: "Changes Captain orb into Matching orb",
-		specialName: "Captain Orb Change",
-	},
-	1151: {//Minotaur
-		special: "Cuts the current HP of one enemy by 10%",
-		specialName: "Tough Jailer Beast: Spiked Club"
-	},
-	1152: {
-		special: "Deals 3 hits of 7x character's ATK in [INT] damage to random enemies.",
-		specialNotes: "#{randomHits : 3}",
-		specialName: "Shy Jailer Beast: Spiked Mace",
-	},
-	1153: {
-		special: "Reduces the defense of all enemies by 100% and boosts ATK of Powerhouse characters by 1.25x for 1 turn",
-		specialName: "Demon Lord's Roar"
-	},
-	1154: {
-		captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.3x",
-		special: "Reduces crew's current HP by 30%. Boosts ATK of Powerhouse characters by 1.5x",
-		specialName: "Leader of the Jailers",
-	},
-	1155: {
-		special: "Deals 7x character's ATK in QCK damage to all enemies",
-		specialName: "Monsterous Appetite"
-	},
-	1156: {
-		captain: "Boosts ATK of Driven characters by 1.2x if HP is above 50% at the start of the turn",
-		special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Abyss Road",
-		specialNotes: "#{zombie}",
-	},
-	1157: {
-		captain: "Boosts ATK of Driven and Striker characters by 1.75x if HP is above 50% at the start of the turn",
-		special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
-		specialName: "Abyss Road",
-		specialNotes: "#{zombie}",
-	},
-	1158: {
-		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
-		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
-		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
-		specialName: "Poison Puffer Fish"
-	},
+        specialName: "Paralysis Recovery - Light",
+        special: "Reduces Paralysis by 1 turn"
+    },
+    1149:{
+        special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
+        specialNotes: "#{poison}",
+        specialName: "Poison Attack",
+    },
+    1150:{
+        special: "Changes Captain orb into Matching orb",
+        specialName: "Captain Orb Change",
+    },
+    1151: {//Minotaur
+        special: "Cuts the current HP of one enemy by 10%",
+        specialName: "Tough Jailer Beast: Spiked Club"
+    },
+    1152: {
+        special: "Deals 3 hits of 7x character's ATK in [INT] damage to random enemies.",
+        specialNotes: "#{randomHits : 3}",
+        specialName: "Shy Jailer Beast: Spiked Mace",
+    },
+    1153: {
+        special: "Reduces the defense of all enemies by 100% and boosts ATK of Powerhouse characters by 1.25x for 1 turn",
+        specialName: "Demon Lord's Roar"
+    },
+    1154: {
+        captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.3x",
+        special: "Reduces crew's current HP by 30%. Boosts ATK of Powerhouse characters by 1.5x",
+        specialName: "Leader of the Jailers",
+    },
+    1155: {
+        special: "Deals 7x character's ATK in QCK damage to all enemies",
+        specialName: "Monsterous Appetite"
+    },
+    1156: {
+        captain: "Boosts ATK of Driven characters by 1.2x if HP is above 50% at the start of the turn",
+        special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Abyss Road",
+        specialNotes: "#{zombie}",
+    },
+    1157: {
+        captain: "Boosts ATK of Driven and Striker characters by 1.75x if HP is above 50% at the start of the turn",
+        special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
+        specialName: "Abyss Road",
+        specialNotes: "#{zombie}",
+    },
+    1158: {
+        captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
+        special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
+        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
+        specialName: "Poison Puffer Fish"
+    },
     1159: {
-		captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
-		special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
-		specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
-		specialName: "Poison Puffer Fish"
-	},
+        captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
+        special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
+        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
+        specialName: "Poison Puffer Fish"
+    },
     1160: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
-		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Summer Koala Special"
     },
     1161: {
         captain: "Boosts ATK of Free Spirit characters by 2x and their RCV by 1.5x",
         special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
-		specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Summer Koala Special"
     },
     1162: {//Tesoro
@@ -5838,75 +5838,75 @@ window.details = {
     1168: {//Dice
         captain: "Boosts ATK of [STR] characters by 2x if HP is below 30% at the start of the turn",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
-		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
         specialName: "Trump Card Dealer",
     },
     1169: {//Dice Evolved
         captain: "Boosts ATK of [STR] characters proportionally to the crew's current HP",
-		captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}",
+        captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
-		specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
         specialName: "Trump Card Dealer",
     },
     1170: {//Tanaka
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-		specialName: "Escape-Escape Fruit",
+        specialName: "Escape-Escape Fruit",
     },
     1171: {//Tanaka Evolved
         captain: "Boosts ATK of [QCK] characters by 2x",
         special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-		specialName: "Escape-Escape Fruit",
+        specialName: "Escape-Escape Fruit",
     },
     1172: {
-		special: "Deals random PSY damage to all enemies, randomizes all orbs",
-		specialName: "Three-Verse Humming: Arrow-Notch Slash",
-		captain: "Boosts ATK of PSY characters by 2x",
+        special: "Deals random PSY damage to all enemies, randomizes all orbs",
+        specialName: "Three-Verse Humming: Arrow-Notch Slash",
+        captain: "Boosts ATK of PSY characters by 2x",
         sailor: "Boosts RCV of PSY Characters by 15"
-	},
-	1173: {
-		special: "Deals random PSY damage to all enemies, randomizes all orbs",
-		specialName: "Three-Verse Humming: Arrow-Notch Slash",
-		captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
+    },
+    1173: {
+        special: "Deals random PSY damage to all enemies, randomizes all orbs",
+        specialName: "Three-Verse Humming: Arrow-Notch Slash",
+        captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
         sailor: "Boosts RCV of PSY Characters by 15"
-	},
+    },
     1174: {
-		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
-		specialName: "Ashura Ugui",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
+        special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
+        specialName: "Ashura Ugui",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
         sailor: "Boosts ATK of Slasher Characters by 20"
-	},
-	1175: {
-		special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
-		specialName: "Ashura Ugui",
-		specialNotes: "#{fixed}",
-		captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
+    },
+    1175: {
+        special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
+        specialName: "Ashura Ugui",
+        specialNotes: "#{fixed}",
+        captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Boosts ATK of Slasher Characters by 20"
-	},
+    },
     1176: {
-		special: "Removes poison, recovers 15x character's RCV in HP",
-		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
-		captain: "Boosts ATK and RCV of DEX characters by 1.5x",
+        special: "Removes poison, recovers 15x character's RCV in HP",
+        specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
+        captain: "Boosts ATK and RCV of DEX characters by 1.5x",
         sailor: "When HP is below x%, boosts own RCV by 50"
-	},
-	1177: {
-		special: "Removes poison, recovers 15x character's RCV in HP",
-		specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
-		captain: "Boosts ATK and RCV of DEX characters by 2x",
+    },
+    1177: {
+        special: "Removes poison, recovers 15x character's RCV in HP",
+        specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
+        captain: "Boosts ATK and RCV of DEX characters by 2x",
         sailor: "When HP is below x%, boosts own RCV by 50"
-	},
+    },
     1178: {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
-		specialName: "Not Rubber Gum-Gum Jet Gatling",
-		specialNotes: "#{random : 30,000 : 150,000}",
+        specialName: "Not Rubber Gum-Gum Jet Gatling",
+        specialNotes: "#{random : 30,000 : 150,000}",
     },
     1179: {
         captain: "Boosts ATK of [STR] characters by 2.75x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
-		specialName: "Not Rubber Gum-Gum Jet Gatling",
-		specialNotes: "#{random : 30,000 : 150,000}",
+        specialName: "Not Rubber Gum-Gum Jet Gatling",
+        specialNotes: "#{random : 30,000 : 150,000}",
     },
     1181: { //Blenheim
         captain: "Boosts ATK of [DEX] characters by 2.5x",
@@ -5923,14 +5923,14 @@ window.details = {
     1183: {
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
+        specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
         specialName: "Brass Knuckle Destruction",
         sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
     },
     1184: {
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
-		specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
+        specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
         specialName: "Brass Knuckle Destruction",
         sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
     },
@@ -5938,15 +5938,15 @@ window.details = {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
-			{
-				"description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
-				"cooldown": [ 8, 3 ],
-			},
-			{
-				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
-				"cooldown": [ 17, 12 ],
-			}
-		],
+            {
+                "description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
+                "cooldown": [ 8, 3 ],
+            },
+            {
+                "description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
+                "cooldown": [ 17, 12 ],
+            }
+        ],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
@@ -5955,15 +5955,15 @@ window.details = {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
-			{
-				"description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
-				"cooldown": [ 8, 3 ],
-			},
-			{
-				"description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
-				"cooldown": [ 17, 12 ],
-			}
-		],
+            {
+                "description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
+                "cooldown": [ 8, 3 ],
+            },
+            {
+                "description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
+                "cooldown": [ 17, 12 ],
+            }
+        ],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
@@ -5971,20 +5971,20 @@ window.details = {
     1187: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
-		specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
+        specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
         specialName: "Advancing Continuous Sword Attack",
         sailor: "Boosts ATK, HP, and RCV of all characters by 20"
     },
     1188: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
-		specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
+        specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
         specialName: "Advancing Continuous Sword Attack",
         sailor: "Boosts ATK, HP, and RCV of all characters by 20"
     },
     1189: {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
-		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+        captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
         special: "Reduces enemy Barrier timers by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
         specialName: "Break Bullet",
@@ -5992,7 +5992,7 @@ window.details = {
     },
     1190: {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
-		captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
+        captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
         special: "Reduces enemy Barrier timers by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
         specialName: "Break Bullet",
@@ -6018,21 +6018,21 @@ window.details = {
         special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Sweet Style Petrification",
     },
-	1195: {
-		captain: "Boosts ATK of Striker characters by 1.75x. Recovers 2x character's RCV in HP at the end of each turn",
-		special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
-		specialName: "Split Air Hole",
-	},
-	1196: {
-		captain: "Boosts ATK of Striker characters by 2x. Recovers 5x character's RCV in HP at the end of each turn",
-		special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
-		specialName: "Split Air Hole",
-	},
-	1197: {
-		captain: "Boosts ATK of Cerebral and Powerhouse characters by 2.5x if they have a matching orb, by 1x otherwise, reduces crew's RCV to 0",
+    1195: {
+        captain: "Boosts ATK of Striker characters by 1.75x. Recovers 2x character's RCV in HP at the end of each turn",
+        special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
+        specialName: "Split Air Hole",
+    },
+    1196: {
+        captain: "Boosts ATK of Striker characters by 2x. Recovers 5x character's RCV in HP at the end of each turn",
+        special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
+        specialName: "Split Air Hole",
+    },
+    1197: {
+        captain: "Boosts ATK of Cerebral and Powerhouse characters by 2.5x if they have a matching orb, by 1x otherwise, reduces crew's RCV to 0",
         special: "For Cerebral and Powerhouse characters, changes all orbs including [BLOCK] orbs to Badly Matching. Deals [INT] damage to all enemies",
         specialName: "Investigator of Sorrow",
-	},
+    },
     1198: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Empties all slots with [RCV] orbs, recover 20% of MAX HP",
@@ -6082,43 +6082,43 @@ window.details = {
         specialNotes: "#{zombie}"
     },
     1207: {
-		special: "Boosts chances of getting [INT] orbs for 3 turns",
-		specialName: "Ochenta Fleur - Cuatro Manus Shock",
-		captain: "Boosts ATK and RCV of INT characters by 1.5x",
+        special: "Boosts chances of getting [INT] orbs for 3 turns",
+        specialName: "Ochenta Fleur - Cuatro Manus Shock",
+        captain: "Boosts ATK and RCV of INT characters by 1.5x",
         sailor: "Reduces duration of Blindness by 3 turn"
-	},
-	1208: {
-		special: "Boosts chances of getting [INT] orbs for 3 turns",
-		specialName: "Ochenta Fleur - Cuatro Manus Shock",
-		captain: "Boosts ATK and RCV of INT characters by 2x",
+    },
+    1208: {
+        special: "Boosts chances of getting [INT] orbs for 3 turns",
+        specialName: "Ochenta Fleur - Cuatro Manus Shock",
+        captain: "Boosts ATK and RCV of INT characters by 2x",
         sailor: "Reduces duration of Blindness by 3 turn"
-	},
+    },
     1209: {
-		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
-		specialName: "Heavenly Dragon Star",
-		captain: "Boosts ATK of Shooter characters by 2x",
+        special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
+        specialName: "Heavenly Dragon Star",
+        captain: "Boosts ATK of Shooter characters by 2x",
         sailor: "Boosts RCV of Shooter Characters by 10"
-	},
-	1210: {
-		special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
-		specialName: "Heavenly Dragon Star",
-		captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
+    },
+    1210: {
+        special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
+        specialName: "Heavenly Dragon Star",
+        captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
         sailor: "Boosts RCV of Shooter Characters by 10"
-	},
-	1211: {
-		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Roar! Zarley Davison",
-		captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+    },
+    1211: {
+        special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Roar! Zarley Davison",
+        captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
         sailor: "Boosts ATK of Shooter Characters by 20"
-	},
-	1212: {
-		special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
-		specialNotes: "#{orb : 1.5x}",
-		specialName: "Roar! Zarley Davison",
-		captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
+    },
+    1212: {
+        special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
+        specialNotes: "#{orb : 1.5x}",
+        specialName: "Roar! Zarley Davison",
+        captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
         sailor: "Boosts ATK of Shooter Characters by 20"
-	},
+    },
     1213: {
         captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
         specialName: "Exciting Transfiguration",
@@ -6131,76 +6131,76 @@ window.details = {
         special: "Recovers 10x character's RCV in HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
-	1215: { //Gairam
-		captain: "Boosts ATK by 2.5x following a chain of [QCK] > [PSY] > [DEX] attacks no lower than Good",
-		special: "Deals 5 hits of 2,000 fixed damage to random enemies and reduces any damage received above 5,000 HP by 80% for 1 turn",
-		specialNotes: "#{randomHits : 5}",
-		specialName: "Totem Cube"
-	},
-	1216: { //sebastian
-		captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage taken based on current HP by up to 20%",
-		captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
-		special: "Reduces damage received by 50% for 1 turn, and changes own orb to [QCK]",
-		specialName: "Camouflage Air",
-	},
-	1217: { //nightin
-		captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
-		special: "Reduces Paralysis and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
-		specialName: "Catepillar Soul Shot",
-	},
-	1218: {//hancock
-		captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
-		special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
-		specialName: "Everybody Confusing Fragrance",
-	},
-	1219: {//Byrnndi World Coliseum
+    1215: { //Gairam
+        captain: "Boosts ATK by 2.5x following a chain of [QCK] > [PSY] > [DEX] attacks no lower than Good",
+        special: "Deals 5 hits of 2,000 fixed damage to random enemies and reduces any damage received above 5,000 HP by 80% for 1 turn",
+        specialNotes: "#{randomHits : 5}",
+        specialName: "Totem Cube"
+    },
+    1216: { //sebastian
+        captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage taken based on current HP by up to 20%",
+        captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
+        special: "Reduces damage received by 50% for 1 turn, and changes own orb to [QCK]",
+        specialName: "Camouflage Air",
+    },
+    1217: { //nightin
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+        special: "Reduces Paralysis and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
+        specialName: "Catepillar Soul Shot",
+    },
+    1218: {//hancock
+        captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
+        special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
+        specialName: "Everybody Confusing Fragrance",
+    },
+    1219: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x If you did not defeat an enemy, lose all ATK boost stacks.",
-		special: [
-			{
-				"description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
-				"cooldown": [ 22, 6 ],
-			},
-			{
-				"description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-				"cooldown": [ 28, 12 ],
-			},
-			{
-				"description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
-				"cooldown": [ 34, 18 ],
-			},
-		],        
-		specialName: "More More, 10 Times \"Iron Hammer\"",
-	},
-	1220: {//Byrnndi World Coliseum
+        special: [
+            {
+                "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
+                "cooldown": [ 22, 6 ],
+            },
+            {
+                "description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
+                "cooldown": [ 28, 12 ],
+            },
+            {
+                "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
+                "cooldown": [ 34, 18 ],
+            },
+        ],        
+        specialName: "More More, 10 Times \"Iron Hammer\"",
+    },
+    1220: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x If you did not defeat an enemy, lose all ATK boost stacks.",
-		special: [
-			{
-				"description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
-				"cooldown": [ 22, 6 ],
-			},
-			{
-				"description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-				"cooldown": [ 28, 12 ],
-			},
-			{
-				"description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
-				"cooldown": [ 34, 18 ],
-			},
-		],        
-		specialName: "More More, 10 Times \"Iron Hammer\"",
-	},
-	1221: {//Coliseum Oars Jr
-		captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
-		special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
+        special: [
+            {
+                "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
+                "cooldown": [ 22, 6 ],
+            },
+            {
+                "description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
+                "cooldown": [ 28, 12 ],
+            },
+            {
+                "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
+                "cooldown": [ 34, 18 ],
+            },
+        ],        
+        specialName: "More More, 10 Times \"Iron Hammer\"",
+    },
+    1221: {//Coliseum Oars Jr
+        captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
+        special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-		specialName: "Blood of the Devil Warrior",
-	},
-	1222: {//Coliseum Oars Jr
-		captain: "Boosts ATK of Slasher characters by 2x and the HP of Powerhouse characters by 1.75x",
-		special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
+        specialName: "Blood of the Devil Warrior",
+    },
+    1222: {//Coliseum Oars Jr
+        captain: "Boosts ATK of Slasher characters by 2x and the HP of Powerhouse characters by 1.75x",
+        special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-		specialName: "Blood of the Devil Warrior",
-	},
+        specialName: "Blood of the Devil Warrior",
+    },
     1223: { // Story Bastille
         captain: "Boosts the ATK of [INT] characters by 2x",
         special: "Deals 25x character's ATK in [INT] damage to all enemies",
@@ -6232,138 +6232,138 @@ window.details = {
         specialName: "The Cave of the Sun Goddess",
     },
     1229: {//Sentomaru
-		captain: "Boosts the ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
+        captain: "Boosts the ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
         special: [
-			{
-				"description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": [ 11, 4 ],
-			},
-			{
-				"description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": [ 15, 8 ],
-			},
-			{
-				"description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-				"cooldown": [ 22, 15 ], 
-			},
-		],
-		sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-		specialName: "Leg-Locked Heave-Ho",
-	},
+            {
+                "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+                "cooldown": [ 11, 4 ],
+            },
+            {
+                "description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+                "cooldown": [ 15, 8 ],
+            },
+            {
+                "description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
+                "cooldown": [ 22, 15 ], 
+            },
+        ],
+        sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
+        specialName: "Leg-Locked Heave-Ho",
+    },
     1230: {//Sentomaru
-		captain: "Boosts the ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
+        captain: "Boosts the ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
         special: [
-			{
-				"description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": [ 11, 4 ],
-			},
-			{
-				"description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-				"cooldown": [ 15, 8 ],
-			},
-			{
-				"description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-				"cooldown": [ 22, 15 ], 
-			},
-		],
+            {
+                "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+                "cooldown": [ 11, 4 ],
+            },
+            {
+                "description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
+                "cooldown": [ 15, 8 ],
+            },
+            {
+                "description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
+                "cooldown": [ 22, 15 ], 
+            },
+        ],
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-		specialName: "Leg-Locked Heave-Ho",
-	},
+        specialName: "Leg-Locked Heave-Ho",
+    },
     1231: {//Smoker
-		captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.25x",
+        captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.25x",
         captainNote: "If smoker uses his special ability to swap to your captain, his effective captain boost will be 2.925x",
-		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
+        special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
-		specialName: "Armed - White Launcher",
+        specialName: "Armed - White Launcher",
         sailor: "Boosts ATK of Striker characters by 50",
-	},
+    },
     1232: {//Smoker
-		captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
+        captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
         captainNote: "If smoker uses his special ability to swap to your captain, his effective captain boost will be 2.925x",
-		special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
+        special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
-		specialName: "Armed - White Launcher",
+        specialName: "Armed - White Launcher",
         sailor: "Boosts ATK of Striker characters by 50",
-	},
+    },
     1233: {//Tashigi
-		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
+        captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.25x ATK",
-		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
+        special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
-		specialName: "Cutting Drizzle",
+        specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
-	},
+    },
     1234: {//Tashigi
-		captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
+        captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.56x ATK",
-		special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
+        special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
-		specialName: "Cutting Drizzle",
+        specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
-	},
+    },
     1235: {//Maynard
-		captain: "Boosts ATK of [PSY] characters by 1.75x, deals 3x character's ATK to all enemies at the end of each turn",
-		special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
-		specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
-		specialName: "Sword of Silence",
+        captain: "Boosts ATK of [PSY] characters by 1.75x, deals 3x character's ATK to all enemies at the end of each turn",
+        special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
+        specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
+        specialName: "Sword of Silence",
         sailor: "Reduces duration of Blindness for 3 turns",
-	},
+    },
     1236: {//Maynard
-		captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
+        captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
-		specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
-		specialName: "Sword of Silence",
+        specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
+        specialName: "Sword of Silence",
         sailor: "Reduces duration of Blindness for 3 turns",
-	},
+    },
     1237: {//Bastille
-		captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
-		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
-		specialName: "Shark Cutter - Flash",
+        captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
+        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
+        specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
-	},
+    },
     1238: {//Bastille
-		captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain and by 3x after the 30th hit",
-		special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
-		specialName: "Shark Cutter - Flash",
+        captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain and by 3x after the 30th hit",
+        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
+        specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
-	},
+    },
     1239: {//6* Kizaru
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
         specialName: "Yasakani no Magatama",
         special: [
-			{
-				"description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
-				"cooldown": [ 6, 3 ],
-			},
-			{
-				"description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
-				"cooldown": [ 12, 9 ],
-			},
-			{
-				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
-				"cooldown": [ 20, 17 ], 
-			},
-		],    
-		specialNotes: "#{randomHits : 10}",
+            {
+                "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
+                "cooldown": [ 6, 3 ],
+            },
+            {
+                "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+                "cooldown": [ 12, 9 ],
+            },
+            {
+                "description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
+                "cooldown": [ 20, 17 ], 
+            },
+        ],    
+        specialNotes: "#{randomHits : 10}",
     },
     1240: {//6* Kizaru
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
         specialName: "Yasakani no Magatama",
         special: [
-			{
-				"description": "For Shooter and Slasher characters,randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
-				"cooldown": [ 6, 3 ],
-			},
-			{
-				"description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
-				"cooldown": [ 12, 9 ],
-			},
-			{
-				"description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
-				"cooldown": [ 20, 17 ],
-			},
-		],    
-		specialNotes: "#{randomHits : 10}",
+            {
+                "description": "For Shooter and Slasher characters,randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
+                "cooldown": [ 6, 3 ],
+            },
+            {
+                "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
+                "cooldown": [ 12, 9 ],
+            },
+            {
+                "description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
+                "cooldown": [ 20, 17 ],
+            },
+        ],    
+        specialNotes: "#{randomHits : 10}",
     },
     1241: {//Fortnight Koala
         captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
@@ -6421,30 +6421,30 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 1.5x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
         captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 2.5x RCV",
         special: [
-			{
-				"description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
-				"cooldown": [ 21, 6 ],
-			},
-			{
-				"description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-				"cooldown": [ 24, 9 ],
-			},
-		], 
+            {
+                "description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
+                "cooldown": [ 21, 6 ],
+            },
+            {
+                "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
+                "cooldown": [ 24, 9 ],
+            },
+        ], 
         specialName: "Burning Vanguard",
     },
     1251: {// Coliseum Marco
         captain: "Boosts ATK of Powerhouse characters by 2x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
         captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 2.5x RCV",
         special: [
-			{
-				"description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
-				"cooldown": [ 21, 6 ],
-			},
-			{
-				"description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-				"cooldown": [ 24, 9 ],
-			},
-		], 
+            {
+                "description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
+                "cooldown": [ 21, 6 ],
+            },
+            {
+                "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
+                "cooldown": [ 24, 9 ],
+            },
+        ], 
         specialName: "Burning Vanguard",
     },
     1252: {// Coliseum Doma
@@ -6479,37 +6479,37 @@ window.details = {
     1257: {//Young Whitebeard
         captain: "Boosts ATK of all characters by 2x if HP is below 50% at the start of the turn",
         special: [
-			{
-				"description": "Cuts the current HP of each enemy by 10%",
-				"cooldown": [ 23, 11 ],
-			},
-			{
-				"description": "Cuts the current HP of each enemy by 20%",
-				"cooldown": [ 28, 16 ],
-			},
             {
-				"description": "Cuts the current HP of each enemy by 40%",
-				"cooldown": [ 36, 24 ],
-			},
-		], 
+                "description": "Cuts the current HP of each enemy by 10%",
+                "cooldown": [ 23, 11 ],
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 20%",
+                "cooldown": [ 28, 16 ],
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 40%",
+                "cooldown": [ 36, 24 ],
+            },
+        ], 
         specialName: "Earth Shattering Fist",
     },
     1258: {//Young Whitebeard Evolved
         captain: "Boosts ATK of all characters by 2.5x if HP is below 50% at the start of the turn",
         special: [
-			{
-				"description": "Cuts the current HP of each enemy by 10%",
-				"cooldown": [ 23, 11 ],
-			},
-			{
-				"description": "Cuts the current HP of each enemy by 20%",
-				"cooldown": [ 28, 16 ],
-			},
             {
-				"description": "Cuts the current HP of each enemy by 40%",
-				"cooldown": [ 36, 24 ],
-			},
-		],
+                "description": "Cuts the current HP of each enemy by 10%",
+                "cooldown": [ 23, 11 ],
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 20%",
+                "cooldown": [ 28, 16 ],
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 40%",
+                "cooldown": [ 36, 24 ],
+            },
+        ],
         specialName: "Earth Shattering Fist",
     },
     1259: {//Young Doflamingo
@@ -6686,13 +6686,13 @@ window.details = {
     },
     1288: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 2.5x on the first turn, 2.4x on the second, 2.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
+        captainNotes: "His ATK multiplier will be 2.5x on the first turn, 2.4x on the second, 2.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
         specialName: "Kid Law Special",
     },
     1289: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.75x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
-		captainNotes: "His ATK multiplier will be 2.75x on the first turn, 2.65x on the second, 2.55x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
+        captainNotes: "His ATK multiplier will be 2.75x on the first turn, 2.65x on the second, 2.55x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
         specialName: "Kid Law Special",
     },
@@ -6714,30 +6714,30 @@ window.details = {
     1293: {//Coliseum Sandersonia
         captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
-			{
-				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
-				"cooldown": [ 21, 11 ],
-			},
             {
-				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
-				"cooldown": [ 26, 16 ],
-			},
-		],
+                "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
+                "cooldown": [ 21, 11 ],
+            },
+            {
+                "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
+                "cooldown": [ 26, 16 ],
+            },
+        ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
         specialName: "Coliseum Sandersonia Special",
     },
     1294: {//Coliseum Sandersonia
         captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
-			{
-				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
-				"cooldown": [ 21, 11 ],
-			},
             {
-				"description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
-				"cooldown": [ 26, 16 ],
-			},
-		],
+                "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
+                "cooldown": [ 21, 11 ],
+            },
+            {
+                "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
+                "cooldown": [ 26, 16 ],
+            },
+        ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
         specialName: "Coliseum Sandersonia Special",
     },
diff --git a/common/data/drops.js b/common/data/drops.js
index 47f148236..76c69e64f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -383,7 +383,7 @@ window.drops = {
             name: "Enies Lobby: Entrance",
             shortName: "Enies Lobby 1",
             thumb: 706,
-			global: true,
+            global: true,
             completion: '5x Rainbow Gems',
             "Completion Units": [708],
             "01": [ 78, 79, 80, 81, 82, 185, 186, 188, 694 ],
@@ -482,8 +482,8 @@ window.drops = {
             "13": [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
             "14": [ 111, 112, 113, 114, 185, 186, 187, 691, 693, 695, 968, 969, 970, 972, 973 ]
         },
-		
-		{
+        
+        {
             name: "Amazon Lily",
             shortName: "Amazon Lily",
             thumb: 1056,
@@ -498,8 +498,8 @@ window.drops = {
             "08": [ 1055, 1057, 111, 113 ],
             "09": [ 1055, 1057, 110, 112 ]
         },
-		
-		{
+        
+        {
             name: "Impel Down",
             shortName: "Impel Down",
             thumb: 1159,
@@ -513,13 +513,13 @@ window.drops = {
             "07": [ 1155, 931 ],
             "08": [  ],
             "09": [  ],
-			"10": [  ],
-			"11": [ 551, 539, 1151, 1152, 931, 552 ],
-			"12": [ 1156, 549 ],
-			"13": [  ],
-			"14": [ 1152 ],
-			"15": [  ],
-			"16": [ 1158 ],
+            "10": [  ],
+            "11": [ 551, 539, 1151, 1152, 931, 552 ],
+            "12": [ 1156, 549 ],
+            "13": [  ],
+            "14": [ 1152 ],
+            "15": [  ],
+            "16": [ 1158 ],
         },
         
         {
@@ -536,9 +536,9 @@ window.drops = {
             "07": [  ],
             "08": [ 815 ],
             "09": [ 1226 ],
-			"10": [ 1227 ],
-			"11": [  ],
-			"12": [ 1228 ]
+            "10": [ 1227 ],
+            "11": [  ],
+            "12": [ 1228 ]
         },
         
         {
@@ -555,12 +555,12 @@ window.drops = {
             "07": [  ],
             "08": [ 1281, 1282 ],
             "09": [ 1280 ],
-			"10": [ 1283 ],
-			"11": [ 1283 ],
-			"12": [  ],
+            "10": [ 1283 ],
+            "11": [ 1283 ],
+            "12": [  ],
             "13": [  ],
-			"14": [ 1283 ],
-			"15": [ 1283 ],
+            "14": [ 1283 ],
+            "15": [ 1283 ],
         },
         
     ],
@@ -642,7 +642,7 @@ window.drops = {
             name: 'Buggy\'s Counterattack!!',
             thumb: 39,
             global: true,
-			condition: "None",
+            condition: "None",
             Expert: [ 36, 37, 38, 99, 109, 114, -4 ],
             Elite: [ 36, 37, 38, 99, 109, 114, -3 ]
         },
@@ -651,7 +651,7 @@ window.drops = {
             name: 'Alvida\'s Romance',
             thumb: 30,
             global: true,
-			condition: "None",
+            condition: "None",
             Expert: [ 28, 29, 31, 40, 84, 95, 110, 117, -30, -21, -8 ],
             Elite: [ 28, 29, 31, 40, 95, 105, 110, -21, -7 ]
         },
@@ -660,7 +660,7 @@ window.drops = {
             name: 'Kuro\'s Master Plan',
             thumb: 46,
             global: true,
-			condition: "None",
+            condition: "None",
             Expert: [ 41, 42, 43, 45, -16 ],
             Elite: [ 41, 42, 43, 45, 96, 106, 111, -15 ]
         },
@@ -669,7 +669,7 @@ window.drops = {
             name: 'Arlong: Empire Rising',
             thumb: 66,
             global: true,
-			condition: "None",
+            condition: "None",
             Expert: [ 61, 62, 63, 65, 89, 95, 105, 110, -12, -66 ],
             Elite: [ 61, 62, 63, 65, 95, 105, 110, -11 ]
         },
@@ -678,7 +678,7 @@ window.drops = {
             name: 'Krieg\'s Assault!',
             thumb: 58,
             global: true,
-			condition: "None",
+            condition: "None",
             Expert: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20 ],
             Elite: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20, -19 ]
         },
@@ -687,15 +687,15 @@ window.drops = {
             name: 'Escaped! Morgan',
             thumb: 228,
             global: true,
-			condition: "None",
-			"All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
+            condition: "None",
+            "All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
         },
 
         {
             name: 'Hina\'s Resort Getaway',
             thumb: 232,
             global: true,
-			condition: "None",
+            condition: "None",
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['450,000','1x ATK Cotton Candy'],['750,000','3x Rainbow Gems']],
             Expert: [ 43, 49, 79, 85, 96, 106, 231, -230, -229, -221, -208, -62, -54 ],
@@ -706,7 +706,7 @@ window.drops = {
             name: 'Cobymeppo\'s Proving Ground!',
             thumb: 263,
             global: true,
-			condition: "None",
+            condition: "None",
             challenge:'Total number of hits above 50,000',
             challengeData: [['5 Times','1x Yellow Elder'],['15 Times','1x ATK Cotton Candy'],['25 Times','3x Rainbow Gems']],
             "All Difficulties": [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ]
@@ -716,7 +716,7 @@ window.drops = {
             name: 'Smoker\'s Great Pursuit',
             thumb: 268,
             global: true,
-			condition: "None",
+            condition: "None",
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems, 1x Forbidden Tome']],
             "All Difficulties": [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
@@ -726,7 +726,7 @@ window.drops = {
             name: 'Tsuru\'s Morning Stroll',
             thumb: 297,
             global: true,
-			condition: "None",
+            condition: "None",
             Expert: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -217, -202, -200, -199 ],
             Elite: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -202, -200 ]
         },
@@ -773,7 +773,7 @@ window.drops = {
             thumb: 386,
             global: true,
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
-			challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
+            challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Damage Reduction Forbidden Tome']],
             "All Difficulties": [ 385, 387, -388, -335, -314, -36, -16, -11 ]
         },
@@ -800,7 +800,7 @@ window.drops = {
             name: 'Rising Sun, Rising Fortunes',
             thumb: 420,
             global: true,
-			condition: "None",
+            condition: "None",
             "All Difficulties": [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8 ]
         },
 
@@ -867,9 +867,9 @@ window.drops = {
         {
             name: 'Chief Jailer Sadie: Cruel and Unusual',
             thumb: 550,
-			global: true,
+            global: true,
             condition: '30: Non-Slasher, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
-			challenge: 'High Score calculated with Clear Speed and Crew Cost. (Crew cost can basically be ignored)',
+            challenge: 'High Score calculated with Clear Speed and Crew Cost. (Crew cost can basically be ignored)',
             challengeData: [['60,000 Points','1x Black Elder'],['160,000 Points','1x ATK Cotton Candy'],['300,000 Points','3x Rainbow Gems']],
             "All Difficulties": [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
         },
@@ -888,7 +888,7 @@ window.drops = {
             thumb: 583,
             global: true,
             condition: 'All Units considered from the “Sea” will lose 20% to all stats',
-			challenge: 'Total number of hits over 50,000',
+            challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Black Elder'],['16 Times','1x ATK Cotton Candy'],['38 Times','3x Rainbow Gems']],
             "All Difficulties": [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
         },
@@ -896,7 +896,7 @@ window.drops = {
         {
             name: 'Pirate Apprentices! Shanks and Buggy',
             thumb: 599,
-			global: true,
+            global: true,
             condition: 'You cannot use any two units that are the same',
             Expert: [ 598, 600, -504, -467, -463, -414, -372, -332, -310, -77 ],
             Elite: [ 598, 600, -467, -463, -414, -372, -332, -310, -77 ]
@@ -905,7 +905,7 @@ window.drops = {
         {
             name: 'Raging Cook! Red Leg Zeff',
             thumb: 607,
-			global: true,
+            global: true,
             condition: 'You cannot use any two units that are the same',
             "All Difficulties": [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]
         },
@@ -913,9 +913,9 @@ window.drops = {
         {
             name: 'Camie and Hachi\'s Takoyaki Shop!',
             thumb: 635,
-			global: true,
+            global: true,
             condition: 'No Units above the cost of 49 is allowed',
-			challenge: 'Total number of hits over 50,000',
+            challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, 1x Orb Matching Forbidden Tome']],
             "All Difficulties": [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
         },
@@ -923,7 +923,7 @@ window.drops = {
         {
             name: 'Shark Attack! Arlong Pirates',
             thumb: 656,
-			global: true,
+            global: true,
             condition: 'You can only get STR, QCK, DEX, PSY and INT orbs',
             "All Difficulties": [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
         },
@@ -951,7 +951,7 @@ window.drops = {
             thumb: 713,
             global: true,
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
-			challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
             "Japan": [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ],
             "Global": [ 712, 714, 715, -716, -643, -546, -541, -400, -202, -363, -204 ]
@@ -960,7 +960,7 @@ window.drops = {
         {
             name: "T-Bone's Absolute Justice",
             thumb: 724,
-			global: true,
+            global: true,
             condition: 'You can only bring INT, PSY and QCK units',
             "Japan": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ],
             "Global": [ 721, 723, -590, -564, -563, -530, -641, -384, -361, -219 ]
@@ -969,7 +969,7 @@ window.drops = {
         {
             name: "Explosive! Wanze's Ramen Kenpo!!",
             thumb: 743,
-			global: true,
+            global: true,
             condition: 'You can only bring STR, QCK and DEX units',
             "Japan": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ],
             "Global": [ 740, 742, -671, -673, -586, -567, -566, -412, -225, -18 ]
@@ -979,7 +979,7 @@ window.drops = {
             name: "Twilight Party DEAD or TREAT!!",
             thumb: 761,
             global: true,
-			condition: "None",
+            condition: "None",
             "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ],
             "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
         },
@@ -988,7 +988,7 @@ window.drops = {
             name: "Midnight Party DEAD or TREAT!!",
             thumb: 766,
             global: true,
-			condition: "None",
+            condition: "None",
             "Japan": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ],
             "Global": [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
         },
@@ -1037,7 +1037,7 @@ window.drops = {
         {
             name: "Lightning Speed! Strawhat Crew's Surprise Visit",
             thumb: 866,
-			condition: "None",
+            condition: "None",
             challenge:'Total number of hits above 50,000',
             challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Anti-Silence Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ]
@@ -1063,45 +1063,45 @@ window.drops = {
             condition: 'You can only bring DEX units',
             "All Difficulties": [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ]
         },
-		
-		{
+        
+        {
             name: "Hannyabal's Great Ambition",
             thumb: 929,
             condition: 'You can only bring STR units',
             "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
         },
-		
+        
         {
             name: "Encounter! Whitebeard Pirates",
             thumb: 946,
             condition: "You can only bring PSY units",
             "All Difficulties": [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738]
         },
-		
-		{
-			name: "Clash! Whitebeard Pirates",
+        
+        {
+            name: "Clash! Whitebeard Pirates",
             thumb: 979,
-			condition: "You can only bring INT units",
+            condition: "You can only bring INT units",
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['420,000','1x HP Cotton Candy, 1x Rainbow Gem'],['700,000','2x Rainbow Gems, 1x Orb Forbidden Tome']],
-			"All Difficulties": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
-		},
-		
-		{
-			name: "Let's Find Our Captain! Heart Pirates!",
-			condition: "You can only bring QCK units",
+            "All Difficulties": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
+        },
+        
+        {
+            name: "Let's Find Our Captain! Heart Pirates!",
+            condition: "You can only bring QCK units",
             thumb: 1003,
-			"All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ]
-		},
+            "All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ]
+        },
         
         {
-			name: "Rare Animal Island's Count Butler",
-			thumb: 1011,
-			condition: "None",
+            name: "Rare Animal Island's Count Butler",
+            thumb: 1011,
+            condition: "None",
             global: true,
             "Global": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -812, -565 ],
-			"Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
-		},
+            "Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
+        },
         
         {
             name: "Temptation!? The Queen of Kamabakka Queendom!",
@@ -1126,7 +1126,7 @@ window.drops = {
         
         {
             name: "Dr. Indigo & Scarlet!",
-			thumb: 1095,
+            thumb: 1095,
             condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
         },
@@ -1137,8 +1137,8 @@ window.drops = {
             condition: "Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             "All Difficulties": [ 1109, 1111, 1113, -23, -628, -639, -641, -892, -937, -939, -941 ]
         },
-		
-		{
+        
+        {
             name: "Behind the Scenes Intelligency Agency, CP9",
             thumb: 1137,
             condition: "Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear",
@@ -1186,7 +1186,7 @@ window.drops = {
             condition: "Child-like characters get their ATK and HP boosted by 3.5x, RCV by 1.5x, and cooldowns reduced by 7 turns at the start of the fight",
             "All Difficulties": [ 1286, 1288, 1290, -963, -1045, -251, -760, -1083, -1129, -506, -1062, -702 ]
         },
-		
+        
     ],
 
             
@@ -1251,7 +1251,7 @@ window.drops = {
             name: 'Clash!? Usopp\'n',
             thumb: 518,
             showManual: true,
-			global: true,
+            global: true,
             'Ultimate': [ 517, -15, -16, -223 ]
         },
 
@@ -1325,13 +1325,13 @@ window.drops = {
             Master: [ 932 ],
             Expert: [ 932 ]
         },
-		
-		{
-			name: 'Clash!! Kizaru',
+        
+        {
+            name: 'Clash!! Kizaru',
             thumb: 978,
-			Ultimate: [ 977 ],
-			Master: [ 977 ]
-		},
+            Ultimate: [ 977 ],
+            Master: [ 977 ]
+        },
         
         {
             name: 'Clash!? Impostor Straw Hat Pirates',
@@ -1388,7 +1388,7 @@ window.drops = {
             challenge: 'Total number of hits over 30,000',
             challengeData: [['10 Times','Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems']],
             "All Difficulties": [ 659, 680, 682, 684, 1200, 1198 ],
-			"Completion Units": [686]
+            "Completion Units": [686]
         },
         
         {
diff --git a/common/data/effects.js b/common/data/effects.js
index 8bc7d6e07..b0568b892 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -310,7 +310,7 @@ window.effects = {
         barrierReduction: 0.99
     },
     
-	'Dr. Indigo & Scarlet! Fortnight': {
+    'Dr. Indigo & Scarlet! Fortnight': {
         description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
         thumb: 1095,
         id: 37,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 838eaaf85..a9c5788ac 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1,1404 +1,1404 @@
 window.evolutions = {
-	1: {
-		evolution: 2,
-		evolvers: [ 78 ]
-	},
-	2: {
-		evolution: 3,
-		evolvers: [ 115, 78 ]
-	},
-	3: {
-		evolution: 4,
-		evolvers: [ 117, 84, 95, 100 ]
-	},
-	5: {
-		evolution: [ 6, 7 ],
-		evolvers: [ [ 115, 80 ], [ 116, 80, 97 ] ]
-	},
-	6: {
-		evolution: 8,
-		evolvers: [ 117, 86, 97, 102 ]
-	},
-	7: {
-		evolution: 8,
-		evolvers: [ 117, 80, 102 ]
-	},
-	9: {
-		evolution: [ 10, 11 ],
-		evolvers: [ [ 115, 82 ], [ 116, 82, 99 ] ]
-	},
-	10: {
-		evolution: 12,
-		evolvers: [ 117, 88, 99, 104 ]
-	},
-	11: {
-		evolution: 12,
-		evolvers: [ 117, 82, 104 ]
-	},
-	13: {
-		evolution: [ 14, 15 ],
-		evolvers: [ [ 115, 81 ], [ 115, 81, 98 ] ]
-	},
-	14: {
-		evolution: [ 15, 16 ],
-		evolvers: [ [ 117 ], [ 117, 87, 98, 103 ] ]
-	},
-	15: {
-		evolution: 16,
-		evolvers: [ 117, 81, 103 ]
-	},
-	17: {
-		evolution: [ 18, 19 ],
-		evolvers: [ [ 115, 79 ], [ 116, 79, 96 ] ]
-	},
-	18: {
-		evolution: 20,
-		evolvers: [ 117, 85, 96, 101 ]
-	},
-	19: {
-		evolution: 20,
-		evolvers: [ 117, 79, 101 ]
-	},
-	21: {
-		evolution: [ 22, 23, 24, 25, 26 ],
-		evolvers: [ [ 116, 81, 98 ], [ 116, 82, 99 ], [ 116, 78, 95 ], [ 116, 79, 96 ], [ 116, 80, 97 ] ]
-	},
-	29: {
-		evolution: 30,
-		evolvers: [ 117, 78, 89, 100 ]
-	},
-	31: {
-		evolution: 32,
-		evolvers: [ 115, 81 ]
-	},
-	33: {
-		evolution: 34,
-		evolvers: [ 115, 82 ]
-	},
-	35: {
-		evolution: 228,
-		evolvers: [ 116, 78, 89 ]
-	},
-	38: {
-		evolution: 39,
-		evolvers: [ 116, 82, 93 ]
-	},
-	43: {
-		evolution: [ 44, 229 ],
-		evolvers: [ [ 116, 80, 91 ], [ 116, 81, 92 ] ]
-	},
-	45: {
-		evolution: 46,
-		evolvers: [ 117, 79, 90, 101 ]
-	},
-	49: {
-		evolution: 230,
-		evolvers: [ 116, 78, 89 ]
-	},
-	53: {
-		evolution: 54,
-		evolvers: [ 116, 79, 90 ]
-	},
-	55: {
-		evolution: 56,
-		evolvers: [ 116, 78, 89 ]
-	},
-	57: {
-		evolution: 58,
-		evolvers: [ 117, 82, 93, 104 ]
-	},
-	63: {
-		evolution: 64,
-		evolvers: [ 116, 80, 91 ]
-	},
-	65: {
-		evolution: 66,
-		evolvers: [ 117, 78, 89, 100 ]
-	},
-	67: {
-		evolution: 68,
-		evolvers: [ 117, 83, 79, 85, 96 ]
-	},
-	69: {
-		evolution: 70,
-		evolvers: [ 117, 83, 80, 86, 97 ]
-	},
-	70: {
-		evolution: 268,
-		evolvers: [ 117, 80, 86, 91, 102 ]
-	},
-	71: {
-		evolution: [ 72, 72 ],
-		evolvers: [ [ 117, 81, 98 ], [ 444 ] ]
-	},
-	72: {
-		evolution: 73,
-		evolvers: [ 118, 83, 87, 98, 103 ]
-	},
-	74: {
-		evolution: 75,
-		evolvers: [ 118, 83, 85, 85, 101 ]
-	},
-	76: {
-		evolution: 77,
-		evolvers: [ 118, 83, 87, 98, 103 ]
-	},
-	121: {
-		evolution: 142,
-		evolvers: [ 89 ]
-	},
-	122: {
-		evolution: 143,
-		evolvers: [ 90 ]
-	},
-	123: {
-		evolution: 144,
-		evolvers: [ 91 ]
-	},
-	124: {
-		evolution: 145,
-		evolvers: [ 92 ]
-	},
-	125: {
-		evolution: 146,
-		evolvers: [ 93 ]
-	},
-	126: {
-		evolution: 147,
-		evolvers: [ 89 ]
-	},
-	127: {
-		evolution: 148,
-		evolvers: [ 90 ]
-	},
-	128: {
-		evolution: 149,
-		evolvers: [ 91 ]
-	},
-	129: {
-		evolution: 150,
-		evolvers: [ 92 ]
-	},
-	130: {
-		evolution: 151,
-		evolvers: [ 93 ]
-	},
-	131: {
-		evolution: 152,
-		evolvers: [ 89 ]
-	},
-	132: {
-		evolution: 153,
-		evolvers: [ 90 ]
-	},
-	133: {
-		evolution: 154,
-		evolvers: [ 91 ]
-	},
-	134: {
-		evolution: 155,
-		evolvers: [ 92 ]
-	},
-	135: {
-		evolution: 156,
-		evolvers: [ 93 ]
-	},
-	136: {
-		evolution: 157,
-		evolvers: [ 89 ]
-	},
-	137: {
-		evolution: 158,
-		evolvers: [ 90 ]
-	},
-	138: {
-		evolution: 159,
-		evolvers: [ 91 ]
-	},
-	139: {
-		evolution: 160,
-		evolvers: [ 92 ]
-	},
-	140: {
-		evolution: 161,
-		evolvers: [ 93 ]
-	},
-	141: {
-		evolution: 162,
-		evolvers: [ 115, 93 ]
-	},
-	142: {
-		evolution: 269,
-		evolvers: [ 115, 116, 89 ]
-	},
-	143: {
-		evolution: 270,
-		evolvers: [ 115, 116, 90 ]
-	},
-	144: {
-		evolution: 271,
-		evolvers: [ 115, 116, 91 ]
-	},
-	145: {
-		evolution: 272,
-		evolvers: [ 115, 116, 92 ]
-	},
-	146: {
-		evolution: 273,
-		evolvers: [ 115, 116, 93 ]
-	},
-	147: {
-		evolution: 274,
-		evolvers: [ 116, 95 ]
-	},
-	148: {
-		evolution: 275,
-		evolvers: [ 116, 96 ]
-	},
-	149: {
-		evolution: 276,
-		evolvers: [ 116, 97 ]
-	},
-	150: {
-		evolution: 277,
-		evolvers: [ 116, 98 ]
-	},
-	151: {
-		evolution: 278,
-		evolvers: [ 116, 99 ]
-	},
-	152: {
-		evolution: 279,
-		evolvers: [ 78, 84 ]
-	},
-	153: {
-		evolution: 280,
-		evolvers: [ 79, 85 ]
-	},
-	154: {
-		evolution: 281,
-		evolvers: [ 80, 86 ]
-	},
-	155: {
-		evolution: 282,
-		evolvers: [ 81, 87 ]
-	},
-	156: {
-		evolution: 283,
-		evolvers: [ 82, 88 ]
-	},
-	157: {
-		evolution: 284,
-		evolvers: [ 115, 116, 89 ]
-	},
-	158: {
-		evolution: 285,
-		evolvers: [ 115, 116, 90 ]
-	},
-	159: {
-		evolution: 286,
-		evolvers: [ 115, 116, 91 ]
-	},
-	160: {
-		evolution: 287,
-		evolvers: [ 115, 116, 92 ]
-	},
-	161: {
-		evolution: 288,
-		evolvers: [ 115, 116, 93 ]
-	},
-	162: {
-		evolution: 289,
-		evolvers: [ 104 ]
-	},
-	179: {
-		evolution: 184,
-		evolvers: [ 78 ]
-	},
-	180: {
-		evolution: 185,
-		evolvers: [ 80 ]
-	},
-	181: {
-		evolution: 186,
-		evolvers: [ 79 ]
-	},
-	182: {
-		evolution: 187,
-		evolvers: [ 81 ]
-	},
-	183: {
-		evolution: 188,
-		evolvers: [ 115, 82 ]
-	},
-	184: {
-		evolution: 194,
-		evolvers: [ 116, 78, 84 ]
-	},
-	185: {
-		evolution: 195,
-		evolvers: [ 116, 80, 86 ]
-	},
-	186: {
-		evolution: 196,
-		evolvers: [ 116, 79, 85 ]
-	},
-	187: {
-		evolution: 197,
-		evolvers: [ 116, 81, 87 ]
-	},
-	188: {
-		evolution: 198,
-		evolvers: [ 116, 117, 82, 88 ]
-	},
-	199: {
-		evolution: 200,
-		evolvers: [ 94, 78 ]
-	},
-	201: {
-		evolution: 202,
-		evolvers: [ 94, 79 ]
-	},
-	203: {
-		evolution: 204,
-		evolvers: [ 94, 82 ]
-	},
-	205: {
-		evolution: 206,
-		evolvers: [ 94, 80 ]
-	},
-	207: {
-		evolution: [ 208, 462 ],
-		evolvers: [ [ 94, 81 ], [ 117, 231 ] ]
-	},
-	209: {
-		evolution: 210,
-		evolvers: [ 118, 82, 83, 88, 104 ]
-	},
-	211: {
-		evolution: 212,
-		evolvers: [ 116, 79, 90 ]
-	},
-	213: {
-		evolution: 214,
-		evolvers: [ 117, 78, 95, 100 ]
-	},
-	216: {
-		evolution: 217,
-		evolvers: [ 118, 84, 100, 94, 89 ]
-	},
-	218: {
-		evolution: 219,
-		evolvers: [ 118, 86, 102, 94, 91 ]
-	},
-	220: {
-		evolution: 221,
-		evolvers: [ 118, 88, 104, 94, 93 ]
-	},
-	222: {
-		evolution: 223,
-		evolvers: [ 117, 81, 98, 83 ]
-	},
-	224: {
-		evolution: 225,
-		evolvers: [ 117, 79, 90, 83 ]
-	},
-	226: {
-		evolution: 227,
-		evolvers: [ 118, 83, 86, 86, 102 ]
-	},
-	231: {
-		evolution: 232,
-		evolvers: [ 117, 79, 85, 90, 101 ]
-	},
-	233: {
-		evolution: 234,
-		evolvers: [ 116, 81, 92 ]
-	},
-	235: {
-		evolution: 236,
-		evolvers: [ 116, 78, 89 ]
-	},
-	237: {
-		evolution: 242,
-		evolvers: [ 115, 89, 95 ]
-	},
-	238: {
-		evolution: 243,
-		evolvers: [ 115, 91, 97 ]
-	},
-	239: {
-		evolution: 244,
-		evolvers: [ 115, 90, 96 ]
-	},
-	240: {
-		evolution: 245,
-		evolvers: [ 115, 92, 98 ]
-	},
-	241: {
-		evolution: 246,
-		evolvers: [ 115, 93, 99 ]
-	},
-	248: {
-		evolution: 249,
-		evolvers: [ 118, 84, 84, 95, 100 ]
-	},
-	250: {
-		evolution: 251,
-		evolvers: [ 118, 87, 94, 98, 103 ]
-	},
-	252: {
-		evolution: 253,
-		evolvers: [ 118, 85, 94, 96, 101 ]
-	},
-	254: {
-		evolution: 255,
-		evolvers: [ 118, 88, 94, 99, 104 ]
-	},
-	256: {
-		evolution: 257,
-		evolvers: [ 118, 86, 94, 97, 102 ]
-	},
-	258: {
-		evolution: 259,
-		evolvers: [ 118, 84, 94, 95, 100 ]
-	},
-	260: {
-		evolution: 261,
-		evolvers: [ 118, 84, 266, 95, 267 ]
-	},
-	262: {
-		evolution: 263,
-		evolvers: [ 117, 81, 87, 92, 103 ]
-	},
-	264: {
-		evolution: 265,
-		evolvers: [ 117, 82, 88, 93, 104 ]
-	},
-	296: {
-		evolution: 297,
-		evolvers: [ 117, 82, 88, 93, 104 ]
-	},
-	305: {
-		evolution: 306,
-		evolvers: [ 118, 87, 87, 303, 103 ]
-	},
-	307: {
-		evolution: 308,
-		evolvers: [ 118, 80, 83, 302, 102 ]
-	},
-	309: {
-		evolution: 310,
-		evolvers: [ 118, 82, 83, 304, 104 ]
-	},
-	311: {
-		evolution: 312,
-		evolvers: [ 118, 79, 83, 301, 101 ]
-	},
-	313: {
-		evolution: 314,
-		evolvers: [ 118, 81, 83, 303, 103 ]
-	},
-	315: {
-		evolution: 316,
-		evolvers: [ 118, 78, 83, 300, 100 ]
-	},
-	317: {
-		evolution: 318,
-		evolvers: [ 117, 80, 86, 97, 102 ]
-	},
-	319: {
-		evolution: 320,
-		evolvers: [ 117, 80, 86, 97, 102 ]
-	},
-	321: {
-		evolution: 322,
-		evolvers: [ 117, 79, 85, 96, 101 ]
-	},
-	323: {
-		evolution: 324,
-		evolvers: [ 117, 90, 85, 96, 101 ]
-	},
-	326: {
-		evolution: 327,
-		evolvers: [ 117, 84, 89, 95, 300 ]
-	},
-	328: {
-		evolution: 329,
-		evolvers: [ 117, 79, 85, 96 ]
-	},
-	330: {
-		evolution: 332,
-		evolvers: [ 116, 331, 302 ]
-	},
-	331: {
-		evolution: 332,
-		evolvers: [ 116, 330, 302 ]
-	},
-	334: {
-		evolution: 335,
-		evolvers: [ 116, 82, 304 ]
-	},
-	336: {
-		evolution: 337,
-		evolvers: [ 117, 81, 87, 98, 103 ]
-	},
-	340: {
-		evolution: 341,
-		evolvers: [ 117, 78, 84, 95, 100 ]
-	},
-	342: {
-		evolution: [ 347, 347, 347 ],
-		evolvers: [ [ 115, 105, 105 ], [ 78, 105, 105 ], [ 89, 105, 105 ] ]
-	},
-	343: {
-		evolution: [ 348, 348, 348 ],
-		evolvers: [ [ 115, 106, 106 ], [ 79, 106, 106 ], [ 90, 106, 106 ] ]
-	},
-	344: {
-		evolution: [ 349, 349, 349 ],
-		evolvers: [ [ 115, 107, 107 ], [ 80, 107, 107 ], [ 91, 107, 107 ] ]
-	},
-	345: {
-		evolution: [ 350, 350, 350 ],
-		evolvers: [ [ 115, 108, 108 ], [ 81, 108, 108 ], [ 92, 108, 108 ] ]
-	},
-	346: {
-		evolution: [ 351, 351, 351 ],
-		evolvers: [ [ 115, 109, 109 ], [ 82, 109, 109 ], [ 93, 109, 109 ] ]
-	},
-	352: {
-		evolution: 353,
-		evolvers: [ 118, 83, 88, 304, 104 ]
-	},
-	354: {
-		evolution: 355,
-		evolvers: [ 116, 85, 90, 96 ]
-	},
-	356: {
-		evolution: 357,
-		evolvers: [ 118, 78, 83, 300, 100 ]
-	},
-	358: {
-		evolution: 359,
-		evolvers: [ 118, 80, 83, 302, 102 ]
-	},
-	360: {
-		evolution: 361,
-		evolvers: [ 118, 82, 83, 304, 104 ]
-	},
-	362: {
-		evolution: 363,
-		evolvers: [ 118, 81, 83, 303, 103 ]
-	},
-	364: {
-		evolution: 365,
-		evolvers: [ 118, 79, 83, 301, 101 ]
-	},
-	366: {
-		evolution: 367,
-		evolvers: [ 118, 88, 266, 99, 267 ]
-	},
-	368: {
-		evolution: 373,
-		evolvers: [ 116, 89, 95 ]
-	},
-	369: {
-		evolution: 374,
-		evolvers: [ 116, 90, 96 ]
-	},
-	370: {
-		evolution: 375,
-		evolvers: [ 116, 91, 97 ]
-	},
-	371: {
-		evolution: 376,
-		evolvers: [ 116, 92, 98 ]
-	},
-	372: {
-		evolution: 377,
-		evolvers: [ 116, 93, 99 ]
-	},
-	379: {
-		evolution: 380,
-		evolvers: [ 115, 78, 300 ]
-	},
-	383: {
-		evolution: [ 384, 408 ],
-		evolvers: [ [ 117, 88, 93, 94, 104 ], [ 118, 88, 266, 304, 267 ] ]
-	},
-	385: {
-		evolution: 386,
-		evolvers: [ 117, 82, 88, 93, 99 ]
-	},
-	387: {
-		evolution: 388,
-		evolvers: [ 117, 81, 87, 385 ]
-	},
-	389: {
-		evolution: 390,
-		evolvers: [ 118, 85, 94, 301, 101 ]
-	},
-	391: {
-		evolution: 392,
-		evolvers: [ 117, 86, 91, 97, 102 ]
-	},
-	395: {
-		evolution: 396,
-		evolvers: [ 79, 85, 90, 301 ]
-	},
-	397: {
-		evolution: 398,
-		evolvers: [ 78, 84, 89, 300 ]
-	},
-	399: {
-		evolution: 400,
-		evolvers: [ 80, 86, 91, 302 ]
-	},
-	401: {
-		evolution: 402,
-		evolvers: [ 78, 84, 89, 300 ]
-	},
-	404: {
-		evolution: 405,
-		evolvers: [ 117, 84, 89, 95, 100 ]
-	},
-	409: {
-		evolution: 410,
-		evolvers: [ 118, 85, 94, 301, 101 ]
-	},
-	411: {
-		evolution: 412,
-		evolvers: [ 118, 84, 94, 300, 100 ]
-	},
-	413: {
-		evolution: 414,
-		evolvers: [ 118, 88, 94, 304, 104 ]
-	},
-	415: {
-		evolution: 416,
-		evolvers: [ 118, 266, 94, 96, 267 ]
-	},
-	417: {
-		evolution: 418,
-		evolvers: [ 118, 83, 86, 302, 102 ]
-	},
-	423: {
-		evolution: 424,
-		evolvers: [ 117, 79, 85, 96, 101 ]
-	},
-	430: {
-		evolution: 431,
-		evolvers: [ 116, 86, 91, 97 ]
-	},
-	435: {
-		evolution: 436,
-		evolvers: [ 117, 85, 433, 434, 96 ]
-	},
-	437: {
-		evolution: 438,
-		evolvers: [ 118, 80, 86, 94, 97 ]
-	},
-	439: {
-		evolution: 440,
-		evolvers: [ 118, 81, 87, 94, 98 ]
-	},
-	444: {
-		evolution: 445,
-		evolvers: [ 441, 442, 443 ]
-	},
-	446: {
-		evolution: 447,
-		evolvers: [ 118, 266, 89, 300, 100 ]
-	},
-	448: {
-		evolution: 449,
-		evolvers: [ 118, 83, 85, 301, 101 ]
-	},
-	450: {
-		evolution: 451,
-		evolvers: [ 118, 83, 86, 302, 102 ]
-	},
-	452: {
-		evolution: 453,
-		evolvers: [ 118, 83, 87, 303, 103 ]
-	},
-	454: {
-		evolution: 455,
-		evolvers: [ 118, 83, 84, 300, 100 ]
-	},
-	456: {
-		evolution: 457,
-		evolvers: [ 118, 83, 88, 304, 104 ]
-	},
-	458: {
-		evolution: 459,
-		evolvers: [ 118, 266, 94, 98, 267 ]
-	},
-	461: {
-		evolution: 462,
-		evolvers: [ 117, 80, 86, 97, 102 ]
-	},
-	468: {
-		evolution: 470,
-		evolvers: [ 116, 81, 98 ]
-	},
-	469: {
-		evolution: 471,
-		evolvers: [ 116, 82, 99 ]
-	},
-	477: {
-		evolution: 482,
-		evolvers: [ 116, 84, 89, 95 ]
-	},
-	478: {
-		evolution: 483,
-		evolvers: [ 116, 85, 90, 96 ]
-	},
-	479: {
-		evolution: 484,
-		evolvers: [ 116, 86, 91, 97 ]
-	},
-	480: {
-		evolution: 485,
-		evolvers: [ 116, 87, 92, 98 ]
-	},
-	481: {
-		evolution: 486,
-		evolvers: [ 116, 88, 93, 99 ]
-	},
-	487: {
-		evolution: 490,
-		evolvers: [ 115, 300 ]
-	},
-	488: {
-		evolution: 491,
-		evolvers: [ 116, 301 ]
-	},
-	489: {
-		evolution: 492,
-		evolvers: [ 117, 302 ]
-	},
-	493: {
-		evolution: 495,
-		evolvers: [ 117, 81, 87 ]
-	},
-	494: {
-		evolution: 496,
-		evolvers: [ 117, 82, 88 ]
-	},
-	497: {
-		evolution: 498,
-		evolvers: [ 90, 94, 96, 301, 101 ]
-	},
-	499: {
-		evolution: 500,
-		evolvers: [ 117, 80, 97, 94 ]
-	},
-	501: {
-		evolution: 502,
-		evolvers: [ 117, 87, 92, 94 ]
-	},
-	503: {
-		evolution: 504,
-		evolvers: [ 117, 82, 88, 104 ]
-	},
-	505: {
-		evolution: 506,
-		evolvers: [ 116, 79, 85, 266 ]
-	},
-	507: {
-		evolution: 508,
-		evolvers: [ 116, 89, 95, 300 ]
-	},
-	509: {
-		evolution: 510,
-		evolvers: [ 117, 85, 96, 96, 301 ]
-	},
-	512: {
-		evolution: 513,
-		evolvers: [ 115, 116, 117, 118, 81 ]
-	},
-	515: {
-		evolution: 516,
-		evolvers: [ 118, 87, 266, 303, 103 ]
-	},
-	517: {
-		evolution: 518,
-		evolvers: [ 116, 81, 98 ]
-	},
-	519: {
-		evolution: 520,
-		evolvers: [ 118, 84, 95, 94, 100 ]
-	},
-	521: {
-		evolution: 522,
-		evolvers: [ 118, 83, 88, 94, 104 ]
-	},
-	523: {
-		evolution: 524,
-		evolvers: [ 118, 85, 96, 301, 101 ]
-	},
-	525: {
-		evolution: 526,
-		evolvers: [ 118, 92, 94, 98, 303 ]
-	},
-	527: {
-		evolution: 528,
-		evolvers: [ 118, 86, 266, 97, 302 ]
-	},
-	529: {
-		evolution: 530,
-		evolvers: [ 118, 87, 266, 98, 267 ]
-	},
-	531: {
-		evolution: 532,
-		evolvers: [ 117, 80, 86, 91, 97 ]
-	},
-	533: {
-		evolution: 534,
-		evolvers: [ 118, 79, 85, 96, 101 ]
-	},
-	535: {
-		evolution: 536,
-		evolvers: [ 118, 80, 86, 91, 97 ]
-	},
-	537: {
-		evolution: 538,
-		evolvers: [ 117, 81, 92, 98, 103 ]
-	},
-	543: {
-		evolution: 544,
-		evolvers: [ 117, 86, 97, 102 ]
-	},
-	545: {
-		evolution: 546,
-		evolvers: [ 118, 266, 92, 303, 103 ]
-	},
-	547: {
-		evolution: 548,
-		evolvers: [ 118, 78, 78, 84, 84 ]
-	},
-	549: {
-		evolution: 550,
-		evolvers: [ 117, 82, 88, 99, 104 ]
-	},
-	553: {
-		evolution: 554,
-		evolvers: [ 118, 83, 97, 302, 102 ]
-	},
-	555: {
-		evolution: 556,
-		evolvers: [ 118, 83, 96, 301, 101 ]
-	},
-	557: {
-		evolution: 558,
-		evolvers: [ 118, 88, 94, 304, 104 ]
-	},
-	559: {
-		evolution: 560,
-		evolvers: [ 118, 83, 84, 300, 100 ]
-	},
-	561: {
-		evolution: 562,
-		evolvers: [ 118, 86, 266, 302, 267 ]
-	},
-	568: {
-		evolution: 569,
-		evolvers: [ 117, 83, 88, 93, 99 ]
-	},
-	570: {
-		evolution: 571,
-		evolvers: [ 170, 142, 184, 237, 572 ]
-	},
-	574: {
-		evolution: 575,
-		evolvers: [ 118, 88, 266, 304, 104 ]
-	},
-	577: {
-		evolution: 578,
-		evolvers: [ 118, 266, 95, 300, 267 ]
-	},
-	579: {
-		evolution: 580,
-		evolvers: [ 117, 85, 86, 96, 97 ]
-	},
-	585: {
-		evolution: 586,
-		evolvers: [ 116, 87, 92, 98 ]
-	},
-	587: {
-		evolution: 588,
-		evolvers: [ 117, 304 ]
-	},
-	589: {
-		evolution: 590,
-		evolvers: [ 116, 117, 79, 85 ]
-	},
-	596: {
-		evolution: 597,
-		evolvers: [ 117, 78, 84, 89, 95 ]
-	},
-	598: {
-		evolution: 599,
-		evolvers: [ 117, 82, 82, 88, 88 ]
-	},
-	600: {
-		evolution: 601,
-		evolvers: [ 117, 81, 87, 98, 103 ]
-	},
-	602: {
-		evolution: 603,
-		evolvers: [ 118, 266, 96, 301, 101 ]
-	},
-	604: {
-		evolution: 605,
-		evolvers: [ 117, 86, 97, 97, 302 ]
-	},
-	606: {
-		evolution: 607,
-		evolvers: [ 117, 80, 86, 97, 102 ]
-	},
-	612: {
-		evolution: 613,
-		evolvers: [ 91, 94, 97, 97, 302 ]
-	},
-	629: {
-		evolution: 739,
-		evolvers: [ 117, 82, 83, 99, 104 ]
-	},
-	630: {
-		evolution: [ 631, 736 ],
-		evolvers: [ [ 117, 90, 96, 301, 101 ], [ 118, 78, 94, 95, 100 ] ]
-	},
-	632: {
-		evolution: [ 633, 737 ],
-		evolvers: [ [ 117, 89, 95, 300, 100 ], [ 118, 79, 94, 96, 101 ] ]
-	},
-	634: {
-		evolution: 635,
-		evolvers: [ 117, 79, 85, 96, 101 ]
-	},
-	638: {
-		evolution: 639,
-		evolvers: [ 118, 83, 96, 301, 101 ]
-	},
-	640: {
-		evolution: 641,
-		evolvers: [ 118, 83, 86, 302, 102 ]
-	},
-	642: {
-		evolution: 643,
-		evolvers: [ 118, 92, 94, 303, 103 ]
-	},
-	644: {
-		evolution: 645,
-		evolvers: [ 118, 94, 99, 304, 104 ]
-	},
-	646: {
-		evolution: 647,
-		evolvers: [ 118, 84, 266, 95, 100 ]
-	},
-	648: {
-		evolution: 649,
-		evolvers: [ 118, 85, 266, 301, 267 ]
-	},
-	650: {
-		evolution: 651,
-		evolvers: [ 117, 83, 88, 93, 104 ]
-	},
-	652: {
-		evolution: 653,
-		evolvers: [ 116, 117, 80, 91, 97 ]
-	},
-	653: {
-		evolution: [ 654, 654 ],
-		evolvers: [ [ 118, 86, 266, 97, 102 ], [ 18 ] ]
-	},
-	655: {
-		evolution: 656,
-		evolvers: [ 117, 78, 84, 95, 100 ]
-	},
-	660: {
-		evolution: 661,
-		evolvers: [ 117, 85, 94, 96, 101 ]
-	},
-	663: {
-		evolution: 664,
-		evolvers: [ 117, 81, 87, 98, 103 ]
-	},
-	665: {
-		evolution: 666,
-		evolvers: [ 117, 79, 85, 96, 101 ]
-	},
-	668: {
-		evolution: 669,
-		evolvers: [ 118, 87, 266, 303, 267 ]
-	},
-	670: {
-		evolution: 671,
-		evolvers: [ 118, 83, 86, 302, 102 ]
-	},
-	672: {
-		evolution: 673,
-		evolvers: [ 118, 84, 94, 300, 100 ]
-	},
-	674: {
-		evolution: 675,
-		evolvers: [ 118, 83, 88, 304, 104 ]
-	},
-	676: {
-		evolution: 677,
-		evolvers: [ 94, 96, 96, 301, 301 ]
-	},
-	678: {
-		evolution: 679,
-		evolvers: [ 117, 87, 94, 303, 103 ]
-	},
-	680: {
-		evolution: 681,
-		evolvers: [ 117, 80, 86, 97, 302 ]
-	},
-	682: {
-		evolution: 683,
-		evolvers: [ 117, 81, 87, 98, 303 ]
-	},
-	684: {
-		evolution: 685,
-		evolvers: [ 117, 88, 93, 99, 304 ]
-	},
-	687: {
-		evolution: 688,
-		evolvers: [ 117, 78, 84, 95, 100 ]
-	},
-	689: {
-		evolution: 690,
-		evolvers: [ 117, 82, 88, 99, 104 ]
-	},
-	691: {
-		evolution: 696,
-		evolvers: [ 116, 97, 302 ]
-	},
-	692: {
-		evolution: 697,
-		evolvers: [ 116, 96, 301 ]
-	},
-	693: {
-		evolution: 698,
-		evolvers: [ 116, 98, 303 ]
-	},
-	694: {
-		evolution: 699,
-		evolvers: [ 116, 95, 300 ]
-	},
-	695: {
-		evolution: 700,
-		evolvers: [ 116, 99, 304 ]
-	},
-	706: {
-		evolution: 707,
-		evolvers: [ 117, 84, 89, 95, 100 ]
-	},
-	708: {
-		evolution: 709,
-		evolvers: [ 117, 81, 87, 303, 103 ]
-	},
-	710: {
-		evolution: 711,
-		evolvers: [ 117, 87, 94, 303, 103 ]
-	},
-	712: {
-		evolution: 713,
-		evolvers: [ 117, 90, 96, 301, 101 ]
-	},
-	715: {
-		evolution: 716,
-		evolvers: [ 116, 117, 81, 87 ]
-	},
-	717: {
-		evolution: 718,
-		evolvers: [ 118, 266, 99, 304, 267 ]
-	},
-	719: {
-		evolution: 720,
-		evolvers: [ 118, 86, 266, 102, 267 ]
-	},
-	721: {
-		evolution: 722,
-		evolvers: [ 117, 78, 89, 95 ]
-	},
-	723: {
-		evolution: 724,
-		evolvers: [ 117, 92, 98, 98, 103 ]
-	},
-	725: {
-		evolution: 726,
-		evolvers: [ 117, 79, 85, 96, 101 ]
-	},
-	728: {
-		evolution: 729,
-		evolvers: [ 117, 86, 91, 97, 302 ]
-	},
-	730: {
-		evolution: 731,
-		evolvers: [ 117, 88, 93, 99, 304 ]
-	},
-	732: {
-		evolution: 733,
-		evolvers: [ 116, 84, 95, 300 ]
-	},
-	734: {
-		evolution: 735,
-		evolvers: [ 116, 87, 98, 303 ]
-	},
-	740: {
-		evolution: 741,
-		evolvers: [ 117, 79, 90, 96 ]
-	},
-	742: {
-		evolution: 743,
-		evolvers: [ 117, 80, 86, 91, 97 ]
-	},
-	744: {
-		evolution: 745,
-		evolvers: [ 118, 85, 94, 301, 101 ]
-	},
-	747: {
-		evolution: 748,
-		evolvers: [ 118, 84, 266, 300, 267 ]
-	},
-	749: {
-		evolution: 750,
-		evolvers: [ 118, 83, 86, 302, 102 ]
-	},
-	751: {
-		evolution: 752,
-		evolvers: [ 118, 83, 85, 301, 101 ]
-	},
-	753: {
-		evolution: 754,
-		evolvers: [ 118, 94, 96, 301, 101 ]
-	},
-	755: {
-		evolution: 756,
-		evolvers: [ 118, 83, 88, 304, 104 ]
-	},
-	757: {
-		evolution: 758,
-		evolvers: [ 118, 87, 87, 303, 103 ]
-	},
-	759: {
-		evolution: 760,
-		evolvers: [ 118, 84, 84, 300, 100 ]
-	},
-	776: {
-		evolution: 777,
-		evolvers: [ 116, 117, 81, 87, 103 ]
-	},
-	778: {
-		evolution: 779,
-		evolvers: [ 117, 85, 94, 96, 301 ]
-	},
-	780: {
-		evolution: 781,
-		evolvers: [ 118, 84, 94, 300, 100 ]
-	},
-	782: {
-		evolution: 783,
-		evolvers: [ 117, 93, 94, 304, 104 ]
-	},
-	784: {
-		evolution: 785,
-		evolvers: [ 116, 89, 95 ]
-	},
-	786: {
-		evolution: 787,
-		evolvers: [ 116, 81, 87 ]
-	},
-	788: {
-		evolution: 789,
-		evolvers: [ 116, 80, 86 ]
-	},
-	790: {
-		evolution: 791,
-		evolvers: [ 89, 90, 91 ]
-	},
-	792: {
-		evolution: 793,
-		evolvers: [ 116, 117, 99 ]
-	},
-	794: {
-		evolution: 795,
-		evolvers: [ 118, 88, 266, 304, 104 ]
-	},
-	796: {
-		evolution: 797,
-		evolvers: [ 117, 82, 88, 99, 104 ]
-	},
-	801: {
-		evolution: 802,
-		evolvers: [ 87, 94, 98, 303, 103 ]
-	},
-	803: {
-		evolution: 804,
-		evolvers: [ 117, 80, 86, 302, 102 ]
-	},
-	805: {
-		evolution: 806,
-		evolvers: [ 118, 83, 88, 99, 304 ]
-	},
-	807: {
-		evolution: 808,
-		evolvers: [ 117, 87, 92, 98, 103 ]
-	},
-	809: {
-		evolution: [ 810, 810 ],
-		evolvers: [ [ 116, 78, 84, 89, 95 ], [ 404 ] ]
-	},
-	815: {
-		evolution: [ 816, 894 ],
-		evolvers: [ [ 117, 88, 94, 304, 104 ], [ 117, 88, 94, 99, 104 ] ]
-	},
+    1: {
+        evolution: 2,
+        evolvers: [ 78 ]
+    },
+    2: {
+        evolution: 3,
+        evolvers: [ 115, 78 ]
+    },
+    3: {
+        evolution: 4,
+        evolvers: [ 117, 84, 95, 100 ]
+    },
+    5: {
+        evolution: [ 6, 7 ],
+        evolvers: [ [ 115, 80 ], [ 116, 80, 97 ] ]
+    },
+    6: {
+        evolution: 8,
+        evolvers: [ 117, 86, 97, 102 ]
+    },
+    7: {
+        evolution: 8,
+        evolvers: [ 117, 80, 102 ]
+    },
+    9: {
+        evolution: [ 10, 11 ],
+        evolvers: [ [ 115, 82 ], [ 116, 82, 99 ] ]
+    },
+    10: {
+        evolution: 12,
+        evolvers: [ 117, 88, 99, 104 ]
+    },
+    11: {
+        evolution: 12,
+        evolvers: [ 117, 82, 104 ]
+    },
+    13: {
+        evolution: [ 14, 15 ],
+        evolvers: [ [ 115, 81 ], [ 115, 81, 98 ] ]
+    },
+    14: {
+        evolution: [ 15, 16 ],
+        evolvers: [ [ 117 ], [ 117, 87, 98, 103 ] ]
+    },
+    15: {
+        evolution: 16,
+        evolvers: [ 117, 81, 103 ]
+    },
+    17: {
+        evolution: [ 18, 19 ],
+        evolvers: [ [ 115, 79 ], [ 116, 79, 96 ] ]
+    },
+    18: {
+        evolution: 20,
+        evolvers: [ 117, 85, 96, 101 ]
+    },
+    19: {
+        evolution: 20,
+        evolvers: [ 117, 79, 101 ]
+    },
+    21: {
+        evolution: [ 22, 23, 24, 25, 26 ],
+        evolvers: [ [ 116, 81, 98 ], [ 116, 82, 99 ], [ 116, 78, 95 ], [ 116, 79, 96 ], [ 116, 80, 97 ] ]
+    },
+    29: {
+        evolution: 30,
+        evolvers: [ 117, 78, 89, 100 ]
+    },
+    31: {
+        evolution: 32,
+        evolvers: [ 115, 81 ]
+    },
+    33: {
+        evolution: 34,
+        evolvers: [ 115, 82 ]
+    },
+    35: {
+        evolution: 228,
+        evolvers: [ 116, 78, 89 ]
+    },
+    38: {
+        evolution: 39,
+        evolvers: [ 116, 82, 93 ]
+    },
+    43: {
+        evolution: [ 44, 229 ],
+        evolvers: [ [ 116, 80, 91 ], [ 116, 81, 92 ] ]
+    },
+    45: {
+        evolution: 46,
+        evolvers: [ 117, 79, 90, 101 ]
+    },
+    49: {
+        evolution: 230,
+        evolvers: [ 116, 78, 89 ]
+    },
+    53: {
+        evolution: 54,
+        evolvers: [ 116, 79, 90 ]
+    },
+    55: {
+        evolution: 56,
+        evolvers: [ 116, 78, 89 ]
+    },
+    57: {
+        evolution: 58,
+        evolvers: [ 117, 82, 93, 104 ]
+    },
+    63: {
+        evolution: 64,
+        evolvers: [ 116, 80, 91 ]
+    },
+    65: {
+        evolution: 66,
+        evolvers: [ 117, 78, 89, 100 ]
+    },
+    67: {
+        evolution: 68,
+        evolvers: [ 117, 83, 79, 85, 96 ]
+    },
+    69: {
+        evolution: 70,
+        evolvers: [ 117, 83, 80, 86, 97 ]
+    },
+    70: {
+        evolution: 268,
+        evolvers: [ 117, 80, 86, 91, 102 ]
+    },
+    71: {
+        evolution: [ 72, 72 ],
+        evolvers: [ [ 117, 81, 98 ], [ 444 ] ]
+    },
+    72: {
+        evolution: 73,
+        evolvers: [ 118, 83, 87, 98, 103 ]
+    },
+    74: {
+        evolution: 75,
+        evolvers: [ 118, 83, 85, 85, 101 ]
+    },
+    76: {
+        evolution: 77,
+        evolvers: [ 118, 83, 87, 98, 103 ]
+    },
+    121: {
+        evolution: 142,
+        evolvers: [ 89 ]
+    },
+    122: {
+        evolution: 143,
+        evolvers: [ 90 ]
+    },
+    123: {
+        evolution: 144,
+        evolvers: [ 91 ]
+    },
+    124: {
+        evolution: 145,
+        evolvers: [ 92 ]
+    },
+    125: {
+        evolution: 146,
+        evolvers: [ 93 ]
+    },
+    126: {
+        evolution: 147,
+        evolvers: [ 89 ]
+    },
+    127: {
+        evolution: 148,
+        evolvers: [ 90 ]
+    },
+    128: {
+        evolution: 149,
+        evolvers: [ 91 ]
+    },
+    129: {
+        evolution: 150,
+        evolvers: [ 92 ]
+    },
+    130: {
+        evolution: 151,
+        evolvers: [ 93 ]
+    },
+    131: {
+        evolution: 152,
+        evolvers: [ 89 ]
+    },
+    132: {
+        evolution: 153,
+        evolvers: [ 90 ]
+    },
+    133: {
+        evolution: 154,
+        evolvers: [ 91 ]
+    },
+    134: {
+        evolution: 155,
+        evolvers: [ 92 ]
+    },
+    135: {
+        evolution: 156,
+        evolvers: [ 93 ]
+    },
+    136: {
+        evolution: 157,
+        evolvers: [ 89 ]
+    },
+    137: {
+        evolution: 158,
+        evolvers: [ 90 ]
+    },
+    138: {
+        evolution: 159,
+        evolvers: [ 91 ]
+    },
+    139: {
+        evolution: 160,
+        evolvers: [ 92 ]
+    },
+    140: {
+        evolution: 161,
+        evolvers: [ 93 ]
+    },
+    141: {
+        evolution: 162,
+        evolvers: [ 115, 93 ]
+    },
+    142: {
+        evolution: 269,
+        evolvers: [ 115, 116, 89 ]
+    },
+    143: {
+        evolution: 270,
+        evolvers: [ 115, 116, 90 ]
+    },
+    144: {
+        evolution: 271,
+        evolvers: [ 115, 116, 91 ]
+    },
+    145: {
+        evolution: 272,
+        evolvers: [ 115, 116, 92 ]
+    },
+    146: {
+        evolution: 273,
+        evolvers: [ 115, 116, 93 ]
+    },
+    147: {
+        evolution: 274,
+        evolvers: [ 116, 95 ]
+    },
+    148: {
+        evolution: 275,
+        evolvers: [ 116, 96 ]
+    },
+    149: {
+        evolution: 276,
+        evolvers: [ 116, 97 ]
+    },
+    150: {
+        evolution: 277,
+        evolvers: [ 116, 98 ]
+    },
+    151: {
+        evolution: 278,
+        evolvers: [ 116, 99 ]
+    },
+    152: {
+        evolution: 279,
+        evolvers: [ 78, 84 ]
+    },
+    153: {
+        evolution: 280,
+        evolvers: [ 79, 85 ]
+    },
+    154: {
+        evolution: 281,
+        evolvers: [ 80, 86 ]
+    },
+    155: {
+        evolution: 282,
+        evolvers: [ 81, 87 ]
+    },
+    156: {
+        evolution: 283,
+        evolvers: [ 82, 88 ]
+    },
+    157: {
+        evolution: 284,
+        evolvers: [ 115, 116, 89 ]
+    },
+    158: {
+        evolution: 285,
+        evolvers: [ 115, 116, 90 ]
+    },
+    159: {
+        evolution: 286,
+        evolvers: [ 115, 116, 91 ]
+    },
+    160: {
+        evolution: 287,
+        evolvers: [ 115, 116, 92 ]
+    },
+    161: {
+        evolution: 288,
+        evolvers: [ 115, 116, 93 ]
+    },
+    162: {
+        evolution: 289,
+        evolvers: [ 104 ]
+    },
+    179: {
+        evolution: 184,
+        evolvers: [ 78 ]
+    },
+    180: {
+        evolution: 185,
+        evolvers: [ 80 ]
+    },
+    181: {
+        evolution: 186,
+        evolvers: [ 79 ]
+    },
+    182: {
+        evolution: 187,
+        evolvers: [ 81 ]
+    },
+    183: {
+        evolution: 188,
+        evolvers: [ 115, 82 ]
+    },
+    184: {
+        evolution: 194,
+        evolvers: [ 116, 78, 84 ]
+    },
+    185: {
+        evolution: 195,
+        evolvers: [ 116, 80, 86 ]
+    },
+    186: {
+        evolution: 196,
+        evolvers: [ 116, 79, 85 ]
+    },
+    187: {
+        evolution: 197,
+        evolvers: [ 116, 81, 87 ]
+    },
+    188: {
+        evolution: 198,
+        evolvers: [ 116, 117, 82, 88 ]
+    },
+    199: {
+        evolution: 200,
+        evolvers: [ 94, 78 ]
+    },
+    201: {
+        evolution: 202,
+        evolvers: [ 94, 79 ]
+    },
+    203: {
+        evolution: 204,
+        evolvers: [ 94, 82 ]
+    },
+    205: {
+        evolution: 206,
+        evolvers: [ 94, 80 ]
+    },
+    207: {
+        evolution: [ 208, 462 ],
+        evolvers: [ [ 94, 81 ], [ 117, 231 ] ]
+    },
+    209: {
+        evolution: 210,
+        evolvers: [ 118, 82, 83, 88, 104 ]
+    },
+    211: {
+        evolution: 212,
+        evolvers: [ 116, 79, 90 ]
+    },
+    213: {
+        evolution: 214,
+        evolvers: [ 117, 78, 95, 100 ]
+    },
+    216: {
+        evolution: 217,
+        evolvers: [ 118, 84, 100, 94, 89 ]
+    },
+    218: {
+        evolution: 219,
+        evolvers: [ 118, 86, 102, 94, 91 ]
+    },
+    220: {
+        evolution: 221,
+        evolvers: [ 118, 88, 104, 94, 93 ]
+    },
+    222: {
+        evolution: 223,
+        evolvers: [ 117, 81, 98, 83 ]
+    },
+    224: {
+        evolution: 225,
+        evolvers: [ 117, 79, 90, 83 ]
+    },
+    226: {
+        evolution: 227,
+        evolvers: [ 118, 83, 86, 86, 102 ]
+    },
+    231: {
+        evolution: 232,
+        evolvers: [ 117, 79, 85, 90, 101 ]
+    },
+    233: {
+        evolution: 234,
+        evolvers: [ 116, 81, 92 ]
+    },
+    235: {
+        evolution: 236,
+        evolvers: [ 116, 78, 89 ]
+    },
+    237: {
+        evolution: 242,
+        evolvers: [ 115, 89, 95 ]
+    },
+    238: {
+        evolution: 243,
+        evolvers: [ 115, 91, 97 ]
+    },
+    239: {
+        evolution: 244,
+        evolvers: [ 115, 90, 96 ]
+    },
+    240: {
+        evolution: 245,
+        evolvers: [ 115, 92, 98 ]
+    },
+    241: {
+        evolution: 246,
+        evolvers: [ 115, 93, 99 ]
+    },
+    248: {
+        evolution: 249,
+        evolvers: [ 118, 84, 84, 95, 100 ]
+    },
+    250: {
+        evolution: 251,
+        evolvers: [ 118, 87, 94, 98, 103 ]
+    },
+    252: {
+        evolution: 253,
+        evolvers: [ 118, 85, 94, 96, 101 ]
+    },
+    254: {
+        evolution: 255,
+        evolvers: [ 118, 88, 94, 99, 104 ]
+    },
+    256: {
+        evolution: 257,
+        evolvers: [ 118, 86, 94, 97, 102 ]
+    },
+    258: {
+        evolution: 259,
+        evolvers: [ 118, 84, 94, 95, 100 ]
+    },
+    260: {
+        evolution: 261,
+        evolvers: [ 118, 84, 266, 95, 267 ]
+    },
+    262: {
+        evolution: 263,
+        evolvers: [ 117, 81, 87, 92, 103 ]
+    },
+    264: {
+        evolution: 265,
+        evolvers: [ 117, 82, 88, 93, 104 ]
+    },
+    296: {
+        evolution: 297,
+        evolvers: [ 117, 82, 88, 93, 104 ]
+    },
+    305: {
+        evolution: 306,
+        evolvers: [ 118, 87, 87, 303, 103 ]
+    },
+    307: {
+        evolution: 308,
+        evolvers: [ 118, 80, 83, 302, 102 ]
+    },
+    309: {
+        evolution: 310,
+        evolvers: [ 118, 82, 83, 304, 104 ]
+    },
+    311: {
+        evolution: 312,
+        evolvers: [ 118, 79, 83, 301, 101 ]
+    },
+    313: {
+        evolution: 314,
+        evolvers: [ 118, 81, 83, 303, 103 ]
+    },
+    315: {
+        evolution: 316,
+        evolvers: [ 118, 78, 83, 300, 100 ]
+    },
+    317: {
+        evolution: 318,
+        evolvers: [ 117, 80, 86, 97, 102 ]
+    },
+    319: {
+        evolution: 320,
+        evolvers: [ 117, 80, 86, 97, 102 ]
+    },
+    321: {
+        evolution: 322,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
+    323: {
+        evolution: 324,
+        evolvers: [ 117, 90, 85, 96, 101 ]
+    },
+    326: {
+        evolution: 327,
+        evolvers: [ 117, 84, 89, 95, 300 ]
+    },
+    328: {
+        evolution: 329,
+        evolvers: [ 117, 79, 85, 96 ]
+    },
+    330: {
+        evolution: 332,
+        evolvers: [ 116, 331, 302 ]
+    },
+    331: {
+        evolution: 332,
+        evolvers: [ 116, 330, 302 ]
+    },
+    334: {
+        evolution: 335,
+        evolvers: [ 116, 82, 304 ]
+    },
+    336: {
+        evolution: 337,
+        evolvers: [ 117, 81, 87, 98, 103 ]
+    },
+    340: {
+        evolution: 341,
+        evolvers: [ 117, 78, 84, 95, 100 ]
+    },
+    342: {
+        evolution: [ 347, 347, 347 ],
+        evolvers: [ [ 115, 105, 105 ], [ 78, 105, 105 ], [ 89, 105, 105 ] ]
+    },
+    343: {
+        evolution: [ 348, 348, 348 ],
+        evolvers: [ [ 115, 106, 106 ], [ 79, 106, 106 ], [ 90, 106, 106 ] ]
+    },
+    344: {
+        evolution: [ 349, 349, 349 ],
+        evolvers: [ [ 115, 107, 107 ], [ 80, 107, 107 ], [ 91, 107, 107 ] ]
+    },
+    345: {
+        evolution: [ 350, 350, 350 ],
+        evolvers: [ [ 115, 108, 108 ], [ 81, 108, 108 ], [ 92, 108, 108 ] ]
+    },
+    346: {
+        evolution: [ 351, 351, 351 ],
+        evolvers: [ [ 115, 109, 109 ], [ 82, 109, 109 ], [ 93, 109, 109 ] ]
+    },
+    352: {
+        evolution: 353,
+        evolvers: [ 118, 83, 88, 304, 104 ]
+    },
+    354: {
+        evolution: 355,
+        evolvers: [ 116, 85, 90, 96 ]
+    },
+    356: {
+        evolution: 357,
+        evolvers: [ 118, 78, 83, 300, 100 ]
+    },
+    358: {
+        evolution: 359,
+        evolvers: [ 118, 80, 83, 302, 102 ]
+    },
+    360: {
+        evolution: 361,
+        evolvers: [ 118, 82, 83, 304, 104 ]
+    },
+    362: {
+        evolution: 363,
+        evolvers: [ 118, 81, 83, 303, 103 ]
+    },
+    364: {
+        evolution: 365,
+        evolvers: [ 118, 79, 83, 301, 101 ]
+    },
+    366: {
+        evolution: 367,
+        evolvers: [ 118, 88, 266, 99, 267 ]
+    },
+    368: {
+        evolution: 373,
+        evolvers: [ 116, 89, 95 ]
+    },
+    369: {
+        evolution: 374,
+        evolvers: [ 116, 90, 96 ]
+    },
+    370: {
+        evolution: 375,
+        evolvers: [ 116, 91, 97 ]
+    },
+    371: {
+        evolution: 376,
+        evolvers: [ 116, 92, 98 ]
+    },
+    372: {
+        evolution: 377,
+        evolvers: [ 116, 93, 99 ]
+    },
+    379: {
+        evolution: 380,
+        evolvers: [ 115, 78, 300 ]
+    },
+    383: {
+        evolution: [ 384, 408 ],
+        evolvers: [ [ 117, 88, 93, 94, 104 ], [ 118, 88, 266, 304, 267 ] ]
+    },
+    385: {
+        evolution: 386,
+        evolvers: [ 117, 82, 88, 93, 99 ]
+    },
+    387: {
+        evolution: 388,
+        evolvers: [ 117, 81, 87, 385 ]
+    },
+    389: {
+        evolution: 390,
+        evolvers: [ 118, 85, 94, 301, 101 ]
+    },
+    391: {
+        evolution: 392,
+        evolvers: [ 117, 86, 91, 97, 102 ]
+    },
+    395: {
+        evolution: 396,
+        evolvers: [ 79, 85, 90, 301 ]
+    },
+    397: {
+        evolution: 398,
+        evolvers: [ 78, 84, 89, 300 ]
+    },
+    399: {
+        evolution: 400,
+        evolvers: [ 80, 86, 91, 302 ]
+    },
+    401: {
+        evolution: 402,
+        evolvers: [ 78, 84, 89, 300 ]
+    },
+    404: {
+        evolution: 405,
+        evolvers: [ 117, 84, 89, 95, 100 ]
+    },
+    409: {
+        evolution: 410,
+        evolvers: [ 118, 85, 94, 301, 101 ]
+    },
+    411: {
+        evolution: 412,
+        evolvers: [ 118, 84, 94, 300, 100 ]
+    },
+    413: {
+        evolution: 414,
+        evolvers: [ 118, 88, 94, 304, 104 ]
+    },
+    415: {
+        evolution: 416,
+        evolvers: [ 118, 266, 94, 96, 267 ]
+    },
+    417: {
+        evolution: 418,
+        evolvers: [ 118, 83, 86, 302, 102 ]
+    },
+    423: {
+        evolution: 424,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
+    430: {
+        evolution: 431,
+        evolvers: [ 116, 86, 91, 97 ]
+    },
+    435: {
+        evolution: 436,
+        evolvers: [ 117, 85, 433, 434, 96 ]
+    },
+    437: {
+        evolution: 438,
+        evolvers: [ 118, 80, 86, 94, 97 ]
+    },
+    439: {
+        evolution: 440,
+        evolvers: [ 118, 81, 87, 94, 98 ]
+    },
+    444: {
+        evolution: 445,
+        evolvers: [ 441, 442, 443 ]
+    },
+    446: {
+        evolution: 447,
+        evolvers: [ 118, 266, 89, 300, 100 ]
+    },
+    448: {
+        evolution: 449,
+        evolvers: [ 118, 83, 85, 301, 101 ]
+    },
+    450: {
+        evolution: 451,
+        evolvers: [ 118, 83, 86, 302, 102 ]
+    },
+    452: {
+        evolution: 453,
+        evolvers: [ 118, 83, 87, 303, 103 ]
+    },
+    454: {
+        evolution: 455,
+        evolvers: [ 118, 83, 84, 300, 100 ]
+    },
+    456: {
+        evolution: 457,
+        evolvers: [ 118, 83, 88, 304, 104 ]
+    },
+    458: {
+        evolution: 459,
+        evolvers: [ 118, 266, 94, 98, 267 ]
+    },
+    461: {
+        evolution: 462,
+        evolvers: [ 117, 80, 86, 97, 102 ]
+    },
+    468: {
+        evolution: 470,
+        evolvers: [ 116, 81, 98 ]
+    },
+    469: {
+        evolution: 471,
+        evolvers: [ 116, 82, 99 ]
+    },
+    477: {
+        evolution: 482,
+        evolvers: [ 116, 84, 89, 95 ]
+    },
+    478: {
+        evolution: 483,
+        evolvers: [ 116, 85, 90, 96 ]
+    },
+    479: {
+        evolution: 484,
+        evolvers: [ 116, 86, 91, 97 ]
+    },
+    480: {
+        evolution: 485,
+        evolvers: [ 116, 87, 92, 98 ]
+    },
+    481: {
+        evolution: 486,
+        evolvers: [ 116, 88, 93, 99 ]
+    },
+    487: {
+        evolution: 490,
+        evolvers: [ 115, 300 ]
+    },
+    488: {
+        evolution: 491,
+        evolvers: [ 116, 301 ]
+    },
+    489: {
+        evolution: 492,
+        evolvers: [ 117, 302 ]
+    },
+    493: {
+        evolution: 495,
+        evolvers: [ 117, 81, 87 ]
+    },
+    494: {
+        evolution: 496,
+        evolvers: [ 117, 82, 88 ]
+    },
+    497: {
+        evolution: 498,
+        evolvers: [ 90, 94, 96, 301, 101 ]
+    },
+    499: {
+        evolution: 500,
+        evolvers: [ 117, 80, 97, 94 ]
+    },
+    501: {
+        evolution: 502,
+        evolvers: [ 117, 87, 92, 94 ]
+    },
+    503: {
+        evolution: 504,
+        evolvers: [ 117, 82, 88, 104 ]
+    },
+    505: {
+        evolution: 506,
+        evolvers: [ 116, 79, 85, 266 ]
+    },
+    507: {
+        evolution: 508,
+        evolvers: [ 116, 89, 95, 300 ]
+    },
+    509: {
+        evolution: 510,
+        evolvers: [ 117, 85, 96, 96, 301 ]
+    },
+    512: {
+        evolution: 513,
+        evolvers: [ 115, 116, 117, 118, 81 ]
+    },
+    515: {
+        evolution: 516,
+        evolvers: [ 118, 87, 266, 303, 103 ]
+    },
+    517: {
+        evolution: 518,
+        evolvers: [ 116, 81, 98 ]
+    },
+    519: {
+        evolution: 520,
+        evolvers: [ 118, 84, 95, 94, 100 ]
+    },
+    521: {
+        evolution: 522,
+        evolvers: [ 118, 83, 88, 94, 104 ]
+    },
+    523: {
+        evolution: 524,
+        evolvers: [ 118, 85, 96, 301, 101 ]
+    },
+    525: {
+        evolution: 526,
+        evolvers: [ 118, 92, 94, 98, 303 ]
+    },
+    527: {
+        evolution: 528,
+        evolvers: [ 118, 86, 266, 97, 302 ]
+    },
+    529: {
+        evolution: 530,
+        evolvers: [ 118, 87, 266, 98, 267 ]
+    },
+    531: {
+        evolution: 532,
+        evolvers: [ 117, 80, 86, 91, 97 ]
+    },
+    533: {
+        evolution: 534,
+        evolvers: [ 118, 79, 85, 96, 101 ]
+    },
+    535: {
+        evolution: 536,
+        evolvers: [ 118, 80, 86, 91, 97 ]
+    },
+    537: {
+        evolution: 538,
+        evolvers: [ 117, 81, 92, 98, 103 ]
+    },
+    543: {
+        evolution: 544,
+        evolvers: [ 117, 86, 97, 102 ]
+    },
+    545: {
+        evolution: 546,
+        evolvers: [ 118, 266, 92, 303, 103 ]
+    },
+    547: {
+        evolution: 548,
+        evolvers: [ 118, 78, 78, 84, 84 ]
+    },
+    549: {
+        evolution: 550,
+        evolvers: [ 117, 82, 88, 99, 104 ]
+    },
+    553: {
+        evolution: 554,
+        evolvers: [ 118, 83, 97, 302, 102 ]
+    },
+    555: {
+        evolution: 556,
+        evolvers: [ 118, 83, 96, 301, 101 ]
+    },
+    557: {
+        evolution: 558,
+        evolvers: [ 118, 88, 94, 304, 104 ]
+    },
+    559: {
+        evolution: 560,
+        evolvers: [ 118, 83, 84, 300, 100 ]
+    },
+    561: {
+        evolution: 562,
+        evolvers: [ 118, 86, 266, 302, 267 ]
+    },
+    568: {
+        evolution: 569,
+        evolvers: [ 117, 83, 88, 93, 99 ]
+    },
+    570: {
+        evolution: 571,
+        evolvers: [ 170, 142, 184, 237, 572 ]
+    },
+    574: {
+        evolution: 575,
+        evolvers: [ 118, 88, 266, 304, 104 ]
+    },
+    577: {
+        evolution: 578,
+        evolvers: [ 118, 266, 95, 300, 267 ]
+    },
+    579: {
+        evolution: 580,
+        evolvers: [ 117, 85, 86, 96, 97 ]
+    },
+    585: {
+        evolution: 586,
+        evolvers: [ 116, 87, 92, 98 ]
+    },
+    587: {
+        evolution: 588,
+        evolvers: [ 117, 304 ]
+    },
+    589: {
+        evolution: 590,
+        evolvers: [ 116, 117, 79, 85 ]
+    },
+    596: {
+        evolution: 597,
+        evolvers: [ 117, 78, 84, 89, 95 ]
+    },
+    598: {
+        evolution: 599,
+        evolvers: [ 117, 82, 82, 88, 88 ]
+    },
+    600: {
+        evolution: 601,
+        evolvers: [ 117, 81, 87, 98, 103 ]
+    },
+    602: {
+        evolution: 603,
+        evolvers: [ 118, 266, 96, 301, 101 ]
+    },
+    604: {
+        evolution: 605,
+        evolvers: [ 117, 86, 97, 97, 302 ]
+    },
+    606: {
+        evolution: 607,
+        evolvers: [ 117, 80, 86, 97, 102 ]
+    },
+    612: {
+        evolution: 613,
+        evolvers: [ 91, 94, 97, 97, 302 ]
+    },
+    629: {
+        evolution: 739,
+        evolvers: [ 117, 82, 83, 99, 104 ]
+    },
+    630: {
+        evolution: [ 631, 736 ],
+        evolvers: [ [ 117, 90, 96, 301, 101 ], [ 118, 78, 94, 95, 100 ] ]
+    },
+    632: {
+        evolution: [ 633, 737 ],
+        evolvers: [ [ 117, 89, 95, 300, 100 ], [ 118, 79, 94, 96, 101 ] ]
+    },
+    634: {
+        evolution: 635,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
+    638: {
+        evolution: 639,
+        evolvers: [ 118, 83, 96, 301, 101 ]
+    },
+    640: {
+        evolution: 641,
+        evolvers: [ 118, 83, 86, 302, 102 ]
+    },
+    642: {
+        evolution: 643,
+        evolvers: [ 118, 92, 94, 303, 103 ]
+    },
+    644: {
+        evolution: 645,
+        evolvers: [ 118, 94, 99, 304, 104 ]
+    },
+    646: {
+        evolution: 647,
+        evolvers: [ 118, 84, 266, 95, 100 ]
+    },
+    648: {
+        evolution: 649,
+        evolvers: [ 118, 85, 266, 301, 267 ]
+    },
+    650: {
+        evolution: 651,
+        evolvers: [ 117, 83, 88, 93, 104 ]
+    },
+    652: {
+        evolution: 653,
+        evolvers: [ 116, 117, 80, 91, 97 ]
+    },
+    653: {
+        evolution: [ 654, 654 ],
+        evolvers: [ [ 118, 86, 266, 97, 102 ], [ 18 ] ]
+    },
+    655: {
+        evolution: 656,
+        evolvers: [ 117, 78, 84, 95, 100 ]
+    },
+    660: {
+        evolution: 661,
+        evolvers: [ 117, 85, 94, 96, 101 ]
+    },
+    663: {
+        evolution: 664,
+        evolvers: [ 117, 81, 87, 98, 103 ]
+    },
+    665: {
+        evolution: 666,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
+    668: {
+        evolution: 669,
+        evolvers: [ 118, 87, 266, 303, 267 ]
+    },
+    670: {
+        evolution: 671,
+        evolvers: [ 118, 83, 86, 302, 102 ]
+    },
+    672: {
+        evolution: 673,
+        evolvers: [ 118, 84, 94, 300, 100 ]
+    },
+    674: {
+        evolution: 675,
+        evolvers: [ 118, 83, 88, 304, 104 ]
+    },
+    676: {
+        evolution: 677,
+        evolvers: [ 94, 96, 96, 301, 301 ]
+    },
+    678: {
+        evolution: 679,
+        evolvers: [ 117, 87, 94, 303, 103 ]
+    },
+    680: {
+        evolution: 681,
+        evolvers: [ 117, 80, 86, 97, 302 ]
+    },
+    682: {
+        evolution: 683,
+        evolvers: [ 117, 81, 87, 98, 303 ]
+    },
+    684: {
+        evolution: 685,
+        evolvers: [ 117, 88, 93, 99, 304 ]
+    },
+    687: {
+        evolution: 688,
+        evolvers: [ 117, 78, 84, 95, 100 ]
+    },
+    689: {
+        evolution: 690,
+        evolvers: [ 117, 82, 88, 99, 104 ]
+    },
+    691: {
+        evolution: 696,
+        evolvers: [ 116, 97, 302 ]
+    },
+    692: {
+        evolution: 697,
+        evolvers: [ 116, 96, 301 ]
+    },
+    693: {
+        evolution: 698,
+        evolvers: [ 116, 98, 303 ]
+    },
+    694: {
+        evolution: 699,
+        evolvers: [ 116, 95, 300 ]
+    },
+    695: {
+        evolution: 700,
+        evolvers: [ 116, 99, 304 ]
+    },
+    706: {
+        evolution: 707,
+        evolvers: [ 117, 84, 89, 95, 100 ]
+    },
+    708: {
+        evolution: 709,
+        evolvers: [ 117, 81, 87, 303, 103 ]
+    },
+    710: {
+        evolution: 711,
+        evolvers: [ 117, 87, 94, 303, 103 ]
+    },
+    712: {
+        evolution: 713,
+        evolvers: [ 117, 90, 96, 301, 101 ]
+    },
+    715: {
+        evolution: 716,
+        evolvers: [ 116, 117, 81, 87 ]
+    },
+    717: {
+        evolution: 718,
+        evolvers: [ 118, 266, 99, 304, 267 ]
+    },
+    719: {
+        evolution: 720,
+        evolvers: [ 118, 86, 266, 102, 267 ]
+    },
+    721: {
+        evolution: 722,
+        evolvers: [ 117, 78, 89, 95 ]
+    },
+    723: {
+        evolution: 724,
+        evolvers: [ 117, 92, 98, 98, 103 ]
+    },
+    725: {
+        evolution: 726,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
+    728: {
+        evolution: 729,
+        evolvers: [ 117, 86, 91, 97, 302 ]
+    },
+    730: {
+        evolution: 731,
+        evolvers: [ 117, 88, 93, 99, 304 ]
+    },
+    732: {
+        evolution: 733,
+        evolvers: [ 116, 84, 95, 300 ]
+    },
+    734: {
+        evolution: 735,
+        evolvers: [ 116, 87, 98, 303 ]
+    },
+    740: {
+        evolution: 741,
+        evolvers: [ 117, 79, 90, 96 ]
+    },
+    742: {
+        evolution: 743,
+        evolvers: [ 117, 80, 86, 91, 97 ]
+    },
+    744: {
+        evolution: 745,
+        evolvers: [ 118, 85, 94, 301, 101 ]
+    },
+    747: {
+        evolution: 748,
+        evolvers: [ 118, 84, 266, 300, 267 ]
+    },
+    749: {
+        evolution: 750,
+        evolvers: [ 118, 83, 86, 302, 102 ]
+    },
+    751: {
+        evolution: 752,
+        evolvers: [ 118, 83, 85, 301, 101 ]
+    },
+    753: {
+        evolution: 754,
+        evolvers: [ 118, 94, 96, 301, 101 ]
+    },
+    755: {
+        evolution: 756,
+        evolvers: [ 118, 83, 88, 304, 104 ]
+    },
+    757: {
+        evolution: 758,
+        evolvers: [ 118, 87, 87, 303, 103 ]
+    },
+    759: {
+        evolution: 760,
+        evolvers: [ 118, 84, 84, 300, 100 ]
+    },
+    776: {
+        evolution: 777,
+        evolvers: [ 116, 117, 81, 87, 103 ]
+    },
+    778: {
+        evolution: 779,
+        evolvers: [ 117, 85, 94, 96, 301 ]
+    },
+    780: {
+        evolution: 781,
+        evolvers: [ 118, 84, 94, 300, 100 ]
+    },
+    782: {
+        evolution: 783,
+        evolvers: [ 117, 93, 94, 304, 104 ]
+    },
+    784: {
+        evolution: 785,
+        evolvers: [ 116, 89, 95 ]
+    },
+    786: {
+        evolution: 787,
+        evolvers: [ 116, 81, 87 ]
+    },
+    788: {
+        evolution: 789,
+        evolvers: [ 116, 80, 86 ]
+    },
+    790: {
+        evolution: 791,
+        evolvers: [ 89, 90, 91 ]
+    },
+    792: {
+        evolution: 793,
+        evolvers: [ 116, 117, 99 ]
+    },
+    794: {
+        evolution: 795,
+        evolvers: [ 118, 88, 266, 304, 104 ]
+    },
+    796: {
+        evolution: 797,
+        evolvers: [ 117, 82, 88, 99, 104 ]
+    },
+    801: {
+        evolution: 802,
+        evolvers: [ 87, 94, 98, 303, 103 ]
+    },
+    803: {
+        evolution: 804,
+        evolvers: [ 117, 80, 86, 302, 102 ]
+    },
+    805: {
+        evolution: 806,
+        evolvers: [ 118, 83, 88, 99, 304 ]
+    },
+    807: {
+        evolution: 808,
+        evolvers: [ 117, 87, 92, 98, 103 ]
+    },
+    809: {
+        evolution: [ 810, 810 ],
+        evolvers: [ [ 116, 78, 84, 89, 95 ], [ 404 ] ]
+    },
+    815: {
+        evolution: [ 816, 894 ],
+        evolvers: [ [ 117, 88, 94, 304, 104 ], [ 117, 88, 94, 99, 104 ] ]
+    },
     828: {
         evolution: 829,
         evolvers: [ 115, 116, 117, 118 ]
     },
-	830: {
-		evolution: 831,
-		evolvers: [ 118, 86, 94, 302, 102 ]
-	},
-	832: {
-		evolution: 833,
-		evolvers: [ 117, 89, 95, 300, 100 ]
-	},
-	835: {
-		evolution: 836,
-		evolvers: [ 118, 84, 266, 300, 100 ]
-	},
-	837: {
-		evolution: 838,
-		evolvers: [ 83, 86, 97, 302, 102 ]
-	},
-	839: {
-		evolution: 840,
-		evolvers: [ 118, 88, 266, 304, 104 ]
-	},
-	841: {
-		evolution: 842,
-		evolvers: [ 118, 83, 87, 303, 103 ]
-	},
-	843: {
-		evolution: 844,
-		evolvers: [ 118, 84, 95, 300, 100 ]
-	},
-	845: {
-		evolution: 846,
-		evolvers: [ 118, 85, 94, 301, 101 ]
-	},
-	847: {
-		evolution: 848,
-		evolvers: [ 117, 80, 86, 97, 102 ]
-	},
-	851: {
-		evolution: 852,
-		evolvers: [ 117, 78, 85, 95, 101 ]
-	},
-	855: {
-		evolution: 856,
-		evolvers: [ 117, 86, 94, 97, 102 ]
-	},
-	857: {
-		evolution: 858,
-		evolvers: [ 117, 98, 98, 303, 303 ]
-	},
-	859: {
-		evolution: 860,
-		evolvers: [ 117, 87, 98, 98, 303 ]
-	},
-	861: {
-		evolution: 862,
-		evolvers: [ 117, 79, 85, 301, 101 ]
-	},
-	864: {
-		evolution: 865,
-		evolvers: [ 118, 87, 266, 303, 103 ]
-	},
-	869: {
-		evolution: 870,
-		evolvers: [ 118, 85, 266, 301, 267 ]
-	},
-	871: {
-		evolution: 872,
-		evolvers: [ 83, 85, 96, 301, 101 ]
-	},
-	873: {
-		evolution: 874,
-		evolvers: [ 118, 87, 94, 303, 103 ]
-	},
-	875: {
-		evolution: 876,
-		evolvers: [ 118, 88, 99, 304, 104 ]
-	},
-	877: {
-		evolution: 878,
-		evolvers: [ 86, 266, 91, 97, 102 ]
-	},
-	879: {
-		evolution: 880,
-		evolvers: [ 118, 83, 84, 300, 100 ]
-	},
-	881: {
-		evolution: 882,
-		evolvers: [ 118, 85, 94, 301, 101 ]
-	},
-	883: {
-		evolution: 884,
-		evolvers: [ 117, 88, 93, 99, 104 ]
-	},
-	889: {
-		evolution: 890,
-		evolvers: [ 117, 80, 86, 97, 302 ]
-	},
-	895: {
-		evolution: 896,
-		evolvers: [ 117, 86, 91, 97, 102 ]
-	},
-	900: {
-		evolution: 901,
-		evolvers: [ 118, 86, 94, 302, 102 ]
-	},
-	902: {
-		evolution: 903,
-		evolvers: [ 117, 87, 92, 98, 103 ]
-	},
-	905: {
-		evolution: 906,
-		evolvers: [ 118, 83, 84, 300, 100 ]
-	},
-	907: {
-		evolution: 908,
-		evolvers: [ 88, 266, 94, 304, 104 ]
-	},
-	909: {
-		evolution: 910,
-		evolvers: [ 118, 83, 87, 98, 103 ]
-	},
-	911: {
-		evolution: 912,
-		evolvers: [ 118, 86, 266, 97, 102 ]
-	},
-	913: {
-		evolution: 914,
-		evolvers: [ 85, 94, 94, 301, 101 ]
-	},
-	915: {
-		evolution: 916,
-		evolvers: [ 84, 85, 86, 87, 88 ]
-	},
-	917: {
-		evolution: 918,
-		evolvers: [ 117, 79, 85, 96, 101 ]
-	},
+    830: {
+        evolution: 831,
+        evolvers: [ 118, 86, 94, 302, 102 ]
+    },
+    832: {
+        evolution: 833,
+        evolvers: [ 117, 89, 95, 300, 100 ]
+    },
+    835: {
+        evolution: 836,
+        evolvers: [ 118, 84, 266, 300, 100 ]
+    },
+    837: {
+        evolution: 838,
+        evolvers: [ 83, 86, 97, 302, 102 ]
+    },
+    839: {
+        evolution: 840,
+        evolvers: [ 118, 88, 266, 304, 104 ]
+    },
+    841: {
+        evolution: 842,
+        evolvers: [ 118, 83, 87, 303, 103 ]
+    },
+    843: {
+        evolution: 844,
+        evolvers: [ 118, 84, 95, 300, 100 ]
+    },
+    845: {
+        evolution: 846,
+        evolvers: [ 118, 85, 94, 301, 101 ]
+    },
+    847: {
+        evolution: 848,
+        evolvers: [ 117, 80, 86, 97, 102 ]
+    },
+    851: {
+        evolution: 852,
+        evolvers: [ 117, 78, 85, 95, 101 ]
+    },
+    855: {
+        evolution: 856,
+        evolvers: [ 117, 86, 94, 97, 102 ]
+    },
+    857: {
+        evolution: 858,
+        evolvers: [ 117, 98, 98, 303, 303 ]
+    },
+    859: {
+        evolution: 860,
+        evolvers: [ 117, 87, 98, 98, 303 ]
+    },
+    861: {
+        evolution: 862,
+        evolvers: [ 117, 79, 85, 301, 101 ]
+    },
+    864: {
+        evolution: 865,
+        evolvers: [ 118, 87, 266, 303, 103 ]
+    },
+    869: {
+        evolution: 870,
+        evolvers: [ 118, 85, 266, 301, 267 ]
+    },
+    871: {
+        evolution: 872,
+        evolvers: [ 83, 85, 96, 301, 101 ]
+    },
+    873: {
+        evolution: 874,
+        evolvers: [ 118, 87, 94, 303, 103 ]
+    },
+    875: {
+        evolution: 876,
+        evolvers: [ 118, 88, 99, 304, 104 ]
+    },
+    877: {
+        evolution: 878,
+        evolvers: [ 86, 266, 91, 97, 102 ]
+    },
+    879: {
+        evolution: 880,
+        evolvers: [ 118, 83, 84, 300, 100 ]
+    },
+    881: {
+        evolution: 882,
+        evolvers: [ 118, 85, 94, 301, 101 ]
+    },
+    883: {
+        evolution: 884,
+        evolvers: [ 117, 88, 93, 99, 104 ]
+    },
+    889: {
+        evolution: 890,
+        evolvers: [ 117, 80, 86, 97, 302 ]
+    },
+    895: {
+        evolution: 896,
+        evolvers: [ 117, 86, 91, 97, 102 ]
+    },
+    900: {
+        evolution: 901,
+        evolvers: [ 118, 86, 94, 302, 102 ]
+    },
+    902: {
+        evolution: 903,
+        evolvers: [ 117, 87, 92, 98, 103 ]
+    },
+    905: {
+        evolution: 906,
+        evolvers: [ 118, 83, 84, 300, 100 ]
+    },
+    907: {
+        evolution: 908,
+        evolvers: [ 88, 266, 94, 304, 104 ]
+    },
+    909: {
+        evolution: 910,
+        evolvers: [ 118, 83, 87, 98, 103 ]
+    },
+    911: {
+        evolution: 912,
+        evolvers: [ 118, 86, 266, 97, 102 ]
+    },
+    913: {
+        evolution: 914,
+        evolvers: [ 85, 94, 94, 301, 101 ]
+    },
+    915: {
+        evolution: 916,
+        evolvers: [ 84, 85, 86, 87, 88 ]
+    },
+    917: {
+        evolution: 918,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
     921: {
         evolution: 922,
         evolvers: [ 84 , 85, 86 , 87 , 88]
@@ -1411,13 +1411,13 @@ window.evolutions = {
         evolution: 926,
         evolvers: [ 117 , 85, 90 , 96 , 101]
     },
-	928: {
+    928: {
         evolution: 929,
         evolvers: [ 117, 80, 86, 97, 102 ]
     },
     932: {
         evolution: 933,
-		evolvers: [ 118, 87, 266, 303, 103 ]
+        evolvers: [ 118, 87, 266, 303, 103 ]
     },
     934: {
         evolution: 935,
@@ -1451,10 +1451,10 @@ window.evolutions = {
         evolution: 953,
         evolvers: [ 116, 117, 80, 86, 97 ]
     },
-	973: {
-		evolution: [ 974, 974, 974, 974, 974 ],
-		evolvers: [ [ 117, 971 ], [ 87, 968], [ 98, 970], [ 87, 969], [ 117, 972] ]
-	},
+    973: {
+        evolution: [ 974, 974, 974, 974, 974 ],
+        evolvers: [ [ 117, 971 ], [ 87, 968], [ 98, 970], [ 87, 969], [ 117, 972] ]
+    },
     975: {
         evolution: 976,
         evolvers: [ 117, 80, 91, 97 ]
@@ -1495,18 +1495,18 @@ window.evolutions = {
         evolution: 1001,
         evolvers: [ 118, 86, 266, 302, 267 ]
     },
-	1002: {
-		evolution: 1003,
-		evolvers: [ 117, 78, 84, 95, 100 ]
-	},
-	1005: {
-		evolution: 1006,
-		evolvers: [ 116, 84, 89, 95, 100 ]
-	},
-	1007: {
-		evolution: 1008,
-		evolvers: [ 117, 85, 87, 96, 98 ]
-	},
+    1002: {
+        evolution: 1003,
+        evolvers: [ 117, 78, 84, 95, 100 ]
+    },
+    1005: {
+        evolution: 1006,
+        evolvers: [ 116, 84, 89, 95, 100 ]
+    },
+    1007: {
+        evolution: 1008,
+        evolvers: [ 117, 85, 87, 96, 98 ]
+    },
     1010: {
         evolution: 1011,
         evolvers: [ 116, 82, 88, 93, 104 ]
@@ -1515,38 +1515,38 @@ window.evolutions = {
         evolution: 1016,
         evolvers: [ 82, 266, 88, 304, 104 ]
     },
-	1017: {
-		evolution: 1018,
+    1017: {
+        evolution: 1018,
         evolvers: [ 117, 81, 87, 98, 103 ]
-	},
-	1020: {
-		evolution: 1021,
+    },
+    1020: {
+        evolution: 1021,
         evolvers: [ 117, 85, 88, 96, 99 ]
-	},
-	1024: {
-		evolution: 1025,
+    },
+    1024: {
+        evolution: 1025,
         evolvers: [ 88, 266, 94, 100, 104 ]
-	},
-	1026: {
-		evolution: 1027,
+    },
+    1026: {
+        evolution: 1027,
         evolvers: [ 85, 96, 301, 301, 101 ]
-	},
-	1028: {
-		evolution: 1029,
+    },
+    1028: {
+        evolution: 1029,
         evolvers: [ 118, 84, 86, 100, 102 ]
-	},
-	1030: {
-		evolution: 1031,
+    },
+    1030: {
+        evolution: 1031,
         evolvers: [ 83, 87, 98, 303, 103 ]
-	},
-	1032: {
-		evolution: 1033,
+    },
+    1032: {
+        evolution: 1033,
         evolvers: [ 118, 84, 87, 300, 303 ]
-	},
-	1034: {
-		evolution: 1035,
+    },
+    1034: {
+        evolution: 1035,
         evolvers: [ 118, 84, 266, 300, 267]
-	},
+    },
     1036: {
         evolution: 1037,
         evolvers: [ 117, 79, 85, 96, 101]
@@ -1680,17 +1680,17 @@ window.evolutions = {
         evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1114: {
-		evolution: 1115,
-		evolvers: [ 118, 84, 95, 94, 100 ]
-	},
-	1116: {
-		evolution: 1117,
-		evolvers: [ 118, 83, 88, 94, 104 ]
-	},
-	1118: {
-		evolution: 1119,
-		evolvers: [ 118, 85, 96, 301, 101 ]
-	},
+        evolution: 1115,
+        evolvers: [ 118, 84, 95, 94, 100 ]
+    },
+    1116: {
+        evolution: 1117,
+        evolvers: [ 118, 83, 88, 94, 104 ]
+    },
+    1118: {
+        evolution: 1119,
+        evolvers: [ 118, 85, 96, 301, 101 ]
+    },
     1120: {
         evolution: 1121,
         evolvers: [ 118, 266, 95, 300, 267 ]
@@ -1832,135 +1832,135 @@ window.evolutions = {
         evolvers: [ 116, 117, 90, 96, 101 ]
     },
     1207: {
-		evolution: 1208,
-		evolvers: [ 118, 88, 94, 304, 104 ]
-	},
+        evolution: 1208,
+        evolvers: [ 118, 88, 94, 304, 104 ]
+    },
     1209: {
-		evolution: 1210,
-		evolvers: [ 118, 83, 96, 301, 101 ]
-	},
-	1211: {
-		evolution: 1212,
-		evolvers: [ 118, 83, 84, 300, 100 ]
-	},
+        evolution: 1210,
+        evolvers: [ 118, 83, 96, 301, 101 ]
+    },
+    1211: {
+        evolution: 1212,
+        evolvers: [ 118, 83, 84, 300, 100 ]
+    },
     1213: {
-		evolution: 1214,
-		evolvers: [ 117, 78, 98, 95, 100 ]
-	},
+        evolution: 1214,
+        evolvers: [ 117, 78, 98, 95, 100 ]
+    },
     1219: {
-		evolution: 1220,
-		evolvers: [ 118, 88, 84, 304, 104 ]
-	},
+        evolution: 1220,
+        evolvers: [ 118, 88, 84, 304, 104 ]
+    },
     1221: {
-		evolution: 1222,
-		evolvers: [ 83, 84, 89, 95, 300 ]
-	},
+        evolution: 1222,
+        evolvers: [ 83, 84, 89, 95, 300 ]
+    },
     1229: {
         evolution: 1230,
-		evolvers: [ 98, 99, 300, 303, 304 ]
+        evolvers: [ 98, 99, 300, 303, 304 ]
     },
     1231: {
         evolution: 1232,
-		evolvers: [ 118, 83, 86, 302, 102 ]
+        evolvers: [ 118, 83, 86, 302, 102 ]
     },
     1233: {
         evolution: 1234,
-		evolvers: [ 118, 83, 85, 301, 101 ]
+        evolvers: [ 118, 83, 85, 301, 101 ]
     },
     1235: {
         evolution: 1236,
-		evolvers: [ 266, 94, 98, 303, 103 ]
+        evolvers: [ 266, 94, 98, 303, 103 ]
     },
     1237: {
         evolution: 1238,
-		evolvers: [ 84, 89, 94, 95, 100 ]
+        evolvers: [ 84, 89, 94, 95, 100 ]
     },
     1239: {
         evolution: 1240,
-		evolvers: [ 118, 266, 98, 303, 267 ]
+        evolvers: [ 118, 266, 98, 303, 267 ]
     },
     1241: {
         evolution: 1242,
-		evolvers: [ 116, 117, 78, 84, 100 ]
+        evolvers: [ 116, 117, 78, 84, 100 ]
     },
     1243: {
         evolution: 1244,
-		evolvers: [ 116, 117, 93, 99, 104 ]
+        evolvers: [ 116, 117, 93, 99, 104 ]
     },
     1246: {
         evolution: 1247,
-		evolvers: [ 118, 84, 94, 95, 100 ]
+        evolvers: [ 118, 84, 94, 95, 100 ]
     },
     1248: {
         evolution: 1249,
-		evolvers: [ 117, 80, 86, 97, 102 ]
+        evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1250: {
         evolution: 1251,
-		evolvers: [ 118, 85, 87, 301, 101 ]
+        evolvers: [ 118, 85, 87, 301, 101 ]
     },
     1257: {
         evolution: 1258,
-		evolvers: [ 118, 87, 266, 98, 267 ]
+        evolvers: [ 118, 87, 266, 98, 267 ]
     },
     1259: {
         evolution: 1260,
-		evolvers: [ 300, 301, 302, 303, 304 ]
+        evolvers: [ 300, 301, 302, 303, 304 ]
     },
     1261: {
         evolution: 1262,
-		evolvers: [ 266, 88, 88, 88, 88 ]
+        evolvers: [ 266, 88, 88, 88, 88 ]
     },
     1263: {
         evolution: 1264,
-		evolvers: [ 96, 99, 101, 104 ]
+        evolvers: [ 96, 99, 101, 104 ]
     },
     1265: {
         evolution: 1266,
-		evolvers: [  ]
+        evolvers: [  ]
     },
     1267: {
         evolution: 1268,
-		evolvers: [ 266, 302, 304, 102, 267 ]
+        evolvers: [ 266, 302, 304, 102, 267 ]
     },
     1269: {
         evolution: 1270,
-		evolvers: [ 83, 86, 94, 97, 302 ]
+        evolvers: [ 83, 86, 94, 97, 302 ]
     },
     1271: {
         evolution: 1272,
-		evolvers: [ 85, 94, 96, 301, 101 ]
+        evolvers: [ 85, 94, 96, 301, 101 ]
     },
     1273: {
         evolution: 1274,
-		evolvers: [ 118, 118, 78, 78, 100 ]
+        evolvers: [ 118, 118, 78, 78, 100 ]
     },
     1275: {
         evolution: 1276,
-		evolvers: [ 118, 88, 99, 304, 104 ]
+        evolvers: [ 118, 88, 99, 304, 104 ]
     },
     1277: {
         evolution: 1278,
-		evolvers: [ 118, 87, 98, 303, 103 ]
+        evolvers: [ 118, 87, 98, 303, 103 ]
     },
     1284: {
         evolution: 1285,
-		evolvers: [ 95, 96, 97, 303, 304 ]
+        evolvers: [ 95, 96, 97, 303, 304 ]
     },
     1286: {
         evolution: 1287,
-		evolvers: [ 116, 117, 81, 98 ]
+        evolvers: [ 116, 117, 81, 98 ]
     },
     1288: {
         evolution: 1289,
-		evolvers: [ 116, 117, 80, 97 ]
+        evolvers: [ 116, 117, 80, 97 ]
     },
     1291: {
         evolution: 1292,
-		evolvers: [  ]
+        evolvers: [  ]
     },
     1293: {
         evolution: 1294,
-		evolvers: [  ]
+        evolvers: [  ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 115a31594..327596399 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1,924 +1,924 @@
 window.families = [
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Roronoa Zoro",
-	"Roronoa Zoro",
-	"Roronoa Zoro",
-	"Roronoa Zoro",
-	"Nami",
-	"Nami",
-	"Nami",
-	"Nami",
-	"Usopp",
-	"Usopp",
-	"Usopp",
-	"Usopp",
-	"Sanji",
-	"Sanji",
-	"Sanji",
-	"Sanji",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Higuma",
-	"Master of the Near Sea",
-	"Alvida",
-	"Alvida",
-	"Coby",
-	"Coby",
-	"Helmeppo",
-	"Helmeppo",
-	"Morgan",
-	"Mohji & Richie",
-	"Cabaji",
-	"Buggy",
-	"Buggy",
-	"Gaimon",
-	"Siam",
-	"Butchie",
-	"Django",
-	"Django",
-	"Kuro",
-	"Kuro",
-	"Yosaku",
-	"Johnny",
-	"Fullbody",
-	"Patty",
-	"Carne",
-	"Zeff",
-	"Gin",
-	"Gin",
-	"Pearl",
-	"Pearl",
-	"Don Krieg",
-	"Don Krieg",
-	"Nezumi",
-	"Momoo",
-	"Choo",
-	"Kuroobi",
-	"Hachi",
-	"Hachi",
-	"Arlong",
-	"Arlong",
-	"Tashigi",
-	"Tashigi",
-	"Smoker",
-	"Smoker",
-	"Nefertari Vivi",
-	"Nefertari Vivi",
-	"Nefertari Vivi",
-	"Portgas D. Ace",
-	"Portgas D. Ace",
-	"Shanks",
-	"Shanks",
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	"Sword Bandit",
-	"Pistol Bandit",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Cannoneer",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Cannoneer",
-	"Bodyguard",
-	"Bodyguard",
-	"Black Cat Pirates",
-	"Black Cat Pirates",
-	"Black Cat Pirates",
-	"Black Cat Pirates",
-	"Black Cat Pirates",
-	"Fighter Group Leader",
-	"Slasher Group Leader",
-	"Striker Group Leader",
-	"Shooter Group Leader",
-	"Assassin Master",
-	"Arlong Crewmember",
-	"Arlong Crewmember",
-	"Arlong Crewmember",
-	"Arlong Crewmember",
-	"Knuckle Navy",
-	"Saber Navy",
-	"Halberd Navy",
-	"Pistol Navy",
-	"Cannoneer Navy",
-	"Knuckle Navy",
-	"Saber Navy",
-	"Halberd Navy",
-	"Pistol Navy",
-	"Cannoneer Navy",
-	null,
-	null,
-	null,
-	null,
-	null,
-	"Knuckle Navy",
-	"Saber Navy",
-	"Halberd Navy",
-	"Pistol Navy",
-	"Cannoneer Navy",
-	"Mr. 5",
-	"Mr. 5",
-	"Miss Valentine",
-	"Miss Valentine",
-	"Galdino",
-	"Galdino",
-	"Miss Goldenweek",
-	"Miss Goldenweek",
-	"Bentham",
-	"Bentham",
-	"Nico Robin",
-	"Nico Robin",
-	"Mr. 9",
-	"Mr. 9",
-	"Laboon",
-	"Laboon",
-	"Neptunian Squid",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Roronoa Zoro",
-	"Roronoa Zoro",
-	"Nami",
-	"Nami",
-	"Usopp",
-	"Usopp",
-	"Sanji",
-	"Sanji",
-	"Dracule Mihawk",
-	"Dracule Mihawk",
-	"Morgan",
-	"Django",
-	"Fullbody",
-	"Hina",
-	"Hina",
-	"Mr. 8",
-	"Mr. 8",
-	"Misss Monday",
-	"Misss Monday",
-	"Knuckle Baroque Works",
-	"Saber Baroque Works",
-	"Halberd Baroque Works",
-	"Pistol Baroque Works",
-	"Bazooka Baroque Works",
-	"Knuckle Baroque Works",
-	"Saber Baroque Works",
-	"Halberd Baroque Works",
-	"Pistol Baroque Works",
-	"Bazooka Baroque Works",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Marco",
-	"Marco",
-	"Jozu",
-	"Jozu",
-	"Vista",
-	"Vista",
-	"Izo",
-	"Izo",
-	"Blamenco",
-	"Blamenco",
-	"Whitebeard",
-	"Whitebeard",
-	"Coby",
-	"Coby",
-	"Helmeppo",
-	"Helmeppo",
-	null,
-	null,
-	"Smoker",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Fighter Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Slasher Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Striker Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Shooter Group Crew Pirates",
-	"Cannoneer",
-	"Mr. 13",
-	"Dorry",
-	"Broggy",
-	"Triceratops",
-	"Rex",
-	"Brontosaurus",
-	"Tsuru",
-	"Tsuru",
-	"Momonga",
-	"Onigumo",
-	null,
-	null,
-	null,
-	null,
-	null,
-	"Monkey D. Garp",
-	"Monkey D. Garp",
-	"Trafalgar Law",
-	"Trafalgar Law",
-	"Basil Hawkins",
-	"Basil Hawkins",
-	"Killer",
-	"Killer",
-	"Urouge",
-	"Urouge",
-	"Bepo",
-	"Bepo",
-	"Kalifa",
-	"Kalifa",
-	"Paulie",
-	"Paulie",
-	"Rob Lucci",
-	"Rob Lucci",
-	"Kaku",
-	"Kaku",
-	"Lulu",
-	"Wapol",
-	"Wapol",
-	"Dalton",
-	"Dalton",
-	"Chessmarimo",
-	"Chessmarimo",
-	"Chessmarimo",
-	"Dr. Kureha",
-	"Lapin",
-	"Lapin",
-	"Franky",
-	"Franky",
-	"Kiwi & Mozu",
-	"Kiwi & Mozu",
-	"Surume",
-	"Surume",
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	null,
-	"Zephyr",
-	"Zephyr",
-	"Ain",
-	"Ain",
-	"Eustass Kid",
-	"Eustass Kid",
-	"Scratchmen Apoo",
-	"Scratchmen Apoo",
-	"X Drake",
-	"X Drake",
-	"Jewelry Bonney",
-	"Jewelry Bonney",
-	"Capone Bege",
-	"Capone Bege",
-	"Silvers Rayleigh",
-	"Silvers Rayleigh",
-	"Giant Red Pirates",
-	"Giant Blue Pirates",
-	"Giant Green Pirates",
-	"Giant Yellow Pirates",
-	"Giant Black Pirates",
-	"Giant Red Pirates",
-	"Giant Blue Pirates",
-	"Giant Green Pirates",
-	"Giant Yellow Pirates",
-	"Giant Black Pirates",
-	"Sea Cat",
-	"Dugong",
-	"Dugong",
-	"Banana Gator",
-	"Sandora Dragon",
-	"Crocodile",
-	"Crocodile",
-	"Hogback",
-	"Hogback",
-	"Cindry",
-	"Cindry",
-	"Emporio Ivankov",
-	"Emporio Ivankov",
-	"Perona",
-	"Perona",
-	"Kumacy",
-	"Dog Penguin",
-	"Miss Merry Christmas",
-	"Miss Merry Christmas",
-	"Mr. 4",
-	"Mr. 4",
-	"Miss Doublefinger",
-	"Miss Doublefinger",
-	"Daz Bones",
-	"Daz Bones",
-	"Rebecca",
-	"Absalom",
-	"Absalom",
-	"General Zombie",
-	"Jigoro of the Wind",
-	"Crocodile",
-	"Jimbe",
-	"Jimbe",
-	"Bartholomew Kuma",
-	"Bartholomew Kuma",
-	"Gecko Moria",
-	"Gecko Moria",
-	"Boa Hancock",
-	"Boa Hancock",
-	"Donquixote Doflamingo",
-	"Donquixote Doflamingo",
-	"Sanji",
-	"Monkey D. Luffy",
-	"Roronoa Zoro",
-	"Nami",
-	"Brook",
-	"Brook",
-	"Ryuuma",
-	"Masira",
-	"Shoujou",
-	"Montblanc Cricket",
-	"South Bird and Forest Residents",
-	"Bellamy",
-	"Bellamy",
-	"Sarquiss",
-	"Elizabeth",
-	"Caroline",
-	"Sanji",
-	"Sanji",
-	"Perona",
-	"Perona",
-	"Nefertari Vivi",
-	"Nefertari Vivi",
-	"Duck Squadron",
-	"Duck Squadron",
-	"Duck Squadron",
-	"Duck Squadron",
-	"Duck Squadron",
-	"Blackbeard",
-	"Blackbeard",
-	"Thatch",
-	"Thatch",
-	"Namule",
-	"Namule",
-	"Rakuyo",
-	"Rakuyo",
-	"Fossa",
-	"Fossa",
-	"Curiel",
-	"Curiel",
-	"Sengoku",
-	"Sengoku",
-	"Galdino",
-	"Bentham",
-	"Bentham",
-	"Satori",
-	"Shura",
-	"Gedatsu",
-	"Braham",
-	"Yama",
-	"Yellow Skypiea Guard",
-	"Black Skypiea Guard",
-	"Yellow Skypiea Guard",
-	"Black Skypiea Guard",
-	"Red Skypiea Guard Enforcer",
-	"Blue Skypiea Guard Enforcer",
-	"Green Skypiea Guard Enforcer",
-	"Yellow Skypiea Guard Enforcer",
-	"Black Skypiea Guard Enforcer",
-	"Red Skypiea Enforcer",
-	"Blue Skypiea Enforcer",
-	"Green Skypiea Enforcer",
-	"Yellow Skypiea Enforcer",
-	"Black Skypiea Enforcer",
-	"Red Skypiea Enforcer",
-	"Blue Skypiea Enforcer",
-	"Green Skypiea Enforcer",
-	"Yellow Skypiea Enforcer",
-	"Black Skypiea Enforcer",
-	"Red Shandian Warrior",
-	"Blue Shandian Warrior",
-	"Green Shandian Warrior",
-	"Red Shandian Warrior",
-	"Blue Shandian Warrior",
-	"Green Shandian Warrior",
-	"Yellow Shandian Warrior",
-	"Black Shandian Warrior",
-	"Yellow Shandian Warrior",
-	"Black Shandian Warrior",
-	"Portgas D. Ace",
-	"Portgas D. Ace",
-	"Bellmere",
-	"Bellmere",
-	"Kaya",
-	"Kaya",
-	"Hotori and Kotori",
-	"Hotori and Kotori",
-	"Pell",
-	"Pell",
-	"Chaka",
-	"Chaka",
-	"Crocodile",
-	"Crocodile",
-	"Daz Bones",
-	"Sabo",
-	"Sabo",
-	"Nico Robin",
-	"Heracles'n",
-	"Heracles'n",
-	"Usopp",
-	"Usopp",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Sanji",
-	"Sanji",
-	"Nami",
-	"Nami",
-	"Brook",
-	"Brook",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Shanks",
-	"Shanks",
-	"Nico Robin",
-	"Nico Robin",
-	"Brook",
-	"Brook",
-	"Nami",
-	"Nami",
-	"Domino",
-	"Domino",
-	"Minorhinoceros",
-	"Basilisk",
-	"Ohm",
-	"Nola Giant Snake",
-	"Wyper",
-	"Wyper",
-	"Eneru",
-	"Eneru",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Sadi-chan",
-	"Sadi-chan",
-	"Minokoala",
-	"Manticore",
-	"Roronoa Zoro",
-	"Roronoa Zoro",
-	"Usopp",
-	"Usopp",
-	"Nico Robin",
-	"Nico Robin",
-	"Franky",
-	"Franky",
-	"Portgas D. Ace",
-	"Portgas D. Ace",
-	"Porche",
-	"Capote",
-	"Hamburg",
-	"Pickles",
-	"Big Bun",
-	"Foxy",
-	"Foxy",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Usopp",
-	"Tony Tony Chopper",
-	"Aokiji",
-	"Aokiji",
-	"Nami",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Roronoa Zoro",
-	"Roronoa Zoro",
-	"Genbou",
-	"Kamakiri",
-	"Raki",
-	"Aisa",
-	"Nojiko",
-	"Nojiko",
-	"Crocus",
-	"Crocus",
-	"Koza",
-	"Koza",
-	null,
-	null,
-	null,
-	null,
-	null,
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Buggy",
-	"Buggy",
-	"Shanks",
-	"Shanks",
-	"Eneru",
-	"Eneru",
-	"Sanji",
-	"Sanji",
-	"Zeff",
-	"Zeff",
-	"Patty",
-	"Carne",
-	"Hiking Bear",
-	"Purinpurin",
-	"Brook",
-	"Brook",
-	"Zanbai",
-	"Superhuman Destroyers",
-	"Superhuman Destroyers",
-	"Superhuman Destroyers",
-	"Street Punk Brawler",
-	"Street Punk Brawler",
-	"Street Punk Blade",
-	"Street Punk Blade",
-	"Street Punk Bullet",
-	"Street Punk Bullet",
-	"Street Punk Nails",
-	"Street Punk Nails",
-	"Street Punk Gatling",
-	"Street Punk Gatling",
-	"Tilestone",
-	"Franky",
-	"Kaku",
-	"Kaku",
-	"Rob Lucci",
-	"Rob Lucci",
-	"Keimi",
-	"Keimi",
-	"Pappug",
-	"Hachi",
-	"Doma",
-	"Doma",
-	"Decalvan Brothers",
-	"Decalvan Brothers",
-	"Squard",
-	"Squard",
-	"Whitey Bay",
-	"Whitey Bay",
-	"Little Oars Jr.",
-	"Little Oars Jr.",
-	"Marco",
-	"Marco",
-	"Nami",
-	"Nami",
-	"Duval",
-	"Duval",
-	"Duval",
-	"Arlong",
-	"Arlong",
-	"Kuroobi",
-	"Choo",
-	"Monkey D. Luffy",
-	"Usopp",
-	"Usopp",
-	"Nami",
-	"Nefertari Vivi",
-	"Nefertari Vivi",
-	"Koza",
-	"Koza",
-	"Nefertari Cobra",
-	"Sabo",
-	"Sabo",
-	"Koala",
-	"Koala",
-	"Hack",
-	"Hack",
-	"Emporio Ivankov",
-	"Emporio Ivankov",
-	"Inazuma",
-	"Inazuma",
-	"Nico Robin",
-	"Nico Robin",
-	"Nami",
-	"Nami",
-	"Nico Robin",
-	"Nico Robin",
-	"Perona",
-	"Perona",
-	"Nefertari Vivi",
-	"Calgara",
-	"Calgara",
-	"Montblanc Noland",
-	"Montblanc Noland",
-	"Halberd Coporal Navy",
-	"Pistol Coporal Navy",
-	"Saber Coporal Navy",
-	"Bazooka Coporal Navy",
-	"Knuckle Coporal Navy",
-	"Halberd Coporal Navy",
-	"Pistol Coporal Navy",
-	"Saber Coporal Navy",
-	"Bazooka Coporal Navy",
-	"Knuckle Coporal Navy",
-	"Oimo",
-	"Kashi",
-	"Watchdog Unit of the Law",
-	"Just Juryman",
-	"Three-Headed Baskerville",
-	"Blueno",
-	"Blueno",
-	"Nico Robin",
-	"Nico Robin",
-	"Franky",
-	"Franky",
-	"Gan Fall",
-	"Gan Fall",
-	"Pierre",
-	"Konis",
-	"Konis",
-	"Dracule Mihawk",
-	"Dracule Mihawk",
-	"Crocodile",
-	"Crocodile",
-	"Jerry",
-	"Jerry",
-	"T-Bone",
-	"T-Bone",
-	"Nefertari Vivi",
-	"Nefertari Vivi",
-	"Monkey D. Luffy",
-	"Kalifa",
-	"Kalifa",
-	"Jabra",
-	"Jabra",
-	"Fukuro",
-	"Fukuro",
-	"Kumadori",
-	"Kumadori",
-	"Kaku",
-	"Rob Lucci",
-	"Spandam",
-	"Franky",
-	"Nero",
-	"Nero",
-	"Wanze",
-	"Wanze",
-	"Portgas D. Ace",
-	"Portgas D. Ace",
-	"Princess Shirahoshi",
-	"Rob Lucci",
-	"Rob Lucci",
-	"Kaku",
-	"Kaku",
-	"Kalifa",
-	"Kalifa",
-	"Jabra",
-	"Jabra",
-	"Blueno",
-	"Blueno",
-	"Fukuro",
-	"Fukuro",
-	"Kumadori",
-	"Kumadori",
-	"Monkey D. Luffy",
-	"Usopp",
-	"Franky",
-	"Nami",
-	"Tony Tony Chopper",
-	"Roronoa Zoro",
-	"Nico Robin",
-	"Sanji",
-	"Brook",
-	"Dalmatian",
-	"Momonga",
-	"Onigumo",
-	"Shu",
-	"Very Good",
-	"Strawberry",
-	"Lucky Roo",
-	"Lucky Roo",
-	"Rebecca",
-	"Rebecca",
-	"Urouge",
-	"Urouge",
-	"Tashigi",
-	"Tashigi",
-	"Genzo",
-	"Genzo",
-	"Dr. Hiluluk",
-	"Dr. Hiluluk",
-	"Kuina",
-	"Kuina",
-	"Usopp Pirates",
-	"Usopp Pirates",
-	"Iceburg",
-	"Iceburg",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Breed",
-	"Breed",
-	"Dugong",
-	"Lapin",
-	"Octopus Boxer",
-	"Bentham",
-	"Bentham",
-	"Hina",
-	"Hina",
-	"Smoker",
-	"Smoker",
-	"Nami",
-	"Nami",
-	"Lola",
-	"Lola",
-	"Risky Brothers",
-	"Cerberus",
-	"Tararan",
-	"Bear-Skin Rug",
-	"Gecko Moria",
-	"Gecko Moria",
-	"Soldier Zombie",
-	"Soldier Zombie",
-	"Soldier Zombie",
-	"Soldier Zombie",
-	"Soldier Zombie",
-	"Wild Zombie",
-	"Wild Zombie",
-	"Wild Zombie",
-	"General Zombie",
-	"General Zombie",
-	"General Zombie",
-	"Trafalgar Law",
-	"Trafalgar Law",
-	"Basil Hawkins",
-	"Basil Hawkins",
-	"Wyper",
-	"Wyper",
-	"Mr. 7 & Miss Father's Day",
-	"Bartholomew Kuma",
-	"Bartholomew Kuma",
-	"Caesar Clown",
-	"Caesar Clown",
-	"Vergo",
-	"Vergo",
-	"Monet",
-	"Monet",
-	"Baby 5",
-	"Baby 5",
-	"Buffalo",
-	"Buffalo",
-	"Tom",
-	"Tom",
-	"Franky",
-	"Iceburg",
-	"Wapol",
-	"Wapol",
-	"Robson",
-	"Tony Tony Chopper",
-	"Trafalgar Law",
-	"Trafalgar Law",
-	"Jewelry Bonney",
-	"Jewelry Bonney",
-	"Coby",
-	"Coby",
-	"Alvida",
-	"Alvida",
-	"Nami",
-	"Boa Hancock",
-	"Boa Hancock",
-	"Nico Robin",
-	"Usopp",
-	"Tony Tony Chopper",
-	"Donquixote Doflamingo",
-	"Donquixote Doflamingo",
-	"Sugar",
-	"Sugar",
-	"Señor Pink",
-	"Señor Pink",
-	"Trebol",
-	"Trebol",
-	"Jora",
-	"Jora",
-	"Lao-G",
-	"Lao-G",
-	"Scratchmen Apoo",
-	"Scratchmen Apoo",
-	"Dorry",
-	"Dorry",
-	"Jimbe",
-	"Daz Bones",
-	"Buggy",
-	null,
-	"Perona",
-	"Perona",
-	"Hogback",
-	"Absalom",
-	"Oars",
-	"Gecko Moria",
-	"Brook",
-	"Brook",
-	"Crocodile",
-	"Galdino",
-	"Bentham",
-	"Franky",
-	"Franky",
-	"Broggy",
-	"Broggy",
-	"Yokozuna",
-	"Roronoa Zoro",
-	"Roronoa Zoro",
-	"Nico Robin",
-	"Nico Robin",
-	"Tony Tony Chopper",
-	"Tony Tony Chopper",
-	"Sanji",
-	"Sanji",
-	"Brook",
-	"Brook",
-	"Nico Robin",
-	"Nico Robin",
-	"Marguerite",
-	"Marguerite",
-	"Aphelandra",
-	"Sweet Pea",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Nami",
+    "Nami",
+    "Nami",
+    "Nami",
+    "Usopp",
+    "Usopp",
+    "Usopp",
+    "Usopp",
+    "Sanji",
+    "Sanji",
+    "Sanji",
+    "Sanji",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Higuma",
+    "Master of the Near Sea",
+    "Alvida",
+    "Alvida",
+    "Coby",
+    "Coby",
+    "Helmeppo",
+    "Helmeppo",
+    "Morgan",
+    "Mohji & Richie",
+    "Cabaji",
+    "Buggy",
+    "Buggy",
+    "Gaimon",
+    "Siam",
+    "Butchie",
+    "Django",
+    "Django",
+    "Kuro",
+    "Kuro",
+    "Yosaku",
+    "Johnny",
+    "Fullbody",
+    "Patty",
+    "Carne",
+    "Zeff",
+    "Gin",
+    "Gin",
+    "Pearl",
+    "Pearl",
+    "Don Krieg",
+    "Don Krieg",
+    "Nezumi",
+    "Momoo",
+    "Choo",
+    "Kuroobi",
+    "Hachi",
+    "Hachi",
+    "Arlong",
+    "Arlong",
+    "Tashigi",
+    "Tashigi",
+    "Smoker",
+    "Smoker",
+    "Nefertari Vivi",
+    "Nefertari Vivi",
+    "Nefertari Vivi",
+    "Portgas D. Ace",
+    "Portgas D. Ace",
+    "Shanks",
+    "Shanks",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Sword Bandit",
+    "Pistol Bandit",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Cannoneer",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Cannoneer",
+    "Bodyguard",
+    "Bodyguard",
+    "Black Cat Pirates",
+    "Black Cat Pirates",
+    "Black Cat Pirates",
+    "Black Cat Pirates",
+    "Black Cat Pirates",
+    "Fighter Group Leader",
+    "Slasher Group Leader",
+    "Striker Group Leader",
+    "Shooter Group Leader",
+    "Assassin Master",
+    "Arlong Crewmember",
+    "Arlong Crewmember",
+    "Arlong Crewmember",
+    "Arlong Crewmember",
+    "Knuckle Navy",
+    "Saber Navy",
+    "Halberd Navy",
+    "Pistol Navy",
+    "Cannoneer Navy",
+    "Knuckle Navy",
+    "Saber Navy",
+    "Halberd Navy",
+    "Pistol Navy",
+    "Cannoneer Navy",
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Knuckle Navy",
+    "Saber Navy",
+    "Halberd Navy",
+    "Pistol Navy",
+    "Cannoneer Navy",
+    "Mr. 5",
+    "Mr. 5",
+    "Miss Valentine",
+    "Miss Valentine",
+    "Galdino",
+    "Galdino",
+    "Miss Goldenweek",
+    "Miss Goldenweek",
+    "Bentham",
+    "Bentham",
+    "Nico Robin",
+    "Nico Robin",
+    "Mr. 9",
+    "Mr. 9",
+    "Laboon",
+    "Laboon",
+    "Neptunian Squid",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Nami",
+    "Nami",
+    "Usopp",
+    "Usopp",
+    "Sanji",
+    "Sanji",
+    "Dracule Mihawk",
+    "Dracule Mihawk",
+    "Morgan",
+    "Django",
+    "Fullbody",
+    "Hina",
+    "Hina",
+    "Mr. 8",
+    "Mr. 8",
+    "Misss Monday",
+    "Misss Monday",
+    "Knuckle Baroque Works",
+    "Saber Baroque Works",
+    "Halberd Baroque Works",
+    "Pistol Baroque Works",
+    "Bazooka Baroque Works",
+    "Knuckle Baroque Works",
+    "Saber Baroque Works",
+    "Halberd Baroque Works",
+    "Pistol Baroque Works",
+    "Bazooka Baroque Works",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Marco",
+    "Marco",
+    "Jozu",
+    "Jozu",
+    "Vista",
+    "Vista",
+    "Izo",
+    "Izo",
+    "Blamenco",
+    "Blamenco",
+    "Whitebeard",
+    "Whitebeard",
+    "Coby",
+    "Coby",
+    "Helmeppo",
+    "Helmeppo",
+    null,
+    null,
+    "Smoker",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Fighter Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Slasher Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Striker Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Shooter Group Crew Pirates",
+    "Cannoneer",
+    "Mr. 13",
+    "Dorry",
+    "Broggy",
+    "Triceratops",
+    "Rex",
+    "Brontosaurus",
+    "Tsuru",
+    "Tsuru",
+    "Momonga",
+    "Onigumo",
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Monkey D. Garp",
+    "Monkey D. Garp",
+    "Trafalgar Law",
+    "Trafalgar Law",
+    "Basil Hawkins",
+    "Basil Hawkins",
+    "Killer",
+    "Killer",
+    "Urouge",
+    "Urouge",
+    "Bepo",
+    "Bepo",
+    "Kalifa",
+    "Kalifa",
+    "Paulie",
+    "Paulie",
+    "Rob Lucci",
+    "Rob Lucci",
+    "Kaku",
+    "Kaku",
+    "Lulu",
+    "Wapol",
+    "Wapol",
+    "Dalton",
+    "Dalton",
+    "Chessmarimo",
+    "Chessmarimo",
+    "Chessmarimo",
+    "Dr. Kureha",
+    "Lapin",
+    "Lapin",
+    "Franky",
+    "Franky",
+    "Kiwi & Mozu",
+    "Kiwi & Mozu",
+    "Surume",
+    "Surume",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Zephyr",
+    "Zephyr",
+    "Ain",
+    "Ain",
+    "Eustass Kid",
+    "Eustass Kid",
+    "Scratchmen Apoo",
+    "Scratchmen Apoo",
+    "X Drake",
+    "X Drake",
+    "Jewelry Bonney",
+    "Jewelry Bonney",
+    "Capone Bege",
+    "Capone Bege",
+    "Silvers Rayleigh",
+    "Silvers Rayleigh",
+    "Giant Red Pirates",
+    "Giant Blue Pirates",
+    "Giant Green Pirates",
+    "Giant Yellow Pirates",
+    "Giant Black Pirates",
+    "Giant Red Pirates",
+    "Giant Blue Pirates",
+    "Giant Green Pirates",
+    "Giant Yellow Pirates",
+    "Giant Black Pirates",
+    "Sea Cat",
+    "Dugong",
+    "Dugong",
+    "Banana Gator",
+    "Sandora Dragon",
+    "Crocodile",
+    "Crocodile",
+    "Hogback",
+    "Hogback",
+    "Cindry",
+    "Cindry",
+    "Emporio Ivankov",
+    "Emporio Ivankov",
+    "Perona",
+    "Perona",
+    "Kumacy",
+    "Dog Penguin",
+    "Miss Merry Christmas",
+    "Miss Merry Christmas",
+    "Mr. 4",
+    "Mr. 4",
+    "Miss Doublefinger",
+    "Miss Doublefinger",
+    "Daz Bones",
+    "Daz Bones",
+    "Rebecca",
+    "Absalom",
+    "Absalom",
+    "General Zombie",
+    "Jigoro of the Wind",
+    "Crocodile",
+    "Jimbe",
+    "Jimbe",
+    "Bartholomew Kuma",
+    "Bartholomew Kuma",
+    "Gecko Moria",
+    "Gecko Moria",
+    "Boa Hancock",
+    "Boa Hancock",
+    "Donquixote Doflamingo",
+    "Donquixote Doflamingo",
+    "Sanji",
+    "Monkey D. Luffy",
+    "Roronoa Zoro",
+    "Nami",
+    "Brook",
+    "Brook",
+    "Ryuuma",
+    "Masira",
+    "Shoujou",
+    "Montblanc Cricket",
+    "South Bird and Forest Residents",
+    "Bellamy",
+    "Bellamy",
+    "Sarquiss",
+    "Elizabeth",
+    "Caroline",
+    "Sanji",
+    "Sanji",
+    "Perona",
+    "Perona",
+    "Nefertari Vivi",
+    "Nefertari Vivi",
+    "Duck Squadron",
+    "Duck Squadron",
+    "Duck Squadron",
+    "Duck Squadron",
+    "Duck Squadron",
+    "Blackbeard",
+    "Blackbeard",
+    "Thatch",
+    "Thatch",
+    "Namule",
+    "Namule",
+    "Rakuyo",
+    "Rakuyo",
+    "Fossa",
+    "Fossa",
+    "Curiel",
+    "Curiel",
+    "Sengoku",
+    "Sengoku",
+    "Galdino",
+    "Bentham",
+    "Bentham",
+    "Satori",
+    "Shura",
+    "Gedatsu",
+    "Braham",
+    "Yama",
+    "Yellow Skypiea Guard",
+    "Black Skypiea Guard",
+    "Yellow Skypiea Guard",
+    "Black Skypiea Guard",
+    "Red Skypiea Guard Enforcer",
+    "Blue Skypiea Guard Enforcer",
+    "Green Skypiea Guard Enforcer",
+    "Yellow Skypiea Guard Enforcer",
+    "Black Skypiea Guard Enforcer",
+    "Red Skypiea Enforcer",
+    "Blue Skypiea Enforcer",
+    "Green Skypiea Enforcer",
+    "Yellow Skypiea Enforcer",
+    "Black Skypiea Enforcer",
+    "Red Skypiea Enforcer",
+    "Blue Skypiea Enforcer",
+    "Green Skypiea Enforcer",
+    "Yellow Skypiea Enforcer",
+    "Black Skypiea Enforcer",
+    "Red Shandian Warrior",
+    "Blue Shandian Warrior",
+    "Green Shandian Warrior",
+    "Red Shandian Warrior",
+    "Blue Shandian Warrior",
+    "Green Shandian Warrior",
+    "Yellow Shandian Warrior",
+    "Black Shandian Warrior",
+    "Yellow Shandian Warrior",
+    "Black Shandian Warrior",
+    "Portgas D. Ace",
+    "Portgas D. Ace",
+    "Bellmere",
+    "Bellmere",
+    "Kaya",
+    "Kaya",
+    "Hotori and Kotori",
+    "Hotori and Kotori",
+    "Pell",
+    "Pell",
+    "Chaka",
+    "Chaka",
+    "Crocodile",
+    "Crocodile",
+    "Daz Bones",
+    "Sabo",
+    "Sabo",
+    "Nico Robin",
+    "Heracles'n",
+    "Heracles'n",
+    "Usopp",
+    "Usopp",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Sanji",
+    "Sanji",
+    "Nami",
+    "Nami",
+    "Brook",
+    "Brook",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Shanks",
+    "Shanks",
+    "Nico Robin",
+    "Nico Robin",
+    "Brook",
+    "Brook",
+    "Nami",
+    "Nami",
+    "Domino",
+    "Domino",
+    "Minorhinoceros",
+    "Basilisk",
+    "Ohm",
+    "Nola Giant Snake",
+    "Wyper",
+    "Wyper",
+    "Eneru",
+    "Eneru",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Sadi-chan",
+    "Sadi-chan",
+    "Minokoala",
+    "Manticore",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Usopp",
+    "Usopp",
+    "Nico Robin",
+    "Nico Robin",
+    "Franky",
+    "Franky",
+    "Portgas D. Ace",
+    "Portgas D. Ace",
+    "Porche",
+    "Capote",
+    "Hamburg",
+    "Pickles",
+    "Big Bun",
+    "Foxy",
+    "Foxy",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Usopp",
+    "Tony Tony Chopper",
+    "Aokiji",
+    "Aokiji",
+    "Nami",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Genbou",
+    "Kamakiri",
+    "Raki",
+    "Aisa",
+    "Nojiko",
+    "Nojiko",
+    "Crocus",
+    "Crocus",
+    "Koza",
+    "Koza",
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Buggy",
+    "Buggy",
+    "Shanks",
+    "Shanks",
+    "Eneru",
+    "Eneru",
+    "Sanji",
+    "Sanji",
+    "Zeff",
+    "Zeff",
+    "Patty",
+    "Carne",
+    "Hiking Bear",
+    "Purinpurin",
+    "Brook",
+    "Brook",
+    "Zanbai",
+    "Superhuman Destroyers",
+    "Superhuman Destroyers",
+    "Superhuman Destroyers",
+    "Street Punk Brawler",
+    "Street Punk Brawler",
+    "Street Punk Blade",
+    "Street Punk Blade",
+    "Street Punk Bullet",
+    "Street Punk Bullet",
+    "Street Punk Nails",
+    "Street Punk Nails",
+    "Street Punk Gatling",
+    "Street Punk Gatling",
+    "Tilestone",
+    "Franky",
+    "Kaku",
+    "Kaku",
+    "Rob Lucci",
+    "Rob Lucci",
+    "Keimi",
+    "Keimi",
+    "Pappug",
+    "Hachi",
+    "Doma",
+    "Doma",
+    "Decalvan Brothers",
+    "Decalvan Brothers",
+    "Squard",
+    "Squard",
+    "Whitey Bay",
+    "Whitey Bay",
+    "Little Oars Jr.",
+    "Little Oars Jr.",
+    "Marco",
+    "Marco",
+    "Nami",
+    "Nami",
+    "Duval",
+    "Duval",
+    "Duval",
+    "Arlong",
+    "Arlong",
+    "Kuroobi",
+    "Choo",
+    "Monkey D. Luffy",
+    "Usopp",
+    "Usopp",
+    "Nami",
+    "Nefertari Vivi",
+    "Nefertari Vivi",
+    "Koza",
+    "Koza",
+    "Nefertari Cobra",
+    "Sabo",
+    "Sabo",
+    "Koala",
+    "Koala",
+    "Hack",
+    "Hack",
+    "Emporio Ivankov",
+    "Emporio Ivankov",
+    "Inazuma",
+    "Inazuma",
+    "Nico Robin",
+    "Nico Robin",
+    "Nami",
+    "Nami",
+    "Nico Robin",
+    "Nico Robin",
+    "Perona",
+    "Perona",
+    "Nefertari Vivi",
+    "Calgara",
+    "Calgara",
+    "Montblanc Noland",
+    "Montblanc Noland",
+    "Halberd Coporal Navy",
+    "Pistol Coporal Navy",
+    "Saber Coporal Navy",
+    "Bazooka Coporal Navy",
+    "Knuckle Coporal Navy",
+    "Halberd Coporal Navy",
+    "Pistol Coporal Navy",
+    "Saber Coporal Navy",
+    "Bazooka Coporal Navy",
+    "Knuckle Coporal Navy",
+    "Oimo",
+    "Kashi",
+    "Watchdog Unit of the Law",
+    "Just Juryman",
+    "Three-Headed Baskerville",
+    "Blueno",
+    "Blueno",
+    "Nico Robin",
+    "Nico Robin",
+    "Franky",
+    "Franky",
+    "Gan Fall",
+    "Gan Fall",
+    "Pierre",
+    "Konis",
+    "Konis",
+    "Dracule Mihawk",
+    "Dracule Mihawk",
+    "Crocodile",
+    "Crocodile",
+    "Jerry",
+    "Jerry",
+    "T-Bone",
+    "T-Bone",
+    "Nefertari Vivi",
+    "Nefertari Vivi",
+    "Monkey D. Luffy",
+    "Kalifa",
+    "Kalifa",
+    "Jabra",
+    "Jabra",
+    "Fukuro",
+    "Fukuro",
+    "Kumadori",
+    "Kumadori",
+    "Kaku",
+    "Rob Lucci",
+    "Spandam",
+    "Franky",
+    "Nero",
+    "Nero",
+    "Wanze",
+    "Wanze",
+    "Portgas D. Ace",
+    "Portgas D. Ace",
+    "Princess Shirahoshi",
+    "Rob Lucci",
+    "Rob Lucci",
+    "Kaku",
+    "Kaku",
+    "Kalifa",
+    "Kalifa",
+    "Jabra",
+    "Jabra",
+    "Blueno",
+    "Blueno",
+    "Fukuro",
+    "Fukuro",
+    "Kumadori",
+    "Kumadori",
+    "Monkey D. Luffy",
+    "Usopp",
+    "Franky",
+    "Nami",
+    "Tony Tony Chopper",
+    "Roronoa Zoro",
+    "Nico Robin",
+    "Sanji",
+    "Brook",
+    "Dalmatian",
+    "Momonga",
+    "Onigumo",
+    "Shu",
+    "Very Good",
+    "Strawberry",
+    "Lucky Roo",
+    "Lucky Roo",
+    "Rebecca",
+    "Rebecca",
+    "Urouge",
+    "Urouge",
+    "Tashigi",
+    "Tashigi",
+    "Genzo",
+    "Genzo",
+    "Dr. Hiluluk",
+    "Dr. Hiluluk",
+    "Kuina",
+    "Kuina",
+    "Usopp Pirates",
+    "Usopp Pirates",
+    "Iceburg",
+    "Iceburg",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Breed",
+    "Breed",
+    "Dugong",
+    "Lapin",
+    "Octopus Boxer",
+    "Bentham",
+    "Bentham",
+    "Hina",
+    "Hina",
+    "Smoker",
+    "Smoker",
+    "Nami",
+    "Nami",
+    "Lola",
+    "Lola",
+    "Risky Brothers",
+    "Cerberus",
+    "Tararan",
+    "Bear-Skin Rug",
+    "Gecko Moria",
+    "Gecko Moria",
+    "Soldier Zombie",
+    "Soldier Zombie",
+    "Soldier Zombie",
+    "Soldier Zombie",
+    "Soldier Zombie",
+    "Wild Zombie",
+    "Wild Zombie",
+    "Wild Zombie",
+    "General Zombie",
+    "General Zombie",
+    "General Zombie",
+    "Trafalgar Law",
+    "Trafalgar Law",
+    "Basil Hawkins",
+    "Basil Hawkins",
+    "Wyper",
+    "Wyper",
+    "Mr. 7 & Miss Father's Day",
+    "Bartholomew Kuma",
+    "Bartholomew Kuma",
+    "Caesar Clown",
+    "Caesar Clown",
+    "Vergo",
+    "Vergo",
+    "Monet",
+    "Monet",
+    "Baby 5",
+    "Baby 5",
+    "Buffalo",
+    "Buffalo",
+    "Tom",
+    "Tom",
+    "Franky",
+    "Iceburg",
+    "Wapol",
+    "Wapol",
+    "Robson",
+    "Tony Tony Chopper",
+    "Trafalgar Law",
+    "Trafalgar Law",
+    "Jewelry Bonney",
+    "Jewelry Bonney",
+    "Coby",
+    "Coby",
+    "Alvida",
+    "Alvida",
+    "Nami",
+    "Boa Hancock",
+    "Boa Hancock",
+    "Nico Robin",
+    "Usopp",
+    "Tony Tony Chopper",
+    "Donquixote Doflamingo",
+    "Donquixote Doflamingo",
+    "Sugar",
+    "Sugar",
+    "Señor Pink",
+    "Señor Pink",
+    "Trebol",
+    "Trebol",
+    "Jora",
+    "Jora",
+    "Lao-G",
+    "Lao-G",
+    "Scratchmen Apoo",
+    "Scratchmen Apoo",
+    "Dorry",
+    "Dorry",
+    "Jimbe",
+    "Daz Bones",
+    "Buggy",
+    null,
+    "Perona",
+    "Perona",
+    "Hogback",
+    "Absalom",
+    "Oars",
+    "Gecko Moria",
+    "Brook",
+    "Brook",
+    "Crocodile",
+    "Galdino",
+    "Bentham",
+    "Franky",
+    "Franky",
+    "Broggy",
+    "Broggy",
+    "Yokozuna",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Nico Robin",
+    "Nico Robin",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Sanji",
+    "Sanji",
+    "Brook",
+    "Brook",
+    "Nico Robin",
+    "Nico Robin",
+    "Marguerite",
+    "Marguerite",
+    "Aphelandra",
+    "Sweet Pea",
     "Boa Hancock",
     "Boa Hancock",
     "Eustass Kid",
@@ -926,53 +926,53 @@ window.families = [
     "Sadi-chan",
     "Sadi-chan",
     "Doberman",
-	"Hannyabal",
-	"Hannyabal",
-	"Saldeath",
-	null,
-	"Pica",
-	"Pica",
-	"Jimbe",
-	"Jimbe",
-	"Monkey D. Luffy",
-	"Monkey D. Luffy",
-	"Nami",
-	"Nami",
-	"Usopp",
-	"Usopp",
-	"Franky",
-	"Franky",
-	"Perona",
-	"Perona",
-	"Rakuyo",
-	"Fossa",
-	"Curiel",
-	"Thatch",
-	"Portgas D. Ace",
-	"Portgas D. Ace",
-	"Beckman",
-	"Beckman",
-	"Gyaro",
-	"Makuro",
-	"Tansui",
-	"Bodyguard",
-	"Bodyguard",
-	"Bodyguard",
-	"Bodyguard",
-	"Bodyguard",
-	"Bodyguard",
-	"Charloss",
-	"Roswald",
-	"Shalulia",
-	"Eustass Kid",
-	"Trafalgar Law",
-	"Pacifista",
-	"Pacifista",
-	"Pacifista",
-	"Pacifista",
-	"Pacifista",
-	"Sentomaru",
-	"Sentomaru",
+    "Hannyabal",
+    "Hannyabal",
+    "Saldeath",
+    null,
+    "Pica",
+    "Pica",
+    "Jimbe",
+    "Jimbe",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Nami",
+    "Nami",
+    "Usopp",
+    "Usopp",
+    "Franky",
+    "Franky",
+    "Perona",
+    "Perona",
+    "Rakuyo",
+    "Fossa",
+    "Curiel",
+    "Thatch",
+    "Portgas D. Ace",
+    "Portgas D. Ace",
+    "Beckman",
+    "Beckman",
+    "Gyaro",
+    "Makuro",
+    "Tansui",
+    "Bodyguard",
+    "Bodyguard",
+    "Bodyguard",
+    "Bodyguard",
+    "Bodyguard",
+    "Bodyguard",
+    "Charloss",
+    "Roswald",
+    "Shalulia",
+    "Eustass Kid",
+    "Trafalgar Law",
+    "Pacifista",
+    "Pacifista",
+    "Pacifista",
+    "Pacifista",
+    "Pacifista",
+    "Sentomaru",
+    "Sentomaru",
     "Smoker",
     "Smoker",
     "Kizaru",
@@ -980,34 +980,34 @@ window.families = [
     "Izo",
     "Blamenco",
     "Namule",
-	"Vista",
-	"Vista",
-	"Paulie",
-	null,
-	null,
-	null,
-	null,
-	null,
-	"Machvise",
-	"Machvise",
-	"Gladius",
-	"Gladius",
-	"Violet",
-	"Violet",
-	"Dellinger",
-	"Dellinger",
-	"Diamante",
-	"Diamante",
-	"Corazon",
-	"Corazon",
-	"Bepo",
-	"Bepo",
-	"Sachi and Penguin",
-	"Jean Bart",
-	"Jean Bart",
-	"Monet",
-	"Monet",
-	"Monkey D. Luffy",
+    "Vista",
+    "Vista",
+    "Paulie",
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Machvise",
+    "Machvise",
+    "Gladius",
+    "Gladius",
+    "Violet",
+    "Violet",
+    "Dellinger",
+    "Dellinger",
+    "Diamante",
+    "Diamante",
+    "Corazon",
+    "Corazon",
+    "Bepo",
+    "Bepo",
+    "Sachi and Penguin",
+    "Jean Bart",
+    "Jean Bart",
+    "Monet",
+    "Monet",
+    "Monkey D. Luffy",
     "Count Butler",
     "Count Butler",
     "President Heaby",
@@ -1018,22 +1018,22 @@ window.families = [
     "Brownbeard",
     "Brownbeard",
     "Lulu",
-	"Sugar",
-	"Sugar",
-	"Monkey D. Luffy",
-	"Portgas D. Ace",
-	"Don Chinjao",
-	"Don Chinjao",
-	"Blue Gilly",
-	"Blue Gilly",
-	"Funk Brothers",
-	"Funk Brothers",
-	"Hajrudin",
-	"Hajrudin",
-	"Abdullah and Jeet",
-	"Abdullah and Jeet",
-	"Bartomoleo",
-	"Bartomoleo",
+    "Sugar",
+    "Sugar",
+    "Monkey D. Luffy",
+    "Portgas D. Ace",
+    "Don Chinjao",
+    "Don Chinjao",
+    "Blue Gilly",
+    "Blue Gilly",
+    "Funk Brothers",
+    "Funk Brothers",
+    "Hajrudin",
+    "Hajrudin",
+    "Abdullah and Jeet",
+    "Abdullah and Jeet",
+    "Bartomoleo",
+    "Bartomoleo",
     "Emporio Ivankov",
     "Emporio Ivankov",
     "Inazuma",
@@ -1067,29 +1067,29 @@ window.families = [
     "Bright Swordswoman, Kuja Warriors",
     "Skilled Female Fighter, Kuja Warriors",
     "Nimble Female Fighter, Kuja Warriors",
-	"Shuraiya",
-	"Shuraiya",
-	"Gasparde",
-	"Gasparde",
-	"Needless",
-	"Ricky",
-	"Ricky",
-	"Leo",
-	"Leo",
-	"Mansherry",
-	"Mansherry",
-	"Kyros",
-	"Kyros",
-	"Don Sai",
-	"Don Sai",
-	"Fujitora",
-	"Fujitora",
-	"Musshuru",
-	"Musshuru",
-	"Saga",
-	"Saga",
-	"X Drake",
-	"X Drake",
+    "Shuraiya",
+    "Shuraiya",
+    "Gasparde",
+    "Gasparde",
+    "Needless",
+    "Ricky",
+    "Ricky",
+    "Leo",
+    "Leo",
+    "Mansherry",
+    "Mansherry",
+    "Kyros",
+    "Kyros",
+    "Don Sai",
+    "Don Sai",
+    "Fujitora",
+    "Fujitora",
+    "Musshuru",
+    "Musshuru",
+    "Saga",
+    "Saga",
+    "X Drake",
+    "X Drake",
     "Rebecca",
     "Rebecca",
     "Dr. Indigo",
@@ -1105,8 +1105,8 @@ window.families = [
     "Ain",
     "Binz",
     "Binz",
-	"Shiki",
-	"Shiki",
+    "Shiki",
+    "Shiki",
     "Nami",
     "Nami",
     "Nico Robin",
@@ -1118,20 +1118,20 @@ window.families = [
     "Sanji",
     "Nami",
     "Nami",
-	"Monkey D. Luffy",
     "Monkey D. Luffy",
-	"Cavendish",
-	"Cavendish",
-	"Suleiman",
-	"Suleiman",
-	"Orlumbus",
-	"Orlumbus",
-	"Dagama",
-	"Dagama",
-	"Elizabello",
-	"Elizabello",
-	"Ideo",
-	"Ideo",
+    "Monkey D. Luffy",
+    "Cavendish",
+    "Cavendish",
+    "Suleiman",
+    "Suleiman",
+    "Orlumbus",
+    "Orlumbus",
+    "Dagama",
+    "Dagama",
+    "Elizabello",
+    "Elizabello",
+    "Ideo",
+    "Ideo",
     "Tashigi",
     "Tashigi",
     "Fukuro",
@@ -1193,13 +1193,13 @@ window.families = [
     "Aokiji",
     "Boa Hancock",
     "Boa Hancock",
-	"Gan Fall",
-	"Gan Fall",
-	"Ohm",
+    "Gan Fall",
+    "Gan Fall",
+    "Ohm",
+    "Jewelry Bonney",
     "Jewelry Bonney",
-	"Jewelry Bonney",
     "Violet",
-	"Violet",
+    "Violet",
     "Yoki",
     "Yoki",
     "Brook",
@@ -1208,11 +1208,11 @@ window.families = [
     "Nico Robin",
     "Nico Robin",
     "Usopp",
-	"Usopp",
+    "Usopp",
+    "Franky",
     "Franky",
-	"Franky",
     "Baby 5",
-	"Baby 5",
+    "Baby 5",
     null,
     null,
     null,
@@ -1220,7 +1220,7 @@ window.families = [
     "Byrnndi World",
     "Byrnndi World",
     "Little Oars Jr.",
-	"Little Oars Jr.",
+    "Little Oars Jr.",
     "Bastille",
     "Yamakaji",
     "Hina",
@@ -1229,10 +1229,10 @@ window.families = [
     "Kizaru",
     "Sentomaru",
     "Sentomaru",
-	"Smoker",
-	"Smoker",
+    "Smoker",
+    "Smoker",
+    "Tashigi",
     "Tashigi",
-	"Tashigi",
     "Maynard",
     "Maynard",
     "Bastille",
@@ -1245,7 +1245,7 @@ window.families = [
     "Hack",
     "Monkey D. Luffy",
     "Portgas D. Ace",
-	"Portgas D. Ace",
+    "Portgas D. Ace",
     "Marco",
     "Marco",
     "Marco",
@@ -1256,7 +1256,7 @@ window.families = [
     "Decalvan Brothers",
     "Whitey Bay",
     "Whitebeard",
-	"Whitebeard",
+    "Whitebeard",
     "Doflamingo",
     "Doflamingo",
     "Señor Pink",
@@ -1266,7 +1266,7 @@ window.families = [
     "Portgas D. Ace",
     "Portgas D. Ace",
     "Blackbeard",
-	"Blackbeard",
+    "Blackbeard",
     "Laffitte",
     "Laffitte",
     "Van Augur",
@@ -1285,9 +1285,9 @@ window.families = [
     "Monkey D. Luffy",
     "Monkey D. Luffy",
     "Baby 5",
-	"Baby 5",
+    "Baby 5",
+    "Trafalgar Law",
     "Trafalgar Law",
-	"Trafalgar Law",
     "Buffalo",
     "Lao G",
     "Lao G",
diff --git a/common/data/flags.js b/common/data/flags.js
index 04895fb97..71418027d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1,681 +1,681 @@
 window.flags = {
-	1: { global: 1 },
-	2: { global: 1, rr: 1 },
-	3: { global: 1, rr: 1 },
-	4: { global: 1, rr: 1 },
-	5: { global: 1, rr: 1 },
-	6: { global: 1, rr: 1 },
-	7: { global: 1, rr: 1 },
-	8: { global: 1, rr: 1 },
-	9: { global: 1, rr: 1 },
-	10: { global: 1, rr: 1 },
-	11: { global: 1, rr: 1 },
-	12: { global: 1, rr: 1 },
-	13: { global: 1, rr: 1 },
-	14: { global: 1, rr: 1 },
-	15: { global: 1, rr: 1 },
-	16: { global: 1, rr: 1 },
-	17: { global: 1, rr: 1 },
-	18: { global: 1, rr: 1 },
-	19: { global: 1, rr: 1 },
-	20: { global: 1, rr: 1 },
-	21: { global: 1, rr: 1 },
-	22: { global: 1, rr: 1 },
-	23: { global: 1, rr: 1 },
-	24: { global: 1, rr: 1 },
-	25: { global: 1, rr: 1 },
-	26: { global: 1, rr: 1 },
-	27: { global: 1 },
-	28: { global: 1 },
-	29: { global: 1, rr: 1 },
-	30: { global: 1, rr: 1 },
-	31: { global: 1 },
-	32: { global: 1, rr: 1 },
-	33: { global: 1 },
-	34: { global: 1, rr: 1 },
-	35: { global: 1 },
-	36: { global: 1 },
-	37: { global: 1 },
-	38: { global: 1, rr: 1 },
-	39: { global: 1, rr: 1 },
-	40: { global: 1 },
-	41: { global: 1 },
-	42: { global: 1 },
-	43: { global: 1 },
-	44: { global: 1, rr: 1 },
-	45: { global: 1, rr: 1 },
-	46: { global: 1, rr: 1 },
-	47: { global: 1 },
-	48: { global: 1 },
-	49: { global: 1 },
-	50: { global: 1 },
-	51: { global: 1 },
-	52: { global: 1 },
-	53: { global: 1 },
-	54: { global: 1, rr: 1 },
-	55: { global: 1 },
-	56: { global: 1, rr: 1 },
-	57: { global: 1, rr: 1 },
-	58: { global: 1, rr: 1 },
-	59: { global: 1 },
-	60: { global: 1 },
-	61: { global: 1, rr: 1 },
-	62: { global: 1, rr: 1 },
-	63: { global: 1, rr: 1 },
-	64: { global: 1, rr: 1 },
-	65: { global: 1, rr: 1 },
-	66: { global: 1, rr: 1 },
-	67: { global: 1, rr: 1 },
-	68: { global: 1, rr: 1 },
-	69: { global: 1, rr: 1 },
-	70: { global: 1, rr: 1 },
-	71: { global: 1, rr: 1 },
-	72: { global: 1, rr: 1 },
-	73: { global: 1, rr: 1 },
-	74: { global: 1, rr: 1, rro: 1 },
-	75: { global: 1, rr: 1, rro: 1 },
-	76: { global: 1, rr: 1, rro: 1 },
-	77: { global: 1, rr: 1, rro: 1 },
-	78: { global: 1 },
-	79: { global: 1 },
-	80: { global: 1 },
-	81: { global: 1 },
-	82: { global: 1 },
-	83: { global: 1 },
-	84: { global: 1 },
-	85: { global: 1 },
-	86: { global: 1 },
-	87: { global: 1 },
-	88: { global: 1 },
-	89: { global: 1 },
-	90: { global: 1 },
-	91: { global: 1 },
-	92: { global: 1 },
-	93: { global: 1 },
-	94: { global: 1 },
-	95: { global: 1 },
-	96: { global: 1 },
-	97: { global: 1 },
-	98: { global: 1 },
-	99: { global: 1 },
-	100: { global: 1 },
-	101: { global: 1 },
-	102: { global: 1 },
-	103: { global: 1 },
-	104: { global: 1 },
-	105: { global: 1 },
-	106: { global: 1 },
-	107: { global: 1 },
-	108: { global: 1 },
-	109: { global: 1 },
-	110: { global: 1 },
-	111: { global: 1 },
-	112: { global: 1 },
-	113: { global: 1 },
-	114: { global: 1 },
-	115: { global: 1 },
-	116: { global: 1 },
-	117: { global: 1 },
-	118: { global: 1 },
-	119: { global: 1 },
-	120: { global: 1 },
-	121: { global: 1 },
-	122: { global: 1 },
-	123: { global: 1 },
-	124: { global: 1 },
-	125: { global: 1 },
-	126: { global: 1 },
-	127: { global: 1 },
-	128: { global: 1 },
-	129: { global: 1 },
-	130: { global: 1 },
-	131: { global: 1 },
-	132: { global: 1 },
-	133: { global: 1 },
-	134: { global: 1 },
-	135: { global: 1 },
-	136: { global: 1 },
-	137: { global: 1 },
-	138: { global: 1 },
-	139: { global: 1 },
-	140: { global: 1 },
-	141: { global: 1 },
-	142: { global: 1 },
-	143: { global: 1 },
-	144: { global: 1 },
-	145: { global: 1 },
-	146: { global: 1 },
-	147: { global: 1 },
-	148: { global: 1 },
-	149: { global: 1 },
-	150: { global: 1 },
-	151: { global: 1 },
-	152: { global: 1 },
-	153: { global: 1 },
-	154: { global: 1 },
-	155: { global: 1 },
-	156: { global: 1 },
-	157: { global: 1 },
-	158: { global: 1 },
-	159: { global: 1 },
-	160: { global: 1 },
-	161: { global: 1 },
-	162: { global: 1 },
-	163: { global: 1 },
-	164: { global: 1 },
-	165: { global: 1 },
-	166: { global: 1 },
-	167: { global: 1 },
-	168: { global: 1 },
-	169: { global: 1 },
-	170: { global: 1 },
-	171: { global: 1 },
-	172: { global: 1 },
-	173: { global: 1 },
-	174: { global: 1 },
-	175: { global: 1 },
-	176: { global: 1 },
-	177: { global: 1 },
-	178: { global: 1 },
-	179: { global: 1 },
-	180: { global: 1 },
-	181: { global: 1 },
-	182: { global: 1 },
-	183: { global: 1 },
-	184: { global: 1 },
-	185: { global: 1 },
-	186: { global: 1 },
-	187: { global: 1 },
-	188: { global: 1 },
-	189: { global: 1 },
-	190: { global: 1 },
-	191: { global: 1 },
-	192: { global: 1 },
-	193: { global: 1 },
-	194: { global: 1 },
-	195: { global: 1 },
-	196: { global: 1 },
-	197: { global: 1 },
-	198: { global: 1 },
-	199: { global: 1, rr: 1 },
-	200: { global: 1, rr: 1 },
-	201: { global: 1, rr: 1 },
-	202: { global: 1, rr: 1 },
-	203: { global: 1, rr: 1 },
-	204: { global: 1, rr: 1 },
-	205: { global: 1, rr: 1 },
-	206: { global: 1, rr: 1 },
-	207: { global: 1, rr: 1 },
-	208: { global: 1, rr: 1 },
-	209: { global: 1, rr: 1, rro: 1 },
-	210: { global: 1, rr: 1, rro: 1 },
-	211: { global: 1 },
-	212: { global: 1 },
-	213: { global: 1 },
-	214: { global: 1 },
-	215: { global: 1 },
-	216: { global: 1, rr: 1, rro: 1 },
-	217: { global: 1, rr: 1, rro: 1 },
-	218: { global: 1, rr: 1, rro: 1 },
-	219: { global: 1, rr: 1, rro: 1 },
-	220: { global: 1, rr: 1, rro: 1 },
-	221: { global: 1, rr: 1, rro: 1 },
-	222: { global: 1, rr: 1 },
-	223: { global: 1, rr: 1 },
-	224: { global: 1, rr: 1, rro: 1 },
-	225: { global: 1, rr: 1, rro: 1 },
-	226: { global: 1 },
-	227: { global: 1 },
-	228: { global: 1 },
-	229: { global: 1 },
-	230: { global: 1 },
-	231: { global: 1 },
-	232: { global: 1 },
-	233: { global: 1 },
-	234: { global: 1 },
-	235: { global: 1 },
-	236: { global: 1 },
-	237: { global: 1 },
-	238: { global: 1 },
-	239: { global: 1 },
-	240: { global: 1 },
-	241: { global: 1 },
-	242: { global: 1 },
-	243: { global: 1 },
-	244: { global: 1 },
-	245: { global: 1 },
-	246: { global: 1 },
-	247: { global: 1, special: 1 },
-	248: { global: 1 },
-	249: { global: 1 },
-	250: { global: 1, rr: 1, rro: 1 },
-	251: { global: 1, rr: 1, rro: 1 },
-	252: { global: 1, rr: 1, rro: 1 },
-	253: { global: 1, rr: 1, rro: 1 },
-	254: { global: 1, rr: 1, rro: 1 },
-	255: { global: 1, rr: 1, rro: 1 },
-	256: { global: 1, rr: 1, rro: 1 },
-	257: { global: 1, rr: 1, rro: 1 },
-	258: { global: 1, rr: 1, rro: 1 },
-	259: { global: 1, rr: 1, rro: 1 },
-	260: { global: 1, rr: 1, rro: 1 },
-	261: { global: 1, rr: 1, rro: 1 },
-	262: { global: 1 },
-	263: { global: 1 },
-	264: { global: 1 },
-	265: { global: 1 },
-	266: { global: 1 },
-	267: { global: 1 },
-	268: { global: 1 },
-	269: { global: 1 },
-	270: { global: 1 },
-	271: { global: 1 },
-	272: { global: 1 },
-	273: { global: 1 },
-	274: { global: 1 },
-	275: { global: 1 },
-	276: { global: 1 },
-	277: { global: 1 },
-	278: { global: 1 },
-	279: { global: 1 },
-	280: { global: 1 },
-	281: { global: 1 },
-	282: { global: 1 },
-	283: { global: 1 },
-	284: { global: 1 },
-	285: { global: 1 },
-	286: { global: 1 },
-	287: { global: 1 },
-	288: { global: 1 },
-	289: { global: 1 },
-	290: { global: 1 },
-	291: { global: 1 },
-	292: { global: 1 },
-	293: { global: 1 },
-	294: { global: 1 },
-	295: { global: 1 },
-	296: { global: 1 },
-	297: { global: 1 },
-	298: { global: 1 },
-	299: { global: 1 },
-	300: { global: 1 },
-	301: { global: 1 },
-	302: { global: 1 },
-	303: { global: 1 },
-	304: { global: 1 },
-	305: { global: 1 },
-	306: { global: 1 },
-	307: { global: 1, rr: 1, rro: 1 },
-	308: { global: 1, rr: 1, rro: 1 },
-	309: { global: 1, rr: 1, rro: 1 },
-	310: { global: 1, rr: 1, rro: 1 },
-	311: { global: 1, rr: 1, rro: 1 },
-	312: { global: 1, rr: 1, rro: 1 },
-	313: { global: 1, rr: 1, rro: 1 },
-	314: { global: 1, rr: 1, rro: 1 },
-	315: { global: 1, rr: 1, rro: 1 },
-	316: { global: 1, rr: 1, rro: 1 },
-	317: { global: 1 },
-	318: { global: 1 },
-	319: { global: 1 },
-	320: { global: 1 },
-	321: { global: 1 },
-	322: { global: 1 },
-	323: { global: 1 },
-	324: { global: 1 },
-	325: { global: 1 },
-	326: { global: 1 },
-	327: { global: 1 },
-	328: { global: 1 },
-	329: { global: 1 },
-	330: { global: 1 },
-	331: { global: 1 },
-	332: { global: 1 },
-	333: { global: 1 },
-	334: { global: 1 },
-	335: { global: 1 },
-	336: { global: 1 },
-	337: { global: 1 },
-	338: { global: 1 },
-	339: { global: 1 },
-	340: { global: 1 },
-	341: { global: 1 },
-	342: { global: 1 },
-	343: { global: 1 },
-	344: { global: 1 },
-	345: { global: 1 },
-	346: { global: 1 },
-	347: { global: 1 },
-	348: { global: 1 },
-	349: { global: 1 },
-	350: { global: 1 },
-	351: { global: 1 },
+    1: { global: 1 },
+    2: { global: 1, rr: 1 },
+    3: { global: 1, rr: 1 },
+    4: { global: 1, rr: 1 },
+    5: { global: 1, rr: 1 },
+    6: { global: 1, rr: 1 },
+    7: { global: 1, rr: 1 },
+    8: { global: 1, rr: 1 },
+    9: { global: 1, rr: 1 },
+    10: { global: 1, rr: 1 },
+    11: { global: 1, rr: 1 },
+    12: { global: 1, rr: 1 },
+    13: { global: 1, rr: 1 },
+    14: { global: 1, rr: 1 },
+    15: { global: 1, rr: 1 },
+    16: { global: 1, rr: 1 },
+    17: { global: 1, rr: 1 },
+    18: { global: 1, rr: 1 },
+    19: { global: 1, rr: 1 },
+    20: { global: 1, rr: 1 },
+    21: { global: 1, rr: 1 },
+    22: { global: 1, rr: 1 },
+    23: { global: 1, rr: 1 },
+    24: { global: 1, rr: 1 },
+    25: { global: 1, rr: 1 },
+    26: { global: 1, rr: 1 },
+    27: { global: 1 },
+    28: { global: 1 },
+    29: { global: 1, rr: 1 },
+    30: { global: 1, rr: 1 },
+    31: { global: 1 },
+    32: { global: 1, rr: 1 },
+    33: { global: 1 },
+    34: { global: 1, rr: 1 },
+    35: { global: 1 },
+    36: { global: 1 },
+    37: { global: 1 },
+    38: { global: 1, rr: 1 },
+    39: { global: 1, rr: 1 },
+    40: { global: 1 },
+    41: { global: 1 },
+    42: { global: 1 },
+    43: { global: 1 },
+    44: { global: 1, rr: 1 },
+    45: { global: 1, rr: 1 },
+    46: { global: 1, rr: 1 },
+    47: { global: 1 },
+    48: { global: 1 },
+    49: { global: 1 },
+    50: { global: 1 },
+    51: { global: 1 },
+    52: { global: 1 },
+    53: { global: 1 },
+    54: { global: 1, rr: 1 },
+    55: { global: 1 },
+    56: { global: 1, rr: 1 },
+    57: { global: 1, rr: 1 },
+    58: { global: 1, rr: 1 },
+    59: { global: 1 },
+    60: { global: 1 },
+    61: { global: 1, rr: 1 },
+    62: { global: 1, rr: 1 },
+    63: { global: 1, rr: 1 },
+    64: { global: 1, rr: 1 },
+    65: { global: 1, rr: 1 },
+    66: { global: 1, rr: 1 },
+    67: { global: 1, rr: 1 },
+    68: { global: 1, rr: 1 },
+    69: { global: 1, rr: 1 },
+    70: { global: 1, rr: 1 },
+    71: { global: 1, rr: 1 },
+    72: { global: 1, rr: 1 },
+    73: { global: 1, rr: 1 },
+    74: { global: 1, rr: 1, rro: 1 },
+    75: { global: 1, rr: 1, rro: 1 },
+    76: { global: 1, rr: 1, rro: 1 },
+    77: { global: 1, rr: 1, rro: 1 },
+    78: { global: 1 },
+    79: { global: 1 },
+    80: { global: 1 },
+    81: { global: 1 },
+    82: { global: 1 },
+    83: { global: 1 },
+    84: { global: 1 },
+    85: { global: 1 },
+    86: { global: 1 },
+    87: { global: 1 },
+    88: { global: 1 },
+    89: { global: 1 },
+    90: { global: 1 },
+    91: { global: 1 },
+    92: { global: 1 },
+    93: { global: 1 },
+    94: { global: 1 },
+    95: { global: 1 },
+    96: { global: 1 },
+    97: { global: 1 },
+    98: { global: 1 },
+    99: { global: 1 },
+    100: { global: 1 },
+    101: { global: 1 },
+    102: { global: 1 },
+    103: { global: 1 },
+    104: { global: 1 },
+    105: { global: 1 },
+    106: { global: 1 },
+    107: { global: 1 },
+    108: { global: 1 },
+    109: { global: 1 },
+    110: { global: 1 },
+    111: { global: 1 },
+    112: { global: 1 },
+    113: { global: 1 },
+    114: { global: 1 },
+    115: { global: 1 },
+    116: { global: 1 },
+    117: { global: 1 },
+    118: { global: 1 },
+    119: { global: 1 },
+    120: { global: 1 },
+    121: { global: 1 },
+    122: { global: 1 },
+    123: { global: 1 },
+    124: { global: 1 },
+    125: { global: 1 },
+    126: { global: 1 },
+    127: { global: 1 },
+    128: { global: 1 },
+    129: { global: 1 },
+    130: { global: 1 },
+    131: { global: 1 },
+    132: { global: 1 },
+    133: { global: 1 },
+    134: { global: 1 },
+    135: { global: 1 },
+    136: { global: 1 },
+    137: { global: 1 },
+    138: { global: 1 },
+    139: { global: 1 },
+    140: { global: 1 },
+    141: { global: 1 },
+    142: { global: 1 },
+    143: { global: 1 },
+    144: { global: 1 },
+    145: { global: 1 },
+    146: { global: 1 },
+    147: { global: 1 },
+    148: { global: 1 },
+    149: { global: 1 },
+    150: { global: 1 },
+    151: { global: 1 },
+    152: { global: 1 },
+    153: { global: 1 },
+    154: { global: 1 },
+    155: { global: 1 },
+    156: { global: 1 },
+    157: { global: 1 },
+    158: { global: 1 },
+    159: { global: 1 },
+    160: { global: 1 },
+    161: { global: 1 },
+    162: { global: 1 },
+    163: { global: 1 },
+    164: { global: 1 },
+    165: { global: 1 },
+    166: { global: 1 },
+    167: { global: 1 },
+    168: { global: 1 },
+    169: { global: 1 },
+    170: { global: 1 },
+    171: { global: 1 },
+    172: { global: 1 },
+    173: { global: 1 },
+    174: { global: 1 },
+    175: { global: 1 },
+    176: { global: 1 },
+    177: { global: 1 },
+    178: { global: 1 },
+    179: { global: 1 },
+    180: { global: 1 },
+    181: { global: 1 },
+    182: { global: 1 },
+    183: { global: 1 },
+    184: { global: 1 },
+    185: { global: 1 },
+    186: { global: 1 },
+    187: { global: 1 },
+    188: { global: 1 },
+    189: { global: 1 },
+    190: { global: 1 },
+    191: { global: 1 },
+    192: { global: 1 },
+    193: { global: 1 },
+    194: { global: 1 },
+    195: { global: 1 },
+    196: { global: 1 },
+    197: { global: 1 },
+    198: { global: 1 },
+    199: { global: 1, rr: 1 },
+    200: { global: 1, rr: 1 },
+    201: { global: 1, rr: 1 },
+    202: { global: 1, rr: 1 },
+    203: { global: 1, rr: 1 },
+    204: { global: 1, rr: 1 },
+    205: { global: 1, rr: 1 },
+    206: { global: 1, rr: 1 },
+    207: { global: 1, rr: 1 },
+    208: { global: 1, rr: 1 },
+    209: { global: 1, rr: 1, rro: 1 },
+    210: { global: 1, rr: 1, rro: 1 },
+    211: { global: 1 },
+    212: { global: 1 },
+    213: { global: 1 },
+    214: { global: 1 },
+    215: { global: 1 },
+    216: { global: 1, rr: 1, rro: 1 },
+    217: { global: 1, rr: 1, rro: 1 },
+    218: { global: 1, rr: 1, rro: 1 },
+    219: { global: 1, rr: 1, rro: 1 },
+    220: { global: 1, rr: 1, rro: 1 },
+    221: { global: 1, rr: 1, rro: 1 },
+    222: { global: 1, rr: 1 },
+    223: { global: 1, rr: 1 },
+    224: { global: 1, rr: 1, rro: 1 },
+    225: { global: 1, rr: 1, rro: 1 },
+    226: { global: 1 },
+    227: { global: 1 },
+    228: { global: 1 },
+    229: { global: 1 },
+    230: { global: 1 },
+    231: { global: 1 },
+    232: { global: 1 },
+    233: { global: 1 },
+    234: { global: 1 },
+    235: { global: 1 },
+    236: { global: 1 },
+    237: { global: 1 },
+    238: { global: 1 },
+    239: { global: 1 },
+    240: { global: 1 },
+    241: { global: 1 },
+    242: { global: 1 },
+    243: { global: 1 },
+    244: { global: 1 },
+    245: { global: 1 },
+    246: { global: 1 },
+    247: { global: 1, special: 1 },
+    248: { global: 1 },
+    249: { global: 1 },
+    250: { global: 1, rr: 1, rro: 1 },
+    251: { global: 1, rr: 1, rro: 1 },
+    252: { global: 1, rr: 1, rro: 1 },
+    253: { global: 1, rr: 1, rro: 1 },
+    254: { global: 1, rr: 1, rro: 1 },
+    255: { global: 1, rr: 1, rro: 1 },
+    256: { global: 1, rr: 1, rro: 1 },
+    257: { global: 1, rr: 1, rro: 1 },
+    258: { global: 1, rr: 1, rro: 1 },
+    259: { global: 1, rr: 1, rro: 1 },
+    260: { global: 1, rr: 1, rro: 1 },
+    261: { global: 1, rr: 1, rro: 1 },
+    262: { global: 1 },
+    263: { global: 1 },
+    264: { global: 1 },
+    265: { global: 1 },
+    266: { global: 1 },
+    267: { global: 1 },
+    268: { global: 1 },
+    269: { global: 1 },
+    270: { global: 1 },
+    271: { global: 1 },
+    272: { global: 1 },
+    273: { global: 1 },
+    274: { global: 1 },
+    275: { global: 1 },
+    276: { global: 1 },
+    277: { global: 1 },
+    278: { global: 1 },
+    279: { global: 1 },
+    280: { global: 1 },
+    281: { global: 1 },
+    282: { global: 1 },
+    283: { global: 1 },
+    284: { global: 1 },
+    285: { global: 1 },
+    286: { global: 1 },
+    287: { global: 1 },
+    288: { global: 1 },
+    289: { global: 1 },
+    290: { global: 1 },
+    291: { global: 1 },
+    292: { global: 1 },
+    293: { global: 1 },
+    294: { global: 1 },
+    295: { global: 1 },
+    296: { global: 1 },
+    297: { global: 1 },
+    298: { global: 1 },
+    299: { global: 1 },
+    300: { global: 1 },
+    301: { global: 1 },
+    302: { global: 1 },
+    303: { global: 1 },
+    304: { global: 1 },
+    305: { global: 1 },
+    306: { global: 1 },
+    307: { global: 1, rr: 1, rro: 1 },
+    308: { global: 1, rr: 1, rro: 1 },
+    309: { global: 1, rr: 1, rro: 1 },
+    310: { global: 1, rr: 1, rro: 1 },
+    311: { global: 1, rr: 1, rro: 1 },
+    312: { global: 1, rr: 1, rro: 1 },
+    313: { global: 1, rr: 1, rro: 1 },
+    314: { global: 1, rr: 1, rro: 1 },
+    315: { global: 1, rr: 1, rro: 1 },
+    316: { global: 1, rr: 1, rro: 1 },
+    317: { global: 1 },
+    318: { global: 1 },
+    319: { global: 1 },
+    320: { global: 1 },
+    321: { global: 1 },
+    322: { global: 1 },
+    323: { global: 1 },
+    324: { global: 1 },
+    325: { global: 1 },
+    326: { global: 1 },
+    327: { global: 1 },
+    328: { global: 1 },
+    329: { global: 1 },
+    330: { global: 1 },
+    331: { global: 1 },
+    332: { global: 1 },
+    333: { global: 1 },
+    334: { global: 1 },
+    335: { global: 1 },
+    336: { global: 1 },
+    337: { global: 1 },
+    338: { global: 1 },
+    339: { global: 1 },
+    340: { global: 1 },
+    341: { global: 1 },
+    342: { global: 1 },
+    343: { global: 1 },
+    344: { global: 1 },
+    345: { global: 1 },
+    346: { global: 1 },
+    347: { global: 1 },
+    348: { global: 1 },
+    349: { global: 1 },
+    350: { global: 1 },
+    351: { global: 1 },
     352: { global: 1 },
-	353: { global: 1 },
+    353: { global: 1 },
     354: { global: 1 },
-	355: { global: 1 },
-	356: { global: 1, rr: 1, rro: 1 },
-	357: { global: 1, rr: 1, rro: 1 },
-	358: { global: 1, rr: 1, rro: 1 },
-	359: { global: 1, rr: 1, rro: 1 },
-	360: { global: 1, rr: 1, rro: 1 },
-	361: { global: 1, rr: 1, rro: 1 },
-	362: { global: 1, rr: 1, rro: 1 },
-	363: { global: 1, rr: 1, rro: 1 },
-	364: { global: 1, rr: 1, rro: 1 },
-	365: { global: 1, rr: 1, rro: 1 },
-	366: { global: 1, rr: 1, rro: 1 },
-	367: { global: 1, rr: 1, rro: 1 },
-	368: { global: 1 },
-	369: { global: 1 },
-	370: { global: 1 },
-	371: { global: 1 },
-	372: { global: 1 },
-	373: { global: 1 },
-	374: { global: 1 },
-	375: { global: 1 },
-	376: { global: 1 },
-	377: { global: 1 },
-	378: { global: 1 },
-	379: { global: 1 },
-	380: { global: 1 },
-	381: { global: 1 },
-	382: { global: 1 },
-	383: { global: 1 },
-	384: { global: 1 },
-	385: { global: 1 },
-	386: { global: 1 },
-	387: { global: 1 },
-	388: { global: 1 },
-	389: { global: 1 },
-	390: { global: 1 },
-	391: { global: 1 },
-	392: { global: 1 },
-	393: { global: 1 },
-	394: { global: 1 },
-	395: { global: 1 },
-	396: { global: 1 },
-	397: { global: 1 },
-	398: { global: 1 },
-	399: { global: 1 },
-	400: { global: 1 },
-	401: { global: 1 },
-	402: { global: 1 },
-	403: { promo: 1 },
-	404: { global: 1 },
-	405: { global: 1 },
-	406: { global: 1 },
-	407: { global: 1 },
-	408: { global: 1 },
-	409: { global: 1, rr: 1, rro: 1 },
-	410: { global: 1, rr: 1, rro: 1 },
-	411: { global: 1, rr: 1, rro: 1 },
-	412: { global: 1, rr: 1, rro: 1 },
-	413: { global: 1, rr: 1, rro: 1 },
-	414: { global: 1, rr: 1, rro: 1 },
-	415: { global: 1, rr: 1, rro: 1 },
-	416: { global: 1, rr: 1, rro: 1 },
-	417: { global: 1 },
-	418: { global: 1 },
-	419: { global: 1, promo: 1, special: 1 },
-	420: { global: 1 },
-	421: { global: 1 },
-	422: { global: 1 },
-	423: { global: 1 },
-	424: { global: 1 },
-	425: { global: 1 },
-	426: { global: 1 },
-	427: { global: 1 },
-	428: { global: 1 },
-	429: { global: 1 },
-	430: { global: 1 },
-	431: { global: 1 },
-	432: { global: 1 },
-	433: { global: 1 },
-	434: { global: 1 },
-	435: { global: 1 },
-	436: { global: 1 },
-	437: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	438: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	439: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	440: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	441: { global: 1 },
-	442: { global: 1 },
-	443: { global: 1 },
-	444: { global: 1 },
-	445: { global: 1 },
-	446: { global: 1 },
-	447: { global: 1 },
-	448: { global: 1, rr: 1, rro: 1 },
-	449: { global: 1, rr: 1, rro: 1 },
-	450: { global: 1, rr: 1, rro: 1 },
-	451: { global: 1, rr: 1, rro: 1 },
-	452: { global: 1, rr: 1, rro: 1 },
-	453: { global: 1, rr: 1, rro: 1 },
-	454: { global: 1, rr: 1, rro: 1 },
-	455: { global: 1, rr: 1, rro: 1 },
-	456: { global: 1, rr: 1, rro: 1 },
-	457: { global: 1, rr: 1, rro: 1 },
-	458: { global: 1, rr: 1, rro: 1 },
-	459: { global: 1, rr: 1, rro: 1 },
+    355: { global: 1 },
+    356: { global: 1, rr: 1, rro: 1 },
+    357: { global: 1, rr: 1, rro: 1 },
+    358: { global: 1, rr: 1, rro: 1 },
+    359: { global: 1, rr: 1, rro: 1 },
+    360: { global: 1, rr: 1, rro: 1 },
+    361: { global: 1, rr: 1, rro: 1 },
+    362: { global: 1, rr: 1, rro: 1 },
+    363: { global: 1, rr: 1, rro: 1 },
+    364: { global: 1, rr: 1, rro: 1 },
+    365: { global: 1, rr: 1, rro: 1 },
+    366: { global: 1, rr: 1, rro: 1 },
+    367: { global: 1, rr: 1, rro: 1 },
+    368: { global: 1 },
+    369: { global: 1 },
+    370: { global: 1 },
+    371: { global: 1 },
+    372: { global: 1 },
+    373: { global: 1 },
+    374: { global: 1 },
+    375: { global: 1 },
+    376: { global: 1 },
+    377: { global: 1 },
+    378: { global: 1 },
+    379: { global: 1 },
+    380: { global: 1 },
+    381: { global: 1 },
+    382: { global: 1 },
+    383: { global: 1 },
+    384: { global: 1 },
+    385: { global: 1 },
+    386: { global: 1 },
+    387: { global: 1 },
+    388: { global: 1 },
+    389: { global: 1 },
+    390: { global: 1 },
+    391: { global: 1 },
+    392: { global: 1 },
+    393: { global: 1 },
+    394: { global: 1 },
+    395: { global: 1 },
+    396: { global: 1 },
+    397: { global: 1 },
+    398: { global: 1 },
+    399: { global: 1 },
+    400: { global: 1 },
+    401: { global: 1 },
+    402: { global: 1 },
+    403: { promo: 1 },
+    404: { global: 1 },
+    405: { global: 1 },
+    406: { global: 1 },
+    407: { global: 1 },
+    408: { global: 1 },
+    409: { global: 1, rr: 1, rro: 1 },
+    410: { global: 1, rr: 1, rro: 1 },
+    411: { global: 1, rr: 1, rro: 1 },
+    412: { global: 1, rr: 1, rro: 1 },
+    413: { global: 1, rr: 1, rro: 1 },
+    414: { global: 1, rr: 1, rro: 1 },
+    415: { global: 1, rr: 1, rro: 1 },
+    416: { global: 1, rr: 1, rro: 1 },
+    417: { global: 1 },
+    418: { global: 1 },
+    419: { global: 1, promo: 1, special: 1 },
+    420: { global: 1 },
+    421: { global: 1 },
+    422: { global: 1 },
+    423: { global: 1 },
+    424: { global: 1 },
+    425: { global: 1 },
+    426: { global: 1 },
+    427: { global: 1 },
+    428: { global: 1 },
+    429: { global: 1 },
+    430: { global: 1 },
+    431: { global: 1 },
+    432: { global: 1 },
+    433: { global: 1 },
+    434: { global: 1 },
+    435: { global: 1 },
+    436: { global: 1 },
+    437: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    438: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    439: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    440: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    441: { global: 1 },
+    442: { global: 1 },
+    443: { global: 1 },
+    444: { global: 1 },
+    445: { global: 1 },
+    446: { global: 1 },
+    447: { global: 1 },
+    448: { global: 1, rr: 1, rro: 1 },
+    449: { global: 1, rr: 1, rro: 1 },
+    450: { global: 1, rr: 1, rro: 1 },
+    451: { global: 1, rr: 1, rro: 1 },
+    452: { global: 1, rr: 1, rro: 1 },
+    453: { global: 1, rr: 1, rro: 1 },
+    454: { global: 1, rr: 1, rro: 1 },
+    455: { global: 1, rr: 1, rro: 1 },
+    456: { global: 1, rr: 1, rro: 1 },
+    457: { global: 1, rr: 1, rro: 1 },
+    458: { global: 1, rr: 1, rro: 1 },
+    459: { global: 1, rr: 1, rro: 1 },
     460: { global: 1 },
     461: { global: 1 },
     462: { global: 1 },
-	463: { global: 1 },
-	464: { global: 1 },
-	465: { global: 1 },
-	466: { global: 1 },
-	467: { global: 1 },
-	468: { global: 1 },
-	469: { global: 1 },
-	470: { global: 1 },
-	471: { global: 1 },
-	472: { global: 1 },
-	473: { global: 1 },
-	474: { global: 1 },
-	475: { global: 1 },
-	476: { global: 1 },
-	477: { global: 1 },
-	478: { global: 1 },
-	479: { global: 1 },
-	480: { global: 1 },
-	481: { global: 1 },
-	482: { global: 1 },
-	483: { global: 1 },
-	484: { global: 1 },
-	485: { global: 1 },
-	486: { global: 1 },
-	487: { global: 1 },
-	488: { global: 1 },
-	489: { global: 1 },
-	490: { global: 1 },
-	491: { global: 1 },
-	492: { global: 1 },
-	493: { global: 1 },
-	494: { global: 1 },
-	495: { global: 1 },
-	496: { global: 1 },
-	497: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	498: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	499: { global: 1, rr: 1, rro: 1 },
-	500: { global: 1, rr: 1, rro: 1 },
-	501: { global: 1, rr: 1, rro: 1 },
-	502: { global: 1, rr: 1, rro: 1 },
-	503: { global: 1, rr: 1, rro: 1 },
-	504: { global: 1, rr: 1, rro: 1 },
-	505: { global: 1, rr: 1, rro: 1 },
-	506: { global: 1, rr: 1, rro: 1 },
-	507: { global: 1, rr: 1, rro: 1 },
-	508: { global: 1, rr: 1, rro: 1 },
-	509: { global: 1 },
-	510: { global: 1 },
-	511: { global: 1 },
-	512: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
-	513: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
-	514: { special: 1 },
+    463: { global: 1 },
+    464: { global: 1 },
+    465: { global: 1 },
+    466: { global: 1 },
+    467: { global: 1 },
+    468: { global: 1 },
+    469: { global: 1 },
+    470: { global: 1 },
+    471: { global: 1 },
+    472: { global: 1 },
+    473: { global: 1 },
+    474: { global: 1 },
+    475: { global: 1 },
+    476: { global: 1 },
+    477: { global: 1 },
+    478: { global: 1 },
+    479: { global: 1 },
+    480: { global: 1 },
+    481: { global: 1 },
+    482: { global: 1 },
+    483: { global: 1 },
+    484: { global: 1 },
+    485: { global: 1 },
+    486: { global: 1 },
+    487: { global: 1 },
+    488: { global: 1 },
+    489: { global: 1 },
+    490: { global: 1 },
+    491: { global: 1 },
+    492: { global: 1 },
+    493: { global: 1 },
+    494: { global: 1 },
+    495: { global: 1 },
+    496: { global: 1 },
+    497: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    498: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    499: { global: 1, rr: 1, rro: 1 },
+    500: { global: 1, rr: 1, rro: 1 },
+    501: { global: 1, rr: 1, rro: 1 },
+    502: { global: 1, rr: 1, rro: 1 },
+    503: { global: 1, rr: 1, rro: 1 },
+    504: { global: 1, rr: 1, rro: 1 },
+    505: { global: 1, rr: 1, rro: 1 },
+    506: { global: 1, rr: 1, rro: 1 },
+    507: { global: 1, rr: 1, rro: 1 },
+    508: { global: 1, rr: 1, rro: 1 },
+    509: { global: 1 },
+    510: { global: 1 },
+    511: { global: 1 },
+    512: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
+    513: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
+    514: { special: 1 },
     515: { global: 1 },
     516: { global: 1 },
     517: { global: 1 },
     518: { global: 1 },
-	519: { rr: 1, rro: 1 },
-	520: { rr: 1, rro: 1 },
-	521: { rr: 1, rro: 1 },
-	522: { rr: 1, rro: 1 },
-	523: { rr: 1, rro: 1 },
-	524: { rr: 1, rro: 1 },
-	525: { rr: 1, rro: 1 },
-	526: { rr: 1, rro: 1 },
-	527: { rr: 1, rro: 1 },
-	528: { rr: 1, rro: 1 },
-	529: { global: 1, rr: 1, rro: 1 },
-	530: { global: 1, rr: 1, rro: 1 },
-	531: { promo: 1, global: 1 },
-	532: { promo: 1, global: 1 },
-	533: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	534: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	535: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	536: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    519: { rr: 1, rro: 1 },
+    520: { rr: 1, rro: 1 },
+    521: { rr: 1, rro: 1 },
+    522: { rr: 1, rro: 1 },
+    523: { rr: 1, rro: 1 },
+    524: { rr: 1, rro: 1 },
+    525: { rr: 1, rro: 1 },
+    526: { rr: 1, rro: 1 },
+    527: { rr: 1, rro: 1 },
+    528: { rr: 1, rro: 1 },
+    529: { global: 1, rr: 1, rro: 1 },
+    530: { global: 1, rr: 1, rro: 1 },
+    531: { promo: 1, global: 1 },
+    532: { promo: 1, global: 1 },
+    533: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    534: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    535: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    536: { rr: 1, rro: 1, lrr: 1, global: 1 },
     537: { global: 1 },
     538: { global: 1 },
     539: { global: 1 },
     540: { global: 1 },
-	541: { global: 1 },
-	542: { global: 1 },
-	543: { global: 1 },
-	544: { global: 1 },
-	545: { global: 1 },
-	546: { global: 1 },
-	547: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	548: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	549: { global: 1 },
-	550: { global: 1 },
-	551: { global: 1 },
-	552: { global: 1 },
-	553: { rr: 1, rro: 1 },
-	554: { rr: 1, rro: 1 },
-	555: { rr: 1, rro: 1 },
-	556: { rr: 1, rro: 1 },
-	557: { rr: 1, rro: 1 },
-	558: { rr: 1, rro: 1 },
-	559: { rr: 1, rro: 1 },
-	560: { rr: 1, rro: 1 },
-	561: { rr: 1, rro: 1, global: 1 },
-	562: { rr: 1, rro: 1, global: 1 },
-	563: { global: 1 },
-	564: { global: 1 },
-	565: { global: 1 },
-	566: { global: 1 },
-	567: { global: 1 },
-	568: { global: 1 },
-	569: { global: 1 },
-	570: { global: 1 },
-	571: { global: 1 },
-	572: { global: 1 },
-	573: { global: 1 },
+    541: { global: 1 },
+    542: { global: 1 },
+    543: { global: 1 },
+    544: { global: 1 },
+    545: { global: 1 },
+    546: { global: 1 },
+    547: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    548: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    549: { global: 1 },
+    550: { global: 1 },
+    551: { global: 1 },
+    552: { global: 1 },
+    553: { rr: 1, rro: 1 },
+    554: { rr: 1, rro: 1 },
+    555: { rr: 1, rro: 1 },
+    556: { rr: 1, rro: 1 },
+    557: { rr: 1, rro: 1 },
+    558: { rr: 1, rro: 1 },
+    559: { rr: 1, rro: 1 },
+    560: { rr: 1, rro: 1 },
+    561: { rr: 1, rro: 1, global: 1 },
+    562: { rr: 1, rro: 1, global: 1 },
+    563: { global: 1 },
+    564: { global: 1 },
+    565: { global: 1 },
+    566: { global: 1 },
+    567: { global: 1 },
+    568: { global: 1 },
+    569: { global: 1 },
+    570: { global: 1 },
+    571: { global: 1 },
+    572: { global: 1 },
+    573: { global: 1 },
     574: { global: 1 },
     575: { global: 1 },
-	576: { special: 1 },
-	577: { rr: 1, rro: 1, global: 1 },
-	578: { rr: 1, rro: 1, global: 1 },
-	579: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	580: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	581: { global: 1 },
-	582: { global: 1 },
-	583: { global: 1 },
-	584: { global: 1 },
-	585: { global: 1, rr: 1, rro: 1 },
-	586: { global: 1, rr: 1, rro: 1 },
-	587: { global: 1, rr: 1, rro: 1 },
-	588: { global: 1, rr: 1, rro: 1 },
-	589: { global: 1, rr: 1, rro: 1 },
-	590: { global: 1, rr: 1, rro: 1 },
-	591: { global: 1 },
-	592: { global: 1 },
-	593: { global: 1 },
-	594: { global: 1 },
-	595: { global: 1 },
-	596: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	597: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	598: { global: 1 },
-	599: { global: 1 },
-	600: { global: 1 },
-	601: { global: 1 },
-	602: { global: 1 },
-	603: { global: 1 },
-	604: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	605: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    576: { special: 1 },
+    577: { rr: 1, rro: 1, global: 1 },
+    578: { rr: 1, rro: 1, global: 1 },
+    579: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    580: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    581: { global: 1 },
+    582: { global: 1 },
+    583: { global: 1 },
+    584: { global: 1 },
+    585: { global: 1, rr: 1, rro: 1 },
+    586: { global: 1, rr: 1, rro: 1 },
+    587: { global: 1, rr: 1, rro: 1 },
+    588: { global: 1, rr: 1, rro: 1 },
+    589: { global: 1, rr: 1, rro: 1 },
+    590: { global: 1, rr: 1, rro: 1 },
+    591: { global: 1 },
+    592: { global: 1 },
+    593: { global: 1 },
+    594: { global: 1 },
+    595: { global: 1 },
+    596: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    597: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    598: { global: 1 },
+    599: { global: 1 },
+    600: { global: 1 },
+    601: { global: 1 },
+    602: { global: 1 },
+    603: { global: 1 },
+    604: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    605: { rr: 1, rro: 1, lrr: 1, global: 1 },
     606: { global: 1 },
     607: { global: 1 },
     608: { global: 1 },
     609: { global: 1 },
-	610: { global: 1 },
-	611: { global: 1 },
-	612: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	613: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	614: { global: 1 },
-	615: { global: 1 },
-	616: { global: 1 },
-	617: { global: 1 },
-	618: { global: 1 },
-	619: { global: 1 },
-	620: { global: 1 },
-	621: { global: 1 },
-	622: { global: 1 },
-	623: { global: 1 },
-	624: { global: 1 },
-	625: { global: 1 },
-	626: { global: 1 },
-	627: { global: 1 },
-	628: { global: 1 },
-	629: { global: 1 },
-	630: { global: 1 },
-	631: { global: 1 },
-	632: { global: 1 },
-	633: { global: 1 },
-	634: { global: 1 },
-	635: { global: 1 },
-	636: { global: 1 },
-	637: { global: 1 },
-	638: { rr: 1, rro: 1, global: 1 },
-	639: { rr: 1, rro: 1, global: 1 },
-	640: { rr: 1, rro: 1, global: 1 },
-	641: { rr: 1, rro: 1, global: 1 },
-	642: { rr: 1, rro: 1, global: 1 },
-	643: { rr: 1, rro: 1, global: 1 },
-	644: { rr: 1, rro: 1, global: 1 },
-	645: { rr: 1, rro: 1, global: 1 },
-	646: { rr: 1, rro: 1, global: 1 },
-	647: { rr: 1, rro: 1, global: 1 },
-	648: { rr: 1, rro: 1, global: 1 },
-	649: { rr: 1, rro: 1, global: 1 },
-	650: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	651: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	652: { global: 1 },
-	653: { global: 1 },
-	654: { global: 1 },
+    610: { global: 1 },
+    611: { global: 1 },
+    612: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    613: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    614: { global: 1 },
+    615: { global: 1 },
+    616: { global: 1 },
+    617: { global: 1 },
+    618: { global: 1 },
+    619: { global: 1 },
+    620: { global: 1 },
+    621: { global: 1 },
+    622: { global: 1 },
+    623: { global: 1 },
+    624: { global: 1 },
+    625: { global: 1 },
+    626: { global: 1 },
+    627: { global: 1 },
+    628: { global: 1 },
+    629: { global: 1 },
+    630: { global: 1 },
+    631: { global: 1 },
+    632: { global: 1 },
+    633: { global: 1 },
+    634: { global: 1 },
+    635: { global: 1 },
+    636: { global: 1 },
+    637: { global: 1 },
+    638: { rr: 1, rro: 1, global: 1 },
+    639: { rr: 1, rro: 1, global: 1 },
+    640: { rr: 1, rro: 1, global: 1 },
+    641: { rr: 1, rro: 1, global: 1 },
+    642: { rr: 1, rro: 1, global: 1 },
+    643: { rr: 1, rro: 1, global: 1 },
+    644: { rr: 1, rro: 1, global: 1 },
+    645: { rr: 1, rro: 1, global: 1 },
+    646: { rr: 1, rro: 1, global: 1 },
+    647: { rr: 1, rro: 1, global: 1 },
+    648: { rr: 1, rro: 1, global: 1 },
+    649: { rr: 1, rro: 1, global: 1 },
+    650: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    651: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    652: { global: 1 },
+    653: { global: 1 },
+    654: { global: 1 },
     655: { global: 1},
     656: { global: 1},
     657: { global: 1},
     658: { global: 1},
-	660: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	661: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	663: { global: 1 },
-	664: { global: 1 },
-	665: { global: 1 },
-	666: { global: 1 },
-	667: { global: 1 },
-	668: { rr: 1, rro: 1, global: 1 },
-	669: { rr: 1, rro: 1, global: 1 },
-	670: { rr: 1, rro: 1, global: 1 },
-	671: { rr: 1, rro: 1, global: 1 },
-	672: { rr: 1, rro: 1, global: 1 },
-	673: { rr: 1, rro: 1, global: 1 },
-	674: { rr: 1, rro: 1, global: 1 },
-	675: { rr: 1, rro: 1, global: 1 },
-	676: { rr: 1, rro: 1, global: 1 },
-	677: { rr: 1, rro: 1, global: 1 },
-	678: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	679: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    660: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    661: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    663: { global: 1 },
+    664: { global: 1 },
+    665: { global: 1 },
+    666: { global: 1 },
+    667: { global: 1 },
+    668: { rr: 1, rro: 1, global: 1 },
+    669: { rr: 1, rro: 1, global: 1 },
+    670: { rr: 1, rro: 1, global: 1 },
+    671: { rr: 1, rro: 1, global: 1 },
+    672: { rr: 1, rro: 1, global: 1 },
+    673: { rr: 1, rro: 1, global: 1 },
+    674: { rr: 1, rro: 1, global: 1 },
+    675: { rr: 1, rro: 1, global: 1 },
+    676: { rr: 1, rro: 1, global: 1 },
+    677: { rr: 1, rro: 1, global: 1 },
+    678: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    679: { rr: 1, rro: 1, lrr: 1, global: 1 },
     680: { global: 1 },
     681: { global: 1 },
     682: { global: 1 },
@@ -686,43 +686,43 @@ window.flags = {
     688: { global: 1 },
     689: { global: 1 },
     690: { global: 1 },
-	691: { global: 1 },
-	692: { global: 1 },
-	693: { global: 1 },
-	694: { global: 1 },
-	695: { global: 1 },
-	696: { global: 1 },
-	697: { global: 1 },
-	698: { global: 1 },
-	699: { global: 1 },
-	700: { global: 1 },
-	701: { global: 1 },
-	702: { global: 1 },
-	703: { global: 1 },
-	704: { global: 1 },
-	705: { global: 1 },
-	706: { global: 1 },
-	707: { global: 1 },
-	708: { global: 1 },
-	709: { global: 1 },
-	710: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	711: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	712: { global: 1 },
-	713: { global: 1 },
-	714: { global: 1 },
-	715: { global: 1 },
-	716: { global: 1 },
-	717: { rr: 1, rro: 1, global: 1 },
-	718: { rr: 1, rro: 1, global: 1 },
-	719: { rr: 1, rro: 1, global: 1 },
-	720: { rr: 1, rro: 1, global: 1 },
+    691: { global: 1 },
+    692: { global: 1 },
+    693: { global: 1 },
+    694: { global: 1 },
+    695: { global: 1 },
+    696: { global: 1 },
+    697: { global: 1 },
+    698: { global: 1 },
+    699: { global: 1 },
+    700: { global: 1 },
+    701: { global: 1 },
+    702: { global: 1 },
+    703: { global: 1 },
+    704: { global: 1 },
+    705: { global: 1 },
+    706: { global: 1 },
+    707: { global: 1 },
+    708: { global: 1 },
+    709: { global: 1 },
+    710: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    711: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    712: { global: 1 },
+    713: { global: 1 },
+    714: { global: 1 },
+    715: { global: 1 },
+    716: { global: 1 },
+    717: { rr: 1, rro: 1, global: 1 },
+    718: { rr: 1, rro: 1, global: 1 },
+    719: { rr: 1, rro: 1, global: 1 },
+    720: { rr: 1, rro: 1, global: 1 },
     721: { global: 1 },
-	722: { global: 1 },
+    722: { global: 1 },
     723: { global: 1 },
-	724: { global: 1 },
-	725: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	726: { global: 1, rr: 1, rro: 1, lrr: 1 },
-	727: { special: 1 },
+    724: { global: 1 },
+    725: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    726: { global: 1, rr: 1, rro: 1, lrr: 1 },
+    727: { special: 1 },
     728: { global: 1 },
     729: { global: 1 },
     730: { global: 1 },
@@ -735,36 +735,36 @@ window.flags = {
     737: { global: 1 },
     738: { global: 1 },
     739: { global: 1 },
-	740: { global: 1 },
-	741: { global: 1 },
-	742: { global: 1 },
-	743: { global: 1 },
-	744: { rr: 1, rro: 1, lrr: 1 },
-	745: { rr: 1, rro: 1, lrr: 1 },
-	746: { promo: 1 },
-	747: { rr: 1, rro: 1, global: 1 },
-	748: { rr: 1, rro: 1, global: 1 },
-	749: { rr: 1, rro: 1, global: 1 },
-	750: { rr: 1, rro: 1, global: 1 },
-	751: { rr: 1, rro: 1, global: 1 },
-	752: { rr: 1, rro: 1, global: 1 },
-	753: { rr: 1, rro: 1, global: 1 },
-	754: { rr: 1, rro: 1, global: 1 },
-	755: { rr: 1, rro: 1, global: 1 },
-	756: { rr: 1, rro: 1, global: 1 },
-	757: { rr: 1, rro: 1, global: 1 },
-	758: { rr: 1, rro: 1, global: 1 },
-	759: { rr: 1, rro: 1, global: 1 },
-	760: { rr: 1, rro: 1, global: 1 },
-	761: { global: 1 },
-	762: { global: 1 },
-	763: { global: 1 },
-	764: { global: 1 },
-	765: { global: 1 },
-	766: { global: 1 },
-	767: { global: 1 },
-	768: { global: 1 },
-	769: { global: 1 },
+    740: { global: 1 },
+    741: { global: 1 },
+    742: { global: 1 },
+    743: { global: 1 },
+    744: { rr: 1, rro: 1, lrr: 1 },
+    745: { rr: 1, rro: 1, lrr: 1 },
+    746: { promo: 1 },
+    747: { rr: 1, rro: 1, global: 1 },
+    748: { rr: 1, rro: 1, global: 1 },
+    749: { rr: 1, rro: 1, global: 1 },
+    750: { rr: 1, rro: 1, global: 1 },
+    751: { rr: 1, rro: 1, global: 1 },
+    752: { rr: 1, rro: 1, global: 1 },
+    753: { rr: 1, rro: 1, global: 1 },
+    754: { rr: 1, rro: 1, global: 1 },
+    755: { rr: 1, rro: 1, global: 1 },
+    756: { rr: 1, rro: 1, global: 1 },
+    757: { rr: 1, rro: 1, global: 1 },
+    758: { rr: 1, rro: 1, global: 1 },
+    759: { rr: 1, rro: 1, global: 1 },
+    760: { rr: 1, rro: 1, global: 1 },
+    761: { global: 1 },
+    762: { global: 1 },
+    763: { global: 1 },
+    764: { global: 1 },
+    765: { global: 1 },
+    766: { global: 1 },
+    767: { global: 1 },
+    768: { global: 1 },
+    769: { global: 1 },
     770: { global: 1 },
     771: { global: 1 },
     772: { global: 1 },
@@ -777,25 +777,25 @@ window.flags = {
     779: { global: 1 },
     780: { global: 1 },
     781: { global: 1 },
-	782: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	783: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	784: { rr: 1, rro: 1 },
-	785: { rr: 1, rro: 1 },
-	786: { rr: 1, rro: 1 },
-	787: { rr: 1, rro: 1 },
-	788: { rr: 1, rro: 1 },
-	789: { rr: 1, rro: 1 },
-	790: { rr: 1, rro: 1 },
-	791: { rr: 1, rro: 1 },
-	792: { rr: 1, rro: 1 },
-	793: { rr: 1, rro: 1 },
+    782: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    783: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    784: { rr: 1, rro: 1 },
+    785: { rr: 1, rro: 1 },
+    786: { rr: 1, rro: 1 },
+    787: { rr: 1, rro: 1 },
+    788: { rr: 1, rro: 1 },
+    789: { rr: 1, rro: 1 },
+    790: { rr: 1, rro: 1 },
+    791: { rr: 1, rro: 1 },
+    792: { rr: 1, rro: 1 },
+    793: { rr: 1, rro: 1 },
     796: { global: 1 },
     797: { global: 1 },
     798: { global: 1 },
     799: { global: 1 },
     800: { global: 1 },
-	801: { rr: 1, rro: 1, lrr: 1 },
-	802: { rr: 1, rro: 1, lrr: 1 },
+    801: { rr: 1, rro: 1, lrr: 1 },
+    802: { rr: 1, rro: 1, lrr: 1 },
     803: { global: 1 },
     804: { global: 1 },
     805: { global: 1 },
@@ -822,44 +822,44 @@ window.flags = {
     826: { global: 1 },
     827: { global: 1 },
     828: { rr: 1, rro: 1, lrr: 1 },
-	829: { rr: 1, rro: 1, lrr: 1 },
+    829: { rr: 1, rro: 1, lrr: 1 },
     835: { global: 1 },
     836: { global: 1 },
-	837: { rr: 1, rro: 1, global: 1 },
-	838: { rr: 1, rro: 1, global: 1 },
-	839: { rr: 1, rro: 1, global: 1 },
-	840: { rr: 1, rro: 1, global: 1 },
-	841: { rr: 1, rro: 1, global: 1 },
-	842: { rr: 1, rro: 1, global: 1 },
-	843: { rr: 1, rro: 1, global: 1 },
-	844: { rr: 1, rro: 1, global: 1 },
-	845: { rr: 1, rro: 1, global: 1 },
-	846: { rr: 1, rro: 1, global: 1 },
+    837: { rr: 1, rro: 1, global: 1 },
+    838: { rr: 1, rro: 1, global: 1 },
+    839: { rr: 1, rro: 1, global: 1 },
+    840: { rr: 1, rro: 1, global: 1 },
+    841: { rr: 1, rro: 1, global: 1 },
+    842: { rr: 1, rro: 1, global: 1 },
+    843: { rr: 1, rro: 1, global: 1 },
+    844: { rr: 1, rro: 1, global: 1 },
+    845: { rr: 1, rro: 1, global: 1 },
+    846: { rr: 1, rro: 1, global: 1 },
     847: { global: 1 },
     848: { global: 1 },
     849: { global: 1 },
     850: { global: 1 },
     851: { global: 1 },
-	852: { global: 1 },
+    852: { global: 1 },
     853: { global: 1 },
-	854: { global: 1 },
-	855: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	856: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	857: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	858: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	863: { special: 1 },
-	869: { rr: 1, rro: 1, global: 1 },
-	870: { rr: 1, rro: 1, global: 1 },
-	871: { rr: 1, rro: 1, global: 1 },
-	872: { rr: 1, rro: 1, global: 1 },
-	873: { rr: 1, rro: 1, global: 1 },
-	874: { rr: 1, rro: 1, global: 1 },
-	875: { rr: 1, rro: 1, global: 1 },
-	876: { rr: 1, rro: 1, global: 1 },
-	877: { rr: 1, rro: 1, global: 1 },
-	878: { rr: 1, rro: 1, global: 1 },
-	879: { rr: 1, rro: 1, global: 1 },
-	880: { rr: 1, rro: 1, global: 1 },
+    854: { global: 1 },
+    855: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    856: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    857: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    858: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    863: { special: 1 },
+    869: { rr: 1, rro: 1, global: 1 },
+    870: { rr: 1, rro: 1, global: 1 },
+    871: { rr: 1, rro: 1, global: 1 },
+    872: { rr: 1, rro: 1, global: 1 },
+    873: { rr: 1, rro: 1, global: 1 },
+    874: { rr: 1, rro: 1, global: 1 },
+    875: { rr: 1, rro: 1, global: 1 },
+    876: { rr: 1, rro: 1, global: 1 },
+    877: { rr: 1, rro: 1, global: 1 },
+    878: { rr: 1, rro: 1, global: 1 },
+    879: { rr: 1, rro: 1, global: 1 },
+    880: { rr: 1, rro: 1, global: 1 },
     888: { global: 1 },
     889: { global: 1 },
     890: { global: 1 },
@@ -867,34 +867,34 @@ window.flags = {
     892: { global: 1 },
     893: { global: 1 },
     894: { global: 1 },
-	895: { special: 1, global: 1 },
-	896: { special: 1, global: 1 },
-	905: { rr: 1, rro: 1, global: 1 },
-	906: { rr: 1, rro: 1, global: 1 },
-	907: { rr: 1, rro: 1, global: 1 },
-	908: { rr: 1, rro: 1, global: 1 },
-	909: { rr: 1, rro: 1, global: 1 },
-	910: { rr: 1, rro: 1, global: 1 },
-	911: { rr: 1, rro: 1, global: 1 },
-	912: { rr: 1, rro: 1, global: 1 },
-	913: { rr: 1, rro: 1, global: 1 },
-	914: { rr: 1, rro: 1, global: 1 },
-	915: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	916: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    895: { special: 1, global: 1 },
+    896: { special: 1, global: 1 },
+    905: { rr: 1, rro: 1, global: 1 },
+    906: { rr: 1, rro: 1, global: 1 },
+    907: { rr: 1, rro: 1, global: 1 },
+    908: { rr: 1, rro: 1, global: 1 },
+    909: { rr: 1, rro: 1, global: 1 },
+    910: { rr: 1, rro: 1, global: 1 },
+    911: { rr: 1, rro: 1, global: 1 },
+    912: { rr: 1, rro: 1, global: 1 },
+    913: { rr: 1, rro: 1, global: 1 },
+    914: { rr: 1, rro: 1, global: 1 },
+    915: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    916: { rr: 1, rro: 1, lrr: 1, global: 1 },
     921: { rr: 1, rro: 1, lrr: 1, global: 1 },
     922: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	934: { rr: 1, rro: 1, global: 1 },
-	935: { rr: 1, rro: 1, global: 1 },
-	936: { rr: 1, rro: 1, global: 1 },
-	937: { rr: 1, rro: 1, global: 1 },
-	938: { rr: 1, rro: 1, global: 1 },
-	939: { rr: 1, rro: 1, global: 1 },
-	940: { rr: 1, rro: 1, global: 1 },
-	941: { rr: 1, rro: 1, global: 1 },
-	942: { rr: 1, rro: 1, global: 1 },
-	943: { rr: 1, rro: 1, global: 1 },
-	944: { rr: 1, rro: 1, lrr: 1, global: 1 },
-	945: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    934: { rr: 1, rro: 1, global: 1 },
+    935: { rr: 1, rro: 1, global: 1 },
+    936: { rr: 1, rro: 1, global: 1 },
+    937: { rr: 1, rro: 1, global: 1 },
+    938: { rr: 1, rro: 1, global: 1 },
+    939: { rr: 1, rro: 1, global: 1 },
+    940: { rr: 1, rro: 1, global: 1 },
+    941: { rr: 1, rro: 1, global: 1 },
+    942: { rr: 1, rro: 1, global: 1 },
+    943: { rr: 1, rro: 1, global: 1 },
+    944: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    945: { rr: 1, rro: 1, lrr: 1, global: 1 },
     954: { global: 1 },
     955: { global: 1 },
     956: { global: 1 },
@@ -916,8 +916,8 @@ window.flags = {
     972: { global: 1 },
     973: { global: 1 },
     974: { global: 1 },
-	975: { rr: 1, rro: 1, lrr: 1 },
-	976: { rr: 1, rro: 1, lrr: 1 },
+    975: { rr: 1, rro: 1, lrr: 1 },
+    976: { rr: 1, rro: 1, lrr: 1 },
     990: { rr: 1, rro: 1, global: 1 },
     991: { rr: 1, rro: 1, global: 1 },
     992: { rr: 1, rro: 1, global: 1 },
@@ -930,15 +930,15 @@ window.flags = {
     999: { rr: 1, rro: 1, global: 1 },
     1000: { rr: 1, rro: 1, global: 1 },
     1001: { rr: 1, rro: 1, global: 1 },
-	1007: { rr: 1, rro: 1, lrr: 1 },
+    1007: { rr: 1, rro: 1, lrr: 1 },
     1008: { rr: 1, rro: 1, lrr: 1 },
-	1009: { promo: 1 },
+    1009: { promo: 1 },
     1010: { global: 1 },
     1011: { global: 1 },
     1012: { global: 1 },
     1013: { global: 1 },
     1014: { global: 1 },
-	1020: { rr: 1, rro: 1, lrr: 1 },
+    1020: { rr: 1, rro: 1, lrr: 1 },
     1021: { rr: 1, rro: 1, lrr: 1 },
     1022: { promo: 1 },
     1024: { rr: 1, rro: 1, global: 1 },
@@ -957,7 +957,7 @@ window.flags = {
     1045: { rr: 1, rro: 1 },
     1053: { rr: 1, rro: 1, lrr: 1 },
     1054: { rr: 1, rro: 1, lrr: 1 },
-	1074: { rr: 1, rro: 1, global: 1 },
+    1074: { rr: 1, rro: 1, global: 1 },
     1075: { rr: 1, rro: 1, global: 1 },
     1076: { rr: 1, rro: 1, global: 1 },
     1077: { rr: 1, rro: 1, global: 1 },
@@ -969,11 +969,11 @@ window.flags = {
     1083: { rr: 1, rro: 1, global: 1 },
     1084: { rr: 1, rro: 1, global: 1 },
     1085: { rr: 1, rro: 1, global: 1 },
-	1092: { rr: 1, rro: 1, lrr: 1 },
-	1093: { rr: 1, rro: 1, lrr: 1 },
+    1092: { rr: 1, rro: 1, lrr: 1 },
+    1093: { rr: 1, rro: 1, lrr: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
     1100: { rr: 1, rro: 1, lrr: 1 },
-	1114: { rr: 1, rro: 1, global: 1 },
+    1114: { rr: 1, rro: 1, global: 1 },
     1115: { rr: 1, rro: 1, global: 1 },
     1116: { rr: 1, rro: 1, global: 1 },
     1117: { rr: 1, rro: 1, global: 1 },
@@ -985,7 +985,7 @@ window.flags = {
     1123: { rr: 1, rro: 1 },
     1124: { rr: 1, rro: 1 },
     1125: { rr: 1, rro: 1 },
-	1126: { rr: 1, rro: 1 },
+    1126: { rr: 1, rro: 1 },
     1127: { rr: 1, rro: 1 },
     1128: { rr: 1, rro: 1 },
     1129: { rr: 1, rro: 1 },
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 643173846..21d11c6cc 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -205,9 +205,9 @@ window.matchers = [
     },
     
     {
-    	name: 'Full-board orb controllers',
-    	target: 'special',
-    	matcher: /(Changes[^,]+all orbs|Changes the orbs in|Changes[^,]*every other orb)/i
+        name: 'Full-board orb controllers',
+        target: 'special',
+        matcher: /(Changes[^,]+all orbs|Changes the orbs in|Changes[^,]*every other orb)/i
     },
 
     {
@@ -378,18 +378,18 @@ window.matchers = [
         target: 'special',
         matcher: /Protects from defeat/i
     },
-	
-	{
-		name: 'Special cooldown reducer',
-		target: 'special',
-		matcher: /reduces special cooldown/i
-	},
-	
-	{
-		name: 'Paralysis reducers',
+    
+    {
+        name: 'Special cooldown reducer',
+        target: 'special',
+        matcher: /reduces special cooldown/i
+    },
+    
+    {
+        name: 'Paralysis reducers',
         target: 'special',
         matcher: /(reduces|removes).+Paralysis/i 
-	},
+    },
     
     /* * * * * Sailor * * * * */
     
diff --git a/common/data/specials.js b/common/data/specials.js
index e347c6c4b..b95708176 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1,1067 +1,1067 @@
 window.specials = {
-	18: {
-		def: function(p) { return 0.5; }
-	},
-	24: {
-		def: function(p) { return 0.5; }
-	},
-	34: {
-		def: function(p) { return 0; }
-	},
-	127: {
-		def: function(p) { return 0.5; }
-	},
-	137: {
-		def: function(p) { return 0.5; }
-	},
-	148: {
-		def: function(p) { return 0.5; }
-	},
-	158: {
-		def: function(p) { return 0.5; }
-	},
-	206: {
-		def: function(p) { return 0.5; }
-	},
-	209: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		type: "type"
-	},
-	210: {
-		atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-		type: "type"
-	},
-	222: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		type: "type"
-	},
-	223: {
-		atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-		type: "type"
-	},
-	263: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	267: {
-		def: function(p) { return 0.5; }
-	},
-	275: {
-		def: function(p) { return 0.5; }
-	},
-	285: {
-		def: function(p) { return 0.5; }
-	},
-	295: {
-		def: function(p) { return 0.5; }
-	},
-	309: {
-		def: function(p) { return 0.5; }
-	},
-	310: {
-		def: function(p) { return 0.5; }
-	},
-	313: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		type: "class"
-	},
-	314: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		type: "class"
-	},
-	323: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	324: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	352: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-		type: "class"
-	},
-	353: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-		type: "class"
-	},
-	382: {
-		def: function(p) { return 0.5; }
-	},
-	385: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-		type: "class"
-	},
-	386: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-		type: "class"
-	},
-	391: {
-		def: function(p) { return 0.2; }
-	},
-	392: {
-		def: function(p) { return 0.2; }
-	},
-	395: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	396: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	399: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		type: "type"
-	},
-	400: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-		type: "type"
-	},
-	401: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
-		type: "class"
-	},
-	402: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
-		type: "class"
-	},
-	404: {
-		rcv: function(p) { return 2; }
-	},
-	405: {
-		rcv: function(p) { return 2; }
-	},
-	406: {
-		atk: function(p) { return 1.2; },
-		type: "type"
-	},
-	417: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2); }
-	},
-	418: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2); }
-	},
-	419: {
-		def: function(p) { return 0.5; }
-	},
-	423: {
-		def: function(p) { return 0.5; }
-	},
-	424: {
-		def: function(p) { return 0.5; }
-	},
-	426: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.05 : 1; },
-		type: "type"
-	},
-	429: {
-		def: function(p) { return 0.5; }
-	},
-	430: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	431: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	434: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	450: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		type: "class"
-	},
-	451: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		type: "class"
-	},
-	454: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		type: "type"
-	},
-	455: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-		type: "type"
-	},
-	458: {
-		atk: function(p) { return 1.5; },
-		type: "type"
-	},
-	459: {
-		atk: function(p) { return 1.5; },
-		type: "type"
-	},
-	461: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-		type: "class"
-	},
-	462: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-		type: "class"
-	},
-	465: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	468: {
-		rcv: function(p) { return 1.5; }
-	},
-	470: {
-		rcv: function(p) { return 1.5; }
-	},
-	487: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
-		type: "type"
-	},
-	488: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-		type: "type"
-	},
-	489: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-		type: "type"
-	},
-	490: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
-		type: "type"
-	},
-	491: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-		type: "type"
-	},
-	492: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-		type: "type"
-	},
-	505: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
-		type: "type"
-	},
-	506: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
-		type: "type"
-	},
-	509: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		type: "class"
-	},
-	510: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-		type: "class"
-	},
-	511: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
-		type: "class"
-	},
-	514: {
-		def: function(p) { return 0.5; },
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		type: "type"
-	},
-	517: {
-		atk: function(p) { return 1.05; },
-		type: "type"
-	},
-	518: {
-		atk: function(p) { return 1.05; },
-		type: "type"
-	},
-	519: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		type: "type"
-	},
-	520: {
-		atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		type: "type"
-	},
-	529: {
-		def: function(p) { return 0; }
-	},
-	530: {
-		def: function(p) { return 0; }
-	},
-	533: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	534: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	542: {
-		rcv: function(p) { return 2; }
-	},
-	545: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		type: "type"
-	},
-	546: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		type: "type"
-	},
-	549: {
-		atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
-	},
-	550: {
-		atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
-	},
+    18: {
+        def: function(p) { return 0.5; }
+    },
+    24: {
+        def: function(p) { return 0.5; }
+    },
+    34: {
+        def: function(p) { return 0; }
+    },
+    127: {
+        def: function(p) { return 0.5; }
+    },
+    137: {
+        def: function(p) { return 0.5; }
+    },
+    148: {
+        def: function(p) { return 0.5; }
+    },
+    158: {
+        def: function(p) { return 0.5; }
+    },
+    206: {
+        def: function(p) { return 0.5; }
+    },
+    209: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        type: "type"
+    },
+    210: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        type: "type"
+    },
+    222: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        type: "type"
+    },
+    223: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        type: "type"
+    },
+    263: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    267: {
+        def: function(p) { return 0.5; }
+    },
+    275: {
+        def: function(p) { return 0.5; }
+    },
+    285: {
+        def: function(p) { return 0.5; }
+    },
+    295: {
+        def: function(p) { return 0.5; }
+    },
+    309: {
+        def: function(p) { return 0.5; }
+    },
+    310: {
+        def: function(p) { return 0.5; }
+    },
+    313: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
+    },
+    314: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
+    },
+    323: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    324: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    352: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        type: "class"
+    },
+    353: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        type: "class"
+    },
+    382: {
+        def: function(p) { return 0.5; }
+    },
+    385: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
+    },
+    386: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
+    },
+    391: {
+        def: function(p) { return 0.2; }
+    },
+    392: {
+        def: function(p) { return 0.2; }
+    },
+    395: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    396: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    399: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        type: "type"
+    },
+    400: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        type: "type"
+    },
+    401: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+        type: "class"
+    },
+    402: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+        type: "class"
+    },
+    404: {
+        rcv: function(p) { return 2; }
+    },
+    405: {
+        rcv: function(p) { return 2; }
+    },
+    406: {
+        atk: function(p) { return 1.2; },
+        type: "type"
+    },
+    417: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2); }
+    },
+    418: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2); }
+    },
+    419: {
+        def: function(p) { return 0.5; }
+    },
+    423: {
+        def: function(p) { return 0.5; }
+    },
+    424: {
+        def: function(p) { return 0.5; }
+    },
+    426: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.05 : 1; },
+        type: "type"
+    },
+    429: {
+        def: function(p) { return 0.5; }
+    },
+    430: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    431: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    434: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    450: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
+    451: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
+    454: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        type: "type"
+    },
+    455: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        type: "type"
+    },
+    458: {
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
+    459: {
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
+    461: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
+    },
+    462: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
+    },
+    465: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    468: {
+        rcv: function(p) { return 1.5; }
+    },
+    470: {
+        rcv: function(p) { return 1.5; }
+    },
+    487: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        type: "type"
+    },
+    488: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        type: "type"
+    },
+    489: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        type: "type"
+    },
+    490: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        type: "type"
+    },
+    491: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        type: "type"
+    },
+    492: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        type: "type"
+    },
+    505: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
+        type: "type"
+    },
+    506: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
+        type: "type"
+    },
+    509: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
+    },
+    510: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
+    },
+    511: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+        type: "class"
+    },
+    514: {
+        def: function(p) { return 0.5; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        type: "type"
+    },
+    517: {
+        atk: function(p) { return 1.05; },
+        type: "type"
+    },
+    518: {
+        atk: function(p) { return 1.05; },
+        type: "type"
+    },
+    519: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        type: "type"
+    },
+    520: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        type: "type"
+    },
+    529: {
+        def: function(p) { return 0; }
+    },
+    530: {
+        def: function(p) { return 0; }
+    },
+    533: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    534: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    542: {
+        rcv: function(p) { return 2; }
+    },
+    545: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        type: "type"
+    },
+    546: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        type: "type"
+    },
+    549: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
+    550: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
     552: {
-		def: function(p) { return 0; }
-	},
-	559: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	560: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	568: {
-		def: function(p) { return 0.5; }
-	},
-	569: {
-		def: function(p) { return 0.5; }
-	},
-	572: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-		type: "class",
-		onActivation: function(p) { p.tdata.lock = Math.max(1, p.tdata.lock); },
-		onDeactivation: function(p) { if (p.tdata.lock == 1) p.tdata.lock = 0; }
-	},
-	574: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-		type: "class"
-	},
-	575: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-		type: "class"
-	},
-	576: {
-		rcv: function(p) { return 1.5; }
-	},
-	582: {
-		atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-		type: "type"
-	},
-	589: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		type: "class"
-	},
-	590: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		type: "class"
-	},
-	596: {
-		def: function(p) { return 0.5; }
-	},
-	597: {
-		def: function(p) { return 0.5; }
-	},
-	600: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
-		type: "type"
-	},
-	601: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
-		type: "type"
-	},
-	602: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-		type: "type"
-	},
-	603: {
-		atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-		type: "type"
-	},
-	612: {
-		atkStatic: function(p) { return 45; },
-		rcvStatic: function(p) { return 45; },
-		type: "type"
-	},
-	613: {
-		atkStatic: function(p) { return 45; },
-		rcvStatic: function(p) { return 45; },
-		type: "type"
-	},
-	614: {
-		def: function(p) { return 0.5; }
-	},
-	617: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
-		type: "class"
-	},
-	622: {
-		rcvStatic: function(p) { return 100; },
-		type: "type"
-	},
-	632: {
-		def: function(p) { return 0.5; }
-	},
-	633: {
-		def: function(p) { return 0.5; }
-	},
-	634: {
-		atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
-		type: "type"
-	},
-	635: {
-		atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
-		type: "type"
-	},
-	637: {
-		atk: function(p) { return 1.3; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
-	},
-	642: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	643: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	644: {
-		atk: function(p) { return 1.2; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been delayed."
-	},
-	645: {
-		atk: function(p) { return 1.2; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been delayed."
-	},
-	648: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	649: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	650: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	651: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	655: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	656: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	660: {
-		def: function(p) { return 0.5; }
-	},
-	661: {
-		def: function(p) { return 0.5; }
-	},
-	665: {
-		atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
-	},
-	666: {
-		atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
-	},
-	668: {
-		atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[668].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[668].multiplier == 1.5 ? 1 : 0);
-			window.specials[668].multiplier = [1.5, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '667warning'
-			});
-		}
-	},
-	669: {
-		atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[669].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[669].multiplier == 1.5 ? 1 : 0);
-			window.specials[669].multiplier = [1.5, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '668warning'
-			});
-		}
-	},
-	670: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-		type: "class"
-	},
-	671: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-		type: "class"
-	},
-	680: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
-		type: "type"
-	},
-	681: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
-		rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
-		type: "type"
-	},
-	687: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
-		type: "class"
-	},
-	688: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
-		type: "class"
-	},
-	689: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	690: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	710: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
-		type: "class"
-	},
-	711: {
-		atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
-		type: "class"
-	},
-	712: {
-		atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
-		type: "class"
-	},
-	713: {
-		atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
-		type: "class"
-	},
-	715: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-		type: "class"
-	},
-	716: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-		type: "class"
-	},
-	719: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[719].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (p.percHP <= 30 ? 2 : 1.5);
-			window.specials[719].multiplier = n;
-			p.scope.notify({
-				text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-				name: '719warning'
-			});
-		}
-	},
-	720: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[720].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (p.percHP <= 30 ? 2 : 1.5);
-			window.specials[720].multiplier = n;
-			p.scope.notify({
-				text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-				name: '720warning'
-			});
-		}
-	},
-	727: {
-		def: function(p) { return 0.5; }
-	},
-	730: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		type: "type"
-	},
-	731: {
-		atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		type: "type"
-	},
-	732: {
-		def: function(p) { return 0.5; }
-	},
-	733: {
-		def: function(p) { return 0.5; }
-	},
-	740: {
-		atk: function(p) { return 1.3; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
-	},
-	741: {
-		atk: function(p) { return 1.3; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
-	},
-	742: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	743: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	753: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	754: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	755: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-		type: "class"
-	},
-	756: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-		type: "class"
-	},
-	761: {
-		atk: function(p) { return 1.2; },
-		type: "type"
-	},
-	762: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
-		type: "type"
-	},
-	770: {
-		atk: function(p) { return 1.3; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been delayed."
-	},
-	771: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-		type: "type"
-	},
-	780: {
-		atk: function(p) { return p.slot == p.sourceSlot ? window.specials[780].multiplier : 1; },
-		type: "type",
-		onActivation: function(p) {
-			var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
-			window.specials[780].multiplier = n;
-			p.scope.notify({
-				text: 'Using the ' + n + 'x multiplier.',
-				name: '780warning'
-			});
-		}
-	},
-	781: {
-		atk: function(p) { return p.slot == p.sourceSlot ? window.specials[781].multiplier : 1; },
-		type: "type",
-		onActivation: function(p) {
-			var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
-			window.specials[781].multiplier = n;
-			p.scope.notify({
-				text: 'Using the ' + n + 'x multiplier.',
-				name: '781warning'
-			});
-		}
-	},
-	788: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-		type: "class"
-	},
-	789: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-		type: "class"
-	},
-	790: {
-		atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
-		type: "type"
-	},
-	791: {
-		atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
-		type: "type"
-	},
-	796: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-		type: "type"
-	},
-	797: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-		type: "type"
-	},
-	798: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-		type: "class"
-	},
-	803: {
-		atk: function(p) { return 1.1; },
-		type: "type"
-	},
-	804: {
-		atk: function(p) { return 1.1; },
-		type: "type"
-	},
-	805: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	806: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	807: {
-		atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
-	},
-	808: {
-		atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
-	},
-	809: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
-		def: function(p) { return 0.2; }
-	},
-	810: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
-		def: function(p) { return 0.2; }
-	},
-	813: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	822: {
-		rcvStatic: function(p) { return 100; },
-		type: "type"
-	},
-	825: {
-		atkStatic: function(p) { return 200; },
-		type: "type"
-	},
-	826: {
-		atk: function(p) { return 0.2; },
-		type: "type"
-	},
-	827: {
-		atk: function(p) { return 1.05; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
-	},
+        def: function(p) { return 0; }
+    },
+    559: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    560: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    568: {
+        def: function(p) { return 0.5; }
+    },
+    569: {
+        def: function(p) { return 0.5; }
+    },
+    572: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        type: "class",
+        onActivation: function(p) { p.tdata.lock = Math.max(1, p.tdata.lock); },
+        onDeactivation: function(p) { if (p.tdata.lock == 1) p.tdata.lock = 0; }
+    },
+    574: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
+    },
+    575: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
+    },
+    576: {
+        rcv: function(p) { return 1.5; }
+    },
+    582: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        type: "type"
+    },
+    589: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        type: "class"
+    },
+    590: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        type: "class"
+    },
+    596: {
+        def: function(p) { return 0.5; }
+    },
+    597: {
+        def: function(p) { return 0.5; }
+    },
+    600: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        type: "type"
+    },
+    601: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        type: "type"
+    },
+    602: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        type: "type"
+    },
+    603: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        type: "type"
+    },
+    612: {
+        atkStatic: function(p) { return 45; },
+        rcvStatic: function(p) { return 45; },
+        type: "type"
+    },
+    613: {
+        atkStatic: function(p) { return 45; },
+        rcvStatic: function(p) { return 45; },
+        type: "type"
+    },
+    614: {
+        def: function(p) { return 0.5; }
+    },
+    617: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        type: "class"
+    },
+    622: {
+        rcvStatic: function(p) { return 100; },
+        type: "type"
+    },
+    632: {
+        def: function(p) { return 0.5; }
+    },
+    633: {
+        def: function(p) { return 0.5; }
+    },
+    634: {
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
+        type: "type"
+    },
+    635: {
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
+        type: "type"
+    },
+    637: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+    },
+    642: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    643: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    644: {
+        atk: function(p) { return 1.2; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    645: {
+        atk: function(p) { return 1.2; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    648: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    649: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    650: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    651: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    655: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    656: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    660: {
+        def: function(p) { return 0.5; }
+    },
+    661: {
+        def: function(p) { return 0.5; }
+    },
+    665: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
+    666: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
+    668: {
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[668].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[668].multiplier == 1.5 ? 1 : 0);
+            window.specials[668].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '667warning'
+            });
+        }
+    },
+    669: {
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[669].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[669].multiplier == 1.5 ? 1 : 0);
+            window.specials[669].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '668warning'
+            });
+        }
+    },
+    670: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
+    },
+    671: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
+    },
+    680: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        type: "type"
+    },
+    681: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        type: "type"
+    },
+    687: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
+        type: "class"
+    },
+    688: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
+        type: "class"
+    },
+    689: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    690: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    710: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        type: "class"
+    },
+    711: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        type: "class"
+    },
+    712: {
+        atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
+        type: "class"
+    },
+    713: {
+        atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
+        type: "class"
+    },
+    715: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
+    },
+    716: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
+    },
+    719: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[719].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 2 : 1.5);
+            window.specials[719].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '719warning'
+            });
+        }
+    },
+    720: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[720].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 2 : 1.5);
+            window.specials[720].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '720warning'
+            });
+        }
+    },
+    727: {
+        def: function(p) { return 0.5; }
+    },
+    730: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        type: "type"
+    },
+    731: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        type: "type"
+    },
+    732: {
+        def: function(p) { return 0.5; }
+    },
+    733: {
+        def: function(p) { return 0.5; }
+    },
+    740: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+    },
+    741: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+    },
+    742: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    743: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    753: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    754: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    755: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
+    },
+    756: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
+    },
+    761: {
+        atk: function(p) { return 1.2; },
+        type: "type"
+    },
+    762: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        type: "type"
+    },
+    770: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    771: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        type: "type"
+    },
+    780: {
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[780].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
+            window.specials[780].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x multiplier.',
+                name: '780warning'
+            });
+        }
+    },
+    781: {
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[781].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
+            window.specials[781].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x multiplier.',
+                name: '781warning'
+            });
+        }
+    },
+    788: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        type: "class"
+    },
+    789: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        type: "class"
+    },
+    790: {
+        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
+        type: "type"
+    },
+    791: {
+        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
+        type: "type"
+    },
+    796: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type"
+    },
+    797: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type"
+    },
+    798: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
+    },
+    803: {
+        atk: function(p) { return 1.1; },
+        type: "type"
+    },
+    804: {
+        atk: function(p) { return 1.1; },
+        type: "type"
+    },
+    805: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    806: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    807: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
+    808: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
+    809: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        def: function(p) { return 0.2; }
+    },
+    810: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        def: function(p) { return 0.2; }
+    },
+    813: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    822: {
+        rcvStatic: function(p) { return 100; },
+        type: "type"
+    },
+    825: {
+        atkStatic: function(p) { return 200; },
+        type: "type"
+    },
+    826: {
+        atk: function(p) { return 0.2; },
+        type: "type"
+    },
+    827: {
+        atk: function(p) { return 1.05; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+    },
     828: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[828].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (p.percHP < 20 ? 1.75 : 1);
-			window.specials[828].multiplier = n;
-			p.scope.notify({
-				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
-				name: '828warning'
-			});
-		}  
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP < 20 ? 1.75 : 1);
+            window.specials[828].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                name: '828warning'
+            });
+        }  
+    },
+    829: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[829].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP < 20 ? 1.75 : 1);
+            window.specials[829].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                name: '829warning'
+            });
+        }
+    },
+    832: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
+    },
+    833: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
+    },
+    835: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    836: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+    },
+    837: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
+    },
+    838: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
+    },
+    839: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
+    840: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
+    841: {
+        atk: function(p) { return 1.25; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    842: {
+        atk: function(p) { return 1.25; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    843: {
+        atk: function(p) {
+            if (window.specials[843].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[843].first = !window.specials[843].first;
+            p.scope.notify({
+                text: (window.specials[843].first ?
+                    'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
+                    'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
+                name: '843warning'
+            });
+        }
+    },
+    844: {
+        atk: function(p) {
+            if (window.specials[844].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[844].first = !window.specials[844].first;
+            p.scope.notify({
+                text: (window.specials[844].first ?
+                    'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
+                    'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
+                name: '844warning'
+            });
+        }
+    },
+    847: {
+        atk: function(p) { return 1.05; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.15); },
+        type: "class"
+    },
+    848: {
+        atk: function(p) { return 1.05; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.15); },
+        type: "class"
+    },
+    849: {
+        def: function() { return 0.5; }
+    },
+    853: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; },
+        type: "class"
+    },
+    857: {
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
+        type: "type"
+    },
+    858: {
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
+        type: "type"
+    },
+    861: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    862: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    863: {
+        def: function(p) { return 0.5; }
+    },
+    864: {
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
+    865: {
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
+    866: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1;
+        },
+        type: "class"
+    },
+    869: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2.0); }
+    },
+    870: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2.0); }
+    },
+    873: {
+        orb: function(p) {
+            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
+            else return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[873].first = !window.specials[873].first;
+            p.scope.notify({
+                text: (window.specials[873].first ?
+                    'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
+                    'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
+                name: '873warning'
+            });
+        }
+    },
+    874: {
+        orb: function(p) {
+            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
+            else return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[874].first = !window.specials[874].first;
+            p.scope.notify({
+                text: (window.specials[874].first ?
+                    'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
+                    'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
+                name: '874warning'
+            });
+        }
+    },
+    881: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        rcv: function(p) { return 0.1; },
+        type: "class"
+    },
+    882: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        rcv: function(p) { return 0.1; },
+        type: "class"
+    },
+    883: {
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[883].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[883].multiplier == 1.5 ? 1 : 0);
+            window.specials[883].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '883warning'
+            });
+        }
+    },
+    884: {
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[884].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[884].multiplier == 1.5 ? 1 : 0);
+            window.specials[884].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '884warning'
+            });
+        }
+    },
+    885: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
+    886: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        type: "class"
+    },
+    887: {
+        def: function(p) { return 0.2; }
+    },
+    891: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        type: "class"
+    },
+    902: {
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[902].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[902].multiplier == 1.5 ? 1 : 0);
+            window.specials[902].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '902warning'
+            });
+        }
+    },
+    903: {
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[903].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[903].multiplier == 1.5 ? 1 : 0);
+            window.specials[903].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '902warning'
+            });
+        }
+    },
+    905: {
+        atk: function(p) {
+            if (!window.specials[905].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
+            if (window.specials[905].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[905].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[905].stage = (window.specials[905].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[905].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '905warning'
+            });
+        }
+    },
+    906: {
+        atk: function(p) {
+            if (!window.specials[906].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
+            if (window.specials[906].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[906].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[906].stage = (window.specials[906].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[906].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '906warning'
+            });
+        }
+    },
+    909: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        type: "type"
+    },
+    910: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        type: "type"
+    },
+    911: {
+        atk: function(p) {
+            if (!window.specials[911].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
+            if (window.specials[911].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[911].stage = (window.specials[911].stage + 1) % 2;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[911].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '911warning'
+            });
+        }
+    },
+    912: {
+        atk: function(p) {
+            if (!window.specials[912].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
+            if (window.specials[912].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[912].stage = (window.specials[912].stage + 1) % 2;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[912].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '912warning'
+            });
+        }
+    },
+    915: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        type: "class"
+    },
+    916: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        type: "class"
     },
-    829: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[829].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (p.percHP < 20 ? 1.75 : 1);
-			window.specials[829].multiplier = n;
-			p.scope.notify({
-				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
-				name: '829warning'
-			});
-		}
-    },
-	832: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-		type: "class"
-	},
-	833: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-		type: "class"
-	},
-	835: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	836: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
-	},
-	837: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-		type: "class"
-	},
-	838: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-		type: "class"
-	},
-	839: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-		type: "type"
-	},
-	840: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-		type: "type"
-	},
-	841: {
-		atk: function(p) { return 1.25; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been delayed."
-	},
-	842: {
-		atk: function(p) { return 1.25; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been delayed."
-	},
-	843: {
-		atk: function(p) {
-			if (window.specials[843].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
-			else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
-		},
-		type: "class",
-		onActivation: function(p) {
-			window.specials[843].first = !window.specials[843].first;
-			p.scope.notify({
-				text: (window.specials[843].first ?
-					'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
-					'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
-				name: '843warning'
-			});
-		}
-	},
-	844: {
-		atk: function(p) {
-			if (window.specials[844].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
-			else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
-		},
-		type: "class",
-		onActivation: function(p) {
-			window.specials[844].first = !window.specials[844].first;
-			p.scope.notify({
-				text: (window.specials[844].first ?
-					'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
-					'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
-				name: '844warning'
-			});
-		}
-	},
-	847: {
-		atk: function(p) { return 1.05; },
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.15); },
-		type: "class"
-	},
-	848: {
-		atk: function(p) { return 1.05; },
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.15); },
-		type: "class"
-	},
-	849: {
-		def: function() { return 0.5; }
-	},
-	853: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; },
-		type: "class"
-	},
-	857: {
-		rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
-		type: "type"
-	},
-	858: {
-		rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
-		type: "type"
-	},
-	861: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	862: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	863: {
-		def: function(p) { return 0.5; }
-	},
-	864: {
-		chain: function(p) { return 2.5; },
-		chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
-	},
-	865: {
-		chain: function(p) { return 2.5; },
-		chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
-	},
-	866: {
-		atk: function(p) {
-			return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1;
-		},
-		type: "class"
-	},
-	869: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2.0); }
-	},
-	870: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2.0); }
-	},
-	873: {
-		orb: function(p) {
-			if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
-			else return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
-		},
-		type: "class",
-		onActivation: function(p) {
-			window.specials[873].first = !window.specials[873].first;
-			p.scope.notify({
-				text: (window.specials[873].first ?
-					'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
-					'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
-				name: '873warning'
-			});
-		}
-	},
-	874: {
-		orb: function(p) {
-			if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
-			else return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
-		},
-		type: "class",
-		onActivation: function(p) {
-			window.specials[874].first = !window.specials[874].first;
-			p.scope.notify({
-				text: (window.specials[874].first ?
-					'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
-					'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
-				name: '874warning'
-			});
-		}
-	},
-	881: {
-		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
-		},
-		rcv: function(p) { return 0.1; },
-		type: "class"
-	},
-	882: {
-		atk: function(p) {
-			return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
-		},
-		rcv: function(p) { return 0.1; },
-		type: "class"
-	},
-	883: {
-		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[883].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[883].multiplier == 1.5 ? 1 : 0);
-			window.specials[883].multiplier = [1.5, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '883warning'
-			});
-		}
-	},
-	884: {
-		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[884].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[884].multiplier == 1.5 ? 1 : 0);
-			window.specials[884].multiplier = [1.5, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '884warning'
-			});
-		}
-	},
-	885: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		type: "class"
-	},
-	886: {
-		atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-		type: "class"
-	},
-	887: {
-		def: function(p) { return 0.2; }
-	},
-	891: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-		type: "class"
-	},
-	902: {
-		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[902].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[902].multiplier == 1.5 ? 1 : 0);
-			window.specials[902].multiplier = [1.5, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '902warning'
-			});
-		}
-	},
-	903: {
-		atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[903].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[903].multiplier == 1.5 ? 1 : 0);
-			window.specials[903].multiplier = [1.5, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '902warning'
-			});
-		}
-	},
-	905: {
-		atk: function(p) {
-			if (!window.specials[905].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
-			if (window.specials[905].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-			if (window.specials[905].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
-		},
-		type: "class",
-		stage: -1,
-		onActivation: function(p) {
-			window.specials[905].stage = (window.specials[905].stage + 1) % 3;
-			p.scope.notify({
-				text: 'Activating stage #' + (window.specials[905].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-				name: '905warning'
-			});
-		}
-	},
-	906: {
-		atk: function(p) {
-			if (!window.specials[906].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
-			if (window.specials[906].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-			if (window.specials[906].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
-		},
-		type: "class",
-		stage: -1,
-		onActivation: function(p) {
-			window.specials[906].stage = (window.specials[906].stage + 1) % 3;
-			p.scope.notify({
-				text: 'Activating stage #' + (window.specials[906].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-				name: '906warning'
-			});
-		}
-	},
-	909: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		type: "type"
-	},
-	910: {
-		atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-		type: "type"
-	},
-	911: {
-		atk: function(p) {
-			if (!window.specials[911].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-			if (window.specials[911].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
-		},
-		type: "class",
-		stage: -1,
-		onActivation: function(p) {
-			window.specials[911].stage = (window.specials[911].stage + 1) % 2;
-			p.scope.notify({
-				text: 'Activating stage #' + (window.specials[911].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-				name: '911warning'
-			});
-		}
-	},
-	912: {
-		atk: function(p) {
-			if (!window.specials[912].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-			if (window.specials[912].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
-		},
-		type: "class",
-		stage: -1,
-		onActivation: function(p) {
-			window.specials[912].stage = (window.specials[912].stage + 1) % 2;
-			p.scope.notify({
-				text: 'Activating stage #' + (window.specials[912].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-				name: '912warning'
-			});
-		}
-	},
-	915: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		type: "class"
-	},
-	916: {
-		atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-		type: "class"
-	},
     921: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
     },
@@ -1070,100 +1070,100 @@ window.specials = {
     },
     925: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
+        type: "condition"
     },
     926: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-		type: "condition"
+        type: "condition"
     },
-	927: {
+    927: {
         atk: function(p) {
-			return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.2 : 1;
-		},
-		type: "class"
+            return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.2 : 1;
+        },
+        type: "class"
     },
-	928: {
+    928: {
         atk: function(p) { return 1.3; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned."
     },
     929: {
         atk: function(p) { return 1.3; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been poisoned."
-    },
-	940: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
-		type: "type"
-    },
-	941: {
-		atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
-		type: "type"
-    },
-	944: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-		type: "class"
-    },
-	945: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-		rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-		type: "class"
-    },
-	947: {
-		atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.3 : 1; },
-		type: "type"
-    },
-	954: {
-		def: function(p) { return 0.2; }		
-	},
-	955: {
-		atk: function(p) { return p.defenseDown ? 1.2 : 1; },
-		type: "condition"
-	},
-	956: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-		type: "class"
-	},
-	961: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
-	},
-	963: {
-		def: function(p) { return 0; }
-	},
-	964: {
-		atk: function(p) { return window.specials[964].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[964].multiplier == 1.1 ? 1 : 0);
-			window.specials[964].multiplier = [1.1, 1.5][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
-				name: '965warning'
-			});
-		}
-	},
-	965: {
-		atk: function(p) { return window.specials[965].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[965].multiplier == 1.1 ? 1 : 0);
-			window.specials[965].multiplier = [1.1, 1.5][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
-				name: '965warning'
-			});
-		}
-	},
-	975: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
-		type: "class"
-    },
-	976: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
-		type: "class"
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+    },
+    940: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        type: "type"
+    },
+    941: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        type: "type"
+    },
+    944: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
+    },
+    945: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
+    },
+    947: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.3 : 1; },
+        type: "type"
+    },
+    954: {
+        def: function(p) { return 0.2; }		
+    },
+    955: {
+        atk: function(p) { return p.defenseDown ? 1.2 : 1; },
+        type: "condition"
+    },
+    956: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        type: "class"
+    },
+    961: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+    },
+    963: {
+        def: function(p) { return 0; }
+    },
+    964: {
+        atk: function(p) { return window.specials[964].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[964].multiplier == 1.1 ? 1 : 0);
+            window.specials[964].multiplier = [1.1, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
+                name: '965warning'
+            });
+        }
+    },
+    965: {
+        atk: function(p) { return window.specials[965].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[965].multiplier == 1.1 ? 1 : 0);
+            window.specials[965].multiplier = [1.1, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
+                name: '965warning'
+            });
+        }
+    },
+    975: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
+        type: "class"
+    },
+    976: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
+        type: "class"
     },
     977: {
         chainAddition: function(p) {return 0.5;}
@@ -1173,36 +1173,36 @@ window.specials = {
     },
     981: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-		type: "type"
-    },
-	1005: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-		type: "type"
-	},
-	1006: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-		type: "type"
-	},
-	1010: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
-		type: "type"
-	},
-	1011: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
-		type: "type"
-	},
-	1013: {
-		atk: function(p) { return 1.2; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been delayed."
-	},
+        type: "type"
+    },
+    1005: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type"
+    },
+    1006: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type"
+    },
+    1010: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
+        type: "type"
+    },
+    1011: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
+        type: "type"
+    },
+    1013: {
+        atk: function(p) { return 1.2; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
     1015: {
         atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		type: "type"
+        type: "type"
     },
     1016: {
         atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-		type: "type"
+        type: "type"
     },
     1017: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
@@ -1250,19 +1250,19 @@ window.specials = {
     },
     1030: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
-		type: "type"
+        type: "type"
     },
     1031: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
-		type: "type"
+        type: "type"
     },
     1040: {
         atk: function(p) { return p.percHP < 30.0 ? 1.5 : 1; },
-		type: "type"
+        type: "type"
     },
     1041: {
         atk: function(p) { return p.percHP < 30.0 ? 1.5 : 1; },
-		type: "type"
+        type: "type"
     },
     1046: {
         staticMult: function(p) { return 55; }
@@ -1271,15 +1271,15 @@ window.specials = {
         staticMult: function(p) { return 55; }
     },
     1055: {
-		atk: function(p) { return 1.4; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
-	},
+        atk: function(p) { return 1.4; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
+    },
     1056: {
-		atk: function(p) { return 1.4; },
-		type: "condition",
-		warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
-	},
+        atk: function(p) { return 1.4; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
+    },
     1059: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
     },
@@ -1287,9 +1287,9 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
     },
     1061: {
-		chain: function(p) { return 2; },
-		chainLimiter: function(p) { return p.chainPosition > 0 ? 2 : 1.0; }
-	},
+        chain: function(p) { return 2; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2 : 1.0; }
+    },
     1063: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1},
         type: "class"
@@ -1301,9 +1301,9 @@ window.specials = {
         chainAddition: function(p){ return 0.1;}
     },
     1067: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
-		type: "type"
-	},
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        type: "type"
+    },
     1071: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
         type: "class"
@@ -1313,13 +1313,13 @@ window.specials = {
         type: "class"
     },
     1080: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-		type: "type"
-	},
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
     1081: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-		type: "type"
-	},
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
     1082: {
         atk: function(p) {
             if(p.percHP >= 70.0){
@@ -1360,11 +1360,11 @@ window.specials = {
     },
     1096: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-		type: "type"
+        type: "type"
     },
     1097: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-		type: "type"
+        type: "type"
     },
     1099: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
@@ -1373,12 +1373,12 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
     },
     1101: {
-		atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
-		type: "type"
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
+        type: "type"
     },
     1102: {
-		atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
-		type: "type"
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
+        type: "type"
     },
     1105: {
         chainAddition: function(p){ return 0.2;}
@@ -1406,11 +1406,11 @@ window.specials = {
     },
     1114: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		type: "type" 
+        type: "type" 
     },
     1115: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-		type: "type" 
+        type: "type" 
     },
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
@@ -1424,30 +1424,30 @@ window.specials = {
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[1132].multiplier == 1.5 ? 1 : 0);
-			window.specials[1132].multiplier = [1.5, 1.75][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '1132warning'
-			});
-		}
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1132].multiplier == 1.5 ? 1 : 0);
+            window.specials[1132].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1132warning'
+            });
+        }
     },
     1133: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? window.specials[1133].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[1133].multiplier == 1.5 ? 1 : 0);
-			window.specials[1133].multiplier = [1.5, 1.75][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-				name: '1133warning'
-			});
-		}
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1133].multiplier == 1.5 ? 1 : 0);
+            window.specials[1133].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1133warning'
+            });
+        }
     },
     1137: {
-    	orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
     1138: {
         atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
@@ -1464,99 +1464,99 @@ window.specials = {
     },
     1164: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
-		rcv: function(p) { return 1.5; }
-	},
+        rcv: function(p) { return 1.5; }
+    },
     1165: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
-		rcv: function(p) { return 1.5; }
-	},
+        rcv: function(p) { return 1.5; }
+    },
     1168: {
-		atk: function(p) { return p.unit.type == "STR" ? window.specials[1168].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (p.percHP <= 30 ? 1.75 : 1.1);
-			window.specials[1168].multiplier = n;
-			p.scope.notify({
-				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-				name: '1168warning'
-			});
-		}
-	},
+        atk: function(p) { return p.unit.type == "STR" ? window.specials[1168].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.75 : 1.1);
+            window.specials[1168].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '1168warning'
+            });
+        }
+    },
     1169: {
-		atk: function(p) { return p.unit.type == "STR" ? window.specials[1169].multiplier : 1; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (p.percHP <= 30 ? 1.75 : 1.1);
-			window.specials[1169].multiplier = n;
-			p.scope.notify({
-				text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-				name: '1169warning'
-			});
-		}
-	},
+        atk: function(p) { return p.unit.type == "STR" ? window.specials[1169].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.75 : 1.1);
+            window.specials[1169].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '1169warning'
+            });
+        }
+    },
     1193: {
-		chain: function(p) { return 2.5; },
-		chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
-	},
-	1194: {
-		chain: function(p) { return 2.5; },
-		chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
-	},
-	1195: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-		type: "class"
-	},
-	1196: {
-		atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-		type: "class"
-	},
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
+    1194: {
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
+    1195: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
+    },
+    1196: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
+    },
     1211: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
-	1212: {
-		orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
-	},
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
+    1212: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+    },
     1219: {
-		atk: function(p) {
-			if (!window.specials[1219].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-			if (window.specials[1219].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-			if (window.specials[1219].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
-		},
-		type: "class",
-		stage: -1,
-		onActivation: function(p) {
-			window.specials[1219].stage = (window.specials[1219].stage + 1) % 3;
-			p.scope.notify({
-				text: 'Activating stage #' + (window.specials[1219].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-				name: '1219warning'
-			});
-		}
-	},
+        atk: function(p) {
+            if (!window.specials[1219].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
+            if (window.specials[1219].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1219].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[1219].stage = (window.specials[1219].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[1219].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '1219warning'
+            });
+        }
+    },
     1220: {
-		atk: function(p) {
-			if (!window.specials[1220].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-			if (window.specials[1220].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-			if (window.specials[1220].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
-		},
-		type: "class",
-		stage: -1,
-		onActivation: function(p) {
-			window.specials[1220].stage = (window.specials[1220].stage + 1) % 3;
-			p.scope.notify({
-				text: 'Activating stage #' + (window.specials[1220].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-				name: '1219warning'
-			});
-		}
-	},
+        atk: function(p) {
+            if (!window.specials[1220].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
+            if (window.specials[1220].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1220].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[1220].stage = (window.specials[1220].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[1220].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '1219warning'
+            });
+        }
+    },
     1231: {
         turnedOn: false,
         onActivation: function(p) {
             window.specials[1231].turnedOn = true;
-			p.scope.notify({
-				text: 'Only affects damage if Smoker is your captain',
-				name: '1231warning'
-			});
-		},
+            p.scope.notify({
+                text: 'Only affects damage if Smoker is your captain',
+                name: '1231warning'
+            });
+        },
         onDeactivation: function(p) {
             window.specials[1231].turnedOn = false;
         }
@@ -1565,11 +1565,11 @@ window.specials = {
         turnedOn: false,
         onActivation: function(p) {
             window.specials[1232].turnedOn = true;
-			p.scope.notify({
-				text: 'Only affects damage if Smoker is your captain',
-				name: '1232warning'
-			});
-		},
+            p.scope.notify({
+                text: 'Only affects damage if Smoker is your captain',
+                name: '1232warning'
+            });
+        },
         onDeactivation: function(p) {
             window.specials[1232].turnedOn = false;
         }
@@ -1584,11 +1584,11 @@ window.specials = {
         turnedOn: false,
         onActivation: function(p) {
             window.specials[1239].turnedOn = true;
-			p.scope.notify({
-				text: 'Only affects damage if Kizaru is your captain',
-				name: '1239warning'
-			});
-		},
+            p.scope.notify({
+                text: 'Only affects damage if Kizaru is your captain',
+                name: '1239warning'
+            });
+        },
         onDeactivation: function(p) {
             window.specials[1239].turnedOn = false;
         }
@@ -1597,11 +1597,11 @@ window.specials = {
         turnedOn: false,
         onActivation: function(p) {
             window.specials[1240].turnedOn = true;
-			p.scope.notify({
-				text: 'Only affects damage if Kizaru is your captain',
-				name: '1240warning'
-			});
-		},
+            p.scope.notify({
+                text: 'Only affects damage if Kizaru is your captain',
+                name: '1240warning'
+            });
+        },
         onDeactivation: function(p) {
             window.specials[1240].turnedOn = false;
         }
@@ -1613,53 +1613,53 @@ window.specials = {
         staticMult: function(p) { return 15; }
     },
     1245: {
-		atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1245].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[1245].multiplier == 1.3 ? 1 : 0);
-			window.specials[1245].multiplier = [1.3, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-				name: '1245warning'
-			});
-		}
-	},
+        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1245].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1245].multiplier == 1.3 ? 1 : 0);
+            window.specials[1245].multiplier = [1.3, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1245warning'
+            });
+        }
+    },
     1246: {
-		atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1246].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[1246].multiplier == 1.3 ? 1 : 0);
-			window.specials[1246].multiplier = [1.3, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-				name: '1246warning'
-			});
-		}
-	},
+        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1246].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1246].multiplier == 1.3 ? 1 : 0);
+            window.specials[1246].multiplier = [1.3, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1246warning'
+            });
+        }
+    },
     1247: {
-		atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1247].multiplier; },
-		type: "class",
-		onActivation: function(p) {
-			var n = (window.specials[1247].multiplier == 1.3 ? 1 : 0);
-			window.specials[1247].multiplier = [1.3, 2][n];
-			p.scope.notify({
-				text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-				name: '1247warning'
-			});
-		}
-	},
+        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1247].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1247].multiplier == 1.3 ? 1 : 0);
+            window.specials[1247].multiplier = [1.3, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1247warning'
+            });
+        }
+    },
     1250: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class"
+    },
     1251: {
-		atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class"
+    },
     1253: {
-		atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
+        type: "class"
+    },
     1254: {
         def: function(p) { return 0.5; } //TODO: get correct value
     },
@@ -1678,42 +1678,42 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1263: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-		type: "type"
-	},
-	1264: {
-		atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-		type: "type"
-	},
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
+    1264: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
     1265: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        type: "class"
+    },
     1266: {
-		atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        type: "class"
+    },
     1271: {
-    	orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
     1272: {
-    	orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
     1273: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
     1274: {
-		atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
     1282: {
-		atk: function(p) { return 1.2; },
-		type: "class",
+        atk: function(p) { return 1.2; },
+        type: "class",
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.2); },
-	},
+    },
     1283: {
-		atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-		type: "class"
-	},
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
+    },
 };
diff --git a/common/data/tandems.js b/common/data/tandems.js
index 874c573c3..5931f864d 100644
--- a/common/data/tandems.js
+++ b/common/data/tandems.js
@@ -319,11 +319,11 @@ window.tandems = [
         "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Powerhouse characters by 1.4x until the end of the current turn",
         "units": [ 884, 903 ]
     },
-	{
-		"name": "Kidnapping Trio Rampage",
-		"desc": "Deals 3,000 fixed damage to all enemies",
-		"units": [ 954, 955, 956 ]
-	},
+    {
+        "name": "Kidnapping Trio Rampage",
+        "desc": "Deals 3,000 fixed damage to all enemies",
+        "units": [ 954, 955, 956 ]
+    },
     {
         "name": "Snake Pit Dance",
         "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Tough characters by 1.3x until the end of the current turn",
diff --git a/common/data/units.js b/common/data/units.js
index ca008cfb6..c2e17b9eb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1,985 +1,985 @@
 window.units = [
-	[ "Monkey D. Luffy", "STR", "Fighter", 2, 1, 5, 0, 5, 163, 42, 15, 8, 134, 68, 15, 1 ],
-	[ "Monkey D. Luffy Gum-Gum Pistol", "STR", "Fighter", 3, 4, 6, 0, 20, 26184, 130, 76, 14, 510, 249, 49, 0.7 ],
-	[ "Monkey D. Luffy Gum-Gum Bazooka", "STR", "Fighter", 4, 7, 6, 2, 35, 136167, 404, 227, 39, 975, 522, 105, 1 ],
-	[ "Monkey D. Luffy Gear 2", "STR", [ "Fighter", "Free Spirit" ], 5, 15, 8, 3, 99, 3000000, 902, 473, 74, 1772, 1313, 227, 1 ],
-	[ "Roronoa Zoro", "DEX", "Slasher", 3, 4, 6, 0, 20, 26184, 126, 75, 15, 488, 239, 56, 0.7 ],
-	[ "Roronoa Zoro Three Thousand Worlds", "DEX", [ "Slasher", "Driven" ], 4, 7, 6, 2, 35, 136167, 426, 222, 37, 899, 515, 120, 1 ],
-	[ "Roronoa Zoro Pound Phoenix", "DEX", [ "Slasher", "Driven" ], 4, 9, 4, 2, 50, 392109, 462, 258, 37, 1216, 694, 106, 1 ],
-	[ "Roronoa Zoro Ashura Ichibugin", "DEX", [ "Slasher", "Driven" ], 5, 15, 9, 3, 99, 3000000, 724, 667, 39, 2232, 1332, 144, 1 ],
-	[ "Nami", "INT", "Striker", 3, 4, 4, 0, 20, 26184, 72, 51, 32, 366, 201, 89, 0.7 ],
-	[ "Nami Tornado Tempo", "INT", [ "Striker", "Cerebral" ], 4, 7, 5, 2, 35, 136167, 336, 192, 62, 783, 453, 160, 1 ],
-	[ "Nami Mirage Tempo", "INT", [ "Striker", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 348, 201, 75, 840, 543, 219, 1 ],
-	[ "Nami Thunderbolt Tempo", "INT", [ "Striker", "Cerebral" ], 5, 15, 4, 3, 99, 3000000, 494, 437, 154, 1262, 1088, 387, 1 ],
-	[ "Usopp", "PSY", "Shooter", 3, 4, 5, 0, 20, 26184, 50, 32, 42, 322, 127, 121, 0.7 ],
-	[ "Usopp Tabasco Star", "PSY", "Shooter", 4, 7, 6, 2, 35, 136167, 286, 148, 85, 627, 240, 257, 1 ],
-	[ "Usopp Golden Pound", "PSY", "Shooter", 4, 9, 6, 2, 50, 392109, 444, 237, 47, 1080, 648, 144, 1 ],
-	[ "Sogeking", "PSY", "Shooter", 5, 15, 7, 3, 99, 3000000, 638, 260, 189, 1506, 690, 479, 1 ],
-	[ "Sanji", "QCK", "Fighter", 3, 4, 6, 0, 20, 26184, 136, 64, 17, 506, 218, 60, 1 ],
-	[ "Sanji Plastic Surgery Shot", "QCK", [ "Fighter", "Powerhouse" ], 4, 7, 5, 2, 35, 136167, 486, 207, 32, 907, 496, 125, 1 ],
-	[ "Chef Sanji Hot Rock Stew", "QCK", [ "Fighter", "Powerhouse" ], 4, 9, 4, 2, 50, 392109, 494, 191, 54, 986, 500, 209, 1 ],
-	[ "Sanji Diable Jambe Flambe", "QCK", [ "Fighter", "Powerhouse" ], 5, 15, 4, 3, 99, 3000000, 406, 418, 175, 2206, 1030, 249, 1 ],
-	[ "Tony Tony Chopper", "PSY", "Fighter", 3, 4, 5, 0, 20, 26184, 52, 40, 39, 294, 144, 120, 1 ],
-	[ "Tony Tony Chopper Heavy Point", "PSY", [ "Fighter", "Free Spirit" ], 4, 9, 5, 2, 50, 392109, 306, 213, 78, 754, 622, 207, 1 ],
-	[ "Tony Tony Chopper Brain Point", "INT", [ "Fighter", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 258, 198, 91, 520, 454, 302, 1 ],
-	[ "Tony Tony Chopper Arm Point", "STR", [ "Fighter", "Powerhouse" ], 4, 9, 4, 2, 50, 392109, 356, 260, 54, 868, 820, 122, 1 ],
-	[ "Tony Tony Chopper Horn Point", "QCK", "Fighter", 4, 9, 6, 2, 50, 392109, 414, 306, 29, 958, 856, 95, 1 ],
-	[ "Tony Tony Chopper Guard Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 9, 6, 2, 50, 392109, 394, 178, 75, 1320, 408, 184, 1 ],
-	[ "Higuma", "QCK", "Slasher", 2, 8, 5, 0, 35, 45389, 132, 87, 29, 692, 323, 99, 1 ],
-	[ "Master of the Near Sea", "STR", "Fighter", 2, 20, 5, 0, 35, 90778, 500, 350, 80, 550, 400, 100, 1.5 ],
-	[ "Iron-Mace Alvida", "STR", [ "Striker", "Powerhouse" ], 3, 10, 5, 0, 50, 392109, 184, 154, 5, 1412, 755, 61, 1 ],
-	[ "Iron-Mace Alvida Smooth-Smooth Fruit", "STR", [ "Striker", "Free Spirit" ], 4, 15, 6, 1, 99, 3000000, 766, 625, 135, 1668, 999, 369, 1 ],
-	[ "Coby", "PSY", "Fighter", 2, 4, 5, 0, 25, 50439, 70, 25, 32, 166, 70, 120, 1 ],
-	[ "Cabin Boy Coby", "PSY", [ "Fighter", "Driven" ], 3, 9, 5, 3, 50, 392109, 130, 49, 100, 524, 155, 216, 1 ],
-	[ "Helmeppo", "INT", "Shooter", 2, 4, 5, 0, 25, 50439, 62, 62, 21, 308, 242, 39, 1 ],
-	[ "Cabin Boy Helmeppo", "INT", [ "Fighter", "Driven" ], 3, 8, 5, 3, 50, 392109, 234, 210, 29, 770, 485, 130, 1 ],
-	[ "Axe-Hand Morgan", "STR", [ "Slasher", "Driven" ], 2, 9, 5, 0, 50, 261406, 133, 100, 5, 1554, 747, 35, 1 ],
-	[ "Mohji & Richie", "PSY", [ "Fighter", "Driven" ], 2, 9, 6, 1, 50, 261406, 150, 135, 10, 1072, 559, 55, 1 ],
-	[ "Cabaji the Acrobat", "DEX", [ "Slasher", "Driven" ], 2, 9, 6, 1, 50, 261406, 134, 77, 32, 824, 458, 130, 1 ],
-	[ "Buggy", "INT", [ "Slasher", "Driven" ], 3, 8, 5, 0, 35, 136167, 200, 107, 22, 818, 446, 85, 1 ],
-	[ "Buggy the Clown", "INT", [ "Slasher", "Driven" ], 4, 11, 5, 2, 70, 1066998, 714, 342, 58, 1666, 757, 135, 1 ],
-	[ "Gaimon", "PSY", "Shooter", 2, 3, 6, 0, 50, 261406, 133, 5, 14, 1303, 85, 121, 1.5 ],
-	[ "Siam", "INT", "Slasher", 2, 9, 6, 0, 50, 261406, 112, 112, 24, 724, 499, 133, 1 ],
-	[ "Butchie", "STR", [ "Slasher", "Powerhouse" ], 2, 9, 6, 0, 50, 261406, 132, 117, 19, 872, 530, 98, 1 ],
-	[ "One-Two Django", "DEX", "Slasher", 2, 8, 5, 0, 35, 90778, 118, 64, 39, 556, 271, 139, 1 ],
-	[ "Dancing Django", "DEX", "Slasher", 3, 11, 5, 2, 70, 1066998, 476, 218, 98, 1155, 555, 228, 1 ],
-	[ "Captain Kuro", "QCK", [ "Slasher", "Cerebral" ], 3, 10, 7, 0, 70, 1066998, 144, 111, 31, 1102, 640, 151, 1 ],
-	[ "Kuro of a Hundred Plans", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 8, 2, 99, 3000000, 978, 558, 122, 2074, 1057, 282, 1 ],
-	[ "Yosaku", "STR", "Slasher", 2, 5, 6, 1, 40, 134812, 100, 43, 19, 439, 439, 99, 1.5 ],
-	[ "Johnny", "QCK", "Slasher", 2, 7, 6, 1, 40, 134812, 100, 42, 20, 421, 421, 108, 1.5 ],
-	[ "Iron Fist Fullbody", "STR", "Fighter", 2, 3, 6, 0, 15, 7532, 103, 100, 49, 153, 160, 84, 0.7 ],
-	[ "Patty", "STR", "Slasher", 2, 9, 5, 0, 50, 261406, 140, 65, 35, 872, 314, 170, 1 ],
-	[ "Carne", "QCK", "Slasher", 2, 9, 5, 0, 50, 261406, 94, 91, 34, 650, 428, 169, 1 ],
-	[ "Chef Zeff", "DEX", "Fighter", 3, 10, 5, 1, 50, 392109, 142, 118, 29, 908, 698, 164, 1.5 ],
-	[ "Gin", "QCK", "Shooter", 2, 8, 5, 0, 35, 90778, 148, 94, 24, 618, 363, 98, 1 ],
-	[ "Gin the Man-Demon", "QCK", "Striker", 3, 11, 6, 1, 70, 1066998, 558, 300, 57, 1152, 792, 209, 1 ],
-	[ "Pearl", "STR", [ "Striker", "Powerhouse" ], 2, 8, 5, 0, 35, 90778, 198, 84, 19, 956, 296, 64, 1 ],
-	[ "Fire Pearl", "STR", [ "Striker", "Powerhouse" ], 3, 11, 4, 1, 70, 1066998, 820, 226, 38, 1904, 656, 129, 1 ],
-	[ "Don Krieg", "INT", [ "Shooter", "Driven" ], 3, 10, 6, 0, 50, 392109, 214, 97, 24, 1454, 632, 95, 1 ],
-	[ "Don Krieg Poison Gas Bomb MH5", "INT", [ "Shooter", "Driven" ], 4, 15, 4, 2, 99, 3000000, 1276, 553, 74, 2734, 1057, 172, 1 ],
-	[ "Nezumi", "INT", [ "Shooter", "Cerebral" ], 2, 6, 6, 0, 30, 28779, 55, 55, 55, 150, 130, 204, 0.7 ],
-	[ "Momoo", "STR", "Fighter", 3, 18, 4, 0, 50, 392109, 600, 400, 120, 1000, 500, 150, 1.5 ],
-	[ "Choo", "INT", [ "Shooter", "Powerhouse" ], 3, 9, 5, 1, 50, 392109, 110, 71, 49, 768, 492, 256, 1 ],
-	[ "Kuroobi", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 1, 50, 392109, 160, 157, 10, 1200, 759, 76, 1 ],
-	[ "Hatchan", "DEX", [ "Slasher", "Powerhouse" ], 3, 8, 8, 1, 35, 136167, 88, 88, 47, 588, 387, 143, 1 ],
-	[ "Six-Sword Hachi", "DEX", [ "Slasher", "Powerhouse" ], 4, 11, 8, 2, 70, 1066998, 542, 338, 88, 986, 638, 288, 1 ],
-	[ "Arlong", "STR", [ "Slasher", "Powerhouse" ], 3, 10, 5, 0, 50, 392109, 104, 152, 24, 936, 930, 82, 1 ],
-	[ "Enraged Arlong Shark On Tooth", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 1, 99, 3000000, 832, 832, 55, 1974, 1491, 154, 1 ],
-	[ "Tashigi", "QCK", [ "Slasher", "Cerebral" ], 3, 9, 5, 1, 50, 392109, 102, 102, 41, 690, 483, 272, 1 ],
-	[ "Tashigi Navy HQ Ensign", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 99, 3000000, 632, 431, 222, 1434, 921, 434, 1.5 ],
-	[ "Smoker", "DEX", [ "Striker", "Driven" ], 3, 9, 5, 1, 50, 392109, 110, 113, 36, 944, 575, 199, 1 ],
-	[ "Smoker the White Hunter", "DEX", [ "Striker", "Driven" ], 4, 15, 5, 2, 99, 3000000, 872, 515, 154, 1736, 1070, 334, 1.5 ],
-	[ "Miss Wednesday", "PSY", "Slasher", 3, 9, 5, 0, 35, 136167, 22, 10, 74, 190, 127, 216, 0.7 ],
-	[ "Nefertari Vivi", "PSY", "Slasher", 4, 13, 5, 1, 70, 1066998, 138, 102, 183, 682, 454, 350, 1 ],
-	[ "Princess Vivi", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 4000000, 602, 414, 280, 908, 747, 477, 1.5 ],
-	[ "Portgas D. Ace", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 70, 1066998, 252, 144, 40, 1802, 545, 199, 1.5 ],
-	[ "Portgas D. Ace Flame Mirror", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 6, 4, 99, 4000000, 1728, 501, 140, 2886, 1020, 279, 1.5 ],
-	[ "Shanks", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 5, 3, 70, 1066998, 186, 159, 46, 1010, 725, 271, 1.5 ],
-	[ "Red-Haired Shanks", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 4, 4, 99, 4000000, 898, 670, 222, 2118, 990, 417, 1 ],
-	[ "Red Robber Penguin", "STR", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
-	[ "Blue Robber Penguin", "QCK", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
-	[ "Green Robber Penguin", "DEX", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
-	[ "Yellow Robber Penguin", "PSY", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
-	[ "Black Robber Penguin", "INT", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
-	[ "Rainbow Robber Penguin", "INT", "Evolver", 3, 1, 5, 0, 1, 0, 20, 20, 50, 20, 20, 50, 1 ],
-	[ "Red Pirate Penguin", "STR", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
-	[ "Blue Pirate Penguin", "QCK", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
-	[ "Green Pirate Penguin", "DEX", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
-	[ "Yellow Pirate Penguin", "PSY", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
-	[ "Black Pirate Penguin", "INT", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
-	[ "Red Hermit Crab", "STR", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
-	[ "Blue Hermit Crab", "QCK", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
-	[ "Green Hermit Crab", "DEX", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
-	[ "Yellow Hermit Crab", "PSY", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
-	[ "Black Hermit Crab", "INT", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
-	[ "Rainbow Hermit Crab", "INT", "Evolver", 2, 3, 5, 0, 1, 0, 50, 280, 0, 50, 150, 0, 1 ],
-	[ "Red Armored Crab", "STR", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
-	[ "Blue Armored Crab", "QCK", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
-	[ "Green Armored Crab", "DEX", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
-	[ "Yellow Armored Crab", "PSY", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
-	[ "Black Armored Crab", "INT", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
-	[ "Red Striped Dragon", "STR", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
-	[ "Blue Striped Dragon", "QCK", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
-	[ "Green Striped Dragon", "DEX", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
-	[ "Yellow Striped Dragon", "PSY", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
-	[ "Black Striped Dragon", "INT", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
-	[ "Red Treasure Turtle", "STR", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
-	[ "Blue Treasure Turtle", "QCK", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
-	[ "Green Treasure Turtle", "DEX", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
-	[ "Yellow Treasure Turtle", "PSY", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
-	[ "Black Treasure Turtle", "INT", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
-	[ "Red Daimyo Turtle", "STR", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
-	[ "Blue Daimyo Turtle", "QCK", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
-	[ "Green Daimyo Turtle", "DEX", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
-	[ "Yellow Daimyo Turtle", "PSY", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
-	[ "Black Daimyo Turtle", "INT", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
-	[ "Sea Pony", "PSY", "Evolver", 1, 2, 5, 0, 1, 0, 20, 20, 20, 20, 20, 10, 1 ],
-	[ "Sea Colt", "PSY", "Evolver", 2, 4, 5, 0, 1, 0, 50, 50, 50, 50, 50, 20, 1 ],
-	[ "Sea Horse", "PSY", "Evolver", 3, 6, 4, 0, 1, 0, 100, 100, 100, 100, 100, 40, 1 ],
-	[ "Sea Stallion", "PSY", "Evolver", 4, 8, 4, 0, 1, 0, 150, 150, 150, 150, 150, 60, 1 ],
-	[ "Sword Bandit", "DEX", "Slasher", 1, 1, 5, 0, 20, 8728, 77, 41, 9, 348, 140, 41, 1 ],
-	[ "Pistol Bandit", "STR", "Shooter", 1, 1, 5, 0, 20, 8728, 17, 14, 28, 105, 57, 104, 1 ],
-	[ "Fighter Group Cabin Boy Red Pirates", "STR", "Fighter", 1, 2, 6, 0, 10, 2330, 79, 54, 6, 327, 141, 17, 1 ],
-	[ "Fighter Group Cabin Boy Blue Pirates", "QCK", "Fighter", 1, 2, 6, 0, 10, 2330, 85, 51, 6, 349, 133, 16, 1 ],
-	[ "Fighter Group Cabin Boy Green Pirates", "DEX", "Fighter", 1, 2, 6, 0, 10, 2330, 85, 54, 5, 357, 138, 13, 1 ],
-	[ "Fighter Group Cabin Boy Yellow Pirates", "PSY", "Fighter", 1, 2, 6, 0, 10, 2330, 77, 49, 8, 315, 126, 24, 1 ],
-	[ "Fighter Group Cabin Boy Black Pirates", "INT", "Fighter", 1, 2, 6, 0, 10, 2330, 83, 61, 3, 345, 153, 10, 1 ],
-	[ "Slasher Group Cabin Boy Red Pirates", "STR", "Slasher", 1, 3, 6, 0, 15, 7532, 69, 47, 10, 333, 134, 28, 1 ],
-	[ "Slasher Group Cabin Boy Blue Pirates", "QCK", "Slasher", 1, 3, 6, 0, 15, 7532, 75, 41, 11, 347, 118, 31, 1 ],
-	[ "Slasher Group Cabin Boy Green Pirates", "DEX", "Slasher", 1, 3, 6, 0, 15, 7532, 69, 44, 11, 341, 115, 33, 1 ],
-	[ "Slasher Group Cabin Boy Yellow Pirates", "PSY", "Slasher", 1, 3, 6, 0, 15, 7532, 63, 38, 14, 325, 114, 35, 1 ],
-	[ "Slasher Group Cabin Boy Black Pirates", "INT", "Slasher", 1, 3, 6, 0, 15, 7532, 65, 49, 10, 341, 136, 25, 1 ],
-	[ "Striker Group Cabin Boy Red Pirates", "STR", "Striker", 1, 1, 6, 0, 10, 2330, 77, 49, 12, 281, 114, 27, 0.7 ],
-	[ "Striker Group Cabin Boy Blue Pirates", "QCK", "Striker", 1, 1, 6, 0, 10, 2330, 79, 45, 13, 281, 105, 30, 0.7 ],
-	[ "Striker Group Cabin Boy Green Pirates", "DEX", "Striker", 1, 1, 6, 0, 10, 2330, 73, 45, 14, 255, 103, 35, 0.7 ],
-	[ "Striker Group Cabin Boy Yellow Pirates", "PSY", "Striker", 1, 1, 6, 0, 10, 2330, 67, 42, 16, 253, 101, 36, 0.7 ],
-	[ "Striker Group Cabin Boy Black Pirates", "INT", "Striker", 1, 1, 6, 0, 10, 2330, 73, 57, 10, 261, 127, 26, 0.7 ],
-	[ "Shooter Group Cabin Boy Red Pirates", "STR", "Shooter", 1, 3, 6, 0, 10, 2330, 41, 19, 24, 129, 57, 78, 0.7 ],
-	[ "Shooter Group Cabin Boy Blue Pirates", "QCK", "Shooter", 1, 3, 6, 0, 10, 2330, 39, 17, 25, 125, 53, 80, 0.7 ],
-	[ "Shooter Group Cabin Boy Green Pirates", "DEX", "Shooter", 1, 3, 6, 0, 10, 2330, 37, 15, 26, 123, 51, 81, 0.7 ],
-	[ "Shooter Group Cabin Boy Yellow Pirates", "PSY", "Shooter", 1, 3, 6, 0, 10, 2330, 35, 13, 27, 107, 47, 85, 0.7 ],
-	[ "Shooter Group Cabin Boy Black Pirates", "INT", "Shooter", 1, 3, 6, 0, 10, 2330, 41, 22, 23, 139, 64, 74, 0.7 ],
-	[ "Cannoneer Cabin Boy", "INT", "Shooter", 1, 4, 5, 0, 20, 17456, 98, 80, 1, 523, 280, 3, 1 ],
-	[ "Fighter Group Crew Red Pirates", "STR", "Fighter", 2, 6, 5, 0, 30, 57558, 200, 103, 10, 707, 428, 29, 1 ],
-	[ "Fighter Group Crew Blue Pirates", "QCK", "Fighter", 2, 6, 5, 0, 30, 57558, 220, 93, 10, 727, 412, 31, 1 ],
-	[ "Fighter Group Crew Green Pirates", "DEX", "Fighter", 2, 6, 5, 0, 30, 57558, 212, 100, 9, 717, 417, 31, 1 ],
-	[ "Fighter Group Crew Yellow Pirates", "PSY", "Fighter", 2, 6, 5, 0, 30, 57558, 190, 90, 16, 695, 398, 41, 1 ],
-	[ "Fighter Group Crew Black Pirates", "INT", "Fighter", 2, 6, 5, 0, 30, 57558, 202, 108, 8, 695, 440, 27, 1 ],
-	[ "Slasher Group Crew Red Pirates", "STR", "Slasher", 2, 7, 5, 0, 35, 90778, 178, 90, 19, 645, 406, 79, 1 ],
-	[ "Slasher Group Crew Blue Pirates", "QCK", "Slasher", 2, 7, 5, 0, 35, 90778, 184, 75, 23, 659, 372, 88, 1 ],
-	[ "Slasher Group Crew Green Pirates", "DEX", "Slasher", 2, 7, 5, 0, 35, 90778, 162, 83, 24, 665, 375, 86, 1 ],
-	[ "Slasher Group Crew Yellow Pirates", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 152, 73, 29, 629, 369, 94, 1 ],
-	[ "Slasher Group Crew Black Pirates", "INT", "Slasher", 2, 7, 5, 0, 35, 90778, 176, 100, 16, 695, 384, 78, 1 ],
-	[ "Striker Group Crew Red Pirates", "STR", "Striker", 2, 5, 5, 0, 25, 33626, 174, 85, 21, 473, 320, 71, 0.7 ],
-	[ "Striker Group Crew Blue Pirates", "QCK", "Striker", 2, 5, 5, 0, 25, 33626, 190, 74, 22, 483, 309, 73, 0.7 ],
-	[ "Striker Group Crew Green Pirates", "DEX", "Striker", 2, 5, 5, 0, 25, 33626, 176, 75, 24, 429, 318, 79, 0.7 ],
-	[ "Striker Group Crew Yellow Pirates", "PSY", "Striker", 2, 5, 5, 0, 25, 33626, 182, 69, 25, 439, 289, 87, 0.7 ],
-	[ "Striker Group Crew Black Pirates", "INT", "Striker", 2, 5, 5, 0, 25, 33626, 188, 87, 18, 465, 342, 65, 0.7 ],
-	[ "Shooter Group Crew Red Pirates", "STR", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 23, 60, 289, 118, 202, 1 ],
-	[ "Shooter Group Crew Blue Pirates", "QCK", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 20, 61, 299, 110, 203, 1 ],
-	[ "Shooter Group Crew Green Pirates", "DEX", "Shooter", 2, 7, 5, 0, 30, 57558, 65, 19, 63, 281, 113, 205, 1 ],
-	[ "Shooter Group Crew Yellow Pirates", "PSY", "Shooter", 2, 7, 5, 0, 30, 57558, 55, 15, 66, 227, 98, 219, 1 ],
-	[ "Shooter Group Crew Black Pirates", "INT", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 29, 58, 299, 155, 198, 1 ],
-	[ "Cannoneer Skilled", "INT", "Shooter", 2, 12, 5, 0, 50, 261406, 203, 105, 3, 1350, 550, 30, 1 ],
-	[ "Bodyguard, ‘Sunglasses'", "DEX", "Shooter", 1, 4, 5, 0, 20, 8728, 115, 50, 30, 370, 180, 90, 0.7 ],
-	[ "Bearded Bodyguard", "QCK", "Shooter", 1, 4, 5, 0, 20, 8728, 105, 70, 25, 370, 210, 80, 0.7 ],
-	[ "Knuckle Punk Black Cat Pirates", "STR", "Fighter", 2, 6, 6, 0, 25, 33626, 30, 129, 2, 267, 612, 3, 1 ],
-	[ "Saber Punk Black Cat Pirates", "DEX", "Slasher", 2, 6, 5, 0, 25, 33626, 42, 120, 3, 295, 592, 5, 1 ],
-	[ "Halberd Punk Black Cat Pirates", "QCK", "Striker", 2, 6, 5, 0, 25, 33626, 32, 122, 4, 277, 598, 6, 1 ],
-	[ "Pistol Punk Black Cat Pirates", "PSY", "Shooter", 2, 6, 5, 0, 25, 33626, 30, 117, 6, 269, 569, 17, 1 ],
-	[ "Cannoneer Punk Black Cat Pirates", "INT", "Shooter", 2, 6, 5, 0, 25, 33626, 26, 137, 0, 267, 621, 0, 1 ],
-	[ "Fighter Group Leader", "STR", "Fighter", 3, 7, 6, 1, 40, 202218, 208, 97, 23, 982, 457, 104, 1 ],
-	[ "Slasher Group Leader", "DEX", "Slasher", 3, 7, 5, 1, 45, 286773, 166, 82, 35, 922, 397, 184, 1 ],
-	[ "Striker Group Leader", "QCK", "Striker", 3, 7, 5, 1, 35, 136167, 200, 80, 30, 828, 291, 135, 1 ],
-	[ "Shooter Group Leader", "PSY", "Shooter", 3, 7, 5, 1, 40, 202218, 128, 41, 55, 508, 253, 251, 1 ],
-	[ "Assassin Master", "INT", "Shooter", 3, 7, 5, 1, 50, 392109, 224, 119, 13, 1532, 557, 79, 1 ],
-	[ "Karate Fishman Arlong crewmember", "STR", "Fighter", 2, 7, 6, 0, 30, 57558, 70, 49, 24, 547, 258, 116, 0.7 ],
-	[ "Sword Fishman Arlong crewmember", "DEX", "Slasher", 2, 7, 5, 0, 30, 57558, 92, 44, 22, 585, 245, 114, 0.7 ],
-	[ "Spear Fishman Arlong crewmember", "QCK", "Striker", 2, 7, 5, 0, 30, 57558, 82, 46, 23, 553, 246, 119, 0.7 ],
-	[ "Pistol Fishman Arlong crewmember", "PSY", "Shooter", 2, 7, 5, 0, 30, 57558, 72, 36, 28, 523, 216, 134, 0.7 ],
-	[ "Knuckle Apprentice Navy", "STR", "Fighter", 1, 3, 6, 0, 15, 7532, 105, 66, 6, 317, 203, 17, 1 ],
-	[ "Saber Apprentice Navy", "DEX", "Slasher", 1, 4, 6, 0, 20, 17456, 45, 75, 13, 293, 194, 44, 1 ],
-	[ "Halberd Apprentice Navy", "QCK", "Striker", 1, 3, 6, 0, 15, 7532, 73, 70, 10, 305, 158, 34, 1 ],
-	[ "Pistol Apprentice Navy", "PSY", "Shooter", 1, 3, 6, 0, 15, 7532, 49, 16, 32, 105, 72, 96, 1 ],
-	[ "Cannoneer Apprentice Navy", "INT", "Shooter", 1, 5, 5, 0, 25, 33626, 93, 90, 0, 400, 350, 1, 1 ],
-	[ "Knuckle Seaman Navy", "STR", "Fighter", 2, 5, 5, 0, 25, 33626, 139, 96, 17, 523, 289, 43, 1 ],
-	[ "Saber Seaman Navy", "DEX", "Slasher", 2, 6, 5, 0, 35, 90778, 75, 101, 26, 512, 322, 84, 1 ],
-	[ "Halberd Seaman Navy", "QCK", "Striker", 2, 5, 5, 0, 25, 33626, 105, 92, 24, 407, 290, 62, 1 ],
-	[ "Pistol Seaman Navy", "PSY", "Shooter", 2, 6, 5, 0, 25, 33626, 75, 23, 52, 139, 100, 170, 1 ],
-	[ "Cannoneer Seaman Navy", "INT", "Shooter", 2, 10, 5, 0, 40, 134812, 143, 140, 1, 620, 660, 2, 1.5 ],
-	[ "Red Elder Turtle", "STR", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
-	[ "Blue Elder Turtle", "QCK", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
-	[ "Green Elder Turtle", "DEX", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
-	[ "Yellow Elder Turtle", "PSY", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
-	[ "Black Elder Turtle", "INT", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
-	[ "Knuckle Ensign Navy HQ", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 474, 237, 30, 898, 490, 107, 1 ],
-	[ "Saber Ensign Navy HQ", "DEX", "Slasher", 3, 9, 6, 1, 50, 392109, 424, 229, 51, 800, 467, 131, 1 ],
-	[ "Halberd Ensign Navy HQ", "QCK", "Striker", 3, 9, 6, 1, 50, 392109, 400, 220, 48, 916, 442, 120, 1 ],
-	[ "Pistol Ensign Navy HQ", "PSY", "Shooter", 3, 9, 6, 1, 50, 392109, 121, 70, 145, 275, 191, 320, 1 ],
-	[ "Bazooka Ensign Navy HQ", "INT", "Shooter", 3, 12, 5, 1, 70, 1066998, 480, 460, 1, 1300, 850, 3, 1 ],
-	[ "Mr. 5 Nez-Palm Cannon", "STR", "Fighter", 3, 11, 5, 1, 35, 136167, 82, 142, 31, 752, 602, 124, 1 ],
-	[ "Mr. 5 Breeze Breath Bomb", "STR", "Shooter", 4, 15, 5, 2, 70, 1066998, 688, 520, 92, 1120, 943, 180, 1 ],
-	[ "Miss Valentine", "QCK", "Fighter", 3, 11, 5, 1, 35, 136167, 120, 114, 34, 860, 488, 144, 1 ],
-	[ "Miss Valentine 10,000 Kilo Guillotine", "QCK", "Fighter", 4, 15, 5, 2, 70, 1066998, 804, 426, 104, 1324, 787, 198, 1 ],
-	[ "Mr. 3", "INT", [ "Slasher", "Cerebral" ], 3, 11, 4, 1, 35, 136167, 196, 100, 26, 926, 515, 120, 1 ],
-	[ "Mr. 3 Extra Special Candelabra", "INT", [ "Slasher", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 600, 449, 120, 1394, 818, 176, 1 ],
-	[ "Miss Goldenweek", "DEX", [ "Striker", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 51, 51, 81, 301, 301, 305, 1 ],
-	[ "Miss Goldenweek Colors Trap: Calming Green", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 5, 2, 70, 1066998, 264, 264, 268, 412, 390, 530, 1 ],
-	[ "Mr. 2 Bon Clay", "PSY", [ "Fighter", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 94, 93, 46, 690, 403, 201, 1 ],
-	[ "Mr. 2 Bon Clay Bombardier Arabesque", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 599, 348, 169, 935, 709, 302, 1 ],
-	[ "Miss All Sunday Baroque Works VP", "INT", [ "Fighter", "Cerebral" ], 4, 15, 6, 1, 50, 392109, 368, 128, 96, 772, 478, 252, 0.7 ],
-	[ "Nico Robin", "INT", [ "Fighter", "Cerebral" ], 5, 20, 6, 2, 99, 3000000, 736, 430, 214, 1865, 1055, 338, 1 ],
-	[ "Mr. 9", "QCK", "Striker", 2, 10, 5, 0, 35, 90778, 106, 88, 33, 490, 313, 136, 0.7 ],
-	[ "Mr. 9 Hot Blooded Bat", "QCK", "Striker", 3, 13, 5, 3, 70, 1066998, 408, 249, 99, 1011, 590, 240, 0.7 ],
-	[ "Laboon", "STR", [ "Fighter", "Powerhouse" ], 3, 18, 5, 1, 50, 392109, 650, 300, 150, 1100, 500, 200, 1 ],
-	[ "Laboon (Luffy's drawing)", "STR", [ "Fighter", "Powerhouse" ], 4, 22, 5, 2, 99, 3000000, 1000, 400, 160, 2500, 850, 250, 1 ],
-	[ "Neptunian Squid", "DEX", "Striker", 3, 18, 8, 1, 50, 392109, 600, 280, 130, 900, 480, 180, 1.5 ],
-	[ "Monkey D. Luffy, Gum-Gum Balloon", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
-	[ "Monkey D. Luffy, Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
-	[ "Roronoa Zoro, Streaming Wolf Swords", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
-	[ "Roronoa Zoro, Lion's Song", "DEX", [ "Slasher", "Driven" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
-	[ "Nami, Fine Tempo", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
-	[ "Nami, Happiness Punch", "INT", [ "Striker", "Cerebral" ], 5, 22, 4, 3, 99, 4000000, 1044, 377, 94, 1990, 949, 168, 1 ],
-	[ "Usopp, Usopp Hammer", "PSY", "Striker", 3, 12, 5, 1, 35, 136167, 188, 101, 40, 778, 388, 191, 1 ],
-	[ "Usopp, Impact", "PSY", "Shooter", 4, 18, 6, 2, 70, 1066998, 733, 361, 97, 1185, 669, 265, 1 ],
-	[ "Mr. Prince, Mutton Shot", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 4, 1, 35, 136167, 276, 108, 32, 1144, 457, 107, 1 ],
-	[ "Mr. Prince, Veau Shot", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 5, 2, 70, 1066998, 1101, 422, 93, 1600, 792, 161, 1 ],
-	[ "Dracule Mihawk", "DEX", "Slasher", 4, 30, 4, 1, 70, 1066998, 324, 201, 1, 1998, 814, 7, 1 ],
-	[ "Hawk Eyes Mihawk", "DEX", "Slasher", 5, 50, 4, 1, 99, 5000000, 1916, 782, 5, 3760, 1285, 15, 1 ],
-	[ "Escapee Morgan", "STR", [ "Slasher", "Driven" ], 3, 17, 5, 1, 70, 711332, 1427, 699, 27, 1600, 1000, 35, 1 ],
-	[ "Double Crosser Django", "PSY", [ "Slasher", "Free Spirit" ], 3, 11, 5, 1, 70, 1066998, 446, 219, 103, 930, 665, 230, 1 ],
-	[ "Double Ironfist Fullbody", "STR", [ "Fighter", "Free Spirit" ], 3, 11, 6, 1, 70, 1066998, 150, 150, 80, 890, 809, 187, 1 ],
-	[ "Hina", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 154, 73, 42, 1176, 495, 187, 1 ],
-	[ "Black Cage Hina", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 4, 2, 99, 3000000, 1088, 422, 149, 2270, 905, 300, 1 ],
-	[ "Mr. 8", "PSY", [ "Shooter", "Cerebral" ], 2, 10, 5, 0, 35, 90778, 178, 55, 32, 530, 248, 151, 1 ],
-	[ "Mr. 8 Igarappapa", "PSY", [ "Shooter", "Cerebral" ], 3, 13, 5, 1, 70, 1066998, 500, 186, 120, 1286, 433, 230, 1 ],
-	[ "Miss Monday", "STR", [ "Fighter", "Powerhouse" ], 2, 10, 4, 0, 35, 90778, 66, 126, 27, 350, 500, 97, 1 ],
-	[ "Miss Monday Superhuman Brass Knuckles", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 270, 422, 71, 506, 1005, 186, 1 ],
-	[ "Knuckle Millions Baroque Works", "STR", "Fighter", 2, 5, 6, 0, 25, 33626, 185, 89, 21, 532, 352, 50, 1 ],
-	[ "Saber Millions Baroque Works", "DEX", "Slasher", 2, 5, 6, 0, 25, 33626, 161, 77, 29, 486, 294, 77, 1 ],
-	[ "Polearm Millions Baroque Works", "QCK", "Striker", 2, 5, 6, 0, 25, 33626, 197, 74, 24, 620, 278, 60, 1 ],
-	[ "Pistol Millions Baroque Works", "PSY", "Shooter", 2, 5, 6, 0, 25, 33626, 159, 51, 40, 476, 224, 102, 1 ],
-	[ "Bazooka Millions Baroque Works", "INT", "Shooter", 2, 5, 4, 0, 25, 33626, 203, 113, 10, 640, 388, 20, 1 ],
-	[ "Knuckle Billions Baroque Works", "STR", "Fighter", 3, 9, 5, 1, 50, 261406, 466, 301, 32, 850, 580, 85, 1 ],
-	[ "Saber Billions Baroque Works", "DEX", "Slasher", 3, 9, 5, 1, 50, 261406, 410, 257, 56, 798, 508, 120, 1 ],
-	[ "Halberd Billions Baroque Works", "QCK", "Striker", 3, 9, 5, 1, 50, 261406, 560, 230, 40, 996, 477, 95, 1 ],
-	[ "Pistol Billions Baroque Works", "PSY", "Shooter", 3, 9, 5, 1, 50, 261406, 402, 187, 82, 698, 400, 172, 1 ],
-	[ "Bazooka Billions Baroque Works", "INT", "Shooter", 3, 9, 4, 1, 50, 261406, 550, 319, 12, 1020, 655, 32, 1 ],
-	[ "Chopper Man", "PSY", "Fighter", 4, 10, 6, 5, 50, 130703, 250, 250, 125, 500, 500, 250, 1 ],
-	[ "Tony Tony Chopper Pre-Rampage", "STR", "Fighter", 4, 30, 6, 1, 70, 1066998, 280, 180, 300, 1808, 851, 0, 1 ],
-	[ "Tony Tony Chopper Post-Rampage", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1808, 851, -350, 3660, 1500, -900, 1 ],
-	[ "Marco", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 6, 3, 50, 392109, 172, 125, 64, 1030, 676, 220, 1 ],
-	[ "Marco the Phoenix", "PSY", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 951, 618, 180, 2258, 1100, 390, 1 ],
-	[ "Jozu", "QCK", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 50, 392109, 412, 109, 27, 1820, 596, 98, 1 ],
-	[ "Diamond Jozu", "QCK", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 1748, 524, 69, 3300, 987, 231, 1 ],
-	[ "Vista", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 5, 3, 50, 392109, 290, 206, 15, 1388, 806, 100, 1 ],
-	[ "Flower Sword Vista", "INT", [ "Slasher", "Powerhouse" ], 5, 28, 5, 4, 99, 4000000, 1314, 732, 72, 2840, 1325, 185, 1 ],
-	[ "Izo", "DEX", [ "Shooter", "Cerebral" ], 4, 18, 4, 3, 50, 392109, 232, 130, 50, 1300, 634, 172, 1 ],
-	[ "Flintlock Pistols Izo", "DEX", [ "Shooter", "Cerebral" ], 5, 28, 5, 4, 99, 4000000, 1224, 585, 136, 2550, 1068, 319, 1 ],
-	[ "Blamenco", "STR", [ "Striker", "Free Spirit" ], 4, 18, 4, 3, 50, 392109, 204, 192, 34, 1150, 775, 150, 1 ],
-	[ "Blamenco the Mallet", "STR", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 1086, 726, 112, 2488, 1252, 268, 1 ],
-	[ "Edward Newgate", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 4, 70, 1422664, 1338, 522, 80, 3220, 1060, 156, 1 ],
-	[ "Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 3148, 978, 110, 3900, 1360, 235, 1 ],
-	[ "Training Coby", "PSY", [ "Striker", "Driven" ], 3, 12, 5, 1, 50, 261406, 90, 81, 55, 780, 514, 218, 0.7 ],
-	[ "Petty Officer Coby", "PSY", [ "Fighter", "Driven" ], 4, 18, 6, 2, 99, 3000000, 701, 485, 191, 1926, 984, 340, 1 ],
-	[ "Training Helmeppo", "INT", [ "Striker", "Driven" ], 3, 12, 5, 1, 50, 261406, 108, 93, 43, 890, 605, 185, 0.7 ],
-	[ "Sergeant Helmeppo", "INT", [ "Slasher", "Driven" ], 4, 18, 5, 2, 99, 3000000, 807, 555, 150, 1998, 1060, 260, 1 ],
-	[ "Rainbow Pirate Penguin", "INT", "Evolver", 4, 6, 6, 0, 1, 0, 200, 100, 300, 200, 100, 300, 1 ],
-	[ "Rainbow Striped Dragon", "INT", "Evolver", 4, 20, 4, 0, 1, 0, 1500, 800, 100, 1500, 800, 100, 1 ],
-	[ "White Chase Smoker", "DEX", [ "Striker", "Driven" ], 5, 20, 5, 3, 99, 2000000, 1644, 1012, 298, 2215, 1282, 338, 1.5 ],
-	[ "Armed Fighter Unit Red Pirates", "STR", "Fighter", 3, 12, 5, 1, 60, 449516, 644, 388, 19, 1055, 781, 33, 0.7 ],
-	[ "Armed Fighter Unit Blue Pirates", "QCK", "Fighter", 3, 12, 5, 1, 60, 449516, 679, 369, 21, 1106, 750, 36, 0.7 ],
-	[ "Armed Fighter Unit Green Pirates", "DEX", "Fighter", 3, 12, 5, 1, 60, 449516, 663, 380, 22, 1082, 770, 34, 0.7 ],
-	[ "Armed Fighter Unit Yellow Pirates", "PSY", "Fighter", 3, 12, 5, 1, 60, 449516, 622, 358, 35, 1030, 725, 58, 0.7 ],
-	[ "Armed Fighter Unit Black Pirates", "INT", "Fighter", 3, 12, 5, 1, 60, 449516, 633, 405, 18, 1044, 800, 30, 0.7 ],
-	[ "Armed Slasher Unit Red Pirates", "STR", "Slasher", 3, 12, 5, 1, 60, 449516, 583, 380, 69, 990, 658, 99, 0.7 ],
-	[ "Armed Slasher Unit Blue Pirates", "QCK", "Slasher", 3, 12, 5, 1, 60, 449516, 618, 339, 74, 1068, 592, 119, 0.7 ],
-	[ "Armed Slasher Unit Green Pirates", "DEX", "Slasher", 3, 12, 5, 1, 60, 449516, 602, 358, 80, 1017, 616, 122, 0.7 ],
-	[ "Armed Slasher Unit Yellow Pirates", "PSY", "Slasher", 3, 12, 5, 1, 60, 449516, 566, 333, 84, 944, 572, 149, 0.7 ],
-	[ "Armed Slasher Unit Black Pirates", "INT", "Slasher", 3, 12, 5, 1, 60, 449516, 590, 381, 59, 983, 660, 109, 0.7 ],
-	[ "Armed Striker Unit Red Pirates", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 473, 320, 71, 946, 640, 142, 0.7 ],
-	[ "Armed Striker Unit Blue Pirates", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 483, 309, 73, 976, 618, 146, 0.7 ],
-	[ "Armed Striker Unit Green Pirates", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 429, 318, 79, 858, 636, 158, 0.7 ],
-	[ "Armed Striker Unit Yellow Pirates", "PSY", "Striker", 3, 12, 5, 1, 60, 449516, 439, 289, 87, 878, 578, 176, 0.7 ],
-	[ "Armed Striker Unit Black Pirates", "INT", "Striker", 3, 12, 5, 1, 60, 449516, 465, 342, 65, 930, 684, 130, 0.7 ],
-	[ "Armed Shooter Unit Red Pirates", "STR", "Shooter", 3, 12, 5, 1, 60, 449516, 271, 102, 180, 481, 355, 301, 0.7 ],
-	[ "Armed Shooter Unit Blue Pirates", "QCK", "Shooter", 3, 12, 5, 1, 60, 449516, 280, 96, 181, 530, 302, 312, 0.7 ],
-	[ "Armed Shooter Unit Green Pirates", "DEX", "Shooter", 3, 12, 5, 1, 60, 449516, 273, 99, 182, 502, 312, 314, 0.7 ],
-	[ "Armed Shooter Unit Yellow Pirates", "PSY", "Shooter", 3, 12, 5, 1, 60, 449516, 201, 88, 205, 427, 284, 348, 0.7 ],
-	[ "Armed Shooter Unit Black Pirates", "INT", "Shooter", 3, 12, 5, 1, 60, 449516, 280, 137, 174, 500, 400, 297, 0.7 ],
-	[ "Skilled Gunner", "INT", "Shooter", 3, 15, 5, 2, 70, 711332, 1280, 500, 20, 1550, 850, 40, 0.7 ],
-	[ "Mr. 13 & Ms. Friday The Unluckies", "INT", "Shooter", 3, 13, 7, 3, 50, 392109, 44, 44, 44, 596, 893, 130, 0.7 ],
-	[ "Dorry", "PSY", [ "Slasher", "Powerhouse" ], 4, 25, 4, 2, 70, 1422664, 450, 370, 102, 1662, 783, 153, 1.5 ],
-	[ "Broggy", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 2, 70, 1422664, 440, 411, 88, 1634, 875, 117, 1.5 ],
-	[ "Triceratops", "QCK", "Fighter", 2, 25, 4, 0, 50, 392109, 500, 200, 50, 965, 700, 50, 1.5 ],
-	[ "Rex", "STR", "Fighter", 2, 25, 4, 0, 50, 392109, 300, 300, 50, 520, 900, 50, 1.5 ],
-	[ "Brontosaurus", "DEX", "Fighter", 2, 25, 4, 0, 50, 392109, 400, 250, 50, 755, 755, 50, 1.5 ],
-	[ "Tsuru", "INT", [ "Shooter", "Cerebral" ], 3, 12, 4, 2, 50, 392109, 140, 26, 60, 880, 400, 266, 1 ],
-	[ "Great Advisor Tsuru", "INT", [ "Shooter", "Cerebral" ], 4, 18, 6, 3, 99, 4000000, 808, 337, 224, 1151, 1210, 366, 1 ],
-	[ "Momonga", "PSY", [ "Slasher", "Cerebral" ], 3, 11, 5, 2, 70, 1066998, 420, 398, 98, 632, 815, 255, 1 ],
-	[ "Onigumo", "DEX", [ "Slasher", "Driven" ], 3, 11, 8, 2, 70, 1066998, 482, 434, 63, 944, 920, 131, 1 ],
-	[ "Red Plated Lobster", "STR", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
-	[ "Blue Plated Lobster", "QCK", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
-	[ "Green Plated Lobster", "DEX", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
-	[ "Yellow Plated Lobster", "PSY", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
-	[ "Black Plated Lobster", "INT", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
-	[ "Monkey D. Garp", "PSY", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 280, 145, 50, 1442, 722, 131, 1 ],
-	[ "Garp the Fist", "PSY", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1377, 685, 105, 2852, 1220, 225, 1 ],
-	[ "Trafalgar Law", "DEX", [ "Slasher", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 104, 125, 73, 876, 702, 238, 1 ],
-	[ "Trafalgar Law, ROOM", "DEX", [ "Slasher", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
-	[ "Basil Hawkins", "INT", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 200, 200, 7, 1165, 750, 127, 1 ],
-	[ "Basil Hawkins the Magician", "INT", [ "Striker", "Cerebral" ], 5, 28, 6, 4, 99, 4000000, 1095, 717, 85, 2480, 1295, 255, 1 ],
-	[ "Killer", "QCK", [ "Striker", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 180, 250, 0, 1228, 895, -50, 1 ],
-	[ "Massacre Soldier Killer", "QCK", [ "Striker", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1120, 811, 0, 2570, 1449, -200, 1 ],
-	[ "Urouge", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 108, 108, 35, 1290, 798, 108, 1 ],
-	[ "Mad Monk Urouge", "PSY", [ "Striker", "Powerhouse" ], 5, 28, 5, 4, 99, 4000000, 1202, 730, 75, 2071, 1343, 200, 1 ],
-	[ "Bepo", "STR", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 120, 105, 80, 820, 690, 246, 1 ],
-	[ "Bepo the Martial Artist", "STR", [ "Fighter", "Powerhouse" ], 5, 28, 6, 4, 99, 4000000, 755, 640, 198, 1880, 1200, 405, 1 ],
-	[ "Kalifa", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 116, 65, 51, 850, 540, 227, 1 ],
-	[ "Beautiful Secretary Kalifa", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 6, 2, 99, 3000000, 788, 488, 177, 1728, 963, 378, 1 ],
-	[ "Paulie", "DEX", "Striker", 3, 12, 5, 1, 50, 392109, 162, 102, 31, 882, 705, 166, 1 ],
-	[ "Paulie Dock One Foreman/Mast Specialist", "DEX", "Striker", 4, 18, 4, 2, 99, 3000000, 812, 617, 130, 2300, 1070, 231, 1 ],
-	[ "Rob Lucci", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 4, 1, 50, 392109, 132, 126, 28, 1192, 721, 106, 1 ],
-	[ "Rob Lucci Dock One Sawyer, Treenail Specialist", "QCK", [ "Slasher", "Powerhouse" ], 4, 18, 6, 2, 99, 3000000, 1107, 654, 69, 2220, 1203, 177, 1 ],
-	[ "Kaku", "QCK", "Striker", 3, 12, 5, 1, 50, 392109, 172, 79, 37, 1233, 635, 131, 0.7 ],
-	[ "Kaku Dock One Carpentry Specialist", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 4, 2, 99, 3000000, 1132, 552, 98, 2517, 988, 213, 0.7 ],
-	[ "Lulu", "QCK", "Shooter", 3, 12, 6, 2, 70, 1066998, 290, 168, 88, 985, 682, 223, 1 ],
-	[ "Wapol", "STR", [ "Fighter", "Free Spirit" ], 3, 8, 4, 1, 50, 392109, 330, 128, 20, 1440, 488, 98, 1 ],
-	[ "Wapol House", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 4, 2, 99, 3000000, 1390, 423, 77, 2940, 835, 142, [ 1, 1, 0.7 ] ],
-	[ "Dalton", "QCK", [ "Slasher", "Cerebral" ], 3, 7, 5, 1, 35, 90778, 192, 110, 45, 751, 390, 140, 0.7 ],
-	[ "Dalton Bison", "QCK", [ "Slasher", "Cerebral" ], 4, 11, 4, 2, 70, 1066998, 690, 322, 102, 1155, 620, 290, 0.7 ],
-	[ "Chess", "DEX", "Shooter", 3, 7, 6, 0, 35, 90778, 186, 90, 31, 668, 296, 121, 1 ],
-	[ "Kuromarimo", "DEX", "Striker", 3, 7, 5, 0, 35, 90778, 72, 144, 24, 366, 488, 108, 1 ],
-	[ "Chessmarimo", "DEX", "Striker", 4, 11, 7, 2, 70, 1066998, 525, 396, 145, 1290, 840, 185, 1 ],
-	[ "Dr. Kureha", "PSY", [ "Slasher", "Cerebral" ], 3, 20, 5, 2, 50, 392109, 35, 32, 88, 200, 200, 510, 1.5 ],
-	[ "Lapin", "INT", "Fighter", 2, 15, 5, 0, 35, 90778, 200, 200, 25, 550, 550, 53, 1.5 ],
-	[ "Lapin Adult", "INT", [ "Fighter", "Powerhouse" ], 3, 20, 4, 2, 70, 1066998, 380, 480, 38, 1100, 950, 100, 1.5 ],
-	[ "Franky", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 128, 128, 28, 1220, 680, 112, 1 ],
-	[ "Dismantler Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 3000000, 1138, 637, 71, 2453, 1032, 198, 1 ],
-	[ "Kiwi", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 777, 444, 265, 1 ],
-	[ "Mozu", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 555, 555, 265, 1 ],
-	[ "Kraken Surume", "STR", [ "Striker", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 99, 99, 188, 1440, 685, 133, 1 ],
-	[ "Kraken Monster of the North", "STR", [ "Striker", "Powerhouse" ], 4, 20, 8, 2, 99, 3000000, 1355, 602, 118, 2700, 1111, 33, 1 ],
-	[ "Red Jeweled Porc", "STR", "Booster", 2, 2, 4, 0, 10, 2330, 45, 27, 7, 129, 77, 15, 1 ],
-	[ "Blue Jeweled Porc", "QCK", "Booster", 2, 2, 4, 0, 10, 2330, 49, 21, 9, 145, 65, 19, 1 ],
-	[ "Green Jeweled Porc", "DEX", "Booster", 2, 2, 4, 0, 10, 2330, 47, 25, 8, 133, 72, 17, 1 ],
-	[ "Yellow Jeweled Porc", "PSY", "Booster", 2, 2, 4, 0, 10, 2330, 44, 19, 12, 120, 58, 28, 1 ],
-	[ "Black Jeweled Porc", "INT", "Booster", 2, 2, 4, 0, 10, 2330, 42, 30, 7, 119, 88, 14, 1 ],
-	[ "Ruby Jeweled Porc", "STR", "Booster", 3, 5, 4, 0, 1, 0, 169, 97, 22, 169, 97, 22, 1 ],
-	[ "Sapphire Jeweled Porc", "QCK", "Booster", 3, 5, 4, 0, 1, 0, 185, 85, 26, 185, 85, 26, 1 ],
-	[ "Emerald Jeweled Porc", "DEX", "Booster", 3, 5, 4, 0, 1, 0, 173, 92, 24, 173, 92, 24, 1 ],
-	[ "Topaz Jeweled Porc", "PSY", "Booster", 3, 5, 4, 0, 1, 0, 160, 78, 35, 160, 78, 35, 1 ],
-	[ "Amethyst Jeweled Porc", "INT", "Booster", 3, 5, 4, 0, 1, 0, 159, 108, 21, 159, 108, 21, 1 ],
-	[ "Zephyr", "INT", [ "Shooter", "Powerhouse" ], 4, 30, 7, 1, 70, 1066998, 320, 133, 4, 1588, 699, 29, 1 ],
-	[ "Zephyr NEO Navy Commander", "INT", [ "Shooter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
-	[ "Ain", "QCK", [ "Shooter", "Cerebral" ], 3, 8, 6, 1, 35, 136167, 96, 87, 47, 688, 421, 195, 1 ],
-	[ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Cerebral" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
-	[ "Eustass Kid", "STR", [ "Striker", "Driven" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
-	[ "Captain Kid", "STR", [ "Striker", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
-	[ "Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
-	[ "Roar of the Sea Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1085, 580, 144, 2801, 1111, 300, 1 ],
-	[ "X Drake", "INT", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 242, 112, 32, 1515, 688, 88, 1 ],
-	[ "Red Flag X Drake", "INT", [ "Fighter", "Powerhouse" ], 5, 28, 6, 4, 99, 4000000, 1432, 611, 57, 3580, 1098, 132, 1 ],
-	[ "Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 277, 80, 44, 1370, 440, 220, 1 ],
-	[ "Big Eater Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1248, 401, 158, 3000, 720, 400, 1 ],
-	[ "Capone Bege", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 199, 102, 34, 1050, 755, 153, 1 ],
-	[ "Capone Gang Bege", "QCK", [ "Shooter", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 893, 682, 110, 2122, 1323, 313, 1 ],
-	[ "Silvers Rayleigh", "INT", [ "Fighter", "Cerebral" ], 5, 30, 4, 3, 70, 1066998, 488, 302, 168, 1518, 826, 309, 1 ],
-	[ "Dark King Rayleigh", "INT", [ "Fighter", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1462, 777, 277, 3001, 1300, 500, 1 ],
-	[ "Giant Slasher Red Pirates", "STR", "Slasher", 2, 8, 6, 0, 30, 57558, 297, 163, 41, 579, 363, 41, 1.5 ],
-	[ "Giant Shooter Blue Pirates", "QCK", "Shooter", 2, 8, 4, 0, 30, 57558, 350, 129, 53, 619, 303, 68, 1.5 ],
-	[ "Giant Warrior Green Pirates", "DEX", "Striker", 2, 8, 4, 0, 30, 57558, 313, 155, 55, 561, 340, 77, 1.5 ],
-	[ "Giant Fighter Yellow Pirates", "PSY", "Fighter", 2, 8, 5, 0, 30, 57558, 308, 151, 52, 575, 332, 67, 1.5 ],
-	[ "Giant Striker Black Pirates", "INT", "Striker", 2, 8, 6, 0, 30, 57558, 330, 133, 42, 614, 313, 54, 1.5 ],
-	[ "Giant Imperial Slasher Red Pirates", "STR", "Slasher", 3, 13, 4, 1, 60, 674274, 490, 334, 46, 1179, 668, 109, 1.5 ],
-	[ "Giant Imperial Shooter Blue Pirates", "QCK", "Shooter", 3, 13, 4, 1, 60, 674274, 528, 281, 64, 1235, 562, 135, 1.5 ],
-	[ "Female Giant Imperial Warrior Green Pirates", "DEX", "Striker", 3, 13, 4, 1, 60, 674274, 472, 310, 72, 1132, 620, 143, 1.5 ],
-	[ "Giant Imperial Fighter Yellow Pirates", "PSY", "Fighter", 3, 13, 4, 1, 60, 674274, 488, 302, 61, 1170, 604, 132, 1.5 ],
-	[ "Giant Imperial Striker Black Pirates", "INT", "Striker", 3, 13, 4, 1, 60, 674274, 525, 311, 49, 1213, 622, 119, 1.5 ],
-	[ "Sea Cat", "PSY", "Fighter", 3, 10, 4, 1, 50, 392109, 77, 7, 33, 777, 77, 333, 1 ],
-	[ "Kung Fu Dugong", "STR", "Fighter", 3, 7, 5, 1, 20, 26184, 25, 225, 45, 50, 355, 95, 0.7 ],
-	[ "Kung Fu Dugong Faithful Apprentice", "STR", "Fighter", 4, 11, 8, 3, 50, 392109, 25, 305, 55, 75, 825, 225, 0.7 ],
-	[ "Banana Gator", "QCK", "Fighter", 3, 10, 4, 0, 50, 392109, 552, 334, 80, 922, 534, 155, 1 ],
-	[ "Sandora Dragon", "DEX", "Fighter", 3, 10, 4, 0, 50, 392109, 511, 285, 120, 811, 485, 190, 1 ],
-	[ "Mr. 0 Baroque Works CEO", "INT", [ "Striker", "Cerebral" ], 3, 10, 5, 2, 50, 392109, 194, 110, 23, 1088, 659, 147, 1.5 ],
-	[ "Sir Crocodile", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 99, 3000000, 995, 582, 112, 2210, 1220, 208, 1.5 ],
-	[ "Hogback", "INT", [ "Fighter", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 210, 72, 33, 1251, 595, 118, 1 ],
-	[ "Doctor Hogback", "INT", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1180, 550, 72, 2741, 945, 189, 1 ],
-	[ "Cindry", "PSY", "Shooter", 3, 12, 5, 1, 50, 392109, 76, 58, 60, 806, 458, 259, 0.7 ],
-	[ "Victoria Cindry", "PSY", "Shooter", 4, 20, 4, 2, 99, 3000000, 622, 398, 231, 1402, 661, 478, 0.7 ],
-	[ "Emporio Ivankov", "QCK", [ "Fighter", "Free Spirit" ], 4, 30, 4, 3, 70, 1066998, 302, 125, 53, 1682, 512, 161, 1 ],
-	[ "Emporio Ivankov Queen of Kamabakka Queendom", "QCK", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1642, 470, 132, 3030, 1155, 290, 1 ],
-	[ "Perona", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 50, 392109, 134, 44, 55, 944, 422, 222, 1 ],
-	[ "Ghost Princess Perona", "DEX", [ "Shooter", "Driven" ], 4, 18, 4, 2, 99, 3000000, 887, 377, 198, 1598, 791, 430, 1 ],
-	[ "Kumacy", "STR", [ "Fighter", "Powerhouse" ], 3, 11, 6, 1, 70, 1066998, 500, 255, 0, 1660, 904, 0, 1 ],
-	[ "Dog Penguin", "QCK", "Fighter", 3, 11, 4, 1, 50, 392109, 986, 500, 54, 1420, 722, 0, 1 ],
-	[ "Miss Merry Christmas", "QCK", "Fighter", 3, 11, 5, 1, 35, 136167, 220, 51, 42, 980, 422, 147, 1 ],
-	[ "Miss Merry Christmas Human Mole", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 910, 348, 113, 1401, 690, 233, 1 ],
-	[ "Mr. 4", "STR", [ "Shooter", "Powerhouse" ], 3, 11, 4, 1, 35, 136167, 250, 110, 14, 1046, 590, 80, 1 ],
-	[ "Mr. 4 and Lassoo the Dog-Gun", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 6, 2, 70, 1066998, 980, 522, 43, 1606, 910, 110, 1 ],
-	[ "Miss Doublefinger", "DEX", [ "Striker", "Cerebral" ], 3, 11, 8, 1, 35, 136167, 115, 87, 44, 770, 501, 158, 1 ],
-	[ "Miss Doublefinger Human Spike", "DEX", [ "Striker", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 720, 435, 120, 1081, 701, 288, 1 ],
-	[ "Mr. 1", "STR", [ "Slasher", "Cerebral" ], 3, 11, 4, 1, 35, 136167, 255, 156, 1, 1152, 744, 10, 1 ],
-	[ "Mr. 1 Human Sword", "STR", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 1021, 652, 2, 1880, 1042, 15, 1 ],
-	[ "Rebecca", "QCK", "Slasher", 4, 14, 5, 2, 70, 1422664, 242, 115, 108, 1525, 707, 345, 1 ],
-	[ "Absalom", "STR", [ "Shooter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 158, 93, 35, 1330, 602, 126, 1 ],
-	[ "Absalom of the Graveyard", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 7, 2, 99, 3000000, 1271, 545, 77, 2601, 1008, 192, 1 ],
-	[ "General Zombie", "INT", "Fighter", 3, 12, 5, 1, 70, 1066998, 920, 352, 0, 2610, 605, 0, 1 ],
-	[ "Jigoro of the Wind", "DEX", "Slasher", 3, 9, 6, 1, 50, 392109, 426, 258, 37, 1348, 744, 0, 1 ],
-	[ "Sir Crocodile Warlord of the Sea", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1088, 659, 147, 2980, 1380, 150, 1 ],
-	[ "Jimbe", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 266, 101, 35, 1590, 660, 118, 1 ],
-	[ "Jimbe Warlord of the Sea", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
-	[ "Bartholomew Kuma", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 290, 110, 33, 1525, 692, 118, 1 ],
-	[ "Bartholomew Kuma Warlord of the Sea", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1445, 644, 82, 2734, 1205, 262, 1 ],
-	[ "Gecko Moria", "INT", [ "Striker", "Driven" ], 4, 15, 4, 3, 70, 1066998, 355, 102, 15, 1928, 677, 33, 1 ],
-	[ "Gecko Moria Warlord of the Sea", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1845, 612, 33, 3900, 1120, 118, 1 ],
-	[ "Boa Hancock", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 416, 251, 197, 1595, 859, 340, 1 ],
-	[ "Boa Hancock Warlord of the Sea", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1512, 782, 301, 2860, 1320, 515, 1 ],
-	[ "Donquixote Doflamingo", "DEX", [ "Slasher", "Driven" ], 4, 30, 4, 1, 70, 1066998, 200, 186, 30, 1061, 790, 145, 1 ],
-	[ "Donquixote Doflamingo, Warlord of the Sea", "DEX", [ "Slasher", "Driven" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
-	[ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Powerhouse" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
-	[ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
-	[ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Driven" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
-	[ "Nami Mirage Tempo: The Heavens", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 348, 201, 75, 1260, 988, 361, 1 ],
-	[ "Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 220, 43, 45, 1190, 430, 208, 1 ],
-	[ "Humming Swordsman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1138, 368, 162, 2108, 980, 332, 1 ],
-	[ "Ryuma", "PSY", "Slasher", 4, 18, 5, 2, 99, 3000000, 1138, 368, 162, 2005, 1088, 162, 1 ],
-	[ "Masira", "STR", "Fighter", 3, 10, 4, 1, 50, 392109, 525, 212, 12, 1120, 655, 95, 1 ],
-	[ "Shoujou", "DEX", "Shooter", 3, 10, 4, 1, 50, 392109, 655, 132, 23, 1334, 401, 144, 1 ],
-	[ "Montblanc Cricket", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 488, 145, 54, 1050, 525, 155, 1.5 ],
-	[ "South Bird and Forest Residents", "DEX", "Fighter", 3, 8, 6, 1, 50, 261406, 752, 383, 121, 929, 423, 161, 1.5 ],
-	[ "Bellamy", "DEX", [ "Fighter", "Driven" ], 3, 10, 4, 1, 35, 136167, 131, 152, 24, 769, 692, 89, 1 ],
-	[ "Bellamy the Hyena", "DEX", [ "Fighter", "Driven" ], 4, 15, 6, 2, 70, 1066998, 726, 600, 67, 1072, 986, 170, 1 ],
-	[ "Sarquiss", "QCK", "Slasher", 3, 10, 5, 1, 50, 392109, 220, 92, 22, 1440, 424, 68, 1 ],
-	[ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 70, 1422664, 881, 422, 155, 1485, 700, 198, 1.5 ],
-	[ "Caroline", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 6, 2, 99, 3000000, 772, 389, 177, 1890, 915, 300, [ 1.5, 1.5, 0.7 ] ],
-	[ "Sanji Kamabakka Queendom Traditional Fighting Style", "QCK", "Fighter", 3, 10, 4, 2, 50, 392109, 221, 58, 29, 1229, 622, 130, [ 0.7, 0.7, 1.5 ] ],
-	[ "Sanji Candy", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1155, 545, 76, 1802, 951, 357, [ 0.7, 0.7, 1.5 ] ],
-	[ "Perona - Sweets", "DEX", [ "Shooter", "Driven" ], 4, 11, 4, 2, 50, 392109, 168, 98, 58, 928, 412, 231, 1.5 ],
-	[ "Ghost Princess Perona - Sweets", "DEX", [ "Shooter", "Driven" ], 5, 20, 4, 3, 99, 3000000, 856, 359, 186, 1568, 741, 466, 1.5 ],
-	[ "Nefertari Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 4, 11, 5, 2, 50, 392109, 138, 102, 183, 889, 358, 256, 1.5 ],
-	[ "Princess Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 844, 297, 213, 1440, 683, 322, 1.5 ],
-	[ "Cowboy and Bourbon Jr. Supersonic Duck Squadron", "QCK", "Evolver", 3, 9, 5, 0, 35, 90778, 150, 80, 35, 755, 334, 155, 1 ],
-	[ "Stomp and Ivan X Supersonic Duck Squadron", "DEX", "Evolver", 3, 9, 5, 0, 35, 90778, 126, 98, 33, 719, 361, 152, 1 ],
-	[ "Centaur and Hikoichi Supersonic Duck Squadron", "STR", "Evolver", 3, 9, 5, 0, 35, 90778, 102, 119, 30, 693, 383, 149, 1 ],
-	[ "Karoo", "PSY", "Striker", 3, 6, 4, 1, 20, 26184, 178, 86, 40, 229, 155, 100, 1 ],
-	[ "Captain Karoo and the Supersonic Duck Squadron", "PSY", "Striker", 4, 18, 7, 2, 99, 3000000, 378, 383, 138, 1412, 702, 461, 1.5 ],
-	[ "Marshall D. Teach", "STR", [ "Shooter", "Driven" ], 4, 30, 6, 1, 70, 1066998, 235, 166, 30, 1402, 790, 23, 1 ],
-	[ "Blackbeard", "STR", [ "Shooter", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1338, 744, 18, 3140, 1418, 83, 1 ],
-	[ "Thatch", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 5, 3, 50, 522812, 208, 103, 63, 1246, 626, 188, 1 ],
-	[ "Twin-Blade Thatch", "QCK", [ "Slasher", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1184, 575, 146, 2505, 1190, 302, 1 ],
-	[ "Namule", "DEX", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 50, 522812, 155, 133, 40, 1081, 822, 142, 1 ],
-	[ "One-Hit Namule", "DEX", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 999, 755, 117, 2398, 1303, 262, 1 ],
-	[ "Rakuyo", "PSY", [ "Striker", "Driven" ], 4, 18, 4, 3, 50, 522812, 161, 122, 65, 1000, 733, 193, 1 ],
-	[ "Morning Star Rakuyo", "PSY", [ "Striker", "Driven" ], 5, 28, 4, 4, 99, 4000000, 945, 681, 122, 2001, 1320, 337, 1 ],
-	[ "Fossa", "STR", [ "Slasher", "Driven" ], 4, 18, 4, 3, 50, 522812, 150, 160, 34, 1120, 831, 132, 1 ],
-	[ "Fossa the Blazing Katana", "STR", [ "Slasher", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1059, 788, 95, 2454, 1388, 228, 1 ],
-	[ "Curiel", "INT", [ "Shooter", "Driven" ], 4, 18, 6, 3, 50, 522812, 202, 153, 48, 1159, 818, 134, 1 ],
-	[ "Heavy Specialist Curiel", "INT", [ "Shooter", "Driven" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
-	[ "Sengoku", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
-	[ "Sengoku the Buddha", "PSY", [ "Fighter", "Cerebral" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
-	[ "Galdino the Criminal, Mr. 3", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
-	[ "Escapee Bentham, Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
-	[ "Master Escape Artist Bentham, Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
-	[ "Satori", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 479, 190, 158, 1422, 576, 272, 1 ],
-	[ "Shura", "INT", "Striker", 4, 15, 4, 2, 70, 1066998, 330, 420, 93, 1030, 1002, 175, 1 ],
-	[ "Gedatsu", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 622, 378, 53, 2020, 703, 108, 1 ],
-	[ "Braham", "DEX", [ "Shooter", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 374, 283, 96, 1202, 684, 202, 1 ],
-	[ "Yama", "STR", "Fighter", 3, 13, 6, 1, 50, 392109, 800, 228, 1, 1700, 608, 2, 1 ],
-	[ "Yellow White Beret, Skypiea Guard", "PSY", "Shooter", 2, 3, 6, 0, 20, 17456, 51, 23, 45, 330, 166, 89, 1 ],
-	[ "Black White Beret, Skypiea Guard", "INT", "Shooter", 2, 3, 6, 0, 20, 17456, 49, 38, 40, 320, 197, 80, 1 ],
-	[ "Yellow White Beret Captain, Skypiea Guard", "PSY", "Shooter", 3, 9, 5, 1, 50, 261406, 270, 128, 69, 845, 433, 198, 1 ],
-	[ "Black White Beret Captain, Skypiea Guard", "INT", "Shooter", 3, 9, 5, 1, 50, 261406, 259, 142, 65, 837, 498, 177, 1 ],
-	[ "Eneru's Elect: Red Guard, Skypiea Enforcer", "STR", "Slasher", 2, 8, 6, 0, 50, 261406, 388, 202, 87, 890, 503, 121, 1 ],
-	[ "Eneru's Elect: Blue Guard, Skypiea Enforcer", "QCK", "Slasher", 2, 8, 6, 0, 50, 261406, 438, 155, 90, 962, 413, 139, 1 ],
-	[ "Eneru's Elect: Green Guard, Skypiea Enforcer", "DEX", "Slasher", 2, 8, 6, 0, 50, 261406, 410, 179, 88, 926, 464, 128, 1 ],
-	[ "Eneru's Elect: Yellow Guard, Skypiea Enforcer", "PSY", "Slasher", 2, 8, 6, 0, 50, 261406, 377, 140, 110, 859, 396, 170, 1 ],
-	[ "Eneru's Elect: Black Guard, Skypiea Enforcer", "INT", "Slasher", 2, 8, 6, 0, 50, 261406, 390, 200, 80, 912, 501, 115, 1 ],
-	[ "Red Striker, Skypiea Enforcer", "STR", "Striker", 2, 6, 4, 0, 30, 57558, 12, 55, 25, 311, 445, 70, 1 ],
-	[ "Blue Striker, Skypiea Enforcer", "QCK", "Striker", 2, 6, 4, 0, 30, 57558, 20, 47, 27, 343, 420, 73, 1 ],
-	[ "Green Striker, Skypiea Enforcer", "DEX", "Striker", 2, 6, 4, 0, 30, 57558, 16, 51, 26, 325, 435, 71, 1 ],
-	[ "Yellow Striker, Skypiea Enforcer", "PSY", "Striker", 2, 6, 4, 0, 30, 57558, 12, 47, 30, 322, 418, 80, 1 ],
-	[ "Black Striker, Skypiea Enforcer", "INT", "Striker", 2, 6, 4, 0, 30, 57558, 16, 54, 24, 329, 442, 68, 1 ],
-	[ "Red Striker Elite, Skypiea Enforcer", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 243, 359, 45, 510, 804, 157, 1 ],
-	[ "Blue Striker Elite, Skypiea Enforcer", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 278, 340, 48, 562, 772, 159, 1 ],
-	[ "Green Striker Elite, Skypiea Enforcer", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 265, 350, 46, 536, 788, 158, 1 ],
-	[ "Yellow Striker Elite, Skypiea Enforcer", "PSY", "Striker", 3, 12, 5, 1, 60, 449516, 242, 338, 53, 505, 760, 166, 1 ],
-	[ "Black Striker Elite, Skypiea Enforcer", "INT", "Striker", 3, 12, 5, 1, 60, 449516, 250, 358, 45, 520, 802, 156, 1 ],
-	[ "Red Nomad, Shandian Warrior", "STR", "Striker", 2, 6, 5, 0, 30, 57558, 79, 45, 26, 494, 302, 87, 1 ],
-	[ "Blue Nomad, Shandian Warrior", "QCK", "Striker", 2, 6, 5, 0, 30, 57558, 92, 36, 30, 538, 268, 94, 1 ],
-	[ "Green Nomad, Shandian Warrior", "DEX", "Striker", 2, 6, 5, 0, 30, 57558, 85, 40, 28, 517, 289, 89, 1 ],
-	[ "Red Nomad Adept, Shandian Warrior", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 438, 228, 60, 864, 642, 162, 1 ],
-	[ "Blue Nomad Adept, Shandian Warrior", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 460, 187, 63, 948, 570, 172, 1 ],
-	[ "Green Nomad Adept, Shandian Warrior", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 449, 201, 61, 900, 606, 168, 1 ],
-	[ "Yellow Hunter, Shandian Warrior", "PSY", "Shooter", 2, 5, 4, 0, 30, 57558, 38, 20, 41, 210, 115, 201, 1 ],
-	[ "Black Hunter, Shandian Warrior", "INT", "Shooter", 2, 5, 4, 0, 30, 57558, 40, 25, 39, 214, 128, 196, 1 ],
-	[ "Yellow Hunter Adept, Shandian Warrior", "PSY", "Shooter", 3, 11, 4, 1, 60, 449516, 150, 60, 160, 502, 258, 365, 1 ],
-	[ "Black Hunter Adept, Shandian Warrior", "INT", "Shooter", 3, 11, 4, 1, 60, 449516, 152, 66, 153, 508, 271, 359, 1 ],
-	[ "Portgas D. Ace, Mt. Corvo's Brothers 3", "QCK", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 90778, 144, 66, 60, 632, 347, 248, 0.7 ],
-	[ "Portgas D. Ace, Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "QCK", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 571, 295, 200, 1072, 559, 385, 0.7 ],
-	[ "Bellmere", "DEX", "Shooter", 3, 9, 5, 1, 35, 136167, 60, 39, 68, 426, 291, 283, 1 ],
-	[ "Bellmere, Nami and Nojiko's Mother", "DEX", "Shooter", 4, 15, 4, 2, 70, 1066998, 377, 249, 240, 810, 483, 400, 1 ],
-	[ "Kaya", "PSY", [ "Shooter", "Cerebral" ], 3, 9, 6, 1, 35, 136167, 115, 50, 72, 370, 180, 330, 1.5 ],
-	[ "Kaya, A rich young girl from Syrup Village", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 331, 151, 275, 405, 250, 550, 1.5 ],
-	[ "Hotori and Kotori", "INT", "Fighter", 3, 9, 6, 1, 35, 136167, 242, 74, 27, 1055, 455, 122, 1 ],
-	[ "Hotori and Kotori, Skypiea Vice Head Enforcers", "INT", "Fighter", 4, 15, 4, 2, 70, 1066998, 989, 385, 92, 1959, 601, 151, 1 ],
-	[ "Pell", "QCK", [ "Slasher", "Powerhouse" ], 3, 9, 6, 1, 35, 136167, 175, 70, 40, 1000, 427, 142, 1 ],
-	[ "Pell, The guardian falcon of Alabasta.", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
-	[ "Chaka", "STR", [ "Slasher", "Powerhouse" ], 3, 9, 5, 1, 35, 136167, 173, 120, 21, 822, 615, 109, 1 ],
-	[ "Chaka, The guardian jackal of Alabasta.", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
-	[ "Sir Crocodile, the Strongest Prisoner, Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
-	[ "Sir Crocodile, the Strongest Prisoner, Ex-Seven Warlords Member", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
-	[ "Daz Bones, Convict, Mr. 1", "INT", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
-	[ "Sabo Mt. Corvo's Brothers 3", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 5, 2, 35, 90778, 32, 32, 32, 522, 288, 286, 0.7 ],
-	[ "Sabo Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "PSY", [ "Striker", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 440, 233, 242, 951, 460, 450, 0.7 ],
-	[ "Nico Robin Tropical", "INT", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 99, 2000000, 368, 128, 96, 1910, 715, 292, 1 ],
-	[ "Heracles-un", "PSY", [ "Shooter", "Cerebral" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
-	[ "Heracles-un, Hero of the Forest", "PSY", [ "Shooter", "Cerebral" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
-	[ "Usopp-un", "PSY", "Shooter", 4, 10, 5, 1, 50, 261406, 444, 237, 47, 1080, 648, 144, 1 ],
-	[ "Usopp-un, Hercules' Student", "PSY", [ "Shooter", "Powerhouse" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
-	[ "Monkey D. Luffy, Merveille's Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
-	[ "Monkey D. Luffy, Straw Hat Pirates' Attack", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
-	[ "Sanji, Merveille's Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
-	[ "Sanji, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
-	[ "Nami, Merveille's Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
-	[ "Nami and Billy the Thunder Bird", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
-	[ "Brook, Merveille's Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
-	[ "Brook, Straw Hat Pirates' Attack", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
-	[ "Chopper, Merveille's Adventurer", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
-	[ "Chopper, Straw Hat Pirates' Attack", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
-	[ "Shanks, Black Clad Redhead", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 478, 285, 185, 1650, 780, 291, 1 ],
-	[ "Shanks, Black Clad Emperor", "PSY", [ "Slasher", "Cerebral" ], 6, 55, 5, 5, 99, 5000000, 1537, 736, 261, 3140, 1400, 418, 1 ],
-	[ "Nico Robin Cherry Blossoms Falling", "DEX", [ "Fighter", "Cerebral" ], 4, 11, 4, 2, 50, 392109, 171, 55, 65, 976, 328, 252, 1 ],
-	[ "Nico Robin Cherry Blossoms in Full Bloom", "DEX", [ "Fighter", "Cerebral" ], 5, 19, 6, 3, 99, 3000000, 913, 271, 209, 1925, 747, 384, 1 ],
-	[ "Brook Cherry Blossom Hair", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 5, 2, 50, 392109, 211, 108, 40, 1267, 448, 163, 1 ],
-	[ "Brook Cherry Blossom Melody", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 1199, 379, 131, 2311, 885, 281, 1 ],
-	[ "Nami Blossom Cloud", "DEX", [ "Shooter", "Cerebral" ], 4, 12, 5, 2, 50, 392109, 127, 53, 73, 812, 303, 287, 1 ],
-	[ "Nami Blossom Climate", "DEX", [ "Shooter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 750, 247, 241, 1783, 670, 445, 1 ],
-	[ "Domino", "PSY", [ "Fighter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 32, 20, 80, 713, 366, 318, 1 ],
-	[ "Domino, Impel Down Vice Head Jailer", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 2, 99, 3000000, 634, 301, 265, 1800, 694, 449, 1 ],
-	[ "Minorhinoceros", "STR", [ "Striker", "Powerhouse" ], 3, 30, 6, 0, 70, 1066998, 1055, 655, 0, 2122, 815, -250, 1 ],
-	[ "Basilisk", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 4, 1, 70, 1066998, 612, 289, 31, 1525, 644, 128, 1 ],
-	[ "Ohm", "STR", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 770, 480, -600, 2200, 1050, -600, 1 ],
-	[ "Nola, Giant Snake", "PSY", [ "Fighter", "Powerhouse" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
-	[ "Wyper", "DEX", [ "Shooter", "Free Spirit" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
-	[ "Wyper, Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
-	[ "Eneru", "PSY", [ "Shooter", "Driven" ], 3, 12, 4, 2, 50, 392109, 177, 141, 58, 951, 615, 185, 1 ],
-	[ "Kami Eneru", "PSY", [ "Shooter", "Driven" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
-	[ "Monkey D. Luffy, Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
-	[ "Monkey D. Luffy, Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
-	[ "Sadie", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
-	[ "Sadie, Impel Down Chief Jailer", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
-	[ "Minokoala", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
-	[ "Manticore", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
-	[ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
-	[ "Roronoa Zoro, Straw Hat Pirates' Attack", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
-	[ "Usopp, Merveille's Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
-	[ "Usopp, Straw Hat Pirates' Attack", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
-	[ "Nico Robin, Merveille's Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
-	[ "Nico Robin, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
-	[ "Franky, Merveille's Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
-	[ "Franky, Straw Hat Pirates' Attack", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
-	[ "Portgas D. Ace, Black Clad Flame Fist", "DEX", [ "Shooter", "Free Spirit" ], 5, 30, 6, 4, 70, 1066998, 515, 264, 152, 1922, 758, 253, 1 ],
-	[ "Portgas D. Ace, Black Clad Division Commander", "DEX", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1877, 702, 214, 3818, 1352, 321, 1 ],
-	[ "Porche", "PSY", "Shooter", 3, 10, 6, 1, 50, 392109, 33, 29, 58, 536, 338, 300, 1 ],
-	[ "Capote", "QCK", "Striker", 3, 10, 5, 1, 50, 392109, 124, 48, 36, 1188, 482, 139, 1 ],
-	[ "Hamburg", "DEX", [ "Striker", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 103, 58, 32, 1024, 620, 122, 1 ],
-	[ "Pickles", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 4, 1, 50, 392109, 130, 51, 25, 1202, 603, 98, 1 ],
-	[ "Big Bun", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 180, 105, 2, 1895, 850, 3, 1 ],
-	[ "Foxy", "INT", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 106, 51, 30, 788, 433, 175, 1 ],
-	[ "The Silver Fox Foxy", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 725, 373, 144, 1212, 698, 266, 1 ],
-	[ "Monkey D. Luffy, Davy Back Fight: Afro", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
-	[ "Monkey D. Luffy, Davy Back Fight: Combat", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
-	[ "Usopp, Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
-	[ "Tony Tony Chopper, Davy Back Fight: Mask", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
-	[ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
-	[ "Aokiji, Ice Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
-	[ "Tea Time Nami", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
-	[ "Monkey D. Luffy, Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
-	[ "Monkey D. Luffy, Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
-	[ "Roronoa Zoro, Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Driven" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
-	[ "Roronoa Zoro, Voyage Dream: Master Swordsman", "QCK", [ "Slasher", "Driven" ], 5, 20, 4, 3, 99, 3000000, 1329, 777, 90, 2250, 1118, 201, 1 ],
-	[ "Genbou", "STR", [ "Shooter", "Free Spirit" ], 3, 15, 4, 1, 70, 1066998, 271, 91, 15, 1855, 711, 54, 0.7 ],
-	[ "Kamakiri", "QCK", [ "Striker", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 195, 84, 30, 1669, 691, 101, 0.7 ],
-	[ "Raki", "INT", "Shooter", 4, 18, 4, 2, 99, 3000000, 158, 55, 51, 1544, 668, 460, 0.7 ],
-	[ "Aisa", "PSY", "Fighter", 3, 11, 5, 2, 50, 392109, 32, 15, 80, 223, 109, 475, 0.7 ],
-	[ "Nojiko", "PSY", [ "Striker", "Cerebral" ], 3, 9, 5, 1, 35, 136167, 125, 57, 60, 398, 277, 293, 1 ],
-	[ "Nojiko, Nami's Sister", "PSY", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 70, 1066998, 330, 233, 253, 709, 382, 438, 1 ],
-	[ "Crocus", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 1, 35, 136167, 202, 60, 41, 886, 301, 203, 1 ],
-	[ "Crocus, Twin Cape Lighthouse Keeper", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 820, 249, 160, 1224, 509, 320, 1 ],
-	[ "Koza", "QCK", "Slasher", 3, 9, 5, 1, 35, 136167, 179, 69, 33, 939, 423, 158, 1 ],
-	[ "Koza, Rebel Leader", "QCK", "Slasher", 4, 15, 4, 2, 70, 1066998, 872, 375, 114, 1440, 681, 225, 1 ],
-	[ "Crimson Hime Turtle", "STR", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
-	[ "Azure Hime Turtle", "QCK", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
-	[ "Jade Hime Turtle", "DEX", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
-	[ "Amber Hime Turtle", "PSY", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
-	[ "Onyx Hime Turtle", "INT", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
-	[ "Tony Tony Chopper, Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 220, 95, 46, 1324, 589, 186, 0.7 ],
-	[ "Tony Tony Chopper, Voyage Dream: Great Doctor", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
-	[ "Buggy, Pirate Apprentice", "INT", [ "Slasher", "Driven" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
-	[ "Buggy, Roger Pirates", "INT", [ "Slasher", "Driven" ], 4, 19, 5, 2, 99, 3000000, 813, 358, 123, 1602, 709, 290, 1 ],
-	[ "Shanks, Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
-	[ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Free Spirit" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
-	[ "Eneru, 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
-	[ "Eneru, Lightning Incarnate, 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
-	[ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
-	[ "Sanji Voyage Dream: All Blue", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1413, 577, 100, 2350, 1052, 208, 0.7 ],
-	[ "Pirate Zeff", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
-	[ "Red-Leg Zeff, Cook Pirates Captain", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1152, 599, 81, 2000, 1088, 258, 1 ],
-	[ "Gangster Patty", "STR", "Shooter", 3, 10, 4, 1, 50, 522812, 155, 120, 25, 1080, 648, 132, 0.7 ],
-	[ "Gangster Carne", "QCK", "Slasher", 3, 10, 6, 1, 50, 522812, 153, 91, 35, 1054, 571, 162, 0.7 ],
-	[ "Hiking Bear", "INT", "Fighter", 2, 7, 5, 0, 35, 90778, 129, 32, 8, 1410, 225, 30, 0.7 ],
-	[ "Purinpurin", "PSY", "Shooter", 2, 7, 6, 0, 35, 90778, 38, 14, 29, 544, 194, 193, 0.7 ],
-	[ "Brook Voyage Log: Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 208, 99, 29, 1326, 603, 168, 0.7 ],
-	[ "Brook Voyage Dream: Promised Meeting", "DEX", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1276, 560, 132, 2117, 1009, 279, 0.7 ],
-	[ "Zambai", "PSY", "Shooter", 3, 16, 4, 2, 70, 1066998, 230, 90, 48, 1580, 702, 168, 1 ],
-	[ "Demolisher Axeman", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
-	[ "Demolisher Spearman", "STR", [ "Striker", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
-	[ "Demolisher Gunner", "STR", [ "Shooter", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
-	[ "Street Punk: Brawler, Red Bounty Hunter", "STR", "Fighter", 3, 13, 6, 1, 60, 674274, 102, 85, 28, 1158, 790, 90, 1 ],
-	[ "Street Punk: Brawler, Green Bounty Hunter", "DEX", "Fighter", 3, 13, 6, 1, 60, 674274, 108, 75, 32, 1175, 754, 102, 1 ],
-	[ "Street Punk: Blade, Blue Bounty Hunter", "QCK", "Slasher", 3, 13, 5, 1, 60, 674274, 153, 66, 40, 1215, 653, 128, 1 ],
-	[ "Street Punk: Blade, Red Bounty Hunter", "STR", "Slasher", 3, 13, 5, 1, 60, 674274, 149, 73, 33, 1193, 690, 115, 1 ],
-	[ "Street Punk: Bullet, Green Bounty Hunter", "DEX", "Shooter", 3, 13, 5, 1, 60, 674274, 92, 45, 51, 938, 500, 255, 1 ],
-	[ "Street Punk: Bullet, Yellow Bounty Hunter", "PSY", "Shooter", 3, 13, 5, 1, 60, 674274, 86, 38, 55, 900, 467, 274, 1 ],
-	[ "Street Punk: Nails, Yellow Bounty Hunter", "PSY", "Striker", 3, 13, 4, 1, 60, 674274, 71, 102, 33, 878, 854, 119, 1 ],
-	[ "Street Punk: Nails, Black Bounty Hunter", "INT", "Striker", 3, 13, 4, 1, 60, 674274, 71, 108, 29, 877, 890, 107, 1 ],
-	[ "Street Punk: Gatling, Black Bounty Hunter", "INT", "Shooter", 3, 13, 6, 1, 60, 674274, 133, 90, 3, 1556, 765, 15, 1 ],
-	[ "Street Punk: Gatling, Blue Bounty Hunter", "QCK", "Shooter", 3, 13, 6, 1, 60, 674274, 150, 84, 5, 1602, 745, 16, 1 ],
-	[ "Tilestone", "STR", [ "Shooter", "Powerhouse" ], 3, 12, 4, 2, 70, 1066998, 153, 98, 30, 1521, 800, 101, 1 ],
-	[ "Franky, Franky Family", "INT", "Fighter", 3, 17, 5, 2, 70, 1066998, 203, 103, 23, 1712, 831, 85, 1 ],
-	[ "Kaku, Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 175, 80, 36, 1224, 643, 120, 1 ],
-	[ "Kaku: Six Powers, Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1144, 577, 93, 2523, 1000, 196, 1 ],
-	[ "Rob Lucci, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 121, 153, 20, 1121, 792, 64, 1 ],
-	[ "Rob Lucci: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 1064, 743, 51, 2284, 1289, 134, 1 ],
-	[ "Camie", "QCK", "Fighter", 3, 12, 4, 1, 50, 392109, 90, 23, 62, 960, 352, 273, [ 0.7, 1, 0.7 ] ],
-	[ "Camie, Takoyaki Shop Clerk", "QCK", "Fighter", 4, 18, 5, 2, 99, 3000000, 900, 295, 231, 1731, 698, 455, 0.7 ],
-	[ "Pappagu", "INT", "Fighter", 3, 12, 5, 1, 50, 392109, 77, 30, 77, 895, 505, 214, 0.7 ],
-	[ "Hatchan, Takoyaki Shop Manager", "PSY", [ "Slasher", "Powerhouse" ], 3, 16, 6, 2, 99, 3000000, 134, 88, 41, 1788, 888, 187, 0.7 ],
-	[ "Doma", "QCK", "Slasher", 4, 18, 4, 3, 70, 1066998, 89, 144, 43, 1098, 733, 187, 0.7 ],
-	[ "Bohemian Knight Doma", "QCK", "Slasher", 5, 29, 4, 4, 99, 4000000, 1020, 695, 150, 2134, 1268, 328, 0.7 ],
-	[ "DeCalvan Brothers", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 240, 89, 28, 1880, 668, 73, 0.7 ],
-	[ "DeCalvan Brothers, Brothers' Bond", "DEX", "Fighter", 5, 29, 5, 4, 99, 4000000, 1824, 602, 50, 3330, 1183, 158, 0.7 ],
-	[ "Squard", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 198, 190, 0, 1351, 810, 0, 0.7 ],
-	[ "Maelstrom Spider Squard", "PSY", [ "Striker", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 960, 755, -1, 2755, 1434, -150, 0.7 ],
-	[ "Whitey Bay", "INT", [ "Slasher", "Driven" ], 4, 18, 5, 3, 70, 1066998, 109, 93, 44, 1140, 600, 223, 0.7 ],
-	[ "Ice Witch Whitey Bay", "INT", [ "Slasher", "Driven" ], 5, 29, 5, 4, 99, 4000000, 1094, 561, 171, 2278, 993, 399, 0.7 ],
-	[ "Little Oars Jr.", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 6, 3, 70, 1066998, 251, 166, 1, 1900, 734, 3, 0.7 ],
-	[ "Little Oars Jr., Charging!", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
-	[ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
-	[ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
-	[ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Cerebral" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
-	[ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
-	[ "Iron Mask Duval", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
-	[ "Duval, Flying Fish Riders Leader", "DEX", [ "Shooter", "Driven" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
-	[ "Duval, Rosy Life Riders Leader", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
-	[ "Arlong the Pirate", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
-	[ "Arlong, Sun Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
-	[ "Kuroobi, Sun Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 50, 392109, 160, 103, 9, 1233, 744, 70, 1 ],
-	[ "Choo, Sun Pirates", "INT", [ "Shooter", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 75, 72, 22, 1002, 552, 178, 1 ],
-	[ "Monkey D. Luffy Swim Ring", "QCK", "Fighter", 4, 15, 6, 2, 99, 2000000, 144, 69, 31, 2232, 933, 242, 1 ],
-	[ "Usopp Voyage Log: Straw Hat Pirates", "QCK", "Striker", 4, 12, 6, 2, 50, 392109, 155, 67, 47, 1085, 513, 235, 0.7 ],
-	[ "Usopp Voyage Dream: Brave Sea Warrior", "QCK", "Striker", 5, 20, 4, 3, 99, 3000000, 1024, 468, 185, 2012, 938, 344, 0.7 ],
-	[ "Nami Holiday", "PSY", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 70, 30, 100, 1334, 673, 396, 0.7 ],
-	[ "Nefeltari Vivi, Princess of Alabasta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 6, 1, 35, 136167, 11, 11, 11, 285, 104, 225, 1 ],
-	[ "Nefeltari Vivi, Sand-Sand Band Sub-Leader", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 243, 51, 187, 593, 269, 488, 1 ],
-	[ "Koza, Alabasta Citizen", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 53, 53, 3, 503, 274, 151, 1 ],
-	[ "Koza, Sand-Sand Band Leader", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 445, 230, 123, 1000, 503, 341, 1 ],
-	[ "Nefeltari Cobra, King of Alabasta Kingdom", "PSY", "Fighter", 3, 15, 5, 2, 70, 1066998, 523, 294, 31, 1402, 571, 211, 1 ],
-	[ "Sabo", "PSY", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 70, 1066998, 369, 279, 169, 1498, 821, 305, 1.5 ],
-	[ "Sabo the Revolutionary", "PSY", [ "Free Spirit", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1440, 752, 252, 2985, 1422, 451, 1.5 ],
-	[ "Koala", "DEX", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 94, 122, 48, 996, 644, 226, 1.5 ],
-	[ "Koala the Revolutionary", "DEX", [ "Fighter", "Free Spirit" ], 5, 29, 4, 4, 99, 4000000, 931, 600, 185, 1934, 1212, 392, 1.5 ],
-	[ "Hack", "STR", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 188, 136, 21, 1241, 721, 151, 1.5 ],
-	[ "Hack, Revolutionary Army", "STR", [ "Fighter", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
-	[ "Emporio Ivankov, New Kama Karate Master", "INT", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
-	[ "Emporio Ivankov, Revolutionary Army", "INT", [ "Free Spirit", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
-	[ "Inazuma", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 179, 58, 47, 1300, 449, 232, 1.5 ],
-	[ "Inazuma the Revolutionary", "QCK", [ "Slasher", "Cerebral" ], 5, 29, 6, 4, 99, 4000000, 1244, 400, 199, 2559, 833, 380, 1.5 ],
-	[ "Nico Robin Voyage Log: Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 2, 50, 392109, 155, 62, 58, 1032, 484, 262, 1 ],
-	[ "Nico Robin Voyage Dream: 100-Year Void", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 6, 3, 99, 3000000, 970, 423, 220, 1924, 857, 390, 1 ],
-	[ "Ice Cream-Loving Nami", "DEX", [ "Striker", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 141, 43, 53, 966, 422, 242, 1 ],
-	[ "Ice Cream-Loving Nami, Lemon Ice Cream", "DEX", [ "Striker", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 900, 366, 200, 1802, 768, 402, 1 ],
-	[ "Ice Cream-Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 147, 61, 46, 988, 491, 218, 0.7 ],
-	[ "Ice Cream-Loving Robin, Chocolate Ice Cream", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
-	[ "Ice Cream-Loving Perona", "INT", [ "Shooter", "Driven" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
-	[ "Ice Cream-Loving Perona, Strawberry Ice Cream", "INT", [ "Shooter", "Driven" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
-	[ "Vivi's Breather", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 4, 2, 70, 1066998, 102, 37, 91, 1028, 497, 343, 1 ],
-	[ "Calgara", "STR", [ "Free Spirit", "Striker" ], 3, 12, 6, 1, 50, 392109, 94, 115, 0, 1203, 692, 0, 1 ],
-	[ "Calgara, Great Shandia Warrior", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
-	[ "Mont Blanc Noland", "INT", [ "Slasher", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
-	[ "Mont Blanc Noland, Lvneel Kingdom Explorer", "INT", [ "Slasher", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
-	[ "Naginata Corporal, Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
-	[ "Rifle Corporal, Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
-	[ "Saber Corporal, Navy HQ", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 51, 34, 22, 466, 330, 111, 1 ],
-	[ "Bazooka Corporal, Navy HQ", "STR", "Shooter", 2, 7, 4, 0, 35, 90778, 62, 50, 14, 598, 404, 64, 1 ],
-	[ "Knuckle Corporal, Navy HQ", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 55, 48, 22, 522, 392, 82, 1 ],
-	[ "Naginata Major, Navy HQ", "DEX", "Striker", 3, 13, 6, 1, 70, 1066998, 554, 250, 61, 1358, 645, 170, 1 ],
-	[ "Rifle Major, Navy HQ", "QCK", "Shooter", 3, 13, 5, 1, 70, 1066998, 444, 244, 96, 1002, 568, 259, 1 ],
-	[ "Saber Major, Navy HQ", "PSY", "Slasher", 3, 13, 6, 1, 70, 1066998, 411, 275, 86, 989, 737, 208, 1 ],
-	[ "Bazooka Major, Navy HQ", "STR", "Shooter", 3, 13, 6, 1, 70, 1066998, 547, 362, 44, 1301, 833, 117, 1 ],
-	[ "Knuckle Major, Navy HQ", "INT", "Fighter", 3, 13, 5, 1, 70, 1066998, 462, 351, 49, 1244, 876, 112, 1 ],
-	[ "Oimo", "PSY", [ "Striker", "Powerhouse" ], 3, 25, 5, 2, 70, 1778330, 452, 223, 23, 1602, 742, 98, 1 ],
-	[ "Kashii", "INT", [ "Slasher", "Powerhouse" ], 3, 25, 6, 2, 70, 1778330, 426, 242, 21, 1551, 798, 87, 1 ],
-	[ "Watchdog Unit of the Law", "QCK", "Slasher", 3, 13, 4, 1, 70, 1066998, 122, 43, 40, 1211, 488, 251, 1 ],
-	[ "Righteous Juror", "STR", "Striker", 3, 13, 4, 1, 70, 1066998, 108, 129, 34, 990, 900, 144, 1 ],
-	[ "Three-Headed Baskerville", "DEX", "Slasher", 3, 13, 4, 3, 70, 1066998, 102, 78, 38, 1109, 595, 232, 1 ],
-	[ "Blueno, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
-	[ "Blueno: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
-	[ "Nico Robin, Devil Child", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
-	[ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
-	[ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
-	[ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],
-	[ "Ganfor", "QCK", "Striker", 3, 12, 6, 1, 50, 392109, 80, 40, 48, 930, 452, 185, 1.5 ],
-	[ "Ganfor, Sky Knight", "QCK", "Striker", 4, 20, 4, 2, 99, 3000000, 884, 401, 151, 1704, 1202, 300, 1.5 ],
-	[ "Pierre", "DEX", "Fighter", 3, 12, 4, 1, 50, 392109, 69, 32, 38, 920, 480, 182, 1 ],
-	[ "Conis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
-	[ "Conis, Skypiea Girl", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
-	[ "Dracule Mihawk Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
-	[ "Hawk Eyes Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
-	[ "Sir Crocodile: Logia, Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
-	[ "Sir Crocodile: Logia, Ex-Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
-	[ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
-	[ "Jerry, Cipher Pol No. 6", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
-	[ "T-Bone", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 99, 78, 42, 958, 542, 162, 1 ],
-	[ "Ship Cutter T-Bone, Marine Captain", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 900, 493, 133, 1700, 1100, 300, 1 ],
-	[ "Nefertari Vivi Voyage Log: Princess of Alabasta", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 98, 51, 62, 855, 424, 288, 1 ],
-	[ "Nefertari Vivi Voyage Dream: Queen of the Pirates", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 800, 371, 258, 1591, 777, 474, 1 ],
-	[ "Monkey D. Luffy Gum-Gum Gatling", "DEX", [ "Free Spirit", "Fighter" ], 4, 15, 8, 3, 99, 2000000, 212, 100, 46, 1777, 795, 270, 0.7 ],
-	[ "Kalifa, Cipher Pol No. 9", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
-	[ "Kalifa: Six Powers, Cipher Pol No. 9", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
-	[ "Jabra, Cipher Pol No. 9", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
-	[ "Jabra: Six Powers, Cipher Pol No. 9", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1272, 521, -200, 2720, 1250, -200, 1 ],
-	[ "Fukuro, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 2, 35, 136167, 114, 52, 30, 1123, 408, 122, 1 ],
-	[ "Fukuro: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 70, 1066998, 1077, 362, 97, 1850, 690, 177, 1 ],
-	[ "Kumadori, Cipher Pol No. 9", "PSY", [ "Striker", "Powerhouse" ], 3, 9, 5, 2, 35, 136167, 102, 60, 29, 1055, 442, 119, 1 ],
-	[ "Kumadori: Six Powers, Cipher Pol No. 9", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 1000, 398, 88, 1792, 755, 165, 1 ],
-	[ "Kaku: Beastman, Ox-Ox Fruit, Model: Giraffe", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 6, 3, 99, 4000000, 1220, 692, 43, 2526, 1200, 114, 1 ],
-	[ "Lucci: Beastman, Cat-Cat Fruit, Model: Leopard", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
-	[ "Spandam", "INT", "Slasher", 4, 7, 5, 1, 35, 136167, 52, 25, 25, 258, 196, 89, 1 ],
-	[ "Franky, Straw Hat Pirates", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1623, 765, 70, 2505, 1149, 130, 1 ],
-	[ "Nero", "QCK", [ "Shooter", "Driven" ], 3, 9, 6, 1, 35, 136167, 59, 112, 20, 324, 543, 83, 0.7 ],
-	[ "Nero, Cipher Pol No. 9", "QCK", [ "Shooter", "Driven" ], 4, 15, 5, 2, 70, 1066998, 277, 489, 51, 755, 1050, 145, 0.7 ],
-	[ "Wanze", "DEX", "Free Spirit", 3, 11, 4, 1, 50, 392109, 202, 44, 40, 1124, 367, 212, 1 ],
-	[ "Wanze, Cipher Pol No. 7", "DEX", "Free Spirit", 4, 18, 5, 2, 99, 3000000, 1059, 312, 170, 2051, 674, 363, 1 ],
-	[ "Portgas D. Ace, Record of the Voyage - Whitebeard Pirates", "QCK", [ "Free Spirit", "Fighter" ], 4, 12, 5, 2, 50, 392109, 141, 71, 36, 1121, 585, 189, 1.5 ],
-	[ "Portgas D. Ace Voyage Dream: Pirate Summit", "QCK", [ "Free Spirit", "Fighter" ], 5, 20, 4, 3, 99, 4000000, 1063, 524, 140, 2181, 1100, 258, 1.5 ],
-	[ "Megalo and Princess Shirahoshi", "QCK", "Fighter", 4, 15, 4, 3, 70, 1066998, 1251, 271, 150, 2001, 600, 241, 1 ],
-	[ "Rob Lucci, CP9 Dark Justice", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 70, 1066998, 496, 300, 89, 1656, 800, 245, 1.5 ],
-	[ "Rob Lucci, CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
-	[ "Kaku, CP9 Dark Justice", "DEX", [ "Slasher", "Powerhouse" ], 4, 17, 6, 3, 70, 1066998, 151, 132, 28, 1183, 713, 178, 1 ],
-	[ "Kaku, CP9's Strongest", "DEX", [ "Slasher", "Powerhouse" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
-	[ "Kalifa, CP9 Dark Justice", "QCK", [ "Cerebral", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
-	[ "Kalifa, CP9's Strongest", "QCK", [ "Cerebral", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
-	[ "Jabra, CP9 Dark Justice", "QCK", [ "Powerhouse", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
-	[ "Jabra, CP9's Strongest", "QCK", [ "Powerhouse", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
-	[ "Blueno, CP9 Dark Justice", "INT", [ "Powerhouse", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
-	[ "Blueno, CP9's Strongest", "INT", [ "Powerhouse", "Free Spirit" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
-	[ "Fukuro, CP9 Dark Justice", "PSY", [ "Powerhouse", "Fighter" ], 4, 16, 4, 3, 70, 1066998, 151, 97, 46, 1140, 651, 203, 1 ],
-	[ "Fukuro, CP9's Strongest", "PSY", [ "Powerhouse", "Fighter" ], 5, 26, 8, 4, 99, 4000000, 1093, 603, 165, 2415, 1051, 353, 1 ],
-	[ "Kumadori, CP9 Dark Justice", "STR", [ "Powerhouse", "Striker" ], 4, 16, 4, 3, 70, 1066998, 162, 89, 47, 1167, 612, 212, 1 ],
-	[ "Kumadori, CP9's Strongest", "STR", [ "Powerhouse", "Striker" ], 5, 26, 7, 4, 99, 4000000, 1110, 560, 170, 2479, 1018, 355, 1 ],
-	[ "Monkey D. Luffy, Halloween Monster", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
-	[ "Usopp, Lying Wolf", "PSY", "Shooter", 4, 20, 5, 3, 99, 3000000, 51, 23, 46, 1444, 673, 400, 1 ],
-	[ "Franky, Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
-	[ "Nami, Jackie 'o Lantern", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
-	[ "Tony Tony Chopper, Lil' Vampire", "INT", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
-	[ "Roronoa Zoro, Jack the Ripper", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
-	[ "Nico Robin, Devil Girl", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
-	[ "Sanji, Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
-	[ "Brook, Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
-	[ "Dalmatian, Marine Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
-	[ "Momonga, Marine Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
-	[ "Onigumo, Marine Vice Admiral", "DEX", [ "Slasher", "Driven" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
-	[ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
-	[ "Berry Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
-	[ "Strawberry, Marine Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
-	[ "Lucky Roo", "PSY", [ "Shooter", "Free Spirit" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
-	[ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
-	[ "Rebecca, Imprisoned Swordsman", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
-	[ "Rebecca, Coliseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
-	[ "Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
-	[ "Mad Monk Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1512, 755, 83, 2824, 1324, 203, 1.5 ],
-	[ "Tashigi: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 132, 65, 49, 999, 495, 205, 1 ],
-	[ "Tashigi Marine Officer: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 932, 428, 164, 1804, 890, 378, 1 ],
-	[ "Gen-san", "STR", [ "Slasher", "Cerebral" ], 3, 9, 5, 2, 35, 136167, 211, 45, 33, 930, 288, 190, 1 ],
-	[ "Genzo, Cocoyasi Village Resident", "STR", [ "Slasher", "Cerebral" ], 4, 15, 4, 3, 70, 1066998, 879, 242, 143, 1324, 501, 299, 1 ],
-	[ "Dr. Hiluluk", "PSY", [ "Shooter", "Free Spirit" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
-	[ "Dr. Hiluluk, Quack Doctor", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
-	[ "Kuina", "DEX", "Striker", 3, 9, 6, 2, 35, 136167, 54, 41, 70, 503, 264, 251, 1 ],
-	[ "Kuina, Shimotsuki Village's Girl Swordsman", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 3, 70, 1066998, 448, 220, 213, 917, 582, 338, 1 ],
-	[ "Tamanegi, Piiman & Ninjin", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
-	[ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
-	[ "Iceburg", "INT", [ "Shooter", "Cerebral" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
-	[ "Iceburg, Mayor of W7 and President of Galley-La Company", "INT", [ "Shooter", "Cerebral" ], 4, 16, 4, 3, 70, 1066998, 723, 343, 122, 1401, 702, 224, 1 ],
-	[ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
-	[ "Nightmare Luffy Warrior of Hope", "INT", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1331, 711, 0, 3020, 1520, 0, 1.5 ],
-	[ "Breed", "INT", "Cerebral", 3, 13, 6, 1, 50, 392109, 59, 25, 59, 867, 418, 275, 1.5 ],
-	[ "Breed, Pet-Pet Fruit User", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
-	[ "Kung Fu Dugong, Sea Animal Pirates", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 2, 70, 1778330, 50, 355, 95, 450, 1115, 225, 1.5 ],
-	[ "Sea Lapahn, Sea Animal Pirates", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
-	[ "Octopus Boxer, Sea Animal Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 15, 8, 1, 70, 711332, 99, 91, 2, 1563, 846, 93, 1 ],
-	[ "Mr. 2 Bon Clay Voyage Log: B.W.", "PSY", [ "Fighter", "Free Spirit" ], 4, 13, 5, 2, 50, 392109, 109, 57, 32, 1033, 513, 212, 1 ],
-	[ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
-	[ "Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 5, 1, 50, 392109, 188, 128, 48, 977, 544, 191, 1 ],
-	[ "Black Cage Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 5, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1 ],
-	[ "Smoker, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 4, 25, 6, 2, 70, 1066998, 710, 309, 44, 1600, 703, 146, 1.5 ],
-	[ "Smoker the White Hunter, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 5, 40, 5, 3, 99, 4000000, 1549, 640, 112, 2727, 1289, 234, 1.5 ],
-	[ "Angel in White Nami, Wedding", "PSY", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
-	[ "Goddess in White Nami, Wedding", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
-	[ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
-	[ "Loveseeking Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
-	[ "Risky Brothers", "DEX", [ "Slasher", "Free Spirit" ], 3, 9, 4, 2, 50, 392109, 30, 15, 40, 707, 368, 287, 1 ],
-	[ "Cerberus", "QCK", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
-	[ "Taralan", "INT", [ "Cerebral", "Powerhouse" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
-	[ "Bear Skin Rug", "DEX", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
-	[ "Gecko Moria, Thriller Bark Demon", "INT", [ "Free Spirit", "Driven" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
-	[ "Gecko Moria, Thriller Bark Ruler", "INT", [ "Free Spirit", "Driven" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
-	[ "Strong Soldier Zombie", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
-	[ "Speedy Soldier Zombie", "QCK", "Fighter", 2, 7, 6, 0, 35, 90778, 77, 30, 92, 944, 590, 43, 1 ],
-	[ "Crafty Soldier Zombie", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],
-	[ "Hate-Filled Soldier Zombie", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 71, 40, 92, 903, 648, 29, 1 ],
-	[ "Egotistical Soldier Zombie", "PSY", "Fighter", 2, 7, 6, 0, 35, 90778, 70, 24, 92, 887, 551, 72, 1 ],
-	[ "Tricky Wild Zombie", "DEX", "Powerhouse", 3, 12, 4, 1, 50, 392109, 75, 74, 132, 899, 720, 71, 1 ],
-	[ "Brainy Wild Zombie", "INT", "Powerhouse", 3, 12, 4, 1, 50, 392109, 71, 86, 132, 823, 771, 65, 1 ],
-	[ "Heartful Wild Zombie", "PSY", "Powerhouse", 3, 12, 4, 1, 50, 392109, 70, 70, 132, 801, 700, 94, 1 ],
-	[ "Powerful General Zombie", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
-	[ "Sneaky General Zombie", "DEX", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
-	[ "Blazing General Zombie", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
-	["Trafalgar Law, the Boy from the White City", "PSY", ["Slasher", "Driven"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
-	["Trafalgar Law, the Boy Saved by Fate", "PSY", ["Slasher", "Driven"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
-	[ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
-	[ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
-	[ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
-	[ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
-	[ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Driven" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
-	[ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
-	[ "Tyrant Bartholomew Kuma, Government Human Weapon", "STR", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
-	[ "Caesar Clown", "DEX", [ "Driven", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
-	[ "Master Caesar", "DEX", [ "Driven", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
-	[ "Vergo", "INT", [ "Striker", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
-	[ "Vergo, Donquixote Pirates", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1464, 730, 60, 3003, 1410, 140, 1 ],
-	[ "Monet", "PSY", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
-	[ "Monet, Donquixote Pirates", "PSY", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1020, 540, 199, 2131, 1001, 433, 1 ],
-	[ "Baby 5", "STR", [ "Shooter", "Striker" ], 4, 18, 5, 3, 70, 1066998, 114, 142, 53, 892, 743, 230, 1 ],
-	[ "Baby 5, Donquixote Pirates", "STR", [ "Shooter", "Striker" ], 5, 30, 6, 4, 99, 4000000, 850, 692, 185, 1929, 1352, 349, 1 ],
-	[ "Buffalo", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 9, 3, 70, 1066998, 96, 96, 49, 1111, 666, 196, 1 ],
-	[ "Buffalo, Donquixote Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 30, 10, 4, 99, 4000000, 1050, 600, 173, 2769, 1096, 296, 1 ],
-	[ "Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 95, 30, 1103, 614, 141, 1 ],
-	[ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
-	[ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
-	[ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
-	[ "Wapol of Tin", "STR", [ "Shooter", "Driven" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
-	[ "Slim-up Wapol", "QCK", [ "Shooter", "Driven" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
-	[ "Robson", "PSY", [ "Fighter", "Powerhouse" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
-	[ "Chopper's Snow Day", "DEX", [ "Fighter", "Powerhouse" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
-	[ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
-	[ "Trafalgar Law Holy Night Nobleman", "DEX", [ "Slasher", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 945, 460, 151, 2003, 1030, 313, 1 ],
-	[ "Jewelry Bonney Ravenous Spoiled Santa", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 5, 3, 50, 392109, 190, 50, 54, 1003, 403, 213, 1 ],
-	[ "Jewelry Bonney Ravenous Greedy Santa", "PSY", [ "Fighter", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 848, 354, 178, 2380, 769, 338, 1 ],
-	[ "Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 18, 5, 2, 50, 392109, 267, 98, 27, 1193, 561, 158, 1 ],
-	[ "War Hero Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 3, 99, 3000000, 1121, 500, 104, 2239, 1048, 261, 1 ],
-	[ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
-	[ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
-	[ "Snowy World Nami", "QCK", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
-	[ "Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
-	[ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
-	[ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Cerebral", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
-	[ "Usopp Tabasco Star: The Storm", "DEX", "Shooter", 4, 15, 7, 2, 99, 2000000, 258, 152, 94, 1866, 704, 343, 1 ],
-	[ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
-	[ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Driven", "Cerebral" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
-	[ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Driven", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
-	[ "Sugar", "QCK", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
-	[ "Sugar, Donquixote Pirates", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 896, 342, 274, 1905, 790, 532, 1 ],
-	[ "Señor Pink", "PSY", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 292, 103, 24, 1524, 657, 142, 1 ],
-	[ "Señor Pink, Donquixote Pirates", "PSY", [ "Free Spirit", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1478, 600, 100, 2800, 1242, 241, 1 ],
-	[ "Trebol", "INT", [ "Cerebral", "Driven" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
-	[ "Trebol, Donquixote Pirates", "INT", [ "Cerebral", "Driven" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
-	[ "Giolla", "DEX", [ "Free Spirit", "Driven" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
-	[ "Giolla, Donquixote Pirates", "DEX", [ "Free Spirit", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
-	[ "Lao G.", "STR", [ "Fighter", "Driven" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
-	[ "Lao G., Donquixote Pirates", "STR", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
-	[ "Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, 5, 2, 70, 1066998, 646, 261, 83, 1247, 693, 220, 1 ],
-	[ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
-	[ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
-	[ "Dorry the Blue Ogre", "INT", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
-	[ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
-	[ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Cerebral" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
-	[ "Buggy, Cheerfully Crazy", "QCK", [ "Driven", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
-	[ "Horo Horo Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
-	[ "Perona, Thriller Bark Demon", "DEX", [ "Shooter", "Driven" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
-	[ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Driven" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
-	[ "Doctor Hogback, Thriller Bark Demon", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
-	[ "Absalom of the Graveyard, Thriller Bark Demon", "STR", [ "Shooter", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
-	[ "Oars, Special Zombie", "STR", [ "Fighter", "Powerhouse" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
-	[ "Gecko Moria, Shadows' Asgard", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
-	[ "Brook, Gentlemanly Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
-	[ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
-	[ "Sir Crocodile, Sand General", "STR", [ "Cerebral", "Driven" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
-	[ "Mr. 3, Makeshift Musician", "QCK", [ "Striker", "Cerebral" ], 4, 17, 4, 2, 99, 2000000, 24, 14, 33, 1703, 622, 312, 1.5 ],
-	[ "Mr. 2 Bon Clay, Dubious Samurai", "INT", [ "Fighter", "Free Spirit" ], 4, 17, 4, 2, 99, 2000000, 42, 20, 22, 1810, 804, 235, 1.5 ],
-	[ "Fresh Franky, Health Comes First", "DEX", [ "Shooter", "Free Spirit" ], 4, 25, 6, 2, 70, 1066998, 659, 244, 85, 1330, 659, 211, 1 ],
-	[ "Cyborg Franky", "DEX", [ "Shooter", "Free Spirit" ], 5, 40, 8, 3, 99, 4000000, 1269, 618, 167, 2515, 1172, 323, 1 ],
-	[ "Broggy, Giant Warrior Pirates", "PSY", [ "Slasher", "Powerhouse" ], 4, 18, 5, 1, 50, 392109, 261, 120, 20, 1354, 539, 90, 1 ],
-	[ "Broggy the Red Ogre", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1292, 463, 64, 2460, 1090, 156, 1 ],
-	[ "Yokozuna", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
-	[ "Roronoa Zoro, the Swordsman Who Wanders Kuraigana Island", "STR", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
-	[ "Roronoa Zoro, Pupil of the World's Strongest Swordsman", "STR", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1403, 687, 67, 2830, 1390, 190, 1 ],
-	[ "Nico Robin, Tequila Wolf Inmate", "INT", [ "Cerebral", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 131, 91, 43, 1021, 679, 217, 1 ],
-	[ "Nico Robin, Light of the Revolution", "INT", [ "Cerebral", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
-	[ "Tony Tony Chopper, Torino Kingdom's Peace Mediator", "PSY", [ "Fighter", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
-	[ "Chopper Mask, the Hero Who Protects the World", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
-	[ "Sanji, Kamabakka Queendom Fugitive", "DEX", [ "Powerhouse", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
-	[ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
-	[ "Brook, Harahetternia's Demon Lord", "QCK", [ "Free Spirit", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
-	[ "Brook, BONE to be Wild!!!", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
-	[ "Nico Robin, Bride of Ohara", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
-	[ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Cerebral", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
-	[ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
-	[ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 1 ],
-	[ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
-	[ "Sweet Pea", "STR", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
-	[ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter", "Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
-	[ "Empress in Love Hancock, Wedding", "INT", [ "Shooter", "Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
-	[ "South Blue's Captain Kid", "STR", [ "Striker", "Driven" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
-	[ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
-	[ "Chief Guard Sadie-chan", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
-	[ "Chief Guard Sadie-chan, Commander of the Jailer Beasts", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
-	[ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Driven" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
-	[ "Hannyabal", "DEX", ["Driven", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
-	[ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Driven", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
-	[ "Saldeath", "INT", [ "Striker", "Cerebral" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
-	[ "Blugori", "DEX", [ "Powerhouse", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
-	[ "Pica", "PSY", [ "Powerhouse","Driven" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
-	[ "Pica, Donquixote Pirates", "PSY", [ "Powerhouse", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-	[ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 1066998, 572, 268, 102, 1841, 797, 229, 1],
-	[ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
-	[ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
-	[ "Monkey D. Luffy, Crew's Promise: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
-	[ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
-	[ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
-	[ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
-	[ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
-	[ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
-	[ "Cyborg Franky, Sacred Beast of Baldimore", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
-	[ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Driven" ], 4, 13, 4, 2, 50, 392109, 59, 34, 47, 814, 392, 223, 1],
-	[ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Driven" ], 5, 20, 5, 3, 99, 3000000, 740, 333, 172, 1787, 787, 390, 1],
-	[ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
-	[ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
-	[ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Powerhouse" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
-	[ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
-	[ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, 1066998, 606, 313, 54, 1496, 744, 152, 1],
-	[ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1431, 690, 110, 2599, 1271, 271, 1],
-	[ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, 136167, 131, 98, 25, 935, 375, 163, 1],
- 	[ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, 1778330, 867, 329, 122, 1403, 800, 229, 1],
-	[ "Gyaro", "QCK", [ "Slasher", "Powerhouse" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
-	[ "Macro", "PSY", [ "Shooter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
-	[ "Tansui", "INT", [ "Fighter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
-	[ "Quick-Draw Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
-	[ "Scheming Gunman, Black Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
-	[ "Technical Gunman, Green Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
-	[ "Quick-Strike Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 84, 66, 52, 805, 612, 236, 1],
-	[ "Strong-Arm Gunman, Red Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, 1123790, 82, 80, 44, 821, 700, 204, 1],
-	[ "Bold Gunman, Yellow Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
-	[ "Saint Charlos", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
-	[ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, 1000000, 6, 334, -600, 30, 601, -500, 1],
-	[ "Saint Shalria", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
-	[ "Eustass Kid, Supernova", "QCK", [ "Driven", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
-	[ "Trafalgar Law, Supernova", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
-	[ "Pacifista PX-1", "DEX", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-2", "PSY", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-3", "QCK", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-4", "STR", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Pacifista PX-5", "INT", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
-	[ "Sentomaru", "PSY", [ "Fighter", "Powerhouse" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
-	[ "Sentomaru, Marine Science Unit Commander", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
-	[ "Smoker, Wild Lone Wolf", "DEX", ["Striker", "Driven"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
-	[ "Smoker, Solitary Lone Wolf", "DEX", ["Striker", "Driven"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
-	[ "Kizaru", "QCK", ["Shooter", "Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
-	[ "Kizaru, Light Human", "QCK", ["Shooter", "Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
-	[ "Izo Whitebeard 16th Div. Commander", "PSY", ["Shooter", "Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
-	[ "Blamenco Whitebeard 6th Div. Commander", "DEX", ["Striker", "Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
-	[ "Namule Whitebeard 8th Div. Commander", "PSY", ["Fighter", "Powerhouse"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
+    [ "Monkey D. Luffy", "STR", "Fighter", 2, 1, 5, 0, 5, 163, 42, 15, 8, 134, 68, 15, 1 ],
+    [ "Monkey D. Luffy Gum-Gum Pistol", "STR", "Fighter", 3, 4, 6, 0, 20, 26184, 130, 76, 14, 510, 249, 49, 0.7 ],
+    [ "Monkey D. Luffy Gum-Gum Bazooka", "STR", "Fighter", 4, 7, 6, 2, 35, 136167, 404, 227, 39, 975, 522, 105, 1 ],
+    [ "Monkey D. Luffy Gear 2", "STR", [ "Fighter", "Free Spirit" ], 5, 15, 8, 3, 99, 3000000, 902, 473, 74, 1772, 1313, 227, 1 ],
+    [ "Roronoa Zoro", "DEX", "Slasher", 3, 4, 6, 0, 20, 26184, 126, 75, 15, 488, 239, 56, 0.7 ],
+    [ "Roronoa Zoro Three Thousand Worlds", "DEX", [ "Slasher", "Driven" ], 4, 7, 6, 2, 35, 136167, 426, 222, 37, 899, 515, 120, 1 ],
+    [ "Roronoa Zoro Pound Phoenix", "DEX", [ "Slasher", "Driven" ], 4, 9, 4, 2, 50, 392109, 462, 258, 37, 1216, 694, 106, 1 ],
+    [ "Roronoa Zoro Ashura Ichibugin", "DEX", [ "Slasher", "Driven" ], 5, 15, 9, 3, 99, 3000000, 724, 667, 39, 2232, 1332, 144, 1 ],
+    [ "Nami", "INT", "Striker", 3, 4, 4, 0, 20, 26184, 72, 51, 32, 366, 201, 89, 0.7 ],
+    [ "Nami Tornado Tempo", "INT", [ "Striker", "Cerebral" ], 4, 7, 5, 2, 35, 136167, 336, 192, 62, 783, 453, 160, 1 ],
+    [ "Nami Mirage Tempo", "INT", [ "Striker", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 348, 201, 75, 840, 543, 219, 1 ],
+    [ "Nami Thunderbolt Tempo", "INT", [ "Striker", "Cerebral" ], 5, 15, 4, 3, 99, 3000000, 494, 437, 154, 1262, 1088, 387, 1 ],
+    [ "Usopp", "PSY", "Shooter", 3, 4, 5, 0, 20, 26184, 50, 32, 42, 322, 127, 121, 0.7 ],
+    [ "Usopp Tabasco Star", "PSY", "Shooter", 4, 7, 6, 2, 35, 136167, 286, 148, 85, 627, 240, 257, 1 ],
+    [ "Usopp Golden Pound", "PSY", "Shooter", 4, 9, 6, 2, 50, 392109, 444, 237, 47, 1080, 648, 144, 1 ],
+    [ "Sogeking", "PSY", "Shooter", 5, 15, 7, 3, 99, 3000000, 638, 260, 189, 1506, 690, 479, 1 ],
+    [ "Sanji", "QCK", "Fighter", 3, 4, 6, 0, 20, 26184, 136, 64, 17, 506, 218, 60, 1 ],
+    [ "Sanji Plastic Surgery Shot", "QCK", [ "Fighter", "Powerhouse" ], 4, 7, 5, 2, 35, 136167, 486, 207, 32, 907, 496, 125, 1 ],
+    [ "Chef Sanji Hot Rock Stew", "QCK", [ "Fighter", "Powerhouse" ], 4, 9, 4, 2, 50, 392109, 494, 191, 54, 986, 500, 209, 1 ],
+    [ "Sanji Diable Jambe Flambe", "QCK", [ "Fighter", "Powerhouse" ], 5, 15, 4, 3, 99, 3000000, 406, 418, 175, 2206, 1030, 249, 1 ],
+    [ "Tony Tony Chopper", "PSY", "Fighter", 3, 4, 5, 0, 20, 26184, 52, 40, 39, 294, 144, 120, 1 ],
+    [ "Tony Tony Chopper Heavy Point", "PSY", [ "Fighter", "Free Spirit" ], 4, 9, 5, 2, 50, 392109, 306, 213, 78, 754, 622, 207, 1 ],
+    [ "Tony Tony Chopper Brain Point", "INT", [ "Fighter", "Cerebral" ], 4, 9, 5, 2, 50, 392109, 258, 198, 91, 520, 454, 302, 1 ],
+    [ "Tony Tony Chopper Arm Point", "STR", [ "Fighter", "Powerhouse" ], 4, 9, 4, 2, 50, 392109, 356, 260, 54, 868, 820, 122, 1 ],
+    [ "Tony Tony Chopper Horn Point", "QCK", "Fighter", 4, 9, 6, 2, 50, 392109, 414, 306, 29, 958, 856, 95, 1 ],
+    [ "Tony Tony Chopper Guard Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 9, 6, 2, 50, 392109, 394, 178, 75, 1320, 408, 184, 1 ],
+    [ "Higuma", "QCK", "Slasher", 2, 8, 5, 0, 35, 45389, 132, 87, 29, 692, 323, 99, 1 ],
+    [ "Master of the Near Sea", "STR", "Fighter", 2, 20, 5, 0, 35, 90778, 500, 350, 80, 550, 400, 100, 1.5 ],
+    [ "Iron-Mace Alvida", "STR", [ "Striker", "Powerhouse" ], 3, 10, 5, 0, 50, 392109, 184, 154, 5, 1412, 755, 61, 1 ],
+    [ "Iron-Mace Alvida Smooth-Smooth Fruit", "STR", [ "Striker", "Free Spirit" ], 4, 15, 6, 1, 99, 3000000, 766, 625, 135, 1668, 999, 369, 1 ],
+    [ "Coby", "PSY", "Fighter", 2, 4, 5, 0, 25, 50439, 70, 25, 32, 166, 70, 120, 1 ],
+    [ "Cabin Boy Coby", "PSY", [ "Fighter", "Driven" ], 3, 9, 5, 3, 50, 392109, 130, 49, 100, 524, 155, 216, 1 ],
+    [ "Helmeppo", "INT", "Shooter", 2, 4, 5, 0, 25, 50439, 62, 62, 21, 308, 242, 39, 1 ],
+    [ "Cabin Boy Helmeppo", "INT", [ "Fighter", "Driven" ], 3, 8, 5, 3, 50, 392109, 234, 210, 29, 770, 485, 130, 1 ],
+    [ "Axe-Hand Morgan", "STR", [ "Slasher", "Driven" ], 2, 9, 5, 0, 50, 261406, 133, 100, 5, 1554, 747, 35, 1 ],
+    [ "Mohji & Richie", "PSY", [ "Fighter", "Driven" ], 2, 9, 6, 1, 50, 261406, 150, 135, 10, 1072, 559, 55, 1 ],
+    [ "Cabaji the Acrobat", "DEX", [ "Slasher", "Driven" ], 2, 9, 6, 1, 50, 261406, 134, 77, 32, 824, 458, 130, 1 ],
+    [ "Buggy", "INT", [ "Slasher", "Driven" ], 3, 8, 5, 0, 35, 136167, 200, 107, 22, 818, 446, 85, 1 ],
+    [ "Buggy the Clown", "INT", [ "Slasher", "Driven" ], 4, 11, 5, 2, 70, 1066998, 714, 342, 58, 1666, 757, 135, 1 ],
+    [ "Gaimon", "PSY", "Shooter", 2, 3, 6, 0, 50, 261406, 133, 5, 14, 1303, 85, 121, 1.5 ],
+    [ "Siam", "INT", "Slasher", 2, 9, 6, 0, 50, 261406, 112, 112, 24, 724, 499, 133, 1 ],
+    [ "Butchie", "STR", [ "Slasher", "Powerhouse" ], 2, 9, 6, 0, 50, 261406, 132, 117, 19, 872, 530, 98, 1 ],
+    [ "One-Two Django", "DEX", "Slasher", 2, 8, 5, 0, 35, 90778, 118, 64, 39, 556, 271, 139, 1 ],
+    [ "Dancing Django", "DEX", "Slasher", 3, 11, 5, 2, 70, 1066998, 476, 218, 98, 1155, 555, 228, 1 ],
+    [ "Captain Kuro", "QCK", [ "Slasher", "Cerebral" ], 3, 10, 7, 0, 70, 1066998, 144, 111, 31, 1102, 640, 151, 1 ],
+    [ "Kuro of a Hundred Plans", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 8, 2, 99, 3000000, 978, 558, 122, 2074, 1057, 282, 1 ],
+    [ "Yosaku", "STR", "Slasher", 2, 5, 6, 1, 40, 134812, 100, 43, 19, 439, 439, 99, 1.5 ],
+    [ "Johnny", "QCK", "Slasher", 2, 7, 6, 1, 40, 134812, 100, 42, 20, 421, 421, 108, 1.5 ],
+    [ "Iron Fist Fullbody", "STR", "Fighter", 2, 3, 6, 0, 15, 7532, 103, 100, 49, 153, 160, 84, 0.7 ],
+    [ "Patty", "STR", "Slasher", 2, 9, 5, 0, 50, 261406, 140, 65, 35, 872, 314, 170, 1 ],
+    [ "Carne", "QCK", "Slasher", 2, 9, 5, 0, 50, 261406, 94, 91, 34, 650, 428, 169, 1 ],
+    [ "Chef Zeff", "DEX", "Fighter", 3, 10, 5, 1, 50, 392109, 142, 118, 29, 908, 698, 164, 1.5 ],
+    [ "Gin", "QCK", "Shooter", 2, 8, 5, 0, 35, 90778, 148, 94, 24, 618, 363, 98, 1 ],
+    [ "Gin the Man-Demon", "QCK", "Striker", 3, 11, 6, 1, 70, 1066998, 558, 300, 57, 1152, 792, 209, 1 ],
+    [ "Pearl", "STR", [ "Striker", "Powerhouse" ], 2, 8, 5, 0, 35, 90778, 198, 84, 19, 956, 296, 64, 1 ],
+    [ "Fire Pearl", "STR", [ "Striker", "Powerhouse" ], 3, 11, 4, 1, 70, 1066998, 820, 226, 38, 1904, 656, 129, 1 ],
+    [ "Don Krieg", "INT", [ "Shooter", "Driven" ], 3, 10, 6, 0, 50, 392109, 214, 97, 24, 1454, 632, 95, 1 ],
+    [ "Don Krieg Poison Gas Bomb MH5", "INT", [ "Shooter", "Driven" ], 4, 15, 4, 2, 99, 3000000, 1276, 553, 74, 2734, 1057, 172, 1 ],
+    [ "Nezumi", "INT", [ "Shooter", "Cerebral" ], 2, 6, 6, 0, 30, 28779, 55, 55, 55, 150, 130, 204, 0.7 ],
+    [ "Momoo", "STR", "Fighter", 3, 18, 4, 0, 50, 392109, 600, 400, 120, 1000, 500, 150, 1.5 ],
+    [ "Choo", "INT", [ "Shooter", "Powerhouse" ], 3, 9, 5, 1, 50, 392109, 110, 71, 49, 768, 492, 256, 1 ],
+    [ "Kuroobi", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 1, 50, 392109, 160, 157, 10, 1200, 759, 76, 1 ],
+    [ "Hatchan", "DEX", [ "Slasher", "Powerhouse" ], 3, 8, 8, 1, 35, 136167, 88, 88, 47, 588, 387, 143, 1 ],
+    [ "Six-Sword Hachi", "DEX", [ "Slasher", "Powerhouse" ], 4, 11, 8, 2, 70, 1066998, 542, 338, 88, 986, 638, 288, 1 ],
+    [ "Arlong", "STR", [ "Slasher", "Powerhouse" ], 3, 10, 5, 0, 50, 392109, 104, 152, 24, 936, 930, 82, 1 ],
+    [ "Enraged Arlong Shark On Tooth", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 1, 99, 3000000, 832, 832, 55, 1974, 1491, 154, 1 ],
+    [ "Tashigi", "QCK", [ "Slasher", "Cerebral" ], 3, 9, 5, 1, 50, 392109, 102, 102, 41, 690, 483, 272, 1 ],
+    [ "Tashigi Navy HQ Ensign", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 99, 3000000, 632, 431, 222, 1434, 921, 434, 1.5 ],
+    [ "Smoker", "DEX", [ "Striker", "Driven" ], 3, 9, 5, 1, 50, 392109, 110, 113, 36, 944, 575, 199, 1 ],
+    [ "Smoker the White Hunter", "DEX", [ "Striker", "Driven" ], 4, 15, 5, 2, 99, 3000000, 872, 515, 154, 1736, 1070, 334, 1.5 ],
+    [ "Miss Wednesday", "PSY", "Slasher", 3, 9, 5, 0, 35, 136167, 22, 10, 74, 190, 127, 216, 0.7 ],
+    [ "Nefertari Vivi", "PSY", "Slasher", 4, 13, 5, 1, 70, 1066998, 138, 102, 183, 682, 454, 350, 1 ],
+    [ "Princess Vivi", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 4000000, 602, 414, 280, 908, 747, 477, 1.5 ],
+    [ "Portgas D. Ace", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 70, 1066998, 252, 144, 40, 1802, 545, 199, 1.5 ],
+    [ "Portgas D. Ace Flame Mirror", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 6, 4, 99, 4000000, 1728, 501, 140, 2886, 1020, 279, 1.5 ],
+    [ "Shanks", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 5, 3, 70, 1066998, 186, 159, 46, 1010, 725, 271, 1.5 ],
+    [ "Red-Haired Shanks", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 4, 4, 99, 4000000, 898, 670, 222, 2118, 990, 417, 1 ],
+    [ "Red Robber Penguin", "STR", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
+    [ "Blue Robber Penguin", "QCK", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
+    [ "Green Robber Penguin", "DEX", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
+    [ "Yellow Robber Penguin", "PSY", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
+    [ "Black Robber Penguin", "INT", "Evolver", 1, 1, 5, 0, 1, 0, 20, 10, 20, 20, 10, 20, 1 ],
+    [ "Rainbow Robber Penguin", "INT", "Evolver", 3, 1, 5, 0, 1, 0, 20, 20, 50, 20, 20, 50, 1 ],
+    [ "Red Pirate Penguin", "STR", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
+    [ "Blue Pirate Penguin", "QCK", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
+    [ "Green Pirate Penguin", "DEX", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
+    [ "Yellow Pirate Penguin", "PSY", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
+    [ "Black Pirate Penguin", "INT", "Evolver", 2, 3, 6, 0, 1, 0, 30, 20, 180, 30, 20, 180, 1 ],
+    [ "Red Hermit Crab", "STR", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
+    [ "Blue Hermit Crab", "QCK", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
+    [ "Green Hermit Crab", "DEX", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
+    [ "Yellow Hermit Crab", "PSY", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
+    [ "Black Hermit Crab", "INT", "Evolver", 1, 1, 5, 0, 1, 0, 50, 180, 0, 50, 180, 0, 1 ],
+    [ "Rainbow Hermit Crab", "INT", "Evolver", 2, 3, 5, 0, 1, 0, 50, 280, 0, 50, 150, 0, 1 ],
+    [ "Red Armored Crab", "STR", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
+    [ "Blue Armored Crab", "QCK", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
+    [ "Green Armored Crab", "DEX", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
+    [ "Yellow Armored Crab", "PSY", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
+    [ "Black Armored Crab", "INT", "Evolver", 2, 2, 5, 0, 1, 0, 50, 300, 0, 50, 300, 0, 1 ],
+    [ "Red Striped Dragon", "STR", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
+    [ "Blue Striped Dragon", "QCK", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
+    [ "Green Striped Dragon", "DEX", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
+    [ "Yellow Striped Dragon", "PSY", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
+    [ "Black Striped Dragon", "INT", "Evolver", 3, 12, 4, 0, 1, 0, 500, 500, 50, 500, 500, 50, 1 ],
+    [ "Red Treasure Turtle", "STR", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
+    [ "Blue Treasure Turtle", "QCK", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
+    [ "Green Treasure Turtle", "DEX", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
+    [ "Yellow Treasure Turtle", "PSY", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
+    [ "Black Treasure Turtle", "INT", "Booster", 3, 1, 6, 0, 1, 0, 100, 10, 10, 100, 10, 10, 1 ],
+    [ "Red Daimyo Turtle", "STR", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
+    [ "Blue Daimyo Turtle", "QCK", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
+    [ "Green Daimyo Turtle", "DEX", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
+    [ "Yellow Daimyo Turtle", "PSY", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
+    [ "Black Daimyo Turtle", "INT", "Booster", 4, 2, 5, 0, 1, 0, 500, 20, 20, 500, 20, 20, 1 ],
+    [ "Sea Pony", "PSY", "Evolver", 1, 2, 5, 0, 1, 0, 20, 20, 20, 20, 20, 10, 1 ],
+    [ "Sea Colt", "PSY", "Evolver", 2, 4, 5, 0, 1, 0, 50, 50, 50, 50, 50, 20, 1 ],
+    [ "Sea Horse", "PSY", "Evolver", 3, 6, 4, 0, 1, 0, 100, 100, 100, 100, 100, 40, 1 ],
+    [ "Sea Stallion", "PSY", "Evolver", 4, 8, 4, 0, 1, 0, 150, 150, 150, 150, 150, 60, 1 ],
+    [ "Sword Bandit", "DEX", "Slasher", 1, 1, 5, 0, 20, 8728, 77, 41, 9, 348, 140, 41, 1 ],
+    [ "Pistol Bandit", "STR", "Shooter", 1, 1, 5, 0, 20, 8728, 17, 14, 28, 105, 57, 104, 1 ],
+    [ "Fighter Group Cabin Boy Red Pirates", "STR", "Fighter", 1, 2, 6, 0, 10, 2330, 79, 54, 6, 327, 141, 17, 1 ],
+    [ "Fighter Group Cabin Boy Blue Pirates", "QCK", "Fighter", 1, 2, 6, 0, 10, 2330, 85, 51, 6, 349, 133, 16, 1 ],
+    [ "Fighter Group Cabin Boy Green Pirates", "DEX", "Fighter", 1, 2, 6, 0, 10, 2330, 85, 54, 5, 357, 138, 13, 1 ],
+    [ "Fighter Group Cabin Boy Yellow Pirates", "PSY", "Fighter", 1, 2, 6, 0, 10, 2330, 77, 49, 8, 315, 126, 24, 1 ],
+    [ "Fighter Group Cabin Boy Black Pirates", "INT", "Fighter", 1, 2, 6, 0, 10, 2330, 83, 61, 3, 345, 153, 10, 1 ],
+    [ "Slasher Group Cabin Boy Red Pirates", "STR", "Slasher", 1, 3, 6, 0, 15, 7532, 69, 47, 10, 333, 134, 28, 1 ],
+    [ "Slasher Group Cabin Boy Blue Pirates", "QCK", "Slasher", 1, 3, 6, 0, 15, 7532, 75, 41, 11, 347, 118, 31, 1 ],
+    [ "Slasher Group Cabin Boy Green Pirates", "DEX", "Slasher", 1, 3, 6, 0, 15, 7532, 69, 44, 11, 341, 115, 33, 1 ],
+    [ "Slasher Group Cabin Boy Yellow Pirates", "PSY", "Slasher", 1, 3, 6, 0, 15, 7532, 63, 38, 14, 325, 114, 35, 1 ],
+    [ "Slasher Group Cabin Boy Black Pirates", "INT", "Slasher", 1, 3, 6, 0, 15, 7532, 65, 49, 10, 341, 136, 25, 1 ],
+    [ "Striker Group Cabin Boy Red Pirates", "STR", "Striker", 1, 1, 6, 0, 10, 2330, 77, 49, 12, 281, 114, 27, 0.7 ],
+    [ "Striker Group Cabin Boy Blue Pirates", "QCK", "Striker", 1, 1, 6, 0, 10, 2330, 79, 45, 13, 281, 105, 30, 0.7 ],
+    [ "Striker Group Cabin Boy Green Pirates", "DEX", "Striker", 1, 1, 6, 0, 10, 2330, 73, 45, 14, 255, 103, 35, 0.7 ],
+    [ "Striker Group Cabin Boy Yellow Pirates", "PSY", "Striker", 1, 1, 6, 0, 10, 2330, 67, 42, 16, 253, 101, 36, 0.7 ],
+    [ "Striker Group Cabin Boy Black Pirates", "INT", "Striker", 1, 1, 6, 0, 10, 2330, 73, 57, 10, 261, 127, 26, 0.7 ],
+    [ "Shooter Group Cabin Boy Red Pirates", "STR", "Shooter", 1, 3, 6, 0, 10, 2330, 41, 19, 24, 129, 57, 78, 0.7 ],
+    [ "Shooter Group Cabin Boy Blue Pirates", "QCK", "Shooter", 1, 3, 6, 0, 10, 2330, 39, 17, 25, 125, 53, 80, 0.7 ],
+    [ "Shooter Group Cabin Boy Green Pirates", "DEX", "Shooter", 1, 3, 6, 0, 10, 2330, 37, 15, 26, 123, 51, 81, 0.7 ],
+    [ "Shooter Group Cabin Boy Yellow Pirates", "PSY", "Shooter", 1, 3, 6, 0, 10, 2330, 35, 13, 27, 107, 47, 85, 0.7 ],
+    [ "Shooter Group Cabin Boy Black Pirates", "INT", "Shooter", 1, 3, 6, 0, 10, 2330, 41, 22, 23, 139, 64, 74, 0.7 ],
+    [ "Cannoneer Cabin Boy", "INT", "Shooter", 1, 4, 5, 0, 20, 17456, 98, 80, 1, 523, 280, 3, 1 ],
+    [ "Fighter Group Crew Red Pirates", "STR", "Fighter", 2, 6, 5, 0, 30, 57558, 200, 103, 10, 707, 428, 29, 1 ],
+    [ "Fighter Group Crew Blue Pirates", "QCK", "Fighter", 2, 6, 5, 0, 30, 57558, 220, 93, 10, 727, 412, 31, 1 ],
+    [ "Fighter Group Crew Green Pirates", "DEX", "Fighter", 2, 6, 5, 0, 30, 57558, 212, 100, 9, 717, 417, 31, 1 ],
+    [ "Fighter Group Crew Yellow Pirates", "PSY", "Fighter", 2, 6, 5, 0, 30, 57558, 190, 90, 16, 695, 398, 41, 1 ],
+    [ "Fighter Group Crew Black Pirates", "INT", "Fighter", 2, 6, 5, 0, 30, 57558, 202, 108, 8, 695, 440, 27, 1 ],
+    [ "Slasher Group Crew Red Pirates", "STR", "Slasher", 2, 7, 5, 0, 35, 90778, 178, 90, 19, 645, 406, 79, 1 ],
+    [ "Slasher Group Crew Blue Pirates", "QCK", "Slasher", 2, 7, 5, 0, 35, 90778, 184, 75, 23, 659, 372, 88, 1 ],
+    [ "Slasher Group Crew Green Pirates", "DEX", "Slasher", 2, 7, 5, 0, 35, 90778, 162, 83, 24, 665, 375, 86, 1 ],
+    [ "Slasher Group Crew Yellow Pirates", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 152, 73, 29, 629, 369, 94, 1 ],
+    [ "Slasher Group Crew Black Pirates", "INT", "Slasher", 2, 7, 5, 0, 35, 90778, 176, 100, 16, 695, 384, 78, 1 ],
+    [ "Striker Group Crew Red Pirates", "STR", "Striker", 2, 5, 5, 0, 25, 33626, 174, 85, 21, 473, 320, 71, 0.7 ],
+    [ "Striker Group Crew Blue Pirates", "QCK", "Striker", 2, 5, 5, 0, 25, 33626, 190, 74, 22, 483, 309, 73, 0.7 ],
+    [ "Striker Group Crew Green Pirates", "DEX", "Striker", 2, 5, 5, 0, 25, 33626, 176, 75, 24, 429, 318, 79, 0.7 ],
+    [ "Striker Group Crew Yellow Pirates", "PSY", "Striker", 2, 5, 5, 0, 25, 33626, 182, 69, 25, 439, 289, 87, 0.7 ],
+    [ "Striker Group Crew Black Pirates", "INT", "Striker", 2, 5, 5, 0, 25, 33626, 188, 87, 18, 465, 342, 65, 0.7 ],
+    [ "Shooter Group Crew Red Pirates", "STR", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 23, 60, 289, 118, 202, 1 ],
+    [ "Shooter Group Crew Blue Pirates", "QCK", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 20, 61, 299, 110, 203, 1 ],
+    [ "Shooter Group Crew Green Pirates", "DEX", "Shooter", 2, 7, 5, 0, 30, 57558, 65, 19, 63, 281, 113, 205, 1 ],
+    [ "Shooter Group Crew Yellow Pirates", "PSY", "Shooter", 2, 7, 5, 0, 30, 57558, 55, 15, 66, 227, 98, 219, 1 ],
+    [ "Shooter Group Crew Black Pirates", "INT", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 29, 58, 299, 155, 198, 1 ],
+    [ "Cannoneer Skilled", "INT", "Shooter", 2, 12, 5, 0, 50, 261406, 203, 105, 3, 1350, 550, 30, 1 ],
+    [ "Bodyguard, ‘Sunglasses'", "DEX", "Shooter", 1, 4, 5, 0, 20, 8728, 115, 50, 30, 370, 180, 90, 0.7 ],
+    [ "Bearded Bodyguard", "QCK", "Shooter", 1, 4, 5, 0, 20, 8728, 105, 70, 25, 370, 210, 80, 0.7 ],
+    [ "Knuckle Punk Black Cat Pirates", "STR", "Fighter", 2, 6, 6, 0, 25, 33626, 30, 129, 2, 267, 612, 3, 1 ],
+    [ "Saber Punk Black Cat Pirates", "DEX", "Slasher", 2, 6, 5, 0, 25, 33626, 42, 120, 3, 295, 592, 5, 1 ],
+    [ "Halberd Punk Black Cat Pirates", "QCK", "Striker", 2, 6, 5, 0, 25, 33626, 32, 122, 4, 277, 598, 6, 1 ],
+    [ "Pistol Punk Black Cat Pirates", "PSY", "Shooter", 2, 6, 5, 0, 25, 33626, 30, 117, 6, 269, 569, 17, 1 ],
+    [ "Cannoneer Punk Black Cat Pirates", "INT", "Shooter", 2, 6, 5, 0, 25, 33626, 26, 137, 0, 267, 621, 0, 1 ],
+    [ "Fighter Group Leader", "STR", "Fighter", 3, 7, 6, 1, 40, 202218, 208, 97, 23, 982, 457, 104, 1 ],
+    [ "Slasher Group Leader", "DEX", "Slasher", 3, 7, 5, 1, 45, 286773, 166, 82, 35, 922, 397, 184, 1 ],
+    [ "Striker Group Leader", "QCK", "Striker", 3, 7, 5, 1, 35, 136167, 200, 80, 30, 828, 291, 135, 1 ],
+    [ "Shooter Group Leader", "PSY", "Shooter", 3, 7, 5, 1, 40, 202218, 128, 41, 55, 508, 253, 251, 1 ],
+    [ "Assassin Master", "INT", "Shooter", 3, 7, 5, 1, 50, 392109, 224, 119, 13, 1532, 557, 79, 1 ],
+    [ "Karate Fishman Arlong crewmember", "STR", "Fighter", 2, 7, 6, 0, 30, 57558, 70, 49, 24, 547, 258, 116, 0.7 ],
+    [ "Sword Fishman Arlong crewmember", "DEX", "Slasher", 2, 7, 5, 0, 30, 57558, 92, 44, 22, 585, 245, 114, 0.7 ],
+    [ "Spear Fishman Arlong crewmember", "QCK", "Striker", 2, 7, 5, 0, 30, 57558, 82, 46, 23, 553, 246, 119, 0.7 ],
+    [ "Pistol Fishman Arlong crewmember", "PSY", "Shooter", 2, 7, 5, 0, 30, 57558, 72, 36, 28, 523, 216, 134, 0.7 ],
+    [ "Knuckle Apprentice Navy", "STR", "Fighter", 1, 3, 6, 0, 15, 7532, 105, 66, 6, 317, 203, 17, 1 ],
+    [ "Saber Apprentice Navy", "DEX", "Slasher", 1, 4, 6, 0, 20, 17456, 45, 75, 13, 293, 194, 44, 1 ],
+    [ "Halberd Apprentice Navy", "QCK", "Striker", 1, 3, 6, 0, 15, 7532, 73, 70, 10, 305, 158, 34, 1 ],
+    [ "Pistol Apprentice Navy", "PSY", "Shooter", 1, 3, 6, 0, 15, 7532, 49, 16, 32, 105, 72, 96, 1 ],
+    [ "Cannoneer Apprentice Navy", "INT", "Shooter", 1, 5, 5, 0, 25, 33626, 93, 90, 0, 400, 350, 1, 1 ],
+    [ "Knuckle Seaman Navy", "STR", "Fighter", 2, 5, 5, 0, 25, 33626, 139, 96, 17, 523, 289, 43, 1 ],
+    [ "Saber Seaman Navy", "DEX", "Slasher", 2, 6, 5, 0, 35, 90778, 75, 101, 26, 512, 322, 84, 1 ],
+    [ "Halberd Seaman Navy", "QCK", "Striker", 2, 5, 5, 0, 25, 33626, 105, 92, 24, 407, 290, 62, 1 ],
+    [ "Pistol Seaman Navy", "PSY", "Shooter", 2, 6, 5, 0, 25, 33626, 75, 23, 52, 139, 100, 170, 1 ],
+    [ "Cannoneer Seaman Navy", "INT", "Shooter", 2, 10, 5, 0, 40, 134812, 143, 140, 1, 620, 660, 2, 1.5 ],
+    [ "Red Elder Turtle", "STR", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
+    [ "Blue Elder Turtle", "QCK", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
+    [ "Green Elder Turtle", "DEX", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
+    [ "Yellow Elder Turtle", "PSY", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
+    [ "Black Elder Turtle", "INT", "Booster", 5, 4, 4, 0, 1, 0, 1000, 30, 30, 1000, 30, 30, 1 ],
+    [ "Knuckle Ensign Navy HQ", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 474, 237, 30, 898, 490, 107, 1 ],
+    [ "Saber Ensign Navy HQ", "DEX", "Slasher", 3, 9, 6, 1, 50, 392109, 424, 229, 51, 800, 467, 131, 1 ],
+    [ "Halberd Ensign Navy HQ", "QCK", "Striker", 3, 9, 6, 1, 50, 392109, 400, 220, 48, 916, 442, 120, 1 ],
+    [ "Pistol Ensign Navy HQ", "PSY", "Shooter", 3, 9, 6, 1, 50, 392109, 121, 70, 145, 275, 191, 320, 1 ],
+    [ "Bazooka Ensign Navy HQ", "INT", "Shooter", 3, 12, 5, 1, 70, 1066998, 480, 460, 1, 1300, 850, 3, 1 ],
+    [ "Mr. 5 Nez-Palm Cannon", "STR", "Fighter", 3, 11, 5, 1, 35, 136167, 82, 142, 31, 752, 602, 124, 1 ],
+    [ "Mr. 5 Breeze Breath Bomb", "STR", "Shooter", 4, 15, 5, 2, 70, 1066998, 688, 520, 92, 1120, 943, 180, 1 ],
+    [ "Miss Valentine", "QCK", "Fighter", 3, 11, 5, 1, 35, 136167, 120, 114, 34, 860, 488, 144, 1 ],
+    [ "Miss Valentine 10,000 Kilo Guillotine", "QCK", "Fighter", 4, 15, 5, 2, 70, 1066998, 804, 426, 104, 1324, 787, 198, 1 ],
+    [ "Mr. 3", "INT", [ "Slasher", "Cerebral" ], 3, 11, 4, 1, 35, 136167, 196, 100, 26, 926, 515, 120, 1 ],
+    [ "Mr. 3 Extra Special Candelabra", "INT", [ "Slasher", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 600, 449, 120, 1394, 818, 176, 1 ],
+    [ "Miss Goldenweek", "DEX", [ "Striker", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 51, 51, 81, 301, 301, 305, 1 ],
+    [ "Miss Goldenweek Colors Trap: Calming Green", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 5, 2, 70, 1066998, 264, 264, 268, 412, 390, 530, 1 ],
+    [ "Mr. 2 Bon Clay", "PSY", [ "Fighter", "Free Spirit" ], 3, 11, 5, 1, 35, 136167, 94, 93, 46, 690, 403, 201, 1 ],
+    [ "Mr. 2 Bon Clay Bombardier Arabesque", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 599, 348, 169, 935, 709, 302, 1 ],
+    [ "Miss All Sunday Baroque Works VP", "INT", [ "Fighter", "Cerebral" ], 4, 15, 6, 1, 50, 392109, 368, 128, 96, 772, 478, 252, 0.7 ],
+    [ "Nico Robin", "INT", [ "Fighter", "Cerebral" ], 5, 20, 6, 2, 99, 3000000, 736, 430, 214, 1865, 1055, 338, 1 ],
+    [ "Mr. 9", "QCK", "Striker", 2, 10, 5, 0, 35, 90778, 106, 88, 33, 490, 313, 136, 0.7 ],
+    [ "Mr. 9 Hot Blooded Bat", "QCK", "Striker", 3, 13, 5, 3, 70, 1066998, 408, 249, 99, 1011, 590, 240, 0.7 ],
+    [ "Laboon", "STR", [ "Fighter", "Powerhouse" ], 3, 18, 5, 1, 50, 392109, 650, 300, 150, 1100, 500, 200, 1 ],
+    [ "Laboon (Luffy's drawing)", "STR", [ "Fighter", "Powerhouse" ], 4, 22, 5, 2, 99, 3000000, 1000, 400, 160, 2500, 850, 250, 1 ],
+    [ "Neptunian Squid", "DEX", "Striker", 3, 18, 8, 1, 50, 392109, 600, 280, 130, 900, 480, 180, 1.5 ],
+    [ "Monkey D. Luffy, Gum-Gum Balloon", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 50, 392109, 490, 178, 29, 1492, 655, 63, 1 ],
+    [ "Monkey D. Luffy, Gear Third", "STR", [ "Fighter", "Free Spirit" ], 5, 22, 4, 2, 99, 4000000, 1374, 585, 50, 2960, 1303, 105, 1 ],
+    [ "Roronoa Zoro, Streaming Wolf Swords", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 2, 50, 392109, 598, 136, 5, 1902, 582, 19, 1 ],
+    [ "Roronoa Zoro, Lion's Song", "DEX", [ "Slasher", "Driven" ], 5, 22, 6, 3, 99, 4000000, 1882, 538, 10, 3558, 1038, 32, 1 ],
+    [ "Nami, Fine Tempo", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 50, 392109, 454, 133, 50, 1062, 421, 102, 1 ],
+    [ "Nami, Happiness Punch", "INT", [ "Striker", "Cerebral" ], 5, 22, 4, 3, 99, 4000000, 1044, 377, 94, 1990, 949, 168, 1 ],
+    [ "Usopp, Usopp Hammer", "PSY", "Striker", 3, 12, 5, 1, 35, 136167, 188, 101, 40, 778, 388, 191, 1 ],
+    [ "Usopp, Impact", "PSY", "Shooter", 4, 18, 6, 2, 70, 1066998, 733, 361, 97, 1185, 669, 265, 1 ],
+    [ "Mr. Prince, Mutton Shot", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 4, 1, 35, 136167, 276, 108, 32, 1144, 457, 107, 1 ],
+    [ "Mr. Prince, Veau Shot", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 5, 2, 70, 1066998, 1101, 422, 93, 1600, 792, 161, 1 ],
+    [ "Dracule Mihawk", "DEX", "Slasher", 4, 30, 4, 1, 70, 1066998, 324, 201, 1, 1998, 814, 7, 1 ],
+    [ "Hawk Eyes Mihawk", "DEX", "Slasher", 5, 50, 4, 1, 99, 5000000, 1916, 782, 5, 3760, 1285, 15, 1 ],
+    [ "Escapee Morgan", "STR", [ "Slasher", "Driven" ], 3, 17, 5, 1, 70, 711332, 1427, 699, 27, 1600, 1000, 35, 1 ],
+    [ "Double Crosser Django", "PSY", [ "Slasher", "Free Spirit" ], 3, 11, 5, 1, 70, 1066998, 446, 219, 103, 930, 665, 230, 1 ],
+    [ "Double Ironfist Fullbody", "STR", [ "Fighter", "Free Spirit" ], 3, 11, 6, 1, 70, 1066998, 150, 150, 80, 890, 809, 187, 1 ],
+    [ "Hina", "QCK", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 154, 73, 42, 1176, 495, 187, 1 ],
+    [ "Black Cage Hina", "QCK", [ "Fighter", "Cerebral" ], 4, 18, 4, 2, 99, 3000000, 1088, 422, 149, 2270, 905, 300, 1 ],
+    [ "Mr. 8", "PSY", [ "Shooter", "Cerebral" ], 2, 10, 5, 0, 35, 90778, 178, 55, 32, 530, 248, 151, 1 ],
+    [ "Mr. 8 Igarappapa", "PSY", [ "Shooter", "Cerebral" ], 3, 13, 5, 1, 70, 1066998, 500, 186, 120, 1286, 433, 230, 1 ],
+    [ "Miss Monday", "STR", [ "Fighter", "Powerhouse" ], 2, 10, 4, 0, 35, 90778, 66, 126, 27, 350, 500, 97, 1 ],
+    [ "Miss Monday Superhuman Brass Knuckles", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 270, 422, 71, 506, 1005, 186, 1 ],
+    [ "Knuckle Millions Baroque Works", "STR", "Fighter", 2, 5, 6, 0, 25, 33626, 185, 89, 21, 532, 352, 50, 1 ],
+    [ "Saber Millions Baroque Works", "DEX", "Slasher", 2, 5, 6, 0, 25, 33626, 161, 77, 29, 486, 294, 77, 1 ],
+    [ "Polearm Millions Baroque Works", "QCK", "Striker", 2, 5, 6, 0, 25, 33626, 197, 74, 24, 620, 278, 60, 1 ],
+    [ "Pistol Millions Baroque Works", "PSY", "Shooter", 2, 5, 6, 0, 25, 33626, 159, 51, 40, 476, 224, 102, 1 ],
+    [ "Bazooka Millions Baroque Works", "INT", "Shooter", 2, 5, 4, 0, 25, 33626, 203, 113, 10, 640, 388, 20, 1 ],
+    [ "Knuckle Billions Baroque Works", "STR", "Fighter", 3, 9, 5, 1, 50, 261406, 466, 301, 32, 850, 580, 85, 1 ],
+    [ "Saber Billions Baroque Works", "DEX", "Slasher", 3, 9, 5, 1, 50, 261406, 410, 257, 56, 798, 508, 120, 1 ],
+    [ "Halberd Billions Baroque Works", "QCK", "Striker", 3, 9, 5, 1, 50, 261406, 560, 230, 40, 996, 477, 95, 1 ],
+    [ "Pistol Billions Baroque Works", "PSY", "Shooter", 3, 9, 5, 1, 50, 261406, 402, 187, 82, 698, 400, 172, 1 ],
+    [ "Bazooka Billions Baroque Works", "INT", "Shooter", 3, 9, 4, 1, 50, 261406, 550, 319, 12, 1020, 655, 32, 1 ],
+    [ "Chopper Man", "PSY", "Fighter", 4, 10, 6, 5, 50, 130703, 250, 250, 125, 500, 500, 250, 1 ],
+    [ "Tony Tony Chopper Pre-Rampage", "STR", "Fighter", 4, 30, 6, 1, 70, 1066998, 280, 180, 300, 1808, 851, 0, 1 ],
+    [ "Tony Tony Chopper Post-Rampage", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1808, 851, -350, 3660, 1500, -900, 1 ],
+    [ "Marco", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 6, 3, 50, 392109, 172, 125, 64, 1030, 676, 220, 1 ],
+    [ "Marco the Phoenix", "PSY", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 951, 618, 180, 2258, 1100, 390, 1 ],
+    [ "Jozu", "QCK", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 50, 392109, 412, 109, 27, 1820, 596, 98, 1 ],
+    [ "Diamond Jozu", "QCK", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 1748, 524, 69, 3300, 987, 231, 1 ],
+    [ "Vista", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 5, 3, 50, 392109, 290, 206, 15, 1388, 806, 100, 1 ],
+    [ "Flower Sword Vista", "INT", [ "Slasher", "Powerhouse" ], 5, 28, 5, 4, 99, 4000000, 1314, 732, 72, 2840, 1325, 185, 1 ],
+    [ "Izo", "DEX", [ "Shooter", "Cerebral" ], 4, 18, 4, 3, 50, 392109, 232, 130, 50, 1300, 634, 172, 1 ],
+    [ "Flintlock Pistols Izo", "DEX", [ "Shooter", "Cerebral" ], 5, 28, 5, 4, 99, 4000000, 1224, 585, 136, 2550, 1068, 319, 1 ],
+    [ "Blamenco", "STR", [ "Striker", "Free Spirit" ], 4, 18, 4, 3, 50, 392109, 204, 192, 34, 1150, 775, 150, 1 ],
+    [ "Blamenco the Mallet", "STR", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 1086, 726, 112, 2488, 1252, 268, 1 ],
+    [ "Edward Newgate", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 4, 70, 1422664, 1338, 522, 80, 3220, 1060, 156, 1 ],
+    [ "Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 3148, 978, 110, 3900, 1360, 235, 1 ],
+    [ "Training Coby", "PSY", [ "Striker", "Driven" ], 3, 12, 5, 1, 50, 261406, 90, 81, 55, 780, 514, 218, 0.7 ],
+    [ "Petty Officer Coby", "PSY", [ "Fighter", "Driven" ], 4, 18, 6, 2, 99, 3000000, 701, 485, 191, 1926, 984, 340, 1 ],
+    [ "Training Helmeppo", "INT", [ "Striker", "Driven" ], 3, 12, 5, 1, 50, 261406, 108, 93, 43, 890, 605, 185, 0.7 ],
+    [ "Sergeant Helmeppo", "INT", [ "Slasher", "Driven" ], 4, 18, 5, 2, 99, 3000000, 807, 555, 150, 1998, 1060, 260, 1 ],
+    [ "Rainbow Pirate Penguin", "INT", "Evolver", 4, 6, 6, 0, 1, 0, 200, 100, 300, 200, 100, 300, 1 ],
+    [ "Rainbow Striped Dragon", "INT", "Evolver", 4, 20, 4, 0, 1, 0, 1500, 800, 100, 1500, 800, 100, 1 ],
+    [ "White Chase Smoker", "DEX", [ "Striker", "Driven" ], 5, 20, 5, 3, 99, 2000000, 1644, 1012, 298, 2215, 1282, 338, 1.5 ],
+    [ "Armed Fighter Unit Red Pirates", "STR", "Fighter", 3, 12, 5, 1, 60, 449516, 644, 388, 19, 1055, 781, 33, 0.7 ],
+    [ "Armed Fighter Unit Blue Pirates", "QCK", "Fighter", 3, 12, 5, 1, 60, 449516, 679, 369, 21, 1106, 750, 36, 0.7 ],
+    [ "Armed Fighter Unit Green Pirates", "DEX", "Fighter", 3, 12, 5, 1, 60, 449516, 663, 380, 22, 1082, 770, 34, 0.7 ],
+    [ "Armed Fighter Unit Yellow Pirates", "PSY", "Fighter", 3, 12, 5, 1, 60, 449516, 622, 358, 35, 1030, 725, 58, 0.7 ],
+    [ "Armed Fighter Unit Black Pirates", "INT", "Fighter", 3, 12, 5, 1, 60, 449516, 633, 405, 18, 1044, 800, 30, 0.7 ],
+    [ "Armed Slasher Unit Red Pirates", "STR", "Slasher", 3, 12, 5, 1, 60, 449516, 583, 380, 69, 990, 658, 99, 0.7 ],
+    [ "Armed Slasher Unit Blue Pirates", "QCK", "Slasher", 3, 12, 5, 1, 60, 449516, 618, 339, 74, 1068, 592, 119, 0.7 ],
+    [ "Armed Slasher Unit Green Pirates", "DEX", "Slasher", 3, 12, 5, 1, 60, 449516, 602, 358, 80, 1017, 616, 122, 0.7 ],
+    [ "Armed Slasher Unit Yellow Pirates", "PSY", "Slasher", 3, 12, 5, 1, 60, 449516, 566, 333, 84, 944, 572, 149, 0.7 ],
+    [ "Armed Slasher Unit Black Pirates", "INT", "Slasher", 3, 12, 5, 1, 60, 449516, 590, 381, 59, 983, 660, 109, 0.7 ],
+    [ "Armed Striker Unit Red Pirates", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 473, 320, 71, 946, 640, 142, 0.7 ],
+    [ "Armed Striker Unit Blue Pirates", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 483, 309, 73, 976, 618, 146, 0.7 ],
+    [ "Armed Striker Unit Green Pirates", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 429, 318, 79, 858, 636, 158, 0.7 ],
+    [ "Armed Striker Unit Yellow Pirates", "PSY", "Striker", 3, 12, 5, 1, 60, 449516, 439, 289, 87, 878, 578, 176, 0.7 ],
+    [ "Armed Striker Unit Black Pirates", "INT", "Striker", 3, 12, 5, 1, 60, 449516, 465, 342, 65, 930, 684, 130, 0.7 ],
+    [ "Armed Shooter Unit Red Pirates", "STR", "Shooter", 3, 12, 5, 1, 60, 449516, 271, 102, 180, 481, 355, 301, 0.7 ],
+    [ "Armed Shooter Unit Blue Pirates", "QCK", "Shooter", 3, 12, 5, 1, 60, 449516, 280, 96, 181, 530, 302, 312, 0.7 ],
+    [ "Armed Shooter Unit Green Pirates", "DEX", "Shooter", 3, 12, 5, 1, 60, 449516, 273, 99, 182, 502, 312, 314, 0.7 ],
+    [ "Armed Shooter Unit Yellow Pirates", "PSY", "Shooter", 3, 12, 5, 1, 60, 449516, 201, 88, 205, 427, 284, 348, 0.7 ],
+    [ "Armed Shooter Unit Black Pirates", "INT", "Shooter", 3, 12, 5, 1, 60, 449516, 280, 137, 174, 500, 400, 297, 0.7 ],
+    [ "Skilled Gunner", "INT", "Shooter", 3, 15, 5, 2, 70, 711332, 1280, 500, 20, 1550, 850, 40, 0.7 ],
+    [ "Mr. 13 & Ms. Friday The Unluckies", "INT", "Shooter", 3, 13, 7, 3, 50, 392109, 44, 44, 44, 596, 893, 130, 0.7 ],
+    [ "Dorry", "PSY", [ "Slasher", "Powerhouse" ], 4, 25, 4, 2, 70, 1422664, 450, 370, 102, 1662, 783, 153, 1.5 ],
+    [ "Broggy", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 2, 70, 1422664, 440, 411, 88, 1634, 875, 117, 1.5 ],
+    [ "Triceratops", "QCK", "Fighter", 2, 25, 4, 0, 50, 392109, 500, 200, 50, 965, 700, 50, 1.5 ],
+    [ "Rex", "STR", "Fighter", 2, 25, 4, 0, 50, 392109, 300, 300, 50, 520, 900, 50, 1.5 ],
+    [ "Brontosaurus", "DEX", "Fighter", 2, 25, 4, 0, 50, 392109, 400, 250, 50, 755, 755, 50, 1.5 ],
+    [ "Tsuru", "INT", [ "Shooter", "Cerebral" ], 3, 12, 4, 2, 50, 392109, 140, 26, 60, 880, 400, 266, 1 ],
+    [ "Great Advisor Tsuru", "INT", [ "Shooter", "Cerebral" ], 4, 18, 6, 3, 99, 4000000, 808, 337, 224, 1151, 1210, 366, 1 ],
+    [ "Momonga", "PSY", [ "Slasher", "Cerebral" ], 3, 11, 5, 2, 70, 1066998, 420, 398, 98, 632, 815, 255, 1 ],
+    [ "Onigumo", "DEX", [ "Slasher", "Driven" ], 3, 11, 8, 2, 70, 1066998, 482, 434, 63, 944, 920, 131, 1 ],
+    [ "Red Plated Lobster", "STR", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
+    [ "Blue Plated Lobster", "QCK", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
+    [ "Green Plated Lobster", "DEX", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
+    [ "Yellow Plated Lobster", "PSY", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
+    [ "Black Plated Lobster", "INT", "Evolver", 3, 7, 4, 0, 1, 0, 50, 550, 0, 50, 550, 0, 1 ],
+    [ "Monkey D. Garp", "PSY", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 280, 145, 50, 1442, 722, 131, 1 ],
+    [ "Garp the Fist", "PSY", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1377, 685, 105, 2852, 1220, 225, 1 ],
+    [ "Trafalgar Law", "DEX", [ "Slasher", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 104, 125, 73, 876, 702, 238, 1 ],
+    [ "Trafalgar Law, ROOM", "DEX", [ "Slasher", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 817, 655, 190, 2052, 1300, 370, 1 ],
+    [ "Basil Hawkins", "INT", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 200, 200, 7, 1165, 750, 127, 1 ],
+    [ "Basil Hawkins the Magician", "INT", [ "Striker", "Cerebral" ], 5, 28, 6, 4, 99, 4000000, 1095, 717, 85, 2480, 1295, 255, 1 ],
+    [ "Killer", "QCK", [ "Striker", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 180, 250, 0, 1228, 895, -50, 1 ],
+    [ "Massacre Soldier Killer", "QCK", [ "Striker", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1120, 811, 0, 2570, 1449, -200, 1 ],
+    [ "Urouge", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 108, 108, 35, 1290, 798, 108, 1 ],
+    [ "Mad Monk Urouge", "PSY", [ "Striker", "Powerhouse" ], 5, 28, 5, 4, 99, 4000000, 1202, 730, 75, 2071, 1343, 200, 1 ],
+    [ "Bepo", "STR", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 120, 105, 80, 820, 690, 246, 1 ],
+    [ "Bepo the Martial Artist", "STR", [ "Fighter", "Powerhouse" ], 5, 28, 6, 4, 99, 4000000, 755, 640, 198, 1880, 1200, 405, 1 ],
+    [ "Kalifa", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 116, 65, 51, 850, 540, 227, 1 ],
+    [ "Beautiful Secretary Kalifa", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 6, 2, 99, 3000000, 788, 488, 177, 1728, 963, 378, 1 ],
+    [ "Paulie", "DEX", "Striker", 3, 12, 5, 1, 50, 392109, 162, 102, 31, 882, 705, 166, 1 ],
+    [ "Paulie Dock One Foreman/Mast Specialist", "DEX", "Striker", 4, 18, 4, 2, 99, 3000000, 812, 617, 130, 2300, 1070, 231, 1 ],
+    [ "Rob Lucci", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 4, 1, 50, 392109, 132, 126, 28, 1192, 721, 106, 1 ],
+    [ "Rob Lucci Dock One Sawyer, Treenail Specialist", "QCK", [ "Slasher", "Powerhouse" ], 4, 18, 6, 2, 99, 3000000, 1107, 654, 69, 2220, 1203, 177, 1 ],
+    [ "Kaku", "QCK", "Striker", 3, 12, 5, 1, 50, 392109, 172, 79, 37, 1233, 635, 131, 0.7 ],
+    [ "Kaku Dock One Carpentry Specialist", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 4, 2, 99, 3000000, 1132, 552, 98, 2517, 988, 213, 0.7 ],
+    [ "Lulu", "QCK", "Shooter", 3, 12, 6, 2, 70, 1066998, 290, 168, 88, 985, 682, 223, 1 ],
+    [ "Wapol", "STR", [ "Fighter", "Free Spirit" ], 3, 8, 4, 1, 50, 392109, 330, 128, 20, 1440, 488, 98, 1 ],
+    [ "Wapol House", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 4, 2, 99, 3000000, 1390, 423, 77, 2940, 835, 142, [ 1, 1, 0.7 ] ],
+    [ "Dalton", "QCK", [ "Slasher", "Cerebral" ], 3, 7, 5, 1, 35, 90778, 192, 110, 45, 751, 390, 140, 0.7 ],
+    [ "Dalton Bison", "QCK", [ "Slasher", "Cerebral" ], 4, 11, 4, 2, 70, 1066998, 690, 322, 102, 1155, 620, 290, 0.7 ],
+    [ "Chess", "DEX", "Shooter", 3, 7, 6, 0, 35, 90778, 186, 90, 31, 668, 296, 121, 1 ],
+    [ "Kuromarimo", "DEX", "Striker", 3, 7, 5, 0, 35, 90778, 72, 144, 24, 366, 488, 108, 1 ],
+    [ "Chessmarimo", "DEX", "Striker", 4, 11, 7, 2, 70, 1066998, 525, 396, 145, 1290, 840, 185, 1 ],
+    [ "Dr. Kureha", "PSY", [ "Slasher", "Cerebral" ], 3, 20, 5, 2, 50, 392109, 35, 32, 88, 200, 200, 510, 1.5 ],
+    [ "Lapin", "INT", "Fighter", 2, 15, 5, 0, 35, 90778, 200, 200, 25, 550, 550, 53, 1.5 ],
+    [ "Lapin Adult", "INT", [ "Fighter", "Powerhouse" ], 3, 20, 4, 2, 70, 1066998, 380, 480, 38, 1100, 950, 100, 1.5 ],
+    [ "Franky", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 128, 128, 28, 1220, 680, 112, 1 ],
+    [ "Dismantler Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 3000000, 1138, 637, 71, 2453, 1032, 198, 1 ],
+    [ "Kiwi", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 777, 444, 265, 1 ],
+    [ "Mozu", "PSY", "Slasher", 3, 13, 4, 1, 50, 392109, 77, 77, 77, 555, 555, 265, 1 ],
+    [ "Kraken Surume", "STR", [ "Striker", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 99, 99, 188, 1440, 685, 133, 1 ],
+    [ "Kraken Monster of the North", "STR", [ "Striker", "Powerhouse" ], 4, 20, 8, 2, 99, 3000000, 1355, 602, 118, 2700, 1111, 33, 1 ],
+    [ "Red Jeweled Porc", "STR", "Booster", 2, 2, 4, 0, 10, 2330, 45, 27, 7, 129, 77, 15, 1 ],
+    [ "Blue Jeweled Porc", "QCK", "Booster", 2, 2, 4, 0, 10, 2330, 49, 21, 9, 145, 65, 19, 1 ],
+    [ "Green Jeweled Porc", "DEX", "Booster", 2, 2, 4, 0, 10, 2330, 47, 25, 8, 133, 72, 17, 1 ],
+    [ "Yellow Jeweled Porc", "PSY", "Booster", 2, 2, 4, 0, 10, 2330, 44, 19, 12, 120, 58, 28, 1 ],
+    [ "Black Jeweled Porc", "INT", "Booster", 2, 2, 4, 0, 10, 2330, 42, 30, 7, 119, 88, 14, 1 ],
+    [ "Ruby Jeweled Porc", "STR", "Booster", 3, 5, 4, 0, 1, 0, 169, 97, 22, 169, 97, 22, 1 ],
+    [ "Sapphire Jeweled Porc", "QCK", "Booster", 3, 5, 4, 0, 1, 0, 185, 85, 26, 185, 85, 26, 1 ],
+    [ "Emerald Jeweled Porc", "DEX", "Booster", 3, 5, 4, 0, 1, 0, 173, 92, 24, 173, 92, 24, 1 ],
+    [ "Topaz Jeweled Porc", "PSY", "Booster", 3, 5, 4, 0, 1, 0, 160, 78, 35, 160, 78, 35, 1 ],
+    [ "Amethyst Jeweled Porc", "INT", "Booster", 3, 5, 4, 0, 1, 0, 159, 108, 21, 159, 108, 21, 1 ],
+    [ "Zephyr", "INT", [ "Shooter", "Powerhouse" ], 4, 30, 7, 1, 70, 1066998, 320, 133, 4, 1588, 699, 29, 1 ],
+    [ "Zephyr NEO Navy Commander", "INT", [ "Shooter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
+    [ "Ain", "QCK", [ "Shooter", "Cerebral" ], 3, 8, 6, 1, 35, 136167, 96, 87, 47, 688, 421, 195, 1 ],
+    [ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Cerebral" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
+    [ "Eustass Kid", "STR", [ "Striker", "Driven" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
+    [ "Captain Kid", "STR", [ "Striker", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
+    [ "Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
+    [ "Roar of the Sea Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1085, 580, 144, 2801, 1111, 300, 1 ],
+    [ "X Drake", "INT", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 242, 112, 32, 1515, 688, 88, 1 ],
+    [ "Red Flag X Drake", "INT", [ "Fighter", "Powerhouse" ], 5, 28, 6, 4, 99, 4000000, 1432, 611, 57, 3580, 1098, 132, 1 ],
+    [ "Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 277, 80, 44, 1370, 440, 220, 1 ],
+    [ "Big Eater Jewelry Bonney", "PSY", [ "Fighter", "Free Spirit" ], 5, 28, 5, 4, 99, 4000000, 1248, 401, 158, 3000, 720, 400, 1 ],
+    [ "Capone Bege", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 199, 102, 34, 1050, 755, 153, 1 ],
+    [ "Capone Gang Bege", "QCK", [ "Shooter", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 893, 682, 110, 2122, 1323, 313, 1 ],
+    [ "Silvers Rayleigh", "INT", [ "Fighter", "Cerebral" ], 5, 30, 4, 3, 70, 1066998, 488, 302, 168, 1518, 826, 309, 1 ],
+    [ "Dark King Rayleigh", "INT", [ "Fighter", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1462, 777, 277, 3001, 1300, 500, 1 ],
+    [ "Giant Slasher Red Pirates", "STR", "Slasher", 2, 8, 6, 0, 30, 57558, 297, 163, 41, 579, 363, 41, 1.5 ],
+    [ "Giant Shooter Blue Pirates", "QCK", "Shooter", 2, 8, 4, 0, 30, 57558, 350, 129, 53, 619, 303, 68, 1.5 ],
+    [ "Giant Warrior Green Pirates", "DEX", "Striker", 2, 8, 4, 0, 30, 57558, 313, 155, 55, 561, 340, 77, 1.5 ],
+    [ "Giant Fighter Yellow Pirates", "PSY", "Fighter", 2, 8, 5, 0, 30, 57558, 308, 151, 52, 575, 332, 67, 1.5 ],
+    [ "Giant Striker Black Pirates", "INT", "Striker", 2, 8, 6, 0, 30, 57558, 330, 133, 42, 614, 313, 54, 1.5 ],
+    [ "Giant Imperial Slasher Red Pirates", "STR", "Slasher", 3, 13, 4, 1, 60, 674274, 490, 334, 46, 1179, 668, 109, 1.5 ],
+    [ "Giant Imperial Shooter Blue Pirates", "QCK", "Shooter", 3, 13, 4, 1, 60, 674274, 528, 281, 64, 1235, 562, 135, 1.5 ],
+    [ "Female Giant Imperial Warrior Green Pirates", "DEX", "Striker", 3, 13, 4, 1, 60, 674274, 472, 310, 72, 1132, 620, 143, 1.5 ],
+    [ "Giant Imperial Fighter Yellow Pirates", "PSY", "Fighter", 3, 13, 4, 1, 60, 674274, 488, 302, 61, 1170, 604, 132, 1.5 ],
+    [ "Giant Imperial Striker Black Pirates", "INT", "Striker", 3, 13, 4, 1, 60, 674274, 525, 311, 49, 1213, 622, 119, 1.5 ],
+    [ "Sea Cat", "PSY", "Fighter", 3, 10, 4, 1, 50, 392109, 77, 7, 33, 777, 77, 333, 1 ],
+    [ "Kung Fu Dugong", "STR", "Fighter", 3, 7, 5, 1, 20, 26184, 25, 225, 45, 50, 355, 95, 0.7 ],
+    [ "Kung Fu Dugong Faithful Apprentice", "STR", "Fighter", 4, 11, 8, 3, 50, 392109, 25, 305, 55, 75, 825, 225, 0.7 ],
+    [ "Banana Gator", "QCK", "Fighter", 3, 10, 4, 0, 50, 392109, 552, 334, 80, 922, 534, 155, 1 ],
+    [ "Sandora Dragon", "DEX", "Fighter", 3, 10, 4, 0, 50, 392109, 511, 285, 120, 811, 485, 190, 1 ],
+    [ "Mr. 0 Baroque Works CEO", "INT", [ "Striker", "Cerebral" ], 3, 10, 5, 2, 50, 392109, 194, 110, 23, 1088, 659, 147, 1.5 ],
+    [ "Sir Crocodile", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 99, 3000000, 995, 582, 112, 2210, 1220, 208, 1.5 ],
+    [ "Hogback", "INT", [ "Fighter", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 210, 72, 33, 1251, 595, 118, 1 ],
+    [ "Doctor Hogback", "INT", [ "Fighter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1180, 550, 72, 2741, 945, 189, 1 ],
+    [ "Cindry", "PSY", "Shooter", 3, 12, 5, 1, 50, 392109, 76, 58, 60, 806, 458, 259, 0.7 ],
+    [ "Victoria Cindry", "PSY", "Shooter", 4, 20, 4, 2, 99, 3000000, 622, 398, 231, 1402, 661, 478, 0.7 ],
+    [ "Emporio Ivankov", "QCK", [ "Fighter", "Free Spirit" ], 4, 30, 4, 3, 70, 1066998, 302, 125, 53, 1682, 512, 161, 1 ],
+    [ "Emporio Ivankov Queen of Kamabakka Queendom", "QCK", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1642, 470, 132, 3030, 1155, 290, 1 ],
+    [ "Perona", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 50, 392109, 134, 44, 55, 944, 422, 222, 1 ],
+    [ "Ghost Princess Perona", "DEX", [ "Shooter", "Driven" ], 4, 18, 4, 2, 99, 3000000, 887, 377, 198, 1598, 791, 430, 1 ],
+    [ "Kumacy", "STR", [ "Fighter", "Powerhouse" ], 3, 11, 6, 1, 70, 1066998, 500, 255, 0, 1660, 904, 0, 1 ],
+    [ "Dog Penguin", "QCK", "Fighter", 3, 11, 4, 1, 50, 392109, 986, 500, 54, 1420, 722, 0, 1 ],
+    [ "Miss Merry Christmas", "QCK", "Fighter", 3, 11, 5, 1, 35, 136167, 220, 51, 42, 980, 422, 147, 1 ],
+    [ "Miss Merry Christmas Human Mole", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 910, 348, 113, 1401, 690, 233, 1 ],
+    [ "Mr. 4", "STR", [ "Shooter", "Powerhouse" ], 3, 11, 4, 1, 35, 136167, 250, 110, 14, 1046, 590, 80, 1 ],
+    [ "Mr. 4 and Lassoo the Dog-Gun", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 6, 2, 70, 1066998, 980, 522, 43, 1606, 910, 110, 1 ],
+    [ "Miss Doublefinger", "DEX", [ "Striker", "Cerebral" ], 3, 11, 8, 1, 35, 136167, 115, 87, 44, 770, 501, 158, 1 ],
+    [ "Miss Doublefinger Human Spike", "DEX", [ "Striker", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 720, 435, 120, 1081, 701, 288, 1 ],
+    [ "Mr. 1", "STR", [ "Slasher", "Cerebral" ], 3, 11, 4, 1, 35, 136167, 255, 156, 1, 1152, 744, 10, 1 ],
+    [ "Mr. 1 Human Sword", "STR", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 1021, 652, 2, 1880, 1042, 15, 1 ],
+    [ "Rebecca", "QCK", "Slasher", 4, 14, 5, 2, 70, 1422664, 242, 115, 108, 1525, 707, 345, 1 ],
+    [ "Absalom", "STR", [ "Shooter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 158, 93, 35, 1330, 602, 126, 1 ],
+    [ "Absalom of the Graveyard", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 7, 2, 99, 3000000, 1271, 545, 77, 2601, 1008, 192, 1 ],
+    [ "General Zombie", "INT", "Fighter", 3, 12, 5, 1, 70, 1066998, 920, 352, 0, 2610, 605, 0, 1 ],
+    [ "Jigoro of the Wind", "DEX", "Slasher", 3, 9, 6, 1, 50, 392109, 426, 258, 37, 1348, 744, 0, 1 ],
+    [ "Sir Crocodile Warlord of the Sea", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1088, 659, 147, 2980, 1380, 150, 1 ],
+    [ "Jimbe", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 266, 101, 35, 1590, 660, 118, 1 ],
+    [ "Jimbe Warlord of the Sea", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
+    [ "Bartholomew Kuma", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 290, 110, 33, 1525, 692, 118, 1 ],
+    [ "Bartholomew Kuma Warlord of the Sea", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1445, 644, 82, 2734, 1205, 262, 1 ],
+    [ "Gecko Moria", "INT", [ "Striker", "Driven" ], 4, 15, 4, 3, 70, 1066998, 355, 102, 15, 1928, 677, 33, 1 ],
+    [ "Gecko Moria Warlord of the Sea", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1845, 612, 33, 3900, 1120, 118, 1 ],
+    [ "Boa Hancock", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 416, 251, 197, 1595, 859, 340, 1 ],
+    [ "Boa Hancock Warlord of the Sea", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1512, 782, 301, 2860, 1320, 515, 1 ],
+    [ "Donquixote Doflamingo", "DEX", [ "Slasher", "Driven" ], 4, 30, 4, 1, 70, 1066998, 200, 186, 30, 1061, 790, 145, 1 ],
+    [ "Donquixote Doflamingo, Warlord of the Sea", "DEX", [ "Slasher", "Driven" ], 5, 50, 5, 2, 99, 4000000, 932, 721, 118, 2311, 1500, 255, 1 ],
+    [ "Sanji Parage Shot: The Storm", "QCK", [ "Fighter", "Powerhouse" ], 4, 10, 5, 2, 99, 2000000, 486, 207, 32, 2015, 900, 217, 0.7 ],
+    [ "Monkey D. Luffy Gum-Gum Bazooka: Supremacy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 99, 2000000, 404, 227, 39, 1748, 1250, 192, 1 ],
+    [ "Roronoa Zoro Three Thousand Worlds: The Final Stroke", "DEX", [ "Slasher", "Driven" ], 4, 15, 6, 2, 99, 2000000, 426, 222, 37, 2175, 1188, 132, 1 ],
+    [ "Nami Mirage Tempo: The Heavens", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 348, 201, 75, 1260, 988, 361, 1 ],
+    [ "Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 220, 43, 45, 1190, 430, 208, 1 ],
+    [ "Humming Swordsman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1138, 368, 162, 2108, 980, 332, 1 ],
+    [ "Ryuma", "PSY", "Slasher", 4, 18, 5, 2, 99, 3000000, 1138, 368, 162, 2005, 1088, 162, 1 ],
+    [ "Masira", "STR", "Fighter", 3, 10, 4, 1, 50, 392109, 525, 212, 12, 1120, 655, 95, 1 ],
+    [ "Shoujou", "DEX", "Shooter", 3, 10, 4, 1, 50, 392109, 655, 132, 23, 1334, 401, 144, 1 ],
+    [ "Montblanc Cricket", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 488, 145, 54, 1050, 525, 155, 1.5 ],
+    [ "South Bird and Forest Residents", "DEX", "Fighter", 3, 8, 6, 1, 50, 261406, 752, 383, 121, 929, 423, 161, 1.5 ],
+    [ "Bellamy", "DEX", [ "Fighter", "Driven" ], 3, 10, 4, 1, 35, 136167, 131, 152, 24, 769, 692, 89, 1 ],
+    [ "Bellamy the Hyena", "DEX", [ "Fighter", "Driven" ], 4, 15, 6, 2, 70, 1066998, 726, 600, 67, 1072, 986, 170, 1 ],
+    [ "Sarquiss", "QCK", "Slasher", 3, 10, 5, 1, 50, 392109, 220, 92, 22, 1440, 424, 68, 1 ],
+    [ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 70, 1422664, 881, 422, 155, 1485, 700, 198, 1.5 ],
+    [ "Caroline", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 6, 2, 99, 3000000, 772, 389, 177, 1890, 915, 300, [ 1.5, 1.5, 0.7 ] ],
+    [ "Sanji Kamabakka Queendom Traditional Fighting Style", "QCK", "Fighter", 3, 10, 4, 2, 50, 392109, 221, 58, 29, 1229, 622, 130, [ 0.7, 0.7, 1.5 ] ],
+    [ "Sanji Candy", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1155, 545, 76, 1802, 951, 357, [ 0.7, 0.7, 1.5 ] ],
+    [ "Perona - Sweets", "DEX", [ "Shooter", "Driven" ], 4, 11, 4, 2, 50, 392109, 168, 98, 58, 928, 412, 231, 1.5 ],
+    [ "Ghost Princess Perona - Sweets", "DEX", [ "Shooter", "Driven" ], 5, 20, 4, 3, 99, 3000000, 856, 359, 186, 1568, 741, 466, 1.5 ],
+    [ "Nefertari Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 4, 11, 5, 2, 50, 392109, 138, 102, 183, 889, 358, 256, 1.5 ],
+    [ "Princess Vivi - Love", "PSY", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 844, 297, 213, 1440, 683, 322, 1.5 ],
+    [ "Cowboy and Bourbon Jr. Supersonic Duck Squadron", "QCK", "Evolver", 3, 9, 5, 0, 35, 90778, 150, 80, 35, 755, 334, 155, 1 ],
+    [ "Stomp and Ivan X Supersonic Duck Squadron", "DEX", "Evolver", 3, 9, 5, 0, 35, 90778, 126, 98, 33, 719, 361, 152, 1 ],
+    [ "Centaur and Hikoichi Supersonic Duck Squadron", "STR", "Evolver", 3, 9, 5, 0, 35, 90778, 102, 119, 30, 693, 383, 149, 1 ],
+    [ "Karoo", "PSY", "Striker", 3, 6, 4, 1, 20, 26184, 178, 86, 40, 229, 155, 100, 1 ],
+    [ "Captain Karoo and the Supersonic Duck Squadron", "PSY", "Striker", 4, 18, 7, 2, 99, 3000000, 378, 383, 138, 1412, 702, 461, 1.5 ],
+    [ "Marshall D. Teach", "STR", [ "Shooter", "Driven" ], 4, 30, 6, 1, 70, 1066998, 235, 166, 30, 1402, 790, 23, 1 ],
+    [ "Blackbeard", "STR", [ "Shooter", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1338, 744, 18, 3140, 1418, 83, 1 ],
+    [ "Thatch", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 5, 3, 50, 522812, 208, 103, 63, 1246, 626, 188, 1 ],
+    [ "Twin-Blade Thatch", "QCK", [ "Slasher", "Cerebral" ], 5, 28, 4, 4, 99, 4000000, 1184, 575, 146, 2505, 1190, 302, 1 ],
+    [ "Namule", "DEX", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 50, 522812, 155, 133, 40, 1081, 822, 142, 1 ],
+    [ "One-Hit Namule", "DEX", [ "Fighter", "Powerhouse" ], 5, 28, 4, 4, 99, 4000000, 999, 755, 117, 2398, 1303, 262, 1 ],
+    [ "Rakuyo", "PSY", [ "Striker", "Driven" ], 4, 18, 4, 3, 50, 522812, 161, 122, 65, 1000, 733, 193, 1 ],
+    [ "Morning Star Rakuyo", "PSY", [ "Striker", "Driven" ], 5, 28, 4, 4, 99, 4000000, 945, 681, 122, 2001, 1320, 337, 1 ],
+    [ "Fossa", "STR", [ "Slasher", "Driven" ], 4, 18, 4, 3, 50, 522812, 150, 160, 34, 1120, 831, 132, 1 ],
+    [ "Fossa the Blazing Katana", "STR", [ "Slasher", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1059, 788, 95, 2454, 1388, 228, 1 ],
+    [ "Curiel", "INT", [ "Shooter", "Driven" ], 4, 18, 6, 3, 50, 522812, 202, 153, 48, 1159, 818, 134, 1 ],
+    [ "Heavy Specialist Curiel", "INT", [ "Shooter", "Driven" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
+    [ "Sengoku", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
+    [ "Sengoku the Buddha", "PSY", [ "Fighter", "Cerebral" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
+    [ "Galdino the Criminal, Mr. 3", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
+    [ "Escapee Bentham, Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 178, 104, 32, 980, 529, 187, 1 ],
+    [ "Master Escape Artist Bentham, Mr. 2 Bon Clay", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 921, 460, 146, 1830, 978, 323, 1 ],
+    [ "Satori", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 4, 2, 70, 1066998, 479, 190, 158, 1422, 576, 272, 1 ],
+    [ "Shura", "INT", "Striker", 4, 15, 4, 2, 70, 1066998, 330, 420, 93, 1030, 1002, 175, 1 ],
+    [ "Gedatsu", "QCK", "Fighter", 4, 15, 4, 2, 70, 1066998, 622, 378, 53, 2020, 703, 108, 1 ],
+    [ "Braham", "DEX", [ "Shooter", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 374, 283, 96, 1202, 684, 202, 1 ],
+    [ "Yama", "STR", "Fighter", 3, 13, 6, 1, 50, 392109, 800, 228, 1, 1700, 608, 2, 1 ],
+    [ "Yellow White Beret, Skypiea Guard", "PSY", "Shooter", 2, 3, 6, 0, 20, 17456, 51, 23, 45, 330, 166, 89, 1 ],
+    [ "Black White Beret, Skypiea Guard", "INT", "Shooter", 2, 3, 6, 0, 20, 17456, 49, 38, 40, 320, 197, 80, 1 ],
+    [ "Yellow White Beret Captain, Skypiea Guard", "PSY", "Shooter", 3, 9, 5, 1, 50, 261406, 270, 128, 69, 845, 433, 198, 1 ],
+    [ "Black White Beret Captain, Skypiea Guard", "INT", "Shooter", 3, 9, 5, 1, 50, 261406, 259, 142, 65, 837, 498, 177, 1 ],
+    [ "Eneru's Elect: Red Guard, Skypiea Enforcer", "STR", "Slasher", 2, 8, 6, 0, 50, 261406, 388, 202, 87, 890, 503, 121, 1 ],
+    [ "Eneru's Elect: Blue Guard, Skypiea Enforcer", "QCK", "Slasher", 2, 8, 6, 0, 50, 261406, 438, 155, 90, 962, 413, 139, 1 ],
+    [ "Eneru's Elect: Green Guard, Skypiea Enforcer", "DEX", "Slasher", 2, 8, 6, 0, 50, 261406, 410, 179, 88, 926, 464, 128, 1 ],
+    [ "Eneru's Elect: Yellow Guard, Skypiea Enforcer", "PSY", "Slasher", 2, 8, 6, 0, 50, 261406, 377, 140, 110, 859, 396, 170, 1 ],
+    [ "Eneru's Elect: Black Guard, Skypiea Enforcer", "INT", "Slasher", 2, 8, 6, 0, 50, 261406, 390, 200, 80, 912, 501, 115, 1 ],
+    [ "Red Striker, Skypiea Enforcer", "STR", "Striker", 2, 6, 4, 0, 30, 57558, 12, 55, 25, 311, 445, 70, 1 ],
+    [ "Blue Striker, Skypiea Enforcer", "QCK", "Striker", 2, 6, 4, 0, 30, 57558, 20, 47, 27, 343, 420, 73, 1 ],
+    [ "Green Striker, Skypiea Enforcer", "DEX", "Striker", 2, 6, 4, 0, 30, 57558, 16, 51, 26, 325, 435, 71, 1 ],
+    [ "Yellow Striker, Skypiea Enforcer", "PSY", "Striker", 2, 6, 4, 0, 30, 57558, 12, 47, 30, 322, 418, 80, 1 ],
+    [ "Black Striker, Skypiea Enforcer", "INT", "Striker", 2, 6, 4, 0, 30, 57558, 16, 54, 24, 329, 442, 68, 1 ],
+    [ "Red Striker Elite, Skypiea Enforcer", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 243, 359, 45, 510, 804, 157, 1 ],
+    [ "Blue Striker Elite, Skypiea Enforcer", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 278, 340, 48, 562, 772, 159, 1 ],
+    [ "Green Striker Elite, Skypiea Enforcer", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 265, 350, 46, 536, 788, 158, 1 ],
+    [ "Yellow Striker Elite, Skypiea Enforcer", "PSY", "Striker", 3, 12, 5, 1, 60, 449516, 242, 338, 53, 505, 760, 166, 1 ],
+    [ "Black Striker Elite, Skypiea Enforcer", "INT", "Striker", 3, 12, 5, 1, 60, 449516, 250, 358, 45, 520, 802, 156, 1 ],
+    [ "Red Nomad, Shandian Warrior", "STR", "Striker", 2, 6, 5, 0, 30, 57558, 79, 45, 26, 494, 302, 87, 1 ],
+    [ "Blue Nomad, Shandian Warrior", "QCK", "Striker", 2, 6, 5, 0, 30, 57558, 92, 36, 30, 538, 268, 94, 1 ],
+    [ "Green Nomad, Shandian Warrior", "DEX", "Striker", 2, 6, 5, 0, 30, 57558, 85, 40, 28, 517, 289, 89, 1 ],
+    [ "Red Nomad Adept, Shandian Warrior", "STR", "Striker", 3, 12, 5, 1, 60, 449516, 438, 228, 60, 864, 642, 162, 1 ],
+    [ "Blue Nomad Adept, Shandian Warrior", "QCK", "Striker", 3, 12, 5, 1, 60, 449516, 460, 187, 63, 948, 570, 172, 1 ],
+    [ "Green Nomad Adept, Shandian Warrior", "DEX", "Striker", 3, 12, 5, 1, 60, 449516, 449, 201, 61, 900, 606, 168, 1 ],
+    [ "Yellow Hunter, Shandian Warrior", "PSY", "Shooter", 2, 5, 4, 0, 30, 57558, 38, 20, 41, 210, 115, 201, 1 ],
+    [ "Black Hunter, Shandian Warrior", "INT", "Shooter", 2, 5, 4, 0, 30, 57558, 40, 25, 39, 214, 128, 196, 1 ],
+    [ "Yellow Hunter Adept, Shandian Warrior", "PSY", "Shooter", 3, 11, 4, 1, 60, 449516, 150, 60, 160, 502, 258, 365, 1 ],
+    [ "Black Hunter Adept, Shandian Warrior", "INT", "Shooter", 3, 11, 4, 1, 60, 449516, 152, 66, 153, 508, 271, 359, 1 ],
+    [ "Portgas D. Ace, Mt. Corvo's Brothers 3", "QCK", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 90778, 144, 66, 60, 632, 347, 248, 0.7 ],
+    [ "Portgas D. Ace, Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "QCK", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 571, 295, 200, 1072, 559, 385, 0.7 ],
+    [ "Bellmere", "DEX", "Shooter", 3, 9, 5, 1, 35, 136167, 60, 39, 68, 426, 291, 283, 1 ],
+    [ "Bellmere, Nami and Nojiko's Mother", "DEX", "Shooter", 4, 15, 4, 2, 70, 1066998, 377, 249, 240, 810, 483, 400, 1 ],
+    [ "Kaya", "PSY", [ "Shooter", "Cerebral" ], 3, 9, 6, 1, 35, 136167, 115, 50, 72, 370, 180, 330, 1.5 ],
+    [ "Kaya, A rich young girl from Syrup Village", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 331, 151, 275, 405, 250, 550, 1.5 ],
+    [ "Hotori and Kotori", "INT", "Fighter", 3, 9, 6, 1, 35, 136167, 242, 74, 27, 1055, 455, 122, 1 ],
+    [ "Hotori and Kotori, Skypiea Vice Head Enforcers", "INT", "Fighter", 4, 15, 4, 2, 70, 1066998, 989, 385, 92, 1959, 601, 151, 1 ],
+    [ "Pell", "QCK", [ "Slasher", "Powerhouse" ], 3, 9, 6, 1, 35, 136167, 175, 70, 40, 1000, 427, 142, 1 ],
+    [ "Pell, The guardian falcon of Alabasta.", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
+    [ "Chaka", "STR", [ "Slasher", "Powerhouse" ], 3, 9, 5, 1, 35, 136167, 173, 120, 21, 822, 615, 109, 1 ],
+    [ "Chaka, The guardian jackal of Alabasta.", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
+    [ "Sir Crocodile, the Strongest Prisoner, Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
+    [ "Sir Crocodile, the Strongest Prisoner, Ex-Seven Warlords Member", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
+    [ "Daz Bones, Convict, Mr. 1", "INT", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
+    [ "Sabo Mt. Corvo's Brothers 3", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 5, 2, 35, 90778, 32, 32, 32, 522, 288, 286, 0.7 ],
+    [ "Sabo Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "PSY", [ "Striker", "Free Spirit" ], 5, 18, 4, 3, 70, 1066998, 440, 233, 242, 951, 460, 450, 0.7 ],
+    [ "Nico Robin Tropical", "INT", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 99, 2000000, 368, 128, 96, 1910, 715, 292, 1 ],
+    [ "Heracles-un", "PSY", [ "Shooter", "Cerebral" ], 4, 30, 6, 2, 70, 1066998, 330, 89, 34, 1698, 569, 160, 1 ],
+    [ "Heracles-un, Hero of the Forest", "PSY", [ "Shooter", "Cerebral" ], 5, 50, 4, 3, 99, 5000000, 1622, 480, 108, 3188, 1010, 300, 1 ],
+    [ "Usopp-un", "PSY", "Shooter", 4, 10, 5, 1, 50, 261406, 444, 237, 47, 1080, 648, 144, 1 ],
+    [ "Usopp-un, Hercules' Student", "PSY", [ "Shooter", "Powerhouse" ], 5, 20, 4, 5, 99, 2000000, 1280, 648, 0, 2550, 700, -41, 1 ],
+    [ "Monkey D. Luffy, Merveille's Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
+    [ "Monkey D. Luffy, Straw Hat Pirates' Attack", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
+    [ "Sanji, Merveille's Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
+    [ "Sanji, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
+    [ "Nami, Merveille's Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
+    [ "Nami and Billy the Thunder Bird", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
+    [ "Brook, Merveille's Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
+    [ "Brook, Straw Hat Pirates' Attack", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
+    [ "Chopper, Merveille's Adventurer", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
+    [ "Chopper, Straw Hat Pirates' Attack", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
+    [ "Shanks, Black Clad Redhead", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 478, 285, 185, 1650, 780, 291, 1 ],
+    [ "Shanks, Black Clad Emperor", "PSY", [ "Slasher", "Cerebral" ], 6, 55, 5, 5, 99, 5000000, 1537, 736, 261, 3140, 1400, 418, 1 ],
+    [ "Nico Robin Cherry Blossoms Falling", "DEX", [ "Fighter", "Cerebral" ], 4, 11, 4, 2, 50, 392109, 171, 55, 65, 976, 328, 252, 1 ],
+    [ "Nico Robin Cherry Blossoms in Full Bloom", "DEX", [ "Fighter", "Cerebral" ], 5, 19, 6, 3, 99, 3000000, 913, 271, 209, 1925, 747, 384, 1 ],
+    [ "Brook Cherry Blossom Hair", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 5, 2, 50, 392109, 211, 108, 40, 1267, 448, 163, 1 ],
+    [ "Brook Cherry Blossom Melody", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 1199, 379, 131, 2311, 885, 281, 1 ],
+    [ "Nami Blossom Cloud", "DEX", [ "Shooter", "Cerebral" ], 4, 12, 5, 2, 50, 392109, 127, 53, 73, 812, 303, 287, 1 ],
+    [ "Nami Blossom Climate", "DEX", [ "Shooter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 750, 247, 241, 1783, 670, 445, 1 ],
+    [ "Domino", "PSY", [ "Fighter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 32, 20, 80, 713, 366, 318, 1 ],
+    [ "Domino, Impel Down Vice Head Jailer", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 2, 99, 3000000, 634, 301, 265, 1800, 694, 449, 1 ],
+    [ "Minorhinoceros", "STR", [ "Striker", "Powerhouse" ], 3, 30, 6, 0, 70, 1066998, 1055, 655, 0, 2122, 815, -250, 1 ],
+    [ "Basilisk", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 4, 1, 70, 1066998, 612, 289, 31, 1525, 644, 128, 1 ],
+    [ "Ohm", "STR", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 770, 480, -600, 2200, 1050, -600, 1 ],
+    [ "Nola, Giant Snake", "PSY", [ "Fighter", "Powerhouse" ], 3, 20, 4, 1, 50, 392109, 1000, 180, 71, 2100, 455, 101, 0.7 ],
+    [ "Wyper", "DEX", [ "Shooter", "Free Spirit" ], 3, 9, 4, 2, 35, 136167, 212, 105, 20, 981, 567, 99, 1 ],
+    [ "Wyper, Descendant of Great Warrior Calgara", "DEX", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 914, 490, 70, 1598, 804, 155, 1 ],
+    [ "Eneru", "PSY", [ "Shooter", "Driven" ], 3, 12, 4, 2, 50, 392109, 177, 141, 58, 951, 615, 185, 1 ],
+    [ "Kami Eneru", "PSY", [ "Shooter", "Driven" ], 4, 20, 4, 3, 99, 3000000, 880, 542, 143, 1530, 1290, 318, 1 ],
+    [ "Monkey D. Luffy, Mt. Corvo's Brothers 3", "STR", [ "Fighter", "Free Spirit" ], 4, 10, 4, 2, 35, 136167, 100, 28, 77, 551, 267, 261, 1 ],
+    [ "Monkey D. Luffy, Mt. Corvo's Brothers 3, Cup of Sworn Brotherhood", "STR", [ "Fighter", "Free Spirit" ], 5, 18, 4, 3, 70, 1778330, 479, 209, 231, 1058, 541, 397, 1 ],
+    [ "Sadie", "INT", [ "Striker", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 31, 60, 66, 681, 550, 263, 1 ],
+    [ "Sadie, Impel Down Chief Jailer", "INT", [ "Striker", "Free Spirit" ], 4, 20, 6, 2, 99, 3000000, 618, 488, 202, 1505, 997, 388, 1 ],
+    [ "Minokoala", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 5, 0, 70, 1066998, 1400, 602, 0, 1977, 812, -100, 1 ],
+    [ "Manticore", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 1066998, 313, 245, 24, 999, 770, 112, 1 ],
+    [ "Roronoa Zoro, Merveille's Adventurer", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
+    [ "Roronoa Zoro, Straw Hat Pirates' Attack", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
+    [ "Usopp, Merveille's Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
+    [ "Usopp, Straw Hat Pirates' Attack", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
+    [ "Nico Robin, Merveille's Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
+    [ "Nico Robin, Straw Hat Pirates' Attack", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
+    [ "Franky, Merveille's Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
+    [ "Franky, Straw Hat Pirates' Attack", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
+    [ "Portgas D. Ace, Black Clad Flame Fist", "DEX", [ "Shooter", "Free Spirit" ], 5, 30, 6, 4, 70, 1066998, 515, 264, 152, 1922, 758, 253, 1 ],
+    [ "Portgas D. Ace, Black Clad Division Commander", "DEX", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1877, 702, 214, 3818, 1352, 321, 1 ],
+    [ "Porche", "PSY", "Shooter", 3, 10, 6, 1, 50, 392109, 33, 29, 58, 536, 338, 300, 1 ],
+    [ "Capote", "QCK", "Striker", 3, 10, 5, 1, 50, 392109, 124, 48, 36, 1188, 482, 139, 1 ],
+    [ "Hamburg", "DEX", [ "Striker", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 103, 58, 32, 1024, 620, 122, 1 ],
+    [ "Pickles", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 4, 1, 50, 392109, 130, 51, 25, 1202, 603, 98, 1 ],
+    [ "Big Bun", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 180, 105, 2, 1895, 850, 3, 1 ],
+    [ "Foxy", "INT", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 106, 51, 30, 788, 433, 175, 1 ],
+    [ "The Silver Fox Foxy", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 725, 373, 144, 1212, 698, 266, 1 ],
+    [ "Monkey D. Luffy, Davy Back Fight: Afro", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 465, 232, 36, 984, 585, 110, 1.5 ],
+    [ "Monkey D. Luffy, Davy Back Fight: Combat", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 862, 492, 70, 1978, 1170, 220, 1.5 ],
+    [ "Usopp, Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
+    [ "Tony Tony Chopper, Davy Back Fight: Mask", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
+    [ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
+    [ "Aokiji, Ice Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
+    [ "Tea Time Nami", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
+    [ "Monkey D. Luffy, Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
+    [ "Monkey D. Luffy, Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
+    [ "Roronoa Zoro, Voyage Log: Straw Hat Pirates", "QCK", [ "Slasher", "Driven" ], 4, 12, 4, 2, 50, 392109, 230, 110, 35, 1388, 651, 132, 1 ],
+    [ "Roronoa Zoro, Voyage Dream: Master Swordsman", "QCK", [ "Slasher", "Driven" ], 5, 20, 4, 3, 99, 3000000, 1329, 777, 90, 2250, 1118, 201, 1 ],
+    [ "Genbou", "STR", [ "Shooter", "Free Spirit" ], 3, 15, 4, 1, 70, 1066998, 271, 91, 15, 1855, 711, 54, 0.7 ],
+    [ "Kamakiri", "QCK", [ "Striker", "Free Spirit" ], 3, 15, 5, 1, 70, 1066998, 195, 84, 30, 1669, 691, 101, 0.7 ],
+    [ "Raki", "INT", "Shooter", 4, 18, 4, 2, 99, 3000000, 158, 55, 51, 1544, 668, 460, 0.7 ],
+    [ "Aisa", "PSY", "Fighter", 3, 11, 5, 2, 50, 392109, 32, 15, 80, 223, 109, 475, 0.7 ],
+    [ "Nojiko", "PSY", [ "Striker", "Cerebral" ], 3, 9, 5, 1, 35, 136167, 125, 57, 60, 398, 277, 293, 1 ],
+    [ "Nojiko, Nami's Sister", "PSY", [ "Fighter", "Cerebral" ], 4, 15, 6, 2, 70, 1066998, 330, 233, 253, 709, 382, 438, 1 ],
+    [ "Crocus", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 1, 35, 136167, 202, 60, 41, 886, 301, 203, 1 ],
+    [ "Crocus, Twin Cape Lighthouse Keeper", "INT", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 820, 249, 160, 1224, 509, 320, 1 ],
+    [ "Koza", "QCK", "Slasher", 3, 9, 5, 1, 35, 136167, 179, 69, 33, 939, 423, 158, 1 ],
+    [ "Koza, Rebel Leader", "QCK", "Slasher", 4, 15, 4, 2, 70, 1066998, 872, 375, 114, 1440, 681, 225, 1 ],
+    [ "Crimson Hime Turtle", "STR", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
+    [ "Azure Hime Turtle", "QCK", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
+    [ "Jade Hime Turtle", "DEX", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
+    [ "Amber Hime Turtle", "PSY", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
+    [ "Onyx Hime Turtle", "INT", "Booster", 6, 20, 6, 0, 1, 0, 2000, 100, 50, 2000, 100, 50, 1 ],
+    [ "Tony Tony Chopper, Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 220, 95, 46, 1324, 589, 186, 0.7 ],
+    [ "Tony Tony Chopper, Voyage Dream: Great Doctor", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1280, 542, 151, 1980, 1002, 301, 0.7 ],
+    [ "Buggy, Pirate Apprentice", "INT", [ "Slasher", "Driven" ], 3, 12, 6, 1, 50, 392109, 155, 74, 42, 872, 411, 162, 1 ],
+    [ "Buggy, Roger Pirates", "INT", [ "Slasher", "Driven" ], 4, 19, 5, 2, 99, 3000000, 813, 358, 123, 1602, 709, 290, 1 ],
+    [ "Shanks, Pirate Apprentice", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 155, 74, 42, 903, 488, 230, 1 ],
+    [ "Shanks, Roger Pirates", "PSY", [ "Slasher", "Free Spirit" ], 4, 18, 6, 3, 99, 3000000, 825, 440, 193, 1964, 920, 354, 1 ],
+    [ "Eneru, 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 4, 30, 6, 2, 70, 1066998, 155, 163, 38, 1369, 724, 128, 1 ],
+    [ "Eneru, Lightning Incarnate, 200,000,000 Volt Amaru", "QCK", [ "Striker", "Driven" ], 5, 50, 5, 3, 99, 5000000, 1288, 670, 90, 2524, 1470, 234, 1 ],
+    [ "Sanji Voyage Log: Straw Hat Pirates", "DEX", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 240, 103, 36, 1462, 620, 134, 0.7 ],
+    [ "Sanji Voyage Dream: All Blue", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 1413, 577, 100, 2350, 1052, 208, 0.7 ],
+    [ "Pirate Zeff", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 5, 1, 50, 392109, 185, 112, 24, 1210, 663, 128, 1 ],
+    [ "Red-Leg Zeff, Cook Pirates Captain", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1152, 599, 81, 2000, 1088, 258, 1 ],
+    [ "Gangster Patty", "STR", "Shooter", 3, 10, 4, 1, 50, 522812, 155, 120, 25, 1080, 648, 132, 0.7 ],
+    [ "Gangster Carne", "QCK", "Slasher", 3, 10, 6, 1, 50, 522812, 153, 91, 35, 1054, 571, 162, 0.7 ],
+    [ "Hiking Bear", "INT", "Fighter", 2, 7, 5, 0, 35, 90778, 129, 32, 8, 1410, 225, 30, 0.7 ],
+    [ "Purinpurin", "PSY", "Shooter", 2, 7, 6, 0, 35, 90778, 38, 14, 29, 544, 194, 193, 0.7 ],
+    [ "Brook Voyage Log: Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 208, 99, 29, 1326, 603, 168, 0.7 ],
+    [ "Brook Voyage Dream: Promised Meeting", "DEX", [ "Slasher", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1276, 560, 132, 2117, 1009, 279, 0.7 ],
+    [ "Zambai", "PSY", "Shooter", 3, 16, 4, 2, 70, 1066998, 230, 90, 48, 1580, 702, 168, 1 ],
+    [ "Demolisher Axeman", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 15, 1500, 900, 35, 1.5 ],
+    [ "Demolisher Spearman", "STR", [ "Striker", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 16, 1700, 800, 38, 1.5 ],
+    [ "Demolisher Gunner", "STR", [ "Shooter", "Powerhouse" ], 3, 20, 6, 1, 60, 899032, 1200, 500, 14, 1300, 1000, 32, 1.5 ],
+    [ "Street Punk: Brawler, Red Bounty Hunter", "STR", "Fighter", 3, 13, 6, 1, 60, 674274, 102, 85, 28, 1158, 790, 90, 1 ],
+    [ "Street Punk: Brawler, Green Bounty Hunter", "DEX", "Fighter", 3, 13, 6, 1, 60, 674274, 108, 75, 32, 1175, 754, 102, 1 ],
+    [ "Street Punk: Blade, Blue Bounty Hunter", "QCK", "Slasher", 3, 13, 5, 1, 60, 674274, 153, 66, 40, 1215, 653, 128, 1 ],
+    [ "Street Punk: Blade, Red Bounty Hunter", "STR", "Slasher", 3, 13, 5, 1, 60, 674274, 149, 73, 33, 1193, 690, 115, 1 ],
+    [ "Street Punk: Bullet, Green Bounty Hunter", "DEX", "Shooter", 3, 13, 5, 1, 60, 674274, 92, 45, 51, 938, 500, 255, 1 ],
+    [ "Street Punk: Bullet, Yellow Bounty Hunter", "PSY", "Shooter", 3, 13, 5, 1, 60, 674274, 86, 38, 55, 900, 467, 274, 1 ],
+    [ "Street Punk: Nails, Yellow Bounty Hunter", "PSY", "Striker", 3, 13, 4, 1, 60, 674274, 71, 102, 33, 878, 854, 119, 1 ],
+    [ "Street Punk: Nails, Black Bounty Hunter", "INT", "Striker", 3, 13, 4, 1, 60, 674274, 71, 108, 29, 877, 890, 107, 1 ],
+    [ "Street Punk: Gatling, Black Bounty Hunter", "INT", "Shooter", 3, 13, 6, 1, 60, 674274, 133, 90, 3, 1556, 765, 15, 1 ],
+    [ "Street Punk: Gatling, Blue Bounty Hunter", "QCK", "Shooter", 3, 13, 6, 1, 60, 674274, 150, 84, 5, 1602, 745, 16, 1 ],
+    [ "Tilestone", "STR", [ "Shooter", "Powerhouse" ], 3, 12, 4, 2, 70, 1066998, 153, 98, 30, 1521, 800, 101, 1 ],
+    [ "Franky, Franky Family", "INT", "Fighter", 3, 17, 5, 2, 70, 1066998, 203, 103, 23, 1712, 831, 85, 1 ],
+    [ "Kaku, Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 175, 80, 36, 1224, 643, 120, 1 ],
+    [ "Kaku: Six Powers, Cipher Pol No. 9", "QCK", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1144, 577, 93, 2523, 1000, 196, 1 ],
+    [ "Rob Lucci, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 121, 153, 20, 1121, 792, 64, 1 ],
+    [ "Rob Lucci: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 1064, 743, 51, 2284, 1289, 134, 1 ],
+    [ "Camie", "QCK", "Fighter", 3, 12, 4, 1, 50, 392109, 90, 23, 62, 960, 352, 273, [ 0.7, 1, 0.7 ] ],
+    [ "Camie, Takoyaki Shop Clerk", "QCK", "Fighter", 4, 18, 5, 2, 99, 3000000, 900, 295, 231, 1731, 698, 455, 0.7 ],
+    [ "Pappagu", "INT", "Fighter", 3, 12, 5, 1, 50, 392109, 77, 30, 77, 895, 505, 214, 0.7 ],
+    [ "Hatchan, Takoyaki Shop Manager", "PSY", [ "Slasher", "Powerhouse" ], 3, 16, 6, 2, 99, 3000000, 134, 88, 41, 1788, 888, 187, 0.7 ],
+    [ "Doma", "QCK", "Slasher", 4, 18, 4, 3, 70, 1066998, 89, 144, 43, 1098, 733, 187, 0.7 ],
+    [ "Bohemian Knight Doma", "QCK", "Slasher", 5, 29, 4, 4, 99, 4000000, 1020, 695, 150, 2134, 1268, 328, 0.7 ],
+    [ "DeCalvan Brothers", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 240, 89, 28, 1880, 668, 73, 0.7 ],
+    [ "DeCalvan Brothers, Brothers' Bond", "DEX", "Fighter", 5, 29, 5, 4, 99, 4000000, 1824, 602, 50, 3330, 1183, 158, 0.7 ],
+    [ "Squard", "PSY", [ "Striker", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 198, 190, 0, 1351, 810, 0, 0.7 ],
+    [ "Maelstrom Spider Squard", "PSY", [ "Striker", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 960, 755, -1, 2755, 1434, -150, 0.7 ],
+    [ "Whitey Bay", "INT", [ "Slasher", "Driven" ], 4, 18, 5, 3, 70, 1066998, 109, 93, 44, 1140, 600, 223, 0.7 ],
+    [ "Ice Witch Whitey Bay", "INT", [ "Slasher", "Driven" ], 5, 29, 5, 4, 99, 4000000, 1094, 561, 171, 2278, 993, 399, 0.7 ],
+    [ "Little Oars Jr.", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 6, 3, 70, 1066998, 251, 166, 1, 1900, 734, 3, 0.7 ],
+    [ "Little Oars Jr., Charging!", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
+    [ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
+    [ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
+    [ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Cerebral" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
+    [ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
+    [ "Iron Mask Duval", "DEX", [ "Shooter", "Driven" ], 3, 10, 4, 1, 35, 226945, 132, 133, 25, 725, 505, 77, 1 ],
+    [ "Duval, Flying Fish Riders Leader", "DEX", [ "Shooter", "Driven" ], 4, 30, 5, 2, 60, 1123790, 664, 424, 44, 1448, 723, 103, 1 ],
+    [ "Duval, Rosy Life Riders Leader", "DEX", [ "Shooter", "Free Spirit" ], 5, 50, 8, 3, 99, 5000000, 1420, 658, 103, 2608, 1113, 308, 1 ],
+    [ "Arlong the Pirate", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 144, 14, 1332, 700, 89, 1 ],
+    [ "Arlong, Sun Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1261, 633, 45, 2020, 1389, 171, 1 ],
+    [ "Kuroobi, Sun Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 50, 392109, 160, 103, 9, 1233, 744, 70, 1 ],
+    [ "Choo, Sun Pirates", "INT", [ "Shooter", "Powerhouse" ], 3, 10, 5, 1, 50, 392109, 75, 72, 22, 1002, 552, 178, 1 ],
+    [ "Monkey D. Luffy Swim Ring", "QCK", "Fighter", 4, 15, 6, 2, 99, 2000000, 144, 69, 31, 2232, 933, 242, 1 ],
+    [ "Usopp Voyage Log: Straw Hat Pirates", "QCK", "Striker", 4, 12, 6, 2, 50, 392109, 155, 67, 47, 1085, 513, 235, 0.7 ],
+    [ "Usopp Voyage Dream: Brave Sea Warrior", "QCK", "Striker", 5, 20, 4, 3, 99, 3000000, 1024, 468, 185, 2012, 938, 344, 0.7 ],
+    [ "Nami Holiday", "PSY", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 70, 30, 100, 1334, 673, 396, 0.7 ],
+    [ "Nefeltari Vivi, Princess of Alabasta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 6, 1, 35, 136167, 11, 11, 11, 285, 104, 225, 1 ],
+    [ "Nefeltari Vivi, Sand-Sand Band Sub-Leader", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 243, 51, 187, 593, 269, 488, 1 ],
+    [ "Koza, Alabasta Citizen", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 53, 53, 3, 503, 274, 151, 1 ],
+    [ "Koza, Sand-Sand Band Leader", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 445, 230, 123, 1000, 503, 341, 1 ],
+    [ "Nefeltari Cobra, King of Alabasta Kingdom", "PSY", "Fighter", 3, 15, 5, 2, 70, 1066998, 523, 294, 31, 1402, 571, 211, 1 ],
+    [ "Sabo", "PSY", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 70, 1066998, 369, 279, 169, 1498, 821, 305, 1.5 ],
+    [ "Sabo the Revolutionary", "PSY", [ "Free Spirit", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1440, 752, 252, 2985, 1422, 451, 1.5 ],
+    [ "Koala", "DEX", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 70, 1066998, 94, 122, 48, 996, 644, 226, 1.5 ],
+    [ "Koala the Revolutionary", "DEX", [ "Fighter", "Free Spirit" ], 5, 29, 4, 4, 99, 4000000, 931, 600, 185, 1934, 1212, 392, 1.5 ],
+    [ "Hack", "STR", [ "Fighter", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 188, 136, 21, 1241, 721, 151, 1.5 ],
+    [ "Hack, Revolutionary Army", "STR", [ "Fighter", "Powerhouse" ], 5, 29, 5, 4, 99, 4000000, 1185, 668, 115, 2387, 1324, 259, 1.5 ],
+    [ "Emporio Ivankov, New Kama Karate Master", "INT", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 206, 99, 32, 1343, 653, 157, 1.5 ],
+    [ "Emporio Ivankov, Revolutionary Army", "INT", [ "Free Spirit", "Fighter" ], 5, 29, 7, 4, 99, 4000000, 1285, 593, 142, 2774, 1212, 241, 1.5 ],
+    [ "Inazuma", "QCK", [ "Slasher", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 179, 58, 47, 1300, 449, 232, 1.5 ],
+    [ "Inazuma the Revolutionary", "QCK", [ "Slasher", "Cerebral" ], 5, 29, 6, 4, 99, 4000000, 1244, 400, 199, 2559, 833, 380, 1.5 ],
+    [ "Nico Robin Voyage Log: Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 2, 50, 392109, 155, 62, 58, 1032, 484, 262, 1 ],
+    [ "Nico Robin Voyage Dream: 100-Year Void", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 6, 3, 99, 3000000, 970, 423, 220, 1924, 857, 390, 1 ],
+    [ "Ice Cream-Loving Nami", "DEX", [ "Striker", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 141, 43, 53, 966, 422, 242, 1 ],
+    [ "Ice Cream-Loving Nami, Lemon Ice Cream", "DEX", [ "Striker", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 900, 366, 200, 1802, 768, 402, 1 ],
+    [ "Ice Cream-Loving Robin", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 6, 1, 50, 392109, 147, 61, 46, 988, 491, 218, 0.7 ],
+    [ "Ice Cream-Loving Robin, Chocolate Ice Cream", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 2, 99, 3000000, 943, 443, 172, 1903, 842, 361, 1 ],
+    [ "Ice Cream-Loving Perona", "INT", [ "Shooter", "Driven" ], 4, 12, 5, 1, 50, 392109, 99, 67, 52, 901, 527, 233, 1 ],
+    [ "Ice Cream-Loving Perona, Strawberry Ice Cream", "INT", [ "Shooter", "Driven" ], 5, 20, 4, 2, 99, 3000000, 848, 462, 182, 1689, 877, 385, 1 ],
+    [ "Vivi's Breather", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 4, 2, 70, 1066998, 102, 37, 91, 1028, 497, 343, 1 ],
+    [ "Calgara", "STR", [ "Free Spirit", "Striker" ], 3, 12, 6, 1, 50, 392109, 94, 115, 0, 1203, 692, 0, 1 ],
+    [ "Calgara, Great Shandia Warrior", "STR", [ "Free Spirit", "Striker" ], 4, 20, 4, 2, 99, 3000000, 1145, 633, 0, 2401, 1300, 90, 1 ],
+    [ "Mont Blanc Noland", "INT", [ "Slasher", "Cerebral" ], 3, 12, 5, 1, 50, 392109, 102, 74, 49, 1028, 502, 212, 1 ],
+    [ "Mont Blanc Noland, Lvneel Kingdom Explorer", "INT", [ "Slasher", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 949, 442, 170, 1982, 890, 326, 1 ],
+    [ "Naginata Corporal, Navy HQ", "DEX", "Striker", 2, 7, 5, 0, 35, 90778, 70, 32, 21, 601, 301, 98, 1 ],
+    [ "Rifle Corporal, Navy HQ", "QCK", "Shooter", 2, 7, 6, 0, 35, 90778, 58, 28, 28, 498, 286, 121, 1 ],
+    [ "Saber Corporal, Navy HQ", "PSY", "Slasher", 2, 7, 5, 0, 35, 90778, 51, 34, 22, 466, 330, 111, 1 ],
+    [ "Bazooka Corporal, Navy HQ", "STR", "Shooter", 2, 7, 4, 0, 35, 90778, 62, 50, 14, 598, 404, 64, 1 ],
+    [ "Knuckle Corporal, Navy HQ", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 55, 48, 22, 522, 392, 82, 1 ],
+    [ "Naginata Major, Navy HQ", "DEX", "Striker", 3, 13, 6, 1, 70, 1066998, 554, 250, 61, 1358, 645, 170, 1 ],
+    [ "Rifle Major, Navy HQ", "QCK", "Shooter", 3, 13, 5, 1, 70, 1066998, 444, 244, 96, 1002, 568, 259, 1 ],
+    [ "Saber Major, Navy HQ", "PSY", "Slasher", 3, 13, 6, 1, 70, 1066998, 411, 275, 86, 989, 737, 208, 1 ],
+    [ "Bazooka Major, Navy HQ", "STR", "Shooter", 3, 13, 6, 1, 70, 1066998, 547, 362, 44, 1301, 833, 117, 1 ],
+    [ "Knuckle Major, Navy HQ", "INT", "Fighter", 3, 13, 5, 1, 70, 1066998, 462, 351, 49, 1244, 876, 112, 1 ],
+    [ "Oimo", "PSY", [ "Striker", "Powerhouse" ], 3, 25, 5, 2, 70, 1778330, 452, 223, 23, 1602, 742, 98, 1 ],
+    [ "Kashii", "INT", [ "Slasher", "Powerhouse" ], 3, 25, 6, 2, 70, 1778330, 426, 242, 21, 1551, 798, 87, 1 ],
+    [ "Watchdog Unit of the Law", "QCK", "Slasher", 3, 13, 4, 1, 70, 1066998, 122, 43, 40, 1211, 488, 251, 1 ],
+    [ "Righteous Juror", "STR", "Striker", 3, 13, 4, 1, 70, 1066998, 108, 129, 34, 990, 900, 144, 1 ],
+    [ "Three-Headed Baskerville", "DEX", "Slasher", 3, 13, 4, 3, 70, 1066998, 102, 78, 38, 1109, 595, 232, 1 ],
+    [ "Blueno, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 166, 102, 32, 1338, 502, 124, 1 ],
+    [ "Blueno: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1281, 452, 100, 2466, 921, 221, 1 ],
+    [ "Nico Robin, Devil Child", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 6, 2, 50, 392109, 110, 63, 32, 1002, 494, 209, 1 ],
+    [ "Nico Robin, Straw Hat Pirates", "PSY", [ "Fighter", "Cerebral" ], 4, 16, 5, 3, 99, 3000000, 938, 430, 155, 1892, 881, 351, 1 ],
+    [ "Franky Voyage Log: Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 242, 100, 34, 1330, 597, 151, 1 ],
+    [ "Franky Voyage Dream: Ship of the Seven Seas", "PSY", [ "Shooter", "Free Spirit" ], 5, 20, 6, 3, 99, 3000000, 1259, 550, 112, 2372, 1100, 231, 1 ],
+    [ "Ganfor", "QCK", "Striker", 3, 12, 6, 1, 50, 392109, 80, 40, 48, 930, 452, 185, 1.5 ],
+    [ "Ganfor, Sky Knight", "QCK", "Striker", 4, 20, 4, 2, 99, 3000000, 884, 401, 151, 1704, 1202, 300, 1.5 ],
+    [ "Pierre", "DEX", "Fighter", 3, 12, 4, 1, 50, 392109, 69, 32, 38, 920, 480, 182, 1 ],
+    [ "Conis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
+    [ "Conis, Skypiea Girl", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
+    [ "Dracule Mihawk Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
+    [ "Hawk Eyes Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
+    [ "Sir Crocodile: Logia, Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
+    [ "Sir Crocodile: Logia, Ex-Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
+    [ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
+    [ "Jerry, Cipher Pol No. 6", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 8, 2, 70, 1066998, 439, 323, 70, 1000, 712, 212, 1 ],
+    [ "T-Bone", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 99, 78, 42, 958, 542, 162, 1 ],
+    [ "Ship Cutter T-Bone, Marine Captain", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 900, 493, 133, 1700, 1100, 300, 1 ],
+    [ "Nefertari Vivi Voyage Log: Princess of Alabasta", "QCK", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 98, 51, 62, 855, 424, 288, 1 ],
+    [ "Nefertari Vivi Voyage Dream: Queen of the Pirates", "QCK", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 800, 371, 258, 1591, 777, 474, 1 ],
+    [ "Monkey D. Luffy Gum-Gum Gatling", "DEX", [ "Free Spirit", "Fighter" ], 4, 15, 8, 3, 99, 2000000, 212, 100, 46, 1777, 795, 270, 0.7 ],
+    [ "Kalifa, Cipher Pol No. 9", "DEX", [ "Fighter", "Cerebral" ], 3, 12, 5, 2, 50, 392109, 89, 39, 55, 952, 448, 217, 1 ],
+    [ "Kalifa: Six Powers, Cipher Pol No. 9", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 900, 401, 174, 1894, 970, 302, 1 ],
+    [ "Jabra, Cipher Pol No. 9", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 4, 2, 50, 392109, 190, 92, -200, 1334, 572, -200, 1 ],
+    [ "Jabra: Six Powers, Cipher Pol No. 9", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1272, 521, -200, 2720, 1250, -200, 1 ],
+    [ "Fukuro, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 3, 9, 4, 2, 35, 136167, 114, 52, 30, 1123, 408, 122, 1 ],
+    [ "Fukuro: Six Powers, Cipher Pol No. 9", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 70, 1066998, 1077, 362, 97, 1850, 690, 177, 1 ],
+    [ "Kumadori, Cipher Pol No. 9", "PSY", [ "Striker", "Powerhouse" ], 3, 9, 5, 2, 35, 136167, 102, 60, 29, 1055, 442, 119, 1 ],
+    [ "Kumadori: Six Powers, Cipher Pol No. 9", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 1000, 398, 88, 1792, 755, 165, 1 ],
+    [ "Kaku: Beastman, Ox-Ox Fruit, Model: Giraffe", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 6, 3, 99, 4000000, 1220, 692, 43, 2526, 1200, 114, 1 ],
+    [ "Lucci: Beastman, Cat-Cat Fruit, Model: Leopard", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 4000000, 1032, 703, 56, 2200, 1302, 140, 1 ],
+    [ "Spandam", "INT", "Slasher", 4, 7, 5, 1, 35, 136167, 52, 25, 25, 258, 196, 89, 1 ],
+    [ "Franky, Straw Hat Pirates", "INT", [ "Fighter", "Free Spirit" ], 4, 18, 4, 3, 99, 3000000, 1623, 765, 70, 2505, 1149, 130, 1 ],
+    [ "Nero", "QCK", [ "Shooter", "Driven" ], 3, 9, 6, 1, 35, 136167, 59, 112, 20, 324, 543, 83, 0.7 ],
+    [ "Nero, Cipher Pol No. 9", "QCK", [ "Shooter", "Driven" ], 4, 15, 5, 2, 70, 1066998, 277, 489, 51, 755, 1050, 145, 0.7 ],
+    [ "Wanze", "DEX", "Free Spirit", 3, 11, 4, 1, 50, 392109, 202, 44, 40, 1124, 367, 212, 1 ],
+    [ "Wanze, Cipher Pol No. 7", "DEX", "Free Spirit", 4, 18, 5, 2, 99, 3000000, 1059, 312, 170, 2051, 674, 363, 1 ],
+    [ "Portgas D. Ace, Record of the Voyage - Whitebeard Pirates", "QCK", [ "Free Spirit", "Fighter" ], 4, 12, 5, 2, 50, 392109, 141, 71, 36, 1121, 585, 189, 1.5 ],
+    [ "Portgas D. Ace Voyage Dream: Pirate Summit", "QCK", [ "Free Spirit", "Fighter" ], 5, 20, 4, 3, 99, 4000000, 1063, 524, 140, 2181, 1100, 258, 1.5 ],
+    [ "Megalo and Princess Shirahoshi", "QCK", "Fighter", 4, 15, 4, 3, 70, 1066998, 1251, 271, 150, 2001, 600, 241, 1 ],
+    [ "Rob Lucci, CP9 Dark Justice", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 70, 1066998, 496, 300, 89, 1656, 800, 245, 1.5 ],
+    [ "Rob Lucci, CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], 6, 55, 6, 4, 99, 5000000, 1611, 762, 220, 3230, 1456, 382, 1.5 ],
+    [ "Kaku, CP9 Dark Justice", "DEX", [ "Slasher", "Powerhouse" ], 4, 17, 6, 3, 70, 1066998, 151, 132, 28, 1183, 713, 178, 1 ],
+    [ "Kaku, CP9's Strongest", "DEX", [ "Slasher", "Powerhouse" ], 5, 27, 8, 4, 99, 4000000, 1124, 666, 147, 2440, 1325, 272, 1 ],
+    [ "Kalifa, CP9 Dark Justice", "QCK", [ "Cerebral", "Fighter" ], 4, 17, 5, 3, 70, 1066998, 98, 60, 63, 963, 545, 270, 1 ],
+    [ "Kalifa, CP9's Strongest", "QCK", [ "Cerebral", "Fighter" ], 5, 27, 5, 4, 99, 4000000, 912, 498, 238, 1964, 933, 473, 1 ],
+    [ "Jabra, CP9 Dark Justice", "QCK", [ "Powerhouse", "Free Spirit" ], 4, 17, 5, 3, 70, 1066998, 224, 112, 21, 1650, 702, 89, 1 ],
+    [ "Jabra, CP9's Strongest", "QCK", [ "Powerhouse", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1601, 657, 55, 3003, 1299, 166, 1 ],
+    [ "Blueno, CP9 Dark Justice", "INT", [ "Powerhouse", "Free Spirit" ], 4, 16, 5, 3, 70, 1066998, 245, 94, 23, 1832, 644, 91, 1 ],
+    [ "Blueno, CP9's Strongest", "INT", [ "Powerhouse", "Free Spirit" ], 5, 26, 4, 4, 99, 4000000, 1779, 600, 56, 3502, 1045, 168, 1 ],
+    [ "Fukuro, CP9 Dark Justice", "PSY", [ "Powerhouse", "Fighter" ], 4, 16, 4, 3, 70, 1066998, 151, 97, 46, 1140, 651, 203, 1 ],
+    [ "Fukuro, CP9's Strongest", "PSY", [ "Powerhouse", "Fighter" ], 5, 26, 8, 4, 99, 4000000, 1093, 603, 165, 2415, 1051, 353, 1 ],
+    [ "Kumadori, CP9 Dark Justice", "STR", [ "Powerhouse", "Striker" ], 4, 16, 4, 3, 70, 1066998, 162, 89, 47, 1167, 612, 212, 1 ],
+    [ "Kumadori, CP9's Strongest", "STR", [ "Powerhouse", "Striker" ], 5, 26, 7, 4, 99, 4000000, 1110, 560, 170, 2479, 1018, 355, 1 ],
+    [ "Monkey D. Luffy, Halloween Monster", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 6, 3, 99, 3000000, 85, 41, 26, 1920, 1080, 185, 1 ],
+    [ "Usopp, Lying Wolf", "PSY", "Shooter", 4, 20, 5, 3, 99, 3000000, 51, 23, 46, 1444, 673, 400, 1 ],
+    [ "Franky, Frankenstein", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 82, 43, 22, 1903, 1121, 170, 1 ],
+    [ "Nami, Jackie 'o Lantern", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 47, 25, 49, 1342, 699, 416, 1 ],
+    [ "Tony Tony Chopper, Lil' Vampire", "INT", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 56, 33, 38, 1548, 763, 358, 1 ],
+    [ "Roronoa Zoro, Jack the Ripper", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 3000000, 90, 39, 13, 2094, 1063, 131, 1 ],
+    [ "Nico Robin, Devil Girl", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 53, 35, 34, 1500, 889, 320, 1 ],
+    [ "Sanji, Ghost Knight", "PSY", "Fighter", 4, 20, 4, 3, 99, 3000000, 92, 36, 28, 2088, 936, 221, 1 ],
+    [ "Brook, Cowardly Skeleton", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 62, 35, 26, 1921, 948, 210, 1 ],
+    [ "Dalmatian, Marine Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 4000000, 241, 186, 35, 2171, 1275, 189, 1.5 ],
+    [ "Momonga, Marine Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 4, 20, 6, 3, 99, 4000000, 298, 142, 20, 2618, 1111, 163, 1.5 ],
+    [ "Onigumo, Marine Vice Admiral", "DEX", [ "Slasher", "Driven" ], 4, 20, 8, 3, 99, 4000000, 213, 118, 54, 2000, 1021, 318, 1.5 ],
+    [ "Shu", "INT", [ "Fighter", "Free Spirit" ], 3, 12, 4, 2, 70, 1066998, 56, 89, 23, 943, 969, 150, 1 ],
+    [ "Berry Good", "QCK", [ "Free Spirit", "Striker" ], 3, 12, 4, 2, 70, 1066998, 203, 57, 15, 1808, 703, 103, 1 ],
+    [ "Strawberry, Marine Vice Admiral", "PSY", [ "Cerebral", "Slasher" ], 3, 16, 6, 2, 99, 3000000, 142, 64, 33, 1883, 943, 178, 1 ],
+    [ "Lucky Roo", "PSY", [ "Shooter", "Free Spirit" ], 3, 13, 6, 2, 35, 136167, 303, 169, 30, 904, 460, 98, 0.7 ],
+    [ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
+    [ "Rebecca, Imprisoned Swordsman", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
+    [ "Rebecca, Coliseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
+    [ "Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
+    [ "Mad Monk Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1512, 755, 83, 2824, 1324, 203, 1.5 ],
+    [ "Tashigi: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 132, 65, 49, 999, 495, 205, 1 ],
+    [ "Tashigi Marine Officer: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 932, 428, 164, 1804, 890, 378, 1 ],
+    [ "Gen-san", "STR", [ "Slasher", "Cerebral" ], 3, 9, 5, 2, 35, 136167, 211, 45, 33, 930, 288, 190, 1 ],
+    [ "Genzo, Cocoyasi Village Resident", "STR", [ "Slasher", "Cerebral" ], 4, 15, 4, 3, 70, 1066998, 879, 242, 143, 1324, 501, 299, 1 ],
+    [ "Dr. Hiluluk", "PSY", [ "Shooter", "Free Spirit" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
+    [ "Dr. Hiluluk, Quack Doctor", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
+    [ "Kuina", "DEX", "Striker", 3, 9, 6, 2, 35, 136167, 54, 41, 70, 503, 264, 251, 1 ],
+    [ "Kuina, Shimotsuki Village's Girl Swordsman", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 3, 70, 1066998, 448, 220, 213, 917, 582, 338, 1 ],
+    [ "Tamanegi, Piiman & Ninjin", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
+    [ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
+    [ "Iceburg", "INT", [ "Shooter", "Cerebral" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
+    [ "Iceburg, Mayor of W7 and President of Galley-La Company", "INT", [ "Shooter", "Cerebral" ], 4, 16, 4, 3, 70, 1066998, 723, 343, 122, 1401, 702, 224, 1 ],
+    [ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
+    [ "Nightmare Luffy Warrior of Hope", "INT", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1331, 711, 0, 3020, 1520, 0, 1.5 ],
+    [ "Breed", "INT", "Cerebral", 3, 13, 6, 1, 50, 392109, 59, 25, 59, 867, 418, 275, 1.5 ],
+    [ "Breed, Pet-Pet Fruit User", "INT", [ "Cerebral", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 867, 818, 200, 2002, 1311, 180, 1.5 ],
+    [ "Kung Fu Dugong, Sea Animal Pirates", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 2, 70, 1778330, 50, 355, 95, 450, 1115, 225, 1.5 ],
+    [ "Sea Lapahn, Sea Animal Pirates", "QCK", [ "Fighter", "Powerhouse" ], 3, 15, 4, 1, 70, 711332, 209, 76, 14, 1757, 724, 112, 1 ],
+    [ "Octopus Boxer, Sea Animal Pirates", "STR", [ "Fighter", "Powerhouse" ], 3, 15, 8, 1, 70, 711332, 99, 91, 2, 1563, 846, 93, 1 ],
+    [ "Mr. 2 Bon Clay Voyage Log: B.W.", "PSY", [ "Fighter", "Free Spirit" ], 4, 13, 5, 2, 50, 392109, 109, 57, 32, 1033, 513, 212, 1 ],
+    [ "Mr. 2 Bon Clay Voyage Dream: Okama Way", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 970, 448, 181, 1914, 922, 362, 1 ],
+    [ "Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 4, 18, 5, 1, 50, 392109, 188, 128, 48, 977, 544, 191, 1 ],
+    [ "Black Cage Hina, Navy HQ Captain", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 5, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1 ],
+    [ "Smoker, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 4, 25, 6, 2, 70, 1066998, 710, 309, 44, 1600, 703, 146, 1.5 ],
+    [ "Smoker the White Hunter, Navy HQ Captain", "INT", [ "Striker", "Driven" ], 5, 40, 5, 3, 99, 4000000, 1549, 640, 112, 2727, 1289, 234, 1.5 ],
+    [ "Angel in White Nami, Wedding", "PSY", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 60, 33, 49, 933, 419, 268, 1 ],
+    [ "Goddess in White Nami, Wedding", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 877, 362, 221, 1772, 799, 409, 1 ],
+    [ "Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 3, 11, 6, 1, 50, 261406, 103, 69, 31, 1101, 559, 91, 1 ],
+    [ "Loveseeking Lola, Thriller Bark Bride", "STR", [ "Slasher", "Powerhouse" ], 4, 18, 8, 2, 99, 2000000, 1032, 513, 52, 2018, 1009, 147, 1 ],
+    [ "Risky Brothers", "DEX", [ "Slasher", "Free Spirit" ], 3, 9, 4, 2, 50, 392109, 30, 15, 40, 707, 368, 287, 1 ],
+    [ "Cerberus", "QCK", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 233, 108, 52, 1151, 781, 0, 1 ],
+    [ "Taralan", "INT", [ "Cerebral", "Powerhouse" ], 3, 14, 7, 2, 50, 392109, 325, 76, 48, 1385, 696, 0, 1 ],
+    [ "Bear Skin Rug", "DEX", [ "Fighter", "Powerhouse" ], 3, 14, 5, 2, 50, 392109, 203, 52, 155, 1074, 609, 74, 1 ],
+    [ "Gecko Moria, Thriller Bark Demon", "INT", [ "Free Spirit", "Driven" ], 3, 12, 6, 2, 50, 392109, 205, 92, 0, 1422, 504, 0, 1 ],
+    [ "Gecko Moria, Thriller Bark Ruler", "INT", [ "Free Spirit", "Driven" ], 4, 20, 4, 3, 99, 3000000, 1355, 451, 0, 2603, 913, 0, 1.5 ],
+    [ "Strong Soldier Zombie", "STR", "Fighter", 2, 7, 6, 0, 35, 90778, 85, 39, 92, 990, 622, 27, 1 ],
+    [ "Speedy Soldier Zombie", "QCK", "Fighter", 2, 7, 6, 0, 35, 90778, 77, 30, 92, 944, 590, 43, 1 ],
+    [ "Crafty Soldier Zombie", "DEX", "Fighter", 2, 7, 6, 0, 35, 90778, 92, 28, 92, 1032, 574, 35, 1 ],
+    [ "Hate-Filled Soldier Zombie", "INT", "Fighter", 2, 7, 6, 0, 35, 90778, 71, 40, 92, 903, 648, 29, 1 ],
+    [ "Egotistical Soldier Zombie", "PSY", "Fighter", 2, 7, 6, 0, 35, 90778, 70, 24, 92, 887, 551, 72, 1 ],
+    [ "Tricky Wild Zombie", "DEX", "Powerhouse", 3, 12, 4, 1, 50, 392109, 75, 74, 132, 899, 720, 71, 1 ],
+    [ "Brainy Wild Zombie", "INT", "Powerhouse", 3, 12, 4, 1, 50, 392109, 71, 86, 132, 823, 771, 65, 1 ],
+    [ "Heartful Wild Zombie", "PSY", "Powerhouse", 3, 12, 4, 1, 50, 392109, 70, 70, 132, 801, 700, 94, 1 ],
+    [ "Powerful General Zombie", "STR", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 99, 59, 29, 1702, 813, 0, 1 ],
+    [ "Sneaky General Zombie", "DEX", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 102, 57, 29, 1727, 802, 0, 1 ],
+    [ "Blazing General Zombie", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
+    ["Trafalgar Law, the Boy from the White City", "PSY", ["Slasher", "Driven"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
+    ["Trafalgar Law, the Boy Saved by Fate", "PSY", ["Slasher", "Driven"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
+    [ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
+    [ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
+    [ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
+    [ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
+    [ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Driven" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
+    [ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
+    [ "Tyrant Bartholomew Kuma, Government Human Weapon", "STR", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
+    [ "Caesar Clown", "DEX", [ "Driven", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
+    [ "Master Caesar", "DEX", [ "Driven", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 941, 695, 177, 2000, 1383, 343, 1 ],
+    [ "Vergo", "INT", [ "Striker", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 282, 150, 19, 1515, 782, 89, 1 ],
+    [ "Vergo, Donquixote Pirates", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1464, 730, 60, 3003, 1410, 140, 1 ],
+    [ "Monet", "PSY", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 130, 87, 47, 1078, 593, 241, 1 ],
+    [ "Monet, Donquixote Pirates", "PSY", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1020, 540, 199, 2131, 1001, 433, 1 ],
+    [ "Baby 5", "STR", [ "Shooter", "Striker" ], 4, 18, 5, 3, 70, 1066998, 114, 142, 53, 892, 743, 230, 1 ],
+    [ "Baby 5, Donquixote Pirates", "STR", [ "Shooter", "Striker" ], 5, 30, 6, 4, 99, 4000000, 850, 692, 185, 1929, 1352, 349, 1 ],
+    [ "Buffalo", "QCK", [ "Shooter", "Free Spirit" ], 4, 18, 9, 3, 70, 1066998, 96, 96, 49, 1111, 666, 196, 1 ],
+    [ "Buffalo, Donquixote Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 30, 10, 4, 99, 4000000, 1050, 600, 173, 2769, 1096, 296, 1 ],
+    [ "Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 159, 95, 30, 1103, 614, 141, 1 ],
+    [ "Legendary Shipwright Tom, Tom's Workers", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1059, 572, 100, 2207, 1029, 266, 1 ],
+    [ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
+    [ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
+    [ "Wapol of Tin", "STR", [ "Shooter", "Driven" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
+    [ "Slim-up Wapol", "QCK", [ "Shooter", "Driven" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
+    [ "Robson", "PSY", [ "Fighter", "Powerhouse" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
+    [ "Chopper's Snow Day", "DEX", [ "Fighter", "Powerhouse" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
+    [ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
+    [ "Trafalgar Law Holy Night Nobleman", "DEX", [ "Slasher", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 945, 460, 151, 2003, 1030, 313, 1 ],
+    [ "Jewelry Bonney Ravenous Spoiled Santa", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 5, 3, 50, 392109, 190, 50, 54, 1003, 403, 213, 1 ],
+    [ "Jewelry Bonney Ravenous Greedy Santa", "PSY", [ "Fighter", "Free Spirit" ], 5, 19, 4, 3, 99, 4000000, 848, 354, 178, 2380, 769, 338, 1 ],
+    [ "Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 18, 5, 2, 50, 392109, 267, 98, 27, 1193, 561, 158, 1 ],
+    [ "War Hero Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 3, 99, 3000000, 1121, 500, 104, 2239, 1048, 261, 1 ],
+    [ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
+    [ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
+    [ "Snowy World Nami", "QCK", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
+    [ "Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
+    [ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
+    [ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Cerebral", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
+    [ "Usopp Tabasco Star: The Storm", "DEX", "Shooter", 4, 15, 7, 2, 99, 2000000, 258, 152, 94, 1866, 704, 343, 1 ],
+    [ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
+    [ "Donquixote Doflamingo, Donquixote Pirates", "QCK", [ "Driven", "Cerebral" ], 5, 30, 6, 4, 70, 1066998, 390, 311, 77, 1510, 830, 258, 1 ],
+    [ "Heavenly Yaksha Donquixote Doflamingo", "QCK", [ "Driven", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1446, 780, 230, 2800, 1530, 405, 1 ],
+    [ "Sugar", "QCK", [ "Free Spirit", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 102, 55, 68, 952, 420, 321, 1 ],
+    [ "Sugar, Donquixote Pirates", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 896, 342, 274, 1905, 790, 532, 1 ],
+    [ "Señor Pink", "PSY", [ "Free Spirit", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 292, 103, 24, 1524, 657, 142, 1 ],
+    [ "Señor Pink, Donquixote Pirates", "PSY", [ "Free Spirit", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1478, 600, 100, 2800, 1242, 241, 1 ],
+    [ "Trebol", "INT", [ "Cerebral", "Driven" ], 4, 18, 5, 3, 70, 1066998, 103, 150, 42, 941, 770, 201, 1 ],
+    [ "Trebol, Donquixote Pirates", "INT", [ "Cerebral", "Driven" ], 5, 30, 6, 4, 99, 4000000, 889, 721, 148, 1967, 1381, 334, 1 ],
+    [ "Giolla", "DEX", [ "Free Spirit", "Driven" ], 4, 18, 4, 3, 70, 1066998, 236, 66, 41, 1463, 494, 204, 1 ],
+    [ "Giolla, Donquixote Pirates", "DEX", [ "Free Spirit", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1404, 443, 146, 2887, 880, 347, 1 ],
+    [ "Lao G.", "STR", [ "Fighter", "Driven" ], 4, 18, 5, 3, 70, 1066998, 117, 129, 37, 1025, 783, 181, [ 1.5, 0.7, 1.5 ] ],
+    [ "Lao G., Donquixote Pirates", "STR", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 968, 721, 143, 2021, 1420, 293, [ 1.5, 0.7, 1.5 ] ],
+    [ "Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, 5, 2, 70, 1066998, 646, 261, 83, 1247, 693, 220, 1 ],
+    [ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
+    [ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
+    [ "Dorry the Blue Ogre", "INT", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
+    [ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
+    [ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Cerebral" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
+    [ "Buggy, Cheerfully Crazy", "QCK", [ "Driven", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
+    [ "Horo Horo Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
+    [ "Perona, Thriller Bark Demon", "DEX", [ "Shooter", "Driven" ], 3, 12, 4, 1, 50, 392109, 59, 31, 38, 797, 392, 271, 1 ],
+    [ "Perona, Giant Ghost Princess", "DEX", [ "Shooter", "Driven" ], 4, 20, 5, 3, 99, 3000000, 772, 381, 159, 1909, 960, 271, 1 ],
+    [ "Doctor Hogback, Thriller Bark Demon", "INT", [ "Fighter", "Cerebral" ], 3, 15, 5, 2, 70, 1066998, 148, 75, 30, 1492, 535, 247, 1 ],
+    [ "Absalom of the Graveyard, Thriller Bark Demon", "STR", [ "Shooter", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 156, 102, 13, 1803, 813, 96, 1 ],
+    [ "Oars, Special Zombie", "STR", [ "Fighter", "Powerhouse" ], 4, 50, 4, 2, 99, 4000000, 1500, 700, 0, 2700, 1440, -500, 1 ],
+    [ "Gecko Moria, Shadows' Asgard", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1000, 500, -500, 3180, 1430, -999, 1 ],
+    [ "Brook, Gentlemanly Skeleton", "DEX", [ "Slasher", "Free Spirit" ], 3, 10, 5, 1, 50, 392109, 148, 96, 37, 1067, 491, 196, 1 ],
+    [ "Brook, Straw Hat Pirates", "DEX", [ "Slasher", "Free Spirit" ], 4, 16, 6, 3, 99, 3000000, 1000, 442, 140, 1990, 847, 316, 1 ],
+    [ "Sir Crocodile, Sand General", "STR", [ "Cerebral", "Driven" ], 4, 20, 5, 2, 99, 3000000, 89, 41, 24, 2142, 1149, 208, 1 ],
+    [ "Mr. 3, Makeshift Musician", "QCK", [ "Striker", "Cerebral" ], 4, 17, 4, 2, 99, 2000000, 24, 14, 33, 1703, 622, 312, 1.5 ],
+    [ "Mr. 2 Bon Clay, Dubious Samurai", "INT", [ "Fighter", "Free Spirit" ], 4, 17, 4, 2, 99, 2000000, 42, 20, 22, 1810, 804, 235, 1.5 ],
+    [ "Fresh Franky, Health Comes First", "DEX", [ "Shooter", "Free Spirit" ], 4, 25, 6, 2, 70, 1066998, 659, 244, 85, 1330, 659, 211, 1 ],
+    [ "Cyborg Franky", "DEX", [ "Shooter", "Free Spirit" ], 5, 40, 8, 3, 99, 4000000, 1269, 618, 167, 2515, 1172, 323, 1 ],
+    [ "Broggy, Giant Warrior Pirates", "PSY", [ "Slasher", "Powerhouse" ], 4, 18, 5, 1, 50, 392109, 261, 120, 20, 1354, 539, 90, 1 ],
+    [ "Broggy the Red Ogre", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1292, 463, 64, 2460, 1090, 156, 1 ],
+    [ "Yokozuna", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
+    [ "Roronoa Zoro, the Swordsman Who Wanders Kuraigana Island", "STR", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
+    [ "Roronoa Zoro, Pupil of the World's Strongest Swordsman", "STR", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1403, 687, 67, 2830, 1390, 190, 1 ],
+    [ "Nico Robin, Tequila Wolf Inmate", "INT", [ "Cerebral", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 131, 91, 43, 1021, 679, 217, 1 ],
+    [ "Nico Robin, Light of the Revolution", "INT", [ "Cerebral", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
+    [ "Tony Tony Chopper, Torino Kingdom's Peace Mediator", "PSY", [ "Fighter", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
+    [ "Chopper Mask, the Hero Who Protects the World", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
+    [ "Sanji, Kamabakka Queendom Fugitive", "DEX", [ "Powerhouse", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
+    [ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
+    [ "Brook, Harahetternia's Demon Lord", "QCK", [ "Free Spirit", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
+    [ "Brook, BONE to be Wild!!!", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
+    [ "Nico Robin, Bride of Ohara", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
+    [ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Cerebral", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
+    [ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
+    [ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 1 ],
+    [ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
+    [ "Sweet Pea", "STR", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
+    [ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter", "Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
+    [ "Empress in Love Hancock, Wedding", "INT", [ "Shooter", "Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
+    [ "South Blue's Captain Kid", "STR", [ "Striker", "Driven" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
+    [ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
+    [ "Chief Guard Sadie-chan", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
+    [ "Chief Guard Sadie-chan, Commander of the Jailer Beasts", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
+    [ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Driven" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
+    [ "Hannyabal", "DEX", ["Driven", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
+    [ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Driven", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
+    [ "Saldeath", "INT", [ "Striker", "Cerebral" ], 3, 15, 4, 2, 70, 1066998, 34, 25, 34, 1095, 501, 274, 1],
+    [ "Blugori", "DEX", [ "Powerhouse", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
+    [ "Pica", "PSY", [ "Powerhouse","Driven" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
+    [ "Pica, Donquixote Pirates", "PSY", [ "Powerhouse", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
+    [ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 1066998, 572, 268, 102, 1841, 797, 229, 1],
+    [ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
+    [ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
+    [ "Monkey D. Luffy, Crew's Promise: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
+    [ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
+    [ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
+    [ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
+    [ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
+    [ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
+    [ "Cyborg Franky, Sacred Beast of Baldimore", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
+    [ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Driven" ], 4, 13, 4, 2, 50, 392109, 59, 34, 47, 814, 392, 223, 1],
+    [ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Driven" ], 5, 20, 5, 3, 99, 3000000, 740, 333, 172, 1787, 787, 390, 1],
+    [ "Rakuyo, Whitebeard 7th Div. Commander", "INT", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 58, 27, 33, 2077, 1055, 218, 1],
+    [ "Fossa, Whitebeard 15th Div. Commander", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 6, 3, 99, 3000000, 48, 35, 20, 1910, 1231, 187, 1],
+    [ "Curiel, Whitebeard 10th Div. Commander", "STR", [ "Shooter", "Powerhouse" ], 4, 25, 5, 3, 99, 3000000, 33, 39, 30, 1706, 1251, 212, 1],
+    [ "Thatch, Whitebeard 4th Div. Commander", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 5, 3, 99, 3000000, 80, 37, 37, 1995, 1088, 227, 1],
+    [ "Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 4, 25, 5, 2, 70, 1066998, 606, 313, 54, 1496, 744, 152, 1],
+    [ "Fire Fist Ace, Whitebeard 2nd Div. Commander", "PSY", [ "Free Spirit", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1431, 690, 110, 2599, 1271, 271, 1],
+    [ "Ben Beckman", "DEX", [ "Striker", "Shooter" ], 3, 13, 6, 1, 35, 136167, 131, 98, 25, 935, 375, 163, 1],
+    [ "Ben Beckman, Red Hair Pirates", "DEX", [ "Striker", "Shooter" ], 4, 20, 4, 2, 70, 1778330, 867, 329, 122, 1403, 800, 229, 1],
+    [ "Gyaro", "QCK", [ "Slasher", "Powerhouse" ], 3, 7, 6, 2, 50, 392109, 950, 427, 36, 1420, 627, 98, 1],
+    [ "Macro", "PSY", [ "Shooter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 972, 390, 44, 1447, 591, 110, 1],
+    [ "Tansui", "INT", [ "Fighter", "Powerhouse" ], 3, 7, 4, 2, 50, 392109, 933, 468, 31, 1368, 701, 84, 1],
+    [ "Quick-Draw Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 72, 57, 59, 743, 556, 265, 1],
+    [ "Scheming Gunman, Black Bodyguard", "INT", "Shooter", 3, 11, 6, 1, 60, 1123790, 64, 64, 57, 709, 597, 257, 1],
+    [ "Technical Gunman, Green Bodyguard", "DEX", "Shooter", 3, 11, 6, 1, 60, 1123790, 80, 69, 51, 785, 640, 230, 1],
+    [ "Quick-Strike Gunman, Blue Bodyguard", "QCK", "Shooter", 3, 11, 6, 1, 60, 1123790, 84, 66, 52, 805, 612, 236, 1],
+    [ "Strong-Arm Gunman, Red Bodyguard", "STR", "Shooter", 3, 11, 6, 1, 60, 1123790, 82, 80, 44, 821, 700, 204, 1],
+    [ "Bold Gunman, Yellow Bodyguard", "PSY", "Shooter", 3, 11, 6, 1, 60, 1123790, 89, 73, 46, 855, 656, 213, 1],
+    [ "Saint Charlos", "STR", "Shooter", 6, 99, 7, 0, 99, 1000000, 5, 320, -500, 25, 554, -400, 1],
+    [ "Saint Roswald", "DEX", "Shooter", 6, 99, 7, 0, 99, 1000000, 6, 334, -600, 30, 601, -500, 1],
+    [ "Saint Shalria", "QCK", "Shooter", 6, 99, 7, 0, 99, 1000000, 4, 293, -400, 20, 503, -300, 1],
+    [ "Eustass Kid, Supernova", "QCK", [ "Driven", "Striker" ], 4, 20, 5, 3, 99, 3000000, 462, 299, 19, 2301, 1205, 128, 1],
+    [ "Trafalgar Law, Supernova", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 440, 244, 41, 2035, 1013, 243, 1],
+    [ "Pacifista PX-1", "DEX", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+    [ "Pacifista PX-2", "PSY", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+    [ "Pacifista PX-3", "QCK", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+    [ "Pacifista PX-4", "STR", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+    [ "Pacifista PX-5", "INT", [ "Shooter", "Powerhouse" ], 4, 40, 4, 0, 70, 1422664, 2000, 1000, -100, 2009, 1016, 1, 1],
+    [ "Sentomaru", "PSY", [ "Fighter", "Powerhouse" ], 3, 12, 5, 1, 50, 392109, 105, 38, 10, 1202, 557, 137, 1],
+    [ "Sentomaru, Marine Science Unit Commander", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1125, 497, 92, 2209, 1000, 214, 1],
+    [ "Smoker, Wild Lone Wolf", "DEX", ["Striker", "Driven"], 4, 10, 6, 3, 35, 90778, 210, 86, 100, 610, 286, 273, 1],
+    [ "Smoker, Solitary Lone Wolf", "DEX", ["Striker", "Driven"], 5, 18, 4, 3, 70, 1066998, 556, 240, 241, 1128, 556, 379, 1],
+    [ "Kizaru", "QCK", ["Shooter", "Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
+    [ "Kizaru, Light Human", "QCK", ["Shooter", "Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
+    [ "Izo Whitebeard 16th Div. Commander", "PSY", ["Shooter", "Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
+    [ "Blamenco Whitebeard 6th Div. Commander", "DEX", ["Striker", "Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
+    [ "Namule Whitebeard 8th Div. Commander", "PSY", ["Fighter", "Powerhouse"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
     [ "Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
     [ "Flower Sword Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],
     [ "Paulie Galley-La Company Dock One Foreman","PSY",["Striker","Powerhouse"], 4, 30, 6, 2, 99, 3000000, 321, 132, 30, 2404, 1024, 243, 1 ],
@@ -1000,28 +1000,28 @@ window.units = [
     [ "Diamante, Donquixote Pirates","STR",["Driven","Striker"], 5, 30, 5, 4, 99, 4000000, 1443, 812, 50, 2840, 1421, 174, 1 ],
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
-	[ "Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
-	[ "Martial Artist Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
-	[ "Sachi and Penguin, Heart Pirates", "QCK", ["Fighter", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
-	[ "Jean Bart", "STR", ["Powerhouse", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
-	[ "Jean Bart, Heart Pirates", "STR", ["Powerhouse", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
+    [ "Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
+    [ "Martial Artist Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
+    [ "Sachi and Penguin, Heart Pirates", "QCK", ["Fighter", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
+    [ "Jean Bart", "STR", ["Powerhouse", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
+    [ "Jean Bart, Heart Pirates", "STR", ["Powerhouse", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, 392109, 67, 37, 55, 884, 428, 204, 1],
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, 3000000, 831, 366, 162, 1660, 869, 384, 1],
-	[ "Kizuna BOOST Luffy", "STR", ["Fighter","Powerhouse"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
+    [ "Kizuna BOOST Luffy", "STR", ["Fighter","Powerhouse"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
     [ "Count Butler", "INT", ["Driven","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
     [ "Count Butler (Ruling Power)", "INT", ["Driven","Powerhouse"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
     [ "President Heaby", "QCK", ["Slasher","Driven"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
     [ "General Hotdog", "DEX", ["Fighter","Driven"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Powerhouse"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
-	[ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
-	[ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
-	[ "Brownbeard", "PSY", ["Slasher","Driven"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
-	[ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Powerhouse"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
-	[ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
+    [ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
+    [ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
+    [ "Brownbeard", "PSY", ["Slasher","Driven"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
+    [ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Powerhouse"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
+    [ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
     [ "Sugar Cherry Tree", "INT", ["Shooter","Cerebral"], 4, 13, 7, 2, 50, 392109, 41, 24, 64, 799, 355, 249, 1],
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, 3000000, 731, 300, 198, 1621, 717, 442, 1],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
-	[ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 98, 41, 1773, 1310, 221, 1.5 ],
+    [ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 98, 41, 1773, 1310, 221, 1.5 ],
     [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
     [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
@@ -1113,13 +1113,13 @@ window.units = [
     [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 921, 468, 119, 1789, 941, 346, 1 ],
     [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 2, 50, 392109, 67, 55, 49, 524, 506, 300, 1 ],
     [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
-	[ "Monkey D. Luffy, Loyal Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
-	[ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
-	[ "Sanji, Loyal Straw Hat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
-	[ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
-	[ "Nami, Loyal Straw Hat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
+    [ "Monkey D. Luffy, Loyal Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
+    [ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
+    [ "Sanji, Loyal Straw Hat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
+    [ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
+    [ "Nami, Loyal Straw Hat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
     [ "Monkey D. Luffy, Wakes of the Endless Dream, Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
-	[ "Monkey D. Luffy, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
+    [ "Monkey D. Luffy, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
     [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, 1066998, 504, 277, 148, 1603, 808, 287, 1 ],
     [ "Cavendish of Hakuba", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, 5000000, 1541, 749, 231, 2970, 1460, 438, 1 ],
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 102, 151, 34, 981, 780, 201, 1 ],
@@ -1132,18 +1132,18 @@ window.units = [
     [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1070, 724, 131, 2152, 1400, 303, 1 ],
     [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 151, 120, 29, 1230, 679, 180, 1 ],
     [ "Destruction Cannon Ideo", "QCK", [ "Shooter", "Fighter" ], 5, 30, 5, 4, 99, 4000000, 1171, 603, 123, 2404, 1318, 294, 1 ],
-	[ "Tashigi, Brash Kendo Girl", "INT", [ "Striker", "Cerebral" ], 4, 10, 6, 3, 35, 90778, 91, 25, 56, 600, 232, 291, 1 ],
+    [ "Tashigi, Brash Kendo Girl", "INT", [ "Striker", "Cerebral" ], 4, 10, 6, 3, 35, 90778, 91, 25, 56, 600, 232, 291, 1 ],
     [ "Tashigi, Dream Kendo Girl", "INT", [ "Striker", "Cerebral" ], 5, 18, 4, 3, 70, 1066998, 523, 177, 252, 1088, 483, 418, 1 ],
-	[ "Fukuro, Secret Intelligence Agency CP9", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 8, 2, 99, 2000000, 73, 32, 38, 1462, 730, 342, 1 ],
-	[ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
-	[ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
-	[ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
-	[ "Gecko Moria, Lord of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, 1066998, 689, 223, 31, 1505, 700, 112, 1 ],
-	[ "Gecko Moria, Ruler of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, 1 ],
-	[ "Foxy, Nuisance of Donut Race", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, 392109, 165, 94, 44, 949, 503, 162, 1 ],
-	[ "Foxy, Cowardly Fighter", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 867, 424, 120, 1877, 942, 313, 1 ],
-	[ "Porche, Flower Cheerleader", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, 136167, 129, 62, 40, 658, 372, 170, 1 ],
-	[ "Porche, Cutie Baton", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, 1066998, 591, 314, 121, 1103, 656, 330, 1 ],
+    [ "Fukuro, Secret Intelligence Agency CP9", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 8, 2, 99, 2000000, 73, 32, 38, 1462, 730, 342, 1 ],
+    [ "Jabra, Secret Intelligence Agency CP9", "STR", [ "Powerhouse", "Free Spirit" ], 4, 25, 6, 3, 99, 3000000, 76, 59, 29, 1992, 1210, 210, 1 ],
+    [ "Blueno, Secret Intelligence Agency CP9", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 4, 2, 99, 2000000, 99, 30, 19, 2330, 712, 193, 1 ],
+    [ "Kumadori, Secret Intelligence Agency CP9", "DEX", [ "Powerhouse", "Striker" ], 4, 20, 4, 2, 99, 2000000, 84, 35, 32, 1707, 803, 277, 1 ],
+    [ "Gecko Moria, Lord of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 4, 25, 4, 2, 70, 1066998, 689, 223, 31, 1505, 700, 112, 1 ],
+    [ "Gecko Moria, Ruler of Florian Triangle", "DEX", [ "Slasher", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1419, 629, 79, 3023, 1211, 229, 1 ],
+    [ "Foxy, Nuisance of Donut Race", "STR", [ "Free Spirit", "Fighter" ], 3, 16, 5, 2, 50, 392109, 165, 94, 44, 949, 503, 162, 1 ],
+    [ "Foxy, Cowardly Fighter", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 867, 424, 120, 1877, 942, 313, 1 ],
+    [ "Porche, Flower Cheerleader", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, 136167, 129, 62, 40, 658, 372, 170, 1 ],
+    [ "Porche, Cutie Baton", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, 1066998, 591, 314, 121, 1103, 656, 330, 1 ],
     [ "Suppresion Uniformed Jailer", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 40, 21, 30, 858, 663, 242, 1 ],
     [ "Urgent Uniformed Jailer", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 52, 20, 31, 894, 640, 246, 1 ],
     [ "Siege Uniformed Jailer", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 54, 19, 31, 877, 651, 244, 1 ],
@@ -1206,11 +1206,11 @@ window.units = [
     [ "Rumbar Pirates Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
     [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ],
     [ "Nico Robin, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
-	[ "Nico Robin, Loyal Straw Hat Crew", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
+    [ "Nico Robin, Loyal Straw Hat Crew", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
     [ "Usopp, Dream-Pursuing Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
-	[ "Usopp, Loyal Straw Hat Crew", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
-	[ "Franky, Dream-Pursuing Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
-	[ "Franky, Loyal Straw Hat Crew", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
+    [ "Usopp, Loyal Straw Hat Crew", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
+    [ "Franky, Dream-Pursuing Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
+    [ "Franky, Loyal Straw Hat Crew", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
     [ "Baby 5, Dolphin Floatie", "STR", [ "Slasher", "Striker" ], 4, 13, 4, 2, 50, 392109, 101, 103, 34, 910, 563, 177, 1 ],
     [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, 1 ],
     [ "Gairam, World Pirates", "DEX", [ "Shooter", "Striker" ], 4, 20, 6, 2, 99, 3000000, 85, 35, 15, 1735, 1135, 175, 1 ],
@@ -1219,7 +1219,7 @@ window.units = [
     [ "Boa Hancock, Amazon Lily Princess", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 72, 42, 22, 1692, 1202, 262, 1 ],
     [ "Byrnndi World", "INT", [ "Shooter", "Driven" ], 4, 25, 4, 2, 70, 1066998, 472, 331, 19, 1093, 809, 97, 1 ],
     [ "Byrnndi World, Captain of the World Pirates", "INT", [ "Shooter", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1011, 744, 52, 1990, 1483, 170, 1 ],
-	[ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, 392109, 266, 119, 9, 1306, 548, 47, 1 ],
+    [ "Oars Jr.", "STR", [ "Slasher", "Powerhouse" ], 4, 16, 6, 2, 50, 392109, 266, 119, 9, 1306, 548, 47, 1 ],
     [ "Oars Jr. of the Whitebeard Pirates", "STR", [ "Slasher", "Powerhouse" ], 5, 26, 4, 3, 99, 3000000, 1241, 482, 31, 2802, 1171, 90, 1 ],
     [ "Bastille", "INT", [ "Slasher", "Driven" ], 3, 15, 4, 2, 70, 1066998, 265, 169, 1, 1725, 1102, 9, 1 ],
     [ "Yamakaji", "STR", [ "Slasher", "Driven" ], 3, 15, 5, 2, 70, 1066998, 340, 128, 24, 1978, 800, 99, 1 ],
@@ -1293,8 +1293,8 @@ window.units = [
     [ "Lao G, Diamante Military Leader", "DEX", [ "Driven", "Fighter" ], 5, 40, 4, 3, 99, null, 970, 700, 107, null, null, null, null ],
     [ "Boa Sandersonia, Coliseum", "PSY", "Fighter", 4, 16, 4, 2, 50, 392109, null, null, null, 693, 393, 193, null ],
     [ "Boa Sandersonia, Coliseum Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 26, null, 3, 99, null, null, null, null, null, null, null, null ],
-	];
-	
+    ];
+    
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
 // [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index f56935e34..d09a9ce28 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -211,22 +211,22 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
-	949: { //Fortnight Thatch
-		type: 'healer',
+    949: { //Fortnight Thatch
+        type: 'healer',
         multiplier: 2
-	},
-	965: {//Saint Charloss
-		type: 'healer',
-		amount: 500 
-	},
-	1008: {//Sakura Monet
-		type: 'healer',
+    },
+    965: {//Saint Charloss
+        type: 'healer',
+        amount: 500 
+    },
+    1008: {//Sakura Monet
+        type: 'healer',
         multiplier: 3
-	},
-	1014: {//Tony Tony Chopper, Animal King
-		type: 'healer',
+    },
+    1014: {//Tony Tony Chopper, Animal King
+        type: 'healer',
         multiplier: 2
-	},
+    },
     1052: {//Kid Robin
         type: 'healer',
         amount: 1000
@@ -243,14 +243,14 @@ window.zombies = {
         type: 'healer',
         multiplier: 3
     },
-	1195: {//Colo Ganfor
-		type: 'healer',
+    1195: {//Colo Ganfor
+        type: 'healer',
         multiplier: 2
-	},
-	1196: {//Colo Ganfor
-		type: 'healer',
+    },
+    1196: {//Colo Ganfor
+        type: 'healer',
         multiplier: 5
-	},
+    },
     1241: {//Fortnight Koala
         type: 'healer',
         multiplier: 1

From ea0127e9b0453bf570915505ffd1de0438378190 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 14 Oct 2016 04:36:53 -0500
Subject: [PATCH 0616/1569] Akainu Raid Added

---
 common/data/aliases.js    | 12 +++++--
 common/data/captains.js   | 71 ++++++++++++++++++++++++++++++++++++---
 common/data/cooldowns.js  |  4 +++
 common/data/details.js    | 32 +++++++++++++++---
 common/data/drops.js      | 18 ++++++++--
 common/data/evolutions.js | 10 +++++-
 common/data/flags.js      |  2 ++
 common/data/specials.js   | 14 ++++++++
 common/data/units.js      | 18 ++++++----
 index.html                |  4 +--
 10 files changed, 163 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 3852aa05c..90e24b969 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1022,8 +1022,8 @@ window.aliases = {
     1021: ['？？？','','Sakura Sugar'],
     1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
     1023: ['？？？',''],
-    1024: ['首領・チンジャオ',''],
-    1025: ['首領・チンジャオ 花ノ国のギャング',''],
+    1024: ['首領・チンジャオ','Don Chinjao'],
+    1025: ['首領・チンジャオ 花ノ国のギャング','Don Chinjao'],
     1026: ['ブルーギリー',''],
     1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）',''],
     1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ',''],
@@ -1289,4 +1289,12 @@ window.aliases = {
     1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law'],
     1289: ['トラファルガー・ロー ドンキホーテファミリーの一員','','Kid Trafalgar Law'],
     1290: ['バッファロー ドンキホーテファミリーの一員','','Kid Buffalo'],
+    1291: ['ラオＧ 地翁拳の使い手','','Coliseum'],
+    1292: ['ラオＧ ディアマンテ軍幹部','','Coliseum'],
+    1293: ['ボア・サンダーソニア 九蛇の戦士','','Coliseum'],
+    1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女','','Coliseum'],
+    1295: ['','',''],
+    1296: ['','',''],
+    1297: ['赤犬','','Raid Sakazuki'],
+    1298: ['赤犬 マグマ人間','','Raid Sakazuki'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ac99983e6..0545ec6b3 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3299,10 +3299,10 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
     },
     1265: {
-        atk: function(p) { return p.unit.class.has("Shooters") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1266: {
-        atk: function(p) { return p.unit.class.has("Shooters") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
     },
     1267: {
         atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
@@ -3329,10 +3329,10 @@ window.captains = {
                },
     },
     1271: {
-        atk: function(p) { return p.unit.class.has("Shooters") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1272: {
-        atk: function(p) { return p.unit.class.has("Shooters") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
     },
     1273: {
         atk: function(p) {
@@ -3405,4 +3405,67 @@ window.captains = {
         },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
     },
+    1286: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+    },
+    1287: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+    },
+    1288: {
+        atk: function(p) {
+            return p.unit.class.has("Driven") ? Math.max(1.0, 2.5 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1289: {
+        atk: function(p) {
+            return p.unit.class.has("Driven") ? Math.max(1.0, 2.75 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1291: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+    },
+    1292: {
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 2.5 : 2); },
+    },
+    1293: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+    },
+    1294: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    
+    1297: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'STR', 'STR']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1298: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'STR', 'STR']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7b689d467..3be8ca5e8 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1293,4 +1293,8 @@ window.cooldowns = [
     29,
     null,//Coliseumn Sandersonia
     null,//Coliseumn Sandersonia
+    [ 16, 16 ],
+    [ 16, 16 ],
+    [ 32, 16 ],
+    [ 32, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 80f58b9ce..8d6ee683a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6288,7 +6288,7 @@ window.details = {
     1233: {//Tashigi
         captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.25x ATK",
-        special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
+        special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
         specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
@@ -6296,7 +6296,7 @@ window.details = {
     1234: {//Tashigi
         captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.56x ATK",
-        special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the 'Color Affinity' of Slasher and Cerebral character's regular attacks by 1.5x for 2 turns",
+        special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
         specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
@@ -6526,13 +6526,13 @@ window.details = {
     },
     1261: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.5x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
-        special: "Randomizes all orbs. Boosts the 'Color Affinity' of Free Spirit and Shooter character's regular attacks by 1.5x for 1 turn",
+        special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
         specialName: "Blood and Gunpowder of the Underground Family",
     },
     1262: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.75x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
-        special: "Randomizes all orbs. Boosts the 'Color Affinity' of Free Spirit and Shooter character's regular attacks by 1.5x for 1 turn",
+        special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
         specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
         specialName: "Blood and Gunpowder of the Underground Family",
     },
@@ -6727,7 +6727,7 @@ window.details = {
         specialName: "Coliseum Sandersonia Special",
     },
     1294: {//Coliseum Sandersonia
-        captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
+        captain: "Boosts ATK of Fighter characters by 2x, deals 4 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
@@ -6741,5 +6741,27 @@ window.details = {
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
         specialName: "Coliseum Sandersonia Special",
     },
+    1295: {//Halloween Kalifa
+        captain: "Boosts ATK and RCV of [STR] characters by 1.5x",
+        special: "Reduces duration of Paralysis by 3 turns, removes poison, and reduces the defense of all enemies by 100% for 1 turn",
+        specialName: "Halloween Kalifa Special",
+    },
+    1296: {//Halloween Kalifa
+        captain: "Boosts ATK of [STR] characters by 2x and their RCV by 1.5x",
+        special: "Reduces duration of Paralysis by 3 turns, removes poison, and reduces the defense of all enemies by 100% for 1 turn",
+        specialName: "Halloween Kalifa Special",
+    },
+    1297: {
+        captain: "Boosts ATK by 2.5x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
+        special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
+        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialName: "Great Eruption",
+    },
+    1298: {
+        captain: "Boosts ATK by 3x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
+        special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
+        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialName: "Great Eruption",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 76c69e64f..8f39701b6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1120,7 +1120,8 @@ window.drops = {
         {
             name: "Pirate Ship Competition! \"Dead End\" Opens!",
             thumb: 1072,
-            condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
+            //OLD condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
+            condition: "STR/DEX/QCK units get their ATK boosted by 1.6x. INT/PSY units get their HP boosted by 2.0x",
             "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888, -1070]
         },
         
@@ -1358,10 +1359,16 @@ window.drops = {
         
         {
             name: 'Clash!! Tesoro',
-            thumb: 1162, //Change to evolved Tereso once he arrives
+            thumb: 1163, 
             Master: [ 1162, 1164 ],
             Ultimate: [ 1162, 1164, 1180 ]
         },
+        
+        {
+            name: 'Clash!! Akainu',
+            thumb: 1298,
+            Ultimate: [ 1297 ]
+        },
 
     ],
 
@@ -1425,6 +1432,13 @@ window.drops = {
             challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -367, -649, -718, -870, -1001 ]
         },
+        
+        {
+            name: 'Young Whitebeard Event',
+            thumb: 1258,
+            challenge: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
+            "All Difficulties": [ 1257 ]
+        },
 
    ]
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a9c5788ac..34b23c334 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1957,10 +1957,18 @@ window.evolutions = {
     },
     1291: {
         evolution: 1292,
-        evolvers: [  ]
+        evolvers: [ 118, 94, 97, 302, 102 ]
     },
     1293: {
         evolution: 1294,
+        evolvers: [ 117, 80, 81, 86, 87 ]
+    },
+    1295: {
+        evolution: 1296,
         evolvers: [  ]
     },
+    1297: {
+        evolution: 1298,
+        evolvers: [ 118, 94, 300, 300, 100 ]
+    },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 71418027d..25c474ffe 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1055,4 +1055,6 @@ window.flags = {
     1276: { rr: 1, rro: 1 },
     1277: { rr: 1, rro: 1 },
     1278: { rr: 1, rro: 1 },
+    1295: { rr: 1, rro: 1, lrr: 1 },
+    1296: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index b95708176..aa6b5969e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1716,4 +1716,18 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
         type: "class"
     },
+    1286: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        type: "class"
+    },
+    1287: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        type: "class"
+    },
+    1297: {
+        affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
+    },
+    1298: {
+        affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index c2e17b9eb..1cb705a33 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1022,8 +1022,8 @@ window.units = [
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, 3000000, 731, 300, 198, 1621, 717, 442, 1],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
     [ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 98, 41, 1773, 1310, 221, 1.5 ],
-    [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
-    [ "Don Chinjao, Flower Country Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
+    [ "Don Chin Jao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
+    [ "Don Chin Jao, Kano Kingdom Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
     [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 4000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
     [ "Funk Brothers", "DEX", [ "Fighter","Driven" ], 4, 18, 5, 3, 70, 1066998, 60, 172, 44, 937, 824, 109, 1 ],
@@ -1289,10 +1289,16 @@ window.units = [
     [ "Trafalgar Law, Boy of Spider Miles", "DEX", [ "Driven", "Slasher" ], 3, 9, 6, 1, 50, 392109, 28, 64, 14, 368, 493, 90, 1 ],
     [ "Trafalgar Law, Member of Donquixote Family", "DEX", [ "Driven", "Shooter" ], 4, 15, 4, 3, 99, 3000000, 312, 420, 51, 892, 890, 242, 1 ],
     [ "Buffalo, Member of Donquixote Family", "INT", [ "Shooter", "Free Spirit" ], 3, 13, 4, 2, 99, 3000000, 69, 22, 30, 1306, 470, 249, 1 ],
-    [ "Lao G", "DEX", [ "Driven", "Fighter" ], 4, 25, 7, 2, 70, null, 210, 222, 49, null, null, null, null ],
-    [ "Lao G, Diamante Military Leader", "DEX", [ "Driven", "Fighter" ], 5, 40, 4, 3, 99, null, 970, 700, 107, null, null, null, null ],
-    [ "Boa Sandersonia, Coliseum", "PSY", "Fighter", 4, 16, 4, 2, 50, 392109, null, null, null, 693, 393, 193, null ],
-    [ "Boa Sandersonia, Coliseum Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 26, null, 3, 99, null, null, null, null, null, null, null, null ],
+    [ "Lao G, Jio-Ken User", "DEX", [ "Driven", "Fighter" ], 4, 25, 7, 2, 70, 1066998, 210, 222, 49, 1070, 777, 147, 1 ],
+    [ "Lao G, Diamante Military Leader", "DEX", [ "Driven", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 970, 700, 107, 2070, 1357, 270, 1 ],
+    [ "Boa Sandersonia, Kuja Warrior", "PSY", "Fighter", 3, 16, 4, 2, 50, 392109, 93, 39, 39, 693, 393, 193, 1 ],
+    [ "Boa Sandersonia, Three Gorgon Sisters, Second Daughter", "PSY", [ "Powerhouse", "Striker" ], 4, 26, 4, 3, 99, 3000000, 693, 393, 139, 1839, 993, 329, 1 ],
+    [ "Halloween Kalifa", "STR", [ "Fighter", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 96, 83, 44, 836, 422, 277, null ],
+    [ "Halloween Kalifa Evolved", "STR", [ "Fighter", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 759, 351, 229, 1655, 839, 464, null ],
+    [ "Akainu", "STR", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 286, 216, 0, 1618, 816, 49, 1 ],
+    [ "Akainu, Magma Man", "STR", [ "Driven", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1518, 716, 44, 3168, 1444, 99, 1 ],
+    [ "Halloween Rebecca", "INT", "Fighter", 4, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Halloween Rebecca Evolved", "INT", "Fighter", 5, null, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 1bf79da30..103a7d2e0 100644
--- a/index.html
+++ b/index.html
@@ -67,8 +67,8 @@
             <p>5/10/2016</p>
             <br>
             <ul>
-                <li>Turtle Time Calculator removed, original</li>
-                <li>website is back up!</li>
+                <li>Akainu Raid Boss is Up!</li>
+                <li>Android App under development</li>
                 <br>
                 <li>Added Tashigi/Young Senior Pink Specials</li>
                 <li>Go and try your OP teams</li>

From 2d8020c3d87904d19bb0c5fb7626152e9494458d Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 14 Oct 2016 04:48:22 -0500
Subject: [PATCH 0617/1569] Cooldown fix

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3be8ca5e8..3d270a25a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1295,6 +1295,6 @@ window.cooldowns = [
     null,//Coliseumn Sandersonia
     [ 16, 16 ],
     [ 16, 16 ],
-    [ 32, 16 ],
-    [ 32, 16 ],
+    [ 32, 17 ],
+    [ 32, 17 ],
 ];

From 4bdd2a06f1a0ea4e17fe92a787f86b722202b422 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 15 Oct 2016 23:38:23 +0200
Subject: [PATCH 0618/1569] Color Affinity matcher and Notes

---
 common/data/details.js  | 12 ++++++------
 common/data/matchers.js |  6 ++++++
 common/js/directives.js |  3 ++-
 index.html              |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8d6ee683a..d0615e94e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6289,7 +6289,7 @@ window.details = {
         captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.25x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
-        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
     },
@@ -6297,7 +6297,7 @@ window.details = {
         captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.56x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
-        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
         sailor: "Boosts RCV of Slasher characters by 30",
     },
@@ -6527,13 +6527,13 @@ window.details = {
     1261: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.5x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
-        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Blood and Gunpowder of the Underground Family",
     },
     1262: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.75x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
-        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Blood and Gunpowder of the Underground Family",
     },
     1263: {//Young Vergo
@@ -6754,13 +6754,13 @@ window.details = {
     1297: {
         captain: "Boosts ATK by 2.5x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
-        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption",
     },
     1298: {
         captain: "Boosts ATK by 3x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
-        specialNotes: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With Color Affinity boost, it will deal 3x to DEX and .25x to QCK. ",
+        specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption",
     },
 };
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 21d11c6cc..76b27afed 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -174,6 +174,12 @@ window.matchers = [
         matcher: /(Following the activation.+boosts.+ATK|If during that turn.+boosts.+ATK)/i
     },
     
+    {
+        name: 'Color Affinity boosters',
+        target: 'special',
+        matcher: /Boosts the Color Affinity/i
+    },
+    
     {
         name: 'RCV boosters',
         target: 'special',
diff --git a/common/js/directives.js b/common/js/directives.js
index 5c59fe7a5..e2f214a17 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -18,7 +18,8 @@ var notes = {
         "crew's remaining HP and is higher the #1 the HP is. The multiplier is calculated as: #2.",
     stages: "The special can be used as soon as the first stage is reached.",
     zombie: "The protection only works when attacked by one single enemy and will leave the team with at least 1 HP; " +
-        "the effect will not work when attacked by multiples enemies at once."
+        "the effect will not work when attacked by multiples enemies at once.",
+    colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5*(#1-1))x to QCK."
 };
 
 /***********
diff --git a/index.html b/index.html
index 103a7d2e0..1e02f4f91 100644
--- a/index.html
+++ b/index.html
@@ -64,14 +64,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>5/10/2016</p>
+            <p>15/10/2016</p>
             <br>
             <ul>
                 <li>Akainu Raid Boss is Up!</li>
                 <li>Android App under development</li>
                 <br>
                 <li>Added Tashigi/Young Senior Pink Specials</li>
-                <li>Go and try your OP teams</li>
+                <li>Added a Filter for them as well</li>
                 <br>
                 <li>Kimono Marco and New Coliseum Units Added</li>
                 <br>

From edeef341afddb545461d3afcfc5a9c67186ef464 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sun, 16 Oct 2016 12:05:25 +0200
Subject: [PATCH 0619/1569] Fixed Saga Special

---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index aa6b5969e..501851031 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1351,11 +1351,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
     },
     1088: {
-        atk: function(p) { return p.unit.class.has("Slasher" || p.unit.class.has("Driven")) ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
         type: "class"
     },
     1089: {
-        atk: function(p) { return p.unit.class.has("Slasher" || p.unit.class.has("Driven")) ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
         type: "class"
     },
     1096: {

From 76f77a679a4ab33b8abe96b990dc0249bc6af776 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 18 Oct 2016 01:57:37 -0500
Subject: [PATCH 0620/1569] Halloween Ready

max stats needed
---
 common/data/aliases.js    |  6 ++++++
 common/data/captains.js   | 25 +++++++++++++++++++++++++
 common/data/cooldowns.js  | 34 ++++++++++++++++++++--------------
 common/data/details.js    | 37 ++++++++++++++++++++++++++++++++++---
 common/data/drops.js      | 14 ++++++++++++++
 common/data/evolutions.js | 12 ++++++++++++
 common/data/families.js   | 10 ++++++++++
 common/data/gw.js         |  7 +++++++
 common/data/specials.js   | 12 ++++++++++++
 common/data/units.js      |  8 ++++++--
 index.html                |  6 +++---
 11 files changed, 149 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 90e24b969..1aaea3cd8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1297,4 +1297,10 @@ window.aliases = {
     1296: ['','',''],
     1297: ['赤犬','','Raid Sakazuki'],
     1298: ['赤犬 マグマ人間','','Raid Sakazuki'],
+    1299: ['','',''],
+    1300: ['','',''],
+    1301: ['','',''],
+    1302: ['','',''],
+    1303: ['','',''],
+    1304: ['','',''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 0545ec6b3..c5f3a08bc 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3468,4 +3468,29 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1299: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+    },
+    1300: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
+    1301: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+    },
+    1302: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.625 :
+                p.unit.class.has("Slasher") && !p.unit.class.has("Driven") ? 1.75 : 
+                !p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.5 :
+                1;
+        },
+    },
+    1303: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+    },
+    1304: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3d270a25a..70d9d9dc0 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1185,8 +1185,8 @@ window.cooldowns = [
     [ 23, 17 ],
     null,// Haruta
     null,// Haruta
-    23,
-    23,
+    [ 23, 16 ],
+    [ 23, 16 ],
     [ 11, 5 ],
     [ 11, 5 ],
     [ 19, 13 ],
@@ -1265,18 +1265,18 @@ window.cooldowns = [
     [ 13, 11 ],
     [ 14, 14 ],
     [ 14, 14 ],
+    [ 25, 19 ],
+    [ 25, 19 ],
+    [ 14, 8 ],
+    [ 14, 8 ],
+    [ 19, 15 ],
+    [ 19, 15 ],
     25,
     25,
-    14,
-    14,
-    19,
-    19,
-    25,
-    25,
-    25,
-    25,
-    10,
-    10,
+    [ 25, 19 ],
+    [ 25, 19 ],
+    [ 10, 4 ],
+    [ 10, 4 ],
     14,
     21,
     25,
@@ -1289,12 +1289,18 @@ window.cooldowns = [
     [ 13, 9 ],
     [ 13, 9 ],
     [ 20, 10 ],
-    29,
-    29,
+    [ 29, 17 ],
+    [ 29, 17 ],
     null,//Coliseumn Sandersonia
     null,//Coliseumn Sandersonia
     [ 16, 16 ],
     [ 16, 16 ],
     [ 32, 17 ],
     [ 32, 17 ],
+    [ 19, 12 ],
+    [ 19, 12 ],
+    20,
+    20,
+    20,
+    20,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index d0615e94e..cc5a1a55c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6727,7 +6727,7 @@ window.details = {
         specialName: "Coliseum Sandersonia Special",
     },
     1294: {//Coliseum Sandersonia
-        captain: "Boosts ATK of Fighter characters by 2x, deals 4 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
+        captain: "Boosts ATK of Powerhouse characters by 2x, deals 4 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
@@ -6751,17 +6751,48 @@ window.details = {
         special: "Reduces duration of Paralysis by 3 turns, removes poison, and reduces the defense of all enemies by 100% for 1 turn",
         specialName: "Halloween Kalifa Special",
     },
-    1297: {
+    1297: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption",
     },
-    1298: {
+    1298: {//Akainu
         captain: "Boosts ATK by 3x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption",
     },
+    1299: {//Halloween Rebecca
+        captain: "Boosts ATK and RCV of [INT] characters by 1.2x",
+        special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
+        specialName: "Halloween Rebecca Special",
+    },
+    1300: {//Halloween Rebecca
+        captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
+        special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
+        specialName: "Halloween Rebecca Special",
+    },
+    1301: {//Jailbreak Buggy
+        captain: "Boosts ATK of Slasher characters by 1.75x",
+        special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
+        specialName: "Jailbreak Buggy Special",
+    },
+    1302: {//Jailbreak Buggy
+        captain: "Boosts ATK of Slasher characters by 1.75x and boosts ATK of Driven characters by 1.5x",
+        captainNotes: "The bonus is cumulative. Slasher Driven characters get a 2.625x bonus.",
+        special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
+        specialName: "Jailbreak Buggy Special",
+    },
+    1303: {//Jailbreak Mr. 3
+        captain: "Boosts ATK of Cerebral characters by 1.5x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
+        special: "Reduces damage received by 60% for 2 turns",
+        specialName: "Jailbreak Mr. 3 Special",
+    },
+    1304: {//Jailbreak Mr. 3
+        captain: "Boosts ATK of Cerebral characters by 2x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
+        special: "Reduces damage received by 60% for 2 turns",
+        specialName: "Jailbreak Mr. 3 Special",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 8f39701b6..fc79fb3f3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1120,6 +1120,7 @@ window.drops = {
         {
             name: "Pirate Ship Competition! \"Dead End\" Opens!",
             thumb: 1072,
+            global: true,
             //OLD condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
             condition: "STR/DEX/QCK units get their ATK boosted by 1.6x. INT/PSY units get their HP boosted by 2.0x",
             "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888, -1070]
@@ -1188,6 +1189,13 @@ window.drops = {
             "All Difficulties": [ 1286, 1288, 1290, -963, -1045, -251, -760, -1083, -1129, -506, -1062, -702 ]
         },
         
+        {
+            name: "Jailbreak Battle! Mr. 3 and Buggy",
+            thumb: 1304,
+            condition: "Shooter and Fighter characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
+            "All Difficulties": [ 1301, 1303, 1152, 1151, 551, 539, -718, -752, -1125, -1133, -15, -203, -733, -1056, -1060 ]
+        },
+        
     ],
 
             
@@ -1398,6 +1406,12 @@ window.drops = {
             "Completion Units": [686]
         },
         
+        {
+            name: 'Halloween Event Characters',
+            thumb: 1300,
+            "All Difficulties": [ 1300 ],
+        },
+        
         {
             name: '2nd Anniversary Celebration! Duel! Ace',
             thumb: 1023,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 34b23c334..33ebc04a5 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1971,4 +1971,16 @@ window.evolutions = {
         evolution: 1298,
         evolvers: [ 118, 94, 300, 300, 100 ]
     },
+    1299: {
+        evolution: 1300,
+        evolvers: [  ]
+    },
+    1301: {
+        evolution: 1302,
+        evolvers: [  ]
+    },
+    1303: {
+        evolution: 1304,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 327596399..27b051e98 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1293,4 +1293,14 @@ window.families = [
     "Lao G",
     "Boa Sandersonia",
     "Boa Sandersonia",
+    "Kalifa",
+    "Kalifa",
+    "Akainu",
+    "Akainu",
+    "Rebecca",
+    "Rebecca",
+    "Buggy",
+    "Buggy",
+    "Galdino",
+    "Galdino",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 29473405d..0331181e2 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1293,4 +1293,11 @@ window.gw=[
     39529,
     39530,
     39530,
+    40554,
+    40554,
+    41278,
+    41278,
+    41926,
+    41926,
+    
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 501851031..78ff57c24 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1548,6 +1548,10 @@ window.specials = {
             });
         }
     },
+    1227: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type"
+    },
     1231: {
         turnedOn: false,
         onActivation: function(p) {
@@ -1730,4 +1734,12 @@ window.specials = {
     1298: {
         affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
     },
+    1299: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
+        type: "class"
+    },
+    1300: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
+        type: "class"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 1cb705a33..185b908b8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1297,8 +1297,12 @@ window.units = [
     [ "Halloween Kalifa Evolved", "STR", [ "Fighter", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 759, 351, 229, 1655, 839, 464, null ],
     [ "Akainu", "STR", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 286, 216, 0, 1618, 816, 49, 1 ],
     [ "Akainu, Magma Man", "STR", [ "Driven", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1518, 716, 44, 3168, 1444, 99, 1 ],
-    [ "Halloween Rebecca", "INT", "Fighter", 4, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Halloween Rebecca Evolved", "INT", "Fighter", 5, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Halloween Rebecca", "INT", "Fighter", 4, 12, 7, 1, 50, 392109, 87, 43, 38, 961, 453, 221, null ],
+    [ "Halloween Rebecca Evolved", "INT", "Fighter", 5, 20, 5, 3, 99, 3000000, 900, 391, 168, 1862, 912, 361, null ],
+    [ "Jailbreak Buggy", "QCK", [ "Slasher", "Driven" ], 3, 12, 4, 1, 50, null, 72, 33, 28, null, null, null, null ],
+    [ "Jailbreak Buggy Evolved", "QCK", [ "Slasher", "Driven" ], 4, 20, 4, 3, 99, null, 852, 371, 130, null, null, null, null ],
+    [ "Jailbreak Mr. 3", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 1, 50, null, 79, 29, 31, null, null, null, null ],
+    [ "Jailbreak Mr. 3 Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, null, 932, 323, 138, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 1e02f4f91..dc608db9f 100644
--- a/index.html
+++ b/index.html
@@ -64,17 +64,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>15/10/2016</p>
+            <p>18/10/2016</p>
             <br>
             <ul>
+                <li>Jailbreak And Halloween Units Added</li>
+                <br>
                 <li>Akainu Raid Boss is Up!</li>
                 <li>Android App under development</li>
                 <br>
                 <li>Added Tashigi/Young Senior Pink Specials</li>
                 <li>Added a Filter for them as well</li>
                 <br>
-                <li>Kimono Marco and New Coliseum Units Added</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>

From c56d7f91abb2a2caeeb7ea99a3bf94129dd36d3f Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 22 Oct 2016 10:24:36 +0200
Subject: [PATCH 0621/1569] Tesoro Map Effects

---
 common/data/effects.js | 19 +++++++++++++++++--
 index.html             |  5 +++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index b0568b892..9c23e3bf3 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 39
+    // last ID used: 41
     // Use p.type instead of p.unit.type here
 
     'Baroque Works (pre-v4.0)': {
@@ -342,7 +342,7 @@ window.effects = {
     
     'Coliseum Tashigi': {
         description: '25 hit barrier and 2x chain limit',
-        thumb: null,
+        thumb: 783,
         id: 38,
         comboShield: 25,
         chainLimiter: function() { return 2.0; }
@@ -378,5 +378,20 @@ window.effects = {
                             return 1*boost1*boost2*boost3*boost4*boost5;
                         }
     },
+    
+    'Gild Tesoro - 40 Stamina': {
+        description: 'Boosts the Orbs of all characters by 1.4x',
+        thumb: 1163,
+        id: 40,
+        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 20/28 : 1); }
+    },
+    
+    'Gild Tesoro - 60 Stamina': {
+        description: 'Boosts the Orbs and ATK of all characters by 1.4x',
+        thumb: 1163,
+        id: 41,
+        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 20/28 : 1); },
+        atk: function(p) { return 1.5; }
+    },
 
 };
\ No newline at end of file
diff --git a/index.html b/index.html
index dc608db9f..c3b559c97 100644
--- a/index.html
+++ b/index.html
@@ -64,13 +64,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>18/10/2016</p>
+            <p>22/10/2016</p>
             <br>
             <ul>
                 <li>Jailbreak And Halloween Units Added</li>
                 <br>
                 <li>Akainu Raid Boss is Up!</li>
-                <li>Android App under development</li>
+                <br>
+                <li>Added Tesoro Map Conditions to the calc</li>
                 <br>
                 <li>Added Tashigi/Young Senior Pink Specials</li>
                 <li>Added a Filter for them as well</li>

From ae036b065bf8b6c1c3be77029c62edfe157d86c5 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 24 Oct 2016 00:31:07 -0500
Subject: [PATCH 0622/1569] Halloween Sugar

---
 common/data/aliases.js    | 24 ++++++++++++++++--------
 common/data/cooldowns.js  | 14 +++++++++++---
 common/data/details.js    | 12 +++++++++++-
 common/data/drops.js      |  8 ++++----
 common/data/evolutions.js | 16 ++++++++++++++--
 common/data/gw.js         |  7 ++++++-
 common/data/ships.js      |  4 ++--
 common/data/units.js      | 22 +++++++++++++++-------
 8 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1aaea3cd8..fa9230652 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1263,8 +1263,8 @@ window.aliases = {
     1262: ['セニョール・ピンク “北の海”の闇','','Senor Pink', 'Young Senior Pink'],
     1263: ['ヴェルゴ “北の海”の海賊','','Young Vergo'],
     1264: ['ヴェルゴ “北の海”の闇','','Young Vergo'],
-    1265: ['','',''],
-    1266: ['','',''],
+    1265: ['エース 黄昏の道草','',''],
+    1266: ['エース 月下の艶肌','',''],
     1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','',''],
     1268: ['黒ひげ 黒ひげ海賊団船長','',''],
     1269: ['ラフィット','',''],
@@ -1297,10 +1297,18 @@ window.aliases = {
     1296: ['','',''],
     1297: ['赤犬','','Raid Sakazuki'],
     1298: ['赤犬 マグマ人間','','Raid Sakazuki'],
-    1299: ['','',''],
-    1300: ['','',''],
-    1301: ['','',''],
-    1302: ['','',''],
-    1303: ['','',''],
-    1304: ['','',''],
+    1299: ['レベッカ　ラブリーモンスターキャット','',''],
+    1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード','',''],
+    1301: ['受刑者　バギー','',''],
+    1302: ['受刑者　道化のバギー 脱獄同盟','',''],
+    1303: ['脱走囚　ギャルディーノ','','Mr 3', 'Mr. 3'],
+    1304: ['脱走囚　ギャルディーノ 脱獄同盟','','Mr 3', 'Mr. 3'],
+    1305: ['','',''],
+    1306: ['','',''],
+    1307: ['','',''],
+    1308: ['','',''],
+    1309: ['','','Coliseum'],
+    1310: ['','','Coliseum'],
+    1311: ['','','Coliseum'],
+    1312: ['','','Coliseum'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 70d9d9dc0..8762c2020 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1092,8 +1092,8 @@ window.cooldowns = [
     [ 25, 12 ],
     [ 13, 13 ],
     [ 13, 13 ],
-    24,
-    24,
+    [ 24, 15 ],
+    [ 24, 15 ],
     [ 20, 11 ],
     [ 20, 11 ],
     [ 13, 8 ],
@@ -1149,7 +1149,7 @@ window.cooldowns = [
     20,
     20,
     15,
-    25,
+    [ 25, 18 ],
     19,
     25,
     21,
@@ -1303,4 +1303,12 @@ window.cooldowns = [
     20,
     20,
     20,
+    [ 12, 5 ],
+    [ 12, 5 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index cc5a1a55c..56547441f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5236,7 +5236,7 @@ window.details = {
         specialName: "Haute Couture: Patchwork"
     },
     1077:{
-        captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their HP by 1.5x",
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x and their RCV by 1.5x",
         special: [
             {
                 "description": "Delays all enemies for 1 turn. Locks all orbs for 1 turn. Cuts the current HP of all enemies by 10%",
@@ -6794,5 +6794,15 @@ window.details = {
         special: "Reduces damage received by 60% for 2 turns",
         specialName: "Jailbreak Mr. 3 Special",
     },
+    1305: {//Halloween Sugar
+        captain:  "Boosts ATK of Cerebral characters by 1.3x and recovers 500 HP at the end of each turn",
+        special: "Changes Badly Matching, [BLOCK], and [BOMB] orbs into [G] orbs. Reduces Special Cooldown of 1 character by 1 turn",
+        specialName: "Aggressive 'Trick-Or-Treat'",
+    },
+    1306: {//Halloween Sugar
+        captain:  "Boosts ATK of Cerebral characters by 1.75x and recovers 1,000 HP at the end of each turn",
+        special: "Changes Badly Matching, [BLOCK], and [BOMB] orbs into [G] orbs. Reduces Special Cooldown of 1 character by 1 turn",
+        specialName: "Aggressive 'Trick-Or-Treat'",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index fc79fb3f3..cb50f8fae 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1409,7 +1409,7 @@ window.drops = {
         {
             name: 'Halloween Event Characters',
             thumb: 1300,
-            "All Difficulties": [ 1300 ],
+            "All Difficulties": [ 1299, 1305 ],
         },
         
         {
@@ -1421,9 +1421,9 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294, 1309, 1311 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 33ebc04a5..83243733d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1973,14 +1973,26 @@ window.evolutions = {
     },
     1299: {
         evolution: 1300,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 82, 88, 104 ]
     },
     1301: {
         evolution: 1302,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 79, 85, 101 ]
     },
     1303: {
         evolution: 1304,
+        evolvers: [ 116, 117, 82, 88, 104 ]
+    },
+    1305: {
+        evolution: 1306,
+        evolvers: [  ]
+    },
+    1309: {
+        evolution: 1310,
+        evolvers: [  ]
+    },
+    1311: {
+        evolution: 1312,
         evolvers: [  ]
     },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index 0331181e2..a4126757a 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1299,5 +1299,10 @@ window.gw=[
     41278,
     41926,
     41926,
-    
+    null,
+    null,
+    null,
+    null,
+    43619,
+    43619,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index 279eae24d..e3399940d 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -240,7 +240,7 @@ window.ships = [
     { // 19
         name: "Doflamingo Ship",
         thumb: null,
-        description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Special: Makes Perfects easier to Hit, Adds 0.2 to Chain  (cooldown: 15 Turns)',
+        description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. Special: Adds 0.2 to Chain  (cooldown: 15 Turns)',
         atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
         hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
     },
@@ -248,7 +248,7 @@ window.ships = [
     { // 20
         name: 'The Rocket Man',
         thumb: null,
-        description: 'Boosts ATK and Powerhouse characters by 1.55x, and heals at the end of every turn for a variable amount depending on the number of Powerhouse characters on the team. (At MAX, heals 900 per turn with 6 Powerhouse characters) Sharply reduces HP of non-Powerhouse units. Special: Deals 99,999 typeless damage to one unit.  (cooldown MAX: 17 Turns)',
+        description: 'Boosts ATK of Powerhouse characters by 1.55x, and heals at the end of every turn for a variable amount depending on the number of Powerhouse characters on the team. (At MAX, heals 900 per turn with 6 Powerhouse characters) Sharply reduces HP of non-Powerhouse units. Special: Deals 99,999 typeless damage to one unit.  (cooldown MAX: 17 Turns)',
         atk: function(p) {
             return !p.unit.class.has('Powerhouse') ? 1 : [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.4, 1.55 ][p.boatLevel - 1];
         },
diff --git a/common/data/units.js b/common/data/units.js
index 185b908b8..59bde520f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1238,7 +1238,7 @@ window.units = [
     [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 139, 123, 26, 1293, 594, 133, 1 ],
     [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
     [ "Kizaru, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
-    [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 5, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
+    [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
     [ "Koala, Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 33, 40, 49, 764, 543, 196, 1 ],
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
@@ -1297,12 +1297,20 @@ window.units = [
     [ "Halloween Kalifa Evolved", "STR", [ "Fighter", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 759, 351, 229, 1655, 839, 464, null ],
     [ "Akainu", "STR", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 286, 216, 0, 1618, 816, 49, 1 ],
     [ "Akainu, Magma Man", "STR", [ "Driven", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1518, 716, 44, 3168, 1444, 99, 1 ],
-    [ "Halloween Rebecca", "INT", "Fighter", 4, 12, 7, 1, 50, 392109, 87, 43, 38, 961, 453, 221, null ],
-    [ "Halloween Rebecca Evolved", "INT", "Fighter", 5, 20, 5, 3, 99, 3000000, 900, 391, 168, 1862, 912, 361, null ],
-    [ "Jailbreak Buggy", "QCK", [ "Slasher", "Driven" ], 3, 12, 4, 1, 50, null, 72, 33, 28, null, null, null, null ],
-    [ "Jailbreak Buggy Evolved", "QCK", [ "Slasher", "Driven" ], 4, 20, 4, 3, 99, null, 852, 371, 130, null, null, null, null ],
-    [ "Jailbreak Mr. 3", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 1, 50, null, 79, 29, 31, null, null, null, null ],
-    [ "Jailbreak Mr. 3 Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, null, 932, 323, 138, null, null, null, null ],
+    [ "Rebecca, Lovely Monster Cat", "INT", "Fighter", 4, 12, 7, 1, 50, 392109, 87, 43, 38, 961, 453, 221, 1 ],
+    [ "Rebecca, Lovely Monster Cat Halloween Night - Masquerade", "INT", "Fighter", 5, 20, 5, 3, 99, 3000000, 900, 391, 168, 1862, 912, 361, 1 ],
+    [ "Inmate Buggy", "QCK", [ "Slasher", "Driven" ], 3, 12, 4, 1, 50, 392109, 72, 33, 28, 923, 424, 187, 1 ],
+    [ "Inmate Buggy the Clown, Jailbreak Alliance", "QCK", [ "Slasher", "Driven" ], 4, 20, 4, 3, 99, 3000000, 852, 371, 130, 1903, 854, 340, 1 ],
+    [ "Prison Escapee Galdino", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 1, 50, 392109, 79, 29, 31, 998, 380, 195, 1 ],
+    [ "Prison Escapee Galdino, Jailbreak Alliance", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 932, 323, 138, 2052, 753, 357, 1 ],
+    [ "Little Succubus Sugar", "DEX", [ "Cerebral", "Slasher" ], 4, 12, 6, 1, 50, null, 70, 32, 50, 912, 409, 250, null ],
+    [ "Little Succubus Sugar, Halloween Night - Masquerade", "DEX", [ "Cerebral", "Slasher" ], 5, 20, 4, 3, 99, null, 844, 358, 209, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Kinemon Evolved", "STR", [ "Slasher", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Boa Marigold", "INT", [ "Slasher", "Powerhouse" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Boa Marigold Evolved", "INT", [ "Slasher", "Powerhouse" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From d718da2474e31643cf097e4fb9e8868e1eaa5acd Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 27 Oct 2016 18:20:32 -0500
Subject: [PATCH 0623/1569] New Sugo & Coliseum Units

---
 common/data/cooldowns.js  |  20 ++++++--
 common/data/details.js    | 100 +++++++++++++++++++++++++++++++++++++-
 common/data/evolutions.js |  28 +++++++++++
 common/data/flags.js      |  19 ++++++++
 common/data/gw.js         |  22 ++++++++-
 common/data/units.js      |  24 ++++++---
 index.html                |   7 ++-
 7 files changed, 203 insertions(+), 17 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8762c2020..dbe978498 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1299,12 +1299,24 @@ window.cooldowns = [
     [ 32, 17 ],
     [ 19, 12 ],
     [ 19, 12 ],
-    20,
-    20,
-    20,
-    20,
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 12 ],
+    [ 20, 12 ],
     [ 12, 5 ],
     [ 12, 5 ],
+    [ 14, 14 ],
+    [ 14, 14 ],
+    [ 16, 5 ],
+    [ 16, 5 ],
+    [ 25, 15 ],
+    [ 25, 15 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 56547441f..f921906fb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5201,7 +5201,7 @@ window.details = {
         specialName: "Emerald Porcupine Robe"
     },
     1072: {
-        captain: "Boosts ATK of characters with cost 30 or less by 2x and boosts the HP of Powerhouse characters by 1.2x",
+        captain: "Boosts ATK of characters with cost 20 or less by 2x and boosts the HP of Powerhouse characters by 1.2x",
         special: "Deals 20x ATK in [STR] damage to one enemy. Boosts ATK of Powerhouse characters by 1.5x for 1 turn.",
         specialName: "Emerald Porcupine Robe"
     },
@@ -6804,5 +6804,103 @@ window.details = {
         special: "Changes Badly Matching, [BLOCK], and [BOMB] orbs into [G] orbs. Reduces Special Cooldown of 1 character by 1 turn",
         specialName: "Aggressive 'Trick-Or-Treat'",
     },
+    1307: {//Halloween Bartolomeo
+        captain: "Boosts ATK of Driven characters by 1.75x. If you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
+        special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
+        specialName: "Vulgar provocation",
+    },
+    1308: {//Halloween Bartolomeo
+        captain: "Boosts ATK of Driven characters by 2x. If you don't attack with Bartolomeo, reduces damage received by 20% for that turn.",
+        special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
+        specialName: "Vulgar provocation",
+    },
+    1309: {//Coliseum Kinemon
+        captain: "Boosts ATK of Free Spirit characters by 2x, recovers 1x character's RCV in HP at the end of each turn",
+        special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
+        specialName: "Coliseum Kinemon Special",
+    },
+    1310: {//Coliseum Kinemon
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
+        special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
+        specialName: "Coliseum Kinemon Special",
+    },
+    1311: {//Coliseum Marigold
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
+        specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage taken over a certain amount",
+        specialName: "Coliseum Marigold Special",
+    },
+    1312: {//Coliseum Marigold
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.75x",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
+        specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage taken over a certain amount",
+        specialName: "Coliseum Marigold Special",
+    },
+    1313: {//Akainu
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Akainu Special",
+    },
+    1314: {//Akainu
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Akainu Special",
+    },
+    1315: {//Coby
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Coby Special",
+    },
+    1316: {//Coby
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Coby Special",
+    },
+    1317: {//Garp
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Garp Special",
+    },
+    1318: {//Garp
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Garp Special",
+    },
+    1319: {//Lady Tsuru
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Lady Tsuru Special",
+    },
+    1320: {//Lady Tsuru
+        captain: "Unknown",
+        special: "Unknown",
+        specialName: "Lady Tsuru Special",
+    },
+    1321: {//Momonga
+        captain: "Unknown",
+        special: "Deals damage to all enemies. Boosts ATK against delayed enemies by __x for _ turns",
+        specialName: "Momonga Special",
+        sailor: "Boosts ATK of ____ characters by ___ if your captain is a ___ character",
+    },
+    1322: {//Momonga
+        captain: "Unknown",
+        special: "Deals damage to all enemies. Boosts ATK against delayed enemies by __x for _ turns",
+        specialName: "Momonga Special",
+        sailor: "Boosts ATK of ____ characters by ___ if your captain is a ___ character",
+    },
+    1323: {//Onigumo
+        captain: "Unknown",
+        special: "Randomize ___ orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
+        specialName: "Onigumo Special",
+        sailor: "Reduces Paralysis for 2 turns for himself"
+    },
+    1324: {//Onigumo
+        captain: "Unknown",
+        special: "Randomize ___ orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters",
+        specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
+        specialName: "Onigumo Special",
+        sailor: "Reduces Paralysis for 2 turns for himself"
+    },
 };
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 83243733d..01bf5a1f7 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1987,6 +1987,10 @@ window.evolutions = {
         evolution: 1306,
         evolvers: [  ]
     },
+    1307: {
+        evolution: 1308,
+        evolvers: [  ]
+    },
     1309: {
         evolution: 1310,
         evolvers: [  ]
@@ -1995,4 +1999,28 @@ window.evolutions = {
         evolution: 1312,
         evolvers: [  ]
     },
+    1313: {
+        evolution: 1314,
+        evolvers: [  ]
+    },
+    1315: {
+        evolution: 1316,
+        evolvers: [  ]
+    },
+    1317: {
+        evolution: 1318,
+        evolvers: [  ]
+    },
+    1319: {
+        evolution: 1320,
+        evolvers: [  ]
+    },
+    1321: {
+        evolution: 1322,
+        evolvers: [  ]
+    },
+    1323: {
+        evolution: 1324,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 25c474ffe..8201bc346 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -823,6 +823,11 @@ window.flags = {
     827: { global: 1 },
     828: { rr: 1, rro: 1, lrr: 1 },
     829: { rr: 1, rro: 1, lrr: 1 },
+    830: { global: 1 },
+    831: { global: 1 },
+    832: { global: 1 },
+    833: { global: 1 },
+    834: { global: 1 },
     835: { global: 1 },
     836: { global: 1 },
     837: { rr: 1, rro: 1, global: 1 },
@@ -1057,4 +1062,18 @@ window.flags = {
     1278: { rr: 1, rro: 1 },
     1295: { rr: 1, rro: 1, lrr: 1 },
     1296: { rr: 1, rro: 1, lrr: 1 },
+    1307: { rr: 1, rro: 1, lrr: 1 },
+    1308: { rr: 1, rro: 1, lrr: 1 },
+    1313: { rr: 1, rro: 1 },
+    1314: { rr: 1, rro: 1 },
+    1315: { rr: 1, rro: 1 },
+    1316: { rr: 1, rro: 1 },
+    1317: { rr: 1, rro: 1 },
+    1318: { rr: 1, rro: 1 },
+    1319: { rr: 1, rro: 1 },
+    1320: { rr: 1, rro: 1 },
+    1321: { rr: 1, rro: 1 },
+    1322: { rr: 1, rro: 1 },
+    1323: { rr: 1, rro: 1 },
+    1324: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index a4126757a..500cb7ac9 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1299,10 +1299,28 @@ window.gw=[
     41278,
     41926,
     41926,
+    41931,
+    41931,
+    41932,
+    41932,
+    43619,
+    43619,
+    43743,
+    43743,
+    43751,
+    43751,
+    43752,
+    43752,
     null,
     null,
     null,
     null,
-    43619,
-    43619,
+    null,
+    null,
+    null,
+    null,
+    43894,
+    43894,
+    43893,
+    43893,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 59bde520f..32d8913e9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1305,12 +1305,24 @@ window.units = [
     [ "Prison Escapee Galdino, Jailbreak Alliance", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 932, 323, 138, 2052, 753, 357, 1 ],
     [ "Little Succubus Sugar", "DEX", [ "Cerebral", "Slasher" ], 4, 12, 6, 1, 50, null, 70, 32, 50, 912, 409, 250, null ],
     [ "Little Succubus Sugar, Halloween Night - Masquerade", "DEX", [ "Cerebral", "Slasher" ], 5, 20, 4, 3, 99, null, 844, 358, 209, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Kinemon Evolved", "STR", [ "Slasher", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Boa Marigold", "INT", [ "Slasher", "Powerhouse" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Boa Marigold Evolved", "INT", [ "Slasher", "Powerhouse" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Halloween Bartolomeo", "QCK", [ "Driven", "Fighter" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Halloween Bartolomeo Evolved", "QCK", [ "Driven", "Fighter" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 609, 399, 62, 1142, 779, 177, null ],
+    [ "Foxfire Kinemon", "STR", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1095, 708, 131, 2075, 1433, 321, null ],
+    [ "Boa Marigold, Kuja Warrior", "INT", [ "Slasher", "Powerhouse" ], 3, 16, 5, 2, 50, null, 245, 116, 24, 1209, 462, 99, null ],
+    [ "Boa Marigold, Three Gorgon Sisters, Third Daughter", "INT", [ "Slasher", "Powerhouse" ], 4, 26, 4, 3, 99, null, 1136, 411, 57, null, null, null, null ],
+    [ "Akainu", "STR", [ "Driven", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Akainu Evolved", "STR", [ "Driven", "Powerhouse" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coby", "PSY", [ "Fighter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coby Evolved", "PSY", [ "Fighter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Garp", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Garp Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lady Tsuru", "QCK", [ "Cerebral", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lady Tsuru Evolved", "QCK", [ "Cerebral", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Momonga", "DEX", [ "Cerebral", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Momonga Evolved", "DEX", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Onigumo", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Onigumo Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index c3b559c97..a0d44d8d7 100644
--- a/index.html
+++ b/index.html
@@ -64,18 +64,17 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>22/10/2016</p>
+            <p>27/10/2016</p>
             <br>
             <ul>
+                <li>Added New Sugofest Unit Previews</li>
+                <br>
                 <li>Jailbreak And Halloween Units Added</li>
                 <br>
                 <li>Akainu Raid Boss is Up!</li>
                 <br>
                 <li>Added Tesoro Map Conditions to the calc</li>
                 <br>
-                <li>Added Tashigi/Young Senior Pink Specials</li>
-                <li>Added a Filter for them as well</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>

From 8a3192b49f1d3d2ecc5df44a679e25713ecce769 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sat, 29 Oct 2016 06:50:28 -0500
Subject: [PATCH 0624/1569] New Sugo Batch

---
 common/data/aliases.js    |  12 +++++
 common/data/captains.js   |  90 ++++++++++++++++++++++++++++++++-
 common/data/details.js    |  74 ++++++++++++++++-----------
 common/data/drops.js      |   7 +++
 common/data/events.js     | 102 +++++++++++++++++++++++++++++++++++++-
 common/data/evolutions.js |   4 ++
 common/data/families.js   |  26 +++++++++-
 common/data/gw.js         |  16 +++---
 common/data/ships.js      |  17 +++++--
 common/data/specials.js   |  26 ++++++++++
 common/data/units.js      |  30 +++++------
 common/data/zombies.js    |  16 ++++++
 damage/js/cruncher.js     |  14 ++++++
 index.html                |   7 ++-
 14 files changed, 376 insertions(+), 65 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index fa9230652..5630d4703 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1311,4 +1311,16 @@ window.aliases = {
     1310: ['','','Coliseum'],
     1311: ['','','Coliseum'],
     1312: ['','','Coliseum'],
+    1313: ['','','Sakazuki'],
+    1314: ['','','Akainu'],
+    1315: ['','',''],
+    1316: ['','',''],
+    1317: ['','',''],
+    1318: ['','',''],
+    1319: ['','',''],
+    1320: ['','',''],
+    1321: ['','',''],
+    1322: ['','',''],
+    1323: ['','',''],
+    1324: ['','',''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index c5f3a08bc..c9d9004a4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2449,10 +2449,10 @@ window.captains = {
         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1015: {
-        atk: function(p) { return !p.unit.type == "INT" ? 1 : (p.orb == 2.0 ? 2.75 : 1); }
+        atk: function(p) { return p.unit.type == "INT" ? (p.orb == 2.0 ? 2.75 : 1) : 1; },
     },
     1016: {
-        atk: function(p) { return !p.unit.type == "INT" ? 1 : (p.orb == 2.0 ? 3 : 1.5); }
+        atk: function(p) { return p.unit.type == "INT" ? (p.orb == 2.0 ? 3 : 1.5) : 1; },
     },
     1017: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
@@ -3493,4 +3493,90 @@ window.captains = {
     1304: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
     },
+    1305: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; },
+    },
+    1306: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+    },
+    1307: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+    },
+    1308: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1309: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+    },
+    1310: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+    },
+    1311: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+    },
+    1312: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+    },
+    1313: {
+        //Akainu NEEDS TO BE CHANGED
+        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : 2.25; },
+    },
+    1314: {
+        //Akainu NEEDS TO BE CHANGED
+        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : 2.25; },
+    },
+    1315: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1316: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1317: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2.5 : 1; },
+    },
+    1318: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2.5 : 1; },
+    },
+    1321: {
+        atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher"))) 
+                return 2.5;
+            else
+                return 1; 
+               },
+    },
+    1322: {
+        atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher")))
+                return 2.5;
+            else
+                return 1; 
+               },
+    },
+    1323: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.56 :
+                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.6 :
+                1;
+        }
+    },
+    1324: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.56 :
+                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.6 :
+                1;
+        }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index f921906fb..316579a5a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6837,70 +6837,84 @@ window.details = {
         specialName: "Coliseum Marigold Special",
     },
     1313: {//Akainu
-        captain: "Unknown",
-        special: "Unknown",
-        specialName: "Akainu Special",
+        captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
+        captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
+        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
+        specialName: "Meteor Volcano",
     },
     1314: {//Akainu
-        captain: "Unknown",
-        special: "Unknown",
-        specialName: "Akainu Special",
+        captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
+        captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
+        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
+        specialName: "Meteor Volcano",
     },
     1315: {//Coby
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK by 2.5x after the 2nd Perfect, 2.75x after the 3rd Perfect, 3x after the 4th Perfect, and by 3.5x after the 5th Perfect.",
+        special: "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+        specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
+        sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Coby Special",
     },
     1316: {//Coby
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK by 2.5x after the 2nd Perfect, 2.75x after the 3rd Perfect, 3x after the 4th Perfect, and by 3.5x after the 5th Perfect.",
+        special: "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+        specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
+        sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Coby Special",
     },
     1317: {//Garp
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
+        special: "Deals 30x character's ATK as fixed damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by __ for 1 turn.",
+        sailor: "Boosts ATK of all characters by 75",
         specialName: "Garp Special",
     },
     1318: {//Garp
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
+        special: "Deals 30x character's ATK as fixed damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by __ for 1 turn.",
+        sailor: "Boosts ATK of all characters by 75",
         specialName: "Garp Special",
     },
     1319: {//Lady Tsuru
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
+        special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
+        specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
+        sailor: "Reduces duration of Paralysis by 1 turn",
         specialName: "Lady Tsuru Special",
     },
     1320: {//Lady Tsuru
-        captain: "Unknown",
-        special: "Unknown",
+        captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
+        special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
+        specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
+        sailor: "Reduces duration of Paralysis by 1 turn",
         specialName: "Lady Tsuru Special",
     },
     1321: {//Momonga
-        captain: "Unknown",
-        special: "Deals damage to all enemies. Boosts ATK against delayed enemies by __x for _ turns",
+        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Momonga Special",
-        sailor: "Boosts ATK of ____ characters by ___ if your captain is a ___ character",
+        sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1322: {//Momonga
-        captain: "Unknown",
-        special: "Deals damage to all enemies. Boosts ATK against delayed enemies by __x for _ turns",
+        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Momonga Special",
-        sailor: "Boosts ATK of ____ characters by ___ if your captain is a ___ character",
+        sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1323: {//Onigumo
-        captain: "Unknown",
-        special: "Randomize ___ orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.6x",
+        captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 2.56x bonus.",
+        special: "Randomize [RCV], [TND], and [BOMB] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         specialName: "Onigumo Special",
-        sailor: "Reduces Paralysis for 2 turns for himself"
+        sailor: "Reduces Paralysis for 5 turns for himself"
     },
     1324: {//Onigumo
-        captain: "Unknown",
-        special: "Randomize ___ orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.6x",
+        captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 2.56x bonus.",
+        special: "Randomize [RCV], [TND], and [BOMB] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         specialName: "Onigumo Special",
-        sailor: "Reduces Paralysis for 2 turns for himself"
+        sailor: "Reduces Paralysis for 5 turns for himself"
     },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index cb50f8fae..84c4082e5 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1196,6 +1196,13 @@ window.drops = {
             "All Difficulties": [ 1301, 1303, 1152, 1151, 551, 539, -718, -752, -1125, -1133, -15, -203, -733, -1056, -1060 ]
         },
         
+        {
+            name: "Tontatta Kingdom Island",
+            thumb: null,
+            condition: "",
+            "All Difficulties": [ -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
+        },
+        
     ],
 
             
diff --git a/common/data/events.js b/common/data/events.js
index 167407e76..9b26c7294 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -19,6 +19,26 @@ window.events = {
                 $scope.notify({ text: 'Disabling [G] orbs support.' });
         }
     },
+    900: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    901: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
     989: {
         onInsertion: function($scope) {
             if (++$scope.options.gOrbsEnabled == 1)
@@ -48,5 +68,85 @@ window.events = {
             if (--$scope.options.gOrbsEnabled === 0)
                 $scope.notify({ text: 'Disabling [G] orbs support.' });
         }
-    }
+    },
+    1243: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1244: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1291: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1292: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1305: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1306: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1313: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Captain ability still being worked on. Use a [G] orb for now to simulate a STR orb on a character. (Will only have 1.5x boost)' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1314: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Captain ability still being worked on. Use a [G] orb for now to simulate a STR orb on a character. (Will only have 1.5x boost)' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 01bf5a1f7..07fff6a1e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2023,4 +2023,8 @@ window.evolutions = {
         evolution: 1324,
         evolvers: [  ]
     },
+    1325: {
+        evolution: 1326,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 27b051e98..903855759 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1032,8 +1032,8 @@ window.families = [
     "Hajrudin",
     "Abdullah and Jeet",
     "Abdullah and Jeet",
-    "Bartomoleo",
-    "Bartomoleo",
+    "Bartolomeo",
+    "Bartolomeo",
     "Emporio Ivankov",
     "Emporio Ivankov",
     "Inazuma",
@@ -1303,4 +1303,26 @@ window.families = [
     "Buggy",
     "Galdino",
     "Galdino",
+    "Sugar",
+    "Sugar",
+    "Bartolomeo",
+    "Bartolomeo",
+    "Kinemon",
+    "Kinemon",
+    "Boa Marigold",
+    "Boa Marigold",
+    "Akainu",
+    "Akainu",
+    "Coby",
+    "Coby",
+    "Garp",
+    "Garp",
+    "Tsuru",
+    "Tsuru",
+    "Momonga",
+    "Momonga",
+    "Onigumo",
+    "Onigumo",
+    "Corazon",
+    "Corazon",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 500cb7ac9..3b0654110 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1311,14 +1311,14 @@ window.gw=[
     43751,
     43752,
     43752,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    43909,
+    43909,
+    43907,
+    43907,
+    43908,
+    43908,
+    43906,
+    43906,
     43894,
     43894,
     43893,
diff --git a/common/data/ships.js b/common/data/ships.js
index e3399940d..a5f14e83c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -258,14 +258,23 @@ window.ships = [
     },
     
     { // 21
-        name: 'Burning WB Ship',
+        name: 'Burning Whitebeard Ship',
         thumb: null,
-        description: 'Boosts ATK by 1.5x, and HP by 1.4x. Take 5% current HP damage at the end of each turn. Special: Cuts the current HP of all enemies by 20%.  (cooldown MAX: 18 Turns)',
+        description: 'Boosts HP by 1.3x',
+        hp: function(p) {
+            return 1.3;
+        },
+    },
+    
+    { // 22
+        name: 'Garp Ship',
+        thumb: null,
+        description: 'Boosts ATK of [STR] and [PSY] characters by 1.5x, and their HP by 1.25x',
         atk: function(p) {
-            return 1.5;
+            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return 1.4;
+            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.15, 1.25 ][p.boatLevel - 1] : 1;
         },
     },
 
diff --git a/common/data/specials.js b/common/data/specials.js
index 78ff57c24..658e6af5c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1742,4 +1742,30 @@ window.specials = {
         atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
         type: "class"
     },
+    1313: {
+        atk: function(p) { return p.unit.cost >= 50 ? 1.75 : 1; },
+        type: "class"
+    },
+    1314: {
+        atk: function(p) { return p.unit.cost >= 50 ? 1.75 : 1; },
+        type: "class"
+    },
+    1319: {
+        atk: function(p) { return 1.5; },
+        type: "class"
+    },
+    1320: {
+        atk: function(p) { return 1.5; },
+        type: "class"
+    },
+    1321: {
+        atk: function(p) { return 1.5; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    1322: {
+        atk: function(p) { return 1.5; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 32d8913e9..7527154ea 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1305,24 +1305,26 @@ window.units = [
     [ "Prison Escapee Galdino, Jailbreak Alliance", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 932, 323, 138, 2052, 753, 357, 1 ],
     [ "Little Succubus Sugar", "DEX", [ "Cerebral", "Slasher" ], 4, 12, 6, 1, 50, null, 70, 32, 50, 912, 409, 250, null ],
     [ "Little Succubus Sugar, Halloween Night - Masquerade", "DEX", [ "Cerebral", "Slasher" ], 5, 20, 4, 3, 99, null, 844, 358, 209, null, null, null, null ],
-    [ "Halloween Bartolomeo", "QCK", [ "Driven", "Fighter" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Halloween Bartolomeo Evolved", "QCK", [ "Driven", "Fighter" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Halloween Bartolomeo", "QCK", [ "Driven", "Fighter" ], 4, 13, 5, 2, 50, 392109, 106, 99, 33, 1171, 557, 158, null ],
+    [ "Halloween Bartolomeo Evolved", "QCK", [ "Driven", "Fighter" ], 5, 20, 4, 4, 99, 3000000, 1109, 472, 109, 2149, 1242, 247, null ],
     [ "Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 609, 399, 62, 1142, 779, 177, null ],
     [ "Foxfire Kinemon", "STR", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1095, 708, 131, 2075, 1433, 321, null ],
     [ "Boa Marigold, Kuja Warrior", "INT", [ "Slasher", "Powerhouse" ], 3, 16, 5, 2, 50, null, 245, 116, 24, 1209, 462, 99, null ],
     [ "Boa Marigold, Three Gorgon Sisters, Third Daughter", "INT", [ "Slasher", "Powerhouse" ], 4, 26, 4, 3, 99, null, 1136, 411, 57, null, null, null, null ],
-    [ "Akainu", "STR", [ "Driven", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Akainu Evolved", "STR", [ "Driven", "Powerhouse" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coby", "PSY", [ "Fighter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coby Evolved", "PSY", [ "Fighter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Garp", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Garp Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lady Tsuru", "QCK", [ "Cerebral", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lady Tsuru Evolved", "QCK", [ "Cerebral", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Momonga", "DEX", [ "Cerebral", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Momonga Evolved", "DEX", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Onigumo", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Onigumo Evolved", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Akainu, Navy HQ's Strongest Forces", "STR", [ "Driven", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sakazuki", "STR", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, null, 1, 1, 1, 1, 1450, 1, null ],
+    [ "Coby of the Grand Line, Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coby, Student of the 'Hero of the Navy', Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Monkey D. Garp, Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Garp the Fist', Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Halloween Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Halloween Corazon Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index d09a9ce28..ea4d8f9c2 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -267,4 +267,20 @@ window.zombies = {
         type: 'healer',
         multiplier: 2.5
     },
+    1305: {//Halloween Sugar
+        type: 'healer',
+        amount: 500
+    },
+    1305: {//Halloween Sugar
+        type: 'healer',
+        amount: 1000
+    },
+    1309: {//Colo Kinemon
+        type: 'healer',
+        multiplier: 1
+    },
+    1310: {//Colo Kinemon
+        type: 'healer',
+        multiplier: 2
+    },
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 8ef8840eb..4dbc758f9 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -772,6 +772,20 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         }
         return classes;
     };
+    
+    var colorCounter = function() {
+        var colors = {};
+        var colorArray = ['STR', 'DEX', 'QCK', 'INT', 'PSY'];
+        for (var i = 0, j = colorArray.length; i < j; i++) {
+            colors[colorArray[i]] = 0;
+        }
+        for(var z=0;z<team.length;z++){
+            if(team[z].unit){
+                colors[team[z].unit.type]++;
+                }
+            }
+        return colors;
+    };
 
     var getParameters = function(slotNumber, chainPosition) {
         return {
diff --git a/index.html b/index.html
index a0d44d8d7..1dfa4aa3a 100644
--- a/index.html
+++ b/index.html
@@ -64,17 +64,16 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>27/10/2016</p>
+            <p>29/10/2016</p>
             <br>
             <ul>
-                <li>Added New Sugofest Unit Previews</li>
+                <li>Added New Sugofest Unit details</li>
+                <li>Garp Ship added to Calculator</li>
                 <br>
                 <li>Jailbreak And Halloween Units Added</li>
                 <br>
                 <li>Akainu Raid Boss is Up!</li>
                 <br>
-                <li>Added Tesoro Map Conditions to the calc</li>
-                <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>
             </ul>

From 8944caaf05075a045cd6dacf10b19fd1422c7a07 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 31 Oct 2016 19:53:33 -0500
Subject: [PATCH 0625/1569] updated stats

---
 common/data/captains.js  |  7 ++++++-
 common/data/cooldowns.js | 26 +++++++++++++-----------
 common/data/details.js   | 44 ++++++++++++++++++++++++++++++++++++----
 common/data/drops.js     |  8 ++++----
 common/data/flags.js     |  2 ++
 common/data/matchers.js  |  2 +-
 common/data/ships.js     |  4 ++--
 common/data/units.js     | 32 ++++++++++++++++-------------
 index.html               |  2 +-
 9 files changed, 88 insertions(+), 39 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c9d9004a4..2567aadad 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3401,9 +3401,11 @@ window.captains = {
     1285: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.375, [ "Striker" ]); },
         hitAtk: function(p) {
-            return !p.unit.class.has("Striker") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.375 : 1.5;
+            if (!p.unit.class.has("Striker")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.375 : 1.5;
         },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1286: {
         atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
@@ -3579,4 +3581,7 @@ window.captains = {
                 1;
         }
     },
+    1326: {
+        atk: function(p) { return 1.3; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index dbe978498..5a41de7c1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1311,16 +1311,18 @@ window.cooldowns = [
     [ 16, 5 ],
     [ 25, 15 ],
     [ 25, 15 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    25,
+    25,
+    null,//Coby
+    null,//Coby
+    22,
+    22,
+    [ 21 , 17 ],
+    [ 21 , 17 ],
+    18,
+    18,
+    [ 15, 9 ],
+    [ 15, 9 ],
+    [ 13, 6 ],
+    [ 13, 6 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 316579a5a..6856d8cb3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6850,27 +6850,53 @@ window.details = {
     },
     1315: {//Coby
         captain: "Boosts ATK by 2.5x after the 2nd Perfect, 2.75x after the 3rd Perfect, 3x after the 4th Perfect, and by 3.5x after the 5th Perfect.",
-        special: "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+        special: [
+            {
+                "description": "If HP is below 3,000, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
+                "cooldown": 15,
+            },
+            {
+                "description": "If HP is below 3,000, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
+                "cooldown": 20,
+            },
+            {
+                "description": "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+                "cooldown": 24,
+            },
+        ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
         sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Coby Special",
     },
     1316: {//Coby
         captain: "Boosts ATK by 2.5x after the 2nd Perfect, 2.75x after the 3rd Perfect, 3x after the 4th Perfect, and by 3.5x after the 5th Perfect.",
-        special: "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+        special: [
+            {
+                "description": "If HP is below 3,000, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
+                "cooldown": 15,
+            },
+            {
+                "description": "If HP is below 3,000, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
+                "cooldown": 20,
+            },
+            {
+                "description": "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+                "cooldown": 24,
+            },
+        ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
         sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Coby Special",
     },
     1317: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
-        special: "Deals 30x character's ATK as fixed damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by __ for 1 turn.",
+        special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         sailor: "Boosts ATK of all characters by 75",
         specialName: "Garp Special",
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
-        special: "Deals 30x character's ATK as fixed damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by __ for 1 turn.",
+        special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         sailor: "Boosts ATK of all characters by 75",
         specialName: "Garp Special",
     },
@@ -6916,5 +6942,15 @@ window.details = {
         specialName: "Onigumo Special",
         sailor: "Reduces Paralysis for 5 turns for himself"
     },
+    1325: {//Halloween Corazon
+        captain: "Recovers 3x character's RCV in HP at the end of each turn",
+        special: "If HP is above 99%, changes [STR], [DEX], and [QCK] orbs into Matching orbs for Cerebral and Free Spirit characters",
+        specialName: "Amulet Flame",
+    },
+    1326: {//Halloween Corazon
+        captain: "Boosts ATK by 1.3x and recovers 4x character's RCV in HP at the end of each turn",
+        special: "If HP is above 99%, changes [STR], [DEX], and [QCK] orbs into Matching orbs for Cerebral and Free Spirit characters",
+        specialName: "Amulet Flame",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 84c4082e5..79ff52641 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1198,9 +1198,9 @@ window.drops = {
         
         {
             name: "Tontatta Kingdom Island",
-            thumb: null,
-            condition: "",
-            "All Difficulties": [ -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
+            thumb: 1330,
+            condition: "Slasher characters are weakened",
+            "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
         },
         
     ],
@@ -1416,7 +1416,7 @@ window.drops = {
         {
             name: 'Halloween Event Characters',
             thumb: 1300,
-            "All Difficulties": [ 1299, 1305 ],
+            "All Difficulties": [ 1299, 1305, 1325 ],
         },
         
         {
diff --git a/common/data/flags.js b/common/data/flags.js
index 8201bc346..50e5ddeee 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -978,6 +978,8 @@ window.flags = {
     1093: { rr: 1, rro: 1, lrr: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
     1100: { rr: 1, rro: 1, lrr: 1 },
+    1107: { global: 1 },
+    1108: { global: 1 },
     1114: { rr: 1, rro: 1, global: 1 },
     1115: { rr: 1, rro: 1, global: 1 },
     1116: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 76b27afed..8482792e1 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -376,7 +376,7 @@ window.matchers = [
     {
         name: 'Poison removers',
         target: 'special',
-        matcher: /(reduces|removes).+poison/i 
+        matcher: /removes.+poison/i 
     },
 
     {
diff --git a/common/data/ships.js b/common/data/ships.js
index a5f14e83c..a29db873b 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -271,10 +271,10 @@ window.ships = [
         thumb: null,
         description: 'Boosts ATK of [STR] and [PSY] characters by 1.5x, and their HP by 1.25x',
         atk: function(p) {
-            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
+            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.15, 1.25 ][p.boatLevel - 1] : 1;
+            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
         },
     },
 
diff --git a/common/data/units.js b/common/data/units.js
index 7527154ea..b44c7ef1a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1311,20 +1311,24 @@ window.units = [
     [ "Foxfire Kinemon", "STR", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1095, 708, 131, 2075, 1433, 321, null ],
     [ "Boa Marigold, Kuja Warrior", "INT", [ "Slasher", "Powerhouse" ], 3, 16, 5, 2, 50, null, 245, 116, 24, 1209, 462, 99, null ],
     [ "Boa Marigold, Three Gorgon Sisters, Third Daughter", "INT", [ "Slasher", "Powerhouse" ], 4, 26, 4, 3, 99, null, 1136, 411, 57, null, null, null, null ],
-    [ "Akainu, Navy HQ's Strongest Forces", "STR", [ "Driven", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sakazuki", "STR", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, null, 1, 1, 1, 1, 1450, 1, null ],
-    [ "Coby of the Grand Line, Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coby, Student of the 'Hero of the Navy', Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Monkey D. Garp, Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Garp the Fist', Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Halloween Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Halloween Corazon Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Akainu, Navy HQ's Strongest Forces", "STR", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, null, 442, 300, 18, 1700, 881, 49, null ],
+    [ "Sakazuki", "STR", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1642, 835, 32, 3500, 1600, 99, null ],
+    [ "Coby of the Grand Line, Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, null, 103, 94, 48, null, null, null, null ],
+    [ "Coby, Student of the 'Hero of the Navy', Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 877, 447, 164, 2024, 1151, 414, null ],
+    [ "Monkey D. Garp, Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, null, 106, 144, 29, null, null, null, null ],
+    [ "'Garp the Fist', Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 5, 4, 99, 4000000, 901, 602, 106, 2110, 1474, 290, null ],
+    [ "Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 4, 15, 4, 3, 50, null, 292, 205, 89, null, null, null, null ],
+    [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, null, null, null, null ],
+    [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, null, 136, 120, 35, null, null, null, null ],
+    [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, null, null, null, null ],
+    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, null, 172, 136, 5, null, null, null, null ],
+    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, null, null, null, null ],
+    [ "Halloween Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, 6, 1, 50, null, 84, 51, 33, 935, 526, 206, null ],
+    [ "Halloween Corazon Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 3, 99, null, 869, 467, 170, 1840, 1014, 337, null ],
+    [ "Leo", "DEX", [ "Striker", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Leo Evolved", "DEX", [ "Striker", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/index.html b/index.html
index 1dfa4aa3a..a3bf074dd 100644
--- a/index.html
+++ b/index.html
@@ -64,7 +64,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>29/10/2016</p>
+            <p>31/10/2016</p>
             <br>
             <ul>
                 <li>Added New Sugofest Unit details</li>

From 1fc98a69e2b36edc674ec47ffbfa32389ea3de99 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 2 Nov 2016 18:00:32 -0400
Subject: [PATCH 0626/1569] Units added and Stats filled

New FN, RR, Enent and Colo units stats added and some drops stuff
changed
---
 common/data/abilities.js  |   6 +-
 common/data/captains.js   |   9 +++
 common/data/details.js    | 151 +++++++++++++++++++++++++-------------
 common/data/drops.js      |   1 +
 common/data/evolutions.js |  26 ++++---
 common/data/families.js   |   4 +
 common/data/units.js      |  58 +++++++--------
 7 files changed, 162 insertions(+), 93 deletions(-)

diff --git a/common/data/abilities.js b/common/data/abilities.js
index 1766f0488..b7ffd4783 100644
--- a/common/data/abilities.js
+++ b/common/data/abilities.js
@@ -62,7 +62,7 @@ window.abilities = [
         levels: [
             [ 5, 'Boosted chances (20%) of getting matching orbs' ],
             [ 10, 'Boosted chances (22.2%) of getting matching orbs' ],
-            [ 20, 'Boosted chances (25%) of getting matching orbs' ],
+            [ 20, 'Boosted chances (25%) of getting matching orbs' ]
         ]
     },
 
@@ -71,7 +71,7 @@ window.abilities = [
         levels: [
             [ 10, 'Poison damage reduced by 20%' ],
             [ 15, 'Poison damage reduced by 50%' ],
-            [ 20, 'Poison damage reduced by 100%' ],
+            [ 20, 'Poison damage reduced by 100%' ]
         ]
     },
 
@@ -79,7 +79,7 @@ window.abilities = [
         name: 'Map damage resistance',
         levels: [
             [ 10, 'Map damage reduced by 50%' ],
-            [ 20, 'Map damage reduced by 100%' ],
+            [ 20, 'Map damage reduced by 100%' ]
         ]
     },
 
diff --git a/common/data/captains.js b/common/data/captains.js
index 2567aadad..34525d7ee 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3584,4 +3584,13 @@ window.captains = {
     1326: {
         atk: function(p) { return 1.3; },
     },
+    1327: {
+        atk: function(p) { return p.unit.cost <= 20 ? 2 : 1; },
+    },
+    1328: {
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; },
+    },
+    1330: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    }
 };
diff --git a/common/data/details.js b/common/data/details.js
index 6856d8cb3..5b5727d69 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6549,12 +6549,12 @@ window.details = {
     1265: {//Kimono Ace
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Recovers 3,000 HP and boosts the ATK of Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Kimono Ace Special",
+        specialName: "Looking to the Full Moon",
     },
     1266: {//Kimono Ace Evo
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "Recovers 3,000 HP and boosts the ATK of Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Kimono Ace Special",
+        specialName: "Looking to the Full Moon",
     },
     1267: {//Legend Blackbeard
         captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
@@ -6575,141 +6575,141 @@ window.details = {
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
         sailor: "Boosts ATK of all characters by 100 if your captain is a Driven character",
-        specialName: "Laffitte Special",
+        specialName: "Horrifying Suggestion",
     },
     1270: {//Laffitte
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 7x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
         sailor: "Boosts ATK of all characters by 100 if your captain is a Driven character",
-        specialName: "Laffitte Special",
+        specialName: "Horrifying Suggestion",
     },
     1271: {//Van Augur
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces duration of Blindness by 5 turns",
-        specialName: "Van Augur Special",
+        specialName: "Other Side of Fate",
     },
     1272: {//Van Augur Evo
         captain: "Reduces cooldown of Shooter specials by 1 turn at the start of the fight. Boosts ATK of Shooter characters by 2.5x.",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces duration of Blindness by 5 turns",
-        specialName: "Van Augur Special",
+        specialName: "Other Side of Fate",
     },
     1273: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.15",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.3225 HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
-        specialName: "Jesus Burgess Special",
+        specialName: "Champion of the Wild Roar",
     },
     1274: {//Jesus Burgess Evo
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.15x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.3225 HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
-        specialName: "Jesus Burgess Special",
+        specialName: "Champion of the Wild Roar",
     },
     1275: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
-        specialName: "Shiliew Special",
+        specialName: "Handling Hell",
     },
     1276: {//Shiliew Evo
         captain: "Boosts ATK and HP of Slasher characters by 2x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
-        specialName: "Shiliew Special",
+        specialName: "Handling Hell",
     },
     1277: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.25x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
-        specialName: "Doc Q Special",
+        specialName: "Reaping of Desperate Lives",
     },
     1278: {//Doc Q Evo
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
-        specialName: "Doc Q Special",
+        specialName: "Reaping of Desperate Lives",
     },
     1279: {//John Giant
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
         special: "Reduces damage received in the next turn by 50% if the special is activated with less than 50% health remaining",
-        specialName: "John Giant Special",
+        specialName: "Manifesto to the Weak",
     },
     1280: {//Marineford Aokiji
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Deals 10,000 fixed damage to all enemies and locks all orbs for 1 turn",
-        specialName: "Aokiji Special",
+        specialName: "Ice Chunks - Trident",
     },
     1281: {//Marineford Garp
         captain: "Boosts ATK of Fighter characters by 2.25x and reduces damage received by 10%",
         special: "Deals 25x character's ATK in [STR] damage to one enemy that bypasses all defensive Buffs",
         specialNotes: "Ignores barriers, DEF, and Damage Reduction buffs",
-        specialName: "Garp Special",
+        specialName: "Fist of Love - Falling Fortress",
     },
     1282: {//Marineford Sengoku
         captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces cooldown of all specials by 1 turn. Boosts the ATK of all characters by 1.2x and amplifies the effect of orbs by 1.2x for 1 turn",
-        specialName: "Sengoku Special",
+        specialName: "Encircling Wall around Marineford Bay",
     },
     1283: {//Marineford Akainu
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Deals 35x character's ATK in [INT] damage to one enemy. Boosts the ATK of Driven characters by 1.5x for 1 turn",
-        specialName: "Akainu Special",
+        specialName: "Dark Dog",
     },
     1284: {//Wild Luffy
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
         special: "Reduces duration of Bind and Silence by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
         sailor: "Reduces duration of Silence against this character by 3 turns",
-        specialName: "Wild Luffy Special",
+        specialName: "Wild Hunt",
     },
     1285: {//Wild Luffy Evolved
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 3.375x instead.",
         special: "Reduces duration of Despair and Silence by 3 turns. Randomizes Non-Matching orbs. (Including [BLOCK] orb)",
         sailor: "Reduces duration of Silence against this character by 3 turns",
-        specialName: "Wild Luffy Special",
+        specialName: "Wild Hunt",
     },
     1286: {//Kid Baby 5
         captain: "Boosts ATK and RCV of [PSY] characters by 1.3x",
         special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Kid Baby 5 Special",
+        specialName: "Handgun Legs",
     },
     1287: {//Kid Baby 5
         captain: "Boosts ATK and RCV of [PSY] characters by 1.5x",
         special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Kid Baby 5 Special",
+        specialName: "Handgun Legs",
     },
     1288: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.5x on the first turn, 2.4x on the second, 2.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
-        specialName: "Kid Law Special",
+        specialName: "Outcome of Sparta",
     },
     1289: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.75x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.75x on the first turn, 2.65x on the second, 2.55x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
-        specialName: "Kid Law Special",
+        specialName: "Outcome of Sparta",
     },
     1290: {//Kid Buffalo
         captain: "Recovers 500 HP at the end of each turn",
         special: "Changes own orb into [INT], and Captain orb into [BOMB]",
-        specialName: "Kid Buffalo Special",
+        specialName: "Rude Prank",
     },
     1291: {//Lao G, Coliseum
         captain: "Boosts ATK of Driven characters by 1.75x",
         special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
-        specialName: "Lao G Special",
+        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact",
     },
     1292: {//Lao G, Coliseum
         captain: "Boosts ATK of Driven characters by 2.5x if they have a matching orb, by 2x otherwise",
         special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
-        specialName: "Lao G Special",
+        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact",
     },
     1293: {//Coliseum Sandersonia
         captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
@@ -6724,7 +6724,7 @@ window.details = {
             },
         ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
-        specialName: "Coliseum Sandersonia Special",
+        specialName: "Snake Dance",
     },
     1294: {//Coliseum Sandersonia
         captain: "Boosts ATK of Powerhouse characters by 2x, deals 4 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
@@ -6739,7 +6739,7 @@ window.details = {
             },
         ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
-        specialName: "Coliseum Sandersonia Special",
+        specialName: "Snake Dance",
     },
     1295: {//Halloween Kalifa
         captain: "Boosts ATK and RCV of [STR] characters by 1.5x",
@@ -6766,33 +6766,33 @@ window.details = {
     1299: {//Halloween Rebecca
         captain: "Boosts ATK and RCV of [INT] characters by 1.2x",
         special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
-        specialName: "Halloween Rebecca Special",
+        specialName: "Driving Away Evil Spirits of Sin - Cat Pose",
     },
     1300: {//Halloween Rebecca
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
-        specialName: "Halloween Rebecca Special",
+        specialName: "Driving Away Evil Spirits of Sin - Cat Pose",
     },
     1301: {//Jailbreak Buggy
         captain: "Boosts ATK of Slasher characters by 1.75x",
         special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
-        specialName: "Jailbreak Buggy Special",
+        specialName: "Special Muggy Ball",
     },
     1302: {//Jailbreak Buggy
         captain: "Boosts ATK of Slasher characters by 1.75x and boosts ATK of Driven characters by 1.5x",
         captainNotes: "The bonus is cumulative. Slasher Driven characters get a 2.625x bonus.",
         special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
-        specialName: "Jailbreak Buggy Special",
+        specialName: "Special Muggy Ball",
     },
     1303: {//Jailbreak Mr. 3
         captain: "Boosts ATK of Cerebral characters by 1.5x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 60% for 2 turns",
-        specialName: "Jailbreak Mr. 3 Special",
+        specialName: "Extra Large Candle Wall",
     },
     1304: {//Jailbreak Mr. 3
         captain: "Boosts ATK of Cerebral characters by 2x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 60% for 2 turns",
-        specialName: "Jailbreak Mr. 3 Special",
+        specialName: "Extra Large Candle Wall",
     },
     1305: {//Halloween Sugar
         captain:  "Boosts ATK of Cerebral characters by 1.3x and recovers 500 HP at the end of each turn",
@@ -6807,34 +6807,34 @@ window.details = {
     1307: {//Halloween Bartolomeo
         captain: "Boosts ATK of Driven characters by 1.75x. If you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
-        specialName: "Vulgar provocation",
+        specialName: "Vulgar Provocation",
     },
     1308: {//Halloween Bartolomeo
         captain: "Boosts ATK of Driven characters by 2x. If you don't attack with Bartolomeo, reduces damage received by 20% for that turn.",
         special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
-        specialName: "Vulgar provocation",
+        specialName: "Vulgar Provocation",
     },
     1309: {//Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2x, recovers 1x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
-        specialName: "Coliseum Kinemon Special",
+        specialName: "Poof",
     },
     1310: {//Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
-        specialName: "Coliseum Kinemon Special",
+        specialName: "Poof",
     },
     1311: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
         specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage taken over a certain amount",
-        specialName: "Coliseum Marigold Special",
+        specialName: "King Cobra Machetes",
     },
     1312: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.75x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
         specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage taken over a certain amount",
-        specialName: "Coliseum Marigold Special",
+        specialName: "King Cobra Machetes",
     },
     1313: {//Akainu
         captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
@@ -6866,7 +6866,7 @@ window.details = {
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
         sailor: "Reduces duration of Blindness by 5 turns",
-        specialName: "Coby Special",
+        specialName: "Echoing Cry of the Soul",
     },
     1316: {//Coby
         captain: "Boosts ATK by 2.5x after the 2nd Perfect, 2.75x after the 3rd Perfect, 3x after the 4th Perfect, and by 3.5x after the 5th Perfect.",
@@ -6886,44 +6886,44 @@ window.details = {
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
         sailor: "Reduces duration of Blindness by 5 turns",
-        specialName: "Coby Special",
+        specialName: "Echoing Cry of the Soul",
     },
     1317: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         sailor: "Boosts ATK of all characters by 75",
-        specialName: "Garp Special",
+        specialName: "Super Large Iron Ball",
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         sailor: "Boosts ATK of all characters by 75",
-        specialName: "Garp Special",
+        specialName: "Super Large Iron Balll",
     },
     1319: {//Lady Tsuru
         captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
         specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
         sailor: "Reduces duration of Paralysis by 1 turn",
-        specialName: "Lady Tsuru Special",
+        specialName: "A Decree of the Veteran",
     },
     1320: {//Lady Tsuru
         captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
         specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
         sailor: "Reduces duration of Paralysis by 1 turn",
-        specialName: "Lady Tsuru Special",
+        specialName: "A Decree of the Veteran",
     },
     1321: {//Momonga
         captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
-        specialName: "Momonga Special",
+        specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1322: {//Momonga
         captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
-        specialName: "Momonga Special",
+        specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1323: {//Onigumo
@@ -6931,7 +6931,7 @@ window.details = {
         captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 2.56x bonus.",
         special: "Randomize [RCV], [TND], and [BOMB] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
-        specialName: "Onigumo Special",
+        specialName: "Onigumo of Dismantling Swordsmanship",
         sailor: "Reduces Paralysis for 5 turns for himself"
     },
     1324: {//Onigumo
@@ -6939,7 +6939,7 @@ window.details = {
         captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 2.56x bonus.",
         special: "Randomize [RCV], [TND], and [BOMB] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
-        specialName: "Onigumo Special",
+        specialName: "Onigumo of Dismantling Swordsmanship",
         sailor: "Reduces Paralysis for 5 turns for himself"
     },
     1325: {//Halloween Corazon
@@ -6952,5 +6952,56 @@ window.details = {
         special: "If HP is above 99%, changes [STR], [DEX], and [QCK] orbs into Matching orbs for Cerebral and Free Spirit characters",
         specialName: "Amulet Flame",
     },
+    1327: {//Fornight Leo
+        captain: "Boost ATK of characters with cost 20 or less by 2x",
+        special: [
+            {
+                "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
+                "cooldown": 11,
+            },
+            {
+                "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
+                "cooldown": 19,
+            }
+        ],
+        specialName: "Tail Hammer",
+    },
+    1328: {//Fornight Leo
+        captain: "Boost ATK of characters with cost 20 or less by 2.5x",
+        special: [
+            {
+                "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
+                "cooldown": 11,
+            },
+            {
+                "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
+                "cooldown": 19,
+            }
+        ],
+        specialName: "Tail Hammer",
+    },
+    1329: {//Wicca
+        captain: "Reduces cooldown of Fighter and Free Spirit specials by 1 turn at the start of the fight. Gives chance of duplicating a drop upon completion of the island. ",
+        special: [
+            {
+                "description": "Deals 6 fixed damage to all enemies. Randomizes orbs of upper row characters",
+                "cooldown": 9,
+            },
+            {
+                "description": "Deals 15 fixed damage to all enemies. Recovers 3x character's RCV in HP",
+                "cooldown": 11,
+            },
+            {
+                "description": "Deals 300 fixed damage to all enemies. Boosts the Color Affinity of Fighters and Free Spirit characters by ___x",
+                "cooldown": 16,
+            },
+        ],
+        specialName: "The Work of Fairies",
+    },
+    1330: {//Gancho
+        captain: "Boosts ATK of Striker characters by 1.5x and recovers 2x character's RCV in HP at the end of each turn",
+        special: "Switches orbs between slots twice. Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
+        specialName: "Tonta Knowledge",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 79ff52641..0661183cb 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1367,6 +1367,7 @@ window.drops = {
         {
             name: 'Clash!! Shiki',
             thumb: 1108,
+            global: true,
             Ultimate: [ 1107 ],
             Master: [ 1107 ],
             Expert: [ 1107 ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 07fff6a1e..3325d22fe 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1917,7 +1917,7 @@ window.evolutions = {
     },
     1265: {
         evolution: 1266,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 84, 95, 100 ]
     },
     1267: {
         evolution: 1268,
@@ -1985,7 +1985,7 @@ window.evolutions = {
     },
     1305: {
         evolution: 1306,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 80, 86, 102 ]
     },
     1307: {
         evolution: 1308,
@@ -1993,38 +1993,42 @@ window.evolutions = {
     },
     1309: {
         evolution: 1310,
-        evolvers: [  ]
+        evolvers: [ 118, 95, 95, 300, 267 ]
     },
     1311: {
         evolution: 1312,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 82, 84, 88 ]
     },
     1313: {
         evolution: 1314,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 95, 300, 267 ]
     },
     1315: {
         evolution: 1316,
-        evolvers: [  ]
+        evolvers: [ 87, 94, 98, 303, 103 ]
     },
     1317: {
         evolution: 1318,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 94, 300, 100 ]
     },
     1319: {
         evolution: 1320,
-        evolvers: [  ]
+        evolvers: [ 83, 85, 96, 301, 101 ]
     },
     1321: {
         evolution: 1322,
-        evolvers: [  ]
+        evolvers: [ 118, 80, 83, 97, 102 ]
     },
     1323: {
         evolution: 1324,
-        evolvers: [  ]
+        evolvers: [ 88, 266, 99, 304, 104 ]
     },
     1325: {
         evolution: 1326,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 81, 87, 103 ]
     },
+    1327: {
+        evolution: 1328,
+        evolvers: [ 116, 117, 80, 91, 102 ]
+    }
 };
diff --git a/common/data/families.js b/common/data/families.js
index 903855759..9a5775f63 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1325,4 +1325,8 @@ window.families = [
     "Onigumo",
     "Corazon",
     "Corazon",
+    "Leo",
+    "Leo",
+    "Wicca",
+    "Gancho",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b44c7ef1a..530db3935 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -504,9 +504,9 @@ window.units = [
     [ "Hotori and Kotori", "INT", "Fighter", 3, 9, 6, 1, 35, 136167, 242, 74, 27, 1055, 455, 122, 1 ],
     [ "Hotori and Kotori, Skypiea Vice Head Enforcers", "INT", "Fighter", 4, 15, 4, 2, 70, 1066998, 989, 385, 92, 1959, 601, 151, 1 ],
     [ "Pell", "QCK", [ "Slasher", "Powerhouse" ], 3, 9, 6, 1, 35, 136167, 175, 70, 40, 1000, 427, 142, 1 ],
-    [ "Pell, The guardian falcon of Alabasta.", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
+    [ "Pell, The guardian falcon of Alabasta", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 941, 358, 104, 1585, 695, 186, 1 ],
     [ "Chaka", "STR", [ "Slasher", "Powerhouse" ], 3, 9, 5, 1, 35, 136167, 173, 120, 21, 822, 615, 109, 1 ],
-    [ "Chaka, The guardian jackal of Alabasta.", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
+    [ "Chaka, The guardian jackal of Alabasta", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 4, 2, 70, 1066998, 740, 531, 81, 1160, 923, 180, 1 ],
     [ "Sir Crocodile, the Strongest Prisoner, Mr. 0, Ex-Baroque Works Leader", "QCK", [ "Striker", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 213, 108, 24, 1161, 565, 135, 1 ],
     [ "Sir Crocodile, the Strongest Prisoner, Ex-Seven Warlords Member", "QCK", [ "Striker", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 1101, 500, 100, 2200, 1150, 188, 1 ],
     [ "Daz Bones, Convict, Mr. 1", "INT", [ "Slasher", "Cerebral" ], 4, 16, 4, 2, 70, 1066998, 255, 156, 242, 1710, 1011, 55, 1 ],
@@ -1189,7 +1189,7 @@ window.units = [
     [ "Atmos, The Water Buffalo", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1159, 440, 41, 3552, 1238, 132, 1 ],
     [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, 6, 3, 70, 1066998, 242, 86, 30, 1198, 500, 148, 1 ],
     [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
-    [ "Aokiji, Marine Admiral", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
+    [ "Aokiji, Navy HQ's Strongest Forces", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
     [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, 392109, 181, 132, 47, 945, 539, 181, 1 ],
     [ "Boa Hancock, Maiden Drowned in Love", "DEX", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 863, 448, 144, 1724, 1132, 326, 1 ],
@@ -1263,8 +1263,8 @@ window.units = [
     [ "Senior Pink, Darkness of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
     [ "Vergo, Pirates of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
     [ "Vergo, Darkness of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
-    [ "Kimono Ace", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, null, 152, 90, 30, 961, 584, 174, null ],
-    [ "Kimono Ace Evolved", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, null, 890, 541, 130, null, null, null, null ],
+    [ "Ace, Wasting Time Until Twilight", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, 392109, 152, 90, 30, 961, 584, 174, 1 ],
+    [ "Ace, Face Glowing in the Moonlight", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, 3000000, 890, 541, 130, 1948, 1187, 289, 1 ],
     [ "Marshall D. Teach, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, 1066998, 429, 287, 39, 1674, 854, 127, 1 ],
     [ "Blackbeard, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1600, 789, 73, 3350, 1520, 244, 1 ],
     [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, 392109, 109, 92, 51, 995, 506, 202, 1 ],
@@ -1303,32 +1303,32 @@ window.units = [
     [ "Inmate Buggy the Clown, Jailbreak Alliance", "QCK", [ "Slasher", "Driven" ], 4, 20, 4, 3, 99, 3000000, 852, 371, 130, 1903, 854, 340, 1 ],
     [ "Prison Escapee Galdino", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 1, 50, 392109, 79, 29, 31, 998, 380, 195, 1 ],
     [ "Prison Escapee Galdino, Jailbreak Alliance", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 932, 323, 138, 2052, 753, 357, 1 ],
-    [ "Little Succubus Sugar", "DEX", [ "Cerebral", "Slasher" ], 4, 12, 6, 1, 50, null, 70, 32, 50, 912, 409, 250, null ],
-    [ "Little Succubus Sugar, Halloween Night - Masquerade", "DEX", [ "Cerebral", "Slasher" ], 5, 20, 4, 3, 99, null, 844, 358, 209, null, null, null, null ],
+    [ "Little Succubus Sugar", "DEX", [ "Cerebral", "Slasher" ], 4, 12, 6, 1, 50, 392109, 70, 32, 50, 912, 409, 250, 1 ],
+    [ "Little Succubus Sugar, Halloween Night - Masquerade", "DEX", [ "Cerebral", "Slasher" ], 5, 20, 4, 3, 99, 3000000, 844, 358, 209, 1768, 843, 407, 1 ],
     [ "Halloween Bartolomeo", "QCK", [ "Driven", "Fighter" ], 4, 13, 5, 2, 50, 392109, 106, 99, 33, 1171, 557, 158, null ],
     [ "Halloween Bartolomeo Evolved", "QCK", [ "Driven", "Fighter" ], 5, 20, 4, 4, 99, 3000000, 1109, 472, 109, 2149, 1242, 247, null ],
-    [ "Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 609, 399, 62, 1142, 779, 177, null ],
-    [ "Foxfire Kinemon", "STR", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1095, 708, 131, 2075, 1433, 321, null ],
-    [ "Boa Marigold, Kuja Warrior", "INT", [ "Slasher", "Powerhouse" ], 3, 16, 5, 2, 50, null, 245, 116, 24, 1209, 462, 99, null ],
-    [ "Boa Marigold, Three Gorgon Sisters, Third Daughter", "INT", [ "Slasher", "Powerhouse" ], 4, 26, 4, 3, 99, null, 1136, 411, 57, null, null, null, null ],
-    [ "Akainu, Navy HQ's Strongest Forces", "STR", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, null, 442, 300, 18, 1700, 881, 49, null ],
-    [ "Sakazuki", "STR", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1642, 835, 32, 3500, 1600, 99, null ],
-    [ "Coby of the Grand Line, Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, null, 103, 94, 48, null, null, null, null ],
-    [ "Coby, Student of the 'Hero of the Navy', Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 877, 447, 164, 2024, 1151, 414, null ],
-    [ "Monkey D. Garp, Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, null, 106, 144, 29, null, null, null, null ],
-    [ "'Garp the Fist', Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 5, 4, 99, 4000000, 901, 602, 106, 2110, 1474, 290, null ],
-    [ "Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 4, 15, 4, 3, 50, null, 292, 205, 89, null, null, null, null ],
-    [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, null, null, null, null ],
-    [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, null, 136, 120, 35, null, null, null, null ],
-    [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, null, null, null, null ],
-    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, null, 172, 136, 5, null, null, null, null ],
-    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, null, null, null, null ],
-    [ "Halloween Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, 6, 1, 50, null, 84, 51, 33, 935, 526, 206, null ],
-    [ "Halloween Corazon Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 3, 99, null, 869, 467, 170, 1840, 1014, 337, null ],
-    [ "Leo", "DEX", [ "Striker", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Leo Evolved", "DEX", [ "Striker", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 609, 399, 62, 1142, 779, 177, 1 ],
+    [ "Foxfire Kinemon", "STR", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1095, 708, 131, 2075, 1433, 321, 1 ],
+    [ "Boa Marigold, Kuja Warrior", "INT", [ "Slasher", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 245, 116, 24, 1209, 462, 99, 1 ],
+    [ "Boa Marigold, Three Gorgon Sisters, Third Daughter", "INT", [ "Slasher", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 1136, 411, 57, 2854, 1033, 169, 1 ],
+    [ "Akainu, Navy HQ's Strongest Forces", "STR", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, 1066998, 442, 300, 18, 1700, 881, 49, 1 ],
+    [ "Sakazuki", "STR", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1642, 835, 32, 3500, 1600, 99, 1 ],
+    [ "Coby of the Grand Line, Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 103, 94, 48, 941, 511, 209, 1 ],
+    [ "Coby, Student of the 'Hero of the Navy', Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 877, 447, 164, 2024, 1151, 414, 1 ],
+    [ "Monkey D. Garp, Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, 392109, 106, 144, 29, 959, 677, 151, 1 ],
+    [ "'Garp the Fist', Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 5, 4, 99, 4000000, 901, 602, 106, 2110, 1474, 290, 1 ],
+    [ "Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 4, 15, 4, 3, 50, 392109, 292, 205, 89, 902, 534, 213, 1 ],
+    [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
+    [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 136, 120, 35, 993, 591, 172, 1 ],
+    [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, 2342, 1296, 330, 1 ],
+    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
+    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, 2598, 1383, 225, 1 ],
+    [ "Royal Vampire Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 84, 51, 33, 935, 526, 206, 1 ],
+    [ "Royal Vampire Corazon, Halloween Night - Masquerade", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 869, 467, 170, 1840, 1014, 337, 1 ],
+    [ "Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 40, 40, 40, 888, 518, 180, 1 ],
+    [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
+    [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
+    [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 2d1ab29052841d5c8519afc95d1a0aa27edb45ad Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 2 Nov 2016 18:01:40 -0400
Subject: [PATCH 0627/1569] Global Drops

Indigo and Scarlet Added to global
---
 common/data/drops.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 0661183cb..6c778dce3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1129,6 +1129,7 @@ window.drops = {
         {
             name: "Dr. Indigo & Scarlet!",
             thumb: 1095,
+            global: true,
             condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
         },

From 2f056fae3b35bb1a600e7e02a0138a000b5f6ed3 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 2 Nov 2016 18:14:38 -0400
Subject: [PATCH 0628/1569] Gancho

Made Gancho a healer
---
 common/data/zombies.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/data/zombies.js b/common/data/zombies.js
index ea4d8f9c2..4aca9708c 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -283,4 +283,8 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    1330: {//Gancho
+        type: 'healer',
+        multiplier: 2
+    }
 };

From afd8aaff01e80d76acdf56890ada991da33038a5 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 4 Nov 2016 22:02:53 +0100
Subject: [PATCH 0629/1569] Cavendish Flags

---
 common/data/flags.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 50e5ddeee..a004ad887 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -988,18 +988,18 @@ window.flags = {
     1119: { rr: 1, rro: 1, global: 1 },
     1120: { rr: 1, rro: 1, global: 1 },
     1121: { rr: 1, rro: 1, global: 1 },
-    1122: { rr: 1, rro: 1 },
-    1123: { rr: 1, rro: 1 },
-    1124: { rr: 1, rro: 1 },
-    1125: { rr: 1, rro: 1 },
-    1126: { rr: 1, rro: 1 },
-    1127: { rr: 1, rro: 1 },
-    1128: { rr: 1, rro: 1 },
-    1129: { rr: 1, rro: 1 },
-    1130: { rr: 1, rro: 1 },
-    1131: { rr: 1, rro: 1 },
-    1132: { rr: 1, rro: 1 },
-    1133: { rr: 1, rro: 1 },
+    1122: { rr: 1, rro: 1, global: 1 },
+    1123: { rr: 1, rro: 1, global: 1 },
+    1124: { rr: 1, rro: 1, global: 1 },
+    1125: { rr: 1, rro: 1, global: 1 },
+    1126: { rr: 1, rro: 1, global: 1 },
+    1127: { rr: 1, rro: 1, global: 1 },
+    1128: { rr: 1, rro: 1, global: 1 },
+    1129: { rr: 1, rro: 1, global: 1 },
+    1130: { rr: 1, rro: 1, global: 1 },
+    1131: { rr: 1, rro: 1, global: 1 },
+    1132: { rr: 1, rro: 1, global: 1 },
+    1133: { rr: 1, rro: 1, global: 1 },
     1160: { rr: 1, rro: 1, lrr: 1 },
     1161: { rr: 1, rro: 1, lrr: 1 },
     1172: { rr: 1, rro: 1, global: 1 },

From aaa2a040dfcc3b824a6cf8901a930dbb3b1efaf2 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Fri, 4 Nov 2016 22:41:02 +0100
Subject: [PATCH 0630/1569] Test Link to Spanish DB

---
 common/css/links.css    | 10 ++++++++++
 common/views/links.html |  7 +++++++
 2 files changed, 17 insertions(+)

diff --git a/common/css/links.css b/common/css/links.css
index cb81abe0f..fe701c6a9 100644
--- a/common/css/links.css
+++ b/common/css/links.css
@@ -185,6 +185,12 @@
     transform: translateX(-24em);
 }
 
+#links-button.active .rotater:nth-child(9) > a {
+    -webkit-transform: translateY(-4em);
+    -ms-transform: translateY(-4em);
+    transform: translateY(-4em);
+}
+
 #link-damage > .btn { background: #85C1F5; }
 #link-characters > .btn { background: #7FCA9F; }
 #link-drops > .btn { background: #F4BA70; }
@@ -194,6 +200,7 @@
 #links-home > .btn { background: #939393; }
 #link-prob > .btn { background: #DEA5A4; }
 #link-turtles > .btn { background: #ce4500; }
+#link-es > .btn { background: linear-gradient(#ff0000 30%, #ffff00 30%, #ffff00 70%, #ff0000 30%); }
 
 .tip { color: black; }
 
@@ -212,3 +219,6 @@
     text-decoration: none !important;
 }
 
+.top {
+    left: -1em;
+}
diff --git a/common/views/links.html b/common/views/links.html
index d49ac3bdb..177adb63e 100644
--- a/common/views/links.html
+++ b/common/views/links.html
@@ -69,6 +69,13 @@
             </a>
             <a class="tip">Turtle Times</a>
         </div>
+        
+        <div class="rotater" id="link-es" title="Spanish DB" ng-if="exclude != 'turtles'">
+            <a class="btn btn-icon" target="_blank" href="https://optc-sp.github.io/">
+                <i class="fa fa-database"></i>
+            </a>
+            <a class="tip top">Spanish DB</a>
+        </div>
 
     </div>
 

From 3757b8121b918e79a53d65ef92c4955e546353f1 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 5 Nov 2016 09:03:54 +0100
Subject: [PATCH 0631/1569] Actually push the colorCounter to params

Momonga no longer crashes the calc
---
 damage/js/cruncher.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 4dbc758f9..0433a016d 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -800,7 +800,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             slot: slotNumber,
             turnCounter: $scope.tdata.turnCounter.value,
             chainPosition: chainPosition,
-            classCount: classCounter()
+            classCount: classCounter(),
+            colorCount: colorCounter()
         };
     };
 

From 6ab2fd55f0637f902289257198706f1e25b3498f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 13 Nov 2016 01:44:27 -0500
Subject: [PATCH 0632/1569] Another Update Dump

Added:
Japanese Aliases
Max Cooldowns
Wicca Special
Icons to Rescue Ace Events
Law Ship
(Tried getting healing on Rocketman Ship to work, to no avail)
New Colo Unit Holders
Changed:
Wedding Nami Drops
Akainu Sugo RR 4* Captains to be correct in description and calc
Tesoro Raid Conditions
Indigo and Scarlet Fortnight Condition
Added Ideo to Rumbar Pirates Drops
Fixed Difficulty names on Kuma Raid
Fixed Colo Porche Captain
Fixed spelling mistake in Snow Chopper and changed a 4 to a 3 in old
Patty's captain
---
 common/data/aliases.js   | 53 ++++++++++++++++++++++++++--------------
 common/data/captains.js  | 23 ++++++++---------
 common/data/cooldowns.js | 14 +++++++----
 common/data/details.js   | 52 +++++++++++++++++++--------------------
 common/data/drops.js     | 17 +++++++------
 common/data/effects.js   | 20 +++++++++------
 common/data/ships.js     | 14 ++++++++++-
 common/data/specials.js  |  3 +++
 common/data/units.js     | 11 +++++++++
 9 files changed, 130 insertions(+), 77 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 5630d4703..efaf79e74 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1303,24 +1303,41 @@ window.aliases = {
     1302: ['受刑者　道化のバギー 脱獄同盟','',''],
     1303: ['脱走囚　ギャルディーノ','','Mr 3', 'Mr. 3'],
     1304: ['脱走囚　ギャルディーノ 脱獄同盟','','Mr 3', 'Mr. 3'],
-    1305: ['','',''],
-    1306: ['','',''],
+    1305: ['シュガー　リトルサキュバス','',''],
+    1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','',''],
     1307: ['','',''],
     1308: ['','',''],
-    1309: ['','','Coliseum'],
-    1310: ['','','Coliseum'],
-    1311: ['','','Coliseum'],
-    1312: ['','','Coliseum'],
-    1313: ['','','Sakazuki'],
-    1314: ['','','Akainu'],
-    1315: ['','',''],
-    1316: ['','',''],
-    1317: ['','',''],
-    1318: ['','',''],
-    1319: ['','',''],
-    1320: ['','',''],
-    1321: ['','',''],
-    1322: ['','',''],
-    1323: ['','',''],
-    1324: ['','',''],
+    1309: ['錦えもん','','Coliseum'],
+    1310: ['狐火の錦えもん','','Coliseum'],
+    1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum'],
+    1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女','','Coliseum'],
+    1313: ['赤犬 海軍本部最高戦力','','Sakazuki'],
+    1314: ['サカズキ','','Akainu'],
+    1315: ['海軍本部曹長　コビー “偉大なる航路”の海兵','',''],
+    1316: ['海軍本部曹長　コビー “海軍の英雄”の教え子','',''],
+    1317: ['モンキー・D・ガープ 海軍本部中将','',''],
+    1318: ['ゲンコツのガープ 海軍本部中将','',''],
+    1319: ['つる 海軍本部中将','',''],
+    1320: ['“大参謀”つる 海軍本部中将','',''],
+    1321: ['モモンガ 怪物斬りの名将','',''],
+    1322: ['海軍本部中将モモンガ 怪物斬りの名将','',''],
+    1323: ['オニグモ 八刀流の剣士','',''],
+    1324: ['海軍本部中将オニグモ 八刀流の剣士','',''],
+    1325: ['コラソン　ロイヤルヴァンパイア','',''],
+    1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード','',''],
+    1327: ['レオ トンタッタ族トンタ兵団','',''],
+    1328: ['戦士レオ トンタッタ族トンタ兵団','',''],
+    1329: ['ウィッカ','',''],
+    1330: ['ガンチョ','',''],
+    1331: ['','',''],
+    1332: ['','',''],
+    1333: ['','',''],
+    1334: ['','',''],
+    1335: ['','',''],
+    1336: ['','',''],
+    1337: ['','','Coliseum'],
+    1338: ['','','Coliseum'],
+    1339: ['','','Coliseum'],
+    1340: ['','','Coliseum'],
+    1341: ['','','Coliseum'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 34525d7ee..2e48e8ae4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2906,11 +2906,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1144: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
     },
     1145: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     1154: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
@@ -3523,6 +3523,7 @@ window.captains = {
     },
     1313: {
         //Akainu NEEDS TO BE CHANGED
+        //[This works for STR and DEX units, just need a custom orb for QCK, INT, PSY units. Orb matchers like Oars and Onigumo are still a pain] atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : 2.25; },
         atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : 2.25; },
     },
     1314: {
@@ -3531,10 +3532,10 @@ window.captains = {
     },
     1315: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -3548,14 +3549,14 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1317: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2 : 1; },
     },
     1318: {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2.5 : 1; },
     },
     1321: {
         atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher"))) 
-                return 2.5;
+                return 2.25;
             else
                 return 1; 
                },
@@ -3569,8 +3570,8 @@ window.captains = {
     },
     1323: {
         atk: function(p) {
-            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.56 :
-                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.6 :
+            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.69 :
+                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.3 :
                 1;
         }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5a41de7c1..78a15fd85 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1134,7 +1134,7 @@ window.cooldowns = [
     null,//Ideo
     [ 6, 6 ],
     [ 6, 6 ],
-    16,
+    [ 16, 12],
     [ 18 , 11 ],
     19,
     [ 15, 8 ],
@@ -1317,12 +1317,16 @@ window.cooldowns = [
     null,//Coby
     22,
     22,
-    [ 21 , 17 ],
-    [ 21 , 17 ],
-    18,
-    18,
+    [ 21, 17 ],
+    [ 21, 17 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
     [ 15, 9 ],
     [ 15, 9 ],
     [ 13, 6 ],
     [ 13, 6 ],
+    null,//Leo
+    null,//Leo
+    null,//Wicca
+    [ 20, 12 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 5b5727d69..91e1a5e10 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -241,7 +241,7 @@ window.details = {
     50: {
         special: "Deals 5x character's ATK in STR damage to one enemy",
         specialName: "The Meatball Of Doom",
-        captain: "Recovers 4x character's RCV in HP at the end of each turn"
+        captain: "Recovers 3x character's RCV in HP at the end of each turn"
     },
     51: {
         captain: "Recovers 3x character's RCV in HP at the end of each turn"
@@ -3881,7 +3881,7 @@ window.details = {
     854: {
         captain: "Boosts ATK of DEX chracters by 1.5x, reduces damage received by 10%",
         specialName: "Guard Point: Winter Coat",
-        special: "Redues damage received by 50% for 3 turns, slightly boosts chances of getting [DEX] orbs for 3 turns"
+        special: "Reduces damage received by 50% for 3 turns, slightly boosts chances of getting [DEX] orbs for 3 turns"
     },
     855: {
         captain: "Boosts ATK of Slasher characters by 2x",
@@ -5482,12 +5482,12 @@ window.details = {
     },
     1111: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.25x",
-        special: "Amplifies the effect of orbs by 1.25x for 3 turns, recovers 7x character's RCV at the end of the turn for 3 turns.",
+        special: "Amplifies the effect of orbs by 1.25x for 3 turns, recovers 8x character's RCV at the end of the turn for 3 turns.",
         specialName: "Impish Sultry Dance"
     },
     1112: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
-        special: "Amplifies the effect of orbs by 1.25x for 3 turns, recovers 7x character's RCV at the end of the turn for 3 turns.",
+        special: "Amplifies the effect of orbs by 1.25x for 3 turns, recovers 8x character's RCV at the end of the turn for 3 turns.",
         specialName: "Impish Sultry Dance"
     },
     1113: {
@@ -5714,12 +5714,12 @@ window.details = {
         specialName: "Gorilla Punch: Golden Strike"
     },
     1144: {// Coliseum Porche
-        captain: "Boosts ATK of Cerebral characters by 1.75x",
+        captain: "Boosts ATK of [PSY] characters by 1.75x",
         special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
         specialName: "Cutie Baton: Flower Shuriken"
     },
     1145: {// Coliseum Porche
-        captain: "Boosts ATK of Cerebral characters by 1.75x and their RCV by 1.5x",
+        captain: "Boosts ATK of [PSY] characters by 1.75x and their RCV by 1.5x",
         special: "Deals 5x character's ATK in [PSY] damage to all enemies. Recovers 15x character's RCV in HP",
         specialName: "Cutie Baton: Flower Shuriken"
     },
@@ -6849,19 +6849,19 @@ window.details = {
         specialName: "Meteor Volcano",
     },
     1315: {//Coby
-        captain: "Boosts ATK by 2.5x after the 2nd Perfect, 2.75x after the 3rd Perfect, 3x after the 4th Perfect, and by 3.5x after the 5th Perfect.",
+        captain: "Boosts ATK by 2x after the 2nd Perfect and by 3x after the 5th Perfect.",
         special: [
             {
                 "description": "If HP is below 3,000, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
-                "cooldown": 15,
+                "cooldown": [ 15, 9 ],
             },
             {
                 "description": "If HP is below 3,000, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
-                "cooldown": 20,
+                "cooldown": [ 20, 14 ],
             },
             {
                 "description": "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
-                "cooldown": 24,
+                "cooldown": [ 24, 18 ],
             },
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
@@ -6873,15 +6873,15 @@ window.details = {
         special: [
             {
                 "description": "If HP is below 3,000, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
-                "cooldown": 15,
+                "cooldown": [ 15, 9 ],
             },
             {
                 "description": "If HP is below 3,000, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
-                "cooldown": 20,
+                "cooldown": [ 20, 14 ],
             },
             {
                 "description": "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
-                "cooldown": 24,
+                "cooldown": [ 24, 18 ],
             },
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
@@ -6889,7 +6889,7 @@ window.details = {
         specialName: "Echoing Cry of the Soul",
     },
     1317: {//Garp
-        captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
+        captain: "Boosts ATK of [STR] and [PSY] characters by 2x",
         special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         sailor: "Boosts ATK of all characters by 75",
         specialName: "Super Large Iron Ball",
@@ -6901,7 +6901,7 @@ window.details = {
         specialName: "Super Large Iron Balll",
     },
     1319: {//Lady Tsuru
-        captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
+        captain: "Heals for 1x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
         specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
         sailor: "Reduces duration of Paralysis by 1 turn",
@@ -6915,7 +6915,7 @@ window.details = {
         specialName: "A Decree of the Veteran",
     },
     1321: {//Momonga
-        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.25x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
@@ -6927,8 +6927,8 @@ window.details = {
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1323: {//Onigumo
-        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.6x",
-        captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 2.56x bonus.",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.3x",
+        captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 1.69x bonus.",
         special: "Randomize [RCV], [TND], and [BOMB] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         specialName: "Onigumo of Dismantling Swordsmanship",
@@ -6957,11 +6957,11 @@ window.details = {
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
-                "cooldown": 11,
+                "cooldown": [ 11, 4 ],
             },
             {
                 "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
-                "cooldown": 19,
+                "cooldown": [ 19, 12 ],
             }
         ],
         specialName: "Tail Hammer",
@@ -6971,11 +6971,11 @@ window.details = {
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
-                "cooldown": 11,
+                "cooldown": [ 11, 4 ],
             },
             {
                 "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
-                "cooldown": 19,
+                "cooldown": [ 19, 12 ],
             }
         ],
         specialName: "Tail Hammer",
@@ -6985,15 +6985,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 6 fixed damage to all enemies. Randomizes orbs of upper row characters",
-                "cooldown": 9,
+                "cooldown": [ 9, 3 ],
             },
             {
                 "description": "Deals 15 fixed damage to all enemies. Recovers 3x character's RCV in HP",
-                "cooldown": 11,
+                "cooldown": [ 11, 5 ],
             },
             {
-                "description": "Deals 300 fixed damage to all enemies. Boosts the Color Affinity of Fighters and Free Spirit characters by ___x",
-                "cooldown": 16,
+                "description": "Deals 300 fixed damage to all enemies. Boosts the Color Affinity of Fighters and Free Spirit characters by 1.25x",
+                "cooldown": [ 16, 10 ],
             },
         ],
         specialName: "The Work of Fairies",
diff --git a/common/data/drops.js b/common/data/drops.js
index 6c778dce3..d0734e490 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1010,7 +1010,7 @@ window.drops = {
             global: true,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
             "Japan": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ],
-            "Global": [ 807, 809, 811, -811, -645, -451, -631, -502, -11, -12, -9 ],
+            "Global": [ 807, 809, 811, -811, -760, -675, -631, -502, -11, -12, -9 ],
         },
 
         {
@@ -1130,7 +1130,8 @@ window.drops = {
             name: "Dr. Indigo & Scarlet!",
             thumb: 1095,
             global: true,
-            condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
+            //OLD condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
+            condition: "Boosts ATK of Driven characters by 2x and boosts HP for Powerhouse characters by 2x.",
             "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
         },
         
@@ -1159,7 +1160,7 @@ window.drops = {
             name: "Rumbar Pirates!",
             thumb: 1203,
             condition: "'Musical' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)",
-            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -1207, -677, -896, -631, -954, -1206, -617 ]
+            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -1207, -677, -896, -631, -954, -1206, -617, -1027 ]
         },
         
         {
@@ -1324,8 +1325,8 @@ window.drops = {
             name: 'Clash!! Tyrant Kuma',
             thumb: 836,
             global: true,
-            Master: [ 835 ],
-            Expert: [ 835 ]
+            Ultimate: [ 835 ],
+            Master: [ 835 ]
         },
 
         {
@@ -1437,21 +1438,21 @@ window.drops = {
         
         {
             name: 'Rescue Ace Event - Akainu',
-            thumb: null,
+            thumb: 1283,
             challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -261, -562, -720, -748, -935 ]
         },
         
         {
             name: 'Rescue Ace Event - Aokiji',
-            thumb: null,
+            thumb: 1280,
             challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -416, -459, -530, -669, -578 ]
         },
         
         {
             name: 'Rescue Ace Event - Kizaru',
-            thumb: null,
+            thumb: 1228,
             challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -367, -649, -718, -870, -1001 ]
         },
diff --git a/common/data/effects.js b/common/data/effects.js
index 9c23e3bf3..120a90add 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -311,11 +311,12 @@ window.effects = {
     },
     
     'Dr. Indigo & Scarlet! Fortnight': {
-        description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
+        //OLD description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
+        description: 'Boosts ATK of Driven characters by 2x and boosts HP for Powerhouse characters by 2x.',
         thumb: 1095,
         id: 37,
         atk: function(p) { 
-                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
+/*                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
                             if(p.class.has('Driven')) { boost1 = 2.0}
                             if(p.class.has('Powerhouse')) { boost2 = 2.0}
                             if(!(p.class.has('Driven')&&p.class.has('Powerhouse')) && p.class.constructor === Array){
@@ -324,10 +325,11 @@ window.effects = {
                             if(p.class.constructor === String){
                                 if(!(p.class.has('Driven') || p.class.has('Powerhouse'))){ boost5 = 0.5}
                             }
-                            return 1*boost1*boost2*boost3*boost4*boost5; 
+                            return 1*boost1*boost2*boost3*boost4*boost5;*/ 
+                            return p.class.has('Driven') ? 2 : 1;
                         },
         hp: function(p) {
-                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
+/*                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
                             if(p.class.has('Fighter')) { boost1 = 2.0}
                             if(p.class.has('Slasher')) { boost2 = 2.0}
                             if(!(p.class.has('Fighter')&&p.class.has('Slasher')) && p.class.constructor === Array){
@@ -336,7 +338,8 @@ window.effects = {
                             if(p.class.constructor === String){
                                 if(!(p.class.has('Fighter') || p.class.has('Slasher'))){ boost5 = 0.5}
                             }
-                            return 1*boost1*boost2*boost3*boost4*boost5;
+                            return 1*boost1*boost2*boost3*boost4*boost5;*/
+                            return p.class.has('Powerhouse') ? 2 : 1;
                         }
     },
     
@@ -383,15 +386,16 @@ window.effects = {
         description: 'Boosts the Orbs of all characters by 1.4x',
         thumb: 1163,
         id: 40,
-        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 20/28 : 1); }
+        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 5/7 : 1); },
+        atk: function(p) { return 1.4; }
     },
     
     'Gild Tesoro - 60 Stamina': {
         description: 'Boosts the Orbs and ATK of all characters by 1.4x',
         thumb: 1163,
         id: 41,
-        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 20/28 : 1); },
-        atk: function(p) { return 1.5; }
+        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
+        atk: function(p) { return 1.2; }
     },
 
 };
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index a29db873b..9521b2062 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -240,7 +240,7 @@ window.ships = [
     { // 19
         name: "Doflamingo Ship",
         thumb: null,
-        description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. Special: Adds 0.2 to Chain  (cooldown: 15 Turns)',
+        description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. Special: Adds 0.2 to Chain  (cooldown MAX: 15 Turns)',
         atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
         hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
     },
@@ -277,5 +277,17 @@ window.ships = [
             return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
         },
     },
+    
+    { //23
+        name: 'Polar Tang',
+        thumb: null,
+        description: 'Boosts ATK of Slashers and Free Spirit characters by 1.5x and their HP by 1.25x. Special: Heals for 10k when low HP (cooldown MAX: 18 turns)',
+        atk: function(p) {
+            return !(p.unit.class.has('Slasher') || p.unit.class.has('Free Spirit')) ? 1 : [ 1.3, 1.3, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return !(p.unit.class.has('Slasher') || p.unit.class.has('Free Spirit')) ? 1 : [ 1.1, 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.25, 1.25 ][p.boatLevel - 1];
+        },
+    },
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index 658e6af5c..fc9b67a64 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1768,4 +1768,7 @@ window.specials = {
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
+    1329: {
+        affinity: function(p){ return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1; }
+    }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 530db3935..2c03b5fcf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1329,6 +1329,17 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Gedatsu", "QCK", [ "Driven", "Free Spirit" ], 4, 16, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, null, null, null, null, null, null, null, null, null, null, null],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 2669dd9f8ec2801d7dbdf81061f86eba579044eb Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 13 Nov 2016 13:45:27 -0500
Subject: [PATCH 0633/1569] Tontatta Warriors Part 2

Added Mansherry Fortnight because I forgot it
---
 common/data/drops.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index d0734e490..30a569933 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1205,6 +1205,13 @@ window.drops = {
             "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
         },
         
+        {
+            name: "Tontatta Kingdom Island",
+            thumb: null,
+            //condition: "Unknown",
+            "All Difficulties": [ -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
+        },
+        
     ],
 
             

From 6c732ba17db014b6f5ea385cb3f9a8d65832806f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 13 Nov 2016 14:54:53 -0500
Subject: [PATCH 0634/1569] Rocketman Ship Healing Added

Made Rocketman Ship add healing based on how many Powerhouse units are
in the calculator
---
 common/data/ships.js  | 5 +++++
 damage/js/cruncher.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 9521b2062..3a2605cb2 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -255,6 +255,11 @@ window.ships = [
         hp: function(p) {
             return p.unit.class.has('Powerhouse') ? 1 : 0.01;
         },
+        heal: function(p) {
+            return p.classCount.Powerhouse == 1 ? 1 : p.classCount.Powerhouse == 2 ? 10 : p.classCount.Powerhouse == 3 ? 20 : p.classCount.Powerhouse == 4 ? 30 : p.classCount.Powerhouse == 5 ? 100 : p.classCount.Powerhouse == 6 ? 900 : 0;
+            debugger;  
+        },
+        
     },
     
     { // 21
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 0433a016d..984e03317 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -840,7 +840,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 zombieThreshold = zombie.threshold;
         }
         if (shipBonus.bonus && shipBonus.bonus.heal)
-            healAmount += shipBonus.bonus.heal({ boatLevel: shipBonus.level });
+            healAmount += shipBonus.bonus.heal({ boatLevel: shipBonus.level, classCount: classCounter() });
         // get heal per turn
         if (healAmount > 0) numbers.healPerTurn = healAmount;
         else return; // nothing to do if there's no healer

From ce0a48458b5ee4eb562c06e4302820557ab02a63 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 13 Nov 2016 14:57:44 -0500
Subject: [PATCH 0635/1569] Removed Debugger Statement

ya.
---
 common/data/ships.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 3a2605cb2..e8fc668d2 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -256,8 +256,7 @@ window.ships = [
             return p.unit.class.has('Powerhouse') ? 1 : 0.01;
         },
         heal: function(p) {
-            return p.classCount.Powerhouse == 1 ? 1 : p.classCount.Powerhouse == 2 ? 10 : p.classCount.Powerhouse == 3 ? 20 : p.classCount.Powerhouse == 4 ? 30 : p.classCount.Powerhouse == 5 ? 100 : p.classCount.Powerhouse == 6 ? 900 : 0;
-            debugger;  
+            return p.classCount.Powerhouse == 1 ? 1 : p.classCount.Powerhouse == 2 ? 10 : p.classCount.Powerhouse == 3 ? 20 : p.classCount.Powerhouse == 4 ? 30 : p.classCount.Powerhouse == 5 ? 100 : p.classCount.Powerhouse == 6 ? 900 : 0;  
         },
         
     },

From b2bf5fde8f886fde0534e847a11a50889fec2cb6 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 13 Nov 2016 15:41:14 -0500
Subject: [PATCH 0636/1569] Added alias to Kid Law

added 'Kid Law' to alias, not jsut 'Kid Trafalgar Law'
---
 common/data/aliases.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index efaf79e74..d6e72fbda 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1286,8 +1286,8 @@ window.aliases = {
     1285: ['モンキー・D・ルフィ 大地の開拓者','',''],
     1286: ['ベビー５ スパイダーマイルズの少女','','Kid Baby 5'],
     1287: ['ベビー５ ドンキホーテファミリーの一員','','Kid Baby 5'],
-    1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law'],
-    1289: ['トラファルガー・ロー ドンキホーテファミリーの一員','','Kid Trafalgar Law'],
+    1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law', 'Kid Law'],
+    1289: ['トラファルガー・ロー ドンキホーテファミリーの一員','','Kid Trafalgar Law', 'Kid Law'],
     1290: ['バッファロー ドンキホーテファミリーの一員','','Kid Buffalo'],
     1291: ['ラオＧ 地翁拳の使い手','','Coliseum'],
     1292: ['ラオＧ ディアマンテ軍幹部','','Coliseum'],

From d37552eb58f40244924cb1f0962f864083abc57e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 13 Nov 2016 16:17:51 -0500
Subject: [PATCH 0637/1569] Kid Law Secret RR Captain Fixed

Fixed Typo making him not recognized as a Zombie captain
---
 common/data/zombies.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/zombies.js b/common/data/zombies.js
index 4aca9708c..d214e3a65 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -181,11 +181,11 @@ window.zombies = {
     },
     828: { //Kid Law
         type: 'zombie',
-        treshold: 0.5
+        threshold: 0.5
     },
     829: { //Kid Law Evolution
         type: 'zombie',
-        treshold: 0.3
+        threshold: 0.3
     },
     841: { // Monet
         type: 'healer',

From 2d28b7de844a0da0f6cd71c2964ac1b76143eeb7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 14 Nov 2016 11:33:29 -0500
Subject: [PATCH 0638/1569] Mansherry Fortnight Units

Added Mansherry Fortnight units and Families
---
 common/data/families.js | 11 +++++++++++
 common/data/units.js    | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 9a5775f63..14d5532d7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1329,4 +1329,15 @@ window.families = [
     "Leo",
     "Wicca",
     "Gancho",
+    "Mansherry",
+    "Mansherry",
+    "Kabu",
+    "Bian",
+    "Sabo",
+    "Sabo",
+    "Kanjuro",
+    "Kanjuro",
+    "Tony Tony Chopper",
+    "Gedatsu",
+    "Gedatsu",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 2c03b5fcf..5b53d59a5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1329,12 +1329,12 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry", "PSY", [ "Striker", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Secret Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Secret Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],

From 255e796ec7f8d988f86e91db429589a8ccb23403 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 14 Nov 2016 12:08:27 -0500
Subject: [PATCH 0639/1569] Updated Index page and Story mode units fixed

Marineford Part 1 Bosses didn't have captains in the Calculator, added
them now.

Updated the splurge on the index page, nice Konami code Easter Egg.
---
 common/data/captains.js    | 21 ++++++++++++++++++++-
 common/js/nonSuspicious.js |  2 +-
 index.html                 | 10 +++++-----
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 2e48e8ae4..b15735609 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3146,11 +3146,30 @@ window.captains = {
     1221: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-    },
+    }, 
     1222: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
+    1223: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    1224: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1225: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
+    1226: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    1227: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; }
+    },
+    1228: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
     1229: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
     },
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index fbc1dd33d..9c6939d90 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1245, 1251, 1252, 1253, 1254, 1255, 1256 ];
+    var newUnits = [ 1310, 1314, 1316, 1326, 1330, 1329, 1328 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index a3bf074dd..9b126d488 100644
--- a/index.html
+++ b/index.html
@@ -64,15 +64,15 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>31/10/2016</p>
+            <p>14/11/2016</p>
             <br>
             <ul>
-                <li>Added New Sugofest Unit details</li>
-                <li>Garp Ship added to Calculator</li>
+                <li>Akainu Sugofest Units Completed</li>
+                <li>Law Ship added to Calculator</li>
                 <br>
-                <li>Jailbreak And Halloween Units Added</li>
+                <li>Tontatta Warriors And Halloween Units Added</li>
                 <br>
-                <li>Akainu Raid Boss is Up!</li>
+                <li>Previews for New Units Added</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From 167448d3e0dfaf8ca98c71d0e7c2750666645353 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 14 Nov 2016 12:28:43 -0500
Subject: [PATCH 0640/1569] Revert "Mansherry Fortnight Units"

This reverts commit 2d28b7de844a0da0f6cd71c2964ac1b76143eeb7.
---
 common/data/families.js | 11 -----------
 common/data/units.js    | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 14d5532d7..9a5775f63 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1329,15 +1329,4 @@ window.families = [
     "Leo",
     "Wicca",
     "Gancho",
-    "Mansherry",
-    "Mansherry",
-    "Kabu",
-    "Bian",
-    "Sabo",
-    "Sabo",
-    "Kanjuro",
-    "Kanjuro",
-    "Tony Tony Chopper",
-    "Gedatsu",
-    "Gedatsu",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 5b53d59a5..2c03b5fcf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1329,12 +1329,12 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
-    [ "Mansherry", "PSY", [ "Striker", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Mansherry Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Secret Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Secret Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],

From e1a023dad0162f09a3071f6eea23aea13d102534 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 14 Nov 2016 12:33:01 -0500
Subject: [PATCH 0641/1569] Reverted the reversion

whoops
---
 common/data/families.js | 11 +++++++++++
 common/data/units.js    | 12 ++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 9a5775f63..14d5532d7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1329,4 +1329,15 @@ window.families = [
     "Leo",
     "Wicca",
     "Gancho",
+    "Mansherry",
+    "Mansherry",
+    "Kabu",
+    "Bian",
+    "Sabo",
+    "Sabo",
+    "Kanjuro",
+    "Kanjuro",
+    "Tony Tony Chopper",
+    "Gedatsu",
+    "Gedatsu",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 2c03b5fcf..5b53d59a5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1329,12 +1329,12 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry", "PSY", [ "Striker", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Secret Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Secret Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],

From c5fc0882173246de6a57abe474a2e9bbaabc6b2a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 14 Nov 2016 12:37:15 -0500
Subject: [PATCH 0642/1569] Mansherry Fortnight Conditions and ID drops

Just added thumb and condition stuffs.
---
 common/data/drops.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 30a569933..2e36b88ee 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1201,15 +1201,15 @@ window.drops = {
         {
             name: "Tontatta Kingdom Island",
             thumb: 1330,
-            condition: "Slasher characters are weakened",
+            condition: "Slasher characters have their ATK reduced and their specials silenced",
             "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
         },
         
         {
             name: "Tontatta Kingdom Island",
-            thumb: null,
-            //condition: "Unknown",
-            "All Difficulties": [ -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
+            thumb: 1332,
+            condition: "Striker characters have their ATK reduced and their specials silenced",
+            "All Difficulties": [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
         },
         
     ],

From 4e13365b84a1c31aa5da04972b62428e9c9633ed Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 14 Nov 2016 13:58:51 -0500
Subject: [PATCH 0643/1569] Matchers

I fixed some matchers.
---
 common/data/details.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 91e1a5e10..b1405d3f9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4401,7 +4401,7 @@ window.details = {
         specialNotes: "#{stages}"
     },
     934: {
-        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
+        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75x instead",
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
         special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
@@ -6202,37 +6202,37 @@ window.details = {
         specialName: "Blood of the Devil Warrior",
     },
     1223: { // Story Bastille
-        captain: "Boosts the ATK of [INT] characters by 2x",
+        captain: "Boosts ATK of [INT] characters by 2x",
         special: "Deals 25x character's ATK in [INT] damage to all enemies",
         specialName: "Shark Knife - Flash",
     },
     1224: { // Story Yamakaji
-        captain: "Boosts the ATK of Slasher characters by 2x",
+        captain: "Boosts ATK of Slasher characters by 2x",
         special: "Reduces damage received by 60% for 1 turn",
         specialName: "Appreciation For The Great Men",
     },
     1225: { // Story Hina
-        captain: "Boosts the ATK and RCV of [INT] characters by 1.5x",
+        captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Delays all enemies for 1 turn, and locks own orb for 1 turn",
         specialName: "Binding Iron Tablet",
     },
     1226: { // Story Smoker
-        captain: "Boosts the ATK of Driven characters by 2x",
+        captain: "Boosts ATK of Driven characters by 2x",
         special: "Cuts the current HP of one enemy by 10% and changes own orb into [PSY]",
         specialName: "Seastone Truncheon",
     },
     1227: { //Story Mihawk
-        captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight. Boosts the ATK of Slasher characters by 2.25x",
+        captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight. Boosts ATK of Slasher characters by 2.25x",
         special: "Deals 100,000 fixed damage to one enemy, and boosts own ATK by 1.75x for 1 turn ",
         specialName: "Black Blade - Slashing Burial Drop",
     },
     1228: { // Story Kizaru
-        captain: "Boosts the ATK of Shooter characters by 2.5x",
+        captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "For Shooter characters, changes [BLOCK] orbs into Matching, and deals large [DEX] damage to all enemies",
         specialName: "The Cave of the Sun Goddess",
     },
     1229: {//Sentomaru
-        captain: "Boosts the ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
+        captain: "Boosts ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
         special: [
             {
                 "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
@@ -6251,7 +6251,7 @@ window.details = {
         specialName: "Leg-Locked Heave-Ho",
     },
     1230: {//Sentomaru
-        captain: "Boosts the ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
         special: [
             {
                 "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
@@ -6286,7 +6286,7 @@ window.details = {
         sailor: "Boosts ATK of Striker characters by 50",
     },
     1233: {//Tashigi
-        captain: "Boosts the ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
+        captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.25x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",
@@ -6294,7 +6294,7 @@ window.details = {
         sailor: "Boosts RCV of Slasher characters by 30",
     },
     1234: {//Tashigi
-        captain: "Boosts the ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
+        captain: "Boosts ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
         captainNotes: "Attack boost stacks, so a Slasher Cerebral unit has 2.56x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",

From 3fdf35bb9a525cfa73002ee71637e8499f1cbc40 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 15 Nov 2016 03:34:55 -0600
Subject: [PATCH 0644/1569] New Units updated

---
 common/data/cooldowns.js |   8 +-
 common/data/details.js   | 168 +++++++++++++++++++++++++--------------
 common/data/drops.js     |  12 +--
 common/data/gw.js        |  13 +++
 common/data/units.js     |  12 +--
 5 files changed, 141 insertions(+), 72 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 78a15fd85..783d701be 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1151,7 +1151,7 @@ window.cooldowns = [
     15,
     [ 25, 18 ],
     19,
-    25,
+    [ 25, 18 ],
     21,
     [ 10, 4 ],
     23,
@@ -1329,4 +1329,10 @@ window.cooldowns = [
     null,//Leo
     null,//Wicca
     [ 20, 12 ],
+    null,//Mansherry
+    null,//Mansherry
+    [ 20, 12 ],
+    [ 19, 12 ],
+    [ 6, 6 ],
+    [ 6, 6 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 91e1a5e10..427b37d83 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1171,14 +1171,14 @@ window.details = {
         specialName: "Massacre Soldier",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
-        sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
+        sailor: "When HP is below x%, boosts ATK of Cerebral characters by 50"
     },
     312: {
         special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
         specialName: "Massacre Soldier",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
-        sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
+        sailor: "When HP is below x%, boosts ATK of Cerebral characters by 50"
     },
     313: {
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
@@ -2201,13 +2201,13 @@ window.details = {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     526: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     527: {
         special: "Removes poison, recovers 15x character's RCV in HP",
@@ -2350,26 +2350,26 @@ window.details = {
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     554: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     555: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     556: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     557: {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
@@ -2388,14 +2388,14 @@ window.details = {
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     560: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     561: {
         special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
@@ -2763,14 +2763,14 @@ window.details = {
         specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Pirate Brothers: Twin Strike",
         captain: "Boosts ATK of Fighter characters by 2x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
-        sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
+        sailor: "When HP is below x%, boosts ATK of Fighter characters by 100"
     },
     641: {
         special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
         specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Pirate Brothers: Twin Strike",
         captain: "Boosts ATK of Fighter characters by 2.25x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
-        sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
+        sailor: "When HP is below x%, boosts ATK of Fighter characters by 100"
     },
     642: {
         special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
@@ -4352,12 +4352,12 @@ window.details = {
         special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
     },
     928: {
-        captain: "Boosts ATK of Driven Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
+        captain: "Boosts ATK of Driven characters by 1.75x while above 30% HP and boosts ATK of Striker characters by 1.75x while below 30% HP",
         special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
         specialName: "Hell Wisdom Rush"
     },
     929: {
-        captain: "Boosts ATK of Driven Characters by 2.25x while above 30% HP and boosts ATK of Striker Characters by 2.25x while below 30% HP",
+        captain: "Boosts ATK of Driven characters by 2.25x while above 30% HP and boosts ATK of Striker characters by 2.25x while below 30% HP",
         special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
         specialName: "Hell Wisdom Rush"
     },
@@ -4371,7 +4371,7 @@ window.details = {
         special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
     },
     932: {
-        captain: "Boosts ATK of Powerhouse Characters by 1.5x, and their HP by 1.5x",
+        captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
         specialName: "Rock Domination Wall",
         special: [
             {
@@ -4386,7 +4386,7 @@ window.details = {
         specialNotes: "#{stages}"	
         },
     933: {
-        captain: "Boosts ATK of Powerhouse Characters by 2.25x, and their HP by 1.5x",
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x",
         specialName: "Rock Domination Wall",
         special: [
             {
@@ -4401,13 +4401,13 @@ window.details = {
         specialNotes: "#{stages}"
     },
     934: {
-        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
+        captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
         special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
     },
     935: {
-        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
+        captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
         special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
@@ -4435,91 +4435,91 @@ window.details = {
         special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
     },
     940: {
-        captain: "Boosts ATK and HP of [DEX] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
         specialName: "Sure Kill! Exploding Star!!",
         special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
     },
     941: {
-        captain: "Boosts ATK of [DEX] Characters by 1.75x and their HP by 2.25x",
+        captain: "Boosts ATK of [DEX] characters by 1.75x and their HP by 2.25x",
         specialName: "Sure Kill! Exploding Star!!",
         special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
     },
     942: {
-        captain: "Boosts ATK and HP of [STR] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [STR] characters by 1.5x",
         specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
         special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
     },
     943: {
-        captain: "Boosts ATK of [STR] Characters by 2.25x and their HP by 1.75x",
+        captain: "Boosts ATK of [STR] characters by 2.25x and their HP by 1.75x",
         specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
         special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
     },
     944: {
-        captain: "Boosts ATK and RCV of Driven Characters by 1.2x",
+        captain: "Boosts ATK and RCV of Driven characters by 1.2x",
         specialName: "Spiritual Bouquet",
-        special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
+        special: "Boosts ATK and RCV of Driven characters by 1.5x for 1 turn"
     },
     945: {
-        captain: "Boosts ATK and RCV of Driven Characters by 1.75x",
+        captain: "Boosts ATK and RCV of Driven characters by 1.75x",
         specialName: "Spiritual Bouquet",
-        special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
+        special: "Boosts ATK and RCV of Driven characters by 1.5x for 1 turn"
     },
     946: {
         specialName: "Lock-on Iron Ball",
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker Characters by 1.75x",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker characters by 1.75x",
         special: "Change Friend Captain and changes own orb into [INT]"
     },
     947: {
-        captain: "Boosts ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
+        captain: "Boosts ATK of [INT] characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
         specialName: "Flame Flash",
-        special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals 10x character's ATK in [INT] damage to all enemies",
+        special: "[STR] and [INT] characters gain 1.3x ATK for 1 turn. Deals 10x character's ATK in [INT] damage to all enemies",
         captainNotes: "#{noFixedPerc}"
     },
     948: {
-        captain: "Boosts ATK of Shooter Characters by 1.5x and their RCV by 1.2x",
+        captain: "Boosts ATK of Shooter characters by 1.5x and their RCV by 1.2x",
         specialName: "Twin Cannons",
         special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage"
     },
     949: {
-        captain: "Boosts ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
+        captain: "Boosts ATK of Slasher characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         specialName: "Ties with Ace",
         special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
     },
     950: {
-        captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
+        captain: "Boosts ATK of Fighter and Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
         specialName: "Flame Commandment: Fire Pillar",
-        special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+        special: "Reduces Special Cooldown of Fighter and Free Spirit characters by 1 turn. Reduces damage received by 50% for 1 turn.",
         specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
     },
     951: {
-        captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
+        captain: "Boosts ATK of Fighter and Free Spirit characters by 2.75x after scoring 3 Perfects in a row",
         specialName: "Flame Commandment: Fire Pillar",
-        special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+        special: "Reduces Special Cooldown of Fighter and Free Spirit characters by 1 turn. Reduces damage received by 50% for 1 turn.",
         specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
     },
     952: {
-        captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.2x",
+        captain: "Boosts ATK and HP of Shooter and Striker characters by 1.2x",
         specialName: "Life-saving Gunstock Blow",
         special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
     },
     953: {
-        captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
+        captain: "Boosts ATK and HP of Shooter and Striker characters by 1.5x",
         specialName: "Life-saving Gunstock Blow",
         special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
     },
     954:{
-        captain: "Boosts ATK and HP of [QCK] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
         specialName: "Goldfish Fencing! I'll Dye the Sea Red with Your Blood",
         special: "Reduces the defense of all enemies by 80% for 2 turns"
     },
     955:{
-        captain: "Boosts ATK and HP of [PSY] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [PSY] characters by 1.5x",
         specialName: "Get Rich Quick Scheme! We're All Gonna Be Rich",
         special: "Boosts ATK against enemies with reduced defense by 1.2x for 2 turns"
     },
     956:{
-        captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [INT] characters by 1.5x",
         specialName: "Fishman karate! I'll Finish You",
         special: "Boosts ATK of Powerhouse characters by 1.2x for 2 turns"
     },
@@ -4563,13 +4563,13 @@ window.details = {
         special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
     },
     966:{
-        captain: "Boosts ATK of Driven Characters by 2.25x",
+        captain: "Boosts ATK of Driven characters by 2.25x",
         specialName: "Repel",
         special: "Empties slots with [QCK] orbs, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
         specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: 0 orbs - Can't activate; 1 orb - 14x ATK; 2 orbs - 21x ATK; 3 orbs - 35x ATK; 4 orbs - 49x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
     },
     967:{
-        captain: "Boosts ATK of Free Spirit Characters by 2.25x",
+        captain: "Boosts ATK of Free Spirit characters by 2.25x",
         specialName: "Surgeon of Death's First Aid Surgery",
         special: "Recovers 20x character's RCV in HP. Switches orbs between slots twice"
     },
@@ -4594,25 +4594,25 @@ window.details = {
         special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
     },
     973:{
-        captain: "Boosts ATK of Powerhouse Characters by 2x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Powerhouse characters by 2x if HP is above 99% at the start of the turn",
         specialName: "Ironclad Thrust: Dwarf Guard of the World",
         special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
     },
     974:{
-        captain: "Boosts ATK of Powerhouse Characters by 2.5x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "Ironclad Thrust: Dwarf Guard of the World",
         special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
     },
     975:{
         captain: "Reduces damage received by 10%",
         specialName: "A Threat That Puts Adults to Shame",
-        special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Boosts the ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
         specialNotes: "#{zombie}"
     },
     976:{
-        captain: "Boosts ATK of Driven Characters by 2x. Reduces damage received by 10%",
+        captain: "Boosts ATK of Driven characters by 2x. Reduces damage received by 10%",
         specialName: "A Threat That Puts Adults to Shame",
-        special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Boosts the ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
         specialNotes: "#{zombie}"
     },
     977:{
@@ -5862,27 +5862,27 @@ window.details = {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     1173: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     1174: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     1175: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     1176: {
         special: "Removes poison, recovers 15x character's RCV in HP",
@@ -5925,14 +5925,14 @@ window.details = {
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
         specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
         specialName: "Brass Knuckle Destruction",
-        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
+        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] characters by 75"
     },
     1184: {
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
         specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
         specialName: "Brass Knuckle Destruction",
-        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
+        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] characters by 75"
     },
     1185: {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
@@ -6097,27 +6097,27 @@ window.details = {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     1210: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     1211: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     1212: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     1213: {
         captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
@@ -6626,13 +6626,13 @@ window.details = {
     },
     1277: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.25x if HP is above 99% at the start of the turn",
-        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
+        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
     },
     1278: {//Doc Q Evo
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
-        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
+        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
     },
@@ -7003,5 +7003,55 @@ window.details = {
         special: "Switches orbs between slots twice. Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
         specialName: "Tonta Knowledge",
     },
+    1331: {//Mansherry
+        captain: "Recovers 2x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
+                "cooldown": [ 18, 11 ],
+            },
+            {
+                "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
+                "cooldown": [ 24, 17 ],
+            },
+        ],
+        specialName: "Mansherry Special",
+    },
+    1332: {//Mansherry
+        captain: "Recovers 3x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
+                "cooldown": [ 18, 11 ],
+            },
+            {
+                "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
+                "cooldown": [ 24, 17 ],
+            },
+        ],
+        specialName: "Mansherry Special",
+    },
+    1333: {//Kabu
+        captain: "Boosts ATK of [STR] and Powerhouse characters by 1.4x",
+        captainNotes: "The bonus is cumulative. [STR] Powerhouse characters get a 1.96x bonus.",
+        special: "Slightly boosts chances of getting [STR] orbs and boosts own ATK by 1.2x for 2 turns",
+        specialName: "Kabu Special",
+    },
+    1334: {//Bian
+        captain: "Boosts ATK of [DEX] and Free Spirit characters by 1.4x",
+        captainNotes: "The bonus is cumulative. [DEX] Free Spirit characters get a 1.96x bonus.",
+        special: "Poisons all enemies and randomizes all orbs",
+        specialName: "Kabu Special",
+    },
+    1335: {//Wedding Sabo
+        captain: "Reduces cooldown of Free Spirit specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
+        special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
+        specialName: "Wedding Sabo Special",
+    },
+    1336: {//Wedding Sabo
+        captain: "Reduces cooldown of Free Spirit specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
+        special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
+        specialName: "Wedding Sabo Special",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 30a569933..801e577fc 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1199,17 +1199,17 @@ window.drops = {
         },
         
         {
-            name: "Tontatta Kingdom Island",
+            name: "Tontatta Kingdom Island Part 1: Leo",
             thumb: 1330,
-            condition: "Slasher characters are weakened",
+            condition: "Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
             "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
         },
         
         {
-            name: "Tontatta Kingdom Island",
-            thumb: null,
-            //condition: "Unknown",
-            "All Difficulties": [ -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
+            name: "Tontatta Kingdom Island Part 2: Mansherry",
+            thumb: 1332,
+            condition: "Striker characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (70% on 30 stamina)",
+            "All Difficulties": [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
         },
         
     ],
diff --git a/common/data/gw.js b/common/data/gw.js
index 3b0654110..d06ff6c27 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1323,4 +1323,17 @@ window.gw=[
     43894,
     43893,
     43893,
+    
+    
+    
+    
+    
+    
+    44750,
+    44750,
+    44751,
+    44752,
+    44762,
+    44762,
+    
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 2c03b5fcf..3d15008b8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1329,12 +1329,12 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry, Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 3, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry, Tontatta Tribe Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, null, 606, 303, 234, 1972, 604, 597, null],
+    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, null, 64, 37, 16, 1604, 964, 106, null],
+    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, null, 210, 182, 80, null, null, null, null],
+    [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, null, null, null, null, 1106, 574, 171, null],
+    [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, null],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],

From 3e5be7402b4cc7f9534a6fd290ed97c30dbcedf8 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 15 Nov 2016 10:08:08 -0500
Subject: [PATCH 0645/1569] Revert "Reverted the reversion"

This reverts commit e1a023dad0162f09a3071f6eea23aea13d102534.
---
 common/data/families.js | 11 -----------
 common/data/units.js    | 12 ++++++------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 14d5532d7..9a5775f63 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1329,15 +1329,4 @@ window.families = [
     "Leo",
     "Wicca",
     "Gancho",
-    "Mansherry",
-    "Mansherry",
-    "Kabu",
-    "Bian",
-    "Sabo",
-    "Sabo",
-    "Kanjuro",
-    "Kanjuro",
-    "Tony Tony Chopper",
-    "Gedatsu",
-    "Gedatsu",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 5b53d59a5..2c03b5fcf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1329,12 +1329,12 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
-    [ "Mansherry", "PSY", [ "Striker", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Mansherry Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Secret Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Secret Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],

From 860d2f53581e0c6dcabcfe6ba6cd5a45fbc247ff Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 15 Nov 2016 10:13:20 -0500
Subject: [PATCH 0646/1569] Merge with master

---
 common/data/cooldowns.js |   8 +-
 common/data/details.js   | 168 +++++++++++++++++++++++++--------------
 common/data/drops.js     |   8 +-
 common/data/gw.js        |  13 +++
 common/data/units.js     |  12 +--
 5 files changed, 139 insertions(+), 70 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 78a15fd85..783d701be 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1151,7 +1151,7 @@ window.cooldowns = [
     15,
     [ 25, 18 ],
     19,
-    25,
+    [ 25, 18 ],
     21,
     [ 10, 4 ],
     23,
@@ -1329,4 +1329,10 @@ window.cooldowns = [
     null,//Leo
     null,//Wicca
     [ 20, 12 ],
+    null,//Mansherry
+    null,//Mansherry
+    [ 20, 12 ],
+    [ 19, 12 ],
+    [ 6, 6 ],
+    [ 6, 6 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index b1405d3f9..502e6bea0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1171,14 +1171,14 @@ window.details = {
         specialName: "Massacre Soldier",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
-        sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
+        sailor: "When HP is below x%, boosts ATK of Cerebral characters by 50"
     },
     312: {
         special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
         specialName: "Massacre Soldier",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
-        sailor: "When HP is below x%, boosts ATK of Cerebral Characters by 50"
+        sailor: "When HP is below x%, boosts ATK of Cerebral characters by 50"
     },
     313: {
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
@@ -2201,13 +2201,13 @@ window.details = {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     526: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     527: {
         special: "Removes poison, recovers 15x character's RCV in HP",
@@ -2350,26 +2350,26 @@ window.details = {
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     554: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     555: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     556: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     557: {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
@@ -2388,14 +2388,14 @@ window.details = {
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     560: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     561: {
         special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
@@ -2763,14 +2763,14 @@ window.details = {
         specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Pirate Brothers: Twin Strike",
         captain: "Boosts ATK of Fighter characters by 2x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
-        sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
+        sailor: "When HP is below x%, boosts ATK of Fighter characters by 100"
     },
     641: {
         special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
         specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Pirate Brothers: Twin Strike",
         captain: "Boosts ATK of Fighter characters by 2.25x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
-        sailor: "When HP is below x%, boosts ATK of Fighter Characters by 100"
+        sailor: "When HP is below x%, boosts ATK of Fighter characters by 100"
     },
     642: {
         special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
@@ -4352,12 +4352,12 @@ window.details = {
         special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
     },
     928: {
-        captain: "Boosts ATK of Driven Characters by 1.75x while above 30% HP and boosts ATK of Striker Characters by 1.75x while below 30% HP",
+        captain: "Boosts ATK of Driven characters by 1.75x while above 30% HP and boosts ATK of Striker characters by 1.75x while below 30% HP",
         special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
         specialName: "Hell Wisdom Rush"
     },
     929: {
-        captain: "Boosts ATK of Driven Characters by 2.25x while above 30% HP and boosts ATK of Striker Characters by 2.25x while below 30% HP",
+        captain: "Boosts ATK of Driven characters by 2.25x while above 30% HP and boosts ATK of Striker characters by 2.25x while below 30% HP",
         special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
         specialName: "Hell Wisdom Rush"
     },
@@ -4371,7 +4371,7 @@ window.details = {
         special: "Deals 13x ATK to 1 enemy in [DEX] Damage. Turns [BLOCK] orbs into [RCV] orbs"
     },
     932: {
-        captain: "Boosts ATK of Powerhouse Characters by 1.5x, and their HP by 1.5x",
+        captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
         specialName: "Rock Domination Wall",
         special: [
             {
@@ -4386,7 +4386,7 @@ window.details = {
         specialNotes: "#{stages}"	
         },
     933: {
-        captain: "Boosts ATK of Powerhouse Characters by 2.25x, and their HP by 1.5x",
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x",
         specialName: "Rock Domination Wall",
         special: [
             {
@@ -4401,13 +4401,13 @@ window.details = {
         specialNotes: "#{stages}"
     },
     934: {
-        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75x instead",
+        captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75x instead",
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
         special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
     },
     935: {
-        captain: "Boosts ATK of Fighter Characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter Characters by 2.75 instead",
+        captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
         special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
@@ -4435,91 +4435,91 @@ window.details = {
         special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
     },
     940: {
-        captain: "Boosts ATK and HP of [DEX] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
         specialName: "Sure Kill! Exploding Star!!",
         special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
     },
     941: {
-        captain: "Boosts ATK of [DEX] Characters by 1.75x and their HP by 2.25x",
+        captain: "Boosts ATK of [DEX] characters by 1.75x and their HP by 2.25x",
         specialName: "Sure Kill! Exploding Star!!",
         special: "Deals 13x ATK as [DEX] damage to all enemies, and boosts ATK of [DEX] characters by 1.75x for 1 turn"
     },
     942: {
-        captain: "Boosts ATK and HP of [STR] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [STR] characters by 1.5x",
         specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
         special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
     },
     943: {
-        captain: "Boosts ATK of [STR] Characters by 2.25x and their HP by 1.75x",
+        captain: "Boosts ATK of [STR] characters by 2.25x and their HP by 1.75x",
         specialName: "Future Country's Big Incident: The Nightmare of Baldimore",
         special: "Reduces damage received from [QCK] enemies by 100% for 1 turn"
     },
     944: {
-        captain: "Boosts ATK and RCV of Driven Characters by 1.2x",
+        captain: "Boosts ATK and RCV of Driven characters by 1.2x",
         specialName: "Spiritual Bouquet",
-        special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
+        special: "Boosts ATK and RCV of Driven characters by 1.5x for 1 turn"
     },
     945: {
-        captain: "Boosts ATK and RCV of Driven Characters by 1.75x",
+        captain: "Boosts ATK and RCV of Driven characters by 1.75x",
         specialName: "Spiritual Bouquet",
-        special: "Boosts ATK and RCV of Driven Characters by 1.5x for 1 turn"
+        special: "Boosts ATK and RCV of Driven characters by 1.5x for 1 turn"
     },
     946: {
         specialName: "Lock-on Iron Ball",
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker Characters by 1.75x",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Striker characters by 1.75x",
         special: "Change Friend Captain and changes own orb into [INT]"
     },
     947: {
-        captain: "Boosts ATK of [INT] Characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
+        captain: "Boosts ATK of [INT] characters by 1.5x, Boosts damage of [INT] specials by 1.5x",
         specialName: "Flame Flash",
-        special: "[STR] and [INT] Characters gain 1.3x ATK for 1 turn. Deals 10x character's ATK in [INT] damage to all enemies",
+        special: "[STR] and [INT] characters gain 1.3x ATK for 1 turn. Deals 10x character's ATK in [INT] damage to all enemies",
         captainNotes: "#{noFixedPerc}"
     },
     948: {
-        captain: "Boosts ATK of Shooter Characters by 1.5x and their RCV by 1.2x",
+        captain: "Boosts ATK of Shooter characters by 1.5x and their RCV by 1.2x",
         specialName: "Twin Cannons",
         special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage"
     },
     949: {
-        captain: "Boosts ATK of Slasher Characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
+        captain: "Boosts ATK of Slasher characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         specialName: "Ties with Ace",
         special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
     },
     950: {
-        captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.5x after scoring 3 Perfects in a row",
+        captain: "Boosts ATK of Fighter and Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
         specialName: "Flame Commandment: Fire Pillar",
-        special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+        special: "Reduces Special Cooldown of Fighter and Free Spirit characters by 1 turn. Reduces damage received by 50% for 1 turn.",
         specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
     },
     951: {
-        captain: "Boosts ATK of Fighter and Free Spirit Characters by 2.75x after scoring 3 Perfects in a row",
+        captain: "Boosts ATK of Fighter and Free Spirit characters by 2.75x after scoring 3 Perfects in a row",
         specialName: "Flame Commandment: Fire Pillar",
-        special: "Reduces Special Cooldown of Fighter and Free Spirit Characters by 1 turn. Reduces damage received by 50% for 1 turn.",
+        special: "Reduces Special Cooldown of Fighter and Free Spirit characters by 1 turn. Reduces damage received by 50% for 1 turn.",
         specialNotes: "Reducing Special Cooldown works as if you took an extra turn"
     },
     952: {
-        captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.2x",
+        captain: "Boosts ATK and HP of Shooter and Striker characters by 1.2x",
         specialName: "Life-saving Gunstock Blow",
         special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
     },
     953: {
-        captain: "Boosts ATK and HP of Shooter and Striker Characters by 1.5x",
+        captain: "Boosts ATK and HP of Shooter and Striker characters by 1.5x",
         specialName: "Life-saving Gunstock Blow",
         special: "Deals 13x ATK in [DEX] Damage to one enemy. Changes Captain's orb into matching."
     },
     954:{
-        captain: "Boosts ATK and HP of [QCK] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
         specialName: "Goldfish Fencing! I'll Dye the Sea Red with Your Blood",
         special: "Reduces the defense of all enemies by 80% for 2 turns"
     },
     955:{
-        captain: "Boosts ATK and HP of [PSY] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [PSY] characters by 1.5x",
         specialName: "Get Rich Quick Scheme! We're All Gonna Be Rich",
         special: "Boosts ATK against enemies with reduced defense by 1.2x for 2 turns"
     },
     956:{
-        captain: "Boosts ATK and HP of [INT] Characters by 1.5x",
+        captain: "Boosts ATK and HP of [INT] characters by 1.5x",
         specialName: "Fishman karate! I'll Finish You",
         special: "Boosts ATK of Powerhouse characters by 1.2x for 2 turns"
     },
@@ -4563,13 +4563,13 @@ window.details = {
         special: "Boosts ATK of all characters by 1.1x for 1 turn. If \"Wrath of the Creator Bloodline\" is used again in the same turn the special is activated in, boosts ATK of all characters by 1.5x instead."
     },
     966:{
-        captain: "Boosts ATK of Driven Characters by 2.25x",
+        captain: "Boosts ATK of Driven characters by 2.25x",
         specialName: "Repel",
         special: "Empties slots with [QCK] orbs, deals [QCK] damage based on number of [QCK] slots emptied to all enemies",
         specialNotes: "The exact multiplier used is chosen based on the number of [QCK] orbs consumed: 0 orbs - Can't activate; 1 orb - 14x ATK; 2 orbs - 21x ATK; 3 orbs - 35x ATK; 4 orbs - 49x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
     },
     967:{
-        captain: "Boosts ATK of Free Spirit Characters by 2.25x",
+        captain: "Boosts ATK of Free Spirit characters by 2.25x",
         specialName: "Surgeon of Death's First Aid Surgery",
         special: "Recovers 20x character's RCV in HP. Switches orbs between slots twice"
     },
@@ -4594,25 +4594,25 @@ window.details = {
         special: "Deals 25x ATK to one enemy. Changes own orb into matching orb"
     },
     973:{
-        captain: "Boosts ATK of Powerhouse Characters by 2x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Powerhouse characters by 2x if HP is above 99% at the start of the turn",
         specialName: "Ironclad Thrust: Dwarf Guard of the World",
         special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
     },
     974:{
-        captain: "Boosts ATK of Powerhouse Characters by 2.5x if HP is above 99% at the start of the turn",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x if HP is above 99% at the start of the turn",
         specialName: "Ironclad Thrust: Dwarf Guard of the World",
         special: "Deals 20,000 fixed damage to one enemy. Changes friend captain's orb into Matching orb"
     },
     975:{
         captain: "Reduces damage received by 10%",
         specialName: "A Threat That Puts Adults to Shame",
-        special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Boosts the ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
         specialNotes: "#{zombie}"
     },
     976:{
-        captain: "Boosts ATK of Driven Characters by 2x. Reduces damage received by 10%",
+        captain: "Boosts ATK of Driven characters by 2x. Reduces damage received by 10%",
         specialName: "A Threat That Puts Adults to Shame",
-        special: "Boosts the ATK of Striker and Driven Characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Boosts the ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
         specialNotes: "#{zombie}"
     },
     977:{
@@ -5862,27 +5862,27 @@ window.details = {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     1173: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
-        sailor: "Boosts RCV of PSY Characters by 15"
+        sailor: "Boosts RCV of PSY characters by 15"
     },
     1174: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     1175: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher Characters by 20"
+        sailor: "Boosts ATK of Slasher characters by 20"
     },
     1176: {
         special: "Removes poison, recovers 15x character's RCV in HP",
@@ -5925,14 +5925,14 @@ window.details = {
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
         specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
         specialName: "Brass Knuckle Destruction",
-        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
+        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] characters by 75"
     },
     1184: {
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Empties all slots with [PSY] orbs, deals several times the character's ATK in [PSY] damage to one enemy",
         specialNotes: "The exact multiplier used is chosen based on the number of [PSY] orbs consumed: 1 orb will give a 13x multiplier, 2 orbs 19x, 3 orbs 26x, 4 orbs 65x, 5 orbs 130x, 6 orbs 230x. It's not possible to activate the special without consuming at least one [PSY] orb.",
         specialName: "Brass Knuckle Destruction",
-        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] Characters by 75"
+        sailor: "If HP is above 99% at the start of the turn, boosts ATK of [PSY] characters by 75"
     },
     1185: {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
@@ -6097,27 +6097,27 @@ window.details = {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     1210: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter Characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10"
     },
     1211: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     1212: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter Characters by 20"
+        sailor: "Boosts ATK of Shooter characters by 20"
     },
     1213: {
         captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
@@ -6626,13 +6626,13 @@ window.details = {
     },
     1277: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.25x if HP is above 99% at the start of the turn",
-        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
+        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
     },
     1278: {//Doc Q Evo
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
-        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker Characters into Matching Orbs.",
+        special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
     },
@@ -7003,5 +7003,55 @@ window.details = {
         special: "Switches orbs between slots twice. Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
         specialName: "Tonta Knowledge",
     },
+        1331: {//Mansherry
+        captain: "Recovers 2x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
+                "cooldown": [ 18, 11 ],
+            },
+            {
+                "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
+                "cooldown": [ 24, 17 ],
+            },
+        ],
+        specialName: "Mansherry Special",
+    },
+    1332: {//Mansherry
+        captain: "Recovers 3x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
+                "cooldown": [ 18, 11 ],
+            },
+            {
+                "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
+                "cooldown": [ 24, 17 ],
+            },
+        ],
+        specialName: "Mansherry Special",
+    },
+    1333: {//Kabu
+        captain: "Boosts ATK of [STR] and Powerhouse characters by 1.4x",
+        captainNotes: "The bonus is cumulative. [STR] Powerhouse characters get a 1.96x bonus.",
+        special: "Slightly boosts chances of getting [STR] orbs and boosts own ATK by 1.2x for 2 turns",
+        specialName: "Kabu Special",
+    },
+    1334: {//Bian
+        captain: "Boosts ATK of [DEX] and Free Spirit characters by 1.4x",
+        captainNotes: "The bonus is cumulative. [DEX] Free Spirit characters get a 1.96x bonus.",
+        special: "Poisons all enemies and randomizes all orbs",
+        specialName: "Kabu Special",
+    },
+    1335: {//Wedding Sabo
+        captain: "Reduces cooldown of Free Spirit specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
+        special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
+        specialName: "Wedding Sabo Special",
+    },
+    1336: {//Wedding Sabo
+        captain: "Reduces cooldown of Free Spirit specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
+        special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
+        specialName: "Wedding Sabo Special",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 2e36b88ee..801e577fc 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1199,16 +1199,16 @@ window.drops = {
         },
         
         {
-            name: "Tontatta Kingdom Island",
+            name: "Tontatta Kingdom Island Part 1: Leo",
             thumb: 1330,
-            condition: "Slasher characters have their ATK reduced and their specials silenced",
+            condition: "Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
             "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
         },
         
         {
-            name: "Tontatta Kingdom Island",
+            name: "Tontatta Kingdom Island Part 2: Mansherry",
             thumb: 1332,
-            condition: "Striker characters have their ATK reduced and their specials silenced",
+            condition: "Striker characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (70% on 30 stamina)",
             "All Difficulties": [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
         },
         
diff --git a/common/data/gw.js b/common/data/gw.js
index 3b0654110..a6c17a0f4 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1323,4 +1323,17 @@ window.gw=[
     43894,
     43893,
     43893,
+        
+    
+    
+    
+    
+    
+    44750,
+    44750,
+    44751,
+    44752,
+    44762,
+    44762,
+    
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 2c03b5fcf..3d15008b8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1329,12 +1329,12 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "", "", "", null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry, Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 3, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Mansherry, Tontatta Tribe Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, null, 606, 303, 234, 1972, 604, 597, null],
+    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, null, 64, 37, 16, 1604, 964, 106, null],
+    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, null, 210, 182, 80, null, null, null, null],
+    [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, null, null, null, null, 1106, 574, 171, null],
+    [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, null],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
     [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],

From 1f3e5d121493eddc61842d62f65cca8f2ead4c09 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 15 Nov 2016 10:44:00 -0500
Subject: [PATCH 0647/1569] Some calculator ability things

New units added
---
 common/data/captains.js | 22 +++++++++++++++++++++-
 common/data/details.js  |  8 --------
 common/data/gw.js       | 10 ----------
 common/data/specials.js |  8 +++++++-
 common/data/zombies.js  | 10 +++++++++-
 5 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index b15735609..aca4944a9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3612,5 +3612,25 @@ window.captains = {
     },
     1330: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    }
+    },
+    1333: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 1.96 :
+                p.unit.class.has("Powerhouse") || p.unit.type == "STR" ? 1.4 :
+                1;
+        }
+    },
+    1334: {
+        atk: function(p) { 
+            return p.unit.class.has("Free Spirit") && p.unit.type == "DEX" ? 1.96 :
+                p.unit.class.has("Free Spirit") || p.unit.type == "DEX" ? 1.4 :
+                1;
+        }
+    },
+    1335: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1336: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index b25419fc1..37e20fde4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4401,11 +4401,7 @@ window.details = {
         specialNotes: "#{stages}"
     },
     934: {
-<<<<<<< HEAD
-        captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75x instead",
-=======
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
->>>>>>> refs/remotes/optc-db/master
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
         special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
@@ -7007,11 +7003,7 @@ window.details = {
         special: "Switches orbs between slots twice. Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
         specialName: "Tonta Knowledge",
     },
-<<<<<<< HEAD
-        1331: {//Mansherry
-=======
     1331: {//Mansherry
->>>>>>> refs/remotes/optc-db/master
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: [
             {
diff --git a/common/data/gw.js b/common/data/gw.js
index 83bee6854..cafcd0e39 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1323,16 +1323,6 @@ window.gw=[
     43894,
     43893,
     43893,
-<<<<<<< HEAD
-        
-=======
-    
->>>>>>> refs/remotes/optc-db/master
-    
-    
-    
-    
-    
     44750,
     44750,
     44751,
diff --git a/common/data/specials.js b/common/data/specials.js
index fc9b67a64..e381cc665 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1770,5 +1770,11 @@ window.specials = {
     },
     1329: {
         affinity: function(p){ return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1; }
-    }
+    },
+    1335: {
+        chainAddition: function(p){ return 0.5;}
+    },
+    1336: {
+        chainAddition: function(p){ return 0.5;}
+    },
 };
diff --git a/common/data/zombies.js b/common/data/zombies.js
index d214e3a65..a23ec1bea 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -286,5 +286,13 @@ window.zombies = {
     1330: {//Gancho
         type: 'healer',
         multiplier: 2
-    }
+    },
+    1331: {//Mansherry
+        type: 'healer',
+        multiplier: 2
+    },
+    1332: {//Mansherry
+        type: 'healer',
+        multiplier: 3
+    },
 };

From 418e81f05789a318623383e25625274b1197993c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 16 Nov 2016 14:58:48 -0500
Subject: [PATCH 0648/1569] Added new units

Colo Units added, Mansherry FN units completed.

Gedatsu's captain needs a little bit of work because I think he's the
first Positional Captain for a Type, not a class.
---
 common/data/captains.js  |  20 +++++
 common/data/cooldowns.js |  21 +++--
 common/data/details.js   |  46 ++++++++++-
 common/data/families.js  |  11 +++
 common/data/flags.js     |   2 +
 common/data/gw.js        | 164 +++++++++++++++++++--------------------
 common/data/specials.js  |   3 +
 common/data/units.js     |  20 ++---
 8 files changed, 183 insertions(+), 104 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index aca4944a9..966b02591 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3633,4 +3633,24 @@ window.captains = {
     1336: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
+    1337: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1338: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+    },
+    1339: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
+    },
+    1340: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    1341: {
+        //damageSorter: function(d) { return CrunchUtils.classSort(d, 2.625, "QCK"); }, //Boosts work, but the sorter doesn't
+        hitAtk: function(p) {
+            if (!(p.unit.type == "QCK")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.625 : 1.75;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 783d701be..b1dbfd880 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1055,8 +1055,8 @@ window.cooldowns = [
     [ 13, 13 ],
     21,
     21,
-    17,
-    17,
+    [ 17, 12 ],
+    [ 17, 12 ],
     15,
     15,
     10,
@@ -1101,8 +1101,8 @@ window.cooldowns = [
     [ 11, 11 ],
     [ 30, 15 ],
     [ 30, 15 ],
-    [ 27, 17],//Ain
-    [ 27, 17],//Ain
+    [ 27, 17 ],//Ain
+    [ 27, 17 ],//Ain
     [ 23, 12 ],
     [ 23, 12 ],
     [ 30, 15 ],
@@ -1136,7 +1136,7 @@ window.cooldowns = [
     [ 6, 6 ],
     [ 16, 12],
     [ 18 , 11 ],
-    19,
+    [ 19, 12 ],
     [ 15, 8 ],
     [ 30, 16 ],
     [ 30, 16 ],
@@ -1178,7 +1178,7 @@ window.cooldowns = [
     [ 23, 17 ],
     [ 17, 17 ],
     [ 17, 17 ],
-    null,
+    null,//Rainbow Armored Crab
     [ 19, 13 ],
     [ 19, 13 ],
     [ 23, 17 ],
@@ -1311,8 +1311,8 @@ window.cooldowns = [
     [ 16, 5 ],
     [ 25, 15 ],
     [ 25, 15 ],
-    25,
-    25,
+    [ 25, 18 ],
+    [ 25, 18 ],
     null,//Coby
     null,//Coby
     22,
@@ -1335,4 +1335,9 @@ window.cooldowns = [
     [ 19, 12 ],
     [ 6, 6 ],
     [ 6, 6 ],
+    [ 27, 15 ],
+    [ 27, 15 ],
+    null,//Jump Point Chopper
+    23,
+    23,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 37e20fde4..0f42a48ee 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7015,7 +7015,7 @@ window.details = {
                 "cooldown": [ 24, 17 ],
             },
         ],
-        specialName: "Mansherry Special",
+        specialName: "Tears of Healing",
     },
     1332: {//Mansherry
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
@@ -7029,19 +7029,19 @@ window.details = {
                 "cooldown": [ 24, 17 ],
             },
         ],
-        specialName: "Mansherry Special",
+        specialName: "Tears of Healing",
     },
     1333: {//Kabu
         captain: "Boosts ATK of [STR] and Powerhouse characters by 1.4x",
         captainNotes: "The bonus is cumulative. [STR] Powerhouse characters get a 1.96x bonus.",
         special: "Slightly boosts chances of getting [STR] orbs and boosts own ATK by 1.2x for 2 turns",
-        specialName: "Kabu Special",
+        specialName: "Yellow Kabu Squad",
     },
     1334: {//Bian
         captain: "Boosts ATK of [DEX] and Free Spirit characters by 1.4x",
         captainNotes: "The bonus is cumulative. [DEX] Free Spirit characters get a 1.96x bonus.",
         special: "Poisons all enemies and randomizes all orbs",
-        specialName: "Kabu Special",
+        specialName: "Pink Bee Squad",
     },
     1335: {//Wedding Sabo
         captain: "Reduces cooldown of Free Spirit specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
@@ -7053,5 +7053,43 @@ window.details = {
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
         specialName: "Wedding Sabo Special",
     },
+    1337: {//Kanjuro
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
+        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
+        specialName: "Brushman's Brush",
+    },
+    1338: {//Kanjuro
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
+        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [BLOCK], [G] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
+        specialName: "Brushman's Brush",
+    },
+    1339: {//Chopper Jump Point
+        captain: "Boosts ATK of [DEX] characters by 2.25x",
+        special: [
+            {
+                "description": "Reduces duration of Paralysis by 1 turn. Adds .2x to Chain multiplier for 1 turn",
+                "cooldown": [ 18, 8 ],
+            },
+            {
+                "description": "Reduces duration of Paralysis by 2 turn. Adds .3x to Chain multiplier for 1 turn",
+                "cooldown": [ 23, 13 ],
+            },
+            {
+                "description": "Reduces duration of Paralysis by 2 turn. Adds .5x to Chain multiplier for 1 turn",
+                "cooldown": [ 25, 15 ],
+            },
+        ],
+        specialName: "Flight Power Strengthening - Jump Point",
+    },
+    1340: {//Gedatsu
+        captain: "Boosts ATK of [QCK] characters by 1.5x",
+        special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
+        specialName: "Swamp Cloud Burger",
+    },
+    1341: {//Getdatsu
+        captain: "Boosts ATK of [QCK] characters by 1.75x. After scoring 3 Perfects in a row, boosts ATK of [QCK] characters by 2.625x instead.",
+        special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
+        specialName: "Swamp Cloud Burger",
+    },
 };
 
diff --git a/common/data/families.js b/common/data/families.js
index 9a5775f63..14d5532d7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1329,4 +1329,15 @@ window.families = [
     "Leo",
     "Wicca",
     "Gancho",
+    "Mansherry",
+    "Mansherry",
+    "Kabu",
+    "Bian",
+    "Sabo",
+    "Sabo",
+    "Kanjuro",
+    "Kanjuro",
+    "Tony Tony Chopper",
+    "Gedatsu",
+    "Gedatsu",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index a004ad887..6122ca1de 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1050,6 +1050,8 @@ window.flags = {
     1262: { rr: 1, rro: 1, lrr: 1 },
     1263: { rr: 1, rro: 1, lrr: 1 },
     1264: { rr: 1, rro: 1, lrr: 1 },
+    1265: { rr: 1, rro: 1, lrr: 1 },
+    1266: { rr: 1, rro: 1, lrr: 1 },
     1267: { rr: 1, rro: 1 },
     1268: { rr: 1, rro: 1 },
     1269: { rr: 1, rro: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index cafcd0e39..49aafe5b8 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1021,7 +1021,7 @@ window.gw=[
     28647,
     28647,
     28650,
-    null,
+    29679,
     28723,
     28723,
     28761,
@@ -1051,87 +1051,87 @@ window.gw=[
     29916,
     29916,
     29917,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    30405,
+    30405,
+    30529,
+    30529,
+    30530,
+    30530,
+    30531,
+    30531,
+    30558,
+    30556,
+    30554,
+    30555,
+    30553,
+    30552,
+    30551,
+    30550,
+    30771,
+    30771,
+    30770,
+    30770,
+    30772,
+    30738,
+    30738,
+    30733,
+    30733,
+    30734,
+    30734,
+    30737,
+    30737,
+    30736,
+    30736,
+    30744,
+    30744,
+    30798,
+    30798,
+    30797,
+    30797,
+    30796,
+    30796,
+    32539,
+    32539,
+    33121,
+    33121,
+    33122,
+    33122,
+    33123,
+    33396,
+    33396,
+    33488,
+    33488,
+    33489,
+    33489,
+    33490,
+    33490,
+    33650,
+    33650,
+    33851,
+    33851,
+    33850,
+    33850,
+    33852,
+    11949,
+    11949,
+    11950,
+    11950,
+    11951,
+    11951,
+    12878,
+    12878,
+    33767,
+    33767,
+    33765,
+    33765,
+    33764,
+    33764,
+    33763,
+    33763,
+    33762,
+    33762,
+    33766,
+    33766,
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index e381cc665..0298d7eae 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1777,4 +1777,7 @@ window.specials = {
     1336: {
         chainAddition: function(p){ return 0.5;}
     },
+    1339: {
+        chainAddition: function(p){ return 0.5;}
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 3d15008b8..13f398e69 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1305,8 +1305,8 @@ window.units = [
     [ "Prison Escapee Galdino, Jailbreak Alliance", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 932, 323, 138, 2052, 753, 357, 1 ],
     [ "Little Succubus Sugar", "DEX", [ "Cerebral", "Slasher" ], 4, 12, 6, 1, 50, 392109, 70, 32, 50, 912, 409, 250, 1 ],
     [ "Little Succubus Sugar, Halloween Night - Masquerade", "DEX", [ "Cerebral", "Slasher" ], 5, 20, 4, 3, 99, 3000000, 844, 358, 209, 1768, 843, 407, 1 ],
-    [ "Halloween Bartolomeo", "QCK", [ "Driven", "Fighter" ], 4, 13, 5, 2, 50, 392109, 106, 99, 33, 1171, 557, 158, null ],
-    [ "Halloween Bartolomeo Evolved", "QCK", [ "Driven", "Fighter" ], 5, 20, 4, 4, 99, 3000000, 1109, 472, 109, 2149, 1242, 247, null ],
+    [ "Bartolomeo, Full Moon Wolf", "QCK", [ "Driven", "Fighter" ], 4, 13, 5, 2, 50, 392109, 106, 99, 33, 1171, 557, 158, 1 ],
+    [ "Bartolomeo, Full Moon Wolf Halloween Night - Masquerade", "QCK", [ "Driven", "Fighter" ], 5, 20, 4, 4, 99, 3000000, 1109, 472, 109, 2149, 1242, 247, 1 ],
     [ "Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 609, 399, 62, 1142, 779, 177, 1 ],
     [ "Foxfire Kinemon", "STR", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1095, 708, 131, 2075, 1433, 321, 1 ],
     [ "Boa Marigold, Kuja Warrior", "INT", [ "Slasher", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 245, 116, 24, 1209, 462, 99, 1 ],
@@ -1329,17 +1329,17 @@ window.units = [
     [ "Warrior Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 810, 472, 140, 1724, 1134, 281, 1 ],
     [ "Wicca", "QCK", [ "Fighter", "Free Spirit" ], 3, 15, 8, 2, 70, 1066998, 101, 88, 11, 1017, 888, 219, 1 ],
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
-    [ "Mansherry, Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 3, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Mansherry, Tontatta Tribe Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, null, 606, 303, 234, 1972, 604, 597, null],
-    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, null, 64, 37, 16, 1604, 964, 106, null],
-    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, null, 210, 182, 80, null, null, null, null],
+    [ "Mansherry, Daughter of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 20, 10, 30, 666, 333, 270, 1],
+    [ "Mansherry, Princess of Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 606, 303, 234, 1472, 604, 497, 1],
+    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 64, 37, 16, 1604, 964, 106, 1],
+    [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, 1066998, 38, 28, 28, 888, 789, 288, 1],
     [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, null, null, null, null, 1106, 574, 171, null],
     [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, null],
-    [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Kanjuro Evolved", "PSY", [ "Striker", "Free Spirit" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 554, 261, 35, 1275, 707, 183, null],
+    [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, null, null, null, null],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Gedatsu", "QCK", [ "Driven", "Free Spirit" ], 4, 16, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Gedatsu", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, null, 109, 122, 38, 753, 505, 193, null],
+    [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, null, 692, 448, 142, null, null, null, null],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From eb2730906e0905c17a2a15dedea9cfb32f02d9ed Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 16 Nov 2016 14:59:11 -0500
Subject: [PATCH 0649/1569] Aliases

Just some aliases
---
 common/data/aliases.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d6e72fbda..733c30fb2 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1018,10 +1018,10 @@ window.aliases = {
     1017: ['茶ひげ','','Coliseum'],
     1018: ['茶ひげ ワニのケンタウロス','','Coliseum'],
     1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum'],
-    1020: ['？？？','','Sakura Sugar'],
-    1021: ['？？？','','Sakura Sugar'],
+    1020: ['シュガー　実桜','','Sakura Sugar'],
+    1021: ['シュガー　桜桃','','Sakura Sugar'],
     1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
-    1023: ['？？？',''],
+    1023: ['ポートガス・D・エース 海賊王に馳せた夢',''],
     1024: ['首領・チンジャオ','Don Chinjao'],
     1025: ['首領・チンジャオ 花ノ国のギャング','Don Chinjao'],
     1026: ['ブルーギリー',''],
@@ -1282,8 +1282,8 @@ window.aliases = {
     1281: ['ガープ 海軍本部中将','',''],
     1282: ['センゴク 海軍本部元帥','',''],
     1283: ['赤犬 海軍本部大将','','Sakazuki'],
-    1284: ['モンキー・D・ルフィ 野生の海賊','',''],
-    1285: ['モンキー・D・ルフィ 大地の開拓者','',''],
+    1284: ['モンキー・D・ルフィ 野生の海賊','','Wild Luffy'],
+    1285: ['モンキー・D・ルフィ 大地の開拓者','','Wild Luffy'],
     1286: ['ベビー５ スパイダーマイルズの少女','','Kid Baby 5'],
     1287: ['ベビー５ ドンキホーテファミリーの一員','','Kid Baby 5'],
     1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law', 'Kid Law'],
@@ -1305,8 +1305,8 @@ window.aliases = {
     1304: ['脱走囚　ギャルディーノ 脱獄同盟','','Mr 3', 'Mr. 3'],
     1305: ['シュガー　リトルサキュバス','',''],
     1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','',''],
-    1307: ['','',''],
-    1308: ['','',''],
+    1307: ['バルトロメオ　フルムーンウルフ','','Halloween Bartolomeo'],
+    1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード','','Halloween Bartolomeo'],
     1309: ['錦えもん','','Coliseum'],
     1310: ['狐火の錦えもん','','Coliseum'],
     1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum'],
@@ -1329,12 +1329,12 @@ window.aliases = {
     1328: ['戦士レオ トンタッタ族トンタ兵団','',''],
     1329: ['ウィッカ','',''],
     1330: ['ガンチョ','',''],
-    1331: ['','',''],
-    1332: ['','',''],
-    1333: ['','',''],
-    1334: ['','',''],
-    1335: ['','',''],
-    1336: ['','',''],
+    1331: ['マンシェリー トンタ長の娘','',''],
+    1332: ['マンシェリー トンタッタ王国の姫','',''],
+    1333: ['カブ','',''],
+    1334: ['ビアン','',''],
+    1335: ['','','Gentleman Sabo'],
+    1336: ['','','Gentleman Sabo'],
     1337: ['','','Coliseum'],
     1338: ['','','Coliseum'],
     1339: ['','','Coliseum'],

From b4a8486a376954bd5f6ce6b524464cdfd3e0c79d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 16 Nov 2016 15:07:28 -0500
Subject: [PATCH 0650/1569] typeSort attempt, block commented

It doesn't work as intended, but most of it is taken from classSort. Not
sure how to adapt it properly for types instead of classes, but my
attempt that is block commented didn't work correctly.
---
 common/data/evolutions.js |  6 +++++-
 damage/js/utils.js        | 30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3325d22fe..af6fc1589 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2030,5 +2030,9 @@ window.evolutions = {
     1327: {
         evolution: 1328,
         evolvers: [ 116, 117, 80, 91, 102 ]
-    }
+    },
+    1331: {
+        evolution: 1332,
+        evolvers: [ 116, 117, 81, 92, 103 ]
+    },
 };
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 04f85e8bc..814c6b213 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -65,6 +65,36 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
     // return result
     return result;
 };
+    
+/*window.CrunchUtils.typeSort = function(array, typeMultiplier, types) {
+    var result = [ ];
+    function isUnitAMatch(unit) {
+        if (unit.type == types) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
+    var temp = array.map(function(x) {
+        var multiplier = x.multipliers.reduce(function(prev,next) { return prev * next[0]; },1);
+        return [ x.base * multiplier * (isUnitAMatch(x.unit.unit) ? typeMultiplier : 1), x ];
+    });
+    temp.sort(function(x,y) { return x[0] - y[0]; });
+    result.push(temp.map(function(x) { return x[1]; }));
+    // class-based
+    var beginning = [ ], end = [ ];
+    array.forEach(function(x) {
+        if (isUnitAMatch(x.unit.unit)) {
+            end.push(x);
+        } else {
+            beginning.push(x);
+        }
+    });
+    result.push(beginning.concat(end));
+    // return result
+    return result;
+};*/
 
 window.CrunchUtils.getOrbMultiplier = function(orb, baseMultiplier, boostedMultiplier) {
     if (orb == 1.0) return baseMultiplier;

From c1b05494bdd5e69729b86b36dc1fd1cf8e9b3896 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 16 Nov 2016 16:36:34 -0500
Subject: [PATCH 0651/1569] Chopper's Special

Multistage Chain Special, I accedentally made it just the third stage.
---
 common/data/specials.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 0298d7eae..99c1963a2 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1778,6 +1778,18 @@ window.specials = {
         chainAddition: function(p){ return 0.5;}
     },
     1339: {
-        chainAddition: function(p){ return 0.5;}
+        chainAddition: function(p) {
+            if (!window.specials[1339].stage) return 0.2;
+            if (window.specials[1339].stage == 1) return 0.3;
+            if (window.specials[1339].stage == 2) return 0.5;
+        },
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[1339].stage = (window.specials[1339].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[1339].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '1339warning'
+            });
+        }
     },
 };

From 8bb9af090a46aaaae835f593a329ff257fe5c7b4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 16 Nov 2016 22:25:31 -0500
Subject: [PATCH 0652/1569] Fixed descriptions and Abilities

Sabo, Speed Jiru, and Gedatsu
---
 common/data/captains.js |  6 +++---
 common/data/details.js  | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 966b02591..1b747aae5 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3628,7 +3628,7 @@ window.captains = {
         }
     },
     1335: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1336: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
@@ -3649,8 +3649,8 @@ window.captains = {
         //damageSorter: function(d) { return CrunchUtils.classSort(d, 2.625, "QCK"); }, //Boosts work, but the sorter doesn't
         hitAtk: function(p) {
             if (!(p.unit.type == "QCK")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.625 : 1.75;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 2.625 : 1.75;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
     },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 0f42a48ee..08fdab3c8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5986,7 +5986,7 @@ window.details = {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
         special: "Reduces enemy Barrier timers by 1 turn",
-        specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
+        specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
         sailor: "Boosts ATK of [QCK] characters by 40"
     },
@@ -5994,7 +5994,7 @@ window.details = {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
         special: "Reduces enemy Barrier timers by 1 turn",
-        specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers and Combo Hit Barriers",
+        specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
         sailor: "Boosts ATK of [QCK] characters by 40"
     },
@@ -7044,12 +7044,12 @@ window.details = {
         specialName: "Pink Bee Squad",
     },
     1335: {//Wedding Sabo
-        captain: "Reduces cooldown of Free Spirit specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight. Boosts ATK of Free Spirit characters by 1.5x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
         specialName: "Wedding Sabo Special",
     },
     1336: {//Wedding Sabo
-        captain: "Reduces cooldown of Free Spirit specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
         specialName: "Wedding Sabo Special",
     },
@@ -7087,7 +7087,7 @@ window.details = {
         specialName: "Swamp Cloud Burger",
     },
     1341: {//Getdatsu
-        captain: "Boosts ATK of [QCK] characters by 1.75x. After scoring 3 Perfects in a row, boosts ATK of [QCK] characters by 2.625x instead.",
+        captain: "Boosts ATK of [QCK] characters by 1.75x. After scoring 3 hits below Good in a row, boosts ATK of [QCK] characters by 2.625x instead.",
         special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
         specialName: "Swamp Cloud Burger",
     },

From aa7ab9f0dcd2620c0d18b594fa6c9b7191b087a9 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 17 Nov 2016 14:56:07 -0500
Subject: [PATCH 0653/1569] Stats and Gamewith Links

Added stats for new Chars and Gamewith links
---
 common/data/cooldowns.js |   4 +-
 common/data/details.js   |   4 +-
 common/data/gw.js        | 174 +++++++++++++++++++++------------------
 common/data/units.js     |   8 +-
 4 files changed, 100 insertions(+), 90 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b1dbfd880..eb9a01091 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1338,6 +1338,6 @@ window.cooldowns = [
     [ 27, 15 ],
     [ 27, 15 ],
     null,//Jump Point Chopper
-    23,
-    23,
+    [ 23, 13 ],
+    [ 23, 13 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 08fdab3c8..407cb3daa 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7055,12 +7055,12 @@ window.details = {
     },
     1337: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
-        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
+        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
     },
     1338: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
-        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [BLOCK], [G] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
+        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
     },
     1339: {//Chopper Jump Point
diff --git a/common/data/gw.js b/common/data/gw.js
index 49aafe5b8..f1b738309 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1132,87 +1132,87 @@ window.gw=[
     33762,
     33766,
     33766,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    34316,
+    34316,
+    34499,
+    34496,
+    34497,
+    34498,
+    34493,
+    34493,
+    34494,
+    34494,
+    34495,
+    34495,
+    34757,
+    34756,
+    34755,
+    34754,
+    34753,
+    34752,
+    34751,
+    34750,
+    34748,
+    34749,
+    34747,
+    34747,
+    34746,
+    34746,
+    35105,
+    35105,
+    35076,
+    35076,
+    35077,
+    35077,
+    35203,
+    35203,
+    35202,
+    35202,
+    35201,
+    35201,
+    11952,
+    11952,
+    12648,
+    12648,
+    11953,
+    11953,
+    35056,
+    35056,
+    1861,
+    35411,
+    35411,
+    35305,
+    35305,
+    35306,
+    35306,
+    35374,
+    35374,
+    35412,
+    35412,
+    35281,
+    35281,
+    35516,
+    35516,
+    35525,
+    35525,
+    35526,
+    35778,
+    35778,
+    36035,
+    36035,
+    35904,
+    35904,
+    35906,
+    35906,
+    35907,
+    12650,
+    12650,
+    12649,
+    12649,
+    12651,
+    12651,
+    36068,
+    36068,
     36743,
     36744,
     36742,
@@ -1329,5 +1329,15 @@ window.gw=[
     44752,
     44762,
     44762,
-    
+    44750,
+    44750,
+    44751,
+    44752,
+    44762,
+    44762,
+    44766,
+    44766,
+    44770,
+    44768,
+    44768,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 13f398e69..d4fe9858c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1333,13 +1333,13 @@ window.units = [
     [ "Mansherry, Princess of Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 606, 303, 234, 1472, 604, 497, 1],
     [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 64, 37, 16, 1604, 964, 106, 1],
     [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, 1066998, 38, 28, 28, 888, 789, 288, 1],
-    [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, null, null, null, null, 1106, 574, 171, null],
+    [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, null, 203, 142, 32, 1106, 574, 171, null],
     [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, null],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 554, 261, 35, 1275, 707, 183, null],
     [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, null, null, null, null],
-    [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Gedatsu", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, null, 109, 122, 38, 753, 505, 193, null],
-    [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, null, 692, 448, 142, null, null, null, null],
+    [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, null, 162, 91, 29, null, null, null, null],
+    [ "Gedatsu", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, 392109, 109, 122, 38, 753, 505, 193, null],
+    [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, null, 692, 448, 142, 1443, 1220, 288, null],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 1905867cf66cf07e6670b4d697a4a81033a15afa Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 21 Nov 2016 10:27:34 -0500
Subject: [PATCH 0654/1569] Couple Fixes

Elizabello Captain
Manshery FN special
Baroke Works condition
---
 common/data/captains.js | 2 +-
 common/data/details.js  | 6 +++---
 common/data/drops.js    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1b747aae5..adc4f492a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2864,7 +2864,7 @@ window.captains = {
     },
     1131: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return 2; }
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
diff --git a/common/data/details.js b/common/data/details.js
index 407cb3daa..c1c90f031 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5613,7 +5613,7 @@ window.details = {
         specialName: "King Punch"
     },
     1131: {
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x, and HP of all characters by 2x",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 2x",
         special: [
             {
                 "description": "Deals 7x character's ATK in typeless damage to all enemies",
@@ -7007,7 +7007,7 @@ window.details = {
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: [
             {
-                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
+                "description": "Reduces Bind duration for one character by 3 turns. Recovers 7x character's RCV in HP.",
                 "cooldown": [ 18, 11 ],
             },
             {
@@ -7021,7 +7021,7 @@ window.details = {
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: [
             {
-                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
+                "description": "Reduces Bind duration for one character by 3 turns. Recovers 7x character's RCV in HP.",
                 "cooldown": [ 18, 11 ],
             },
             {
diff --git a/common/data/drops.js b/common/data/drops.js
index 801e577fc..dd4d16f00 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -838,7 +838,7 @@ window.drops = {
             name: 'Prison Break! Baroque Works',
             thumb: 462,
             global: true,
-            condition: 'Striker, Shooter and Slashers are weakend.',
+            condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Slasher class characters are weakened (Note: Multi-class characters such as Fighter / Powerhouse are not affected)'',
             challenge: 'Damage dealt in a single Round',
             challengeData: [['???','1x ??? Elder'], ['???','1x ?? Cotton Candy'], ['???','3x Rainbow Gems']],
             "All Difficulties": [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
@@ -848,7 +848,7 @@ window.drops = {
             name: 'Crocodile: Life on the Inside',
             thumb: 510,
             global: true,
-            condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened (Note: Multi-class characters such as Fighter / Slasher are not affected)',
+            condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened (Note: Multi-class characters such as Striker / Slasher are not affected)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x CDR Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]

From bc6d9a7eb66513db9445f1cca165cc913a97a198 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 21 Nov 2016 11:21:13 -0500
Subject: [PATCH 0655/1569] Fixed drop table

extra quotation mark
---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index dd4d16f00..5d957cfa4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -838,7 +838,7 @@ window.drops = {
             name: 'Prison Break! Baroque Works',
             thumb: 462,
             global: true,
-            condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Slasher class characters are weakened (Note: Multi-class characters such as Fighter / Powerhouse are not affected)'',
+            condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Slasher class characters are weakened (Note: Multi-class characters such as Fighter / Powerhouse are not affected)',
             challenge: 'Damage dealt in a single Round',
             challengeData: [['???','1x ??? Elder'], ['???','1x ?? Cotton Candy'], ['???','3x Rainbow Gems']],
             "All Difficulties": [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]

From 5d9dd545d0b7745c51c4b35d9fad1ea3b11f38e7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 23 Nov 2016 00:07:30 -0500
Subject: [PATCH 0656/1569] Global Tags

Just a bunch of global tags
---
 common/data/details.js |  2 +-
 common/data/drops.js   |  4 +++
 common/data/flags.js   | 59 ++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c1c90f031..bdf380d7f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6898,7 +6898,7 @@ window.details = {
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         sailor: "Boosts ATK of all characters by 75",
-        specialName: "Super Large Iron Balll",
+        specialName: "Super Large Iron Ball",
     },
     1319: {//Lady Tsuru
         captain: "Heals for 1x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
diff --git a/common/data/drops.js b/common/data/drops.js
index 5d957cfa4..fb081a330 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -487,6 +487,7 @@ window.drops = {
             name: "Amazon Lily",
             shortName: "Amazon Lily",
             thumb: 1056,
+            global: true,
             completion: '5x Rainbow Gems',
             "01": [ 919, 301, 300 ],
             "02": [ 1059, 301, 303 ],
@@ -503,6 +504,7 @@ window.drops = {
             name: "Impel Down",
             shortName: "Impel Down",
             thumb: 1159,
+            global: true,
             completion: '5x Rainbow Gems',
             "01": [ 931 ],
             "02": [ 540, 931 ],
@@ -1138,6 +1140,7 @@ window.drops = {
         {
             name: "Robin and Nami's Secret Undercover Investigation",
             thumb: 1112,
+            global: true,
             condition: "Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             "All Difficulties": [ 1109, 1111, 1113, -23, -628, -639, -641, -892, -937, -939, -941 ]
         },
@@ -1152,6 +1155,7 @@ window.drops = {
         {
             name: "Welcome To The Gran Tesoro!",
             thumb: 1167,
+            global: true,
             condition: "None",
             "All Difficulties": [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index 6122ca1de..750f60eeb 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -888,6 +888,12 @@ window.flags = {
     916: { rr: 1, rro: 1, lrr: 1, global: 1 },
     921: { rr: 1, rro: 1, lrr: 1, global: 1 },
     922: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    923: { global: 1 },
+    924: { global: 1 },
+    925: { global: 1 },
+    926: { global: 1 },
+    927: { global: 1 },
+    931: { global: 1 },
     934: { rr: 1, rro: 1, global: 1 },
     935: { rr: 1, rro: 1, global: 1 },
     936: { rr: 1, rro: 1, global: 1 },
@@ -958,10 +964,29 @@ window.flags = {
     1033: { rr: 1, rro: 1, global: 1 },
     1034: { rr: 1, rro: 1, global: 1 },
     1035: { rr: 1, rro: 1, global: 1 },
-    1044: { rr: 1, rro: 1 },
-    1045: { rr: 1, rro: 1 },
+    1044: { rr: 1, rro: 1, global: 1 },
+    1045: { rr: 1, rro: 1, global: 1 },
     1053: { rr: 1, rro: 1, lrr: 1 },
     1054: { rr: 1, rro: 1, lrr: 1 },
+    1055: { global: 1 },
+    1056: { global: 1 },
+    1057: { global: 1 },
+    1058: { global: 1 },
+    1059: { global: 1 },
+    1060: { global: 1 },
+    1061: { global: 1 },
+    1062: { global: 1 },
+    1063: { global: 1 },
+    1064: { global: 1 },
+    1065: { global: 1 },
+    1066: { global: 1 },
+    1067: { global: 1 },
+    1068: { global: 1 },
+    1069: { global: 1 },
+    1070: { global: 1 },
+    1071: { global: 1 },
+    1072: { global: 1 },
+    1073: { global: 1 },
     1074: { rr: 1, rro: 1, global: 1 },
     1075: { rr: 1, rro: 1, global: 1 },
     1076: { rr: 1, rro: 1, global: 1 },
@@ -976,10 +1001,20 @@ window.flags = {
     1085: { rr: 1, rro: 1, global: 1 },
     1092: { rr: 1, rro: 1, lrr: 1 },
     1093: { rr: 1, rro: 1, lrr: 1 },
+    1094: { global: 1 },
+    1095: { global: 1 },
+    1096: { global: 1 },
+    1097: { global: 1 },
+    1098: { global: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
     1100: { rr: 1, rro: 1, lrr: 1 },
     1107: { global: 1 },
     1108: { global: 1 },
+    1109: { global: 1 },
+    1110: { global: 1 },
+    1111: { global: 1 },
+    1112: { global: 1 },
+    1113: { global: 1 },
     1114: { rr: 1, rro: 1, global: 1 },
     1115: { rr: 1, rro: 1, global: 1 },
     1116: { rr: 1, rro: 1, global: 1 },
@@ -1000,8 +1035,28 @@ window.flags = {
     1131: { rr: 1, rro: 1, global: 1 },
     1132: { rr: 1, rro: 1, global: 1 },
     1133: { rr: 1, rro: 1, global: 1 },
+    1146: { global: 1 },
+    1147: { global: 1 },
+    1148: { global: 1 },
+    1149: { global: 1 },
+    1150: { global: 1 },
+    1151: { global: 1 },
+    1152: { global: 1 },
+    1153: { global: 1 },
+    1154: { global: 1 },
+    1155: { global: 1 },
+    1156: { global: 1 },
+    1157: { global: 1 },
+    1158: { global: 1 },
+    1159: { global: 1 },
     1160: { rr: 1, rro: 1, lrr: 1 },
     1161: { rr: 1, rro: 1, lrr: 1 },
+    1166: { global: 1 },
+    1167: { global: 1 },
+    1168: { global: 1 },
+    1169: { global: 1 },
+    1170: { global: 1 },
+    1171: { global: 1 },
     1172: { rr: 1, rro: 1, global: 1 },
     1173: { rr: 1, rro: 1, global: 1 },
     1174: { rr: 1, rro: 1, global: 1 },

From 99bfb4487b7b28d8bf933c86f33e4fa4074da9d4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 25 Nov 2016 00:24:50 -0500
Subject: [PATCH 0657/1569] General Update

New units, story Stats, global tags, crab island, gw links
---
 common/data/drops.js   | 37 ++++++++++++++++++++++++++++++++++++-
 common/data/flags.js   |  4 ++++
 common/data/gw.js      | 12 ++++++++++++
 common/data/tandems.js |  2 +-
 common/data/units.js   | 12 ++++++++++++
 5 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index fb081a330..c13876829 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -565,6 +565,27 @@ window.drops = {
             "15": [ 1283 ],
         },
         
+        {
+            name: "3D2Y - Timeskip Training",
+            shortName: "3D2Y",
+            thumb: 1353,
+            completion: '5x Rainbow Gems',
+            "01": [ 1342 ],
+            "02": [ 1343 ],
+            "03": [  ],
+            "04": [ 1344 ],
+            "05": [ 1345 ],
+            "06": [ 1346 ],
+            "07": [ 1347 ],
+            "08": [ 1348 ],
+            "09": [ 1349 ],
+            "10": [  ],
+            "11": [ 1350 ],
+            "12": [ 1351 ],
+            "13": [ 1352 ],
+            "14": [ 1353 ],
+        },
+        
     ],
 
     'Weekly Island': [
@@ -624,11 +645,18 @@ window.drops = {
         },
 
         {
-            name: 'Scissor Cavern, Intern',
+            name: 'Scissor Cavern, Inner Cave',
             day: 4,
             thumb: 304,
             ' ': [ 89, 90, 91, 92, 93, 95, 96, 97, 98, 99, 300, 301, 302, 303, 304 ]
         },
+        
+        {
+            name: 'Scissor Cavern, Deepest Parts',
+            day: 4,
+            thumb: 1180,
+            ' ': [ 89, 90, 91, 92, 93, 95, 96, 97, 98, 99, 300, 301, 302, 303, 304, 1180 ]
+        },
 
         {
             name: 'Jeweled Porc Sanctuary',
@@ -1216,6 +1244,12 @@ window.drops = {
             "All Difficulties": [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
         },
         
+        {
+            name: "Big Mom Pirates!",
+            thumb: null,
+            "All Difficulties": [ -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610 ]
+        },
+        
     ],
 
             
@@ -1389,6 +1423,7 @@ window.drops = {
         {
             name: 'Clash!! Tesoro',
             thumb: 1163, 
+            global: true,
             Master: [ 1162, 1164 ],
             Ultimate: [ 1162, 1164, 1180 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index 750f60eeb..48b07bb85 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1051,6 +1051,10 @@ window.flags = {
     1159: { global: 1 },
     1160: { rr: 1, rro: 1, lrr: 1 },
     1161: { rr: 1, rro: 1, lrr: 1 },
+    1162: { global: 1 },
+    1163: { global: 1 },
+    1164: { global: 1 },
+    1165: { global: 1 },
     1166: { global: 1 },
     1167: { global: 1 },
     1168: { global: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index f1b738309..ef7ab0bf4 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1340,4 +1340,16 @@ window.gw=[
     44770,
     44768,
     44768,
+    45630,
+    45629,
+    45628,
+    45561,
+    45627,
+    45634,
+    45633,
+    45632,
+    45636,
+    45635,
+    45637,
+    45560,
 ];
\ No newline at end of file
diff --git a/common/data/tandems.js b/common/data/tandems.js
index 5931f864d..8a97534b4 100644
--- a/common/data/tandems.js
+++ b/common/data/tandems.js
@@ -326,7 +326,7 @@ window.tandems = [
     },
     {
         "name": "Snake Pit Dance",
-        "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Tough characters by 1.3x until the end of the current turn",
+        "desc": "Deals 3 times the cumulative ATK of all the characters in the tandem to all enemies, boosts ATK of Powerhouse characters by 1.3x until the end of the current turn",
         "units": [ 1056, 1058 ]
     },
 ];
diff --git a/common/data/units.js b/common/data/units.js
index d4fe9858c..084c87377 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1340,6 +1340,18 @@ window.units = [
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, null, 162, 91, 29, null, null, null, null],
     [ "Gedatsu", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, 392109, 109, 122, 38, 753, 505, 193, null],
     [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, null, 692, 448, 142, 1443, 1220, 288, null],
+    [ "Dadan", "PSY", [ "Slasher", "Powerhouse" ], 3, 12, 6, 2, 50, null, null, null, null, 1844, 703, 151, null],
+    [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, null, 125, 106, 6, 1734, 891, 34, null],
+    [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, null, null, null, null, 1809, 1043, 9, null],
+    [ "Jimbe", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 510, 261, 73, 2329, 1144, 229, null],
+    [ "Heracles'n", "Dex", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, null, null, null, null, 2095, 899, 303, null],
+    [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, null, 109, 66, 12, null, null, null, null],
+    [ "Humandrills", "STr", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, null, 133, 112, 0, null, null, null, null],
+    [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, null, null, null, null, null, null, null, null],
+    [ "Longarm Tribe Theives", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, null, null, null, null, null, null, null, null],
+    [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, null, 51, 38, 21, null, null, null, null],
+    [ "Ivankov", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, null, null, null, null, 2034, 935, 299, null],
+    [ "Rayleigh", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, null, 388, 298, 97, 2037, 1264, 294, null],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 698bd17f76b0b46ab09f185af3b3e367a897e318 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 25 Nov 2016 00:26:29 -0500
Subject: [PATCH 0658/1569] Grammar and Syntax

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 084c87377..9c1346817 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1344,9 +1344,9 @@ window.units = [
     [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, null, 125, 106, 6, 1734, 891, 34, null],
     [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, null, null, null, null, 1809, 1043, 9, null],
     [ "Jimbe", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 510, 261, 73, 2329, 1144, 229, null],
-    [ "Heracles'n", "Dex", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, null, null, null, null, 2095, 899, 303, null],
+    [ "Heracles'n", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, null, null, null, null, 2095, 899, 303, null],
     [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, null, 109, 66, 12, null, null, null, null],
-    [ "Humandrills", "STr", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, null, 133, 112, 0, null, null, null, null],
+    [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, null, 133, 112, 0, null, null, null, null],
     [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, null, null, null, null, null, null, null, null],
     [ "Longarm Tribe Theives", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, null, null, null, null, null, null, null, null],
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, null, 51, 38, 21, null, null, null, null],

From a7d7b924fc807b7a22c45a9576b14b69e2b8b99a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 25 Nov 2016 01:04:52 -0500
Subject: [PATCH 0659/1569] Story Abilities

Special and Captain descriptions done
---
 common/data/details.js | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index bdf380d7f..94cd6975d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7091,5 +7091,62 @@ window.details = {
         special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
         specialName: "Swamp Cloud Burger",
     },
+    1342: {//Dedan
+        captain: "Boosts HP of [PSY] characters by 1.75x",
+        special: "Reduces Silence duration by 2 turns",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialName: "Dadan Special",
+    },
+    1343: {//Porchemy
+        captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2x.",
+        special: "Deals 13x character's Atk in [DEX] damage to one enemy, and boosts ATK against enemies with reduced defense by 1.3x for 1 turn",
+        specialName: "Porchemy Special",
+    },
+    1344: {//Bluejam
+        captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2.25x.",
+        special: "Deals large [STR] damage to one enemy, and boosts ATK of Driven characters by 1.3x for 1 turn",
+        specialName: "Porchemy Special",
+    },
+    1345: {//Jimbe
+        captain: "Boosts ATK of Fighter characters by 2.5x",
+        special: "Reduces Despair duration by 5 turns. Reduces Special Cooldown of your top row by 1 turn",
+        specialName: "Jimbe Special",
+    },
+    1346: {//Heracles'n
+        captain: "Boosts ATK, HP and RCV of Shooter and Cerebral characters by 1.5x",
+        special: "Randomizes all orbs, including [BLOCK] orbs, switches orbs between slots 3 times",
+        specialName: "Heracles'n Special",
+    },
+    1347: {//Torino Kingdom Monsters
+        special: "Change own orb into [PSY], and deals 25x character's attack in [PSY] damage to one enemy",
+        specialName: "Torino Kingdom Monsters Special",
+    },
+    1348: {//Humandrills
+        special: "Boosts ATK of all characters by 1.2x for 1 turn and amplifies the effect of orbs by 1.2x for 1 turn",
+        specialName: "Humandrills Special",
+    },
+    1349: {//Haredas
+        captain: "Boosts ATK, HP and RCV of Shooter and Cerebral characters by 1.5x",
+        special: "Empty all slots including [BLOCK] orbs, and boost ATK of Cerebral characters by 1.2x for 1 turn",
+        specialName: "Haredas Special",
+    },
+    1350: {//Longarm Tribe Theives
+        special: "Switches orbs between slots 3 times",
+        specialName: "Longarm Tribe Theives Special",
+    },
+    1351: {//Tequila Wolf Guard
+        special: "Reduces the defense of all by 50% and delays all enemies for 1 turn",
+        specialName: "Tequila Wolf Guard Special",
+    },
+    1352: {//Ivankov
+        captain: "Boosts ATK of Fighter characters by 2x, boosts Atk of Fighter characters by 3.5x after the 5th Perfect",
+        special: "Following the activation of the special, if every unit scores a Perfect hit, reduces damage received by 90% in the following turn",
+        specialName: "Ivankov Special",
+    },
+    1353: {//Rayleigh
+        captain: "Boosts ATK of Cerebral characters by 2.5x",
+        special: "Deals 50,000 Fixed damage to one enemy, Adds 0.5 to Chain multiplier for 1 turn",
+        specialName: "Rayleigh Special",
+    },
 };
 

From 49fb372a3a26145924daec3b6d41b2bf834e946d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 25 Nov 2016 11:44:14 -0500
Subject: [PATCH 0660/1569] New Story Units Captain Abilities

Added Captain Abilites
---
 common/data/captains.js | 38 ++++++++++++++++++++++++++++++++++++--
 common/data/details.js  | 10 +++++-----
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index adc4f492a..a4a797a8f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3551,10 +3551,10 @@ window.captains = {
     },
     1315: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
             //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
             //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -3653,4 +3653,38 @@ window.captains = {
         },
         hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
     },
+    1342: {
+        hp: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+    },
+    1343: {
+        hp: function(p) { return p.unit.class.has("Driven") ? 0.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1344: {
+        hp: function(p) { return p.unit.class.has("Driven") ? 0.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
+    },
+    1345: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+    },
+    1346: {
+        hp: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+    },
+    1349: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+    },
+    1352: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, ["Fighter"]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1353:{
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+    }
 };
diff --git a/common/data/details.js b/common/data/details.js
index 94cd6975d..f320ab991 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6664,14 +6664,14 @@ window.details = {
     },
     1284: {//Wild Luffy
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
-        special: "Reduces duration of Bind and Silence by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
-        sailor: "Reduces duration of Silence against this character by 3 turns",
+        special: "Reduces Bind and Silence duration by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
+        sailor: "Reduces Silence duration against this character by 3 turns",
         specialName: "Wild Hunt",
     },
     1285: {//Wild Luffy Evolved
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 3.375x instead.",
-        special: "Reduces duration of Despair and Silence by 3 turns. Randomizes Non-Matching orbs. (Including [BLOCK] orb)",
-        sailor: "Reduces duration of Silence against this character by 3 turns",
+        special: "Reduces Bind and Silence duration by 3 turns. Randomizes Non-Matching orbs. (Including [BLOCK] orb)",
+        sailor: "Reduces Silence duration against this character by 3 turns",
         specialName: "Wild Hunt",
     },
     1286: {//Kid Baby 5
@@ -7126,7 +7126,7 @@ window.details = {
         specialName: "Humandrills Special",
     },
     1349: {//Haredas
-        captain: "Boosts ATK, HP and RCV of Shooter and Cerebral characters by 1.5x",
+        captain: "Boost ATK of Cerebral characters by 1.5x and their RCV by 1.75x",
         special: "Empty all slots including [BLOCK] orbs, and boost ATK of Cerebral characters by 1.2x for 1 turn",
         specialName: "Haredas Special",
     },

From d03fb048d4a39963b939a169665ef2580b656385 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 25 Nov 2016 14:26:55 -0600
Subject: [PATCH 0661/1569] tesoro

---
 common/data/effects.js | 12 ++++++------
 common/data/units.js   | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 120a90add..0e16aff18 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -383,19 +383,19 @@ window.effects = {
     },
     
     'Gild Tesoro - 40 Stamina': {
-        description: 'Boosts the Orbs of all characters by 1.4x',
-        thumb: 1163,
+        description: 'Boosts the Orbs and ATK of all characters by 1.2x',
+        thumb: 1162,
         id: 40,
-        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 5/7 : 1); },
-        atk: function(p) { return 1.4; }
+        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
+        atk: function(p) { return 1.2; }
     },
     
     'Gild Tesoro - 60 Stamina': {
         description: 'Boosts the Orbs and ATK of all characters by 1.4x',
         thumb: 1163,
         id: 41,
-        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
-        atk: function(p) { return 1.2; }
+        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 5/7 : 1); },
+        atk: function(p) { return 1.4; }
     },
 
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 9c1346817..457a17802 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1352,6 +1352,23 @@ window.units = [
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, null, 51, 38, 21, null, null, null, null],
     [ "Ivankov", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, null, null, null, null, 2034, 935, 299, null],
     [ "Rayleigh", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, null, 388, 298, 97, 2037, 1264, 294, null],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Nami Evolved", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Sanji Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Chopper", "QCK", [ "Striker", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Chopper Evolved", "QCK", [ "Striker", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From bd07a6c032eb39cb783eacd083797b8df7f28efd Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 26 Nov 2016 01:15:09 -0500
Subject: [PATCH 0662/1569] Specials and Cooldowns

Calc stuff for story units, Bandai still doesn't have them or HW Kalifa
on the official site
---
 common/data/captains.js  |  4 ++--
 common/data/cooldowns.js | 12 ++++++++++++
 common/data/details.js   |  4 ++--
 common/data/specials.js  | 27 +++++++++++++++++++++++++--
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a4a797a8f..7644b0bf9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3657,11 +3657,11 @@ window.captains = {
         hp: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
     },
     1343: {
-        hp: function(p) { return p.unit.class.has("Driven") ? 0.5 : 1; },
+        hp: function(p) { return 0.5; },
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1344: {
-        hp: function(p) { return p.unit.class.has("Driven") ? 0.5 : 1; },
+        hp: function(p) { return 0.5; },
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
     },
     1345: {
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index eb9a01091..83b16e58a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1340,4 +1340,16 @@ window.cooldowns = [
     null,//Jump Point Chopper
     [ 23, 13 ],
     [ 23, 13 ],
+    15,
+    16,
+    20,
+    18,
+    15,
+    25,
+    [ 17, 10 ],
+    13,
+    14,
+    20,
+    15,
+    16,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index f320ab991..e5f55532f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7091,7 +7091,7 @@ window.details = {
         special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
         specialName: "Swamp Cloud Burger",
     },
-    1342: {//Dedan
+    1342: {//Dadan
         captain: "Boosts HP of [PSY] characters by 1.75x",
         special: "Reduces Silence duration by 2 turns",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
@@ -7105,7 +7105,7 @@ window.details = {
     1344: {//Bluejam
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2.25x.",
         special: "Deals large [STR] damage to one enemy, and boosts ATK of Driven characters by 1.3x for 1 turn",
-        specialName: "Porchemy Special",
+        specialName: "Bluejam Special",
     },
     1345: {//Jimbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
diff --git a/common/data/specials.js b/common/data/specials.js
index 99c1963a2..4dc9c32fe 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1772,10 +1772,10 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
     1335: {
-        chainAddition: function(p){ return 0.5;}
+        chainAddition: function(p){ return 0.5; }
     },
     1336: {
-        chainAddition: function(p){ return 0.5;}
+        chainAddition: function(p){ return 0.5; }
     },
     1339: {
         chainAddition: function(p) {
@@ -1792,4 +1792,27 @@ window.specials = {
             });
         }
     },
+    1343: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
+    1344: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+        type: "class"
+    },
+    1348: {
+        atk: function(p) { return 1.2; },
+        type: "class",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.2); },
+    },
+    1349: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        type: "class"
+    },
+    1351: {
+        def: function(p) { return 0.5; }
+    },
+    1353: {
+        chainAddition: function(p){ return 0.5; }
+    },
 };

From fb0a9ce209276a8365bf982bc44ca50c07f49d50 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 26 Nov 2016 01:59:22 -0500
Subject: [PATCH 0663/1569] Stats and stuff

Fixed and added some stats, gw's sources have become less reliable it
seems
---
 common/data/units.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 457a17802..e5d3cb310 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1342,16 +1342,16 @@ window.units = [
     [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, null, 692, 448, 142, 1443, 1220, 288, null],
     [ "Dadan", "PSY", [ "Slasher", "Powerhouse" ], 3, 12, 6, 2, 50, null, null, null, null, 1844, 703, 151, null],
     [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, null, 125, 106, 6, 1734, 891, 34, null],
-    [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, null, null, null, null, 1809, 1043, 9, null],
-    [ "Jimbe", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 510, 261, 73, 2329, 1144, 229, null],
-    [ "Heracles'n", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, null, null, null, null, 2095, 899, 303, null],
+    [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, null, 131, 133, 1, 1809, 1043, 9, null],
+    [ "Jimbe", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 304, 161, 56, 2329, 1144, 229, null],
+    [ "Heracles'n", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, null, 142, 91, 43, 2095, 899, 303, null],
     [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, null, 109, 66, 12, null, null, null, null],
     [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, null, 133, 112, 0, null, null, null, null],
-    [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, null, null, null, null, null, null, null, null],
-    [ "Longarm Tribe Theives", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, null, null, null, null, null, null, null, null],
+    [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, null, 21, 40, 32, null, null, null, null],
+    [ "Longarm Tribe Theives", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, null, 98, 71, 29, null, null, null, null],
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, null, 51, 38, 21, null, null, null, null],
-    [ "Ivankov", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, null, null, null, null, 2034, 935, 299, null],
-    [ "Rayleigh", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, null, 388, 298, 97, 2037, 1264, 294, null],
+    [ "Ivankov", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, null, 123, 95, 41, 2034, 935, 299, null],
+    [ "Rayleigh", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, null, 201, 189, 75, 2037, 1264, 294, null],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 34768840d6d9347dfb580816ee4d9dd79ec5754f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 26 Nov 2016 23:55:10 -0500
Subject: [PATCH 0664/1569] What we know so far - Nami & Sanji

basic descriptions on Sanji and Nami
---
 common/data/details.js | 90 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 85 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e5f55532f..9687f9837 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2174,14 +2174,14 @@ window.details = {
         specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Diable Jambe - Venaison Shot",
         captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Paralysiss by 3 turns for self"
+        sailor: "Reduces Paralysis by 3 turns for self"
     },
     522: {
         special: "Deals several times the character's ATK in INT damage to all enemies",
         specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Diable Jambe - Venaison Shot",
         captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Paralysiss by 3 turns for self"
+        sailor: "Reduces Paralysis by 3 turns for self"
     },
     523: {
         special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
@@ -5512,14 +5512,14 @@ window.details = {
         specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Diable Jambe: Concassé",
         captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Paralysiss by 3 turns for self"
+        sailor: "Reduces Paralysis by 3 turns for self"
     },
     1117: {
         special: "Deals several times the character's ATK in INT damage to all enemies",
         specialNotes: "#{specialProportional : lower : 100 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Diable Jambe: Concassé",
         captain: "Reduces damage received by 80% if HP is above 99% at the start of the turn",
-        sailor: "Reduces Paralysiss by 3 turns for self"
+        sailor: "Reduces Paralysis by 3 turns for self"
     },
     1118: {
         special: "Randomizes all orbs, protects from defeat as long as HP is above 50% for 1 turn",
@@ -5609,7 +5609,7 @@ window.details = {
                 "cooldown": [ 26, 20 ]
             },
         ],
-        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500xx character's ATK to all enemies.",
+        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.",
         specialName: "King Punch"
     },
     1131: {
@@ -7148,5 +7148,85 @@ window.details = {
         special: "Deals 50,000 Fixed damage to one enemy, Adds 0.5 to Chain multiplier for 1 turn",
         specialName: "Rayleigh Special",
     },
+    1365: {//Timeskip Nami
+        captain: "Not released",
+        special: [
+            {
+                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "cooldown": null,
+            },
+        ],
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities. Nami's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages her special has.",
+        sailor: "Completely resists Silence on this character",
+        specialName: "Nami Special",
+    },
+    1366: {//Timeskip Nami
+        captain: "Not released",
+        special: [
+            {
+                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "cooldown": null,
+            },
+        ],
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities. Nami's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages her special has.",
+        sailor: "Completely resists Silence on this character",
+        specialName: "Nami Special",
+    },
+    1367: {//Timeskip Sanji
+        captain: "Not released",
+        special: [
+            {
+                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "cooldown": null,
+            },
+        ],
+        specialNotes: "If his special works like Elizabello: For every turn after Sanji's special has reached MAX stage, it will increase the orb boost and damage recieved to a variable amount at max after a variable amount of turns. Sanji's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages his special has.",
+        sailor: "Boosts ATK of himself by a variable amount.",
+        specialName: "Sanji Special",
+    },
+    1368: {//Timeskip Sanji
+        captain: "Not released",
+        special: [
+            {
+                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "cooldown": null,
+            },
+            {
+                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "cooldown": null,
+            },
+        ],
+        specialNotes: "If his special works like Elizabello: For every turn after Sanji's special has reached MAX stage, it will increase the orb boost and damage recieved to a variable amount at max after a variable amount of turns. Sanji's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages his special has.",
+        sailor: "Boosts ATK of himself by a variable amount.",
+        specialName: "Sanji Special",
+    },
 };
 

From 5c7916bf9c3e5d49de49f0c8e6382566d1948e5e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 27 Nov 2016 20:50:18 -0600
Subject: [PATCH 0665/1569] Tesoro fix

---
 common/data/effects.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 0e16aff18..1f08fcbb7 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -383,19 +383,19 @@ window.effects = {
     },
     
     'Gild Tesoro - 40 Stamina': {
-        description: 'Boosts the Orbs and ATK of all characters by 1.2x',
+        description: 'Boosts the Orbs and ATK of all characters by 1.1x',
         thumb: 1162,
         id: 40,
-        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
-        atk: function(p) { return 1.2; }
+        orb: function(p) { return p.orb == 2.0 ? 1.1 : (p.orb == 0.5 ? 5/6 : 1); },
+        atk: function(p) { return 1.1; }
     },
     
     'Gild Tesoro - 60 Stamina': {
-        description: 'Boosts the Orbs and ATK of all characters by 1.4x',
+        description: 'Boosts the Orbs and ATK of all characters by 1.2x',
         thumb: 1163,
         id: 41,
-        orb: function(p) { return p.orb == 2.0 ? 1.4 : (p.orb == 0.5 ? 5/7 : 1); },
-        atk: function(p) { return 1.4; }
+        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/7 : 1); },
+        atk: function(p) { return 1.2; }
     },
 
 };
\ No newline at end of file

From 95527f713f9ce4ec80c5113a720eddb07ca2c400 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 28 Nov 2016 10:17:39 -0500
Subject: [PATCH 0666/1569] General Fixes and Chopper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed Bad Orbs on Tesoro, Fixed Dagama not showing up as a Paralysis or
Despair reducer, added Pekoes, Tamago, Rayleigh, and new Luffy, and
added Timeskip Chopper’s information
---
 common/data/details.js | 14 ++++++++++++--
 common/data/effects.js |  4 ++--
 common/data/units.js   | 14 +++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9687f9837..fe29dc5f9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5585,12 +5585,12 @@ window.details = {
     },
     1128: {
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 1.75x",
-        special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
+        special: "Reduces Paralysis and Despair duration by 5 turns. Cuts the current HP of one enemy by 10%",
         specialName: "Tactician's Savage Cut"
     },
     1129: {
         captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of all characters by 2x",
-        special: "Reduces Paralysis and Despair by 5 turns. Cuts the current HP of one enemy by 10%",
+        special: "Reduces Paralysis and Despair duration by 5 turns. Cuts the current HP of one enemy by 10%",
         specialName: "Tactician's Savage Cut"
     },
     1130: {
@@ -7228,5 +7228,15 @@ window.details = {
         sailor: "Boosts ATK of himself by a variable amount.",
         specialName: "Sanji Special",
     },
+    1369: {//Timeskip Chopper
+        captain: "Not released",
+        special: "Changes certain orbs on [QCK] characters into [QCK], cuts the current HP of one enemy by x%",
+        sailor: "Makes [STR] orbs \"beneficial\" for this unit",
+    },
+    1370: {//Timeskip Chopper
+        captain: "Not released",
+        special: "Changes certain orbs on [QCK] characters into [QCK], cuts the current HP of one enemy by x%",
+        sailor: "Makes [STR] orbs \"beneficial\" for this unit",
+    },
 };
 
diff --git a/common/data/effects.js b/common/data/effects.js
index 1f08fcbb7..ee1990077 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -386,7 +386,7 @@ window.effects = {
         description: 'Boosts the Orbs and ATK of all characters by 1.1x',
         thumb: 1162,
         id: 40,
-        orb: function(p) { return p.orb == 2.0 ? 1.1 : (p.orb == 0.5 ? 5/6 : 1); },
+        orb: function(p) { return p.orb == 2.0 ? 1.1 : (p.orb == 0.5 ? 10/11 : 1); },
         atk: function(p) { return 1.1; }
     },
     
@@ -394,7 +394,7 @@ window.effects = {
         description: 'Boosts the Orbs and ATK of all characters by 1.2x',
         thumb: 1163,
         id: 41,
-        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/7 : 1); },
+        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
         atk: function(p) { return 1.2; }
     },
 
diff --git a/common/data/units.js b/common/data/units.js
index e5d3cb310..602a43d1e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1352,13 +1352,13 @@ window.units = [
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, null, 51, 38, 21, null, null, null, null],
     [ "Ivankov", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, null, 123, 95, 41, 2034, 935, 299, null],
     [ "Rayleigh", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, null, 201, 189, 75, 2037, 1264, 294, null],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Secret Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Secret Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "??? Luffy", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 1944fe6d0b56ad604147dfa4dc95ab250af0d96f Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 28 Nov 2016 10:48:15 -0500
Subject: [PATCH 0667/1569] Units added to Official

Finished stats
---
 common/data/units.js | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 602a43d1e..c80fa8b3a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1039,9 +1039,9 @@ window.units = [
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
     [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ],
     [ "Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 4, 25, 6, 2, 70, 1066998, 626, 252, 60, 1464, 700, 169, 1 ],
-    [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
+    [ "'Diamond' Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, 1066998, 455, 310, 36, 949, 797, 113, 1 ],
-    [ "\"Massacre Soldier\" Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
+    [ "'Massacre Soldier' Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 549, 341, 138, 1378, 813, 297, 1 ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, 5000000, 1302, 747, 241, 2790, 1484, 470, 1 ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
@@ -1089,7 +1089,7 @@ window.units = [
     [ "Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 143, 115, 21, 977, 551, 141, 1 ],
     [ "Saga, Cursed Holy Sword", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, 1 ],
     [ "X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 545, 220, 52, 1353, 693, 179, 1 ],
-    [ "\"Red Flag\" X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
+    [ "'Red Flag' X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
     [ "Rebecca, Parasol Rhytm", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, 90778, 59, 14, 79, 462, 130, 328, 1 ],
     [ "Rebecca, Rainbow Melody", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, 1066998, 400, 93, 262, 896, 300, 505, 1 ],
     [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, 392109, 66, 36, 41, 965, 497, 209, 1 ],
@@ -1236,7 +1236,7 @@ window.units = [
     [ "Maynard, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 120, 140, 34, 1172, 614, 153, 1 ],
     [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1100, 549, 101, 2201, 1380, 303, 1 ],
     [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 139, 123, 26, 1293, 594, 133, 1 ],
-    [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
+    [ "'Shark Cutter' Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
     [ "Kizaru, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
     [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
     [ "Koala, Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 33, 40, 49, 764, 543, 196, 1 ],
@@ -1335,23 +1335,23 @@ window.units = [
     [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, 1066998, 38, 28, 28, 888, 789, 288, 1],
     [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, null, 203, 142, 32, 1106, 574, 171, null],
     [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, null],
-    [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 554, 261, 35, 1275, 707, 183, null],
-    [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, null, null, null, null],
-    [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, null, 162, 91, 29, null, null, null, null],
-    [ "Gedatsu", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, 392109, 109, 122, 38, 753, 505, 193, null],
-    [ "Gedatsu Evolved", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, null, 692, 448, 142, 1443, 1220, 288, null],
-    [ "Dadan", "PSY", [ "Slasher", "Powerhouse" ], 3, 12, 6, 2, 50, null, null, null, null, 1844, 703, 151, null],
-    [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, null, 125, 106, 6, 1734, 891, 34, null],
-    [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, null, 131, 133, 1, 1809, 1043, 9, null],
-    [ "Jimbe", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, null, 304, 161, 56, 2329, 1144, 229, null],
-    [ "Heracles'n", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, null, 142, 91, 43, 2095, 899, 303, null],
-    [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, null, 109, 66, 12, null, null, null, null],
-    [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, null, 133, 112, 0, null, null, null, null],
-    [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, null, 21, 40, 32, null, null, null, null],
-    [ "Longarm Tribe Theives", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, null, 98, 71, 29, null, null, null, null],
-    [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, null, 51, 38, 21, null, null, null, null],
-    [ "Ivankov", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, null, 123, 95, 41, 2034, 935, 299, null],
-    [ "Rayleigh", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, null, 201, 189, 75, 2037, 1264, 294, null],
+    [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 554, 261, 35, 1275, 707, 183, 1],
+    [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, 2414, 1253, 330, 1],
+    [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 162, 91, 29, 2334, 892, 296, 1],
+    [ "Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, 392109, 109, 122, 38, 753, 505, 193, 1],
+    [ "'Sky Boss' Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, 3000000, 692, 448, 142, 1443, 1220, 288, 1],
+    [ "Curly Dadan", "PSY", [ "Slasher", "Powerhouse" ], 3, 12, 6, 2, 50, 392109, 144, 62, 33, 1844, 703, 151, 1],
+    [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, 392109, 125, 106, 6, 1734, 891, 34, 1],
+    [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, 1066998, 131, 133, 1, 1809, 1043, 9, 1],
+    [ "Jimbe, Fishman Pirates Captain", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 304, 161, 56, 2329, 1144, 229, 1],
+    [ "Heracles'n, Highwayman of the Forest, Teacher of Amazing Weapons", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, 3000000, 142, 91, 43, 2095, 899, 303, 1],
+    [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 109, 66, 12, 1487, 706, 127, 1],
+    [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, 1066998, 133, 112, 0, 1600, 1020, 0, 1],
+    [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, 1066998, 21, 40, 32, 377, 505, 394, 1],
+    [ "Theives of Tehna Gehna Kingdom", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, 1066998, 98, 71, 29, 1377, 709, 181, 1],
+    [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, 1066998, 51, 38, 21, 1103, 505, 193, 1],
+    [ "Ivankov, New Kama King", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, 3000000, 123, 95, 41, 2034, 935, 299, 1],
+    [ "Rayleigh, Crew of the Pirate King", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, 3000000, 201, 189, 75, 2037, 1264, 294, 1],
     [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],

From 890d44ed249181df36786ae07a882db467223792 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 28 Nov 2016 22:04:11 -0600
Subject: [PATCH 0668/1569] 6* Zoro

---
 common/data/captains.js  | 14 ++++++++++++--
 common/data/cooldowns.js | 14 ++++++++++++++
 common/data/details.js   | 12 ++++++++++++
 common/data/drops.js     |  3 ++-
 common/data/flags.js     |  2 ++
 common/data/specials.js  | 24 ++++++++++++++++++++++++
 common/data/units.js     |  4 ++--
 damage/js/cruncher.js    |  2 +-
 8 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 7644b0bf9..b3cb79b23 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3684,7 +3684,17 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    1353:{
+    1353: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
-    }
+    },
+    1361: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ?
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
+    },
+    1362: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ?
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 83b16e58a..657b249ff 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1352,4 +1352,18 @@ window.cooldowns = [
     20,
     15,
     16,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    20,
+    20,
+    null,
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index fe29dc5f9..6fc3e8e63 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7148,6 +7148,18 @@ window.details = {
         special: "Deals 50,000 Fixed damage to one enemy, Adds 0.5 to Chain multiplier for 1 turn",
         specialName: "Rayleigh Special",
     },
+    1361: {//6* Zoro
+        captain: "If you have 5 or more Slashers on your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slashers by 3x instead",
+        captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
+        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slashers by 2x for 1 turn. If he is a Sailor, boosts ATK by 1.75x for 1 turn",
+        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
+    },
+    1362: {//6* Zoro
+        captain: "If you have 5 or more Slashers on your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slashers by 3x instead",
+        captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
+        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slashers by 2x for 1 turn. If he is a Sailor, boosts ATK by 1.75x for 1 turn",
+        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
+    },
     1365: {//Timeskip Nami
         captain: "Not released",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index c13876829..b988aee7f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1377,6 +1377,7 @@ window.drops = {
         {
             name: 'Clash!! Pirate Empress Hancock',
             thumb: 865,
+            global: true,
             Ultimate: [ 864 ],
             Master: [ 864 ],
             Expert: [ 864 ]
@@ -1421,7 +1422,7 @@ window.drops = {
         },
         
         {
-            name: 'Clash!! Tesoro',
+            name: 'Clash!! Gild Tesoro',
             thumb: 1163, 
             global: true,
             Master: [ 1162, 1164 ],
diff --git a/common/data/flags.js b/common/data/flags.js
index 48b07bb85..70e678b8d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -853,6 +853,8 @@ window.flags = {
     857: { rr: 1, rro: 1, lrr: 1, global: 1 },
     858: { rr: 1, rro: 1, lrr: 1, global: 1 },
     863: { special: 1 },
+    864: { global: 1 },
+    865: { global: 1 },
     869: { rr: 1, rro: 1, global: 1 },
     870: { rr: 1, rro: 1, global: 1 },
     871: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index 4dc9c32fe..5dfe5058f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1815,4 +1815,28 @@ window.specials = {
     1353: {
         chainAddition: function(p){ return 0.5; }
     },
+    1361: {
+        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : window.specials[1361].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1361].multiplier == 2 ? 1 : 0);
+            window.specials[1361].multiplier = [2, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [2, 1.75][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1361warning'
+            });
+        }
+    },
+    1362: {
+        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : window.specials[1362].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1362].multiplier == 2 ? 1 : 0);
+            window.specials[1362].multiplier = [2, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [2, 1.75][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1362warning'
+            });
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index c80fa8b3a..c1168f211 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1359,8 +1359,8 @@ window.units = [
     [ "Secret Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Secret Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "??? Luffy", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, null, 409, 291, 44, 1661, 826, 163, null ],
+    [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, null, 1587, 751, 111, 3603, 1518, 294, null ],
     [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 984e03317..e29423bcf 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -710,7 +710,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));
             }
             // activate turn counter if necessary
-            if (n < 2 && (id == 794 || id == 795 || id == 1191 || id == 1192 || id == 1219 || id == 1220))
+            if (n < 2 && (id == 794 || id == 795 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1361 || id == 1362))
                 $scope.tdata.turnCounter.enabled = true;
         });
         if (conflictWarning) 

From c9462aa94ccd0c2368fbfe40b58fe360017c0ac7 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 29 Nov 2016 12:36:43 -0500
Subject: [PATCH 0669/1569] Bunch of data dumping and simplified Zoro Special

Just a ton of data from GW and some translations from Discord and
Official
---
 common/data/captains.js   |  42 +++++++++++++
 common/data/cooldowns.js  |  17 ++++--
 common/data/details.js    | 121 +++++++++++++++++++++++++++++---------
 common/data/drops.js      |   4 +-
 common/data/evolutions.js |  16 +++++
 common/data/gw.js         |  19 ++++++
 common/data/specials.js   |  26 +++-----
 common/data/units.js      |  20 ++++---
 common/data/zombies.js    |   8 +++
 9 files changed, 211 insertions(+), 62 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index b3cb79b23..c7b989a93 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3687,6 +3687,32 @@ window.captains = {
     1353: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
+    1354:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+    },
+    1355:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1356: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1357: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
+    1358: {
+        chainModifier: function(p) { return 2; }
+    },
+    1359: {
+        chainModifier: function(p) { return 3; }
+    },
+    1360: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+    },
     1361: {
         atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : 1; },
         hp: function(p) { return p.unit.class.has("Slasher") ?
@@ -3697,4 +3723,20 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ?
             p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
     },
+    1371: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.25 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1372: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.25 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 657b249ff..0acce3cd9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1352,6 +1352,15 @@ window.cooldowns = [
     20,
     15,
     16,
+    18,
+    18,
+    20,
+    20,
+    [ 14, 14 ],
+    [ 14, 14 ],
+    [ 15, 15 ],
+    20,
+    20,
     null,
     null,
     null,
@@ -1359,11 +1368,7 @@ window.cooldowns = [
     null,
     null,
     null,
-    20,
-    20,
-    null,
-    null,
-    null,
-    null,
     null,
+    [ 15, 15 ],
+    [ 15, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 6fc3e8e63..0e60c3788 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1206,13 +1206,13 @@ window.details = {
         special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
         specialName: "Beautiful Secretary's Job",
         specialNotes: "#{random : 1 : 15,000}",
-        captain: "Recovers 500 HP at end of turn, reduces damage received by 10%"
+        captain: "Recovers 500 HP at end of each turn, reduces damage received by 10%"
     },
     318: {
         special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
         specialName: "Beautiful Secretary's Job",
         specialNotes: "#{random : 1 : 15,000}",
-        captain: "Recovers 1,000 HP at end of turn, reduces damage received by 15%"
+        captain: "Recovers 1,000 HP at end of each turn, reduces damage received by 15%"
     },
     319: {
         special: "Locks all orbs for 1 turn",
@@ -4415,13 +4415,13 @@ window.details = {
     936: {
         captain: "Boosts Chain Multiplier by 3x",
         specialName: "Gum-Gum Giant Jet Shell",
-        special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
+        special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit for 3 turns",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
     937: {
         captain: "Boosts Chain Multiplier by 3.5x and boosts HP by 1.25x",
         specialName: "Gum-Gum Giant Jet Shell",
-        special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit",
+        special: "Deals 20x ATK as [QCK] damage, and makes Perfects easier to hit for 3 turns",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
     938: {
@@ -7095,58 +7095,97 @@ window.details = {
         captain: "Boosts HP of [PSY] characters by 1.75x",
         special: "Reduces Silence duration by 2 turns",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
-        specialName: "Dadan Special",
+        specialName: "Rogue Threat",
     },
     1343: {//Porchemy
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2x.",
         special: "Deals 13x character's Atk in [DEX] damage to one enemy, and boosts ATK against enemies with reduced defense by 1.3x for 1 turn",
-        specialName: "Porchemy Special",
+        specialName: "Spiked Glove of Punishment",
     },
     1344: {//Bluejam
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2.25x.",
         special: "Deals large [STR] damage to one enemy, and boosts ATK of Driven characters by 1.3x for 1 turn",
-        specialName: "Bluejam Special",
+        specialName: "Bullet Purge",
     },
     1345: {//Jimbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
         special: "Reduces Despair duration by 5 turns. Reduces Special Cooldown of your top row by 1 turn",
-        specialName: "Jimbe Special",
+        specialName: "Gathering Strength for a Counter Attack",
     },
     1346: {//Heracles'n
         captain: "Boosts ATK, HP and RCV of Shooter and Cerebral characters by 1.5x",
         special: "Randomizes all orbs, including [BLOCK] orbs, switches orbs between slots 3 times",
-        specialName: "Heracles'n Special",
+        specialName: "Survival Techniques of the Hungry Baron",
     },
     1347: {//Torino Kingdom Monsters
         special: "Change own orb into [PSY], and deals 25x character's attack in [PSY] damage to one enemy",
-        specialName: "Torino Kingdom Monsters Special",
+        specialName: "Tsubami Behemoth",
     },
     1348: {//Humandrills
         special: "Boosts ATK of all characters by 1.2x for 1 turn and amplifies the effect of orbs by 1.2x for 1 turn",
-        specialName: "Humandrills Special",
+        specialName: "Imitation Tactics",
     },
     1349: {//Haredas
         captain: "Boost ATK of Cerebral characters by 1.5x and their RCV by 1.75x",
         special: "Empty all slots including [BLOCK] orbs, and boost ATK of Cerebral characters by 1.2x for 1 turn",
-        specialName: "Haredas Special",
+        specialName: "Gust 'Wind Knot'",
     },
     1350: {//Longarm Tribe Theives
         special: "Switches orbs between slots 3 times",
-        specialName: "Longarm Tribe Theives Special",
+        specialName: "Longarm Tribe of Tehna Gehna",
     },
     1351: {//Tequila Wolf Guard
         special: "Reduces the defense of all by 50% and delays all enemies for 1 turn",
-        specialName: "Tequila Wolf Guard Special",
+        specialName: "Covering Fire",
     },
     1352: {//Ivankov
         captain: "Boosts ATK of Fighter characters by 2x, boosts Atk of Fighter characters by 3.5x after the 5th Perfect",
         special: "Following the activation of the special, if every unit scores a Perfect hit, reduces damage received by 90% in the following turn",
-        specialName: "Ivankov Special",
+        specialName: "Rolling Beauty",
     },
     1353: {//Rayleigh
         captain: "Boosts ATK of Cerebral characters by 2.5x",
-        special: "Deals 50,000 Fixed damage to one enemy, Adds 0.5 to Chain multiplier for 1 turn",
+        special: "Deals 50,000 Fixed damage to one enemy, adds 0.5 to Chain multiplier for 1 turn",
+        specialName: "Guidence to Control Haki",
+    },
+    1354: {//Pekoms
+        captain: "Boosts ATK of Powerhouse characters by 1.5x",
+        special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
+        specialName: "Pekoms Special",
+        specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
+    },
+    1355: {//Pekoms
+        captain: "Boosts ATK, HP and RCV of Powerhouse characters by 1.5x",
+        special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
+        specialName: "Pekoms Special",
+        specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
+    },
+    1356: {//Tamago
+        captain: "Boosts ATK of Cerebral characters by 1.5x and the HP of Striker characters by 1.5x",
+        special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
+        specialName: "Tamago Special",
+    },
+    1357: {//Tamago
+        captain: "Boosts ATK of Cerebral characters by 1.75x and the HP of Striker characters by 1.75x",
+        special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
+        specialName: "Tamago Special",
+    },
+    1358: {//Secret Rayleigh
+        captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
+        special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "Rayleigh Special",
+        specialNotes: "#{orb : 1.5x}",
+    },
+    1359: {//Secret Rayleigh
+        captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
+        special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Rayleigh Special",
+        specialNotes: "#{orb : 1.5x}",
+    },
+    1360: {//Winter Luffy
+        captain: "Boosts ATK characters with cost 30 or less by 2x and their HP by 1.2x",
+        special: "Changes own orb into [QCK], deals 15x character's ATK in [QCK] damage to one enemy",
+        specialName: "Winter Luffy Special",
     },
     1361: {//6* Zoro
         captain: "If you have 5 or more Slashers on your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slashers by 3x instead",
@@ -7160,8 +7199,20 @@ window.details = {
         special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slashers by 2x for 1 turn. If he is a Sailor, boosts ATK by 1.75x for 1 turn",
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
-    1365: {//Timeskip Nami
+    1363: {//Timeskip Franky
+        captain: "Boosts ATK of [PSY] chatacters by 2x, reduces damage taken by 10%",
+        special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        sailor: "Boosts ATK of [PSY] characters by 100",
+    },
+    1364: {//Timeskip Franky
         captain: "Not released",
+        special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        sailor: "Boosts ATK of [PSY] characters by 100",
+    },
+    1365: {//Timeskip Nami
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: [
             {
                 "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
@@ -7172,7 +7223,7 @@ window.details = {
                 "cooldown": null,
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
                 "cooldown": null,
             },
         ],
@@ -7192,7 +7243,7 @@ window.details = {
                 "cooldown": null,
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
+                "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
                 "cooldown": null,
             },
         ],
@@ -7201,7 +7252,7 @@ window.details = {
         specialName: "Nami Special",
     },
     1367: {//Timeskip Sanji
-        captain: "Not released",
+        captain: "Boosts ATK of [STR] characters by 2x",
         special: [
             {
                 "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
@@ -7212,12 +7263,12 @@ window.details = {
                 "cooldown": null,
             },
             {
-                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "description": "Reduce damage recieved by 70% and boosts orbs by 1.75x for 1 turn.",
                 "cooldown": null,
             },
         ],
         specialNotes: "If his special works like Elizabello: For every turn after Sanji's special has reached MAX stage, it will increase the orb boost and damage recieved to a variable amount at max after a variable amount of turns. Sanji's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages his special has.",
-        sailor: "Boosts ATK of himself by a variable amount.",
+        sailor: "Boosts ATK of himself by 50",
         specialName: "Sanji Special",
     },
     1368: {//Timeskip Sanji
@@ -7232,23 +7283,39 @@ window.details = {
                 "cooldown": null,
             },
             {
-                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "description": "Reduce damage recieved by 70% and boosts orbs by 1.75x for 1 turn.",
                 "cooldown": null,
             },
         ],
         specialNotes: "If his special works like Elizabello: For every turn after Sanji's special has reached MAX stage, it will increase the orb boost and damage recieved to a variable amount at max after a variable amount of turns. Sanji's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages his special has.",
-        sailor: "Boosts ATK of himself by a variable amount.",
+        sailor: "Boosts ATK of himself by 50",
         specialName: "Sanji Special",
     },
     1369: {//Timeskip Chopper
-        captain: "Not released",
-        special: "Changes certain orbs on [QCK] characters into [QCK], cuts the current HP of one enemy by x%",
+        captain: "Boosts ATK of [QCK] characters by 1.5x and their HP and RCV by variable amount",
+        special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
+        specialName: "Chopper Special",
     },
     1370: {//Timeskip Chopper
         captain: "Not released",
-        special: "Changes certain orbs on [QCK] characters into [QCK], cuts the current HP of one enemy by x%",
+        special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
+        specialName: "Chopper Special",
+    },
+    1371: {//Wild Zoro
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
+        special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turn",
+        sailor: "Restores his own special by 2 turns when it is rewinded",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
+        specialName: "Wild Zoro Special",
+    },
+    1372: {//Wild Zoro
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
+        special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turn",
+        sailor: "Restores his own special by 2 turns when it is rewinded",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
+        specialName: "Wild Zoro Special",
     },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index b988aee7f..6f470b84a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1246,8 +1246,8 @@ window.drops = {
         
         {
             name: "Big Mom Pirates!",
-            thumb: null,
-            "All Difficulties": [ -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610 ]
+            thumb: 1355,
+            "All Difficulties": [ 1354, 1356, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610 ]
         },
         
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index af6fc1589..336322ee7 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2035,4 +2035,20 @@ window.evolutions = {
         evolution: 1332,
         evolvers: [ 116, 117, 81, 92, 103 ]
     },
+    1337: {
+        evolution: 1338,
+        evolvers: [ 118, 98, 98, 303, 267 ]
+    },
+    1340: {
+        evolution: 1341,
+        evolvers: [ 79, 85, 90, 94, 301 ]
+    },
+    1354: {
+        evolution: 1355,
+        evolvers: [ 78, 78, 78, 84, 84 ]
+    },
+    1356: {
+        evolution: 1357,
+        evolvers: [ 82, 82, 82, 88, 88 ]
+    },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index ef7ab0bf4..b474d244a 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1352,4 +1352,23 @@ window.gw=[
     45635,
     45637,
     45560,
+    45767,
+    45767,
+    45766,
+    45766,
+    45785,
+    45785,
+    45836,
+    45711,
+    45711,
+    45758,
+    45758,
+    45759,
+    45759,
+    45756,
+    45756,
+    45757,
+    45757,
+    45851,
+    45851,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 5dfe5058f..e010c3645 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1815,28 +1815,18 @@ window.specials = {
     1353: {
         chainAddition: function(p){ return 0.5; }
     },
+    1356: {
+        rcv: function(p){ return 1.75; }
+    },
+    1357: {
+        rcv: function(p){ return 1.75; }
+    },
     1361: {
-        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : window.specials[1361].multiplier; },
+        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
         type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1361].multiplier == 2 ? 1 : 0);
-            window.specials[1361].multiplier = [2, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [2, 1.75][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-                name: '1361warning'
-            });
-        }
     },
     1362: {
-        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : window.specials[1362].multiplier; },
+        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
         type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1362].multiplier == 2 ? 1 : 0);
-            window.specials[1362].multiplier = [2, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [2, 1.75][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-                name: '1362warning'
-            });
-        }
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index c1168f211..240bbc14c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1352,15 +1352,15 @@ window.units = [
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, 1066998, 51, 38, 21, 1103, 505, 193, 1],
     [ "Ivankov, New Kama King", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, 3000000, 123, 95, 41, 2034, 935, 299, 1],
     [ "Rayleigh, Crew of the Pirate King", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, 3000000, 201, 189, 75, 2037, 1264, 294, 1],
-    [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Secret Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Secret Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "??? Luffy", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, null, 409, 291, 44, 1661, 826, 163, null ],
-    [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, null, 1587, 751, 111, 3603, 1518, 294, null ],
+    [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 2, 50, null, null, null, null, null, null, null, null ],
+    [ "Pekoms Evolved", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 99, null, null, null, null, 2033, 1303, 169, null ],
+    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, null, null, null, null, null, null, null, null, null ],
+    [ "Tamago Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, null, null, null, null, null, null, null, null, null ],
+    [ "Bartender Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 5, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Bartender Rayleigh Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Luffy, Winter Island Adventure", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 99, null, null, null, null, 2005, 945, 286, null ],
+    [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, 1066998, 409, 291, 44, 1661, 826, 163, null ],
+    [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1587, 751, 111, 3603, 1518, 294, null ],
     [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1369,6 +1369,8 @@ window.units = [
     [ "Timeskip Sanji Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Chopper", "QCK", [ "Striker", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Chopper Evolved", "QCK", [ "Striker", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wild Zoro", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wild Zoro Evolved", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/data/zombies.js b/common/data/zombies.js
index a23ec1bea..4c19ac4ab 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -295,4 +295,12 @@ window.zombies = {
         type: 'healer',
         multiplier: 3
     },
+    1358: {//Rayleigh
+        type: 'healer',
+        multiplier: 1.5
+    },
+    1359: {//Rayleigh
+        type: 'healer',
+        multiplier: 1.5
+    },
 };

From 0aa29cc29a3cb9acb28d44110b0fdaafbb723720 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 29 Nov 2016 12:42:20 -0500
Subject: [PATCH 0670/1569] Small edit

Fixed Rayleigh description
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 0e60c3788..aa9ed1974 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7171,7 +7171,7 @@ window.details = {
         specialName: "Tamago Special",
     },
     1358: {//Secret Rayleigh
-        captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
+        captain: "Boosts chain multiplier by 2x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Rayleigh Special",
         specialNotes: "#{orb : 1.5x}",

From 15f7af36074010a5c8015b0d26cf7556cd886664 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 29 Nov 2016 21:28:23 -0500
Subject: [PATCH 0671/1569] Cooldowns

Added FN units stats and some fixes to special descriptions so they are
tagged correctly
---
 common/data/cooldowns.js   | 12 ++++++------
 common/data/details.js     | 12 ++++++------
 common/data/flags.js       | 13 +++++++++++++
 common/data/units.js       |  2 +-
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  4 ++--
 6 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0acce3cd9..737ed4efa 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1154,8 +1154,8 @@ window.cooldowns = [
     [ 25, 18 ],
     21,
     [ 10, 4 ],
-    23,
-    23,
+    [ 23, 17 ],
+    [ 23, 17 ],
     21,
     21,
     [ 13, 13 ],
@@ -1352,10 +1352,10 @@ window.cooldowns = [
     20,
     15,
     16,
-    18,
-    18,
-    20,
-    20,
+    [ 18, 10 ],
+    [ 18, 10 ],
+    [ 20, 13 ],
+    [ 20, 13 ],
     [ 14, 14 ],
     [ 14, 14 ],
     [ 15, 15 ],
diff --git a/common/data/details.js b/common/data/details.js
index aa9ed1974..0f1fd3d8b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7255,15 +7255,15 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2x",
         special: [
             {
-                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
                 "cooldown": null,
             },
             {
-                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
                 "cooldown": null,
             },
             {
-                "description": "Reduce damage recieved by 70% and boosts orbs by 1.75x for 1 turn.",
+                "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
                 "cooldown": null,
             },
         ],
@@ -7275,15 +7275,15 @@ window.details = {
         captain: "Not released",
         special: [
             {
-                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
                 "cooldown": null,
             },
             {
-                "description": "Reduce damage recieved by variable amount and boosts orbs by variable amount for 1 turn.",
+                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
                 "cooldown": null,
             },
             {
-                "description": "Reduce damage recieved by 70% and boosts orbs by 1.75x for 1 turn.",
+                "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
                 "cooldown": null,
             },
         ],
diff --git a/common/data/flags.js b/common/data/flags.js
index 70e678b8d..241d81f33 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1141,4 +1141,17 @@ window.flags = {
     1322: { rr: 1, rro: 1 },
     1323: { rr: 1, rro: 1 },
     1324: { rr: 1, rro: 1 },
+    1358: { rr: 1, rro: 1, lrr: 1 },
+    1359: { rr: 1, rro: 1, lrr: 1 },
+    1360: { promo: 1 },
+    1361: { rr: 1, rro: 1 },
+    1362: { rr: 1, rro: 1 },
+    1363: { rr: 1, rro: 1 },
+    1364: { rr: 1, rro: 1 },
+    1365: { rr: 1, rro: 1 },
+    1366: { rr: 1, rro: 1 },
+    1367: { rr: 1, rro: 1 },
+    1368: { rr: 1, rro: 1 },
+    1369: { rr: 1, rro: 1 },
+    1370: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 240bbc14c..298d7beb5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1355,7 +1355,7 @@ window.units = [
     [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 2, 50, null, null, null, null, null, null, null, null ],
     [ "Pekoms Evolved", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 99, null, null, null, null, 2033, 1303, 169, null ],
     [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, null, null, null, null, null, null, null, null, null ],
-    [ "Tamago Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, null, null, null, null, null, null, null, null, null ],
+    [ "Tamago Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, null, null, null, null, 1651, 1012, 315, null ],
     [ "Bartender Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 5, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Bartender Rayleigh Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, null, null, null, null, null, null, null ],
     [ "Luffy, Winter Island Adventure", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 99, null, null, null, null, 2005, 945, 286, null ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 9c6939d90..f1ced5a5f 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1310, 1314, 1316, 1326, 1330, 1329, 1328 ];
+    var newUnits = [ 1353, 1352, 1346, 1345, 1341, 1339, 1338 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 9b126d488..26f50be87 100644
--- a/index.html
+++ b/index.html
@@ -67,10 +67,10 @@
             <p>14/11/2016</p>
             <br>
             <ul>
-                <li>Akainu Sugofest Units Completed</li>
+                <li>Story 3D2Y Characters Completed</li>
                 <li>Law Ship added to Calculator</li>
                 <br>
-                <li>Tontatta Warriors And Halloween Units Added</li>
+                <li>Mom Pirates and Zoro Sugofest units added</li>
                 <br>
                 <li>Previews for New Units Added</li>
                 <br>

From 1c97cc1ffe15a13b6fa3dab2287670d26184fc80 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 30 Nov 2016 00:25:52 -0500
Subject: [PATCH 0672/1569] Timeskip (New World) Strawhats information added

I think all thats left is stats
---
 common/data/captains.js   | 30 +++++++++++++++
 common/data/details.js    | 80 ++++++++++++++++++---------------------
 common/data/evolutions.js | 20 ++++++++++
 common/data/specials.js   | 32 +++++++++++++++-
 common/data/units.js      | 18 ++++-----
 5 files changed, 126 insertions(+), 54 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c7b989a93..d56c03f55 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3723,6 +3723,36 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ?
             p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
     },
+    1363: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+    },
+    1364: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+    },
+    1365: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1366: {
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (p.orb == 2.0 ? 2.75 : 1.5); },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1367: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+    },
+    1368: {
+        atk: function(p) { return !p.unit.type == "STR" ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+    },
+    1369: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    1370: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
     1371: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
         hitAtk: function(p) {
diff --git a/common/data/details.js b/common/data/details.js
index 0f1fd3d8b..256d6ea36 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7203,105 +7203,99 @@ window.details = {
         captain: "Boosts ATK of [PSY] chatacters by 2x, reduces damage taken by 10%",
         special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        sailor: "Boosts ATK of [PSY] characters by 100",
+        sailor: "Boosts HP of [PSY] characters by 100",
+        specialName: "Franky Fireball",
     },
     1364: {//Timeskip Franky
-        captain: "Not released",
+        captain: "Boosts ATK of [PSY] chatacters by 2.5x, reduces damage taken by 10%",
         special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        sailor: "Boosts ATK of [PSY] characters by 100",
+        sailor: "Boosts HP of [PSY] characters by 100",
+        specialName: "Franky Fireball",
     },
     1365: {//Timeskip Nami
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: [
             {
-                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
-                "cooldown": null,
+                "description": "Reduces duration of Paralysis and Silence by 1 turn. Delays all enemies for 1 turn",
+                "cooldown": 13,
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
-                "cooldown": null,
+                "description": "Reduces duration of Paralysis and Silence by 2 turns. Delays all enemies for 1 turn",
+                "cooldown": 15,
             },
             {
                 "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": null,
+                "cooldown": 18,
             },
         ],
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities. Nami's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages her special has.",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
         sailor: "Completely resists Silence on this character",
-        specialName: "Nami Special",
+        specialName: "Black Ball - Thundercloud Rod",
     },
     1366: {//Timeskip Nami
-        captain: "Not released",
+        captain: "Boosts RCV of Cerebral characters by 1.5x and their ATK by 2.75x if they have a matching orb, by 1.5x otherwise",
         special: [
             {
-                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
-                "cooldown": null,
+                "description": "Reduces duration of Paralysis and Silence by 1 turn. Delays all enemies for 1 turn",
+                "cooldown": 13,
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by variable turns. Delays all enemies for variable turns",
-                "cooldown": null,
+                "description": "Reduces duration of Paralysis and Silence by 2 turns. Delays all enemies for 1 turn",
+                "cooldown": 15,
             },
             {
                 "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": null,
+                "cooldown": 18,
             },
         ],
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities. Nami's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages her special has.",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
         sailor: "Completely resists Silence on this character",
-        specialName: "Nami Special",
+        specialName: "Black Ball - Thundercloud Rod",
     },
     1367: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 2x",
         special: [
             {
-                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
-                "cooldown": null,
-            },
-            {
-                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
-                "cooldown": null,
+                "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
+                "cooldown": 11,
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": null,
+                "cooldown": 20,
             },
         ],
-        specialNotes: "If his special works like Elizabello: For every turn after Sanji's special has reached MAX stage, it will increase the orb boost and damage recieved to a variable amount at max after a variable amount of turns. Sanji's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages his special has.",
-        sailor: "Boosts ATK of himself by 50",
-        specialName: "Sanji Special",
+        specialNotes: "#{orb : 1.75x}",
+        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+        specialName: "Sky Walk",
     },
     1368: {//Timeskip Sanji
-        captain: "Not released",
+        captain: "Boosts ATK of [STR] characters by 2.5x, by 3x if HP is below 30% at the start of the turn",
         special: [
             {
-                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
-                "cooldown": null,
-            },
-            {
-                "description": "Reduces damage received by variable amount and amplifies the effect of orbs by variable amount for 1 turn.",
-                "cooldown": null,
+                "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
+                "cooldown": 11,
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": null,
+                "cooldown": 20,
             },
         ],
-        specialNotes: "If his special works like Elizabello: For every turn after Sanji's special has reached MAX stage, it will increase the orb boost and damage recieved to a variable amount at max after a variable amount of turns. Sanji's special is a multi stage special, for now it will show 3 stages, but we don't know how many stages his special has.",
-        sailor: "Boosts ATK of himself by 50",
-        specialName: "Sanji Special",
+        specialNotes: "#{orb : 1.75x}",
+        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+        specialName: "Sky Walk",
     },
     1369: {//Timeskip Chopper
-        captain: "Boosts ATK of [QCK] characters by 1.5x and their HP and RCV by variable amount",
+        captain: "Boosts ATK of [QCK] characters by 1.5x and their HP and RCV by 1.2x",
         special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Chopper Special",
+        specialName: "Kakuho: Elf",
     },
     1370: {//Timeskip Chopper
-        captain: "Not released",
+        captain: "Boosts ATK of [QCK] characters by 2x and their HP and RCV by 1.2x",
         special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Chopper Special",
+        specialName: "Kakuho: Elf",
     },
     1371: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 336322ee7..8cdacbd4e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2051,4 +2051,24 @@ window.evolutions = {
         evolution: 1357,
         evolvers: [ 82, 82, 82, 88, 88 ]
     },
+    1358: {
+        evolution: 1359,
+        evolvers: [ 117, 80, 83, 97, 302 ]
+    },
+    1363: {
+        evolution: 1364,
+        evolvers: [ 1180, 87, 266, 98, 103 ]
+    },
+    1365: {
+        evolution: 1366,
+        evolvers: [ 1180, 82, 83, 88, 304 ]
+    },
+    1367: {
+        evolution: 1368,
+        evolvers: [ 1180, 117, 84, 300, 100 ]
+    },
+    1369: {
+        evolution: 1370,
+        evolvers: [ 1180, 85, 94, 301, 101 ]
+    },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index e010c3645..72772968e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -461,7 +461,7 @@ window.specials = {
             window.specials[668].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '667warning'
+                name: '668warning'
             });
         }
     },
@@ -473,7 +473,7 @@ window.specials = {
             window.specials[669].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '668warning'
+                name: '669warning'
             });
         }
     },
@@ -1829,4 +1829,32 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
         type: "class",
     },
+    1363: {
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
+    },
+    1364: {
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
+    },
+    1367:{
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, window.specials[1367].multiplier); },
+        onActivation: function(p) {
+            var n = (window.specials[1367].multiplier == 1.5 ? 1 : 0);
+            window.specials[1367].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1367warning'
+            });
+        },
+    },
+    1368:{
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, window.specials[1368].multiplier); },
+        onActivation: function(p) {
+            var n = (window.specials[1368].multiplier == 1.5 ? 1 : 0);
+            window.specials[1368].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1368warning'
+            });
+        },
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 298d7beb5..5bf73e3fb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1357,18 +1357,18 @@ window.units = [
     [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, null, null, null, null, null, null, null, null, null ],
     [ "Tamago Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, null, null, null, null, 1651, 1012, 315, null ],
     [ "Bartender Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 5, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Bartender Rayleigh Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Bartender Rayleigh Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, null, null, null, 1922, 1209, 301, null ],
     [ "Luffy, Winter Island Adventure", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 99, null, null, null, null, 2005, 945, 286, null ],
     [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, 1066998, 409, 291, 44, 1661, 826, 163, null ],
     [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1587, 751, 111, 3603, 1518, 294, null ],
-    [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Nami Evolved", "INT", [ "Cerebral", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Sanji Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Chopper", "QCK", [ "Striker", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Chopper Evolved", "QCK", [ "Striker", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 1066998, null, null, null, null, null, null, null ],
+    [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, null, 3, 50, 1066998, null, null, null, 995, 498, 203, null ],
+    [ "Timeskip Nami Evolved", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 921, 431, 156, 2171, 1109, 440, null ],
+    [ "Timeskip Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 1066998, null, null, null, 1182, 556, 148, null ],
+    [ "Timeskip Sanji Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 99, 2603, 1437, 260, null ],
+    [ "Timeskip Chopper", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 1066998, null, null, null, 1062, 503, 186, null ],
+    [ "Timeskip Chopper Evolved", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, null, null, null, null ],
     [ "Wild Zoro", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Wild Zoro Evolved", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];

From 1b6c927143c527f428e549f2b4fb0aa8f19647ea Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 30 Nov 2016 00:31:40 -0500
Subject: [PATCH 0673/1569] New World Cooldowns

forgot cool downs
---
 common/data/cooldowns.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 737ed4efa..619dcd57e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1361,14 +1361,14 @@ window.cooldowns = [
     [ 15, 15 ],
     20,
     20,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    21,
+    21,
+    null,//New World Nami
+    null,//New World Nami
+    null,//New World Sanji
+    null,//New World Sanji
+    12,
+    12,
     [ 15, 15 ],
     [ 15, 15 ],
 ];

From a94888e2534e4f2deb5ab7eedb429506ba5bb17e Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 30 Nov 2016 01:41:41 -0500
Subject: [PATCH 0674/1569] Next stats dump

almost done with the New World units stats
---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 5bf73e3fb..002fcd7b7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1361,13 +1361,13 @@ window.units = [
     [ "Luffy, Winter Island Adventure", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 99, null, null, null, null, 2005, 945, 286, null ],
     [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, 1066998, 409, 291, 44, 1661, 826, 163, null ],
     [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1587, 751, 111, 3603, 1518, 294, null ],
-    [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 1066998, null, null, null, null, null, null, null ],
-    [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 50, 1066998, 309, 158, 19, 1325, 544, 138, null ],
+    [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1249, 467, 77, null, null, null, null ],
     [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, null, 3, 50, 1066998, null, null, null, 995, 498, 203, null ],
     [ "Timeskip Nami Evolved", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 921, 431, 156, 2171, 1109, 440, null ],
     [ "Timeskip Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 1066998, null, null, null, 1182, 556, 148, null ],
     [ "Timeskip Sanji Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 99, 2603, 1437, 260, null ],
-    [ "Timeskip Chopper", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 1066998, null, null, null, 1062, 503, 186, null ],
+    [ "Timeskip Chopper", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 1066998, 202, 109, 31, 1062, 503, 186, null ],
     [ "Timeskip Chopper Evolved", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, null, null, null, null ],
     [ "Wild Zoro", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Wild Zoro Evolved", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],

From a30daa1eb794c653ba38db30188040dd960258ba Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 30 Nov 2016 01:44:26 -0500
Subject: [PATCH 0675/1569] Nami Combo

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 002fcd7b7..d0d133d18 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1363,7 +1363,7 @@ window.units = [
     [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1587, 751, 111, 3603, 1518, 294, null ],
     [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 50, 1066998, 309, 158, 19, 1325, 544, 138, null ],
     [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1249, 467, 77, null, null, null, null ],
-    [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, null, 3, 50, 1066998, null, null, null, 995, 498, 203, null ],
+    [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, 5, 3, 50, 1066998, null, null, null, 995, 498, 203, null ],
     [ "Timeskip Nami Evolved", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 921, 431, 156, 2171, 1109, 440, null ],
     [ "Timeskip Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 1066998, null, null, null, 1182, 556, 148, null ],
     [ "Timeskip Sanji Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 99, 2603, 1437, 260, null ],

From 6b9540d3babeb14d6814ee96c590012a4bb7d8f2 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 30 Nov 2016 11:04:25 -0500
Subject: [PATCH 0676/1569] Cool downs for units

Kizaru Batch and Zoro Batch
---
 common/data/cooldowns.js | 18 +++++++++---------
 common/data/details.js   | 20 ++++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 619dcd57e..8d81dd0ec 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1229,14 +1229,14 @@ window.cooldowns = [
     22,
     [ 22, 15 ],//Sentomaru
     [ 22, 15 ],//Sentomaru
-    19,
-    19,
-    23,
-    23,
-    20,
+    [ 19, 12 ],
+    [ 19, 12 ],
+    [ 23, 15 ],
+    [ 23, 15 ],
     [ 20, 13 ],
-    22,
-    22,
+    [ 20, 13 ],
+    [ 22, 14 ],
+    [ 22, 14 ],
     null,//Kizaru
     null,//Kizaru
     [ 19, 11 ],
@@ -1367,8 +1367,8 @@ window.cooldowns = [
     null,//New World Nami
     null,//New World Sanji
     null,//New World Sanji
-    12,
-    12,
+    [ 12, 6 ],
+    [ 12, 6 ],
     [ 15, 15 ],
     [ 15, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 256d6ea36..c8f4b329c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7218,15 +7218,15 @@ window.details = {
         special: [
             {
                 "description": "Reduces duration of Paralysis and Silence by 1 turn. Delays all enemies for 1 turn",
-                "cooldown": 13,
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Reduces duration of Paralysis and Silence by 2 turns. Delays all enemies for 1 turn",
-                "cooldown": 15,
+                "cooldown": [ 15, 10 ],
             },
             {
                 "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": 18,
+                "cooldown": [ 18, 13 ],
             },
         ],
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
@@ -7238,15 +7238,15 @@ window.details = {
         special: [
             {
                 "description": "Reduces duration of Paralysis and Silence by 1 turn. Delays all enemies for 1 turn",
-                "cooldown": 13,
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Reduces duration of Paralysis and Silence by 2 turns. Delays all enemies for 1 turn",
-                "cooldown": 15,
+                "cooldown": [ 15, 10 ],
             },
             {
                 "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": 18,
+                "cooldown": [ 18, 13 ],
             },
         ],
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
@@ -7258,11 +7258,11 @@ window.details = {
         special: [
             {
                 "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
-                "cooldown": 11,
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": 20,
+                "cooldown": [ 20, 15 ],
             },
         ],
         specialNotes: "#{orb : 1.75x}",
@@ -7274,11 +7274,11 @@ window.details = {
         special: [
             {
                 "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
-                "cooldown": 11,
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": 20,
+                "cooldown": [ 20, 15 ],
             },
         ],
         specialNotes: "#{orb : 1.75x}",

From 2cfaf4721f13bfae906516b936037038ca2de9e6 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 1 Dec 2016 01:10:29 -0500
Subject: [PATCH 0677/1569] Official Site Dump

Fix for unit numbers, Fix for Sanji captain, Fixed Wild Zoro, new Sadie
Mission, Zoro Evo mats, Families updated.
I think thats it.
---
 common/data/captains.js    | 24 ++++++++++++------------
 common/data/cooldowns.js   |  4 ++--
 common/data/details.js     | 38 +++++++++++++++++++-------------------
 common/data/drops.js       |  4 ++--
 common/data/evolutions.js  |  4 ++++
 common/data/families.js    | 31 +++++++++++++++++++++++++++++++
 common/data/specials.js    | 10 ++++++++--
 common/data/units.js       | 38 +++++++++++++++++++-------------------
 common/js/nonSuspicious.js |  2 +-
 index.html                 |  2 +-
 10 files changed, 99 insertions(+), 58 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index d56c03f55..765635fdf 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3687,28 +3687,28 @@ window.captains = {
     1353: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
-    1354:{
+    1354: {
+        chainModifier: function(p) { return 2; }
+    },
+    1355: {
+        chainModifier: function(p) { return 3; }
+    },
+    1356:{
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
     },
-    1355:{
+    1357:{
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
-    1356: {
+    1358: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
-    1357: {
+    1359: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
     },
-    1358: {
-        chainModifier: function(p) { return 2; }
-    },
-    1359: {
-        chainModifier: function(p) { return 3; }
-    },
     1360: {
         atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
         hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
@@ -3741,7 +3741,7 @@ window.captains = {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     1368: {
-        atk: function(p) { return !p.unit.type == "STR" ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type == "STR") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1369: {
         atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
@@ -3765,7 +3765,7 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.25 : 2;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8d81dd0ec..c1ef9445a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1352,12 +1352,12 @@ window.cooldowns = [
     20,
     15,
     16,
+    [ 14, 14 ],
+    [ 14, 14 ],
     [ 18, 10 ],
     [ 18, 10 ],
     [ 20, 13 ],
     [ 20, 13 ],
-    [ 14, 14 ],
-    [ 14, 14 ],
     [ 15, 15 ],
     20,
     20,
diff --git a/common/data/details.js b/common/data/details.js
index c8f4b329c..2da1b10d3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7148,40 +7148,40 @@ window.details = {
         special: "Deals 50,000 Fixed damage to one enemy, adds 0.5 to Chain multiplier for 1 turn",
         specialName: "Guidence to Control Haki",
     },
-    1354: {//Pekoms
+    1354: {//Secret Rayleigh
+        captain: "Boosts chain multiplier by 2x, recovers 1.5x character's RCV in HP at the end of each turn",
+        special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "Rayleigh Special",
+        specialNotes: "#{orb : 1.5x}",
+    },
+    1355: {//Secret Rayleigh
+        captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
+        special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "Rayleigh Special",
+        specialNotes: "#{orb : 1.5x}",
+    },
+    1356: {//Pekoms
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
         special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
         specialName: "Pekoms Special",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
-    1355: {//Pekoms
+    1357: {//Pekoms
         captain: "Boosts ATK, HP and RCV of Powerhouse characters by 1.5x",
         special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
         specialName: "Pekoms Special",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
-    1356: {//Tamago
+    1358: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.5x and the HP of Striker characters by 1.5x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
         specialName: "Tamago Special",
     },
-    1357: {//Tamago
+    1359: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.75x and the HP of Striker characters by 1.75x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
         specialName: "Tamago Special",
     },
-    1358: {//Secret Rayleigh
-        captain: "Boosts chain multiplier by 2x, recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Rayleigh Special",
-        specialNotes: "#{orb : 1.5x}",
-    },
-    1359: {//Secret Rayleigh
-        captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Rayleigh Special",
-        specialNotes: "#{orb : 1.5x}",
-    },
     1360: {//Winter Luffy
         captain: "Boosts ATK characters with cost 30 or less by 2x and their HP by 1.2x",
         special: "Changes own orb into [QCK], deals 15x character's ATK in [QCK] damage to one enemy",
@@ -7302,14 +7302,14 @@ window.details = {
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turn",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
-        specialName: "Wild Zoro Special",
+        specialName: "Wild Plan",
     },
     1372: {//Wild Zoro
-        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect and by 3x after the 5th Perfect.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turn",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
-        specialName: "Wild Zoro Special",
+        specialName: "Wild Plan",
     },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 6f470b84a..54c08f468 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -899,8 +899,8 @@ window.drops = {
             thumb: 550,
             global: true,
             condition: '30: Non-Slasher, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
-            challenge: 'High Score calculated with Clear Speed and Crew Cost. (Crew cost can basically be ignored)',
-            challengeData: [['60,000 Points','1x Black Elder'],['160,000 Points','1x ATK Cotton Candy'],['300,000 Points','3x Rainbow Gems']],
+            challenge: 'Cumulative Damage dealt to enemies in a single run',
+            challengeData: [['600,000 Damage','1x Black Elder'],['2,000,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['5,000,000 Damage','1x Defence Boost Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
         },
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8cdacbd4e..dadb47713 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2055,6 +2055,10 @@ window.evolutions = {
         evolution: 1359,
         evolvers: [ 117, 80, 83, 97, 302 ]
     },
+    1361: {
+        evolution: 1362,
+        evolvers: [ 118, 86, 266, 302, 267 ]
+    },
     1363: {
         evolution: 1364,
         evolvers: [ 1180, 87, 266, 98, 103 ]
diff --git a/common/data/families.js b/common/data/families.js
index 14d5532d7..36f7593f3 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1340,4 +1340,35 @@ window.families = [
     "Tony Tony Chopper",
     "Gedatsu",
     "Gedatsu",
+    "Dadan",
+    "Porchemy",
+    "Bluejam",
+    "Jimbe",
+    "Heracles'n",
+    "Torino Kingdom Monsters",
+    "Humandrills",
+    "Haredas",
+    "Theives of Tehna Gehna Kingdom",
+    "Tequila Wolf Guard",
+    "Emporio Ivankov",
+    "Silvers Rayleigh",
+    "Silvers Rayleigh",
+    "Silvers Rayleigh",
+    "Pekoms",
+    "Pekoms",
+    "Tamago",
+    "Tamago",
+    "Monkey D. Luffy",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Franky",
+    "Franky",
+    "Nami",
+    "Nami",
+    "Sanji",
+    "Sanji",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 72772968e..eb1d8a859 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1815,10 +1815,16 @@ window.specials = {
     1353: {
         chainAddition: function(p){ return 0.5; }
     },
-    1356: {
+    1354: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+    },
+    1355: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+    },
+    1358: {
         rcv: function(p){ return 1.75; }
     },
-    1357: {
+    1359: {
         rcv: function(p){ return 1.75; }
     },
     1361: {
diff --git a/common/data/units.js b/common/data/units.js
index d0d133d18..805be5438 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1333,8 +1333,8 @@ window.units = [
     [ "Mansherry, Princess of Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 606, 303, 234, 1472, 604, 497, 1],
     [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 64, 37, 16, 1604, 964, 106, 1],
     [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, 1066998, 38, 28, 28, 888, 789, 288, 1],
-    [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, null, 203, 142, 32, 1106, 574, 171, null],
-    [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, null],
+    [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 203, 142, 32, 1106, 574, 171, 1],
+    [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, 1],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 554, 261, 35, 1275, 707, 183, 1],
     [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, 2414, 1253, 330, 1],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 162, 91, 29, 2334, 892, 296, 1],
@@ -1352,25 +1352,25 @@ window.units = [
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, 1066998, 51, 38, 21, 1103, 505, 193, 1],
     [ "Ivankov, New Kama King", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, 3000000, 123, 95, 41, 2034, 935, 299, 1],
     [ "Rayleigh, Crew of the Pirate King", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, 3000000, 201, 189, 75, 2037, 1264, 294, 1],
-    [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 2, 50, null, null, null, null, null, null, null, null ],
-    [ "Pekoms Evolved", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 99, null, null, null, null, 2033, 1303, 169, null ],
-    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, null, null, null, null, null, null, null, null, null ],
-    [ "Tamago Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, null, null, null, null, 1651, 1012, 315, null ],
     [ "Bartender Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 5, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Bartender Rayleigh Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, null, null, null, 1922, 1209, 301, null ],
-    [ "Luffy, Winter Island Adventure", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 99, null, null, null, null, 2005, 945, 286, null ],
-    [ "Timeskip Zoro", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, 1066998, 409, 291, 44, 1661, 826, 163, null ],
-    [ "Timeskip Zoro Evolved", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1587, 751, 111, 3603, 1518, 294, null ],
-    [ "Timeskip Franky", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 50, 1066998, 309, 158, 19, 1325, 544, 138, null ],
-    [ "Timeskip Franky Evolved", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1249, 467, 77, null, null, null, null ],
-    [ "Timeskip Nami", "INT", [ "Cerebral", "Striker" ], 4, 15, 5, 3, 50, 1066998, null, null, null, 995, 498, 203, null ],
-    [ "Timeskip Nami Evolved", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 921, 431, 156, 2171, 1109, 440, null ],
-    [ "Timeskip Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 1066998, null, null, null, 1182, 556, 148, null ],
-    [ "Timeskip Sanji Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 99, 2603, 1437, 260, null ],
-    [ "Timeskip Chopper", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 1066998, 202, 109, 31, 1062, 503, 186, null ],
-    [ "Timeskip Chopper Evolved", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, null, null, null, null ],
-    [ "Wild Zoro", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wild Zoro Evolved", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 2, 50, 392109, 99, 66, 33, 909, 666, 156, 1 ],
+    [ "Pekoms, Big Mom Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 866, 651, 133, 1766, 1303, 233, 1 ],
+    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, 50, 392109, 39, 33, 36, 715, 515, 199, 1 ],
+    [ "Tamago, Big Mom Pirates", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 651, 466, 165, 1651, 1012, 315, 1 ],
+    [ "Luffy, Winter Island Adventure", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 99, 2000000, 103, 54, 33, 2005, 945, 286, 1 ],
+    [ "Roronoa Zoro, Gathering of the Straw Hats", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, 1066998, 409, 291, 44, 1661, 826, 163, 1 ],
+    [ "Roronoa Zoro, Reunion of the Straw Hat Pirates", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1587, 751, 111, 3603, 1518, 294, 1 ],
+    [ "Franky, Gathering of the Straw Hats", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 4, 3, 50, 392109, 309, 158, 19, 1325, 544, 138, 1 ],
+    [ "Franky, Reunion of the Straw Hat Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1249, 467, 77, 3030, 1332, 221, 1 ],
+    [ "Nami, Gathering of the Straw Hats", "INT", [ "Cerebral", "Striker" ], 4, 15, 5, 3, 50, 392109, 189, 106, 36, 995, 498, 203, 1 ],
+    [ "Nami, Reunion of the Straw Hat Pirates", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 921, 431, 156, 2171, 1109, 440, 1 ],
+    [ "Sanji, Gathering of the Straw Hats", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 242, 162, 24, 1182, 556, 148, 1 ],
+    [ "Sanji, Reunion of the Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 99, 2603, 1437, 260, 1 ],
+    [ "Chopper, Gathering of the Straw Hats", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 202, 109, 31, 1062, 503, 186, 1 ],
+    [ "Chopper, Reunion of the Straw Hat Pirates", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, 2377, 1188, 379, 1 ],
+    [ "Wild Zoro", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, null ],
+    [ "Wild Zoro Evolved", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index f1ced5a5f..2b479b2d1 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1353, 1352, 1346, 1345, 1341, 1339, 1338 ];
+    var newUnits = [ 1362, 1364, 1366, 1368, 1370, 1360, 1359 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 26f50be87..b32ae4b71 100644
--- a/index.html
+++ b/index.html
@@ -67,7 +67,7 @@
             <p>14/11/2016</p>
             <br>
             <ul>
-                <li>Story 3D2Y Characters Completed</li>
+                <li>Reunion Straw Hats Completed</li>
                 <li>Law Ship added to Calculator</li>
                 <br>
                 <li>Mom Pirates and Zoro Sugofest units added</li>

From f9cfbe9179b18032f6d1c5d89f3f783666fbd0a9 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 1 Dec 2016 01:41:24 -0500
Subject: [PATCH 0678/1569] Aliases and Names

JPN Aliases and Names of Wild Zoro
---
 common/data/aliases.js | 45 +++++++++++++++++++++++++++++++++++-------
 common/data/units.js   |  8 ++++----
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 733c30fb2..91848c7fa 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1333,11 +1333,42 @@ window.aliases = {
     1332: ['マンシェリー トンタッタ王国の姫','',''],
     1333: ['カブ','',''],
     1334: ['ビアン','',''],
-    1335: ['','','Gentleman Sabo'],
-    1336: ['','','Gentleman Sabo'],
-    1337: ['','','Coliseum'],
-    1338: ['','','Coliseum'],
-    1339: ['','','Coliseum'],
-    1340: ['','','Coliseum'],
-    1341: ['','','Coliseum'],
+    1335: ['サボ 貴女との一幕','','Gentleman Sabo'],
+    1336: ['サボ 劇場の怪人','','Gentleman Sabo'],
+    1337: ['カン十郎','','Coliseum'],
+    1338: ['夕立ち　カン十郎','','Coliseum'],
+    1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）','','Coliseum'],
+    1340: ['ゲダツ スカイピア神官','','Coliseum'],
+    1341: ['空番長　ゲダツ スカイピア神官','','Coliseum'],
+    1341: ['カーリー・ダダン','',''],
+    1341: ['ポルシェーミ','',''],
+    1341: ['ブルージャム','',''],
+    1341: ['ジンベエ 魚人海賊団船長','','Jinbe'],
+    1341: ['ヘラクレス おいはぎの森のスゴ腕先生','',''],
+    1341: ['トリノ王国の怪鳥','',''],
+    1341: ['ヒューマンドリル','',''],
+    1341: ['ハレダス','',''],
+    1341: ['テーナ・ゲーナ王国の手長族','',''],
+    1341: ['テキーラウルフの警備兵','',''],
+    1341: ['エンポリオ・イワンコフ キングオブニューカマー','',''],
+    1341: ['シルバーズ・レイリー 海賊王の船員','',''],
+    1341: ['','','Secret Rayleigh'],
+    1341: ['','','Secret Rayleigh'],
+    1341: ['ペコムズ','',''],
+    1341: ['ペコムズ ビッグ・マム海賊団','',''],
+    1341: ['タマゴ男爵','',''],
+    1341: ['タマゴ男爵 ビッグ・マム海賊団','',''],
+    1341: ['ルフィの冬島冒険','','Winter Luffy'],
+    1341: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro'],
+    1341: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro'],
+    1341: ['フランキー 集結の麦わらの一味','','New World Franky'],
+    1341: ['フランキー 新生・麦わらの一味','','New World Franky'],
+    1341: ['ナミ 集結の麦わらの一味','','New World Nami'],
+    1341: ['ナミ 新生・麦わらの一味','','New World Nami'],
+    1341: ['サンジ 集結の麦わらの一味','','New World Sanji'],
+    1341: ['サンジ 新生・麦わらの一味','','New World Sanji'],
+    1341: ['トニートニー・チョッパー 集結の麦わらの一味','','New World Chopper'],
+    1341: ['トニートニー・チョッパー 新生・麦わらの一味','','New World Chopper'],
+    1341: ['','','Wild Zoro'],
+    1341: ['','','Wild Zoro'],
 };
diff --git a/common/data/units.js b/common/data/units.js
index 805be5438..f0780e5f3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1367,10 +1367,10 @@ window.units = [
     [ "Nami, Reunion of the Straw Hat Pirates", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 921, 431, 156, 2171, 1109, 440, 1 ],
     [ "Sanji, Gathering of the Straw Hats", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 242, 162, 24, 1182, 556, 148, 1 ],
     [ "Sanji, Reunion of the Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 99, 2603, 1437, 260, 1 ],
-    [ "Chopper, Gathering of the Straw Hats", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 202, 109, 31, 1062, 503, 186, 1 ],
-    [ "Chopper, Reunion of the Straw Hat Pirates", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, 2377, 1188, 379, 1 ],
-    [ "Wild Zoro", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, null ],
-    [ "Wild Zoro Evolved", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, null ],
+    [ "Tony Tony Chopper, Gathering of the Straw Hats", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 202, 109, 31, 1062, 503, 186, 1 ],
+    [ "Tony Tony Chopper, Reunion of the Straw Hat Pirates", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, 2377, 1188, 379, 1 ],
+    [ "Roronoa Zoro, Wild Pirate", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, null ],
+    [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 1c40b4584e9644da1636dc1de44d6e438e50db30 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 1 Dec 2016 21:27:47 -0500
Subject: [PATCH 0679/1569] Final Fix for mixup

Evos for Rayleigh, Pekoms, and Tamago
---
 common/data/evolutions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index dadb47713..b9f9ebe21 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2045,15 +2045,15 @@ window.evolutions = {
     },
     1354: {
         evolution: 1355,
-        evolvers: [ 78, 78, 78, 84, 84 ]
+        evolvers: [ 117, 80, 83, 97, 302 ]
     },
     1356: {
         evolution: 1357,
-        evolvers: [ 82, 82, 82, 88, 88 ]
+        evolvers: [ 78, 78, 78, 84, 84 ]
     },
     1358: {
         evolution: 1359,
-        evolvers: [ 117, 80, 83, 97, 302 ]
+        evolvers: [ 82, 82, 82, 88, 88 ]
     },
     1361: {
         evolution: 1362,

From 87729d0f913c0dcb1c4a6a86e038940adeb2f054 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 1 Dec 2016 23:12:27 -0500
Subject: [PATCH 0680/1569] Magellan Update

Added Magellan
---
 common/data/captains.js  |  8 ++++++++
 common/data/cooldowns.js |  2 ++
 common/data/details.js   | 30 ++++++++++++++++++++++++++++++
 common/data/drops.js     |  5 +++++
 common/data/families.js  |  2 ++
 common/data/gw.js        |  2 ++
 common/data/units.js     |  2 ++
 7 files changed, 51 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index 765635fdf..a5d247fb9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3769,4 +3769,12 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1373: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+    },
+    1374: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c1ef9445a..ad54d5ed1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1371,4 +1371,6 @@ window.cooldowns = [
     [ 12, 6 ],
     [ 15, 15 ],
     [ 15, 15 ],
+    null,//Magellan
+    null,//Magellan
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 2da1b10d3..533c8c50b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7311,5 +7311,35 @@ window.details = {
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
         specialName: "Wild Plan",
     },
+    1373: {//Magellan
+        captain: "Boosts ATK of INT characters by 1.5x and their HP by 1.2x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
+        special: [
+            {
+                "description": "Poisons all enemies and delays all enemies for 1 turn.",
+                "cooldown": 25,
+            },
+            {
+                "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
+                "cooldown": 31,
+            },
+        ],
+        specialName: "Magellan Special",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
+    },
+    1374: {//Magellan
+        captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.5x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
+        special: [
+            {
+                "description": "Poisons all enemies and delays all enemies for 1 turn.",
+                "cooldown": 25,
+            },
+            {
+                "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
+                "cooldown": 31,
+            },
+        ],
+        specialName: "Magellan Special",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 54c08f468..349768f67 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1434,6 +1434,11 @@ window.drops = {
             thumb: 1298,
             Ultimate: [ 1297 ]
         },
+        {
+            name: 'Clash!! Warden Magellan',
+            thumb: 1374,
+            Master: [ 1373 ],
+        },
 
     ],
 
diff --git a/common/data/families.js b/common/data/families.js
index 36f7593f3..31e01d6a6 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1371,4 +1371,6 @@ window.families = [
     "Tony Tony Chopper",
     "Roronoa Zoro",
     "Roronoa Zoro",
+    "Magellan",
+    "Magellan",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index b474d244a..c14e2a4f2 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1371,4 +1371,6 @@ window.gw=[
     45757,
     45851,
     45851,
+    45905,
+    45905,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f0780e5f3..b0f9ef90e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1371,6 +1371,8 @@ window.units = [
     [ "Tony Tony Chopper, Reunion of the Straw Hat Pirates", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, 2377, 1188, 379, 1 ],
     [ "Roronoa Zoro, Wild Pirate", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, null ],
     [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, null ],
+    [ "Magellan", "INT", [ "Striker", "Shooter" ], 4, 30, 6, 1, 70, 1066998, 210, 107, 29, 1226, 659, 102, null ],
+    [ "Magellan Evolved", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, null, null, null, null ]
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 1cf31093dbb002581c91ffafc99165462b680eef Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 1 Dec 2016 23:32:13 -0500
Subject: [PATCH 0681/1569] Magellan Max Stats

added
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index b0f9ef90e..6f6e66f0f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1372,7 +1372,7 @@ window.units = [
     [ "Roronoa Zoro, Wild Pirate", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, null ],
     [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, null ],
     [ "Magellan", "INT", [ "Striker", "Shooter" ], 4, 30, 6, 1, 70, 1066998, 210, 107, 29, 1226, 659, 102, null ],
-    [ "Magellan Evolved", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, null, null, null, null ]
+    [ "Magellan Evolved", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, null ]
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From ddf343591206d4f567c8fb6e9582f3f8b1cba5dc Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 1 Dec 2016 23:47:03 -0500
Subject: [PATCH 0682/1569] added 30 stamina Magellan

---
 common/data/drops.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 349768f67..71debe48c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1438,6 +1438,7 @@ window.drops = {
             name: 'Clash!! Warden Magellan',
             thumb: 1374,
             Master: [ 1373 ],
+            Expert: [ 1373 ],
         },
 
     ],

From bd294666c0f0febe5234373289ea48e1ac6bb09c Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 2 Dec 2016 22:00:38 -0500
Subject: [PATCH 0683/1569] Magellan and Wild Zoro

Both live on Official
---
 common/data/details.js    | 12 ++++++------
 common/data/drops.js      |  1 +
 common/data/evolutions.js |  8 ++++++++
 common/data/units.js      |  8 ++++----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 533c8c50b..f3c3c3177 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7316,14 +7316,14 @@ window.details = {
         special: [
             {
                 "description": "Poisons all enemies and delays all enemies for 1 turn.",
-                "cooldown": 25,
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
-                "cooldown": 31,
+                "cooldown": [ 31, 16 ],
             },
         ],
-        specialName: "Magellan Special",
+        specialName: "Poison Dragon",
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
     },
     1374: {//Magellan
@@ -7331,14 +7331,14 @@ window.details = {
         special: [
             {
                 "description": "Poisons all enemies and delays all enemies for 1 turn.",
-                "cooldown": 25,
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
-                "cooldown": 31,
+                "cooldown": [ 31, 16 ],
             },
         ],
-        specialName: "Magellan Special",
+        specialName: "Poison Dragon",
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 71debe48c..1ebf07cfd 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1437,6 +1437,7 @@ window.drops = {
         {
             name: 'Clash!! Warden Magellan',
             thumb: 1374,
+            condition: "Take 7% MAX Health in Environmental Damage",
             Master: [ 1373 ],
             Expert: [ 1373 ],
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b9f9ebe21..09c332ce4 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2075,4 +2075,12 @@ window.evolutions = {
         evolution: 1370,
         evolvers: [ 1180, 85, 94, 301, 101 ]
     },
+    1371: {
+        evolution: 1372,
+        evolvers: [ 95, 302, 301, 98, 99 ]
+    },
+    1373: {
+        evolution: 1374,
+        evolvers: [ 118, 88, 94, 304, 104 ]
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 6f6e66f0f..49ff24629 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1369,10 +1369,10 @@ window.units = [
     [ "Sanji, Reunion of the Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 99, 2603, 1437, 260, 1 ],
     [ "Tony Tony Chopper, Gathering of the Straw Hats", "QCK", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 202, 109, 31, 1062, 503, 186, 1 ],
     [ "Tony Tony Chopper, Reunion of the Straw Hat Pirates", "QCK", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 990, 434, 137, 2377, 1188, 379, 1 ],
-    [ "Roronoa Zoro, Wild Pirate", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, null ],
-    [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, null ],
-    [ "Magellan", "INT", [ "Striker", "Shooter" ], 4, 30, 6, 1, 70, 1066998, 210, 107, 29, 1226, 659, 102, null ],
-    [ "Magellan Evolved", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, null ]
+    [ "Roronoa Zoro, Wild Pirate", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, 1 ],
+    [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, 1 ],
+    [ "Magellan", "INT", [ "Striker", "Shooter" ], 4, 30, 6, 1, 70, 1066998, 210, 107, 29, 1226, 659, 102, 1 ],
+    [ "Magellan, Chief Warden of Impel Down", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, 1 ]
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 45bace695cbee66c9bb95fbc02e4427afc6f7bed Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 2 Dec 2016 22:25:42 -0500
Subject: [PATCH 0684/1569] New units

Yolo units added
---
 common/data/drops.js | 2 +-
 common/data/units.js | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 1ebf07cfd..7670f7161 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1247,7 +1247,7 @@ window.drops = {
         {
             name: "Big Mom Pirates!",
             thumb: 1355,
-            "All Difficulties": [ 1354, 1356, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610 ]
+            "All Difficulties": [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610 ]
         },
         
     ],
diff --git a/common/data/units.js b/common/data/units.js
index 49ff24629..a32f3e20e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1372,7 +1372,11 @@ window.units = [
     [ "Roronoa Zoro, Wild Pirate", "QCK", [ "Slasher", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 244, 144, 22, 1122, 596, 77, 1 ],
     [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, 1 ],
     [ "Magellan", "INT", [ "Striker", "Shooter" ], 4, 30, 6, 1, 70, 1066998, 210, 107, 29, 1226, 659, 102, 1 ],
-    [ "Magellan, Chief Warden of Impel Down", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, 1 ]
+    [ "Magellan, Chief Warden of Impel Down", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, 1 ],
+    [ "Coliseum Dellinger", "QCK", [ "Powerhouse", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Dellinger Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Marguerite", "DEX", [ "Shooter", "Slasher" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Marguerite Evolved", "DEX", [ "Shooter", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 58b0b2fa6ebe431a4d8400067eb3f463375373b9 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sat, 3 Dec 2016 00:11:42 -0500
Subject: [PATCH 0685/1569] Fixed Aliases

Ganfor and Imposter/Impostor/Fake Straw Hats aliases added, and new
units JPN names
---
 common/data/aliases.js | 78 ++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 91848c7fa..6cecd5b3c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -983,11 +983,11 @@ window.aliases = {
     982: ['ビスタ 白ひげ海賊団５番隊隊長','','Coliseum'],
     983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Coliseum'],
     984: ['パウリー ガレーラカンパニー１番ドック職長','','Coliseum'],
-    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味','','Raid'],
-    986: ['ココア＆のらギツネ ニセ麦わらの一味','','Raid'],
-    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid'],
-    988: ['マウンブルテン＆トルコ ニセ麦わらの一味','','Raid'],
-    989: ['ニセ麦わらの一味','','Raid'],
+    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    986: ['ココア＆のらギツネ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    988: ['マウンブルテン＆トルコ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    989: ['ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
     990: ['マッハ・バイス',''],
     991: ['マッハ・バイス ドンキホーテ海賊団',''],
     992: ['グラディウス',''],
@@ -1193,8 +1193,8 @@ window.aliases = {
     1192: ['クザン','','Aokiji'],
     1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
     1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
-    1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall'],
-    1196: ['ガン・フォール スカイピアの神','','Coliseum Gan Fall'],
+    1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall', 'Ganfall'],
+    1196: ['ガン・フォール スカイピアの神','','Coliseum Gan Fall', 'Ganfall'],
     1197: ['スカイブリーダー・オーム','','Coliseum Ohm'],
     1198: ['ジュエリー・ボニー 弾けるサファイア','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
     1199: ['ジュエリー・ボニー パールホワイトの煌き','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
@@ -1340,35 +1340,37 @@ window.aliases = {
     1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）','','Coliseum'],
     1340: ['ゲダツ スカイピア神官','','Coliseum'],
     1341: ['空番長　ゲダツ スカイピア神官','','Coliseum'],
-    1341: ['カーリー・ダダン','',''],
-    1341: ['ポルシェーミ','',''],
-    1341: ['ブルージャム','',''],
-    1341: ['ジンベエ 魚人海賊団船長','','Jinbe'],
-    1341: ['ヘラクレス おいはぎの森のスゴ腕先生','',''],
-    1341: ['トリノ王国の怪鳥','',''],
-    1341: ['ヒューマンドリル','',''],
-    1341: ['ハレダス','',''],
-    1341: ['テーナ・ゲーナ王国の手長族','',''],
-    1341: ['テキーラウルフの警備兵','',''],
-    1341: ['エンポリオ・イワンコフ キングオブニューカマー','',''],
-    1341: ['シルバーズ・レイリー 海賊王の船員','',''],
-    1341: ['','','Secret Rayleigh'],
-    1341: ['','','Secret Rayleigh'],
-    1341: ['ペコムズ','',''],
-    1341: ['ペコムズ ビッグ・マム海賊団','',''],
-    1341: ['タマゴ男爵','',''],
-    1341: ['タマゴ男爵 ビッグ・マム海賊団','',''],
-    1341: ['ルフィの冬島冒険','','Winter Luffy'],
-    1341: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro'],
-    1341: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro'],
-    1341: ['フランキー 集結の麦わらの一味','','New World Franky'],
-    1341: ['フランキー 新生・麦わらの一味','','New World Franky'],
-    1341: ['ナミ 集結の麦わらの一味','','New World Nami'],
-    1341: ['ナミ 新生・麦わらの一味','','New World Nami'],
-    1341: ['サンジ 集結の麦わらの一味','','New World Sanji'],
-    1341: ['サンジ 新生・麦わらの一味','','New World Sanji'],
-    1341: ['トニートニー・チョッパー 集結の麦わらの一味','','New World Chopper'],
-    1341: ['トニートニー・チョッパー 新生・麦わらの一味','','New World Chopper'],
-    1341: ['','','Wild Zoro'],
-    1341: ['','','Wild Zoro'],
+    1342: ['カーリー・ダダン','',''],
+    1343: ['ポルシェーミ','',''],
+    1344: ['ブルージャム','',''],
+    1345: ['ジンベエ 魚人海賊団船長','','Jinbe'],
+    1346: ['ヘラクレス おいはぎの森のスゴ腕先生','',''],
+    1347: ['トリノ王国の怪鳥','',''],
+    1348: ['ヒューマンドリル','',''],
+    1349: ['ハレダス','',''],
+    1350: ['テーナ・ゲーナ王国の手長族','',''],
+    1351: ['テキーラウルフの警備兵','',''],
+    1352: ['エンポリオ・イワンコフ キングオブニューカマー','',''],
+    1353: ['シルバーズ・レイリー 海賊王の船員','',''],
+    1354: ['','','Secret Rayleigh'],
+    1355: ['','','Secret Rayleigh'],
+    1356: ['ペコムズ','',''],
+    1357: ['ペコムズ ビッグ・マム海賊団','',''],
+    1358: ['タマゴ男爵','',''],
+    1359: ['タマゴ男爵 ビッグ・マム海賊団','',''],
+    1360: ['ルフィの冬島冒険','','Winter Luffy'],
+    1361: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro'],
+    1362: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro'],
+    1363: ['フランキー 集結の麦わらの一味','','New World Franky'],
+    1364: ['フランキー 新生・麦わらの一味','','New World Franky'],
+    1365: ['ナミ 集結の麦わらの一味','','New World Nami'],
+    1366: ['ナミ 新生・麦わらの一味','','New World Nami'],
+    1367: ['サンジ 集結の麦わらの一味','','New World Sanji'],
+    1368: ['サンジ 新生・麦わらの一味','','New World Sanji'],
+    1369: ['トニートニー・チョッパー 集結の麦わらの一味','','New World Chopper'],
+    1370: ['トニートニー・チョッパー 新生・麦わらの一味','','New World Chopper'],
+    1371: ['ロロノア・ゾロ 野生の海賊','','Wild Zoro'],
+    1372: ['ロロノア・ゾロ 大地の開拓者','','Wild Zoro'],
+    1373: ['マゼラン','','Raid Magellan'],
+    1374: ['マゼラン 監獄署長','','Raid Magellan'],
 };

From b76b68c258772a3010b7ab86a5d26362e04b9776 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 3 Dec 2016 14:31:45 -0500
Subject: [PATCH 0686/1569] Smoker Details Fixed

Notes show up now
---
 common/data/details.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f3c3c3177..2d4d65598 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6270,16 +6270,15 @@ window.details = {
         specialName: "Leg-Locked Heave-Ho",
     },
     1231: {//Smoker
-        captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.25x",
-        captainNote: "If smoker uses his special ability to swap to your captain, his effective captain boost will be 2.925x",
+        captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.25x",
         special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
         specialName: "Armed - White Launcher",
         sailor: "Boosts ATK of Striker characters by 50",
     },
     1232: {//Smoker
-        captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and boosts ATK of Striker and Driven characters by 1.3x",
-        captainNote: "If smoker uses his special ability to swap to your captain, his effective captain boost will be 2.925x",
+        captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.3x",
+        captainNotes: "If Smoker uses his special ability to swap to your captain, his effective captain boost will be 2.925x",
         special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
         specialName: "Armed - White Launcher",

From c679e8b177e9708235bb881c396b42254a4df165 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 3 Dec 2016 14:32:14 -0500
Subject: [PATCH 0687/1569] Unevolved Smoker

corrected description
---
 common/data/details.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/details.js b/common/data/details.js
index 2d4d65598..d8b4bd9eb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6271,6 +6271,7 @@ window.details = {
     },
     1231: {//Smoker
         captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.25x",
+        captainNotes: "If Smoker uses his special ability to swap to your captain, his effective captain boost will be 2.1875x",
         special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
         specialName: "Armed - White Launcher",

From 7b3a54c423e7abd3005054739fcc1e71723498e0 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 4 Dec 2016 22:07:33 -0500
Subject: [PATCH 0688/1569] Akainu detail fixed

Filter shows him as a Driven ATK booster now
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index d8b4bd9eb..c49220048 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6659,7 +6659,7 @@ window.details = {
     },
     1283: {//Marineford Akainu
         captain: "Boosts ATK of Driven characters by 2.5x",
-        special: "Deals 35x character's ATK in [INT] damage to one enemy. Boosts the ATK of Driven characters by 1.5x for 1 turn",
+        special: "Deals 35x character's ATK in [INT] damage to one enemy. Boosts ATK of Driven characters by 1.5x for 1 turn",
         specialName: "Dark Dog",
     },
     1284: {//Wild Luffy

From f8d563013ef2042a826866968e45fb557a70c251 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 4 Dec 2016 22:38:56 -0500
Subject: [PATCH 0689/1569] Added Colo Drops units

---
 common/data/drops.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 7670f7161..70cb620b2 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1485,9 +1485,9 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294, 1309, 1311 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377 ]
         },
         
         {

From b8cc4550531463def7c85bb3864f46514ce7d966 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 5 Dec 2016 01:32:20 -0500
Subject: [PATCH 0690/1569] Sabo names

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index a32f3e20e..1a5a7b8c4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1333,8 +1333,8 @@ window.units = [
     [ "Mansherry, Princess of Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 606, 303, 234, 1472, 604, 497, 1],
     [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 64, 37, 16, 1604, 964, 106, 1],
     [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, 1066998, 38, 28, 28, 888, 789, 288, 1],
-    [ "Debonair Sabo", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 203, 142, 32, 1106, 574, 171, 1],
-    [ "Debonair Sabo Evolved", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, 1],
+    [ "Sabo, One Night with a Noblewoman", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 203, 142, 32, 1106, 574, 171, 1],
+    [ "Sabo, Phantom of the Opera", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, 1],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 554, 261, 35, 1275, 707, 183, 1],
     [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, 2414, 1253, 330, 1],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 162, 91, 29, 2334, 892, 296, 1],

From b623cd099dc90ccc131fcb6610f1669aa88515d3 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 5 Dec 2016 23:17:27 -0500
Subject: [PATCH 0691/1569] Halloween Kalifa

She's in there now
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 1a5a7b8c4..72ab9dd92 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1293,8 +1293,8 @@ window.units = [
     [ "Lao G, Diamante Military Leader", "DEX", [ "Driven", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 970, 700, 107, 2070, 1357, 270, 1 ],
     [ "Boa Sandersonia, Kuja Warrior", "PSY", "Fighter", 3, 16, 4, 2, 50, 392109, 93, 39, 39, 693, 393, 193, 1 ],
     [ "Boa Sandersonia, Three Gorgon Sisters, Second Daughter", "PSY", [ "Powerhouse", "Striker" ], 4, 26, 4, 3, 99, 3000000, 693, 393, 139, 1839, 993, 329, 1 ],
-    [ "Halloween Kalifa", "STR", [ "Fighter", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 96, 83, 44, 836, 422, 277, null ],
-    [ "Halloween Kalifa Evolved", "STR", [ "Fighter", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 759, 351, 229, 1655, 839, 464, null ],
+    [ "Kalifa, Glamorous Mummy", "STR", [ "Fighter", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 96, 83, 44, 836, 422, 277, 1 ],
+    [ "Kalifa, Glamorous Mummy Halloween Night - Masquerade", "STR", [ "Fighter", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 759, 351, 229, 1655, 839, 464, 1 ],
     [ "Akainu", "STR", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 286, 216, 0, 1618, 816, 49, 1 ],
     [ "Akainu, Magma Man", "STR", [ "Driven", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1518, 716, 44, 3168, 1444, 99, 1 ],
     [ "Rebecca, Lovely Monster Cat", "INT", "Fighter", 4, 12, 7, 1, 50, 392109, 87, 43, 38, 961, 453, 221, 1 ],

From 994db6f4df2756dcdcefebe65894bb95f86d56a2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 6 Dec 2016 01:07:37 -0500
Subject: [PATCH 0692/1569] Rayleigh Shop Filter

Added Rayleigh Shop filter, did some edits to aliases and drops page
---
 characters/js/directives.js   |  1 +
 characters/js/table.js        |  5 ++++-
 characters/views/sidebar.html |  4 ++++
 common/data/aliases.js        | 18 +++++++++++-------
 common/data/drops.js          | 25 ++++++++++++-------------
 common/data/evolutions.js     |  2 +-
 common/data/flags.js          | 12 ++++++++++--
 common/data/units.js          |  4 ++--
 8 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 593fefcdd..65922084a 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -360,6 +360,7 @@ directives.addTags = function($stateParams, $rootScope) {
             if (flags.rr) element.append($('<span class="tag flag">Rare Recruit only</div>'));
             if (flags.lrr) element.append($('<span class="tag flag">Limited Rare Recruit only</div>'));
             if (flags.promo) element.append($('<span class="tag flag">Promo-code only</div>'));
+            if (flags.shop) element.append($('<span class="tag flag">Rayleigh Shop Unit</div>'));
             if (flags.special) element.append($('<span class="tag flag">One time only characters</div>'));
             if (CharUtils.checkFarmable(id, { 'Story Island': true }))
                 element.append($('<span class="tag flag">Story mode only</div>'));
diff --git a/characters/js/table.js b/characters/js/table.js
index 5a354e23f..869f4d8d2 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -142,6 +142,9 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
                     // special
                     if (filters.nonFarmable.special && !flags.special) return false;
                     if (filters.nonFarmable.special === false && flags.special) return false;
+                    // rayleigh shop
+                    if (filters.nonFarmable.shop && !flags.shop) return false;
+                    if (filters.nonFarmable.shop === false && flags.shop) return false;
                 }
             }
         }
@@ -151,7 +154,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
         if (filters.noFodder && Utils.isFodder(unit)) return false;
         if (filters.noFortnights && flags.fnonly) return false;
         if (filters.noRaids && flags.raid) return false;
-        if (filters.noSpecials && (flags.lrr || flags.promo || flags.special)) return false;
+        if (filters.noSpecials && (flags.lrr || flags.promo || flags.special || flags.shop )) return false;
         // filter by server
         if (filters.server) {
             if (filters.server == 'Global units' && !flags.global) return false;
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 5020d78e6..081206417 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -71,6 +71,10 @@
         ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,true)">Special-only</span><!--
  --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special === false }"
         ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,false)">Hide special-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop }"
+        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,true)">Ray Shop Unit</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop === false }"
+        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,false)">Hide Ray Shop Unit</span>
 </div>
 
 <div class="filter-container">
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6cecd5b3c..1d95c1389 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -512,7 +512,7 @@ window.aliases = {
     511: ['服役囚ダズ・ボーネス Mr.1','','Mr 1','Daz Bones'],
     512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
     513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
-    514: ['ニコ・ロビン トロピカル',''],
+    514: ['ニコ・ロビン トロピカル', '','Summertime Robin', 'Swimsuit Robin'],
     515: ['ヘラクレスン','','Raid'],
     516: ['ヘラクレスン 森の勇者','','Raid'],
     517: ['ウソップン','', 'Raid Usoppun' ],
@@ -660,7 +660,7 @@ window.aliases = {
     659: ['モンキー・D・ルフィ うきわ','','Summertime Luffy','Swimsuit Luffy'],
     660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp' ],
     661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp' ],
-    662: ['ナミ バカンス',''],
+    662: ['ナミ バカンス', '', 'Summertime Nami', 'Swimsuit Nami'],
     663: ['ネフェルタリ・ビビ アラバスタ王国王女','','Young Vivi'],
     664: ['ネフェルタリ・ビビ 砂砂団　副リーダー','','Young Vivi'],
     665: ['コーザ アラバスタ住民','','Young Koza'],
@@ -684,7 +684,7 @@ window.aliases = {
     683: ['アイス大好きロビン チョコアイス','','Summertime Robin','Swimsuit Robin'],
     684: ['アイス大好きペローナ','','Summertime Perona','Swimsuit Perona'],
     685: ['アイス大好きペローナ ストロベリーアイス','','Summertime Perona','Swimsuit Perona'],
-    686: ['ビビのひとやすみ',''],
+    686: ['ビビのひとやすみ','', 'Summertime Vivi', 'Swimsuit Vivi' ],
     687: ['カルガラ',''],
     688: ['カルガラ シャンディアの大戦士',''],
     689: ['モンブラン・ノーランド',''],
@@ -1118,8 +1118,8 @@ window.aliases = {
     1117: [ 'サンジ 信念に生きる麦わらの一味', 'Strong World Sanji' ],
     1118: [ 'ナミ 夢を追い求める冒険者', 'Strong World Nami' ],
     1119: [ 'ナミ 信念に生きる麦わらの一味', 'Strong World Nami' ],
-    1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '' ],
-    1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '' ],
+    1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy' ],
+    1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy' ],
     1122: [ 'キャベンディッシュ', '','Hakuba','cabbage' ],
     1123: [ '白馬のキャベンディッシュ', '','Hakuba','cabbage' ],
     1124: ['スレイマン',''],
@@ -1293,8 +1293,8 @@ window.aliases = {
     1292: ['ラオＧ ディアマンテ軍幹部','','Coliseum'],
     1293: ['ボア・サンダーソニア 九蛇の戦士','','Coliseum'],
     1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女','','Coliseum'],
-    1295: ['','',''],
-    1296: ['','',''],
+    1295: ['カリファ　グラマラスミイラ','','Halloween Kalifa'],
+    1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード','','Halloween Kalifa'],
     1297: ['赤犬','','Raid Sakazuki'],
     1298: ['赤犬 マグマ人間','','Raid Sakazuki'],
     1299: ['レベッカ　ラブリーモンスターキャット','',''],
@@ -1373,4 +1373,8 @@ window.aliases = {
     1372: ['ロロノア・ゾロ 大地の開拓者','','Wild Zoro'],
     1373: ['マゼラン','','Raid Magellan'],
     1374: ['マゼラン 監獄署長','','Raid Magellan'],
+    1375: ['', '', 'Coliseum'],
+    1376: ['', '', 'Coliseum'],
+    1377: ['', '', 'Coliseum'],
+    1378: ['', '', 'Coliseum'],
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 70cb620b2..9f77a42a5 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -804,7 +804,7 @@ window.drops = {
             global: true,
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
-            challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Damage Reduction Forbidden Tome']],
+            challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Defence Boost Forbidden Tome']],
             "All Difficulties": [ 385, 387, -388, -335, -314, -36, -16, -11 ]
         },
 
@@ -880,7 +880,7 @@ window.drops = {
             global: true,
             condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened (Note: Multi-class characters such as Striker / Slasher are not affected)',
             challenge: 'Total Damage dealt to enemies in one turn',
-            challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x CDR Forbidden Tome, 2x Rainbow Gems']],
+            challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x Cooldown Reduction Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]
         },
 
@@ -982,7 +982,7 @@ window.drops = {
             global: true,
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
-            challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Anti-Lock Forbidden Tome, 2x Rainbow Gems']],
+            challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Lock Resistance Forbidden Tome, 2x Rainbow Gems']],
             "Japan": [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ],
             "Global": [ 712, 714, 715, -716, -643, -546, -541, -400, -202, -363, -204 ]
         },
@@ -1060,7 +1060,7 @@ window.drops = {
             global: true,
             condition: 'You can only bring Shooter and Driven units. (No Evo/Boosters)',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
-            challengeData: [['400,000 Damage','1x QCK Elder Turtle'],['1,400,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['4,000,000 Damage','2x Rainbow Gems, 1x Despair Forbidden Tome']],
+            challengeData: [['400,000 Damage','1x QCK Elder Turtle'],['1,400,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['4,000,000 Damage','2x Rainbow Gems, 1x Despair Resistance Forbidden Tome']],
             "All Difficulties": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
         },
 
@@ -1069,7 +1069,7 @@ window.drops = {
             thumb: 866,
             condition: "None",
             challenge:'Total number of hits above 50,000',
-            challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Anti-Silence Forbidden Tome, 2x Rainbow Gems']],
+            challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Despair Resistance Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ]
         },
 
@@ -1456,7 +1456,7 @@ window.drops = {
             name: 'Battle Royal! Oars',
             thumb: 893,
             challenge:'Total number of hits above 50,000',
-            challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Anti-Bind Forbidden Tome, 2x Rainbow Gems']],
+            challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Bind Resistance Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -15, -8 ]
         },
 
@@ -1465,9 +1465,8 @@ window.drops = {
             thumb: 683,
             global: true,
             challenge: 'Total number of hits over 30,000',
-            challengeData: [['10 Times','Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems']],
-            "All Difficulties": [ 659, 680, 682, 684, 1200, 1198 ],
-            "Completion Units": [686]
+            challengeData: [['Japan Rewards', ''],['10 Times','#686 Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems'], ['Global Rewards', ''],['10 Times','1x Bind Resistance Forbidden Tome, 1x Despair Resistance Forbidden Tome, 1x Auto-Heal Forbidden Tome, 1x Rainbow Gem'],['35 Times','1x Red Elder Turtle, 1x Blue Elder Turtle, 1x Green Elder Turtle, 1x Yellow Elder Turtle, 1x Black Elder Turtle, 2x Rainbow Gems'],['72 Times','5x Rainbow Gems']],
+            "All Difficulties": [ 659, 680, 682, 684, 1200, 1198 ]
         },
         
         {
@@ -1493,28 +1492,28 @@ window.drops = {
         {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
-            challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
+            condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -261, -562, -720, -748, -935 ]
         },
         
         {
             name: 'Rescue Ace Event - Aokiji',
             thumb: 1280,
-            challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
+            condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -416, -459, -530, -669, -578 ]
         },
         
         {
             name: 'Rescue Ace Event - Kizaru',
             thumb: 1228,
-            challenge: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
+            condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "All Difficulties": [ -367, -649, -718, -870, -1001 ]
         },
         
         {
             name: 'Young Whitebeard Event',
             thumb: 1258,
-            challenge: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
+            condition: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
             "All Difficulties": [ 1257 ]
         },
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 09c332ce4..734adbab4 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1965,7 +1965,7 @@ window.evolutions = {
     },
     1295: {
         evolution: 1296,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 84, 300, 100 ]
     },
     1297: {
         evolution: 1298,
diff --git a/common/data/flags.js b/common/data/flags.js
index 241d81f33..70d36b129 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -401,7 +401,7 @@ window.flags = {
     400: { global: 1 },
     401: { global: 1 },
     402: { global: 1 },
-    403: { promo: 1 },
+    403: { promo: 1, shop: 1 },
     404: { global: 1 },
     405: { global: 1 },
     406: { global: 1 },
@@ -512,7 +512,7 @@ window.flags = {
     511: { global: 1 },
     512: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
     513: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
-    514: { special: 1 },
+    514: { special: 1, shop: 1 },
     515: { global: 1 },
     516: { global: 1 },
     517: { global: 1 },
@@ -659,6 +659,7 @@ window.flags = {
     658: { global: 1},
     660: { rr: 1, rro: 1, lrr: 1, global: 1 },
     661: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    662: { shop: 1 },
     663: { global: 1 },
     664: { global: 1 },
     665: { global: 1 },
@@ -682,6 +683,7 @@ window.flags = {
     683: { global: 1 },
     684: { global: 1 },
     685: { global: 1 },
+    686: { special: 1, shop: 1 },
     687: { global: 1 },
     688: { global: 1 },
     689: { global: 1 },
@@ -1069,6 +1071,8 @@ window.flags = {
     1175: { rr: 1, rro: 1, global: 1 },
     1176: { rr: 1, rro: 1, global: 1 },
     1177: { rr: 1, rro: 1, global: 1 },
+    1178: { shop: 1 },
+    1179: { shop: 1 },
     1181: { rr: 1, rro: 1 },
     1182: { rr: 1, rro: 1 },
     1183: { rr: 1, rro: 1 },
@@ -1125,6 +1129,8 @@ window.flags = {
     1276: { rr: 1, rro: 1 },
     1277: { rr: 1, rro: 1 },
     1278: { rr: 1, rro: 1 },
+    1284: { shop: 1 },
+    1285: { shop: 1 },
     1295: { rr: 1, rro: 1, lrr: 1 },
     1296: { rr: 1, rro: 1, lrr: 1 },
     1307: { rr: 1, rro: 1, lrr: 1 },
@@ -1154,4 +1160,6 @@ window.flags = {
     1368: { rr: 1, rro: 1 },
     1369: { rr: 1, rro: 1 },
     1370: { rr: 1, rro: 1 },
+    1371: { shop: 1 },
+    1372: { shop: 1 },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 72ab9dd92..a7cf2214e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1172,8 +1172,8 @@ window.units = [
     [ "Tanaka, Security Guard of Gran Tesoro", "QCK", [ "Shooter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 849, 449, 131, 1706, 1089, 305, 1 ],
     [ "Brook, Dream-Pursuing Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
     [ "Brook, Loyal Straw Hat Crew", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
-    [ "Zoro, Dream-Pursuing Adventurer", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
-    [ "Zoro, Loyal Straw Hat Crew", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
+    [ "Roronoa Zoro, Dream-Pursuing Adventurer", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
+    [ "Roronoa Zoro, Loyal Straw Hat Crew", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
     [ "Chopper, Dream-Pursuing Adventurer", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
     [ "Chopper, Loyal Straw Hat Crew", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
     [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 902, 473, 74, 2018, 1028, -444, 1 ],

From e588c10b59bcd6b7a301af16dad1a2619a593432 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 6 Dec 2016 02:01:33 -0500
Subject: [PATCH 0693/1569] Invasion Boss Shanks Added

I think it won't break
---
 common/data/drops.js      | 9 ++++++++-
 common/data/evolutions.js | 4 ++++
 common/data/units.js      | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9f77a42a5..2b957490a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1511,11 +1511,18 @@ window.drops = {
         },
         
         {
-            name: 'Young Whitebeard Event',
+            name: 'Invasion! Young Whitebeard',
             thumb: 1258,
             condition: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
             "All Difficulties": [ 1257 ]
         },
+        
+        {
+            name: 'Invasion! Red Hair Shanks',
+            thumb: 1380,
+            condition: "Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Shanks.",
+            "All Difficulties": [ 1379 ]
+        },
 
    ]
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 734adbab4..26923d0e8 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2083,4 +2083,8 @@ window.evolutions = {
         evolution: 1374,
         evolvers: [ 118, 88, 94, 304, 104 ]
     },
+    1379: {
+        evolution: 1380,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index a7cf2214e..7ec7bc592 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1377,6 +1377,8 @@ window.units = [
     [ "Coliseum Dellinger Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Marguerite", "DEX", [ "Shooter", "Slasher" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Marguerite Evolved", "DEX", [ "Shooter", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Invasion Boss Shanks", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Invasion Boss Shanks Evolved", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From ba5492001b72a962f19627543a53df40eeef0c4a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 7 Dec 2016 00:35:44 -0500
Subject: [PATCH 0694/1569] New Colo Units

Still need stats
---
 common/data/captains.js  | 20 ++++++++++++++++++++
 common/data/cooldowns.js |  6 ++++++
 common/data/details.js   | 32 ++++++++++++++++++++++++++++++++
 common/data/specials.js  | 10 ++++++++++
 common/data/units.js     | 12 ++++++------
 5 files changed, 74 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a5d247fb9..25acb2163 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3777,4 +3777,24 @@ window.captains = {
         atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
         hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
+    1375: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+    },
+    1376: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; },
+    },
+    1377: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; }
+    },
+    1378: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; }
+    },
+    1379: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+    },
+    1380: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ad54d5ed1..b9f9795bb 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1373,4 +1373,10 @@ window.cooldowns = [
     [ 15, 15 ],
     null,//Magellan
     null,//Magellan
+    26,
+    26,
+    26,
+    26,
+    27,
+    27,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index c49220048..94a08d4a1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7341,5 +7341,37 @@ window.details = {
         specialName: "Poison Dragon",
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
     },
+    1375: {//Dellinger
+        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, doubles damage received",
+        special: "Deals 20x character's ATK in [QCK] damage to all enemies, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
+        specialName: "Dellinger Special",
+    },
+    1376: {//Dellinger
+        captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, doubles damage received",
+        special: "Deals 20x character's ATK in [QCK] damage to all enemies, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
+        specialName: "Dellinger Special",
+    },
+    1377: {//Marguerite
+        captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.3x",
+        special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
+        specialName: "Sincere Devotion",
+    },
+    1378: {//Marguerite
+        captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.75x",
+        special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
+        specialName: "Sincere Devotion",
+    },
+    1379: {//Shanks
+        captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
+        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 3 turns.",
+        specialName: "Shanks Special",
+    },
+    1380: {//Shanks
+        captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
+        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 3 turns.",
+        specialName: "Shanks Special",
+    },
 };
 
diff --git a/common/data/specials.js b/common/data/specials.js
index eb1d8a859..ed84ebaaa 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1863,4 +1863,14 @@ window.specials = {
             });
         },
     },
+    1375: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+    },
+    1376: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 7ec7bc592..89604a783 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1373,12 +1373,12 @@ window.units = [
     [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, 1 ],
     [ "Magellan", "INT", [ "Striker", "Shooter" ], 4, 30, 6, 1, 70, 1066998, 210, 107, 29, 1226, 659, 102, 1 ],
     [ "Magellan, Chief Warden of Impel Down", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, 1 ],
-    [ "Coliseum Dellinger", "QCK", [ "Powerhouse", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Dellinger Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Marguerite", "DEX", [ "Shooter", "Slasher" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Marguerite Evolved", "DEX", [ "Shooter", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Invasion Boss Shanks", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Invasion Boss Shanks Evolved", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Dellinger", "QCK", [ "Powerhouse", "Fighter" ], 4, 25, 5, 2, 70, null, null, null, null, 1134, 749, 171, null ],
+    [ "Coliseum Dellinger Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, 7, 3, 99, null, 1062, 668, 109, null, null, null, null ],
+    [ "Coliseum Marguerite", "DEX", [ "Shooter", "Slasher" ], 3, 16, 5, 2, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Coliseum Marguerite Evolved", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, null, null, null, null, 1759, 974, 403, null ],
+    [ "Invasion Boss Shanks", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, null, null, null, null, null, null, null ],
+    [ "Invasion Boss Shanks Evolved", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, null, null, null, 2552, 1440, 353, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From d7675c73e3b33225e3e81a483606bba7b5d752ef Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 7 Dec 2016 11:54:39 -0500
Subject: [PATCH 0695/1569] New units update, Shanks, Dellinger, Marguerite

Shanks stats are all there, he should be in calc now
---
 common/data/cooldowns.js  |  8 ++++----
 common/data/details.js    | 10 ++++++----
 common/data/evolutions.js | 10 +++++++++-
 common/data/families.js   |  6 ++++++
 common/data/gw.js         |  6 ++++++
 common/data/specials.js   |  6 ++++++
 common/data/units.js      |  6 +++---
 7 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b9f9795bb..dd6e4fd80 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1373,10 +1373,10 @@ window.cooldowns = [
     [ 15, 15 ],
     null,//Magellan
     null,//Magellan
-    26,
-    26,
-    26,
-    26,
+    [ 26, 12 ],
+    [ 26, 12 ],
+    [ 26, 14 ],
+    [ 26, 14 ],
     27,
     27,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 94a08d4a1..c409eb255 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7343,34 +7343,36 @@ window.details = {
     },
     1375: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, doubles damage received",
-        special: "Deals 20x character's ATK in [QCK] damage to all enemies, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
+        special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
         specialName: "Dellinger Special",
     },
     1376: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, doubles damage received",
-        special: "Deals 20x character's ATK in [QCK] damage to all enemies, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
+        special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
         specialName: "Dellinger Special",
     },
     1377: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.3x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
+        sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Sincere Devotion",
     },
     1378: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.75x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
+        sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Sincere Devotion",
     },
     1379: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
-        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 3 turns.",
+        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "Shanks Special",
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
-        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 3 turns.",
+        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "Shanks Special",
     },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 26923d0e8..52a8f7a38 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2083,8 +2083,16 @@ window.evolutions = {
         evolution: 1374,
         evolvers: [ 118, 88, 94, 304, 104 ]
     },
+    1375: {
+        evolution: 1376,
+        evolvers: [ 117, 118, 86, 91, 97 ]
+    },
+    1377: {
+        evolution: 1378,
+        evolvers: [ 118, 79, 83, 96, 301 ]
+    },
     1379: {
         evolution: 1380,
-        evolvers: [  ]
+        evolvers: [ 118, 88, 266, 99, 304 ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 31e01d6a6..0bbce0dd9 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1373,4 +1373,10 @@ window.families = [
     "Roronoa Zoro",
     "Magellan",
     "Magellan",
+    "Dellinger",
+    "Dellinger",
+    "Marguerite",
+    "Marguerite",
+    "Shanks",
+    "Shanks",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index c14e2a4f2..ad7e0e2b5 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1373,4 +1373,10 @@ window.gw=[
     45851,
     45905,
     45905,
+    46259,
+    46259,
+    46330,
+    46330,
+    46369,
+    46369,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index ed84ebaaa..1034986df 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1873,4 +1873,10 @@ window.specials = {
         type: "type",
         orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
     },
+    1379: {
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+    },
+    1380: {
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 89604a783..df0b37110 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1375,10 +1375,10 @@ window.units = [
     [ "Magellan, Chief Warden of Impel Down", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, 1 ],
     [ "Coliseum Dellinger", "QCK", [ "Powerhouse", "Fighter" ], 4, 25, 5, 2, 70, null, null, null, null, 1134, 749, 171, null ],
     [ "Coliseum Dellinger Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, 7, 3, 99, null, 1062, 668, 109, null, null, null, null ],
-    [ "Coliseum Marguerite", "DEX", [ "Shooter", "Slasher" ], 3, 16, 5, 2, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Coliseum Marguerite", "DEX", [ "Shooter", "Slasher" ], 3, 16, 5, 2, 50, 392109, 93, 72, 62, 895, 520, 206, null ],
     [ "Coliseum Marguerite Evolved", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, null, null, null, null, 1759, 974, 403, null ],
-    [ "Invasion Boss Shanks", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, null, null, null, null, null, null, null ],
-    [ "Invasion Boss Shanks Evolved", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, null, null, null, 2552, 1440, 353, null ],
+    [ "Invasion Boss Shanks", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, null ],
+    [ "Invasion Boss Shanks Evolved", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]

From 846b0dcf2304572c7c49da166174062383896b7b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 7 Dec 2016 22:20:45 -0500
Subject: [PATCH 0696/1569] Some Fixes

Shanks, line 4114 for Beaf, and Evo mats switched
---
 common/data/captains.js   | 12 ++++++------
 common/data/details.js    |  6 +++---
 common/data/evolutions.js |  4 ++--
 common/data/specials.js   |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 25acb2163..8e301ce2f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3361,9 +3361,9 @@ window.captains = {
                 1;
         },
         hp: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
-                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
-                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.15 :
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.44 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
                 1;
         },
     },
@@ -3375,9 +3375,9 @@ window.captains = {
                 1;
         },
         hp: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3225 :
-                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.15 : 
-                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.15 :
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.44 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
                 1;
         },
     },
diff --git a/common/data/details.js b/common/data/details.js
index c409eb255..bcd416f64 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4111,7 +4111,7 @@ window.details = {
     891: {
         captain: "Boosts ATK and RCV of Powerhouse characters by 1.75x",
         specialName: "Resurrection of the Dead",
-        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.25x for 1 turn",
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.25x for 1 turn"
         },
     892: {
         captain: "Boosts chain multiplier by 2x",
@@ -6597,14 +6597,14 @@ window.details = {
         specialName: "Other Side of Fate",
     },
     1273: {//Jesus Burgess
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.15",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.2",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.3225 HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Champion of the Wild Roar",
     },
     1274: {//Jesus Burgess Evo
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.15x",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.2x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.3225 HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 52a8f7a38..d45764e59 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2085,11 +2085,11 @@ window.evolutions = {
     },
     1375: {
         evolution: 1376,
-        evolvers: [ 117, 118, 86, 91, 97 ]
+        evolvers: [ 118, 79, 83, 96, 301 ]
     },
     1377: {
         evolution: 1378,
-        evolvers: [ 118, 79, 83, 96, 301 ]
+        evolvers: [ 117, 118, 86, 91, 97 ]
     },
     1379: {
         evolution: 1380,
diff --git a/common/data/specials.js b/common/data/specials.js
index 1034986df..066d11cec 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1874,9 +1874,9 @@ window.specials = {
         orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
     },
     1379: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
     1380: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
 };

From 513ec4512d42689832f5138baceabf0ebc3e0dba Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 8 Dec 2016 13:02:57 -0500
Subject: [PATCH 0697/1569] Suleiman Special Name

added
---
 common/data/details.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index bcd416f64..62d1ac987 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5552,24 +5552,26 @@ window.details = {
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
         special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
-        specialName: "Sickle Weasel of Rommel"
+        specialName: "Slicing Winds of Rommel"
     },
     1123: {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
         special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
-        specialName: "Sickle Weasel of Rommel"
+        specialName: "Slicing Winds of Rommel"
     },
     1124: {
         captain: "Boosts ATK of Slashers characters by 3x, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
         special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
+        specialName: "Idle Execution"
     },
     1125: {
         captain: "Boosts ATK of Slashers characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
         special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
+        specialName: "Idle Execution"
     },
     1126: {
         captain: "Boosts ATK and HP of [DEX] characters by 1.5x",

From 53ea9c8cdb96f6a290da35d11396c9c0f52fa093 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 8 Dec 2016 23:48:33 -0500
Subject: [PATCH 0698/1569] New Fortnight, Rebeccah and Kyros

put in the skillbooks
---
 common/data/drops.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 2b957490a..6073fc8a5 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1246,10 +1246,16 @@ window.drops = {
         
         {
             name: "Big Mom Pirates!",
-            thumb: 1355,
+            thumb: 1357,
             "All Difficulties": [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610 ]
         },
         
+        {
+            name: "Soldier-san's Training!",
+            thumb: null,
+            "All Difficulties": [ -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739 ]
+        },
+        
     ],
 
             

From 2117e4f86c2a5b6570d22793d77c9417d3ac552f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 10 Dec 2016 03:05:11 -0500
Subject: [PATCH 0699/1569] New units updated

Shanks, Marguerite and Dellinger are on official
---
 common/data/aliases.js     | 10 ++++++----
 common/data/details.js     |  8 ++++----
 common/data/units.js       | 12 ++++++------
 common/js/nonSuspicious.js |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1d95c1389..875fe9f9e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1373,8 +1373,10 @@ window.aliases = {
     1372: ['ロロノア・ゾロ 大地の開拓者','','Wild Zoro'],
     1373: ['マゼラン','','Raid Magellan'],
     1374: ['マゼラン 監獄署長','','Raid Magellan'],
-    1375: ['', '', 'Coliseum'],
-    1376: ['', '', 'Coliseum'],
-    1377: ['', '', 'Coliseum'],
-    1378: ['', '', 'Coliseum'],
+    1375: ['デリンジャー 闘魚の血を引く半魚人', '', 'Coliseum Dellinger'],
+    1376: ['デリンジャー ディアマンテ軍戦闘員', '', 'Coliseum Dellinger'],
+    1377: ['マーガレット アマゾン・リリーの弓兵', '', 'Coliseum Marguerite'],
+    1378: ['マーガレット 九蛇の覇気使い', '', 'Coliseum Marguerite'],
+    1379: ['シャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
+    1380: ['赤髪のシャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
 };
diff --git a/common/data/details.js b/common/data/details.js
index 62d1ac987..bfc1ab9a7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7347,13 +7347,13 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, doubles damage received",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
-        specialName: "Dellinger Special",
+        specialName: "Deadly Fangs of Rage",
     },
     1376: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, doubles damage received",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
-        specialName: "Dellinger Special",
+        specialName: "Deadly Fangs of Rage",
     },
     1377: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.3x",
@@ -7370,12 +7370,12 @@ window.details = {
     1379: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
-        specialName: "Shanks Special",
+        specialName: "A Decision Made over Sake",
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
-        specialName: "Shanks Special",
+        specialName: "A Decision Made over Sake",
     },
 };
 
diff --git a/common/data/units.js b/common/data/units.js
index df0b37110..519625360 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1373,12 +1373,12 @@ window.units = [
     [ "Roronoa Zoro, Pioneer of Land", "QCK", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1022, 499, 55, 2711, 1322, 161, 1 ],
     [ "Magellan", "INT", [ "Striker", "Shooter" ], 4, 30, 6, 1, 70, 1066998, 210, 107, 29, 1226, 659, 102, 1 ],
     [ "Magellan, Chief Warden of Impel Down", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, 1 ],
-    [ "Coliseum Dellinger", "QCK", [ "Powerhouse", "Fighter" ], 4, 25, 5, 2, 70, null, null, null, null, 1134, 749, 171, null ],
-    [ "Coliseum Dellinger Evolved", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, 7, 3, 99, null, 1062, 668, 109, null, null, null, null ],
-    [ "Coliseum Marguerite", "DEX", [ "Shooter", "Slasher" ], 3, 16, 5, 2, 50, 392109, 93, 72, 62, 895, 520, 206, null ],
-    [ "Coliseum Marguerite Evolved", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, null, null, null, null, 1759, 974, 403, null ],
-    [ "Invasion Boss Shanks", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, null ],
-    [ "Invasion Boss Shanks Evolved", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, null ],
+    [ "Dellinger, Blood Thirsty Half-Fishman Fighting Fish", "QCK", [ "Powerhouse", "Fighter" ], 4, 25, 5, 2, 70, 1066998, 499, 366, 47, 1134, 749, 171, 1 ],
+    [ "Dellinger, Combatant of the Diamante Army", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, 7, 3, 99, 4000000, 1062, 668, 109, 2060, 1429, 300, 1 ],
+    [ "Marguerite, Amazon Lily Archer", "DEX", [ "Shooter", "Slasher" ], 3, 16, 5, 2, 50, 392109, 93, 72, 62, 895, 520, 206, 1 ],
+    [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
+    [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
+    [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 2b479b2d1..16efdd477 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1362, 1364, 1366, 1368, 1370, 1360, 1359 ];
+    var newUnits = [ 1380, 1378, 1376, 1374, 1372, 1362, 1360 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");

From 529834a5b3cd866c319613638d4c6fd8668cd17e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 12 Dec 2016 11:44:42 -0500
Subject: [PATCH 0700/1569] Rebecca FN

Added 3 new units
---
 common/data/drops.js      |  4 ++--
 common/data/evolutions.js | 12 ++++++++++++
 common/data/families.js   |  6 ++++++
 common/data/units.js      | 12 +++++++++---
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 6073fc8a5..9b6e18369 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1252,8 +1252,8 @@ window.drops = {
         
         {
             name: "Soldier-san's Training!",
-            thumb: null,
-            "All Difficulties": [ -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739 ]
+            thumb: 1384,
+            "All Difficulties": [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739 ]
         },
         
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d45764e59..e3a4e2abd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2095,4 +2095,16 @@ window.evolutions = {
         evolution: 1380,
         evolvers: [ 118, 88, 266, 99, 304 ]
     },
+    1381: {
+        evolution: 1382,
+        evolvers: [  ]
+    },
+    1383: {
+        evolution: 1384,
+        evolvers: [  ]
+    },
+    1385: {
+        evolution: 1386,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 0bbce0dd9..bfa5352eb 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1379,4 +1379,10 @@ window.families = [
     "Marguerite",
     "Shanks",
     "Shanks",
+    "Tashigi",
+    "Tashigi",
+    "Kyros",
+    "Kyros",
+    "Rebecca",
+    "Rebecca",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 519625360..93d6eefc4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1379,8 +1379,14 @@ window.units = [
     [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
     [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
     [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
+    [ "Christmas Tashigi", "PSY", [ "Slasher", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Christmas Tashigi Evolved", "PSY", [ "Slasher", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Toy Soldier Evolved", "QCK", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Training Rebecca", "PSY", [ "Striker", "Free Spirit" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Training Rebecca Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
-// [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ]
-// or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ]
-// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ]
+// [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+// or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ],
+// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ],

From e336083ede33d4e395f9bc3fa908a3cee8568ac8 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 00:46:34 -0500
Subject: [PATCH 0701/1569] Loads of stuff. Don't hate me

Added Boosters and Evolvers to Filters because I've needed it more than
once

Captains and details of new units

New Pre-Timeskip Island added because why not
---
 characters/views/sidebar.html |  2 +-
 common/data/aliases.js        |  6 +++++
 common/data/captains.js       | 14 ++++++++++++
 common/data/details.js        | 42 ++++++++++++++++++++++++++++++-----
 common/data/drops.js          |  8 +++++++
 common/data/units.js          |  6 ++---
 common/js/utils.js            |  2 +-
 7 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 081206417..49548b6a0 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -9,7 +9,7 @@
 
 <div class="filter-container">
     <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven' ]"
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven', 'Evolver', 'Booster' ]"
         class="filter width-6 class" ng-click="onClassClick($event,class)"
         ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
 </div>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 875fe9f9e..1c40cae5c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1379,4 +1379,10 @@ window.aliases = {
     1378: ['マーガレット 九蛇の覇気使い', '', 'Coliseum Marguerite'],
     1379: ['シャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
     1380: ['赤髪のシャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
+    1381: ['', '', 'Christmas Tashigi'],
+    1382: ['', '', 'Christmas Tashigi'],
+    1383: ['', '', 'Toy Soldier', 'Kyros'],
+    1384: ['', '', 'Toy Soldier', 'Kyros'],
+    1385: ['', '', 'Kid Rebecca'],
+    1386: ['', '', 'Kid Rebecca'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 8e301ce2f..ddd12ee1f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3797,4 +3797,18 @@ window.captains = {
     1380: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
+    1381: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
+    1382: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1383: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+    },
+    1384: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index bfc1ab9a7..9572bafa0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1792,12 +1792,12 @@ window.details = {
     446: {
         special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
         specialName: "Black Hole",
-        captain: "Doubles damage received, boosts ATK of STR characters by 2x and their HP by 1.5x"
+        captain: "Increases damage recieved by 2x, boosts ATK of STR characters by 2x and their HP by 1.5x"
     },
     447: {
         special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
         specialName: "Black Hole",
-        captain: "Doubles damage received, boosts ATK of STR characters by 2.5x and their HP by 2.25x"
+        captain: "Increases damage recieved by 2x, boosts ATK of STR characters by 2.5x and their HP by 2.25x"
     },
     448: {
         special: "Boosts chances of getting [QCK] orbs for 3 turns",
@@ -4061,12 +4061,12 @@ window.details = {
     881: {
         captain: "Boosts ATK of Shooter and Free Spirit characters by 2x following a chain of Good > Great > Perfect hits",
         specialName: "Fighting Music: Conflict Chekera",
-        special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
+        special: "Increases damage recieved by 2x for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
     },
     882: {
         captain: "Boosts ATK of Shooter and Free Spirit characters by 3x following a chain of Good > Great > Perfect hits",
         specialName: "Fighting Music: Conflict Chekera",
-        special: "Doubles damage received for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
+        special: "Increases damage recieved by 2x for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
     },
     883: {
         captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
@@ -7344,13 +7344,13 @@ window.details = {
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
     },
     1375: {//Dellinger
-        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, doubles damage received",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, Increases damage recieved by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
         specialName: "Deadly Fangs of Rage",
     },
     1376: {//Dellinger
-        captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, doubles damage received",
+        captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, Increases damage recieved by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
         specialName: "Deadly Fangs of Rage",
@@ -7377,5 +7377,35 @@ window.details = {
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "A Decision Made over Sake",
     },
+    1381: {//Christmas Tashigi
+        captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
+        special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
+        specialName: "Tashigi Special",
+    },
+    1382: {//Christmas Tashigi
+        captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.75x",
+        special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
+        specialName: "Tashigi Special",
+    },
+    1383: {//Soldier-San
+        captain: "Boosts ATK of Striker characters by 2x. Increases damage recieved by 1.5x",
+        special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all orbs into either Badly Matching [BLOCK] or [EMPTY] orbs",
+        specialName: "Toy Soldier Special",
+    },
+    1384: {//Soldier-San
+        captain: "Boosts ATK of Striker characters by 2x. Increases damage recieved by 2x",
+        special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all orbs into either Badly Matching [BLOCK] or [EMPTY] orbs",
+        specialName: "Toy Soldier Special",
+    },
+    1385: {//Rebecca
+        captain: "Reduces damage received by x%",
+        special: "Removes blindness",
+        specialName: "Rebecca Special",
+    },
+    1386: {//Rebecca
+        captain: "Reduces damage received by 25%",
+        special: "Removes blindness",
+        specialName: "Rebecca Special",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 9b6e18369..8e2d9844e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1529,6 +1529,14 @@ window.drops = {
             condition: "Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Shanks.",
             "All Difficulties": [ 1379 ]
         },
+        
+        {
+            name: 'The Flashback Before the Reunion! Fight all your Enemies!',
+            thumb: null,
+            condition: "The fight gets more difficult every time you complete it until it gets to 40 stamina.",
+            "Final Stage": [ 37, 38, 53, 55, 43, 36, 45, 57, 65, 203, 205, 383, 395, 397, 399, 401, 464, 465, 541, 545, 630, 632, 728, 730, 815, 889, 893, 973, 1055, 1057, 1158, 1156, 1227, 1228, 1280, 1283, 1353],
+            "Evolvers and Boosters": [ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 115, 116, 117, 118, 266, 300, 301, 302, 303, 304, 1180, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 189, 190, 191, 192, 193, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351 ]
+        },
 
    ]
 
diff --git a/common/data/units.js b/common/data/units.js
index 93d6eefc4..80a294f3d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1381,10 +1381,10 @@ window.units = [
     [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
     [ "Christmas Tashigi", "PSY", [ "Slasher", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Christmas Tashigi Evolved", "PSY", [ "Slasher", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Toy Soldier Evolved", "QCK", [ "Striker", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, 5, 2, 50, 392109, 81, 72, 28, 867, 611, 186, null ],
+    [ "Toy Soldier Evolved", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, null, null, null, null ],
     [ "Training Rebecca", "PSY", [ "Striker", "Free Spirit" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Training Rebecca Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Training Rebecca Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, null, 441, 239, 153, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/utils.js b/common/js/utils.js
index 30dff8669..d880f4289 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@
         'Skypiea (Guard|Enforcer)', 'Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors'
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) Corporal', '(Naginata|Rifle|Saber|Bazooka|Knuckle) Major', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman',
     ].join(')|(') + ')', 'i');
 
     var utils = {};

From d049d239cd77b69b66283168276764f674156473 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 13 Dec 2016 10:54:01 -0500
Subject: [PATCH 0702/1569] Some Fixes and Improvements

Simplifications for stuff, and global tags
---
 common/data/flags.js | 10 ++++++++--
 common/js/utils.js   |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 70d36b129..630c152a6 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -854,6 +854,8 @@ window.flags = {
     856: { rr: 1, rro: 1, lrr: 1, global: 1 },
     857: { rr: 1, rro: 1, lrr: 1, global: 1 },
     858: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    859: { global: 1 },
+    860: { global: 1 },
     863: { special: 1 },
     864: { global: 1 },
     865: { global: 1 },
@@ -910,6 +912,10 @@ window.flags = {
     943: { rr: 1, rro: 1, global: 1 },
     944: { rr: 1, rro: 1, lrr: 1, global: 1 },
     945: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    950: { global: 1 },
+    951: { global: 1 },
+    952: { global: 1 },
+    953: { global: 1 },
     954: { global: 1 },
     955: { global: 1 },
     956: { global: 1 },
@@ -1147,8 +1153,8 @@ window.flags = {
     1322: { rr: 1, rro: 1 },
     1323: { rr: 1, rro: 1 },
     1324: { rr: 1, rro: 1 },
-    1358: { rr: 1, rro: 1, lrr: 1 },
-    1359: { rr: 1, rro: 1, lrr: 1 },
+    1354: { rr: 1, rro: 1, lrr: 1 },
+    1355: { rr: 1, rro: 1, lrr: 1 },
     1360: { promo: 1 },
     1361: { rr: 1, rro: 1 },
     1362: { rr: 1, rro: 1 },
diff --git a/common/js/utils.js b/common/js/utils.js
index d880f4289..3a5da201e 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@
         'Skypiea (Guard|Enforcer)', 'Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) Corporal', '(Naginata|Rifle|Saber|Bazooka|Knuckle) Major', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman',
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman',
     ].join(')|(') + ')', 'i');
 
     var utils = {};

From 695c7164437f4f018c003f4083fb63f444241f0c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 13:30:00 -0500
Subject: [PATCH 0703/1569] New units Updated from Official

Soldier San, Rebecca, and Secret Ray
---
 common/data/aliases.js     | 12 ++++++------
 common/data/cooldowns.js   |  6 ++++++
 common/data/evolutions.js  |  4 ++--
 common/data/gw.js          |  6 ++++++
 common/data/units.js       | 16 ++++++++--------
 common/js/nonSuspicious.js |  2 +-
 6 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1c40cae5c..71f92c395 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1352,8 +1352,8 @@ window.aliases = {
     1351: ['テキーラウルフの警備兵','',''],
     1352: ['エンポリオ・イワンコフ キングオブニューカマー','',''],
     1353: ['シルバーズ・レイリー 海賊王の船員','',''],
-    1354: ['','','Secret Rayleigh'],
-    1355: ['','','Secret Rayleigh'],
+    1354: ['シルバーズ・レイリー 眠らぬ街のマスター','','Secret Rayleigh'],
+    1355: ['シルバーズ・レイリー ライムライトに煌く冥王','','Secret Rayleigh'],
     1356: ['ペコムズ','',''],
     1357: ['ペコムズ ビッグ・マム海賊団','',''],
     1358: ['タマゴ男爵','',''],
@@ -1381,8 +1381,8 @@ window.aliases = {
     1380: ['赤髪のシャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
     1381: ['', '', 'Christmas Tashigi'],
     1382: ['', '', 'Christmas Tashigi'],
-    1383: ['', '', 'Toy Soldier', 'Kyros'],
-    1384: ['', '', 'Toy Soldier', 'Kyros'],
-    1385: ['', '', 'Kid Rebecca'],
-    1386: ['', '', 'Kid Rebecca'],
+    1383: ['オモチャの兵隊さん', '', 'Toy Soldier', 'Kyros'],
+    1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
+    1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
+    1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index dd6e4fd80..90de28736 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1379,4 +1379,10 @@ window.cooldowns = [
     [ 26, 14 ],
     27,
     27,
+    [ 15, 15 ],
+    [ 15, 15 ],
+    14,
+    14,
+    12,
+    12,
 ];
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index e3a4e2abd..f6e4c4b5e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2101,10 +2101,10 @@ window.evolutions = {
     },
     1383: {
         evolution: 1384,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1385: {
         evolution: 1386,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 81, 98 ]
     },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index ad7e0e2b5..5785bf585 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1379,4 +1379,10 @@ window.gw=[
     46330,
     46369,
     46369,
+    46657,
+    46657,
+    46661,
+    46661,
+    46662,
+    46662,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 80a294f3d..1efd5c127 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1352,8 +1352,8 @@ window.units = [
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, 1066998, 51, 38, 21, 1103, 505, 193, 1],
     [ "Ivankov, New Kama King", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, 3000000, 123, 95, 41, 2034, 935, 299, 1],
     [ "Rayleigh, Crew of the Pirate King", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, 3000000, 201, 189, 75, 2037, 1264, 294, 1],
-    [ "Bartender Rayleigh", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 5, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Bartender Rayleigh Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, null, null, null, 1922, 1209, 301, null ],
+    [ "Silvers Rayleigh, Master of Sleepless Street", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 5, 3, 50, 392109, 144, 97, 33, 905, 601, 179, 1 ],
+    [ "Silvers Rayleigh, Shimmering in Limelight", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, 832, 550, 133, 1922, 1209, 301, 1 ],
     [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 2, 50, 392109, 99, 66, 33, 909, 666, 156, 1 ],
     [ "Pekoms, Big Mom Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 866, 651, 133, 1766, 1303, 233, 1 ],
     [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, 50, 392109, 39, 33, 36, 715, 515, 199, 1 ],
@@ -1379,12 +1379,12 @@ window.units = [
     [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
     [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
     [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
-    [ "Christmas Tashigi", "PSY", [ "Slasher", "Cerebral" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Christmas Tashigi Evolved", "PSY", [ "Slasher", "Cerebral" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, 5, 2, 50, 392109, 81, 72, 28, 867, 611, 186, null ],
-    [ "Toy Soldier Evolved", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, null, null, null, null ],
-    [ "Training Rebecca", "PSY", [ "Striker", "Free Spirit" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Training Rebecca Evolved", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, null, 441, 239, 153, null, null, null, null ],
+    [ "Christmas Tashigi", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, null ],
+    [ "Christmas Tashigi Evolved", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 5, 4, 99, 3000000, 742, 416, 198, null, null, null, null ],
+    [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, 5, 2, 50, 392109, 81, 72, 28, 867, 611, 186, 1 ],
+    [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
+    [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
+    [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 16efdd477..40df9c880 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1380, 1378, 1376, 1374, 1372, 1362, 1360 ];
+    var newUnits = [ 1380, 1384, 1376, 1374, 1355, 1362, 1386 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");

From 21b2f9a684f090dacd60f5df0e6f52c744b77224 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 13:32:44 -0500
Subject: [PATCH 0704/1569] Title Updates changed

Update to Title
---
 index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index b32ae4b71..cff0e4629 100644
--- a/index.html
+++ b/index.html
@@ -64,15 +64,15 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>14/11/2016</p>
+            <p>13/12/2016</p>
             <br>
             <ul>
-                <li>Reunion Straw Hats Completed</li>
+                <li>Bartender Rayleigh Completed</li>
                 <li>Law Ship added to Calculator</li>
                 <br>
-                <li>Mom Pirates and Zoro Sugofest units added</li>
+                <li>Soldier-san's Training and Shanks Colo units added</li>
                 <br>
-                <li>Previews for New Units Added</li>
+                <li>Christmas Tashigi added to Character Table</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From 48530676df5377ef456a8a41265f58e94ae27bfb Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 13:36:15 -0500
Subject: [PATCH 0705/1569] Rebecca Captain

---
 common/data/details.js    | 2 +-
 common/data/evolutions.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9572bafa0..52e5cb7af 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7398,7 +7398,7 @@ window.details = {
         specialName: "Toy Soldier Special",
     },
     1385: {//Rebecca
-        captain: "Reduces damage received by x%",
+        captain: "Reduces damage received by 20%",
         special: "Removes blindness",
         specialName: "Rebecca Special",
     },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f6e4c4b5e..188cc2872 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2099,12 +2099,12 @@ window.evolutions = {
         evolution: 1382,
         evolvers: [  ]
     },
-    1383: {
+/*    1383: {
         evolution: 1384,
         evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1385: {
         evolution: 1386,
         evolvers: [ 116, 117, 81, 98 ]
-    },
+    },*/
 };

From e065809e860f9d91abc0a475499df7d4949e8f84 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 13:39:52 -0500
Subject: [PATCH 0706/1569] Added special names

Trying to fix new units evolution mats
---
 common/data/details.js    | 12 ++++++------
 common/data/evolutions.js |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 52e5cb7af..53fc67df2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7153,13 +7153,13 @@ window.details = {
     1354: {//Secret Rayleigh
         captain: "Boosts chain multiplier by 2x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Rayleigh Special",
+        specialName: "Straight Stimultaion",
         specialNotes: "#{orb : 1.5x}",
     },
     1355: {//Secret Rayleigh
         captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Rayleigh Special",
+        specialName: "Straight Stimultaion",
         specialNotes: "#{orb : 1.5x}",
     },
     1356: {//Pekoms
@@ -7390,22 +7390,22 @@ window.details = {
     1383: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage recieved by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all orbs into either Badly Matching [BLOCK] or [EMPTY] orbs",
-        specialName: "Toy Soldier Special",
+        specialName: "Angry Extermination of Bugs",
     },
     1384: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage recieved by 2x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all orbs into either Badly Matching [BLOCK] or [EMPTY] orbs",
-        specialName: "Toy Soldier Special",
+        specialName: "Angry Extermination of Bugs",
     },
     1385: {//Rebecca
         captain: "Reduces damage received by 20%",
         special: "Removes blindness",
-        specialName: "Rebecca Special",
+        specialName: "Mother's Promise",
     },
     1386: {//Rebecca
         captain: "Reduces damage received by 25%",
         special: "Removes blindness",
-        specialName: "Rebecca Special",
+        specialName: "Mother's Promise",
     },
 };
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 188cc2872..f6e4c4b5e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2099,12 +2099,12 @@ window.evolutions = {
         evolution: 1382,
         evolvers: [  ]
     },
-/*    1383: {
+    1383: {
         evolution: 1384,
         evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1385: {
         evolution: 1386,
         evolvers: [ 116, 117, 81, 98 ]
-    },*/
+    },
 };

From 86fe02acf05acb2d037c49e739fe1a2aaae79d42 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 13:46:15 -0500
Subject: [PATCH 0707/1569] Garp Family

---
 common/data/families.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index bfa5352eb..f993e0b28 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1315,8 +1315,8 @@ window.families = [
     "Akainu",
     "Coby",
     "Coby",
-    "Garp",
-    "Garp",
+    "Monkey D. Garp",
+    "Monkey D. Garp",
     "Tsuru",
     "Tsuru",
     "Momonga",

From 15d27cf2ff7b943b32e770dc1b3c6bfb643f7056 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 14:52:45 -0500
Subject: [PATCH 0708/1569] Kyros Fix

Thought I changed this, but made it correct now
---
 common/data/details.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 53fc67df2..58a821864 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7389,12 +7389,12 @@ window.details = {
     },
     1383: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage recieved by 1.5x",
-        special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all orbs into either Badly Matching [BLOCK] or [EMPTY] orbs",
+        special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialName: "Angry Extermination of Bugs",
     },
     1384: {//Soldier-San
-        captain: "Boosts ATK of Striker characters by 2x. Increases damage recieved by 2x",
-        special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all orbs into either Badly Matching [BLOCK] or [EMPTY] orbs",
+        captain: "Boosts ATK of Striker characters by 2.5x. Increases damage recieved by 1.5x",
+        special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialName: "Angry Extermination of Bugs",
     },
     1385: {//Rebecca

From c5e3c3901e83d85e8963d1836305fb7b36b904c2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Dec 2016 22:59:37 -0500
Subject: [PATCH 0709/1569] New unit Cooldowns

Toy Kyros, Rebecca, Shanks, Zoro
---
 common/data/cooldowns.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 90de28736..6193f8a7d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1359,8 +1359,8 @@ window.cooldowns = [
     [ 20, 13 ],
     [ 20, 13 ],
     [ 15, 15 ],
-    20,
-    20,
+    [ 20, 16 ],
+    [ 20, 16 ],
     21,
     21,
     null,//New World Nami
@@ -1377,12 +1377,12 @@ window.cooldowns = [
     [ 26, 12 ],
     [ 26, 14 ],
     [ 26, 14 ],
-    27,
-    27,
+    [ 27, 15 ],
+    [ 27, 15 ],
     [ 15, 15 ],
     [ 15, 15 ],
-    14,
-    14,
-    12,
-    12,
+    [ 14, 6 ],
+    [ 14, 6 ],
+    [ 12, 8 ],
+    [ 12, 8 ],
 ];

From 8bf1f040375186e30c6b63d2008be5abb452c5d4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Dec 2016 11:19:50 -0500
Subject: [PATCH 0710/1569] 5+ units added

Not sure how to handle Evolutions
---
 common/data/aliases.js    |  2 ++
 common/data/captains.js   |  8 ++++++++
 common/data/cooldowns.js  |  3 +++
 common/data/details.js    | 13 +++++++++++++
 common/data/evolutions.js | 16 ++++++++++++++++
 common/data/families.js   |  3 +++
 common/data/gw.js         |  3 +++
 common/data/specials.js   |  3 +++
 common/data/units.js      |  7 +++++--
 9 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 71f92c395..d1b382307 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1385,4 +1385,6 @@ window.aliases = {
     1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
     1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
     1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
+    1388: ['', '', 'Mega Zoro'],
+    1389: ['', '', 'Mega Nami'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ddd12ee1f..1ab4fa060 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3811,4 +3811,12 @@ window.captains = {
     1384: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
+    
+    1338: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; },
+    },
+    1339: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6193f8a7d..d3ecd31e7 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1385,4 +1385,7 @@ window.cooldowns = [
     [ 14, 6 ],
     [ 12, 8 ],
     [ 12, 8 ],
+    null,
+    [ 12, 7 ],
+    [ 21, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 58a821864..938ded3c5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7371,11 +7371,13 @@ window.details = {
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "A Decision Made over Sake",
+        specialNotes: "#{orb : 2x}",
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "A Decision Made over Sake",
+        specialNotes: "#{orb : 2x}",
     },
     1381: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
@@ -7407,5 +7409,16 @@ window.details = {
         special: "Removes blindness",
         specialName: "Mother's Promise",
     },
+    1388: {//Zoro 5+
+        captain: "Boosts ATK of [DEX] characters by 2.5x",
+        special: "Cuts the current HP of each enemy by 10%. Reduces cooldown of [DEX] specials by 1 turn.",
+        specialName: "Ittoriyu - Hong Kong Bird",
+    },
+    1389: {//Nami 5+
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x. ",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn ",
+        specialName: "Thunder Breed Tempo",
+        specialNotes: "#{orb : 1.75x}",
+    },
 };
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f6e4c4b5e..0a8614a84 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2107,4 +2107,20 @@ window.evolutions = {
         evolution: 1386,
         evolvers: [ 116, 117, 81, 98 ]
     },
+    8: {
+        evolution: 1388,
+        evolvers: [  ]
+    },
+    1388: {
+        evolution: 8,
+        evolvers: [ 116, 117 ]
+    },
+    12: {
+        evolution: 1389,
+        evolvers: [  ]
+    },
+    1389: {
+        evolution: 12,
+        evolvers: [ 116, 117 ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index f993e0b28..377fe3e80 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1385,4 +1385,7 @@ window.families = [
     "Kyros",
     "Rebecca",
     "Rebecca",
+    "Monkey D. Luffy",
+    "Roronoa Zoro",
+    "Nami",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 5785bf585..56ac52fd3 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1385,4 +1385,7 @@ window.gw=[
     46661,
     46662,
     46662,
+    null,
+    2019,
+    2020,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 066d11cec..b0f406b4b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1879,4 +1879,7 @@ window.specials = {
     1380: {
         orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
+    1389: {
+        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 1efd5c127..c5828ea86 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1321,8 +1321,8 @@ window.units = [
     [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
     [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 136, 120, 35, 993, 591, 172, 1 ],
     [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, 2342, 1296, 330, 1 ],
-    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
-    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, 2598, 1383, 225, 1 ],
+    [ "Onigumo, Swordsman of the Eight-Sword Style", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
+    [ "Onigumo, Swordsman of the Eight-Sword Style, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, 2598, 1383, 225, 1 ],
     [ "Royal Vampire Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 84, 51, 33, 935, 526, 206, 1 ],
     [ "Royal Vampire Corazon, Halloween Night - Masquerade", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 869, 467, 170, 1840, 1014, 337, 1 ],
     [ "Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 40, 40, 40, 888, 518, 180, 1 ],
@@ -1385,6 +1385,9 @@ window.units = [
     [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, null, 803, 669, 55, 2501, 1434, 233, null ],
+    [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, null, 705, 496, 181, 1970, 1200, 420, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 7b9cd3d2d2a80ceb0dad75784f3c2dd20c7fbb52 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 15 Dec 2016 19:41:10 -0600
Subject: [PATCH 0711/1569] Revert "5+ units added"

This reverts commit 8bf1f040375186e30c6b63d2008be5abb452c5d4.
---
 common/data/aliases.js    |  2 --
 common/data/captains.js   |  8 --------
 common/data/cooldowns.js  |  3 ---
 common/data/details.js    | 13 -------------
 common/data/evolutions.js | 16 ----------------
 common/data/families.js   |  3 ---
 common/data/gw.js         |  3 ---
 common/data/specials.js   |  3 ---
 common/data/units.js      |  7 ++-----
 9 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d1b382307..71f92c395 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1385,6 +1385,4 @@ window.aliases = {
     1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
     1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
     1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
-    1388: ['', '', 'Mega Zoro'],
-    1389: ['', '', 'Mega Nami'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 1ab4fa060..ddd12ee1f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3811,12 +3811,4 @@ window.captains = {
     1384: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
-    
-    1338: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; },
-    },
-    1339: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d3ecd31e7..6193f8a7d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1385,7 +1385,4 @@ window.cooldowns = [
     [ 14, 6 ],
     [ 12, 8 ],
     [ 12, 8 ],
-    null,
-    [ 12, 7 ],
-    [ 21, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 938ded3c5..58a821864 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7371,13 +7371,11 @@ window.details = {
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "A Decision Made over Sake",
-        specialNotes: "#{orb : 2x}",
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "A Decision Made over Sake",
-        specialNotes: "#{orb : 2x}",
     },
     1381: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
@@ -7409,16 +7407,5 @@ window.details = {
         special: "Removes blindness",
         specialName: "Mother's Promise",
     },
-    1388: {//Zoro 5+
-        captain: "Boosts ATK of [DEX] characters by 2.5x",
-        special: "Cuts the current HP of each enemy by 10%. Reduces cooldown of [DEX] specials by 1 turn.",
-        specialName: "Ittoriyu - Hong Kong Bird",
-    },
-    1389: {//Nami 5+
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x. ",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn ",
-        specialName: "Thunder Breed Tempo",
-        specialNotes: "#{orb : 1.75x}",
-    },
 };
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0a8614a84..f6e4c4b5e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2107,20 +2107,4 @@ window.evolutions = {
         evolution: 1386,
         evolvers: [ 116, 117, 81, 98 ]
     },
-    8: {
-        evolution: 1388,
-        evolvers: [  ]
-    },
-    1388: {
-        evolution: 8,
-        evolvers: [ 116, 117 ]
-    },
-    12: {
-        evolution: 1389,
-        evolvers: [  ]
-    },
-    1389: {
-        evolution: 12,
-        evolvers: [ 116, 117 ]
-    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 377fe3e80..f993e0b28 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1385,7 +1385,4 @@ window.families = [
     "Kyros",
     "Rebecca",
     "Rebecca",
-    "Monkey D. Luffy",
-    "Roronoa Zoro",
-    "Nami",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 56ac52fd3..5785bf585 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1385,7 +1385,4 @@ window.gw=[
     46661,
     46662,
     46662,
-    null,
-    2019,
-    2020,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index b0f406b4b..066d11cec 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1879,7 +1879,4 @@ window.specials = {
     1380: {
         orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
-    1389: {
-        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
-    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index c5828ea86..1efd5c127 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1321,8 +1321,8 @@ window.units = [
     [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
     [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 136, 120, 35, 993, 591, 172, 1 ],
     [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, 2342, 1296, 330, 1 ],
-    [ "Onigumo, Swordsman of the Eight-Sword Style", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
-    [ "Onigumo, Swordsman of the Eight-Sword Style, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, 2598, 1383, 225, 1 ],
+    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
+    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, 2598, 1383, 225, 1 ],
     [ "Royal Vampire Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 84, 51, 33, 935, 526, 206, 1 ],
     [ "Royal Vampire Corazon, Halloween Night - Masquerade", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 869, 467, 170, 1840, 1014, 337, 1 ],
     [ "Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 40, 40, 40, 888, 518, 180, 1 ],
@@ -1385,9 +1385,6 @@ window.units = [
     [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, null, 803, 669, 55, 2501, 1434, 233, null ],
-    [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, null, 705, 496, 181, 1970, 1200, 420, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 1e47afdb75f2f6c5fa7713fd4b9f6797fd5bec90 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 15 Dec 2016 19:48:03 -0600
Subject: [PATCH 0712/1569] Revert "Revert "5+ units added""

This reverts commit 7b9cd3d2d2a80ceb0dad75784f3c2dd20c7fbb52.
---
 common/data/aliases.js    |  2 ++
 common/data/captains.js   |  8 ++++++++
 common/data/cooldowns.js  |  3 +++
 common/data/details.js    | 13 +++++++++++++
 common/data/evolutions.js | 16 ++++++++++++++++
 common/data/families.js   |  3 +++
 common/data/gw.js         |  3 +++
 common/data/specials.js   |  3 +++
 common/data/units.js      |  7 +++++--
 9 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 71f92c395..d1b382307 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1385,4 +1385,6 @@ window.aliases = {
     1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
     1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
     1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
+    1388: ['', '', 'Mega Zoro'],
+    1389: ['', '', 'Mega Nami'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ddd12ee1f..1ab4fa060 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3811,4 +3811,12 @@ window.captains = {
     1384: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
+    
+    1338: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; },
+    },
+    1339: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6193f8a7d..d3ecd31e7 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1385,4 +1385,7 @@ window.cooldowns = [
     [ 14, 6 ],
     [ 12, 8 ],
     [ 12, 8 ],
+    null,
+    [ 12, 7 ],
+    [ 21, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 58a821864..938ded3c5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7371,11 +7371,13 @@ window.details = {
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "A Decision Made over Sake",
+        specialNotes: "#{orb : 2x}",
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
         specialName: "A Decision Made over Sake",
+        specialNotes: "#{orb : 2x}",
     },
     1381: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
@@ -7407,5 +7409,16 @@ window.details = {
         special: "Removes blindness",
         specialName: "Mother's Promise",
     },
+    1388: {//Zoro 5+
+        captain: "Boosts ATK of [DEX] characters by 2.5x",
+        special: "Cuts the current HP of each enemy by 10%. Reduces cooldown of [DEX] specials by 1 turn.",
+        specialName: "Ittoriyu - Hong Kong Bird",
+    },
+    1389: {//Nami 5+
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x. ",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn ",
+        specialName: "Thunder Breed Tempo",
+        specialNotes: "#{orb : 1.75x}",
+    },
 };
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f6e4c4b5e..0a8614a84 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2107,4 +2107,20 @@ window.evolutions = {
         evolution: 1386,
         evolvers: [ 116, 117, 81, 98 ]
     },
+    8: {
+        evolution: 1388,
+        evolvers: [  ]
+    },
+    1388: {
+        evolution: 8,
+        evolvers: [ 116, 117 ]
+    },
+    12: {
+        evolution: 1389,
+        evolvers: [  ]
+    },
+    1389: {
+        evolution: 12,
+        evolvers: [ 116, 117 ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index f993e0b28..377fe3e80 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1385,4 +1385,7 @@ window.families = [
     "Kyros",
     "Rebecca",
     "Rebecca",
+    "Monkey D. Luffy",
+    "Roronoa Zoro",
+    "Nami",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 5785bf585..56ac52fd3 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1385,4 +1385,7 @@ window.gw=[
     46661,
     46662,
     46662,
+    null,
+    2019,
+    2020,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 066d11cec..b0f406b4b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1879,4 +1879,7 @@ window.specials = {
     1380: {
         orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
     },
+    1389: {
+        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 1efd5c127..c5828ea86 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1321,8 +1321,8 @@ window.units = [
     [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
     [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 136, 120, 35, 993, 591, 172, 1 ],
     [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, 2342, 1296, 330, 1 ],
-    [ "Onigumo, Swordsman of the Eight Sword Current", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
-    [ "Onigumo, Swordsman of the Eight Sword Current, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, 2598, 1383, 225, 1 ],
+    [ "Onigumo, Swordsman of the Eight-Sword Style", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
+    [ "Onigumo, Swordsman of the Eight-Sword Style, Navy Vice Admiral", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1243, 572, 46, 2598, 1383, 225, 1 ],
     [ "Royal Vampire Corazon", "PSY", [ "Cerebral", "Free Spirit" ], 4, 12, 6, 1, 50, 392109, 84, 51, 33, 935, 526, 206, 1 ],
     [ "Royal Vampire Corazon, Halloween Night - Masquerade", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 869, 467, 170, 1840, 1014, 337, 1 ],
     [ "Leo, Tontatta Tribe - Tonta Corps", "DEX", [ "Striker", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 40, 40, 40, 888, 518, 180, 1 ],
@@ -1385,6 +1385,9 @@ window.units = [
     [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, null, 803, 669, 55, 2501, 1434, 233, null ],
+    [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, null, 705, 496, 181, 1970, 1200, 420, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From bac411f26a66413f6ecbfc589fba53ee9b3ae39a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 15 Dec 2016 19:48:47 -0600
Subject: [PATCH 0713/1569] Remove evolution back

Creates infinite loop, crashes when launching new window.
---
 common/data/evolutions.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0a8614a84..201ca01a4 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2111,16 +2111,8 @@ window.evolutions = {
         evolution: 1388,
         evolvers: [  ]
     },
-    1388: {
-        evolution: 8,
-        evolvers: [ 116, 117 ]
-    },
     12: {
         evolution: 1389,
         evolvers: [  ]
     },
-    1389: {
-        evolution: 12,
-        evolvers: [ 116, 117 ]
-    },
 };

From 3cc5c88cd5a61ded27ec51eddac53fe1d08101e5 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Dec 2016 23:04:46 -0500
Subject: [PATCH 0714/1569] Baggy Update

Added all Baggy things
---
 common/data/aliases.js    | 12 +++++++-----
 common/data/captains.js   | 12 ++++++++++--
 common/data/cooldowns.js  |  2 ++
 common/data/details.js    | 23 ++++++++++++++++++-----
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  2 ++
 common/data/flags.js      |  4 ++++
 common/data/gw.js         |  2 ++
 common/data/ships.js      |  8 ++++++++
 common/data/specials.js   |  8 ++++++++
 common/data/units.js      |  2 ++
 11 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d1b382307..53c3d1761 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -596,8 +596,8 @@ window.aliases = {
     595: ['漆黒の竜宮カメ姫','', 'Princess Turtle' ],
     596: ['トニートニー・チョッパー 航海の記録・麦わらの一味','', 'Log Chopper' ],
     597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」','', 'Log Chopper' ],
-    598: ['バギー 海賊見習い','','Young Buggy'],
-    599: ['バギー ロジャー海賊団','','Young Buggy'],
+    598: ['バギー 海賊見習い','','Young Buggy', 'Baggy'],
+    599: ['バギー ロジャー海賊団','','Young Buggy', 'Baggy'],
     600: ['シャンクス 海賊見習い','','Young Shanks'],
     601: ['シャンクス ロジャー海賊団','','Young Shanks'],
     602: ['エネル ２億Ｖ　雷神','', 'Raid Enel, 200 Million Volt Thunder God' ],
@@ -885,7 +885,7 @@ window.aliases = {
     884: ['青鬼のドリー','','Coliseum'],
     885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
     886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
-    887: ['バギー 陽気なかぶき者','', 'Kimono Buggy' ],
+    887: ['バギー 陽気なかぶき者','', 'Kimono Buggy', 'Baggy'],
     888: ['ホロホロゴースト',''],
     889: ['ペローナ スリラーバークの怪人',''],
     890: ['ペローナ 巨大なゴーストプリンセス',''],
@@ -1299,8 +1299,8 @@ window.aliases = {
     1298: ['赤犬 マグマ人間','','Raid Sakazuki'],
     1299: ['レベッカ　ラブリーモンスターキャット','',''],
     1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード','',''],
-    1301: ['受刑者　バギー','',''],
-    1302: ['受刑者　道化のバギー 脱獄同盟','',''],
+    1301: ['受刑者　バギー','','Baggy'],
+    1302: ['受刑者　道化のバギー 脱獄同盟','','Baggy'],
     1303: ['脱走囚　ギャルディーノ','','Mr 3', 'Mr. 3'],
     1304: ['脱走囚　ギャルディーノ 脱獄同盟','','Mr 3', 'Mr. 3'],
     1305: ['シュガー　リトルサキュバス','',''],
@@ -1387,4 +1387,6 @@ window.aliases = {
     1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
     1388: ['', '', 'Mega Zoro'],
     1389: ['', '', 'Mega Nami'],
+    1390: ['', '', 'Legend Buggy', 'Legend Baggy'],
+    1391: ['', '', 'Legend Buggy', 'Legend Baggy'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 1ab4fa060..4bfba87d1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3812,11 +3812,19 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
     
-    1338: {
+    1388: {
         atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; },
     },
-    1339: {
+    1389: {
         atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
         rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
+    1390: {
+        atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
+        hp: function(p) { return p.unit.cost <= 40 ? 1 : 0.5; }
+    },
+    1391: {
+        atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
+        hp: function(p) { return p.unit.cost <= 40 ? 1 : 0.5; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d3ecd31e7..efc4aaaae 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1388,4 +1388,6 @@ window.cooldowns = [
     null,
     [ 12, 7 ],
     [ 21, 16 ],
+    [ 17, 12 ],
+    [ 17, 12 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 938ded3c5..abb40b8f9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6841,13 +6841,13 @@ window.details = {
     1313: {//Akainu
         captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
-        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
+        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
     },
     1314: {//Akainu
         captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
-        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
+        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
     },
     1315: {//Coby
@@ -6983,7 +6983,8 @@ window.details = {
         specialName: "Tail Hammer",
     },
     1329: {//Wicca
-        captain: "Reduces cooldown of Fighter and Free Spirit specials by 1 turn at the start of the fight. Gives chance of duplicating a drop upon completion of the island. ",
+        captain: "Reduces cooldown of Fighter and Free Spirit specials by 1 turn at the start of the fight. Gives chance of duplicating a drop upon completion of the island.",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: [
             {
                 "description": "Deals 6 fixed damage to all enemies. Randomizes orbs of upper row characters",
@@ -7415,10 +7416,22 @@ window.details = {
         specialName: "Ittoriyu - Hong Kong Bird",
     },
     1389: {//Nami 5+
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x. ",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn ",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x.",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn",
         specialName: "Thunder Breed Tempo",
         specialNotes: "#{orb : 1.75x}",
     },
+    1390: {//Buggy Legend
+        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of chatacters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
+        captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
+        specialName: "Baggy Special",
+    },
+    1391: {//Buggy Legend
+        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of chatacters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
+        captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
+        specialName: "Baggy Special",
+    },
 };
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 201ca01a4..54fd638c3 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2115,4 +2115,8 @@ window.evolutions = {
         evolution: 1389,
         evolvers: [  ]
     },
+    1390: {
+        evolution: 1391,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 377fe3e80..5dece0099 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1388,4 +1388,6 @@ window.families = [
     "Monkey D. Luffy",
     "Roronoa Zoro",
     "Nami",
+    "Buggy",
+    "Buggy",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 630c152a6..8906f4f46 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1168,4 +1168,8 @@ window.flags = {
     1370: { rr: 1, rro: 1 },
     1371: { shop: 1 },
     1372: { shop: 1 },
+    1381: { rr: 1, rro: 1, lrr: 1 },
+    1382: { rr: 1, rro: 1, lrr: 1 },
+    1390: { rr: 1, rro: 1 },
+    1391: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 56ac52fd3..4682ee5c9 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1388,4 +1388,6 @@ window.gw=[
     null,
     2019,
     2020,
+    46852,
+    46852,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index e8fc668d2..f20c86358 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -293,5 +293,13 @@ window.ships = [
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Free Spirit')) ? 1 : [ 1.1, 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.25, 1.25 ][p.boatLevel - 1];
         },
     },
+    { // 24
+        name: 'New Year\'s Big Top',
+        thumb: null,
+        description: 'Boosts ATK, Berry, and EXP by 1.5x',
+        atk: function(p) {
+            return 1.5;
+        },
+    },
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index b0f406b4b..49b853666 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1882,4 +1882,12 @@ window.specials = {
     1389: {
         orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
     },
+    1390: {
+        atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
+        type: "class"
+    },
+    1391: {
+        atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
+        type: "class"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index c5828ea86..015c1131d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1388,6 +1388,8 @@ window.units = [
     [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, null, 803, 669, 55, 2501, 1434, 233, null ],
     [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, null, 705, 496, 181, 1970, 1200, 420, null ],
+    [ "Legend Baggy", "INT", [ "Driven", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, null ],
+    [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 55, 4, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 45344f45c98554dccadac50fae44bcc6ead7875c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Dec 2016 23:18:42 -0500
Subject: [PATCH 0715/1569] 5+ units EXP

added max EXP for Nami and Zoro
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 015c1131d..f2b4bceb2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1386,8 +1386,8 @@ window.units = [
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
     [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, null, 803, 669, 55, 2501, 1434, 233, null ],
-    [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, null, 705, 496, 181, 1970, 1200, 420, null ],
+    [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, null ],
+    [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, null ],
     [ "Legend Baggy", "INT", [ "Driven", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, null ],
     [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 55, 4, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
     ];

From a2715d23e5bc550ea04c4c99174a270c2f2c7d28 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Dec 2016 23:22:07 -0500
Subject: [PATCH 0716/1569] Zoro detail fixed

wasn't listed as cooldown reducer
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index abb40b8f9..301c909e2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7412,7 +7412,7 @@ window.details = {
     },
     1388: {//Zoro 5+
         captain: "Boosts ATK of [DEX] characters by 2.5x",
-        special: "Cuts the current HP of each enemy by 10%. Reduces cooldown of [DEX] specials by 1 turn.",
+        special: "Cuts the current HP of each enemy by 10%. Reduces special cooldown of [DEX] specials by 1 turn.",
         specialName: "Ittoriyu - Hong Kong Bird",
     },
     1389: {//Nami 5+

From 82dd70cb7d10b311093d4a18be545f63aa257c06 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Dec 2016 23:24:19 -0500
Subject: [PATCH 0717/1569] Sabo flags

Limted RR for Secret Sabo
---
 common/data/flags.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/flags.js b/common/data/flags.js
index 8906f4f46..cf651e8d6 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1153,6 +1153,8 @@ window.flags = {
     1322: { rr: 1, rro: 1 },
     1323: { rr: 1, rro: 1 },
     1324: { rr: 1, rro: 1 },
+    1335: { rr: 1, rro: 1, lrr: 1 },
+    1336: { rr: 1, rro: 1, lrr: 1 },
     1354: { rr: 1, rro: 1, lrr: 1 },
     1355: { rr: 1, rro: 1, lrr: 1 },
     1360: { promo: 1 },

From ddd1496d2d28f4dc583cd0c7e0e8a57c5381c5ce Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Dec 2016 23:40:02 -0500
Subject: [PATCH 0718/1569] Special Names

did some name translations
---
 common/data/details.js | 18 +++++++++---------
 common/data/units.js   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 301c909e2..aa6dda95d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7049,12 +7049,12 @@ window.details = {
     1335: {//Wedding Sabo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight. Boosts ATK of Free Spirit characters by 1.5x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
-        specialName: "Wedding Sabo Special",
+        specialName: "Gentleman's Welcome",
     },
     1336: {//Wedding Sabo
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
-        specialName: "Wedding Sabo Special",
+        specialName: "Gentleman's Welcome",
     },
     1337: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
@@ -7166,29 +7166,29 @@ window.details = {
     1356: {//Pekoms
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
         special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
-        specialName: "Pekoms Special",
+        specialName: "Serious Threat",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
     1357: {//Pekoms
         captain: "Boosts ATK, HP and RCV of Powerhouse characters by 1.5x",
         special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
-        specialName: "Pekoms Special",
+        specialName: "Serious Threat",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
     1358: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.5x and the HP of Striker characters by 1.5x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
-        specialName: "Tamago Special",
+        specialName: "The Long Legged Gentleman's Resolution",
     },
     1359: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.75x and the HP of Striker characters by 1.75x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
-        specialName: "Tamago Special",
+        specialName: "The Long Legged Gentleman's Resolution",
     },
     1360: {//Winter Luffy
         captain: "Boosts ATK characters with cost 30 or less by 2x and their HP by 1.2x",
         special: "Changes own orb into [QCK], deals 15x character's ATK in [QCK] damage to one enemy",
-        specialName: "Winter Luffy Special",
+        specialName: "Gum-Gum Twin Jet Pistol: Snowflake",
     },
     1361: {//6* Zoro
         captain: "If you have 5 or more Slashers on your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slashers by 3x instead",
@@ -7425,13 +7425,13 @@ window.details = {
         captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of chatacters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
-        specialName: "Baggy Special",
+        specialName: "Chop-Chop Clown Car",
     },
     1391: {//Buggy Legend
         captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of chatacters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
-        specialName: "Baggy Special",
+        specialName: "Chop-Chop Clown Car",
     },
 };
 
diff --git a/common/data/units.js b/common/data/units.js
index f2b4bceb2..dd55f1475 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1356,8 +1356,8 @@ window.units = [
     [ "Silvers Rayleigh, Shimmering in Limelight", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 4, 99, 3000000, 832, 550, 133, 1922, 1209, 301, 1 ],
     [ "Pekoms", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 2, 50, 392109, 99, 66, 33, 909, 666, 156, 1 ],
     [ "Pekoms, Big Mom Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 866, 651, 133, 1766, 1303, 233, 1 ],
-    [ "Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, 50, 392109, 39, 33, 36, 715, 515, 199, 1 ],
-    [ "Tamago, Big Mom Pirates", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 651, 466, 165, 1651, 1012, 315, 1 ],
+    [ "Baron Tamago", "INT", [ "Cerebral", "Striker" ], 3, 12, 5, 2, 50, 392109, 39, 33, 36, 715, 515, 199, 1 ],
+    [ "Baron Tamago, Big Mom Pirates", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 651, 466, 165, 1651, 1012, 315, 1 ],
     [ "Luffy, Winter Island Adventure", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 99, 2000000, 103, 54, 33, 2005, 945, 286, 1 ],
     [ "Roronoa Zoro, Gathering of the Straw Hats", "DEX", [ "Driven", "Slasher" ], 5, 30, 6, 3, 70, 1066998, 409, 291, 44, 1661, 826, 163, 1 ],
     [ "Roronoa Zoro, Reunion of the Straw Hat Pirates", "DEX", [ "Driven", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1587, 751, 111, 3603, 1518, 294, 1 ],

From afbb8f7a15c7ebd15915eb792a41cec4dc0105ae Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 16 Dec 2016 05:30:15 -0600
Subject: [PATCH 0719/1569] Buggy Cost

40
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index dd55f1475..ae140bfaa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1389,7 +1389,7 @@ window.units = [
     [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, null ],
     [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, null ],
     [ "Legend Baggy", "INT", [ "Driven", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, null ],
-    [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 55, 4, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
+    [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 40, 4, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 24421798469758879b794ee4cba5824c78c1fd01 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Dec 2016 13:48:45 -0500
Subject: [PATCH 0720/1569] 5+ Units on Official

Nami Zoro and Buggy Cost
---
 common/data/details.js | 4 ++--
 common/data/units.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index aa6dda95d..de1fe6b2a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7413,12 +7413,12 @@ window.details = {
     1388: {//Zoro 5+
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 10%. Reduces special cooldown of [DEX] specials by 1 turn.",
-        specialName: "Ittoriyu - Hong Kong Bird",
+        specialName: "Ittoriyu: Unfortunate Port Bird",
     },
     1389: {//Nami 5+
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x.",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn",
-        specialName: "Thunder Breed Tempo",
+        specialName: "Weather Egg: Thunder Breed Tempo",
         specialNotes: "#{orb : 1.75x}",
     },
     1390: {//Buggy Legend
diff --git a/common/data/units.js b/common/data/units.js
index ae140bfaa..6b68b2d74 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1386,8 +1386,8 @@ window.units = [
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
     [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro 5+", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, null ],
-    [ "Nami 5+", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, null ],
+    [ "Roronoa Zoro, Unfortunate Port Bird: Yakkoudori", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, 1 ],
+    [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
     [ "Legend Baggy", "INT", [ "Driven", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, null ],
     [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 40, 4, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
     ];

From c9103ba5cb19f30b73a329f95aa1f8335e43ef50 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Dec 2016 22:15:49 -0500
Subject: [PATCH 0721/1569] Matchers, Magellan Cooldown

New Matchers for TheShatteredForest
---
 common/data/cooldowns.js |  4 ++--
 common/data/matchers.js  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index efc4aaaae..81459c223 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1156,8 +1156,8 @@ window.cooldowns = [
     [ 10, 4 ],
     [ 23, 17 ],
     [ 23, 17 ],
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     [ 13, 13 ],
     [ 13, 13 ],
     [ 25, 14 ],
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 8482792e1..1159b316c 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -397,6 +397,24 @@ window.matchers = [
         matcher: /(reduces|removes).+Paralysis/i 
     },
     
+    {
+        name: 'Chain Boosters',
+        target: 'special',
+        matcher: /Adds.+to Chain/i 
+    },
+    
+    {
+        name: 'Chain Lockers',
+        target: 'special',
+        matcher: /Locks the chain multiplier/i 
+    },
+    
+    {
+        name: '"Beneficial" Orb Enablers',
+        target: 'special',
+        matcher: /Makes.+ orbs "beneficial"/i
+    },
+    
     /* * * * * Sailor * * * * */
     
     {

From 0eb38b05adc53382cfd1c5e93bd1bab153606ed3 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 17 Dec 2016 02:15:27 -0500
Subject: [PATCH 0722/1569] Buggy Combo

Changed new Buggy's Combo to non-placeholder value
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 6b68b2d74..d50f53664 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1388,8 +1388,8 @@ window.units = [
     [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Roronoa Zoro, Unfortunate Port Bird: Yakkoudori", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, 1 ],
     [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
-    [ "Legend Baggy", "INT", [ "Driven", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, null ],
-    [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 40, 4, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
+    [ "Legend Baggy", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, null ],
+    [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 149bb114484c740dfda5523f6f0b468bfc021d5c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 19 Dec 2016 23:23:28 -0500
Subject: [PATCH 0723/1569] Buggy Finished

Updated to official
---
 common/data/aliases.js    | 8 ++++----
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 53c3d1761..3400d15d4 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1385,8 +1385,8 @@ window.aliases = {
     1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
     1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
     1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
-    1388: ['', '', 'Mega Zoro'],
-    1389: ['', '', 'Mega Nami'],
-    1390: ['', '', 'Legend Buggy', 'Legend Baggy'],
-    1391: ['', '', 'Legend Buggy', 'Legend Baggy'],
+    1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro'],
+    1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami'],
+    1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy'],
+    1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 54fd638c3..4d150167c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2117,6 +2117,6 @@ window.evolutions = {
     },
     1390: {
         evolution: 1391,
-        evolvers: [  ]
+        evolvers: [ 118, 88, 99, 304, 267 ]
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index d50f53664..7a98e55e1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1333,8 +1333,8 @@ window.units = [
     [ "Mansherry, Princess of Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 606, 303, 234, 1472, 604, 497, 1],
     [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 64, 37, 16, 1604, 964, 106, 1],
     [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, 1066998, 38, 28, 28, 888, 789, 288, 1],
-    [ "Sabo, One Night with a Noblewoman", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 203, 142, 32, 1106, 574, 171, 1],
-    [ "Sabo, Phantom of the Opera", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, 1],
+    [ "Sabo, One Act with You", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 203, 142, 32, 1106, 574, 171, 1],
+    [ "Sabo, Phantom of the Theatre", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, 1],
     [ "Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 554, 261, 35, 1275, 707, 183, 1],
     [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, 2414, 1253, 330, 1],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 162, 91, 29, 2334, 892, 296, 1],
@@ -1388,8 +1388,8 @@ window.units = [
     [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Roronoa Zoro, Unfortunate Port Bird: Yakkoudori", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, 1 ],
     [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
-    [ "Legend Baggy", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, null ],
-    [ "Legend Baggy Evolved", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, null ],
+    [ "Buggy Clown, Captain of the Buggy Pirates", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, 1 ],
+    [ "Captain Buggy", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 3afda0003b6f9e863be0800c40badd05a4825fa1 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 20 Dec 2016 09:49:06 -0500
Subject: [PATCH 0724/1569] Jesus Description

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index de1fe6b2a..3decf4a44 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6600,14 +6600,14 @@ window.details = {
     },
     1273: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.2",
-        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.3225 HP",
+        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.44x HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Champion of the Wild Roar",
     },
     1274: {//Jesus Burgess Evo
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.2x",
-        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.3225 HP",
+        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.44x HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Champion of the Wild Roar",

From 751ce0f5d76e398d41c9afca7dfd358c20d625d4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 22 Dec 2016 11:12:28 -0500
Subject: [PATCH 0725/1569] 3D2Y Return

New units and Drops page
---
 characters/js/controllers.js |  9 +++++++++
 common/data/aliases.js       |  2 ++
 common/data/captains.js      |  7 +++++++
 common/data/cooldowns.js     |  2 ++
 common/data/details.js       | 11 +++++++++++
 common/data/drops.js         | 16 ++++++++++++++++
 common/data/families.js      | 12 +++++++-----
 common/data/gw.js            |  2 ++
 common/data/specials.js      |  9 +++++++++
 common/data/units.js         |  6 ++++--
 10 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index 25daf3791..0b089f907 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -153,6 +153,15 @@ app.controller('DetailsCtrl',function($scope, $rootScope, $state, $stateParams,
                     });
                 }
             }
+            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}
+                    });
+                }
+            }
         });
     }
 
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 3400d15d4..0d4410a2a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1389,4 +1389,6 @@ window.aliases = {
     1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami'],
     1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy'],
     1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
+    1392: ['', '', ''],
+    1393: ['', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 4bfba87d1..3957f6a8c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3827,4 +3827,11 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
         hp: function(p) { return p.unit.cost <= 40 ? 1 : 0.5; }
     },
+    1392: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
+    },
+    1391: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 81459c223..47c4525f3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1390,4 +1390,6 @@ window.cooldowns = [
     [ 21, 16 ],
     [ 17, 12 ],
     [ 17, 12 ],
+    22,
+    19,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 3decf4a44..1cf9ade04 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7433,5 +7433,16 @@ window.details = {
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
         specialName: "Chop-Chop Clown Car",
     },
+    1392: {//Sentomaru
+        captain: "Boosts ATK of Striker characters by 2x and boosts the HP of [PSY] characters by 1.25x",
+        captainNotes: "A character with both classes will get both boosts",
+        special: "Deals 25x character's ATK in [PSY] damage to all enemies. If during that turn every unit scores a Perfect hit, boosts ATK of [PSY] characters by 1.75x in the following turn.",
+        specialName: "Large Cutting Axe",
+    },
+    1393: {//Demaro Black
+        captain: "Boosts ATK of characters with cost 30 or less by 2x",
+        special: "Boosts the ATK of all characters by 1.1x, slightly boosts chances of getting matching orbs and amplifies the effect of orbs by 1.1x for 7 turns",
+        specialName: "Three Forked Tongue",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 8e2d9844e..c553615c5 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -586,6 +586,22 @@ window.drops = {
             "14": [ 1353 ],
         },
         
+        {
+            name: "Return to Sabaody Archipelago",
+            shortName: "Straw Hat Return",
+            thumb: 1393,
+            completion: '5x Rainbow Gems',
+            "01": [  ],
+            "02": [  ],
+            "03": [ 1393 ],
+            "04": [  ],
+            "05": [  ],
+            "06": [  ],
+            "07": [  ],
+            "08": [  ],
+            "09": [ 1392 ],
+        },
+        
     ],
 
     'Weekly Island': [
diff --git a/common/data/families.js b/common/data/families.js
index 5dece0099..e6803aabb 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -983,11 +983,11 @@ window.families = [
     "Vista",
     "Vista",
     "Paulie",
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Impostor Straw Hats",
+    "Impostor Straw Hats",
+    "Impostor Straw Hats",
+    "Impostor Straw Hats",
+    "Impostor Straw Hats",
     "Machvise",
     "Machvise",
     "Gladius",
@@ -1390,4 +1390,6 @@ window.families = [
     "Nami",
     "Buggy",
     "Buggy",
+    "Sentomaru",
+    "Demalo Black",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 4682ee5c9..711c0d4ce 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1390,4 +1390,6 @@ window.gw=[
     2020,
     46852,
     46852,
+    47137,
+    47139,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 49b853666..c224d10e8 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1890,4 +1890,13 @@ window.specials = {
         atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
         type: "class"
     },
+    1392: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        type: "class"
+    },
+    1393: {
+        atk: function(p) { return 1.1; },
+        type: "class",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.1); },
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 7a98e55e1..77abe1442 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1379,8 +1379,8 @@ window.units = [
     [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
     [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
     [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
-    [ "Christmas Tashigi", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, null ],
-    [ "Christmas Tashigi Evolved", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 5, 4, 99, 3000000, 742, 416, 198, null, null, null, null ],
+    [ "Tashigi, Silent Night Star", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, null ],
+    [ "Tashigi, Holy Night Heroine", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 5, 4, 99, 3000000, 742, 416, 198, null, null, null, null ],
     [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, 5, 2, 50, 392109, 81, 72, 28, 867, 611, 186, 1 ],
     [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
@@ -1390,6 +1390,8 @@ window.units = [
     [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
     [ "Buggy Clown, Captain of the Buggy Pirates", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, 1 ],
     [ "Captain Buggy", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, 1 ],
+    [ "Sentomaru Story", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, null, null, null, null, 2805, 955, 201, null ],
+    [ "Demalo Black", "INT", [ "Shooter", "Driven" ], 4, 15, 7, 1, 99, null, 102, 105, 49, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From dfd3668c6ee35bc3a8d693039dccbcc2a514e995 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 22 Dec 2016 22:12:14 -0600
Subject: [PATCH 0726/1569] +Luffy & Colo Previews

boop
---
 common/data/captains.js   |  8 +++++++-
 common/data/details.js    |  6 ++++++
 common/data/evolutions.js |  4 ++++
 common/data/units.js      | 11 ++++++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 3957f6a8c..dbbd9f897 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3811,7 +3811,13 @@ window.captains = {
     1384: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
-    
+    1387: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.8125 : 2.25;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return 1.25; },
+    },
     1388: {
         atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; },
     },
diff --git a/common/data/details.js b/common/data/details.js
index 1cf9ade04..d93bf3593 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7410,6 +7410,12 @@ window.details = {
         special: "Removes blindness",
         specialName: "Mother's Promise",
     },
+    1387: {//Luffy 5+
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. Boosts ATK by an additional 1.25x after scoring 4 Perfects in a row",
+        captainNotes: "After 4 Perfects, your captain boost is 2.8125x",
+        special: "Deals 40x character's ATK in [STR] damage to all enemies, and delays all enemies for 1 turn",
+        specialName: "Luffy+ Special",
+    },
     1388: {//Zoro 5+
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 10%. Reduces special cooldown of [DEX] specials by 1 turn.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4d150167c..3ed082b8d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2107,6 +2107,10 @@ window.evolutions = {
         evolution: 1386,
         evolvers: [ 116, 117, 81, 98 ]
     },
+    4: {
+        evolution: 1387,
+        evolvers: [  ]
+    },
     8: {
         evolution: 1388,
         evolvers: [  ]
diff --git a/common/data/units.js b/common/data/units.js
index 77abe1442..198e9e924 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1385,13 +1385,22 @@ window.units = [
     [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Monkey D. Luffy+", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1005, 560, 113, 2255, 1499, 284, null ],
     [ "Roronoa Zoro, Unfortunate Port Bird: Yakkoudori", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, 1 ],
     [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
     [ "Buggy Clown, Captain of the Buggy Pirates", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, 1 ],
     [ "Captain Buggy", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, 1 ],
     [ "Sentomaru Story", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, null, null, null, null, 2805, 955, 201, null ],
     [ "Demalo Black", "INT", [ "Shooter", "Driven" ], 4, 15, 7, 1, 99, null, 102, 105, 49, null, null, null, null ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Gladius Evolved", "STR", [ "Driven", "Shooter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From cb77984089d15dcafafa0794781ff599a35c959f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Dec 2016 01:22:01 -0500
Subject: [PATCH 0727/1569] I did some things, but I forgot

I blame the color black
---
 common/data/aliases.js   |  5 +--
 common/data/cooldowns.js |  2 +-
 common/data/drops.js     |  3 ++
 common/data/flags.js     | 75 ++++++++++++++++++++++++----------------
 common/data/gw.js        |  2 +-
 5 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0d4410a2a..ad7987f8f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1385,8 +1385,9 @@ window.aliases = {
     1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
     1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
     1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
-    1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro'],
-    1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami'],
+    1387: ['', '', 'Mega Luffy', 'Super Luffy'],
+    1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro', 'Super Zoro'],
+    1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami', 'Super Nami'],
     1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy'],
     1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
     1392: ['', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 47c4525f3..7279807a3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1385,7 +1385,7 @@ window.cooldowns = [
     [ 14, 6 ],
     [ 12, 8 ],
     [ 12, 8 ],
-    null,
+    [ 23, 16 ],
     [ 12, 7 ],
     [ 21, 16 ],
     [ 17, 12 ],
diff --git a/common/data/drops.js b/common/data/drops.js
index c553615c5..db17241d1 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -528,6 +528,7 @@ window.drops = {
             name: "Marineford",
             shortName: "Marineford",
             thumb: 1228,
+            global: true,
             completion: '5x Rainbow Gems',
             "01": [  ],
             "02": [ 1223 ],
@@ -1106,6 +1107,7 @@ window.drops = {
         {
             name: "Men are Forbidden!? The Secret Flower Garden",
             thumb: 918,
+            global: true,
             condition: 'You can only bring DEX units',
             "All Difficulties": [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ]
         },
@@ -1113,6 +1115,7 @@ window.drops = {
         {
             name: "Hannyabal's Great Ambition",
             thumb: 929,
+            global: true,
             condition: 'You can only bring STR units',
             "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index cf651e8d6..419d4fe84 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -781,16 +781,16 @@ window.flags = {
     781: { global: 1 },
     782: { rr: 1, rro: 1, lrr: 1, global: 1 },
     783: { rr: 1, rro: 1, lrr: 1, global: 1 },
-    784: { rr: 1, rro: 1 },
-    785: { rr: 1, rro: 1 },
-    786: { rr: 1, rro: 1 },
-    787: { rr: 1, rro: 1 },
-    788: { rr: 1, rro: 1 },
-    789: { rr: 1, rro: 1 },
-    790: { rr: 1, rro: 1 },
-    791: { rr: 1, rro: 1 },
-    792: { rr: 1, rro: 1 },
-    793: { rr: 1, rro: 1 },
+    784: { rr: 1, rro: 1, global: 1 },
+    785: { rr: 1, rro: 1, global: 1 },
+    786: { rr: 1, rro: 1, global: 1 },
+    787: { rr: 1, rro: 1, global: 1 },
+    788: { rr: 1, rro: 1, global: 1 },
+    789: { rr: 1, rro: 1, global: 1 },
+    790: { rr: 1, rro: 1, global: 1 },
+    791: { rr: 1, rro: 1, global: 1 },
+    792: { rr: 1, rro: 1, global: 1 },
+    793: { rr: 1, rro: 1, global: 1 },
     796: { global: 1 },
     797: { global: 1 },
     798: { global: 1 },
@@ -856,7 +856,7 @@ window.flags = {
     858: { rr: 1, rro: 1, lrr: 1, global: 1 },
     859: { global: 1 },
     860: { global: 1 },
-    863: { special: 1 },
+    863: { special: 1, global: 1 },
     864: { global: 1 },
     865: { global: 1 },
     869: { rr: 1, rro: 1, global: 1 },
@@ -871,6 +871,10 @@ window.flags = {
     878: { rr: 1, rro: 1, global: 1 },
     879: { rr: 1, rro: 1, global: 1 },
     880: { rr: 1, rro: 1, global: 1 },
+    881: { global: 1 },
+    882: { global: 1 },
+    883: { global: 1 },
+    884: { global: 1 },
     888: { global: 1 },
     889: { global: 1 },
     890: { global: 1 },
@@ -892,6 +896,10 @@ window.flags = {
     914: { rr: 1, rro: 1, global: 1 },
     915: { rr: 1, rro: 1, lrr: 1, global: 1 },
     916: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    917: { global: 1 },
+    918: { global: 1 },
+    919: { global: 1 },
+    920: { global: 1 },
     921: { rr: 1, rro: 1, lrr: 1, global: 1 },
     922: { rr: 1, rro: 1, lrr: 1, global: 1 },
     923: { global: 1 },
@@ -899,6 +907,9 @@ window.flags = {
     925: { global: 1 },
     926: { global: 1 },
     927: { global: 1 },
+    928: { global: 1 },
+    929: { global: 1 },
+    930: { global: 1 },
     931: { global: 1 },
     934: { rr: 1, rro: 1, global: 1 },
     935: { rr: 1, rro: 1, global: 1 },
@@ -1101,18 +1112,24 @@ window.flags = {
     1212: { rr: 1, rro: 1, global: 1 },
     1213: { rr: 1, rro: 1, lrr: 1 },
     1214: { rr: 1, rro: 1, lrr: 1 },
-    1229: { rr: 1, rro: 1 },
-    1230: { rr: 1, rro: 1 },
-    1231: { rr: 1, rro: 1 },
-    1232: { rr: 1, rro: 1 },
-    1233: { rr: 1, rro: 1 },
-    1234: { rr: 1, rro: 1 },
-    1235: { rr: 1, rro: 1 },
-    1236: { rr: 1, rro: 1 },
-    1237: { rr: 1, rro: 1 },
-    1238: { rr: 1, rro: 1 },
-    1239: { rr: 1, rro: 1 },
-    1240: { rr: 1, rro: 1 },
+    1223: { global: 1 },
+    1224: { global: 1 },
+    1225: { global: 1 },
+    1226: { global: 1 },
+    1227: { global: 1 },
+    1228: { global: 1 },
+    1229: { rr: 1, rro: 1, global: 1 },
+    1230: { rr: 1, rro: 1, global: 1 },
+    1231: { rr: 1, rro: 1, global: 1 },
+    1232: { rr: 1, rro: 1, global: 1 },
+    1233: { rr: 1, rro: 1, global: 1 },
+    1234: { rr: 1, rro: 1, global: 1 },
+    1235: { rr: 1, rro: 1, global: 1 },
+    1236: { rr: 1, rro: 1, global: 1 },
+    1237: { rr: 1, rro: 1, global: 1 },
+    1238: { rr: 1, rro: 1, global: 1 },
+    1239: { rr: 1, rro: 1, global: 1 },
+    1240: { rr: 1, rro: 1, global: 1 },
     1248: { rr: 1, rro: 1, lrr: 1 },
     1249: { rr: 1, rro: 1, lrr: 1 },
     1259: { rr: 1, rro: 1, lrr: 1 },
@@ -1153,10 +1170,10 @@ window.flags = {
     1322: { rr: 1, rro: 1 },
     1323: { rr: 1, rro: 1 },
     1324: { rr: 1, rro: 1 },
-    1335: { rr: 1, rro: 1, lrr: 1 },
-    1336: { rr: 1, rro: 1, lrr: 1 },
-    1354: { rr: 1, rro: 1, lrr: 1 },
-    1355: { rr: 1, rro: 1, lrr: 1 },
+    1335: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1336: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1354: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1355: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1360: { promo: 1 },
     1361: { rr: 1, rro: 1 },
     1362: { rr: 1, rro: 1 },
@@ -1170,8 +1187,8 @@ window.flags = {
     1370: { rr: 1, rro: 1 },
     1371: { shop: 1 },
     1372: { shop: 1 },
-    1381: { rr: 1, rro: 1, lrr: 1 },
-    1382: { rr: 1, rro: 1, lrr: 1 },
+    1381: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1382: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1390: { rr: 1, rro: 1 },
     1391: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 711c0d4ce..5a15eb5c0 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1385,7 +1385,7 @@ window.gw=[
     46661,
     46662,
     46662,
-    null,
+    2017,
     2019,
     2020,
     46852,

From b7c523184418ac4d6af9be64ff3308aec06d894c Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 27 Dec 2016 11:14:24 -0500
Subject: [PATCH 0728/1569] Units added

Here for when we do the rest of the update later
---
 common/data/details.js |  2 +-
 common/data/units.js   | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index d93bf3593..002e9997c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7414,7 +7414,7 @@ window.details = {
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. Boosts ATK by an additional 1.25x after scoring 4 Perfects in a row",
         captainNotes: "After 4 Perfects, your captain boost is 2.8125x",
         special: "Deals 40x character's ATK in [STR] damage to all enemies, and delays all enemies for 1 turn",
-        specialName: "Luffy+ Special",
+        specialName: "Gum Gum: Elephant Gun",
     },
     1388: {//Zoro 5+
         captain: "Boosts ATK of [DEX] characters by 2.5x",
diff --git a/common/data/units.js b/common/data/units.js
index 198e9e924..3ea4ca96a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1379,13 +1379,13 @@ window.units = [
     [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
     [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
     [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
-    [ "Tashigi, Silent Night Star", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, null ],
-    [ "Tashigi, Holy Night Heroine", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 5, 4, 99, 3000000, 742, 416, 198, null, null, null, null ],
+    [ "Tashigi, Silent Night Star", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, 1 ],
+    [ "Tashigi, Holy Night Heroine", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 5, 4, 99, 3000000, 742, 416, 198, 1764, 909, 426, 1 ],
     [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, 5, 2, 50, 392109, 81, 72, 28, 867, 611, 186, 1 ],
     [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
-    [ "Monkey D. Luffy+", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 99, null, 1005, 560, 113, 2255, 1499, 284, null ],
+    [ "Monkey D. Luffy, Gum Gum Elephant: Elephant Gun", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1005, 560, 113, 2255, 1499, 284, 1 ],
     [ "Roronoa Zoro, Unfortunate Port Bird: Yakkoudori", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, 1 ],
     [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
     [ "Buggy Clown, Captain of the Buggy Pirates", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, 1 ],
@@ -1401,6 +1401,23 @@ window.units = [
     [ "Coliseum Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Gladius Evolved", "STR", [ "Driven", "Shooter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tashigi", "DEX", [ "Striker", "Driven" ], 3, 11, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tashigi Evolved", "DEX", [ "Striker", "Driven" ], 4, 19, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Smoker", "QCK", [ "Slasher", "Cerebral" ], 3, 11, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Smoker Evolved", "QCK", [ "Slasher", "Cerebral" ], 4, 19, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Robin Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Brook", "INT", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 0558cd7eb4a596889471994912a80bc17a9bf9ec Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 27 Dec 2016 13:59:41 -0500
Subject: [PATCH 0729/1569] Units and Families

Baby 5, Smoker, and Tashigi
---
 common/data/cooldowns.js |  3 +++
 common/data/details.js   | 31 +++++++++++++++++++++++++++++++
 common/data/families.js  |  6 ++++++
 common/data/gw.js        |  6 ++++++
 common/data/units.js     | 22 ++++++++--------------
 5 files changed, 54 insertions(+), 14 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7279807a3..fa6799b88 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1392,4 +1392,7 @@ window.cooldowns = [
     [ 17, 12 ],
     22,
     19,
+    [ 10, 10 ],
+    [ 21, 14 ],
+    [ 21, 14 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 002e9997c..3ed920e08 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7450,5 +7450,36 @@ window.details = {
         special: "Boosts the ATK of all characters by 1.1x, slightly boosts chances of getting matching orbs and amplifies the effect of orbs by 1.1x for 7 turns",
         specialName: "Three Forked Tongue",
     },
+    1394: {//Kimono Baby 5
+        captain: "Boosts ATK of [STR] and [QCK] characters by 2.25x an their RCV by 1.2x",
+        special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
+        specialName: "Nation's Ambition",
+    },
+    1395: {//Kimono Baby 5
+        captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x an their RCV by 1.1x",
+        special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
+        specialName: "Nation's Ambition",
+    },
+    1396: {//Tashigi Shambles
+        captain: "Boosts ATK of Driven characters by 1.75x and the HP of Striker Characters by 1.25x",
+        special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all by 80% and delays all enemies for 1 turn",
+        specialName: "Surprise Jitte Onslaught",
+    },
+    1397: {//Tashigi Shambles
+        captain: "Boosts ATK of Driven characters by 2x and the HP of Striker Characters by 1.5x",
+        special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all by 80% and delays all enemies for 1 turn",
+        specialName: "Surprise Jitte Onslaught",
+    },
+    1398: {//Smoker Shambles
+        captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x",
+        special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
+        specialName: "Out-of-Control White Smoke",
+    },
+    1399: {//Smoker Shambles
+        captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, reduces damage received by 15%",
+        special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
+        specialName: "Out-of-Control White Smoke",
+    },
+    
 };
 
diff --git a/common/data/families.js b/common/data/families.js
index e6803aabb..67465d529 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1392,4 +1392,10 @@ window.families = [
     "Buggy",
     "Sentomaru",
     "Demalo Black",
+    "Baby 5",
+    "Baby 5",
+    "Tashigi",
+    "Tashigi",
+    "Smoker",
+    "Smoker",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 5a15eb5c0..92e12d542 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1392,4 +1392,10 @@ window.gw=[
     46852,
     47137,
     47139,
+    47292,
+    47292,
+    47253,
+    47253,
+    47254,
+    47254,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 3ea4ca96a..4a2ec57e1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1390,23 +1390,17 @@ window.units = [
     [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
     [ "Buggy Clown, Captain of the Buggy Pirates", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, 1 ],
     [ "Captain Buggy", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, 1 ],
-    [ "Sentomaru Story", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, null, null, null, null, 2805, 955, 201, null ],
-    [ "Demalo Black", "INT", [ "Shooter", "Driven" ], 4, 15, 7, 1, 99, null, 102, 105, 49, null, null, null, null ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "STR", [ "Fighter", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sentomaru, Wall of the Sabaody Archipelagos", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, 3000000, 166, 48, 33, 2805, 955, 201, 1 ],
+    [ "Demalo Black", "INT", [ "Shooter", "Driven" ], 4, 15, 7, 1, 99, 3000000, 102, 105, 49, 1187, 688, 251, 1 ],
+    [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tashigi Shambles", "DEX", [ "Striker", "Driven" ], 3, 11, 6, 1, 50, 392109, 103, 34, 23, 1034, 543, 113, 1 ],
+    [ "Tashigi Shambles, 7 Foot Jitte", "DEX", [ "Striker", "Driven" ], 4, 19, 5, 3, 9, 3000000, 914, 463, 103, 2134, 1043, 231, 1 ],
+    [ "Smoker Shambles", "QCK", [ "Slasher", "Cerebral" ], 3, 11, 6, 1, 50, 392109, 76, 26, 41, 886, 466, 186, 1 ],
+    [ "Smoker Shambles, Shigure", "QCK", [ "Slasher", "Cerebral" ], 4, 19, 4, 3, 99, 3000000, 706, 416, 160, 1606, 910, 361, 1 ],
     [ "Coliseum Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Gladius Evolved", "STR", [ "Driven", "Shooter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tashigi", "DEX", [ "Striker", "Driven" ], 3, 11, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tashigi Evolved", "DEX", [ "Striker", "Driven" ], 4, 19, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Smoker", "QCK", [ "Slasher", "Cerebral" ], 3, 11, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Smoker Evolved", "QCK", [ "Slasher", "Cerebral" ], 4, 19, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From cbab31e4e42403226a57bfad7006b670677efc94 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 27 Dec 2016 15:06:52 -0500
Subject: [PATCH 0730/1569] I think I added everything except for stats

tada
---
 common/data/aliases.js    | 25 ++++++++++++--
 common/data/captains.js   | 24 ++++++++++++-
 common/data/details.js    | 72 +++++++++++++++++++++++++++++++++++++++
 common/data/drops.js      | 12 +++++--
 common/data/evolutions.js | 40 ++++++++++++++++++++++
 common/data/families.js   | 14 ++++++++
 common/data/flags.js      | 13 +++++++
 common/data/units.js      |  1 +
 8 files changed, 195 insertions(+), 6 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ad7987f8f..9ec9aba09 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1390,6 +1390,27 @@ window.aliases = {
     1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami', 'Super Nami'],
     1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy'],
     1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
-    1392: ['', '', ''],
-    1393: ['', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
+    1392: ['戦桃丸 シャボンディ諸島の壁', '', ''],
+    1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
+    1394: ['', '', 'Kimono Baby 5'],
+    1395: ['', '', 'Kimono Baby 5'],
+    1396: ['', '', 'Smoker'],
+    1397: ['', '', 'Smoker'],
+    1398: ['', '', 'Tashigi'],
+    1399: ['', '', 'Tashigi'],
+    1400: ['', '', ''],
+    1401: ['', '', ''],
+    1402: ['', '', ''],
+    1403: ['', '', ''],
+    1404: ['', '', ''],
+    1405: ['', '', ''],
+    1406: ['', '', ''],
+    1407: ['', '', ''],
+    1408: ['', '', ''],
+    1409: ['', '', ''],
+    1410: ['', '', ''],
+    1411: ['', '', ''],
+    1412: ['', '', ''],
+    1413: ['', '', ''],
+    1414: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index dbbd9f897..5a3d86714 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3837,7 +3837,29 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
         hp: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
     },
-    1391: {
+    1393: {
         atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
     },
+    1394: {
+        atk: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 1.1 : 1; },
+    },
+    1395: {
+        atk: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 1.2 : 1; },
+    },
+    1396: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
+    },
+    1397: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+    },
+    1398: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1399: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 3ed920e08..2f6cc037b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7480,6 +7480,78 @@ window.details = {
         special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
         specialName: "Out-of-Control White Smoke",
     },
+    1403: {//Timeskip Luffy
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
+        special: "Deal very large [QCK] damage to one enemy and [QCK], [DEX], and [PSY] orbs are treated as beneficial for 3 turns",
+        specialName: "Gomu Gomu no Red Hawk",
+    },
+    1404: {//Timeskip Luffy
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
+        special: "Deal very large [QCK] damage to one enemy and [QCK], [DEX], and [PSY] orbs are treated as beneficial for 3 turns",
+        specialName: "Gomu Gomu no Red Hawk",
+    },
+    1405: {//Timeskip Usopp
+        captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "Usopp Special",
+        sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
+        
+    },
+    1406: {//Timeskip Usopp
+        captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "Usopp Special",
+        sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
+    },
+    1407: {//Timeskip Robin
+        captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
+        special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
+        specialName: "Robin Special",
+        sailor: "Reduces duration of Blindness by 3 turns"
+    },
+    1408: {//Timeskip Robin
+        captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
+        special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
+        specialName: "Robin Special",
+        sailor: "Reduces duration of Blindness by 3 turns"
+    },
+    1409: {//Timeskip Brook
+        captain: "Protects from defeat as long as HP is above x%",
+        special: "Delay all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
+        specialName: "Brook Special",
+        sailor: "Completely resists Paralysis on this character",
+    },
+    1410: {//Timeskip Brook
+        captain: "Protects from defeat as long as HP is above x%",
+        special: "Delay all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
+        specialName: "Brook Special",
+        sailor: "Completely resists Paralysis on this character",
+    },
+    1411: {//Timeskip Chopper Again
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
+        special: "Reduce enemies damage reduction and increase defense duration by 3 turns and deals extra large typeless damage to all enemies",
+        specialnotes: "This does not affect threshold damage reduction",
+        specialName: "Chopper Special",
+        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
+    },
+    1412: {//Timeskip Chopper Again
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
+        special: "Reduce enemies damage reduction and increase defense duration by 3 turns and deals extra large typeless damage to all enemies",
+        specialnotes: "This does not affect threshold damage reduction",
+        specialName: "Chopper Special",
+        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
+    },
+    1413: {//6+ Whitebeard
+        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise",
+        special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all specials by 1 turn.",
+        specialName: "Seaquake",
+    },
+    1414: {//Shop Sanji
+        captain: "Boosts ATK of Powerhouse characters by 2.5x",
+        special: "Changes own orb into [INT] and reduce the special cooldown of Powerhouse characters by 1 turn.",
+        specialName: "Sanji Special",
+    },
+    
     
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index db17241d1..8e1e11384 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1275,6 +1275,12 @@ window.drops = {
             "All Difficulties": [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739 ]
         },
         
+        {
+            name: "Shambles! Tashigi and Smoker?!?",
+            thumb: 1397,
+            "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
+        },
+        
     ],
 
             
@@ -1509,9 +1515,9 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3ed082b8d..25f7ebdba 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2123,4 +2123,44 @@ window.evolutions = {
         evolution: 1391,
         evolvers: [ 118, 88, 99, 304, 267 ]
     },
+    1394: {
+        evolution: 1395,
+        evolvers: [  ]
+    },
+    1396: {
+        evolution: 1397,
+        evolvers: [ 177, 80, 91, 97, 102 ]
+    },
+    1398: {
+        evolution: 1399,
+        evolvers: [ 117, 79, 90, 96, 101 ]
+    },
+    1400: {
+        evolution: 1401,
+        evolvers: [  ]
+    },
+    1403: {
+        evolution: 1404,
+        evolvers: [  ]
+    },
+    1405: {
+        evolution: 1406,
+        evolvers: [  ]
+    },
+    1407: {
+        evolution: 1408,
+        evolvers: [  ]
+    },
+    1409: {
+        evolution: 1410,
+        evolvers: [  ]
+    },
+    1411: {
+        evolution: 13412,
+        evolvers: [  ]
+    },
+    261: {
+        evolution: 1413,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 67465d529..36a3ff26e 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1398,4 +1398,18 @@ window.families = [
     "Tashigi",
     "Smoker",
     "Smoker",
+    "Gladius",
+    "Gladius",
+    "Dalton",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Usopp",
+    "Usopp",
+    "Nico Robin",
+    "Nico Robin",
+    "Brook",
+    "Brook",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Whitebeard",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 419d4fe84..ec45aeccd 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1191,4 +1191,17 @@ window.flags = {
     1382: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1390: { rr: 1, rro: 1 },
     1391: { rr: 1, rro: 1 },
+    1394: { rr: 1, rro: 1, lrr: 1, },
+    1395: { rr: 1, rro: 1, lrr: 1, },
+    1403: { rr: 1, rro: 1 },
+    1404: { rr: 1, rro: 1 },
+    1405: { rr: 1, rro: 1 },
+    1406: { rr: 1, rro: 1 },
+    1407: { rr: 1, rro: 1 },
+    1408: { rr: 1, rro: 1 },
+    1409: { rr: 1, rro: 1 },
+    1410: { rr: 1, rro: 1 },
+    1411: { rr: 1, rro: 1 },
+    1412: { rr: 1, rro: 1 },
+    1414: { shop: 1 },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 4a2ec57e1..80dfcfdf0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1412,6 +1412,7 @@ window.units = [
     [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ray Shop Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b402b459c8ba64cd04866dde519d9fd7e1fe68ef Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 27 Dec 2016 15:10:57 -0500
Subject: [PATCH 0731/1569] Cooldowns

placeholders and Shop Sanji and 6+ WB
---
 common/data/cooldowns.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fa6799b88..033a1323e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1395,4 +1395,22 @@ window.cooldowns = [
     [ 10, 10 ],
     [ 21, 14 ],
     [ 21, 14 ],
+    19,
+    19,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 25, 17 ],
+    [ 6, 6 ],
+    
 ];

From 169297af5048bdd036fac6318305d0e1c80ecd14 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 27 Dec 2016 15:14:52 -0500
Subject: [PATCH 0732/1569] one off Cooldowns

---
 common/data/cooldowns.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 033a1323e..1c35ee1dc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1410,6 +1410,7 @@ window.cooldowns = [
     null,
     null,
     null,
+    null,
     [ 25, 17 ],
     [ 6, 6 ],
     

From 7033bc7d558e9a2adbda1bd8e0fb9d6f9018f828 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 27 Dec 2016 15:26:07 -0600
Subject: [PATCH 0733/1569] Broke'd

I un-broke'd it.
---
 common/data/captains.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 5a3d86714..ae1b6145f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3841,12 +3841,12 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
     },
     1394: {
-        atk: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 1.1 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.1 : 1; },
     },
     1395: {
-        atk: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" || return p.unit.type == "STR" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.2 : 1; },
     },
     1396: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },

From 496492e875b87f0ec76291a150083e952f9881f7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Dec 2016 00:48:42 -0500
Subject: [PATCH 0734/1569] Colo stuffs

I don't think it's broken again
---
 common/data/aliases.js  | 162 ++++++++++++++++++++--------------------
 common/data/captains.js |  27 +++++++
 common/data/details.js  |  45 ++++++++++-
 common/data/drops.js    |   2 +-
 common/data/specials.js |  26 +++++++
 common/data/units.js    |  12 +--
 6 files changed, 185 insertions(+), 89 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9ec9aba09..0ea446352 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -774,12 +774,12 @@ window.aliases = {
     773: ['シュウ','','Raid'],
     774: ['ベリーグッド','','Very Good','Raid'],
     775: ['ストロベリー 海軍本部中将','','Raid'],
-    776: ['ラッキー・ルウ','','Coliseum'],
-    777: ['ラッキー・ルウ 赤髪海賊団','','Coliseum'],
-    778: ['レベッカ 囚人剣闘士','','Coliseum'],
-    779: ['レベッカ コロシアム専属剣闘士','','Coliseum'],
-    780: ['ウルージ 破戒僧海賊団船長','','Supernova','Coliseum'],
-    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova','Coliseum'],
+    776: ['ラッキー・ルウ','','Coliseum Lucky Roo'],
+    777: ['ラッキー・ルウ 赤髪海賊団','','Coliseum Lucky Roo'],
+    778: ['レベッカ 囚人剣闘士','','Coliseum Rebecca'],
+    779: ['レベッカ コロシアム専属剣闘士','','Coliseum Rebecca'],
+    780: ['ウルージ 破戒僧海賊団船長','','Supernova','Coliseum Urouge'],
+    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova','Coliseum Urouge'],
     782: ['たしぎ 正義の華','', 'Kimono Tashigi' ],
     783: ['たしぎ 海軍本部少尉・正義の華','', 'Kimono Tashigi' ],
     784: ['ゲンさん',''],
@@ -801,10 +801,10 @@ window.aliases = {
     800: ['たこボクサー 海獣海賊団',''],
     801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','mr 2' ],
     802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
-    803: ['ヒナ 海軍本部大佐','','Coliseum'],
-    804: ['黒檻のヒナ 海軍本部大佐','','Coliseum'],
-    805: ['スモーカー 海軍本部大佐','','Coliseum'],
-    806: ['白猟のスモーカー 海軍本部大佐','','Coliseum'],
+    803: ['ヒナ 海軍本部大佐','','Coliseum Hina'],
+    804: ['黒檻のヒナ 海軍本部大佐','','Coliseum Hina'],
+    805: ['スモーカー 海軍本部大佐','','Coliseum Smoker'],
+    806: ['白猟のスモーカー 海軍本部大佐','','Coliseum Smoker'],
     807: ['純白の天使ナミ ウエディング','','Bridal Nami'],
     808: ['純白の女神ナミ ウエディング','','Bridal Nami'],
     809: ['ローラ スリラーバークの花嫁',''],
@@ -828,11 +828,11 @@ window.aliases = {
     827: ['ジェネラルゾンビ　疾速の影',''],
     828: ['？？？','','Kid Law','Young Law'],
     829: ['？？？','','Kid Law','Young Law'],
-    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum'],
-    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum'],
-    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Coliseum' ],
-    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Coliseum' ],
-    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day','Coliseum'],
+    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum Hawkins', 'Coliseum Basil Hawkins'],
+    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum Hawkins', 'Coliseum Basil Hawkins'],
+    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Coliseum Wyper' ],
+    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Coliseum Wyper' ],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day', 'Coliseum Mr 7', 'Coliseum Miss Fathers Day'],
     835: ['暴君バーソロミュー・くま','','Raid'],
     836: ['暴君バーソロミュー・くま 政府の人間兵器','','Raid'],
     837: ['シーザー・クラウン',''],
@@ -857,10 +857,10 @@ window.aliases = {
     856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova','Christmas Law','CLaw'],
     857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova'],
     858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ','','Supernova'],
-    859: ['コビー 海軍本部曹長','','Coliseum'],
-    860: ['戦火の勇士コビー 海軍本部曹長','','Coliseum'],
-    861: ['レディー・アルビダ うるわしき美女','','Coliseum'],
-    862: ['レディー・アルビダ 絶世の美女','','Coliseum'],
+    859: ['コビー 海軍本部曹長','','Coliseum Coby'],
+    860: ['戦火の勇士コビー 海軍本部曹長','','Coliseum Coby'],
+    861: ['レディー・アルビダ うるわしき美女','','Coliseum Alvida'],
+    862: ['レディー・アルビダ 絶世の美女','','Coliseum Alvida'],
     863: ['銀世界のナミ',''],
     864: ['ボア・ハンコック 九蛇海賊団船長','','Raid'],
     865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid'],
@@ -879,10 +879,10 @@ window.aliases = {
     878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates' ],
     879: ['ラオＧ',''],
     880: ['ラオＧ ドンキホーテ海賊団',''],
-    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum'],
-    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum'],
-    883: ['ドリー 巨兵海賊団','','Coliseum'],
-    884: ['青鬼のドリー','','Coliseum'],
+    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum Apoo'],
+    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum Apoo'],
+    883: ['ドリー 巨兵海賊団','','Coliseum Dorry'],
+    884: ['青鬼のドリー','','Coliseum Dorry'],
     885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
     886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
     887: ['バギー 陽気なかぶき者','', 'Kimono Buggy', 'Baggy'],
@@ -898,11 +898,11 @@ window.aliases = {
     897: ['サー・クロコダイル 砂の武将','', 'Kimono Crocodile' ],
     898: ['Mr.3 姑息な楽士','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
     899: ['Mr.2・ボン・クレー あやふやな侍','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
-    900: ['フレッシュ・フランキー 健康第一','','Coliseum'],
-    901: ['鉄人（サイボーグ）フランキー','','Coliseum'],
-    902: ['ブロギー 巨兵海賊団','','Coliseum'],
-    903: ['赤鬼のブロギー','','Coliseum'],
-    904: ['ヨコヅナ','','Coliseum'],
+    900: ['フレッシュ・フランキー 健康第一','','Coliseum Franky'],
+    901: ['鉄人（サイボーグ）フランキー','','Coliseum Franky'],
+    902: ['ブロギー 巨兵海賊団','','Coliseum Broggy'],
+    903: ['赤鬼のブロギー','','Coliseum Broggy'],
+    904: ['ヨコヅナ','','Coliseum Yokozuna'],
     905: ['ロロノア・ゾロ クライガナ島をさすらう剣士','','3D2Y Zoro','Timeskip Zoro'],
     906: ['ロロノア・ゾロ 世界最強剣士の門弟','','3D2Y Zoro','Timeskip Zoro'],
     907: ['ニコ・ロビン テキーラウルフの収監者','','3D2Y Robin','Timeskip Robin'],
@@ -921,11 +921,11 @@ window.aliases = {
     920: ['スイトピー',''],
     921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
     922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
-    923: ['南の海のキャプテン・キッド','','Coliseum'],
-    924: ['キャプテン・キッド キッド海賊団船長','','Coliseum'],
-    925: ['獄卒長サディちゃん','','Coliseum'],
-    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum'],
-    927: ['ドーベルマン 海軍本部中将','','Coliseum'],
+    923: ['南の海のキャプテン・キッド','','Coliseum Kid'],
+    924: ['キャプテン・キッド キッド海賊団船長','','Coliseum Kid'],
+    925: ['獄卒長サディちゃん','','Coliseum Sadie'],
+    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum Sadie'],
+    927: ['ドーベルマン 海軍本部中将','','Coliseum Doberman'],
     928: ['ハンニャバル','','Hannibal'],
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
@@ -948,10 +948,10 @@ window.aliases = {
     947: ['フォッサ 白ひげ海賊団１５番隊隊長',''],
     948: ['クリエル 白ひげ海賊団１０番隊隊長',''],
     949: ['サッチ 白ひげ海賊団４番隊隊長',''],
-    950: ['火拳のエース',''],
-    951: ['火拳のエース 白ひげ海賊団２番隊隊長',''],
-    952: ['ベン・ベックマン',''],
-    953: ['ベン・ベックマン 赤髪海賊団',''],
+    950: ['火拳のエース','','Coliseum Ace'],
+    951: ['火拳のエース 白ひげ海賊団２番隊隊長','', 'Coliseum Ace'],
+    952: ['ベン・ベックマン','', 'Coliseum Ben Beckman'],
+    953: ['ベン・ベックマン 赤髪海賊団','', 'Coliseum Ben Beckman'],
     954: ['ギャロ',''],
     955: ['マクロ','','Makuro'],
     956: ['タンスイ',''],
@@ -980,9 +980,9 @@ window.aliases = {
     979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
     980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
     981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
-    982: ['ビスタ 白ひげ海賊団５番隊隊長','','Coliseum'],
-    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Coliseum'],
-    984: ['パウリー ガレーラカンパニー１番ドック職長','','Coliseum'],
+    982: ['ビスタ 白ひげ海賊団５番隊隊長','','Coliseum Vista'],
+    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Coliseum Vista'],
+    984: ['パウリー ガレーラカンパニー１番ドック職長','','Coliseum Paulie'],
     985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
     986: ['ココア＆のらギツネ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
     987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
@@ -1013,11 +1013,11 @@ window.aliases = {
     1012: ['ヘビー総裁',''],
     1013: ['ホットドッグ将軍',''],
     1014: ['トニートニー・チョッパー 動物王',''],
-    1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Coliseum'],
-    1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Coliseum'],
-    1017: ['茶ひげ','','Coliseum'],
-    1018: ['茶ひげ ワニのケンタウロス','','Coliseum'],
-    1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum'],
+    1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Coliseum Capone Bege'],
+    1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Coliseum Capone Bege'],
+    1017: ['茶ひげ','','Coliseum Brownbeard'],
+    1018: ['茶ひげ ワニのケンタウロス','','Coliseum Brownbeard'],
+    1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum Lulu'],
     1020: ['シュガー　実桜','','Sakura Sugar'],
     1021: ['シュガー　桜桃','','Sakura Sugar'],
     1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
@@ -1038,10 +1038,10 @@ window.aliases = {
     1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
     1038: ['イナズマ 秘密の花園の乙女',''],
     1039: ['イナズマ 変革を画策する乙女',''],
-    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum' ],
-    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum' ],
-    1042: [ 'キラー キッド海賊団', '','Coliseum' ],
-    1043: [ '“殺戮武人”キラー キッド海賊団', '','Coliseum' ],
+    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum Jozu' ],
+    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum Jozu' ],
+    1042: [ 'キラー キッド海賊団', '','Coliseum Killer' ],
+    1043: [ '“殺戮武人”キラー キッド海賊団', '','Coliseum Killer' ],
     1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
     1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
     1046: [ 'サボ 竜の爪', '','Raid' ],
@@ -1084,12 +1084,12 @@ window.aliases = {
     1083: [ '首領・サイ 花ノ国のギャング', '' ],
     1084: [ '藤虎', '' ],
     1085: [ 'イッショウ', '', 'Fujitora' ],
-    1086: [ 'ムッシュール', '','Coliseum' ],
-    1087: [ 'ムッシュール 毒胞子人間', '','Coliseum' ],
-    1088: [ 'サガ', '','Coliseum' ],
-    1089: [ 'サガ 呪われた聖剣', '','Coliseum' ],
-    1090: [ 'X・ドレーク ドレーク海賊団', '','Coliseum' ],
-    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '','Coliseum' ],
+    1086: [ 'ムッシュール', '','Coliseum Musshuru' ],
+    1087: [ 'ムッシュール 毒胞子人間', '','Coliseum Musshuru' ],
+    1088: [ 'サガ', '','Coliseum Saga' ],
+    1089: [ 'サガ 呪われた聖剣', '','Coliseum Saga' ],
+    1090: [ 'X・ドレーク ドレーク海賊団', '','Coliseum X Drake' ],
+    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '','Coliseum X Drake' ],
     1092: [ 'レベッカ パラソルのリズム', '','Kid Rebecca' ],
     1093: [ 'レベッカ 虹のメロディ', '','Kid Rebecca' ],
     1094: [ 'Dr.インディゴ', '' ],
@@ -1099,12 +1099,12 @@ window.aliases = {
     1098: [ '雷鳥ビリー', '' ],
     1099: [ 'コビー 雨の中の曹長', '' ],
     1100: [ 'コビー 露にきらめく曹長', '' ],
-    1101: [ '黒腕のゼファー', '','Coliseum' ],
-    1102: [ '黒腕のゼファー 元海軍本部大将', '','Coliseum' ],
-    1103: [ 'アイン ＮＥＯ海軍', '','Coliseum' ],
-    1104: [ 'アイン ゼファー最後の教え子', '','Coliseum' ],
-    1105: [ 'ビンズ ＮＥＯ海軍', '','Coliseum' ],
-    1106: [ 'ビンズ ゼファー最後の教え子', '','Coliseum' ],
+    1101: [ '黒腕のゼファー', '','Coliseum Zephyr' ],
+    1102: [ '黒腕のゼファー 元海軍本部大将', '','Coliseum Zephyr' ],
+    1103: [ 'アイン ＮＥＯ海軍', '','Coliseum Ain' ],
+    1104: [ 'アイン ゼファー最後の教え子', '','Coliseum Ain' ],
+    1105: [ 'ビンズ ＮＥＯ海軍', '','Coliseum Binz' ],
+    1106: [ 'ビンズ ゼファー最後の教え子', '','Coliseum Binz' ],
     1107: [ '金獅子のシキ', '','Raid' ],
     1108: [ '金獅子のシキ 金獅子海賊団', '','Raid' ],
     1109: [ 'ナミ 若返った航海士', '' ],
@@ -1248,10 +1248,10 @@ window.aliases = {
     1247: ['ポートガス・D・エース マリンフォードに舞う“火拳”','',''],
     1248: ['マルコ 秋風にはためく襟元','',''],
     1249: ['マルコ ほろ酔いの着崩れ','',''],
-    1250: ['マルコ 白ひげ海賊団','','Coliseum'],
-    1251: ['マルコ　復活の炎 白ひげ海賊団','','Coliseum'],
-    1252: ['遊騎士ドーマ 白ひげ海賊団傘下','','Coliseum'],
-    1253: ['スカイライダー・シュラ','','Coliseum'],
+    1250: ['マルコ 白ひげ海賊団','','Coliseum Marco'],
+    1251: ['マルコ　復活の炎 白ひげ海賊団','','Coliseum Marco'],
+    1252: ['遊騎士ドーマ 白ひげ海賊団傘下','','Coliseum Doma'],
+    1253: ['スカイライダー・シュラ','','Coliseum Shura'],
     1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','',''],
     1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下','',''],
     1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下','',''],
@@ -1289,10 +1289,10 @@ window.aliases = {
     1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law', 'Kid Law'],
     1289: ['トラファルガー・ロー ドンキホーテファミリーの一員','','Kid Trafalgar Law', 'Kid Law'],
     1290: ['バッファロー ドンキホーテファミリーの一員','','Kid Buffalo'],
-    1291: ['ラオＧ 地翁拳の使い手','','Coliseum'],
-    1292: ['ラオＧ ディアマンテ軍幹部','','Coliseum'],
-    1293: ['ボア・サンダーソニア 九蛇の戦士','','Coliseum'],
-    1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女','','Coliseum'],
+    1291: ['ラオＧ 地翁拳の使い手','','Coliseum Lao G'],
+    1292: ['ラオＧ ディアマンテ軍幹部','','Coliseum Lao G'],
+    1293: ['ボア・サンダーソニア 九蛇の戦士','','Coliseum Sandersonia','Coliseum Boa Sandersonia'],
+    1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女','','Coliseum Sandersonia','Coliseum Boa Sandersonia'],
     1295: ['カリファ　グラマラスミイラ','','Halloween Kalifa'],
     1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード','','Halloween Kalifa'],
     1297: ['赤犬','','Raid Sakazuki'],
@@ -1307,10 +1307,10 @@ window.aliases = {
     1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','',''],
     1307: ['バルトロメオ　フルムーンウルフ','','Halloween Bartolomeo'],
     1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード','','Halloween Bartolomeo'],
-    1309: ['錦えもん','','Coliseum'],
-    1310: ['狐火の錦えもん','','Coliseum'],
-    1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum'],
-    1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女','','Coliseum'],
+    1309: ['錦えもん','','Coliseum Kinemon'],
+    1310: ['狐火の錦えもん','','Coliseum Kinemon'],
+    1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum Marigold','Coliseum Boa Marigold'],
+    1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女','','Coliseum Marigold','Coliseum Boa Marigold'],
     1313: ['赤犬 海軍本部最高戦力','','Sakazuki'],
     1314: ['サカズキ','','Akainu'],
     1315: ['海軍本部曹長　コビー “偉大なる航路”の海兵','',''],
@@ -1335,11 +1335,11 @@ window.aliases = {
     1334: ['ビアン','',''],
     1335: ['サボ 貴女との一幕','','Gentleman Sabo'],
     1336: ['サボ 劇場の怪人','','Gentleman Sabo'],
-    1337: ['カン十郎','','Coliseum'],
-    1338: ['夕立ち　カン十郎','','Coliseum'],
-    1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）','','Coliseum'],
-    1340: ['ゲダツ スカイピア神官','','Coliseum'],
-    1341: ['空番長　ゲダツ スカイピア神官','','Coliseum'],
+    1337: ['カン十郎','','Coliseum Kanjuro'],
+    1338: ['夕立ち　カン十郎','','Coliseum Kanjuro'],
+    1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）','','Coliseum Chopper','Coliseum Tony Tony Chopper'],
+    1340: ['ゲダツ スカイピア神官','','Coliseum Gedatsu'],
+    1341: ['空番長　ゲダツ スカイピア神官','','Coliseum Gedatsu'],
     1342: ['カーリー・ダダン','',''],
     1343: ['ポルシェーミ','',''],
     1344: ['ブルージャム','',''],
@@ -1398,9 +1398,9 @@ window.aliases = {
     1397: ['', '', 'Smoker'],
     1398: ['', '', 'Tashigi'],
     1399: ['', '', 'Tashigi'],
-    1400: ['', '', ''],
-    1401: ['', '', ''],
-    1402: ['', '', ''],
+    1400: ['', '', 'Coliseum Gladius'],
+    1401: ['', '', 'Coliseum Gladius'],
+    1402: ['', '', 'Coliseum Dalton'],
     1403: ['', '', ''],
     1404: ['', '', ''],
     1405: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index ae1b6145f..009a2b08f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3862,4 +3862,31 @@ window.captains = {
     1399: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
+    1400: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.275 :
+                p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
+                !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.3 :
+                1;
+        },
+    },
+    1401: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.625 :
+                p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
+                !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.5 :
+                1;
+        },
+    },
+    1403: {
+        atk: function(p){ 
+            return p.unit.class.has("Free Spirit") && window.specials[1403].turnedOn ? 4 : 2.5; 
+        },
+    },
+    1404: {
+        atk: function(p){ 
+            return p.unit.class.has("Free Spirit") && window.specials[1404].turnedOn ? 4 : 2.5; 
+        },
+    },
+    
 };
diff --git a/common/data/details.js b/common/data/details.js
index 2f6cc037b..da54ed6a7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7480,6 +7480,50 @@ window.details = {
         special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
         specialName: "Out-of-Control White Smoke",
     },
+    1400: {//Colo Gladius
+        captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.3x",
+        captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.275x bonus.",
+        special: [
+            {
+                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
+                "cooldown": 26,
+            },
+            {
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
+                "cooldown": 33,
+            },
+        ],
+        specialName: "Gladius Special",
+    },
+    1401: {//Colo Gladius
+        captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.5x",
+        captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.625x bonus.",
+        special: [
+            {
+                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
+                "cooldown": 26,
+            },
+            {
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
+                "cooldown": 33,
+            },
+        ],
+        specialName: "Gladius Special",
+    },
+    1402: {//Colo Dalton
+        captain: "",
+        special: [
+            {
+                "description": "Deals 3x character's ATK in [PSY] damage to one enemy, boosts the ATK of [PSY] characters by 1.3x for 1 turn",
+                "cooldown": 14,
+            },
+            {
+                "description": "Deals 13x character's ATK in [PSY] damage to one enemy, boosts the ATK of [PSY] characters by 1.5x for 1 turn",
+                "cooldown": 18,
+            },
+        ],
+        specialName: "Dalton Special",
+    },
     1403: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
         special: "Deal very large [QCK] damage to one enemy and [QCK], [DEX], and [PSY] orbs are treated as beneficial for 3 turns",
@@ -7495,7 +7539,6 @@ window.details = {
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
         specialName: "Usopp Special",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
-        
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
diff --git a/common/data/drops.js b/common/data/drops.js
index 8e1e11384..39265ac28 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1517,7 +1517,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1292, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402 ]
         },
         
         {
diff --git a/common/data/specials.js b/common/data/specials.js
index c224d10e8..7c4a7b954 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1899,4 +1899,30 @@ window.specials = {
         type: "class",
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.1); },
     },
+    1403: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1403].turnedOn = true;
+            p.scope.notify({
+                text: 'Only affects damage if Luffy is your captain',
+                name: '1403warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1403].turnedOn = false;
+        }
+    },
+    1404: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1404].turnedOn = true;
+            p.scope.notify({
+                text: 'Only affects damage if Luffy is your captain',
+                name: '1404warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1404].turnedOn = false;
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 80dfcfdf0..fe28ffaaf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1392,17 +1392,17 @@ window.units = [
     [ "Captain Buggy", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, 1 ],
     [ "Sentomaru, Wall of the Sabaody Archipelagos", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, 3000000, 166, 48, 33, 2805, 955, 201, 1 ],
     [ "Demalo Black", "INT", [ "Shooter", "Driven" ], 4, 15, 7, 1, 99, 3000000, 102, 105, 49, 1187, 688, 251, 1 ],
-    [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, 6, 2, 50, 392109, 164, 130, 40, null, null, null, null ],
     [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Tashigi Shambles", "DEX", [ "Striker", "Driven" ], 3, 11, 6, 1, 50, 392109, 103, 34, 23, 1034, 543, 113, 1 ],
     [ "Tashigi Shambles, 7 Foot Jitte", "DEX", [ "Striker", "Driven" ], 4, 19, 5, 3, 9, 3000000, 914, 463, 103, 2134, 1043, 231, 1 ],
     [ "Smoker Shambles", "QCK", [ "Slasher", "Cerebral" ], 3, 11, 6, 1, 50, 392109, 76, 26, 41, 886, 466, 186, 1 ],
     [ "Smoker Shambles, Shigure", "QCK", [ "Slasher", "Cerebral" ], 4, 19, 4, 3, 99, 3000000, 706, 416, 160, 1606, 910, 361, 1 ],
-    [ "Coliseum Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Gladius Evolved", "STR", [ "Driven", "Shooter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, null, 4, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, null, 5, 99, 5000000, null, null, null, null, null, null, null ],
     [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1412,7 +1412,7 @@ window.units = [
     [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ray Shop Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Naked Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From de62ccb7bd97f9e974fbf1329f7c54fd1473b525 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Dec 2016 01:02:26 -0500
Subject: [PATCH 0735/1569] Added Dalton and null values as temps

---
 common/data/details.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index da54ed6a7..f3e91f64e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7486,11 +7486,11 @@ window.details = {
         special: [
             {
                 "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
-                "cooldown": 26,
+                "cooldown": [ 26, null ],
             },
             {
                 "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
-                "cooldown": 33,
+                "cooldown": [ 33, null ],
             },
         ],
         specialName: "Gladius Special",
@@ -7501,25 +7501,25 @@ window.details = {
         special: [
             {
                 "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
-                "cooldown": 26,
+                "cooldown": [ 26, null ],
             },
             {
                 "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
-                "cooldown": 33,
+                "cooldown": [ 33, null ],
             },
         ],
         specialName: "Gladius Special",
     },
     1402: {//Colo Dalton
-        captain: "",
+        captain: "Not Translated",
         special: [
             {
                 "description": "Deals 3x character's ATK in [PSY] damage to one enemy, boosts the ATK of [PSY] characters by 1.3x for 1 turn",
-                "cooldown": 14,
+                "cooldown": [ 14, null ],
             },
             {
                 "description": "Deals 13x character's ATK in [PSY] damage to one enemy, boosts the ATK of [PSY] characters by 1.5x for 1 turn",
-                "cooldown": 18,
+                "cooldown": [ 18, null ],
             },
         ],
         specialName: "Dalton Special",

From b39d131510650fd3289cc8621185a8ebac5f45df Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Dec 2016 01:11:57 -0500
Subject: [PATCH 0736/1569] I added new lines, and removed them

Maybe it'll fix some things?
---
 common/data/details.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f3e91f64e..0133ea88a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7594,7 +7594,5 @@ window.details = {
         special: "Changes own orb into [INT] and reduce the special cooldown of Powerhouse characters by 1 turn.",
         specialName: "Sanji Special",
     },
-    
-    
 };
 

From ba56bdb51f0235a9a379bf601b2588fa30cdc679 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Dec 2016 01:36:26 -0500
Subject: [PATCH 0737/1569] couple typos

Thanks Zeen
---
 common/data/details.js | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 0133ea88a..84bdadd8c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5313,13 +5313,13 @@ window.details = {
     1084: {
         captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-        specialNote: "Does not stack with other 'end of turn damage' abilities",
+        specialNotes: "Does not stack with other 'end of turn damage' abilities",
         specialName: "Gravito: Heavens Fall"
     },
     1085: {
         captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-        specialNote: "Does not stack with other 'end of turn damage' abilities",
+        specialNotes: "Does not stack with other 'end of turn damage' abilities",
         specialName: "Gravito: Heavens Fall"
     },
     1086: {
@@ -7462,12 +7462,12 @@ window.details = {
     },
     1396: {//Tashigi Shambles
         captain: "Boosts ATK of Driven characters by 1.75x and the HP of Striker Characters by 1.25x",
-        special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all by 80% and delays all enemies for 1 turn",
+        special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
     },
     1397: {//Tashigi Shambles
         captain: "Boosts ATK of Driven characters by 2x and the HP of Striker Characters by 1.5x",
-        special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all by 80% and delays all enemies for 1 turn",
+        special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
     },
     1398: {//Smoker Shambles
@@ -7526,23 +7526,27 @@ window.details = {
     },
     1403: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
-        special: "Deal very large [QCK] damage to one enemy and [QCK], [DEX], and [PSY] orbs are treated as beneficial for 3 turns",
+        captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
+        special: "Deal large [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
         specialName: "Gomu Gomu no Red Hawk",
     },
     1404: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
-        special: "Deal very large [QCK] damage to one enemy and [QCK], [DEX], and [PSY] orbs are treated as beneficial for 3 turns",
+        captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
+        special: "Deal large [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
         specialName: "Gomu Gomu no Red Hawk",
     },
     1405: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "This is a new form of Conditional Boost",
         specialName: "Usopp Special",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "This is a new form of Conditional Boost",
         specialName: "Usopp Special",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },
@@ -7550,43 +7554,43 @@ window.details = {
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Robin Special",
-        sailor: "Reduces duration of Blindness by 3 turns"
+        sailor: "Reduces duration of Blindness by 3 turns",
     },
     1408: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Robin Special",
-        sailor: "Reduces duration of Blindness by 3 turns"
+        sailor: "Reduces duration of Blindness by 3 turns",
     },
     1409: {//Timeskip Brook
         captain: "Protects from defeat as long as HP is above x%",
-        special: "Delay all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
+        special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Brook Special",
         sailor: "Completely resists Paralysis on this character",
     },
     1410: {//Timeskip Brook
         captain: "Protects from defeat as long as HP is above x%",
-        special: "Delay all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
+        special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Brook Special",
         sailor: "Completely resists Paralysis on this character",
     },
     1411: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
-        special: "Reduce enemies damage reduction and increase defense duration by 3 turns and deals extra large typeless damage to all enemies",
-        specialnotes: "This does not affect threshold damage reduction",
+        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals extra large typeless damage to all enemies",
+        specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
         specialName: "Chopper Special",
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1412: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
-        special: "Reduce enemies damage reduction and increase defense duration by 3 turns and deals extra large typeless damage to all enemies",
-        specialnotes: "This does not affect threshold damage reduction",
+        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals extra large typeless damage to all enemies",
+        specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
         specialName: "Chopper Special",
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1413: {//6+ Whitebeard
-        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise",
-        special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all specials by 1 turn.",
+        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by ?x",
+        special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all specials by 1 turn, and randomizes non-matching orbs.",
         specialName: "Seaquake",
     },
     1414: {//Shop Sanji

From a170a1babfc2e280b5f5780c7061b6e7fbb1c04e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 28 Dec 2016 01:49:11 -0600
Subject: [PATCH 0738/1569] Temp Luffy Numbers

and set ship default level to 10
---
 common/data/captains.js | 3 ++-
 common/data/specials.js | 4 ++--
 common/data/units.js    | 2 +-
 damage/js/app.js        | 6 +++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 009a2b08f..681ce8fb1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3881,11 +3881,12 @@ window.captains = {
     1403: {
         atk: function(p){ 
             return p.unit.class.has("Free Spirit") && window.specials[1403].turnedOn ? 4 : 2.5; 
+            
         },
     },
     1404: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") && window.specials[1404].turnedOn ? 4 : 2.5; 
+              return p.unit.class.has("Free Spirit") ? (window.specials[1404].turnedOn ? 4 : 2.5) : 1;
         },
     },
     
diff --git a/common/data/specials.js b/common/data/specials.js
index 7c4a7b954..d7556744c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1904,7 +1904,7 @@ window.specials = {
         onActivation: function(p) {
             window.specials[1403].turnedOn = true;
             p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain',
+                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage.',
                 name: '1403warning'
             });
         },
@@ -1917,7 +1917,7 @@ window.specials = {
         onActivation: function(p) {
             window.specials[1404].turnedOn = true;
             p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain',
+                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage.',
                 name: '1404warning'
             });
         },
diff --git a/common/data/units.js b/common/data/units.js
index fe28ffaaf..d749c7cf5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1402,7 +1402,7 @@ window.units = [
     [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, null, 4, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, null, 5, 99, 5000000, null, null, null, null, null, null, null ],
+    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3000, 1500, 1, null ],
     [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/app.js b/damage/js/app.js
index 1c26c4e88..40cbd309d 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -9,7 +9,7 @@ var app = angular.module('optc', [ 'ui.router', 'ui.bootstrap', 'ngSanitize', 'n
 var SharedRootCtrl = function($scope, $rootScope, $timeout) {
 
     $rootScope.data = {
-
+        //setting default values
         team: [
             { unit: null, level: -1, candies: { hp: 0, atk: 0, rcv: 0 } },
             { unit: null, level: -1, candies: { hp: 0, atk: 0, rcv: 0 } },
@@ -20,8 +20,8 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         ],
 
         percHP: 100.0,
-
-        ship: [ 1, 5 ],
+        
+        ship: [ 1, 10 ],
 
         defense: 0,
 

From 79fc788988c78b2febe73e32d54ee3c0165d9b38 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 28 Dec 2016 12:36:25 -0500
Subject: [PATCH 0739/1569] Captains and

---
 common/data/captains.js | 12 ++++++++++-
 common/data/details.js  | 24 +++++++++++-----------
 common/data/specials.js | 45 +++++++++++++++++++++++++++++++++++++++++
 common/data/units.js    |  8 ++++----
 4 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 681ce8fb1..19307b43e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3878,6 +3878,9 @@ window.captains = {
                 1;
         },
     },
+    1402: {
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 2 : 1; },
+    },
     1403: {
         atk: function(p){ 
             return p.unit.class.has("Free Spirit") && window.specials[1403].turnedOn ? 4 : 2.5; 
@@ -3889,5 +3892,12 @@ window.captains = {
               return p.unit.class.has("Free Spirit") ? (window.specials[1404].turnedOn ? 4 : 2.5) : 1;
         },
     },
-    
+    1405: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+    },
+    1406: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 84bdadd8c..4f44df2d6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7451,12 +7451,12 @@ window.details = {
         specialName: "Three Forked Tongue",
     },
     1394: {//Kimono Baby 5
-        captain: "Boosts ATK of [STR] and [QCK] characters by 2.25x an their RCV by 1.2x",
+        captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x an their RCV by 1.1x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
         specialName: "Nation's Ambition",
     },
     1395: {//Kimono Baby 5
-        captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x an their RCV by 1.1x",
+        captain: "Boosts ATK of [STR] and [QCK] characters by 2.25x an their RCV by 1.2x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
         specialName: "Nation's Ambition",
     },
@@ -7486,14 +7486,14 @@ window.details = {
         special: [
             {
                 "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
-                "cooldown": [ 26, null ],
+                "cooldown": [ 26, 11 ],
             },
             {
                 "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
-                "cooldown": [ 33, null ],
+                "cooldown": [ 33, 18 ],
             },
         ],
-        specialName: "Gladius Special",
+        specialName: "Stonewall Punk",
     },
     1401: {//Colo Gladius
         captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.5x",
@@ -7501,28 +7501,28 @@ window.details = {
         special: [
             {
                 "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
-                "cooldown": [ 26, null ],
+                "cooldown": [ 26, 11 ],
             },
             {
                 "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
-                "cooldown": [ 33, null ],
+                "cooldown": [ 33, 18 ],
             },
         ],
-        specialName: "Gladius Special",
+        specialName: "Stonewall Punk",
     },
     1402: {//Colo Dalton
-        captain: "Not Translated",
+        captain: "Boosts ATK of [PSY] and [QCK] characters by 2x",
         special: [
             {
-                "description": "Deals 3x character's ATK in [PSY] damage to one enemy, boosts the ATK of [PSY] characters by 1.3x for 1 turn",
+                "description": "Deals 3x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.3x for 1 turn",
                 "cooldown": [ 14, null ],
             },
             {
-                "description": "Deals 13x character's ATK in [PSY] damage to one enemy, boosts the ATK of [PSY] characters by 1.5x for 1 turn",
+                "description": "Deals 13x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.5x for 1 turn",
                 "cooldown": [ 18, null ],
             },
         ],
-        specialName: "Dalton Special",
+        specialName: "Offense Battle Axe",
     },
     1403: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
diff --git a/common/data/specials.js b/common/data/specials.js
index d7556744c..daf6a69da 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1899,6 +1899,51 @@ window.specials = {
         type: "class",
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.1); },
     },
+    1394: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
+    },
+    1395: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
+    },
+    1396: {
+        def: function(p) { return 0.2; }
+    },
+    1397: {
+        def: function(p) { return 0.2; }
+    },
+    1400: {
+        affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1400].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1400].multiplier == 1.5 ? 1 : 0);
+            window.specials[1400].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
+                name: '1400warning'
+            });
+        },
+    },
+    1401: {
+        affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1401].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1401].multiplier == 1.5 ? 1 : 0);
+            window.specials[1401].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
+                name: '1401warning'
+            });
+        },
+    },
+    1402: {
+        atk: function(p) { return p.unit.type == "PSY" ? window.specials[1402].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1402].multiplier == 1.3 ? 1 : 0);
+            window.specials[1402].multiplier = [1.3, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 1.5][n] + 'x Affinity boost. To switch to the ' + [1.5, 1.3][n] + 'x Affinity boost, disable and re-enable this special',
+                name: '1402warning'
+            });
+        },
+    },
     1403: {
         turnedOn: false,
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index d749c7cf5..8d699684c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1395,11 +1395,11 @@ window.units = [
     [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, 6, 2, 50, 392109, 164, 130, 40, null, null, null, null ],
     [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Tashigi Shambles", "DEX", [ "Striker", "Driven" ], 3, 11, 6, 1, 50, 392109, 103, 34, 23, 1034, 543, 113, 1 ],
-    [ "Tashigi Shambles, 7 Foot Jitte", "DEX", [ "Striker", "Driven" ], 4, 19, 5, 3, 9, 3000000, 914, 463, 103, 2134, 1043, 231, 1 ],
+    [ "Tashigi Shambles, 7 Foot Jitte", "DEX", [ "Striker", "Driven" ], 4, 19, 5, 3, 99, 3000000, 914, 463, 103, 2134, 1043, 231, 1 ],
     [ "Smoker Shambles", "QCK", [ "Slasher", "Cerebral" ], 3, 11, 6, 1, 50, 392109, 76, 26, 41, 886, 466, 186, 1 ],
     [ "Smoker Shambles, Shigure", "QCK", [ "Slasher", "Cerebral" ], 4, 19, 4, 3, 99, 3000000, 706, 416, 160, 1606, 910, 361, 1 ],
-    [ "Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, 7, 2, 70, null, null, null, null, null, null, null, null ],
+    [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, 4, 3, 99, 4000000, 986, 698, 86, 2188, 1419, 208, null ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, null, 4, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3000, 1500, 1, null ],
@@ -1411,7 +1411,7 @@ window.units = [
     [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, null, null, null, null ],
     [ "Naked Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     

From ff8b704bebf4e0054bd5068ae8531e29aca485f9 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Dec 2016 23:24:27 -0500
Subject: [PATCH 0740/1569] Cooldowns

---
 common/data/cooldowns.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1c35ee1dc..c32ccb131 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1281,7 +1281,7 @@ window.cooldowns = [
     21,
     25,
     19,
-    25,
+    [ 25, 18 ],
     [ 12, 12 ],
     [ 12, 12 ],
     [ 18, 10 ],
@@ -1351,7 +1351,7 @@ window.cooldowns = [
     14,
     20,
     15,
-    16,
+    [ 16, 12 ],
     [ 14, 14 ],
     [ 14, 14 ],
     [ 18, 10 ],
@@ -1393,10 +1393,11 @@ window.cooldowns = [
     22,
     19,
     [ 10, 10 ],
+    [ 10, 10 ],
     [ 21, 14 ],
     [ 21, 14 ],
-    19,
-    19,
+    [ 19, 14 ],
+    [ 19, 14 ],
     null,
     null,
     null,

From bdc782f71cfc9e14ad846cc97c9f215aa788de6d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 31 Dec 2016 01:31:44 -0500
Subject: [PATCH 0741/1569] New units PogChamp

I fixed Luffy too btw
---
 common/data/captains.js   | 27 ++++++++++++---
 common/data/cooldowns.js  | 27 ++++++++-------
 common/data/details.js    | 69 ++++++++++++++++++++++++++-------------
 common/data/evolutions.js |  8 +++--
 common/data/specials.js   | 44 ++++++++++++++++++++++---
 common/data/units.js      | 22 ++++++-------
 common/data/zombies.js    |  8 +++++
 7 files changed, 147 insertions(+), 58 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 19307b43e..f30057488 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3883,13 +3883,13 @@ window.captains = {
     },
     1403: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") && window.specials[1403].turnedOn ? 4 : 2.5; 
+            return p.unit.class.has("Free Spirit") ? ((!window.specials[1403].turnedOn || (window.specials[1403].multiplier == null)) ? 2.5 : window.specials[1403].multiplier) : 1; 
             
         },
     },
     1404: {
         atk: function(p){ 
-              return p.unit.class.has("Free Spirit") ? (window.specials[1404].turnedOn ? 4 : 2.5) : 1;
+            return p.unit.class.has("Free Spirit") ? ((!window.specials[1404].turnedOn || (window.specials[1404].multiplier == null)) ? 2.5 : window.specials[1404].multiplier) : 1;
         },
     },
     1405: {
@@ -3897,7 +3897,26 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
     },
     1406: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+    },
+    1407: {
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.25 : 1; },
+    },
+    1408: {
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.5 : 1; },
+    },
+    1410: {
+        chainModifier: function(p) { return 2.5; }
+    },
+    1411: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        rcv: function(p) { return 0; }
+    },
+    1412: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; },
+        rcv: function(p) { return 0; }
     },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c32ccb131..b57bb1a2e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1398,20 +1398,19 @@ window.cooldowns = [
     [ 21, 14 ],
     [ 19, 14 ],
     [ 19, 14 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    null,//Colo Gladius
+    null,//Colo Gladius
+    null,//Colo Dalton
+    null,//New World Luffy
+    null,//New World Luffy
+    20,
+    20,
+    22,
+    22,
+    [ 16, 10 ],
+    [ 16, 10 ],
+    25,
+    25,
     [ 25, 17 ],
     [ 6, 6 ],
     
diff --git a/common/data/details.js b/common/data/details.js
index 4f44df2d6..3871c61da 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2626,12 +2626,12 @@ window.details = {
         specialName: "[RCV] Slot Storm"
     },
     612: {
-        special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
+        special: "Boosts ATK and RCV of all characters by 45 for 1 turn, reduces damage received by 45% for 1 turn",
         specialName: "45-Degree Joy",
         captain: "Boosts ATK of Slasher characters by 1.5x"
     },
     613: {
-        special: "Boosts ATK and RCV of all characters by 45 characters for 1 turn, reduces damage received by 45% for 1 turn",
+        special: "Boosts ATK and RCV of all characters by 45 for 1 turn, reduces damage received by 45% for 1 turn",
         specialName: "45-Degree Joy",
         captain: "Boosts ATK, HP and RCV of Slasher characters by 1.5x"
     },
@@ -7000,6 +7000,7 @@ window.details = {
             },
         ],
         specialName: "The Work of Fairies",
+        specialNotes: "#{colorAffinity : 1.25}",
     },
     1330: {//Gancho
         captain: "Boosts ATK of Striker characters by 1.5x and recovers 2x character's RCV in HP at the end of each turn",
@@ -7485,30 +7486,32 @@ window.details = {
         captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.275x bonus.",
         special: [
             {
-                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
+                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooters by 1.5x for 1 turn",
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
         specialName: "Stonewall Punk",
+        specialNotes: "#{colorAffinity : 1.75}",
     },
     1401: {//Colo Gladius
         captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.5x",
         captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.625x bonus.",
         special: [
             {
-                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts Color Affinity of Shooters by 1.5x for 1 turn",
+                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooters by 1.5x for 1 turn",
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts Color Affinity of Shooters by 1.75x for 1 turn",
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
         specialName: "Stonewall Punk",
+        specialNotes: "#{colorAffinity : 1.75}",
     },
     1402: {//Colo Dalton
         captain: "Boosts ATK of [PSY] and [QCK] characters by 2x",
@@ -7527,65 +7530,85 @@ window.details = {
     1403: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
-        special: "Deal large [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
+        special: [
+            {
+                "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 1 turn",
+                "cooldown": [ 14, null ],
+            },
+            {
+                "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
+                "cooldown": [ 18, null ],
+            },
+        ],
         specialName: "Gomu Gomu no Red Hawk",
     },
     1404: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
-        special: "Deal large [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
+        special: [
+            {
+                "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 1 turn",
+                "cooldown": [ 14, null ],
+            },
+            {
+                "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
+                "cooldown": [ 18, null ],
+            },
+        ],
         specialName: "Gomu Gomu no Red Hawk",
     },
     1405: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost",
-        specialName: "Usopp Special",
+        specialName: "Meteor Shooting",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
-        captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
+        captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost",
-        specialName: "Usopp Special",
+        specialName: "Meteor Shooting",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },
     1407: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
-        specialName: "Robin Special",
+        specialName: "Mil Fleur: Gigantesco Mano Stomp",
         sailor: "Reduces duration of Blindness by 3 turns",
     },
     1408: {//Timeskip Robin
-        captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
+        captain: "Boosts ATK of [DEX] and [PSY] characters by 2.25x an their RCV by 1.5x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
-        specialName: "Robin Special",
+        specialName: "Mil Fleur: Gigantesco Mano Stomp",
         sailor: "Reduces duration of Blindness by 3 turns",
     },
     1409: {//Timeskip Brook
-        captain: "Protects from defeat as long as HP is above x%",
+        captain: "Protects from defeat as long as HP is above 30%",
+        captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Brook Special",
+        specialName: "Soul's Murder Soul: Soul Solid",
         sailor: "Completely resists Paralysis on this character",
     },
     1410: {//Timeskip Brook
-        captain: "Protects from defeat as long as HP is above x%",
+        captain: "Boosts chain multiplier by 2.5x. Protects from defeat as long as HP is above 30%",
+        captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Brook Special",
+        specialName: "Soul's Murder Soul: Soul Solid",
         sailor: "Completely resists Paralysis on this character",
     },
     1411: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
-        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals extra large typeless damage to all enemies",
+        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
-        specialName: "Chopper Special",
+        specialName: "Carving Hoof Palm: Coconut",
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1412: {//Timeskip Chopper Again
-        captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
-        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals extra large typeless damage to all enemies",
+        captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's RCV to 0",
+        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
-        specialName: "Chopper Special",
+        specialName: "Carving Hoof Palm: Coconut",
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1413: {//6+ Whitebeard
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 25f7ebdba..8f5e6e0a3 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2035,6 +2035,10 @@ window.evolutions = {
         evolution: 1332,
         evolvers: [ 116, 117, 81, 92, 103 ]
     },
+    1335: {
+        evolution: 1336,
+        evolvers: [ 117, 88, 94, 99, 104 ]
+    },
     1337: {
         evolution: 1338,
         evolvers: [ 118, 98, 98, 303, 267 ]
@@ -2125,11 +2129,11 @@ window.evolutions = {
     },
     1394: {
         evolution: 1395,
-        evolvers: [  ]
+        evolvers: [ 117, 118, 84, 85 ]
     },
     1396: {
         evolution: 1397,
-        evolvers: [ 177, 80, 91, 97, 102 ]
+        evolvers: [ 117, 80, 91, 97, 102 ]
     },
     1398: {
         evolution: 1399,
diff --git a/common/data/specials.js b/common/data/specials.js
index daf6a69da..b68664295 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1945,29 +1945,65 @@ window.specials = {
         },
     },
     1403: {
-        turnedOn: false,
         onActivation: function(p) {
+            var n = (window.specials[1403].multiplier == 3.16 ? 1 : 0);
             window.specials[1403].turnedOn = true;
+            window.specials[1403].multiplier = [3.16, 4][n];
             p.scope.notify({
-                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage.',
+                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
                 name: '1403warning'
             });
         },
         onDeactivation: function(p) {
             window.specials[1403].turnedOn = false;
         }
+        
     },
     1404: {
-        turnedOn: false,
         onActivation: function(p) {
+            var n = (window.specials[1404].multiplier == 3.16 ? 1 : 0);
             window.specials[1404].turnedOn = true;
+            window.specials[1404].multiplier = [3.16, 4][n];
             p.scope.notify({
-                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage.',
+                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
                 name: '1404warning'
             });
         },
         onDeactivation: function(p) {
             window.specials[1404].turnedOn = false;
         }
+        
+    },
+    1405: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
+    },
+    1406: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
+    },
+    1407: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 2 : 1; },
+        type: "type"
+    },
+    1408: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 2 : 1; },
+        type: "type"
+    },
+    1409: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
+    },
+    1410: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 8d699684c..43c727bcc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1393,7 +1393,7 @@ window.units = [
     [ "Sentomaru, Wall of the Sabaody Archipelagos", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, 3000000, 166, 48, 33, 2805, 955, 201, 1 ],
     [ "Demalo Black", "INT", [ "Shooter", "Driven" ], 4, 15, 7, 1, 99, 3000000, 102, 105, 49, 1187, 688, 251, 1 ],
     [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, 6, 2, 50, 392109, 164, 130, 40, null, null, null, null ],
-    [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, null, 920, 540, 149, null, null, null, null ],
     [ "Tashigi Shambles", "DEX", [ "Striker", "Driven" ], 3, 11, 6, 1, 50, 392109, 103, 34, 23, 1034, 543, 113, 1 ],
     [ "Tashigi Shambles, 7 Foot Jitte", "DEX", [ "Striker", "Driven" ], 4, 19, 5, 3, 99, 3000000, 914, 463, 103, 2134, 1043, 231, 1 ],
     [ "Smoker Shambles", "QCK", [ "Slasher", "Cerebral" ], 3, 11, 6, 1, 50, 392109, 76, 26, 41, 886, 466, 186, 1 ],
@@ -1401,17 +1401,17 @@ window.units = [
     [ "Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, 7, 2, 70, null, null, null, null, null, null, null, null ],
     [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, 4, 3, 99, 4000000, 986, 698, 86, 2188, 1419, 208, null ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, null, 4, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3000, 1500, 1, null ],
+    [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 313, 300, 70, 1422, 840, 210, null ],
+    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1369, 762, 168, 3080, 1550, 390, null ],
     [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Robin Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Brook", "INT", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, null, null, null, null ],
+    [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, 4, 4, 99, 4000000, 1147, 446, 144, 2712, 1144, 340, null ],
+    [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 182, 119, 33, null, null, null, null ],
+    [ "Timeskip Robin Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 1251, 1257, 403, null ],
+    [ "Timeskip Brook", "INT", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 220, 117, 27, null, null, null, null ],
+    [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1176, 482, 131, null, null, null, null ],
+    [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 233, 77, 34, 1362, 439, 170, null ],
+    [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1501, 170, null ],
+    [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, null ],
     [ "Naked Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 4c19ac4ab..73c60519b 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -303,4 +303,12 @@ window.zombies = {
         type: 'healer',
         multiplier: 1.5
     },
+    1409: { // New World Brook
+        type: 'zombie',
+        threshold: 0.3
+    },
+    1410: { // New World Brook
+        type: 'zombie',
+        threshold: 0.3
+    },
 };

From 92029c51a8dcce0f00f85495ca967bad21b809fc Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sat, 31 Dec 2016 05:11:40 -0500
Subject: [PATCH 0742/1569] GW Links and some fixes

---
 common/data/families.js |  1 +
 common/data/gw.js       | 14 ++++++++++++++
 common/data/units.js    |  4 ++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 36a3ff26e..7d610cf75 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1412,4 +1412,5 @@ window.families = [
     "Tony Tony Chopper",
     "Tony Tony Chopper",
     "Whitebeard",
+    "Sanji",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 92e12d542..76e5354c7 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1398,4 +1398,18 @@ window.gw=[
     47253,
     47254,
     47254,
+    47299,
+    47299,
+    47302,
+    47356,
+    47356,
+    47362,
+    47362,
+    47338,
+    47338,
+    47322,
+    47322,
+    47321,
+    47321,
+    5166,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 43c727bcc..4186fc3f9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1406,11 +1406,11 @@ window.units = [
     [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, 4, 4, 99, 4000000, 1147, 446, 144, 2712, 1144, 340, null ],
     [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 182, 119, 33, null, null, null, null ],
-    [ "Timeskip Robin Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 1251, 1257, 403, null ],
+    [ "Timeskip Robin Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 946, 479, 165, 2151, 1257, 403, null ],
     [ "Timeskip Brook", "INT", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 220, 117, 27, null, null, null, null ],
     [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1176, 482, 131, null, null, null, null ],
     [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 233, 77, 34, 1362, 439, 170, null ],
-    [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1501, 170, null ],
+    [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1499, 170, null ],
     [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, null ],
     [ "Naked Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];

From e5900d21ae16dc940e48144225b120c501c60d29 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sat, 31 Dec 2016 05:25:50 -0500
Subject: [PATCH 0743/1569] Whitebeard 6*+ Update

Captain and fixed details
---
 common/data/captains.js | 7 +++++++
 common/data/details.js  | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index f30057488..0d63b435e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3919,4 +3919,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; },
         rcv: function(p) { return 0; }
     },
+    1413: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1.75; },
+        hp: function(p) { return 1.2; }
+    },
+    1414: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 3871c61da..28709124f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7612,8 +7612,8 @@ window.details = {
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1413: {//6+ Whitebeard
-        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by ?x",
-        special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all specials by 1 turn, and randomizes non-matching orbs.",
+        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
+        special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs.",
         specialName: "Seaquake",
     },
     1414: {//Shop Sanji

From dbfd646e3300d71d65b6c4e4f90d2c2fd81d2cd8 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 3 Jan 2017 12:29:40 -0500
Subject: [PATCH 0744/1569] Some stats

new units still not on Official
---
 common/data/aliases.js |  8 ++++----
 common/data/details.js | 12 ++++++------
 common/data/flags.js   | 14 +++++++-------
 common/data/units.js   | 10 +++++-----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0ea446352..8e392e810 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1246,8 +1246,8 @@ window.aliases = {
     1245: ['モンキー・D・ルフィ マリンフォードに舞う“麦わら”','',''],
     1246: ['ポートガス・D・エース 処刑台の“火拳”','',''],
     1247: ['ポートガス・D・エース マリンフォードに舞う“火拳”','',''],
-    1248: ['マルコ 秋風にはためく襟元','',''],
-    1249: ['マルコ ほろ酔いの着崩れ','',''],
+    1248: ['マルコ 秋風にはためく襟元','','Kimono Marco'],
+    1249: ['マルコ ほろ酔いの着崩れ','','Kimono Marco'],
     1250: ['マルコ 白ひげ海賊団','','Coliseum Marco'],
     1251: ['マルコ　復活の炎 白ひげ海賊団','','Coliseum Marco'],
     1252: ['遊騎士ドーマ 白ひげ海賊団傘下','','Coliseum Doma'],
@@ -1263,8 +1263,8 @@ window.aliases = {
     1262: ['セニョール・ピンク “北の海”の闇','','Senor Pink', 'Young Senior Pink'],
     1263: ['ヴェルゴ “北の海”の海賊','','Young Vergo'],
     1264: ['ヴェルゴ “北の海”の闇','','Young Vergo'],
-    1265: ['エース 黄昏の道草','',''],
-    1266: ['エース 月下の艶肌','',''],
+    1265: ['エース 黄昏の道草','','Kimono Ace'],
+    1266: ['エース 月下の艶肌','','Kimono Ace'],
     1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','',''],
     1268: ['黒ひげ 黒ひげ海賊団船長','',''],
     1269: ['ラフィット','',''],
diff --git a/common/data/details.js b/common/data/details.js
index 28709124f..2b585bcd3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4375,11 +4375,11 @@ window.details = {
         specialName: "Rock Domination Wall",
         special: [
             {
-                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
+                "description": "Changes [EMPTY] and Badly Matching orbs into Matching orbs for Driven and Powerhouse characters. Cuts the current HP of all enemies by 10%",
                 "cooldown": [ 25, 11 ]
             },
             {
-                "description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
+                "description": "Changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 20%",
                 "cooldown": [ 31, 17 ]
             }
         ],
@@ -7059,12 +7059,12 @@ window.details = {
     },
     1337: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
-        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
+        special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
     },
     1338: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
-        special: "Changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs and [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs for Free Spirit and Striker characters.",
+        special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
     },
     1339: {//Chopper Jump Point
@@ -7528,7 +7528,7 @@ window.details = {
         specialName: "Offense Battle Axe",
     },
     1403: {//Timeskip Luffy
-        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
         special: [
             {
@@ -7543,7 +7543,7 @@ window.details = {
         specialName: "Gomu Gomu no Red Hawk",
     },
     1404: {//Timeskip Luffy
-        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead.",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
         special: [
             {
diff --git a/common/data/flags.js b/common/data/flags.js
index ec45aeccd..326512904 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -245,7 +245,7 @@ window.flags = {
     244: { global: 1 },
     245: { global: 1 },
     246: { global: 1 },
-    247: { global: 1, special: 1 },
+    247: { global: 1, special: 1, shop: 1 },
     248: { global: 1 },
     249: { global: 1 },
     250: { global: 1, rr: 1, rro: 1 },
@@ -574,7 +574,7 @@ window.flags = {
     573: { global: 1 },
     574: { global: 1 },
     575: { global: 1 },
-    576: { special: 1 },
+    576: { special: 1, shop: 1 },
     577: { rr: 1, rro: 1, global: 1 },
     578: { rr: 1, rro: 1, global: 1 },
     579: { global: 1, rr: 1, rro: 1, lrr: 1 },
@@ -856,7 +856,7 @@ window.flags = {
     858: { rr: 1, rro: 1, lrr: 1, global: 1 },
     859: { global: 1 },
     860: { global: 1 },
-    863: { special: 1, global: 1 },
+    863: { special: 1, global: 1, shop: 1 },
     864: { global: 1 },
     865: { global: 1 },
     869: { rr: 1, rro: 1, global: 1 },
@@ -1130,16 +1130,16 @@ window.flags = {
     1238: { rr: 1, rro: 1, global: 1 },
     1239: { rr: 1, rro: 1, global: 1 },
     1240: { rr: 1, rro: 1, global: 1 },
-    1248: { rr: 1, rro: 1, lrr: 1 },
-    1249: { rr: 1, rro: 1, lrr: 1 },
+    1248: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1249: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1259: { rr: 1, rro: 1, lrr: 1 },
     1260: { rr: 1, rro: 1, lrr: 1 },
     1261: { rr: 1, rro: 1, lrr: 1 },
     1262: { rr: 1, rro: 1, lrr: 1 },
     1263: { rr: 1, rro: 1, lrr: 1 },
     1264: { rr: 1, rro: 1, lrr: 1 },
-    1265: { rr: 1, rro: 1, lrr: 1 },
-    1266: { rr: 1, rro: 1, lrr: 1 },
+    1265: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1266: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1267: { rr: 1, rro: 1 },
     1268: { rr: 1, rro: 1 },
     1269: { rr: 1, rro: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 4186fc3f9..a111130af 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -861,7 +861,7 @@ window.units = [
     [ "War Hero Coby, Navy HQ Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 3, 99, 3000000, 1121, 500, 104, 2239, 1048, 261, 1 ],
     [ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
     [ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
-    [ "Snowy World Nami", "QCK", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
+    [ "Snowscape Nami", "QCK", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
     [ "Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
     [ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
     [ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Cerebral", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
@@ -1047,7 +1047,7 @@ window.units = [
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
     [ "Sabo, Revolutionary Army Chief of Staff", "DEX", [ "Free Spirit", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1228, 602, 142, 2484, 1325, 340, 1 ],
     [ "Nico Olvia", "PSY", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 50, 392109, 77, 29, 59, 883, 404, 274, 1 ],
-    [ "Nico Olvia, Arcaheologist of Ohara", "PSY", [ "Shooter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 800, 339, 223, 1602, 713, 461, 1 ],
+    [ "Nico Olvia, Archaeologist of Ohara", "PSY", [ "Shooter", "Cerebral" ], 4, 20, 4, 2, 99, 3000000, 800, 339, 223, 1602, 713, 461, 1 ],
     [ "Jaguar D. Saul", "PSY", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 173, 56, 29, 1353, 514, 157, 1 ],
     [ "Jaguar D. Saul, Navy HQ Vice Admiral", "PSY", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1278, 441, 110, 2448, 929, 236, 1 ],
     [ "Nico Robin, Girl of Ohara", "QCK", [ "Cerebral", "Fighter" ], 3, 9, 4, 2, 50, 392109, 38, 18, 94, 522, 273, 378, 1 ],
@@ -1403,16 +1403,16 @@ window.units = [
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 313, 300, 70, 1422, 840, 210, null ],
     [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1369, 762, 168, 3080, 1550, 390, null ],
-    [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, 4, 4, 99, 4000000, 1147, 446, 144, 2712, 1144, 340, null ],
     [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 182, 119, 33, null, null, null, null ],
     [ "Timeskip Robin Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 946, 479, 165, 2151, 1257, 403, null ],
     [ "Timeskip Brook", "INT", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 220, 117, 27, null, null, null, null ],
-    [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1176, 482, 131, null, null, null, null ],
+    [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1176, 482, 131, 2421, 1317, 329, null ],
     [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 233, 77, 34, 1362, 439, 170, null ],
     [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1499, 170, null ],
     [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, null ],
-    [ "Naked Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Naked Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 3000000, 557, 363, 32, 2276, 1200, 210, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 6263e08c0c321cef5fc2c51c1be9928008618c01 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 5 Jan 2017 22:58:22 -0500
Subject: [PATCH 0745/1569] New units dump

spam me with my mistakes
---
 common/data/aliases.js     | 32 ++++++++++++++++----------------
 common/data/cooldowns.js   |  4 ++--
 common/data/details.js     | 16 ++++++++--------
 common/data/drops.js       |  6 ++++++
 common/data/evolutions.js  | 10 +++++-----
 common/data/gw.js          |  1 +
 common/data/ships.js       |  8 ++++++++
 common/data/units.js       | 24 ++++++++++++------------
 common/js/nonSuspicious.js |  2 +-
 index.html                 | 10 +++++-----
 10 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 8e392e810..4b73bb1ec 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1394,23 +1394,23 @@ window.aliases = {
     1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
     1394: ['', '', 'Kimono Baby 5'],
     1395: ['', '', 'Kimono Baby 5'],
-    1396: ['', '', 'Smoker'],
-    1397: ['', '', 'Smoker'],
-    1398: ['', '', 'Tashigi'],
-    1399: ['', '', 'Tashigi'],
+    1396: ['たしぎ シャンブルズ', '', 'Smoker'],
+    1397: ['たしぎ　七尺十手 シャンブルズ', '', 'Smoker'],
+    1398: ['スモーカー シャンブルズ', '', 'Tashigi'],
+    1399: ['スモーカー　時雨 シャンブルズ', '', 'Tashigi'],
     1400: ['', '', 'Coliseum Gladius'],
     1401: ['', '', 'Coliseum Gladius'],
     1402: ['', '', 'Coliseum Dalton'],
-    1403: ['', '', ''],
-    1404: ['', '', ''],
-    1405: ['', '', ''],
-    1406: ['', '', ''],
-    1407: ['', '', ''],
-    1408: ['', '', ''],
-    1409: ['', '', ''],
-    1410: ['', '', ''],
-    1411: ['', '', ''],
-    1412: ['', '', ''],
-    1413: ['', '', ''],
-    1414: ['', '', ''],
+    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy'],
+    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy'],
+    1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp'],
+    1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp'],
+    1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin'],
+    1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin'],
+    1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook'],
+    1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook'],
+    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper'],
+    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper'],
+    1413: ['白ひげ 四皇', '', 'Mega Whitebeard'],
+    1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b57bb1a2e..9352918b8 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1405,8 +1405,8 @@ window.cooldowns = [
     null,//New World Luffy
     20,
     20,
-    22,
-    22,
+    [ 22, 16 ],
+    [ 22, 16 ],
     [ 16, 10 ],
     [ 16, 10 ],
     25,
diff --git a/common/data/details.js b/common/data/details.js
index 2b585bcd3..93d6ea690 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7532,12 +7532,12 @@ window.details = {
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
         special: [
             {
-                "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 1 turn",
-                "cooldown": [ 14, null ],
+                "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
+                "cooldown": [ 14, 9 ],
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
-                "cooldown": [ 18, null ],
+                "cooldown": [ 18, 13 ],
             },
         ],
         specialName: "Gomu Gomu no Red Hawk",
@@ -7547,12 +7547,12 @@ window.details = {
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
         special: [
             {
-                "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 1 turn",
-                "cooldown": [ 14, null ],
+                "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
+                "cooldown": [ 14, 9 ],
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
-                "cooldown": [ 18, null ],
+                "cooldown": [ 18, 13 ],
             },
         ],
         specialName: "Gomu Gomu no Red Hawk",
@@ -7561,14 +7561,14 @@ window.details = {
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost",
-        specialName: "Meteor Shooting",
+        specialName: "Assault Meteor Shower",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost",
-        specialName: "Meteor Shooting",
+        specialName: "Assault Meteor Shower",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },
     1407: {//Timeskip Robin
diff --git a/common/data/drops.js b/common/data/drops.js
index 39265ac28..7a579b7b7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1281,6 +1281,12 @@ window.drops = {
             "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
         },
         
+        {
+            name: "Marines! Sengoku the Fleet Admiral!",
+            thumb: null,
+            "All Difficulties": [ -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8f5e6e0a3..60542385d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2145,23 +2145,23 @@ window.evolutions = {
     },
     1403: {
         evolution: 1404,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 266, 301, 267 ]
     },
     1405: {
         evolution: 1406,
-        evolvers: [  ]
+        evolvers: [ 1180, 87, 98, 303, 103 ]
     },
     1407: {
         evolution: 1408,
-        evolvers: [  ]
+        evolvers: [ 1180, 117, 94, 302, 303 ]
     },
     1409: {
         evolution: 1410,
-        evolvers: [  ]
+        evolvers: [ 1180, 83, 88, 304, 104 ]
     },
     1411: {
         evolution: 13412,
-        evolvers: [  ]
+        evolvers: [ 1180, 118, 89, 95, 100 ]
     },
     261: {
         evolution: 1413,
diff --git a/common/data/gw.js b/common/data/gw.js
index 76e5354c7..8767e922b 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1412,4 +1412,5 @@ window.gw=[
     47321,
     47321,
     5166,
+    47389,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index f20c86358..4932299b9 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -301,5 +301,13 @@ window.ships = [
             return 1.5;
         },
     },
+    { // 25
+        name: 'Thousand Sunny: Coated',
+        thumb: 'null',
+        description: 'Boosts ATK by 1.5x. Special: reduces damage received by 50% for 1 turn (cooldown: 16 turns).',
+        atk: function(p) {
+            return [ 1.3, 1.3, 1.3, 1.3, 1.35, 1.35, 1.35, 1.4, 1.45, 1.5 ][p.boatLevel - 1];
+        }
+    },
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index a111130af..fc568eade 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1401,18 +1401,18 @@ window.units = [
     [ "Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, 7, 2, 70, null, null, null, null, null, null, null, null ],
     [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, 4, 3, 99, 4000000, 986, 698, 86, 2188, 1419, 208, null ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Luffy", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 313, 300, 70, 1422, 840, 210, null ],
-    [ "Timeskip Luffy Evolved", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1369, 762, 168, 3080, 1550, 390, null ],
-    [ "Timeskip Usopp", "PSY", "Shooter", 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Timeskip Usopp Evolved", "PSY", "Shooter", 5, 30, 4, 4, 99, 4000000, 1147, 446, 144, 2712, 1144, 340, null ],
-    [ "Timeskip Robin", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 182, 119, 33, null, null, null, null ],
-    [ "Timeskip Robin Evolved", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 946, 479, 165, 2151, 1257, 403, null ],
-    [ "Timeskip Brook", "INT", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 220, 117, 27, null, null, null, null ],
-    [ "Timeskip Brook Evolved", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1176, 482, 131, 2421, 1317, 329, null ],
-    [ "Timeskip Chopper", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 233, 77, 34, 1362, 439, 170, null ],
-    [ "Timeskip Chopper Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1499, 170, null ],
-    [ "6+ Whitebeard", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, null ],
-    [ "Naked Sanji", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 3000000, 557, 363, 32, 2276, 1200, 210, null ],
+    [ "Monkey D. Luffy, Gathering of the Straw Hats", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 313, 300, 70, 1422, 840, 210, 1 ],
+    [ "Monkey D. Luffy, Reunion of the Straw Hat Pirates", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1369, 762, 168, 3080, 1550, 390, 1 ],
+    [ "Usopp, Gathering of the Straw Hats", "PSY", "Shooter", 4, 15, 4, 3, 50, 392109, 255, 99, 31, 1201, 481, 182, 1 ],
+    [ "Usopp, Reunion of the Straw Hat Pirates", "PSY", "Shooter", 5, 30, 4, 4, 99, 4000000, 1147, 446, 144, 2712, 1142, 340, 1 ],
+    [ "Nico Robin, Gathering of the Straw Hats", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 182, 119, 33, 992, 524, 200, 1 ],
+    [ "Nico Robin, Reunion of the Straw Hat Pirates", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 946, 479, 165, 2151, 1257, 403, 1 ],
+    [ "Brook, Gathering of the Straw Hats", "INT", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 220, 117, 27, 1248, 532, 167, 1 ],
+    [ "Brook, Reunion of the Straw Hat Pirates", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1176, 482, 131, 2421, 1317, 329, 1 ],
+    [ "Tony Tony Chopper: Walk Point, Gathering of the Straw Hats", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 233, 77, 34, 1362, 439, 170, 1 ],
+    [ "Tony Tony Chopper: Monster Point, Reunion of the Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1499, 170, 1 ],
+    [ "Whitebeard: Four Emperors", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, 1 ],
+    [ "Sanji, Making Food and Drinks", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 3000000, 557, 363, 32, 2276, 1200, 210, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 40df9c880..dd486a4ee 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1380, 1384, 1376, 1374, 1355, 1362, 1386 ];
+    var newUnits = [ 1404, 1413, 1414, 1406, 1408, 1410, 1412 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index cff0e4629..f40928d21 100644
--- a/index.html
+++ b/index.html
@@ -64,15 +64,15 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>13/12/2016</p>
+            <p>5/1/2017</p>
             <br>
             <ul>
-                <li>Bartender Rayleigh Completed</li>
-                <li>Law Ship added to Calculator</li>
+                <li>Naked Calendar Sanji Completed</li>
+                <li>Coated Sunny Ship added to Calculator</li>
                 <br>
-                <li>Soldier-san's Training and Shanks Colo units added</li>
+                <li>Sengoku Fortnight and Gladius Colo units added</li>
                 <br>
-                <li>Christmas Tashigi added to Character Table</li>
+                <li>Kimono Baby 5 added to Character Table</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From 0dfaa81891692fd8b52b6e8c1552fe8a00ea3439 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 5 Jan 2017 23:03:13 -0500
Subject: [PATCH 0746/1569] Usopp details fixed

just more info on Usopp
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 93d6ea690..01fc4b9c7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7560,14 +7560,14 @@ window.details = {
     1405: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialNotes: "This is a new form of Conditional Boost",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialNotes: "This is a new form of Conditional Boost",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
     },

From 42f448dd489d14f45db9646b72d7a22f24dd6267 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 8 Jan 2017 05:01:46 -0500
Subject: [PATCH 0747/1569] New units, fixes in specials and abilities

---
 common/data/aliases.js    |  6 +++++
 common/data/details.js    | 46 ++++++++++++++++++++-------------------
 common/data/drops.js      |  6 +++--
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  6 +++++
 common/data/flags.js      |  2 ++
 common/data/units.js      |  6 +++++
 common/data/zombies.js    |  4 ++--
 8 files changed, 54 insertions(+), 26 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 4b73bb1ec..7f3d517cd 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1413,4 +1413,10 @@ window.aliases = {
     1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper'],
     1413: ['白ひげ 四皇', '', 'Mega Whitebeard'],
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
+    1415: ['', '', ''],
+    1416: ['', '', ''],
+    1417: ['', '', ''],
+    1418: ['', '', ''],
+    1419: ['', '', 'Kimono Lucci'],
+    1420: ['', '', 'Kimono Lucci'],
 };
diff --git a/common/data/details.js b/common/data/details.js
index 01fc4b9c7..0a8be7962 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1171,14 +1171,14 @@ window.details = {
         specialName: "Massacre Soldier",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
-        sailor: "When HP is below x%, boosts ATK of Cerebral characters by 50"
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 50"
     },
     312: {
         special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
         specialName: "Massacre Soldier",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK by 3.5x after scoring 3 hits below Good in a row",
-        sailor: "When HP is below x%, boosts ATK of Cerebral characters by 50"
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 50"
     },
     313: {
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
@@ -1388,13 +1388,13 @@ window.details = {
         special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
         specialName: "Gang Fortress",
         captain: "Boosts ATK and RCV of QCK characters by 2x",
-        sailor: "Boosts RCV of Crew by 10"
+        sailor: "Boosts RCV of all characters by 10"
     },
     365: {
         special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
         specialName: "Gang Fortress",
         captain: "Boosts ATK and RCV of QCK characters by 2x",
-        sailor: "Boosts RCV of Crew by 10"
+        sailor: "Boosts RCV of all characters by 10"
     },
     366: {
         special: "Deals 20x character's ATK in INT damage to all enemies, reduces Bind duration by 5 turns",
@@ -2213,13 +2213,13 @@ window.details = {
         special: "Removes poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 1.5x",
-        sailor: "When HP is below x%, boosts own RCV by 50"
+        sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
     },
     528: {
         special: "Removes poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 2x",
-        sailor: "When HP is below x%, boosts own RCV by 50"
+        sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
     },
     529: {
         special: "Deals 35x character's ATK in PSY damage to all enemies, reduces the defense of all enemies by 100% for 2 turns",
@@ -2763,14 +2763,14 @@ window.details = {
         specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Pirate Brothers: Twin Strike",
         captain: "Boosts ATK of Fighter characters by 2x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
-        sailor: "When HP is below x%, boosts ATK of Fighter characters by 100"
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK of Fighter characters by 100"
     },
     641: {
         special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
         specialNotes: "#{specialProportional : lower : 50 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Pirate Brothers: Twin Strike",
         captain: "Boosts ATK of Fighter characters by 2.25x, deals 2x character's ATK in DEX damage to all enemies at the end of each turn",
-        sailor: "When HP is below x%, boosts ATK of Fighter characters by 100"
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK of Fighter characters by 100"
     },
     642: {
         special: "Reduces crew's current HP by 30%, deals 10x character's ATK in fixed damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
@@ -5890,13 +5890,13 @@ window.details = {
         special: "Removes poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 1.5x",
-        sailor: "When HP is below x%, boosts own RCV by 50"
+        sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
     },
     1177: {
         special: "Removes poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 2x",
-        sailor: "When HP is below x%, boosts own RCV by 50"
+        sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
     },
     1178: {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
@@ -6469,7 +6469,7 @@ window.details = {
     1255: {//FN DeCalvan
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2x after the 16th hit, by 2.5x after the 22nd hit",
         special: "For 1 turn, makes Perfects slightly easier to hit and amplifies the effect of orbs by 1.5x",
-        sailor: "When HP is low, boost base ATK of Fighters by 40",
+        sailor: "When HP is below 30% at the start of the turn, boost base ATK of Fighters by 40",
         specialName: "Large Fleet Commander",
     },
     1256: {//FN Whitey Bay
@@ -6892,13 +6892,15 @@ window.details = {
     },
     1317: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2x",
-        special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
+        special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
         sailor: "Boosts ATK of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
-        special: "Deals 30x character's ATK as fixed [STR] damage to all enemies that bypasses all defensive Buffs. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
+        special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
         sailor: "Boosts ATK of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
@@ -7303,14 +7305,14 @@ window.details = {
     },
     1371: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
-        special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turn",
+        special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
         specialName: "Wild Plan",
     },
     1372: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect and by 3x after the 5th Perfect.",
-        special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turn",
+        special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
         specialName: "Wild Plan",
@@ -7559,17 +7561,17 @@ window.details = {
     },
     1405: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn if enemies have delay protection",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters against enemies with delay protection by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn if enemies have delay protection",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is low, boost ATK and RCV of Shooters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
     },
     1407: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
@@ -7584,14 +7586,14 @@ window.details = {
         sailor: "Reduces duration of Blindness by 3 turns",
     },
     1409: {//Timeskip Brook
-        captain: "Protects from defeat as long as HP is above 30%",
+        captain: "Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Soul's Murder Soul: Soul Solid",
         sailor: "Completely resists Paralysis on this character",
     },
     1410: {//Timeskip Brook
-        captain: "Boosts chain multiplier by 2.5x. Protects from defeat as long as HP is above 30%",
+        captain: "Boosts chain multiplier by 2.5x. Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Soul's Murder Soul: Soul Solid",
@@ -7618,7 +7620,7 @@ window.details = {
     },
     1414: {//Shop Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
-        special: "Changes own orb into [INT] and reduce the special cooldown of Powerhouse characters by 1 turn.",
+        special: "Changes own orb into [INT] and reduces Special Cooldown of Powerhouse characters by 1 turn.",
         specialName: "Sanji Special",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 7a579b7b7..2db83d0ab 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1278,13 +1278,15 @@ window.drops = {
         {
             name: "Shambles! Tashigi and Smoker?!?",
             thumb: 1397,
+            condition: "Your captain will be switched with your middle right character when you encounter Law.",
             "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
         },
         
         {
             name: "Marines! Sengoku the Fleet Admiral!",
-            thumb: null,
-            "All Difficulties": [ -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
+            thumb: 1416,
+            condition: "You can only bring INT units",
+            "All Difficulties": [ 1415, 1417, 1418, -1418, -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
         },
         
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 60542385d..e69d050b0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2167,4 +2167,8 @@ window.evolutions = {
         evolution: 1413,
         evolvers: [  ]
     },
+    1415: {
+        evolution: 1416,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 7d610cf75..d32ab7aaa 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1413,4 +1413,10 @@ window.families = [
     "Tony Tony Chopper",
     "Whitebeard",
     "Sanji",
+    "Sengoku",
+    "Sengoku",
+    "Ronse",
+    "Stainless",
+    "Rob Lucci",
+    "Rob Lucci",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 326512904..4afb16a77 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1204,4 +1204,6 @@ window.flags = {
     1411: { rr: 1, rro: 1 },
     1412: { rr: 1, rro: 1 },
     1414: { shop: 1 },
+    1419: { rr: 1, rro: 1, lrr: 1, },
+    1420: { rr: 1, rro: 1, lrr: 1, },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index fc568eade..e22ee0daf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1413,6 +1413,12 @@ window.units = [
     [ "Tony Tony Chopper: Monster Point, Reunion of the Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1499, 170, 1 ],
     [ "Whitebeard: Four Emperors", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, 1 ],
     [ "Sanji, Making Food and Drinks", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 3000000, 557, 363, 32, 2276, 1200, 210, 1 ],
+    [ "Fortnight Sengoku", "PSY", [ "Fighter", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Sengoku, Evolved", "PSY", [ "Fighter", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ronse", "STR", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Stainless", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 73c60519b..a37c89e1d 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -305,10 +305,10 @@ window.zombies = {
     },
     1409: { // New World Brook
         type: 'zombie',
-        threshold: 0.3
+        threshold: 0.5
     },
     1410: { // New World Brook
         type: 'zombie',
-        threshold: 0.3
+        threshold: 0.5
     },
 };

From ca82ae63add65e4bae78b90bd28252d5a0994e55 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 9 Jan 2017 21:41:54 -0500
Subject: [PATCH 0748/1569] Cavedish Fix and Replacement Units Books added

thats about it
---
 common/data/details.js  | 12 +++++------
 common/data/drops.js    | 44 +++++++++++++++++++++--------------------
 common/data/flags.js    | 28 +++++++++++++++-----------
 common/data/specials.js |  8 ++++----
 4 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 0a8be7962..8af23cc65 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5038,11 +5038,11 @@ window.details = {
         specialName: "Gamma Knife",
         special: [
             {
-                "description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+                "description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x character's ATK in fixed PSY damage to one enemy.",
                 "cooldown": [ 18, 13 ]
             },
             {
-                "description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
+                "description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x character's ATK in fixed PSY damage to one enemy.",
                 "cooldown": [ 25, 20 ]
             }
         ],
@@ -5053,11 +5053,11 @@ window.details = {
         specialName: "Gamma Knife",
         special: [
             {
-                "description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x his ATK in PSY damage to one enemy.",
+                "description": "Makes Damage and Health Cutting Specials of Slasher and Free Spirit characters bypass all defensive Buffs, deals 20x character's ATK in fixed PSY damage to one enemy.",
                 "cooldown": [ 18, 13 ]
             },
             {
-                "description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x his ATK in PSY damage to one enemy.",
+                "description": "Makes Damage and Health Cutting Specials of all characters bypass all defensive Buffs, deals 50x character's ATK in fixed PSY damage to one enemy.",
                 "cooldown": [ 25, 20 ]
             }
         ],
@@ -5550,14 +5550,14 @@ window.details = {
     1122: {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 2.25x for 2 turns, amplifies the effect of Cavendish's orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
         specialName: "Slicing Winds of Rommel"
     },
     1123: {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 1.75x for 2 turns, amplifies the effect of Cavendish's orb by 1.75x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 2.25x for 2 turns, amplifies the effect of Cavendish's orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
         specialName: "Slicing Winds of Rommel"
     },
diff --git a/common/data/drops.js b/common/data/drops.js
index 2db83d0ab..15bd3d50e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -980,7 +980,7 @@ window.drops = {
             thumb: 664,
             global: true,
             condition: 'Heatwave causes damage every 2 turns',
-            "Japan": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73 ],
+            "Japan": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73, -1117 ],
             "Global": [ 663, 665, 667, -667, -639, -508, -506, -459, -378, -221, -73 ]
         },
 
@@ -989,7 +989,7 @@ window.drops = {
             thumb: 688,
             global: true,
             condition: 'Bomb orbs appear',
-            "Japan": [ 687, 689, -542, -524, -528, -429, -428, -402, -365, -218 ],
+            "Japan": [ 687, 689, -542, -524, -528, -429, -428, -402, -365, -218, -1119, -1177 ],
             "Global": [ 687, 689, -542, -645, -647, -429, -428, -402, -365, -218 ]
         },
 
@@ -1000,7 +1000,7 @@ window.drops = {
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Lock Resistance Forbidden Tome, 2x Rainbow Gems']],
-            "Japan": [ 712, 714, 715, -716, -546, -541, -520, -400, -202, -363, -204 ],
+            "Japan": [ 712, 714, 715, -716, -546, -541, -520, -1115, -400, -202, -363, -204 ],
             "Global": [ 712, 714, 715, -716, -643, -546, -541, -400, -202, -363, -204 ]
         },
 
@@ -1009,7 +1009,7 @@ window.drops = {
             thumb: 724,
             global: true,
             condition: 'You can only bring INT, PSY and QCK units',
-            "Japan": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219 ],
+            "Japan": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219, -1173 ],
             "Global": [ 721, 723, -590, -564, -563, -530, -641, -384, -361, -219 ]
         },
 
@@ -1018,7 +1018,7 @@ window.drops = {
             thumb: 743,
             global: true,
             condition: 'You can only bring STR, QCK and DEX units',
-            "Japan": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18 ],
+            "Japan": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18, -1208, -1212 ],
             "Global": [ 740, 742, -671, -673, -586, -567, -566, -412, -225, -18 ]
         },
 
@@ -1027,7 +1027,7 @@ window.drops = {
             thumb: 761,
             global: true,
             condition: "None",
-            "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217 ],
+            "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217, -1210 ],
             "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
         },
 
@@ -1036,7 +1036,7 @@ window.drops = {
             thumb: 766,
             global: true,
             condition: "None",
-            "Japan": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223 ],
+            "Japan": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223, -1175 ],
             "Global": [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
         },
 
@@ -1067,8 +1067,8 @@ window.drops = {
             condition: 'You can only bring Impact and Free Spirit units. (No Evo/Boosters)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
-            "Japan": [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455 ],
-            "Global": [ 847, 849, 850, -849, -750, -617, -616, -615, -578, -508, -455 ]
+            "Japan": [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455, -1121 ],
+            "Global": [ 847, 849, 850, -849, -750, -617, -616, -615, -578, -508, -455, -1121 ]
         },
 
         {
@@ -1101,7 +1101,7 @@ window.drops = {
             name: "Mountaintop Banquet! Enter the Generals!",
             thumb: 897,
             condition: 'Only STR/DEX/QCK/PSY/INT orbs will appear',
-            "All Difficulties": [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464 ]
+            "All Difficulties": [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464, -1177 ]
         },
 
         {
@@ -1109,7 +1109,7 @@ window.drops = {
             thumb: 918,
             global: true,
             condition: 'You can only bring DEX units',
-            "All Difficulties": [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522 ]
+            "All Difficulties": [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522, -1117 ]
         },
         
         {
@@ -1117,14 +1117,16 @@ window.drops = {
             thumb: 929,
             global: true,
             condition: 'You can only bring STR units',
-            "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506 ]
+            "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506, -1115 ]
         },
         
         {
             name: "Encounter! Whitebeard Pirates",
             thumb: 946,
+            global: true,
             condition: "You can only bring PSY units",
-            "All Difficulties": [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738]
+            "Japan": [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738, -1173 ],
+            "Global": [ 946, 947, 948, 949, -718, -524, -1119, -528, -1177, -526, -793, -735, -546, -738, -1173 ]
         },
         
         {
@@ -1133,14 +1135,14 @@ window.drops = {
             condition: "You can only bring INT units",
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['420,000','1x HP Cotton Candy, 1x Rainbow Gem'],['700,000','2x Rainbow Gems, 1x Orb Forbidden Tome']],
-            "All Difficulties": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563 ]
+            "All Difficulties": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563, -1119 ]
         },
         
         {
             name: "Let's Find Our Captain! Heart Pirates!",
             condition: "You can only bring QCK units",
             thumb: 1003,
-            "All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564 ]
+            "All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564, -1208 ]
         },
         
         {
@@ -1149,21 +1151,21 @@ window.drops = {
             condition: "None",
             global: true,
             "Global": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -812, -565 ],
-            "Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565 ]
+            "Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565, -1212 ]
         },
         
         {
             name: "Temptation!? The Queen of Kamabakka Queendom!",
             thumb: 1037,
             condition: "Only DEX/RCV/TND orbs will appear",
-            "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566]
+            "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566, -1175 ]
         },
         
         {
             name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
             thumb: 1049,
             condition: "Only TND/RCV/INT orbs will appear",
-            "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908]
+            "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908, -1210 ]
         },
         
         {
@@ -1204,7 +1206,7 @@ window.drops = {
             thumb: 1167,
             global: true,
             condition: "None",
-            "All Difficulties": [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703 ]
+            "All Difficulties": [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703, -1121 ]
         },
         
         {
@@ -1440,7 +1442,7 @@ window.drops = {
             name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
             thumb: 989,
-            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -556, -528, -520, -554, -558, -20, -217, -709]
+            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -556, -528, -520, -554, -558, -20, -217, -709, -1115, -1177, -1175, -1210, -1208 ]
         },
         
         {
@@ -1539,7 +1541,7 @@ window.drops = {
             name: 'Rescue Ace Event - Aokiji',
             thumb: 1280,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "All Difficulties": [ -416, -459, -530, -669, -578 ]
+            "All Difficulties": [ -416, -459, -530, -669, -578, -1121 ]
         },
         
         {
diff --git a/common/data/flags.js b/common/data/flags.js
index 4afb16a77..392f099c8 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -923,6 +923,10 @@ window.flags = {
     943: { rr: 1, rro: 1, global: 1 },
     944: { rr: 1, rro: 1, lrr: 1, global: 1 },
     945: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    946: { global: 1 },
+    947: { global: 1 },
+    948: { global: 1 },
+    949: { global: 1 },
     950: { global: 1 },
     951: { global: 1 },
     952: { global: 1 },
@@ -1090,18 +1094,18 @@ window.flags = {
     1177: { rr: 1, rro: 1, global: 1 },
     1178: { shop: 1 },
     1179: { shop: 1 },
-    1181: { rr: 1, rro: 1 },
-    1182: { rr: 1, rro: 1 },
-    1183: { rr: 1, rro: 1 },
-    1184: { rr: 1, rro: 1 },
-    1185: { rr: 1, rro: 1 },
-    1186: { rr: 1, rro: 1 },
-    1187: { rr: 1, rro: 1 },
-    1188: { rr: 1, rro: 1 },
-    1189: { rr: 1, rro: 1 },
-    1190: { rr: 1, rro: 1 },
-    1191: { rr: 1, rro: 1 },
-    1192: { rr: 1, rro: 1 },
+    1181: { rr: 1, rro: 1, global: 1 },
+    1182: { rr: 1, rro: 1, global: 1 },
+    1183: { rr: 1, rro: 1, global: 1 },
+    1184: { rr: 1, rro: 1, global: 1 },
+    1185: { rr: 1, rro: 1, global: 1 },
+    1186: { rr: 1, rro: 1, global: 1 },
+    1187: { rr: 1, rro: 1, global: 1 },
+    1188: { rr: 1, rro: 1, global: 1 },
+    1189: { rr: 1, rro: 1, global: 1 },
+    1190: { rr: 1, rro: 1, global: 1 },
+    1191: { rr: 1, rro: 1, global: 1 },
+    1192: { rr: 1, rro: 1, global: 1 },
     1193: { rr: 1, rro: 1, lrr: 1 },
     1194: { rr: 1, rro: 1, lrr: 1 },
     1207: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index b68664295..6c457cb1f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1413,14 +1413,14 @@ window.specials = {
         type: "type" 
     },
     1122: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
     },
     1123: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },

From 35dabf40342493cc735a81e5229ad64a20775bfe Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 9 Jan 2017 22:56:27 -0500
Subject: [PATCH 0749/1569] New units

---
 common/data/details.js | 28 ++++++++++++++++++++++++----
 common/data/units.js   |  4 ++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8af23cc65..034d93aa0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4757,11 +4757,11 @@ window.details = {
         special: [
             {
                 "description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
-                "cooldown": 11
+                "cooldown": [ 11, 5 ]
             },
             {
                 "description": "For all characters, changes Bad orbs into matching orbs.",
-                "cooldown": 20
+                "cooldown": [ 20, 14 ]
             }
         ],
         specialName: "Decapitation High Heel",
@@ -4773,11 +4773,11 @@ window.details = {
         special: [
             {
                 "description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
-                "cooldown": 11
+                "cooldown": [ 11, 5 ]
             },
             {
                 "description": "For all characters, changes Bad orbs into matching orbs.",
-                "cooldown": 20
+                "cooldown": [ 20, 14 ]
             }
         ],
         specialName: "Decapitation High Heel",
@@ -7623,5 +7623,25 @@ window.details = {
         special: "Changes own orb into [INT] and reduces Special Cooldown of Powerhouse characters by 1 turn.",
         specialName: "Sanji Special",
     },
+    1415: {//Fortnight Sengoku
+        captain: "Boost ATK of characters with cost 30 or less by 1.5x",
+        special: "Reduces Special Cooldown of all characters by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
+        specialName: "Sengoku Special",
+    },
+    1416: {//Fortnight Sengoku
+        captain: "Boost ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
+        special: "Reduces Special Cooldown of all characters by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
+        specialName: "Sengoku Special",
+    },
+    1417: {//Ronse
+        captain: "Boosts ATK and HP of [STR] characters by 1.5x",
+        special: "Cuts the current HP of all enemies by 10%, changes [BLOCK] orbs into [STR] orbs for [STR] characters",
+        specialName: "Ronse Special",
+    },
+    1418: {//Stainless
+        captain: "Not Translated",
+        special: "Not Translated",
+        specialName: "Stainless Special",
+    },
 };
 
diff --git a/common/data/units.js b/common/data/units.js
index e22ee0daf..9ce0980da 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1246,7 +1246,7 @@ window.units = [
     [ "'Straw Hat' Monkey D Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
     [ "'Fire Fist' Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
     [ "'Fire Fist' Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
-    [ "Marco, Fluttering in Neck the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
+    [ "Marco, Collar Fluttering in the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
     [ "Marco, Tipsy Kimono", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
     [ "Marco, Whitebeard Pirates", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
@@ -1418,7 +1418,7 @@ window.units = [
     [ "Ronse", "STR", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Stainless", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, null, null, null, null, 2299, 1333, 152, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 5e3de254a5efdf6e87fe1615a2fab51d28ff7700 Mon Sep 17 00:00:00 2001
From: John <nguyen3@ualberta.ca>
Date: Mon, 9 Jan 2017 23:09:26 -0700
Subject: [PATCH 0750/1569] added character popover to probability page, still
 needs styling

---
 probability/index.html                   |  2 ++
 probability/js/controllers.js            | 26 +++++++++++++++++++++++-
 probability/views/fragments/popover.html | 22 ++++++++++++++++++++
 probability/views/main.html              |  5 ++++-
 4 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 probability/views/fragments/popover.html

diff --git a/probability/index.html b/probability/index.html
index 67a39c4b6..7a4e90656 100644
--- a/probability/index.html
+++ b/probability/index.html
@@ -38,6 +38,8 @@
 
         <script src="../common/data/units.js"></script>
         <script src="../common/data/aliases.js"></script>
+        <script src="../common/data/details.js"></script>
+        <script src="../common/data/cooldowns.js"></script>
         <script src="../common/data/abilities.js"></script>
 
         <script src="../common/js/utils.js"></script>
diff --git a/probability/js/controllers.js b/probability/js/controllers.js
index 23e2492f5..cd926dd6d 100644
--- a/probability/js/controllers.js
+++ b/probability/js/controllers.js
@@ -104,7 +104,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 	};
 	
     $rootScope.changeUnit = function(unit, uid) {
-        $scope.character = { uid: uid, slots: [ ] };
+        $scope.character = { uid: uid, slots: [ ], name: $scope.returnName(uid) };
 		$scope.slots = $scope.slotCount(uid);
     };
 
@@ -118,6 +118,11 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
         if (!uid) return 0;
         return units[uid - 1].slots;
     };
+    
+    $scope.returnName = function(uid) {
+    	if (!uid) return;
+    	return units[uid - 1].name;
+    };
 
     $scope.onRemove = function(i) {
         $rootScope.character = null;
@@ -250,6 +255,25 @@ controllers.InstructionCtrl = function() {
     //Do nothing
 };
 
+/***************
+ * PopoverCtrl *
+ ***************/
+
+controllers.PopoverCtrl = function($scope) {
+    if (!$scope.character) return;
+    var id = $scope.character.uid;
+    $scope.details = window.details[id] ? JSON.parse(JSON.stringify(window.details[id])) : null;
+    $scope.cooldown = window.cooldowns[id - 1];
+    if (!$scope.details || !$scope.details.special) return;
+    if ($scope.details.special.japan)
+        $scope.details.special = $scope.details.special.japan;
+    if ($scope.details.special.constructor == Array) {
+        var lastStage = $scope.details.special.slice(-1)[0];
+        $scope.cooldown = lastStage.cooldown;
+        $scope.details.special = lastStage.description;
+    }
+};
+
 /******************
  * Initialization *
  ******************/
diff --git a/probability/views/fragments/popover.html b/probability/views/fragments/popover.html
new file mode 100644
index 000000000..5bd1c9b77
--- /dev/null
+++ b/probability/views/fragments/popover.html
@@ -0,0 +1,22 @@
+<div class="popover-data" ng-controller="PopoverCtrl">
+
+    <table class="table table-striped">
+        <tbody>
+            <tr class="header">
+                <td colspan="5">Special</td>
+            </tr>
+            <tr>
+                <td colspan="5">
+                    <div class="special" ng-if="details.special && cooldown">
+                    	{{details.special}}
+                    </div>
+                    <div class="cooldown" ng-if="details.special && cooldown">
+                        {{cooldown.length ? cooldown[0] : cooldown}} turns
+                        {{cooldown.length ? ' (maxed: ' + cooldown[1] + ' turns)' : ''}}
+                    </div>
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+</div>
diff --git a/probability/views/main.html b/probability/views/main.html
index d0cd2f118..7833a24df 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -10,7 +10,10 @@ <h1 class="page-header">
                     <div class="unitContainer">
 
                         <div class="unit" decorate-slot uid="character.uid"
-                            ng-class="{ empty: !character || !character.uid }"></div>
+                            ng-class="{ empty: !character || !character.uid }"
+                            popover-placement="right" popover-enable="{{character}}"
+                            popover-trigger="mouseenter" popover-title="{{character.name}}"
+                            uib-popover-template="'views/fragments/popover.html'"></div>
 
                     </div>
                     <p ng-if="slotCount(character.uid)">Select which Sockets your Unit already has.</p>

From 6c7f5ddb7c56bb9211636548748679e1ef00eaf9 Mon Sep 17 00:00:00 2001
From: John <nguyen3@ualberta.ca>
Date: Tue, 10 Jan 2017 01:08:53 -0700
Subject: [PATCH 0751/1569] add quick fill buttons to probability page

---
 probability/index.css         |  8 ++++++++
 probability/js/controllers.js | 14 ++++++++++++++
 probability/views/main.html   |  8 ++++++++
 3 files changed, 30 insertions(+)

diff --git a/probability/index.css b/probability/index.css
index ee47599a6..57b9dd1e6 100644
--- a/probability/index.css
+++ b/probability/index.css
@@ -233,6 +233,14 @@ slot-wheel > .ghoster {
     background: #ddd;
 }
 
+.quick-fill-slots {
+	margin: 2px auto;
+}
+
+.quick-fill-skillups {
+	display: inline-block;
+}
+
 .label.label-danger {
     display: inline-block;
     white-space: nowrap;
diff --git a/probability/js/controllers.js b/probability/js/controllers.js
index cd926dd6d..7a8f66ee6 100644
--- a/probability/js/controllers.js
+++ b/probability/js/controllers.js
@@ -123,6 +123,20 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
     	if (!uid) return;
     	return units[uid - 1].name;
     };
+    
+    $scope.quickFillSlots = function() {
+        $scope.character.slots = [ ];
+        for (var i=0;i<$scope.slots;++i)
+        	$scope.character.slots.push({ id: [ 2, 3, 1, 6, 4][i], level: 0 });
+    };
+    
+    $scope.quickFillSkillups = function(uid) {
+    	if (!uid) return;
+    	var cooldown = window.cooldowns[uid - 1];
+    	var maxSkillups = cooldown[0] - cooldown[1];
+    	if (!maxSkillups) return;
+    	$scope.skillups = maxSkillups;
+    };
 
     $scope.onRemove = function(i) {
         $rootScope.character = null;
diff --git a/probability/views/main.html b/probability/views/main.html
index 7833a24df..d74eecc27 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -18,6 +18,10 @@ <h1 class="page-header">
                     </div>
                     <p ng-if="slotCount(character.uid)">Select which Sockets your Unit already has.</p>
                     <p ng-if="!slotCount(character.uid)">This Unit has no Sockets.</p>
+                    <div class="quick-fill quick-fill-slots" 
+                    	ng-class="{ visible: character.uid }" ng-click="quickFillSlots()">
+                        Quick fill
+                    </div>
                     <div class="slots">
 
                         <slot-wheel ng-repeat="slotNumber in range(0, slotCount(character.uid))">
@@ -40,6 +44,10 @@ <h1 class="page-header">
                     <p></p>
 					Number of Skill-Ups You Need: <input type="text" class="number-field" ng-model="skillups" placeholder="e.g. 10" auto-focus
 						ng-change="changeBaseValues()" id="skillups">
+					<div class="quick-fill quick-fill-skillups" 
+						ng-class="{ visible: character.uid }" ng-click="quickFillSkillups(character.uid)">
+                        Quick fill
+                    </div>
 					
 				</div>
 				

From 62014644c5f1c6c9779c40e58f986999d936dca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 10 Jan 2017 22:10:51 +0100
Subject: [PATCH 0752/1569] Line 2163 error: evolution: 13412,

        evolution: 13412,
Must be
        evolution: 1412,
---
 common/data/evolutions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index e69d050b0..22ea12321 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2160,7 +2160,7 @@ window.evolutions = {
         evolvers: [ 1180, 83, 88, 304, 104 ]
     },
     1411: {
-        evolution: 13412,
+        evolution: 1412,
         evolvers: [ 1180, 118, 89, 95, 100 ]
     },
     261: {

From ab044e8b29069709fc368ea5ae91884632d39608 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 10 Jan 2017 18:04:37 -0500
Subject: [PATCH 0753/1569] Sengoku, Colo, and Secret Baby 5

---
 common/data/aliases.js   | 18 +++++++++---------
 common/data/captains.js  | 21 +++++++++++++++++++++
 common/data/cooldowns.js | 11 ++++++++---
 common/data/details.js   | 24 +++++++++++++++++-------
 common/data/gw.js        |  5 +++++
 common/data/specials.js  | 16 ++++++++++++++++
 common/data/units.js     | 18 +++++++++---------
 7 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7f3d517cd..161651b33 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1392,15 +1392,15 @@ window.aliases = {
     1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
     1392: ['戦桃丸 シャボンディ諸島の壁', '', ''],
     1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
-    1394: ['', '', 'Kimono Baby 5'],
-    1395: ['', '', 'Kimono Baby 5'],
+    1394: ['ベビー５ 神前の晴れ着', '', 'Kimono Baby 5'],
+    1395: ['ベビー５ ぎこちない振袖', '', 'Kimono Baby 5'],
     1396: ['たしぎ シャンブルズ', '', 'Smoker'],
     1397: ['たしぎ　七尺十手 シャンブルズ', '', 'Smoker'],
     1398: ['スモーカー シャンブルズ', '', 'Tashigi'],
     1399: ['スモーカー　時雨 シャンブルズ', '', 'Tashigi'],
-    1400: ['', '', 'Coliseum Gladius'],
-    1401: ['', '', 'Coliseum Gladius'],
-    1402: ['', '', 'Coliseum Dalton'],
+    1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius'],
+    1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius'],
+    1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton'],
     1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy'],
     1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy'],
     1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp'],
@@ -1413,10 +1413,10 @@ window.aliases = {
     1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper'],
     1413: ['白ひげ 四皇', '', 'Mega Whitebeard'],
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
-    1415: ['', '', ''],
-    1416: ['', '', ''],
-    1417: ['', '', ''],
-    1418: ['', '', ''],
+    1415: ['センゴク 智将', '', ''],
+    1416: ['仏のセンゴク 智将', '', ''],
+    1417: ['ロンズ', '', ''],
+    1418: ['カイゼルヒゲ', '', ''],
     1419: ['', '', 'Kimono Lucci'],
     1420: ['', '', 'Kimono Lucci'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 0d63b435e..aa5962e40 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3926,4 +3926,25 @@ window.captains = {
     1414: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
+    1415: {
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+    },
+    1416: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
+    },
+    1417: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+    },
+    1418: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
+    1419: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+    },
+    1420: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9352918b8..bee3a8a10 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1271,8 +1271,8 @@ window.cooldowns = [
     [ 14, 8 ],
     [ 19, 15 ],
     [ 19, 15 ],
-    25,
-    25,
+    [ 25, 17 ],
+    [ 25, 17 ],
     [ 25, 19 ],
     [ 25, 19 ],
     [ 10, 4 ],
@@ -1413,5 +1413,10 @@ window.cooldowns = [
     25,
     [ 25, 17 ],
     [ 6, 6 ],
-    
+    [ 20, 12 ],
+    [ 20, 12 ],
+    [ 21, 13 ],
+    [ 22, 15 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 034d93aa0..3238895e5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7621,27 +7621,37 @@ window.details = {
     1414: {//Shop Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
         special: "Changes own orb into [INT] and reduces Special Cooldown of Powerhouse characters by 1 turn.",
-        specialName: "Sanji Special",
+        specialName: "Are you ready?",
     },
     1415: {//Fortnight Sengoku
         captain: "Boost ATK of characters with cost 30 or less by 1.5x",
         special: "Reduces Special Cooldown of all characters by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
-        specialName: "Sengoku Special",
+        specialName: "Unshakeable Resolution of the Wise Master",
     },
     1416: {//Fortnight Sengoku
         captain: "Boost ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
         special: "Reduces Special Cooldown of all characters by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
-        specialName: "Sengoku Special",
+        specialName: "Unshakeable Resolution of the Wise Master",
     },
     1417: {//Ronse
         captain: "Boosts ATK and HP of [STR] characters by 1.5x",
         special: "Cuts the current HP of all enemies by 10%, changes [BLOCK] orbs into [STR] orbs for [STR] characters",
-        specialName: "Ronse Special",
+        specialName: "Raid Battle-Axe: One Flash",
     },
     1418: {//Stainless
-        captain: "Not Translated",
-        special: "Not Translated",
-        specialName: "Stainless Special",
+        captain: "Boosts ATK and RCV of INT characters by 1.5x",
+        special: "Reduces any damage received above 5,000 HP by 97% for 1 turn",
+        specialName: "Defence of the Command Line",
+    },
+    1419: {//Kimono Lucci
+        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduce damage received by 10%",
+        special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
+        specialName: "Lucci Special",
+    },
+    1420: {//Kimono Lucci
+        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduce damage received by 10%",
+        special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
+        specialName: "Lucci Special",
     },
 };
 
diff --git a/common/data/gw.js b/common/data/gw.js
index 8767e922b..bdc85838a 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1413,4 +1413,9 @@ window.gw=[
     47321,
     5166,
     47389,
+    48078,
+    48078,
+    48077,
+    48076,
+    48222,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 6c457cb1f..6fa3455c7 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2006,4 +2006,20 @@ window.specials = {
         },
         type: "class"
     },
+    1415: {
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+        type: "class"
+    },
+    1416: {
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+        type: "class"
+    },
+    1419: {
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
+    },
+    1420: {
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 9ce0980da..a7a8758cb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1392,15 +1392,15 @@ window.units = [
     [ "Captain Buggy", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, 1 ],
     [ "Sentomaru, Wall of the Sabaody Archipelagos", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, 3000000, 166, 48, 33, 2805, 955, 201, 1 ],
     [ "Demalo Black", "INT", [ "Shooter", "Driven" ], 4, 15, 7, 1, 99, 3000000, 102, 105, 49, 1187, 688, 251, 1 ],
-    [ "Kimono Baby 5", "QCK", [ "Slasher", "Striker" ], 4, 13, 6, 2, 50, 392109, 164, 130, 40, null, null, null, null ],
-    [ "Kimono Baby 5 Evolved", "QCK", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, null, 920, 540, 149, null, null, null, null ],
+    [ "Baby 5, Dressed for the Shirne", "QCK", [ "Slasher", "Striker" ], 4, 13, 6, 2, 50, 392109, 164, 130, 40, 993, 561, 206, 1 ],
+    [ "Baby 5, Awkward Kimono", "QCK", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 920, 540, 149, 1912, 1239, 369, 1 ],
     [ "Tashigi Shambles", "DEX", [ "Striker", "Driven" ], 3, 11, 6, 1, 50, 392109, 103, 34, 23, 1034, 543, 113, 1 ],
     [ "Tashigi Shambles, 7 Foot Jitte", "DEX", [ "Striker", "Driven" ], 4, 19, 5, 3, 99, 3000000, 914, 463, 103, 2134, 1043, 231, 1 ],
     [ "Smoker Shambles", "QCK", [ "Slasher", "Cerebral" ], 3, 11, 6, 1, 50, 392109, 76, 26, 41, 886, 466, 186, 1 ],
     [ "Smoker Shambles, Shigure", "QCK", [ "Slasher", "Cerebral" ], 4, 19, 4, 3, 99, 3000000, 706, 416, 160, 1606, 910, 361, 1 ],
-    [ "Gladius", "STR", [ "Driven", "Shooter" ], 4, 25, 7, 2, 70, null, null, null, null, null, null, null, null ],
-    [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, 4, 3, 99, 4000000, 986, 698, 86, 2188, 1419, 208, null ],
-    [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gladius, Pop-Pop Man", "STR", [ "Driven", "Shooter" ], 4, 25, 7, 2, 70, 1066998, 186, 168, 39, 1088, 786, 98, 1 ],
+    [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, 4, 3, 99, 4000000, 986, 698, 86, 2188, 1419, 208, 1 ],
+    [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 6, 2, 70, 1778330, 160, 106, 19, 1061, 961, 235, 1 ],
     [ "Monkey D. Luffy, Gathering of the Straw Hats", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 313, 300, 70, 1422, 840, 210, 1 ],
     [ "Monkey D. Luffy, Reunion of the Straw Hat Pirates", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1369, 762, 168, 3080, 1550, 390, 1 ],
     [ "Usopp, Gathering of the Straw Hats", "PSY", "Shooter", 4, 15, 4, 3, 50, 392109, 255, 99, 31, 1201, 481, 182, 1 ],
@@ -1413,10 +1413,10 @@ window.units = [
     [ "Tony Tony Chopper: Monster Point, Reunion of the Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1499, 170, 1 ],
     [ "Whitebeard: Four Emperors", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, 1 ],
     [ "Sanji, Making Food and Drinks", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 3000000, 557, 363, 32, 2276, 1200, 210, 1 ],
-    [ "Fortnight Sengoku", "PSY", [ "Fighter", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Sengoku, Evolved", "PSY", [ "Fighter", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ronse", "STR", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Stainless", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sengoku, Wise Warrior", "PSY", [ "Fighter", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 106, 42, 30, 990, 503, 151, 1 ],
+    [ "Sengoku the Buddha, Wise Warrior", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 920, 440, 100, 2059, 1059, 304, 1 ],
+    [ "Ronse", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 1, 70, 1066998, 106, 59, 1, 2018, 901, 3, 1 ],
+    [ "Stainless", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 82, 57, 20, 1408, 874, 202, 1 ],
     [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, null, null, null, null, 2299, 1333, 152, null ],
     ];

From 8d590d7c00090b12ff4c57d7d60376a37ef31afb Mon Sep 17 00:00:00 2001
From: John <nguyen3@ualberta.ca>
Date: Tue, 10 Jan 2017 17:15:23 -0700
Subject: [PATCH 0754/1569] style probability popover

---
 probability/index.css | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/probability/index.css b/probability/index.css
index 57b9dd1e6..93d7642b9 100644
--- a/probability/index.css
+++ b/probability/index.css
@@ -700,6 +700,37 @@ canvas {
     font-size: 85%;
 }
 
+/***********
+ * POPOVER *
+ ***********/
+ 
+.popover {
+    width: 400px;
+} 
+
+.popover-content {
+    color: black;
+    font-size: 90%;
+    padding: 0;
+}
+ 
+.popover-data {
+    font-size: 90%;
+}
+
+.popover-data table {
+    margin: 0;
+}
+
+.popover-data td {
+    width: 25%;
+    padding: 4px !important;
+}
+
+.popover-data .header > td {
+    font-weight: bold;
+}
+
 /***************
  * BACKGROUNDS *
  ***************/

From 28d4a070e5f15cca316d3f7132b24a83a178a62d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 11 Jan 2017 00:07:16 -0500
Subject: [PATCH 0755/1569] I had some typos

I fixed it
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3238895e5..adb3be698 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7635,12 +7635,12 @@ window.details = {
     },
     1417: {//Ronse
         captain: "Boosts ATK and HP of [STR] characters by 1.5x",
-        special: "Cuts the current HP of all enemies by 10%, changes [BLOCK] orbs into [STR] orbs for [STR] characters",
+        special: "Cuts the current HP of all enemies by 10%, changes [BLOCK] orbs into [STR] orbs for Slasher characters",
         specialName: "Raid Battle-Axe: One Flash",
     },
     1418: {//Stainless
         captain: "Boosts ATK and RCV of INT characters by 1.5x",
-        special: "Reduces any damage received above 5,000 HP by 97% for 1 turn",
+        special: "Reduces any damage received above 5,000 HP by 99% for 1 turn",
         specialName: "Defence of the Command Line",
     },
     1419: {//Kimono Lucci

From fd2662e504c945c2a00aef9b0b9a358e8f90e087 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 14 Jan 2017 23:07:09 -0500
Subject: [PATCH 0756/1569] Baby 5 Fix

New units too
---
 common/data/details.js  | 8 ++++----
 common/data/specials.js | 2 ++
 common/data/units.js    | 4 ++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index adb3be698..740f2cf54 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7206,14 +7206,14 @@ window.details = {
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1363: {//Timeskip Franky
-        captain: "Boosts ATK of [PSY] chatacters by 2x, reduces damage taken by 10%",
+        captain: "Boosts ATK of [PSY] characters by 2x, reduces damage taken by 10%",
         special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts HP of [PSY] characters by 100",
         specialName: "Franky Fireball",
     },
     1364: {//Timeskip Franky
-        captain: "Boosts ATK of [PSY] chatacters by 2.5x, reduces damage taken by 10%",
+        captain: "Boosts ATK of [PSY] characters by 2.5x, reduces damage taken by 10%",
         special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts HP of [PSY] characters by 100",
@@ -7431,13 +7431,13 @@ window.details = {
         specialNotes: "#{orb : 1.75x}",
     },
     1390: {//Buggy Legend
-        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of chatacters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
+        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of characters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
         specialName: "Chop-Chop Clown Car",
     },
     1391: {//Buggy Legend
-        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of chatacters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
+        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of characters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
         specialName: "Chop-Chop Clown Car",
diff --git a/common/data/specials.js b/common/data/specials.js
index 6fa3455c7..bef60bab6 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1901,9 +1901,11 @@ window.specials = {
     },
     1394: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     1395: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     1396: {
         def: function(p) { return 0.2; }
diff --git a/common/data/units.js b/common/data/units.js
index a7a8758cb..a9d8cdb08 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1419,6 +1419,10 @@ window.units = [
     [ "Stainless", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 82, 57, 20, 1408, 874, 202, 1 ],
     [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, null, null, null, null, 2299, 1333, 152, null ],
+    [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Striker" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Gin", "DEX", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 80feda85d8d2c24a4dfd6f3ef83d3984a5ce9d93 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 18 Jan 2017 01:35:56 -0500
Subject: [PATCH 0757/1569] Bunch of units

---
 common/data/aliases.js    |  4 ++++
 common/data/captains.js   |  4 ++++
 common/data/cooldowns.js  |  4 ++++
 common/data/details.js    | 21 +++++++++++++++++++++
 common/data/drops.js      |  6 +++---
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 ++++
 common/data/gw.js         |  5 +++++
 common/data/ships.js      | 17 ++++++++++++++---
 common/data/specials.js   | 20 ++++++++++++++++++++
 common/data/units.js      |  2 +-
 11 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 161651b33..b9dc2bd99 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1419,4 +1419,8 @@ window.aliases = {
     1418: ['カイゼルヒゲ', '', ''],
     1419: ['', '', 'Kimono Lucci'],
     1420: ['', '', 'Kimono Lucci'],
+    1421: ['', '', 'Coliseum Diamante'],
+    1422: ['', '', 'Coliseum Diamante'],
+    1423: ['', '', 'Coliseum T-Bone'],
+    1424: ['', '', 'Coliseum Gin'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index aa5962e40..69ee2afcd 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3947,4 +3947,8 @@ window.captains = {
     1420: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
+    1422: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index bee3a8a10..c118e8b5e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1419,4 +1419,8 @@ window.cooldowns = [
     [ 22, 15 ],
     [ 15, 15 ],
     [ 15, 15 ],
+    33,
+    33,
+    26,
+    16,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 740f2cf54..fd60dc17b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7653,5 +7653,26 @@ window.details = {
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
         specialName: "Lucci Special",
     },
+    1421: {//Coliseum Diamante
+        captain: "Not Translated",
+        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x, 1.5x otherwise",
+        specialName: "Diamante Special",
+    },
+    1422: {//Coliseum Diamante
+        captain: "Boosts ATK of Driven characters by 2.25x and boosts HP of Stiker and Slasher characters by 1.5x",
+        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x, 1.5x otherwise",
+        specialName: "Diamante Special",
+    },
+    1423: {//Coliseum T-Bone
+        captain: "Not Translated",
+        special: "If HP is below 500, reduces damage received by 99% for 1 turn",
+        specialName: "T-Bone Special",
+    },
+    1424: {//Coliseum Gin
+        captain: "Boosts ATK of Striker characters proportionally to the crew's current HP",
+        //captainNotes: "#{captainProportional : higher : 1 + 1.25 * (remaining HP) / (total HP) : 2.25 : 2}"
+        special: "Deals 500 fixed damage to each enemy and reduces Special Cooldown of Striker characters by 1 turn.",
+        specialName: "Gin Special",
+    },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 15bd3d50e..448a44db7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1525,9 +1525,9 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1424 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index e69d050b0..1e23758ad 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2171,4 +2171,8 @@ window.evolutions = {
         evolution: 1416,
         evolvers: [  ]
     },
+    1421: {
+        evolution: 1422,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index d32ab7aaa..e9b0d429b 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1419,4 +1419,8 @@ window.families = [
     "Stainless",
     "Rob Lucci",
     "Rob Lucci",
+    "Diamante",
+    "Diamante",
+    "T-Bone",
+    "Gin",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index bdc85838a..05228aba7 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1418,4 +1418,9 @@ window.gw=[
     48077,
     48076,
     48222,
+    48222,
+    48689,
+    48689,
+    48806,
+    48804,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index 4932299b9..b851831cc 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -296,18 +296,29 @@ window.ships = [
     { // 24
         name: 'New Year\'s Big Top',
         thumb: null,
-        description: 'Boosts ATK, Berry, and EXP by 1.5x',
+        description: 'Boosts ATK by 1.2x',
         atk: function(p) {
-            return 1.5;
+            return 1.2;
         },
     },
     { // 25
         name: 'Thousand Sunny: Coated',
-        thumb: 'null',
+        thumb: null,
         description: 'Boosts ATK by 1.5x. Special: reduces damage received by 50% for 1 turn (cooldown: 16 turns).',
         atk: function(p) {
             return [ 1.3, 1.3, 1.3, 1.3, 1.35, 1.35, 1.35, 1.4, 1.45, 1.5 ][p.boatLevel - 1];
         }
     },
+    { // 26
+        name: 'Kizaru\'s Cannonball',
+        thumb: null,
+        description: 'Boosts ATK of Shooter characters by 1.5x and their HP by 1.2x, reduces cooldown of all specials by 1 turn at the start of the fight. Special: Cuts the current HP of each enemy by 7% (cooldown: 15 turns).',
+        atk: function(p) {
+            return [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
+        }
+    },
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index bef60bab6..793b34c98 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2024,4 +2024,24 @@ window.specials = {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"
     },
+    1421: {
+        atk: function(p) {
+            if(p.percHP == 100.0){
+                return p.unit.class.has("Driven") ? 1.75 : 1;
+            }else{
+                return p.unit.class.has("Driven") ? 1.75 : 1;
+            }
+        },
+        type: "class"
+    },
+    1422: {
+        atk: function(p) {
+            if(p.percHP == 100.0){
+                return p.unit.class.has("Driven") ? 1.75 : 1;
+            }else{
+                return p.unit.class.has("Driven") ? 1.75 : 1;
+            }
+        },
+        type: "class"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index a9d8cdb08..6e6621837 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1420,7 +1420,7 @@ window.units = [
     [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, null, null, null, null, 2299, 1333, 152, null ],
     [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Striker" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Gin", "DEX", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];

From 5684a8d6ced501e05d3df593e3d656cac4405739 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 18 Jan 2017 02:18:20 -0500
Subject: [PATCH 0758/1569] Some stats

---
 common/data/captains.js |  6 ++++++
 common/data/details.js  |  4 ++--
 common/data/units.js    | 12 ++++++------
 common/data/zombies.js  |  4 ++++
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 69ee2afcd..ad96ccb59 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3947,8 +3947,14 @@ window.captains = {
     1420: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
+    1422: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
     1422: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; },
     },
+    1423: {
+        atk: function(p) { return 1.75; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index fd60dc17b..213ff50b8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7654,7 +7654,7 @@ window.details = {
         specialName: "Lucci Special",
     },
     1421: {//Coliseum Diamante
-        captain: "Not Translated",
+        captain: "Boosts ATK of Driven characters by 2x",
         special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x, 1.5x otherwise",
         specialName: "Diamante Special",
     },
@@ -7664,7 +7664,7 @@ window.details = {
         specialName: "Diamante Special",
     },
     1423: {//Coliseum T-Bone
-        captain: "Not Translated",
+        captain: "Boosts ATK of the whole crew by 1.75x and recovers 918 HP at end of each turn,",
         special: "If HP is below 500, reduces damage received by 99% for 1 turn",
         specialName: "T-Bone Special",
     },
diff --git a/common/data/units.js b/common/data/units.js
index 6e6621837..dcc572bc8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1417,12 +1417,12 @@ window.units = [
     [ "Sengoku the Buddha, Wise Warrior", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 920, 440, 100, 2059, 1059, 304, 1 ],
     [ "Ronse", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 1, 70, 1066998, 106, 59, 1, 2018, 901, 3, 1 ],
     [ "Stainless", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 82, 57, 20, 1408, 874, 202, 1 ],
-    [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, null, null, null, null, 2299, 1333, 152, null ],
-    [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Gin", "DEX", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, 5, 2, 50, 392109, 152, 93, 13, 1202, 556, 73, null ],
+    [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, 3000000, 1129, 499, 152, 2299, 1333, 152, null ],
+    [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, 5, 2, 70, 1066998, 505, 388, 12, 1202, 770, 91, null ],
+    [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, null ],
+    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, null, 110, 69, 32, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index a37c89e1d..9602379a9 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -311,4 +311,8 @@ window.zombies = {
         type: 'zombie',
         threshold: 0.5
     },
+    1423: { // Colo T-Bone
+        type: 'healer',
+        amount: 918
+    },
 };

From 802d45511a971384eb914b08f0ba3120da9b95ca Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 18 Jan 2017 13:01:19 -0500
Subject: [PATCH 0759/1569] Ship fix and cooldowns

---
 common/data/cooldowns.js | 16 ++++++++--------
 common/data/ships.js     |  4 ++--
 common/data/units.js     |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c118e8b5e..7f07e906b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1361,8 +1361,8 @@ window.cooldowns = [
     [ 15, 15 ],
     [ 20, 16 ],
     [ 20, 16 ],
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     null,//New World Nami
     null,//New World Nami
     null,//New World Sanji
@@ -1403,8 +1403,8 @@ window.cooldowns = [
     null,//Colo Dalton
     null,//New World Luffy
     null,//New World Luffy
-    20,
-    20,
+    [ 20, 14 ],
+    [ 20, 14 ],
     [ 22, 16 ],
     [ 22, 16 ],
     [ 16, 10 ],
@@ -1419,8 +1419,8 @@ window.cooldowns = [
     [ 22, 15 ],
     [ 15, 15 ],
     [ 15, 15 ],
-    33,
-    33,
-    26,
-    16,
+    [ 33, 17 ],
+    [ 33, 17 ],
+    [ 26, 14 ],
+    [ 16, 7 ],
 ];
diff --git a/common/data/ships.js b/common/data/ships.js
index b851831cc..200e8e412 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -312,9 +312,9 @@ window.ships = [
     { // 26
         name: 'Kizaru\'s Cannonball',
         thumb: null,
-        description: 'Boosts ATK of Shooter characters by 1.5x and their HP by 1.2x, reduces cooldown of all specials by 1 turn at the start of the fight. Special: Cuts the current HP of each enemy by 7% (cooldown: 15 turns).',
+        description: 'Boosts ATK of Shooter characters by 1.55x and their HP by 1.2x, reduces cooldown of all specials by 1 turn at the start of the fight. Special: Cuts the current HP of each enemy by 7% (cooldown: 15 turns).',
         atk: function(p) {
-            return [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
+            return [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.55 ][p.boatLevel - 1];
         },
         hp: function(p) {
             return [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
diff --git a/common/data/units.js b/common/data/units.js
index dcc572bc8..e89e40f6d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1421,8 +1421,8 @@ window.units = [
     [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, 3000000, 1129, 499, 152, 2299, 1333, 152, null ],
     [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, 5, 2, 70, 1066998, 505, 388, 12, 1202, 770, 91, null ],
     [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, null ],
-    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, null, 110, 69, 32, null, null, null, null ],
+    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, null, null, null, 1752, 1199, 300, null ],
+    [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, null, 110, 69, 32, 1228, 801, 191, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From aa9e001f037313c2439969a52b788f666e99661b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 18 Jan 2017 14:36:18 -0500
Subject: [PATCH 0760/1569] small typo

---
 common/data/details.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 213ff50b8..1c4bfb8ae 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7655,12 +7655,12 @@ window.details = {
     },
     1421: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2x",
-        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x, 1.5x otherwise",
+        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
         specialName: "Diamante Special",
     },
     1422: {//Coliseum Diamante
-        captain: "Boosts ATK of Driven characters by 2.25x and boosts HP of Stiker and Slasher characters by 1.5x",
-        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x, 1.5x otherwise",
+        captain: "Boosts ATK of Driven characters by 2.25x and boosts HP of Striker and Slasher characters by 1.5x",
+        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
         specialName: "Diamante Special",
     },
     1423: {//Coliseum T-Bone

From e7dfc704c5f6f172753ad278426a65fb40edd05c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 20 Jan 2017 14:56:56 -0500
Subject: [PATCH 0761/1569] Typos and changes to map effects

---
 common/data/details.js | 2 +-
 common/data/drops.js   | 2 +-
 common/data/effects.js | 6 +++---
 common/data/units.js   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 1c4bfb8ae..f0d6e2b31 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7671,7 +7671,7 @@ window.details = {
     1424: {//Coliseum Gin
         captain: "Boosts ATK of Striker characters proportionally to the crew's current HP",
         //captainNotes: "#{captainProportional : higher : 1 + 1.25 * (remaining HP) / (total HP) : 2.25 : 2}"
-        special: "Deals 500 fixed damage to each enemy and reduces Special Cooldown of Striker characters by 1 turn.",
+        special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
         specialName: "Gin Special",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 448a44db7..b6afd1b79 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1527,7 +1527,7 @@ window.drops = {
             thumb: 779,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1424 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423 ]
         },
         
         {
diff --git a/common/data/effects.js b/common/data/effects.js
index ee1990077..1bb7bcf39 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -264,11 +264,11 @@ window.effects = {
     },
     
     'Pirate Ship Competition! \"Dead End\" Opens!': {
-        description: 'STR/DEX/QCK ATK 1.6x and HP 0.1x. INT/PSY ATK 0.2x and HP 2x',
+        description: 'STR/DEX/QCK ATK 1.6x. INT/PSY HP 2x',
         thumb: 1072,
         id: 31,
-        atk: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 0.2; },
-        hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 0.1 : 2.0; }
+        atk: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 1; },
+        hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1 : 2.0; }
         
     },
     
diff --git a/common/data/units.js b/common/data/units.js
index e89e40f6d..89dd08592 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -978,7 +978,7 @@ window.units = [
     [ "Kizaru", "QCK", ["Shooter", "Fighter"], 4, 30, 4, 2, 70, 1066998, 221, 169, 36,  1241, 741, 160, 1],
     [ "Kizaru, Light Human", "QCK", ["Shooter", "Fighter"], 5, 50, 5, 3, 99, 5000000, 1179, 665, 130, 2506, 1410, 277, 1],
     [ "Izo Whitebeard 16th Div. Commander", "PSY", ["Shooter", "Cerebral"], 4, 25, 6, 3, 99, 3000000, 37, 22, 39, 1910, 990, 300, 1 ],
-    [ "Blamenco Whitebeard 6th Div. Commander", "DEX", ["Striker", "Free Spirit"], 4, 25, 4, 2, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
+    [ "Blamenco Whitebeard 6th Div. Commander", "DEX", ["Striker", "Free Spirit"], 4, 25, 4, 3, 99, 3000000, 66, 40, 18, 2394, 1268, 126, 1 ],
     [ "Namule Whitebeard 8th Div. Commander", "PSY", ["Fighter", "Powerhouse"], 4, 25, 4, 3, 99, 3000000, 49, 48, 26, 2148, 1305, 154, 1 ],
     [ "Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 4, 25, 5, 2, 70, 1066998, 694, 277, 48, 1603, 700, 141, 1 ],
     [ "Flower Sword Vista Whitebeard 5th Div. Commander", "QCK", ["Slasher", "Powerhouse"], 5, 40, 4, 3, 99, 4000000, 1534, 634, 98, 2830, 1257, 228, 1 ],

From 6cd64cc351fa8e04409ecaf31f670f9c6488d6ff Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 21 Jan 2017 19:18:04 -0500
Subject: [PATCH 0762/1569] Diamante Special

---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 793b34c98..a88c8d5fa 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2037,9 +2037,9 @@ window.specials = {
     1422: {
         atk: function(p) {
             if(p.percHP == 100.0){
-                return p.unit.class.has("Driven") ? 1.75 : 1;
+                return p.unit.class.has("Driven") ? 2 : 1;
             }else{
-                return p.unit.class.has("Driven") ? 1.75 : 1;
+                return p.unit.class.has("Driven") ? 1.5 : 1;
             }
         },
         type: "class"

From 76d500aa45e295d47b05c2be6f77bae0b1b53adf Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam@sbcglobal.net>
Date: Sat, 21 Jan 2017 22:51:43 -0800
Subject: [PATCH 0763/1569] Special Names

Potential names for colosseum t-bone and gin
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f0d6e2b31..3c086aa0c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7666,13 +7666,13 @@ window.details = {
     1423: {//Coliseum T-Bone
         captain: "Boosts ATK of the whole crew by 1.75x and recovers 918 HP at end of each turn,",
         special: "If HP is below 500, reduces damage received by 99% for 1 turn",
-        specialName: "T-Bone Special",
+        specialName: "For the Sake of Justice",
     },
     1424: {//Coliseum Gin
         captain: "Boosts ATK of Striker characters proportionally to the crew's current HP",
         //captainNotes: "#{captainProportional : higher : 1 + 1.25 * (remaining HP) / (total HP) : 2.25 : 2}"
         special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
-        specialName: "Gin Special",
+        specialName: "General Commander's Fight",
     },
 };
 

From b41f19df26dd08c1e8975037d2f58fb3c2f3c751 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sun, 22 Jan 2017 16:53:15 -0800
Subject: [PATCH 0764/1569] Added base stats for colosseum t-bone

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 89dd08592..8eddd9bb9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1421,7 +1421,7 @@ window.units = [
     [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, 3000000, 1129, 499, 152, 2299, 1333, 152, null ],
     [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, 5, 2, 70, 1066998, 505, 388, 12, 1202, 770, 91, null ],
     [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, null ],
-    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, null, null, null, 1752, 1199, 300, null ],
+    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, 99, 98, 50, 1752, 1199, 300, null ],
     [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, null, 110, 69, 32, 1228, 801, 191, null ],
     ];
     

From a038b7d9e9773e8048317a7a12d919d402ace8da Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sun, 22 Jan 2017 22:30:08 -0800
Subject: [PATCH 0765/1569] set colo alvida to global unit

---
 common/data/flags.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/flags.js b/common/data/flags.js
index 392f099c8..0a60b1658 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -856,6 +856,8 @@ window.flags = {
     858: { rr: 1, rro: 1, lrr: 1, global: 1 },
     859: { global: 1 },
     860: { global: 1 },
+    861: { global: 1 },
+    862: { global: 1 },
     863: { special: 1, global: 1, shop: 1 },
     864: { global: 1 },
     865: { global: 1 },

From b8efcaebc6f5df9b1b26d3f69777f79973fcbeb7 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sun, 22 Jan 2017 22:39:23 -0800
Subject: [PATCH 0766/1569] set Gum-Gum Gatling luffy to global unit

---
 common/data/flags.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 0a60b1658..d04d5bff1 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -724,7 +724,7 @@ window.flags = {
     724: { global: 1 },
     725: { global: 1, rr: 1, rro: 1, lrr: 1 },
     726: { global: 1, rr: 1, rro: 1, lrr: 1 },
-    727: { special: 1 },
+    727: { special: 1, global: 1 },
     728: { global: 1 },
     729: { global: 1 },
     730: { global: 1 },

From edc669fbfae5586b7eb7aa8db3686632b80840bf Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 23 Jan 2017 02:17:37 -0500
Subject: [PATCH 0767/1569] Whiteboard, Global Drops

added 6+ skill books drop locations
---
 common/data/drops.js | 12 +++++++-----
 common/data/flags.js |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index b6afd1b79..3e84cf30c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -812,7 +812,7 @@ window.drops = {
             condition: 'You may only bring QCK units for 15 and 30 Stamina',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['200,000 Points','1x Red Elder'],['400,000 Points','1x HP Cotton Candy'],['700,000 Points','3x Rainbow Gems']],
-            "All Difficulties": [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44 ]
+            "All Difficulties": [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44, -1413 ]
         },
 
         {
@@ -1027,8 +1027,8 @@ window.drops = {
             thumb: 761,
             global: true,
             condition: "None",
-            "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217, -1210 ],
-            "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8 ]
+            "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217, -1210, -1413 ],
+            "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8, -1413 ]
         },
 
         {
@@ -1132,10 +1132,12 @@ window.drops = {
         {
             name: "Clash! Whitebeard Pirates",
             thumb: 979,
+            global: true,
             condition: "You can only bring INT units",
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['420,000','1x HP Cotton Candy, 1x Rainbow Gem'],['700,000','2x Rainbow Gems, 1x Orb Forbidden Tome']],
-            "All Difficulties": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563, -1119 ]
+            "Japan": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563, -1119 ],
+            "Global": [ 979, 980, 981, 949, -459, -838, -842, -560, -789, -736, -731, -563, -1212 ]
         },
         
         {
@@ -1534,7 +1536,7 @@ window.drops = {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "All Difficulties": [ -261, -562, -720, -748, -935 ]
+            "All Difficulties": [ -261, -562, -720, -748, -935, -1413 ]
         },
         
         {
diff --git a/common/data/flags.js b/common/data/flags.js
index 392f099c8..0a60b1658 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -856,6 +856,8 @@ window.flags = {
     858: { rr: 1, rro: 1, lrr: 1, global: 1 },
     859: { global: 1 },
     860: { global: 1 },
+    861: { global: 1 },
+    862: { global: 1 },
     863: { special: 1, global: 1, shop: 1 },
     864: { global: 1 },
     865: { global: 1 },

From fb179cc368788fdd666dfca56d7d68a832caffbe Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 23 Jan 2017 08:55:23 -0800
Subject: [PATCH 0768/1569] Added raid franky, and FN don sai chars' types and
 classes

---
 common/data/details.js | 24 ++++++++++++++++++++++++
 common/data/units.js   |  6 ++++++
 2 files changed, 30 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 3c086aa0c..82227b058 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7674,5 +7674,29 @@ window.details = {
         special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
         specialName: "General Commander's Fight",
     },
+    1425: {//Don Sai Fortnight Character #1
+        captain: "",
+        special: "",
+    },
+    1426: {//Don Sai Fortnight Character #1, Evolved
+        captain: "",
+        special: "",
+    },
+    1427: {//Don Sai Fortnight Character #2
+        captain: "",
+        special: "",
+    },
+    1428: {//Don Sai Fortnight Character #3
+        captain: "",
+        special: "",
+    },
+    1429: {//Raid Franky
+        captain: "",
+        special: "",
+    },
+    1430: {//Raid Franky, Evolved
+        captain: "",
+        special: "",
+    },
 };
 
diff --git a/common/data/units.js b/common/data/units.js
index 8eddd9bb9..9772fcb6a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1423,6 +1423,12 @@ window.units = [
     [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, null ],
     [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, 99, 98, 50, 1752, 1199, 300, null ],
     [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, null, 110, 69, 32, 1228, 801, 191, null ],
+    [ "Don Sai FortNight Character #1", "QCK", [ "Fighter", "Striker" ], null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Don Sai FortNight Character #1, Evolved", "QCK", [ "Fighter", "Striker" ], null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Don Sai FortNight Character #2", "QCK", [ "Fighter", "Driven" ], null, null, null, null, null, null, null, null, null, null, null, null, null],
+    [ "Don Sai FortNight Character #3", "DEX", [ "Slasher, Shooter" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Franky", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Franky, Evolved", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From cb8cd5282548203d64ae9b2ba751a70222a0002f Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 23 Jan 2017 20:03:59 -0800
Subject: [PATCH 0769/1569] Added information for don sai FN chars (incomplete)

---
 common/data/details.js | 36 +++++++++++++++++++++---------------
 common/data/units.js   |  8 ++++----
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 82227b058..25f6614fd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7674,29 +7674,35 @@ window.details = {
         special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
         specialName: "General Commander's Fight",
     },
-    1425: {//Don Sai Fortnight Character #1
-        captain: "",
-        special: "",
-    },
-    1426: {//Don Sai Fortnight Character #1, Evolved
-        captain: "",
-        special: "",
-    },
-    1427: {//Don Sai Fortnight Character #2
-        captain: "",
-        special: "",
-    },
-    1428: {//Don Sai Fortnight Character #3
-        captain: "",
-        special: "",
+    1425: {//Don Sai 3*
+        captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
+        specialName: "",
+    },
+    1426: {//Don Sai 4*
+        captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
+        specialName: "",
+    },
+    1427: {//Boo 4*
+        captain: "Boosts ATK of QCK characters by 2x",
+        special: "Ignores defensive barriers and deals 15x character's ATK in QCK damage to one enemy",
+        specialName: "",
+    },
+    1428: {//Jean Ango 4*
+        captain: "Boosts amount of beli received by 1.5x, and gives chance of duplicating a drop upon completion of the island",
+        special: "When the enemy is delayed, reduces the special cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
+        specialName: "",
     },
     1429: {//Raid Franky
         captain: "",
         special: "",
+        specialName: "",
     },
     1430: {//Raid Franky, Evolved
         captain: "",
         special: "",
+        specialName: "",
     },
 };
 
diff --git a/common/data/units.js b/common/data/units.js
index 9772fcb6a..85acdba24 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1423,10 +1423,10 @@ window.units = [
     [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, null ],
     [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, 99, 98, 50, 1752, 1199, 300, null ],
     [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, null, 110, 69, 32, 1228, 801, 191, null ],
-    [ "Don Sai FortNight Character #1", "QCK", [ "Fighter", "Striker" ], null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Don Sai FortNight Character #1, Evolved", "QCK", [ "Fighter", "Striker" ], null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Don Sai FortNight Character #2", "QCK", [ "Fighter", "Driven" ], null, null, null, null, null, null, null, null, null, null, null, null, null],
-    [ "Don Sai FortNight Character #3", "DEX", [ "Slasher, Shooter" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Don Sai, Unevolved", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, null, 105, 59, 19, null, null, null, null],
+    [ "Don Sai, Evolved", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, null, null, 1123, 527, 57, null, null, null, null],
+    [ "Boo", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, null, 305, 159, 29, null, null, null, null],
+    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Franky", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Franky, Evolved", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     ];

From e866837029e9fb05b712bffc0a902e70e9a4fd6d Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 23 Jan 2017 20:12:52 -0800
Subject: [PATCH 0770/1569] Added base stats and abilities for don sai FN chars

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 85acdba24..2bc5b95d4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1426,7 +1426,7 @@ window.units = [
     [ "Don Sai, Unevolved", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, null, 105, 59, 19, null, null, null, null],
     [ "Don Sai, Evolved", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, null, null, 1123, 527, 57, null, null, null, null],
     [ "Boo", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, null, 305, 159, 29, null, null, null, null],
-    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 13, 6, 2, 70, null, 158, 173, 21, null, null, null, null ],
     [ "Raid Franky", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Franky, Evolved", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     ];

From f6f308deea183b2e41b6dcd617d5f5e89327b5d8 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 23 Jan 2017 21:51:09 -0800
Subject: [PATCH 0771/1569] Typo  on don sai special

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 25f6614fd..9b2499b13 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7676,12 +7676,12 @@ window.details = {
     },
     1425: {//Don Sai 3*
         captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special activates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
         specialName: "",
     },
     1426: {//Don Sai 4*
         captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special activates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
         specialName: "",
     },
     1427: {//Boo 4*

From 2cd3b0c4f44963611eb8e0136c5f4a603de1d83c Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 24 Jan 2017 00:57:14 -0500
Subject: [PATCH 0772/1569] I told you it was YUGE

pm me your bugs plebs
---
 common/data/aliases.js    | 50 ++++++++++++++++++++----------------
 common/data/captains.js   | 16 ++++++++++++
 common/data/cooldowns.js  |  6 +++++
 common/data/details.js    | 53 +++++++++++++++++++++------------------
 common/data/drops.js      |  9 ++++++-
 common/data/evolutions.js | 16 ++++++++++--
 common/data/families.js   |  6 +++++
 common/data/flags.js      |  2 ++
 common/data/gw.js         |  6 +++++
 common/data/specials.js   | 13 ++++++++++
 common/data/units.js      | 16 ++++++------
 11 files changed, 135 insertions(+), 58 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b9dc2bd99..8bd06c053 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -875,8 +875,8 @@ window.aliases = {
     874: ['セニョール・ピンク ドンキホーテ海賊団','', 'Senor Pink', 'Senior Pink' ],
     875: ['トレーボル',''],
     876: ['トレーボル ドンキホーテ海賊団',''],
-    877: ['ジョーラ','', 'Giolla' ],
-    878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates' ],
+    877: ['ジョーラ','', 'Giolla', 'Jora' ],
+    878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates', 'Jora' ],
     879: ['ラオＧ',''],
     880: ['ラオＧ ドンキホーテ海賊団',''],
     881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum Apoo'],
@@ -1112,16 +1112,16 @@ window.aliases = {
     1111: [ 'ニコ・ロビン 若返った考古学者', '' ],
     1112: [ 'ニコ・ロビン 酒場の可憐な踊り娘', '' ],
     1113: [ 'チョッパー 若返った船医', '' ],
-    1114: [ 'モンキー・D・ルフィ 夢を追い求める冒険者', 'Strong World Luffy' ],
-    1115: [ 'モンキー・D・ルフィ 信念に生きる麦わらの一味', 'Strong World Luffy' ],
-    1116: [ 'サンジ 夢を追い求める冒険者', 'Strong World Sanji' ],
-    1117: [ 'サンジ 信念に生きる麦わらの一味', 'Strong World Sanji' ],
-    1118: [ 'ナミ 夢を追い求める冒険者', 'Strong World Nami' ],
-    1119: [ 'ナミ 信念に生きる麦わらの一味', 'Strong World Nami' ],
+    1114: [ 'モンキー・D・ルフィ 夢を追い求める冒険者', 'New Strong World Luffy', 'SW Luffy' ],
+    1115: [ 'モンキー・D・ルフィ 信念に生きる麦わらの一味', 'New Strong World Luffy', 'SW Luffy' ],
+    1116: [ 'サンジ 夢を追い求める冒険者', 'New Strong World Sanji', 'SW Sanji' ],
+    1117: [ 'サンジ 信念に生きる麦わらの一味', 'New Strong World Sanji', 'SW Sanji' ],
+    1118: [ 'ナミ 夢を追い求める冒険者', 'New Strong World Nami', 'SW Nami' ],
+    1119: [ 'ナミ 信念に生きる麦わらの一味', 'New Strong World Nami', 'SW Nami' ],
     1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy' ],
     1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy' ],
-    1122: [ 'キャベンディッシュ', '','Hakuba','cabbage' ],
-    1123: [ '白馬のキャベンディッシュ', '','Hakuba','cabbage' ],
+    1122: [ 'キャベンディッシュ', '','Hakuba', 'Cabbage' ],
+    1123: [ '白馬のキャベンディッシュ', '','Hakuba', 'Cabbage' ],
     1124: ['スレイマン',''],
     1125: ['首はねスレイマン',''],
     1126: ['オオロンブス',''],
@@ -1170,12 +1170,12 @@ window.aliases = {
     1169: ['ダイス 黄金船のディーラー',''],
     1170: ['タナカさん',''],
     1171: ['タナカさん 黄金船の警備担当',''],
-    1172: ['ブルック 夢を追い求める冒険者','','Strong World Brook'],
-    1173: ['ブルック 信念に生きる麦わらの一味','','Strong World Brook'],
-    1174: ['ロロノア・ゾロ 夢を追い求める冒険者','','Strong World Zoro'],
-    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味','','Strong World Zoro'],
-    1176: ['チョッパー 夢を追い求める冒険者','','Strong World Chopper'],
-    1177: ['チョッパー 信念に生きる麦わらの一味','','Strong World Chopper'],
+    1172: ['ブルック 夢を追い求める冒険者','','New Strong World Brook', 'SW Brook' ],
+    1173: ['ブルック 信念に生きる麦わらの一味','','New Strong World Brook', 'SW Brook' ],
+    1174: ['ロロノア・ゾロ 夢を追い求める冒険者','','New Strong World Zoro', 'SW Zoro' ],
+    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味','','New Strong World Zoro', 'SW Zoro' ],
+    1176: ['チョッパー 夢を追い求める冒険者','','New Strong World Chopper', 'SW Chopper' ],
+    1177: ['チョッパー 信念に生きる麦わらの一味','','New Strong World Chopper', 'SW Chopper' ],
     1178: ['オーズ','','Oz'],
     1179: ['魔人オーズ','','Oz'],
     1180: ['虹ヨロイガニ',''],
@@ -1205,12 +1205,12 @@ window.aliases = {
     1204: ['ブルック ルンバー海賊団',''],
     1205: ['“音楽家兼剣士”ブルック ルンバー海賊団',''],
     1206: ['ラブーン ルンバー海賊団',''],
-    1207: ['ニコ・ロビン 夢を追い求める冒険者','','New Strong World Robin'],
-    1208: ['ニコ・ロビン 信念に生きる麦わらの一味','','New Strong World Robin'],
-    1209: ['ウソップ 夢を追い求める冒険者','','New Strong World Usopp'],
-    1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp'],
-    1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky'],
-    1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky'],
+    1207: ['ニコ・ロビン 夢を追い求める冒険者','','New Strong World Robin', 'SW Robin' ],
+    1208: ['ニコ・ロビン 信念に生きる麦わらの一味','','New Strong World Robin', 'SW Robin' ],
+    1209: ['ウソップ 夢を追い求める冒険者','','New Strong World Usopp', 'SW Usopp' ],
+    1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp', 'SW Usopp' ],
+    1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky', 'SW Franky' ],
+    1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky', 'SW Franky' ],
     1213: ['ベビー５ ドルフィンフロート','','Summertime Baby 5','Swimsuit Baby 5'],
     1214: ['ベビー５ ドルフィンライダー','','Summertime Baby 5','Swimsuit Baby 5'],
     1215: ['ガイラム ワールド海賊団','',''],
@@ -1423,4 +1423,10 @@ window.aliases = {
     1422: ['', '', 'Coliseum Diamante'],
     1423: ['', '', 'Coliseum T-Bone'],
     1424: ['', '', 'Coliseum Gin'],
+    1425: ['', '', ''],
+    1426: ['', '', ''],
+    1427: ['', '', ''],
+    1428: ['', '', ''],
+    1429: ['', '', 'Valentine Mansherry'],
+    1430: ['', '', 'Valentine Mansherry'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ad96ccb59..d280e8fe2 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3957,4 +3957,20 @@ window.captains = {
     1423: {
         atk: function(p) { return 1.75; },
     },
+    1425: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; },
+    },
+    1426: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.25 : 1; },
+    },
+    1427: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+    },
+    1428: {
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; },
+    },
+    1429: {
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7f07e906b..eb4471d9a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1423,4 +1423,10 @@ window.cooldowns = [
     [ 33, 17 ],
     [ 26, 14 ],
     [ 16, 7 ],
+    20,
+    20,
+    18,
+    12,
+    [ 14, 14 ],
+    [ 14, 14 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 25f6614fd..7e788cb75 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6650,8 +6650,8 @@ window.details = {
     },
     1281: {//Marineford Garp
         captain: "Boosts ATK of Fighter characters by 2.25x and reduces damage received by 10%",
-        special: "Deals 25x character's ATK in [STR] damage to one enemy that bypasses all defensive Buffs",
-        specialNotes: "Ignores barriers, DEF, and Damage Reduction buffs",
+        special: "Deals 25x character's ATK in [STR] damage to one enemy that will ignore damage negating abilities and barriers.",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
         specialName: "Fist of Love - Falling Fortress",
     },
     1282: {//Marineford Sengoku
@@ -7520,11 +7520,11 @@ window.details = {
         special: [
             {
                 "description": "Deals 3x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.3x for 1 turn",
-                "cooldown": [ 14, null ],
+                "cooldown": [ 14, 4 ],
             },
             {
                 "description": "Deals 13x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.5x for 1 turn",
-                "cooldown": [ 18, null ],
+                "cooldown": [ 18, 8 ],
             },
         ],
         specialName: "Offense Battle Axe",
@@ -7561,14 +7561,14 @@ window.details = {
     },
     1405: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn if enemies have delay protection",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn if enemies have delay protection",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
@@ -7676,33 +7676,36 @@ window.details = {
     },
     1425: {//Don Sai 3*
         captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
-        specialName: "",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, amplifies the effect of orbs by 1.5x for 3 turns",
+        specialName: "Military Leg Heel",
     },
     1426: {//Don Sai 4*
         captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
-        specialName: "",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, amplifies the effect of orbs by 1.5x for 3 turns",
+        specialName: "Military Leg Heel",
     },
     1427: {//Boo 4*
         captain: "Boosts ATK of QCK characters by 2x",
-        special: "Ignores defensive barriers and deals 15x character's ATK in QCK damage to one enemy",
-        specialName: "",
+        special: "Deals 15x character's ATK in QCK damage to one enemy that will ignore damage negating abilities and barriers.",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialName: "Unblockable Eight Fists",
     },
     1428: {//Jean Ango 4*
-        captain: "Boosts amount of beli received by 1.5x, and gives chance of duplicating a drop upon completion of the island",
-        special: "When the enemy is delayed, reduces the special cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
-        specialName: "",
-    },
-    1429: {//Raid Franky
-        captain: "",
-        special: "",
-        specialName: "",
-    },
-    1430: {//Raid Franky, Evolved
-        captain: "",
-        special: "",
-        specialName: "",
+        captain: "Boosts amount of beli received by 1.5x, and gives small chance of duplicating a drop upon completion of the island",
+        captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
+        specialName: "Looting the Losers",
+    },
+    1429: {//Valentines Mansherry
+        captain: "Boost the RCV of Striker and Free Spirit characters by 1.5x",
+        special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
+        specialName: "Boy's Unknown Taste of Hard Work",
+    },
+    1430: {//Valentines Mansherry, Evolved
+        captain: "Boost the RCV of Striker and Free Spirit characters by 2x",
+        special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
+        specialName: "Boy's Unknown Taste of Hard Work",
     },
 };
 
diff --git a/common/data/drops.js b/common/data/drops.js
index 3e84cf30c..f09edc710 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1255,7 +1255,7 @@ window.drops = {
         
         {
             name: "Tontatta Kingdom Island Part 1: Leo",
-            thumb: 1330,
+            thumb: 1328,
             condition: "Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
             "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
         },
@@ -1293,6 +1293,13 @@ window.drops = {
             "All Difficulties": [ 1415, 1417, 1418, -1418, -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
         },
         
+        {
+            name: "Happo Navy! The 13th Leader Appears!",
+            thumb: 1426,
+            condition: "You can only bring DEX units",
+            "All Difficulties": [ 1425, 1427, 1428, -1240, -1272, -1270, -1227, -1224, -872, -878, -255, -812 ]
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a68135fbb..f439d132a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2169,10 +2169,22 @@ window.evolutions = {
     },
     1415: {
         evolution: 1416,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 92, 98, 103 ]
+    },
+    1419: {
+        evolution: 1420,
+        evolvers: [ 84, 88, 300, 304, 104 ]
     },
     1421: {
         evolution: 1422,
-        evolvers: [  ]
+        evolvers: [ 118, 94, 99, 304, 267 ]
+    },
+    1425: {
+        evolution: 1426,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
+    1429: {
+        evolution: 1430,
+        evolvers: [ 117, 83, 86, 91, 97 ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index e9b0d429b..31c6a1cf8 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1423,4 +1423,10 @@ window.families = [
     "Diamante",
     "T-Bone",
     "Gin",
+    "Don Sai",
+    "Don Sai",
+    "Boo",
+    "Jean Ango",
+    "Mansherry",
+    "Mansherry",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index d04d5bff1..c644d5ab3 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1212,4 +1212,6 @@ window.flags = {
     1414: { shop: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
     1420: { rr: 1, rro: 1, lrr: 1, },
+    1429: { rr: 1, rro: 1, lrr: 1, },
+    1430: { rr: 1, rro: 1, lrr: 1, },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 05228aba7..1ec629e9d 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1423,4 +1423,10 @@ window.gw=[
     48689,
     48806,
     48804,
+    49865,
+    49865,
+    49866,
+    49867,
+    49836,
+    49836,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index a88c8d5fa..c2d28c05f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2044,4 +2044,17 @@ window.specials = {
         },
         type: "class"
     },
+    1426: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
+    },
+    1427: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
+    },
+    1406: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "class",
+        warning: "Selected special (%name%) assumes that the enemy has been Delayed."
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 85acdba24..d1673b524 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1421,14 +1421,14 @@ window.units = [
     [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, 3000000, 1129, 499, 152, 2299, 1333, 152, null ],
     [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, 5, 2, 70, 1066998, 505, 388, 12, 1202, 770, 91, null ],
     [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, null ],
-    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, null, 99, 98, 50, 1752, 1199, 300, null ],
-    [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, null, 110, 69, 32, 1228, 801, 191, null ],
-    [ "Don Sai, Unevolved", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, null, 105, 59, 19, null, null, null, null],
-    [ "Don Sai, Evolved", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, null, null, 1123, 527, 57, null, null, null, null],
-    [ "Boo", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, null, 305, 159, 29, null, null, null, null],
-    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Raid Franky", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Raid Franky, Evolved", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, 3000000, 99, 98, 50, 1752, 1199, 300, null ],
+    [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 110, 69, 32, 1228, 801, 191, null ],
+    [ "Don Sai, Unevolved", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, 392109, 105, 59, 19, null, null, null, null],
+    [ "Don Sai, Evolved", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, 99, 3000000, 1123, 527, 57, null, null, null, null],
+    [ "Boo", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, 1066998, 305, 159, 29, null, null, null, null],
+    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
+    [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From ad6f560d1cd01c5d0b2d3ff574c3e9ccd573fac5 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 23 Jan 2017 22:35:34 -0800
Subject: [PATCH 0773/1569] Updates

---
 common/data/details.js | 41 ++++++++++++++++++++++-------------------
 common/data/units.js   |  4 ++--
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9b2499b13..3f6aedd21 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7676,33 +7676,36 @@ window.details = {
     },
     1425: {//Don Sai 3*
         captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special activates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
-        specialName: "",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, amplifies the effect of orbs by 1.5x for 3 turns",
+        specialName: "Military Leg Heel",
     },
     1426: {//Don Sai 4*
         captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special activates when a character is locked, then for 3 turns boosts the effect of orbs by 1.5x",
-        specialName: "",
+        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, amplifies the effect of orbs by 1.5x for 3 turns",
+        specialName: "Military Leg Heel",
     },
     1427: {//Boo 4*
         captain: "Boosts ATK of QCK characters by 2x",
-        special: "Ignores defensive barriers and deals 15x character's ATK in QCK damage to one enemy",
-        specialName: "",
+        special: "Deals 15x character's ATK in QCK damage to one enemy that will ignore damage negating abilities and barriers.",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialName: "Unblockable Eight Fists",
     },
     1428: {//Jean Ango 4*
-        captain: "Boosts amount of beli received by 1.5x, and gives chance of duplicating a drop upon completion of the island",
-        special: "When the enemy is delayed, reduces the special cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
-        specialName: "",
-    },
-    1429: {//Raid Franky
-        captain: "",
-        special: "",
-        specialName: "",
-    },
-    1430: {//Raid Franky, Evolved
-        captain: "",
-        special: "",
-        specialName: "",
+        captain: "Boosts amount of beli received by 1.5x, and gives small chance of duplicating a drop upon completion of the island",
+        captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
+        special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
+        specialName: "Looting the Losers",
+    },
+    1429: {//Valentines Mansherry
+        captain: "Boost the RCV of Striker and Free Spirit characters by 1.5x",
+        special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
+        specialName: "Boy's Unknown Taste of Hard Work",
+    },
+    1430: {//Valentines Mansherry, Evolved
+        captain: "Boost the RCV of Striker and Free Spirit characters by 2x",
+        special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
+        specialName: "Boy's Unknown Taste of Hard Work",
     },
 };
 
diff --git a/common/data/units.js b/common/data/units.js
index 2bc5b95d4..938068b3b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1427,8 +1427,8 @@ window.units = [
     [ "Don Sai, Evolved", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, null, null, 1123, 527, 57, null, null, null, null],
     [ "Boo", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, null, 305, 159, 29, null, null, null, null],
     [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 13, 6, 2, 70, null, 158, 173, 21, null, null, null, null ],
-    [ "Raid Franky", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Raid Franky, Evolved", "DEX", [ "Striker", "Free Spirit" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
+    [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b8d142898264c03b90c9ad2b5c6a2e9bac6904b9 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 24 Jan 2017 19:42:08 -0500
Subject: [PATCH 0774/1569] New units on official

---
 common/data/aliases.js     |  42 ++++----
 common/data/captains.js    |   2 +-
 common/data/cooldowns.js   |  12 +--
 common/data/details.js     |   9 +-
 common/data/specials.js    |   6 +-
 common/data/units.js       | 216 ++++++++++++++++++-------------------
 common/js/nonSuspicious.js |   2 +-
 common/js/utils.js         |   2 +-
 index.html                 |  10 +-
 9 files changed, 150 insertions(+), 151 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 8bd06c053..090b4e2c2 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -788,8 +788,8 @@ window.aliases = {
     787: ['Dr.ヒルルク ヤブ医者','', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
     788: ['くいな',''],
     789: ['くいな シモツキ村の少女剣士',''],
-    790: ['たまねぎ＆ピーマン＆にんじん','', 'Usopp Pirates' ],
-    791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団','', 'Usopp Pirates' ],
+    790: ['たまねぎ＆ピーマン＆にんじん','', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
+    791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団','', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
     792: ['アイスバーグ','', 'Iceberg' ],
     793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
     794: ['モンキー・D・ルフィ 希望の星','','Raid'],
@@ -918,13 +918,13 @@ window.aliases = {
     917: ['マーガレット',''],
     918: ['マーガレット 護国の戦士',''],
     919: ['アフェランドラ',''],
-    920: ['スイトピー',''],
+    920: ['スイトピー','', 'Sweet Pea'],
     921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
     922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
     923: ['南の海のキャプテン・キッド','','Coliseum Kid'],
     924: ['キャプテン・キッド キッド海賊団船長','','Coliseum Kid'],
-    925: ['獄卒長サディちゃん','','Coliseum Sadie'],
-    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum Sadie'],
+    925: ['獄卒長サディちゃん','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
+    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
     927: ['ドーベルマン 海軍本部中将','','Coliseum Doberman'],
     928: ['ハンニャバル','','Hannibal'],
     929: ['ハンニャバル','','Hannibal'],
@@ -1160,10 +1160,10 @@ window.aliases = {
     1159: ['マゼラン署長 海底監獄インペルダウン',''],
     1160: ['コアラ ビーチの天使','','Summertime Koala','Swimsuit Koala'],
     1161: ['コアラ 楽園の女神','','Summertime Koala','Swimsuit Koala'],
-    1162: ['ギルド・テゾーロ','','Raid'],
-    1163: ['ギルド・テゾーロ 黄金船のカジノ王','','Raid'],
-    1164: ['カリーナ','','Raid'],
-    1165: ['カリーナ 黄金船の歌姫','','Raid'],
+    1162: ['ギルド・テゾーロ','','Raid Tesoro'],
+    1163: ['ギルド・テゾーロ 黄金船のカジノ王','','Raid Tesoro'],
+    1164: ['カリーナ','','Raid Carina'],
+    1165: ['カリーナ 黄金船の歌姫','','Raid Carina'],
     1166: ['バカラ',''],
     1167: ['バカラ 黄金船のコンシェルジュ',''],
     1168: ['ダイス',''],
@@ -1269,8 +1269,8 @@ window.aliases = {
     1268: ['黒ひげ 黒ひげ海賊団船長','',''],
     1269: ['ラフィット','',''],
     1270: ['“鬼保安官”ラフィット','',''],
-    1271: ['ヴァン・オーガー','',''],
-    1272: ['“音越”ヴァン・オーガー','',''],
+    1271: ['ヴァン・オーガー','','Vaper', 'Van Ogre'],
+    1272: ['“音越”ヴァン・オーガー','','','Vaper', 'Van Ogre'],
     1273: ['ジーザス・バージェス','',''],
     1274: ['“チャンピオン”ジーザス・バージェス','',''],
     1275: ['シリュウ','','Shiliew'],
@@ -1417,16 +1417,16 @@ window.aliases = {
     1416: ['仏のセンゴク 智将', '', ''],
     1417: ['ロンズ', '', ''],
     1418: ['カイゼルヒゲ', '', ''],
-    1419: ['', '', 'Kimono Lucci'],
-    1420: ['', '', 'Kimono Lucci'],
-    1421: ['', '', 'Coliseum Diamante'],
-    1422: ['', '', 'Coliseum Diamante'],
-    1423: ['', '', 'Coliseum T-Bone'],
-    1424: ['', '', 'Coliseum Gin'],
-    1425: ['', '', ''],
-    1426: ['', '', ''],
-    1427: ['', '', ''],
-    1428: ['', '', ''],
+    1419: ['ロブ・ルッチ 紋付袴の手招き', '', 'Kimono Lucci'],
+    1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci'],
+    1421: ['ディアマンテ はためく旗（フラッグ）人間', '', 'Coliseum Diamante'],
+    1422: ['ディアマンテ ドンキホーテファミリー最高幹部', '', 'Coliseum Diamante'],
+    1423: ['Tボーン 海軍本部大佐', '', 'Coliseum T-Bone'],
+    1424: ['ギン 海賊艦隊　戦闘“総隊長”', '', 'Coliseum Gin'],
+    1425: ['サイ 八宝水軍', '', ''],
+    1426: ['サイ 八宝水軍第１３代棟梁', '', ''],
+    1427: ['ブー 八宝水軍', '', ''],
+    1428: ['ジャン・アンゴ', '', ''],
     1429: ['', '', 'Valentine Mansherry'],
     1430: ['', '', 'Valentine Mansherry'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index d280e8fe2..b3257439a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3942,7 +3942,7 @@ window.captains = {
         rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1419: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
     },
     1420: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index eb4471d9a..897b5ff88 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1222,10 +1222,10 @@ window.cooldowns = [
     [ 29, 16 ],
     [ 29, 16 ],
     [ 20, 10 ],
-    15,
+    [ 15, 9 ],
     16,
     17,
-    23,
+    [ 23, 16 ],
     22,
     [ 22, 15 ],//Sentomaru
     [ 22, 15 ],//Sentomaru
@@ -1423,10 +1423,10 @@ window.cooldowns = [
     [ 33, 17 ],
     [ 26, 14 ],
     [ 16, 7 ],
-    20,
-    20,
-    18,
-    12,
+    [ 20, 13 ],
+    [ 20, 13 ],
+    [ 18, 11 ],
+    [ 12, 8 ],
     [ 14, 14 ],
     [ 14, 14 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 12f516d3d..76f920631 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7644,7 +7644,7 @@ window.details = {
         specialName: "Defence of the Command Line",
     },
     1419: {//Kimono Lucci
-        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduce damage received by 10%",
+        captain: "Boosts ATK of Powerhouse characters by 2x, reduce damage received by 10%",
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
         specialName: "Lucci Special",
     },
@@ -7676,12 +7676,12 @@ window.details = {
     },
     1425: {//Don Sai 3*
         captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, amplifies the effect of orbs by 1.5x for 3 turns",
+        special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
         specialName: "Military Leg Heel",
     },
     1426: {//Don Sai 4*
         captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
-        special: "Deals 25x character's ATK in QCK damage to one enemy.  When this special ativates when a character is locked, amplifies the effect of orbs by 1.5x for 3 turns",
+        special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
         specialName: "Military Leg Heel",
     },
     1427: {//Boo 4*
@@ -7707,5 +7707,4 @@ window.details = {
         special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
         specialName: "Boy's Unknown Taste of Hard Work",
     },
-};
-
+};
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index c2d28c05f..95ac356b5 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2044,15 +2044,15 @@ window.specials = {
         },
         type: "class"
     },
-    1426: {
+    1425: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
-    1427: {
+    1426: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
-    1406: {
+    1428: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "class",
         warning: "Selected special (%name%) assumes that the enemy has been Delayed."
diff --git a/common/data/units.js b/common/data/units.js
index 1fc3d2290..61a3a9d65 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -351,9 +351,9 @@ window.units = [
     [ "Topaz Jeweled Porc", "PSY", "Booster", 3, 5, 4, 0, 1, 0, 160, 78, 35, 160, 78, 35, 1 ],
     [ "Amethyst Jeweled Porc", "INT", "Booster", 3, 5, 4, 0, 1, 0, 159, 108, 21, 159, 108, 21, 1 ],
     [ "Zephyr", "INT", [ "Shooter", "Powerhouse" ], 4, 30, 7, 1, 70, 1066998, 320, 133, 4, 1588, 699, 29, 1 ],
-    [ "Zephyr NEO Navy Commander", "INT", [ "Shooter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
+    [ "Zephyr, NEO Marines Leader", "INT", [ "Shooter", "Powerhouse" ], 5, 50, 4, 2, 99, 5000000, 1550, 680, 11, 3702, 1252, 88, 1 ],
     [ "Ain", "QCK", [ "Shooter", "Cerebral" ], 3, 8, 6, 1, 35, 136167, 96, 87, 47, 688, 421, 195, 1 ],
-    [ "Ain NEO Navy Vice Admiral", "QCK", [ "Shooter", "Cerebral" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
+    [ "Ain NEO Marines", "QCK", [ "Shooter", "Cerebral" ], 4, 13, 4, 2, 70, 1066998, 620, 377, 155, 908, 679, 285, 1 ],
     [ "Eustass Kid", "STR", [ "Striker", "Driven" ], 4, 18, 4, 3, 70, 1066998, 233, 141, 12, 1221, 721, 32, 1 ],
     [ "Captain Kid", "STR", [ "Striker", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1138, 651, 21, 3515, 1298, 69, 1 ],
     [ "Scratchmen Apoo", "DEX", [ "Shooter", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 209, 122, 39, 1126, 652, 184, 1 ],
@@ -407,8 +407,8 @@ window.units = [
     [ "General Zombie", "INT", "Fighter", 3, 12, 5, 1, 70, 1066998, 920, 352, 0, 2610, 605, 0, 1 ],
     [ "Jigoro of the Wind", "DEX", "Slasher", 3, 9, 6, 1, 50, 392109, 426, 258, 37, 1348, 744, 0, 1 ],
     [ "Sir Crocodile Warlord of the Sea", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1088, 659, 147, 2980, 1380, 150, 1 ],
-    [ "Jimbe", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 266, 101, 35, 1590, 660, 118, 1 ],
-    [ "Jimbe Warlord of the Sea", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
+    [ "Jinbe", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 266, 101, 35, 1590, 660, 118, 1 ],
+    [ "Jinbe, Warlord of the Sea", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1522, 622, 70, 3055, 1092, 250, 1 ],
     [ "Bartholomew Kuma", "STR", [ "Shooter", "Powerhouse" ], 4, 15, 4, 3, 70, 1066998, 290, 110, 33, 1525, 692, 118, 1 ],
     [ "Bartholomew Kuma Warlord of the Sea", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1445, 644, 82, 2734, 1205, 262, 1 ],
     [ "Gecko Moria", "INT", [ "Striker", "Driven" ], 4, 15, 4, 3, 70, 1066998, 355, 102, 15, 1928, 677, 33, 1 ],
@@ -455,7 +455,7 @@ window.units = [
     [ "Fossa", "STR", [ "Slasher", "Driven" ], 4, 18, 4, 3, 50, 522812, 150, 160, 34, 1120, 831, 132, 1 ],
     [ "Fossa the Blazing Katana", "STR", [ "Slasher", "Driven" ], 5, 28, 4, 4, 99, 4000000, 1059, 788, 95, 2454, 1388, 228, 1 ],
     [ "Curiel", "INT", [ "Shooter", "Driven" ], 4, 18, 6, 3, 50, 522812, 202, 153, 48, 1159, 818, 134, 1 ],
-    [ "Heavy Specialist Curiel", "INT", [ "Shooter", "Driven" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
+    [ "Heavy Artillery Curiel", "INT", [ "Shooter", "Driven" ], 5, 28, 5, 4, 99, 4000000, 1092, 762, 99, 2470, 1359, 252, 1 ],
     [ "Sengoku", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 70, 1066998, 610, 278, 157, 2020, 758, 228, 1 ],
     [ "Sengoku the Buddha", "PSY", [ "Fighter", "Cerebral" ], 6, 54, 4, 5, 99, 5000000, 1962, 711, 191, 3429, 1338, 389, 1 ],
     [ "Galdino the Criminal, Mr. 3", "PSY", [ "Slasher", "Cerebral" ], 3, 12, 4, 2, 70, 1066998, 588, 333, 133, 1033, 687, 233, 1 ],
@@ -646,7 +646,7 @@ window.units = [
     [ "Ice Witch Whitey Bay", "INT", [ "Slasher", "Driven" ], 5, 29, 5, 4, 99, 4000000, 1094, 561, 171, 2278, 993, 399, 0.7 ],
     [ "Little Oars Jr.", "STR", [ "Shooter", "Powerhouse" ], 4, 20, 6, 3, 70, 1066998, 251, 166, 1, 1900, 734, 3, 0.7 ],
     [ "Little Oars Jr., Charging!", "STR", [ "Shooter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1533, 801, 2, 4000, 1300, 9, 0.7 ],
-    [ "Marco Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
+    [ "Marco, Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 50, 392109, 455, 268, 177, 1612, 777, 303, 0.7 ],
     [ "Marco the Phoenix Whitebeard 1st Div. Commander", "QCK", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1555, 734, 258, 3013, 1402, 455, 0.7 ],
     [ "Nami Voyage Log: Straw Hat Pirates", "INT", [ "Striker", "Cerebral" ], 4, 12, 4, 2, 50, 392109, 143, 65, 50, 998, 498, 254, 0.7 ],
     [ "Nami Voyage Dream: World Map", "INT", [ "Striker", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 922, 434, 198, 1890, 900, 380, 0.7 ],
@@ -715,8 +715,8 @@ window.units = [
     [ "Pierre", "DEX", "Fighter", 3, 12, 4, 1, 50, 392109, 69, 32, 38, 920, 480, 182, 1 ],
     [ "Conis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
     [ "Conis, Skypiea Girl", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
-    [ "Dracule Mihawk Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
-    [ "Hawk Eyes Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
+    [ "Dracule Mihawk, Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
+    [ "'Hawk Eyes' Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
     [ "Sir Crocodile: Logia, Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
     [ "Sir Crocodile: Logia, Ex-Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
     [ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
@@ -778,18 +778,18 @@ window.units = [
     [ "Lucky Roo of the Red Hair Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 20, 5, 3, 70, 1778330, 842, 412, 70, 1606, 789, 188, 0.7 ],
     [ "Rebecca, Imprisoned Swordsman", "QCK", "Striker", 4, 18, 5, 1, 50, 392109, 193, 112, 51, 1003, 503, 201, 1 ],
     [ "Rebecca, Coliseum's Exclusive Gladiator", "QCK", "Striker", 5, 30, 4, 3, 99, 3000000, 920, 441, 150, 1947, 853, 374, 1 ],
-    [ "Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
-    [ "Mad Monk Urouge, Captain of the Fallen Monk Pirates", "STR", [ "Fighter", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1512, 755, 83, 2824, 1324, 203, 1.5 ],
+    [ "Urouge, Fallen Monk Pirates Captain", "STR", [ "Fighter", "Striker" ], 4, 25, 5, 2, 70, 1066998, 702, 340, 38, 1580, 790, 121, 1.5 ],
+    [ "Mad Monk Urouge, Fallen Monk Pirates Captain", "STR", [ "Fighter", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1512, 755, 83, 2824, 1324, 203, 1.5 ],
     [ "Tashigi: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 4, 13, 5, 2, 50, 392109, 132, 65, 49, 999, 495, 205, 1 ],
     [ "Tashigi Marine Officer: Flower of Justice", "INT", [ "Slasher", "Cerebral" ], 5, 20, 5, 3, 99, 3000000, 932, 428, 164, 1804, 890, 378, 1 ],
     [ "Gen-san", "STR", [ "Slasher", "Cerebral" ], 3, 9, 5, 2, 35, 136167, 211, 45, 33, 930, 288, 190, 1 ],
     [ "Genzo, Cocoyasi Village Resident", "STR", [ "Slasher", "Cerebral" ], 4, 15, 4, 3, 70, 1066998, 879, 242, 143, 1324, 501, 299, 1 ],
-    [ "Dr. Hiluluk", "PSY", [ "Shooter", "Free Spirit" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
-    [ "Dr. Hiluluk, Quack Doctor", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
+    [ "Dr. Hiriluk", "PSY", [ "Shooter", "Free Spirit" ], 3, 9, 6, 2, 35, 136167, 231, 63, 5, 1248, 461, 84, 1 ],
+    [ "Dr. Hiriluk, Quack Doctor", "PSY", [ "Shooter", "Free Spirit" ], 4, 15, 5, 3, 70, 1066998, 1233, 451, 84, 1248, 518, 312, 1 ],
     [ "Kuina", "DEX", "Striker", 3, 9, 6, 2, 35, 136167, 54, 41, 70, 503, 264, 251, 1 ],
     [ "Kuina, Shimotsuki Village's Girl Swordsman", "DEX", [ "Slasher", "Driven" ], 4, 15, 5, 3, 70, 1066998, 448, 220, 213, 917, 582, 338, 1 ],
-    [ "Tamanegi, Piiman & Ninjin", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
-    [ "Tamanegi, Piiman & Ninjin, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
+    [ "Onion, Pepper & Carrot", "QCK", [ "Striker", "Free Spirit" ], 3, 9, 4, 3, 35, 136167, 80, 10, 66, 716, 142, 249, 1 ],
+    [ "Onion, Pepper & Carrot, the Usopp Pirates", "QCK", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 70, 1066998, 654, 77, 180, 1200, 333, 350, 1 ],
     [ "Iceburg", "INT", [ "Shooter", "Cerebral" ], 3, 9, 6, 2, 35, 136167, 155, 69, 38, 790, 392, 167, 1 ],
     [ "Iceburg, Mayor of W7 and President of Galley-La Company", "INT", [ "Shooter", "Cerebral" ], 4, 16, 4, 3, 70, 1066998, 723, 343, 122, 1401, 702, 224, 1 ],
     [ "Monkey D. Luffy Star of Hope", "INT", [ "Slasher", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 259, 179, 0, 1400, 763, 0, 1.5 ],
@@ -828,11 +828,11 @@ window.units = [
     [ "Blazing General Zombie", "QCK", [ "Slasher", "Powerhouse" ], 3, 20, 6, 1, 70, 1066998, 113, 54, 29, 1768, 789, 0, 1 ],
     ["Trafalgar Law, the Boy from the White City", "PSY", ["Slasher", "Driven"], 4, 10, 4, 3, 35, 90778, 442, 60, 0, 455, 497, 222, 1],
     ["Trafalgar Law, the Boy Saved by Fate", "PSY", ["Slasher", "Driven"], 5, 18, 5, 3, 70, 1066998, 442, 424, 149, 696, 762, 390, 1],
-    [ "Basil Hawkins, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
-    [ "Basil Hawkins the Magician, Captain of the Hawkins Pirates", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
-    [ "Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
-    [ "Berserker Wyper, Warrior of Shandia", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
-    [ "Mr. 7 & Miss Father's Day", "QCK", [ "Shooter", "Driven" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
+    [ "Basil Hawkins, Hawkins Pirates Captain", "DEX", [ "Cerebral", "Striker" ], 4, 25, 6, 2, 70, 1066998, 639, 298, 69, 1219, 745, 201, 1 ],
+    [ "Basil Hawkins the Magician, Hawkins Pirates Captain", "DEX", [ "Cerebral", "Striker" ], 5, 40, 4, 3, 99, 4000000, 1157, 690, 147, 2239, 1278, 347, 1 ],
+    [ "Wyper, Shandian Warrior", "STR", [ "Shooter", "Free Spirit" ], 4, 18, 6, 1, 50, 392109, 229, 151, 10, 1198, 611, 33, 1 ],
+    [ "Berserker Wyper, Shandian Warrior", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 5, 3, 99, 3000000, 1140, 543, 15, 2095, 1260, 99, 1 ],
+    [ "Mr. 7 and Ms. Father's Day", "QCK", [ "Shooter", "Driven" ], 4, 20, 6, 2, 70, 1778330, 68, 42, 105, 1085, 625, 315, 1 ],
     [ "Tyrant Bartholomew Kuma", "STR", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 260, 170, 90, 1201, 623, 190, 1 ],
     [ "Tyrant Bartholomew Kuma, Government Human Weapon", "STR", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1159, 572, 190, 3090, 1435, 90, 1 ],
     [ "Caesar Clown", "DEX", [ "Driven", "Cerebral" ], 4, 18, 5, 3, 70, 1066998, 71, 141, 71, 989, 740, 204, 1 ],
@@ -850,7 +850,7 @@ window.units = [
     [ "Cutty Flam, Tom's Workers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 24, 138, 15, 924, 932, 139, 1 ],
     [ "Iceburg, Tom's Workers", "QCK", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 70, 1066998, 58, 60, 36, 1098, 694, 203, 1 ],
     [ "Wapol of Tin", "STR", [ "Shooter", "Driven" ], 3, 12, 6, 2, 70, 1066998, 160, 78, 26, 1304, 800, 99, 1 ],
-    [ "Slim-up Wapol", "QCK", [ "Shooter", "Driven" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
+    [ "Slimmed-down Wapol", "QCK", [ "Shooter", "Driven" ], 4, 20, 5, 2, 99, 3000000, 837, 505, 95, 1923, 867, 247, 1 ],
     [ "Robson", "PSY", [ "Fighter", "Powerhouse" ], 3, 9, 6, 1, 50, 392109, 155, 22, 36, 1574, 318, 151, 1 ],
     [ "Chopper's Snow Day", "DEX", [ "Fighter", "Powerhouse" ], 4, 15, 5, 2, 99, 2000000, 130, 30, 50, 1920, 614, 293, 1 ],
     [ "Trafalgar Law Holy Night Gentleman", "DEX", [ "Slasher", "Free Spirit" ], 4, 12, 6, 3, 50, 392109, 182, 93, 43, 995, 489, 198, 1 ],
@@ -862,8 +862,8 @@ window.units = [
     [ "Lady Alvida, Lovely Beauty", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 1, 50, 392109, 240, 92, 31, 1030, 534, 197, 1 ],
     [ "Lady Alvida, Peerless Beauty", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 967, 466, 148, 2092, 1000, 307, 1 ],
     [ "Snowscape Nami", "QCK", [ "Striker", "Cerebral" ], 4, 15, 5, 2, 99, 2000000, 77, 33, 78, 1459, 674, 349, 1 ],
-    [ "Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
-    [ "Empress Boa Hancock, Captain of the Kuja Pirates", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
+    [ "Boa Hancock, Kuja Pirates Captain", "PSY", [ "Shooter", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 153, 138, 57, 1020, 633, 201, 1 ],
+    [ "Empress Boa Hancock, Kuja Pirates Captain", "PSY", [ "Shooter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 943, 589, 161, 2055, 1378, 375, 1 ],
     [ "Nico Robin Cien Fleur Wing: The Storm", "INT", [ "Cerebral", "Slasher" ], 4, 15, 4, 2, 99, 2000000, 238, 203, 83, 1518, 1061, 290, 1 ],
     [ "Usopp Tabasco Star: The Storm", "DEX", "Shooter", 4, 15, 7, 2, 99, 2000000, 258, 152, 94, 1866, 704, 343, 1 ],
     [ "Tony Tony Chopper Heavy Gong: The Storm", "STR", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 2, 99, 2000000, 303, 168, 70, 2171, 900, 231, 1 ],
@@ -883,7 +883,7 @@ window.units = [
     [ "Roar of the Sea Scratchmen Apoo, Captain of the On Air Pirates", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 3, 99, 4000000, 1188, 639, 175, 2309, 1190, 351, 1 ],
     [ "Dorry, Giant Warrior Pirates", "INT", [ "Slasher", "Powerhouse" ], 4, 18, 6, 1, 50, 392109, 261, 120, 20, 1420, 503, 90, 1 ],
     [ "Dorry the Blue Ogre", "INT", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1366, 449, 64, 2640, 1000, 156, 1 ],
-    [ "Jimbe, Shark Soldier", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
+    [ "Jinbe, Shark Soldier", "PSY", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 84, 34, 29, 1990, 1020, 298, 1 ],
     [ "Mr. 1, West Blue Swordsman", "STR", [ "Slasher", "Cerebral" ], 4, 17, 6, 2, 99, 2000000, 45, 24, 19, 2024, 1044, 118, 1.5 ],
     [ "Buggy, Cheerfully Crazy", "QCK", [ "Driven", "Free Spirit" ], 4, 17, 5, 2, 99, 2000000, 32, 19, 30, 1790, 694, 285, 1.5 ],
     [ "Horo Horo Ghost", "PSY", "Free Spirit", 2, 6, 4, 0, 35, 90778, 40, 20, 100, 150, 90, 190, 1 ],
@@ -903,28 +903,28 @@ window.units = [
     [ "Broggy, Giant Warrior Pirates", "PSY", [ "Slasher", "Powerhouse" ], 4, 18, 5, 1, 50, 392109, 261, 120, 20, 1354, 539, 90, 1 ],
     [ "Broggy the Red Ogre", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 1292, 463, 64, 2460, 1090, 156, 1 ],
     [ "Yokozuna", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 2, 70, 1778330, 520, 170, 45, 1852, 700, 162, 1 ],
-    [ "Roronoa Zoro, the Swordsman Who Wanders Kuraigana Island", "STR", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
+    [ "Roronoa Zoro, Gloom Island Swordsman", "STR", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 200, 142, 15, 1492, 750, 101, 1 ],
     [ "Roronoa Zoro, Pupil of the World's Strongest Swordsman", "STR", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1403, 687, 67, 2830, 1390, 190, 1 ],
     [ "Nico Robin, Tequila Wolf Inmate", "INT", [ "Cerebral", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 131, 91, 43, 1021, 679, 217, 1 ],
-    [ "Nico Robin, Light of the Revolution", "INT", [ "Cerebral", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
-    [ "Tony Tony Chopper, Torino Kingdom's Peace Mediator", "PSY", [ "Fighter", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
-    [ "Chopper Mask, the Hero Who Protects the World", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
-    [ "Sanji, Kamabakka Queendom Fugitive", "DEX", [ "Powerhouse", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
-    [ "Sanji, the Cook of Love Who Laid His Manliness on the Line", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
+    [ "Nico Robin, Flame of the Revolution", "INT", [ "Cerebral", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 946, 593, 178, 2011, 1156, 400, 1 ],
+    [ "Tony Tony Chopper, Birdie Kingdom Peace Broker", "PSY", [ "Fighter", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 187, 70, 42, 1300, 504, 220, 1 ],
+    [ "Chopper Mask, Defender of Peace", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1234, 447, 170, 2500, 912, 404, 1 ],
+    [ "Sanji, Kamabakka Kingdom Escapee", "DEX", [ "Powerhouse", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 212, 124, 20, 1575, 701, 127, 1 ],
+    [ "Sanji, Chef of Love", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1498, 634, 85, 2926, 1349, 201, 1 ],
     [ "Brook, Harahetternia's Demon Lord", "QCK", [ "Free Spirit", "Slasher" ], 4, 18, 6, 3, 70, 1066998, 159, 90, 39, 1281, 597, 201, 1 ],
     [ "Brook, BONE to be Wild!!!", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1220, 531, 150, 2392, 1137, 352, 1 ],
     [ "Nico Robin, Bride of Ohara", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 4, 2, 50, 392109, 72, 38, 43, 899, 409, 105, 1 ],
     [ "Beautiful and Talented Woman Wedding Robin", "QCK", [ "Cerebral", "Fighter" ], 5, 20, 4, 3, 99, 3000000, 826, 327, 143, 1851, 812, 371, 1 ],
     [ "Marguerite", "QCK", "Shooter", 3, 13, 4, 1, 50, 392109, 80, 53, 37, 920, 577, 207, 1 ],
-    [ "Marguerite, Warrior Defending Her Country", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 1 ],
+    [ "Marguerite, Gaurdian Warrior", "QCK", "Shooter", 4, 20, 5, 2, 99, 3000000, 854, 516, 145, 1563, 1070, 335, 1 ],
     [ "Aphelandra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 98, 42, 32, 2001, 604, 141, 1 ],
-    [ "Sweet Pea", "STR", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
+    [ "Sweetpea", "STR", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 210, 157, 26, 1041, 1041, 155, 1 ],
     [ "Boa Hancock, Bride of the Island of Women", "INT", [ "Shooter", "Free Spirit" ], 4 , 13 , 4 , 2 , 50 ,392109, 142 , 91 , 46 ,912,556,153,1],
     [ "Empress in Love Hancock, Wedding", "INT", [ "Shooter", "Free Spirit" ], 5 , 20 , 4 , 3 , 99 ,3000000, 832 , 497 , 106 ,1913,1012,294,1],
-    [ "South Blue's Captain Kid", "STR", [ "Striker", "Driven" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
-    [ "Captain Kid, Captain of the Kid Pirates", "STR", [ "Striker", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
-    [ "Chief Guard Sadie-chan", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
-    [ "Chief Guard Sadie-chan, Commander of the Jailer Beasts", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
+    [ "Captain Kid of the South Blue", "STR", [ "Striker", "Driven" ], 4, 25, 4, 2, 70, 1066998, 710, 309, 44,1600,703,146,1],
+    [ "Captain Kid, Kid Pirates Captain", "STR", [ "Striker", "Driven" ], 5, 40, 4, 3, 99, 4000000, 1549, 640, 112,2727,1319,224,1],
+    [ "Secuurity Chief Miss Sadie", "QCK", [ "Striker", "Free Spirit" ],4, 18, 6, 1, 50,392109, 413, 246, 88, 977, 544, 191, 1],
+    [ "Secuurity Chief Miss Sadie, Jailer Beasts Commander", "QCK", ["Striker", "Free Spirit"], 5, 30, 4, 3, 99, 3000000, 920, 488, 159, 1901, 912, 357, 1],
     [ "Doberman, Navy HQ Vice Admiral", "INT", [ "Slasher", "Driven" ], 4, 20, 6, 2, 70, 1778330, 200, 210, 71, 1085, 951, 205, 1],
     [ "Hannyabal", "DEX", ["Driven", "Striker"],3, 13, 6, 1, 50, 392109, 157, 44, 39, 1412, 497, 151, 1],
     [ "Hannyabal, Impel Down Vice Warden", "DEX", [ "Driven", "Striker" ],4, 20, 4, 2, 99, 3000000, 1333, 429, 102, 2603, 940, 205, 1],
@@ -932,15 +932,15 @@ window.units = [
     [ "Blugori", "DEX", [ "Powerhouse", "Slasher" ], 3, 11, 4, 0, 50, 392109, 103, 99, 1, 1119, 999, 31, 1],
     [ "Pica", "PSY", [ "Powerhouse","Driven" ], 4, 30, 4, 1, 70, 1066998, 300, 99, 5, 1730, 630, 6, 1],
     [ "Pica, Donquixote Pirates", "PSY", [ "Powerhouse", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1660, 552, 5, 4050, 1180, 9, 1],
-    [ "Knight of the Sea Jimbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 1066998, 572, 268, 102, 1841, 797, 229, 1],
-    [ "Knight of the Sea Jimbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
+    [ "Knight of the Sea Jinbe", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 5, 4, 70, 1066998, 572, 268, 102, 1841, 797, 229, 1],
+    [ "Knight of the Sea Jinbe, Warlord of the Sea", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1787, 733, 179, 3400, 1440, 347, 1],
     [ "Monkey D. Luffy, Summit War Survivor", "QCK", [ "Fighter", "Free Spirit" ], 4, 18, 7, 3, 70, 1066998, 151, 150, 21, 1220, 764, 149, 1],
     [ "Monkey D. Luffy, Crew's Promise: 3D2Y", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1173, 712, 99, 2406, 1415, 257, 1],
-    [ "Nami, Seeker of Weather Science", "PSY", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
+    [ "Nami, Weather Researcher", "PSY", [ "Striker", "Cerebral" ], 4, 18, 4, 3, 70, 1066998, 141, 80, 48, 1102, 584, 233, 1],
     [ "Nami, Weatheria's Cat Burglar", "PSY", [ "Striker", "Cerebral" ], 5, 30, 5, 4, 99, 4000000, 1037, 522, 189, 2119, 1081, 413, 1],
-    [ "Usopp, Boin Archipelago's Glutton", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
+    [ "Usopp, Bowin Islands Food Addict", "DEX", "Fighter", 4, 18, 6, 3, 70, 1066998, 271, 52, 34, 1748, 453, 172, 1],
     [ "Usopp, Swindling Forest's Resolute Warrior", "DEX", "Shooter", 5, 30, 4, 4, 99, 4000000, 1669, 398, 131, 3239, 800, 323, 1],
-    [ "Franky, Cyborg Fighting Mecha Animals", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
+    [ "Franky, Mech-Animal Fighting Cyborg", "STR", [ "Free Spirit", "Shooter" ], 4, 18, 4, 3, 70, 1066998, 220, 112, 22, 1603, 686, 131, 1],
     [ "Cyborg Franky, Sacred Beast of Baldimore", "STR", [ "Free Spirit", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1535, 635, 88, 2810, 1249, 244, 1],
     [ "Perona, Malicious Old Castle Bride", "PSY", [ "Shooter", "Driven" ], 4, 13, 4, 2, 50, 392109, 59, 34, 47, 814, 392, 223, 1],
     [ "Fancy Princess Wedding Perona", "PSY", [ "Shooter", "Driven" ], 5, 20, 5, 3, 99, 3000000, 740, 333, 172, 1787, 787, 390, 1],
@@ -1009,7 +1009,7 @@ window.units = [
     [ "Monet Coldest Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 5, 20, 6, 3, 99, 3000000, 831, 366, 162, 1660, 869, 384, 1],
     [ "Kizuna BOOST Luffy", "STR", ["Fighter","Powerhouse"], 4, 20, 6, 2, 99, 3000000, 465, 232, 36, 1978, 1170, 220, 1 ],
     [ "Count Butler", "INT", ["Driven","Cerebral"], 3, 12, 4, 1, 50, 392109, 103, 25, 41, 1172, 377, 220, 1 ],
-    [ "Count Butler (Ruling Power)", "INT", ["Driven","Powerhouse"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
+    [ "Count Butler, King's Power", "INT", ["Driven","Powerhouse"], 4, 20, 5, 2, 99, 3000000, 1175, 606, 50, 2152, 1100, 220, 1 ],
     [ "President Heaby", "QCK", ["Slasher","Driven"], 3, 15, 6, 1, 70, 1422664, 118, 78, 32, 1221, 799, 203, 1 ],
     [ "General Hotdog", "DEX", ["Fighter","Driven"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Powerhouse"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
@@ -1025,7 +1025,7 @@ window.units = [
     [ "Don Chin Jao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
     [ "Don Chin Jao, Kano Kingdom Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
-    [ "Blue Gilly, Jao Kun Do Martial Artist", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 4000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
+    [ "Blue Gilly, Jiaokungdo Fighter", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 4000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
     [ "Funk Brothers", "DEX", [ "Fighter","Driven" ], 4, 18, 5, 3, 70, 1066998, 60, 172, 44, 937, 824, 109, 1 ],
     [ "Funk Brothers, Mogaro Kingdom Assassins", "DEX", [ "Fighter","Driven" ], 5, 30, 8, 4, 99, 4000000, 1500, 824, 77, 2920, 1251, 226, 1 ],
     [ "Hajrudin", "PSY", [ "Powerhouse","Fighter" ], 4, 18, 5, 3, 70, 1066998, 201, 177, 38, 1403, 795, 116, 1 ],
@@ -1033,7 +1033,7 @@ window.units = [
     [ "Abdullah and Jeet", "STR", [ "Slasher","Striker" ], 4, 18, 6, 3, 70, 1066998, 143, 143, 52, 1003, 722, 208, 1 ],
     [ "Abdullah and Jeet, Former Bounty Hunters", "STR", [ "Slasher","Striker" ], 5, 30, 6, 4, 99, 4000000, 920, 673, 156, 1970, 1345, 343, 1 ],
     [ "Bartolomeo", "STR", [ "Striker","Driven" ], 5, 30, 4, 4, 70, 1066998, 403, 278, 58, 1623, 813, 232, 1 ],
-    [ "Bartolomeo the Cannibal", "STR", [ "Striker","Driven" ], 6, 55, 4, 5, 99, 5000000, 1550, 769, 181, 3505, 1431, 341, 1 ],
+    [ "Man-Eating Bartolomeo", "STR", [ "Striker","Driven" ], 6, 55, 4, 5, 99, 5000000, 1550, 769, 181, 3505, 1431, 341, 1 ],
     [ "Emporio Ivankov Queen of the Secret Garden", "QCK", [ "Free Spirit","Fighter" ], 3, 12, 5, 1, 50, 392109, 161, 39, 39, 1198, 492, 202, 1 ],
     [ "Emporio Ivankov Queen of the Garden of Miracles", "QCK", [ "Free Spirit","Fighter" ], 4, 20, 4, 2, 99, 3000000, 1120, 443, 141, 2007, 906, 322, 1 ],
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
@@ -1061,27 +1061,27 @@ window.units = [
     [ "Marguerite, Kuja Warriors", "PSY", [ "Shooter" ], 4, 15, 5, 2, 70, 1066998, 642, 339, 143, 1003, 713, 301, 1 ],
     [ "Kikyo", "QCK", [ "Shooter" ], 4, 14, 5, 2, 70, 1066998, 132, 94, 56, 999, 741, 262, 1 ],
     [ "Gloriosa", "INT", [ "Cerebral", "Fighter" ], 3, 14, 4, 2, 60, 674274, 586, 351, 79, 612, 378, 400, 1 ],
-    [ "Destructive Female Archer, Kuja Warriors", "STR", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 62, 31, 40, 933, 574, 252, 1 ],
-    [ "Scheming Female Archer, Kuja Warriors", "INT", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 58, 28, 44, 901, 549, 266, 1 ],
-    [ "Smart Swordswoman, Kuja Warriors", "INT", "Slasher", 3, 10, 4, 1, 60, 674274, 65, 98, 25, 787, 880, 174, 1 ],
+    [ "Destructive Archer, Kuja Warriors", "STR", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 62, 31, 40, 933, 574, 252, 1 ],
+    [ "Sneaky Archer, Kuja Warriors", "INT", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 58, 28, 44, 901, 549, 266, 1 ],
+    [ "Wise Swordswoman, Kuja Warriors", "INT", "Slasher", 3, 10, 4, 1, 60, 674274, 65, 98, 25, 787, 880, 174, 1 ],
     [ "Bright Swordswoman, Kuja Warriors", "PSY", "Slasher", 3, 10, 4, 1, 60, 674274, 63, 90, 30, 762, 843, 191, 1 ],
-    [ "Skilled Female Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
-    [ "Nimble Female Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
-    [ "Shuraiya Bascùd", "DEX", [ "Fighter", "Driven" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
-    [ "Shuraiya Bascùd, Pirate Executioner", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
+    [ "Proficient Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
+    [ "Nimble Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
+    [ "Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
+    [ "'Pirate Executioner' Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
     [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, 392109, 129, 67, 18, 1494, 571, 101, 1 ],
     [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Striker" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
     [ "Needless", "QCK", [ "Slasher", "Driven" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
     [ "Ricky", "INT", [ "Cerebral", "Striker" ], 4, 18, 6, 3, 70, 1066998, 207, 102, 62, 1177, 524, 246, 1 ],
-    [ "Ricky, Mysterious Gladiator", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1102, 467, 199, 2689, 900, 395, 1 ],
+    [ "Ricky, Mystery Swordsman", "INT", [ "Cerebral", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1102, 467, 199, 2689, 900, 395, 1 ],
     [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 131, 142, 54, 979, 700, 222, 1 ],
-    [ "Leo, Captain of the Tontatta Warriors", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 918, 637, 177, 1934, 1351, 371, 1 ],
+    [ "Leo, Tontatta Corps Leader", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 918, 637, 177, 1934, 1351, 371, 1 ],
     [ "Mansherry", "PSY", "Striker", 4, 18, 6, 3, 70, 1066998, 100, 94, 86, 717, 416, 307, 1 ],
     [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 642, 371, 260, 1510, 642, 557, 1 ],
     [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 192, 152, 43, 1106, 713, 189, 1 ],
     [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1042, 657, 143, 2377, 1373, 290, 1 ],
     [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 130, 130, 31, 1300, 673, 130, 1 ],
-    [ "Don Sai, Flower Country Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1231, 631, 87, 3013, 1300, 202, 1 ],
+    [ "Don Sai, Kano Kingdom Gang", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1231, 631, 87, 3013, 1300, 202, 1 ],
     [ "Fujitora", "INT", [ "Driven", "Powerhouse" ], 5, 30, 4, 4, 70, 1066998, 430, 250, 77, 1890, 754, 204, 1 ],
     [ "Issho", "INT", [ "Driven", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1820, 700, 201, 3809, 1380, 325, 1 ],
     [ "Musshuru", "INT", [ "Driven", "Fighter" ], 3, 16, 6, 2, 50, 392109, 103, 110, 34, 729, 530, 189, 1 ],
@@ -1096,7 +1096,7 @@ window.units = [
     [ "Dr. Indigo, Golden Lion Pirates", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 2, 99, 3000000, 903, 432, 163, 1796, 911, 352, 1 ],
     [ "Commander Scarlet", "INT", [ "Powerhouse", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 121, 47, 5, 1323, 520, 59, 1 ],
     [ "Commander Scarlet, Golden Lion Pirates", "INT", [ "Powerhouse", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 1271, 467, 30, 2302, 980, 92, 1 ],
-    [ "Billy the Thunder Bird", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
+    [ "Billy", "PSY", [ "Shooter", "Powerhouse" ], 3, 10, 4, 2, 50, 392109, 54, 99, 40, 556, 803, 217, 1 ],
     [ "Coby, Petty Officer in the Rain", "DEX", [ "Fighter", "Cerebral" ], 4, 13, 6, 2, 50, 392109, 79, 50, 47, 963, 471, 178, 1 ],
     [ "Coby, Petty Officer Sparkling with Dew", "DEX", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 897, 429, 134, 1946, 995, 344, 1 ],
     [ "Black Arm Zephyr", "STR", [ "Fighter", "Driven" ], 4, 25, 5, 2, 70, 1066998, 545, 404, 0, 1384, 822, 0, 1 ],
@@ -1105,29 +1105,29 @@ window.units = [
     [ "Ain, Zephyr's Last Pupil", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 1019, 447, 169, 1986, 870, 357, 1 ],
     [ "Binz, NEO Marines", "DEX", [ "Striker", "Free Spirit" ], 4, 18, 4, 2, 50, 392109, 220, 122, 32, 1164, 541, 167, 1 ],
     [ "Binz, Zephyr's Last Pupil", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1091, 484, 115, 2107, 1042, 280, 1 ],
-    [ "Golden Lion Shiki", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, 1066998, 244, 164, 39, 1274, 709, 177, 1 ],
-    [ "Golden Lion Shiki, Golden Lion Pirates", "STR", [ "Driven", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1218, 638, 138, 2424, 1407, 292, 1 ],
+    [ "Shiki the Golden Lion", "STR", [ "Driven", "Slasher" ], 4, 30, 4, 2, 70, 1066998, 244, 164, 39, 1274, 709, 177, 1 ],
+    [ "Shiki the Golden Lion, Golden Lion Pirates", "STR", [ "Driven", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1218, 638, 138, 2424, 1407, 292, 1 ],
     [ "Nami, Rejuvenated Navigator", "PSY", [ "Cerebral", "Fighter" ], 3, 9, 5, 2, 50, 392109, 46, 27, 39, 770, 389, 266, 1 ],
-    [ "Nami, Playful Bar Idol", "PSY", [ "Cerebral", "Striker" ], 4, 18, 4, 3, 99, 3000000, 718, 322, 220, 1505, 707, 426, 1 ],
-    [ "Nico Robin, Rejuvanted Archaeologist", "QCK", [ "Cerebral", "Fighter" ], 3, 12, 6, 2, 50, 392109, 95, 39, 24, 992, 524, 162, 1 ],
-    [ "Nico Robin, Pretty Bar Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 921, 468, 119, 1789, 941, 346, 1 ],
-    [ "Chopper, Rejuvenated Ship Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 2, 50, 392109, 67, 55, 49, 524, 506, 300, 1 ],
-    [ "Monkey D. Luffy, Dream-Pursuing Adventurer", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
-    [ "Monkey D. Luffy, Loyal Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
-    [ "Sanji, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
-    [ "Sanji, Loyal Straw Hat Crew", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
-    [ "Nami, Dream-Pursuing Adventurer", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
-    [ "Nami, Loyal Straw Hat Crew", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
+    [ "Nami, Mischievous Tevern Idol", "PSY", [ "Cerebral", "Striker" ], 4, 18, 4, 3, 99, 3000000, 718, 322, 220, 1505, 707, 426, 1 ],
+    [ "Nico Robin, Rejuvenated Archaeologist", "QCK", [ "Cerebral", "Fighter" ], 3, 12, 6, 2, 50, 392109, 95, 39, 24, 992, 524, 162, 1 ],
+    [ "Nico Robin, Fetching Tavern Dancer", "QCK", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 921, 468, 119, 1789, 941, 346, 1 ],
+    [ "Chopper, Rejuvenated Doctor", "INT", [ "Striker", "Cerebral" ], 3, 9, 4, 2, 50, 392109, 67, 55, 49, 524, 506, 300, 1 ],
+    [ "Monkey D. Luffy, Dream Chaser", "STR", [ "Fighter", "Free Spirit" ], 4, 17, 4, 3, 70, 1066998, 242, 148, 28, 1505, 744, 106, 1 ],
+    [ "Monkey D. Luffy, A Pirate Who Lives By His Code", "STR", [ "Fighter", "Free Spirit" ], 5, 27, 8, 4, 99, 4000000, 1438, 676, 72, 2722, 1411, 176, 1 ],
+    [ "Sanji, Dream Chaser", "INT", [ "Fighter", "Powerhouse" ], 4, 17, 4, 3, 70, 1066998, 268, 115, 32, 1545, 698, 122, 1 ],
+    [ "Sanji, A Pirate Who Lives By His Code", "INT", [ "Fighter", "Powerhouse" ], 5, 27, 5, 4, 99, 4000000, 1471, 630, 86, 2834, 1224, 226, 1 ],
+    [ "Nami, Dream Chaser", "QCK", [ "Striker", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 190, 81, 57, 1051, 602, 230, 1 ],
+    [ "Nami, A Pirate Who Lives By Her Code", "QCK", [ "Striker", "Cerebral" ], 5, 27, 6, 4, 99, 4000000, 979, 540, 191, 1980, 1000, 455, 1 ],
     [ "Monkey D. Luffy, Wakes of the Endless Dream, Straw Hat Crew", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1 ],
     [ "Monkey D. Luffy, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
     [ "Cavendish", "QCK", [ "Slasher", "Driven" ], 5, 30, 4, 4, 70, 1066998, 504, 277, 148, 1603, 808, 287, 1 ],
-    [ "Cavendish of Hakuba", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, 5000000, 1541, 749, 231, 2970, 1460, 438, 1 ],
+    [ "White Knight Cavendish", "QCK", [ "Slasher", "Driven" ], 6, 55, 4, 5, 99, 5000000, 1541, 749, 231, 2970, 1460, 438, 1 ],
     [ "Suleiman", "PSY", [ "Slasher", "Cerebral" ], 4, 18, 6, 3, 70, 1066998, 102, 151, 34, 981, 780, 201, 1 ],
     [ "Suleiman the Beheader", "PSY", [ "Slasher", "Cerebral" ], 5, 30, 7, 4, 99, 4000000, 903, 713, 144, 2000, 1410, 336, 1 ],
     [ "Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 4, 18, 4, 3, 70, 1066998, 201, 102, 22, 1461, 668, 152, 1 ],
-    [ "Massacre Rule Orlumbus", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1389, 584, 103, 3065, 1180, 231, 1 ],
+    [ "Orlumbus, Massacre Ruler", "DEX", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1389, 584, 103, 3065, 1180, 231, 1 ],
     [ "Dagama", "INT", [ "Slasher", "Driven" ], 4, 18, 6, 3, 70, 1066998, 177, 52, 31, 1332, 554, 213, 1 ],
-    [ "Dagama, Tactician of Prodence Kingdom", "INT", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1255, 490, 150, 2940, 978, 320, 1 ],
+    [ "Dagama, Prodence Kingdom Tactician", "INT", [ "Slasher", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1255, 490, 150, 2940, 978, 320, 1 ],
     [ "Elizabello II", "STR", [ "Powerhouse", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 123, 157, 20, 1137, 800, 177, 1 ],
     [ "Elizabello II, King of Prodence Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1070, 724, 131, 2152, 1400, 303, 1 ],
     [ "Ideo", "QCK", [ "Shooter", "Fighter" ], 4, 18, 5, 3, 70, 1066998, 151, 120, 29, 1230, 679, 180, 1 ],
@@ -1144,41 +1144,41 @@ window.units = [
     [ "Foxy, Cowardly Fighter", "STR", [ "Free Spirit", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 867, 424, 120, 1877, 942, 313, 1 ],
     [ "Porche, Flower Cheerleader", "PSY", [ "Shooter", "Striker" ], 3, 10, 6, 2, 35, 136167, 129, 62, 40, 658, 372, 170, 1 ],
     [ "Porche, Cutie Baton", "PSY", [ "Shooter", "Slasher" ], 4, 20, 4, 3, 70, 1066998, 591, 314, 121, 1103, 656, 330, 1 ],
-    [ "Suppresion Uniformed Jailer", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 40, 21, 30, 858, 663, 242, 1 ],
-    [ "Urgent Uniformed Jailer", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 52, 20, 31, 894, 640, 246, 1 ],
-    [ "Siege Uniformed Jailer", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 54, 19, 31, 877, 651, 244, 1 ],
-    [ "Black Jailer", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 55, 39, 20, 994, 727, 177, 1 ],
-    [ "Yellow Jailer", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 92, 33, 22, 1003, 691, 192, 1 ],
+    [ "Uniformed Suppressor Jailer", "STR", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 40, 21, 30, 858, 663, 242, 1 ],
+    [ "Uniformed Emergency Jailer", "QCK", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 52, 20, 31, 894, 640, 246, 1 ],
+    [ "Uniformed Perimeter Jailer", "DEX", [ "Shooter", "Cerebral" ], 3, 12, 6, 1, 60, 449516, 54, 19, 31, 877, 651, 244, 1 ],
+    [ "Contemplative Guard", "INT", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 55, 39, 20, 994, 727, 177, 1 ],
+    [ "All-Action Guard", "PSY", [ "Striker", "Driven" ], 3, 12, 6, 1, 60, 449516, 92, 33, 22, 1003, 691, 192, 1 ],
     [ "Minotaur", "PSY", [ "Striker", "Powerhouse" ], 3, 30, 5, 1, 70, 1066998, 549, 237, -400, 2225, 885, -400, 1 ],
     [ "Minozebra", "INT", [ "Striker", "Powerhouse" ], 3, 30, 6, 1, 70, 1066998, 563, 229, -200, 2050, 835, -200, 1 ],
     [ "Sphinx", "STR", [ "Fighter", "Powerhouse" ], 3, 30, 4, 1, 70, 1066998, 622, 339, -300, 2455, 905, -300, 1 ],
     [ "Saldeath, Chief Guard", "DEX", [ "Cerebral", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 163, 131, 57, 912, 686, 309, 1 ],
     [ "Army Wolf", "QCK", "Fighter", 2, 8, 6, 0, 50, 261406, 36, 31, 21, 794, 585, 173, 1 ],
-    [ "Hannyabal, Vice Warden", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, 136167, 70, 31, 29, 824, 412, 128, 1 ],
-    [ "Hannyabal, Vice Warden of the Underwater Prison Impel Down", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
-    [ "Magellan, Chief Warden", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
-    [ "Magellan, Chief Warden of the Underwater Prison Impel Down", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
+    [ "Under Warden Hannyabal", "PSY", [ "Driven", "Striker" ], 3, 9, 6, 1, 35, 136167, 70, 31, 29, 824, 412, 128, 1 ],
+    [ "Under Warden Hannyabal, Undersea Prison - Impel Down", "PSY", [ "Driven", "Striker" ], 4, 16, 4, 3, 70, 1066998, 749, 352, 100, 1590, 755, 190, 1 ],
+    [ "Chief Warden Magellan", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 4, 1, 50, 392109, 154, 56, -250, 1093, 470, -250, 1 ],
+    [ "Chief Warden Magellan, Undersea Prison - Impel Down", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 5, 3, 99, 3000000, 1014, 470, -250, 3000, 1159, -300, 1 ],
     [ "Koala, Beach Angel", "QCK", [ "Fighter", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 133, 79, 37, 994, 479, 187, 1 ],
     [ "Koala, Goddess of Paradise", "QCK", [ "Fighter", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 902, 412, 123, 1822, 984, 359, 1 ],
-    [ "Gild Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
-    [ "Gild Tesoro, Casino King of Gran Tesoro", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 2000000, 1756, 1094, 268, 2256, 1300, 306, 1 ],
+    [ "Gild. Tesoro", "PSY", [ "Cerebral", "Driven" ], 4, 30, 5, 5, 99, 3000000, 187, 156, 56, 1756, 1094, 268, 1 ],
+    [ "Gild. Tesoro, Gold Ship Casino King", "PSY", [ "Cerebral", "Driven" ], 5, 50, 4, 5, 99, 2000000, 1756, 1094, 268, 2256, 1300, 306, 1 ],
     [ "Carina", "DEX", [ "Cerebral", "Slasher" ], 3, 10, 5, 1, 35, 136167, 98, 54, 58, 652, 394, 185, 1 ],
-    [ "Carina, Diva of Gran Tesoro", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, 1066998, 597, 321, 132, 1074, 719, 306, 1 ],
+    [ "Carina, Gold Ship Songstress", "DEX", [ "Cerebral", "Slasher" ], 4, 20, 5, 3, 70, 1066998, 597, 321, 132, 1074, 719, 306, 1 ],
     [ "Baccarat", "INT", [ "Fighter", "Striker" ], 3, 12, 5, 2, 50, 392109, 44, 31, 123, 888, 444, 222, 1 ],
-    [ "Baccarat, Concierge of Gran Tesoro", "INT", [ "Fighter", "Striker" ], 4, 20, 4, 2, 99, 3000000, 777, 333, 222, 1552, 777, 456, 1 ],
+    [ "Baccarat, Gran Tesoro Concierge", "INT", [ "Fighter", "Striker" ], 4, 20, 4, 2, 99, 3000000, 777, 333, 222, 1552, 777, 456, 1 ],
     [ "Dice", "STR", [ "Free Spirit", "Powerhouse" ], 3, 12, 5, 2, 50, 392109, 84, 58, -500, 1624, 484, -500, 1 ],
-    [ "Dice, Dealer of Gran Tesoro", "STR", [ "Free Spirit", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1493, 410, -500, 3035, 1005, -500, 1 ],
+    [ "Dice, Gran Tesoro Dealer", "STR", [ "Free Spirit", "Powerhouse" ], 4, 20, 4, 2, 99, 3000000, 1493, 410, -500, 3035, 1005, -500, 1 ],
     [ "Mr. Tanaka", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, 5, 2, 50, 392109, 54, 62, 32, 924, 528, 188, 1 ],
-    [ "Tanaka, Security Guard of Gran Tesoro", "QCK", [ "Shooter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 849, 449, 131, 1706, 1089, 305, 1 ],
-    [ "Brook, Dream-Pursuing Adventurer", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
-    [ "Brook, Loyal Straw Hat Crew", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
-    [ "Roronoa Zoro, Dream-Pursuing Adventurer", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
-    [ "Roronoa Zoro, Loyal Straw Hat Crew", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
-    [ "Chopper, Dream-Pursuing Adventurer", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
-    [ "Chopper, Loyal Straw Hat Crew", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
+    [ "Mr. Tanaka, Gran Tesoro Security", "QCK", [ "Shooter", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 849, 449, 131, 1706, 1089, 305, 1 ],
+    [ "Brook, Dream Chaser", "PSY", [ "Slasher", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 249, 101, 40, 1530, 684, 133, 1 ],
+    [ "Brook, A Pirate Who Lives By His Code", "PSY", [ "Slasher", "Free Spirit" ], 5, 27, 4, 4, 99, 4000000, 1461, 636, 100, 2788, 1243, 234, 1 ],
+    [ "Roronoa Zoro, Dream Chaser", "DEX", [ "Slasher", "Driven" ], 4, 17, 5, 3, 70, 1066998, 270, 124, 23, 1585, 715, 98, 1 ],
+    [ "Roronoa Zoro, A Pirate Who Lives By His Code", "DEX", [ "Slasher", "Driven" ], 5, 27, 4, 4, 99, 4000000, 1531, 646, 60, 2900, 1321, 171, 1 ],
+    [ "Chopper, Dream Chaser", "DEX", [ "Shooter", "Cerebral" ], 4, 17, 5, 3, 70, 1066998, 196, 98, 51, 1170, 624, 212, 1 ],
+    [ "Chopper, A Pirate Who Lives By His Code", "DEX", [ "Shooter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1110, 571, 179, 2212, 1099, 368, 1 ],
     [ "Oars", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 4, 1, 70, 1066998, 902, 473, 74, 2018, 1028, -444, 1 ],
     [ "Oars, the Devil", "STR", [ "Fighter", "Powerhouse" ], 5, 50, 4, 2, 99, 4000000, 1920, 977, -444, 4400, 1402, -444, 1 ],
-    [ "Rainbow Armored Crab", "INT", "Evolver", 3, 4, 5, 0, 1, 0, 30, 500, 0, 30, 500, 0, 1 ],
+    [ "Rainbow Armor Crab", "INT", "Evolver", 3, 4, 5, 0, 1, 0, 30, 500, 0, 30, 500, 0, 1 ],
     [ "Blenheim", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 206, 106, 19, 1051, 624, 95, 1 ],
     [ "Blenheim, The Cutlass", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 6, 4, 99, 4000000, 949, 512, 44, 2643, 1355, 224, 1 ],
     [ "Kingdew", "PSY", [ "Fighter", "Powerhouse" ], 4, 18, 5, 3, 70, 1066998, 232, 94, 38, 1123, 522, 161, 1 ],
@@ -1205,12 +1205,12 @@ window.units = [
     [ "Rumbar Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
     [ "Rumbar Pirates Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
     [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ],
-    [ "Nico Robin, Dream-Pursuing Adventurer", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
-    [ "Nico Robin, Loyal Straw Hat Crew", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
-    [ "Usopp, Dream-Pursuing Adventurer", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
-    [ "Usopp, Loyal Straw Hat Crew", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
-    [ "Franky, Dream-Pursuing Adventurer", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
-    [ "Franky, Loyal Straw Hat Crew", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
+    [ "Nico Robin, Dream Chaser", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
+    [ "Nico Robin, A Pirate Who Lives By Her Code", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
+    [ "Usopp, Dream Chaser", "QCK", "Shooter", 4, 17, 6, 3, 70, 1066998, 224, 90, 47, 1222, 593, 208, 1 ],
+    [ "Usopp, A Pirate Who Lives By His Code", "QCK", "Shooter", 5, 27, 5, 4, 99, 4000000, 1167, 542, 174, 2301, 954, 376, 1 ],
+    [ "Franky, Dream Chaser", "STR", [ "Shooter", "Free Spirit" ], 4, 17, 6, 3, 70, 1066998, 244, 140, 21, 1590, 738, 95, 1 ],
+    [ "Franky, A Pirate Who Lives By His Code", "STR", [ "Shooter", "Free Spirit" ], 5, 27, 5, 4, 99, 4000000, 1525, 660, 50, 2801, 1395, 161, 1 ],
     [ "Baby 5, Dolphin Floatie", "STR", [ "Slasher", "Striker" ], 4, 13, 4, 2, 50, 392109, 101, 103, 34, 910, 563, 177, 1 ],
     [ "Baby 5, Dolphin Rider", "STR", [ "Slasher", "Striker" ], 5, 20, 4, 3, 99, 3000000, 843, 489, 130, 1624, 1212, 309, 1 ],
     [ "Gairam, World Pirates", "DEX", [ "Shooter", "Striker" ], 4, 20, 6, 2, 99, 3000000, 85, 35, 15, 1735, 1135, 175, 1 ],
@@ -1343,7 +1343,7 @@ window.units = [
     [ "Curly Dadan", "PSY", [ "Slasher", "Powerhouse" ], 3, 12, 6, 2, 50, 392109, 144, 62, 33, 1844, 703, 151, 1],
     [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, 392109, 125, 106, 6, 1734, 891, 34, 1],
     [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, 1066998, 131, 133, 1, 1809, 1043, 9, 1],
-    [ "Jimbe, Fishman Pirates Captain", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 304, 161, 56, 2329, 1144, 229, 1],
+    [ "Jinbe, Fishman Pirates Captain", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 304, 161, 56, 2329, 1144, 229, 1],
     [ "Heracles'n, Highwayman of the Forest, Teacher of Amazing Weapons", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, 3000000, 142, 91, 43, 2095, 899, 303, 1],
     [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 109, 66, 12, 1487, 706, 127, 1],
     [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, 1066998, 133, 112, 0, 1600, 1020, 0, 1],
@@ -1417,16 +1417,16 @@ window.units = [
     [ "Sengoku the Buddha, Wise Warrior", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 920, 440, 100, 2059, 1059, 304, 1 ],
     [ "Ronse", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 1, 70, 1066998, 106, 59, 1, 2018, 901, 3, 1 ],
     [ "Stainless", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 2, 70, 1066998, 82, 57, 20, 1408, 874, 202, 1 ],
-    [ "Kimono Lucci", "INT", [ "Fighter", "Powerhouse" ], 4, 13, 5, 2, 50, 392109, 152, 93, 13, 1202, 556, 73, null ],
-    [ "Kimono Lucci, Evolved", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, 3000000, 1129, 499, 152, 2299, 1333, 152, null ],
-    [ "Coliseum Diamante", "INT", [ "Driven", "Striker" ], 4, 25, 5, 2, 70, 1066998, 505, 388, 12, 1202, 770, 91, null ],
-    [ "Coliseum Diamante, Evolved", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, null ],
-    [ "Coliseum T-Bone", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, 3000000, 99, 98, 50, 1752, 1199, 300, null ],
-    [ "Coliseum Gin", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 110, 69, 32, 1228, 801, 191, null ],
-    [ "Don Sai, Unevolved", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, 392109, 105, 59, 19, null, null, null, null],
-    [ "Don Sai, Evolved", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, 99, 3000000, 1123, 527, 57, null, null, null, null],
-    [ "Boo", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, 1066998, 305, 159, 29, null, null, null, null],
-    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, null, null, null, null ],
+    [ "Rob Lucci, Inviting Hakama", "INT", [ "Fighter", "Powerhouse" ], 4, 13, 5, 2, 50, 392109, 152, 93, 13, 1202, 556, 73, 1 ],
+    [ "Rob Lucci, Home of Happi", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, 3000000, 1129, 499, 42, 2299, 1333, 152, 1 ],
+    [ "Diamante, Ripple-Ripple Man", "INT", [ "Driven", "Striker" ], 4, 25, 5, 2, 70, 1066998, 505, 388, 12, 1202, 770, 91, 1 ],
+    [ "Diamante, Donquiote Family Executive", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, 1 ],
+    [ "T-Bone, Navy HP Colonel", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, 3000000, 99, 98, 50, 1752, 1199, 300, 1 ],
+    [ "Gin, Krieg Pirates Combat Commander", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 110, 69, 32, 1228, 801, 191, 1 ],
+    [ "Don Sai, Happo Navy", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, 392109, 105, 59, 19, 1205, 620, 106, 1],
+    [ "Don Sai, Happo Navy's 13th Leader", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, 99, 3000000, 1123, 527, 57, 2192, 1301, 181, 1],
+    [ "Boo, Happo Navy", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, 1066998, 305, 159, 29, 1672, 1005, 111, 1],
+    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, null, null, null, null ],
     ];
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index dd486a4ee..2a3f58228 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1404, 1413, 1414, 1406, 1408, 1410, 1412 ];
+    var newUnits = [ 1404, 1413, 1420, 1422, 1423, 1426, 1427 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/common/js/utils.js b/common/js/utils.js
index 3a5da201e..1a6487c26 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@
         'Skypiea (Guard|Enforcer)', 'Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman',
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard'
     ].join(')|(') + ')', 'i');
 
     var utils = {};
diff --git a/index.html b/index.html
index f40928d21..983381faf 100644
--- a/index.html
+++ b/index.html
@@ -64,15 +64,15 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>5/1/2017</p>
+            <p>24/1/2017</p>
             <br>
             <ul>
-                <li>Naked Calendar Sanji Completed</li>
-                <li>Coated Sunny Ship added to Calculator</li>
+                <li>Kimono Rob Lucci Completed</li>
+                <li>Kizaru Cannonball added to Calculator</li>
                 <br>
-                <li>Sengoku Fortnight and Gladius Colo units added</li>
+                <li>Don Sai Fortnight and Diamante Colo units Completed</li>
                 <br>
-                <li>Kimono Baby 5 added to Character Table</li>
+                <li>Valentine Mansherry added to Character Table</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From faec22493bb114b5976a9e5d5f7844000093bef0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 25 Jan 2017 06:31:42 -0600
Subject: [PATCH 0775/1569] 6+ Hancock

---
 common/data/captains.js   |  8 ++++++++
 common/data/cooldowns.js  | 15 +++++++++++++++
 common/data/details.js    |  7 +++++++
 common/data/evolutions.js |  4 ++++
 common/data/families.js   | 15 +++++++++++++++
 common/data/specials.js   |  5 +++++
 common/data/units.js      | 15 +++++++++++++++
 7 files changed, 69 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index b3257439a..e0e0d0c6a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3973,4 +3973,12 @@ window.captains = {
     1429: {
         rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; },
     },
+    1445: {
+        atk: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 3 : 1;
+        },
+        rcv: function(p) {
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP <= 70.0 ? 1.5 : 1;
+        }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 897b5ff88..2cf1bde1b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1429,4 +1429,19 @@ window.cooldowns = [
     [ 12, 8 ],
     [ 14, 14 ],
     [ 14, 14 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 17, 13 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 76f920631..c97d4e5ce 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7707,4 +7707,11 @@ window.details = {
         special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
         specialName: "Boy's Unknown Taste of Hard Work",
     },
+    
+    1445: {
+        captain: "Boosts ATK of [QCK] and [PSY] characters by ???x if HP is above 70% at the start of the turn. If HP is below 70%, Boosts RCV of [QCK] and [PSY] units by 1.5x instead.",
+        captainNotes: "Unclear what the captain boost is yet, but in the damage calculator she is currently set to 3x",
+        special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 70%, changes left column into Matching orbs.",
+        specialName: "Boa Hancock Special",
+    },
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f439d132a..a19c4bebd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2187,4 +2187,8 @@ window.evolutions = {
         evolution: 1430,
         evolvers: [ 117, 83, 86, 91, 97 ]
     },
+    416: {
+        evolution: 1445,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 31c6a1cf8..d5f4dcabd 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1429,4 +1429,19 @@ window.families = [
     "Jean Ango",
     "Mansherry",
     "Mansherry",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Boa Hancock",
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 95ac356b5..cfb83f71e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2057,4 +2057,9 @@ window.specials = {
         type: "class",
         warning: "Selected special (%name%) assumes that the enemy has been Delayed."
     },
+    1445: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
+        type: "type"
+    }
 };
diff --git a/common/data/units.js b/common/data/units.js
index 61a3a9d65..f3dc6fe37 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1429,6 +1429,21 @@ window.units = [
     [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 1559, 1500, 303, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 481970448eec7481a7c1f4bb69ba6ae9a88871b4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 25 Jan 2017 07:49:57 -0600
Subject: [PATCH 0776/1569] Stats Estimated

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index f3dc6fe37..2be4b2d7c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1443,7 +1443,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 1559, 1500, 303, null ],
+    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b3252aa5e840c8894ef2cdd5a02b08b621115e45 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Thu, 26 Jan 2017 11:51:58 -0800
Subject: [PATCH 0777/1569] Added preview for Raid Franky

---
 common/data/details.js | 11 ++++++++++-
 common/data/units.js   |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c97d4e5ce..96297eb9c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7707,7 +7707,16 @@ window.details = {
         special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
         specialName: "Boy's Unknown Taste of Hard Work",
     },
-    
+    1431: {//Raid Franky
+        captain: "",
+        special: "",
+        specialName: "",
+    },
+    1432: {//Raid Franky Evolved
+        captain: "",
+        special: "",
+        specialName: "",
+    },
     1445: {
         captain: "Boosts ATK of [QCK] and [PSY] characters by ???x if HP is above 70% at the start of the turn. If HP is below 70%, Boosts RCV of [QCK] and [PSY] units by 1.5x instead.",
         captainNotes: "Unclear what the captain boost is yet, but in the damage calculator she is currently set to 3x",
diff --git a/common/data/units.js b/common/data/units.js
index 2be4b2d7c..9e4d8e7b5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1429,8 +1429,8 @@ window.units = [
     [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Franky, Evolved", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From ca6f611e1e118c9aed14b73a564186e35fa1ae92 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 26 Jan 2017 16:50:41 -0500
Subject: [PATCH 0778/1569] Quick and Speedy Gin

---
 common/data/captains.js | 3 +++
 common/data/details.js  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index e0e0d0c6a..c6a4d5683 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3957,6 +3957,9 @@ window.captains = {
     1423: {
         atk: function(p) { return 1.75; },
     },
+    1424: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1 + 1.25 * p.percHP / 100 : 1; }
+    },
     1425: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; },
     },
diff --git a/common/data/details.js b/common/data/details.js
index c97d4e5ce..42aeb41dd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7670,7 +7670,7 @@ window.details = {
     },
     1424: {//Coliseum Gin
         captain: "Boosts ATK of Striker characters proportionally to the crew's current HP",
-        //captainNotes: "#{captainProportional : higher : 1 + 1.25 * (remaining HP) / (total HP) : 2.25 : 2}"
+        captainNotes: "#{captainProportional : higher : 1 + 1.25 * (remaining HP) / (total HP) : 2.25 : 1}",
         special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
         specialName: "General Commander's Fight",
     },

From 303892fb2ca5753372818204ac7d1240f827491f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 26 Jan 2017 18:07:05 -0500
Subject: [PATCH 0779/1569] More than I thought I was going to update

Ships, stats, fixes
---
 common/data/captains.js   |  8 +++----
 common/data/details.js    | 14 ++++++------
 common/data/drops.js      | 20 +++++++++++------
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 ++--
 common/data/flags.js      | 46 +++++++++++++++++++++++++++++----------
 common/data/gw.js         | 15 +++++++++++++
 common/data/ships.js      | 14 ++++++------
 common/data/units.js      |  2 +-
 9 files changed, 87 insertions(+), 40 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c6a4d5683..bfff4e537 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3551,18 +3551,18 @@ window.captains = {
     },
     1315: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 
             //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
             //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1316: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
             p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
diff --git a/common/data/details.js b/common/data/details.js
index e3b241c15..0cd4160d6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6871,7 +6871,7 @@ window.details = {
         specialName: "Echoing Cry of the Soul",
     },
     1316: {//Coby
-        captain: "Boosts ATK by 2.5x after the 2nd Perfect, 2.75x after the 3rd Perfect, 3x after the 4th Perfect, and by 3.5x after the 5th Perfect.",
+        captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
         special: [
             {
                 "description": "If HP is below 3,000, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
@@ -7708,14 +7708,14 @@ window.details = {
         specialName: "Boy's Unknown Taste of Hard Work",
     },
     1431: {//Raid Franky
-        captain: "",
-        special: "",
-        specialName: "",
+        captain: "Not Released",
+        special: "Not Released",
+        specialName: "Franky Special",
     },
     1432: {//Raid Franky Evolved
-        captain: "",
-        special: "",
-        specialName: "",
+        captain: "Not Released",
+        special: "Not Released",
+        specialName: "Franky Special",
     },
     1445: {
         captain: "Boosts ATK of [QCK] and [PSY] characters by ???x if HP is above 70% at the start of the turn. If HP is below 70%, Boosts RCV of [QCK] and [PSY] units by 1.5x instead.",
diff --git a/common/data/drops.js b/common/data/drops.js
index f09edc710..49c83d751 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -548,7 +548,7 @@ window.drops = {
             name: "Marineford - Oris Plaza",
             shortName: "Oris Plaza",
             thumb: 1283,
-            completion: '5x Rainbow Gems',
+            completion: '10x Rainbow Gems',
             "01": [ 1279 ],
             "02": [  ],
             "03": [ 1280 ],
@@ -1491,6 +1491,12 @@ window.drops = {
             Master: [ 1373 ],
             Expert: [ 1373 ],
         },
+        {
+            name: 'Clash!! Warden Magellan',
+            thumb: 1432,
+            Master: [ 1431 ],
+            Ultimate: [ 1431 ],
+        },
 
     ],
 
@@ -1534,30 +1540,30 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1294, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1294, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423 ]
         },
         
         {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "All Difficulties": [ -261, -562, -720, -748, -935, -1413 ]
+            "Japan": [ -261, -562, -720, -748, -935, -1413 ]
         },
         
         {
             name: 'Rescue Ace Event - Aokiji',
             thumb: 1280,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "All Difficulties": [ -416, -459, -530, -669, -578, -1121 ]
+            "Japan": [ -416, -459, -530, -669, -578, -1121 ]
         },
         
         {
             name: 'Rescue Ace Event - Kizaru',
             thumb: 1228,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "All Difficulties": [ -367, -649, -718, -870, -1001 ]
+            "Japan": [ -367, -649, -718, -870, -1001 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a19c4bebd..59dd69a57 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2191,4 +2191,8 @@ window.evolutions = {
         evolution: 1445,
         evolvers: [  ]
     },
+    1432: {
+        evolution: 1433,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index d5f4dcabd..27f001205 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1429,8 +1429,8 @@ window.families = [
     "Jean Ango",
     "Mansherry",
     "Mansherry",
-    null,
-    null,
+    "Franky",
+    "Franky",
     null,
     null,
     null,
diff --git a/common/data/flags.js b/common/data/flags.js
index c644d5ab3..f6d1af1a2 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -956,6 +956,11 @@ window.flags = {
     974: { global: 1 },
     975: { rr: 1, rro: 1, lrr: 1 },
     976: { rr: 1, rro: 1, lrr: 1 },
+    977: { global: 1 },
+    978: { global: 1 },
+    979: { global: 1 },
+    980: { global: 1 },
+    981: { global: 1 },
     990: { rr: 1, rro: 1, global: 1 },
     991: { rr: 1, rro: 1, global: 1 },
     992: { rr: 1, rro: 1, global: 1 },
@@ -968,6 +973,11 @@ window.flags = {
     999: { rr: 1, rro: 1, global: 1 },
     1000: { rr: 1, rro: 1, global: 1 },
     1001: { rr: 1, rro: 1, global: 1 },
+    1002: { global: 1 },
+    1003: { global: 1 },
+    1004: { global: 1 },
+    1005: { global: 1 },
+    1006: { global: 1 },
     1007: { rr: 1, rro: 1, lrr: 1 },
     1008: { rr: 1, rro: 1, lrr: 1 },
     1009: { promo: 1 },
@@ -1062,6 +1072,8 @@ window.flags = {
     1131: { rr: 1, rro: 1, global: 1 },
     1132: { rr: 1, rro: 1, global: 1 },
     1133: { rr: 1, rro: 1, global: 1 },
+    1134: { rr: 1, rro: 1, lrr: 1 },
+    1135: { rr: 1, rro: 1, lrr: 1 },
     1146: { global: 1 },
     1147: { global: 1 },
     1148: { global: 1 },
@@ -1096,6 +1108,7 @@ window.flags = {
     1177: { rr: 1, rro: 1, global: 1 },
     1178: { shop: 1 },
     1179: { shop: 1 },
+    1180: { global: 1 },
     1181: { rr: 1, rro: 1, global: 1 },
     1182: { rr: 1, rro: 1, global: 1 },
     1183: { rr: 1, rro: 1, global: 1 },
@@ -1137,6 +1150,8 @@ window.flags = {
     1239: { rr: 1, rro: 1, global: 1 },
     1240: { rr: 1, rro: 1, global: 1 },
     1248: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1245: { special: 1, global: 1 },
+    1246: { special: 1, global: 1 },
     1249: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1259: { rr: 1, rro: 1, lrr: 1 },
     1260: { rr: 1, rro: 1, lrr: 1 },
@@ -1146,18 +1161,23 @@ window.flags = {
     1264: { rr: 1, rro: 1, lrr: 1 },
     1265: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1266: { rr: 1, rro: 1, lrr: 1, global: 1 },
-    1267: { rr: 1, rro: 1 },
-    1268: { rr: 1, rro: 1 },
-    1269: { rr: 1, rro: 1 },
-    1270: { rr: 1, rro: 1 },
-    1271: { rr: 1, rro: 1 },
-    1272: { rr: 1, rro: 1 },
-    1273: { rr: 1, rro: 1 },
-    1274: { rr: 1, rro: 1 },
-    1275: { rr: 1, rro: 1 },
-    1276: { rr: 1, rro: 1 },
-    1277: { rr: 1, rro: 1 },
-    1278: { rr: 1, rro: 1 },
+    1267: { rr: 1, rro: 1, global: 1 },
+    1268: { rr: 1, rro: 1, global: 1 },
+    1269: { rr: 1, rro: 1, global: 1 },
+    1270: { rr: 1, rro: 1, global: 1 },
+    1271: { rr: 1, rro: 1, global: 1 },
+    1272: { rr: 1, rro: 1, global: 1 },
+    1273: { rr: 1, rro: 1, global: 1 },
+    1274: { rr: 1, rro: 1, global: 1 },
+    1275: { rr: 1, rro: 1, global: 1 },
+    1276: { rr: 1, rro: 1, global: 1 },
+    1277: { rr: 1, rro: 1, global: 1 },
+    1278: { rr: 1, rro: 1, global: 1 },
+    1279: { global: 1 },
+    1280: { global: 1 },
+    1281: { global: 1 },
+    1282: { global: 1 },
+    1283: { global: 1 },
     1284: { shop: 1 },
     1285: { shop: 1 },
     1295: { rr: 1, rro: 1, lrr: 1 },
@@ -1209,9 +1229,11 @@ window.flags = {
     1410: { rr: 1, rro: 1 },
     1411: { rr: 1, rro: 1 },
     1412: { rr: 1, rro: 1 },
+    1412: { rr: 1, rro: 1 },
     1414: { shop: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
     1420: { rr: 1, rro: 1, lrr: 1, },
     1429: { rr: 1, rro: 1, lrr: 1, },
     1430: { rr: 1, rro: 1, lrr: 1, },
+    1445: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 1ec629e9d..054b4de68 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1429,4 +1429,19 @@ window.gw=[
     49867,
     49836,
     49836,
+    50027,
+    50027,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    9034,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index 200e8e412..260dd223a 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -239,7 +239,7 @@ window.ships = [
     
     { // 19
         name: "Doflamingo Ship",
-        thumb: null,
+        thumb: 'ship_0020_c.png',
         description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. Special: Adds 0.2 to Chain  (cooldown MAX: 15 Turns)',
         atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
         hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
@@ -247,7 +247,7 @@ window.ships = [
     
     { // 20
         name: 'The Rocket Man',
-        thumb: null,
+        thumb: 'ship_0021_c.png',
         description: 'Boosts ATK of Powerhouse characters by 1.55x, and heals at the end of every turn for a variable amount depending on the number of Powerhouse characters on the team. (At MAX, heals 900 per turn with 6 Powerhouse characters) Sharply reduces HP of non-Powerhouse units. Special: Deals 99,999 typeless damage to one unit.  (cooldown MAX: 17 Turns)',
         atk: function(p) {
             return !p.unit.class.has('Powerhouse') ? 1 : [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.4, 1.55 ][p.boatLevel - 1];
@@ -263,7 +263,7 @@ window.ships = [
     
     { // 21
         name: 'Burning Whitebeard Ship',
-        thumb: null,
+        thumb: 'ship_0022_c.png',
         description: 'Boosts HP by 1.3x',
         hp: function(p) {
             return 1.3;
@@ -272,7 +272,7 @@ window.ships = [
     
     { // 22
         name: 'Garp Ship',
-        thumb: null,
+        thumb: 'ship_0023_c.png',
         description: 'Boosts ATK of [STR] and [PSY] characters by 1.5x, and their HP by 1.25x',
         atk: function(p) {
             return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
@@ -284,7 +284,7 @@ window.ships = [
     
     { //23
         name: 'Polar Tang',
-        thumb: null,
+        thumb: 'ship_0024_c.png',
         description: 'Boosts ATK of Slashers and Free Spirit characters by 1.5x and their HP by 1.25x. Special: Heals for 10k when low HP (cooldown MAX: 18 turns)',
         atk: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Free Spirit')) ? 1 : [ 1.3, 1.3, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
@@ -295,7 +295,7 @@ window.ships = [
     },
     { // 24
         name: 'New Year\'s Big Top',
-        thumb: null,
+        thumb: 'ship_0025_c.png',
         description: 'Boosts ATK by 1.2x',
         atk: function(p) {
             return 1.2;
@@ -303,7 +303,7 @@ window.ships = [
     },
     { // 25
         name: 'Thousand Sunny: Coated',
-        thumb: null,
+        thumb: 'ship_0026_c.png',
         description: 'Boosts ATK by 1.5x. Special: reduces damage received by 50% for 1 turn (cooldown: 16 turns).',
         atk: function(p) {
             return [ 1.3, 1.3, 1.3, 1.3, 1.35, 1.35, 1.35, 1.4, 1.45, 1.5 ][p.boatLevel - 1];
diff --git a/common/data/units.js b/common/data/units.js
index 9e4d8e7b5..9838768e4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1428,7 +1428,7 @@ window.units = [
     [ "Boo, Happo Navy", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, 1066998, 305, 159, 29, 1672, 1005, 111, 1],
     [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
-    [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, null, null, null, null ],
+    [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, null ],
     [ "Raid Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Franky, Evolved", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 44a9073d853475f3747f5eda516c3aa1173573bf Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 27 Jan 2017 00:49:25 -0500
Subject: [PATCH 0780/1569] Shogun Franky
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

He’s pretty Super!
---
 common/data/aliases.js    | 16 ++++++++++++++++
 common/data/captains.js   | 28 ++++++++++++++++++++++++++--
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 34 +++++++++++++++++-----------------
 common/data/drops.js      |  6 +++---
 common/data/evolutions.js |  6 +++---
 common/data/specials.js   |  8 ++++++++
 common/data/units.js      |  4 ++--
 damage/js/cruncher.js     | 23 +++++++++++++++++++----
 9 files changed, 96 insertions(+), 33 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 090b4e2c2..0dbe0b778 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1429,4 +1429,20 @@ window.aliases = {
     1428: ['ジャン・アンゴ', '', ''],
     1429: ['', '', 'Valentine Mansherry'],
     1430: ['', '', 'Valentine Mansherry'],
+    1431: ['', '', 'Shogun Franky'],
+    1432: ['', '', 'Shogun Franky'],
+    1433: ['', '', ''],
+    1434: ['', '', ''],
+    1435: ['', '', ''],
+    1436: ['', '', ''],
+    1437: ['', '', ''],
+    1438: ['', '', ''],
+    1439: ['', '', ''],
+    1440: ['', '', ''],
+    1441: ['', '', ''],
+    1442: ['', '', ''],
+    1443: ['', '', ''],
+    1444: ['', '', ''],
+    1445: ['', '', 'Mega Boa Hancock'],
+    
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index bfff4e537..c2a94d29c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3970,12 +3970,36 @@ window.captains = {
     1427: {
         atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
     },
-    1428: {
+    1429: {
         rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; },
     },
-    1429: {
+    1430: {
         rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; },
     },
+    1431: {
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.FreeSpirit>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1 && p.classCount.Powerhouse>=1 && p.classCount.Driven>=1) 
+                return 1.2;
+            else
+                return 1; 
+               },
+    },
+    1432: {
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2.5;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.FreeSpirit>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1 && p.classCount.Powerhouse>=1 && p.classCount.Driven>=1) 
+                return 1.5;
+            else
+                return 1; 
+               },
+    },
     1445: {
         atk: function(p) {
             return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 3 : 1;
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 2cf1bde1b..33617af48 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1429,8 +1429,8 @@ window.cooldowns = [
     [ 12, 8 ],
     [ 14, 14 ],
     [ 14, 14 ],
-    null,
-    null,
+    33,
+    33,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 0cd4160d6..d81811bf7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6919,13 +6919,13 @@ window.details = {
         specialName: "A Decree of the Veteran",
     },
     1321: {//Momonga
-        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.25x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.25x and reduces damage taken by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1322: {//Momonga
-        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if you have a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
@@ -7674,23 +7674,23 @@ window.details = {
         special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
         specialName: "General Commander's Fight",
     },
-    1425: {//Don Sai 3*
+    1425: {//Don Sai
         captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
         special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
         specialName: "Military Leg Heel",
     },
-    1426: {//Don Sai 4*
+    1426: {//Don Sai
         captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
         special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
         specialName: "Military Leg Heel",
     },
-    1427: {//Boo 4*
+    1427: {//Boo
         captain: "Boosts ATK of QCK characters by 2x",
         special: "Deals 15x character's ATK in QCK damage to one enemy that will ignore damage negating abilities and barriers.",
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
         specialName: "Unblockable Eight Fists",
     },
-    1428: {//Jean Ango 4*
+    1428: {//Jean Ango
         captain: "Boosts amount of beli received by 1.5x, and gives small chance of duplicating a drop upon completion of the island",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
@@ -7698,24 +7698,24 @@ window.details = {
         specialName: "Looting the Losers",
     },
     1429: {//Valentines Mansherry
-        captain: "Boost the RCV of Striker and Free Spirit characters by 1.5x",
+        captain: "Boosts the RCV of Striker and Free Spirit characters by 1.5x",
         special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
         specialName: "Boy's Unknown Taste of Hard Work",
     },
-    1430: {//Valentines Mansherry, Evolved
-        captain: "Boost the RCV of Striker and Free Spirit characters by 2x",
+    1430: {//Valentines Mansherry
+        captain: "Boosts the RCV of Striker and Free Spirit characters by 2x",
         special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
         specialName: "Boy's Unknown Taste of Hard Work",
     },
     1431: {//Raid Franky
-        captain: "Not Released",
-        special: "Not Released",
-        specialName: "Franky Special",
-    },
-    1432: {//Raid Franky Evolved
-        captain: "Not Released",
-        special: "Not Released",
-        specialName: "Franky Special",
+        captain: "Boosts ATK of all characters by 2x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.2x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
+        special: "Deals 100x character's ATK in typeless damage to all enemies, remove enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
+        specialName: "General Cannon",
+    },
+    1432: {//Raid Franky
+        captain: "Boosts ATK of all characters by 2.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.5x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
+        special: "Deals 100x character's ATK in typeless damage to all enemies, remove enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
+        specialName: "General Cannon",
     },
     1445: {
         captain: "Boosts ATK of [QCK] and [PSY] characters by ???x if HP is above 70% at the start of the turn. If HP is below 70%, Boosts RCV of [QCK] and [PSY] units by 1.5x instead.",
diff --git a/common/data/drops.js b/common/data/drops.js
index 49c83d751..e60bf574e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1492,10 +1492,10 @@ window.drops = {
             Expert: [ 1373 ],
         },
         {
-            name: 'Clash!! Warden Magellan',
+            name: 'Clash!! Shogun Franky',
             thumb: 1432,
-            Master: [ 1431 ],
-            Ultimate: [ 1431 ],
+            Master: [ 1431, 215, 799 ],
+            Ultimate: [ 1431, 215, 799 ],
         },
 
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 59dd69a57..c01d947ff 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2191,8 +2191,8 @@ window.evolutions = {
         evolution: 1445,
         evolvers: [  ]
     },
-    1432: {
-        evolution: 1433,
-        evolvers: [  ]
+    1431: {
+        evolution: 1432,
+        evolvers: [ 118, 266, 300, 301, 302 ]
     },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index cfb83f71e..ad3ee11f1 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2057,6 +2057,14 @@ window.specials = {
         type: "class",
         warning: "Selected special (%name%) assumes that the enemy has been Delayed."
     },
+    1431: {
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
+    1432: {
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
     1445: {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
diff --git a/common/data/units.js b/common/data/units.js
index 9838768e4..86c56f53d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1429,8 +1429,8 @@ window.units = [
     [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, null ],
-    [ "Raid Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Raid Franky, Evolved", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, null, null, null, null ],
+    [ "Raid Franky, Evolved", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index e29423bcf..2cc03fc55 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -756,17 +756,32 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     //Used for Bartolomeos Captain ability so far
     var classCounter = function() {
         var classes = {};
-        var classArray = ['Fighter', 'Slasher', 'Free Spirit', 'Powerhouse', 'Shooter', 'Striker', 'Cerebral', 'Ambition'];
+        var classArray = ['Fighter', 'Slasher', 'FreeSpirit', 'Powerhouse', 'Shooter', 'Striker', 'Cerebral', 'Driven'];
         for (var i = 0, j = classArray.length; i < j; i++) {
             classes[classArray[i]] = 0;
         }
         for(var z=0;z<team.length;z++){
             if(team[z].unit){
                 if(team[z].unit.class.length==2){
-                    classes[team[z].unit.class[0]]++;
-                    classes[team[z].unit.class[1]]++;
+                    if(team[z].unit.class[0] == 'Free Spirit'){
+                        classes['FreeSpirit']++;
+                    }
+                    else{
+                        classes[team[z].unit.class[0]]++;
+                    }
+                    if(team[z].unit.class[1] == 'Free Spirit'){
+                        classes['FreeSpirit']++;
+                    }
+                    else{
+                        classes[team[z].unit.class[1]]++;
+                    }
                 }else{
-                    classes[team[z].unit.class]++;
+                    if(team[z].unit.class == 'Free Spirit'){
+                        classes['FreeSpirit']++;
+                    }
+                    else{
+                        classes[team[z].unit.class]++;
+                    }
                 }
             }
         }

From 352e468f1ede2310984d9ccd06ef24c497ff6f70 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 27 Jan 2017 13:07:56 -0500
Subject: [PATCH 0781/1569] New Hody Jones Sugo units and Franky Complete

---
 common/data/aliases.js    | 48 +++++++++++++++++++--------------------
 common/data/evolutions.js | 24 ++++++++++++++++++++
 common/data/flags.js      | 14 +++++++++++-
 common/data/units.js      | 32 +++++++++++++-------------
 4 files changed, 77 insertions(+), 41 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0dbe0b778..952cd2a91 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1187,8 +1187,8 @@ window.aliases = {
     1186: ['疾風の小剣士ハルタ',''],
     1187: ['アトモス',''],
     1188: ['水牛のアトモス',''],
-    1189: ['スピード・ジル',''],
-    1190: ['シールドランスのスピード・ジル',''],
+    1189: ['スピード・ジル','', 'Speed Jiru'],
+    1190: ['シールドランスのスピード・ジル','', 'Speed Jiru'],
     1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
     1192: ['クザン','','Aokiji'],
     1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
@@ -1359,16 +1359,16 @@ window.aliases = {
     1358: ['タマゴ男爵','',''],
     1359: ['タマゴ男爵 ビッグ・マム海賊団','',''],
     1360: ['ルフィの冬島冒険','','Winter Luffy'],
-    1361: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro'],
-    1362: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro'],
-    1363: ['フランキー 集結の麦わらの一味','','New World Franky'],
-    1364: ['フランキー 新生・麦わらの一味','','New World Franky'],
-    1365: ['ナミ 集結の麦わらの一味','','New World Nami'],
-    1366: ['ナミ 新生・麦わらの一味','','New World Nami'],
-    1367: ['サンジ 集結の麦わらの一味','','New World Sanji'],
-    1368: ['サンジ 新生・麦わらの一味','','New World Sanji'],
-    1369: ['トニートニー・チョッパー 集結の麦わらの一味','','New World Chopper'],
-    1370: ['トニートニー・チョッパー 新生・麦わらの一味','','New World Chopper'],
+    1361: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
+    1362: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
+    1363: ['フランキー 集結の麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
+    1364: ['フランキー 新生・麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
+    1365: ['ナミ 集結の麦わらの一味','','New World Nami', 'Timeskip Nami', 'TS Nami'],
+    1366: ['ナミ 新生・麦わらの一味','','New World Nami', 'Timeskip Nami', 'TS Nami'],
+    1367: ['サンジ 集結の麦わらの一味','','New World Sanji', 'Timeskip Sanji', 'TS Sanji'],
+    1368: ['サンジ 新生・麦わらの一味','','New World Sanji', 'Timeskip Sanji', 'TS Sanji'],
+    1369: ['トニートニー・チョッパー 集結の麦わらの一味','','New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
+    1370: ['トニートニー・チョッパー 新生・麦わらの一味','','New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
     1371: ['ロロノア・ゾロ 野生の海賊','','Wild Zoro'],
     1372: ['ロロノア・ゾロ 大地の開拓者','','Wild Zoro'],
     1373: ['マゼラン','','Raid Magellan'],
@@ -1401,16 +1401,16 @@ window.aliases = {
     1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius'],
     1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius'],
     1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton'],
-    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy'],
-    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy'],
-    1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp'],
-    1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp'],
-    1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin'],
-    1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin'],
-    1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook'],
-    1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook'],
-    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper'],
-    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper'],
+    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy'],
+    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy'],
+    1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
+    1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
+    1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin', 'Timeskip Robin', 'TS Robin'],
+    1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin',, 'Timeskip Robin', 'TS Robin'],
+    1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
+    1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
+    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
+    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
     1413: ['白ひげ 四皇', '', 'Mega Whitebeard'],
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
     1415: ['センゴク 智将', '', ''],
@@ -1429,8 +1429,8 @@ window.aliases = {
     1428: ['ジャン・アンゴ', '', ''],
     1429: ['', '', 'Valentine Mansherry'],
     1430: ['', '', 'Valentine Mansherry'],
-    1431: ['', '', 'Shogun Franky'],
-    1432: ['', '', 'Shogun Franky'],
+    1431: ['フランキー将軍', '', 'General Franky'],
+    1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky'],
     1433: ['', '', ''],
     1434: ['', '', ''],
     1435: ['', '', ''],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index c01d947ff..110e428a6 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2195,4 +2195,28 @@ window.evolutions = {
         evolution: 1432,
         evolvers: [ 118, 266, 300, 301, 302 ]
     },
+    1433: {
+        evolution: 1434,
+        evolvers: [  ]
+    },
+    1435: {
+        evolution: 1436,
+        evolvers: [  ]
+    },
+    1437: {
+        evolution: 1438,
+        evolvers: [  ]
+    },
+    1439: {
+        evolution: 1440,
+        evolvers: [  ]
+    },
+    1441: {
+        evolution: 1442,
+        evolvers: [  ]
+    },
+    1443: {
+        evolution: 1444,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index f6d1af1a2..634b3ea0d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1229,11 +1229,23 @@ window.flags = {
     1410: { rr: 1, rro: 1 },
     1411: { rr: 1, rro: 1 },
     1412: { rr: 1, rro: 1 },
-    1412: { rr: 1, rro: 1 },
+    1413: { rr: 1, rro: 1 },
     1414: { shop: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
     1420: { rr: 1, rro: 1, lrr: 1, },
     1429: { rr: 1, rro: 1, lrr: 1, },
     1430: { rr: 1, rro: 1, lrr: 1, },
+    1433: { rr: 1, rro: 1 },
+    1434: { rr: 1, rro: 1 },
+    1435: { rr: 1, rro: 1 },
+    1436: { rr: 1, rro: 1 },
+    1437: { rr: 1, rro: 1 },
+    1438: { rr: 1, rro: 1 },
+    1439: { rr: 1, rro: 1 },
+    1440: { rr: 1, rro: 1 },
+    1441: { rr: 1, rro: 1 },
+    1442: { rr: 1, rro: 1 },
+    1443: { rr: 1, rro: 1 },
+    1444: { rr: 1, rro: 1 },
     1445: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 86c56f53d..61a78fabe 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1187,8 +1187,8 @@ window.units = [
     [ "Haruta, Gale Small Swordsman", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 833, 490, 123, 2025, 1309, 372, 1 ],
     [ "Atmos", "STR", [ "Slasher", "Powerhouse" ], 4, 18, 6, 3, 70, 1066998, 255, 99, 13, 1242, 534, 89, 1 ],
     [ "Atmos, The Water Buffalo", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1159, 440, 41, 3552, 1238, 132, 1 ],
-    [ "Speed Jiru", "QCK", [ "Striker", "Driven" ], 4, 18, 6, 3, 70, 1066998, 242, 86, 30, 1198, 500, 148, 1 ],
-    [ "Speed Jiru, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
+    [ "Speed Jil", "QCK", [ "Striker", "Driven" ], 4, 18, 6, 3, 70, 1066998, 242, 86, 30, 1198, 500, 148, 1 ],
+    [ "Speed Jil, Shield and Lance", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1110, 412, 99, 2905, 1152, 288, 1 ],
     [ "Aokiji, Navy HQ's Strongest Forces", "QCK", [ "Striker", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 362, 271, 103, 1599, 800, 240, 1 ],
     [ "Kuzan", "QCK", [ "Striker", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1524, 740, 196, 3300, 1466, 392, 1 ],
     [ "Boa Hancock, Beachgoing Empress", "DEX", [ "Fighter", "Free Spirit" ], 4, 13, 4, 2, 50, 392109, 181, 132, 47, 945, 539, 181, 1 ],
@@ -1429,20 +1429,20 @@ window.units = [
     [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, null ],
-    [ "Raid Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, null, null, null, null ],
-    [ "Raid Franky, Evolved", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shogun Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, 1550, 736, 102, 1 ],
+    [ "Iron Pirate General Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, 1 ],
+    [ "Hody Jones", "INT", [ "Powerhouse", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hody Jones, Evolved", "INT", [ "Powerhouse", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hyouzou", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hyouzou, Evolved", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ikaros Much", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ikaros Much, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Daruma, Evoled", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Zeo, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dosun, Evolved", "STR", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],
     ];
     

From 52d6e596523727ee793116f808283f10039d0791 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 27 Jan 2017 13:21:44 -0500
Subject: [PATCH 0782/1569] Van Ogre extra Alias fixed

---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 952cd2a91..b7faed41f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1270,7 +1270,7 @@ window.aliases = {
     1269: ['ラフィット','',''],
     1270: ['“鬼保安官”ラフィット','',''],
     1271: ['ヴァン・オーガー','','Vaper', 'Van Ogre'],
-    1272: ['“音越”ヴァン・オーガー','','','Vaper', 'Van Ogre'],
+    1272: ['“音越”ヴァン・オーガー','','Vaper', 'Van Ogre'],
     1273: ['ジーザス・バージェス','',''],
     1274: ['“チャンピオン”ジーザス・バージェス','',''],
     1275: ['シリュウ','','Shiliew'],

From d4536a5e3d43018cd04f861f92c12ee2c65015f3 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sun, 29 Jan 2017 12:33:07 -0500
Subject: [PATCH 0783/1569] Franky CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 33617af48..09d07b44d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1429,8 +1429,8 @@ window.cooldowns = [
     [ 12, 8 ],
     [ 14, 14 ],
     [ 14, 14 ],
-    33,
-    33,
+    [ 33, 17 ],
+    [ 33, 17 ],
     null,
     null,
     null,

From 051072f060540be9339ee73d6abbffd77a18e926 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 30 Jan 2017 00:16:43 -0500
Subject: [PATCH 0784/1569] Holy Jones Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

he’s op, I know
---
 common/data/captains.js  |  12 +++++
 common/data/cooldowns.js |   4 +-
 common/data/details.js   | 102 +++++++++++++++++++++++++++++++++++++--
 common/data/families.js  |  24 ++++-----
 common/data/gw.js        |  24 ++++-----
 common/data/units.js     |  14 +++---
 6 files changed, 143 insertions(+), 37 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c2a94d29c..4ba21d74e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4000,6 +4000,18 @@ window.captains = {
                 return 1; 
                },
     },
+    1433: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : p.classCount.Powerhouse==5 ? 2.5 : p.classCount.Powerhouse==4 ? 2 : p.classCount.Powerhouse==3 ? 1.75 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.75 : p.classCount.Powerhouse==4 ? 1.75 : p.classCount.Powerhouse==3 ? 1.5 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+    },
+    1434: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : p.classCount.Powerhouse==5 ? 2.5 : p.classCount.Powerhouse==4 ? 2 : p.classCount.Powerhouse==3 ? 1.75 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.75 : p.classCount.Powerhouse==4 ? 1.75 : p.classCount.Powerhouse==3 ? 1.5 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+    },
     1445: {
         atk: function(p) {
             return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 3 : 1;
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 09d07b44d..1d7ab4ba9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1431,8 +1431,8 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 33, 17 ],
     [ 33, 17 ],
-    null,
-    null,
+    null,//Hody Jones
+    null,//Hody Jones
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index d81811bf7..7439bf0c7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4403,13 +4403,13 @@ window.details = {
     934: {
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-        special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
+        special: "Makes Perfects harder to hit for 1 turn. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into Matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
     },
     935: {
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
         specialName: "Fishman Karate!! Shark Fist Tile Breaker",
-        special: "For 1 turn, Perfects become harder to hit. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into matching",
+        special: "Makes Perfects harder to hit for 1 turn. Deals 20x character's ATK in [INT] damage to all enemies. Changes all Fighter Character orbs into matching",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)"
     },
     936: {
@@ -6457,7 +6457,7 @@ window.details = {
     },
     1253: {// Coliseum Shura
         captain: "Boosts ATK of [DEX] characters by 2.25x if HP is above 99% at the start of the turn",
-        special: "For 1 turn, Perfects become harder to hit. If during that turn every unit scores a Perfect hit, boosts ATK of [DEX] characters by 1.75x in the following turn.",
+        special: "Makes Perfects harder to hit for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [DEX] characters by 1.75x in the following turn.",
         specialName: "Angry Instigator",
     },
     1254: {//FN Squard
@@ -7717,7 +7717,101 @@ window.details = {
         special: "Deals 100x character's ATK in typeless damage to all enemies, remove enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
         specialName: "General Cannon",
     },
-    1445: {
+    1433: {//Hody Jones
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK and HP of Powerhouse characters by a variable amount depending on how many Powerhouse characters are on your team.",
+        captainNotes: "With 6 Powerhouse characters, the HP boost is 2x and the ATK boost is 3x. The boosts for HP and ATK below 6 characters are estimated and NOT confirmed",
+        special: [
+            {
+                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "cooldown": [ 12, null ],
+            },
+            {
+                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
+                "cooldown": [ 22, null ],
+            },
+        ],
+        specialName: "Water Bullets",
+    },
+    1434: {//Hody Jones
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK and HP of Powerhouse characters by a variable amount depending on how many Powerhouse characters are on your team.",
+        captainNotes: "With 6 Powerhouse characters, the HP boost is 2x and the ATK boost is 3x. The boosts for HP and ATK below 6 characters are estimated and NOT confirmed",
+        special: [
+            {
+                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "cooldown": [ 12, null ],
+            },
+            {
+                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
+                "cooldown": [ 22, null ],
+            },
+        ],
+        specialName: "Water Bullets",
+    },
+    1435: {//Hyouzou
+        captain: "Not Translated",
+        special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers ??? HP.",
+        specialName: "Hyouzou Special",
+        specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
+        sailor: "Boost ATK of all characters by ??? if there are 6 Powerhouse characters in your crew",
+    },
+    1436: {//Hyouzou
+        captain: "Not Translated",
+        special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers ??? HP.",
+        specialName: "Hyouzou Special",
+        specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
+        sailor: "Boost ATK of all characters by ??? if there are 6 Powerhouse characters in your crew",
+    },
+    1437: {//Ikaros Much
+        captain: "Not Translated",
+        special: "Reduce crew's current HP, amplifies the effect of orbs by ???x for ??? turns and boosts ATK against delayed enemies by ???x for ??? turns",
+        specialName: "Ikaros Much Special",
+        specialNotes: "Orb boost may also require enemy to be delayed to activate.",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for all characters if there are 6 Powerhouse characters in your crew",
+    },
+    1438: {//Ikaros Much
+        captain: "Not Translated",
+        special: "Reduce crew's current HP, amplifies the effect of orbs by ???x for ??? turns and boosts ATK against delayed enemies by ???x for ??? turns",
+        specialName: "Ikaros Much Special",
+        specialNotes: "Orb boost may also require enemy to be delayed to activate.",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for all characters if there are 6 Powerhouse characters in your crew",
+    },
+    1439: {//Daruma
+        captain: "Not Translated",
+        special: "Reduces Paralysis and Silence duration by ??? turns, Deals ???x character's ATK in [DEX] damage to one enemy, boosts ATK of Powerhouse characters by ???x for 1 turn",
+        specialName: "Daruma Special",
+        sailor: "Completely resists Silence on this character",
+    },
+    1440: {//Daruma
+        captain: "Not Translated",
+        special: "Reduces Paralysis and Silence duration by ??? turns, Deals ???x character's ATK in [DEX] damage to one enemy, boosts ATK of Powerhouse characters by ???x for 1 turn",
+        specialName: "Daruma Special",
+        sailor: "Completely resists Silence on this character",
+    },
+    1441: {//Zeo
+        captain: "Not Translated",
+        special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
+        specialName: "Zeo Special",
+        sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
+    },
+    1442: {//Zeo
+        captain: "Not Translated",
+        special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
+        specialName: "Zeo Special",
+        sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
+    },
+    1443: {//Dosun
+        captain: "Not Translated",
+        special: "Changes certain orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for ??? turns",
+        specialName: "Dosun Special",
+        sailor: "Boost ATK and HP of all characters by ??? if there are 6 Powerhouse characters in your crew",
+    },
+    1444: {//Dosun
+        captain: "Not Translated",
+        special: "Changes certain orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for ??? turns",
+        specialName: "Dosun Special",
+        sailor: "Boost ATK and HP of all characters by ??? if there are 6 Powerhouse characters in your crew",
+    },
+    1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters by ???x if HP is above 70% at the start of the turn. If HP is below 70%, Boosts RCV of [QCK] and [PSY] units by 1.5x instead.",
         captainNotes: "Unclear what the captain boost is yet, but in the damage calculator she is currently set to 3x",
         special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 70%, changes left column into Matching orbs.",
diff --git a/common/data/families.js b/common/data/families.js
index 27f001205..f563eb4c2 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1431,17 +1431,17 @@ window.families = [
     "Mansherry",
     "Franky",
     "Franky",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Hody Jones",
+    "Hody Jones",
+    "Hyouzou",
+    "Hyouzou",
+    "Icaros Much",
+    "Icaros Much",
+    "Daruma",
+    "Daruma",
+    "Zeo",
+    "Zeo",
+    "Dosun",
+    "Dosun",
     "Boa Hancock",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 054b4de68..d2efe3642 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1431,17 +1431,17 @@ window.gw=[
     49836,
     50027,
     50027,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    50143,
+    50143,
+    50182,
+    50182,
+    50181,
+    50181,
+    50184,
+    50184,
+    50183,
+    50183,
+    50185,
+    50185,
     9034,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 61a78fabe..bd04b27dc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1431,18 +1431,18 @@ window.units = [
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, null ],
     [ "Shogun Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, 1550, 736, 102, 1 ],
     [ "Iron Pirate General Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, 1 ],
-    [ "Hody Jones", "INT", [ "Powerhouse", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hody Jones, Evolved", "INT", [ "Powerhouse", "Shooter" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hody Jones", "INT", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 700, 240, 10, 1976, 789, 95, null ],
+    [ "Hody Jones, New Fishman Pirates Captain", "INT", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1921, 731, 32, 4444, 1480, 140, null ],
     [ "Hyouzou", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hyouzou, Evolved", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ikaros Much", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ikaros Much, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Daruma, Evoled", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Zeo, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dosun, Evolved", "STR", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],
     ];
     

From 719e6ce36fa99e68727c13bccfb4d64d8b273c05 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 31 Jan 2017 00:33:10 -0500
Subject: [PATCH 0785/1569] Bunch o Additions

---
 common/data/captains.js  |  65 ++++++++++++++++++++--
 common/data/cooldowns.js |  16 +++---
 common/data/details.js   | 114 +++++++++++++++++++--------------------
 common/data/effects.js   |   7 +++
 common/data/ships.js     |  18 ++++++-
 common/data/specials.js  |  22 ++++++++
 common/data/units.js     |  20 +++----
 index.html               |   2 +-
 8 files changed, 181 insertions(+), 83 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 4ba21d74e..8e2fffb87 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4002,15 +4002,72 @@ window.captains = {
     },
     1433: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : p.classCount.Powerhouse==5 ? 2.5 : p.classCount.Powerhouse==4 ? 2 : p.classCount.Powerhouse==3 ? 1.75 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.75 : p.classCount.Powerhouse==4 ? 1.75 : p.classCount.Powerhouse==3 ? 1.5 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : 1 : 1; },
     },
     1434: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : p.classCount.Powerhouse==5 ? 2.5 : p.classCount.Powerhouse==4 ? 2 : p.classCount.Powerhouse==3 ? 1.75 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.75 : p.classCount.Powerhouse==4 ? 1.75 : p.classCount.Powerhouse==3 ? 1.5 : p.classCount.Powerhouse==2 ? 1.5 : p.classCount.Powerhouse==1 ? 1.25 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : 1 : 1; },
+    },
+    1435: {
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") ? 2 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1436: {
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") ? 2.5 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+    },
+    1437: {
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 1.69 :
+                p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.3 :
+                1;
+        }
+    },
+    1438: {
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 2.56 :
+                p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.6 :
+                1;
+        }
+    },
+    1439: {
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1;
+        }
+    },
+    1440: {
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.5 : 1;
+        }
+    },
+    1441: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
+    1443: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1444: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1445: {
         atk: function(p) {
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1d7ab4ba9..28a94a27a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1433,15 +1433,15 @@ window.cooldowns = [
     [ 33, 17 ],
     null,//Hody Jones
     null,//Hody Jones
+    21,
+    21,
+    21,
+    21,
+    22,
+    22,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    20,
+    20,
     [ 17, 13 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 7439bf0c7..bba3ad5ab 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1792,12 +1792,12 @@ window.details = {
     446: {
         special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
         specialName: "Black Hole",
-        captain: "Increases damage recieved by 2x, boosts ATK of STR characters by 2x and their HP by 1.5x"
+        captain: "Increases damage received by 2x, boosts ATK of STR characters by 2x and their HP by 1.5x"
     },
     447: {
         special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
         specialName: "Black Hole",
-        captain: "Increases damage recieved by 2x, boosts ATK of STR characters by 2.5x and their HP by 2.25x"
+        captain: "Increases damage received by 2x, boosts ATK of STR characters by 2.5x and their HP by 2.25x"
     },
     448: {
         special: "Boosts chances of getting [QCK] orbs for 3 turns",
@@ -4061,12 +4061,12 @@ window.details = {
     881: {
         captain: "Boosts ATK of Shooter and Free Spirit characters by 2x following a chain of Good > Great > Perfect hits",
         specialName: "Fighting Music: Conflict Chekera",
-        special: "Increases damage recieved by 2x for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
+        special: "Increases damage received by 2x for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
     },
     882: {
         captain: "Boosts ATK of Shooter and Free Spirit characters by 3x following a chain of Good > Great > Perfect hits",
         specialName: "Fighting Music: Conflict Chekera",
-        special: "Increases damage recieved by 2x for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
+        special: "Increases damage received by 2x for 2 turns, reduces RCV by 90% for 2 turns, boosts ATK of Shooter and Free Spirit characters by 1.75x for 1 turn"
     },
     883: {
         captain: "Boosts ATK and HP of Powerhouse characters by 1.25x",
@@ -6037,12 +6037,12 @@ window.details = {
     },
     1198: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
-        special: "Empties all slots with [RCV] orbs, recover 20% of MAX HP",
+        special: "Empties all slots with [RCV] orbs, recover 20% of crew's MAX HP",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1199: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
-        special: "Empties all slots with [RCV] orbs, recover 20% of MAX HP",
+        special: "Empties all slots with [RCV] orbs, recover 20% of crew's MAX HP",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1200: {
@@ -6140,7 +6140,7 @@ window.details = {
         specialName: "Totem Cube"
     },
     1216: { //sebastian
-        captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage taken based on current HP by up to 20%",
+        captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage received based on current HP by up to 20%",
         captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
         special: "Reduces damage received by 50% for 1 turn, and changes own orb to [QCK]",
         specialName: "Camouflage Air",
@@ -6829,13 +6829,13 @@ window.details = {
     1311: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
-        specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage taken over a certain amount",
+        specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage received over a certain amount",
         specialName: "King Cobra Machetes",
     },
     1312: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.75x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
-        specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage taken over a certain amount",
+        specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage received over a certain amount",
         specialName: "King Cobra Machetes",
     },
     1313: {//Akainu
@@ -6919,13 +6919,13 @@ window.details = {
         specialName: "A Decree of the Veteran",
     },
     1321: {//Momonga
-        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.25x and reduces damage taken by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1322: {//Momonga
-        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage taken by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
@@ -7206,14 +7206,14 @@ window.details = {
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1363: {//Timeskip Franky
-        captain: "Boosts ATK of [PSY] characters by 2x, reduces damage taken by 10%",
+        captain: "Boosts ATK of [PSY] characters by 2x, reduces damage received by 10%",
         special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts HP of [PSY] characters by 100",
         specialName: "Franky Fireball",
     },
     1364: {//Timeskip Franky
-        captain: "Boosts ATK of [PSY] characters by 2.5x, reduces damage taken by 10%",
+        captain: "Boosts ATK of [PSY] characters by 2.5x, reduces damage received by 10%",
         special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts HP of [PSY] characters by 100",
@@ -7348,13 +7348,13 @@ window.details = {
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
     },
     1375: {//Dellinger
-        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, Increases damage recieved by 2x",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, Increases damage received by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
         specialName: "Deadly Fangs of Rage",
     },
     1376: {//Dellinger
-        captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, Increases damage recieved by 2x",
+        captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, Increases damage received by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
         specialName: "Deadly Fangs of Rage",
@@ -7394,12 +7394,12 @@ window.details = {
         specialName: "Tashigi Special",
     },
     1383: {//Soldier-San
-        captain: "Boosts ATK of Striker characters by 2x. Increases damage recieved by 1.5x",
+        captain: "Boosts ATK of Striker characters by 2x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialName: "Angry Extermination of Bugs",
     },
     1384: {//Soldier-San
-        captain: "Boosts ATK of Striker characters by 2.5x. Increases damage recieved by 1.5x",
+        captain: "Boosts ATK of Striker characters by 2.5x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialName: "Angry Extermination of Bugs",
     },
@@ -7561,14 +7561,14 @@ window.details = {
     },
     1405: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs for Shooters by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs for Shooters by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
@@ -7718,8 +7718,7 @@ window.details = {
         specialName: "General Cannon",
     },
     1433: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK and HP of Powerhouse characters by a variable amount depending on how many Powerhouse characters are on your team.",
-        captainNotes: "With 6 Powerhouse characters, the HP boost is 2x and the ATK boost is 3x. The boosts for HP and ATK below 6 characters are estimated and NOT confirmed",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x and HP of Powerhouse characters by 2x if there are 6 Powerhouse characters in your crew.",
         special: [
             {
                 "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
@@ -7733,8 +7732,7 @@ window.details = {
         specialName: "Water Bullets",
     },
     1434: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK and HP of Powerhouse characters by a variable amount depending on how many Powerhouse characters are on your team.",
-        captainNotes: "With 6 Powerhouse characters, the HP boost is 2x and the ATK boost is 3x. The boosts for HP and ATK below 6 characters are estimated and NOT confirmed",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x and HP of Powerhouse characters by 2x if there are 6 Powerhouse characters in your crew.",
         special: [
             {
                 "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
@@ -7748,68 +7746,68 @@ window.details = {
         specialName: "Water Bullets",
     },
     1435: {//Hyouzou
-        captain: "Not Translated",
-        special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers ??? HP.",
-        specialName: "Hyouzou Special",
+        captain: "Boosts ATK of Slashers by 2x and HP of Powerhouse characters by 1.2x",
+        special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
+        specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boost ATK of all characters by ??? if there are 6 Powerhouse characters in your crew",
+        sailor: "Boost ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1436: {//Hyouzou
-        captain: "Not Translated",
-        special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers ??? HP.",
-        specialName: "Hyouzou Special",
+        captain: "Boosts ATK of Slashers by 2.5x and HP of Powerhouse characters by 1.5x",
+        special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
+        specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boost ATK of all characters by ??? if there are 6 Powerhouse characters in your crew",
+        sailor: "Boost ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1437: {//Ikaros Much
-        captain: "Not Translated",
-        special: "Reduce crew's current HP, amplifies the effect of orbs by ???x for ??? turns and boosts ATK against delayed enemies by ???x for ??? turns",
-        specialName: "Ikaros Much Special",
-        specialNotes: "Orb boost may also require enemy to be delayed to activate.",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for all characters if there are 6 Powerhouse characters in your crew",
+        captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
+        captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 1.69x bonus.",
+        special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by ???x and boosts ATK against delayed enemies by 1.5x for 1 turn",
+        specialName: "Squid Spear",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
     },
     1438: {//Ikaros Much
-        captain: "Not Translated",
-        special: "Reduce crew's current HP, amplifies the effect of orbs by ???x for ??? turns and boosts ATK against delayed enemies by ???x for ??? turns",
-        specialName: "Ikaros Much Special",
-        specialNotes: "Orb boost may also require enemy to be delayed to activate.",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for all characters if there are 6 Powerhouse characters in your crew",
+        captain: "Boosts ATK of Powerhouse and Striker characters by 1.6x",
+        captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 2.56x bonus.",
+        special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by ???x and boosts ATK against delayed enemies by 1.5x for 1 turn",
+        specialName: "Squid Spear",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
     },
     1439: {//Daruma
-        captain: "Not Translated",
-        special: "Reduces Paralysis and Silence duration by ??? turns, Deals ???x character's ATK in [DEX] damage to one enemy, boosts ATK of Powerhouse characters by ???x for 1 turn",
-        specialName: "Daruma Special",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.2x",
+        special: "Reduces Paralysis and Silence duration by 2 turns, cuts the current HP of one enemy by 10%, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
+        specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
     },
     1440: {//Daruma
-        captain: "Not Translated",
-        special: "Reduces Paralysis and Silence duration by ??? turns, Deals ???x character's ATK in [DEX] damage to one enemy, boosts ATK of Powerhouse characters by ???x for 1 turn",
-        specialName: "Daruma Special",
+        captain: "Reduces cooldown of all specials by 4 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.5x",
+        special: "Reduces Paralysis and Silence duration by 2 turns, cuts the current HP of one enemy by 10%, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
+        specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
     },
     1441: {//Zeo
-        captain: "Not Translated",
+        captain: "Boosts ATK of [INT] characters by 1.5x, reduces damage received by 10%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
-        specialName: "Zeo Special",
+        specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
     },
     1442: {//Zeo
         captain: "Not Translated",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
-        specialName: "Zeo Special",
+        specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
     },
     1443: {//Dosun
-        captain: "Not Translated",
-        special: "Changes certain orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for ??? turns",
-        specialName: "Dosun Special",
-        sailor: "Boost ATK and HP of all characters by ??? if there are 6 Powerhouse characters in your crew",
+        captain: "Boosts ATK of Powerhouse characters by 2.75x following a chain of Good > Great > Perfect hits",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for 1 turn",
+        specialName: "Papara Hammer",
+        sailor: "Boost ATK of all characters by 150 and HP of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
     1444: {//Dosun
-        captain: "Not Translated",
-        special: "Changes certain orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for ??? turns",
-        specialName: "Dosun Special",
-        sailor: "Boost ATK and HP of all characters by ??? if there are 6 Powerhouse characters in your crew",
+        captain: "Boosts ATK of Powerhouse characters by 3.25x following a chain of Good > Great > Perfect hits",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for 1 turn",
+        specialName: "Papara Hammer",
+        sailor: "Boost ATK of all characters by 150 and HP of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
     1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters by ???x if HP is above 70% at the start of the turn. If HP is below 70%, Boosts RCV of [QCK] and [PSY] units by 1.5x instead.",
diff --git a/common/data/effects.js b/common/data/effects.js
index 1bb7bcf39..608c7775d 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -397,5 +397,12 @@ window.effects = {
         orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
         atk: function(p) { return 1.2; }
     },
+    
+    '20-Hit Hit Barrier': {
+        description: 'You will only do damage once the combo meter reaches 20 hits',
+        thumb: null,
+        id: 42,
+        comboShield: 20
+    },
 
 };
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index 260dd223a..518037a6b 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -314,10 +314,24 @@ window.ships = [
         thumb: null,
         description: 'Boosts ATK of Shooter characters by 1.55x and their HP by 1.2x, reduces cooldown of all specials by 1 turn at the start of the fight. Special: Cuts the current HP of each enemy by 7% (cooldown: 15 turns).',
         atk: function(p) {
-            return [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.55 ][p.boatLevel - 1];
+            return !(p.unit.class.has('Shooter')) ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.55 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
+            return !(p.unit.class.has('Shooter')) ? 1 : [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
+        }
+    },
+    
+    { // 27
+        name: 'Going Luffy SENPAI!',
+        thumb: null,
+        description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x. Special: Reduces any damage received above 10,000 HP by large amount (cooldown: 17 turns). Incremental stats for this sip are 100% wrong, but level 10 stats are right',
+        atk: function(p) {
+            return !p.unit.class.has('Striker') ? 1 :
+                [ 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return !p.unit.class.has('Striker') ? 1 :
+                [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
         }
     },
 
diff --git a/common/data/specials.js b/common/data/specials.js
index ad3ee11f1..bde7e7c82 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1750,6 +1750,12 @@ window.specials = {
         atk: function(p) { return p.unit.cost >= 50 ? 1.75 : 1; },
         type: "class"
     },
+    1317: {
+        def: function(p) { return 0.2; }
+    },
+    1318: {
+        def: function(p) { return 0.2; }
+    },
     1319: {
         atk: function(p) { return 1.5; },
         type: "class"
@@ -2065,6 +2071,22 @@ window.specials = {
         atk: function(p) { return 1.5; },
         type: "type"
     },
+    1439: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
+    },
+    1440: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
+    },
+    1441: {
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
+    1442: {
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
     1445: {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
diff --git a/common/data/units.js b/common/data/units.js
index bd04b27dc..9614b06c1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1433,16 +1433,16 @@ window.units = [
     [ "Iron Pirate General Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, 1 ],
     [ "Hody Jones", "INT", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 700, 240, 10, 1976, 789, 95, null ],
     [ "Hody Jones, New Fishman Pirates Captain", "INT", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1921, 731, 32, 4444, 1480, 140, null ],
-    [ "Hyouzou", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ikaros Much", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hyouzou", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, 6, 3, 50, 392109, 411, 241, -333, null, null, null, null ],
+    [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, 9, 4, 99, 4000000, 1319, 613, -333, 2941, 1468, -333, null ],
+    [ "Ikaros Much", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 5, 3, 50, 392109, 223, 94, 27, null, null, null, null ],
+    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 8, 4, 99, 4000000, null, null, null, 2506, 1292, 303, null ],
+    [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, null, null, null, null ],
+    [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2341, 1430, 270, null ],
+    [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2424, 1362, 279, null ],
+    [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, null, null, null, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],
     ];
     
diff --git a/index.html b/index.html
index 983381faf..e4ec859de 100644
--- a/index.html
+++ b/index.html
@@ -72,7 +72,7 @@
                 <br>
                 <li>Don Sai Fortnight and Diamante Colo units Completed</li>
                 <br>
-                <li>Valentine Mansherry added to Character Table</li>
+                <li>Hody Jones Units added to Character Table</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From 9d217ff80a886888990786a96856a72d35ec81db Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 31 Jan 2017 00:53:34 -0500
Subject: [PATCH 0786/1569] Some quickies

---
 common/data/details.js  | 12 ++++++------
 common/data/specials.js | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index bba3ad5ab..616bca750 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7721,7 +7721,7 @@ window.details = {
         captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x and HP of Powerhouse characters by 2x if there are 6 Powerhouse characters in your crew.",
         special: [
             {
-                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "description": "Deals 60x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
                 "cooldown": [ 12, null ],
             },
             {
@@ -7735,7 +7735,7 @@ window.details = {
         captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x and HP of Powerhouse characters by 2x if there are 6 Powerhouse characters in your crew.",
         special: [
             {
-                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "description": "Deals 60x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
                 "cooldown": [ 12, null ],
             },
             {
@@ -7762,14 +7762,14 @@ window.details = {
     1437: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
         captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 1.69x bonus.",
-        special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by ???x and boosts ATK against delayed enemies by 1.5x for 1 turn",
+        special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by 1.75x and boosts ATK against delayed enemies by 1.5x for 1 turn",
         specialName: "Squid Spear",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
     },
     1438: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.6x",
         captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 2.56x bonus.",
-        special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by ???x and boosts ATK against delayed enemies by 1.5x for 1 turn",
+        special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by 1.75x and boosts ATK against delayed enemies by 1.5x for 1 turn",
         specialName: "Squid Spear",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
     },
@@ -7799,13 +7799,13 @@ window.details = {
     },
     1443: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 2.75x following a chain of Good > Great > Perfect hits",
-        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for 1 turn",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
         sailor: "Boost ATK of all characters by 150 and HP of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
     1444: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 3.25x following a chain of Good > Great > Perfect hits",
-        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by ???x and amplifies the effect of orbs by ???x for 1 turn",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
         sailor: "Boost ATK of all characters by 150 and HP of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
diff --git a/common/data/specials.js b/common/data/specials.js
index bde7e7c82..f6855190d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2071,6 +2071,18 @@ window.specials = {
         atk: function(p) { return 1.5; },
         type: "type"
     },
+    1437: {
+        atk: function(p) { return 1.5; },
+        type: "condition",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    1438: {
+        atk: function(p) { return 1.5; },
+        type: "condition",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
     1439: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         type: "class"
@@ -2087,6 +2099,16 @@ window.specials = {
         chain: function(p) { return 2.5; },
         chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
     },
+    1443: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+    },
+    1444: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+    },
     1445: {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },

From ceecff39513acd4efee73b234c38d0bb990af362 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 Jan 2017 01:23:22 -0600
Subject: [PATCH 0787/1569] Captain & numbers

for testing
---
 common/data/details.js | 4 ++--
 common/data/units.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 616bca750..67d531451 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7786,13 +7786,13 @@ window.details = {
         sailor: "Completely resists Silence on this character",
     },
     1441: {//Zeo
-        captain: "Boosts ATK of [INT] characters by 1.5x, reduces damage received by 10%",
+        captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
     },
     1442: {//Zeo
-        captain: "Not Translated",
+        captain: "Boosts ATK of [INT] characters by 2.25x and reduces damage received by 20%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
diff --git a/common/data/units.js b/common/data/units.js
index 9614b06c1..f0b971926 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1440,7 +1440,7 @@ window.units = [
     [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, null, null, null, null ],
     [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2341, 1430, 270, null ],
     [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2424, 1362, 279, null ],
+    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2424, 1362, 279, null ],
     [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, null, null, null, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],

From 2b4a468bdf6a4bc28fb38315aa5fc8a907b43c67 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 Jan 2017 01:25:24 -0600
Subject: [PATCH 0788/1569] Numbers For Testing

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index f0b971926..a44d8561e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1436,11 +1436,11 @@ window.units = [
     [ "Hyouzou", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, 6, 3, 50, 392109, 411, 241, -333, null, null, null, null ],
     [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, 9, 4, 99, 4000000, 1319, 613, -333, 2941, 1468, -333, null ],
     [ "Ikaros Much", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 5, 3, 50, 392109, 223, 94, 27, null, null, null, null ],
-    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 8, 4, 99, 4000000, null, null, null, 2506, 1292, 303, null ],
+    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2506, 1292, 303, null ],
     [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, null, null, null, null ],
     [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2341, 1430, 270, null ],
     [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2424, 1362, 279, null ],
+    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2424, 1362, 279, null ],
     [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, null, null, null, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],

From 8291d12a438bd242a7ea7b13631f761e0ea7cda8 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 31 Jan 2017 01:31:24 -0600
Subject: [PATCH 0789/1569] wrong numbers

on purpose
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index a44d8561e..ce2b21c7b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1440,7 +1440,7 @@ window.units = [
     [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, null, null, null, null ],
     [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2341, 1430, 270, null ],
     [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2424, 1362, 279, null ],
+    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2424, 1362, 279, null ],
     [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, null, null, null, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],

From ff81e97e8baf0123e10d23191731e74f1c0d4481 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 31 Jan 2017 11:23:09 -0500
Subject: [PATCH 0790/1569] Stats and Names

---
 common/data/aliases.js    | 24 ++++++++++++------------
 common/data/evolutions.js | 12 ++++++------
 common/data/flags.js      |  2 +-
 common/data/units.js      | 24 ++++++++++++------------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b7faed41f..4c8b6d72d 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1431,18 +1431,18 @@ window.aliases = {
     1430: ['', '', 'Valentine Mansherry'],
     1431: ['フランキー将軍', '', 'General Franky'],
     1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky'],
-    1433: ['', '', ''],
-    1434: ['', '', ''],
-    1435: ['', '', ''],
-    1436: ['', '', ''],
-    1437: ['', '', ''],
-    1438: ['', '', ''],
-    1439: ['', '', ''],
-    1440: ['', '', ''],
-    1441: ['', '', ''],
-    1442: ['', '', ''],
-    1443: ['', '', ''],
-    1444: ['', '', ''],
+    1433: ['ホーディ・ジョーンズ', '', ''],
+    1434: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
+    1435: ['ヒョウゾウ 新魚人海賊団', '', ''],
+    1436: ['ヒョウゾウ 魚人街の亡霊', '', ''],
+    1437: ['イカロス・ムッヒ 新魚人海賊団', '', ''],
+    1438: ['イカロス・ムッヒ 魚人街の亡霊', '', ''],
+    1439: ['ダルマ 新魚人海賊団', '', ''],
+    1440: ['ダルマ 魚人街の亡霊', '', ''],
+    1441: ['ゼオ 新魚人海賊団', '', ''],
+    1442: ['ゼオ 魚人街の亡霊', '', ''],
+    1443: ['ドスン 新魚人海賊団', '', ''],
+    1444: ['ドスン 魚人街の亡霊', '', ''],
     1445: ['', '', 'Mega Boa Hancock'],
     
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 110e428a6..468097f16 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2197,26 +2197,26 @@ window.evolutions = {
     },
     1433: {
         evolution: 1434,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 267, 99, 304 ]
     },
     1435: {
         evolution: 1436,
-        evolvers: [  ]
+        evolvers: [ 118, 96, 1180, 101, 301 ]
     },
     1437: {
         evolution: 1438,
-        evolvers: [  ]
+        evolvers: [ 87, 1180, 94, 103, 303 ]
     },
     1439: {
         evolution: 1440,
-        evolvers: [  ]
+        evolvers: [ 118, 83, 86, 102, 302 ]
     },
     1441: {
         evolution: 1442,
-        evolvers: [  ]
+        evolvers: [ 266, 93, 104, 104, 304 ]
     },
     1443: {
         evolution: 1444,
-        evolvers: [  ]
+        evolvers: [ 95, 95, 1180, 300, 300 ]
     },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 634b3ea0d..018aa9052 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -724,7 +724,7 @@ window.flags = {
     724: { global: 1 },
     725: { global: 1, rr: 1, rro: 1, lrr: 1 },
     726: { global: 1, rr: 1, rro: 1, lrr: 1 },
-    727: { special: 1, global: 1 },
+    727: { special: 1, shop: 1, global: 1 },
     728: { global: 1 },
     729: { global: 1 },
     730: { global: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index ce2b21c7b..7942849ab 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1431,18 +1431,18 @@ window.units = [
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, null ],
     [ "Shogun Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, 1550, 736, 102, 1 ],
     [ "Iron Pirate General Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, 1 ],
-    [ "Hody Jones", "INT", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 700, 240, 10, 1976, 789, 95, null ],
-    [ "Hody Jones, New Fishman Pirates Captain", "INT", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1921, 731, 32, 4444, 1480, 140, null ],
-    [ "Hyouzou", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, 6, 3, 50, 392109, 411, 241, -333, null, null, null, null ],
-    [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, 9, 4, 99, 4000000, 1319, 613, -333, 2941, 1468, -333, null ],
-    [ "Ikaros Much", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 5, 3, 50, 392109, 223, 94, 27, null, null, null, null ],
-    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2506, 1292, 303, null ],
-    [ "Daruma", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, null, null, null, null ],
-    [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2341, 1430, 270, null ],
-    [ "Zeo", "INT", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Zeo, New Fishman Pirates", "INT", [ "Powerhouse", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2424, 1362, 279, null ],
-    [ "Dosun", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, null, null, null, null ],
+    [ "Hody Jones, New Fishman Pirates Captain", "INT", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 700, 240, 10, 1976, 789, 95, null ],
+    [ "Hody Jones", "INT", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1921, 731, 32, 4444, 1480, 140, null ],
+    [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, 6, 3, 50, 392109, 411, 241, -333, 1394, 671, -333, null ],
+    [ "Hyouzou, Ghosts of Fish Street", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, 9, 4, 99, 4000000, 1319, 613, -333, 2941, 1468, -333, null ],
+    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 5, 3, 50, 392109, 223, 94, 27, 1206, 501, 138, null ],
+    [ "Ikaros Much, Ghosts of Fish Street", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 8, 4, 99, 4000000, 1132, 429, 99, 2506, 1292, 303, null ],
+    [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, 1002, 606, 105, null ],
+    [ "Daruma, Ghosts of Fish Street", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 931, 531, 55, 2341, 1430, 270, null ],
+    [ "Zeo, New Fishman Pirate", "INT", [ "Powerhouse", "Striker" ], 4, 15, 4, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Zeo, Ghosts of Fish Street", "INT", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1078, 441, 96, 2424, 1362, 279, null ],
+    [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Dosun, Ghosts of Fish Street", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, null, null, null, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],
     ];
     

From 254f8d5d911fc43fcf80613d31ca78d46f67ac63 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 31 Jan 2017 23:03:31 -0500
Subject: [PATCH 0791/1569] Max Stats Evolved done

---
 common/data/cooldowns.js | 8 ++++----
 common/data/units.js     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 28a94a27a..c742c096d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1437,10 +1437,10 @@ window.cooldowns = [
     21,
     21,
     21,
-    22,
-    22,
-    null,
-    null,
+    [ 22, 15 ],
+    [ 22, 15 ],
+    17,
+    17,
     20,
     20,
     [ 17, 13 ],
diff --git a/common/data/units.js b/common/data/units.js
index 7942849ab..e1ec83e88 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1442,7 +1442,7 @@ window.units = [
     [ "Zeo, New Fishman Pirate", "INT", [ "Powerhouse", "Striker" ], 4, 15, 4, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Zeo, Ghosts of Fish Street", "INT", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1078, 441, 96, 2424, 1362, 279, null ],
     [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Dosun, Ghosts of Fish Street", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, null, null, null, null ],
+    [ "Dosun, Ghosts of Fish Street", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],
     ];
     

From 38311603ccf31dd0f705461a3898c9155036638c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 1 Feb 2017 00:11:28 -0500
Subject: [PATCH 0792/1569] Boa Max Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index e1ec83e88..80b3ca579 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1443,7 +1443,7 @@ window.units = [
     [ "Zeo, Ghosts of Fish Street", "INT", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1078, 441, 96, 2424, 1362, 279, null ],
     [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Dosun, Ghosts of Fish Street", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, null ],
-    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 2900, 1500, 600, null ],
+    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 5d2d10346024463d4de7b28a2a07228169df9ed5 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Wed, 1 Feb 2017 22:50:52 -0800
Subject: [PATCH 0793/1569] Added 5+ Chopper, Sanji, and Sogeking

hopefully fixed things.  if so added 5+ chopper, sanji, and sogeking base stats and details
---
 common/data/details.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 67d531451..73312c173 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1580,7 +1580,7 @@ window.details = {
         specialName: "Iron Guard",
         captain: "Reduces damage received by 10%, boosts ATK of Slasher characters by 2x"
     },
-    403: {
+    403: { 
         special: "Deals several times the character's ATK in QCK damage to all enemies",
         specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Backwater Sword Dance",
@@ -7815,4 +7815,28 @@ window.details = {
         special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 70%, changes left column into Matching orbs.",
         specialName: "Boa Hancock Special",
     },
-};
\ No newline at end of file
+    1446: {//Sogeking 5+
+        captain: "Doubles shooters ATK and boosts shooters RCV by 1.25x.",
+        special: "Deals random PSY damage to all enemies and delays enemies by 3 turns.",
+        specialName: "Sogeking Special",
+    },
+    1447: {//Sanji 5+
+        captain: "Boosts Powerhouse characters ATK by 2.5x and reduces damage take by 10%.",
+        special: [
+            {
+                "description": "Deals 5,000 fixed damage to all enemies and boosts crew's attack by 1.2x for 1 turn.",
+                "cooldown": [ 15, null ],
+            },
+            {
+                "description": "Deals 50,000 fixed damage to all enemies and boosts crew's attack by 1.5x for 1 turn.",
+                "cooldown": [ 20, null ],
+            },
+        ],
+        specialName: "Sanji Special",
+    },
+    1448: {//Chopper 5+
+        captain: "Boosts Fighter characters ATK by 2.5x.",
+        special: "Deals PSY damage based on current HP and is higher the more HP you have.  Changes [Block] orbs on Fighter characters into matching.",
+        specialName: "Chopper Special",
+    },
+};

From 7695c3be6a2133addd0504560ec04134a568e694 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Wed, 1 Feb 2017 22:53:10 -0800
Subject: [PATCH 0794/1569] Added 5+ Chopper, Sanji, and Sogeking

Hopefully fixed things.  if so, added 5+ chopper, sanji, and sogeking base stats and details
---
 common/data/units.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/data/units.js b/common/data/units.js
index 80b3ca579..8b6047c97 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1444,6 +1444,9 @@ window.units = [
     [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Dosun, Ghosts of Fish Street", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, null ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, null ],
+    [ "Sogeking 5+", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, null, 770, 292, 189, null, null, null, null ],
+    [ "Sanji  5+", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, null, 550, 515, 175, null, null, null, null ],
+    [ "Chopper 5+", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, null, 699, 490, 90, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 825022142f4069365349c3d7b164268f9db7071b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 2 Feb 2017 16:42:29 -0500
Subject: [PATCH 0795/1569] New units on Official

---
 common/data/aliases.js  |  6 +++---
 common/data/captains.js |  6 +++---
 common/data/details.js  | 19 ++++++++++---------
 common/data/units.js    | 26 +++++++++++++-------------
 4 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 4c8b6d72d..e1ef3e194 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1431,8 +1431,8 @@ window.aliases = {
     1430: ['', '', 'Valentine Mansherry'],
     1431: ['フランキー将軍', '', 'General Franky'],
     1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky'],
-    1433: ['ホーディ・ジョーンズ', '', ''],
-    1434: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
+    1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
+    1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', ''],
     1435: ['ヒョウゾウ 新魚人海賊団', '', ''],
     1436: ['ヒョウゾウ 魚人街の亡霊', '', ''],
     1437: ['イカロス・ムッヒ 新魚人海賊団', '', ''],
@@ -1443,6 +1443,6 @@ window.aliases = {
     1442: ['ゼオ 魚人街の亡霊', '', ''],
     1443: ['ドスン 新魚人海賊団', '', ''],
     1444: ['ドスン 魚人街の亡霊', '', ''],
-    1445: ['', '', 'Mega Boa Hancock'],
+    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock'],
     
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 8e2fffb87..55c3fa9a4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4070,11 +4070,11 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1445: {
-        atk: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 3 : 1;
+        atk: function(p) { 
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") ? 2.25 + 0.5 * p.percHP / 100 : 1; 
         },
         rcv: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP <= 70.0 ? 1.5 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
         }
     },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 67d531451..781a3ac97 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7718,29 +7718,31 @@ window.details = {
         specialName: "General Cannon",
     },
     1433: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x and HP of Powerhouse characters by 2x if there are 6 Powerhouse characters in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew, however, we do not have any numbers for this yet, so he will only boost HP if there are 6 powerhouse units FOR NOW.",
         special: [
             {
                 "description": "Deals 60x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
-                "cooldown": [ 12, null ],
+                "cooldown": [ 12, 7 ],
             },
             {
                 "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
-                "cooldown": [ 22, null ],
+                "cooldown": [ 22, 17 ],
             },
         ],
         specialName: "Water Bullets",
     },
     1434: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x and HP of Powerhouse characters by 2x if there are 6 Powerhouse characters in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew, however, we do not have any numbers for this yet, so he will only boost HP if there are 6 powerhouse units FOR NOW.",
         special: [
             {
                 "description": "Deals 60x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
-                "cooldown": [ 12, null ],
+                "cooldown": [ 12, 7 ],
             },
             {
                 "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
-                "cooldown": [ 22, null ],
+                "cooldown": [ 22, 17 ],
             },
         ],
         specialName: "Water Bullets",
@@ -7810,9 +7812,8 @@ window.details = {
         sailor: "Boost ATK of all characters by 150 and HP of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
     1445: {//Boa Hancock+
-        captain: "Boosts ATK of [QCK] and [PSY] characters by ???x if HP is above 70% at the start of the turn. If HP is below 70%, Boosts RCV of [QCK] and [PSY] units by 1.5x instead.",
-        captainNotes: "Unclear what the captain boost is yet, but in the damage calculator she is currently set to 3x",
+        captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
         special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 70%, changes left column into Matching orbs.",
-        specialName: "Boa Hancock Special",
+        specialName: "Aromatic Foot",
     },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 80b3ca579..1105884f4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1431,19 +1431,19 @@ window.units = [
     [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, null ],
     [ "Shogun Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, 1550, 736, 102, 1 ],
     [ "Iron Pirate General Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, 1 ],
-    [ "Hody Jones, New Fishman Pirates Captain", "INT", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 700, 240, 10, 1976, 789, 95, null ],
-    [ "Hody Jones", "INT", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1921, 731, 32, 4444, 1480, 140, null ],
-    [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, 6, 3, 50, 392109, 411, 241, -333, 1394, 671, -333, null ],
-    [ "Hyouzou, Ghosts of Fish Street", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, 9, 4, 99, 4000000, 1319, 613, -333, 2941, 1468, -333, null ],
-    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 5, 3, 50, 392109, 223, 94, 27, 1206, 501, 138, null ],
-    [ "Ikaros Much, Ghosts of Fish Street", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 8, 4, 99, 4000000, 1132, 429, 99, 2506, 1292, 303, null ],
-    [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, 1002, 606, 105, null ],
-    [ "Daruma, Ghosts of Fish Street", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 931, 531, 55, 2341, 1430, 270, null ],
-    [ "Zeo, New Fishman Pirate", "INT", [ "Powerhouse", "Striker" ], 4, 15, 4, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Zeo, Ghosts of Fish Street", "INT", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1078, 441, 96, 2424, 1362, 279, null ],
-    [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Dosun, Ghosts of Fish Street", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, null ],
-    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, null ],
+    [ "Hody Jones, New Fishman Pirates Captain", "INT", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 700, 240, 10, 1976, 789, 95, 1 ],
+    [ "Hody Jones, the Ghost of Fishman District", "INT", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1921, 731, 32, 4444, 1480, 140, 1 ],
+    [ "Hyouzou, New Fishman Pirates", "QCK", [ "Powerhouse", "Slasher" ], 4, 15, 6, 3, 50, 392109, 206, 151, -333, 1394, 671, -333, 1 ],
+    [ "Hyouzou, Ghosts of Fishman District", "QCK", [ "Powerhouse", "Slasher" ], 5, 30, 9, 4, 99, 4000000, 1319, 613, -333, 2941, 1468, -333, 1 ],
+    [ "Ikaros Much, New Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 5, 3, 50, 392109, 223, 94, 27, 1206, 501, 138, 1 ],
+    [ "Ikaros Much, Ghosts of Fishman District", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 8, 4, 99, 4000000, 1132, 429, 99, 2506, 1292, 303, 1 ],
+    [ "Daruma, New Fishman Pirates", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 4, 3, 50, 392109, 174, 133, 21, 1002, 606, 105, 1 ],
+    [ "Daruma, Ghosts of Fishman District", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 931, 531, 55, 2341, 1430, 270, 1 ],
+    [ "Zeo, New Fishman Pirate", "INT", [ "Powerhouse", "Striker" ], 4, 15, 4, 3, 50, 392109, 202, 80, 24, 1159, 522, 139, 1 ],
+    [ "Zeo, Ghosts of Fishman District", "INT", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1078, 441, 96, 2424, 1362, 279, 1 ],
+    [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 302, 79, 18, 1440, 509, 96, 1 ],
+    [ "Dosun, Ghosts of Fishman District", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, 1 ],
+    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 74160e9d72c17842a261568ca35ba59d0791ae30 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 2 Feb 2017 17:04:59 -0500
Subject: [PATCH 0796/1569] New 5+ units

---
 common/data/captains.js  |  7 +++++++
 common/data/cooldowns.js |  3 +++
 common/data/details.js   | 21 +++++++++++----------
 common/data/gw.js        |  3 +++
 common/data/specials.js  | 14 +++++++++++++-
 common/data/units.js     |  6 +++---
 6 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 55c3fa9a4..d885240c9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4077,4 +4077,11 @@ window.captains = {
             return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
         }
     },
+    1446: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+    },
+    1447: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c742c096d..b8a9b9245 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1444,4 +1444,7 @@ window.cooldowns = [
     20,
     20,
     [ 17, 13 ],
+    [ 17, 12 ],
+    null,
+    [ 20, 12 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index e582eb5d6..08868d639 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1580,7 +1580,7 @@ window.details = {
         specialName: "Iron Guard",
         captain: "Reduces damage received by 10%, boosts ATK of Slasher characters by 2x"
     },
-    403: { 
+    403: {
         special: "Deals several times the character's ATK in QCK damage to all enemies",
         specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )}",
         specialName: "Backwater Sword Dance",
@@ -7817,27 +7817,28 @@ window.details = {
         specialName: "Aromatic Foot",
     },
     1446: {//Sogeking 5+
-        captain: "Doubles shooters ATK and boosts shooters RCV by 1.25x.",
+        captain: "Boosts ATK of Shooters by 2x and RCV of Shooters by 1.25x.",
         special: "Deals random PSY damage to all enemies and delays enemies by 3 turns.",
-        specialName: "Sogeking Special",
+        specialName: "Green Star: Platanus Shuriken",
     },
     1447: {//Sanji 5+
         captain: "Boosts Powerhouse characters ATK by 2.5x and reduces damage take by 10%.",
         special: [
             {
-                "description": "Deals 5,000 fixed damage to all enemies and boosts crew's attack by 1.2x for 1 turn.",
-                "cooldown": [ 15, null ],
+                "description": "Deals 5,000 fixed damage to all enemies and boosts own ATK by 1.2x for 1 turn.",
+                "cooldown": [ 15, 10 ],
             },
             {
-                "description": "Deals 50,000 fixed damage to all enemies and boosts crew's attack by 1.5x for 1 turn.",
-                "cooldown": [ 20, null ],
+                "description": "Deals 50,000 fixed damage to all enemies and boosts own ATK by 1.5x for 1 turn.",
+                "cooldown": [ 20, 15 ],
             },
         ],
-        specialName: "Sanji Special",
+        specialName: "Grill Shot",
     },
     1448: {//Chopper 5+
         captain: "Boosts Fighter characters ATK by 2.5x.",
-        special: "Deals PSY damage based on current HP and is higher the more HP you have.  Changes [Block] orbs on Fighter characters into matching.",
-        specialName: "Chopper Special",
+        special: "Deals PSY damage according to HP. Changes [Block] orbs on Fighter characters into matching.",
+        specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the higher the HP is. The formula used is ???? * (current HP) / (total HP)",
+        specialName: "Weight Gain: Heavy Gong",
     },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index d2efe3642..d8592b81c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1444,4 +1444,7 @@ window.gw=[
     50185,
     50185,
     9034,
+    2022,
+    2018,
+    2021,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index f6855190d..38190a6b5 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2113,5 +2113,17 @@ window.specials = {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         type: "type"
-    }
+    },
+    1447: {
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1447].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1447].multiplier == 1.5 ? 1 : 0);
+            window.specials[1447].multiplier = [1.2, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.2, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.2][n] + 'x multiplier, disable and re-enable this special',
+                name: '1447warning'
+            });
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 4148fe644..e8249557e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1444,9 +1444,9 @@ window.units = [
     [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 302, 79, 18, 1440, 509, 96, 1 ],
     [ "Dosun, Ghosts of Fishman District", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, 1 ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, 1 ],
-    [ "Sogeking 5+", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, null, 770, 292, 189, null, null, null, null ],
-    [ "Sanji  5+", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, null, 550, 515, 175, null, null, null, null ],
-    [ "Chopper 5+", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, null, 699, 490, 90, null, null, null, null ],
+    [ "Sogeking 5+", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, 3000000, 770, 292, 189, null, null, null, null ],
+    [ "Sanji  5+", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, null, null, null, null ],
+    [ "Chopper 5+", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 0d31161ca0d7bf1737eb5bdf0b627f9f59fbdcd8 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 2 Feb 2017 23:30:30 -0500
Subject: [PATCH 0797/1569] Stats and Boa Notes

---
 common/data/details.js | 1 +
 common/data/units.js   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 08868d639..429451676 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7815,6 +7815,7 @@ window.details = {
         captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
         special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 70%, changes left column into Matching orbs.",
         specialName: "Aromatic Foot",
+        captainNotes: "#{captainProportional : higher : 2.25 + 0.5 * (remaining HP) / (total HP) : 2.75 : 2.25}"
     },
     1446: {//Sogeking 5+
         captain: "Boosts ATK of Shooters by 2x and RCV of Shooters by 1.25x.",
diff --git a/common/data/units.js b/common/data/units.js
index e8249557e..b90638583 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1445,8 +1445,8 @@ window.units = [
     [ "Dosun, Ghosts of Fishman District", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, 1 ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, 1 ],
     [ "Sogeking 5+", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, 3000000, 770, 292, 189, null, null, null, null ],
-    [ "Sanji  5+", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, null, null, null, null ],
-    [ "Chopper 5+", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, null, null, null, null ],
+    [ "Sanji  5+", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, 2709, 1337, 251, null ],
+    [ "Chopper 5+", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, 2336, 1236, 346, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From ab37a1ef4101046713fa9aeeac8dc139b6438e53 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 3 Feb 2017 00:17:57 -0500
Subject: [PATCH 0798/1569] Some stuff

What else do I put here? Memes?
---
 common/data/aliases.js | 4 +++-
 common/data/drops.js   | 7 +++++++
 common/data/ships.js   | 6 +++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index e1ef3e194..964b77520 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1444,5 +1444,7 @@ window.aliases = {
     1443: ['ドスン 新魚人海賊団', '', ''],
     1444: ['ドスン 魚人街の亡霊', '', ''],
     1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock'],
-    
+    1446: ['', '', 'Mega Usopp'],
+    1447: ['', '', 'Mega Sanji'],
+    1448: ['', '', 'Mega Chopper'],
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index e60bf574e..6f1e9e91f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1300,6 +1300,13 @@ window.drops = {
             "All Difficulties": [ 1425, 1427, 1428, -1240, -1272, -1270, -1227, -1224, -872, -878, -255, -812 ]
         },
         
+        {
+            name: "Protect Violet-Chan!!",
+            thumb: null,
+            //condition: "You can only bring DEX units",
+            "All Difficulties": [ -935, -1278, -1378, -1324, -880, -876, -259, -1226, -814 ]
+        },
+        
     ],
 
             
diff --git a/common/data/ships.js b/common/data/ships.js
index 518037a6b..4883b5086 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -324,14 +324,14 @@ window.ships = [
     { // 27
         name: 'Going Luffy SENPAI!',
         thumb: null,
-        description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x. Special: Reduces any damage received above 10,000 HP by large amount (cooldown: 17 turns). Incremental stats for this sip are 100% wrong, but level 10 stats are right',
+        description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x. Special: Reduces any damage received above 10,000 HP by large amount (cooldown: 17 turns).',
         atk: function(p) {
             return !p.unit.class.has('Striker') ? 1 :
-                [ 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
+                [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
             return !p.unit.class.has('Striker') ? 1 :
-                [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
+                [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
         }
     },
 

From 990e6c2377001a5e2977250fa673fe0042569d5e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 01:30:48 +0100
Subject: [PATCH 0799/1569] Prepared for Sakazuki

---
 damage/js/app.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/damage/js/app.js b/damage/js/app.js
index 40cbd309d..2b918d66f 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -61,6 +61,7 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
 
     $rootScope.options = {
         gOrbsEnabled: 0,
+        strOrbsEnabled: 0,
         slidersEnabled: true,
         sidebarVisible: false,
         transientMode: false,
@@ -120,6 +121,35 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         return false;
     };
 
+    /* * * * * [STR] orb control * * * * */
+
+    var resetSTROrbs = function() {
+        for (var i=0;i<6;++i) {
+            if ($scope.tdata.team[i].orb == 'str')
+                $scope.tdata.team[i].orb = 1;
+        }
+    };
+
+    // reset g slots automatically
+    $scope.$watch('options.strOrbsEnabled',function() {
+        if (!$rootScope.areSTROrbsEnabled())
+            resetSTROrbs();
+    });
+
+    $scope.$watch('data.effect',function() {
+        if (!$rootScope.areSTROrbsEnabled())
+            resetSTROrbs();
+    });
+
+    $rootScope.areSTRrbsEnabled = function() {
+        if ($rootScope.options.strOrbsEnabled > 0) return true;
+        if ($rootScope.data.effect) {
+            var effect = window.effects[$rootScope.data.effect];
+            if (effect && effect.strOrbsEnabled) return true;
+        }
+        return false;
+    };
+
     /* * * * * Custom hit modifiers resetting * * * * */
 
     var resetTransitional = function() {

From 4150651b2f527299fc7e5f901b45ae0373b4c638 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 01:37:04 +0100
Subject: [PATCH 0800/1569] Update events.js

---
 common/data/events.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/events.js b/common/data/events.js
index 9b26c7294..af3f8ecf9 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -131,22 +131,22 @@ window.events = {
     },
     1313: {
         onInsertion: function($scope) {
-            if (++$scope.options.gOrbsEnabled == 1)
-                $scope.notify({ text: 'Captain ability still being worked on. Use a [G] orb for now to simulate a STR orb on a character. (Will only have 1.5x boost)' });
+            if (++$scope.options.strOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [STR] orbs support.' });
         },
         onRemoval: function($scope) {
-            if (--$scope.options.gOrbsEnabled === 0)
-                $scope.notify({ text: 'Disabling [G] orbs support.' });
+            if (--$scope.options.strOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [STR] orbs support.' });
         }
     },
     1314: {
         onInsertion: function($scope) {
-            if (++$scope.options.gOrbsEnabled == 1)
-                $scope.notify({ text: 'Captain ability still being worked on. Use a [G] orb for now to simulate a STR orb on a character. (Will only have 1.5x boost)' });
+            if (++$scope.options.strOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [STR] orbs support.' });
         },
         onRemoval: function($scope) {
-            if (--$scope.options.gOrbsEnabled === 0)
-                $scope.notify({ text: 'Disabling [G] orbs support.' });
+            if (--$scope.options.strOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [STR] orbs support.' });
         }
     },
 };

From 0974acfc7548218d479680782ea0527ee0c0727b Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 01:40:38 +0100
Subject: [PATCH 0801/1569] Update utils.js

---
 damage/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/utils.js b/damage/js/utils.js
index 814c6b213..343158e27 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -97,7 +97,7 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
 };*/
 
 window.CrunchUtils.getOrbMultiplier = function(orb, baseMultiplier, boostedMultiplier) {
-    if (orb == 1.0) return baseMultiplier;
+    if (orb == 1.0 || orb == 'str') return baseMultiplier;
     if (orb == 2.0 || orb == 'g') return boostedMultiplier;
     if (orb == 0.5) return 1 / boostedMultiplier;
     return 1;

From 593f8d273d5a8f9d7a905ae9659de674f1b4cb2f Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 01:48:15 +0100
Subject: [PATCH 0802/1569] Update images.js

---
 damage/js/images.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index 64e56fa80..e5fe7bb23 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -83,7 +83,7 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                 if (orb != 1.0) {
                     var gradient = context.createRadialGradient(baseX + 20, baseY + 21, 13, baseX + 22, baseY + 22, 35);
                     if (orb < 1) gradient.addColorStop(0.1, ORB_COLORS[Utils.getOppositeType(unit.type)]);
-                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : unit.type]);
+                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'STR' : unit.type]);
                     if (orb < 1) gradient.addColorStop(0.2, 'black');
                     else {
                         gradient.addColorStop(0.2, 'white');
@@ -93,13 +93,16 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                     gradient.addColorStop(1.0, 'transparent');
                     context.fillStyle = gradient;
                     context.fillRect(0, 0, canvas.width, canvas.height);
-                    if (orb != 'g') {
+                    if (orb != 'g' && orb != 'str') {
                         var temp = (orb < 1 ? [ 'f0d7', baseX + 13, baseY + 31 ] : [ 'f0d8', baseX + 13, baseY + 28 ]);
                         awesome(context, { text: temp[0], style: '28px', color: 'white',
                             x: temp[1], y: temp[2], stroke: 'gray' });
-                    } else {
+                    } else if (orb == 'g') {
                         type(context, { text: 'G', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
+                    } else {
+                        type(context, { text: 'S', style: 'bold 20px "Open Sans"',
+                            x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
                     }
                 }
                 // level label

From 08cc41310a7014b06d243ecd7e2287d113704f46 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 01:50:31 +0100
Subject: [PATCH 0803/1569] Update orb.html

---
 damage/views/fragments/orb.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/damage/views/fragments/orb.html b/damage/views/fragments/orb.html
index 5f300b323..f108a8012 100644
--- a/damage/views/fragments/orb.html
+++ b/damage/views/fragments/orb.html
@@ -1,7 +1,7 @@
 <div class="unitOrb {{glow()}}">
 
     <i class="fa"
-        ng-show="tdata.team[slot].orb != 'g'"
+        ng-show="tdata.team[slot].orb != 'g' && tdata.team[slot].orb != 'str'"
         ng-class="{ 'fa-caret-up': tdata.team[slot].orb == 2, 'fa-caret-down': tdata.team[slot].orb == 0.5 }">
     </i>
 
@@ -9,4 +9,8 @@
         G
     </i>
 
+    <i class="str-orb" ng-show="tdata.team[slot].orb == 'str'">
+        S
+    </i>
+
 </div>

From af29d34d5501028705b0313133775c0dd74f57d1 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 01:55:38 +0100
Subject: [PATCH 0804/1569] Update app.js

---
 damage/js/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/app.js b/damage/js/app.js
index 2b918d66f..b5c47b344 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -141,7 +141,7 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
             resetSTROrbs();
     });
 
-    $rootScope.areSTRrbsEnabled = function() {
+    $rootScope.areSTROrbsEnabled = function() {
         if ($rootScope.options.strOrbsEnabled > 0) return true;
         if ($rootScope.data.effect) {
             var effect = window.effects[$rootScope.data.effect];

From cce01fa6903b64d15d0ec96f97d77de267c6d8d2 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 02:10:28 +0100
Subject: [PATCH 0805/1569] Update images.js

---
 damage/js/images.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index e5fe7bb23..52f8055fc 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -3,7 +3,7 @@
 var app = angular.module('optc');
 
 var BOX_COLORS = { STR: 'salmon', QCK: 'lightskyblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid' };
-var ORB_COLORS = { STR: 'orangered', QCK: 'dodgerblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid', G: 'orange' };
+var ORB_COLORS = { STR: 'orangered', QCK: 'dodgerblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid', G: 'orange', S: 'orangered'};
 
 var lock = new Image(), silence = new Image();
 lock.src = 'res/chain.png';

From a498bec25a445755a9b18dc8a20fc02d76076e71 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 02:12:30 +0100
Subject: [PATCH 0806/1569] Update directives.js

---
 damage/js/directives.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 31769c3f1..e1077f0ad 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,7 +592,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
-                    tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length : ORBS.length - 1)];
+                    tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1)];
                     scope.glow();
                     scope.$apply();
                     e.preventDefault();
@@ -603,7 +603,7 @@ directives.unitOrb = function($rootScope) {
             var onLongPress = function(e) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 var n = ORBS.indexOf(tunit.orb);
-                tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length : ORBS.length - 1)];
+                tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1)];
                 scope.glow();
                 scope.$apply();
                 e.preventDefault();

From 02633005aadfbd0e6edfc943702a8cf79c991492 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 02:18:36 +0100
Subject: [PATCH 0807/1569] Update transfer.js

---
 damage/js/transfer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index 98e6cb632..f82bb54cd 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -126,7 +126,7 @@ var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
                 .slice(-6).split('').map(function(x) { return parseInt(x, 10); });
             temp.forEach(function(x,n) {
                 var unit = $scope.tdata.team[n];
-                unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : 1)));
+                unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : (x == 4 ? 'str' : 1))));
                 if (unit.orb == 'g' && !$rootScope.areGOrbsEnabled()) unit.orb = 1;
             });
         } else if (type == 'S') {

From 4f4a6cb9de1bf8a29ab343c3ced1e2818f7ae912 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 02:21:12 +0100
Subject: [PATCH 0808/1569] Update images.js

---
 damage/js/images.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index 52f8055fc..a9e7370a6 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -83,7 +83,7 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                 if (orb != 1.0) {
                     var gradient = context.createRadialGradient(baseX + 20, baseY + 21, 13, baseX + 22, baseY + 22, 35);
                     if (orb < 1) gradient.addColorStop(0.1, ORB_COLORS[Utils.getOppositeType(unit.type)]);
-                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'STR' : unit.type]);
+                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'S' : unit.type]);
                     if (orb < 1) gradient.addColorStop(0.2, 'black');
                     else {
                         gradient.addColorStop(0.2, 'white');

From 34e2a8b98ab2e14bb8c7211d31e5cfa129caaec4 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 02:22:31 +0100
Subject: [PATCH 0809/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index e1077f0ad..02c64bc05 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -572,7 +572,7 @@ directives.levelSlider = function($timeout) {
 };
 
 directives.unitOrb = function($rootScope) {
-    var ORBS = [ 0.5, 1, 2, 'g' ];
+    var ORBS = [ 0.5, 1, 2, 'g', 'str' ];
     return {
         restrict: 'E',
         replace: true,

From 56d7a523590e402841403dc740682c00ce863def Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 02:28:31 +0100
Subject: [PATCH 0810/1569] Update images.js

---
 damage/js/images.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index a9e7370a6..52f8055fc 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -83,7 +83,7 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                 if (orb != 1.0) {
                     var gradient = context.createRadialGradient(baseX + 20, baseY + 21, 13, baseX + 22, baseY + 22, 35);
                     if (orb < 1) gradient.addColorStop(0.1, ORB_COLORS[Utils.getOppositeType(unit.type)]);
-                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'S' : unit.type]);
+                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'STR' : unit.type]);
                     if (orb < 1) gradient.addColorStop(0.2, 'black');
                     else {
                         gradient.addColorStop(0.2, 'white');

From 105ab47df6466bac9d579a80c0d84cf5eb922537 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 3 Feb 2017 23:37:18 -0500
Subject: [PATCH 0811/1569] Boa fix

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 429451676..ddea08520 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7813,7 +7813,7 @@ window.details = {
     },
     1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
-        special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 70%, changes left column into Matching orbs.",
+        special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 50%, changes left column into Matching orbs.",
         specialName: "Aromatic Foot",
         captainNotes: "#{captainProportional : higher : 2.25 + 0.5 * (remaining HP) / (total HP) : 2.75 : 2.25}"
     },

From 60748f7613b15de5f24811454a0a1a5683fc28a2 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 19:17:38 +0100
Subject: [PATCH 0812/1569] Update app.js

---
 damage/js/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/js/app.js b/damage/js/app.js
index b5c47b344..81d0f7c28 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -81,7 +81,7 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         // reset slot
         if (!onlyTransitional)
             $scope.data.team[n] = { unit: null, level: -1, candies: { hp: 0, atk: 0, rcv: 0 } };
-        $scope.tdata.team[n] = { orb: 1, g: false, special: false, lock: 0, silence: 0, removed: 0 };
+        $scope.tdata.team[n] = { orb: 1, g: false, str: false, special: false, lock: 0, silence: 0, removed: 0 };
     };
 
     // to be invoked every time a new unit is set in a slot so the insertion events can be triggered
@@ -130,7 +130,7 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         }
     };
 
-    // reset g slots automatically
+    // reset STR slots automatically
     $scope.$watch('options.strOrbsEnabled',function() {
         if (!$rootScope.areSTROrbsEnabled())
             resetSTROrbs();

From 19ad21d1df2752bf11159ff54c1563df3e445c3d Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 19:32:56 +0100
Subject: [PATCH 0813/1569] Update cruncher.js

---
 damage/js/cruncher.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 2cc03fc55..eb727fc25 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -178,6 +178,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
+            if (orb == 'str') orb = 1.0;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From 1aeb44ed85ab2de36282f60d24c382ae54a4c38c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 19:42:52 +0100
Subject: [PATCH 0814/1569] Update images.js

---
 damage/js/images.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index 52f8055fc..6afc36194 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -98,7 +98,7 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                         awesome(context, { text: temp[0], style: '28px', color: 'white',
                             x: temp[1], y: temp[2], stroke: 'gray' });
                     } else if (orb == 'g') {
-                        type(context, { text: 'G', style: 'bold 20px "Open Sans"',
+                        type(context, { text: 'S', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
                     } else {
                         type(context, { text: 'S', style: 'bold 20px "Open Sans"',

From 4a2081356a67676711ee8dbecfbd92aa4ef7f755 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 19:45:05 +0100
Subject: [PATCH 0815/1569] Update orb.html

---
 damage/views/fragments/orb.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/views/fragments/orb.html b/damage/views/fragments/orb.html
index f108a8012..8fa8b8adf 100644
--- a/damage/views/fragments/orb.html
+++ b/damage/views/fragments/orb.html
@@ -10,7 +10,7 @@
     </i>
 
     <i class="str-orb" ng-show="tdata.team[slot].orb == 'str'">
-        S
+        G
     </i>
 
 </div>

From a0cc78c61ad18236e677a43241ce3bc2f43bfe5e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 19:45:43 +0100
Subject: [PATCH 0816/1569] Update orb.html

---
 damage/views/fragments/orb.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/views/fragments/orb.html b/damage/views/fragments/orb.html
index 8fa8b8adf..f108a8012 100644
--- a/damage/views/fragments/orb.html
+++ b/damage/views/fragments/orb.html
@@ -10,7 +10,7 @@
     </i>
 
     <i class="str-orb" ng-show="tdata.team[slot].orb == 'str'">
-        G
+        S
     </i>
 
 </div>

From 570ec8e728c9ad350951a721dcf60b78dd9b0398 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 19:47:24 +0100
Subject: [PATCH 0817/1569] Update orbs.css

---
 damage/css/orbs.css | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/damage/css/orbs.css b/damage/css/orbs.css
index 3bd28ef72..409706743 100644
--- a/damage/css/orbs.css
+++ b/damage/css/orbs.css
@@ -70,6 +70,17 @@
     top: 1px;
 }
 
+.str-orb {
+    color: white;
+    font-weight: bold;
+    font-style: normal;
+    font-size: 18px;
+    margin-right: 2px;
+    text-shadow: 0 0 5px black;
+    position: relative;
+    top: 1px;
+}
+
 /***********************
  *     ORB GLOWING     *
  ***********************/
@@ -80,6 +91,7 @@
 .unitOrb.PSY { animation: glowOrange .5s linear infinite alternate; }
 .unitOrb.INT { animation: glowPurple .5s linear infinite alternate; }
 .unitOrb.G { animation: glowG .5s linear infinite alternate; }
+.unitOrb.S { animation: glowG .5s linear infinite alternate; }
 .unitOrb.opposite { animation: glowBlack .5s linear infinite alternate; }
 
 @keyframes glowRed {
@@ -116,3 +128,8 @@
     from { box-shadow 0 0 10px white, 0 0 20px white, 0 0 30px white, 0 0 40px orangered, 0 0 70px orangered, 0 0 80px orangered, 0 0 100px orangered, 0 0 150px orangered; }
     to { box-shadow: 0 0 5px white, 0 0 10px white, 0 0 15px white, 0 0 20px orangered, 0 0 35px orangered, 0 0 40px orangered, 0 0 50px orangered, 0 0 75px orangered; }
 }
+
+@keyframes glowS {
+    from { box-shadow 0 0 10px white, 0 0 20px white, 0 0 30px white, 0 0 40px red, 0 0 70px red, 0 0 80px red, 0 0 100px red, 0 0 150px red; }
+    to { box-shadow: 0 0 5px white, 0 0 10px white, 0 0 15px white, 0 0 20px red, 0 0 35px red, 0 0 40px red, 0 0 50px red, 0 0 75px red; }
+}

From e897d679b836a554709fb5c6652593d6bf472c96 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 20:08:46 +0100
Subject: [PATCH 0818/1569] Update directives.js

---
 damage/js/directives.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 02c64bc05..85c353c04 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -584,6 +584,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.orb == 1) return 'none';
                 if (unit.orb == 2) return scope.data.team[scope.slot].unit.type;
                 if (unit.orb == 'g') return 'G';
+                if (unit.orb == 'str') return 'S';
                 return Utils.getOppositeType(scope.data.team[scope.slot].unit.type) + ' opposite';
             };
             var onShortPress = function(e) {

From 3d27ea785eb7fed673a3bbf8de916524d6c1c9aa Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 20:51:43 +0100
Subject: [PATCH 0819/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 85c353c04..86944745c 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -593,7 +593,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
-                    tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1)];
+                    tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
                     scope.glow();
                     scope.$apply();
                     e.preventDefault();

From 2f41bdacb4f68c74dd5f75533d45f8e6c435ba80 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 20:57:19 +0100
Subject: [PATCH 0820/1569] Update directives.js

---
 damage/js/directives.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 86944745c..f5bbcf42e 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,6 +591,7 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
+								$scope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? "2" : "1" });
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From bbf3d53789be1f5901d95d87b7aa81486ca305f9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 20:58:44 +0100
Subject: [PATCH 0821/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index f5bbcf42e..39c8f6145 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,7 +591,7 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
-								$scope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? "2" : "1" });
+								$scope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From 9cd87f5d5f1504dd48c8e04bd9d42febb20331f9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 20:59:56 +0100
Subject: [PATCH 0822/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 39c8f6145..2cef7ead4 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,7 +591,7 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
-								$scope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
+		$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From a17a5af1f19fbd3d83d2831cf717a8f68144f254 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:02:44 +0100
Subject: [PATCH 0823/1569] Update directives.js

---
 damage/js/directives.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 2cef7ead4..479872114 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,6 +592,7 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
 		$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
+		$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From 62a060751c82fc34b251a27f81a483f9e044bd37 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:04:14 +0100
Subject: [PATCH 0824/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 479872114..667fe2dea 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,7 +592,7 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
 		$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
-		$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
+		$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 1") : ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 2")});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From dd46b4edd4ffbb78176a1c8b63e68c3605061b2d Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:07:01 +0100
Subject: [PATCH 0825/1569] Update directives.js

---
 damage/js/directives.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 667fe2dea..4a1461c66 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,8 +591,10 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
-		$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
-		$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 1") : ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 2")});
+								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
+								$rootScope.notify({ text: "$rootScope.areGOrbsEnabled()"});
+								$rootScope.notify({ text: "$rootScope.areSTROrbsEnabled()"});
+								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 1") : ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 2")});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From 0a2d439469fbf467d6022ca02629f8a8cc45d51a Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:08:22 +0100
Subject: [PATCH 0826/1569] Update directives.js

---
 damage/js/directives.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 4a1461c66..a0d9db818 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,9 +592,9 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
 								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
-								$rootScope.notify({ text: "$rootScope.areGOrbsEnabled()"});
-								$rootScope.notify({ text: "$rootScope.areSTROrbsEnabled()"});
-								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 1") : ($rootScope.areSTROrbsEnabled() ? "ORBS.length" : "ORBS.length - 2")});
+								$rootScope.notify({ text: $rootScope.areGOrbsEnabled()});
+								$rootScope.notify({ text: $rootScope.areSTROrbsEnabled()});
+								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From ac209144106f86d427ec9be97d76b1a95bce697d Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:09:42 +0100
Subject: [PATCH 0827/1569] Update directives.js

---
 damage/js/directives.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index a0d9db818..25b9fa7aa 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,8 +591,8 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
-								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3 ? "2" : "1" });
-								$rootScope.notify({ text: $rootScope.areGOrbsEnabled()});
+								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() ? "2" : "1" });
+								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled()});
 								$rootScope.notify({ text: $rootScope.areSTROrbsEnabled()});
 								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {

From 3d8bda6174730f6f1b2a2f0bc502e7d3f4bf4752 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:21:48 +0100
Subject: [PATCH 0828/1569] Update directives.js

---
 damage/js/directives.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 25b9fa7aa..8c08dee89 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,8 +592,7 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
 								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() ? "2" : "1" });
-								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled()});
-								$rootScope.notify({ text: $rootScope.areSTROrbsEnabled()});
+								$rootScope.notify({ text: n });
 								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);

From 1d5a1d0d4342f490fb8fef1334b723e322b6921c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:23:28 +0100
Subject: [PATCH 0829/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 8c08dee89..d78f81b24 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,7 +592,7 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
 								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() ? "2" : "1" });
-								$rootScope.notify({ text: n });
+								$rootScope.notify({ text: ORBS.indexOf(tunit.orb); });
 								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);

From b159dcaa05152ab53deef749f0b216b9bc2ef3de Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:24:59 +0100
Subject: [PATCH 0830/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index d78f81b24..aafd59fb4 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,7 +592,7 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
 								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() ? "2" : "1" });
-								$rootScope.notify({ text: ORBS.indexOf(tunit.orb); });
+								$rootScope.notify({ text: ORBS.indexOf(tunit.orb) });
 								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);

From 97fa9c1356384f58ebd3ccf72d4066bbff31a257 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:29:28 +0100
Subject: [PATCH 0831/1569] Update directives.js

---
 damage/js/directives.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index aafd59fb4..831ca2461 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,9 +591,7 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
-								$rootScope.notify({ text: !$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() ? "2" : "1" });
-								$rootScope.notify({ text: ORBS.indexOf(tunit.orb) });
-								$rootScope.notify({ text: $rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2)});
+								$rootScope.notify({ text: (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && ORBS.indexOf(tunit.orb) == ORBS.length - 3) ? 2 : 1)});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From 76afe15a41a28613e1b865409914662c5b2d73b1 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:31:11 +0100
Subject: [PATCH 0832/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 831ca2461..e689c66f0 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,7 +591,7 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
-								$rootScope.notify({ text: (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && ORBS.indexOf(tunit.orb) == ORBS.length - 3) ? 2 : 1)});
+								$rootScope.notify({ text: (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && ORBS.indexOf(tunit.orb) == ORBS.length - 3) ? 2 : 1});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From baaa0b6247ecfb218d8fcab13fa317fe10ed24c8 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:34:29 +0100
Subject: [PATCH 0833/1569] Update directives.js

---
 damage/js/directives.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index e689c66f0..52309493e 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -591,9 +591,10 @@ directives.unitOrb = function($rootScope) {
                 var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
-								$rootScope.notify({ text: (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && ORBS.indexOf(tunit.orb) == ORBS.length - 3) ? 2 : 1});
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
+										$rootScope.notify({ text: ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))]});
+										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
                     scope.glow();
                     scope.$apply();

From 086e5ee44aeecff19c84d2c2654bec167e3bd492 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:49:45 +0100
Subject: [PATCH 0834/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 52309493e..5524f9bc1 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -593,7 +593,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
-										$rootScope.notify({ text: ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))]});
+										$rootScope.notify({ text: ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
 										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
                     scope.glow();

From 74ddcd182fc1a706cafbeb6a352ca9968e8a606e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:54:09 +0100
Subject: [PATCH 0835/1569] Update directives.js

---
 damage/js/directives.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 5524f9bc1..b9166492b 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -593,6 +593,8 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
+										$rootScope.notify({ text: n});
+										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)});
 										$rootScope.notify({ text: ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
 										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From 6f40388972d8293138036160f4ff0c1016410af1 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 21:56:37 +0100
Subject: [PATCH 0836/1569] Update directives.js

---
 damage/js/directives.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index b9166492b..71a6ec067 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -594,6 +594,7 @@ directives.unitOrb = function($rootScope) {
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
 										$rootScope.notify({ text: n});
+										$rootScope.notify({ text: (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1});
 										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)});
 										$rootScope.notify({ text: ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
 										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});

From 2e0e752c6867d9fda5c0ca46feea28888e8d96ff Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:07:11 +0100
Subject: [PATCH 0837/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 71a6ec067..108b195cc 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -595,7 +595,7 @@ directives.unitOrb = function($rootScope) {
                     var n = ORBS.indexOf(tunit.orb);
 										$rootScope.notify({ text: n});
 										$rootScope.notify({ text: (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1});
-										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)});
+										$rootScope.notify({ text: (n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1))});
 										$rootScope.notify({ text: ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
 										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
                     tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];

From 888365c57c68dac5f76ccd53ca13a2bff92b924e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:09:47 +0100
Subject: [PATCH 0838/1569] Update directives.js

---
 damage/js/directives.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 108b195cc..865259f09 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -593,12 +593,8 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
                     var n = ORBS.indexOf(tunit.orb);
-										$rootScope.notify({ text: n});
-										$rootScope.notify({ text: (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1});
-										$rootScope.notify({ text: (n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1))});
-										$rootScope.notify({ text: ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
-										$rootScope.notify({ text: (n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
-                    tunit.orb = ORBS[(n + (!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
+										$rootScope.notify({ text: (n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
+                    tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
                     scope.glow();
                     scope.$apply();
                     e.preventDefault();

From 43f4bd303d8c26d4c788fe7952cde1055f92a307 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:14:05 +0100
Subject: [PATCH 0839/1569] Update directives.js

---
 damage/js/directives.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 865259f09..d0b319b13 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,9 +592,11 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
-                    var n = ORBS.indexOf(tunit.orb);
-										$rootScope.notify({ text: (n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))});
-                    tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
+									var n = ORBS.indexOf(tunit.orb);
+									if(unit.type == "STR" || unit.type == "DEX")
+										tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
+									else
+										tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
                     scope.glow();
                     scope.$apply();
                     e.preventDefault();

From 50baca648be1ee247791d35fbac18648cca4d148 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:17:23 +0100
Subject: [PATCH 0840/1569] Update directives.js

---
 damage/js/directives.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index d0b319b13..c0a919270 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -593,6 +593,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
 									var n = ORBS.indexOf(tunit.orb);
+									$scope.notify({ text: unit.type});
 									if(unit.type == "STR" || unit.type == "DEX")
 										tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
 									else

From 93b9c9dae8dad45f9ab2fdc1dbec659e7a917044 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:19:28 +0100
Subject: [PATCH 0841/1569] Update directives.js

---
 damage/js/directives.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index c0a919270..f1db0db06 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -592,12 +592,12 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
-									var n = ORBS.indexOf(tunit.orb);
-									$scope.notify({ text: unit.type});
-									if(unit.type == "STR" || unit.type == "DEX")
-										tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
-									else
-										tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
+			var n = ORBS.indexOf(tunit.orb);
+			$rootScope.notify({ text: unit.type});
+			if(unit.type == "STR" || unit.type == "DEX")
+				tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
+			else
+				tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
                     scope.glow();
                     scope.$apply();
                     e.preventDefault();

From 12d957707565569cfb4910e2110964747f17c9e9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:21:30 +0100
Subject: [PATCH 0842/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index f1db0db06..7321c0cc0 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -593,7 +593,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
 			var n = ORBS.indexOf(tunit.orb);
-			$rootScope.notify({ text: unit.type});
+			$rootScope.notify({ text: unit.unit.type});
 			if(unit.type == "STR" || unit.type == "DEX")
 				tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
 			else

From f8b66233526a9e7b289b2f8af8bf267664c7e4bd Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:22:34 +0100
Subject: [PATCH 0843/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 7321c0cc0..ae454d700 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -594,7 +594,7 @@ directives.unitOrb = function($rootScope) {
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
 			var n = ORBS.indexOf(tunit.orb);
 			$rootScope.notify({ text: unit.unit.type});
-			if(unit.type == "STR" || unit.type == "DEX")
+			if(unit.unit.type == "STR" || unit.unit.type == "DEX")
 				tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
 			else
 				tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];

From eef2976565c7f0ba556b9ba01afa5896ff33e1ce Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:24:11 +0100
Subject: [PATCH 0844/1569] Update directives.js

---
 damage/js/directives.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index ae454d700..432404a0d 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -595,9 +595,9 @@ directives.unitOrb = function($rootScope) {
 			var n = ORBS.indexOf(tunit.orb);
 			$rootScope.notify({ text: unit.unit.type});
 			if(unit.unit.type == "STR" || unit.unit.type == "DEX")
-				tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
-			else
 				tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
+			else
+				tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
                     scope.glow();
                     scope.$apply();
                     e.preventDefault();

From 4e8f5c8c9b7b744d11e862282a70b7418c14a6fd Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:28:01 +0100
Subject: [PATCH 0845/1569] Update directives.js

---
 damage/js/directives.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 432404a0d..cc01077e3 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -593,7 +593,6 @@ directives.unitOrb = function($rootScope) {
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
 			var n = ORBS.indexOf(tunit.orb);
-			$rootScope.notify({ text: unit.unit.type});
 			if(unit.unit.type == "STR" || unit.unit.type == "DEX")
 				tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
 			else
@@ -606,14 +605,17 @@ directives.unitOrb = function($rootScope) {
                 }
             };
             var onLongPress = function(e) {
-                var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
-                var n = ORBS.indexOf(tunit.orb);
-                tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1)];
-                scope.glow();
-                scope.$apply();
-                e.preventDefault();
-                e.stopPropagation();
-                return false;
+							var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
+							var n = ORBS.indexOf(tunit.orb);
+							if(unit.unit.type == "STR" || unit.unit.type == "DEX")
+								tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
+							else
+								tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
+							scope.glow();
+							scope.$apply();
+							e.preventDefault();
+							e.stopPropagation();
+							return false;
             };
             element.parent().longpress(onLongPress,onShortPress);
         },

From 2825aa7f6664edc33fbcc5ebd4d0487514691c7c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:35:04 +0100
Subject: [PATCH 0846/1569] Update orbs.css

---
 damage/css/orbs.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/damage/css/orbs.css b/damage/css/orbs.css
index 409706743..8fd16dc8e 100644
--- a/damage/css/orbs.css
+++ b/damage/css/orbs.css
@@ -50,6 +50,12 @@
     background-image: radial-gradient(9px 3px, circle cover, oldlace, orange, orangered);
 }
 
+.unitOrb.S {
+    background-image: -webkit-radial-gradient(9px 3px, circle cover, oldlace, orangered, rgb(50,50,50));
+    background-image: -moz-radial-gradient(9px 3px, circle cover, oldlace, orangered, rgb(50,50,50));
+    background-image: radial-gradient(9px 3px, circle cover, oldlace, orangered, rgb(50,50,50));
+}
+
 .unitOrb .fa {
     position: relative;
     font-size: 2em;

From cdf9b66db2a48bed5f69767f3bc85e7f957ecdc5 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:42:27 +0100
Subject: [PATCH 0847/1569] Update captains.js

---
 common/data/captains.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index d885240c9..8fdbdfcc7 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3541,13 +3541,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
     1313: {
-        //Akainu NEEDS TO BE CHANGED
-        //[This works for STR and DEX units, just need a custom orb for QCK, INT, PSY units. Orb matchers like Oars and Onigumo are still a pain] atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : 2.25; },
-        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : 2.25; },
+        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : p.orb == 'str' ? 3.9375 : 2.25; },
     },
     1314: {
-        //Akainu NEEDS TO BE CHANGED
-        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : 2.25; },
+        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : p.orb == 'str' ? 3.9375 : 2.25; },
     },
     1315: {
         hitAtk: function(p) {

From 5af8a98fd2ec524a5922ce38876f8d30e4197769 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 22:53:21 +0100
Subject: [PATCH 0848/1569] Update transfer.js

---
 damage/js/transfer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index f82bb54cd..ebc954dd5 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -116,7 +116,7 @@ var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
                 .slice(-6).split('').map(function(x) { return parseInt(x, 10); });
             temp.forEach(function(x,n) {
                 var unit = $scope.tdata.team[n];
-                if (type == 'O') unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : 1)));
+                if (type == 'O') unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : (x == 4 ? 'str' : 1))));
                 else if (type == 'L') unit.lock = x;
                 else if (type == 'G') unit.silence = x;
                 else if (type == 'R') unit.removed = x;
@@ -191,7 +191,7 @@ var ExportCtrl = function($scope) {
         result += (data.defense && data.defense.constructor == Number ? data.defense : parseInt(data.defense)) + 'D';
         //result += (data.defense != 0 ) + 'D';
         result += ($scope.data.effect ? window.effects[$scope.data.effect].id : 0) + 'E';
-        result += parseInt(team.map(function(x) { return ({ '2': 1, '0.5': 2, 'g': 3, '1': 0 }['' + x.orb] || 0); }).join(''),4) + 'Q';
+        result += parseInt(team.map(function(x) { return ({ '2': 1, '0.5': 2, 'g': 3, 'str': 4, '1': 0 }['' + x.orb] || 0); }).join(''),4) + 'Q';
         result += parseInt(team.map(function(x) { return x.lock; }).join(''),3) + 'L';
         result += parseInt(team.map(function(x) { return x.silence; }).join(''),3) + 'G';
         result += parseInt(team.map(function(x) { return x.removed; }).join(''),3) + 'R';

From 0f6fcfaf94ef658c96ef7fa6ff4c7130e4440892 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 23:16:11 +0100
Subject: [PATCH 0849/1569] Update specials.js

---
 common/data/specials.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 38190a6b5..ec6d6b536 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1548,6 +1548,12 @@ window.specials = {
             });
         }
     },
+    1221: {
+        orb: function(p) { return p.unit.type == "QCK" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+    },
+    1222: {
+        orb: function(p) { return p.unit.type == "QCK" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+    },
     1227: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"

From 8fbf91bd35af2df19ca5796ec9293ae1d700caec Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 23:18:12 +0100
Subject: [PATCH 0850/1569] Update specials.js

---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index ec6d6b536..69b536d14 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1549,10 +1549,10 @@ window.specials = {
         }
     },
     1221: {
-        orb: function(p) { return p.unit.type == "QCK" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return p.unit.type == "DEX" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
     },
     1222: {
-        orb: function(p) { return p.unit.type == "QCK" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return p.unit.type == "DEX" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
     },
     1227: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },

From 4bb3932cae35e5c79ee0fa589bb86231782bbe82 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 23:22:15 +0100
Subject: [PATCH 0851/1569] Update specials.js

---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 69b536d14..305b12e7e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1549,10 +1549,10 @@ window.specials = {
         }
     },
     1221: {
-        orb: function(p) { return p.unit.type == "DEX" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : (p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
     },
     1222: {
-        orb: function(p) { return p.unit.type == "DEX" ? (p.orb == 0.5 ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : p.orb) : (p.orb == 'str' ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : (p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
     },
     1227: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },

From a15069abc451ac95867687f34d3fd805236b9aea Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sat, 4 Feb 2017 23:23:38 +0100
Subject: [PATCH 0852/1569] Update specials.js

---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 305b12e7e..d13d71721 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1549,10 +1549,10 @@ window.specials = {
         }
     },
     1221: {
-        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : (p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
     },
     1222: {
-        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : (p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
     },
     1227: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },

From 1cc0120bcc1b893b057d337e913c40707a9c1347 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 01:08:48 +0100
Subject: [PATCH 0853/1569] Update specials.js

---
 common/data/specials.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index d13d71721..653002018 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1549,10 +1549,12 @@ window.specials = {
         }
     },
     1221: {
-        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return ((p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb)); },
+        type: "beneficial"
     },
     1222: {
-        orb: function(p) { return (p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb); }
+        orb: function(p) { return ((p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb)); },
+        type: "beneficial"
     },
     1227: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },

From 86491d6d2078dbec1101b5ec0ee57d6e2c0c5862 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 01:24:52 +0100
Subject: [PATCH 0854/1569] Update cruncher.js

---
 damage/js/cruncher.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index eb727fc25..5157313c5 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -603,7 +603,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
      * The function should return true if there's a conflict between specials
      */
     var computeSpecialsCombinations = function() {
-        var result = { type: [ ], class: [ ], orb: [ ], affinity: [ ], condition: [ ] };
+        var result = { type: [ ], class: [ ], orb: [ ], affinity: [ ], condition: [ ]};
         chainSpecials = [ ];
         chainAddition = [ ];
         affinityMultiplier = [ ];
@@ -682,6 +682,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         if ($scope.data.effect) {
             var data = effects[$scope.data.effect];
             if (data.orb) enabledSpecials.push({ orb: data.orb, permanent: true, sourceSlot: -1 });
+            if (data.orb) enabledSpecials.push({ orb: data.orb, permanent: true, sourceSlot: -1 });
             if (data.chainModifier) mapEffect.chainModifier = data.chainModifier;
             if (data.chainLimiter) mapEffect.chainLimiter = data.chainLimiter;
             if (data.comboShield) mapEffect.comboShield = data.comboShield;
@@ -705,7 +706,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (!team[n].unit || n > 5) return;
             var id = team[n].unit.number + 1;
             if (x.special && specials.hasOwnProperty(id)) {
-                if (specials[id].hasOwnProperty('orb') && enabledSpecials[0] && enabledSpecials[0].permanent)
+                if (specials[id].hasOwnProperty('orb') && !specials[id].hasOwnProperty('type') && enabledSpecials[0] && enabledSpecials[0].permanent)
                     conflictWarning = true;
                 else
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));

From 5d08a929c1032723835820ef15749fca0de6a7d5 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 01:30:37 +0100
Subject: [PATCH 0855/1569] Update specials.js

---
 common/data/specials.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 653002018..5c9ec97a1 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1549,8 +1549,13 @@ window.specials = {
         }
     },
     1221: {
-        orb: function(p) { return ((p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb)); },
-        type: "beneficial"
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1221].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1221].turnedOn = false;
+        }
     },
     1222: {
         orb: function(p) { return ((p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb)); },

From ad394f3ebae70d3c2912bc73e09f90541fb49d09 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 01:31:44 +0100
Subject: [PATCH 0856/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 5157313c5..c8bc3f5f7 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -706,7 +706,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (!team[n].unit || n > 5) return;
             var id = team[n].unit.number + 1;
             if (x.special && specials.hasOwnProperty(id)) {
-                if (specials[id].hasOwnProperty('orb') && !specials[id].hasOwnProperty('type') && enabledSpecials[0] && enabledSpecials[0].permanent)
+                if (specials[id].hasOwnProperty('orb') && enabledSpecials[0] && enabledSpecials[0].permanent)
                     conflictWarning = true;
                 else
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));

From 4bcd92b9c91e7113ef861e5984f26947e23d4736 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 14:45:13 +0100
Subject: [PATCH 0857/1569] Update captains.js

---
 common/data/captains.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 8fdbdfcc7..56965eae1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3541,10 +3541,20 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
     1313: {
-        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : p.orb == 'str' ? 3.9375 : 2.25; },
+        atk: function(p) { 
+          if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
+            return p.orb == 2.0 ? 3.9375 : 2.25;
+          else
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+        },
     },
     1314: {
-        atk: function(p) { return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : p.orb == 'str' ? 3.9375 : 2.25; },
+        atk: function(p) { 
+          if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
+            return p.orb == 2.0 ? 3.9375 : 2.25;
+          else
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+        },
     },
     1315: {
         hitAtk: function(p) {

From d782833b29d701377f2c04c6193bce26f4cb9adc Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 14:55:58 +0100
Subject: [PATCH 0858/1569] Update specials.js

---
 common/data/specials.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 5c9ec97a1..e21e43257 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1552,14 +1552,29 @@ window.specials = {
         turnedOn: false,
         onActivation: function(p) {
             window.specials[1221].turnedOn = true;
+            if($scope.options.gOrbsEnabled > 1)
+                p.scope.notify({
+                    text: 'While this special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs',
+                    name: '1221warning'
+                });
         },
         onDeactivation: function(p) {
             window.specials[1221].turnedOn = false;
         }
     },
     1222: {
-        orb: function(p) { return ((p.unit.type == "DEX" && p.orb == 0.5) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 0.25) : ((p.unit.type != "STR" && p.orb == 'str') ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : p.orb)); },
-        type: "beneficial"
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1221].turnedOn = true;
+            if($scope.options.gOrbsEnabled > 1)
+                p.scope.notify({
+                    text: 'While this special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs',
+                    name: '1221warning'
+                });
+        },
+        onDeactivation: function(p) {
+            window.specials[1221].turnedOn = false;
+        }
     },
     1227: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },

From 2cdc31fb26a6ff001d6908630cf1c21b22d2199c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 14:56:29 +0100
Subject: [PATCH 0859/1569] Update specials.js

---
 common/data/specials.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index e21e43257..24cac400f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1565,15 +1565,15 @@ window.specials = {
     1222: {
         turnedOn: false,
         onActivation: function(p) {
-            window.specials[1221].turnedOn = true;
+            window.specials[1222].turnedOn = true;
             if($scope.options.gOrbsEnabled > 1)
                 p.scope.notify({
                     text: 'While this special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs',
-                    name: '1221warning'
+                    name: '1222warning'
                 });
         },
         onDeactivation: function(p) {
-            window.specials[1221].turnedOn = false;
+            window.specials[1222].turnedOn = false;
         }
     },
     1227: {

From b81ed853f213d2e447a52005bfbef82528caa9c7 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 15:00:02 +0100
Subject: [PATCH 0860/1569] Update events.js

---
 common/data/events.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/data/events.js b/common/data/events.js
index af3f8ecf9..819427562 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -131,7 +131,9 @@ window.events = {
     },
     1313: {
         onInsertion: function($scope) {
-            if (++$scope.options.strOrbsEnabled == 1)
+            if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
+                $scope.notify({ text: 'While a beneficial orbs special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs' });
+            else if (++$scope.options.strOrbsEnabled == 1)
                 $scope.notify({ text: 'Enabling [STR] orbs support.' });
         },
         onRemoval: function($scope) {
@@ -140,8 +142,9 @@ window.events = {
         }
     },
     1314: {
-        onInsertion: function($scope) {
-            if (++$scope.options.strOrbsEnabled == 1)
+            if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
+                $scope.notify({ text: 'While a beneficial orbs special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs' });
+            else if (++$scope.options.strOrbsEnabled == 1)
                 $scope.notify({ text: 'Enabling [STR] orbs support.' });
         },
         onRemoval: function($scope) {

From 83996919f6b84badaf713a826fb419df062f64fd Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 17:26:14 +0100
Subject: [PATCH 0861/1569] Update captains.js

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 56965eae1..bf8069a49 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3545,7 +3545,7 @@ window.captains = {
           if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
             return p.orb == 2.0 ? 3.9375 : 2.25;
           else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'S' ? 3.9375 : 2.25));
         },
     },
     1314: {
@@ -3553,7 +3553,7 @@ window.captains = {
           if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
             return p.orb == 2.0 ? 3.9375 : 2.25;
           else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'S' ? 3.9375 : 2.25));
         },
     },
     1315: {

From 0b10804b80e2619c658631efce2c56b94198cc25 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 17:29:28 +0100
Subject: [PATCH 0862/1569] Update events.js

---
 common/data/events.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/events.js b/common/data/events.js
index 819427562..917703bfc 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -142,6 +142,7 @@ window.events = {
         }
     },
     1314: {
+        onInsertion: function($scope) {
             if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
                 $scope.notify({ text: 'While a beneficial orbs special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs' });
             else if (++$scope.options.strOrbsEnabled == 1)

From ecc6d94b5346c0dbd76f0728ef98e640cbd6b445 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 17:38:38 +0100
Subject: [PATCH 0863/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index c8bc3f5f7..ea01fb81b 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -178,7 +178,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
-            if (orb == 'str') orb = 1.0;
+            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 1.0;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From a102c6d3d1c9f1d98665876d4b7781c51c8e8709 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 17:40:43 +0100
Subject: [PATCH 0864/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index ea01fb81b..3c81c39ad 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -178,7 +178,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
-            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 1.0;
+            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 0.9999;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From e716fa853d49c86dede71a5efa0a5da19cabdee0 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 17:42:04 +0100
Subject: [PATCH 0865/1569] Update captains.js

---
 common/data/captains.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index bf8069a49..0f54c4c75 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3545,7 +3545,8 @@ window.captains = {
           if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
             return p.orb == 2.0 ? 3.9375 : 2.25;
           else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'S' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.9999 ? 3.9375 : 2.25));
+            $scope.notify({ text: p.orb });
         },
     },
     1314: {

From 6f49091aaa1d586b29fddc47d2eb2ca9a879200e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 17:47:24 +0100
Subject: [PATCH 0866/1569] Update specials.js

---
 common/data/specials.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 24cac400f..9814703c3 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1552,11 +1552,6 @@ window.specials = {
         turnedOn: false,
         onActivation: function(p) {
             window.specials[1221].turnedOn = true;
-            if($scope.options.gOrbsEnabled > 1)
-                p.scope.notify({
-                    text: 'While this special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs',
-                    name: '1221warning'
-                });
         },
         onDeactivation: function(p) {
             window.specials[1221].turnedOn = false;
@@ -1566,11 +1561,6 @@ window.specials = {
         turnedOn: false,
         onActivation: function(p) {
             window.specials[1222].turnedOn = true;
-            if($scope.options.gOrbsEnabled > 1)
-                p.scope.notify({
-                    text: 'While this special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs',
-                    name: '1222warning'
-                });
         },
         onDeactivation: function(p) {
             window.specials[1222].turnedOn = false;

From bccdfd6ce9a9dcc5f10f0f7a4695dae84245f9cc Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:04:35 +0100
Subject: [PATCH 0867/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 3c81c39ad..71d0320a3 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -178,7 +178,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
-            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 0.9999;
+            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 0.99;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From f46e0f16071926a909035ffc505bc6a8eaeeb5d9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:05:02 +0100
Subject: [PATCH 0868/1569] Update captains.js

---
 common/data/captains.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 0f54c4c75..f41265d59 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3545,7 +3545,7 @@ window.captains = {
           if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
             return p.orb == 2.0 ? 3.9375 : 2.25;
           else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.9999 ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },

From 53bfe3f7e2809c749ce80191affc23eec55c7d5d Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:16:43 +0100
Subject: [PATCH 0869/1569] Update events.js

---
 common/data/events.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/data/events.js b/common/data/events.js
index 917703bfc..af3f8ecf9 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -131,9 +131,7 @@ window.events = {
     },
     1313: {
         onInsertion: function($scope) {
-            if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
-                $scope.notify({ text: 'While a beneficial orbs special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs' });
-            else if (++$scope.options.strOrbsEnabled == 1)
+            if (++$scope.options.strOrbsEnabled == 1)
                 $scope.notify({ text: 'Enabling [STR] orbs support.' });
         },
         onRemoval: function($scope) {
@@ -143,9 +141,7 @@ window.events = {
     },
     1314: {
         onInsertion: function($scope) {
-            if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
-                $scope.notify({ text: 'While a beneficial orbs special is active, [STR] orbs will have no effect. Please use matching orbs as [STR] orbs' });
-            else if (++$scope.options.strOrbsEnabled == 1)
+            if (++$scope.options.strOrbsEnabled == 1)
                 $scope.notify({ text: 'Enabling [STR] orbs support.' });
         },
         onRemoval: function($scope) {

From 70a806fd72208b24187621ed90cc230210b132d6 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:25:40 +0100
Subject: [PATCH 0870/1569] Update cruncher.js

---
 damage/js/cruncher.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 71d0320a3..279062c2c 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -174,11 +174,13 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         team.forEach(function(x,n) {
             if (n > 5 || x.unit === null || $scope.tdata.team[n].lock > 0) return;
             var orb = $scope.tdata.team[n].orb;
+            var type = $scope.tdata.team[n].type;
             var atk = getStatOfUnit(x,'atk'); // basic attack (scales with level);
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
-            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 0.99;
+            if (orb == 0.5 && type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
+            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 1;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From 2581b1e303a03f70d18c990fc01eee5a129822a8 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:26:45 +0100
Subject: [PATCH 0871/1569] Update captains.js

---
 common/data/captains.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index f41265d59..bceb68e74 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3545,7 +3545,7 @@ window.captains = {
           if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
             return p.orb == 2.0 ? 3.9375 : 2.25;
           else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },

From b55834be061fcf756c79020b35290ad5b4dac943 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:33:05 +0100
Subject: [PATCH 0872/1569] Update cruncher.js

---
 damage/js/cruncher.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 279062c2c..069619f20 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -180,6 +180,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
             if (orb == 0.5 && type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
+            $scope.notify({ type: 'error', text: orb });
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 1;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)

From b91439c8bb40d9a316a10b538c15b555039cf225 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:39:42 +0100
Subject: [PATCH 0873/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 069619f20..665bf51f1 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -180,8 +180,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
             if (orb == 0.5 && type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
-            $scope.notify({ type: 'error', text: orb });
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 1;
+            $scope.notify({ type: 'error', text: orb });
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From fcaf1449e7d5ed7b06a01573e86e36eb233a998d Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 18:55:02 +0100
Subject: [PATCH 0874/1569] Update captains.js

---
 common/data/captains.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index bceb68e74..41a608ddc 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3545,7 +3545,7 @@ window.captains = {
           if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
             return p.orb == 2.0 ? 3.9375 : 2.25;
           else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 1 ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },

From c8ef9307af39f45921b943ceac9f0ba161a7fd01 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:01:26 +0100
Subject: [PATCH 0875/1569] Update captains.js

---
 common/data/captains.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 41a608ddc..a5235dae9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3541,20 +3541,14 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
     1313: {
-        atk: function(p) { 
-          if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
-            return p.orb == 2.0 ? 3.9375 : 2.25;
-          else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 1 ? 3.9375 : 2.25));
+        atk: function(p) {
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
-        atk: function(p) { 
-          if(window.specials[1221].turnedOn || window.specials[1222].turnedOn)
-            return p.orb == 2.0 ? 3.9375 : 2.25;
-          else
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'S' ? 3.9375 : 2.25));
+        atk: function(p) {
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
         },
     },
     1315: {

From 609982d6f6f108752f69304cafe4009f46c00552 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:02:40 +0100
Subject: [PATCH 0876/1569] Update cruncher.js

---
 damage/js/cruncher.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 665bf51f1..a12f9d4cd 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -180,8 +180,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
             if (orb == 0.5 && type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
-            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 1;
+            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 0.99;
             $scope.notify({ type: 'error', text: orb });
+            $scope.notify({ type: 'error', text: type });
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From 7b879779c61781db7fe450a900daf3b4182140ff Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:05:40 +0100
Subject: [PATCH 0877/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index a12f9d4cd..6fbf71f58 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -174,7 +174,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         team.forEach(function(x,n) {
             if (n > 5 || x.unit === null || $scope.tdata.team[n].lock > 0) return;
             var orb = $scope.tdata.team[n].orb;
-            var type = $scope.tdata.team[n].type;
+            var type = $scope.tdata.team[n].unit.type;
             var atk = getStatOfUnit(x,'atk'); // basic attack (scales with level);
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];

From 85283f3f03955e1bb39d7b75e82ad2dc234115ff Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:08:03 +0100
Subject: [PATCH 0878/1569] Update cruncher.js

---
 damage/js/cruncher.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 6fbf71f58..986cdede2 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -174,15 +174,14 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         team.forEach(function(x,n) {
             if (n > 5 || x.unit === null || $scope.tdata.team[n].lock > 0) return;
             var orb = $scope.tdata.team[n].orb;
-            var type = $scope.tdata.team[n].unit.type;
             var atk = getStatOfUnit(x,'atk'); // basic attack (scales with level);
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
-            if (orb == 0.5 && type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
+            if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 0.99;
             $scope.notify({ type: 'error', text: orb });
-            $scope.notify({ type: 'error', text: type });
+            $scope.notify({ type: 'error', text: x.unit.type });
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From dce2b016e3824ea38388ba0741d24f3762e56865 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:17:22 +0100
Subject: [PATCH 0879/1569] Update captains.js

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a5235dae9..dfef5c423 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3542,13 +3542,13 @@ window.captains = {
     },
     1313: {
         atk: function(p) {
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
         atk: function(p) {
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
         },
     },
     1315: {

From d57ec8ac25d154d6cc0597e8ec793a5d36c92f92 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:23:58 +0100
Subject: [PATCH 0880/1569] Update cruncher.js

---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 986cdede2..1fa898531 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -179,7 +179,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
-            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2.0 : 0.99;
+            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 1;
             $scope.notify({ type: 'error', text: orb });
             $scope.notify({ type: 'error', text: x.unit.type });
             atk += getShipBonus('atk',true,x.unit,n);

From 6cd4cb2215f17097e9d59b73a2579a70d0d49bcc Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:25:47 +0100
Subject: [PATCH 0881/1569] Update cruncher.js

---
 damage/js/cruncher.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 1fa898531..bc5e56fd2 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -181,7 +181,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 1;
             $scope.notify({ type: 'error', text: orb });
-            $scope.notify({ type: 'error', text: x.unit.type });
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From aa70280ab710d1e87ad301ac3653442a1a28e8a6 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:39:04 +0100
Subject: [PATCH 0882/1569] Update captains.js

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index dfef5c423..415c75489 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3542,13 +3542,13 @@ window.captains = {
     },
     1313: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 2 ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 0.99 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 2 ? 3.9375 : 2.25));
         },
     },
     1315: {

From 52362308286bbe542685d39fe36280bacf79f5ed Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:42:07 +0100
Subject: [PATCH 0883/1569] Update captains.js

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 415c75489..bbb6d0ee8 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3542,13 +3542,13 @@ window.captains = {
     },
     1313: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 2 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 1.5 ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 2 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 1.5 ? 3.9375 : 2.25));
         },
     },
     1315: {

From 486b63395950c6e21a42a9b6a04ec633447b9374 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:43:11 +0100
Subject: [PATCH 0884/1569] Update captains.js

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index bbb6d0ee8..3bb300db4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3542,13 +3542,13 @@ window.captains = {
     },
     1313: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 1.5 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 1.5 ? 3.9375 : 2.25));
+            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
         },
     },
     1315: {

From 661352c6ceb3fe208d1f703b0a7a7f9617e04d76 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:47:26 +0100
Subject: [PATCH 0885/1569] Update captains.js

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 3bb300db4..4a34b56ef 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3542,13 +3542,13 @@ window.captains = {
     },
     1313: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
         atk: function(p) {
-            return (window.specials[1221].turnedOn || window.specials[1222].turnedOn || p.unit.type == "STR") ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
         },
     },
     1315: {

From a85a03aae165ee15fd42b5c58a82bfc60647f4a1 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 19:58:14 +0100
Subject: [PATCH 0886/1569] Update cruncher.js

---
 damage/js/cruncher.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index bc5e56fd2..cce4d4e72 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -180,7 +180,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 'g') orb = 1.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 1;
-            $scope.notify({ type: 'error', text: orb });
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier

From 51c6ff186f5590a5c2b993a748ac9b2a2c08ef58 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 20:01:41 +0100
Subject: [PATCH 0887/1569] Update utils.js

---
 damage/js/utils.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/damage/js/utils.js b/damage/js/utils.js
index 343158e27..0b7efbdc0 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -97,10 +97,16 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
 };*/
 
 window.CrunchUtils.getOrbMultiplier = function(orb, baseMultiplier, boostedMultiplier) {
-    if (orb == 1.0 || orb == 'str') return baseMultiplier;
-    if (orb == 2.0 || orb == 'g') return boostedMultiplier;
+  if(window.specials[1221].turnedOn || window.specials[1222].turnedOn){
+    if (orb == 'str') return boostedMultiplier;
+    if (orb == 0.5) return boostedMultiplier;
+  }else{
+    if (orb == 'str') return baseMultiplier;
     if (orb == 0.5) return 1 / boostedMultiplier;
-    return 1;
+  }
+  if (orb == 1.0) return baseMultiplier;
+  if (orb == 2.0 || orb == 'g') return boostedMultiplier;
+  return 1;
 };
 
 })();

From f78fb23f79b9ac3df242af3943e7ffe738ceb0c7 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 20:08:34 +0100
Subject: [PATCH 0888/1569] Update utils.js

---
 damage/js/utils.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/damage/js/utils.js b/damage/js/utils.js
index 0b7efbdc0..2c47acc62 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -96,10 +96,11 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
     return result;
 };*/
 
-window.CrunchUtils.getOrbMultiplier = function(orb, baseMultiplier, boostedMultiplier) {
+window.CrunchUtils.getOrbMultiplier = function(orb, type, baseMultiplier, boostedMultiplier) {
   if(window.specials[1221].turnedOn || window.specials[1222].turnedOn){
     if (orb == 'str') return boostedMultiplier;
-    if (orb == 0.5) return boostedMultiplier;
+    if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+    }
   }else{
     if (orb == 'str') return baseMultiplier;
     if (orb == 0.5) return 1 / boostedMultiplier;

From 6e7538c90e0d9bbe8bfa5c8ee0a0c2db954d2f03 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 20:16:43 +0100
Subject: [PATCH 0889/1569] Update specials.js

---
 common/data/specials.js | 192 ++++++++++++++++++++--------------------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 9814703c3..4a549dd51 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -40,7 +40,7 @@ window.specials = {
         type: "type"
     },
     263: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     267: {
         def: function(p) { return 0.5; }
@@ -69,10 +69,10 @@ window.specials = {
         type: "class"
     },
     323: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     324: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     352: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
@@ -100,10 +100,10 @@ window.specials = {
         def: function(p) { return 0.2; }
     },
     395: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     396: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     399: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
@@ -132,10 +132,10 @@ window.specials = {
         type: "type"
     },
     417: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2); }
     },
     418: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2); }
     },
     419: {
         def: function(p) { return 0.5; }
@@ -154,13 +154,13 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     430: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     431: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     434: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     450: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -195,7 +195,7 @@ window.specials = {
         type: "class"
     },
     465: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     468: {
         rcv: function(p) { return 1.5; }
@@ -275,10 +275,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     533: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     534: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     542: {
         rcv: function(p) { return 2; }
@@ -303,10 +303,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     559: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     560: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     568: {
         def: function(p) { return 0.5; }
@@ -406,10 +406,10 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     642: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     643: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     644: {
         atk: function(p) { return 1.2; },
@@ -422,22 +422,22 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     648: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     649: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     650: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     651: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     655: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     656: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     660: {
         def: function(p) { return 0.5; }
@@ -504,10 +504,10 @@ window.specials = {
         type: "class"
     },
     689: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     690: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     710: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
@@ -585,16 +585,16 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     742: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     743: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     753: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     754: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     755: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
@@ -682,10 +682,10 @@ window.specials = {
         type: "type"
     },
     805: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     806: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     807: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -696,15 +696,15 @@ window.specials = {
         type: "condition"
     },
     809: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
         def: function(p) { return 0.2; }
     },
     810: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
         def: function(p) { return 0.2; }
     },
     813: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     822: {
         rcvStatic: function(p) { return 100; },
@@ -756,10 +756,10 @@ window.specials = {
         type: "class"
     },
     835: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     836: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
     837: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
@@ -821,12 +821,12 @@ window.specials = {
     },
     847: {
         atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.15); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.15); },
         type: "class"
     },
     848: {
         atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.15); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.15); },
         type: "class"
     },
     849: {
@@ -845,10 +845,10 @@ window.specials = {
         type: "type"
     },
     861: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     862: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     863: {
         def: function(p) { return 0.5; }
@@ -868,15 +868,15 @@ window.specials = {
         type: "class"
     },
     869: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2.0); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2.0); }
     },
     870: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 2.0); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2.0); }
     },
     873: {
         orb: function(p) {
-            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
-            else return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
         },
         type: "class",
         onActivation: function(p) {
@@ -891,8 +891,8 @@ window.specials = {
     },
     874: {
         orb: function(p) {
-            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
-            else return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
         },
         type: "class",
         onActivation: function(p) {
@@ -1063,10 +1063,10 @@ window.specials = {
         type: "class"
     },
     921: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     922: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     925: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -1126,7 +1126,7 @@ window.specials = {
         type: "class"
     },
     961: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     963: {
         def: function(p) { return 0; }
@@ -1219,22 +1219,22 @@ window.specials = {
     1024: {
         orb: function(p) {
             if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25);
             }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
             }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
             }
         }
     },
     1025: {
         orb: function(p) {
             if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25);
             }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
             }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
             }
         }
     },
@@ -1281,10 +1281,10 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
     },
     1059: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1060: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1061: {
         chain: function(p) { return 2; },
@@ -1295,7 +1295,7 @@ window.specials = {
         type: "class"
     },
     1065: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     1066: {
         chainAddition: function(p){ return 0.1;}
@@ -1345,10 +1345,10 @@ window.specials = {
         type: "class"
     },
     1086: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1087: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1088: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
@@ -1367,10 +1367,10 @@ window.specials = {
         type: "type"
     },
     1099: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1100: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1101: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
@@ -1395,10 +1395,10 @@ window.specials = {
         type: "class"
     },
     1111: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     1112: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
     },
     1113: {
         atk: function(p) { return 1.2; },
@@ -1415,12 +1415,12 @@ window.specials = {
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
     },
     1123: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
@@ -1447,7 +1447,7 @@ window.specials = {
         }
     },
     1137: {
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
     },
     1138: {
         atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
@@ -1463,11 +1463,11 @@ window.specials = {
         type: "class"
     },
     1164: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
         rcv: function(p) { return 1.5; }
     },
     1165: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
         rcv: function(p) { return 1.5; }
     },
     1168: {
@@ -1511,10 +1511,10 @@ window.specials = {
         type: "class"
     },
     1211: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1212: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1219: {
         atk: function(p) {
@@ -1686,7 +1686,7 @@ window.specials = {
         def: function(p) { return 0.5; } //TODO: get correct value
     },
     1255: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
     },
     1256: {
         atk: function(p) { return 1.3 },
@@ -1716,10 +1716,10 @@ window.specials = {
         type: "class"
     },
     1271: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
     },
     1272: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
     },
     1273: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -1732,7 +1732,7 @@ window.specials = {
     1282: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.2); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.2); },
     },
     1283: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
@@ -1827,7 +1827,7 @@ window.specials = {
     1348: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.2); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.2); },
     },
     1349: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -1840,10 +1840,10 @@ window.specials = {
         chainAddition: function(p){ return 0.5; }
     },
     1354: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
     },
     1355: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
     },
     1358: {
         rcv: function(p){ return 1.75; }
@@ -1860,13 +1860,13 @@ window.specials = {
         type: "class",
     },
     1363: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },	
     },
     1364: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },	
     },
     1367:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, window.specials[1367].multiplier); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1367].multiplier); },
         onActivation: function(p) {
             var n = (window.specials[1367].multiplier == 1.5 ? 1 : 0);
             window.specials[1367].multiplier = [1.5, 1.75][n];
@@ -1877,7 +1877,7 @@ window.specials = {
         },
     },
     1368:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, window.specials[1368].multiplier); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1368].multiplier); },
         onActivation: function(p) {
             var n = (window.specials[1368].multiplier == 1.5 ? 1 : 0);
             window.specials[1368].multiplier = [1.5, 1.75][n];
@@ -1890,21 +1890,21 @@ window.specials = {
     1375: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
     },
     1376: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
     },
     1379: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
     },
     1380: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
     },
     1389: {
-        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },	
+        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },	
     },
     1390: {
         atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
@@ -1921,7 +1921,7 @@ window.specials = {
     1393: {
         atk: function(p) { return 1.1; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.1); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.1); },
     },
     1394: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2003,13 +2003,13 @@ window.specials = {
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1406: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1407: {
@@ -2069,11 +2069,11 @@ window.specials = {
         type: "class"
     },
     1425: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1426: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1428: {
@@ -2092,13 +2092,13 @@ window.specials = {
     1437: {
         atk: function(p) { return 1.5; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1438: {
         atk: function(p) { return 1.5; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1439: {
@@ -2120,12 +2120,12 @@ window.specials = {
     1443: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
     },
     1444: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
     },
     1445: {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },

From 9fbdc6b249857b9b04f8954b8a01ba77327ed869 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 20:20:03 +0100
Subject: [PATCH 0890/1569] Update utils.js

---
 damage/js/utils.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/damage/js/utils.js b/damage/js/utils.js
index 2c47acc62..a5c201cc9 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -97,17 +97,14 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
 };*/
 
 window.CrunchUtils.getOrbMultiplier = function(orb, type, baseMultiplier, boostedMultiplier) {
-  if(window.specials[1221].turnedOn || window.specials[1222].turnedOn){
-    if (orb == 'str') return boostedMultiplier;
-    if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+    if(window.specials[1221].turnedOn || window.specials[1222].turnedOn){
+        if (orb == 'str') return boostedMultiplier;
+        if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
     }
-  }else{
-    if (orb == 'str') return baseMultiplier;
+    if (orb == 1.0 || orb == 'str') return baseMultiplier;
+    if (orb == 2.0 || orb == 'g') return boostedMultiplier;
     if (orb == 0.5) return 1 / boostedMultiplier;
-  }
-  if (orb == 1.0) return baseMultiplier;
-  if (orb == 2.0 || orb == 'g') return boostedMultiplier;
-  return 1;
+    return 1;
 };
 
 })();

From d89ab57398fdb77dd560ef56aa3afbcace517b78 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Sun, 5 Feb 2017 20:34:41 +0100
Subject: [PATCH 0891/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index cc01077e3..6ef61f615 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -594,7 +594,7 @@ directives.unitOrb = function($rootScope) {
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
 			var n = ORBS.indexOf(tunit.orb);
 			if(unit.unit.type == "STR" || unit.unit.type == "DEX")
-				tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
+				tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
 			else
 				tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
                     scope.glow();

From e14ba08f61cfad1cfe98983f141702e955c9bcbf Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 7 Feb 2017 01:08:01 -0500
Subject: [PATCH 0892/1569] New units and fixes

Will complete rest once data is out
---
 common/data/captains.js   |  8 +++++-
 common/data/cooldowns.js  | 14 ++++++++++-
 common/data/details.js    | 52 +++++++++++++++++++++++++++++++--------
 common/data/drops.js      |  6 ++---
 common/data/evolutions.js | 24 ++++++++++++++++++
 common/data/families.js   | 15 +++++++++++
 common/data/flags.js      |  2 ++
 common/data/gw.js         |  6 +++++
 common/data/units.js      | 15 ++++++++++-
 9 files changed, 126 insertions(+), 16 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index d885240c9..aa87e0aac 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4022,7 +4022,7 @@ window.captains = {
         atk: function(p) { 
             return p.unit.class.has("Slasher") ? 2.5 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+            return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
     },
     1437: {
         atk: function(p) {
@@ -4084,4 +4084,10 @@ window.captains = {
     1447: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
+    1450: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+    },
+    1452: {
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.5 : 2); }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b8a9b9245..3867919ec 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1445,6 +1445,18 @@ window.cooldowns = [
     20,
     [ 17, 13 ],
     [ 17, 12 ],
-    null,
+    null,//5+ Sanji
     [ 20, 12 ],
+    22,
+    22,
+    20,
+    20,
+    [ 12, 12 ],
+    [ 12, 12 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index ddea08520..70cddd3ae 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6894,14 +6894,14 @@ window.details = {
         captain: "Boosts ATK of [STR] and [PSY] characters by 2x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
-        sailor: "Boosts ATK of all characters by 75",
+        sailor: "Boosts HP of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
-        sailor: "Boosts ATK of all characters by 75",
+        sailor: "Boosts HP of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
     1319: {//Lady Tsuru
@@ -7722,11 +7722,11 @@ window.details = {
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew, however, we do not have any numbers for this yet, so he will only boost HP if there are 6 powerhouse units FOR NOW.",
         special: [
             {
-                "description": "Deals 60x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "description": "Deals 10x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
                 "cooldown": [ 12, 7 ],
             },
             {
-                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
+                "description": "Deals 60x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
                 "cooldown": [ 22, 17 ],
             },
         ],
@@ -7737,11 +7737,11 @@ window.details = {
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew, however, we do not have any numbers for this yet, so he will only boost HP if there are 6 powerhouse units FOR NOW.",
         special: [
             {
-                "description": "Deals 60x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "description": "Deals 10x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
                 "cooldown": [ 12, 7 ],
             },
             {
-                "description": "Deals ???x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
+                "description": "Deals 60x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
                 "cooldown": [ 22, 17 ],
             },
         ],
@@ -7755,7 +7755,7 @@ window.details = {
         sailor: "Boost ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1436: {//Hyouzou
-        captain: "Boosts ATK of Slashers by 2.5x and HP of Powerhouse characters by 1.5x",
+        captain: "Boosts ATK of Slashers by 2.5x and HP of Powerhouse characters by 1.25x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
@@ -7803,18 +7803,18 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2.75x following a chain of Good > Great > Perfect hits",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
-        sailor: "Boost ATK of all characters by 150 and HP of all characters by 50 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
     1444: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
-        sailor: "Boost ATK of all characters by 150 and HP of all characters by 50 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
     1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
         special: "Boosts ATK and RCV of [QCK] and [PSY] characters by 1.75x for 1 turn, and delays all enemies for 1 turn. Changes your Captain orb to [RCV]. If HP is above 50%, changes left column into Matching orbs.",
-        specialName: "Aromatic Foot",
+        specialName: "Perfume Femur",
         captainNotes: "#{captainProportional : higher : 2.25 + 0.5 * (remaining HP) / (total HP) : 2.75 : 2.25}"
     },
     1446: {//Sogeking 5+
@@ -7842,4 +7842,36 @@ window.details = {
         specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the higher the HP is. The formula used is ???? * (current HP) / (total HP)",
         specialName: "Weight Gain: Heavy Gong",
     },
+    1449: {//Violet
+        captain: "Not Translated",
+        special: "Reduces the defense of all enemies by 50% for 1 turn, and if HP is below 50%, randomly changes all orbs to either [RCV] or [TND] orbs",
+        specialName: "Clairvoyance",
+    },
+    1450: {//Violet
+        captain: "Boosts ATK of Cerebral characters by 1.75x. Heals for .5x character's RCV at the end of the turn each time you hit a Great.",
+        special: "Reduces the defense of all enemies by 50% for 1 turn, and if HP is below 50%, randomly changes all orbs to either [RCV] or [TND] orbs",
+        specialName: "Clairvoyance",
+    },
+    1451: {//Moustache Sanji
+        captain: "Not Translated",
+        special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 1 turn",
+        specialName: "Diable Jambe: Love Shot",
+    },
+    1452: {//Moustache Sanji
+        captain: "Boosts ATK of [DEX] characters by 2.5x if they have a matching orb, by 2x otherwise. Slightly boosts chances of getting [DEX] orbs",
+        special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 1 turn",
+        specialName: "Diable Jambe: Love Shot",
+    },
+    1453: {//Valentines Margeurite
+        captain: "Not Translated",
+        special: "Changes Orbs depending on the current HP",
+        specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
+        specialName: "",
+    },
+    1454: {//Valentines Margeurite
+        captain: "Not Translated",
+        special: "Changes Orbs depending on the current HP",
+        specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
+        specialName: "",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 6f1e9e91f..da7602c1f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1302,9 +1302,9 @@ window.drops = {
         
         {
             name: "Protect Violet-Chan!!",
-            thumb: null,
-            //condition: "You can only bring DEX units",
-            "All Difficulties": [ -935, -1278, -1378, -1324, -880, -876, -259, -1226, -814 ]
+            thumb: 1450,
+            condition: "You can only bring STR units",
+            "All Difficulties": [ 1449, 1451, -935, -1278, -1318, -1324, -880, -876, -259, -1226, -814 ]
         },
         
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 468097f16..3d238d65e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2219,4 +2219,28 @@ window.evolutions = {
         evolution: 1444,
         evolvers: [ 95, 95, 1180, 300, 300 ]
     },
+    1449: {
+        evolution: 1450,
+        evolvers: [  ]
+    },
+    1451: {
+        evolution: 1452,
+        evolvers: [  ]
+    },
+    1453: {
+        evolution: 1454,
+        evolvers: [  ]
+    },
+    1455: {
+        evolution: 1456,
+        evolvers: [  ]
+    },
+    1457: {
+        evolution: 1458,
+        evolvers: [  ]
+    },
+    1459: {
+        evolution: 1460,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index f563eb4c2..7741f0294 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1444,4 +1444,19 @@ window.families = [
     "Dosun",
     "Dosun",
     "Boa Hancock",
+    "Usopp",
+    "Sanji",
+    "Tony Tony Chopper",
+    "Violet",
+    "Violet",
+    "Sanji",
+    "Sanji",
+    "Marguerite",
+    "Marguerite",
+    "Don Chinjao",
+    "Don Chinjao",
+    "Kuro",
+    "Kuro",
+    "Miss Valentine",
+    "Miss Valentine",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 018aa9052..9de1bcdb5 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1248,4 +1248,6 @@ window.flags = {
     1443: { rr: 1, rro: 1 },
     1444: { rr: 1, rro: 1 },
     1445: { rr: 1, rro: 1 },
+    1452: { rr: 1, rro: 1, lrr: 1, },
+    1453: { rr: 1, rro: 1, lrr: 1, },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index d8592b81c..977a94ccb 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1447,4 +1447,10 @@ window.gw=[
     2022,
     2018,
     2021,
+    50898,
+    50898,
+    50899,
+    50899,
+    50813,
+    50813,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b90638583..9334b7aac 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1421,7 +1421,7 @@ window.units = [
     [ "Rob Lucci, Home of Happi", "INT", [ "Fighter", "Powerhouse" ], 5, 20, 5, 3, 99, 3000000, 1129, 499, 42, 2299, 1333, 152, 1 ],
     [ "Diamante, Ripple-Ripple Man", "INT", [ "Driven", "Striker" ], 4, 25, 5, 2, 70, 1066998, 505, 388, 12, 1202, 770, 91, 1 ],
     [ "Diamante, Donquiote Family Executive", "INT", [ "Driven", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 1131, 711, 47, 2400, 1457, 168, 1 ],
-    [ "T-Bone, Navy HP Colonel", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, 3000000, 99, 98, 50, 1752, 1199, 300, 1 ],
+    [ "T-Bone, Navy HQ Colonel", "QCK", [ "Cerebral", "Slasher" ], 4, 26, 4, 3, 99, 3000000, 99, 98, 50, 1752, 1199, 300, 1 ],
     [ "Gin, Krieg Pirates Combat Commander", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 110, 69, 32, 1228, 801, 191, 1 ],
     [ "Don Sai, Happo Navy", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, 392109, 105, 59, 19, 1205, 620, 106, 1],
     [ "Don Sai, Happo Navy's 13th Leader", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, 99, 3000000, 1123, 527, 57, 2192, 1301, 181, 1],
@@ -1447,6 +1447,19 @@ window.units = [
     [ "Sogeking 5+", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, 3000000, 770, 292, 189, null, null, null, null ],
     [ "Sanji  5+", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, 2709, 1337, 251, null ],
     [ "Chopper 5+", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, 2336, 1236, 346, null ],
+    [ "Violet", "DEX", [ "Fighter", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 88, 43, 89, null, null, null, null ],
+    [ "Violet, Evolved", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, null, null, null, null ],
+    [ "Sanji Disguise", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 4, 2, 50, 392109, 103, 56, 23, 1023, 567, 103, null ],
+    [ "Sanji Disguise, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, null, null, null, null ],
+    [ "Valentines Marguerite", "STR", [ "Shooter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Valentines Marguerite, Evolved", "STR", [ "Shooter", "Free Spirit" ], 5, 20, 5, 4, 99, 3000000, null, null, null, 1755, 1081, 348, null ],
+    [ "Coliseum Chinjao", "PSY", [ "Striker", "Powerhouse" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Chinjao, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Kuro", "INT", [ "Slasher", "Cerebral" ], 4, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Kuro, Evolved", "INT", [ "Slasher", "Cerebral" ], 6, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Miss Valentine", "STR", [ "Fighter", "Free Spirit" ], 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Miss Valentine, Evolved", "STR", [ "Fighter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 69dfd8b3dc42e6d29f544e3ecdf81d1912602234 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 7 Feb 2017 12:13:52 -0500
Subject: [PATCH 0893/1569] 5+ units on Official

and some other stuff
---
 common/data/aliases.js     | 18 +++++++++++++++---
 common/data/captains.js    |  6 ++++++
 common/data/cooldowns.js   |  8 ++++----
 common/data/details.js     | 10 +++++-----
 common/data/drops.js       | 21 ++++++++++++---------
 common/data/evolutions.js  | 20 ++++++++++++++++----
 common/data/flags.js       |  2 +-
 common/data/ships.js       |  7 +++++--
 common/data/units.js       |  8 ++++----
 common/js/nonSuspicious.js |  2 +-
 index.html                 | 10 +++++-----
 11 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 964b77520..b70e6ba2a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1444,7 +1444,19 @@ window.aliases = {
     1443: ['ドスン 新魚人海賊団', '', ''],
     1444: ['ドスン 魚人街の亡霊', '', ''],
     1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock'],
-    1446: ['', '', 'Mega Usopp'],
-    1447: ['', '', 'Mega Sanji'],
-    1448: ['', '', 'Mega Chopper'],
+    1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp'],
+    1447: ['サンジ グリル＝ショット', '', 'Mega Sanji'],
+    1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper'],
+    1449: ['', '', ''],
+    1450: ['', '', ''],
+    1451: ['', '', ''],
+    1452: ['', '', ''],
+    1453: ['', '', ''],
+    1454: ['', '', ''],
+    1455: ['', '', 'Coliseum Don Chinjao'],
+    1456: ['', '', 'Coliseum Don Chinjao'],
+    1457: ['', '', 'Coliseum Kuro'],
+    1458: ['', '', 'Coliseum Kuro'],
+    1459: ['', '', 'Coliseum Miss Valentine'],
+    1460: ['', '', 'Coliseum Miss Valentine'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index aa87e0aac..f0d6ec235 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4084,9 +4084,15 @@ window.captains = {
     1447: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
+    1449: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+    },
     1450: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
     },
+    1451: {
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.25 : 1.5); }
+    },
     1452: {
         atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.5 : 2); }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3867919ec..15ef09b65 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1447,10 +1447,10 @@ window.cooldowns = [
     [ 17, 12 ],
     null,//5+ Sanji
     [ 20, 12 ],
-    22,
-    22,
-    20,
-    20,
+    [ 22, 14 ],
+    [ 22, 14 ],
+    [ 20, 13 ],
+    [ 20, 13 ],
     [ 12, 12 ],
     [ 12, 12 ],
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 70cddd3ae..e92c36bd5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7843,7 +7843,7 @@ window.details = {
         specialName: "Weight Gain: Heavy Gong",
     },
     1449: {//Violet
-        captain: "Not Translated",
+        captain: "Boosts ATK of Cerebral characters by 1.5x. Heals for .3x character's RCV at the end of the turn each time you hit a Great.",
         special: "Reduces the defense of all enemies by 50% for 1 turn, and if HP is below 50%, randomly changes all orbs to either [RCV] or [TND] orbs",
         specialName: "Clairvoyance",
     },
@@ -7853,7 +7853,7 @@ window.details = {
         specialName: "Clairvoyance",
     },
     1451: {//Moustache Sanji
-        captain: "Not Translated",
+        captain: "Boosts ATK of [DEX] characters by 2.25x if they have a matching orb, by 1.5x otherwise. Slightly boosts chances of getting [DEX] orbs",
         special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 1 turn",
         specialName: "Diable Jambe: Love Shot",
     },
@@ -7866,12 +7866,12 @@ window.details = {
         captain: "Not Translated",
         special: "Changes Orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
-        specialName: "",
+        specialName: "Doki Doki Heart",
     },
     1454: {//Valentines Margeurite
-        captain: "Not Translated",
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x an their RCV by 1.5x",
         special: "Changes Orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
-        specialName: "",
+        specialName: "Doki Doki Heart",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index da7602c1f..e392b5834 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -727,7 +727,7 @@ window.drops = {
             global: true,
             condition: "None",
             Expert: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20 ],
-            Elite: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20, -19 ]
+            Elite: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20, -1447, -19 ]
         },
 
         {
@@ -735,7 +735,7 @@ window.drops = {
             thumb: 228,
             global: true,
             condition: "None",
-            "All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22 ]
+            "All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22, -1448 ]
         },
 
         {
@@ -822,7 +822,7 @@ window.drops = {
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Defence Boost Forbidden Tome']],
-            "All Difficulties": [ 385, 387, -388, -335, -314, -36, -16, -11 ]
+            "All Difficulties": [ 385, 387, -388, -335, -314, -36, -16, -1446, -11 ]
         },
 
         {
@@ -1372,7 +1372,7 @@ window.drops = {
             thumb: 518,
             showManual: true,
             global: true,
-            'Ultimate': [ 517, -15, -16, -223 ]
+            'Ultimate': [ 517, -15, -16, -1446, -223 ]
         },
 
         {
@@ -1458,7 +1458,7 @@ window.drops = {
             name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
             thumb: 989,
-            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -556, -528, -520, -554, -558, -20, -217, -709, -1115, -1177, -1175, -1210, -1208 ]
+            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -1446, -556, -528, -520, -554, -558, -20, -1447, -217, -709, -1115, -1177, -1175, -1210, -1208 ]
         },
         
         {
@@ -1520,7 +1520,7 @@ window.drops = {
             thumb: 893,
             challenge:'Total number of hits above 50,000',
             challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Bind Resistance Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -15, -8 ]
+            "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8 ]
         },
 
         {
@@ -1547,15 +1547,18 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457 ]
         },
         
         {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
+            "Characters": [ 927, 296, 299, 773, 774, 1224 ],
+            "Boosters and Evolvers": [ 351, 193, 114, 266, 83, 118 ],
+            "Global": [ -261, -1413, -562, -720, -8, -1388, -219, -75, -255, -314, -316, -357, -410, -408, -449, -451, -455, -641, -643, -754, -760, -840, -880, -906, -910, -999, -554, -1175, -528, -1177, -560, -1212, -1245, -218, -22, -1448, -24, -204, -384, -504, -508, -785, -789 ],
             "Japan": [ -261, -562, -720, -748, -935, -1413 ]
         },
         
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3d238d65e..57d1c7317 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2187,10 +2187,6 @@ window.evolutions = {
         evolution: 1430,
         evolvers: [ 117, 83, 86, 91, 97 ]
     },
-    416: {
-        evolution: 1445,
-        evolvers: [  ]
-    },
     1431: {
         evolution: 1432,
         evolvers: [ 118, 266, 300, 301, 302 ]
@@ -2219,6 +2215,22 @@ window.evolutions = {
         evolution: 1444,
         evolvers: [ 95, 95, 1180, 300, 300 ]
     },
+    416: {
+        evolution: 1445,
+        evolvers: [  ]
+    },
+    16: {
+        evolution: 1446,
+        evolvers: [  ]
+    },
+    20: {
+        evolution: 1447,
+        evolvers: [  ]
+    },
+    22: {
+        evolution: 1448,
+        evolvers: [  ]
+    },
     1449: {
         evolution: 1450,
         evolvers: [  ]
diff --git a/common/data/flags.js b/common/data/flags.js
index 9de1bcdb5..3e670f198 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1248,6 +1248,6 @@ window.flags = {
     1443: { rr: 1, rro: 1 },
     1444: { rr: 1, rro: 1 },
     1445: { rr: 1, rro: 1 },
-    1452: { rr: 1, rro: 1, lrr: 1, },
     1453: { rr: 1, rro: 1, lrr: 1, },
+    1454: { rr: 1, rro: 1, lrr: 1, },
 };
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index 4883b5086..2a438156f 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -264,9 +264,12 @@ window.ships = [
     { // 21
         name: 'Burning Whitebeard Ship',
         thumb: 'ship_0022_c.png',
-        description: 'Boosts HP by 1.3x',
+        description: 'Boosts ATK by 1.5x and HP by 1.4x. Special: Cuts the current HP of each enemy by 20% (cooldown: 17 turns).',
+        atk: function(p) {
+            return 1.5;
+        },
         hp: function(p) {
-            return 1.3;
+            return 1.4;
         },
     },
     
diff --git a/common/data/units.js b/common/data/units.js
index 9334b7aac..08694677a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1444,11 +1444,11 @@ window.units = [
     [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 302, 79, 18, 1440, 509, 96, 1 ],
     [ "Dosun, Ghosts of Fishman District", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, 1 ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, 1 ],
-    [ "Sogeking 5+", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, 3000000, 770, 292, 189, null, null, null, null ],
-    [ "Sanji  5+", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, 2709, 1337, 251, null ],
-    [ "Chopper 5+", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, 2336, 1236, 346, null ],
+    [ "Usopp, Platanus: Shuriken", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, 3000000, 770, 292, 189, 2022, 972, 480, 1 ],
+    [ "Sanji, Grill Shot", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, 2709, 1337, 251, 1 ],
+    [ "Tony Tony Chopper, Heavy Gong", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, 2336, 1236, 346, 1 ],
     [ "Violet", "DEX", [ "Fighter", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 88, 43, 89, null, null, null, null ],
-    [ "Violet, Evolved", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, null, null, null, null ],
+    [ "Violet, Evolved", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, 1594, 843, 403, null ],
     [ "Sanji Disguise", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 4, 2, 50, 392109, 103, 56, 23, 1023, 567, 103, null ],
     [ "Sanji Disguise, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, null, null, null, null ],
     [ "Valentines Marguerite", "STR", [ "Shooter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 2a3f58228..5dfca41f8 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1404, 1413, 1420, 1422, 1423, 1426, 1427 ];
+    var newUnits = [ 1434, 1445, 1446, 1447, 1448, 1432, 1422 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index e4ec859de..725314019 100644
--- a/index.html
+++ b/index.html
@@ -64,15 +64,15 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>24/1/2017</p>
+            <p>7/2/2017</p>
             <br>
             <ul>
-                <li>Kimono Rob Lucci Completed</li>
-                <li>Kizaru Cannonball added to Calculator</li>
+                <li>Valentines Marguerite Added</li>
+                <li>Going Luffy Senpai! added to Calculator</li>
                 <br>
-                <li>Don Sai Fortnight and Diamante Colo units Completed</li>
+                <li>Violet Fortnight and Don Chinjao Colo units added</li>
                 <br>
-                <li>Hody Jones Units added to Character Table</li>
+                <li>Hody Jones Units Completed in Character Table</li>
                 <br>
                 <li>Love, Zeenigami & Mondfischer & Team<li>
                 <br>

From 3763c43803d631ae30ed066db7df08a1fafe41d4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 7 Feb 2017 16:39:52 -0500
Subject: [PATCH 0894/1569] Are you sure Kuro isn't a 6*

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 08694677a..d7159d8bd 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1456,7 +1456,7 @@ window.units = [
     [ "Coliseum Chinjao", "PSY", [ "Striker", "Powerhouse" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Chinjao, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Kuro", "INT", [ "Slasher", "Cerebral" ], 4, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Kuro, Evolved", "INT", [ "Slasher", "Cerebral" ], 6, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Kuro, Evolved", "INT", [ "Slasher", "Cerebral" ], 5, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Miss Valentine", "STR", [ "Fighter", "Free Spirit" ], 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Miss Valentine, Evolved", "STR", [ "Fighter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     

From ad857a7d3d759e31ebfe5e751c07f9023e8f08f1 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Wed, 8 Feb 2017 12:20:22 -0500
Subject: [PATCH 0895/1569] Colo Chiniamo Batch

---
 common/data/captains.js  | 20 ++++++++++++++
 common/data/cooldowns.js | 18 ++++++-------
 common/data/details.js   | 56 +++++++++++++++++++++++++++++++++++++---
 common/data/gw.js        |  6 +++++
 common/data/specials.js  |  8 ++++++
 common/data/units.js     | 15 +++++------
 common/data/zombies.js   |  4 +++
 7 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index f0d6ec235..ae0457b87 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4096,4 +4096,24 @@ window.captains = {
     1452: {
         atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.5 : 2); }
     },
+    1456: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1459: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 1.75 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+    },
+    1460: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 15ef09b65..f5e4a3da5 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1224,7 +1224,7 @@ window.cooldowns = [
     [ 20, 10 ],
     [ 15, 9 ],
     16,
-    17,
+    [ 17, 10 ],
     [ 23, 16 ],
     22,
     [ 22, 15 ],//Sentomaru
@@ -1315,8 +1315,8 @@ window.cooldowns = [
     [ 25, 18 ],
     null,//Coby
     null,//Coby
-    22,
-    22,
+    [ 22, 17 ],
+    [ 22, 17 ],
     [ 21, 17 ],
     [ 21, 17 ],
     [ 18, 12 ],
@@ -1453,10 +1453,10 @@ window.cooldowns = [
     [ 20, 13 ],
     [ 12, 12 ],
     [ 12, 12 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    null,//Colo Don Chinjao
+    null,//Colo Don Chinjao
+    [ 18, 7 ],
+    [ 18, 7 ],
+    [ 22, 11 ],
+    [ 22, 11 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index e92c36bd5..c2c5abae1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4973,7 +4973,7 @@ window.details = {
         specialName: "Surprise Pincer Attack"
     },
     1033: {
-        captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turn at the start of the fight",
+        captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turns at the start of the fight",
         special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
         specialName: "Surprise Pincer Attack"
     },
@@ -5591,7 +5591,7 @@ window.details = {
         specialName: "Tactician's Savage Cut"
     },
     1129: {
-        captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of all characters by 2x",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 2x",
         special: "Reduces Paralysis and Despair duration by 5 turns. Cuts the current HP of one enemy by 10%",
         specialName: "Tactician's Savage Cut"
     },
@@ -7492,7 +7492,7 @@ window.details = {
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
@@ -7508,7 +7508,7 @@ window.details = {
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turn and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
@@ -7874,4 +7874,52 @@ window.details = {
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
         specialName: "Doki Doki Heart",
     },
+    1455: {//Coliseum Don Chinjao
+        captain: "Boosts ATK of Driven characters by ???x until the first hit other than Perfect and recovers ??? HP at end of each turn",
+        special: [
+            {
+                "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
+                "cooldown": [ 20, 10 ],
+            },
+            {
+                "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
+                "cooldown": [ 30, 15 ],
+            },
+        ],
+        specialName: "Chinjao Special",
+    },
+    1456: {//Coliseum Don Chinjao
+        captain: "Boosts ATK of Driven characters by 2.75x until the first hit other than Perfect and recovers 120 HP at end of each turn",
+        special: [
+            {
+                "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
+                "cooldown": [ 20, 10 ],
+            },
+            {
+                "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
+                "cooldown": [ 30, 15 ],
+            },
+        ],
+        specialName: "Chinjao Special",
+    },
+    1457: {//Coliseum Kuro
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 1.75x",
+        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and randomizes non-matching orbs for Slasher and Cerebral characters.",
+        specialName: "Kuro Special",
+    },
+    1458: {//Coliseum Kuro
+        captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 2x",
+        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and randomizes non-matching orbs for Slasher and Cerebral characters.",
+        specialName: "Kuro Special",
+    },
+    1459: {//Coliseum Miss Valentine
+        captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great > Perfect hits",
+        special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
+        specialName: "Miss Valentine Special",
+    },
+    1460: {//Coliseum Miss Valentine
+        captain: "Boosts ATK by 2.14x following a chain of Good > Good > Great > Perfect hits",
+        special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
+        specialName: "Miss Valentine Special",
+    },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index 977a94ccb..2e7ccbbde 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1453,4 +1453,10 @@ window.gw=[
     50899,
     50813,
     50813,
+    50809,
+    50809,
+    50810,
+    50810,
+    50811,
+    50811,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 38190a6b5..080f1214e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2126,4 +2126,12 @@ window.specials = {
             });
         }
     },
+    1459: {
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
+    },
+    1460: {
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index d7159d8bd..def55a2c5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1450,16 +1450,15 @@ window.units = [
     [ "Violet", "DEX", [ "Fighter", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 88, 43, 89, null, null, null, null ],
     [ "Violet, Evolved", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, 1594, 843, 403, null ],
     [ "Sanji Disguise", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 4, 2, 50, 392109, 103, 56, 23, 1023, 567, 103, null ],
-    [ "Sanji Disguise, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, null, null, null, null ],
+    [ "Sanji Disguise, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, 2030, 1203, 208, null ],
     [ "Valentines Marguerite", "STR", [ "Shooter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Valentines Marguerite, Evolved", "STR", [ "Shooter", "Free Spirit" ], 5, 20, 5, 4, 99, 3000000, null, null, null, 1755, 1081, 348, null ],
-    [ "Coliseum Chinjao", "PSY", [ "Striker", "Powerhouse" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Chinjao, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Kuro", "INT", [ "Slasher", "Cerebral" ], 4, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Kuro, Evolved", "INT", [ "Slasher", "Cerebral" ], 5, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Miss Valentine", "STR", [ "Fighter", "Free Spirit" ], 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Miss Valentine, Evolved", "STR", [ "Fighter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    
+    [ "Coliseum Chinjao", "PSY", [ "Striker", "Powerhouse" ], 4, 25, 5, 2, 70, 1066998, 613, 321, 24, null, null, null, null ],
+    [ "Coliseum Chinjao, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, 7, 3, 99, 4000000, 1177, 576, 77, 2707, 1367, 212, null ],
+    [ "Coliseum Kuro", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, null, null, null, null, 892, 557, 187, null ],
+    [ "Coliseum Kuro, Evolved", "INT", [ "Slasher", "Cerebral" ], 4, 26, 10, 3, 99, 3000000, null, null, null, 1664, 1299, 310, null ],
+    [ "Coliseum Miss Valentine", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, null, 92, 49, 26, 755, 390, 148, null ],
+    [ "Coliseum Miss Valentine, Evolved", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1778330, 687, 319, 90, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 9602379a9..d5ef16e92 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -315,4 +315,8 @@ window.zombies = {
         type: 'healer',
         amount: 918
     },
+    1456: { // Colo Don Chinjao
+        type: 'healer',
+        amount: 120
+    },
 };

From 774b65d752ea331a7da46f81a5d37164a164b282 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 8 Feb 2017 17:17:57 -0500
Subject: [PATCH 0896/1569] Chinjao Details

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c2c5abae1..9051be94e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7875,7 +7875,7 @@ window.details = {
         specialName: "Doki Doki Heart",
     },
     1455: {//Coliseum Don Chinjao
-        captain: "Boosts ATK of Driven characters by ???x until the first hit other than Perfect and recovers ??? HP at end of each turn",
+        captain: "Boosts ATK of Powerhouse characters by ???x until the first hit other than Perfect and recovers ??? HP at end of each turn",
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
@@ -7889,7 +7889,7 @@ window.details = {
         specialName: "Chinjao Special",
     },
     1456: {//Coliseum Don Chinjao
-        captain: "Boosts ATK of Driven characters by 2.75x until the first hit other than Perfect and recovers 120 HP at end of each turn",
+        captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 120 HP at end of each turn",
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",

From b62d1cac408f92cc7867d6c99de2029c6b2fd606 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 10 Feb 2017 23:02:14 -0500
Subject: [PATCH 0897/1569] Sanji Violet and Gedatsu fixed

idk, I changed nothing, but it works now I guess
---
 common/data/aliases.js  | 8 ++++----
 common/data/captains.js | 2 +-
 common/data/units.js    | 8 ++++----
 damage/js/utils.js      | 5 ++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b70e6ba2a..00b80098b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1447,10 +1447,10 @@ window.aliases = {
     1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp'],
     1447: ['サンジ グリル＝ショット', '', 'Mega Sanji'],
     1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper'],
-    1449: ['', '', ''],
-    1450: ['', '', ''],
-    1451: ['', '', ''],
-    1452: ['', '', ''],
+    1449: ['ヴァイオレット 踊り娘', '', ''],
+    1450: ['ヴァイオレット 追われる女', '', ''],
+    1451: ['サンジ 恋人通りの変装男', '', ''],
+    1452: ['サンジ となり町までの護衛', '', ''],
     1453: ['', '', ''],
     1454: ['', '', ''],
     1455: ['', '', 'Coliseum Don Chinjao'],
diff --git a/common/data/captains.js b/common/data/captains.js
index ae0457b87..0b494be15 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3646,7 +3646,7 @@ window.captains = {
         atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1341: {
-        //damageSorter: function(d) { return CrunchUtils.classSort(d, 2.625, "QCK"); }, //Boosts work, but the sorter doesn't
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, "QCK"); }, 
         hitAtk: function(p) {
             if (!(p.unit.type == "QCK")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 2.625 : 1.75;
diff --git a/common/data/units.js b/common/data/units.js
index def55a2c5..003359035 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1447,10 +1447,10 @@ window.units = [
     [ "Usopp, Platanus: Shuriken", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, 3000000, 770, 292, 189, 2022, 972, 480, 1 ],
     [ "Sanji, Grill Shot", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, 2709, 1337, 251, 1 ],
     [ "Tony Tony Chopper, Heavy Gong", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, 2336, 1236, 346, 1 ],
-    [ "Violet", "DEX", [ "Fighter", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 88, 43, 89, null, null, null, null ],
-    [ "Violet, Evolved", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, 1594, 843, 403, null ],
-    [ "Sanji Disguise", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 4, 2, 50, 392109, 103, 56, 23, 1023, 567, 103, null ],
-    [ "Sanji Disguise, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, 2030, 1203, 208, null ],
+    [ "Violet, Dancing Woman", "DEX", [ "Fighter", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 88, 43, 89, 804, 403, 234, 1 ],
+    [ "Violet, Chased Woman", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, 1594, 843, 403, 1 ],
+    [ "Sanji, Disguised Man on a Road to Love", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 4, 2, 50, 392109, 103, 56, 23, 1023, 567, 103, 1 ],
+    [ "Sanji, Escort of a Nearby Town", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, 2030, 1203, 208, 1 ],
     [ "Valentines Marguerite", "STR", [ "Shooter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Valentines Marguerite, Evolved", "STR", [ "Shooter", "Free Spirit" ], 5, 20, 5, 4, 99, 3000000, null, null, null, 1755, 1081, 348, null ],
     [ "Coliseum Chinjao", "PSY", [ "Striker", "Powerhouse" ], 4, 25, 5, 2, 70, 1066998, 613, 321, 24, null, null, null, null ],
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 814c6b213..f300ffffb 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -66,7 +66,7 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
     return result;
 };
     
-/*window.CrunchUtils.typeSort = function(array, typeMultiplier, types) {
+window.CrunchUtils.typeSort = function(array, typeMultiplier, types) {
     var result = [ ];
     function isUnitAMatch(unit) {
         if (unit.type == types) {
@@ -92,9 +92,8 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
         }
     });
     result.push(beginning.concat(end));
-    // return result
     return result;
-};*/
+};
 
 window.CrunchUtils.getOrbMultiplier = function(orb, baseMultiplier, boostedMultiplier) {
     if (orb == 1.0) return baseMultiplier;

From 08aa0a59d394e58d717cc32e71cc9762de7cf012 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 10 Feb 2017 23:05:57 -0500
Subject: [PATCH 0898/1569] Violet and Sanji evos

---
 common/data/evolutions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 57d1c7317..9e67763be 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2233,11 +2233,11 @@ window.evolutions = {
     },
     1449: {
         evolution: 1450,
-        evolvers: [  ]
+        evolvers: [ 116, 80, 86, 91, 102 ]
     },
     1451: {
         evolution: 1452,
-        evolvers: [  ]
+        evolvers: [ 117, 80, 91, 97, 102 ]
     },
     1453: {
         evolution: 1454,

From e3e4d6d6402341c6ae0bbafd404cba56c6fd960b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 12 Feb 2017 19:37:57 -0500
Subject: [PATCH 0899/1569] Save Ace?

---
 common/data/drops.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index e392b5834..3e1e95c2a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1566,6 +1566,9 @@ window.drops = {
             name: 'Rescue Ace Event - Aokiji',
             thumb: 1280,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
+            "Characters": [ 67, 69, 262, 264, 298 ],
+            "Boosters and Evolvers": [ 113, 192, 350, 266, 83, 118 ],
+            "Global": [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739 ],
             "Japan": [ -416, -459, -530, -669, -578, -1121 ]
         },
         
@@ -1573,6 +1576,9 @@ window.drops = {
             name: 'Rescue Ace Event - Kizaru',
             thumb: 1228,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
+            "Characters": [ 968, 969, 970, 971, 972, 231, 775, 1223, 49, 43 ],
+            "Boosters and Evolvers": [ 112, 191, 349, 266, 83, 118 ],
+            "Global": [ -367, -649, -718, -16, -1446, -20, -1447, -73, -251, -257, -308, -359, -365, -412, -457, -639, -750, -758, -912, -914, -941, -993, -522, -1117, -526, -1173, -556, -1210, -1245, -223, -15, -23, -25, -200, -225, -546, -500, -506, -569, -791, -793 ],
             "Japan": [ -367, -649, -718, -870, -1001 ]
         },
         

From 0cff3882909f69a3c5f65b1997cca7d0c7c31c25 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sun, 12 Feb 2017 22:47:33 -0500
Subject: [PATCH 0900/1569] new Luffy and stuff

---
 common/data/aliases.js    |  3 +++
 common/data/captains.js   | 20 ++++++++++++++++++++
 common/data/details.js    | 14 +++++++++++++-
 common/data/drops.js      |  7 +++++++
 common/data/evolutions.js |  4 ++++
 common/data/flags.js      |  1 +
 common/data/gw.js         |  3 +++
 common/data/units.js      |  7 +++++--
 common/data/zombies.js    |  4 ++++
 9 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b70e6ba2a..01fdc1d84 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1459,4 +1459,7 @@ window.aliases = {
     1458: ['', '', 'Coliseum Kuro'],
     1459: ['', '', 'Coliseum Miss Valentine'],
     1460: ['', '', 'Coliseum Miss Valentine'],
+    1461: ['', '', 'Winter Zoro'],
+    1462: ['', '', 'Valentine Luffy'],
+    1463: ['', '', 'Valentine Luffy'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ae0457b87..9eaade193 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4096,6 +4096,14 @@ window.captains = {
     1452: {
         atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.5 : 2); }
     },
+    1455: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1456: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
         hitAtk: function(p) {
@@ -4104,6 +4112,12 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1457: {
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 1.75 : 1; },
+    },
+    1458: {
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
+    },
     1459: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 1.75 : 1;
@@ -4116,4 +4130,10 @@ window.captains = {
         },
         hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
+    1462: {
+        chainModifier: function(p) { return 2; }
+    },
+    1463: {
+        chainModifier: function(p) { return 2.5; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index c2c5abae1..d4e7f23fc 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7875,7 +7875,7 @@ window.details = {
         specialName: "Doki Doki Heart",
     },
     1455: {//Coliseum Don Chinjao
-        captain: "Boosts ATK of Driven characters by ???x until the first hit other than Perfect and recovers ??? HP at end of each turn",
+        captain: "Boosts ATK of Driven characters by 2.5x until the first hit other than Perfect and recovers 120 HP at end of each turn",
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
@@ -7922,4 +7922,16 @@ window.details = {
         special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
         specialName: "Miss Valentine Special",
     },
+    1462: {//Valentines Day Luffy
+        captain: "Boosts chain multiplier by 2x",
+        special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
+        sailor: "Reduces Paralysis for 2 turns for himself",
+        specialName: "Luffy Special",
+    },
+    1463: {//Valentines Day Luffy
+        captain: "Boosts chain multiplier by 2.5x",
+        special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
+        sailor: "Reduces Paralysis for 2 turns for himself",
+        specialName: "Luffy Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index e392b5834..36c8da9c4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1538,6 +1538,13 @@ window.drops = {
             "All Difficulties": [ 1299, 1305, 1325 ],
         },
         
+        {
+            name: 'Valentines Day Characters',
+            thumb: 1463,
+            "Luffy": [ 1462, 29, 563, 1059 ],
+            "Chopper": [  ],
+        },
+        
         {
             name: '2nd Anniversary Celebration! Duel! Ace',
             thumb: 1023,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 57d1c7317..2b147abcc 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2255,4 +2255,8 @@ window.evolutions = {
         evolution: 1460,
         evolvers: [  ]
     },
+    1462: {
+        evolution: 1463,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 3e670f198..cf967fdc5 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1250,4 +1250,5 @@ window.flags = {
     1445: { rr: 1, rro: 1 },
     1453: { rr: 1, rro: 1, lrr: 1, },
     1454: { rr: 1, rro: 1, lrr: 1, },
+    1461: { special: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 2e7ccbbde..3da5cdc8d 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1459,4 +1459,7 @@ window.gw=[
     50810,
     50811,
     50811,
+    null,
+    51594,
+    51594,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index def55a2c5..89929ef50 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1455,10 +1455,13 @@ window.units = [
     [ "Valentines Marguerite, Evolved", "STR", [ "Shooter", "Free Spirit" ], 5, 20, 5, 4, 99, 3000000, null, null, null, 1755, 1081, 348, null ],
     [ "Coliseum Chinjao", "PSY", [ "Striker", "Powerhouse" ], 4, 25, 5, 2, 70, 1066998, 613, 321, 24, null, null, null, null ],
     [ "Coliseum Chinjao, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, 7, 3, 99, 4000000, 1177, 576, 77, 2707, 1367, 212, null ],
-    [ "Coliseum Kuro", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, null, null, null, null, 892, 557, 187, null ],
+    [ "Coliseum Kuro", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, 392109, null, null, null, 892, 557, 187, null ],
     [ "Coliseum Kuro, Evolved", "INT", [ "Slasher", "Cerebral" ], 4, 26, 10, 3, 99, 3000000, null, null, null, 1664, 1299, 310, null ],
-    [ "Coliseum Miss Valentine", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, null, 92, 49, 26, 755, 390, 148, null ],
+    [ "Coliseum Miss Valentine", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 92, 49, 26, 755, 390, 148, null ],
     [ "Coliseum Miss Valentine, Evolved", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1778330, 687, 319, 90, null, null, null, null ],
+    [ "Probably Winter Zoro", "QCK", [ "Slasher", "Driven" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Valentines Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Valentines Luffy, Evolved", "PSY", [ "Fighter", "Free Spirit" ], 5, null, null, null, 99, 4000000, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index d5ef16e92..2d92b0c4f 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -315,6 +315,10 @@ window.zombies = {
         type: 'healer',
         amount: 918
     },
+    1455: { // Colo Don Chinjao
+        type: 'healer',
+        amount: 120
+    },
     1456: { // Colo Don Chinjao
         type: 'healer',
         amount: 120

From 4c5cecb61abdda15db1d028a6c9ae0f2847feb76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 16 Feb 2017 11:12:11 +0100
Subject: [PATCH 0901/1569] Added alias to Jinbe #1345

---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 12a2f071d..4d115e649 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1343,7 +1343,7 @@ window.aliases = {
     1342: ['カーリー・ダダン','',''],
     1343: ['ポルシェーミ','',''],
     1344: ['ブルージャム','',''],
-    1345: ['ジンベエ 魚人海賊団船長','','Jinbe'],
+    1345: ['ジンベエ 魚人海賊団船長','','Jinbe','Jimbei','Jinbei'],
     1346: ['ヘラクレス おいはぎの森のスゴ腕先生','',''],
     1347: ['トリノ王国の怪鳥','',''],
     1348: ['ヒューマンドリル','',''],

From b2ec1516c06692a3a988a61afbadf61245a76152 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sat, 18 Feb 2017 01:12:50 -0500
Subject: [PATCH 0902/1569] Bunch of stuff

Sao too
---
 common/data/aliases.js   | 20 ++++++++++----------
 common/data/captains.js  | 13 +++++++++++++
 common/data/cooldowns.js |  3 +++
 common/data/details.js   | 36 ++++++++++++++++++++++++++++--------
 common/data/drops.js     | 20 +++++++++++++++++++-
 common/data/families.js  |  4 ++++
 common/data/flags.js     | 10 ++++++++++
 common/data/gw.js        |  2 +-
 common/data/specials.js  | 12 ++++++++++++
 common/data/units.js     | 23 ++++++++++++-----------
 10 files changed, 112 insertions(+), 31 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 12a2f071d..9be32140c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -852,7 +852,7 @@ window.aliases = {
     851: ['ブリキのワポル',''],
     852: ['スリムアップワポル',''],
     853: ['ロブソン',''],
-    854: ['チョッパーの雪遊び',''],
+    854: ['チョッパーの雪遊び','', 'Winter Chopper'],
     855: ['トラファルガー・ロー 聖夜の紳士','','Supernova','Christmas Law','CLaw'],
     856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova','Christmas Law','CLaw'],
     857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova'],
@@ -861,7 +861,7 @@ window.aliases = {
     860: ['戦火の勇士コビー 海軍本部曹長','','Coliseum Coby'],
     861: ['レディー・アルビダ うるわしき美女','','Coliseum Alvida'],
     862: ['レディー・アルビダ 絶世の美女','','Coliseum Alvida'],
-    863: ['銀世界のナミ',''],
+    863: ['銀世界のナミ','', 'Winter Nami'],
     864: ['ボア・ハンコック 九蛇海賊団船長','','Raid'],
     865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid'],
     866: ['ニコ・ロビン 百花繚乱 ウイング“華”','', 'Kimono Robin' ],
@@ -1427,8 +1427,8 @@ window.aliases = {
     1426: ['サイ 八宝水軍第１３代棟梁', '', ''],
     1427: ['ブー 八宝水軍', '', ''],
     1428: ['ジャン・アンゴ', '', ''],
-    1429: ['', '', 'Valentine Mansherry'],
-    1430: ['', '', 'Valentine Mansherry'],
+    1429: ['マンシェリー ２月の本命', '', 'Valentine Mansherry'],
+    1430: ['マンシェリー ３月への勇気', '', 'Valentine Mansherry'],
     1431: ['フランキー将軍', '', 'General Franky'],
     1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky'],
     1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
@@ -1453,12 +1453,12 @@ window.aliases = {
     1452: ['サンジ となり町までの護衛', '', ''],
     1453: ['', '', ''],
     1454: ['', '', ''],
-    1455: ['', '', 'Coliseum Don Chinjao'],
-    1456: ['', '', 'Coliseum Don Chinjao'],
-    1457: ['', '', 'Coliseum Kuro'],
-    1458: ['', '', 'Coliseum Kuro'],
-    1459: ['', '', 'Coliseum Miss Valentine'],
-    1460: ['', '', 'Coliseum Miss Valentine'],
+    1455: ['首領・チンジャオ 八宝水軍', '', 'Coliseum Don Chinjao'],
+    1456: ['首領・チンジャオ 元八宝水軍第１２代棟梁', '', 'Coliseum Don Chinjao'],
+    1457: ['クラハドール 執事', '', 'Coliseum Kuro'],
+    1458: ['百計のクロ 海賊', '', 'Coliseum Kuro'],
+    1459: ['ミス・バレンタイン キロキロの実の能力者', '', 'Coliseum Miss Valentine'],
+    1460: ['ミス・バレンタイン Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Miss Valentine'],
     1461: ['', '', 'Winter Zoro'],
     1462: ['', '', 'Valentine Luffy'],
     1463: ['', '', 'Valentine Luffy'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 17abcbf57..63e554acb 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4130,10 +4130,23 @@ window.captains = {
         },
         hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
+    1461: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.6, "QCK"); }, 
+        hitAtk: function(p) {
+            if (!(p.unit.type == "QCK")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.6 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1462: {
         chainModifier: function(p) { return 2; }
     },
     1463: {
         chainModifier: function(p) { return 2.5; }
     },
+    1464: {//CHANGE THIS IF THIS ISN'T SABO
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f5e4a3da5..a6453dc53 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1459,4 +1459,7 @@ window.cooldowns = [
     [ 18, 7 ],
     [ 22, 11 ],
     [ 22, 11 ],
+    [ 14, 14 ],
+    [ 21, 17 ],
+    [ 21, 17 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index a9fed4e4a..fa6c9f816 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7886,7 +7886,7 @@ window.details = {
                 "cooldown": [ 30, 15 ],
             },
         ],
-        specialName: "Chinjao Special",
+        specialName: "Legend told to the Grandchild",
     },
     1456: {//Coliseum Don Chinjao
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 120 HP at end of each turn",
@@ -7900,38 +7900,58 @@ window.details = {
                 "cooldown": [ 30, 15 ],
             },
         ],
-        specialName: "Chinjao Special",
+        specialName: "Legend told to the Grandchild",
     },
     1457: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 1.75x",
         special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and randomizes non-matching orbs for Slasher and Cerebral characters.",
-        specialName: "Kuro Special",
+        specialName: "Pussyfoot Maneuver",
     },
     1458: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 2x",
         special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and randomizes non-matching orbs for Slasher and Cerebral characters.",
-        specialName: "Kuro Special",
+        specialName: "Pussyfoot Maneuver",
     },
     1459: {//Coliseum Miss Valentine
         captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great > Perfect hits",
         special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
-        specialName: "Miss Valentine Special",
+        specialName: "Crescendo Stone",
     },
     1460: {//Coliseum Miss Valentine
         captain: "Boosts ATK by 2.14x following a chain of Good > Good > Great > Perfect hits",
         special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
-        specialName: "Miss Valentine Special",
+        specialName: "Crescendo Stone",
+    },
+    1461: {//Snow Zoro
+        captain: "Boosts ATK of [QCK] characters by 2x at the start of the chain, by 2.6x after the 3rd Perfect.",
+        special: "Deals 11x character's ATK in [QCK] damage to one enemy, boosts ATK of [QCK] characters by 1.5x for 1 turn",
+        specialName: "Demoltion: Ice Crush",
     },
     1462: {//Valentines Day Luffy
         captain: "Boosts chain multiplier by 2x",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
         sailor: "Reduces Paralysis for 2 turns for himself",
-        specialName: "Luffy Special",
+        specialName: "Gum-Gum Gigant Axe - Sweets",
     },
     1463: {//Valentines Day Luffy
         captain: "Boosts chain multiplier by 2.5x",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
         sailor: "Reduces Paralysis for 2 turns for himself",
-        specialName: "Luffy Special",
+        specialName: "Gum-Gum Gigant Axe - Sweets",
+    },
+    1464: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
+        captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
+        captainNotes: "THIS IS ALL A PLACEHOLDER",
+        special: [
+            {
+                "description": "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn you score 5 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
+                "cooldown": [ null, null ],
+            },
+            {
+                "description": "Boosts ATK of Free Spirit characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
+                "cooldown": [ 20, 14 ],
+            },
+        ],
+        specialName: "Burning Dragon Claw Fist",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 53b7109fb..f4277cae5 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -548,6 +548,7 @@ window.drops = {
             name: "Marineford - Oris Plaza",
             shortName: "Oris Plaza",
             thumb: 1283,
+            global: true,
             completion: '10x Rainbow Gems',
             "01": [ 1279 ],
             "02": [  ],
@@ -617,6 +618,7 @@ window.drops = {
         {
             name: 'Princess Turtle\'s Dragon Palace',
             thumb: 595,
+            global: true,
             ' ': [ 110, 111, 112, 113, 114, 189, 190, 191, 192, 193, 591, 592, 593, 594, 595 ]
         },
 
@@ -665,6 +667,7 @@ window.drops = {
             name: 'Scissor Cavern, Inner Cave',
             day: 4,
             thumb: 304,
+            global: true,
             ' ': [ 89, 90, 91, 92, 93, 95, 96, 97, 98, 99, 300, 301, 302, 303, 304 ]
         },
         
@@ -672,6 +675,7 @@ window.drops = {
             name: 'Scissor Cavern, Deepest Parts',
             day: 4,
             thumb: 1180,
+            global: true,
             ' ': [ 89, 90, 91, 92, 93, 95, 96, 97, 98, 99, 300, 301, 302, 303, 304, 1180 ]
         },
 
@@ -1144,6 +1148,7 @@ window.drops = {
             name: "Let's Find Our Captain! Heart Pirates!",
             condition: "You can only bring QCK units",
             thumb: 1003,
+            global: true,
             "All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564, -1208 ]
         },
         
@@ -1159,6 +1164,7 @@ window.drops = {
         {
             name: "Temptation!? The Queen of Kamabakka Queendom!",
             thumb: 1037,
+            global: true,
             condition: "Only DEX/RCV/TND orbs will appear",
             "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566, -1175 ]
         },
@@ -1307,6 +1313,13 @@ window.drops = {
             "All Difficulties": [ 1449, 1451, -935, -1278, -1318, -1324, -880, -876, -259, -1226, -814 ]
         },
         
+        {
+            name: "Sentomaru's Rampage! Stop the Rookies!",
+            thumb: null,
+            //condition: "You can only bring STR units",
+            "All Difficulties": [ -1268, -1322, -1228, -906, -914, -310, -1061 ]
+        },
+        
     ],
 
             
@@ -1450,6 +1463,7 @@ window.drops = {
         {
             name: 'Clash!! Kizaru',
             thumb: 978,
+            global: true,
             Ultimate: [ 977 ],
             Master: [ 977 ]
         },
@@ -1541,7 +1555,7 @@ window.drops = {
         {
             name: 'Valentines Day Characters',
             thumb: 1463,
-            "Luffy": [ 1462, 29, 563, 1059 ],
+            "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
             "Chopper": [  ],
         },
         
@@ -1554,6 +1568,7 @@ window.drops = {
         {
             name: 'Coliseum',
             thumb: 779,
+            global: true,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459 ],
             Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457 ]
@@ -1562,6 +1577,7 @@ window.drops = {
         {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
+            global: true,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "Characters": [ 927, 296, 299, 773, 774, 1224 ],
             "Boosters and Evolvers": [ 351, 193, 114, 266, 83, 118 ],
@@ -1572,6 +1588,7 @@ window.drops = {
         {
             name: 'Rescue Ace Event - Aokiji',
             thumb: 1280,
+            global: true,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "Characters": [ 67, 69, 262, 264, 298 ],
             "Boosters and Evolvers": [ 113, 192, 350, 266, 83, 118 ],
@@ -1582,6 +1599,7 @@ window.drops = {
         {
             name: 'Rescue Ace Event - Kizaru',
             thumb: 1228,
+            global: true,
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "Characters": [ 968, 969, 970, 971, 972, 231, 775, 1223, 49, 43 ],
             "Boosters and Evolvers": [ 112, 191, 349, 266, 83, 118 ],
diff --git a/common/data/families.js b/common/data/families.js
index 7741f0294..c2736022c 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1459,4 +1459,8 @@ window.families = [
     "Kuro",
     "Miss Valentine",
     "Miss Valentine",
+    "Roronoa Zoro",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Sabo",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index cf967fdc5..f1928e5f2 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -884,6 +884,11 @@ window.flags = {
     892: { global: 1 },
     893: { global: 1 },
     894: { global: 1 },
+    900: { global: 1 },
+    901: { global: 1 },
+    902: { global: 1 },
+    903: { global: 1 },
+    904: { global: 1 },
     895: { special: 1, global: 1 },
     896: { special: 1, global: 1 },
     905: { rr: 1, rro: 1, global: 1 },
@@ -1001,6 +1006,10 @@ window.flags = {
     1033: { rr: 1, rro: 1, global: 1 },
     1034: { rr: 1, rro: 1, global: 1 },
     1035: { rr: 1, rro: 1, global: 1 },
+    1036: { global: 1 },
+    1037: { global: 1 },
+    1038: { global: 1 },
+    1039: { global: 1 },
     1044: { rr: 1, rro: 1, global: 1 },
     1045: { rr: 1, rro: 1, global: 1 },
     1053: { rr: 1, rro: 1, lrr: 1 },
@@ -1152,6 +1161,7 @@ window.flags = {
     1248: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1245: { special: 1, global: 1 },
     1246: { special: 1, global: 1 },
+    1247: { special: 1, global: 1 },
     1249: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1259: { rr: 1, rro: 1, lrr: 1 },
     1260: { rr: 1, rro: 1, lrr: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index 3da5cdc8d..0b77018c1 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1459,7 +1459,7 @@ window.gw=[
     50810,
     50811,
     50811,
-    null,
+    51590,
     51594,
     51594,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 080f1214e..6d5b7473d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2134,4 +2134,16 @@ window.specials = {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"
     },
+    1464: {//CHANGE THIS IF THIS ISN'T SABO
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1464].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1464].multiplier == 1.5 ? 1 : window.specials[1464].multiplier == 1.75 ? 2 : 0);
+            window.specials[1464].multiplier = [1.5, 1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [1.75, 2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1464warning'
+            });
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index d1a976798..379564d86 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1427,8 +1427,8 @@ window.units = [
     [ "Don Sai, Happo Navy's 13th Leader", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, 99, 3000000, 1123, 527, 57, 2192, 1301, 181, 1],
     [ "Boo, Happo Navy", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, 1066998, 305, 159, 29, 1672, 1005, 111, 1],
     [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
-    [ "Secret Mansherry", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, null ],
-    [ "Secret Mansherry, Evolved", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, null ],
+    [ "Mansherry, February's Favorite", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, 1 ],
+    [ "Mansherry, March's Courage", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, 1 ],
     [ "Shogun Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, 1550, 736, 102, 1 ],
     [ "Iron Pirate General Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, 1487, 667, 67, 3330, 1400, 181, 1 ],
     [ "Hody Jones, New Fishman Pirates Captain", "INT", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 700, 240, 10, 1976, 789, 95, 1 ],
@@ -1453,15 +1453,16 @@ window.units = [
     [ "Sanji, Escort of a Nearby Town", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, 2030, 1203, 208, 1 ],
     [ "Valentines Marguerite", "STR", [ "Shooter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Valentines Marguerite, Evolved", "STR", [ "Shooter", "Free Spirit" ], 5, 20, 5, 4, 99, 3000000, null, null, null, 1755, 1081, 348, null ],
-    [ "Coliseum Chinjao", "PSY", [ "Striker", "Powerhouse" ], 4, 25, 5, 2, 70, 1066998, 613, 321, 24, null, null, null, null ],
-    [ "Coliseum Chinjao, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, 7, 3, 99, 4000000, 1177, 576, 77, 2707, 1367, 212, null ],
-    [ "Coliseum Kuro", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, 392109, null, null, null, 892, 557, 187, null ],
-    [ "Coliseum Kuro, Evolved", "INT", [ "Slasher", "Cerebral" ], 4, 26, 10, 3, 99, 3000000, null, null, null, 1664, 1299, 310, null ],
-    [ "Coliseum Miss Valentine", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 92, 49, 26, 755, 390, 148, null ],
-    [ "Coliseum Miss Valentine, Evolved", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1778330, 687, 319, 90, null, null, null, null ],
-    [ "Probably Winter Zoro", "QCK", [ "Slasher", "Driven" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Valentines Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Valentines Luffy, Evolved", "PSY", [ "Fighter", "Free Spirit" ], 5, null, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Don Chinjao, Happo Navy", "PSY", [ "Striker", "Powerhouse" ], 4, 25, 5, 2, 70, 1066998, 613, 321, 24, 1249, 660, 134, 1 ],
+    [ "Don Chinjao, Happo Navy's 12th Leader", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, 7, 3, 99, 4000000, 1177, 576, 77, 2707, 1367, 212, 1 ],
+    [ "Klahadore the Butler", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, 392109, 109, 109, 30, 892, 557, 187, 1 ],
+    [ "Pirate Kuro of a Hundred Plans", "INT", [ "Slasher", "Cerebral" ], 4, 26, 10, 3, 99, 3000000, 805, 489, 131, 1664, 1299, 310, 1 ],
+    [ "Miss Valentine, Kilo Kilo Devil Fruit User", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 92, 49, 26, 755, 390, 148, 1 ],
+    [ "Miss Valentine, Baroque Works Officer Agent", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1778330, 687, 319, 90, 1402, 774, 250, 1 ],
+    [ "Winter Zoro", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 2000000, 111, 49, 22, 2303, 919, 244, null ],
+    [ "Valentines Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 132, 94, 26 , null, null, null, null ],
+    [ "Valentines Luffy, Evolved", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 8, 3, 99, 4000000, null, null, null, 2051, 1138, 276, null ],
+    [ "6+ Sabo - This is 100% a placeholder", "PSY", [ "Striker", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1500, 800, 250, 3000, 1500, 500, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 3377b31d150486dfc4aafe86b8ab52a996d7aaa4 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Mon, 20 Feb 2017 11:57:11 -0500
Subject: [PATCH 0903/1569] New FN units, Cavendish and Chopper

---
 common/data/aliases.js    | 14 +++++++++++---
 common/data/captains.js   |  6 +++++-
 common/data/cooldowns.js  |  2 ++
 common/data/details.js    | 28 ++++++++++++++++++++--------
 common/data/drops.js      |  9 +++++----
 common/data/evolutions.js | 18 +++++++++++++++---
 common/data/flags.js      | 19 ++++++++++++++++++-
 common/data/gw.js         |  2 ++
 common/data/specials.js   |  2 +-
 common/data/units.js      | 14 +++++++++++---
 10 files changed, 90 insertions(+), 24 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9be32140c..cd87b4824 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1459,7 +1459,15 @@ window.aliases = {
     1458: ['百計のクロ 海賊', '', 'Coliseum Kuro'],
     1459: ['ミス・バレンタイン キロキロの実の能力者', '', 'Coliseum Miss Valentine'],
     1460: ['ミス・バレンタイン Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Miss Valentine'],
-    1461: ['', '', 'Winter Zoro'],
-    1462: ['', '', 'Valentine Luffy'],
-    1463: ['', '', 'Valentine Luffy'],
+    1461: ['ゾロの寒稽古', '', 'Winter Zoro'],
+    1462: ['ルフィのブレイクタイム', '', 'Valentine Luffy'],
+    1463: ['ルフィのティーパーティ', '', 'Valentine Luffy'],
+    1464: ['', '', 'Valentine Chopper'],
+    1465: ['', '', 'Valentine Chopper'],
+    1466: ['', '', 'Valentine Cavendish'],
+    1467: ['', '', 'Valentine Cavendish'],
+    1468: ['', '', ''],
+    1469: ['', '', ''],
+    1470: ['', '', ''],
+    1471: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 63e554acb..c07326815 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4144,7 +4144,11 @@ window.captains = {
     1463: {
         chainModifier: function(p) { return 2.5; }
     },
-    1464: {//CHANGE THIS IF THIS ISN'T SABO
+    1464: {
+        atk: function(p) { return 1.25; },
+        rcv: function(p) { return 1.25; }
+    },
+    1472: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
         hp: function(p) { return 1.2; },
         rcv: function(p) { return 1.2; }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a6453dc53..8bce7fbc5 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1462,4 +1462,6 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 21, 17 ],
     [ 21, 17 ],
+    [ 11, 7 ],
+    [ 11, 7 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index fa6c9f816..fa706a13e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5066,13 +5066,13 @@ window.details = {
     1046: {
         captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1047: {
         captain: "Boosts ATK of Free Spirit characters by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1048: {
@@ -5782,13 +5782,13 @@ window.details = {
     },
     1158: {
         captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
-        special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
+        special: "Cuts the current HP of all enemies by 20%. Strongly poisons one enemy, and poisons all other enemies.",
         specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
         specialName: "Poison Puffer Fish"
     },
     1159: {
         captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
-        special: "Cuts the current HP of all enemys by 20%. Strongly poisons one enemy, and poisons all other enemies.",
+        special: "Cuts the current HP of all enemies by 20%. Strongly poisons one enemy, and poisons all other enemies.",
         specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
         specialName: "Poison Puffer Fish"
     },
@@ -6070,12 +6070,12 @@ window.details = {
     1204: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.2x",
         specialName: "Awakening Tune Power",
-        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [QCK] and [TND] into [PSY] orbs"
+        special: "Deals 500 fixed damage to all enemies, changes [RCV] orbs into [QCK] and [TND] into [PSY] orbs"
     },
     1205: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         specialName: "Awakening Tune Power",
-        special: "Deals 500 fixed damage to each Enemy, changes [RCV] orbs into [QCK] and [TND] into [PSY] orbs"
+        special: "Deals 500 fixed damage to all enemies, changes [RCV] orbs into [QCK] and [TND] into [PSY] orbs"
     },
     1206: {
         captain: "Boosts HP by 1.3x",
@@ -7128,7 +7128,7 @@ window.details = {
         specialName: "Tsubami Behemoth",
     },
     1348: {//Humandrills
-        special: "Boosts ATK of all characters by 1.2x for 1 turn and amplifies the effect of orbs by 1.2x for 1 turn",
+        special: "Boosts ATK of all characters by 1.2x for 2 turns and amplifies the effect of orbs by 1.2x for 2 turns",
         specialName: "Imitation Tactics",
     },
     1349: {//Haredas
@@ -7939,7 +7939,19 @@ window.details = {
         sailor: "Reduces Paralysis for 2 turns for himself",
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
-    1464: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
+    1463: {//Valentines Day Chopper
+        captain: "Protects from defeat as long as HP is above ???%",
+        captainNotes: "#{zombie}",
+        special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 3 turns",
+        specialName: "Devoted Healing - \"Instant Recovery\"",
+    },
+    1464: {//Valentines Day Chopper
+        captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above ???%",
+        captainNotes: "#{zombie}",
+        special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 3 turns",
+        specialName: "Devoted Healing - \"Instant Recovery\"",
+    },
+    1472: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
         captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
         captainNotes: "THIS IS ALL A PLACEHOLDER",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index f4277cae5..c980ade0b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -571,6 +571,7 @@ window.drops = {
             name: "3D2Y - Timeskip Training",
             shortName: "3D2Y",
             thumb: 1353,
+            global: true,
             completion: '5x Rainbow Gems',
             "01": [ 1342 ],
             "02": [ 1343 ],
@@ -1315,9 +1316,9 @@ window.drops = {
         
         {
             name: "Sentomaru's Rampage! Stop the Rookies!",
-            thumb: null,
-            //condition: "You can only bring STR units",
-            "All Difficulties": [ -1268, -1322, -1228, -906, -914, -310, -1061 ]
+            thumb: 1469,
+            condition: "You can only bring QCK units",
+            "All Difficulties": [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470 ]
         },
         
     ],
@@ -1556,7 +1557,7 @@ window.drops = {
             name: 'Valentines Day Characters',
             thumb: 1463,
             "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Chopper": [  ],
+            "Chopper": [ 1464, 1155, 354, 728, 1061, 83, 94, 115, 116, 117, 266, 1180, 109, 114, 193, 346 ],
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ca0e375c8..153c9b6aa 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2245,18 +2245,30 @@ window.evolutions = {
     },
     1455: {
         evolution: 1456,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 98, 303, 103 ]
     },
     1457: {
         evolution: 1458,
-        evolvers: [  ]
+        evolvers: [ 83, 85, 88, 96, 99 ]
     },
     1459: {
         evolution: 1460,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 89, 95 ]
     },
     1462: {
         evolution: 1463,
         evolvers: [  ]
     },
+    1464: {
+        evolution: 1465,
+        evolvers: [  ]
+    },
+    1466: {
+        evolution: 1467,
+        evolvers: [  ]
+    },
+    1468: {
+        evolution: 1469,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index f1928e5f2..1dee2ee4d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -993,7 +993,7 @@ window.flags = {
     1014: { global: 1 },
     1020: { rr: 1, rro: 1, lrr: 1 },
     1021: { rr: 1, rro: 1, lrr: 1 },
-    1022: { promo: 1 },
+    1022: { promo: 1, global: 1 },
     1024: { rr: 1, rro: 1, global: 1 },
     1025: { rr: 1, rro: 1, global: 1 },
     1026: { rr: 1, rro: 1, global: 1 },
@@ -1208,6 +1208,18 @@ window.flags = {
     1324: { rr: 1, rro: 1 },
     1335: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1336: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1342: { global: 1 },
+    1343: { global: 1 },
+    1344: { global: 1 },
+    1345: { global: 1 },
+    1346: { global: 1 },
+    1347: { global: 1 },
+    1348: { global: 1 },
+    1349: { global: 1 },
+    1350: { global: 1 },
+    1351: { global: 1 },
+    1352: { global: 1 },
+    1353: { global: 1 },
     1354: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1355: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1360: { promo: 1 },
@@ -1225,6 +1237,9 @@ window.flags = {
     1372: { shop: 1 },
     1381: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1382: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1387: { global: 1 },
+    1388: { global: 1 },
+    1389: { global: 1 },
     1390: { rr: 1, rro: 1 },
     1391: { rr: 1, rro: 1 },
     1394: { rr: 1, rro: 1, lrr: 1, },
@@ -1261,4 +1276,6 @@ window.flags = {
     1453: { rr: 1, rro: 1, lrr: 1, },
     1454: { rr: 1, rro: 1, lrr: 1, },
     1461: { special: 1 },
+    1466: { rr: 1, rro: 1, lrr: 1 },
+    1467: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 0b77018c1..12f68480c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1462,4 +1462,6 @@ window.gw=[
     51590,
     51594,
     51594,
+    51897,
+    51897,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 6d5b7473d..adb077ca9 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2134,7 +2134,7 @@ window.specials = {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"
     },
-    1464: {//CHANGE THIS IF THIS ISN'T SABO
+    1472: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1464].multiplier; },
         type: "class",
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 379564d86..f1da1234c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1459,9 +1459,17 @@ window.units = [
     [ "Pirate Kuro of a Hundred Plans", "INT", [ "Slasher", "Cerebral" ], 4, 26, 10, 3, 99, 3000000, 805, 489, 131, 1664, 1299, 310, 1 ],
     [ "Miss Valentine, Kilo Kilo Devil Fruit User", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 92, 49, 26, 755, 390, 148, 1 ],
     [ "Miss Valentine, Baroque Works Officer Agent", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1778330, 687, 319, 90, 1402, 774, 250, 1 ],
-    [ "Winter Zoro", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 2000000, 111, 49, 22, 2303, 919, 244, null ],
-    [ "Valentines Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 132, 94, 26 , null, null, null, null ],
-    [ "Valentines Luffy, Evolved", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 8, 3, 99, 4000000, null, null, null, 2051, 1138, 276, null ],
+    [ "Zoro's Winter Training", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 2000000, 111, 49, 22, 2303, 919, 244, 1 ],
+    [ "Break Time Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 132, 94, 26, 968, 505, 146, 1 ],
+    [ "Luffy's Tea Party", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 8, 3, 99, 3000000, 881, 409, 98, 2051, 1138, 276, 1 ],
+    [ "Break Time Chopper", "INT", [ "Shooter", "Powerhouse" ], 4, 12, 6, 2, 50, 392109, 121, 76, 44, 920, 401, 197, null ],
+    [ "Chopper's Tea Party", "INT", [ "Shooter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 841, 315, 150, 1906, 999, 347, null ],
+    [ "Valentines Cavendish", "PSY", [ "Slasher", "Driven" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Valentines Cavendish, Evolved", "PSY", [ "Slasher", "Driven" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Sentomaru", "STR", [ "Fighter", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Sentomaru, Evolved", "STR", [ "Striker", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Lip Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "6+ Sabo - This is 100% a placeholder", "PSY", [ "Striker", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1500, 800, 250, 3000, 1500, 500, null ],
     ];
     

From 78c0222782fb95ed7bff6ce9c9c489321606d3a4 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Mon, 20 Feb 2017 11:57:46 -0500
Subject: [PATCH 0904/1569] Chopper

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fa706a13e..f7bb21e77 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7939,13 +7939,13 @@ window.details = {
         sailor: "Reduces Paralysis for 2 turns for himself",
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
-    1463: {//Valentines Day Chopper
+    1464: {//Valentines Day Chopper
         captain: "Protects from defeat as long as HP is above ???%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 3 turns",
         specialName: "Devoted Healing - \"Instant Recovery\"",
     },
-    1464: {//Valentines Day Chopper
+    1465: {//Valentines Day Chopper
         captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above ???%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 3 turns",

From 87efae91a9c98f447db69482bc6c1683d374628e Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Mon, 20 Feb 2017 11:59:01 -0500
Subject: [PATCH 0905/1569] Lapin drop on Chopper

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index c980ade0b..0dbf9afeb 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1557,7 +1557,7 @@ window.drops = {
             name: 'Valentines Day Characters',
             thumb: 1463,
             "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Chopper": [ 1464, 1155, 354, 728, 1061, 83, 94, 115, 116, 117, 266, 1180, 109, 114, 193, 346 ],
+            "Chopper": [ 1464, 1155, 334, 728, 1061, 83, 94, 115, 116, 117, 266, 1180, 109, 114, 193, 346 ],
         },
         
         {

From b0011db0511a247faa3f3b6fe664016ed3654829 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Mon, 20 Feb 2017 23:41:36 +0100
Subject: [PATCH 0906/1569] G orbs on Sakazuki's long press

G orbs are no longer appearing on long press (mobile, basically), my bad
---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 6ef61f615..79419549b 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -608,7 +608,7 @@ directives.unitOrb = function($rootScope) {
 							var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
 							var n = ORBS.indexOf(tunit.orb);
 							if(unit.unit.type == "STR" || unit.unit.type == "DEX")
-								tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() || $rootScope.areSTROrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
+								tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
 							else
 								tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
 							scope.glow();

From b7ee94db11be6a33df7928019ac5d7583b740338 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 21 Feb 2017 02:50:02 -0600
Subject: [PATCH 0907/1569] New units updated, 6+ Sabo fix

---
 common/data/details.js  | 40 ++++++++++++++++++++++++++++++++++++++--
 common/data/specials.js |  6 +++---
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f7bb21e77..2e8230784 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7942,15 +7942,51 @@ window.details = {
     1464: {//Valentines Day Chopper
         captain: "Protects from defeat as long as HP is above ???%",
         captainNotes: "#{zombie}",
-        special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 3 turns",
+        special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
+        sailor: "Boosts amount healed from [RCV] orbs by 100 each",
         specialName: "Devoted Healing - \"Instant Recovery\"",
     },
     1465: {//Valentines Day Chopper
         captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above ???%",
         captainNotes: "#{zombie}",
-        special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 3 turns",
+        special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
+        sailor: "Boosts amount healed from [RCV] orbs by 100 each",
         specialName: "Devoted Healing - \"Instant Recovery\"",
     },
+    1466: {//Secret Cavendish
+        captain: "Boosts ATK of [QCK] and [PSY] characters by 2x",
+        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [STR] and friend captain's orb into [PSY]",
+        specialName: "Cavendish Special",
+    },
+    1467: {//Secret Cavendish
+        captain: "Boosts ATK of [QCK] and [PSY] characters by 2.25x and their RCV by 1.3x",
+        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [STR] and friend captain's orb into [PSY]",
+        specialName: "Cavendish Special",
+    },
+    1468: {//Fortnight Sentomaru 
+        captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
+        captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
+        special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
+        specialName: "Sentomaru Special",
+    },
+    1469: {//Fortnight Sentomaru Evolved
+        captain: "Boosts ATK of [STR] characters by 2x and the HP of Powerhouse characters by 1.25x",
+        captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
+        special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
+        specialName: "Sentomaru Special",
+    },
+    1470: {//Lip Service Doughty
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 1.5x, but boost his OWN ATK by 3x",
+        captainNotes: "Captain ability does not stack with itself (Will not boost another Doughty by 3x)",
+        special: "Deals 8x character's ATK as [STR] damage to one enemy. Changes captain orb into [RCV]",
+        specialName: "Lip Service Doughty Special",
+    },
+    1471: {//Albion
+        captain: "Boosts ATK of Slasher and Driven characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : lower : 1 + 1 * (1 - (remaining HP) / (total HP)) : 1 : 2}",
+        special: "Reduces crew's HP by 90%, deals 1x the removed HP as damage to all enemies.",
+        specialName: "Albion Special",
+    },
     1472: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
         captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
         captainNotes: "THIS IS ALL A PLACEHOLDER",
diff --git a/common/data/specials.js b/common/data/specials.js
index 9c0d19b32..a1fd999eb 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2153,11 +2153,11 @@ window.specials = {
         type: "condition"
     },
     1472: {//CHANGE THIS IF THIS ISN'T SABO
-        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1464].multiplier; },
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1472].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1464].multiplier == 1.5 ? 1 : window.specials[1464].multiplier == 1.75 ? 2 : 0);
-            window.specials[1464].multiplier = [1.5, 1.75, 2][n];
+            var n = (window.specials[1472].multiplier == 1.5 ? 1 : window.specials[1472].multiplier == 1.75 ? 2 : 0);
+            window.specials[1472].multiplier = [1.5, 1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [1.75, 2, 1.5][n] + 'x multiplier, disable and re-enable this special',
                 name: '1464warning'

From 6bf8400d281c5adf55310f0b88053e1cea8ed532 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 21 Feb 2017 21:40:17 -0500
Subject: [PATCH 0908/1569] Sentomaru and Lip Service... wait Reddit? is that
 you?

New units stats
---
 common/data/captains.js  | 25 ++++++++++++++++++++++++-
 common/data/cooldowns.js | 12 ++++++++++--
 common/data/drops.js     |  6 +++---
 common/data/gw.js        |  6 ++++++
 common/data/units.js     |  8 ++++----
 5 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index be41d1332..5de3974aa 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4146,10 +4146,33 @@ window.captains = {
     1463: {
         chainModifier: function(p) { return 2.5; }
     },
-    1464: {
+    1465: {
         atk: function(p) { return 1.25; },
         rcv: function(p) { return 1.25; }
     },
+    1466: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 2 : 1; },
+    },
+    1467: {
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.3 : 1; },
+    },
+    1468: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1469: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+    },
+    1470: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 3 : p.unit.class.has("Powerhouse") || p.unit.class.has("Slasher") ? 1.5 : 1; }  
+    },
+    1471: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? 1 + 1 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
     1472: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
         hp: function(p) { return 1.2; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8bce7fbc5..c874f531a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1059,7 +1059,7 @@ window.cooldowns = [
     [ 17, 12 ],
     15,
     15,
-    10,
+    [ 10, 5 ],
     [ 21, 15 ],
     20,
     28,
@@ -1226,7 +1226,7 @@ window.cooldowns = [
     16,
     [ 17, 10 ],
     [ 23, 16 ],
-    22,
+    [ 22, 15 ],
     [ 22, 15 ],//Sentomaru
     [ 22, 15 ],//Sentomaru
     [ 19, 12 ],
@@ -1464,4 +1464,12 @@ window.cooldowns = [
     [ 21, 17 ],
     [ 11, 7 ],
     [ 11, 7 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    [ 22, 15 ],
+    [ 18, 11 ],
+    [ 18, 11 ],
+    [ 17, 10 ],
+    [ 14, 5 ],
+    null,//6+ Sabo
 ];
diff --git a/common/data/drops.js b/common/data/drops.js
index 0dbf9afeb..1f90bc480 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1301,21 +1301,21 @@ window.drops = {
         },
         
         {
-            name: "Happo Navy! The 13th Leader Appears!",
+            name: "Chinjao Family! The 13th Leader Appears!",
             thumb: 1426,
             condition: "You can only bring DEX units",
             "All Difficulties": [ 1425, 1427, 1428, -1240, -1272, -1270, -1227, -1224, -872, -878, -255, -812 ]
         },
         
         {
-            name: "Protect Violet-Chan!!",
+            name: "Fugitive of Love and Passion!!",
             thumb: 1450,
             condition: "You can only bring STR units",
             "All Difficulties": [ 1449, 1451, -935, -1278, -1318, -1324, -880, -876, -259, -1226, -814 ]
         },
         
         {
-            name: "Sentomaru's Rampage! Stop the Rookies!",
+            name: "Gatekeeper of the New World! Stop the Rookies!",
             thumb: 1469,
             condition: "You can only bring QCK units",
             "All Difficulties": [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470 ]
diff --git a/common/data/gw.js b/common/data/gw.js
index 12f68480c..9aa157197 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1464,4 +1464,10 @@ window.gw=[
     51594,
     51897,
     51897,
+    51932,
+    51932,
+    51929,
+    51929,
+    51928,
+    51927,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f1da1234c..4c2b13f50 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1466,10 +1466,10 @@ window.units = [
     [ "Chopper's Tea Party", "INT", [ "Shooter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 841, 315, 150, 1906, 999, 347, null ],
     [ "Valentines Cavendish", "PSY", [ "Slasher", "Driven" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Valentines Cavendish, Evolved", "PSY", [ "Slasher", "Driven" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Sentomaru", "STR", [ "Fighter", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Sentomaru, Evolved", "STR", [ "Striker", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Lip Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Sentomaru", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 95, 45, 21, 1055, 595, 101, null ],
+    [ "Fortnight Sentomaru, Evolved", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, null ],
+    [ "'Lip Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, null ],
+    [ "Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, null ],
     [ "6+ Sabo - This is 100% a placeholder", "PSY", [ "Striker", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1500, 800, 250, 3000, 1500, 500, null ],
     ];
     

From b9d476f7d4f2714b30120eca57703e7526e6d02d Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sat, 25 Feb 2017 01:01:12 -0500
Subject: [PATCH 0909/1569] Big stuff

Fixes and New Batches of RR and Colo
---
 common/data/aliases.js    | 36 ++++++++++++++++++++++-------
 common/data/captains.js   |  2 +-
 common/data/cooldowns.js  | 19 +++++++++++++++-
 common/data/details.js    | 18 +++++++--------
 common/data/drops.js      | 14 +++++++-----
 common/data/evolutions.js | 44 +++++++++++++++++++++++++++++++----
 common/data/families.js   | 28 +++++++++++++++++++++++
 common/data/flags.js      | 48 ++++++++++++++++++++++++++++-----------
 common/data/gw.js         | 21 +++++++++++++++++
 common/data/specials.js   | 10 ++++----
 common/data/units.js      | 38 +++++++++++++++++++++++--------
 11 files changed, 222 insertions(+), 56 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index cd87b4824..2995b69c0 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1451,8 +1451,8 @@ window.aliases = {
     1450: ['ヴァイオレット 追われる女', '', ''],
     1451: ['サンジ 恋人通りの変装男', '', ''],
     1452: ['サンジ となり町までの護衛', '', ''],
-    1453: ['', '', ''],
-    1454: ['', '', ''],
+    1453: ['マーガレット １３日の胸騒ぎ', '', 'Valentine Marguerite'],
+    1454: ['マーガレット １４日の記念日', '', 'Valentine Marguerite'],
     1455: ['首領・チンジャオ 八宝水軍', '', 'Coliseum Don Chinjao'],
     1456: ['首領・チンジャオ 元八宝水軍第１２代棟梁', '', 'Coliseum Don Chinjao'],
     1457: ['クラハドール 執事', '', 'Coliseum Kuro'],
@@ -1462,12 +1462,32 @@ window.aliases = {
     1461: ['ゾロの寒稽古', '', 'Winter Zoro'],
     1462: ['ルフィのブレイクタイム', '', 'Valentine Luffy'],
     1463: ['ルフィのティーパーティ', '', 'Valentine Luffy'],
-    1464: ['', '', 'Valentine Chopper'],
-    1465: ['', '', 'Valentine Chopper'],
+    1464: ['チョッパーのブレイクタイム', '', 'Valentine Chopper'],
+    1465: ['チョッパーのティーパーティ', '', 'Valentine Chopper'],
     1466: ['', '', 'Valentine Cavendish'],
     1467: ['', '', 'Valentine Cavendish'],
-    1468: ['', '', ''],
-    1469: ['', '', ''],
-    1470: ['', '', ''],
-    1471: ['', '', ''],
+    1468: ['戦桃丸 海兵', '', ''],
+    1469: ['鉞の戦桃丸 海兵', '', ''],
+    1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service'],
+    1471: ['深手の・アルビオン', '', ''],
+    1472: ['', '', ''],
+    1473: ['', '', ''],
+    1474: ['', '', ''],
+    1475: ['', '', ''],
+    1476: ['', '', ''],
+    1477: ['', '', ''],
+    1478: ['', '', ''],
+    1479: ['', '', ''],
+    1480: ['', '', ''],
+    1481: ['', '', ''],
+    1482: ['', '', ''],
+    1483: ['', '', ''],
+    1484: ['', '', ''],
+    1485: ['', '', 'Coliseum Ideo'],
+    1486: ['', '', 'Coliseum Ideo'],
+    1487: ['', '', 'Coliseum Don Krieg'],
+    1488: ['', '', 'Coliseum Don Krieg'],
+    1489: ['', '', 'Coliseum Mr. 5'],
+    1490: ['', '', 'Coliseum Mr. 5'],
+    1491: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 5de3974aa..ec248e5cf 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4173,7 +4173,7 @@ window.captains = {
             return p.unit.class.has("Slasher") ? 1 + 1 * ((100 - p.percHP) / 100) : 1;
         }
     },
-    1472: {//CHANGE THIS IF THIS ISN'T SABO
+    1492: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
         hp: function(p) { return 1.2; },
         rcv: function(p) { return 1.2; }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c874f531a..163456ccc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1466,10 +1466,27 @@ window.cooldowns = [
     [ 11, 7 ],
     [ 15, 15 ],
     [ 15, 15 ],
-    [ 22, 15 ],
     [ 18, 11 ],
     [ 18, 11 ],
     [ 17, 10 ],
     [ 14, 5 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
     null,//6+ Sabo
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 2e8230784..c7de8fd91 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4158,13 +4158,13 @@ window.details = {
     900: {
         captain: "Boosts ATK of Shooter characters by 2x if HP is above 99% at the start of the turn",
         specialName: "Franky Destroy Gun",
-        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes Badly Matching orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
         specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
     },
     901: {
         captain: "Boosts ATK of Shooter characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "Franky Destroy Gun",
-        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes opposite orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes Badly Matching orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
         specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
     },
     902: {
@@ -4275,12 +4275,12 @@ window.details = {
     913: {
         captain: "Boosts ATK of QCK characters by 2.5x if they have a matching orb",
         specialName: "Black Magic Summoning: Advent of the Demon Lord Satan",
-        special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes opposite orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
+        special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes Badly Matching orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
     },
     914: {
         captain: "Boosts ATK of QCK characters by 3x if they have a matching orb, by 1.2x otherwise",
         specialName: "Black Magic Summoning: Advent of the Demon Lord Satan",
-        special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes opposite orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
+        special: "Seals himself for 1 turn, changes [BLOCK] orbs into matching orbs, randomly changes Badly Matching orbs into either [STR], [QCK], [DEX], [PSY] or [INT] orbs"
     },
     915: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
@@ -7967,27 +7967,27 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
         special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
-        specialName: "Sentomaru Special",
+        specialName: "Warning of the New World",
     },
     1469: {//Fortnight Sentomaru Evolved
         captain: "Boosts ATK of [STR] characters by 2x and the HP of Powerhouse characters by 1.25x",
         captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
         special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
-        specialName: "Sentomaru Special",
+        specialName: "Warning of the New World",
     },
     1470: {//Lip Service Doughty
         captain: "Boosts ATK of Slasher and Powerhouse characters by 1.5x, but boost his OWN ATK by 3x",
         captainNotes: "Captain ability does not stack with itself (Will not boost another Doughty by 3x)",
         special: "Deals 8x character's ATK as [STR] damage to one enemy. Changes captain orb into [RCV]",
-        specialName: "Lip Service Doughty Special",
+        specialName: "Meat Grinder Blade",
     },
     1471: {//Albion
         captain: "Boosts ATK of Slasher and Driven characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1 + 1 * (1 - (remaining HP) / (total HP)) : 1 : 2}",
         special: "Reduces crew's HP by 90%, deals 1x the removed HP as damage to all enemies.",
-        specialName: "Albion Special",
+        specialName: "Deep Claw Stab",
     },
-    1472: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
+    1492: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
         captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
         captainNotes: "THIS IS ALL A PLACEHOLDER",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index 1f90bc480..3f659e36e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1173,6 +1173,7 @@ window.drops = {
         {
             name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
             thumb: 1049,
+            global: true,
             condition: "Only TND/RCV/INT orbs will appear",
             "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908, -1210 ]
         },
@@ -1222,7 +1223,7 @@ window.drops = {
             name: "Rumbar Pirates!",
             thumb: 1203,
             condition: "'Musical' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)",
-            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -1207, -677, -896, -631, -954, -1206, -617, -1027 ]
+            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -558, -1208, -677, -896, -631, -954, -1206, -617, -1027 ]
         },
         
         {
@@ -1504,6 +1505,7 @@ window.drops = {
         {
             name: 'Clash!! Akainu',
             thumb: 1298,
+            global: true,
             Ultimate: [ 1297 ]
         },
         {
@@ -1557,7 +1559,7 @@ window.drops = {
             name: 'Valentines Day Characters',
             thumb: 1463,
             "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Chopper": [ 1464, 1155, 334, 728, 1061, 83, 94, 115, 116, 117, 266, 1180, 109, 114, 193, 346 ],
+            "Chopper": [ 1464, 1155, 333, 334, 728, 1061, 83, 94, 115, 116, 117, 266, 1180, 109, 114, 193, 346 ],
         },
         
         {
@@ -1570,9 +1572,9 @@ window.drops = {
             name: 'Coliseum',
             thumb: 779,
             global: true,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488 ]
         },
         
         {
@@ -1624,7 +1626,7 @@ window.drops = {
         
         {
             name: 'The Flashback Before the Reunion! Fight all your Enemies!',
-            thumb: null,
+            thumb: 1353,
             condition: "The fight gets more difficult every time you complete it until it gets to 40 stamina.",
             "Final Stage": [ 37, 38, 53, 55, 43, 36, 45, 57, 65, 203, 205, 383, 395, 397, 399, 401, 464, 465, 541, 545, 630, 632, 728, 730, 815, 889, 893, 973, 1055, 1057, 1158, 1156, 1227, 1228, 1280, 1283, 1353],
             "Evolvers and Boosters": [ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 115, 116, 117, 118, 266, 300, 301, 302, 303, 304, 1180, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 189, 190, 191, 192, 193, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351 ]
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 153c9b6aa..71acb7850 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1989,7 +1989,7 @@ window.evolutions = {
     },
     1307: {
         evolution: 1308,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 85, 301, 101 ]
     },
     1309: {
         evolution: 1310,
@@ -2241,7 +2241,7 @@ window.evolutions = {
     },
     1453: {
         evolution: 1454,
-        evolvers: [  ]
+        evolvers: [ 117, 83, 84, 89, 95 ]
     },
     1455: {
         evolution: 1456,
@@ -2257,11 +2257,11 @@ window.evolutions = {
     },
     1462: {
         evolution: 1463,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 81, 87, 98 ]
     },
     1464: {
         evolution: 1465,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 82, 88, 99 ]
     },
     1466: {
         evolution: 1467,
@@ -2269,6 +2269,42 @@ window.evolutions = {
     },
     1468: {
         evolution: 1469,
+        evolvers: [ 117, 78, 84, 89, 100 ]
+    },
+    1472: {
+        evolution: 1473,
+        evolvers: [  ]
+    },
+    1474: {
+        evolution: 1475,
+        evolvers: [  ]
+    },
+    1476: {
+        evolution: 1477,
+        evolvers: [  ]
+    },
+    1478: {
+        evolution: 1479,
+        evolvers: [  ]
+    },
+    1480: {
+        evolution: 1482,
+        evolvers: [  ]
+    },
+    1482: {
+        evolution: 1483,
+        evolvers: [  ]
+    },
+    1486: {
+        evolution: 1487,
+        evolvers: [  ]
+    },
+    1488: {
+        evolution: 1489,
+        evolvers: [  ]
+    },
+    1490: {
+        evolution: 1491,
         evolvers: [  ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index c2736022c..d58845ca5 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1462,5 +1462,33 @@ window.families = [
     "Roronoa Zoro",
     "Monkey D. Luffy",
     "Monkey D. Luffy",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Cavendish",
+    "Cavendish",
+    "Sentomaru",
+    "Sentomaru",
+    "Lip Service",
+    "Albion",
+    "Princess Shirahoshi",
+    "Princess Shirahoshi",
+    "King Neptune",
+    "King Neptune",
+    "Fukaboshi",
+    "Fukaboshi",
+    "Caribou",
+    "Caribou",
+    "Vander Decken IX",
+    "Vander Decken IX",
+    "Madame Shyarly",
+    "Madame Shyarly",
+    null,
+    null,
+    "Ideo",
+    "Ideo",
+    "Don Krieg",
+    "Don Krieg",
+    "Mr. 5",
+    "Mr. 5",
     "Sabo",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 1dee2ee4d..59c145879 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -574,7 +574,7 @@ window.flags = {
     573: { global: 1 },
     574: { global: 1 },
     575: { global: 1 },
-    576: { special: 1, shop: 1 },
+    576: { special: 1, shop: 1, global: 1 },
     577: { rr: 1, rro: 1, global: 1 },
     578: { rr: 1, rro: 1, global: 1 },
     579: { global: 1, rr: 1, rro: 1, lrr: 1 },
@@ -966,6 +966,9 @@ window.flags = {
     979: { global: 1 },
     980: { global: 1 },
     981: { global: 1 },
+    982: { global: 1 },
+    983: { global: 1 },
+    984: { global: 1 },
     990: { rr: 1, rro: 1, global: 1 },
     991: { rr: 1, rro: 1, global: 1 },
     992: { rr: 1, rro: 1, global: 1 },
@@ -1012,6 +1015,11 @@ window.flags = {
     1039: { global: 1 },
     1044: { rr: 1, rro: 1, global: 1 },
     1045: { rr: 1, rro: 1, global: 1 },
+    1048: { global: 1 },
+    1049: { global: 1 },
+    1050: { global: 1 },
+    1051: { global: 1 },
+    1052: { global: 1 },
     1053: { rr: 1, rro: 1, lrr: 1 },
     1054: { rr: 1, rro: 1, lrr: 1 },
     1055: { global: 1 },
@@ -1115,8 +1123,8 @@ window.flags = {
     1175: { rr: 1, rro: 1, global: 1 },
     1176: { rr: 1, rro: 1, global: 1 },
     1177: { rr: 1, rro: 1, global: 1 },
-    1178: { shop: 1 },
-    1179: { shop: 1 },
+    1178: { shop: 1, global: 1 },
+    1179: { shop: 1, global: 1 },
     1180: { global: 1 },
     1181: { rr: 1, rro: 1, global: 1 },
     1182: { rr: 1, rro: 1, global: 1 },
@@ -1192,6 +1200,8 @@ window.flags = {
     1285: { shop: 1 },
     1295: { rr: 1, rro: 1, lrr: 1 },
     1296: { rr: 1, rro: 1, lrr: 1 },
+    1297: { global: 1 },
+    1298: { global: 1 },
     1307: { rr: 1, rro: 1, lrr: 1 },
     1308: { rr: 1, rro: 1, lrr: 1 },
     1313: { rr: 1, rro: 1 },
@@ -1225,14 +1235,14 @@ window.flags = {
     1360: { promo: 1 },
     1361: { rr: 1, rro: 1 },
     1362: { rr: 1, rro: 1 },
-    1363: { rr: 1, rro: 1 },
-    1364: { rr: 1, rro: 1 },
-    1365: { rr: 1, rro: 1 },
-    1366: { rr: 1, rro: 1 },
-    1367: { rr: 1, rro: 1 },
-    1368: { rr: 1, rro: 1 },
-    1369: { rr: 1, rro: 1 },
-    1370: { rr: 1, rro: 1 },
+    1363: { rr: 1, rro: 1, global: 1 },
+    1364: { rr: 1, rro: 1, global: 1 },
+    1365: { rr: 1, rro: 1, global: 1 },
+    1366: { rr: 1, rro: 1, global: 1 },
+    1367: { rr: 1, rro: 1, global: 1 },
+    1368: { rr: 1, rro: 1, global: 1 },
+    1369: { rr: 1, rro: 1, global: 1 },
+    1370: { rr: 1, rro: 1, global: 1 },
     1371: { shop: 1 },
     1372: { shop: 1 },
     1381: { rr: 1, rro: 1, lrr: 1, global: 1 },
@@ -1244,8 +1254,8 @@ window.flags = {
     1391: { rr: 1, rro: 1 },
     1394: { rr: 1, rro: 1, lrr: 1, },
     1395: { rr: 1, rro: 1, lrr: 1, },
-    1403: { rr: 1, rro: 1 },
-    1404: { rr: 1, rro: 1 },
+    1403: { rr: 1, rro: 1, global: 1 },
+    1404: { rr: 1, rro: 1, global: 1 },
     1405: { rr: 1, rro: 1 },
     1406: { rr: 1, rro: 1 },
     1407: { rr: 1, rro: 1 },
@@ -1278,4 +1288,16 @@ window.flags = {
     1461: { special: 1 },
     1466: { rr: 1, rro: 1, lrr: 1 },
     1467: { rr: 1, rro: 1, lrr: 1 },
+    1472: { rr: 1, rro: 1 },
+    1473: { rr: 1, rro: 1 },
+    1474: { rr: 1, rro: 1 },
+    1475: { rr: 1, rro: 1 },
+    1476: { rr: 1, rro: 1 },
+    1477: { rr: 1, rro: 1 },
+    1478: { rr: 1, rro: 1 },
+    1479: { rr: 1, rro: 1 },
+    1480: { rr: 1, rro: 1 },
+    1481: { rr: 1, rro: 1 },
+    1482: { rr: 1, rro: 1 },
+    1483: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 9aa157197..1f1ed4d55 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1470,4 +1470,25 @@ window.gw=[
     51929,
     51928,
     51927,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    15191,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index a1fd999eb..2fdc002b5 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2152,15 +2152,15 @@ window.specials = {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"
     },
-    1472: {//CHANGE THIS IF THIS ISN'T SABO
-        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1472].multiplier; },
+    1492: {//CHANGE THIS IF THIS ISN'T SABO
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1492].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1472].multiplier == 1.5 ? 1 : window.specials[1472].multiplier == 1.75 ? 2 : 0);
-            window.specials[1472].multiplier = [1.5, 1.75, 2][n];
+            var n = (window.specials[1492].multiplier == 1.5 ? 1 : window.specials[1492].multiplier == 1.75 ? 2 : 0);
+            window.specials[1492].multiplier = [1.5, 1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [1.75, 2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1464warning'
+                name: '1492warning'
             });
         }
     },
diff --git a/common/data/units.js b/common/data/units.js
index 4c2b13f50..a98836f78 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1058,7 +1058,7 @@ window.units = [
     [ "Boa Marigold", "STR", [ "Striker" ], 3, 12, 5, 1, 50, 392109, 183, 40, 31, 1062, 517, 158, 1 ],
     [ "Boa Marigold, Kuja Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 1003, 470, 110, 1892, 947, 284, 1 ],
     [ "Marguerite, Female Warrior", "PSY", [ "Shooter" ], 3, 9, 4, 1, 35, 136167, 136, 72, 62, 699, 401, 189, 1 ],
-    [ "Marguerite, Kuja Warriors", "PSY", [ "Shooter" ], 4, 15, 5, 2, 70, 1066998, 642, 339, 143, 1003, 713, 301, 1 ],
+    [ "Marguerite, Kuja Warrior", "PSY", [ "Shooter" ], 4, 15, 5, 2, 70, 1066998, 642, 339, 143, 1003, 713, 301, 1 ],
     [ "Kikyo", "QCK", [ "Shooter" ], 4, 14, 5, 2, 70, 1066998, 132, 94, 56, 999, 741, 262, 1 ],
     [ "Gloriosa", "INT", [ "Cerebral", "Fighter" ], 3, 14, 4, 2, 60, 674274, 586, 351, 79, 612, 378, 400, 1 ],
     [ "Destructive Archer, Kuja Warriors", "STR", [ "Shooter" ], 3, 10, 5, 1, 60, 674274, 62, 31, 40, 933, 574, 252, 1 ],
@@ -1451,8 +1451,8 @@ window.units = [
     [ "Violet, Chased Woman", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, 1594, 843, 403, 1 ],
     [ "Sanji, Disguised Man on a Road to Love", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 4, 2, 50, 392109, 103, 56, 23, 1023, 567, 103, 1 ],
     [ "Sanji, Escort of a Nearby Town", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 4, 3, 99, 3000000, 923, 543, 92, 2030, 1203, 208, 1 ],
-    [ "Valentines Marguerite", "STR", [ "Shooter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Valentines Marguerite, Evolved", "STR", [ "Shooter", "Free Spirit" ], 5, 20, 5, 4, 99, 3000000, null, null, null, 1755, 1081, 348, null ],
+    [ "Marguerite, Unrest on the 13th", "STR", [ "Shooter", "Free Spirit" ], 4, 13, 4, 2, 50, 392109, 44, 42, 50, 903, 452, 230, 1 ],
+    [ "Marguerite, Celebration of the 14th", "STR", [ "Shooter", "Free Spirit" ], 5, 20, 5, 4, 99, 3000000, 831, 377, 188, 1755, 1081, 348, 1 ],
     [ "Don Chinjao, Happo Navy", "PSY", [ "Striker", "Powerhouse" ], 4, 25, 5, 2, 70, 1066998, 613, 321, 24, 1249, 660, 134, 1 ],
     [ "Don Chinjao, Happo Navy's 12th Leader", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, 7, 3, 99, 4000000, 1177, 576, 77, 2707, 1367, 212, 1 ],
     [ "Klahadore the Butler", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, 392109, 109, 109, 30, 892, 557, 187, 1 ],
@@ -1462,14 +1462,34 @@ window.units = [
     [ "Zoro's Winter Training", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 2000000, 111, 49, 22, 2303, 919, 244, 1 ],
     [ "Break Time Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 132, 94, 26, 968, 505, 146, 1 ],
     [ "Luffy's Tea Party", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 8, 3, 99, 3000000, 881, 409, 98, 2051, 1138, 276, 1 ],
-    [ "Break Time Chopper", "INT", [ "Shooter", "Powerhouse" ], 4, 12, 6, 2, 50, 392109, 121, 76, 44, 920, 401, 197, null ],
-    [ "Chopper's Tea Party", "INT", [ "Shooter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 841, 315, 150, 1906, 999, 347, null ],
+    [ "Break Time Chopper", "INT", [ "Shooter", "Powerhouse" ], 4, 12, 6, 2, 50, 392109, 121, 76, 44, 920, 401, 197, 1 ],
+    [ "Chopper's Tea Party", "INT", [ "Shooter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 841, 315, 150, 1906, 999, 347, 1 ],
     [ "Valentines Cavendish", "PSY", [ "Slasher", "Driven" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Valentines Cavendish, Evolved", "PSY", [ "Slasher", "Driven" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Sentomaru", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 95, 45, 21, 1055, 595, 101, null ],
-    [ "Fortnight Sentomaru, Evolved", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, null ],
-    [ "'Lip Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, null ],
-    [ "Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, null ],
+    [ "Sentomaru, Navy HQ", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 95, 45, 21, 1055, 595, 101, 1 ],
+    [ "Sentomaru of the Axe, Navy HQ", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, 1 ],
+    [ "Lip 'Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
+    [ "'Gashed' Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
+    [ "Princess Shirahoshi", "PSY", "Striker", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fukaboshi, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caribou", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caribou, Evolved", "QCK", [ "Driven", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vander Decken IX, Evolved", "DEX", [ "Slasher", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Ideo", "DEX", [ "Shooter", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Ideo, Evolved", "DEX", [ "Shooter", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Don Krieg", "STR", [ "Driven", "Shooter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Don Krieg, Evolved", "STR", [ "Driven", "Shooter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Mr. 5", "QCK", "Shooter", 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Mr. 5, Evolved", "QCK", "Shooter", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "6+ Sabo - This is 100% a placeholder", "PSY", [ "Striker", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1500, 800, 250, 3000, 1500, 500, null ],
     ];
     

From 80f65341e7feeef46b7ba8a144bcceac476ccbf0 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sat, 25 Feb 2017 01:54:23 -0500
Subject: [PATCH 0910/1569] Hody Jones, ships, and Violet

---
 common/data/captains.js | 4 ++--
 common/data/details.js  | 4 ++--
 common/data/ships.js    | 9 ++++-----
 common/data/specials.js | 6 ++++++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index ec248e5cf..8060c2b2a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4006,13 +4006,13 @@ window.captains = {
         atk: function(p) { 
             return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.5 : p.classCount.Powerhouse==4 ? 1.4 : p.classCount.Powerhouse==3 ? 1.3 : p.classCount.Powerhouse==2 ? 1.2 : p.classCount.Powerhouse==1 ? 1.1 : 1 : 1; },
     },
     1434: {
         atk: function(p) { 
             return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.5 : p.classCount.Powerhouse==4 ? 1.4 : p.classCount.Powerhouse==3 ? 1.3 : p.classCount.Powerhouse==2 ? 1.2 : p.classCount.Powerhouse==1 ? 1.1 : 1 : 1; },
     },
     1435: {
         atk: function(p) { 
diff --git a/common/data/details.js b/common/data/details.js
index c7de8fd91..455fedf79 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7719,7 +7719,7 @@ window.details = {
     },
     1433: {//Hody Jones
         captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
-        captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew, however, we do not have any numbers for this yet, so he will only boost HP if there are 6 powerhouse units FOR NOW.",
+        captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
                 "description": "Deals 10x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
@@ -7734,7 +7734,7 @@ window.details = {
     },
     1434: {//Hody Jones
         captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
-        captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew, however, we do not have any numbers for this yet, so he will only boost HP if there are 6 powerhouse units FOR NOW.",
+        captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
                 "description": "Deals 10x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
diff --git a/common/data/ships.js b/common/data/ships.js
index 2a438156f..f701bd513 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -219,6 +219,7 @@ window.ships = [
     { // 17
         name: '2nd Anniversary Thousand Sunny',
         thumb: 'ship_0018_c1.png',
+        //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
         description: 'Boosts ATK by 1.2x.',
         atk: function(p) { return 1.2; },
     }, 
@@ -264,12 +265,10 @@ window.ships = [
     { // 21
         name: 'Burning Whitebeard Ship',
         thumb: 'ship_0022_c.png',
-        description: 'Boosts ATK by 1.5x and HP by 1.4x. Special: Cuts the current HP of each enemy by 20% (cooldown: 17 turns).',
-        atk: function(p) {
-            return 1.5;
-        },
+        //description: 'Boosts ATK by 1.5x and HP by 1.4x, reduces HP by 7% at the end of the turn. Special: Cuts the current HP of each enemy by 20% (cooldown: 18 turns).',
+        description: 'Boosts HP by 1.3x.',
         hp: function(p) {
-            return 1.4;
+            return 1.3;
         },
     },
     
diff --git a/common/data/specials.js b/common/data/specials.js
index 2fdc002b5..e1a39b066 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2144,6 +2144,12 @@ window.specials = {
             });
         }
     },
+    1449: {
+        def: function(p) { return 0.5; }
+    },
+    1450: {
+        def: function(p) { return 0.5; }
+    },
     1459: {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"

From 8e7077f6dba1f20b1fbad471ca7f256f1974cea4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 26 Feb 2017 15:20:07 -0500
Subject: [PATCH 0911/1569] Bastille temp special and Chain Boosters Fixed

---
 common/data/specials.js | 10 ++++++++++
 damage/js/cruncher.js   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index e1a39b066..09429d1f7 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1602,6 +1602,16 @@ window.specials = {
     1234: {//Tashigi
         affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
+    1237: {
+        //TODO
+        hit: function(n) { return n > 30 ? 2 : 1; },
+        type: "condition"
+    },
+    1238: {
+        //TODO
+        hit: function(n) { return n > 30 ? 2 : 1; },
+        type: "condition"
+    },
     1239: {
         turnedOn: false,
         onActivation: function(p) {
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index cce4d4e72..02a83c752 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -485,7 +485,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     chainModifier = Math.min(mapEffect.chainModifier(params[n]), chainModifier);
                 var chainMultiplier = getChainMultiplier(special.chain(params[n]), modifiers.slice(0,n), chainModifier);
                 //Add flat Multiplier Bonuses if they exist
-                if(addition>0.0)
+                if(addition>0.0 && chainMultiplier != 1.0)
                     chainMultiplier = chainMultiplier + addition;
                 if (mapEffect.hasOwnProperty('chainLimiter'))
                     chainMultiplier = Math.min(mapEffect.chainLimiter(params[n]), chainMultiplier);

From ef06895939b7a42271c0df0abfed59f3efa624d2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 26 Feb 2017 16:45:31 -0500
Subject: [PATCH 0912/1569] Sabo Special Fix and Koala Detail

---
 common/data/details.js | 4 ++--
 damage/js/cruncher.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 455fedf79..0e54c3b25 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6369,12 +6369,12 @@ window.details = {
     },
     1241: {//Fortnight Koala
         captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
-        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "Fishman Karate, Midair Upwards Kick",
     },
     1242: {//Fortnight Koala
         captain: "Boosts chain multiplier by 2x. Recovers 2x character's RCV in HP at the end of each turn",
-        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit a Good/Great/Perfect",
+        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "Fishman Karate, Midair Upwards Kick",
     },
     1243: {// Fortnight Hack
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 02a83c752..de1a2d0dd 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -657,9 +657,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 if (enabledSpecials[y].hasOwnProperty('staticMult')){
                     var slot = enabledSpecials[y].sourceSlot;
                     var baseDamage = getStatOfUnit(team[slot],'atk');
-                    var atkCandies = team[slot].candies.atk * 2;
+                    //var atkCandies = team[slot].candies.atk * 0;
                     var mult = enabledSpecials[y].staticMult(params);
-                    var staticDamage = Math.ceil((baseDamage+atkCandies)*mult*conditionalMultiplier);
+                    var staticDamage = Math.ceil((baseDamage)*mult*conditionalMultiplier);
                     if((hitModifier == 'Great')||(hitModifier == 'Good')||(hitModifier == 'Perfect')){
                         resultDamage += staticDamage;
                     } 

From a173c8d7eb6d5f9c2add6cfaac46174994fa3175 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 27 Feb 2017 00:24:43 -0500
Subject: [PATCH 0913/1569] Shirahoshi, placeholders, and mockup for Rainbow
 Orbs

I'll revert 90% of this if I don't need it
---
 characters/css/index.css        | 23 ++++-----
 common/data/captains.js         |  6 +++
 common/data/details.js          | 84 +++++++++++++++++++++++++++++++++
 common/data/events.js           | 20 ++++++++
 common/data/units.js            |  4 +-
 common/data/zombies.js          |  8 ++++
 common/js/directives.js         |  1 +
 damage/css/orbs.css             | 23 +++++++++
 damage/js/app.js                | 32 ++++++++++++-
 damage/js/cruncher.js           |  1 +
 damage/js/directives.js         |  5 +-
 damage/js/images.js             | 11 +++--
 damage/js/transfer.js           |  6 +--
 damage/js/utils.js              |  2 +-
 damage/views/fragments/orb.html |  6 ++-
 15 files changed, 207 insertions(+), 25 deletions(-)

diff --git a/characters/css/index.css b/characters/css/index.css
index f7480dfee..f1cecafed 100644
--- a/characters/css/index.css
+++ b/characters/css/index.css
@@ -124,17 +124,18 @@ input[type="text"] {
     height: 73px;
 }
 
-.STR   { background: salmon; }
-.QCK   { background: lightskyblue; }
-.DEX   { background: lightgreen; }
-.PSY   { background: gold; }
-.INT   { background: orchid; }
-.RCV   { background: sandybrown; }
-.TND   { background: peru; }
-.BLOCK { background: darkslateblue; }
-.BOMB  { background: maroon; }
-.G     { background: orange; }
-.EMPTY { background: #777; }
+.STR     { background: salmon; }
+.QCK     { background: lightskyblue; }
+.DEX     { background: lightgreen; }
+.PSY     { background: gold; }
+.INT     { background: orchid; }
+.RCV     { background: sandybrown; }
+.TND     { background: peru; }
+.BLOCK   { background: darkslateblue; }
+.BOMB    { background: maroon; }
+.RAINBOW { background: magenta; }
+.G       { background: orange; }
+.EMPTY   { background: #777; }
 
 .cell-STR { font-weight: bold; color: red; }
 .cell-QCK { font-weight: bold; color: blue; }
diff --git a/common/data/captains.js b/common/data/captains.js
index 8060c2b2a..1a796a0b3 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4173,6 +4173,12 @@ window.captains = {
             return p.unit.class.has("Slasher") ? 1 + 1 * ((100 - p.percHP) / 100) : 1;
         }
     },
+    1472: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 2.25; }  
+    },
+    1473: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 2.25; }  
+    },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
         hp: function(p) { return 1.2; },
diff --git a/common/data/details.js b/common/data/details.js
index 0e54c3b25..66c897db3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7987,6 +7987,90 @@ window.details = {
         special: "Reduces crew's HP by 90%, deals 1x the removed HP as damage to all enemies.",
         specialName: "Deep Claw Stab",
     },
+    1472: {//Shirahoshi
+        captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by ???x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
+        special: "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
+        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. We do NOT know how this interacts with Sakazuki or Black Clad Ace captain abilities.",
+        sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
+        specialName: "Tears of Courage",
+    },
+    1473: {//Shirahoshi
+        captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by ???x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
+        special: "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
+        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. We do NOT know how this interacts with Sakazuki or Black Clad Ace captain abilities.",
+        sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
+        specialName: "Tears of Courage",
+    },
+    1474: {//King Neptune
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "King Neptune Special",
+    },
+    1475: {//King Neptune
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "King Neptune Special",
+    },
+    1476: {//Fukaboshi
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Fukaboshi Special",
+    },
+    1477: {//Fukaboshi
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Fukaboshi Special",
+    },
+    1478: {//Caribou
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Caribou Special",
+    },
+    1479: {//Caribou
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Caribou Special",
+    },
+    1480: {//Vander Decken IX
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Vander Decken IX Special",
+    },
+    1481: {//Vander Decken IX
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Vander Decken IX Special",
+    },
+    1482: {//Madame Shyarly
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Madame Shyarly Special",
+    },
+    1483: {//Madame Shyarly
+        captain: "",
+        special: "",
+        specialNotes: "",
+        sailor: "",
+        specialName: "Madame Shyarly Special",
+    },
     1492: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
         captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
         captainNotes: "THIS IS ALL A PLACEHOLDER",
diff --git a/common/data/events.js b/common/data/events.js
index af3f8ecf9..f2deeed8d 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -149,4 +149,24 @@ window.events = {
                 $scope.notify({ text: 'Disabling [STR] orbs support.' });
         }
     },
+/*    1472: {//Add if needed for Shirahoshi
+        onInsertion: function($scope) {
+            if (++$scope.options.rainbowOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [RAINBOW] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.rainbowOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [RAINBOW] orbs support.' });
+        }
+    },
+    1473: {
+        onInsertion: function($scope) {
+            if (++$scope.options.rainbowOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [RAINBOW] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.rainbowOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [RAINBOW] orbs support.' });
+        }
+    },*/
 };
diff --git a/common/data/units.js b/common/data/units.js
index a98836f78..c5b681806 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1470,8 +1470,8 @@ window.units = [
     [ "Sentomaru of the Axe, Navy HQ", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, 1 ],
     [ "Lip 'Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
     [ "'Gashed' Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
-    [ "Princess Shirahoshi", "PSY", "Striker", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Princess Shirahoshi", "PSY", "Striker", 5, 30, 4, 3, 70, 1066998, 433, 131, 60, 1296, 620, 286, null ],
+    [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, null ],
     [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 2d92b0c4f..cb16f9ddd 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -323,4 +323,12 @@ window.zombies = {
         type: 'healer',
         amount: 120
     },
+    1472: { // Shirahoshi
+        type: 'healer',
+        multiplier: 5
+    },
+    1473: { // Shirahoshi
+        type: 'healer',
+        multiplier: 5
+    },
 };
diff --git a/common/js/directives.js b/common/js/directives.js
index e2f214a17..94f73ab80 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -78,6 +78,7 @@ filters.decorate = function() {
             .replace(/\[EMPTY\]/g,'<span class="badge EMPTY"><i class="fa fa-circle-o"></i> EMPTY</span>')
             .replace(/\[BLOCK\]/g,'<span class="badge BLOCK"><i class="block-icon"></i> BLOCK</span>')
             .replace(/\[BOMB\]/g,'<span class="badge BOMB"><i class="fa fa-bomb"></i> BOMB</span>')
+            .replace(/\[RAINBOW\]/g,'<span class="badge RAINBOW"></i> RAINBOW</span>')
             .replace(/\[G\]/g,'<span class="badge G">G</span>');
     };
 };
diff --git a/damage/css/orbs.css b/damage/css/orbs.css
index 8fd16dc8e..21ecd023c 100644
--- a/damage/css/orbs.css
+++ b/damage/css/orbs.css
@@ -56,6 +56,12 @@
     background-image: radial-gradient(9px 3px, circle cover, oldlace, orangered, rgb(50,50,50));
 }
 
+.unitOrb.Rainbow {
+    background-image: -webkit-radial-gradient(9px 3px, circle cover, oldlace, magenta, rgb(50,50,50));
+    background-image: -moz-radial-gradient(9px 3px, circle cover, oldlace, magenta, rgb(50,50,50));
+    background-image: radial-gradient(9px 3px, circle cover, oldlace, magenta, rgb(50,50,50));
+}
+
 .unitOrb .fa {
     position: relative;
     font-size: 2em;
@@ -87,6 +93,17 @@
     top: 1px;
 }
 
+.rainbow-orb {
+    color: white;
+    font-weight: bold;
+    font-style: normal;
+    font-size: 18px;
+    margin-right: 2px;
+    text-shadow: 0 0 5px black;
+    position: relative;
+    top: 1px;
+}
+
 /***********************
  *     ORB GLOWING     *
  ***********************/
@@ -98,6 +115,7 @@
 .unitOrb.INT { animation: glowPurple .5s linear infinite alternate; }
 .unitOrb.G { animation: glowG .5s linear infinite alternate; }
 .unitOrb.S { animation: glowG .5s linear infinite alternate; }
+.unitOrb.Rainbow { animation: glowG .5s linear infinite alternate; }
 .unitOrb.opposite { animation: glowBlack .5s linear infinite alternate; }
 
 @keyframes glowRed {
@@ -139,3 +157,8 @@
     from { box-shadow 0 0 10px white, 0 0 20px white, 0 0 30px white, 0 0 40px red, 0 0 70px red, 0 0 80px red, 0 0 100px red, 0 0 150px red; }
     to { box-shadow: 0 0 5px white, 0 0 10px white, 0 0 15px white, 0 0 20px red, 0 0 35px red, 0 0 40px red, 0 0 50px red, 0 0 75px red; }
 }
+
+@keyframes glowRainbow {
+    from { box-shadow 0 0 10px white, 0 0 20px white, 0 0 30px white, 0 0 40px red, 0 0 70px red, 0 0 80px red, 0 0 100px red, 0 0 150px red; }
+    to { box-shadow: 0 0 5px white, 0 0 10px white, 0 0 15px white, 0 0 20px red, 0 0 35px red, 0 0 40px red, 0 0 50px red, 0 0 75px red; }
+}
diff --git a/damage/js/app.js b/damage/js/app.js
index 81d0f7c28..f96ec6442 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -62,6 +62,7 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
     $rootScope.options = {
         gOrbsEnabled: 0,
         strOrbsEnabled: 0,
+        rainbowOrbsEnabled: 0,
         slidersEnabled: true,
         sidebarVisible: false,
         transientMode: false,
@@ -81,7 +82,7 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         // reset slot
         if (!onlyTransitional)
             $scope.data.team[n] = { unit: null, level: -1, candies: { hp: 0, atk: 0, rcv: 0 } };
-        $scope.tdata.team[n] = { orb: 1, g: false, str: false, special: false, lock: 0, silence: 0, removed: 0 };
+        $scope.tdata.team[n] = { orb: 1, g: false, str: false, rainbow: false, special: false, lock: 0, silence: 0, removed: 0 };
     };
 
     // to be invoked every time a new unit is set in a slot so the insertion events can be triggered
@@ -149,6 +150,35 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         }
         return false;
     };
+    
+    /* * * * * [RAINBOW] orb control * * * * */
+
+    var resetRainbowOrbs = function() {
+        for (var i=0;i<6;++i) {
+            if ($scope.tdata.team[i].orb == 'rainbow')
+                $scope.tdata.team[i].orb = 1;
+        }
+    };
+
+    // reset rainbow slots automatically
+    $scope.$watch('options.gOrbsEnabled',function() {
+        if (!$rootScope.areGOrbsEnabled())
+            resetRainbowOrbs();
+    });
+
+    $scope.$watch('data.effect',function() {
+        if (!$rootScope.areRainbowOrbsEnabled())
+            resetRainbowOrbs();
+    });
+
+    $rootScope.areRainbowOrbsEnabled = function() {
+        if ($rootScope.options.rainbowOrbsEnabled > 0) return true;
+        if ($rootScope.data.effect) {
+            var effect = window.effects[$rootScope.data.effect];
+            if (effect && effect.rainbowOrbsEnabled) return true;
+        }
+        return false;
+    };
 
     /* * * * * Custom hit modifiers resetting * * * * */
 
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index de1a2d0dd..53f6e26e7 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -180,6 +180,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 'g') orb = 1.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 1;
+            if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
             multipliers.push([ getTypeMultiplierOfUnit(x.unit.type,type, x), 'type' ]); // type multiplier
diff --git a/damage/js/directives.js b/damage/js/directives.js
index 6ef61f615..fe8d658f8 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -572,7 +572,7 @@ directives.levelSlider = function($timeout) {
 };
 
 directives.unitOrb = function($rootScope) {
-    var ORBS = [ 0.5, 1, 2, 'g', 'str' ];
+    var ORBS = [ 0.5, 1, 2, 'g', 'str' ];//add rainbow if needed
     return {
         restrict: 'E',
         replace: true,
@@ -585,6 +585,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.orb == 2) return scope.data.team[scope.slot].unit.type;
                 if (unit.orb == 'g') return 'G';
                 if (unit.orb == 'str') return 'S';
+                if (unit.orb == 'rainbow') return 'R';
                 return Utils.getOppositeType(scope.data.team[scope.slot].unit.type) + ' opposite';
             };
             var onShortPress = function(e) {
@@ -602,7 +603,7 @@ directives.unitOrb = function($rootScope) {
                     e.preventDefault();
                     e.stopPropagation();
                     return false;
-                }
+                }//IF I need to add Rainbow orbs, I need to rethink that
             };
             var onLongPress = function(e) {
 							var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
diff --git a/damage/js/images.js b/damage/js/images.js
index 6afc36194..81825f590 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -3,7 +3,7 @@
 var app = angular.module('optc');
 
 var BOX_COLORS = { STR: 'salmon', QCK: 'lightskyblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid' };
-var ORB_COLORS = { STR: 'orangered', QCK: 'dodgerblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid', G: 'orange', S: 'orangered'};
+var ORB_COLORS = { STR: 'orangered', QCK: 'dodgerblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid', G: 'orange', S: 'orangered', RAINBOW: 'magenta'};
 
 var lock = new Image(), silence = new Image();
 lock.src = 'res/chain.png';
@@ -83,7 +83,7 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                 if (orb != 1.0) {
                     var gradient = context.createRadialGradient(baseX + 20, baseY + 21, 13, baseX + 22, baseY + 22, 35);
                     if (orb < 1) gradient.addColorStop(0.1, ORB_COLORS[Utils.getOppositeType(unit.type)]);
-                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'STR' : unit.type]);
+                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'STR' : orb == 'rainbow' ? 'RAINBOW' : unit.type]);
                     if (orb < 1) gradient.addColorStop(0.2, 'black');
                     else {
                         gradient.addColorStop(0.2, 'white');
@@ -93,16 +93,19 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                     gradient.addColorStop(1.0, 'transparent');
                     context.fillStyle = gradient;
                     context.fillRect(0, 0, canvas.width, canvas.height);
-                    if (orb != 'g' && orb != 'str') {
+                    if (orb != 'g' && orb != 'str' && orb != 'rainbow') {
                         var temp = (orb < 1 ? [ 'f0d7', baseX + 13, baseY + 31 ] : [ 'f0d8', baseX + 13, baseY + 28 ]);
                         awesome(context, { text: temp[0], style: '28px', color: 'white',
                             x: temp[1], y: temp[2], stroke: 'gray' });
                     } else if (orb == 'g') {
                         type(context, { text: 'S', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
-                    } else {
+                    } else if (orb == 's'{
                         type(context, { text: 'S', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
+                    } else{
+                        type(context, { text: 'R', style: 'bold 20px "Open Sans"',
+                            x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
                     }
                 }
                 // level label
diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index ebc954dd5..e18683fe6 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -116,7 +116,7 @@ var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
                 .slice(-6).split('').map(function(x) { return parseInt(x, 10); });
             temp.forEach(function(x,n) {
                 var unit = $scope.tdata.team[n];
-                if (type == 'O') unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : (x == 4 ? 'str' : 1))));
+                if (type == 'O') unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : (x == 4 ? 'str' : (x == 5 ? 'rainbow' : 1)))));
                 else if (type == 'L') unit.lock = x;
                 else if (type == 'G') unit.silence = x;
                 else if (type == 'R') unit.removed = x;
@@ -126,7 +126,7 @@ var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
                 .slice(-6).split('').map(function(x) { return parseInt(x, 10); });
             temp.forEach(function(x,n) {
                 var unit = $scope.tdata.team[n];
-                unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : (x == 4 ? 'str' : 1))));
+                unit.orb = (x == 1 ? 2 : (x == 2 ? 0.5 : (x == 3 ? 'g' : (x == 4 ? 'str' : (x == 5 ? 'rainbow' : 1)))));
                 if (unit.orb == 'g' && !$rootScope.areGOrbsEnabled()) unit.orb = 1;
             });
         } else if (type == 'S') {
@@ -191,7 +191,7 @@ var ExportCtrl = function($scope) {
         result += (data.defense && data.defense.constructor == Number ? data.defense : parseInt(data.defense)) + 'D';
         //result += (data.defense != 0 ) + 'D';
         result += ($scope.data.effect ? window.effects[$scope.data.effect].id : 0) + 'E';
-        result += parseInt(team.map(function(x) { return ({ '2': 1, '0.5': 2, 'g': 3, 'str': 4, '1': 0 }['' + x.orb] || 0); }).join(''),4) + 'Q';
+        result += parseInt(team.map(function(x) { return ({ '2': 1, '0.5': 2, 'g': 3, 'str': 4, 'rainbow': 5, '1': 0 }['' + x.orb] || 0); }).join(''),4) + 'Q';
         result += parseInt(team.map(function(x) { return x.lock; }).join(''),3) + 'L';
         result += parseInt(team.map(function(x) { return x.silence; }).join(''),3) + 'G';
         result += parseInt(team.map(function(x) { return x.removed; }).join(''),3) + 'R';
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 64608fbf6..67f544287 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -101,7 +101,7 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, baseMultiplier, booste
         if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
     }
     if (orb == 1.0 || orb == 'str') return baseMultiplier;
-    if (orb == 2.0 || orb == 'g') return boostedMultiplier;
+    if (orb == 2.0 || orb == 'g' || orb == 'rainbow') return boostedMultiplier;
     if (orb == 0.5) return 1 / boostedMultiplier;
     return 1;
 };
diff --git a/damage/views/fragments/orb.html b/damage/views/fragments/orb.html
index f108a8012..b18ec71b2 100644
--- a/damage/views/fragments/orb.html
+++ b/damage/views/fragments/orb.html
@@ -1,7 +1,7 @@
 <div class="unitOrb {{glow()}}">
 
     <i class="fa"
-        ng-show="tdata.team[slot].orb != 'g' && tdata.team[slot].orb != 'str'"
+        ng-show="tdata.team[slot].orb != 'g' && tdata.team[slot].orb != 'str' && tdata.team[slot].orb != 'rainbow'"
         ng-class="{ 'fa-caret-up': tdata.team[slot].orb == 2, 'fa-caret-down': tdata.team[slot].orb == 0.5 }">
     </i>
 
@@ -12,5 +12,9 @@
     <i class="str-orb" ng-show="tdata.team[slot].orb == 'str'">
         S
     </i>
+    
+    <i class="rainbow-orb" ng-show="tdata.team[slot].orb == 'rainbow'">
+        R
+    </i>
 
 </div>

From 7455f5aece7267e85845def28fe9bc6c8098b8b8 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 27 Feb 2017 01:31:12 -0500
Subject: [PATCH 0914/1569] Image fixed

---
 damage/js/images.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index 81825f590..50f7a4ee8 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -100,7 +100,7 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                     } else if (orb == 'g') {
                         type(context, { text: 'S', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
-                    } else if (orb == 's'{
+                    } else if (orb == 's'){
                         type(context, { text: 'S', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
                     } else{

From 8872b5470f0b1b71489fbd2505da83fd0ed37e8d Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 27 Feb 2017 02:28:38 -0500
Subject: [PATCH 0915/1569] Details of future units

---
 common/data/details.js | 120 ++++++++++++++++++++++++++---------------
 1 file changed, 77 insertions(+), 43 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 66c897db3..cd1274ea9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7467,11 +7467,13 @@ window.details = {
         captain: "Boosts ATK of Driven characters by 1.75x and the HP of Striker Characters by 1.25x",
         special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
+        specialNotes: "#{randomHits : 7}",
     },
     1397: {//Tashigi Shambles
         captain: "Boosts ATK of Driven characters by 2x and the HP of Striker Characters by 1.5x",
         special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
+        specialNotes: "#{randomHits : 7}",
     },
     1398: {//Smoker Shambles
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x",
@@ -7562,14 +7564,14 @@ window.details = {
     1405: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs for Shooters by 1.75x for 1 turn",
-        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs for Shooters by 1.75x for 1 turn",
-        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
     },
@@ -8002,77 +8004,109 @@ window.details = {
         specialName: "Tears of Courage",
     },
     1474: {//King Neptune
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Not Translated",
+        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 40x character's ATK in typeless damage to all enemies",
+        specialNotes: "The HP cut looks to be of the highest HP enemy, not confirmed yet.",
+        sailor: "Not Translated",
         specialName: "King Neptune Special",
     },
     1475: {//King Neptune
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Boosts ATK of all characters by 2.25x and EXP gained by 1.5x",
+        captainNotes: "EXP boost does not take effect if he becomes your capatin in the middle of the adventure.",
+         special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 40x character's ATK in typeless damage to all enemies",
+        specialNotes: "The HP cut looks to be of the highest HP enemy, not confirmed yet.",
+        sailor: "Not Translated",
         specialName: "King Neptune Special",
     },
     1476: {//Fukaboshi
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Not Translated",
+        special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
+        sailor: "Not Translated",
         specialName: "Fukaboshi Special",
     },
     1477: {//Fukaboshi
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Boosts ATK of Striker characters by 2.5x and boosts HP of Powerhouse characters by 1.25x",
+        captainNotes: "This effect does stack for characters that have both classes, so Striker/Powerhouse characters will have 2.5x ATK and 1.25x HP",
+        special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
+        sailor: "Not Translated",
         specialName: "Fukaboshi Special",
     },
     1478: {//Caribou
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Not Translated",
+        special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
+        specialNotes: "#{randomHits : 15}",
+        sailor: "Not Translated",
         specialName: "Caribou Special",
     },
     1479: {//Caribou
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Boosts ATK of all characters by 1.75x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 33th hit, by 3.5x after the 44th hit",
+        special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
+        specialNotes: "#{randomHits : 15}",
+        sailor: "Not Translated",
         specialName: "Caribou Special",
     },
     1480: {//Vander Decken IX
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Not Translated",
+        special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        sailor: "Not Translated",
         specialName: "Vander Decken IX Special",
     },
     1481: {//Vander Decken IX
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
+        special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        sailor: "Not Translated",
         specialName: "Vander Decken IX Special",
     },
     1482: {//Madame Shyarly
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Not Translated",
+        special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
+        sailor: "Not Translated",
         specialName: "Madame Shyarly Special",
     },
     1483: {//Madame Shyarly
-        captain: "",
-        special: "",
-        specialNotes: "",
-        sailor: "",
+        captain: "Boosts ATK of INT characters by 2.5x and their RCV by 1.2x",
+        special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
+        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
+        sailor: "Not Translated",
         specialName: "Madame Shyarly Special",
     },
+    1486: {//Coliseum Ideo
+        captain: "Not Translated",
+        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for fighters by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        specialName: "Ideo Special",
+    },
+    1487: {//Coliseum Ideo
+        captain: "Not Translated",
+        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for fighters by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        specialName: "Ideo Special",
+    },
+    1488: {//Coliseum Don Krieg
+        captain: "Not Translated",
+        special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Change Up and Orb Change Down Buffs",
+        specialName: "Don Krieg Special",
+    },
+    1489: {//Coliseum Don Krieg
+        captain: "Not Translated",
+        special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Change Up and Orb Change Down Buffs",
+        specialName: "Don Krieg Special",
+    },
+    1490: {//Coliseum Mr. 5
+        captain: "Not Translated",
+        special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
+        specialName: "Mr. 5 Special",
+    },
+    1491: {//Coliseum Mr. 5
+        captain: "Not Translated",
+        special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
+        specialName: "Mr. 5 Special",
+    },
     1492: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
-        captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
+        captain: "Boosts HP and RCV of all characters by ???x, boosts ATK of Free Spirit characters by 2.75x",
         captainNotes: "THIS IS ALL A PLACEHOLDER",
         special: [
             {

From 22782b7b09d2ba1d53b988882dba5314d9614727 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 27 Feb 2017 03:43:16 -0500
Subject: [PATCH 0916/1569] Small goof

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index cd1274ea9..516178ac7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8005,7 +8005,7 @@ window.details = {
     },
     1474: {//King Neptune
         captain: "Not Translated",
-        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 40x character's ATK in typeless damage to all enemies",
+        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 140x character's ATK in typeless damage to all enemies",
         specialNotes: "The HP cut looks to be of the highest HP enemy, not confirmed yet.",
         sailor: "Not Translated",
         specialName: "King Neptune Special",
@@ -8013,7 +8013,7 @@ window.details = {
     1475: {//King Neptune
         captain: "Boosts ATK of all characters by 2.25x and EXP gained by 1.5x",
         captainNotes: "EXP boost does not take effect if he becomes your capatin in the middle of the adventure.",
-         special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 40x character's ATK in typeless damage to all enemies",
+         special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 140x character's ATK in typeless damage to all enemies",
         specialNotes: "The HP cut looks to be of the highest HP enemy, not confirmed yet.",
         sailor: "Not Translated",
         specialName: "King Neptune Special",

From 93db879a8679d3cd364330e4a35275c172bd95c0 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 28 Feb 2017 00:42:21 -0500
Subject: [PATCH 0917/1569] Quick push

---
 common/data/aliases.js    |  4 ++--
 common/data/captains.js   | 21 ++++++++++++++++
 common/data/details.js    | 50 ++++++++++++++++++++++++---------------
 common/data/evolutions.js |  4 ++++
 common/data/units.js      |  4 ++--
 5 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2995b69c0..5455ffae4 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1481,8 +1481,8 @@ window.aliases = {
     1480: ['', '', ''],
     1481: ['', '', ''],
     1482: ['', '', ''],
-    1483: ['', '', ''],
-    1484: ['', '', ''],
+    1483: ['', '', 'Wild Sanji'],
+    1484: ['', '', 'Wild Sanji'],
     1485: ['', '', 'Coliseum Ideo'],
     1486: ['', '', 'Coliseum Ideo'],
     1487: ['', '', 'Coliseum Don Krieg'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 1a796a0b3..edc33dd6b 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4179,6 +4179,27 @@ window.captains = {
     1473: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 2.25; }  
     },
+    1474: {
+        atk: function(p) { return 1.5; }  
+    },
+    1475: {
+        atk: function(p) { return 2.25; }  
+    },
+    1476: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+    },
+    1477: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+    },
+    1478: {
+        hit: function(n) {
+            return n > 40 ? 3.5 :
+                n > 30 ? 2.75 :
+                n > 22 ? 2.5 :
+                n > 11 ? 1.5 : 1;
+        }
+    },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
         hp: function(p) { return 1.2; },
diff --git a/common/data/details.js b/common/data/details.js
index 516178ac7..7a371bf8b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8004,75 +8004,87 @@ window.details = {
         specialName: "Tears of Courage",
     },
     1474: {//King Neptune
-        captain: "Not Translated",
-        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 140x character's ATK in typeless damage to all enemies",
-        specialNotes: "The HP cut looks to be of the highest HP enemy, not confirmed yet.",
-        sailor: "Not Translated",
+        captain: "Boosts ATK of all characters by 1.5x and EXP gained by 1.5x",
+        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy with the highest current HP by 20% if their HP is above 50%, and if all enemies HP is less than 50%, deals 140x character's ATK in typeless damage to all enemies",
+        sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
         specialName: "King Neptune Special",
     },
     1475: {//King Neptune
         captain: "Boosts ATK of all characters by 2.25x and EXP gained by 1.5x",
         captainNotes: "EXP boost does not take effect if he becomes your capatin in the middle of the adventure.",
-         special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy by 20% and if HP is above 50%, deals 140x character's ATK in typeless damage to all enemies",
-        specialNotes: "The HP cut looks to be of the highest HP enemy, not confirmed yet.",
-        sailor: "Not Translated",
+        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy with the highest current HP by 20% if their HP is above 50%, and if all enemies HP is less than 50%, deals 140x character's ATK in typeless damage to all enemies",
+        sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
         specialName: "King Neptune Special",
     },
     1476: {//Fukaboshi
-        captain: "Not Translated",
+        captain: "Boosts ATK of Striker characters by 2x",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
-        sailor: "Not Translated",
+        sailor: "Boosts HP, RCV and ATK of all characters by 50",
         specialName: "Fukaboshi Special",
     },
     1477: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2.5x and boosts HP of Powerhouse characters by 1.25x",
         captainNotes: "This effect does stack for characters that have both classes, so Striker/Powerhouse characters will have 2.5x ATK and 1.25x HP",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
-        sailor: "Not Translated",
+        sailor: "Boosts HP, RCV and ATK of all characters by 50",
         specialName: "Fukaboshi Special",
     },
     1478: {//Caribou
-        captain: "Not Translated",
+        captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 1.75x after the 22nd hit, by 2x after the 33th hit, by 3x after the 44th hit",
         special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
         specialNotes: "#{randomHits : 15}",
-        sailor: "Not Translated",
+        sailor: "Completely resists Paralysis on this character",
         specialName: "Caribou Special",
     },
     1479: {//Caribou
         captain: "Boosts ATK of all characters by 1.75x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 33th hit, by 3.5x after the 44th hit",
         special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
         specialNotes: "#{randomHits : 15}",
-        sailor: "Not Translated",
+        sailor: "Completely resists Paralysis on this character",
         specialName: "Caribou Special",
     },
     1480: {//Vander Decken IX
-        captain: "Not Translated",
+        captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row",
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
-        sailor: "Not Translated",
+        sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Vander Decken IX Special",
     },
     1481: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
-        sailor: "Not Translated",
+        sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Vander Decken IX Special",
     },
     1482: {//Madame Shyarly
-        captain: "Not Translated",
+        captain: "Boosts ATK of INT characters by 2x and their RCV by 1.2x",
         special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
-        sailor: "Not Translated",
+        sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
         specialName: "Madame Shyarly Special",
     },
     1483: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2.5x and their RCV by 1.2x",
         special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
-        sailor: "Not Translated",
+        sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
         specialName: "Madame Shyarly Special",
     },
+    1484: {//Wild Sanji
+        captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
+        special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
+        sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
+        specialName: "Sanji Special",
+    },
+    1485: {//Wild Sanji
+        captain: "Boosts HP and ATK slightly and boosts ATK by 3.25x after scoring 3 Perfects in a row",
+        special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
+        sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
+        specialName: "Sanji Special",
+    },
     1486: {//Coliseum Ideo
         captain: "Not Translated",
         special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for fighters by 2x for 1 turn",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 71acb7850..07c492b39 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2295,6 +2295,10 @@ window.evolutions = {
         evolution: 1483,
         evolvers: [  ]
     },
+    1484: {
+        evolution: 1485,
+        evolvers: [  ]
+    },
     1486: {
         evolution: 1487,
         evolvers: [  ]
diff --git a/common/data/units.js b/common/data/units.js
index c5b681806..eb6fe823e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1482,8 +1482,8 @@ window.units = [
     [ "Vander Decken IX, Evolved", "DEX", [ "Slasher", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Ideo", "DEX", [ "Shooter", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Ideo, Evolved", "DEX", [ "Shooter", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Don Krieg", "STR", [ "Driven", "Shooter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],

From 7553a5a882eaa4fb11c43aeef80e1e554d1158ad Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 28 Feb 2017 02:26:22 -0500
Subject: [PATCH 0918/1569] As much data as we got

---
 common/data/captains.js  | 52 ++++++++++++++++++++++++++++++++++++----
 common/data/cooldowns.js | 30 +++++++++++------------
 common/data/details.js   | 30 ++++++++++++++++++-----
 common/data/families.js  |  4 ++--
 common/data/flags.js     |  2 ++
 common/data/gw.js        | 28 +++++++++++-----------
 common/data/specials.js  | 44 ++++++++++++++++++++++++++++++++++
 common/data/units.js     | 24 +++++++++----------
 8 files changed, 160 insertions(+), 54 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index edc33dd6b..71c435d25 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4174,10 +4174,10 @@ window.captains = {
         }
     },
     1472: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 2.25; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.125 : 2.25; }  
     },
     1473: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 2.25; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.125 : 2.25; }  
     },
     1474: {
         atk: function(p) { return 1.5; }  
@@ -4194,12 +4194,54 @@ window.captains = {
     },
     1478: {
         hit: function(n) {
-            return n > 40 ? 3.5 :
-                n > 30 ? 2.75 :
-                n > 22 ? 2.5 :
+            return n > 44 ? 3 :
+                n > 33 ? 2 :
+                n > 22 ? 1.75 :
                 n > 11 ? 1.5 : 1;
         }
     },
+    1479: {
+        hit: function(n) {
+            return n > 44 ? 3.5 :
+                n > 33 ? 2.75 :
+                n > 22 ? 2.5 :
+                n > 11 ? 1.75 : 1;
+        }
+    },
+    1480: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1481: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1482: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+    },
+    1483: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+    },
+    1484: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1485: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.25 : 1.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return 1.25; },
+    },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
         hp: function(p) { return 1.2; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 163456ccc..31f22bbd3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1468,22 +1468,22 @@ window.cooldowns = [
     [ 15, 15 ],
     [ 18, 11 ],
     [ 18, 11 ],
-    [ 17, 10 ],
     [ 14, 5 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    [ 17, 10 ],
+    null,//Shirahoshi
+    null,//Shirahoshi
+    21,
+    21,
+    16,
+    16,
+    22,
+    22,
+    20,
+    20,
+    15,
+    15,
+    [ 14, 14 ],
+    [ 14, 14 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 7a371bf8b..a64530e25 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7990,16 +7990,34 @@ window.details = {
         specialName: "Deep Claw Stab",
     },
     1472: {//Shirahoshi
-        captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by ???x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
-        special: "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. We do NOT know how this interacts with Sakazuki or Black Clad Ace captain abilities.",
+        captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
+        special: [
+            {
+                "description": "Changes adjacent orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
+                "cooldown": [ 13, null ],
+            },
+            {
+                "description": "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
+                "cooldown": [ 22, null ],
+            },
+        ],
+        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
     },
     1473: {//Shirahoshi
-        captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by ???x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
-        special: "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. We do NOT know how this interacts with Sakazuki or Black Clad Ace captain abilities.",
+        captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
+        special: [
+            {
+                "description": "Changes adjacent orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
+                "cooldown": [ 13, null ],
+            },
+            {
+                "description": "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
+                "cooldown": [ 22, null ],
+            },
+        ],
+        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
     },
diff --git a/common/data/families.js b/common/data/families.js
index d58845ca5..a23e8c596 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1482,8 +1482,8 @@ window.families = [
     "Vander Decken IX",
     "Madame Shyarly",
     "Madame Shyarly",
-    null,
-    null,
+    "Sanji",
+    "Sanji",
     "Ideo",
     "Ideo",
     "Don Krieg",
diff --git a/common/data/flags.js b/common/data/flags.js
index 59c145879..57a73ccd8 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1300,4 +1300,6 @@ window.flags = {
     1481: { rr: 1, rro: 1 },
     1482: { rr: 1, rro: 1 },
     1483: { rr: 1, rro: 1 },
+    1484: { shop: 1 },
+    1485: { shop: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 1f1ed4d55..659f64431 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1470,20 +1470,20 @@ window.gw=[
     51929,
     51928,
     51927,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    52204,
+    52204,
+    52178,
+    52178,
+    52205,
+    52205,
+    52206,
+    52206,
+    52207,
+    52207,
+    52208,
+    52208,
+    52276,
+    52276,
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index 09429d1f7..303b7296f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2168,6 +2168,50 @@ window.specials = {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"
     },
+    1476: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
+    },
+    1477: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
+    },
+    1478: {
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
+        type: "type"
+    },
+    1479: {
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
+        type: "type"
+    },
+    1480: {
+        atk: function(p) { return window.specials[1480].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1480].multiplier == 1.5 ? 1 : 0);
+            window.specials[1480].multiplier = [1.25, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
+                name: '1480warning'
+            });
+        },
+    },
+    1481: {
+        atk: function(p) { return window.specials[1481].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1481].multiplier == 1.5 ? 1 : 0);
+            window.specials[1481].multiplier = [1.25, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
+                name: '1481warning'
+            });
+        },
+    },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1492].multiplier; },
         type: "class",
diff --git a/common/data/units.js b/common/data/units.js
index eb6fe823e..19a8e6eaf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1464,7 +1464,7 @@ window.units = [
     [ "Luffy's Tea Party", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 8, 3, 99, 3000000, 881, 409, 98, 2051, 1138, 276, 1 ],
     [ "Break Time Chopper", "INT", [ "Shooter", "Powerhouse" ], 4, 12, 6, 2, 50, 392109, 121, 76, 44, 920, 401, 197, 1 ],
     [ "Chopper's Tea Party", "INT", [ "Shooter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 841, 315, 150, 1906, 999, 347, 1 ],
-    [ "Valentines Cavendish", "PSY", [ "Slasher", "Driven" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Valentines Cavendish", "PSY", [ "Slasher", "Driven" ], 4, 13, 6, 2, 50, 392109, null, null, null, 1077, 476, 176, null ],
     [ "Valentines Cavendish, Evolved", "PSY", [ "Slasher", "Driven" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Sentomaru, Navy HQ", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 95, 45, 21, 1055, 595, 101, 1 ],
     [ "Sentomaru of the Axe, Navy HQ", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, 1 ],
@@ -1472,17 +1472,17 @@ window.units = [
     [ "'Gashed' Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
     [ "Princess Shirahoshi", "PSY", "Striker", 5, 30, 4, 3, 70, 1066998, 433, 131, 60, 1296, 620, 286, null ],
     [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, null ],
-    [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fukaboshi, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Caribou", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Caribou, Evolved", "QCK", [ "Driven", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vander Decken IX, Evolved", "DEX", [ "Slasher", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 392109, null, null, null, null, null, null, null, null ],
+    [ "Fukaboshi, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2554, 1206, 323, null ],
+    [ "Caribou", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 144, 144, 22, 1042, 651, 149, null ],
+    [ "Caribou, Evolved", "QCK", [ "Driven", "Shooter" ], 5, 30, 10, 4, 99, 4000000, null, null, null, 2340, 1484, 257, null ],
+    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, null, 3, 392109, null, null, null, null, null, null, null, null ],
+    [ "Vander Decken IX, Evolved", "DEX", [ "Slasher", "Shooter" ], 5, 30, 5, 4, 99, 4000000, null, null, null, 2198, 1393, 316, null ],
+    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, null, 3, 392109, null, null, null, null, null, null, null, null ],
+    [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, null, null, null, null ],
     [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Ideo", "DEX", [ "Shooter", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Ideo, Evolved", "DEX", [ "Shooter", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],

From bfa5a52f0980ea0fb89712b298cf575ac1944946 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 28 Feb 2017 12:08:11 -0500
Subject: [PATCH 0919/1569] Morning Update

Neptune special clarified
---
 common/data/details.js    | 10 +++++-----
 common/data/drops.js      | 11 +++++++----
 common/data/evolutions.js | 12 ++++++------
 common/data/units.js      | 12 ++++++------
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index a64530e25..821bb7c76 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8023,14 +8023,14 @@ window.details = {
     },
     1474: {//King Neptune
         captain: "Boosts ATK of all characters by 1.5x and EXP gained by 1.5x",
-        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy with the highest current HP by 20% if their HP is above 50%, and if all enemies HP is less than 50%, deals 140x character's ATK in typeless damage to all enemies",
+        special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
         specialName: "King Neptune Special",
     },
     1475: {//King Neptune
         captain: "Boosts ATK of all characters by 2.25x and EXP gained by 1.5x",
         captainNotes: "EXP boost does not take effect if he becomes your capatin in the middle of the adventure.",
-        special: "Locks all orbs for 1 turn. Cuts the current HP of one enemy with the highest current HP by 20% if their HP is above 50%, and if all enemies HP is less than 50%, deals 140x character's ATK in typeless damage to all enemies",
+        special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
         specialName: "King Neptune Special",
     },
@@ -8137,15 +8137,15 @@ window.details = {
     },
     1492: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
         captain: "Boosts HP and RCV of all characters by ???x, boosts ATK of Free Spirit characters by 2.75x",
-        captainNotes: "THIS IS ALL A PLACEHOLDER",
+        captainNotes: "HP and RCV boost are not known yet, but are assumed to be for anyone and is a 1.2x boost for both in the calculator.",
         special: [
             {
                 "description": "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn you score 5 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ null, null ],
+                "cooldown": [ 18, 12 ],
             },
             {
                 "description": "Boosts ATK of Free Spirit characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ 20, 14 ],
+                "cooldown": [ 23, 17 ],
             },
         ],
         specialName: "Burning Dragon Claw Fist",
diff --git a/common/data/drops.js b/common/data/drops.js
index 3f659e36e..798b39e8e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1106,7 +1106,7 @@ window.drops = {
             name: "Mountaintop Banquet! Enter the Generals!",
             thumb: 897,
             condition: 'Only STR/DEX/QCK/PSY/INT orbs will appear',
-            "All Difficulties": [ 897, 898, 899, -899, -754, -702, -701, -669, -528, -466, -449, -464, -1177 ]
+            "All Difficulties": [ 897, 898, 899, -899, -754, -702, -701, -669, -1492, -528, -466, -449, -464, -1177 ]
         },
 
         {
@@ -1244,7 +1244,7 @@ window.drops = {
             name: "Gather! Whitebeard Alliance",
             thumb: 1254,
             condition: "Driven Characters have their cooldowns reduced by 10 turns at the start of the fight",
-            "All Difficulties": [ 1254, 1255, 1256, -669, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
+            "All Difficulties": [ 1254, 1255, 1256, -669, -1492, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },
         
         {
@@ -1596,7 +1596,7 @@ window.drops = {
             "Characters": [ 67, 69, 262, 264, 298 ],
             "Boosters and Evolvers": [ 113, 192, 350, 266, 83, 118 ],
             "Global": [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739 ],
-            "Japan": [ -416, -459, -530, -669, -578, -1121 ]
+            "Japan": [ -416, -459, -530, -669, -1492, -578, -1121 ]
         },
         
         {
@@ -1641,10 +1641,12 @@ var bonuses = [
     { type: 'stamina' , x: 6 , y: 5  },
     { type: 'stamina' , x: 6 , y: 12 },
     { type: 'stamina' , x: 6 , y: 19 },
+    { type: 'stamina' , x: 6 , y: 26 },
     { type: 'drop'    , x: 6 , y: 1  },
     { type: 'drop'    , x: 6 , y: 8  },
     { type: 'drop'    , x: 6 , y: 15 },
     { type: 'drop'    , x: 6 , y: 22 },
+    { type: 'drop'    , x: 6 , y: 29 },
     { type: 'beli'    , x: 6 , y: 3  },
     { type: 'beli'    , x: 1 , y: 4  },
     { type: 'beli'    , x: 6 , y: 10 },
@@ -1656,5 +1658,6 @@ var bonuses = [
     { type: 'exp'     , x: 6 , y: 6  },
     { type: 'exp'     , x: 6 , y: 9, stop: 2 },
     { type: 'exp'     , x: 6 , y: 13 },
-    { type: 'exp'     , x: 6 , y: 20 }
+    { type: 'exp'     , x: 6 , y: 20 },
+    { type: 'exp'     , x: 6 , y: 27 }
 ];
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 07c492b39..7d83a54de 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2273,27 +2273,27 @@ window.evolutions = {
     },
     1472: {
         evolution: 1473,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 98, 267, 303 ]
     },
     1474: {
         evolution: 1475,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 95, 1180, 100 ]
     },
     1476: {
         evolution: 1477,
-        evolvers: [  ]
+        evolvers: [ 116, 87, 266, 1180, 303 ]
     },
     1478: {
         evolution: 1479,
-        evolvers: [  ]
+        evolvers: [ 83, 85, 94, 131, 301 ]
     },
     1480: {
         evolution: 1482,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 94, 102, 302 ]
     },
     1482: {
         evolution: 1483,
-        evolvers: [  ]
+        evolvers: [ 88, 99, 1180, 104, 304 ]
     },
     1484: {
         evolution: 1485,
diff --git a/common/data/units.js b/common/data/units.js
index 19a8e6eaf..066a1b42d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1474,23 +1474,23 @@ window.units = [
     [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, null ],
     [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, null, 3, 392109, null, null, null, null, null, null, null, null ],
+    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 392109, 202, 91, 33, null, null, null, null, null ],
     [ "Fukaboshi, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2554, 1206, 323, null ],
     [ "Caribou", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 144, 144, 22, 1042, 651, 149, null ],
     [ "Caribou, Evolved", "QCK", [ "Driven", "Shooter" ], 5, 30, 10, 4, 99, 4000000, null, null, null, 2340, 1484, 257, null ],
-    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, null, 3, 392109, null, null, null, null, null, null, null, null ],
+    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, 6, 3, 392109, 123, 119, 29, null, null, null, null, null ],
     [ "Vander Decken IX, Evolved", "DEX", [ "Slasher", "Shooter" ], 5, 30, 5, 4, 99, 4000000, null, null, null, 2198, 1393, 316, null ],
-    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, null, 3, 392109, null, null, null, null, null, null, null, null ],
-    [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 392109, 91, 89, 44, null, null, null, null, null ],
+    [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, 8, 4, 99, 4000000, 878, 422, 154, null, null, null, null ],
     [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, null, null, null, null ],
-    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2625, 1289, 250, null ],
     [ "Coliseum Ideo", "DEX", [ "Shooter", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Ideo, Evolved", "DEX", [ "Shooter", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Don Krieg", "STR", [ "Driven", "Shooter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Don Krieg, Evolved", "STR", [ "Driven", "Shooter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Mr. 5", "QCK", "Shooter", 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Mr. 5, Evolved", "QCK", "Shooter", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6+ Sabo - This is 100% a placeholder", "PSY", [ "Striker", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1500, 800, 250, 3000, 1500, 500, null ],
+    [ "6+ Sabo", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1534, 777, 277, 3000, 1500, 500, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 331422690db0b993afb08cea67df745ad6cc412e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 28 Feb 2017 12:11:40 -0500
Subject: [PATCH 0920/1569] goof

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 066a1b42d..795154289 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1474,13 +1474,13 @@ window.units = [
     [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, null ],
     [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 392109, 202, 91, 33, null, null, null, null, null ],
+    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 202, 91, 33, null, null, null, null, null ],
     [ "Fukaboshi, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2554, 1206, 323, null ],
     [ "Caribou", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 144, 144, 22, 1042, 651, 149, null ],
     [ "Caribou, Evolved", "QCK", [ "Driven", "Shooter" ], 5, 30, 10, 4, 99, 4000000, null, null, null, 2340, 1484, 257, null ],
-    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, 6, 3, 392109, 123, 119, 29, null, null, null, null, null ],
+    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, 6, 3, 50, 392109, 123, 119, 29, null, null, null, null, null ],
     [ "Vander Decken IX, Evolved", "DEX", [ "Slasher", "Shooter" ], 5, 30, 5, 4, 99, 4000000, null, null, null, 2198, 1393, 316, null ],
-    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 392109, 91, 89, 44, null, null, null, null, null ],
+    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 91, 89, 44, null, null, null, null, null ],
     [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, 8, 4, 99, 4000000, 878, 422, 154, null, null, null, null ],
     [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, null, null, null, null ],
     [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2625, 1289, 250, null ],

From d2d61aaf11f4b92b19ad4913f571a08ec7f0c4ff Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 28 Feb 2017 16:16:43 -0500
Subject: [PATCH 0921/1569] Neptune stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 795154289..42121ee1b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1473,7 +1473,7 @@ window.units = [
     [ "Princess Shirahoshi", "PSY", "Striker", 5, 30, 4, 3, 70, 1066998, 433, 131, 60, 1296, 620, 286, null ],
     [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, null ],
     [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2604, 1450, 229, null ],
     [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 202, 91, 33, null, null, null, null, null ],
     [ "Fukaboshi, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2554, 1206, 323, null ],
     [ "Caribou", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 144, 144, 22, 1042, 651, 149, null ],

From 0093759d2fa0153c0008e2371bbcb2bcd48256b3 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Wed, 1 Mar 2017 12:04:18 -0500
Subject: [PATCH 0922/1569] New units added to Official

---
 common/data/aliases.js   | 33 +++++++++++++++---------------
 common/data/captains.js  | 26 +++++++++++++++++++++++-
 common/data/cooldowns.js | 10 +++++----
 common/data/details.js   | 20 +++++++++---------
 common/data/gw.js        | 12 +++++------
 common/data/specials.js  | 16 +++++++++++++--
 common/data/units.js     | 44 ++++++++++++++++++++--------------------
 7 files changed, 100 insertions(+), 61 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 5455ffae4..06fe222b9 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1470,24 +1470,25 @@ window.aliases = {
     1469: ['鉞の戦桃丸 海兵', '', ''],
     1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service'],
     1471: ['深手の・アルビオン', '', ''],
-    1472: ['', '', ''],
-    1473: ['', '', ''],
-    1474: ['', '', ''],
-    1475: ['', '', ''],
-    1476: ['', '', ''],
-    1477: ['', '', ''],
-    1478: ['', '', ''],
-    1479: ['', '', ''],
-    1480: ['', '', ''],
-    1481: ['', '', ''],
-    1482: ['', '', ''],
-    1483: ['', '', 'Wild Sanji'],
+    1472: ['しらほし姫', '', ''],
+    1473: ['しらほし姫 リュウグウ王国王女', '', ''],
+    1474: ['ネプチューン', '', ''],
+    1475: ['ネプチューン リュウグウ王国国王', '', ''],
+    1476: ['フカボシ', '', ''],
+    1477: ['フカボシ リュウグウ王国王子', '', ''],
+    1478: ['カリブー カリブー海賊団船長', '', ''],
+    1479: ['濡れ髪のカリブー カリブー海賊団船長', '', ''],
+    1480: ['バンダー・デッケン九世 幽霊船の主', '', ''],
+    1481: ['バンダー・デッケン九世 フライング海賊団船長', '', ''],
+    1482: ['マダム・シャーリー', '', ''],
+    1483: ['マダム・シャーリー 占い師', '', ''],
     1484: ['', '', 'Wild Sanji'],
-    1485: ['', '', 'Coliseum Ideo'],
+    1485: ['', '', 'Wild Sanji'],
     1486: ['', '', 'Coliseum Ideo'],
-    1487: ['', '', 'Coliseum Don Krieg'],
+    1487: ['', '', 'Coliseum Ideo'],
     1488: ['', '', 'Coliseum Don Krieg'],
-    1489: ['', '', 'Coliseum Mr. 5'],
+    1489: ['', '', 'Coliseum Don Krieg'],
     1490: ['', '', 'Coliseum Mr. 5'],
-    1491: ['', '', ''],
+    1491: ['', '', 'Coliseum Mr. 5'],
+    1492: ['', '', 'Mega Sabo'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 71c435d25..a2d59b5f0 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4128,7 +4128,7 @@ window.captains = {
     },
     1460: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 2 : 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 2.14 : 1;
         },
         hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
@@ -4242,6 +4242,30 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return 1.25; },
     },
+    1486: {
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.5 : 1); },
+    },
+    1487: {
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 3 : 1); },
+    },
+    1488: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+    },
+    1489: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1490: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great"]) ? 1.75 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+    },
+    1491: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great"]) ? 2 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+    },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
         hp: function(p) { return 1.2; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 31f22bbd3..d31a35cc2 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1484,9 +1484,11 @@ window.cooldowns = [
     15,
     [ 14, 14 ],
     [ 14, 14 ],
-    null,
-    null,
-    null,
-    null,
+    28,
+    28,
+    [ 20, 10 ],
+    [ 20, 10 ],
+    [ 20, 11 ],
+    [ 20, 11 ],
     null,//6+ Sabo
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 821bb7c76..2659556c3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8104,34 +8104,34 @@ window.details = {
         specialName: "Sanji Special",
     },
     1486: {//Coliseum Ideo
-        captain: "Not Translated",
+        captain: "Boosts ATK of Fighter characters by 2.5x if they have a matching orb.",
         special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for fighters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Ideo Special",
+        specialName: "Destruction Cannon: Hidden Bullet",
     },
     1487: {//Coliseum Ideo
-        captain: "Not Translated",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 3x if they have a matching orb.",
         special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for fighters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Ideo Special",
+        specialName: "Destruction Cannon: Hidden Bullet",
     },
     1488: {//Coliseum Don Krieg
-        captain: "Not Translated",
+        captain: "Boosts ATK of Driven characters by 1.5x, reduces damage received by 20%",
         special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Change Up and Orb Change Down Buffs",
-        specialName: "Don Krieg Special",
+        specialName: "Great Battle Spear",
     },
     1489: {//Coliseum Don Krieg
-        captain: "Not Translated",
+        captain: "Boosts ATK of Driven characters by 2x, reduces damage received by 20%",
         special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Change Up and Orb Change Down Buffs",
-        specialName: "Don Krieg Special",
+        specialName: "Great Battle Spear",
     },
     1490: {//Coliseum Mr. 5
-        captain: "Not Translated",
+        captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
         specialName: "Mr. 5 Special",
     },
     1491: {//Coliseum Mr. 5
-        captain: "Not Translated",
+        captain: "Boosts ATK by 2x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
         specialName: "Mr. 5 Special",
     },
diff --git a/common/data/gw.js b/common/data/gw.js
index 659f64431..1e7b05535 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1484,11 +1484,11 @@ window.gw=[
     52208,
     52276,
     52276,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    52180,
+    52180,
+    52209,
+    52209,
+    52210,
+    52210,
     15191,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 303b7296f..f54f033f0 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2188,7 +2188,7 @@ window.specials = {
         atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
         type: "type"
     },
-    1480: {
+    1482: {
         atk: function(p) { return window.specials[1480].multiplier; },
         type: "class",
         onActivation: function(p) {
@@ -2200,7 +2200,7 @@ window.specials = {
             });
         },
     },
-    1481: {
+    1483: {
         atk: function(p) { return window.specials[1481].multiplier; },
         type: "class",
         onActivation: function(p) {
@@ -2212,6 +2212,18 @@ window.specials = {
             });
         },
     },
+    1486: {
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+    },
+    1487: {
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+    },
+    1490: {
+        def: function(p) { return 0.5; }
+    },
+    1491: {
+        def: function(p) { return 0.5; }
+    },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1492].multiplier; },
         type: "class",
diff --git a/common/data/units.js b/common/data/units.js
index 42121ee1b..5bad48f81 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1457,7 +1457,7 @@ window.units = [
     [ "Don Chinjao, Happo Navy's 12th Leader", "PSY", [ "Fighter", "Powerhouse" ], 5, 40, 7, 3, 99, 4000000, 1177, 576, 77, 2707, 1367, 212, 1 ],
     [ "Klahadore the Butler", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, 392109, 109, 109, 30, 892, 557, 187, 1 ],
     [ "Pirate Kuro of a Hundred Plans", "INT", [ "Slasher", "Cerebral" ], 4, 26, 10, 3, 99, 3000000, 805, 489, 131, 1664, 1299, 310, 1 ],
-    [ "Miss Valentine, Kilo Kilo Devil Fruit User", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 92, 49, 26, 755, 390, 148, 1 ],
+    [ "Miss Valentine, Kilo Human", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 92, 49, 26, 755, 390, 148, 1 ],
     [ "Miss Valentine, Baroque Works Officer Agent", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1778330, 687, 319, 90, 1402, 774, 250, 1 ],
     [ "Zoro's Winter Training", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 2000000, 111, 49, 22, 2303, 919, 244, 1 ],
     [ "Break Time Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 132, 94, 26, 968, 505, 146, 1 ],
@@ -1470,27 +1470,27 @@ window.units = [
     [ "Sentomaru of the Axe, Navy HQ", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, 1 ],
     [ "Lip 'Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
     [ "'Gashed' Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
-    [ "Princess Shirahoshi", "PSY", "Striker", 5, 30, 4, 3, 70, 1066998, 433, 131, 60, 1296, 620, 286, null ],
-    [ "Princess Shirahoshi, Evolved", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, null ],
-    [ "King Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "King Neptune, Evolved", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2604, 1450, 229, null ],
-    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 202, 91, 33, null, null, null, null, null ],
-    [ "Fukaboshi, Evolved", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2554, 1206, 323, null ],
-    [ "Caribou", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 144, 144, 22, 1042, 651, 149, null ],
-    [ "Caribou, Evolved", "QCK", [ "Driven", "Shooter" ], 5, 30, 10, 4, 99, 4000000, null, null, null, 2340, 1484, 257, null ],
-    [ "Vander Decken IX", "DEX", [ "Slasher", "Shooter" ], 4, 15, 6, 3, 50, 392109, 123, 119, 29, null, null, null, null, null ],
-    [ "Vander Decken IX, Evolved", "DEX", [ "Slasher", "Shooter" ], 5, 30, 5, 4, 99, 4000000, null, null, null, 2198, 1393, 316, null ],
-    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 91, 89, 44, null, null, null, null, null ],
-    [ "Madame Shyarly, Evolved", "INT", [ "Fighter", "Cerebral" ], 5, 30, 8, 4, 99, 4000000, 878, 422, 154, null, null, null, null ],
-    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, null, null, null, null ],
-    [ "Wild Sanji", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2625, 1289, 250, null ],
-    [ "Coliseum Ideo", "DEX", [ "Shooter", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Ideo, Evolved", "DEX", [ "Shooter", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Don Krieg", "STR", [ "Driven", "Shooter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Don Krieg, Evolved", "STR", [ "Driven", "Shooter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Mr. 5", "QCK", "Shooter", 3, 10, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Mr. 5, Evolved", "QCK", "Shooter", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6+ Sabo", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1534, 777, 277, 3000, 1500, 500, null ],
+    [ "Shirahoshi-hime", "PSY", "Striker", 5, 30, 4, 3, 70, 1066998, 433, 131, 60, 1296, 620, 286, 1 ],
+    [ "Shirahoshi-hime, Ryugu Kingdom Princess", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, 1 ],
+    [ "Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, 392109, 171, 149, 25, 1176, 667, 118, 1 ],
+    [ "Neptune, Ryugu Kingdom King", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1099, 601, 52, 2604, 1450, 229, 1 ],
+    [ "Fukaboshi", "PSY", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 202, 91, 33, 1176, 496, 181, 1 ],
+    [ "Fukaboshi, Ryugu Kingdom Prince", "PSY", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1125, 423, 133, 2554, 1206, 323, 1 ],
+    [ "Caribou, Caribou Pirates Captain", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 144, 144, 22, 1042, 651, 149, 1 ],
+    [ "Wet Haired Caribou, Caribou Pirates Captain", "QCK", [ "Driven", "Shooter" ], 5, 30, 10, 4, 99, 4000000, 959, 579, 89, 2340, 1484, 257, 1 ],
+    [ "Vander Decken IX, Lord of the Ghost Ship", "DEX", [ "Slasher", "Shooter" ], 4, 15, 6, 3, 50, 392109, 123, 119, 29, 1000, 589, 171, 1 ],
+    [ "Vander Decken IX, Captain of the Flying Pirates", "DEX", [ "Slasher", "Shooter" ], 5, 30, 5, 4, 99, 4000000, 929, 532, 132, 2198, 1393, 316, 1 ],
+    [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 91, 89, 44, 935, 478, 232, 1 ],
+    [ "Madame Shyarly, Fortune Teller", "INT", [ "Fighter", "Cerebral" ], 5, 30, 8, 4, 99, 4000000, 878, 422, 154, 1976, 999, 486, 1 ],
+    [ "Sanji, Wild Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, null, null, null, null ],
+    [ "Sanji, Pioneer Of Land", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2625, 1289, 250, null ],
+    [ "Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 4, 25, 6, 2, 70, 1066998, 505, 303, 41, null, null, null, null ],
+    [ "Destruction Cannon Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 5, 40, null, 3, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Don Krieg", "STR", [ "Driven", "Shooter" ], 3, 16, 7, 2, 50, 392109, 177, 106, 14, null, null, null, null ],
+    [ "Don Krieg, East Blue Supreme Ruler", "STR", [ "Driven", "Shooter" ], 4, 26, 8, 3, 99, 3000000, 1200, 476, 30, 2707, 1225, 106, null ],
+    [ "Mr. 5, Bomb Human", "QCK", "Shooter", 3, 10, 6, 2, 35, 136167, 288, 147, 35, null, null, null, null ],
+    [ "Mr. 5, Baroque Works Officer Agent", "QCK", "Shooter", 4, 20, 6, 3, 70, 1778330, 733, 325, 44, 1618, 818, 198, null ],
+    [ "6+ Sabo", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1534, 777, 277, 3234, 1534, 452, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From a98c1f843d0a2658cccddd4a20f2b52a3a41b397 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 1 Mar 2017 18:36:26 -0500
Subject: [PATCH 0923/1569] Vander Decken isn't Madame Waifu

---
 common/data/cooldowns.js  | 4 ++--
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d31a35cc2..17cd64559 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1484,8 +1484,8 @@ window.cooldowns = [
     15,
     [ 14, 14 ],
     [ 14, 14 ],
-    28,
-    28,
+    [ 28, 13 ],
+    [ 28, 13 ],
     [ 20, 10 ],
     [ 20, 10 ],
     [ 20, 11 ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7d83a54de..5122d3410 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2288,7 +2288,7 @@ window.evolutions = {
         evolvers: [ 83, 85, 94, 131, 301 ]
     },
     1480: {
-        evolution: 1482,
+        evolution: 1481,
         evolvers: [ 118, 86, 94, 102, 302 ]
     },
     1482: {
diff --git a/common/data/units.js b/common/data/units.js
index 5bad48f81..b4ebc8e54 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1485,7 +1485,7 @@ window.units = [
     [ "Sanji, Wild Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, null, null, null, null ],
     [ "Sanji, Pioneer Of Land", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2625, 1289, 250, null ],
     [ "Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 4, 25, 6, 2, 70, 1066998, 505, 303, 41, null, null, null, null ],
-    [ "Destruction Cannon Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 5, 40, null, 3, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Destruction Cannon Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 5, 40, 4, 3, 99, 4000000, null, null, null, 2099, 1339, 302, null ],
     [ "Don Krieg", "STR", [ "Driven", "Shooter" ], 3, 16, 7, 2, 50, 392109, 177, 106, 14, null, null, null, null ],
     [ "Don Krieg, East Blue Supreme Ruler", "STR", [ "Driven", "Shooter" ], 4, 26, 8, 3, 99, 3000000, 1200, 476, 30, 2707, 1225, 106, null ],
     [ "Mr. 5, Bomb Human", "QCK", "Shooter", 3, 10, 6, 2, 35, 136167, 288, 147, 35, null, null, null, null ],

From 1c032ac63c2a1a203450ac2df327b5b4379beac3 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Sat, 4 Mar 2017 19:38:52 +0100
Subject: [PATCH 0924/1569] Changed link to mroe up to date Spanish DB

---
 common/views/links.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/views/links.html b/common/views/links.html
index 177adb63e..68404601e 100644
--- a/common/views/links.html
+++ b/common/views/links.html
@@ -71,7 +71,7 @@
         </div>
         
         <div class="rotater" id="link-es" title="Spanish DB" ng-if="exclude != 'turtles'">
-            <a class="btn btn-icon" target="_blank" href="https://optc-sp.github.io/">
+            <a class="btn btn-icon" target="_blank" href="https://optces.github.io/">
                 <i class="fa fa-database"></i>
             </a>
             <a class="tip top">Spanish DB</a>

From 2dad0eb759a64d4ef763ccd6ea7c359b49454b4e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 7 Mar 2017 00:13:33 -0500
Subject: [PATCH 0925/1569] Big details dump

---
 common/data/aliases.js    |  33 ++++++--
 common/data/cooldowns.js  |  20 +++++
 common/data/details.js    | 153 ++++++++++++++++++++++++++++++++++----
 common/data/evolutions.js |   8 ++
 common/data/gw.js         |  16 ++++
 common/data/matchers.js   |   2 +-
 common/data/specials.js   |   4 +-
 common/data/units.js      |  36 +++++++--
 common/js/utils.js        |   2 +-
 9 files changed, 240 insertions(+), 34 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 06fe222b9..13432cb2e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1482,13 +1482,30 @@ window.aliases = {
     1481: ['バンダー・デッケン九世 フライング海賊団船長', '', ''],
     1482: ['マダム・シャーリー', '', ''],
     1483: ['マダム・シャーリー 占い師', '', ''],
-    1484: ['', '', 'Wild Sanji'],
-    1485: ['', '', 'Wild Sanji'],
-    1486: ['', '', 'Coliseum Ideo'],
-    1487: ['', '', 'Coliseum Ideo'],
-    1488: ['', '', 'Coliseum Don Krieg'],
-    1489: ['', '', 'Coliseum Don Krieg'],
-    1490: ['', '', 'Coliseum Mr. 5'],
-    1491: ['', '', 'Coliseum Mr. 5'],
+    1484: ['サンジ 野生の海賊', '', 'Wild Sanji'],
+    1485: ['サンジ 大地の開拓者', '', 'Wild Sanji'],
+    1486: ['イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
+    1487: ['破壊砲　イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
+    1488: ['首領・クリーク 海賊艦隊「提督」', '', 'Coliseum Don Krieg'],
+    1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg'],
+    1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5'],
+    1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5'],
     1492: ['', '', 'Mega Sabo'],
+    1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', ''],
+    1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
+    1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
+    1496: ['一発必中の砲撃部隊 魚人街の無法者', '', ''],
+    1497: ['一発入魂の砲撃部隊 魚人街の無法者', '', ''],
+    1498: ['赤のアンモナイツ 丈夫な警備隊', '', ''],
+    1499: ['青のアンモナイツ 機敏な警備隊', '', ''],
+    1500: ['緑のアンモナイツ 利発な警備隊', '', ''],
+    1501: ['カリブー', '', ''],
+    1502: ['コリブー', '', ''],
+    1503: ['ハモンド', '', ''],
+    1504: ['バンダー・デッケン九世', '', ''],
+    1505: ['ホーディ・ジョーンズ', '', ''],
+    1506: ['ホーディ・ジョーンズ 覚醒', '', ''],
+    1507: ['', '', ''],
+    1508: ['', '', ''],
+    1509: ['', '', ''],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 17cd64559..1330ab435 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1491,4 +1491,24 @@ window.cooldowns = [
     [ 20, 11 ],
     [ 20, 11 ],
     null,//6+ Sabo
+    22,
+    19,
+    19,
+    18,
+    16,
+    17,
+    15,
+    20,
+    15,
+    16,
+    14,
+    19,
+    22,
+    22,
+    [ 20, 16 ],
+    [ 20, 16 ],
+    18,
+    14,
+    19,
+    19,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 2659556c3..799f720f4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4484,7 +4484,7 @@ window.details = {
         captain: "Boosts ATK of Slasher characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         specialName: "Ties with Ace",
         special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
     },
     950: {
         captain: "Boosts ATK of Fighter and Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
@@ -5462,12 +5462,12 @@ window.details = {
     },
     1107: {
         captain: "Boosts ATK and HP of Driven characters by 1.5x",
-        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters into matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs into matching orbs for Driven characters. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
     },
     1108: {
         captain: "Boosts ATK and HP of Driven characters by 2x",
-        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs on Driven characters into matching orbs. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs into matching orbs for Driven characters. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
     },
     1109: {
@@ -6453,7 +6453,8 @@ window.details = {
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
         special: "Changes adjacent orbs into [INT] orbs. Deals 20x character's ATK in [INT] damage to all enemies.",
         specialName: "Reversed Twin Blades - Surprise Thrust",
-        sailor: "Reduces own Silence by 1 Turn"
+        sailor: "Reduces own Silence by 1 Turn",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
     },
     1253: {// Coliseum Shura
         captain: "Boosts ATK of [DEX] characters by 2.25x if HP is above 99% at the start of the turn",
@@ -6617,6 +6618,7 @@ window.details = {
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Handling Hell",
     },
     1276: {//Shiliew Evo
@@ -6624,6 +6626,7 @@ window.details = {
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Handling Hell",
     },
     1277: {//Doc Q
@@ -7237,6 +7240,7 @@ window.details = {
         ],
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
         sailor: "Completely resists Silence on this character",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Black Ball - Thundercloud Rod",
     },
     1366: {//Timeskip Nami
@@ -7257,6 +7261,7 @@ window.details = {
         ],
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
         sailor: "Completely resists Silence on this character",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Black Ball - Thundercloud Rod",
     },
     1367: {//Timeskip Sanji
@@ -7386,21 +7391,25 @@ window.details = {
     1381: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Tashigi Special",
     },
     1382: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.75x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Tashigi Special",
     },
     1383: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Angry Extermination of Bugs",
     },
     1384: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2.5x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Angry Extermination of Bugs",
     },
     1385: {//Rebecca
@@ -7780,14 +7789,18 @@ window.details = {
     1439: {//Daruma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.2x",
         special: "Reduces Paralysis and Silence duration by 2 turns, cuts the current HP of one enemy by 10%, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
     },
     1440: {//Daruma
         captain: "Reduces cooldown of all specials by 4 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.5x",
         special: "Reduces Paralysis and Silence duration by 2 turns, cuts the current HP of one enemy by 10%, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
     },
     1441: {//Zeo
         captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
@@ -7957,12 +7970,12 @@ window.details = {
     },
     1466: {//Secret Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2x",
-        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [STR] and friend captain's orb into [PSY]",
+        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [PSY] and friend captain's orb into [STR]",
         specialName: "Cavendish Special",
     },
     1467: {//Secret Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2.25x and their RCV by 1.3x",
-        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [STR] and friend captain's orb into [PSY]",
+        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [PSY] and friend captain's orb into [STR]",
         specialName: "Cavendish Special",
     },
     1468: {//Fortnight Sentomaru 
@@ -8064,7 +8077,7 @@ window.details = {
     1480: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row",
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Vander Decken IX Special",
@@ -8072,7 +8085,7 @@ window.details = {
     1481: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Vander Decken IX Special",
@@ -8095,13 +8108,13 @@ window.details = {
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
         special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
         sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
-        specialName: "Sanji Special",
+        specialName: "Wild Shot",
     },
     1485: {//Wild Sanji
-        captain: "Boosts HP and ATK slightly and boosts ATK by 3.25x after scoring 3 Perfects in a row",
+        captain: "Boosts HP and RCV of all characters by 1.2x and boosts ATK by 3.25x after scoring 3 Perfects in a row",
         special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
         sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
-        specialName: "Sanji Special",
+        specialName: "Wild Shot",
     },
     1486: {//Coliseum Ideo
         captain: "Boosts ATK of Fighter characters by 2.5x if they have a matching orb.",
@@ -8128,14 +8141,14 @@ window.details = {
     1490: {//Coliseum Mr. 5
         captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
-        specialName: "Mr. 5 Special",
+        specialName: "Explosion Blocking Escape",
     },
     1491: {//Coliseum Mr. 5
         captain: "Boosts ATK by 2x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
-        specialName: "Mr. 5 Special",
+        specialName: "Explosion Blocking Escape",
     },
-    1492: {//6+ Sabo CHANGE THIS IF THIS ISN'T SABO
+    1492: {//6+ Sabo
         captain: "Boosts HP and RCV of all characters by ???x, boosts ATK of Free Spirit characters by 2.75x",
         captainNotes: "HP and RCV boost are not known yet, but are assumed to be for anyone and is a 1.2x boost for both in the calculator.",
         special: [
@@ -8150,4 +8163,116 @@ window.details = {
         ],
         specialName: "Burning Dragon Claw Fist",
     },
+    1493: {//STR Fishman Outlaw
+        captain: "Boosts ATK of [STR] characters by 1.5x",
+        special: "Deals 5 hits of random typeless damage to random enemies",
+        specialNotes: "#{randomHits : 5}",
+        specialName: "Random Light Blows",
+    },
+    1494: {//QCK Fishman Outlaw
+        captain: "Boosts ATK of [QCK] characters by 1.5x",
+        special: "Locks captain's orb for 1 turn",
+        specialName: "Captain Slot Light Hold",
+    },
+    1495: {//DEX Fishman Outlaw
+        captain: "Boosts ATK of [DEX] characters by 1.5x",
+        special: "Reduces Silence duration by 1 turn",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialName: "Special Bind Light Recovery",
+    },
+    1496: {//INT Fishman Outlaw
+        captain: "Boosts ATK of Powerhouse characters by 1.5x",
+        special: "Reduces Despair duration by 2 turns",
+        specialName: "Captain Soul Recovery",
+    },
+    1497: {//PSY Fishman Outlaw
+        captain: "Boosts ATK of Shooter characters by 1.5x",
+        special: "Boosts own ATK by 1.5x for 1 turn",
+        specialName: "Light Attack Boost",
+    },
+    1498: {//STR Fishman Guard
+        captain: "Boosts ATK, HP and RCV of [STR] characters by 1.2x",
+        special: "Changes Captain's orb into [STR]",
+        specialName: "Captain Slot Change - [STR]",
+    },
+    1499: {//QCK Fishman Guard
+        captain: "Boosts ATK, HP and RCV of [QCK] characters by 1.5x",
+        special: "Changes Captain's [BLOCK] orbs into Matching orbs",
+        specialName: "Captain [BLOCK] Slot Change - Matching",
+    },
+    1500: {//DEX Fishman Guard
+        captain: "Boosts ATK, HP and RCV of [DEX] characters by 1.5x",
+        special: "Recovers 2000 HP",
+        specialName: "First Aid",
+    },
+    1501: {//Caribou
+        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight, boosts ATK of characters with cost 15 or less by 2x",
+        special: "Reduces crew's current HP by 50%, boosts ATK of all characters by 1.3x for 1 turn",
+        specialName: "Conviction of God's Will",
+    },
+    1502: {//Coribou
+        captain: "Reduces damage received from [PSY] and [INT] enemies by 30%",
+        special: "Randomizes non-matching orbs for Driven characters",
+        specialName: "Confession Burial",
+    },
+    1503: {//Hammond
+        captain: "Boosts ATK of Powerhouse characters proportionally to the crew's current HP",
+        captainNotes: "#{captainProportional : lower : ??? + ??? * (1 - (remaining HP) / (total HP)) : ??? : 2.25}",
+        special: "Randomizes non-matching orbs for Driven characters",
+        specialName: "Absurd Invitation",
+    },
+    1504: {//Vander Decken IX
+        captain: "Boosts ATK of Driven characters by 2x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 2.4x instead.",
+        special: "Changes the orbs in the middle row into [EMPTY] orbs and deals 20x character's ATK as [DEX] damage to all enemies at the end of the turn for 2 turns",
+        specialName: "Inexcapable Pursuit",
+    },
+    1505: {//Hody Jones
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.25x if HP is below ???% at the start of the turn",
+        special: "Deals large [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
+        specialName: "Shark Arrows",
+    },
+    1506: {//Hody Jones
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.5x if HP is below ???% at the start of the turn, 2.25x otherwise",
+        special: "Deals large [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
+        specialName: "Shark Arrows",
+    },
+    1507: {//White Day Sanji
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
+        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 1.69x ATK",
+        special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
+        sailor: "Boosts ATK of all characters by 15",
+        specialName: "Diable Jambe - Concassé Baked",
+    },
+    1508: {//White Day Sanji
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
+        captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK",
+        special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
+        sailor: "Boosts ATK of all characters by 15",
+        specialName: "Diable Jambe - Concassé Baked",
+    },
+    1509: {//Haruta
+        captain: "Reduces cooldown of Slasher and Cerebral specials by 1 turn at the start of the fight. Boosts ATK of [INT] characters by 2x.",
+        special: "Deals 12x character's ATK in INT damage to one enemy and reduces damage received from PSY enemies by 80%.",
+        specialName: "Haruta Special",
+        sailor: "Reduces Silence duration against this unit by 2 turns",
+        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+    },
+    1510: {//Speed Jiru
+        captain: "Boosts ATK of Driven and Striker characters by 2x",
+        special: "Deals 15,000 fixed damage to one enemy",
+        specialName: "Genocide Jil Special",
+        sailor: "When HP is above 70% at the start of the turn, boosts ATK of Striker characters by 20",
+    },
+    1511: {//Atmos
+        captain: "Boosts ATK of PSY characters by 2x",
+        special: "Deals 15,000 fixed damage to one enemy",
+        specialName: "Atmos Special",
+        sailor: "Boosts ATK of Powerhouse characters by 20 if your captain is a Powerhouse character",
+    },
+    1512: {//Kingdew
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
+        special: "Removes poison, boosts ATK of Powerhouse characters by 1.5x for 1 turn if HP is below 30% when the special is activated",
+        specialName: "Kingdew Special",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 5122d3410..92b2e7ace 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2311,4 +2311,12 @@ window.evolutions = {
         evolution: 1491,
         evolvers: [  ]
     },
+    1505: {
+        evolution: 1506,
+        evolvers: [  ]
+    },
+    1507: {
+        evolution: 1508,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index 1e7b05535..8544373a4 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1491,4 +1491,20 @@ window.gw=[
     52210,
     52210,
     15191,
+    52607,
+    52606,
+    52604,
+    52602,
+    52601,
+    52600,
+    52599,
+    52598,
+    52492,
+    52491,
+    52493,
+    52494,
+    52490,
+    52490,
+    52628,
+    52628,
 ];
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 1159b316c..81f331c0a 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -189,7 +189,7 @@ window.matchers = [
     {
         name: 'Orb lockers',
         target: 'special',
-        matcher: /locks.+orbs/i
+        matcher: /locks.+orb/i
     },
 
     {
diff --git a/common/data/specials.js b/common/data/specials.js
index f54f033f0..1c81bad99 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2170,13 +2170,13 @@ window.specials = {
     },
     1476: {
         atk: function(p) {
-            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+            return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
         },
         type: "class"
     },
     1477: {
         atk: function(p) {
-            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+            return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
         },
         type: "class"
     },
diff --git a/common/data/units.js b/common/data/units.js
index b4ebc8e54..62b0fd677 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1482,15 +1482,35 @@ window.units = [
     [ "Vander Decken IX, Captain of the Flying Pirates", "DEX", [ "Slasher", "Shooter" ], 5, 30, 5, 4, 99, 4000000, 929, 532, 132, 2198, 1393, 316, 1 ],
     [ "Madame Shyarly", "INT", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 91, 89, 44, 935, 478, 232, 1 ],
     [ "Madame Shyarly, Fortune Teller", "INT", [ "Fighter", "Cerebral" ], 5, 30, 8, 4, 99, 4000000, 878, 422, 154, 1976, 999, 486, 1 ],
-    [ "Sanji, Wild Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, null, null, null, null ],
-    [ "Sanji, Pioneer Of Land", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2625, 1289, 250, null ],
-    [ "Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 4, 25, 6, 2, 70, 1066998, 505, 303, 41, null, null, null, null ],
-    [ "Destruction Cannon Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 5, 40, 4, 3, 99, 4000000, null, null, null, 2099, 1339, 302, null ],
-    [ "Don Krieg", "STR", [ "Driven", "Shooter" ], 3, 16, 7, 2, 50, 392109, 177, 106, 14, null, null, null, null ],
-    [ "Don Krieg, East Blue Supreme Ruler", "STR", [ "Driven", "Shooter" ], 4, 26, 8, 3, 99, 3000000, 1200, 476, 30, 2707, 1225, 106, null ],
-    [ "Mr. 5, Bomb Human", "QCK", "Shooter", 3, 10, 6, 2, 35, 136167, 288, 147, 35, null, null, null, null ],
-    [ "Mr. 5, Baroque Works Officer Agent", "QCK", "Shooter", 4, 20, 6, 3, 70, 1778330, 733, 325, 44, 1618, 818, 198, null ],
+    [ "Sanji, Wild Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, 1225, 573, 138, 1 ],
+    [ "Sanji, Pioneer Of Land", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1141, 494, 84, 2625, 1289, 250, 1 ],
+    [ "Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 4, 25, 6, 2, 70, 1066998, 505, 350, 41, 1158, 717, 166, 1 ],
+    [ "Destruction Cannon Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1087, 640, 119, 2099, 1339, 302, 1 ],
+    [ "Don Krieg, Krieg Pirates Fleet Admiral", "STR", [ "Driven", "Shooter" ], 3, 16, 7, 2, 50, 392109, 177, 106, 14, 1271, 540, 55, 1 ],
+    [ "Don Krieg, East Blue Supreme Ruler", "STR", [ "Driven", "Shooter" ], 4, 26, 8, 3, 99, 3000000, 1200, 476, 30, 2707, 1225, 106, 1 ],
+    [ "Mr. 5, Bomb Human", "QCK", "Shooter", 3, 10, 6, 2, 35, 136167, 101, 56, 21, 808, 401, 74, 1 ],
+    [ "Mr. 5, Baroque Works Officer Agent", "QCK", "Shooter", 4, 20, 6, 3, 70, 1066998, 733, 325, 44, 1618, 818, 198, 1 ],
     [ "6+ Sabo", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1534, 777, 277, 3234, 1534, 452, null ],
+    [ "Rough Fishman Outlaw", "STR", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 73, 42, 13, 1173, 749, 143, 1 ],
+    [ "Fast-paced Fishman Outlaw", "QCK", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 71, 37, 16, 1167, 701, 169, 1 ],
+    [ "Skilled Fishman Outlaw", "DEX", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 67, 40, 15, 1143, 737, 157, 1 ],
+    [ "Surefire Bombardment Fishman Outlaw", "INT", [ "Powerhouse", "Shooter" ], 3, 12, 6, 1, 60, 449516, 63, 43, 17, 1137, 750, 173, 1 ],
+    [ "One Shot Bombardment Fishman Outlaw", "PSY", [ "Powerhouse", "Shooter" ], 3, 12, 6, 1, 60, 449516, 57, 47, 14, 1093, 773, 153, 1 ],
+    [ "Durable Fishman Guard", "STR", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 83, 35, 18, 1247, 697, 174, 1 ],
+    [ "Agile Fishman Guard", "QCK", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 79, 30, 22, 1237, 673, 183, 1 ],
+    [ "Clever Fishman Guard", "DEX", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 77, 33, 20, 1217, 683, 117, 1 ],
+    [ "Caribou", "INT", [ "Driven", "Shooter" ], 3, 15, 6, 2, 70, 1066998, 194, 87, 14, 1647, 974, 74, 1 ],
+    [ "Coribou", "PSY", [ "Driven", "Striker" ], 3, 15, 6, 2, 70, 1066998, 152, 75, 25, 1425, 852, 152, 1 ],
+    [ "Hammond", "QCK", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 217, 71, 17, 1701, 817, 117, 1 ],
+    [ "Vander Decken IX", "DEX", [ "Driven", "Slasher" ], 4, 20, 5, 3, 99, 3000000, 182, 102, 15, 2218, 1182, 188, 1 ],
+    [ "Hody Jones", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 6, 1, 50, 392109, 141, 69, 0, 1041, 594, 31, 1 ],
+    [ "Hody Jones, Awakened", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 6, 3, 99, 3000000, 1014, 494, 29, 2741, 1294, 104, 1 ],
+    [ "White Day Sanji", "QCK", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 153, 90, 23, 1030, 489, 122, null ],
+    [ "White Day Sanji, Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 949, 402, 90, 2200, 1130, 247, null ],
+    [ "Haruta, Whitebeard 12th Div. Commander", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Speed Jil, Whitebeard 14th Div. Commander ", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Atmos, Whitebeard 13th Div. Commander", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kingdew, Whitebeard 11th Div. Commander", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/utils.js b/common/js/utils.js
index 1a6487c26..eb8e339a4 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@
         'Skypiea (Guard|Enforcer)', 'Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard'
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard', 'Fishman (Guard|Outlaw)'
     ].join(')|(') + ')', 'i');
 
     var utils = {};

From c9767e17f5a4250f33976953ddfe1849d6946d5b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 7 Mar 2017 00:14:14 -0500
Subject: [PATCH 0926/1569] new chars

---
 common/data/units.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 62b0fd677..d57928ef0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1507,10 +1507,10 @@ window.units = [
     [ "Hody Jones, Awakened", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 6, 3, 99, 3000000, 1014, 494, 29, 2741, 1294, 104, 1 ],
     [ "White Day Sanji", "QCK", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 153, 90, 23, 1030, 489, 122, null ],
     [ "White Day Sanji, Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 949, 402, 90, 2200, 1130, 247, null ],
-    [ "Haruta, Whitebeard 12th Div. Commander", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Speed Jil, Whitebeard 14th Div. Commander ", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Atmos, Whitebeard 13th Div. Commander", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kingdew, Whitebeard 11th Div. Commander", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Haruta, Whitebeard 12th Div. Commander", "INT", [ "Cerebral", "Slasher" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Speed Jil, Whitebeard 14th Div. Commander ", "INT", [ "Driven", "Striker" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Atmos, Whitebeard 13th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 1e463d6b1310ff880ba2cbdb612c4ba5efed558f Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 7 Mar 2017 02:16:46 -0500
Subject: [PATCH 0927/1569] Rest of the update

---
 common/data/aliases.js    |  9 ++++-
 common/data/captains.js   | 85 ++++++++++++++++++++++++++++++++++++++-
 common/data/cooldowns.js  |  2 +
 common/data/details.js    | 26 ++++++++----
 common/data/drops.js      | 33 ++++++++++++++-
 common/data/evolutions.js | 14 ++++---
 common/data/families.js   | 22 ++++++++++
 common/data/flags.js      |  4 ++
 common/data/gw.js         |  6 +++
 common/data/specials.js   | 40 ++++++++++++++++++
 common/data/units.js      | 10 +++--
 common/data/zombies.js    |  4 ++
 12 files changed, 233 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 13432cb2e..c517f14a0 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1505,7 +1505,12 @@ window.aliases = {
     1504: ['バンダー・デッケン九世', '', ''],
     1505: ['ホーディ・ジョーンズ', '', ''],
     1506: ['ホーディ・ジョーンズ 覚醒', '', ''],
-    1507: ['', '', ''],
-    1508: ['', '', ''],
+    1507: ['', '', 'Valentine Sanji'],
+    1508: ['', '', 'Valentine Sanji'],
     1509: ['', '', ''],
+    1510: ['', '', ''],
+    1511: ['', '', ''],
+    1512: ['', '', ''],
+    1513: ['', '', 'Anniversary Sanji'],
+    1514: ['', '', 'Anniversary Sanji'], 
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index a2d59b5f0..eab48f5c6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3025,13 +3025,13 @@ window.captains = {
         atk: function(p) {
             return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
         },
-        hp: function(p) { return 1.25; }
+        hp: function(p) { return 1.2; }
     },
     1192: {
         atk: function(p) {
             return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
         },
-        hp: function(p) { return 1.25; }
+        hp: function(p) { return 1.2; }
     },
     1193: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
@@ -4271,4 +4271,85 @@ window.captains = {
         hp: function(p) { return 1.2; },
         rcv: function(p) { return 1.2; }
     },
+    1493: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+    },
+    1494: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+    },
+    1495: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+    },
+    1496: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+    },
+    1497: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+    },
+    1498: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+    },
+    1499: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    1500: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    1501: {
+        atk: function(p) { return p.unit.cost <= 15 ? 2 : 1; }
+    },
+    1504: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.4, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1505: {
+        atk: function(p) { return !(p.unit.class.has("Powerhouse")) ? 1 : p.percHP <= 30.0 ? 2.25 : 1; }
+    },
+    1506: {
+        atk: function(p) { return !(p.unit.class.has("Powerhouse")) ? 1 : p.percHP <= 30.0 ? 2.5 : 2.25; }
+    },
+    1507: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+                1;
+        }
+    },
+    1508: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 :
+                1;
+        }
+    },
+    1509: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+    },
+    1510: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1511: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+    },
+    1512: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+    },
+    1513: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1514: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1330ab435..6ee36c5bb 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1511,4 +1511,6 @@ window.cooldowns = [
     14,
     19,
     19,
+    [ 5, 5 ],
+    [ 5, 5 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 799f720f4..e8b71b79a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6001,12 +6001,12 @@ window.details = {
         sailor: "Boosts ATK of [QCK] characters by 40"
     },
     1191: {
-        captain: "Boosts ATK of all characters by 2x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
         specialName: "Ice Age",
     },
     1192: {
-        captain: "Boosts ATK of all characters by 2x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
         specialName: "Ice Age",
     },
@@ -8161,7 +8161,7 @@ window.details = {
                 "cooldown": [ 23, 17 ],
             },
         ],
-        specialName: "Burning Dragon Claw Fist",
+        specialName: "Reborn - Fire",
     },
     1493: {//STR Fishman Outlaw
         captain: "Boosts ATK of [STR] characters by 1.5x",
@@ -8196,12 +8196,12 @@ window.details = {
         specialName: "Captain Slot Change - [STR]",
     },
     1499: {//QCK Fishman Guard
-        captain: "Boosts ATK, HP and RCV of [QCK] characters by 1.5x",
+        captain: "Boosts ATK, HP and RCV of [QCK] characters by 1.2x",
         special: "Changes Captain's [BLOCK] orbs into Matching orbs",
         specialName: "Captain [BLOCK] Slot Change - Matching",
     },
     1500: {//DEX Fishman Guard
-        captain: "Boosts ATK, HP and RCV of [DEX] characters by 1.5x",
+        captain: "Boosts ATK, HP and RCV of [DEX] characters by 1.2x",
         special: "Recovers 2000 HP",
         specialName: "First Aid",
     },
@@ -8222,7 +8222,7 @@ window.details = {
         specialName: "Absurd Invitation",
     },
     1504: {//Vander Decken IX
-        captain: "Boosts ATK of Driven characters by 2x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 2.4x instead.",
+        captain: "Boosts ATK of Driven characters by 2x. After scoring 3 Perfects in a row, boosts ATK of Driven characters by 2.4x instead.",
         special: "Changes the orbs in the middle row into [EMPTY] orbs and deals 20x character's ATK as [DEX] damage to all enemies at the end of the turn for 2 turns",
         specialName: "Inexcapable Pursuit",
     },
@@ -8259,13 +8259,13 @@ window.details = {
     },
     1510: {//Speed Jiru
         captain: "Boosts ATK of Driven and Striker characters by 2x",
-        special: "Deals 15,000 fixed damage to one enemy",
+        special: "Deals 12,500 fixed damage to one enemy",
         specialName: "Genocide Jil Special",
         sailor: "When HP is above 70% at the start of the turn, boosts ATK of Striker characters by 20",
     },
     1511: {//Atmos
         captain: "Boosts ATK of PSY characters by 2x",
-        special: "Deals 15,000 fixed damage to one enemy",
+        special: "Reduces Despair duration by 3 turns, boosts own ATK by 1.5x for 1 turn",
         specialName: "Atmos Special",
         sailor: "Boosts ATK of Powerhouse characters by 20 if your captain is a Powerhouse character",
     },
@@ -8275,4 +8275,14 @@ window.details = {
         specialName: "Kingdew Special",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character",
     },
+    1513: {//Anniversary Sanji
+        captain: "Boosts ATK of Fighter characters by 1.75x and RCV of Powerhouse characters by 1.2x",
+        special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
+        specialName: "Sanji Special",
+    },
+    1514: {//Anniversary Sanji
+        captain: "Boosts ATK of Fighter characters by 2.5x and RCV of Powerhouse characters by 1.2x",
+        special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
+        specialName: "Sanji Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 798b39e8e..2b55e04bc 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -605,6 +605,27 @@ window.drops = {
             "09": [ 1392 ],
         },
         
+        {
+            name: "Fishman Island",
+            shortName: "Fishman Island",
+            thumb: 1506,
+            completion: '5x Rainbow Gems',
+            "01": [ 1501, 1502 ],
+            "02": [ 1502, 340 ],
+            "03": [  ],
+            "04": [  ],
+            "05": [ 1503 ],
+            "06": [  ],
+            "07": [  ],
+            "08": [  ],
+            "09": [  ],
+            "10": [  ],
+            "11": [  ],
+            "12": [  ],
+            "13": [ 1504 ],
+            "14": [ 1505 ],
+        },
+        
     ],
 
     'Weekly Island': [
@@ -1322,6 +1343,13 @@ window.drops = {
             "All Difficulties": [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470 ]
         },
         
+        {
+            name: "Exit! Whitebeard Pirates",
+            thumb: 1509,
+            condition: "You can only bring PSY units",
+            "All Difficulties": [ 1509, 1510, 1511, 1512, -1001, -1316, -1280, -314, -908, -16, -1446, -1370, -1368, -816 ],
+        },
+        
     ],
 
             
@@ -1479,6 +1507,7 @@ window.drops = {
         
         {
             name: 'Clash!! Sabo',
+            global: true,
             thumb: 1047,
             Ultimate: [ 1046 ],
             Master: [ 1046 ],
@@ -1556,10 +1585,12 @@ window.drops = {
         },
         
         {
-            name: 'Valentines Day Characters',
+            name: 'Valentines Day and White Day Characters',
             thumb: 1463,
             "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
             "Chopper": [ 1464, 1155, 333, 334, 728, 1061, 83, 94, 115, 116, 117, 266, 1180, 109, 114, 193, 346 ],
+            "Sanji": [ 1507, 52, 207, 892, 343, 190, 111, 106, 115, 116, 117, 1180, 266, 94, 83 ],
+            "Brook": [  ],
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 92b2e7ace..a42f874cc 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2297,26 +2297,30 @@ window.evolutions = {
     },
     1484: {
         evolution: 1485,
-        evolvers: [  ]
+        evolvers: [ 95, 96, 97, 300, 100 ]
     },
     1486: {
         evolution: 1487,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 97, 302, 102 ]
     },
     1488: {
         evolution: 1489,
-        evolvers: [  ]
+        evolvers: [ 84, 89, 94, 95, 300 ]
     },
     1490: {
         evolution: 1491,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 90, 96 ]
     },
     1505: {
         evolution: 1506,
-        evolvers: [  ]
+        evolvers: [ 118, 95, 99, 300, 304 ]
     },
     1507: {
         evolution: 1508,
         evolvers: [  ]
     },
+    1513: {
+        evolution: 1514,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index a23e8c596..d5b71f08b 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1491,4 +1491,26 @@ window.families = [
     "Mr. 5",
     "Mr. 5",
     "Sabo",
+    "Rough Fishman Outlaw",
+    "Fast-paced Fishman Outlaw",
+    "Skilled Fishman Outlaw",
+    "Surefire Bombardment Fishman Outlaw",
+    "One Shot Bombardment Fishman Outlaw",
+    "Durable Fishman Guard",
+    "Agile Fishman Guard",
+    "Clever Fishman Guard",
+    "Caribou",
+    "Coribou",
+    "Hammond",
+    "Vander Decken IX",
+    "Hody Jones",
+    "Hody Jones",
+    "Sanji",
+    "Sanji",
+    "Haruta",
+    "Speed Jiru",
+    "Atmos",
+    "Kingdew",
+    "Sanji",
+    "Sanji",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 57a73ccd8..46f3f5ad7 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1015,6 +1015,8 @@ window.flags = {
     1039: { global: 1 },
     1044: { rr: 1, rro: 1, global: 1 },
     1045: { rr: 1, rro: 1, global: 1 },
+    1046: { global: 1 },
+    1047: { global: 1 },
     1048: { global: 1 },
     1049: { global: 1 },
     1050: { global: 1 },
@@ -1302,4 +1304,6 @@ window.flags = {
     1483: { rr: 1, rro: 1 },
     1484: { shop: 1 },
     1485: { shop: 1 },
+    1513: { rr: 1, rro: 1, lrr: 1 },
+    1514: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 8544373a4..7fa98eac2 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1507,4 +1507,10 @@ window.gw=[
     52490,
     52628,
     52628,
+    52632,
+    52634,
+    52633,
+    52635,
+    52663,
+    52663,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 1c81bad99..b37dece6d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2236,4 +2236,44 @@ window.specials = {
             });
         }
     },
+    1497: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        type: "type"
+    },
+    1501: {
+        atk: function(p) { return 1.3; },
+        type: "type"
+    },
+    1505: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        type: "type"
+    },
+    1506: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        type: "type"
+    },
+    1507: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
+    },
+    1508: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
+    },
+    1511: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        type: "type"
+    },
+    1512: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? window.specials[1512].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1512].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.5 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '1512warning'
+            });
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index d57928ef0..fa8eb8eb2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1507,10 +1507,12 @@ window.units = [
     [ "Hody Jones, Awakened", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 6, 3, 99, 3000000, 1014, 494, 29, 2741, 1294, 104, 1 ],
     [ "White Day Sanji", "QCK", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 153, 90, 23, 1030, 489, 122, null ],
     [ "White Day Sanji, Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 949, 402, 90, 2200, 1130, 247, null ],
-    [ "Haruta, Whitebeard 12th Div. Commander", "INT", [ "Cerebral", "Slasher" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Speed Jil, Whitebeard 14th Div. Commander ", "INT", [ "Driven", "Striker" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Atmos, Whitebeard 13th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Haruta, Whitebeard 12th Div. Commander", "INT", [ "Cerebral", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 40, 49, 34, null, null, null, null ],
+    [ "Speed Jil, Whitebeard 14th Div. Commander ", "INT", [ "Driven", "Striker" ], 4, 25, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Atmos, Whitebeard 13th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 25, null, 3, 99, 3000000, 51, 35, 35, null, null, null, null ],
+    [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], 4, 25, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Anniversary Sanji", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, null, 2, null, null, null, null, null, null, null, null, null ],
+    [ "Anniversary Sanji, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, null, null, null, null, 1858, 1157, 332, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index cb16f9ddd..d5c260401 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -331,4 +331,8 @@ window.zombies = {
         type: 'healer',
         multiplier: 5
     },
+    1508: { // Tea Time Sanji
+        type: 'healer',
+        multiplier: 2
+    },
 };

From 51889091849c4300072d067979ddf7778b457c61 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Wed, 8 Mar 2017 11:51:07 -0500
Subject: [PATCH 0928/1569] New FN units

---
 common/data/aliases.js    | 32 ++++++++++++++++----------------
 common/data/cooldowns.js  | 10 +++++-----
 common/data/details.js    | 18 +++++++++---------
 common/data/evolutions.js |  4 ++--
 common/data/specials.js   | 12 ++++++++++++
 common/data/units.js      | 16 ++++++++--------
 6 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c517f14a0..4b61bd9a5 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1297,14 +1297,14 @@ window.aliases = {
     1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード','','Halloween Kalifa'],
     1297: ['赤犬','','Raid Sakazuki'],
     1298: ['赤犬 マグマ人間','','Raid Sakazuki'],
-    1299: ['レベッカ　ラブリーモンスターキャット','',''],
-    1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード','',''],
+    1299: ['レベッカ　ラブリーモンスターキャット','','Halloween Rebecca'],
+    1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード','','Halloween Rebecca'],
     1301: ['受刑者　バギー','','Baggy'],
     1302: ['受刑者　道化のバギー 脱獄同盟','','Baggy'],
     1303: ['脱走囚　ギャルディーノ','','Mr 3', 'Mr. 3'],
     1304: ['脱走囚　ギャルディーノ 脱獄同盟','','Mr 3', 'Mr. 3'],
-    1305: ['シュガー　リトルサキュバス','',''],
-    1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','',''],
+    1305: ['シュガー　リトルサキュバス','','Halloween Sugar'],
+    1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','','Halloween Sugar'],
     1307: ['バルトロメオ　フルムーンウルフ','','Halloween Bartolomeo'],
     1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード','','Halloween Bartolomeo'],
     1309: ['錦えもん','','Coliseum Kinemon'],
@@ -1323,8 +1323,8 @@ window.aliases = {
     1322: ['海軍本部中将モモンガ 怪物斬りの名将','',''],
     1323: ['オニグモ 八刀流の剣士','',''],
     1324: ['海軍本部中将オニグモ 八刀流の剣士','',''],
-    1325: ['コラソン　ロイヤルヴァンパイア','',''],
-    1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード','',''],
+    1325: ['コラソン　ロイヤルヴァンパイア','','Halloween Corazon'],
+    1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード','','Halloween Corazon'],
     1327: ['レオ トンタッタ族トンタ兵団','',''],
     1328: ['戦士レオ トンタッタ族トンタ兵団','',''],
     1329: ['ウィッカ','',''],
@@ -1460,12 +1460,12 @@ window.aliases = {
     1459: ['ミス・バレンタイン キロキロの実の能力者', '', 'Coliseum Miss Valentine'],
     1460: ['ミス・バレンタイン Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Miss Valentine'],
     1461: ['ゾロの寒稽古', '', 'Winter Zoro'],
-    1462: ['ルフィのブレイクタイム', '', 'Valentine Luffy'],
-    1463: ['ルフィのティーパーティ', '', 'Valentine Luffy'],
-    1464: ['チョッパーのブレイクタイム', '', 'Valentine Chopper'],
-    1465: ['チョッパーのティーパーティ', '', 'Valentine Chopper'],
-    1466: ['', '', 'Valentine Cavendish'],
-    1467: ['', '', 'Valentine Cavendish'],
+    1462: ['ルフィのブレイクタイム', '', 'White Day Luffy'],
+    1463: ['ルフィのティーパーティ', '', 'White Day Luffy'],
+    1464: ['チョッパーのブレイクタイム', '', 'White Day Chopper'],
+    1465: ['チョッパーのティーパーティ', '', 'White Day Chopper'],
+    1466: ['キャベンディッシュ 白い日の優男', '', 'White Day Cavendish'],
+    1467: ['キャベンディッシュ 白い日の白昼夢', '', 'White Day Cavendish'],
     1468: ['戦桃丸 海兵', '', ''],
     1469: ['鉞の戦桃丸 海兵', '', ''],
     1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service'],
@@ -1505,12 +1505,12 @@ window.aliases = {
     1504: ['バンダー・デッケン九世', '', ''],
     1505: ['ホーディ・ジョーンズ', '', ''],
     1506: ['ホーディ・ジョーンズ 覚醒', '', ''],
-    1507: ['', '', 'Valentine Sanji'],
-    1508: ['', '', 'Valentine Sanji'],
+    1507: ['サンジのブレイクタイム', '', 'White Day Sanji'],
+    1508: ['サンジのティーパーティ', '', 'White Day Sanji'],
     1509: ['', '', ''],
     1510: ['', '', ''],
     1511: ['', '', ''],
     1512: ['', '', ''],
-    1513: ['', '', 'Anniversary Sanji'],
-    1514: ['', '', 'Anniversary Sanji'], 
+    1513: ['', '', 'Anniversary Sanji', 'White Day Sanji'],
+    1514: ['', '', 'Anniversary Sanji', 'White Day Sanji'], 
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6ee36c5bb..14d26a6d9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1278,7 +1278,7 @@ window.cooldowns = [
     [ 10, 4 ],
     [ 10, 4 ],
     14,
-    21,
+    [ 21, 15 ],
     25,
     19,
     [ 25, 18 ],
@@ -1507,10 +1507,10 @@ window.cooldowns = [
     22,
     [ 20, 16 ],
     [ 20, 16 ],
-    18,
-    14,
-    19,
-    19,
+    [ 18, 10 ],
+    [ 14, 7 ],
+    [ 19, 11 ],
+    [ 19, 14 ],
     [ 5, 5 ],
     [ 5, 5 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index e8b71b79a..b828ef2ad 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7440,7 +7440,7 @@ window.details = {
         specialNotes: "#{orb : 1.75x}",
     },
     1390: {//Buggy Legend
-        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of characters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
+        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and boosts the HP and ATK of characters with cost 41 or greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
         specialName: "Chop-Chop Clown Car",
@@ -7942,41 +7942,41 @@ window.details = {
         special: "Deals 11x character's ATK in [QCK] damage to one enemy, boosts ATK of [QCK] characters by 1.5x for 1 turn",
         specialName: "Demoltion: Ice Crush",
     },
-    1462: {//Valentines Day Luffy
+    1462: {//White Day Luffy
         captain: "Boosts chain multiplier by 2x",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
         sailor: "Reduces Paralysis for 2 turns for himself",
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
-    1463: {//Valentines Day Luffy
+    1463: {//White Day Luffy
         captain: "Boosts chain multiplier by 2.5x",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
         sailor: "Reduces Paralysis for 2 turns for himself",
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
-    1464: {//Valentines Day Chopper
+    1464: {//White Day Chopper
         captain: "Protects from defeat as long as HP is above ???%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
         specialName: "Devoted Healing - \"Instant Recovery\"",
     },
-    1465: {//Valentines Day Chopper
+    1465: {//White Day Chopper
         captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above ???%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
         specialName: "Devoted Healing - \"Instant Recovery\"",
     },
-    1466: {//Secret Cavendish
+    1466: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2x",
         special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [PSY] and friend captain's orb into [STR]",
-        specialName: "Cavendish Special",
+        specialName: "Rosy Pleasure",
     },
-    1467: {//Secret Cavendish
+    1467: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2.25x and their RCV by 1.3x",
         special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [PSY] and friend captain's orb into [STR]",
-        specialName: "Cavendish Special",
+        specialName: "Rosy Pleasure",
     },
     1468: {//Fortnight Sentomaru 
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a42f874cc..b976c35c1 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2265,7 +2265,7 @@ window.evolutions = {
     },
     1466: {
         evolution: 1467,
-        evolvers: [  ]
+        evolvers: [ 117, 85, 87, 96, 98 ]
     },
     1468: {
         evolution: 1469,
@@ -2317,7 +2317,7 @@ window.evolutions = {
     },
     1507: {
         evolution: 1508,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 79, 85, 96 ]
     },
     1513: {
         evolution: 1514,
diff --git a/common/data/specials.js b/common/data/specials.js
index b37dece6d..c54f4d627 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1756,6 +1756,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
         type: "class"
     },
+    1295: {
+        def: function(p) { return 0; }
+    },
+    1296: {
+        def: function(p) { return 0; }
+    },
     1297: {
         affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
     },
@@ -2168,6 +2174,12 @@ window.specials = {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"
     },
+    1466: {
+        def: function(p) { return 0; }
+    },
+    1467: {
+        def: function(p) { return 0; }
+    },
     1476: {
         atk: function(p) {
             return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
diff --git a/common/data/units.js b/common/data/units.js
index fa8eb8eb2..fbe57f344 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1464,8 +1464,8 @@ window.units = [
     [ "Luffy's Tea Party", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 8, 3, 99, 3000000, 881, 409, 98, 2051, 1138, 276, 1 ],
     [ "Break Time Chopper", "INT", [ "Shooter", "Powerhouse" ], 4, 12, 6, 2, 50, 392109, 121, 76, 44, 920, 401, 197, 1 ],
     [ "Chopper's Tea Party", "INT", [ "Shooter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 841, 315, 150, 1906, 999, 347, 1 ],
-    [ "Valentines Cavendish", "PSY", [ "Slasher", "Driven" ], 4, 13, 6, 2, 50, 392109, null, null, null, 1077, 476, 176, null ],
-    [ "Valentines Cavendish, Evolved", "PSY", [ "Slasher", "Driven" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Cavendish, God of White Day", "PSY", [ "Slasher", "Driven" ], 4, 13, 6, 2, 50, 392109, 94, 48, 33, 1077, 476, 176, 1 ],
+    [ "Cavendish, Daydream of White Day", "PSY", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 3000000, 1003, 421, 129, 1953, 1101, 311, 1 ],
     [ "Sentomaru, Navy HQ", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 95, 45, 21, 1055, 595, 101, 1 ],
     [ "Sentomaru of the Axe, Navy HQ", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, 1 ],
     [ "Lip 'Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
@@ -1505,12 +1505,12 @@ window.units = [
     [ "Vander Decken IX", "DEX", [ "Driven", "Slasher" ], 4, 20, 5, 3, 99, 3000000, 182, 102, 15, 2218, 1182, 188, 1 ],
     [ "Hody Jones", "STR", [ "Powerhouse", "Shooter" ], 3, 18, 6, 1, 50, 392109, 141, 69, 0, 1041, 594, 31, 1 ],
     [ "Hody Jones, Awakened", "STR", [ "Powerhouse", "Shooter" ], 4, 30, 6, 3, 99, 3000000, 1014, 494, 29, 2741, 1294, 104, 1 ],
-    [ "White Day Sanji", "QCK", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 153, 90, 23, 1030, 489, 122, null ],
-    [ "White Day Sanji, Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 949, 402, 90, 2200, 1130, 247, null ],
-    [ "Haruta, Whitebeard 12th Div. Commander", "INT", [ "Cerebral", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 40, 49, 34, null, null, null, null ],
-    [ "Speed Jil, Whitebeard 14th Div. Commander ", "INT", [ "Driven", "Striker" ], 4, 25, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
-    [ "Atmos, Whitebeard 13th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 25, null, 3, 99, 3000000, 51, 35, 35, null, null, null, null ],
-    [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], 4, 25, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Break Time Sanji", "QCK", [ "Fighter", "Powerhouse" ], 4, 12, 4, 2, 50, 392109, 153, 90, 23, 1030, 489, 122, 1 ],
+    [ "Sanji's Tea Party", "QCK", [ "Fighter", "Powerhouse" ], 5, 20, 6, 3, 99, 3000000, 949, 402, 90, 2200, 1130, 247, 1 ],
+    [ "Haruta, Whitebeard 12th Div. Commander", "INT", [ "Cerebral", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 40, 49, 34, 2012, 1212, 212, 1 ],
+    [ "Speed Jil, Whitebeard 14th Div. Commander ", "INT", [ "Driven", "Striker" ], 4, 25, 6, 3, 99, 3000000, 49, 50, 30, 2140, 1214, 188, 1 ],
+    [ "Atmos, Whitebeard 13th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 51, 35, 35, 2213, 1113, 213, 1 ],
+    [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], 4, 25, 6, 3, 99, 3000000, 45, 60, 26, 2119, 1311, 160, 1 ],
     [ "Anniversary Sanji", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, null, 2, null, null, null, null, null, null, null, null, null ],
     [ "Anniversary Sanji, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, null, null, null, null, 1858, 1157, 332, null ],
     ];

From fdb095d9d2e3c9281bd2e398e7a2d4c558288638 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 10 Mar 2017 13:07:46 -0500
Subject: [PATCH 0929/1569] Brook and Mega Evo Skillbooks

---
 common/data/aliases.js    |  4 ++--
 common/data/drops.js      | 45 ++++++++++++++++++++-------------------
 common/data/evolutions.js |  8 +++++++
 common/data/units.js      |  2 ++
 4 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 4b61bd9a5..caf8402c2 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1187,8 +1187,8 @@ window.aliases = {
     1186: ['疾風の小剣士ハルタ',''],
     1187: ['アトモス',''],
     1188: ['水牛のアトモス',''],
-    1189: ['スピード・ジル','', 'Speed Jiru'],
-    1190: ['シールドランスのスピード・ジル','', 'Speed Jiru'],
+    1189: ['スピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
+    1190: ['シールドランスのスピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
     1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
     1192: ['クザン','','Aokiji'],
     1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
diff --git a/common/data/drops.js b/common/data/drops.js
index 2b55e04bc..9ad9ad3ce 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -716,7 +716,7 @@ window.drops = {
             thumb: 39,
             global: true,
             condition: "None",
-            Expert: [ 36, 37, 38, 99, 109, 114, -4 ],
+            Expert: [ 36, 37, 38, 99, 109, 114, -4, -1387 ],
             Elite: [ 36, 37, 38, 99, 109, 114, -3 ]
         },
 
@@ -725,7 +725,7 @@ window.drops = {
             thumb: 30,
             global: true,
             condition: "None",
-            Expert: [ 28, 29, 31, 40, 84, 95, 110, 117, -30, -21, -8 ],
+            Expert: [ 28, 29, 31, 40, 84, 95, 110, 117, -30, -21, -8, -1388 ],
             Elite: [ 28, 29, 31, 40, 95, 105, 110, -21, -7 ]
         },
 
@@ -734,7 +734,7 @@ window.drops = {
             thumb: 46,
             global: true,
             condition: "None",
-            Expert: [ 41, 42, 43, 45, -16 ],
+            Expert: [ 41, 42, 43, 45, -16, -1446 ],
             Elite: [ 41, 42, 43, 45, 96, 106, 111, -15 ]
         },
 
@@ -743,7 +743,7 @@ window.drops = {
             thumb: 66,
             global: true,
             condition: "None",
-            Expert: [ 61, 62, 63, 65, 89, 95, 105, 110, -12, -66 ],
+            Expert: [ 61, 62, 63, 65, 89, 95, 105, 110, -12, -66, -1389 ],
             Elite: [ 61, 62, 63, 65, 95, 105, 110, -11 ]
         },
 
@@ -858,7 +858,7 @@ window.drops = {
             condition: 'You can only get STR, QCK, INT and Food Orbs',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['3 Times','1x Green Elder'],['12 Times','1x RCV Cotton Candy'],['25 Times','3x Rainbow Gems']],
-            "All Difficulties": [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4 ]
+            "All Difficulties": [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4, -1387 ]
         },
 
         {
@@ -866,7 +866,7 @@ window.drops = {
             thumb: 405,
             global: true,
             condition: 'You can only get QCK, DEX, PSY and Food Orbs',
-            "All Difficulties": [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20 ]
+            "All Difficulties": [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20, -1447 ]
         },
 
         {
@@ -874,7 +874,7 @@ window.drops = {
             thumb: 420,
             global: true,
             condition: "None",
-            "All Difficulties": [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8 ]
+            "All Difficulties": [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8, -1388 ]
         },
 
         {
@@ -934,7 +934,7 @@ window.drops = {
             condition: '30: Non-Shooter, Evolver, or Booster class characters are weakend; 15: Fighter and Slasher class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Yellow Elder'],['2,000,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['5,000,000 Damage','1x Matching Orb Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ 537, 539, 540, -539, -428, -416, -365, -257, -59 ]
+            "All Difficulties": [ 537, 539, 540, -539, -428, -416, -365, -257, -59, -1445 ]
         },
 
         {
@@ -1054,7 +1054,7 @@ window.drops = {
             global: true,
             condition: "None",
             "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217, -1210, -1413 ],
-            "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8, -1413 ]
+            "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8, -1413, -1388 ]
         },
 
         {
@@ -1082,8 +1082,8 @@ window.drops = {
             thumb: 808,
             global: true,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
-            "Japan": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9 ],
-            "Global": [ 807, 809, 811, -811, -760, -675, -631, -502, -11, -12, -9 ],
+            "Japan": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9, -1389 ],
+            "Global": [ 807, 809, 811, -811, -760, -675, -631, -502, -11, -12, -9, -1389 ],
         },
 
         {
@@ -1104,7 +1104,8 @@ window.drops = {
             condition: 'You can only bring Shooter and Driven units. (No Evo/Boosters)',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['400,000 Damage','1x QCK Elder Turtle'],['1,400,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['4,000,000 Damage','2x Rainbow Gems, 1x Despair Resistance Forbidden Tome']],
-            "All Difficulties": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22 ]
+            "Japan": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22, -1448 ],
+            "Global": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -754, -614, -463, -457, -327, -22, -1448 ]
         },
 
         {
@@ -1120,7 +1121,7 @@ window.drops = {
             name: "Riverside Banquet! Enter the Crazy Ones!",
             thumb: 885,
             condition: 'Highly increased chance of TND, Bomb, and G orbs',
-            "All Difficulties": [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416 ]
+            "All Difficulties": [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416, -1445 ]
         },
 
         {
@@ -1286,7 +1287,7 @@ window.drops = {
             name: "Tontatta Kingdom Island Part 1: Leo",
             thumb: 1328,
             condition: "Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
-            "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508 ]
+            "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508, -1387 ]
         },
         
         {
@@ -1299,7 +1300,7 @@ window.drops = {
         {
             name: "Big Mom Pirates!",
             thumb: 1357,
-            "All Difficulties": [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610 ]
+            "All Difficulties": [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610, -1388 ]
         },
         
         {
@@ -1312,7 +1313,7 @@ window.drops = {
             name: "Shambles! Tashigi and Smoker?!?",
             thumb: 1397,
             condition: "Your captain will be switched with your middle right character when you encounter Law.",
-            "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
+            "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257, -1389 ]
         },
         
         {
@@ -1502,7 +1503,7 @@ window.drops = {
             name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
             thumb: 989,
-            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -1446, -556, -528, -520, -554, -558, -20, -1447, -217, -709, -1115, -1177, -1175, -1210, -1208 ]
+            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -1446, -556, -528, -520, -554, -558, -20, -1447, -217, -709, -1115, -1177, -1175, -1210, -1208, -1387, -1388, -1389 ]
         },
         
         {
@@ -1566,7 +1567,7 @@ window.drops = {
             thumb: 893,
             challenge:'Total number of hits above 50,000',
             challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Bind Resistance Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8 ]
+            "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8, -1388 ]
         },
 
         {
@@ -1588,9 +1589,9 @@ window.drops = {
             name: 'Valentines Day and White Day Characters',
             thumb: 1463,
             "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Chopper": [ 1464, 1155, 333, 334, 728, 1061, 83, 94, 115, 116, 117, 266, 1180, 109, 114, 193, 346 ],
+            "Chopper": [ 1464, 1155, 333, 728, 334, 1061, 346, 193, 109, 114, 115, 116, 117, 1180, 266, 94, 83 ],
             "Sanji": [ 1507, 52, 207, 892, 343, 190, 111, 106, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Brook": [  ],
+            "Brook": [ 1515, 342, 189, 110, 105, 115, 116, 117, 1180, 266, 94, 83 ],
         },
         
         {
@@ -1626,8 +1627,8 @@ window.drops = {
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "Characters": [ 67, 69, 262, 264, 298 ],
             "Boosters and Evolvers": [ 113, 192, 350, 266, 83, 118 ],
-            "Global": [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739 ],
-            "Japan": [ -416, -459, -530, -669, -1492, -578, -1121 ]
+            "Global": [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1445 ],
+            "Japan": [ -416, -459, -530, -669, -1492, -578, -1121, -1445 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b976c35c1..664ce3b2d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2311,6 +2311,10 @@ window.evolutions = {
         evolution: 1491,
         evolvers: [ 117, 79, 90, 96 ]
     },
+    669: {
+        evolution: 1492,
+        evolvers: [  ]
+    },
     1505: {
         evolution: 1506,
         evolvers: [ 118, 95, 99, 300, 304 ]
@@ -2323,4 +2327,8 @@ window.evolutions = {
         evolution: 1514,
         evolvers: [  ]
     },
+    1515: {
+        evolution: 1516,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index fbe57f344..72d32767b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1513,6 +1513,8 @@ window.units = [
     [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], 4, 25, 6, 3, 99, 3000000, 45, 60, 26, 2119, 1311, 160, 1 ],
     [ "Anniversary Sanji", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, null, 2, null, null, null, null, null, null, null, null, null ],
     [ "Anniversary Sanji, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, null, null, null, null, 1858, 1157, 332, null ],
+    [ "Break Time Brook", "STR", [ "Slasher", "Free Spirit" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Brook's Tea Party", "STR", [ "Slasher", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From ea92f8fb69b323c98f170d4fb4550c4027b67b4b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 10 Mar 2017 16:22:38 -0500
Subject: [PATCH 0930/1569] Ship and typo

---
 common/data/ships.js    | 2 +-
 common/data/specials.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index f701bd513..d4b824c5c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -287,7 +287,7 @@ window.ships = [
     { //23
         name: 'Polar Tang',
         thumb: 'ship_0024_c.png',
-        description: 'Boosts ATK of Slashers and Free Spirit characters by 1.5x and their HP by 1.25x. Special: Heals for 10k when low HP (cooldown MAX: 18 turns)',
+        description: 'Boosts ATK of Slashers and Free Spirit characters by 1.5x and their HP by 1.25x. Makes Perfects easier to Hit. Special: Heals for 10k when under 20% HP. (cooldown MAX: 18 turns)',
         atk: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Free Spirit')) ? 1 : [ 1.3, 1.3, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
diff --git a/common/data/specials.js b/common/data/specials.js
index c54f4d627..3bea0639f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1992,7 +1992,7 @@ window.specials = {
             window.specials[1403].turnedOn = true;
             window.specials[1403].multiplier = [3.16, 4][n];
             p.scope.notify({
-                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
+                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
                 name: '1403warning'
             });
         },
@@ -2007,7 +2007,7 @@ window.specials = {
             window.specials[1404].turnedOn = true;
             window.specials[1404].multiplier = [3.16, 4][n];
             p.scope.notify({
-                text: 'Only affects damage is Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
+                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
                 name: '1404warning'
             });
         },

From 3b8e972bad5103811f6e335280d4f28e12d9bb35 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 12 Mar 2017 06:48:54 -0500
Subject: [PATCH 0931/1569] Small fixes

---
 common/data/effects.js  | 4 ++--
 common/js/directives.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 608c7775d..eee0c6a13 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 41
+    // last ID used: 42
     // Use p.type instead of p.unit.type here
 
     'Baroque Works (pre-v4.0)': {
@@ -299,7 +299,7 @@ window.effects = {
         description: 'Used by Christmas Law in Saga Coliseum',
         thumb: 856,
         id: 35,
-        orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); }
+        orb: function(p) { return p.orb == 2.0 ? 1.25 : (p.orb == 0.5 ? 20/25 : 1); }
     },
     
     '700k Damage Treshold Barrier': {
diff --git a/common/js/directives.js b/common/js/directives.js
index 94f73ab80..4db26e8c7 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -19,7 +19,7 @@ var notes = {
     stages: "The special can be used as soon as the first stage is reached.",
     zombie: "The protection only works when attacked by one single enemy and will leave the team with at least 1 HP; " +
         "the effect will not work when attacked by multiples enemies at once.",
-    colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5*(#1-1))x to QCK."
+    colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5/#1)x to QCK."
 };
 
 /***********

From 15154bfc38a08debc08768066fbfe40a28f4273a Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Sun, 12 Mar 2017 07:32:52 -0500
Subject: [PATCH 0932/1569] Map Effects & Chain Boosting Captains

Fixed!
---
 common/data/effects.js | 2 +-
 damage/js/cruncher.js  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index eee0c6a13..f442bb6f1 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -260,7 +260,7 @@ window.effects = {
         description: 'Reduces Chain By Half',
         thumb: 1047,
         id: 30,
-        chainModifier: function(p) { return 0.5; }
+        chainModifier: function(p) { return 0.5 ; }
     },
     
     'Pirate Ship Competition! \"Dead End\" Opens!': {
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 53f6e26e7..fbf6d5d3d 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -483,7 +483,13 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                 },1);
                 //Computing Chain Modifier from map effects
                 if (mapEffect.hasOwnProperty('chainModifier'))
+                    //chain modifier WITH chain boosting captain
+                    if(cptsWith.chainModifiers.length>0){
+                    chainModifier = Math.min(mapEffect.chainModifier(params[n])*chainModifier, chainModifier);
+                    }else{
+                    //chain modifier without chain boosting captain
                     chainModifier = Math.min(mapEffect.chainModifier(params[n]), chainModifier);
+                    }
                 var chainMultiplier = getChainMultiplier(special.chain(params[n]), modifiers.slice(0,n), chainModifier);
                 //Add flat Multiplier Bonuses if they exist
                 if(addition>0.0 && chainMultiplier != 1.0)

From 5ae8208530664fa774eb6e218e8e3d2b1a77dfff Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 12 Mar 2017 23:24:11 -0400
Subject: [PATCH 0933/1569] New units and bugs

sorry for the wait
---
 characters/views/sidebar.html |  2 +-
 common/data/cooldowns.js      | 12 ++++++------
 common/data/details.js        | 14 +++++++-------
 common/data/specials.js       | 12 ++++++++++++
 common/data/zombies.js        | 12 ++++++++++++
 5 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 49548b6a0..4d1a0e92a 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -33,7 +33,7 @@
     <span class="filter-header">Drop filters</span>
     <span ng-repeat="type in [ 'Farmable', 'Non-farmable' ]" class="filter width-6 drop" ng-model="filters.drop"
         ng-class="{ active: filters.drop == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-    <span ng-repeat="type in [ 'Global units', 'Japan units' ]" class="filter width-6 drop" ng-model="filters.server"
+    <span ng-repeat="type in [ 'Global units', 'Japan exclusives' ]" class="filter width-6 drop" ng-model="filters.server"
         ng-class="{ active: filters.server == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
     <span ng-repeat="type in [ 'In RR pool', 'Not in RR pool' ]" class="filter width-6 drop" ng-model="filters.rr"
         ng-class="{ active: filters.rr == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 14d26a6d9..88595018d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1474,12 +1474,12 @@ window.cooldowns = [
     null,//Shirahoshi
     21,
     21,
-    16,
-    16,
-    22,
-    22,
-    20,
-    20,
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 22, 16 ],
+    [ 22, 16 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
     15,
     15,
     [ 14, 14 ],
diff --git a/common/data/details.js b/common/data/details.js
index b828ef2ad..74000f4da 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5775,7 +5775,7 @@ window.details = {
         specialNotes: "#{zombie}",
     },
     1157: {
-        captain: "Boosts ATK of Driven and Striker characters by 1.75x if HP is above 50% at the start of the turn",
+        captain: "Boosts ATK of Driven and Striker characters by 1.75x and protects from defeat as long as HP is above 50% at the start of the turn",
         special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Abyss Road",
         specialNotes: "#{zombie}",
@@ -7955,14 +7955,14 @@ window.details = {
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
     1464: {//White Day Chopper
-        captain: "Protects from defeat as long as HP is above ???%",
+        captain: "Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
         specialName: "Devoted Healing - \"Instant Recovery\"",
     },
     1465: {//White Day Chopper
-        captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above ???%",
+        captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
@@ -8007,11 +8007,11 @@ window.details = {
         special: [
             {
                 "description": "Changes adjacent orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
-                "cooldown": [ 13, null ],
+                "cooldown": [ 13, 9 ],
             },
             {
                 "description": "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-                "cooldown": [ 22, null ],
+                "cooldown": [ 22, 18 ],
             },
         ],
         specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.",
@@ -8023,11 +8023,11 @@ window.details = {
         special: [
             {
                 "description": "Changes adjacent orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
-                "cooldown": [ 13, null ],
+                "cooldown": [ 13, 9 ],
             },
             {
                 "description": "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-                "cooldown": [ 22, null ],
+                "cooldown": [ 22, 18 ],
             },
         ],
         specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.",
diff --git a/common/data/specials.js b/common/data/specials.js
index 3bea0639f..d637e504d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2174,6 +2174,10 @@ window.specials = {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },
         type: "condition"
     },
+    1461: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        type: "type"
+    },
     1466: {
         def: function(p) { return 0; }
     },
@@ -2224,6 +2228,14 @@ window.specials = {
             });
         },
     },
+    1484: {
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
+    1485: {
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },
     1486: {
         orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
     },
diff --git a/common/data/zombies.js b/common/data/zombies.js
index d5c260401..fa5c13051 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -243,6 +243,10 @@ window.zombies = {
         type: 'healer',
         multiplier: 3
     },
+    1157: {// Story Hannyabal
+        type: 'zombie',
+        threshold: 0.5
+    },
     1195: {//Colo Ganfor
         type: 'healer',
         multiplier: 2
@@ -323,6 +327,14 @@ window.zombies = {
         type: 'healer',
         amount: 120
     },
+    1465: { // White Day Chopper
+        type: 'zombie',
+        threshold: 0.5
+    },
+    1466: { // White Day Chopper
+        type: 'zombie',
+        threshold: 0.5
+    },
     1472: { // Shirahoshi
         type: 'healer',
         multiplier: 5

From 3621585b08520b5d1f7891db073be140c31486b0 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 13 Mar 2017 00:03:51 -0400
Subject: [PATCH 0934/1569] Temps for Brook and details for Brook

Thanks BlazingGamer and Gamewith
---
 common/data/captains.js  |  6 ++++++
 common/data/cooldowns.js |  2 ++
 common/data/details.js   | 12 ++++++++++++
 common/data/drops.js     |  2 +-
 common/data/families.js  |  2 ++
 common/data/gw.js        |  2 ++
 common/data/zombies.js   |  6 +++++-
 7 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index eab48f5c6..039adbb1a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4352,4 +4352,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
+    1515: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 1 : 1; },
+    },
+    1516: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 2 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 88595018d..52011a109 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1513,4 +1513,6 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 5, 5 ],
     [ 5, 5 ],
+    14,
+    14,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 74000f4da..b0e799429 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8285,4 +8285,16 @@ window.details = {
         special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
         specialName: "Sanji Special",
     },
+    1515: {//White Day Brook
+        captain: "Boosts ATK of [STR] and [QCK] characters by ???x",
+        special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
+        specialName: "Brook Special",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+    },
+    1516: {//White Day Brook
+        captain: "Boosts ATK of [STR] and [QCK] characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
+        special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
+        specialName: "Brook Special",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 9ad9ad3ce..af9680438 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1591,7 +1591,7 @@ window.drops = {
             "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
             "Chopper": [ 1464, 1155, 333, 728, 334, 1061, 346, 193, 109, 114, 115, 116, 117, 1180, 266, 94, 83 ],
             "Sanji": [ 1507, 52, 207, 892, 343, 190, 111, 106, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Brook": [ 1515, 342, 189, 110, 105, 115, 116, 117, 1180, 266, 94, 83 ],
+            "Brook": [ 1515, 954, 614, 379, 730, 342, 189, 110, 105, 115, 116, 117, 1180, 266, 94, 83 ],
         },
         
         {
diff --git a/common/data/families.js b/common/data/families.js
index d5b71f08b..586dbd1c7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1513,4 +1513,6 @@ window.families = [
     "Kingdew",
     "Sanji",
     "Sanji",
+    "Brook",
+    "Brook",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 7fa98eac2..9ebb9e30b 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1513,4 +1513,6 @@ window.gw=[
     52635,
     52663,
     52663,
+    53095,
+    53095,
 ];
\ No newline at end of file
diff --git a/common/data/zombies.js b/common/data/zombies.js
index fa5c13051..442d18dd5 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -343,7 +343,11 @@ window.zombies = {
         type: 'healer',
         multiplier: 5
     },
-    1508: { // Tea Time Sanji
+    1508: { // White Day Sanji
+        type: 'healer',
+        multiplier: 2
+    },
+    1516: { // White Day Brook
         type: 'healer',
         multiplier: 2
     },

From ada001656a982b176f6f0498d6b5481137f3f353 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 14 Mar 2017 01:03:39 -0400
Subject: [PATCH 0935/1569] =?UTF-8?q?Man=20sherry=20Brook=20and=20?=
 =?UTF-8?q?=E2=80=A6=20oh=20wait=20thats=20it?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/data/captains.js  | 2 +-
 common/data/cooldowns.js | 4 ++--
 common/data/details.js   | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 039adbb1a..c0bce2ef5 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4353,7 +4353,7 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1515: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 1 : 1; },
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 1.5 : 1; },
     },
     1516: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 2 : 1; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 52011a109..2c59892b6 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1513,6 +1513,6 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 5, 5 ],
     [ 5, 5 ],
-    14,
-    14,
+    [ 14, 10 ],
+    [ 14, 10 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index b0e799429..98d5798a4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7710,12 +7710,12 @@ window.details = {
     },
     1429: {//Valentines Mansherry
         captain: "Boosts the RCV of Striker and Free Spirit characters by 1.5x",
-        special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
+        special: "Reduces Bind, Despair, and Paralysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
         specialName: "Boy's Unknown Taste of Hard Work",
     },
     1430: {//Valentines Mansherry
         captain: "Boosts the RCV of Striker and Free Spirit characters by 2x",
-        special: "Reduces Bind, Despair, and Parlysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
+        special: "Reduces Bind, Despair, and Paralysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
         specialName: "Boy's Unknown Taste of Hard Work",
     },
     1431: {//Raid Franky
@@ -8286,7 +8286,7 @@ window.details = {
         specialName: "Sanji Special",
     },
     1515: {//White Day Brook
-        captain: "Boosts ATK of [STR] and [QCK] characters by ???x",
+        captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x",
         special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
         specialName: "Brook Special",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",

From 643850c46c03563171a6e7285c17580af4128631 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 14 Mar 2017 01:09:41 -0400
Subject: [PATCH 0936/1569] Brook Units

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 72d32767b..897c13140 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1513,8 +1513,8 @@ window.units = [
     [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], 4, 25, 6, 3, 99, 3000000, 45, 60, 26, 2119, 1311, 160, 1 ],
     [ "Anniversary Sanji", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, null, 2, null, null, null, null, null, null, null, null, null ],
     [ "Anniversary Sanji, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, null, null, null, null, 1858, 1157, 332, null ],
-    [ "Break Time Brook", "STR", [ "Slasher", "Free Spirit" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Brook's Tea Party", "STR", [ "Slasher", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Break Time Brook", "STR", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 124, 84, 30, null, null, null, null ],
+    [ "Brook's Tea Party", "STR", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 912, 393, 106, 2059, 1122, 247, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 070228bd2121b72725159133db4b58e2e5b4230f Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 14 Mar 2017 11:24:45 -0400
Subject: [PATCH 0937/1569] Sabo +

---
 common/data/aliases.js | 2 +-
 common/data/units.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 5ef1d5784..d1baed536 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1490,7 +1490,7 @@ window.aliases = {
     1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg'],
     1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5'],
     1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5'],
-    1492: ['', '', 'Mega Sabo'],
+    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo'],
     1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', ''],
     1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
     1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
diff --git a/common/data/units.js b/common/data/units.js
index 897c13140..31781120a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1490,7 +1490,7 @@ window.units = [
     [ "Don Krieg, East Blue Supreme Ruler", "STR", [ "Driven", "Shooter" ], 4, 26, 8, 3, 99, 3000000, 1200, 476, 30, 2707, 1225, 106, 1 ],
     [ "Mr. 5, Bomb Human", "QCK", "Shooter", 3, 10, 6, 2, 35, 136167, 101, 56, 21, 808, 401, 74, 1 ],
     [ "Mr. 5, Baroque Works Officer Agent", "QCK", "Shooter", 4, 20, 6, 3, 70, 1066998, 733, 325, 44, 1618, 818, 198, 1 ],
-    [ "6+ Sabo", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1534, 777, 277, 3234, 1534, 452, null ],
+    [ "Sabo, True Power of the Mera Mera no Mi", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1534, 777, 277, 3234, 1534, 452, 1 ],
     [ "Rough Fishman Outlaw", "STR", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 73, 42, 13, 1173, 749, 143, 1 ],
     [ "Fast-paced Fishman Outlaw", "QCK", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 71, 37, 16, 1167, 701, 169, 1 ],
     [ "Skilled Fishman Outlaw", "DEX", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 67, 40, 15, 1143, 737, 157, 1 ],

From 1720cf084ec42fea442d8c63bcbb321ec71e99cc Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 16 Mar 2017 12:08:31 -0400
Subject: [PATCH 0938/1569] Bellamy and Matchers

Will reorder the matchers soon
---
 common/data/details.js    | 10 ++++++++++
 common/data/drops.js      |  6 ++++++
 common/data/evolutions.js |  4 ++++
 common/data/matchers.js   | 18 ++++++++++++++++++
 common/data/units.js      |  2 ++
 5 files changed, 40 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 98d5798a4..8c487695d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8297,4 +8297,14 @@ window.details = {
         specialName: "Brook Special",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
+    1517: {//Raid Bellamy
+        captain: "Not Translated",
+        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by ???x for 1 turn",
+        specialName: "Bellamy Special",
+    },
+    1518: {//Raid Bellamy
+        captain: "Boosts ATK of Driven characters by 2.5x",
+        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by ???x for 1 turn",
+        specialName: "Bellamy Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index af9680438..f753402b1 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1551,6 +1551,12 @@ window.drops = {
             Master: [ 1431, 215, 799 ],
             Ultimate: [ 1431, 215, 799 ],
         },
+        {
+            name: 'Clash!! Bellamy',
+            thumb: 1518,
+            Master: [ 1517 ],
+            Expert: [ 1517 ],
+        },
 
     ],
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 664ce3b2d..c4d9f6d06 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2331,4 +2331,8 @@ window.evolutions = {
         evolution: 1516,
         evolvers: [  ]
     },
+    1517: {
+        evolution: 1518,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 81f331c0a..35f4d7906 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -129,6 +129,24 @@ window.matchers = [
         target: 'captain',
         matcher: /deals.+end of each turn/i
     },
+    
+    {
+        name: 'Beli Boosters',
+        target: 'captain',
+        matcher: /boosts amount of beli received/i
+    },
+    
+    {
+        name: 'EXP Boosters',
+        target: 'captain',
+        matcher: /boosts.+EXP/i
+    },
+    
+    {
+        name: 'Drop Doublers',
+        target: 'captain',
+        matcher: /duplicating a drop/i
+    },
 
     /* * * * * Specials * * * * */
 
diff --git a/common/data/units.js b/common/data/units.js
index 31781120a..0f8ce79c0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1515,6 +1515,8 @@ window.units = [
     [ "Anniversary Sanji, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, null, null, null, null, 1858, 1157, 332, null ],
     [ "Break Time Brook", "STR", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 124, 84, 30, null, null, null, null ],
     [ "Brook's Tea Party", "STR", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 912, 393, 106, 2059, 1122, 247, null ],
+    [ "Raid Bellamy", "QCK", [ "Fighter", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Bellamy, Evolved", "QCK", [ "Fighter", "Driven" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 6f6226c01d17620e9a5fe562adfe144cdba58bee Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 16 Mar 2017 22:52:35 -0400
Subject: [PATCH 0939/1569] New features

---
 common/data/ships.js      |  8 ++++++++
 common/data/specials.js   | 36 ++++++++++++++++++++++++++++++++++++
 damage/js/cruncher.js     | 39 +++++++++++++++++++++++++++++++++++----
 damage/views/sidebar.html | 22 +++++++++++++++++++++-
 4 files changed, 100 insertions(+), 5 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index d4b824c5c..a9b2afc1c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -246,6 +246,14 @@ window.ships = [
         hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
     },
     
+    { // 19.2
+        name: "Doflamingo Ship - Special ACTIVATED",
+        thumb: 'ship_0020_c.png',
+        description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. ACTIVATED Special: Adds 0.2 to Chain  (cooldown MAX: 15 Turns)',
+        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
+        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
+    },
+    
     { // 20
         name: 'The Rocket Man',
         thumb: 'ship_0021_c.png',
diff --git a/common/data/specials.js b/common/data/specials.js
index d637e504d..a1e35919e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1703,6 +1703,24 @@ window.specials = {
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
+    1259: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1259].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1259].turnedOn = false;
+        }
+    },
+    1260: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1260].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1260].turnedOn = false;
+        }
+    },
     1261: {//Young Senor Pink
         affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
@@ -1808,6 +1826,24 @@ window.specials = {
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
+    1323: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1323].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1323].turnedOn = false;
+        }
+    },
+    1324: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1324].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1324].turnedOn = false;
+        }
+    },
     1329: {
         affinity: function(p){ return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index fbf6d5d3d..c4dadf6c6 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -178,8 +178,12 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
-            if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn)) orb = 2;
-            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 1;
+            if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
+                                 || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))||(window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))))) orb = 2;
+            if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
+                                 || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))) ? 2 : 1;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
@@ -465,6 +469,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
 
     var applyChainAndBonusMultipliers = function(damage,modifiers) {
         var currentMax = -1, currentResult = null, addition = 0.0;
+        if(shipBonus.bonus.name=="Doflamingo Ship - Special ACTIVATED"){
+            addition = 0.2
+        }
 
         //get the highest Chain Addition if it exists
         chainAddition.forEach(function(special){
@@ -693,14 +700,17 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (data.orb) enabledSpecials.push({ orb: data.orb, permanent: true, sourceSlot: -1 });
             if (data.chainModifier) mapEffect.chainModifier = data.chainModifier;
             if (data.chainLimiter) mapEffect.chainLimiter = data.chainLimiter;
-            if (data.comboShield) mapEffect.comboShield = data.comboShield;
-            if (data.comboType) mapEffect.comboType = data.comboType;
+            if ($scope.data.comboShield) mapEffect.comboShield = $scope.data.comboShield;
+            if ($scope.data.comboType) mapEffect.comboType = $scope.data.comboType;
             if (data.damage) mapEffect.damage = data.damage;
             if (data.barrierThreshold) {
                 mapEffect.barrierThreshold = data.barrierThreshold;
                 mapEffect.barrierReduction = data.barrierReduction;
             }
         }
+        if ($scope.data.comboShield) mapEffect.comboShield = $scope.data.comboShield;
+        if ($scope.data.comboType) mapEffect.comboType = $scope.data.comboType;
+        
         // team
         team = $scope.data.team.map(function(x,n) {
             if (!$scope.tdata.team[n] || $scope.tdata.team[n].removed)
@@ -866,6 +876,27 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         }
         if (shipBonus.bonus && shipBonus.bonus.heal)
             healAmount += shipBonus.bonus.heal({ boatLevel: shipBonus.level, classCount: classCounter() });
+        console.log($scope.data.healLevel);
+        switch($scope.data.healLevel){
+            case "0":
+                break;
+            case "1":
+                healAmount += 100;
+                break;
+            case "2":
+                healAmount += 200;
+                break;
+            case "3":
+                healAmount += 300;
+                break;
+            case "4":
+                healAmount += 500;
+                break;
+            case "5":
+                healAmount += 1000;
+                break;
+            
+        }
         // get heal per turn
         if (healAmount > 0) numbers.healPerTurn = healAmount;
         else return; // nothing to do if there's no healer
diff --git a/damage/views/sidebar.html b/damage/views/sidebar.html
index 0e6385524..59e8b375a 100644
--- a/damage/views/sidebar.html
+++ b/damage/views/sidebar.html
@@ -1,4 +1,4 @@
-<nav id="menu" class="panel" role="navigation">
+<nav id="menu" class="panel" role="navigation">
 
     <ul>
 
@@ -17,6 +17,13 @@
                 <div id="ship-background"></div>
             </div>
         </li>
+        
+        <li>
+            <div id="heal">
+                <i class="fa fa-circle-o-notch"></i>
+                Heal Socket Level: <input type="number" min="0" max="5" id="healLevel" to-int ng-model="data.healLevel"></input>
+            </div>
+        </li>
 
         <li>
             <div id="defenseContainer" title="Middle-click or CTRL-click for details" defense-on-click>
@@ -26,6 +33,19 @@
             </div>
         </li>
 
+        <li>
+            <div id="shieldContainer">
+                <i class="fa fa-shield"></i>
+                Barrier: <input min="0" style="color: black; width:40px" type="number" id="comboShield" to-int ng-model="data.comboShield">
+                                                                      <select style="color: black" id="comboType" ng-model="data.comboType">
+                                                                        <option value="" selected>Hits</option>
+                                                                        <option value="Good">Good</option>
+                                                                        <option value="Great">Great</option>
+                                                                        <option value="Perfect">Perfect</option>
+                                                                      </select> 
+            </div>
+        </li>
+
         <li ui-sref=".candy">
             <div id="candyContainer">
                 <i class="fa fa-sliders"></i>

From 211019b3b15c712739e56299022424b5cf4b0150 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 17 Mar 2017 10:05:02 -0400
Subject: [PATCH 0940/1569] Bellamy and New FN/Colo units

---
 common/data/aliases.js    | 24 +++++++++++++++++++-----
 common/data/captains.js   |  6 ++++++
 common/data/cooldowns.js  |  2 ++
 common/data/details.js    | 10 +++++-----
 common/data/drops.js      | 13 ++++++++++---
 common/data/evolutions.js | 14 +++++++++++++-
 common/data/families.js   | 12 ++++++++++++
 common/data/flags.js      |  2 ++
 common/data/gw.js         |  2 ++
 common/data/specials.js   |  6 ++++++
 common/data/units.js      | 18 ++++++++++++++----
 11 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d1baed536..fd9ced3da 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1507,10 +1507,24 @@ window.aliases = {
     1506: ['ホーディ・ジョーンズ 覚醒', '', ''],
     1507: ['サンジのブレイクタイム', '', 'White Day Sanji'],
     1508: ['サンジのティーパーティ', '', 'White Day Sanji'],
-    1509: ['', '', ''],
-    1510: ['', '', ''],
-    1511: ['', '', ''],
-    1512: ['', '', ''],
+    1509: ['ハルタ 白ひげ海賊団１２番隊隊長', '', ''],
+    1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', ''],
+    1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', ''],
+    1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', ''],
     1513: ['', '', 'Anniversary Sanji', 'White Day Sanji'],
-    1514: ['', '', 'Anniversary Sanji', 'White Day Sanji'], 
+    1514: ['', '', 'Anniversary Sanji', 'White Day Sanji'],
+    1515: ['ブルックのブレイクタイム', '', 'White Day Brook'],
+    1516: ['ブルックのティーパーティ', '', 'White Day Brook'],
+    1517: ['ハイエナのベラミー 元ベラミー海賊団船長', '', 'Raid Bellamy'],
+    1518: ['ハイエナのベラミー ドレスローザの凶弾', '', 'Raid Bellamy'],
+    1519: ['', '', ''],
+    1520: ['', '', ''],
+    1521: ['', '', ''],
+    1522: ['', '', ''],
+    1523: ['', '', ''],
+    1524: ['', '', ''],
+    1525: ['', '', ''],
+    1526: ['', '', ''],
+    1527: ['', '', ''],
+    1528: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index c0bce2ef5..6f3b79e06 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4358,4 +4358,10 @@ window.captains = {
     1516: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 2 : 1; },
     },
+    1517: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1518: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 2c59892b6..c7df085a3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1515,4 +1515,6 @@ window.cooldowns = [
     [ 5, 5 ],
     [ 14, 10 ],
     [ 14, 10 ],
+    [ 28, 15 ],
+    [ 28, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 8c487695d..9d699931b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8298,13 +8298,13 @@ window.details = {
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
     1517: {//Raid Bellamy
-        captain: "Not Translated",
-        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by ???x for 1 turn",
-        specialName: "Bellamy Special",
+        captain: "Boosts ATK of Driven characters by 2x",
+        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "Spring Hopper - Bullet",
     },
     1518: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2.5x",
-        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by ???x for 1 turn",
-        specialName: "Bellamy Special",
+        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "Spring Hopper - Bullet",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index f753402b1..20ee3c02c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1351,6 +1351,13 @@ window.drops = {
             "All Difficulties": [ 1509, 1510, 1511, 1512, -1001, -1316, -1280, -314, -908, -16, -1446, -1370, -1368, -816 ],
         },
         
+        {
+            name: "Dadan Family! Encounter with the Mountain Bandits",
+            thumb: 1520,
+            //condition: "You can only bring PSY units",
+            "All Difficulties": [ 1519, 1521, 1522, -1314, -1366, -1364, -912, -937, -316, -1281, -891, -22, -1448 ],
+        },
+        
     ],
 
             
@@ -1610,9 +1617,9 @@ window.drops = {
             name: 'Coliseum',
             thumb: 779,
             global: true,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index c4d9f6d06..c05854bca 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2329,10 +2329,22 @@ window.evolutions = {
     },
     1515: {
         evolution: 1516,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 78, 84, 95 ]
     },
     1517: {
         evolution: 1518,
+        evolvers: [ 118, 79, 85, 94, 96 ]
+    },
+    1519: {
+        evolution: 1520,
+        evolvers: [  ]
+    },
+    1523: {
+        evolution: 1524,
+        evolvers: [  ]
+    },
+    1526: {
+        evolution: 1527,
         evolvers: [  ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 586dbd1c7..a3eeef13c 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1515,4 +1515,16 @@ window.families = [
     "Sanji",
     "Brook",
     "Brook",
+    "Bellamy",
+    "Bellamy",
+    "Dadan",
+    "Dadan",
+    "Dogra",
+    "Portgas D. Ace",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
+    "Suleiman",
+    "Arlong",
+    "Arlong",
+    "Blenheim",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 46f3f5ad7..8ecdc4028 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1306,4 +1306,6 @@ window.flags = {
     1485: { shop: 1 },
     1513: { rr: 1, rro: 1, lrr: 1 },
     1514: { rr: 1, rro: 1, lrr: 1 },
+    1523: { rr: 1, rro: 1, lrr: 1 },
+    1524: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 9ebb9e30b..501184de5 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1515,4 +1515,6 @@ window.gw=[
     52663,
     53095,
     53095,
+    53153,
+    53153,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index a1e35919e..e086a3f9e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2336,4 +2336,10 @@ window.specials = {
             });
         }
     },
+    1517: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+    },
+    1518: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 0f8ce79c0..8142cd7e9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1513,10 +1513,20 @@ window.units = [
     [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], 4, 25, 6, 3, 99, 3000000, 45, 60, 26, 2119, 1311, 160, 1 ],
     [ "Anniversary Sanji", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, null, 2, null, null, null, null, null, null, null, null, null ],
     [ "Anniversary Sanji, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, null, null, null, null, 1858, 1157, 332, null ],
-    [ "Break Time Brook", "STR", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 124, 84, 30, null, null, null, null ],
-    [ "Brook's Tea Party", "STR", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 912, 393, 106, 2059, 1122, 247, null ],
-    [ "Raid Bellamy", "QCK", [ "Fighter", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Raid Bellamy, Evolved", "QCK", [ "Fighter", "Driven" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Break Time Brook", "STR", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 124, 84, 30, 979, 465, 151, 1 ],
+    [ "Brook's Tea Party", "STR", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 912, 393, 106, 2059, 1122, 247, 1 ],
+    [ "Bellamy the Hyena, Former Captain of the Bellamy Pirates", "QCK", [ "Fighter", "Driven" ], 4, 30, 4, 1, 70, 1066998, 177, 120, 32, 979, 701, 197, 1 ],
+    [ "Bellamy the Hyena, Bullet of Dressrosa", "QCK", [ "Fighter", "Driven" ], 5, 50, 4, 2, 99, 5000000, 901, 624, 151, 2024, 1300, 313, 1 ],
+    [ "Curly Dadan", "PSY", [ "Powerhouse", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Curly Dadan, Evolved", "PSY", [ "Powerhouse", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dogra", "QCK", "Slasher", 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kid Ace", "DEX", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Anniversary Chopper", "PSY", "Cerebral", 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Anniversary Chopper, Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Suleiman", "QCK", [ "Slasher", "Cerebral" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Arlong", "INT", [ "Striker", "Shooter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Arlong, Evolved", "INT", [ "Striker", "Shooter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Blenheim", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 2d6448c511495d2cc660c637f31b2f0bc1e536b5 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 22 Mar 2017 22:28:33 -0400
Subject: [PATCH 0941/1569] Bunch of stuff

Whisper me your bug reports
---
 common/data/aliases.js    |  26 ++++-----
 common/data/captains.js   |  43 +++++++++++++++
 common/data/cooldowns.js  |  12 +++++
 common/data/details.js    | 107 +++++++++++++++++++++++++++++++++-----
 common/data/drops.js      |  11 +++-
 common/data/effects.js    |   9 +++-
 common/data/evolutions.js |   8 ++-
 common/data/gw.js         |  12 +++++
 common/data/specials.js   |  71 ++++++++++++++++++++++---
 common/data/units.js      |  24 +++++----
 common/data/zombies.js    |   8 +++
 damage/js/cruncher.js     |   2 +-
 12 files changed, 284 insertions(+), 49 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index fd9ced3da..705725909 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1511,20 +1511,22 @@ window.aliases = {
     1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', ''],
     1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', ''],
     1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', ''],
-    1513: ['', '', 'Anniversary Sanji', 'White Day Sanji'],
-    1514: ['', '', 'Anniversary Sanji', 'White Day Sanji'],
+    1513: ['サンジ 春先のお付き添い', '', 'Spring Sanji', 'White Day Sanji'],
+    1514: ['サンジ 記念日の手作り', '', 'Spring Sanji', 'White Day Sanji'],
     1515: ['ブルックのブレイクタイム', '', 'White Day Brook'],
     1516: ['ブルックのティーパーティ', '', 'White Day Brook'],
     1517: ['ハイエナのベラミー 元ベラミー海賊団船長', '', 'Raid Bellamy'],
     1518: ['ハイエナのベラミー ドレスローザの凶弾', '', 'Raid Bellamy'],
-    1519: ['', '', ''],
-    1520: ['', '', ''],
-    1521: ['', '', ''],
-    1522: ['', '', ''],
-    1523: ['', '', ''],
-    1524: ['', '', ''],
-    1525: ['', '', ''],
-    1526: ['', '', ''],
-    1527: ['', '', ''],
-    1528: ['', '', ''],
+    1519: ['カーリー・ダダン コルボ山　山賊', '', ''],
+    1520: ['カーリー・ダダン ダダン一家　棟梁', '', ''],
+    1521: ['ドグラ', '', ''],
+    1522: ['ポートガス・D・エース 隠された鬼の子', '', 'Kid Ace'],
+    1523: ['', '', 'Spring Chopper', 'Sakura Chopper'],
+    1524: ['', '', 'Spring Chopper', 'Sakura Chopper'],
+    1525: ['', '', 'Coliseum Suleiman'],
+    1526: ['', '', 'Coliseum Arlong'],
+    1527: ['', '', 'Coliseum Arlong'],
+    1528: ['', '', 'Coliseum Blenheim'],
+    1529: ['', '', 'Invasion Cavendish'],
+    1530: ['', '', 'Invasion Cavendish'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 6f3b79e06..4239d4e97 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4364,4 +4364,47 @@ window.captains = {
     1518: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
     },
+    1519: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+    },
+    1520: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+    },
+    1521: {
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") && p.unit.type == "QCK" ? 1.44 :
+                p.unit.class.has("Slasher") || p.unit.type == "QCK" ? 1.2 :
+                1;
+        }
+    },
+    1522: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    1523: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+    },
+    1524: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; },
+    },
+    1525: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.25 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1526: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+    },
+    1527: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+    },
+    1528: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+    },
+    1529: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 3 : 1.5; }  
+    },
+    1530: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 3.5 : 1.75; }  
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c7df085a3..9d0f8f3db 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1517,4 +1517,16 @@ window.cooldowns = [
     [ 14, 10 ],
     [ 28, 15 ],
     [ 28, 15 ],
+    [ 17, 8 ],
+    [ 17, 8 ],
+    [ 15, 4 ],
+    [ 16, 8 ],
+    [ 11, 11 ],
+    [ 11, 11 ],
+    null,
+    null,//Coliseum Arlong
+    null,//Coliseum Arlong
+    [ 21, 12 ],
+    28,
+    28,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 9d699931b..9114b6d84 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4606,13 +4606,13 @@ window.details = {
     975:{
         captain: "Reduces damage received by 10%",
         specialName: "A Threat That Puts Adults to Shame",
-        special: "Boosts the ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Boosts ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
         specialNotes: "#{zombie}"
     },
     976:{
         captain: "Boosts ATK of Driven characters by 2x. Reduces damage received by 10%",
         specialName: "A Threat That Puts Adults to Shame",
-        special: "Boosts the ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Boosts ATK of Striker and Driven characters by 1.3x for 1 turn. Protects from defeat as long as HP is above 50% for 1 turn",
         specialNotes: "#{zombie}"
     },
     977:{
@@ -6424,7 +6424,7 @@ window.details = {
         captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 2.5x RCV",
         special: [
             {
-                "description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
+                "description": "Randomizes all orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
                 "cooldown": [ 21, 6 ],
             },
             {
@@ -6439,7 +6439,7 @@ window.details = {
         captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 2.5x RCV",
         special: [
             {
-                "description": "Randomizes all orbs, and boosts the ATK of Powerhouse characters by 1.5x for 1 turn",
+                "description": "Randomizes all orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
                 "cooldown": [ 21, 6 ],
             },
             {
@@ -6551,23 +6551,23 @@ window.details = {
     },
     1265: {//Kimono Ace
         captain: "Boosts ATK of Shooter characters by 2x",
-        special: "Recovers 3,000 HP and boosts the ATK of Free Spirit characters by 1.75x for 1 turn",
+        special: "Recovers 3,000 HP and boosts ATK of Free Spirit characters by 1.75x for 1 turn",
         specialName: "Looking to the Full Moon",
     },
     1266: {//Kimono Ace Evo
         captain: "Boosts ATK of Shooter characters by 2.5x",
-        special: "Recovers 3,000 HP and boosts the ATK of Free Spirit characters by 1.75x for 1 turn",
+        special: "Recovers 3,000 HP and boosts ATK of Free Spirit characters by 1.75x for 1 turn",
         specialName: "Looking to the Full Moon",
     },
     1267: {//Legend Blackbeard
-        captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
+        captain: "Boosts ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
         captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
         specialName: "World Shaking Impact",
     },
     1268: {//Legend Blackbeard
-        captain: "Boosts the ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
+        captain: "Boosts ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
         captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
@@ -6659,7 +6659,7 @@ window.details = {
     },
     1282: {//Marineford Sengoku
         captain: "Boosts ATK of Cerebral characters by 2.5x",
-        special: "Reduces cooldown of all specials by 1 turn. Boosts the ATK of all characters by 1.2x and amplifies the effect of orbs by 1.2x for 1 turn",
+        special: "Reduces cooldown of all specials by 1 turn. Boosts ATK of all characters by 1.2x and amplifies the effect of orbs by 1.2x for 1 turn",
         specialName: "Encircling Wall around Marineford Bay",
     },
     1283: {//Marineford Akainu
@@ -6922,13 +6922,13 @@ window.details = {
         specialName: "A Decree of the Veteran",
     },
     1321: {//Momonga
-        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        captain: "Boosts ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1322: {//Momonga
-        captain: "Boosts the ATK of Cerebral and Slasher characters by 2.5x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
+        captain: "Boosts ATK of Cerebral and Slasher characters by 2.5x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
         sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
@@ -7459,7 +7459,7 @@ window.details = {
     },
     1393: {//Demaro Black
         captain: "Boosts ATK of characters with cost 30 or less by 2x",
-        special: "Boosts the ATK of all characters by 1.1x, slightly boosts chances of getting matching orbs and amplifies the effect of orbs by 1.1x for 7 turns",
+        special: "Boosts ATK of all characters by 1.1x, slightly boosts chances of getting matching orbs and amplifies the effect of orbs by 1.1x for 7 turns",
         specialName: "Three Forked Tongue",
     },
     1394: {//Kimono Baby 5
@@ -8307,4 +8307,87 @@ window.details = {
         special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
         specialName: "Spring Hopper - Bullet",
     },
+    1519: {//Dadan
+        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight. Boosts ATK of Slasher characters by 1.5x",
+        special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
+        specialName: "Break by the Fireplace",
+    },
+    1520: {//Dadan
+        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight. Boosts ATK of Slasher characters by 2x",
+        special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
+        specialName: "Break by the Fireplace",
+    },
+    1521: {//Dogra
+        captain: "Boosts ATK of [QCK] and Slasher characters by 1.2x",
+        captainNotes: "The bonus is cumulative. [QCK] Slasher characters get a 1.44x bonus.",
+        special: "Reduces Despair duration by 1 turn, recovers 1000 HP at the end of each turn for 2 turns",
+        specialName: "Affectionate Circumstances",
+    },
+    1522: {//Ace
+        captain: "Boosts ATK of [DEX] characters by 1.75x and their HP by 1.2x",
+        special: "Removes blindness, boosts own ATK by 1.75x for 1 turn",
+        specialName: "Demon's Temper",
+    },
+    1523: {//Spring Chopper
+        captain: "Boosts ATK of [PSY] characters by 1.75x and recovers 1,000 HP at end of each turn",
+        special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
+        specialName: "The Life Risked for the 'Sakura' Miracle",
+    },
+    1524: {//Spring Chopper
+        captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 1,224 HP at end of each turn",
+        special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
+        specialName: "The Life Risked for the 'Sakura' Miracle",
+    },
+    1525: {//Sulieman
+        captain: "Boosts ATK of Slashers characters by 3.25x, reduces his own ATK multiplier by ???x at the end of each turn",
+        special: "Deals 3 hits of random typeless damage to random enemies, delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.3x for 2 turns",
+        specialNotes: "#{randomHits : 10}",
+        specialName: "Sorrowful Execution",
+    },
+    1526: {//Arlong
+        captain: "Boosts ATK of [INT] characters by 1.75x",
+        special: [
+            {
+                "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.5x for 1 turn",
+                "cooldown": [ 16, 7 ],
+            },
+            {
+                "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.75x for 1 turn",
+                "cooldown": [ 21, 12 ],
+            },
+        ],
+        specialName: "Arlong Special",
+    },
+    1527: {//Arlong
+        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight. Boosts ATK of [INT] characters by 2x",
+        special: [
+            {
+                "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.5x for 1 turn",
+                "cooldown": [ 16, 7 ],
+            },
+            {
+                "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.75x for 1 turn",
+                "cooldown": [ 21, 12 ],
+            },
+        ],
+        specialName: "Arlong Special",
+    },
+    1528: {//Blenheim
+        captain: "Boosts ATK of Powerhouse characters by 2.25x",
+        special: "Reduces Despair duration by 2 turns,  makes STR, DEX, and QCK orbs \"beneficial\" to Powerhouse characters for 1 turn if HP is below 30% at the start of the turn",
+        sailor: "Makes [TND] orbs \"beneficial\" for this unit",
+        specialName: "Blenheim Special",
+    },
+    1529: {//Cavendish
+        captain: "Boosts ATK of all characters by 1.5x, but boosts his OWN attack by 3x",
+        special: "For Slasher characters, if HP is above ???% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
+        sailor: "Reduces ATK of all characters by .5x if your captain is [STR] or [QCK]",
+        specialName: "Cavendish Special",
+    },
+    1530: {//Cavendish
+        captain: "Boosts ATK of all characters by 1.75x, but boosts his OWN attack by 3.5x",
+        special: "For Slasher characters, if HP is above ???% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
+        sailor: "Reduces ATK of all characters by .5x if your captain is [STR] or [QCK]",
+        specialName: "Cavendish Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 20ee3c02c..e380cd409 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1658,17 +1658,24 @@ window.drops = {
         {
             name: 'Invasion! Young Whitebeard',
             thumb: 1258,
-            condition: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
+            condition: "Has a chance of appearing at the end of ANY Friday Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
             "All Difficulties": [ 1257 ]
         },
         
         {
             name: 'Invasion! Red Hair Shanks',
             thumb: 1380,
-            condition: "Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Shanks.",
+            condition: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Shanks.",
             "All Difficulties": [ 1379 ]
         },
         
+        {
+            name: 'Invasion! Cavendish',
+            thumb: 1530,
+            condition: "Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.",
+            "All Difficulties": [ 1529 ]
+        },
+        
         {
             name: 'The Flashback Before the Reunion! Fight all your Enemies!',
             thumb: 1353,
diff --git a/common/data/effects.js b/common/data/effects.js
index f442bb6f1..91672ba68 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -398,10 +398,17 @@ window.effects = {
         atk: function(p) { return 1.2; }
     },
     
+    'Invastion Cavendish Sailor - Temp until I get sailor abilities': {
+        description: 'Reduces ATK of all characters by 0.5x. Simulates Cavendish Sailor Ability.',
+        thumb: 1530,
+        id: 42,
+        atk: function(p) { return 0.5; }
+    },
+    
     '20-Hit Hit Barrier': {
         description: 'You will only do damage once the combo meter reaches 20 hits',
         thumb: null,
-        id: 42,
+        id: 43,
         comboShield: 20
     },
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index c05854bca..88f098c3a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2325,7 +2325,7 @@ window.evolutions = {
     },
     1513: {
         evolution: 1514,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 84, 85, 86 ]
     },
     1515: {
         evolution: 1516,
@@ -2337,7 +2337,7 @@ window.evolutions = {
     },
     1519: {
         evolution: 1520,
-        evolvers: [  ]
+        evolvers: [ 117, 81, 81, 98, 103 ]
     },
     1523: {
         evolution: 1524,
@@ -2347,4 +2347,8 @@ window.evolutions = {
         evolution: 1527,
         evolvers: [  ]
     },
+    1529: {
+        evolution: 1530,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index 501184de5..547376196 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1517,4 +1517,16 @@ window.gw=[
     53095,
     53153,
     53153,
+    53572,
+    53572,
+    53574,
+    53573,
+    53576,
+    53576,
+    53589,
+    53593,
+    53593,
+    53592,
+    53622,
+    53622,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index e086a3f9e..e757dcf58 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2241,26 +2241,26 @@ window.specials = {
         type: "type"
     },
     1482: {
-        atk: function(p) { return window.specials[1480].multiplier; },
+        atk: function(p) { return window.specials[1482].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1480].multiplier == 1.5 ? 1 : 0);
-            window.specials[1480].multiplier = [1.25, 1.75][n];
+            var n = (window.specials[1482].multiplier == 1.25 ? 1 : 0);
+            window.specials[1482].multiplier = [1.25, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
-                name: '1480warning'
+                name: '1482warning'
             });
         },
     },
     1483: {
-        atk: function(p) { return window.specials[1481].multiplier; },
+        atk: function(p) { return window.specials[1483].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1481].multiplier == 1.5 ? 1 : 0);
-            window.specials[1481].multiplier = [1.25, 1.75][n];
+            var n = (window.specials[1483].multiplier == 1.25 ? 1 : 0);
+            window.specials[1483].multiplier = [1.25, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
-                name: '1481warning'
+                name: '1483warning'
             });
         },
     },
@@ -2342,4 +2342,59 @@ window.specials = {
     1518: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
     },
+    1522: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type",
+    },
+    1525: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been delayed."
+    },
+    1526: {
+        atk: function(p) { return p.slot < 2 ? window.specials[1526].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1526].multiplier == 1.5 ? 1 : 0);
+            window.specials[1526].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1526warning'
+            });
+        },
+    },
+    1527: {
+        atk: function(p) { return p.slot < 2 ? window.specials[1527].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1527].multiplier == 1.5 ? 1 : 0);
+            window.specials[1527].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1527warning'
+            });
+        },
+    },
+    1529: {
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1529].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 99 ? 2.25 : 2);
+            window.specials[1529].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 99%, using the ' + n + 'x multiplier.',
+                name: '1529warning'
+            });
+        }
+    },
+    1530: {
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1530].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 99 ? 2.25 : 2);
+            window.specials[1530].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 99%, using the ' + n + 'x multiplier.',
+                name: '1530warning'
+            });
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 8142cd7e9..273e5cafc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1511,22 +1511,24 @@ window.units = [
     [ "Speed Jil, Whitebeard 14th Div. Commander ", "INT", [ "Driven", "Striker" ], 4, 25, 6, 3, 99, 3000000, 49, 50, 30, 2140, 1214, 188, 1 ],
     [ "Atmos, Whitebeard 13th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 51, 35, 35, 2213, 1113, 213, 1 ],
     [ "Kingdew, Whitebeard 11th Div. Commander", "STR", [ "Powerhouse", "Fighter" ], 4, 25, 6, 3, 99, 3000000, 45, 60, 26, 2119, 1311, 160, 1 ],
-    [ "Anniversary Sanji", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, null, 2, null, null, null, null, null, null, null, null, null ],
-    [ "Anniversary Sanji, Evolved", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, null, null, null, null, 1858, 1157, 332, null ],
+    [ "Sanji, Early Spring Adventure", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 6, 2, 50, 392109, 89, 52, 39, 1032, 490, 192, 1 ],
+    [ "Sanji's Handmade Anniversary Gift", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 7, 4, 99, 3000000, 956, 434, 151, 1858, 1157, 332, 1 ],
     [ "Break Time Brook", "STR", [ "Slasher", "Free Spirit" ], 4, 12, 6, 2, 50, 392109, 124, 84, 30, 979, 465, 151, 1 ],
     [ "Brook's Tea Party", "STR", [ "Slasher", "Free Spirit" ], 5, 20, 4, 3, 99, 3000000, 912, 393, 106, 2059, 1122, 247, 1 ],
     [ "Bellamy the Hyena, Former Captain of the Bellamy Pirates", "QCK", [ "Fighter", "Driven" ], 4, 30, 4, 1, 70, 1066998, 177, 120, 32, 979, 701, 197, 1 ],
     [ "Bellamy the Hyena, Bullet of Dressrosa", "QCK", [ "Fighter", "Driven" ], 5, 50, 4, 2, 99, 5000000, 901, 624, 151, 2024, 1300, 313, 1 ],
-    [ "Curly Dadan", "PSY", [ "Powerhouse", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Curly Dadan, Evolved", "PSY", [ "Powerhouse", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dogra", "QCK", "Slasher", 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kid Ace", "DEX", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Anniversary Chopper", "PSY", "Cerebral", 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Anniversary Chopper, Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Suleiman", "QCK", [ "Slasher", "Cerebral" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Curly Dadan, Mt. Corvo Brigade", "PSY", [ "Powerhouse", "Slasher" ], 3, 13, 6, 2, 50, 392109, 121, 76, 7, 1254, 606, 39, 1 ],
+    [ "Curly Dadan, Head of the Dadan Family", "PSY", [ "Powerhouse", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 1080, 578, 36, 2394, 912, 247, 1 ],
+    [ "Dogra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 120, 83, 33, 1314, 660, 201, 1 ],
+    [ "Portgas D. Ace, Hidden Demon's Child", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 108, 103, 31, 1134, 870, 191, 1 ],
+    [ "Spring Chopper", "PSY", "Cerebral", 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Spring Chopper, Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Suleiman the Beheader, Battle of Dias Class-A War Criminal", "QCK", [ "Slasher", "Cerebral" ], 5, 40, 6, 3, 99, null, null, null, null, 2087, 1347, 247, null ],
     [ "Coliseum Arlong", "INT", [ "Striker", "Shooter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Arlong, Evolved", "INT", [ "Striker", "Shooter" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Blenheim", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Arlong the Saw, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 4, 26, 4, 3, 99, null, null, null, null, 2053, 1479, 153, null ],
+    [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, 6, 3, 99, null, null, null, null, 1959, 1246, 248, null ],
+    [ "Ambush Cavendish", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1500, 737, 202, null ],
+    [ "Ambush Cavendish, Evolved", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 442d18dd5..b886e5dbc 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -351,4 +351,12 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    1523: { // Spring Chopper
+        type: 'healer',
+        amount: 1000
+    },
+    1524: { // Spring Chopper
+        type: 'healer',
+        amount: 1224
+    },
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index c4dadf6c6..46a32916f 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -730,7 +730,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));
             }
             // activate turn counter if necessary
-            if (n < 2 && (id == 794 || id == 795 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1361 || id == 1362))
+            if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525))
                 $scope.tdata.turnCounter.enabled = true;
         });
         if (conflictWarning) 

From 29eae59fa6b568f4c27d4c146f90c534e4aa2afd Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 23 Mar 2017 20:13:47 -0400
Subject: [PATCH 0942/1569] Fixes

---
 common/data/cooldowns.js |  2 +-
 common/data/details.js   | 10 +++++-----
 common/data/drops.js     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9d0f8f3db..61049d42a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1523,7 +1523,7 @@ window.cooldowns = [
     [ 16, 8 ],
     [ 11, 11 ],
     [ 11, 11 ],
-    null,
+    [ 30, 16 ],
     null,//Coliseum Arlong
     null,//Coliseum Arlong
     [ 21, 12 ],
diff --git a/common/data/details.js b/common/data/details.js
index 9114b6d84..266facf34 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6844,13 +6844,13 @@ window.details = {
     1313: {//Akainu
         captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
-        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
+        special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
     },
     1314: {//Akainu
         captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
-        special: "Deals large typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
+        special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
     },
     1315: {//Coby
@@ -6936,7 +6936,7 @@ window.details = {
     1323: {//Onigumo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.3x",
         captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 1.69x bonus.",
-        special: "Randomize [RCV], [TND], and [BOMB] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
+        special: "Randomize [RCV], [TND], and [BLOCK] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         specialName: "Onigumo of Dismantling Swordsmanship",
         sailor: "Reduces Paralysis for 5 turns for himself"
@@ -6944,7 +6944,7 @@ window.details = {
     1324: {//Onigumo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.6x",
         captainNotes: "The bonus is cumulative. Slasher + Driven characters get a 2.56x bonus.",
-        special: "Randomize [RCV], [TND], and [BOMB] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
+        special: "Randomize [RCV], [TND], and [BLOCK] orbs. Makes [STR], [DEX], and [QCK] orbs \"beneficial\" to Driven and Slasher characters for 2 turns",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         specialName: "Onigumo of Dismantling Swordsmanship",
         sailor: "Reduces Paralysis for 5 turns for himself"
@@ -7627,7 +7627,7 @@ window.details = {
     1413: {//6+ Whitebeard
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
         special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs.",
-        specialName: "Seaquake",
+        specialName: "Emperor's Pride",
     },
     1414: {//Shop Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
diff --git a/common/data/drops.js b/common/data/drops.js
index e380cd409..ddedcd52e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1313,7 +1313,7 @@ window.drops = {
             name: "Shambles! Tashigi and Smoker?!?",
             thumb: 1397,
             condition: "Your captain will be switched with your middle right character when you encounter Law.",
-            "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257, -1389 ]
+            "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
         },
         
         {

From 6c3736438c8b661796ea1ba7a7eb4be55dc2e844 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 27 Mar 2017 16:51:35 +0200
Subject: [PATCH 0943/1569] Load Images via https

---
 common/js/utils.js       | 10 +++++-----
 damage/js/controllers.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index eb8e339a4..f1e44098b 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -69,18 +69,18 @@
 
     utils.getThumbnailUrl = function (n) {
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
-            return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+            return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
         if (id == '0742')
-            return 'http://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
-        return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
+            return 'https://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
+        return 'https://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
     };
 
     utils.getBigThumbnailUrl = function (n) {
         if (window.units[n - 1].incomplete)
-            return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+            return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
-        return 'http://onepiece-treasurecruise.com/wp-content/uploads/c' + id + '.png';
+        return 'https://onepiece-treasurecruise.com/wp-content/uploads/c' + id + '.png';
     };
 
     utils.getThumbnailTitle = function (arg) {
diff --git a/damage/js/controllers.js b/damage/js/controllers.js
index 78db80093..2cfe7c267 100644
--- a/damage/js/controllers.js
+++ b/damage/js/controllers.js
@@ -199,7 +199,7 @@ controllers.ShipCtrl = function($scope, $state) {
 
     $scope.getThumbnail = function(ship) {
         if (!ship.thumb) return 'background-image: url(' + Utils.getThumbnailUrl(null) + ')';
-        return 'background-image: url(http://onepiece-treasurecruise.com/wp-content/uploads/' + ship.thumb + ')';
+        return 'background-image: url(https://onepiece-treasurecruise.com/wp-content/uploads/' + ship.thumb + ')';
     };
 
     $scope.pickShip = function(name) {

From e30419110fb2592b3368ef407b85ed49ec446de9 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 28 Mar 2017 18:54:57 -0400
Subject: [PATCH 0944/1569] New units

Will fix other issues soon
---
 common/data/aliases.js    |  12 ++---
 common/data/details.js    | 110 +++++++++++++++++++++++++++++++-------
 common/data/effects.js    |  46 +++-------------
 common/data/evolutions.js |  26 ++++++++-
 common/data/flags.js      |  12 +++++
 common/data/specials.js   |   8 +--
 common/data/units.js      |  24 ++++++---
 common/data/zombies.js    |   8 +++
 8 files changed, 173 insertions(+), 73 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 705725909..a080a237c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1523,10 +1523,10 @@ window.aliases = {
     1522: ['ポートガス・D・エース 隠された鬼の子', '', 'Kid Ace'],
     1523: ['', '', 'Spring Chopper', 'Sakura Chopper'],
     1524: ['', '', 'Spring Chopper', 'Sakura Chopper'],
-    1525: ['', '', 'Coliseum Suleiman'],
-    1526: ['', '', 'Coliseum Arlong'],
-    1527: ['', '', 'Coliseum Arlong'],
-    1528: ['', '', 'Coliseum Blenheim'],
-    1529: ['', '', 'Invasion Cavendish'],
-    1530: ['', '', 'Invasion Cavendish'],
+    1525: ['首はねスレイマン ディアス海戦Ａ級戦犯', '', 'Coliseum Suleiman'],
+    1526: ['アーロン アーロン一味船長', '', 'Coliseum Arlong'],
+    1527: ['ノコギリのアーロン アーロン一味船長', '', 'Coliseum Arlong'],
+    1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim'],
+    1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
+    1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
 };
diff --git a/common/data/details.js b/common/data/details.js
index 266facf34..6bafd279a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2400,12 +2400,12 @@ window.details = {
     561: {
         special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
         specialName: "Great Flame Commandment: Flame Emperor",
-        captain: "Boosts HP of Shooter characters by 1.5x and their ATK by 3x if they have a matching orb, by 2x otherwise"
+        captain: "Boosts HP of Shooter characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 2x otherwise"
     },
     562: {
         special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
         specialName: "Great Flame Commandment: Flame Emperor",
-        captain: "Boosts HP of Shooter characters by 1.5x and their ATK by 3x if they have a matching orb, by 2x otherwise"
+        captain: "Boosts HP of Shooter characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 2x otherwise"
     },
     563: {
         special: "Deal 3x character's ATK in PSY damage to one enemy, changes [INT] orbs into [RCV] orbs",
@@ -5311,13 +5311,13 @@ window.details = {
         specialName: "Drill Dragon: Drill Nail"
     },
     1084: {
-        captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
+        captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
         specialNotes: "Does not stack with other 'end of turn damage' abilities",
         specialName: "Gravito: Heavens Fall"
     },
     1085: {
-        captain: "Boosts HP of Driven characters by 1.5x and their ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
+        captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
         specialNotes: "Does not stack with other 'end of turn damage' abilities",
         specialName: "Gravito: Heavens Fall"
@@ -6330,7 +6330,7 @@ window.details = {
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
     },
     1239: {//6* Kizaru
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and boosts RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
         specialName: "Yasakani no Magatama",
         special: [
             {
@@ -6349,7 +6349,7 @@ window.details = {
         specialNotes: "#{randomHits : 10}",
     },
     1240: {//6* Kizaru
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and boosts RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
         specialName: "Yasakani no Magatama",
         special: [
             {
@@ -7879,14 +7879,14 @@ window.details = {
     },
     1453: {//Valentines Margeurite
         captain: "Not Translated",
-        special: "Changes Orbs depending on the current HP",
+        special: "Changes all orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
         specialName: "Doki Doki Heart",
     },
     1454: {//Valentines Margeurite
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x an their RCV by 1.5x",
-        special: "Changes Orbs depending on the current HP",
-        specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
+        special: "Changes all orbs depending on the current HP",
+        specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [DEX], bottom row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
         specialName: "Doki Doki Heart",
     },
     1455: {//Coliseum Don Chinjao
@@ -7944,13 +7944,13 @@ window.details = {
     },
     1462: {//White Day Luffy
         captain: "Boosts chain multiplier by 2x",
-        special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
+        special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters for 1 turn",
         sailor: "Reduces Paralysis for 2 turns for himself",
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
     1463: {//White Day Luffy
         captain: "Boosts chain multiplier by 2.5x",
-        special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters",
+        special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters for 1 turn",
         sailor: "Reduces Paralysis for 2 turns for himself",
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
@@ -8356,7 +8356,7 @@ window.details = {
                 "cooldown": [ 21, 12 ],
             },
         ],
-        specialName: "Arlong Special",
+        specialName: "Just 'Water Play'",
     },
     1527: {//Arlong
         captain: "Reduces cooldown of all specials by 1 turns at the start of the fight. Boosts ATK of [INT] characters by 2x",
@@ -8370,24 +8370,98 @@ window.details = {
                 "cooldown": [ 21, 12 ],
             },
         ],
-        specialName: "Arlong Special",
+        specialName: "Just 'Water Play'",
     },
     1528: {//Blenheim
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
         special: "Reduces Despair duration by 2 turns,  makes STR, DEX, and QCK orbs \"beneficial\" to Powerhouse characters for 1 turn if HP is below 30% at the start of the turn",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
-        specialName: "Blenheim Special",
+        specialName: "Australian Army Aid Blade",
     },
     1529: {//Cavendish
         captain: "Boosts ATK of all characters by 1.5x, but boosts his OWN attack by 3x",
-        special: "For Slasher characters, if HP is above ???% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
+        special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
         sailor: "Reduces ATK of all characters by .5x if your captain is [STR] or [QCK]",
-        specialName: "Cavendish Special",
+        specialName: "Blue Bird Sword",
     },
     1530: {//Cavendish
         captain: "Boosts ATK of all characters by 1.75x, but boosts his OWN attack by 3.5x",
-        special: "For Slasher characters, if HP is above ???% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
+        special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
         sailor: "Reduces ATK of all characters by .5x if your captain is [STR] or [QCK]",
-        specialName: "Cavendish Special",
+        specialName: "Blue Bird Sword",
+    },
+    1530: {//Legend Usopp
+        captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
+        special: "Delays all enemies for 5 turns, adds .3x to Chain multiplier for 4 turns",
+        sailor: "Completely resists Blindness",
+        specialName: "Legend Usopp Special",
+    },
+    1530: {//Legend Usopp
+        captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
+        special: "Delays all enemies for 5 turns, adds .3x to Chain multiplier for 4 turns",
+        sailor: "Completely resists Blindness",
+        specialName: "Legend Usopp Special",
+    },
+    1530: {//Rayleigh
+        captain: "Not Translated",
+        special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
+        sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Rayleigh Special",
+    },
+    1530: {//Rayleigh
+        captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect.",
+        special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
+        sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Rayleigh Special",
+    },
+    1530: {//Duval
+        captain: "Not Translated",
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
+        sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
+        specialName: "Duval Special",
+    },
+    1530: {//Duval
+        captain: "Reduces cooldown of [PSY] specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
+        sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
+        specialName: "Duval Special",
+    },
+    1530: {//Heracles'n
+        captain: "Not Translated",
+        special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
+        sailor: "Boosts HP of STR characters by 150",
+        specialName: "Heracles'n Special",
+    },
+    1530: {//Heracles'n
+        captain: "Boosts ATK of [STR] characters by 2.5x and their HP by 1.2x",
+        special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
+        sailor: "Boosts HP of STR characters by 150",
+        specialName: "Heracles'n Special",
+    },
+    1530: {//Perona
+        captain: "Not Translated",
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by ??% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction by 2 turns",
+        sailor: "Boosts ATK of INT characters by 50",
+        specialName: "Perona Special",
+    },
+    1530: {//Perona
+        captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by ??% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction by 2 turns",
+        sailor: "Boosts ATK of INT characters by 50",
+        specialName: "Perona Special",
+    },
+    1530: {//Elizabeth
+        captain: "Not Translated",
+        special: "recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
+        sailor: "Restores her own special by 2 turns when it is rewinded",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        specialName: "Elizabeth Special",
+    },
+    1530: {//Elizabeth
+        captain: "Boosts RCV and HP by ???x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
+        special: "recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
+        sailor: "Restores her own special by 2 turns when it is rewinded",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        specialName: "Elizabeth Special",
     },
 };
diff --git a/common/data/effects.js b/common/data/effects.js
index 91672ba68..5a23f8557 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -272,40 +272,17 @@ window.effects = {
         
     },
     
-    '3-hit Good Barrier': {
-        description: 'You need to hit 3 Goods before you do any Damage',
-        thumb: null,
-        id: 32,
-        comboShield: 3,
-        comboType: 'Good'
-    },
-    
-    '3-hit Great Barrier': {
-        description: 'You need to hit 3 Greats before you do any Damage',
-        thumb: null,
-        id: 33,
-        comboShield: 3,
-        comboType: 'Great'
-    },
-    
-    '10-Hit Hit Barrier': {
-        description: 'You will only do damage once the combo meter reaches 10 hits',
-        thumb: null,
-        id: 34,
-        comboShield: 10
-    },
-    
     '1.25x Orb Boost': {
         description: 'Used by Christmas Law in Saga Coliseum',
         thumb: 856,
-        id: 35,
+        id: 32,
         orb: function(p) { return p.orb == 2.0 ? 1.25 : (p.orb == 0.5 ? 20/25 : 1); }
     },
     
     '700k Damage Treshold Barrier': {
         description: 'Used by Saga. You cannot do more that 700k damage in one hit',
         thumb: 1089,
-        id: 36,
+        id: 33,
         barrierThreshold: 700000,
         barrierReduction: 0.99
     },
@@ -314,7 +291,7 @@ window.effects = {
         //OLD description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
         description: 'Boosts ATK of Driven characters by 2x and boosts HP for Powerhouse characters by 2x.',
         thumb: 1095,
-        id: 37,
+        id: 34,
         atk: function(p) { 
 /*                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
                             if(p.class.has('Driven')) { boost1 = 2.0}
@@ -346,7 +323,7 @@ window.effects = {
     'Coliseum Tashigi': {
         description: '25 hit barrier and 2x chain limit',
         thumb: 783,
-        id: 38,
+        id: 35,
         comboShield: 25,
         chainLimiter: function() { return 2.0; }
     },
@@ -354,7 +331,7 @@ window.effects = {
     'Robin and Nami\'s Secret Undercover Investigation': {
         description: 'Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP.',
         thumb: 1112,
-        id: 39,
+        id: 36,
         atk: function(p) { 
                             var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
                             if(p.class.has('Cerebral')) { boost1 = 2.0}
@@ -385,7 +362,7 @@ window.effects = {
     'Gild Tesoro - 40 Stamina': {
         description: 'Boosts the Orbs and ATK of all characters by 1.1x',
         thumb: 1162,
-        id: 40,
+        id: 37,
         orb: function(p) { return p.orb == 2.0 ? 1.1 : (p.orb == 0.5 ? 10/11 : 1); },
         atk: function(p) { return 1.1; }
     },
@@ -393,7 +370,7 @@ window.effects = {
     'Gild Tesoro - 60 Stamina': {
         description: 'Boosts the Orbs and ATK of all characters by 1.2x',
         thumb: 1163,
-        id: 41,
+        id: 38,
         orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
         atk: function(p) { return 1.2; }
     },
@@ -401,15 +378,8 @@ window.effects = {
     'Invastion Cavendish Sailor - Temp until I get sailor abilities': {
         description: 'Reduces ATK of all characters by 0.5x. Simulates Cavendish Sailor Ability.',
         thumb: 1530,
-        id: 42,
+        id: 39,
         atk: function(p) { return 0.5; }
     },
-    
-    '20-Hit Hit Barrier': {
-        description: 'You will only do damage once the combo meter reaches 20 hits',
-        thumb: null,
-        id: 43,
-        comboShield: 20
-    },
 
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 88f098c3a..c13d382f9 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2345,10 +2345,34 @@ window.evolutions = {
     },
     1526: {
         evolution: 1527,
-        evolvers: [  ]
+        evolvers: [ 88, 89, 94, 95, 304 ]
     },
     1529: {
         evolution: 1530,
+        evolvers: [ 118, 85, 266, 96, 267 ]
+    },
+    1531: {
+        evolution: 1532,
+        evolvers: [  ]
+    },
+    1533: {
+        evolution: 1534,
+        evolvers: [  ]
+    },
+    1535: {
+        evolution: 1536,
+        evolvers: [  ]
+    },
+    1537: {
+        evolution: 1538,
+        evolvers: [  ]
+    },
+    1539: {
+        evolution: 1540,
+        evolvers: [  ]
+    },
+    1541: {
+        evolution: 1542,
         evolvers: [  ]
     },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 8ecdc4028..018c46f7c 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1308,4 +1308,16 @@ window.flags = {
     1514: { rr: 1, rro: 1, lrr: 1 },
     1523: { rr: 1, rro: 1, lrr: 1 },
     1524: { rr: 1, rro: 1, lrr: 1 },
+    1531: { rr: 1, rro: 1 },
+    1532: { rr: 1, rro: 1 },
+    1533: { rr: 1, rro: 1 },
+    1534: { rr: 1, rro: 1 },
+    1535: { rr: 1, rro: 1 },
+    1536: { rr: 1, rro: 1 },
+    1537: { rr: 1, rro: 1 },
+    1538: { rr: 1, rro: 1 },
+    1539: { rr: 1, rro: 1 },
+    1540: { rr: 1, rro: 1 },
+    1541: { rr: 1, rro: 1 },
+    1542: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index e757dcf58..c6d467d59 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2378,10 +2378,10 @@ window.specials = {
     1529: {
         orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1529].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
         onActivation: function(p) {
-            var n = (p.percHP >= 99 ? 2.25 : 2);
+            var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1529].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 99%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
                 name: '1529warning'
             });
         }
@@ -2389,10 +2389,10 @@ window.specials = {
     1530: {
         orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1530].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
         onActivation: function(p) {
-            var n = (p.percHP >= 99 ? 2.25 : 2);
+            var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1530].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 99%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
                 name: '1530warning'
             });
         }
diff --git a/common/data/units.js b/common/data/units.js
index 273e5cafc..2f342f229 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1523,12 +1523,24 @@ window.units = [
     [ "Portgas D. Ace, Hidden Demon's Child", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 108, 103, 31, 1134, 870, 191, 1 ],
     [ "Spring Chopper", "PSY", "Cerebral", 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Spring Chopper, Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Suleiman the Beheader, Battle of Dias Class-A War Criminal", "QCK", [ "Slasher", "Cerebral" ], 5, 40, 6, 3, 99, null, null, null, null, 2087, 1347, 247, null ],
-    [ "Coliseum Arlong", "INT", [ "Striker", "Shooter" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Arlong the Saw, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 4, 26, 4, 3, 99, null, null, null, null, 2053, 1479, 153, null ],
-    [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, 6, 3, 99, null, null, null, null, 1959, 1246, 248, null ],
-    [ "Ambush Cavendish", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1500, 737, 202, null ],
-    [ "Ambush Cavendish, Evolved", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, null ],
+    [ "Suleiman the Beheader, Battle of Dias Class-A War Criminal", "QCK", [ "Slasher", "Cerebral" ], 5, 40, 6, 3, 99, 4000000, 174, 147, 47, 2087, 1347, 247, 1 ],
+    [ "Arlong, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 3, 16, 4, 2, 50, 392109, 173, 153, 23, 935, 853, 75, 1 ],
+    [ "Arlong the Saw, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 853, 735, 55, 2053, 1479, 153, 1 ],
+    [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
+    [ "Cavendish, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1588, 801, 249, 1 ],
+    [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
+    [ "Usoland", "DEX", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "God Usopp", "DEX", "Shooter", 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rayleigh", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Duval", "PSY", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Duval, Straw Hat Pirates Accomplice", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Heracles'n", "STR", [ "Striker", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Heracles'n, Straw Hat Pirates Accomplice", "STR", [ "Striker", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Perona", "INT", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index b886e5dbc..f2390fdb1 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -235,6 +235,14 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    1078: {//Mansherry
+        type: 'healer',
+        multiplier: 3
+    },
+    1079: {//Mansherry
+        type: 'healer',
+        multiplier: 4
+    },
     1133: {
         type: 'healer',
         multiplier: 2

From e447c1e5d6d5ffeab1ef9b2ee11b495795fc8088 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 28 Mar 2017 21:03:27 -0400
Subject: [PATCH 0945/1569] Global Flags

---
 common/data/flags.js | 48 ++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 018c46f7c..24f9701b7 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -986,16 +986,19 @@ window.flags = {
     1004: { global: 1 },
     1005: { global: 1 },
     1006: { global: 1 },
-    1007: { rr: 1, rro: 1, lrr: 1 },
-    1008: { rr: 1, rro: 1, lrr: 1 },
+    1007: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1008: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1009: { promo: 1 },
     1010: { global: 1 },
     1011: { global: 1 },
     1012: { global: 1 },
     1013: { global: 1 },
     1014: { global: 1 },
-    1020: { rr: 1, rro: 1, lrr: 1 },
-    1021: { rr: 1, rro: 1, lrr: 1 },
+    1015: { global: 1 },
+    1016: { global: 1 },
+    1019: { global: 1 },
+    1020: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1021: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1022: { promo: 1, global: 1 },
     1024: { rr: 1, rro: 1, global: 1 },
     1025: { rr: 1, rro: 1, global: 1 },
@@ -1093,6 +1096,10 @@ window.flags = {
     1133: { rr: 1, rro: 1, global: 1 },
     1134: { rr: 1, rro: 1, lrr: 1 },
     1135: { rr: 1, rro: 1, lrr: 1 },
+    1136: { global: 1 },
+    1137: { global: 1 },
+    1138: { global: 1 },
+    1139: { global: 1 },
     1146: { global: 1 },
     1147: { global: 1 },
     1148: { global: 1 },
@@ -1142,6 +1149,11 @@ window.flags = {
     1192: { rr: 1, rro: 1, global: 1 },
     1193: { rr: 1, rro: 1, lrr: 1 },
     1194: { rr: 1, rro: 1, lrr: 1 },
+    1202: { global: 1 },
+    1203: { global: 1 },
+    1204: { global: 1 },
+    1205: { global: 1 },
+    1206: { global: 1 },
     1207: { rr: 1, rro: 1, global: 1 },
     1208: { rr: 1, rro: 1, global: 1 },
     1209: { rr: 1, rro: 1, global: 1 },
@@ -1173,6 +1185,8 @@ window.flags = {
     1246: { special: 1, global: 1 },
     1247: { special: 1, global: 1 },
     1249: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1257: { global: 1 },
+    1258: { global: 1 },
     1259: { rr: 1, rro: 1, lrr: 1 },
     1260: { rr: 1, rro: 1, lrr: 1 },
     1261: { rr: 1, rro: 1, lrr: 1 },
@@ -1206,18 +1220,18 @@ window.flags = {
     1298: { global: 1 },
     1307: { rr: 1, rro: 1, lrr: 1 },
     1308: { rr: 1, rro: 1, lrr: 1 },
-    1313: { rr: 1, rro: 1 },
-    1314: { rr: 1, rro: 1 },
-    1315: { rr: 1, rro: 1 },
-    1316: { rr: 1, rro: 1 },
-    1317: { rr: 1, rro: 1 },
-    1318: { rr: 1, rro: 1 },
-    1319: { rr: 1, rro: 1 },
-    1320: { rr: 1, rro: 1 },
-    1321: { rr: 1, rro: 1 },
-    1322: { rr: 1, rro: 1 },
-    1323: { rr: 1, rro: 1 },
-    1324: { rr: 1, rro: 1 },
+    1313: { rr: 1, rro: 1, global: 1 },
+    1314: { rr: 1, rro: 1, global: 1 },
+    1315: { rr: 1, rro: 1, global: 1 },
+    1316: { rr: 1, rro: 1, global: 1 },
+    1317: { rr: 1, rro: 1, global: 1 },
+    1318: { rr: 1, rro: 1, global: 1 },
+    1319: { rr: 1, rro: 1, global: 1 },
+    1320: { rr: 1, rro: 1, global: 1 },
+    1321: { rr: 1, rro: 1, global: 1 },
+    1322: { rr: 1, rro: 1, global: 1 },
+    1323: { rr: 1, rro: 1, global: 1 },
+    1324: { rr: 1, rro: 1, global: 1 },
     1335: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1336: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1342: { global: 1 },
@@ -1266,7 +1280,7 @@ window.flags = {
     1410: { rr: 1, rro: 1 },
     1411: { rr: 1, rro: 1 },
     1412: { rr: 1, rro: 1 },
-    1413: { rr: 1, rro: 1 },
+    1413: { rr: 1, rro: 1, global: 1 },
     1414: { shop: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
     1420: { rr: 1, rro: 1, lrr: 1, },

From 219e9446fa66ff89c9e80079e499e575216df476 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 28 Mar 2017 21:07:20 -0400
Subject: [PATCH 0946/1569] Whoops

---
 common/data/details.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6bafd279a..8e35ef0a3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8390,74 +8390,74 @@ window.details = {
         sailor: "Reduces ATK of all characters by .5x if your captain is [STR] or [QCK]",
         specialName: "Blue Bird Sword",
     },
-    1530: {//Legend Usopp
+    1531: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
         special: "Delays all enemies for 5 turns, adds .3x to Chain multiplier for 4 turns",
         sailor: "Completely resists Blindness",
         specialName: "Legend Usopp Special",
     },
-    1530: {//Legend Usopp
+    1532: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
         special: "Delays all enemies for 5 turns, adds .3x to Chain multiplier for 4 turns",
         sailor: "Completely resists Blindness",
         specialName: "Legend Usopp Special",
     },
-    1530: {//Rayleigh
+    1533: {//Rayleigh
         captain: "Not Translated",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
         specialName: "Rayleigh Special",
     },
-    1530: {//Rayleigh
+    1534: {//Rayleigh
         captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
         specialName: "Rayleigh Special",
     },
-    1530: {//Duval
+    1535: {//Duval
         captain: "Not Translated",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
         specialName: "Duval Special",
     },
-    1530: {//Duval
+    1536: {//Duval
         captain: "Reduces cooldown of [PSY] specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
         specialName: "Duval Special",
     },
-    1530: {//Heracles'n
+    1537: {//Heracles'n
         captain: "Not Translated",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Heracles'n Special",
     },
-    1530: {//Heracles'n
+    1538: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2.5x and their HP by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Heracles'n Special",
     },
-    1530: {//Perona
+    1539: {//Perona
         captain: "Not Translated",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by ??% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
         specialName: "Perona Special",
     },
-    1530: {//Perona
+    1540: {//Perona
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by ??% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
         specialName: "Perona Special",
     },
-    1530: {//Elizabeth
+    1541: {//Elizabeth
         captain: "Not Translated",
         special: "recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Elizabeth Special",
     },
-    1530: {//Elizabeth
+    1542: {//Elizabeth
         captain: "Boosts RCV and HP by ???x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",

From 5832f3f289e6128610c91c9ea961a94236e569b5 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 28 Mar 2017 21:09:33 -0400
Subject: [PATCH 0947/1569] Cavendish and new cooldown placeholders

and a typo on capitalization
---
 common/data/cooldowns.js | 16 ++++++++++++++--
 common/data/details.js   |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 61049d42a..ba791fee3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1527,6 +1527,18 @@ window.cooldowns = [
     null,//Coliseum Arlong
     null,//Coliseum Arlong
     [ 21, 12 ],
-    28,
-    28,
+    [ 28, 15 ],
+    [ 28, 15 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 8e35ef0a3..e0aab6958 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8452,14 +8452,14 @@ window.details = {
     },
     1541: {//Elizabeth
         captain: "Not Translated",
-        special: "recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Elizabeth Special",
     },
     1542: {//Elizabeth
         captain: "Boosts RCV and HP by ???x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
-        special: "recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Elizabeth Special",

From 945a8081a6182ac319ca49bf61d997281dee49d0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 29 Mar 2017 23:36:42 -0500
Subject: [PATCH 0948/1569] 6+ Usopp Updated

Bamo
---
 characters/index.html   |  2 +-
 common/data/aliases.js  |  3 +++
 common/data/captains.js | 44 ++++++++++++++++++++++++++++++++++++
 common/data/details.js  | 50 +++++++++++++++++++++++++++++++++--------
 common/data/families.js | 15 +++++++++++++
 common/data/specials.js | 26 +++++++++++++++++++--
 common/data/units.js    |  5 +++--
 index.html              | 13 +++++------
 8 files changed, 136 insertions(+), 22 deletions(-)

diff --git a/characters/index.html b/characters/index.html
index 3c5a6e1a2..b6ce2034f 100644
--- a/characters/index.html
+++ b/characters/index.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="description" itemprop="description" content="One Piece Treasure Cruise Character Table">
-        <meta name="author" content="Zeenigami and Mondfischer">
+        <meta name="author" content="Solaris, 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>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index a080a237c..76bd7abb5 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1529,4 +1529,7 @@ window.aliases = {
     1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim'],
     1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
     1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
+    1531: ['', '', 'God Usopp'],
+    1532: ['', '', 'God Usopp'],
+    1543: ['', '', 'God Usopp'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 4239d4e97..e2177b1aa 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4407,4 +4407,48 @@ window.captains = {
     1530: {
         atk: function(p) { return p.slot == p.sourceSlot ? 3.5 : 1.75; }  
     },
+    1531: {
+        atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
+    },
+    1532: {
+        atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
+    },
+    1533: {
+        hitAtk: function(p) {
+            return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    1534: {
+        hitAtk: function(p) {
+            return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+    },
+    
+    1536: {
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : p.slot == p.sourceSlot ? 3 : 1; }
+    },
+    1537: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+    },
+    1538: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.25 : 1; }
+    },
+    1539: {
+        atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
+    },
+    1540: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
+    },
+    
+    1543: {
+        atk: function(p) { return !(p.unit.class.has("Shooter")) ? 1 : p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index e0aab6958..f47f081fc 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8149,7 +8149,7 @@ window.details = {
         specialName: "Explosion Blocking Escape",
     },
     1492: {//6+ Sabo
-        captain: "Boosts HP and RCV of all characters by ???x, boosts ATK of Free Spirit characters by 2.75x",
+        captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
         captainNotes: "HP and RCV boost are not known yet, but are assumed to be for anyone and is a 1.2x boost for both in the calculator.",
         special: [
             {
@@ -8392,18 +8392,44 @@ window.details = {
     },
     1531: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
-        special: "Delays all enemies for 5 turns, adds .3x to Chain multiplier for 4 turns",
+        special: [
+            {
+                "description": "Delays all enemies for 3 turns",
+                "cooldown": [ 13, 10 ],
+            },
+            {
+                "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
+                "cooldown": [ 19, 16 ],
+            },
+            {
+                "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
+                "cooldown": [ 24, 21 ],
+            },
+        ],
         sailor: "Completely resists Blindness",
-        specialName: "Legend Usopp Special",
+        specialName: "Long-Range Attack: Bagworm",
     },
     1532: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
-        special: "Delays all enemies for 5 turns, adds .3x to Chain multiplier for 4 turns",
+        special: [
+            {
+                "description": "Delays all enemies for 3 turns",
+                "cooldown": [ 13, 10 ],
+            },
+            {
+                "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
+                "cooldown": [ 19, 16 ],
+            },
+            {
+                "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
+                "cooldown": [ 24, 21 ],
+            },
+        ],
         sailor: "Completely resists Blindness",
-        specialName: "Legend Usopp Special",
+        specialName: "Long-Range Attack: Bagworm",
     },
     1533: {//Rayleigh
-        captain: "Not Translated",
+        captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
         specialName: "Rayleigh Special",
@@ -8427,19 +8453,19 @@ window.details = {
         specialName: "Duval Special",
     },
     1537: {//Heracles'n
-        captain: "Not Translated",
+        captain: "Boosts ATK of [STR] characters by 2x and their HP by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Heracles'n Special",
     },
     1538: {//Heracles'n
-        captain: "Boosts ATK of [STR] characters by 2.5x and their HP by 1.2x",
+        captain: "Boosts ATK of [STR] characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Heracles'n Special",
     },
     1539: {//Perona
-        captain: "Not Translated",
+        captain: "Boosts ATK and RCV of characters with cost 20 or less by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by ??% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
         specialName: "Perona Special",
@@ -8464,4 +8490,10 @@ window.details = {
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Elizabeth Special",
     },
+    1543: {//6+ Usopp
+        captain: "Boosts ATK of Shooter characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to Shooter characters.",
+        special: "Cuts the current HP of each enemy by 10%. If enemies have Delay Prevention, ignores it and Delays all enemies for 1 turn. Otherwise, Delays all enemies for 3 turns",
+        sailor: "Completely resists Blindness",
+        specialName: "Green Star, Impact Wolf",
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index a3eeef13c..dee0d5290 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1527,4 +1527,19 @@ window.families = [
     "Arlong",
     "Arlong",
     "Blenheim",
+    "Cavendish",
+    "Cavendish",
+    "Usopp",
+    "Usopp",
+    "Rayleigh",
+    "Rayleigh",
+    "Duval",
+    "Duval",
+    "Heracles'n",
+    "Heracles'n",
+    "Perona",
+    "Perona",
+    "Elizabeth",
+    "Elizabeth",
+    "Usopp"
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index c6d467d59..cfcbaec07 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2028,7 +2028,7 @@ window.specials = {
             window.specials[1403].turnedOn = true;
             window.specials[1403].multiplier = [3.16, 4][n];
             p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
+                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
                 name: '1403warning'
             });
         },
@@ -2043,7 +2043,7 @@ window.specials = {
             window.specials[1404].turnedOn = true;
             window.specials[1404].multiplier = [3.16, 4][n];
             p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [10, 16][n] + 'x Captain boost, disable and re-enable this special',
+                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
                 name: '1404warning'
             });
         },
@@ -2397,4 +2397,26 @@ window.specials = {
             });
         }
     },
+    1531: {
+        chainAddition: function(p) {return window.specials[1531].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1531].multiplier == 0.2 ? 1 : 0);
+            window.specials[1531].multiplier = [0.2, 0.3][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1531warning'
+            });
+        }
+    },
+    1532: {
+        chainAddition: function(p) {return window.specials[1532].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1532].multiplier == 0.2 ? 1 : 0);
+            window.specials[1532].multiplier = [0.2, 0.3][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1532warning'
+            });
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 2f342f229..79c8f3c9b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1529,8 +1529,8 @@ window.units = [
     [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
     [ "Cavendish, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1588, 801, 249, 1 ],
     [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
-    [ "Usoland", "DEX", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "God Usopp", "DEX", "Shooter", 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, null ],
+    [ "God Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1493, 566, 162, 3141, 1291, 441, null ],
     [ "Rayleigh", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Duval", "PSY", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1541,6 +1541,7 @@ window.units = [
     [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Captain Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/index.html b/index.html
index 725314019..8a3006626 100644
--- a/index.html
+++ b/index.html
@@ -28,7 +28,7 @@
         <script src="common/js/utils.js"></script>
         <script src="common/js/nonSuspicious.js"></script>
         <meta name="viewport" content="initial-scale=1, user-scalable=no, user-scalable=0">
-        <meta name="author" content="Zeenigami and Mondfischer">
+        <meta name="author" content="Solaris, Zeenigami, and Mondfischer">
         <meta name="keywords" content="OPTC, One Piece Treasure Cruise, Database, Calculator, Guides, Help, Walkthroughs, Tutorials">
         <meta name="description" content="Fan run database for One Piece Treasure Cruise. Includes a character database with all unit captain abilities, descriptions, sailor abilities, and special abilities. Also includes a damage calculator that accurately helps you find out how much damage your team will deal.">
 
@@ -64,17 +64,14 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>7/2/2017</p>
+            <p>29/3/2017</p>
             <br>
             <ul>
-                <li>Valentines Marguerite Added</li>
-                <li>Going Luffy Senpai! added to Calculator</li>
+                <li>Legend 6+ Usopp Added in calculator</li>
                 <br>
-                <li>Violet Fortnight and Don Chinjao Colo units added</li>
+                <li>Stuff</li>
                 <br>
-                <li>Hody Jones Units Completed in Character Table</li>
-                <br>
-                <li>Love, Zeenigami & Mondfischer & Team<li>
+                <li>Love, Solaris, Zeenigami, Mondfischer & Team<li>
                 <br>
             </ul>
             <table id="table">

From 950c9a5f5f387d06c5326f2e7b84f4c142a7055e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 30 Mar 2017 00:07:54 -0500
Subject: [PATCH 0949/1569] Elizabeth

13 not 100
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f47f081fc..010743525 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8478,14 +8478,14 @@ window.details = {
     },
     1541: {//Elizabeth
         captain: "Not Translated",
-        special: "Recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Elizabeth Special",
     },
     1542: {//Elizabeth
         captain: "Boosts RCV and HP by ???x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
-        special: "Recovers 100x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
         specialName: "Elizabeth Special",

From 0653a63ac3a437756a7a29b28e251faa2bb07673 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 30 Mar 2017 00:39:08 -0500
Subject: [PATCH 0950/1569] 6+ Usopp Fix

---
 common/data/details.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 010743525..6469e80b1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8491,7 +8491,8 @@ window.details = {
         specialName: "Elizabeth Special",
     },
     1543: {//6+ Usopp
-        captain: "Boosts ATK of Shooter characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to Shooter characters.",
+        captain: "Boosts ATK of Shooter characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to Shooter characters. At the beginning of each Stage, increases the Attack Timer of all enemies by 1 turn",
+        captainNotes: "The Attack Timer increase is NOT a delay, so the enemies will still be delayed. Attack Timer increase ignores Debuff Prevention barriers",
         special: "Cuts the current HP of each enemy by 10%. If enemies have Delay Prevention, ignores it and Delays all enemies for 1 turn. Otherwise, Delays all enemies for 3 turns",
         sailor: "Completely resists Blindness",
         specialName: "Green Star, Impact Wolf",

From e53bb0a9f5299e67a11387445693a75a89896198 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 31 Mar 2017 03:07:44 -0400
Subject: [PATCH 0951/1569] New units stats

---
 common/data/aliases.js    | 10 ++++++++++
 common/data/captains.js   | 36 +++++++++++++++++++++++++++++++++++-
 common/data/cooldowns.js  | 25 +++++++++++++------------
 common/data/details.js    | 12 ++++++------
 common/data/evolutions.js |  6 +++++-
 common/data/flags.js      |  1 +
 common/data/gw.js         | 13 +++++++++++++
 common/data/specials.js   | 21 +++++++++++++++++++++
 common/data/units.js      | 24 ++++++++++++------------
 9 files changed, 116 insertions(+), 32 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 76bd7abb5..b9deb367b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1531,5 +1531,15 @@ window.aliases = {
     1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
     1531: ['', '', 'God Usopp'],
     1532: ['', '', 'God Usopp'],
+    1533: ['', '', ''],
+    1534: ['', '', ''],
+    1535: ['', '', ''],
+    1536: ['', '', ''],
+    1537: ['', '', ''],
+    1538: ['', '', ''],
+    1539: ['', '', ''],
+    1540: ['', '', ''],
+    1541: ['', '', ''],
+    1542: ['', '', ''],
     1543: ['', '', 'God Usopp'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index e2177b1aa..6af68c727 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4086,6 +4086,9 @@ window.captains = {
     1447: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
+    1448: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+    },
     1449: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
     },
@@ -4447,7 +4450,38 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
         rcv: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
     },
-    
+    1541: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1542: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1543: {
         atk: function(p) { return !(p.unit.class.has("Shooter")) ? 1 : p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ba791fee3..cddb5fac6 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1529,16 +1529,17 @@ window.cooldowns = [
     [ 21, 12 ],
     [ 28, 15 ],
     [ 28, 15 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    null,//Legend Usopp
+    null,//Legend Usopp
+    17,
+    17,
+    19,
+    19,
+    19,
+    19,
+    20,
+    20,
+    22,
+    22,
+    [ 16, 13 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 6469e80b1..2050a8e40 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8399,7 +8399,7 @@ window.details = {
             },
             {
                 "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
-                "cooldown": [ 19, 16 ],
+                "cooldown": [ 18, 15 ],
             },
             {
                 "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
@@ -8418,7 +8418,7 @@ window.details = {
             },
             {
                 "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
-                "cooldown": [ 19, 16 ],
+                "cooldown": [ 18, 15 ],
             },
             {
                 "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
@@ -8466,18 +8466,18 @@ window.details = {
     },
     1539: {//Perona
         captain: "Boosts ATK and RCV of characters with cost 20 or less by 1.5x",
-        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by ??% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction by 2 turns",
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
         specialName: "Perona Special",
     },
     1540: {//Perona
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
-        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by ??% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction by 2 turns",
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
         specialName: "Perona Special",
     },
     1541: {//Elizabeth
-        captain: "Not Translated",
+        captain: "Boosts ATK by 2x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
@@ -8492,7 +8492,7 @@ window.details = {
     },
     1543: {//6+ Usopp
         captain: "Boosts ATK of Shooter characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to Shooter characters. At the beginning of each Stage, increases the Attack Timer of all enemies by 1 turn",
-        captainNotes: "The Attack Timer increase is NOT a delay, so the enemies will still be delayed. Attack Timer increase ignores Debuff Prevention barriers",
+        captainNotes: "The Attack Timer increase is NOT a delay, so the enemies can still be delayed. Attack Timer increase ignores Debuff Prevention barriers",
         special: "Cuts the current HP of each enemy by 10%. If enemies have Delay Prevention, ignores it and Delays all enemies for 1 turn. Otherwise, Delays all enemies for 3 turns",
         sailor: "Completely resists Blindness",
         specialName: "Green Star, Impact Wolf",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index c13d382f9..d26e0f4bc 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -965,7 +965,7 @@ window.evolutions = {
     },
     629: {
         evolution: 739,
-        evolvers: [ 117, 82, 83, 99, 104 ]
+        evolvers: [ 117, 82, 83, 99, 304 ]
     },
     630: {
         evolution: [ 631, 736 ],
@@ -2375,4 +2375,8 @@ window.evolutions = {
         evolution: 1542,
         evolvers: [  ]
     },
+    1532: {
+        evolution: 1543,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 24f9701b7..6bb15a306 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1334,4 +1334,5 @@ window.flags = {
     1540: { rr: 1, rro: 1 },
     1541: { rr: 1, rro: 1 },
     1542: { rr: 1, rro: 1 },
+    1543: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 547376196..73bc702f1 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1529,4 +1529,17 @@ window.gw=[
     53592,
     53622,
     53622,
+    54006,
+    54006,
+    54001,
+    54001,
+    54004,
+    54004,
+    54003,
+    54003,
+    53948,
+    53948,
+    54002,
+    54002,
+    54006,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index cfcbaec07..701b807a4 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2419,4 +2419,25 @@ window.specials = {
             });
         }
     },
+    1534: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        type: "type"
+    },
+    1535: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        type: "type"
+    },
+    1539: {
+        def: function(p) { return 0.1; }
+    },
+    1540: {
+        def: function(p) { return 0.1; }
+    },
+    1541: {
+        chainAddition: function(p) {return 0.5;}
+    },
+    1542: {
+        chainAddition: function(p){ return 0.5;}
+    },
+    
 };
diff --git a/common/data/units.js b/common/data/units.js
index 79c8f3c9b..0b8cc82fc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1521,8 +1521,8 @@ window.units = [
     [ "Curly Dadan, Head of the Dadan Family", "PSY", [ "Powerhouse", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 1080, 578, 36, 2394, 912, 247, 1 ],
     [ "Dogra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 120, 83, 33, 1314, 660, 201, 1 ],
     [ "Portgas D. Ace, Hidden Demon's Child", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 108, 103, 31, 1134, 870, 191, 1 ],
-    [ "Spring Chopper", "PSY", "Cerebral", 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Spring Chopper, Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Spring Chopper", "PSY", "Cerebral", 4, 13, 8, 2, 50, 392109, 185, 70, 55, null, null, null, null ],
+    [ "Spring Chopper, Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1120, 381, 193, 2011, 908, 391, null ],
     [ "Suleiman the Beheader, Battle of Dias Class-A War Criminal", "QCK", [ "Slasher", "Cerebral" ], 5, 40, 6, 3, 99, 4000000, 174, 147, 47, 2087, 1347, 247, 1 ],
     [ "Arlong, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 3, 16, 4, 2, 50, 392109, 173, 153, 23, 935, 853, 75, 1 ],
     [ "Arlong the Saw, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 853, 735, 55, 2053, 1479, 153, 1 ],
@@ -1531,16 +1531,16 @@ window.units = [
     [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
     [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, null ],
     [ "God Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1493, 566, 162, 3141, 1291, 441, null ],
-    [ "Rayleigh", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Duval", "PSY", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Duval, Straw Hat Pirates Accomplice", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Heracles'n", "STR", [ "Striker", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Heracles'n, Straw Hat Pirates Accomplice", "STR", [ "Striker", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Perona", "INT", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rayleigh", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 141, 107, 32, 1034, 566, 197, null ],
+    [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 957, 500, 147, 2350, 1298, 351, null ],
+    [ "Duval", "PSY", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 189, 90, 20, 1324, 501, 131, null ],
+    [ "Duval, Straw Hat Pirates Accomplice", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, null, null, 99, 4000000, 1246, 430, 86, null, null, null, null ],
+    [ "Heracles'n", "STR", [ "Striker", "Shooter" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Heracles'n, Straw Hat Pirates Accomplice", "STR", [ "Striker", "Shooter" ], 5, 30, null, null, 99, 4000000, 923, 547, 91, null, null, null, null ],
+    [ "Perona", "INT", [ "Shooter", "Driven" ], 4, 15, null, null, null, 50, 392109, null, null, null, null, null, null ],
+    [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, null, null, 99, 4000000, 885, 416, 167, null, null, null ],
+    [ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, 99, 4000000, 821, 380, 157, null, null, null, null ],
     [ "Captain Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, null ],
     ];
     

From 703fbef1452a06beaf7a874676ce3523b50231ef Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Fri, 31 Mar 2017 21:09:26 -0700
Subject: [PATCH 0952/1569] Added info for Thriller Bark Ship

---
 common/data/ships.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/common/data/ships.js b/common/data/ships.js
index a9b2afc1c..edd3f3a7d 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -344,5 +344,17 @@ window.ships = [
                 [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
         }
     },
+    
+    { //28
+        name: "Thriller Bark",
+        thumb: null,
+        description: 'Boosts ATK of [DEX] and [INT] characters by 1.5x and their HP by 1.25x',
+        atk: function(p) {
+            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatlevel - 1] : 1;
+        },
+        hp: function(p) {
+            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatlevel - 1] : 1;
+        },
+    },
 
 ];

From d3ad603c5817e41b6e8a2c345813efa659692baf Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 3 Apr 2017 01:49:54 -0400
Subject: [PATCH 0953/1569] I hope I didn't break anything

---
 common/data/aliases.js    | 30 +++++++++++++++---------------
 common/data/cooldowns.js  | 20 ++++++++++----------
 common/data/details.js    | 20 ++++++++++----------
 common/data/drops.js      |  8 +++++++-
 common/data/evolutions.js | 12 ++++++------
 common/data/ships.js      | 14 +++++++++++++-
 common/data/units.js      | 26 +++++++++++++-------------
 7 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b9deb367b..8e79087ae 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1307,8 +1307,8 @@ window.aliases = {
     1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','','Halloween Sugar'],
     1307: ['バルトロメオ　フルムーンウルフ','','Halloween Bartolomeo'],
     1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード','','Halloween Bartolomeo'],
-    1309: ['錦えもん','','Coliseum Kinemon'],
-    1310: ['狐火の錦えもん','','Coliseum Kinemon'],
+    1309: ['錦えもん','','Coliseum Kinemon','Coliseum Kin\'emon'],
+    1310: ['狐火の錦えもん','','Coliseum Kinemon','Coliseum Kin\'emon'],
     1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum Marigold','Coliseum Boa Marigold'],
     1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女','','Coliseum Marigold','Coliseum Boa Marigold'],
     1313: ['赤犬 海軍本部最高戦力','','Sakazuki'],
@@ -1529,17 +1529,17 @@ window.aliases = {
     1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim'],
     1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
     1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
-    1531: ['', '', 'God Usopp'],
-    1532: ['', '', 'God Usopp'],
-    1533: ['', '', ''],
-    1534: ['', '', ''],
-    1535: ['', '', ''],
-    1536: ['', '', ''],
-    1537: ['', '', ''],
-    1538: ['', '', ''],
-    1539: ['', '', ''],
-    1540: ['', '', ''],
-    1541: ['', '', ''],
-    1542: ['', '', ''],
-    1543: ['', '', 'God Usopp'],
+    1531: ['ウソランド', '', 'God Usopp'],
+    1532: ['ゴッド・ウソップ', '', 'God Usopp'],
+    1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', ''],
+    1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', ''],
+    1535: ['デュバル 麦わらの一味の協力者', '', ''],
+    1536: ['デュバル 麦わらの一味の共犯者', '', ''],
+    1537: ['ヘラクレス 麦わらの一味の協力者', '', ''],
+    1538: ['ヘラクレス 麦わらの一味の共犯者', '', ''],
+    1539: ['ペローナ 麦わらの一味の協力者', '', ''],
+    1540: ['ペローナ 麦わらの一味の共犯者', '', ''],
+    1541: ['エリザベス 麦わらの一味の協力者', '', ''],
+    1542: ['エリザベス 麦わらの一味の共犯者', '', ''],
+    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index cddb5fac6..873ce4bef 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1531,15 +1531,15 @@ window.cooldowns = [
     [ 28, 15 ],
     null,//Legend Usopp
     null,//Legend Usopp
-    17,
-    17,
-    19,
-    19,
-    19,
-    19,
-    20,
-    20,
-    22,
-    22,
+    [ 17, 11 ],
+    [ 17, 11 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 19, 12 ],
+    [ 19, 12 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 22, 15 ],
+    [ 22, 15 ],
     [ 16, 13 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 2050a8e40..5615692bf 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8432,63 +8432,63 @@ window.details = {
         captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Rayleigh Special",
+        specialName: "The Teacher's Final Ordeal",
     },
     1534: {//Rayleigh
         captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Rayleigh Special",
+        specialName: "The Teacher's Final Ordeal",
     },
     1535: {//Duval
         captain: "Not Translated",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Duval Special",
+        specialName: "Prideful Memories",
     },
     1536: {//Duval
         captain: "Reduces cooldown of [PSY] specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Duval Special",
+        specialName: "Prideful Memories",
     },
     1537: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2x and their HP by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
-        specialName: "Heracles'n Special",
+        specialName: "Greenstone Threat",
     },
     1538: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
-        specialName: "Heracles'n Special",
+        specialName: "Greenstone Threat",
     },
     1539: {//Perona
         captain: "Boosts ATK and RCV of characters with cost 20 or less by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
-        specialName: "Perona Special",
+        specialName: "Negative Hollow: You're all Rotten Imbeciles",
     },
     1540: {//Perona
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
-        specialName: "Perona Special",
+        specialName: "Negative Hollow: You're all Rotten Imbeciles",
     },
     1541: {//Elizabeth
         captain: "Boosts ATK by 2x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
-        specialName: "Elizabeth Special",
+        specialName: "Soft and Gentle Fluffy Kisses",
     },
     1542: {//Elizabeth
         captain: "Boosts RCV and HP by ???x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
-        specialName: "Elizabeth Special",
+        specialName: "Soft and Gentle Fluffy Kisses",
     },
     1543: {//6+ Usopp
         captain: "Boosts ATK of Shooter characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to Shooter characters. At the beginning of each Stage, increases the Attack Timer of all enemies by 1 turn",
diff --git a/common/data/drops.js b/common/data/drops.js
index ddedcd52e..e14c80f1a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1354,10 +1354,16 @@ window.drops = {
         {
             name: "Dadan Family! Encounter with the Mountain Bandits",
             thumb: 1520,
-            //condition: "You can only bring PSY units",
             "All Difficulties": [ 1519, 1521, 1522, -1314, -1366, -1364, -912, -937, -316, -1281, -891, -22, -1448 ],
         },
         
+        {
+            name: "Soul King! Farewell Tour Concert",
+            thumb: null,
+            //condition: "You can only bring PSY units",
+            "All Difficulties": [ -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d26e0f4bc..06c5009ac 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2353,27 +2353,27 @@ window.evolutions = {
     },
     1531: {
         evolution: 1532,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 266, 302, 267 ]
     },
     1533: {
         evolution: 1534,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 266, 301, 101 ]
     },
     1535: {
         evolution: 1536,
-        evolvers: [  ]
+        evolvers: [ 94, 98, 1180, 303, 103 ]
     },
     1537: {
         evolution: 1538,
-        evolvers: [  ]
+        evolvers: [ 95, 96, 97, 300, 100 ]
     },
     1539: {
         evolution: 1540,
-        evolvers: [  ]
+        evolvers: [ 83, 88, 99, 304, 104 ]
     },
     1541: {
         evolution: 1542,
-        evolvers: [  ]
+        evolvers: [ 115, 116, 117, 118, 94 ]
     },
     1532: {
         evolution: 1543,
diff --git a/common/data/ships.js b/common/data/ships.js
index edd3f3a7d..e7b283020 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -322,7 +322,7 @@ window.ships = [
     { // 26
         name: 'Kizaru\'s Cannonball',
         thumb: null,
-        description: 'Boosts ATK of Shooter characters by 1.55x and their HP by 1.2x, reduces cooldown of all specials by 1 turn at the start of the fight. Special: Cuts the current HP of each enemy by 7% (cooldown: 15 turns).',
+        description: 'Boosts ATK of Shooter characters by 1.55x and their HP by 1.2x, reduces cooldown of Shooter characters specials by 2 turns at the start of the fight. Special: Cuts the current HP of each enemy by 7% (cooldown: 15 turns).',
         atk: function(p) {
             return !(p.unit.class.has('Shooter')) ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.55 ][p.boatLevel - 1];
         },
@@ -356,5 +356,17 @@ window.ships = [
             return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatlevel - 1] : 1;
         },
     },
+    
+    { //29
+        name: "Karasumaru Ship",
+        thumb: null,
+        description: 'Boosts ATK and HP of Shooter Only characters by 2x and boosts the ATK of all other characters by 1.5x and their HP by 1.02x. Special: Delays all enemies for 2 turns (cooldown: 12 turns).',
+        atk: function(p) {
+            return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.5;
+        },
+        hp: function(p) {
+            return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.02;
+        },
+    },
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 0b8cc82fc..3d6d707f4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1529,19 +1529,19 @@ window.units = [
     [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
     [ "Cavendish, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1588, 801, 249, 1 ],
     [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
-    [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, null ],
-    [ "God Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1493, 566, 162, 3141, 1291, 441, null ],
-    [ "Rayleigh", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 141, 107, 32, 1034, 566, 197, null ],
-    [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 957, 500, 147, 2350, 1298, 351, null ],
-    [ "Duval", "PSY", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 189, 90, 20, 1324, 501, 131, null ],
-    [ "Duval, Straw Hat Pirates Accomplice", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, null, null, 99, 4000000, 1246, 430, 86, null, null, null, null ],
-    [ "Heracles'n", "STR", [ "Striker", "Shooter" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Heracles'n, Straw Hat Pirates Accomplice", "STR", [ "Striker", "Shooter" ], 5, 30, null, null, 99, 4000000, 923, 547, 91, null, null, null, null ],
-    [ "Perona", "INT", [ "Shooter", "Driven" ], 4, 15, null, null, null, 50, 392109, null, null, null, null, null, null ],
-    [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, null, null, 99, 4000000, 885, 416, 167, null, null, null ],
-    [ "Elizabeth", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, 99, 4000000, 821, 380, 157, null, null, null, null ],
-    [ "Captain Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, null ],
+    [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],
+    [ "God Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1493, 566, 162, 3141, 1291, 441, 1 ],
+    [ "Rayleigh, Straw Hat Pirates Companion", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 141, 107, 32, 1034, 566, 197, 1 ],
+    [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 957, 500, 147, 2350, 1298, 351, 1 ],
+    [ "Duval, Straw Hat Pirates Companion", "PSY", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 189, 90, 20, 1324, 501, 131, 1 ],
+    [ "Duval, Straw Hat Pirates Accomplice", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 6, 4, 99, 4000000, 1246, 430, 86, 3000, 1120, 267, 1 ],
+    [ "Heracles'n, Straw Hat Pirates Companion", "STR", [ "Striker", "Shooter" ], 4, 15, 6, 3, 50, 392109, 102, 137, 26, 989, 620, 148, 1 ],
+    [ "Heracles'n, Straw Hat Pirates Accomplice", "STR", [ "Striker", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 923, 547, 91, 2091, 1403, 328, 1 ],
+    [ "Perona, Straw Hat Pirates Companion", "INT", [ "Shooter", "Driven" ], 4, 15, 4, 3, 50, 392109, 97, 78, 44, 948, 479, 221, 1 ],
+    [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 885, 416, 167, 1969, 1001, 481, 1 ],
+    [ "Elizabeth, Straw Hat Pirates Companion", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 77, 55, 33, 888, 444, 222, 1 ],
+    [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 821, 380, 157, 2681, 810, 381, 1 ],
+    [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 2c8d77bc49b048927bc9fc94198c8d1f73000d32 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 3 Apr 2017 02:10:57 -0400
Subject: [PATCH 0954/1569] ThrillerBark Ship Fix

---
 common/data/ships.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index e7b283020..4074f8b2e 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -309,7 +309,7 @@ window.ships = [
         description: 'Boosts ATK by 1.2x',
         atk: function(p) {
             return 1.2;
-        },
+        }
     },
     { // 25
         name: 'Thousand Sunny: Coated',
@@ -350,10 +350,10 @@ window.ships = [
         thumb: null,
         description: 'Boosts ATK of [DEX] and [INT] characters by 1.5x and their HP by 1.25x',
         atk: function(p) {
-            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatlevel - 1] : 1;
+            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatlevel - 1] : 1;
+            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
         },
     },
     

From d5592a3c8da0beaa6414456caa0416329f76ba00 Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Mon, 3 Apr 2017 14:04:55 +0200
Subject: [PATCH 0955/1569] Fix Powerhouse for Blenheim

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 3d6d707f4..62e70cc82 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1526,7 +1526,7 @@ window.units = [
     [ "Suleiman the Beheader, Battle of Dias Class-A War Criminal", "QCK", [ "Slasher", "Cerebral" ], 5, 40, 6, 3, 99, 4000000, 174, 147, 47, 2087, 1347, 247, 1 ],
     [ "Arlong, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 3, 16, 4, 2, 50, 392109, 173, 153, 23, 935, 853, 75, 1 ],
     [ "Arlong the Saw, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 853, 735, 55, 2053, 1479, 153, 1 ],
-    [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhosue", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
+    [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
     [ "Cavendish, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1588, 801, 249, 1 ],
     [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
     [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],

From b95f4174c6674a3379bdbc24a33886cf7f2b0932 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Mon, 3 Apr 2017 12:25:54 -0400
Subject: [PATCH 0956/1569] Cool downs for Chars

Story Brook and Gyaro
---
 common/data/cooldowns.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 873ce4bef..de6ab4b90 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -893,8 +893,8 @@ window.cooldowns = [
     [ 14, 8 ],
     [ 28, 22 ],
     [ 25, 18 ],
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     [ 27, 18 ],
     [ 24, 15 ],
     [ 24, 14 ],
@@ -952,7 +952,7 @@ window.cooldowns = [
     [ 21, 9 ],
     [ 18, 10 ],
     [ 18, 10 ],
-    20,
+    [ 20, 14 ],
     [ 16, 10 ],
     [ 20, 14 ],
     20,

From f832dc8fd9b54678a11013f0bdd828d1673c87cc Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 4 Apr 2017 16:18:03 -0400
Subject: [PATCH 0957/1569] FN units

---
 common/data/aliases.js    | 11 +++++++++++
 common/data/captains.js   | 13 ++++++++++++-
 common/data/cooldowns.js  |  5 +++++
 common/data/details.js    | 23 +++++++++++++++++++----
 common/data/drops.js      |  4 ++--
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  7 ++++++-
 common/data/gw.js         |  5 +++++
 common/data/specials.js   | 11 +++++++++++
 common/data/units.js      |  7 ++++++-
 10 files changed, 81 insertions(+), 9 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 8e79087ae..ca85c1955 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1542,4 +1542,15 @@ window.aliases = {
     1541: ['エリザベス 麦わらの一味の協力者', '', ''],
     1542: ['エリザベス 麦わらの一味の共犯者', '', ''],
     1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp'],
+    1544: ['', '', ''],
+    1545: ['', '', ''],
+    1546: ['', '', 'Brook'],
+    1547: ['', '', 'Brook'],
+    1548: ['', '', ''],
+    1549: ['', '', ''],
+    1550: ['', '', ''],
+    1551: ['', '', ''],
+    1552: ['', '', ''],
+    1553: ['', '', ''],
+    1554: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 6af68c727..fa2cf0026 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -667,7 +667,7 @@ window.captains = {
         rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     424: {
-        atk: function(p) { return 1.5; }
+        atk: function(p) { return p.percHP >= 70.0 ? 1.5 : 1; }
     },
     425: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
@@ -4485,4 +4485,15 @@ window.captains = {
     1543: {
         atk: function(p) { return !(p.unit.class.has("Shooter")) ? 1 : p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
     },
+    1546: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
+    1547: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; }
+    },
+    1548: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index de6ab4b90..1b1c3e062 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1542,4 +1542,9 @@ window.cooldowns = [
     [ 22, 15 ],
     [ 22, 15 ],
     [ 16, 13 ],
+    null,
+    null,
+    [ 13, 7 ],
+    [ 13, 7 ],
+    19,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 5615692bf..906130333 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7440,13 +7440,13 @@ window.details = {
         specialNotes: "#{orb : 1.75x}",
     },
     1390: {//Buggy Legend
-        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and boosts the HP and ATK of characters with cost 41 or greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
+        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and boosts the HP and ATK of characters with cost 41 or greater by 0.5x. Guarantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
         specialName: "Chop-Chop Clown Car",
     },
     1391: {//Buggy Legend
-        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of characters with cost 41 and greater by 0.5x. Gurantees duplicating a drop upon completion of the island.",
+        captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of characters with cost 41 and greater by 0.5x. Guarantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
         specialName: "Chop-Chop Clown Car",
@@ -8468,13 +8468,13 @@ window.details = {
         captain: "Boosts ATK and RCV of characters with cost 20 or less by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
-        specialName: "Negative Hollow: You're all Rotten Imbeciles",
+        specialName: "Negative Hollow: You're All Rotten Imbeciles",
     },
     1540: {//Perona
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts ATK of INT characters by 50",
-        specialName: "Negative Hollow: You're all Rotten Imbeciles",
+        specialName: "Negative Hollow: You're All Rotten Imbeciles",
     },
     1541: {//Elizabeth
         captain: "Boosts ATK by 2x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
@@ -8497,4 +8497,19 @@ window.details = {
         sailor: "Completely resists Blindness",
         specialName: "Green Star, Impact Wolf",
     },
+    1546: {//Soul King Brook
+        captain: "Boosts ATK of [QCK] characters by 1.5x and boosts HP of Free Spirit characters by 1.2x",
+        special: "Boosts ATK of Slasher characters by 1.75x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
+        specialName: "Dawn of A Big Star",
+    },
+    1547: {//Soul King Brook
+        captain: "Boosts ATK of [QCK] characters by 2x and boosts HP of Free Spirit characters by 1.3x",
+        special: "Boosts ATK of Slasher characters by 1.75x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
+        specialName: "Dawn of A Big Star",
+    },
+    1548: {//Soul King Managers
+        captain: "Boosts ATK of Driven characters by 1.5x",
+        special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 1 turn",
+        specialName: "Former Thief's Box Office",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index e14c80f1a..288b8d5de 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1359,9 +1359,9 @@ window.drops = {
         
         {
             name: "Soul King! Farewell Tour Concert",
-            thumb: null,
+            thumb: 1547,
             //condition: "You can only bring PSY units",
-            "All Difficulties": [ -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
+            "All Difficulties": [ 1546, 1548, -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
         },
         
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 06c5009ac..f2b5eb049 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2379,4 +2379,8 @@ window.evolutions = {
         evolution: 1543,
         evolvers: [  ]
     },
+    1546: {
+        evolution: 1547,
+        evolvers: [ 117, 79, 85, 96, 101 ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index dee0d5290..2b0244e69 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1348,7 +1348,7 @@ window.families = [
     "Torino Kingdom Monsters",
     "Humandrills",
     "Haredas",
-    "Theives of Tehna Gehna Kingdom",
+    "Thieves of Tehna Gehna Kingdom",
     "Tequila Wolf Guard",
     "Emporio Ivankov",
     "Silvers Rayleigh",
@@ -1542,4 +1542,9 @@ window.families = [
     "Elizabeth",
     "Elizabeth",
     "Usopp"
+    null,
+    null,
+    "Brook",
+    "Brook",
+    "Thieves of Tehna Gehna Kingdom",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 73bc702f1..87af00801 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1542,4 +1542,9 @@ window.gw=[
     54002,
     54002,
     54006,
+    null,
+    null,
+    54305,
+    54305,
+    54306,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 701b807a4..3c8d42bd0 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2439,5 +2439,16 @@ window.specials = {
     1542: {
         chainAddition: function(p){ return 0.5;}
     },
+    1546: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
+    },
+    1547: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
+    },
+    1548: {
+        chainAddition: function(p){ return 0.2;}
+    },
     
 };
diff --git a/common/data/units.js b/common/data/units.js
index 62e70cc82..aa36cb8d1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1348,7 +1348,7 @@ window.units = [
     [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 109, 66, 12, 1487, 706, 127, 1],
     [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, 1066998, 133, 112, 0, 1600, 1020, 0, 1],
     [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, 1066998, 21, 40, 32, 377, 505, 394, 1],
-    [ "Theives of Tehna Gehna Kingdom", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, 1066998, 98, 71, 29, 1377, 709, 181, 1],
+    [ "Thieves of Tehna Gehna Kingdom", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, 1066998, 98, 71, 29, 1377, 709, 181, 1],
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, 1066998, 51, 38, 21, 1103, 505, 193, 1],
     [ "Ivankov, New Kama King", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, 3000000, 123, 95, 41, 2034, 935, 299, 1],
     [ "Rayleigh, Crew of the Pirate King", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, 3000000, 201, 189, 75, 2037, 1264, 294, 1],
@@ -1542,6 +1542,11 @@ window.units = [
     [ "Elizabeth, Straw Hat Pirates Companion", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 77, 55, 33, 888, 444, 222, 1 ],
     [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 821, 380, 157, 2681, 810, 381, 1 ],
     [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
+    [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
+    [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 2820857b904f279ae0b55e11b6147eb6de04013d Mon Sep 17 00:00:00 2001
From: optc-db <optc.db@gmail.com>
Date: Tue, 4 Apr 2017 22:36:07 +0200
Subject: [PATCH 0958/1569] Missing comma in families

---
 common/data/families.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 2b0244e69..32b76f43d 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1541,10 +1541,10 @@ window.families = [
     "Perona",
     "Elizabeth",
     "Elizabeth",
-    "Usopp"
+    "Usopp",
     null,
     null,
     "Brook",
     "Brook",
     "Thieves of Tehna Gehna Kingdom",
-];
\ No newline at end of file
+];

From dac0b0f11954e35ef3c42c8ce8a19287e9ff3116 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 4 Apr 2017 18:19:35 -0400
Subject: [PATCH 0959/1569] Copy Pasta Error

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 906130333..1dfaf48b2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8499,12 +8499,12 @@ window.details = {
     },
     1546: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 1.5x and boosts HP of Free Spirit characters by 1.2x",
-        special: "Boosts ATK of Slasher characters by 1.75x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
+        special: "Boosts ATK of Free Spirit characters by 1.5x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
         specialName: "Dawn of A Big Star",
     },
     1547: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 2x and boosts HP of Free Spirit characters by 1.3x",
-        special: "Boosts ATK of Slasher characters by 1.75x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
+        special: "Boosts ATK of Free Spirit characters by 1.5x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
         specialName: "Dawn of A Big Star",
     },
     1548: {//Soul King Managers

From 0c62cbf626c636469574f44b7154a199aacfe329 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 4 Apr 2017 20:06:00 -0400
Subject: [PATCH 0960/1569] New World Luffy matchers problem

---
 common/data/details.js  | 4 ++--
 common/data/matchers.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 1dfaf48b2..a4a5cb196 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8299,12 +8299,12 @@ window.details = {
     },
     1517: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2x",
-        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
         specialName: "Spring Hopper - Bullet",
     },
     1518: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2.5x",
-        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for all characters for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
         specialName: "Spring Hopper - Bullet",
     },
     1519: {//Dadan
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 35f4d7906..5db78aa66 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -430,7 +430,7 @@ window.matchers = [
     {
         name: '"Beneficial" Orb Enablers',
         target: 'special',
-        matcher: /Makes.+ orbs "beneficial"/i
+        matcher: /"beneficial/i
     },
     
     /* * * * * Sailor * * * * */

From 0c29aa20e7e97a3d95ff333fcd977b7a2f5ea2e6 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 6 Apr 2017 22:30:19 -0400
Subject: [PATCH 0961/1569] When you see Sailor Abilities in the calculator

Ahh, I see you're a man of culture as well.
---
 common/data/aliases.js   |  34 ++---
 common/data/captains.js  |   4 +-
 common/data/cooldowns.js |   6 +-
 common/data/details.js   |   8 +-
 common/data/effects.js   |  73 +++--------
 common/data/sailors.js   | 267 +++++++++++++++++++++++++++++++++++++++
 common/data/specials.js  |  35 +++++
 common/data/units.js     |   4 +-
 common/data/zombies.js   |   8 ++
 damage/index.html        |   1 +
 damage/js/cruncher.js    |  53 ++++++--
 11 files changed, 405 insertions(+), 88 deletions(-)
 create mode 100644 common/data/sailors.js

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ca85c1955..583224074 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -577,8 +577,8 @@ window.aliases = {
     576: ['ナミのティータイム',''],
     577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy' ],
     578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy' ],
-    579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro' ],
-    580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro' ],
+    579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro', 'Roronoa Zoro, Wakes of the Endless Dream, Straw Hat Crew' ],
+    580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro', 'Roronoa Zoro, A Vow in the Great Age of Pirates - Master Swordsman' ],
     581: ['ゲンボウ',''],
     582: ['カマキリ',''],
     583: ['ラキ','', 'Laki' ],
@@ -594,15 +594,15 @@ window.aliases = {
     593: ['翠の竜宮カメ姫','', 'Princess Turtle' ],
     594: ['琥珀の竜宮カメ姫','', 'Princess Turtle' ],
     595: ['漆黒の竜宮カメ姫','', 'Princess Turtle' ],
-    596: ['トニートニー・チョッパー 航海の記録・麦わらの一味','', 'Log Chopper' ],
-    597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」','', 'Log Chopper' ],
+    596: ['トニートニー・チョッパー 航海の記録・麦わらの一味','', 'Log Chopper', 'Tony Tony Chopper, Wakes of the Endless Dream, Straw Hat Crew' ],
+    597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」','', 'Log Chopper', 'Tony Tony Chopper, A Vow in the Great Age of Pirates - Great Doctor' ],
     598: ['バギー 海賊見習い','','Young Buggy', 'Baggy'],
     599: ['バギー ロジャー海賊団','','Young Buggy', 'Baggy'],
     600: ['シャンクス 海賊見習い','','Young Shanks'],
     601: ['シャンクス ロジャー海賊団','','Young Shanks'],
     602: ['エネル ２億Ｖ　雷神','', 'Raid Enel, 200 Million Volt Thunder God' ],
     603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God' ],
-    604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji' ],
+    604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji', 'Sanji, Wakes of the Endless Dream, Straw Hat Crew' ],
     605: ['サンジ 航海の夢「オールブルー」','', 'Log Sanji' ],
     606: ['海賊ゼフ',''],
     607: ['赫足のゼフ クック海賊団船長',''],
@@ -610,8 +610,8 @@ window.aliases = {
     609: ['ごろつきカルネ',''],
     610: ['ハイキングベア',''],
     611: ['プリンプリン','', 'Pudding Pudding' ],
-    612: ['ブルック 航海の記録・麦わらの一味','', 'Log Brook' ],
-    613: ['ブルック 航海の夢「約束の再会」','','Log Brook' ],
+    612: ['ブルック 航海の記録・麦わらの一味','', 'Log Brook', 'Brook, Wakes of the Endless Dream, Straw Hat Crew' ],
+    613: ['ブルック 航海の夢「約束の再会」','','Log Brook', 'Brook, A Vow in the Great Age of Pirates - Promised Meeting' ],
     614: ['ザンバイ',''],
     615: ['怪力デストロイヤーズ 斧使い',''],
     616: ['怪力デストロイヤーズ 槍使い',''],
@@ -648,8 +648,8 @@ window.aliases = {
     647: ['猛攻のリトルオーズJr.',''],
     648: ['マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
     649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
-    650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami' ],
-    651: ['ナミ 航海の夢「世界地図」','', 'Log Nami' ],
+    650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami', 'Nami, Wakes of the Endless Dream, Straw Hat Crew' ],
+    651: ['ナミ 航海の夢「世界地図」','', 'Log Nami', 'Nami, A Vow in the Great Age of Pirates - World Map' ],
     652: ['鉄仮面のデュバル','','Raid'],
     653: ['デュバル トビウオライダーズ ヘッド','','Raid'],
     654: ['デュバル 人生バラ色ライダーズ ヘッド','','Raid'],
@@ -658,8 +658,8 @@ window.aliases = {
     657: ['クロオビ タイヨウの海賊団','','Young Kuroobi'],
     658: ['チュウ タイヨウの海賊団','','Young Choo'],
     659: ['モンキー・D・ルフィ うきわ','','Summertime Luffy','Swimsuit Luffy'],
-    660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp' ],
-    661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp' ],
+    660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp', 'Usopp, Wakes of the Endless Dream, Straw Hat Crew' ],
+    661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp', 'Usopp, A Vow in the Great Age of Pirates - Brave Sea Warrior' ],
     662: ['ナミ バカンス', '', 'Summertime Nami', 'Swimsuit Nami'],
     663: ['ネフェルタリ・ビビ アラバスタ王国王女','','Young Vivi'],
     664: ['ネフェルタリ・ビビ 砂砂団　副リーダー','','Young Vivi'],
@@ -676,8 +676,8 @@ window.aliases = {
     675: ['エンポリオ・イワンコフ 革命軍','','INTvankov'],
     676: ['イナズマ',''],
     677: ['イナズマ 革命軍',''],
-    678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin' ],
-    679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」','', 'Log Robin' ],
+    678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin', 'Nico Robin, Wakes of the Endless Dream, Straw Hat Crew' ],
+    679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」','', 'Log Robin', 'Nico Robin, A Vow in the Great Age of Pirates - 100-Year Void' ],
     680: ['アイス大好きナミ','','Summertime Nami','Swimsuit Nami'],
     681: ['アイス大好きナミ レモンアイス','','Summertime Nami','Swimsuit Nami'],
     682: ['アイス大好きロビン','','Summertime Robin','Swimsuit Robin'],
@@ -708,8 +708,8 @@ window.aliases = {
     707: ['ブルーノ 六式 サイファーポールNo.9',''],
     708: ['ニコ・ロビン 悪魔の子',''],
     709: ['ニコ・ロビン 麦わらの一味',''],
-    710: ['フランキー 航海の記録・麦わらの一味','', 'Log Franky' ],
-    711: ['フランキー 航海の夢「海の果てを旅する船」','', 'Log Franky' ],
+    710: ['フランキー 航海の記録・麦わらの一味','', 'Log Franky', 'Franky, Wakes of the Endless Dream, Straw Hat Crew' ],
+    711: ['フランキー 航海の夢「海の果てを旅する船」','', 'Log Franky', 'Franky, A Vow in the Great Age of Pirates - Ship of the Seven Seas' ],
     712: ['ガン・フォール','','Gan Fall','ganfall'],
     713: ['ガン・フォール 空の騎士','','Gan Fall the Knight of the Sky','ganfall'],
     714: ['ピエール',''],
@@ -1521,8 +1521,8 @@ window.aliases = {
     1520: ['カーリー・ダダン ダダン一家　棟梁', '', ''],
     1521: ['ドグラ', '', ''],
     1522: ['ポートガス・D・エース 隠された鬼の子', '', 'Kid Ace'],
-    1523: ['', '', 'Spring Chopper', 'Sakura Chopper'],
-    1524: ['', '', 'Spring Chopper', 'Sakura Chopper'],
+    1523: ['トニートニー・チョッパー フラスコの中の大きな夢', '', 'Spring Chopper', 'Sakura Chopper'],
+    1524: ['トニートニー・チョッパー 冬島に見た春の景色', '', 'Spring Chopper', 'Sakura Chopper'],
     1525: ['首はねスレイマン ディアス海戦Ａ級戦犯', '', 'Coliseum Suleiman'],
     1526: ['アーロン アーロン一味船長', '', 'Coliseum Arlong'],
     1527: ['ノコギリのアーロン アーロン一味船長', '', 'Coliseum Arlong'],
diff --git a/common/data/captains.js b/common/data/captains.js
index fa2cf0026..107dd19ee 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4436,11 +4436,11 @@ window.captains = {
     },
     1537: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1538: {
         atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.25 : 1; }
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.25 : 1; }
     },
     1539: {
         atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1b1c3e062..4d32f57ba 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1279,8 +1279,8 @@ window.cooldowns = [
     [ 10, 4 ],
     14,
     [ 21, 15 ],
-    25,
-    19,
+    [ 25, 18 ],
+    [ 19, 13 ],
     [ 25, 18 ],
     [ 12, 12 ],
     [ 12, 12 ],
@@ -1546,5 +1546,5 @@ window.cooldowns = [
     null,
     [ 13, 7 ],
     [ 13, 7 ],
-    19,
+    [ 19, 13 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index a4a5cb196..3b69be103 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2802,13 +2802,13 @@ window.details = {
         special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
         specialName: "Vanguard Breaker",
         captain: "Boosts ATK of Shooter characters by 2.5x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of STR characters by 30"
+        sailor: "Boosts HP of STR characters by 30"
     },
     647: {
         special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
         specialName: "Vanguard Breaker",
         captain: "Boosts ATK of Shooter characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of STR characters by 30"
+        sailor: "Boosts HP of STR characters by 30"
     },
     648: {
         special: "Recovers 100x character's RCV in HP, amplifies the effect of orbs by 1.5x for 2 turns",
@@ -8453,13 +8453,13 @@ window.details = {
         specialName: "Prideful Memories",
     },
     1537: {//Heracles'n
-        captain: "Boosts ATK of [STR] characters by 2x and their HP by 1.2x",
+        captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooters and Strikers by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Greenstone Threat",
     },
     1538: {//Heracles'n
-        captain: "Boosts ATK of [STR] characters by 2.5x and their HP by 1.25x",
+        captain: "Boosts ATK of [STR] characters by 2.5x and boosts HP of Shooters and Strikers by 1.25x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Greenstone Threat",
diff --git a/common/data/effects.js b/common/data/effects.js
index 5a23f8557..0c3b36fff 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -146,17 +146,10 @@ window.effects = {
         chainLimiter: function() { return 2.0; }
     },
 
-    'Hit barrier (11 hits)': {
-        description: 'Nullifies the first 11 hits in the chain',
-        thumb: 794,
-        id: 15, // don't change this
-        comboShield: 11
-    },
-
     'Nightmare Luffy, 2nd stage': {
         description: 'Limits chain multiplier to 2.0x, nullifies the first 11 hits in the chain',
         thumb: 795,
-        id: 16, // don't change this
+        id: 15, // don't change this
         comboShield: 11,
         chainLimiter: function() { return 2.0; }
     },
@@ -164,63 +157,63 @@ window.effects = {
     'Attack reduction (50%)': {
         description: 'ATK of all units reduced by 50%',
         thumb: 546,
-        id: 17, // don't change this
+        id: 16, // don't change this
         atk: function(p) { return 0.5; }
     },
 
     'Attack reduction (70%)': {
         description: 'ATK of all units reduced by 70%',
         thumb: 765,
-        id: 18, // don't change this
+        id: 17, // don't change this
         atk: function(p) { return 0.3; }
     },
 
     'Kuma': {
         description: 'Damage of STR and DEX characters nullified',
         thumb: 836,
-        id: 19,  // don't change this
+        id: 18,  // don't change this
         atk: function(p) { return p.type == 'STR' || p.type == 'DEX' ? 0 : 1; }
     },
 
     'Shu (Expert)': {
         description: 'Attack of Slasher units reduced by 50%',
         thumb: 773,
-        id: 20, // don't change this
+        id: 19, // don't change this
         atk: function(p) { return p.class.has("Slasher") ? 0.5 : 1; }
     },
 
     'Shu (Master)': {
         description: 'Attack of Slasher units reduced by 70%',
         thumb: 773,
-        id: 21, // don't change this
+        id: 20, // don't change this
         atk: function(p) { return p.class.has("Slasher") ? 0.3 : 1; }
     },
 
     'Attack reduction (20%)': {
         description: 'ATK of all units reduced by 20%',
         thumb: 567,
-        id: 22, // don't change this
+        id: 21, // don't change this
         atk: function(p) { return 0.8; }
     },
 
     'Hit barrier (26 hits)': {
         description: 'Nullifies the first 26 hits in the chain',
         thumb: 375,
-        id: 23, // don't change this
+        id: 22, // don't change this
         comboShield: 26
     },
 
     'There\'s the G!': {
         description: 'Activates [G] orb support even when Lao-G is not in the team',
         thumb: 880,
-        id: 24, // don't change this
+        id: 23, // don't change this
         gOrbsEnabled: true
     },
     
     'Coliseum Franky': {
         description: 'Activates [G] orb Support, boosts Orbs by 1.5x',
         thumb: 560,
-        id: 25, // don't change this
+        id: 24, // don't change this
         orb: function(p) { return p.orb == 2.0 ? 1.5 : (p.orb == 0.5 ? 10/15 : 1); },
         gOrbsEnabled: true
     },
@@ -228,30 +221,14 @@ window.effects = {
     'Coliseum Killer': {
         description: 'ATK of all units reduced by 95%',
         thumb: 1043,
-        id: 26, // don't change this
+        id: 25, // don't change this
         atk: function(p) { return 0.05; }
     },
     
-    'Coliseum Kid': {
-        description: 'Perfect hit barrier (2 hits)',
-        thumb: 966,
-        id: 27,
-        comboShield: 2,
-        comboType: 'Perfect'
-    },
-    
-    'Coliseum Fukuro': {
-        description: 'Perfect hit barrier (3 hits)',
-        thumb: 758,
-        id: 28,
-        comboShield: 3,
-        comboType: 'Perfect'
-    },
-    
     'Coliseum Cricket': {
         description: 'Fixed threshold barrier (200,000)',
         thumb: 428,
-        id: 29,
+        id: 26,
         barrierThreshold: 200000,
         barrierReduction: 0.99
     },
@@ -259,14 +236,14 @@ window.effects = {
     'Sabo Raid Boss': {
         description: 'Reduces Chain By Half',
         thumb: 1047,
-        id: 30,
+        id: 27,
         chainModifier: function(p) { return 0.5 ; }
     },
     
     'Pirate Ship Competition! \"Dead End\" Opens!': {
         description: 'STR/DEX/QCK ATK 1.6x. INT/PSY HP 2x',
         thumb: 1072,
-        id: 31,
+        id: 28,
         atk: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1.6 : 1; },
         hp: function(p) { return (p.type == "STR" || p.type == "DEX" || p.type == "QCK") ? 1 : 2.0; }
         
@@ -275,14 +252,14 @@ window.effects = {
     '1.25x Orb Boost': {
         description: 'Used by Christmas Law in Saga Coliseum',
         thumb: 856,
-        id: 32,
+        id: 29,
         orb: function(p) { return p.orb == 2.0 ? 1.25 : (p.orb == 0.5 ? 20/25 : 1); }
     },
     
     '700k Damage Treshold Barrier': {
         description: 'Used by Saga. You cannot do more that 700k damage in one hit',
         thumb: 1089,
-        id: 33,
+        id: 30,
         barrierThreshold: 700000,
         barrierReduction: 0.99
     },
@@ -291,7 +268,7 @@ window.effects = {
         //OLD description: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP.',
         description: 'Boosts ATK of Driven characters by 2x and boosts HP for Powerhouse characters by 2x.',
         thumb: 1095,
-        id: 34,
+        id: 31,
         atk: function(p) { 
 /*                            var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
                             if(p.class.has('Driven')) { boost1 = 2.0}
@@ -323,7 +300,7 @@ window.effects = {
     'Coliseum Tashigi': {
         description: '25 hit barrier and 2x chain limit',
         thumb: 783,
-        id: 35,
+        id: 32,
         comboShield: 25,
         chainLimiter: function() { return 2.0; }
     },
@@ -331,7 +308,7 @@ window.effects = {
     'Robin and Nami\'s Secret Undercover Investigation': {
         description: 'Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP.',
         thumb: 1112,
-        id: 36,
+        id: 33,
         atk: function(p) { 
                             var boost1 = 1.0, boost2 = 1.0, boost3 = 1.0, boost4 = 1.0, boost5 = 1.0;
                             if(p.class.has('Cerebral')) { boost1 = 2.0}
@@ -362,7 +339,7 @@ window.effects = {
     'Gild Tesoro - 40 Stamina': {
         description: 'Boosts the Orbs and ATK of all characters by 1.1x',
         thumb: 1162,
-        id: 37,
+        id: 34,
         orb: function(p) { return p.orb == 2.0 ? 1.1 : (p.orb == 0.5 ? 10/11 : 1); },
         atk: function(p) { return 1.1; }
     },
@@ -370,16 +347,8 @@ window.effects = {
     'Gild Tesoro - 60 Stamina': {
         description: 'Boosts the Orbs and ATK of all characters by 1.2x',
         thumb: 1163,
-        id: 38,
+        id: 35,
         orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
         atk: function(p) { return 1.2; }
     },
-    
-    'Invastion Cavendish Sailor - Temp until I get sailor abilities': {
-        description: 'Reduces ATK of all characters by 0.5x. Simulates Cavendish Sailor Ability.',
-        thumb: 1530,
-        id: 39,
-        atk: function(p) { return 0.5; }
-    },
-
 };
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
new file mode 100644
index 000000000..dc0a36ede
--- /dev/null
+++ b/common/data/sailors.js
@@ -0,0 +1,267 @@
+window.sailors = {
+    311: {
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; },
+    },
+    312: {
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; },
+    },
+    360: {
+        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; },
+    },
+    361: {
+        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; },
+    },
+    364: {
+        rcvStatic: function(p) { return 10; },
+    },
+    365: {
+        rcvStatic: function(p) { return 10; },
+    },
+    450: {
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; },
+    },
+    451: {
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; },
+    },
+    525: {
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+    },
+    526: {
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+    },
+    527: {//not working
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+    },
+    528: {//not working
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+    },
+    553: {
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+    },
+    554: {
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+    },
+    555: {
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+    },
+    556: {
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+    },
+    559: {
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+    },
+    560: {
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+    },
+    640: {
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; },
+    },
+    641: {
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; },
+    },
+    644: {
+        rcvStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+    },
+    645: {
+        rcvStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+    },
+    646: {
+        hpStatic: function(p) { return p.unit.type == "STR" ? 30 : 0; },
+    },
+    647: {
+        hpStatic: function(p) { return p.unit.type == "STR" ? 30 : 0; },
+    },
+    1172: {
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+    },
+    1173: {
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+    },
+    1174: {
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+    },
+    1175: {
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+    },
+    1176: {//not working
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+    },
+    1177: {//not working
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+    },
+    1183: {
+        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type == "PSY" ? 75 : 0; },
+    },
+    1184: {
+        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type == "PSY" ? 75 : 0; },
+    },
+    1187: {
+        atkStatic: function(p) { return 20; },
+        rcvStatic: function(p) { return 20; },
+        hpStatic: function(p) { return 20; },
+    },
+    1188: {
+        atkStatic: function(p) { return 20; },
+        rcvStatic: function(p) { return 20; },
+        hpStatic: function(p) { return 20; },
+    },
+    1189: {
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 40 : 0; },
+    },
+    1190: {
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 40 : 0; },
+    },
+    1209: {
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+    },
+    1210: {
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+    },
+    1211: {
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+    },
+    1212: {
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+    },
+    1231: {
+        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; },
+    },
+    1232: {
+        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; },
+    },
+    1233: {
+        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; },
+    },
+    1234: {
+        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; },
+    },
+    1255: {
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 40 : 0; },
+    },
+    1256: {
+        rcvStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; },
+    },
+    1271: {
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Driven") ? 100 : 0 : 0; },
+    },
+    1270: {
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Driven") ? 100 : 0 : 0; },
+    },
+    1273: {
+        hpStatic: function(p) { return 75; },
+    },
+    1274: {
+        hpStatic: function(p) { return 75; },
+    },
+    1277: {
+        rcvAdded: function(p) { return 150; },
+    },
+    1278: {
+        rcvAdded: function(p) { return 150; },
+    },
+    1317: {
+        hpStatic: function(p) { return 75; },
+    },
+    1318: {
+        hpStatic: function(p) { return 75; },
+    },
+    1321: {
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 100 : 0 : 0 : 0; },
+    },
+    1322: {
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 100 : 0 : 0 : 0; },
+    },
+    1363: {
+        hpStatic: function(p) { return p.unit.type == "PSY" ? 100 : 0; },
+    },
+    1364: {
+        hpStatic: function(p) { return p.unit.type == "PSY" ? 100 : 0; },
+    },
+    1367: {
+        atkStatic: function(p) { return 50; },
+        rcvStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; },
+    },
+    1368: {
+        atkStatic: function(p) { return 50; },
+        rcvStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; },
+    },
+    1377: {
+        rcvAdded: function(p) { return 150; },
+    },
+    1378: {
+        rcvAdded: function(p) { return 150; },
+    },
+    1405: {
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
+    },
+    1406: {
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
+    },
+    1435: {
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+    },
+    1436: {
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+    },
+    1443: {
+        hpStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 50 : 0; },
+    },
+    1444: {
+        hpStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 50 : 0; },
+    },
+    1464: {
+        rcvAdded: function(p) { return 100; },
+    },
+    1465: {
+        rcvAdded: function(p) { return 100; },
+    },
+    1476: {
+        atkStatic: function(p) { return 50; },
+        rcvStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; },
+    },
+    1477: {
+        atkStatic: function(p) { return 50; },
+        rcvStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; },
+    },
+    1507: {
+        atkStatic: function(p) { return 15; },
+    },
+    1508: {
+        atkStatic: function(p) { return 15; },
+    },
+    1510: {
+        atkStatic: function(p) { return p.percHP >= 70.0 && p.unit.class.has("Striker") ? 20 : 0; },
+    },
+    1511: {
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Powerhouse") ? p.unit.class.has("Powerhouse") ? 20 : 0 : 0 : 0; },
+    },
+    1529: {
+        atk: function(p) { return p.captain != null ? p.captain.type == "STR" || p.captain.type == "QCK" ? .5 : 1 : 1; },
+    },
+    1530: {
+        atk: function(p) { return p.captain != null ? p.captain.type == "STR" || p.captain.type == "QCK" ? .5 : 1 : 1; },
+    },
+    1537: {
+        hpStatic: function(p) { return p.unit.type == "STR" ? 150 : 0; },
+    },
+    1538: {
+        hpStatic: function(p) { return p.unit.type == "STR" ? 150 : 0; },
+    },
+    1539: {
+        atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
+    },
+    1540: {
+        atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
+    },
+};
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 3c8d42bd0..cda5a530b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -335,6 +335,9 @@ window.specials = {
         atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
         type: "type"
     },
+    583: {
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 300: 0; },
+    },
     589: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         type: "class"
@@ -1743,6 +1746,24 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
         type: "class"
     },
+    1269: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1269].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1269].turnedOn = false;
+        }
+    },
+    1270: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1270].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1270].turnedOn = false;
+        }
+    },
     1271: {
         orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
     },
@@ -2440,10 +2461,24 @@ window.specials = {
         chainAddition: function(p){ return 0.5;}
     },
     1546: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1546].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1546].turnedOn = false;
+        },
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
         type: "class"
     },
     1547: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1547].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1547].turnedOn = false;
+        },
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
         type: "class"
     },
diff --git a/common/data/units.js b/common/data/units.js
index aa36cb8d1..35145437b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1521,8 +1521,8 @@ window.units = [
     [ "Curly Dadan, Head of the Dadan Family", "PSY", [ "Powerhouse", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 1080, 578, 36, 2394, 912, 247, 1 ],
     [ "Dogra", "QCK", "Slasher", 3, 15, 6, 1, 70, 1066998, 120, 83, 33, 1314, 660, 201, 1 ],
     [ "Portgas D. Ace, Hidden Demon's Child", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 6, 2, 70, 1066998, 108, 103, 31, 1134, 870, 191, 1 ],
-    [ "Spring Chopper", "PSY", "Cerebral", 4, 13, 8, 2, 50, 392109, 185, 70, 55, null, null, null, null ],
-    [ "Spring Chopper, Evolved", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1120, 381, 193, 2011, 908, 391, null ],
+    [ "Tony Tony Chopper, A Big Dream in a Flask", "PSY", "Cerebral", 4, 13, 8, 2, 50, 392109, 93, 42, 42, 1224, 391, 211, 1 ],
+    [ "Tony Tony Chopper, Spring Scenery on the Winter Island", "PSY", [ "Cerebral", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1120, 361, 193, 2011, 908, 391, 1 ],
     [ "Suleiman the Beheader, Battle of Dias Class-A War Criminal", "QCK", [ "Slasher", "Cerebral" ], 5, 40, 6, 3, 99, 4000000, 174, 147, 47, 2087, 1347, 247, 1 ],
     [ "Arlong, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 3, 16, 4, 2, 50, 392109, 173, 153, 23, 935, 853, 75, 1 ],
     [ "Arlong the Saw, Arlong Pirates Captain", "INT", [ "Striker", "Shooter" ], 4, 26, 4, 3, 99, 3000000, 853, 735, 55, 2053, 1479, 153, 1 ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index f2390fdb1..e68199bf0 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -279,6 +279,14 @@ window.zombies = {
         type: 'healer',
         multiplier: 2.5
     },
+    1269: {//Laffitte
+        type: 'healer',
+        multiplier: 3
+    },
+    1270: {//Laffitte
+        type: 'healer',
+        multiplier: 3
+    },
     1305: {//Halloween Sugar
         type: 'healer',
         amount: 500
diff --git a/damage/index.html b/damage/index.html
index a04a0eab1..c224e8f23 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -34,6 +34,7 @@
         <script src="../common/data/units.js"></script>
         <script src="../common/data/aliases.js"></script>
         <script src="../common/data/captains.js"></script>
+        <script src="../common/data/sailors.js"></script>
         <script src="../common/data/specials.js"></script>
         <script src="../common/data/defenses.js"></script>
         <script src="../common/data/ships.js"></script>
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 46a32916f..b06ad7815 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -102,7 +102,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             result[type] = crunchForType(type);
         });
         result.team = getTeamDetails();
-        var hpMax = 0, rcvTotal = 0;
+        var hpMax = 0, rcvTotal = 0, bonusrcv = 0;
         team.forEach(function(x,n) {
             if (n > 5 || x.unit === null) return;
             // hp
@@ -117,8 +117,13 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             rcv *= getShipBonus('rcv',false,x.unit,n);
             rcv *= getEffectBonus('rcv',x.unit);
             rcvTotal += Math.floor(applyCaptainEffectsAndSpecialsToRCV(n,rcv));
+            
+            bonusrcv = applyAddRCVSpecialsToRCV(n,0);
+            
         });
+        
         result.rcv = Math.max(0,rcvTotal);
+        result.rcv += bonusrcv
         var cost = team.slice(1,6).reduce(function(prev,next) { return prev + (!next.unit ? 0 : next.unit.cost); },0);
         result.cost = { cost: cost, level: Math.max(1,Math.floor(cost / 2) * 2 - 18) };
         $scope.numbers = jQuery.extend($scope.numbers, result);
@@ -184,6 +189,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
                                  || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))) ? 2 : 1;
+            //if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn) ? 1 : .5;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
@@ -439,6 +445,10 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
 
     var applyCaptainEffectsToHP = function(slotNumber,hp) {
         var params = getParameters(slotNumber);
+        for (var i=0;i<enabledEffects.length;++i) {
+            if (enabledEffects[i].hasOwnProperty('hpStatic'))
+                hp += enabledEffects[i].hpStatic(params);
+        }
         for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('hp'))
                 hp *= enabledEffects[i].hp(params);
@@ -449,9 +459,13 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     var applyCaptainEffectsAndSpecialsToRCV = function(slotNumber,rcv) {
         var params = getParameters(slotNumber);
         // static rcv
-        for (var j=0;j<enabledSpecials.length;++j) {
-            if (enabledSpecials[j].hasOwnProperty('rcvStatic'))
-                rcv += enabledSpecials[j].rcvStatic(params);
+        for (var h=0;h<enabledSpecials.length;++h) {
+            if (enabledSpecials[h].hasOwnProperty('rcvStatic'))
+                rcv += enabledSpecials[h].rcvStatic(params);
+        }
+        for (var j=0;j<enabledEffects.length;++j) {
+            if (enabledEffects[j].hasOwnProperty('rcvStatic'))
+                rcv += enabledEffects[j].rcvStatic(params);
         }
         // non-static rcv
         for (var i=0;i<enabledEffects.length;++i) {
@@ -466,6 +480,16 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         }
         return maximum;
     };
+    var applyAddRCVSpecialsToRCV = function(slotNumber, bonusrcv) {
+        var params = getParameters(slotNumber);
+        // sailor ability rcv
+        for (var l=0;l<enabledEffects.length;++l) {
+            if (enabledEffects[l].hasOwnProperty('rcvAdded'))
+                bonusrcv += enabledEffects[l].rcvAdded(params);
+        }
+        var final = bonusrcv;
+        return final;
+    };
 
     var applyChainAndBonusMultipliers = function(damage,modifiers) {
         var currentMax = -1, currentResult = null, addition = 0.0;
@@ -738,8 +762,20 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // check if defense is down (required by some captain effects)
         computeActualDefense();
         isDefenseDown = enabledSpecials.some(function(x) { return x !== null && x.hasOwnProperty('def'); });
-        // captain effect array
+        
         enabledEffects = [ ];
+        
+        for (var i=2;i<6;i++) {
+            if (team[i].unit === null) continue;
+            var id = team[i].unit.number + 1;
+            if (!window.sailors.hasOwnProperty(id)) continue;
+            var effect = jQuery.extend({ },window.sailors[id]);
+            effect.sourceSlot = i;
+            enabledEffects.push(effect);
+        }
+        
+        // captain effect array
+        
         for (var i=0;i<2;++i) {
             if (team[i].unit === null) continue;
             var id = team[i].unit.number + 1;
@@ -821,7 +857,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             }
         return colors;
     };
-
+    
     var getParameters = function(slotNumber, chainPosition) {
         return {
             unit: team[slotNumber].unit,
@@ -836,7 +872,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             turnCounter: $scope.tdata.turnCounter.value,
             chainPosition: chainPosition,
             classCount: classCounter(),
-            colorCount: colorCounter()
+            colorCount: colorCounter(),
+            captain: team[1].unit
         };
     };
 
@@ -876,7 +913,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         }
         if (shipBonus.bonus && shipBonus.bonus.heal)
             healAmount += shipBonus.bonus.heal({ boatLevel: shipBonus.level, classCount: classCounter() });
-        console.log($scope.data.healLevel);
+        //console.log($scope.data.healLevel);
         switch($scope.data.healLevel){
             case "0":
                 break;

From 6c5c2db206313b2c79d1f8e30edf9aba96bf1289 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 6 Apr 2017 22:46:38 -0400
Subject: [PATCH 0962/1569] Global flags

and Chopper evo
---
 common/data/drops.js      |  4 ++++
 common/data/evolutions.js |  2 +-
 common/data/flags.js      | 18 ++++++++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 288b8d5de..1f7d9fac7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1229,6 +1229,7 @@ window.drops = {
         {
             name: "Behind the Scenes Intelligency Agency, CP9",
             thumb: 1137,
+            global: true,
             condition: "Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear",
             "All Difficulties": [ 1136, 1137, 1138, 1139, -935, -643, -673, -894, -943, -995, -615, -705, -704 ]
         },
@@ -1244,6 +1245,7 @@ window.drops = {
         {
             name: "Rumbar Pirates!",
             thumb: 1203,
+            global: true,
             condition: "'Musical' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)",
             "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -558, -1208, -677, -896, -631, -954, -1206, -617, -1027 ]
         },
@@ -1251,6 +1253,7 @@ window.drops = {
         {
             name: "World Pirates!",
             thumb: 1215,
+            global: true,
             condition: "Total Crew Cost must be lower than 180 (Including friend captain)",
             "All Difficulties": [ 1215, 1216, 1217, 1218, -1025, -1029, -1033, -671, -956, -964, -633, -504, -1218 ]
         },
@@ -1515,6 +1518,7 @@ window.drops = {
         {
             name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
+            global: true,
             thumb: 989,
             Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -1446, -556, -528, -520, -554, -558, -20, -1447, -217, -709, -1115, -1177, -1175, -1210, -1208, -1387, -1388, -1389 ]
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f2b5eb049..4ca7ab8c5 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2341,7 +2341,7 @@ window.evolutions = {
     },
     1523: {
         evolution: 1524,
-        evolvers: [  ]
+        evolvers: [ 115, 115, 116, 117, 118 ]
     },
     1526: {
         evolution: 1527,
diff --git a/common/data/flags.js b/common/data/flags.js
index 6bb15a306..c29a01058 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -969,6 +969,11 @@ window.flags = {
     982: { global: 1 },
     983: { global: 1 },
     984: { global: 1 },
+    985: { global: 1 },
+    986: { global: 1 },
+    987: { global: 1 },
+    988: { global: 1 },
+    989: { global: 1 },
     990: { rr: 1, rro: 1, global: 1 },
     991: { rr: 1, rro: 1, global: 1 },
     992: { rr: 1, rro: 1, global: 1 },
@@ -996,6 +1001,8 @@ window.flags = {
     1014: { global: 1 },
     1015: { global: 1 },
     1016: { global: 1 },
+    1017: { global: 1 },
+    1018: { global: 1 },
     1019: { global: 1 },
     1020: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1021: { rr: 1, rro: 1, lrr: 1, global: 1 },
@@ -1016,6 +1023,8 @@ window.flags = {
     1037: { global: 1 },
     1038: { global: 1 },
     1039: { global: 1 },
+    1040: { global: 1 },
+    1041: { global: 1 },
     1044: { rr: 1, rro: 1, global: 1 },
     1045: { rr: 1, rro: 1, global: 1 },
     1046: { global: 1 },
@@ -1160,6 +1169,10 @@ window.flags = {
     1210: { rr: 1, rro: 1, global: 1 },
     1211: { rr: 1, rro: 1, global: 1 },
     1212: { rr: 1, rro: 1, global: 1 },
+    1215: { global: 1 },
+    1216: { global: 1 },
+    1217: { global: 1 },
+    1218: { global: 1 },
     1213: { rr: 1, rro: 1, lrr: 1 },
     1214: { rr: 1, rro: 1, lrr: 1 },
     1223: { global: 1 },
@@ -1266,8 +1279,8 @@ window.flags = {
     1387: { global: 1 },
     1388: { global: 1 },
     1389: { global: 1 },
-    1390: { rr: 1, rro: 1 },
-    1391: { rr: 1, rro: 1 },
+    1390: { rr: 1, rro: 1, global: 1 },
+    1391: { rr: 1, rro: 1, global: 1 },
     1394: { rr: 1, rro: 1, lrr: 1, },
     1395: { rr: 1, rro: 1, lrr: 1, },
     1403: { rr: 1, rro: 1, global: 1 },
@@ -1318,6 +1331,7 @@ window.flags = {
     1483: { rr: 1, rro: 1 },
     1484: { shop: 1 },
     1485: { shop: 1 },
+    1492: { rr: 1, rro: 1 },
     1513: { rr: 1, rro: 1, lrr: 1 },
     1514: { rr: 1, rro: 1, lrr: 1 },
     1523: { rr: 1, rro: 1, lrr: 1 },

From 41518c0e0e253dbfb4202a5bba513e1d9110587a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 8 Apr 2017 18:35:39 -0400
Subject: [PATCH 0963/1569] New units and stuff

---
 common/data/captains.js   | 20 +++++++++++++++++--
 common/data/details.js    | 42 +++++++++++++++++++++++++++++----------
 common/data/drops.js      |  6 +++---
 common/data/evolutions.js |  8 ++++++++
 common/data/sailors.js    | 10 ++++++++--
 common/data/specials.js   | 14 +++++++++++++
 common/data/units.js      | 11 ++++++++--
 common/data/zombies.js    |  4 ++++
 8 files changed, 96 insertions(+), 19 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 107dd19ee..391f03f00 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4392,7 +4392,7 @@ window.captains = {
     },
     1525: {
         atk: function(p) {
-            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.25 - 0.1 * p.turnCounter) : 1;
+            return p.unit.class.has("Slasher") ? Math.max(2.0, 3.25 - 0.0625 * p.turnCounter) : 1;
         }
     },
     1526: {
@@ -4430,7 +4430,9 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
-    
+    1535: {
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : p.slot == p.sourceSlot ? 2.5 : 1; }
+    },
     1536: {
         atk: function(p) { return !p.unit.type == "PSY" ? 1 : p.slot == p.sourceSlot ? 3 : 1; }
     },
@@ -4480,6 +4482,8 @@ window.captains = {
                 minModifier: 'Good'
             }]) ? 2.5 : 1;
         },
+        rcv: function(p) { return 1.2; },
+        hp: function(p) { return 1.2; },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1543: {
@@ -4496,4 +4500,16 @@ window.captains = {
     1548: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
+    1552: {
+        atk: function(p) { return p.unit.cost == 40 ? 1 : 1; },
+    },
+    1553: {
+        atk: function(p) { return p.unit.cost == 40 ? 2.75 : 1; },
+    },
+    1554: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+    },
+    1555: {
+        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 3b69be103..ea63cea19 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5987,7 +5987,7 @@ window.details = {
     1189: {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-        special: "Reduces enemy Barrier timers by 1 turn",
+        special: "Reduces enemy Barrier duration by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
         sailor: "Boosts ATK of [QCK] characters by 40"
@@ -5995,7 +5995,7 @@ window.details = {
     1190: {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-        special: "Reduces enemy Barrier timers by 1 turn",
+        special: "Reduces enemy Barrier duration by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
         sailor: "Boosts ATK of [QCK] characters by 40"
@@ -7367,13 +7367,13 @@ window.details = {
     1377: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.3x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
-        sailor: "Boosts amount healed from [RCV] orbs by 150 each",
+        sailor: "Boosts amount healed from [RCV] orbs by 125 each",
         specialName: "Sincere Devotion",
     },
     1378: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.75x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
-        sailor: "Boosts amount healed from [RCV] orbs by 150 each",
+        sailor: "Boosts amount healed from [RCV] orbs by 125 each",
         specialName: "Sincere Devotion",
     },
     1379: {//Shanks
@@ -7636,12 +7636,12 @@ window.details = {
     },
     1415: {//Fortnight Sengoku
         captain: "Boost ATK of characters with cost 30 or less by 1.5x",
-        special: "Reduces Special Cooldown of all characters by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
+        special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
         specialName: "Unshakeable Resolution of the Wise Master",
     },
     1416: {//Fortnight Sengoku
         captain: "Boost ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
-        special: "Reduces Special Cooldown of all characters by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
+        special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
         specialName: "Unshakeable Resolution of the Wise Master",
     },
     1417: {//Ronse
@@ -8332,14 +8332,16 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 1.75x and recovers 1,000 HP at end of each turn",
         special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
         specialName: "The Life Risked for the 'Sakura' Miracle",
+        sailor: "Boosts amount healed from [RCV] orbs by 124 each",
     },
     1524: {//Spring Chopper
         captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 1,224 HP at end of each turn",
         special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
         specialName: "The Life Risked for the 'Sakura' Miracle",
+        sailor: "Boosts amount healed from [RCV] orbs by 124 each",
     },
     1525: {//Sulieman
-        captain: "Boosts ATK of Slashers characters by 3.25x, reduces his own ATK multiplier by ???x at the end of each turn",
+        captain: "Boosts ATK of Slashers characters by 3.25x, reduces his own ATK multiplier by 0.0625x at the end of each turn until it is 2x",
         special: "Deals 3 hits of random typeless damage to random enemies, delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.3x for 2 turns",
         specialNotes: "#{randomHits : 10}",
         specialName: "Sorrowful Execution",
@@ -8441,13 +8443,13 @@ window.details = {
         specialName: "The Teacher's Final Ordeal",
     },
     1535: {//Duval
-        captain: "Not Translated",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [PSY] characters by 2.5x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
         specialName: "Prideful Memories",
     },
     1536: {//Duval
-        captain: "Reduces cooldown of [PSY] specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
         specialName: "Prideful Memories",
@@ -8484,7 +8486,7 @@ window.details = {
         specialName: "Soft and Gentle Fluffy Kisses",
     },
     1542: {//Elizabeth
-        captain: "Boosts RCV and HP by ???x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
+        captain: "Boosts RCV and HP by 1.2x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
@@ -8512,4 +8514,24 @@ window.details = {
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 1 turn",
         specialName: "Former Thief's Box Office",
     },
+    1552: {//Coliseum Hajrudin
+        captain: "Boosts ATK of characters with ??? cost by ????x",
+        special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
+        specialName: "Thunder Giant",
+    },
+    1553: {//Coliseum Hajrudin
+        captain: "Boosts ATK of characters with 40 cost by 2.75x",
+        special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
+        specialName: "Thunder Giant",
+    },
+    1554: {//Coliseum Ryuma
+        captain: "Boosts ATK of [DEX] characters by 2x",
+        special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
+        specialName: "Ryuma Special",
+    },
+    1555: {//Coliseum Ryuma
+        captain: "Boosts ATK of [DEX] characters by 2.25x, recovers 2x character's RCV in HP at the end of each turn",
+        special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
+        specialName: "Ryuma Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 1f7d9fac7..8ae5b0fda 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1627,9 +1627,9 @@ window.drops = {
             name: 'Coliseum',
             thumb: 779,
             global: true,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4ca7ab8c5..b473957ee 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2383,4 +2383,12 @@ window.evolutions = {
         evolution: 1547,
         evolvers: [ 117, 79, 85, 96, 101 ]
     },
+    1552: {
+        evolution: 1553,
+        evolvers: [  ]
+    },
+    1554: {
+        evolution: 1555,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/sailors.js b/common/data/sailors.js
index dc0a36ede..09dc1da8f 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -191,10 +191,10 @@ window.sailors = {
         hpStatic: function(p) { return 50; },
     },
     1377: {
-        rcvAdded: function(p) { return 150; },
+        rcvAdded: function(p) { return 125; },
     },
     1378: {
-        rcvAdded: function(p) { return 150; },
+        rcvAdded: function(p) { return 125; },
     },
     1405: {
         atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
@@ -246,6 +246,12 @@ window.sailors = {
     1511: {
         atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Powerhouse") ? p.unit.class.has("Powerhouse") ? 20 : 0 : 0 : 0; },
     },
+    1523: {
+        rcvAdded: function(p) { return 124; },
+    },
+    1524: {
+        rcvAdded: function(p) { return 124; },
+    },
     1529: {
         atk: function(p) { return p.captain != null ? p.captain.type == "STR" || p.captain.type == "QCK" ? .5 : 1 : 1; },
     },
diff --git a/common/data/specials.js b/common/data/specials.js
index cda5a530b..129a4c6fb 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2485,5 +2485,19 @@ window.specials = {
     1548: {
         chainAddition: function(p){ return 0.2;}
     },
+    1552: {
+        atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
+    },
+    1553: {
+        atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
+    },
+    1554: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+    },
+    1555: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+    },
     
 };
diff --git a/common/data/units.js b/common/data/units.js
index 35145437b..c98201c94 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1375,8 +1375,8 @@ window.units = [
     [ "Magellan, Chief Warden of Impel Down", "INT", [ "Striker", "Shooter" ], 5, 50, 5, 2, 99, 5000000, 1149, 590, 57, 2605, 1316, 207, 1 ],
     [ "Dellinger, Blood Thirsty Half-Fishman Fighting Fish", "QCK", [ "Powerhouse", "Fighter" ], 4, 25, 5, 2, 70, 1066998, 499, 366, 47, 1134, 749, 171, 1 ],
     [ "Dellinger, Combatant of the Diamante Army", "QCK", [ "Powerhouse", "Fighter" ], 5, 40, 7, 3, 99, 4000000, 1062, 668, 109, 2060, 1429, 300, 1 ],
-    [ "Marguerite, Amazon Lily Archer", "DEX", [ "Shooter", "Slasher" ], 3, 16, 5, 2, 50, 392109, 93, 72, 62, 895, 520, 206, 1 ],
-    [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 4, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
+    [ "Marguerite, Amazon Lily Archer", "DEX", [ "Shooter", "Slasher" ], 4, 16, 5, 2, 50, 392109, 93, 72, 62, 895, 520, 206, 1 ],
+    [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 5, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
     [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
     [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
     [ "Tashigi, Silent Night Star", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, 1 ],
@@ -1547,6 +1547,13 @@ window.units = [
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
     [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
     [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Hajrudin", "STR", [ "Powerhouse", "Striker" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Hajrudin, Evolved", "STR", [ "Powerhouse", "Striker" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Ryuma", "DEX", "Slasher", 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Ryuma, Evolved", "DEX", "Slasher", 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index e68199bf0..d3f0a6f90 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -375,4 +375,8 @@ window.zombies = {
         type: 'healer',
         amount: 1224
     },
+    1555: { // Coliseum Ryuma
+        type: 'healer',
+        multiplier: 2
+    },
 };

From 9344d1d54db62bde47e4692ce68940b3ab5f5c36 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 8 Apr 2017 21:03:05 -0400
Subject: [PATCH 0964/1569] Benefittial Specials and Null Orbs Specials working

Figured out the problem... uclass plz
---
 common/data/specials.js | 208 ++++++++++++++++++++--------------------
 damage/js/cruncher.js   |   8 +-
 damage/js/utils.js      |  17 +++-
 3 files changed, 124 insertions(+), 109 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 129a4c6fb..f3d7f0994 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -40,7 +40,7 @@ window.specials = {
         type: "type"
     },
     263: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     267: {
         def: function(p) { return 0.5; }
@@ -69,10 +69,10 @@ window.specials = {
         type: "class"
     },
     323: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     324: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     352: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
@@ -100,10 +100,10 @@ window.specials = {
         def: function(p) { return 0.2; }
     },
     395: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     396: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     399: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
@@ -132,10 +132,10 @@ window.specials = {
         type: "type"
     },
     417: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
     },
     418: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
     },
     419: {
         def: function(p) { return 0.5; }
@@ -154,13 +154,13 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     430: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     431: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     434: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     450: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -195,7 +195,7 @@ window.specials = {
         type: "class"
     },
     465: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     468: {
         rcv: function(p) { return 1.5; }
@@ -275,10 +275,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     533: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     534: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     542: {
         rcv: function(p) { return 2; }
@@ -303,10 +303,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     559: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     560: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     568: {
         def: function(p) { return 0.5; }
@@ -409,10 +409,10 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     642: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     643: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     644: {
         atk: function(p) { return 1.2; },
@@ -425,22 +425,22 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     648: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     649: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     650: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     651: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     655: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     656: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     660: {
         def: function(p) { return 0.5; }
@@ -507,10 +507,10 @@ window.specials = {
         type: "class"
     },
     689: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     690: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     710: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
@@ -588,16 +588,16 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     742: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     743: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     753: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     754: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     755: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
@@ -685,10 +685,10 @@ window.specials = {
         type: "type"
     },
     805: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     806: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     807: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -699,15 +699,15 @@ window.specials = {
         type: "condition"
     },
     809: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
         def: function(p) { return 0.2; }
     },
     810: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
         def: function(p) { return 0.2; }
     },
     813: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     822: {
         rcvStatic: function(p) { return 100; },
@@ -759,10 +759,10 @@ window.specials = {
         type: "class"
     },
     835: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     836: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     837: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
@@ -824,12 +824,12 @@ window.specials = {
     },
     847: {
         atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.15); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15); },
         type: "class"
     },
     848: {
         atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.15); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15); },
         type: "class"
     },
     849: {
@@ -848,10 +848,10 @@ window.specials = {
         type: "type"
     },
     861: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     862: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     863: {
         def: function(p) { return 0.5; }
@@ -871,15 +871,15 @@ window.specials = {
         type: "class"
     },
     869: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2.0); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0); }
     },
     870: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2.0); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0); }
     },
     873: {
         orb: function(p) {
-            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
-            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
+            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
         },
         type: "class",
         onActivation: function(p) {
@@ -894,8 +894,8 @@ window.specials = {
     },
     874: {
         orb: function(p) {
-            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
-            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
+            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
         },
         type: "class",
         onActivation: function(p) {
@@ -1066,10 +1066,10 @@ window.specials = {
         type: "class"
     },
     921: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     922: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     925: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -1129,7 +1129,7 @@ window.specials = {
         type: "class"
     },
     961: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     963: {
         def: function(p) { return 0; }
@@ -1222,22 +1222,22 @@ window.specials = {
     1024: {
         orb: function(p) {
             if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25);
             }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
             }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
             }
         }
     },
     1025: {
         orb: function(p) {
             if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25);
             }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
             }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
             }
         }
     },
@@ -1284,10 +1284,10 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
     },
     1059: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1060: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1061: {
         chain: function(p) { return 2; },
@@ -1298,7 +1298,7 @@ window.specials = {
         type: "class"
     },
     1065: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     1066: {
         chainAddition: function(p){ return 0.1;}
@@ -1348,10 +1348,10 @@ window.specials = {
         type: "class"
     },
     1086: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1087: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1088: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
@@ -1370,10 +1370,10 @@ window.specials = {
         type: "type"
     },
     1099: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1100: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1101: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
@@ -1398,10 +1398,10 @@ window.specials = {
         type: "class"
     },
     1111: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     1112: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     1113: {
         atk: function(p) { return 1.2; },
@@ -1418,12 +1418,12 @@ window.specials = {
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
     },
     1123: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
@@ -1450,7 +1450,7 @@ window.specials = {
         }
     },
     1137: {
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1138: {
         atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
@@ -1466,11 +1466,11 @@ window.specials = {
         type: "class"
     },
     1164: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
         rcv: function(p) { return 1.5; }
     },
     1165: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
         rcv: function(p) { return 1.5; }
     },
     1168: {
@@ -1514,10 +1514,10 @@ window.specials = {
         type: "class"
     },
     1211: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1212: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1219: {
         atk: function(p) {
@@ -1699,7 +1699,7 @@ window.specials = {
         def: function(p) { return 0.5; } //TODO: get correct value
     },
     1255: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1256: {
         atk: function(p) { return 1.3 },
@@ -1765,10 +1765,10 @@ window.specials = {
         }
     },
     1271: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1272: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1273: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -1781,7 +1781,7 @@ window.specials = {
     1282: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.2); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2); },
     },
     1283: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
@@ -1900,7 +1900,7 @@ window.specials = {
     1348: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.2); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2); },
     },
     1349: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -1913,10 +1913,10 @@ window.specials = {
         chainAddition: function(p){ return 0.5; }
     },
     1354: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
     },
     1355: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
     },
     1358: {
         rcv: function(p){ return 1.75; }
@@ -1933,13 +1933,13 @@ window.specials = {
         type: "class",
     },
     1363: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },	
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
     1364: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },	
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
     1367:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1367].multiplier); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier); },
         onActivation: function(p) {
             var n = (window.specials[1367].multiplier == 1.5 ? 1 : 0);
             window.specials[1367].multiplier = [1.5, 1.75][n];
@@ -1950,7 +1950,7 @@ window.specials = {
         },
     },
     1368:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1368].multiplier); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1368].multiplier); },
         onActivation: function(p) {
             var n = (window.specials[1368].multiplier == 1.5 ? 1 : 0);
             window.specials[1368].multiplier = [1.5, 1.75][n];
@@ -1963,21 +1963,21 @@ window.specials = {
     1375: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
     },
     1376: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
     },
     1379: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1380: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1389: {
-        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },	
+        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
     1390: {
         atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
@@ -1994,7 +1994,7 @@ window.specials = {
     1393: {
         atk: function(p) { return 1.1; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.1); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1); },
     },
     1394: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2076,13 +2076,13 @@ window.specials = {
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1406: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1407: {
@@ -2142,11 +2142,11 @@ window.specials = {
         type: "class"
     },
     1425: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1426: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1428: {
@@ -2165,13 +2165,13 @@ window.specials = {
     1437: {
         atk: function(p) { return 1.5; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1438: {
         atk: function(p) { return 1.5; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
         warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1439: {
@@ -2193,12 +2193,12 @@ window.specials = {
     1443: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
     },
     1444: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
     },
     1445: {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
@@ -2294,10 +2294,10 @@ window.specials = {
         chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
     },
     1486: {
-        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1487: {
-        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1490: {
         def: function(p) { return 0.5; }
@@ -2358,10 +2358,10 @@ window.specials = {
         }
     },
     1517: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     1518: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     1522: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
@@ -2397,7 +2397,7 @@ window.specials = {
         },
     },
     1529: {
-        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1529].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1529].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
         onActivation: function(p) {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1529].multiplier = n;
@@ -2408,7 +2408,7 @@ window.specials = {
         }
     },
     1530: {
-        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, window.specials[1530].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1530].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
         onActivation: function(p) {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1530].multiplier = n;
@@ -2493,11 +2493,11 @@ window.specials = {
     },
     1554: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
     },
     1555: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, 1, 1); },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
     },
     
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index b06ad7815..af2fe5712 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -183,13 +183,13 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
             var multipliers = [ ];
             if (orb == 'g') orb = 1.5;
-            if (orb == 0.5 && x.unit.type == 'DEX' && (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
-                                 || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))||(window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))))) orb = 2;
+            if (orb == 0.5 && x.unit.type == 'DEX') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Driven")) orb = (window.specials[1259].turnedOn || window.specials[1260].turnedOn || window.specials[1323].turnedOn || window.specials[1324].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Slasher")) orb = (window.specials[1323].turnedOn || window.specials[1324].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
                                  || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))) ? 2 : 1;
-            //if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn) ? 1 : .5;
+            if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn) ? 1 : .5;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 67f544287..cdf8030ef 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -95,11 +95,26 @@ window.CrunchUtils.typeSort = function(array, typeMultiplier, types) {
     return result;
 };
 
-window.CrunchUtils.getOrbMultiplier = function(orb, type, baseMultiplier, boostedMultiplier) {
+window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier, boostedMultiplier) {
     if(window.specials[1221].turnedOn || window.specials[1222].turnedOn){
         if (orb == 'str') return boostedMultiplier;
         if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
     }
+    if(window.specials[1323].turnedOn || window.specials[1324].turnedOn){
+        if(uclass.has("Driven") || uclass.has("Slasher")){
+            if (orb == 'str') return boostedMultiplier;
+            if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+        }
+    }
+    if(window.specials[1259].turnedOn || window.specials[1260].turnedOn){
+        if(uclass.has("Driven")){
+            if (orb == 'str') return boostedMultiplier;
+            if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+        }
+    }
+    if(window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn){
+        if (orb == 0.5) return baseMultiplier;
+    }
     if (orb == 1.0 || orb == 'str') return baseMultiplier;
     if (orb == 2.0 || orb == 'g' || orb == 'rainbow') return boostedMultiplier;
     if (orb == 0.5) return 1 / boostedMultiplier;

From a67edd741a15af101653e429e68b05416ae55850 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 10 Apr 2017 21:37:53 -0400
Subject: [PATCH 0965/1569] New 5+ Units

---
 common/data/aliases.js    |  6 +++---
 common/data/captains.js   | 15 +++++++++++++++
 common/data/cooldowns.js  |  3 +++
 common/data/details.js    | 27 ++++++++++++++++++++++++++-
 common/data/evolutions.js | 12 ++++++++++++
 common/data/specials.js   |  4 ++--
 common/data/units.js      | 10 +++++-----
 common/data/zombies.js    |  8 ++++++++
 8 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 583224074..ac777c3b8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1547,9 +1547,9 @@ window.aliases = {
     1546: ['', '', 'Brook'],
     1547: ['', '', 'Brook'],
     1548: ['', '', ''],
-    1549: ['', '', ''],
-    1550: ['', '', ''],
-    1551: ['', '', ''],
+    1549: ['', '', 'Mega Robin'],
+    1550: ['', '', 'Mega Franky'],
+    1551: ['', '', 'Mega Brook'],
     1552: ['', '', ''],
     1553: ['', '', ''],
     1554: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 391f03f00..066c2a9cf 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4489,6 +4489,12 @@ window.captains = {
     1543: {
         atk: function(p) { return !(p.unit.class.has("Shooter")) ? 1 : p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
     },
+    1544: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    },
+    1545: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+    },
     1546: {
         atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
@@ -4500,6 +4506,15 @@ window.captains = {
     1548: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
+    1549: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; },
+    },
+    1550: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+    },
+    1551: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
     1552: {
         atk: function(p) { return p.unit.cost == 40 ? 1 : 1; },
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 4d32f57ba..67239d807 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1547,4 +1547,7 @@ window.cooldowns = [
     [ 13, 7 ],
     [ 13, 7 ],
     [ 19, 13 ],
+    [ 20, 14 ],
+    [ 19, 13 ],
+    [ 17, 11 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index ea63cea19..f5f4e3455 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4677,7 +4677,7 @@ window.details = {
     984: {
         captain: "Boosts ATK of Striker characters by 2.25x",
         specialName: "Shrouds and Rattling Knot",
-        special: "Delays all enemies for 1 turn, Locks all orbs for 1 turn"
+        special: "Delays all enemies for 1 turn and locks all orbs for 1 turn"
     },
     985:{
       captainNotes: "Acts as a Daimyo Turtle and thus gives 15k EXP"  
@@ -8499,6 +8499,16 @@ window.details = {
         sailor: "Completely resists Blindness",
         specialName: "Green Star, Impact Wolf",
     },
+    1544: {//Sakura Koala
+        captain: "Boosts ATK of Fighter characters by 1.75x and heals for .3x her RCV at the end of the turn each time you hit a Perfect",
+        special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
+        specialName: "Sakura Koala Special",
+    },
+    1545: {//Sakura Koala
+        captain: "Boosts ATK of Fighter characters by 2.25x and heals for .5x her RCV at the end of the turn each time you hit a Perfect",
+        special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
+        specialName: "Sakura Koala Special",
+    },
     1546: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 1.5x and boosts HP of Free Spirit characters by 1.2x",
         special: "Boosts ATK of Free Spirit characters by 1.5x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
@@ -8514,6 +8524,21 @@ window.details = {
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 1 turn",
         specialName: "Former Thief's Box Office",
     },
+    1549: {//5+ Robin
+        captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 3x character's RCV in HP at the end of each turn",
+        special: "Reduces Bind and Despair duration by 3 turns, and reduces Special Cooldown of all characters by 1 turn",
+        specialName: "Mil Fluer: Campo de Flores",
+    },
+    1550: {//5+ Franky
+        captain: "Boosts ATK of [INT] characters by 2.5x, reduces damage received by 10%",
+        special: "Deals 35x character's ATK in [INT] damage to all enemies. Changes [TND] and [RCV] orbs on Shooter and Free Spirit characters into Matching Orbs.",
+        specialName: "Franky's Rocket Launcher",
+    },
+    1551: {//5+ Brook
+        captain: "Boosts ATK of Free Spirit characters by 2.5x and recovers 430 HP at end of each turn",
+        special: "Delays all enemies for 1 turn and locks all orbs for 1 turn",
+        specialName: "Song of Scratches: Blizzard Slash",
+    },
     1552: {//Coliseum Hajrudin
         captain: "Boosts ATK of characters with ??? cost by ????x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b473957ee..90027a183 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2383,6 +2383,18 @@ window.evolutions = {
         evolution: 1547,
         evolvers: [ 117, 79, 85, 96, 101 ]
     },
+    709: {
+        evolution: 1549,
+        evolvers: [  ]
+    },
+    739: {
+        evolution: 1550,
+        evolvers: [  ]
+    },
+    896: {
+        evolution: 1551,
+        evolvers: [  ]
+    },
     1552: {
         evolution: 1553,
         evolvers: [  ]
diff --git a/common/data/specials.js b/common/data/specials.js
index f3d7f0994..e6230d474 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2440,11 +2440,11 @@ window.specials = {
             });
         }
     },
-    1534: {
+    1535: {
         atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
         type: "type"
     },
-    1535: {
+    1536: {
         atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
         type: "type"
     },
diff --git a/common/data/units.js b/common/data/units.js
index c98201c94..05879b9e9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1542,14 +1542,14 @@ window.units = [
     [ "Elizabeth, Straw Hat Pirates Companion", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 77, 55, 33, 888, 444, 222, 1 ],
     [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 821, 380, 157, 2681, 810, 381, 1 ],
     [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
     [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
     [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], 5, 30, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], 5, 30, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
     [ "Coliseum Hajrudin", "STR", [ "Powerhouse", "Striker" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Hajrudin, Evolved", "STR", [ "Powerhouse", "Striker" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Ryuma", "DEX", "Slasher", 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index d3f0a6f90..223b483d7 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -375,6 +375,14 @@ window.zombies = {
         type: 'healer',
         amount: 1224
     },
+    1549: { // 5+ Robin
+        type: 'healer',
+        multiplier: 3
+    },
+    1551: { // 5+ Brook
+        type: 'healer',
+        amount: 430
+    },
     1555: { // Coliseum Ryuma
         type: 'healer',
         multiplier: 2

From 39f2ec03956d614e9318ee41a26a217bab18b52b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 11 Apr 2017 11:51:54 -0400
Subject: [PATCH 0966/1569] 5+ StrawHats

Barto Ship and others
---
 common/data/cooldowns.js |  4 ++--
 common/data/ships.js     | 14 +++++++-------
 common/data/units.js     | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 67239d807..8e94ccb6b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1542,8 +1542,8 @@ window.cooldowns = [
     [ 22, 15 ],
     [ 22, 15 ],
     [ 16, 13 ],
-    null,
-    null,
+    [ 7, 7 ],
+    [ 7, 7 ],
     [ 13, 7 ],
     [ 13, 7 ],
     [ 19, 13 ],
diff --git a/common/data/ships.js b/common/data/ships.js
index 4074f8b2e..0f2552019 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -321,7 +321,7 @@ window.ships = [
     },
     { // 26
         name: 'Kizaru\'s Cannonball',
-        thumb: null,
+        thumb: 'ship_0027_c.png',
         description: 'Boosts ATK of Shooter characters by 1.55x and their HP by 1.2x, reduces cooldown of Shooter characters specials by 2 turns at the start of the fight. Special: Cuts the current HP of each enemy by 7% (cooldown: 15 turns).',
         atk: function(p) {
             return !(p.unit.class.has('Shooter')) ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.55 ][p.boatLevel - 1];
@@ -333,21 +333,21 @@ window.ships = [
     
     { // 27
         name: 'Going Luffy SENPAI!',
-        thumb: null,
-        description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x. Special: Reduces any damage received above 10,000 HP by large amount (cooldown: 17 turns).',
+        thumb: 'ship_0028_c.png',
+        description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x if there are 6 Striker characters in your crew. Special: Reduces any damage received above 10,000 HP by 97% (cooldown: 17 turns).',
         atk: function(p) {
-            return !p.unit.class.has('Striker') ? 1 :
+            return !(p.classCount.Striker == 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
                 [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !p.unit.class.has('Striker') ? 1 :
+            return !(p.classCount.Striker == 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
                 [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
         }
     },
     
     { //28
         name: "Thriller Bark",
-        thumb: null,
+        thumb: 'ship_0029_c.png',
         description: 'Boosts ATK of [DEX] and [INT] characters by 1.5x and their HP by 1.25x',
         atk: function(p) {
             return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
@@ -359,7 +359,7 @@ window.ships = [
     
     { //29
         name: "Karasumaru Ship",
-        thumb: null,
+        thumb: 'ship_0030_c.png',
         description: 'Boosts ATK and HP of Shooter Only characters by 2x and boosts the ATK of all other characters by 1.5x and their HP by 1.02x. Special: Delays all enemies for 2 turns (cooldown: 12 turns).',
         atk: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.5;
diff --git a/common/data/units.js b/common/data/units.js
index 05879b9e9..ce8a9adaa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1542,14 +1542,14 @@ window.units = [
     [ "Elizabeth, Straw Hat Pirates Companion", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 77, 55, 33, 888, 444, 222, 1 ],
     [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 821, 380, 157, 2681, 810, 381, 1 ],
     [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
-    [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, null, 4, 99, 3000000, null, null, null, 1701, 1205, 358, null ],
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
     [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
     [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
-    [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], 5, 30, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
-    [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], 5, 30, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
-    [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, null, 3, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, null, null, null, 2105, 1187, 401, null ],
+    [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, null, null, null, 2687, 1359, 244, null ],
+    [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, null, null, null, 2204, 1277, 351, null ],
     [ "Coliseum Hajrudin", "STR", [ "Powerhouse", "Striker" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Hajrudin, Evolved", "STR", [ "Powerhouse", "Striker" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Coliseum Ryuma", "DEX", "Slasher", 3, 16, null, null, null, null, null, null, null, null, null, null, null ],

From d1fb85e2ec8d24689f957da3604fcc6244e290d4 Mon Sep 17 00:00:00 2001
From: lextic <lextic@users.noreply.github.com>
Date: Tue, 11 Apr 2017 19:42:42 +0100
Subject: [PATCH 0967/1569] Drag'n'drop bugfix

---
 common/js/dragger.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/common/js/dragger.js b/common/js/dragger.js
index 7091b9f42..8b6422436 100644
--- a/common/js/dragger.js
+++ b/common/js/dragger.js
@@ -43,15 +43,17 @@ var onMove = function(e) {
 
 var onEndMove = function(stopProp, removable) {
     return function(e) {
-        e.target.style.zIndex = 3;
-        e.target.style.webkitTransform = e.target.style.transform = '';
-        if (removable) $('#removeZone').hide();
-        if (stopProp && stopProp(dropped)) stopPropagation = true;
-        else stopPropagation = false;
-        coordinates = [ 0, 0 ];
-        startObject.removeClass('ghoster');
-        startObject = null;
-        $(e.target.parentNode).removeClass('dragging');
+		setTimeout(function() {
+			e.target.style.zIndex = 3;
+			e.target.style.webkitTransform = e.target.style.transform = '';
+			if (removable) $('#removeZone').hide();
+			if (stopProp && stopProp(dropped)) stopPropagation = true;
+			else stopPropagation = false;
+			coordinates = [ 0, 0 ];
+			startObject.removeClass('ghoster');
+			startObject = null;
+			$(e.target.parentNode).removeClass('dragging');
+		}, 100);
     };
 };
 

From 4908ae77c40edeaf0c218fe22dacfc7e0ebbc8c0 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 11 Apr 2017 15:22:14 -0400
Subject: [PATCH 0968/1569] FN Drops fix and families

---
 common/data/drops.js    |  3 ++-
 common/data/families.js | 11 +++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 8ae5b0fda..aace3984e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1136,7 +1136,8 @@ window.drops = {
             thumb: 918,
             global: true,
             condition: 'You can only bring DEX units',
-            "All Difficulties": [ 917, 919, 920, -920, -791, -756, -720, -706, -705, -542, -541, -522, -1117 ]
+            "Japan": [ 917, 919, 920, -920, -791, -756, -720, -707, -705, -542, -541, -522, -1117 ],
+            "Global": [ 917, 919, 920, -920, -506, -756, -720, -707, -705, -542, -541, -522, -1117 ]
         },
         
         {
diff --git a/common/data/families.js b/common/data/families.js
index 32b76f43d..f351c28a7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1542,9 +1542,16 @@ window.families = [
     "Elizabeth",
     "Elizabeth",
     "Usopp",
-    null,
-    null,
+    "Koala",
+    "Koala",
     "Brook",
     "Brook",
     "Thieves of Tehna Gehna Kingdom",
+    "Nico Robin",
+    "Franky",
+    "Brook",
+    "Hajrudin",
+    "Hajrudin",
+    "Ryuuma",
+    "Ryuuma",
 ];

From ce57e33d18fea868b87752a27431c427f26b2b85 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Tue, 11 Apr 2017 14:12:55 -0700
Subject: [PATCH 0969/1569] Fixed 6+ Usopp's Cost

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index ce8a9adaa..cdfe2d2e6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1541,7 +1541,7 @@ window.units = [
     [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 885, 416, 167, 1969, 1001, 481, 1 ],
     [ "Elizabeth, Straw Hat Pirates Companion", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 77, 55, 33, 888, 444, 222, 1 ],
     [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 821, 380, 157, 2681, 810, 381, 1 ],
-    [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
+    [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 65, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
     [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, null, null, 50, 392109, null, null, null, null, null, null, null ],
     [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, null, 4, 99, 3000000, null, null, null, 1701, 1205, 358, null ],
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],

From 7df7f538fa34ac3c99d59bde835e5e1e843ff795 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 14 Apr 2017 20:59:01 -0400
Subject: [PATCH 0970/1569] Woo! New Story and some things I've wanted.

Gamewith links on drop page
Dice fix
some more stuff
---
 characters/js/utils.js    |   2 +-
 common/data/aliases.js    |  35 +++++++++----
 common/data/captains.js   |  33 ++++++++++++
 common/data/cooldowns.js  |  21 ++++++--
 common/data/details.js    | 103 +++++++++++++++++++++++++-------------
 common/data/drops.js      |  75 ++++++++++++++++++++++++---
 common/data/effects.js    |  17 +++++++
 common/data/evolutions.js |  10 ++--
 common/data/families.js   |   7 +++
 common/data/gw.js         |  22 ++++++--
 common/data/specials.js   |  34 ++++++++++---
 common/data/units.js      |  25 +++++----
 damage/js/cruncher.js     |   6 +--
 damage/js/utils.js        |   2 +-
 drops/index.html          |   8 ++-
 15 files changed, 314 insertions(+), 86 deletions(-)

diff --git a/characters/js/utils.js b/characters/js/utils.js
index 9ec80141d..3436bec8f 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -102,7 +102,7 @@ CharUtils.searchDropLocations = function(id) {
         for (var island=0;island<window.drops[type].length;++island) {
             var temp = [ ];
             for (var stage in window.drops[type][island]) {
-                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge' || stage == 'challengeData' || stage == 'showManual') continue;
+                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge' || stage == 'challengeData' || stage == 'showManual' || stage == 'gamewith') continue;
                 if (window.drops[type][island][stage].indexOf(id) != -1)
                     temp.push(stage);
             }
diff --git a/common/data/aliases.js b/common/data/aliases.js
index ac777c3b8..bdf719a23 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1544,13 +1544,30 @@ window.aliases = {
     1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp'],
     1544: ['', '', ''],
     1545: ['', '', ''],
-    1546: ['', '', 'Brook'],
-    1547: ['', '', 'Brook'],
-    1548: ['', '', ''],
-    1549: ['', '', 'Mega Robin'],
-    1550: ['', '', 'Mega Franky'],
-    1551: ['', '', 'Mega Brook'],
-    1552: ['', '', ''],
-    1553: ['', '', ''],
-    1554: ['', '', ''],
+    1546: ['ソウルキング', '', 'Brook'],
+    1547: ['“ソウルキング”ブルック 海賊', '', 'Brook'],
+    1548: ['テーナ・ゲーナ王国の手長族 “ソウルキング”マネージャー', '', ''],
+    1549: ['ニコ・ロビン 千紫万紅　花畑', '', 'Mega Robin'],
+    1550: ['フランキー フランキ～～～ロケットランチャ――', '', 'Mega Franky'],
+    1551: ['ブルック 掠り唄　吹雪斬り', '', 'Mega Brook'],
+    1552: ['ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
+    1553: ['海賊傭兵　ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
+    1554: ['リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma'],
+    1555: ['剣豪リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma'],
+    1556: ['ワダツミ', '', ''],
+    1557: ['ゼオ', '', ''],
+    1558: ['イカロス', '', ''],
+    1559: ['ヒョウゾウ', '', ''],
+    1560: ['ダルマ', '', ''],
+    1561: ['ドスン', '', ''],
+    1562: ['ホーディ・ジョーンズ 暴走', '', ''],
+    1563: ['', '', ''],
+    1564: ['', '', ''],
+    1565: ['', '', ''],
+    1566: ['', '', ''],
+    1567: ['', '', ''],
+    1568: ['', '', ''],
+    1569: ['', '', ''],
+    1570: ['', '', ''],
+    1571: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 066c2a9cf..ce2a91ab3 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4527,4 +4527,37 @@ window.captains = {
     1555: {
         atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; },
     },
+    1556: {
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+    },
+    1557: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1558: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1559: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1560: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1561: {
+        atk: function(p) {
+            return p.unit.type == "INT" ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1562: {
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") ? Math.max(1.5, 3.5 - 0.1 * p.turnCounter) : 1;
+        }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8e94ccb6b..b212d1a1d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1015,11 +1015,11 @@ window.cooldowns = [
     [ 16, 6 ],
     [ 24, 12 ],
     [ 24, 12 ],
-    [ 26, 14 ],
-    [ 26, 14 ],
-    [ 16, 6],
-    [ 13, 13],
-    [ 13, 13],
+    [ 26, 16 ],
+    [ 26, 16 ],
+    [ 16, 6 ],
+    [ 13, 13 ],
+    [ 13, 13 ],
     [ 15, 15 ],
     [ 17, 17 ],
     [ 19, 13 ],
@@ -1550,4 +1550,15 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 19, 13 ],
     [ 17, 11 ],
+    [ 30, 17 ],
+    [ 30, 17 ],
+    [ 16, 7 ],
+    [ 16, 7 ],
+    20,
+    12,
+    20,
+    19,
+    11,
+    23,
+    15,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index f5f4e3455..040bf2d51 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5796,13 +5796,13 @@ window.details = {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
-        specialName: "Summer Koala Special"
+        specialName: "Open Sun"
     },
     1161: {
         captain: "Boosts ATK of Free Spirit characters by 2x and their RCV by 1.5x",
         special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
-        specialName: "Summer Koala Special"
+        specialName: "Open Sun"
     },
     1162: {//Tesoro
         captain: "Boosts ATK of [PSY] characters by 1.75x and boosts amount of Beli received by 1.5x",
@@ -5840,14 +5840,14 @@ window.details = {
     1168: {//Dice
         captain: "Boosts ATK of [STR] characters by 2x if HP is below 30% at the start of the turn",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
-        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated<br>HP > 50%: 1.1x<br>50% > HP > 30%: 1.25x<br>30% > HP > 10%: 1.5x<br>HP < 10%: 1.75x",
         specialName: "Trump Card Dealer",
     },
     1169: {//Dice Evolved
         captain: "Boosts ATK of [STR] characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
-        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.1x; below 30% HP, it's 1.75x.",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated<br>HP > 50%: 1.1x<br>50% > HP > 30%: 1.25x<br>30% > HP > 10%: 1.5x<br>HP < 10%: 1.75x",
         specialName: "Trump Card Dealer",
     },
     1170: {//Tanaka
@@ -6749,12 +6749,12 @@ window.details = {
     1295: {//Halloween Kalifa
         captain: "Boosts ATK and RCV of [STR] characters by 1.5x",
         special: "Reduces duration of Paralysis by 3 turns, removes poison, and reduces the defense of all enemies by 100% for 1 turn",
-        specialName: "Halloween Kalifa Special",
+        specialName: "Mysterious Hour of the Dark Night",
     },
     1296: {//Halloween Kalifa
         captain: "Boosts ATK of [STR] characters by 2x and their RCV by 1.5x",
         special: "Reduces duration of Paralysis by 3 turns, removes poison, and reduces the defense of all enemies by 100% for 1 turn",
-        specialName: "Halloween Kalifa Special",
+        specialName: "Mysterious Hour of the Dark Night",
     },
     1297: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
@@ -7392,13 +7392,13 @@ window.details = {
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
-        specialName: "Tashigi Special",
+        specialName: "Strawberry Smile",
     },
     1382: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.75x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
-        specialName: "Tashigi Special",
+        specialName: "Strawberry Smile",
     },
     1383: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage received by 1.5x",
@@ -7657,22 +7657,22 @@ window.details = {
     1419: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2x, reduce damage received by 10%",
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
-        specialName: "Lucci Special",
+        specialName: "Demonic Style",
     },
     1420: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduce damage received by 10%",
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
-        specialName: "Lucci Special",
+        specialName: "Demonic Style",
     },
     1421: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
-        specialName: "Diamante Special",
+        specialName: "Half Moon Glaive",
     },
     1422: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2.25x and boosts HP of Striker and Slasher characters by 1.5x",
         special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
-        specialName: "Diamante Special",
+        specialName: "Half Moon Glaive",
     },
     1423: {//Coliseum T-Bone
         captain: "Boosts ATK of the whole crew by 1.75x and recovers 918 HP at end of each turn,",
@@ -8038,41 +8038,41 @@ window.details = {
         captain: "Boosts ATK of all characters by 1.5x and EXP gained by 1.5x",
         special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
-        specialName: "King Neptune Special",
+        specialName: "Merman Gujutsu - Ultramarine",
     },
     1475: {//King Neptune
         captain: "Boosts ATK of all characters by 2.25x and EXP gained by 1.5x",
         captainNotes: "EXP boost does not take effect if he becomes your capatin in the middle of the adventure.",
         special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
-        specialName: "King Neptune Special",
+        specialName: "Merman Gujutsu - Ultramarine",
     },
     1476: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
         sailor: "Boosts HP, RCV and ATK of all characters by 50",
-        specialName: "Fukaboshi Special",
+        specialName: "Merman Gujutsu - Spear of the Ages",
     },
     1477: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2.5x and boosts HP of Powerhouse characters by 1.25x",
         captainNotes: "This effect does stack for characters that have both classes, so Striker/Powerhouse characters will have 2.5x ATK and 1.25x HP",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
         sailor: "Boosts HP, RCV and ATK of all characters by 50",
-        specialName: "Fukaboshi Special",
+        specialName: "Merman Gujutsu - Spear of the Ages",
     },
     1478: {//Caribou
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 1.75x after the 22nd hit, by 2x after the 33th hit, by 3x after the 44th hit",
         special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
         specialNotes: "#{randomHits : 15}",
         sailor: "Completely resists Paralysis on this character",
-        specialName: "Caribou Special",
+        specialName: "Swamp-Swamp Gatling Gun",
     },
     1479: {//Caribou
         captain: "Boosts ATK of all characters by 1.75x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 33th hit, by 3.5x after the 44th hit",
         special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
         specialNotes: "#{randomHits : 15}",
         sailor: "Completely resists Paralysis on this character",
-        specialName: "Caribou Special",
+        specialName: "Swamp-Swamp Gatling Gun",
     },
     1480: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row",
@@ -8080,7 +8080,7 @@ window.details = {
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
-        specialName: "Vander Decken IX Special",
+        specialName: "Stalking Rose Axe",
     },
     1481: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
@@ -8088,21 +8088,21 @@ window.details = {
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
-        specialName: "Vander Decken IX Special",
+        specialName: "Stalking Rose Axe",
     },
     1482: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2x and their RCV by 1.2x",
         special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
-        specialName: "Madame Shyarly Special",
+        specialName: "Foretold Catastrophe",
     },
     1483: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2.5x and their RCV by 1.2x",
         special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
-        specialName: "Madame Shyarly Special",
+        specialName: "Foretold Catastrophe",
     },
     1484: {//Wild Sanji
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
@@ -8253,48 +8253,48 @@ window.details = {
     1509: {//Haruta
         captain: "Reduces cooldown of Slasher and Cerebral specials by 1 turn at the start of the fight. Boosts ATK of [INT] characters by 2x.",
         special: "Deals 12x character's ATK in INT damage to one enemy and reduces damage received from PSY enemies by 80%.",
-        specialName: "Haruta Special",
+        specialName: "Honorable Blade",
         sailor: "Reduces Silence duration against this unit by 2 turns",
         sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
     },
     1510: {//Speed Jiru
         captain: "Boosts ATK of Driven and Striker characters by 2x",
         special: "Deals 12,500 fixed damage to one enemy",
-        specialName: "Genocide Jil Special",
+        specialName: "Acceleration Lance",
         sailor: "When HP is above 70% at the start of the turn, boosts ATK of Striker characters by 20",
     },
     1511: {//Atmos
         captain: "Boosts ATK of PSY characters by 2x",
         special: "Reduces Despair duration by 3 turns, boosts own ATK by 1.5x for 1 turn",
-        specialName: "Atmos Special",
+        specialName: "Buffalo Roar",
         sailor: "Boosts ATK of Powerhouse characters by 20 if your captain is a Powerhouse character",
     },
     1512: {//Kingdew
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
         special: "Removes poison, boosts ATK of Powerhouse characters by 1.5x for 1 turn if HP is below 30% when the special is activated",
-        specialName: "Kingdew Special",
+        specialName: "Enlightened Spirit",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character",
     },
     1513: {//Anniversary Sanji
         captain: "Boosts ATK of Fighter characters by 1.75x and RCV of Powerhouse characters by 1.2x",
         special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Sanji Special",
+        specialName: "Unfamiliar Escort",
     },
     1514: {//Anniversary Sanji
         captain: "Boosts ATK of Fighter characters by 2.5x and RCV of Powerhouse characters by 1.2x",
         special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Sanji Special",
+        specialName: "Unfamiliar Escort",
     },
     1515: {//White Day Brook
         captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x",
         special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
-        specialName: "Brook Special",
+        specialName: "Three-Verse Humming: Arrow-Notch Slash - Hail",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
     1516: {//White Day Brook
         captain: "Boosts ATK of [STR] and [QCK] characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
-        specialName: "Brook Special",
+        specialName: "Three-Verse Humming: Arrow-Notch Slash - Hail",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
     1517: {//Raid Bellamy
@@ -8343,7 +8343,7 @@ window.details = {
     1525: {//Sulieman
         captain: "Boosts ATK of Slashers characters by 3.25x, reduces his own ATK multiplier by 0.0625x at the end of each turn until it is 2x",
         special: "Deals 3 hits of random typeless damage to random enemies, delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.3x for 2 turns",
-        specialNotes: "#{randomHits : 10}",
+        specialNotes: "#{randomHits : 3}",
         specialName: "Sorrowful Execution",
     },
     1526: {//Arlong
@@ -8540,7 +8540,7 @@ window.details = {
         specialName: "Song of Scratches: Blizzard Slash",
     },
     1552: {//Coliseum Hajrudin
-        captain: "Boosts ATK of characters with ??? cost by ????x",
+        captain: "Boosts ATK of characters with 40 cost by 2.5x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
         specialName: "Thunder Giant",
     },
@@ -8552,11 +8552,46 @@ window.details = {
     1554: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2x",
         special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
-        specialName: "Ryuma Special",
+        specialName: "Pure Body and Soul",
     },
     1555: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2.25x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
-        specialName: "Ryuma Special",
+        specialName: "Pure Body and Soul",
+    },
+    1556: {//Wadatsumi
+        captain: "Boosts HP of STR characters by 2x",
+        special: "If the HP of the enemy with the highest HP percentage is above 3,000,000 HP, boosts own ATK by 2x for 1 turn",
+        specialName: "Sailboat Sinking Fist",
+    },
+    1557: {//Zeo
+        captain: "Boosts ATK of Strikers characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        special: "Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
+        specialName: "Super Sole Headbutt",
+    },
+    1558: {//Ikaros
+        captain: "Boosts ATK of Shooters characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        special: "Cuts the current HP of each enemy by 15%",
+        specialName: "Stamping Press",
+    },
+    1559: {//Hyouzou
+        captain: "Boosts ATK of Slashers characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        special: "Reduces crew's HP by 50%, deals 55x ATK in Typeless damage to all enemies",
+        specialName: "Disorderly Drunken Frenzy Killing",
+    },
+    1560: {//Daruma
+        captain: "Boosts ATK of Fighters characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        special: "Empties all slots including those with [BLOCK] orbs",
+        specialName: "Daruma Drop",
+    },
+    1561: {//Dosun
+        captain: "Boosts ATK of [INT] characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in [INT] damage to one enemy",
+        specialName: "Explosive Nail Hammer",
+    },
+    1562: {//Hody Jones
+        captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces own ATK multiplier by 0.1x at the end of each turn until it is 1.5x, reduces crew's current HP by 10% at the end of each turn",
+        special: "Deals 60x character's ATK in [QCK] damage to one enemy, increases damage received by 2x for 2 turns, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
+        specialName: "Drugs From Heaven",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index aace3984e..d26f45623 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -7,6 +7,7 @@ window.drops = {
             thumb: 28,
             global: true,
             completion: '5x Rainbow Gems',	
+            gamewith: 3417,
             "01": [ 119, 120 ],
             "02": [ 27, 115, 119, 120 ],
             "03": [ 28, 78, 79, 80, 119, 120 ]
@@ -16,7 +17,9 @@ window.drops = {
             name: "Alvida's Hideout",
             thumb: 29,
             global: true,
-            "Completion Units": [31, 105 ],
+            gamewith: 3418,
+            completion: 'Unlocks Extra Islands',
+            "Completion Units": [ 31, 105 ],
             "01": [ 121, 123, 127, 131, 136 ],
             "02": [ 78, 79, 80, 121, 122, 123, 126, 131, 132, 137, 138, 141 ],
             "03": [ 29, 115, 121, 122, 123, 126, 127, 128, 131, 132, 133, 136, 137, 138, 141, 171 ]
@@ -26,7 +29,8 @@ window.drops = {
             name: "Shells Town",
             thumb: 35,
             global: true,
-            completion: 'Ship: Navy Ship, Unlocks Extra Islands',
+            completion: 'Ship: Navy Ship',
+            gamewith: 3423,
             "Completion Units": [5, 80, 97, 116 ],
             "01": [ 81, 82, 179, 180, 181, 182 ],
             "02": [ 78, 79, 80, 179, 180, 181, 183 ],
@@ -44,6 +48,7 @@ window.drops = {
             thumb: 38,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 3422,
             "01": [ 115, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 134, 135, 174 ],
             "02": [ 78, 121, 126, 136, 142, 147, 170 ],
             "03": [ 40, 80, 123, 124, 128, 129, 130, 133, 134, 135, 138, 139, 140, 144, 149, 154, 158, 159, 171 ],
@@ -64,6 +69,7 @@ window.drops = {
             thumb: 45,
             global: true,
             completion: 'Ship: Merry Go - 5x Rainbow Gems',
+            gamewith: 3424,
             "Completion Units": [13],
             "01": [ 13, 78, 79, 80, 81, 82, 89, 90, 91, 95, 96, 97, 105, 106, 107, 115 ],
             "02": [ 108, 109, 163, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
@@ -85,6 +91,7 @@ window.drops = {
             thumb: 57,
             global: true,
             completion: 'Ship: Baratie - 5x Rainbow Gems',
+            gamewith: 3416,
             "Completion Units": [17],
             "01": [ 48, 131, 132, 133, 136, 137, 138, 140 ],
             "02": [ 49, 116, 117, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
@@ -108,6 +115,7 @@ window.drops = {
             thumb: 65,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 3408,
             "Completion Units": [9],
             "01": [ 89, 121, 126, 131, 136, 141, 142, 147, 152, 156, 157, 158, 159, 160, 162, 170, 173, 175, 178 ],
             "02": [ 90, 122, 127, 132, 137, 141, 143, 148, 153, 155, 157, 158, 159, 161, 162, 172, 174, 177 ],
@@ -131,6 +139,7 @@ window.drops = {
             thumb: 69,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 2807,
             "01": [ 174, 170, 171, 172, 84 ],
             "02": [ 29, 85 ],
             "03": [ 174, 173, 86 ],
@@ -150,6 +159,7 @@ window.drops = {
             thumb: 213,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 3753,
             "01": [ 215, 83, 95, 110 ],
             "02": [ 174, 96, 111, 83 ],
             "03": [ 173, 174, 97, 112, 83 ],
@@ -167,6 +177,7 @@ window.drops = {
             thumb: 201,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 4911,
             "01": [ 237, 238, 239, 110, 118 ],
             "02": [ 111, 118, 240 ],
             "03": [ 84, 118, 235 ],
@@ -189,6 +200,7 @@ window.drops = {
             thumb: 292,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 5419,
             "01": [ 289, 162, 141, 83, 116, 117 ],
             "02": [ 83, 85, 90, 293 ],
             "03": [ 83, 84, 89, 294 ],
@@ -211,6 +223,7 @@ window.drops = {
             thumb: 326,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 6658,
             "Completion Units": [21],
             "01": [ 328, 94, 117 ],
             "02": [ 84, 94, 116, 334 ],
@@ -235,6 +248,7 @@ window.drops = {
             thumb: 383,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 7578,
             "01": [ 116, 300, 301, 302, 303, 304, 378 ],
             "02": [ 69, 300, 301, 302, 303, 304 ],
             "03": [ 113, 114, 184, 185, 186, 300, 301, 302, 303, 304 ],
@@ -257,6 +271,7 @@ window.drops = {
             thumb: 384,
             global: true,
             completion: '10x Rainbow Gems',
+            gamewith: 8949,
             "01": [ 368, 237, 78, 83, 89 ],
             "02": [ 369, 239, 79, 90, 83 ],
             "03": [ 207, 80, 91, 83 ],
@@ -279,6 +294,7 @@ window.drops = {
             thumb: 430,
             global: true,
             completion: 'Ship: Merry Go Flying - 5x Rainbow Gems',
+            gamewith: 9879,
             "01": [ 215, 105, 106, 107, 108, 109, 115, 116, 381 ],
             "02": [ 171, 91, 97, 96 ],
             "03": [ 170, 426, 89, 95 ],
@@ -302,6 +318,7 @@ window.drops = {
             thumb: 467,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 11528,
             "01": [ 488, 487, 489, 493, 494, 116, 117 ],
             "02": [ 468, 469, 92, 93, 98, 99 ],
             "03": [ 468, 469, 303, 304 ],
@@ -325,6 +342,7 @@ window.drops = {
             thumb: 545,
             global: true,
             completion: '10x Rainbow Gems',
+            gamewith: 12130,
             "01": [ 94, 300, 541 ],
             "02": [ 94, 302, 464, 543 ],
             "03": [ 94, 303, 542 ],
@@ -344,6 +362,7 @@ window.drops = {
             thumb: 568,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 12773,
             "01": [ 368, 147, 152, 300 ],
             "02": [ 564, 158, 301 ],
             "03": [ 171, 144, 149, 302 ],
@@ -362,6 +381,7 @@ window.drops = {
             thumb: 632,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 14293,
             "01": [ 614, 87, 88, 266 ],
             "02": [ 84, 85, 86, 173, 174, 237, 238, 239, 266 ],
             "03": [ 110, 266, 615, 616, 617 ],
@@ -385,6 +405,7 @@ window.drops = {
             thumb: 706,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 15599,
             "Completion Units": [708],
             "01": [ 78, 79, 80, 81, 82, 185, 186, 188, 694 ],
             "02": [ 78, 79, 80, 81, 184, 185, 187, 692 ],
@@ -404,6 +425,7 @@ window.drops = {
             thumb: 737,
             global: true,
             completion: 'Ship: Thousand Sunny - 5x Rainbow Gems',
+            gamewith: 16618,
             "Completion Units": [739],
             "01": [ 110 ],
             "02": [ 111 ],
@@ -427,6 +449,7 @@ window.drops = {
             thumb: 816,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 19269,
             "01": [ 89, 90, 91, 387, 817, 818, 819, 820, 821 ],
             "02": [ 89, 90, 91, 92, 93, 812, 817, 818, 819, 820, 821 ],
             "03": [ 116, 817, 818, 819, 820, 821 ],
@@ -446,6 +469,7 @@ window.drops = {
             thumb: 894,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 22436,
             "Completion Units": [895],
             "01": [ 817, 818, 819, 888 ],
             "02": [ 393, 888, 889 ],
@@ -467,6 +491,7 @@ window.drops = {
             thumb: 974,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 24829,
             "01": [ 620, 111, 623, 113, 625, 114, 954, 955, 956 ],
             "02": [ ],
             "03": [ ],
@@ -489,6 +514,7 @@ window.drops = {
             thumb: 1056,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 30491,
             "01": [ 919, 301, 300 ],
             "02": [ 1059, 301, 303 ],
             "03": [ 1068, 1067, 302 ],
@@ -506,6 +532,7 @@ window.drops = {
             thumb: 1159,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 34745,
             "01": [ 931 ],
             "02": [ 540, 931 ],
             "03": [ 1153, 931 ],
@@ -525,11 +552,12 @@ window.drops = {
         },
         
         {
-            name: "Marineford",
+            name: "Marineford Bay",
             shortName: "Marineford",
             thumb: 1228,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 37190,
             "01": [  ],
             "02": [ 1223 ],
             "03": [  ],
@@ -550,6 +578,7 @@ window.drops = {
             thumb: 1283,
             global: true,
             completion: '10x Rainbow Gems',
+            gamewith: 38886,
             "01": [ 1279 ],
             "02": [  ],
             "03": [ 1280 ],
@@ -573,6 +602,7 @@ window.drops = {
             thumb: 1353,
             global: true,
             completion: '5x Rainbow Gems',
+            gamewith: 45559,
             "01": [ 1342 ],
             "02": [ 1343 ],
             "03": [  ],
@@ -593,7 +623,8 @@ window.drops = {
             name: "Return to Sabaody Archipelago",
             shortName: "Straw Hat Return",
             thumb: 1393,
-            completion: '5x Rainbow Gems',
+            completion: 'Ship: Coated Thousand Sunny - 5x Rainbow Gems',
+            gamewith: 46976,
             "01": [  ],
             "02": [  ],
             "03": [ 1393 ],
@@ -606,10 +637,11 @@ window.drops = {
         },
         
         {
-            name: "Fishman Island",
-            shortName: "Fishman Island",
+            name: "Hard-Shell Tower - Dragon Imperial Palace",
+            shortName: "Fishman Island 1",
             thumb: 1506,
             completion: '5x Rainbow Gems',
+            gamewith: 52247,
             "01": [ 1501, 1502 ],
             "02": [ 1502, 340 ],
             "03": [  ],
@@ -626,6 +658,28 @@ window.drops = {
             "14": [ 1505 ],
         },
         
+        {
+            name: "King Neptune's Execution Site - Noah's Ark",
+            shortName: "Fishman Island 2",
+            thumb: 1506,
+            completion: '10x Rainbow Gems',
+            gamewith: 54695,
+            "01": [  ],
+            "02": [  ],
+            "03": [  ],
+            "04": [ 1560 ],
+            "05": [ 1558, 1561 ],
+            "06": [  ],
+            "07": [  ],
+            "08": [  ],
+            "09": [ 1557 ],
+            "10": [ 1558, 1560 ],
+            "11": [ 1561 ],
+            "12": [ 1556 ],
+            "13": [ 1559 ],
+            "14": [ 1505 ],
+        },
+        
     ],
 
     'Weekly Island': [
@@ -1364,10 +1418,17 @@ window.drops = {
         {
             name: "Soul King! Farewell Tour Concert",
             thumb: 1547,
-            //condition: "You can only bring PSY units",
+            condition: "Strawhat Pirates get ATK, HP, and RCV boosted by 1.5x and reduces cooldown of specials by 9 turns at the start of the fight",
             "All Difficulties": [ 1546, 1548, -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
         },
         
+        {
+            name: "Prodence Kingdom",
+            thumb: null,
+            //condition: "You can only bring PSY units",
+            "All Difficulties": [ -1362, -1408, -1414, -941, -991, -308, -1283, -892, -1549, -709 ],
+        },
+        
     ],
 
             
diff --git a/common/data/effects.js b/common/data/effects.js
index 0c3b36fff..f2bec6d08 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -351,4 +351,21 @@ window.effects = {
         orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
         atk: function(p) { return 1.2; }
     },
+    
+    'World Pirates - Boa Stage 1': {
+        description: 'Boosts the ATK of characters with 40 cost or less by 1.5x',
+        thumb: 865,
+        id: 36,
+        atk: function(p) { return p.cost <= 40 ? 1.5 : 1; }
+    },
+   /* 
+    'World Pirates - Boa Secret Stage': {
+        description: 'Locks the chain multiplier at 2.5x',
+        thumb: 1218,
+        id: 37,
+        atk: function(p) { return p.cost <= 40 ? 1.5 : 1; },
+        chain: function(p) { return 2.5; },
+        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+    },*/
+    
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 90027a183..32d077c6b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1513,7 +1513,7 @@ window.evolutions = {
     },
     1015: {
         evolution: 1016,
-        evolvers: [ 82, 266, 88, 304, 104 ]
+        evolvers: [ 82, 83, 88, 304, 104 ]
     },
     1017: {
         evolution: 1018,
@@ -2316,8 +2316,8 @@ window.evolutions = {
         evolvers: [  ]
     },
     1505: {
-        evolution: 1506,
-        evolvers: [ 118, 95, 99, 300, 304 ]
+        evolution: [ 1506, 1562 ],
+        evolvers: [[ 118, 95, 99, 300, 304 ], [ 118, 83, 85, 96, 101 ] ]
     },
     1507: {
         evolution: 1508,
@@ -2397,10 +2397,10 @@ window.evolutions = {
     },
     1552: {
         evolution: 1553,
-        evolvers: [  ]
+        evolvers: [ 118, 94, 95, 300, 100 ]
     },
     1554: {
         evolution: 1555,
-        evolvers: [  ]
+        evolvers: [ 177, 80, 86, 97, 302 ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index f351c28a7..631ceef84 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1554,4 +1554,11 @@ window.families = [
     "Hajrudin",
     "Ryuuma",
     "Ryuuma",
+    "Wadatsumi",
+    "Zeo",
+    "Icaros Much",
+    "Hyouzou",
+    "Daruma",
+    "Dosun",
+    "Hody Jones",
 ];
diff --git a/common/data/gw.js b/common/data/gw.js
index 87af00801..23a2a82bf 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -893,8 +893,8 @@ window.gw=[
     22657,
     22658,
     19289,
-    22436,
-    22436,
+    22659,
+    22659,
     22986,
     22983,
     22987,
@@ -1542,9 +1542,23 @@ window.gw=[
     54002,
     54002,
     54006,
-    null,
-    null,
+    54313,
+    54313,
     54305,
     54305,
     54306,
+    15622,
+    14294,
+    22659,
+    54674,
+    54674,
+    54675,
+    54675,
+    54883,
+    54884,
+    54885,
+    54886,
+    54888,
+    54889,
+    52490,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index e6230d474..885ade0a4 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1477,10 +1477,10 @@ window.specials = {
         atk: function(p) { return p.unit.type == "STR" ? window.specials[1168].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.75 : 1.1);
+            var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
             window.specials[1168].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' ' + (n == 1.75 ? '10%' : n == 1.5 ? '10%' : n == 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
                 name: '1168warning'
             });
         }
@@ -1489,11 +1489,11 @@ window.specials = {
         atk: function(p) { return p.unit.type == "STR" ? window.specials[1169].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.75 : 1.1);
+            var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
             window.specials[1169].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-                name: '1169warning'
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' ' + (n == 1.75 ? '10%' : n == 1.5 ? '10%' : n == 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
+                name: '1168warning'
             });
         }
     },
@@ -2499,5 +2499,27 @@ window.specials = {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
         orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
     },
-    
+    1556: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type",
+        warning: "Selected special (%name%) assumes that the enemy has over 3,000,000 HP."
+    },
+    1557: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1557].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1557].turnedOn = false;
+        },
+        type: "class"
+    },
+    1561: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
+    },
+    1562: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index ce8a9adaa..1223c7881 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1259,8 +1259,8 @@ window.units = [
     [ "'Whitebeard' Edward Newgate, Grand Pirate", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
     [ "Donquixote Doflamingo, Pirates of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
     [ "Donquixote Doflamingo, Darkness of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
-    [ "Senior Pink, Pirates of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
-    [ "Senior Pink, Darkness of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
+    [ "Señor Pink, Pirates of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
+    [ "Señor Pink, Darkness of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
     [ "Vergo, Pirates of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
     [ "Vergo, Darkness of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
     [ "Ace, Wasting Time Until Twilight", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, 392109, 152, 90, 30, 961, 584, 174, 1 ],
@@ -1547,13 +1547,20 @@ window.units = [
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
     [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
     [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
-    [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, null, null, null, 2105, 1187, 401, null ],
-    [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, null, null, null, 2687, 1359, 244, null ],
-    [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, null, null, null, 2204, 1277, 351, null ],
-    [ "Coliseum Hajrudin", "STR", [ "Powerhouse", "Striker" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Hajrudin, Evolved", "STR", [ "Powerhouse", "Striker" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Ryuma", "DEX", "Slasher", 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Ryuma, Evolved", "DEX", "Slasher", 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 979, 487, 171, 2105, 1187, 401, 1 ],
+    [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1655, 803, 91, 2687, 1359, 244, 1 ],
+    [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 1043, 481, 187, 2204, 1277, 351, 1 ],
+    [ "Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 4, 25, 4, 1, 70, 1066998, 551, 299, 21, 1306, 757, 139, 1 ],
+    [ "Pirate Mercenary Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1225, 683, 89, 2840, 1381, 206, 1 ],
+    [ "Ryuma, Samurai General Zombie", "DEX", "Slasher", 3, 16, 6, 1, 50, 392109, 131, 111, 0, 1094, 525, 99, 1 ],
+    [ "Swordsman Ryuma, Samurai General Zombie", "DEX", "Slasher", 4, 26, 6, 3, 99, 3000000, 1031, 450, 99, 2017, 1192, 244, 1 ],
+    [ "Wadatsumi", "STR", [ "Powerhouse", "Fighter" ], 3, 30, 6, 2, 70, 1066998, 436, 106, 0, 3000, 801, 0, 1 ],
+    [ "Zeo", "PSY", [ "Striker", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 91, 62, 31, 1135, 882, 261, 1 ],
+    [ "Ikaros", "DEX", [ "Powerhouse", "Shooter" ], 3, 15, 10, 2, 70, 1066998, 99, 49, 33, 1231, 809, 270, 1 ],
+    [ "Hyouzou", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 2, 70, 1066998, 106, 99, -555, 1931, 1255, -555, 1 ],
+    [ "Daruma", "QCK", [ "Powerhouse", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 70, 83, 24, 1039, 1191, 173, 1 ],
+    [ "Dosun", "INT", [ "Powerhouse", "Striker" ], 3, 15, 4, 2, 70, 1066998, 101, 77, 18, 1465, 1092, 133, 1 ],
+    [ "Hody Jones, Rampage", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1115, 660, 0, 3115, 1395, -150, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index af2fe5712..4bd8a186b 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -189,7 +189,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
                                  || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))) ? 2 : 1;
-            if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn) ? 1 : .5;
+            if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
@@ -734,7 +734,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         }
         if ($scope.data.comboShield) mapEffect.comboShield = $scope.data.comboShield;
         if ($scope.data.comboType) mapEffect.comboType = $scope.data.comboType;
-        
         // team
         team = $scope.data.team.map(function(x,n) {
             if (!$scope.tdata.team[n] || $scope.tdata.team[n].removed)
@@ -754,7 +753,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));
             }
             // activate turn counter if necessary
-            if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525))
+            if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562))
                 $scope.tdata.turnCounter.enabled = true;
         });
         if (conflictWarning) 
@@ -913,7 +912,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         }
         if (shipBonus.bonus && shipBonus.bonus.heal)
             healAmount += shipBonus.bonus.heal({ boatLevel: shipBonus.level, classCount: classCounter() });
-        //console.log($scope.data.healLevel);
         switch($scope.data.healLevel){
             case "0":
                 break;
diff --git a/damage/js/utils.js b/damage/js/utils.js
index cdf8030ef..ae8a7dca3 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -112,7 +112,7 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
-    if(window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn){
+    if(window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn){
         if (orb == 0.5) return baseMultiplier;
     }
     if (orb == 1.0 || orb == 'str') return baseMultiplier;
diff --git a/drops/index.html b/drops/index.html
index 327446b4c..309a179e0 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -76,6 +76,12 @@ <h3>
                         <td>Completion</td>
                         <td colspan="2">{{island.completion}} </td>
                     </tr>
+                    <tr ng-if="island.gamewith" hide-when-empty>
+                        <td>Gamewith</td>
+                        <td colspan="2">
+                            <a href = "https://トレクル.gamewith.jp/article/show/{{island.gamewith}}">Gamewith Page</a>
+                        </td>
+                    </tr>
                     <tr ng-if="island.condition" hide-when-empty>
                         <td>Condition</td>
                         <td colspan="2">{{island.condition}} </td>
@@ -92,7 +98,7 @@ <h3>
                 </tbody>
                 <tbody>
                     <tr ng-repeat="(stage,data) in island"
-                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion' && stage != 'challengeData' && stage != 'showManual'">
+                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion' && stage != 'challengeData' && stage != 'showManual' && stage != 'gamewith'">
                         <td>
                             {{type == 'Story Island'&& stage!='Completion Units' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
                         </td>

From 0f3c6b7e2d155b5cfd4bdf425bdd37830ccfd9b0 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 14 Apr 2017 21:04:03 -0400
Subject: [PATCH 0971/1569] Hody icon

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index d26f45623..dc83a8b60 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -661,7 +661,7 @@ window.drops = {
         {
             name: "King Neptune's Execution Site - Noah's Ark",
             shortName: "Fishman Island 2",
-            thumb: 1506,
+            thumb: 1562,
             completion: '10x Rainbow Gems',
             gamewith: 54695,
             "01": [  ],

From 937232b37c50198407db8397912eba79304efa7e Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sat, 15 Apr 2017 16:11:21 -0400
Subject: [PATCH 0972/1569] Hajrudin

---
 common/data/captains.js | 2 +-
 common/data/specials.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index ce2a91ab3..3400d5a8c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4516,7 +4516,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1552: {
-        atk: function(p) { return p.unit.cost == 40 ? 1 : 1; },
+        atk: function(p) { return p.unit.cost == 40 ? 2.5 : 1; },
     },
     1553: {
         atk: function(p) { return p.unit.cost == 40 ? 2.75 : 1; },
diff --git a/common/data/specials.js b/common/data/specials.js
index 885ade0a4..987d429de 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2487,9 +2487,11 @@ window.specials = {
     },
     1552: {
         atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
+        type: "class"
     },
     1553: {
         atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
+        type: "class"
     },
     1554: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },

From 4d7795a5f4d6c71fa5b0edcff6e9281f7689a6a3 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 17 Apr 2017 04:41:14 -0400
Subject: [PATCH 0973/1569] New Elizabello

and some wording convention changes to make it the same
---
 common/data/captains.js   |  16 +++++
 common/data/details.js    | 140 ++++++++++++++++++++++++--------------
 common/data/drops.js      |   4 +-
 common/data/effects.js    |   4 +-
 common/data/evolutions.js |   8 +++
 common/data/families.js   |   4 ++
 common/data/units.js      |   4 ++
 7 files changed, 125 insertions(+), 55 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 3400d5a8c..f171bbec0 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4560,4 +4560,20 @@ window.captains = {
             return p.unit.class.has("Powerhouse") ? Math.max(1.5, 3.5 - 0.1 * p.turnCounter) : 1;
         }
     },
+    1563: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Fighter", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.1875 : 1.75;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1564: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Fighter", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 040bf2d51..e3af2030b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3876,7 +3876,7 @@ window.details = {
     },
     853: {
         specialName: "Robson: Serious Mode",
-        special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Powerhouse and Fighters characters by 1.2x for 3 turns"
+        special: "Following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Powerhouse and Fighter characters by 1.2x for 3 turns"
     },
     854: {
         captain: "Boosts ATK of DEX chracters by 1.5x, reduces damage received by 10%",
@@ -4620,11 +4620,11 @@ window.details = {
         specialName: "Yata no Kagami (Sacred Mirror)",
         special: [
             {
-                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn",
                 "cooldown": [ 19, 5 ]
             },
             {
-                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn. Adds .5x to Chain multiplier for 2 turns",
                 "cooldown": [ 25, 11 ]
             }
         ],
@@ -4635,12 +4635,12 @@ window.details = {
         specialName: "Yata no Kagami (Sacred Mirror)",
         special: [
             {
-                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn",
-                "cooldown": [19,5]
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn",
+                "cooldown": [ 19, 5 ]
             },
             {
-                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooters and Fighters by 1 turn. Adds .5x to Chain multiplier for 2 turns",
-                "cooldown": [25,11]
+                "description": "Changes own orb into [QCK]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn. Adds .5x to Chain multiplier for 2 turns",
+                "cooldown": [ 25, 11 ]
             }
         ],
         specialNotes: "#{stages}"
@@ -4657,7 +4657,7 @@ window.details = {
         special: "Changes own orb into [DEX] and randomizes every other orb"
     },
     981: {
-        captain: "Boosts ATK of Fighters and Powerhouse characters by 2x and sharply reduces their RCV",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 2x and sharply reduces their RCV",
         captainNotes: "The RCV Reduction is around 90%",
         specialName: "Martial Art Diving Fist",
         special: "Boosts own ATK by 1.75x for 1 turn and deals 800 fixed damage to one enemy",
@@ -4722,11 +4722,11 @@ window.details = {
         specialName: "Peeping Mind",
         special: [
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
                 "cooldown": [ 13, 7 ]
             },
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
                 "cooldown": [ 20, 14 ]
             }
         ],
@@ -4740,11 +4740,11 @@ window.details = {
         specialName: "Peeping Mind",
         special: [
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighters by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
                 "cooldown": [ 13, 7 ]
             },
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighters by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
                 "cooldown": [ 20, 14 ]
             }
         ],
@@ -4936,12 +4936,12 @@ window.details = {
         specialName: "Eight-Impact Fist! Blow of Resentment"
     },
     1026: {
-        captain: "Boosts ATK and RCV of Fighters by 1.5x",
+        captain: "Boosts ATK and RCV of Fighter characters by 1.5x",
         specialName: "Shooting Moon",
         special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
     },
     1027: {
-        captain: "Boosts ATK and RCV of Fighters by 2x",
+        captain: "Boosts ATK and RCV of Fighter characters by 2x",
         specialName: "Shooting Moon",
         special: "Changes Captain orb into Matching orb, and switches orbs between slots three times"
     },
@@ -4969,12 +4969,12 @@ window.details = {
     },
     1032: {
         captain: "Boosts ATK of Striker and Slasher characters by 1.5x and reduces cooldown of Slasher and Striker characters by 1 turn at the start of the fight",
-        special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+        special: "Reduces Special Cooldown of Slasher and Striker specials by 1 turn. For Slasher and Striker characters, changes Badly Matching orbs into [RCV] orbs.",
         specialName: "Surprise Pincer Attack"
     },
     1033: {
         captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turns at the start of the fight",
-        special: "Reduces Special Cooldown of Slasher and Strikers by 1 turn. For Slasher and Strikers, changes Badly Matching orbs into [RCV] orbs.",
+        special: "Reduces Special Cooldown of Slasher and Striker specials by 1 turn. For Slasher and Striker characters, changes Badly Matching orbs into [RCV] orbs.",
         specialName: "Surprise Pincer Attack"
     },
     1034: {
@@ -5025,12 +5025,12 @@ window.details = {
     },
     1042: {
         captain: "Boosts ATK of Striker and Slasher characters by 2x, reduces crew's RCV to 0.",
-        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers into matching orbs, cuts the current HP of one enemy by 7%",
+        special: "Changes [STR] and [QCK] orbs on Striker and Slasher characters into matching orbs, cuts the current HP of one enemy by 7%",
         specialName: "Hitting Size"
     },
     1043: {
         captain: "Boosts ATK of Striker and Slasher characters by 2.75x if they have a matching Orb, by 2x otherwise, reduces crew's RCV to 0.",
-        special: "Changes [STR] and [QCK] orbs on Strikers and Slashers into matching orbs, cuts the current HP of one enemy by 7%",
+        special: "Changes [STR] and [QCK] orbs on Striker and Slasher characters into matching orbs, cuts the current HP of one enemy by 7%",
         specialName: "Hitting Size"
     },
     1044: {
@@ -5562,13 +5562,13 @@ window.details = {
         specialName: "Slicing Winds of Rommel"
     },
     1124: {
-        captain: "Boosts ATK of Slashers characters by 3x, reduces his own ATK multiplier by 0.1x at the end of each turn",
+        captain: "Boosts ATK of Slasher characters by 3x, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 3x on the first turn, 2.9x on the second, 2.8x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
         special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
         specialName: "Idle Execution"
     },
     1125: {
-        captain: "Boosts ATK of Slashers characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
+        captain: "Boosts ATK of Slasher characters by 3.5x, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 3.5x on the first turn, 3.4x on the second, 3.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Slasher characters.",
         special: "Deals 13x character's ATK in [PSY] damage to all enemies, changes own orb and captain's orb into Matching orbs.",
         specialName: "Idle Execution"
@@ -6156,7 +6156,7 @@ window.details = {
         specialName: "Everybody Confusing Fragrance",
     },
     1219: {//Byrnndi World Coliseum
-        captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x If you did not defeat an enemy, lose all ATK boost stacks.",
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
@@ -6174,7 +6174,7 @@ window.details = {
         specialName: "More More, 10 Times \"Iron Hammer\"",
     },
     1220: {//Byrnndi World Coliseum
-        captain: "Boosts ATK of Shooters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x If you did not defeat an enemy, lose all ATK boost stacks.",
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
@@ -6470,12 +6470,12 @@ window.details = {
     1255: {//FN DeCalvan
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2x after the 16th hit, by 2.5x after the 22nd hit",
         special: "For 1 turn, makes Perfects slightly easier to hit and amplifies the effect of orbs by 1.5x",
-        sailor: "When HP is below 30% at the start of the turn, boost base ATK of Fighters by 40",
+        sailor: "When HP is below 30% at the start of the turn, boost base ATK of Fighter characters by 40",
         specialName: "Large Fleet Commander",
     },
     1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
-        special: "Shuffle non-matching orbs on Slashers and Driven characters, boost Atk against enemies with increased defense by 1.3x for 1 turn",
+        special: "Shuffle non-matching orbs on Slasher and Driven characters, boost Atk against enemies with increased defense by 1.3x for 1 turn",
         sailor: "Boosts ATK and RCV of Driven characters by 10",
         specialName: "Icebreaker Breakthrough Force",
     },
@@ -7000,7 +7000,7 @@ window.details = {
                 "cooldown": [ 11, 5 ],
             },
             {
-                "description": "Deals 300 fixed damage to all enemies. Boosts the Color Affinity of Fighters and Free Spirit characters by 1.25x",
+                "description": "Deals 300 fixed damage to all enemies. Boosts the Color Affinity of Fighter and Free Spirit characters by 1.25x",
                 "cooldown": [ 16, 10 ],
             },
         ],
@@ -7197,15 +7197,15 @@ window.details = {
         specialName: "Gum-Gum Twin Jet Pistol: Snowflake",
     },
     1361: {//6* Zoro
-        captain: "If you have 5 or more Slashers on your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slashers by 3x instead",
+        captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
-        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slashers by 2x for 1 turn. If he is a Sailor, boosts ATK by 1.75x for 1 turn",
+        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1362: {//6* Zoro
-        captain: "If you have 5 or more Slashers on your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slashers by 3x instead",
+        captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
-        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slashers by 2x for 1 turn. If he is a Sailor, boosts ATK by 1.75x for 1 turn",
+        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1363: {//Timeskip Franky
@@ -7499,11 +7499,11 @@ window.details = {
         captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.275x bonus.",
         special: [
             {
-                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooters by 1.5x for 1 turn",
+                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
@@ -7515,11 +7515,11 @@ window.details = {
         captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.625x bonus.",
         special: [
             {
-                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooters by 1.5x for 1 turn",
+                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooters by 1.75x for 1 turn",
+                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
@@ -7571,18 +7571,18 @@ window.details = {
         specialName: "Gomu Gomu no Red Hawk",
     },
     1405: {//Timeskip Usopp
-        captain: "Boost ATK of Shooters by 1.75x, and their RCV by 1.25x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs for Shooters by 1.75x for 1 turn",
+        captain: "Boost ATK of Shooter characters by 1.75x, and their RCV by 1.25x",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooter characters by 100",
     },
     1406: {//Timeskip Usopp
-        captain: "Boost ATK of Shooters by 2.25x, and their RCV by 1.5x",
-        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooters by 1.75x and amplifies the effect of orbs for Shooters by 1.75x for 1 turn",
+        captain: "Boost ATK of Shooter characters by 2.25x, and their RCV by 1.5x",
+        special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooter characters by 100",
     },
     1407: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
@@ -7759,14 +7759,14 @@ window.details = {
         specialName: "Water Bullets",
     },
     1435: {//Hyouzou
-        captain: "Boosts ATK of Slashers by 2x and HP of Powerhouse characters by 1.2x",
+        captain: "Boosts ATK of Slasher characters by 2x and HP of Powerhouse characters by 1.2x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
         sailor: "Boost ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1436: {//Hyouzou
-        captain: "Boosts ATK of Slashers by 2.5x and HP of Powerhouse characters by 1.25x",
+        captain: "Boosts ATK of Slasher characters by 2.5x and HP of Powerhouse characters by 1.25x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
@@ -7833,7 +7833,7 @@ window.details = {
         captainNotes: "#{captainProportional : higher : 2.25 + 0.5 * (remaining HP) / (total HP) : 2.75 : 2.25}"
     },
     1446: {//Sogeking 5+
-        captain: "Boosts ATK of Shooters by 2x and RCV of Shooters by 1.25x.",
+        captain: "Boosts ATK of Shooter characters by 2x and RCV of Shooter characters by 1.25x.",
         special: "Deals random PSY damage to all enemies and delays enemies by 3 turns.",
         specialName: "Green Star: Platanus Shuriken",
     },
@@ -8118,13 +8118,13 @@ window.details = {
     },
     1486: {//Coliseum Ideo
         captain: "Boosts ATK of Fighter characters by 2.5x if they have a matching orb.",
-        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for fighters by 2x for 1 turn",
+        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         specialName: "Destruction Cannon: Hidden Bullet",
     },
     1487: {//Coliseum Ideo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 3x if they have a matching orb.",
-        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for fighters by 2x for 1 turn",
+        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         specialName: "Destruction Cannon: Hidden Bullet",
     },
@@ -8341,7 +8341,7 @@ window.details = {
         sailor: "Boosts amount healed from [RCV] orbs by 124 each",
     },
     1525: {//Sulieman
-        captain: "Boosts ATK of Slashers characters by 3.25x, reduces his own ATK multiplier by 0.0625x at the end of each turn until it is 2x",
+        captain: "Boosts ATK of Slasher characters by 3.25x, reduces his own ATK multiplier by 0.0625x at the end of each turn until it is 2x",
         special: "Deals 3 hits of random typeless damage to random enemies, delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.3x for 2 turns",
         specialNotes: "#{randomHits : 3}",
         specialName: "Sorrowful Execution",
@@ -8455,13 +8455,13 @@ window.details = {
         specialName: "Prideful Memories",
     },
     1537: {//Heracles'n
-        captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooters and Strikers by 1.2x",
+        captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooter and Striker characters by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Greenstone Threat",
     },
     1538: {//Heracles'n
-        captain: "Boosts ATK of [STR] characters by 2.5x and boosts HP of Shooters and Strikers by 1.25x",
+        captain: "Boosts ATK of [STR] characters by 2.5x and boosts HP of Shooter and Striker characters by 1.25x",
         special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Greenstone Threat",
@@ -8565,22 +8565,22 @@ window.details = {
         specialName: "Sailboat Sinking Fist",
     },
     1557: {//Zeo
-        captain: "Boosts ATK of Strikers characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        captain: "Boosts ATK of Striker characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
         specialName: "Super Sole Headbutt",
     },
     1558: {//Ikaros
-        captain: "Boosts ATK of Shooters characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        captain: "Boosts ATK of Shooter characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Cuts the current HP of each enemy by 15%",
         specialName: "Stamping Press",
     },
     1559: {//Hyouzou
-        captain: "Boosts ATK of Slashers characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        captain: "Boosts ATK of Slasher characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Reduces crew's HP by 50%, deals 55x ATK in Typeless damage to all enemies",
         specialName: "Disorderly Drunken Frenzy Killing",
     },
     1560: {//Daruma
-        captain: "Boosts ATK of Fighters characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
+        captain: "Boosts ATK of Fighter characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Empties all slots including those with [BLOCK] orbs",
         specialName: "Daruma Drop",
     },
@@ -8594,4 +8594,42 @@ window.details = {
         special: "Deals 60x character's ATK in [QCK] damage to one enemy, increases damage received by 2x for 2 turns, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
         specialName: "Drugs From Heaven",
     },
+    1563: {//Elizabello
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.75x at the start of the chain and by 2.1875x after the 5th Perfect",
+        special: [
+            {
+                "description": "Changes own orb into [STR], deals 10 hits of 3x chatacter's ATK in typeless damage to random enemies",
+                "cooldown": [ null, null ],
+            },
+            {
+                "description": "Changes own orb into [STR], deals 10 hits of 15x chatacter's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
+                "cooldown": [ null, null ],
+            },
+        ],
+        specialName: "Elizabello Special",
+    },
+    1564: {//Elizabello
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect",
+        special: [
+            {
+                "description": "Changes own orb into [STR], deals 10 hits of 3x chatacter's ATK in typeless damage to random enemies",
+                "cooldown": [ null, null ],
+            },
+            {
+                "description": "Changes own orb into [STR], deals 10 hits of 15x chatacter's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
+                "cooldown": [ null, null ],
+            },
+        ],
+        specialName: "Elizabello Special",
+    },
+    1565: {//Dagama
+        captain: "Not Released",
+        special: "Not Released",
+        specialName: "Dagama Special",
+    },
+    1566: {//Dagama
+        captain: "Not Released",
+        special: "Not Released",
+        specialName: "Dagama Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index dc83a8b60..90e6e5caa 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1424,9 +1424,9 @@ window.drops = {
         
         {
             name: "Prodence Kingdom",
-            thumb: null,
+            thumb: 1564,
             //condition: "You can only bring PSY units",
-            "All Difficulties": [ -1362, -1408, -1414, -941, -991, -308, -1283, -892, -1549, -709 ],
+            "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
         },
         
     ],
diff --git a/common/data/effects.js b/common/data/effects.js
index f2bec6d08..a19f84cc0 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -353,10 +353,10 @@ window.effects = {
     },
     
     'World Pirates - Boa Stage 1': {
-        description: 'Boosts the ATK of characters with 40 cost or less by 1.5x',
+        description: 'Boosts the ATK of characters with 30 cost or less by 1.5x',
         thumb: 865,
         id: 36,
-        atk: function(p) { return p.cost <= 40 ? 1.5 : 1; }
+        atk: function(p) { return p.cost <= 30 ? 1.5 : 1; }
     },
    /* 
     'World Pirates - Boa Secret Stage': {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 32d077c6b..131507d7f 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2403,4 +2403,12 @@ window.evolutions = {
         evolution: 1555,
         evolvers: [ 177, 80, 86, 97, 302 ]
     },
+    1563: {
+        evolution: 1564,
+        evolvers: [  ]
+    },
+    1565: {
+        evolution: 1566,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 631ceef84..c8b439f4f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1561,4 +1561,8 @@ window.families = [
     "Daruma",
     "Dosun",
     "Hody Jones",
+    "Elizabello",
+    "Elizabello",
+    "Dagama",
+    "Dagama",
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 1223c7881..5ca1d51f5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1561,6 +1561,10 @@ window.units = [
     [ "Daruma", "QCK", [ "Powerhouse", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 70, 83, 24, 1039, 1191, 173, 1 ],
     [ "Dosun", "INT", [ "Powerhouse", "Striker" ], 3, 15, 4, 2, 70, 1066998, 101, 77, 18, 1465, 1092, 133, 1 ],
     [ "Hody Jones, Rampage", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1115, 660, 0, 3115, 1395, -150, 1 ],
+    [ "Fortnight Elizabello", "STR", [ "Fighter", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Elizabello, Evolved", "STR", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Dagama, Evolved", "DEX", [ "Driven", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 7a05680a6560d73e9fe0228e6aa661076201ef5c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 18 Apr 2017 16:18:58 -0400
Subject: [PATCH 0974/1569] FN Gamewith Pages and Elizabello

No his sailor isn't working
---
 common/data/captains.js  |  6 +++
 common/data/cooldowns.js |  4 ++
 common/data/details.js   | 26 +++++++------
 common/data/drops.js     | 80 ++++++++++++++++++++++++++++++++++++++++
 common/data/flags.js     | 18 ++++-----
 common/data/gw.js        |  4 ++
 common/data/units.js     |  8 ++--
 7 files changed, 121 insertions(+), 25 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index f171bbec0..730d7db8b 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4576,4 +4576,10 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1565: {
+        atk: function(p) { return 1.75; }
+    },
+    1566: {
+        atk: function(p) { return 2; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b212d1a1d..4c738ca81 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1561,4 +1561,8 @@ window.cooldowns = [
     11,
     23,
     15,
+    null,//Fortnight Elizabello
+    null,//Fortnight Elizabello
+    15,
+    15,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index e3af2030b..092f51052 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8599,37 +8599,39 @@ window.details = {
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x chatacter's ATK in typeless damage to random enemies",
-                "cooldown": [ null, null ],
+                "cooldown": [ 17, 9 ],
             },
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 15x chatacter's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ null, null ],
+                "cooldown": [ 24, 16 ],
             },
         ],
-        specialName: "Elizabello Special",
+        specialName: "Battle Royale Rush",
+        sailor: "Boosts own ATK by 350 if this character is the last in the chain to attack",
     },
     1564: {//Elizabello
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect",
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x chatacter's ATK in typeless damage to random enemies",
-                "cooldown": [ null, null ],
+                "cooldown": [ 17, 9 ],
             },
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 15x chatacter's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ null, null ],
+                "cooldown": [ 24, 16 ],
             },
         ],
-        specialName: "Elizabello Special",
+        specialName: "Battle Royale Rush",
+        sailor: "Boosts own ATK by 350 if this character is the last in the chain to attack",
     },
     1565: {//Dagama
-        captain: "Not Released",
-        special: "Not Released",
-        specialName: "Dagama Special",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 1.75x",
+        special: "Reduces Special Cooldown of all characters by 1 turn and reduces crew's current HP by 10%",
+        specialName: "War of Mislead Order",
     },
     1566: {//Dagama
-        captain: "Not Released",
-        special: "Not Released",
-        specialName: "Dagama Special",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 2x",
+        special: "Reduces Special Cooldown of all characters by 1 turn and reduces crew's current HP by 10%",
+        specialName: "War of Mislead Order",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 90e6e5caa..cbbc607c7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -770,6 +770,7 @@ window.drops = {
             thumb: 39,
             global: true,
             condition: "None",
+            gamewith: 6600,
             Expert: [ 36, 37, 38, 99, 109, 114, -4, -1387 ],
             Elite: [ 36, 37, 38, 99, 109, 114, -3 ]
         },
@@ -779,6 +780,7 @@ window.drops = {
             thumb: 30,
             global: true,
             condition: "None",
+            gamewith: 7457,
             Expert: [ 28, 29, 31, 40, 84, 95, 110, 117, -30, -21, -8, -1388 ],
             Elite: [ 28, 29, 31, 40, 95, 105, 110, -21, -7 ]
         },
@@ -788,6 +790,7 @@ window.drops = {
             thumb: 46,
             global: true,
             condition: "None",
+            gamewith: 7784,
             Expert: [ 41, 42, 43, 45, -16, -1446 ],
             Elite: [ 41, 42, 43, 45, 96, 106, 111, -15 ]
         },
@@ -797,6 +800,7 @@ window.drops = {
             thumb: 66,
             global: true,
             condition: "None",
+            gamewith: 5852,
             Expert: [ 61, 62, 63, 65, 89, 95, 105, 110, -12, -66, -1389 ],
             Elite: [ 61, 62, 63, 65, 95, 105, 110, -11 ]
         },
@@ -806,6 +810,7 @@ window.drops = {
             thumb: 58,
             global: true,
             condition: "None",
+            gamewith: 8111,
             Expert: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20 ],
             Elite: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20, -1447, -19 ]
         },
@@ -815,6 +820,7 @@ window.drops = {
             thumb: 228,
             global: true,
             condition: "None",
+            gamewith: 22603,
             "All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22, -1448 ]
         },
 
@@ -823,6 +829,7 @@ window.drops = {
             thumb: 232,
             global: true,
             condition: "None",
+            gamewith: 5853,
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['450,000','1x ATK Cotton Candy'],['750,000','3x Rainbow Gems']],
             Expert: [ 43, 49, 79, 85, 96, 106, 231, -230, -229, -221, -208, -62, -54 ],
@@ -834,6 +841,7 @@ window.drops = {
             thumb: 263,
             global: true,
             condition: "None",
+            gamewith: 5777,
             challenge:'Total number of hits above 50,000',
             challengeData: [['5 Times','1x Yellow Elder'],['15 Times','1x ATK Cotton Candy'],['25 Times','3x Rainbow Gems']],
             "All Difficulties": [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ]
@@ -844,6 +852,7 @@ window.drops = {
             thumb: 268,
             global: true,
             condition: "None",
+            gamewith: 6725,
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems, 1x Forbidden Tome']],
             "All Difficulties": [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
@@ -854,6 +863,7 @@ window.drops = {
             thumb: 297,
             global: true,
             condition: "None",
+            gamewith: 9181,
             Expert: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -217, -202, -200, -199 ],
             Elite: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -202, -200 ]
         },
@@ -862,6 +872,7 @@ window.drops = {
             name: 'Kalifa\'s Secret Assignment',
             thumb: 318,
             global: true,
+            gamewith: 6204,
             condition: 'You may only bring STR units into this island',
             "All Difficulties": [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ]
         },
@@ -870,6 +881,7 @@ window.drops = {
             name: 'Lucci\'s Artisan Spirit',
             thumb: 322,
             global: true,
+            gamewith: 5776,
             condition: 'You may only bring DEX units for 15 and 30 Stamina',
             "All Difficulties": [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ]
         },
@@ -878,6 +890,7 @@ window.drops = {
             name: 'Franky - Pervert\'s Aesthetic!',
             thumb: 337,
             global: true,
+            gamewith: 22596,
             condition: 'You may only bring INT units for 15 and 30 Stamina',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['150,000 Damage','1x Yellow Elder'],['400,000 Damage','1x ATK Cotton Candy'],['800,000 Damage','3x Rainbow Gems']],
@@ -889,6 +902,7 @@ window.drops = {
             name: 'Deep Sea Kraken',
             thumb: 341,
             global: true,
+            gamewith: 26802,
             condition: 'You may only bring QCK units for 15 and 30 Stamina',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['200,000 Points','1x Red Elder'],['400,000 Points','1x HP Cotton Candy'],['700,000 Points','3x Rainbow Gems']],
@@ -899,6 +913,7 @@ window.drops = {
             name: 'Dr. Hogback\'s Lab of the Dead',
             thumb: 386,
             global: true,
+            gamewith: 25982,
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Defence Boost Forbidden Tome']],
@@ -909,6 +924,7 @@ window.drops = {
             name: 'Perona\'s Worden Garden',
             thumb: 392,
             global: true,
+            gamewith: 7767,
             condition: 'You can only get STR, QCK, INT and Food Orbs',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['3 Times','1x Green Elder'],['12 Times','1x RCV Cotton Candy'],['25 Times','3x Rainbow Gems']],
@@ -919,6 +935,7 @@ window.drops = {
             name: 'Perv-salom\'s Manly Adventure',
             thumb: 405,
             global: true,
+            gamewith: 6332,
             condition: 'You can only get QCK, DEX, PSY and Food Orbs',
             "All Difficulties": [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20, -1447 ]
         },
@@ -927,6 +944,7 @@ window.drops = {
             name: 'Rising Sun, Rising Fortunes',
             thumb: 420,
             global: true,
+            gamewith: null,
             condition: "None",
             "All Difficulties": [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8, -1388 ]
         },
@@ -935,6 +953,7 @@ window.drops = {
             name: 'Adrift!? Humming Brook',
             thumb: 424,
             global: true,
+            gamewith: 7161,
             condition: 'You can only get STR, DEX, INT and PSY Orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['500,000 Damage','1x Black Elder'],['1,500,000 Damage','1x ATK Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
@@ -945,6 +964,7 @@ window.drops = {
             name: 'Maiden in Love - First Sight',
             thumb: 436,
             global: true,
+            gamewith: 7785,
             challenge: 'Damage dealt in a single Round',
             challengeData: [['350,000','1x Black Elder'], ['900,000','1x HP Cotton Candy'], ['2,000,000','3x Rainbow Gems']],
             condition: 'Each non-Okama in your Team will take 60 Damage each turn',
@@ -955,6 +975,7 @@ window.drops = {
             name: 'Supersonic Duck Squadron!',
             thumb: 445,
             global: true,
+            gamewith: 7556,
             condition: 'Higher Chance of Food orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['450,000 Damage','1x Yellow Elder'],['1,250,000 Damage','1x RCV Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
@@ -965,6 +986,7 @@ window.drops = {
             name: 'Prison Break! Baroque Works',
             thumb: 462,
             global: true,
+            gamewith: 5924,
             condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Slasher class characters are weakened (Note: Multi-class characters such as Fighter / Powerhouse are not affected)',
             challenge: 'Damage dealt in a single Round',
             challengeData: [['???','1x ??? Elder'], ['???','1x ?? Cotton Candy'], ['???','3x Rainbow Gems']],
@@ -975,6 +997,7 @@ window.drops = {
             name: 'Crocodile: Life on the Inside',
             thumb: 510,
             global: true,
+            gamewith: 5784,
             condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened (Note: Multi-class characters such as Striker / Slasher are not affected)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x Cooldown Reduction Forbidden Tome, 2x Rainbow Gems']],
@@ -985,6 +1008,7 @@ window.drops = {
             name: 'Jailer Domino\' Special Guard',
             thumb: 538,
             global: true,
+            gamewith: 7565,
             condition: '30: Non-Shooter, Evolver, or Booster class characters are weakend; 15: Fighter and Slasher class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Yellow Elder'],['2,000,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['5,000,000 Damage','1x Matching Orb Forbidden Tome, 2x Rainbow Gems']],
@@ -995,6 +1019,7 @@ window.drops = {
             name: 'Chief Jailer Sadie: Cruel and Unusual',
             thumb: 550,
             global: true,
+            gamewith: 6225,
             condition: '30: Non-Slasher, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Black Elder'],['2,000,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['5,000,000 Damage','1x Defence Boost Forbidden Tome, 2x Rainbow Gems']],
@@ -1005,6 +1030,7 @@ window.drops = {
             name: 'Brother Soul! Afro Luffy!',
             thumb: 571,
             global: true,
+            gamewith: 5857,
             challenge: 'Total number of hits over 50,000',
             challengeData: [['3 Times','1x Red Elder'],['12 Times','1x RCV Cotton Candy'],['34 Times','3x Rainbow Gems & 1x Forbidden Tome']],
             "All Difficulties": [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ]
@@ -1014,6 +1040,7 @@ window.drops = {
             name: 'Warriors of Shandia! Dreams of a Homeland!',
             thumb: 583,
             global: true,
+            gamewith: 25677,
             condition: 'All Units considered from the “Sea” will lose 20% to all stats',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Black Elder'],['16 Times','1x ATK Cotton Candy'],['38 Times','3x Rainbow Gems']],
@@ -1024,6 +1051,7 @@ window.drops = {
             name: 'Pirate Apprentices! Shanks and Buggy',
             thumb: 599,
             global: true,
+            gamewith: 6333,
             condition: 'You cannot use any two units that are the same',
             Expert: [ 598, 600, -504, -467, -463, -414, -372, -332, -310, -77 ],
             Elite: [ 598, 600, -467, -463, -414, -372, -332, -310, -77 ]
@@ -1033,6 +1061,7 @@ window.drops = {
             name: 'Raging Cook! Red Leg Zeff',
             thumb: 607,
             global: true,
+            gamewith: 26093,
             condition: 'You cannot use any two units that are the same',
             "All Difficulties": [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]
         },
@@ -1041,6 +1070,7 @@ window.drops = {
             name: 'Camie and Hachi\'s Takoyaki Shop!',
             thumb: 635,
             global: true,
+            gamewith: 9782,
             condition: 'No Units above the cost of 49 is allowed',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, 1x Orb Matching Forbidden Tome']],
@@ -1051,6 +1081,7 @@ window.drops = {
             name: 'Shark Attack! Arlong Pirates',
             thumb: 656,
             global: true,
+            gamewith: 8739,
             condition: 'You can only get STR, QCK, DEX, PSY and INT orbs',
             "All Difficulties": [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
         },
@@ -1059,6 +1090,7 @@ window.drops = {
             name: 'Fight! Sand-Sand Band!!',
             thumb: 664,
             global: true,
+            gamewith: 5504,
             condition: 'Heatwave causes damage every 2 turns',
             "Japan": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73, -1117 ],
             "Global": [ 663, 665, 667, -667, -639, -508, -506, -459, -378, -221, -73 ]
@@ -1068,6 +1100,7 @@ window.drops = {
             name: 'Led by the Light of Shandora! Calgara & Noland!',
             thumb: 688,
             global: true,
+            gamewith: 5352,
             condition: 'Bomb orbs appear',
             "Japan": [ 687, 689, -542, -524, -528, -429, -428, -402, -365, -218, -1119, -1177 ],
             "Global": [ 687, 689, -542, -645, -647, -429, -428, -402, -365, -218 ]
@@ -1077,6 +1110,7 @@ window.drops = {
             name: "Sky Night Ganfor",
             thumb: 713,
             global: true,
+            gamewith: 5882,
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Lock Resistance Forbidden Tome, 2x Rainbow Gems']],
@@ -1088,6 +1122,7 @@ window.drops = {
             name: "T-Bone's Absolute Justice",
             thumb: 724,
             global: true,
+            gamewith: 5451,
             condition: 'You can only bring INT, PSY and QCK units',
             "Japan": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219, -1173 ],
             "Global": [ 721, 723, -590, -564, -563, -530, -641, -384, -361, -219 ]
@@ -1097,6 +1132,7 @@ window.drops = {
             name: "Explosive! Wanze's Ramen Kenpo!!",
             thumb: 743,
             global: true,
+            gamewith: 7031,
             condition: 'You can only bring STR, QCK and DEX units',
             "Japan": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18, -1208, -1212 ],
             "Global": [ 740, 742, -671, -673, -586, -567, -566, -412, -225, -18 ]
@@ -1106,6 +1142,7 @@ window.drops = {
             name: "Twilight Party DEAD or TREAT!!",
             thumb: 761,
             global: true,
+            gamewith: 25120,
             condition: "None",
             "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217, -1210, -1413 ],
             "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8, -1413, -1388 ]
@@ -1115,6 +1152,7 @@ window.drops = {
             name: "Midnight Party DEAD or TREAT!!",
             thumb: 766,
             global: true,
+            gamewith: 25101,
             condition: "None",
             "Japan": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223, -1175 ],
             "Global": [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
@@ -1124,6 +1162,7 @@ window.drops = {
             name: "Evil Manager Breed's Marine Circus!",
             thumb: 797,
             global: true,
+            gamewith: 2191,
             condition: 'You can only bring Fighter and Powerhouse units',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['100,000','1x Purple Elder'],['400,000','1x RCV Candy, 1x Rainbow Gem'],['750,000','1x Auto-Heal Skullbook, 2x Rainbow Gem']],
@@ -1135,6 +1174,7 @@ window.drops = {
             name: "Nami and Lola's Great Proposal Plan",
             thumb: 808,
             global: true,
+            gamewith: 19169,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
             "Japan": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9, -1389 ],
             "Global": [ 807, 809, 811, -811, -760, -675, -631, -502, -11, -12, -9, -1389 ],
@@ -1144,6 +1184,7 @@ window.drops = {
             name: "Legendary Shipbuilding Company Tom's Workers",
             thumb: 848,
             global: true,
+            gamewith: 19832,
             condition: 'You can only bring Impact and Free Spirit units. (No Evo/Boosters)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
@@ -1155,6 +1196,7 @@ window.drops = {
             name: "Wapol's Counterattack",
             thumb: 852,
             global: true,
+            gamewith: 20412,
             condition: 'You can only bring Shooter and Driven units. (No Evo/Boosters)',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['400,000 Damage','1x QCK Elder Turtle'],['1,400,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['4,000,000 Damage','2x Rainbow Gems, 1x Despair Resistance Forbidden Tome']],
@@ -1165,6 +1207,7 @@ window.drops = {
         {
             name: "Lightning Speed! Strawhat Crew's Surprise Visit",
             thumb: 866,
+            gamewith: 21530,
             condition: "None",
             challenge:'Total number of hits above 50,000',
             challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Despair Resistance Forbidden Tome, 2x Rainbow Gems']],
@@ -1174,6 +1217,7 @@ window.drops = {
         {
             name: "Riverside Banquet! Enter the Crazy Ones!",
             thumb: 885,
+            gamewith: 22421,
             condition: 'Highly increased chance of TND, Bomb, and G orbs',
             "All Difficulties": [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416, -1445 ]
         },
@@ -1181,6 +1225,7 @@ window.drops = {
         {
             name: "Mountaintop Banquet! Enter the Generals!",
             thumb: 897,
+            gamewith: 23047,
             condition: 'Only STR/DEX/QCK/PSY/INT orbs will appear',
             "All Difficulties": [ 897, 898, 899, -899, -754, -702, -701, -669, -1492, -528, -466, -449, -464, -1177 ]
         },
@@ -1189,6 +1234,7 @@ window.drops = {
             name: "Men are Forbidden!? The Secret Flower Garden",
             thumb: 918,
             global: true,
+            gamewith: 23687,
             condition: 'You can only bring DEX units',
             "Japan": [ 917, 919, 920, -920, -791, -756, -720, -707, -705, -542, -541, -522, -1117 ],
             "Global": [ 917, 919, 920, -920, -506, -756, -720, -707, -705, -542, -541, -522, -1117 ]
@@ -1198,6 +1244,7 @@ window.drops = {
             name: "Hannyabal's Great Ambition",
             thumb: 929,
             global: true,
+            gamewith: 24198,
             condition: 'You can only bring STR units',
             "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506, -1115 ]
         },
@@ -1206,6 +1253,7 @@ window.drops = {
             name: "Encounter! Whitebeard Pirates",
             thumb: 946,
             global: true,
+            gamewith: 25000,
             condition: "You can only bring PSY units",
             "Japan": [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738, -1173 ],
             "Global": [ 946, 947, 948, 949, -718, -524, -1119, -528, -1177, -526, -793, -735, -546, -738, -1173 ]
@@ -1215,6 +1263,7 @@ window.drops = {
             name: "Clash! Whitebeard Pirates",
             thumb: 979,
             global: true,
+            gamewith: 25750,
             condition: "You can only bring INT units",
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['420,000','1x HP Cotton Candy, 1x Rainbow Gem'],['700,000','2x Rainbow Gems, 1x Orb Forbidden Tome']],
@@ -1227,6 +1276,7 @@ window.drops = {
             condition: "You can only bring QCK units",
             thumb: 1003,
             global: true,
+            gamewith: 26908,
             "All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564, -1208 ]
         },
         
@@ -1235,6 +1285,7 @@ window.drops = {
             thumb: 1011,
             condition: "None",
             global: true,
+            gamewith: 27631,
             "Global": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -812, -565 ],
             "Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565, -1212 ]
         },
@@ -1243,6 +1294,7 @@ window.drops = {
             name: "Temptation!? The Queen of Kamabakka Queendom!",
             thumb: 1037,
             global: true,
+            gamewith: 29442,
             condition: "Only DEX/RCV/TND orbs will appear",
             "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566, -1175 ]
         },
@@ -1251,6 +1303,7 @@ window.drops = {
             name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
             thumb: 1049,
             global: true,
+            gamewith: 29912,
             condition: "Only TND/RCV/INT orbs will appear",
             "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908, -1210 ]
         },
@@ -1259,6 +1312,7 @@ window.drops = {
             name: "Pirate Ship Competition! \"Dead End\" Opens!",
             thumb: 1072,
             global: true,
+            gamewith: 30767,
             //OLD condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
             condition: "STR/DEX/QCK units get their ATK boosted by 1.6x. INT/PSY units get their HP boosted by 2.0x",
             "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888, -1070]
@@ -1268,6 +1322,7 @@ window.drops = {
             name: "Dr. Indigo & Scarlet!",
             thumb: 1095,
             global: true,
+            gamewith: 33039,
             //OLD condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             condition: "Boosts ATK of Driven characters by 2x and boosts HP for Powerhouse characters by 2x.",
             "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
@@ -1277,6 +1332,7 @@ window.drops = {
             name: "Robin and Nami's Secret Undercover Investigation",
             thumb: 1112,
             global: true,
+            gamewith: 33849,
             condition: "Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
             "All Difficulties": [ 1109, 1111, 1113, -23, -628, -639, -641, -892, -937, -939, -941 ]
         },
@@ -1285,6 +1341,7 @@ window.drops = {
             name: "Behind the Scenes Intelligency Agency, CP9",
             thumb: 1137,
             global: true,
+            gamewith: 34515,
             condition: "Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear",
             "All Difficulties": [ 1136, 1137, 1138, 1139, -935, -643, -673, -894, -943, -995, -615, -705, -704 ]
         },
@@ -1293,6 +1350,7 @@ window.drops = {
             name: "Welcome To The Gran Tesoro!",
             thumb: 1167,
             global: true,
+            gamewith: 35095,
             condition: "None",
             "All Difficulties": [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703, -1121 ]
         },
@@ -1301,6 +1359,7 @@ window.drops = {
             name: "Rumbar Pirates!",
             thumb: 1203,
             global: true,
+            gamewith: 35905,
             condition: "'Musical' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)",
             "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -558, -1208, -677, -896, -631, -954, -1206, -617, -1027 ]
         },
@@ -1309,6 +1368,7 @@ window.drops = {
             name: "World Pirates!",
             thumb: 1215,
             global: true,
+            gamewith: 36738,
             condition: "Total Crew Cost must be lower than 180 (Including friend captain)",
             "All Difficulties": [ 1215, 1216, 1217, 1218, -1025, -1029, -1033, -671, -956, -964, -633, -504, -1218 ]
         },
@@ -1316,6 +1376,7 @@ window.drops = {
         {
             name: "Revolutionary Armed Forces!",
             thumb: 1242,
+            gamewith: 37425,
             condition: "Free Spirit Characters have their cooldowns reduced by 10 turns at the start of the fight",
             "All Difficulties": [ 1241, 1243, -1035, -965, -1031, -1081, -754, -966, -502, -707, -955 ]
         },
@@ -1323,6 +1384,7 @@ window.drops = {
         {
             name: "Gather! Whitebeard Alliance",
             thumb: 1254,
+            gamewith: 38336,
             condition: "Driven Characters have their cooldowns reduced by 10 turns at the start of the fight",
             "All Difficulties": [ 1254, 1255, 1256, -669, -1492, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },
@@ -1330,6 +1392,7 @@ window.drops = {
         {
             name: "Young Donquixote Pirates - Baby 5 And Buffalo",
             thumb: 1287,
+            gamewith: 39522,
             condition: "Child-like characters get their ATK and HP boosted by 3.5x, RCV by 1.5x, and cooldowns reduced by 7 turns at the start of the fight",
             "All Difficulties": [ 1286, 1288, 1290, -963, -1045, -251, -760, -1083, -1129, -506, -1062, -702 ]
         },
@@ -1337,6 +1400,7 @@ window.drops = {
         {
             name: "Jailbreak Battle! Mr. 3 and Buggy",
             thumb: 1304,
+            gamewith: 41928,
             condition: "Shooter and Fighter characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
             "All Difficulties": [ 1301, 1303, 1152, 1151, 551, 539, -718, -752, -1125, -1133, -15, -203, -733, -1056, -1060 ]
         },
@@ -1344,6 +1408,7 @@ window.drops = {
         {
             name: "Tontatta Kingdom Island Part 1: Leo",
             thumb: 1328,
+            gamewith: 44164,
             condition: "Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
             "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508, -1387 ]
         },
@@ -1351,6 +1416,7 @@ window.drops = {
         {
             name: "Tontatta Kingdom Island Part 2: Mansherry",
             thumb: 1332,
+            gamewith: 44747,
             condition: "Striker characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (70% on 30 stamina)",
             "All Difficulties": [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
         },
@@ -1358,18 +1424,21 @@ window.drops = {
         {
             name: "Big Mom Pirates!",
             thumb: 1357,
+            gamewith: 45801,
             "All Difficulties": [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610, -1388 ]
         },
         
         {
             name: "Soldier-san's Training!",
             thumb: 1384,
+            gamewith: 46658,
             "All Difficulties": [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739 ]
         },
         
         {
             name: "Shambles! Tashigi and Smoker?!?",
             thumb: 1397,
+            gamewith: 47247,
             condition: "Your captain will be switched with your middle right character when you encounter Law.",
             "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
         },
@@ -1377,6 +1446,7 @@ window.drops = {
         {
             name: "Marines! Sengoku the Fleet Admiral!",
             thumb: 1416,
+            gamewith: 48079,
             condition: "You can only bring INT units",
             "All Difficulties": [ 1415, 1417, 1418, -1418, -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
         },
@@ -1384,6 +1454,7 @@ window.drops = {
         {
             name: "Chinjao Family! The 13th Leader Appears!",
             thumb: 1426,
+            gamewith: 49862,
             condition: "You can only bring DEX units",
             "All Difficulties": [ 1425, 1427, 1428, -1240, -1272, -1270, -1227, -1224, -872, -878, -255, -812 ]
         },
@@ -1391,6 +1462,7 @@ window.drops = {
         {
             name: "Fugitive of Love and Passion!!",
             thumb: 1450,
+            gamewith: 50895,
             condition: "You can only bring STR units",
             "All Difficulties": [ 1449, 1451, -935, -1278, -1318, -1324, -880, -876, -259, -1226, -814 ]
         },
@@ -1398,6 +1470,7 @@ window.drops = {
         {
             name: "Gatekeeper of the New World! Stop the Rookies!",
             thumb: 1469,
+            gamewith: 51926,
             condition: "You can only bring QCK units",
             "All Difficulties": [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470 ]
         },
@@ -1405,6 +1478,7 @@ window.drops = {
         {
             name: "Exit! Whitebeard Pirates",
             thumb: 1509,
+            gamewith: 52629,
             condition: "You can only bring PSY units",
             "All Difficulties": [ 1509, 1510, 1511, 1512, -1001, -1316, -1280, -314, -908, -16, -1446, -1370, -1368, -816 ],
         },
@@ -1412,12 +1486,14 @@ window.drops = {
         {
             name: "Dadan Family! Encounter with the Mountain Bandits",
             thumb: 1520,
+            gamewith: 53569,
             "All Difficulties": [ 1519, 1521, 1522, -1314, -1366, -1364, -912, -937, -316, -1281, -891, -22, -1448 ],
         },
         
         {
             name: "Soul King! Farewell Tour Concert",
             thumb: 1547,
+            gamewith: 54302,
             condition: "Strawhat Pirates get ATK, HP, and RCV boosted by 1.5x and reduces cooldown of specials by 9 turns at the start of the fight",
             "All Difficulties": [ 1546, 1548, -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
         },
@@ -1425,6 +1501,7 @@ window.drops = {
         {
             name: "Prodence Kingdom",
             thumb: 1564,
+            gamewith: 55145,
             //condition: "You can only bring PSY units",
             "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
         },
@@ -1659,6 +1736,7 @@ window.drops = {
             name: 'Girls of Summer Paradise',
             thumb: 683,
             global: true,
+            gamewith: 15440,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['Japan Rewards', ''],['10 Times','#686 Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems'], ['Global Rewards', ''],['10 Times','1x Bind Resistance Forbidden Tome, 1x Despair Resistance Forbidden Tome, 1x Auto-Heal Forbidden Tome, 1x Rainbow Gem'],['35 Times','1x Red Elder Turtle, 1x Blue Elder Turtle, 1x Green Elder Turtle, 1x Yellow Elder Turtle, 1x Black Elder Turtle, 2x Rainbow Gems'],['72 Times','5x Rainbow Gems']],
             "All Difficulties": [ 659, 680, 682, 684, 1200, 1198 ]
@@ -1673,6 +1751,7 @@ window.drops = {
         {
             name: 'Valentines Day and White Day Characters',
             thumb: 1463,
+            gamewith: 51651,
             "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
             "Chopper": [ 1464, 1155, 333, 728, 334, 1061, 346, 193, 109, 114, 115, 116, 117, 1180, 266, 94, 83 ],
             "Sanji": [ 1507, 52, 207, 892, 343, 190, 111, 106, 115, 116, 117, 1180, 266, 94, 83 ],
@@ -1776,6 +1855,7 @@ var bonuses = [
     { type: 'beli'    , x: 6 , y: 10 },
     { type: 'beli'    , x: 6 , y: 17 },
     { type: 'beli'    , x: 6 , y: 24 },
+    { type: 'beli'    , x: 6 , y: 31 },
     { type: 'exp'     , x: 2 , y: 2  },
     { type: 'exp'     , x: 6 , y: 2  },
     { type: 'exp'     , x: 5 , y: 5, stop: 5 },
diff --git a/common/data/flags.js b/common/data/flags.js
index c29a01058..597b0c02b 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -529,8 +529,8 @@ window.flags = {
     528: { rr: 1, rro: 1 },
     529: { global: 1, rr: 1, rro: 1 },
     530: { global: 1, rr: 1, rro: 1 },
-    531: { promo: 1, global: 1 },
-    532: { promo: 1, global: 1 },
+    531: { promo: 1, global: 1, shop: 1 },
+    532: { promo: 1, global: 1, shop: 1 },
     533: { rr: 1, rro: 1, lrr: 1, global: 1 },
     534: { rr: 1, rro: 1, lrr: 1, global: 1 },
     535: { rr: 1, rro: 1, lrr: 1, global: 1 },
@@ -1200,12 +1200,12 @@ window.flags = {
     1249: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1257: { global: 1 },
     1258: { global: 1 },
-    1259: { rr: 1, rro: 1, lrr: 1 },
-    1260: { rr: 1, rro: 1, lrr: 1 },
-    1261: { rr: 1, rro: 1, lrr: 1 },
-    1262: { rr: 1, rro: 1, lrr: 1 },
-    1263: { rr: 1, rro: 1, lrr: 1 },
-    1264: { rr: 1, rro: 1, lrr: 1 },
+    1259: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1260: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1261: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1262: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1263: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1264: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1265: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1266: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1267: { rr: 1, rro: 1, global: 1 },
@@ -1311,7 +1311,7 @@ window.flags = {
     1442: { rr: 1, rro: 1 },
     1443: { rr: 1, rro: 1 },
     1444: { rr: 1, rro: 1 },
-    1445: { rr: 1, rro: 1 },
+    1445: { rr: 1, rro: 1, global: 1 },
     1453: { rr: 1, rro: 1, lrr: 1, },
     1454: { rr: 1, rro: 1, lrr: 1, },
     1461: { special: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index 23a2a82bf..49a15d064 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1561,4 +1561,8 @@ window.gw=[
     54888,
     54889,
     52490,
+    55148,
+    55148,    
+    55149,
+    55149,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 5ca1d51f5..e77bc1971 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1561,10 +1561,10 @@ window.units = [
     [ "Daruma", "QCK", [ "Powerhouse", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 70, 83, 24, 1039, 1191, 173, 1 ],
     [ "Dosun", "INT", [ "Powerhouse", "Striker" ], 3, 15, 4, 2, 70, 1066998, 101, 77, 18, 1465, 1092, 133, 1 ],
     [ "Hody Jones, Rampage", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1115, 660, 0, 3115, 1395, -150, 1 ],
-    [ "Fortnight Elizabello", "STR", [ "Fighter", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Elizabello, Evolved", "STR", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Dagama, Evolved", "DEX", [ "Driven", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Elizabello", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 91, 48, 19, null, null, null, null ],
+    [ "Fortnight Elizabello, Evolved", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, null ],
+    [ "Fortnight Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, null, null, null, 1012, 511, 160, null ],
+    [ "Fortnight Dagama, Evolved", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c9513e34ac1adb8ad6be160e245bb1ff721353f8 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Wed, 19 Apr 2017 14:36:54 -0400
Subject: [PATCH 0975/1569] Reddit lied to me, but eh

---
 common/data/drops.js    | 2 +-
 common/data/families.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index cbbc607c7..a545a4eef 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1472,7 +1472,7 @@ window.drops = {
             thumb: 1469,
             gamewith: 51926,
             condition: "You can only bring QCK units",
-            "All Difficulties": [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470 ]
+            "All Difficulties": [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470, -1320 ]
         },
         
         {
diff --git a/common/data/families.js b/common/data/families.js
index c8b439f4f..6fcc8139f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1289,8 +1289,8 @@ window.families = [
     "Trafalgar Law",
     "Trafalgar Law",
     "Buffalo",
-    "Lao G",
-    "Lao G",
+    "Lao-G",
+    "Lao-G",
     "Boa Sandersonia",
     "Boa Sandersonia",
     "Kalifa",

From b14969c9b7fe0549d3a347d91b48d91c58570ebc Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 24 Apr 2017 20:11:36 -0400
Subject: [PATCH 0976/1569] New stuff

---
 common/data/aliases.js    | 26 ++++++------
 common/data/captains.js   | 11 ++++++
 common/data/cooldowns.js  |  7 +++-
 common/data/details.js    | 83 +++++++++++++++++++++++----------------
 common/data/evolutions.js |  4 ++
 common/data/families.js   |  3 ++
 common/data/flags.js      |  3 ++
 common/data/gw.js         |  3 ++
 common/data/matchers.js   | 18 +++++++--
 common/data/ships.js      | 12 +++---
 common/data/specials.js   |  6 +++
 common/data/units.js      | 11 ++++--
 12 files changed, 126 insertions(+), 61 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index bdf719a23..e4147ef25 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1267,8 +1267,8 @@ window.aliases = {
     1266: ['エース 月下の艶肌','','Kimono Ace'],
     1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','',''],
     1268: ['黒ひげ 黒ひげ海賊団船長','',''],
-    1269: ['ラフィット','',''],
-    1270: ['“鬼保安官”ラフィット','',''],
+    1269: ['ラフィット','','Lafitte'],
+    1270: ['“鬼保安官”ラフィット','','Lafitte'],
     1271: ['ヴァン・オーガー','','Vaper', 'Van Ogre'],
     1272: ['“音越”ヴァン・オーガー','','Vaper', 'Van Ogre'],
     1273: ['ジーザス・バージェス','',''],
@@ -1464,8 +1464,8 @@ window.aliases = {
     1463: ['ルフィのティーパーティ', '', 'White Day Luffy'],
     1464: ['チョッパーのブレイクタイム', '', 'White Day Chopper'],
     1465: ['チョッパーのティーパーティ', '', 'White Day Chopper'],
-    1466: ['キャベンディッシュ 白い日の優男', '', 'White Day Cavendish'],
-    1467: ['キャベンディッシュ 白い日の白昼夢', '', 'White Day Cavendish'],
+    1466: ['キャベンディッシュ 白い日の優男', '', 'White Day Cavendish', 'White Day Cabbage'],
+    1467: ['キャベンディッシュ 白い日の白昼夢', '', 'White Day Cavendish', 'White Day Cabbage'],
     1468: ['戦桃丸 海兵', '', ''],
     1469: ['鉞の戦桃丸 海兵', '', ''],
     1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service'],
@@ -1527,8 +1527,8 @@ window.aliases = {
     1526: ['アーロン アーロン一味船長', '', 'Coliseum Arlong'],
     1527: ['ノコギリのアーロン アーロン一味船長', '', 'Coliseum Arlong'],
     1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim'],
-    1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
-    1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish'],
+    1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
+    1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
     1531: ['ウソランド', '', 'God Usopp'],
     1532: ['ゴッド・ウソップ', '', 'God Usopp'],
     1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', ''],
@@ -1561,13 +1561,13 @@ window.aliases = {
     1560: ['ダルマ', '', ''],
     1561: ['ドスン', '', ''],
     1562: ['ホーディ・ジョーンズ 暴走', '', ''],
-    1563: ['', '', ''],
-    1564: ['', '', ''],
-    1565: ['', '', ''],
-    1566: ['', '', ''],
-    1567: ['', '', ''],
-    1568: ['', '', ''],
-    1569: ['', '', ''],
+    1563: ['“戦う王”エリザベローII世', '', ''],
+    1564: ['“戦う王”エリザベローII世 プロデンス王国', '', ''],
+    1565: ['軍師ダガマ', '', ''],
+    1566: ['軍師ダガマ プロデンス王国', '', ''],
+    1567: ['', '', 'Kid Boa Hancock'],
+    1568: ['', '', 'Kid Boa Hancock'],
+    1569: ['', '', 'Anniversary Law'],
     1570: ['', '', ''],
     1571: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 730d7db8b..4e91af89d 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4582,4 +4582,15 @@ window.captains = {
     1566: {
         atk: function(p) { return 2; }
     },
+    1567: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    1568: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    1569: {
+        atk: function(p) { return 2.25; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 4c738ca81..de6bf73f0 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1563,6 +1563,9 @@ window.cooldowns = [
     15,
     null,//Fortnight Elizabello
     null,//Fortnight Elizabello
-    15,
-    15,
+    [ 15, 9 ],
+    [ 15, 9 ],
+    null,
+    null,
+    [ 11, 11 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 092f51052..7ec09f2cb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1551,12 +1551,12 @@ window.details = {
         captain: "Boosts ATK and RCV of QCK characters by 1.2x"
     },
     397: {
-        special: "Fills [EMPTY] orbs with [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
+        special: "Changes [EMPTY] orbs into [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
         specialName: "Four Hundred Base Hits",
         captain: "Boosts ATK by 3x after scoring 5 Perfects in a row"
     },
     398: {
-        special: "Fills [EMPTY] orbs with [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
+        special: "Changes [EMPTY] orbs into [STR] orbs with a 50% probability, deals 15x character's ATK in damage to all enemies",
         specialName: "Four Hundred Base Hits",
         captain: "Boosts ATK by 4x after scoring 5 Perfects in a row"
     },
@@ -4035,13 +4035,13 @@ window.details = {
         special: "Changes the captain's orb into a matching orb, locks all orbs for 1 turn, deals 13x character's ATK in INT damage to all enemies"
     },
     877: {
-        captain: "Boosts amount of beli received by 2x",
+        captain: "Boosts amount of Beli received by 2x",
         specialName: "Heaven's Do Art",
         special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
         specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
     },
     878: {
-        captain: "Boosts ATK of all characters by 1.5x, boosts amount of beli received by 2x",
+        captain: "Boosts ATK of all characters by 1.5x, boosts amount of Beli received by 2x",
         specialName: "Heaven's Do Art",
         special: "Reduces any damage received above 2,000 HP by 88% for 2 turns",
         specialNotes: "The exact formula for the damage received is: 2000 + ((total damage) - 2000) * 0.12"
@@ -4089,7 +4089,7 @@ window.details = {
         special: "Deals 15x character's ATK in STR damage to all enemies, boosts ATK of Slasher characters by 1.5x for 1 turn if HP is below 30% when the special is activated"
     },
     887: {
-        captain: "Boosts ATK of Driven characters by 1.5x, boosts amount of beli received by 1.2x",
+        captain: "Boosts ATK of Driven characters by 1.5x, boosts amount of Beli received by 1.2x",
         specialName: "Special Muggy Ball: Flashy",
         special: "Reduces the defense of all enemies by 80% for 1 turn, deals 15x character's ATK in QCK damage to all enemies"
     },
@@ -4717,7 +4717,7 @@ window.details = {
         specialName: "Punc Rock Fest"
     },
     994: {
-        captain: "Boosts amount of beli received by 2x",
+        captain: "Boosts amount of Beli received by 2x",
         special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
         specialName: "Peeping Mind",
         special: [
@@ -4735,7 +4735,7 @@ window.details = {
         sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
     },
     995:{
-        captain: "Boosts amount of beli received by 3x",
+        captain: "Boosts amount of Beli received by 3x",
         special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
         specialName: "Peeping Mind",
         special: [
@@ -4913,7 +4913,7 @@ window.details = {
         special: "Recovers 9x characters RCV in HP. Changes captain's orb into Matching orb"
     },
     1022: {
-        captain: "Boosts ATK of all characters by 2x and boosts amount of beli received by 1.2x",
+        captain: "Boosts ATK of all characters by 2x and boosts amount of Beli received by 1.2x",
         special: "Deals 13x character's ATK as [PSY] damage to all enemies. Changes [BOMB], [EMPTY], and [TND] orbs to [PSY]",
         specialName: "Gum-Gum Gigant Rifle: New Star"
     },
@@ -4948,13 +4948,13 @@ window.details = {
     1028: {
         captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain",
         specialName: "Rah-Rah-Rah Rampage",
-        special: "Deals random damage to all enemies, boost ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
+        special: "Deals random damage to all enemies, boosts ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
     },
     1029: {
         captain: "Boosts ATK of all characters by 2.5x after the 21st hit in the chain and by 3.5x after the 36th hit",
         specialName: "Rah-Rah-Rah Rampage",
-        special: "Deals random damage to all enemies, boost ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
+        special: "Deals random damage to all enemies, boosts ATK of all characters by 1.75x after 30th hit in the chain for 3 turns.",
         specialNotes: "Buffalo's Captain as a Special essentially"
     },
     1030: {
@@ -6319,13 +6319,13 @@ window.details = {
     },
     1237: {//Bastille
         captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
-        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
+        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
         specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
     },
     1238: {//Bastille
         captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain and by 3x after the 30th hit",
-        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boost ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
+        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of all characters by 2x after 30th hit in the chain for 1 turn.",
         specialName: "Shark Cutter - Flash",
         sailor: "Makes [QCK] orbs \"beneficial\" for this unit"
     },
@@ -6462,7 +6462,7 @@ window.details = {
         specialName: "Angry Instigator",
     },
     1254: {//FN Squard
-        captain: "Boost ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
+        captain: "Boosts ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
         special: "Deals 10x his ATK to one enemy, reduces crews current HP by 30% and reduces enemies defense by a certain amount for one turn",
         specialName: "Sword Attack Without Hesitation",
         sailor: "Reduces his own Numbness by 1 turn"
@@ -6475,7 +6475,7 @@ window.details = {
     },
     1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
-        special: "Shuffle non-matching orbs on Slasher and Driven characters, boost Atk against enemies with increased defense by 1.3x for 1 turn",
+        special: "Shuffle non-matching orbs on Slasher and Driven characters, boosts Atk against enemies with increased defense by 1.3x for 1 turn",
         sailor: "Boosts ATK and RCV of Driven characters by 10",
         specialName: "Icebreaker Breakthrough Force",
     },
@@ -6960,7 +6960,7 @@ window.details = {
         specialName: "Amulet Flame",
     },
     1327: {//Fornight Leo
-        captain: "Boost ATK of characters with cost 20 or less by 2x",
+        captain: "Boosts ATK of characters with cost 20 or less by 2x",
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
@@ -6974,7 +6974,7 @@ window.details = {
         specialName: "Tail Hammer",
     },
     1328: {//Fornight Leo
-        captain: "Boost ATK of characters with cost 20 or less by 2.5x",
+        captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
@@ -7135,8 +7135,8 @@ window.details = {
         specialName: "Imitation Tactics",
     },
     1349: {//Haredas
-        captain: "Boost ATK of Cerebral characters by 1.5x and their RCV by 1.75x",
-        special: "Empty all slots including [BLOCK] orbs, and boost ATK of Cerebral characters by 1.2x for 1 turn",
+        captain: "Boosts ATK of Cerebral characters by 1.5x and their RCV by 1.75x",
+        special: "Empty all slots including [BLOCK] orbs, and boosts ATK of Cerebral characters by 1.2x for 1 turn",
         specialName: "Gust 'Wind Knot'",
     },
     1350: {//Longarm Tribe Theives
@@ -7171,13 +7171,13 @@ window.details = {
     },
     1356: {//Pekoms
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
-        special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
+        special: "Changes [RCV] and [EMPTY] orbs into Matching orbs on Fighter characters. Makes Perfects easier to hit for 1 turn.",
         specialName: "Serious Threat",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
     1357: {//Pekoms
         captain: "Boosts ATK, HP and RCV of Powerhouse characters by 1.5x",
-        special: "Changes [RCV] and [EMPTY] orbs on Fighter characters into Matching orbs. Makes Perfects easier to hit for 1 turn.",
+        special: "Changes [RCV] and [EMPTY] orbs into Matching orbs on Fighter characters. Makes Perfects easier to hit for 1 turn.",
         specialName: "Serious Threat",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)"
     },
@@ -7571,18 +7571,18 @@ window.details = {
         specialName: "Gomu Gomu no Red Hawk",
     },
     1405: {//Timeskip Usopp
-        captain: "Boost ATK of Shooter characters by 1.75x, and their RCV by 1.25x",
+        captain: "Boosts ATK of Shooter characters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooter characters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
     },
     1406: {//Timeskip Usopp
-        captain: "Boost ATK of Shooter characters by 2.25x, and their RCV by 1.5x",
+        captain: "Boosts ATK of Shooter characters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boost ATK and RCV of Shooter characters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
     },
     1407: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
@@ -7635,12 +7635,12 @@ window.details = {
         specialName: "Are you ready?",
     },
     1415: {//Fortnight Sengoku
-        captain: "Boost ATK of characters with cost 30 or less by 1.5x",
+        captain: "Boosts ATK of characters with cost 30 or less by 1.5x",
         special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
         specialName: "Unshakeable Resolution of the Wise Master",
     },
     1416: {//Fortnight Sengoku
-        captain: "Boost ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
+        captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
         special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
         specialName: "Unshakeable Resolution of the Wise Master",
     },
@@ -7702,7 +7702,7 @@ window.details = {
         specialName: "Unblockable Eight Fists",
     },
     1428: {//Jean Ango
-        captain: "Boosts amount of beli received by 1.5x, and gives small chance of duplicating a drop upon completion of the island",
+        captain: "Boosts amount of Beli received by 1.5x, and gives small chance of duplicating a drop upon completion of the island",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
@@ -7763,14 +7763,14 @@ window.details = {
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boost ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boosts ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1436: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 2.5x and HP of Powerhouse characters by 1.25x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boost ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boosts ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1437: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
@@ -8526,7 +8526,7 @@ window.details = {
     },
     1549: {//5+ Robin
         captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 3x character's RCV in HP at the end of each turn",
-        special: "Reduces Bind and Despair duration by 3 turns, and reduces Special Cooldown of all characters by 1 turn",
+        special: "Reduces Bind, Despair and Silence duration by 3 turns, and reduces Special Cooldown of all characters by 1 turn",
         specialName: "Mil Fluer: Campo de Flores",
     },
     1550: {//5+ Franky
@@ -8598,11 +8598,11 @@ window.details = {
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.75x at the start of the chain and by 2.1875x after the 5th Perfect",
         special: [
             {
-                "description": "Changes own orb into [STR], deals 10 hits of 3x chatacter's ATK in typeless damage to random enemies",
+                "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
                 "cooldown": [ 17, 9 ],
             },
             {
-                "description": "Changes own orb into [STR], deals 10 hits of 15x chatacter's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
+                "description": "Changes own orb into [STR], deals 10 hits of 15x character's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
                 "cooldown": [ 24, 16 ],
             },
         ],
@@ -8613,11 +8613,11 @@ window.details = {
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect",
         special: [
             {
-                "description": "Changes own orb into [STR], deals 10 hits of 3x chatacter's ATK in typeless damage to random enemies",
+                "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
                 "cooldown": [ 17, 9 ],
             },
             {
-                "description": "Changes own orb into [STR], deals 10 hits of 15x chatacter's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
+                "description": "Changes own orb into [STR], deals 10 hits of 15x character's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
                 "cooldown": [ 24, 16 ],
             },
         ],
@@ -8634,4 +8634,19 @@ window.details = {
         special: "Reduces Special Cooldown of all characters by 1 turn and reduces crew's current HP by 10%",
         specialName: "War of Mislead Order",
     },
+    1567: {//Kid Boa
+        captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
+        special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by ???x for 3 turns",
+        specialName: "Boa Special",
+    },
+    1568: {//Kid Boa
+        captain: "Boosts ATK and RCV of [QCK] characters by 2x",
+        special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by ???x for 3 turns",
+        specialName: "Boa Special",
+    },
+    1569: {//Anniversary Law
+        captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
+        special: "Randomizes all orbs, including [BLOCK] orbs and switches orbs between slots three times",
+        specialName: "Law Special",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 131507d7f..076f2b410 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2411,4 +2411,8 @@ window.evolutions = {
         evolution: 1566,
         evolvers: [  ]
     },
+    1567: {
+        evolution: 1568,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 6fcc8139f..8533689d7 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1565,4 +1565,7 @@ window.families = [
     "Elizabello",
     "Dagama",
     "Dagama",
+    "Boa Hancock",
+    "Boa Hancock",
+    "Trafalgar Law",
 ];
diff --git a/common/data/flags.js b/common/data/flags.js
index 597b0c02b..d72b3f5f8 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1349,4 +1349,7 @@ window.flags = {
     1541: { rr: 1, rro: 1 },
     1542: { rr: 1, rro: 1 },
     1543: { rr: 1, rro: 1 },
+    1567: { rr: 1, rro: 1, lrr: 1 },
+    1568: { rr: 1, rro: 1, lrr: 1 },
+    1569: { special: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 49a15d064..8ef73d1df 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1565,4 +1565,7 @@ window.gw=[
     55148,    
     55149,
     55149,
+    null,
+    null,
+    55433,
 ];
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 5db78aa66..42607bc80 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -93,6 +93,12 @@ window.matchers = [
         target: 'captain',
         matcher: /Boosts.+chain multiplier/i
     },
+    
+    {
+        name: 'Combo Boost Captains',
+        target: 'captain',
+        matcher: /Boosts.+hit in the chain/i
+    },
 
     {
         name: 'Cooldown reducers',
@@ -133,7 +139,7 @@ window.matchers = [
     {
         name: 'Beli Boosters',
         target: 'captain',
-        matcher: /boosts amount of beli received/i
+        matcher: /boosts.+Beli/i
     },
     
     {
@@ -198,6 +204,12 @@ window.matchers = [
         matcher: /Boosts the Color Affinity/i
     },
     
+    {
+        name: 'Combo Boost Specials',
+        target: 'special',
+        matcher: /Boost.+hit in the chain/i
+    },
+    
     {
         name: 'RCV boosters',
         target: 'special',
@@ -265,11 +277,11 @@ window.matchers = [
         matcher: /(Empties|Changes.+into.+\[EMPTY\])/i
     },
 
-    {
+    /*{
         name: 'Slot fillers',
         target: 'special',
         matcher: /(Fills\b|\[EMPTY\] orbs into|Changes.+\[EMPTY\].+into)/i
-    },
+    },*/
 
     {
         name: 'Delayers',
diff --git a/common/data/ships.js b/common/data/ships.js
index 0f2552019..58270a569 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -306,9 +306,9 @@ window.ships = [
     { // 24
         name: 'New Year\'s Big Top',
         thumb: 'ship_0025_c.png',
-        description: 'Boosts ATK by 1.2x',
+        description: 'Boosts ATK of characters with 20 cost or less by 1.2x',
         atk: function(p) {
-            return 1.2;
+            return p.unit.cost <= 20 ? 1.2 : 1;
         }
     },
     { // 25
@@ -360,13 +360,15 @@ window.ships = [
     { //29
         name: "Karasumaru Ship",
         thumb: 'ship_0030_c.png',
-        description: 'Boosts ATK and HP of Shooter Only characters by 2x and boosts the ATK of all other characters by 1.5x and their HP by 1.02x. Special: Delays all enemies for 2 turns (cooldown: 12 turns).',
-        atk: function(p) {
+        //description: 'Boosts ATK and HP of Shooter Only characters by 2x and boosts the ATK of all other characters by 1.5x and their HP by 1.02x. Special: Delays all enemies for 2 turns (cooldown: 12 turns).',
+        description: 'Boosts ATK and Shooter characters by 1.2x. Special: Delays all enemies for 1 turn (cooldown: 16 turns).',
+        /*atk: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.5;
         },
         hp: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.02;
-        },
+        },*/
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index 987d429de..4cce949e3 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2524,4 +2524,10 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         type: "class"
     },
+    1567: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+    },
+    1568: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index e77bc1971..179877300 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1561,10 +1561,13 @@ window.units = [
     [ "Daruma", "QCK", [ "Powerhouse", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 70, 83, 24, 1039, 1191, 173, 1 ],
     [ "Dosun", "INT", [ "Powerhouse", "Striker" ], 3, 15, 4, 2, 70, 1066998, 101, 77, 18, 1465, 1092, 133, 1 ],
     [ "Hody Jones, Rampage", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1115, 660, 0, 3115, 1395, -150, 1 ],
-    [ "Fortnight Elizabello", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 91, 48, 19, null, null, null, null ],
-    [ "Fortnight Elizabello, Evolved", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, null ],
-    [ "Fortnight Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, null, null, null, 1012, 511, 160, null ],
-    [ "Fortnight Dagama, Evolved", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, null, null, null, null ],
+    [ "'The Fighting King' Elizabello II", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 91, 48, 19, 1021, 602, 99, 1 ],
+    [ "'The Fighting King' Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
+    [ "Tactician Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, 101, 45, 70, 1012, 511, 160, 1 ],
+    [ "Tactician Dagama, Prodence Kingdom", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, 2022, 1011, 276, 1 ],
+    [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, null, 197, 109, 15, 2017, 1230, 245, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 5f3fcda0ff4292d2513e99cce6cf4cb2d91c4466 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Wed, 26 Apr 2017 12:31:39 -0400
Subject: [PATCH 0977/1569] Mink Tribe Sugo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’ll fix it I swear
---
 common/data/aliases.js    | 12 ++++++--
 common/data/captains.js   | 46 +++++++++++++++++++++++++++++
 common/data/details.js    | 62 +++++++++++++++++++++++++++++++++++++++
 common/data/evolutions.js | 20 +++++++++++++
 common/data/families.js   | 10 +++++++
 common/data/flags.js      | 10 +++++++
 common/data/sailors.js    |  7 +++++
 common/data/specials.js   | 21 +++++++++++++
 common/data/units.js      | 10 +++++++
 common/data/zombies.js    |  8 +++++
 10 files changed, 204 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index e4147ef25..7c86e9c77 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1568,6 +1568,14 @@ window.aliases = {
     1567: ['', '', 'Kid Boa Hancock'],
     1568: ['', '', 'Kid Boa Hancock'],
     1569: ['', '', 'Anniversary Law'],
-    1570: ['', '', ''],
-    1571: ['', '', ''],
+    1570: ['', '', 'Inuyasha'],
+    1571: ['', '', 'Inuyasha'],
+    1572: ['', '', ''],
+    1573: ['', '', ''],
+    1574: ['', '', ''],
+    1575: ['', '', ''],
+    1576: ['', '', 'Kin\'emon'],
+    1577: ['', '', 'Kin\'emon'],
+    1578: ['', '', ''],
+    1579: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 4e91af89d..201c6e303 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4593,4 +4593,50 @@ window.captains = {
     1569: {
         atk: function(p) { return 2.25; }
     },
+    1570: {
+        atk: function(p) { return !(p.unit.class.has("Cerebral")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.5; },
+        chainModifier: function(p) { return  p.percHP <= 30.0 ? 1.5 : 1; }
+    },
+    1571: {
+        atk: function(p) { return !(p.unit.class.has("Cerebral")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.5; },
+        chainModifier: function(p) { return  p.percHP <= 30.0 ? 1.5 : 1; }
+    },
+    1572: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1 : 1; }
+    },
+    1573: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
+    1574: {
+        atk: function(p) { return p.unit.type == "INT" ? 1 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1 : 1; }
+    },
+    1575: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+    },
+    1576: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 1 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1577: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1579: {
+        atk: function(p) { return 1; },
+        rcv: function(p) { return 1; },
+        hp: function(p) { return 1; },
+    },
+    1579: {
+        atk: function(p) { return 1.3; },
+        rcv: function(p) { return 1.3; },
+        hp: function(p) { return 1.3; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 7ec09f2cb..aee191880 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8649,4 +8649,66 @@ window.details = {
         special: "Randomizes all orbs, including [BLOCK] orbs and switches orbs between slots three times",
         specialName: "Law Special",
     },
+    1570: {//Inuarashi
+        captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
+        special: "Reduces crew's current HP by ??%, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good, and does additional effects",
+        specialNotes: "Additional effects are not known yet and may be a new mechanic.",
+        specialName: "Inuarashi Special",
+    },
+    1571: {//Inuarashi
+        captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
+        special: "Reduces crew's current HP by ??%, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good, and does additional effects",
+        specialNotes: "Additional effects are not known yet and may be a new mechanic.",
+        specialName: "Inuarashi Special",
+    },
+    1572: {//Wanda
+        captain: "Boosts ATK of Cerebral characters by ???x, and their RCV by ???x",
+        special: "Randomizes non-matching orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        sailor: "Reduces Paralysis duration by 1 turn",
+        specialName: "Wanda Special",
+    },
+    1573: {//Wanda
+        captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
+        special: "Randomizes non-matching orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        sailor: "Reduces Paralysis duration by 1 turn",
+        specialName: "Wanda Special",
+    },
+    1574: {//Sicilian
+        captain: "Boosts ATK of [INT] characters by ???x and their RCV by ???x",
+        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes all orbs on Cerebral characters into Matching orbs.",
+        sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
+        specialName: "Sicilian Special",
+    },
+    1575: {//Sicilian
+        captain: "Boosts ATK of [INT] characters by 2.5x and their RCV by 1.2x",
+        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes all orbs on Cerebral characters into Matching orbs.",
+        sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
+        specialName: "Sicilian Special",
+    },
+    1576: {//Kin'emon
+        captain: "Boosts ATK by ???x following a chain of Good > Great > Perfect hits, recovers ?x character's RCV in HP at the end of each turn",
+        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Matching orbs.",
+        specialNotes: "Not confirmed if it's all characters for the orb shuffle.",
+        sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
+        specialName: "Kin'emon Special",
+    },
+    1577: {//Kin'emon
+        captain: "Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits, recovers 3x character's RCV in HP at the end of each turn",
+        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Matching orbs.",
+        specialNotes: "Not confirmed if it's all characters for the orb shuffle.",
+        sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
+        specialName: "Kin'emon Special",
+    },
+    1578: {//Momonosuke
+        captain: "Boosts ATK, HP and RCV of all characters by ???x, protects from defeat as long as HP is above ???%",
+        special: "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
+        sailor: "Makes [STR], [QCK], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Momonosuke Special",
+    },
+    1579: {//Momonosuke
+        captain: "Boosts ATK, HP and RCV of all characters by 1.35x, protects from defeat as long as HP is above 30%",
+        special: "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
+        sailor: "Makes [STR], [QCK], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Momonosuke Special",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 076f2b410..c30864313 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2415,4 +2415,24 @@ window.evolutions = {
         evolution: 1568,
         evolvers: [  ]
     },
+    1570: {
+        evolution: 1571,
+        evolvers: [  ]
+    },
+    1572: {
+        evolution: 1573,
+        evolvers: [  ]
+    },
+    1574: {
+        evolution: 1575,
+        evolvers: [  ]
+    },
+    1576: {
+        evolution: 1577,
+        evolvers: [  ]
+    },
+    1578: {
+        evolution: 1579,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 8533689d7..6a27380d2 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1568,4 +1568,14 @@ window.families = [
     "Boa Hancock",
     "Boa Hancock",
     "Trafalgar Law",
+    "Inuarashi",
+    "Inuarashi",
+    "Wanda",
+    "Wanda",
+    "Sicilian",
+    "Sicilian",
+    "Kinemon",
+    "Kinemon",
+    "Momonosuke",
+    "Momonosuke",
 ];
diff --git a/common/data/flags.js b/common/data/flags.js
index d72b3f5f8..32e281caa 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1352,4 +1352,14 @@ window.flags = {
     1567: { rr: 1, rro: 1, lrr: 1 },
     1568: { rr: 1, rro: 1, lrr: 1 },
     1569: { special: 1 },
+    1570: { rr: 1, rro: 1 },
+    1571: { rr: 1, rro: 1 },
+    1572: { rr: 1, rro: 1 },
+    1573: { rr: 1, rro: 1 },
+    1574: { rr: 1, rro: 1 },
+    1575: { rr: 1, rro: 1 },
+    1576: { rr: 1, rro: 1 },
+    1577: { rr: 1, rro: 1 },
+    1578: { rr: 1, rro: 1 },
+    1579: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 09dc1da8f..fd4ba978d 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -270,4 +270,11 @@ window.sailors = {
     1540: {
         atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
     },
+    1574: {
+        atkStatic: function(p) { return p.percHP <= 30.0 ? 200 : 0; },
+    },
+    1575: {
+        atkStatic: function(p) { return p.percHP <= 30.0 ? 200 : 0; },
+    },
+    
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 4cce949e3..b014d82c8 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2530,4 +2530,25 @@ window.specials = {
     1568: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
+    1570: {
+        staticMult: function(p) { return 80; }
+    },
+    1571: {
+        staticMult: function(p) { return 80; }
+    },
+    1572: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        type: "class"
+    },
+    1573: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        type: "class"
+    },
+    1578: {
+        chainAddition: function(p) { return 0.5; }
+    },
+    1579: {
+        chainAddition: function(p) { return 0.5; }
+    },
+    
 };
diff --git a/common/data/units.js b/common/data/units.js
index 706a57eba..cc4c250eb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1568,6 +1568,16 @@ window.units = [
     [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, null, 197, 109, 15, 2017, 1230, 245, null ],
+    [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wanda, Mink Tribe", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sicilian, Mink Tribe", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 223b483d7..ab7f3a35f 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -387,4 +387,12 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    1578: { // Momonosuke
+        type: 'zombie',
+        threshold: 0.3
+    },
+    1579: { // Momonosuke
+        type: 'zombie',
+        threshold: 0.3
+    },
 };

From 55e1707d4dc9eaea3ae5dbff9240b12e2dc0071e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 26 Apr 2017 20:51:47 -0400
Subject: [PATCH 0978/1569] Some filters

Idk, but something is probably broken
---
 characters/js/directives.js | 14 +++++++-------
 characters/js/table.js      |  2 ++
 common/data/captains.js     | 16 +++++-----------
 common/data/details.js      | 24 +++++++++++-------------
 common/data/drops.js        | 27 +++++++++++++++++++++++++++
 common/data/matchers.js     | 20 +++++++++++++++++++-
 common/data/sailors.js      |  4 ++--
 7 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 65922084a..0c3259a60 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -133,8 +133,8 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
     
 directives.addSailorOptions = function($timeout, $compile, MATCHER_IDS) {
     //TO DO ONCE WE FIND OUT WHAT SAILOR ABILITIES DO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    /*
-    var TARGET = MATCHER_IDS['captain.ClassBoostingCaptains'];
+    
+    var TARGET = MATCHER_IDS['sailor.ClassBoostingSailors'];
     return {
         restrict: 'A',
         link: function(scope, element, attrs) {
@@ -142,17 +142,17 @@ directives.addSailorOptions = function($timeout, $compile, MATCHER_IDS) {
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
             var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven' ];
             classes.forEach(function(x,n) {
-                var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
-                    'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
+                var template = '<span class="filter subclass %c" ng-class="{ active: filters.classSailor == \'%s\' }" ' +
+                    'ng-click="onSailorClick($event,\'%s\')">%s</span>';
                 filter.append($(template.replace(/%s/g,x).replace(/%c/,'width-6')));
             });
             element.after(filter);
             $compile(filter)(scope);
-            scope.onCaptainClick = function(e,type) {
-                scope.filters.classCaptain = (scope.filters.classCaptain == type ? null : type);
+            scope.onSailorClick = function(e,type) {
+                scope.filters.classSailor = (scope.filters.classSailor == type ? null : type);
             };
         }
-    };*/
+    };
 };
 
 directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
diff --git a/characters/js/table.js b/characters/js/table.js
index 869f4d8d2..5aae0afa8 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -196,6 +196,8 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
                 !CharUtils.isClassBooster('captain', id, filters.classCaptain)) return false;
         if ($rootScope.filters.custom[MATCHER_IDS['special.ClassBoostingSpecials']] && filters.classSpecial &&
                 !CharUtils.isClassBooster('special', id, filters.classSpecial)) return false;
+        if ($rootScope.filters.custom[MATCHER_IDS['sailor.ClassBoostingSailors']] && filters.classSailor &&
+                !CharUtils.isClassBooster('sailor', id, filters.classSailor)) return false;
         return true;
     };
 
diff --git a/common/data/captains.js b/common/data/captains.js
index 201c6e303..c04eef299 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4602,24 +4602,23 @@ window.captains = {
         chainModifier: function(p) { return  p.percHP <= 30.0 ? 1.5 : 1; }
     },
     1572: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1573: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1574: {
-        atk: function(p) { return p.unit.type == "INT" ? 1 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
     },
     1575: {
         atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
     },
     1576: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 1 : 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.5 : 1;
         },
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -4629,11 +4628,6 @@ window.captains = {
         },
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    1579: {
-        atk: function(p) { return 1; },
-        rcv: function(p) { return 1; },
-        hp: function(p) { return 1; },
-    },
     1579: {
         atk: function(p) { return 1.3; },
         rcv: function(p) { return 1.3; },
diff --git a/common/data/details.js b/common/data/details.js
index aee191880..f4770c924 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8651,18 +8651,16 @@ window.details = {
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by ??%, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good, and does additional effects",
-        specialNotes: "Additional effects are not known yet and may be a new mechanic.",
+        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "Inuarashi Special",
     },
     1571: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by ??%, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good, and does additional effects",
-        specialNotes: "Additional effects are not known yet and may be a new mechanic.",
+        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "Inuarashi Special",
     },
     1572: {//Wanda
-        captain: "Boosts ATK of Cerebral characters by ???x, and their RCV by ???x",
+        captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
         special: "Randomizes non-matching orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Wanda Special",
@@ -8674,33 +8672,33 @@ window.details = {
         specialName: "Wanda Special",
     },
     1574: {//Sicilian
-        captain: "Boosts ATK of [INT] characters by ???x and their RCV by ???x",
+        captain: "Boosts ATK of [INT] characters by 2.25x",
         special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes all orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
         specialName: "Sicilian Special",
     },
     1575: {//Sicilian
-        captain: "Boosts ATK of [INT] characters by 2.5x and their RCV by 1.2x",
+        captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.2x",
         special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes all orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
         specialName: "Sicilian Special",
     },
     1576: {//Kin'emon
-        captain: "Boosts ATK by ???x following a chain of Good > Great > Perfect hits, recovers ?x character's RCV in HP at the end of each turn",
-        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Matching orbs.",
-        specialNotes: "Not confirmed if it's all characters for the orb shuffle.",
+        captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
+        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [Rainbow] and [BLOCK] orbs has not been confirmed",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Kin'emon Special",
     },
     1577: {//Kin'emon
         captain: "Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits, recovers 3x character's RCV in HP at the end of each turn",
-        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Matching orbs.",
-        specialNotes: "Not confirmed if it's all characters for the orb shuffle.",
+        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [Rainbow] and [BLOCK] orbs has not been confirmed",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Kin'emon Special",
     },
     1578: {//Momonosuke
-        captain: "Boosts ATK, HP and RCV of all characters by ???x, protects from defeat as long as HP is above ???%",
+        captain: "Protects from defeat as long as HP is above ???%",
         special: "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
         sailor: "Makes [STR], [QCK], [INT], and [DEX] orbs \"beneficial\" for this unit",
         specialName: "Momonosuke Special",
diff --git a/common/data/drops.js b/common/data/drops.js
index a545a4eef..bd45d43cf 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1515,6 +1515,7 @@ window.drops = {
             name: 'Clash!! Mihawk',
             thumb: 227,
             global: true,
+            gamewith: 4142,
             Master: [ 86, 112, 118, 226 ],
             Expert: [ 97, 112, 226 ]
         },
@@ -1523,6 +1524,7 @@ window.drops = {
             name: 'Clash!! Chopper\'s Rampage',
             thumb: 249,
             global: true,
+            gamewith: 5210,
             Master: [ 84, 110, 118, 248 ],
             Expert: [ 84, 110, 248 ]
         },
@@ -1531,6 +1533,7 @@ window.drops = {
             name: 'Clash!! Vice-Admiral Garp',
             thumb: 306,
             global: true,
+            gamewith: 5905,
             Master: [ 113, 118, 262, 264, 305 ],
         },
 
@@ -1538,6 +1541,7 @@ window.drops = {
             name: 'Clash!! Black Arm Zephyr',
             thumb: 353,
             global: true,
+            gamewith: 7293,
             Master: [ 88, 114, 118, 352, 354 ],
             Expert: [ 99, 114, 117, 352, 354 ]
         },
@@ -1546,6 +1550,7 @@ window.drops = {
             name: 'Clash!! Ivankov',
             thumb: 390,
             global: true,
+            gamewith: 8285,
             Master: [ 85, 111, 118, 389 ],
             Expert: [ 85, 96, 111, 389 ]
         },
@@ -1554,6 +1559,7 @@ window.drops = {
             name: 'Clash!! Doflamingo',
             thumb: 418,
             global: true,
+            gamewith: 9037,
             Ultimate: [ 86, 112, 118, 302, 417 ],
             Master: [ 86, 97, 112, 417 ]
         },
@@ -1562,6 +1568,7 @@ window.drops = {
             name: 'Clash!! Blackbeard',
             thumb: 447,
             global: true,
+            gamewith: 11051,
             Master: [ 84, 110, 118, 300, 446 ],
             Expert: [ 84, 110, 446 ]
         },
@@ -1571,6 +1578,7 @@ window.drops = {
             thumb: 518,
             showManual: true,
             global: true,
+            gamewith: 12014,
             'Ultimate': [ 517, -15, -16, -1446, -223 ]
         },
 
@@ -1578,6 +1586,7 @@ window.drops = {
             name: 'Clash!! Heracles\'n',
             thumb: 516,
             global: true,
+            gamewith: 11958,
             Master: [ 87, 97, 113, 117, 118, 294, 295, 303, 429, 515 ],
             Expert: [ 87, 98, 113, 117, 293, 295, 429, 379, 515 ]
         },
@@ -1586,6 +1595,7 @@ window.drops = {
             name: 'Clash!! Aokiji',
             thumb: 575,
             global: true,
+            gamewith: 12792,
             Ultimate: [ 88, 114, 118, 304, 574 ],
             Master: [ 114, 118, 574 ]
         },
@@ -1594,6 +1604,7 @@ window.drops = {
             name: 'Clash!! Eneru',
             thumb: 603,
             global: true,
+            gamewith: 13682,
             Ultimate: [ 85, 111, 118, 301, 602 ],
             Master: [ 85, 111, 118, 602 ] ,
             Expert: [ 111, 118, 602 ]
@@ -1603,6 +1614,7 @@ window.drops = {
             name: 'Clash!! Duval',
             thumb: 654,
             global: true,
+            gamewith: 14747,
             Master: [ 112, 118, 302, 652 ],
             Expert: [ 86, 97, 112, 652 ]
         },
@@ -1611,6 +1623,7 @@ window.drops = {
             name: 'Clash!! Buster Call',
             thumb: 771,
             global: true,
+            gamewith: 17344,
             Master: [ 110, 111, 112, 113, 114, 770, 771, 772, 773, 774, 775 ],
             Expert: [ 110, 111, 112, 113, 114, 770, 771, 772, 773, 774, 775 ]
         },
@@ -1618,6 +1631,7 @@ window.drops = {
         {
             name: 'Clash!! Nightmare Luffy',
             thumb: 795,
+            gamewith: 18565,
             Master: [ 794 ],
             Expert: [ 794 ]
         },
@@ -1626,6 +1640,7 @@ window.drops = {
             name: 'Clash!! Tyrant Kuma',
             thumb: 836,
             global: true,
+            gamewith: 19424,
             Ultimate: [ 835 ],
             Master: [ 835 ]
         },
@@ -1634,6 +1649,7 @@ window.drops = {
             name: 'Clash!! Pirate Empress Hancock',
             thumb: 865,
             global: true,
+            gamewith: 21345,
             Ultimate: [ 864 ],
             Master: [ 864 ],
             Expert: [ 864 ]
@@ -1642,6 +1658,7 @@ window.drops = {
         {
             name: 'Clash!! Pica',
             thumb: 932,
+            gamewith: 23507,
             Master: [ 932 ],
             Expert: [ 932 ]
         },
@@ -1650,6 +1667,7 @@ window.drops = {
             name: 'Clash!! Kizaru',
             thumb: 978,
             global: true,
+            gamewith: 25109,
             Ultimate: [ 977 ],
             Master: [ 977 ]
         },
@@ -1658,6 +1676,7 @@ window.drops = {
             name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
             global: true,
+            gamewith: 26803,
             thumb: 989,
             Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -1446, -556, -528, -520, -554, -558, -20, -1447, -217, -709, -1115, -1177, -1175, -1210, -1208, -1387, -1388, -1389 ]
         },
@@ -1665,6 +1684,7 @@ window.drops = {
         {
             name: 'Clash!! Sabo',
             global: true,
+            gamewith: 29788,
             thumb: 1047,
             Ultimate: [ 1046 ],
             Master: [ 1046 ],
@@ -1675,6 +1695,7 @@ window.drops = {
             name: 'Clash!! Shiki',
             thumb: 1108,
             global: true,
+            gamewith: 33648,
             Ultimate: [ 1107 ],
             Master: [ 1107 ],
             Expert: [ 1107 ]
@@ -1684,6 +1705,7 @@ window.drops = {
             name: 'Clash!! Gild Tesoro',
             thumb: 1163, 
             global: true,
+            gamewith: 35950,
             Master: [ 1162, 1164 ],
             Ultimate: [ 1162, 1164, 1180 ]
         },
@@ -1692,24 +1714,28 @@ window.drops = {
             name: 'Clash!! Akainu',
             thumb: 1298,
             global: true,
+            gamewith: 41277,
             Ultimate: [ 1297 ]
         },
         {
             name: 'Clash!! Warden Magellan',
             thumb: 1374,
             condition: "Take 7% MAX Health in Environmental Damage",
+            gamewith: 45906,
             Master: [ 1373 ],
             Expert: [ 1373 ],
         },
         {
             name: 'Clash!! Shogun Franky',
             thumb: 1432,
+            gamewith: 50030,
             Master: [ 1431, 215, 799 ],
             Ultimate: [ 1431, 215, 799 ],
         },
         {
             name: 'Clash!! Bellamy',
             thumb: 1518,
+            gamewith: '%20%2053151',
             Master: [ 1517 ],
             Expert: [ 1517 ],
         },
@@ -1768,6 +1794,7 @@ window.drops = {
             name: 'Coliseum',
             thumb: 779,
             global: true,
+            gamewith: 17473,
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552 ],
             Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554 ]
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 42607bc80..0d737529b 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -468,7 +468,25 @@ window.matchers = [
     {
         name: '"Beneficial" Orb sailors',
         target: 'sailor',
-        matcher: /Makes (\[STR\]|\[DEX\]|\[QCK\]|\[PSY\]|\[INT\]|\[RCV\]|\[TND\]) orbs "beneficial"/i
+        matcher: /"beneficial/i
+    },
+    
+    {
+        name: 'Paralysis reducers',
+        target: 'sailor',
+        matcher: /(reduces|removes).+Paralysis/i 
+    },
+
+    {
+        name: 'Blindness removers',
+        target: 'sailor',
+        matcher: /(reduces|removes|resists).+blindness/i
+    },
+    
+    {
+        name: 'Silence reducers',
+        target: 'sailor',
+        matcher: /(reduces|removes|resists).+silence/i
     },
 
 ];
diff --git a/common/data/sailors.js b/common/data/sailors.js
index fd4ba978d..618655956 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -271,10 +271,10 @@ window.sailors = {
         atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
     },
     1574: {
-        atkStatic: function(p) { return p.percHP <= 30.0 ? 200 : 0; },
+        atkStatic: function(p) { return p.percHP <= 10.0 ? 200 : 0; },
     },
     1575: {
-        atkStatic: function(p) { return p.percHP <= 30.0 ? 200 : 0; },
+        atkStatic: function(p) { return p.percHP <= 10.0 ? 200 : 0; },
     },
     
 };
\ No newline at end of file

From 4e8b2642b185b2cfa7badb358eda24f5f3558870 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 26 Apr 2017 21:21:00 -0500
Subject: [PATCH 0979/1569] Dummy stats

Solaris did all the work
---
 common/data/units.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index cc4c250eb..dbd8c169a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1569,15 +1569,15 @@ window.units = [
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, null, 197, 109, 15, 2017, 1230, 245, null ],
     [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1, 1, 1, 3000, 1500, 100, null ],
     [ "Wanda, Mink Tribe", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
     [ "Sicilian, Mink Tribe", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
     [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
     [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 10f4c0e8475fffc664735bb8d5e2a4d863347428 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 27 Apr 2017 01:08:43 -0500
Subject: [PATCH 0980/1569] Changes to wanda/sici

---
 common/data/details.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f4770c924..afb676a61 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8651,35 +8651,35 @@ window.details = {
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "Inuarashi Special",
     },
     1571: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "Inuarashi Special",
     },
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
-        special: "Randomizes non-matching orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        special: "Randomizes all orbs, including [BLOCK] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Wanda Special",
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
-        special: "Randomizes non-matching orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        special: "Randomizes all orbs, including [BLOCK] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Wanda Special",
     },
     1574: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.25x",
-        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes all orbs on Cerebral characters into Matching orbs.",
+        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
         specialName: "Sicilian Special",
     },
     1575: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.2x",
-        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes all orbs on Cerebral characters into Matching orbs.",
+        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
         specialName: "Sicilian Special",
     },

From 8e380ed66b46464d22037f4bf5dab9287436e996 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 27 Apr 2017 01:12:22 -0500
Subject: [PATCH 0981/1569] Wanda Fix 2

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index afb676a61..35da2091e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8661,13 +8661,13 @@ window.details = {
     },
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
-        special: "Randomizes all orbs, including [BLOCK] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Wanda Special",
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
-        special: "Randomizes all orbs, including [BLOCK] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Wanda Special",
     },

From acefca433b139bc8ea7e3d105b8066985815c3ef Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 27 Apr 2017 01:24:05 -0500
Subject: [PATCH 0982/1569] More fixes

---
 common/data/details.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 35da2091e..2289f2954 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8678,7 +8678,7 @@ window.details = {
         specialName: "Sicilian Special",
     },
     1575: {//Sicilian
-        captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.2x",
+        captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.25x",
         special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
         specialName: "Sicilian Special",
@@ -8691,7 +8691,7 @@ window.details = {
         specialName: "Kin'emon Special",
     },
     1577: {//Kin'emon
-        captain: "Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits, recovers 3x character's RCV in HP at the end of each turn",
+        captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
         special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [Rainbow] and [BLOCK] orbs has not been confirmed",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
@@ -8700,13 +8700,13 @@ window.details = {
     1578: {//Momonosuke
         captain: "Protects from defeat as long as HP is above ???%",
         special: "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-        sailor: "Makes [STR], [QCK], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
         specialName: "Momonosuke Special",
     },
     1579: {//Momonosuke
-        captain: "Boosts ATK, HP and RCV of all characters by 1.35x, protects from defeat as long as HP is above 30%",
+        captain: "Boosts ATK, HP and RCV of all characters by 1.25x, protects from defeat as long as HP is above 30%",
         special: "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-        sailor: "Makes [STR], [QCK], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
         specialName: "Momonosuke Special",
     },
 };

From 94ae9c0c387d1b61ef46061903c339f7d40d2154 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Thu, 27 Apr 2017 01:25:23 -0500
Subject: [PATCH 0983/1569] captain fix

---
 common/data/captains.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c04eef299..edd4ed876 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4614,7 +4614,7 @@ window.captains = {
     },
     1575: {
         atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 1.25 : 1; }
     },
     1576: {
         hitAtk: function(p) {

From 7ea8b40747e089b7e2b5dd6ca94602ace8a5bb81 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 27 Apr 2017 11:52:43 -0400
Subject: [PATCH 0984/1569] Small Fixed

and realistic stats
---
 common/data/details.js |  8 ++++----
 common/data/sailors.js |  8 ++++----
 common/data/units.js   | 10 +++++-----
 common/data/zombies.js |  4 ++++
 damage/css/main.css    |  1 +
 index.css              |  1 +
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2289f2954..e3e7b6550 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8674,26 +8674,26 @@ window.details = {
     1574: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.25x",
         special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
-        sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
+        sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
         specialName: "Sicilian Special",
     },
     1575: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.25x",
         special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
-        sailor: "When HP is below ???% at the start of the turn, boosts ATK of all characters by 200",
+        sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
         specialName: "Sicilian Special",
     },
     1576: {//Kin'emon
         captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
-        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [Rainbow] and [BLOCK] orbs has not been confirmed",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [RAINBOW] and [BLOCK] orbs has not been confirmed",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Kin'emon Special",
     },
     1577: {//Kin'emon
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
         special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
-        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [Rainbow] and [BLOCK] orbs has not been confirmed",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [RAINBOW] and [BLOCK] orbs has not been confirmed",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Kin'emon Special",
     },
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 618655956..92558602b 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -270,11 +270,11 @@ window.sailors = {
     1540: {
         atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
     },
-    1574: {
-        atkStatic: function(p) { return p.percHP <= 10.0 ? 200 : 0; },
+    1574: {//not working
+        atkStatic: function(p) { return p.percHP <= 10.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
-    1575: {
-        atkStatic: function(p) { return p.percHP <= 10.0 ? 200 : 0; },
+    1575: {//not working
+        atkStatic: function(p) { return p.percHP <= 10.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
     
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index dbd8c169a..6e2930cb7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1569,15 +1569,15 @@ window.units = [
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, null, 197, 109, 15, 2017, 1230, 245, null ],
     [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1, 1, 1, 3000, 1500, 100, null ],
+    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1, 1, 1, 3000, 1500, 300, null ],
     [ "Wanda, Mink Tribe", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
+    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
     [ "Sicilian, Mink Tribe", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
+    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
     [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
+    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
     [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 1, 99, 2, 1, 1, 1, 1000, 1000, 1000, null ],
+    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index ab7f3a35f..42e418b0d 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -387,6 +387,10 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    1577: { // Kin'emon
+        type: 'healer',
+        multiplier: 3
+    },
     1578: { // Momonosuke
         type: 'zombie',
         threshold: 0.3
diff --git a/damage/css/main.css b/damage/css/main.css
index ce77a11b9..a9298dded 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -1044,6 +1044,7 @@ body > .popover .popover-content {
 .popover-data .TND   { background: peru; }
 .popover-data .BLOCK { background: darkslateblue; }
 .popover-data .BOMB  { background: maroon; }
+.popover-data .RAINBOW { background: magenta; }
 .popover-data .G     { background: orange; }
 
 .block-icon:before, .tnd-icon:before {
diff --git a/index.css b/index.css
index 7895e2bbe..210703cd6 100644
--- a/index.css
+++ b/index.css
@@ -150,6 +150,7 @@ body {
 .TND   { background: peru; }
 .BLOCK { background: darkslateblue; }
 .BOMB  { background: maroon; }
+.RAINBOW { background: magenta; }
 .G     { background: orange; }
 .EMPTY { background: #777; }
 

From 7516d53a1b86244e11b0215b50c53b79207e22b5 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 28 Apr 2017 16:52:38 -0400
Subject: [PATCH 0985/1569] I think I got it all?

New Colo units and shit.
---
 common/data/aliases.js    | 21 ++++++++++-----
 common/data/captains.js   | 26 ++++++++++++++++++
 common/data/details.js    | 57 +++++++++++++++++++++++++++++++--------
 common/data/drops.js      | 12 +++++++--
 common/data/evolutions.js | 16 +++++++++--
 common/data/families.js   |  7 +++++
 common/data/flags.js      | 16 +++++++++--
 common/data/gw.js         | 14 ++++++++--
 common/data/specials.js   | 49 +++++++++++++++++++++++++++++++++
 common/data/units.js      | 13 ++++++---
 10 files changed, 202 insertions(+), 29 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7c86e9c77..3ca4acdb7 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -992,8 +992,8 @@ window.aliases = {
     991: ['マッハ・バイス ドンキホーテ海賊団',''],
     992: ['グラディウス',''],
     993: ['グラディウス ドンキホーテ海賊団',''],
-    994: ['ヴァイオレット',''],
-    995: ['ヴァイオレット ドンキホーテ海賊団',''],
+    994: ['ヴァイオレット','', 'Viola'],
+    995: ['ヴァイオレット ドンキホーテ海賊団','', 'Viola'],
     996: ['デリンジャー',''],
     997: ['デリンジャー ドンキホーテ海賊団',''],
     998: ['ディアマンテ',''],
@@ -1447,8 +1447,8 @@ window.aliases = {
     1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp'],
     1447: ['サンジ グリル＝ショット', '', 'Mega Sanji'],
     1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper'],
-    1449: ['ヴァイオレット 踊り娘', '', ''],
-    1450: ['ヴァイオレット 追われる女', '', ''],
+    1449: ['ヴァイオレット 踊り娘', '', 'Viola'],
+    1450: ['ヴァイオレット 追われる女', '', 'Viola'],
     1451: ['サンジ 恋人通りの変装男', '', ''],
     1452: ['サンジ となり町までの護衛', '', ''],
     1453: ['マーガレット １３日の胸騒ぎ', '', 'Valentine Marguerite'],
@@ -1567,9 +1567,9 @@ window.aliases = {
     1566: ['軍師ダガマ プロデンス王国', '', ''],
     1567: ['', '', 'Kid Boa Hancock'],
     1568: ['', '', 'Kid Boa Hancock'],
-    1569: ['', '', 'Anniversary Law'],
-    1570: ['', '', 'Inuyasha'],
-    1571: ['', '', 'Inuyasha'],
+    1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law'],
+    1570: ['', '', 'Inuyasha', 'Dogstorm'],
+    1571: ['', '', 'Inuyasha', 'Dogstorm'],
     1572: ['', '', ''],
     1573: ['', '', ''],
     1574: ['', '', ''],
@@ -1578,4 +1578,11 @@ window.aliases = {
     1577: ['', '', 'Kin\'emon'],
     1578: ['', '', ''],
     1579: ['', '', ''],
+    1580: ['', '', ''],
+    1581: ['', '', ''],
+    1582: ['', '', ''],
+    1583: ['', '', 'Coliseum Orlumbus'],
+    1584: ['', '', 'Coliseum Orlumbus'],
+    1585: ['', '', 'Coliseum Helmeppo'],
+    1586: ['', '', 'Coliseum Helmeppo'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index edd4ed876..db3578abb 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4633,4 +4633,30 @@ window.captains = {
         rcv: function(p) { return 1.3; },
         hp: function(p) { return 1.3; },
     },
+    1580: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1 : 1; },
+    },
+    1581: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+    },
+    1582: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+    },
+    1583: {
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 1 : 1; }
+    },
+    1584: {
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+    },
+    1585: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1 : 1; },
+    },
+    1586: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index e3e7b6550..247e5bcec 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6857,15 +6857,15 @@ window.details = {
         captain: "Boosts ATK by 2x after the 2nd Perfect and by 3x after the 5th Perfect.",
         special: [
             {
-                "description": "If HP is below 3,000, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
+                "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
                 "cooldown": [ 15, 9 ],
             },
             {
-                "description": "If HP is below 3,000, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
+                "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
                 "cooldown": [ 20, 14 ],
             },
             {
-                "description": "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+                "description": "If HP is below 3,000 when the special is activated, removes No Healing debuff. Recovers 13x character's RCV in HP",
                 "cooldown": [ 24, 18 ],
             },
         ],
@@ -6877,15 +6877,15 @@ window.details = {
         captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
         special: [
             {
-                "description": "If HP is below 3,000, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
+                "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
                 "cooldown": [ 15, 9 ],
             },
             {
-                "description": "If HP is below 3,000, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
+                "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
                 "cooldown": [ 20, 14 ],
             },
             {
-                "description": "If HP is below 3,000, removes No Healing debuff. Recovers 13x character's RCV in HP",
+                "description": "If HP is below 3,000 when the special is activated, removes No Healing debuff. Recovers 13x character's RCV in HP",
                 "cooldown": [ 24, 18 ],
             },
         ],
@@ -7729,7 +7729,7 @@ window.details = {
         specialName: "General Cannon",
     },
     1433: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
@@ -7744,7 +7744,7 @@ window.details = {
         specialName: "Water Bullets",
     },
     1434: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
@@ -8647,7 +8647,7 @@ window.details = {
     1569: {//Anniversary Law
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
         special: "Randomizes all orbs, including [BLOCK] orbs and switches orbs between slots three times",
-        specialName: "Law Special",
+        specialName: "ROOM Shambles・Junction",
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
@@ -8662,13 +8662,13 @@ window.details = {
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
         special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
-        sailor: "Reduces Paralysis duration by 1 turn",
+        sailor: "Reduces Paralysis duration by 1 turn for herself",
         specialName: "Wanda Special",
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
         special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
-        sailor: "Reduces Paralysis duration by 1 turn",
+        sailor: "Reduces Paralysis duration by 1 turn for herself",
         specialName: "Wanda Special",
     },
     1574: {//Sicilian
@@ -8709,4 +8709,39 @@ window.details = {
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
         specialName: "Momonosuke Special",
     },
+    1580: {//Fortnight Law
+        captain: "Not Released",
+        special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by ???x for 1 turn",
+        specialName: "Law Special",
+    },
+    1581: {//Fortnight Law
+        captain: "Boosts ATK of Free Spirit characters by 2x and boosts RCV of DEX characters by 1.5x",
+        special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by ???x for 1 turn",
+        specialName: "Law Special",
+    },
+    1582: {//Fortnight Monet
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
+        special: "Recovers 10x character's RCV in HP. Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn",
+        specialName: "Monet Special",
+    },
+    1583: {//Coliseum Orlumbus
+        captain: "Not Released",
+        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Fighter characters by 1.5x for 1 turn otherwise",
+        specialName: "Orlumbus Special",
+    },
+    1584: {//Coliseum Orlumbus
+        captain: "Boosts ATK of Striker characters by 3x (or 2.7x) if HP is below ??% at the start of the turn, by 2.5x otherwise",
+        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Fighter characters by 1.5x for 1 turn otherwise",
+        specialName: "Orlumbus Special",
+    },
+    1585: {//Coliseum Helmeppo
+        captain: "Not Released",
+        special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
+        specialName: "Helmeppo Special",
+    },
+    1586: {//Coliseum Helmeppo
+        captain: "Boosts ATK of Slasher and Driven characters by 2x and their RCV by 1.5x",
+        special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
+        specialName: "Helmeppo Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index bd45d43cf..3bbbca404 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -662,7 +662,7 @@ window.drops = {
             name: "King Neptune's Execution Site - Noah's Ark",
             shortName: "Fishman Island 2",
             thumb: 1562,
-            completion: '10x Rainbow Gems',
+            completion: '5x Rainbow Gems',
             gamewith: 54695,
             "01": [  ],
             "02": [  ],
@@ -1502,10 +1502,18 @@ window.drops = {
             name: "Prodence Kingdom",
             thumb: 1564,
             gamewith: 55145,
-            //condition: "You can only bring PSY units",
+            condition: "Elizabello will kill you with one punch",
             "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
         },
         
+        {
+            name: "Punk Hazard",
+            thumb: 1581,
+            gamewith: null,
+            //condition: "Elizabello will kill you with one punch",
+            "All Difficulties": [ 1580, 1582, -1391, -1444, -1436, -1551, -896, -910, -357, -995, -890, -1342 ],
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index c30864313..10c4e893e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2405,11 +2405,11 @@ window.evolutions = {
     },
     1563: {
         evolution: 1564,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 84, 95, 100 ]
     },
     1565: {
         evolution: 1566,
-        evolvers: [  ]
+        evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1567: {
         evolution: 1568,
@@ -2435,4 +2435,16 @@ window.evolutions = {
         evolution: 1579,
         evolvers: [  ]
     },
+    1580: {
+        evolution: 1581,
+        evolvers: [  ]
+    },
+    1583: {
+        evolution: 1584,
+        evolvers: [  ]
+    },
+    1585: {
+        evolution: 1586,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 6a27380d2..373a593bb 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1578,4 +1578,11 @@ window.families = [
     "Kinemon",
     "Momonosuke",
     "Momonosuke",
+    "Trafalgar Law",
+    "Trafalgar Law",
+    "Monet",
+    "Orlumbus",
+    "Orlumbus",
+    "Helmeppo",
+    "Helmeppo",
 ];
diff --git a/common/data/flags.js b/common/data/flags.js
index 32e281caa..49d66d614 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -918,6 +918,8 @@ window.flags = {
     929: { global: 1 },
     930: { global: 1 },
     931: { global: 1 },
+    932: { global: 1 },
+    933: { global: 1 },
     934: { rr: 1, rro: 1, global: 1 },
     935: { rr: 1, rro: 1, global: 1 },
     936: { rr: 1, rro: 1, global: 1 },
@@ -1025,6 +1027,8 @@ window.flags = {
     1039: { global: 1 },
     1040: { global: 1 },
     1041: { global: 1 },
+    1042: { global: 1 },
+    1043: { global: 1 },
     1044: { rr: 1, rro: 1, global: 1 },
     1045: { rr: 1, rro: 1, global: 1 },
     1046: { global: 1 },
@@ -1067,6 +1071,8 @@ window.flags = {
     1083: { rr: 1, rro: 1, global: 1 },
     1084: { rr: 1, rro: 1, global: 1 },
     1085: { rr: 1, rro: 1, global: 1 },
+    1090: { global: 1 },
+    1091: { global: 1 },
     1092: { rr: 1, rro: 1, lrr: 1 },
     1093: { rr: 1, rro: 1, lrr: 1 },
     1094: { global: 1 },
@@ -1193,6 +1199,10 @@ window.flags = {
     1238: { rr: 1, rro: 1, global: 1 },
     1239: { rr: 1, rro: 1, global: 1 },
     1240: { rr: 1, rro: 1, global: 1 },
+    1241: { global: 1 },
+    1242: { global: 1 },
+    1243: { global: 1 },
+    1244: { global: 1 },
     1248: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1245: { special: 1, global: 1 },
     1246: { special: 1, global: 1 },
@@ -1225,8 +1235,8 @@ window.flags = {
     1281: { global: 1 },
     1282: { global: 1 },
     1283: { global: 1 },
-    1284: { shop: 1 },
-    1285: { shop: 1 },
+    1284: { shop: 1, global: 1 },
+    1285: { shop: 1, global: 1 },
     1295: { rr: 1, rro: 1, lrr: 1 },
     1296: { rr: 1, rro: 1, lrr: 1 },
     1297: { global: 1 },
@@ -1274,6 +1284,8 @@ window.flags = {
     1370: { rr: 1, rro: 1, global: 1 },
     1371: { shop: 1 },
     1372: { shop: 1 },
+    1379: { global: 1 },
+    1380: { global: 1 },
     1381: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1382: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1387: { global: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index 8ef73d1df..3f017d23f 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1565,7 +1565,17 @@ window.gw=[
     55148,    
     55149,
     55149,
-    null,
-    null,
+    55425,
+    55425,
     55433,
+    55743,
+    55743,
+    55744,
+    55744,
+    55823,
+    55823,
+    55766,
+    55766,
+    55822,
+    55822,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index b014d82c8..fbe8cf9e7 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2524,6 +2524,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         type: "class"
     },
+    1563: {
+        chainAddition: function(p) { return 0.3; }
+    },
+    1564: {
+        chainAddition: function(p) { return 0.3; }
+    },
     1567: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
@@ -2550,5 +2556,48 @@ window.specials = {
     1579: {
         chainAddition: function(p) { return 0.5; }
     },
+    1580: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+    },
+    1581: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+    },
+    1582: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        type: "class"
+    },
+    1583:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier); },
+        onActivation: function(p) {
+            var n = (window.specials[1583].multiplier == 1.5 ? 1 : 0);
+            window.specials[1583].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1583warning'
+            });
+        },
+    },
+    1584:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier); },
+        onActivation: function(p) {
+            var n = (window.specials[1584].multiplier == 1.5 ? 1 : 0);
+            window.specials[1584].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1584warning'
+            });
+        },
+    },
+    1585: {
+        atk: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
+        rcv: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
+        type: "class"
+    },
+    1586: {
+        atk: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
+        rcv: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
+        type: "class"
+    },
     
 };
diff --git a/common/data/units.js b/common/data/units.js
index 6e2930cb7..2457a4d85 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1567,9 +1567,9 @@ window.units = [
     [ "Tactician Dagama, Prodence Kingdom", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, 2022, 1011, 276, 1 ],
     [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, null, 197, 109, 15, 2017, 1230, 245, null ],
-    [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 4, 99, 5000000, 1, 1, 1, 3000, 1500, 300, null ],
+    [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, 2000000, 197, 109, 15, 2017, 1230, 245, 1 ],
+    [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, null ],
+    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, null ],
     [ "Wanda, Mink Tribe", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
     [ "Sicilian, Mink Tribe", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1578,6 +1578,13 @@ window.units = [
     [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
     [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
+    [ "Fortnight Law", "DEX", [ "Free Spirit", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Law, Evolved", "DEX", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fortnight Monet", "PSY", [ "Cerebral", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Orlumbus", "PSY", [ "Striker", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Orlumbus, Evolved", "PSY", [ "Striker", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Helmeppo, Evolved", "QCK", [ "Slasher", "Driven" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 9774b72af315db878b6b936c95ccaad94628ad3c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 28 Apr 2017 17:04:03 -0400
Subject: [PATCH 0986/1569] Found a typo

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 247e5bcec..bc568b8c2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8726,12 +8726,12 @@ window.details = {
     },
     1583: {//Coliseum Orlumbus
         captain: "Not Released",
-        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Fighter characters by 1.5x for 1 turn otherwise",
+        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Striker characters by 1.5x for 1 turn otherwise",
         specialName: "Orlumbus Special",
     },
     1584: {//Coliseum Orlumbus
         captain: "Boosts ATK of Striker characters by 3x (or 2.7x) if HP is below ??% at the start of the turn, by 2.5x otherwise",
-        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Fighter characters by 1.5x for 1 turn otherwise",
+        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Striker characters by 1.5x for 1 turn otherwise",
         specialName: "Orlumbus Special",
     },
     1585: {//Coliseum Helmeppo

From 31f4487f4045c39c55ed74c4d3e6f301d5e494ae Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 30 Apr 2017 00:23:37 -0400
Subject: [PATCH 0987/1569] New units

---
 common/data/aliases.js    |  4 ++--
 common/data/cooldowns.js  | 10 +++++++++
 common/data/details.js    | 46 ++++++++++++++++++++++++++++++---------
 common/data/evolutions.js |  8 +++----
 common/data/specials.js   | 20 +++++++++++++++--
 common/data/units.js      | 26 +++++++++++-----------
 6 files changed, 83 insertions(+), 31 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 3ca4acdb7..03ef85878 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1542,8 +1542,8 @@ window.aliases = {
     1541: ['エリザベス 麦わらの一味の協力者', '', ''],
     1542: ['エリザベス 麦わらの一味の共犯者', '', ''],
     1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp'],
-    1544: ['', '', ''],
-    1545: ['', '', ''],
+    1544: ['コアラ 桜色の待ち合わせ', '', 'Sakura Koala'],
+    1545: ['コアラ 桜色の口元', '', 'Sakura Koala'],
     1546: ['ソウルキング', '', 'Brook'],
     1547: ['“ソウルキング”ブルック 海賊', '', 'Brook'],
     1548: ['テーナ・ゲーナ王国の手長族 “ソウルキング”マネージャー', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index de6bf73f0..90aa6c482 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1568,4 +1568,14 @@ window.cooldowns = [
     null,
     null,
     [ 11, 11 ],
+    19,
+    19,
+    21,
+    21,
+    19,
+    19,
+    19,
+    19,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index bc568b8c2..b6a7561c8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7226,15 +7226,15 @@ window.details = {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: [
             {
-                "description": "Reduces duration of Paralysis and Silence by 1 turn. Delays all enemies for 1 turn",
+                "description": "Reduces Paralysis and Silence duration by 1 turn. Delays all enemies for 1 turn",
                 "cooldown": [ 13, 8 ],
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by 2 turns. Delays all enemies for 1 turn",
+                "description": "Reduces Paralysis and Silence duration by 2 turns. Delays all enemies for 1 turn",
                 "cooldown": [ 15, 10 ],
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
+                "description": "Reduces Paralysis and Silence duration by 5 turns. Delays all enemies for 2 turns",
                 "cooldown": [ 18, 13 ],
             },
         ],
@@ -7247,15 +7247,15 @@ window.details = {
         captain: "Boosts RCV of Cerebral characters by 1.5x and their ATK by 2.75x if they have a matching orb, by 1.5x otherwise",
         special: [
             {
-                "description": "Reduces duration of Paralysis and Silence by 1 turn. Delays all enemies for 1 turn",
+                "description": "Reduces Paralysis and Silence duration by 1 turn. Delays all enemies for 1 turn",
                 "cooldown": [ 13, 8 ],
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by 2 turns. Delays all enemies for 1 turn",
+                "description": "Reduces Paralysis and Silence duration by 2 turns. Delays all enemies for 1 turn",
                 "cooldown": [ 15, 10 ],
             },
             {
-                "description": "Reduces duration of Paralysis and Silence by 5 turns. Delays all enemies for 2 turns",
+                "description": "Reduces Paralysis and Silence duration by 5 turns. Delays all enemies for 2 turns",
                 "cooldown": [ 18, 13 ],
             },
         ],
@@ -8699,13 +8699,39 @@ window.details = {
     },
     1578: {//Momonosuke
         captain: "Protects from defeat as long as HP is above ???%",
-        special: "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
+        special: [
+            {
+                "description": "Adds .2x to Chain multiplier for 1 turn",
+                "cooldown": [ 8, null ],
+            },
+            {
+                "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
+                "cooldown": [ 11, null ],
+            },
+            {
+                "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
+                "cooldown": [ 14, null ],
+            },
+        ],
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
         specialName: "Momonosuke Special",
     },
     1579: {//Momonosuke
         captain: "Boosts ATK, HP and RCV of all characters by 1.25x, protects from defeat as long as HP is above 30%",
-        special: "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
+        special: [
+            {
+                "description": "Adds .2x to Chain multiplier for 1 turn",
+                "cooldown": [ 8, null ],
+            },
+            {
+                "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
+                "cooldown": [ 11, null ],
+            },
+            {
+                "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
+                "cooldown": [ 14, null ],
+            },
+        ],
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
         specialName: "Momonosuke Special",
     },
@@ -8726,12 +8752,12 @@ window.details = {
     },
     1583: {//Coliseum Orlumbus
         captain: "Not Released",
-        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Striker characters by 1.5x for 1 turn otherwise",
+        special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
         specialName: "Orlumbus Special",
     },
     1584: {//Coliseum Orlumbus
         captain: "Boosts ATK of Striker characters by 3x (or 2.7x) if HP is below ??% at the start of the turn, by 2.5x otherwise",
-        special: "Locks all orbs for 1 turn. If there are 4 enemies on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, amplifies the effect of orbs for Striker characters by 1.5x for 1 turn otherwise",
+        special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
         specialName: "Orlumbus Special",
     },
     1585: {//Coliseum Helmeppo
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 10c4e893e..fd6662cf0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2417,7 +2417,7 @@ window.evolutions = {
     },
     1570: {
         evolution: 1571,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 266, 100, 267 ]
     },
     1572: {
         evolution: 1573,
@@ -2425,15 +2425,15 @@ window.evolutions = {
     },
     1574: {
         evolution: 1575,
-        evolvers: [  ]
+        evolvers: [ 83, 88, 94, 99, 304 ]
     },
     1576: {
         evolution: 1577,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 97, 1180, 102 ]
     },
     1578: {
         evolution: 1579,
-        evolvers: [  ]
+        evolvers: [ 115, 116, 117, 118, 103 ]
     },
     1580: {
         evolution: 1581,
diff --git a/common/data/specials.js b/common/data/specials.js
index fbe8cf9e7..61082aac5 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2551,10 +2551,26 @@ window.specials = {
         type: "class"
     },
     1578: {
-        chainAddition: function(p) { return 0.5; }
+        chainAddition: function(p) {return window.specials[1578].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1578].multiplier == 0.2 ? 1 : window.specials[1578].multiplier == 0.3 ? 2 : 0);
+            window.specials[1578].multiplier = [0.2, 0.3, 0.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1578warning'
+            });
+        }
     },
     1579: {
-        chainAddition: function(p) { return 0.5; }
+        chainAddition: function(p) {return window.specials[1579].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1579].multiplier == 0.2 ? 1 : window.specials[1579].multiplier == 0.3 ? 2 : 0);
+            window.specials[1579].multiplier = [0.2, 0.3, 0.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1579warning'
+            });
+        }
     },
     1580: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
diff --git a/common/data/units.js b/common/data/units.js
index 2457a4d85..b28b655ab 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1542,8 +1542,8 @@ window.units = [
     [ "Elizabeth, Straw Hat Pirates Companion", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 77, 55, 33, 888, 444, 222, 1 ],
     [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 821, 380, 157, 2681, 810, 381, 1 ],
     [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 65, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
-    [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, null, 4, 99, 3000000, null, null, null, 1701, 1205, 358, null ],
+    [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 50, 392109, 87, 63, 45, 922, 521, 205, 1 ],
+    [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 873, 463, 173, 1701, 1205, 358, 1 ],
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
     [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
     [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
@@ -1565,19 +1565,19 @@ window.units = [
     [ "'The Fighting King' Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
     [ "Tactician Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, 101, 45, 70, 1012, 511, 160, 1 ],
     [ "Tactician Dagama, Prodence Kingdom", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, 2022, 1011, 276, 1 ],
-    [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, null, 35, 90778, null, null, null, 603, 304, 289, null ],
+    [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, 4, 5, 70, 1066998, 534, 255, 249, 1030, 603, 436, null ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, 2000000, 197, 109, 15, 2017, 1230, 245, 1 ],
-    [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, 4, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, null ],
+    [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, 6, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, null ],
     [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, null ],
-    [ "Wanda, Mink Tribe", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
-    [ "Sicilian, Mink Tribe", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
-    [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
-    [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 1, 99, 4000000, 1, 1, 1, 2000, 1200, 250, null ],
+    [ "Wanda, Mink Tribe", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 938, 470, 167, 2177, 1243, 367, null ],
+    [ "Sicilian, Mink Tribe", "INT", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 142, 155, 19, 1202, 658, 127, null ],
+    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1130, 589, 86, 2559, 1457, 212, null ],
+    [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 216, 168, 33, null, null, null, null ],
+    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1066, 530, 119, 2349, 1377, 294, null ],
+    [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 102, 76, 60, null, null, null, null ],
+    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 761, 238, 200, 1922, 690, 535, null ],
     [ "Fortnight Law", "DEX", [ "Free Spirit", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fortnight Law, Evolved", "DEX", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fortnight Monet", "PSY", [ "Cerebral", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 3817701dac335ec39792c4b999d5b1806523fd7d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 30 Apr 2017 00:34:37 -0400
Subject: [PATCH 0988/1569] Secret units shit

---
 common/data/cooldowns.js  | 4 ++--
 common/data/details.js    | 4 ++--
 common/data/evolutions.js | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 90aa6c482..d5420c044 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1565,8 +1565,8 @@ window.cooldowns = [
     null,//Fortnight Elizabello
     [ 15, 9 ],
     [ 15, 9 ],
-    null,
-    null,
+    [ 13, 13 ],
+    [ 13, 13 ],
     [ 11, 11 ],
     19,
     19,
diff --git a/common/data/details.js b/common/data/details.js
index b6a7561c8..35c3f7f84 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8502,12 +8502,12 @@ window.details = {
     1544: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 1.75x and heals for .3x her RCV at the end of the turn each time you hit a Perfect",
         special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Sakura Koala Special",
+        specialName: "Bean Paste under the Petal Snow",
     },
     1545: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 2.25x and heals for .5x her RCV at the end of the turn each time you hit a Perfect",
         special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Sakura Koala Special",
+        specialName: "Bean Paste under the Petal Snow",
     },
     1546: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 1.5x and boosts HP of Free Spirit characters by 1.2x",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index fd6662cf0..53d7480f5 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2379,6 +2379,10 @@ window.evolutions = {
         evolution: 1543,
         evolvers: [  ]
     },
+    1544: {
+        evolution: 1545,
+        evolvers: [ 116, 117, 82, 88, 104 ]
+    },
     1546: {
         evolution: 1547,
         evolvers: [ 117, 79, 85, 96, 101 ]
@@ -2413,7 +2417,7 @@ window.evolutions = {
     },
     1567: {
         evolution: 1568,
-        evolvers: [  ]
+        evolvers: [ 117, 118, 79, 101 ]
     },
     1570: {
         evolution: 1571,

From 0de02b1d9f2da142d0bf5bafff51e6101a949bb4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 1 May 2017 20:05:08 -0500
Subject: [PATCH 0989/1569] Kinemon Special update

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 35c3f7f84..047ce7502 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8686,14 +8686,14 @@ window.details = {
     1576: {//Kin'emon
         captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
-        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [RAINBOW] and [BLOCK] orbs has not been confirmed",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Kin'emon Special",
     },
     1577: {//Kin'emon
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
         special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
-        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has. Synergy with [RAINBOW] and [BLOCK] orbs has not been confirmed",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Kin'emon Special",
     },

From 1a48da8e80a696cedbcc7f7aa72457008b7bb1b0 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 1 May 2017 20:40:16 -0500
Subject: [PATCH 0990/1569] Wild Luffy Sockets

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index b28b655ab..d79ee364b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1282,7 +1282,7 @@ window.units = [
     [ "Garp, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 171, 64, 62, 2094, 1002, 266, 1 ],
     [ "Sengoku Navy HQ Fleet Admiral", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 213, 96, 95, 1942, 972, 304, 1 ],
     [ "Akainu Navy HQ Admiral", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 133, 100, 0, 2000, 1381, 0, 1 ],
-    [ "Monkey D. Luffy, Wild Pirate", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 226, 154, 51, 1104, 602, 143, 1 ],
+    [ "Monkey D. Luffy, Wild Pirate", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 4, 50, 392109, 226, 154, 51, 1104, 602, 143, 1 ],
     [ "Monkey D. Luffy, Pioneer Of Land", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1002, 501, 88, 2491, 1325, 261, 1 ],
     [ "Baby 5, Girl of Spider Miles", "PSY", [ "Fighter", "Shooter" ], 3, 9, 5, 1, 50, 392109, 19, 29, 35, 399, 204, 194, 1 ],
     [ "Baby 5, Member of Donquixote Family", "PSY", [ "Striker", "Shooter" ], 4, 15, 4, 3, 99, 3000000, 274, 158, 146, 784, 579, 372, 1 ],

From ac037ca828c9cb2672d8a921a2fdfc59d12ed7ea Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 1 May 2017 23:17:28 -0400
Subject: [PATCH 0991/1569] Not Tonight

---
 common/data/aliases.js    | 20 ++++++++++----------
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 24 ++++++++++++------------
 common/data/drops.js      |  2 +-
 common/data/evolutions.js |  2 +-
 common/data/sailors.js    |  4 ++--
 common/data/units.js      | 20 ++++++++++----------
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 03ef85878..a803ac1bc 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1568,16 +1568,16 @@ window.aliases = {
     1567: ['', '', 'Kid Boa Hancock'],
     1568: ['', '', 'Kid Boa Hancock'],
     1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law'],
-    1570: ['', '', 'Inuyasha', 'Dogstorm'],
-    1571: ['', '', 'Inuyasha', 'Dogstorm'],
-    1572: ['', '', ''],
-    1573: ['', '', ''],
-    1574: ['', '', ''],
-    1575: ['', '', ''],
-    1576: ['', '', 'Kin\'emon'],
-    1577: ['', '', 'Kin\'emon'],
-    1578: ['', '', ''],
-    1579: ['', '', ''],
+    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm'],
+    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm'],
+    1572: ['ワンダ', '', ''],
+    1573: ['王の鳥　ワンダ', '', ''],
+    1574: ['シシリアン', '', ''],
+    1575: ['全力のシシリアン', '', ''],
+    1576: ['錦えもん ワノ国の侍', '', 'Kin\'emon'],
+    1577: ['狐火の錦えもん ワノ国の侍', '', 'Kin\'emon'],
+    1578: ['モモの助', '', ''],
+    1579: ['モモの助 ワノ国の子', '', ''],
     1580: ['', '', ''],
     1581: ['', '', ''],
     1582: ['', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d5420c044..a8147a852 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1568,8 +1568,8 @@ window.cooldowns = [
     [ 13, 13 ],
     [ 13, 13 ],
     [ 11, 11 ],
-    19,
-    19,
+    [ 19, 14 ],
+    [ 19, 14 ],
     21,
     21,
     19,
diff --git a/common/data/details.js b/common/data/details.js
index 047ce7502..eda670b80 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8651,51 +8651,51 @@ window.details = {
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
-        specialName: "Inuarashi Special",
+        special: "Reduces crew's current HP by 80%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        specialName: "King Sword Shine",
     },
     1571: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by ??%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
-        specialName: "Inuarashi Special",
+        special: "Reduces crew's current HP by 80%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        specialName: "King Sword Shine",
     },
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
         special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn for herself",
-        specialName: "Wanda Special",
+        specialName: "Ruler's Aide Flight",
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
         special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn for herself",
-        specialName: "Wanda Special",
+        specialName: "Ruler's Aide Flight",
     },
     1574: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.25x",
         special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
-        specialName: "Sicilian Special",
+        specialName: "Dash - Dive - Destroy",
     },
     1575: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.25x",
         special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
-        specialName: "Sicilian Special",
+        specialName: "Dash - Dive - Destroy",
     },
     1576: {//Kin'emon
         captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
-        specialName: "Kin'emon Special",
+        specialName: "Flaming Flash",
     },
     1577: {//Kin'emon
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
         special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
-        specialName: "Kin'emon Special",
+        specialName: "Flaming Flash",
     },
     1578: {//Momonosuke
         captain: "Protects from defeat as long as HP is above ???%",
@@ -8714,7 +8714,7 @@ window.details = {
             },
         ],
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
-        specialName: "Momonosuke Special",
+        specialName: "Miraculous Flying Dragon",
     },
     1579: {//Momonosuke
         captain: "Boosts ATK, HP and RCV of all characters by 1.25x, protects from defeat as long as HP is above 30%",
@@ -8733,7 +8733,7 @@ window.details = {
             },
         ],
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
-        specialName: "Momonosuke Special",
+        specialName: "Miraculous Flying Dragon",
     },
     1580: {//Fortnight Law
         captain: "Not Released",
diff --git a/common/data/drops.js b/common/data/drops.js
index 3bbbca404..81c7fd10c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1509,7 +1509,7 @@ window.drops = {
         {
             name: "Punk Hazard",
             thumb: 1581,
-            gamewith: null,
+            gamewith: 56038,
             //condition: "Elizabello will kill you with one punch",
             "All Difficulties": [ 1580, 1582, -1391, -1444, -1436, -1551, -896, -910, -357, -995, -890, -1342 ],
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 53d7480f5..f1bbd5d0b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2425,7 +2425,7 @@ window.evolutions = {
     },
     1572: {
         evolution: 1573,
-        evolvers: [  ]
+        evolvers: [ 85, 96, 1180, 301, 101 ]
     },
     1574: {
         evolution: 1575,
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 92558602b..edd5dc163 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -271,10 +271,10 @@ window.sailors = {
         atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
     },
     1574: {//not working
-        atkStatic: function(p) { return p.percHP <= 10.0 && p.slot == p.sourceSlot ? 200 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
     1575: {//not working
-        atkStatic: function(p) { return p.percHP <= 10.0 && p.slot == p.sourceSlot ? 200 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
     
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index d79ee364b..f1d78dd85 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1568,16 +1568,16 @@ window.units = [
     [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, null, 35, 90778, null, null, null, 603, 304, 289, null ],
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, 4, 5, 70, 1066998, 534, 255, 249, 1030, 603, 436, null ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, 2000000, 197, 109, 15, 2017, 1230, 245, 1 ],
-    [ "Duke Inuarashi, Kozuki Family Retainer", "STR", [ "Slasher", "Cerebral" ], 5, 30, 6, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, null ],
-    [ "Duke Inuarashi, Ruler of Day", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, null ],
-    [ "Wanda, Mink Tribe", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Wanda, Inuarashi Musketeer Squad", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 938, 470, 167, 2177, 1243, 367, null ],
-    [ "Sicilian, Mink Tribe", "INT", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 142, 155, 19, 1202, 658, 127, null ],
-    [ "'Full Power' Sicilian, Inuarashi Musketeer Squad Captain", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1130, 589, 86, 2559, 1457, 212, null ],
-    [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 216, 168, 33, null, null, null, null ],
-    [ "'Firefox' Kinemon, Kozuki Family Retainer", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1066, 530, 119, 2349, 1377, 294, null ],
-    [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 102, 76, 60, null, null, null, null ],
-    [ "Kozuki Momonosuke, Kozuki Family Heir", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 761, 238, 200, 1922, 690, 535, null ],
+    [ "Inuarashi", "STR", [ "Slasher", "Cerebral" ], 5, 30, 6, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, 1 ],
+    [ "'King of the Day' Inuarashi", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, 1 ],
+    [ "Wanda", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 135, 103, 38, 1019, 547, 213, 1 ],
+    [ "Ruler's Aide Wanda", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 938, 470, 167, 2177, 1243, 367, 1 ],
+    [ "Sicilian", "INT", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 142, 155, 19, 1202, 658, 127, 1 ],
+    [ "Full Power Sicilian", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1130, 589, 86, 2559, 1457, 212, 1 ],
+    [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 135, 130, 22, 1133, 601, 166, 1 ],
+    [ "Firefox Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1066, 530, 119, 2349, 1377, 294, 1 ],
+    [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 13, 6, 3, 50, 392109, 102, 76, 60, 830, 309, 269, 1 ],
+    [ "Momonosuke, Child of Wano Country", "PSY", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 761, 238, 200, 1922, 690, 535, 1 ],
     [ "Fortnight Law", "DEX", [ "Free Spirit", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fortnight Law, Evolved", "DEX", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fortnight Monet", "PSY", [ "Cerebral", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From c3be4f7ebb9ab8d22de4540623ced8b8e9d8065a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 1 May 2017 23:46:27 -0400
Subject: [PATCH 0992/1569] Doggo

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index eda670b80..5fa5cbc5c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8651,12 +8651,12 @@ window.details = {
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by 80%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "King Sword Shine",
     },
     1571: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by 80%, deals ???x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         specialName: "King Sword Shine",
     },
     1572: {//Wanda

From ad9820ccc23ffaff6405114fbf0623552d70e8cf Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 4 May 2017 23:40:03 -0400
Subject: [PATCH 0993/1569] Ravioli Ravioli

---
 common/data/aliases.js    |  6 +++---
 common/data/captains.js   | 10 +++++-----
 common/data/cooldowns.js  | 17 ++++++++++++-----
 common/data/details.js    | 26 +++++++++++++-------------
 common/data/drops.js      |  6 +++---
 common/data/evolutions.js |  4 ++--
 common/data/gw.js         |  7 +++++++
 common/data/sailors.js    |  4 ++--
 common/data/ships.js      | 10 ++++++++++
 common/data/specials.js   |  4 ++--
 common/data/units.js      | 18 +++++++++---------
 11 files changed, 68 insertions(+), 44 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index a803ac1bc..c75004a54 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1578,9 +1578,9 @@ window.aliases = {
     1577: ['狐火の錦えもん ワノ国の侍', '', 'Kin\'emon'],
     1578: ['モモの助', '', ''],
     1579: ['モモの助 ワノ国の子', '', ''],
-    1580: ['', '', ''],
-    1581: ['', '', ''],
-    1582: ['', '', ''],
+    1580: ['トラファルガー・ロー パンクハザードの滞在者', '', ''],
+    1581: ['トラファルガー・ロー 二人目の救いの神', '', ''],
+    1582: ['モネ ユキユキの実の雪女', '', ''],
     1583: ['', '', 'Coliseum Orlumbus'],
     1584: ['', '', 'Coliseum Orlumbus'],
     1585: ['', '', 'Coliseum Helmeppo'],
diff --git a/common/data/captains.js b/common/data/captains.js
index db3578abb..ed2cba834 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4634,8 +4634,8 @@ window.captains = {
         hp: function(p) { return 1.3; },
     },
     1580: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
     },
     1581: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
@@ -4646,14 +4646,14 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
     },
     1583: {
-        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 1 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1584: {
         atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1585: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1586: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a8147a852..85ccd561f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1340,7 +1340,7 @@ window.cooldowns = [
     null,//Jump Point Chopper
     [ 23, 13 ],
     [ 23, 13 ],
-    15,
+    [ 15, 9 ],
     16,
     20,
     18,
@@ -1433,16 +1433,16 @@ window.cooldowns = [
     [ 33, 17 ],
     null,//Hody Jones
     null,//Hody Jones
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     21,
     21,
     [ 22, 15 ],
     [ 22, 15 ],
     17,
     17,
-    20,
-    20,
+    [ 20, 15 ],
+    [ 20, 15 ],
     [ 17, 13 ],
     [ 17, 12 ],
     null,//5+ Sanji
@@ -1578,4 +1578,11 @@ window.cooldowns = [
     19,
     null,
     null,
+    [ 20, 13 ],
+    [ 20, 13 ],
+    [ 22, 15 ],
+    [ 29, 15 ],
+    [ 29, 15 ],
+    [ 20, 11 ],
+    [ 20, 11 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 5fa5cbc5c..66eada5f8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8456,13 +8456,13 @@ window.details = {
     },
     1537: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooter and Striker characters by 1.2x",
-        special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
+        special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Greenstone Threat",
     },
     1538: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2.5x and boosts HP of Shooter and Striker characters by 1.25x",
-        special: "Cuts the current HP of each enemy by 20%, changes right column orbs into Matching orbs for Shooter and Striker characters",
+        special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts HP of STR characters by 150",
         specialName: "Greenstone Threat",
     },
@@ -8736,32 +8736,32 @@ window.details = {
         specialName: "Miraculous Flying Dragon",
     },
     1580: {//Fortnight Law
-        captain: "Not Released",
-        special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by ???x for 1 turn",
-        specialName: "Law Special",
+        captain: "Boosts ATK of Free Spirit characters by 1.5x and boosts RCV of DEX characters by 1.2x",
+        special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "ROOM Tact",
     },
     1581: {//Fortnight Law
         captain: "Boosts ATK of Free Spirit characters by 2x and boosts RCV of DEX characters by 1.5x",
-        special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by ???x for 1 turn",
-        specialName: "Law Special",
+        special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "ROOM Tact",
     },
     1582: {//Fortnight Monet
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
         special: "Recovers 10x character's RCV in HP. Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn",
-        specialName: "Monet Special",
+        specialName: "Observing within the Snow Storm",
     },
     1583: {//Coliseum Orlumbus
-        captain: "Not Released",
+        captain: "Boosts ATK of Striker characters by 2x",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
-        specialName: "Orlumbus Special",
+        specialName: "Admiral Hug",
     },
     1584: {//Coliseum Orlumbus
-        captain: "Boosts ATK of Striker characters by 3x (or 2.7x) if HP is below ??% at the start of the turn, by 2.5x otherwise",
+        captain: "Boosts ATK of Striker characters by 3x if HP is below ??% at the start of the turn, by 2.5x otherwise",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
-        specialName: "Orlumbus Special",
+        specialName: "Admiral Hug",
     },
     1585: {//Coliseum Helmeppo
-        captain: "Not Released",
+        captain: "Boosts ATK and RCV of Slasher and Driven characters by 1.5x",
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
         specialName: "Helmeppo Special",
     },
diff --git a/common/data/drops.js b/common/data/drops.js
index 81c7fd10c..32008eaf6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -582,7 +582,7 @@ window.drops = {
             "01": [ 1279 ],
             "02": [  ],
             "03": [ 1280 ],
-            "04": [ 1228 ],
+            "04": [ 1228, 771, 770 ],
             "05": [  ],
             "06": [ 262 ],
             "07": [  ],
@@ -1176,8 +1176,8 @@ window.drops = {
             global: true,
             gamewith: 19169,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
-            "Japan": [ 807, 809, 811, -811, -645, -641, -631, -502, -11, -12, -9, -1389 ],
-            "Global": [ 807, 809, 811, -811, -760, -675, -631, -502, -11, -12, -9, -1389 ],
+            "Japan": [ 807, 809, 811, 17, 404, -811, -645, -641, -631, -502, -11, -12, -9, -1389 ],
+            "Global": [ 807, 809, 811, 17, 404, -811, -760, -675, -631, -502, -11, -12, -9, -1389 ],
         },
 
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f1bbd5d0b..ea3b1f19e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -1257,7 +1257,7 @@ window.evolutions = {
     },
     815: {
         evolution: [ 816, 894 ],
-        evolvers: [ [ 117, 88, 94, 304, 104 ], [ 117, 88, 94, 99, 104 ] ]
+        evolvers: [ [ 117, 88, 94, 304, 104 ], [ 118, 88, 94, 99, 104 ] ]
     },
     828: {
         evolution: 829,
@@ -2441,7 +2441,7 @@ window.evolutions = {
     },
     1580: {
         evolution: 1581,
-        evolvers: [  ]
+        evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1583: {
         evolution: 1584,
diff --git a/common/data/gw.js b/common/data/gw.js
index 3f017d23f..884df1e4c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1578,4 +1578,11 @@ window.gw=[
     55766,
     55822,
     55822,
+    56042,
+    56042,
+    56043,
+    56054,
+    56054,
+    56056,
+    56056,
 ];
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
index edd5dc163..6891bbd45 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -169,10 +169,10 @@ window.sailors = {
         hpStatic: function(p) { return 75; },
     },
     1321: {
-        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 100 : 0 : 0 : 0; },
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; },
     },
     1322: {
-        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 100 : 0 : 0 : 0; },
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; },
     },
     1363: {
         hpStatic: function(p) { return p.unit.type == "PSY" ? 100 : 0; },
diff --git a/common/data/ships.js b/common/data/ships.js
index 58270a569..e03a2caa8 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -370,5 +370,15 @@ window.ships = [
         },*/
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
+    
+    
+    
+    { //30
+        name: "3rd Anniversary Thousand Sunny",
+        thumb: null,
+        //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
+        description: 'Boosts ATK by 1.5x. Boosts EXP gained by 3x.',
+        atk: function(p) { return 1.5; },
+    },
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index 61082aac5..6539a26ba 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2573,10 +2573,10 @@ window.specials = {
         }
     },
     1580: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1581: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     1582: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
diff --git a/common/data/units.js b/common/data/units.js
index f1d78dd85..d0dc2540c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1345,10 +1345,10 @@ window.units = [
     [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, 1066998, 131, 133, 1, 1809, 1043, 9, 1],
     [ "Jinbe, Fishman Pirates Captain", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 304, 161, 56, 2329, 1144, 229, 1],
     [ "Heracles'n, Highwayman of the Forest, Teacher of Amazing Weapons", "DEX", [ "Cerebral", "Shooter" ], 4, 20, 4, 3, 99, 3000000, 142, 91, 43, 2095, 899, 303, 1],
-    [ "Torino Kingdom Monsters", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 109, 66, 12, 1487, 706, 127, 1],
+    [ "Birdie Kingdom Roc", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 109, 66, 12, 1487, 706, 127, 1],
     [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, 1066998, 133, 112, 0, 1600, 1020, 0, 1],
     [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, 1066998, 21, 40, 32, 377, 505, 394, 1],
-    [ "Thieves of Tehna Gehna Kingdom", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, 1066998, 98, 71, 29, 1377, 709, 181, 1],
+    [ "Longarm Kingdom Tribesman", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, 1066998, 98, 71, 29, 1377, 709, 181, 1],
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, 1066998, 51, 38, 21, 1103, 505, 193, 1],
     [ "Ivankov, New Kama King", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, 3000000, 123, 95, 41, 2034, 935, 299, 1],
     [ "Rayleigh, Crew of the Pirate King", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, 3000000, 201, 189, 75, 2037, 1264, 294, 1],
@@ -1578,13 +1578,13 @@ window.units = [
     [ "Firefox Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1066, 530, 119, 2349, 1377, 294, 1 ],
     [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 13, 6, 3, 50, 392109, 102, 76, 60, 830, 309, 269, 1 ],
     [ "Momonosuke, Child of Wano Country", "PSY", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 761, 238, 200, 1922, 690, 535, 1 ],
-    [ "Fortnight Law", "DEX", [ "Free Spirit", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Law, Evolved", "DEX", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fortnight Monet", "PSY", [ "Cerebral", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Orlumbus", "PSY", [ "Striker", "Fighter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Orlumbus, Evolved", "PSY", [ "Striker", "Fighter" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coliseum Helmeppo, Evolved", "QCK", [ "Slasher", "Driven" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Trafalgar Law, Punk Hazard Resident", "DEX", [ "Free Spirit", "Slasher" ], 3, 13, 4, 2, 50, 392109, 149, 56, 25, 894, 453, 150, 1 ],
+    [ "Trafalgar Law, Second Salvation God", "DEX", [ "Free Spirit", "Fighter" ], 4, 20, 4, 4, 99, 3000000, 801, 423, 134, 1884, 1155, 251, 1 ],
+    [ "Monet, Snow-Snow Fruit Snow Woman", "PSY", [ "Cerebral", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 96, 83, 45, 1062, 666, 271, 1 ],
+    [ "Coliseum Orlumbus", "PSY", [ "Striker", "Fighter" ], 4, 25, 5, 1, 70, 1066998, 624, 303, 22, 1425, 613, 119, null ],
+    [ "Massacre Ruler Orlumbus, Yonta Maria Grand Fleet Admiral", "PSY", [ "Striker", "Fighter" ], 5, 40, 6, 3, 99, 4000000, 1354, 544, 67, 3012, 1243, 200, null ],
+    [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, 6, 1, 50, 392109, 124, 77, 23, 905, 492, 136, null ],
+    [ "Brave Compannion Helmeppo, Navy HQ Chief Petty Officer", "QCK", [ "Slasher", "Driven" ], 4, 26, null, 3, 99, 3000000, null, null, null, 1971, 1016, 322, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 514b62f7c42f26dc755eedc8094d5c8f5831c68b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 5 May 2017 18:11:27 -0400
Subject: [PATCH 0994/1569] + Characters Formuoli

No they don't work yet
---
 characters/js/directives.js | 15 +++++--
 common/data/evolutions.js   | 26 +++++------
 common/js/utils.js          | 88 +++++++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 17 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 0c3259a60..629506475 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -266,10 +266,17 @@ directives.compare = function() {
                     source: function(query, callback) { callback(fuse.search(query)); },
                     templates: {
                         suggestion: function(id) {
-                            var name = units[id].name, url = Utils.getThumbnailUrl(id+1);
-                            if (name.length > 63) name = name.slice(0,60) + '...';
-                            var thumb = '<div class="slot small" style="background-image: url(' + url + ')"></div>';
-                            return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
+                            if (Number.isInteger(id)){
+                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1);
+                                if (name.length > 63) name = name.slice(0,60) + '...';
+                                var thumb = '<div class="slot small" style="background-image: url(' + url + ')"></div>';
+                                return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
+                            }
+                            else{
+                                var name = 'material', url = Utils.getThumbnailUrl(id);
+                                var thumb = '<div class="slot small" style="background-image: url(' + url + ')"></div>';
+                                return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
+                            }
                         }
                     },
                     display: function(id) {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ea3b1f19e..540548817 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2113,15 +2113,15 @@ window.evolutions = {
     },
     4: {
         evolution: 1387,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     8: {
         evolution: 1388,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     12: {
         evolution: 1389,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     1390: {
         evolution: 1391,
@@ -2141,7 +2141,7 @@ window.evolutions = {
     },
     1400: {
         evolution: 1401,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 300, 267 ]
     },
     1403: {
         evolution: 1404,
@@ -2217,19 +2217,19 @@ window.evolutions = {
     },
     416: {
         evolution: 1445,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 301, 267 ]
     },
     16: {
         evolution: 1446,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     20: {
         evolution: 1447,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     22: {
         evolution: 1448,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     1449: {
         evolution: 1450,
@@ -2313,7 +2313,7 @@ window.evolutions = {
     },
     669: {
         evolution: 1492,
-        evolvers: [  ]
+        evolvers: [ 118, 87, 303, 267 ]
     },
     1505: {
         evolution: [ 1506, 1562 ],
@@ -2377,7 +2377,7 @@ window.evolutions = {
     },
     1532: {
         evolution: 1543,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 302, 267 ]
     },
     1544: {
         evolution: 1545,
@@ -2389,15 +2389,15 @@ window.evolutions = {
     },
     709: {
         evolution: 1549,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     739: {
         evolution: 1550,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     896: {
         evolution: 1551,
-        evolvers: [  ]
+        evolvers: [ 267 ]
     },
     1552: {
         evolution: 1553,
diff --git a/common/js/utils.js b/common/js/utils.js
index f1e44098b..38932b308 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -68,6 +68,50 @@
     /* * * * * Thumbnail control * * * * */
 
     utils.getThumbnailUrl = function (n) {
+        switch (id){
+            case id == 'skullLuffy':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_luffy.png';
+                break;
+            case id == 'skullZoro':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_zoro.png';
+                break;
+            case id == 'skullNami':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_nami.png';
+                break;
+            case id == 'skullUsopp':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_usopp_f.png';
+                break;
+            case id == 'skullSanji':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_sanji_f.png';
+                break;
+            case id == 'skullChopper':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_chopper_f.png';
+                break;
+            case id == 'skullRobin':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_robin_f.png';
+                break;
+            case id == 'skullFranky':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_franky_f.png';
+                break;
+            case id == 'skullBrook':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_brook_f.png';
+                break;
+            case id == 'skullSTR':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/red_skull_f.png';
+                break;
+            case id == 'skullQCK':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/blue_skull_f.png';
+                break;
+            case id == 'skullPSY':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/yellow_skull2_f.png';
+                break;
+            case id == 'skullDEX':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/green_skull2_f.png';
+                break;
+            case id == 'skullINT':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/black_skull2_f.png';
+                break;
+        }
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
@@ -77,6 +121,50 @@
     };
 
     utils.getBigThumbnailUrl = function (n) {
+        switch (id){
+            case id == 'skullLuffy':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_luffy_c.png';
+                break;
+            case id == 'skullZoro':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_zoro_c.png';
+                break;
+            case id == 'skullNami':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_nami_c.png';
+                break;
+            case id == 'skullUsopp':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_usopp_c.png';
+                break;
+            case id == 'skullSanji':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_sanji_c.png';
+                break;
+            case id == 'skullChopper':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_chopper_c.png';
+                break;
+            case id == 'skullRobin':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_robin_c.png';
+                break;
+            case id == 'skullFranky':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_franky_c.png';
+                break;
+            case id == 'skullBrook':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_brook_c.png';
+                break;
+            case id == 'skullSTR':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/red_skull_c.png';
+                break;
+            case id == 'skullQCK':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/blue_skull_c.png';
+                break;
+            case id == 'skullPSY':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/yellow_skull2_c.png';
+                break;
+            case id == 'skullDEX':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/green_skull2_c.png';
+                break;
+            case id == 'skullINT':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/black_skull2_c.png';
+                break;
+        }
         if (window.units[n - 1].incomplete)
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image

From 48300cc97e2f8d3a7301c70f4bb813d76eef41a9 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sun, 7 May 2017 21:10:27 -0700
Subject: [PATCH 0995/1569] added 5+ and 6+ chars NOW WORKING

---
 characters/css/index.css | 29 +++++++++++++++++------------
 common/data/units.js     | 26 +++++++++++++-------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/characters/css/index.css b/characters/css/index.css
index f1cecafed..542f85992 100644
--- a/characters/css/index.css
+++ b/characters/css/index.css
@@ -162,29 +162,34 @@ input[type="text"] {
 .stars:before, .stars:after {
     font-weight: bold;
     font-family: icomoon;
-    font-size: 11px;
+    font-size: 13px;
 }
 
 .filter.stars:not(.active):not(:hover):before {
     color: #cccccc !important;
 }
 
-.stars-1:before { color: #40a3da; content: '\e900'; }
-.stars-1:after  { color: #cccccc; content: '\e900\e900\e900\e900\e900'; }
+.stars-1:before { color: #40a3da; content: '\2605'; }
+.stars-1:after  { color: #cccccc; content: '\2605\2605\2605\2605\2605'; }
+
+.stars-2:before { color: #acc523; content: '\2605\2605'; }
+.stars-2:after  { color: #cccccc; content: '\2605\2605\2605\2605'; }
+
+.stars-3:before { color: #f7c118; content: '\2605\2605\2605'; }
+.stars-3:after  { color: #cccccc; content: '\2605\2605\2605'; }
+
+.stars-4:before { color: #f28e00; content: '\2605\2605\2605\2605'; }
+.stars-4:after  { color: #cccccc; content: '\2605\2605'; }
 
-.stars-2:before { color: #acc523; content: '\e900\e900'; }
-.stars-2:after  { color: #cccccc; content: '\e900\e900\e900\e900'; }
+.stars-5:before { color: #ff0000; content: '\2605\2605\2605\2605\2605'; }
+.stars-5:after  { color: #cccccc; content: '\2605'; }
 
-.stars-3:before { color: #f7c118; content: '\e900\e900\e900'; }
-.stars-3:after  { color: #cccccc; content: '\e900\e900\e900'; }
+*[class~="stars-5+"]:before { color: #ff1493; content: '\2605\2605\2605\2605\2605\002B'; }
 
-.stars-4:before { color: #f28e00; content: '\e900\e900\e900\e900'; }
-.stars-4:after  { color: #cccccc; content: '\e900\e900'; }
+.stars-6:before { color: #9932cc; content: '\2605\2605\2605\2605\2605\2605'; }
 
-.stars-5:before { color: #ff0000; content: '\e900\e900\e900\e900\e900'; }
-.stars-5:after  { color: #cccccc; content: '\e900'; }
+*[class~="stars-6+"]:before { color: #990000; content: '\2605\2605\2605\2605\2605\2605\002B'; }
 
-.stars-6:before { color: #9932cc; content: '\e900\e900\e900\e900\e900\e900'; }
 
 .block-icon:before, .tnd-icon:before {
     font-style: normal;
diff --git a/common/data/units.js b/common/data/units.js
index d0dc2540c..cf0ae2564 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1385,9 +1385,9 @@ window.units = [
     [ "Toy Soldier, Thunder Soldier", "QCK", [ "Striker", "Shooter" ], 4, 20, 4, 4, 99, 3000000, 792, 557, 151, 1552, 1300, 300, 1 ],
     [ "Rebecca, Surviving Bloodline of the Former Royal Family", "PSY", [ "Striker", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 70, 27, 40, 502, 301, 197, 1 ],
     [ "Rebecca, Target from the Former Royal Family's Bloodline", "PSY", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 70, 1066998, 441, 239, 153, 819, 492, 348, 1 ],
-    [ "Monkey D. Luffy, Gum Gum Elephant: Elephant Gun", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1005, 560, 113, 2255, 1499, 284, 1 ],
-    [ "Roronoa Zoro, Unfortunate Port Bird: Yakkoudori", "DEX", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, 1 ],
-    [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
+    [ "Monkey D. Luffy, Gum Gum Elephant: Elephant Gun", "STR", [ "Fighter", "Free Spirit" ], "5+", 30, 4, 3, 99, 3000000, 1005, 560, 113, 2255, 1499, 284, 1 ],
+    [ "Roronoa Zoro, Unfortunate Port Bird: Yakkoudori", "DEX", [ "Slasher", "Driven" ], "5+", 30, 4, 3, 99, 3000000, 803, 669, 55, 2501, 1434, 233, 1 ],
+    [ "Nami, Weather Egg: Thunder Breed Tempo", "INT", [ "Striker", "Cerebral" ], "5+", 30, 4, 3, 99, 3000000, 705, 496, 181, 1970, 1200, 420, 1 ],
     [ "Buggy Clown, Captain of the Buggy Pirates", "INT", [ "Driven", "Shooter" ], 5, 30, 5, 3, 70, 1066998, 296, 199, 133, 1310, 577, 299, 1 ],
     [ "Captain Buggy", "INT", [ "Driven", "Shooter" ],6, 40, 5, 5, 99, 5000000, 1244, 504, 220, 2506, 1149, 491, 1 ],
     [ "Sentomaru, Wall of the Sabaody Archipelagos", "PSY", [ "Slasher", "Striker" ], 4, 20, 5, 3, 99, 3000000, 166, 48, 33, 2805, 955, 201, 1 ],
@@ -1411,7 +1411,7 @@ window.units = [
     [ "Brook, Reunion of the Straw Hat Pirates", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1176, 482, 131, 2421, 1317, 329, 1 ],
     [ "Tony Tony Chopper: Walk Point, Gathering of the Straw Hats", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 4, 3, 50, 392109, 233, 77, 34, 1362, 439, 170, 1 ],
     [ "Tony Tony Chopper: Monster Point, Reunion of the Straw Hat Pirates", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1362, 515, 0, 3000, 1499, 170, 1 ],
-    [ "Whitebeard: Four Emperors", "STR", [ "Striker", "Powerhouse" ], 6, 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, 1 ],
+    [ "Whitebeard: Four Emperors", "STR", [ "Striker", "Powerhouse" ], "6+", 65, 4, 5, 99, 5000000, 3148, 996, 142, 3806, 1558, 347, 1 ],
     [ "Sanji, Making Food and Drinks", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 3, 99, 3000000, 557, 363, 32, 2276, 1200, 210, 1 ],
     [ "Sengoku, Wise Warrior", "PSY", [ "Fighter", "Cerebral" ], 3, 13, 5, 1, 50, 392109, 106, 42, 30, 990, 503, 151, 1 ],
     [ "Sengoku the Buddha, Wise Warrior", "PSY", [ "Fighter", "Cerebral" ], 4, 20, 5, 3, 99, 3000000, 920, 440, 100, 2059, 1059, 304, 1 ],
@@ -1443,10 +1443,10 @@ window.units = [
     [ "Zeo, Ghosts of Fishman District", "INT", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1078, 441, 96, 2424, 1362, 279, 1 ],
     [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 302, 79, 18, 1440, 509, 96, 1 ],
     [ "Dosun, Ghosts of Fishman District", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, 1 ],
-    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], 6, 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, 1 ],
-    [ "Usopp, Platanus: Shuriken", "PSY", [ "Shooter" ], 5, 30, 4, 3, 99, 3000000, 770, 292, 189, 2022, 972, 480, 1 ],
-    [ "Sanji, Grill Shot", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 3000000, 550, 515, 175, 2709, 1337, 251, 1 ],
-    [ "Tony Tony Chopper, Heavy Gong", "PSY", [ "Fighter", "Free Spirit" ], 5, 30, 4, 2, 50, 392109, 699, 490, 90, 2336, 1236, 346, 1 ],
+    [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], "6+", 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, 1 ],
+    [ "Usopp, Platanus: Shuriken", "PSY", [ "Shooter" ], "5+", 30, 4, 3, 99, 3000000, 770, 292, 189, 2022, 972, 480, 1 ],
+    [ "Sanji, Grill Shot", "QCK", [ "Fighter", "Powerhouse" ], "5+", 30, 4, 3, 99, 3000000, 550, 515, 175, 2709, 1337, 251, 1 ],
+    [ "Tony Tony Chopper, Heavy Gong", "PSY", [ "Fighter", "Free Spirit" ], "5+", 30, 4, 2, 50, 392109, 699, 490, 90, 2336, 1236, 346, 1 ],
     [ "Violet, Dancing Woman", "DEX", [ "Fighter", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 88, 43, 89, 804, 403, 234, 1 ],
     [ "Violet, Chased Woman", "DEX", [ "Fighter", "Cerebral" ], 4, 20, 6, 3, 99, 3000000, 643, 349, 184, 1594, 843, 403, 1 ],
     [ "Sanji, Disguised Man on a Road to Love", "DEX", [ "Fighter", "Powerhouse" ], 3, 13, 4, 2, 50, 392109, 103, 56, 23, 1023, 567, 103, 1 ],
@@ -1490,7 +1490,7 @@ window.units = [
     [ "Don Krieg, East Blue Supreme Ruler", "STR", [ "Driven", "Shooter" ], 4, 26, 8, 3, 99, 3000000, 1200, 476, 30, 2707, 1225, 106, 1 ],
     [ "Mr. 5, Bomb Human", "QCK", "Shooter", 3, 10, 6, 2, 35, 136167, 101, 56, 21, 808, 401, 74, 1 ],
     [ "Mr. 5, Baroque Works Officer Agent", "QCK", "Shooter", 4, 20, 6, 3, 70, 1066998, 733, 325, 44, 1618, 818, 198, 1 ],
-    [ "Sabo, True Power of the Mera Mera no Mi", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1534, 777, 277, 3234, 1534, 452, 1 ],
+    [ "Sabo, True Power of the Mera Mera no Mi", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1534, 777, 277, 3234, 1534, 452, 1 ],
     [ "Rough Fishman Outlaw", "STR", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 73, 42, 13, 1173, 749, 143, 1 ],
     [ "Fast-paced Fishman Outlaw", "QCK", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 71, 37, 16, 1167, 701, 169, 1 ],
     [ "Skilled Fishman Outlaw", "DEX", [ "Powerhouse", "Striker" ], 3, 12, 6, 1, 60, 449516, 67, 40, 15, 1143, 737, 157, 1 ],
@@ -1541,15 +1541,15 @@ window.units = [
     [ "Perona, Straw Hat Pirates Accomplice", "INT", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 885, 416, 167, 1969, 1001, 481, 1 ],
     [ "Elizabeth, Straw Hat Pirates Companion", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 77, 55, 33, 888, 444, 222, 1 ],
     [ "Elizabeth, Straw Hat Pirates Accomplice", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 821, 380, 157, 2681, 810, 381, 1 ],
-    [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", 6, 65, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
+    [ "Captain Usopp, Usopp's Great Manly Adventure ~Chapter II~", "DEX", "Shooter", "6+", 65, 4, 5, 99, 5000000, 1556, 577, 179, 3410, 1341, 481, 1 ],
     [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 50, 392109, 87, 63, 45, 922, 521, 205, 1 ],
     [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 873, 463, 173, 1701, 1205, 358, 1 ],
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
     [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
     [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
-    [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], 5, 30, 4, 3, 99, 3000000, 979, 487, 171, 2105, 1187, 401, 1 ],
-    [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 3, 99, 3000000, 1655, 803, 91, 2687, 1359, 244, 1 ],
-    [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 6, 3, 99, 3000000, 1043, 481, 187, 2204, 1277, 351, 1 ],
+    [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], "5+", 30, 4, 3, 99, 3000000, 979, 487, 171, 2105, 1187, 401, 1 ],
+    [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], "5+", 30, 4, 3, 99, 3000000, 1655, 803, 91, 2687, 1359, 244, 1 ],
+    [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], "5+", 30, 6, 3, 99, 3000000, 1043, 481, 187, 2204, 1277, 351, 1 ],
     [ "Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 4, 25, 4, 1, 70, 1066998, 551, 299, 21, 1306, 757, 139, 1 ],
     [ "Pirate Mercenary Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1225, 683, 89, 2840, 1381, 206, 1 ],
     [ "Ryuma, Samurai General Zombie", "DEX", "Slasher", 3, 16, 6, 1, 50, 392109, 131, 111, 0, 1094, 525, 99, 1 ],

From 81ecd6d8dca0defd30da7c4fe82f2ba05924dc6f Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Tue, 9 May 2017 17:35:48 -0700
Subject: [PATCH 0996/1569] almost got + chars working

---
 characters/views/sidebar.html | 236 +++++++++++++++++-----------------
 1 file changed, 119 insertions(+), 117 deletions(-)

diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 4d1a0e92a..5fab06cce 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -1,117 +1,119 @@
-<div id="clear-button" class="filter-header" ng-click="clearFilters()">Clear filters</div>
-
-<div class="filter-container">
-    <span class="filter-header">Type filters</span>
-    <span ng-model="filters.type" ng-repeat="(n,type) in [ 'STR', 'QCK', 'DEX', 'PSY', 'INT' ]"
-        class="filter {{n < 3 ? 'width-4' : 'width-6'}} type {{type}}" ng-class="{ active: filters.type == type }"
-        ng-click="onFilterClick($event,type)">{{type}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven', 'Evolver', 'Booster' ]"
-        class="filter width-6 class" ng-click="onClassClick($event,class)"
-        ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Rarity filters</span>
-    <span ng-repeat="(n,stars) in [ 1, 2, 3, 4, 5, 6 ]" class="filter stars width-4 stars-{{stars}}"
-        ng-click="onStarsClick($event,stars)" ng-class="{ active: filters.stars.indexOf(stars) > -1 }"></span>
-</div>
-
-<div class="filter-container expandable" id="cost-container"
-        ng-class="{ expanded: filters.costEnabled }">
-    <span class="filter-header" ng-click="filters.costEnabled = !filters.costEnabled">
-        Cost filter
-        <i class="pull-right fa fa-{{costExpanded ? 'chevron-up' : 'chevron-down'}}"></i>
-    </span>
-    <input type="text" id="cost-slider" name="cost-slider" value="" cost-slider></input>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Drop filters</span>
-    <span ng-repeat="type in [ 'Farmable', 'Non-farmable' ]" class="filter width-6 drop" ng-model="filters.drop"
-        ng-class="{ active: filters.drop == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-    <span ng-repeat="type in [ 'Global units', 'Japan exclusives' ]" class="filter width-6 drop" ng-model="filters.server"
-        ng-class="{ active: filters.server == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-    <span ng-repeat="type in [ 'In RR pool', 'Not in RR pool' ]" class="filter width-6 drop" ng-model="filters.rr"
-        ng-class="{ active: filters.rr == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-    <span ng-repeat="type in [ 'Farmable Sockets', 'No Farmable Sockets' ]" class="filter width-6 drop" ng-model="filters.socket"
-        ng-class="{ active: filters.socket == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-</div>
-
-<div class="filter-container conditional" ng-show="filters.drop == 'Farmable'">
-    <span class="filter-header">Farmable filters</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.fortnight }"
-        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,true)">Fortnight-only</span><!--
- --><span class="filter width-6 exc" ng-class="{ active: filters.farmable.fortnight === false }"
-        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,false)">Hide fortnight-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.raid }"
-        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,true)">Raid-only</span><!--
- --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.raid === false }"
-        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,false)">Hide raid-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.Coliseum }"
-        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,true)">Coliseum-only</span><!--
- --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.Coliseum === false }"
-        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,false)">Hide Clssm-only</span>
-</div>
-
-<div class="filter-container conditional" ng-show="filters.drop == 'Non-farmable'">
-    <span class="filter-header">Non-farmable filters</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr }"
-        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,true)">Limited RR-only</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr === false }"
-        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,false)">Hide lim. RR-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo }"
-        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,true)">Promo-only</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo === false }"
-        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,false)">Hide promo-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special }"
-        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,true)">Special-only</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special === false }"
-        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,false)">Hide special-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop }"
-        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,true)">Ray Shop Unit</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop === false }"
-        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,false)">Hide Ray Shop Unit</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Exclusion filters</span>
-    <span class="filter width-6 exc" ng-model="filters.noBase" ng-class="{ active: filters.noBase }"
-        ng-click="filters.noBase = !filters.noBase">Hide base forms</span><!--
- --><span class="filter width-6 exc" ng-model="filters.noFodder" ng-class="{ active: filters.noFodder }"
-        ng-click="filters.noFodder = !filters.noFodder">Hide fodder</span>
-    <span class="filter width-12 exc" ng-model="filters.noEvos" ng-class="{ active: filters.noEvos }"
-        ng-click="filters.noEvos = !filters.noEvos">Hide Boosters and Evolvers</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Captain ability filters</span>
-    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target == 'captain'"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-captain-options
-        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Special filters</span>
-    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('special') == 0"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
-        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Sailor filters</span>
-    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('sailor') == 0"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
-        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
-</div>
-
-<div class="filter-container" ng-if="showLogFilters">
-    <span class="filter-header">Character Log filters</span>
-    <span class="filter width-12 custom" ng-model="filters.noLog" ng-class="{ active: filters.noLog }"
-        ng-click="filters.noLog = !filters.noLog">Hide units in Character Log</span>
-    <span class="filter width-12 custom" ng-model="filters.noMissing" ng-class="{ active: filters.noMissing }"
-        ng-click="filters.noMissing = !filters.noMissing">Hide units not in Character Log</span>
-</div>
+<div id="clear-button" class="filter-header" ng-click="clearFilters()">Clear filters</div>
+
+<div class="filter-container">
+    <span class="filter-header">Type filters</span>
+    <span ng-model="filters.type" ng-repeat="(n,type) in [ 'STR', 'QCK', 'DEX', 'PSY', 'INT' ]"
+        class="filter {{n < 3 ? 'width-4' : 'width-6'}} type {{type}}" ng-class="{ active: filters.type == type }"
+        ng-click="onFilterClick($event,type)">{{type}}</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Class filters</span>
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven', 'Evolver', 'Booster' ]"
+        class="filter width-6 class" ng-click="onClassClick($event,class)"
+        ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Rarity filters</span>
+    <span ng-repeat="(n,stars) in [ 1, 2, 3, 4, 5, 6 ]" class="filter stars width-4 stars-{{stars}}"
+        ng-click="onStarsClick($event,stars)" ng-class="{ active: filters.stars.indexOf(stars) > -1 }"></span>
+    <span ng-repeat="(n,stars) in [ 5, 6 ]" class="filter stars width-4 stars-{{stars}}+"
+        ng-click="onStarsClick($event,stars)" ng-class="{ active: filters.stars.indexOf(stars) > -1 }"></span>
+</div>
+
+<div class="filter-container expandable" id="cost-container"
+        ng-class="{ expanded: filters.costEnabled }">
+    <span class="filter-header" ng-click="filters.costEnabled = !filters.costEnabled">
+        Cost filter
+        <i class="pull-right fa fa-{{costExpanded ? 'chevron-up' : 'chevron-down'}}"></i>
+    </span>
+    <input type="text" id="cost-slider" name="cost-slider" value="" cost-slider></input>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Drop filters</span>
+    <span ng-repeat="type in [ 'Farmable', 'Non-farmable' ]" class="filter width-6 drop" ng-model="filters.drop"
+        ng-class="{ active: filters.drop == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+    <span ng-repeat="type in [ 'Global units', 'Japan exclusives' ]" class="filter width-6 drop" ng-model="filters.server"
+        ng-class="{ active: filters.server == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+    <span ng-repeat="type in [ 'In RR pool', 'Not in RR pool' ]" class="filter width-6 drop" ng-model="filters.rr"
+        ng-class="{ active: filters.rr == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+    <span ng-repeat="type in [ 'Farmable Sockets', 'No Farmable Sockets' ]" class="filter width-6 drop" ng-model="filters.socket"
+        ng-class="{ active: filters.socket == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+</div>
+
+<div class="filter-container conditional" ng-show="filters.drop == 'Farmable'">
+    <span class="filter-header">Farmable filters</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.fortnight }"
+        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,true)">Fortnight-only</span><!--
+ --><span class="filter width-6 exc" ng-class="{ active: filters.farmable.fortnight === false }"
+        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,false)">Hide fortnight-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.raid }"
+        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,true)">Raid-only</span><!--
+ --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.raid === false }"
+        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,false)">Hide raid-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.Coliseum }"
+        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,true)">Coliseum-only</span><!--
+ --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.Coliseum === false }"
+        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,false)">Hide Clssm-only</span>
+</div>
+
+<div class="filter-container conditional" ng-show="filters.drop == 'Non-farmable'">
+    <span class="filter-header">Non-farmable filters</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr }"
+        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,true)">Limited RR-only</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr === false }"
+        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,false)">Hide lim. RR-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo }"
+        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,true)">Promo-only</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo === false }"
+        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,false)">Hide promo-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special }"
+        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,true)">Special-only</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special === false }"
+        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,false)">Hide special-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop }"
+        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,true)">Ray Shop Unit</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop === false }"
+        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,false)">Hide Ray Shop Unit</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Exclusion filters</span>
+    <span class="filter width-6 exc" ng-model="filters.noBase" ng-class="{ active: filters.noBase }"
+        ng-click="filters.noBase = !filters.noBase">Hide base forms</span><!--
+ --><span class="filter width-6 exc" ng-model="filters.noFodder" ng-class="{ active: filters.noFodder }"
+        ng-click="filters.noFodder = !filters.noFodder">Hide fodder</span>
+    <span class="filter width-12 exc" ng-model="filters.noEvos" ng-class="{ active: filters.noEvos }"
+        ng-click="filters.noEvos = !filters.noEvos">Hide Boosters and Evolvers</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Captain ability filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target == 'captain'"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-captain-options
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Special filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('special') == 0"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Sailor filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('sailor') == 0"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
+<div class="filter-container" ng-if="showLogFilters">
+    <span class="filter-header">Character Log filters</span>
+    <span class="filter width-12 custom" ng-model="filters.noLog" ng-class="{ active: filters.noLog }"
+        ng-click="filters.noLog = !filters.noLog">Hide units in Character Log</span>
+    <span class="filter width-12 custom" ng-model="filters.noMissing" ng-class="{ active: filters.noMissing }"
+        ng-click="filters.noMissing = !filters.noMissing">Hide units not in Character Log</span>
+</div>

From f7b27fe79c4c6f58378218395a94ed20eac96cd4 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 10 May 2017 00:43:40 -0500
Subject: [PATCH 0997/1569] Sanji Don't Fuggin Work

something something jumping
---
 common/data/aliases.js    |  3 +++
 common/data/captains.js   | 13 +++++++++++++
 common/data/cooldowns.js  |  3 +++
 common/data/details.js    | 28 ++++++++++++++++++++++++++++
 common/data/evolutions.js |  8 ++++++++
 common/data/families.js   |  3 +++
 common/data/specials.js   | 25 ++++++++++++++++++++++++-
 common/data/units.js      |  5 ++++-
 8 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c75004a54..f4e2924e1 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1585,4 +1585,7 @@ window.aliases = {
     1584: ['', '', 'Coliseum Orlumbus'],
     1585: ['', '', 'Coliseum Helmeppo'],
     1586: ['', '', 'Coliseum Helmeppo'],
+    1587: ['', '', 'Gear 4 Luffy'],
+    1588: ['', '', ''],
+    1589: ['', '', ''],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index ed2cba834..11d3924d6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4659,4 +4659,17 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
     },
+    1587: {
+        atk: function(p){ 
+            return p.unit.class.has("Fighter") ? ((!window.specials[1587].turnedOn || (window.specials[1587].multiplier == null)) ? 2.5 : window.specials[1587].multiplier) : 1;
+        },
+    },
+    1588: {
+        atk: function(p) { return 2.5 },
+        hp: function(p) { return 1.3 },
+    },
+    1589: {
+        atk: function(p) { return 2.5 },
+        hp: function(p) { return 1.3 },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 85ccd561f..21633161f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1585,4 +1585,7 @@ window.cooldowns = [
     [ 29, 15 ],
     [ 20, 11 ],
     [ 20, 11 ],
+    null,//Gear 4 Luffy
+    19,
+    19,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 66eada5f8..f89a97b5a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8770,4 +8770,32 @@ window.details = {
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
         specialName: "Helmeppo Special",
     },
+    1587: {//Gear 4 Luffy
+        captain: "Boosts ATK of Slasher and Driven characters by 2x and their RCV by 1.5x",
+        special: [
+            {
+                "description": "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn you score 5 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
+                "cooldown": [ 18, 12 ],
+            },
+            {
+                "description": "Boosts ATK of Free Spirit characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
+                "cooldown": [ 23, 17 ],
+            },
+        ],
+        specialName: "King Kong Gun",
+    },
+    1588: {//Legend Sanji
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own by an additional 2.5x",
+        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x",
+        special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
+        sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
+        specialName: "Hell Memories",
+    },
+    1589: {//Legend Sanji
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts attack of all characters by an additional 2.5x",
+        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x",
+        special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
+        sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
+        specialName: "Hell Memories",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 540548817..159fb6f85 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2451,4 +2451,12 @@ window.evolutions = {
         evolution: 1586,
         evolvers: [  ]
     },
+    1587: {
+        evolution: 1404,
+        evolvers: [  ]
+    },
+    1589: {
+        evolution: 1588,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 373a593bb..304615d8f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1585,4 +1585,7 @@ window.families = [
     "Orlumbus",
     "Helmeppo",
     "Helmeppo",
+    "Monkey D. Luffy",
+    "Sanji",
+    "Sanji",
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index 6539a26ba..fcc5fe136 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2615,5 +2615,28 @@ window.specials = {
         rcv: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
         type: "class"
     },
-    
+    1587: {
+        onActivation: function(p) {
+            var n = (window.specials[1587].multiplier == 3.16 ? 1 : 0);
+            window.specials[1587].turnedOn = true;
+            window.specials[1587].multiplier = [3.16, 4][n];
+            p.scope.notify({
+                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
+                name: '1587warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1587].turnedOn = false;
+        }
+    },
+    1588: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type",
+        warning: "CANNOT CALCULATE SANJI JUMP, SPECIAL IS SELF TYPE BOOST",
+    },  
+    1589: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type",
+        warning: "CANNOT CALCULATE SANJI JUMP, SPECIAL IS SELF TYPE BOOST",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index d0dc2540c..e2035d885 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1077,7 +1077,7 @@ window.units = [
     [ "Leo", "QCK", [ "Striker", "Free Spirit" ], 4, 18, 5, 3, 70, 1066998, 131, 142, 54, 979, 700, 222, 1 ],
     [ "Leo, Tontatta Corps Leader", "QCK", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 918, 637, 177, 1934, 1351, 371, 1 ],
     [ "Mansherry", "PSY", "Striker", 4, 18, 6, 3, 70, 1066998, 100, 94, 86, 717, 416, 307, 1 ],
-    [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 642, 371, 260, 1510, 642, 557, 1 ],
+    [ "Mansherry, Princess of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 642, 371, 260, 1510, 642, 557, 1 ],
     [ "Kyros", "DEX", [ "Slasher", "Powerhouse" ], 4, 18, 4, 3, 70, 1066998, 192, 152, 43, 1106, 713, 189, 1 ],
     [ "Kyros, Former Captain of the Riku Royal Army", "DEX", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1042, 657, 143, 2377, 1373, 290, 1 ],
     [ "Don Sai", "STR", [ "Striker", "Fighter" ], 4, 18, 4, 3, 70, 1066998, 130, 130, 31, 1300, 673, 130, 1 ],
@@ -1585,6 +1585,9 @@ window.units = [
     [ "Massacre Ruler Orlumbus, Yonta Maria Grand Fleet Admiral", "PSY", [ "Striker", "Fighter" ], 5, 40, 6, 3, 99, 4000000, 1354, 544, 67, 3012, 1243, 200, null ],
     [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, 6, 1, 50, 392109, 124, 77, 23, 905, 492, 136, null ],
     [ "Brave Compannion Helmeppo, Navy HQ Chief Petty Officer", "QCK", [ "Slasher", "Driven" ], 4, 26, null, 3, 99, 3000000, null, null, null, 1971, 1016, 322, null ],
+    [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
+    [ "Sanji, Vinsmoke Family's 3rd Son", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 1066998, 369, 222, 31, 1323, 784, 200, null ],
+    [ "Black Leg Sanji", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 6, 5, 99, 5000000, 1251, 726, 147, 3233, 1506, 354, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 74dff8fb02d6085c79edbf026377adf0b1645315 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 10 May 2017 01:46:07 -0400
Subject: [PATCH 0998/1569] Croc, I have more don't worry

---
 common/data/details.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f89a97b5a..75c51355a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3176,15 +3176,13 @@ window.details = {
         captainNotes: "A hit below Good or a Miss will boost the ATK of the next unit by 2x, a Good hit by 2.25x, a Great hit by 2.5x and a Perfect hit by 2.75x. This bonus is applied only to Slasher characters."
     },
     719: {
-        special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
-        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
+        special: "Boosts ATK of Cerebral characters by 2x if HP is below 30% when the special is activated, otherwise boosts ATK of Cerebral characters by 1.5x, deals 20x character's ATK in DEX damage to all enemies",
         specialName: "Sables: Pesado",
         captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"
     },
     720: {
-        special: "Boosts ATK of Cerebral characters by a variable factor for 1 turn, deals 20x character's ATK in DEX damage to all enemies",
-        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 30% HP, the multiplier used is 1.5x; below 30% HP, it's 2x.",
+        special: "Boosts ATK of Cerebral characters by 2x if HP is below 30% when the special is activated, otherwise boosts ATK of Cerebral characters by 1.5x, deals 20x character's ATK in DEX damage to all enemies",
         specialName: "Sables: Pesado",
         captain: "Boosts ATK of Cerebral characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1.5 + 1.75 * (1 - (remaining HP) / (total HP)) : 1.5 : 3.25}"

From 805f6b1dceae67d4191b5526fb11dd7bbb424b8e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 10 May 2017 00:48:59 -0500
Subject: [PATCH 0999/1569] sanji fix

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 75c51355a..9499d48a0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8783,15 +8783,15 @@ window.details = {
         specialName: "King Kong Gun",
     },
     1588: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own by an additional 2.5x",
-        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x",
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
+        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
         specialName: "Hell Memories",
     },
     1589: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts attack of all characters by an additional 2.5x",
-        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x",
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
+        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
         specialName: "Hell Memories",

From 36d50b36761fc9995d82d30c99b03aaf50406046 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 10 May 2017 01:01:34 -0500
Subject: [PATCH 1000/1569] Gear 4

Forgot
---
 common/data/details.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9499d48a0..260e86b54 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7544,7 +7544,7 @@ window.details = {
         special: [
             {
                 "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
-                "cooldown": [ 14, 9 ],
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
@@ -7559,7 +7559,7 @@ window.details = {
         special: [
             {
                 "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
-                "cooldown": [ 14, 9 ],
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
@@ -8769,15 +8769,15 @@ window.details = {
         specialName: "Helmeppo Special",
     },
     1587: {//Gear 4 Luffy
-        captain: "Boosts ATK of Slasher and Driven characters by 2x and their RCV by 1.5x",
+        captain: "Boosts ATK of Fighter characters by 2.5x. If you use \"King Kong Gun\" THIS LUFFY boosts ATK of Fighter characters by 4x instead for 3 turns and reduces damage taken by 56% for 3 turns.",
         special: [
             {
-                "description": "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn you score 5 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ 18, 12 ],
+                "description": "Does something we aren't sure about yet",
+                "cooldown": [ 13, 8 ],
             },
             {
-                "description": "Boosts ATK of Free Spirit characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ 23, 17 ],
+                "description": "Deals 200x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 3 turns. After 3 turns, Binds and Despairs himself for ?? turns.",
+                "cooldown": [ 18, 13 ],
             },
         ],
         specialName: "King Kong Gun",

From 87ec8b95046d29d25a4d621e7601c06744ea6520 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 10 May 2017 01:33:55 -0500
Subject: [PATCH 1001/1569] Sanji 2 stage

---
 common/data/specials.js | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index fcc5fe136..275ac8314 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2630,13 +2630,27 @@ window.specials = {
         }
     },
     1588: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-        type: "type",
-        warning: "CANNOT CALCULATE SANJI JUMP, SPECIAL IS SELF TYPE BOOST",
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1588].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1588].multiplier == 2 ? 1 : 0);
+            window.specials[1588].multiplier = [2, 5][n];
+            p.scope.notify({
+                text: 'Using the ' + [2, 5][n] + 'x ATK multiplier. To switch to the ' + [5, 2][n] + 'x multiplier, disable and re-enable this special. (5x Attack boost assumes that Sanji Jumped, and used his special on the following turn. Jumping + Type Boost does NOT work yet.)',
+                name: '1588warning'
+            });
+        },
     },  
     1589: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
-        type: "type",
-        warning: "CANNOT CALCULATE SANJI JUMP, SPECIAL IS SELF TYPE BOOST",
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1589].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1589].multiplier == 2 ? 1 : 0);
+            window.specials[1589].multiplier = [2, 5][n];
+            p.scope.notify({
+                text: 'Using the ' + [2, 5][n] + 'x ATK multiplier. To switch to the ' + [5, 2][n] + 'x multiplier, disable and re-enable this special. (5x Attack boost assumes that Sanji Jumped, and used his special on the following turn. Jumping + Type Boost does NOT work yet.)',
+                name: '1589warning'
+            });
+        },
     },
 };

From b86d425a3864cdb41bd8ea86f9a0b5ee7af94da5 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 10 May 2017 01:52:02 -0500
Subject: [PATCH 1002/1569] sanji

better
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 260e86b54..096e91193 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8784,14 +8784,14 @@ window.details = {
     },
     1588: {//Legend Sanji
         captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
-        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
+        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
         specialName: "Hell Memories",
     },
     1589: {//Legend Sanji
         captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
-        captainNotes: "Action does not stack with second Sanji. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
+        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
         specialName: "Hell Memories",

From 0cd8707d4e3de17d2fe55db55277e522faae8a62 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 10 May 2017 03:06:40 -0400
Subject: [PATCH 1003/1569] Bug Fixes

Cucked by Tech Support
---
 common/data/details.js               | 4 ++--
 common/data/drops.js                 | 2 +-
 common/data/evolutions.js            | 2 +-
 probability/js/controllers.js        | 3 ++-
 probability/js/specialprobability.js | 4 ++++
 probability/views/main.html          | 5 ++++-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 096e91193..d7f5c1905 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8297,12 +8297,12 @@ window.details = {
     },
     1517: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2x",
-        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
         specialName: "Spring Hopper - Bullet",
     },
     1518: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2.5x",
-        special: "Cuts the current HP of each enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
         specialName: "Spring Hopper - Bullet",
     },
     1519: {//Dadan
diff --git a/common/data/drops.js b/common/data/drops.js
index 32008eaf6..1f900f3aa 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1852,7 +1852,7 @@ window.drops = {
             name: 'Invasion! Red Hair Shanks',
             thumb: 1380,
             condition: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Shanks.",
-            "All Difficulties": [ 1379 ]
+            "All Difficulties": [ 1379, 952, 776 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 159fb6f85..7871d01fa 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2097,7 +2097,7 @@ window.evolutions = {
     },
     1379: {
         evolution: 1380,
-        evolvers: [ 118, 88, 266, 99, 304 ]
+        evolvers: [ 118, 88, 266, 99, 267 ]
     },
     1381: {
         evolution: 1382,
diff --git a/probability/js/controllers.js b/probability/js/controllers.js
index 7a8f66ee6..aa93fdf70 100644
--- a/probability/js/controllers.js
+++ b/probability/js/controllers.js
@@ -17,6 +17,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
     $scope.copies = null;
 	$scope.slots = null;
 	$scope.specialEvent = false;
+    $scope.special3Event = false;
     $scope.jpnVersion = false;
 	
 	$scope.specialProbabilityProgress = 0;
@@ -31,7 +32,7 @@ controllers.MainCtrl = ['$scope', '$rootScope', '$state', '$stateParams', '$cont
 			return;
 		}
 		$scope.isSpecialReady = false;
-		var data = {copies: $scope.copies, skillups: $scope.skillups, special_event: $scope.specialEvent, jpn_server: $scope.jpnVersion};
+		var data = {copies: $scope.copies, skillups: $scope.skillups, special_event: $scope.specialEvent, special_3event: $scope.special3Event, jpn_server: $scope.jpnVersion};
 		SpecialProbability.compute(data).then(
 			function(data) {
 				if (data.finished == true) {
diff --git a/probability/js/specialprobability.js b/probability/js/specialprobability.js
index 68745bb6a..7cbd866ce 100644
--- a/probability/js/specialprobability.js
+++ b/probability/js/specialprobability.js
@@ -11,6 +11,10 @@ onmessage = function(e) {
 	if (e.data.special_event == true) {
 		probability *= 2;
 	}
+    // if special event selected probability is doubled
+	else if (e.data.special_3event == true) {
+		probability *= 3;
+	}
     
 	
 	var prob = 0;
diff --git a/probability/views/main.html b/probability/views/main.html
index d74eecc27..1470facb9 100644
--- a/probability/views/main.html
+++ b/probability/views/main.html
@@ -35,7 +35,10 @@ <h1 class="page-header">
 			<div id="calculation-area">
 				
 				<div class="small-container">
-                    <label><input type="checkbox" ng-model="specialEvent" ng-change="changeBaseValues()">Special x2 Event </label>
+                    <form skillevent="">
+                        <input type="checkbox" name="event" value = 2 ng-model="specialEvent" ng-change="changeBaseValues()">Special x2 Event
+                        <input type="checkbox" name="event" value = 3 ng-model="special3Event" ng-change="changeBaseValues()">Special x3 Event 
+                    </form>
                     &nbsp; &nbsp;
                     <label><input type="checkbox" ng-model="jpnVersion" ng-change="changeBaseValues()">Japanese Version</label>
                     <p></p>

From c39d3da70add128b2796918767915ff95a68ad1b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 10 May 2017 03:18:54 -0400
Subject: [PATCH 1004/1569] WOWEE

---
 common/data/details.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/details.js b/common/data/details.js
index d7f5c1905..ebf1bc553 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8780,6 +8780,7 @@ window.details = {
                 "cooldown": [ 18, 13 ],
             },
         ],
+        sailor: "Completely resists Paralysis on this character",
         specialName: "King Kong Gun",
     },
     1588: {//Legend Sanji

From d35050d75c116c3d80a9e75ac7728c1b71f1cd7e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 10 May 2017 03:25:50 -0400
Subject: [PATCH 1005/1569] Duval

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 11d3924d6..8af0894b0 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4431,10 +4431,10 @@ window.captains = {
         hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1535: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : p.slot == p.sourceSlot ? 2.5 : 1; }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (p.orb == 2.0 ? 2.5 : 1); }
     },
     1536: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : p.slot == p.sourceSlot ? 3 : 1; }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (p.orb == 2.0 ? 3 : 1); }
     },
     1537: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },

From 370b7b6b2020aa39789aafeab7db88469b8418ca Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 10 May 2017 10:30:03 -0400
Subject: [PATCH 1006/1569] reverse evolution

Sanji only gets worse when he evolves
---
 common/data/evolutions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7871d01fa..4181c747a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2451,12 +2451,12 @@ window.evolutions = {
         evolution: 1586,
         evolvers: [  ]
     },
-    1587: {
-        evolution: 1404,
+    1404: {
+        evolution: 1587,
         evolvers: [  ]
     },
-    1589: {
-        evolution: 1588,
+    1588: {
+        evolution: 1589,
         evolvers: [  ]
     },
 };

From 36d453328f8bec57c22a6ee6f300a7e1d6fe6d9c Mon Sep 17 00:00:00 2001
From: Michael Pollind <mpollind@gmail.com>
Date: Wed, 10 May 2017 08:04:23 -0700
Subject: [PATCH 1007/1569] added star plus to sidebar

---
 characters/views/sidebar.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 4d1a0e92a..595e1e01a 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -18,6 +18,8 @@
     <span class="filter-header">Rarity filters</span>
     <span ng-repeat="(n,stars) in [ 1, 2, 3, 4, 5, 6 ]" class="filter stars width-4 stars-{{stars}}"
         ng-click="onStarsClick($event,stars)" ng-class="{ active: filters.stars.indexOf(stars) > -1 }"></span>
+    <span ng-repeat="(n,stars) in [ 5, 6 ]" class="filter stars width-4 stars-{{stars}}+"
+        ng-click="onStarsClick($event,stars + '+')" ng-class="{ active: filters.stars.indexOf(stars + '+') > -1 }"></span>
 </div>
 
 <div class="filter-container expandable" id="cost-container"

From fd953a636fd767214245a9cf50066699eb9ea46f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 10 May 2017 12:13:53 -0400
Subject: [PATCH 1008/1569] That one guy who is driven slasher

---
 common/data/aliases.js    |  6 ++++-
 common/data/captains.js   | 26 ++++++++++++++++----
 common/data/cooldowns.js  |  6 ++++-
 common/data/details.js    | 50 ++++++++++++++++++++++++++-----------
 common/data/evolutions.js |  6 ++---
 common/data/flags.js      |  7 ++++++
 common/data/specials.js   | 52 ++++++++++++++++++++++++---------------
 common/data/units.js      |  6 ++++-
 8 files changed, 113 insertions(+), 46 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index f4e2924e1..2685ee824 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1585,7 +1585,11 @@ window.aliases = {
     1584: ['', '', 'Coliseum Orlumbus'],
     1585: ['', '', 'Coliseum Helmeppo'],
     1586: ['', '', 'Coliseum Helmeppo'],
-    1587: ['', '', 'Gear 4 Luffy'],
     1588: ['', '', ''],
     1589: ['', '', ''],
+    1591: ['', '', 'Anniversary Shanks'],
+    1592: ['', '', 'Anniversary Shanks'],
+    1593: ['', '', 'Anniversary Boa'],
+    1594: ['', '', 'Anniversary Boa'],
+    1593: ['', '', 'Gear 4 Luffy', 'Mega Luffy'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 8af0894b0..67e710464 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4660,16 +4660,32 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1587: {
-        atk: function(p){ 
-            return p.unit.class.has("Fighter") ? ((!window.specials[1587].turnedOn || (window.specials[1587].multiplier == null)) ? 2.5 : window.specials[1587].multiplier) : 1;
-        },
+        atk: function(p) { return 2.5 },
+        hp: function(p) { return 1.3 },
     },
     1588: {
         atk: function(p) { return 2.5 },
         hp: function(p) { return 1.3 },
     },
     1589: {
-        atk: function(p) { return 2.5 },
-        hp: function(p) { return 1.3 },
+        chainModifier: function(p) { return 3; },
+    },
+    1589: {
+        chainModifier: function(p) { return 3.5; },
+        rcv: function(p) { return 1.2 },
+        hp: function(p) { return 1.2 },
+    },
+    1591: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+    },
+    1592: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+    },
+    1593: {
+        atk: function(p){ 
+            return p.unit.class.has("Fighter") ? ((!window.specials[1587].turnedOn || (window.specials[1587].multiplier == null)) ? 2.5 : window.specials[1587].multiplier) : 1;
+        },
     },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 21633161f..699bda386 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1585,7 +1585,11 @@ window.cooldowns = [
     [ 29, 15 ],
     [ 20, 11 ],
     [ 20, 11 ],
-    null,//Gear 4 Luffy
     19,
     19,
+    null,
+    null,
+    [ 14, 14 ],
+    [ 14, 14 ],
+    null,//Gear 4 Luffy
 ];
diff --git a/common/data/details.js b/common/data/details.js
index ebf1bc553..6e15cf59a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8768,7 +8768,41 @@ window.details = {
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
         specialName: "Helmeppo Special",
     },
-    1587: {//Gear 4 Luffy
+    1587: {//Legend Sanji
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
+        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
+        special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
+        sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
+        specialName: "Hell Memories",
+    },
+    1588: {//Legend Sanji
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
+        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
+        special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
+        sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
+        specialName: "Hell Memories",
+    },
+    1589: {//Anniversary Shanks
+        captain: "Boosts Chain Multiplier by 3x",
+        special: "Recover 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
+        specialName: "Sharing a Cup Filled with Emotions",
+    },
+    1590: {//Anniversary Shanks
+        captain: "Boosts Chain Multiplier by 3.5x, Boosts HP and RCV of all characters by 1.2x",
+        special: "Recover 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
+        specialName: "Sharing a Cup Filled with Emotions",
+    },	
+    1591: {//Anniversary Boa
+        captain: "Boosts ATK and RCV of Fighter and Free Spirit characters by 1.5x",
+        special: "Recovers 3,000 HP and boosts ATK of Free Spirit and Fighter characters by 1.75x for 1 turn",
+        specialName: "Immoral Gaze",
+    },
+    1592: {//Anniversary Boa
+        captain: "Boosts ATK of Fighter and Free Spirit characters by 2.25x and their RCV by 1.75x",
+        special: "Recovers 3,000 HP and boosts ATK of Free Spirit and Fighter characters by 1.75x for 1 turn",
+        specialName: "Immoral Gaze",
+    },
+    1593: {//Gear 4 Luffy
         captain: "Boosts ATK of Fighter characters by 2.5x. If you use \"King Kong Gun\" THIS LUFFY boosts ATK of Fighter characters by 4x instead for 3 turns and reduces damage taken by 56% for 3 turns.",
         special: [
             {
@@ -8783,18 +8817,4 @@ window.details = {
         sailor: "Completely resists Paralysis on this character",
         specialName: "King Kong Gun",
     },
-    1588: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
-        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
-        special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
-        sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
-        specialName: "Hell Memories",
-    },
-    1589: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
-        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
-        special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
-        sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
-        specialName: "Hell Memories",
-    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4181c747a..f69115c15 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2452,11 +2452,11 @@ window.evolutions = {
         evolvers: [  ]
     },
     1404: {
-        evolution: 1587,
+        evolution: 1593,
         evolvers: [  ]
     },
-    1588: {
-        evolution: 1589,
+    1587: {
+        evolution: 1588,
         evolvers: [  ]
     },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 49d66d614..3cbf22bc1 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1374,4 +1374,11 @@ window.flags = {
     1577: { rr: 1, rro: 1 },
     1578: { rr: 1, rro: 1 },
     1579: { rr: 1, rro: 1 },
+    1587: { rr: 1, rro: 1 },
+    1588: { rr: 1, rro: 1 },
+    1589: { rr: 1, rro: 1, lrr: 1 },
+    1590: { rr: 1, rro: 1, lrr: 1 },
+    1591: { rr: 1, rro: 1, lrr: 1 },
+    1592: { rr: 1, rro: 1, lrr: 1 },
+    1593: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 275ac8314..cda2860fa 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2606,29 +2606,27 @@ window.specials = {
         },
     },
     1585: {
-        atk: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
-        rcv: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
+        atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
+        rcv: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
         type: "class"
     },
     1586: {
-        atk: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
-        rcv: function(p) { return (p.percHP*p.maxHP/100 > 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
+        atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
+        rcv: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
         type: "class"
     },
     1587: {
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1587].multiplier : 1; },
+        type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1587].multiplier == 3.16 ? 1 : 0);
-            window.specials[1587].turnedOn = true;
-            window.specials[1587].multiplier = [3.16, 4][n];
+            var n = (window.specials[1587].multiplier == 2 ? 1 : 0);
+            window.specials[1587].multiplier = [2, 5][n];
             p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
+                text: 'Using the ' + [2, 5][n] + 'x ATK multiplier. To switch to the ' + [5, 2][n] + 'x multiplier, disable and re-enable this special. (5x Attack boost assumes that Sanji Jumped, and used his special on the following turn. Jumping + Type Boost does NOT work yet.)',
                 name: '1587warning'
             });
         },
-        onDeactivation: function(p) {
-            window.specials[1587].turnedOn = false;
-        }
-    },
+    },  
     1588: {
         atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1588].multiplier : 1; },
         type: "class",
@@ -2640,17 +2638,31 @@ window.specials = {
                 name: '1588warning'
             });
         },
-    },  
-    1589: {
-        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1589].multiplier : 1; },
-        type: "class",
+    },
+    1591: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
+    },
+    1592: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
+    },
+    1593: {
         onActivation: function(p) {
-            var n = (window.specials[1589].multiplier == 2 ? 1 : 0);
-            window.specials[1589].multiplier = [2, 5][n];
+            var n = (window.specials[1593].multiplier == 3.16 ? 1 : 0);
+            window.specials[1593].turnedOn = true;
+            window.specials[1593].multiplier = [3.16, 4][n];
             p.scope.notify({
-                text: 'Using the ' + [2, 5][n] + 'x ATK multiplier. To switch to the ' + [5, 2][n] + 'x multiplier, disable and re-enable this special. (5x Attack boost assumes that Sanji Jumped, and used his special on the following turn. Jumping + Type Boost does NOT work yet.)',
-                name: '1589warning'
+                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
+                name: '1593warning'
             });
         },
+        onDeactivation: function(p) {
+            window.specials[1593].turnedOn = false;
+        }
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index e2035d885..bd808fbad 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1585,9 +1585,13 @@ window.units = [
     [ "Massacre Ruler Orlumbus, Yonta Maria Grand Fleet Admiral", "PSY", [ "Striker", "Fighter" ], 5, 40, 6, 3, 99, 4000000, 1354, 544, 67, 3012, 1243, 200, null ],
     [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, 6, 1, 50, 392109, 124, 77, 23, 905, 492, 136, null ],
     [ "Brave Compannion Helmeppo, Navy HQ Chief Petty Officer", "QCK", [ "Slasher", "Driven" ], 4, 26, null, 3, 99, 3000000, null, null, null, 1971, 1016, 322, null ],
-    [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
     [ "Sanji, Vinsmoke Family's 3rd Son", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 1066998, 369, 222, 31, 1323, 784, 200, null ],
     [ "Black Leg Sanji", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 6, 5, 99, 5000000, 1251, 726, 147, 3233, 1506, 354, null ],
+    [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 4b8b2437f2c24665f36b8741f43f653219f87623 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Wed, 10 May 2017 10:11:35 -0700
Subject: [PATCH 1009/1569] + CHARS COMPLETELY WORK NOW!!!

---
 characters/views/sidebar.html | 237 +++++++++++++++++-----------------
 1 file changed, 119 insertions(+), 118 deletions(-)

diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 2f6c100d8..1c2c450d5 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -1,119 +1,120 @@
-<div id="clear-button" class="filter-header" ng-click="clearFilters()">Clear filters</div>
-
-<div class="filter-container">
-    <span class="filter-header">Type filters</span>
-    <span ng-model="filters.type" ng-repeat="(n,type) in [ 'STR', 'QCK', 'DEX', 'PSY', 'INT' ]"
-        class="filter {{n < 3 ? 'width-4' : 'width-6'}} type {{type}}" ng-class="{ active: filters.type == type }"
-        ng-click="onFilterClick($event,type)">{{type}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Class filters</span>
-    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven', 'Evolver', 'Booster' ]"
-        class="filter width-6 class" ng-click="onClassClick($event,class)"
-        ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Rarity filters</span>
-    <span ng-repeat="(n,stars) in [ 1, 2, 3, 4, 5, 6 ]" class="filter stars width-4 stars-{{stars}}"
-        ng-click="onStarsClick($event,stars)" ng-class="{ active: filters.stars.indexOf(stars) > -1 }"></span>
-    <span ng-repeat="(n,stars) in [ 5, 6 ]" class="filter stars width-4 stars-{{stars}}+"
-        ng-click="onStarsClick($event,stars + '+')" ng-class="{ active: filters.stars.indexOf(stars + '+') > -1 }"></span>
-</div>
-
-<div class="filter-container expandable" id="cost-container"
-        ng-class="{ expanded: filters.costEnabled }">
-    <span class="filter-header" ng-click="filters.costEnabled = !filters.costEnabled">
-        Cost filter
-        <i class="pull-right fa fa-{{costExpanded ? 'chevron-up' : 'chevron-down'}}"></i>
-    </span>
-    <input type="text" id="cost-slider" name="cost-slider" value="" cost-slider></input>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Drop filters</span>
-    <span ng-repeat="type in [ 'Farmable', 'Non-farmable' ]" class="filter width-6 drop" ng-model="filters.drop"
-        ng-class="{ active: filters.drop == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-    <span ng-repeat="type in [ 'Global units', 'Japan exclusives' ]" class="filter width-6 drop" ng-model="filters.server"
-        ng-class="{ active: filters.server == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-    <span ng-repeat="type in [ 'In RR pool', 'Not in RR pool' ]" class="filter width-6 drop" ng-model="filters.rr"
-        ng-class="{ active: filters.rr == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-    <span ng-repeat="type in [ 'Farmable Sockets', 'No Farmable Sockets' ]" class="filter width-6 drop" ng-model="filters.socket"
-        ng-class="{ active: filters.socket == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
-</div>
-
-<div class="filter-container conditional" ng-show="filters.drop == 'Farmable'">
-    <span class="filter-header">Farmable filters</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.fortnight }"
-        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,true)">Fortnight-only</span><!--
- --><span class="filter width-6 exc" ng-class="{ active: filters.farmable.fortnight === false }"
-        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,false)">Hide fortnight-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.raid }"
-        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,true)">Raid-only</span><!--
- --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.raid === false }"
-        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,false)">Hide raid-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.Coliseum }"
-        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,true)">Coliseum-only</span><!--
- --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.Coliseum === false }"
-        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,false)">Hide Clssm-only</span>
-</div>
-
-<div class="filter-container conditional" ng-show="filters.drop == 'Non-farmable'">
-    <span class="filter-header">Non-farmable filters</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr }"
-        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,true)">Limited RR-only</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr === false }"
-        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,false)">Hide lim. RR-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo }"
-        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,true)">Promo-only</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo === false }"
-        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,false)">Hide promo-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special }"
-        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,true)">Special-only</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special === false }"
-        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,false)">Hide special-only</span>
-    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop }"
-        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,true)">Ray Shop Unit</span><!--
- --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop === false }"
-        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,false)">Hide Ray Shop Unit</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Exclusion filters</span>
-    <span class="filter width-6 exc" ng-model="filters.noBase" ng-class="{ active: filters.noBase }"
-        ng-click="filters.noBase = !filters.noBase">Hide base forms</span><!--
- --><span class="filter width-6 exc" ng-model="filters.noFodder" ng-class="{ active: filters.noFodder }"
-        ng-click="filters.noFodder = !filters.noFodder">Hide fodder</span>
-    <span class="filter width-12 exc" ng-model="filters.noEvos" ng-class="{ active: filters.noEvos }"
-        ng-click="filters.noEvos = !filters.noEvos">Hide Boosters and Evolvers</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Captain ability filters</span>
-    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target == 'captain'"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-captain-options
-        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Special filters</span>
-    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('special') == 0"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
-        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
-</div>
-
-<div class="filter-container">
-    <span class="filter-header">Sailor filters</span>
-    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('sailor') == 0"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
-        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
-</div>
-
-<div class="filter-container" ng-if="showLogFilters">
-    <span class="filter-header">Character Log filters</span>
-    <span class="filter width-12 custom" ng-model="filters.noLog" ng-class="{ active: filters.noLog }"
-        ng-click="filters.noLog = !filters.noLog">Hide units in Character Log</span>
-    <span class="filter width-12 custom" ng-model="filters.noMissing" ng-class="{ active: filters.noMissing }"
-        ng-click="filters.noMissing = !filters.noMissing">Hide units not in Character Log</span>
+<div id="clear-button" class="filter-header" ng-click="clearFilters()">Clear filters</div>
+
+<div class="filter-container">
+    <span class="filter-header">Type filters</span>
+    <span ng-model="filters.type" ng-repeat="(n,type) in [ 'STR', 'QCK', 'DEX', 'PSY', 'INT' ]"
+        class="filter {{n < 3 ? 'width-4' : 'width-6'}} type {{type}}" ng-class="{ active: filters.type == type }"
+        ng-click="onFilterClick($event,type)">{{type}}</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Class filters</span>
+    <span ng-repeat="(n,class) in [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven', 'Evolver', 'Booster' ]"
+        class="filter width-6 class" ng-click="onClassClick($event,class)"
+        ng-class="{ active: filters.classes.indexOf(class) > -1 }">{{class}}</span>
+</div>
+
+
+<div class="filter-container">
+    <span class="filter-header">Rarity filters</span>
+    <span ng-repeat="(n,stars) in [ 1, 2, 3, 4, 5, 6 ]" class="filter stars width-4 stars-{{stars}}"
+        ng-click="onStarsClick($event,stars)" ng-class="{ active: filters.stars.indexOf(stars) > -1 }"></span>
+    <span ng-repeat="(n,stars) in [ 5, 6 ]" class="filter stars width-4 stars-{{stars}}+"
+        ng-click="onStarsClick($event,stars + '+')" ng-class="{ active: filters.stars.indexOf(stars + '+') > -1 }"></span>
+</div>
+
+<div class="filter-container expandable" id="cost-container"
+        ng-class="{ expanded: filters.costEnabled }">
+    <span class="filter-header" ng-click="filters.costEnabled = !filters.costEnabled">
+        Cost filter
+        <i class="pull-right fa fa-{{costExpanded ? 'chevron-up' : 'chevron-down'}}"></i>
+    </span>
+    <input type="text" id="cost-slider" name="cost-slider" value="" cost-slider></input>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Drop filters</span>
+    <span ng-repeat="type in [ 'Farmable', 'Non-farmable' ]" class="filter width-6 drop" ng-model="filters.drop"
+        ng-class="{ active: filters.drop == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+    <span ng-repeat="type in [ 'Global units', 'Japan exclusives' ]" class="filter width-6 drop" ng-model="filters.server"
+        ng-class="{ active: filters.server == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+    <span ng-repeat="type in [ 'In RR pool', 'Not in RR pool' ]" class="filter width-6 drop" ng-model="filters.rr"
+        ng-class="{ active: filters.rr == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+    <span ng-repeat="type in [ 'Farmable Sockets', 'No Farmable Sockets' ]" class="filter width-6 drop" ng-model="filters.socket"
+        ng-class="{ active: filters.socket == type }" ng-click="onFilterClick($event,type)">{{type}}</span>
+</div>
+
+<div class="filter-container conditional" ng-show="filters.drop == 'Farmable'">
+    <span class="filter-header">Farmable filters</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.fortnight }"
+        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,true)">Fortnight-only</span><!--
+ --><span class="filter width-6 exc" ng-class="{ active: filters.farmable.fortnight === false }"
+        ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,false)">Hide fortnight-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.raid }"
+        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,true)">Raid-only</span><!--
+ --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.raid === false }"
+        ng-model="filters.farmable.raid" ng-click="onDropFilterClick($event,false)">Hide raid-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.Coliseum }"
+        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,true)">Coliseum-only</span><!--
+ --><span class="filter width-6 exc"  ng-class="{ active: filters.farmable.Coliseum === false }"
+        ng-model="filters.farmable.Coliseum" ng-click="onDropFilterClick($event,false)">Hide Clssm-only</span>
+</div>
+
+<div class="filter-container conditional" ng-show="filters.drop == 'Non-farmable'">
+    <span class="filter-header">Non-farmable filters</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr }"
+        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,true)">Limited RR-only</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.lrr === false }"
+        ng-model="filters.nonFarmable.lrr" ng-click="onDropFilterClick($event,false)">Hide lim. RR-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo }"
+        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,true)">Promo-only</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.promo === false }"
+        ng-model="filters.nonFarmable.promo" ng-click="onDropFilterClick($event,false)">Hide promo-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special }"
+        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,true)">Special-only</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.special === false }"
+        ng-model="filters.nonFarmable.special" ng-click="onDropFilterClick($event,false)">Hide special-only</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop }"
+        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,true)">Ray Shop Unit</span><!--
+ --><span class="filter width-6 drop" ng-class="{ active: filters.nonFarmable.shop === false }"
+        ng-model="filters.nonFarmable.shop" ng-click="onDropFilterClick($event,false)">Hide Ray Shop Unit</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Exclusion filters</span>
+    <span class="filter width-6 exc" ng-model="filters.noBase" ng-class="{ active: filters.noBase }"
+        ng-click="filters.noBase = !filters.noBase">Hide base forms</span><!--
+ --><span class="filter width-6 exc" ng-model="filters.noFodder" ng-class="{ active: filters.noFodder }"
+        ng-click="filters.noFodder = !filters.noFodder">Hide fodder</span>
+    <span class="filter width-12 exc" ng-model="filters.noEvos" ng-class="{ active: filters.noEvos }"
+        ng-click="filters.noEvos = !filters.noEvos">Hide Boosters and Evolvers</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Captain ability filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target == 'captain'"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-captain-options
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Special filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('special') == 0"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
+<div class="filter-container">
+    <span class="filter-header">Sailor filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('sailor') == 0"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
+<div class="filter-container" ng-if="showLogFilters">
+    <span class="filter-header">Character Log filters</span>
+    <span class="filter width-12 custom" ng-model="filters.noLog" ng-class="{ active: filters.noLog }"
+        ng-click="filters.noLog = !filters.noLog">Hide units in Character Log</span>
+    <span class="filter width-12 custom" ng-model="filters.noMissing" ng-class="{ active: filters.noMissing }"
+        ng-click="filters.noMissing = !filters.noMissing">Hide units not in Character Log</span>
 </div>
\ No newline at end of file

From 0ed1767a10296238fdf15f7679717362f1afaf9f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 10 May 2017 19:13:00 -0400
Subject: [PATCH 1010/1569] 4

---
 common/data/captains.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 67e710464..9471a8844 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4685,7 +4685,7 @@ window.captains = {
     },
     1593: {
         atk: function(p){ 
-            return p.unit.class.has("Fighter") ? ((!window.specials[1587].turnedOn || (window.specials[1587].multiplier == null)) ? 2.5 : window.specials[1587].multiplier) : 1;
+            return p.unit.class.has("Fighter") ? ((!window.specials[1593].turnedOn || (window.specials[1593].multiplier == null)) ? 2.5 : window.specials[1593].multiplier) : 1;
         },
     },
 };

From b1e2de054c2b534f408ea006fb81247bbba677da Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Wed, 10 May 2017 23:35:46 -0700
Subject: [PATCH 1011/1569] Added Gear 4 stage 1 special

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6e15cf59a..ad8567afa 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8806,7 +8806,7 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.5x. If you use \"King Kong Gun\" THIS LUFFY boosts ATK of Fighter characters by 4x instead for 3 turns and reduces damage taken by 56% for 3 turns.",
         special: [
             {
-                "description": "Does something we aren't sure about yet",
+                "description": "Deals 100x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 1 turn.  After 3 turns, Binds and Despairs himself for ?? turns.",
                 "cooldown": [ 13, 8 ],
             },
             {

From 61271deb42f5b450040809993ea2b24b2b8051a6 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Fri, 12 May 2017 08:42:35 -0700
Subject: [PATCH 1012/1569] added legend sanji's max CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 699bda386..dc50f3590 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1585,8 +1585,8 @@ window.cooldowns = [
     [ 29, 15 ],
     [ 20, 11 ],
     [ 20, 11 ],
-    19,
-    19,
+    [ 19, 14 ],
+    [ 19, 14 ],
     null,
     null,
     [ 14, 14 ],

From 3f2ba4f451a0d4e5cd1aefd9b0ca3b72dd959564 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 12 May 2017 18:12:32 -0400
Subject: [PATCH 1013/1569] New stuff

Sanji is in progress
---
 common/data/aliases.js               | 10 +++++-----
 common/data/captains.js              |  4 ++++
 common/data/details.js               | 14 ++++++++++++--
 common/data/families.js              |  4 ++--
 common/data/gw.js                    |  7 +++++++
 common/data/specials.js              |  6 ++++++
 common/data/units.js                 |  4 +++-
 damage/js/app.js                     |  4 ++++
 damage/js/cruncher.js                |  5 +++++
 damage/js/directives.js              |  2 +-
 damage/views/content.html            |  4 ++++
 probability/js/specialprobability.js |  2 +-
 12 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2685ee824..43853c30f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1585,11 +1585,11 @@ window.aliases = {
     1584: ['', '', 'Coliseum Orlumbus'],
     1585: ['', '', 'Coliseum Helmeppo'],
     1586: ['', '', 'Coliseum Helmeppo'],
+    1587: ['', '', ''],
     1588: ['', '', ''],
-    1589: ['', '', ''],
-    1591: ['', '', 'Anniversary Shanks'],
-    1592: ['', '', 'Anniversary Shanks'],
-    1593: ['', '', 'Anniversary Boa'],
-    1594: ['', '', 'Anniversary Boa'],
+    1589: ['', '', 'Anniversary Shanks'],
+    1590: ['', '', 'Anniversary Shanks'],
+    1591: ['', '', 'Anniversary Boa'],
+    1592: ['', '', 'Anniversary Boa'],
     1593: ['', '', 'Gear 4 Luffy', 'Mega Luffy'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 9471a8844..d50136bca 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4688,4 +4688,8 @@ window.captains = {
             return p.unit.class.has("Fighter") ? ((!window.specials[1593].turnedOn || (window.specials[1593].multiplier == null)) ? 2.5 : window.specials[1593].multiplier) : 1;
         },
     },
+    1595: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index ad8567afa..a4590f710 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8634,12 +8634,12 @@ window.details = {
     },
     1567: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
-        special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by ???x for 3 turns",
+        special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
         specialName: "Boa Special",
     },
     1568: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 2x",
-        special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by ???x for 3 turns",
+        special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
         specialName: "Boa Special",
     },
     1569: {//Anniversary Law
@@ -8817,4 +8817,14 @@ window.details = {
         sailor: "Completely resists Paralysis on this character",
         specialName: "King Kong Gun",
     },
+    1594: {//Raid Fuji
+        captain: "Cuts the current HP of each enemy by 10% at the end of each turn",
+        special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
+        specialName: "Gravity Blade: Fierce Tiger",
+    },
+    1595: {//Raid Fuji
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.2x, cuts the current HP of each enemy by 10% at the end of each turn",
+        special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
+        specialName: "Gravity Blade: Fierce Tiger",
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 304615d8f..e8d95d0c1 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1257,8 +1257,8 @@ window.families = [
     "Whitey Bay",
     "Whitebeard",
     "Whitebeard",
-    "Doflamingo",
-    "Doflamingo",
+    "Donquixote Doflamingo",
+    "Donquixote Doflamingo",
     "Señor Pink",
     "Señor Pink",
     "Vergo",
diff --git a/common/data/gw.js b/common/data/gw.js
index 884df1e4c..01fc14180 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1585,4 +1585,11 @@ window.gw=[
     56054,
     56056,
     56056,
+    56735,
+    56735,
+    56780,
+    56780,
+    56779,
+    56779,
+    56736,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index cda2860fa..e371ea663 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2665,4 +2665,10 @@ window.specials = {
             window.specials[1593].turnedOn = false;
         }
     },
+    1594: {
+        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+    },
+    1594: {
+        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index d39b61a63..878bfe75b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1586,12 +1586,14 @@ window.units = [
     [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, 6, 1, 50, 392109, 124, 77, 23, 905, 492, 136, null ],
     [ "Brave Compannion Helmeppo, Navy HQ Chief Petty Officer", "QCK", [ "Slasher", "Driven" ], 4, 26, null, 3, 99, 3000000, null, null, null, 1971, 1016, 322, null ],
     [ "Sanji, Vinsmoke Family's 3rd Son", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 1066998, 369, 222, 31, 1323, 784, 200, null ],
-    [ "Black Leg Sanji", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 6, 5, 99, 5000000, 1251, 726, 147, 3233, 1506, 354, null ],
+    [ "Sanji, Germa Kingdom Prince", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 6, 5, 99, 5000000, 1251, 726, 147, 3233, 1506, 354, null ],
     [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
+    [ "Fujitora", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora, Evolved", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/app.js b/damage/js/app.js
index f96ec6442..a8dd26668 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -50,6 +50,10 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         turnCounter: {
             enabled: false,
             value: 0
+        },
+        captainAction: {
+            enabled: false,
+            value: [$scope.captainAction1, $scope.captainAction2]
         }
 
     };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 4bd8a186b..63cfdb3df 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -716,6 +716,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         enabledSpecials = [ ];
         // deactivate turn counter (will be reactivated if necessary)
         $scope.tdata.turnCounter.enabled = false;
+        $scope.tdata.captainAction.enabled = false;
         // orb map effects
         mapEffect = { };
         if ($scope.data.effect) {
@@ -755,6 +756,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             // activate turn counter if necessary
             if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562))
                 $scope.tdata.turnCounter.enabled = true;
+            if (n < 2 && (id == 1587 || id == 1588))
+                $scope.tdata.captainAction.enabled = true;
         });
         if (conflictWarning) 
             $scope.notify({ type: 'error', text: 'One or more specials you selected cannot be activated due to an active map effect.' });
@@ -858,6 +861,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     };
     
     var getParameters = function(slotNumber, chainPosition) {
+        //console.log($scope.tdata.captainAction.value)
         return {
             unit: team[slotNumber].unit,
             orb: $scope.tdata.team[slotNumber].orb,
@@ -869,6 +873,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             scope: $scope,
             slot: slotNumber,
             turnCounter: $scope.tdata.turnCounter.value,
+            captainAction: $scope.tdata.captainAction.value,
             chainPosition: chainPosition,
             classCount: classCounter(),
             colorCount: colorCounter(),
diff --git a/damage/js/directives.js b/damage/js/directives.js
index fdfc3b41f..80d0d54a1 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -484,7 +484,7 @@ directives.turnCounter = function() {
         }
     };
 };
-
+    
 directives.levelLabel = function($timeout) {
     return {
         restrict: 'E',
diff --git a/damage/views/content.html b/damage/views/content.html
index 9f340f0c5..79167c4b4 100644
--- a/damage/views/content.html
+++ b/damage/views/content.html
@@ -6,6 +6,10 @@
     </div>
 
     <turn-counter ng-show="tdata.turnCounter.enabled"></turn-counter>
+    <div id="capact" captainAction="" ng-show="tdata.captainAction.enabled">
+                        <input type="checkbox" name="action" ng-model="captainAction1" ng-change="changeBaseValues()">Friend Caption Action
+                        <input type="checkbox" name="action" ng-model="captainAction2" ng-change="changeBaseValues()">Captain Action
+    </div>
     <hp-bar></hp-bar>
 
     <div id="other">
diff --git a/probability/js/specialprobability.js b/probability/js/specialprobability.js
index 7cbd866ce..b4361f08d 100644
--- a/probability/js/specialprobability.js
+++ b/probability/js/specialprobability.js
@@ -11,7 +11,7 @@ onmessage = function(e) {
 	if (e.data.special_event == true) {
 		probability *= 2;
 	}
-    // if special event selected probability is doubled
+    // if special event selected probability is trippled
 	else if (e.data.special_3event == true) {
 		probability *= 3;
 	}

From 722d51723b1e23c88e10f57734dd992ea02dc239 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 12 May 2017 18:15:46 -0400
Subject: [PATCH 1014/1569] Luffy 6+

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 878bfe75b..16770bd72 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1591,7 +1591,7 @@ window.units = [
     [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], 6, 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
+    [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
     [ "Fujitora", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fujitora, Evolved", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
     ];

From db3f3f1b0f725e73012fd75f3d1813f6e6096c51 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 14 May 2017 09:29:04 -0400
Subject: [PATCH 1015/1569] New stuff

Still nothing on Official, maybe tomorrow
---
 common/data/aliases.js    |  6 +++---
 common/data/cooldowns.js  |  8 ++++----
 common/data/details.js    | 16 ++++++++--------
 common/data/drops.js      | 18 +++++++++++++++---
 common/data/evolutions.js | 12 ++++++++++++
 common/data/specials.js   | 15 ++++++++++++---
 common/data/units.js      | 10 +++++-----
 7 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 43853c30f..f34c93e3c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1255,8 +1255,8 @@ window.aliases = {
     1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','',''],
     1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下','',''],
     1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下','',''],
-    1257: ['エドワード・ニューゲート 海賊王のライバル','','Edward Newgate','Young Whitebeard'],
-    1258: ['エドワード・ニューゲート 大海賊“白ひげ”','','Edward Newgate','Young Whitebeard'],
+    1257: ['エドワード・ニューゲート 海賊王のライバル','', 'Edward Newgate', 'Young Whitebeard', 'YWB'],
+    1258: ['エドワード・ニューゲート 大海賊“白ひげ”','', 'Edward Newgate', 'Young Whitebeard', 'YWB'],
     1259: ['ドンキホーテ・ドフラミンゴ “北の海”の海賊','','Young Doffy','Donquixote Doflamingo'],
     1260: ['ドンキホーテ・ドフラミンゴ “北の海”の闇','','Young Doffy','Donquixote Doflamingo'],
     1261: ['セニョール・ピンク “北の海”の海賊','','Senor Pink', 'Young Senior Pink'],
@@ -1591,5 +1591,5 @@ window.aliases = {
     1590: ['', '', 'Anniversary Shanks'],
     1591: ['', '', 'Anniversary Boa'],
     1592: ['', '', 'Anniversary Boa'],
-    1593: ['', '', 'Gear 4 Luffy', 'Mega Luffy'],
+    1593: ['', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index dc50f3590..403b3627a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1587,9 +1587,9 @@ window.cooldowns = [
     [ 20, 11 ],
     [ 19, 14 ],
     [ 19, 14 ],
-    null,
-    null,
-    [ 14, 14 ],
-    [ 14, 14 ],
+    [ 17, 17 ],
+    [ 17, 17 ],
+    [ 11, 11 ],
+    [ 11, 11 ],
     null,//Gear 4 Luffy
 ];
diff --git a/common/data/details.js b/common/data/details.js
index a4590f710..bfe4f53a8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3431,8 +3431,8 @@ window.details = {
     },
     767: {
         special: {
-            "japan": "Changes the orbs in the top row into [DEX] orbs, removes blindness",
-            "global": "Changes the orbs in the top row into [DEX] orbs, reduces Despair duration by 1 turn"
+            "japan": "Changes top row orbs into [DEX] orbs, removes blindness",
+            "global": "Changes top row orbs into [DEX] orbs, reduces Despair duration by 1 turn"
         },
         specialName: "Ojos Fleur: Thriller",
         captain: "Boosts ATK and RCV of DEX characters by 1.5x"
@@ -8671,26 +8671,26 @@ window.details = {
     },
     1574: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.25x",
-        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
+        special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
         specialName: "Dash - Dive - Destroy",
     },
     1575: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.25x",
-        special: "Delays all enemies for 1 turn, deals ???x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
+        special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
         specialName: "Dash - Dive - Destroy",
     },
     1576: {//Kin'emon
         captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
-        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
+        special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Flaming Flash",
     },
     1577: {//Kin'emon
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
-        special: "Deals typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
+        special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Flaming Flash",
@@ -8806,11 +8806,11 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.5x. If you use \"King Kong Gun\" THIS LUFFY boosts ATK of Fighter characters by 4x instead for 3 turns and reduces damage taken by 56% for 3 turns.",
         special: [
             {
-                "description": "Deals 100x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 1 turn.  After 3 turns, Binds and Despairs himself for ?? turns.",
+                "description": "Deals 100x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 1 turn.  After 3 turns, Binds and Despairs himself for 7 turns.",
                 "cooldown": [ 13, 8 ],
             },
             {
-                "description": "Deals 200x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 3 turns. After 3 turns, Binds and Despairs himself for ?? turns.",
+                "description": "Deals 200x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 3 turns. After 3 turns, Binds and Despairs himself for 7 turns.",
                 "cooldown": [ 18, 13 ],
             },
         ],
diff --git a/common/data/drops.js b/common/data/drops.js
index 1f900f3aa..48d38c1b4 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1725,6 +1725,7 @@ window.drops = {
             gamewith: 41277,
             Ultimate: [ 1297 ]
         },
+        
         {
             name: 'Clash!! Warden Magellan',
             thumb: 1374,
@@ -1733,6 +1734,7 @@ window.drops = {
             Master: [ 1373 ],
             Expert: [ 1373 ],
         },
+        
         {
             name: 'Clash!! Shogun Franky',
             thumb: 1432,
@@ -1740,6 +1742,7 @@ window.drops = {
             Master: [ 1431, 215, 799 ],
             Ultimate: [ 1431, 215, 799 ],
         },
+        
         {
             name: 'Clash!! Bellamy',
             thumb: 1518,
@@ -1747,6 +1750,15 @@ window.drops = {
             Master: [ 1517 ],
             Expert: [ 1517 ],
         },
+        
+        {
+            name: 'Clash!! Fujitora',
+            thumb: 1595,
+            gamewith: null,
+            Ultimate: [ 1594 ],
+            Master: [ 1594 ],
+            Expert: [ 1594 ]
+        },
 
     ],
 
@@ -1803,9 +1815,9 @@ window.drops = {
             thumb: 779,
             global: true,
             gamewith: 17473,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f69115c15..d34642f88 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2459,4 +2459,16 @@ window.evolutions = {
         evolution: 1588,
         evolvers: [  ]
     },
+    1588: {
+        evolution: 1589,
+        evolvers: [  ]
+    },
+    1590: {
+        evolution: 1591,
+        evolvers: [  ]
+    },
+    1594: {
+        evolution: 1595,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index e371ea663..62c1f6f82 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2455,10 +2455,20 @@ window.specials = {
         def: function(p) { return 0.1; }
     },
     1541: {
-        chainAddition: function(p) {return 0.5;}
+        chainAddition: function(p) { return 0.5; },
+        def: function(p) { return 0; }
     },
     1542: {
-        chainAddition: function(p){ return 0.5;}
+        chainAddition: function(p){ return 0.5; },
+        def: function(p) { return 0; }
+    },
+    1544: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
+    1545: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     1546: {
         turnedOn: false,
@@ -2514,7 +2524,6 @@ window.specials = {
         onDeactivation: function(p) {
             window.specials[1557].turnedOn = false;
         },
-        type: "class"
     },
     1561: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
diff --git a/common/data/units.js b/common/data/units.js
index 16770bd72..9b4592f01 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1585,12 +1585,12 @@ window.units = [
     [ "Massacre Ruler Orlumbus, Yonta Maria Grand Fleet Admiral", "PSY", [ "Striker", "Fighter" ], 5, 40, 6, 3, 99, 4000000, 1354, 544, 67, 3012, 1243, 200, null ],
     [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, 6, 1, 50, 392109, 124, 77, 23, 905, 492, 136, null ],
     [ "Brave Compannion Helmeppo, Navy HQ Chief Petty Officer", "QCK", [ "Slasher", "Driven" ], 4, 26, null, 3, 99, 3000000, null, null, null, 1971, 1016, 322, null ],
-    [ "Sanji, Vinsmoke Family's 3rd Son", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 4, 3, 99, 1066998, 369, 222, 31, 1323, 784, 200, null ],
+    [ "Sanji, Vinsmoke Family's 3rd Son", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 6, 3, 99, 1066998, 369, 222, 31, 1323, 784, 200, null ],
     [ "Sanji, Germa Kingdom Prince", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 6, 5, 99, 5000000, 1251, 726, 147, 3233, 1506, 354, null ],
-    [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1652, 548, 145, null ],
+    [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, null ],
+    [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1134, 591, 233, null ],
+    [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, null ],
     [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
     [ "Fujitora", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fujitora, Evolved", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],

From ccd1884892e5e9139ef708adabbf2bb3783e5d4d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 14 May 2017 10:43:41 -0400
Subject: [PATCH 1016/1569] New Event

---
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 12 ++++++------
 common/data/drops.js      | 32 ++++++++++++++++++++++++++++++++
 common/data/evolutions.js | 16 ++++++++--------
 common/data/families.js   |  8 +++++++-
 common/data/units.js      |  2 +-
 6 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 403b3627a..fac495fff 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1570,8 +1570,8 @@ window.cooldowns = [
     [ 11, 11 ],
     [ 19, 14 ],
     [ 19, 14 ],
-    21,
-    21,
+    [ 21, 16 ],
+    [ 21, 16 ],
     19,
     19,
     19,
diff --git a/common/data/details.js b/common/data/details.js
index bfe4f53a8..ee945ac3e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8700,15 +8700,15 @@ window.details = {
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 8, null ],
+                "cooldown": [ 8, 3 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 11, null ],
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 14, null ],
+                "cooldown": [ 14, 9 ],
             },
         ],
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
@@ -8719,15 +8719,15 @@ window.details = {
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 8, null ],
+                "cooldown": [ 8, 3 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 11, null ],
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 14, null ],
+                "cooldown": [ 14, 9 ],
             },
         ],
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
diff --git a/common/data/drops.js b/common/data/drops.js
index 48d38c1b4..798f2f21d 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1881,6 +1881,38 @@ window.drops = {
             "Final Stage": [ 37, 38, 53, 55, 43, 36, 45, 57, 65, 203, 205, 383, 395, 397, 399, 401, 464, 465, 541, 545, 630, 632, 728, 730, 815, 889, 893, 973, 1055, 1057, 1158, 1156, 1227, 1228, 1280, 1283, 1353],
             "Evolvers and Boosters": [ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 115, 116, 117, 118, 266, 300, 301, 302, 303, 304, 1180, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 189, 190, 191, 192, 193, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351 ]
         },
+        
+        {
+            name: 'Challenge the Enemy! Sugofest Exclusive Character Skillbooks!',
+            thumb: 1588,
+            gamewith: 56742,
+            condition: "High chance of dropping 6* skillbooks. Only Evolvers and Booster characters will drop.",
+            "Black Clad Shanks": [ 301, 101, 96, 79, 90, 348, -530, -316, -910, -995, -1236, -1364, -465, -590, -967, -813, -888 ],
+            "Donquixote Doflamingo": [ 304, 104, 88, 99, 82, 93, 351, -870, -312, -645, -838, -876, -880, -1190, -396, -586, -631, -567 ],
+            "Trafalgar Law": [ 300, 100, 84, 95, 78, 89, 347, -964, -1045, -219, -308, -675, -991, -1077, -504, -1159, -212, -892 ],
+            "Black Clad Ace": [ 302, 102, 86, 97, 80, 91, 349, -562, -310, -359, -941, -560, -1212, -1406, -789, -966, -432, -565, -566 ],
+            "Cavendish": [ 303, 103, 87, 98, 81, 92, 350, -963, -1123, -217, -914, -1029, -1127, -1408, -202, -464, -1227, -705 ],
+            "Blackbeard": [  ],
+            "Crocodile": [  ],
+            "Log Luffy": [  ],
+            "Corazon": [  ],
+            "Kuzan": [  ],
+            "Issho": [  ],
+            "Dracule Mihawk": [  ],
+            "Sabo": [  ],
+            "Rayleigh": [  ],
+            "Jinbei": [  ],
+            "Sakazuki": [  ],
+            "Rob Lucci": [  ],
+            "Sengoku": [  ],
+            "Whitebeard": [  ],
+            "Marco": [  ],
+            "Zoro": [  ],
+            "Boa Hancock": [  ],
+            "Bartolomeo": [  ],
+            "Borsalino": [  ],
+            "Captain Buggy": [  ],
+        },
 
    ]
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d34642f88..67df6747a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2101,7 +2101,7 @@ window.evolutions = {
     },
     1381: {
         evolution: 1382,
-        evolvers: [  ]
+        evolvers: [ 95, 96, 97, 303, 304 ]
     },
     1383: {
         evolution: 1384,
@@ -2453,19 +2453,19 @@ window.evolutions = {
     },
     1404: {
         evolution: 1593,
-        evolvers: [  ]
+        evolvers: [ 98, 303, 267 ]
     },
     1587: {
         evolution: 1588,
         evolvers: [  ]
     },
-    1588: {
-        evolution: 1589,
-        evolvers: [  ]
+    1589: {
+        evolution: 1590,
+        evolvers: [ 83, 85, 1180, 101, 301 ]
     },
-    1590: {
-        evolution: 1591,
-        evolvers: [  ]
+    1591: {
+        evolution: 1592,
+        evolvers: [ 118, 88, 94, 104, 304 ]
     },
     1594: {
         evolution: 1595,
diff --git a/common/data/families.js b/common/data/families.js
index e8d95d0c1..57f8f32e1 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1585,7 +1585,13 @@ window.families = [
     "Orlumbus",
     "Helmeppo",
     "Helmeppo",
-    "Monkey D. Luffy",
     "Sanji",
     "Sanji",
+    "Shanks",
+    "Shanks",
+    "Boa Hancock",
+    "Boa Hancock",
+    "Monkey D. Luffy",
+    "Fujitora",
+    "Fujitora",
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 9b4592f01..5775ca7e7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1565,7 +1565,7 @@ window.units = [
     [ "'The Fighting King' Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
     [ "Tactician Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, 101, 45, 70, 1012, 511, 160, 1 ],
     [ "Tactician Dagama, Prodence Kingdom", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, 2022, 1011, 276, 1 ],
-    [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, null, 35, 90778, null, null, null, 603, 304, 289, null ],
+    [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, 3, 35, 90778, 92, 33, 83, 603, 304, 289, null ],
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, 4, 5, 70, 1066998, 534, 255, 249, 1030, 603, 436, null ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, 2000000, 197, 109, 15, 2017, 1230, 245, 1 ],
     [ "Inuarashi", "STR", [ "Slasher", "Cerebral" ], 5, 30, 6, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, 1 ],

From c1f3f3f59defd640b81e2a415d33624e94d1dd2c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 15 May 2017 19:17:57 -0400
Subject: [PATCH 1017/1569] Fuji Update

---
 common/data/aliases.js    | 24 +++++++++++++-----------
 common/data/cooldowns.js  |  2 ++
 common/data/drops.js      | 37 ++++++++++++++++++++++++++-----------
 common/data/evolutions.js |  8 ++++----
 common/data/families.js   |  4 ++++
 common/data/gw.js         |  2 ++
 common/data/units.js      | 30 +++++++++++++++++-------------
 7 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index f34c93e3c..ee737b4f9 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1581,15 +1581,17 @@ window.aliases = {
     1580: ['トラファルガー・ロー パンクハザードの滞在者', '', ''],
     1581: ['トラファルガー・ロー 二人目の救いの神', '', ''],
     1582: ['モネ ユキユキの実の雪女', '', ''],
-    1583: ['', '', 'Coliseum Orlumbus'],
-    1584: ['', '', 'Coliseum Orlumbus'],
-    1585: ['', '', 'Coliseum Helmeppo'],
-    1586: ['', '', 'Coliseum Helmeppo'],
-    1587: ['', '', ''],
-    1588: ['', '', ''],
-    1589: ['', '', 'Anniversary Shanks'],
-    1590: ['', '', 'Anniversary Shanks'],
-    1591: ['', '', 'Anniversary Boa'],
-    1592: ['', '', 'Anniversary Boa'],
-    1593: ['', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy'],
+    1583: ['オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus'],
+    1584: ['殺戮支配者オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus'],
+    1585: ['ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
+    1586: ['勇士の戦友ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
+    1587: ['サンジ ヴィンスモーク家　三男', '', ''],
+    1588: ['サンジ ジェルマ王国　プリンス', '', ''],
+    1589: ['シャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
+    1590: ['赤髪のシャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
+    1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
+    1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
+    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy'],
+    1594: ['藤虎 海軍本部最高戦力', '', 'Raid Fujitora'],
+    1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Fujitora'],
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fac495fff..e78363499 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1592,4 +1592,6 @@ window.cooldowns = [
     [ 11, 11 ],
     [ 11, 11 ],
     null,//Gear 4 Luffy
+    [ 29, 14 ],
+    [ 29, 14 ],
 ];
diff --git a/common/data/drops.js b/common/data/drops.js
index 798f2f21d..70a62c460 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1376,6 +1376,7 @@ window.drops = {
         {
             name: "Revolutionary Armed Forces!",
             thumb: 1242,
+            global: true,
             gamewith: 37425,
             condition: "Free Spirit Characters have their cooldowns reduced by 10 turns at the start of the fight",
             "All Difficulties": [ 1241, 1243, -1035, -965, -1031, -1081, -754, -966, -502, -707, -955 ]
@@ -1384,6 +1385,7 @@ window.drops = {
         {
             name: "Gather! Whitebeard Alliance",
             thumb: 1254,
+            global: true,
             gamewith: 38336,
             condition: "Driven Characters have their cooldowns reduced by 10 turns at the start of the fight",
             "All Difficulties": [ 1254, 1255, 1256, -669, -1492, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
@@ -1499,7 +1501,7 @@ window.drops = {
         },
         
         {
-            name: "Prodence Kingdom",
+            name: "Prodence Kingdom!",
             thumb: 1564,
             gamewith: 55145,
             condition: "Elizabello will kill you with one punch",
@@ -1507,13 +1509,20 @@ window.drops = {
         },
         
         {
-            name: "Punk Hazard",
+            name: "Punk Hazard!",
             thumb: 1581,
             gamewith: 56038,
-            //condition: "Elizabello will kill you with one punch",
             "All Difficulties": [ 1580, 1582, -1391, -1444, -1436, -1551, -896, -910, -357, -995, -890, -1342 ],
         },
         
+        {
+            name: "Fishman Island! The Royal Family!",
+            thumb: 1581,
+            gamewith: null,
+            //condition: "Elizabello will kill you with one punch",
+            "All Difficulties": [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1438, -1440, -893, -1343 ],
+        },
+        
     ],
 
             
@@ -1666,6 +1675,7 @@ window.drops = {
         {
             name: 'Clash!! Pica',
             thumb: 932,
+            global: true,
             gamewith: 23507,
             Master: [ 932 ],
             Expert: [ 932 ]
@@ -1754,7 +1764,7 @@ window.drops = {
         {
             name: 'Clash!! Fujitora',
             thumb: 1595,
-            gamewith: null,
+            gamewith: 56946,
             Ultimate: [ 1594 ],
             Master: [ 1594 ],
             Expert: [ 1594 ]
@@ -1856,20 +1866,25 @@ window.drops = {
         {
             name: 'Invasion! Young Whitebeard',
             thumb: 1258,
-            condition: "Has a chance of appearing at the end of ANY Friday Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
+            global: true,
+            gamewith: 38237,
+            condition: "Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
             "All Difficulties": [ 1257 ]
         },
         
         {
             name: 'Invasion! Red Hair Shanks',
             thumb: 1380,
-            condition: "Has a chance of appearing at the end of ANY Raid boss. You MUST use the same team that you just used to complete the raid boss to fight Shanks.",
+            global: true,
+            gamewith: 46369,
+            condition: "Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks.",
             "All Difficulties": [ 1379, 952, 776 ]
         },
         
         {
             name: 'Invasion! Cavendish',
             thumb: 1530,
+            gamewith: 53621,
             condition: "Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.",
             "All Difficulties": [ 1529 ]
         },
@@ -1892,11 +1907,11 @@ window.drops = {
             "Trafalgar Law": [ 300, 100, 84, 95, 78, 89, 347, -964, -1045, -219, -308, -675, -991, -1077, -504, -1159, -212, -892 ],
             "Black Clad Ace": [ 302, 102, 86, 97, 80, 91, 349, -562, -310, -359, -941, -560, -1212, -1406, -789, -966, -432, -565, -566 ],
             "Cavendish": [ 303, 103, 87, 98, 81, 92, 350, -963, -1123, -217, -914, -1029, -1127, -1408, -202, -464, -1227, -705 ],
-            "Blackbeard": [  ],
-            "Crocodile": [  ],
-            "Log Luffy": [  ],
-            "Corazon": [  ],
-            "Kuzan": [  ],
+            "Blackbeard": [ -1268, -75, -733, -1033, -1082, -1230, -1278, -569, -1061, -52, -335 ],
+            "Crocodile": [ -720, -410, -908, -1208, -558, -1234, -1366, -544, -731, -236, -814, -1224 ],
+            "Log Luffy": [ -1121, -1075, -1131, -1133, -1115, -520, -1177, -528, -1387, -4, -816, -426, -542, -563 ],
+            "Corazon": [ -1001, -451, -878, -1079, -1183, -1316, -1446, -16, -223, -327, -628, -614 ],
+            "Kuzan": [ -1192, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
             "Issho": [  ],
             "Dracule Mihawk": [  ],
             "Sabo": [  ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 67df6747a..5aa893c05 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2445,11 +2445,11 @@ window.evolutions = {
     },
     1583: {
         evolution: 1584,
-        evolvers: [  ]
+        evolvers: [ 118, 98, 98, 303, 103 ]
     },
     1585: {
         evolution: 1586,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 85, 96, 301 ]
     },
     1404: {
         evolution: 1593,
@@ -2457,7 +2457,7 @@ window.evolutions = {
     },
     1587: {
         evolution: 1588,
-        evolvers: [  ]
+        evolvers: [ 118, 88, 266, 304, 267 ]
     },
     1589: {
         evolution: 1590,
@@ -2469,6 +2469,6 @@ window.evolutions = {
     },
     1594: {
         evolution: 1595,
-        evolvers: [  ]
+        evolvers: [ 118, 83, 87, 303, 103 ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 57f8f32e1..ec3cd6542 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1594,4 +1594,8 @@ window.families = [
     "Monkey D. Luffy",
     "Fujitora",
     "Fujitora",
+    "Princess Shirahoshi",
+    "Princess Shirahoshi",
+    "Ryuboshi",
+    "Manboshi",
 ];
diff --git a/common/data/gw.js b/common/data/gw.js
index 01fc14180..0a2646c4a 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1592,4 +1592,6 @@ window.gw=[
     56779,
     56779,
     56736,
+    56945,
+    56945,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 5775ca7e7..1ca7cb3d2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1581,19 +1581,23 @@ window.units = [
     [ "Trafalgar Law, Punk Hazard Resident", "DEX", [ "Free Spirit", "Slasher" ], 3, 13, 4, 2, 50, 392109, 149, 56, 25, 894, 453, 150, 1 ],
     [ "Trafalgar Law, Second Salvation God", "DEX", [ "Free Spirit", "Fighter" ], 4, 20, 4, 4, 99, 3000000, 801, 423, 134, 1884, 1155, 251, 1 ],
     [ "Monet, Snow-Snow Fruit Snow Woman", "PSY", [ "Cerebral", "Free Spirit" ], 4, 15, 4, 2, 70, 1066998, 96, 83, 45, 1062, 666, 271, 1 ],
-    [ "Coliseum Orlumbus", "PSY", [ "Striker", "Fighter" ], 4, 25, 5, 1, 70, 1066998, 624, 303, 22, 1425, 613, 119, null ],
-    [ "Massacre Ruler Orlumbus, Yonta Maria Grand Fleet Admiral", "PSY", [ "Striker", "Fighter" ], 5, 40, 6, 3, 99, 4000000, 1354, 544, 67, 3012, 1243, 200, null ],
-    [ "Coliseum Helmeppo", "QCK", [ "Slasher", "Driven" ], 3, 16, 6, 1, 50, 392109, 124, 77, 23, 905, 492, 136, null ],
-    [ "Brave Compannion Helmeppo, Navy HQ Chief Petty Officer", "QCK", [ "Slasher", "Driven" ], 4, 26, null, 3, 99, 3000000, null, null, null, 1971, 1016, 322, null ],
-    [ "Sanji, Vinsmoke Family's 3rd Son", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 6, 3, 99, 1066998, 369, 222, 31, 1323, 784, 200, null ],
-    [ "Sanji, Germa Kingdom Prince", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 6, 5, 99, 5000000, 1251, 726, 147, 3233, 1506, 354, null ],
-    [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1652, 548, 145, null ],
-    [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, null ],
-    [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1134, 591, 233, null ],
-    [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, null ],
-    [ "Monkey D Luffy, Gear 4th Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, null ],
-    [ "Fujitora", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora, Evolved", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Admiral Orlumbus, Yonta Maria Grand Fleet", "PSY", [ "Striker", "Fighter" ], 4, 25, 5, 1, 70, 1066998, 624, 303, 22, 1425, 613, 119, 1 ],
+    [ "Massacre Ruler Orlumbus, Yonta Maria Grand Fleet Admiral", "PSY", [ "Striker", "Fighter" ], 5, 40, 6, 3, 99, 4000000, 1354, 544, 67, 3012, 1243, 200, 1 ],
+    [ "Helmeppo, Navy HQ Sergeant", "QCK", [ "Slasher", "Driven" ], 3, 16, 6, 1, 50, 392109, 124, 77, 23, 905, 492, 136, 1 ],
+    [ "Brave Compannion Helmeppo, Navy HQ Chief Petty Officer", "QCK", [ "Slasher", "Driven" ], 4, 26, 6, 3, 99, 3000000, 817, 420, 89, 1971, 1016, 322, 1 ],
+    [ "Sanji, Vinsmoke Family's 3rd Son", "INT", [ "Fighter", "Powerhouse" ], 5, 30, 6, 3, 70, 1066998, 369, 222, 31, 1323, 784, 200, 1 ],
+    [ "Sanji, Germa Kingdom Prince", "INT", [ "Fighter", "Powerhouse" ], 6, 55, 6, 5, 99, 5000000, 1251, 726, 147, 3233, 1506, 354, 1 ],
+    [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 143, 144, 29, 1152, 626, 206, 1 ],
+    [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, 1 ],
+    [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 141, 121, 36, 1134, 589, 233, 1 ],
+    [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
+    [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
+    [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
+    [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
+    [ "Shirahoshi", "INT", "Striker", 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 3f3b144689f0154f5094d893c99233e7ec3e9f8d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 15 May 2017 20:01:40 -0400
Subject: [PATCH 1018/1569] Fuji fix

---
 common/data/specials.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 62c1f6f82..8aec932e6 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2677,7 +2677,7 @@ window.specials = {
     1594: {
         orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
-    1594: {
+    1595: {
         orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
 };

From bd6a243e4ae0df81b6785e9eafeea465d263a6e8 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 15 May 2017 20:54:35 -0400
Subject: [PATCH 1019/1569] Evo mats for legend island

---
 common/data/drops.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 70a62c460..f96869ea0 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1907,11 +1907,11 @@ window.drops = {
             "Trafalgar Law": [ 300, 100, 84, 95, 78, 89, 347, -964, -1045, -219, -308, -675, -991, -1077, -504, -1159, -212, -892 ],
             "Black Clad Ace": [ 302, 102, 86, 97, 80, 91, 349, -562, -310, -359, -941, -560, -1212, -1406, -789, -966, -432, -565, -566 ],
             "Cavendish": [ 303, 103, 87, 98, 81, 92, 350, -963, -1123, -217, -914, -1029, -1127, -1408, -202, -464, -1227, -705 ],
-            "Blackbeard": [ -1268, -75, -733, -1033, -1082, -1230, -1278, -569, -1061, -52, -335 ],
-            "Crocodile": [ -720, -410, -908, -1208, -558, -1234, -1366, -544, -731, -236, -814, -1224 ],
-            "Log Luffy": [ -1121, -1075, -1131, -1133, -1115, -520, -1177, -528, -1387, -4, -816, -426, -542, -563 ],
-            "Corazon": [ -1001, -451, -878, -1079, -1183, -1316, -1446, -16, -223, -327, -628, -614 ],
-            "Kuzan": [ -1192, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
+            "Blackbeard": [ 304, 104, 88, 99, 82, 93, 351, -1268, -75, -733, -1033, -1082, -1230, -1278, -569, -1061, -52, -335 ],
+            "Crocodile": [ 302, 102, 86, 97, 80, 91, 349, -720, -410, -908, -1208, -558, -1234, -1366, -544, -731, -236, -814, -1224 ],
+            "Log Luffy": [ 300, 100, 84, 95, 78, 89, 347, -1121, -578, -1075, -1131, -1133, -1115, -520, -1177, -528, -1387, -4, -816, -426, -542, -563 ],
+            "Corazon": [ 303, 103, 87, 98, 81, 92, 350, -1001, -451, -878, -1079, -1183, -1316, -1446, -16, -223, -327, -628, -614 ],
+            "Kuzan": [ 301, 101, 96, 79, 90, 348, -1192, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
             "Issho": [  ],
             "Dracule Mihawk": [  ],
             "Sabo": [  ],

From 598e880d4c532d4656541071aab5bcdbe689b9d4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 16 May 2017 01:01:22 -0400
Subject: [PATCH 1020/1569] Shirahoshi

---
 common/data/captains.js | 14 ++++++++++++++
 common/data/details.js  | 26 +++++++++++++++++++++++---
 common/data/gw.js       |  4 ++++
 common/data/specials.js |  3 +++
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index d50136bca..dc0baa9fd 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4692,4 +4692,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
+    1596: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+    },
+    1597: {
+        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.75 : 1; }
+    },
+    1598: {
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1599: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index ee945ac3e..cf664a06b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6140,7 +6140,7 @@ window.details = {
     1216: { //sebastian
         captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage received based on current HP by up to 20%",
         captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
-        special: "Reduces damage received by 50% for 1 turn, and changes own orb to [QCK]",
+        special: "Reduces damage received by 50% for 1 turn, and changes own orb into [QCK]",
         specialName: "Camouflage Air",
     },
     1217: { //nightin
@@ -7968,12 +7968,12 @@ window.details = {
     },
     1466: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2x",
-        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [PSY] and friend captain's orb into [STR]",
+        special: "Reduces the defense of all enemies by 100% for 1 turn and changes own orb into [PSY] and friend captain's orb into [STR]",
         specialName: "Rosy Pleasure",
     },
     1467: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2.25x and their RCV by 1.3x",
-        special: "Reduces the defense of all enemies by 100% for 1 turn. changes own orb into [PSY] and friend captain's orb into [STR]",
+        special: "Reduces the defense of all enemies by 100% for 1 turn and changes own orb into [PSY] and friend captain's orb into [STR]",
         specialName: "Rosy Pleasure",
     },
     1468: {//Fortnight Sentomaru 
@@ -8827,4 +8827,24 @@ window.details = {
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialName: "Gravity Blade: Fierce Tiger",
     },
+    1596: {//Shirahoshi
+        captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
+        special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
+        specialName: "Shirahoshi Special",
+    },
+    1597: {//Shirahoshi
+        captain: "Boosts ATK and RCV of [INT] characters by 1.75x",
+        special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
+        specialName: "Shirahoshi Special",
+    },
+    1598: {//Ryuboshi
+        captain: "Boosts HP of Powerhouse characters by 1.5x",
+        special: "Boosts ATK of all characters by 1.2x and recovers 5x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Ryuboshi Special",
+    },
+    1598: {//Manboshi
+        captain: "Boosts ATK of Powerhouse characters by 1.75x",
+        special: "Reduces the defense of all enemies by 50% for 1 turn. Changes own orb into [QCK]",
+        specialName: "Manboshi Special",
+    },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index 0a2646c4a..f7f007127 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1594,4 +1594,8 @@ window.gw=[
     56736,
     56945,
     56945,
+    57042,
+    57042,
+    57044,
+    57043,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 8aec932e6..e5378dcd9 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2680,4 +2680,7 @@ window.specials = {
     1595: {
         orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
+    1598: {
+        atk: function(p) { return 1.2 },
+    },
 };

From 1581d15d664b2c275f1d6f0e6256172de56677f8 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Tue, 16 May 2017 08:45:20 -0700
Subject: [PATCH 1021/1569] Added new luffy and upated (not finished) stats for
 shirahoshi FN chars

---
 common/data/cooldowns.js | 5 +++++
 common/data/details.js   | 7 ++++++-
 common/data/units.js     | 9 +++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e78363499..55e417835 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1594,4 +1594,9 @@ window.cooldowns = [
     null,//Gear 4 Luffy
     [ 29, 14 ],
     [ 29, 14 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 16, 10 ],
+    [ 17, 11 ],
+    [ ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index cf664a06b..bdbd7a18e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8842,9 +8842,14 @@ window.details = {
         special: "Boosts ATK of all characters by 1.2x and recovers 5x character's RCV in HP at the end of each turn for 3 turns",
         specialName: "Ryuboshi Special",
     },
-    1598: {//Manboshi
+    1599: {//Manboshi
         captain: "Boosts ATK of Powerhouse characters by 1.75x",
         special: "Reduces the defense of all enemies by 50% for 1 turn. Changes own orb into [QCK]",
         specialName: "Manboshi Special",
     },
+    1600: {//3rd Anniversary Luffy
+        captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
+        special: "Deals 20x character's ATK in [PSY] damage to one enmy, locks orbs for 1 turn, and boosts the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
+        specialName: "Right Leg Armament: Gum-Gum Battle Axe",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 1ca7cb3d2..8b6ac97ba 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1594,10 +1594,11 @@ window.units = [
     [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
-    [ "Shirahoshi", "INT", "Striker", 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, null ],
+    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, 4, 3, 99, null, 620, 330, 200, 1536, 858, 408, null ],
+    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 123, 87, 29, 1362, 699, 180, null ],
+    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 79, 90, 40, 864, 768, 240, null ],
+    [ "Monkey D Luffy, Straw Hat, Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c8aec748c75e2855932310d74098218e666fb466 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 16 May 2017 13:10:43 -0400
Subject: [PATCH 1022/1569] Revert "Merge pull request #92 from
 ribcrush/master"

This reverts commit f25a7da9fb29a1b6b9bd67ed22750ead2cdfb126, reversing
changes made to 598e880d4c532d4656541071aab5bcdbe689b9d4.
---
 common/data/cooldowns.js | 5 -----
 common/data/details.js   | 7 +------
 common/data/units.js     | 9 ++++-----
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 55e417835..e78363499 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1594,9 +1594,4 @@ window.cooldowns = [
     null,//Gear 4 Luffy
     [ 29, 14 ],
     [ 29, 14 ],
-    [ 20, 15 ],
-    [ 20, 15 ],
-    [ 16, 10 ],
-    [ 17, 11 ],
-    [ ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index bdbd7a18e..cf664a06b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8842,14 +8842,9 @@ window.details = {
         special: "Boosts ATK of all characters by 1.2x and recovers 5x character's RCV in HP at the end of each turn for 3 turns",
         specialName: "Ryuboshi Special",
     },
-    1599: {//Manboshi
+    1598: {//Manboshi
         captain: "Boosts ATK of Powerhouse characters by 1.75x",
         special: "Reduces the defense of all enemies by 50% for 1 turn. Changes own orb into [QCK]",
         specialName: "Manboshi Special",
     },
-    1600: {//3rd Anniversary Luffy
-        captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
-        special: "Deals 20x character's ATK in [PSY] damage to one enmy, locks orbs for 1 turn, and boosts the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
-        specialName: "Right Leg Armament: Gum-Gum Battle Axe",
-    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 8b6ac97ba..1ca7cb3d2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1594,11 +1594,10 @@ window.units = [
     [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
-    [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, null ],
-    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, 4, 3, 99, null, 620, 330, 200, 1536, 858, 408, null ],
-    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 123, 87, 29, 1362, 699, 180, null ],
-    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 79, 90, 40, 864, 768, 240, null ],
-    [ "Monkey D Luffy, Straw Hat, Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shirahoshi", "INT", "Striker", 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From bbb08a5a1d9e3ddb3b8ca9a1abb36533695a2f31 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 16 May 2017 13:13:45 -0400
Subject: [PATCH 1023/1569] Revert "Revert "Merge pull request #92 from
 ribcrush/master""

This reverts commit c8aec748c75e2855932310d74098218e666fb466.
---
 common/data/cooldowns.js | 5 +++++
 common/data/details.js   | 7 ++++++-
 common/data/units.js     | 9 +++++----
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e78363499..55e417835 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1594,4 +1594,9 @@ window.cooldowns = [
     null,//Gear 4 Luffy
     [ 29, 14 ],
     [ 29, 14 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 16, 10 ],
+    [ 17, 11 ],
+    [ ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index cf664a06b..bdbd7a18e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8842,9 +8842,14 @@ window.details = {
         special: "Boosts ATK of all characters by 1.2x and recovers 5x character's RCV in HP at the end of each turn for 3 turns",
         specialName: "Ryuboshi Special",
     },
-    1598: {//Manboshi
+    1599: {//Manboshi
         captain: "Boosts ATK of Powerhouse characters by 1.75x",
         special: "Reduces the defense of all enemies by 50% for 1 turn. Changes own orb into [QCK]",
         specialName: "Manboshi Special",
     },
+    1600: {//3rd Anniversary Luffy
+        captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
+        special: "Deals 20x character's ATK in [PSY] damage to one enmy, locks orbs for 1 turn, and boosts the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
+        specialName: "Right Leg Armament: Gum-Gum Battle Axe",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 1ca7cb3d2..8b6ac97ba 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1594,10 +1594,11 @@ window.units = [
     [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
-    [ "Shirahoshi", "INT", "Striker", 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, null ],
+    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, 4, 3, 99, null, 620, 330, 200, 1536, 858, 408, null ],
+    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 123, 87, 29, 1362, 699, 180, null ],
+    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 79, 90, 40, 864, 768, 240, null ],
+    [ "Monkey D Luffy, Straw Hat, Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 21c296e46646a9ca7d99a8d2831d6e283d61b824 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 16 May 2017 13:31:07 -0400
Subject: [PATCH 1024/1569] Did I fix that error? Maybe

---
 common/data/captains.js  |  3 +++
 common/data/cooldowns.js |  5 ++---
 common/data/details.js   | 10 +++++-----
 common/data/flags.js     |  3 +++
 common/data/specials.js  |  3 +++
 common/data/units.js     |  8 ++++----
 6 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index dc0baa9fd..ce0cb4a1e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4706,4 +4706,7 @@ window.captains = {
     1599: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
+    1600: {
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 55e417835..04a63fd64 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1409,8 +1409,8 @@ window.cooldowns = [
     [ 22, 16 ],
     [ 16, 10 ],
     [ 16, 10 ],
-    25,
-    25,
+    [ 25, 18 ],
+    [ 25, 18 ],
     [ 25, 17 ],
     [ 6, 6 ],
     [ 20, 12 ],
@@ -1598,5 +1598,4 @@ window.cooldowns = [
     [ 20, 15 ],
     [ 16, 10 ],
     [ 17, 11 ],
-    [ ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index bdbd7a18e..8aa123ded 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5460,12 +5460,12 @@ window.details = {
     },
     1107: {
         captain: "Boosts ATK and HP of Driven characters by 1.5x",
-        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs into matching orbs for Driven characters. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs into Matching orbs for Driven characters. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
     },
     1108: {
         captain: "Boosts ATK and HP of Driven characters by 2x",
-        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs into matching orbs for Driven characters. Boosts ATK of Driven characters by 1.75x for 1 turn.",
+        special: "Deals 30x the character's ATK as Typeless damage to all enemies. Changes [BLOCK], [G], and [BOMB] orbs into Matching orbs for Driven characters. Boosts ATK of Driven characters by 1.75x for 1 turn.",
         specialName: "Lion's Threat: Imperial Earth Bind"
     },
     1109: {
@@ -8644,7 +8644,7 @@ window.details = {
     },
     1569: {//Anniversary Law
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
-        special: "Randomizes all orbs, including [BLOCK] orbs and switches orbs between slots three times",
+        special: "Randomizes all non-matching orbs, including [BLOCK] orbs and switches orbs between slots three times",
         specialName: "ROOM Shambles・Junction",
     },
     1570: {//Inuarashi
@@ -8660,13 +8660,13 @@ window.details = {
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
         special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
-        sailor: "Reduces Paralysis duration by 1 turn for herself",
+        sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Ruler's Aide Flight",
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
         special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
-        sailor: "Reduces Paralysis duration by 1 turn for herself",
+        sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Ruler's Aide Flight",
     },
     1574: {//Sicilian
diff --git a/common/data/flags.js b/common/data/flags.js
index 3cbf22bc1..780489152 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1208,6 +1208,9 @@ window.flags = {
     1246: { special: 1, global: 1 },
     1247: { special: 1, global: 1 },
     1249: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1254: { global: 1 },
+    1255: { global: 1 },
+    1256: { global: 1 },
     1257: { global: 1 },
     1258: { global: 1 },
     1259: { rr: 1, rro: 1, lrr: 1, global: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index e5378dcd9..5723a683d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2683,4 +2683,7 @@ window.specials = {
     1598: {
         atk: function(p) { return 1.2 },
     },
+    1600: {
+        orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 8b6ac97ba..e7d30463f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1595,10 +1595,10 @@ window.units = [
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
     [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, null ],
-    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, 4, 3, 99, null, 620, 330, 200, 1536, 858, 408, null ],
-    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 123, 87, 29, 1362, 699, 180, null ],
-    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, null, 79, 90, 40, 864, 768, 240, null ],
-    [ "Monkey D Luffy, Straw Hat, Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, 4, 3, 99, 3000000, 620, 330, 200, 1536, 858, 408, null ],
+    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, null ],
+    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, null ],
+    [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 34ce8492d7606849d9761bc6e8315a878ea8b17d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 16 May 2017 16:05:10 -0400
Subject: [PATCH 1025/1569] BabyRage

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8aa123ded..e738542e5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8849,7 +8849,7 @@ window.details = {
     },
     1600: {//3rd Anniversary Luffy
         captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
-        special: "Deals 20x character's ATK in [PSY] damage to one enmy, locks orbs for 1 turn, and boosts the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
+        special: "Deals 20x character's ATK in [PSY] damage to one enemy, locks orbs for 1 turn, and boosts the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
         specialName: "Right Leg Armament: Gum-Gum Battle Axe",
     },
 };

From edc5957d288f4335ef95dd532fad376c6eb6fbf6 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 16 May 2017 16:26:57 -0400
Subject: [PATCH 1026/1569] pls no

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e738542e5..1f4c184b7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8672,13 +8672,13 @@ window.details = {
     1574: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.25x",
         special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
-        sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
+        sailor: "When HP is below 30% at the start of the turn, boosts own ATK by 200",
         specialName: "Dash - Dive - Destroy",
     },
     1575: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.25x",
         special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
-        sailor: "When HP is below ???% at the start of the turn, boosts own ATK by 200",
+        sailor: "When HP is below 30% at the start of the turn, boosts own ATK by 200",
         specialName: "Dash - Dive - Destroy",
     },
     1576: {//Kin'emon

From 768678bf7d257fb391e0758944d2e433af60f74a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 19 May 2017 16:05:03 -0400
Subject: [PATCH 1027/1569] bunch o' shizz

---
 common/data/aliases.js    | 24 ++++++++++-----
 common/data/captains.js   | 20 +++++++++++++
 common/data/cooldowns.js  |  5 ++--
 common/data/details.js    | 33 +++++++++++++++-----
 common/data/drops.js      | 43 +++++++++++++++-----------
 common/data/evolutions.js |  8 +++++
 common/data/families.js   |  3 ++
 common/data/flags.js      | 63 +++++++++++++++++++++------------------
 common/data/gw.js         |  1 +
 common/data/units.js      | 17 ++++++-----
 common/data/zombies.js    |  4 +++
 11 files changed, 151 insertions(+), 70 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ee737b4f9..eb81ad9b6 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -728,8 +728,8 @@ window.aliases = {
     727: ['モンキー・D・ルフィ ゴムゴムの銃乱打 (ガトリング)',''],
     728: ['カリファ サイファーポールNo.9','', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
     729: ['カリファ　六式 サイファーポールNo.9','', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
-    730: ['ジャブラ サイファーポールNo.9',''],
-    731: ['ジャブラ　六式 サイファーポールNo.9',''],
+    730: ['ジャブラ サイファーポールNo.9','','Jabura'],
+    731: ['ジャブラ　六式 サイファーポールNo.9','','Jabura'],
     732: ['フクロウ サイファーポールNo.9',''],
     733: ['フクロウ　六式 サイファーポールNo.9',''],
     734: ['クマドリ サイファーポールNo.9',''],
@@ -751,8 +751,8 @@ window.aliases = {
     750: ['カク 歴代最強の「ＣＰ９」',''],
     751: ['カリファ 闇の正義の「ＣＰ９」','', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
     752: ['カリファ 歴代最強の「ＣＰ９」','', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
-    753: ['ジャブラ 闇の正義の「ＣＰ９」',''],
-    754: ['ジャブラ 歴代最強の「ＣＰ９」',''],
+    753: ['ジャブラ 闇の正義の「ＣＰ９」','','Jabura'],
+    754: ['ジャブラ 歴代最強の「ＣＰ９」','','Jabura'],
     755: ['ブルーノ 闇の正義の「ＣＰ９」',''],
     756: ['ブルーノ 歴代最強の「ＣＰ９」',''],
     757: ['フクロウ 闇の正義の「ＣＰ９」',''],
@@ -1135,7 +1135,7 @@ window.aliases = {
     1134: ['たしぎ がむしゃらな剣道少女','','Young Tashigi', 'Kid Tashigi'],
     1135: ['たしぎ 夢見る剣道少女','','Young Tashigi', 'Kid Tashigi'],
     1136: ['フクロウ 世界政府直下暗躍諜報機関',''],
-    1137: ['ジャブラ 世界政府直下暗躍諜報機関',''],
+    1137: ['ジャブラ 世界政府直下暗躍諜報機関','','Jabura'],
     1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
     1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
     1140: ['ゲッコー・モリア 魔の三角地帯の主','','Coliseum Gekko Moriah'],
@@ -1565,8 +1565,8 @@ window.aliases = {
     1564: ['“戦う王”エリザベローII世 プロデンス王国', '', ''],
     1565: ['軍師ダガマ', '', ''],
     1566: ['軍師ダガマ プロデンス王国', '', ''],
-    1567: ['', '', 'Kid Boa Hancock'],
-    1568: ['', '', 'Kid Boa Hancock'],
+    1567: ['ボア・ハンコック 少女戦士', '', 'Kid Boa Hancock'],
+    1568: ['ボア・ハンコック お姫さまの片鱗', '', 'Kid Boa Hancock'],
     1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law'],
     1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm'],
     1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm'],
@@ -1594,4 +1594,14 @@ window.aliases = {
     1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy'],
     1594: ['藤虎 海軍本部最高戦力', '', 'Raid Fujitora'],
     1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Fujitora'],
+    1596: ['しらほし', '', ''],
+    1597: ['しらほし リュウグウ王国王女', '', ''],
+    1598: ['リュウボシ', '', ''],
+    1599: ['マンボシ', '', ''],
+    1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy'],
+    1601: ['', '', 'Coliseum Shiryu'],
+    1602: ['', '', 'Coliseum Shiryu'],
+    1603: ['', '', 'Coliseum McGuy'],
 };
+
+//  xxxx: ['', '', ''],
\ No newline at end of file
diff --git a/common/data/captains.js b/common/data/captains.js
index ce0cb4a1e..daea37fb5 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4709,4 +4709,24 @@ window.captains = {
     1600: {
         atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 2.5 : 1; },
     },
+    1601: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1602: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1603: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.25 : 1; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 04a63fd64..26d196382 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1435,8 +1435,8 @@ window.cooldowns = [
     null,//Hody Jones
     [ 21, 15 ],
     [ 21, 15 ],
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     [ 22, 15 ],
     [ 22, 15 ],
     17,
@@ -1598,4 +1598,5 @@ window.cooldowns = [
     [ 20, 15 ],
     [ 16, 10 ],
     [ 17, 11 ],
+    [ 20, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 1f4c184b7..0f6ade0c4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7618,7 +7618,7 @@ window.details = {
     1412: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's RCV to 0",
         special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
-        specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
+        specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shield buff enemies have",
         specialName: "Carving Hoof Palm: Coconut",
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
@@ -7947,7 +7947,7 @@ window.details = {
         specialName: "Gum-Gum Gigant Axe - Sweets",
     },
     1463: {//White Day Luffy
-        captain: "Boosts chain multiplier by 2.5x",
+        captain: "Boosts chain multiplier by 2.5x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters for 1 turn",
         sailor: "Reduces Paralysis for 2 turns for himself",
         specialName: "Gum-Gum Gigant Axe - Sweets",
@@ -8635,12 +8635,12 @@ window.details = {
     1567: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
         special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "Boa Special",
+        specialName: "The Princess' Principle",
     },
     1568: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 2x",
         special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "Boa Special",
+        specialName: "The Princess' Principle",
     },
     1569: {//Anniversary Law
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
@@ -8830,26 +8830,43 @@ window.details = {
     1596: {//Shirahoshi
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
-        specialName: "Shirahoshi Special",
+        specialName: "Great Dinner Buffet",
     },
     1597: {//Shirahoshi
         captain: "Boosts ATK and RCV of [INT] characters by 1.75x",
         special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
-        specialName: "Shirahoshi Special",
+        specialName: "Great Dinner Buffet",
     },
     1598: {//Ryuboshi
         captain: "Boosts HP of Powerhouse characters by 1.5x",
         special: "Boosts ATK of all characters by 1.2x and recovers 5x character's RCV in HP at the end of each turn for 3 turns",
-        specialName: "Ryuboshi Special",
+        specialName: "Musical Scale",
     },
     1599: {//Manboshi
         captain: "Boosts ATK of Powerhouse characters by 1.75x",
         special: "Reduces the defense of all enemies by 50% for 1 turn. Changes own orb into [QCK]",
-        specialName: "Manboshi Special",
+        specialName: "Happy Dance",
     },
     1600: {//3rd Anniversary Luffy
         captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
         special: "Deals 20x character's ATK in [PSY] damage to one enemy, locks orbs for 1 turn, and boosts the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
         specialName: "Right Leg Armament: Gum-Gum Battle Axe",
     },
+    1601: {//Power Creep Shiryu
+        captain: "Boosts ATK of Slasher characters by ???x at the start of the chain, by ???x after the 3rd Perfect",
+        special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes poison and reduces damage received by 50% for 3 turns,",
+        specialName: "Shiryu Special",
+        sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
+    },
+    1602: {//Power Creep Shiryu
+        captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect",
+        special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes poison and reduces damage received by 50% for 3 turns,",
+        specialName: "Shiryu Special",
+        sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
+    },
+    1603: {//McGuy
+        captain: "Boosts ATK of [STR] characters by 2.25x and their RCV by 1.25x",
+        special: "Delays all enemies for 2 turns",
+        specialName: "All Hail Lightning God McGuy Special",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index f96869ea0..bed8edaf0 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1211,7 +1211,7 @@ window.drops = {
             condition: "None",
             challenge:'Total number of hits above 50,000',
             challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Despair Resistance Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -673, -671, -633, -500, -467, -465, -451, -431 ]
+            "All Difficulties": [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -1549, -673, -671, -633, -500, -467, -465, -451, -431 ]
         },
 
         {
@@ -1286,8 +1286,8 @@ window.drops = {
             condition: "None",
             global: true,
             gamewith: 27631,
-            "Global": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -812, -565 ],
-            "Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -812, -565, -1212 ]
+            "Global": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -1550, -812, -565 ],
+            "Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -1550, -812, -565, -1212 ]
         },
         
         {
@@ -1361,7 +1361,7 @@ window.drops = {
             global: true,
             gamewith: 35905,
             condition: "'Musical' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)",
-            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -558, -1208, -677, -896, -631, -954, -1206, -617, -1027 ]
+            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -558, -1208, -677, -896, -1551, -631, -954, -1206, -617, -1027 ]
         },
         
         {
@@ -1394,6 +1394,7 @@ window.drops = {
         {
             name: "Young Donquixote Pirates - Baby 5 And Buffalo",
             thumb: 1287,
+            global: true,
             gamewith: 39522,
             condition: "Child-like characters get their ATK and HP boosted by 3.5x, RCV by 1.5x, and cooldowns reduced by 7 turns at the start of the fight",
             "All Difficulties": [ 1286, 1288, 1290, -963, -1045, -251, -760, -1083, -1129, -506, -1062, -702 ]
@@ -1434,7 +1435,7 @@ window.drops = {
             name: "Soldier-san's Training!",
             thumb: 1384,
             gamewith: 46658,
-            "All Difficulties": [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739 ]
+            "All Difficulties": [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739, -1550 ]
         },
         
         {
@@ -1505,7 +1506,7 @@ window.drops = {
             thumb: 1564,
             gamewith: 55145,
             condition: "Elizabello will kill you with one punch",
-            "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
+            "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709, -1549 ],
         },
         
         {
@@ -1520,7 +1521,7 @@ window.drops = {
             thumb: 1581,
             gamewith: null,
             //condition: "Elizabello will kill you with one punch",
-            "All Difficulties": [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1438, -1440, -893, -1343 ],
+            "All Difficulties": [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1550, -1438, -1440, -893, -1343 ],
         },
         
     ],
@@ -1696,7 +1697,7 @@ window.drops = {
             global: true,
             gamewith: 26803,
             thumb: 989,
-            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -1446, -556, -528, -520, -554, -558, -20, -1447, -217, -709, -1115, -1177, -1175, -1210, -1208, -1387, -1388, -1389 ]
+            Ultimate: [ 985, 986, 987, 988, -989, -4, -8, -11, -12, -15, -16, -1446, -556, -528, -520, -554, -558, -20, -1447, -217, -709, -1549, -1115, -1177, -1175, -1210, -1208, -1387, -1388, -1389 ]
         },
         
         {
@@ -1777,12 +1778,14 @@ window.drops = {
         {
             name: 'Chopper\'s Sweet Special Adventure',
             thumb: 247,
+            global: true,
             '': [ 247 ]
         },
 
         {
             name: 'Battle Royal! Oars',
             thumb: 893,
+            global: true,
             challenge:'Total number of hits above 50,000',
             challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Bind Resistance Forbidden Tome, 2x Rainbow Gems']],
             "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8, -1388 ]
@@ -1819,15 +1822,21 @@ window.drops = {
             thumb: 1023,
             "All Difficulties": [ 1023 ]
         },
+        
+        {
+            name: '3nd Anniversary Celebration! Duel! Luffy',
+            thumb: 1600,
+            "30 Stamina": [ 1600 ]
+        },
 
         {
             name: 'Coliseum',
             thumb: 779,
             global: true,
             gamewith: 17473,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603 ]
         },
         
         {
@@ -1848,7 +1857,7 @@ window.drops = {
             condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
             "Characters": [ 67, 69, 262, 264, 298 ],
             "Boosters and Evolvers": [ 113, 192, 350, 266, 83, 118 ],
-            "Global": [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1445 ],
+            "Global": [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1550, -1445 ],
             "Japan": [ -416, -459, -530, -669, -1492, -578, -1121, -1445 ]
         },
         
@@ -1912,11 +1921,11 @@ window.drops = {
             "Log Luffy": [ 300, 100, 84, 95, 78, 89, 347, -1121, -578, -1075, -1131, -1133, -1115, -520, -1177, -528, -1387, -4, -816, -426, -542, -563 ],
             "Corazon": [ 303, 103, 87, 98, 81, 92, 350, -1001, -451, -878, -1079, -1183, -1316, -1446, -16, -223, -327, -628, -614 ],
             "Kuzan": [ 301, 101, 96, 79, 90, 348, -1192, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
-            "Issho": [  ],
-            "Dracule Mihawk": [  ],
-            "Sabo": [  ],
-            "Rayleigh": [  ],
-            "Jinbei": [  ],
+            "Issho": [ 301, 101, 96, 79, 90, 348, -1085, -965, -414, -457, -999, -1270, -218, -15, -785, -1228, -467 ],
+            "Dracule Mihawk": [ 303, 103, 87, 98, 81, 92, 350, -718, -639, -846, -906, -1129, -1238, -1322, -463, -729, -791, -215 ],
+            "Sabo": [ 304, 104, 88, 99, 82, 93, 351, -669, -874, -937, -1027, -1119, -524, -1318, -216, -332, -502, -737, -1062 ],
+            "Rayleigh": [ 300, 100, 84, 95, 78, 89, 347, -367, -210, -894, -997, -1389, -12, -1412, -208, -431, -544, -954, -1151 ],
+            "Jinbei": [ 302, 102, 86, 97, 80, 91, 349, -935, -408, -641, -671, -673, -1187, -1274, -1368, -333, -704, -956 ],
             "Sakazuki": [  ],
             "Rob Lucci": [  ],
             "Sengoku": [  ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 5aa893c05..4a46dcccc 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2471,4 +2471,12 @@ window.evolutions = {
         evolution: 1595,
         evolvers: [ 118, 83, 87, 303, 103 ]
     },
+    1596: {
+        evolution: 1597,
+        evolvers: [ 117, 82, 88, 99, 104 ]
+    },
+    1601: {
+        evolution: 1602,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index ec3cd6542..6ef80e582 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1598,4 +1598,7 @@ window.families = [
     "Princess Shirahoshi",
     "Ryuboshi",
     "Manboshi",
+    "Shiliew",
+    "Shiliew",
+    "McGuy",
 ];
diff --git a/common/data/flags.js b/common/data/flags.js
index 780489152..4d7f63c5d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -36,15 +36,15 @@ window.flags = {
     35: { global: 1 },
     36: { global: 1 },
     37: { global: 1 },
-    38: { global: 1, rr: 1 },
-    39: { global: 1, rr: 1 },
+    38: { global: 1 },
+    39: { global: 1 },
     40: { global: 1 },
     41: { global: 1 },
     42: { global: 1 },
     43: { global: 1 },
-    44: { global: 1, rr: 1 },
-    45: { global: 1, rr: 1 },
-    46: { global: 1, rr: 1 },
+    44: { global: 1 },
+    45: { global: 1 },
+    46: { global: 1 },
     47: { global: 1 },
     48: { global: 1 },
     49: { global: 1 },
@@ -52,23 +52,23 @@ window.flags = {
     51: { global: 1 },
     52: { global: 1 },
     53: { global: 1 },
-    54: { global: 1, rr: 1 },
+    54: { global: 1 },
     55: { global: 1 },
-    56: { global: 1, rr: 1 },
-    57: { global: 1, rr: 1 },
-    58: { global: 1, rr: 1 },
+    56: { global: 1 },
+    57: { global: 1 },
+    58: { global: 1 },
     59: { global: 1 },
     60: { global: 1 },
-    61: { global: 1, rr: 1 },
-    62: { global: 1, rr: 1 },
-    63: { global: 1, rr: 1 },
-    64: { global: 1, rr: 1 },
-    65: { global: 1, rr: 1 },
-    66: { global: 1, rr: 1 },
-    67: { global: 1, rr: 1 },
-    68: { global: 1, rr: 1 },
-    69: { global: 1, rr: 1 },
-    70: { global: 1, rr: 1 },
+    61: { global: 1 },
+    62: { global: 1 },
+    63: { global: 1 },
+    64: { global: 1 },
+    65: { global: 1 },
+    66: { global: 1 },
+    67: { global: 1 },
+    68: { global: 1 },
+    69: { global: 1 },
+    70: { global: 1 },
     71: { global: 1, rr: 1 },
     72: { global: 1, rr: 1 },
     73: { global: 1, rr: 1 },
@@ -197,16 +197,16 @@ window.flags = {
     196: { global: 1 },
     197: { global: 1 },
     198: { global: 1 },
-    199: { global: 1, rr: 1 },
-    200: { global: 1, rr: 1 },
-    201: { global: 1, rr: 1 },
-    202: { global: 1, rr: 1 },
-    203: { global: 1, rr: 1 },
-    204: { global: 1, rr: 1 },
-    205: { global: 1, rr: 1 },
-    206: { global: 1, rr: 1 },
-    207: { global: 1, rr: 1 },
-    208: { global: 1, rr: 1 },
+    199: { global: 1 },
+    200: { global: 1 },
+    201: { global: 1 },
+    202: { global: 1 },
+    203: { global: 1 },
+    204: { global: 1 },
+    205: { global: 1 },
+    206: { global: 1 },
+    207: { global: 1 },
+    208: { global: 1 },
     209: { global: 1, rr: 1, rro: 1 },
     210: { global: 1, rr: 1, rro: 1 },
     211: { global: 1 },
@@ -1240,6 +1240,11 @@ window.flags = {
     1283: { global: 1 },
     1284: { shop: 1, global: 1 },
     1285: { shop: 1, global: 1 },
+    1286: { global: 1 },
+    1287: { global: 1 },
+    1288: { global: 1 },
+    1289: { global: 1 },
+    1290: { global: 1 },
     1295: { rr: 1, rro: 1, lrr: 1 },
     1296: { rr: 1, rro: 1, lrr: 1 },
     1297: { global: 1 },
diff --git a/common/data/gw.js b/common/data/gw.js
index f7f007127..760b5f2cd 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1598,4 +1598,5 @@ window.gw=[
     57042,
     57044,
     57043,
+    56812,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index e7d30463f..cb6ed5672 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1565,8 +1565,8 @@ window.units = [
     [ "'The Fighting King' Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
     [ "Tactician Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, 101, 45, 70, 1012, 511, 160, 1 ],
     [ "Tactician Dagama, Prodence Kingdom", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, 2022, 1011, 276, 1 ],
-    [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, 3, 35, 90778, 92, 33, 83, 603, 304, 289, null ],
-    [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, 4, 5, 70, 1066998, 534, 255, 249, 1030, 603, 436, null ],
+    [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, 3, 35, 136167, 92, 33, 83, 603, 304, 289, 1 ],
+    [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, 4, 5, 70, 1066998, 534, 255, 249, 1030, 603, 436, 1 ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, 2000000, 197, 109, 15, 2017, 1230, 245, 1 ],
     [ "Inuarashi", "STR", [ "Slasher", "Cerebral" ], 5, 30, 6, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, 1 ],
     [ "'King of the Day' Inuarashi", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, 1 ],
@@ -1594,11 +1594,14 @@ window.units = [
     [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
-    [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, null ],
-    [ "Shirahoshi, Evolved", "INT", "Striker", 4, 20, 4, 3, 99, 3000000, 620, 330, 200, 1536, 858, 408, null ],
-    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, null ],
-    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, null ],
-    [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, 1 ],
+    [ "Princess Shirahoshi, Ryugu Kingdom", "INT", "Striker", 4, 20, 4, 3, 99, 3000000, 620, 330, 200, 1536, 858, 408, 1 ],
+    [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, 1 ],
+    [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, 1 ],
+    [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
+    [ "Coliseum Shiryu", "INT", [ "Slasher", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shiryu of the Rain", "INT", [ "Slasher", "Driven" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Lightning God' McGuy, Subordinates of the Whitebeard Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 42e418b0d..04ade437a 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -343,6 +343,10 @@ window.zombies = {
         type: 'healer',
         amount: 120
     },
+    1463: { // White Day Luffy
+        type: 'healer',
+        multiplier: 1.5
+    },
     1465: { // White Day Chopper
         type: 'zombie',
         threshold: 0.5

From 1374fa7863cc0867334c28e3233d66775d68250a Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sat, 20 May 2017 22:59:32 -0700
Subject: [PATCH 1028/1569] Fixed 1600 Monkey D Luffy's Family

for some reason it doesn't give mcguy a family and doesn't show that
unevolved colo shiryu has a family (but it does show it for his evolved
version)
---
 common/data/families.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/families.js b/common/data/families.js
index 6ef80e582..4a202b1c0 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1598,7 +1598,8 @@ window.families = [
     "Princess Shirahoshi",
     "Ryuboshi",
     "Manboshi",
+    "Monkey D. Luffy",
     "Shiliew",
     "Shiliew",
     "McGuy",
-];
+];
\ No newline at end of file

From 620199fa4b12a32715a5c6196fd68b4968b39fc3 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 23 May 2017 00:11:44 -0400
Subject: [PATCH 1029/1569] New Ace

---
 common/data/aliases.js    |  8 +++++---
 common/data/captains.js   |  6 ++++++
 common/data/details.js    | 18 ++++++++++++++----
 common/data/drops.js      |  6 ++++++
 common/data/evolutions.js |  4 ++++
 common/data/units.js      |  8 +++++---
 common/data/zombies.js    |  4 ++++
 7 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index eb81ad9b6..83fd16eca 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1599,9 +1599,11 @@ window.aliases = {
     1598: ['リュウボシ', '', ''],
     1599: ['マンボシ', '', ''],
     1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy'],
-    1601: ['', '', 'Coliseum Shiryu'],
-    1602: ['', '', 'Coliseum Shiryu'],
-    1603: ['', '', 'Coliseum McGuy'],
+    1601: ['黒ひげ海賊団, シリュウ', '', 'Coliseum Shiryu'],
+    1602: ['黒ひげ海賊団, 雨のシリュウ', '', 'Coliseum Shiryu'],
+    1603: ['雷卿, マクガイ', '', 'Coliseum McGuy'],
+    1604: ['ルフィの "兄", ポートガス • D • エース', '', '0 Stamina Ace'],
+    1605: ['白ひげの "息子", ポートガス • D • エース', '', '0 Stamina Ace'],
 };
 
 //  xxxx: ['', '', ''],
\ No newline at end of file
diff --git a/common/data/captains.js b/common/data/captains.js
index daea37fb5..5dc4b7adb 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4729,4 +4729,10 @@ window.captains = {
         atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
         rcv: function(p) { return p.unit.type == "STR" ? 1.25 : 1; }
     },
+    1604: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+    },
+    1605: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 0f6ade0c4..31d21566e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7851,7 +7851,7 @@ window.details = {
     },
     1448: {//Chopper 5+
         captain: "Boosts Fighter characters ATK by 2.5x.",
-        special: "Deals PSY damage according to HP. Changes [Block] orbs on Fighter characters into matching.",
+        special: "Deals PSY damage according to HP. Changes [BLOCK] orbs on Fighter characters into matching.",
         specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the higher the HP is. The formula used is ???? * (current HP) / (total HP)",
         specialName: "Weight Gain: Heavy Gong",
     },
@@ -8855,18 +8855,28 @@ window.details = {
     1601: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by ???x at the start of the chain, by ???x after the 3rd Perfect",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes poison and reduces damage received by 50% for 3 turns,",
-        specialName: "Shiryu Special",
+        specialName: "Blood Stained 'Iron Wall'",
         sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
     },
     1602: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes poison and reduces damage received by 50% for 3 turns,",
-        specialName: "Shiryu Special",
+        specialName: "Blood Stained 'Iron Wall'",
         sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
     },
     1603: {//McGuy
         captain: "Boosts ATK of [STR] characters by 2.25x and their RCV by 1.25x",
         special: "Delays all enemies for 2 turns",
-        specialName: "All Hail Lightning God McGuy Special",
+        specialName: "Numb Crosscut",
+    },
+    1604: {//Training Forest Ace
+        captain: "Boosts ATK of [STR] characters by 1.5x",
+        special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
+        specialName: "Fist of the Demon's Child 'Fire'",
+    },
+    1605: {//Training Forest Ace
+        captain: "Boosts ATK of [STR] characters by 2x and recovers 500 HP at end of each turn",
+        special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
+        specialName: "Fist of the Demon's Child 'Fire'",
     },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index bed8edaf0..09ea70712 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1782,6 +1782,12 @@ window.drops = {
             '': [ 247 ]
         },
 
+        {
+            name: 'Ace Training Ground',
+            thumb: 1605,
+            "All Difficulties": [ 1604 ],
+        },
+
         {
             name: 'Battle Royal! Oars',
             thumb: 893,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4a46dcccc..99f7a33cd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2479,4 +2479,8 @@ window.evolutions = {
         evolution: 1602,
         evolvers: [  ]
     },
+    1604: {
+        evolution: 1605,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index cb6ed5672..2be4a5ece 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1599,9 +1599,11 @@ window.units = [
     [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, 1 ],
     [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, 1 ],
     [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
-    [ "Coliseum Shiryu", "INT", [ "Slasher", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Shiryu of the Rain", "INT", [ "Slasher", "Driven" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Lightning God' McGuy, Subordinates of the Whitebeard Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 04ade437a..9ad067c3b 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -403,4 +403,8 @@ window.zombies = {
         type: 'zombie',
         threshold: 0.3
     },
+    1605: { // Training Forest Ace
+        type: 'healer',
+        amount: 500
+    },
 };

From 9bea39e176e7c56ed4ee8810baaab33e68db59ff Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 23 May 2017 00:12:41 -0400
Subject: [PATCH 1030/1569] Forgot dis

---
 common/data/gw.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/common/data/gw.js b/common/data/gw.js
index 760b5f2cd..703b7497f 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1599,4 +1599,9 @@ window.gw=[
     57044,
     57043,
     56812,
+    null,
+    null,
+    null,
+    57510,
+    57510,
 ];
\ No newline at end of file

From 65027b0af4d3da19f124cd2be1868142a809953f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 24 May 2017 16:41:35 -0400
Subject: [PATCH 1031/1569] Stats and sshit

---
 common/data/captains.js  |  7 +------
 common/data/cooldowns.js |  5 +++++
 common/data/details.js   |  2 +-
 common/data/gw.js        |  6 +++---
 common/data/units.js     | 10 +++++-----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 5dc4b7adb..8a756b3af 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4710,12 +4710,7 @@ window.captains = {
         atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 2.5 : 1; },
     },
     1601: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Slasher" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Slasher")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1602: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Slasher" ]); },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 26d196382..f43aeee8a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1599,4 +1599,9 @@ window.cooldowns = [
     [ 16, 10 ],
     [ 17, 11 ],
     [ 20, 16 ],
+    [ 29, 15 ],
+    [ 29, 15 ],
+    [ 21, 12 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 31d21566e..bf19ab944 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8853,7 +8853,7 @@ window.details = {
         specialName: "Right Leg Armament: Gum-Gum Battle Axe",
     },
     1601: {//Power Creep Shiryu
-        captain: "Boosts ATK of Slasher characters by ???x at the start of the chain, by ???x after the 3rd Perfect",
+        captain: "Boosts ATK of Slasher characters by 2x",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes poison and reduces damage received by 50% for 3 turns,",
         specialName: "Blood Stained 'Iron Wall'",
         sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
diff --git a/common/data/gw.js b/common/data/gw.js
index 703b7497f..d222a0192 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1599,9 +1599,9 @@ window.gw=[
     57044,
     57043,
     56812,
-    null,
-    null,
-    null,
+    57473,
+    57473,
+    57474,
     57510,
     57510,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 2be4a5ece..cfe1d0524 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1599,11 +1599,11 @@ window.units = [
     [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, 1 ],
     [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, 1 ],
     [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
-    [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, null ],
+    [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, null ],
+    [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, null, null, null, 1760, 1190, 257, null ],
+    [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
+    [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 83e9a0edec03365c5fee41a9100cbe6313566221 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 24 May 2017 19:18:48 -0400
Subject: [PATCH 1032/1569] New legend islands drops

---
 common/data/drops.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 09ea70712..2023faf1d 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1916,6 +1916,7 @@ window.drops = {
             name: 'Challenge the Enemy! Sugofest Exclusive Character Skillbooks!',
             thumb: 1588,
             gamewith: 56742,
+            showManual: true,
             condition: "High chance of dropping 6* skillbooks. Only Evolvers and Booster characters will drop.",
             "Black Clad Shanks": [ 301, 101, 96, 79, 90, 348, -530, -316, -910, -995, -1236, -1364, -465, -590, -967, -813, -888 ],
             "Donquixote Doflamingo": [ 304, 104, 88, 99, 82, 93, 351, -870, -312, -645, -838, -876, -880, -1190, -396, -586, -631, -567 ],
@@ -1932,16 +1933,16 @@ window.drops = {
             "Sabo": [ 304, 104, 88, 99, 82, 93, 351, -669, -874, -937, -1027, -1119, -524, -1318, -216, -332, -502, -737, -1062 ],
             "Rayleigh": [ 300, 100, 84, 95, 78, 89, 347, -367, -210, -894, -997, -1389, -12, -1412, -208, -431, -544, -954, -1151 ],
             "Jinbei": [ 302, 102, 86, 97, 80, 91, 349, -935, -408, -641, -671, -673, -1187, -1274, -1368, -333, -704, -956 ],
-            "Sakazuki": [  ],
-            "Rob Lucci": [  ],
-            "Sengoku": [  ],
-            "Whitebeard": [  ],
-            "Marco": [  ],
-            "Zoro": [  ],
-            "Boa Hancock": [  ],
-            "Bartolomeo": [  ],
-            "Borsalino": [  ],
-            "Captain Buggy": [  ],
+            "Sakazuki": [ 303, 103, 87, 98, 81, 92, 350, -1314, -73, -259, -412, -455, -647, -1324, -292, -329, -1283, -955 ],
+            "Rob Lucci": [ 300, 100, 84, 95, 78, 89, 347, -748, -314, -756, -912, -1238, -1447, -20, -633, -787, -731, -427, -1279 ],
+            "Sengoku": [ 304, 104, 88, 99, 82, 93, 351, -459, -453, -1117, -522, -1186, -1175, -554, -1549, -709, -400, -500, -974, -1152, -1153 ],
+            "Whitebeard": [ 302, 102, 86, 97, 80, 91, 349, -261, -1413, -361, -363, -752, -872, -939, -204, -1280, -564, -701, -1154 ],
+            "Marco": [ 301, 101, 96, 79, 90, 348, -649, -251, -750, -842, -993, -1173, -508, -631, -378, -891, -1226 ],
+            "Zoro": [ 301, 101, 96, 79, 90, 348, -1362, -844, -1081, -1125, -1410, -546, -1282, -234, -812, -47 ],
+            "Boa Hancock": [ 303, 103, 87, 98, 81, 92, 350, -416, -1445, -253, -677, -1320, -1448, -22, -402, -506, -588, -893, -1157, -702 ],
+            "Bartolomeo": [ 304, 104, 88, 99, 82, 93, 351, -1035, -221, -357, -643, -840, -1025, -1029, -225, -541, -733, -1056 ],
+            "Borsalino": [ 302, 102, 86, 97, 80, 91, 349, -1240, -77, -257, -760, -943, -1272, -1551, -896, -398, -793, -1058, -59 ],
+            "Captain Buggy": [ 300, 100, 84, 95, 78, 89, 347, -1391, -1031, -1232, -1276, -1550, -739, -214, -707, -735, -890, -1318, -290 ],
         },
 
    ]

From ab109054c4eb147ab78416245766077e14030132 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 25 May 2017 00:56:38 -0400
Subject: [PATCH 1033/1569] GG EZ

---
 common/data/drops.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 2023faf1d..861c9872c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1506,7 +1506,7 @@ window.drops = {
             thumb: 1564,
             gamewith: 55145,
             condition: "Elizabello will kill you with one punch",
-            "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709, -1549 ],
+            "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
         },
         
         {
@@ -1518,10 +1518,9 @@ window.drops = {
         
         {
             name: "Fishman Island! The Royal Family!",
-            thumb: 1581,
-            gamewith: null,
-            //condition: "Elizabello will kill you with one punch",
-            "All Difficulties": [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1550, -1438, -1440, -893, -1343 ],
+            thumb: 1597,
+            gamewith: 57039,
+            "All Difficulties": [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1438, -1440, -893, -1343 ],
         },
         
     ],

From db7bb0dde6858b3f72038a14ae62346533a7cac9 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 25 May 2017 14:39:26 -0400
Subject: [PATCH 1034/1569] Zoro weird thing confirmed

---
 common/data/captains.js | 4 ++--
 common/data/details.js  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 8a756b3af..1e9458f31 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3716,12 +3716,12 @@ window.captains = {
         hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
     },
     1361: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
         hp: function(p) { return p.unit.class.has("Slasher") ?
             p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
     },
     1362: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
         hp: function(p) { return p.unit.class.has("Slasher") ?
             p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
     },
diff --git a/common/data/details.js b/common/data/details.js
index bf19ab944..56bcf3fd7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7195,13 +7195,13 @@ window.details = {
         specialName: "Gum-Gum Twin Jet Pistol: Snowflake",
     },
     1361: {//6* Zoro
-        captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead",
+        captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
         special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1362: {//6* Zoro
-        captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead",
+        captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
         special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",

From 41e70eeda70a5d11bc3df958528257074c41b2f1 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 25 May 2017 16:30:24 -0400
Subject: [PATCH 1035/1569] Sanji typo

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 56bcf3fd7..b393ccf4e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7836,7 +7836,7 @@ window.details = {
         specialName: "Green Star: Platanus Shuriken",
     },
     1447: {//Sanji 5+
-        captain: "Boosts Powerhouse characters ATK by 2.5x and reduces damage take by 10%.",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x and reduces damage take by 10%.",
         special: [
             {
                 "description": "Deals 5,000 fixed damage to all enemies and boosts own ATK by 1.2x for 1 turn.",

From 8237743fab19bc3271f10316a2f5e83054084420 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Fri, 26 May 2017 10:47:47 -0700
Subject: [PATCH 1036/1569] Bunch O' New Stuff

---
 common/data/captains.js   | 48 ++++++++++++++++++++++++++++++++-
 common/data/details.js    | 57 +++++++++++++++++++++++++++++++++++++++
 common/data/evolutions.js | 24 +++++++++++++++--
 common/data/ships.js      |  4 +--
 common/data/units.js      | 16 ++++++++++-
 5 files changed, 143 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1e9458f31..c0f210e18 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4670,7 +4670,7 @@ window.captains = {
     1589: {
         chainModifier: function(p) { return 3; },
     },
-    1589: {
+    1590: {
         chainModifier: function(p) { return 3.5; },
         rcv: function(p) { return 1.2 },
         hp: function(p) { return 1.2 },
@@ -4730,4 +4730,50 @@ window.captains = {
     1605: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
     },
+    1606: {
+        
+    },
+    1607: {
+        
+    },
+    1608: {
+        
+    },
+    1609: {
+        
+    },
+    1610: {
+        
+    },
+    1611: {
+        atk: function(p) {return p.unit.class.has("Shooter") ? 2.5 : 1; },
+    },
+    1612: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ?1.2 : 1; },
+    },
+    1613: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+    },
+    1614: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; },
+    },
+    1615: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+    },
+    1616: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+    },
+    1617: {
+        
+    },
+    1618: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
+    },
+    1619: {
+        chainModifier: function(p) { return 4; }
+        hp: function(p) { return 1.2 },
+        rcv: function(p) { return 1.2 },
+    }
 };
diff --git a/common/data/details.js b/common/data/details.js
index b393ccf4e..f366f3d4e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8879,4 +8879,61 @@ window.details = {
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
         specialName: "Fist of the Demon's Child 'Fire'",
     },
+    1611: {//New Kuma
+        captain: "Boosts ATK of Shooter characters by 2.5x",
+        special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
+        specialName: "",
+        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
+    },
+    1612: {//New Kuma
+        captain: "Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x",
+        special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
+        specialName: "",
+        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
+    },
+    1613: {//New Lucci
+        captain: "Boosts ATK of Fighter characters by 2.5x",
+        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? amount for ??? turns",
+        specialName: "",
+        sailor: "Adds 2x character's ATK as bonus damage",
+        sailorNotes: "Similar effect to Raid Sabo",
+    },
+    1614: {//New Lucci
+        captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.2x",
+        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? for ??? turns",
+        specialName: "",
+        sailor: "Restores his own special by 2 turns when it is rewinded",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+    },
+    1615: {//New Crocodile
+        captain: "Boosts ATK of Strikers by 2.5x",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK and amplifies orbs of Strikers by ??? for ??? turns",
+        specialName: "",
+        sailor: "Restores his own special by 2 turns when it is rewinded",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+    },
+    1616: {//New Crocodile
+        captain: "Boosts ATK of Strikers by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK and amplifies orbs of Strikers by ??? for ??? turns",
+        specialName: "",
+        sailor: "Restores his own special by 2 turns when it is rewinded",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+    },
+    1617: {//4* Moria
+        captain: "",
+        special: "",
+        specialName: "",
+        sailor: "",
+    },
+    1618: {//5* Moria
+        captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2.5x",
+        special: "Shuffles all orbs except matching [STR], [INT], [DEX] orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for ??? turns",
+        specialName: "",
+        sailor: "",
+    },
+    1619: {//6+ Raybae
+        captain: "Boosts chain multiplier by 4xand crew's HP by 1.2x",
+        special: "Reduces the duration of Bind, Despair, and Paralysis by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
+        specialName: "",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 99f7a33cd..b80ed9371 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2477,10 +2477,30 @@ window.evolutions = {
     },
     1601: {
         evolution: 1602,
-        evolvers: [  ]
+        evolvers: [ 118, 99, 99, 304, 104 ]
     },
     1604: {
         evolution: 1605,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 89, 95 ]
+    },
+    1611: {
+        evolution: 1612,
+        evolvers: [ ]
+    },
+    1613: {
+        evolution: 1614,
+        evolvers: [ ]
+    },
+    1615: {
+        evolution: 1616,
+        evolvers: [ ]
+    },
+    1617: {
+        evolution: 1618,
+        evolvers: [ ]
+    },
+    367: {
+        evolution: 1619,
+        evolvers: [ ]
     },
 };
diff --git a/common/data/ships.js b/common/data/ships.js
index e03a2caa8..ea0b02e2c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -377,8 +377,8 @@ window.ships = [
         name: "3rd Anniversary Thousand Sunny",
         thumb: null,
         //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
-        description: 'Boosts ATK by 1.5x. Boosts EXP gained by 3x.',
-        atk: function(p) { return 1.5; },
+        description: 'Boosts ATK by 1.2x.',
+        atk: function(p) { return 1.2; },
     },
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index cfe1d0524..307b14a46 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1601,9 +1601,23 @@ window.units = [
     [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
     [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, null ],
     [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, null ],
-    [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, null, null, null, 1760, 1190, 257, null ],
+    [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
+    [ ],
+    [ ],
+    [ ],
+    [ ],
+    [ ],
+    [ "Kuma", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kuma Evolved", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lucci", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lucci Evolved", "DEX", [ "Fighter", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Crocodile", "INT", [ "Striker", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Crocodile Evolved", "INT", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Moria", "STR", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Moria Evolved", "STR", [ "Driven", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6+ Rayleigh", "INT", [ "Slasher", "Fighter" ], "6+", 65, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 67e480f8b0d6c9c6ca4f4b86e5c4babb2d93a65e Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Fri, 26 May 2017 10:56:40 -0700
Subject: [PATCH 1037/1569] Forgot Enel

---
 common/data/details.js | 10 ++++++++++
 common/data/units.js   |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f366f3d4e..995c4b584 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8879,6 +8879,16 @@ window.details = {
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
         specialName: "Fist of the Demon's Child 'Fire'",
     },
+    1609: {//Legend Enel
+        captain: "",
+        special: "",
+        specialName: "",
+    },
+    1610: {//Legend Enel Evolved
+        captain: "",
+        special: "",
+        specialName: "",
+    },
     1611: {//New Kuma
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
diff --git a/common/data/units.js b/common/data/units.js
index 307b14a46..3717b2c9f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1607,8 +1607,8 @@ window.units = [
     [ ],
     [ ],
     [ ],
-    [ ],
-    [ ],
+    [ "Legend Enel", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Legend Enel Evolved", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kuma", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kuma Evolved", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lucci", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 994059abb0736baf80f5738c77b9b0a1373902d8 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Fri, 26 May 2017 10:58:37 -0700
Subject: [PATCH 1038/1569] Woops forgot one last thing (i hope)

---
 common/data/evolutions.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b80ed9371..bfdc95df1 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2483,6 +2483,10 @@ window.evolutions = {
         evolution: 1605,
         evolvers: [ 117, 78, 89, 95 ]
     },
+    1609: {
+        evolution: 1610,
+        evolvers: [ ]
+    },
     1611: {
         evolution: 1612,
         evolvers: [ ]

From 6a4c1c7e9ee207ad3ad9dbf277b055dfce6e89ea Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Fri, 26 May 2017 14:24:40 -0500
Subject: [PATCH 1039/1569] Fix

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c0f210e18..8bc4a2a31 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4772,8 +4772,8 @@ window.captains = {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
     },
     1619: {
-        chainModifier: function(p) { return 4; }
+        chainModifier: function(p) { return 4; },
         hp: function(p) { return 1.2 },
         rcv: function(p) { return 1.2 },
-    }
+    },
 };

From 842711e14cbe56283b69c5ac94a34001ef17bc38 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 26 May 2017 19:22:11 -0400
Subject: [PATCH 1040/1569] New units and Sanji Fix

---
 common/data/aliases.js    |  14 +++++
 common/data/captains.js   |  38 +++++-------
 common/data/details.js    | 122 ++++++++++++++++++++------------------
 common/data/flags.js      |  11 ++++
 common/data/matchers.js   |   9 ++-
 common/data/specials.js   |  94 ++++++++++-------------------
 common/data/units.js      |  16 ++---
 common/data/zombies.js    |   4 ++
 damage/js/app.js          |   4 --
 damage/js/cruncher.js     |   9 +--
 damage/views/content.html |   4 --
 damage/views/sidebar.html |   9 ++-
 12 files changed, 165 insertions(+), 169 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 83fd16eca..7ba5325a7 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1604,6 +1604,20 @@ window.aliases = {
     1603: ['雷卿, マクガイ', '', 'Coliseum McGuy'],
     1604: ['ルフィの "兄", ポートガス • D • エース', '', '0 Stamina Ace'],
     1605: ['白ひげの "息子", ポートガス • D • エース', '', '0 Stamina Ace'],
+    1606: ['', '', ''],
+    1607: ['', '', ''],
+    1608: ['', '', ''],
+    1609: ['', '', ''],
+    1610: ['', '', ''],
+    1611: ['', '', ''],
+    1612: ['', '', ''],
+    1613: ['', '', ''],
+    1614: ['', '', ''],
+    1615: ['', '', ''],
+    1616: ['', '', ''],
+    1617: ['', '', ''],
+    1618: ['', '', ''],
+    1619: ['', '', 'Mega Rayleigh', '6+ Rayleigh'],
 };
 
 //  xxxx: ['', '', ''],
\ No newline at end of file
diff --git a/common/data/captains.js b/common/data/captains.js
index 8bc4a2a31..28d1cf0c4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3885,13 +3885,13 @@ window.captains = {
     },
     1403: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? ((!window.specials[1403].turnedOn || (window.specials[1403].multiplier == null)) ? 2.5 : window.specials[1403].multiplier) : 1; 
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
             
         },
     },
     1404: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? ((!window.specials[1404].turnedOn || (window.specials[1404].multiplier == null)) ? 2.5 : window.specials[1404].multiplier) : 1;
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
         },
     },
     1405: {
@@ -4660,11 +4660,11 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1587: {
-        atk: function(p) { return 2.5 },
+        atk: function(p) { return (p.slot == p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
         hp: function(p) { return 1.3 },
     },
     1588: {
-        atk: function(p) { return 2.5 },
+        atk: function(p) { return (p.slot == p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
         hp: function(p) { return 1.3 },
     },
     1589: {
@@ -4685,7 +4685,7 @@ window.captains = {
     },
     1593: {
         atk: function(p){ 
-            return p.unit.class.has("Fighter") ? ((!window.specials[1593].turnedOn || (window.specials[1593].multiplier == null)) ? 2.5 : window.specials[1593].multiplier) : 1;
+            return p.unit.class.has("Fighter") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
         },
     },
     1595: {
@@ -4730,43 +4730,37 @@ window.captains = {
     1605: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
     },
-    1606: {
+    1609: {//Enel
+        hp: function(p) { return 0.8 },
         
     },
-    1607: {
-        
-    },
-    1608: {
-        
-    },
-    1609: {
-        
-    },
-    1610: {
+    1610: {//Enel
+        hp: function(p) { return 0.8 },
         
     },
     1611: {
-        atk: function(p) {return p.unit.class.has("Shooter") ? 2.5 : 1; },
+        atk: function(p) {return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
     1612: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ?1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
     1613: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
     },
     1614: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
     },
     1615: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
     },
     1616: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
     1617: {
-        
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2 : 1; },
     },
     1618: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
diff --git a/common/data/details.js b/common/data/details.js
index 995c4b584..386619d54 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2749,14 +2749,14 @@ window.details = {
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
     },
     639: {
         special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
     },
     640: {
         special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
@@ -4730,7 +4730,7 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
     },
     995:{
         captain: "Boosts amount of Beli received by 3x",
@@ -4748,7 +4748,7 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
     },
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
@@ -5949,7 +5949,7 @@ window.details = {
         ],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
     },
     1186: {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
@@ -5966,7 +5966,7 @@ window.details = {
         ],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn"
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
     },
     1187: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
@@ -6451,7 +6451,7 @@ window.details = {
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
         special: "Changes adjacent orbs into [INT] orbs. Deals 20x character's ATK in [INT] damage to all enemies.",
         specialName: "Reversed Twin Blades - Surprise Thrust",
-        sailor: "Reduces own Silence by 1 Turn",
+        sailor: "Reduces own Silence by 1 turn",
         sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
     },
     1253: {// Coliseum Shura
@@ -6473,7 +6473,7 @@ window.details = {
     },
     1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
-        special: "Shuffle non-matching orbs on Slasher and Driven characters, boosts Atk against enemies with increased defense by 1.3x for 1 turn",
+        special: "For Slasher and Driven characters, randomizes non-matching orbs, boosts Atk against enemies with increased defense by 1.3x for 1 turn",
         sailor: "Boosts ATK and RCV of Driven characters by 10",
         specialName: "Icebreaker Breakthrough Force",
     },
@@ -6673,7 +6673,7 @@ window.details = {
     },
     1285: {//Wild Luffy Evolved
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 3.375x instead.",
-        special: "Reduces Bind and Silence duration by 3 turns. Randomizes Non-Matching orbs. (Including [BLOCK] orb)",
+        special: "Reduces Bind and Silence duration by 3 turns. Randomizes non-matching orbs. (Including [BLOCK] orb)",
         sailor: "Reduces Silence duration against this character by 3 turns",
         specialName: "Wild Hunt",
     },
@@ -7310,14 +7310,14 @@ window.details = {
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
         specialName: "Wild Plan",
     },
     1372: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect and by 3x after the 5th Perfect.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 2 turns",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
         specialName: "Wild Plan",
     },
     1373: {//Magellan
@@ -7917,12 +7917,12 @@ window.details = {
     },
     1457: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 1.75x",
-        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and randomizes non-matching orbs for Slasher and Cerebral characters.",
+        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and for Slasher and Cerebral characters, randomizes non-matching orbs",
         specialName: "Pussyfoot Maneuver",
     },
     1458: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 2x",
-        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and randomizes non-matching orbs for Slasher and Cerebral characters.",
+        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and for Slasher and Cerebral characters, randomizes non-matching orbs",
         specialName: "Pussyfoot Maneuver",
     },
     1459: {//Coliseum Miss Valentine
@@ -8077,7 +8077,7 @@ window.details = {
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
         specialName: "Stalking Rose Axe",
     },
     1481: {//Vander Decken IX
@@ -8085,7 +8085,7 @@ window.details = {
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
         specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
         specialName: "Stalking Rose Axe",
     },
     1482: {//Madame Shyarly
@@ -8210,13 +8210,13 @@ window.details = {
     },
     1502: {//Coribou
         captain: "Reduces damage received from [PSY] and [INT] enemies by 30%",
-        special: "Randomizes non-matching orbs for Driven characters",
+        special: "For Driven characters, randomizes non-matching orbs",
         specialName: "Confession Burial",
     },
     1503: {//Hammond
         captain: "Boosts ATK of Powerhouse characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : ??? + ??? * (1 - (remaining HP) / (total HP)) : ??? : 2.25}",
-        special: "Randomizes non-matching orbs for Driven characters",
+        special: "For Driven characters, randomizes non-matching orbs",
         specialName: "Absurd Invitation",
     },
     1504: {//Vander Decken IX
@@ -8480,14 +8480,14 @@ window.details = {
         captain: "Boosts ATK by 2x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
         specialName: "Soft and Gentle Fluffy Kisses",
     },
     1542: {//Elizabeth
         captain: "Boosts RCV and HP by 1.2x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
         specialName: "Soft and Gentle Fluffy Kisses",
     },
     1543: {//6+ Usopp
@@ -8817,12 +8817,12 @@ window.details = {
         sailor: "Completely resists Paralysis on this character",
         specialName: "King Kong Gun",
     },
-    1594: {//Raid Fuji
+    1594: {//Raid Fujitora
         captain: "Cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialName: "Gravity Blade: Fierce Tiger",
     },
-    1595: {//Raid Fuji
+    1595: {//Raid Fujitora
         captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.2x, cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialName: "Gravity Blade: Fierce Tiger",
@@ -8880,70 +8880,74 @@ window.details = {
         specialName: "Fist of the Demon's Child 'Fire'",
     },
     1609: {//Legend Enel
-        captain: "",
-        special: "",
-        specialName: "",
-    },
-    1610: {//Legend Enel Evolved
-        captain: "",
-        special: "",
-        specialName: "",
-    },
-    1611: {//New Kuma
-        captain: "Boosts ATK of Shooter characters by 2.5x",
+        captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
+        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
+        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated",
+        specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
+        specialName: "Enel Special",
+    },
+    1610: {//Legend Enel
+        captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
+        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
+        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated",
+        specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
+        specialName: "Enel Special",
+    },
+    1611: {//Kuma
+        captain: "Boosts ATK of Shooter characters by 1.75x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
-        specialName: "",
+        specialName: "Kuma Special",
         sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
-    1612: {//New Kuma
+    1612: {//Kuma
         captain: "Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
-        specialName: "",
+        specialName: "Kuma Special",
         sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
-    1613: {//New Lucci
-        captain: "Boosts ATK of Fighter characters by 2.5x",
+    1613: {//Rob Lucci
+        captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? amount for ??? turns",
         specialName: "",
         sailor: "Adds 2x character's ATK as bonus damage",
         sailorNotes: "Similar effect to Raid Sabo",
     },
-    1614: {//New Lucci
-        captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.2x",
+    1614: {//Rob Lucci
+        captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? for ??? turns",
         specialName: "",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
     },
-    1615: {//New Crocodile
-        captain: "Boosts ATK of Strikers by 2.5x",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK and amplifies orbs of Strikers by ??? for ??? turns",
+    1615: {//Crocodile
+        captain: "Boosts ATK of Strikers by 2x",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
         specialName: "",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
     },
-    1616: {//New Crocodile
+    1616: {//Crocodile
         captain: "Boosts ATK of Strikers by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK and amplifies orbs of Strikers by ??? for ??? turns",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
         specialName: "",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 Turns, this Sailor Ability decreases that by 1 Turn",
+        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
     },
-    1617: {//4* Moria
-        captain: "",
-        special: "",
-        specialName: "",
-        sailor: "",
+    1617: {//Moria
+        captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
+        special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
+        specialName: "Moria Special",
+        sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
     },
-    1618: {//5* Moria
+    1618: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2.5x",
-        special: "Shuffles all orbs except matching [STR], [INT], [DEX] orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for ??? turns",
-        specialName: "",
-        sailor: "",
+        special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
+        specialName: "Moria Special",
+        sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
     },
-    1619: {//6+ Raybae
-        captain: "Boosts chain multiplier by 4xand crew's HP by 1.2x",
+    1619: {//6+ Raybae/Rayleigh
+        captain: "Boosts chain multiplier by 4x and boosts HP and RCV of all characters by 1.2x",
         special: "Reduces the duration of Bind, Despair, and Paralysis by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
-        specialName: "",
+        specialName: "Netherworld Conqueror",
     },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 4d7f63c5d..2e8e6dac0 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1389,4 +1389,15 @@ window.flags = {
     1591: { rr: 1, rro: 1, lrr: 1 },
     1592: { rr: 1, rro: 1, lrr: 1 },
     1593: { rr: 1, rro: 1 },
+    1609: { rr: 1, rro: 1 },
+    1610: { rr: 1, rro: 1 },
+    1611: { rr: 1, rro: 1 },
+    1612: { rr: 1, rro: 1 },
+    1613: { rr: 1, rro: 1 },
+    1614: { rr: 1, rro: 1 },
+    1615: { rr: 1, rro: 1 },
+    1616: { rr: 1, rro: 1 },
+    1617: { rr: 1, rro: 1 },
+    1618: { rr: 1, rro: 1 },
+    1619: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 0d737529b..eec75ecfd 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -234,6 +234,13 @@ window.matchers = [
         matcher: /boosts chances of getting.+orbs/i
     },
 
+    {
+        name: 'Negative to Positive Orb controllers',
+        target: 'special',
+        matcher: /(Badly Matching orbs into Matching orbs)/i,
+        include: [ 900, 901, 996, 997, 933 ],
+    },
+
     {
         name: 'Orb controllers',
         target: 'special',
@@ -268,7 +275,7 @@ window.matchers = [
         name: 'Orb matchers',
         target: 'special',
         matcher: /(Changes.+(orb|orbs))[^,]+Matching/i,
-        include: [ 1036, 1037 ]
+        include: [ 1036, 1037, 1445 ]
     },
 
     {
diff --git a/common/data/specials.js b/common/data/specials.js
index 5723a683d..c2a43036f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2043,36 +2043,6 @@ window.specials = {
             });
         },
     },
-    1403: {
-        onActivation: function(p) {
-            var n = (window.specials[1403].multiplier == 3.16 ? 1 : 0);
-            window.specials[1403].turnedOn = true;
-            window.specials[1403].multiplier = [3.16, 4][n];
-            p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
-                name: '1403warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1403].turnedOn = false;
-        }
-        
-    },
-    1404: {
-        onActivation: function(p) {
-            var n = (window.specials[1404].multiplier == 3.16 ? 1 : 0);
-            window.specials[1404].turnedOn = true;
-            window.specials[1404].multiplier = [3.16, 4][n];
-            p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
-                name: '1404warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1404].turnedOn = false;
-        }
-        
-    },
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
         type: "class",
@@ -2625,28 +2595,12 @@ window.specials = {
         type: "class"
     },
     1587: {
-        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1587].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1587].multiplier == 2 ? 1 : 0);
-            window.specials[1587].multiplier = [2, 5][n];
-            p.scope.notify({
-                text: 'Using the ' + [2, 5][n] + 'x ATK multiplier. To switch to the ' + [5, 2][n] + 'x multiplier, disable and re-enable this special. (5x Attack boost assumes that Sanji Jumped, and used his special on the following turn. Jumping + Type Boost does NOT work yet.)',
-                name: '1587warning'
-            });
-        },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
     },  
     1588: {
-        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1588].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1588].multiplier == 2 ? 1 : 0);
-            window.specials[1588].multiplier = [2, 5][n];
-            p.scope.notify({
-                text: 'Using the ' + [2, 5][n] + 'x ATK multiplier. To switch to the ' + [5, 2][n] + 'x multiplier, disable and re-enable this special. (5x Attack boost assumes that Sanji Jumped, and used his special on the following turn. Jumping + Type Boost does NOT work yet.)',
-                name: '1588warning'
-            });
-        },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1591: {
         atk: function(p) {
@@ -2660,20 +2614,6 @@ window.specials = {
         },
         type: "class"
     },
-    1593: {
-        onActivation: function(p) {
-            var n = (window.specials[1593].multiplier == 3.16 ? 1 : 0);
-            window.specials[1593].turnedOn = true;
-            window.specials[1593].multiplier = [3.16, 4][n];
-            p.scope.notify({
-                text: 'Only affects damage if Luffy is your captain, and each Luffy only boosts his own Captain damage. Toggle to change between effective captain boosts. Using the ' + [10, 16][n] + 'x Captain boost. To switch to the ' + [16, 10][n] + 'x Captain boost, disable and re-enable this special. NOTE: STAGE 1 SPECIAL IS ONLY USED IF YOU HAVE TWO LUFFYS, AND ARE TESTING DAMAGE AS IF YOU ONLY ACTIVATED ONE LUFFY SPECIAL.',
-                name: '1593warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1593].turnedOn = false;
-        }
-    },
     1594: {
         orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
@@ -2686,4 +2626,30 @@ window.specials = {
     1600: {
         orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
+    1613: {
+        def: function(p) { return 0.5 },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+    },
+    1614: {
+        def: function(p) { return 0.5 },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+    },
+    1615: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+    },
+    1616: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+    },
+    1617: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
+        type: "type"
+    },
+    1618: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
+        type: "type"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 3717b2c9f..a8f19d95f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,20 +1604,20 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ ],
-    [ ],
-    [ ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Legend Enel", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Legend Enel Evolved", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kuma", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kuma Evolved", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bartholomew Kuma, Clash of the Great Pirate Era [ __ ]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lucci", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lucci Evolved", "DEX", [ "Fighter", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rob Lucci, Clash of the Great Pirate Era  [Dark Justice]", "DEX", [ "Fighter", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Crocodile", "INT", [ "Striker", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Crocodile Evolved", "INT", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Moria", "STR", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Moria Evolved", "STR", [ "Driven", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6+ Rayleigh", "INT", [ "Slasher", "Fighter" ], "6+", 65, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 9ad067c3b..181d8b1dc 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -407,4 +407,8 @@ window.zombies = {
         type: 'healer',
         amount: 500
     },
+    1616: { // Crocodile
+        type: 'healer',
+        multiplier: 1.5
+    },
 };
diff --git a/damage/js/app.js b/damage/js/app.js
index a8dd26668..b43495264 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -51,10 +51,6 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
             enabled: false,
             value: 0
         },
-        captainAction: {
-            enabled: false,
-            value: [$scope.captainAction1, $scope.captainAction2]
-        }
 
     };
 
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 63cfdb3df..d987c2165 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -716,7 +716,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         enabledSpecials = [ ];
         // deactivate turn counter (will be reactivated if necessary)
         $scope.tdata.turnCounter.enabled = false;
-        $scope.tdata.captainAction.enabled = false;
         // orb map effects
         mapEffect = { };
         if ($scope.data.effect) {
@@ -756,8 +755,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             // activate turn counter if necessary
             if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562))
                 $scope.tdata.turnCounter.enabled = true;
-            if (n < 2 && (id == 1587 || id == 1588))
-                $scope.tdata.captainAction.enabled = true;
         });
         if (conflictWarning) 
             $scope.notify({ type: 'error', text: 'One or more specials you selected cannot be activated due to an active map effect.' });
@@ -861,7 +858,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     };
     
     var getParameters = function(slotNumber, chainPosition) {
-        //console.log($scope.tdata.captainAction.value)
+        //console.log($scope.data.actionleft)
         return {
             unit: team[slotNumber].unit,
             orb: $scope.tdata.team[slotNumber].orb,
@@ -873,11 +870,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             scope: $scope,
             slot: slotNumber,
             turnCounter: $scope.tdata.turnCounter.value,
-            captainAction: $scope.tdata.captainAction.value,
             chainPosition: chainPosition,
             classCount: classCounter(),
             colorCount: colorCounter(),
-            captain: team[1].unit
+            captain: team[1].unit,
+            actions: [ $scope.data.actionleft, $scope.data.actionright ],
         };
     };
 
diff --git a/damage/views/content.html b/damage/views/content.html
index 79167c4b4..9f340f0c5 100644
--- a/damage/views/content.html
+++ b/damage/views/content.html
@@ -6,10 +6,6 @@
     </div>
 
     <turn-counter ng-show="tdata.turnCounter.enabled"></turn-counter>
-    <div id="capact" captainAction="" ng-show="tdata.captainAction.enabled">
-                        <input type="checkbox" name="action" ng-model="captainAction1" ng-change="changeBaseValues()">Friend Caption Action
-                        <input type="checkbox" name="action" ng-model="captainAction2" ng-change="changeBaseValues()">Captain Action
-    </div>
     <hp-bar></hp-bar>
 
     <div id="other">
diff --git a/damage/views/sidebar.html b/damage/views/sidebar.html
index 59e8b375a..58179925c 100644
--- a/damage/views/sidebar.html
+++ b/damage/views/sidebar.html
@@ -20,7 +20,7 @@
         
         <li>
             <div id="heal">
-                <i class="fa fa-circle-o-notch"></i>
+                <i class="fa fa-heart"></i>
                 Heal Socket Level: <input type="number" min="0" max="5" id="healLevel" to-int ng-model="data.healLevel"></input>
             </div>
         </li>
@@ -52,6 +52,13 @@
                 <a>Cotton Candies</a>
             </div>
         </li>
+        
+        <li>
+            <div id="action">
+                <i class="fa fa-check-square"></i>
+                Captain Actions: <br><input type="checkbox" name="friend" value="left" ng-model="data.actionleft">Friend/Guest Captain<br><input type="checkbox" name="captain" value="right" ng-model="data.actionright">Captain 
+            </div>
+        </li>
 
         <li>
             <div id="sliderToggle" status="{{options.slidersEnabled ? 0 : 1}}"

From ff288e5d6175b50ae4bd8ff4f5f3805384441c64 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 26 May 2017 19:56:36 -0400
Subject: [PATCH 1041/1569] Some stuff for my favorite mods

---
 common/data/details.js  | 127 ++++++++++++++++++++++------------------
 common/data/matchers.js |   6 ++
 common/js/directives.js |   3 +
 3 files changed, 78 insertions(+), 58 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 386619d54..f5256e2f5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2749,14 +2749,14 @@ window.details = {
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
+        sailorNotes: "#{rewind : 1}",
     },
     639: {
         special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
+        sailorNotes: "#{rewind : 1}",
     },
     640: {
         special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
@@ -4482,7 +4482,7 @@ window.details = {
         captain: "Boosts ATK of Slasher characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         specialName: "Ties with Ace",
         special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
     },
     950: {
         captain: "Boosts ATK of Fighter and Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
@@ -4720,17 +4720,17 @@ window.details = {
         specialName: "Peeping Mind",
         special: [
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 1 turn. Displays the status of all enemies.",
                 "cooldown": [ 13, 7 ]
             },
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 2 turn. Displays the status of all enemies.",
                 "cooldown": [ 20, 14 ]
             }
         ],
-        specialNotes: "#{stages}",
+        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'<br>#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
+        sailorNotes: "#{rewind : 1}",
     },
     995:{
         captain: "Boosts amount of Beli received by 3x",
@@ -4738,17 +4738,17 @@ window.details = {
         specialName: "Peeping Mind",
         special: [
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 1 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 1 turn. Displays the status of all enemies.",
                 "cooldown": [ 13, 7 ]
             },
             {
-                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 2 turn. Shows Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'",
+                "description": "Reduces Special Cooldown of Cerebral and Fighter specials by 2 turn. Displays the status of all enemies.",
                 "cooldown": [ 20, 14 ]
             }
         ],
-        specialNotes: "#{stages}",
+        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'<br>#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
+        sailorNotes: "#{rewind : 1}",
     },
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
@@ -5098,7 +5098,7 @@ window.details = {
         captain: "Recovers 1,000 HP at the end of each turn",
         special: "Reduces Silence duration by 2 turns",
         specialName: "Knowledge the World is Afraid of",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities"
+        specialNotes: "#{silence}",
     },
     1053: {
         captain: "Boosts RCV of Cerebral characters by 1.5x",
@@ -5793,13 +5793,13 @@ window.details = {
     1160: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Open Sun"
     },
     1161: {
         captain: "Boosts ATK of Free Spirit characters by 2x and their RCV by 1.5x",
         special: "Reduces Bind, Despair, and Silence duration by 3 turns, and recovers 2,000 HP",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Open Sun"
     },
     1162: {//Tesoro
@@ -5949,7 +5949,7 @@ window.details = {
         ],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
+        sailorNotes: "#{rewind : 1}",
     },
     1186: {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
@@ -5966,7 +5966,7 @@ window.details = {
         ],
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn"
+        sailorNotes: "#{rewind : 1}",
     },
     1187: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
@@ -6047,13 +6047,17 @@ window.details = {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
         specialName: "Passionate Look, 'I'm a Bad Guy...'",
-        sailor: "Reduces Silence duration against this unit by 2 turns"
+        specialNotes: "#{silence}",
+        sailor: "Reduces Silence duration against this unit by 2 turns",
+        sailorNotes: "#{silence}",
     },
     1201: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
         specialName: "Passionate Look, 'I'm a Bad Guy...'",
-        sailor: "Reduces Silence duration against this unit by 2 turns"
+        specialNotes: "#{silence}",
+        sailor: "Reduces Silence duration against this unit by 2 turns",
+        sailorNotes: "#{silence}",
     },
     1202: {
         captain: "Boosts ATK of Free Spirit characters by 1.5x",
@@ -6452,7 +6456,7 @@ window.details = {
         special: "Changes adjacent orbs into [INT] orbs. Deals 20x character's ATK in [INT] damage to all enemies.",
         specialName: "Reversed Twin Blades - Surprise Thrust",
         sailor: "Reduces own Silence by 1 turn",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        sailorNotes: "#{silence}",
     },
     1253: {// Coliseum Shura
         captain: "Boosts ATK of [DEX] characters by 2.25x if HP is above 99% at the start of the turn",
@@ -6591,7 +6595,7 @@ window.details = {
         sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Other Side of Fate",
     },
-    1272: {//Van Augur Evo
+    1272: {//Van Augur
         captain: "Reduces cooldown of Shooter specials by 1 turn at the start of the fight. Boosts ATK of Shooter characters by 2.5x.",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces duration of Blindness by 5 turns",
@@ -6604,7 +6608,7 @@ window.details = {
         sailor: "Boosts HP of all characters by 75",
         specialName: "Champion of the Wild Roar",
     },
-    1274: {//Jesus Burgess Evo
+    1274: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.2x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.44x HP",
         special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
@@ -6616,15 +6620,15 @@ window.details = {
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        sailorNotes: "#{silence}",
         specialName: "Handling Hell",
     },
-    1276: {//Shiliew Evo
+    1276: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 2x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
         specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        sailorNotes: "#{silence}",
         specialName: "Handling Hell",
     },
     1277: {//Doc Q
@@ -6633,7 +6637,7 @@ window.details = {
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
     },
-    1278: {//Doc Q Evo
+    1278: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
@@ -6652,7 +6656,7 @@ window.details = {
     1281: {//Marineford Garp
         captain: "Boosts ATK of Fighter characters by 2.25x and reduces damage received by 10%",
         special: "Deals 25x character's ATK in [STR] damage to one enemy that will ignore damage negating abilities and barriers.",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialNotes: "#{ignoreBarrier}",
         specialName: "Fist of Love - Falling Fortress",
     },
     1282: {//Marineford Sengoku
@@ -6667,14 +6671,18 @@ window.details = {
     },
     1284: {//Wild Luffy
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
-        special: "Reduces Bind and Silence duration by 3 turns. Randomizes own orb. (Including [BLOCK] orb)",
+        special: "Reduces Bind and Silence duration by 3 turns. Randomizes non-matching orbs including [BLOCK] orbs",
+        specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this character by 3 turns",
+        sailorNotes: "#{silence}",
         specialName: "Wild Hunt",
     },
     1285: {//Wild Luffy Evolved
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 3.375x instead.",
-        special: "Reduces Bind and Silence duration by 3 turns. Randomizes non-matching orbs. (Including [BLOCK] orb)",
+        special: "Reduces Bind and Silence duration by 3 turns. Randomizes non-matching orbs including [BLOCK] orbs",
+        specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this character by 3 turns",
+        sailorNotes: "#{silence}",
         specialName: "Wild Hunt",
     },
     1286: {//Kid Baby 5
@@ -6894,14 +6902,14 @@ window.details = {
     1317: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialNotes: "#{ignoreBarrier}",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialNotes: "#{ignoreBarrier}",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
@@ -7101,7 +7109,7 @@ window.details = {
     1342: {//Dadan
         captain: "Boosts HP of [PSY] characters by 1.75x",
         special: "Reduces Silence duration by 2 turns",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Rogue Threat",
     },
     1343: {//Porchemy
@@ -7236,9 +7244,9 @@ window.details = {
                 "cooldown": [ 18, 13 ],
             },
         ],
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
+        sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Black Ball - Thundercloud Rod",
     },
     1366: {//Timeskip Nami
@@ -7257,9 +7265,9 @@ window.details = {
                 "cooldown": [ 18, 13 ],
             },
         ],
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities.",
+        sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Black Ball - Thundercloud Rod",
     },
     1367: {//Timeskip Sanji
@@ -7310,14 +7318,14 @@ window.details = {
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
+        sailorNotes: "#{rewind : 2}",
         specialName: "Wild Plan",
     },
     1372: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect and by 3x after the 5th Perfect.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
+        sailorNotes: "#{rewind : 2}",
         specialName: "Wild Plan",
     },
     1373: {//Magellan
@@ -7391,23 +7399,25 @@ window.details = {
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Strawberry Smile",
+        specialNotes: "#{silence}",
     },
     1382: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.75x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
         specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Strawberry Smile",
+        specialNotes: "#{silence}",
     },
     1383: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Angry Extermination of Bugs",
     },
     1384: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2.5x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Angry Extermination of Bugs",
     },
     1385: {//Rebecca
@@ -7696,11 +7706,11 @@ window.details = {
     1427: {//Boo
         captain: "Boosts ATK of QCK characters by 2x",
         special: "Deals 15x character's ATK in QCK damage to one enemy that will ignore damage negating abilities and barriers.",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain",
+        specialNotes: "#{ignoreBarrier}",
         specialName: "Unblockable Eight Fists",
     },
     1428: {//Jean Ango
-        captain: "Boosts amount of Beli received by 1.5x, and gives small chance of duplicating a drop upon completion of the island",
+        captain: "Boosts amount of Beli received by 1.5x, and gives chance of duplicating a drop upon completion of the island",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
@@ -7787,18 +7797,18 @@ window.details = {
     1439: {//Daruma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.2x",
         special: "Reduces Paralysis and Silence duration by 2 turns, cuts the current HP of one enemy by 10%, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        sailorNotes: "#{silence}",
     },
     1440: {//Daruma
         captain: "Reduces cooldown of all specials by 4 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.5x",
         special: "Reduces Paralysis and Silence duration by 2 turns, cuts the current HP of one enemy by 10%, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        sailorNotes: "#{silence}",
     },
     1441: {//Zeo
         captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
@@ -8075,17 +8085,17 @@ window.details = {
     1480: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row",
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{ignoreBarrier}<br>#{silence}",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
+        sailorNotes: "#{rewind : 1}<br>#{silence}",
         specialName: "Stalking Rose Axe",
     },
     1481: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
-        specialNotes: "Damage that ignores damage negating abilities and barriers is similar to 6* Blackbeard's special when he is captain<br>Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{ignoreBarrier}<br>#{silence}",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
+        sailorNotes: "#{rewind : 1}<br>#{silence}",
         specialName: "Stalking Rose Axe",
     },
     1482: {//Madame Shyarly
@@ -8175,7 +8185,7 @@ window.details = {
     1495: {//DEX Fishman Outlaw
         captain: "Boosts ATK of [DEX] characters by 1.5x",
         special: "Reduces Silence duration by 1 turn",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        specialNotes: "#{silence}",
         specialName: "Special Bind Light Recovery",
     },
     1496: {//INT Fishman Outlaw
@@ -8253,7 +8263,7 @@ window.details = {
         special: "Deals 12x character's ATK in INT damage to one enemy and reduces damage received from PSY enemies by 80%.",
         specialName: "Honorable Blade",
         sailor: "Reduces Silence duration against this unit by 2 turns",
-        sailorNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
+        sailorNotes: "#{silence}",
     },
     1510: {//Speed Jiru
         captain: "Boosts ATK of Driven and Striker characters by 2x",
@@ -8480,14 +8490,14 @@ window.details = {
         captain: "Boosts ATK by 2x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
+        sailorNotes: "#{rewind : 1}",
         specialName: "Soft and Gentle Fluffy Kisses",
     },
     1542: {//Elizabeth
         captain: "Boosts RCV and HP by 1.2x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
+        sailorNotes: "#{rewind : 1}",
         specialName: "Soft and Gentle Fluffy Kisses",
     },
     1543: {//6+ Usopp
@@ -8526,6 +8536,7 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Reduces Bind, Despair and Silence duration by 3 turns, and reduces Special Cooldown of all characters by 1 turn",
         specialName: "Mil Fluer: Campo de Flores",
+        specialNotes: "#{silence}",
     },
     1550: {//5+ Franky
         captain: "Boosts ATK of [INT] characters by 2.5x, reduces damage received by 10%",
@@ -8909,29 +8920,29 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? amount for ??? turns",
         specialName: "",
-        sailor: "Adds 2x character's ATK as bonus damage",
+        sailor: "This character gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         sailorNotes: "Similar effect to Raid Sabo",
     },
     1614: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? for ??? turns",
         specialName: "",
-        sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
+        sailor: "This character gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        sailorNotes: "Similar effect to Raid Sabo",
     },
     1615: {//Crocodile
         captain: "Boosts ATK of Strikers by 2x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
         specialName: "",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 2 turns",
+        sailorNotes: "#{rewind : 2}",
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Strikers by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
         specialName: "",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by 1 turn",
+        sailorNotes: "#{rewind : 2}",
     },
     1617: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
diff --git a/common/data/matchers.js b/common/data/matchers.js
index eec75ecfd..af3330564 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -495,5 +495,11 @@ window.matchers = [
         target: 'sailor',
         matcher: /(reduces|removes|resists).+silence/i
     },
+    
+    {
+        name: 'Special Rewind Restorers',
+        target: 'sailor',
+        matcher: /Restores (his|her) own special/i
+    },
 
 ];
diff --git a/common/js/directives.js b/common/js/directives.js
index 4db26e8c7..930f1c93f 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -17,6 +17,9 @@ var notes = {
     specialProportional: "The exact multiplier used to compute the damage is proportional to the " +
         "crew's remaining HP and is higher the #1 the HP is. The multiplier is calculated as: #2.",
     stages: "The special can be used as soon as the first stage is reached.",
+    silence: "This is called 'Special Bind' in-game and refers to effects that prevent you from activating Special Abilities.",
+    rewind: "Some enemies can increase your cooldown by 1/2 turns, this Sailor Ability decreases that by #1 turn.",
+    ignoreBarrier: "Damage that ignores damage negating abilities and barriers is similar to 6* Law's special, but only for this character.",
     zombie: "The protection only works when attacked by one single enemy and will leave the team with at least 1 HP; " +
         "the effect will not work when attacked by multiples enemies at once.",
     colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5/#1)x to QCK."

From 100c387815fd5100b616067cd2c10813ffa3dd41 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 27 May 2017 00:47:42 -0400
Subject: [PATCH 1042/1569] Names and Special Names

---
 common/data/details.js | 20 ++++++++++----------
 common/data/units.js   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f5256e2f5..4379db3be 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8895,65 +8895,65 @@ window.details = {
         captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
-        specialName: "Enel Special",
+        specialName: "Heavy Thunder",
     },
     1610: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
-        specialName: "Enel Special",
+        specialName: "Heavy Thunder",
     },
     1611: {//Kuma
         captain: "Boosts ATK of Shooter characters by 1.75x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
-        specialName: "Kuma Special",
+        specialName: "Paw Paw Fruit: Scatter and Fly Away",
         sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
     1612: {//Kuma
         captain: "Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
-        specialName: "Kuma Special",
+        specialName: "Paw Paw Fruit: Scatter and Fly Away",
         sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
     1613: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? amount for ??? turns",
-        specialName: "",
+        specialName: "4000 Power Level Technique: Tempest Kick",
         sailor: "This character gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         sailorNotes: "Similar effect to Raid Sabo",
     },
     1614: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? for ??? turns",
-        specialName: "",
+        specialName: "4000 Power Level Technique: Tempest Kick",
         sailor: "This character gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         sailorNotes: "Similar effect to Raid Sabo",
     },
     1615: {//Crocodile
         captain: "Boosts ATK of Strikers by 2x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
-        specialName: "",
+        specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Strikers by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
-        specialName: "",
+        specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
     },
     1617: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
         special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
-        specialName: "Moria Special",
+        specialName: "Shadow Asgard: \"Baptism\" from the Royal Shichibukai",
         sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
     },
     1618: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2.5x",
         special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
-        specialName: "Moria Special",
+        specialName: "Shadow Asgard: \"Baptism\" from the Royal Shichibukai",
         sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
     },
     1619: {//6+ Raybae/Rayleigh
diff --git a/common/data/units.js b/common/data/units.js
index a8f19d95f..0bbb93fe1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1608,7 +1608,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Legend Enel", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Legend Enel Evolved", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kami Enel, Clash of the Great Pirate Era [ __ ]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kuma", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bartholomew Kuma, Clash of the Great Pirate Era [ __ ]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lucci", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 8ea1ee3d01cf27adf90cf53cdda1443475854dca Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sat, 27 May 2017 18:29:16 -0700
Subject: [PATCH 1043/1569] fixed some cooldowns

---
 common/data/cooldowns.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f43aeee8a..03da207bb 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1472,16 +1472,16 @@ window.cooldowns = [
     [ 17, 10 ],
     null,//Shirahoshi
     null,//Shirahoshi
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     [ 16, 10 ],
     [ 16, 10 ],
     [ 22, 16 ],
     [ 22, 16 ],
     [ 20, 15 ],
     [ 20, 15 ],
-    15,
-    15,
+    [ 15, 9 ],
+    [ 15, 9 ],
     [ 14, 14 ],
     [ 14, 14 ],
     [ 28, 13 ],
@@ -1572,10 +1572,10 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 21, 16 ],
     [ 21, 16 ],
-    19,
-    19,
-    19,
-    19,
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 19, 13 ],
+    [ 19, 13 ],
     null,
     null,
     [ 20, 13 ],

From 2c201bd9c1d749dff58bdfc1a9bf85e6757df261 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sat, 27 May 2017 22:29:42 -0700
Subject: [PATCH 1044/1569] Fixed Jean Ango's Classes

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 0bbb93fe1..bb6d1ca86 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1426,7 +1426,7 @@ window.units = [
     [ "Don Sai, Happo Navy", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, 392109, 105, 59, 19, 1205, 620, 106, 1],
     [ "Don Sai, Happo Navy's 13th Leader", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, 99, 3000000, 1123, 527, 57, 2192, 1301, 181, 1],
     [ "Boo, Happo Navy", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, 1066998, 305, 159, 29, 1672, 1005, 111, 1],
-    [ "Jean Ango", "DEX", [ "Slasher, Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
+    [ "Jean Ango", "DEX", [ "Slasher" , "Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Mansherry, February's Favorite", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, 1 ],
     [ "Mansherry, March's Courage", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, 1 ],
     [ "Shogun Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, 1550, 736, 102, 1 ],

From fc179fb946d38ca70339dac06d38160e0599409b Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sun, 28 May 2017 09:11:33 -0700
Subject: [PATCH 1045/1569] Fixed Story Chars CD's and Fixed Special Typo

---
 common/data/cooldowns.js | 22 +++++++++++-----------
 common/data/details.js   |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 03da207bb..ad642f80c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1341,16 +1341,16 @@ window.cooldowns = [
     [ 23, 13 ],
     [ 23, 13 ],
     [ 15, 9 ],
-    16,
-    20,
-    18,
-    15,
+    [ 16, 10 ],
+    [ 20, 14 ],
+    [ 18, 13 ],
+    [ 15, 10 ],
     25,
     [ 17, 10 ],
     13,
-    14,
+    [ 14, 8 ],
     20,
-    15,
+    [ 15, 9 ],
     [ 16, 12 ],
     [ 14, 14 ],
     [ 14, 14 ],
@@ -1502,7 +1502,7 @@ window.cooldowns = [
     15,
     16,
     14,
-    19,
+    [ 19, 13 ],
     22,
     22,
     [ 20, 16 ],
@@ -1555,11 +1555,11 @@ window.cooldowns = [
     [ 16, 7 ],
     [ 16, 7 ],
     20,
-    12,
+    [ 12, 6 ],
     20,
-    19,
-    11,
-    23,
+    [ 19, 14 ],
+    [ 11, 5 ],
+    [ 23, 17 ],
     15,
     null,//Fortnight Elizabello
     null,//Fortnight Elizabello
diff --git a/common/data/details.js b/common/data/details.js
index 4379db3be..857343b68 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8232,7 +8232,7 @@ window.details = {
     1504: {//Vander Decken IX
         captain: "Boosts ATK of Driven characters by 2x. After scoring 3 Perfects in a row, boosts ATK of Driven characters by 2.4x instead.",
         special: "Changes the orbs in the middle row into [EMPTY] orbs and deals 20x character's ATK as [DEX] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Inexcapable Pursuit",
+        specialName: "Inescapable Pursuit",
     },
     1505: {//Hody Jones
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.25x if HP is below ???% at the start of the turn",

From fb197ba0a7570952914caa1a4a336510362535fc Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 28 May 2017 14:21:58 -0400
Subject: [PATCH 1046/1569] Working on filters

---
 characters/js/directives.js   |  4 ++--
 characters/js/table.js        |  1 +
 characters/views/sidebar.html |  2 +-
 common/data/details.js        | 26 +++++++++++++-------------
 common/data/drops.js          |  7 +++++++
 common/data/matchers.js       |  4 ++--
 6 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 629506475..df72a89ba 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -394,9 +394,9 @@ directives.addTags = function($stateParams, $rootScope) {
                 // sailor effects
                 if (matcher.target.indexOf('sailor') === 0 && matcher.matcher.test(data[matcher.target]) && !(data[matcher.target] === undefined)) {
                     name = matcher.name;
-                    /*if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
+                    if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
                     else name = name.replace(/s$/,'');
-                    name = name.replace(/iing/,'ying');*/
+                    name = name.replace(/iing/,'ying');
                     element.append($('<span class="tag sailor">' + name + '</div>'));
                 }
                 // specials
diff --git a/characters/js/table.js b/characters/js/table.js
index 5aae0afa8..2aa05c660 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -198,6 +198,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
                 !CharUtils.isClassBooster('special', id, filters.classSpecial)) return false;
         if ($rootScope.filters.custom[MATCHER_IDS['sailor.ClassBoostingSailors']] && filters.classSailor &&
                 !CharUtils.isClassBooster('sailor', id, filters.classSailor)) return false;
+        console.log(MATCHER_IDS);
         return true;
     };
 
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 1c2c450d5..9d8463699 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -107,7 +107,7 @@
 <div class="filter-container">
     <span class="filter-header">Sailor filters</span>
     <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('sailor') == 0"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-orb-options add-special-options
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-special-options
         ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
 </div>
 
diff --git a/common/data/details.js b/common/data/details.js
index 857343b68..b32ab690c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4156,13 +4156,13 @@ window.details = {
     900: {
         captain: "Boosts ATK of Shooter characters by 2x if HP is above 99% at the start of the turn",
         specialName: "Franky Destroy Gun",
-        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes Badly Matching orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies and for Shooter and Free Spirit characters, randomly changes Badly Matching orbs into [G] orbs or Matching orbs",
         specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
     },
     901: {
         captain: "Boosts ATK of Shooter characters by 2.75x if HP is above 99% at the start of the turn",
         specialName: "Franky Destroy Gun",
-        special: "Deals 6 hits of 2,000 fixed damage to random enemies, randomly changes Badly Matching orbs on Shooter and Free Spirit characters into either [G] orbs or matching orbs",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies and for Shooter and Free Spirit characters, randomly changes Badly Matching orbs into [G] orbs or Matching orbs",
         specialNotes: "The orb shuffle only applies to Shooter and Free Spirit characters, other classes are unaffected. #{gOrbs}"
     },
     902: {
@@ -4373,7 +4373,7 @@ window.details = {
         specialName: "Rock Domination Wall",
         special: [
             {
-                "description": "Changes [EMPTY] and Badly Matching orbs into Matching orbs for Driven and Powerhouse characters. Cuts the current HP of all enemies by 10%",
+                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
                 "cooldown": [ 25, 11 ]
             },
             {
@@ -4388,11 +4388,11 @@ window.details = {
         specialName: "Rock Domination Wall",
         special: [
             {
-                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 10%",
+                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
                 "cooldown": [ 25, 11 ]
             },
             {
-                "description": "For all characters, changes [EMPTY] and Bad orbs into Matching. Cuts the current HP of all enemies by 20%",
+                "description": "Changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 20%",
                 "cooldown": [ 31, 17 ]
             }
         ],
@@ -4425,12 +4425,12 @@ window.details = {
     938: {
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Cerebral characters by 1.5x",
         specialName: "Cyclone Burst",
-        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
+        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs"
     },
     939: {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
         specialName: "Cyclone Burst",
-        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Bad orbs into matching"
+        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs"
     },
     940: {
         captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
@@ -4754,11 +4754,11 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2x",
         special: [
             {
-                "description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
+                "description": "For Powerhouse characters, changes Badly Matching orbs into Matching orbs.",
                 "cooldown": [ 11, 5 ]
             },
             {
-                "description": "For all characters, changes Bad orbs into matching orbs.",
+                "description": "For all characters, changes Badly Matching orbs into Matching orbs.",
                 "cooldown": [ 20, 14 ]
             }
         ],
@@ -4770,11 +4770,11 @@ window.details = {
         captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
         special: [
             {
-                "description": "For Powerhouse characters, changes Bad orbs into matching orbs.",
+                "description": "For Powerhouse characters, changes Badly Matching orbs into Matching orbs.",
                 "cooldown": [ 11, 5 ]
             },
             {
-                "description": "For all characters, changes Bad orbs into matching orbs.",
+                "description": "For all characters, changes Badly Matching orbs into Matching orbs.",
                 "cooldown": [ 20, 14 ]
             }
         ],
@@ -5392,12 +5392,12 @@ window.details = {
     },
     1099: {
         captain: "Boosts ATK of Fighter characters by 2x",
-        special: "Changes Bad orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
+        special: "Changes Badly Matching orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
         specialName: "\"To the End of the Clouds\""
     },
     1100: {
         captain: "Boosts ATK of Fighter characters by 2.25x and their RCV by 1.2x",
-        special: "Changes Bad orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
+        special: "Changes Badly Matching orbs into [EMPTY] orbs, amplifies the effect of orbs by 1.5x for 2 turns",
         specialName: "\"To the End of the Clouds\""
     },
     1101: {
diff --git a/common/data/drops.js b/common/data/drops.js
index 861c9872c..b8a65977d 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1523,6 +1523,13 @@ window.drops = {
             "All Difficulties": [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1438, -1440, -893, -1343 ],
         },
         
+        {
+            name: "Blackbeard Pirates!",
+            thumb: null,
+            gamewith: null,
+            "All Difficulties": [ -1404, -1593, -1481, -1442, -1029, -361, -363, -997, -894, -1344 ],
+        },
+        
     ],
 
             
diff --git a/common/data/matchers.js b/common/data/matchers.js
index af3330564..6ee2c809d 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -237,8 +237,8 @@ window.matchers = [
     {
         name: 'Negative to Positive Orb controllers',
         target: 'special',
-        matcher: /(Badly Matching orbs into Matching orbs)/i,
-        include: [ 900, 901, 996, 997, 933 ],
+        matcher: /(Badly Matching orbs into.+Matching orbs)/i,
+        //include: [ 900, 901, 996, 997, 933, 938, 939 ],
     },
 
     {

From 9f257add4658fd4cfdc5e68acfbe9384d0c0b2a1 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 28 May 2017 14:22:48 -0400
Subject: [PATCH 1047/1569] commented out log

---
 characters/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index 2aa05c660..b024e75d4 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -198,7 +198,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
                 !CharUtils.isClassBooster('special', id, filters.classSpecial)) return false;
         if ($rootScope.filters.custom[MATCHER_IDS['sailor.ClassBoostingSailors']] && filters.classSailor &&
                 !CharUtils.isClassBooster('sailor', id, filters.classSailor)) return false;
-        console.log(MATCHER_IDS);
+        //console.log(MATCHER_IDS);
         return true;
     };
 

From 737ebb1a3320e2b5ad6ee185278c0d2ba2a8c32f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 29 May 2017 00:33:48 -0400
Subject: [PATCH 1048/1569] some stuff

---
 common/data/aliases.js |  6 +++---
 common/data/details.js |  2 +-
 common/data/units.js   | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7ba5325a7..f4a36cea2 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -258,8 +258,8 @@ window.aliases = {
     257: ['短筒使いのイゾウ',''],
     258: ['ブラメンコ',''],
     259: ['大槌のブラメンコ',''],
-    260: ['エドワード・ニューゲート','', 'Whitebeard' ],
-    261: ['白ひげ',''],
+    260: ['エドワード・ニューゲート','', 'Whitebeard', 'WB' ],
+    261: ['白ひげ','','Edward Newgate', 'WB'],
     262: ['特訓コビー',''],
     263: ['曹長コビー',''],
     264: ['特訓ヘルメッポ',''],
@@ -1411,7 +1411,7 @@ window.aliases = {
     1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
     1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
     1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
-    1413: ['白ひげ 四皇', '', 'Mega Whitebeard'],
+    1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate'],
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
     1415: ['センゴク 智将', '', ''],
     1416: ['仏のセンゴク 智将', '', ''],
diff --git a/common/data/details.js b/common/data/details.js
index b32ab690c..292b67706 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7634,7 +7634,7 @@ window.details = {
     },
     1413: {//6+ Whitebeard
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
-        special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs.",
+        special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs including [BLOCK] orbs.",
         specialName: "Emperor's Pride",
     },
     1414: {//Shop Sanji
diff --git a/common/data/units.js b/common/data/units.js
index bb6d1ca86..83049d22b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1607,15 +1607,15 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Legend Enel", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kami Enel, Clash of the Great Pirate Era [ __ ]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kuma", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Bartholomew Kuma, Clash of the Great Pirate Era [ __ ]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lucci", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Rob Lucci, Clash of the Great Pirate Era  [Dark Justice]", "DEX", [ "Fighter", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Crocodile", "INT", [ "Striker", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mr.0, Endless Dreams of Arch Enemies", "INT", [ "Striker", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Moria", "STR", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, null, null, null, null, null, null, null, null, null, null, null ],
     ];

From aff8c5f4ba8fe2971218aaaf7932eea02f952407 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 29 May 2017 11:53:22 -0700
Subject: [PATCH 1049/1569] BB pirates FN

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 83049d22b..d9789d39a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,9 +1604,9 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "BlackBeard Pirates Fortnight Character #1", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "BlackBeard Pirates Fortnight Character #2", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "BlackBeard Pirates Fortnight Character #3", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 33d2b86370dffb17a1026fef179ccb4b71400972 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 29 May 2017 13:07:18 -0700
Subject: [PATCH 1050/1569] BB Pirates FN Info

---
 common/data/details.js | 16 ++++++++++++++++
 common/data/units.js   |  6 +++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 292b67706..95e7d06ac 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8890,6 +8890,22 @@ window.details = {
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
         specialName: "Fist of the Demon's Child 'Fire'",
     },
+    1606: {//lafitte
+        captain: "Boosts ATK and RCV of [PSY] characters by 1.75x",
+        special: "Randomly shuffles non-matching orbs on Shooter characters, reduces enemies defense by 50% for 1 turn and delays all enemies for 1 turn",
+        specialName: "Lafitte Special",
+    },
+    1607: {//van augur
+        captain: "Boosts ATK of Shooters by 2x",
+        special: "Deals 10x character's ATK in [DEX] damage to one enemy, locks orbs for 1 turn, and boosts ATK of Shooter characters by 1.5x for 1 turn",
+        specialName: "Van Augur Special",
+    },
+    1608: {//doc q
+        captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
+        special: "For each enemy, has an extremely small chance to instantly defeat that enemy.",
+        specialNotes: "Same as shriyu special but a lower chance",
+        specialName: "Doc Q Special",
+    },
     1609: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
diff --git a/common/data/units.js b/common/data/units.js
index d9789d39a..bbcfd06eb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,9 +1604,9 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ "BlackBeard Pirates Fortnight Character #1", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "BlackBeard Pirates Fortnight Character #2", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "BlackBeard Pirates Fortnight Character #3", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lafitte", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Van Augur", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Doc Q", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From a0cd286f707a0d2e39a12b3ee97cb63a3e978927 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 29 May 2017 14:50:00 -0700
Subject: [PATCH 1051/1569] BB Pirates FN Captains and Specials Working (I
 hope)

---
 common/data/captains.js | 11 +++++++++++
 common/data/specials.js |  6 ++++++
 common/data/units.js    |  6 +++---
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 28d1cf0c4..8a20bcc81 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4730,6 +4730,17 @@ window.captains = {
     1605: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
     },
+    1606: {//BB Pirates FN Lafitte
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+    },
+    1607: {//BB Pirates FN Van Augur
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+    },
+    1608: {//BB Pirates FN Doc Q
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+    },
     1609: {//Enel
         hp: function(p) { return 0.8 },
         
diff --git a/common/data/specials.js b/common/data/specials.js
index c2a43036f..08c46d086 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2626,6 +2626,12 @@ window.specials = {
     1600: {
         orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
+    1606: {
+        def: function(p) { return 0.5 },
+    },
+    1607: {
+        atk: function(p) { return (p.unit.class.has("Shooter")) ? 1.5 : 1; },
+    },
     1613: {
         def: function(p) { return 0.5 },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
diff --git a/common/data/units.js b/common/data/units.js
index bbcfd06eb..bc0f948c2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,9 +1604,9 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ "Lafitte", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Van Augur", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Doc Q", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "BlackBeard Pirates Lafitte", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "BlackBeard Pirates Van Augur", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Blackbeard Pirates Doc Q", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 84cb69189878b66607a995d44246ab8901be612c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 29 May 2017 21:26:04 -0400
Subject: [PATCH 1052/1569] Manboshi's Special

---
 common/data/specials.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 08c46d086..5f2d06392 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2623,6 +2623,9 @@ window.specials = {
     1598: {
         atk: function(p) { return 1.2 },
     },
+    1599: {
+        def: function(p) { return 0.5 },
+    },
     1600: {
         orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },

From 6a5f5910e6b08fd650f9f2d321017c60cd762e32 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 29 May 2017 21:45:45 -0400
Subject: [PATCH 1053/1569] Fixed a bunch of stuff

---
 common/data/aliases.js   |  4 ++--
 common/data/captains.js  |  4 ++--
 common/data/cooldowns.js | 14 ++++++++++++++
 common/data/details.js   | 14 +++++++-------
 common/data/drops.js     |  6 +++---
 common/data/families.js  | 16 ++++++++++++++++
 common/data/specials.js  | 13 +++++++++++++
 common/data/units.js     |  6 +++---
 damage/js/cruncher.js    |  4 +++-
 damage/js/utils.js       |  6 ++++++
 10 files changed, 69 insertions(+), 18 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index f4a36cea2..5c9563e15 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1604,8 +1604,8 @@ window.aliases = {
     1603: ['雷卿, マクガイ', '', 'Coliseum McGuy'],
     1604: ['ルフィの "兄", ポートガス • D • エース', '', '0 Stamina Ace'],
     1605: ['白ひげの "息子", ポートガス • D • エース', '', '0 Stamina Ace'],
-    1606: ['', '', ''],
-    1607: ['', '', ''],
+    1606: ['', '', 'La Feet'],
+    1607: ['', '', 'Vaper', 'Van Ogre'],
     1608: ['', '', ''],
     1609: ['', '', ''],
     1610: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 8a20bcc81..aeabc87ad 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4741,11 +4741,11 @@ window.captains = {
         atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
         rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
-    1609: {//Enel
+    1609: {//Enel TO DO
         hp: function(p) { return 0.8 },
         
     },
-    1610: {//Enel
+    1610: {//Enel TO DO
         hp: function(p) { return 0.8 },
         
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ad642f80c..a2678ce58 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1604,4 +1604,18 @@ window.cooldowns = [
     [ 21, 12 ],
     [ 15, 10 ],
     [ 15, 10 ],
+    15,
+    24,
+    20,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 95e7d06ac..fe32c0c27 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8890,21 +8890,21 @@ window.details = {
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
         specialName: "Fist of the Demon's Child 'Fire'",
     },
-    1606: {//lafitte
+    1606: {//Lafitte
         captain: "Boosts ATK and RCV of [PSY] characters by 1.75x",
         special: "Randomly shuffles non-matching orbs on Shooter characters, reduces enemies defense by 50% for 1 turn and delays all enemies for 1 turn",
-        specialName: "Lafitte Special",
+        specialName: "Deprivation of Self-Consciousness",
     },
-    1607: {//van augur
+    1607: {//Van augur
         captain: "Boosts ATK of Shooters by 2x",
         special: "Deals 10x character's ATK in [DEX] damage to one enemy, locks orbs for 1 turn, and boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Van Augur Special",
+        specialName: "Painless Bullet",
     },
-    1608: {//doc q
+    1608: {//Doc Q
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "For each enemy, has an extremely small chance to instantly defeat that enemy.",
-        specialNotes: "Same as shriyu special but a lower chance",
-        specialName: "Doc Q Special",
+        specialNotes: "Same as Rare Recruit Shriyu special but a lower chance",
+        specialName: "Vile Fruit",
     },
     1609: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
diff --git a/common/data/drops.js b/common/data/drops.js
index b8a65977d..0e9750c0a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1525,9 +1525,9 @@ window.drops = {
         
         {
             name: "Blackbeard Pirates!",
-            thumb: null,
+            thumb: 1606,
             gamewith: null,
-            "All Difficulties": [ -1404, -1593, -1481, -1442, -1029, -361, -363, -997, -894, -1344 ],
+            "All Difficulties": [ 1606, 1607, 1608, -1404, -1593, -1481, -1442, -1029, -361, -363, -997, -894, -1344 ],
         },
         
     ],
@@ -1923,7 +1923,7 @@ window.drops = {
             thumb: 1588,
             gamewith: 56742,
             showManual: true,
-            condition: "High chance of dropping 6* skillbooks. Only Evolvers and Booster characters will drop.",
+            condition: "High chance of dropping 6* skillbooks. Only Evolvers and Booster characters will drop posters.",
             "Black Clad Shanks": [ 301, 101, 96, 79, 90, 348, -530, -316, -910, -995, -1236, -1364, -465, -590, -967, -813, -888 ],
             "Donquixote Doflamingo": [ 304, 104, 88, 99, 82, 93, 351, -870, -312, -645, -838, -876, -880, -1190, -396, -586, -631, -567 ],
             "Trafalgar Law": [ 300, 100, 84, 95, 78, 89, 347, -964, -1045, -219, -308, -675, -991, -1077, -504, -1159, -212, -892 ],
diff --git a/common/data/families.js b/common/data/families.js
index 4a202b1c0..53d256ec9 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1602,4 +1602,20 @@ window.families = [
     "Shiliew",
     "Shiliew",
     "McGuy",
+    "Portgas D. Ace",
+    "Portgas D. Ace",
+    "Laffitte",
+    "Van Augur",
+    "Doc Q",
+    "Eneru",
+    "Eneru",
+    "Bartholomew Kuma",
+    "Bartholomew Kuma",
+    "Rob Lucci",
+    "Rob Lucci",
+    "Crocodile",
+    "Crocodile",
+    "Gecko Moria",
+    "Gecko Moria",
+    "Silvers Rayleigh",
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 5f2d06392..f57d14213 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2614,6 +2614,19 @@ window.specials = {
         },
         type: "class"
     },
+    1593: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1593].turnedOn = true;
+            p.scope.notify({
+                text: 'This does not activate G4 Captain boost, only the "beneficial" Orb Effect, to enable G4\' 4x boost, use the Captain Action checkboxes.',
+                name: '1593warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1593].turnedOn = false;
+        }
+    },
     1594: {
         orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
diff --git a/common/data/units.js b/common/data/units.js
index bc0f948c2..545da88e3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,9 +1604,9 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ "BlackBeard Pirates Lafitte", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "BlackBeard Pirates Van Augur", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Blackbeard Pirates Doc Q", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index d987c2165..09b24c262 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -186,9 +186,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Driven")) orb = (window.specials[1259].turnedOn || window.specials[1260].turnedOn || window.specials[1323].turnedOn || window.specials[1324].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Slasher")) orb = (window.specials[1323].turnedOn || window.specials[1324].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Free Spirit")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))) ? 2 : 1;
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")))) ? 2 : 1;
             if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
diff --git a/damage/js/utils.js b/damage/js/utils.js
index ae8a7dca3..8c81150ab 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -106,6 +106,12 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
+    if(window.specials[1593].turnedOn){
+        if(uclass.has("Fighter") || uclass.has("Free Spirit")){
+            if (orb == 'str') return boostedMultiplier;
+            if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+        }
+    }
     if(window.specials[1259].turnedOn || window.specials[1260].turnedOn){
         if(uclass.has("Driven")){
             if (orb == 'str') return boostedMultiplier;

From b5608a929af804d1699fa352cad7e4197b408261 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 29 May 2017 22:54:57 -0700
Subject: [PATCH 1054/1569] new stuff

---
 common/data/cooldowns.js |  2 +-
 common/data/units.js     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a2678ce58..db5c72164 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1605,8 +1605,8 @@ window.cooldowns = [
     [ 15, 10 ],
     [ 15, 10 ],
     15,
-    24,
     20,
+    24,
     null,
     null,
     null,
diff --git a/common/data/units.js b/common/data/units.js
index 545da88e3..a2b292dde 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,11 +1604,11 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, null, 93, 49, 29, null, null, null, null ],
+    [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, null, 87, 55, 22, null, null, null, null ],
+    [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, null, 51, 59, 31, null, null, null, null ],
+    [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, 3, 70, null, 350, 219, 56, 1256, 756, 236, null ],
+    [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, 5, 99, null, 1189, 681, 170, 2890, 1503, 414, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 2c38a9df8d93f868c349ae7a595d0c31dbfbc5f0 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 30 May 2017 02:55:38 -0400
Subject: [PATCH 1055/1569] IDK why I bothered to do so much for one character

---
 common/data/captains.js  |   4 +-
 common/data/cooldowns.js |   8 +-
 common/data/drops.js     |   2 +-
 common/data/gw.js        |  14 +++
 common/data/specials.js  | 233 +++++++++++++++++++++++++++++++++++----
 common/data/units.js     |   4 +-
 damage/js/cruncher.js    |   3 +
 7 files changed, 237 insertions(+), 31 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index aeabc87ad..4df7c015c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4743,11 +4743,11 @@ window.captains = {
     },
     1609: {//Enel TO DO
         hp: function(p) { return 0.8 },
-        
+        atk: function(p) { return p.actions[p.sourceSlot] ? 3.25 : 2; },
     },
     1610: {//Enel TO DO
         hp: function(p) { return 0.8 },
-        
+        atk: function(p) { return p.actions[p.sourceSlot] ? 3.25 : 2; },
     },
     1611: {
         atk: function(p) {return p.unit.class.has("Shooter") ? 1.75 : 1; },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a2678ce58..692f6fba9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1604,10 +1604,9 @@ window.cooldowns = [
     [ 21, 12 ],
     [ 15, 10 ],
     [ 15, 10 ],
-    15,
-    24,
-    20,
-    null,
+    [ 15, 9 ],
+    [ 20, 14 ],
+    [ 24, 18 ],
     null,
     null,
     null,
@@ -1618,4 +1617,5 @@ window.cooldowns = [
     null,
     null,
     null,
+    [ 19, 14 ],
 ];
diff --git a/common/data/drops.js b/common/data/drops.js
index 0e9750c0a..f8b972002 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1526,7 +1526,7 @@ window.drops = {
         {
             name: "Blackbeard Pirates!",
             thumb: 1606,
-            gamewith: null,
+            gamewith: 57820,
             "All Difficulties": [ 1606, 1607, 1608, -1404, -1593, -1481, -1442, -1029, -361, -363, -997, -894, -1344 ],
         },
         
diff --git a/common/data/gw.js b/common/data/gw.js
index d222a0192..d3492c4f9 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1604,4 +1604,18 @@ window.gw=[
     57474,
     57510,
     57510,
+    57823,
+    57824,
+    57825,
+    57875,
+    57875,
+    57876,
+    57876,
+    57877,
+    57877,
+    57878,
+    57878,
+    57879,
+    57879,
+    7311,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index f57d14213..1345ddbef 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1,4 +1,16 @@
 window.specials = {
+    13: {
+        delay: function(p) { return 1; },
+    },
+    14: {
+        delay: function(p) { return 1; },
+    },
+    15: {
+        delay: function(p) { return 1; },
+    },
+    16: {
+        delay: function(p) { return 1; },
+    },
     18: {
         def: function(p) { return 0.5; }
     },
@@ -20,6 +32,9 @@ window.specials = {
     158: {
         def: function(p) { return 0.5; }
     },
+    204: {
+        delay: function(p) { return 1; },
+    },
     206: {
         def: function(p) { return 0.5; }
     },
@@ -131,6 +146,12 @@ window.specials = {
         atk: function(p) { return 1.2; },
         type: "type"
     },
+    415: {
+        delay: function(p) { return 1; },
+    },
+    416: {
+        delay: function(p) { return 1; },
+    },
     417: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
     },
@@ -186,6 +207,9 @@ window.specials = {
         atk: function(p) { return 1.5; },
         type: "type"
     },
+    460: {
+        delay: function(p) { return 1; },
+    },
     461: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
         type: "class"
@@ -197,6 +221,9 @@ window.specials = {
     465: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
+    466: {
+        delay: function(p) { return 1; },
+    },
     468: {
         rcv: function(p) { return 1.5; }
     },
@@ -227,6 +254,12 @@ window.specials = {
         atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
         type: "type"
     },
+    499: {
+        delay: function(p) { return 1; },
+    },
+    500: {
+        delay: function(p) { return 1; },
+    },
     505: {
         atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
         type: "type"
@@ -302,6 +335,12 @@ window.specials = {
     552: {
         def: function(p) { return 0; }
     },
+    555: {
+        delay: function(p) { return 1; },
+    },
+    556: {
+        delay: function(p) { return 1; },
+    },
     559: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
@@ -309,9 +348,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
     568: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.5; }
     },
     569: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.5; }
     },
     572: {
@@ -415,14 +456,12 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     644: {
-        atk: function(p) { return 1.2; },
+        atk: function(p) { return p.delayed ? 1.2 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     645: {
-        atk: function(p) { return 1.2; },
+        atk: function(p) { return p.delayed ? 1.2 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     648: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
@@ -443,9 +482,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     660: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.5; }
     },
     661: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.5; }
     },
     665: {
@@ -498,6 +539,9 @@ window.specials = {
         rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
         type: "type"
     },
+    686: {
+        delay: function(p) { return 1; },
+    },
     687: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
         type: "class"
@@ -615,10 +659,12 @@ window.specials = {
         atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
         type: "type"
     },
+    766: {
+        delay: function(p) { return 1; },
+    },
     770: {
-        atk: function(p) { return 1.3; },
+        atk: function(p) { return p.delayed ? 1.3 : 1;; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     771: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
@@ -648,6 +694,18 @@ window.specials = {
             });
         }
     },
+    782: {
+        delay: function(p) { return 1; },
+    },
+    783: {
+        delay: function(p) { return 1; },
+    },
+    786: {
+        delay: function(p) { return 1; },
+    },
+    787: {
+        delay: function(p) { return 1; },
+    },
     788: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
         type: "class"
@@ -664,6 +722,12 @@ window.specials = {
         atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
         type: "type"
     },
+    794: {
+        delay: function(p) { return 1; },
+    },
+    795: {
+        delay: function(p) { return 1; },
+    },
     796: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
@@ -707,6 +771,7 @@ window.specials = {
         def: function(p) { return 0.2; }
     },
     813: {
+        delay: function(p) { return 1; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
     },
     822: {
@@ -718,6 +783,7 @@ window.specials = {
         type: "type"
     },
     826: {
+        delay: function(p) { return 1; },
         atk: function(p) { return 0.2; },
         type: "type"
     },
@@ -781,14 +847,14 @@ window.specials = {
         type: "type"
     },
     841: {
-        atk: function(p) { return 1.25; },
+        delay: function(p) { return 1; },
+        atk: function(p) { return p.delayed ? 1.25 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     842: {
-        atk: function(p) { return 1.25; },
+        delay: function(p) { return 1; },
+        atk: function(p) { return p.delayed ? 1.25 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     843: {
         atk: function(p) {
@@ -857,10 +923,12 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     864: {
+        delay: function(p) { return 1; },
         chain: function(p) { return 2.5; },
         chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
     },
     865: {
+        delay: function(p) { return 1; },
         chain: function(p) { return 2.5; },
         chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
     },
@@ -870,6 +938,9 @@ window.specials = {
         },
         type: "class"
     },
+    867: {
+        delay: function(p) { return 1; },
+    },
     869: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0); }
     },
@@ -985,6 +1056,9 @@ window.specials = {
             });
         }
     },
+    904: {
+        delay: function(p) { return 1; },
+    },
     905: {
         atk: function(p) {
             if (!window.specials[905].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
@@ -1017,6 +1091,12 @@ window.specials = {
             });
         }
     },
+    907: {
+        delay: function(p) { return 1; },
+    },
+    908: {
+        delay: function(p) { return 1; },
+    },
     909: {
         atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
@@ -1065,6 +1145,12 @@ window.specials = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
         type: "class"
     },
+    917: {
+        delay: function(p) { return 1; },
+    },
+    918: {
+        delay: function(p) { return 1; },
+    },
     921: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
@@ -1174,10 +1260,19 @@ window.specials = {
     978: {
         chainAddition: function(p){ return 0.5;}
     },
+    984: {
+        delay: function(p) { return 1; },
+    },
     981: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
+    998: {
+        delay: function(p) { return 1; },
+    },
+    999: {
+        delay: function(p) { return 1; },
+    },
     1005: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
@@ -1195,9 +1290,8 @@ window.specials = {
         type: "type"
     },
     1013: {
-        atk: function(p) { return 1.2; },
+        atk: function(p) { return p.delayed ? 1.2 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1015: {
         atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
@@ -1315,6 +1409,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
         type: "class"
     },
+    1076: {
+        delay: function(p) { return 1; },
+    },
+    1077: {
+        delay: function(p) { return 1; },
+    },
     1080: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
@@ -1384,9 +1484,11 @@ window.specials = {
         type: "type"
     },
     1105: {
+        delay: function(p) { return 1; },
         chainAddition: function(p){ return 0.2;}
     },
     1106: {
+        delay: function(p) { return 1; },
         chainAddition: function(p){ return 0.2;}
     },
     1107: {
@@ -1456,6 +1558,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
         type: "class"
     },
+    1142: {
+        delay: function(p) { return 1; },
+    },
+    1143: {
+        delay: function(p) { return 1; },
+    },
     1153: {
         def: function(p) { return 0; },
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1},
@@ -1513,6 +1621,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
         type: "class"
     },
+    1209: {
+        delay: function(p) { return 1; },
+    },
+    1210: {
+        delay: function(p) { return 1; },
+    },
     1211: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
     },
@@ -1569,6 +1683,9 @@ window.specials = {
             window.specials[1222].turnedOn = false;
         }
     },
+    1225: {
+        delay: function(p) { return 1; },
+    },
     1227: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
@@ -1605,6 +1722,12 @@ window.specials = {
     1234: {//Tashigi
         affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
+    1235: {
+        delay: function(p) { return 1; },
+    },
+    1236: {
+        delay: function(p) { return 1; },
+    },
     1237: {
         //TODO
         hit: function(n) { return n > 30 ? 2 : 1; },
@@ -1824,9 +1947,11 @@ window.specials = {
         type: "class"
     },
     1317: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.2; }
     },
     1318: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.2; }
     },
     1319: {
@@ -1838,14 +1963,12 @@ window.specials = {
         type: "class"
     },
     1321: {
-        atk: function(p) { return 1.5; },
+        atk: function(p) { return p.delayed ? 1.5 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1322: {
-        atk: function(p) { return 1.5; },
+        atk: function(p) { return p.delayed ? 1.2 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1323: {
         turnedOn: false,
@@ -1889,6 +2012,12 @@ window.specials = {
             });
         }
     },
+    1340: {
+        delay: function(p) { return 1; },
+    },
+    1341: {
+        delay: function(p) { return 1; },
+    },
     1343: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
         type: "condition"
@@ -1907,6 +2036,7 @@ window.specials = {
         type: "class"
     },
     1351: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.5; }
     },
     1353: {
@@ -1919,9 +2049,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
     },
     1358: {
+        delay: function(p) { return 1; },
         rcv: function(p){ return 1.75; }
     },
     1359: {
+        delay: function(p) { return 1; },
         rcv: function(p){ return 1.75; }
     },
     1361: {
@@ -1938,6 +2070,12 @@ window.specials = {
     1364: {
         orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
+    1365: {
+        delay: function(p) { return 1; },
+    },
+    1366: {
+        delay: function(p) { return 1; },
+    },
     1367:{
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier); },
         onActivation: function(p) {
@@ -1960,6 +2098,12 @@ window.specials = {
             });
         },
     },
+    1373: {
+        delay: function(p) { return 1; },
+    },
+    1374: {
+        delay: function(p) { return 1; },
+    },
     1375: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
@@ -1976,6 +2120,9 @@ window.specials = {
     1380: {
         orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
+    1387: {
+        delay: function(p) { return 1; },
+    },
     1389: {
         orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
@@ -2005,9 +2152,11 @@ window.specials = {
         type: "class"
     },
     1396: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.2; }
     },
     1397: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.2; }
     },
     1400: {
@@ -2064,12 +2213,14 @@ window.specials = {
         type: "type"
     },
     1409: {
+        delay: function(p) { return 1; },
         atk: function(p) {
             return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
         },
         type: "class"
     },
     1410: {
+        delay: function(p) { return 1; },
         atk: function(p) {
             return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
         },
@@ -2132,17 +2283,21 @@ window.specials = {
         atk: function(p) { return 1.5; },
         type: "type"
     },
+    1435: {
+        delay: function(p) { return 1; },
+    },
+    1436: {
+        delay: function(p) { return 1; },
+    },
     1437: {
-        atk: function(p) { return 1.5; },
+        atk: function(p) { return p.delayed ? 1.5 : 1; },
         type: "condition",
         orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1438: {
-        atk: function(p) { return 1.5; },
+        atk: function(p) { return p.delayed ? 1.5 : 1; },
         type: "condition",
         orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1439: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
@@ -2171,10 +2326,14 @@ window.specials = {
         orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
     },
     1445: {
+        delay: function(p) { return 1; },
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         type: "type"
     },
+    1446: {
+        delay: function(p) { return 1; },
+    },
     1447: {
         atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1447].multiplier : 1; },
         type: "class",
@@ -2211,13 +2370,21 @@ window.specials = {
     1467: {
         def: function(p) { return 0; }
     },
+    1468: {
+        delay: function(p) { return 1; },
+    },
+    1469: {
+        delay: function(p) { return 1; },
+    },
     1476: {
+        delay: function(p) { return 1; },
         atk: function(p) {
             return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
         },
         type: "class"
     },
     1477: {
+        delay: function(p) { return 1; },
         atk: function(p) {
             return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
         },
@@ -2338,9 +2505,9 @@ window.specials = {
         type: "type",
     },
     1525: {
-        atk: function(p) { return 1.3; },
+        delay: function(p) { return 1; },
+        atk: function(p) { return p.delayed ? 1.3 : 1; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been delayed."
     },
     1526: {
         atk: function(p) { return p.slot < 2 ? window.specials[1526].multiplier : 1; },
@@ -2389,6 +2556,7 @@ window.specials = {
         }
     },
     1531: {
+        delay: function(p) { return 1; },
         chainAddition: function(p) {return window.specials[1531].multiplier;},
         onActivation: function(p) {
             var n = (window.specials[1531].multiplier == 0.2 ? 1 : 0);
@@ -2400,6 +2568,7 @@ window.specials = {
         }
     },
     1532: {
+        delay: function(p) { return 1; },
         chainAddition: function(p) {return window.specials[1532].multiplier;},
         onActivation: function(p) {
             var n = (window.specials[1532].multiplier == 0.2 ? 1 : 0);
@@ -2432,6 +2601,9 @@ window.specials = {
         chainAddition: function(p){ return 0.5; },
         def: function(p) { return 0; }
     },
+    1543: {
+        delay: function(p) { return 1; },
+    },
     1544: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
         type: "class"
@@ -2463,8 +2635,12 @@ window.specials = {
         type: "class"
     },
     1548: {
+        delay: function(p) { return 1; },
         chainAddition: function(p){ return 0.2;}
     },
+    1551: {
+        delay: function(p) { return 1; },
+    },
     1552: {
         atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
         type: "class"
@@ -2529,6 +2705,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
         type: "class"
     },
+    1574: {
+        delay: function(p) { return 1; },
+    },
+    1575: {
+        delay: function(p) { return 1; },
+    },
     1578: {
         chainAddition: function(p) {return window.specials[1578].multiplier;},
         onActivation: function(p) {
@@ -2642,7 +2824,11 @@ window.specials = {
     1600: {
         orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
     },
+    1603: {
+        delay: function(p) { return 1; },
+    },
     1606: {
+        delay: function(p) { return 1; },
         def: function(p) { return 0.5 },
     },
     1607: {
@@ -2674,4 +2860,7 @@ window.specials = {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
         type: "type"
     },
+    1619: {
+        delay: function(p) { return 1; },
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 545da88e3..427011b15 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1607,8 +1607,8 @@ window.units = [
     [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, 4, 3, 70, 1066998, 350, 219, 56, 1256, 756, 236, null ],
+    [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1189, 681, 170, 2890, 1503, 414, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 09b24c262..0bc2d20f1 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -58,6 +58,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     var cptsWith = { };
     var currentDefense = 0;
     var isDefenseDown = false;
+    var isDelayed = false;
 
     var specialsCombinations = [ ], chainSpecials = [ ];
     var hitModifiers = [ ];
@@ -763,6 +764,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // check if defense is down (required by some captain effects)
         computeActualDefense();
         isDefenseDown = enabledSpecials.some(function(x) { return x !== null && x.hasOwnProperty('def'); });
+        isDelayed = enabledSpecials.some(function(x) { return x !== null && x.hasOwnProperty('delay'); });
         
         enabledEffects = [ ];
         
@@ -867,6 +869,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             maxHP: $scope.numbers.hp,
             percHP: $scope.data.percHP,
             defenseDown: isDefenseDown,
+            delayed: isDelayed,
             data: team[slotNumber],
             tdata: $scope.tdata.team[slotNumber],
             scope: $scope,

From 01b33801da8a8ba509e0812e75fc50b7c434b850 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 30 May 2017 03:29:15 -0400
Subject: [PATCH 1056/1569] Zero CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 692f6fba9..ca1da468c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1439,8 +1439,8 @@ window.cooldowns = [
     [ 21, 15 ],
     [ 22, 15 ],
     [ 22, 15 ],
-    17,
-    17,
+    [ 17, 10 ],
+    [ 17, 10 ],
     [ 20, 15 ],
     [ 20, 15 ],
     [ 17, 13 ],

From f89929086a5c23ceef3c0545b65cfc62630da463 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 30 May 2017 05:37:09 -0400
Subject: [PATCH 1057/1569] Enel Disclaimer

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fe32c0c27..90d8c5133 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8909,14 +8909,14 @@ window.details = {
     1609: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
-        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated",
+        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
         specialName: "Heavy Thunder",
     },
     1610: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
-        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated",
+        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
         specialName: "Heavy Thunder",
     },

From 9946ce8fb85a34ff024db0d6b59ad785b01d9038 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 30 May 2017 05:40:15 -0400
Subject: [PATCH 1058/1569] Ryuma Fix

---
 common/data/specials.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 1345ddbef..bf7ca2c51 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2652,10 +2652,12 @@ window.specials = {
     1554: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
         orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        type: "type",
     },
     1555: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
         orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        type: "type",
     },
     1556: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },

From c61eb44603dba88f9b6520230830a2f0f174de83 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 30 May 2017 09:58:36 -0400
Subject: [PATCH 1059/1569] Cooldowns and Enel

Somehow we still don't have CDs for Water 7 fodder
---
 common/data/cooldowns.js | 28 ++++++++++++++--------------
 common/data/details.js   |  8 ++++----
 common/data/units.js     |  6 +++---
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ca1da468c..a9cfe481b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1053,19 +1053,19 @@ window.cooldowns = [
     [ 14, 8 ],
     [ 13, 13 ],
     [ 13, 13 ],
-    21,
-    21,
+    [ 21, 15 ],
+    [ 21, 15 ],
     [ 17, 12 ],
     [ 17, 12 ],
-    15,
-    15,
+    [ 15, 9 ],
+    [ 15, 9 ],
     [ 10, 5 ],
     [ 21, 15 ],
-    20,
-    28,
-    16,
+    [ 20, 13 ],
+    [ 28, 18 ],
+    [ 16, 8 ],
     13,
-    16,
+    [ 16, 9 ],
     16,
     [ 13, 6 ],
     [ 13, 6 ],
@@ -1144,15 +1144,15 @@ window.cooldowns = [
     [ 24, 12 ],
     [ 22, 12 ],
     [ 22, 12 ],
-    18,
-    15,
-    20,
-    20,
-    15,
+    [ 18, 10 ],
+    [ 20, 11 ],
+    [ 15, 6 ],
+    [ 20, 15 ],
+    [ 15, 6 ],
     [ 25, 18 ],
     19,
     [ 25, 18 ],
-    21,
+    [ 21, 16 ],
     [ 10, 4 ],
     [ 23, 17 ],
     [ 23, 17 ],
diff --git a/common/data/details.js b/common/data/details.js
index 90d8c5133..47075426d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8908,15 +8908,15 @@ window.details = {
     },
     1609: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
-        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
-        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
+        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, [RCV] orb based, or percentage based. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
+        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
         specialName: "Heavy Thunder",
     },
     1610: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
-        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, or percentage based.",
-        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
+        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, [RCV] orb based, or percentage based. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
+        special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
         specialName: "Heavy Thunder",
     },
diff --git a/common/data/units.js b/common/data/units.js
index 427011b15..da7b8f145 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,9 +1604,9 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, null, null, null, null, null, null, null ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, 4, 3, 70, 1066998, 350, 219, 56, 1256, 756, 236, null ],
     [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1189, 681, 170, 2890, 1503, 414, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 5f18db9fbc2e1711a96edfc95230ddb396a761b0 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 30 May 2017 10:02:03 -0400
Subject: [PATCH 1060/1569] Flying Dutchman

---
 common/data/ships.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/data/ships.js b/common/data/ships.js
index ea0b02e2c..e010dec55 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -380,5 +380,14 @@ window.ships = [
         description: 'Boosts ATK by 1.2x.',
         atk: function(p) { return 1.2; },
     },
+    
+    
+    
+    { //31
+        name: "Flying Dutchman",
+        thumb: null,
+        description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x.',
+        atk: function(p) { return 1.5; },
+    },
 
 ];

From 8d2d37499f69ce5b666a8cf6a1875e2dd7d96254 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 30 May 2017 10:02:55 -0400
Subject: [PATCH 1061/1569] Forgot Special

---
 common/data/ships.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index e010dec55..d82152520 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -386,7 +386,7 @@ window.ships = [
     { //31
         name: "Flying Dutchman",
         thumb: null,
-        description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x.',
+        description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
         atk: function(p) { return 1.5; },
     },
 

From 3a8a2e487d7586ba1e42965209aecdf635725ed4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 30 May 2017 19:39:19 -0400
Subject: [PATCH 1062/1569] Fixed some errors with conditionals

---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index bf7ca2c51..dd741af6e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -663,7 +663,7 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     770: {
-        atk: function(p) { return p.delayed ? 1.3 : 1;; },
+        atk: function(p) { return p.delayed ? 1.3 : 1; },
         type: "condition",
     },
     771: {
@@ -1967,7 +1967,7 @@ window.specials = {
         type: "condition",
     },
     1322: {
-        atk: function(p) { return p.delayed ? 1.2 : 1; },
+        atk: function(p) { return p.delayed ? 1.5 : 1; },
         type: "condition",
     },
     1323: {

From 9dde71332e154271c9639dc0b325905905f51953 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 30 May 2017 19:55:41 -0400
Subject: [PATCH 1063/1569] New Ship for Conditionals

---
 common/data/ships.js  |  9 +++++++++
 damage/js/cruncher.js | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index d82152520..819c1f8e0 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -389,5 +389,14 @@ window.ships = [
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
         atk: function(p) { return 1.5; },
     },
+    
+    
+    
+    { //31.2
+        name: "Flying Dutchman - Special ACTIVATED",
+        thumb: null,
+        description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. ACTIVATED Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
+        atk: function(p) { return 1.5; },
+    },
 
 ];
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 0bc2d20f1..843e37a94 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -371,13 +371,17 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     /* Computes the actual defense threshold of the enemy after the specials are factored in.
      * Defense-reducing specials do not stack with each other, so we just use the one that grants the lowest defense.
      */
-    var computeActualDefense = function() {
+    var computeActualDefense = function(shipName) {
         var baseDefense = parseInt($scope.data.defense, 10) || 0;
         currentDefense = baseDefense;
         enabledSpecials.forEach(function(x) {
             if (x === null || !x.hasOwnProperty('def')) return;
             currentDefense = Math.min(currentDefense,baseDefense * x.def());
         });
+        if(shipName=="Flying Dutchman - Special ACTIVATED"){
+            currentDefense = Math.min(currentDefense,baseDefense * .75);
+        }
+        
     };
 
     var getShipBonus = function(type,static,unit,slot) {
@@ -719,6 +723,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         enabledSpecials = [ ];
         // deactivate turn counter (will be reactivated if necessary)
         $scope.tdata.turnCounter.enabled = false;
+        // get ship bonus
+        shipBonus = jQuery.extend({ bonus: window.ships[$scope.data.ship[0]] },{ level: $scope.data.ship[1] });
         // orb map effects
         mapEffect = { };
         if ($scope.data.effect) {
@@ -762,8 +768,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         if (conflictWarning) 
             $scope.notify({ type: 'error', text: 'One or more specials you selected cannot be activated due to an active map effect.' });
         // check if defense is down (required by some captain effects)
-        computeActualDefense();
-        isDefenseDown = enabledSpecials.some(function(x) { return x !== null && x.hasOwnProperty('def'); });
+        computeActualDefense(shipBonus.bonus.name);
+        //console.log(enabledSpecials);
+        isDefenseDown = enabledSpecials.some(function(x) { return (x !== null && x.hasOwnProperty('def')) || (shipBonus.bonus.name == "Flying Dutchman - Special ACTIVATED"); });
         isDelayed = enabledSpecials.some(function(x) { return x !== null && x.hasOwnProperty('delay'); });
         
         enabledEffects = [ ];
@@ -807,8 +814,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         computeSpecialsCombinations();
         $scope.conflictingSpecials = (specialsCombinations.length > 1 || chainSpecials.length > 1 || chainAddition.length > 1 || affinityMultiplier.length > 1);
         $scope.conflictingMultipliers = ( staticMultiplier.length > 1 )
-        // get ship bonus
-        shipBonus = jQuery.extend({ bonus: window.ships[$scope.data.ship[0]] },{ level: $scope.data.ship[1] });
     };
     
     //Returns an Object with a counter of classes in the current Team

From cb9611b40fb496036769dfbbb61bb83a8e9406cb Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 30 May 2017 20:00:42 -0400
Subject: [PATCH 1064/1569] Skypea ship special recognized

---
 common/data/ships.js  | 14 ++++++++++++++
 damage/js/cruncher.js |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 819c1f8e0..9c6329956 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -371,6 +371,20 @@ window.ships = [
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
     
+    { //29.2
+        name: "Karasumaru Ship - Special ACTIVATED",
+        thumb: 'ship_0030_c.png',
+        //description: 'Boosts ATK and HP of Shooter Only characters by 2x and boosts the ATK of all other characters by 1.5x and their HP by 1.02x. Special: Delays all enemies for 2 turns (cooldown: 12 turns).',
+        description: 'Boosts ATK and Shooter characters by 1.2x. ACTIVATED Special: Delays all enemies for 1 turn (cooldown: 16 turns).',
+        /*atk: function(p) {
+            return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.5;
+        },
+        hp: function(p) {
+            return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.02;
+        },*/
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+    },
+    
     
     
     { //30
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 843e37a94..44b1b1a0e 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -771,7 +771,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         computeActualDefense(shipBonus.bonus.name);
         //console.log(enabledSpecials);
         isDefenseDown = enabledSpecials.some(function(x) { return (x !== null && x.hasOwnProperty('def')) || (shipBonus.bonus.name == "Flying Dutchman - Special ACTIVATED"); });
-        isDelayed = enabledSpecials.some(function(x) { return x !== null && x.hasOwnProperty('delay'); });
+        isDelayed = enabledSpecials.some(function(x) { return (x !== null && x.hasOwnProperty('delay')) || (shipBonus.bonus.name == "Karasumaru Ship - Special ACTIVATED"); });
         
         enabledEffects = [ ];
         

From 2bc22995ef29c7bd388da9b2fe0d0e7168826c03 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 31 May 2017 00:41:47 -0400
Subject: [PATCH 1065/1569] Just some stats

---
 common/data/cooldowns.js  | 20 ++++++++++----------
 common/data/details.js    |  8 ++++----
 common/data/evolutions.js |  2 +-
 common/data/specials.js   |  8 ++++----
 common/data/units.js      | 16 ++++++++--------
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a9cfe481b..3ba328c5a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1607,15 +1607,15 @@ window.cooldowns = [
     [ 15, 9 ],
     [ 20, 14 ],
     [ 24, 18 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    [ 21, 16 ],
+    [ 21, 16 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 24, 17 ],
+    [ 24, 17 ],
     [ 19, 14 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 47075426d..a39592ee2 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8934,16 +8934,16 @@ window.details = {
     },
     1613: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.25x",
-        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? amount for ??? turns",
+        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
-        sailor: "This character gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        sailor: "All characters gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         sailorNotes: "Similar effect to Raid Sabo",
     },
     1614: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
-        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by ??? for ??? turns",
+        special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
-        sailor: "This character gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        sailor: "All characters gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
         sailorNotes: "Similar effect to Raid Sabo",
     },
     1615: {//Crocodile
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index bfdc95df1..059a21ffa 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2489,7 +2489,7 @@ window.evolutions = {
     },
     1611: {
         evolution: 1612,
-        evolvers: [ ]
+        evolvers: [ 87, 98, 1180, 303, 103 ]
     },
     1613: {
         evolution: 1614,
diff --git a/common/data/specials.js b/common/data/specials.js
index dd741af6e..c96e28e1f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2838,21 +2838,21 @@ window.specials = {
     },
     1613: {
         def: function(p) { return 0.5 },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     1614: {
         def: function(p) { return 0.5 },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
     },
     1615: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1616: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
     },
     1617: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
diff --git a/common/data/units.js b/common/data/units.js
index da7b8f145..24b5214b2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1609,14 +1609,14 @@ window.units = [
     [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, null, null, null, null, null, null, null ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, 4, 3, 70, 1066998, 350, 219, 56, 1256, 756, 236, null ],
     [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1189, 681, 170, 2890, 1503, 414, null ],
-    [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Rob Lucci, Clash of the Great Pirate Era  [Dark Justice]", "DEX", [ "Fighter", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Mr.0, Endless Dreams of Arch Enemies", "INT", [ "Striker", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 212, 123, 25, null, null, null, null ],
+    [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1323, 489, 69, null, null, null, null ],
+    [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, 4, 3, 50, 392109, 155, 160, 19, null, null, null, null ],
+    [ "Rob Lucci, Clash of the Great Pirate Era  [Dark Justice]", "DEX", [ "Fighter", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1189, 621, 56, 2814, 1490, 177, null ],
+    [ "Mr.0, Endless Dreams of Arch Enemies", "INT", [ "Striker", "Driven" ], 4, 15, 5, 3, 50, 392109, 147, 144, 22, 1201, 604, 109, null ],
+    [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1131, 540, 59, 2760, 1457, 197, null ],
+    [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, null, null, null, null ],
+    [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, null ],
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     

From 1d967438aa7c77eba7533465bb67d104de4e30dc Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 31 May 2017 16:58:40 -0400
Subject: [PATCH 1066/1569] Stats and aliases

---
 common/data/aliases.js    | 16 ++++++++--------
 common/data/details.js    |  1 +
 common/data/evolutions.js |  8 ++++----
 common/data/units.js      | 22 +++++++++++-----------
 4 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 5c9563e15..c3b242087 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1599,14 +1599,14 @@ window.aliases = {
     1598: ['リュウボシ', '', ''],
     1599: ['マンボシ', '', ''],
     1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy'],
-    1601: ['黒ひげ海賊団, シリュウ', '', 'Coliseum Shiryu'],
-    1602: ['黒ひげ海賊団, 雨のシリュウ', '', 'Coliseum Shiryu'],
-    1603: ['雷卿, マクガイ', '', 'Coliseum McGuy'],
-    1604: ['ルフィの "兄", ポートガス • D • エース', '', '0 Stamina Ace'],
-    1605: ['白ひげの "息子", ポートガス • D • エース', '', '0 Stamina Ace'],
-    1606: ['', '', 'La Feet'],
-    1607: ['', '', 'Vaper', 'Van Ogre'],
-    1608: ['', '', ''],
+    1601: ['シリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
+    1602: ['雨のシリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
+    1603: ['雷卿マクガイ', '', 'Coliseum McGuy'],
+    1604: ['ポートガス・D・エース ルフィの“兄”', '', '0 Stamina Ace'],
+    1605: ['ポートガス・D・エース 白ひげの“息子”', '', '0 Stamina Ace'],
+    1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet'],
+    1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre'],
+    1608: ['ドクＱ 黒ひげ海賊団', '', ''],
     1609: ['', '', ''],
     1610: ['', '', ''],
     1611: ['', '', ''],
diff --git a/common/data/details.js b/common/data/details.js
index a39592ee2..b24ad407d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8974,6 +8974,7 @@ window.details = {
     },
     1619: {//6+ Raybae/Rayleigh
         captain: "Boosts chain multiplier by 4x and boosts HP and RCV of all characters by 1.2x",
+        captainNotes: "Stats for Rayleigh are temporary and are estimates for use in the calculator",
         special: "Reduces the duration of Bind, Despair, and Paralysis by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
         specialName: "Netherworld Conqueror",
     },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 059a21ffa..b42e1caf8 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2493,18 +2493,18 @@ window.evolutions = {
     },
     1613: {
         evolution: 1614,
-        evolvers: [ ]
+        evolvers: [ 83, 86, 94, 102, 302 ]
     },
     1615: {
         evolution: 1616,
-        evolvers: [ ]
+        evolvers: [ 118, 82, 88, 266, 304 ]
     },
     1617: {
         evolution: 1618,
-        evolvers: [ ]
+        evolvers: [ 83, 84, 95, 99, 100 ]
     },
     367: {
         evolution: 1619,
-        evolvers: [ ]
+        evolvers: [ 118, 304, 99, 267 ]
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 24b5214b2..39b07d624 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1599,25 +1599,25 @@ window.units = [
     [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, 1 ],
     [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, 1 ],
     [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
-    [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, null ],
-    [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, null ],
-    [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, null, 151, 90, 98, 1760, 1190, 257, null ],
-    [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, null, 50, 30, 10, 950, 500, 150, null ],
-    [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, null, 880, 410, 110, 1850, 1090, 260, null ],
-    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, null, null, null, null, null, null, null ],
-    [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, 3000000, null, null, null, null, null, null, null ],
-    [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, null, null, null, null, null, null, null ],
+    [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, 1 ],
+    [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, 1 ],
+    [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, 3000000, 151, 90, 98, 1760, 1190, 257, 1 ],
+    [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, 261406, 50, 30, 10, 950, 500, 150, 1 ],
+    [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, 2000000, 880, 410, 110, 1850, 1090, 260, 1 ],
+    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, 93, 49, 29, 2044, 949, 323, 1 ],
+    [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, 3000000, 87, 55, 22, 2006, 1050, 280, 1 ],
+    [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, 51, 59, 31, 1502, 1138, 340, 1 ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, 4, 3, 70, 1066998, 350, 219, 56, 1256, 756, 236, null ],
     [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1189, 681, 170, 2890, 1503, 414, null ],
     [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 212, 123, 25, null, null, null, null ],
-    [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1323, 489, 69, null, null, null, null ],
-    [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, 4, 3, 50, 392109, 155, 160, 19, null, null, null, null ],
+    [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1323, 489, 69, 3035, 1300, 220, null ],
+    [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, 4, 3, 50, 392109, 155, 160, 19, 1256, 690, 94, null ],
     [ "Rob Lucci, Clash of the Great Pirate Era  [Dark Justice]", "DEX", [ "Fighter", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1189, 621, 56, 2814, 1490, 177, null ],
     [ "Mr.0, Endless Dreams of Arch Enemies", "INT", [ "Striker", "Driven" ], 4, 15, 5, 3, 50, 392109, 147, 144, 22, 1201, 604, 109, null ],
     [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1131, 540, 59, 2760, 1457, 197, null ],
     [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, null, null, null, null ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, null ],
-    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3000, 1500, 500, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From fc1502585034c9893aa45cbf4f65116d30f2b2b4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 31 May 2017 17:17:24 -0400
Subject: [PATCH 1067/1569] Enel Slider

---
 common/data/captains.js   |  4 ++--
 damage/js/app.js          |  5 +++++
 damage/js/cruncher.js     |  4 ++++
 damage/js/directives.js   | 37 +++++++++++++++++++++++++++++++++++++
 damage/js/images.js       |  8 ++++++++
 damage/views/content.html |  2 ++
 6 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 4df7c015c..7121eff9f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4743,11 +4743,11 @@ window.captains = {
     },
     1609: {//Enel TO DO
         hp: function(p) { return 0.8 },
-        atk: function(p) { return p.actions[p.sourceSlot] ? 3.25 : 2; },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); },
     },
     1610: {//Enel TO DO
         hp: function(p) { return 0.8 },
-        atk: function(p) { return p.actions[p.sourceSlot] ? 3.25 : 2; },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); },
     },
     1611: {
         atk: function(p) {return p.unit.class.has("Shooter") ? 1.75 : 1; },
diff --git a/damage/js/app.js b/damage/js/app.js
index b43495264..58a1bace5 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -51,6 +51,11 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
             enabled: false,
             value: 0
         },
+        
+        healCounter: {
+            enabled: false,
+            value: 0
+        },
 
     };
 
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 44b1b1a0e..5bd4e7067 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -723,6 +723,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         enabledSpecials = [ ];
         // deactivate turn counter (will be reactivated if necessary)
         $scope.tdata.turnCounter.enabled = false;
+        $scope.tdata.healCounter.enabled = false;
         // get ship bonus
         shipBonus = jQuery.extend({ bonus: window.ships[$scope.data.ship[0]] },{ level: $scope.data.ship[1] });
         // orb map effects
@@ -764,6 +765,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             // activate turn counter if necessary
             if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562))
                 $scope.tdata.turnCounter.enabled = true;
+            if (n < 2 && (id == 1609 || id == 1610))
+                $scope.tdata.healCounter.enabled = true;
         });
         if (conflictWarning) 
             $scope.notify({ type: 'error', text: 'One or more specials you selected cannot be activated due to an active map effect.' });
@@ -880,6 +883,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             scope: $scope,
             slot: slotNumber,
             turnCounter: $scope.tdata.turnCounter.value,
+            healCounter: $scope.tdata.healCounter.value,
             chainPosition: chainPosition,
             classCount: classCounter(),
             colorCount: colorCounter(),
diff --git a/damage/js/directives.js b/damage/js/directives.js
index 80d0d54a1..58866fa67 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -485,6 +485,43 @@ directives.turnCounter = function() {
     };
 };
     
+directives.healCounter = function() {
+    return {
+        retrict: 'E',
+        replace: true,
+        template: '<div id="heals"><div id="healSlider"></div>' +
+            '<div id="healLabel">{{currentHeals}} {{currentHeals == 1 ? "Health Point" : "Health Points"}} recovered in the last turn</div></div>',
+        link: function(scope, element, attrs) {
+
+            scope.currentHeals = 0;
+
+            var slider = element.find('#healSlider')[0];
+            var sliderSettings = {
+                start: [ scope.currentTurns ],
+                range: { min: [ 0 ], max: [ 10000 ] },
+                step: 10,
+                connect: 'lower'
+            };
+            
+            var createSlider = function() {
+                if (slider.noUiSlider) slider.noUiSlider.destroy();
+                noUiSlider.create(slider, sliderSettings);
+                slider.noUiSlider.on('change', function(_,__,value) { update('change', value); });
+                slider.noUiSlider.on('slide', function(_,__,value) { update('slide', value); });
+            };
+
+            var update = function(event,value) {
+                scope.currentHeals = parseInt(value, 10);
+                if (event == 'change') scope.tdata.healCounter.value = scope.currentHeals;
+                scope.$apply();
+            };
+
+            createSlider();
+
+        }
+    };
+};
+    
 directives.levelLabel = function($timeout) {
     return {
         restrict: 'E',
diff --git a/damage/js/images.js b/damage/js/images.js
index 50f7a4ee8..26b769777 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -157,6 +157,14 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
         baseY += 25;
     }
 
+    // heal counter
+    if ($scope.tdata.healCounter.enabled) {
+        awesome(context, { text: 'f162', x: baseX + 8, y: baseY + 20, align: 'center' });
+        var turns = $scope.tdata.healCounter.value;
+        type(context, { text: turns + (turns == 1 ? ' Health Point' : ' Health Points') + ' recovered in the last turn', x: baseX + 25, y: baseY + 20 });
+        baseY += 25;
+    }
+
     // specials
     awesome(context, { text: 'f0e7', x: baseX + 8, y: baseY + 20, align: 'center' });
     type(context, { text: 'Active specials:', x: baseX + 25, y: baseY + 20 });
diff --git a/damage/views/content.html b/damage/views/content.html
index 9f340f0c5..a9ea11a4c 100644
--- a/damage/views/content.html
+++ b/damage/views/content.html
@@ -6,6 +6,8 @@
     </div>
 
     <turn-counter ng-show="tdata.turnCounter.enabled"></turn-counter>
+    <heal-counter ng-show="tdata.healCounter.enabled"></heal-counter>
+    
     <hp-bar></hp-bar>
 
     <div id="other">

From 61e5276183e48cfdac0ef88cd7468ff249aa9a64 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 31 May 2017 17:47:03 -0400
Subject: [PATCH 1068/1569] Enel Details

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index b24ad407d..dfed8bebd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8908,14 +8908,14 @@ window.details = {
     },
     1609: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
-        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, [RCV] orb based, or percentage based. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
+        captainNotes: "The range of ATK boost is from 2x to 3.25x. The exact boost is calculated as 2 + <HP recovered in the previous turn> * 0.000125 and maxes at 10k HP healed. This ignores your max HP, so it doesn't stop counting if you over-heal.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
         specialName: "Heavy Thunder",
     },
     1610: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
-        captainNotes: "The range of ATK boost is from 2x to 3.25x and is not confirmed on how it is calculated. It could be value based, [RCV] orb based, or percentage based. In the Calculator, Enel will use Captain Action to toggle between his 2x and 3.25x boosts.",
+        captainNotes: "The range of ATK boost is from 2x to 3.25x. The exact boost is calculated as 2 + <HP recovered in the previous turn> * 0.000125 and maxes at 10k HP healed. This ignores your max HP, so it doesn't stop counting if you over-heal.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
         specialName: "Heavy Thunder",

From 84dcc2c18259562ec2d50b108aae19cd0d0e2233 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 1 Jun 2017 00:01:17 -0400
Subject: [PATCH 1069/1569] Stats on Official\

---
 common/data/aliases.js | 20 ++++++++++----------
 common/data/units.js   | 22 +++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c3b242087..2e7f17128 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1607,16 +1607,16 @@ window.aliases = {
     1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet'],
     1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre'],
     1608: ['ドクＱ 黒ひげ海賊団', '', ''],
-    1609: ['', '', ''],
-    1610: ['', '', ''],
-    1611: ['', '', ''],
-    1612: ['', '', ''],
-    1613: ['', '', ''],
-    1614: ['', '', ''],
-    1615: ['', '', ''],
-    1616: ['', '', ''],
-    1617: ['', '', ''],
-    1618: ['', '', ''],
+    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', ''],
+    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', ''],
+    1611: ['バーソロミュー・くま 終わらぬ夢の宿敵', '', ''],
+    1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
+    1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
+    1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', ''],
+    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile'],
+    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile'],
+    1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
+    1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
     1619: ['', '', 'Mega Rayleigh', '6+ Rayleigh'],
 };
 
diff --git a/common/data/units.js b/common/data/units.js
index 39b07d624..b22818a59 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1607,17 +1607,17 @@ window.units = [
     [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, 93, 49, 29, 2044, 949, 323, 1 ],
     [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, 3000000, 87, 55, 22, 2006, 1050, 280, 1 ],
     [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, 51, 59, 31, 1502, 1138, 340, 1 ],
-    [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, 4, 3, 70, 1066998, 350, 219, 56, 1256, 756, 236, null ],
-    [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1189, 681, 170, 2890, 1503, 414, null ],
-    [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 212, 123, 25, null, null, null, null ],
-    [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1323, 489, 69, 3035, 1300, 220, null ],
-    [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, 4, 3, 50, 392109, 155, 160, 19, 1256, 690, 94, null ],
-    [ "Rob Lucci, Clash of the Great Pirate Era  [Dark Justice]", "DEX", [ "Fighter", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1189, 621, 56, 2814, 1490, 177, null ],
-    [ "Mr.0, Endless Dreams of Arch Enemies", "INT", [ "Striker", "Driven" ], 4, 15, 5, 3, 50, 392109, 147, 144, 22, 1201, 604, 109, null ],
-    [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1131, 540, 59, 2760, 1457, 197, null ],
-    [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, null, null, null, null ],
-    [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, null ],
-    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3000, 1500, 500, null ],
+    [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, 4, 3, 70, 1066998, 350, 219, 56, 1256, 756, 236, 1 ],
+    [ "Kami Enel, Clash of the Great Pirate Era  [Fairy Vearth]", "QCK", [ "Shooter", "Striker" ], 6, 55, 4, 5, 99, 5000000, 1189, 681, 170, 2890, 1503, 414, 1 ],
+    [ "Bartholomew Kuma, Endless Dreams of Arch Enemies", "PSY", [ "Shooter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 212, 123, 25, 1400, 554, 114, 1 ],
+    [ "Bartholomew Kuma, Clash of the Great Pirate Era [Crew Obliterator]", "PSY", [ "Shooter", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1323, 489, 69, 3035, 1300, 220, 1 ],
+    [ "Rob Lucci, Endless Dreams of Arch Enemies", "DEX", [ "Fighter", "Slasher" ], 4, 15, 4, 3, 50, 392109, 155, 160, 19, 1256, 690, 94, 1 ],
+    [ "Rob Lucci, Clash of the Great Pirate Era  [Dark Justice]", "DEX", [ "Fighter", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1189, 621, 56, 2814, 1490, 177, 1 ],
+    [ "Mr.0, Endless Dreams of Arch Enemies", "INT", [ "Striker", "Driven" ], 4, 15, 5, 3, 50, 392109, 147, 144, 22, 1201, 604, 109, 1 ],
+    [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1131, 540, 59, 2760, 1457, 197, 1 ],
+    [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, 1390, 699, 0, 1 ],
+    [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, 1 ],
+    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 12cbc77b5adb24d4d73cac12b5a1cf0324fefee7 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 1 Jun 2017 03:28:19 -0400
Subject: [PATCH 1070/1569] Evo mats

---
 common/data/evolutions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b42e1caf8..ec1c55052 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2285,7 +2285,7 @@ window.evolutions = {
     },
     1478: {
         evolution: 1479,
-        evolvers: [ 83, 85, 94, 131, 301 ]
+        evolvers: [ 83, 85, 94, 101, 301 ]
     },
     1480: {
         evolution: 1481,

From cd2756593528c24771a5a139e7956662c00216d1 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Thu, 1 Jun 2017 12:28:42 -0700
Subject: [PATCH 1071/1569] Fixed RR Moria's Evo Unit

---
 common/data/evolutions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b42e1caf8..125289e20 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2501,7 +2501,7 @@ window.evolutions = {
     },
     1617: {
         evolution: 1618,
-        evolvers: [ 83, 84, 95, 99, 100 ]
+        evolvers: [ 83, 84, 95, 1180, 100 ]
     },
     367: {
         evolution: 1619,

From 132bae3b38097b498103828429d30021dcc4cda6 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Thu, 1 Jun 2017 20:15:32 -0400
Subject: [PATCH 1072/1569] Log Ace and fix for Caribou Link

---
 characters/js/directives.js |  8 +++++++-
 common/data/aliases.js      |  2 ++
 common/data/captains.js     |  6 ++++++
 common/data/cooldowns.js    |  2 ++
 common/data/details.js      | 12 +++++++++++-
 common/data/evolutions.js   |  8 ++++++--
 common/data/families.js     |  2 ++
 common/data/flags.js        |  2 ++
 common/data/specials.js     |  6 ++++++
 common/data/units.js        |  2 ++
 mats/views/popover.html     |  3 +++
 11 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index df72a89ba..bec797592 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -427,8 +427,14 @@ directives.addLinks = function($stateParams) {
                 ul.append($('<li><a href="' + link + '" target="_blank">Official Guide (English)</a></li>'));
             }
             if (!incomplete) {
-                ul.append($('<li><a href="http://onepiece-treasurecruise.com/c-' + id + '" target="_blank">' +
+                if (id == 1478){
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/カリブー-カリブー海賊団船長/" target="_blank">' +
                         'Official Guide (Japanese)</a></li>'));
+                }
+                else{
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/c-' + id + '" target="_blank">' +
+                        'Official Guide (Japanese)</a></li>'));
+                }
             }
             if (gw[id-1] != null) {
                 ul.append($('<li><a href="http://xn--pck6bvfc.gamewith.jp/article/show/' + gw[id-1] + '" target="_blank">' +
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2e7f17128..9d14e10e6 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1618,6 +1618,8 @@ window.aliases = {
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
     1619: ['', '', 'Mega Rayleigh', '6+ Rayleigh'],
+    1620: ['', '', 'Log Kid'],
+    1621: ['', '', 'Log Kid'],
 };
 
 //  xxxx: ['', '', ''],
\ No newline at end of file
diff --git a/common/data/captains.js b/common/data/captains.js
index 7121eff9f..a56fd6072 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4781,4 +4781,10 @@ window.captains = {
         hp: function(p) { return 1.2 },
         rcv: function(p) { return 1.2 },
     },
+    1620: {
+        atk: function(p) { return p.unit.class.has("Striker") && p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    1621: {
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3ba328c5a..c9dee7e8a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1618,4 +1618,6 @@ window.cooldowns = [
     [ 24, 17 ],
     [ 24, 17 ],
     [ 19, 14 ],
+    17,
+    17,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index dfed8bebd..04c73201a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8765,7 +8765,7 @@ window.details = {
         specialName: "Admiral Hug",
     },
     1584: {//Coliseum Orlumbus
-        captain: "Boosts ATK of Striker characters by 3x if HP is below ??% at the start of the turn, by 2.5x otherwise",
+        captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
         specialName: "Admiral Hug",
     },
@@ -8978,4 +8978,14 @@ window.details = {
         special: "Reduces the duration of Bind, Despair, and Paralysis by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
         specialName: "Netherworld Conqueror",
     },
+    1620: {//Log Kid
+        captain: "Boosts ATK of Strikers characters by 2.5x if HP is below 30% at the start of the turn",
+        special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
+        specialName: "Double Steel Magnetic Arm",
+    },
+    1621: {//Log Kid
+        captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
+        special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
+        specialName: "Double Steel Magnetic Arm",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 63dde4e14..958278deb 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2165,7 +2165,7 @@ window.evolutions = {
     },
     261: {
         evolution: 1413,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 300, 267 ]
     },
     1415: {
         evolution: 1416,
@@ -2485,7 +2485,7 @@ window.evolutions = {
     },
     1609: {
         evolution: 1610,
-        evolvers: [ ]
+        evolvers: [ 118, 266, 96, 301, 267 ]
     },
     1611: {
         evolution: 1612,
@@ -2507,4 +2507,8 @@ window.evolutions = {
         evolution: 1619,
         evolvers: [ 118, 304, 99, 267 ]
     },
+    1620: {
+        evolution: 1621,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 53d256ec9..c33b040d9 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1618,4 +1618,6 @@ window.families = [
     "Gecko Moria",
     "Gecko Moria",
     "Silvers Rayleigh",
+    "Eustass Kid",
+    "Eustass Kid",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 2e8e6dac0..70b325118 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1400,4 +1400,6 @@ window.flags = {
     1617: { rr: 1, rro: 1 },
     1618: { rr: 1, rro: 1 },
     1619: { rr: 1, rro: 1 },
+    1620: { rr: 1, rro: 1, lrr: 1 },
+    1621: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index c96e28e1f..ff0ef206d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2865,4 +2865,10 @@ window.specials = {
     1619: {
         delay: function(p) { return 1; },
     },
+    1620: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+    },
+    1621: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index b22818a59..66e7e1ec0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1618,6 +1618,8 @@ window.units = [
     [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, 1390, 699, 0, 1 ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, 1 ],
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, null ],
+    [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/mats/views/popover.html b/mats/views/popover.html
index e82d63999..cdd9a36fe 100644
--- a/mats/views/popover.html
+++ b/mats/views/popover.html
@@ -20,6 +20,9 @@
             <td ng-repeat="uid in range(95,100)">
                 <div class="slot micro" ng-click="quickPick(uid)" decorate-slot uid="uid"></div>
             </td>
+            <td>
+                <div class="slot micro" ng-click="quickPick(1180)" decorate-slot uid="1180"></div>
+            </td>
         </tr>
         <tr>
             <td ng-repeat="uid in range(100,105)">

From 2415dedc2856837037c8c910f503757c7cb89d35 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Fri, 2 Jun 2017 01:35:21 -0400
Subject: [PATCH 1073/1569] Kid

not Ace
---
 common/data/cooldowns.js | 4 ++--
 common/data/units.js     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c9dee7e8a..94e57a88d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1618,6 +1618,6 @@ window.cooldowns = [
     [ 24, 17 ],
     [ 24, 17 ],
     [ 19, 14 ],
-    17,
-    17,
+    [ 17, 13 ],
+    [ 17, 13 ],
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 66e7e1ec0..75329adc8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1618,8 +1618,8 @@ window.units = [
     [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, 1390, 699, 0, 1 ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, 1 ],
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, null ],
-    [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, null, 3, 70, null, null, null, null, null, null, null, null ],
+    [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, null, 4, 99, null, null, null, null, 2795, 1324, 287, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From a4c0ecc463af07f2f63f64d5c696c2f8c2245684 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Sat, 3 Jun 2017 00:16:13 -0400
Subject: [PATCH 1074/1569] Drops for Story Mode Event

Thank you Kinnikufan
---
 common/data/drops.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index f8b972002..9b2c61ed6 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1913,8 +1913,15 @@ window.drops = {
         {
             name: 'The Flashback Before the Reunion! Fight all your Enemies!',
             thumb: 1353,
-            condition: "The fight gets more difficult every time you complete it until it gets to 40 stamina.",
-            "Final Stage": [ 37, 38, 53, 55, 43, 36, 45, 57, 65, 203, 205, 383, 395, 397, 399, 401, 464, 465, 541, 545, 630, 632, 728, 730, 815, 889, 893, 973, 1055, 1057, 1158, 1156, 1227, 1228, 1280, 1283, 1353],
+            condition: "The fight gets more difficult every time you complete it until it gets to 40 stamina. You an only beat the first 7 stages once, but you can challenge the 8th stage multiple times and it has randomly selected stages.",
+            "1st Stage": [ 27, 29, 35, 36, 37, 38, 43, 35, 53, 55, 57, 61, 62, 63, 65 ],
+            "2nd Stage": [ 71, 211, 233, 235, 199, 201, 203, 205, 395, 397, 207, 399, 401, 383 ],
+            "3rd Stage": [ 430, 432, 463, 467, 542, 464, 465, 541, 545 ],
+            "4th Stage": [ 630, 632, 706, 728, 730, 732, 734, 738 ],
+            "5th Stage": [ 813, 891, 892, 889, 893, 815, 425, 387 ],
+            "6th Stage": [ 963, 966, 967, 973, 1059, 1055, 1057, 1156, 1158 ],
+            "7th Stage": [ 1224, 1223, 1225, 1226, 1227, 1282, 1281, 1280, 1228, 1283 ],
+            "8th Stage": [ 37, 38, 53, 55, 43, 36, 45, 57, 65, 203, 205, 383, 395, 397, 399, 401, 464, 465, 541, 545, 630, 632, 728, 730, 815, 889, 893, 973, 1055, 1057, 1158, 1156, 1227, 1228, 1280, 1283, 1353 ],
             "Evolvers and Boosters": [ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 115, 116, 117, 118, 266, 300, 301, 302, 303, 304, 1180, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 189, 190, 191, 192, 193, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351 ]
         },
         

From 4d467b9f8fd09ac65a43a4aeaab3801409b60e29 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Sun, 4 Jun 2017 01:05:53 -0400
Subject: [PATCH 1075/1569] Log Kid

---
 common/data/gw.js       | 2 ++
 common/data/specials.js | 2 ++
 common/data/units.js    | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index d3492c4f9..625aecf0c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1618,4 +1618,6 @@ window.gw=[
     57879,
     57879,
     7311,
+    58061,
+    58061,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index ff0ef206d..3b8cfd847 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2867,8 +2867,10 @@ window.specials = {
     },
     1620: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        type: "class",
     },
     1621: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        type: "class",
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 75329adc8..ade809665 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1618,8 +1618,8 @@ window.units = [
     [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, 1390, 699, 0, 1 ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, 1 ],
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, null ],
-    [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, null, 3, 70, null, null, null, null, null, null, null, null ],
-    [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, null, 4, 99, null, null, null, null, 2795, 1324, 287, null ],
+    [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, null, null, null, null, 1424, 690, 151, null ],
+    [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 9a468e238e6154054f36a09bb528c65d9d81d57b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 6 Jun 2017 03:59:54 -0400
Subject: [PATCH 1076/1569] Some shit

---
 common/data/drops.js | 2 ++
 common/data/flags.js | 4 ++--
 common/data/ships.js | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9b2c61ed6..6c9513984 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1629,6 +1629,7 @@ window.drops = {
             thumb: 603,
             global: true,
             gamewith: 13682,
+            condition: "Take 300 damage per character in Environmental Lightning Damage",
             Ultimate: [ 85, 111, 118, 301, 602 ],
             Master: [ 85, 111, 118, 602 ] ,
             Expert: [ 111, 118, 602 ]
@@ -1656,6 +1657,7 @@ window.drops = {
             name: 'Clash!! Nightmare Luffy',
             thumb: 795,
             gamewith: 18565,
+            condition: "Take 10% MAX Health in Environmental Damage",
             Master: [ 794 ],
             Expert: [ 794 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index 70b325118..cae88976b 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -743,7 +743,7 @@ window.flags = {
     743: { global: 1 },
     744: { rr: 1, rro: 1, lrr: 1 },
     745: { rr: 1, rro: 1, lrr: 1 },
-    746: { promo: 1 },
+    746: { promo: 1, shop: 1 },
     747: { rr: 1, rro: 1, global: 1 },
     748: { rr: 1, rro: 1, global: 1 },
     749: { rr: 1, rro: 1, global: 1 },
@@ -1008,7 +1008,7 @@ window.flags = {
     1019: { global: 1 },
     1020: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1021: { rr: 1, rro: 1, lrr: 1, global: 1 },
-    1022: { promo: 1, global: 1 },
+    1022: { special: 1, global: 1, shop: 1 },
     1024: { rr: 1, rro: 1, global: 1 },
     1025: { rr: 1, rro: 1, global: 1 },
     1026: { rr: 1, rro: 1, global: 1 },
diff --git a/common/data/ships.js b/common/data/ships.js
index 9c6329956..825711568 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -401,7 +401,7 @@ window.ships = [
         name: "Flying Dutchman",
         thumb: null,
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
-        atk: function(p) { return 1.5; },
+        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
     },
     
     
@@ -410,7 +410,7 @@ window.ships = [
         name: "Flying Dutchman - Special ACTIVATED",
         thumb: null,
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. ACTIVATED Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
-        atk: function(p) { return 1.5; },
+        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
     },
 
 ];

From 1207aed401bd1efc60e5a39fe2a79f8796c746cd Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 6 Jun 2017 04:02:57 -0400
Subject: [PATCH 1077/1569] Typos

---
 common/data/drops.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 6c9513984..c61ba8dcd 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1629,7 +1629,7 @@ window.drops = {
             thumb: 603,
             global: true,
             gamewith: 13682,
-            condition: "Take 300 damage per character in Environmental Lightning Damage",
+            condition: "Take 300 damage per character in Environmental Lightning Damage every 3 turns",
             Ultimate: [ 85, 111, 118, 301, 602 ],
             Master: [ 85, 111, 118, 602 ] ,
             Expert: [ 111, 118, 602 ]
@@ -1657,7 +1657,7 @@ window.drops = {
             name: 'Clash!! Nightmare Luffy',
             thumb: 795,
             gamewith: 18565,
-            condition: "Take 10% MAX Health in Environmental Damage",
+            condition: "Take 10% current Health in Environmental Damage every 2 turns",
             Master: [ 794 ],
             Expert: [ 794 ]
         },

From da3efe11c1cf68493eafcf8e4eedb37fd185dfaf Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Tue, 6 Jun 2017 12:37:11 -0700
Subject: [PATCH 1078/1569] Fixed potential Wild Sanji Bug

fixed it based SOLELY on the DB's wording of his captain.  i may be
wrong but that's why it's only a pull request
---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a56fd6072..154858b5b 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4240,10 +4240,10 @@ window.captains = {
     },
     1485: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.25 : 1.5;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.25; },
+        hp: function(p) { return 1.2; },
     },
     1486: {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.5 : 1); },

From 3b986420c8f669e0db1b476cdcb40f560e8f4f84 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 6 Jun 2017 16:27:36 -0400
Subject: [PATCH 1079/1569] Scroll bar

---
 common/data/captains.js | 1 +
 damage/css/main.css     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index 154858b5b..8ba02290b 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4244,6 +4244,7 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; },
     },
     1486: {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.5 : 1); },
diff --git a/damage/css/main.css b/damage/css/main.css
index a9298dded..2f0dc906f 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -473,6 +473,8 @@ body, html {
     height: 100%;
     transition: left .1s linear;
     margin-bottom: 0;
+    overflow-y: scroll;
+    overflow-x: hidden;
 }
 
 #menu.open {

From 2ae2fb887b6330b2fe762e93d706be0c12b0c588 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 6 Jun 2017 16:37:26 -0400
Subject: [PATCH 1080/1569] Heal Slider customization

---
 damage/css/main.css | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/damage/css/main.css b/damage/css/main.css
index 2f0dc906f..ea08a2366 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -331,13 +331,13 @@ body, html {
  * BUTTONS & HP BAR *
  ********************/
 
-#hpSlider, #turnSlider {
+#hpSlider, #turnSlider, #healSlider {
     width: 350px;
     height: 12px;
     display: inline-block;
 }
 
-#turnSlider {
+#turnSlider, #healSlider {
     width: 300px;
 }
 
@@ -345,6 +345,10 @@ body, html {
     background: orchid;
 }
 
+#heals > .noUi-connect {
+    background: green;
+}
+
 .noUi-handle {
     width: 24px !important;
     height: 18px !important;

From f5e8fa33929dbac5b1964a22f44b62042fe148a6 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 15:33:22 +0200
Subject: [PATCH 1081/1569] Update utils.js

---
 common/js/utils.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 1a6487c26..6a2331563 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -71,9 +71,17 @@
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
-        if (id == '0742')
-            return 'http://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
-        return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
+        if (utils.imageExists('http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'))
+            return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
+        else
+            return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
+    };
+  
+    utils.imageExists = function(image_url){
+        var http = new XMLHttpRequest();
+        http.open('HEAD', image_url, false);
+        http.send();
+        return http.status != 404;
     };
 
     utils.getBigThumbnailUrl = function (n) {

From 53218928c952b27bb9701ee2a3015c875c6885bf Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 15:44:18 +0200
Subject: [PATCH 1082/1569] Update utils.js

---
 common/js/utils.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/js/utils.js b/common/js/utils.js
index 6a2331563..8f8855339 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -71,6 +71,7 @@
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
+        console.log(utils.imageExists('http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'));
         if (utils.imageExists('http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'))
             return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
         else

From 0024c993179dee7fce1db5fccda3b13a6910cd9b Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 15:49:09 +0200
Subject: [PATCH 1083/1569] Update utils.js

---
 common/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 8f8855339..433cc7a10 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -72,7 +72,7 @@
             return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
         console.log(utils.imageExists('http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'));
-        if (utils.imageExists('http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'))
+        if (utils.imageExists('https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'))
             return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
         else
             return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';

From 3699a1b5f8862224b2a8ac00a8d802690ff99099 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 15:59:28 +0200
Subject: [PATCH 1084/1569] Update utils.js

---
 common/js/utils.js | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 433cc7a10..169b59e60 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -71,18 +71,7 @@
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
-        console.log(utils.imageExists('http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'));
-        if (utils.imageExists('https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png'))
-            return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
-        else
-            return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
-    };
-  
-    utils.imageExists = function(image_url){
-        var http = new XMLHttpRequest();
-        http.open('HEAD', image_url, false);
-        http.send();
-        return http.status != 404;
+        return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
     };
 
     utils.getBigThumbnailUrl = function (n) {

From 70a89265f83339d10c7a1bd3654e651bead4e084 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:03:00 +0200
Subject: [PATCH 1085/1569] Update table.js

---
 characters/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index 869f4d8d2..ebb66be4e 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -12,7 +12,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
     var table = null;
 
     var addImage = function(data, type, row, meta) {
-        return '<img class="slot small" data-original="' + Utils.getThumbnailUrl(row[0]) + '"> ' +
+        return '<img class="slot small" data-original="' + Utils.getThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.src=\'' + Utils.getJapanThumbnailUrl(row[0]) + '\';"> ' +
             '<a ui-sref="main.search.view({ id: ' + parseInt(row[0],10) + '})">' + data + '</a>';
     };
 

From 5b0f6859aff15e011eec24e8b56d843ea7563a7e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:04:09 +0200
Subject: [PATCH 1086/1569] Update utils.js

---
 common/js/utils.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/js/utils.js b/common/js/utils.js
index 169b59e60..a77c3f0d0 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -74,6 +74,13 @@
         return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
     };
 
+    utils.getJapanThumbnailUrl = function (n) {
+        if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
+            return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+        var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
+        return 'http://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
+    };
+
     utils.getBigThumbnailUrl = function (n) {
         if (window.units[n - 1].incomplete)
             return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';

From 9cf4c42dcd856412a0bfe5fa32615e6f8e3badb0 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:07:35 +0200
Subject: [PATCH 1087/1569] Update table.js

---
 characters/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index ebb66be4e..d1122c212 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -12,7 +12,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
     var table = null;
 
     var addImage = function(data, type, row, meta) {
-        return '<img class="slot small" data-original="' + Utils.getThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.src=\'' + Utils.getJapanThumbnailUrl(row[0]) + '\';"> ' +
+        return '<img class="slot small" data-original="' + Utils.getThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.data-original=\'' + Utils.getJapanThumbnailUrl(row[0]) + '\';"> ' +
             '<a ui-sref="main.search.view({ id: ' + parseInt(row[0],10) + '})">' + data + '</a>';
     };
 

From e56c7c2036960af7d9f9377694f34a881d308930 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:09:57 +0200
Subject: [PATCH 1088/1569] Update table.js

---
 characters/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index d1122c212..3f83f303d 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -12,7 +12,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
     var table = null;
 
     var addImage = function(data, type, row, meta) {
-        return '<img class="slot small" data-original="' + Utils.getThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.data-original=\'' + Utils.getJapanThumbnailUrl(row[0]) + '\';"> ' +
+        return '<img class="slot small" data-original="' + Utils.getGlobalThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.data-original=\'' + Utils.getThumbnailUrl(row[0]) + '\';"> ' +
             '<a ui-sref="main.search.view({ id: ' + parseInt(row[0],10) + '})">' + data + '</a>';
     };
 

From baee2fad32d553015983d046a1da1684d90dc275 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:10:36 +0200
Subject: [PATCH 1089/1569] Update utils.js

---
 common/js/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index a77c3f0d0..7c3c432bf 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -67,14 +67,14 @@
 
     /* * * * * Thumbnail control * * * * */
 
-    utils.getThumbnailUrl = function (n) {
+    utils.getGlobalThumbnailUrl = function (n) {
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
         return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
     };
 
-    utils.getJapanThumbnailUrl = function (n) {
+    utils.getThumbnailUrl = function (n) {
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image

From acd8f4e86c5e8772799aeeabbe9295917aa3643e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:21:25 +0200
Subject: [PATCH 1090/1569] Update utils.js

---
 common/js/utils.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 7c3c432bf..6103df9f1 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -68,8 +68,6 @@
     /* * * * * Thumbnail control * * * * */
 
     utils.getGlobalThumbnailUrl = function (n) {
-        if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
-            return 'http://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
         return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
     };

From f339c122685bd79f0476601e2efcd61eab5c118a Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:24:36 +0200
Subject: [PATCH 1091/1569] Update index.js

---
 mats/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mats/index.js b/mats/index.js
index af85336b6..a269c385b 100644
--- a/mats/index.js
+++ b/mats/index.js
@@ -321,8 +321,9 @@ app.directive('decorateSlot',function() {
             if (scope.uid && attrs.hasOwnProperty('addHref'))
                 element.attr('href','../characters/#/view/' + parseInt(scope.uid, 10));
             var url = Utils.getThumbnailUrl(scope.uid);
+            var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
             var div = $('<div class="amount"></div>');
-            element[0].style.backgroundImage = 'url(' + url + ')';
+            element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
             element.append(div);
             // updating
             var update = function() {

From aeb63945bb5091319cca45c221d4269e89092f3a Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:30:56 +0200
Subject: [PATCH 1092/1569] Update directives.js

---
 probability/js/directives.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/probability/js/directives.js b/probability/js/directives.js
index 7b849ee80..23c812c2b 100644
--- a/probability/js/directives.js
+++ b/probability/js/directives.js
@@ -74,7 +74,8 @@ directives.decorateSlot = function() {
                 if (!uid) element[0].style.backgroundImage = null;
                 else {
                     var url = Utils.getThumbnailUrl(scope.uid);
-                    element[0].style.backgroundImage = 'url(' + url + ')';
+                    var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
+                    element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
                 }
             };
             scope.$watch('uid', update);

From 47b70c97c3370120113768a4b060af5f3cc63b3f Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:31:32 +0200
Subject: [PATCH 1093/1569] Update directives.js

---
 slots/js/directives.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/slots/js/directives.js b/slots/js/directives.js
index 55de38ed9..c0c7f0b73 100644
--- a/slots/js/directives.js
+++ b/slots/js/directives.js
@@ -64,7 +64,8 @@ directives.decorateSlot = function() {
                 if (!uid) element[0].style.backgroundImage = null;
                 else {
                     var url = Utils.getThumbnailUrl(scope.uid);
-                    element[0].style.backgroundImage = 'url(' + url + ')';
+                    var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
+                    element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
                 }
             };
             scope.$watch('uid', update);

From dab2f211e426d15ad0427424df355ee26d6a367c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:34:48 +0200
Subject: [PATCH 1094/1569] Update images.js

---
 slots/js/images.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/slots/js/images.js b/slots/js/images.js
index 3e27d12c6..a4a046b10 100644
--- a/slots/js/images.js
+++ b/slots/js/images.js
@@ -70,7 +70,10 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
             }
         };
 
-        image.src = Utils.getThumbnailUrl(data.uid);
+        image.src = Utils.getGlobalThumbnailUrl(data.uid);
+        image.onerror = function(){
+            image.src = Utils.getThumbnailUrl(data.uid);
+        }
 
     });
 

From 27245554d0f1c7f639d9366426d9a0d3e3cb940e Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:40:47 +0200
Subject: [PATCH 1095/1569] Update index.js

---
 drops/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drops/index.js b/drops/index.js
index ab178b2bc..a23689a09 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -50,8 +50,9 @@ app.directive('decorateSlot',function() {
         scope: { uid: '=', big: '@', delay: '@' },
         link: function(scope, element, attrs) {
             var url = scope.big ? Utils.getBigThumbnailUrl(scope.uid) : Utils.getThumbnailUrl(scope.uid);
+            var url2 = scope.big ? Utils.getBigThumbnailUrl(scope.uid) : Utils.getGlobalThumbnailUrl(scope.uid);
             if (scope.delay) element[0].setAttribute('data',url);
-            else element[0].style.backgroundImage = 'url(' + url + ')';
+            else element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
         }
     };
 });
@@ -251,4 +252,4 @@ function updateTimes(){
 window.onload = function() {
     //Also add the URI Search into the Search Bar
     document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/%20Fortnight|%20Raid/g,"").replace(/\?/,"\\?"));
-}
\ No newline at end of file
+}

From 7be203d563e1d402d402b2a6c704c43a4e6aff93 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:44:30 +0200
Subject: [PATCH 1096/1569] Update images.js

---
 damage/js/images.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index 6afc36194..8b2e5f99c 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -121,7 +121,10 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                         x: baseX + 7, y: baseY + 103, color: 'gold', stroke: 'black', strokeWidth: 3 });
                 }
             };
-            image.src = Utils.getThumbnailUrl(unit.number + 1);
+            image.src = Utils.getGlobalThumbnailUrl(unit.number + 1);
+            image.onerror = function(){
+		    image.src = Utils.getThumbnailUrl(unit.number + 1);
+	    }
         });
     },true);
 

From 0d12a4167d9705730f8e3e8837bf2b1ff00aafe7 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:48:06 +0200
Subject: [PATCH 1097/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 6ef61f615..f60835045 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -30,7 +30,7 @@ directives.decorateSlot = function($rootScope) {
                     target.removeAttribute('title');
                 } else {
                     if (scope.uid != 1 || scope.flag || (scope.udata && scope.udata.name == 'Monkey D. Luffy'))
-                        target.style.backgroundImage = 'url(' + Utils.getThumbnailUrl(scope.uid) + ')';
+                        target.style.backgroundImage = 'url(' + Utils.getGlobalThumbnailUrl(scope.uid) + '), url(' + Utils.getThumbnailUrl(scope.uid) + ')';
                     else
                         target.style.backgroundImage = null;
                     if (attrs.decorateSlot.indexOf('notitle') == -1)

From 9679596d1568e0cd79a8c9aec0250a260ef49e4c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:53:40 +0200
Subject: [PATCH 1098/1569] Update directives.js

---
 damage/js/directives.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index f60835045..8892d1bcd 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -282,7 +282,8 @@ directives.quickPick = function() {
                 },
                 template: function (value) {
                     var thumb = Utils.getThumbnailUrl(value + 1);
-                    return '<span><img class="quickpick-icon" src="' + thumb + '"> ' + window.units[value].name + '</span>';
+                    var thumb2 = Utils.getGlobalThumbnailUrl(value + 1);
+                    return '<span><img class="quickpick-icon" src="' + thumb2 + '" onerror="this.onerror=null;this.data-original=\'' + thumb + '\';"> ' + window.units[value].name + '</span>';
                 },
                 replace: function(value) {
                     return window.units[value].name;

From 9cb953abcb8f1f12c1542d26e42ddb248165bd4d Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:54:59 +0200
Subject: [PATCH 1099/1569] Update directives.js

---
 damage/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 8892d1bcd..e2c7a4115 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -283,7 +283,7 @@ directives.quickPick = function() {
                 template: function (value) {
                     var thumb = Utils.getThumbnailUrl(value + 1);
                     var thumb2 = Utils.getGlobalThumbnailUrl(value + 1);
-                    return '<span><img class="quickpick-icon" src="' + thumb2 + '" onerror="this.onerror=null;this.data-original=\'' + thumb + '\';"> ' + window.units[value].name + '</span>';
+                    return '<span><img class="quickpick-icon" src="' + thumb2 + '" onerror="this.onerror=null;this.src=\'' + thumb + '\';"> ' + window.units[value].name + '</span>';
                 },
                 replace: function(value) {
                     return window.units[value].name;

From 33d325b4657f2ebc3e40cdd41070bfef2ecd4358 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 16:57:53 +0200
Subject: [PATCH 1100/1569] Update nonSuspicious.js

---
 common/js/nonSuspicious.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 2a3f58228..9ae62e7e9 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -53,8 +53,8 @@ window.onload = function() {
         unit.className = "slot small";
         unit.target = "_blank";
         unit.title = window.units[newUnits[i]-1][0];
-        unit.style = "background-image: url("+Utils.getThumbnailUrl(newUnits[i])+");";
+        unit.style = "background-image: url("+Utils.getGlobalThumbnailUrl(newUnits[i])+"), url("+Utils.getThumbnailUrl(newUnits[i])+");";
         
         document.getElementById("newUnits").appendChild(unit);
     }
-}
\ No newline at end of file
+}

From 701e7f14ca17f7cd2eddc13965b9f5d7271717d1 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:05:55 +0200
Subject: [PATCH 1101/1569] Update directives.js

---
 characters/js/directives.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 65922084a..43b31e52c 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -95,7 +95,7 @@ directives.decorateSlot = function() {
             if (scope.big)
                 element[0].style.backgroundImage = 'url(' + Utils.getBigThumbnailUrl(scope.uid) + ')';
             else
-                element[0].style.backgroundImage = 'url(' + Utils.getThumbnailUrl(scope.uid) + ')';
+                element[0].style.backgroundImage = 'url(' + Utils.getGlobalThumbnailUrl(scope.uid) + '), url(' + Utils.getThumbnailUrl(scope.uid) + ')';
         }
     };
 };
@@ -266,10 +266,17 @@ directives.compare = function() {
                     source: function(query, callback) { callback(fuse.search(query)); },
                     templates: {
                         suggestion: function(id) {
-                            var name = units[id].name, url = Utils.getThumbnailUrl(id+1);
-                            if (name.length > 63) name = name.slice(0,60) + '...';
-                            var thumb = '<div class="slot small" style="background-image: url(' + url + ')"></div>';
-                            return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
+                            if (Number.isInteger(id)){
+                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1), url2 = Utils.getGlobalThumbnailUrl(id+1);
+                                if (name.length > 63) name = name.slice(0,60) + '...';
+                                var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ')"></div>';
+                                return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
+                            }
+                            else{
+                                var name = 'material', url = Utils.getThumbnailUrl(id);
+                                var thumb = '<div class="slot small" style="background-image: url(' + url + ')"></div>';
+                                return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
+                            }
                         }
                     },
                     display: function(id) {

From 4b9ccc4786d922e5432186a96dea7e0fee2a6881 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:09:36 +0200
Subject: [PATCH 1102/1569] Update directives.js

---
 characters/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 43b31e52c..66669f861 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -269,7 +269,7 @@ directives.compare = function() {
                             if (Number.isInteger(id)){
                                 var name = units[id].name, url = Utils.getThumbnailUrl(id+1), url2 = Utils.getGlobalThumbnailUrl(id+1);
                                 if (name.length > 63) name = name.slice(0,60) + '...';
-                                var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ')"></div>';
+                                var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ');"></div>';
                                 return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
                             }
                             else{

From 5dcda57f9018f4f0756a39173ced985b5442d26f Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:17:26 +0200
Subject: [PATCH 1103/1569] Update directives.js

---
 characters/js/directives.js | 120 +++++++++++++++++++-----------------
 1 file changed, 63 insertions(+), 57 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 66669f861..0e1915686 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -10,50 +10,50 @@ var app = angular.module('optc');
  **************/
 
 directives.characterTable = function($rootScope, $timeout, $compile, $storage) {
-    return {
-        restrict: 'E',
-        replace: true,
-        template: '<table id="mainTable" class="table table-striped-column panel panel-default"></table>',
-        link: function(scope, element, attrs) {
-            var table = element.dataTable({
-                iDisplayLength: $storage.get('unitsPerPage', 10),
-                stateSave: true,
-                data: scope.table.data,
-                columns: scope.table.columns,
-                rowCallback: function(row, data, index) {
-                    if (!row || row.hasAttribute('loaded')) return;
-                    var $row = $(row);
-                    if (!$row) return;
-                    // lazy thumbnails
-                    $row.find('[data-original]').each(function(n,x) {
-                        x.setAttribute('src',x.getAttribute('data-original'));
-                        x.removeAttribute('data-original');
-                    });
-                    // character log checkbox
-                    var id = data[data.length - 1] + 1;
-                    var checkbox = $('<label><input type="checkbox" ng-change="checkLog(' + id + ')" ng-model="characterLog[' + id + ']"></input></label>');
-                    $(row.cells[10 + scope.table.additional]).append(checkbox);
-                    // cosmetic fixes
-                    $(row.cells[2]).addClass('cell-' + row.cells[2].textContent);
-                    var n = row.cells.length - 2 - scope.table.additional;
-                    $(row.cells[n]).addClass('stars stars-' + row.cells[n].textContent);
-                    row.cells[n].textContent = '';
-                    // compile
-                    $compile($(row).contents())($rootScope);
-                    if (window.units[id - 1].preview) $(row).addClass('preview');
-                    else if (window.units[id - 1].incomplete) $(row).addClass('incomplete');
-                    row.setAttribute('loaded','true');
-                },
-                headerCallback : function(header) {
-                    if (header.hasAttribute('loaded')) return;
-                    header.cells[header.cells.length - 1].setAttribute('title', 'Character Log');
-                    header.setAttribute('loaded',true);
-                }
-            });
-            scope.table.refresh = function() {
-                $rootScope.$emit('table.refresh');
-                $timeout(function() { element.fnDraw(); });
-            };
+	return {
+		restrict: 'E',
+		replace: true,
+		template: '<table id="mainTable" class="table table-striped-column panel panel-default"></table>',
+		link: function(scope, element, attrs) {
+			var table = element.dataTable({
+				iDisplayLength: $storage.get('unitsPerPage', 10),
+				stateSave: true,
+				data: scope.table.data,
+				columns: scope.table.columns,
+				rowCallback: function(row, data, index) {
+					if (!row || row.hasAttribute('loaded')) return;
+					var $row = $(row);
+					if (!$row) return;
+					// lazy thumbnails
+					$row.find('[data-original]').each(function(n,x) {
+						x.setAttribute('src',x.getAttribute('data-original'));
+						x.removeAttribute('data-original');
+					});
+					// character log checkbox
+					var id = data[data.length - 1] + 1;
+					var checkbox = $('<label><input type="checkbox" ng-change="checkLog(' + id + ')" ng-model="characterLog[' + id + ']"></input></label>');
+					$(row.cells[10 + scope.table.additional]).append(checkbox);
+					// cosmetic fixes
+					$(row.cells[2]).addClass('cell-' + row.cells[2].textContent);
+					var n = row.cells.length - 2 - scope.table.additional;
+					$(row.cells[n]).addClass('stars stars-' + row.cells[n].textContent);
+					row.cells[n].textContent = '';
+					// compile
+					$compile($(row).contents())($rootScope);
+					if (window.units[id - 1].preview) $(row).addClass('preview');
+					else if (window.units[id - 1].incomplete) $(row).addClass('incomplete');
+					row.setAttribute('loaded','true');
+				},
+				headerCallback : function(header) {
+					if (header.hasAttribute('loaded')) return;
+					header.cells[header.cells.length - 1].setAttribute('title', 'Character Log');
+					header.setAttribute('loaded',true);
+				}
+			});
+			scope.table.refresh = function() {
+				$rootScope.$emit('table.refresh');
+				$timeout(function() { element.fnDraw(); });
+			};
             // report link
             var link = $('<span class="help-link">Want to report or request something? Use <a>this form</a>.</span>');
             link.find('a').attr('href', 'https://discord.gg/MRhRrbF');
@@ -133,8 +133,8 @@ directives.addCaptainOptions = function($timeout, $compile, MATCHER_IDS) {
     
 directives.addSailorOptions = function($timeout, $compile, MATCHER_IDS) {
     //TO DO ONCE WE FIND OUT WHAT SAILOR ABILITIES DO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    /*
-    var TARGET = MATCHER_IDS['captain.ClassBoostingCaptains'];
+    
+    var TARGET = MATCHER_IDS['sailor.ClassBoostingSailors'];
     return {
         restrict: 'A',
         link: function(scope, element, attrs) {
@@ -142,17 +142,17 @@ directives.addSailorOptions = function($timeout, $compile, MATCHER_IDS) {
             var filter = $('<div id="class-filters" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
             var classes = [ 'Fighter', 'Shooter', 'Slasher', 'Striker', 'Free Spirit', 'Cerebral', 'Powerhouse', 'Driven' ];
             classes.forEach(function(x,n) {
-                var template = '<span class="filter subclass %c" ng-class="{ active: filters.classCaptain == \'%s\' }" ' +
-                    'ng-click="onCaptainClick($event,\'%s\')">%s</span>';
+                var template = '<span class="filter subclass %c" ng-class="{ active: filters.classSailor == \'%s\' }" ' +
+                    'ng-click="onSailorClick($event,\'%s\')">%s</span>';
                 filter.append($(template.replace(/%s/g,x).replace(/%c/,'width-6')));
             });
             element.after(filter);
             $compile(filter)(scope);
-            scope.onCaptainClick = function(e,type) {
-                scope.filters.classCaptain = (scope.filters.classCaptain == type ? null : type);
+            scope.onSailorClick = function(e,type) {
+                scope.filters.classSailor = (scope.filters.classSailor == type ? null : type);
             };
         }
-    };*/
+    };
 };
 
 directives.addSpecialOptions = function($timeout, $compile, MATCHER_IDS) {
@@ -267,9 +267,9 @@ directives.compare = function() {
                     templates: {
                         suggestion: function(id) {
                             if (Number.isInteger(id)){
-                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1), url2 = Utils.getGlobalThumbnailUrl(id+1);
+                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1);, url2 = Utils.getGlobalThumbnailUrl(id+1);
                                 if (name.length > 63) name = name.slice(0,60) + '...';
-                                var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ');"></div>';
+                                var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ')"></div>';
                                 return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
                             }
                             else{
@@ -394,9 +394,9 @@ directives.addTags = function($stateParams, $rootScope) {
                 // sailor effects
                 if (matcher.target.indexOf('sailor') === 0 && matcher.matcher.test(data[matcher.target]) && !(data[matcher.target] === undefined)) {
                     name = matcher.name;
-                    /*if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
+                    if (!/sailor$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' sailor';
                     else name = name.replace(/s$/,'');
-                    name = name.replace(/iing/,'ying');*/
+                    name = name.replace(/iing/,'ying');
                     element.append($('<span class="tag sailor">' + name + '</div>'));
                 }
                 // specials
@@ -427,8 +427,14 @@ directives.addLinks = function($stateParams) {
                 ul.append($('<li><a href="' + link + '" target="_blank">Official Guide (English)</a></li>'));
             }
             if (!incomplete) {
-                ul.append($('<li><a href="http://onepiece-treasurecruise.com/c-' + id + '" target="_blank">' +
+                if (id == 1478){
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/カリブー-カリブー海賊団船長/" target="_blank">' +
                         'Official Guide (Japanese)</a></li>'));
+                }
+                else{
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/c-' + id + '" target="_blank">' +
+                        'Official Guide (Japanese)</a></li>'));
+                }
             }
             if (gw[id-1] != null) {
                 ul.append($('<li><a href="http://xn--pck6bvfc.gamewith.jp/article/show/' + gw[id-1] + '" target="_blank">' +
@@ -446,7 +452,7 @@ directives.costSlider = function($timeout) {
         link: function(scope, element, attrs) {
             element.ionRangeSlider({
                 grid: true,
-                type: 'double',
+		    type: 'double',
                 min: scope.filters.cost[0],
                 max: scope.filters.cost[1],
                 from: scope.filters.cost[0],

From 4d0011b440379dcd5223579a20ec59210ae07146 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:18:46 +0200
Subject: [PATCH 1104/1569] Update directives.js

---
 characters/js/directives.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 0e1915686..780c0f213 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -267,7 +267,7 @@ directives.compare = function() {
                     templates: {
                         suggestion: function(id) {
                             if (Number.isInteger(id)){
-                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1);, url2 = Utils.getGlobalThumbnailUrl(id+1);
+                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1), url2 = Utils.getGlobalThumbnailUrl(id+1);
                                 if (name.length > 63) name = name.slice(0,60) + '...';
                                 var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ')"></div>';
                                 return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';

From 6e96ddaf4f172c52bf844f82503a81d6af3d57a9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:21:11 +0200
Subject: [PATCH 1105/1569] Update directives.js

---
 characters/js/directives.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 780c0f213..9d8fd31a1 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -280,6 +280,7 @@ directives.compare = function() {
                         }
                     },
                     display: function(id) {
+			    console.log(id);
                         return units[id].name;
                     }
                 }

From e3b4ec43307b48b801adc6b9b9b3cd55b286cb2f Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:24:56 +0200
Subject: [PATCH 1106/1569] Update images.js

---
 slots/js/images.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/slots/js/images.js b/slots/js/images.js
index 3e27d12c6..a4a046b10 100644
--- a/slots/js/images.js
+++ b/slots/js/images.js
@@ -70,7 +70,10 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
             }
         };
 
-        image.src = Utils.getThumbnailUrl(data.uid);
+        image.src = Utils.getGlobalThumbnailUrl(data.uid);
+        image.onerror = function(){
+            image.src = Utils.getThumbnailUrl(data.uid);
+        }
 
     });
 

From fc0532cb21f725427c77c0ec8d783b74aabe1d51 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:27:50 +0200
Subject: [PATCH 1107/1569] Update directives.js

---
 slots/js/directives.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/slots/js/directives.js b/slots/js/directives.js
index 55de38ed9..c0c7f0b73 100644
--- a/slots/js/directives.js
+++ b/slots/js/directives.js
@@ -64,7 +64,8 @@ directives.decorateSlot = function() {
                 if (!uid) element[0].style.backgroundImage = null;
                 else {
                     var url = Utils.getThumbnailUrl(scope.uid);
-                    element[0].style.backgroundImage = 'url(' + url + ')';
+                    var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
+                    element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
                 }
             };
             scope.$watch('uid', update);

From 1efaa13f621652c8ed88458bafc2fc534996c9c8 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:31:02 +0200
Subject: [PATCH 1108/1569] Update directives.js

---
 probability/js/directives.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/probability/js/directives.js b/probability/js/directives.js
index 7b849ee80..23c812c2b 100644
--- a/probability/js/directives.js
+++ b/probability/js/directives.js
@@ -74,7 +74,8 @@ directives.decorateSlot = function() {
                 if (!uid) element[0].style.backgroundImage = null;
                 else {
                     var url = Utils.getThumbnailUrl(scope.uid);
-                    element[0].style.backgroundImage = 'url(' + url + ')';
+                    var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
+                    element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
                 }
             };
             scope.$watch('uid', update);

From 94f00007c7bf4734ae27157b5c0036ba10a33e2c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:32:20 +0200
Subject: [PATCH 1109/1569] Update index.js

---
 mats/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mats/index.js b/mats/index.js
index af85336b6..a269c385b 100644
--- a/mats/index.js
+++ b/mats/index.js
@@ -321,8 +321,9 @@ app.directive('decorateSlot',function() {
             if (scope.uid && attrs.hasOwnProperty('addHref'))
                 element.attr('href','../characters/#/view/' + parseInt(scope.uid, 10));
             var url = Utils.getThumbnailUrl(scope.uid);
+            var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
             var div = $('<div class="amount"></div>');
-            element[0].style.backgroundImage = 'url(' + url + ')';
+            element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
             element.append(div);
             // updating
             var update = function() {

From de3af1d8393875ca97112b52d730f97e7631bcf9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:33:48 +0200
Subject: [PATCH 1110/1569] Update index.js

---
 drops/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drops/index.js b/drops/index.js
index ab178b2bc..a23689a09 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -50,8 +50,9 @@ app.directive('decorateSlot',function() {
         scope: { uid: '=', big: '@', delay: '@' },
         link: function(scope, element, attrs) {
             var url = scope.big ? Utils.getBigThumbnailUrl(scope.uid) : Utils.getThumbnailUrl(scope.uid);
+            var url2 = scope.big ? Utils.getBigThumbnailUrl(scope.uid) : Utils.getGlobalThumbnailUrl(scope.uid);
             if (scope.delay) element[0].setAttribute('data',url);
-            else element[0].style.backgroundImage = 'url(' + url + ')';
+            else element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
         }
     };
 });
@@ -251,4 +252,4 @@ function updateTimes(){
 window.onload = function() {
     //Also add the URI Search into the Search Bar
     document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/%20Fortnight|%20Raid/g,"").replace(/\?/,"\\?"));
-}
\ No newline at end of file
+}

From 73db942a8f0b549ac27e232a239d2c8d20bab04a Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:35:52 +0200
Subject: [PATCH 1111/1569] Update images.js

---
 damage/js/images.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index 26b769777..9ad1264a3 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -124,7 +124,10 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                         x: baseX + 7, y: baseY + 103, color: 'gold', stroke: 'black', strokeWidth: 3 });
                 }
             };
-            image.src = Utils.getThumbnailUrl(unit.number + 1);
+            image.src = Utils.getGlobalThumbnailUrl(unit.number + 1);
+            image.onerror = function(){
+		    image.src = Utils.getThumbnailUrl(unit.number + 1);
+	    };
         });
     },true);
 

From 6550743bb5a1a2823432523f325bfda2b298a463 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:39:24 +0200
Subject: [PATCH 1112/1569] Update directives.js

---
 damage/js/directives.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 58866fa67..ab7efa1c6 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -30,7 +30,7 @@ directives.decorateSlot = function($rootScope) {
                     target.removeAttribute('title');
                 } else {
                     if (scope.uid != 1 || scope.flag || (scope.udata && scope.udata.name == 'Monkey D. Luffy'))
-                        target.style.backgroundImage = 'url(' + Utils.getThumbnailUrl(scope.uid) + ')';
+                        target.style.backgroundImage = 'url(' + Utils.getGlobalThumbnailUrl(scope.uid) + '), url(' + Utils.getThumbnailUrl(scope.uid) + ')';
                     else
                         target.style.backgroundImage = null;
                     if (attrs.decorateSlot.indexOf('notitle') == -1)
@@ -282,7 +282,8 @@ directives.quickPick = function() {
                 },
                 template: function (value) {
                     var thumb = Utils.getThumbnailUrl(value + 1);
-                    return '<span><img class="quickpick-icon" src="' + thumb + '"> ' + window.units[value].name + '</span>';
+                    var thumb2 = Utils.getGlobalThumbnailUrl(value + 1);
+                    return '<span><img class="quickpick-icon" src="' + thumb2 + '" onerror="this.onerror=null;this.src=\'' + thumb + '\';"> ' + window.units[value].name + '</span>';
                 },
                 replace: function(value) {
                     return window.units[value].name;

From 3659e7682581c8cad7a7fe016b24fcc8f0c23a57 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:42:55 +0200
Subject: [PATCH 1113/1569] Update nonSuspicious.js

---
 common/js/nonSuspicious.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 5dfca41f8..740e213c4 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -53,8 +53,8 @@ window.onload = function() {
         unit.className = "slot small";
         unit.target = "_blank";
         unit.title = window.units[newUnits[i]-1][0];
-        unit.style = "background-image: url("+Utils.getThumbnailUrl(newUnits[i])+");";
+        unit.style = "background-image: url("+Utils.getGlobalThumbnailUrl(newUnits[i])+"), url("+Utils.getThumbnailUrl(newUnits[i])+");";
         
         document.getElementById("newUnits").appendChild(unit);
     }
-}
\ No newline at end of file
+}

From 3f681707eae8b6874931d86afa9dbffa9fa658d8 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:46:10 +0200
Subject: [PATCH 1114/1569] Update utils.js

---
 common/js/utils.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 38932b308..6dddf05de 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -66,6 +66,13 @@
     };
 
     /* * * * * Thumbnail control * * * * */
+    
+    utils.getGlobalThumbnailUrl = function (n) {
+        if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
+            return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+        var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1');
+        return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
+    };
 
     utils.getThumbnailUrl = function (n) {
         switch (id){
@@ -115,8 +122,6 @@
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
-        if (id == '0742')
-            return 'https://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
         return 'https://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
     };
 

From ff0890d0de3ca1b654837eb85fd1ebd53e993ee9 Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:48:17 +0200
Subject: [PATCH 1115/1569] Update table.js

---
 characters/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index b024e75d4..1fe2a8d36 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -12,7 +12,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
     var table = null;
 
     var addImage = function(data, type, row, meta) {
-        return '<img class="slot small" data-original="' + Utils.getThumbnailUrl(row[0]) + '"> ' +
+        return '<img class="slot small" data-original="' + Utils.getGlobalThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.data-original=\'' + Utils.getThumbnailUrl(row[0]) + '\';"> ' +
             '<a ui-sref="main.search.view({ id: ' + parseInt(row[0],10) + '})">' + data + '</a>';
     };
 

From 4b5ef400a5cf81429fa3932c8fefc6605d1aca5c Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 17:57:52 +0200
Subject: [PATCH 1116/1569] Update table.js

---
 characters/js/table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/characters/js/table.js b/characters/js/table.js
index 1fe2a8d36..acf029409 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -12,7 +12,7 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
     var table = null;
 
     var addImage = function(data, type, row, meta) {
-        return '<img class="slot small" data-original="' + Utils.getGlobalThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.data-original=\'' + Utils.getThumbnailUrl(row[0]) + '\';"> ' +
+        return '<img class="slot small" data-original="' + Utils.getGlobalThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.src=\'' + Utils.getThumbnailUrl(row[0]) + '\';"> ' +
             '<a ui-sref="main.search.view({ id: ' + parseInt(row[0],10) + '})">' + data + '</a>';
     };
 

From 3504657d7835acdd0b821f55c014445a7bc51dfe Mon Sep 17 00:00:00 2001
From: pesaher <pesaher@gmail.com>
Date: Wed, 7 Jun 2017 18:02:17 +0200
Subject: [PATCH 1117/1569] Update utils.js

---
 common/js/utils.js | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index dfedee1c5..47e2807ff 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -71,57 +71,52 @@
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1');
-        return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
-    };
-
-    utils.getGlobalThumbnailUrl = function (n) {
-        var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
-        return 'http://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
+        return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
     };
 
     utils.getThumbnailUrl = function (n) {
         switch (id){
             case id == 'skullLuffy':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_luffy.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_luffy.png';
                 break;
             case id == 'skullZoro':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_zoro.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_zoro.png';
                 break;
             case id == 'skullNami':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_nami.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_nami.png';
                 break;
             case id == 'skullUsopp':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_usopp_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_usopp_f.png';
                 break;
             case id == 'skullSanji':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_sanji_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_sanji_f.png';
                 break;
             case id == 'skullChopper':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_chopper_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_chopper_f.png';
                 break;
             case id == 'skullRobin':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_robin_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_robin_f.png';
                 break;
             case id == 'skullFranky':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_franky_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_franky_f.png';
                 break;
             case id == 'skullBrook':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_brook_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_brook_f.png';
                 break;
             case id == 'skullSTR':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/red_skull_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/red_skull_f.png';
                 break;
             case id == 'skullQCK':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/blue_skull_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/blue_skull_f.png';
                 break;
             case id == 'skullPSY':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/yellow_skull2_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/yellow_skull2_f.png';
                 break;
             case id == 'skullDEX':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/green_skull2_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/green_skull2_f.png';
                 break;
             case id == 'skullINT':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/black_skull2_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/black_skull2_f.png';
                 break;
         }
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))

From 7a4ef885f8b0ed4ff2b7500a9e9a628c18b8c45e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 8 Jun 2017 02:26:35 -0400
Subject: [PATCH 1118/1569] New Doffy

---
 common/data/aliases.js    |  2 ++
 common/data/captains.js   |  7 +++++++
 common/data/cooldowns.js  |  2 ++
 common/data/details.js    | 12 ++++++++++++
 common/data/drops.js      | 10 ++++++++++
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  2 ++
 common/data/gw.js         |  2 ++
 common/data/specials.js   |  6 ++++++
 common/data/units.js      |  4 +++-
 10 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9d14e10e6..1cd41249c 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1620,6 +1620,8 @@ window.aliases = {
     1619: ['', '', 'Mega Rayleigh', '6+ Rayleigh'],
     1620: ['', '', 'Log Kid'],
     1621: ['', '', 'Log Kid'],
+    1622: ['', '', 'INT Doffy'],
+    1623: ['', '', 'INT Doffy'],
 };
 
 //  xxxx: ['', '', ''],
\ No newline at end of file
diff --git a/common/data/captains.js b/common/data/captains.js
index 8ba02290b..a2394a02c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4788,4 +4788,11 @@ window.captains = {
     1621: {
         atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
+    1622: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1623: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 94e57a88d..e336c384c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1620,4 +1620,6 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 17, 13 ],
     [ 17, 13 ],
+    23,
+    23,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 04c73201a..74aaf085b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8988,4 +8988,16 @@ window.details = {
         special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
         specialName: "Double Steel Magnetic Arm",
     },
+    1622: {
+        special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        specialName: "INT Doflamingo Special",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    1623: {
+        special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
+        specialNotes: "#{orb : 2x}",
+        specialName: "INT Doflamingo Special",
+        captain: "Boosts ATK and HP of Slasher characters by 2x"
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index c61ba8dcd..353541ea3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1588,6 +1588,16 @@ window.drops = {
             Master: [ 86, 97, 112, 417 ]
         },
 
+        {
+            name: 'Clash Reborn!! Doflamingo',
+            thumb: 418,
+            global: true,
+            condition: "3 different versions with different conditions: Cerebral Only, Fighter Only, and Striker Only",
+            gamewith: 58437,
+            Ultimate: [ 1622 ],
+            Master: [ 1622 ]
+        },
+
         {
             name: 'Clash!! Blackbeard',
             thumb: 447,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 958278deb..d4e25610c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2511,4 +2511,8 @@ window.evolutions = {
         evolution: 1621,
         evolvers: [  ]
     },
+    1622: {
+        evolution: 1623,
+        evolvers: [ 118, 83, 88, 304, 104 ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index c33b040d9..f8020c5f5 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1620,4 +1620,6 @@ window.families = [
     "Silvers Rayleigh",
     "Eustass Kid",
     "Eustass Kid",
+    "Donquixote Doflamingo",
+    "Donquixote Doflamingo",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 625aecf0c..c8739216e 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1620,4 +1620,6 @@ window.gw=[
     7311,
     58061,
     58061,
+    58436,
+    58436,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 3b8cfd847..2d1405239 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2873,4 +2873,10 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
         type: "class",
     },
+    1622: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
+    },
+    1623: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index ade809665..5d4e46a4e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1604,7 +1604,7 @@ window.units = [
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, 3000000, 151, 90, 98, 1760, 1190, 257, 1 ],
     [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, 261406, 50, 30, 10, 950, 500, 150, 1 ],
     [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, 2000000, 880, 410, 110, 1850, 1090, 260, 1 ],
-    [ "Lafitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, 93, 49, 29, 2044, 949, 323, 1 ],
+    [ "Laffitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, 93, 49, 29, 2044, 949, 323, 1 ],
     [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, 3000000, 87, 55, 22, 2006, 1050, 280, 1 ],
     [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, 51, 59, 31, 1502, 1138, 340, 1 ],
     [ "Kami Enel, Endless Dreams of Arch Enemies", "QCK", [ "Shooter", "Striker" ], 5, 30, 4, 3, 70, 1066998, 350, 219, 56, 1256, 756, 236, 1 ],
@@ -1620,6 +1620,8 @@ window.units = [
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, null ],
     [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, null, null, null, null, 1424, 690, 151, null ],
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, null ],
+    [ "Donquixote Doflamingo [INT]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, null ],
+    [ "Donquixote Doflamingo, Warlord of the Sea [INT]", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c7181a098016b9f3dc972bfce037bd2fbe1ee772 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 8 Jun 2017 17:58:48 -0400
Subject: [PATCH 1119/1569] Doffy

---
 common/data/cooldowns.js | 4 ++--
 common/data/drops.js     | 4 ++--
 common/data/units.js     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e336c384c..de8beff28 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1620,6 +1620,6 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 17, 13 ],
     [ 17, 13 ],
-    23,
-    23,
+    [ 23, 14 ],
+    [ 23, 14 ],
 ];
diff --git a/common/data/drops.js b/common/data/drops.js
index 353541ea3..f3a67b4f8 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1590,9 +1590,9 @@ window.drops = {
 
         {
             name: 'Clash Reborn!! Doflamingo',
-            thumb: 418,
+            thumb: 1623,
             global: true,
-            condition: "3 different versions with different conditions: Cerebral Only, Fighter Only, and Striker Only",
+            condition: "3 different Master versions and 1 Ultimate version with different conditions. Master: Cerebral Only, Fighter Only, and Striker Only. Ultimate: Striker/Cerebral/Fighter Only",
             gamewith: 58437,
             Ultimate: [ 1622 ],
             Master: [ 1622 ]
diff --git a/common/data/units.js b/common/data/units.js
index 5d4e46a4e..845519068 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1621,7 +1621,7 @@ window.units = [
     [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, null, null, null, null, 1424, 690, 151, null ],
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, null ],
     [ "Donquixote Doflamingo [INT]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, null ],
-    [ "Donquixote Doflamingo, Warlord of the Sea [INT]", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, null, null, null, null ],
+    [ "Donquixote Doflamingo, Warlord of the Sea [INT]", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 059f86f980c5f4f8391764af47476810e964f025 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Thu, 8 Jun 2017 17:22:55 -0700
Subject: [PATCH 1120/1569] Fixed errors

Fixed typo for INT Doffy Raid, and fixed a cosmetic issue.  cosmetic
issue: scroll bar pushed the box for enemy defense to the next line; i
pushed it back :)
---
 common/data/drops.js | 2 +-
 damage/css/main.css  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index f3a67b4f8..51b1cb9ac 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1592,7 +1592,7 @@ window.drops = {
             name: 'Clash Reborn!! Doflamingo',
             thumb: 1623,
             global: true,
-            condition: "3 different Master versions and 1 Ultimate version with different conditions. Master: Cerebral Only, Fighter Only, and Striker Only. Ultimate: Striker/Cerebral/Fighter Only",
+            condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Striker/Cerebral/Fighter Only. Ultimate: Cerebral Only, Fighter Only, and Striker Only",
             gamewith: 58437,
             Ultimate: [ 1622 ],
             Master: [ 1622 ]
diff --git a/damage/css/main.css b/damage/css/main.css
index ea08a2366..f986604c0 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -473,7 +473,7 @@ body, html {
     position: fixed;
     top: 0px;
     left: -17.9em;
-    width: 17.9em;
+    width: 18.9em;
     height: 100%;
     transition: left .1s linear;
     margin-bottom: 0;

From e3c30ac3322d84a43ba6c2b8026716e54832b826 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 9 Jun 2017 14:50:18 -0400
Subject: [PATCH 1121/1569] New stuff

---
 common/data/aliases.js    | 19 +++++++++-----
 common/data/captains.js   | 15 +++++++++++
 common/data/cooldowns.js  |  7 ++++++
 common/data/details.js    | 52 +++++++++++++++++++++++++++++++++++++--
 common/data/drops.js      | 12 ++++++---
 common/data/evolutions.js | 10 +++++++-
 common/data/families.js   | 13 +++++++---
 common/data/flags.js      | 35 ++++++++++++++++++--------
 common/data/specials.js   | 22 +++++++++++++++++
 common/data/units.js      | 19 +++++++++-----
 10 files changed, 172 insertions(+), 32 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1cd41249c..d8dd53628 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1617,11 +1617,18 @@ window.aliases = {
     1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile'],
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
-    1619: ['', '', 'Mega Rayleigh', '6+ Rayleigh'],
-    1620: ['', '', 'Log Kid'],
-    1621: ['', '', 'Log Kid'],
-    1622: ['', '', 'INT Doffy'],
-    1623: ['', '', 'INT Doffy'],
+    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', '6+ Rayleigh'],
+    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid'],
+    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid'],
+    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy'],
+    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'INT Doffy'],
+    1624: ['', '', ''],
+    1625: ['', '', ''],
+    1626: ['', '', ''],
+    1627: ['', '', 'Coliseum Mach Vise'],
+    1628: ['', '', 'Coliseum Mach Vise'],
+    1629: ['', '', 'Coliseum Ikaros Much'],
+    1630: ['', '', 'Coliseum Ikaros Much'],
 };
 
-//  xxxx: ['', '', ''],
\ No newline at end of file
+//  xxxx: ['JPN', 'FR', 'Other'],
\ No newline at end of file
diff --git a/common/data/captains.js b/common/data/captains.js
index a2394a02c..ca0731a1c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4795,4 +4795,19 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
+    1627: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1628: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+    },
+    1629: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1630: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index de8beff28..a875a6f81 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1622,4 +1622,11 @@ window.cooldowns = [
     [ 17, 13 ],
     [ 23, 14 ],
     [ 23, 14 ],
+    null,
+    null,
+    null,
+    null,//Mach Vise
+    null,//Mach Vise
+    15,
+    15,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 74aaf085b..e4ddb517a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8988,16 +8988,64 @@ window.details = {
         special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
         specialName: "Double Steel Magnetic Arm",
     },
-    1622: {
+    1622: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         specialName: "INT Doflamingo Special",
         captain: "Boosts ATK of Slasher characters by 2x"
     },
-    1623: {
+    1623: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         specialName: "INT Doflamingo Special",
         captain: "Boosts ATK and HP of Slasher characters by 2x"
     },
+    1627: {//Mach Vise
+        captain: "Boosts ATK Free Spirit characters by 2x",
+        special: [
+            {
+                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by ???x for 1 turn",
+                "cooldown": [ 23, null ]
+            },
+            {
+                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
+                "cooldown": [ 27, null ]
+            },
+            {
+                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
+                "cooldown": [ 31, null ]
+            },
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Thousand Ton Destruction",
+    },
+    1628: {//Mach Vise
+        captain: "Boosts ATK Free Spirit and Striker characters by 2.25x and their RCV by 1.5x",
+        special: [
+            {
+                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by ???x for 1 turn",
+                "cooldown": [ 23, null ]
+            },
+            {
+                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
+                "cooldown": [ 27, null ]
+            },
+            {
+                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
+                "cooldown": [ 31, null ]
+            },
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Thousand Ton Destruction",
+    },
+    1629: {//Ikaros Much
+        captain: "Boosts ATK and HP of Striker characters by 1.5x",
+        special: "Changes own orb into [INT] and randomizes every other orb, including [BLOCK] orbs",
+        specialName: "The Spear that Penetrated the Undersea Mountain",
+    },
+    1630: {//Ikaros Much
+        captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
+        special: "Changes own orb into [INT] and randomizes every other orb, including [BLOCK] orbs",
+        specialName: "The Spear that Penetrated the Undersea Mountain",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index f3a67b4f8..51e7caeed 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -620,8 +620,9 @@ window.drops = {
         },
         
         {
-            name: "Return to Sabaody Archipelago",
+            name: "Sabaody Archipelago - Redux",
             shortName: "Straw Hat Return",
+            global: true,
             thumb: 1393,
             completion: 'Ship: Coated Thousand Sunny - 5x Rainbow Gems',
             gamewith: 46976,
@@ -1403,6 +1404,7 @@ window.drops = {
         {
             name: "Jailbreak Battle! Mr. 3 and Buggy",
             thumb: 1304,
+            global: true,
             gamewith: 41928,
             condition: "Shooter and Fighter characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
             "All Difficulties": [ 1301, 1303, 1152, 1151, 551, 539, -718, -752, -1125, -1133, -15, -203, -733, -1056, -1060 ]
@@ -1666,6 +1668,7 @@ window.drops = {
         {
             name: 'Clash!! Nightmare Luffy',
             thumb: 795,
+            global: true,
             gamewith: 18565,
             condition: "Take 10% current Health in Environmental Damage every 2 turns",
             Master: [ 794 ],
@@ -1858,9 +1861,9 @@ window.drops = {
             thumb: 779,
             global: true,
             gamewith: 17473,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629 ]
         },
         
         {
@@ -1925,6 +1928,7 @@ window.drops = {
         {
             name: 'The Flashback Before the Reunion! Fight all your Enemies!',
             thumb: 1353,
+            global: true,
             condition: "The fight gets more difficult every time you complete it until it gets to 40 stamina. You an only beat the first 7 stages once, but you can challenge the 8th stage multiple times and it has randomly selected stages.",
             "1st Stage": [ 27, 29, 35, 36, 37, 38, 43, 35, 53, 55, 57, 61, 62, 63, 65 ],
             "2nd Stage": [ 71, 211, 233, 235, 199, 201, 203, 205, 395, 397, 207, 399, 401, 383 ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d4e25610c..3b58b72b0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2509,10 +2509,18 @@ window.evolutions = {
     },
     1620: {
         evolution: 1621,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 266, 95, 300 ]
     },
     1622: {
         evolution: 1623,
         evolvers: [ 118, 83, 88, 304, 104 ]
     },
+    1627: {
+        evolution: 1628,
+        evolvers: [  ]
+    },
+    1629: {
+        evolution: 1630,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index f8020c5f5..5e00206ac 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1435,8 +1435,8 @@ window.families = [
     "Hody Jones",
     "Hyouzou",
     "Hyouzou",
-    "Icaros Much",
-    "Icaros Much",
+    "Ikaros Much",
+    "Ikaros Much",
     "Daruma",
     "Daruma",
     "Zeo",
@@ -1556,7 +1556,7 @@ window.families = [
     "Ryuuma",
     "Wadatsumi",
     "Zeo",
-    "Icaros Much",
+    "Ikaros Much",
     "Hyouzou",
     "Daruma",
     "Dosun",
@@ -1622,4 +1622,11 @@ window.families = [
     "Eustass Kid",
     "Donquixote Doflamingo",
     "Donquixote Doflamingo",
+    null,
+    null,
+    null,
+    "Machvise",
+    "Machvise",
+    "Ikaros Much",
+    "Ikaros Much",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index cae88976b..8e03a2cf8 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -791,6 +791,8 @@ window.flags = {
     791: { rr: 1, rro: 1, global: 1 },
     792: { rr: 1, rro: 1, global: 1 },
     793: { rr: 1, rro: 1, global: 1 },
+    794: { global: 1 },
+    795: { global: 1 },
     796: { global: 1 },
     797: { global: 1 },
     798: { global: 1 },
@@ -1082,6 +1084,12 @@ window.flags = {
     1098: { global: 1 },
     1099: { rr: 1, rro: 1, lrr: 1 },
     1100: { rr: 1, rro: 1, lrr: 1 },
+    1101: { global: 1 },
+    1102: { global: 1 },
+    1103: { global: 1 },
+    1104: { global: 1 },
+    1105: { global: 1 },
+    1106: { global: 1 },
     1107: { global: 1 },
     1108: { global: 1 },
     1109: { global: 1 },
@@ -1249,6 +1257,10 @@ window.flags = {
     1296: { rr: 1, rro: 1, lrr: 1 },
     1297: { global: 1 },
     1298: { global: 1 },
+    1301: { global: 1 },
+    1302: { global: 1 },
+    1303: { global: 1 },
+    1304: { global: 1 },
     1307: { rr: 1, rro: 1, lrr: 1 },
     1308: { rr: 1, rro: 1, lrr: 1 },
     1313: { rr: 1, rro: 1, global: 1 },
@@ -1280,8 +1292,8 @@ window.flags = {
     1354: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1355: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1360: { promo: 1 },
-    1361: { rr: 1, rro: 1 },
-    1362: { rr: 1, rro: 1 },
+    1361: { rr: 1, rro: 1, global: 1 },
+    1362: { rr: 1, rro: 1, global: 1 },
     1363: { rr: 1, rro: 1, global: 1 },
     1364: { rr: 1, rro: 1, global: 1 },
     1365: { rr: 1, rro: 1, global: 1 },
@@ -1301,18 +1313,20 @@ window.flags = {
     1389: { global: 1 },
     1390: { rr: 1, rro: 1, global: 1 },
     1391: { rr: 1, rro: 1, global: 1 },
+    1392: { global: 1 },
+    1393: { global: 1 },
     1394: { rr: 1, rro: 1, lrr: 1, },
     1395: { rr: 1, rro: 1, lrr: 1, },
     1403: { rr: 1, rro: 1, global: 1 },
     1404: { rr: 1, rro: 1, global: 1 },
-    1405: { rr: 1, rro: 1 },
-    1406: { rr: 1, rro: 1 },
-    1407: { rr: 1, rro: 1 },
-    1408: { rr: 1, rro: 1 },
-    1409: { rr: 1, rro: 1 },
-    1410: { rr: 1, rro: 1 },
-    1411: { rr: 1, rro: 1 },
-    1412: { rr: 1, rro: 1 },
+    1405: { rr: 1, rro: 1, global: 1 },
+    1406: { rr: 1, rro: 1, global: 1 },
+    1407: { rr: 1, rro: 1, global: 1 },
+    1408: { rr: 1, rro: 1, global: 1 },
+    1409: { rr: 1, rro: 1, global: 1 },
+    1410: { rr: 1, rro: 1, global: 1 },
+    1411: { rr: 1, rro: 1, global: 1 },
+    1412: { rr: 1, rro: 1, global: 1 },
     1413: { rr: 1, rro: 1, global: 1 },
     1414: { shop: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
@@ -1332,6 +1346,7 @@ window.flags = {
     1443: { rr: 1, rro: 1 },
     1444: { rr: 1, rro: 1 },
     1445: { rr: 1, rro: 1, global: 1 },
+    1447: { global: 1 },
     1453: { rr: 1, rro: 1, lrr: 1, },
     1454: { rr: 1, rro: 1, lrr: 1, },
     1461: { special: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index 2d1405239..07306bc4f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2879,4 +2879,26 @@ window.specials = {
     1623: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
     },
+    1627: {
+        affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1627].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1627].multiplier == 1.25 ? 1 : window.specials[1627].multiplier == 1.5 ? 2 : 0);
+            window.specials[1627].multiplier = [1.25, 1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x chain addition, disable and re-enable this special',
+                name: '1627warning'
+            });
+        }
+    },
+    1628: {
+        affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1628].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1628].multiplier == 1.25 ? 1 : window.specials[1628].multiplier == 1.5 ? 2 : 0);
+            window.specials[1628].multiplier = [1.25, 1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x chain addition, disable and re-enable this special',
+                name: '1628warning'
+            });
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 845519068..88a26b2b9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1441,7 +1441,7 @@ window.units = [
     [ "Daruma, Ghosts of Fishman District", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 931, 531, 55, 2341, 1430, 270, 1 ],
     [ "Zeo, New Fishman Pirate", "INT", [ "Powerhouse", "Striker" ], 4, 15, 4, 3, 50, 392109, 202, 80, 24, 1159, 522, 139, 1 ],
     [ "Zeo, Ghosts of Fishman District", "INT", [ "Powerhouse", "Striker" ], 5, 30, 6, 4, 99, 4000000, 1078, 441, 96, 2424, 1362, 279, 1 ],
-    [ "Dosun, New Fishman Pirate", "STR", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 302, 79, 18, 1440, 509, 96, 1 ],
+    [ "Dosun, New Fishman Pirates", "STR", [ "Powerhouse", "Striker" ], 4, 15, 6, 3, 50, 392109, 302, 79, 18, 1440, 509, 96, 1 ],
     [ "Dosun, Ghosts of Fishman District", "STR", [ "Powerhouse", "Striker" ], 5, 30, 7, 4, 99, 4000000, 1369, 430, 50, 3059, 1333, 189, 1 ],
     [ "Boa Hancock: Snake Princess", "QCK", [ "Free Spirit", "Shooter" ], "6+", 65, 4, 5, 99, 5000000, 1559, 803, 303, 3002, 1480, 507, 1 ],
     [ "Usopp, Platanus: Shuriken", "PSY", [ "Shooter" ], "5+", 30, 4, 3, 99, 3000000, 770, 292, 189, 2022, 972, 480, 1 ],
@@ -1617,11 +1617,18 @@ window.units = [
     [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1131, 540, 59, 2760, 1457, 197, 1 ],
     [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, 1390, 699, 0, 1 ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, 1 ],
-    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, null ],
-    [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, null, null, null, null, 1424, 690, 151, null ],
-    [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, null ],
-    [ "Donquixote Doflamingo [INT]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, null ],
-    [ "Donquixote Doflamingo, Warlord of the Sea [INT]", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, null ],
+    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 5, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, 1 ],
+    [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, 1066998, 281, 190, 30, 1424, 690, 151, 1 ],
+    [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, 1 ],
+    [ "Donquixote Doflamingo [Reborn]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
+    [ "Donquixote Doflamingo [Reborn], Warlord of the Sea", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, 1 ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mach Vise", "DEX", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, null, null, null, 3110, 1198, 186, null ],
+    [ "Ikaros Much", "INT", [ "Striker", "Powerhouse" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, null, null, null, 2230, 1142, 199, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 3ba3315edb04fb268a6a490e216cd347739048ff Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 9 Jun 2017 15:05:14 -0400
Subject: [PATCH 1122/1569] Shanks typo

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e4ddb517a..e7de44df5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8795,12 +8795,12 @@ window.details = {
     },
     1589: {//Anniversary Shanks
         captain: "Boosts Chain Multiplier by 3x",
-        special: "Recover 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
+        special: "Recovers 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
         specialName: "Sharing a Cup Filled with Emotions",
     },
     1590: {//Anniversary Shanks
         captain: "Boosts Chain Multiplier by 3.5x, Boosts HP and RCV of all characters by 1.2x",
-        special: "Recover 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
+        special: "Recovers 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
         specialName: "Sharing a Cup Filled with Emotions",
     },	
     1591: {//Anniversary Boa

From f104daf3f81b00c6c6306fbf91cd2467241858cb Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 9 Jun 2017 15:22:54 -0400
Subject: [PATCH 1123/1569] Ikaros Much and rewording specials

---
 common/data/details.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e7de44df5..70427aada 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1508,12 +1508,12 @@ window.details = {
         captain: "Boosts RCV of PSY characters by 1.5x"
     },
     389: {
-        special: "Changes own orb into [QCK] and every other orb into either [RCV], [STR], [DEX] or [QCK] orbs",
+        special: "Randomly changes all orbs into either [RCV], [STR], [DEX] or [QCK] orbs and changes own orb into [QCK]",
         specialName: "Hell Wink",
         captain: "Boosts ATK by 2.25x following a chain of DEX > INT > QCK attacks no lower than Good"
     },
     390: {
-        special: "Changes own orb into [QCK] and every other orb into either [RCV], [STR], [DEX] or [QCK] orbs",
+        special: "Randomly changes all orbs into either [RCV], [STR], [DEX] or [QCK] orbs and changes own orb into [QCK]",
         specialName: "Hell Wink",
         captain: "Boosts ATK by 2.75x following a chain of DEX > INT > QCK attacks no lower than Good"
     },
@@ -1602,11 +1602,11 @@ window.details = {
         specialNotes: "#{fixed}"
     },
     407: {
-        special: "Randomizes all orbs, deals 7x character's ATK in DEX damage to all enemies",
+        special: "Randomizes all orbs, deals 7x character's ATK in [DEX] damage to all enemies",
         specialName: "Zombie-Style 36-Pound Phoenix"
     },
     408: {
-        special: "Changes own orb into [INT] and randomizes every other orb, deals 15x character's ATK in INT damage to all enemies",
+        special: "Randomizes all orbs and changes own orb into [INT], deals 15x character's ATK in [INT] damage to all enemies",
         specialName: "Ground Death",
         captain: "Reduces damage received by 20%, boosts ATK of Slasher characters by 2x"
     },
@@ -1874,12 +1874,12 @@ window.details = {
         captain: "Reduces damage received by 10%"
     },
     461: {
-        special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
+        special: "Randomizes all orbs and changes own orb into [DEX], boosts ATK of Fighter characters by 1.25x for 2 turns",
         specialName: "Escape Dance: White Swan Arabesque",
         captain: "Boosts ATK of Fighter characters by 2x"
     },
     462: {
-        special: "Changes own orb into [DEX] and randomizes every other orb, boosts ATK of Fighter characters by 1.25x for 2 turns",
+        special: "Randomizes all orbs and changes own orb into [DEX], boosts ATK of Fighter characters by 1.25x for 2 turns",
         specialName: "Escape Dance: White Swan Arabesque",
         captain: "Boosts ATK of Fighter characters by 2x"
     },
@@ -3833,12 +3833,12 @@ window.details = {
     845: {
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit",
         specialName: "Gust: Matasaburo",
-        special: "Changes own orb into [QCK], randomizes every other orb"
+        special: "Randomizes all orbs and changes own orb into [QCK]"
     },
     846: {
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 30th hit, by 3.5x after the 40th hit",
         specialName: "Gust: Matasaburo",
-        special: "Changes own orb into [QCK], randomizes every other orb"
+        special: "Randomizes all orbs and changes own orb into [QCK]"
     },
     847: {
         captain: "Boosts ATK of all characters by 1.5x if HP is below 30% at the start of the turn",
@@ -4047,13 +4047,13 @@ window.details = {
     879: {
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 1.75x",
         specialName: "Battle Preservation Fist: Manki Kayaku",
-        special: "Changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
+        special: "Randomly changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
         specialNotes: "#{gOrbs}"
     },
     880: {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Fighter characters by 2x",
         specialName: "Battle Preservation Fist: Manki Kayaku",
-        special: "Changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
+        special: "Randomly changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
         specialNotes: "#{gOrbs}"
     },
     881: {
@@ -4140,7 +4140,7 @@ window.details = {
     897: {
         captain: "Boosts ATK of Cerebral and Driven characters by 2x",
         specialName: "Ground Death: Thirst",
-        special: "Changes own orb into [STR], randomizes all other orbs, cuts the current HP of all enemies by 10%"
+        special: "Cuts the current HP of all enemies by 10%, randomizes all orbs and changes own orb into [STR]"
     },
     898: {
         captain: "Boosts ATK and HP of Striker and Cerebral characters by 1.5x",
@@ -4652,7 +4652,7 @@ window.details = {
     980: {
         captain: "Boosts ATK of [DEX] and [STR] characters by 1.75x and their RCV by 1.2x",
         specialName: "Hidden King Mallet",
-        special: "Changes own orb into [DEX] and randomizes every other orb"
+        special: "Randomizes all orbs and changes own orb into [DEX]"
     },
     981: {
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x and sharply reduces their RCV",
@@ -7927,12 +7927,12 @@ window.details = {
     },
     1457: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 1.75x",
-        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and for Slasher and Cerebral characters, randomizes non-matching orbs",
+        special: "Reduces Bind and Despair duration by 2 turns, for Slasher and Cerebral characters, randomizes non-matching orbs and changes own orb into [INT]",
         specialName: "Pussyfoot Maneuver",
     },
     1458: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 2x",
-        special: "Reduces Bind and Despair duration by 2 turns, changes own orb into [INT] and for Slasher and Cerebral characters, randomizes non-matching orbs",
+        special: "Reduces Bind and Despair duration by 2 turns, for Slasher and Cerebral characters, randomizes non-matching orbs and changes own orb into [INT]",
         specialName: "Pussyfoot Maneuver",
     },
     1459: {//Coliseum Miss Valentine
@@ -8670,13 +8670,13 @@ window.details = {
     },
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
-        special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        special: "Randomly changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Ruler's Aide Flight",
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
-        special: "Changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
+        special: "Randomly changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "Ruler's Aide Flight",
     },
@@ -9040,12 +9040,12 @@ window.details = {
     },
     1629: {//Ikaros Much
         captain: "Boosts ATK and HP of Striker characters by 1.5x",
-        special: "Changes own orb into [INT] and randomizes every other orb, including [BLOCK] orbs",
+        special: "Randomly changes all orbs, including [BLOCK] orbs, into [STR], [DEX], [QCK], [INT], or [PSY] orbs and changes own orb into [INT]",
         specialName: "The Spear that Penetrated the Undersea Mountain",
     },
     1630: {//Ikaros Much
         captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
-        special: "Changes own orb into [INT] and randomizes every other orb, including [BLOCK] orbs",
+        special: "Randomly changes all orbs, including [BLOCK] orbs, into [STR], [DEX], [QCK], [INT], or [PSY] orbs and changes own orb into [INT]",
         specialName: "The Spear that Penetrated the Undersea Mountain",
     },
 };

From c2cf7f5acbcf32cff7a89d8528a031becfe33ea5 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Sat, 10 Jun 2017 19:51:04 -0700
Subject: [PATCH 1124/1569] Fixed Going Luffy Senpai Ship

---
 common/data/ships.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 825711568..ca2827e15 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -334,7 +334,7 @@ window.ships = [
     { // 27
         name: 'Going Luffy SENPAI!',
         thumb: 'ship_0028_c.png',
-        description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x if there are 6 Striker characters in your crew. Special: Reduces any damage received above 10,000 HP by 97% (cooldown: 17 turns).',
+        description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x if there are 6 Striker characters in your crew. Reduces special cooldown of Striker characters by 1 at the start of the adventure.  Special: Reduces any damage received above 10,000 HP by 97% (cooldown: 17 turns).',
         atk: function(p) {
             return !(p.classCount.Striker == 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
                 [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];

From 633e3da3c6a354571deb73b2c3f37a9918e211cf Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 12:50:22 -0400
Subject: [PATCH 1125/1569] Fixed Scroll bar showing up on left side

---
 damage/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/css/main.css b/damage/css/main.css
index f986604c0..f5de2f80f 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -472,7 +472,7 @@ body, html {
 #menu {
     position: fixed;
     top: 0px;
-    left: -17.9em;
+    left: -18.9em;
     width: 18.9em;
     height: 100%;
     transition: left .1s linear;

From 53eb3f01bfc8187462e3b61e4c48c626f951f9c2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 13:26:08 -0400
Subject: [PATCH 1126/1569] placeholders and slight fixes

also, Towel Nami got changed on global? WaitWhat
---
 common/data/drops.js   | 8 +++++++-
 common/data/sailors.js | 6 ++++++
 damage/css/main.css    | 6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 2c9812e5c..7e47590c7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1532,6 +1532,13 @@ window.drops = {
             "All Difficulties": [ 1606, 1607, 1608, -1404, -1593, -1481, -1442, -1029, -361, -363, -997, -894, -1344 ],
         },
         
+        {
+            name: "New Fishman Pirates!",
+            thumb: 1624,
+            gamewith: null,
+            "All Difficulties": [ 1624, 1625, 1626, -1434, -1477, -1475, -410, -365, -993, -1031, -954, -1347 ],
+        },
+        
     ],
 
             
@@ -1593,7 +1600,6 @@ window.drops = {
         {
             name: 'Clash Reborn!! Doflamingo',
             thumb: 1623,
-            global: true,
             condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Striker/Cerebral/Fighter Only. Ultimate: Cerebral Only, Fighter Only, and Striker Only",
             gamewith: 58437,
             Ultimate: [ 1622 ],
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 6891bbd45..e64399720 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -276,5 +276,11 @@ window.sailors = {
     1575: {//not working
         atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
+    1613: {//not working
+        staticMult: function(p) { return 2; }
+    },
+    1614: {//not working
+        staticMult: function(p) { return 2; }
+    },
     
 };
\ No newline at end of file
diff --git a/damage/css/main.css b/damage/css/main.css
index f5de2f80f..6123da53a 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -472,8 +472,8 @@ body, html {
 #menu {
     position: fixed;
     top: 0px;
-    left: -18.9em;
-    width: 18.9em;
+    left: -20.9em;
+    width: 20.9em;
     height: 100%;
     transition: left .1s linear;
     margin-bottom: 0;
@@ -566,7 +566,7 @@ li.disabled {
 }
 
 .special > div, #profileContainer {
-    width: 249px;
+    width: 270px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;

From 9dd96c9d3215161de1f049ad97472d627ce4a5e1 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 15:01:46 -0400
Subject: [PATCH 1127/1569] Shanks fix

---
 common/js/utils.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/js/utils.js b/common/js/utils.js
index 47e2807ff..2d65fd1a1 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -71,6 +71,12 @@
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1');
+        if (id == 530){
+            return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + 529 + '.png';
+        }
+        else if (id == 529){
+            return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + 530 + '.png';
+        }
         return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
     };
 

From d43ffd15981c175dbbfcf5526d8579e3e227ea44 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 15:02:37 -0400
Subject: [PATCH 1128/1569] uhh, cleaner fix

---
 common/js/utils.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index 2d65fd1a1..e46e9bc49 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -72,10 +72,10 @@
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1');
         if (id == 530){
-            return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + 529 + '.png';
+            return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f0529.png';
         }
         else if (id == 529){
-            return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + 530 + '.png';
+            return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f0530.png';
         }
         return 'https://onepiece-treasurecruise.com/wp-content/uploads/sites/2/f' + id + '.png';
     };

From 66037dc2f8a1bc23b65c2cc449e63febe6711ae8 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 15:06:44 -0400
Subject: [PATCH 1129/1569] INT Skull file fix

---
 common/js/utils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/js/utils.js b/common/js/utils.js
index e46e9bc49..01ef1c665 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -122,7 +122,7 @@
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/green_skull2_f.png';
                 break;
             case id == 'skullINT':
-                return 'https://onepiece-treasurecruise.com/wp-content/uploads/black_skull2_f.png';
+                return 'https://onepiece-treasurecruise.com/wp-content/uploads/black_skull_f.png';
                 break;
         }
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))

From 879f2ddabbd8384134401abfb5b86421d6b0408f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 19:12:41 -0400
Subject: [PATCH 1130/1569] Bugs

---
 common/data/details.js | 10 +++++-----
 common/data/drops.js   |  4 ++--
 common/data/units.js   |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 70427aada..642b761d6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8226,7 +8226,7 @@ window.details = {
     1503: {//Hammond
         captain: "Boosts ATK of Powerhouse characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : ??? + ??? * (1 - (remaining HP) / (total HP)) : ??? : 2.25}",
-        special: "For Driven characters, randomizes non-matching orbs",
+        special: "Changes own orb into [QCK] and changes adjacent orbs into [EMPTY] orbs",
         specialName: "Absurd Invitation",
     },
     1504: {//Vander Decken IX
@@ -8235,12 +8235,12 @@ window.details = {
         specialName: "Inescapable Pursuit",
     },
     1505: {//Hody Jones
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.25x if HP is below ???% at the start of the turn",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.25x if HP is below 30% at the start of the turn",
         special: "Deals large [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
         specialName: "Shark Arrows",
     },
     1506: {//Hody Jones
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.5x if HP is below ???% at the start of the turn, 2.25x otherwise",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.5x if HP is below 30% at the start of the turn, 2.25x otherwise",
         special: "Deals large [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
         specialName: "Shark Arrows",
     },
@@ -8991,13 +8991,13 @@ window.details = {
     1622: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "INT Doflamingo Special",
+        specialName: "Overheat [Reformed]",
         captain: "Boosts ATK of Slasher characters by 2x"
     },
     1623: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "INT Doflamingo Special",
+        specialName: "Overheat [Reformed]",
         captain: "Boosts ATK and HP of Slasher characters by 2x"
     },
     1627: {//Mach Vise
diff --git a/common/data/drops.js b/common/data/drops.js
index 7e47590c7..2525ed3a7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1867,8 +1867,8 @@ window.drops = {
             thumb: 779,
             global: true,
             gamewith: 17473,
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629 ]
         },
         
diff --git a/common/data/units.js b/common/data/units.js
index 88a26b2b9..0167d3155 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1620,8 +1620,8 @@ window.units = [
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 5, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, 1 ],
     [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, 1066998, 281, 190, 30, 1424, 690, 151, 1 ],
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, 1 ],
-    [ "Donquixote Doflamingo [Reborn]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
-    [ "Donquixote Doflamingo [Reborn], Warlord of the Sea", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, 1 ],
+    [ "Donquixote Doflamingo [Reformed]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
+    [ "Donquixote Doflamingo [Reformed], Warlord of the Sea", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 89c07113d550ec14610570d06c607ba933520871 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 19:13:05 -0400
Subject: [PATCH 1131/1569] Drops page

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 2525ed3a7..c06af77fe 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1598,7 +1598,7 @@ window.drops = {
         },
 
         {
-            name: 'Clash Reborn!! Doflamingo',
+            name: 'Clash Reformed!! Doflamingo',
             thumb: 1623,
             condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Striker/Cerebral/Fighter Only. Ultimate: Cerebral Only, Fighter Only, and Striker Only",
             gamewith: 58437,

From 0740fbdd58ac5b9c2b7c5130dd7afcf7287bd8e2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 11 Jun 2017 20:40:28 -0400
Subject: [PATCH 1132/1569] special notes stuff

---
 common/data/details.js | 89 +++++++++++++++++++++++++++++-------------
 1 file changed, 61 insertions(+), 28 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 642b761d6..1dbf852f1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5609,7 +5609,7 @@ window.details = {
                 "cooldown": [ 26, 20 ]
             },
         ],
-        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.",
+        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.<br>#{stages}",
         specialName: "King Punch"
     },
     1131: {
@@ -5628,7 +5628,7 @@ window.details = {
                 "cooldown": [ 26, 20 ]
             },
         ],
-        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.",
+        specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.<br>#{stages}",
         specialName: "King Punch"
     },
     1132: {
@@ -5947,6 +5947,7 @@ window.details = {
                 "cooldown": [ 17, 12 ],
             }
         ],
+        specialNotes : "#{stages}",
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
@@ -5964,6 +5965,7 @@ window.details = {
                 "cooldown": [ 17, 12 ],
             }
         ],
+        specialNotes : "#{stages}",
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
@@ -6172,7 +6174,8 @@ window.details = {
                 "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
                 "cooldown": [ 34, 18 ],
             },
-        ],        
+        ],
+        specialNotes: "#{stages}",
         specialName: "More More, 10 Times \"Iron Hammer\"",
     },
     1220: {//Byrnndi World Coliseum
@@ -6190,7 +6193,8 @@ window.details = {
                 "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
                 "cooldown": [ 34, 18 ],
             },
-        ],        
+        ],
+        specialNotes: "#{stages}",
         specialName: "More More, 10 Times \"Iron Hammer\"",
     },
     1221: {//Coliseum Oars Jr
@@ -6251,6 +6255,7 @@ window.details = {
                 "cooldown": [ 22, 15 ], 
             },
         ],
+        specialNotes: "#{stages}",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
         specialName: "Leg-Locked Heave-Ho",
     },
@@ -6270,6 +6275,7 @@ window.details = {
                 "cooldown": [ 22, 15 ], 
             },
         ],
+        specialNotes: "#{stages}",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
         specialName: "Leg-Locked Heave-Ho",
     },
@@ -6348,7 +6354,7 @@ window.details = {
                 "cooldown": [ 20, 17 ], 
             },
         ],    
-        specialNotes: "#{randomHits : 10}",
+        specialNotes: "#{randomHits : 10}<br>#{stages}",
     },
     1240: {//6* Kizaru
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and boosts RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
@@ -6367,7 +6373,7 @@ window.details = {
                 "cooldown": [ 20, 17 ],
             },
         ],    
-        specialNotes: "#{randomHits : 10}",
+        specialNotes: "#{randomHits : 10}<br>#{stages}",
     },
     1241: {//Fortnight Koala
         captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
@@ -6433,7 +6439,8 @@ window.details = {
                 "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
                 "cooldown": [ 24, 9 ],
             },
-        ], 
+        ],
+        specialNotes: "#{stages}",
         specialName: "Burning Vanguard",
     },
     1251: {// Coliseum Marco
@@ -6448,7 +6455,8 @@ window.details = {
                 "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
                 "cooldown": [ 24, 9 ],
             },
-        ], 
+        ],
+        specialNotes: "#{stages}",
         specialName: "Burning Vanguard",
     },
     1252: {// Coliseum Doma
@@ -6496,7 +6504,8 @@ window.details = {
                 "description": "Cuts the current HP of each enemy by 40%",
                 "cooldown": [ 36, 24 ],
             },
-        ], 
+        ],
+        specialNotes: "#{stages}",
         specialName: "Earth Shattering Fist",
     },
     1258: {//Young Whitebeard Evolved
@@ -6515,6 +6524,7 @@ window.details = {
                 "cooldown": [ 36, 24 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Earth Shattering Fist",
     },
     1259: {//Young Doflamingo
@@ -6734,7 +6744,7 @@ window.details = {
                 "cooldown": [ 26, 16 ],
             },
         ],
-        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.<br>#{stages}",
         specialName: "Snake Dance",
     },
     1294: {//Coliseum Sandersonia
@@ -6749,7 +6759,7 @@ window.details = {
                 "cooldown": [ 26, 16 ],
             },
         ],
-        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.",
+        specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.<br>#{stages}",
         specialName: "Snake Dance",
     },
     1295: {//Halloween Kalifa
@@ -6875,7 +6885,7 @@ window.details = {
                 "cooldown": [ 24, 18 ],
             },
         ],
-        specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
+        specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
         sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Echoing Cry of the Soul",
     },
@@ -6895,7 +6905,7 @@ window.details = {
                 "cooldown": [ 24, 18 ],
             },
         ],
-        specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid",
+        specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
         sailor: "Reduces duration of Blindness by 5 turns",
         specialName: "Echoing Cry of the Soul",
     },
@@ -6977,6 +6987,7 @@ window.details = {
                 "cooldown": [ 19, 12 ],
             }
         ],
+        specialNotes: "#{stages}",
         specialName: "Tail Hammer",
     },
     1328: {//Fornight Leo
@@ -6991,6 +7002,7 @@ window.details = {
                 "cooldown": [ 19, 12 ],
             }
         ],
+        specialNotes: "#{stages}",
         specialName: "Tail Hammer",
     },
     1329: {//Wicca
@@ -7011,7 +7023,7 @@ window.details = {
             },
         ],
         specialName: "The Work of Fairies",
-        specialNotes: "#{colorAffinity : 1.25}",
+        specialNotes: "#{colorAffinity : 1.25}<br>#{stages}",
     },
     1330: {//Gancho
         captain: "Boosts ATK of Striker characters by 1.5x and recovers 2x character's RCV in HP at the end of each turn",
@@ -7030,6 +7042,7 @@ window.details = {
                 "cooldown": [ 24, 17 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Tears of Healing",
     },
     1332: {//Mansherry
@@ -7044,6 +7057,7 @@ window.details = {
                 "cooldown": [ 24, 17 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Tears of Healing",
     },
     1333: {//Kabu
@@ -7094,6 +7108,7 @@ window.details = {
                 "cooldown": [ 25, 15 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Flight Power Strengthening - Jump Point",
     },
     1340: {//Gedatsu
@@ -7246,7 +7261,7 @@ window.details = {
         ],
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
-        specialNotes: "#{silence}",
+        specialNotes: "#{silence}<br>#{stages}",
         specialName: "Black Ball - Thundercloud Rod",
     },
     1366: {//Timeskip Nami
@@ -7265,7 +7280,7 @@ window.details = {
                 "cooldown": [ 18, 13 ],
             },
         ],
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}<br>#{stages}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
         specialName: "Black Ball - Thundercloud Rod",
@@ -7282,7 +7297,7 @@ window.details = {
                 "cooldown": [ 20, 15 ],
             },
         ],
-        specialNotes: "#{orb : 1.75x}",
+        specialNotes: "#{orb : 1.75x}<br>#{stages}",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
         specialName: "Sky Walk",
     },
@@ -7298,7 +7313,7 @@ window.details = {
                 "cooldown": [ 20, 15 ],
             },
         ],
-        specialNotes: "#{orb : 1.75x}",
+        specialNotes: "#{orb : 1.75x}<br>#{stages}",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
         specialName: "Sky Walk",
     },
@@ -7341,7 +7356,7 @@ window.details = {
             },
         ],
         specialName: "Poison Dragon",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}",
     },
     1374: {//Magellan
         captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.5x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
@@ -7356,7 +7371,7 @@ window.details = {
             },
         ],
         specialName: "Poison Dragon",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}",
     },
     1375: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, Increases damage received by 2x",
@@ -7516,7 +7531,7 @@ window.details = {
             },
         ],
         specialName: "Stonewall Punk",
-        specialNotes: "#{colorAffinity : 1.75}",
+        specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
     },
     1401: {//Colo Gladius
         captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.5x",
@@ -7532,7 +7547,7 @@ window.details = {
             },
         ],
         specialName: "Stonewall Punk",
-        specialNotes: "#{colorAffinity : 1.75}",
+        specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
     },
     1402: {//Colo Dalton
         captain: "Boosts ATK of [PSY] and [QCK] characters by 2x",
@@ -7546,6 +7561,7 @@ window.details = {
                 "cooldown": [ 18, 8 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Offense Battle Axe",
     },
     1403: {//Timeskip Luffy
@@ -7561,6 +7577,7 @@ window.details = {
                 "cooldown": [ 18, 13 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Gomu Gomu no Red Hawk",
     },
     1404: {//Timeskip Luffy
@@ -7576,6 +7593,7 @@ window.details = {
                 "cooldown": [ 18, 13 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Gomu Gomu no Red Hawk",
     },
     1405: {//Timeskip Usopp
@@ -7741,14 +7759,15 @@ window.details = {
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
-                "description": "Deals 10x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "description": "Deals 10x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
                 "cooldown": [ 12, 7 ],
             },
             {
-                "description": "Deals 60x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
+                "description": "Deals 60x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
                 "cooldown": [ 22, 17 ],
             },
         ],
+        specialNotes: "#{ignoreBarrier}<br>#{stages}",
         specialName: "Water Bullets",
     },
     1434: {//Hody Jones
@@ -7756,14 +7775,15 @@ window.details = {
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
-                "description": "Deals 10x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
+                "description": "Deals 10x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
                 "cooldown": [ 12, 7 ],
             },
             {
-                "description": "Deals 60x character's ATK in [INT] damage to one enemy, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
+                "description": "Deals 60x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
                 "cooldown": [ 22, 17 ],
             },
         ],
+        specialNotes: "#{ignoreBarrier}<br>#{stages}",
         specialName: "Water Bullets",
     },
     1435: {//Hyouzou
@@ -7857,6 +7877,7 @@ window.details = {
                 "cooldown": [ 20, 15 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Grill Shot",
     },
     1448: {//Chopper 5+
@@ -7909,6 +7930,7 @@ window.details = {
                 "cooldown": [ 30, 15 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Legend told to the Grandchild",
     },
     1456: {//Coliseum Don Chinjao
@@ -7923,6 +7945,7 @@ window.details = {
                 "cooldown": [ 30, 15 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Legend told to the Grandchild",
     },
     1457: {//Coliseum Kuro
@@ -8022,7 +8045,7 @@ window.details = {
                 "cooldown": [ 22, 18 ],
             },
         ],
-        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.",
+        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
     },
@@ -8038,7 +8061,7 @@ window.details = {
                 "cooldown": [ 22, 18 ],
             },
         ],
-        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.",
+        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
     },
@@ -8169,6 +8192,7 @@ window.details = {
                 "cooldown": [ 23, 17 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Reborn - Fire",
     },
     1493: {//STR Fishman Outlaw
@@ -8366,6 +8390,7 @@ window.details = {
                 "cooldown": [ 21, 12 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Just 'Water Play'",
     },
     1527: {//Arlong
@@ -8380,6 +8405,7 @@ window.details = {
                 "cooldown": [ 21, 12 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Just 'Water Play'",
     },
     1528: {//Blenheim
@@ -8416,6 +8442,7 @@ window.details = {
                 "cooldown": [ 24, 21 ],
             },
         ],
+        specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
         specialName: "Long-Range Attack: Bagworm",
     },
@@ -8435,6 +8462,7 @@ window.details = {
                 "cooldown": [ 24, 21 ],
             },
         ],
+        specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
         specialName: "Long-Range Attack: Bagworm",
     },
@@ -8615,6 +8643,7 @@ window.details = {
                 "cooldown": [ 24, 16 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
         sailor: "Boosts own ATK by 350 if this character is the last in the chain to attack",
     },
@@ -8630,6 +8659,7 @@ window.details = {
                 "cooldown": [ 24, 16 ],
             },
         ],
+        specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
         sailor: "Boosts own ATK by 350 if this character is the last in the chain to attack",
     },
@@ -8722,6 +8752,7 @@ window.details = {
                 "cooldown": [ 14, 9 ],
             },
         ],
+        specialNotes: "#{stages}",
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
         specialName: "Miraculous Flying Dragon",
     },
@@ -8741,6 +8772,7 @@ window.details = {
                 "cooldown": [ 14, 9 ],
             },
         ],
+        specialNotes: "#{stages}",
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
         specialName: "Miraculous Flying Dragon",
     },
@@ -8825,6 +8857,7 @@ window.details = {
                 "cooldown": [ 18, 13 ],
             },
         ],
+        specialNotes: "#{stages}",
         sailor: "Completely resists Paralysis on this character",
         specialName: "King Kong Gun",
     },

From dcc512e04ddbb91aae694dd1613190e25271bede Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 12 Jun 2017 23:40:14 -0400
Subject: [PATCH 1133/1569] Kid Fix

---
 common/data/captains.js | 3 ++-
 common/data/details.js  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index ca0731a1c..9d35809fb 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4786,7 +4786,8 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     1621: {
-        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
     1622: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
diff --git a/common/data/details.js b/common/data/details.js
index 1dbf852f1..fb482da05 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9017,7 +9017,7 @@ window.details = {
         specialName: "Double Steel Magnetic Arm",
     },
     1621: {//Log Kid
-        captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
+        captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise and boosts HP of Striker characters by 1.2x",
         special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
         specialName: "Double Steel Magnetic Arm",
     },

From bf5f61c35b080f9eb5ce1b7740818c4ee5775a0c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Jun 2017 00:10:43 -0400
Subject: [PATCH 1134/1569] New units

---
 common/data/details.js | 15 +++++++++++++++
 common/data/units.js   |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fb482da05..f6b160ece 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9033,6 +9033,21 @@ window.details = {
         specialName: "Overheat [Reformed]",
         captain: "Boosts ATK and HP of Slasher characters by 2x"
     },
+    1624: {//Hyouzou
+        captain: "Boosts ATK of Slasher characters by 1.5x and boosts HP of Powerhouse characters by 1.25x",
+        special: "Randomizes all orbs, cuts the current HP of all enemies by 10%, and poisons all enemies.",
+        specialName: "Flexible Six Swords",
+    },
+    1625: {//Daruma
+        captain: "Boosts ATK of Powerhouse and Fighter characters by 1.75x",
+        special: "Randomizes all orbs, including [BLOCK] orbs, and reduces damage received by 50% for 1 turn.",
+        specialName: "Arching Fangs",
+    },
+    1626: {//Dosun
+        captain: "Boosts ATK of Powerhouse characters by 2.5x following a chain of Good > Great > Perfect hits",
+        special: "Deals 20x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.5x for 1 turn",
+        specialName: "The Calm Before The Storm",
+    },
     1627: {//Mach Vise
         captain: "Boosts ATK Free Spirit characters by 2x",
         special: [
diff --git a/common/data/units.js b/common/data/units.js
index 0167d3155..8ff985536 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1622,9 +1622,9 @@ window.units = [
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, 1 ],
     [ "Donquixote Doflamingo [Reformed]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
     [ "Donquixote Doflamingo [Reformed], Warlord of the Sea", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hyouzou, Fishman Pirates Bodyguard", "QCK", [ "Powerhouse", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Daruma, Deep Sea Fishman Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dosun, Deep Sea Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mach Vise", "DEX", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, null, null, null, 3110, 1198, 186, null ],
     [ "Ikaros Much", "INT", [ "Striker", "Powerhouse" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],

From 889ae765e5670be02d491e6068a3d014c59941d0 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Tue, 13 Jun 2017 03:03:03 -0700
Subject: [PATCH 1135/1569] Fixed G4's special typo and added new FN chars CDs

---
 common/data/cooldowns.js | 6 +++---
 common/data/details.js   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a875a6f81..0cfdb9d79 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1622,9 +1622,9 @@ window.cooldowns = [
     [ 17, 13 ],
     [ 23, 14 ],
     [ 23, 14 ],
-    null,
-    null,
-    null,
+    [ 15, 9 ],
+    [ 15, 9 ],
+    [ 20, 14 ],
     null,//Mach Vise
     null,//Mach Vise
     15,
diff --git a/common/data/details.js b/common/data/details.js
index f6b160ece..467500242 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8849,7 +8849,7 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.5x. If you use \"King Kong Gun\" THIS LUFFY boosts ATK of Fighter characters by 4x instead for 3 turns and reduces damage taken by 56% for 3 turns.",
         special: [
             {
-                "description": "Deals 100x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 1 turn.  After 3 turns, Binds and Despairs himself for 7 turns.",
+                "description": "Deals 100x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter characters for 1 turn.  After 3 turns, Binds and Despairs himself for 7 turns.",
                 "cooldown": [ 13, 8 ],
             },
             {

From 7cd0fb9cad43e4395882f914d73e35f67790e258 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Jun 2017 20:11:20 -0400
Subject: [PATCH 1136/1569] Wild Luffy Sockets fix

Sorry
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 8ff985536..f4ef89e11 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1282,8 +1282,8 @@ window.units = [
     [ "Garp, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 171, 64, 62, 2094, 1002, 266, 1 ],
     [ "Sengoku Navy HQ Fleet Admiral", "INT", [ "Cerebral", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 213, 96, 95, 1942, 972, 304, 1 ],
     [ "Akainu Navy HQ Admiral", "INT", [ "Driven", "Fighter" ], 4, 30, 5, 3, 99, 3000000, 133, 100, 0, 2000, 1381, 0, 1 ],
-    [ "Monkey D. Luffy, Wild Pirate", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 4, 50, 392109, 226, 154, 51, 1104, 602, 143, 1 ],
-    [ "Monkey D. Luffy, Pioneer Of Land", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 3, 99, 4000000, 1002, 501, 88, 2491, 1325, 261, 1 ],
+    [ "Monkey D. Luffy, Wild Pirate", "PSY", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 226, 154, 51, 1104, 602, 143, 1 ],
+    [ "Monkey D. Luffy, Pioneer Of Land", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1002, 501, 88, 2491, 1325, 261, 1 ],
     [ "Baby 5, Girl of Spider Miles", "PSY", [ "Fighter", "Shooter" ], 3, 9, 5, 1, 50, 392109, 19, 29, 35, 399, 204, 194, 1 ],
     [ "Baby 5, Member of Donquixote Family", "PSY", [ "Striker", "Shooter" ], 4, 15, 4, 3, 99, 3000000, 274, 158, 146, 784, 579, 372, 1 ],
     [ "Trafalgar Law, Boy of Spider Miles", "DEX", [ "Driven", "Slasher" ], 3, 9, 6, 1, 50, 392109, 28, 64, 14, 368, 493, 90, 1 ],

From e1fbf321fb86734bc4200e5db3d0e5ee6de4893a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Jun 2017 20:24:36 -0400
Subject: [PATCH 1137/1569] New Fishman Units

---
 common/data/aliases.js  |  6 +++---
 common/data/captains.js | 16 +++++++++++++++-
 common/data/drops.js    |  2 +-
 common/data/families.js |  6 +++---
 common/data/gw.js       |  5 +++++
 common/data/specials.js |  4 ++++
 common/data/units.js    |  6 +++---
 7 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d8dd53628..089b47c4e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1622,9 +1622,9 @@ window.aliases = {
     1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid'],
     1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy'],
     1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'INT Doffy'],
-    1624: ['', '', ''],
-    1625: ['', '', ''],
-    1626: ['', '', ''],
+    1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
+    1625: ['ダルマ 深海の魚人海賊', '', ''],
+    1626: ['ドスン 深海の魚人海賊', '', ''],
     1627: ['', '', 'Coliseum Mach Vise'],
     1628: ['', '', 'Coliseum Mach Vise'],
     1629: ['', '', 'Coliseum Ikaros Much'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 9d35809fb..0518957b8 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2571,7 +2571,7 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1046: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
         hitAtk: function(p) {
             return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
         },
@@ -4796,6 +4796,20 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
+    1624: {
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1625: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+    },
+    1626: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Powerhouse") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1627: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
diff --git a/common/data/drops.js b/common/data/drops.js
index c06af77fe..9a40b79eb 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1535,7 +1535,7 @@ window.drops = {
         {
             name: "New Fishman Pirates!",
             thumb: 1624,
-            gamewith: null,
+            gamewith: 59321,
             "All Difficulties": [ 1624, 1625, 1626, -1434, -1477, -1475, -410, -365, -993, -1031, -954, -1347 ],
         },
         
diff --git a/common/data/families.js b/common/data/families.js
index 5e00206ac..4a92efff3 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1622,9 +1622,9 @@ window.families = [
     "Eustass Kid",
     "Donquixote Doflamingo",
     "Donquixote Doflamingo",
-    null,
-    null,
-    null,
+    "Hyouzou",
+    "Daruma",
+    "Dosun",
     "Machvise",
     "Machvise",
     "Ikaros Much",
diff --git a/common/data/gw.js b/common/data/gw.js
index c8739216e..c97f45fcb 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1622,4 +1622,9 @@ window.gw=[
     58061,
     58436,
     58436,
+    59328,
+    59332,
+    59330,
+    null,//Mach Vise
+    null,//Mach Vise
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 07306bc4f..59cfc05b2 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2879,6 +2879,10 @@ window.specials = {
     1623: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
     },
+    1618: {
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        type: "type"
+    },
     1627: {
         affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1627].multiplier : 1; },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index f4ef89e11..50ea54596 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1622,9 +1622,9 @@ window.units = [
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, 1 ],
     [ "Donquixote Doflamingo [Reformed]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
     [ "Donquixote Doflamingo [Reformed], Warlord of the Sea", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, 1 ],
-    [ "Hyouzou, Fishman Pirates Bodyguard", "QCK", [ "Powerhouse", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Daruma, Deep Sea Fishman Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dosun, Deep Sea Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hyouzou, Fishman Pirates Bodyguard", "QCK", [ "Powerhouse", "Slasher" ], 4, 20, 6, 4, 99, 3000000, 85, 58, 27, 1980, 1088, 345, 1 ],
+    [ "Daruma, Deep Sea Fishman Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 4, 4, 99, 3000000, 48, 53, 24, 1405, 985, 320, 1 ],
+    [ "Dosun, Deep Sea Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 20, 6, 4, 99, 3000000, 91, 60, 21, 2050, 1155, 274, 1 ],
     [ "Mach Vise", "DEX", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, null, null, null, 3110, 1198, 186, null ],
     [ "Ikaros Much", "INT", [ "Striker", "Powerhouse" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],

From 408d45b814f8ca65c5362a3fe93159e56e69335c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 13 Jun 2017 20:26:44 -0400
Subject: [PATCH 1138/1569] Birdo Cooldown

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0cfdb9d79..8bf436ebb 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1345,7 +1345,7 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 18, 13 ],
     [ 15, 10 ],
-    25,
+    [ 25, 17 ],
     [ 17, 10 ],
     13,
     [ 14, 8 ],

From 0dffe325ee1560e2c972b9c8e3fa9ee5f5c74529 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 14 Jun 2017 04:06:28 -0400
Subject: [PATCH 1139/1569] New units

---
 common/data/aliases.js    |  4 ++--
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 28 ++++++++++++++--------------
 common/data/evolutions.js |  4 ++--
 common/data/gw.js         |  6 ++++--
 common/data/units.js      |  8 ++++----
 6 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 089b47c4e..bae63c5b0 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1620,8 +1620,8 @@ window.aliases = {
     1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', '6+ Rayleigh'],
     1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid'],
     1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid'],
-    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy'],
-    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'INT Doffy'],
+    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy', 'INT Doflamingo'],
+    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'INT Doffy', 'INT Doflamingo'],
     1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
     1625: ['ダルマ 深海の魚人海賊', '', ''],
     1626: ['ドスン 深海の魚人海賊', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8bf436ebb..9839ccc4d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1627,6 +1627,6 @@ window.cooldowns = [
     [ 20, 14 ],
     null,//Mach Vise
     null,//Mach Vise
-    15,
-    15,
+    [ 15, 5 ],
+    [ 15, 5 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 467500242..d74166f84 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7923,7 +7923,7 @@ window.details = {
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
-                "cooldown": [ 20, 10 ],
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
@@ -7938,7 +7938,7 @@ window.details = {
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
-                "cooldown": [ 20, 10 ],
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
@@ -9052,16 +9052,16 @@ window.details = {
         captain: "Boosts ATK Free Spirit characters by 2x",
         special: [
             {
-                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by ???x for 1 turn",
-                "cooldown": [ 23, null ]
+                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by 1.25x for 1 turn",
+                "cooldown": [ 23, 9 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
-                "cooldown": [ 27, null ]
+                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by 1.5x for 1 turn",
+                "cooldown": [ 27, 13 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
-                "cooldown": [ 31, null ]
+                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
+                "cooldown": [ 31, 17 ]
             },
         ],
         specialNotes: "#{stages}",
@@ -9071,16 +9071,16 @@ window.details = {
         captain: "Boosts ATK Free Spirit and Striker characters by 2.25x and their RCV by 1.5x",
         special: [
             {
-                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by ???x for 1 turn",
-                "cooldown": [ 23, null ]
+                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by 1.25x for 1 turn",
+                "cooldown": [ 23, 9 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
-                "cooldown": [ 27, null ]
+                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by 1.5x for 1 turn",
+                "cooldown": [ 27, 13 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by ???x for 1 turn",
-                "cooldown": [ 31, null ]
+                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
+                "cooldown": [ 31, 17 ]
             },
         ],
         specialNotes: "#{stages}",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3b58b72b0..21f9092ac 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2517,10 +2517,10 @@ window.evolutions = {
     },
     1627: {
         evolution: 1628,
-        evolvers: [  ]
+        evolvers: [ 118, 97, 97, 302, 102 ]
     },
     1629: {
         evolution: 1630,
-        evolvers: [  ]
+        evolvers: [ 117, 82, 88, 99, 304 ]
     },
 };
diff --git a/common/data/gw.js b/common/data/gw.js
index c97f45fcb..2b82a7328 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1625,6 +1625,8 @@ window.gw=[
     59328,
     59332,
     59330,
-    null,//Mach Vise
-    null,//Mach Vise
+    59480,
+    59480,
+    59477,
+    59477,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 50ea54596..17125fe60 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1625,10 +1625,10 @@ window.units = [
     [ "Hyouzou, Fishman Pirates Bodyguard", "QCK", [ "Powerhouse", "Slasher" ], 4, 20, 6, 4, 99, 3000000, 85, 58, 27, 1980, 1088, 345, 1 ],
     [ "Daruma, Deep Sea Fishman Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 4, 4, 99, 3000000, 48, 53, 24, 1405, 985, 320, 1 ],
     [ "Dosun, Deep Sea Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 20, 6, 4, 99, 3000000, 91, 60, 21, 2050, 1155, 274, 1 ],
-    [ "Mach Vise", "DEX", [ "Striker", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, null, null, null, 3110, 1198, 186, null ],
-    [ "Ikaros Much", "INT", [ "Striker", "Powerhouse" ], 3, 16, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, null, null, null, 2230, 1142, 199, null ],
+    [ "Machvise, Super Weight Human", "DEX", [ "Striker", "Free Spirit" ], 4, 25, 4, 3, 70, 1066998, 140, 70, 16, 1540, 590, 98, null ],
+    [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, 1310, 490, 77, 3110, 1198, 186, null ],
+    [ "Ikaros, Deep Sea Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 93, 54, 24, 920, 446, 151, null ],
+    [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 876, 409, 104, 2230, 1142, 199, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 8ba30a2c0ee59ea0b8282750675582c13b6f9d3a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Jun 2017 06:02:20 -0400
Subject: [PATCH 1140/1569] BB Ship

---
 common/data/ships.js | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index ca2827e15..ee1eb7d98 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -389,7 +389,7 @@ window.ships = [
     
     { //30
         name: "3rd Anniversary Thousand Sunny",
-        thumb: null,
+        thumb: 'ship_0032_c.png',
         //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
         description: 'Boosts ATK by 1.2x.',
         atk: function(p) { return 1.2; },
@@ -399,7 +399,7 @@ window.ships = [
     
     { //31
         name: "Flying Dutchman",
-        thumb: null,
+        thumb: 'ship_0033_c.png',
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
         atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
     },
@@ -408,9 +408,23 @@ window.ships = [
     
     { //31.2
         name: "Flying Dutchman - Special ACTIVATED",
-        thumb: null,
+        thumb: 'ship_0033_c.png',
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. ACTIVATED Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
         atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
     },
+    
+    
+    
+    { //32
+        name: "Marshal D. Teach Pirate Ship",
+        thumb: null,
+        description: 'Boosts HP by 1.25x and reduces special cooldown of all characters by 1 at the start of the adventure. Boosts ATK by 1.55x if you have a Striker, Shooter, Fighter, and Slasher on your crew.',
+        atk: function(p) { 
+            return (p.classCount.Striker >= 1 && p.classCount.Fighter >= 1 && p.classCount.Shooter >= 1 && p.classCount.Slasher >= 1) ? [ 1.2, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.5, 1.55 ][p.boatLevel - 1] : 1;
+        },
+        hp: function(p) {
+            return [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.25 ][p.boatLevel - 1];
+        }
+    },
 
 ];

From db22952909fa7ece6fa094c93b55e0099674195f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Jun 2017 15:42:14 -0400
Subject: [PATCH 1141/1569] Stuff

---
 common/js/nonSuspicious.js | 2 +-
 index.html                 | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 740e213c4..740d0054c 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -45,7 +45,7 @@ window.onload = function() {
     
     //Add new Units with Pics here so they show up in the Updates
     //7 Units are about the Max you can add, otherwise you would need to implement another tr for them
-    var newUnits = [ 1434, 1445, 1446, 1447, 1448, 1432, 1422 ];
+    var newUnits = [ 1619, 1610, 1621, 1623, 1624, 1606, 1605 ];
 
     for (var i = 0, len = newUnits.length; i < len; i++) {
         var unit = document.createElement("a");
diff --git a/index.html b/index.html
index 8a3006626..c11418212 100644
--- a/index.html
+++ b/index.html
@@ -67,9 +67,9 @@
             <p>29/3/2017</p>
             <br>
             <ul>
-                <li>Legend 6+ Usopp Added in calculator</li>
+                <li>New Coliseum Units Added to Calculator</li>
                 <br>
-                <li>Stuff</li>
+                <li>We Changed Stuff</li>
                 <br>
                 <li>Love, Solaris, Zeenigami, Mondfischer & Team<li>
                 <br>

From dbfdf45c9b010969559178db789ba75a5f148870 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 15 Jun 2017 15:45:10 -0400
Subject: [PATCH 1142/1569] Date

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index c11418212..f2ca4c746 100644
--- a/index.html
+++ b/index.html
@@ -64,7 +64,7 @@
         <div class="animated zoomIn blue" id="changelog">
             <p id="update">Updates</p>
 
-            <p>29/3/2017</p>
+            <p>15/6/2017</p>
             <br>
             <ul>
                 <li>New Coliseum Units Added to Calculator</li>

From 503ecbd72675e70b6d33781bd41350df0797e30f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 13:32:51 -0400
Subject: [PATCH 1143/1569] Fisher Tiger

---
 common/data/aliases.js    | 26 ++++++++++++++------------
 common/data/captains.js   |  6 ++++++
 common/data/cooldowns.js  |  2 ++
 common/data/details.js    | 18 +++++++++++++++---
 common/data/evolutions.js |  4 ++++
 common/data/flags.js      |  2 ++
 common/data/specials.js   |  8 ++++++++
 common/data/units.js      |  2 ++
 8 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index bae63c5b0..654b64bd9 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1411,7 +1411,7 @@ window.aliases = {
     1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
     1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
     1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
-    1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate'],
+    1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate', 'Super Whitebeard', 'Super WB',],
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
     1415: ['センゴク 智将', '', ''],
     1416: ['仏のセンゴク 智将', '', ''],
@@ -1443,10 +1443,10 @@ window.aliases = {
     1442: ['ゼオ 魚人街の亡霊', '', ''],
     1443: ['ドスン 新魚人海賊団', '', ''],
     1444: ['ドスン 魚人街の亡霊', '', ''],
-    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock'],
-    1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp'],
-    1447: ['サンジ グリル＝ショット', '', 'Mega Sanji'],
-    1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper'],
+    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock', 'Super Boa Hancock'],
+    1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp', 'Super Usopp'],
+    1447: ['サンジ グリル＝ショット', '', 'Mega Sanji', 'Super Sanji'],
+    1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper', 'Super Chopper'],
     1449: ['ヴァイオレット 踊り娘', '', 'Viola'],
     1450: ['ヴァイオレット 追われる女', '', 'Viola'],
     1451: ['サンジ 恋人通りの変装男', '', ''],
@@ -1490,7 +1490,7 @@ window.aliases = {
     1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg'],
     1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5'],
     1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5'],
-    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo'],
+    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo'],
     1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', ''],
     1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
     1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
@@ -1541,15 +1541,15 @@ window.aliases = {
     1540: ['ペローナ 麦わらの一味の共犯者', '', ''],
     1541: ['エリザベス 麦わらの一味の協力者', '', ''],
     1542: ['エリザベス 麦わらの一味の共犯者', '', ''],
-    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp'],
+    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp', 'Super Usopp'],
     1544: ['コアラ 桜色の待ち合わせ', '', 'Sakura Koala'],
     1545: ['コアラ 桜色の口元', '', 'Sakura Koala'],
     1546: ['ソウルキング', '', 'Brook'],
     1547: ['“ソウルキング”ブルック 海賊', '', 'Brook'],
     1548: ['テーナ・ゲーナ王国の手長族 “ソウルキング”マネージャー', '', ''],
-    1549: ['ニコ・ロビン 千紫万紅　花畑', '', 'Mega Robin'],
-    1550: ['フランキー フランキ～～～ロケットランチャ――', '', 'Mega Franky'],
-    1551: ['ブルック 掠り唄　吹雪斬り', '', 'Mega Brook'],
+    1549: ['ニコ・ロビン 千紫万紅　花畑', '', 'Mega Robin', 'Super Robin'],
+    1550: ['フランキー フランキ～～～ロケットランチャ――', '', 'Mega Franky', 'Super Franky'],
+    1551: ['ブルック 掠り唄　吹雪斬り', '', 'Mega Brook', 'Super Brook'],
     1552: ['ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
     1553: ['海賊傭兵　ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
     1554: ['リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma'],
@@ -1591,7 +1591,7 @@ window.aliases = {
     1590: ['赤髪のシャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
     1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
     1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
-    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy'],
+    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy', 'Super Luffy'],
     1594: ['藤虎 海軍本部最高戦力', '', 'Raid Fujitora'],
     1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Fujitora'],
     1596: ['しらほし', '', ''],
@@ -1617,7 +1617,7 @@ window.aliases = {
     1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile'],
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
-    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', '6+ Rayleigh'],
+    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
     1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid'],
     1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid'],
     1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy', 'INT Doflamingo'],
@@ -1629,6 +1629,8 @@ window.aliases = {
     1628: ['', '', 'Coliseum Mach Vise'],
     1629: ['', '', 'Coliseum Ikaros Much'],
     1630: ['', '', 'Coliseum Ikaros Much'],
+    1631: ['', '', ''],
+    1632: ['', '', ''],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
\ No newline at end of file
diff --git a/common/data/captains.js b/common/data/captains.js
index 0518957b8..6e76fbcc0 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4825,4 +4825,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
+    1631: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+    },
+    1632: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9839ccc4d..5a82c61d9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1629,4 +1629,6 @@ window.cooldowns = [
     null,//Mach Vise
     [ 15, 5 ],
     [ 15, 5 ],
+    21,
+    21
 ];
diff --git a/common/data/details.js b/common/data/details.js
index d74166f84..2e4ba0943 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5691,12 +5691,12 @@ window.details = {
         special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
         specialName: "Lack of Pure Chi: Lion Finger Gun Sneak Attack"
     },
-    1140: {// Coliseum Moriah
+    1140: {// Coliseum Moria
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
         specialName: "Horn Blade Shadow"
     },
-    1141: {// Coliseum Moriah
+    1141: {// Coliseum Moria
         captain: "Boosts ATK of Driven characters by 2.25x, recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes own orb into [DEX] and deals 300,000 Fixed damage to one enemy",
         specialName: "Horn Blade Shadow"
@@ -9096,4 +9096,16 @@ window.details = {
         special: "Randomly changes all orbs, including [BLOCK] orbs, into [STR], [DEX], [QCK], [INT], or [PSY] orbs and changes own orb into [INT]",
         specialName: "The Spear that Penetrated the Undersea Mountain",
     },
-};
+    1631: {//Fisher Tiger
+        captain: "Boosts ATK of Powerhouse characters by 2.25x",
+        special: "Boosts ATK of Powerhouse characters by 1.75x for 3 turns",
+        specialName: "Rebellion against the \"Prohibition\" - Taboo",
+        sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn",
+    },
+    1632: {//Fisher Tiger
+        captain: "Boosts ATK of Powerhouse characters by 2.75x",
+        special: "Boosts ATK of Powerhouse characters by 1.75x for 3 turns",
+        specialName: "Rebellion against the \"Prohibition\" - Taboo",
+        sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn",
+    },
+};
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 21f9092ac..8a5d43d94 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2523,4 +2523,8 @@ window.evolutions = {
         evolution: 1630,
         evolvers: [ 117, 82, 88, 99, 304 ]
     },
+    1631: {
+        evolution: 1632,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/flags.js b/common/data/flags.js
index 8e03a2cf8..6b075229f 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1417,4 +1417,6 @@ window.flags = {
     1619: { rr: 1, rro: 1 },
     1620: { rr: 1, rro: 1, lrr: 1 },
     1621: { rr: 1, rro: 1, lrr: 1 },
+    1631: { rr: 1, rro: 1, lrr: 1 },
+    1632: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 59cfc05b2..9cf44edd4 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2905,4 +2905,12 @@ window.specials = {
             });
         }
     },
+    1631: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class",
+    },
+    1632: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 17125fe60..9e2e88192 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1629,6 +1629,8 @@ window.units = [
     [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, 1310, 490, 77, 3110, 1198, 186, null ],
     [ "Ikaros, Deep Sea Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 93, 54, 24, 920, 446, 151, null ],
     [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 876, 409, 104, 2230, 1142, 199, null ],
+    [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Fisher Tiger, Captain of the Sun Pirates", "PSY", [ "Powerhouse", "Fighter" ], 5, 30, null, null, 99, 4000000, null, null, null, 2522, 1386, 313, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 2555e4d0052744a71c66f3a31191be4ec8368cd0 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 13:35:30 -0400
Subject: [PATCH 1144/1569] Fisher Tiger family

---
 common/data/families.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/families.js b/common/data/families.js
index 4a92efff3..807dedc77 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1629,4 +1629,6 @@ window.families = [
     "Machvise",
     "Ikaros Much",
     "Ikaros Much",
+    "Fisher Tiger",
+    "Fisher Tiger",
 ];
\ No newline at end of file

From 46e7d1b1e25af9788f8f4197d7aa8b47baf78dd0 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 17:07:28 -0400
Subject: [PATCH 1145/1569] Disabled Global Thumbnails

Errors with swapping Evolved and Unevolved chars, and not consistant
images with in-game.
---
 characters/js/directives.js  | 20 +++++++++++---------
 characters/js/table.js       |  3 ++-
 common/js/nonSuspicious.js   |  5 +++--
 common/js/utils.js           |  3 ++-
 damage/js/directives.js      |  8 +++++---
 damage/js/images.js          |  9 +++++----
 drops/index.js               |  7 ++++---
 mats/index.js                |  5 +++--
 probability/js/directives.js |  5 +++--
 slots/js/directives.js       |  5 +++--
 slots/js/images.js           |  9 +++++----
 11 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index aa1430c50..83cc2a682 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -10,7 +10,7 @@ var app = angular.module('optc');
  **************/
 
 directives.characterTable = function($rootScope, $timeout, $compile, $storage) {
-	return {
+    return {
 		restrict: 'E',
 		replace: true,
 		template: '<table id="mainTable" class="table table-striped-column panel panel-default"></table>',
@@ -95,7 +95,8 @@ directives.decorateSlot = function() {
             if (scope.big)
                 element[0].style.backgroundImage = 'url(' + Utils.getBigThumbnailUrl(scope.uid) + ')';
             else
-                element[0].style.backgroundImage = 'url(' + Utils.getGlobalThumbnailUrl(scope.uid) + '), url(' + Utils.getThumbnailUrl(scope.uid) + ')';
+                element[0].style.backgroundImage = 'url(' + Utils.getThumbnailUrl(scope.uid) + ')';
+                //element[0].style.backgroundImage = 'url(' + Utils.getGlobalThumbnailUrl(scope.uid) + '), url(' + Utils.getThumbnailUrl(scope.uid) + ')';
         }
     };
 };
@@ -267,11 +268,13 @@ directives.compare = function() {
                     templates: {
                         suggestion: function(id) {
                             if (Number.isInteger(id)){
-                              
-                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1), url2 = Utils.getGlobalThumbnailUrl(id+1);
+                                
+                                var name = units[id].name, url = Utils.getThumbnailUrl(id+1);
+                                //var name = units[id].name, url = Utils.getThumbnailUrl(id+1), url2 = Utils.getGlobalThumbnailUrl(id+1);
                                 if (name.length > 63) name = name.slice(0,60) + '...';
-                                var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ')"></div>';
-                              
+                                var thumb = '<div class="slot small" style="background-image: url(' + url + ')"></div>';
+                                //var thumb = '<div class="slot small" style="background-image: url(' + url2 + '), url(' + url + ')"></div>';
+                                
                                 return '<div><div class="suggestion-container">' + thumb + '<span>' + name + '</span></div></div>';
                             }
                             else{
@@ -282,12 +285,11 @@ directives.compare = function() {
                         }
                     },
                     display: function(id) {
-			    console.log(id);
                         return units[id].name;
                     }
                 }
             );
-
+            
             target.bind('typeahead:select',function(e,suggestion) {
                 $(e.currentTarget).prop('disabled', true);
                 scope.compare = window.units[suggestion];
@@ -455,7 +457,7 @@ directives.costSlider = function($timeout) {
         link: function(scope, element, attrs) {
             element.ionRangeSlider({
                 grid: true,
-		    type: 'double',
+                type: 'double',
                 min: scope.filters.cost[0],
                 max: scope.filters.cost[1],
                 from: scope.filters.cost[0],
diff --git a/characters/js/table.js b/characters/js/table.js
index acf029409..556176052 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -12,7 +12,8 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
     var table = null;
 
     var addImage = function(data, type, row, meta) {
-        return '<img class="slot small" data-original="' + Utils.getGlobalThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.src=\'' + Utils.getThumbnailUrl(row[0]) + '\';"> ' +
+        return '<img class="slot small" data-original="' + Utils.getThumbnailUrl(row[0]) + '"> ' +
+            //return '<img class="slot small" data-original="' + Utils.getGlobalThumbnailUrl(row[0]) + '" onerror="this.onerror=null;this.src=\'' + Utils.getThumbnailUrl(row[0]) + '\';"> ' +
             '<a ui-sref="main.search.view({ id: ' + parseInt(row[0],10) + '})">' + data + '</a>';
     };
 
diff --git a/common/js/nonSuspicious.js b/common/js/nonSuspicious.js
index 740d0054c..c738d048e 100644
--- a/common/js/nonSuspicious.js
+++ b/common/js/nonSuspicious.js
@@ -53,8 +53,9 @@ window.onload = function() {
         unit.className = "slot small";
         unit.target = "_blank";
         unit.title = window.units[newUnits[i]-1][0];
-        unit.style = "background-image: url("+Utils.getGlobalThumbnailUrl(newUnits[i])+"), url("+Utils.getThumbnailUrl(newUnits[i])+");";
+        unit.style = "background-image: url("+Utils.getThumbnailUrl(newUnits[i])+");";
+        //unit.style = "background-image: url("+Utils.getGlobalThumbnailUrl(newUnits[i])+"), url("+Utils.getThumbnailUrl(newUnits[i])+");";
         
         document.getElementById("newUnits").appendChild(unit);
     }
-}
+}
\ No newline at end of file
diff --git a/common/js/utils.js b/common/js/utils.js
index 01ef1c665..a4c627107 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -128,7 +128,8 @@
         if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
-      
+        if (id == '0742')
+            return 'https://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
         return 'https://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
     };
 
diff --git a/damage/js/directives.js b/damage/js/directives.js
index ab7efa1c6..bdfd4b119 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -30,7 +30,8 @@ directives.decorateSlot = function($rootScope) {
                     target.removeAttribute('title');
                 } else {
                     if (scope.uid != 1 || scope.flag || (scope.udata && scope.udata.name == 'Monkey D. Luffy'))
-                        target.style.backgroundImage = 'url(' + Utils.getGlobalThumbnailUrl(scope.uid) + '), url(' + Utils.getThumbnailUrl(scope.uid) + ')';
+                        target.style.backgroundImage = 'url(' + Utils.getThumbnailUrl(scope.uid) + ')';
+                        //target.style.backgroundImage = 'url(' + Utils.getGlobalThumbnailUrl(scope.uid) + '), url(' + Utils.getThumbnailUrl(scope.uid) + ')';
                     else
                         target.style.backgroundImage = null;
                     if (attrs.decorateSlot.indexOf('notitle') == -1)
@@ -282,8 +283,9 @@ directives.quickPick = function() {
                 },
                 template: function (value) {
                     var thumb = Utils.getThumbnailUrl(value + 1);
-                    var thumb2 = Utils.getGlobalThumbnailUrl(value + 1);
-                    return '<span><img class="quickpick-icon" src="' + thumb2 + '" onerror="this.onerror=null;this.src=\'' + thumb + '\';"> ' + window.units[value].name + '</span>';
+                    return '<span><img class="quickpick-icon" src="' + thumb + '"> ' + window.units[value].name + '</span>';
+                    //var thumb2 = Utils.getGlobalThumbnailUrl(value + 1);
+                    //return '<span><img class="quickpick-icon" src="' + thumb2 + '" onerror="this.onerror=null;this.src=\'' + thumb + '\';"> ' + window.units[value].name + '</span>';
                 },
                 replace: function(value) {
                     return window.units[value].name;
diff --git a/damage/js/images.js b/damage/js/images.js
index 48aba0c8b..fe21a2e46 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -124,10 +124,11 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                         x: baseX + 7, y: baseY + 103, color: 'gold', stroke: 'black', strokeWidth: 3 });
                 }
             };
-            image.src = Utils.getGlobalThumbnailUrl(unit.number + 1);
-            image.onerror = function(){
-		          image.src = Utils.getThumbnailUrl(unit.number + 1);
-	          }
+            image.src = Utils.getThumbnailUrl(unit.number + 1);
+            //image.src = Utils.getGlobalThumbnailUrl(unit.number + 1);
+            //image.onerror = function(){
+            //    image.src = Utils.getThumbnailUrl(unit.number + 1);
+            //}
         });
     },true);
 
diff --git a/drops/index.js b/drops/index.js
index a23689a09..791792593 100644
--- a/drops/index.js
+++ b/drops/index.js
@@ -50,9 +50,10 @@ app.directive('decorateSlot',function() {
         scope: { uid: '=', big: '@', delay: '@' },
         link: function(scope, element, attrs) {
             var url = scope.big ? Utils.getBigThumbnailUrl(scope.uid) : Utils.getThumbnailUrl(scope.uid);
-            var url2 = scope.big ? Utils.getBigThumbnailUrl(scope.uid) : Utils.getGlobalThumbnailUrl(scope.uid);
+            //var url2 = scope.big ? Utils.getBigThumbnailUrl(scope.uid) : Utils.getGlobalThumbnailUrl(scope.uid);
             if (scope.delay) element[0].setAttribute('data',url);
-            else element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
+            else element[0].style.backgroundImage = 'url(' + url + ')';
+            //else element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
         }
     };
 });
@@ -252,4 +253,4 @@ function updateTimes(){
 window.onload = function() {
     //Also add the URI Search into the Search Bar
     document.getElementById("search").value = decodeURI(location.search.replace('?','').replace(/%20Fortnight|%20Raid/g,"").replace(/\?/,"\\?"));
-}
+}
\ No newline at end of file
diff --git a/mats/index.js b/mats/index.js
index a269c385b..a46efccd2 100644
--- a/mats/index.js
+++ b/mats/index.js
@@ -321,9 +321,10 @@ app.directive('decorateSlot',function() {
             if (scope.uid && attrs.hasOwnProperty('addHref'))
                 element.attr('href','../characters/#/view/' + parseInt(scope.uid, 10));
             var url = Utils.getThumbnailUrl(scope.uid);
-            var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
+            //var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
             var div = $('<div class="amount"></div>');
-            element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
+            element[0].style.backgroundImage = 'url(' + url + ')';
+            //element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
             element.append(div);
             // updating
             var update = function() {
diff --git a/probability/js/directives.js b/probability/js/directives.js
index 23c812c2b..de8121ce0 100644
--- a/probability/js/directives.js
+++ b/probability/js/directives.js
@@ -74,8 +74,9 @@ directives.decorateSlot = function() {
                 if (!uid) element[0].style.backgroundImage = null;
                 else {
                     var url = Utils.getThumbnailUrl(scope.uid);
-                    var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
-                    element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
+                    element[0].style.backgroundImage = 'url(' + url + ')';
+                    //var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
+                    //element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
                 }
             };
             scope.$watch('uid', update);
diff --git a/slots/js/directives.js b/slots/js/directives.js
index c0c7f0b73..238370bd5 100644
--- a/slots/js/directives.js
+++ b/slots/js/directives.js
@@ -64,8 +64,9 @@ directives.decorateSlot = function() {
                 if (!uid) element[0].style.backgroundImage = null;
                 else {
                     var url = Utils.getThumbnailUrl(scope.uid);
-                    var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
-                    element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
+                    element[0].style.backgroundImage = 'url(' + url + ')';
+                    //var url2 = Utils.getGlobalThumbnailUrl(scope.uid);
+                    //element[0].style.backgroundImage = 'url(' + url2 + '), url(' + url + ')';
                 }
             };
             scope.$watch('uid', update);
diff --git a/slots/js/images.js b/slots/js/images.js
index a4a046b10..ff7d84fe0 100644
--- a/slots/js/images.js
+++ b/slots/js/images.js
@@ -70,10 +70,11 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
             }
         };
 
-        image.src = Utils.getGlobalThumbnailUrl(data.uid);
-        image.onerror = function(){
-            image.src = Utils.getThumbnailUrl(data.uid);
-        }
+        image.src = Utils.getThumbnailUrl(data.uid);
+        //image.src = Utils.getGlobalThumbnailUrl(data.uid);
+        //image.onerror = function(){
+        //    image.src = Utils.getThumbnailUrl(data.uid);
+        //}
 
     });
 

From c13dac04b66d80001b4f6e6f73fe74c9bd7c0bca Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 17:52:27 -0400
Subject: [PATCH 1146/1569] Team Database links added

---
 common/data/drops.js | 127 +++++++++++++++++++++++++++++++++++++++++++
 drops/index.html     |  10 +++-
 2 files changed, 135 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9a40b79eb..d94b4d3a3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1549,6 +1549,7 @@ window.drops = {
             thumb: 227,
             global: true,
             gamewith: 4142,
+            teamDatabase: 'raid_bosses/3',
             Master: [ 86, 112, 118, 226 ],
             Expert: [ 97, 112, 226 ]
         },
@@ -1558,6 +1559,7 @@ window.drops = {
             thumb: 249,
             global: true,
             gamewith: 5210,
+            teamDatabase: 'raid_bosses/4',
             Master: [ 84, 110, 118, 248 ],
             Expert: [ 84, 110, 248 ]
         },
@@ -1567,6 +1569,7 @@ window.drops = {
             thumb: 306,
             global: true,
             gamewith: 5905,
+            teamDatabase: 'raid_bosses/5',
             Master: [ 113, 118, 262, 264, 305 ],
         },
 
@@ -1575,6 +1578,7 @@ window.drops = {
             thumb: 353,
             global: true,
             gamewith: 7293,
+            teamDatabase: 'raid_bosses/27',
             Master: [ 88, 114, 118, 352, 354 ],
             Expert: [ 99, 114, 117, 352, 354 ]
         },
@@ -1584,6 +1588,7 @@ window.drops = {
             thumb: 390,
             global: true,
             gamewith: 8285,
+            teamDatabase: 'raid_bosses/6',
             Master: [ 85, 111, 118, 389 ],
             Expert: [ 85, 96, 111, 389 ]
         },
@@ -1593,6 +1598,7 @@ window.drops = {
             thumb: 418,
             global: true,
             gamewith: 9037,
+            teamDatabase: 'raid_bosses/7',
             Ultimate: [ 86, 112, 118, 302, 417 ],
             Master: [ 86, 97, 112, 417 ]
         },
@@ -1611,6 +1617,7 @@ window.drops = {
             thumb: 447,
             global: true,
             gamewith: 11051,
+            teamDatabase: 'raid_bosses/8',
             Master: [ 84, 110, 118, 300, 446 ],
             Expert: [ 84, 110, 446 ]
         },
@@ -1629,6 +1636,7 @@ window.drops = {
             thumb: 516,
             global: true,
             gamewith: 11958,
+            teamDatabase: 'raid_bosses/9',
             Master: [ 87, 97, 113, 117, 118, 294, 295, 303, 429, 515 ],
             Expert: [ 87, 98, 113, 117, 293, 295, 429, 379, 515 ]
         },
@@ -1638,6 +1646,7 @@ window.drops = {
             thumb: 575,
             global: true,
             gamewith: 12792,
+            teamDatabase: 'raid_bosses/10',
             Ultimate: [ 88, 114, 118, 304, 574 ],
             Master: [ 114, 118, 574 ]
         },
@@ -1647,6 +1656,7 @@ window.drops = {
             thumb: 603,
             global: true,
             gamewith: 13682,
+            teamDatabase: 'raid_bosses/11',
             condition: "Take 300 damage per character in Environmental Lightning Damage every 3 turns",
             Ultimate: [ 85, 111, 118, 301, 602 ],
             Master: [ 85, 111, 118, 602 ] ,
@@ -1658,6 +1668,7 @@ window.drops = {
             thumb: 654,
             global: true,
             gamewith: 14747,
+            teamDatabase: 'raid_bosses/12',
             Master: [ 112, 118, 302, 652 ],
             Expert: [ 86, 97, 112, 652 ]
         },
@@ -1667,6 +1678,7 @@ window.drops = {
             thumb: 771,
             global: true,
             gamewith: 17344,
+            teamDatabase: 'raid_bosses/13',
             Master: [ 110, 111, 112, 113, 114, 770, 771, 772, 773, 774, 775 ],
             Expert: [ 110, 111, 112, 113, 114, 770, 771, 772, 773, 774, 775 ]
         },
@@ -1676,6 +1688,7 @@ window.drops = {
             thumb: 795,
             global: true,
             gamewith: 18565,
+            teamDatabase: 'raid_bosses/28',
             condition: "Take 10% current Health in Environmental Damage every 2 turns",
             Master: [ 794 ],
             Expert: [ 794 ]
@@ -1686,6 +1699,7 @@ window.drops = {
             thumb: 836,
             global: true,
             gamewith: 19424,
+            teamDatabase: 'raid_bosses/14',
             Ultimate: [ 835 ],
             Master: [ 835 ]
         },
@@ -1695,6 +1709,7 @@ window.drops = {
             thumb: 865,
             global: true,
             gamewith: 21345,
+            teamDatabase: 'raid_bosses/15',
             Ultimate: [ 864 ],
             Master: [ 864 ],
             Expert: [ 864 ]
@@ -1705,6 +1720,7 @@ window.drops = {
             thumb: 932,
             global: true,
             gamewith: 23507,
+            teamDatabase: 'raid_bosses/24',
             Master: [ 932 ],
             Expert: [ 932 ]
         },
@@ -1714,6 +1730,7 @@ window.drops = {
             thumb: 978,
             global: true,
             gamewith: 25109,
+            teamDatabase: 'raid_bosses/16',
             Ultimate: [ 977 ],
             Master: [ 977 ]
         },
@@ -1731,6 +1748,7 @@ window.drops = {
             name: 'Clash!! Sabo',
             global: true,
             gamewith: 29788,
+            teamDatabase: 'raid_bosses/17',
             thumb: 1047,
             Ultimate: [ 1046 ],
             Master: [ 1046 ],
@@ -1742,6 +1760,7 @@ window.drops = {
             thumb: 1108,
             global: true,
             gamewith: 33648,
+            teamDatabase: 'raid_bosses/25',
             Ultimate: [ 1107 ],
             Master: [ 1107 ],
             Expert: [ 1107 ]
@@ -1752,6 +1771,7 @@ window.drops = {
             thumb: 1163, 
             global: true,
             gamewith: 35950,
+            teamDatabase: 'raid_bosses/26',
             Master: [ 1162, 1164 ],
             Ultimate: [ 1162, 1164, 1180 ]
         },
@@ -1761,6 +1781,7 @@ window.drops = {
             thumb: 1298,
             global: true,
             gamewith: 41277,
+            teamDatabase: 'raid_bosses/18',
             Ultimate: [ 1297 ]
         },
         
@@ -1867,6 +1888,7 @@ window.drops = {
             thumb: 779,
             global: true,
             gamewith: 17473,
+            teamDatabase: 'coliseums',
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629 ]
@@ -1980,6 +2002,111 @@ window.drops = {
             "Captain Buggy": [ 300, 100, 84, 95, 78, 89, 347, -1391, -1031, -1232, -1276, -1550, -739, -214, -707, -735, -890, -1318, -290 ],
         },
 
+   ],
+
+    'Training Forest': [
+
+        {
+            name: 'Forest of Training: Hawk',
+            thumb: 227,
+            gamewith: 2949,
+            teamDatabase: 'forests/1',
+            global: true,
+            completion: 'Ship: Coffin Boat',
+        },
+        
+        {
+            name: 'Forest of Training: Flame Fist',
+            thumb: 562,
+            gamewith: 15896,
+            teamDatabase: 'forests/2',
+            global: true,
+            completion: 'Ship: Striker',
+        },
+        
+        {
+            name: 'Forest of Training: Kami',
+            thumb: 603,
+            gamewith: 25369,
+            teamDatabase: 'forests/7',
+            global: true,
+            completion: 'Ship: Ark Maxim',
+        },
+        
+        {
+            name: 'Forest of Training: Sun',
+            thumb: 935,
+            gamewith: 32540,
+            teamDatabase: 'forests/9',
+            global: true,
+            completion: 'Ship: Sun Pirates Ship',
+        },
+        
+        {
+            name: 'Forest of Training: Beard',
+            thumb: 261,
+            gamewith: 11685,
+            teamDatabase: 'forests/6',
+            global: true,
+            completion: 'Ship: Moby Dick',
+        },
+        
+        {
+            name: 'Forest of Training: Pheasant',
+            thumb: 575,
+            gamewith: 15617,
+            teamDatabase: 'forests/11',
+            global: true,
+            completion: 'Ship: Aokiji\'s Bicycle',
+        },
+        
+        {
+            name: 'Forest of Training: Snake',
+            thumb: 416,
+            gamewith: 24312,
+            teamDatabase: 'forests/8',
+            global: true,
+            completion: 'Ship: Kuja Pirates Ship',
+        },
+        
+        {
+            name: 'Forest of Training: Red Hair',
+            thumb: 530,
+            gamewith: 27893,
+            teamDatabase: 'forests/10',
+            global: true,
+            completion: 'Ship: Red Force',
+        },
+        
+        {
+            name: 'Forest of Training: Heavenly Demon',
+            thumb: 870,
+            gamewith: 34319,
+            global: true,
+            completion: 'Ship: Doflamingo Pirates Ship',
+        },
+        
+        {
+            name: 'Forest of Training: ROOM',
+            thumb: 1045,
+            gamewith: 44527,
+            completion: 'Ship: Polar Tang',
+        },
+        
+        {
+            name: 'Forest of Training: Monkey',
+            thumb: 1240,
+            gamewith: 48115,
+            completion: 'Ship: Kizaru\'s Cannonball',
+        },
+        
+        {
+            name: 'Forest of Training: Darkness',
+            thumb: 1268,
+            gamewith: 59779,
+            completion: 'Ship: Blackbeard Pirates Ship',
+        },
+
    ]
 
 };
diff --git a/drops/index.html b/drops/index.html
index 309a179e0..ceca1f534 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -77,11 +77,17 @@ <h3>
                         <td colspan="2">{{island.completion}} </td>
                     </tr>
                     <tr ng-if="island.gamewith" hide-when-empty>
-                        <td>Gamewith</td>
+                        <td>Gamewith (Japanese)</td>
                         <td colspan="2">
                             <a href = "https://トレクル.gamewith.jp/article/show/{{island.gamewith}}">Gamewith Page</a>
                         </td>
                     </tr>
+                    <tr ng-if="island.teamDatabase" hide-when-empty>
+                        <td>Team Database</td>
+                        <td colspan="2">
+                            <a href = "http://slefty.herokuapp.com/{{island.teamDatabase}}">Team Database Page</a>
+                        </td>
+                    </tr>
                     <tr ng-if="island.condition" hide-when-empty>
                         <td>Condition</td>
                         <td colspan="2">{{island.condition}} </td>
@@ -134,7 +140,7 @@ <h1 class="page-header">
                     ng-model="queryFilter" ng-model-options="{ debounce: 500 }" ng-change="changeQueryFilter()" id="search">
             </h1>
 
-            <div ng-repeat="type in [ 'Story Island', 'Weekly Island', 'Fortnight', 'Raid', 'Special' ]"
+            <div ng-repeat="type in [ 'Story Island', 'Weekly Island', 'Fortnight', 'Raid', 'Special', 'Training Forest' ]"
                 class="type collapsed" collapsable hidden-units="hiddenUnits" only-global="onlyGlobal"
                 target="type.html" type="type" data="data" query="query">
                 <h2>

From fbc6d36ea3d579a089f3e701582ac467cff77d8a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 21:11:34 -0400
Subject: [PATCH 1147/1569] Some fixes

---
 common/data/details.js    | 17 ++++++++---------
 common/data/evolutions.js |  2 +-
 drops/index.html          |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2e4ba0943..9f4958db8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -3336,14 +3336,14 @@ window.details = {
     749: {
         special: "Deals random DEX damage to all enemies, randomizes all orbs",
         specialName: "Tempest Kick: Sky Slicer",
-        specialNotes: "The random damage is between 10,000 and 90,000",
+        specialNotes: "#{random : 10,000 : 90,000}",
         captain: "Boosts ATK of DEX characters by 1.5x, boosts damage of DEX specials by 1.5x",
         captainNotes: "#{noFixedPerc}"
     },
     750: {
         special: "Deals random DEX damage to all enemies, randomizes all orbs",
         specialName: "Tempest Kick: Sky Slicer",
-        specialNotes: "The random damage is between 10,000 and 90,000",
+        specialNotes: "#{random : 10,000 : 90,000}",
         captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
         captainNotes: "#{noFixedPerc}"
     },
@@ -4647,7 +4647,6 @@ window.details = {
         captain: "Boosts ATK of [PSY] and [DEX] characters by 1.75x and their RCV by 1.2x",
         specialName: "Flintlock Barrage",
         special: "Randomly changes all orbs into either [PSY] or [DEX] orbs, deals random PSY damage to all enemies",
-        specialNotes: "Random Damage is currently unknown"
     },
     980: {
         captain: "Boosts ATK of [DEX] and [STR] characters by 1.75x and their RCV by 1.2x",
@@ -5065,13 +5064,13 @@ window.details = {
         captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit no lower than Good",
-        specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
+        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1047: {
         captain: "Boosts ATK of Free Spirit characters by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
         special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit no lower than Good",
-        specialNotes: "The Random Damage is between 10k and 30k <br> Extra Damage can only be boosted by conditional Boosters"
+        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1048: {
         captain: "Boosts ATK and RCV of [PSY] characters by 1.2x",
@@ -6401,7 +6400,7 @@ window.details = {
     },
     1245: {// Event Luffy
         captain: "Boosts ATK of Fighter characters by 1.75x. If HP is below 10%, boosts ATK of Fighter characters by 3x instead.",
-        special: "Deals random [QCK] damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Light of a Firefly, Fire Daruma\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
+        special: "Deals random [QCK] damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Firefly Light, Fiery Doll\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
         specialName:"Gomu Gomu no Stamp Gatling",
         specialNotes: "Firefly Light, Fiery Doll is Event Ace's special ability.",
     },
@@ -6473,7 +6472,7 @@ window.details = {
     },
     1254: {//FN Squard
         captain: "Boosts ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
-        special: "Deals 10x his ATK to one enemy, reduces crews current HP by 30% and reduces enemies defense by a certain amount for one turn",
+        special: "Deals 10x character's ATK in fixed damage to one enemy, reduces crews current HP by 30% and reduces enemies defense by 80% for one turn",
         specialName: "Sword Attack Without Hesitation",
         sailor: "Reduces his own Numbness by 1 turn"
     },
@@ -7692,12 +7691,12 @@ window.details = {
     },
     1421: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2x",
-        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
+        special: "Deals 20x Character's ATK in [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
         specialName: "Half Moon Glaive",
     },
     1422: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2.25x and boosts HP of Striker and Slasher characters by 1.5x",
-        special: "Deals large [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
+        special: "Deals 20x Character's ATK in [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
         specialName: "Half Moon Glaive",
     },
     1423: {//Coliseum T-Bone
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8a5d43d94..0dc12d95b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2141,7 +2141,7 @@ window.evolutions = {
     },
     1400: {
         evolution: 1401,
-        evolvers: [ 118, 84, 300, 267 ]
+        evolvers: [ 118, 78, 83, 95, 300 ]
     },
     1403: {
         evolution: 1404,
diff --git a/drops/index.html b/drops/index.html
index ceca1f534..4c020d2db 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -79,13 +79,13 @@ <h3>
                     <tr ng-if="island.gamewith" hide-when-empty>
                         <td>Gamewith (Japanese)</td>
                         <td colspan="2">
-                            <a href = "https://トレクル.gamewith.jp/article/show/{{island.gamewith}}">Gamewith Page</a>
+                            <a href = "https://トレクル.gamewith.jp/article/show/{{island.gamewith}}" target="_blank">Gamewith Page</a>
                         </td>
                     </tr>
                     <tr ng-if="island.teamDatabase" hide-when-empty>
                         <td>Team Database</td>
                         <td colspan="2">
-                            <a href = "http://slefty.herokuapp.com/{{island.teamDatabase}}">Team Database Page</a>
+                            <a href = "http://slefty.herokuapp.com/{{island.teamDatabase}}" target="_blank">Team Database Page</a>
                         </td>
                     </tr>
                     <tr ng-if="island.condition" hide-when-empty>

From 327caed63571b5b104e298098d9a182b70ecc485 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 23:05:22 -0400
Subject: [PATCH 1148/1569] Damage values added

---
 common/data/details.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9f4958db8..0351ccb05 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6613,14 +6613,14 @@ window.details = {
     1273: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.2",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.44x HP",
-        special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
+        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Champion of the Wild Roar",
     },
     1274: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.2x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.44x HP",
-        special: "Deals large [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
+        special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts HP of all characters by 75",
         specialName: "Champion of the Wild Roar",
     },
@@ -7133,7 +7133,7 @@ window.details = {
     },
     1344: {//Bluejam
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2.25x.",
-        special: "Deals large [STR] damage to one enemy, and boosts ATK of Driven characters by 1.3x for 1 turn",
+        special: "Deals 20x character's ATK in [STR] damage to all enemies, and boosts ATK of Driven characters by 1.3x for 1 turn",
         specialName: "Bullet Purge",
     },
     1345: {//Jimbe
@@ -7230,14 +7230,14 @@ window.details = {
     },
     1363: {//Timeskip Franky
         captain: "Boosts ATK of [PSY] characters by 2x, reduces damage received by 10%",
-        special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
+        special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts HP of [PSY] characters by 100",
         specialName: "Franky Fireball",
     },
     1364: {//Timeskip Franky
         captain: "Boosts ATK of [PSY] characters by 2.5x, reduces damage received by 10%",
-        special: "Deals random [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
+        special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts HP of [PSY] characters by 100",
         specialName: "Franky Fireball",
@@ -7521,11 +7521,11 @@ window.details = {
         captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.275x bonus.",
         special: [
             {
-                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
+                "description": "Deals 13x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
+                "description": "Deals 30x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
@@ -7537,11 +7537,11 @@ window.details = {
         captainNotes: "The bonus is cumulative. Shooter Driven characters get a 2.625x bonus.",
         special: [
             {
-                "description": "Deals [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
+                "description": "Deals 13x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
                 "cooldown": [ 26, 11 ],
             },
             {
-                "description": "Deals large [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
+                "description": "Deals 30x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
                 "cooldown": [ 33, 18 ],
             },
         ],
@@ -8148,13 +8148,13 @@ window.details = {
     },
     1486: {//Coliseum Ideo
         captain: "Boosts ATK of Fighter characters by 2.5x if they have a matching orb.",
-        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
+        special: "Increases damage received by 2x for 2 turns, deals 15x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         specialName: "Destruction Cannon: Hidden Bullet",
     },
     1487: {//Coliseum Ideo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 3x if they have a matching orb.",
-        special: "Increases damage received by 2x for 2 turns, deals random [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
+        special: "Increases damage received by 2x for 2 turns, deals 15x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         specialName: "Destruction Cannon: Hidden Bullet",
     },
@@ -8374,7 +8374,7 @@ window.details = {
     1525: {//Sulieman
         captain: "Boosts ATK of Slasher characters by 3.25x, reduces his own ATK multiplier by 0.0625x at the end of each turn until it is 2x",
         special: "Deals 3 hits of random typeless damage to random enemies, delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.3x for 2 turns",
-        specialNotes: "#{randomHits : 3}",
+        specialNotes: "#{randomHits : 3}<br>#{random : 50,000 : 150,000 : per hit}",
         specialName: "Sorrowful Execution",
     },
     1526: {//Arlong

From 589158cc71d43e95e076b668a673490fb1dc974c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 23:15:52 -0400
Subject: [PATCH 1149/1569] Fisher Tiger Cooldown

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5a82c61d9..7d79206a4 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1629,6 +1629,6 @@ window.cooldowns = [
     null,//Mach Vise
     [ 15, 5 ],
     [ 15, 5 ],
-    21,
-    21
+    [ 21, 17 ],
+    [ 21, 17 ],
 ];

From 7e31158320eaa200e347b378e3be0025873bf578 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 16 Jun 2017 23:47:05 -0400
Subject: [PATCH 1150/1569] Fisher Tiger info

---
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0dc12d95b..fcab24d41 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2525,6 +2525,6 @@ window.evolutions = {
     },
     1631: {
         evolution: 1632,
-        evolvers: [  ]
+        evolvers: [ 118, 87, 266, 98, 303 ]
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 9e2e88192..c1785e509 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1629,8 +1629,8 @@ window.units = [
     [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, 1310, 490, 77, 3110, 1198, 186, null ],
     [ "Ikaros, Deep Sea Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 93, 54, 24, 920, 446, 151, null ],
     [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 876, 409, 104, 2230, 1142, 199, null ],
-    [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Fisher Tiger, Captain of the Sun Pirates", "PSY", [ "Powerhouse", "Fighter" ], 5, 30, null, null, 99, 4000000, null, null, null, 2522, 1386, 313, null ],
+    [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 1066998, null, null, null, 1323, 707, 180, null ],
+    [ "Fisher Tiger, Captain of the Sun Pirates", "PSY", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1250, 630, 132, 2522, 1386, 313, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 4d102a6c8d04ec3afbd0fccddbc753f47e8deac4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 17 Jun 2017 15:52:39 -0400
Subject: [PATCH 1151/1569] Dosun/Moria Fix

---
 common/data/specials.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 9cf44edd4..7268c5227 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2879,7 +2879,7 @@ window.specials = {
     1623: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
     },
-    1618: {
+    1626: {
         atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
     },

From ebfefb7288bdbd4f8750a97752e2fde71557895b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 17 Jun 2017 20:08:45 -0400
Subject: [PATCH 1152/1569] Details

---
 common/data/cooldowns.js | 4 ++--
 common/data/details.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7d79206a4..7e2b0b595 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1499,7 +1499,7 @@ window.cooldowns = [
     17,
     15,
     20,
-    15,
+    [ 15, 9 ],
     16,
     14,
     [ 19, 13 ],
@@ -1560,7 +1560,7 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 11, 5 ],
     [ 23, 17 ],
-    15,
+    [ 15, 9 ],
     null,//Fortnight Elizabello
     null,//Fortnight Elizabello
     [ 15, 9 ],
diff --git a/common/data/details.js b/common/data/details.js
index 0351ccb05..216cb97de 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8259,12 +8259,12 @@ window.details = {
     },
     1505: {//Hody Jones
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.25x if HP is below 30% at the start of the turn",
-        special: "Deals large [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
+        special: "Deals 15x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
         specialName: "Shark Arrows",
     },
     1506: {//Hody Jones
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.5x if HP is below 30% at the start of the turn, 2.25x otherwise",
-        special: "Deals large [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
+        special: "Deals 15x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
         specialName: "Shark Arrows",
     },
     1507: {//White Day Sanji

From 7eeb49b1e2ef0ad14edf5011712d66c6f9e9b717 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 19 Jun 2017 12:10:00 -0400
Subject: [PATCH 1153/1569] Rand Damage values

---
 common/data/details.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 216cb97de..6cee15279 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2705,11 +2705,13 @@ window.details = {
     630: {
         special: "Randomly changes all orbs into either [QCK] or [DEX] orbs, deals random QCK damage to all enemies",
         specialName: "Tempest Kick: Slaughter",
+        specialNotes: "#{random : 5,000 : 15,000}",
         captain: "Boosts ATK of Slasher characters by 1.5x"
     },
     631: {
         special: "Randomly changes all orbs into either [QCK] or [DEX] orbs, deals random QCK damage to all enemies",
         specialName: "Tempest Kick: Slaughter",
+        specialNotes: "#{random : 5,000 : 15,000}",
         captain: "Boosts ATK of Slasher characters by 2x"
     },
     632: {
@@ -4048,13 +4050,13 @@ window.details = {
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 1.75x",
         specialName: "Battle Preservation Fist: Manki Kayaku",
         special: "Randomly changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
-        specialNotes: "#{gOrbs}"
+        specialNotes: "#{gOrbs}<br>#{random : 5,000 : 100,000}"
     },
     880: {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Fighter characters by 2x",
         specialName: "Battle Preservation Fist: Manki Kayaku",
         special: "Randomly changes all orbs including [BLOCK] orbs into [G] orbs, deals random typeless damage to all enemies",
-        specialNotes: "#{gOrbs}"
+        specialNotes: "#{gOrbs}<br>#{random : 5,000 : 100,000}"
     },
     881: {
         captain: "Boosts ATK of Shooter and Free Spirit characters by 2x following a chain of Good > Great > Perfect hits",
@@ -4476,7 +4478,8 @@ window.details = {
     948: {
         captain: "Boosts ATK of Shooter characters by 1.5x and their RCV by 1.2x",
         specialName: "Twin Cannons",
-        special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage"
+        special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage",
+        specialNotes: "#{random : 7,000 : 18,000}",
     },
     949: {
         captain: "Boosts ATK of Slasher characters by 2x, recovers 2x character's RCV in HP at the end of each turn",

From 01b8c16966620beddf41eb6371e36da606663616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 21 Jun 2017 12:49:14 +0200
Subject: [PATCH 1154/1569] Mach Vise (#1628) standarized [...]

[...] following previous naming
---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index c1785e509..c8c88caa8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1626,7 +1626,7 @@ window.units = [
     [ "Daruma, Deep Sea Fishman Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 4, 4, 99, 3000000, 48, 53, 24, 1405, 985, 320, 1 ],
     [ "Dosun, Deep Sea Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 20, 6, 4, 99, 3000000, 91, 60, 21, 2050, 1155, 274, 1 ],
     [ "Machvise, Super Weight Human", "DEX", [ "Striker", "Free Spirit" ], 4, 25, 4, 3, 70, 1066998, 140, 70, 16, 1540, 590, 98, null ],
-    [ "Mach Vise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, 1310, 490, 77, 3110, 1198, 186, null ],
+    [ "Machvise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, 1310, 490, 77, 3110, 1198, 186, null ],
     [ "Ikaros, Deep Sea Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 93, 54, 24, 920, 446, 151, null ],
     [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 876, 409, 104, 2230, 1142, 199, null ],
     [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 1066998, null, null, null, 1323, 707, 180, null ],

From 8bd6114aace06f255aac7461f5b36553bbe582f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 21 Jun 2017 12:49:28 +0200
Subject: [PATCH 1155/1569] Added Alternative name [...]

[...]to Machvise (#990-991)
---
 common/data/aliases.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 654b64bd9..0e9cc7d6b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -988,8 +988,8 @@ window.aliases = {
     987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
     988: ['マウンブルテン＆トルコ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
     989: ['ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
-    990: ['マッハ・バイス',''],
-    991: ['マッハ・バイス ドンキホーテ海賊団',''],
+    990: ['マッハ・バイス','','Mach Vise'],
+    991: ['マッハ・バイス ドンキホーテ海賊団','''Mach Vise'],
     992: ['グラディウス',''],
     993: ['グラディウス ドンキホーテ海賊団',''],
     994: ['ヴァイオレット','', 'Viola'],
@@ -1633,4 +1633,4 @@ window.aliases = {
     1632: ['', '', ''],
 };
 
-//  xxxx: ['JPN', 'FR', 'Other'],
\ No newline at end of file
+//  xxxx: ['JPN', 'FR', 'Other'],

From c6967bae7293b4cb304291a264272103896ab2e4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 21 Jun 2017 14:56:26 -0400
Subject: [PATCH 1156/1569] Commas

---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0e9cc7d6b..712298cdb 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -989,7 +989,7 @@ window.aliases = {
     988: ['マウンブルテン＆トルコ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
     989: ['ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
     990: ['マッハ・バイス','','Mach Vise'],
-    991: ['マッハ・バイス ドンキホーテ海賊団','''Mach Vise'],
+    991: ['マッハ・バイス ドンキホーテ海賊団', '', 'Mach Vise'],
     992: ['グラディウス',''],
     993: ['グラディウス ドンキホーテ海賊団',''],
     994: ['ヴァイオレット','', 'Viola'],

From e5d072e66943759b2d3c12ebd6e4f1a5dd3a83e7 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Wed, 21 Jun 2017 13:16:08 -0700
Subject: [PATCH 1157/1569] New units

---
 common/data/captains.js | 26 ++++++++++++++++++-
 common/data/details.js  | 56 +++++++++++++++++++++++++++++++++++++++++
 common/data/specials.js | 13 ++++++++++
 common/data/units.js    | 15 +++++++++++
 4 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 6e76fbcc0..81534fb20 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2174,7 +2174,7 @@ window.captains = {
         chainModifier: function(p) { return 2; }
     },
     932: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     933: {
@@ -4831,4 +4831,28 @@ window.captains = {
     1632: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
     },
+    1633: {
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+    },
+    1634: {
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+    },
+    1635: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    1636: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    1637: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25: 1; }
+    },
+    1646: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1647: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 6cee15279..e25432a46 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9110,4 +9110,60 @@ window.details = {
         specialName: "Rebellion against the \"Prohibition\" - Taboo",
         sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn",
     },
+    1633: {//Punk Hazard Dragon
+        captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
+        special: "Deals 15x character's ATK in [STR] damage to all enemies and amplifies the effect of orbs by 1.25x for 1 turn",
+        specialName: "Punk Hazard Dragon Special",
+    },
+    1634: {//Yeti Cool Brothers
+        captain: "Boosts HP of [INT] characters by 2x",
+        special: "Reduces damage received by 50% for 1 turn",
+        specialName: "Yeti Cool Brothers Special",
+    },
+    1635: {//Brownbeard
+        captain: "Boosts OWN ATK by 1.5x and the ATK of cerebral characters by 2x",
+        special: "Cuts the HP of all enemies by 20% and binds himself for 5 turns",
+        specialName: "Brownbeard Special",
+    },
+    1636: {//Caesar Clown
+        captain: "Boosts ATK of cerebral characters by 2x",
+        special: "For 3 turns, boosts ATK against poisoned and strongly poisoned enemies by 1.3x and changes [BOMB] orbs into matching orbs",
+        specialName: "Gastanet",
+    },
+    1637: {//Caesar Clown Evolved
+        captain: "Boosts ATK of cerebral characters by 2.25x and reduces damage received by 15%",
+        special: "For 3 turns, boosts ATK against poisoned and strongly poisoned enemies by 1.3x and changes [BOMB] orbs into matching orbs",
+        specialName: "Gastanet",
+    },
+    1646: {
+        captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
+        specialName: "Rock Domination Wall",
+        special: [
+            {
+                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
+                "cooldown": [ 20, 11 ]
+            },
+            {
+                "description": "Changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 20%",
+                "cooldown": [ 26, 17 ]
+            }
+        ],
+        specialNotes: "#{stages}"	
+        },
+    1647: {
+        captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x",
+        specialName: "Rock Domination Wall",
+        special: [
+            {
+                "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
+                "cooldown": [ 20, 11 ]
+            },
+            {
+                "description": "Changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 20%",
+                "cooldown": [ 26, 17 ]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
+    
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 7268c5227..34f9fafc8 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2913,4 +2913,17 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         type: "class",
     },
+    1633: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+    },
+    1636: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+    },
+    1637: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index c8c88caa8..1be3a417e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1631,6 +1631,21 @@ window.units = [
     [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 876, 409, 104, 2230, 1142, 199, null ],
     [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 1066998, null, null, null, 1323, 707, 180, null ],
     [ "Fisher Tiger, Captain of the Sun Pirates", "PSY", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1250, 630, 132, 2522, 1386, 313, null ],
+    [ "Punk Hazard Dragon", "STR", [ "Powerhouse", "Shooter" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Yeti Cool Brothers, Rock and Scotch", "INT", [ "Shooter", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Brownbeard", "PSY", [ "Slasher", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caesar Clown", "QCK", [ "Shooter", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caesar Clown Evolved", "QCK", [ "Cerebral", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #1", "STR", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #2", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #3", "DEX", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #4", "INT", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #5", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #7", "STR", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #6", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fodder #8", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Pica, Donquixote Pirates, Reformed", "STR", [ "Powerhouse", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Pica, Donquixote Pirates, Reformed Evolved", "STR", [ "Powerhouse", "Driven" ], 5, 50, null, 3, 99, null, null, null, null, 4020, 1210, 5, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 81f8e2b5302dafdd055968ec72fb2cfd782c714a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 21 Jun 2017 16:38:20 -0400
Subject: [PATCH 1158/1569] Tedious stuffs

---
 common/data/aliases.js    | 17 ++++++++++++++++-
 common/data/cooldowns.js  | 15 +++++++++++++++
 common/data/details.js    | 14 +++++++-------
 common/data/evolutions.js |  8 ++++++++
 common/data/families.js   | 38 ++++++++++++++++++++++++++------------
 common/data/units.js      |  4 ++--
 6 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 712298cdb..b09e41b44 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1327,7 +1327,7 @@ window.aliases = {
     1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード','','Halloween Corazon'],
     1327: ['レオ トンタッタ族トンタ兵団','',''],
     1328: ['戦士レオ トンタッタ族トンタ兵団','',''],
-    1329: ['ウィッカ','',''],
+    1329: ['ウィッカ','','Wicka'],
     1330: ['ガンチョ','',''],
     1331: ['マンシェリー トンタ長の娘','',''],
     1332: ['マンシェリー トンタッタ王国の姫','',''],
@@ -1631,6 +1631,21 @@ window.aliases = {
     1630: ['', '', 'Coliseum Ikaros Much'],
     1631: ['', '', ''],
     1632: ['', '', ''],
+    1633: ['', '', ''],
+    1634: ['', '', ''],
+    1635: ['', '', ''],
+    1636: ['', '', ''],
+    1637: ['', '', ''],
+    1638: ['', '', ''],
+    1639: ['', '', ''],
+    1640: ['', '', ''],
+    1641: ['', '', ''],
+    1642: ['', '', ''],
+    1643: ['', '', ''],
+    1644: ['', '', ''],
+    1645: ['', '', ''],
+    1646: ['', '', ''],
+    1647: ['', '', ''],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7e2b0b595..1505827c9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1631,4 +1631,19 @@ window.cooldowns = [
     [ 15, 5 ],
     [ 21, 17 ],
     [ 21, 17 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,//Pica
+    null,//Pica
 ];
diff --git a/common/data/details.js b/common/data/details.js
index e25432a46..41a37110f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9121,23 +9121,23 @@ window.details = {
         specialName: "Yeti Cool Brothers Special",
     },
     1635: {//Brownbeard
-        captain: "Boosts OWN ATK by 1.5x and the ATK of cerebral characters by 2x",
+        captain: "Boosts OWN ATK by 1.5x and the ATK of Cerebral characters by 2x",
         special: "Cuts the HP of all enemies by 20% and binds himself for 5 turns",
         specialName: "Brownbeard Special",
     },
     1636: {//Caesar Clown
-        captain: "Boosts ATK of cerebral characters by 2x",
+        captain: "Boosts ATK of Cerebral characters by 2x",
         special: "For 3 turns, boosts ATK against poisoned and strongly poisoned enemies by 1.3x and changes [BOMB] orbs into matching orbs",
         specialName: "Gastanet",
     },
     1637: {//Caesar Clown Evolved
-        captain: "Boosts ATK of cerebral characters by 2.25x and reduces damage received by 15%",
+        captain: "Boosts ATK of Cerebral characters by 2.25x and reduces damage received by 15%",
         special: "For 3 turns, boosts ATK against poisoned and strongly poisoned enemies by 1.3x and changes [BOMB] orbs into matching orbs",
         specialName: "Gastanet",
     },
-    1646: {
+    1646: {//Reborn Pica
         captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
-        specialName: "Rock Domination Wall",
+        specialName: "Rock Domination Wall [Reformed]",
         special: [
             {
                 "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
@@ -9150,9 +9150,9 @@ window.details = {
         ],
         specialNotes: "#{stages}"	
         },
-    1647: {
+    1647: {//Reborn Pica
         captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x",
-        specialName: "Rock Domination Wall",
+        specialName: "Rock Domination Wall [Reformed]",
         special: [
             {
                 "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index fcab24d41..05328e6ee 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2527,4 +2527,12 @@ window.evolutions = {
         evolution: 1632,
         evolvers: [ 118, 87, 266, 98, 303 ]
     },
+    1636: {
+        evolution: 1637,
+        evolvers: [  ]
+    },
+    1646: {
+        evolution: 1647,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 807dedc77..406441a07 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -886,7 +886,7 @@ window.families = [
     "Jimbe",
     "Daz Bones",
     "Buggy",
-    null,
+    "Horo Horo Ghost",
     "Perona",
     "Perona",
     "Hogback",
@@ -929,7 +929,7 @@ window.families = [
     "Hannyabal",
     "Hannyabal",
     "Saldeath",
-    null,
+    "Blugori",
     "Pica",
     "Pica",
     "Jimbe",
@@ -1153,7 +1153,7 @@ window.families = [
     "Minozebra",
     "Sphinx",
     "Saldeath",
-    null,
+    "Army Wolf",
     "Hannyabal",
     "Hannyabal",
     "Magellan",
@@ -1170,12 +1170,12 @@ window.families = [
     "Dice",
     "Tanaka",
     "Tanaka",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Brook",
+    "Brook",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
     "Oars",
     "Oars",
     null,
@@ -1213,9 +1213,9 @@ window.families = [
     "Franky",
     "Baby 5",
     "Baby 5",
-    null,
-    null,
-    null,
+    "Gairam",
+    "Sebastian",
+    "Nightin",
     "Boa Hancock",
     "Byrnndi World",
     "Byrnndi World",
@@ -1631,4 +1631,18 @@ window.families = [
     "Ikaros Much",
     "Fisher Tiger",
     "Fisher Tiger",
+    "Punk Hazard Dragon",
+    "Rock and Scotch",
+    "Brownbeard",
+    "Caesar Clown",
+    "Caesar Clown",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 1be3a417e..a9bc60185 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1644,8 +1644,8 @@ window.units = [
     [ "Fodder #7", "STR", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fodder #6", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Fodder #8", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Pica, Donquixote Pirates, Reformed", "STR", [ "Powerhouse", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Pica, Donquixote Pirates, Reformed Evolved", "STR", [ "Powerhouse", "Driven" ], 5, 50, null, 3, 99, null, null, null, null, 4020, 1210, 5, null ],
+    [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Pica, Donquixote Pirates [Reformed]", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, null, null, null, 4020, 1210, 5, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 0ba529b26c231be90ba7b6c2044f79f723678a16 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 21 Jun 2017 16:44:26 -0400
Subject: [PATCH 1159/1569] Found a thing

---
 drops/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drops/index.html b/drops/index.html
index 4c020d2db..124c71468 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -104,7 +104,7 @@ <h3>
                 </tbody>
                 <tbody>
                     <tr ng-repeat="(stage,data) in island"
-                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion' && stage != 'challengeData' && stage != 'showManual' && stage != 'gamewith'">
+                        ng-if="stage != 'thumb' && stage != 'day' && stage != 'name' && stage != 'shortName' && stage != 'global' && stage != 'condition' && stage != 'challenge' && stage != 'completion' && stage != 'challengeData' && stage != 'showManual' && stage != 'gamewith' && stage != 'teamDatabase'">
                         <td>
                             {{type == 'Story Island'&& stage!='Completion Units' ? 'Stage ' + stage : (stage.length < 2 ? 'Any' : stage)}}
                         </td>

From a6e07b893188442b3685b1e1f145144e6e380ecf Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 22 Jun 2017 01:11:05 -0400
Subject: [PATCH 1160/1569] Story Mode?

---
 common/data/captains.js   |  11 +++
 common/data/cooldowns.js  |  28 +++----
 common/data/details.js    | 168 +++++++++++++++++++++++---------------
 common/data/drops.js      |  32 ++++++++
 common/data/evolutions.js |   2 +-
 common/data/families.js   |   3 +-
 common/data/gw.js         |  17 ++++
 common/data/specials.js   |  18 ++++
 common/data/units.js      |  22 ++---
 common/js/utils.js        |   2 +-
 damage/js/cruncher.js     |   3 +-
 damage/js/utils.js        |   6 ++
 12 files changed, 218 insertions(+), 94 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 81534fb20..795ceb005 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4847,6 +4847,17 @@ window.captains = {
     1637: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25: 1; }
     },
+    1644: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    1645: {
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") && p.unit.type == "DEX" ? 1.96 :
+                p.unit.class.has("Slasher") && !p.unit.type == "DEX" ? 1.3 :
+                !p.unit.class.has("Slasher") && p.unit.type == "DEX" ? 1.5 :
+                1;
+        }
+    },
     1646: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1505827c9..dc62d8f35 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1623,27 +1623,27 @@ window.cooldowns = [
     [ 23, 14 ],
     [ 23, 14 ],
     [ 15, 9 ],
-    [ 15, 9 ],
     [ 20, 14 ],
+    [ 15, 9 ],
     null,//Mach Vise
     null,//Mach Vise
     [ 15, 5 ],
     [ 15, 5 ],
     [ 21, 17 ],
     [ 21, 17 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    14,
+    19,
+    19,
+    17,
+    17,
+    15,
+    15,
+    16,
+    22,
+    20,
+    19,
+    19,
+    22,
     null,//Pica
     null,//Pica
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 41a37110f..039a2cdc7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1457,11 +1457,11 @@ window.details = {
         captain: "Boosts RCV of all characters by 1.5x"
     },
     379: {
-        special: "Removes poison",
+        special: "Removes Poison",
         specialName: "Dugong Kung Fu Fist of Healing"
     },
     380: {
-        special: "Removes poison",
+        special: "Removes Poison",
         specialName: "Dugong Kung Fu Fist of Healing",
         captain: "Boosts ATK and RCV of STR characters by 1.5x"
     },
@@ -1474,14 +1474,14 @@ window.details = {
         specialName: "Shield Crusher"
     },
     383: {
-        special: "Strongly poisons one enemy",
-        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        special: "Strongly Poisons one enemy",
+        specialNotes: "Strong Poison deals 5x character's ATK in fixed damage at the end of each turn",
         specialName: "Poison Needle",
         captain: "Reduces damage received by 10%, boosts ATK of INT characters by 2x"
     },
     384: {
-        special: "Strongly poisons one enemy",
-        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        special: "Strongly Poisons one enemy",
+        specialNotes: "Strong Poison deals 5x character's ATK in fixed damage at the end of each turn",
         specialName: "Poison Needle",
         captain: "Reduces damage received by 20%, boosts ATK of INT characters by 2x"
     },
@@ -1518,13 +1518,13 @@ window.details = {
         captain: "Boosts ATK by 2.75x following a chain of DEX > INT > QCK attacks no lower than Good"
     },
     391: {
-        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, Poisons enemies for 1,000 damage for a single turn",
         specialName: "Negative Hollow",
         specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
         captain: "Boosts RCV of DEX characters by 1.5x"
     },
     392: {
-        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, poisons enemies for 1,000 damage for a single turn",
+        special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 80% for 1 turn, Poisons enemies for 1,000 damage for a single turn",
         specialName: "Negative Hollow",
         specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
         captain: "Boosts RCV of DEX characters by 2x"
@@ -1760,13 +1760,13 @@ window.details = {
         captain: "Boosts ATK by 2.25x following a chain of INT > PSY > QCK attacks no lower than Good"
     },
     437: {
-        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
+        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, Poisons enemies for 1,000 for a single turn",
         specialName: "Negative Horo \"Sweet\"",
         specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
         captain: "Boosts RCV of [DEX] characters by 3x if HP is below 30% at the start of the turn"
     },
     438: {
-        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, poisons enemies for 1,000 for a single turn",
+        special: "Recovers 3x character's RCV in HP, reduces damage received by 80% for 1 turn, Poisons enemies for 1,000 for a single turn",
         specialName: "Negative Horo \"Sweet\"",
         specialNotes: "Poison damage deals 1,000 damage exactly and will ignore enemy armor at the end of your turn",
         captain: "Boosts RCV of [DEX] characters by 5x if HP is below 30% at the start of the turn"
@@ -2024,7 +2024,7 @@ window.details = {
         specialName: "Moderate Healing"
     },
     494: {
-        special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
+        special: "Deals 3x character's ATK in INT damage to all enemies, Poisons all enemies",
         specialNotes: "#{poison}",
         specialName: "Poison Attack"
     },
@@ -2034,7 +2034,7 @@ window.details = {
         captain: "Recovers 500 HP at the end of each turn"
     },
     496: {
-        special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
+        special: "Deals 3x character's ATK in INT damage to all enemies, Poisons all enemies",
         specialNotes: "#{poison}",
         specialName: "Poison Attack",
         captain: "Boosts ATK of Shooter characters by 1.5x"
@@ -2210,13 +2210,13 @@ window.details = {
         sailor: "Boosts RCV of PSY characters by 15"
     },
     527: {
-        special: "Removes poison, recovers 15x character's RCV in HP",
+        special: "Removes Poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 1.5x",
         sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
     },
     528: {
-        special: "Removes poison, recovers 15x character's RCV in HP",
+        special: "Removes Poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 2x",
         sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
@@ -2528,12 +2528,12 @@ window.details = {
         captain: "Boosts HP and RCV of PSY characters by 1.5x"
     },
     587: {
-        special: "Removes poison, reduces Bind and Despair duration by 2 turns",
+        special: "Removes Poison, reduces Bind and Despair duration by 2 turns",
         specialName: "Merciful Painkiller",
         captain: "Recovers 3x character's RCV in HP at the end of each turn"
     },
     588: {
-        special: "Removes poison, reduces Bind and Despair duration by 2 turns",
+        special: "Removes Poison, reduces Bind and Despair duration by 2 turns",
         specialName: "Merciful Painkiller",
         captain: "Recovers 5x character's RCV in HP at the end of each turn"
     },
@@ -2954,12 +2954,12 @@ window.details = {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Fighter characters by 2x"
     },
     674: {
-        special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
+        special: "Removes Poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
         specialName: "Emporio Healing Hormone",
         captain: "Boosts ATK of Free Spirit characters by 2x"
     },
     675: {
-        special: "Removes poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
+        special: "Removes Poison, reduces damage received by 50% for 2 turns, recovers 13x character's RCV in HP at the end of each turn for 2 turns",
         specialName: "Emporio Healing Hormone",
         captain: "Boosts ATK of Free Spirit characters by 2.5x"
     },
@@ -3445,7 +3445,7 @@ window.details = {
         captain: "Boosts ATK of PSY characters by 2x"
     },
     769: {
-        special: "Recovers 4,343 HP, poisons all enemies",
+        special: "Recovers 4,343 HP, Poisons all enemies",
         specialNotes: "#{poison}",
         specialName: "Lullaby Parry: Horror",
         captain: "Boosts ATK and RCV of INT characters by 1.5x"
@@ -3596,7 +3596,7 @@ window.details = {
         captain: "Boosts ATK of Cerebral and Powerhouse characters by 2x"
     },
     798: {
-        special: "Removes poison, following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Fighter characters by 1.75x in the following turn",
+        special: "Removes Poison, following the activation of the special, if every unit scores a Perfect hit, boosts ATK of Fighter characters by 1.75x in the following turn",
         specialName: "Dugong Secret! Fist of the Black Fin",
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row"
     },
@@ -3738,17 +3738,17 @@ window.details = {
     827: {
         captain: "Boosts ATK and HP of QCK characters by 1.5x",
         specialName: "Poison of the Ancient Knight",
-        special: "Boosts ATK against poisoned enemies by 1.05x for 999 turns"
+        special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.05x for 999 turns"
     },
     828: {
         specialName: "Surprise Stab",
-        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turns if used below 20% HP",
+        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turn if used below 20% HP",
         captain: "Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}" 
     },
     829: {
         specialName: "Surprise Stab",
-        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turns if used below 20% HP",
+        special: "Deals 3x character's ATK in [PSY] damage to one enemy, Boosts ATK of Slasher and Driven characters by 1.75x for 1 turn if used below 20% HP",
         captain: "Protects from defeat as long as HP is above 30%",
         captainNotes: "#{zombie}" 
     },
@@ -4353,12 +4353,12 @@ window.details = {
     },
     928: {
         captain: "Boosts ATK of Driven characters by 1.75x while above 30% HP and boosts ATK of Striker characters by 1.75x while below 30% HP",
-        special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
+        special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns",
         specialName: "Hell Wisdom Rush"
     },
     929: {
         captain: "Boosts ATK of Driven characters by 2.25x while above 30% HP and boosts ATK of Striker characters by 2.25x while below 30% HP",
-        special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned enemies by 1.3x for 3 turns",
+        special: "Deals 7x his ATK in [DEX] damage to all enemies, and boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns",
         specialName: "Hell Wisdom Rush"
     },
     930: {
@@ -4784,7 +4784,7 @@ window.details = {
         specialNotes: "#{stages}"
     },
     998: {
-        captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turns at the start of the fight",
+        captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turn at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
     },
@@ -4865,7 +4865,7 @@ window.details = {
     },
     1013: {
         specialName: "Binding Iron Chain",
-        special: "Boosts ATK against delayed enemies by 1.2x for 1 turns"
+        special: "Boosts ATK against delayed enemies by 1.2x for 1 turn"
     },
     1014: {
         special: "Binds himself for 1 turn and makes Perfects easier to hit for 2 turns",
@@ -5122,14 +5122,14 @@ window.details = {
         specialName: "Snake Press"
     },
     1057: {
-        special: "Strongly poisons one enemy",
-        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        special: "Strongly Poisons one enemy",
+        specialNotes: "Strong Poison deals 5x character's ATK in fixed damage at the end of each turn",
         specialName: "Deadly Poisonous Corrosive Liquid"
     },
     1058: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.25x",
-        special: "Strongly poisons one enemy",
-        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn",
+        special: "Strongly Poisons one enemy",
+        specialNotes: "Strong Poison deals 5x character's ATK in fixed damage at the end of each turn",
         specialName: "Deadly Poisonous Corrosive Liquid"
     },
     1059: {
@@ -5738,7 +5738,7 @@ window.details = {
         special: "Reduces Paralysis by 1 turn"
     },
     1149:{
-        special: "Deals 3x character's ATK in INT damage to all enemies, poisons all enemies",
+        special: "Deals 3x character's ATK in INT damage to all enemies, Poisons all enemies",
         specialNotes: "#{poison}",
         specialName: "Poison Attack",
     },
@@ -5770,26 +5770,26 @@ window.details = {
     },
     1156: {
         captain: "Boosts ATK of Driven characters by 1.2x if HP is above 50% at the start of the turn",
-        special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Removes Poison. Protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Abyss Road",
         specialNotes: "#{zombie}",
     },
     1157: {
         captain: "Boosts ATK of Driven and Striker characters by 1.75x and protects from defeat as long as HP is above 50% at the start of the turn",
-        special: "Removes poison. Protects from defeat as long as HP is above 50% for 1 turn",
+        special: "Removes Poison. Protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Abyss Road",
         specialNotes: "#{zombie}",
     },
     1158: {
         captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
-        special: "Cuts the current HP of all enemies by 20%. Strongly poisons one enemy, and poisons all other enemies.",
-        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
+        special: "Cuts the current HP of all enemies by 20%. Strongly Poisons one enemy, and Poisons all other enemies.",
+        specialNotes: "Strong Poison deals 5x character's ATK in fixed damage at the end of each turn. Regular Poison deals .5x character's ATK in fixed damage at the end of each turn.",
         specialName: "Poison Puffer Fish"
     },
     1159: {
         captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 2.25x",
-        special: "Cuts the current HP of all enemies by 20%. Strongly poisons one enemy, and poisons all other enemies.",
-        specialNotes: "Strong poison deals 5x character's ATK in fixed damage at the end of each turn. Regular poison deals .5x character's ATK in fixed damage at the end of each turn.",
+        special: "Cuts the current HP of all enemies by 20%. Strongly Poisons one enemy, and Poisons all other enemies.",
+        specialNotes: "Strong Poison deals 5x character's ATK in fixed damage at the end of each turn. Regular Poison deals .5x character's ATK in fixed damage at the end of each turn.",
         specialName: "Poison Puffer Fish"
     },
     1160: {
@@ -5887,13 +5887,13 @@ window.details = {
         sailor: "Boosts ATK of Slasher characters by 20"
     },
     1176: {
-        special: "Removes poison, recovers 15x character's RCV in HP",
+        special: "Removes Poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 1.5x",
         sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
     },
     1177: {
-        special: "Removes poison, recovers 15x character's RCV in HP",
+        special: "Removes Poison, recovers 15x character's RCV in HP",
         specialName: "Devoted Healing - \"I'm Glad You are Safe\"",
         captain: "Boosts ATK and RCV of DEX characters by 2x",
         sailor: "When HP is below 30% at the start of the turn, boosts own RCV by 50"
@@ -6766,12 +6766,12 @@ window.details = {
     },
     1295: {//Halloween Kalifa
         captain: "Boosts ATK and RCV of [STR] characters by 1.5x",
-        special: "Reduces duration of Paralysis by 3 turns, removes poison, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Reduces duration of Paralysis by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
         specialName: "Mysterious Hour of the Dark Night",
     },
     1296: {//Halloween Kalifa
         captain: "Boosts ATK of [STR] characters by 2x and their RCV by 1.5x",
-        special: "Reduces duration of Paralysis by 3 turns, removes poison, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Reduces duration of Paralysis by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
         specialName: "Mysterious Hour of the Dark Night",
     },
     1297: {//Akainu
@@ -7401,13 +7401,13 @@ window.details = {
     },
     1379: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
-        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
+        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turn.",
         specialName: "A Decision Made over Sake",
         specialNotes: "#{orb : 2x}",
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
-        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turns.",
+        special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turn.",
         specialName: "A Decision Made over Sake",
         specialNotes: "#{orb : 2x}",
     },
@@ -7684,12 +7684,12 @@ window.details = {
     },
     1419: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2x, reduce damage received by 10%",
-        special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
+        special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turn",
         specialName: "Demonic Style",
     },
     1420: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduce damage received by 10%",
-        special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turns",
+        special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turn",
         specialName: "Demonic Style",
     },
     1421: {//Coliseum Diamante
@@ -7757,7 +7757,7 @@ window.details = {
         specialName: "General Cannon",
     },
     1433: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
@@ -7773,7 +7773,7 @@ window.details = {
         specialName: "Water Bullets",
     },
     1434: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turns at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
@@ -8163,12 +8163,12 @@ window.details = {
     },
     1488: {//Coliseum Don Krieg
         captain: "Boosts ATK of Driven characters by 1.5x, reduces damage received by 20%",
-        special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Change Up and Orb Change Down Buffs",
+        special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Rate Up and Orb Rate Down Buffs",
         specialName: "Great Battle Spear",
     },
     1489: {//Coliseum Don Krieg
         captain: "Boosts ATK of Driven characters by 2x, reduces damage received by 20%",
-        special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Change Up and Orb Change Down Buffs",
+        special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Rate Up and Orb Rate Down Buffs",
         specialName: "Great Battle Spear",
     },
     1490: {//Coliseum Mr. 5
@@ -8240,7 +8240,7 @@ window.details = {
         specialName: "First Aid",
     },
     1501: {//Caribou
-        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight, boosts ATK of characters with cost 15 or less by 2x",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of characters with cost 15 or less by 2x",
         special: "Reduces crew's current HP by 50%, boosts ATK of all characters by 1.3x for 1 turn",
         specialName: "Conviction of God's Will",
     },
@@ -8305,7 +8305,7 @@ window.details = {
     },
     1512: {//Kingdew
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
-        special: "Removes poison, boosts ATK of Powerhouse characters by 1.5x for 1 turn if HP is below 30% when the special is activated",
+        special: "Removes Poison, boosts ATK of Powerhouse characters by 1.5x for 1 turn if HP is below 30% when the special is activated",
         specialName: "Enlightened Spirit",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character",
     },
@@ -8342,12 +8342,12 @@ window.details = {
         specialName: "Spring Hopper - Bullet",
     },
     1519: {//Dadan
-        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight. Boosts ATK of Slasher characters by 1.5x",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of Slasher characters by 1.5x",
         special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
         specialName: "Break by the Fireplace",
     },
     1520: {//Dadan
-        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight. Boosts ATK of Slasher characters by 2x",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of Slasher characters by 2x",
         special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
         specialName: "Break by the Fireplace",
     },
@@ -8396,7 +8396,7 @@ window.details = {
         specialName: "Just 'Water Play'",
     },
     1527: {//Arlong
-        captain: "Reduces cooldown of all specials by 1 turns at the start of the fight. Boosts ATK of [INT] characters by 2x",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of [INT] characters by 2x",
         special: [
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.5x for 1 turn",
@@ -8900,13 +8900,13 @@ window.details = {
     },
     1601: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x",
-        special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes poison and reduces damage received by 50% for 3 turns,",
+        special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
         specialName: "Blood Stained 'Iron Wall'",
         sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
     },
     1602: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect",
-        special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes poison and reduces damage received by 50% for 3 turns,",
+        special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
         specialName: "Blood Stained 'Iron Wall'",
         sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
     },
@@ -8983,14 +8983,14 @@ window.details = {
     },
     1615: {//Crocodile
         captain: "Boosts ATK of Strikers by 2x",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Strikers by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turns",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
@@ -9037,7 +9037,7 @@ window.details = {
     },
     1624: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 1.5x and boosts HP of Powerhouse characters by 1.25x",
-        special: "Randomizes all orbs, cuts the current HP of all enemies by 10%, and poisons all enemies.",
+        special: "Randomizes all orbs, cuts the current HP of all enemies by 10%, and Poisons all enemies.",
         specialName: "Flexible Six Swords",
     },
     1625: {//Daruma
@@ -9113,12 +9113,12 @@ window.details = {
     1633: {//Punk Hazard Dragon
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         special: "Deals 15x character's ATK in [STR] damage to all enemies and amplifies the effect of orbs by 1.25x for 1 turn",
-        specialName: "Punk Hazard Dragon Special",
+        specialName: "Flame Breath",
     },
-    1634: {//Yeti Cool Brothers
+    1634: {//Rock and Scotch
         captain: "Boosts HP of [INT] characters by 2x",
         special: "Reduces damage received by 50% for 1 turn",
-        specialName: "Yeti Cool Brothers Special",
+        specialName: "COOL Ambush",
     },
     1635: {//Brownbeard
         captain: "Boosts OWN ATK by 1.5x and the ATK of Cerebral characters by 2x",
@@ -9127,14 +9127,52 @@ window.details = {
     },
     1636: {//Caesar Clown
         captain: "Boosts ATK of Cerebral characters by 2x",
-        special: "For 3 turns, boosts ATK against poisoned and strongly poisoned enemies by 1.3x and changes [BOMB] orbs into matching orbs",
+        special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns and changes [BOMB] orbs into matching orbs",
         specialName: "Gastanet",
     },
     1637: {//Caesar Clown Evolved
         captain: "Boosts ATK of Cerebral characters by 2.25x and reduces damage received by 15%",
-        special: "For 3 turns, boosts ATK against poisoned and strongly poisoned enemies by 1.3x and changes [BOMB] orbs into matching orbs",
+        special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns and changes [BOMB] orbs into matching orbs",
         specialName: "Gastanet",
     },
+    1638: {//STR Gas Mask Fodder
+        special: "Boosts chances of getting [RCV] orbs",
+        specialName: "Meat for Meat",
+    },
+    1639: {//QCK Gas Mask Fodder
+        special: "Reduces Paralysis duration by 1 turn",
+        specialName: "Shock Recovery: Light",
+    },
+    1640: {//DEX Gas Mask Fodder
+        special: "For 1 turn, makes STR orb \"beneficial\" for Shooter characters",
+        specialName: "Shooter Beneficial Slot: STR",
+    },
+    1641: {//INT Gas Mask Fodder
+        special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.2x for 1 turn",
+        specialName: "Rising Damage: Poison",
+    },
+    1642: {//PSY Gas Mask Fodder
+        special: "Deals 3x character's ATK in typeless damage to all enemies, Poisons all enemies",
+        specialNotes: "#{poison}",
+        specialName: "Poison Attack",
+    },
+    1643: {//STR Centaur Fodder
+        captain: "Reduces cooldown of Slasher specials by 2 turns",
+        special: "Boosts ATK of Slasher characters for 1 turn",
+        specialName: "Attack Boost: Slasher",
+    },
+    1644: {//QCK Centaur Fodder
+        captain: "Boosts ATK of [QCK] characters by 2x, reduces crew's current HP by ???% at the end of each turn",
+        special: "Reduces Paralysis duration by 1 turn",
+        specialName: "Special Seal Recovery: Light",
+    },
+    1645: {//DEX Centaur Fodder
+        captain: "Boosts ATK of [DEX] characters by 1.5x and Slasher characters by 1.3x",
+        captainNotes: "The bonus is cumulative. [DEX] Slasher characters get a 1.95x bonus.",
+        special: "Deals 5 hits of random typeless damage to random enemies",
+        specialNotes: "#{randomHits : 5}",
+        specialName: "Random Light Blows",
+    },
     1646: {//Reborn Pica
         captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
         specialName: "Rock Domination Wall [Reformed]",
diff --git a/common/data/drops.js b/common/data/drops.js
index d94b4d3a3..5e18c74bf 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -681,6 +681,29 @@ window.drops = {
             "14": [ 1505 ],
         },
         
+        {
+            name: "Punk Hazard Burning Lands - Laboratory",
+            shortName: "Punk Hazard 1",
+            thumb: 1637,
+            completion: '5x Rainbow Gems',
+            gamewith: 60126,
+            "01": [ 1633 ],
+            "02": [  ],
+            "03": [  ],
+            "04": [  ],
+            "05": [  ],
+            "06": [  ],
+            "07": [ 1635 ],
+            "08": [  ],
+            "09": [  ],
+            "10": [  ],
+            "11": [  ],
+            "12": [ 1634 ],
+            "13": [ 1634 ],
+            "14": [  ],
+            "15": [ 1636 ],
+        },
+        
     ],
 
     'Weekly Island': [
@@ -1725,6 +1748,15 @@ window.drops = {
             Expert: [ 932 ]
         },
         
+        {
+            name: 'Clash Reformed!! Pica',
+            thumb: 1647,
+            gamewith: 60095,
+            condition: "1 Expert version and 3 different Master versions with different conditions. Master: Powerhouse/Driven/Slasher Only. Ultimate: Powerhouse Only, Driven Only, and Slasher Only",
+            Master: [ 1646 ],
+            Expert: [ 1646 ]
+        },
+        
         {
             name: 'Clash!! Kizaru',
             thumb: 978,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 05328e6ee..d34d9122c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2529,7 +2529,7 @@ window.evolutions = {
     },
     1636: {
         evolution: 1637,
-        evolvers: [  ]
+        evolvers: [ 118, 96, 97, 301, 302 ]
     },
     1646: {
         evolution: 1647,
diff --git a/common/data/families.js b/common/data/families.js
index 406441a07..0c03d99b6 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1644,5 +1644,6 @@ window.families = [
     null,
     null,
     null,
-    
+    "Pica",
+    "Pica",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 2b82a7328..3ad7c33bd 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1629,4 +1629,21 @@ window.gw=[
     59480,
     59477,
     59477,
+    60067,
+    60067,
+    60337,
+    60336,
+    60338,
+    60339,
+    60339,
+    60340,
+    60341,
+    60342,
+    60343,
+    60344,
+    60345,
+    60346,
+    60347,
+    60100,
+    60100,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 34f9fafc8..e48885260 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2926,4 +2926,22 @@ window.specials = {
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
+    1640: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1640].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1640].turnedOn = false;
+        }
+    },
+    1641: {
+        atk: function(p) { return 1.2; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+    },
+    1643: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
+        type: "class",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index a9bc60185..e2494bc93 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1632,18 +1632,18 @@ window.units = [
     [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 1066998, null, null, null, 1323, 707, 180, null ],
     [ "Fisher Tiger, Captain of the Sun Pirates", "PSY", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1250, 630, 132, 2522, 1386, 313, null ],
     [ "Punk Hazard Dragon", "STR", [ "Powerhouse", "Shooter" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Yeti Cool Brothers, Rock and Scotch", "INT", [ "Shooter", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rock and Scotch", "INT", [ "Shooter", "Powerhouse" ], 3, 15, 7, 2, 99, null, null, null, null, 1541, 1260, 104, null ],
     [ "Brownbeard", "PSY", [ "Slasher", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Caesar Clown", "QCK", [ "Shooter", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Caesar Clown Evolved", "QCK", [ "Cerebral", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #1", "STR", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #2", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #3", "DEX", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #4", "INT", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #5", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #7", "STR", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #6", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fodder #8", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caesar Clown, Former Government Scientist", "QCK", [ "Shooter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 81, 54, 25, 989, 565, 187, null ],
+    [ "Master Caesar Clown, Former Government Scientist", "QCK", [ "Cerebral", "Shooter" ], 4, 20, 5, 3, 99, 3000000, 913, 498, 125, 1813, 1220, 301, null ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [STR]", "STR", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [QCK]", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [DEX]", "DEX", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [INT]", "INT", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [PSY]", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Strong Leg Centaur, Punk Hazard Patrol Troop Corps", "STR", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nimble-footed Centaur, Punk Hazard Patrol Troop Corps", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Pica, Donquixote Pirates [Reformed]", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, null, null, null, 4020, 1210, 5, null ],
     ];
diff --git a/common/js/utils.js b/common/js/utils.js
index a4c627107..b8b49463d 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@
         'Skypiea (Guard|Enforcer)', 'Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard', 'Fishman (Guard|Outlaw)'
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard', 'Fishman (Guard|Outlaw)', 'Punk Hazard Gas Mask Patrol Soldier', 'Punk Hazard Patrol Troop Corps'
     ].join(')|(') + ')', 'i');
 
     var utils = {};
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 5bd4e7067..a513bb990 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -189,9 +189,10 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Slasher")) orb = (window.specials[1323].turnedOn || window.specials[1324].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Free Spirit")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")))) ? 2 : 1;
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")))) ? 2 : 1;
             if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 8c81150ab..944ecd72d 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -118,6 +118,12 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
+    if(window.specials[1640].turnedOn){
+        if(uclass.has("Shooter")){
+            if (orb == 'str') return boostedMultiplier;
+            if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+        }
+    }
     if(window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn){
         if (orb == 0.5) return baseMultiplier;
     }

From e534c694c53c0986b72c8b5d49c285eb84190332 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 22 Jun 2017 21:12:38 -0400
Subject: [PATCH 1161/1569] Stats and Kureha info

---
 common/data/details.js  | 5 ++++-
 common/data/units.js    | 4 ++--
 common/js/directives.js | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 039a2cdc7..64dc9874a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -1278,6 +1278,7 @@ window.details = {
     333: {
         special: "Recovers a random amount of HP",
         specialName: "Doctor Stop",
+        specialNotes: "#{randomHeal : 2,000 : 5,000}",
         captain: "Boosts ATK and RCV of PSY and INT characters by 1.5x"
     },
     334: {
@@ -1682,7 +1683,7 @@ window.details = {
     422: {
         special: "Reduces damage received from INT enemies by 100% for 1 turn, recovers a random amount of HP",
         specialName: "Mirage Tempo: The Heavens",
-        specialNotes: "Estimated healing range: between 1,000 HP and 3,000 HP.",
+        specialNotes: "#{randomHeal : 1,000 : 3,000}",
         captain: "Boosts ATK, HP and RCV of INT characters by 1.5x"
     },
     423: {
@@ -3519,11 +3520,13 @@ window.details = {
     782: {
         special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
         specialName: "Smile of a Natural Beauty",
+        specialNotes: "#{randomHeal : ??? : ???}",
         captain: "Boosts RCV of Slasher characters by 1.5x"
     },
     783: {
         special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
         specialName: "Smile of a Natural Beauty",
+        specialNotes: "#{randomHeal : ??? : ???}",
         captain: "Boosts ATK of Slasher characters by 2x and their RCV by 1.5x"
     },
     784: {
diff --git a/common/data/units.js b/common/data/units.js
index e2494bc93..9a699b409 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1644,8 +1644,8 @@ window.units = [
     [ "Strong Leg Centaur, Punk Hazard Patrol Troop Corps", "STR", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Nimble-footed Centaur, Punk Hazard Patrol Troop Corps", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Pica, Donquixote Pirates [Reformed]", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, null, null, null, 4020, 1210, 5, null ],
+    [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, null, null, null, null ],
+    [ "Pica, Donquixote Pirates [Reformed]", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/directives.js b/common/js/directives.js
index 930f1c93f..8ec967431 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -13,6 +13,7 @@ var notes = {
         "matching orbs will deal #1 more damage and opposite orbs will deal #1 less damage.",
     poison: "Poison deals 0.5x character's ATK in fixed damage at the end of each turn.",
     random: "Estimated random damage range: between #1 HP and #2 HP #3.",
+    randomHeal: "Estimated random recovery range: between #1 HP and #2 HP.",
     randomHits: "The target of each of the #1 hits is chosen randomly.",
     specialProportional: "The exact multiplier used to compute the damage is proportional to the " +
         "crew's remaining HP and is higher the #1 the HP is. The multiplier is calculated as: #2.",

From a4d4bbd74630ad53fa5ac5b03ed88e39b96b4f31 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 15:03:49 -0400
Subject: [PATCH 1162/1569] New units

---
 common/data/aliases.js    | 59 +++++++++++++++++++-----------
 common/data/cooldowns.js  | 13 +++++++
 common/data/details.js    | 69 +++++++++++++++++++++++++++++++++--
 common/data/evolutions.js | 20 ++++++++++
 common/data/families.js   | 77 +++++++++++++++++++++++----------------
 common/data/flags.js      | 10 +++++
 common/data/matchers.js   | 12 +++---
 common/data/units.js      | 55 +++++++++++++++++-----------
 8 files changed, 231 insertions(+), 84 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index b09e41b44..177ce31f2 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1625,27 +1625,44 @@ window.aliases = {
     1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
     1625: ['ダルマ 深海の魚人海賊', '', ''],
     1626: ['ドスン 深海の魚人海賊', '', ''],
-    1627: ['', '', 'Coliseum Mach Vise'],
-    1628: ['', '', 'Coliseum Mach Vise'],
-    1629: ['', '', 'Coliseum Ikaros Much'],
-    1630: ['', '', 'Coliseum Ikaros Much'],
-    1631: ['', '', ''],
-    1632: ['', '', ''],
-    1633: ['', '', ''],
-    1634: ['', '', ''],
-    1635: ['', '', ''],
-    1636: ['', '', ''],
-    1637: ['', '', ''],
-    1638: ['', '', ''],
-    1639: ['', '', ''],
-    1640: ['', '', ''],
-    1641: ['', '', ''],
-    1642: ['', '', ''],
-    1643: ['', '', ''],
-    1644: ['', '', ''],
-    1645: ['', '', ''],
-    1646: ['', '', ''],
-    1647: ['', '', ''],
+    1627: ['マッハ・バイス 超体重人間', '', 'Coliseum Mach Vise'],
+    1628: ['マッハ・バイス ディアマンテ軍幹部', '', 'Coliseum Mach Vise'],
+    1629: ['イカロス・ムッヒ 深海の魚人海賊', '', 'Coliseum Ikaros Much'],
+    1630: ['イカロス・ムッヒ 反逆の魚人海賊', '', 'Coliseum Ikaros Much'],
+    1631: ['フィッシャー・タイガー', '', ''],
+    1632: ['フィッシャー・タイガー タイヨウの海賊団船長', '', ''],
+    1633: ['Ｄｒａｇｏｎ パンクハザード生息', '', ''],
+    1634: ['ロック＆スコッチ', '', ''],
+    1635: ['茶ひげ ＰＨ巡回部隊“ボス”', '', ''],
+    1636: ['シーザー・クラウン 元政府の科学者', '', ''],
+    1637: ['Ｍ（マスター）・シーザー 元政府の科学者', '', ''],
+    1638: ['ＰＨガスマスク巡回兵・[力]', '', ''],
+    1639: ['ＰＨガスマスク巡回兵・[速]', '', ''],
+    1640: ['ＰＨガスマスク巡回兵・[技]', '', ''],
+    1641: ['ＰＨガスマスク巡回兵・[知]', '', ''],
+    1642: ['ＰＨガスマスク巡回兵・[心]', '', ''],
+    1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', ''],
+    1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', ''],
+    1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', ''],
+    1646: ['ピーカ「改」', '', 'STR Pica'],
+    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'STR Pica'],
+    1648: ['', '', ''],
+    1649: ['', '', ''],
+    1650: ['', '', ''],
+    1651: ['', '', 'Cat Viper', 'Nekopara'],
+    1652: ['', '', 'Cat Viper', 'Nekopara'],
+    1653: ['', '', ''],
+    1654: ['', '', ''],
+    1655: ['', '', ''],
+    1656: ['', '', ''],
+    1657: ['', '', ''],
+    1658: ['', '', ''],
+    1659: ['', '', ''],
+    1660: ['', '', ''],
+    1661: ['', '', ''],
+    1662: ['', '', ''],
+    1663: ['', '', ''],
+    1664: ['', '', ''],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index dc62d8f35..997229abc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1646,4 +1646,17 @@ window.cooldowns = [
     22,
     null,//Pica
     null,//Pica
+    null,
+    null,
+    null,
+    16,
+    16,
+    18,
+    18,
+    18,
+    18,
+    17,
+    17,
+    15,
+    15,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 64dc9874a..176030886 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6863,13 +6863,13 @@ window.details = {
         specialName: "King Cobra Machetes",
     },
     1313: {//Akainu
-        captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
+        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
     },
     1314: {//Akainu
-        captain: "Boosts ATK by 2.25x. If they have a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
+        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
@@ -8415,7 +8415,7 @@ window.details = {
     },
     1528: {//Blenheim
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
-        special: "Reduces Despair duration by 2 turns,  makes STR, DEX, and QCK orbs \"beneficial\" to Powerhouse characters for 1 turn if HP is below 30% at the start of the turn",
+        special: "Reduces Despair duration by 2 turns, makes STR, DEX, and QCK orbs \"beneficial\" to Powerhouse characters for 1 turn if HP is below 30% at the start of the turn",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
         specialName: "Australian Army Aid Blade",
     },
@@ -9206,5 +9206,66 @@ window.details = {
         ],
         specialNotes: "#{stages}"
     },
-    
+    1651: {//Nekomamushi
+        captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
+        special: "Deals large [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
+        specialName: "King of the Dawn",
+    },
+    1652: {//Nekomamushi
+        captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
+        special: "Deals large [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
+        specialName: "King of the Dawn",
+    },
+    1653: {//Pedro
+        captain: "Reduces cooldown of all specials by ??? turns at the start of the fight, boosts ATK of [INT] characters by ???x",
+        special: "Reduces crew's HP to 1, deals 7x the amount of HP subtracted in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for 1 turn",
+        sailor: "Makes INT orbs \"beneficial\" for Slasher and Cerebral characters",
+        specialName: "Charge Drive",
+    },
+    1654: {//Pedro
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2.5x",
+        special: "Reduces crew's HP to 1, deals 7x the amount of HP subtracted in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for 1 turn",
+        sailor: "Makes INT orbs \"beneficial\" for Slasher and Cerebral characters",
+        specialName: "Charge Drive",
+    },
+    1655: {//Carrot
+        captain: "Boosts ATK of [QCK] characters by ???x and their RCV by ???x",
+        special: "Boosts ATK of QCK characters by 2x for 1 turn",
+        sailor: "Boosts ATK and RCV of [QCK] characters by 75",
+        specialName: "Electric Fist",
+    },
+    1656: {//Carrot
+        captain: "Boosts ATK of [QCK] characters by 2.25x and their RCV by 1.5x",
+        special: "Boosts ATK of QCK characters by 2x for 1 turn",
+        sailor: "Boosts ATK and RCV of [QCK] characters by 75",
+        specialName: "Electric Fist",
+    },
+    1657: {//Kanjuro
+        captain: "Boosts ATK of Striker and Free Spirit characters by ???x",
+        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.5x for 1 turn if your Captain is a Striker character",
+        sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
+        specialName: "Summon Dragon",
+    },
+    1658: {//Kanjuro
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2.5x",
+        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.5x for 1 turn if your Captain is a Striker character",
+        sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
+        specialName: "Summon Dragon",
+    },
+    1659: {//Raizo
+        captain: "Boosts ATK of Shooter characters by ???x and makes [TND] and [RCV] orbs \"beneficial\" to ??? characters",
+        special: "Reduces Paralysis and Silence duration by 3 turns, switches orbs between slots 3 times",
+        sailorNotes: "#{silence}",
+        sailor: "Completely resists Silence on this character",
+        specialNotes: "#{silence}",
+        specialName: "Ninja Arts - Bunshin no Jutsu",
+    },
+    1660: {//Raizo
+        captain: "Boosts ATK of Shooter characters by 2.5x and makes [TND] and [RCV] orbs \"beneficial\" to ??? characters",
+        special: "Reduces Paralysis and Silence duration by 3 turns, switches orbs between slots 3 times",
+        sailorNotes: "#{silence}",
+        sailor: "Completely resists Silence on this character",
+        specialNotes: "#{silence}",
+        specialName: "Ninja Arts - Bunshin no Jutsu",
+    },
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d34d9122c..6c693db75 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2533,6 +2533,26 @@ window.evolutions = {
     },
     1646: {
         evolution: 1647,
+        evolvers: [ 118, 84, 266, 300, 100 ]
+    },
+    1651: {
+        evolution: 1652,
+        evolvers: [  ]
+    },
+    1653: {
+        evolution: 1654,
+        evolvers: [  ]
+    },
+    1655: {
+        evolution: 1656,
+        evolvers: [  ]
+    },
+    1657: {
+        evolution: 1658,
+        evolvers: [  ]
+    },
+    1659: {
+        evolution: 1660,
         evolvers: [  ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 0c03d99b6..3ada8528d 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -955,12 +955,12 @@ window.families = [
     "Gyaro",
     "Makuro",
     "Tansui",
-    "Bodyguard",
-    "Bodyguard",
-    "Bodyguard",
-    "Bodyguard",
-    "Bodyguard",
-    "Bodyguard",
+    "Gunman QCK 2",
+    "Gunman INT",
+    "Gunman DEX",
+    "Gunman QCK",
+    "Gunman STR",
+    "Gunman PSY",
     "Charloss",
     "Roswald",
     "Shalulia",
@@ -1061,12 +1061,12 @@ window.families = [
     "Marguerite",
     "Kikyo",
     "Gloriosa",
-    "Destructive Female Archer, Kuja Warriors",
-    "Scheming Female Archer, Kuja Warriors",
-    "Smart Swordswoman, Kuja Warriors",
-    "Bright Swordswoman, Kuja Warriors",
-    "Skilled Female Fighter, Kuja Warriors",
-    "Nimble Female Fighter, Kuja Warriors",
+    "Female Archer STR",
+    "Female Archer INT",
+    "Swordswoman INT",
+    "Swordswoman PSY",
+    "Female Fighter DEX",
+    "Female Fighter QCK",
     "Shuraiya",
     "Shuraiya",
     "Gasparde",
@@ -1144,11 +1144,11 @@ window.families = [
     "Foxy",
     "Porche",
     "Porche",
-    "Red Uniformed Guard",
-    "Green Uniformed Guard",
-    "Blue Uniformed Guard",
-    "Black Jailer",
-    "Yellow jailer",
+    "Uniformed Guard STR",
+    "Uniformed Guard QCK",
+    "Uniformed Guard DEX",
+    "Jailer INT",
+    "Jailer PSY",
     "Minotaur",
     "Minozebra",
     "Sphinx",
@@ -1491,14 +1491,14 @@ window.families = [
     "Mr. 5",
     "Mr. 5",
     "Sabo",
-    "Rough Fishman Outlaw",
-    "Fast-paced Fishman Outlaw",
-    "Skilled Fishman Outlaw",
-    "Surefire Bombardment Fishman Outlaw",
-    "One Shot Bombardment Fishman Outlaw",
-    "Durable Fishman Guard",
-    "Agile Fishman Guard",
-    "Clever Fishman Guard",
+    "Fishman Outlaw STR",
+    "Fishman Outlaw QCK",
+    "Fishman Outlaw DEX",
+    "Bombardment Fishman Outlaw INT",
+    "Bombardment Fishman Outlaw PSY",
+    "Fishman Guard STR",
+    "Fishman Guard QCK",
+    "Fishman Guard DEX",
     "Caribou",
     "Coribou",
     "Hammond",
@@ -1636,14 +1636,27 @@ window.families = [
     "Brownbeard",
     "Caesar Clown",
     "Caesar Clown",
+    "Gas Mask Patrol STR",
+    "Gas Mask Patrol QCK",
+    "Gas Mask Patrol DEX",
+    "Gas Mask Patrol INT",
+    "Gas Mask Patrol PSY",
+    "Patrol Troop Corps STR",
+    "Patrol Troop Corps QCK",
+    "Patrol Troop Corps DEX",
+    "Pica",
+    "Pica",
     null,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    "Pica",
-    "Pica",
+    "Nekomamushi",
+    "Nekomamushi",
+    "Pedro",
+    "Pedro",
+    "Carrot",
+    "Carrot",
+    "Kanjuro",
+    "Kanjuro",
+    "Raizo",
+    "Raizo",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 6b075229f..4a5b08c9b 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1419,4 +1419,14 @@ window.flags = {
     1621: { rr: 1, rro: 1, lrr: 1 },
     1631: { rr: 1, rro: 1, lrr: 1 },
     1632: { rr: 1, rro: 1, lrr: 1 },
+    1651: { rr: 1, rro: 1 },
+    1652: { rr: 1, rro: 1 },
+    1653: { rr: 1, rro: 1 },
+    1654: { rr: 1, rro: 1 },
+    1655: { rr: 1, rro: 1 },
+    1656: { rr: 1, rro: 1 },
+    1657: { rr: 1, rro: 1 },
+    1658: { rr: 1, rro: 1 },
+    1659: { rr: 1, rro: 1 },
+    1660: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 6ee2c809d..858ed1099 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -379,6 +379,12 @@ window.matchers = [
         target: 'special',
         matcher: /(reduces|removes).+silence.+duration/i
     },
+    
+    {
+        name: 'Paralysis reducers',
+        target: 'special',
+        matcher: /(reduces|removes).+Paralysis/i 
+    },
 
     {
         name: 'Block orb removers',
@@ -428,12 +434,6 @@ window.matchers = [
         matcher: /reduces special cooldown/i
     },
     
-    {
-        name: 'Paralysis reducers',
-        target: 'special',
-        matcher: /(reduces|removes).+Paralysis/i 
-    },
-    
     {
         name: 'Chain Boosters',
         target: 'special',
diff --git a/common/data/units.js b/common/data/units.js
index 9a699b409..84ec45032 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1625,27 +1625,40 @@ window.units = [
     [ "Hyouzou, Fishman Pirates Bodyguard", "QCK", [ "Powerhouse", "Slasher" ], 4, 20, 6, 4, 99, 3000000, 85, 58, 27, 1980, 1088, 345, 1 ],
     [ "Daruma, Deep Sea Fishman Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 4, 4, 99, 3000000, 48, 53, 24, 1405, 985, 320, 1 ],
     [ "Dosun, Deep Sea Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 20, 6, 4, 99, 3000000, 91, 60, 21, 2050, 1155, 274, 1 ],
-    [ "Machvise, Super Weight Human", "DEX", [ "Striker", "Free Spirit" ], 4, 25, 4, 3, 70, 1066998, 140, 70, 16, 1540, 590, 98, null ],
-    [ "Machvise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, 1310, 490, 77, 3110, 1198, 186, null ],
-    [ "Ikaros, Deep Sea Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 93, 54, 24, 920, 446, 151, null ],
-    [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 876, 409, 104, 2230, 1142, 199, null ],
-    [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 1066998, null, null, null, 1323, 707, 180, null ],
-    [ "Fisher Tiger, Captain of the Sun Pirates", "PSY", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1250, 630, 132, 2522, 1386, 313, null ],
-    [ "Punk Hazard Dragon", "STR", [ "Powerhouse", "Shooter" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Rock and Scotch", "INT", [ "Shooter", "Powerhouse" ], 3, 15, 7, 2, 99, null, null, null, null, 1541, 1260, 104, null ],
-    [ "Brownbeard", "PSY", [ "Slasher", "Powerhouse" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Caesar Clown, Former Government Scientist", "QCK", [ "Shooter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 81, 54, 25, 989, 565, 187, null ],
-    [ "Master Caesar Clown, Former Government Scientist", "QCK", [ "Cerebral", "Shooter" ], 4, 20, 5, 3, 99, 3000000, 913, 498, 125, 1813, 1220, 301, null ],
-    [ "Punk Hazard Gas Mask Patrol Soldier [STR]", "STR", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Punk Hazard Gas Mask Patrol Soldier [QCK]", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Punk Hazard Gas Mask Patrol Soldier [DEX]", "DEX", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Punk Hazard Gas Mask Patrol Soldier [INT]", "INT", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Punk Hazard Gas Mask Patrol Soldier [PSY]", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Strong Leg Centaur, Punk Hazard Patrol Troop Corps", "STR", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Nimble-footed Centaur, Punk Hazard Patrol Troop Corps", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, null, null, null, null ],
-    [ "Pica, Donquixote Pirates [Reformed]", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, null ],
+    [ "Machvise, Super Weight Human", "DEX", [ "Striker", "Free Spirit" ], 4, 25, 4, 3, 70, 1066998, 140, 70, 16, 1540, 590, 98, 1 ],
+    [ "Machvise, Diamante Military Leader", "DEX", [ "Striker", "Free Spirit" ], 5, 40, 4, 4, 99, 4000000, 1310, 490, 77, 3110, 1198, 186, 1 ],
+    [ "Ikaros, Deep Sea Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 93, 54, 24, 920, 446, 151, 1 ],
+    [ "Ikaros Much, The Rebellious Fishman Pirates", "INT", [ "Striker", "Powerhouse" ], 4, 26, 4, 3, 99, 3000000, 876, 409, 104, 2231, 1142, 199, 1 ],
+    [ "Fisher Tiger", "PSY", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 1066998, 140, 198, 36, 1323, 707, 180, 1 ],
+    [ "Fisher Tiger, Captain of the Sun Pirates", "PSY", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1250, 630, 132, 2522, 1386, 313, 1 ],
+    [ "Dragon of Punk Hazard", "STR", [ "Powerhouse", "Shooter" ], 3, 15, 4, 2, 70, 1066998, 159, 220, 18, 1117, 883, 177, 1 ],
+    [ "Rock and Scotch", "INT", [ "Shooter", "Powerhouse" ], 3, 15, 7, 2, 99, 3000000, 192, 210, 13, 1541, 1260, 104, 1 ],
+    [ "Brownbeard, Punk Hazard Centaur Patrol Unit Leader", "PSY", [ "Slasher", "Powerhouse" ], 3, 15, 6, 2, 99, 3000000, 89, 70, 17, 1431, 1132, 177, 1 ],
+    [ "Caesar Clown, Former Government Scientist", "QCK", [ "Shooter", "Cerebral" ], 3, 13, 4, 1, 50, 392109, 81, 54, 25, 989, 565, 187, 1 ],
+    [ "Master Caesar Clown, Former Government Scientist", "QCK", [ "Cerebral", "Shooter" ], 4, 20, 5, 3, 99, 3000000, 913, 498, 125, 1813, 1220, 301, 1 ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [STR]", "STR", [ "Shooter", "Free Spirit" ], 3, 12, 8, 1, 60, 449516, 57, 38, 12, 1148, 770, 123, 1 ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [QCK]", "QCK", [ "Shooter", "Free Spirit" ], 3, 12, 8, 1, 60, 449516, 51, 33, 13, 1025, 671, 187, 1 ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [DEX]", "DEX", [ "Shooter", "Free Spirit" ], 3, 12, 8, 1, 60, 449516, 54, 36, 15, 1093, 727, 147, 1 ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [INT]", "INT", [ "Shooter", "Free Spirit" ], 3, 12, 8, 1, 60, 449516, 57, 37, 17, 1147, 756, 143, 1 ],
+    [ "Punk Hazard Gas Mask Patrol Soldier [PSY]", "PSY", [ "Shooter", "Free Spirit" ], 3, 12, 8, 1, 60, 449516, 63, 32, 15, 1263, 643, 157, 1 ],
+    [ "Strong Leg Centaur, Punk Hazard Patrol Troop Corps", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 62, 35, 15, 1247, 717, 154, 1 ],
+    [ "Nimble-footed Centaur, Punk Hazard Patrol Troop Corps", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 57, 34, 18, 1141, 684, 182, 1 ],
+    [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
+    [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
+    [ "Pica [Reformed], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, null, null, null, 3404, 1451, 352, null ],
+    [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2009, 1438, 325, null ],
+    [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2041, 1250, 390, null ],
+    [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2306, 1301, 329, null ],
+    [ "Raizo, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Raizo of the Mist, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, null, null, null, 2353, 1363, 290, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 92ed1a1e760658216ebb34d5f4fec90a2daabca7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 16:46:50 -0400
Subject: [PATCH 1163/1569] Dummy stats and specials

---
 common/data/captains.js | 34 +++++++++++++++
 common/data/specials.js | 91 +++++++++++++++++++++++++++++++++++++----
 common/data/units.js    |  8 ++--
 damage/js/cruncher.js   |  1 +
 4 files changed, 121 insertions(+), 13 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 795ceb005..bfa11ad5c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4866,4 +4866,38 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
+    1651: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 3.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+    },
+    1652: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 3.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+    },
+    1653: {
+        atk: function(p) { return p.unit.type == "INT" ? 1 : 1; }
+    },
+    1654: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
+    },
+    1655: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1 : 1; }
+    },
+    1656: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    1657: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1 : 1; }
+    },
+    1658: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    1659: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
+    1660: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index e48885260..f5646d3f3 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -925,12 +925,18 @@ window.specials = {
     864: {
         delay: function(p) { return 1; },
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     865: {
         delay: function(p) { return 1; },
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     866: {
         atk: function(p) {
@@ -1385,7 +1391,10 @@ window.specials = {
     },
     1061: {
         chain: function(p) { return 2; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2 : 1.0; }
+        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') ? 2 : 1;
+        }
     },
     1063: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1},
@@ -1607,11 +1616,17 @@ window.specials = {
     },
     1193: {
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     1194: {
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     1195: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
@@ -2309,11 +2324,17 @@ window.specials = {
     },
     1441: {
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     1442: {
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     1443: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -2424,11 +2445,17 @@ window.specials = {
     },
     1484: {
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     1485: {
         chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
+        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') ? 2.5 : 1;
+        }
     },
     1486: {
         orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
@@ -2944,4 +2971,50 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
         type: "class",
     },
+    1651: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1651].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1651].turnedOn = false;
+        }
+    },
+    1652: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1652].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1652].turnedOn = false;
+        }
+    },
+    1653: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+    },
+    1654: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+    },
+    1655: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        type: "type"
+    },
+    1656: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        type: "type"
+    },
+    1657: {
+        chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
+        }
+    },
+    1658: {
+        chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 84ec45032..7fbed8bd6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1652,13 +1652,13 @@ window.units = [
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, null, null, null, 3404, 1451, 352, null ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2009, 1438, 325, null ],
+    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2009, 1438, 325, null ],
     [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2041, 1250, 390, null ],
+    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2041, 1250, 390, null ],
     [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2306, 1301, 329, null ],
+    [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
     [ "Raizo, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Raizo of the Mist, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, null, null, null, 2353, 1363, 290, null ],
+    [ "Raizo of the Mist, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index a513bb990..bd7b3ef18 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -890,6 +890,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             colorCount: colorCounter(),
             captain: team[1].unit,
             actions: [ $scope.data.actionleft, $scope.data.actionright ],
+            hitcombo: hitModifiers,
         };
     };
 

From 3a9df1128588f391308c1a74a69bf1fbd435f6e5 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 16:57:43 -0400
Subject: [PATCH 1164/1569] Special names

---
 common/data/details.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 176030886..8ae24b9fb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8809,12 +8809,12 @@ window.details = {
     1585: {//Coliseum Helmeppo
         captain: "Boosts ATK and RCV of Slasher and Driven characters by 1.5x",
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
-        specialName: "Helmeppo Special",
+        specialName: "Firey Morale",
     },
     1586: {//Coliseum Helmeppo
         captain: "Boosts ATK of Slasher and Driven characters by 2x and their RCV by 1.5x",
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
-        specialName: "Helmeppo Special",
+        specialName: "Firey Morale",
     },
     1587: {//Legend Sanji
         captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
@@ -9126,7 +9126,7 @@ window.details = {
     1635: {//Brownbeard
         captain: "Boosts OWN ATK by 1.5x and the ATK of Cerebral characters by 2x",
         special: "Cuts the HP of all enemies by 20% and binds himself for 5 turns",
-        specialName: "Brownbeard Special",
+        specialName: "Crocodile Thrust",
     },
     1636: {//Caesar Clown
         captain: "Boosts ATK of Cerebral characters by 2x",

From 25272043c965fca865ec53a445c77219354264de Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 17:31:03 -0400
Subject: [PATCH 1165/1569] Gancho and Kanjuro

---
 common/data/details.js  | 4 ++--
 common/data/specials.js | 9 +++++++++
 damage/js/cruncher.js   | 5 +++--
 damage/js/utils.js      | 8 +++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8ae24b9fb..551017d58 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9242,13 +9242,13 @@ window.details = {
     },
     1657: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by ???x",
-        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.5x for 1 turn if your Captain is a Striker character",
+        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },
     1658: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.5x",
-        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.5x for 1 turn if your Captain is a Striker character",
+        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },
diff --git a/common/data/specials.js b/common/data/specials.js
index f5646d3f3..5c7c4a96e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2006,6 +2006,15 @@ window.specials = {
     1329: {
         affinity: function(p){ return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
+    1330: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1330].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1330].turnedOn = false;
+        }
+    },
     1335: {
         chainAddition: function(p){ return 0.5; }
     },
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index bd7b3ef18..d181d697a 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -190,10 +190,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Free Spirit")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Striker")) orb = (window.specials[1651].turnedOn || window.specials[1652].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")))) ? 2 : 1;
-            if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")))) ? 2 : 1;
+            if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1330].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 944ecd72d..c8a40a714 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -124,7 +124,13 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
-    if(window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn){
+    if(window.specials[1651].turnedOn || window.specials[1652].turnedOn){
+        if(uclass.has("Striker")){
+            if (orb == 'str') return boostedMultiplier;
+            if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+        }
+    }
+    if(window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1330].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn){
         if (orb == 0.5) return baseMultiplier;
     }
     if (orb == 1.0 || orb == 'str') return baseMultiplier;

From 0ce18e5712116b5d72f8f26c9f9bd01420bd5727 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 22:17:08 -0400
Subject: [PATCH 1166/1569] Loads of stuff

Most of it works, I promise
---
 common/data/captains.js         |  56 +++---
 common/data/details.js          |  15 +-
 common/data/events.js           |  64 ++++++-
 common/data/specials.js         | 323 ++++++++++++++++++++------------
 common/data/units.js            |   4 +-
 damage/css/main.css             |   2 +-
 damage/css/orbs.css             |  35 +++-
 damage/js/app.js                |  34 +++-
 damage/js/cruncher.js           |  18 +-
 damage/js/directives.js         |  75 ++++++--
 damage/js/images.js             |  15 +-
 damage/js/utils.js              |  32 +++-
 damage/views/fragments/orb.html |   4 +
 index.css                       |   2 +-
 14 files changed, 477 insertions(+), 202 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index bfa11ad5c..a10a15963 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1047,11 +1047,11 @@ window.captains = {
         atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
     },
     561: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (p.orb == 2.0 ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     562: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (p.orb == 2.0 ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     568: {
@@ -1273,13 +1273,13 @@ window.captains = {
         rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     652: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2 : 1); }
     },
     653: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.25 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.25 : 1); }
     },
     654: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.75 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 1); }
     },
     655: {
         atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
@@ -1554,11 +1554,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     747: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     748: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (p.orb == 2.0 ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     749: {
@@ -2097,10 +2097,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     913: {
-        atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1); }
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1); }
     },
     914: {
-        atk: function(p) { return p.unit.type != "QCK" ? 1 : (p.orb == 2.0 ? 3 : 1.2); }
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.2); }
     },
     915: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -2449,10 +2449,10 @@ window.captains = {
         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1015: {
-        atk: function(p) { return p.unit.type == "INT" ? (p.orb == 2.0 ? 2.75 : 1) : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 1) : 1; },
     },
     1016: {
-        atk: function(p) { return p.unit.type == "INT" ? (p.orb == 2.0 ? 3 : 1.5) : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5) : 1; },
     },
     1017: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
@@ -2551,7 +2551,7 @@ window.captains = {
         rcv: function(p) { return 0; }
     },
     1043: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (p.orb == 2.0 ? 2.75 : 2) : 1;},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 2) : 1;},
         rcv: function(p) { return 0; }
     },
     1044: {
@@ -2689,11 +2689,11 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1084: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1085: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1086:{
@@ -3046,7 +3046,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1197: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (p.orb == 2.0 ? 2.5 : 1) : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 1) : 1; }
     },
     1198: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
@@ -3255,7 +3255,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1247: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.75 : 2); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 2); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1248: {
@@ -3448,7 +3448,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
     },
     1292: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (p.orb == 2.0 ? 2.5 : 2); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 2); },
     },
     1293: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
@@ -3542,13 +3542,13 @@ window.captains = {
     },
     1313: {
         atk: function(p) {
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
         atk: function(p) {
-            return p.unit.type == "STR" ? (p.orb == 2.0 ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
         },
     },
     1315: {
@@ -3736,7 +3736,7 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1366: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (p.orb == 2.0 ? 2.75 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1367: {
@@ -4096,10 +4096,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
     },
     1451: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.25 : 1.5); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.25 : 1.5); }
     },
     1452: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (p.orb == 2.0 ? 2.5 : 2); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 2); }
     },
     1455: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
@@ -4247,10 +4247,10 @@ window.captains = {
         rcv: function(p) { return 1.2; },
     },
     1486: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 2.5 : 1); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 1); },
     },
     1487: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (p.orb == 2.0 ? 3 : 1); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1); },
     },
     1488: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
@@ -4432,10 +4432,10 @@ window.captains = {
         hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1535: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (p.orb == 2.0 ? 2.5 : 1); }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 1); }
     },
     1536: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (p.orb == 2.0 ? 3 : 1); }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1); }
     },
     1537: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
@@ -4871,7 +4871,7 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1652: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb != 'meat') ? 3.75 : 1 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1653: {
@@ -4900,4 +4900,4 @@ window.captains = {
     1660: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
-};
+};
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index 551017d58..7c97cdefb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2996,11 +2996,11 @@ window.details = {
         captain: "Boosts ATK and RCV of Striker characters by 1.5x"
     },
     682: {
-        special: "Recovers 2,561 HP, reduces damage received by 50% for 2 turns",
+        special: "Recovers a random amount of HP, reduces damage received by 50% for 2 turns",
         specialName: "Transcendental Serenity Healing"
     },
     683: {
-        special: "Recovers 2,561 HP, reduces damage received by 50% for 2 turns",
+        special: "Recovers a random amount of HP, reduces damage received by 50% for 2 turns",
         specialName: "Transcendental Serenity Healing",
         captain: "Boosts ATK and RCV of Fighter characters by 1.5x"
     },
@@ -9166,7 +9166,8 @@ window.details = {
     },
     1644: {//QCK Centaur Fodder
         captain: "Boosts ATK of [QCK] characters by 2x, reduces crew's current HP by ???% at the end of each turn",
-        special: "Reduces Paralysis duration by 1 turn",
+        special: "Reduces Silence duration by 1 turn",
+        specialNotes: "#{silence}",
         specialName: "Special Seal Recovery: Light",
     },
     1645: {//DEX Centaur Fodder
@@ -9208,13 +9209,13 @@ window.details = {
     },
     1651: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
-        special: "Deals large [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
-        specialName: "King of the Dawn",
+        special: "Deals 60x character's ATK in [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
+        specialName: "Daybreak Ruler's Spear",
     },
     1652: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
-        special: "Deals large [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
-        specialName: "King of the Dawn",
+        special: "Deals 60x character's ATK in [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
+        specialName: "Daybreak Ruler's Spear",
     },
     1653: {//Pedro
         captain: "Reduces cooldown of all specials by ??? turns at the start of the fight, boosts ATK of [INT] characters by ???x",
diff --git a/common/data/events.js b/common/data/events.js
index f2deeed8d..58cca2f6d 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -149,7 +149,7 @@ window.events = {
                 $scope.notify({ text: 'Disabling [STR] orbs support.' });
         }
     },
-/*    1472: {//Add if needed for Shirahoshi
+    1472: {
         onInsertion: function($scope) {
             if (++$scope.options.rainbowOrbsEnabled == 1)
                 $scope.notify({ text: 'Enabling [RAINBOW] orbs support.' });
@@ -168,5 +168,65 @@ window.events = {
             if (--$scope.options.rainbowOrbsEnabled === 0)
                 $scope.notify({ text: 'Disabling [RAINBOW] orbs support.' });
         }
-    },*/
+    },
+    1531: {
+        onInsertion: function($scope) {
+            if (++$scope.options.meatOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [MEAT] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.meatOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [MEAT] orbs support.' });
+        }
+    },
+    1532: {
+        onInsertion: function($scope) {
+            if (++$scope.options.meatOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [MEAT] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.meatOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [MEAT] orbs support.' });
+        }
+    },
+    1609: {
+        onInsertion: function($scope) {
+            if (++$scope.options.meatOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [MEAT] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.meatOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [MEAT] orbs support.' });
+        }
+    },
+    1610: {
+        onInsertion: function($scope) {
+            if (++$scope.options.meatOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [MEAT] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.meatOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [MEAT] orbs support.' });
+        }
+    },
+    1651: {
+        onInsertion: function($scope) {
+            if (++$scope.options.meatOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [MEAT] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.meatOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [MEAT] orbs support.' });
+        }
+    },
+    1652: {
+        onInsertion: function($scope) {
+            if (++$scope.options.meatOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [MEAT] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.meatOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [MEAT] orbs support.' });
+        }
+    },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 5c7c4a96e..91748af8a 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -55,7 +55,7 @@ window.specials = {
         type: "type"
     },
     263: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     267: {
         def: function(p) { return 0.5; }
@@ -84,10 +84,10 @@ window.specials = {
         type: "class"
     },
     323: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     324: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     352: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
@@ -115,10 +115,10 @@ window.specials = {
         def: function(p) { return 0.2; }
     },
     395: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     396: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     399: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
@@ -153,10 +153,10 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     417: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     418: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     419: {
         def: function(p) { return 0.5; }
@@ -175,13 +175,13 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     430: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     431: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     434: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     450: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -219,7 +219,7 @@ window.specials = {
         type: "class"
     },
     465: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     466: {
         delay: function(p) { return 1; },
@@ -308,10 +308,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     533: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     534: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     542: {
         rcv: function(p) { return 2; }
@@ -342,10 +342,10 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     559: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     560: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     568: {
         delay: function(p) { return 1; },
@@ -450,10 +450,10 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     642: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     643: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     644: {
         atk: function(p) { return p.delayed ? 1.2 : 1; },
@@ -464,22 +464,22 @@ window.specials = {
         type: "condition",
     },
     648: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     649: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     650: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     651: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     655: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     656: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     660: {
         delay: function(p) { return 1; },
@@ -551,10 +551,10 @@ window.specials = {
         type: "class"
     },
     689: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     690: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     710: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
@@ -632,16 +632,16 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     742: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     743: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     753: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     754: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     755: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
@@ -749,10 +749,10 @@ window.specials = {
         type: "type"
     },
     805: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     806: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     807: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -763,16 +763,16 @@ window.specials = {
         type: "condition"
     },
     809: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         def: function(p) { return 0.2; }
     },
     810: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         def: function(p) { return 0.2; }
     },
     813: {
         delay: function(p) { return 1; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     822: {
         rcvStatic: function(p) { return 100; },
@@ -825,10 +825,10 @@ window.specials = {
         type: "class"
     },
     835: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     836: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     837: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
@@ -890,12 +890,12 @@ window.specials = {
     },
     847: {
         atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15, [p.friendCaptain, p.captain]); },
         type: "class"
     },
     848: {
         atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15, [p.friendCaptain, p.captain]); },
         type: "class"
     },
     849: {
@@ -914,10 +914,10 @@ window.specials = {
         type: "type"
     },
     861: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     862: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     863: {
         def: function(p) { return 0.5; }
@@ -948,15 +948,15 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     869: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
     },
     870: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
     },
     873: {
         orb: function(p) {
-            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
-            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
+            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
         },
         type: "class",
         onActivation: function(p) {
@@ -971,8 +971,8 @@ window.specials = {
     },
     874: {
         orb: function(p) {
-            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
-            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
+            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
         },
         type: "class",
         onActivation: function(p) {
@@ -1158,10 +1158,10 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     921: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     922: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     925: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -1221,7 +1221,7 @@ window.specials = {
         type: "class"
     },
     961: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     963: {
         def: function(p) { return 0; }
@@ -1322,22 +1322,22 @@ window.specials = {
     1024: {
         orb: function(p) {
             if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]);
             }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
             }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
             }
         }
     },
     1025: {
         orb: function(p) {
             if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]);
             }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
             }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75);
+                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
             }
         }
     },
@@ -1384,10 +1384,10 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
     },
     1059: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1060: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1061: {
         chain: function(p) { return 2; },
@@ -1401,7 +1401,7 @@ window.specials = {
         type: "class"
     },
     1065: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1066: {
         chainAddition: function(p){ return 0.1;}
@@ -1457,10 +1457,10 @@ window.specials = {
         type: "class"
     },
     1086: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1087: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1088: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
@@ -1479,10 +1479,10 @@ window.specials = {
         type: "type"
     },
     1099: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1100: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1101: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
@@ -1509,10 +1509,10 @@ window.specials = {
         type: "class"
     },
     1111: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1112: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1113: {
         atk: function(p) { return 1.2; },
@@ -1529,12 +1529,12 @@ window.specials = {
     1122: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1123: {
         atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
@@ -1561,7 +1561,7 @@ window.specials = {
         }
     },
     1137: {
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1138: {
         atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
@@ -1583,11 +1583,11 @@ window.specials = {
         type: "class"
     },
     1164: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         rcv: function(p) { return 1.5; }
     },
     1165: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         rcv: function(p) { return 1.5; }
     },
     1168: {
@@ -1614,6 +1614,24 @@ window.specials = {
             });
         }
     },
+    1181: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1181].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1181].turnedOn = false;
+        }
+    },
+    1182: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1182].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1182].turnedOn = false;
+        }
+    },
     1193: {
         chain: function(p) { return 2.5; },
         chainLimiter: function(p) {
@@ -1643,10 +1661,10 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     1211: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1212: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1219: {
         atk: function(p) {
@@ -1837,7 +1855,7 @@ window.specials = {
         def: function(p) { return 0.5; } //TODO: get correct value
     },
     1255: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1256: {
         atk: function(p) { return 1.3 },
@@ -1903,10 +1921,10 @@ window.specials = {
         }
     },
     1271: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1272: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1273: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -1919,7 +1937,7 @@ window.specials = {
     1282: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); },
     },
     1283: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
@@ -2053,7 +2071,7 @@ window.specials = {
     1348: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); },
     },
     1349: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -2067,10 +2085,10 @@ window.specials = {
         chainAddition: function(p){ return 0.5; }
     },
     1354: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
     },
     1355: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
     },
     1358: {
         delay: function(p) { return 1; },
@@ -2089,10 +2107,10 @@ window.specials = {
         type: "class",
     },
     1363: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1364: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1365: {
         delay: function(p) { return 1; },
@@ -2101,7 +2119,7 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     1367:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
             var n = (window.specials[1367].multiplier == 1.5 ? 1 : 0);
             window.specials[1367].multiplier = [1.5, 1.75][n];
@@ -2112,7 +2130,7 @@ window.specials = {
         },
     },
     1368:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1368].multiplier); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1368].multiplier, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
             var n = (window.specials[1368].multiplier == 1.5 ? 1 : 0);
             window.specials[1368].multiplier = [1.5, 1.75][n];
@@ -2131,24 +2149,38 @@ window.specials = {
     1375: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1376: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1)}
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1379: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1379].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1379].turnedOn = false;
+        },
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1380: {
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1380].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1380].turnedOn = false;
+        },
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1387: {
         delay: function(p) { return 1; },
     },
     1389: {
-        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
+        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1390: {
         atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
@@ -2165,7 +2197,7 @@ window.specials = {
     1393: {
         atk: function(p) { return 1.1; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1, [p.friendCaptain, p.captain]); },
     },
     1394: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2219,13 +2251,13 @@ window.specials = {
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1406: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1407: {
@@ -2287,11 +2319,11 @@ window.specials = {
         type: "class"
     },
     1425: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1426: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1428: {
@@ -2316,12 +2348,12 @@ window.specials = {
     1437: {
         atk: function(p) { return p.delayed ? 1.5 : 1; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1438: {
         atk: function(p) { return p.delayed ? 1.5 : 1; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1439: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
@@ -2348,12 +2380,12 @@ window.specials = {
     1443: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1444: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1445: {
         delay: function(p) { return 1; },
@@ -2394,6 +2426,24 @@ window.specials = {
         atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
         type: "type"
     },
+    1462: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1462].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1462].turnedOn = false;
+        }
+    },
+    1463: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1463].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1463].turnedOn = false;
+        }
+    },
     1466: {
         def: function(p) { return 0; }
     },
@@ -2467,10 +2517,10 @@ window.specials = {
         }
     },
     1486: {
-        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1487: {
-        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1490: {
         def: function(p) { return 0.5; }
@@ -2530,11 +2580,29 @@ window.specials = {
             });
         }
     },
+    1515: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1515].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1515].turnedOn = false;
+        }
+    },
+    1516: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1516].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1516].turnedOn = false;
+        }
+    },
     1517: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1518: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1522: {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
@@ -2569,8 +2637,19 @@ window.specials = {
             });
         },
     },
+    1528: {
+        turnedOn: false,
+        onActivation: function(p) {
+            if(p.percHP > 30){
+                window.specials[1528].turnedOn = true;
+            }
+        },
+        onDeactivation: function(p) {
+            window.specials[1528].turnedOn = false;
+        }
+    },
     1529: {
-        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1529].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1529].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1529].multiplier = n;
@@ -2581,7 +2660,7 @@ window.specials = {
         }
     },
     1530: {
-        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1530].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1530].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1530].multiplier = n;
@@ -2687,12 +2766,12 @@ window.specials = {
     },
     1554: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         type: "type",
     },
     1555: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         type: "type",
     },
     1556: {
@@ -2724,10 +2803,10 @@ window.specials = {
         chainAddition: function(p) { return 0.3; }
     },
     1567: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1568: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1570: {
         staticMult: function(p) { return 80; }
@@ -2772,10 +2851,10 @@ window.specials = {
         }
     },
     1580: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1581: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1582: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
@@ -2783,7 +2862,7 @@ window.specials = {
         type: "class"
     },
     1583:{
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier); },
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
             var n = (window.specials[1583].multiplier == 1.5 ? 1 : 0);
             window.specials[1583].multiplier = [1.5, 2][n];
@@ -2794,7 +2873,7 @@ window.specials = {
         },
     },
     1584:{
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier); },
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
             var n = (window.specials[1584].multiplier == 1.5 ? 1 : 0);
             window.specials[1584].multiplier = [1.5, 2][n];
@@ -2848,10 +2927,10 @@ window.specials = {
         }
     },
     1594: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1595: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1598: {
         atk: function(p) { return 1.2 },
@@ -2860,7 +2939,7 @@ window.specials = {
         def: function(p) { return 0.5 },
     },
     1600: {
-        orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); },	
+        orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1603: {
         delay: function(p) { return 1; },
@@ -2874,21 +2953,21 @@ window.specials = {
     },
     1613: {
         def: function(p) { return 0.5 },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1614: {
         def: function(p) { return 0.5 },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1615: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1616: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1); }	
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1617: {
         atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
@@ -2910,10 +2989,10 @@ window.specials = {
         type: "class",
     },
     1622: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1623: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1626: {
         atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
@@ -2950,7 +3029,7 @@ window.specials = {
         type: "class",
     },
     1633: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1636: {
         atk: function(p) { return 1.3; },
@@ -2999,10 +3078,10 @@ window.specials = {
         }
     },
     1653: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1654: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1655: {
         atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
diff --git a/common/data/units.js b/common/data/units.js
index 7fbed8bd6..907a3c5da 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1650,7 +1650,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, null, null, null, 3404, 1451, 352, null ],
+    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3404, 1451, 352, null ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2009, 1438, 325, null ],
     [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
@@ -1658,7 +1658,7 @@ window.units = [
     [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
     [ "Raizo, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Raizo of the Mist, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
+    [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/css/main.css b/damage/css/main.css
index 6123da53a..b9c74d494 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -1046,7 +1046,7 @@ body > .popover .popover-content {
 .popover-data .DEX   { background: lightgreen; }
 .popover-data .PSY   { background: gold; }
 .popover-data .INT   { background: orchid; }
-.popover-data .RCV   { background: sandybrown; }
+.popover-data .RCV   { background: darkgoldenrod; }
 .popover-data .TND   { background: peru; }
 .popover-data .BLOCK { background: darkslateblue; }
 .popover-data .BOMB  { background: maroon; }
diff --git a/damage/css/orbs.css b/damage/css/orbs.css
index 21ecd023c..2a6d25524 100644
--- a/damage/css/orbs.css
+++ b/damage/css/orbs.css
@@ -56,10 +56,16 @@
     background-image: radial-gradient(9px 3px, circle cover, oldlace, orangered, rgb(50,50,50));
 }
 
-.unitOrb.Rainbow {
-    background-image: -webkit-radial-gradient(9px 3px, circle cover, oldlace, magenta, rgb(50,50,50));
-    background-image: -moz-radial-gradient(9px 3px, circle cover, oldlace, magenta, rgb(50,50,50));
-    background-image: radial-gradient(9px 3px, circle cover, oldlace, magenta, rgb(50,50,50));
+.unitOrb.R {
+    background-image: -webkit-radial-gradient(9px 3px, circle cover, oldlace, pink, magenta);
+    background-image: -moz-radial-gradient(9px 3px, circle cover, oldlace, pink, magenta);
+    background-image: radial-gradient(9px 3px, circle cover, oldlace, pink, magenta);
+}
+
+.unitOrb.M {
+    background-image: -webkit-radial-gradient(9px 3px, circle cover, oldlace, darkgoldenrod, saddlebrown);
+    background-image: -moz-radial-gradient(9px 3px, circle cover, oldlace, darkgoldenrod, saddlebrown);
+    background-image: radial-gradient(9px 3px, circle cover, oldlace, darkgoldenrod, saddlebrown);
 }
 
 .unitOrb .fa {
@@ -104,6 +110,17 @@
     top: 1px;
 }
 
+.meat-orb {
+    color: white;
+    font-weight: bold;
+    font-style: normal;
+    font-size: 18px;
+    margin-right: 2px;
+    text-shadow: 0 0 5px black;
+    position: relative;
+    top: 1px;
+}
+
 /***********************
  *     ORB GLOWING     *
  ***********************/
@@ -114,8 +131,8 @@
 .unitOrb.PSY { animation: glowOrange .5s linear infinite alternate; }
 .unitOrb.INT { animation: glowPurple .5s linear infinite alternate; }
 .unitOrb.G { animation: glowG .5s linear infinite alternate; }
-.unitOrb.S { animation: glowG .5s linear infinite alternate; }
-.unitOrb.Rainbow { animation: glowG .5s linear infinite alternate; }
+.unitOrb.S { animation: glowS .5s linear infinite alternate; }
+.unitOrb.R { animation: glowR .5s linear infinite alternate; }
 .unitOrb.opposite { animation: glowBlack .5s linear infinite alternate; }
 
 @keyframes glowRed {
@@ -158,7 +175,7 @@
     to { box-shadow: 0 0 5px white, 0 0 10px white, 0 0 15px white, 0 0 20px red, 0 0 35px red, 0 0 40px red, 0 0 50px red, 0 0 75px red; }
 }
 
-@keyframes glowRainbow {
-    from { box-shadow 0 0 10px white, 0 0 20px white, 0 0 30px white, 0 0 40px red, 0 0 70px red, 0 0 80px red, 0 0 100px red, 0 0 150px red; }
-    to { box-shadow: 0 0 5px white, 0 0 10px white, 0 0 15px white, 0 0 20px red, 0 0 35px red, 0 0 40px red, 0 0 50px red, 0 0 75px red; }
+@keyframes glowR {
+    from { box-shadow 0 0 10px white, 0 0 20px white, 0 0 30px white, 0 0 40px magenta, 0 0 70px magenta, 0 0 80px magenta, 0 0 100px magenta, 0 0 150px magenta; }
+    to { box-shadow: 0 0 5px white, 0 0 10px white, 0 0 15px white, 0 0 20px magenta, 0 0 35px magenta, 0 0 40px magenta, 0 0 50px magenta, 0 0 75px magenta; }
 }
diff --git a/damage/js/app.js b/damage/js/app.js
index 58a1bace5..43800f26c 100644
--- a/damage/js/app.js
+++ b/damage/js/app.js
@@ -68,6 +68,7 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         gOrbsEnabled: 0,
         strOrbsEnabled: 0,
         rainbowOrbsEnabled: 0,
+        meatOrbsEnabled: 0,
         slidersEnabled: true,
         sidebarVisible: false,
         transientMode: false,
@@ -166,8 +167,8 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
     };
 
     // reset rainbow slots automatically
-    $scope.$watch('options.gOrbsEnabled',function() {
-        if (!$rootScope.areGOrbsEnabled())
+    $scope.$watch('options.rainbowOrbsEnabled',function() {
+        if (!$rootScope.areRainbowOrbsEnabled())
             resetRainbowOrbs();
     });
 
@@ -184,6 +185,35 @@ var SharedRootCtrl = function($scope, $rootScope, $timeout) {
         }
         return false;
     };
+    
+    /* * * * * [MEAT] orb control * * * * */
+
+    var resetMeatOrbs = function() {
+        for (var i=0;i<6;++i) {
+            if ($scope.tdata.team[i].orb == 'meat')
+                $scope.tdata.team[i].orb = 1;
+        }
+    };
+
+    // reset meat slots automatically
+    $scope.$watch('options.meatOrbsEnabled',function() {
+        if (!$rootScope.areMeatOrbsEnabled())
+            resetMeatOrbs();
+    });
+
+    $scope.$watch('data.effect',function() {
+        if (!$rootScope.areMeatOrbsEnabled())
+            resetMeatOrbs();
+    });
+
+    $rootScope.areMeatOrbsEnabled = function() {
+        if ($rootScope.options.meatOrbsEnabled > 0) return true;
+        if ($rootScope.data.effect) {
+            var effect = window.effects[$rootScope.data.effect];
+            if (effect && effect.meatOrbsEnabled) return true;
+        }
+        return false;
+    };
 
     /* * * * * Custom hit modifiers resetting * * * * */
 
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index d181d697a..1c217e81b 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -179,6 +179,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // populate array with the damage of each unit in the team
         team.forEach(function(x,n) {
             if (n > 5 || x.unit === null || $scope.tdata.team[n].lock > 0) return;
+            var friendCaptain = $scope.tdata.team[0];
+            var captain = $scope.tdata.team[1];
             var orb = $scope.tdata.team[n].orb;
             var atk = getStatOfUnit(x,'atk'); // basic attack (scales with level);
             var ship = getShipBonus('atk',false,x.unit,n), againstType = type;
@@ -187,14 +189,25 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Driven")) orb = (window.specials[1259].turnedOn || window.specials[1260].turnedOn || window.specials[1323].turnedOn || window.specials[1324].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Slasher")) orb = (window.specials[1323].turnedOn || window.specials[1324].turnedOn) ? 2 : 0.5;
-            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn || window.specials[1463]. turnedOn || window.specials[1462]. turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Powerhouse")) orb = (window.specials[1528].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Free Spirit")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Striker")) orb = (window.specials[1651].turnedOn || window.specials[1652].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")))) ? 2 : 1;
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1528].turnedOn && x.unit.class.has("Powerhouse")) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")))) ? 2 : 1;
             if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1330].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
+            
+            //Captain Meat orbs because Nekomamushi
+            if (orb =='meat'){
+                for (temp = 0; temp < 2; temp++){
+                    if (team[temp].unit.name.includes("Kami Enel")){
+                        orb = 2;
+                    }
+                }
+            }
+            if (orb == 'meat') orb = (window.specials[1515].turnedOn || window.specials[1516].turnedOn || (window.specials[1593].turnedOn && x.unit.class.has("Fighter")) || ((window.specials[1181].turnedOn || window.specials[1182].turnedOn) && x.unit.class.has("Slasher")) || ((window.specials[1380].turnedOn || window.specials[1379].turnedOn) && (x.unit.class.has("Cerebral") || x.unit.class.has("Free Spirit")))) ? 2 : 1;
             if (orb == 'rainbow') orb = 2;
             atk += getShipBonus('atk',true,x.unit,n);
             multipliers.push([ orb, 'orb' ]); // orb multiplier (fixed)
@@ -890,6 +903,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             classCount: classCounter(),
             colorCount: colorCounter(),
             captain: team[1].unit,
+            friendCaptain: team[0].unit,
             actions: [ $scope.data.actionleft, $scope.data.actionright ],
             hitcombo: hitModifiers,
         };
diff --git a/damage/js/directives.js b/damage/js/directives.js
index bdfd4b119..8b0725dfd 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -612,7 +612,8 @@ directives.levelSlider = function($timeout) {
 };
 
 directives.unitOrb = function($rootScope) {
-    var ORBS = [ 0.5, 1, 2, 'g', 'str' ];//add rainbow if needed
+    //var ORBS = [ 0.5, 1, 2, 'g', 'rainbow', 'meat', 'str' ];//STR has to go last for simplicity, but will change if 6+ Shanks makes a turn in the same direction
+    var ORBS = [ 0.5, 1, 2 ];
     return {
         restrict: 'E',
         replace: true,
@@ -626,6 +627,7 @@ directives.unitOrb = function($rootScope) {
                 if (unit.orb == 'g') return 'G';
                 if (unit.orb == 'str') return 'S';
                 if (unit.orb == 'rainbow') return 'R';
+                if (unit.orb == 'meat') return 'M';
                 return Utils.getOppositeType(scope.data.team[scope.slot].unit.type) + ' opposite';
             };
             var onShortPress = function(e) {
@@ -633,30 +635,67 @@ directives.unitOrb = function($rootScope) {
                 if (!$(e.target).hasClass('unitPortrait')) return;
                 if (unit.unit === null || /unitLevel/.test(e.target.className) || e.altKey || e.shiftKey) return;
                 if (e.which == 2 || (e.which == 1 && (e.ctrlKey || e.metaKey || Utils.isClickOnOrb(e,e.target.parentNode)))) {
-			var n = ORBS.indexOf(tunit.orb);
-			if(unit.unit.type == "STR" || unit.unit.type == "DEX")
-				tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
-			else
-				tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
+                    if($rootScope.areGOrbsEnabled()){
+                        ORBS.push('g');
+                    }
+                    if($rootScope.areRainbowOrbsEnabled()){
+                        ORBS.push('rainbow');
+                    }
+                    if($rootScope.areMeatOrbsEnabled()){
+                        ORBS.push('meat');
+                    }
+                    if($rootScope.areSTROrbsEnabled()){
+                        ORBS.push('str');
+                    }
+                    var ORBSlength = ORBS.length;
+                    if($rootScope.areSTROrbsEnabled() && (unit.unit.type == "STR" || unit.unit.type == "DEX")){
+                        ORBSlength--;
+                    }
+                    var n = ORBS.indexOf(tunit.orb);
+                    /*if(unit.unit.type == "STR" || unit.unit.type == "DEX")
+                        tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
+                    else
+                        tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];*/
+                    tunit.orb = ORBS[(n + 1) % (ORBSlength)];
                     scope.glow();
                     scope.$apply();
                     e.preventDefault();
                     e.stopPropagation();
+                    ORBS = [ 0.5, 1, 2 ];
                     return false;
-                }//IF I need to add Rainbow orbs, I need to rethink that
+                }
+            
             };
             var onLongPress = function(e) {
-							var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
-							var n = ORBS.indexOf(tunit.orb);
-							if(unit.unit.type == "STR" || unit.unit.type == "DEX")
-								tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
-							else
-								tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];
-							scope.glow();
-							scope.$apply();
-							e.preventDefault();
-							e.stopPropagation();
-							return false;
+                if($rootScope.areGOrbsEnabled()){
+                    ORBS.push('g');
+                }
+                if($rootScope.areRainbowOrbsEnabled()){
+                    ORBS.push('rainbow');
+                }
+                if($rootScope.areMeatOrbsEnabled()){
+                    ORBS.push('meat');
+                }
+                if($rootScope.areSTROrbsEnabled()){
+                    ORBS.push('str');
+                }
+                var unit = scope.data.team[scope.slot], tunit = scope.tdata.team[scope.slot];
+                var ORBSlength = ORBS.length;
+                    if($rootScope.areSTROrbsEnabled() && (unit.unit.type == "STR" || unit.unit.type == "DEX")){
+                        ORBSlength--;
+                    }
+                    var n = ORBS.indexOf(tunit.orb);
+                /*if(unit.unit.type == "STR" || unit.unit.type == "DEX")
+                tunit.orb = ORBS[(n + 1) % ($rootScope.areGOrbsEnabled() ? ORBS.length - 1 : ORBS.length - 2)];
+                else
+                tunit.orb = ORBS[(n + ((!$rootScope.areGOrbsEnabled() && $rootScope.areSTROrbsEnabled() && n == ORBS.length - 3) ? 2 : 1)) % ($rootScope.areGOrbsEnabled() ? ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 1) : ($rootScope.areSTROrbsEnabled() ? ORBS.length : ORBS.length - 2))];*/
+                tunit.orb = ORBS[(n + 1) % (ORBSlength)];
+                scope.glow();
+                scope.$apply();
+                e.preventDefault();
+                e.stopPropagation();
+                ORBS = [ 0.5, 1, 2 ];
+                return false;
             };
             element.parent().longpress(onLongPress,onShortPress);
         },
diff --git a/damage/js/images.js b/damage/js/images.js
index fe21a2e46..7fd016696 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -3,7 +3,7 @@
 var app = angular.module('optc');
 
 var BOX_COLORS = { STR: 'salmon', QCK: 'lightskyblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid' };
-var ORB_COLORS = { STR: 'orangered', QCK: 'dodgerblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid', G: 'orange', S: 'orangered', RAINBOW: 'magenta'};
+var ORB_COLORS = { STR: 'orangered', QCK: 'dodgerblue', DEX: 'lightgreen', PSY: 'gold', INT: 'orchid', G: 'orange', S: 'orangered', RAINBOW: 'pink', MEAT: 'darkgoldenrod'};
 
 var lock = new Image(), silence = new Image();
 lock.src = 'res/chain.png';
@@ -83,7 +83,7 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                 if (orb != 1.0) {
                     var gradient = context.createRadialGradient(baseX + 20, baseY + 21, 13, baseX + 22, baseY + 22, 35);
                     if (orb < 1) gradient.addColorStop(0.1, ORB_COLORS[Utils.getOppositeType(unit.type)]);
-                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'STR' : orb == 'rainbow' ? 'RAINBOW' : unit.type]);
+                    else gradient.addColorStop(0.1, ORB_COLORS[orb == 'g' ? 'G' : orb == 'str' ? 'STR' : orb == 'rainbow' ? 'RAINBOW' : orb == 'meat' ? 'MEAT' : unit.type]);
                     if (orb < 1) gradient.addColorStop(0.2, 'black');
                     else {
                         gradient.addColorStop(0.2, 'white');
@@ -93,19 +93,22 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                     gradient.addColorStop(1.0, 'transparent');
                     context.fillStyle = gradient;
                     context.fillRect(0, 0, canvas.width, canvas.height);
-                    if (orb != 'g' && orb != 'str' && orb != 'rainbow') {
+                    if (orb != 'g' && orb != 'str' && orb != 'rainbow' && orb != 'meat') {
                         var temp = (orb < 1 ? [ 'f0d7', baseX + 13, baseY + 31 ] : [ 'f0d8', baseX + 13, baseY + 28 ]);
                         awesome(context, { text: temp[0], style: '28px', color: 'white',
                             x: temp[1], y: temp[2], stroke: 'gray' });
                     } else if (orb == 'g') {
-                        type(context, { text: 'S', style: 'bold 20px "Open Sans"',
+                        type(context, { text: 'G', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
-                    } else if (orb == 's'){
+                    } else if (orb == 'str'){
                         type(context, { text: 'S', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
-                    } else{
+                    } else if (orb == 'rainbow'){
                         type(context, { text: 'R', style: 'bold 20px "Open Sans"',
                             x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
+                    } else{
+                        type(context, { text: 'M', style: 'bold 20px "Open Sans"',
+                            x: baseX + 13, y: baseY + 28, color: 'white', stroke: 'black', strokeWidth: 2 });
                     }
                 }
                 // level label
diff --git a/damage/js/utils.js b/damage/js/utils.js
index c8a40a714..614b32aa7 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -95,7 +95,7 @@ window.CrunchUtils.typeSort = function(array, typeMultiplier, types) {
     return result;
 };
 
-window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier, boostedMultiplier) {
+window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier, boostedMultiplier, captains) {
     if(window.specials[1221].turnedOn || window.specials[1222].turnedOn){
         if (orb == 'str') return boostedMultiplier;
         if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
@@ -130,10 +130,38 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
+    if(window.specials[1515].turnedOn || window.specials[1516].turnedOn){
+        if (orb == 'meat') return boostedMultiplier;
+    }
+    if(window.specials[1593].turnedOn){
+        if(uclass.has("Fighter")){
+            if (orb == 'meat') return boostedMultiplier;
+        }
+    }
+    if(window.specials[1181].turnedOn || window.specials[1182].turnedOn){
+        if(uclass.has("Slasher")){
+            if (orb == 'meat') return boostedMultiplier;
+        }
+    }
+    if(window.specials[1379].turnedOn || window.specials[1380].turnedOn){
+        if(uclass.has("Cerebral") || uclass.has("Free Spirit")){
+            if (orb == 'meat') return boostedMultiplier;
+        }
+    }
     if(window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1330].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn){
         if (orb == 0.5) return baseMultiplier;
     }
-    if (orb == 1.0 || orb == 'str') return baseMultiplier;
+    for(temp = 0; temp < 2; temp++){
+        if(captains[temp] != null){
+            if(captains[temp].name.includes('Kami Enel')){
+                if (orb == 'meat'){
+                    console.log('test');
+                    return boostedMultiplier;
+                }
+            }
+        }
+    }
+    if (orb == 1.0 || orb == 'str' || orb == 'meat') return baseMultiplier;
     if (orb == 2.0 || orb == 'g' || orb == 'rainbow') return boostedMultiplier;
     if (orb == 0.5) return 1 / boostedMultiplier;
     return 1;
diff --git a/damage/views/fragments/orb.html b/damage/views/fragments/orb.html
index b18ec71b2..e4df8492f 100644
--- a/damage/views/fragments/orb.html
+++ b/damage/views/fragments/orb.html
@@ -16,5 +16,9 @@
     <i class="rainbow-orb" ng-show="tdata.team[slot].orb == 'rainbow'">
         R
     </i>
+    
+    <i class="meat-orb" ng-show="tdata.team[slot].orb == 'meat'">
+        M
+    </i>
 
 </div>
diff --git a/index.css b/index.css
index 210703cd6..147b5c1a7 100644
--- a/index.css
+++ b/index.css
@@ -146,7 +146,7 @@ body {
 .DEX   { background: lightgreen; }
 .PSY   { background: gold; }
 .INT   { background: orchid; }
-.RCV   { background: sandybrown; }
+.RCV   { background: darkgoldenrod; }
 .TND   { background: peru; }
 .BLOCK { background: darkslateblue; }
 .BOMB  { background: maroon; }

From 47803560e9ca58060eac8c58dabeac777e5887fb Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 22:22:10 -0400
Subject: [PATCH 1167/1569] Nekomamushi and Akainu fixes

---
 common/data/captains.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a10a15963..675916bee 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3542,13 +3542,13 @@ window.captains = {
     },
     1313: {
         atk: function(p) {
-            return p.unit.type == "STR" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? ((p.orb == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
         },
     },
     1314: {
         atk: function(p) {
-            return p.unit.type == "STR" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? ((p.orb == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
         },
     },
     1315: {
@@ -4867,11 +4867,11 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1651: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1652: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb != 'meat') ? 3.75 : 1 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1653: {

From 2f9a22eee73ec511bf29527cd9042b35207cd33e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 22:31:07 -0400
Subject: [PATCH 1168/1569] G orbs for the cat

---
 common/data/captains.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 675916bee..f9d52dfd6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4867,11 +4867,11 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1651: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat') ? 1 : 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1652: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat') ? 1 : 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1653: {

From 1bf6c73da99e1e3a3ff7a9122584e3ac568de171 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 23 Jun 2017 22:59:53 -0400
Subject: [PATCH 1169/1569] Usopp

---
 damage/js/cruncher.js | 6 ++++--
 damage/js/utils.js    | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 1c217e81b..1122211e1 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -202,8 +202,10 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             //Captain Meat orbs because Nekomamushi
             if (orb =='meat'){
                 for (temp = 0; temp < 2; temp++){
-                    if (team[temp].unit.name.includes("Kami Enel")){
-                        orb = 2;
+                    if (team[temp].unit != null){
+                        if (team[temp].unit.name.includes("Kami Enel") || team[temp].unit.name.includes("God Usopp") || team[temp].unit.name.includes("Usoland")){
+                            orb = 2;
+                        }
                     }
                 }
             }
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 614b32aa7..7bb338980 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -153,9 +153,8 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
     }
     for(temp = 0; temp < 2; temp++){
         if(captains[temp] != null){
-            if(captains[temp].name.includes('Kami Enel')){
+            if(captains[temp].name.includes('Kami Enel') || captains[temp].name.includes('God Usopp') || captains[temp].name.includes('Usoland')){
                 if (orb == 'meat'){
-                    console.log('test');
                     return boostedMultiplier;
                 }
             }

From 3c2028e51bda4101448b5412589d6e30575a927d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 24 Jun 2017 22:48:05 -0400
Subject: [PATCH 1170/1569] Doggo Storm

---
 common/data/aliases.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 177ce31f2..62dc218d9 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1181,8 +1181,8 @@ window.aliases = {
     1180: ['虹ヨロイガニ',''],
     1181: ['ブレンハイム',''],
     1182: ['カトラスのブレンハイム',''],
-    1183: ['キングデュー',''],
-    1184: ['双拳ガントレットのキングデュー',''],
+    1183: ['キングデュー','','Heman'],
+    1184: ['双拳ガントレットのキングデュー','','Heman'],
     1185: ['ハルタ',''],
     1186: ['疾風の小剣士ハルタ',''],
     1187: ['アトモス',''],
@@ -1510,7 +1510,7 @@ window.aliases = {
     1509: ['ハルタ 白ひげ海賊団１２番隊隊長', '', ''],
     1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', ''],
     1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', ''],
-    1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', ''],
+    1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', 'Heman'],
     1513: ['サンジ 春先のお付き添い', '', 'Spring Sanji', 'White Day Sanji'],
     1514: ['サンジ 記念日の手作り', '', 'Spring Sanji', 'White Day Sanji'],
     1515: ['ブルックのブレイクタイム', '', 'White Day Brook'],
@@ -1568,8 +1568,8 @@ window.aliases = {
     1567: ['ボア・ハンコック 少女戦士', '', 'Kid Boa Hancock'],
     1568: ['ボア・ハンコック お姫さまの片鱗', '', 'Kid Boa Hancock'],
     1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law'],
-    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm'],
-    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm'],
+    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
+    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
     1572: ['ワンダ', '', ''],
     1573: ['王の鳥　ワンダ', '', ''],
     1574: ['シシリアン', '', ''],

From 198086f97b58aeafd1a235cf3a9979b1091fb7fb Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 24 Jun 2017 23:09:07 -0400
Subject: [PATCH 1171/1569] Story only Filter

---
 characters/js/utils.js        | 2 +-
 characters/views/sidebar.html | 4 ++++
 common/data/drops.js          | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/characters/js/utils.js b/characters/js/utils.js
index 3436bec8f..d88153028 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -102,7 +102,7 @@ CharUtils.searchDropLocations = function(id) {
         for (var island=0;island<window.drops[type].length;++island) {
             var temp = [ ];
             for (var stage in window.drops[type][island]) {
-                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge' || stage == 'challengeData' || stage == 'showManual' || stage == 'gamewith') continue;
+                if (stage == 'thumb' || stage == 'name' || stage == 'shortName' || stage == 'day' || stage == 'global' || stage == 'condition' || stage == 'completion' || stage == 'challenge' || stage == 'challengeData' || stage == 'showManual' || stage == 'gamewith' || stage == 'teamDatabase') continue;
                 if (window.drops[type][island][stage].indexOf(id) != -1)
                     temp.push(stage);
             }
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 9d8463699..8e7bc9aa6 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -46,6 +46,10 @@
 
 <div class="filter-container conditional" ng-show="filters.drop == 'Farmable'">
     <span class="filter-header">Farmable filters</span>
+    <span class="filter width-6 drop" ng-class="{ active: filters.farmable.story }"
+        ng-model="filters.farmable.story" ng-click="onDropFilterClick($event,true)">Story-only</span><!--
+ --><span class="filter width-6 exc" ng-class="{ active: filters.farmable.story === false }"
+        ng-model="filters.farmable.story" ng-click="onDropFilterClick($event,false)">Hide story-only</span>
     <span class="filter width-6 drop" ng-class="{ active: filters.farmable.fortnight }"
         ng-model="filters.farmable.fortnight" ng-click="onDropFilterClick($event,true)">Fortnight-only</span><!--
  --><span class="filter width-6 exc" ng-class="{ active: filters.farmable.fortnight === false }"
diff --git a/common/data/drops.js b/common/data/drops.js
index 5e18c74bf..5d4582d56 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1902,6 +1902,12 @@ window.drops = {
             "Sanji": [ 1507, 52, 207, 892, 343, 190, 111, 106, 115, 116, 117, 1180, 266, 94, 83 ],
             "Brook": [ 1515, 954, 614, 379, 730, 342, 189, 110, 105, 115, 116, 117, 1180, 266, 94, 83 ],
         },
+
+        {
+            name: 'Straw Hat Pirates!',
+            thumb: 1387,
+            "All Difficulties": [ 2, 5, 9, 13, 17, 21, 708, 629, 895 ],
+        },
         
         {
             name: '2nd Anniversary Celebration! Duel! Ace',

From 5d4004811e672422a0a5f872cf5a16eca48347ab Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 26 Jun 2017 10:41:14 -0400
Subject: [PATCH 1172/1569] New FN units

---
 common/data/captains.js   | 15 +++++++++++++++
 common/data/cooldowns.js  |  8 ++++----
 common/data/details.js    | 17 ++++++++++++++++-
 common/data/drops.js      |  8 ++++++++
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  6 +++---
 common/data/sailors.js    |  9 ++++++++-
 common/data/specials.js   |  3 +++
 common/data/units.js      |  6 +++---
 9 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index f9d52dfd6..bee030a98 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4866,6 +4866,21 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
+    1648: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.4 : 1.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
+    1649: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
+    1650: {
+        atk: function(p) { return p.unit.type == "DEX" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5) : 1; },
+    },
     1651: {
         atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 997229abc..3c83b5f1a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1636,7 +1636,7 @@ window.cooldowns = [
     19,
     17,
     17,
-    15,
+    [ 15, 9 ],
     15,
     16,
     22,
@@ -1646,9 +1646,9 @@ window.cooldowns = [
     22,
     null,//Pica
     null,//Pica
-    null,
-    null,
-    null,
+    20,
+    20,
+    15,
     16,
     16,
     18,
diff --git a/common/data/details.js b/common/data/details.js
index 7c97cdefb..d7d605615 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7451,7 +7451,7 @@ window.details = {
         specialName: "Mother's Promise",
     },
     1387: {//Luffy 5+
-        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. Boosts ATK by an additional 1.25x after scoring 4 Perfects in a row",
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. Boosts ATK by 2.8125x after scoring 4 Perfects in a row",
         captainNotes: "After 4 Perfects, your captain boost is 2.8125x",
         special: "Deals 40x character's ATK in [STR] damage to all enemies, and delays all enemies for 1 turn",
         specialName: "Gum Gum: Elephant Gun",
@@ -9207,6 +9207,21 @@ window.details = {
         ],
         specialNotes: "#{stages}"
     },
+    1648: {//Giolla
+        captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 2.4x after scoring 4 Perfects in a row",
+        special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
+        specialName: "Giolla Special",
+    },
+    1649: {//Giolla
+        captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 3x after scoring 4 Perfects in a row",
+        special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
+        specialName: "Giolla Special",
+    },
+    1650: {//Brook x5
+        captain: "Boosts RCV of [DEX] characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
+        special: "Changes [BLOCK], [TND], [EMPTY], and [BOMB] orbs into [DEX] orbs and amplifies the effect of orbs by 1.5x for 1 turns",
+        specialName: "Brook Special",
+    },
     1651: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
         special: "Deals 60x character's ATK in [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
diff --git a/common/data/drops.js b/common/data/drops.js
index 5d4582d56..9f31011ec 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1562,6 +1562,14 @@ window.drops = {
             "All Difficulties": [ 1624, 1625, 1626, -1434, -1477, -1475, -410, -365, -993, -1031, -954, -1347 ],
         },
         
+        {
+            name: "The Two Artists! Giolla and Brook!",
+            thumb: 1649,
+            gamewith: null,
+            condition: "You must have at least one character of each type on your team: STR, DEX, QCK, PSY, and INT.",
+            "All Difficulties": [ 1648, 1650, -1473, -1483, -412, -414, -1075, -1027, -1348, -956 ],
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 6c693db75..f2e3b7560 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2535,6 +2535,10 @@ window.evolutions = {
         evolution: 1647,
         evolvers: [ 118, 84, 266, 300, 100 ]
     },
+    1648: {
+        evolution: 1649,
+        evolvers: [  ]
+    },
     1651: {
         evolution: 1652,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 3ada8528d..6296a7f79 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1646,9 +1646,9 @@ window.families = [
     "Patrol Troop Corps DEX",
     "Pica",
     "Pica",
-    null,
-    null,
-    null,
+    "Jora",
+    "Jora",
+    "Brook",
     "Nekomamushi",
     "Nekomamushi",
     "Pedro",
diff --git a/common/data/sailors.js b/common/data/sailors.js
index e64399720..ba3a27a30 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -282,5 +282,12 @@ window.sailors = {
     1614: {//not working
         staticMult: function(p) { return 2; }
     },
-    
+    1654: {
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+    },
+    1655: {
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 91748af8a..293903fba 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3059,6 +3059,9 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
         type: "class",
     },
+    1650: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    },
     1651: {
         turnedOn: false,
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 907a3c5da..87f1ed2cc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1646,9 +1646,9 @@ window.units = [
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
     [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
     [ "Pica [Reformed], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Giolla", "STR", [ "Shooter", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Giolla, Trebol Army Executive", "STR", [ "Shooter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3404, 1451, 352, null ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],

From bac9d6c0e5d935d1e4e735af9a9790da2db56072 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 26 Jun 2017 15:24:25 -0400
Subject: [PATCH 1173/1569] Some Fodder Specials and Multistage Specials

---
 common/data/cooldowns.js | 130 +++++++++++++++++++--------------------
 common/data/details.js   |   4 +-
 2 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3c83b5f1a..cad1c810f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -992,10 +992,10 @@ window.cooldowns = [
     [ 15, 9 ],
     [ 20, 15 ],
     [ 20, 15 ],
-    null, //Violet
-    null, //Violet
-    null, //Dellinger 
-    null, //Dellinger 
+    [ 20, 14 ], //Violet
+    [ 20, 14 ], //Violet
+    [ 20, 14 ], //Dellinger 
+    [ 20, 14 ], //Dellinger 
     [ 23, 17 ],
     [ 23, 17 ],
     [ 23, 17 ],
@@ -1042,8 +1042,8 @@ window.cooldowns = [
     [ 29, 18 ],
     [ 18, 8 ],
     [ 18, 8 ],
-    null,
-    null,
+    [ 25, 20 ],//Law
+    [ 25, 20 ],//Law
     [ 30, 14 ],
     [ 30, 14 ],
     [ 22, 15 ],
@@ -1128,10 +1128,10 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 20, 15 ],
     [ 20, 15 ],
-    null,//Elizabello
-    null,//Elizabello
-    null,//Ideo
-    null,//Ideo
+    [ 26, 20 ],//Elizabello
+    [ 26, 20 ],//Elizabello
+    [ 23, 17 ],//Ideo
+    [ 23, 17 ],//Ideo
     [ 6, 6 ],
     [ 6, 6 ],
     [ 16, 12],
@@ -1183,8 +1183,8 @@ window.cooldowns = [
     [ 19, 13 ],
     [ 23, 17 ],
     [ 23, 17 ],
-    null,// Haruta
-    null,// Haruta
+    [ 17, 12 ],// Haruta
+    [ 17, 12 ],// Haruta
     [ 23, 16 ],
     [ 23, 16 ],
     [ 11, 5 ],
@@ -1217,13 +1217,13 @@ window.cooldowns = [
     [ 17, 10 ],
     [ 17, 11 ],
     [ 25, 14 ],
-    null, //byrnndi world
-    null,//byrnndi world
+    [ 34, 18 ],//byrnndi world
+    [ 34, 18 ],//byrnndi world
     [ 29, 16 ],
     [ 29, 16 ],
     [ 20, 10 ],
     [ 15, 9 ],
-    16,
+    [ 16, 10 ],
     [ 17, 10 ],
     [ 23, 16 ],
     [ 22, 15 ],
@@ -1237,8 +1237,8 @@ window.cooldowns = [
     [ 20, 13 ],
     [ 22, 14 ],
     [ 22, 14 ],
-    null,//Kizaru
-    null,//Kizaru
+    [ 20, 17 ],//Kizaru
+    [ 20, 17 ],//Kizaru
     [ 19, 11 ],
     [ 19, 11 ],
     [ 20, 15 ],
@@ -1248,15 +1248,15 @@ window.cooldowns = [
     [ 17, 17 ],
     [ 13, 13 ],
     [ 13, 13 ],
-    null,//Colo Marco
-    null,//Colo Marco
+    [ 24, 9 ],//Colo Marco
+    [ 24, 9 ],//Colo Marco
     [ 24, 14 ],
     [ 14, 6 ],
     [ 21, 14 ],
     [ 19, 12 ],
     [ 18, 12 ],
-    null,//Young Whitebeard
-    null,//Young Whitebeard
+    [ 36, 24 ],//Young Whitebeard
+    [ 36, 24 ],//Young Whitebeard
     [ 17, 15 ],
     [ 17, 15 ],
     [ 12, 10 ],
@@ -1291,8 +1291,8 @@ window.cooldowns = [
     [ 20, 10 ],
     [ 29, 17 ],
     [ 29, 17 ],
-    null,//Coliseumn Sandersonia
-    null,//Coliseumn Sandersonia
+    [ 26, 16 ],//Coliseumn Sandersonia
+    [ 26, 16 ],//Coliseumn Sandersonia
     [ 16, 16 ],
     [ 16, 16 ],
     [ 32, 17 ],
@@ -1313,8 +1313,8 @@ window.cooldowns = [
     [ 25, 15 ],
     [ 25, 18 ],
     [ 25, 18 ],
-    null,//Coby
-    null,//Coby
+    [ 28, 18 ],//Coby
+    [ 28, 18 ],//Coby
     [ 22, 17 ],
     [ 22, 17 ],
     [ 21, 17 ],
@@ -1325,19 +1325,19 @@ window.cooldowns = [
     [ 15, 9 ],
     [ 13, 6 ],
     [ 13, 6 ],
-    null,//Leo
-    null,//Leo
-    null,//Wicca
+    [ 19, 12 ],//Leo
+    [ 19, 12 ],//Leo
+    [ 16, 10 ],//Wicca
     [ 20, 12 ],
-    null,//Mansherry
-    null,//Mansherry
+    [ 24, 17 ],//Mansherry
+    [ 24, 17 ],//Mansherry
     [ 20, 12 ],
     [ 19, 12 ],
     [ 6, 6 ],
     [ 6, 6 ],
     [ 27, 15 ],
     [ 27, 15 ],
-    null,//Jump Point Chopper
+    [ 25, 15 ],//Jump Point Chopper
     [ 23, 13 ],
     [ 23, 13 ],
     [ 15, 9 ],
@@ -1349,7 +1349,7 @@ window.cooldowns = [
     [ 17, 10 ],
     13,
     [ 14, 8 ],
-    20,
+    [ 20, 13 ],
     [ 15, 9 ],
     [ 16, 12 ],
     [ 14, 14 ],
@@ -1363,16 +1363,16 @@ window.cooldowns = [
     [ 20, 16 ],
     [ 21, 15 ],
     [ 21, 15 ],
-    null,//New World Nami
-    null,//New World Nami
-    null,//New World Sanji
-    null,//New World Sanji
+    [ 18, 13 ],//New World Nami
+    [ 18, 13 ],//New World Nami
+    [ 20, 15 ],//New World Sanji
+    [ 20, 15 ],//New World Sanji
     [ 12, 6 ],
     [ 12, 6 ],
     [ 15, 15 ],
     [ 15, 15 ],
-    null,//Magellan
-    null,//Magellan
+    [ 31, 16 ],//Magellan
+    [ 31, 16 ],//Magellan
     [ 26, 12 ],
     [ 26, 12 ],
     [ 26, 14 ],
@@ -1398,11 +1398,11 @@ window.cooldowns = [
     [ 21, 14 ],
     [ 19, 14 ],
     [ 19, 14 ],
-    null,//Colo Gladius
-    null,//Colo Gladius
-    null,//Colo Dalton
-    null,//New World Luffy
-    null,//New World Luffy
+    [ 33, 18 ],//Colo Gladius
+    [ 33, 18 ],//Colo Gladius
+    [ 18, 8 ],//Colo Dalton
+    [ 18, 13 ],//New World Luffy
+    [ 18, 13 ],//New World Luffy
     [ 20, 14 ],
     [ 20, 14 ],
     [ 22, 16 ],
@@ -1431,8 +1431,8 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 33, 17 ],
     [ 33, 17 ],
-    null,//Hody Jones
-    null,//Hody Jones
+    [ 22, 17 ],//Hody Jones
+    [ 22, 17 ],//Hody Jones
     [ 21, 15 ],
     [ 21, 15 ],
     [ 21, 15 ],
@@ -1445,7 +1445,7 @@ window.cooldowns = [
     [ 20, 15 ],
     [ 17, 13 ],
     [ 17, 12 ],
-    null,//5+ Sanji
+    [ 20, 15 ],//5+ Sanji
     [ 20, 12 ],
     [ 22, 14 ],
     [ 22, 14 ],
@@ -1453,8 +1453,8 @@ window.cooldowns = [
     [ 20, 13 ],
     [ 12, 12 ],
     [ 12, 12 ],
-    null,//Colo Don Chinjao
-    null,//Colo Don Chinjao
+    [ 30, 15 ],//Colo Don Chinjao
+    [ 30, 15 ],//Colo Don Chinjao
     [ 18, 7 ],
     [ 18, 7 ],
     [ 22, 11 ],
@@ -1470,8 +1470,8 @@ window.cooldowns = [
     [ 18, 11 ],
     [ 14, 5 ],
     [ 17, 10 ],
-    null,//Shirahoshi
-    null,//Shirahoshi
+    [ 22, 18 ],//Shirahoshi
+    [ 22, 18 ],//Shirahoshi
     [ 21, 15 ],
     [ 21, 15 ],
     [ 16, 10 ],
@@ -1490,11 +1490,11 @@ window.cooldowns = [
     [ 20, 10 ],
     [ 20, 11 ],
     [ 20, 11 ],
-    null,//6+ Sabo
+    [ 23, 17 ],//6+ Sabo
     22,
     19,
     19,
-    18,
+    [ 18, 10 ],
     16,
     17,
     15,
@@ -1524,13 +1524,13 @@ window.cooldowns = [
     [ 11, 11 ],
     [ 11, 11 ],
     [ 30, 16 ],
-    null,//Coliseum Arlong
-    null,//Coliseum Arlong
+    [ 21, 12 ],//Coliseum Arlong
+    [ 21, 12 ],//Coliseum Arlong
     [ 21, 12 ],
     [ 28, 15 ],
     [ 28, 15 ],
-    null,//Legend Usopp
-    null,//Legend Usopp
+    [ 24, 21 ],//Legend Usopp
+    [ 24, 21 ],//Legend Usopp
     [ 17, 11 ],
     [ 17, 11 ],
     [ 19, 14 ],
@@ -1561,8 +1561,8 @@ window.cooldowns = [
     [ 11, 5 ],
     [ 23, 17 ],
     [ 15, 9 ],
-    null,//Fortnight Elizabello
-    null,//Fortnight Elizabello
+    [ 24, 16 ],//Fortnight Elizabello
+    [ 24, 16 ],//Fortnight Elizabello
     [ 15, 9 ],
     [ 15, 9 ],
     [ 13, 13 ],
@@ -1576,8 +1576,8 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 19, 13 ],
     [ 19, 13 ],
-    null,
-    null,
+    [ 14, 9 ],//Momonosuke
+    [ 14, 9 ],//Momonosuke
     [ 20, 13 ],
     [ 20, 13 ],
     [ 22, 15 ],
@@ -1591,7 +1591,7 @@ window.cooldowns = [
     [ 17, 17 ],
     [ 11, 11 ],
     [ 11, 11 ],
-    null,//Gear 4 Luffy
+    [ 18, 13 ],//Gear 4 Luffy
     [ 29, 14 ],
     [ 29, 14 ],
     [ 20, 15 ],
@@ -1625,8 +1625,8 @@ window.cooldowns = [
     [ 15, 9 ],
     [ 20, 14 ],
     [ 15, 9 ],
-    null,//Mach Vise
-    null,//Mach Vise
+    [ 31, 17 ],//Mach Vise
+    [ 31, 17 ],//Mach Vise
     [ 15, 5 ],
     [ 15, 5 ],
     [ 21, 17 ],
@@ -1644,8 +1644,8 @@ window.cooldowns = [
     19,
     19,
     22,
-    null,//Pica
-    null,//Pica
+    [ 26, 17 ],//Pica
+    [ 26, 17 ],//Pica
     20,
     20,
     15,
diff --git a/common/data/details.js b/common/data/details.js
index d7d605615..1f1c6d21e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8209,13 +8209,13 @@ window.details = {
     1494: {//QCK Fishman Outlaw
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Locks captain's orb for 1 turn",
-        specialName: "Captain Slot Light Hold",
+        specialName: "Captain Slot Hold: Light",
     },
     1495: {//DEX Fishman Outlaw
         captain: "Boosts ATK of [DEX] characters by 1.5x",
         special: "Reduces Silence duration by 1 turn",
         specialNotes: "#{silence}",
-        specialName: "Special Bind Light Recovery",
+        specialName: "Special Seal Recovery: Light",
     },
     1496: {//INT Fishman Outlaw
         captain: "Boosts ATK of Powerhouse characters by 1.5x",

From 96344bd30448e279e96127bcd059c2393929fe26 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 26 Jun 2017 23:56:47 -0400
Subject: [PATCH 1174/1569] Wild Zoro fix

---
 common/data/captains.js |  4 ++--
 common/data/details.js  | 10 +++++-----
 common/data/units.js    |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index bee030a98..216e7c597 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3759,7 +3759,7 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.25 : 2;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 2;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -3767,7 +3767,7 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 2;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
diff --git a/common/data/details.js b/common/data/details.js
index 1f1c6d21e..733dd9e3e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7335,14 +7335,14 @@ window.details = {
         specialName: "Kakuho: Elf",
     },
     1371: {//Wild Zoro
-        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 3rd Perfect and by 2.5x after the 5th Perfect.",
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 2nd Perfect and by 2.5x after the 4th Perfect.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
         specialName: "Wild Plan",
     },
     1372: {//Wild Zoro
-        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect and by 3x after the 5th Perfect.",
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 2nd Perfect and by 3x after the 4th Perfect.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
@@ -9210,17 +9210,17 @@ window.details = {
     1648: {//Giolla
         captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 2.4x after scoring 4 Perfects in a row",
         special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
-        specialName: "Giolla Special",
+        specialName: "Sprouting with Beautiful Passion",
     },
     1649: {//Giolla
         captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 3x after scoring 4 Perfects in a row",
         special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
-        specialName: "Giolla Special",
+        specialName: "Sprouting with Beautiful Passion",
     },
     1650: {//Brook x5
         captain: "Boosts RCV of [DEX] characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
         special: "Changes [BLOCK], [TND], [EMPTY], and [BOMB] orbs into [DEX] orbs and amplifies the effect of orbs by 1.5x for 1 turns",
-        specialName: "Brook Special",
+        specialName: "Eyes Blinded by True Beauty",
     },
     1651: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
diff --git a/common/data/units.js b/common/data/units.js
index 87f1ed2cc..964e97670 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1646,9 +1646,9 @@ window.units = [
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
     [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
     [ "Pica [Reformed], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
-    [ "Giolla", "STR", [ "Shooter", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Giolla, Trebol Army Executive", "STR", [ "Shooter", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Giolla, Trebol Army Executive", "STR", [ "Shooter", "Free Spirit" ], 4, 20, null, 4, null, null, null, null, null, null, null, null, null ],
+    [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, null, 4, null, null, null, null, null, null, null, null, null ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3404, 1451, 352, null ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],

From 82398189dba09796fac7b4c508002c5764584c9f Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Tue, 27 Jun 2017 08:13:25 -0700
Subject: [PATCH 1175/1569] New STR Aokiji

---
 common/data/captains.js | 12 ++++++++++++
 common/data/details.js  | 10 ++++++++++
 common/data/units.js    |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index 216e7c597..63faaa657 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4915,4 +4915,16 @@ window.captains = {
     1660: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
+    1664: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
+    1665: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index 733dd9e3e..1e6ede90b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9284,4 +9284,14 @@ window.details = {
         specialNotes: "#{silence}",
         specialName: "Ninja Arts - Bunshin no Jutsu",
     },
+    1664: {//STR Aokiji
+        captain: "Boosts ATK of Shooter characters by 2.5x",
+        special: "Locks all orbs for 1 turn.  If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
+        specialName: "STR Aokiji Special",
+    },
+    1665: {//STR Aokiji Evolved
+        captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
+        special: "Locks all orbs for 1 turn.  If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
+        specialName: "STR Aokiji Evolved Special",
+    },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 964e97670..281df0ab6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1659,6 +1659,11 @@ window.units = [
     [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
     [ "Raizo, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
+    [ ],
+    [ ],
+    [ ],
+    [ "STR Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "STR Aokiji Evolved", "STR", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b1416e9355098bedf0c800294442dc95289260c7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 27 Jun 2017 15:15:49 -0400
Subject: [PATCH 1176/1569] New units and Random Button

---
 characters/css/index.css     |  8 +++++++
 characters/js/controllers.js |  6 +++++
 characters/views/main.html   |  1 +
 common/data/aliases.js       | 12 ++++++----
 common/data/captains.js      |  2 +-
 common/data/cooldowns.js     | 11 ++++++---
 common/data/details.js       | 12 +++++-----
 common/data/drops.js         |  4 +++-
 common/data/evolutions.js    |  6 ++++-
 common/data/families.js      |  5 ++++
 common/data/flags.js         | 44 ++++++++++++++++++++++++------------
 common/data/gw.js            | 18 +++++++++++++++
 common/data/ships.js         |  2 +-
 common/data/specials.js      | 12 ++++++++--
 common/data/units.js         | 18 +++++++--------
 15 files changed, 119 insertions(+), 42 deletions(-)

diff --git a/characters/css/index.css b/characters/css/index.css
index 542f85992..5391c6611 100644
--- a/characters/css/index.css
+++ b/characters/css/index.css
@@ -758,6 +758,14 @@ tr.preview td:nth-child(2) > a:after {
     text-decoration: underline;
 }
 
+.clickable, #random-button {
+    cursor: pointer !important;
+}
+
+#random-button:hover {
+    text-decoration: underline;
+}
+
 .arrow {
     font-size: 1.5em;
     bottom: 10px;
diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index 0b089f907..bac1746cb 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -34,6 +34,12 @@ app.controller('MainCtrl',function($scope, $rootScope, $state, $stateParams, $ti
     });
 
     $controller('DismissalCtrl');
+    
+    $scope.getRandChar = function(){
+        var range = $rootScope.table.data.length;
+        //var range = 1665;
+        return Math.floor(Math.random() * range);
+    };
 
 });
 
diff --git a/characters/views/main.html b/characters/views/main.html
index 87a41a68e..68bb9504a 100644
--- a/characters/views/main.html
+++ b/characters/views/main.html
@@ -10,6 +10,7 @@
         <input type="text" id="picker" placeholder="type to filter"
             ng-model="query" ng-model-options="{ updateOn: 'change blur' }" auto-focus>
         <span id="clear-input-button" ng-click="query = ''">Clear</span>
+        <span id="random-button" ng-click="query = getRandChar();">Random</span>
         <span popover-trigger="mouseenter" popover-placement="bottom"
             uib-popover-template="'operators.html'" popover-append-to-body="'true'"><i>Operators</i></span>
     </div>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 62dc218d9..dc96cba16 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1646,9 +1646,9 @@ window.aliases = {
     1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', ''],
     1646: ['ピーカ「改」', '', 'STR Pica'],
     1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'STR Pica'],
-    1648: ['', '', ''],
-    1649: ['', '', ''],
-    1650: ['', '', ''],
+    1648: ['ジョーラ 芸術人間', '', 'Jora'],
+    1649: ['ジョーラ トレーボル軍', '', 'Jora'],
+    1650: ['ブルック サイケデリックアート', '', ''],
     1651: ['', '', 'Cat Viper', 'Nekopara'],
     1652: ['', '', 'Cat Viper', 'Nekopara'],
     1653: ['', '', ''],
@@ -1662,7 +1662,11 @@ window.aliases = {
     1661: ['', '', ''],
     1662: ['', '', ''],
     1663: ['', '', ''],
-    1664: ['', '', ''],
+    1664: ['', '', 'Secret Aokiji'],
+    1665: ['', '', 'Secret Aokiji'],
+    1666: ['', '', ''],
+    1667: ['', '', ''],
+    1668: ['', '', ''],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 63faaa657..a5bd1a471 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4923,7 +4923,7 @@ window.captains = {
         hitAtk: function(p) {
             if (!p.unit.class.has("Shooter")) return 1;
             return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index cad1c810f..465d668ba 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1646,9 +1646,9 @@ window.cooldowns = [
     22,
     [ 26, 17 ],//Pica
     [ 26, 17 ],//Pica
-    20,
-    20,
-    15,
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 15, 11 ],
     16,
     16,
     18,
@@ -1659,4 +1659,9 @@ window.cooldowns = [
     17,
     15,
     15,
+    null,
+    null,
+    null,
+    16,
+    16,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 1e6ede90b..7f12dd589 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7886,7 +7886,7 @@ window.details = {
         specialName: "Grill Shot",
     },
     1448: {//Chopper 5+
-        captain: "Boosts Fighter characters ATK by 2.5x.",
+        captain: "Boosts ATK of Fighter characters by 2.5x.",
         special: "Deals PSY damage according to HP. Changes [BLOCK] orbs on Fighter characters into matching.",
         specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the higher the HP is. The formula used is ???? * (current HP) / (total HP)",
         specialName: "Weight Gain: Heavy Gong",
@@ -9286,12 +9286,12 @@ window.details = {
     },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
-        special: "Locks all orbs for 1 turn.  If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
-        specialName: "STR Aokiji Special",
+        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
+        specialName: "Ice Saber",
     },
-    1665: {//STR Aokiji Evolved
+    1665: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
-        special: "Locks all orbs for 1 turn.  If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
-        specialName: "STR Aokiji Evolved Special",
+        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
+        specialName: "Ice Saber",
     },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index 9f31011ec..a0bd4a1ae 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1436,6 +1436,7 @@ window.drops = {
         {
             name: "Tontatta Kingdom Island Part 1: Leo",
             thumb: 1328,
+            global: true,
             gamewith: 44164,
             condition: "Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
             "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508, -1387 ]
@@ -1444,6 +1445,7 @@ window.drops = {
         {
             name: "Tontatta Kingdom Island Part 2: Mansherry",
             thumb: 1332,
+            global: true,
             gamewith: 44747,
             condition: "Striker characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (70% on 30 stamina)",
             "All Difficulties": [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
@@ -1565,7 +1567,7 @@ window.drops = {
         {
             name: "The Two Artists! Giolla and Brook!",
             thumb: 1649,
-            gamewith: null,
+            gamewith: 60685,
             condition: "You must have at least one character of each type on your team: STR, DEX, QCK, PSY, and INT.",
             "All Difficulties": [ 1648, 1650, -1473, -1483, -412, -414, -1075, -1027, -1348, -956 ],
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f2e3b7560..7dff8ead5 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2537,7 +2537,7 @@ window.evolutions = {
     },
     1648: {
         evolution: 1649,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 84, 95, 100 ]
     },
     1651: {
         evolution: 1652,
@@ -2559,4 +2559,8 @@ window.evolutions = {
         evolution: 1660,
         evolvers: [  ]
     },
+    1664: {
+        evolution: 1665,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 6296a7f79..48a7c3af2 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1659,4 +1659,9 @@ window.families = [
     "Kanjuro",
     "Raizo",
     "Raizo",
+    null,
+    null,
+    null,
+    "Aokiji",
+    "Aokiji",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 4a5b08c9b..f55d11125 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1073,6 +1073,10 @@ window.flags = {
     1083: { rr: 1, rro: 1, global: 1 },
     1084: { rr: 1, rro: 1, global: 1 },
     1085: { rr: 1, rro: 1, global: 1 },
+    1086: { global: 1 },
+    1087: { global: 1 },
+    1088: { global: 1 },
+    1089: { global: 1 },
     1090: { global: 1 },
     1091: { global: 1 },
     1092: { rr: 1, rro: 1, lrr: 1 },
@@ -1275,6 +1279,14 @@ window.flags = {
     1322: { rr: 1, rro: 1, global: 1 },
     1323: { rr: 1, rro: 1, global: 1 },
     1324: { rr: 1, rro: 1, global: 1 },
+    1327: { global: 1 },
+    1328: { global: 1 },
+    1329: { global: 1 },
+    1330: { global: 1 },
+    1331: { global: 1 },
+    1332: { global: 1 },
+    1333: { global: 1 },
+    1334: { global: 1 },
     1335: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1336: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1342: { global: 1 },
@@ -1302,8 +1314,8 @@ window.flags = {
     1368: { rr: 1, rro: 1, global: 1 },
     1369: { rr: 1, rro: 1, global: 1 },
     1370: { rr: 1, rro: 1, global: 1 },
-    1371: { shop: 1 },
-    1372: { shop: 1 },
+    1371: { shop: 1, global: 1, global: 1 },
+    1372: { shop: 1, global: 1, global: 1 },
     1379: { global: 1 },
     1380: { global: 1 },
     1381: { rr: 1, rro: 1, lrr: 1, global: 1 },
@@ -1333,20 +1345,22 @@ window.flags = {
     1420: { rr: 1, rro: 1, lrr: 1, },
     1429: { rr: 1, rro: 1, lrr: 1, },
     1430: { rr: 1, rro: 1, lrr: 1, },
-    1433: { rr: 1, rro: 1 },
-    1434: { rr: 1, rro: 1 },
-    1435: { rr: 1, rro: 1 },
-    1436: { rr: 1, rro: 1 },
-    1437: { rr: 1, rro: 1 },
-    1438: { rr: 1, rro: 1 },
-    1439: { rr: 1, rro: 1 },
-    1440: { rr: 1, rro: 1 },
-    1441: { rr: 1, rro: 1 },
-    1442: { rr: 1, rro: 1 },
-    1443: { rr: 1, rro: 1 },
-    1444: { rr: 1, rro: 1 },
+    1433: { rr: 1, rro: 1, global: 1 },
+    1434: { rr: 1, rro: 1, global: 1 },
+    1435: { rr: 1, rro: 1, global: 1 },
+    1436: { rr: 1, rro: 1, global: 1 },
+    1437: { rr: 1, rro: 1, global: 1 },
+    1438: { rr: 1, rro: 1, global: 1 },
+    1439: { rr: 1, rro: 1, global: 1 },
+    1440: { rr: 1, rro: 1, global: 1 },
+    1441: { rr: 1, rro: 1, global: 1 },
+    1442: { rr: 1, rro: 1, global: 1 },
+    1443: { rr: 1, rro: 1, global: 1 },
+    1444: { rr: 1, rro: 1, global: 1 },
     1445: { rr: 1, rro: 1, global: 1 },
+    1446: { global: 1 },
     1447: { global: 1 },
+    1448: { global: 1 },
     1453: { rr: 1, rro: 1, lrr: 1, },
     1454: { rr: 1, rro: 1, lrr: 1, },
     1461: { special: 1 },
@@ -1429,4 +1443,6 @@ window.flags = {
     1658: { rr: 1, rro: 1 },
     1659: { rr: 1, rro: 1 },
     1660: { rr: 1, rro: 1 },
+    1664: { rr: 1, rro: 1, lrr: 1 },
+    1665: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 3ad7c33bd..5f3e0e667 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1646,4 +1646,22 @@ window.gw=[
     60347,
     60100,
     60100,
+    60688,
+    60688,
+    60689,
+    null,//Nekomamushi
+    null,//Nekomamushi
+    60676,
+    60676,
+    60677,
+    60677,
+    60675,
+    60675,
+    60678,
+    60678,
+    null,
+    null,
+    null,
+    61003,
+    61003,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index ee1eb7d98..bbf42dad0 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -417,7 +417,7 @@ window.ships = [
     
     { //32
         name: "Marshal D. Teach Pirate Ship",
-        thumb: null,
+        thumb: 'ship_0034_c.png',
         description: 'Boosts HP by 1.25x and reduces special cooldown of all characters by 1 at the start of the adventure. Boosts ATK by 1.55x if you have a Striker, Shooter, Fighter, and Slasher on your crew.',
         atk: function(p) { 
             return (p.classCount.Striker >= 1 && p.classCount.Fighter >= 1 && p.classCount.Shooter >= 1 && p.classCount.Slasher >= 1) ? [ 1.2, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.5, 1.55 ][p.boatLevel - 1] : 1;
diff --git a/common/data/specials.js b/common/data/specials.js
index 293903fba..030d6e1f0 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3004,7 +3004,7 @@ window.specials = {
             var n = (window.specials[1627].multiplier == 1.25 ? 1 : window.specials[1627].multiplier == 1.5 ? 2 : 0);
             window.specials[1627].multiplier = [1.25, 1.5, 1.75][n];
             p.scope.notify({
-                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x chain addition, disable and re-enable this special',
+                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
                 name: '1627warning'
             });
         }
@@ -3015,7 +3015,7 @@ window.specials = {
             var n = (window.specials[1628].multiplier == 1.25 ? 1 : window.specials[1628].multiplier == 1.5 ? 2 : 0);
             window.specials[1628].multiplier = [1.25, 1.5, 1.75][n];
             p.scope.notify({
-                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x chain addition, disable and re-enable this special',
+                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
                 name: '1628warning'
             });
         }
@@ -3108,4 +3108,12 @@ window.specials = {
             return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         }
     },
+    1664: {
+        atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
+        type: "class",
+    },
+    1665: {
+        atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
+        type: "class",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 281df0ab6..c11d0643a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1646,9 +1646,9 @@ window.units = [
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
     [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
     [ "Pica [Reformed], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
-    [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Giolla, Trebol Army Executive", "STR", [ "Shooter", "Free Spirit" ], 4, 20, null, 4, null, null, null, null, null, null, null, null, null ],
-    [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, null, 4, null, null, null, null, null, null, null, null, null ],
+    [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
+    [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
+    [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3404, 1451, 352, null ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
@@ -1657,13 +1657,13 @@ window.units = [
     [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2041, 1250, 390, null ],
     [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
-    [ "Raizo, Wano Country Ninja", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
-    [ ],
-    [ ],
-    [ ],
-    [ "STR Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "STR Aokiji Evolved", "STR", [ "Shooter", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From bf48d9d140663276ac1d9094a6375fd292e83126 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 27 Jun 2017 15:19:10 -0400
Subject: [PATCH 1177/1569] Small fix

---
 characters/js/controllers.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index bac1746cb..bb9ddcbb2 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -36,8 +36,7 @@ app.controller('MainCtrl',function($scope, $rootScope, $state, $stateParams, $ti
     $controller('DismissalCtrl');
     
     $scope.getRandChar = function(){
-        var range = $rootScope.table.data.length;
-        //var range = 1665;
+        var range = $rootScope.table.data[$rootScope.table.data.length - 1][11] + 1;
         return Math.floor(Math.random() * range);
     };
 

From 455d6862fe1b0c9aeb28f6b9671913ea4b6ae011 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 27 Jun 2017 19:55:53 -0400
Subject: [PATCH 1178/1569] Aokiji clarification

---
 common/data/details.js | 4 ++--
 common/data/units.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 7f12dd589..5a79ab3d8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9286,12 +9286,12 @@ window.details = {
     },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
-        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
+        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
     },
     1665: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
-        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn",
+        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
     },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index c11d0643a..93d98529a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1663,7 +1663,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 17a18d428b2b838bd9ee236eafa10d5b0ba58a3e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 27 Jun 2017 21:47:21 -0400
Subject: [PATCH 1179/1569] Matching orb captains

and new Sugo unevolved boosts
---
 common/data/captains.js | 60 ++++++++++++++++++++---------------------
 common/data/details.js  | 14 +++++-----
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a5bd1a471..18c7a7cb8 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1047,11 +1047,11 @@ window.captains = {
         atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
     },
     561: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     562: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     568: {
@@ -1273,13 +1273,13 @@ window.captains = {
         rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     652: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2 : 1); }
     },
     653: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.25 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.25 : 1); }
     },
     654: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1); }
     },
     655: {
         atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
@@ -1554,11 +1554,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     747: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     748: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     749: {
@@ -2097,10 +2097,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     913: {
-        atk: function(p) { return p.unit.type != "QCK" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1); }
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); }
     },
     914: {
-        atk: function(p) { return p.unit.type != "QCK" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.2); }
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.2); }
     },
     915: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -2449,10 +2449,10 @@ window.captains = {
         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1015: {
-        atk: function(p) { return p.unit.type == "INT" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 1) : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1) : 1; },
     },
     1016: {
-        atk: function(p) { return p.unit.type == "INT" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5) : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5) : 1; },
     },
     1017: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
@@ -2551,7 +2551,7 @@ window.captains = {
         rcv: function(p) { return 0; }
     },
     1043: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 2) : 1;},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2) : 1;},
         rcv: function(p) { return 0; }
     },
     1044: {
@@ -2689,11 +2689,11 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1084: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1085: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1086:{
@@ -3046,7 +3046,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1197: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 1) : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1) : 1; }
     },
     1198: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
@@ -3255,7 +3255,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1247: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 2); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1248: {
@@ -3448,7 +3448,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
     },
     1292: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 2); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); },
     },
     1293: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
@@ -3736,7 +3736,7 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1366: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.75 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1367: {
@@ -4096,10 +4096,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
     },
     1451: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.25 : 1.5); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.25 : 1.5); }
     },
     1452: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 2); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); }
     },
     1455: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
@@ -4247,10 +4247,10 @@ window.captains = {
         rcv: function(p) { return 1.2; },
     },
     1486: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 1); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1); },
     },
     1487: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); },
     },
     1488: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
@@ -4432,10 +4432,10 @@ window.captains = {
         hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1535: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 2.5 : 1); }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1); }
     },
     1536: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1); }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); }
     },
     1537: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
@@ -4879,7 +4879,7 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1650: {
-        atk: function(p) { return p.unit.type == "DEX" ? ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) ? 3 : 1.5) : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5) : 1; },
     },
     1651: {
         atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
@@ -4890,27 +4890,27 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1653: {
-        atk: function(p) { return p.unit.type == "INT" ? 1 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     1654: {
         atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
     },
     1655: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1656: {
         atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; },
         rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1657: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1658: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1659: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1660: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
diff --git a/common/data/details.js b/common/data/details.js
index 5a79ab3d8..0bd33ad9e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9233,7 +9233,7 @@ window.details = {
         specialName: "Daybreak Ruler's Spear",
     },
     1653: {//Pedro
-        captain: "Reduces cooldown of all specials by ??? turns at the start of the fight, boosts ATK of [INT] characters by ???x",
+        captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduces crew's HP to 1, deals 7x the amount of HP subtracted in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Makes INT orbs \"beneficial\" for Slasher and Cerebral characters",
         specialName: "Charge Drive",
@@ -9245,7 +9245,7 @@ window.details = {
         specialName: "Charge Drive",
     },
     1655: {//Carrot
-        captain: "Boosts ATK of [QCK] characters by ???x and their RCV by ???x",
+        captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
         special: "Boosts ATK of QCK characters by 2x for 1 turn",
         sailor: "Boosts ATK and RCV of [QCK] characters by 75",
         specialName: "Electric Fist",
@@ -9257,19 +9257,19 @@ window.details = {
         specialName: "Electric Fist",
     },
     1657: {//Kanjuro
-        captain: "Boosts ATK of Striker and Free Spirit characters by ???x",
-        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
+        captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
+        special: "Reduces the duration of Bind and Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },
     1658: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.5x",
-        special: "Reduces the duration of Bind, Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
+        special: "Reduces the duration of Bind and Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },
     1659: {//Raizo
-        captain: "Boosts ATK of Shooter characters by ???x and makes [TND] and [RCV] orbs \"beneficial\" to ??? characters",
+        captain: "Boosts ATK of Shooter characters by 2x",
         special: "Reduces Paralysis and Silence duration by 3 turns, switches orbs between slots 3 times",
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
@@ -9277,7 +9277,7 @@ window.details = {
         specialName: "Ninja Arts - Bunshin no Jutsu",
     },
     1660: {//Raizo
-        captain: "Boosts ATK of Shooter characters by 2.5x and makes [TND] and [RCV] orbs \"beneficial\" to ??? characters",
+        captain: "Boosts ATK of Shooter characters by 2.5x and makes [TND] and [RCV] orbs \"beneficial\" to Shooter characters",
         special: "Reduces Paralysis and Silence duration by 3 turns, switches orbs between slots 3 times",
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",

From 8924166c33bc67ce1d31c10ce1aca6c022ca1d87 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Jun 2017 03:00:16 -0400
Subject: [PATCH 1180/1569] Lucci I guess

---
 common/data/aliases.js    |  2 +-
 common/data/captains.js   | 10 ++++++++++
 common/data/cooldowns.js  |  6 +++---
 common/data/details.js    | 33 +++++++++++++++++++++++++++++++++
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  6 +++---
 common/data/flags.js      |  3 +++
 common/data/gw.js         |  2 +-
 common/data/units.js      |  6 +++---
 common/data/zombies.js    |  8 ++++++++
 10 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index dc96cba16..1168d4238 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1661,7 +1661,7 @@ window.aliases = {
     1660: ['', '', ''],
     1661: ['', '', ''],
     1662: ['', '', ''],
-    1663: ['', '', ''],
+    1663: ['', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci'],
     1664: ['', '', 'Secret Aokiji'],
     1665: ['', '', 'Secret Aokiji'],
     1666: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 18c7a7cb8..46c80f9aa 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4915,6 +4915,16 @@ window.captains = {
     1660: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
+    1661: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
+    },
+    1662: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1 : 1; },
+    },
+    1663: {
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.5 : 2.5); },
+        rcv: function(p) { return 0; }
+    },
     1664: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 465d668ba..c9a8f6bf1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1659,9 +1659,9 @@ window.cooldowns = [
     17,
     15,
     15,
-    null,
-    null,
-    null,
+    [ 10, 10 ],
+    [ 10, 10 ],
+    [ 22, 12 ],
     16,
     16,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 0bd33ad9e..c5f1d559e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9284,6 +9284,39 @@ window.details = {
         specialNotes: "#{silence}",
         specialName: "Ninja Arts - Bunshin no Jutsu",
     },
+    1661: {//Corazon
+        captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by 2x and recovers 300 HP at end of each turn",
+        special: [
+            {
+                "description": "Locks the chain multiplier at ???x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by ? turns.",
+                "cooldown": [ null, null ]
+            },
+            {
+                "description": "Locks the chain multiplier at 2.5x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
+                "cooldown": [ 10, 10 ]
+            }
+        ],
+        specialName: "The Sun under the Rain",
+    },
+    1662: {//Corazon
+        captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by ???x and recovers ??? HP at end of each turn",
+        special: [
+            {
+                "description": "Locks the chain multiplier at ???x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by ? turns.",
+                "cooldown": [ null, null ]
+            },
+            {
+                "description": "Locks the chain multiplier at 2.5x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
+                "cooldown": [ 10, 10 ]
+            }
+        ],
+        specialName: "The Sun under the Rain",
+    },
+    1663: {//6+ Rob Lucci
+        special: "Deals 75x character's ATK in typeless damage to one enemy, greatly boosts chances of getting matching orbs for 3 turns",
+        specialName: "Rokushiki Mystery Rokuougan",
+        captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+    },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7dff8ead5..842d4bba1 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2559,6 +2559,10 @@ window.evolutions = {
         evolution: 1660,
         evolvers: [  ]
     },
+    1661: {
+        evolution: 1662,
+        evolvers: [  ]
+    },
     1664: {
         evolution: 1665,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 48a7c3af2..069f15115 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1659,9 +1659,9 @@ window.families = [
     "Kanjuro",
     "Raizo",
     "Raizo",
-    null,
-    null,
-    null,
+    "Corazon",
+    "Corazon",
+    "Rob Lucci",
     "Aokiji",
     "Aokiji",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index f55d11125..801ad6ac3 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1443,6 +1443,9 @@ window.flags = {
     1658: { rr: 1, rro: 1 },
     1659: { rr: 1, rro: 1 },
     1660: { rr: 1, rro: 1 },
+    1661: { shop: 1 },
+    1662: { shop: 1 },
+    1663: { rr: 1, rro: 1 },
     1664: { rr: 1, rro: 1, lrr: 1 },
     1665: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 5f3e0e667..5615a5ec8 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1661,7 +1661,7 @@ window.gw=[
     60678,
     null,
     null,
-    null,
+    16960,
     61003,
     61003,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 93d98529a..dee16ea59 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1659,9 +1659,9 @@ window.units = [
     [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
     [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, null, null, null, null ],
+    [ "Corazon, Evolved", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "6+ Lucci", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3500, 1500, 400, null ],
     [ "Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
     ];
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 181d8b1dc..e9d64dccc 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -411,4 +411,12 @@ window.zombies = {
         type: 'healer',
         multiplier: 1.5
     },
+    1661: { // Corazon
+        type: 'healer',
+        amount: 300
+    },
+    1662: { // Corazon
+        type: 'healer',
+        amount: 300
+    },
 };

From fdd71ec174845867ca073f134cb21b9c1f01b27f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Jun 2017 03:03:32 -0400
Subject: [PATCH 1181/1569] Probe me

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index dee16ea59..c65372a89 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1661,7 +1661,7 @@ window.units = [
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
     [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, null, null, null, null ],
     [ "Corazon, Evolved", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "6+ Lucci", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3500, 1500, 400, null ],
+    [ "6+ Lucci", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
     [ "Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
     ];

From b45c0f7ae76e88d3a31620c1691d32515ad34bbe Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 28 Jun 2017 13:59:54 -0400
Subject: [PATCH 1182/1569] Sue me

---
 common/data/aliases.js    |  2 +
 common/data/captains.js   |  6 +++
 common/data/cooldowns.js  | 86 +++++++++++++++++++++++++++++++++++++++
 common/data/details.js    | 30 +++++++++++++-
 common/data/evolutions.js |  4 ++
 common/data/families.js   | 86 +++++++++++++++++++++++++++++++++++++++
 common/data/flags.js      |  2 +
 common/data/gw.js         |  4 +-
 common/data/specials.js   | 22 ++++++++++
 common/data/units.js      | 86 +++++++++++++++++++++++++++++++++++++++
 10 files changed, 325 insertions(+), 3 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 1168d4238..f9518a337 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1667,6 +1667,8 @@ window.aliases = {
     1666: ['', '', ''],
     1667: ['', '', ''],
     1668: ['', '', ''],
+    1750: ['', '', 'Korea Law'],
+    1751: ['', '', 'Korea Law'],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 46c80f9aa..8645ffee6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4937,4 +4937,10 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1750: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
+    },
+    1751: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c9a8f6bf1..435edbf4d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1664,4 +1664,90 @@ window.cooldowns = [
     [ 22, 12 ],
     16,
     16,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 20, 15 ],
+    [ 20, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index c5f1d559e..e0b7467f7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9299,7 +9299,7 @@ window.details = {
         specialName: "The Sun under the Rain",
     },
     1662: {//Corazon
-        captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by ???x and recovers ??? HP at end of each turn",
+        captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by 2.5x and recovers 500 HP at end of each turn",
         special: [
             {
                 "description": "Locks the chain multiplier at ???x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by ? turns.",
@@ -9327,4 +9327,32 @@ window.details = {
         special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
     },
+    1750: {//Korea Law
+        captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
+        special: [
+            {
+                "description": "Deals 50,000 fixed damage to one enemy, and for Striker characters, amplifies the effect of orbs by 1.75x for 1 turn",
+                "cooldown": [ 15, 10 ]
+            },
+            {
+                "description": "Deals 300,000 fixed damage to one enemy, and for Striker characters, amplifies the effect of orbs by 2.25x for 1 turn",
+                "cooldown": [ 20, 15 ]
+            }
+        ],
+        specialName: "Injection Shot",
+    },
+    1751: {//Korea Law
+        captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
+        special: [
+            {
+                "description": "Deals 50,000 fixed damage to one enemy, and for Striker characters, amplifies the effect of orbs by 1.75x for 1 turn",
+                "cooldown": [ 15, 10 ]
+            },
+            {
+                "description": "Deals 300,000 fixed damage to one enemy, and for Striker characters, amplifies the effect of orbs by 2.25x for 1 turn",
+                "cooldown": [ 20, 15 ]
+            }
+        ],
+        specialName: "Injection Shot",
+    },
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 842d4bba1..9a8b35fa9 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2567,4 +2567,8 @@ window.evolutions = {
         evolution: 1665,
         evolvers: [  ]
     },
+    1750: {
+        evolution: 1751,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 069f15115..2ea5d08e3 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1664,4 +1664,90 @@ window.families = [
     "Rob Lucci",
     "Aokiji",
     "Aokiji",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Trafalgar Law",
+    "Trafalgar Law",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 801ad6ac3..448cb744d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1448,4 +1448,6 @@ window.flags = {
     1663: { rr: 1, rro: 1 },
     1664: { rr: 1, rro: 1, lrr: 1 },
     1665: { rr: 1, rro: 1, lrr: 1 },
+    1750: { rr: 1, rro: 1 },
+    1751: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 5615a5ec8..1263c6c80 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1659,8 +1659,8 @@ window.gw=[
     60675,
     60678,
     60678,
-    null,
-    null,
+    61073,
+    61073,
     16960,
     61003,
     61003,
diff --git a/common/data/specials.js b/common/data/specials.js
index 030d6e1f0..92b6ade88 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3116,4 +3116,26 @@ window.specials = {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
         type: "class",
     },
+    1750:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1750].multiplier == 1.75 ? 1 : 0);
+            window.specials[1750].multiplier = [1.75, 2.25][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1584warning'
+            });
+        },
+    },
+    1751:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1751].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1751].multiplier == 1.75 ? 1 : 0);
+            window.specials[1751].multiplier = [1.75, 2.25][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1584warning'
+            });
+        },
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index c65372a89..fc7ea5bf2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1664,6 +1664,92 @@ window.units = [
     [ "6+ Lucci", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
     [ "Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
+    [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 1e6db4f03fc33b3b949a3eee909a82a3217d9fd4 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 29 Jun 2017 01:16:14 -0400
Subject: [PATCH 1183/1569] Neko's stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index fc7ea5bf2..4a7e6e0c0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1649,8 +1649,8 @@ window.units = [
     [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
-    [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3404, 1451, 352, null ],
+    [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, null ],
+    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, null ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2009, 1438, 325, null ],
     [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],

From f365f3b85eef0384b1ca4de07d98e69f164007de Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 29 Jun 2017 11:52:02 -0400
Subject: [PATCH 1184/1569] Fixed Random?

---
 characters/js/controllers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index bb9ddcbb2..6caa6d3bb 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -36,8 +36,8 @@ app.controller('MainCtrl',function($scope, $rootScope, $state, $stateParams, $ti
     $controller('DismissalCtrl');
     
     $scope.getRandChar = function(){
-        var range = $rootScope.table.data[$rootScope.table.data.length - 1][11] + 1;
-        return Math.floor(Math.random() * range);
+        var range = parseInt($rootScope.table.data.length) + 1;
+        return $rootScope.table.data[Math.floor(Math.random() * range)][0];
     };
 
 });

From 8427058eb5de71fa142b11b3647f12352e8034ac Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 30 Jun 2017 16:39:41 -0400
Subject: [PATCH 1185/1569] Kyros and new stats

---
 common/data/captains.js   |  4 ++++
 common/data/cooldowns.js  | 24 ++++++++++++------------
 common/data/details.js    | 20 +++++++++++++++-----
 common/data/drops.js      |  2 +-
 common/data/evolutions.js | 16 ++++++++++------
 common/data/families.js   |  4 ++--
 common/data/gw.js         |  4 ++--
 common/data/units.js      | 26 +++++++++++++-------------
 8 files changed, 59 insertions(+), 41 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 8645ffee6..54a025a8f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4937,6 +4937,10 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1667: {
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.25; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 435edbf4d..0c090faff 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1649,23 +1649,23 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 20, 14 ],
     [ 15, 11 ],
-    16,
-    16,
-    18,
-    18,
-    18,
-    18,
-    17,
-    17,
-    15,
-    15,
+    [ 16, 11 ],
+    [ 16, 11 ],
+    [ 18, 13 ],
+    [ 18, 13 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 17, 12 ],
+    [ 17, 12 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
     [ 10, 10 ],
     [ 10, 10 ],
     [ 22, 12 ],
     16,
     16,
-    null,
-    null,
+    21,
+    21,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index e0b7467f7..5c8192690 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9288,8 +9288,8 @@ window.details = {
         captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by 2x and recovers 300 HP at end of each turn",
         special: [
             {
-                "description": "Locks the chain multiplier at ???x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by ? turns.",
-                "cooldown": [ null, null ]
+                "description": "Reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
+                "cooldown": [ 6, 6 ]
             },
             {
                 "description": "Locks the chain multiplier at 2.5x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
@@ -9302,8 +9302,8 @@ window.details = {
         captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by 2.5x and recovers 500 HP at end of each turn",
         special: [
             {
-                "description": "Locks the chain multiplier at ???x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by ? turns.",
-                "cooldown": [ null, null ]
+                "description": "Reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
+                "cooldown": [ 6, 6 ]
             },
             {
                 "description": "Locks the chain multiplier at 2.5x for 1 turn and reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
@@ -9314,7 +9314,7 @@ window.details = {
     },
     1663: {//6+ Rob Lucci
         special: "Deals 75x character's ATK in typeless damage to one enemy, greatly boosts chances of getting matching orbs for 3 turns",
-        specialName: "Rokushiki Mystery Rokuougan",
+        specialName: "Six Powers Supreme: Six King Gun",
         captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
     },
     1664: {//STR Aokiji
@@ -9327,6 +9327,16 @@ window.details = {
         special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
     },
+    1666: {//Kyros
+        captain: "Not Translated",
+        special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
+        specialName: "Kyros Special",
+    },
+    1667: {//Kyros
+        captain: "Boosts HP of Striker characters by 1.2x and boosts Striker characters ATK by 2.75x if HP is below 30% at the start of the turn, 2.25x otherwise",
+        special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
+        specialName: "Kyros Special",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index a0bd4a1ae..caeb90405 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1939,7 +1939,7 @@ window.drops = {
             teamDatabase: 'coliseums',
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 9a8b35fa9..39a1abe6b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2541,32 +2541,36 @@ window.evolutions = {
     },
     1651: {
         evolution: 1652,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 98, 267, 303 ]
     },
     1653: {
         evolution: 1654,
-        evolvers: [  ]
+        evolvers: [ 88, 99, 1180, 104, 304 ]
     },
     1655: {
         evolution: 1656,
-        evolvers: [  ]
+        evolvers: [ 83, 85, 94, 101, 301 ]
     },
     1657: {
         evolution: 1658,
-        evolvers: [  ]
+        evolvers: [ 118, 80, 86, 226, 102 ]
     },
     1659: {
         evolution: 1660,
-        evolvers: [  ]
+        evolvers: [ 83, 84, 95, 1180, 100 ]
     },
     1661: {
         evolution: 1662,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 1180, 101, 301 ]
     },
     1664: {
         evolution: 1665,
         evolvers: [  ]
     },
+    1666: {
+        evolution: 1667,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 2ea5d08e3..1045bf7c5 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1664,8 +1664,8 @@ window.families = [
     "Rob Lucci",
     "Aokiji",
     "Aokiji",
-    null,
-    null,
+    "Kyros",
+    "Kyros",
     null,
     null,
     null,
diff --git a/common/data/gw.js b/common/data/gw.js
index 1263c6c80..578034992 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1649,8 +1649,8 @@ window.gw=[
     60688,
     60688,
     60689,
-    null,//Nekomamushi
-    null,//Nekomamushi
+    60679,
+    60679,
     60676,
     60676,
     60677,
diff --git a/common/data/units.js b/common/data/units.js
index 4a7e6e0c0..d05eb597a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1651,21 +1651,21 @@ window.units = [
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, null ],
     [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, null ],
-    [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2009, 1438, 325, null ],
-    [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2041, 1250, 390, null ],
-    [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 110, 148, 58, 957, 620, 213, null ],
+    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 878, 544, 162, 2009, 1438, 325, null ],
+    [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 113, 99, 60, null, null, null, null ],
+    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 941, 461, 171, 2041, 1250, 390, null ],
+    [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 50, 392109, 133, 116, 44, null, null, null, null ],
     [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
-    [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1, 1, 1, 2353, 1363, 290, null ],
-    [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, null, null, null, null ],
-    [ "Corazon, Evolved", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, 4, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "6+ Lucci", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
-    [ "Aokiji", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 129, 133, 34, null, null, null, null ],
+    [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, null ],
+    [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, null ],
+    [ "Corazon, Evolved", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, null ],
+    [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
+    [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, null, 5, 99, 4000000, null, null, null, 2710, 1390, 225, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From cbaa633e3de883adc4ead7cd3ce2cb8ccadf2bd6 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 30 Jun 2017 16:41:40 -0400
Subject: [PATCH 1186/1569] Forgot to save

---
 common/data/specials.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 92b6ade88..1001173d3 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2301,9 +2301,9 @@ window.specials = {
     1421: {
         atk: function(p) {
             if(p.percHP == 100.0){
-                return p.unit.class.has("Driven") ? 1.75 : 1;
+                return p.unit.class.has("Driven") ? 2 : 1;
             }else{
-                return p.unit.class.has("Driven") ? 1.75 : 1;
+                return p.unit.class.has("Driven") ? 1.5 : 1;
             }
         },
         type: "class"
@@ -3116,6 +3116,12 @@ window.specials = {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
         type: "class",
     },
+    1594: {
+        orb: function(p) { return ((p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) && (p.percHP > 70)) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1595: {
+        orb: function(p) { return ((p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) && (p.percHP > 70)) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {

From 633a348431fa7c5c65790dd1440b58223ed7be35 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 30 Jun 2017 18:58:42 -0400
Subject: [PATCH 1187/1569] Kyros Captain

monkaS what does it say
---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 5c8192690..4762e3009 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9328,7 +9328,7 @@ window.details = {
         specialName: "Ice Saber",
     },
     1666: {//Kyros
-        captain: "Not Translated",
+        captain: "Boosts Striker characters ATK by 2x",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
         specialName: "Kyros Special",
     },

From 1b969ea7f77d16d8c0b47a8d0a6372faa6c6bd6f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 30 Jun 2017 20:07:22 -0400
Subject: [PATCH 1188/1569] Bunch of cooldowns

---
 common/data/cooldowns.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0c090faff..dc162fc8c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1277,7 +1277,7 @@ window.cooldowns = [
     [ 25, 19 ],
     [ 10, 4 ],
     [ 10, 4 ],
-    14,
+    [ 14, 7 ],
     [ 21, 15 ],
     [ 25, 18 ],
     [ 19, 13 ],
@@ -1347,7 +1347,7 @@ window.cooldowns = [
     [ 15, 10 ],
     [ 25, 17 ],
     [ 17, 10 ],
-    13,
+    [ 13, 6 ],
     [ 14, 8 ],
     [ 20, 13 ],
     [ 15, 9 ],
@@ -1390,8 +1390,8 @@ window.cooldowns = [
     [ 21, 16 ],
     [ 17, 12 ],
     [ 17, 12 ],
-    22,
-    19,
+    [ 22, 15 ],
+    [ 19, 12 ],
     [ 10, 10 ],
     [ 10, 10 ],
     [ 21, 14 ],
@@ -1503,8 +1503,8 @@ window.cooldowns = [
     16,
     14,
     [ 19, 13 ],
-    22,
-    22,
+    [ 22, 15 ],
+    [ 22, 15 ],
     [ 20, 16 ],
     [ 20, 16 ],
     [ 18, 10 ],
@@ -1631,11 +1631,11 @@ window.cooldowns = [
     [ 15, 5 ],
     [ 21, 17 ],
     [ 21, 17 ],
-    14,
+    [ 14, 7 ],
     19,
     19,
-    17,
-    17,
+    [ 17, 10 ],
+    [ 17, 10 ],
     [ 15, 9 ],
     15,
     16,

From 5000a2d058f385dc777deb7a8641afef8cea8fab Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 30 Jun 2017 21:08:29 -0400
Subject: [PATCH 1189/1569] Rayleigh

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 4762e3009..5e132ec62 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9013,7 +9013,7 @@ window.details = {
     1619: {//6+ Raybae/Rayleigh
         captain: "Boosts chain multiplier by 4x and boosts HP and RCV of all characters by 1.2x",
         captainNotes: "Stats for Rayleigh are temporary and are estimates for use in the calculator",
-        special: "Reduces the duration of Bind, Despair, and Paralysis by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
+        special: "Reduces Bind, Despair, and Paralysis duration by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
         specialName: "Netherworld Conqueror",
     },
     1620: {//Log Kid

From 454bf44d4a5ea2c42e0600385cbaf07d2044530c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 1 Jul 2017 02:30:44 -0400
Subject: [PATCH 1190/1569] Typos

---
 common/data/captains.js   |  4 ++--
 common/data/details.js    | 12 +++++++-----
 common/data/evolutions.js |  2 +-
 common/js/directives.js   |  3 ++-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 54a025a8f..721f3e613 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4916,10 +4916,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1661: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
     },
     1662: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1 : 1; },
     },
     1663: {
         atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.5 : 2.5); },
diff --git a/common/data/details.js b/common/data/details.js
index 5e132ec62..ddba0bc37 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6633,7 +6633,7 @@ window.details = {
     1275: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
-        specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
+        specialNotes: "#{instantKill : 25%}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
         specialName: "Handling Hell",
@@ -6641,7 +6641,7 @@ window.details = {
     1276: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 2x",
         special: "For each enemy, has a small chance to instantly defeat that enemy.",
-        specialNotes: "About 25% chance of killing ANY character. Cannot be reset by exiting, but can try for different kills by continuing attack.",
+        specialNotes: "#{instantKill : 25%}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
         specialName: "Handling Hell",
@@ -8941,7 +8941,7 @@ window.details = {
     1608: {//Doc Q
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "For each enemy, has an extremely small chance to instantly defeat that enemy.",
-        specialNotes: "Same as Rare Recruit Shriyu special but a lower chance",
+        specialNotes: "#{instantKill : <1%}",
         specialName: "Vile Fruit",
     },
     1609: {//Legend Enel
@@ -8961,12 +8961,14 @@ window.details = {
     1611: {//Kuma
         captain: "Boosts ATK of Shooter characters by 1.75x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
+        specialNotes: "#{instantKill : 10%}",
         specialName: "Paw Paw Fruit: Scatter and Fly Away",
         sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
     1612: {//Kuma
         captain: "Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
+        specialNotes: "#{instantKill : 10%}",
         specialName: "Paw Paw Fruit: Scatter and Fly Away",
         sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
@@ -9285,7 +9287,7 @@ window.details = {
         specialName: "Ninja Arts - Bunshin no Jutsu",
     },
     1661: {//Corazon
-        captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by 2x and recovers 300 HP at end of each turn",
+        captain: "Boosts ATK of [PSY], [QCK], and [DEX] characters by 2x and recovers 300 HP at end of each turn",
         special: [
             {
                 "description": "Reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
@@ -9299,7 +9301,7 @@ window.details = {
         specialName: "The Sun under the Rain",
     },
     1662: {//Corazon
-        captain: "Boosts ATK of [STR], [QCK], and [DEX] characters by 2.5x and recovers 500 HP at end of each turn",
+        captain: "Boosts ATK of [PSY], [QCK], and [DEX] characters by 2.5x and recovers 500 HP at end of each turn",
         special: [
             {
                 "description": "Reduces Special Cooldown of Cerebral and Free Spirit characters by 1 turn.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 39a1abe6b..87cd57a71 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2553,7 +2553,7 @@ window.evolutions = {
     },
     1657: {
         evolution: 1658,
-        evolvers: [ 118, 80, 86, 226, 102 ]
+        evolvers: [ 118, 80, 86, 266, 102 ]
     },
     1659: {
         evolution: 1660,
diff --git a/common/js/directives.js b/common/js/directives.js
index 8ec967431..096462011 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -23,7 +23,8 @@ var notes = {
     ignoreBarrier: "Damage that ignores damage negating abilities and barriers is similar to 6* Law's special, but only for this character.",
     zombie: "The protection only works when attacked by one single enemy and will leave the team with at least 1 HP; " +
         "the effect will not work when attacked by multiples enemies at once.",
-    colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5/#1)x to QCK."
+    colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5/#1)x to QCK.",
+    instantKill: "The chance for this character to instantly kill any enemy is #1. The kills can not be reset by exiting the game, but can change by passing the turn or killing an enemy.",
 };
 
 /***********

From 59d8308f2461d167ba40ada2652a4d217f58011d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 1 Jul 2017 18:54:11 -0400
Subject: [PATCH 1191/1569] Fuji fixed

Maynard and Neko details fixed too
---
 common/data/details.js  | 8 ++++----
 common/data/specials.js | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index ddba0bc37..9340beb1f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6319,14 +6319,14 @@ window.details = {
     1235: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 1.75x, deals 3x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
-        specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
+        specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
         sailor: "Reduces duration of Blindness for 3 turns",
     },
     1236: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
-        specialNotes: "#{specialProportional : higher : ??? * (remaining HP) / (total HP) }",
+        specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
         sailor: "Reduces duration of Blindness for 3 turns",
     },
@@ -9226,12 +9226,12 @@ window.details = {
     },
     1651: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
-        special: "Deals 60x character's ATK in [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
+        special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
         specialName: "Daybreak Ruler's Spear",
     },
     1652: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
-        special: "Deals 60x character's ATK in [PSY] damage to one enemy and and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
+        special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
         specialName: "Daybreak Ruler's Spear",
     },
     1653: {//Pedro
diff --git a/common/data/specials.js b/common/data/specials.js
index 1001173d3..ecb3f652c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3116,10 +3116,10 @@ window.specials = {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
         type: "class",
     },
-    1594: {
+    1666: {
         orb: function(p) { return ((p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) && (p.percHP > 70)) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1595: {
+    1667: {
         orb: function(p) { return ((p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) && (p.percHP > 70)) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1750:{

From 7604f144f80a4ea44ff47379a7689750791fc7b7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 4 Jul 2017 13:06:30 -0400
Subject: [PATCH 1192/1569] Sanji and Luffy

Always causing problems
---
 common/data/details.js  | 2 +-
 common/data/specials.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 9340beb1f..7752ad118 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8898,7 +8898,7 @@ window.details = {
     },
     1600: {//3rd Anniversary Luffy
         captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
-        special: "Deals 20x character's ATK in [PSY] damage to one enemy, locks orbs for 1 turn, and boosts the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
+        special: "Deals 20x character's ATK in [PSY] damage to one enemy, locks orbs for 1 turn, and amplifies the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
         specialName: "Right Leg Armament: Gum-Gum Battle Axe",
     },
     1601: {//Power Creep Shiryu
diff --git a/common/data/specials.js b/common/data/specials.js
index ecb3f652c..8bf064a77 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2400,7 +2400,7 @@ window.specials = {
         atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1447].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1447].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1447].multiplier == 1.2 ? 1 : 0);
             window.specials[1447].multiplier = [1.2, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.2, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.2][n] + 'x multiplier, disable and re-enable this special',

From 2f87805a5abf5a3700d99fa5c1a61607baf162fa Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 5 Jul 2017 08:17:18 -0400
Subject: [PATCH 1193/1569] Kyros and Foxfire

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index d05eb597a..5b430aec7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1575,7 +1575,7 @@ window.units = [
     [ "Sicilian", "INT", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 142, 155, 19, 1202, 658, 127, 1 ],
     [ "Full Power Sicilian", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1130, 589, 86, 2559, 1457, 212, 1 ],
     [ "Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 135, 130, 22, 1133, 601, 166, 1 ],
-    [ "Firefox Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1066, 530, 119, 2349, 1377, 294, 1 ],
+    [ "Foxfire Kinemon, Wano Country Samurai", "DEX", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1066, 530, 119, 2349, 1377, 294, 1 ],
     [ "Momonosuke", "PSY", [ "Striker", "Free Spirit" ], 4, 13, 6, 3, 50, 392109, 102, 76, 60, 830, 309, 269, 1 ],
     [ "Momonosuke, Child of Wano Country", "PSY", [ "Striker", "Free Spirit" ], 5, 28, 4, 4, 99, 4000000, 761, 238, 200, 1922, 690, 535, 1 ],
     [ "Trafalgar Law, Punk Hazard Resident", "DEX", [ "Free Spirit", "Slasher" ], 3, 13, 4, 2, 50, 392109, 149, 56, 25, 894, 453, 150, 1 ],
@@ -1664,8 +1664,8 @@ window.units = [
     [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
     [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
-    [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, null, 5, 99, 4000000, null, null, null, 2710, 1390, 225, null ],
+    [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, null ],
+    [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 6529e15bee786b6f8f89ab6d545e7063c73b9c94 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 5 Jul 2017 12:14:58 -0400
Subject: [PATCH 1194/1569] Kyros cooldown, some fixes and Sailors for Heal per
 turn

---
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    |  1 -
 common/data/evolutions.js |  4 ++--
 common/data/gw.js         |  2 ++
 common/data/sailors.js    |  4 ++--
 damage/js/cruncher.js     | 12 ++++++++++--
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index dc162fc8c..7caaab639 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1664,8 +1664,8 @@ window.cooldowns = [
     [ 22, 12 ],
     16,
     16,
-    21,
-    21,
+    [ 21, 6 ],
+    [ 21, 6 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 7752ad118..3afccc662 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9014,7 +9014,6 @@ window.details = {
     },
     1619: {//6+ Raybae/Rayleigh
         captain: "Boosts chain multiplier by 4x and boosts HP and RCV of all characters by 1.2x",
-        captainNotes: "Stats for Rayleigh are temporary and are estimates for use in the calculator",
         special: "Reduces Bind, Despair, and Paralysis duration by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
         specialName: "Netherworld Conqueror",
     },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 87cd57a71..05703d20e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2565,11 +2565,11 @@ window.evolutions = {
     },
     1664: {
         evolution: 1665,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 94, 100, 300 ]
     },
     1666: {
         evolution: 1667,
-        evolvers: [  ]
+        evolvers: [ 118, 96, 96, 101, 301 ]
     },
     1750: {
         evolution: 1751,
diff --git a/common/data/gw.js b/common/data/gw.js
index 578034992..6141b5a6c 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1664,4 +1664,6 @@ window.gw=[
     16960,
     61003,
     61003,
+    61261,
+    61261,
 ];
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
index ba3a27a30..0fa02dafd 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -282,11 +282,11 @@ window.sailors = {
     1614: {//not working
         staticMult: function(p) { return 2; }
     },
-    1654: {
+    1655: {
         atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
         rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
     },
-    1655: {
+    1656: {
         atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
         rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
     },
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 1122211e1..e3e3447ac 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -934,12 +934,20 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // compute data
         var healAmount = 0, zombieThreshold = 0, tankReducer = null;
         for (var i=0;i<2;++i) {
+            rcvtemp = 0;
             if (!team[i].unit) continue;
             var id = team[i].unit.number + 1, zombie = window.zombies[id];
             if (!zombie) continue;
             if (zombie.type == 'healer') {
-                if (zombie.hasOwnProperty('amount')) healAmount += zombie.amount;
-                else healAmount += Math.floor(data.team[i].rcv * zombie.multiplier);
+                if (zombie.hasOwnProperty('amount')) 
+                    healAmount += zombie.amount;
+                else{
+                    enabledEffects.forEach(function(x) {
+                    if (x.hasOwnProperty('rcvStatic'))
+                        rcvtemp += x.rcvStatic(getParameters(i));
+                    });
+                    healAmount += Math.floor((data.team[i].rcv + rcvtemp) * zombie.multiplier);
+                }
             } else if (zombie.type == 'reducer')
                 tankReducer = [ zombie.multiplier, zombie.threshold ];
             else if (zombie.type == 'zombie')

From 95bef281a6da83e09ef00870892fe48bb4a4702f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 5 Jul 2017 23:42:43 -0400
Subject: [PATCH 1195/1569] Kinemon

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3afccc662..3c115d5f4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8730,14 +8730,14 @@ window.details = {
     1576: {//Kin'emon
         captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
-        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. This will not override other [BLOCK] orbs.",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Flaming Flash",
     },
     1577: {//Kin'emon
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
-        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. Will not override [BLOCK] orbs, but WILL remove Orb Rejection if kinemon has an orb. (The effect that Ambush Quest Cavendish has)",
+        specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. This will not override other [BLOCK] orbs.",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
         specialName: "Flaming Flash",
     },

From 66f5caec03f1810c67c0077c826ac7f5969b548f Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 6 Jul 2017 02:03:55 -0400
Subject: [PATCH 1196/1569] Aokiji stuff

---
 common/data/captains.js   |  7 +++++++
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 10 ++++++++++
 common/data/drops.js      |  8 ++++++++
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 ++--
 common/data/gw.js         |  2 ++
 common/data/specials.js   |  8 ++++++++
 common/data/units.js      |  4 ++--
 9 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 721f3e613..316e9d5d6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4941,6 +4941,13 @@ window.captains = {
         atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.25; },
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
+    1668: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1669: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7caaab639..58ec48bd2 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1666,8 +1666,8 @@ window.cooldowns = [
     16,
     [ 21, 6 ],
     [ 21, 6 ],
-    null,
-    null,
+    [ 26, 18 ],
+    [ 26, 18 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 3c115d5f4..c0bdff2ad 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9338,6 +9338,16 @@ window.details = {
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
         specialName: "Kyros Special",
     },
+    1668: {
+        special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
+        specialName: "Ice Block - Pheasant Beak [Reformed]",
+        captain: "Boosts ATK of Striker characters by 2x"
+    },
+    1669: {
+        special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
+        specialName: "Ice Block - Pheasant Beak [Reformed]",
+        captain: "Boosts ATK and HP of Striker characters by 2x"
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index caeb90405..471837adf 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1684,6 +1684,14 @@ window.drops = {
             Master: [ 114, 118, 574 ]
         },
 
+        {
+            name: 'Clash Reformed!! Aokiji',
+            thumb: 1669,
+            gamewith: 61262,
+            Ultimate: [ 86, 112, 118, 302, 1668 ],
+            Master: [ 112, 118, 1668 ]
+        },
+
         {
             name: 'Clash!! Eneru',
             thumb: 603,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 05703d20e..8b66bcb71 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2571,6 +2571,10 @@ window.evolutions = {
         evolution: 1667,
         evolvers: [ 118, 96, 96, 101, 301 ]
     },
+    1668: {
+        evolution: 1669,
+        evolvers: [ 118, 86, 266, 302, 102 ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 1045bf7c5..b6375a099 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1666,8 +1666,8 @@ window.families = [
     "Aokiji",
     "Kyros",
     "Kyros",
-    null,
-    null,
+    "Aokiji",
+    "Aokiji",
     null,
     null,
     null,
diff --git a/common/data/gw.js b/common/data/gw.js
index 6141b5a6c..eca9fbf17 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1666,4 +1666,6 @@ window.gw=[
     61003,
     61261,
     61261,
+    61267,
+    61267,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 8bf064a77..fe1d51f36 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3122,6 +3122,14 @@ window.specials = {
     1667: {
         orb: function(p) { return ((p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) && (p.percHP > 70)) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
+    1668: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
+    },
+    1669: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 5b430aec7..93a8382e5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1666,8 +1666,8 @@ window.units = [
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
     [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, null ],
     [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Aokiji [Reformed]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
+    [ "Aokiji [Reformed], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 0fd1cc20bee9df0750ec633b081436df196e44bc Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 6 Jul 2017 02:07:08 -0400
Subject: [PATCH 1197/1569] Aokiji condition

---
 common/data/drops.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 471837adf..13d74fc42 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1639,7 +1639,7 @@ window.drops = {
         {
             name: 'Clash Reformed!! Doflamingo',
             thumb: 1623,
-            condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Striker/Cerebral/Fighter Only. Ultimate: Cerebral Only, Fighter Only, and Striker Only",
+            condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Striker/Cerebral/Fighter Only. Ultimate: Striker Only, Cerebral Only, and Fighter Only",
             gamewith: 58437,
             Ultimate: [ 1622 ],
             Master: [ 1622 ]
@@ -1687,6 +1687,7 @@ window.drops = {
         {
             name: 'Clash Reformed!! Aokiji',
             thumb: 1669,
+            condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Free Spirit/Shooter/Striker Only. Ultimate: Free Spirit Only, Shooter Only, and Striker Only",
             gamewith: 61262,
             Ultimate: [ 86, 112, 118, 302, 1668 ],
             Master: [ 112, 118, 1668 ]

From 9a66dc4b761489eca7bf0871b1e4bc360eefb358 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 6 Jul 2017 02:15:09 -0400
Subject: [PATCH 1198/1569] Kanjuro typo

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c0bdff2ad..709d26974 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9259,13 +9259,13 @@ window.details = {
     },
     1657: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
-        special: "Reduces the duration of Bind and Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
+        special: "Reduces Bind and Despair duration by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },
     1658: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.5x",
-        special: "Reduces the duration of Bind and Despair by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
+        special: "Reduces Bind and Despair duration by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },

From 295086a6578245e5ac55121e6f4112b4b4e80112 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 6 Jul 2017 02:18:19 -0400
Subject: [PATCH 1199/1569] Duration typos

---
 common/data/details.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 709d26974..0d68cfeec 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -2376,13 +2376,13 @@ window.details = {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
         specialName: "Ochenta Fleur - Cuatro Manus Shock",
         captain: "Boosts ATK and RCV of INT characters by 1.5x",
-        sailor: "Reduces duration of Blindness by 3 turns"
+        sailor: "Reduces Blindness duration by 3 turns"
     },
     558: {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
         specialName: "Ochenta Fleur - Cuatro Manus Shock",
         captain: "Boosts ATK and RCV of INT characters by 2x",
-        sailor: "Reduces duration of Blindness by 3 turns"
+        sailor: "Reduces Blindness duration by 3 turns"
     },
     559: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
@@ -6096,13 +6096,13 @@ window.details = {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
         specialName: "Ochenta Fleur - Cuatro Manus Shock",
         captain: "Boosts ATK and RCV of INT characters by 1.5x",
-        sailor: "Reduces duration of Blindness by 3 turn"
+        sailor: "Reduces Blindness duration by 3 turn"
     },
     1208: {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
         specialName: "Ochenta Fleur - Cuatro Manus Shock",
         captain: "Boosts ATK and RCV of INT characters by 2x",
-        sailor: "Reduces duration of Blindness by 3 turn"
+        sailor: "Reduces Blindness duration by 3 turn"
     },
     1209: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
@@ -6321,14 +6321,14 @@ window.details = {
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
         specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
-        sailor: "Reduces duration of Blindness for 3 turns",
+        sailor: "Reduces Blindness duration for 3 turns",
     },
     1236: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
         specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
-        sailor: "Reduces duration of Blindness for 3 turns",
+        sailor: "Reduces Blindness duration for 3 turns",
     },
     1237: {//Bastille
         captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
@@ -6607,13 +6607,13 @@ window.details = {
     1271: {//Van Augur
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
-        sailor: "Reduces duration of Blindness by 5 turns",
+        sailor: "Reduces Blindness duration by 5 turns",
         specialName: "Other Side of Fate",
     },
     1272: {//Van Augur
         captain: "Reduces cooldown of Shooter specials by 1 turn at the start of the fight. Boosts ATK of Shooter characters by 2.5x.",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
-        sailor: "Reduces duration of Blindness by 5 turns",
+        sailor: "Reduces Blindness duration by 5 turns",
         specialName: "Other Side of Fate",
     },
     1273: {//Jesus Burgess
@@ -6769,12 +6769,12 @@ window.details = {
     },
     1295: {//Halloween Kalifa
         captain: "Boosts ATK and RCV of [STR] characters by 1.5x",
-        special: "Reduces duration of Paralysis by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Reduces Paralysis duration by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
         specialName: "Mysterious Hour of the Dark Night",
     },
     1296: {//Halloween Kalifa
         captain: "Boosts ATK of [STR] characters by 2x and their RCV by 1.5x",
-        special: "Reduces duration of Paralysis by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
+        special: "Reduces Paralysis duration by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
         specialName: "Mysterious Hour of the Dark Night",
     },
     1297: {//Akainu
@@ -6891,7 +6891,7 @@ window.details = {
             },
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
-        sailor: "Reduces duration of Blindness by 5 turns",
+        sailor: "Reduces Blindness duration by 5 turns",
         specialName: "Echoing Cry of the Soul",
     },
     1316: {//Coby
@@ -6911,7 +6911,7 @@ window.details = {
             },
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
-        sailor: "Reduces duration of Blindness by 5 turns",
+        sailor: "Reduces Blindness duration by 5 turns",
         specialName: "Echoing Cry of the Soul",
     },
     1317: {//Garp
@@ -6932,14 +6932,14 @@ window.details = {
         captain: "Heals for 1x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
         specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
-        sailor: "Reduces duration of Paralysis by 1 turn",
+        sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "A Decree of the Veteran",
     },
     1320: {//Lady Tsuru
         captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
         specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
-        sailor: "Reduces duration of Paralysis by 1 turn",
+        sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "A Decree of the Veteran",
     },
     1321: {//Momonga
@@ -7101,15 +7101,15 @@ window.details = {
         captain: "Boosts ATK of [DEX] characters by 2.25x",
         special: [
             {
-                "description": "Reduces duration of Paralysis by 1 turn. Adds .2x to Chain multiplier for 1 turn",
+                "description": "Reduces Paralysis duration by 1 turn. Adds .2x to Chain multiplier for 1 turn",
                 "cooldown": [ 18, 8 ],
             },
             {
-                "description": "Reduces duration of Paralysis by 2 turn. Adds .3x to Chain multiplier for 1 turn",
+                "description": "Reduces Paralysis duration by 2 turn. Adds .3x to Chain multiplier for 1 turn",
                 "cooldown": [ 23, 13 ],
             },
             {
-                "description": "Reduces duration of Paralysis by 2 turn. Adds .5x to Chain multiplier for 1 turn",
+                "description": "Reduces Paralysis duration by 2 turn. Adds .5x to Chain multiplier for 1 turn",
                 "cooldown": [ 25, 15 ],
             },
         ],
@@ -7619,13 +7619,13 @@ window.details = {
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
-        sailor: "Reduces duration of Blindness by 3 turns",
+        sailor: "Reduces Blindness duration by 3 turns",
     },
     1408: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 2.25x an their RCV by 1.5x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
-        sailor: "Reduces duration of Blindness by 3 turns",
+        sailor: "Reduces Blindness duration by 3 turns",
     },
     1409: {//Timeskip Brook
         captain: "Protects from defeat as long as HP is above 50%",

From c878e365e3b4f42c7a80edf5c613bdbb6a1f8ccf Mon Sep 17 00:00:00 2001
From: Christoph Gebendorfer <christoph.gebendorfer@msg-systems.com>
Date: Thu, 6 Jul 2017 15:41:55 +0200
Subject: [PATCH 1200/1569] fix #122

---
 probability/js/specialprobability.js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/probability/js/specialprobability.js b/probability/js/specialprobability.js
index b4361f08d..c2d6649d9 100644
--- a/probability/js/specialprobability.js
+++ b/probability/js/specialprobability.js
@@ -2,7 +2,7 @@ onmessage = function(e) {
 
 	var copies = parseInt(e.data.copies);
 	var skillups = parseInt(e.data.skillups);
-	
+
 	var probability = 0.125;
     if (e.data.jpn_server == true) {
 		probability = .2;
@@ -15,33 +15,33 @@ onmessage = function(e) {
 	else if (e.data.special_3event == true) {
 		probability *= 3;
 	}
-    
-	
+
+
 	var prob = 0;
 	var result = 0;
-	
+
 	var socketProgress = 0;
 	var data = null;
-	
-	for (var i = skillups; i < copies; i++) {
+
+	for (var i = skillups; i <= copies; i++) {
 		result = binomial(copies, i, probability);
 		prob += result;
-		
+
 		socketProgress = Math.round(i / copies * 100);
-         
-		data = 
+
+		data =
 		{
 			finished: false,
 			progress: socketProgress
-			
+
 		};
 		postMessage(data);
-		
+
 	}
-	
+
     if (isNaN(prob) || !isFinite(prob))
         prob = 0.999;
-	data = 
+	data =
 	{
 		finished: true,
 		result: prob,
@@ -74,4 +74,4 @@ function facculty(start, end) {
 	} else {
 		return end;
 	}
-}
\ No newline at end of file
+}

From 201de9a683b65473788a6e537d531c839b3aa439 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 6 Jul 2017 12:34:55 -0400
Subject: [PATCH 1201/1569] Aokiji Effecr

---
 common/data/effects.js | 14 ++++++--------
 common/data/units.js   |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index a19f84cc0..1f022300e 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -358,14 +358,12 @@ window.effects = {
         id: 36,
         atk: function(p) { return p.cost <= 30 ? 1.5 : 1; }
     },
-   /* 
-    'World Pirates - Boa Secret Stage': {
-        description: 'Locks the chain multiplier at 2.5x',
-        thumb: 1218,
+    
+    'Aokiji Reformed - Striker Raid Boss': {
+        description: 'Reduces Chain By 10%',
+        thumb: 1668,
         id: 37,
-        atk: function(p) { return p.cost <= 40 ? 1.5 : 1; },
-        chain: function(p) { return 2.5; },
-        chainLimiter: function(p) { return p.chainPosition > 0 ? 2.5 : 1.0; }
-    },*/
+        chainModifier: function(p) { return 0.1 ; }
+    },
     
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 93a8382e5..4836715f9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1667,7 +1667,7 @@ window.units = [
     [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, null ],
     [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, null ],
     [ "Aokiji [Reformed]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
-    [ "Aokiji [Reformed], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, null, null, null, null ],
+    [ "Aokiji [Reformed], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 371bdddbe9df9bf42dcb12974a73e1e34713b946 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 6 Jul 2017 21:21:05 -0400
Subject: [PATCH 1202/1569] Gamewith Links

---
 common/data/drops.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 13d74fc42..28095cd02 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -968,7 +968,7 @@ window.drops = {
             name: 'Rising Sun, Rising Fortunes',
             thumb: 420,
             global: true,
-            gamewith: null,
+            gamewith: 7161,
             condition: "None",
             "All Difficulties": [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8, -1388 ]
         },
@@ -977,7 +977,7 @@ window.drops = {
             name: 'Adrift!? Humming Brook',
             thumb: 424,
             global: true,
-            gamewith: 7161,
+            gamewith: 5383,
             condition: 'You can only get STR, DEX, INT and PSY Orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['500,000 Damage','1x Black Elder'],['1,500,000 Damage','1x ATK Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
@@ -999,7 +999,7 @@ window.drops = {
             name: 'Supersonic Duck Squadron!',
             thumb: 445,
             global: true,
-            gamewith: 7556,
+            gamewith: 7566,
             condition: 'Higher Chance of Food orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['450,000 Damage','1x Yellow Elder'],['1,250,000 Damage','1x RCV Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],

From a6e9eb77ebd52e4848ec4560855877555fa6422d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 7 Jul 2017 15:46:28 -0400
Subject: [PATCH 1203/1569] New Fortnight

---
 common/data/aliases.js   |   89 ++-
 common/data/captains.js  |   11 +
 common/data/cooldowns.js |    6 +-
 common/data/details.js   |   35 +-
 common/data/drops.js     | 1639 +++++++++++++++++++-------------------
 common/data/effects.js   |    2 +-
 common/data/families.js  |   12 +-
 common/data/specials.js  |    6 +
 common/data/units.js     |   22 +-
 9 files changed, 972 insertions(+), 850 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index f9518a337..0a331ee70 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -62,7 +62,7 @@ window.aliases = {
     61: ['チュウ','Smack'],
     62: ['クロオビ','Kuroobi'],
     63: ['はっちゃん','Octy', 'Hachi' ],
-    64: ['六刀流のハチ','Octy aux six lames'],
+    64: ['六刀流のハチ','Octy aux six lames', 'Hatchan'],
     65: ['アーロン','Arlong'],
     66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）','Arlong enragé Squalo Crunch'],
     67: ['たしぎ','Tashigi'],
@@ -634,7 +634,7 @@ window.aliases = {
     633: ['ロブ・ルッチ 六式 サイファーポールNo.9',''],
     634: ['ケイミー','','Keimi'],
     635: ['ケイミー タコ焼き屋店員','','Keimi, Takoyaki Stand Assistant'],
-    636: ['パッパグ',''],
+    636: ['パッパグ','', 'Pappug'],
     637: ['はっちゃん タコ焼き屋店主','', 'Hachi, Takoyaki Stand Owner' ],
     638: ['ドーマ',''],
     639: ['遊騎士ドーマ',''],
@@ -1480,8 +1480,8 @@ window.aliases = {
     1479: ['濡れ髪のカリブー カリブー海賊団船長', '', ''],
     1480: ['バンダー・デッケン九世 幽霊船の主', '', ''],
     1481: ['バンダー・デッケン九世 フライング海賊団船長', '', ''],
-    1482: ['マダム・シャーリー', '', ''],
-    1483: ['マダム・シャーリー 占い師', '', ''],
+    1482: ['マダム・シャーリー', '', '', 'Madame Shirley'],
+    1483: ['マダム・シャーリー 占い師', '', '', 'Madame Shirley'],
     1484: ['サンジ 野生の海賊', '', 'Wild Sanji'],
     1485: ['サンジ 大地の開拓者', '', 'Wild Sanji'],
     1486: ['イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
@@ -1667,6 +1667,87 @@ window.aliases = {
     1666: ['', '', ''],
     1667: ['', '', ''],
     1668: ['', '', ''],
+    1669: ['', '', ''],
+    1670: ['', '', 'Madame Shirley'],
+    1671: ['', '', ''],
+    1672: ['', '', 'Pappug'],
+    1673: ['', '', ''],
+    1674: ['', '', ''],
+    1675: ['', '', ''],
+    1676: ['', '', ''],
+    1677: ['', '', ''],
+    1678: ['', '', ''],
+    1679: ['', '', ''],
+    1680: ['', '', ''],
+    1681: ['', '', ''],
+    1682: ['', '', ''],
+    1683: ['', '', ''],
+    1684: ['', '', ''],
+    1685: ['', '', ''],
+    1686: ['', '', ''],
+    1687: ['', '', ''],
+    1688: ['', '', ''],
+    1689: ['', '', ''],
+    1690: ['', '', ''],
+    1691: ['', '', ''],
+    1692: ['', '', ''],
+    1693: ['', '', ''],
+    1694: ['', '', ''],
+    1695: ['', '', ''],
+    1696: ['', '', ''],
+    1697: ['', '', ''],
+    1698: ['', '', ''],
+    1699: ['', '', ''],
+    1700: ['', '', ''],
+    1701: ['', '', ''],
+    1702: ['', '', ''],
+    1703: ['', '', ''],
+    1704: ['', '', ''],
+    1705: ['', '', ''],
+    1706: ['', '', ''],
+    1707: ['', '', ''],
+    1708: ['', '', ''],
+    1709: ['', '', ''],
+    1710: ['', '', ''],
+    1711: ['', '', ''],
+    1712: ['', '', ''],
+    1713: ['', '', ''],
+    1714: ['', '', ''],
+    1715: ['', '', ''],
+    1716: ['', '', ''],
+    1717: ['', '', ''],
+    1718: ['', '', ''],
+    1719: ['', '', ''],
+    1720: ['', '', ''],
+    1721: ['', '', ''],
+    1722: ['', '', ''],
+    1723: ['', '', ''],
+    1724: ['', '', ''],
+    1725: ['', '', ''],
+    1726: ['', '', ''],
+    1727: ['', '', ''],
+    1728: ['', '', ''],
+    1729: ['', '', ''],
+    1730: ['', '', ''],
+    1731: ['', '', ''],
+    1732: ['', '', ''],
+    1733: ['', '', ''],
+    1734: ['', '', ''],
+    1735: ['', '', ''],
+    1736: ['', '', ''],
+    1737: ['', '', ''],
+    1738: ['', '', ''],
+    1739: ['', '', ''],
+    1740: ['', '', ''],
+    1741: ['', '', ''],
+    1742: ['', '', ''],
+    1743: ['', '', ''],
+    1744: ['', '', ''],
+    1745: ['', '', ''],
+    1746: ['', '', ''],
+    1747: ['', '', ''],
+    1748: ['', '', ''],
+    1749: ['', '', ''],
     1750: ['', '', 'Korea Law'],
     1751: ['', '', 'Korea Law'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 316e9d5d6..7684a9ffd 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4948,6 +4948,17 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
+    1670: {
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+    },
+    1671: {
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1672: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 58ec48bd2..7f31118f2 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1668,9 +1668,9 @@ window.cooldowns = [
     [ 21, 6 ],
     [ 26, 18 ],
     [ 26, 18 ],
-    null,
-    null,
-    null,
+    15,
+    16,
+    20,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 0d68cfeec..ead5a8508 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -914,12 +914,12 @@ window.details = {
         captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%"
     },
     250: {
-        special: "Recovers all HP",
+        special: "Recovers all missing HP",
         specialName: "Blue Flame Rebirth",
         captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
     },
     251: {
-        special: "Recovers all HP",
+        special: "Recovers all missing HP",
         specialName: "Blue Flame Rebirth",
         captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
     },
@@ -9030,13 +9030,13 @@ window.details = {
     1622: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Overheat [Reformed]",
+        specialName: "Overheat [Neo]",
         captain: "Boosts ATK of Slasher characters by 2x"
     },
     1623: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Overheat [Reformed]",
+        specialName: "Overheat [Neo]",
         captain: "Boosts ATK and HP of Slasher characters by 2x"
     },
     1624: {//Hyouzou
@@ -9180,7 +9180,7 @@ window.details = {
     },
     1646: {//Reborn Pica
         captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
-        specialName: "Rock Domination Wall [Reformed]",
+        specialName: "Rock Domination Wall [Neo]",
         special: [
             {
                 "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
@@ -9195,7 +9195,7 @@ window.details = {
         },
     1647: {//Reborn Pica
         captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.5x",
-        specialName: "Rock Domination Wall [Reformed]",
+        specialName: "Rock Domination Wall [Neo]",
         special: [
             {
                 "description": "For Driven and Powerhouse characters, changes [EMPTY] and Badly Matching orbs into Matching orbs. Cuts the current HP of all enemies by 10%",
@@ -9338,16 +9338,31 @@ window.details = {
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
         specialName: "Kyros Special",
     },
-    1668: {
+    1668: {//Reborn Aokiji
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
-        specialName: "Ice Block - Pheasant Beak [Reformed]",
+        specialName: "Ice Block - Pheasant Beak [Neo]",
         captain: "Boosts ATK of Striker characters by 2x"
     },
-    1669: {
+    1669: {//Reborn Aokiji
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
-        specialName: "Ice Block - Pheasant Beak [Reformed]",
+        specialName: "Ice Block - Pheasant Beak [Neo]",
         captain: "Boosts ATK and HP of Striker characters by 2x"
     },
+    1670: {//Shyarly
+        captain: "Boosts ATK of [DEX] characters by 1.75x and their RCV by 1.2x",
+        special: "Randomizes all non-matching orbs, switches orbs between slots two times, and delays all enemies for 1 turn",
+        specialName: "Shyarly Special",
+    },
+    1671: {//Camie
+        captain: "Boosts RCV of Free Spirit characters by 1.5x",
+        special: "Recovers 15% of crew's MAX HP and amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "Camie Special",
+    },
+    1671: {//Pappagu
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
+        special: "Binds himself for 2 turns and reduces Despair and Silence duration by 3 turns",
+        specialName: "Pappagu Special",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index 28095cd02..031d13d8b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -3,705 +3,707 @@ window.drops = {
     'Story Island': [
 
         {
-            name: "Fushia Village",
+            name: 'Fushia Village',
             thumb: 28,
             global: true,
             completion: '5x Rainbow Gems',	
             gamewith: 3417,
-            "01": [ 119, 120 ],
-            "02": [ 27, 115, 119, 120 ],
-            "03": [ 28, 78, 79, 80, 119, 120 ]
+            '01': [ 119, 120 ],
+            '02': [ 27, 115, 119, 120 ],
+            '03': [ 28, 78, 79, 80, 119, 120 ]
         },
 
         {
-            name: "Alvida's Hideout",
+            name: 'Alvida\'s Hideout',
             thumb: 29,
             global: true,
             gamewith: 3418,
             completion: 'Unlocks Extra Islands',
-            "Completion Units": [ 31, 105 ],
-            "01": [ 121, 123, 127, 131, 136 ],
-            "02": [ 78, 79, 80, 121, 122, 123, 126, 131, 132, 137, 138, 141 ],
-            "03": [ 29, 115, 121, 122, 123, 126, 127, 128, 131, 132, 133, 136, 137, 138, 141, 171 ]
+            'Completion Units': [ 31, 105 ],
+            '01': [ 121, 123, 127, 131, 136 ],
+            '02': [ 78, 79, 80, 121, 122, 123, 126, 131, 132, 137, 138, 141 ],
+            '03': [ 29, 115, 121, 122, 123, 126, 127, 128, 131, 132, 133, 136, 137, 138, 141, 171 ]
         },
 
         {
-            name: "Shells Town",
+            name: 'Shells Town',
             thumb: 35,
             global: true,
             completion: 'Ship: Navy Ship',
             gamewith: 3423,
-            "Completion Units": [5, 80, 97, 116 ],
-            "01": [ 81, 82, 179, 180, 181, 182 ],
-            "02": [ 78, 79, 80, 179, 180, 181, 183 ],
-            "03": [ 33, 81, 82, 179, 180, 181, 182, 183 ],
-            "04": [ 115, 179, 180, 181, 182, 183 ],
-            "05": [ 105, 106, 107, 179, 180, 181, 182, 187 ],
-            "06": [ 116, 179, 180, 181, 188 ],
-            "07": [ 78, 79, 80, 184, 185, 186, 187 ],
-            "08": [ 33, 80, 105, 106, 107, 179, 180, 181, 184, 185, 186, 187, 188 ],
-            "09": [ 35, 89, 90, 91, 116, 184, 185, 186, 187, 188 ]
+            'Completion Units': [5, 80, 97, 116 ],
+            '01': [ 81, 82, 179, 180, 181, 182 ],
+            '02': [ 78, 79, 80, 179, 180, 181, 183 ],
+            '03': [ 33, 81, 82, 179, 180, 181, 182, 183 ],
+            '04': [ 115, 179, 180, 181, 182, 183 ],
+            '05': [ 105, 106, 107, 179, 180, 181, 182, 187 ],
+            '06': [ 116, 179, 180, 181, 188 ],
+            '07': [ 78, 79, 80, 184, 185, 186, 187 ],
+            '08': [ 33, 80, 105, 106, 107, 179, 180, 181, 184, 185, 186, 187, 188 ],
+            '09': [ 35, 89, 90, 91, 116, 184, 185, 186, 187, 188 ]
         },
 
         {
-            name: "Orange Town",
+            name: 'Orange Town',
             thumb: 38,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 3422,
-            "01": [ 115, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 134, 135, 174 ],
-            "02": [ 78, 121, 126, 136, 142, 147, 170 ],
-            "03": [ 40, 80, 123, 124, 128, 129, 130, 133, 134, 135, 138, 139, 140, 144, 149, 154, 158, 159, 171 ],
-            "04": [ 40, 79, 122, 125, 127, 129, 132, 135, 137, 141, 143, 148, 153, 158, 172 ],
-            "05": [ 38, 40, 78, 79, 80, 81, 82, 124, 125, 129, 130, 134, 135, 136, 137, 138, 139, 140, 147, 148, 149, 157, 158, 159 ],
-            "06": [ 40, 89, 90, 91, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 162, 173 ],
-            "07": [ 40, 105, 115, 116, 117, 126, 136, 141, 142, 147, 152, 157, 170 ],
-            "08": [ 36, 40, 106, 115, 116, 117, 122, 127, 134, 135, 137, 141, 143, 148, 153, 158 ],
-            "09": [ 40, 107, 115, 116, 117, 124, 125, 139, 140, 141, 144, 149, 154, 159, 162, 174 ],
-            "10": [ 92, 93, 121, 125, 126, 129, 130, 134, 135, 136, 139, 142, 147, 152, 157, 158, 159, 172 ],
-            "11": [ 37, 92, 93, 116, 122, 129, 130, 132, 137, 139, 140, 143, 148, 153, 158 ],
-            "12": [ 81, 82, 123, 128, 133, 134, 135, 138, 139, 140, 144, 149, 154, 159, 171 ],
-            "13": [ 38, 89, 90, 91, 131, 132, 133, 139, 140, 141, 142, 152, 153, 154, 157, 158, 159, 162 ]
-        },
-
-        {
-            name: "Syrup Village",
+            '01': [ 115, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 134, 135, 174 ],
+            '02': [ 78, 121, 126, 136, 142, 147, 170 ],
+            '03': [ 40, 80, 123, 124, 128, 129, 130, 133, 134, 135, 138, 139, 140, 144, 149, 154, 158, 159, 171 ],
+            '04': [ 40, 79, 122, 125, 127, 129, 132, 135, 137, 141, 143, 148, 153, 158, 172 ],
+            '05': [ 38, 40, 78, 79, 80, 81, 82, 124, 125, 129, 130, 134, 135, 136, 137, 138, 139, 140, 147, 148, 149, 157, 158, 159 ],
+            '06': [ 40, 89, 90, 91, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 162, 173 ],
+            '07': [ 40, 105, 115, 116, 117, 126, 136, 141, 142, 147, 152, 157, 170 ],
+            '08': [ 36, 40, 106, 115, 116, 117, 122, 127, 134, 135, 137, 141, 143, 148, 153, 158 ],
+            '09': [ 40, 107, 115, 116, 117, 124, 125, 139, 140, 141, 144, 149, 154, 159, 162, 174 ],
+            '10': [ 92, 93, 121, 125, 126, 129, 130, 134, 135, 136, 139, 142, 147, 152, 157, 158, 159, 172 ],
+            '11': [ 37, 92, 93, 116, 122, 129, 130, 132, 137, 139, 140, 143, 148, 153, 158 ],
+            '12': [ 81, 82, 123, 128, 133, 134, 135, 138, 139, 140, 144, 149, 154, 159, 171 ],
+            '13': [ 38, 89, 90, 91, 131, 132, 133, 139, 140, 141, 142, 152, 153, 154, 157, 158, 159, 162 ]
+        },
+
+        {
+            name: 'Syrup Village',
             thumb: 45,
             global: true,
             completion: 'Ship: Merry Go - 5x Rainbow Gems',
             gamewith: 3424,
-            "Completion Units": [13],
-            "01": [ 13, 78, 79, 80, 81, 82, 89, 90, 91, 95, 96, 97, 105, 106, 107, 115 ],
-            "02": [ 108, 109, 163, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
-            "03": [ 92, 93, 124, 125, 126, 127, 128, 147, 148, 149, 160, 161, 165, 166, 174 ],
-            "04": [ 43, 116, 131, 132, 133, 139, 140, 145, 146, 147, 148, 149, 152, 153, 154, 155, 156, 166, 167 ],
-            "05": [ 45, 92, 93, 131, 132, 133, 143, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 165, 167 ],
-            "06": [ 89, 90, 91, 164, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
-            "07": [ 116, 117, 165, 166, 167, 168 ],
-            "08": [ 105, 106, 107, 145, 146, 150, 151, 155, 156, 160, 161, 165, 166, 168, 173 ],
-            "09": [ 41, 116, 117, 141, 142, 145, 146, 147, 152, 157, 162, 165, 170 ],
-            "10": [ 42, 116, 117, 144, 149, 150, 151, 154, 159, 166, 169, 171 ],
-            "11": [ 41, 42, 108, 109, 141, 143, 148, 153, 162, 167, 172 ],
-            "12": [ 43, 95, 96, 97, 142, 143, 144, 145, 146, 150, 151, 155, 156, 162, 165, 166, 167, 168 ],
-            "13": [ 45, 105, 106, 107, 165, 166, 167, 168, 169, 170, 171, 172, 174 ]
-        },
-
-        {
-            name: "Baratie",
+            'Completion Units': [13],
+            '01': [ 13, 78, 79, 80, 81, 82, 89, 90, 91, 95, 96, 97, 105, 106, 107, 115 ],
+            '02': [ 108, 109, 163, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
+            '03': [ 92, 93, 124, 125, 126, 127, 128, 147, 148, 149, 160, 161, 165, 166, 174 ],
+            '04': [ 43, 116, 131, 132, 133, 139, 140, 145, 146, 147, 148, 149, 152, 153, 154, 155, 156, 166, 167 ],
+            '05': [ 45, 92, 93, 131, 132, 133, 143, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 165, 167 ],
+            '06': [ 89, 90, 91, 164, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
+            '07': [ 116, 117, 165, 166, 167, 168 ],
+            '08': [ 105, 106, 107, 145, 146, 150, 151, 155, 156, 160, 161, 165, 166, 168, 173 ],
+            '09': [ 41, 116, 117, 141, 142, 145, 146, 147, 152, 157, 162, 165, 170 ],
+            '10': [ 42, 116, 117, 144, 149, 150, 151, 154, 159, 166, 169, 171 ],
+            '11': [ 41, 42, 108, 109, 141, 143, 148, 153, 162, 167, 172 ],
+            '12': [ 43, 95, 96, 97, 142, 143, 144, 145, 146, 150, 151, 155, 156, 162, 165, 166, 167, 168 ],
+            '13': [ 45, 105, 106, 107, 165, 166, 167, 168, 169, 170, 171, 172, 174 ]
+        },
+
+        {
+            name: 'Baratie',
             thumb: 57,
             global: true,
             completion: 'Ship: Baratie - 5x Rainbow Gems',
             gamewith: 3416,
-            "Completion Units": [17],
-            "01": [ 48, 131, 132, 133, 136, 137, 138, 140 ],
-            "02": [ 49, 116, 117, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
-            "03": [ 50, 51, 52, 184, 185, 186, 187, 188 ],
-            "04": [ 53, 110, 111, 112, 145, 146, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162 ],
-            "05": [ 57, 105, 106, 107, 122, 123, 132, 142, 147, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161 ],
-            "06": [ 92, 93, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 136, 137, 138, 142, 143, 144, 148, 149, 153, 154, 158, 159, 160, 161, 170, 171 ],
-            "07": [ 108, 109, 124, 125, 129, 130, 134, 135, 139, 140, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 172, 173 ],
-            "08": [ 55, 116, 136, 142, 143, 144, 145, 146, 147, 148, 149, 170 ],
-            "09": [ 55, 95, 110, 117, 142, 147, 149, 152, 153, 157, 162, 170, 171, 172 ],
-            "10": [ 105, 106, 107, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 173, 174 ],
-            "11": [ 55, 96, 111, 117, 143, 144, 148, 149, 152, 153, 154, 158, 159, 162 ],
-            "12": [ 53, 97, 112, 117, 144, 148, 149, 151, 154, 156, 159 ],
-            "13": [ 108, 109, 116, 124, 129, 134, 139, 145, 147, 148, 149, 150, 152, 153, 154, 155, 160, 170, 173 ],
-            "14": [ 92, 93, 116, 125, 130, 135, 140, 146, 151, 156, 157, 158, 159, 161, 171, 172, 174 ],
-            "15": [ 57, 89, 90, 91, 110, 111, 112, 117, 142, 143, 144, 145, 146, 149, 150, 151, 152, 153, 154, 160, 161, 162, 170, 171, 172 ]
-        },
-
-        {
-            name: "Arlong Park",
+            'Completion Units': [17],
+            '01': [ 48, 131, 132, 133, 136, 137, 138, 140 ],
+            '02': [ 49, 116, 117, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188 ],
+            '03': [ 50, 51, 52, 184, 185, 186, 187, 188 ],
+            '04': [ 53, 110, 111, 112, 145, 146, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162 ],
+            '05': [ 57, 105, 106, 107, 122, 123, 132, 142, 147, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161 ],
+            '06': [ 92, 93, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 136, 137, 138, 142, 143, 144, 148, 149, 153, 154, 158, 159, 160, 161, 170, 171 ],
+            '07': [ 108, 109, 124, 125, 129, 130, 134, 135, 139, 140, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 172, 173 ],
+            '08': [ 55, 116, 136, 142, 143, 144, 145, 146, 147, 148, 149, 170 ],
+            '09': [ 55, 95, 110, 117, 142, 147, 149, 152, 153, 157, 162, 170, 171, 172 ],
+            '10': [ 105, 106, 107, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 173, 174 ],
+            '11': [ 55, 96, 111, 117, 143, 144, 148, 149, 152, 153, 154, 158, 159, 162 ],
+            '12': [ 53, 97, 112, 117, 144, 148, 149, 151, 154, 156, 159 ],
+            '13': [ 108, 109, 116, 124, 129, 134, 139, 145, 147, 148, 149, 150, 152, 153, 154, 155, 160, 170, 173 ],
+            '14': [ 92, 93, 116, 125, 130, 135, 140, 146, 151, 156, 157, 158, 159, 161, 171, 172, 174 ],
+            '15': [ 57, 89, 90, 91, 110, 111, 112, 117, 142, 143, 144, 145, 146, 149, 150, 151, 152, 153, 154, 160, 161, 162, 170, 171, 172 ]
+        },
+
+        {
+            name: 'Arlong Park',
             thumb: 65,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 3408,
-            "Completion Units": [9],
-            "01": [ 89, 121, 126, 131, 136, 141, 142, 147, 152, 156, 157, 158, 159, 160, 162, 170, 173, 175, 178 ],
-            "02": [ 90, 122, 127, 132, 137, 141, 143, 148, 153, 155, 157, 158, 159, 161, 162, 172, 174, 177 ],
-            "03": [ 91, 123, 128, 133, 138, 141, 144, 149, 154, 157, 158, 159, 160, 161, 162, 171, 173, 175, 176, 177 ],
-            "04": [ 59, 92, 93, 179, 180, 181, 182, 184, 185, 186, 187, 188 ],
-            "05": [ 98, 99, 121, 122, 123, 126, 127, 142, 143, 144, 145, 146, 147, 148, 150, 151, 152, 153, 155, 156, 160, 161, 162, 172, 173, 174, 177 ],
-            "06": [ 78, 79, 80, 121, 122, 139, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 153, 154, 155, 156, 160, 161, 162, 170, 171, 172, 176 ],
-            "07": [ 60, 98, 99, 110, 111, 112, 122, 123, 139, 140, 141, 142, 145, 146, 147, 150, 151, 152, 155, 156, 160, 161, 170, 175, 178 ],
-            "08": [ 61, 110, 111, 112, 116, 117, 131, 133, 137, 143, 145, 146, 148, 153, 158, 172, 175, 176, 177, 178 ],
-            "09": [ 62, 110, 111, 112, 131, 132, 138, 142, 143, 144, 145, 146, 149, 150, 151, 154, 159, 162, 171, 176, 178 ],
-            "10": [ 81, 82, 124, 125, 129, 130, 134, 135, 139, 140, 146, 150, 151, 156, 157, 158, 159, 160, 161, 173, 174, 175, 176, 177, 178 ],
-            "11": [ 63, 117, 121, 123, 126, 127, 128, 131, 132, 133, 136, 138, 139, 140, 142, 143, 145, 146, 147, 149, 150, 151, 155, 156, 160, 161, 162, 170, 172, 175, 176, 177, 178 ],
-            "12": [ 63, 92, 93, 113, 114, 142, 147, 148, 149, 152, 157, 170, 175, 176, 177, 178 ],
-            "13": [ 116, 142, 143, 144, 148, 152, 153, 154, 158, 172, 175, 176, 177, 178 ],
-            "14": [ 65, 117, 123, 133, 136, 137, 138, 142, 143, 144, 149, 152, 153, 154, 159, 171, 175, 176, 177, 178 ],
-            "15": [ 62, 63, 65, 113, 114, 121, 122, 123, 126, 127, 128, 131, 132, 133, 136, 137, 138, 145, 146, 147, 148, 149, 150, 151, 155, 156, 173, 174, 175, 176, 177, 178 ],
-        },
-        
-        {
-            name: "Logue Town",
+            'Completion Units': [9],
+            '01': [ 89, 121, 126, 131, 136, 141, 142, 147, 152, 156, 157, 158, 159, 160, 162, 170, 173, 175, 178 ],
+            '02': [ 90, 122, 127, 132, 137, 141, 143, 148, 153, 155, 157, 158, 159, 161, 162, 172, 174, 177 ],
+            '03': [ 91, 123, 128, 133, 138, 141, 144, 149, 154, 157, 158, 159, 160, 161, 162, 171, 173, 175, 176, 177 ],
+            '04': [ 59, 92, 93, 179, 180, 181, 182, 184, 185, 186, 187, 188 ],
+            '05': [ 98, 99, 121, 122, 123, 126, 127, 142, 143, 144, 145, 146, 147, 148, 150, 151, 152, 153, 155, 156, 160, 161, 162, 172, 173, 174, 177 ],
+            '06': [ 78, 79, 80, 121, 122, 139, 141, 142, 143, 144, 145, 146, 147, 148, 149, 150, 151, 153, 154, 155, 156, 160, 161, 162, 170, 171, 172, 176 ],
+            '07': [ 60, 98, 99, 110, 111, 112, 122, 123, 139, 140, 141, 142, 145, 146, 147, 150, 151, 152, 155, 156, 160, 161, 170, 175, 178 ],
+            '08': [ 61, 110, 111, 112, 116, 117, 131, 133, 137, 143, 145, 146, 148, 153, 158, 172, 175, 176, 177, 178 ],
+            '09': [ 62, 110, 111, 112, 131, 132, 138, 142, 143, 144, 145, 146, 149, 150, 151, 154, 159, 162, 171, 176, 178 ],
+            '10': [ 81, 82, 124, 125, 129, 130, 134, 135, 139, 140, 146, 150, 151, 156, 157, 158, 159, 160, 161, 173, 174, 175, 176, 177, 178 ],
+            '11': [ 63, 117, 121, 123, 126, 127, 128, 131, 132, 133, 136, 138, 139, 140, 142, 143, 145, 146, 147, 149, 150, 151, 155, 156, 160, 161, 162, 170, 172, 175, 176, 177, 178 ],
+            '12': [ 63, 92, 93, 113, 114, 142, 147, 148, 149, 152, 157, 170, 175, 176, 177, 178 ],
+            '13': [ 116, 142, 143, 144, 148, 152, 153, 154, 158, 172, 175, 176, 177, 178 ],
+            '14': [ 65, 117, 123, 133, 136, 137, 138, 142, 143, 144, 149, 152, 153, 154, 159, 171, 175, 176, 177, 178 ],
+            '15': [ 62, 63, 65, 113, 114, 121, 122, 123, 126, 127, 128, 131, 132, 133, 136, 137, 138, 145, 146, 147, 148, 149, 150, 151, 155, 156, 173, 174, 175, 176, 177, 178 ],
+        },
+        
+        {
+            name: 'Logue Town',
             thumb: 69,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 2807,
-            "01": [ 174, 170, 171, 172, 84 ],
-            "02": [ 29, 85 ],
-            "03": [ 174, 173, 86 ],
-            "04": [ 36, 87 ],
-            "05": [ 174, 162, 88 ],
-            "06": [ 36, 113, 29 ],
-            "07": [ 37, 114, 38 ],
-            "08": [ 184, 95 ],
-            "09": [ 185, 97 ],
-            "10": [ 67, 180, 181, 182, 183, 96 ],
-            "11": [ 188, 184, 185, 186, 98, 99 ],
-            "12": [ 69, 110, 111, 112 ]
-        },
-
-        {
-            name: "Twin Cape",
+            '01': [ 174, 170, 171, 172, 84 ],
+            '02': [ 29, 85 ],
+            '03': [ 174, 173, 86 ],
+            '04': [ 36, 87 ],
+            '05': [ 174, 162, 88 ],
+            '06': [ 36, 113, 29 ],
+            '07': [ 37, 114, 38 ],
+            '08': [ 184, 95 ],
+            '09': [ 185, 97 ],
+            '10': [ 67, 180, 181, 182, 183, 96 ],
+            '11': [ 188, 184, 185, 186, 98, 99 ],
+            '12': [ 69, 110, 111, 112 ]
+        },
+
+        {
+            name: 'Twin Cape',
             thumb: 213,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 3753,
-            "01": [ 215, 83, 95, 110 ],
-            "02": [ 174, 96, 111, 83 ],
-            "03": [ 173, 174, 97, 112, 83 ],
-            "04": [ 211, 99, 114, 83 ],
-            "05": [ 71, 173, 98, 113, 83 ],
-            "06": [ 71, 211, 84, 83 ],
-            "07": [ 215, 85, 83 ],
-            "08": [ 71, 86, 83, 211 ],
-            "09": [ 213, 87, 88, 83 ],
-            "10": [ 213, 117, 83, 84, 85, 86, 87, 88, 110, 111, 112, 113, 114 ]
+            '01': [ 215, 83, 95, 110 ],
+            '02': [ 174, 96, 111, 83 ],
+            '03': [ 173, 174, 97, 112, 83 ],
+            '04': [ 211, 99, 114, 83 ],
+            '05': [ 71, 173, 98, 113, 83 ],
+            '06': [ 71, 211, 84, 83 ],
+            '07': [ 215, 85, 83 ],
+            '08': [ 71, 86, 83, 211 ],
+            '09': [ 213, 87, 88, 83 ],
+            '10': [ 213, 117, 83, 84, 85, 86, 87, 88, 110, 111, 112, 113, 114 ]
         },
 
         {
-            name: "Whiskey Peak",
+            name: 'Whiskey Peak',
             thumb: 201,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 4911,
-            "01": [ 237, 238, 239, 110, 118 ],
-            "02": [ 111, 118, 240 ],
-            "03": [ 84, 118, 235 ],
-            "04": [ 71, 85, 118, 211 ],
-            "05": [ 114, 118, 241 ],
-            "06": [ 233, 240, 241, 87, 118 ],
-            "07": [ 86, 99, 118, 233, 235 ],
-            "08": [ 113, 118, 240, 241 ],
-            "09": [ 88, 118, 199 ],
-            "10": [ 86, 118, 201 ],
-            "11": [ 98, 117, 118, 240, 241 ],
-            "12": [ 95, 96, 118, 201 ],
-            "13": [ 96, 97, 118, 199 ],
-            "14": [ 95, 97, 118, 199, 201 ],
-            "15": [ 2, 110, 111, 112, 118, 199, 201 ]
-        },
-
-        {
-            name: "Little Garden",
+            '01': [ 237, 238, 239, 110, 118 ],
+            '02': [ 111, 118, 240 ],
+            '03': [ 84, 118, 235 ],
+            '04': [ 71, 85, 118, 211 ],
+            '05': [ 114, 118, 241 ],
+            '06': [ 233, 240, 241, 87, 118 ],
+            '07': [ 86, 99, 118, 233, 235 ],
+            '08': [ 113, 118, 240, 241 ],
+            '09': [ 88, 118, 199 ],
+            '10': [ 86, 118, 201 ],
+            '11': [ 98, 117, 118, 240, 241 ],
+            '12': [ 95, 96, 118, 201 ],
+            '13': [ 96, 97, 118, 199 ],
+            '14': [ 95, 97, 118, 199, 201 ],
+            '15': [ 2, 110, 111, 112, 118, 199, 201 ]
+        },
+
+        {
+            name: 'Little Garden',
             thumb: 292,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 5419,
-            "01": [ 289, 162, 141, 83, 116, 117 ],
-            "02": [ 83, 85, 90, 293 ],
-            "03": [ 83, 84, 89, 294 ],
-            "04": [ 83, 86, 91, 295 ],
-            "05": [ 83, 111, 112, 113, 293, 295 ],
-            "06": [ 83, 88, 93, 292 ],
-            "07": [ 83, 87, 92, 291 ],
-            "08": [ 83, 110, 111, 293, 294 ],
-            "09": [ 83, 110, 112, 293, 294, 295 ],
-            "10": [ 83, 240, 241, 303 ],
-            "11": [ 83, 203, 304 ],
-            "12": [ 83, 205, 302 ],
-            "13": [ 83, 290, 301 ],
-            "14": [ 83, 199, 201, 300 ],
-            "15": [ 113, 114, 83, 110, 111, 112, 203, 205, 300, 301, 302, 303, 304 ]
-        },
-
-        {
-            name: "Drum Island",
+            '01': [ 289, 162, 141, 83, 116, 117 ],
+            '02': [ 83, 85, 90, 293 ],
+            '03': [ 83, 84, 89, 294 ],
+            '04': [ 83, 86, 91, 295 ],
+            '05': [ 83, 111, 112, 113, 293, 295 ],
+            '06': [ 83, 88, 93, 292 ],
+            '07': [ 83, 87, 92, 291 ],
+            '08': [ 83, 110, 111, 293, 294 ],
+            '09': [ 83, 110, 112, 293, 294, 295 ],
+            '10': [ 83, 240, 241, 303 ],
+            '11': [ 83, 203, 304 ],
+            '12': [ 83, 205, 302 ],
+            '13': [ 83, 290, 301 ],
+            '14': [ 83, 199, 201, 300 ],
+            '15': [ 113, 114, 83, 110, 111, 112, 203, 205, 300, 301, 302, 303, 304 ]
+        },
+
+        {
+            name: 'Drum Island',
             thumb: 326,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 6658,
-            "Completion Units": [21],
-            "01": [ 328, 94, 117 ],
-            "02": [ 84, 94, 116, 334 ],
-            "03": [ 78, 79, 80, 81, 82, 94, 334 ],
-            "04": [ 85, 94, 110, 330 ],
-            "05": [ 86, 94, 111, 331 ],
-            "06": [ 94, 145, 150, 155, 160, 303 ],
-            "07": [ 24, 21, 87, 113, 333 ],
-            "08": [ 94, 146, 151, 156, 161, 304 ],
-            "09": [ 87, 94, 112, 330 ],
-            "10": [ 88, 94, 113, 331 ],
-            "11": [ 94, 143, 148, 153, 158, 301 ],
-            "12": [ 94, 302, 330, 331 ],
-            "13": [ 94, 300, 326 ],
-            "14": [ 94, 114, 117, 160, 162, 289 ],
-            "15": [ 94, 110, 111, 112, 113, 114, 300, 301, 302, 303, 304, 326 ]
-        },
-
-        {
-            name: "Nanohana - Rainbase",
-            shortName: "Nanohana",
+            'Completion Units': [21],
+            '01': [ 328, 94, 117 ],
+            '02': [ 84, 94, 116, 334 ],
+            '03': [ 78, 79, 80, 81, 82, 94, 334 ],
+            '04': [ 85, 94, 110, 330 ],
+            '05': [ 86, 94, 111, 331 ],
+            '06': [ 94, 145, 150, 155, 160, 303 ],
+            '07': [ 24, 21, 87, 113, 333 ],
+            '08': [ 94, 146, 151, 156, 161, 304 ],
+            '09': [ 87, 94, 112, 330 ],
+            '10': [ 88, 94, 113, 331 ],
+            '11': [ 94, 143, 148, 153, 158, 301 ],
+            '12': [ 94, 302, 330, 331 ],
+            '13': [ 94, 300, 326 ],
+            '14': [ 94, 114, 117, 160, 162, 289 ],
+            '15': [ 94, 110, 111, 112, 113, 114, 300, 301, 302, 303, 304, 326 ]
+        },
+
+        {
+            name: 'Nanohana - Rainbase',
+            shortName: 'Alabasta 1',
             thumb: 383,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 7578,
-            "01": [ 116, 300, 301, 302, 303, 304, 378 ],
-            "02": [ 69, 300, 301, 302, 303, 304 ],
-            "03": [ 113, 114, 184, 185, 186, 300, 301, 302, 303, 304 ],
-            "04": [ 300, 301, 302, 303, 304, 379 ],
-            "05": [ 84, 300, 301, 302, 303, 304, 368 ],
-            "06": [ 86, 300, 301, 302, 303, 304, 382 ],
-            "07": [ 85, 300, 301, 302, 303, 304, 369 ],
-            "08": [ 87, 88, 300, 301, 302, 303, 304, 372 ],
-            "09": [ 117, 300, 301, 302, 303, 304, 379, 382 ],
-            "10": [ 187, 188, 300, 301, 302, 303, 304 ],
-            "11": [ 300, 301, 302, 303, 304, 371 ],
-            "12": [ 300, 301, 302, 303, 304, 368 ],
-            "13": [ 95, 96, 97, 300, 301, 302, 303, 304, 381 ],
-            "14": [ 98, 99, 203, 300, 301, 302, 303, 304, 381 ],
-            "15": [ 110, 111, 112, 113, 114, 117, 300, 301, 302, 303, 304, 383 ]
-        },
-
-        {
-            name: "Alubarna",
+            '01': [ 116, 300, 301, 302, 303, 304, 378 ],
+            '02': [ 69, 300, 301, 302, 303, 304 ],
+            '03': [ 113, 114, 184, 185, 186, 300, 301, 302, 303, 304 ],
+            '04': [ 300, 301, 302, 303, 304, 379 ],
+            '05': [ 84, 300, 301, 302, 303, 304, 368 ],
+            '06': [ 86, 300, 301, 302, 303, 304, 382 ],
+            '07': [ 85, 300, 301, 302, 303, 304, 369 ],
+            '08': [ 87, 88, 300, 301, 302, 303, 304, 372 ],
+            '09': [ 117, 300, 301, 302, 303, 304, 379, 382 ],
+            '10': [ 187, 188, 300, 301, 302, 303, 304 ],
+            '11': [ 300, 301, 302, 303, 304, 371 ],
+            '12': [ 300, 301, 302, 303, 304, 368 ],
+            '13': [ 95, 96, 97, 300, 301, 302, 303, 304, 381 ],
+            '14': [ 98, 99, 203, 300, 301, 302, 303, 304, 381 ],
+            '15': [ 110, 111, 112, 113, 114, 117, 300, 301, 302, 303, 304, 383 ]
+        },
+
+        {
+            name: 'Alubarna',
+            shortName: 'Alabasta 2',
             thumb: 384,
             global: true,
             completion: '10x Rainbow Gems',
             gamewith: 8949,
-            "01": [ 368, 237, 78, 83, 89 ],
-            "02": [ 369, 239, 79, 90, 83 ],
-            "03": [ 207, 80, 91, 83 ],
-            "04": [ 81, 92, 83, 207 ],
-            "05": [ 395, 397, 82, 93, 83 ],
-            "06": [ 300, 301, 83, 395, 397 ],
-            "07": [ 238, 370, 171, 302, 83, 301 ],
-            "08": [ 83, 300, 302, 401 ],
-            "09": [ 116, 117, 83, 399 ],
-            "10": [ 383, 303, 304, 83 ],
-            "11": [ 372, 370, 83, 303, 304 ],
-            "12": [ 170, 171, 172, 371, 105, 106, 107, 108, 109, 83 ],
-            "13": [ 83, 115, 116, 117, 173, 174, 368, 370 ],
-            "14": [ 83, 117, 237, 238, 239, 240, 241 ],
-            "15": [ 110, 111, 112, 83, 383 ]
-        },
-
-        {
-            name: "Jaya",
+            '01': [ 368, 237, 78, 83, 89 ],
+            '02': [ 369, 239, 79, 90, 83 ],
+            '03': [ 207, 80, 91, 83 ],
+            '04': [ 81, 92, 83, 207 ],
+            '05': [ 395, 397, 82, 93, 83 ],
+            '06': [ 300, 301, 83, 395, 397 ],
+            '07': [ 238, 370, 171, 302, 83, 301 ],
+            '08': [ 83, 300, 302, 401 ],
+            '09': [ 116, 117, 83, 399 ],
+            '10': [ 383, 303, 304, 83 ],
+            '11': [ 372, 370, 83, 303, 304 ],
+            '12': [ 170, 171, 172, 371, 105, 106, 107, 108, 109, 83 ],
+            '13': [ 83, 115, 116, 117, 173, 174, 368, 370 ],
+            '14': [ 83, 117, 237, 238, 239, 240, 241 ],
+            '15': [ 110, 111, 112, 83, 383 ]
+        },
+
+        {
+            name: 'Jaya',
+            shortName: 'Jaya',
             thumb: 430,
             global: true,
             completion: 'Ship: Merry Go Flying - 5x Rainbow Gems',
             gamewith: 9879,
-            "01": [ 215, 105, 106, 107, 108, 109, 115, 116, 381 ],
-            "02": [ 171, 91, 97, 96 ],
-            "03": [ 170, 426, 89, 95 ],
-            "04": [ 172, 90, 96 ],
-            "05": [ 174, 93, 99 ],
-            "06": [ 173, 92, 98 ],
-            "07": [ 430, 84, 85, 86, 432 ],
-            "08": [ 142, 147, 152, 284, 300 ],
-            "09": [ 159, 427, 302 ],
-            "10": [ 428, 303, 304 ],
-            "11": [ 143, 148, 153, 158, 301 ],
-            "12": [ 429, 87, 88, 293, 303, 304 ],
-            "13": [ 429, 78, 79, 80, 81, 82, 295 ],
-            "14": [ 142, 149, 153, 160, 289, 113, 114, 294 ],
-            "15": [ 110, 111, 112, 117, 116, 430 ]
-        },
-
-        {
-            name: "Sky Island: Angel Island - Upper Yard",
-            shortName: "Angel Island",
+            '01': [ 215, 105, 106, 107, 108, 109, 115, 116, 381 ],
+            '02': [ 171, 91, 97, 96 ],
+            '03': [ 170, 426, 89, 95 ],
+            '04': [ 172, 90, 96 ],
+            '05': [ 174, 93, 99 ],
+            '06': [ 173, 92, 98 ],
+            '07': [ 430, 84, 85, 86, 432 ],
+            '08': [ 142, 147, 152, 284, 300 ],
+            '09': [ 159, 427, 302 ],
+            '10': [ 428, 303, 304 ],
+            '11': [ 143, 148, 153, 158, 301 ],
+            '12': [ 429, 87, 88, 293, 303, 304 ],
+            '13': [ 429, 78, 79, 80, 81, 82, 295 ],
+            '14': [ 142, 149, 153, 160, 289, 113, 114, 294 ],
+            '15': [ 110, 111, 112, 117, 116, 430 ]
+        },
+
+        {
+            name: 'Angel Island - Upper Yard',
+            shortName: 'Skypea 1',
             thumb: 467,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 11528,
-            "01": [ 488, 487, 489, 493, 494, 116, 117 ],
-            "02": [ 468, 469, 92, 93, 98, 99 ],
-            "03": [ 468, 469, 303, 304 ],
-            "04": [ 469, 468, 113, 114 ],
-            "05": [ 472, 473, 474, 89, 90, 91, 95, 96, 97 ],
-            "06": [ 92, 93, 98, 99, 117, 463 ],
-            "07": [ 472, 473, 474, 170, 171, 172, 300, 301, 302, 303, 304 ],
-            "08": [ 464, 110, 111, 112 ],
-            "09": [ 477, 478, 479, 105, 106, 107 ],
-            "10": [ 480, 475, 481, 476, 108, 109 ],
-            "11": [ 105, 106, 107, 490, 491, 492, 493, 494 ],
-            "12": [ 472, 474, 89, 90, 91 ],
-            "13": [ 466, 108, 109 ],
-            "14": [ 95, 96, 97, 465, 472 ],
-            "15": [ 467, 110, 111, 112, 113, 114 ]
-        },
-
-        {
-            name: "Sky Island: Upper Yard - Ark Maxim",
-            shortName: "Ark Maxim",
+            '01': [ 488, 487, 489, 493, 494, 116, 117 ],
+            '02': [ 468, 469, 92, 93, 98, 99 ],
+            '03': [ 468, 469, 303, 304 ],
+            '04': [ 469, 468, 113, 114 ],
+            '05': [ 472, 473, 474, 89, 90, 91, 95, 96, 97 ],
+            '06': [ 92, 93, 98, 99, 117, 463 ],
+            '07': [ 472, 473, 474, 170, 171, 172, 300, 301, 302, 303, 304 ],
+            '08': [ 464, 110, 111, 112 ],
+            '09': [ 477, 478, 479, 105, 106, 107 ],
+            '10': [ 480, 475, 481, 476, 108, 109 ],
+            '11': [ 105, 106, 107, 490, 491, 492, 493, 494 ],
+            '12': [ 472, 474, 89, 90, 91 ],
+            '13': [ 466, 108, 109 ],
+            '14': [ 95, 96, 97, 465, 472 ],
+            '15': [ 467, 110, 111, 112, 113, 114 ]
+        },
+
+        {
+            name: 'Upper Yard - Ark Maxim',
+            shortName: 'Skypea 2',
             thumb: 545,
             global: true,
             completion: '10x Rainbow Gems',
             gamewith: 12130,
-            "01": [ 94, 300, 541 ],
-            "02": [ 94, 302, 464, 543 ],
-            "03": [ 94, 303, 542 ],
-            "04": [ 94, 301, 477, 478, 479 ],
-            "05": [ 94, 304, 476, 545 ],
-            "06": [ 464, 78, 79, 83, 88 ],
-            "07": [ 79, 80, 83, 86, 480, 481, 545 ],
-            "08": [ 80, 81, 83, 87, 463 ],
-            "09": [ 81, 82, 83, 85, 465, 473 ],
-            "10": [ 78, 82, 83, 84, 541 ],
-            "11": [ 83, 94, 116, 117, 477, 478, 479, 480, 481 ],
-            "12": [ 83, 98, 99, 113, 114, 117, 118, 545 ]
-        },
-
-        {
-            name: "Long Ring Long Land",
+            '01': [ 94, 300, 541 ],
+            '02': [ 94, 302, 464, 543 ],
+            '03': [ 94, 303, 542 ],
+            '04': [ 94, 301, 477, 478, 479 ],
+            '05': [ 94, 304, 476, 545 ],
+            '06': [ 464, 78, 79, 83, 88 ],
+            '07': [ 79, 80, 83, 86, 480, 481, 545 ],
+            '08': [ 80, 81, 83, 87, 463 ],
+            '09': [ 81, 82, 83, 85, 465, 473 ],
+            '10': [ 78, 82, 83, 84, 541 ],
+            '11': [ 83, 94, 116, 117, 477, 478, 479, 480, 481 ],
+            '12': [ 83, 98, 99, 113, 114, 117, 118, 545 ]
+        },
+
+        {
+            name: 'Long Ring Long Land',
             thumb: 568,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 12773,
-            "01": [ 368, 147, 152, 300 ],
-            "02": [ 564, 158, 301 ],
-            "03": [ 171, 144, 149, 302 ],
-            "04": [ 371, 174, 372, 303, 304 ],
-            "05": [ 564, 563, 303, 304 ],
-            "06": [ 147, 148, 149, 368, 105, 106 ],
-            "07": [ 565, 566, 107, 106 ],
-            "08": [ 565, 566, 567, 105, 107 ],
-            "09": [ 142, 149, 153, 160, 289, 108, 109 ],
-            "10": [ 108, 109, 142, 143, 144, 145, 146, 568 ],
-            "11": [ 110, 111, 112, 568 ]
+            '01': [ 368, 147, 152, 300 ],
+            '02': [ 564, 158, 301 ],
+            '03': [ 171, 144, 149, 302 ],
+            '04': [ 371, 174, 372, 303, 304 ],
+            '05': [ 564, 563, 303, 304 ],
+            '06': [ 147, 148, 149, 368, 105, 106 ],
+            '07': [ 565, 566, 107, 106 ],
+            '08': [ 565, 566, 567, 105, 107 ],
+            '09': [ 142, 149, 153, 160, 289, 108, 109 ],
+            '10': [ 108, 109, 142, 143, 144, 145, 146, 568 ],
+            '11': [ 110, 111, 112, 568 ]
         },
 
         {
-            name: "Water Seven",
+            name: 'Water Seven',
             thumb: 632,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 14293,
-            "01": [ 614, 87, 88, 266 ],
-            "02": [ 84, 85, 86, 173, 174, 237, 238, 239, 266 ],
-            "03": [ 110, 266, 615, 616, 617 ],
-            "04": [ 111, 266, 614, 615, 616 ],
-            "05": [ 112, 266, 614, 616, 617 ],
-            "06": [ 113, 114, 266, 614, 615, 616, 617 ],
-            "07": [ 98, 99, 222, 266 ],
-            "08": [ 117, 266, 629 ],
-            "09": [ 266, 302, 319, 620, 621, 625 ],
-            "10": [ 266, 300, 317, 321, 323, 325, 628 ],
-            "11": [ 266, 301, 618, 620, 622, 624, 626 ],
-            "12": [ 266, 303, 336 ],
-            "13": [ 266, 304, 622, 623, 626, 627 ],
-            "14": [ 117, 266, 618, 619 ],
-            "15": [ 117, 266, 300, 301, 302, 303, 304, 620, 621, 625, 630, 632 ]
-        },
-
-        {
-            name: "Enies Lobby: Entrance",
-            shortName: "Enies Lobby 1",
+            '01': [ 614, 87, 88, 266 ],
+            '02': [ 84, 85, 86, 173, 174, 237, 238, 239, 266 ],
+            '03': [ 110, 266, 615, 616, 617 ],
+            '04': [ 111, 266, 614, 615, 616 ],
+            '05': [ 112, 266, 614, 616, 617 ],
+            '06': [ 113, 114, 266, 614, 615, 616, 617 ],
+            '07': [ 98, 99, 222, 266 ],
+            '08': [ 117, 266, 629 ],
+            '09': [ 266, 302, 319, 620, 621, 625 ],
+            '10': [ 266, 300, 317, 321, 323, 325, 628 ],
+            '11': [ 266, 301, 618, 620, 622, 624, 626 ],
+            '12': [ 266, 303, 336 ],
+            '13': [ 266, 304, 622, 623, 626, 627 ],
+            '14': [ 117, 266, 618, 619 ],
+            '15': [ 117, 266, 300, 301, 302, 303, 304, 620, 621, 625, 630, 632 ]
+        },
+
+        {
+            name: 'Enies Lobby Front Gate',
+            shortName: 'Enies Lobby 1',
             thumb: 706,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 15599,
-            "Completion Units": [708],
-            "01": [ 78, 79, 80, 81, 82, 185, 186, 188, 694 ],
-            "02": [ 78, 79, 80, 81, 184, 185, 187, 692 ],
-            "03": [ 304, 695, 702 ],
-            "04": [ 303, 693, 701 ],
-            "05": [ 301, 692, 703 ],
-            "06": [ 300, 694, 706 ],
-            "07": [ 302, 691, 704 ],
-            "08": [ 110, 111, 112, 691, 692, 694 ],
-            "09": [ 113, 114, 695, 704, 705 ],
-            "10": [ 110, 111, 112, 691, 692, 693, 694, 695, 706 ]
-        },
-
-        {
-            name: "Enies Lobby: Tower of Justice - Gates of Justice",
-            shortName: "Enies Lobby 2",
+            'Completion Units': [708],
+            '01': [ 78, 79, 80, 81, 82, 185, 186, 188, 694 ],
+            '02': [ 78, 79, 80, 81, 184, 185, 187, 692 ],
+            '03': [ 304, 695, 702 ],
+            '04': [ 303, 693, 701 ],
+            '05': [ 301, 692, 703 ],
+            '06': [ 300, 694, 706 ],
+            '07': [ 302, 691, 704 ],
+            '08': [ 110, 111, 112, 691, 692, 694 ],
+            '09': [ 113, 114, 695, 704, 705 ],
+            '10': [ 110, 111, 112, 691, 692, 693, 694, 695, 706 ]
+        },
+
+        {
+            name: 'Tower of Law - Gates of Justice',
+            shortName: 'Enies Lobby 2',
             thumb: 737,
             global: true,
             completion: 'Ship: Thousand Sunny - 5x Rainbow Gems',
             gamewith: 16618,
-            "Completion Units": [739],
-            "01": [ 110 ],
-            "02": [ 111 ],
-            "03": [ 112 ],
-            "04": [ 98, 303, 734 ],
-            "05": [ 95, 300, 732 ],
-            "06": [ 113 ],
-            "07": [ 97, 302, 728 ],
-            "08": [ 99, 304, 730 ],
-            "09": [ 84, 300, 630 ],
-            "10": [ 114 ],
-            "11": [ 85, 86, 87, 738 ],
-            "12": [ 96, 301, 632 ],
-            "13": [ 105, 106, 107, 108, 109 ],
-            "14": [ 113, 114, 300, 301, 632 ]
-        },
-
-        {
-            name: "Thriller Bark: Mouth Gate - Hogback's Residence",
-            shortName: "Thriller Bark 1",
+            'Completion Units': [739],
+            '01': [ 110 ],
+            '02': [ 111 ],
+            '03': [ 112 ],
+            '04': [ 98, 303, 734 ],
+            '05': [ 95, 300, 732 ],
+            '06': [ 113 ],
+            '07': [ 97, 302, 728 ],
+            '08': [ 99, 304, 730 ],
+            '09': [ 84, 300, 630 ],
+            '10': [ 114 ],
+            '11': [ 85, 86, 87, 738 ],
+            '12': [ 96, 301, 632 ],
+            '13': [ 105, 106, 107, 108, 109 ],
+            '14': [ 113, 114, 300, 301, 632 ]
+        },
+
+        {
+            name: 'Mouth Gate - Hogback\'s Mansion',
+            shortName: 'Thriller Bark 1',
             thumb: 816,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 19269,
-            "01": [ 89, 90, 91, 387, 817, 818, 819, 820, 821 ],
-            "02": [ 89, 90, 91, 92, 93, 812, 817, 818, 819, 820, 821 ],
-            "03": [ 116, 817, 818, 819, 820, 821 ],
-            "04": [ 110, 111, 112, 814, 817, 818, 819 ],
-            "05": [ 113, 114, 425, 820, 821 ],
-            "06": [ 110, 111, 112, 814, 817, 818, 819 ],
-            "07": [ 80, 81, 82, 84, 85, 394, 822, 823, 824 ],
-            "08": [ 116, 117, 813, 817, 818, 819, 825, 826, 827 ],
-            "09": [ 116, 117, 820, 821, 825, 826, 827 ],
-            "10": [ 78, 79, 80, 81, 82, 393, 817, 818, 819, 820, 821, 822, 823, 824 ],
-            "11": [ 98, 99, 113, 114, 303, 304, 815, 817, 818, 819, 820, 821, 825, 826, 827 ]
-        },
-
-        {
-            name: "Thriller Bark: Moria's Mast Mansion",
-            shortName: "Thriller Bark 2",
+            '01': [ 89, 90, 91, 387, 817, 818, 819, 820, 821 ],
+            '02': [ 89, 90, 91, 92, 93, 812, 817, 818, 819, 820, 821 ],
+            '03': [ 116, 817, 818, 819, 820, 821 ],
+            '04': [ 110, 111, 112, 814, 817, 818, 819 ],
+            '05': [ 113, 114, 425, 820, 821 ],
+            '06': [ 110, 111, 112, 814, 817, 818, 819 ],
+            '07': [ 80, 81, 82, 84, 85, 394, 822, 823, 824 ],
+            '08': [ 116, 117, 813, 817, 818, 819, 825, 826, 827 ],
+            '09': [ 116, 117, 820, 821, 825, 826, 827 ],
+            '10': [ 78, 79, 80, 81, 82, 393, 817, 818, 819, 820, 821, 822, 823, 824 ],
+            '11': [ 98, 99, 113, 114, 303, 304, 815, 817, 818, 819, 820, 821, 825, 826, 827 ]
+        },
+
+        {
+            name: 'Moria\'s Mast Mansion',
+            shortName: 'Thriller Bark 2',
             thumb: 894,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 22436,
-            "Completion Units": [895],
-            "01": [ 817, 818, 819, 888 ],
-            "02": [ 393, 888, 889 ],
-            "03": [ 425 ],
-            "04": [ 404, 406, 892 ],
-            "05": [ 818, 822, 823, 824, 827 ],
-            "06": [ 385, 387, 394, 407, 891 ],
-            "07": [ 825, 826, 827, 892 ],
-            "08": [ 825, 826, 827 ],
-            "09": [ 406, 820, 821, 825, 826, 827 ],
-            "10": [ 893 ],
-            "11": [ 893 ],
-            "12": [ 406, 815 ]
-        },
-        
-        {
-            name: "Sabaody Archipelago",
-            shortName: "Sabaody Archipelago",
+            'Completion Units': [895],
+            '01': [ 817, 818, 819, 888 ],
+            '02': [ 393, 888, 889 ],
+            '03': [ 425 ],
+            '04': [ 404, 406, 892 ],
+            '05': [ 818, 822, 823, 824, 827 ],
+            '06': [ 385, 387, 394, 407, 891 ],
+            '07': [ 825, 826, 827, 892 ],
+            '08': [ 825, 826, 827 ],
+            '09': [ 406, 820, 821, 825, 826, 827 ],
+            '10': [ 893 ],
+            '11': [ 893 ],
+            '12': [ 406, 815 ]
+        },
+        
+        {
+            name: 'Sabaody Archipelago',
+            shortName: 'Sabaody Archipelago',
             thumb: 974,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 24829,
-            "01": [ 620, 111, 623, 113, 625, 114, 954, 955, 956 ],
-            "02": [ ],
-            "03": [ ],
-            "04": [ ],
-            "05": [ ],
-            "06": [ ],
-            "07": [ ],
-            "08": [ 114, 163, 164, 957, 958, 959, 960, 961, 962, 963 ],
-            "09": [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 965, 967 ],
-            "10": [ 95, 97, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 966 ],
-            "11": [ ],
-            "12": [ ],
-            "13": [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
-            "14": [ 111, 112, 113, 114, 185, 186, 187, 691, 693, 695, 968, 969, 970, 972, 973 ]
-        },
-        
-        {
-            name: "Amazon Lily",
-            shortName: "Amazon Lily",
+            '01': [ 620, 111, 623, 113, 625, 114, 954, 955, 956 ],
+            '02': [ ],
+            '03': [ ],
+            '04': [ ],
+            '05': [ ],
+            '06': [ ],
+            '07': [ ],
+            '08': [ 114, 163, 164, 957, 958, 959, 960, 961, 962, 963 ],
+            '09': [ 112, 142, 144, 154, 157, 159, 170, 173, 174, 289, 618, 623, 624, 625, 626, 957, 958, 959, 961, 962, 964, 965, 967 ],
+            '10': [ 95, 97, 142, 150, 151, 154, 155, 162, 170, 172, 173, 174, 237, 241, 620, 622, 623, 626, 966 ],
+            '11': [ ],
+            '12': [ ],
+            '13': [ 111, 181, 184, 185, 186, 691, 692, 693, 694, 695, 971 ],
+            '14': [ 111, 112, 113, 114, 185, 186, 187, 691, 693, 695, 968, 969, 970, 972, 973 ]
+        },
+        
+        {
+            name: 'Amazon Lily',
+            shortName: 'Amazon Lily',
             thumb: 1056,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 30491,
-            "01": [ 919, 301, 300 ],
-            "02": [ 1059, 301, 303 ],
-            "03": [ 1068, 1067, 302 ],
-            "04": [ 1062, 1066, 1065, 88, 87 ],
-            "05": [ 1061, 1062, 86, 84 ],
-            "06": [ 1063, 1064, 1065, 1066, 1067, 1068, 110, 112 ],
-            "07": [ 1067, 1068, 88 ],
-            "08": [ 1055, 1057, 111, 113 ],
-            "09": [ 1055, 1057, 110, 112 ]
+            '01': [ 919, 301, 300 ],
+            '02': [ 1059, 301, 303 ],
+            '03': [ 1068, 1067, 302 ],
+            '04': [ 1062, 1066, 1065, 88, 87 ],
+            '05': [ 1061, 1062, 86, 84 ],
+            '06': [ 1063, 1064, 1065, 1066, 1067, 1068, 110, 112 ],
+            '07': [ 1067, 1068, 88 ],
+            '08': [ 1055, 1057, 111, 113 ],
+            '09': [ 1055, 1057, 110, 112 ]
         },
         
         {
-            name: "Impel Down",
-            shortName: "Impel Down",
+            name: 'Impel Down',
+            shortName: 'Impel Down',
             thumb: 1159,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 34745,
-            "01": [ 931 ],
-            "02": [ 540, 931 ],
-            "03": [ 1153, 931 ],
-            "04": [ 1154, 931 ],
-            "05": [ 1151, 931 ],
-            "06": [ 1158 ],
-            "07": [ 1155, 931 ],
-            "08": [  ],
-            "09": [  ],
-            "10": [  ],
-            "11": [ 551, 539, 1151, 1152, 931, 552 ],
-            "12": [ 1156, 549 ],
-            "13": [  ],
-            "14": [ 1152 ],
-            "15": [  ],
-            "16": [ 1158 ],
-        },
-        
-        {
-            name: "Marineford Bay",
-            shortName: "Marineford",
+            '01': [ 931 ],
+            '02': [ 540, 931 ],
+            '03': [ 1153, 931 ],
+            '04': [ 1154, 931 ],
+            '05': [ 1151, 931 ],
+            '06': [ 1158 ],
+            '07': [ 1155, 931 ],
+            '08': [  ],
+            '09': [  ],
+            '10': [  ],
+            '11': [ 551, 539, 1151, 1152, 931, 552 ],
+            '12': [ 1156, 549 ],
+            '13': [  ],
+            '14': [ 1152 ],
+            '15': [  ],
+            '16': [ 1158 ],
+        },
+        
+        {
+            name: 'Marineford Bay',
+            shortName: 'Marineford 1',
             thumb: 1228,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 37190,
-            "01": [  ],
-            "02": [ 1223 ],
-            "03": [  ],
-            "04": [  ],
-            "05": [ 1224 ],
-            "06": [ 1225 ],
-            "07": [  ],
-            "08": [ 815 ],
-            "09": [ 1226 ],
-            "10": [ 1227 ],
-            "11": [  ],
-            "12": [ 1228 ]
-        },
-        
-        {
-            name: "Marineford - Oris Plaza",
-            shortName: "Oris Plaza",
+            '01': [  ],
+            '02': [ 1223 ],
+            '03': [  ],
+            '04': [  ],
+            '05': [ 1224 ],
+            '06': [ 1225 ],
+            '07': [  ],
+            '08': [ 815 ],
+            '09': [ 1226 ],
+            '10': [ 1227 ],
+            '11': [  ],
+            '12': [ 1228 ]
+        },
+        
+        {
+            name: 'The Bay - Oris Plaza',
+            shortName: 'Marineford 2',
             thumb: 1283,
             global: true,
             completion: '10x Rainbow Gems',
             gamewith: 38886,
-            "01": [ 1279 ],
-            "02": [  ],
-            "03": [ 1280 ],
-            "04": [ 1228, 771, 770 ],
-            "05": [  ],
-            "06": [ 262 ],
-            "07": [  ],
-            "08": [ 1281, 1282 ],
-            "09": [ 1280 ],
-            "10": [ 1283 ],
-            "11": [ 1283 ],
-            "12": [  ],
-            "13": [  ],
-            "14": [ 1283 ],
-            "15": [ 1283 ],
-        },
-        
-        {
-            name: "3D2Y - Timeskip Training",
-            shortName: "3D2Y",
+            '01': [ 1279 ],
+            '02': [  ],
+            '03': [ 1280 ],
+            '04': [ 1228, 771, 770 ],
+            '05': [  ],
+            '06': [ 262 ],
+            '07': [  ],
+            '08': [ 1281, 1282 ],
+            '09': [ 1280 ],
+            '10': [ 1283 ],
+            '11': [ 1283 ],
+            '12': [  ],
+            '13': [  ],
+            '14': [ 1283 ],
+            '15': [ 1283 ],
+        },
+        
+        {
+            name: '3D2Y',
+            shortName: '3D2Y',
             thumb: 1353,
             global: true,
             completion: '5x Rainbow Gems',
             gamewith: 45559,
-            "01": [ 1342 ],
-            "02": [ 1343 ],
-            "03": [  ],
-            "04": [ 1344 ],
-            "05": [ 1345 ],
-            "06": [ 1346 ],
-            "07": [ 1347 ],
-            "08": [ 1348 ],
-            "09": [ 1349 ],
-            "10": [  ],
-            "11": [ 1350 ],
-            "12": [ 1351 ],
-            "13": [ 1352 ],
-            "14": [ 1353 ],
-        },
-        
-        {
-            name: "Sabaody Archipelago - Redux",
-            shortName: "Straw Hat Return",
+            '01': [ 1342 ],
+            '02': [ 1343 ],
+            '03': [  ],
+            '04': [ 1344 ],
+            '05': [ 1345 ],
+            '06': [ 1346 ],
+            '07': [ 1347 ],
+            '08': [ 1348 ],
+            '09': [ 1349 ],
+            '10': [  ],
+            '11': [ 1350 ],
+            '12': [ 1351 ],
+            '13': [ 1352 ],
+            '14': [ 1353 ],
+        },
+        
+        {
+            name: 'Sabaody Archipelago Redux',
+            shortName: 'Straw Hat Return',
             global: true,
             thumb: 1393,
             completion: 'Ship: Coated Thousand Sunny - 5x Rainbow Gems',
             gamewith: 46976,
-            "01": [  ],
-            "02": [  ],
-            "03": [ 1393 ],
-            "04": [  ],
-            "05": [  ],
-            "06": [  ],
-            "07": [  ],
-            "08": [  ],
-            "09": [ 1392 ],
+            '01': [  ],
+            '02': [  ],
+            '03': [ 1393 ],
+            '04': [  ],
+            '05': [  ],
+            '06': [  ],
+            '07': [  ],
+            '08': [  ],
+            '09': [ 1392 ],
         },
         
         {
-            name: "Hard-Shell Tower - Dragon Imperial Palace",
-            shortName: "Fishman Island 1",
+            name: 'Deep-Sea Aphotic Zone to Ryugu Palace',
+            shortName: 'Fishman Island 1',
             thumb: 1506,
             completion: '5x Rainbow Gems',
             gamewith: 52247,
-            "01": [ 1501, 1502 ],
-            "02": [ 1502, 340 ],
-            "03": [  ],
-            "04": [  ],
-            "05": [ 1503 ],
-            "06": [  ],
-            "07": [  ],
-            "08": [  ],
-            "09": [  ],
-            "10": [  ],
-            "11": [  ],
-            "12": [  ],
-            "13": [ 1504 ],
-            "14": [ 1505 ],
-        },
-        
-        {
-            name: "King Neptune's Execution Site - Noah's Ark",
-            shortName: "Fishman Island 2",
+            '01': [ 1501, 1502 ],
+            '02': [ 1502, 340 ],
+            '03': [  ],
+            '04': [  ],
+            '05': [ 1503 ],
+            '06': [  ],
+            '07': [  ],
+            '08': [  ],
+            '09': [  ],
+            '10': [  ],
+            '11': [  ],
+            '12': [  ],
+            '13': [ 1504 ],
+            '14': [ 1505 ],
+        },
+        
+        {
+            name: 'King Neptune\'s Execution Site - Noah\'s Ark',
+            shortName: 'Fishman Island 2',
             thumb: 1562,
             completion: '5x Rainbow Gems',
             gamewith: 54695,
-            "01": [  ],
-            "02": [  ],
-            "03": [  ],
-            "04": [ 1560 ],
-            "05": [ 1558, 1561 ],
-            "06": [  ],
-            "07": [  ],
-            "08": [  ],
-            "09": [ 1557 ],
-            "10": [ 1558, 1560 ],
-            "11": [ 1561 ],
-            "12": [ 1556 ],
-            "13": [ 1559 ],
-            "14": [ 1505 ],
-        },
-        
-        {
-            name: "Punk Hazard Burning Lands - Laboratory",
-            shortName: "Punk Hazard 1",
+            '01': [  ],
+            '02': [  ],
+            '03': [  ],
+            '04': [ 1560 ],
+            '05': [ 1558, 1561 ],
+            '06': [  ],
+            '07': [  ],
+            '08': [  ],
+            '09': [ 1557 ],
+            '10': [ 1558, 1560 ],
+            '11': [ 1561 ],
+            '12': [ 1556 ],
+            '13': [ 1559 ],
+            '14': [ 1505 ],
+        },
+        
+        {
+            name: 'Punk Hazard Burning Lands - Laboratory',
+            shortName: 'Punk Hazard 1',
             thumb: 1637,
             completion: '5x Rainbow Gems',
             gamewith: 60126,
-            "01": [ 1633 ],
-            "02": [  ],
-            "03": [  ],
-            "04": [  ],
-            "05": [  ],
-            "06": [  ],
-            "07": [ 1635 ],
-            "08": [  ],
-            "09": [  ],
-            "10": [  ],
-            "11": [  ],
-            "12": [ 1634 ],
-            "13": [ 1634 ],
-            "14": [  ],
-            "15": [ 1636 ],
+            '01': [ 1633 ],
+            '02': [  ],
+            '03': [  ],
+            '04': [  ],
+            '05': [  ],
+            '06': [  ],
+            '07': [ 1635 ],
+            '08': [  ],
+            '09': [  ],
+            '10': [  ],
+            '11': [  ],
+            '12': [ 1634 ],
+            '13': [ 1634 ],
+            '14': [  ],
+            '15': [ 1636 ],
         },
         
     ],
@@ -793,7 +795,7 @@ window.drops = {
             name: 'Buggy\'s Counterattack!!',
             thumb: 39,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 6600,
             Expert: [ 36, 37, 38, 99, 109, 114, -4, -1387 ],
             Elite: [ 36, 37, 38, 99, 109, 114, -3 ]
@@ -803,7 +805,7 @@ window.drops = {
             name: 'Alvida\'s Romance',
             thumb: 30,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 7457,
             Expert: [ 28, 29, 31, 40, 84, 95, 110, 117, -30, -21, -8, -1388 ],
             Elite: [ 28, 29, 31, 40, 95, 105, 110, -21, -7 ]
@@ -813,7 +815,7 @@ window.drops = {
             name: 'Kuro\'s Master Plan',
             thumb: 46,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 7784,
             Expert: [ 41, 42, 43, 45, -16, -1446 ],
             Elite: [ 41, 42, 43, 45, 96, 106, 111, -15 ]
@@ -823,7 +825,7 @@ window.drops = {
             name: 'Arlong: Empire Rising',
             thumb: 66,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 5852,
             Expert: [ 61, 62, 63, 65, 89, 95, 105, 110, -12, -66, -1389 ],
             Elite: [ 61, 62, 63, 65, 95, 105, 110, -11 ]
@@ -833,7 +835,7 @@ window.drops = {
             name: 'Krieg\'s Assault!',
             thumb: 58,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 8111,
             Expert: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20 ],
             Elite: [ 98, 99, 108, 109, 113, 114, 53, 55, 57, -58, -20, -1447, -19 ]
@@ -843,16 +845,16 @@ window.drops = {
             name: 'Escaped! Morgan',
             thumb: 228,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 22603,
-            "All Difficulties": [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22, -1448 ]
+            'All Difficulties': [ 33, 35, 84, 95, 105, 107, 110, 112, -228, -34, -26, -25, -24, -23, -22, -1448 ]
         },
 
         {
             name: 'Hina\'s Resort Getaway',
             thumb: 232,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 5853,
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['450,000','1x ATK Cotton Candy'],['750,000','3x Rainbow Gems']],
@@ -864,29 +866,29 @@ window.drops = {
             name: 'Cobymeppo\'s Proving Ground!',
             thumb: 263,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 5777,
             challenge:'Total number of hits above 50,000',
             challengeData: [['5 Times','1x Yellow Elder'],['15 Times','1x ATK Cotton Candy'],['25 Times','3x Rainbow Gems']],
-            "All Difficulties": [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ]
+            'All Difficulties': [ 31, 33, 262, 264, 87, 88, 98, 99, 113, -265, -263, -225, -210, -64, -56, -32 ]
         },
 
         {
             name: 'Smoker\'s Great Pursuit',
             thumb: 268,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 6725,
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Green Elder'],['1,400,000 Damage','1y Rainbow Gem & 1x HP Cotton Candy'],['3,000,000 Damage','2x Rainbow Gems, 1x Forbidden Tome']],
-            "All Difficulties": [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
+            'All Difficulties': [ 67, 69, 86, 97, 112, -219, -212, -206, -204, -73, -52, -50 ]
         },
 
         {
             name: 'Tsuru\'s Morning Stroll',
             thumb: 297,
             global: true,
-            condition: "None",
+            condition: 'None',
             gamewith: 9181,
             Expert: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -217, -202, -200, -199 ],
             Elite: [ 99, 88, 114, 296, 298, 299, -236, -234, -223, -202, -200 ]
@@ -898,7 +900,7 @@ window.drops = {
             global: true,
             gamewith: 6204,
             condition: 'You may only bring STR units into this island',
-            "All Difficulties": [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ]
+            'All Difficulties': [ 86, 97, 110, 112, 317, 319, -259, -253, -216, -215, -62, -56 ]
         },
 
         {
@@ -907,7 +909,7 @@ window.drops = {
             global: true,
             gamewith: 5776,
             condition: 'You may only bring DEX units for 15 and 30 Stamina',
-            "All Difficulties": [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ]
+            'All Difficulties': [ 85, 96, 111, 112, 321, 323, 325, -251, -218, -75, -74, -54, -21 ]
         },
 
         {
@@ -930,7 +932,7 @@ window.drops = {
             condition: 'You may only bring QCK units for 15 and 30 Stamina',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['200,000 Points','1x Red Elder'],['400,000 Points','1x HP Cotton Candy'],['700,000 Points','3x Rainbow Gems']],
-            "All Difficulties": [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44, -1413 ]
+            'All Difficulties': [ 28, 40, 60, 213, 215, 340, -292, -291, -290, -261, -257, -214, -71, -44, -1413 ]
         },
 
         {
@@ -941,7 +943,7 @@ window.drops = {
             condition: 'You may only bring PSY units for 15 and 30 Stamina',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['10,000 Points','1x Black Elder'],['40,000 Points','1x Rainbow Gem, 1x ATK Cotton Candy'],['70,000 Points','2x Rainbow Gems, 1x Defence Boost Forbidden Tome']],
-            "All Difficulties": [ 385, 387, -388, -335, -314, -36, -16, -1446, -11 ]
+            'All Difficulties': [ 385, 387, -388, -335, -314, -36, -16, -1446, -11 ]
         },
 
         {
@@ -952,16 +954,16 @@ window.drops = {
             condition: 'You can only get STR, QCK, INT and Food Orbs',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['3 Times','1x Green Elder'],['12 Times','1x RCV Cotton Candy'],['25 Times','3x Rainbow Gems']],
-            "All Difficulties": [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4, -1387 ]
+            'All Difficulties': [ 391, 393, 394, -394, -393, -329, -316, -47, -34, -4, -1387 ]
         },
 
         {
-            name: 'Perv-salom\'s Manly Adventure',
+            name: 'Perv-salom\'s Very Manly Adventure',
             thumb: 405,
             global: true,
             gamewith: 6332,
             condition: 'You can only get QCK, DEX, PSY and Food Orbs',
-            "All Difficulties": [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20, -1447 ]
+            'All Difficulties': [ 404, 406, 407, -407, -406, -333, -312, -208, -26, -20, -1447 ]
         },
 
         {
@@ -969,8 +971,8 @@ window.drops = {
             thumb: 420,
             global: true,
             gamewith: 7161,
-            condition: "None",
-            "All Difficulties": [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8, -1388 ]
+            condition: 'None',
+            'All Difficulties': [ 36, 37, 47, 48, 49, 50, 51, 59, 63, 211, 233, 420, 421, 422, -422, -332, -308, -225, -206, -204, -8, -1388 ]
         },
 
         {
@@ -981,18 +983,18 @@ window.drops = {
             condition: 'You can only get STR, DEX, INT and PSY Orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['500,000 Damage','1x Black Elder'],['1,500,000 Damage','1x ATK Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
-            "All Difficulties": [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ]
+            'All Difficulties': [ 423, 425, -425, -327, -310, -223, -219, -214, -202 ]
         },
 
         {
-            name: 'Maiden in Love - First Sight',
+            name: 'Candy the Maiden-Hearted',
             thumb: 436,
             global: true,
             gamewith: 7785,
             challenge: 'Damage dealt in a single Round',
             challengeData: [['350,000','1x Black Elder'], ['900,000','1x HP Cotton Candy'], ['2,000,000','3x Rainbow Gems']],
             condition: 'Each non-Okama in your Team will take 60 Damage each turn',
-            "All Difficulties": [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ]
+            'All Difficulties': [ 433, 434, 435, -384, -372, -371, -359, -217, -210, -19 ]
         },
 
         {
@@ -1003,7 +1005,7 @@ window.drops = {
             condition: 'Higher Chance of Food orbs',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['450,000 Damage','1x Yellow Elder'],['1,250,000 Damage','1x RCV Cotton Candy'],['3,000,000 Damage','3x Rainbow Gems']],
-            "All Difficulties": [ 290, 293, 294, 295, 334, 379, 381, 382, 429, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
+            'All Difficulties': [ 290, 293, 294, 295, 334, 379, 381, 382, 429, 441, 442, 443, 444, -378, -368, -363, -251, -73, -15 ]
         },
 
         {
@@ -1014,7 +1016,7 @@ window.drops = {
             condition: '30: Non-Fighter, Evolver, or Booster class characters are weakend; 15: Striker and Slasher class characters are weakened (Note: Multi-class characters such as Fighter / Powerhouse are not affected)',
             challenge: 'Damage dealt in a single Round',
             challengeData: [['???','1x ??? Elder'], ['???','1x ?? Cotton Candy'], ['???','3x Rainbow Gems']],
-            "All Difficulties": [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
+            'All Difficulties': [ 460, 461, -398, -396, -370, -361, -253, -236, -234 ]
         },
 
         {
@@ -1025,29 +1027,29 @@ window.drops = {
             condition: '30: Non-Striker, Evolver, or Booster class characters are weakend; 15: Fighter and Shooter class characters are weakened (Note: Multi-class characters such as Striker / Slasher are not affected)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['120,000 Damage','1x Blue Elder'],['600,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['2,500,000 Damage','1x Cooldown Reduction Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]
+            'All Difficulties': [ 509, 511, -402, -400, -374, -357, -259, -212, -209 ]
         },
 
         {
-            name: 'Jailer Domino\' Special Guard',
+            name: 'Domino\'s Special Security',
             thumb: 538,
             global: true,
             gamewith: 7565,
             condition: '30: Non-Shooter, Evolver, or Booster class characters are weakend; 15: Fighter and Slasher class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Yellow Elder'],['2,000,000 Damage','1x HP Cotton Candy, 1x Rainbow Gem'],['5,000,000 Damage','1x Matching Orb Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ 537, 539, 540, -539, -428, -416, -365, -257, -59, -1445 ]
+            'All Difficulties': [ 537, 539, 540, -539, -428, -416, -365, -257, -59, -1445 ]
         },
 
         {
-            name: 'Chief Jailer Sadie: Cruel and Unusual',
+            name: 'Chief Jailer Sadie',
             thumb: 550,
             global: true,
             gamewith: 6225,
             condition: '30: Non-Slasher, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000 Damage','1x Black Elder'],['2,000,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['5,000,000 Damage','1x Defence Boost Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
+            'All Difficulties': [ 549, 551, 552, -552, -551, -432, -426, -408, -329, -308, -255 ]
         },
 
         {
@@ -1057,22 +1059,22 @@ window.drops = {
             gamewith: 5857,
             challenge: 'Total number of hits over 50,000',
             challengeData: [['3 Times','1x Red Elder'],['12 Times','1x RCV Cotton Candy'],['34 Times','3x Rainbow Gems & 1x Forbidden Tome']],
-            "All Difficulties": [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ]
+            'All Difficulties': [ 570, 572, 573, -431, -429, -410, -333, -332, -327, -316, -75 ]
         },
 
         {
-            name: 'Warriors of Shandia! Dreams of a Homeland!',
+            name: 'Shandia - Dreams of a Homeland!',
             thumb: 583,
             global: true,
             gamewith: 25677,
             condition: 'All Units considered from the “Sea” will lose 20% to all stats',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Black Elder'],['16 Times','1x ATK Cotton Candy'],['38 Times','3x Rainbow Gems']],
-            "All Difficulties": [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
+            'All Difficulties': [ 581, 582, 583, 584, -584, -544, -466, -412, -371, -335, -314, -291 ]
         },
 
         {
-            name: 'Pirate Apprentices! Shanks and Buggy',
+            name: 'Apprentices! Shanks and Buggy!',
             thumb: 599,
             global: true,
             gamewith: 6333,
@@ -1087,18 +1089,18 @@ window.drops = {
             global: true,
             gamewith: 26093,
             condition: 'You cannot use any two units that are the same',
-            "All Difficulties": [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]
+            'All Difficulties': [ 606, 608, 609, -502, -457, -449, -312, -52, -50 ]
         },
 
         {
-            name: 'Camie and Hachi\'s Takoyaki Shop!',
+            name: 'Camie and Hachi\'s Takoyaki Stand!',
             thumb: 635,
             global: true,
             gamewith: 9782,
             condition: 'No Units above the cost of 49 is allowed',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, 1x Orb Matching Forbidden Tome']],
-            "All Difficulties": [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
+            'All Difficulties': [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
         },
 
         {
@@ -1107,7 +1109,7 @@ window.drops = {
             global: true,
             gamewith: 8739,
             condition: 'You can only get STR, QCK, DEX, PSY and INT orbs',
-            "All Difficulties": [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
+            'All Difficulties': [ 655, 657, 658, -658, -500, -465, -455, -453, -398, -357, -60 ]
         },
 
         {
@@ -1116,460 +1118,467 @@ window.drops = {
             global: true,
             gamewith: 5504,
             condition: 'Heatwave causes damage every 2 turns',
-            "Japan": [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73, -1117 ],
-            "Global": [ 663, 665, 667, -667, -639, -508, -506, -459, -378, -221, -73 ]
+            'Japan': [ 663, 665, 667, -667, -522, -508, -506, -459, -378, -221, -73, -1117 ],
+            'Global': [ 663, 665, 667, -667, -639, -508, -506, -459, -378, -221, -73 ]
         },
 
         {
-            name: 'Led by the Light of Shandora! Calgara & Noland!',
+            name: 'Calgara & Noland!',
             thumb: 688,
             global: true,
             gamewith: 5352,
             condition: 'Bomb orbs appear',
-            "Japan": [ 687, 689, -542, -524, -528, -429, -428, -402, -365, -218, -1119, -1177 ],
-            "Global": [ 687, 689, -542, -645, -647, -429, -428, -402, -365, -218 ]
+            'Japan': [ 687, 689, -542, -524, -528, -429, -428, -402, -365, -218, -1119, -1177 ],
+            'Global': [ 687, 689, -542, -645, -647, -429, -428, -402, -365, -218 ]
         },
 
         {
-            name: "Sky Night Ganfor",
+            name: 'Sky Night Ganfor',
             thumb: 713,
             global: true,
             gamewith: 5882,
             condition: '30: Non-Free Spirit, Evolver, or Booster class characters are weakend; 15: Striker and Shooter class characters are weakened',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['600,000','1x Blue Elder'],['2,000,000','1x RCV Cotton Candy, 1x Rainbow Gem'],['5,000,000','1x Lock Resistance Forbidden Tome, 2x Rainbow Gems']],
-            "Japan": [ 712, 714, 715, -716, -546, -541, -520, -1115, -400, -202, -363, -204 ],
-            "Global": [ 712, 714, 715, -716, -643, -546, -541, -400, -202, -363, -204 ]
+            'Japan': [ 712, 714, 715, -716, -546, -541, -520, -1115, -400, -202, -363, -204 ],
+            'Global': [ 712, 714, 715, -716, -643, -546, -541, -400, -202, -363, -204 ]
         },
 
         {
-            name: "T-Bone's Absolute Justice",
+            name: 'T-Bone\'s Absolute Justice',
             thumb: 724,
             global: true,
             gamewith: 5451,
             condition: 'You can only bring INT, PSY and QCK units',
-            "Japan": [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219, -1173 ],
-            "Global": [ 721, 723, -590, -564, -563, -530, -641, -384, -361, -219 ]
+            'Japan': [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219, -1173 ],
+            'Global': [ 721, 723, -590, -564, -563, -530, -641, -384, -361, -219 ]
         },
 
         {
-            name: "Explosive! Wanze's Ramen Kenpo!!",
+            name: 'Wanze\'s Ramen Kung Fu!!',
             thumb: 743,
             global: true,
             gamewith: 7031,
             condition: 'You can only bring STR, QCK and DEX units',
-            "Japan": [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18, -1208, -1212 ],
-            "Global": [ 740, 742, -671, -673, -586, -567, -566, -412, -225, -18 ]
+            'Japan': [ 740, 742, -560, -558, -586, -567, -566, -412, -225, -18, -1208, -1212 ],
+            'Global': [ 740, 742, -671, -673, -586, -567, -566, -412, -225, -18 ]
         },
 
         {
-            name: "Twilight Party DEAD or TREAT!!",
+            name: 'Twilight Party! DEAD or TREAT!!',
             thumb: 761,
             global: true,
             gamewith: 25120,
-            condition: "None",
-            "Japan": [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217, -1210, -1413 ],
-            "Global": [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8, -1413, -1388 ]
+            condition: 'None',
+            'Japan': [ 761, 762, 763, 764, 765, -610, -588, -565, -556, -426, -408, -261, -217, -1210, -1413 ],
+            'Global': [ 761, 762, 763, 764, 765, -426, -408, -332, -308, -292, -261, -217, -8, -1413, -1388 ]
         },
 
         {
-            name: "Midnight Party DEAD or TREAT!!",
+            name: 'Midnight Party! DEAD or TREAT!!',
             thumb: 766,
             global: true,
             gamewith: 25101,
-            condition: "None",
-            "Japan": [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223, -1175 ],
-            "Global": [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
+            condition: 'None',
+            'Japan': [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223, -1175 ],
+            'Global': [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
         },
 
         {
-            name: "Evil Manager Breed's Marine Circus!",
+            name: 'Breed\'s Sea Animal Circus!',
             thumb: 797,
             global: true,
             gamewith: 2191,
             condition: 'You can only bring Fighter and Powerhouse units',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['100,000','1x Purple Elder'],['400,000','1x RCV Candy, 1x Rainbow Gem'],['750,000','1x Auto-Heal Skullbook, 2x Rainbow Gem']],
-            "Japan": [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ],
-            "Global": [ 796, 798, 799, 800, -800, -677, -628, -562, -414, -432, -380, -75 ]
+            'Japan': [ 796, 798, 799, 800, -800, -639, -628, -562, -414, -432, -380, -75 ],
+            'Global': [ 796, 798, 799, 800, -800, -677, -628, -562, -414, -432, -380, -75 ]
         },
 
         {
-            name: "Nami and Lola's Great Proposal Plan",
+            name: 'Operation: Proposal!',
             thumb: 808,
             global: true,
             gamewith: 19169,
             condition: 'You can only bring Slasher and Cerebral units. (No Evolution/Booster)',
-            "Japan": [ 807, 809, 811, 17, 404, -811, -645, -641, -631, -502, -11, -12, -9, -1389 ],
-            "Global": [ 807, 809, 811, 17, 404, -811, -760, -675, -631, -502, -11, -12, -9, -1389 ],
+            'Japan': [ 807, 809, 811, 17, 404, -811, -645, -641, -631, -502, -11, -12, -9, -1389 ],
+            'Global': [ 807, 809, 811, 17, 404, -811, -760, -675, -631, -502, -11, -12, -9, -1389 ],
         },
 
         {
-            name: "Legendary Shipbuilding Company Tom's Workers",
+            name:'Tom\'s Workers',
             thumb: 848,
             global: true,
             gamewith: 19832,
             condition: 'You can only bring Impact and Free Spirit units. (No Evo/Boosters)',
             challenge: 'Total Damage dealt to enemies in one turn',
             challengeData: [['100,000 Damage','1x DEX Elder Turtle'],['500,000 Damage','1x Rainbow Gem, 1x ATK Cotton Candy'],['2,000,000 Damage','2x Rainbow Gems, 1x Auto-Heal Forbidden Tome']],
-            "Japan": [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455, -1121 ],
-            "Global": [ 847, 849, 850, -849, -750, -617, -616, -615, -578, -508, -455, -1121 ]
+            'Japan': [ 847, 849, 850, -849, -647, -617, -616, -615, -578, -508, -455, -1121 ],
+            'Global': [ 847, 849, 850, -849, -750, -617, -616, -615, -578, -508, -455, -1121 ]
         },
 
         {
-            name: "Wapol's Counterattack",
+            name: 'Wapol\'s Revenge',
             thumb: 852,
             global: true,
             gamewith: 20412,
             condition: 'You can only bring Shooter and Driven units. (No Evo/Boosters)',
             challenge: 'Cumulative Damage dealt to enemies in a single run',
             challengeData: [['400,000 Damage','1x QCK Elder Turtle'],['1,400,000 Damage','1x ATK Cotton Candy, 1x Rainbow Gem'],['4,000,000 Damage','2x Rainbow Gems, 1x Despair Resistance Forbidden Tome']],
-            "Japan": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22, -1448 ],
-            "Global": [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -754, -614, -463, -457, -327, -22, -1448 ]
+            'Japan': [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -643, -614, -463, -457, -327, -22, -1448 ],
+            'Global': [ 328, 330, 331, 333, 851, 853, 854, -854, -649, -754, -614, -463, -457, -327, -22, -1448 ]
         },
 
         {
-            name: "Lightning Speed! Strawhat Crew's Surprise Visit",
+            name: 'Lightning Speed! Strawhat Crew\'s Surprise Visit',
             thumb: 866,
             gamewith: 21530,
-            condition: "None",
+            condition: 'None',
             challenge:'Total number of hits above 50,000',
             challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Despair Resistance Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -1549, -673, -671, -633, -500, -467, -465, -451, -431 ]
+            'All Difficulties': [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -1549, -673, -671, -633, -500, -467, -465, -451, -431 ]
         },
 
         {
-            name: "Riverside Banquet! Enter the Crazy Ones!",
+            name: 'Riverside Banquet! Enter the Crazy Ones!',
             thumb: 885,
             gamewith: 22421,
             condition: 'Highly increased chance of TND, Bomb, and G orbs',
-            "All Difficulties": [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416, -1445 ]
+            'All Difficulties': [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416, -1445 ]
         },
 
         {
-            name: "Mountaintop Banquet! Enter the Generals!",
+            name: 'Mountaintop Banquet! Enter the Generals!',
             thumb: 897,
             gamewith: 23047,
             condition: 'Only STR/DEX/QCK/PSY/INT orbs will appear',
-            "All Difficulties": [ 897, 898, 899, -899, -754, -702, -701, -669, -1492, -528, -466, -449, -464, -1177 ]
+            'All Difficulties': [ 897, 898, 899, -899, -754, -702, -701, -669, -1492, -528, -466, -449, -464, -1177 ]
         },
 
         {
-            name: "Men are Forbidden!? The Secret Flower Garden",
+            name: 'The Secret Garden! Men are Forbidden!?',
             thumb: 918,
             global: true,
             gamewith: 23687,
             condition: 'You can only bring DEX units',
-            "Japan": [ 917, 919, 920, -920, -791, -756, -720, -707, -705, -542, -541, -522, -1117 ],
-            "Global": [ 917, 919, 920, -920, -506, -756, -720, -707, -705, -542, -541, -522, -1117 ]
+            'Japan': [ 917, 919, 920, -920, -791, -756, -720, -707, -705, -542, -541, -522, -1117 ],
+            'Global': [ 917, 919, 920, -920, -506, -756, -720, -707, -705, -542, -541, -522, -1117 ]
         },
         
         {
-            name: "Hannyabal's Great Ambition",
+            name: 'Hannyabal\'s Great Ambition',
             thumb: 929,
             global: true,
             gamewith: 24198,
             condition: 'You can only bring STR units',
-            "All Difficulties": [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506, -1115 ]
+            'All Difficulties': [ 928, 930, 931, -752, -758, -520, -729, -733, -787, -930, -544, -506, -1115 ]
         },
         
         {
-            name: "Encounter! Whitebeard Pirates",
+            name: 'Encounter! Whitebeard Pirates',
             thumb: 946,
             global: true,
             gamewith: 25000,
-            condition: "You can only bring PSY units",
-            "Japan": [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738, -1173 ],
-            "Global": [ 946, 947, 948, 949, -718, -524, -1119, -528, -1177, -526, -793, -735, -546, -738, -1173 ]
+            condition: 'You can only bring PSY units',
+            'Japan': [ 946, 947, 948, 949, -718, -750, -760, -526, -793, -735, -546, -738, -1173 ],
+            'Global': [ 946, 947, 948, 949, -718, -524, -1119, -528, -1177, -526, -793, -735, -546, -738, -1173 ]
         },
         
         {
-            name: "Clash! Whitebeard Pirates",
+            name: 'Clash! Whitebeard Pirates',
             thumb: 979,
             global: true,
             gamewith: 25750,
-            condition: "You can only bring INT units",
+            condition: 'You can only bring INT units',
             challenge: 'High Score calculated with Crew Cost, Turns Taken and Tap Accuracy',
             challengeData: [['150,000','1x Blue Elder'],['420,000','1x HP Cotton Candy, 1x Rainbow Gem'],['700,000','2x Rainbow Gems, 1x Orb Forbidden Tome']],
-            "Japan": [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563, -1119 ],
-            "Global": [ 979, 980, 981, 949, -459, -838, -842, -560, -789, -736, -731, -563, -1212 ]
+            'Japan': [ 979, 980, 981, 949, -459, -838, -842, -524, -789, -736, -731, -563, -1119 ],
+            'Global': [ 979, 980, 981, 949, -459, -838, -842, -560, -789, -736, -731, -563, -1212 ]
         },
         
         {
-            name: "Let's Find Our Captain! Heart Pirates!",
-            condition: "You can only bring QCK units",
+            name: 'Let\'s Find Our Captain! Heart Pirates!',
+            condition: 'You can only bring QCK units',
             thumb: 1003,
             global: true,
             gamewith: 26908,
-            "All Difficulties": [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564, -1208 ]
+            'All Difficulties': [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564, -1208 ]
         },
         
         {
-            name: "Rare Animal Island's Count Butler",
+            name: 'Butler and Strange Animal Island',
             thumb: 1011,
-            condition: "None",
+            condition: 'None',
             global: true,
             gamewith: 27631,
-            "Global": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -1550, -812, -565 ],
-            "Japan": [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -1550, -812, -565, -1212 ]
+            'Global': [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -1550, -812, -565 ],
+            'Japan': [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -1550, -812, -565, -1212 ]
         },
         
         {
-            name: "Temptation!? The Queen of Kamabakka Queendom!",
+            name: 'The Queen of Kamabakka Queendom!',
             thumb: 1037,
             global: true,
             gamewith: 29442,
-            condition: "Only DEX/RCV/TND orbs will appear",
-            "All Dificulties": [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566, -1175 ]
+            condition: 'Only DEX/RCV/TND orbs will appear',
+            'All Dificulties': [ 1036, 1038, -874, -876, -878, -554, -813, -814, -566, -1175 ]
         },
         
         {
-            name: "The One Who Seeks the Truth of History: Archaeologist Nico Olvia",
+            name: 'Archaeologist Nico Olvia',
             thumb: 1049,
             global: true,
             gamewith: 29912,
-            condition: "Only TND/RCV/INT orbs will appear",
-            "All Difficulties": [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908, -1210 ]
+            condition: 'Only TND/RCV/INT orbs will appear',
+            'All Difficulties': [ 1048, 1050, 1052, -556, -567, -586, -614, -816, -870, -872, -908, -1210 ]
         },
         
         {
-            name: "Pirate Ship Competition! \"Dead End\" Opens!",
+            name: 'Dead End Begins! Raging Blast!',
             thumb: 1072,
             global: true,
             gamewith: 30767,
-            //OLD condition: "STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x",
-            condition: "STR/DEX/QCK units get their ATK boosted by 1.6x. INT/PSY units get their HP boosted by 2.0x",
-            "All Difficulties": [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888, -1070]
+            //OLD condition: 'STR/DEX/QCK units get their ATK boosted by 1.6x and their HP reduced by 90%. INT/PSY units get their ATK reduced by 80% and their HP boosted by 2.0x',
+            condition: 'STR/DEX/QCK units get their ATK boosted by 1.6x. INT/PSY units get their HP boosted by 2.0x',
+            'All Difficulties': [ 1069, 1071, 1073, -562, -906, -914, -645, -890, -587, -629, -888, -1070]
         },
         
         {
-            name: "Dr. Indigo & Scarlet!",
+            name: 'Golden Lion Pirates\' Attack!',
             thumb: 1095,
             global: true,
             gamewith: 33039,
-            //OLD condition: "Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
-            condition: "Boosts ATK of Driven characters by 2x and boosts HP for Powerhouse characters by 2x.",
-            "All Difficulties": [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
+            //OLD condition: 'Boosts ATK of Driven and Powerhouse characters by 2x, other classes get .5x ATK. Boosts HP of Slasher and Fighter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)',
+            condition: 'Boosts ATK of Driven characters by 2x and boosts HP for Powerhouse characters by 2x.',
+            'All Difficulties': [ 1094, 1096, 1098, -649, -910, -647, -891, -590, -611, -893, -1098, -912]
         },
         
         {
-            name: "Robin and Nami's Secret Undercover Investigation",
+            name: 'Robin and Nami\'s Secret Undercover Investigation',
             thumb: 1112,
             global: true,
             gamewith: 33849,
-            condition: "Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)",
-            "All Difficulties": [ 1109, 1111, 1113, -23, -628, -639, -641, -892, -937, -939, -941 ]
+            condition: 'Boosts ATK of Cerebral and Free Spirit characters by 2x, other classes get .5x ATK. Boosts HP of Striker and Shooter characters by 2x, other classes get .5x HP. (This STACKS for characters with multiple classes)',
+            'All Difficulties': [ 1109, 1111, 1113, -23, -628, -639, -641, -892, -937, -939, -941 ]
         },
         
         {
-            name: "Behind the Scenes Intelligency Agency, CP9",
+            name: 'Behind the Scenes Intelligency Agency: CP9',
             thumb: 1137,
             global: true,
             gamewith: 34515,
-            condition: "Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear",
-            "All Difficulties": [ 1136, 1137, 1138, 1139, -935, -643, -673, -894, -943, -995, -615, -705, -704 ]
+            condition: 'Only [STR], [QCK], [DEX], [INT], and [PSY] orbs appear',
+            'All Difficulties': [ 1136, 1137, 1138, 1139, -935, -643, -673, -894, -943, -995, -615, -705, -704 ]
         },
         
         {
-            name: "Welcome To The Gran Tesoro!",
+            name: 'Welcome To The Gran Tesoro!',
             thumb: 1167,
             global: true,
             gamewith: 35095,
-            condition: "None",
-            "All Difficulties": [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703, -1121 ]
+            condition: 'None',
+            'All Difficulties': [ 1166, 1168, 1170, -578, -999, -991, -993, -675, -508, -616, -703, -1121 ]
         },
         
         {
-            name: "Rumbar Pirates!",
+            name: 'Rumbar Pirates!',
             thumb: 1203,
             global: true,
             gamewith: 35905,
-            condition: "'Musical' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)",
-            "All Difficulties": [ 1202, 1204, 1206, -1001, -997, -558, -1208, -677, -896, -1551, -631, -954, -1206, -617, -1027 ]
+            condition: '\'Musical\' units get their stats boosted by 1.5x (Dancers, Singers, Playing an instrument, etc)',
+            'All Difficulties': [ 1202, 1204, 1206, -1001, -997, -558, -1208, -677, -896, -1551, -631, -954, -1206, -617, -1027 ]
         },
         
         {
-            name: "World Pirates!",
+            name: 'World Pirates!',
             thumb: 1215,
             global: true,
             gamewith: 36738,
-            condition: "Total Crew Cost must be lower than 180 (Including friend captain)",
-            "All Difficulties": [ 1215, 1216, 1217, 1218, -1025, -1029, -1033, -671, -956, -964, -633, -504, -1218 ]
+            condition: 'Total Crew Cost must be lower than 180 (Including friend captain)',
+            'All Difficulties': [ 1215, 1216, 1217, 1218, -1025, -1029, -1033, -671, -956, -964, -633, -504, -1218 ]
         },
         
         {
-            name: "Revolutionary Armed Forces!",
+            name: 'Revealing the Truth!',
             thumb: 1242,
             global: true,
             gamewith: 37425,
-            condition: "Free Spirit Characters have their cooldowns reduced by 10 turns at the start of the fight",
-            "All Difficulties": [ 1241, 1243, -1035, -965, -1031, -1081, -754, -966, -502, -707, -955 ]
+            condition: 'Free Spirit Characters have their cooldowns reduced by 10 turns at the start of the fight',
+            'All Difficulties': [ 1241, 1243, -1035, -965, -1031, -1081, -754, -966, -502, -707, -955 ]
         },
         
         {
-            name: "Gather! Whitebeard Alliance",
+            name: 'Gather! Whitebeard Alliance',
             thumb: 1254,
             global: true,
             gamewith: 38336,
-            condition: "Driven Characters have their cooldowns reduced by 10 turns at the start of the fight",
-            "All Difficulties": [ 1254, 1255, 1256, -669, -1492, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
+            condition: 'Driven Characters have their cooldowns reduced by 10 turns at the start of the fight',
+            'All Difficulties': [ 1254, 1255, 1256, -669, -1492, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },
         
         {
-            name: "Young Donquixote Pirates - Baby 5 And Buffalo",
+            name: 'Young Donquixote Pirates - Baby 5 And Buffalo',
             thumb: 1287,
             global: true,
             gamewith: 39522,
-            condition: "Child-like characters get their ATK and HP boosted by 3.5x, RCV by 1.5x, and cooldowns reduced by 7 turns at the start of the fight",
-            "All Difficulties": [ 1286, 1288, 1290, -963, -1045, -251, -760, -1083, -1129, -506, -1062, -702 ]
+            condition: 'Child-like characters get their ATK and HP boosted by 3.5x, RCV by 1.5x, and cooldowns reduced by 7 turns at the start of the fight',
+            'All Difficulties': [ 1286, 1288, 1290, -963, -1045, -251, -760, -1083, -1129, -506, -1062, -702 ]
         },
         
         {
-            name: "Jailbreak Battle! Mr. 3 and Buggy",
+            name: 'Jailbreak Battle! Mr. 3 and Buggy',
             thumb: 1304,
             global: true,
             gamewith: 41928,
-            condition: "Shooter and Fighter characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
-            "All Difficulties": [ 1301, 1303, 1152, 1151, 551, 539, -718, -752, -1125, -1133, -15, -203, -733, -1056, -1060 ]
+            condition: 'Shooter and Fighter characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)',
+            'All Difficulties': [ 1301, 1303, 1152, 1151, 551, 539, -718, -752, -1125, -1133, -15, -203, -733, -1056, -1060 ]
         },
         
         {
-            name: "Tontatta Kingdom Island Part 1: Leo",
+            name: 'Tontatta Tribe: Catch the Big Person!',
             thumb: 1328,
             global: true,
             gamewith: 44164,
-            condition: "Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)",
-            "All Difficulties": [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508, -1387 ]
+            condition: 'Slasher characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (75% on 30 stamina)',
+            'All Difficulties': [ 1327, 1329, 1330, -1085, -1127, -1131, -1058, -758, -760, -735, -4, -508, -1387 ]
         },
         
         {
-            name: "Tontatta Kingdom Island Part 2: Mansherry",
+            name: 'Tontatta Tribe: Find the Beloved Prince?!',
             thumb: 1332,
             global: true,
             gamewith: 44747,
-            condition: "Striker characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (70% on 30 stamina)",
-            "All Difficulties": [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
+            condition: 'Striker characters are Silenced for 99 turns and have their ATK reduced by a variable amount. (70% on 30 stamina)',
+            'All Difficulties': [ 1331, 1333, 1334, -720, -1186, -1190, -756, -1188, -1151, -1153, -738 ]
         },
         
         {
-            name: "Big Mom Pirates!",
+            name: 'Gather the Candy!',
             thumb: 1357,
             gamewith: 45801,
-            "All Difficulties": [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610, -1388 ]
+            'All Difficulties': [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610, -1388 ]
         },
         
         {
-            name: "Soldier-san's Training!",
+            name: 'Become Strong to be Happy!',
             thumb: 1384,
             gamewith: 46658,
-            "All Difficulties": [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739, -1550 ]
+            'All Difficulties': [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739, -1550 ]
         },
         
         {
-            name: "Shambles! Tashigi and Smoker?!?",
+            name: 'Shambles! Tashigi and Smoker?!?',
             thumb: 1397,
             gamewith: 47247,
-            condition: "Your captain will be switched with your middle right character when you encounter Law.",
-            "All Difficulties": [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
+            condition: 'Your captain will be switched with your middle right character when you encounter Law.',
+            'All Difficulties': [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
         },
         
         {
-            name: "Marines! Sengoku the Fleet Admiral!",
+            name: 'Marines! Sengoku the Fleet Admiral!',
             thumb: 1416,
             gamewith: 48079,
-            condition: "You can only bring INT units",
-            "All Difficulties": [ 1415, 1417, 1418, -1418, -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
+            condition: 'You can only bring INT units',
+            'All Difficulties': [ 1415, 1417, 1418, -1418, -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
         },
         
         {
-            name: "Chinjao Family! The 13th Leader Appears!",
+            name: 'Chinjao Family!',
             thumb: 1426,
             gamewith: 49862,
-            condition: "You can only bring DEX units",
-            "All Difficulties": [ 1425, 1427, 1428, -1240, -1272, -1270, -1227, -1224, -872, -878, -255, -812 ]
+            condition: 'You can only bring DEX units',
+            'All Difficulties': [ 1425, 1427, 1428, -1240, -1272, -1270, -1227, -1224, -872, -878, -255, -812 ]
         },
         
         {
-            name: "Fugitive of Love and Passion!!",
+            name: 'Fugitive of Love and Passion!!',
             thumb: 1450,
             gamewith: 50895,
-            condition: "You can only bring STR units",
-            "All Difficulties": [ 1449, 1451, -935, -1278, -1318, -1324, -880, -876, -259, -1226, -814 ]
+            condition: 'You can only bring STR units',
+            'All Difficulties': [ 1449, 1451, -935, -1278, -1318, -1324, -880, -876, -259, -1226, -814 ]
         },
         
         {
-            name: "Gatekeeper of the New World! Stop the Rookies!",
+            name: 'Gatekeeper of the New World!',
             thumb: 1469,
             gamewith: 51926,
-            condition: "You can only bring QCK units",
-            "All Difficulties": [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470, -1320 ]
+            condition: 'You can only bring QCK units',
+            'All Difficulties': [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470, -1320 ]
         },
         
         {
-            name: "Exit! Whitebeard Pirates",
+            name: 'Departure! Whitebeard Pirates',
             thumb: 1509,
             gamewith: 52629,
-            condition: "You can only bring PSY units",
-            "All Difficulties": [ 1509, 1510, 1511, 1512, -1001, -1316, -1280, -314, -908, -16, -1446, -1370, -1368, -816 ],
+            condition: 'You can only bring PSY units',
+            'All Difficulties': [ 1509, 1510, 1511, 1512, -1001, -1316, -1280, -314, -908, -16, -1446, -1370, -1368, -816 ],
         },
         
         {
-            name: "Dadan Family! Encounter with the Mountain Bandits",
+            name: 'Bandits! Dadan Family!',
             thumb: 1520,
             gamewith: 53569,
-            "All Difficulties": [ 1519, 1521, 1522, -1314, -1366, -1364, -912, -937, -316, -1281, -891, -22, -1448 ],
+            'All Difficulties': [ 1519, 1521, 1522, -1314, -1366, -1364, -912, -937, -316, -1281, -891, -22, -1448 ],
         },
         
         {
-            name: "Soul King! Farewell Tour Concert",
+            name: 'Encourage the Soul!',
             thumb: 1547,
             gamewith: 54302,
-            condition: "Strawhat Pirates get ATK, HP, and RCV boosted by 1.5x and reduces cooldown of specials by 9 turns at the start of the fight",
-            "All Difficulties": [ 1546, 1548, -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
+            condition: 'Strawhat Pirates get ATK, HP, and RCV boosted by 1.5x and reduces cooldown of specials by 9 turns at the start of the fight',
+            'All Difficulties': [ 1546, 1548, -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
         },
         
         {
-            name: "Prodence Kingdom!",
+            name: 'Fight for your Friends!',
             thumb: 1564,
             gamewith: 55145,
-            condition: "Elizabello will kill you with one punch",
-            "All Difficulties": [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
+            condition: 'Elizabello will kill you with one punch',
+            'All Difficulties': [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
         },
         
         {
-            name: "Punk Hazard!",
+            name: 'The Mysterious Warlord!',
             thumb: 1581,
             gamewith: 56038,
-            "All Difficulties": [ 1580, 1582, -1391, -1444, -1436, -1551, -896, -910, -357, -995, -890, -1342 ],
+            'All Difficulties': [ 1580, 1582, -1391, -1444, -1436, -1551, -896, -910, -357, -995, -890, -1342 ],
         },
         
         {
-            name: "Fishman Island! The Royal Family!",
+            name: 'Targeted Mermaid Princess!',
             thumb: 1597,
             gamewith: 57039,
-            "All Difficulties": [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1438, -1440, -893, -1343 ],
+            'All Difficulties': [ 1596, 1598, 1599, -1045, -359, -999, -1033, -1550, -739, -1438, -1440, -893, -1343 ],
         },
         
         {
-            name: "Blackbeard Pirates!",
+            name: 'The Dark Path of the Blackbeard Pirates!',
             thumb: 1606,
             gamewith: 57820,
-            "All Difficulties": [ 1606, 1607, 1608, -1404, -1593, -1481, -1442, -1029, -361, -363, -997, -894, -1344 ],
+            'All Difficulties': [ 1606, 1607, 1608, -1404, -1593, -1481, -1442, -1029, -361, -363, -997, -894, -1344 ],
         },
         
         {
-            name: "New Fishman Pirates!",
+            name: 'The Time of Revenge has Come! New Fishman Pirates!',
             thumb: 1624,
             gamewith: 59321,
-            "All Difficulties": [ 1624, 1625, 1626, -1434, -1477, -1475, -410, -365, -993, -1031, -954, -1347 ],
+            'All Difficulties': [ 1624, 1625, 1626, -1434, -1477, -1475, -410, -365, -993, -1031, -954, -1347 ],
         },
         
         {
-            name: "The Two Artists! Giolla and Brook!",
+            name: 'Seeking The Best Art! Giolla and Brook!',
             thumb: 1649,
             gamewith: 60685,
-            condition: "You must have at least one character of each type on your team: STR, DEX, QCK, PSY, and INT.",
-            "All Difficulties": [ 1648, 1650, -1473, -1483, -412, -414, -1075, -1027, -1348, -956 ],
+            condition: 'You must have at least one character of each type on your team: STR, DEX, QCK, PSY, and INT.',
+            'All Difficulties': [ 1648, 1650, -1473, -1483, -412, -414, -1075, -1027, -1348, -956 ],
+        },
+        
+        {
+            name: 'Open the Cafe!',
+            thumb: 1670,
+            gamewith: null,
+            'All Difficulties': [ 1670, 1671, 1672, -1085, -451, -457, -1081, -1353, -1540, -1345, -955, -1350 ],
         },
         
     ],
@@ -1637,9 +1646,9 @@ window.drops = {
         },
 
         {
-            name: 'Clash Reformed!! Doflamingo',
+            name: 'Clash Neo!! Doflamingo',
             thumb: 1623,
-            condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Striker/Cerebral/Fighter Only. Ultimate: Striker Only, Cerebral Only, and Fighter Only",
+            condition: '1 Master version and 3 different Ultimate versions with different conditions. Master: Striker/Cerebral/Fighter Only. Ultimate: Striker Only, Cerebral Only, and Fighter Only',
             gamewith: 58437,
             Ultimate: [ 1622 ],
             Master: [ 1622 ]
@@ -1685,9 +1694,9 @@ window.drops = {
         },
 
         {
-            name: 'Clash Reformed!! Aokiji',
+            name: 'Clash Neo!! Aokiji',
             thumb: 1669,
-            condition: "1 Master version and 3 different Ultimate versions with different conditions. Master: Free Spirit/Shooter/Striker Only. Ultimate: Free Spirit Only, Shooter Only, and Striker Only",
+            condition: '1 Master version and 3 different Ultimate versions with different conditions. Master: Free Spirit/Shooter/Striker Only. Ultimate: Free Spirit Only, Shooter Only, and Striker Only',
             gamewith: 61262,
             Ultimate: [ 86, 112, 118, 302, 1668 ],
             Master: [ 112, 118, 1668 ]
@@ -1699,7 +1708,7 @@ window.drops = {
             global: true,
             gamewith: 13682,
             teamDatabase: 'raid_bosses/11',
-            condition: "Take 300 damage per character in Environmental Lightning Damage every 3 turns",
+            condition: 'Take 300 damage per character in Environmental Lightning Damage every 3 turns',
             Ultimate: [ 85, 111, 118, 301, 602 ],
             Master: [ 85, 111, 118, 602 ] ,
             Expert: [ 111, 118, 602 ]
@@ -1731,7 +1740,7 @@ window.drops = {
             global: true,
             gamewith: 18565,
             teamDatabase: 'raid_bosses/28',
-            condition: "Take 10% current Health in Environmental Damage every 2 turns",
+            condition: 'Take 10% current Health in Environmental Damage every 2 turns',
             Master: [ 794 ],
             Expert: [ 794 ]
         },
@@ -1768,10 +1777,10 @@ window.drops = {
         },
         
         {
-            name: 'Clash Reformed!! Pica',
+            name: 'Clash Neo!! Pica',
             thumb: 1647,
             gamewith: 60095,
-            condition: "1 Expert version and 3 different Master versions with different conditions. Master: Powerhouse/Driven/Slasher Only. Ultimate: Powerhouse Only, Driven Only, and Slasher Only",
+            condition: '1 Expert version and 3 different Master versions with different conditions. Master: Powerhouse/Driven/Slasher Only. Ultimate: Powerhouse Only, Driven Only, and Slasher Only',
             Master: [ 1646 ],
             Expert: [ 1646 ]
         },
@@ -1839,7 +1848,7 @@ window.drops = {
         {
             name: 'Clash!! Warden Magellan',
             thumb: 1374,
-            condition: "Take 7% MAX Health in Environmental Damage",
+            condition: 'Take 7% MAX Health in Environmental Damage',
             gamewith: 45906,
             Master: [ 1373 ],
             Expert: [ 1373 ],
@@ -1884,7 +1893,7 @@ window.drops = {
         {
             name: 'Ace Training Ground',
             thumb: 1605,
-            "All Difficulties": [ 1604 ],
+            'All Difficulties': [ 1604 ],
         },
 
         {
@@ -1893,7 +1902,7 @@ window.drops = {
             global: true,
             challenge:'Total number of hits above 50,000',
             challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Bind Resistance Forbidden Tome, 2x Rainbow Gems']],
-            "All Difficulties": [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8, -1388 ]
+            'All Difficulties': [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8, -1388 ]
         },
 
         {
@@ -1903,41 +1912,41 @@ window.drops = {
             gamewith: 15440,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['Japan Rewards', ''],['10 Times','#686 Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems'], ['Global Rewards', ''],['10 Times','1x Bind Resistance Forbidden Tome, 1x Despair Resistance Forbidden Tome, 1x Auto-Heal Forbidden Tome, 1x Rainbow Gem'],['35 Times','1x Red Elder Turtle, 1x Blue Elder Turtle, 1x Green Elder Turtle, 1x Yellow Elder Turtle, 1x Black Elder Turtle, 2x Rainbow Gems'],['72 Times','5x Rainbow Gems']],
-            "All Difficulties": [ 659, 680, 682, 684, 1200, 1198 ]
+            'All Difficulties': [ 659, 680, 682, 684, 1200, 1198 ]
         },
         
         {
             name: 'Halloween Event Characters',
             thumb: 1300,
-            "All Difficulties": [ 1299, 1305, 1325 ],
+            'All Difficulties': [ 1299, 1305, 1325 ],
         },
         
         {
             name: 'Valentines Day and White Day Characters',
             thumb: 1463,
             gamewith: 51651,
-            "Luffy": [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Chopper": [ 1464, 1155, 333, 728, 334, 1061, 346, 193, 109, 114, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Sanji": [ 1507, 52, 207, 892, 343, 190, 111, 106, 115, 116, 117, 1180, 266, 94, 83 ],
-            "Brook": [ 1515, 954, 614, 379, 730, 342, 189, 110, 105, 115, 116, 117, 1180, 266, 94, 83 ],
+            'Luffy': [ 1462, 29, 563, 1059, 345, 192, 113, 108, 115, 116, 117, 1180, 266, 94, 83 ],
+            'Chopper': [ 1464, 1155, 333, 728, 334, 1061, 346, 193, 109, 114, 115, 116, 117, 1180, 266, 94, 83 ],
+            'Sanji': [ 1507, 52, 207, 892, 343, 190, 111, 106, 115, 116, 117, 1180, 266, 94, 83 ],
+            'Brook': [ 1515, 954, 614, 379, 730, 342, 189, 110, 105, 115, 116, 117, 1180, 266, 94, 83 ],
         },
 
         {
             name: 'Straw Hat Pirates!',
             thumb: 1387,
-            "All Difficulties": [ 2, 5, 9, 13, 17, 21, 708, 629, 895 ],
+            'All Difficulties': [ 2, 5, 9, 13, 17, 21, 708, 629, 895 ],
         },
         
         {
             name: '2nd Anniversary Celebration! Duel! Ace',
             thumb: 1023,
-            "All Difficulties": [ 1023 ]
+            'All Difficulties': [ 1023 ]
         },
         
         {
             name: '3nd Anniversary Celebration! Duel! Luffy',
             thumb: 1600,
-            "30 Stamina": [ 1600 ]
+            '30 Stamina': [ 1600 ]
         },
 
         {
@@ -1955,33 +1964,33 @@ window.drops = {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
             global: true,
-            condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "Characters": [ 927, 296, 299, 773, 774, 1224 ],
-            "Boosters and Evolvers": [ 351, 193, 114, 266, 83, 118 ],
-            "Global": [ -261, -1413, -562, -720, -8, -1388, -219, -75, -255, -314, -316, -357, -410, -408, -449, -451, -455, -641, -643, -754, -760, -840, -880, -906, -910, -999, -554, -1175, -528, -1177, -560, -1212, -1245, -218, -22, -1448, -24, -204, -384, -504, -508, -785, -789 ],
-            "Japan": [ -261, -562, -720, -748, -935, -1413 ]
+            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.',
+            'Characters': [ 927, 296, 299, 773, 774, 1224 ],
+            'Boosters and Evolvers': [ 351, 193, 114, 266, 83, 118 ],
+            'Global': [ -261, -1413, -562, -720, -8, -1388, -219, -75, -255, -314, -316, -357, -410, -408, -449, -451, -455, -641, -643, -754, -760, -840, -880, -906, -910, -999, -554, -1175, -528, -1177, -560, -1212, -1245, -218, -22, -1448, -24, -204, -384, -504, -508, -785, -789 ],
+            'Japan': [ -261, -562, -720, -748, -935, -1413 ]
         },
         
         {
             name: 'Rescue Ace Event - Aokiji',
             thumb: 1280,
             global: true,
-            condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "Characters": [ 67, 69, 262, 264, 298 ],
-            "Boosters and Evolvers": [ 113, 192, 350, 266, 83, 118 ],
-            "Global": [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1550, -1445 ],
-            "Japan": [ -416, -459, -530, -669, -1492, -578, -1121, -1445 ]
+            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.',
+            'Characters': [ 67, 69, 262, 264, 298 ],
+            'Boosters and Evolvers': [ 113, 192, 350, 266, 83, 118 ],
+            'Global': [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1550, -1445 ],
+            'Japan': [ -416, -459, -530, -669, -1492, -578, -1121, -1445 ]
         },
         
         {
             name: 'Rescue Ace Event - Kizaru',
             thumb: 1228,
             global: true,
-            condition: "10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.",
-            "Characters": [ 968, 969, 970, 971, 972, 231, 775, 1223, 49, 43 ],
-            "Boosters and Evolvers": [ 112, 191, 349, 266, 83, 118 ],
-            "Global": [ -367, -649, -718, -16, -1446, -20, -1447, -73, -251, -257, -308, -359, -365, -412, -457, -639, -750, -758, -912, -914, -941, -993, -522, -1117, -526, -1173, -556, -1210, -1245, -223, -15, -23, -25, -200, -225, -546, -500, -506, -569, -791, -793 ],
-            "Japan": [ -367, -649, -718, -870, -1001 ]
+            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.',
+            'Characters': [ 968, 969, 970, 971, 972, 231, 775, 1223, 49, 43 ],
+            'Boosters and Evolvers': [ 112, 191, 349, 266, 83, 118 ],
+            'Global': [ -367, -649, -718, -16, -1446, -20, -1447, -73, -251, -257, -308, -359, -365, -412, -457, -639, -750, -758, -912, -914, -941, -993, -522, -1117, -526, -1173, -556, -1210, -1245, -223, -15, -23, -25, -200, -225, -546, -500, -506, -569, -791, -793 ],
+            'Japan': [ -367, -649, -718, -870, -1001 ]
         },
         
         {
@@ -1989,8 +1998,8 @@ window.drops = {
             thumb: 1258,
             global: true,
             gamewith: 38237,
-            condition: "Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.",
-            "All Difficulties": [ 1257 ]
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.',
+            'All Difficulties': [ 1257 ]
         },
         
         {
@@ -1998,32 +2007,32 @@ window.drops = {
             thumb: 1380,
             global: true,
             gamewith: 46369,
-            condition: "Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks.",
-            "All Difficulties": [ 1379, 952, 776 ]
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks.',
+            'All Difficulties': [ 1379, 952, 776 ]
         },
         
         {
             name: 'Invasion! Cavendish',
             thumb: 1530,
             gamewith: 53621,
-            condition: "Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.",
-            "All Difficulties": [ 1529 ]
+            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.',
+            'All Difficulties': [ 1529 ]
         },
         
         {
             name: 'The Flashback Before the Reunion! Fight all your Enemies!',
             thumb: 1353,
             global: true,
-            condition: "The fight gets more difficult every time you complete it until it gets to 40 stamina. You an only beat the first 7 stages once, but you can challenge the 8th stage multiple times and it has randomly selected stages.",
-            "1st Stage": [ 27, 29, 35, 36, 37, 38, 43, 35, 53, 55, 57, 61, 62, 63, 65 ],
-            "2nd Stage": [ 71, 211, 233, 235, 199, 201, 203, 205, 395, 397, 207, 399, 401, 383 ],
-            "3rd Stage": [ 430, 432, 463, 467, 542, 464, 465, 541, 545 ],
-            "4th Stage": [ 630, 632, 706, 728, 730, 732, 734, 738 ],
-            "5th Stage": [ 813, 891, 892, 889, 893, 815, 425, 387 ],
-            "6th Stage": [ 963, 966, 967, 973, 1059, 1055, 1057, 1156, 1158 ],
-            "7th Stage": [ 1224, 1223, 1225, 1226, 1227, 1282, 1281, 1280, 1228, 1283 ],
-            "8th Stage": [ 37, 38, 53, 55, 43, 36, 45, 57, 65, 203, 205, 383, 395, 397, 399, 401, 464, 465, 541, 545, 630, 632, 728, 730, 815, 889, 893, 973, 1055, 1057, 1158, 1156, 1227, 1228, 1280, 1283, 1353 ],
-            "Evolvers and Boosters": [ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 115, 116, 117, 118, 266, 300, 301, 302, 303, 304, 1180, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 189, 190, 191, 192, 193, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351 ]
+            condition: 'The fight gets more difficult every time you complete it until it gets to 40 stamina. You an only beat the first 7 stages once, but you can challenge the 8th stage multiple times and it has randomly selected stages.',
+            '1st Stage': [ 27, 29, 35, 36, 37, 38, 43, 35, 53, 55, 57, 61, 62, 63, 65 ],
+            '2nd Stage': [ 71, 211, 233, 235, 199, 201, 203, 205, 395, 397, 207, 399, 401, 383 ],
+            '3rd Stage': [ 430, 432, 463, 467, 542, 464, 465, 541, 545 ],
+            '4th Stage': [ 630, 632, 706, 728, 730, 732, 734, 738 ],
+            '5th Stage': [ 813, 891, 892, 889, 893, 815, 425, 387 ],
+            '6th Stage': [ 963, 966, 967, 973, 1059, 1055, 1057, 1156, 1158 ],
+            '7th Stage': [ 1224, 1223, 1225, 1226, 1227, 1282, 1281, 1280, 1228, 1283 ],
+            '8th Stage': [ 37, 38, 53, 55, 43, 36, 45, 57, 65, 203, 205, 383, 395, 397, 399, 401, 464, 465, 541, 545, 630, 632, 728, 730, 815, 889, 893, 973, 1055, 1057, 1158, 1156, 1227, 1228, 1280, 1283, 1353 ],
+            'Evolvers and Boosters': [ 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 115, 116, 117, 118, 266, 300, 301, 302, 303, 304, 1180, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 189, 190, 191, 192, 193, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351 ]
         },
         
         {
@@ -2031,32 +2040,32 @@ window.drops = {
             thumb: 1588,
             gamewith: 56742,
             showManual: true,
-            condition: "High chance of dropping 6* skillbooks. Only Evolvers and Booster characters will drop posters.",
-            "Black Clad Shanks": [ 301, 101, 96, 79, 90, 348, -530, -316, -910, -995, -1236, -1364, -465, -590, -967, -813, -888 ],
-            "Donquixote Doflamingo": [ 304, 104, 88, 99, 82, 93, 351, -870, -312, -645, -838, -876, -880, -1190, -396, -586, -631, -567 ],
-            "Trafalgar Law": [ 300, 100, 84, 95, 78, 89, 347, -964, -1045, -219, -308, -675, -991, -1077, -504, -1159, -212, -892 ],
-            "Black Clad Ace": [ 302, 102, 86, 97, 80, 91, 349, -562, -310, -359, -941, -560, -1212, -1406, -789, -966, -432, -565, -566 ],
-            "Cavendish": [ 303, 103, 87, 98, 81, 92, 350, -963, -1123, -217, -914, -1029, -1127, -1408, -202, -464, -1227, -705 ],
-            "Blackbeard": [ 304, 104, 88, 99, 82, 93, 351, -1268, -75, -733, -1033, -1082, -1230, -1278, -569, -1061, -52, -335 ],
-            "Crocodile": [ 302, 102, 86, 97, 80, 91, 349, -720, -410, -908, -1208, -558, -1234, -1366, -544, -731, -236, -814, -1224 ],
-            "Log Luffy": [ 300, 100, 84, 95, 78, 89, 347, -1121, -578, -1075, -1131, -1133, -1115, -520, -1177, -528, -1387, -4, -816, -426, -542, -563 ],
-            "Corazon": [ 303, 103, 87, 98, 81, 92, 350, -1001, -451, -878, -1079, -1183, -1316, -1446, -16, -223, -327, -628, -614 ],
-            "Kuzan": [ 301, 101, 96, 79, 90, 348, -1192, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
-            "Issho": [ 301, 101, 96, 79, 90, 348, -1085, -965, -414, -457, -999, -1270, -218, -15, -785, -1228, -467 ],
-            "Dracule Mihawk": [ 303, 103, 87, 98, 81, 92, 350, -718, -639, -846, -906, -1129, -1238, -1322, -463, -729, -791, -215 ],
-            "Sabo": [ 304, 104, 88, 99, 82, 93, 351, -669, -874, -937, -1027, -1119, -524, -1318, -216, -332, -502, -737, -1062 ],
-            "Rayleigh": [ 300, 100, 84, 95, 78, 89, 347, -367, -210, -894, -997, -1389, -12, -1412, -208, -431, -544, -954, -1151 ],
-            "Jinbei": [ 302, 102, 86, 97, 80, 91, 349, -935, -408, -641, -671, -673, -1187, -1274, -1368, -333, -704, -956 ],
-            "Sakazuki": [ 303, 103, 87, 98, 81, 92, 350, -1314, -73, -259, -412, -455, -647, -1324, -292, -329, -1283, -955 ],
-            "Rob Lucci": [ 300, 100, 84, 95, 78, 89, 347, -748, -314, -756, -912, -1238, -1447, -20, -633, -787, -731, -427, -1279 ],
-            "Sengoku": [ 304, 104, 88, 99, 82, 93, 351, -459, -453, -1117, -522, -1186, -1175, -554, -1549, -709, -400, -500, -974, -1152, -1153 ],
-            "Whitebeard": [ 302, 102, 86, 97, 80, 91, 349, -261, -1413, -361, -363, -752, -872, -939, -204, -1280, -564, -701, -1154 ],
-            "Marco": [ 301, 101, 96, 79, 90, 348, -649, -251, -750, -842, -993, -1173, -508, -631, -378, -891, -1226 ],
-            "Zoro": [ 301, 101, 96, 79, 90, 348, -1362, -844, -1081, -1125, -1410, -546, -1282, -234, -812, -47 ],
-            "Boa Hancock": [ 303, 103, 87, 98, 81, 92, 350, -416, -1445, -253, -677, -1320, -1448, -22, -402, -506, -588, -893, -1157, -702 ],
-            "Bartolomeo": [ 304, 104, 88, 99, 82, 93, 351, -1035, -221, -357, -643, -840, -1025, -1029, -225, -541, -733, -1056 ],
-            "Borsalino": [ 302, 102, 86, 97, 80, 91, 349, -1240, -77, -257, -760, -943, -1272, -1551, -896, -398, -793, -1058, -59 ],
-            "Captain Buggy": [ 300, 100, 84, 95, 78, 89, 347, -1391, -1031, -1232, -1276, -1550, -739, -214, -707, -735, -890, -1318, -290 ],
+            condition: 'High chance of dropping 6* skillbooks. Only Evolvers and Booster characters will drop posters.',
+            'Black Clad Shanks': [ 301, 101, 96, 79, 90, 348, -530, -316, -910, -995, -1236, -1364, -465, -590, -967, -813, -888 ],
+            'Donquixote Doflamingo': [ 304, 104, 88, 99, 82, 93, 351, -870, -312, -645, -838, -876, -880, -1190, -396, -586, -631, -567 ],
+            'Trafalgar Law': [ 300, 100, 84, 95, 78, 89, 347, -964, -1045, -219, -308, -675, -991, -1077, -504, -1159, -212, -892 ],
+            'Black Clad Ace': [ 302, 102, 86, 97, 80, 91, 349, -562, -310, -359, -941, -560, -1212, -1406, -789, -966, -432, -565, -566 ],
+            'Cavendish': [ 303, 103, 87, 98, 81, 92, 350, -963, -1123, -217, -914, -1029, -1127, -1408, -202, -464, -1227, -705 ],
+            'Blackbeard': [ 304, 104, 88, 99, 82, 93, 351, -1268, -75, -733, -1033, -1082, -1230, -1278, -569, -1061, -52, -335 ],
+            'Crocodile': [ 302, 102, 86, 97, 80, 91, 349, -720, -410, -908, -1208, -558, -1234, -1366, -544, -731, -236, -814, -1224 ],
+            'Log Luffy': [ 300, 100, 84, 95, 78, 89, 347, -1121, -578, -1075, -1131, -1133, -1115, -520, -1177, -528, -1387, -4, -816, -426, -542, -563 ],
+            'Corazon': [ 303, 103, 87, 98, 81, 92, 350, -1001, -451, -878, -1079, -1183, -1316, -1446, -16, -223, -327, -628, -614 ],
+            'Kuzan': [ 301, 101, 96, 79, 90, 348, -1192, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
+            'Issho': [ 301, 101, 96, 79, 90, 348, -1085, -965, -414, -457, -999, -1270, -218, -15, -785, -1228, -467 ],
+            'Dracule Mihawk': [ 303, 103, 87, 98, 81, 92, 350, -718, -639, -846, -906, -1129, -1238, -1322, -463, -729, -791, -215 ],
+            'Sabo': [ 304, 104, 88, 99, 82, 93, 351, -669, -874, -937, -1027, -1119, -524, -1318, -216, -332, -502, -737, -1062 ],
+            'Rayleigh': [ 300, 100, 84, 95, 78, 89, 347, -367, -210, -894, -997, -1389, -12, -1412, -208, -431, -544, -954, -1151 ],
+            'Jinbei': [ 302, 102, 86, 97, 80, 91, 349, -935, -408, -641, -671, -673, -1187, -1274, -1368, -333, -704, -956 ],
+            'Sakazuki': [ 303, 103, 87, 98, 81, 92, 350, -1314, -73, -259, -412, -455, -647, -1324, -292, -329, -1283, -955 ],
+            'Rob Lucci': [ 300, 100, 84, 95, 78, 89, 347, -748, -314, -756, -912, -1238, -1447, -20, -633, -787, -731, -427, -1279 ],
+            'Sengoku': [ 304, 104, 88, 99, 82, 93, 351, -459, -453, -1117, -522, -1186, -1175, -554, -1549, -709, -400, -500, -974, -1152, -1153 ],
+            'Whitebeard': [ 302, 102, 86, 97, 80, 91, 349, -261, -1413, -361, -363, -752, -872, -939, -204, -1280, -564, -701, -1154 ],
+            'Marco': [ 301, 101, 96, 79, 90, 348, -649, -251, -750, -842, -993, -1173, -508, -631, -378, -891, -1226 ],
+            'Zoro': [ 301, 101, 96, 79, 90, 348, -1362, -844, -1081, -1125, -1410, -546, -1282, -234, -812, -47 ],
+            'Boa Hancock': [ 303, 103, 87, 98, 81, 92, 350, -416, -1445, -253, -677, -1320, -1448, -22, -402, -506, -588, -893, -1157, -702 ],
+            'Bartolomeo': [ 304, 104, 88, 99, 82, 93, 351, -1035, -221, -357, -643, -840, -1025, -1029, -225, -541, -733, -1056 ],
+            'Borsalino': [ 302, 102, 86, 97, 80, 91, 349, -1240, -77, -257, -760, -943, -1272, -1551, -896, -398, -793, -1058, -59 ],
+            'Captain Buggy': [ 300, 100, 84, 95, 78, 89, 347, -1391, -1031, -1232, -1276, -1550, -739, -214, -707, -735, -890, -1318, -290 ],
         },
 
    ],
diff --git a/common/data/effects.js b/common/data/effects.js
index 1f022300e..fbd5f5fc2 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -359,7 +359,7 @@ window.effects = {
         atk: function(p) { return p.cost <= 30 ? 1.5 : 1; }
     },
     
-    'Aokiji Reformed - Striker Raid Boss': {
+    'Aokiji Neo - Striker Raid Boss': {
         description: 'Reduces Chain By 10%',
         thumb: 1668,
         id: 37,
diff --git a/common/data/families.js b/common/data/families.js
index b6375a099..1ae22fa47 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -632,9 +632,9 @@ window.families = [
     "Kaku",
     "Rob Lucci",
     "Rob Lucci",
-    "Keimi",
-    "Keimi",
-    "Pappug",
+    "Camie",
+    "Camie",
+    "Pappagu",
     "Hachi",
     "Doma",
     "Doma",
@@ -1668,9 +1668,9 @@ window.families = [
     "Kyros",
     "Aokiji",
     "Aokiji",
-    null,
-    null,
-    null,
+    "Madame Shyarly",
+    "Camie",
+    "Pappagu",
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index fe1d51f36..e6cddcdc5 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3130,6 +3130,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
         type: "class"
     },
+    1670: {
+        delay: function(p) { return 1; },
+    },
+    1671: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 4836715f9..6fd94810a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1331,7 +1331,7 @@ window.units = [
     [ "Gancho", "INT", [ "Striker", "Cerebral" ], 3, 15, 6, 2, 70, 1066998, 158, 129, 84, 1008, 629, 334, 1 ],
     [ "Mansherry, Daughter of the Tontatta Tribe", "PSY", [ "Striker", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 20, 10, 30, 666, 333, 270, 1],
     [ "Mansherry, Princess of Tontatta Kingdom", "PSY", [ "Striker", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 606, 303, 234, 1472, 604, 497, 1],
-    [ "Kabu", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 64, 37, 16, 1604, 964, 106, 1],
+    [ "Cub", "STR", [ "Striker", "Powerhouse" ], 3, 15, 6, 2, 70, 1066998, 64, 37, 16, 1604, 964, 106, 1],
     [ "Bian", "DEX", [ "Striker", "Free Spirit" ], 3, 15, 4, 2, 70, 1066998, 38, 28, 28, 888, 789, 288, 1],
     [ "Sabo, One Act with You", "INT", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 203, 142, 32, 1106, 574, 171, 1],
     [ "Sabo, Phantom of the Theatre", "INT", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 1035, 501, 126, 2191, 1281, 307, 1],
@@ -1620,8 +1620,8 @@ window.units = [
     [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 5, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, 1 ],
     [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, 1066998, 281, 190, 30, 1424, 690, 151, 1 ],
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, 1 ],
-    [ "Donquixote Doflamingo [Reformed]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
-    [ "Donquixote Doflamingo [Reformed], Warlord of the Sea", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, 1 ],
+    [ "Donquixote Doflamingo [Neo]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
+    [ "Donquixote Doflamingo [Neo], Warlord of the Sea", "INT", [ "Slasher", "Driven" ], 5, 50, 5, 3, 99, 4000000, 889, 726, 121, 2287, 1510, 262, 1 ],
     [ "Hyouzou, Fishman Pirates Bodyguard", "QCK", [ "Powerhouse", "Slasher" ], 4, 20, 6, 4, 99, 3000000, 85, 58, 27, 1980, 1088, 345, 1 ],
     [ "Daruma, Deep Sea Fishman Pirates", "STR", [ "Powerhouse", "Fighter" ], 4, 20, 4, 4, 99, 3000000, 48, 53, 24, 1405, 985, 320, 1 ],
     [ "Dosun, Deep Sea Fishman Pirates", "PSY", [ "Powerhouse", "Striker" ], 4, 20, 6, 4, 99, 3000000, 91, 60, 21, 2050, 1155, 274, 1 ],
@@ -1644,8 +1644,8 @@ window.units = [
     [ "Strong Leg Centaur, Punk Hazard Patrol Troop Corps", "STR", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 62, 35, 15, 1247, 717, 154, 1 ],
     [ "Nimble-footed Centaur, Punk Hazard Patrol Troop Corps", "QCK", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 57, 34, 18, 1141, 684, 182, 1 ],
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
-    [ "Pica [Reformed]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
-    [ "Pica [Reformed], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
+    [ "Pica [Neo]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
+    [ "Pica [Neo], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
     [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
@@ -1660,17 +1660,17 @@ window.units = [
     [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 129, 133, 34, null, null, null, null ],
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, null ],
     [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, null ],
-    [ "Corazon, Evolved", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, null ],
+    [ "Corazon, Removing the Sound of the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, null ],
     [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
     [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
     [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, null ],
     [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, null ],
-    [ "Aokiji [Reformed]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
-    [ "Aokiji [Reformed], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
+    [ "Aokiji [Neo], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, null ],
+    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From e1b25be517d6708320159d92d0e81d2728034b3e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 8 Jul 2017 16:24:06 -0400
Subject: [PATCH 1204/1569] Kyros change

---
 common/data/details.js  | 10 ++++------
 common/data/specials.js |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index ead5a8508..36028b1b5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4326,15 +4326,13 @@ window.details = {
         special: "Recovers 5000 HP and amplifies the effect of orbs by 1.5x for 2 turns"
     },
     923: {
-        captain: "Boosts ATK of Driven characters by 2x or by 2.5x",
-        captainNotes: "#{captainFixed : 2x : HP<30% : 2.5x}",
+        captain: "Boosts ATK of Driven Characters by 2.5x if HP is below 30% at the start of the turn, 2x otherwise",
         specialName: "Repel: Weapons Reflect",
         special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
         specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
     },
     924: {
-        captain: "Boosts ATK of Driven characters by 2x or by 2.75x",
-        captainNotes: "#{captainFixed : 2x : HP<30% : 2.75x}",
+        captain: "Boosts ATK of Driven Characters by 2.75x if HP is below 30% at the start of the turn, 2x otherwise",
         specialName: "Repel: Weapons Reflect",
         special: "Empties all slots, deals [STR] damage based on number of [STR] slots emptied to all enemies",
         specialNotes: "The exact multiplier used is chosen based on the number of [STR] orbs consumed: 0 orbs - 3.5x ATK; 1 orb - 7x ATK; 2 orbs - 14x ATK; 3 orbs - 21x ATK; 4 orbs - 35x ATK; 5 orbs - 91x ATK; 6 orbs - 140x ATK."
@@ -9329,12 +9327,12 @@ window.details = {
         specialName: "Ice Saber",
     },
     1666: {//Kyros
-        captain: "Boosts Striker characters ATK by 2x",
+        captain: "Boosts ATK of Striker characters by 2x",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
         specialName: "Kyros Special",
     },
     1667: {//Kyros
-        captain: "Boosts HP of Striker characters by 1.2x and boosts Striker characters ATK by 2.75x if HP is below 30% at the start of the turn, 2.25x otherwise",
+        captain: "Boosts HP of Striker characters by 1.2x and boosts ATK of Striker characters by 2.75x if HP is below 30% at the start of the turn, 2.25x otherwise",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
         specialName: "Kyros Special",
     },
diff --git a/common/data/specials.js b/common/data/specials.js
index e6cddcdc5..6be253343 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3117,10 +3117,10 @@ window.specials = {
         type: "class",
     },
     1666: {
-        orb: function(p) { return ((p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) && (p.percHP > 70)) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1667: {
-        orb: function(p) { return ((p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) && (p.percHP > 70)) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1668: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },

From 0af11042b10f13625ca314e2479d3f5bc47adab2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 9 Jul 2017 14:19:27 -0400
Subject: [PATCH 1205/1569] Various Fixes

---
 common/data/cooldowns.js  | 4 ++--
 common/data/details.js    | 2 +-
 common/data/drops.js      | 2 +-
 common/data/evolutions.js | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7f31118f2..4b36cda92 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1666,8 +1666,8 @@ window.cooldowns = [
     16,
     [ 21, 6 ],
     [ 21, 6 ],
-    [ 26, 18 ],
-    [ 26, 18 ],
+    [ 26, 17 ],
+    [ 26, 17 ],
     15,
     16,
     20,
diff --git a/common/data/details.js b/common/data/details.js
index 36028b1b5..7e7fd7442 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8048,7 +8048,7 @@ window.details = {
                 "cooldown": [ 22, 18 ],
             },
         ],
-        specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
+        specialNotes: "Rainbow orbs are the beneficial form of [BLOCK] orbs. They can not be shuffled by you or your opponent. They count as beneficial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
     },
diff --git a/common/data/drops.js b/common/data/drops.js
index 031d13d8b..e111de411 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1571,7 +1571,7 @@ window.drops = {
             thumb: 1649,
             gamewith: 60685,
             condition: 'You must have at least one character of each type on your team: STR, DEX, QCK, PSY, and INT.',
-            'All Difficulties': [ 1648, 1650, -1473, -1483, -412, -414, -1075, -1027, -1348, -956 ],
+            'All Difficulties': [ 1648, 1650, -1473, -1483, -412, -414, -1075, -1027, -1479, -1348, -956 ],
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8b66bcb71..2685a607b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2563,6 +2563,10 @@ window.evolutions = {
         evolution: 1662,
         evolvers: [ 118, 85, 1180, 101, 301 ]
     },
+    748: {
+        evolution: 1663,
+        evolvers: [  ]
+    },
     1664: {
         evolution: 1665,
         evolvers: [ 118, 84, 94, 100, 300 ]

From 578dfb3864f3ff41056b052032ca049c15951311 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-204-48.umd.edu>
Date: Mon, 10 Jul 2017 10:34:23 -0400
Subject: [PATCH 1206/1569] Perona
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Katsu’s Waifu
---
 common/data/aliases.js    |  4 ++--
 common/data/captains.js   |  6 ++++++
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 18 +++++++++++++++++-
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 ++--
 common/data/flags.js      |  2 ++
 common/data/specials.js   |  6 ++++++
 common/data/units.js      |  4 ++--
 9 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0a331ee70..addf46e56 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1671,8 +1671,8 @@ window.aliases = {
     1670: ['', '', 'Madame Shirley'],
     1671: ['', '', ''],
     1672: ['', '', 'Pappug'],
-    1673: ['', '', ''],
-    1674: ['', '', ''],
+    1673: ['', '', 'Swimsuit Perona', 'Summer Perona'],
+    1674: ['', '', 'Swimsuit Perona', 'Summer Perona'],
     1675: ['', '', ''],
     1676: ['', '', ''],
     1677: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 7684a9ffd..a90a4bc00 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4959,6 +4959,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
+    1673: {
+        atk: function(p) { return 1.75; }
+    },
+    1674: {
+        atk: function(p) { return 2.25; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 4b36cda92..70dfc9d25 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1671,8 +1671,8 @@ window.cooldowns = [
     15,
     16,
     20,
-    null,
-    null,
+    [ 13, 13 ],
+    [ 13, 13 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 7e7fd7442..835ddf56e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9356,11 +9356,27 @@ window.details = {
         special: "Recovers 15% of crew's MAX HP and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Camie Special",
     },
-    1671: {//Pappagu
+    1672: {//Pappagu
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Binds himself for 2 turns and reduces Despair and Silence duration by 3 turns",
         specialName: "Pappagu Special",
     },
+    1673: {//Swinsuit Perona
+        captain: "Boosts ATK of all characters by 1.75x and boosts EXP gained by 1.2x",
+        special: "Reduces damage received by 70% for 1 turn, reduces the defense of all enemies by ??% for 1 turn and reduces Silence duration by 2 turns.",
+        specialNotes: "#{silence}",
+        sailor: "Completely resists Silence on this character",
+        sailorNotes: "#{silence}",
+        specialName: "Romantic Princess",
+    },
+    1674: {//Swinsuit Perona
+        captain: "Boosts ATK of all characters by 2.25x and boosts EXP gained by 1.5x",
+        special: "Reduces damage received by 70% for 1 turn, reduces the defense of all enemies by ??% for 1 turn and reduces Silence duration by 2 turns.",
+        specialNotes: "#{silence}",
+        sailor: "Completely resists Silence on this character",
+        sailorNotes: "#{silence}",
+        specialName: "Romantic Princess",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 2685a607b..38e564f0b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2579,6 +2579,10 @@ window.evolutions = {
         evolution: 1669,
         evolvers: [ 118, 86, 266, 302, 102 ]
     },
+    1673: {
+        evolution: 1674,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 1ae22fa47..a09e8cd81 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1671,8 +1671,8 @@ window.families = [
     "Madame Shyarly",
     "Camie",
     "Pappagu",
-    null,
-    null,
+    "Perona",
+    "Perona",
     null,
     null,
     null,
diff --git a/common/data/flags.js b/common/data/flags.js
index 448cb744d..72328967d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1448,6 +1448,8 @@ window.flags = {
     1663: { rr: 1, rro: 1 },
     1664: { rr: 1, rro: 1, lrr: 1 },
     1665: { rr: 1, rro: 1, lrr: 1 },
+    1673: { rr: 1, rro: 1, lrr: 1 },
+    1674: { rr: 1, rro: 1, lrr: 1 },
     1750: { rr: 1, rro: 1 },
     1751: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 6be253343..aec764296 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3136,6 +3136,12 @@ window.specials = {
     1671: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
+    1673: {
+        def: function(p) { return 0.3; }
+    },
+    1674: {
+        def: function(p) { return 0.3; }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 6fd94810a..c3ba69239 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1671,8 +1671,8 @@ window.units = [
     [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 32bb0e8d6b106cfa6ff84b8600decc0a9e5e2ab4 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-204-48.umd.edu>
Date: Mon, 10 Jul 2017 13:58:32 -0400
Subject: [PATCH 1207/1569] Sailor Matchers and template for new ones

---
 characters/js/directives.js   | 23 +++++++++++++++++++++++
 characters/js/table.js        |  3 +--
 characters/js/utils.js        |  2 +-
 characters/views/sidebar.html |  4 ++--
 common/data/matchers.js       | 24 ++++++++++++++++++++++++
 5 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 83cc2a682..d3991f990 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -208,6 +208,29 @@ directives.addOrbOptions = function($timeout, $compile, MATCHER_IDS) {
         }
     };
 };
+    
+directives.addDebuffOptions = function($timeout, $compile, MATCHER_IDS) {
+    var TARGET = MATCHER_IDS['special.DebuffReducingSpecials'];
+    return {
+        restrict: 'A',
+        link: function(scope, element, attrs) {
+            if (scope.n !== TARGET) return;
+            var filter = $('<div id="debuff" ng-class="{ enabled: filters.custom[' + TARGET + '] }"></div>');
+            var debuffs = [ 'Bind', 'Despair', 'Silence', 'Paralysis', 'Blindness', 'Poison', 'Anti-Healing', 'Chain Limit' ];
+            debuffs.forEach(function(x,n) {
+                var template = '<span class="filter debuff %c" ng-class="{ active: filters.debuffs == \'%s\' }" ' +
+                    'ng-click="onDebuffClick($event,\'%s\')">%s</span>';
+                filter.append($(template.replace(/%s/g,x).replace(/%c/,'width-6')));
+            });
+            element.after(filter);
+            $compile(filter)(scope);
+            scope.onDebuffClick = function(e,type) {
+                console.log(scope.filters.debuffs);
+                scope.filters.debuffs = (scope.filters.debuffs == type ? null : type);
+            };
+        }
+    };
+};
 
 directives.goBack = function($state) {
 	return {
diff --git a/characters/js/table.js b/characters/js/table.js
index 556176052..db7300736 100644
--- a/characters/js/table.js
+++ b/characters/js/table.js
@@ -192,14 +192,13 @@ angular.module('optc') .run(function($rootScope, $timeout, $storage, MATCHER_IDS
             }
             if (mismatch) return false;
         }
-        // filter by class-filters
+        // filter by class-filters  
         if ($rootScope.filters.custom[MATCHER_IDS['captain.ClassBoostingCaptains']] && filters.classCaptain &&
                 !CharUtils.isClassBooster('captain', id, filters.classCaptain)) return false;
         if ($rootScope.filters.custom[MATCHER_IDS['special.ClassBoostingSpecials']] && filters.classSpecial &&
                 !CharUtils.isClassBooster('special', id, filters.classSpecial)) return false;
         if ($rootScope.filters.custom[MATCHER_IDS['sailor.ClassBoostingSailors']] && filters.classSailor &&
                 !CharUtils.isClassBooster('sailor', id, filters.classSailor)) return false;
-        //console.log(MATCHER_IDS);
         return true;
     };
 
diff --git a/characters/js/utils.js b/characters/js/utils.js
index d88153028..f6d85eb5c 100644
--- a/characters/js/utils.js
+++ b/characters/js/utils.js
@@ -202,7 +202,7 @@ CharUtils.getStatOfUnit = function(unit, stat, level) {
  * Caching *
  ***********/
 
-var orbControllerCache = { }, regexCache = { }, classCache = { captain: { }, special: { } };
+var orbControllerCache = { }, regexCache = { }, classCache = { captain: { }, special: { }, sailor: { } };
 
 CharUtils.getOrbControllerData = function(id) {
     if (orbControllerCache.hasOwnProperty(id) || !window.details[id] || !window.details[id].special)
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 8e7bc9aa6..004daad87 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -109,9 +109,9 @@
 </div>
 
 <div class="filter-container">
-    <span class="filter-header">Sailor filters</span>
+    <span class="filter-header">Sailor ability filters</span>
     <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('sailor') == 0"
-        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-special-options
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }" add-sailor-options
         ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
 </div>
 
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 858ed1099..3b5324b1b 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -361,6 +361,12 @@ window.matchers = [
         target: 'special',
         matcher: /Reduces (any )?damage received.+100%/i
     },
+    
+    /*{
+        name: 'Debuff Reducing Specials',
+        target: 'special',
+        matcher: /(reduces|removes) [^,]+(Bind|Despair|Silence|Paralysis|Blindness|Poison|No Healing|Chain Limit).+duration/i
+    },*/
 
     {
         name: 'Bind reducers',
@@ -472,6 +478,24 @@ window.matchers = [
         matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Driven)/i
     },
     
+    {
+        name: 'ATK boosting sailors',
+        target: 'sailor',
+        matcher: /Boosts ATK/i
+    },
+
+    {
+        name: 'HP boosting sailors',
+        target: 'sailor',
+        matcher: /Boosts (HP|ATK and HP|ATK, HP)|Boosts.+and their HP/i
+    },
+
+    {
+        name: 'RCV boosting sailors',
+        target: 'sailor',
+        matcher: /Boosts (RCV|ATK and RCV|HP and RCV|ATK, HP and RCV)|Boosts.+and their RCV/i
+    },
+    
     {
         name: '"Beneficial" Orb sailors',
         target: 'sailor',

From d71f31092d0bd05ea49aa971d660e1351118ae58 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 10 Jul 2017 23:55:55 -0400
Subject: [PATCH 1208/1569] stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index c3ba69239..84c9a0303 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1668,9 +1668,9 @@ window.units = [
     [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, null ],
     [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
     [ "Aokiji [Neo], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, null ],
-    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, null, 154, 105, 29, null, null, null, null ],
     [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, null ],
     [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From a6405697a30d03b6c366889c6a05e550cba9cad7 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-195-228.umd.edu>
Date: Tue, 11 Jul 2017 13:44:09 -0400
Subject: [PATCH 1209/1569] New units

---
 common/data/aliases.js    | 42 +++++++++++++++++++--------------------
 common/data/details.js    | 18 ++++++++---------
 common/data/evolutions.js | 14 ++++++-------
 common/data/units.js      | 40 ++++++++++++++++++-------------------
 4 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index addf46e56..f2bf176b6 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1644,30 +1644,30 @@ window.aliases = {
     1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', ''],
     1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', ''],
     1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', ''],
-    1646: ['ピーカ「改」', '', 'STR Pica'],
-    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'STR Pica'],
+    1646: ['ピーカ「改」', '', 'Kai Pica'],
+    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica'],
     1648: ['ジョーラ 芸術人間', '', 'Jora'],
     1649: ['ジョーラ トレーボル軍', '', 'Jora'],
     1650: ['ブルック サイケデリックアート', '', ''],
-    1651: ['', '', 'Cat Viper', 'Nekopara'],
-    1652: ['', '', 'Cat Viper', 'Nekopara'],
-    1653: ['', '', ''],
-    1654: ['', '', ''],
-    1655: ['', '', ''],
-    1656: ['', '', ''],
-    1657: ['', '', ''],
-    1658: ['', '', ''],
-    1659: ['', '', ''],
-    1660: ['', '', ''],
-    1661: ['', '', ''],
-    1662: ['', '', ''],
-    1663: ['', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci'],
-    1664: ['', '', 'Secret Aokiji'],
-    1665: ['', '', 'Secret Aokiji'],
-    1666: ['', '', ''],
-    1667: ['', '', ''],
-    1668: ['', '', ''],
-    1669: ['', '', ''],
+    1651: ['ネコマムシ', '', 'Cat Viper', 'Nekopara'],
+    1652: ['“夜の王”ネコマムシ', '', 'Cat Viper', 'Nekopara'],
+    1653: ['ペドロ', '', ''],
+    1654: ['木の上のペドロ', '', ''],
+    1655: ['キャロット', '', ''],
+    1656: ['王の鳥　キャロット', '', ''],
+    1657: ['カン十郎 ワノ国の侍', '', ''],
+    1658: ['夕立ち　カン十郎 ワノ国の侍', '', ''],
+    1659: ['雷ぞう', '', ''],
+    1660: ['霧の雷ぞう', '', ''],
+    1661: ['コラソン 消したい雨雲', '', ''],
+    1662: ['コラソン 消える雨音', '', ''],
+    1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci'],
+    1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji'],
+    1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji'],
+    1666: ['キュロス 無敗の剣闘士', '', ''],
+    1667: ['キュロス リク王軍軍隊長', '', ''],
+    1668: ['青キジ「改」', '', 'Kai Aokiji'],
+    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji'],
     1670: ['', '', 'Madame Shirley'],
     1671: ['', '', ''],
     1672: ['', '', 'Pappug'],
diff --git a/common/data/details.js b/common/data/details.js
index 835ddf56e..87cbd2835 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5255,7 +5255,7 @@ window.details = {
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: [
             {
-                "description": "Recovers 6x character's RCV in HP. Removes Paralysis",
+                "description": "Recovers 6x character's RCV in HP. Reduces Paralysis duration by 3 turns",
                 "cooldown": [ 14, 8 ]
             },
             {
@@ -5274,7 +5274,7 @@ window.details = {
         captain: "Recovers 4x character's RCV in HP at the end of each turn",
         special: [
             {
-                "description": "Recovers 6x character's RCV in HP. Removes Paralysis",
+                "description": "Recovers 6x character's RCV in HP. Reduces Paralysis duration by 3 turns",
                 "cooldown": [ 14, 8 ]
             },
             {
@@ -7037,7 +7037,7 @@ window.details = {
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: [
             {
-                "description": "Reduces Bind duration for one character by 3 turns. Recovers 7x character's RCV in HP.",
+                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
                 "cooldown": [ 18, 11 ],
             },
             {
@@ -7052,7 +7052,7 @@ window.details = {
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: [
             {
-                "description": "Reduces Bind duration for one character by 3 turns. Recovers 7x character's RCV in HP.",
+                "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
                 "cooldown": [ 18, 11 ],
             },
             {
@@ -9329,12 +9329,12 @@ window.details = {
     1666: {//Kyros
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
-        specialName: "Kyros Special",
+        specialName: "Trueno Bastardo",
     },
     1667: {//Kyros
         captain: "Boosts HP of Striker characters by 1.2x and boosts ATK of Striker characters by 2.75x if HP is below 30% at the start of the turn, 2.25x otherwise",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
-        specialName: "Kyros Special",
+        specialName: "Trueno Bastardo",
     },
     1668: {//Reborn Aokiji
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
@@ -9349,17 +9349,17 @@ window.details = {
     1670: {//Shyarly
         captain: "Boosts ATK of [DEX] characters by 1.75x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots two times, and delays all enemies for 1 turn",
-        specialName: "Shyarly Special",
+        specialName: "A Warning to the Fool",
     },
     1671: {//Camie
         captain: "Boosts RCV of Free Spirit characters by 1.5x",
         special: "Recovers 15% of crew's MAX HP and amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Camie Special",
+        specialName: "Cheerfulness that Shines in the Deep Sea",
     },
     1672: {//Pappagu
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Binds himself for 2 turns and reduces Despair and Silence duration by 3 turns",
-        specialName: "Pappagu Special",
+        specialName: "A Starfish Reaching for His Beliefs",
     },
     1673: {//Swinsuit Perona
         captain: "Boosts ATK of all characters by 1.75x and boosts EXP gained by 1.2x",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 38e564f0b..abd1cb322 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2541,15 +2541,15 @@ window.evolutions = {
     },
     1651: {
         evolution: 1652,
-        evolvers: [ 118, 266, 98, 267, 303 ]
+        evolvers: [ 118, 266, 98, 303, 267 ]
     },
     1653: {
         evolution: 1654,
-        evolvers: [ 88, 99, 1180, 104, 304 ]
+        evolvers: [ 88, 99, 1180, 304, 104 ]
     },
     1655: {
         evolution: 1656,
-        evolvers: [ 83, 85, 94, 101, 301 ]
+        evolvers: [ 83, 85, 94, 301, 101 ]
     },
     1657: {
         evolution: 1658,
@@ -2561,19 +2561,19 @@ window.evolutions = {
     },
     1661: {
         evolution: 1662,
-        evolvers: [ 118, 85, 1180, 101, 301 ]
+        evolvers: [ 118, 85, 1180, 301, 101 ]
     },
     748: {
         evolution: 1663,
-        evolvers: [  ]
+        evolvers: [ 118, 95, 300, 267 ]
     },
     1664: {
         evolution: 1665,
-        evolvers: [ 118, 84, 94, 100, 300 ]
+        evolvers: [ 118, 84, 94, 300, 100 ]
     },
     1666: {
         evolution: 1667,
-        evolvers: [ 118, 96, 96, 101, 301 ]
+        evolvers: [ 118, 96, 96, 301, 101 ]
     },
     1668: {
         evolution: 1669,
diff --git a/common/data/units.js b/common/data/units.js
index 84c9a0303..369590451 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -573,7 +573,7 @@ window.units = [
     [ "Usopp, Davy Back Fight: Cornerman", "DEX", "Shooter", 4, 13, 5, 2, 70, 1066998, 61, 30, 75, 1361, 354, 310, 1 ],
     [ "Tony Tony Chopper, Davy Back Fight: Mask", "PSY", [ "Fighter", "Cerebral" ], 3, 10, 4, 2, 70, 1066998, 83, 27, 70, 1176, 483, 280, 0.7 ],
     [ "Aokiji", "INT", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 232, 160, 32, 1142, 712, 157, 1 ],
-    [ "Aokiji, Ice Man", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
+    [ "Aokiji, Ice Human", "INT", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1093, 644, 122, 2465, 1435, 251, 1 ],
     [ "Tea Time Nami", "INT", [ "Striker", "Cerebral" ], 4, 18, 4, 2, 99, 2000000, 454, 133, 50, 1473, 703, 373, 0.7 ],
     [ "Monkey D. Luffy, Voyage Log: Straw Hat Pirates", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 390, 290, 150, 1559, 840, 290, 1.5 ],
     [ "Monkey D. Luffy, Voyage Dream: Pirate King", "STR", [ "Fighter", "Free Spirit" ], 6, 55, 4, 4, 99, 5000000, 1490, 776, 250, 3440, 1430, 351, 1 ],
@@ -1649,25 +1649,25 @@ window.units = [
     [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
-    [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, null ],
-    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, null ],
-    [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 110, 148, 58, 957, 620, 213, null ],
-    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 878, 544, 162, 2009, 1438, 325, null ],
-    [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 113, 99, 60, null, null, null, null ],
-    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 941, 461, 171, 2041, 1250, 390, null ],
-    [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 50, 392109, 133, 116, 44, null, null, null, null ],
-    [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
-    [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 129, 133, 34, null, null, null, null ],
-    [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, null ],
-    [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, null ],
-    [ "Corazon, Removing the Sound of the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, null ],
-    [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
-    [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
-    [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, null ],
-    [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, null ],
-    [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
-    [ "Aokiji [Neo], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, null ],
+    [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
+    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, 1 ],
+    [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 110, 148, 58, 957, 620, 213, 1 ],
+    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 878, 544, 162, 2009, 1438, 325, 1 ],
+    [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 113, 99, 60, 1006, 539, 220, 1 ],
+    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 941, 461, 171, 2041, 1250, 390, 1 ],
+    [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 50, 392109, 133, 116, 44, 1100, 574, 196, 1 ],
+    [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1026, 511, 144, 2306, 1301, 329, 1 ],
+    [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 129, 133, 34, 1126, 604, 152, 1 ],
+    [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, 1 ],
+    [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, 1 ],
+    [ "Corazon, Silencing the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, 1 ],
+    [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, 1 ],
+    [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, 7, 3, 70, 1066998, 126, 130, 49, 1220, 724, 195, 1 ],
+    [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1174, 655, 155, 2364, 1406, 336, 1 ],
+    [ "Kyros, Undefeated Gladiator", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, 1 ],
+    [ "Kyros, Riku Royal Army Commander", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, 1 ],
+    [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, 1 ],
+    [ "Aokiji [Neo], Ice Human", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, 1 ],
     [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, null, 154, 105, 29, null, null, null, null ],
     [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, null ],

From e6012d4acc20d1cd12f795fe69c65cf843c0c343 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-195-228.umd.edu>
Date: Tue, 11 Jul 2017 13:48:45 -0400
Subject: [PATCH 1210/1569] Aokiji Cooldown

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 70dfc9d25..8546569cf 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1662,8 +1662,8 @@ window.cooldowns = [
     [ 10, 10 ],
     [ 10, 10 ],
     [ 22, 12 ],
-    16,
-    16,
+    [ 16, 12 ],
+    [ 16, 12 ],
     [ 21, 6 ],
     [ 21, 6 ],
     [ 26, 17 ],

From 265e3673a626b35278cebb6334c623379aa25e58 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-195-228.umd.edu>
Date: Tue, 11 Jul 2017 13:57:51 -0400
Subject: [PATCH 1211/1569] Fortnight stats

---
 common/data/cooldowns.js | 4 ++--
 common/data/drops.js     | 3 ++-
 common/data/gw.js        | 3 +++
 common/data/units.js     | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8546569cf..28898bf96 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1668,9 +1668,9 @@ window.cooldowns = [
     [ 21, 6 ],
     [ 26, 17 ],
     [ 26, 17 ],
-    15,
+    [ 15, 9 ],
     16,
-    20,
+    [ 20, 14 ],
     [ 13, 13 ],
     [ 13, 13 ],
     null,
diff --git a/common/data/drops.js b/common/data/drops.js
index e111de411..ac25da450 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1577,7 +1577,8 @@ window.drops = {
         {
             name: 'Open the Cafe!',
             thumb: 1670,
-            gamewith: null,
+            gamewith: 61622,
+            condition: 'Total Crew Cost must be lower than 180 (Including friend captain)',
             'All Difficulties': [ 1670, 1671, 1672, -1085, -451, -457, -1081, -1353, -1540, -1345, -955, -1350 ],
         },
         
diff --git a/common/data/gw.js b/common/data/gw.js
index eca9fbf17..7ae66acc6 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1668,4 +1668,7 @@ window.gw=[
     61261,
     61267,
     61267,
+    61625,
+    61626,
+    61627,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 369590451..78baf786d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1348,7 +1348,7 @@ window.units = [
     [ "Birdie Kingdom Roc", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 4, 1, 70, 1066998, 109, 66, 12, 1487, 706, 127, 1],
     [ "Humandrills", "STR", [ "Slasher", "Powerhouse" ], 3, 13, 6, 1, 70, 1066998, 133, 112, 0, 1600, 1020, 0, 1],
     [ "Haredas", "PSY", [ "Cerebral", "Shooter" ], 3, 13, 4, 1, 70, 1066998, 21, 40, 32, 377, 505, 394, 1],
-    [ "Longarm Kingdom Tribesman", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, 1066998, 98, 71, 29, 1377, 709, 181, 1],
+    [ "Long Arm Kingdom Tribesman", "QCK", [ "Driven", "Slasher" ], 3, 13, 5, 1, 70, 1066998, 98, 71, 29, 1377, 709, 181, 1],
     [ "Tequila Wolf Guard", "INT", "Shooter", 3, 9, 7, 1, 70, 1066998, 51, 38, 21, 1103, 505, 193, 1],
     [ "Ivankov, New Kama King", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 8, 3, 99, 3000000, 123, 95, 41, 2034, 935, 299, 1],
     [ "Rayleigh, Crew of the Pirate King", "QCK", [ "Fighter", "Cerebral" ], 4, 30, 6, 3, 99, 3000000, 201, 189, 75, 2037, 1264, 294, 1],
@@ -1668,7 +1668,7 @@ window.units = [
     [ "Kyros, Riku Royal Army Commander", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, 1 ],
     [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, 1 ],
     [ "Aokiji [Neo], Ice Human", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, 1 ],
-    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, null, 154, 105, 29, null, null, null, null ],
+    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 154, 105, 29, 1950, 1140, 315, null ],
     [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, null ],
     [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From c5ddc5bc952aaaf5c846ce9029734fd517b74c01 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-195-228.umd.edu>
Date: Wed, 12 Jul 2017 13:21:55 -0400
Subject: [PATCH 1212/1569] New units

Law, Zoro, Admiral Event and other stuff
---
 common/data/aliases.js    | 12 ++++----
 common/data/captains.js   | 17 +++++++++++
 common/data/cooldowns.js  |  8 +++---
 common/data/details.js    | 34 ++++++++++++++++++----
 common/data/drops.js      | 60 ++++++++++++++++++++++-----------------
 common/data/evolutions.js |  8 ++++++
 common/data/families.js   |  8 +++---
 common/data/flags.js      |  4 +++
 common/data/gw.js         |  4 +++
 common/data/specials.js   | 14 +++++++++
 common/data/units.js      |  8 +++---
 11 files changed, 127 insertions(+), 50 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index f2bf176b6..a4acba642 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1629,8 +1629,8 @@ window.aliases = {
     1628: ['マッハ・バイス ディアマンテ軍幹部', '', 'Coliseum Mach Vise'],
     1629: ['イカロス・ムッヒ 深海の魚人海賊', '', 'Coliseum Ikaros Much'],
     1630: ['イカロス・ムッヒ 反逆の魚人海賊', '', 'Coliseum Ikaros Much'],
-    1631: ['フィッシャー・タイガー', '', ''],
-    1632: ['フィッシャー・タイガー タイヨウの海賊団船長', '', ''],
+    1631: ['フィッシャー・タイガー', '', 'Secret Fisher Tiger'],
+    1632: ['フィッシャー・タイガー タイヨウの海賊団船長', '', 'Secret Fisher Tiger'],
     1633: ['Ｄｒａｇｏｎ パンクハザード生息', '', ''],
     1634: ['ロック＆スコッチ', '', ''],
     1635: ['茶ひげ ＰＨ巡回部隊“ボス”', '', ''],
@@ -1673,10 +1673,10 @@ window.aliases = {
     1672: ['', '', 'Pappug'],
     1673: ['', '', 'Swimsuit Perona', 'Summer Perona'],
     1674: ['', '', 'Swimsuit Perona', 'Summer Perona'],
-    1675: ['', '', ''],
-    1676: ['', '', ''],
-    1677: ['', '', ''],
-    1678: ['', '', ''],
+    1675: ['', '', 'Kimono Zoro'],
+    1676: ['', '', 'Kimono Zoro'],
+    1677: ['', '', 'Log Law', 'Secret Law'],
+    1678: ['', '', 'Log Law', 'Secret Law'],
     1679: ['', '', ''],
     1680: ['', '', ''],
     1681: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index a90a4bc00..28df525a7 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4965,6 +4965,23 @@ window.captains = {
     1674: {
         atk: function(p) { return 2.25; }
     },
+    1601: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+    },
+    1602: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1675: {
+        chainModifier: function(p) { return 2; }
+    },
+    1676: {
+        chainModifier: function(p) { return 3.25; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 28898bf96..3f98c4cb8 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1673,10 +1673,10 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 13, 13 ],
     [ 13, 13 ],
-    null,
-    null,
-    null,
-    null,
+    [ 9, 9 ],
+    [ 9, 9 ],
+    11,
+    11,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 87cbd2835..69237373b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7568,7 +7568,7 @@ window.details = {
         specialName: "Offense Battle Axe",
     },
     1403: {//Timeskip Luffy
-        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x and reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
         special: [
             {
@@ -7584,7 +7584,7 @@ window.details = {
         specialName: "Gomu Gomu no Red Hawk",
     },
     1404: {//Timeskip Luffy
-        captain: "Boosts ATK of Free Spirit characters by 2.5x, reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x and reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
         captainNotes: "Using Luffy's special will change his own captain boost to 4x. If both Luffy's specials are used, the total ATK boost will be 16x",
         special: [
             {
@@ -8420,13 +8420,13 @@ window.details = {
     1529: {//Cavendish
         captain: "Boosts ATK of all characters by 1.5x, but boosts his OWN attack by 3x",
         special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
-        sailor: "Reduces ATK of all characters by .5x if your captain is [STR] or [QCK]",
+        sailor: "Reduces ATK of all characters by .5x if your captain is a [STR] or [QCK] character",
         specialName: "Blue Bird Sword",
     },
     1530: {//Cavendish
         captain: "Boosts ATK of all characters by 1.75x, but boosts his OWN attack by 3.5x",
         special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
-        sailor: "Reduces ATK of all characters by .5x if your captain is [STR] or [QCK]",
+        sailor: "Reduces ATK of all characters by .5x if your captain is a [STR] or [QCK] character",
         specialName: "Blue Bird Sword",
     },
     1531: {//Legend Usopp
@@ -9257,13 +9257,13 @@ window.details = {
     },
     1657: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
-        special: "Reduces Bind and Despair duration by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
+        special: "Reduces Bind and Despair duration by 5 turns. If your Captain is a Striker character, locks the chain multiplier at 2.75x for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },
     1658: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.5x",
-        special: "Reduces Bind and Despair duration by 5 turns and locks the chain multiplier at 2.75x for 1 turn if your Captain is a Striker character",
+        special: "Reduces Bind and Despair duration by 5 turns. If your Captain is a Striker character, locks the chain multiplier at 2.75x for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
         specialName: "Summon Dragon",
     },
@@ -9377,6 +9377,28 @@ window.details = {
         sailorNotes: "#{silence}",
         specialName: "Romantic Princess",
     },
+    1675: {//Kimono Zoro
+        captain: "Boosts chain multiplier by 2x",
+        special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, reduces Paralysis and Despair duration by 2 turns",
+        sailor: "Reduces Blindness duration by 1 turn",
+        specialName: "Great Swordsman Under the Umbrella",
+    },
+    1676: {//Kimono Zoro
+        captain: "Boosts chain multiplier by 3.25 and reduce damage received by 10%",
+        special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, reduces Paralysis and Despair duration by 2 turns",
+        sailor: "Reduces Blindness duration by 1 turn",
+        specialName: "Great Swordsman Under the Umbrella",
+    },
+    1677: {//Log Law
+        captain: "Boosts ATK of Slasher characters by 2.5x",
+        special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
+        specialName: "ROOM: Kikoku",
+    },
+    1678: {//Log Law
+        captain: "Boosts ATK of Slasher characters by 2.5x at the start of the chain, by 3.25x after the 3rd Perfect",
+        special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
+        specialName: "ROOM: Kikoku",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index ac25da450..a11b9391a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1961,11 +1961,37 @@ window.drops = {
             Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666 ]
         },
         
+        {
+            name: 'Invasion! Young Whitebeard',
+            thumb: 1258,
+            global: true,
+            gamewith: 38237,
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.',
+            'All Difficulties': [ 1257 ]
+        },
+        
+        {
+            name: 'Invasion! Red Hair Shanks',
+            thumb: 1380,
+            global: true,
+            gamewith: 46369,
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks.',
+            'All Difficulties': [ 1379, 952, 776 ]
+        },
+        
+        {
+            name: 'Invasion! Cavendish',
+            thumb: 1530,
+            gamewith: 53621,
+            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.',
+            'All Difficulties': [ 1529 ]
+        },
+        
         {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
             global: true,
-            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.',
+            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Almighty Book.',
             'Characters': [ 927, 296, 299, 773, 774, 1224 ],
             'Boosters and Evolvers': [ 351, 193, 114, 266, 83, 118 ],
             'Global': [ -261, -1413, -562, -720, -8, -1388, -219, -75, -255, -314, -316, -357, -410, -408, -449, -451, -455, -641, -643, -754, -760, -840, -880, -906, -910, -999, -554, -1175, -528, -1177, -560, -1212, -1245, -218, -22, -1448, -24, -204, -384, -504, -508, -785, -789 ],
@@ -1976,7 +2002,7 @@ window.drops = {
             name: 'Rescue Ace Event - Aokiji',
             thumb: 1280,
             global: true,
-            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.',
+            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Almighty Book.',
             'Characters': [ 67, 69, 262, 264, 298 ],
             'Boosters and Evolvers': [ 113, 192, 350, 266, 83, 118 ],
             'Global': [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1550, -1445 ],
@@ -1987,7 +2013,7 @@ window.drops = {
             name: 'Rescue Ace Event - Kizaru',
             thumb: 1228,
             global: true,
-            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Universal Skill Book.',
+            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Almighty Book.',
             'Characters': [ 968, 969, 970, 971, 972, 231, 775, 1223, 49, 43 ],
             'Boosters and Evolvers': [ 112, 191, 349, 266, 83, 118 ],
             'Global': [ -367, -649, -718, -16, -1446, -20, -1447, -73, -251, -257, -308, -359, -365, -412, -457, -639, -750, -758, -912, -914, -941, -993, -522, -1117, -526, -1173, -556, -1210, -1245, -223, -15, -23, -25, -200, -225, -546, -500, -506, -569, -791, -793 ],
@@ -1995,29 +2021,11 @@ window.drops = {
         },
         
         {
-            name: 'Invasion! Young Whitebeard',
-            thumb: 1258,
-            global: true,
-            gamewith: 38237,
-            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.',
-            'All Difficulties': [ 1257 ]
-        },
-        
-        {
-            name: 'Invasion! Red Hair Shanks',
-            thumb: 1380,
-            global: true,
-            gamewith: 46369,
-            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks.',
-            'All Difficulties': [ 1379, 952, 776 ]
-        },
-        
-        {
-            name: 'Invasion! Cavendish',
-            thumb: 1530,
-            gamewith: 53621,
-            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.',
-            'All Difficulties': [ 1529 ]
+            name: 'The Three Admirals',
+            thumb: 1314,
+            condition: 'Chance of dropping the Almighty Book.',
+            'All Bosses': [ -1621, -1632, -1665 ],
+            'Chopperman Mission': [ 1675 ],
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index abd1cb322..0a870e157 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2583,6 +2583,14 @@ window.evolutions = {
         evolution: 1674,
         evolvers: [  ]
     },
+    1675: {
+        evolution: 1676,
+        evolvers: [  ]
+    },
+    1677: {
+        evolution: 1678,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index a09e8cd81..a5aad45b2 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1673,10 +1673,10 @@ window.families = [
     "Pappagu",
     "Perona",
     "Perona",
-    null,
-    null,
-    null,
-    null,
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Trafalgar Law",
+    "Trafalgar Law",
     null,
     null,
     null,
diff --git a/common/data/flags.js b/common/data/flags.js
index 72328967d..d2f10bec6 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1450,6 +1450,10 @@ window.flags = {
     1665: { rr: 1, rro: 1, lrr: 1 },
     1673: { rr: 1, rro: 1, lrr: 1 },
     1674: { rr: 1, rro: 1, lrr: 1 },
+    1675: { special: 1 },
+    1676: { special: 1 },
+    1677: { rr: 1, rro: 1, lrr: 1 },
+    1678: { rr: 1, rro: 1, lrr: 1 },
     1750: { rr: 1, rro: 1 },
     1751: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 7ae66acc6..ae092d4eb 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1671,4 +1671,8 @@ window.gw=[
     61625,
     61626,
     61627,
+    null,
+    null,
+    61807,
+    61807,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index aec764296..f11a32351 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3142,6 +3142,20 @@ window.specials = {
     1674: {
         def: function(p) { return 0.3; }
     },
+    1675: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
+        type: "class"
+    },
+    1676: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
+        type: "class"
+    },
+    1677: {
+        affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1678: {
+        affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 78baf786d..8601bb786 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1673,10 +1673,10 @@ window.units = [
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, null ],
     [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro", "PSY", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 8088437cf590e9e2984c28c0c10c7b71887245a8 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 12 Jul 2017 22:56:50 -0400
Subject: [PATCH 1213/1569] Camie stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 84c9a0303..b043f83ac 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1669,7 +1669,7 @@ window.units = [
     [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
     [ "Aokiji [Neo], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, null ],
     [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, null, 154, 105, 29, null, null, null, null ],
-    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, 4, 3, 99, null, 122, 52, 38, null, null, null, null ],
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, null ],
     [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],

From 5de2bd43c3e4849556a3894aff73d29c4dea6d40 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 12 Jul 2017 23:03:44 -0400
Subject: [PATCH 1214/1569] oops

---
 common/data/units.js | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index b7267b6d9..f6d56153e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1649,29 +1649,6 @@ window.units = [
     [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
-<<<<<<< HEAD
-    [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, null, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, null ],
-    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, null ],
-    [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 110, 148, 58, 957, 620, 213, null ],
-    [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 878, 544, 162, 2009, 1438, 325, null ],
-    [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 113, 99, 60, null, null, null, null ],
-    [ "Ruler's Aide Carrot", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 941, 461, 171, 2041, 1250, 390, null ],
-    [ "Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 4, 15, 4, 3, 50, 392109, 133, 116, 44, null, null, null, null ],
-    [ "Evening Shower Kanjuro, Wano Country Samurai", "DEX", [ "Striker", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2306, 1301, 329, null ],
-    [ "Raizo", "STR", [ "Shooter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 129, 133, 34, null, null, null, null ],
-    [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, null ],
-    [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, null ],
-    [ "Corazon, Removing the Sound of the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, null ],
-    [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, null ],
-    [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, null, 4, 99, 4000000, null, null, null, 2364, 1406, 336, null ],
-    [ "Coliseum Kyros", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, null ],
-    [ "Coliseum Kyros, Evolved", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, null ],
-    [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, null ],
-    [ "Aokiji [Neo], Ice Man", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, null ],
-    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, null, 154, 105, 29, null, null, null, null ],
-    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, 4, 3, 99, null, 122, 52, 38, null, null, null, null ],
-=======
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
     [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, 1 ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 110, 148, 58, 957, 620, 213, 1 ],
@@ -1692,8 +1669,7 @@ window.units = [
     [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, 1 ],
     [ "Aokiji [Neo], Ice Human", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, 1 ],
     [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 154, 105, 29, 1950, 1140, 315, null ],
-    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
->>>>>>> origin/master
+    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, 4, 3, 99, null, 122, 52, 38, null, null, null, null ],
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, null ],
     [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],

From 619b015795ff88332f24a505f489f77870291623 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 12 Jul 2017 23:30:48 -0400
Subject: [PATCH 1215/1569] GW Links

---
 common/data/gw.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/gw.js b/common/data/gw.js
index ae092d4eb..0152d581b 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1323,12 +1323,12 @@ window.gw=[
     43894,
     43893,
     43893,
-    44750,
-    44750,
-    44751,
-    44752,
-    44762,
-    44762,
+    44160,
+    44160,
+    44167,
+    44167,
+    44169,
+    44168,
     44750,
     44750,
     44751,

From 3e288ed3696cecaf3078085622799ae6ca54662c Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-193-200.umd.edu>
Date: Thu, 13 Jul 2017 14:18:54 -0400
Subject: [PATCH 1216/1569] New FN units

---
 common/data/aliases.js | 6 +++---
 common/data/units.js   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index a4acba642..c83e097c7 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1668,9 +1668,9 @@ window.aliases = {
     1667: ['キュロス リク王軍軍隊長', '', ''],
     1668: ['青キジ「改」', '', 'Kai Aokiji'],
     1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji'],
-    1670: ['', '', 'Madame Shirley'],
-    1671: ['', '', ''],
-    1672: ['', '', 'Pappug'],
+    1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley'],
+    1671: ['ケイミー マーメイドカフェ', '', ''],
+    1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug'],
     1673: ['', '', 'Swimsuit Perona', 'Summer Perona'],
     1674: ['', '', 'Swimsuit Perona', 'Summer Perona'],
     1675: ['', '', 'Kimono Zoro'],
diff --git a/common/data/units.js b/common/data/units.js
index f6d56153e..7e7d0ce54 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1668,9 +1668,9 @@ window.units = [
     [ "Kyros, Riku Royal Army Commander", "QCK", [ "Powerhouse", "Striker" ], 5, 40, 4, 5, 99, 4000000, 1220, 670, 157, 2710, 1390, 225, 1 ],
     [ "Aokiji [Neo]", "DEX", [ "Striker", "Free Spirit" ], 4, 30, 4, 2, 70, 1066998, 239, 157, 34, 1150, 710, 161, 1 ],
     [ "Aokiji [Neo], Ice Human", "DEX", [ "Striker", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1099, 640, 126, 2500, 1430, 254, 1 ],
-    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 154, 105, 29, 1950, 1140, 315, null ],
-    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, 4, 3, 99, null, 122, 52, 38, null, null, null, null ],
-    [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, null ],
+    [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 154, 105, 29, 1950, 1140, 315, 1 ],
+    [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 122, 52, 38, 1850, 946, 350, 1 ],
+    [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, 1 ],
     [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Roronoa Zoro", "PSY", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 4325233398ef0056fe2d41287f577f30b6deeda5 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 13 Jul 2017 22:36:47 -0400
Subject: [PATCH 1217/1569] Zoro

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 69237373b..76aa5fd08 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9379,13 +9379,13 @@ window.details = {
     },
     1675: {//Kimono Zoro
         captain: "Boosts chain multiplier by 2x",
-        special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, reduces Paralysis and Despair duration by 2 turns",
+        special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, changes adjacent orbs into matching orbs and reduces Paralysis and Despair duration by 2 turns",
         sailor: "Reduces Blindness duration by 1 turn",
         specialName: "Great Swordsman Under the Umbrella",
     },
     1676: {//Kimono Zoro
         captain: "Boosts chain multiplier by 3.25 and reduce damage received by 10%",
-        special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, reduces Paralysis and Despair duration by 2 turns",
+        special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, changes adjacent orbs into matching orbs and reduces Paralysis and Despair duration by 2 turns",
         sailor: "Reduces Blindness duration by 1 turn",
         specialName: "Great Swordsman Under the Umbrella",
     },

From 74c170fd2dc2c08ba64f1a24b81a0d4f98ce2a83 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-204-36.umd.edu>
Date: Fri, 14 Jul 2017 10:10:32 -0400
Subject: [PATCH 1218/1569] Global thought they were special

---
 common/data/aliases.js    | 20 ++++++++++----------
 common/data/captains.js   |  6 ++++++
 common/data/details.js    | 10 ++++++++++
 common/data/drops.js      |  9 +++++++++
 common/data/evolutions.js | 20 ++++++++++++++++++++
 common/data/families.js   | 20 ++++++++++----------
 common/data/units.js      | 20 ++++++++++----------
 7 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index c83e097c7..ec11175ae 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1677,16 +1677,16 @@ window.aliases = {
     1676: ['', '', 'Kimono Zoro'],
     1677: ['', '', 'Log Law', 'Secret Law'],
     1678: ['', '', 'Log Law', 'Secret Law'],
-    1679: ['', '', ''],
-    1680: ['', '', ''],
-    1681: ['', '', ''],
-    1682: ['', '', ''],
-    1683: ['', '', ''],
-    1684: ['', '', ''],
-    1685: ['', '', ''],
-    1686: ['', '', ''],
-    1687: ['', '', ''],
-    1688: ['', '', ''],
+    1679: ['', '', 'Kai Mihawk'],
+    1680: ['', '', 'Kai Mihawk'],
+    1681: ['', '', '20th Anniversary Luffy'],
+    1682: ['', '', '20th Anniversary Luffy'],
+    1683: ['', '', '20th Anniversary Robin'],
+    1684: ['', '', '20th Anniversary Robin'],
+    1685: ['', '', '20th Anniversary Usopp'],
+    1686: ['', '', '20th Anniversary Usopp'],
+    1687: ['', '', '20th Anniversary Franky'],
+    1688: ['', '', '20th Anniversary Franky'],
     1689: ['', '', ''],
     1690: ['', '', ''],
     1691: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 28df525a7..55fc6fc0f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4982,6 +4982,12 @@ window.captains = {
     1676: {
         chainModifier: function(p) { return 3.25; }
     },
+    1679: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1680: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/details.js b/common/data/details.js
index 76aa5fd08..b824c734b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9399,6 +9399,16 @@ window.details = {
         special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
         specialName: "ROOM: Kikoku",
     },
+    1679: {
+        special: "Cuts the current HP of each enemy by 30%",
+        specialName: "Black Blade Ship Cutter [Neo]",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    1680: {
+        special: "Cuts the current HP of each enemy by 30%",
+        specialName: "Black Blade Ship Cutter [Neo]",
+        captain: "Boosts ATK of Slasher characters by 2.5x"
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index a11b9391a..5e4e0c1e8 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1596,6 +1596,15 @@ window.drops = {
             Master: [ 86, 112, 118, 226 ],
             Expert: [ 97, 112, 226 ]
         },
+        
+        {
+            name: 'Clash Neo!! Mihawk',
+            thumb: 1680,
+            global: true,
+            gamewith: null,
+            Master: [ 85, 111, 118, 1679 ],
+            Expert: [ 96, 111, 1679 ]
+        },
 
         {
             name: 'Clash!! Chopper\'s Rampage',
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0a870e157..9d76608b4 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2591,6 +2591,26 @@ window.evolutions = {
         evolution: 1678,
         evolvers: [  ]
     },
+    1679: {
+        evolution: 1680,
+        evolvers: [  ]
+    },
+    1681: {
+        evolution: 1682,
+        evolvers: [  ]
+    },
+    1683: {
+        evolution: 1684,
+        evolvers: [  ]
+    },
+    1685: {
+        evolution: 1686,
+        evolvers: [  ]
+    },
+    1687: {
+        evolution: 1688,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index a5aad45b2..4ba6b071f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1677,16 +1677,16 @@ window.families = [
     "Roronoa Zoro",
     "Trafalgar Law",
     "Trafalgar Law",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Dracule Mihawk",
+    "Dracule Mihawk",
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
+    "Nico Robin",
+    "Nico Robin",
+    "Usopp",
+    "Usopp",
+    "Franky",
+    "Franky",
     null,
     null,
     null,
diff --git a/common/data/units.js b/common/data/units.js
index 7e7d0ce54..b48c8f850 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1677,16 +1677,16 @@ window.units = [
     [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Luffy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Luffy, Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Robin", "QCK", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Robin, Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Usopp", "INT", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Usopp, Evolved", "INT", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Franky", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "20th Anniversary Franky, Evolved", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 88dd08e6f722d6f8198b623057190fdfd7cbf830 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-204-36.umd.edu>
Date: Fri, 14 Jul 2017 10:18:36 -0400
Subject: [PATCH 1219/1569] Stats and flags

---
 common/data/cooldowns.js | 4 ++--
 common/data/flags.js     | 8 ++++++++
 common/data/units.js     | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3f98c4cb8..129ccfce1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1677,8 +1677,8 @@ window.cooldowns = [
     [ 9, 9 ],
     11,
     11,
-    null,
-    null,
+    25,
+    25,
     null,
     null,
     null,
diff --git a/common/data/flags.js b/common/data/flags.js
index d2f10bec6..893c922e4 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1454,6 +1454,14 @@ window.flags = {
     1676: { special: 1 },
     1677: { rr: 1, rro: 1, lrr: 1 },
     1678: { rr: 1, rro: 1, lrr: 1 },
+    1661: { rr: 1, rro: 1 },
+    1662: { rr: 1, rro: 1 },
+    1663: { rr: 1, rro: 1 },
+    1664: { rr: 1, rro: 1 },
+    1665: { rr: 1, rro: 1 },
+    1666: { rr: 1, rro: 1 },
+    1667: { rr: 1, rro: 1 },
+    1668: { rr: 1, rro: 1 },
     1750: { rr: 1, rro: 1 },
     1751: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b48c8f850..04e7a30fc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1677,8 +1677,8 @@ window.units = [
     [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, null, null, null, 3794, 1280, 24, null ],
     [ "20th Anniversary Luffy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "20th Anniversary Luffy, Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "20th Anniversary Robin", "QCK", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From cb5d0246dcaf9b1db712844992881b0fb025d55e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 15 Jul 2017 01:51:31 -0400
Subject: [PATCH 1220/1569] Zoro

---
 common/data/evolutions.js | 2 +-
 common/data/gw.js         | 4 ++--
 common/data/units.js      | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 9d76608b4..199b2c87f 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2581,7 +2581,7 @@ window.evolutions = {
     },
     1673: {
         evolution: 1674,
-        evolvers: [  ]
+        evolvers: [ 115, 115, 90, 96, 301 ]
     },
     1675: {
         evolution: 1676,
diff --git a/common/data/gw.js b/common/data/gw.js
index 0152d581b..fedad39e9 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1671,8 +1671,8 @@ window.gw=[
     61625,
     61626,
     61627,
-    null,
-    null,
+    61707,
+    61707,
     61807,
     61807,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 04e7a30fc..bcbbe0e40 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1671,10 +1671,10 @@ window.units = [
     [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 154, 105, 29, 1950, 1140, 315, 1 ],
     [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 122, 52, 38, 1850, 946, 350, 1 ],
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, 1 ],
-    [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro", "PSY", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, 4, 3, null, null, 194, 110, 63, null, null, null, null ],
+    [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 873, 110, 63, 1904, 1003, 436, null ],
+    [ "Roronoa Zoro, Young Swordsman", "PSY", [ "Slasher", "Driven" ], 4, 15, 6, 2, 50, 392109, 152, 104, 24, null, null, null, null ],
+    [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 4000000, 931, 536, 85, 2094, 1193, 257, null ],
     [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, null, null, null, null, null, null, null ],

From d6fdafc71a9efbb2291dde17f66e66665b948c56 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 15 Jul 2017 01:57:03 -0400
Subject: [PATCH 1221/1569] Link

---
 common/data/drops.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 5e4e0c1e8..4bb65beee 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -2032,6 +2032,7 @@ window.drops = {
         {
             name: 'The Three Admirals',
             thumb: 1314,
+            gamewith: 61665,
             condition: 'Chance of dropping the Almighty Book.',
             'All Bosses': [ -1621, -1632, -1665 ],
             'Chopperman Mission': [ 1675 ],

From 750f8662ecc552d5587d529dd8a1381a42c8762f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 15 Jul 2017 13:59:26 -0400
Subject: [PATCH 1222/1569] Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index bcbbe0e40..5935df6a4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1673,7 +1673,7 @@ window.units = [
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, 1 ],
     [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, 4, 3, null, null, 194, 110, 63, null, null, null, null ],
     [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 873, 110, 63, 1904, 1003, 436, null ],
-    [ "Roronoa Zoro, Young Swordsman", "PSY", [ "Slasher", "Driven" ], 4, 15, 6, 2, 50, 392109, 152, 104, 24, null, null, null, null ],
+    [ "Roronoa Zoro, Young Swordsman", "PSY", [ "Slasher", "Driven" ], 4, 15, 6, 2, 50, 392109, 152, 104, 24, 1008, 604, 131, null ],
     [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 4000000, 931, 536, 85, 2094, 1193, 257, null ],
     [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],

From ea76dd56fce92763418010f003f0500a4dd09eb2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 15 Jul 2017 16:27:56 -0400
Subject: [PATCH 1223/1569] Meat Captains

Need to do some looking into adding family to params
---
 damage/js/cruncher.js | 5 ++++-
 damage/js/utils.js    | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index e3e3447ac..eafab3c39 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -203,7 +203,10 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb =='meat'){
                 for (temp = 0; temp < 2; temp++){
                     if (team[temp].unit != null){
-                        if (team[temp].unit.name.includes("Kami Enel") || team[temp].unit.name.includes("God Usopp") || team[temp].unit.name.includes("Usoland")){
+                        /*if (team[temp].unit.name.includes("Kami Enel") || team[temp].unit.name.includes("God Usopp") || team[temp].unit.name.includes("Usoland")){
+                            orb = 2;
+                        }*/
+                        if (team[temp].unit.number == 1610 || team[temp].unit.number == 1609 || team[temp].unit.number == 1532 || team[temp].unit.number == 1531){
                             orb = 2;
                         }
                     }
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 7bb338980..a55b29685 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -153,7 +153,12 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
     }
     for(temp = 0; temp < 2; temp++){
         if(captains[temp] != null){
-            if(captains[temp].name.includes('Kami Enel') || captains[temp].name.includes('God Usopp') || captains[temp].name.includes('Usoland')){
+            /*if(captains[temp].name.includes('Kami Enel') || captains[temp].name.includes('God Usopp') || captains[temp].name.includes('Usoland')){
+                if (orb == 'meat'){
+                    return boostedMultiplier;
+                }
+            }*/
+            if(captains[temp].number == 1610 || captains[temp].number == 1609 || captains[temp].number == 1531 || captains[temp].number == 1532){
                 if (orb == 'meat'){
                     return boostedMultiplier;
                 }

From d5743e0a21103ef16f995aa6023e05377aa307f7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 15 Jul 2017 21:37:29 -0400
Subject: [PATCH 1224/1569] Marg stuffs

---
 common/data/captains.js | 7 +++++++
 common/data/details.js  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 55fc6fc0f..1cf50d79d 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4101,6 +4101,13 @@ window.captains = {
     1452: {
         atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); }
     },
+    1453: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; },
+    },
+    1454: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; },
+    },
     1455: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
         hitAtk: function(p) {
diff --git a/common/data/details.js b/common/data/details.js
index b824c734b..b0ea41fae 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7910,7 +7910,7 @@ window.details = {
         specialName: "Diable Jambe: Love Shot",
     },
     1453: {//Valentines Margeurite
-        captain: "Not Translated",
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.5x",
         special: "Changes all orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
         specialName: "Doki Doki Heart",

From 2f1e4d686e2e8bf81640849e5162a5abe3b7a681 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 16 Jul 2017 14:01:09 -0400
Subject: [PATCH 1225/1569] flag fixes

---
 common/data/flags.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 893c922e4..d586fb810 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1454,14 +1454,14 @@ window.flags = {
     1676: { special: 1 },
     1677: { rr: 1, rro: 1, lrr: 1 },
     1678: { rr: 1, rro: 1, lrr: 1 },
-    1661: { rr: 1, rro: 1 },
-    1662: { rr: 1, rro: 1 },
-    1663: { rr: 1, rro: 1 },
-    1664: { rr: 1, rro: 1 },
-    1665: { rr: 1, rro: 1 },
-    1666: { rr: 1, rro: 1 },
-    1667: { rr: 1, rro: 1 },
-    1668: { rr: 1, rro: 1 },
+    1681: { rr: 1, rro: 1 },
+    1682: { rr: 1, rro: 1 },
+    1683: { rr: 1, rro: 1 },
+    1684: { rr: 1, rro: 1 },
+    1685: { rr: 1, rro: 1 },
+    1686: { rr: 1, rro: 1 },
+    1687: { rr: 1, rro: 1 },
+    1688: { rr: 1, rro: 1 },
     1750: { rr: 1, rro: 1 },
     1751: { rr: 1, rro: 1 },
 };
\ No newline at end of file

From eca1e82fa5b32147f6998f46165302d66ca31af5 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 16 Jul 2017 16:23:30 -0400
Subject: [PATCH 1226/1569] Perona

---
 common/data/details.js  | 4 ++--
 common/data/specials.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index b0ea41fae..3927c0ba1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9363,7 +9363,7 @@ window.details = {
     },
     1673: {//Swinsuit Perona
         captain: "Boosts ATK of all characters by 1.75x and boosts EXP gained by 1.2x",
-        special: "Reduces damage received by 70% for 1 turn, reduces the defense of all enemies by ??% for 1 turn and reduces Silence duration by 2 turns.",
+        special: "Reduces damage received by 70% for 1 turn, reduces the defense of all enemies by 90% for 1 turn and reduces Silence duration by 2 turns.",
         specialNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
@@ -9371,7 +9371,7 @@ window.details = {
     },
     1674: {//Swinsuit Perona
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP gained by 1.5x",
-        special: "Reduces damage received by 70% for 1 turn, reduces the defense of all enemies by ??% for 1 turn and reduces Silence duration by 2 turns.",
+        special: "Reduces damage received by 70% for 1 turn, reduces the defense of all enemies by 90% for 1 turn and reduces Silence duration by 2 turns.",
         specialNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
diff --git a/common/data/specials.js b/common/data/specials.js
index f11a32351..cac06ca4c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3137,10 +3137,10 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1673: {
-        def: function(p) { return 0.3; }
+        def: function(p) { return 0.1; }
     },
     1674: {
-        def: function(p) { return 0.3; }
+        def: function(p) { return 0.1; }
     },
     1675: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},

From 20f33d729c0b3e4a4fa56d7fe7626cfcab483b86 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 17 Jul 2017 12:18:41 -0700
Subject: [PATCH 1227/1569] Added Ray Shop Corazon's Special

---
 common/data/specials.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index cac06ca4c..ce548202d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3108,6 +3108,13 @@ window.specials = {
             return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         }
     },
+    1662: {
+        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') ? 2.5 : 1;
+        }
+    },
     1664: {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
         type: "class",

From d783f3741f14258229f2e795099e34fa05e0832f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 17 Jul 2017 16:59:13 -0400
Subject: [PATCH 1228/1569] Corazon Unevolved

---
 common/data/specials.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index ce548202d..27ff88b2d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3108,6 +3108,13 @@ window.specials = {
             return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         }
     },
+    1661: {
+        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') ? 2.5 : 1;
+        }
+    },
     1662: {
         chain: function(p) { return 2.5; },
         chainLimiter: function(p) {

From 0cf2c37a2086c159f0e1155f962aee972854227a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 17 Jul 2017 17:10:30 -0400
Subject: [PATCH 1229/1569] Hody clarification

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3927c0ba1..2dd32c176 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7758,7 +7758,7 @@ window.details = {
         specialName: "General Cannon",
     },
     1433: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and boosts HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {
@@ -7774,7 +7774,7 @@ window.details = {
         specialName: "Water Bullets",
     },
     1434: {//Hody Jones
-        captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
+        captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and boosts HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
         captainNotes: "Hody's HP boost is dependent on how many Powerhouse characters are in your crew. With 6 Powerhouse characters, the boost is 2x, with 5 the boost is 1.5x, with 4 the boost is 1.4x, with 3 the boost is 1.3x, with 2 the boost is 1.2x, and with 1 the boost is 1.1x.",
         special: [
             {

From 126459c1d1f24599187a6bac1ca03b027c1fbb62 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 17 Jul 2017 18:54:14 -0400
Subject: [PATCH 1230/1569] Flags

---
 characters/js/directives.js |  2 +-
 common/data/drops.js        |  2 ++
 common/data/flags.js        | 31 +++++++++++++++++++++++++------
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index d3991f990..280e3af05 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -55,7 +55,7 @@ directives.characterTable = function($rootScope, $timeout, $compile, $storage) {
 				$timeout(function() { element.fnDraw(); });
 			};
             // report link
-            var link = $('<span class="help-link">Want to report or request something? Use <a>this form</a>.</span>');
+            var link = $('<span class="help-link">Want to report or request something? <a> Join our discord</a>.</span>');
             link.find('a').attr('href', 'https://discord.gg/MRhRrbF');
             link.insertAfter($('.dataTables_length'));
             // pick column link
diff --git a/common/data/drops.js b/common/data/drops.js
index 4bb65beee..d3b3c56fa 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -643,6 +643,7 @@ window.drops = {
             name: 'Deep-Sea Aphotic Zone to Ryugu Palace',
             shortName: 'Fishman Island 1',
             thumb: 1506,
+            global: true,
             completion: '5x Rainbow Gems',
             gamewith: 52247,
             '01': [ 1501, 1502 ],
@@ -1456,6 +1457,7 @@ window.drops = {
         {
             name: 'Gather the Candy!',
             thumb: 1357,
+            global: true,
             gamewith: 45801,
             'All Difficulties': [ 1356, 1358, -1123, -1184, -1182, -1152, -1157, -8, -840, -736, -610, -1388 ]
         },
diff --git a/common/data/flags.js b/common/data/flags.js
index d586fb810..c279bdd2b 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1011,6 +1011,7 @@ window.flags = {
     1020: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1021: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1022: { special: 1, global: 1, shop: 1 },
+    1023: { global: 1 },
     1024: { rr: 1, rro: 1, global: 1 },
     1025: { rr: 1, rro: 1, global: 1 },
     1026: { rr: 1, rro: 1, global: 1 },
@@ -1141,8 +1142,8 @@ window.flags = {
     1157: { global: 1 },
     1158: { global: 1 },
     1159: { global: 1 },
-    1160: { rr: 1, rro: 1, lrr: 1 },
-    1161: { rr: 1, rro: 1, lrr: 1 },
+    1160: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1161: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1162: { global: 1 },
     1163: { global: 1 },
     1164: { global: 1 },
@@ -1174,8 +1175,8 @@ window.flags = {
     1190: { rr: 1, rro: 1, global: 1 },
     1191: { rr: 1, rro: 1, global: 1 },
     1192: { rr: 1, rro: 1, global: 1 },
-    1193: { rr: 1, rro: 1, lrr: 1 },
-    1194: { rr: 1, rro: 1, lrr: 1 },
+    1193: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1194: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1202: { global: 1 },
     1203: { global: 1 },
     1204: { global: 1 },
@@ -1187,12 +1188,12 @@ window.flags = {
     1210: { rr: 1, rro: 1, global: 1 },
     1211: { rr: 1, rro: 1, global: 1 },
     1212: { rr: 1, rro: 1, global: 1 },
+    1213: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1214: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1215: { global: 1 },
     1216: { global: 1 },
     1217: { global: 1 },
     1218: { global: 1 },
-    1213: { rr: 1, rro: 1, lrr: 1 },
-    1214: { rr: 1, rro: 1, lrr: 1 },
     1223: { global: 1 },
     1224: { global: 1 },
     1225: { global: 1 },
@@ -1303,6 +1304,10 @@ window.flags = {
     1353: { global: 1 },
     1354: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1355: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1356: { global: 1 },
+    1357: { global: 1 },
+    1358: { global: 1 },
+    1359: { global: 1 },
     1360: { promo: 1 },
     1361: { rr: 1, rro: 1, global: 1 },
     1362: { rr: 1, rro: 1, global: 1 },
@@ -1381,6 +1386,20 @@ window.flags = {
     1484: { shop: 1 },
     1485: { shop: 1 },
     1492: { rr: 1, rro: 1 },
+    1493: { global: 1 },
+    1494: { global: 1 },
+    1495: { global: 1 },
+    1496: { global: 1 },
+    1497: { global: 1 },
+    1498: { global: 1 },
+    1499: { global: 1 },
+    1500: { global: 1 },
+    1501: { global: 1 },
+    1502: { global: 1 },
+    1503: { global: 1 },
+    1504: { global: 1 },
+    1505: { global: 1 },
+    1506: { global: 1 },
     1513: { rr: 1, rro: 1, lrr: 1 },
     1514: { rr: 1, rro: 1, lrr: 1 },
     1523: { rr: 1, rro: 1, lrr: 1 },

From f17f5efe8f44e0f4f0d784e4d1dfc2988eca82c9 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 18 Jul 2017 01:27:05 -0400
Subject: [PATCH 1231/1569] New units

20th Anni
---
 common/data/cooldowns.js |  8 ++---
 common/data/details.js   | 64 +++++++++++++++++++++++++++++++++++++---
 common/data/units.js     | 16 +++++-----
 3 files changed, 72 insertions(+), 16 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 129ccfce1..c2671970b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1679,12 +1679,12 @@ window.cooldowns = [
     11,
     25,
     25,
+    18,
+    18,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
+    11,
+    11,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 2dd32c176..5b3820965 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7223,13 +7223,13 @@ window.details = {
     1361: {//6* Zoro
         captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
-        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
+        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain or Friend/Guest Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1362: {//6* Zoro
         captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
-        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
+        special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain or Friend/Guest Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
         specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1363: {//Timeskip Franky
@@ -9399,16 +9399,72 @@ window.details = {
         special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
         specialName: "ROOM: Kikoku",
     },
-    1679: {
+    1679: {//Kai Mihawk
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Black Blade Ship Cutter [Neo]",
         captain: "Boosts ATK of Slasher characters by 2x"
     },
-    1680: {
+    1680: {//Kai Mihawk
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Black Blade Ship Cutter [Neo]",
         captain: "Boosts ATK of Slasher characters by 2.5x"
     },
+    1681: {//20th Anni Luffy
+        captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
+        special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
+        specialName: "Luffy Special",
+        sailor: "Boosts HP and ATK of all characters by 56",
+    },
+    1682: {//20th Anni Luffy
+        captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect",
+        special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
+        specialName: "Luffy Special",
+        sailor: "Boosts HP and ATK of all characters by 56",
+    },
+    1683: {//20th Anni Robin
+        captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.3x",
+        special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
+        specialName: "Robin Special",
+        specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
+        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
+    },
+    1684: {//20th Anni Robin
+        captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.3x",
+        special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
+        specialName: "Robin Special",
+        specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
+        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
+    },
+    1685: {//20th Anni Usopp
+        captain: "Boosts ATK of Shooter characters by 2.75x following a chain of Good > Great > Perfect hits",
+        special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
+        specialName: "Usopp Special",
+        sailor: "Reduces Silence duration on this character by 4 turns",
+        sailorNotes: "#{silence}",
+    },
+    1686: {//20th Anni Usopp
+        captain: "Boosts ATK of Shooter characters by 3.25x following a chain of Good > Great > Perfect hits",
+        special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
+        specialName: "Usopp Special",
+        sailor: "Reduces Silence duration on this character by 4 turns",
+        sailorNotes: "#{silence}",
+    },
+    1687: {//20th Anni Franky
+        captain: "Boosts ATK of Fighter characters by 2x and reduce damage received by 10%",
+        special: "Changes own orb into [DEX], deals 15 hits of random typeless damage to random enemies, and reduces the defense of all enemies by 100% for 2 turns",
+        specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
+        specialName: "Franky Special",
+        sailor: "Restores his own special by 3 turns when it is rewinded",
+        sailorNotes: "#{rewind : 3}",
+    },
+    1688: {//20th Anni Franky
+        captain: "Boosts ATK of Fighter characters by 2.5x and reduce damage received by 15%",
+        special: "Changes own orb into [DEX], deals 15 hits of random typeless damage to random enemies, and reduces the defense of all enemies by 100% for 2 turns",
+        specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
+        specialName: "Franky Special",
+        sailor: "Restores his own special by 3 turns when it is rewinded",
+        sailorNotes: "#{rewind : 3}",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/units.js b/common/data/units.js
index 5935df6a4..ddb2825bc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1679,14 +1679,14 @@ window.units = [
     [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, null, null, null, 3794, 1280, 24, null ],
-    [ "20th Anniversary Luffy", "STR", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "20th Anniversary Luffy, Evolved", "STR", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "20th Anniversary Robin", "QCK", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "20th Anniversary Robin, Evolved", "QCK", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "20th Anniversary Usopp", "INT", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "20th Anniversary Usopp, Evolved", "INT", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "20th Anniversary Franky", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "20th Anniversary Franky, Evolved", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Usopp, Celebrate 20th Anniversary Cruise", "INT", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From bf9abe2dfb02fc4055bc9c84b64d5f38b38b779d Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 20 Jul 2017 21:02:24 -0400
Subject: [PATCH 1232/1569] New units calc stuff

Law too
---
 common/data/captains.js   | 98 +++++++++++++++++++++++++++++++++++----
 common/data/cooldowns.js  | 16 +++----
 common/data/details.js    | 28 +++++++++--
 common/data/drops.js      | 25 ++++++++++
 common/data/evolutions.js |  4 ++
 common/data/families.js   |  8 ++--
 common/data/gw.js         | 12 +++++
 common/data/sailors.js    |  8 ++++
 common/data/specials.js   | 42 +++++++++++++++++
 common/data/units.js      | 16 +++----
 damage/js/utils.js        | 29 ++++++++++++
 11 files changed, 252 insertions(+), 34 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 1cf50d79d..aed6b696e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1,9 +1,9 @@
 window.captains = {
     2: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return 1.5; }
     },
     3: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return 1.5; }
     },
     4: {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1.5; }
@@ -4972,10 +4972,16 @@ window.captains = {
     1674: {
         atk: function(p) { return 2.25; }
     },
-    1601: {
+    1675: {
+        chainModifier: function(p) { return 2; }
+    },
+    1676: {
+        chainModifier: function(p) { return 3.25; }
+    },
+    1677: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
-    1602: {
+    1678: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Slasher" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Slasher")) return 1;
@@ -4983,18 +4989,90 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    1675: {
-        chainModifier: function(p) { return 2; }
-    },
-    1676: {
-        chainModifier: function(p) { return 3.25; }
-    },
     1679: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1680: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
+    1681: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+    },
+    1682: {
+        damageSorter: function(d) { return CrunchUtils.lowCostSort(d, 3.5, 30); },
+        hitAtk: function(p) {
+            if (!(p.unit.cost <= 30)) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
+    },
+    1683: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
+    },
+    1684: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
+    },
+    1685: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Shooter") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1686: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Shooter") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1687: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+    },
+    1688: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+    },
+    1689: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 2.25 : 1.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1690: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1691: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+    },
+    1692: {
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c2671970b..fc287a05a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1677,20 +1677,20 @@ window.cooldowns = [
     [ 9, 9 ],
     11,
     11,
-    25,
-    25,
+    [ 25, 16 ],
+    [ 25, 16 ],
     18,
     18,
     null,
     null,
-    11,
-    11,
-    null,
-    null,
-    null,
-    null,
+    [ 11, 7 ],
+    [ 11, 7 ],
     null,
     null,
+    20,
+    20,
+    20,
+    17,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 5b3820965..7f485c3ee 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6,12 +6,12 @@ window.details = {
     2: {
         special: "Deals 7x character's ATK in STR damage to one enemy",
         specialName: "Gum-Gum Pistol",
-        captain: "Boosts ATK of STR characters by 1.5x"
+        captain: "Boosts ATK of all characters by 1.5x"
     },
     3: {
         special: "Deals 15x character's ATK in STR damage to one enemy",
         specialName: "Gum-Gum Bazooka",
-        captain: "Boosts ATK of STR characters by 1.5x"
+        captain: "Boosts ATK of all characters by 1.5x"
     },
     4: {
         captain: "Boosts ATK of STR characters by 2x, and ATK of all others by 1.5x",
@@ -6711,13 +6711,13 @@ window.details = {
     1288: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.5x on the first turn, 2.4x on the second, 2.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
-        special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
+        special: "Reduces Special Cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces Special Cooldown of Driven specials by 1 turn.",
         specialName: "Outcome of Sparta",
     },
     1289: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.75x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.75x on the first turn, 2.65x on the second, 2.55x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
-        special: "Reduces cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces cooldown of Driven specials by 1 turn.",
+        special: "Reduces Special Cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces Special Cooldown of Driven specials by 1 turn.",
         specialName: "Outcome of Sparta",
     },
     1290: {//Kid Buffalo
@@ -9465,6 +9465,26 @@ window.details = {
         sailor: "Restores his own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
     },
+    1689: {//Fortnight Kid
+        captain: "Boosts ATK of all characters by 1.5x at the start of the chain, by 2.25x following a chain of STR > DEX > INT attacks no lower than Good",
+        special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
+        specialName: "Kid Special",
+    },
+    1690: {//Fortnight Kid
+        captain: "Boosts ATK of all characters by 2x at the start of the chain, by 3x following a chain of STR > DEX > INT attacks no lower than Good",
+        special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
+        specialName: "Kid Special",
+    },
+    1691: {//Heat
+        captain: "Boosts ATK of Shooter characters by 1.75x",
+        special: "Boosts ATK against enemies with reduced defense by 1.3x for 1 turn, changes the captain's [STR], [DEX], [QCK], [INT], or [PSY] orbs into Matching orbs.",
+        specialName: "Heat Special",
+    },
+    1692: {//Wire
+        captain: "Boosts HP of Driven characters by 1.5x",
+        special: "Adds .3x to Chain multiplier, and reduces the defense of all enemies by 50% for 1 turn",
+        specialName: "Wire Special",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index d3b3c56fa..ed0a2a25f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1584,6 +1584,14 @@ window.drops = {
             'All Difficulties': [ 1670, 1671, 1672, -1085, -451, -457, -1081, -1353, -1540, -1345, -955, -1350 ],
         },
         
+        {
+            name: 'Kid Pirates!',
+            thumb: 1690,
+            gamewith: null,
+            condition: 'Only [INT] and [PSY] orbs appear',
+            'All Difficulties': [ 1689, 1691, 1692, -1532, -1543, -449, -453, -1079, -1538, -967, -1346, -1349 ],
+        },
+        
     ],
 
             
@@ -2088,6 +2096,23 @@ window.drops = {
             'Borsalino': [ 302, 102, 86, 97, 80, 91, 349, -1240, -77, -257, -760, -943, -1272, -1551, -896, -398, -793, -1058, -59 ],
             'Captain Buggy': [ 300, 100, 84, 95, 78, 89, 347, -1391, -1031, -1232, -1276, -1550, -739, -214, -707, -735, -890, -1318, -290 ],
         },
+        
+        {
+            name: '20th Anniversary! Nico Robin!',
+            thumb: 1684,
+            gamewith: 62383,
+            showManual: true,
+            condition: 'No characters will drop posters.',
+            'All Difficulties': [ -1121, -578, -1404, -1593, -217, -210, -908, -937, -941, -943, -1115, -520, -1208, -558, -1210, -556, -1212, -560, -1364, -1408, -1387, -4, -1446, -16, -1549, -709, -1550, -739, -223, -15, -629, -209 ],
+        },
+        
+        {
+            name: '20th Anniversary! Straw Hats!',
+            thumb: 1686,
+            gamewith: 62386,
+            condition: 'Gain gems by completeing the missions. Once you complete a mission, it will no longer be available and the next difficulty will be available. Total of 46 gems possible. Only Booster characters will drop posters.',
+            'All Difficulties': [ 591, 592, 593, 594, 595, 189, 190, 191, 192, 193 ],
+        },
 
    ],
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 199b2c87f..ad8ee0970 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2611,6 +2611,10 @@ window.evolutions = {
         evolution: 1688,
         evolvers: [  ]
     },
+    1689: {
+        evolution: 1690,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 4ba6b071f..64935fb39 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1687,10 +1687,10 @@ window.families = [
     "Usopp",
     "Franky",
     "Franky",
-    null,
-    null,
-    null,
-    null,
+    "Eustass Kid",
+    "Eustass Kid",
+    "Heat",
+    "Wire",
     null,
     null,
     null,
diff --git a/common/data/gw.js b/common/data/gw.js
index fedad39e9..3331bd7f1 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1673,6 +1673,18 @@ window.gw=[
     61627,
     61707,
     61707,
+    61811,
+    61811,
     61807,
     61807,
+    62443,
+    62443,
+    62644,
+    62644,
+    62646,
+    62646,
+    62647,
+    62647,
+    62645,
+    62645,
 ];
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 0fa02dafd..1267f4d77 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -290,4 +290,12 @@ window.sailors = {
         atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
         rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
     },
+    1681: {
+        atkStatic: function(p) { return 56; },
+        hpStatic: function(p) { return 56; },
+    },
+    1682: {
+        atkStatic: function(p) { return 56; },
+        hpStatic: function(p) { return 56; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 27ff88b2d..f68e7f246 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3170,6 +3170,48 @@ window.specials = {
     1678: {
         affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
+    1681: {
+        chainAddition: function(p){ return p.sourceSlot < 2 ? 0 : 0.5; },
+    },
+    1682: {
+        chainAddition: function(p){ return p.sourceSlot < 2 ? 0 : 0.5; },
+    },
+    1683: {
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
+    },
+    1684: {
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
+    },
+    1685: {
+        delay: function(p) { return 1; },
+    },
+    1686: {
+        delay: function(p) { return 1; },
+    },
+    1687: {
+        def: function(p) { return 0; }
+    },
+    1688: {
+        def: function(p) { return 0; }
+    },
+    1689: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
+    1690: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
+    1691: {
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
+    },
+    1692: {
+        chainAddition: function(p){ return 0.3; },
+        def: function(p) { return 0.5; }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index ddb2825bc..2d51ea85f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1675,10 +1675,10 @@ window.units = [
     [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 873, 110, 63, 1904, 1003, 436, null ],
     [ "Roronoa Zoro, Young Swordsman", "PSY", [ "Slasher", "Driven" ], 4, 15, 6, 2, 50, 392109, 152, 104, 24, 1008, 604, 131, null ],
     [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 4000000, 931, 536, 85, 2094, 1193, 257, null ],
-    [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, null, null, null, 3794, 1280, 24, null ],
+    [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 5, 3, 70, 1066998, null, null, null, 1193, 733, 204, null ],
+    [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2177, 1423, 361, null ],
+    [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, 328, 194, 3, 2009, 804, 9, null ],
+    [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, 1934, 778, 13, 3794, 1280, 24, null ],
     [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1687,10 +1687,10 @@ window.units = [
     [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Eustass Kid", "INT", [ "Striker", "Driven" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Eustass Kid, Evolved", "INT", [ "Striker", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/utils.js b/damage/js/utils.js
index a55b29685..a083e17ef 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -66,6 +66,35 @@ window.CrunchUtils.classSort = function(array, classMultiplier, classes) {
     return result;
 };
     
+window.CrunchUtils.lowCostSort = function(array, costMultiplier, cost) {
+    var result = [ ];
+    function isUnitAMatch(unit) {
+        if (unit.cost <= cost) {
+            return true;
+        }
+        return false;
+    }
+    // atk-based
+    var temp = array.map(function(x) {
+        var multiplier = x.multipliers.reduce(function(prev,next) { return prev * next[0]; },1);
+        return [ x.base * multiplier * (isUnitAMatch(x.unit.unit) ? costMultiplier : 1), x ];
+    });
+    temp.sort(function(x,y) { return x[0] - y[0]; });
+    result.push(temp.map(function(x) { return x[1]; }));
+    // class-based
+    var beginning = [ ], end = [ ];
+    array.forEach(function(x) {
+        if (isUnitAMatch(x.unit.unit)) {
+            end.push(x);
+        } else {
+            beginning.push(x);
+        }
+    });
+    result.push(beginning.concat(end));
+    // return result
+    return result;
+};
+    
 window.CrunchUtils.typeSort = function(array, typeMultiplier, types) {
     var result = [ ];
     function isUnitAMatch(unit) {

From 6296ad543a3a19a23fdc651e45916714a1ea1e31 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-200-11.umd.edu>
Date: Fri, 21 Jul 2017 14:18:44 -0400
Subject: [PATCH 1233/1569] Law cooldown

---
 common/data/cooldowns.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fc287a05a..b8fa09508 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1675,16 +1675,16 @@ window.cooldowns = [
     [ 13, 13 ],
     [ 9, 9 ],
     [ 9, 9 ],
-    11,
-    11,
+    [ 11, 7 ],
+    [ 11, 7 ],
     [ 25, 16 ],
     [ 25, 16 ],
     18,
     18,
     null,
     null,
-    [ 11, 7 ],
-    [ 11, 7 ],
+    11,
+    11,
     null,
     null,
     20,

From c5b8e90a417e8866729e37e623362047208f0f0a Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-200-11.umd.edu>
Date: Fri, 21 Jul 2017 14:30:08 -0400
Subject: [PATCH 1234/1569] New units

---
 common/data/aliases.js    | 16 ++++++++--------
 common/data/evolutions.js |  6 +++---
 common/data/units.js      | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ec11175ae..9ef011e5f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1671,14 +1671,14 @@ window.aliases = {
     1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley'],
     1671: ['ケイミー マーメイドカフェ', '', ''],
     1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug'],
-    1673: ['', '', 'Swimsuit Perona', 'Summer Perona'],
-    1674: ['', '', 'Swimsuit Perona', 'Summer Perona'],
-    1675: ['', '', 'Kimono Zoro'],
-    1676: ['', '', 'Kimono Zoro'],
-    1677: ['', '', 'Log Law', 'Secret Law'],
-    1678: ['', '', 'Log Law', 'Secret Law'],
-    1679: ['', '', 'Kai Mihawk'],
-    1680: ['', '', 'Kai Mihawk'],
+    1673: ['ペローナ 暗い浜辺のプリンセス', '', 'Swimsuit Perona', 'Summer Perona'],
+    1674: ['ペローナ 大胆水着なプリンセス', '', 'Swimsuit Perona', 'Summer Perona'],
+    1675: ['ロロノア・ゾロ からかさ剣士', '', 'Kimono Zoro'],
+    1676: ['ロロノア・ゾロ 雨濡れ剣客', '', 'Kimono Zoro'],
+    1677: ['トラファルガー・ロー 終わらぬ夢の航跡・ハートの海賊団', '', 'Log Law', 'Secret Law'],
+    1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law'],
+    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk'],
+    1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk'],
     1681: ['', '', '20th Anniversary Luffy'],
     1682: ['', '', '20th Anniversary Luffy'],
     1683: ['', '', '20th Anniversary Robin'],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ad8ee0970..ca82dbc35 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2585,15 +2585,15 @@ window.evolutions = {
     },
     1675: {
         evolution: 1676,
-        evolvers: [  ]
+        evolvers: [ 81, 81, 87, 92, 98 ]
     },
     1677: {
         evolution: 1678,
-        evolvers: [  ]
+        evolvers: [ 118, 88, 99, 304, 104 ]
     },
     1679: {
         evolution: 1680,
-        evolvers: [  ]
+        evolvers: [ 118, 83, 85, 85, 101 ]
     },
     1681: {
         evolution: 1682,
diff --git a/common/data/units.js b/common/data/units.js
index 2d51ea85f..1ec6d4107 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1671,14 +1671,14 @@ window.units = [
     [ "Madame Shyarly, Mermaid Cafe Manager", "DEX", [ "Cerebral", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 154, 105, 29, 1950, 1140, 315, 1 ],
     [ "Camie, Mermaid Cafe", "QCK", [ "Free Spirit", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 122, 52, 38, 1850, 946, 350, 1 ],
     [ "Pappagu, \"Criminal Brand Company\" President and Super Famous Celebrity Fashion Desginer", "PSY", [ "Fighter", "Powerhouse" ], 3, 13, 8, 3, 70, 1066998, 108, 41, 21, 920, 855, 180, 1 ],
-    [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, 4, 3, null, null, 194, 110, 63, null, null, null, null ],
-    [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 873, 110, 63, 1904, 1003, 436, null ],
-    [ "Roronoa Zoro, Young Swordsman", "PSY", [ "Slasher", "Driven" ], 4, 15, 6, 2, 50, 392109, 152, 104, 24, 1008, 604, 131, null ],
-    [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 4000000, 931, 536, 85, 2094, 1193, 257, null ],
-    [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 5, 3, 70, 1066998, null, null, null, 1193, 733, 204, null ],
-    [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2177, 1423, 361, null ],
-    [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, 328, 194, 3, 2009, 804, 9, null ],
-    [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, 1934, 778, 13, 3794, 1280, 24, null ],
+    [ "Perona, Dark Beach Princess", "QCK", [ "Shooter", "Driven" ], 4, 15, 4, 3, 50, 392109, 128, 77, 50, 946, 490, 210, 1 ],
+    [ "Perona, Audacious Swimsuit Princess", "QCK", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 873, 406, 173, 1904, 1003, 436, 1 ],
+    [ "Roronoa Zoro, Young Swordsman", "PSY", [ "Slasher", "Driven" ], 4, 15, 6, 2, 50, 392109, 152, 104, 24, 1008, 604, 131, 1 ],
+    [ "Roronoa Zoro, Rain Soaked Samurai", "PSY", [ "Slasher", "Driven" ], 5, 30, 4, 3, 99, 4000000, 931, 536, 85, 2094, 1193, 257, 1 ],
+    [ "Trafalgar Law, Wakes of an Endless Dream, Heart Pirates", "INT", [ "Slasher", "Free Spirit" ], 4, 20, 5, 3, 70, 1066998, 110, 137, 51, 1193, 733, 204, 1 ],
+    [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1109, 660, 164, 2177, 1423, 361, 1 ],
+    [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, 328, 194, 3, 2009, 804, 9, 1 ],
+    [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, 1934, 778, 13, 3794, 1280, 24, 1 ],
     [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From ac875fb1ae79c3db9e7cc9ac1315203bdac8845a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 21 Jul 2017 23:37:43 -0400
Subject: [PATCH 1235/1569] New Units

---
 common/data/cooldowns.js  | 16 ++++++++--------
 common/data/evolutions.js |  8 ++++----
 common/data/units.js      | 16 ++++++++--------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b8fa09508..e1d39fe57 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1679,14 +1679,14 @@ window.cooldowns = [
     [ 11, 7 ],
     [ 25, 16 ],
     [ 25, 16 ],
-    18,
-    18,
-    null,
-    null,
-    11,
-    11,
-    null,
-    null,
+    [ 18, 14 ],
+    [ 18, 14 ],
+    [ 17, 13 ],
+    [ 17, 13 ],
+    [ 11, 7 ],
+    [ 11, 7 ],
+    [ 19, 15 ],
+    [ 19, 15 ],
     20,
     20,
     20,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ca82dbc35..07f47dcfd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2597,19 +2597,19 @@ window.evolutions = {
     },
     1681: {
         evolution: 1682,
-        evolvers: [  ]
+        evolvers: [ 78, 84, 89, 95, 100 ]
     },
     1683: {
         evolution: 1684,
-        evolvers: [  ]
+        evolvers: [ 79, 85, 90, 96, 101 ]
     },
     1685: {
         evolution: 1686,
-        evolvers: [  ]
+        evolvers: [ 82, 88, 93, 99, 104 ]
     },
     1687: {
         evolution: 1688,
-        evolvers: [  ]
+        evolvers: [ 80, 86, 91, 97, 102 ]
     },
     1689: {
         evolution: 1690,
diff --git a/common/data/units.js b/common/data/units.js
index 1ec6d4107..e3896ac54 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1679,14 +1679,14 @@ window.units = [
     [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1109, 660, 164, 2177, 1423, 361, 1 ],
     [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, 328, 194, 3, 2009, 804, 9, 1 ],
     [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, 1934, 778, 13, 3794, 1280, 24, 1 ],
-    [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Usopp, Celebrate 20th Anniversary Cruise", "INT", "Shooter", 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 654, 420, 39, 1206, 719, 175, null ],
+    [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 8, 5, 99, 4000000, 1033, 587, 113, null, null, null, null ],
+    [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 601, 335, 66, null, null, null, null ],
+    [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 878, 478, 189, null, null, null, null ],
+    [ "Usopp, Celebrate 20th Anniversary Cruise", "INT", "Shooter", 4, 15, 6, 3, 50, 392109, 707, 324, 49, 1313, 587, 209, null ],
+    [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, null, null, null, null ],
+    [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 794, 385, 30, null, null, null, null ],
+    [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 10, 5, 99, 4000000, 1487, 559, 69, null, null, null, null ],
     [ "Eustass Kid", "INT", [ "Striker", "Driven" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Eustass Kid, Evolved", "INT", [ "Striker", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 58b02cd76867b59f17bde8f31795fbda0c95b590 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 21 Jul 2017 23:52:13 -0400
Subject: [PATCH 1236/1569] Stata

---
 common/data/units.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index e3896ac54..c21966b00 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1680,13 +1680,13 @@ window.units = [
     [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, 328, 194, 3, 2009, 804, 9, 1 ],
     [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, 1934, 778, 13, 3794, 1280, 24, 1 ],
     [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 654, 420, 39, 1206, 719, 175, null ],
-    [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 8, 5, 99, 4000000, 1033, 587, 113, null, null, null, null ],
+    [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 8, 5, 99, 4000000, 1033, 587, 113, 2440, 1406, 279, null ],
     [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 601, 335, 66, null, null, null, null ],
-    [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 878, 478, 189, null, null, null, null ],
+    [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 878, 478, 189, 2126, 1200, 404, null ],
     [ "Usopp, Celebrate 20th Anniversary Cruise", "INT", "Shooter", 4, 15, 6, 3, 50, 392109, 707, 324, 49, 1313, 587, 209, null ],
-    [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, null, null, null, null ],
-    [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 794, 385, 30, null, null, null, null ],
-    [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 10, 5, 99, 4000000, 1487, 559, 69, null, null, null, null ],
+    [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, 2550, 1184, 336, null ],
+    [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 794, 385, 30, 1599, 687, 126, null ],
+    [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 10, 5, 99, 4000000, 1487, 559, 69, 3095, 1255, 205, null ],
     [ "Eustass Kid", "INT", [ "Striker", "Driven" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Eustass Kid, Evolved", "INT", [ "Striker", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],

From f92168af7dfffc683a96e75adf2a123b3e5485c7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 22 Jul 2017 00:12:27 -0400
Subject: [PATCH 1237/1569] Robin

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index c21966b00..b5ac50951 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1681,7 +1681,7 @@ window.units = [
     [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, 1934, 778, 13, 3794, 1280, 24, 1 ],
     [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 654, 420, 39, 1206, 719, 175, null ],
     [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 8, 5, 99, 4000000, 1033, 587, 113, 2440, 1406, 279, null ],
-    [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 601, 335, 66, null, null, null, null ],
+    [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 601, 335, 66, 1043, 604, 257, null ],
     [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 878, 478, 189, 2126, 1200, 404, null ],
     [ "Usopp, Celebrate 20th Anniversary Cruise", "INT", "Shooter", 4, 15, 6, 3, 50, 392109, 707, 324, 49, 1313, 587, 209, null ],
     [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, 2550, 1184, 336, null ],

From e7107e2fea5a68774f5ce4f94cbc48a003e02eeb Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 22 Jul 2017 21:18:44 -0400
Subject: [PATCH 1238/1569] Luffy fix

---
 common/data/specials.js | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index f68e7f246..42f0e55e0 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3131,10 +3131,26 @@ window.specials = {
         type: "class",
     },
     1666: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1666].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP <= 70 ? 1 : 1.5);
+            window.specials[1666].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                name: '1666warning'
+            });
+        }
     },
     1667: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1667].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP <= 70 ? 1 : 1.5);
+            window.specials[1667].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                name: '1667warning'
+            });
+        }
     },
     1668: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
@@ -3171,10 +3187,22 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1681: {
-        chainAddition: function(p){ return p.sourceSlot < 2 ? 0 : 0.5; },
+        chainAddition: function(p) { return 0.5; },
+        onActivation: function(p) {
+            p.scope.notify({
+                text: 'Chain Addition only works when Luffy is a sailor.',
+                name: '1681warning'
+            });
+        }
     },
     1682: {
-        chainAddition: function(p){ return p.sourceSlot < 2 ? 0 : 0.5; },
+        chainAddition: function(p) { return 0.5; },
+        onActivation: function(p) {
+            p.scope.notify({
+                text: 'Chain Addition only works when Luffy is a sailor.',
+                name: '1682warning'
+            });
+        }
     },
     1683: {
         atk: function(p) { return p.defenseDown ? 1.5 : 1; },

From 54b280dc10778a54fcf78518a4721123cff9df96 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-200-11.umd.edu>
Date: Mon, 24 Jul 2017 14:54:17 -0400
Subject: [PATCH 1239/1569] Tsuru and Kizaru details

subject to change if anyone proves them wrong
---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 7f485c3ee..2999d6638 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6357,7 +6357,7 @@ window.details = {
                 "cooldown": [ 20, 17 ], 
             },
         ],    
-        specialNotes: "#{randomHits : 10}<br>#{stages}",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}",
     },
     1240: {//6* Kizaru
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and boosts RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
@@ -6376,7 +6376,7 @@ window.details = {
                 "cooldown": [ 20, 17 ],
             },
         ],    
-        specialNotes: "#{randomHits : 10}<br>#{stages}",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}",
     },
     1241: {//Fortnight Koala
         captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
@@ -6929,14 +6929,14 @@ window.details = {
     1319: {//Lady Tsuru
         captain: "Heals for 1x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
-        specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 32,000 : for each hit}",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "A Decree of the Veteran",
     },
     1320: {//Lady Tsuru
         captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
-        specialNotes: "#{randomHits : 10}<br>#{random : ??? : ??? : for each hit}",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 32,000 : for each hit}",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "A Decree of the Veteran",
     },

From c59aae04180c0756e15dc1fe7096f902c1504ee2 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 25 Jul 2017 00:19:42 -0400
Subject: [PATCH 1240/1569] Stats

---
 common/data/units.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index b5ac50951..1229b5a97 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1687,10 +1687,10 @@ window.units = [
     [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, 2550, 1184, 336, null ],
     [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 794, 385, 30, 1599, 687, 126, null ],
     [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 10, 5, 99, 4000000, 1487, 559, 69, 3095, 1255, 205, null ],
-    [ "Eustass Kid", "INT", [ "Striker", "Driven" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Eustass Kid, Evolved", "INT", [ "Striker", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Eustass Kid", "INT", [ "Striker", "Driven" ], 3, 13, 4, 2, 50, 392109, 125, 61, 40, 757, 579, 155, null ],
+    [ "Eustass Kid, Evolved", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, null, null, null, null ],
+    [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, null, null, null, null ],
+    [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 0e65b73d1a6d9b8be11b9b821b8fbb79229f3920 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 25 Jul 2017 17:20:04 -0400
Subject: [PATCH 1241/1569] new units and stats

---
 common/data/aliases.js    | 24 ++++++++--------
 common/data/captains.js   | 12 ++++++++
 common/data/cooldowns.js  | 16 +++++------
 common/data/details.js    | 58 +++++++++++++++++++++++++++------------
 common/data/drops.js      | 10 ++++++-
 common/data/evolutions.js |  8 ++++++
 common/data/families.js   |  8 +++---
 common/data/specials.js   | 16 +++++++++++
 common/data/units.js      | 28 +++++++++----------
 9 files changed, 123 insertions(+), 57 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9ef011e5f..23024cf4f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1679,22 +1679,22 @@ window.aliases = {
     1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law'],
     1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk'],
     1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk'],
-    1681: ['', '', '20th Anniversary Luffy'],
-    1682: ['', '', '20th Anniversary Luffy'],
-    1683: ['', '', '20th Anniversary Robin'],
-    1684: ['', '', '20th Anniversary Robin'],
-    1685: ['', '', '20th Anniversary Usopp'],
-    1686: ['', '', '20th Anniversary Usopp'],
-    1687: ['', '', '20th Anniversary Franky'],
-    1688: ['', '', '20th Anniversary Franky'],
+    1681: ['モンキー・D・ルフィ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Luffy'],
+    1682: ['モンキー・D・ルフィ 20th Anniversary Memorial Treasure', '', '20th Anniversary Luffy'],
+    1683: ['ニコ・ロビン Celebrate 20th Anniversary Cruise', '', '20th Anniversary Robin'],
+    1684: ['ニコ・ロビン 20th Anniversary Memorial Treasure', '', '20th Anniversary Robin'],
+    1685: ['ウソップ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Usopp'],
+    1686: ['ウソップ 20th Anniversary Memorial Treasure', '', '20th Anniversary Usopp'],
+    1687: ['フランキー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Franky'],
+    1688: ['フランキー 20th Anniversary Memorial Treasure', '', '20th Anniversary Franky'],
     1689: ['', '', ''],
     1690: ['', '', ''],
     1691: ['', '', ''],
     1692: ['', '', ''],
-    1693: ['', '', ''],
-    1694: ['', '', ''],
-    1695: ['', '', ''],
-    1696: ['', '', ''],
+    1693: ['', '', 'Coliseum Inuarashi'],
+    1694: ['', '', 'Coliseum Inuarashi'],
+    1695: ['', '', 'Raid Vergo'],
+    1696: ['', '', 'Raid Vergo'],
     1697: ['', '', ''],
     1698: ['', '', ''],
     1699: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index aed6b696e..78202f4a9 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5073,6 +5073,18 @@ window.captains = {
     1692: {
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
+    1693: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+    },
+    1694: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.75 : 1; },
+    },
+    1695: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1696: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e1d39fe57..0d95d7b48 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1687,14 +1687,14 @@ window.cooldowns = [
     [ 11, 7 ],
     [ 19, 15 ],
     [ 19, 15 ],
-    20,
-    20,
-    20,
-    17,
-    null,
-    null,
-    null,
-    null,
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 17, 14 ],
+    24,
+    24,
+    30,
+    30,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 2999d6638..a8ca47b39 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5551,15 +5551,15 @@ window.details = {
     1122: {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 2.25x for 2 turns, amplifies the effect of Cavendish's orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
-        specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
+        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts own ATK by 2.25x for 2 turns, amplifies the effect of own orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
         specialName: "Slicing Winds of Rommel"
     },
     1123: {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts Cavendish's ATK by 2.25x for 2 turns, amplifies the effect of Cavendish's orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
-        specialNotes: "Boosted ATK and Orb Effectivess only works for the Cavendish who uses his Special.",
+        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts own ATK by 2.25x for 2 turns, amplifies the effect of own orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
         specialName: "Slicing Winds of Rommel"
     },
     1124: {
@@ -8864,12 +8864,12 @@ window.details = {
         sailor: "Completely resists Paralysis on this character",
         specialName: "King Kong Gun",
     },
-    1594: {//Raid Fujitora
+    1594: {//Fujitora
         captain: "Cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialName: "Gravity Blade: Fierce Tiger",
     },
-    1595: {//Raid Fujitora
+    1595: {//Fujitora
         captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.2x, cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialName: "Gravity Blade: Fierce Tiger",
@@ -9412,40 +9412,40 @@ window.details = {
     1681: {//20th Anni Luffy
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
-        specialName: "Luffy Special",
+        specialName: "Gomu Gomu no Tako Stamp",
         sailor: "Boosts HP and ATK of all characters by 56",
     },
     1682: {//20th Anni Luffy
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
-        specialName: "Luffy Special",
+        specialName: "Gomu Gomu no Tako Stamp",
         sailor: "Boosts HP and ATK of all characters by 56",
     },
     1683: {//20th Anni Robin
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.3x",
         special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
-        specialName: "Robin Special",
+        specialName: "Mil Fleur: Gigantesco Mano",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
         sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
     },
     1684: {//20th Anni Robin
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.3x",
         special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
-        specialName: "Robin Special",
+        specialName: "Mil Fleur: Gigantesco Mano",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
         sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
     },
     1685: {//20th Anni Usopp
         captain: "Boosts ATK of Shooter characters by 2.75x following a chain of Good > Great > Perfect hits",
         special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
-        specialName: "Usopp Special",
+        specialName: "Green Star: Bamboo Javelin-Grove",
         sailor: "Reduces Silence duration on this character by 4 turns",
         sailorNotes: "#{silence}",
     },
     1686: {//20th Anni Usopp
         captain: "Boosts ATK of Shooter characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
-        specialName: "Usopp Special",
+        specialName: "Green Star: Bamboo Javelin-Grove",
         sailor: "Reduces Silence duration on this character by 4 turns",
         sailorNotes: "#{silence}",
     },
@@ -9453,7 +9453,7 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2x and reduce damage received by 10%",
         special: "Changes own orb into [DEX], deals 15 hits of random typeless damage to random enemies, and reduces the defense of all enemies by 100% for 2 turns",
         specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
-        specialName: "Franky Special",
+        specialName: "Franky Iron BOXING",
         sailor: "Restores his own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
     },
@@ -9461,29 +9461,51 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.5x and reduce damage received by 15%",
         special: "Changes own orb into [DEX], deals 15 hits of random typeless damage to random enemies, and reduces the defense of all enemies by 100% for 2 turns",
         specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
-        specialName: "Franky Special",
+        specialName: "Franky Iron BOXING",
         sailor: "Restores his own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
     },
     1689: {//Fortnight Kid
         captain: "Boosts ATK of all characters by 1.5x at the start of the chain, by 2.25x following a chain of STR > DEX > INT attacks no lower than Good",
         special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
-        specialName: "Kid Special",
+        specialName: "Iron Giant Palm Slam",
     },
     1690: {//Fortnight Kid
         captain: "Boosts ATK of all characters by 2x at the start of the chain, by 3x following a chain of STR > DEX > INT attacks no lower than Good",
         special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
-        specialName: "Kid Special",
+        specialName: "Iron Giant Palm Slam",
     },
     1691: {//Heat
         captain: "Boosts ATK of Shooter characters by 1.75x",
         special: "Boosts ATK against enemies with reduced defense by 1.3x for 1 turn, changes the captain's [STR], [DEX], [QCK], [INT], or [PSY] orbs into Matching orbs.",
-        specialName: "Heat Special",
+        specialName: "Aim and Burn",
     },
     1692: {//Wire
         captain: "Boosts HP of Driven characters by 1.5x",
         special: "Adds .3x to Chain multiplier, and reduces the defense of all enemies by 50% for 1 turn",
-        specialName: "Wire Special",
+        specialName: "Three Wind Tunnels",
+    },
+    1693: {//Inuarashi
+        captain: "Boosts ATK of [PSY] characters by 2x",
+        special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemies, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
+        specialName: "Inuarashi Special",
+    },
+    1694: {//Inuarashi
+        captain: "Boosts ATK of [PSY] characters by 2.75x",
+        special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemies, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
+        specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
+        specialName: "Inuarashi Special",
+    },
+    1695: {//Vergo
+        captain: "Boosts ATK of Striker characters by 2x",
+        special: "Deals 50x character's ATK in [DEX] damage to all enemies, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
+        specialName: "Vergo Special",
+    },
+    1696: {//Vergo
+        captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
+        special: "Deals 50x character's ATK in [DEX] damage to all enemies, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
+        specialName: "Vergo Special",
     },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
diff --git a/common/data/drops.js b/common/data/drops.js
index ed0a2a25f..9fff9711d 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1898,6 +1898,14 @@ window.drops = {
             Master: [ 1594 ],
             Expert: [ 1594 ]
         },
+        
+        {
+            name: 'Clash!! Vergo',
+            thumb: 1696,
+            gamewith: null,
+            Master: [ 1695 ],
+            Expert: [ 1695 ]
+        },
 
     ],
 
@@ -1977,7 +1985,7 @@ window.drops = {
             teamDatabase: 'coliseums',
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 07f47dcfd..9c93f693b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2615,6 +2615,14 @@ window.evolutions = {
         evolution: 1690,
         evolvers: [  ]
     },
+    1693: {
+        evolution: 1694,
+        evolvers: [  ]
+    },
+    1695: {
+        evolution: 1696,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 64935fb39..b5a9fff51 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1691,10 +1691,10 @@ window.families = [
     "Eustass Kid",
     "Heat",
     "Wire",
-    null,
-    null,
-    null,
-    null,
+    "Inuarashi",
+    "Inuarashi",
+    "Vergo",
+    "Vergo",
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index 42f0e55e0..a6d2a18cf 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3240,6 +3240,22 @@ window.specials = {
         chainAddition: function(p){ return 0.3; },
         def: function(p) { return 0.5; }
     },
+    1693: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+    },
+    1694: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+    },
+    1695: {
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1696: {
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 1229b5a97..4ca48b79f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1679,22 +1679,22 @@ window.units = [
     [ "Trafalgar Law, A Vow in the Great Age of Pirates - Free Spirit", "INT", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1109, 660, 164, 2177, 1423, 361, 1 ],
     [ "Dracule Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 4, 1, 70, 1066998, 328, 194, 3, 2009, 804, 9, 1 ],
     [ "Hawk Eyes Mihawk [Neo]", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 4, 2, 99, 5000000, 1934, 778, 13, 3794, 1280, 24, 1 ],
-    [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 654, 420, 39, 1206, 719, 175, null ],
-    [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 8, 5, 99, 4000000, 1033, 587, 113, 2440, 1406, 279, null ],
-    [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 601, 335, 66, 1043, 604, 257, null ],
-    [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 878, 478, 189, 2126, 1200, 404, null ],
-    [ "Usopp, Celebrate 20th Anniversary Cruise", "INT", "Shooter", 4, 15, 6, 3, 50, 392109, 707, 324, 49, 1313, 587, 209, null ],
-    [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, 2550, 1184, 336, null ],
-    [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 794, 385, 30, 1599, 687, 126, null ],
-    [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 10, 5, 99, 4000000, 1487, 559, 69, 3095, 1255, 205, null ],
-    [ "Eustass Kid", "INT", [ "Striker", "Driven" ], 3, 13, 4, 2, 50, 392109, 125, 61, 40, 757, 579, 155, null ],
-    [ "Eustass Kid, Evolved", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, null, null, null, null ],
+    [ "Monkey D. Luffy, Celebrate 20th Anniversary Cruise", "STR", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 654, 420, 39, 1206, 719, 175, 1 ],
+    [ "Monkey D. Luffy, 20th Anniversary Memorial Treasure", "STR", [ "Fighter", "Free Spirit" ], 5, 30, 8, 5, 99, 4000000, 1033, 587, 113, 2440, 1406, 279, 1 ],
+    [ "Nico Robin, Celebrate 20th Anniversary Cruise", "QCK", [ "Fighter", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 601, 335, 66, 1043, 604, 257, 1 ],
+    [ "Nico Robin, 20th Anniversary Memorial Treasure", "QCK", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 878, 478, 189, 2126, 1200, 404, 1 ],
+    [ "Usopp, Celebrate 20th Anniversary Cruise", "INT", "Shooter", 4, 15, 6, 3, 50, 392109, 707, 324, 49, 1313, 587, 209, 1 ],
+    [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, 2550, 1184, 336, 1 ],
+    [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 794, 385, 30, 1599, 687, 126, 1 ],
+    [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 10, 5, 99, 4000000, 1487, 559, 69, 3095, 1255, 205, 1 ],
+    [ "Eustass Kid, Supernova Born from the South Sea", "INT", [ "Striker", "Driven" ], 3, 13, 4, 2, 50, 392109, 125, 61, 40, 757, 579, 155, null ],
+    [ "Captain Kid, Supernova Born from the South Sea", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, 2154, 1406, 204, null ],
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, null, null, null, null ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coliseum Inuarashi", "PSY", [ "Slasher?", "Cerebral?" ], 4, 25, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Coliseum Inuarashi", "PSY", [ "Slasher?", "Cerebral?" ], 5, 40, null, 5, 99, 4000000, null, null, null, 2330, 1405, 301, null ],
+    [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b68041c473d9a073d4169b3bea14917267296d6f Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 25 Jul 2017 17:41:47 -0400
Subject: [PATCH 1242/1569] Inuarashi classes

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 4ca48b79f..a8b8a6dd1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1691,8 +1691,8 @@ window.units = [
     [ "Captain Kid, Supernova Born from the South Sea", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, 2154, 1406, 204, null ],
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, null, null, null, null ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, null, null, null, null ],
-    [ "Coliseum Inuarashi", "PSY", [ "Slasher?", "Cerebral?" ], 4, 25, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Coliseum Inuarashi", "PSY", [ "Slasher?", "Cerebral?" ], 5, 40, null, 5, 99, 4000000, null, null, null, 2330, 1405, 301, null ],
+    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 4, 25, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 5, 40, null, 5, 99, 4000000, null, null, null, 2330, 1405, 301, null ],
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From a7b74e3eb6c62577fd1f665421db6aeaeac35635 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 25 Jul 2017 23:51:33 -0400
Subject: [PATCH 1243/1569] Inuarashi stuffs

---
 common/data/details.js | 4 ++--
 common/data/units.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index a8ca47b39..2b05bbe99 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9487,13 +9487,13 @@ window.details = {
     },
     1693: {//Inuarashi
         captain: "Boosts ATK of [PSY] characters by 2x",
-        special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemies, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
+        special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
         specialName: "Inuarashi Special",
     },
     1694: {//Inuarashi
         captain: "Boosts ATK of [PSY] characters by 2.75x",
-        special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemies, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
+        special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
         specialName: "Inuarashi Special",
     },
diff --git a/common/data/units.js b/common/data/units.js
index a8b8a6dd1..868a016ef 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1691,7 +1691,7 @@ window.units = [
     [ "Captain Kid, Supernova Born from the South Sea", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, 2154, 1406, 204, null ],
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, null, null, null, null ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, null, null, null, null ],
-    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 4, 25, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
     [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 5, 40, null, 5, 99, 4000000, null, null, null, 2330, 1405, 301, null ],
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],

From d8bbea514bf8e9fd2c0483f805182bbbd969b158 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Wed, 26 Jul 2017 10:41:34 -0400
Subject: [PATCH 1244/1569] New units

Will add Nami later maybe
---
 common/data/details.js    | 95 +++++++++++++++++++++++++++++++++++++--
 common/data/evolutions.js | 20 +++++++++
 common/data/families.js   | 20 ++++-----
 common/data/flags.js      | 10 +++++
 common/data/units.js      | 22 ++++-----
 5 files changed, 143 insertions(+), 24 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2b05bbe99..8398574af 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5551,14 +5551,14 @@ window.details = {
     1122: {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts own ATK by 2.25x for 2 turns, amplifies the effect of own orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        special: "Removes all positive buffs on your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts own ATK by 2.25x for 2 turns, amplifies the effect of own orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
         specialName: "Slicing Winds of Rommel"
     },
     1123: {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.5x, but boosts his OWN attack by 4x",
         captainNotes: "Cavendish only boosts Friend or Sub Cavendish by 2.5x for a total of 10x boost with two Cavendish captains",
-        special: "Removes all positive buffs on Your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts own ATK by 2.25x for 2 turns, amplifies the effect of own orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
+        special: "Removes all positive buffs on your team. Deals 15x the character's ATK as Typeless damage to all enemies. Boosts own ATK by 2.25x for 2 turns, amplifies the effect of own orb by 1.5x for 2 turns, locks his orb for 2 turns, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
         specialName: "Slicing Winds of Rommel"
     },
@@ -7450,7 +7450,6 @@ window.details = {
     },
     1387: {//Luffy 5+
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. Boosts ATK by 2.8125x after scoring 4 Perfects in a row",
-        captainNotes: "After 4 Perfects, your captain boost is 2.8125x",
         special: "Deals 40x character's ATK in [STR] damage to all enemies, and delays all enemies for 1 turn",
         specialName: "Gum Gum: Elephant Gun",
     },
@@ -9507,6 +9506,96 @@ window.details = {
         special: "Deals 50x character's ATK in [DEX] damage to all enemies, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
         specialName: "Vergo Special",
     },
+    1697: {//Magellan
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and a Fighter, Slasher, Shooter, Striker, Driven, Free Spirit, Cerebral and Powerhouse character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
+        special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
+        specialName: "Magellan Special",
+    },
+    1698: {//Magellan
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and a Fighter, Slasher, Shooter, Striker, Driven, Free Spirit, Cerebral and Powerhouse character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
+        special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
+        specialName: "Magellan Special",
+    },
+    1699: {//Jinbe
+        captain: "Boosts ATK of Fighter characters by ???x, and their HP by ???x",
+        special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit duration by 3 turns",
+        specialName: "Jinbe Special",
+        specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
+        sailor: "Boosts ATK of Fighter characters by 75",
+    },
+    1700: {//Jinbe
+        captain: "Boosts ATK of Fighter characters by 2.5x, and their HP by 1.3x",
+        special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit duration by 3 turns",
+        specialName: "Jinbe Special",
+        specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
+        sailor: "Boosts ATK of Fighter characters by 75",
+    },
+    1701: {//Ivankov
+        captain: "Boosts ATK of Free Spirit characters by ???x, recovers ???x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Randomizes all orbs",
+                "cooldown": [ null, null ]
+            },
+            {
+                "description": "Changes [BLOCK] orbs into Matching orbs",
+                "cooldown": [ null, null ]
+            },
+            {
+                "description": "Changes [BLOCK] and Badly Matching orbs into Matching orbs",
+                "cooldown": [ null, null ]
+            }
+        ],
+        specialName: "Ivankov Special",
+        specialNotes: "#{stages}",
+        sailor: "Completely resists Paralysis on this character",
+    },
+    1702: {//Ivankov
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers ???x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Randomizes all orbs",
+                "cooldown": [ null, null ]
+            },
+            {
+                "description": "Changes [BLOCK] orbs into Matching orbs",
+                "cooldown": [ null, null ]
+            },
+            {
+                "description": "Changes [BLOCK] and Badly Matching orbs into Matching orbs",
+                "cooldown": [ null, null ]
+            }
+        ],
+        specialName: "Ivankov Special",
+        specialNotes: "#{stages}",
+        sailor: "Completely resists Paralysis on this character",
+    },
+    1703: {//Hannyabal
+        captain: "Boosts ATK of [INT] characters by ???x, recovers ???x character's RCV in HP at the end of each turn",
+        special: "Reduces damage received by 50% for 2 turns and boosts ATK against Poisoned and Strongly Poisoned enemies by 1.75x for 2 turns",
+        specialName: "Hannyabal Special",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
+    },
+    1704: {//Hannyabal
+        captain: "Boosts ATK of [INT] characters by 2.5x, recovers ???x character's RCV in HP at the end of each turn",
+        special: "Reduces damage received by 50% for 2 turns and boosts ATK against Poisoned and Strongly Poisoned enemies by 1.75x for 2 turns",
+        specialName: "Hannyabal Special",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
+    },
+    1705: {//Bon Clay
+        captain: "Boosts ATK of all characters by ???x. Boosts ATK by ???x after scoring 3 Perfects in a row",
+        special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
+        specialName: "Bon Clay Special",
+        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+    },
+    1706: {//Bon Clay
+        captain: "Boosts ATK of all characters by 2.5x. Boosts ATK by 3.125x after scoring 3 Perfects in a row",
+        special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
+        specialName: "Bon Clay Special",
+        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 9c93f693b..b1d285151 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2623,6 +2623,26 @@ window.evolutions = {
         evolution: 1696,
         evolvers: [  ]
     },
+    1697: {
+        evolution: 1698,
+        evolvers: [  ]
+    },
+    1699: {
+        evolution: 1700,
+        evolvers: [  ]
+    },
+    1701: {
+        evolution: 1702,
+        evolvers: [  ]
+    },
+    1703: {
+        evolution: 1704,
+        evolvers: [  ]
+    },
+    1705: {
+        evolution: 1706,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index b5a9fff51..1cda03ac4 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1695,16 +1695,16 @@ window.families = [
     "Inuarashi",
     "Vergo",
     "Vergo",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Magellan",
+    "Magellan",
+    "Jimbe",
+    "Jimbe",
+    "Emporio Ivankov",
+    "Emporio Ivankov",
+    "Hannyabal",
+    "Hannyabal",
+    "Bentham",
+    "Bentham",
     null,
     null,
     null,
diff --git a/common/data/flags.js b/common/data/flags.js
index c279bdd2b..179284288 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1481,6 +1481,16 @@ window.flags = {
     1686: { rr: 1, rro: 1 },
     1687: { rr: 1, rro: 1 },
     1688: { rr: 1, rro: 1 },
+    1697: { rr: 1, rro: 1 },
+    1698: { rr: 1, rro: 1 },
+    1699: { rr: 1, rro: 1 },
+    1700: { rr: 1, rro: 1 },
+    1701: { rr: 1, rro: 1 },
+    1702: { rr: 1, rro: 1 },
+    1703: { rr: 1, rro: 1 },
+    1704: { rr: 1, rro: 1 },
+    1705: { rr: 1, rro: 1 },
+    1706: { rr: 1, rro: 1 },
     1750: { rr: 1, rro: 1 },
     1751: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 868a016ef..1733d920c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1692,19 +1692,19 @@ window.units = [
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, null, null, null, null ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, null, null, null, null ],
     [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
-    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 5, 40, null, 5, 99, 4000000, null, null, null, 2330, 1405, 301, null ],
+    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Magellan", "DEX", [ "Striker", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Magellan, Evolved", "DEX", [ "Striker", "Shooter" ], 6, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ivankov", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ivankov, Evolved", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hannyabal", "INT", [ "Driven", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hannyabal, Evolved", "INT", [ "Driven", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bon Clay", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bon Clay, Evolved", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 28669fceb5e5848cc7c2381b35bac84cc8910559 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Wed, 26 Jul 2017 11:57:51 -0400
Subject: [PATCH 1245/1569] Stats and Details

---
 common/data/aliases.js    |  4 ++--
 common/data/cooldowns.js  | 24 +++++++++++-----------
 common/data/details.js    | 42 +++++++++++++++++++++++++--------------
 common/data/evolutions.js |  4 ++++
 common/data/units.js      |  8 ++++----
 5 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 23024cf4f..e7096ef60 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1706,8 +1706,8 @@ window.aliases = {
     1705: ['', '', ''],
     1706: ['', '', ''],
     1707: ['', '', ''],
-    1708: ['', '', ''],
-    1709: ['', '', ''],
+    1708: ['', '', 'Summer Nami', 'Swimsuit Nami'],
+    1709: ['', '', 'Summer Nami', 'Swimsuit Nami'],
     1710: ['', '', ''],
     1711: ['', '', ''],
     1712: ['', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0d95d7b48..7cb2e44d8 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1695,19 +1695,19 @@ window.cooldowns = [
     24,
     30,
     30,
+    19,
+    19,
+    16,
+    16,
+    15,
+    15,
+    20,
+    20,
+    19,
+    19,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    15,
+    15,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 8398574af..b6e0b381e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9507,19 +9507,19 @@ window.details = {
         specialName: "Vergo Special",
     },
     1697: {//Magellan
-        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and a Fighter, Slasher, Shooter, Striker, Driven, Free Spirit, Cerebral and Powerhouse character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Magellan Special",
     },
     1698: {//Magellan
-        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and a Fighter, Slasher, Shooter, Striker, Driven, Free Spirit, Cerebral and Powerhouse character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Magellan Special",
     },
     1699: {//Jinbe
-        captain: "Boosts ATK of Fighter characters by ???x, and their HP by ???x",
+        captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.2x",
         special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit duration by 3 turns",
         specialName: "Jinbe Special",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
@@ -9533,19 +9533,19 @@ window.details = {
         sailor: "Boosts ATK of Fighter characters by 75",
     },
     1701: {//Ivankov
-        captain: "Boosts ATK of Free Spirit characters by ???x, recovers ???x character's RCV in HP at the end of each turn",
+        captain: "Boosts ATK of Free Spirit characters by 2x of [STR] characters",
         special: [
             {
                 "description": "Randomizes all orbs",
-                "cooldown": [ null, null ]
+                "cooldown": [ 9, null ]
             },
             {
                 "description": "Changes [BLOCK] orbs into Matching orbs",
-                "cooldown": [ null, null ]
+                "cooldown": [ 12, null ]
             },
             {
                 "description": "Changes [BLOCK] and Badly Matching orbs into Matching orbs",
-                "cooldown": [ null, null ]
+                "cooldown": [ 15, null ]
             }
         ],
         specialName: "Ivankov Special",
@@ -9557,15 +9557,15 @@ window.details = {
         special: [
             {
                 "description": "Randomizes all orbs",
-                "cooldown": [ null, null ]
+                "cooldown": [ 9, null ]
             },
             {
                 "description": "Changes [BLOCK] orbs into Matching orbs",
-                "cooldown": [ null, null ]
+                "cooldown": [ 12, null ]
             },
             {
                 "description": "Changes [BLOCK] and Badly Matching orbs into Matching orbs",
-                "cooldown": [ null, null ]
+                "cooldown": [ 15, null ]
             }
         ],
         specialName: "Ivankov Special",
@@ -9573,29 +9573,41 @@ window.details = {
         sailor: "Completely resists Paralysis on this character",
     },
     1703: {//Hannyabal
-        captain: "Boosts ATK of [INT] characters by ???x, recovers ???x character's RCV in HP at the end of each turn",
-        special: "Reduces damage received by 50% for 2 turns and boosts ATK against Poisoned and Strongly Poisoned enemies by 1.75x for 2 turns",
+        captain: "Boosts ATK of [INT] characters by 2x",
+        special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflixed with Toxic by 1.75x for 2 turns",
         specialName: "Hannyabal Special",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
     1704: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2.5x, recovers ???x character's RCV in HP at the end of each turn",
-        special: "Reduces damage received by 50% for 2 turns and boosts ATK against Poisoned and Strongly Poisoned enemies by 1.75x for 2 turns",
+        special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflixed with Toxic by 1.75x for 2 turns",
         specialName: "Hannyabal Special",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
     1705: {//Bon Clay
-        captain: "Boosts ATK of all characters by ???x. Boosts ATK by ???x after scoring 3 Perfects in a row",
+        captain: "Boosts ATK of [STR] characters by 2x",
         special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
         specialName: "Bon Clay Special",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
     },
     1706: {//Bon Clay
-        captain: "Boosts ATK of all characters by 2.5x. Boosts ATK by 3.125x after scoring 3 Perfects in a row",
+        captain: "Boosts ATK of [STR] characters by 2.5x. Boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
         special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
         specialName: "Bon Clay Special",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
     },
+    1708: {//Summer Nami
+        captain: "Recovers 3x character's RCV in HP at the end of each turn",
+        special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
+        specialName: "Summer Nami Special",
+        sailor: "Makes [TND] orbs \"beneficial\" for this unit",
+    },
+    1709: {//Summer Nami
+        captain: "Boosts ATK of all characters by 1.5x, recovers 4x character's RCV in HP at the end of each turn",
+        special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
+        specialName: "Summer Nami Special",
+        sailor: "Makes [TND] orbs \"beneficial\" for this unit",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b1d285151..0a1295209 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2643,6 +2643,10 @@ window.evolutions = {
         evolution: 1706,
         evolvers: [  ]
     },
+    1708: {
+        evolution: 1709,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/units.js b/common/data/units.js
index 1733d920c..2452a33d4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1695,8 +1695,8 @@ window.units = [
     [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
-    [ "Magellan", "DEX", [ "Striker", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Magellan, Evolved", "DEX", [ "Striker", "Shooter" ], 6, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Magellan", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Magellan, Evolved", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, null, null, null, 3527, 1499, 291, null ],
     [ "Jinbe", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Jinbe, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ivankov", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1706,8 +1706,8 @@ window.units = [
     [ "Bon Clay", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Bon Clay, Evolved", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Summer Nami", "QCK", [ "Cerebral", "Fighter" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Summer Nami, Evolved", "QCK", [ "Cerebral", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 8545aca07967a1a208a526ac6482a662eae4e8be Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Wed, 26 Jul 2017 14:40:01 -0400
Subject: [PATCH 1246/1569] Names

---
 common/data/details.js | 24 ++++++++++++------------
 common/data/units.js   | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index b6e0b381e..bc6553f5f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9488,13 +9488,13 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2x",
         special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
-        specialName: "Inuarashi Special",
+        specialName: "King's Lightning Burial",
     },
     1694: {//Inuarashi
         captain: "Boosts ATK of [PSY] characters by 2.75x",
         special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
-        specialName: "Inuarashi Special",
+        specialName: "King's Lightning Burial",
     },
     1695: {//Vergo
         captain: "Boosts ATK of Striker characters by 2x",
@@ -9510,25 +9510,25 @@ window.details = {
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
-        specialName: "Magellan Special",
+        specialName: "Venom Cloud",
     },
     1698: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
-        specialName: "Magellan Special",
+        specialName: "Venom Cloud",
     },
     1699: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.2x",
         special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit duration by 3 turns",
-        specialName: "Jinbe Special",
+        specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
         sailor: "Boosts ATK of Fighter characters by 75",
     },
     1700: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x, and their HP by 1.3x",
         special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit duration by 3 turns",
-        specialName: "Jinbe Special",
+        specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
         sailor: "Boosts ATK of Fighter characters by 75",
     },
@@ -9548,7 +9548,7 @@ window.details = {
                 "cooldown": [ 15, null ]
             }
         ],
-        specialName: "Ivankov Special",
+        specialName: "Hair Removal Fist",
         specialNotes: "#{stages}",
         sailor: "Completely resists Paralysis on this character",
     },
@@ -9568,32 +9568,32 @@ window.details = {
                 "cooldown": [ 15, null ]
             }
         ],
-        specialName: "Ivankov Special",
+        specialName: "Hair Removal Fist",
         specialNotes: "#{stages}",
         sailor: "Completely resists Paralysis on this character",
     },
     1703: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflixed with Toxic by 1.75x for 2 turns",
-        specialName: "Hannyabal Special",
+        specialName: "Inferno Hell Wheel",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
     1704: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2.5x, recovers ???x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflixed with Toxic by 1.75x for 2 turns",
-        specialName: "Hannyabal Special",
+        specialName: "Inferno Hell Wheel",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
     1705: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2x",
         special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
-        specialName: "Bon Clay Special",
+        specialName: "A Speech Left in Hell",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
     },
     1706: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2.5x. Boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
         special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
-        specialName: "Bon Clay Special",
+        specialName: "A Speech Left in Hell",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
     },
     1708: {//Summer Nami
diff --git a/common/data/units.js b/common/data/units.js
index 2452a33d4..b1f65feb2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1691,20 +1691,20 @@ window.units = [
     [ "Captain Kid, Supernova Born from the South Sea", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, 2154, 1406, 204, null ],
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, null, null, null, null ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, null, null, null, null ],
-    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
-    [ "Coliseum Inuarashi", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
+    [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
+    [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
-    [ "Magellan", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Magellan, Evolved", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, null, null, null, 3527, 1499, 291, null ],
-    [ "Jinbe", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Jinbe, Evolved", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ivankov", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ivankov, Evolved", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hannyabal", "INT", [ "Driven", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hannyabal, Evolved", "INT", [ "Driven", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Bon Clay", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Bon Clay, Evolved", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, null, null, null, 3527, 1499, 291, null ],
+    [ "Jimbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jimbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Summer Nami", "QCK", [ "Cerebral", "Fighter" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Summer Nami, Evolved", "QCK", [ "Cerebral", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],

From cf3aa8c6bc0bb4ed888fd6b6bc50119c2a727040 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Wed, 26 Jul 2017 22:37:19 -0400
Subject: [PATCH 1247/1569] Temp stats

---
 common/data/captains.js | 43 +++++++++++++++++++++++++++++++++++++++++
 common/data/details.js  |  2 +-
 common/data/sailors.js  | 16 +++++++++++++++
 common/data/specials.js | 22 ++++++++++++++++++---
 common/data/units.js    |  2 +-
 5 files changed, 80 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 78202f4a9..07794af58 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5085,6 +5085,49 @@ window.captains = {
     1696: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
+    1697: {
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2.25;
+            else
+                return 1; 
+               },
+    },
+    1698: {
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2.25;
+            else
+                return 1; 
+               },
+    },
+    1699: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
+    1700: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.3 : 1; }
+    },
+    1701: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+    },
+    1702: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+    },
+    1703: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+    },
+    1704: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+    },
+    1705: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+    },
+    1706: {
+        hitAtk: function(p) {
+            return !p.unit.type == "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/details.js b/common/data/details.js
index bc6553f5f..8d3d59636 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9533,7 +9533,7 @@ window.details = {
         sailor: "Boosts ATK of Fighter characters by 75",
     },
     1701: {//Ivankov
-        captain: "Boosts ATK of Free Spirit characters by 2x of [STR] characters",
+        captain: "Boosts ATK of Free Spirit characters by 2x",
         special: [
             {
                 "description": "Randomizes all orbs",
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 1267f4d77..1411a87dc 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -298,4 +298,20 @@ window.sailors = {
         atkStatic: function(p) { return 56; },
         hpStatic: function(p) { return 56; },
     },
+    1699: {
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; },
+    },
+    1700: {
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; },
+    },
+    1705: {
+        atkStatic: function(p) { return 50; },
+        rcvStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; },
+    },
+    1706: {
+        atkStatic: function(p) { return 50; },
+        rcvStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index a6d2a18cf..fd1932dbd 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -790,7 +790,7 @@ window.specials = {
     827: {
         atk: function(p) { return 1.05; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
     828: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[828].multiplier : 1; },
@@ -1180,12 +1180,12 @@ window.specials = {
     928: {
         atk: function(p) { return 1.3; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
     929: {
         atk: function(p) { return 1.3; },
         type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned."
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
     940: {
         atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
@@ -3256,6 +3256,22 @@ window.specials = {
     1696: {
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
+    1699: {
+        chainAddition: function(p) { return 0.3; }
+    },
+    1700: {
+        chainAddition: function(p) { return 0.3; }
+    },
+    1703: {
+        atk: function(p) { return 1.75; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been inflicted with Toxin."
+    },
+    1704: {
+        atk: function(p) { return 1.75; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been inflicted with Toxin."
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index b1f65feb2..172d8c265 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1696,7 +1696,7 @@ window.units = [
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, null, null, null, 3527, 1499, 291, null ],
+    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1, 1, 1, 3527, 1499, 291, null ],
     [ "Jimbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Jimbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 4e98aadd133088edef8fd06d62539f2239d30e02 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 27 Jul 2017 01:30:10 -0400
Subject: [PATCH 1248/1569] Finalization of stuffs

---
 common/data/details.js | 20 ++++++++++----------
 common/data/zombies.js |  8 ++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8d3d59636..2388ffdd5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9055,15 +9055,15 @@ window.details = {
         captain: "Boosts ATK Free Spirit characters by 2x",
         special: [
             {
-                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by 1.25x for 1 turn",
+                "description": "Reduces Chain Multiplier Limit duration by 1 turn and boosts the Color Affinity of Striker characters by 1.25x for 1 turn",
                 "cooldown": [ 23, 9 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by 1.5x for 1 turn",
+                "description": "Reduces Chain Multiplier Limit duration by 3 turns and boosts the Color Affinity of Striker characters by 1.5x for 1 turn",
                 "cooldown": [ 27, 13 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
+                "description": "Reduces Chain Multiplier Limit duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
                 "cooldown": [ 31, 17 ]
             },
         ],
@@ -9074,15 +9074,15 @@ window.details = {
         captain: "Boosts ATK Free Spirit and Striker characters by 2.25x and their RCV by 1.5x",
         special: [
             {
-                "description": "Reduces Chain Multiplier Lock duration by 1 turn and boosts the Color Affinity of Striker characters by 1.25x for 1 turn",
+                "description": "Reduces Chain Multiplier Limit duration by 1 turn and boosts the Color Affinity of Striker characters by 1.25x for 1 turn",
                 "cooldown": [ 23, 9 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 3 turns and boosts the Color Affinity of Striker characters by 1.5x for 1 turn",
+                "description": "Reduces Chain Multiplier Limit duration by 3 turns and boosts the Color Affinity of Striker characters by 1.5x for 1 turn",
                 "cooldown": [ 27, 13 ]
             },
             {
-                "description": "Reduces Chain Multiplier Lock duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
+                "description": "Reduces Chain Multiplier Limit duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
                 "cooldown": [ 31, 17 ]
             },
         ],
@@ -9520,14 +9520,14 @@ window.details = {
     },
     1699: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.2x",
-        special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit duration by 3 turns",
+        special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit and Chain Coeffiecient Reduction duration by 3 turns",
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
         sailor: "Boosts ATK of Fighter characters by 75",
     },
     1700: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x, and their HP by 1.3x",
-        special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit duration by 3 turns",
+        special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit and Chain Coeffiecient Reduction duration by 3 turns",
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
         sailor: "Boosts ATK of Fighter characters by 75",
@@ -9553,7 +9553,7 @@ window.details = {
         sailor: "Completely resists Paralysis on this character",
     },
     1702: {//Ivankov
-        captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers ???x character's RCV in HP at the end of each turn",
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: [
             {
                 "description": "Randomizes all orbs",
@@ -9579,7 +9579,7 @@ window.details = {
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
     1704: {//Hannyabal
-        captain: "Boosts ATK of [INT] characters by 2.5x, recovers ???x character's RCV in HP at the end of each turn",
+        captain: "Boosts ATK of [INT] characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflixed with Toxic by 1.75x for 2 turns",
         specialName: "Inferno Hell Wheel",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
diff --git a/common/data/zombies.js b/common/data/zombies.js
index e9d64dccc..ee4e63321 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -419,4 +419,12 @@ window.zombies = {
         type: 'healer',
         amount: 300
     },
+    1702: { // Ivankov
+        type: 'healer',
+        multiplier: 2
+    },
+    1704: { // Hannyabal
+        type: 'healer',
+        multiplier: 2
+    },
 };

From 1d02fb3ae3a2250bf19fa3372d2adfcc1df7c641 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Wed, 26 Jul 2017 23:34:05 -0700
Subject: [PATCH 1249/1569] Fixed Legend Magellan Typo

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2388ffdd5..ce6b09049 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9509,13 +9509,13 @@ window.details = {
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
+        specialNotes: "Toxic starts at 50x character's attack and increases by 3x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Venom Cloud",
     },
     1698: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 50x at the end of every turn until 2,000,000 damage per turn.",
+        specialNotes: "Toxic starts at 50x character's attack and increases by 3x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Venom Cloud",
     },
     1699: {//Jinbe

From 22bc08b081f6d0513ecc36088cc71f9653923dc7 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Thu, 27 Jul 2017 10:44:52 -0400
Subject: [PATCH 1250/1569] new shit

---
 common/data/captains.js   | 24 ++++++++++++++++++++++++
 common/data/details.js    | 16 ++++++++++++++++
 common/data/evolutions.js |  4 ++++
 common/data/specials.js   | 17 +++++++++++++++++
 common/data/units.js      | 10 +++++-----
 5 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 07794af58..da370cebc 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5091,6 +5091,11 @@ window.captains = {
             else
                 return 1; 
                },
+        hp: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.5;
+            else
+                return 1; 
+               },
     },
     1698: {
         atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
@@ -5098,6 +5103,11 @@ window.captains = {
             else
                 return 1; 
                },
+        hp: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.5;
+            else
+                return 1; 
+               },
     },
     1699: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
@@ -5128,6 +5138,20 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
+    1707: {
+        atk: function(p) { return p.unit.type == "PSY" ? 2.75 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+    },
+    1709: {
+        atk: function(p) { return 1.5; },
+    },
+    1712: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+    },
+    1713: {
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/details.js b/common/data/details.js
index ce6b09049..6e2938537 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9596,6 +9596,12 @@ window.details = {
         specialName: "A Speech Left in Hell",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
     },
+    1707: {//Shanks 6+
+        captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
+        captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
+        special: "Deals 75x character's ATK in typeless damage to one enemy, reduces the defense of all enemies by 100% for 1 turns and changes all orbs to [PSY] orbs",
+        specialName: "Arm to Break the Clouds",
+    },
     1708: {//Summer Nami
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
@@ -9608,6 +9614,16 @@ window.details = {
         specialName: "Summer Nami Special",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
     },
+    1712: {//Secret Jinbe
+        captain: "Boosts ATK of Fighter characters by 2.5x",
+        special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
+        specialName: "Passive Agressive Boss"
+    },
+    1713: {//Secret Jinbe
+        captain: "Boosts HP of Fighter characters by 1.4x and boosts ATK by 2.75x if they have a matching orb, by 2.5x otherwise.",
+        special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
+        specialName: "Passive Agressive Boss"
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0a1295209..f35fa5408 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2643,6 +2643,10 @@ window.evolutions = {
         evolution: 1706,
         evolvers: [  ]
     },
+    530: {
+        evolution: 1707,
+        evolvers: [  ]
+    },
     1708: {
         evolution: 1709,
         evolvers: [  ]
diff --git a/common/data/specials.js b/common/data/specials.js
index fd1932dbd..803256e21 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3272,6 +3272,23 @@ window.specials = {
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has been inflicted with Toxin."
     },
+    1707: {
+        def: function(p) { return 0; }
+    },
+    1712: {
+        chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
+        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') ? 2.75 : 1;
+        }
+    },
+    1713: {
+        chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
+        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') ? 2.75 : 1;
+        }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 172d8c265..af33b99a0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1697,21 +1697,21 @@ window.units = [
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1, 1, 1, 3527, 1499, 291, null ],
-    [ "Jimbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Jimbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "6+ Shanks", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
     [ "Timeskip Summer Nami", "QCK", [ "Cerebral", "Fighter" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Summer Nami, Evolved", "QCK", [ "Cerebral", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Boss Jinbe, Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 5ce4f37a5cbb32c80334be77bd396a1db739a881 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Thu, 27 Jul 2017 12:55:19 -0400
Subject: [PATCH 1251/1569] Fixes

---
 common/data/aliases.js    | 22 +++++++++++-----------
 common/data/captains.js   |  4 ++--
 common/data/cooldowns.js  |  8 ++++----
 common/data/details.js    |  6 +++---
 common/data/drops.js      |  2 +-
 common/data/evolutions.js |  4 ++++
 common/data/gw.js         | 33 +++++++++++++++++++++++++++++++++
 common/data/specials.js   |  4 ++--
 common/data/units.js      | 14 +++++++-------
 9 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index e7096ef60..ec10fcab9 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1618,8 +1618,8 @@ window.aliases = {
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
     1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
-    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid'],
-    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid'],
+    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid'],
+    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid'],
     1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy', 'INT Doflamingo'],
     1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'INT Doffy', 'INT Doflamingo'],
     1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
@@ -1644,8 +1644,8 @@ window.aliases = {
     1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', ''],
     1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', ''],
     1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', ''],
-    1646: ['ピーカ「改」', '', 'Kai Pica'],
-    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica'],
+    1646: ['ピーカ「改」', '', 'Kai Pica', 'STR Pica'],
+    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica', 'STR Pica'],
     1648: ['ジョーラ 芸術人間', '', 'Jora'],
     1649: ['ジョーラ トレーボル軍', '', 'Jora'],
     1650: ['ブルック サイケデリックアート', '', ''],
@@ -1687,10 +1687,10 @@ window.aliases = {
     1686: ['ウソップ 20th Anniversary Memorial Treasure', '', '20th Anniversary Usopp'],
     1687: ['フランキー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Franky'],
     1688: ['フランキー 20th Anniversary Memorial Treasure', '', '20th Anniversary Franky'],
-    1689: ['', '', ''],
-    1690: ['', '', ''],
-    1691: ['', '', ''],
-    1692: ['', '', ''],
+    1689: ['ユースタス・キッド “南の海”出身の超新星', '', ''],
+    1690: ['キャプテン・キッド “南の海”出身の超新星', '', ''],
+    1691: ['ヒート', '', ''],
+    1692: ['ワイヤー', '', ''],
     1693: ['', '', 'Coliseum Inuarashi'],
     1694: ['', '', 'Coliseum Inuarashi'],
     1695: ['', '', 'Raid Vergo'],
@@ -1705,7 +1705,7 @@ window.aliases = {
     1704: ['', '', ''],
     1705: ['', '', ''],
     1706: ['', '', ''],
-    1707: ['', '', ''],
+    1707: ['', '', 'Mega Shanks', 'Super Shanks'],
     1708: ['', '', 'Summer Nami', 'Swimsuit Nami'],
     1709: ['', '', 'Summer Nami', 'Swimsuit Nami'],
     1710: ['', '', ''],
@@ -1718,8 +1718,8 @@ window.aliases = {
     1717: ['', '', ''],
     1718: ['', '', ''],
     1719: ['', '', ''],
-    1720: ['', '', ''],
-    1721: ['', '', ''],
+    1720: ['', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
+    1721: ['', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
     1722: ['', '', ''],
     1723: ['', '', ''],
     1724: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index da370cebc..2c31a5c51 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5145,10 +5145,10 @@ window.captains = {
     1709: {
         atk: function(p) { return 1.5; },
     },
-    1712: {
+    1720: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
-    1713: {
+    1721: {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7cb2e44d8..bf61a5e11 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1691,8 +1691,8 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 20, 14 ],
     [ 17, 14 ],
-    24,
-    24,
+    [ 24, 9 ],
+    [ 24, 9 ],
     30,
     30,
     19,
@@ -1718,8 +1718,8 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
-    null,
+    [ 10, 6 ],
+    [ 10, 6 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 6e2938537..b0305c11e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9600,7 +9600,7 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
         captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
         special: "Deals 75x character's ATK in typeless damage to one enemy, reduces the defense of all enemies by 100% for 1 turns and changes all orbs to [PSY] orbs",
-        specialName: "Arm to Break the Clouds",
+        specialName: "One-Armed Man that Splits the Heavens",
     },
     1708: {//Summer Nami
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
@@ -9614,12 +9614,12 @@ window.details = {
         specialName: "Summer Nami Special",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
     },
-    1712: {//Secret Jinbe
+    1720: {//Secret Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Passive Agressive Boss"
     },
-    1713: {//Secret Jinbe
+    1721: {//Secret Jinbe
         captain: "Boosts HP of Fighter characters by 1.4x and boosts ATK by 2.75x if they have a matching orb, by 2.5x otherwise.",
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Passive Agressive Boss"
diff --git a/common/data/drops.js b/common/data/drops.js
index 9fff9711d..fdf4a1752 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1587,7 +1587,7 @@ window.drops = {
         {
             name: 'Kid Pirates!',
             thumb: 1690,
-            gamewith: null,
+            gamewith: 62883,
             condition: 'Only [INT] and [PSY] orbs appear',
             'All Difficulties': [ 1689, 1691, 1692, -1532, -1543, -449, -453, -1079, -1538, -967, -1346, -1349 ],
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f35fa5408..d45824c2a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2651,6 +2651,10 @@ window.evolutions = {
         evolution: 1709,
         evolvers: [  ]
     },
+    1720: {
+        evolution: 1721,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/gw.js b/common/data/gw.js
index 3331bd7f1..5f7ee15d4 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1687,4 +1687,37 @@ window.gw=[
     62647,
     62645,
     62645,
+    62886,
+    62886,
+    62887,
+    62888,
+    62896,
+    62896,
+    null,
+    null,
+    63199,
+    63199,
+    63200,
+    63200,
+    63203,
+    63203,
+    63204,
+    63204,
+    63205,
+    63205,
+    11948,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    63375,
+    63375,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 803256e21..86613dc09 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3275,14 +3275,14 @@ window.specials = {
     1707: {
         def: function(p) { return 0; }
     },
-    1712: {
+    1720: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         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') ? 2.75 : 1;
         }
     },
-    1713: {
+    1721: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         chainLimiter: function(p) {
             var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
diff --git a/common/data/units.js b/common/data/units.js
index af33b99a0..f61c43d7c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1687,10 +1687,10 @@ window.units = [
     [ "Usopp, 20th Anniversary Memorial Treasure", "INT", "Shooter", 5, 30, 4, 5, 99, 4000000, 1146, 432, 148, 2550, 1184, 336, 1 ],
     [ "Franky, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 794, 385, 30, 1599, 687, 126, 1 ],
     [ "Franky, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Free Spirit" ], 5, 30, 10, 5, 99, 4000000, 1487, 559, 69, 3095, 1255, 205, 1 ],
-    [ "Eustass Kid, Supernova Born from the South Sea", "INT", [ "Striker", "Driven" ], 3, 13, 4, 2, 50, 392109, 125, 61, 40, 757, 579, 155, null ],
-    [ "Captain Kid, Supernova Born from the South Sea", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, 2154, 1406, 204, null ],
-    [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, null, null, null, null ],
-    [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, null, null, null, null ],
+    [ "Eustass Kid, Supernova Born from the South Blue", "INT", [ "Striker", "Driven" ], 3, 13, 4, 2, 50, 392109, 125, 61, 40, 757, 579, 155, 1 ],
+    [ "Captain Kid, Supernova Born from the South Blue", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, 2154, 1406, 204, 1 ],
+    [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, 1201, 955, 122, 1 ],
+    [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, 1449, 896, 101, 1 ],
     [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
     [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1705,13 +1705,11 @@ window.units = [
     [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "6+ Shanks", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
+    [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
     [ "Timeskip Summer Nami", "QCK", [ "Cerebral", "Fighter" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Timeskip Summer Nami, Evolved", "QCK", [ "Cerebral", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Jinbe", "QCK", [ "Fighter", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Boss Jinbe, Evolved", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1720,6 +1718,8 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 5000000, null, null, null, 2594, 1330, 320, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From a3c4f4b9ae7da290d598cbb28e90a85fdb4bfbc0 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Thu, 27 Jul 2017 14:37:34 -0400
Subject: [PATCH 1252/1569] Shanks CD

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index bf61a5e11..34d5b2c7f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1705,7 +1705,7 @@ window.cooldowns = [
     20,
     19,
     19,
-    null,
+    [ 19, 12 ],
     15,
     15,
     null,

From db70ea3fa5422ef0fc1e1a925e577120cc852b68 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Thu, 27 Jul 2017 14:44:12 -0400
Subject: [PATCH 1253/1569] Nami to drops

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index fdf4a1752..2c717a020 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1940,7 +1940,7 @@ window.drops = {
             gamewith: 15440,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['Japan Rewards', ''],['10 Times','#686 Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems'], ['Global Rewards', ''],['10 Times','1x Bind Resistance Forbidden Tome, 1x Despair Resistance Forbidden Tome, 1x Auto-Heal Forbidden Tome, 1x Rainbow Gem'],['35 Times','1x Red Elder Turtle, 1x Blue Elder Turtle, 1x Green Elder Turtle, 1x Yellow Elder Turtle, 1x Black Elder Turtle, 2x Rainbow Gems'],['72 Times','5x Rainbow Gems']],
-            'All Difficulties': [ 659, 680, 682, 684, 1200, 1198 ]
+            'All Difficulties': [ 659, 680, 682, 684, 1200, 1198, 1708 ]
         },
         
         {

From 0d99f2a3ae26dcb96dba82c61fb18c860a23ef61 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Thu, 27 Jul 2017 14:45:01 -0400
Subject: [PATCH 1254/1569] Flags

---
 common/data/flags.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/data/flags.js b/common/data/flags.js
index 179284288..65896ba75 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1491,6 +1491,9 @@ window.flags = {
     1704: { rr: 1, rro: 1 },
     1705: { rr: 1, rro: 1 },
     1706: { rr: 1, rro: 1 },
+    1707: { rr: 1, rro: 1 },
+    1720: { rr: 1, rro: 1, lrr: 1 },
+    1721: { rr: 1, rro: 1, lrr: 1 },
     1750: { rr: 1, rro: 1 },
     1751: { rr: 1, rro: 1 },
 };
\ No newline at end of file

From be7355fafb7b7ef588768d2076708d15d9c4bc53 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Thu, 27 Jul 2017 14:49:36 -0400
Subject: [PATCH 1255/1569] I forget things

---
 common/data/families.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 1cda03ac4..ce067c48d 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1705,6 +1705,9 @@ window.families = [
     "Hannyabal",
     "Bentham",
     "Bentham",
+    "Shanks",
+    "Nami",
+    "Nami",
     null,
     null,
     null,
@@ -1715,11 +1718,8 @@ window.families = [
     null,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Jimbe",
+    "Jimbe",
     null,
     null,
     null,

From ea6754b9d3194fa2531beb5744f2fa7b4c147271 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 27 Jul 2017 19:23:39 -0400
Subject: [PATCH 1256/1569] I can't math

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 34d5b2c7f..e107e0720 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1705,7 +1705,7 @@ window.cooldowns = [
     20,
     19,
     19,
-    [ 19, 12 ],
+    [ 19, 14 ],
     15,
     15,
     null,

From f71c1c2507209c8241dca3aac67989a4043fac6c Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 27 Jul 2017 23:05:48 -0400
Subject: [PATCH 1257/1569] Stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index f61c43d7c..07990d90e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1695,8 +1695,8 @@ window.units = [
     [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
     [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
-    [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1, 1, 1, 3527, 1499, 291, null ],
+    [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, null ],
+    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, null ],
     [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From 9eaf6d3d19197befe3cd0ab3298e93692cde3a1b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 27 Jul 2017 23:35:15 -0400
Subject: [PATCH 1258/1569] Vergo Stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 07990d90e..cef5b8d42 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1693,7 +1693,7 @@ window.units = [
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, 1449, 896, 101, 1 ],
     [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
     [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
-    [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, null, null, null, null ],
     [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, null ],
     [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, null ],

From eb31d014bf3528984463b31350c4cc74609dda3e Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 28 Jul 2017 02:20:23 -0400
Subject: [PATCH 1259/1569] Vergo CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e107e0720..354a9f337 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1693,8 +1693,8 @@ window.cooldowns = [
     [ 17, 14 ],
     [ 24, 9 ],
     [ 24, 9 ],
-    30,
-    30,
+    [ 30, 16 ],
+    [ 30, 16 ],
     19,
     19,
     16,

From ed4c66734bab6d33c81ef2d0e2a7f3275dcd7166 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 28 Jul 2017 21:32:41 -0400
Subject: [PATCH 1260/1569] Vergo Stats

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index cef5b8d42..ce5d31ad3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1693,8 +1693,8 @@ window.units = [
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, 1449, 896, 101, 1 ],
     [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
     [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
-    [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, null, null, null, null ],
-    [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, null, null, null, 2265, 1402, 245, null ],
+    [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, null ],
+    [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, null ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, null ],
     [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, null ],
     [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],

From cd4acbf7e9ba61d6877dde26aa45e495899d342a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 28 Jul 2017 22:02:58 -0400
Subject: [PATCH 1261/1569] Vergo GW and typo

---
 common/data/details.js | 4 ++--
 common/data/drops.js   | 2 +-
 common/data/gw.js      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index b0305c11e..fa0875e6c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9498,12 +9498,12 @@ window.details = {
     },
     1695: {//Vergo
         captain: "Boosts ATK of Striker characters by 2x",
-        special: "Deals 50x character's ATK in [DEX] damage to all enemies, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
+        special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
         specialName: "Vergo Special",
     },
     1696: {//Vergo
         captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
-        special: "Deals 50x character's ATK in [DEX] damage to all enemies, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
+        special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
         specialName: "Vergo Special",
     },
     1697: {//Magellan
diff --git a/common/data/drops.js b/common/data/drops.js
index 2c717a020..ac9f149f7 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1902,7 +1902,7 @@ window.drops = {
         {
             name: 'Clash!! Vergo',
             thumb: 1696,
-            gamewith: null,
+            gamewith: 63217,
             Master: [ 1695 ],
             Expert: [ 1695 ]
         },
diff --git a/common/data/gw.js b/common/data/gw.js
index 5f7ee15d4..1b7742c97 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1693,8 +1693,8 @@ window.gw=[
     62888,
     62896,
     62896,
-    null,
-    null,
+    63219,
+    63219,
     63199,
     63199,
     63200,

From cc3de27c6077481d81018b723a8f01c36c75c30b Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sat, 29 Jul 2017 13:36:14 -0400
Subject: [PATCH 1262/1569] Ideo ATK

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index ce5d31ad3..1e798d709 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1485,7 +1485,7 @@ window.units = [
     [ "Sanji, Wild Pirates", "STR", [ "Slasher", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 242, 133, 49, 1225, 573, 138, 1 ],
     [ "Sanji, Pioneer Of Land", "STR", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1141, 494, 84, 2625, 1289, 250, 1 ],
     [ "Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 4, 25, 6, 2, 70, 1066998, 505, 350, 41, 1158, 717, 166, 1 ],
-    [ "Destruction Cannon Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1087, 640, 119, 2099, 1339, 302, 1 ],
+    [ "Destruction Cannon Ideo, XXX Rank Boxer", "DEX", [ "Shooter", "Fighter" ], 5, 40, 4, 3, 99, 4000000, 1087, 640, 119, 2099, 1399, 302, 1 ],
     [ "Don Krieg, Krieg Pirates Fleet Admiral", "STR", [ "Driven", "Shooter" ], 3, 16, 7, 2, 50, 392109, 177, 106, 14, 1271, 540, 55, 1 ],
     [ "Don Krieg, East Blue Supreme Ruler", "STR", [ "Driven", "Shooter" ], 4, 26, 8, 3, 99, 3000000, 1200, 476, 30, 2707, 1225, 106, 1 ],
     [ "Mr. 5, Bomb Human", "QCK", "Shooter", 3, 10, 6, 2, 35, 136167, 101, 56, 21, 808, 401, 74, 1 ],

From d276e23b07e6da34ab0a8fffc77ee0685acb19f7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 31 Jul 2017 00:07:15 -0400
Subject: [PATCH 1263/1569] Nami

---
 common/data/aliases.js    |  8 ++++----
 common/data/evolutions.js |  2 +-
 common/data/units.js      | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ec10fcab9..6a882fab9 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1691,10 +1691,10 @@ window.aliases = {
     1690: ['キャプテン・キッド “南の海”出身の超新星', '', ''],
     1691: ['ヒート', '', ''],
     1692: ['ワイヤー', '', ''],
-    1693: ['', '', 'Coliseum Inuarashi'],
-    1694: ['', '', 'Coliseum Inuarashi'],
-    1695: ['', '', 'Raid Vergo'],
-    1696: ['', '', 'Raid Vergo'],
+    1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi'],
+    1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi'],
+    1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo'],
+    1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo'],
     1697: ['', '', ''],
     1698: ['', '', ''],
     1699: ['', '', ''],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d45824c2a..7e5c2efd2 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2649,7 +2649,7 @@ window.evolutions = {
     },
     1708: {
         evolution: 1709,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 79, 85, 96 ]
     },
     1720: {
         evolution: 1721,
diff --git a/common/data/units.js b/common/data/units.js
index 1e798d709..a1505e62f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1691,10 +1691,10 @@ window.units = [
     [ "Captain Kid, Supernova Born from the South Blue", "INT", [ "Striker", "Driven" ], 4, 20, 5, 3, 99, 3000000, 740, 565, 144, 2154, 1406, 204, 1 ],
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, 1201, 955, 122, 1 ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, 1449, 896, 101, 1 ],
-    [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, null, null, null, 1241, 751, 190, null ],
-    [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, null ],
-    [ "Raid Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, null ],
-    [ "Raid Vergo, Evolved", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, null ],
+    [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, 545, 303, 36, 1241, 751, 190, 1 ],
+    [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, 1 ],
+    [ "Demon Bamboo Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, 1 ],
+    [ "Demon Bamboo Vergo, Donquiote Family Senior Executive", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, 1 ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, null ],
     [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, null ],
     [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1706,8 +1706,8 @@ window.units = [
     [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
-    [ "Timeskip Summer Nami", "QCK", [ "Cerebral", "Fighter" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Timeskip Summer Nami, Evolved", "QCK", [ "Cerebral", "Striker" ], 5, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Timeskip Summer Nami", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, null ],
+    [ "Timeskip Summer Nami, Evolved", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From cf0dea478a0dadb8f92d555fbc0003f34e78c6e6 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 31 Jul 2017 00:09:19 -0400
Subject: [PATCH 1264/1569] Magellan Typo?

maybe it's a bug or smthn
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fa0875e6c..3af2a8d70 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9509,13 +9509,13 @@ window.details = {
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
-        specialNotes: "Toxic starts at 50x character's attack and increases by 3x at the end of every turn until 2,000,000 damage per turn.",
+        specialNotes: "Toxic starts at 50x character's attack and increases by 2x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Venom Cloud",
     },
     1698: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
-        specialNotes: "Toxic starts at 50x character's attack and increases by 3x at the end of every turn until 2,000,000 damage per turn.",
+        specialNotes: "Toxic starts at 50x character's attack and increases by 2x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Venom Cloud",
     },
     1699: {//Jinbe

From 2224aba513c1cdafbc25eed05ae4290d977e7a6a Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 31 Jul 2017 01:30:18 -0400
Subject: [PATCH 1265/1569] Nami Name

---
 common/data/aliases.js | 4 ++--
 common/data/details.js | 4 ++--
 common/data/gw.js      | 4 ++--
 common/data/units.js   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6a882fab9..84435a21f 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1706,8 +1706,8 @@ window.aliases = {
     1705: ['', '', ''],
     1706: ['', '', ''],
     1707: ['', '', 'Mega Shanks', 'Super Shanks'],
-    1708: ['', '', 'Summer Nami', 'Swimsuit Nami'],
-    1709: ['', '', 'Summer Nami', 'Swimsuit Nami'],
+    1708: ['', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
+    1709: ['', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1710: ['', '', ''],
     1711: ['', '', ''],
     1712: ['', '', ''],
diff --git a/common/data/details.js b/common/data/details.js
index 3af2a8d70..bd50d3d75 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9605,13 +9605,13 @@ window.details = {
     1708: {//Summer Nami
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
-        specialName: "Summer Nami Special",
+        specialName: "Cat Burglar's Eye Contact",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
     },
     1709: {//Summer Nami
         captain: "Boosts ATK of all characters by 1.5x, recovers 4x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
-        specialName: "Summer Nami Special",
+        specialName: "Cat Burglar's Eye Contact",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
     },
     1720: {//Secret Jinbe
diff --git a/common/data/gw.js b/common/data/gw.js
index 1b7742c97..152e49ea1 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1706,8 +1706,8 @@ window.gw=[
     63205,
     63205,
     11948,
-    null,
-    null,
+    63214,
+    63214,
     null,
     null,
     null,
diff --git a/common/data/units.js b/common/data/units.js
index a1505e62f..58f078f28 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1706,8 +1706,8 @@ window.units = [
     [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
-    [ "Timeskip Summer Nami", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, null ],
-    [ "Timeskip Summer Nami, Evolved", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, null, null, null, null ],
+    [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, null ],
+    [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 8974080d4fe2de2925d4640e6ab3bb45abd59254 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Mon, 31 Jul 2017 10:32:32 -0400
Subject: [PATCH 1266/1569] Blenheim and Stats

---
 common/data/cooldowns.js  | 20 ++++++++++----------
 common/data/details.js    | 14 +++++++-------
 common/data/evolutions.js | 16 ++++++++--------
 common/data/units.js      | 20 ++++++++++----------
 damage/js/utils.js        |  6 ++++++
 5 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 354a9f337..787f0a637 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1695,16 +1695,16 @@ window.cooldowns = [
     [ 24, 9 ],
     [ 30, 16 ],
     [ 30, 16 ],
-    19,
-    19,
-    16,
-    16,
-    15,
-    15,
-    20,
-    20,
-    19,
-    19,
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 15, 10 ],
+    [ 15, 10 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
     [ 19, 14 ],
     15,
     15,
diff --git a/common/data/details.js b/common/data/details.js
index bd50d3d75..466995359 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9537,15 +9537,15 @@ window.details = {
         special: [
             {
                 "description": "Randomizes all orbs",
-                "cooldown": [ 9, null ]
+                "cooldown": [ 9, 4 ]
             },
             {
                 "description": "Changes [BLOCK] orbs into Matching orbs",
-                "cooldown": [ 12, null ]
+                "cooldown": [ 12, 7 ]
             },
             {
                 "description": "Changes [BLOCK] and Badly Matching orbs into Matching orbs",
-                "cooldown": [ 15, null ]
+                "cooldown": [ 15, 10 ]
             }
         ],
         specialName: "Hair Removal Fist",
@@ -9557,15 +9557,15 @@ window.details = {
         special: [
             {
                 "description": "Randomizes all orbs",
-                "cooldown": [ 9, null ]
+                "cooldown": [ 9, 4 ]
             },
             {
                 "description": "Changes [BLOCK] orbs into Matching orbs",
-                "cooldown": [ 12, null ]
+                "cooldown": [ 12, 7 ]
             },
             {
                 "description": "Changes [BLOCK] and Badly Matching orbs into Matching orbs",
-                "cooldown": [ 15, null ]
+                "cooldown": [ 15, 10 ]
             }
         ],
         specialName: "Hair Removal Fist",
@@ -9600,7 +9600,7 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
         captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
         special: "Deals 75x character's ATK in typeless damage to one enemy, reduces the defense of all enemies by 100% for 1 turns and changes all orbs to [PSY] orbs",
-        specialName: "One-Armed Man that Splits the Heavens",
+        spe4Name: "One-Armed Man that Splits the Heavens",
     },
     1708: {//Summer Nami
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7e5c2efd2..2e6e22d89 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2613,35 +2613,35 @@ window.evolutions = {
     },
     1689: {
         evolution: 1690,
-        evolvers: [  ]
+        evolvers: [ 117, 82, 88, 99, 304 ]
     },
     1693: {
         evolution: 1694,
-        evolvers: [  ]
+        evolvers: [ 118, 98, 1180, 303, 103 ]
     },
     1695: {
         evolution: 1696,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 266, 302, 102 ]
     },
     1697: {
         evolution: 1698,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 1180, 302, 267 ]
     },
     1699: {
         evolution: 1700,
-        evolvers: [  ]
+        evolvers: [ 87, 94, 98, 303, 103 ]
     },
     1701: {
         evolution: 1702,
-        evolvers: [  ]
+        evolvers: [ 118, 83, 85, 96, 101 ]
     },
     1703: {
         evolution: 1704,
-        evolvers: [  ]
+        evolvers: [ 266, 93, 1180, 304, 104 ]
     },
     1705: {
         evolution: 1706,
-        evolvers: [  ]
+        evolvers: [ 83, 84, 95, 1180, 100 ]
     },
     530: {
         evolution: 1707,
diff --git a/common/data/units.js b/common/data/units.js
index 58f078f28..b05bdda31 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1695,19 +1695,19 @@ window.units = [
     [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, 1 ],
     [ "Demon Bamboo Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, 1 ],
     [ "Demon Bamboo Vergo, Donquiote Family Senior Executive", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, 1 ],
-    [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, null, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, null ],
+    [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, null ],
     [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, null ],
-    [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, 50, 392109, null, null, null, 1120, 674, 196, null ],
+    [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, null ],
+    [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, 6, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1277, 589, 57, 2910, 1309, 221, null ],
+    [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, 7, 4, 99, 4000000, 1145, 542, 170, 2402, 1202, 355, null ],
     [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
     [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, null ],
-    [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, null, null, null, null ],
+    [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, 1903, 940, 386, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/utils.js b/damage/js/utils.js
index a083e17ef..84c8f1d4e 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -159,6 +159,12 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
+    if(window.specials[1528].turnedOn){
+        if(uclass.has("Powerhouse")){
+            if (orb == 'str') return boostedMultiplier;
+            if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+        }
+    }
     if(window.specials[1515].turnedOn || window.specials[1516].turnedOn){
         if (orb == 'meat') return boostedMultiplier;
     }

From 28c12e558f5af532bf278fe53853cd0dba274873 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Mon, 31 Jul 2017 10:34:11 -0400
Subject: [PATCH 1267/1569] nami CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 787f0a637..e680c0420 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1706,8 +1706,8 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 19, 14 ],
     [ 19, 14 ],
-    15,
-    15,
+    [ 15, 6 ],
+    [ 15, 6 ],
     null,
     null,
     null,

From 931bd965dbe66e360fbbacb1ca67ef4975589f6a Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Mon, 31 Jul 2017 17:34:55 -0400
Subject: [PATCH 1268/1569] Typo and Blenheim change

---
 common/data/details.js  | 4 ++--
 common/data/specials.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 466995359..fa9206b47 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9574,13 +9574,13 @@ window.details = {
     },
     1703: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2x",
-        special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflixed with Toxic by 1.75x for 2 turns",
+        special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflicted with Toxic by 1.75x for 2 turns",
         specialName: "Inferno Hell Wheel",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
     1704: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
-        special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflixed with Toxic by 1.75x for 2 turns",
+        special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflicted with Toxic by 1.75x for 2 turns",
         specialName: "Inferno Hell Wheel",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
diff --git a/common/data/specials.js b/common/data/specials.js
index 86613dc09..286661ce6 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2640,7 +2640,7 @@ window.specials = {
     1528: {
         turnedOn: false,
         onActivation: function(p) {
-            if(p.percHP > 30){
+            if(p.percHP < 30){
                 window.specials[1528].turnedOn = true;
             }
         },

From da25fd6b66b206cb7ce396ef32a32ee9ac3ed3f1 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 1 Aug 2017 07:22:11 -0400
Subject: [PATCH 1269/1569] another one

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index fa9206b47..e2e281481 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9600,7 +9600,7 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
         captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
         special: "Deals 75x character's ATK in typeless damage to one enemy, reduces the defense of all enemies by 100% for 1 turns and changes all orbs to [PSY] orbs",
-        spe4Name: "One-Armed Man that Splits the Heavens",
+        specialName: "One-Armed Man that Splits the Heavens",
     },
     1708: {//Summer Nami
         captain: "Recovers 3x character's RCV in HP at the end of each turn",

From 40d46fb577c36b15bcf6b7efe006e9f406fae7d9 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Tue, 1 Aug 2017 12:30:54 -0400
Subject: [PATCH 1270/1569] Robin

---
 common/data/aliases.js    |  4 ++--
 common/data/captains.js   |  8 ++++++++
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 12 ++++++++++++
 common/data/drops.js      |  2 +-
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  4 ++--
 common/data/specials.js   |  6 ++++++
 common/data/units.js      |  4 ++--
 9 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 84435a21f..d227f2318 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1708,8 +1708,8 @@ window.aliases = {
     1707: ['', '', 'Mega Shanks', 'Super Shanks'],
     1708: ['', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1709: ['', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
-    1710: ['', '', ''],
-    1711: ['', '', ''],
+    1710: ['', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
+    1711: ['', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
     1712: ['', '', ''],
     1713: ['', '', ''],
     1714: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 2c31a5c51..15d982a48 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5145,6 +5145,14 @@ window.captains = {
     1709: {
         atk: function(p) { return 1.5; },
     },
+    1710: {
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
+    1711: {
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
     1720: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e680c0420..7898a3ac3 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1708,8 +1708,8 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 15, 6 ],
     [ 15, 6 ],
-    null,
-    null,
+    25,
+    25,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index e2e281481..19a4d6006 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9614,6 +9614,18 @@ window.details = {
         specialName: "Cat Burglar's Eye Contact",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
     },
+    1710: {//Summer Robin
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
+        special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
+        specialName: "Nico Robin Special",
+        sailor: "Reduces Blindness duration by 2 turns",
+    },
+    1711: {//Summer Robin
+        captain: "Boosts RCV of Cerebral characters by 1.2x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
+        special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
+        specialName: "Nico Robin Special",
+        sailor: "Reduces Blindness duration by 2 turns",
+    },
     1720: {//Secret Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
diff --git a/common/data/drops.js b/common/data/drops.js
index ac9f149f7..73dad3122 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1940,7 +1940,7 @@ window.drops = {
             gamewith: 15440,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['Japan Rewards', ''],['10 Times','#686 Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems'], ['Global Rewards', ''],['10 Times','1x Bind Resistance Forbidden Tome, 1x Despair Resistance Forbidden Tome, 1x Auto-Heal Forbidden Tome, 1x Rainbow Gem'],['35 Times','1x Red Elder Turtle, 1x Blue Elder Turtle, 1x Green Elder Turtle, 1x Yellow Elder Turtle, 1x Black Elder Turtle, 2x Rainbow Gems'],['72 Times','5x Rainbow Gems']],
-            'All Difficulties': [ 659, 680, 682, 684, 1200, 1198, 1708 ]
+            'All Difficulties': [ 659, 680, 682, 684, 1200, 1198, 1708, 1710 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 2e6e22d89..86d297ffc 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2651,6 +2651,10 @@ window.evolutions = {
         evolution: 1709,
         evolvers: [ 116, 117, 79, 85, 96 ]
     },
+    1710: {
+        evolution: 1711,
+        evolvers: [  ]
+    },
     1720: {
         evolution: 1721,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index ce067c48d..e0f86f84b 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1708,8 +1708,8 @@ window.families = [
     "Shanks",
     "Nami",
     "Nami",
-    null,
-    null,
+    "Nico Robin",
+    "Nico Robin",
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index 286661ce6..9b0b7f7af 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3275,6 +3275,12 @@ window.specials = {
     1707: {
         def: function(p) { return 0; }
     },
+    1710: {
+        orb: function(p) { return (p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1711: {
+        orb: function(p) { return (p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
     1720: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         chainLimiter: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index b05bdda31..904937811 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1708,8 +1708,8 @@ window.units = [
     [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
     [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, null ],
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, 1903, 940, 386, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin,", "PSY", [ "Fighter", "Cerebral" ], 4, 12, null, 2, 50, 261406, null, null, null, null, null, null, null ],
+    [ "Nico Robin, Evolved", "PSY", [ "Fighter", "Cerebral" ], 5, 20, null, 3, 99, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 2bcb3d496b8cc49078531b46df4fcd1699d35c67 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Tue, 1 Aug 2017 14:33:15 -0400
Subject: [PATCH 1271/1569] Units

---
 common/data/drops.js      | 3 ++-
 common/data/evolutions.js | 2 +-
 common/data/flags.js      | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 73dad3122..975da5f6c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1940,7 +1940,8 @@ window.drops = {
             gamewith: 15440,
             challenge: 'Total number of hits over 30,000',
             challengeData: [['Japan Rewards', ''],['10 Times','#686 Vivi\'s Breather Unit'],['35 Times','1x HP Cotton Candy'],['72 Times','3x Rainbow Gems'], ['Global Rewards', ''],['10 Times','1x Bind Resistance Forbidden Tome, 1x Despair Resistance Forbidden Tome, 1x Auto-Heal Forbidden Tome, 1x Rainbow Gem'],['35 Times','1x Red Elder Turtle, 1x Blue Elder Turtle, 1x Green Elder Turtle, 1x Yellow Elder Turtle, 1x Black Elder Turtle, 2x Rainbow Gems'],['72 Times','5x Rainbow Gems']],
-            'All Difficulties': [ 659, 680, 682, 684, 1200, 1198, 1708, 1710 ]
+            'All Difficulties': [ 659, 680, 682, 684, 1200, 1198, 1708, 1710 ],
+            'Challenge Unit': [ 686 ],
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 86d297ffc..639a5e871 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2645,7 +2645,7 @@ window.evolutions = {
     },
     530: {
         evolution: 1707,
-        evolvers: [  ]
+        evolvers: [ 118, 98, 303, 267 ]
     },
     1708: {
         evolution: 1709,
diff --git a/common/data/flags.js b/common/data/flags.js
index 65896ba75..e096ae5ea 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -683,7 +683,7 @@ window.flags = {
     683: { global: 1 },
     684: { global: 1 },
     685: { global: 1 },
-    686: { special: 1, shop: 1 },
+    686: { shop: 1 },
     687: { global: 1 },
     688: { global: 1 },
     689: { global: 1 },
@@ -997,7 +997,7 @@ window.flags = {
     1006: { global: 1 },
     1007: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1008: { rr: 1, rro: 1, lrr: 1, global: 1 },
-    1009: { promo: 1 },
+    1009: { special: 1 },
     1010: { global: 1 },
     1011: { global: 1 },
     1012: { global: 1 },
@@ -1308,7 +1308,7 @@ window.flags = {
     1357: { global: 1 },
     1358: { global: 1 },
     1359: { global: 1 },
-    1360: { promo: 1 },
+    1360: { special: 1 },
     1361: { rr: 1, rro: 1, global: 1 },
     1362: { rr: 1, rro: 1, global: 1 },
     1363: { rr: 1, rro: 1, global: 1 },
@@ -1419,7 +1419,7 @@ window.flags = {
     1543: { rr: 1, rro: 1 },
     1567: { rr: 1, rro: 1, lrr: 1 },
     1568: { rr: 1, rro: 1, lrr: 1 },
-    1569: { special: 1 },
+    1569: { special: 1, global: 1 },
     1570: { rr: 1, rro: 1 },
     1571: { rr: 1, rro: 1 },
     1572: { rr: 1, rro: 1 },

From 2a01123b9f2caf3ee37f0307e4ab3336f956950e Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 1 Aug 2017 20:58:05 -0400
Subject: [PATCH 1272/1569] T H I C C

---
 common/data/aliases.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d227f2318..2207df4fd 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1231,8 +1231,8 @@ window.aliases = {
     1230: ['鉞の戦桃丸 海軍本部将校','','Sentoumaru'],
     1231: ['スモーカー 海軍ＧＬ第５支部','',''],
     1232: ['スモーカー 海軍ＧＬ第５支部「Ｇ‐５」中将','',''],
-    1233: ['たしぎ 海軍ＧＬ第５支部','',''],
-    1234: ['たしぎ 海軍ＧＬ第５支部「Ｇ‐５」大佐','',''],
+    1233: ['たしぎ 海軍ＧＬ第５支部','','Thiccshigi'],
+    1234: ['たしぎ 海軍ＧＬ第５支部「Ｇ‐５」大佐','','Thiccshigi'],
     1235: ['メイナード 海軍本部中将','',''],
     1236: ['追撃のメイナード 海軍本部中将','',''],
     1237: ['バスティーユ 海軍本部中将','',''],

From 75c1c148ce680787129dd91882b5327b3c0889ec Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Wed, 2 Aug 2017 10:33:58 -0400
Subject: [PATCH 1273/1569] new FN units

will do captain and special later
---
 common/data/details.js    | 60 ++++++++++++++++++++++++++++-----------
 common/data/drops.js      |  8 ++++++
 common/data/evolutions.js |  8 ++++++
 common/data/families.js   |  8 +++---
 common/data/units.js      |  8 +++---
 common/data/zombies.js    |  8 ++++++
 common/js/directives.js   |  1 +
 7 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 19a4d6006..c03bb4555 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4350,7 +4350,7 @@ window.details = {
     927: {
         captain: "Boosts ATK and HP of Driven characters by 1.5x",
         specialName: "Unwavering Hammer of Justice",
-        special: "Take 1.5x Additional damage; Boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
+        special: "Increases damage received by 1.5x and boosts ATK of Slasher and Driven characters by 1.2x for 3 turns"
     },
     928: {
         captain: "Boosts ATK of Driven characters by 1.75x while above 30% HP and boosts ATK of Striker characters by 1.75x while below 30% HP",
@@ -5067,13 +5067,13 @@ window.details = {
     1046: {
         captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Deals random typeless damage to all enemies. Adds 55x character's ATK as Additional Typeless Damage for 2 turns",
         specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1047: {
         captain: "Boosts ATK of Free Spirit characters by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath",
-        special: "Deals random typeless damage to all enemies. For 2 turns every attacking character gets 55x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Deals random typeless damage to all enemies. Adds 55x character's ATK as Additional Typeless Damage for 2 turns",
         specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
     },
     1048: {
@@ -6380,12 +6380,14 @@ window.details = {
     },
     1241: {//Fortnight Koala
         captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
-        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Deals 11x character's ATK in [STR] damage to one enemy. Adds 15x character's ATK as Additional Typeless Damage for 1 turn",
+        specialNotes: "#{additionalDamage : 15x}",
         specialName: "Fishman Karate, Midair Upwards Kick",
     },
     1242: {//Fortnight Koala
         captain: "Boosts chain multiplier by 2x. Recovers 2x character's RCV in HP at the end of each turn",
-        special: "Deals 11x character's ATK in [STR] damage to one enemy. For 1 turn every attacking character gets 15x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Deals 11x character's ATK in [STR] damage to one enemy. Adds 15x character's ATK as Additional Typeless Damage for 1 turn",
+        specialNotes: "#{additionalDamage : 15x}",
         specialName: "Fishman Karate, Midair Upwards Kick",
     },
     1243: {// Fortnight Hack
@@ -6861,13 +6863,13 @@ window.details = {
         specialName: "King Cobra Machetes",
     },
     1313: {//Akainu
-        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
+        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
     },
     1314: {//Akainu
-        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by an additional 1.75x. Boosts chances of getting [STR] orbs",
+        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
@@ -8692,12 +8694,14 @@ window.details = {
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. Adds 80x character's ATK as Additional Typeless Damage for 1 turn",
+        specialNotes: "#{additionalDamage : 80x}",
         specialName: "King Sword Shine",
     },
     1571: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
-        special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. For 1 turn, every attacking character gets 80x character's ATK as additional typeless bonus damage if you hit no lower than Good",
+        special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. Adds 80x character's ATK as Additional Typeless Damage for 1 turn",
+        specialNotes: "#{additionalDamage : 80x}",
         specialName: "King Sword Shine",
     },
     1572: {//Wanda
@@ -8814,15 +8818,15 @@ window.details = {
         specialName: "Firey Morale",
     },
     1587: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
-        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
+        captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
         specialName: "Hell Memories",
     },
     1588: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including Bind, Despair, and Silence) Next turn, boosts own ATK by an additional 2.5x",
-        captainNotes: "Multiple Sanjis can Jump at the same time. Even while Flying, will still boost all characters by 2.5x. Jumping is not a type boost, and will stack with other boosts",
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
+        captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
         specialName: "Hell Memories",
@@ -8973,15 +8977,15 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
-        sailor: "All characters gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
-        sailorNotes: "Similar effect to Raid Sabo",
+        sailor: "Adds 22x character's ATK as Additional Typeless Damage",
+        sailorNotes: "#{additionalDamage : 2x}",
     },
     1614: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
-        sailor: "All characters gets 2x character's ATK as additional typeless bonus damage if you hit no lower than Good",
-        sailorNotes: "Similar effect to Raid Sabo",
+        sailor: "Adds 22x character's ATK as Additional Typeless Damage",
+        sailorNotes: "#{additionalDamage : 2x}",
     },
     1615: {//Crocodile
         captain: "Boosts ATK of Strikers by 2x",
@@ -9636,6 +9640,28 @@ window.details = {
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Passive Agressive Boss"
     },
+    1722: {//Neptune
+        captain: "Boosts ATK of Striker characters by ???x and their RCV by ???x.",
+        special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below ???% when the special is activated and deals 20,000 Fixed damage to one enemy.",
+        specialName: "Neptune Special"
+    },
+    1723: {//Neptune
+        captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.2x.",
+        special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below ???% when the special is activated and deals 20,000 Fixed damage to one enemy.",
+        specialName: "Neptune Special"
+    },
+    1724: {//Fukaboshi
+        captain: "Maybe? boosts chances Powerhouse characters of getting Matching orbs, boosts ATK of Powerhouse characters by ???x",
+        special: "Reduces crew's current HP by 50%, adds 25x character's ATK as Additional Typeless Damage for 1 turn",
+        specialNotes: "#{additionalDamage : 25x}",
+        specialName: "Fukaboshi Special"
+    },
+    1725: {//Fukaboshi
+        captain: "Slightly boosts chances Powerhouse characters of getting Matching orbs, boosts ATK of Powerhouse characters by 1.5x",
+        special: "Reduces crew's current HP by 50%, adds 25x character's ATK as Additional Typeless Damage for 1 turn",
+        specialNotes: "#{additionalDamage : 25x}",
+        specialName: "Fukaboshi Special"
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index 975da5f6c..fbef0a127 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1592,6 +1592,14 @@ window.drops = {
             'All Difficulties': [ 1689, 1691, 1692, -1532, -1543, -449, -453, -1079, -1538, -967, -1346, -1349 ],
         },
         
+        {
+            name: 'Royal Neptune Family!',
+            thumb: 1723,
+            gamewith: null,
+            condition: 'Strikers and Powerhouse characters get a boost',
+            'All Difficulties': [ 1722, 1724, -1123, -455, -1077, -560, -1212, -1536, -1577, -1579, -966, -1352 ],
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 639a5e871..8650d7174 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2659,6 +2659,14 @@ window.evolutions = {
         evolution: 1721,
         evolvers: [  ]
     },
+    1722: {
+        evolution: 1723,
+        evolvers: [  ]
+    },
+    1724: {
+        evolution: 1725 ,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index e0f86f84b..8f8b71546 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1720,10 +1720,10 @@ window.families = [
     null,
     "Jimbe",
     "Jimbe",
-    null,
-    null,
-    null,
-    null,
+    "King Neptune",
+    "King Neptune",
+    "Fukaboshi",
+    "Fukaboshi",
     null,
     null,
     null,
diff --git a/common/data/units.js b/common/data/units.js
index 904937811..6a99e134f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1720,10 +1720,10 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 5000000, null, null, null, 2594, 1330, 320, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "King Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "King Neptune, Evolved", "PSY", [ "Striker", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Prince Fukaboshi", "QCK", [ "Striker", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Prince Fukaboshi, Evolved", "QCK", [ "Striker", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index ee4e63321..a94258a64 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -427,4 +427,12 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    1708: { // Nami
+        type: 'healer',
+        multiplier: 3
+    },
+    1709: { // Nami
+        type: 'healer',
+        multiplier: 4
+    },
 };
diff --git a/common/js/directives.js b/common/js/directives.js
index 096462011..661eff54f 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -25,6 +25,7 @@ var notes = {
         "the effect will not work when attacked by multiples enemies at once.",
     colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5/#1)x to QCK.",
     instantKill: "The chance for this character to instantly kill any enemy is #1. The kills can not be reset by exiting the game, but can change by passing the turn or killing an enemy.",
+    additionalDamage: "Every attacking character gains additional damage if they land a hit no less than Good.",
 };
 
 /***********

From dd5d223c3aa7e70c925ee244124e78d50cb07f4f Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Wed, 2 Aug 2017 13:07:02 -0400
Subject: [PATCH 1274/1569] Fixed some stuff

---
 common/data/captains.js |  13 ++++
 common/data/details.js  |   4 +-
 common/data/specials.js | 142 +++++++++++++++++++++++++++-------------
 3 files changed, 111 insertions(+), 48 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 15d982a48..f0a529107 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5160,6 +5160,19 @@ window.captains = {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
+    1722: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    1723: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+    },
+    1724: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1725: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/details.js b/common/data/details.js
index c03bb4555..7cb898f72 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9641,7 +9641,7 @@ window.details = {
         specialName: "Passive Agressive Boss"
     },
     1722: {//Neptune
-        captain: "Boosts ATK of Striker characters by ???x and their RCV by ???x.",
+        captain: "Boosts ATK of Striker characters by 2x.",
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below ???% when the special is activated and deals 20,000 Fixed damage to one enemy.",
         specialName: "Neptune Special"
     },
@@ -9651,7 +9651,7 @@ window.details = {
         specialName: "Neptune Special"
     },
     1724: {//Fukaboshi
-        captain: "Maybe? boosts chances Powerhouse characters of getting Matching orbs, boosts ATK of Powerhouse characters by ???x",
+        captain: "Boosts ATK of Powerhouse characters by 1.5x",
         special: "Reduces crew's current HP by 50%, adds 25x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 25x}",
         specialName: "Fukaboshi Special"
diff --git a/common/data/specials.js b/common/data/specials.js
index 9b0b7f7af..7123c53e2 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -677,7 +677,7 @@ window.specials = {
             var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
             window.specials[780].multiplier = n;
             p.scope.notify({
-                text: 'Using the ' + n + 'x multiplier.',
+                text: 'Using the ' + n + 'x Self Attack boost.',
                 name: '780warning'
             });
         }
@@ -689,7 +689,7 @@ window.specials = {
             var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
             window.specials[781].multiplier = n;
             p.scope.notify({
-                text: 'Using the ' + n + 'x multiplier.',
+                text: 'Using the ' + n + 'x Self Attack boost.',
                 name: '781warning'
             });
         }
@@ -1320,25 +1320,25 @@ window.specials = {
         type: "class"
     },
     1024: {
-        orb: function(p) {
-            if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]);
-            }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
-            }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
-            }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1024].multiplier, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1024].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                name: '1024warning'
+            });
         }
     },
     1025: {
-        orb: function(p) {
-            if(p.percHP >= 70.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]);
-            }else if(p.percHP >= 30.0){
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
-            }else{
-                return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
-            }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1025].multiplier, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1025].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                name: '1025warning'
+            });
         }
     },
     1028: {
@@ -1360,12 +1360,28 @@ window.specials = {
         type: "type"
     },
     1040: {
-        atk: function(p) { return p.percHP < 30.0 ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return window.specials[1040].multiplier; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1040].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '1040warning'
+            });
+        }
     },
     1041: {
-        atk: function(p) { return p.percHP < 30.0 ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return window.specials[1041].multiplier; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1041].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '1041warning'
+            });
+        }
     },
     1046: {
         staticMult: function(p) { return 55; }
@@ -1433,28 +1449,28 @@ window.specials = {
         type: "type"
     },
     1082: {
-        atk: function(p) {
-            if(p.percHP >= 70.0){
-                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
-            }else if(p.percHP >= 30.0){
-                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.5 : 1;
-            }else{
-                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
-            }
-        },
-        type: "class"
+        atk: function(p) { return (p.unit.class.has("Striker") || p.unit.class.has("Fighter")) ? window.specials[1082].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1082].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                name: '1082warning'
+            });
+        }
     },
     1083: {
-        atk: function(p) {
-            if(p.percHP >= 70.0){
-                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1;
-            }else if(p.percHP >= 30.0){
-                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.5 : 1;
-            }else{
-                return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1;
-            }
-        },
-        type: "class"
+        atk: function(p) { return (p.unit.class.has("Striker") || p.unit.class.has("Fighter")) ? window.specials[1083].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1083].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                name: '1083warning'
+            });
+        }
     },
     1086: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3187,19 +3203,23 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1681: {
-        chainAddition: function(p) { return 0.5; },
+        chainAddition: function(p) { return window.specials[1681].multiplier; },
         onActivation: function(p) {
+            var n = (p.slot > 1 ? 0.5 : 0);
+            window.specials[1681].multiplier = n;
             p.scope.notify({
-                text: 'Chain Addition only works when Luffy is a sailor.',
+                text: 'Luffy is ' + (n == 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
                 name: '1681warning'
             });
         }
     },
     1682: {
-        chainAddition: function(p) { return 0.5; },
+        chainAddition: function(p) { return window.specials[1682].multiplier; },
         onActivation: function(p) {
+            var n = (p.slot > 1 ? 0.5 : 0);
+            window.specials[1682].multiplier = n;
             p.scope.notify({
-                text: 'Chain Addition only works when Luffy is a sailor.',
+                text: 'Luffy is ' + (n == 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
                 name: '1682warning'
             });
         }
@@ -3295,6 +3315,36 @@ window.specials = {
             return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         }
     },
+    1722: {
+        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1722].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1722].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x multiplier.',
+                name: '1722warning'
+            });
+        }
+    },
+    1723: {
+        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1723].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1723].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x multiplier.',
+                name: '1723warning'
+            });
+        }
+    },
+    1724: {
+        staticMult: function(p) { return 25; }
+    },
+    1725: {
+        staticMult: function(p) { return 25; }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {

From 0fa3adbaa0bf76c99bf001a22600619948c1db48 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Wed, 2 Aug 2017 13:14:08 -0400
Subject: [PATCH 1275/1569] Kimono chars

---
 common/data/specials.js | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 7123c53e2..77735c237 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1024,12 +1024,28 @@ window.specials = {
         }
     },
     885: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has('Fighter') ? window.specials[885].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[885].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '885warning'
+            });
+        }
     },
     886: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has('Slasher') ? window.specials[886].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[886].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '886warning'
+            });
+        }
     },
     887: {
         def: function(p) { return 0.2; }

From c83e981cbf320a74c33876161b81dc0b4e445656 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Thu, 3 Aug 2017 21:28:30 -0400
Subject: [PATCH 1276/1569] Neo Doffy

---
 common/data/effects.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/effects.js b/common/data/effects.js
index fbd5f5fc2..afd70567b 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -365,5 +365,12 @@ window.effects = {
         id: 37,
         chainModifier: function(p) { return 0.1 ; }
     },
+
+    'Doflamingo Neo - Fighter Raid Boss': {
+        description: 'Reduces Damage taken by 30%',
+        thumb: 1623,
+        id: 38, // don't change this
+        atk: function(p) { return .7 ; },
+    },
     
 };
\ No newline at end of file

From 976188e5d82b9f129306b97f9b351fdf9f2113e7 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-194-54.umd.edu>
Date: Fri, 4 Aug 2017 14:57:19 -0400
Subject: [PATCH 1277/1569] Sabo

---
 common/data/aliases.js    |  4 ++--
 common/data/captains.js   | 14 ++++++++++++++
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 12 ++++++++++++
 common/data/drops.js      | 12 +++++++++++-
 common/data/evolutions.js |  6 +++++-
 common/data/families.js   |  4 ++--
 common/data/specials.js   |  6 ++++++
 common/data/units.js      |  4 ++--
 9 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2207df4fd..ade3cacea 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1724,8 +1724,8 @@ window.aliases = {
     1723: ['', '', ''],
     1724: ['', '', ''],
     1725: ['', '', ''],
-    1726: ['', '', ''],
-    1727: ['', '', ''],
+    1726: ['', '', 'Kai Sabo'],
+    1727: ['', '', 'Kai Sabo'],
     1728: ['', '', ''],
     1729: ['', '', ''],
     1730: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index f0a529107..c8646dcc1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5173,6 +5173,20 @@ window.captains = {
     1725: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
+    1726: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1727: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7898a3ac3..f96a34c84 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1724,8 +1724,8 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
-    null,
+    [ 23, 14 ],
+    [ 23, 14 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 7cb898f72..788d2519e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9662,6 +9662,18 @@ window.details = {
         specialNotes: "#{additionalDamage : 25x}",
         specialName: "Fukaboshi Special"
     },
+    1726: {
+        captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
+        specialName: "Dragon Claw Fist: Dragon's Breath [Neo]",
+        special: "Deals random typeless damage to all enemies. Adds 55x character's ATK as Additional Typeless Damage for 2 turns",
+        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
+    },
+    1727: {
+        captain: "Boosts ATK of Free Spirit characters by 3.5x following a chain of Good > Great > Perfect hits",
+        specialName: "Dragon Claw Fist: Dragon's Breath [Neo]",
+        special: "Deals random typeless damage to all enemies. Adds 55x character's ATK as Additional Typeless Damage for 2 turns",
+        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index fbef0a127..eff470985 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1808,7 +1808,7 @@ window.drops = {
             name: 'Clash Neo!! Pica',
             thumb: 1647,
             gamewith: 60095,
-            condition: '1 Expert version and 3 different Master versions with different conditions. Master: Powerhouse/Driven/Slasher Only. Ultimate: Powerhouse Only, Driven Only, and Slasher Only',
+            condition: '1 Expert version and 3 different Master versions with different conditions. Expert: Powerhouse/Driven/Slasher Only. Master: Powerhouse Only, Driven Only, and Slasher Only',
             Master: [ 1646 ],
             Expert: [ 1646 ]
         },
@@ -1843,6 +1843,16 @@ window.drops = {
             Expert: [ 1046 ]
         },
         
+        {
+            name: 'Clash Neo!! Sabo',
+            gamewith: null,
+            thumb: 1727,
+            condition: '1 Expert version, 1 Master version, and 3 different Ultimate versions with different conditions. Expert/Master: Shooter/Fighter/Cerebral Only. Can only complete 10 times each. Ultimate: Shooter Only, Fighter Only, and Cerebral Only',
+            Ultimate: [ 1726 ],
+            Master: [ 1726 ],
+            Expert: [ 1726 ]
+        },
+        
         {
             name: 'Clash!! Shiki',
             thumb: 1108,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8650d7174..32e905346 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2664,7 +2664,11 @@ window.evolutions = {
         evolvers: [  ]
     },
     1724: {
-        evolution: 1725 ,
+        evolution: 1725,
+        evolvers: [  ]
+    },
+    1726: {
+        evolution: 1727,
         evolvers: [  ]
     },
     1750: {
diff --git a/common/data/families.js b/common/data/families.js
index 8f8b71546..a07f4b7bc 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1724,8 +1724,8 @@ window.families = [
     "King Neptune",
     "Fukaboshi",
     "Fukaboshi",
-    null,
-    null,
+    "Sabo",
+    "Sabo",
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index 77735c237..0ed734e7a 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3361,6 +3361,12 @@ window.specials = {
     1725: {
         staticMult: function(p) { return 25; }
     },
+    1726: {
+        staticMult: function(p) { return 55; }
+    },
+    1727: {
+        staticMult: function(p) { return 55; }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 6a99e134f..c6c8a0e77 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1724,8 +1724,8 @@ window.units = [
     [ "King Neptune, Evolved", "PSY", [ "Striker", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Prince Fukaboshi", "QCK", [ "Striker", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Prince Fukaboshi, Evolved", "QCK", [ "Striker", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, null, null, null, 2494, 1305, 345, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 38bc8b0e7587ac9fe698e6b9ad40fd0f17f78446 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 6 Aug 2017 12:37:23 -0400
Subject: [PATCH 1278/1569] Ryuma evo

---
 common/data/drops.js      |  3 ++-
 common/data/evolutions.js |  2 +-
 common/data/flags.js      | 10 ++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index eff470985..d0942b2c3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1463,8 +1463,9 @@ window.drops = {
         },
         
         {
-            name: 'Become Strong to be Happy!',
+            name: 'Fight for your Happiness!',
             thumb: 1384,
+            global: true,
             gamewith: 46658,
             'All Difficulties': [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739, -1550 ]
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 32e905346..6a903b361 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2405,7 +2405,7 @@ window.evolutions = {
     },
     1554: {
         evolution: 1555,
-        evolvers: [ 177, 80, 86, 97, 302 ]
+        evolvers: [ 117, 80, 86, 97, 302 ]
     },
     1563: {
         evolution: 1564,
diff --git a/common/data/flags.js b/common/data/flags.js
index e096ae5ea..d79e6416b 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1128,6 +1128,8 @@ window.flags = {
     1137: { global: 1 },
     1138: { global: 1 },
     1139: { global: 1 },
+    1140: { global: 1 },
+    1141: { global: 1 },
     1146: { global: 1 },
     1147: { global: 1 },
     1148: { global: 1 },
@@ -1325,6 +1327,10 @@ window.flags = {
     1380: { global: 1 },
     1381: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1382: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1383: { global: 1 },
+    1384: { global: 1 },
+    1385: { global: 1 },
+    1386: { global: 1 },
     1387: { global: 1 },
     1388: { global: 1 },
     1389: { global: 1 },
@@ -1494,6 +1500,6 @@ window.flags = {
     1707: { rr: 1, rro: 1 },
     1720: { rr: 1, rro: 1, lrr: 1 },
     1721: { rr: 1, rro: 1, lrr: 1 },
-    1750: { rr: 1, rro: 1 },
-    1751: { rr: 1, rro: 1 },
+    1750: { rr: 1, rro: 1, global: 1 },
+    1751: { rr: 1, rro: 1, global: 1 },
 };
\ No newline at end of file

From 55c4609f6886218637ba1ef177d84ac0dc2e0f58 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Sun, 6 Aug 2017 23:49:10 -0400
Subject: [PATCH 1279/1569] Robin Stats

---
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 6a903b361..1f2bf93a4 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2653,7 +2653,7 @@ window.evolutions = {
     },
     1710: {
         evolution: 1711,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 81, 87, 98 ]
     },
     1720: {
         evolution: 1721,
diff --git a/common/data/units.js b/common/data/units.js
index c6c8a0e77..ceaad1348 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1708,8 +1708,8 @@ window.units = [
     [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
     [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, null ],
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, 1903, 940, 386, null ],
-    [ "Nico Robin,", "PSY", [ "Fighter", "Cerebral" ], 4, 12, null, 2, 50, 261406, null, null, null, null, null, null, null ],
-    [ "Nico Robin, Evolved", "PSY", [ "Fighter", "Cerebral" ], 5, 20, null, 3, 99, null, null, null, null, null, null, null, null ],
+    [ "Nico Robin,", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, null ],
+    [ "Nico Robin, Evolved", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 851, 366, 133, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 8019d888a19a8d4bb892480a44e94c321a00ab00 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-196-12.umd.edu>
Date: Mon, 7 Aug 2017 10:06:09 -0400
Subject: [PATCH 1280/1569] Stats on official and Robin CD

---
 common/data/aliases.js   | 30 +++++++++++++++---------------
 common/data/cooldowns.js |  4 ++--
 common/data/details.js   |  8 ++++----
 common/data/units.js     | 30 +++++++++++++++---------------
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ade3cacea..3953edc2e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1695,21 +1695,21 @@ window.aliases = {
     1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi'],
     1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo'],
     1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo'],
-    1697: ['', '', ''],
-    1698: ['', '', ''],
-    1699: ['', '', ''],
-    1700: ['', '', ''],
-    1701: ['', '', ''],
-    1702: ['', '', ''],
-    1703: ['', '', ''],
-    1704: ['', '', ''],
-    1705: ['', '', ''],
-    1706: ['', '', ''],
-    1707: ['', '', 'Mega Shanks', 'Super Shanks'],
-    1708: ['', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
-    1709: ['', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
-    1710: ['', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
-    1711: ['', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
+    1697: ['マゼラン 監獄の支配者', '', ''],
+    1698: ['マゼラン 地獄の支配者', '', ''],
+    1699: ['ジンベエ “無限地獄”の囚人', '', ''],
+    1700: ['ジンベエ “地獄”の七武海', '', ''],
+    1701: ['エンポリオ・イワンコフ “ニューカマーランド”の囚人', '', ''],
+    1702: ['エンポリオ・イワンコフ “地獄”の革命家', '', ''],
+    1703: ['ハンニャバル 支配者の腹心', '', ''],
+    1704: ['ハンニャバル 今は支配者の腹心', '', ''],
+    1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', ''],
+    1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', ''],
+    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks'],
+    1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
+    1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
+    1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
+    1711: ['ニコ・ロビン 文化の象徴', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
     1712: ['', '', ''],
     1713: ['', '', ''],
     1714: ['', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f96a34c84..f6e43cdfb 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1708,8 +1708,8 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 15, 6 ],
     [ 15, 6 ],
-    25,
-    25,
+    [ 25, 16 ],
+    [ 25, 16 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 788d2519e..007281d14 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9621,13 +9621,13 @@ window.details = {
     1710: {//Summer Robin
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
-        specialName: "Nico Robin Special",
+        specialName: "Beautiful Maturity",
         sailor: "Reduces Blindness duration by 2 turns",
     },
     1711: {//Summer Robin
         captain: "Boosts RCV of Cerebral characters by 1.2x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
-        specialName: "Nico Robin Special",
+        specialName: "Beautiful Maturity",
         sailor: "Reduces Blindness duration by 2 turns",
     },
     1720: {//Secret Jinbe
@@ -9662,13 +9662,13 @@ window.details = {
         specialNotes: "#{additionalDamage : 25x}",
         specialName: "Fukaboshi Special"
     },
-    1726: {
+    1726: {//Sabo
         captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath [Neo]",
         special: "Deals random typeless damage to all enemies. Adds 55x character's ATK as Additional Typeless Damage for 2 turns",
         specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
     },
-    1727: {
+    1727: {//Sabo
         captain: "Boosts ATK of Free Spirit characters by 3.5x following a chain of Good > Great > Perfect hits",
         specialName: "Dragon Claw Fist: Dragon's Breath [Neo]",
         special: "Deals random typeless damage to all enemies. Adds 55x character's ATK as Additional Typeless Damage for 2 turns",
diff --git a/common/data/units.js b/common/data/units.js
index ceaad1348..169b9a664 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1695,21 +1695,21 @@ window.units = [
     [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, 1 ],
     [ "Demon Bamboo Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, 1 ],
     [ "Demon Bamboo Vergo, Donquiote Family Senior Executive", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, 1 ],
-    [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, null ],
-    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, null ],
-    [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, 50, 392109, null, null, null, 1120, 674, 196, null ],
-    [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, null ],
-    [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, 6, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1277, 589, 57, 2910, 1309, 221, null ],
-    [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, 7, 4, 99, 4000000, 1145, 542, 170, 2402, 1202, 355, null ],
-    [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, null ],
-    [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, null ],
-    [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, null, 832, 334, 142, 1903, 940, 386, null ],
-    [ "Nico Robin,", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, null ],
-    [ "Nico Robin, Evolved", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, null, 851, 366, 133, null, null, null, null ],
+    [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, 1 ],
+    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, 1 ],
+    [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 156, 137, 30, 1120, 674, 196, 1 ],
+    [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1056, 620, 132, 2188, 1392, 320, 1 ],
+    [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, 1 ],
+    [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1148, 550, 176, 2389, 1244, 340, 1 ],
+    [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, 6, 3, 50, 392109, 198, 125, 20, 1340, 669, 101, 1 ],
+    [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1277, 589, 57, 2910, 1309, 221, 1 ],
+    [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, 6, 3, 50, 392109, 172, 98, 40, 1210, 596, 212, 1 ],
+    [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, 7, 4, 99, 4000000, 1145, 542, 170, 2402, 1202, 355, 1 ],
+    [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, 1 ],
+    [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, 1 ],
+    [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, 3000000, 832, 334, 142, 1903, 940, 386, 1 ],
+    [ "Nico Robin, Healthy Radiance", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
+    [ "Nico Robin, Symbol of Culture", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 5ce881d398dc17c9a931fbf998a8149ca07bf826 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-196-12.umd.edu>
Date: Mon, 7 Aug 2017 12:35:07 -0400
Subject: [PATCH 1281/1569] Robin translations

---
 common/data/details.js | 4 ++--
 common/data/units.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 007281d14..e003c0781 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9621,13 +9621,13 @@ window.details = {
     1710: {//Summer Robin
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
-        specialName: "Beautiful Maturity",
+        specialName: "Charmed by a Lovely Adult",
         sailor: "Reduces Blindness duration by 2 turns",
     },
     1711: {//Summer Robin
         captain: "Boosts RCV of Cerebral characters by 1.2x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
-        specialName: "Beautiful Maturity",
+        specialName: "Charmed by a Lovely Adult",
         sailor: "Reduces Blindness duration by 2 turns",
     },
     1720: {//Secret Jinbe
diff --git a/common/data/units.js b/common/data/units.js
index 169b9a664..1e4a2f442 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1708,8 +1708,8 @@ window.units = [
     [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, 1 ],
     [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, 1 ],
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, 3000000, 832, 334, 142, 1903, 940, 386, 1 ],
-    [ "Nico Robin, Healthy Radiance", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
-    [ "Nico Robin, Symbol of Culture", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
+    [ "Nico Robin, Healthful Beauty", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
+    [ "Nico Robin, Cultural Symbol", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c748fc366cfbecd7104e84181f510be5114002a8 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Tue, 8 Aug 2017 00:38:43 -0400
Subject: [PATCH 1282/1569] Translation

---
 common/data/details.js | 8 ++++----
 common/data/units.js   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e003c0781..ff421bd78 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9643,24 +9643,24 @@ window.details = {
     1722: {//Neptune
         captain: "Boosts ATK of Striker characters by 2x.",
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below ???% when the special is activated and deals 20,000 Fixed damage to one enemy.",
-        specialName: "Neptune Special"
+        specialName: "Sea God's Strike"
     },
     1723: {//Neptune
         captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.2x.",
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below ???% when the special is activated and deals 20,000 Fixed damage to one enemy.",
-        specialName: "Neptune Special"
+        specialName: "Sea God's Strike"
     },
     1724: {//Fukaboshi
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
         special: "Reduces crew's current HP by 50%, adds 25x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 25x}",
-        specialName: "Fukaboshi Special"
+        specialName: "Sun's Hope"
     },
     1725: {//Fukaboshi
         captain: "Slightly boosts chances Powerhouse characters of getting Matching orbs, boosts ATK of Powerhouse characters by 1.5x",
         special: "Reduces crew's current HP by 50%, adds 25x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 25x}",
-        specialName: "Fukaboshi Special"
+        specialName: "Sun's Hope"
     },
     1726: {//Sabo
         captain: "Boosts ATK of Free Spirit characters by 2.75x following a chain of Good > Great > Perfect hits",
diff --git a/common/data/units.js b/common/data/units.js
index 1e4a2f442..8011136a8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1720,10 +1720,10 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 5000000, null, null, null, 2594, 1330, 320, null ],
-    [ "King Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "King Neptune, Evolved", "PSY", [ "Striker", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Prince Fukaboshi", "QCK", [ "Striker", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Prince Fukaboshi, Evolved", "QCK", [ "Striker", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, null, null, null, 2494, 1305, 345, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 7f6a42b87e7d54e69e22370cba4c84bf2f8d0c91 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 8 Aug 2017 01:04:28 -0400
Subject: [PATCH 1283/1569] Stats

---
 common/data/units.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 8011136a8..b98ca377d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1720,10 +1720,10 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 5000000, null, null, null, 2594, 1330, 320, null ],
-    [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, null, null, null, 611, 498, 189, null ],
+    [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 598, 445, 175, null, null, null, null ],
+    [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, null, 2, 50, 392019, null, null, null, null, null, null, null ],
+    [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 617, 512, 155, null, null, null, null ],
     [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, null, null, null, 2494, 1305, 345, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 992f7657a0e33a281764ceb43bf6c96bf23d2383 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 8 Aug 2017 01:21:11 -0400
Subject: [PATCH 1284/1569] Cool downs

---
 common/data/cooldowns.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f6e43cdfb..e183698f5 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1720,10 +1720,10 @@ window.cooldowns = [
     null,
     [ 10, 6 ],
     [ 10, 6 ],
-    null,
-    null,
-    null,
-    null,
+    15,
+    15,
+    [ 19, 13 ],
+    [ 19, 13 ],
     [ 23, 14 ],
     [ 23, 14 ],
     null,

From 5b677f80669fce3c239b698c3f26b58cdb2779d0 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-203-160.umd.edu>
Date: Tue, 8 Aug 2017 10:56:44 -0400
Subject: [PATCH 1285/1569] Global Doffy Effects

---
 common/data/effects.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/common/data/effects.js b/common/data/effects.js
index afd70567b..cb3531dcd 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -372,5 +372,19 @@ window.effects = {
         id: 38, // don't change this
         atk: function(p) { return .7 ; },
     },
+
+    'Doflamingo Neo [GLOBAL] - Fighter Raid Boss': {
+        description: 'Reduces Damage taken by 50%',
+        thumb: 1623,
+        id: 39, // don't change this
+        atk: function(p) { return .5 ; },
+    },
+
+    'Doflamingo Neo [GLOBAL] - Striker Raid Boss': {
+        description: 'Limit Chain to 1.75x.',
+        thumb: 1623,
+        id: 40, // don't change this
+        chainLimiter: function() { return 1.75; }
+    },
     
 };
\ No newline at end of file

From bf5d66e110ca099fd498f240e6fad03e809fc6ca Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 9 Aug 2017 01:05:54 -0400
Subject: [PATCH 1286/1569] Doffy Effects

---
 common/data/effects.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index cb3531dcd..417038343 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -381,10 +381,10 @@ window.effects = {
     },
 
     'Doflamingo Neo [GLOBAL] - Striker Raid Boss': {
-        description: 'Limit Chain to 1.75x.',
+        description: 'Halves Chain Multiplier.',
         thumb: 1623,
         id: 40, // don't change this
-        chainLimiter: function() { return 1.75; }
+        chainModifier: function(p) { return 0.5 ; }
     },
     
 };
\ No newline at end of file

From 2ff614ecd4ace082f8bd2f1f6306c6e3b4f4b2c7 Mon Sep 17 00:00:00 2001
From: JNathwani <jaylen.nathwani@gmail.com>
Date: Fri, 11 Aug 2017 00:36:03 -0400
Subject: [PATCH 1287/1569] Units

---
 common/data/aliases.js    |  8 ++++----
 common/data/cooldowns.js  | 12 ++++++------
 common/data/details.js    | 26 ++++++++++++++++++++++++++
 common/data/drops.js      |  2 +-
 common/data/effects.js    | 11 ++++++++++-
 common/data/evolutions.js |  8 ++++++++
 common/data/families.js   |  8 ++++----
 common/data/flags.js      |  4 ++++
 common/data/gw.js         |  8 ++++++--
 common/data/units.js      | 24 ++++++++++++------------
 10 files changed, 81 insertions(+), 30 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 3953edc2e..777308e89 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1726,10 +1726,10 @@ window.aliases = {
     1725: ['', '', ''],
     1726: ['', '', 'Kai Sabo'],
     1727: ['', '', 'Kai Sabo'],
-    1728: ['', '', ''],
-    1729: ['', '', ''],
-    1730: ['', '', ''],
-    1731: ['', '', ''],
+    1728: ['', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
+    1729: ['', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
+    1730: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi'],
+    1731: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi'],
     1732: ['', '', ''],
     1733: ['', '', ''],
     1734: ['', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e183698f5..f17a1ec34 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1720,16 +1720,16 @@ window.cooldowns = [
     null,
     [ 10, 6 ],
     [ 10, 6 ],
-    15,
-    15,
+    [ 15, 12 ],
+    [ 15, 12 ],
     [ 19, 13 ],
     [ 19, 13 ],
     [ 23, 14 ],
     [ 23, 14 ],
-    null,
-    null,
-    null,
-    null,
+    [ 8, 8 ],
+    [ 8, 8 ],
+    [ 20, 16 ],
+    [ 20, 16 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index ff421bd78..4cf3ce9ad 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9674,6 +9674,32 @@ window.details = {
         special: "Deals random typeless damage to all enemies. Adds 55x character's ATK as Additional Typeless Damage for 2 turns",
         specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters"
     },
+    1728: {//Tashigi
+        captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2x",
+        special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, remove enemies' ATK Up Buffs, and recovers 2,000 HP",
+        sailor: "Boosts HP, RCV, and ATK of [STR], [DEX], and [QCK] characters by 30",
+        specialName: "Destructive Water Splash",
+    },
+    1729: {//Tashigi
+        captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.25x and their HP by 1.25x. Recovers 3x character's RCV in HP at the end of each turn",
+        special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, remove enemies' ATK Up Buffs, and recovers 2,000 HP",
+        sailor: "Boosts HP, RCV, and ATK of [STR], [DEX], and [QCK] characters by 30",
+        specialName: "Destructive Water Splash",
+    },
+    1731: {//Vivi
+        captain: "Boosts ATK of all characters by 2x",
+        special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
+        sailor: "Restores her own special by 3 turns when it is rewinded",
+        sailorNotes: "#{rewind : 3}",
+        specialName: "Shining Brightly Upon the Oasis",
+    },
+    1730: {//Vivi
+        captain: "Boosts ATK of all characters by 2x, boosts amount of Beli received by 2.5x",
+        special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
+        sailor: "Restores her own special by 3 turns when it is rewinded",
+        sailorNotes: "#{rewind : 3}",
+        specialName: "Shining Brightly Upon the Oasis",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index d0942b2c3..6c82621b5 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1596,7 +1596,7 @@ window.drops = {
         {
             name: 'Royal Neptune Family!',
             thumb: 1723,
-            gamewith: null,
+            gamewith: 64138,
             condition: 'Strikers and Powerhouse characters get a boost',
             'All Difficulties': [ 1722, 1724, -1123, -455, -1077, -560, -1212, -1536, -1577, -1579, -966, -1352 ],
         },
diff --git a/common/data/effects.js b/common/data/effects.js
index 417038343..78e876da0 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -360,7 +360,7 @@ window.effects = {
     },
     
     'Aokiji Neo - Striker Raid Boss': {
-        description: 'Reduces Chain By 10%',
+        description: 'Reduces Chain By 90%',
         thumb: 1668,
         id: 37,
         chainModifier: function(p) { return 0.1 ; }
@@ -387,4 +387,13 @@ window.effects = {
         chainModifier: function(p) { return 0.5 ; }
     },
     
+    'Sabo Neo - Fighter Raid Boss': {
+        description: 'Boosts the Orbs all characters by 1.2x, ATK by 1.3x and Reduces Chain by Half.',
+        thumb: 1727,
+        id: 41,
+        orb: function(p) { return p.orb == 2.0 ? 1.2 : (p.orb == 0.5 ? 5/6 : 1); },
+        atk: function(p) { return 1.3; },
+        chainModifier: function(p) { return 0.5 ; }
+    },
+    
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 1f2bf93a4..a782534c0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2671,6 +2671,14 @@ window.evolutions = {
         evolution: 1727,
         evolvers: [  ]
     },
+    1728: {
+        evolution: 1729,
+        evolvers: [  ]
+    },
+    1730: {
+        evolution: 1731,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index a07f4b7bc..da7a81f53 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1726,10 +1726,10 @@ window.families = [
     "Fukaboshi",
     "Sabo",
     "Sabo",
-    null,
-    null,
-    null,
-    null,
+    "Tashigi",
+    "Tashigi",
+    "Nefertari Vivi",
+    "Nefertari Vivi",
     null,
     null,
     null,
diff --git a/common/data/flags.js b/common/data/flags.js
index d79e6416b..f8e7feb20 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1500,6 +1500,10 @@ window.flags = {
     1707: { rr: 1, rro: 1 },
     1720: { rr: 1, rro: 1, lrr: 1 },
     1721: { rr: 1, rro: 1, lrr: 1 },
+    1728: { special: 1 },
+    1729: { special: 1 },
+    1730: { rr: 1, rro: 1, lrr: 1 },
+    1731: { rr: 1, rro: 1, lrr: 1 },    
     1750: { rr: 1, rro: 1, global: 1 },
     1751: { rr: 1, rro: 1, global: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 152e49ea1..548ee07fe 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1708,8 +1708,8 @@ window.gw=[
     11948,
     63214,
     63214,
-    null,
-    null,
+    63272,
+    63272,
     null,
     null,
     null,
@@ -1720,4 +1720,8 @@ window.gw=[
     null,
     63375,
     63375,
+    64091,
+    64091,
+    64096,
+    64096,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b98ca377d..da6f18efc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1718,18 +1718,18 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 5000000, null, null, null, 2594, 1330, 320, null ],
-    [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, null, null, null, 611, 498, 189, null ],
-    [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 598, 445, 175, null, null, null, null ],
-    [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, null, 2, 50, 392019, null, null, null, null, null, null, null ],
-    [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 617, 512, 155, null, null, null, null ],
-    [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, null, null, null, 2494, 1305, 345, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 70, 1066998, 158, 113, 39, 1284, 698, 178, 1 ],
+    [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
+    [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 159, 56, 51, 611, 498, 189, 1 ],
+    [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 598, 445, 175, 1737, 1011, 324, 1 ],
+    [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, 6, 2, 50, 392019, 166, 52, 44, 655, 588, 164, 1 ],
+    [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 617, 512, 155, 2015, 1201, 238, 1 ],
+    [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, 238, 135, 37, null, null, null, null ],
+    [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1235, 595, 147, 2494, 1305, 345, null ],
+    [ "Tashigi, Beach Captain", "STR", [ "Slasher", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, null, null, null, null, 1770, 1090, 357, null ],
+    [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, null, null, null, 1990, 996, 445, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 6d18a041e526e74484663b7131770140a139768b Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 11 Aug 2017 01:59:35 -0400
Subject: [PATCH 1288/1569] Madame I-can't-spell-her-name special fixed

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 4cf3ce9ad..e021d590a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8127,14 +8127,14 @@ window.details = {
     },
     1482: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2x and their RCV by 1.2x",
-        special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
+        special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
         specialName: "Foretold Catastrophe",
     },
     1483: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2.5x and their RCV by 1.2x",
-        special: "Randomizes all orbs not her own, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
+        special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
         specialName: "Foretold Catastrophe",

From e1a0d327a48c1901948c9702c4192ed4e2e42d6e Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 16 Aug 2017 00:41:27 -0400
Subject: [PATCH 1289/1569] Vivi stats

---
 common/data/cooldowns.js | 4 ++--
 common/data/details.js   | 4 ++--
 common/data/units.js     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index f17a1ec34..5ec070b41 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1728,8 +1728,8 @@ window.cooldowns = [
     [ 23, 14 ],
     [ 8, 8 ],
     [ 8, 8 ],
-    [ 20, 16 ],
-    [ 20, 16 ],
+    [ 16, 16 ],
+    [ 16, 16 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index e021d590a..0b9f4ff73 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9686,14 +9686,14 @@ window.details = {
         sailor: "Boosts HP, RCV, and ATK of [STR], [DEX], and [QCK] characters by 30",
         specialName: "Destructive Water Splash",
     },
-    1731: {//Vivi
+    1730: {//Vivi
         captain: "Boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
         sailor: "Restores her own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
         specialName: "Shining Brightly Upon the Oasis",
     },
-    1730: {//Vivi
+    1731: {//Vivi
         captain: "Boosts ATK of all characters by 2x, boosts amount of Beli received by 2.5x",
         special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
         sailor: "Restores her own special by 3 turns when it is rewinded",
diff --git a/common/data/units.js b/common/data/units.js
index da6f18efc..f866f82b8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1728,8 +1728,8 @@ window.units = [
     [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1235, 595, 147, 2494, 1305, 345, null ],
     [ "Tashigi, Beach Captain", "STR", [ "Slasher", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, null, null, null, null, 1770, 1090, 357, null ],
-    [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, null, null, null, 1990, 996, 445, null ],
+    [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, null ],
+    [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From dfae672213ca1390d5222f452b62d51c7b08d7d4 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 16 Aug 2017 12:10:32 -0400
Subject: [PATCH 1290/1569] New Akainu

---
 common/data/captains.js   | 19 +++++++++++++++++++
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 11 +++++++++++
 common/data/evolutions.js |  4 ++++
 common/data/flags.js      |  2 ++
 common/data/sailors.js    | 10 ++++++++++
 common/data/specials.js   |  6 ++++++
 common/data/units.js      |  4 ++--
 damage/js/cruncher.js     |  2 +-
 9 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c8646dcc1..879390e49 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5153,6 +5153,12 @@ window.captains = {
         atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
+    1712: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+    },
+    1713: {
+        atk: function(p) { return p.unit.class.has("Driven") ? Math.min(3.25, 2.5 + 0.25 * p.turnCounter) : 1; }
+    },
     1720: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
@@ -5187,6 +5193,19 @@ window.captains = {
         },
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1728: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
+    },
+    1729: {
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1; },
+    },
+    1730: {
+        atk: function(p) { return 2; },
+    },
+    1731: {
+        atk: function(p) { return 2; },
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5ec070b41..7a35c15ba 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1710,8 +1710,8 @@ window.cooldowns = [
     [ 15, 6 ],
     [ 25, 16 ],
     [ 25, 16 ],
-    null,
-    null,
+    [ 17, 13 ],
+    [ 17, 13 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 0b9f4ff73..8f75dcc66 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9630,6 +9630,17 @@ window.details = {
         specialName: "Charmed by a Lovely Adult",
         sailor: "Reduces Blindness duration by 2 turns",
     },
+    1712: {//Akainu
+        captain: "Boosts ATK of Driven characters by 2.5x.",
+        special: "Deals 50x character's ATK as typeless damage to all enemies. Amplifies the effect of orbs for Driven characters by 2x for 1 turn.",
+        specialName: "Blazing Hound Crimson Lotus",
+    },
+    1713: {//Akainu
+        captain: "Boosts ATK of Driven characters by 2.5x. If you defeat an enemy last turn, increases ATK boost slighty. Stacks up to 3 times to a maximum of 3.25x.",
+        captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
+        special: "Deals 50x character's ATK as typeless damage to all enemies. Amplifies the effect of orbs for Driven characters by 2x for 1 turn.",
+        specialName: "Blazing Hound Crimson Lotus",
+    },
     1720: {//Secret Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a782534c0..0af342890 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2655,6 +2655,10 @@ window.evolutions = {
         evolution: 1711,
         evolvers: [ 116, 117, 81, 87, 98 ]
     },
+    1712: {
+        evolution: 1713,
+        evolvers: [  ]
+    },
     1720: {
         evolution: 1721,
         evolvers: [  ]
diff --git a/common/data/flags.js b/common/data/flags.js
index f8e7feb20..2b60f23af 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1498,6 +1498,8 @@ window.flags = {
     1705: { rr: 1, rro: 1 },
     1706: { rr: 1, rro: 1 },
     1707: { rr: 1, rro: 1 },
+    1712: { rr: 1, rro: 1, lrr: 1 },
+    1713: { rr: 1, rro: 1, lrr: 1 },
     1720: { rr: 1, rro: 1, lrr: 1 },
     1721: { rr: 1, rro: 1, lrr: 1 },
     1728: { special: 1 },
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 1411a87dc..35e6be36a 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -304,6 +304,16 @@ window.sailors = {
     1700: {
         atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; },
     },
+    1728: {
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+    },
+    1729: {
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+    },
     1705: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
diff --git a/common/data/specials.js b/common/data/specials.js
index 0ed734e7a..36e1ac57b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3317,6 +3317,12 @@ window.specials = {
     1711: {
         orb: function(p) { return (p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
+    1712: {
+        orb: function(p) { return (p.unit.class.has("Driven")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1713: {
+        orb: function(p) { return (p.unit.class.has("Driven")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
     1720: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         chainLimiter: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index f866f82b8..827e610e2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1710,8 +1710,8 @@ window.units = [
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, 3000000, 832, 334, 142, 1903, 940, 386, 1 ],
     [ "Nico Robin, Healthful Beauty", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
     [ "Nico Robin, Cultural Symbol", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Akainu", "DEX", [ "Powerhouse", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Akainu, Summit War Gellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2506, 1505, 251, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index eafab3c39..451d2d33b 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -783,7 +783,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));
             }
             // activate turn counter if necessary
-            if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562))
+            if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562 || id == 1712 || id == 1713))
                 $scope.tdata.turnCounter.enabled = true;
             if (n < 2 && (id == 1609 || id == 1610))
                 $scope.tdata.healCounter.enabled = true;

From 05cd454a237ad5221ee9a3717f156216522f7d26 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-195-187.umd.edu>
Date: Thu, 17 Aug 2017 14:00:38 -0400
Subject: [PATCH 1291/1569] 20th Anni Part 2

Half Done, too lazy
---
 common/data/aliases.js    |  18 ++++--
 common/data/details.js    | 114 ++++++++++++++++++++++++++++++++++----
 common/data/evolutions.js |  32 +++++++++++
 common/data/units.js      |  24 +++++---
 4 files changed, 166 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 777308e89..ead897f14 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1728,8 +1728,8 @@ window.aliases = {
     1727: ['', '', 'Kai Sabo'],
     1728: ['', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
     1729: ['', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
-    1730: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi'],
-    1731: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi'],
+    1730: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
+    1731: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
     1732: ['', '', ''],
     1733: ['', '', ''],
     1734: ['', '', ''],
@@ -1744,12 +1744,22 @@ window.aliases = {
     1743: ['', '', ''],
     1744: ['', '', ''],
     1745: ['', '', ''],
-    1746: ['', '', ''],
-    1747: ['', '', ''],
+    1746: ['', '', 'Korea Boa'],
+    1747: ['', '', 'Korea Boa'],
     1748: ['', '', ''],
     1749: ['', '', ''],
     1750: ['', '', 'Korea Law'],
     1751: ['', '', 'Korea Law'],
+    1752: ['', '', '20th Anniversary Zoro'],
+    1753: ['', '', '20th Anniversary Zoro'],
+    1754: ['', '', '20th Anniversary Sanji'],
+    1755: ['', '', '20th Anniversary Sanji'],
+    1756: ['', '', '20th Anniversary Nami'],
+    1757: ['', '', '20th Anniversary Nami'],
+    1758: ['', '', '20th Anniversary Brook'],
+    1759: ['', '', '20th Anniversary Brook'],
+    1760: ['', '', '20th Anniversary Chopper'],
+    1761: ['', '', '20th Anniversary Chopper'],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/details.js b/common/data/details.js
index 8f75dcc66..da1de1562 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7490,12 +7490,12 @@ window.details = {
         specialName: "Three Forked Tongue",
     },
     1394: {//Kimono Baby 5
-        captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x an their RCV by 1.1x",
+        captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x and their RCV by 1.1x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
         specialName: "Nation's Ambition",
     },
     1395: {//Kimono Baby 5
-        captain: "Boosts ATK of [STR] and [QCK] characters by 2.25x an their RCV by 1.2x",
+        captain: "Boosts ATK of [STR] and [QCK] characters by 2.25x and their RCV by 1.2x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
         specialName: "Nation's Ambition",
     },
@@ -7615,13 +7615,13 @@ window.details = {
         sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
     },
     1407: {//Timeskip Robin
-        captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x an their RCV by 1.25x",
+        captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x and their RCV by 1.25x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
         sailor: "Reduces Blindness duration by 3 turns",
     },
     1408: {//Timeskip Robin
-        captain: "Boosts ATK of [DEX] and [PSY] characters by 2.25x an their RCV by 1.5x",
+        captain: "Boosts ATK of [DEX] and [PSY] characters by 2.25x and their RCV by 1.5x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
         sailor: "Reduces Blindness duration by 3 turns",
@@ -7917,7 +7917,7 @@ window.details = {
         specialName: "Doki Doki Heart",
     },
     1454: {//Valentines Margeurite
-        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x an their RCV by 1.5x",
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x and their RCV by 1.5x",
         special: "Changes all orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [DEX], bottom row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
         specialName: "Doki Doki Heart",
@@ -8977,26 +8977,26 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
-        sailor: "Adds 22x character's ATK as Additional Typeless Damage",
+        sailor: "Adds 2x character's ATK as Additional Typeless Damage",
         sailorNotes: "#{additionalDamage : 2x}",
     },
     1614: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
-        sailor: "Adds 22x character's ATK as Additional Typeless Damage",
+        sailor: "Adds 2x character's ATK as Additional Typeless Damage",
         sailorNotes: "#{additionalDamage : 2x}",
     },
     1615: {//Crocodile
-        captain: "Boosts ATK of Strikers by 2x",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turn",
+        captain: "Boosts ATK of Striker characters by 2x",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
     },
     1616: {//Crocodile
-        captain: "Boosts ATK of Strikers by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Strikers and amplifies orbs of Strikers by 1.5x for 1 turn",
+        captain: "Boosts ATK of Striker characters by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
@@ -9711,6 +9711,36 @@ window.details = {
         sailorNotes: "#{rewind : 3}",
         specialName: "Shining Brightly Upon the Oasis",
     },
+    1734: {//Sugar
+        captain: "Boosts ATK of Cerebral and Fighter characters by ???x and recovers ?x character's RCV in HP at the end of each turn",
+        special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
+        specialName: "Sugar Special",
+    },
+    1735: {//Sugar
+        captain: "Boosts ATK of Cerebral and Fighter characters by 1.75x and recovers 3x character's RCV in HP at the end of each turn",
+        special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
+        specialName: "Sugar Special",
+    },
+    1736: {//Trebol
+        captain: "Boosts ATK of INT characters by ???x and their HP by ???x. Reduces damage received by ???%",
+        special: "Delays all enemies for 1 turn and deals 20x character's ATK as DEX damage to all enemies at the end of the turn for 2 turns",
+        specialName: "Trebol Special",
+    },
+    1737: {//Trebol
+        captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.2x. Reduces damage received by 10%",
+        special: "Delays all enemies for 1 turn and deals 20x character's ATK as DEX damage to all enemies at the end of the turn for 2 turns",
+        specialName: "Trebol Special",
+    },
+    1746: {//Korea Boa
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
+        specialName: "Pistol Kisses",
+    },
+    1747: {//Korea Boa
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
+        special: "Deals 6 hits of 2,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
+        specialName: "Pistol Kisses",
+    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
@@ -9739,4 +9769,66 @@ window.details = {
         ],
         specialName: "Injection Shot",
     },
+    1752: {//20th Anni Zoro
+        captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
+        special: "Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
+        sailor: "Boosts ATK of Slasher characters by 50",
+        specialName: "Zoro Special",
+    },
+    1753: {//20th Anni Zoro
+        captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect",
+        special: "Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
+        sailor: "Boosts ATK of Slasher characters by 50",
+        specialName: "Zoro Special",
+    },
+    1754: {//20th Anni Sanji
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
+        special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
+        sailor: "Boosts HP, RCV, and ATK of all characters by 40",
+        specialName: "Sanji Special",
+    },
+    1755: {//20th Anni Sanji
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 2.5x and their HP by 1.2x",
+        special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
+        sailor: "Boosts HP, RCV, and ATK of all characters by 40",
+        specialName: "Sanji Special",
+    },
+    1756: {//20th Anni Nami
+        captain: "Recovers 2x character's RCV in HP at the end of each turn",
+        special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Nami Special",
+    },
+    1757: {//20th Anni Nami
+        captain: "Recovers 5x character's RCV in HP at the end of each turn",
+        special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Nami Special",
+    },
+    1758: {//20th Anni Brook
+        captain: "Boosts ATK of Free Spirit characters by 2x and their HP by 1.1x",
+        special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+        specialName: "Brook Special",
+    },
+    1759: {//20th Anni Brook
+        captain: "Boosts ATK of Free Spirit characters by 2.5x and their HP by 1.2x",
+        special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+        specialName: "Brook Special",
+    },
+    1760: {//20th Anni Chopper
+        captain: "Boosts ATK of [DEX] and [INT] characters by 2x",
+        special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
+        sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
+        sailorNotes: "#{silence}<br>#{rewind : 2}",
+        specialName: "Chopper Special",
+    },
+    1760: {//20th Anni Chopper
+        captain: "Boosts ATK of [DEX] and [INT] characters by 2.5x",
+        special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
+        sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
+        sailorNotes: "#{silence}<br>#{rewind : 2}",
+        specialName: "Chopper Special",
+    },
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 0af342890..4833dfee5 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2683,8 +2683,40 @@ window.evolutions = {
         evolution: 1731,
         evolvers: [  ]
     },
+    1734: {
+        evolution: 1735,
+        evolvers: [  ]
+    },
+    1736: {
+        evolution: 1737,
+        evolvers: [  ]
+    },
+    1747: {
+        evolution: 1748,
+        evolvers: [  ]
+    },
     1750: {
         evolution: 1751,
         evolvers: [  ]
     },
+    1752: {
+        evolution: 1753,
+        evolvers: [  ]
+    },
+    1754: {
+        evolution: 1755,
+        evolvers: [  ]
+    },
+    1756: {
+        evolution: 1757,
+        evolvers: [  ]
+    },
+    1758: {
+        evolution: 1759,
+        evolvers: [  ]
+    },
+    1760: {
+        evolution: 1761,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 827e610e2..45e8c5190 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1646,7 +1646,7 @@ window.units = [
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
     [ "Pica [Neo]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
     [ "Pica [Neo], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
-    [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
+    [ "Giolla, Art-Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
@@ -1732,6 +1732,10 @@ window.units = [
     [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugar, Hobby-Hobby Human", "STR", [ "Cerebral", "Fighter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugar, Trebol Army", "STR", [ "Cerebral", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Trebol, Stick-Stick Man", "INT", [ "Cerebral", "Driven" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Trebol, Donquiote Family Executive", "INT", [ "Cerebral", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1740,16 +1744,22 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Boa", "PSY", [ "Shooter", "Fighter" ], 5, 30, 4, 3, 70, 1066998, 294, 255, 77, 1326, 790, 189, null ],
+    [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
     [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
+    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c7f0d50dfcd1b1c5a3752bd3670e7b23c09aad95 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@wireless-10-104-195-187.umd.edu>
Date: Thu, 17 Aug 2017 14:50:25 -0400
Subject: [PATCH 1292/1569] Boa Machine Broke

It fixed now
---
 common/data/captains.js | 51 +++++++++++++++++++++++++++++++++
 common/data/details.js  |  2 +-
 common/data/families.js | 22 +++++++++++----
 common/data/flags.js    | 14 +++++++++-
 common/data/gw.js       | 40 ++++++++++++++++++++++++--
 common/data/sailors.js  | 16 +++++++++++
 common/data/specials.js | 62 +++++++++++++++++++++++++++++++++++++++++
 common/data/units.js    | 20 ++++++-------
 common/data/zombies.js  | 28 +++++++++++++++++++
 damage/js/cruncher.js   |  5 ++--
 damage/js/utils.js      |  6 ++++
 11 files changed, 244 insertions(+), 22 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 879390e49..72fa28044 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5206,10 +5206,61 @@ window.captains = {
     1731: {
         atk: function(p) { return 2; },
     },
+    1746: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Shooter')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2.5 : (prev == 'Good' ? 2.75 : (prev == 'Great' ? 3 : (prev == 'Perfect' ? 3.25 : 2.5)));
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1747: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Shooter')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2.5 : (prev == 'Good' ? 2.75 : (prev == 'Great' ? 3 : (prev == 'Perfect' ? 3.25 : 2.5)));
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
     1751: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
+    1752: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+    },
+    1753: {
+        damageSorter: function(d) { return CrunchUtils.lowCostSort(d, 3.5, 30); },
+        hitAtk: function(p) {
+            if (!(p.unit.cost <= 30)) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
+    },
+    1754: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+    },
+    1755: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1758: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.1 : 1; },
+    },
+    1759: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+    },
+    1760: {
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2 : 1; },
+    },
+    1761: {
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/details.js b/common/data/details.js
index da1de1562..3bb7f2f7a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9824,7 +9824,7 @@ window.details = {
         sailorNotes: "#{silence}<br>#{rewind : 2}",
         specialName: "Chopper Special",
     },
-    1760: {//20th Anni Chopper
+    1761: {//20th Anni Chopper
         captain: "Boosts ATK of [DEX] and [INT] characters by 2.5x",
         special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
         sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
diff --git a/common/data/families.js b/common/data/families.js
index da7a81f53..133ef835c 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1733,6 +1733,10 @@ window.families = [
     null,
     null,
     null,
+    "Sugar",
+    "Sugar",
+    "Trebol",
+    "Trebol",
     null,
     null,
     null,
@@ -1740,14 +1744,20 @@ window.families = [
     null,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Boa Hancock",
+    "Boa Hancock",
     null,
     null,
     "Trafalgar Law",
     "Trafalgar Law",
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Sanji",
+    "Sanji",
+    "Nami",
+    "Nami",
+    "Brook",
+    "Brook",
+    "Tony Tony Chopper",
+    "Tony Tony Chopper",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 2b60f23af..b426197f9 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1505,7 +1505,19 @@ window.flags = {
     1728: { special: 1 },
     1729: { special: 1 },
     1730: { rr: 1, rro: 1, lrr: 1 },
-    1731: { rr: 1, rro: 1, lrr: 1 },    
+    1731: { rr: 1, rro: 1, lrr: 1 },   
+    1746: { rr: 1, rro: 1 },
+    1747: { rr: 1, rro: 1 },  
     1750: { rr: 1, rro: 1, global: 1 },
     1751: { rr: 1, rro: 1, global: 1 },
+    1752: { rr: 1, rro: 1 },
+    1753: { rr: 1, rro: 1 },
+    1754: { rr: 1, rro: 1 },
+    1755: { rr: 1, rro: 1 },
+    1756: { rr: 1, rro: 1 },
+    1757: { rr: 1, rro: 1 },
+    1758: { rr: 1, rro: 1 },
+    1759: { rr: 1, rro: 1 },
+    1760: { rr: 1, rro: 1 },
+    1761: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 548ee07fe..47587f56e 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1710,8 +1710,8 @@ window.gw=[
     63214,
     63272,
     63272,
-    null,
-    null,
+    65777,
+    65777,
     null,
     null,
     null,
@@ -1724,4 +1724,40 @@ window.gw=[
     64091,
     64096,
     64096,
+    64234,
+    64234,
+    null,
+    null,
+    64838,
+    64838,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    65830,
+    65830,
+    65835,
+    65835,
+    65833,
+    65833,
+    65831,
+    65831,
+    65834,
+    65834,
 ];
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 35e6be36a..32f34642f 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -324,4 +324,20 @@ window.sailors = {
         rcvStatic: function(p) { return 50; },
         hpStatic: function(p) { return 50; },
     },
+    1752: {
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+    },
+    1753: {
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+    },
+    1754: {
+        atkStatic: function(p) { return 40; },
+        rcvStatic: function(p) { return 40; },
+        hpStatic: function(p) { return 40; },
+    },
+    1755: {
+        atkStatic: function(p) { return 40; },
+        rcvStatic: function(p) { return 40; },
+        hpStatic: function(p) { return 40; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 36e1ac57b..baea95c3c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3373,6 +3373,32 @@ window.specials = {
     1727: {
         staticMult: function(p) { return 55; }
     },
+    1736: {
+        delay: function(p) { return 1; },
+    },
+    1737: {
+        delay: function(p) { return 1; },
+    },
+    1746: {
+        delay: function(p) { return 1; },
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1746].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1746].turnedOn = false;
+        }
+    },
+    1747: {
+        delay: function(p) { return 1; },
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1747].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1747].turnedOn = false;
+        }
+    },
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
@@ -3395,4 +3421,40 @@ window.specials = {
             });
         },
     },
+    1752: {
+        atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1752].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1752].multiplier == 1.75 ? 1 : 0);
+            window.specials[1752].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1752warning'
+            });
+        }
+    },
+    1753: {
+        atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1753].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1753].multiplier == 1.75 ? 1 : 0);
+            window.specials[1753].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1753warning'
+            });
+        }
+    },
+    1754: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
+    1755: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
+    1758: {
+        delay: function(p) { return 1; },
+    },
+    1759: {
+        delay: function(p) { return 1; },
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 45e8c5190..e558877b1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1750,16 +1750,16 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
     [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
-    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
+    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
+    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
+    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
+    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
+    [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
+    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
+    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
+    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index a94258a64..5ff9247fa 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -435,4 +435,32 @@ window.zombies = {
         type: 'healer',
         multiplier: 4
     },
+    1728: { // Tashigi
+        type: 'healer',
+        multiplier: 2
+    },
+    1729: { // Tashigi
+        type: 'healer',
+        multiplier: 3
+    },
+    1735: { // Sugar
+        type: 'healer',
+        multiplier: 3
+    },
+    1746: { // Boa
+        type: 'healer',
+        amount: 1000
+    },
+    1747: { // Boa
+        type: 'healer',
+        amount: 1000
+    },
+    1756: { // Nami
+        type: 'healer',
+        multiplier: 2
+    },
+    1757: { // Nami
+        type: 'healer',
+        multiplier: 5
+    },
 };
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 451d2d33b..ccf11b757 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -192,11 +192,12 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn || window.specials[1463]. turnedOn || window.specials[1462]. turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Powerhouse")) orb = (window.specials[1528].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Free Spirit")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
-            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn || window.specials[1746].turnedOn || window.specials[1747].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Striker")) orb = (window.specials[1651].turnedOn || window.specials[1652].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher")))|| (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1528].turnedOn && x.unit.class.has("Powerhouse")) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit")) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")))) ? 2 : 1;
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1528].turnedOn && x.unit.class.has("Powerhouse")) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit"))) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")) || ((window.specials[1746].turnedOn || window.specials[1747].turnedOn) && x.unit.class.has("Shooter"))) ? 2 : 1;
+            
             if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1330].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
             
             //Captain Meat orbs because Nekomamushi
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 84c8f1d4e..1685be12f 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -153,6 +153,12 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
+    if(window.specials[1746].turnedOn || window.specials[1747].turnedOn){
+        if(uclass.has("Shooter")){
+            if (orb == 'str') return boostedMultiplier;
+            if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
+        }
+    }
     if(window.specials[1651].turnedOn || window.specials[1652].turnedOn){
         if(uclass.has("Striker")){
             if (orb == 'str') return boostedMultiplier;

From 455d5b475cd2283191eaf2b5d1177ae0622651c8 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 17 Aug 2017 17:50:34 -0400
Subject: [PATCH 1293/1569] Zoro and Bepo

---
 common/data/details.js | 4 ++--
 common/data/units.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3bb7f2f7a..3d03e01b8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9771,13 +9771,13 @@ window.details = {
     },
     1752: {//20th Anni Zoro
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
-        special: "Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
+        special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
         sailor: "Boosts ATK of Slasher characters by 50",
         specialName: "Zoro Special",
     },
     1753: {//20th Anni Zoro
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect",
-        special: "Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
+        special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
         sailor: "Boosts ATK of Slasher characters by 50",
         specialName: "Zoro Special",
     },
diff --git a/common/data/units.js b/common/data/units.js
index e558877b1..8ccef0d50 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1001,8 +1001,8 @@ window.units = [
     [ "Corazon, Donquixote Pirates","DEX",["Free Spirit","Cerebral"], 5, 30, 4, 4, 70, 1066998, 406, 196, 155, 1503, 694, 320, 1 ],
     [ "Donquixote Rosinante","DEX",["Free Spirit","Cerebral"], 6, 55, 4, 5, 99, 5000000, 1428, 628, 272, 2746, 1222, 555, 1 ],
     [ "Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 3, 12, 4, 1, 50, 392109, 96, 53, 46, 1003, 525, 213, 1],
-    [ "Martial Artist Bepo, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
-    [ "Sachi and Penguin, Heart Pirates", "QCK", ["Fighter", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
+    [ "Bepo the Martial Artist, Heart Pirates", "STR", ["Fighter", "Powerhouse"], 4, 20, 4, 2, 99, 3000000, 921, 461, 162, 1803, 1054, 307, 1],
+    [ "Sachi & Penguin, Heart Pirates", "QCK", ["Fighter", "Free Spirit"], 4, 15, 5, 2, 70, 1066998, 92, 37, 36, 1059, 701, 231, 1],
     [ "Jean Bart", "STR", ["Powerhouse", "Fighter"], 3, 12, 5, 1, 50, 392109, 194, 55, 13, 1404, 541, 96, 1],
     [ "Jean Bart, Heart Pirates", "STR", ["Powerhouse", "Fighter"], 4, 20, 4, 2, 99, 3000000, 1337, 488, 44, 2614, 1069, 153, 1],
     [ "Monet Cold Season Cherry Blossoms","QCK",["Free Spirit","Cerebral"], 4, 13, 6, 2, 50, 392109, 67, 37, 55, 884, 428, 204, 1],

From ee7126c07f2ecc3e8602390a42867f2fafba380c Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 17 Aug 2017 17:53:57 -0400
Subject: [PATCH 1294/1569] Stats

---
 common/data/units.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 8ccef0d50..da5b2426e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1750,16 +1750,16 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
     [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
-    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
-    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
-    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
-    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
-    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
-    [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
-    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
-    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, 3, null, null, null, null, null, null, null, null, null ],
-    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, null, 5, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2503, 1400, 269, null ],
+    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2417, 1353, 305, null ],
+    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, 6, 5, 99, 4000000, null, null, null, 2076, 1179, 417, null ],
+    [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2274, 1336, 333, null ],
+    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2330, 1258, 351, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 582e3dbb7a741853c9095083ddf172e82370bf6d Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 17 Aug 2017 17:56:26 -0400
Subject: [PATCH 1295/1569] CDs

---
 common/data/cooldowns.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7a35c15ba..3fd333855 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1744,10 +1744,20 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
-    null,
+    20,
+    20,
     null,
     null,
     [ 20, 15 ],
     [ 20, 15 ],
+    18,
+    18,
+    16,
+    16,
+    14,
+    14,
+    11,
+    11,
+    13,
+    13,
 ];

From af5aad9f7664f750c3b791f5ab346a1e4890b8f1 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Thu, 17 Aug 2017 17:23:41 -0700
Subject: [PATCH 1296/1569] Korean Boa special fix + new 20th anni special
 names

---
 common/data/details.js | 24 ++++++++++++------------
 common/data/units.js   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3d03e01b8..07b6d7b67 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9733,12 +9733,12 @@ window.details = {
     },
     1746: {//Korea Boa
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
-        special: "Deals 6 hits of 2,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
+        special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },
     1747: {//Korea Boa
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
-        special: "Deals 6 hits of 2,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
+        special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },
     1750: {//Korea Law
@@ -9773,62 +9773,62 @@ window.details = {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
         sailor: "Boosts ATK of Slasher characters by 50",
-        specialName: "Zoro Special",
+        specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
     1753: {//20th Anni Zoro
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
         sailor: "Boosts ATK of Slasher characters by 50",
-        specialName: "Zoro Special",
+        specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
     1754: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
         sailor: "Boosts HP, RCV, and ATK of all characters by 40",
-        specialName: "Sanji Special",
+        specialName: "Diable Jambe: Collier Strike",
     },
     1755: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2.5x and their HP by 1.2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
         sailor: "Boosts HP, RCV, and ATK of all characters by 40",
-        specialName: "Sanji Special",
+        specialName: "Diable Jambe: Collier Strike",
     },
     1756: {//20th Anni Nami
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Nami Special",
+        specialName: "Gust Sword",
     },
     1757: {//20th Anni Nami
         captain: "Recovers 5x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Nami Special",
+        specialName: "Gust Sword",
     },
     1758: {//20th Anni Brook
         captain: "Boosts ATK of Free Spirit characters by 2x and their HP by 1.1x",
         special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
-        specialName: "Brook Special",
+        specialName: "Party Music: Quinte Tierce Fantasia",
     },
     1759: {//20th Anni Brook
         captain: "Boosts ATK of Free Spirit characters by 2.5x and their HP by 1.2x",
         special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
-        specialName: "Brook Special",
+        specialName: "Party Music: Quinte Tierce Fantasia",
     },
     1760: {//20th Anni Chopper
         captain: "Boosts ATK of [DEX] and [INT] characters by 2x",
         special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
         sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
         sailorNotes: "#{silence}<br>#{rewind : 2}",
-        specialName: "Chopper Special",
+        specialName: "Intelligent Monster",
     },
     1761: {//20th Anni Chopper
         captain: "Boosts ATK of [DEX] and [INT] characters by 2.5x",
         special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
         sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
         sailorNotes: "#{silence}<br>#{rewind : 2}",
-        specialName: "Chopper Special",
+        specialName: "Intelligent Monster",
     },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index da5b2426e..261c19926 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1710,8 +1710,8 @@ window.units = [
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, 3000000, 832, 334, 142, 1903, 940, 386, 1 ],
     [ "Nico Robin, Healthful Beauty", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
     [ "Nico Robin, Cultural Symbol", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
-    [ "Akainu", "DEX", [ "Powerhouse", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Akainu, Summit War Gellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2506, 1505, 251, null ],
+    [ "Akainu, Summit War Coverfire", "DEX", [ "Powerhouse", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Akainu, Summit War Hellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2506, 1505, 251, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b7d4a7e6b7fe7a6a9863f617be02ba31a03650fc Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Thu, 17 Aug 2017 17:30:37 -0700
Subject: [PATCH 1297/1569] also Neo Sabo's MAX Unevolved stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 261c19926..480cd34c2 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1724,7 +1724,7 @@ window.units = [
     [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 598, 445, 175, 1737, 1011, 324, 1 ],
     [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, 6, 2, 50, 392019, 166, 52, 44, 655, 588, 164, 1 ],
     [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 617, 512, 155, 2015, 1201, 238, 1 ],
-    [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, 238, 135, 37, null, null, null, null ],
+    [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, 238, 135, 37, 1305, 676, 190, null ],
     [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1235, 595, 147, 2494, 1305, 345, null ],
     [ "Tashigi, Beach Captain", "STR", [ "Slasher", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, null, null, null, null, 1770, 1090, 357, null ],

From 04ece05040bada5c789bf5a98cc15e1d423d19b9 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 17 Aug 2017 23:35:00 -0400
Subject: [PATCH 1298/1569] Fixes

Farmable Drops and Families
---
 common/data/drops.js    | 12 +++++++++++-
 common/data/families.js |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 6c82621b5..9408755a3 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1467,12 +1467,14 @@ window.drops = {
             thumb: 1384,
             global: true,
             gamewith: 46658,
+            condition: 'Limited amount of turns to complete the mission.',
             'All Difficulties': [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739, -1550 ]
         },
         
         {
             name: 'Shambles! Tashigi and Smoker?!?',
             thumb: 1397,
+            global: true,
             gamewith: 47247,
             condition: 'Your captain will be switched with your middle right character when you encounter Law.',
             'All Difficulties': [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
@@ -1597,10 +1599,18 @@ window.drops = {
             name: 'Royal Neptune Family!',
             thumb: 1723,
             gamewith: 64138,
-            condition: 'Strikers and Powerhouse characters get a boost',
+            condition: 'Strikers and Powerhouse characters get a boost (1.5x ATK boost on 30 stamina)',
             'All Difficulties': [ 1722, 1724, -1123, -455, -1077, -560, -1212, -1536, -1577, -1579, -966, -1352 ],
         },
         
+        {
+            name: 'Underground Trade Port! Escape!',
+            thumb: 1735,
+            gamewith: null,
+            condition: 'Limited amount of turns to complete the mission.',
+            'All Difficulties': [ 1734, 1736, -1571, -1573, -1654, -641, -1182, -1188, -1210, -556, -964, -1354 ]
+        },
+        
     ],
 
             
diff --git a/common/data/families.js b/common/data/families.js
index 133ef835c..617eaacd1 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1732,7 +1732,6 @@ window.families = [
     "Nefertari Vivi",
     null,
     null,
-    null,
     "Sugar",
     "Sugar",
     "Trebol",
@@ -1744,6 +1743,7 @@ window.families = [
     null,
     null,
     null,
+    null,
     "Boa Hancock",
     "Boa Hancock",
     null,

From 51384e0dc70b52c0eb4124f9e3884c806d904cb1 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Fri, 18 Aug 2017 14:06:33 -0400
Subject: [PATCH 1299/1569] New units

and fixed Diamante
---
 common/data/captains.js   | 22 ++++++++++++++
 common/data/cooldowns.js  | 12 ++++----
 common/data/details.js    | 61 ++++++++++++++++++++++++++++++---------
 common/data/drops.js      | 23 +++++++++++++++
 common/data/evolutions.js |  4 +++
 common/data/families.js   | 16 +++++-----
 common/data/specials.js   | 52 +++++++++++++++++++++++----------
 common/data/units.js      | 12 ++++----
 common/data/zombies.js    |  4 +++
 common/js/directives.js   |  3 +-
 10 files changed, 158 insertions(+), 51 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 72fa28044..782a6b117 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5159,6 +5159,28 @@ window.captains = {
     1713: {
         atk: function(p) { return p.unit.class.has("Driven") ? Math.min(3.25, 2.5 + 0.25 * p.turnCounter) : 1; }
     },
+    1714: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+    },
+    1715: {
+        atk: function(p) { return !p.unit.class.has("Striker") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); },
+    },
+    1716: {
+        atk: function(p) {
+            return p.unit.class.has("Driven") ? Math.min(3, 1.2 + 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1718: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1719: {
+        atk: function(p) { return p.unit.type != "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2 : 1); }
+    },
     1720: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3fd333855..a2b041a7e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1712,12 +1712,12 @@ window.cooldowns = [
     [ 25, 16 ],
     [ 17, 13 ],
     [ 17, 13 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    21,
+    19,
+    21,
+    19,
+    20,
+    20,
     [ 10, 6 ],
     [ 10, 6 ],
     [ 15, 12 ],
diff --git a/common/data/details.js b/common/data/details.js
index 07b6d7b67..fd54505f6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4243,7 +4243,7 @@ window.details = {
         specialName: "Hero of Justice! Chopper Mask!!",
         special: "Recovers 5,000 HP, boosts ATK of PSY characters by 1.5x for 2 turns",
         captain: "Boosts ATK of PSY characters by 2x, their RCV by 1.5x, makes INT orbs \"beneficial\" to PSY characters",
-        captainNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs."
+        captainNotes: "#{beneficial}"
     },
     911: {
         specialName: "Diable Jambe: Premier Hachis",
@@ -5691,7 +5691,7 @@ window.details = {
     },
     1139: {
         captain: "Boosts ATK and RCV of Striker characters by 1.5x",
-        special: "Randomly changes all orbs (including [BLOCK] orbs) into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
+        special: "Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK], [PSY], or [INT] orbs",
         specialName: "Lack of Pure Chi: Lion Finger Gun Sneak Attack"
     },
     1140: {// Coliseum Moria
@@ -6434,7 +6434,7 @@ window.details = {
     },
     1250: {// Coliseum Marco
         captain: "Boosts ATK of Powerhouse characters by 1.5x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
-        captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 2.5x RCV",
+        captainNotes: "1x Powerhouse: .5x RCV | 2x Powerhouse: .75x RCV | 3x Powerhouse: 1x RCV | 4x Powerhouse: 1.5x RCV | 5x Powerhouse: 2x RCV | 6x Powerhouse: 3.5x RCV",
         special: [
             {
                 "description": "Randomizes all orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
@@ -8041,11 +8041,11 @@ window.details = {
         captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
         special: [
             {
-                "description": "Changes adjacent orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
+                "description": "Changes adjacent orbs, including [BLOCK] orbs, into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
                 "cooldown": [ 13, 9 ],
             },
             {
-                "description": "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
+                "description": "Changes all orbs, including [BLOCK] orbs, into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
                 "cooldown": [ 22, 18 ],
             },
         ],
@@ -8057,11 +8057,11 @@ window.details = {
         captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
         special: [
             {
-                "description": "Changes adjacent orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
+                "description": "Changes adjacent orbs, including [BLOCK] orbs into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
                 "cooldown": [ 13, 9 ],
             },
             {
-                "description": "Changes all orbs (including [BLOCK] orbs) into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
+                "description": "Changes all orbs, including [BLOCK] orbs into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
                 "cooldown": [ 22, 18 ],
             },
         ],
@@ -8818,14 +8818,14 @@ window.details = {
         specialName: "Firey Morale",
     },
     1587: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Sky Walks into the air for 1 turn, preventing all debuffs to himself. This does not remove the his own Captain boost while he is unable to attack. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
         captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
         specialName: "Hell Memories",
     },
     1588: {//Legend Sanji
-        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Flies into the air for 1 turn, preventing all debuffs to himself. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
+        captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Sky Walks into the air for 1 turn, preventing all debuffs to himself. This does not remove the his own Captain boost while he is unable to attack. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
         captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
@@ -9162,7 +9162,7 @@ window.details = {
         specialName: "Poison Attack",
     },
     1643: {//STR Centaur Fodder
-        captain: "Reduces cooldown of Slasher specials by 2 turns",
+        captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight",
         special: "Boosts ATK of Slasher characters for 1 turn",
         specialName: "Attack Boost: Slasher",
     },
@@ -9641,6 +9641,37 @@ window.details = {
         special: "Deals 50x character's ATK as typeless damage to all enemies. Amplifies the effect of orbs for Driven characters by 2x for 1 turn.",
         specialName: "Blazing Hound Crimson Lotus",
     },
+    1714: {//Monet
+        captain: "Boosts ATK of INT characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
+        special: "Deals 10x character's ATK in [INT] damage to all enemies. Randomly changes all orbs into either [TND], [BOMB] or [RCV] orbs.",
+        specialName: "Monet Special",
+    },
+    1715: {//Vergo
+        captain: "Boosts ATK of Striker characters by 2.5x if they have a matching orb, by 2x otherwise",
+        special: "Changes own orb into [QCK], locks all orbs for 1 turn",
+        specialName: "Vergo Special",
+    },
+    1716: {//Caesar
+        captain: "Reduces HP of all characters by 50%, boosts ATK of Driven characters by 1.2x, increases his own ATK multiplier by 0.1x at the end of each turn until it reaches 3x",
+        special: "Delays all enemies for 1 turn. For Driven characters, Changes [EMPTY] orbs into Matching orbs. Boosts ATK of Driven characters by 1.75x if HP is below 30% when the special is activated.",
+        specialName: "Massacre GAS",
+    },
+    1717: {//Vegapunk Dragon
+        captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight",
+        special: "Deals 3x character's ATK in [QCK] damage to all enemies",
+        specialName: "Vegapunk Dragon Special",
+    },
+    1718: {//Buffalo
+        captain: "Boosts ATK of Driven characters by 2.5x until the first hit other than Perfect",
+        special: "Boosts ATK of Driven characters by 1.25x for 5 turns",
+        specialName: "Buffalo Special",
+    },
+    1719: {//Baby 5
+        captain: "Boosts ATK of [PSY] characters by 2x if they have matching orbs, makes INT orbs \"beneficial\" to PSY characters",
+        captainNotes: "#{beneficial}",
+        special: "Changes adjacent orbs into [G] orbs",
+        specialName: "Baby 5 Special",
+    },
     1720: {//Secret Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
@@ -9653,12 +9684,12 @@ window.details = {
     },
     1722: {//Neptune
         captain: "Boosts ATK of Striker characters by 2x.",
-        special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below ???% when the special is activated and deals 20,000 Fixed damage to one enemy.",
+        special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below 30% when the special is activated and deals 20,000 Fixed damage to one enemy.",
         specialName: "Sea God's Strike"
     },
     1723: {//Neptune
         captain: "Boosts ATK of Striker characters by 2x and their RCV by 1.2x.",
-        special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below ???% when the special is activated and deals 20,000 Fixed damage to one enemy.",
+        special: "Boosts ATK of Striker characters by 1.5x for 1 turn and Changes own orb into [PSY] if HP is below 30% when the special is activated and deals 20,000 Fixed damage to one enemy.",
         specialName: "Sea God's Strike"
     },
     1724: {//Fukaboshi
@@ -9723,12 +9754,12 @@ window.details = {
     },
     1736: {//Trebol
         captain: "Boosts ATK of INT characters by ???x and their HP by ???x. Reduces damage received by ???%",
-        special: "Delays all enemies for 1 turn and deals 20x character's ATK as DEX damage to all enemies at the end of the turn for 2 turns",
+        special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
         specialName: "Trebol Special",
     },
     1737: {//Trebol
         captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.2x. Reduces damage received by 10%",
-        special: "Delays all enemies for 1 turn and deals 20x character's ATK as DEX damage to all enemies at the end of the turn for 2 turns",
+        special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
         specialName: "Trebol Special",
     },
     1746: {//Korea Boa
@@ -9753,6 +9784,7 @@ window.details = {
                 "cooldown": [ 20, 15 ]
             }
         ],
+        specialNotes:"#{stages}",
         specialName: "Injection Shot",
     },
     1751: {//Korea Law
@@ -9767,6 +9799,7 @@ window.details = {
                 "cooldown": [ 20, 15 ]
             }
         ],
+        specialNotes:"#{stages}",
         specialName: "Injection Shot",
     },
     1752: {//20th Anni Zoro
diff --git a/common/data/drops.js b/common/data/drops.js
index 9408755a3..38dcce6cb 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -707,6 +707,29 @@ window.drops = {
             '15': [ 1636 ],
         },
         
+        {
+            name: 'Punk Hazard Ice Lands - First Floor Room R',
+            shortName: 'Punk Hazard 2',
+            thumb: 1716,
+            completion: 'Something',
+            gamewith: 65822,
+            '01': [ 1714, 1715, 1716, 1717, 1718, 1719 ],
+            '02': [  ],
+            '03': [  ],
+            '04': [  ],
+            '05': [  ],
+            '06': [  ],
+            '07': [  ],
+            '08': [  ],
+            '09': [  ],
+            '10': [  ],
+            '11': [  ],
+            '12': [  ],
+            '13': [  ],
+            '14': [  ],
+            '15': [  ],
+        },
+        
     ],
 
     'Weekly Island': [
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 4833dfee5..41190055b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2659,6 +2659,10 @@ window.evolutions = {
         evolution: 1713,
         evolvers: [  ]
     },
+    1636: {
+        evolution: 1716,
+        evolvers: [  ]
+    },
     1720: {
         evolution: 1721,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 617eaacd1..3f024540c 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1710,14 +1710,14 @@ window.families = [
     "Nami",
     "Nico Robin",
     "Nico Robin",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Akainu",
+    "Akainu",
+    "Monet",
+    "Vergo",
+    "Caesar Clown",
+    "Vegapunk's Dragon",
+    "Buffalo",
+    "Baby 5",
     "Jimbe",
     "Jimbe",
     "King Neptune",
diff --git a/common/data/specials.js b/common/data/specials.js
index baea95c3c..f4466db8e 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2331,24 +2331,28 @@ window.specials = {
         type: "condition"
     },
     1421: {
-        atk: function(p) {
-            if(p.percHP == 100.0){
-                return p.unit.class.has("Driven") ? 2 : 1;
-            }else{
-                return p.unit.class.has("Driven") ? 1.5 : 1;
-            }
-        },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1421].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP == 100 ? 2 : 1.5);
+            window.specials[1421].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                name: '1421warning'
+            });
+        }
     },
     1422: {
-        atk: function(p) {
-            if(p.percHP == 100.0){
-                return p.unit.class.has("Driven") ? 2 : 1;
-            }else{
-                return p.unit.class.has("Driven") ? 1.5 : 1;
-            }
-        },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1422].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP == 100 ? 2 : 1.5);
+            window.specials[1422].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                name: '1422warning'
+            });
+        }
     },
     1425: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
@@ -3323,6 +3327,22 @@ window.specials = {
     1713: {
         orb: function(p) { return (p.unit.class.has("Driven")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
+    1716: {
+        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1716].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.75 : 1);
+            window.specials[1716].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '1716warning'
+            });
+        }
+    },
+    1718: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.25 : 1},
+        type: "class"
+    },
     1720: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         chainLimiter: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 480cd34c2..c1dab816e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1712,12 +1712,12 @@ window.units = [
     [ "Nico Robin, Cultural Symbol", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
     [ "Akainu, Summit War Coverfire", "DEX", [ "Powerhouse", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Akainu, Summit War Hellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2506, 1505, 251, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Monet", "INT", [ "Free Spirit", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vergo", "QCK", [ "Striker", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caesar Clown, Shinokuni Ruler", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, null, 1097, 717, 130, 2194, 1435, 260, null ],
+    [ "Vegapunk's Dragon", "QCK", [ "Shooter", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Buffalo", "DEX", [ "Free Spirit", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Baby 5", "PSY", [ "Shooter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 70, 1066998, 158, 113, 39, 1284, 698, 178, 1 ],
     [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
     [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 159, 56, 51, 611, 498, 189, 1 ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 5ff9247fa..a66bd7096 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -463,4 +463,8 @@ window.zombies = {
         type: 'healer',
         multiplier: 5
     },
+    1714: { // Monet
+        type: 'healer',
+        multiplier: 2
+    },
 };
diff --git a/common/js/directives.js b/common/js/directives.js
index 661eff54f..b947765de 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -24,8 +24,9 @@ var notes = {
     zombie: "The protection only works when attacked by one single enemy and will leave the team with at least 1 HP; " +
         "the effect will not work when attacked by multiples enemies at once.",
     colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5/#1)x to QCK.",
-    instantKill: "The chance for this character to instantly kill any enemy is #1. The kills can not be reset by exiting the game, but can change by passing the turn or killing an enemy.",
+    instantKill: "The chance for this character to instantly kill any enemy is #1. The kills can not be reset by exiting the game, but can change by passing the turn or killing an enemy on that stage.",
     additionalDamage: "Every attacking character gains additional damage if they land a hit no less than Good.",
+    beneficial: "\"Beneficial\" orbs grant the same ATK boost as matching orbs and activate any Captain Abilities that are enabled by mathcing orbs.",
 };
 
 /***********

From 85223bbf7e24ddd005a030e3feb7d3006de2961c Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 18 Aug 2017 15:11:10 -0400
Subject: [PATCH 1300/1569] 3nd

---
 common/data/drops.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9408755a3..ef800f274 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -2002,7 +2002,7 @@ window.drops = {
         },
         
         {
-            name: '3nd Anniversary Celebration! Duel! Luffy',
+            name: '3rd Anniversary Celebration! Duel! Luffy',
             thumb: 1600,
             '30 Stamina': [ 1600 ]
         },

From a067c2aed3f08abbb80261217f619ac87643e531 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 19 Aug 2017 19:23:58 -0400
Subject: [PATCH 1301/1569] Lenny stats

---
 common/data/drops.js | 25 +++++++++++++++++--------
 common/data/gw.js    |  6 +++---
 common/data/units.js |  4 ++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 0e5134578..fc21d516f 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1653,7 +1653,7 @@ window.drops = {
             name: 'Clash Neo!! Mihawk',
             thumb: 1680,
             global: true,
-            gamewith: null,
+            gamewith: 62444,
             Master: [ 85, 111, 118, 1679 ],
             Expert: [ 96, 111, 1679 ]
         },
@@ -1879,7 +1879,7 @@ window.drops = {
         
         {
             name: 'Clash Neo!! Sabo',
-            gamewith: null,
+            gamewith: 64230,
             thumb: 1727,
             condition: '1 Expert version, 1 Master version, and 3 different Ultimate versions with different conditions. Expert/Master: Shooter/Fighter/Cerebral Only. Can only complete 10 times each. Ultimate: Shooter Only, Fighter Only, and Cerebral Only',
             Ultimate: [ 1726 ],
@@ -2046,7 +2046,7 @@ window.drops = {
             thumb: 1258,
             global: true,
             gamewith: 38237,
-            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.',
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard. Can drop a Super Evolution Skull.',
             'All Difficulties': [ 1257 ]
         },
         
@@ -2055,7 +2055,7 @@ window.drops = {
             thumb: 1380,
             global: true,
             gamewith: 46369,
-            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks.',
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks. Can drop a Super Evolution Skull.',
             'All Difficulties': [ 1379, 952, 776 ]
         },
         
@@ -2063,7 +2063,7 @@ window.drops = {
             name: 'Invasion! Cavendish',
             thumb: 1530,
             gamewith: 53621,
-            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.',
+            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish. Can drop a Super Evolution Skull.',
             'All Difficulties': [ 1529 ]
         },
         
@@ -2093,7 +2093,7 @@ window.drops = {
             name: 'Rescue Ace Event - Kizaru',
             thumb: 1228,
             global: true,
-            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Almighty Book.',
+            condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Silver Almighty Book.',
             'Characters': [ 968, 969, 970, 971, 972, 231, 775, 1223, 49, 43 ],
             'Boosters and Evolvers': [ 112, 191, 349, 266, 83, 118 ],
             'Global': [ -367, -649, -718, -16, -1446, -20, -1447, -73, -251, -257, -308, -359, -365, -412, -457, -639, -750, -758, -912, -914, -941, -993, -522, -1117, -526, -1173, -556, -1210, -1245, -223, -15, -23, -25, -200, -225, -546, -500, -506, -569, -791, -793 ],
@@ -2101,14 +2101,23 @@ window.drops = {
         },
         
         {
-            name: 'The Three Admirals',
+            name: 'Big Battle! The Three Admirals',
             thumb: 1314,
             gamewith: 61665,
-            condition: 'Chance of dropping the Almighty Book.',
+            condition: 'Chance of dropping the Silver Almighty Book.',
             'All Bosses': [ -1621, -1632, -1665 ],
             'Chopperman Mission': [ 1675 ],
         },
         
+        {
+            name: 'Big Battle! Straw Hat Pirates',
+            thumb: 1404,
+            gamewith: 65078,
+            condition: 'Chance of dropping the Silver Almighty Book.',
+            'All Bosses': [ -1621, -1632, -1665, -1678, -1721 ],
+            'Chopperman Missions': [ 1728 ],
+        },
+        
         {
             name: 'The Flashback Before the Reunion! Fight all your Enemies!',
             thumb: 1353,
diff --git a/common/data/gw.js b/common/data/gw.js
index 47587f56e..a94e6fee3 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1714,7 +1714,7 @@ window.gw=[
     65777,
     null,
     null,
-    null,
+    60339,
     null,
     null,
     null,
@@ -1726,8 +1726,8 @@ window.gw=[
     64096,
     64234,
     64234,
-    null,
-    null,
+    65077,
+    65077,
     64838,
     64838,
     null,
diff --git a/common/data/units.js b/common/data/units.js
index c1dab816e..da6014785 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1726,8 +1726,8 @@ window.units = [
     [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 617, 512, 155, 2015, 1201, 238, 1 ],
     [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, 238, 135, 37, 1305, 676, 190, null ],
     [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1235, 595, 147, 2494, 1305, 345, null ],
-    [ "Tashigi, Beach Captain", "STR", [ "Slasher", "Cerebral" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, null, null, null, null, 1770, 1090, 357, null ],
+    [ "Tashigi, Beach Captain", "STR", [ "Slasher", "Cerebral" ], 4, 12, 6, 2, 50, 392109, 72, 72, 72, 870, 469, 201, null ],
+    [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, 4000000, 813, 400, 151, 1770, 1090, 357, null ],
     [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, null ],
     [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 57ae5920062dfddc55b12a41794de271e28ddc34 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 21 Aug 2017 00:22:10 -0400
Subject: [PATCH 1302/1569] Caesar

---
 common/data/evolutions.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 41190055b..a0c321304 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2528,8 +2528,8 @@ window.evolutions = {
         evolvers: [ 118, 87, 266, 98, 303 ]
     },
     1636: {
-        evolution: 1637,
-        evolvers: [ 118, 96, 97, 301, 302 ]
+        evolution: [ 1637, 1716 ],
+        evolvers: [ [ 118, 96, 97, 301, 302 ], [ ] ]
     },
     1646: {
         evolution: 1647,
@@ -2659,10 +2659,6 @@ window.evolutions = {
         evolution: 1713,
         evolvers: [  ]
     },
-    1636: {
-        evolution: 1716,
-        evolvers: [  ]
-    },
     1720: {
         evolution: 1721,
         evolvers: [  ]

From 443230884513a7e207856e8a8930ed3801d28b75 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 23 Aug 2017 20:46:20 -0400
Subject: [PATCH 1303/1569] Jinbe Bug

---
 common/data/specials.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index f4466db8e..598900f12 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3347,14 +3347,14 @@ window.specials = {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         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') ? 2.75 : 1;
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1721: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         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') ? 2.75 : 1;
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1722: {

From 8c170b426a1c7e231fd0abafa6230d288a47cec9 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 24 Aug 2017 18:06:00 -0400
Subject: [PATCH 1304/1569] New Units

Sue Me
---
 common/data/aliases.js    | 52 +++++++++++++++++------------------
 common/data/captains.js   | 19 +++++++++++++
 common/data/cooldowns.js  | 24 ++++++++--------
 common/data/details.js    | 22 +++++++++++----
 common/data/drops.js      |  9 ++++++
 common/data/evolutions.js |  4 +++
 common/data/families.js   |  4 +--
 common/data/gw.js         | 22 +++++++--------
 common/data/specials.js   |  6 ++++
 common/data/units.js      | 58 +++++++++++++++++++--------------------
 common/data/zombies.js    |  4 +++
 11 files changed, 138 insertions(+), 86 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ead897f14..9f69905a8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1710,34 +1710,34 @@ window.aliases = {
     1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
     1711: ['ニコ・ロビン 文化の象徴', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
-    1712: ['', '', ''],
-    1713: ['', '', ''],
-    1714: ['', '', ''],
-    1715: ['', '', ''],
-    1716: ['', '', ''],
-    1717: ['', '', ''],
-    1718: ['', '', ''],
-    1719: ['', '', ''],
-    1720: ['', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
-    1721: ['', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
-    1722: ['', '', ''],
-    1723: ['', '', ''],
-    1724: ['', '', ''],
-    1725: ['', '', ''],
-    1726: ['', '', 'Kai Sabo'],
-    1727: ['', '', 'Kai Sabo'],
-    1728: ['', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
-    1729: ['', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
-    1730: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
-    1731: ['', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
+    1712: ['赤犬 頂上戦争の火蓋', '', 'Secret Akainu'],
+    1713: ['赤犬 頂上戦争の業火', '', 'Secret Akainu'],
+    1714: ['モネ 氷雪の化身', '', ''],
+    1715: ['ヴェルゴ 海軍「Ｇ‐５」基地長', '', ''],
+    1716: ['シーザー・クラウン 死の国の王', '', ''],
+    1717: ['ベガパンクの竜（小型）', '', ''],
+    1718: ['バッファロー ドンキホーテ海賊団　戦闘員', '', ''],
+    1719: ['ベビー５ ドンキホーテ海賊団　使用人兼殺し屋', '', ''],
+    1720: ['ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
+    1721: ['“親分”ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
+    1722: ['海神ネプチューン', '', ''],
+    1723: ['海神ネプチューン リュウグウ王国国王', '', ''],
+    1724: ['フカボシ ネプチューン家三兄弟　長男', '', ''],
+    1725: ['フカボシ 王国軍三強', '', ''],
+    1726: ['サボ「改」 竜の爪', '', 'Kai Sabo'],
+    1727: ['サボ「改」 革命軍参謀総長', '', 'Kai Sabo'],
+    1728: ['たしぎ ビーチの大佐', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
+    1729: ['たしぎ バカンスの大佐ちゃん', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
+    1730: ['ネフェルタリ・ビビ 眩しい純白', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
+    1731: ['ネフェルタリ・ビビ 魅惑の透明感', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
     1732: ['', '', ''],
     1733: ['', '', ''],
-    1734: ['', '', ''],
-    1735: ['', '', ''],
-    1736: ['', '', ''],
-    1737: ['', '', ''],
-    1738: ['', '', ''],
-    1739: ['', '', ''],
+    1734: ['シュガー ホビホビの実の能力者', '', ''],
+    1735: ['シュガー トレーボル軍　特別幹部', '', ''],
+    1736: ['トレーボル ベタベタの実の能力者', '', ''],
+    1737: ['トレーボル ドンキホーテファミリー最高幹部', '', ''],
+    1738: ['', '', 'Neo Bellamy'],
+    1739: ['', '', 'Neo Bellamy'],
     1740: ['', '', ''],
     1741: ['', '', ''],
     1742: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 782a6b117..53585bfa1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5228,6 +5228,25 @@ window.captains = {
     1731: {
         atk: function(p) { return 2; },
     },
+    1734: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+    },
+    1735: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
+    },
+    1736: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+    },
+    1737: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+    },
+    1738: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1739: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+    },
     1746: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
         hitAtk: function(p) {
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a2b041a7e..ac16adf38 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1734,8 +1734,8 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
-    null,
+    [ 22, 14 ],
+    [ 22, 14 ],
     null,
     null,
     null,
@@ -1750,14 +1750,14 @@ window.cooldowns = [
     null,
     [ 20, 15 ],
     [ 20, 15 ],
-    18,
-    18,
-    16,
-    16,
-    14,
-    14,
-    11,
-    11,
-    13,
-    13,
+    [ 18, 14 ],
+    [ 18, 14 ],
+    [ 16, 12 ],
+    [ 16, 12 ],
+    [ 14, 10 ],
+    [ 14, 10 ],
+    [ 11, 7 ],
+    [ 11, 7 ],
+    [ 13, 9 ],
+    [ 13, 9 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index fd54505f6..0538abbad 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9743,24 +9743,34 @@ window.details = {
         specialName: "Shining Brightly Upon the Oasis",
     },
     1734: {//Sugar
-        captain: "Boosts ATK of Cerebral and Fighter characters by ???x and recovers ?x character's RCV in HP at the end of each turn",
+        captain: "Boosts ATK of Cerebral and Fighter characters by 1.5x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
-        specialName: "Sugar Special",
+        specialName: "Toy's Close Combat",
     },
     1735: {//Sugar
         captain: "Boosts ATK of Cerebral and Fighter characters by 1.75x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
-        specialName: "Sugar Special",
+        specialName: "Toy's Close Combat",
     },
     1736: {//Trebol
-        captain: "Boosts ATK of INT characters by ???x and their HP by ???x. Reduces damage received by ???%",
+        captain: "Boosts ATK of INT characters by 2.25x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Trebol Special",
+        specialName: "Sticky Sticky Burning Explosion",
     },
     1737: {//Trebol
         captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.2x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Trebol Special",
+        specialName: "Sticky Sticky Burning Explosion",
+    },
+    1738: {//Raid Bellamy
+        captain: "Boosts ATK of Driven characters by 2x",
+        special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "Spring Hopper - Bullet [Neo]",
+    },
+    1739: {//Raid Bellamy
+        captain: "Boosts ATK of Driven characters by 2.5x",
+        special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialName: "Spring Hopper - Bullet [Neo]",
     },
     1746: {//Korea Boa
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
diff --git a/common/data/drops.js b/common/data/drops.js
index fc21d516f..3a0c7ffdd 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1942,6 +1942,15 @@ window.drops = {
             Expert: [ 1517 ],
         },
         
+        {
+            name: 'Clash!! Bellamy',
+            thumb: 1738,
+            gamewith: 66087,
+            condition: '1 Expert version and 3 Master versions with different conditions. Expert: Driven/Free Spirit/Striker Only. Can only complete 10 times each. Master: Driven Only, Free Spirit Only, and Striker Only',
+            Master: [ 1738 ],
+            Expert: [ 1738 ],
+        },
+        
         {
             name: 'Clash!! Fujitora',
             thumb: 1595,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a0c321304..f632818fa 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2691,6 +2691,10 @@ window.evolutions = {
         evolution: 1737,
         evolvers: [  ]
     },
+    1738: {
+        evolution: 1739,
+        evolvers: [  ]
+    },
     1747: {
         evolution: 1748,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index 3f024540c..ed5b8486e 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1736,8 +1736,8 @@ window.families = [
     "Sugar",
     "Trebol",
     "Trebol",
-    null,
-    null,
+    "Bellamy",
+    "Bellamy",
     null,
     null,
     null,
diff --git a/common/data/gw.js b/common/data/gw.js
index a94e6fee3..45d3d6987 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1712,12 +1712,12 @@ window.gw=[
     63272,
     65777,
     65777,
-    null,
-    null,
+    65970,
+    65969,
     60339,
-    null,
-    null,
-    null,
+    65966,
+    65968,
+    65967,
     63375,
     63375,
     64091,
@@ -1732,12 +1732,12 @@ window.gw=[
     64838,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    66024,
+    66024,
+    66025,
+    66025,
+    66094,
+    66094,
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index 598900f12..09fb61b86 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3399,6 +3399,12 @@ window.specials = {
     1737: {
         delay: function(p) { return 1; },
     },
+    1738: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
+    1739: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
     1746: {
         delay: function(p) { return 1; },
         turnedOn: false,
diff --git a/common/data/units.js b/common/data/units.js
index da6014785..fc73b34ea 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1710,34 +1710,34 @@ window.units = [
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, 3000000, 832, 334, 142, 1903, 940, 386, 1 ],
     [ "Nico Robin, Healthful Beauty", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
     [ "Nico Robin, Cultural Symbol", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
-    [ "Akainu, Summit War Coverfire", "DEX", [ "Powerhouse", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Akainu, Summit War Hellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2506, 1505, 251, null ],
-    [ "Monet", "INT", [ "Free Spirit", "Cerebral" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vergo", "QCK", [ "Striker", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Caesar Clown, Shinokuni Ruler", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, null, 1097, 717, 130, 2194, 1435, 260, null ],
-    [ "Vegapunk's Dragon", "QCK", [ "Shooter", "Driven" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Buffalo", "DEX", [ "Free Spirit", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Baby 5", "PSY", [ "Shooter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Akainu, Summit War Coverfire", "DEX", [ "Powerhouse", "Driven" ], 4, 20, 5, 3, 70, 1066998, 138, 150, 23, 1255, 760, 143, 1 ],
+    [ "Akainu, Summit War Hellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1187, 724, 99, 2506, 1505, 251, 1 ],
+    [ "Monet, Incarnation of Ice and Snow", "INT", [ "Free Spirit", "Cerebral" ], 4, 20, 4, 2, 70, 1066998, 131, 103, 67, 1830, 719, 220, 1 ],
+    [ "Vergo, G-5 Navy Unit Leader", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 275, 203, 75, 1650, 1219, 300, 1 ],
+    [ "Caesar Clown, Shinokuni Ruler", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1097, 717, 130, 2194, 1435, 260, 1 ],
+    [ "Vegapunk's Dragon (Small)", "QCK", [ "Shooter", "Driven" ], 3, 15, 4, 2, 70, 1066998, 238, 125, 45, 1429, 750, 152, 1 ],
+    [ "Buffalo, Donquixote Pirates Fighter", "DEX", [ "Free Spirit", "Driven" ], 4, 20, 8, 2, 70, 1066998, 191, 81, 55, 1731, 755, 220, 1 ],
+    [ "Baby 5, Donquixote Pirates Servant and Killer", "PSY", [ "Shooter", "Slasher" ], 4, 20, 8, 2, 70, 1066998, 154, 111, 47, 1239, 1161, 171, 1 ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 70, 1066998, 158, 113, 39, 1284, 698, 178, 1 ],
     [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
     [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 159, 56, 51, 611, 498, 189, 1 ],
     [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 598, 445, 175, 1737, 1011, 324, 1 ],
     [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, 6, 2, 50, 392019, 166, 52, 44, 655, 588, 164, 1 ],
     [ "Fukaboshi, Top Three of the Royal Army", "QCK", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 617, 512, 155, 2015, 1201, 238, 1 ],
-    [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, 238, 135, 37, 1305, 676, 190, null ],
-    [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1235, 595, 147, 2494, 1305, 345, null ],
-    [ "Tashigi, Beach Captain", "STR", [ "Slasher", "Cerebral" ], 4, 12, 6, 2, 50, 392109, 72, 72, 72, 870, 469, 201, null ],
-    [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, 4000000, 813, 400, 151, 1770, 1090, 357, null ],
-    [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, null ],
-    [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugar, Hobby-Hobby Human", "STR", [ "Cerebral", "Fighter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sugar, Trebol Army", "STR", [ "Cerebral", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Trebol, Stick-Stick Man", "INT", [ "Cerebral", "Driven" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Trebol, Donquiote Family Executive", "INT", [ "Cerebral", "Driven" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sabo [Neo], Dragon Claw", "PSY", [ "Fighter", "Free Spirit" ], 4, 30, 5, 3, 70, 1066998, 238, 135, 37, 1305, 676, 190, 1 ],
+    [ "Sabo [Neo], Revolutionary Army Chief of Staff", "PSY", [ "Fighter", "Free Spirit" ], 5, 50, 4, 4, 99, 5000000, 1235, 595, 147, 2494, 1305, 345, 1 ],
+    [ "Tashigi, Beach Captain", "STR", [ "Slasher", "Cerebral" ], 4, 12, 6, 2, 50, 392109, 72, 72, 72, 870, 469, 201, 1 ],
+    [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, 4000000, 813, 400, 151, 1770, 1090, 357, 1 ],
+    [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, 1 ],
+    [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sugar, Hobby Hobby Fruit Ability User", "STR", [ "Cerebral", "Fighter" ], 3, 13, 4, 2, 50, 392109, 150, 102, 30, 646, 367, 220, 1 ],
+    [ "Sugar, Trebol Army Special Executive", "STR", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 597, 311, 203, 1830, 975, 320, 1 ],
+    [ "Trebol, Sticky Sticky Fruit Ability User", "INT", [ "Cerebral", "Driven" ], 3, 13, 5, 2, 50, 392109, 230, 156, 9, 1020, 519, 107, 1 ],
+    [ "Trebol, Donquiote Family Elite Executive", "INT", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 99, 3000000, 975, 476, 97, 2540, 1220, 120, 1 ],
+    [ "Bellamy the Hyena [Neo], Former Captain of the Bellamy Pirates", "STR", [ "Fighter", "Driven" ], 4, 30, 4, 2, 70, 1066998, 173, 125, 31, null, null, null, null ],
+    [ "Bellamy the Hyena [Neo], Bullet of Dressrosa", "STR", [ "Fighter", "Driven" ], 5, 50, 4, 3, 99, 5000000, 893, 634, 149, 2014, 1320, 308, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1750,16 +1750,16 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
     [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
-    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2503, 1400, 269, null ],
-    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2417, 1353, 305, null ],
-    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, 6, 5, 99, 4000000, null, null, null, 2076, 1179, 417, null ],
+    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1240, 710, 159, null ],
+    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, 1043, 554, 94, 2503, 1400, 269, null ],
+    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 650, 394, 41, 1230, 698, 200, null ],
+    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1032, 574, 137, 2417, 1353, 305, null ],
+    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, 4, 3, 50, 392109, null, null, null, 1001, 554, 287, null ],
+    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, 6, 5, 99, 4000000, 820, 420, 220, 2076, 1179, 417, null ],
     [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2274, 1336, 333, null ],
-    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, null, null, null, 2330, 1258, 351, null ],
+    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, 1076, 569, 148, 2274, 1336, 333, null ],
+    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1184, 589, 240, null ],
+    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index a66bd7096..470911a00 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -443,6 +443,10 @@ window.zombies = {
         type: 'healer',
         multiplier: 3
     },
+    1734: { // Sugar
+        type: 'healer',
+        multiplier: 3
+    },
     1735: { // Sugar
         type: 'healer',
         multiplier: 3

From 63cffe63f356f16069f8128b2dc87dc0d77aef79 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 24 Aug 2017 20:57:06 -0400
Subject: [PATCH 1305/1569] Barto

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index fc73b34ea..ecf23886b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1306,7 +1306,7 @@ window.units = [
     [ "Little Succubus Sugar", "DEX", [ "Cerebral", "Slasher" ], 4, 12, 6, 1, 50, 392109, 70, 32, 50, 912, 409, 250, 1 ],
     [ "Little Succubus Sugar, Halloween Night - Masquerade", "DEX", [ "Cerebral", "Slasher" ], 5, 20, 4, 3, 99, 3000000, 844, 358, 209, 1768, 843, 407, 1 ],
     [ "Bartolomeo, Full Moon Wolf", "QCK", [ "Driven", "Fighter" ], 4, 13, 5, 2, 50, 392109, 106, 99, 33, 1171, 557, 158, 1 ],
-    [ "Bartolomeo, Full Moon Wolf Halloween Night - Masquerade", "QCK", [ "Driven", "Fighter" ], 5, 20, 4, 4, 99, 3000000, 1109, 472, 109, 2149, 1242, 247, 1 ],
+    [ "Bartolomeo, Full Moon Wolf Halloween Night - Masquerade", "QCK", [ "Driven", "Striker" ], 5, 20, 4, 4, 99, 3000000, 1109, 472, 109, 2149, 1242, 247, 1 ],
     [ "Kinemon", "STR", [ "Slasher", "Free Spirit" ], 4, 25, 6, 4, 70, 1066998, 609, 399, 62, 1142, 779, 177, 1 ],
     [ "Foxfire Kinemon", "STR", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1095, 708, 131, 2075, 1433, 321, 1 ],
     [ "Boa Marigold, Kuja Warrior", "INT", [ "Slasher", "Powerhouse" ], 3, 16, 5, 2, 50, 392109, 245, 116, 24, 1209, 462, 99, 1 ],

From 45e6386d8e5dcb0edab3a97e357bdc731994d054 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:00:08 -0400
Subject: [PATCH 1306/1569] Translations

---
 common/data/details.js | 14 +++++++-------
 common/data/units.js   |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 0538abbad..a67db85c0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9503,12 +9503,12 @@ window.details = {
     1695: {//Vergo
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
-        specialName: "Vergo Special",
+        specialName: "The Darkest Demon",
     },
     1696: {//Vergo
         captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
-        specialName: "Vergo Special",
+        specialName: "The Darkest Demon",
     },
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
@@ -9644,12 +9644,12 @@ window.details = {
     1714: {//Monet
         captain: "Boosts ATK of INT characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
         special: "Deals 10x character's ATK in [INT] damage to all enemies. Randomly changes all orbs into either [TND], [BOMB] or [RCV] orbs.",
-        specialName: "Monet Special",
+        specialName: "Devouring Blizzard",
     },
     1715: {//Vergo
         captain: "Boosts ATK of Striker characters by 2.5x if they have a matching orb, by 2x otherwise",
         special: "Changes own orb into [QCK], locks all orbs for 1 turn",
-        specialName: "Vergo Special",
+        specialName: "Sealed Mouth Exterminator",
     },
     1716: {//Caesar
         captain: "Reduces HP of all characters by 50%, boosts ATK of Driven characters by 1.2x, increases his own ATK multiplier by 0.1x at the end of each turn until it reaches 3x",
@@ -9659,18 +9659,18 @@ window.details = {
     1717: {//Vegapunk Dragon
         captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight",
         special: "Deals 3x character's ATK in [QCK] damage to all enemies",
-        specialName: "Vegapunk Dragon Special",
+        specialName: "High Maneuverable Fireball Blast",
     },
     1718: {//Buffalo
         captain: "Boosts ATK of Driven characters by 2.5x until the first hit other than Perfect",
         special: "Boosts ATK of Driven characters by 1.25x for 5 turns",
-        specialName: "Buffalo Special",
+        specialName: "Rolling Rotation",
     },
     1719: {//Baby 5
         captain: "Boosts ATK of [PSY] characters by 2x if they have matching orbs, makes INT orbs \"beneficial\" to PSY characters",
         captainNotes: "#{beneficial}",
         special: "Changes adjacent orbs into [G] orbs",
-        specialName: "Baby 5 Special",
+        specialName: "Phantasmagoric \"Weapon-Morphosis\"",
     },
     1720: {//Secret Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
diff --git a/common/data/units.js b/common/data/units.js
index ecf23886b..eaed1d290 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1712,12 +1712,12 @@ window.units = [
     [ "Nico Robin, Cultural Symbol", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
     [ "Akainu, Summit War Coverfire", "DEX", [ "Powerhouse", "Driven" ], 4, 20, 5, 3, 70, 1066998, 138, 150, 23, 1255, 760, 143, 1 ],
     [ "Akainu, Summit War Hellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1187, 724, 99, 2506, 1505, 251, 1 ],
-    [ "Monet, Incarnation of Ice and Snow", "INT", [ "Free Spirit", "Cerebral" ], 4, 20, 4, 2, 70, 1066998, 131, 103, 67, 1830, 719, 220, 1 ],
-    [ "Vergo, G-5 Navy Unit Leader", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 275, 203, 75, 1650, 1219, 300, 1 ],
+    [ "Monet, Piercing Ice and Snow", "INT", [ "Free Spirit", "Cerebral" ], 4, 20, 4, 2, 70, 1066998, 131, 103, 67, 1830, 719, 220, 1 ],
+    [ "Vergo, G-5 Navy Base Commander", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 275, 203, 75, 1650, 1219, 300, 1 ],
     [ "Caesar Clown, Shinokuni Ruler", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1097, 717, 130, 2194, 1435, 260, 1 ],
     [ "Vegapunk's Dragon (Small)", "QCK", [ "Shooter", "Driven" ], 3, 15, 4, 2, 70, 1066998, 238, 125, 45, 1429, 750, 152, 1 ],
-    [ "Buffalo, Donquixote Pirates Fighter", "DEX", [ "Free Spirit", "Driven" ], 4, 20, 8, 2, 70, 1066998, 191, 81, 55, 1731, 755, 220, 1 ],
-    [ "Baby 5, Donquixote Pirates Servant and Killer", "PSY", [ "Shooter", "Slasher" ], 4, 20, 8, 2, 70, 1066998, 154, 111, 47, 1239, 1161, 171, 1 ],
+    [ "Buffalo, Donquixote Pirates' Combatant", "DEX", [ "Free Spirit", "Driven" ], 4, 20, 8, 2, 70, 1066998, 191, 81, 55, 1731, 755, 220, 1 ],
+    [ "Baby 5, Donquixote Pirates' Servant and Assassin", "PSY", [ "Shooter", "Slasher" ], 4, 20, 8, 2, 70, 1066998, 154, 111, 47, 1239, 1161, 171, 1 ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 70, 1066998, 158, 113, 39, 1284, 698, 178, 1 ],
     [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
     [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 159, 56, 51, 611, 498, 189, 1 ],

From 44a4ecf7b6e21892755c1198acef44bd7691f51e Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 24 Aug 2017 21:06:11 -0400
Subject: [PATCH 1307/1569] Monet revert

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index eaed1d290..5f3e7edf3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1712,7 +1712,7 @@ window.units = [
     [ "Nico Robin, Cultural Symbol", "PSY", [ "Fighter", "Cerebral" ], 5, 20, 4, 3, 99, 3000000, 851, 366, 133, 1949, 1007, 355, 1 ],
     [ "Akainu, Summit War Coverfire", "DEX", [ "Powerhouse", "Driven" ], 4, 20, 5, 3, 70, 1066998, 138, 150, 23, 1255, 760, 143, 1 ],
     [ "Akainu, Summit War Hellfire", "DEX", [ "Powerhouse", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1187, 724, 99, 2506, 1505, 251, 1 ],
-    [ "Monet, Piercing Ice and Snow", "INT", [ "Free Spirit", "Cerebral" ], 4, 20, 4, 2, 70, 1066998, 131, 103, 67, 1830, 719, 220, 1 ],
+    [ "Monet, Incarnation of Ice and Snow", "INT", [ "Free Spirit", "Cerebral" ], 4, 20, 4, 2, 70, 1066998, 131, 103, 67, 1830, 719, 220, 1 ],
     [ "Vergo, G-5 Navy Base Commander", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 99, 3000000, 275, 203, 75, 1650, 1219, 300, 1 ],
     [ "Caesar Clown, Shinokuni Ruler", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1097, 717, 130, 2194, 1435, 260, 1 ],
     [ "Vegapunk's Dragon (Small)", "QCK", [ "Shooter", "Driven" ], 3, 15, 4, 2, 70, 1066998, 238, 125, 45, 1429, 750, 152, 1 ],

From bcd8a7ac377ef22df36fa30ba2dbeb0614440ece Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 24 Aug 2017 23:37:51 -0400
Subject: [PATCH 1308/1569] cooldowns

---
 common/data/cooldowns.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ac16adf38..a845f0883 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1732,12 +1732,12 @@ window.cooldowns = [
     [ 16, 16 ],
     null,
     null,
-    null,
-    null,
+    [ 13, 6 ],
+    [ 13, 6 ],
     [ 22, 14 ],
     [ 22, 14 ],
-    null,
-    null,
+    [ 22, 13 ],
+    [ 22, 13 ],
     null,
     null,
     null,

From 542e37772168d6732902e22894961667eb727835 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 25 Aug 2017 19:02:31 -0400
Subject: [PATCH 1309/1569] New units

I made the 29 mil team first
---
 common/data/aliases.js    | 19 +++++----
 common/data/captains.js   | 46 +++++++++++++++++++-
 common/data/cooldowns.js  | 23 +++++-----
 common/data/details.js    | 89 +++++++++++++++++++++++++++++++++++----
 common/data/drops.js      | 42 +++++++++---------
 common/data/evolutions.js | 40 +++++++++++++-----
 common/data/families.js   | 23 +++++-----
 common/data/flags.js      | 12 +++++-
 common/data/specials.js   | 51 +++++++++++++++++++---
 common/data/units.js      | 25 ++++++-----
 common/data/zombies.js    |  4 +-
 damage/js/cruncher.js     |  6 +--
 damage/js/utils.js        |  2 +-
 13 files changed, 289 insertions(+), 93 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9f69905a8..ab796aca5 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1691,8 +1691,8 @@ window.aliases = {
     1690: ['キャプテン・キッド “南の海”出身の超新星', '', ''],
     1691: ['ヒート', '', ''],
     1692: ['ワイヤー', '', ''],
-    1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi'],
-    1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi'],
+    1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
+    1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
     1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo'],
     1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo'],
     1697: ['マゼラン 監獄の支配者', '', ''],
@@ -1730,8 +1730,8 @@ window.aliases = {
     1729: ['たしぎ バカンスの大佐ちゃん', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
     1730: ['ネフェルタリ・ビビ 眩しい純白', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
     1731: ['ネフェルタリ・ビビ 魅惑の透明感', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
-    1732: ['', '', ''],
-    1733: ['', '', ''],
+    1732: ['', '', 'Nekopara', 'Coliseum Nekomamushi'],
+    1733: ['', '', 'Nekopara', 'Coliseum Nekomamushi'],
     1734: ['シュガー ホビホビの実の能力者', '', ''],
     1735: ['シュガー トレーボル軍　特別幹部', '', ''],
     1736: ['トレーボル ベタベタの実の能力者', '', ''],
@@ -1744,10 +1744,10 @@ window.aliases = {
     1743: ['', '', ''],
     1744: ['', '', ''],
     1745: ['', '', ''],
-    1746: ['', '', 'Korea Boa'],
-    1747: ['', '', 'Korea Boa'],
-    1748: ['', '', ''],
-    1749: ['', '', ''],
+    1746: ['', '', ''],
+    1747: ['', '', ''],
+    1748: ['', '', 'Korea Boa'],
+    1749: ['', '', 'Korea Boa'],
     1750: ['', '', 'Korea Law'],
     1751: ['', '', 'Korea Law'],
     1752: ['', '', '20th Anniversary Zoro'],
@@ -1760,6 +1760,9 @@ window.aliases = {
     1759: ['', '', '20th Anniversary Brook'],
     1760: ['', '', '20th Anniversary Chopper'],
     1761: ['', '', '20th Anniversary Chopper'],
+    1762: ['', '', ''],
+    1763: ['', '', ''],
+    1764: ['', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 53585bfa1..f9ac33676 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5228,6 +5228,14 @@ window.captains = {
     1731: {
         atk: function(p) { return 2; },
     },
+    1732: {
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.1 : 1; },
+    },
+    1733: {
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+    },
     1734: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
     },
@@ -5247,7 +5255,37 @@ window.captains = {
     1739: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
     },
+    1740: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.1 : 1; },
+    },
+    1741: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.3 : 1; },
+    },
+    1742: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.1 : 1; },
+    },
+    1743: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.3 : 1; },
+    },
+    1744: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+    },
+    1745: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+    },
     1746: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    1747: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
+    1748: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
@@ -5256,7 +5294,7 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    1747: {
+    1749: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
@@ -5304,4 +5342,10 @@ window.captains = {
     1761: {
         atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
     },
+    1764: {
+        atk: function(p) {
+            return Math.min(3.5, 2.25 + 0.25 * p.turnCounter);
+        },
+        hp: function(p) { return 1.25; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a845f0883..033b41582 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1730,24 +1730,24 @@ window.cooldowns = [
     [ 8, 8 ],
     [ 16, 16 ],
     [ 16, 16 ],
-    null,
-    null,
+    21,
+    21,
     [ 13, 6 ],
     [ 13, 6 ],
     [ 22, 14 ],
     [ 22, 14 ],
     [ 22, 13 ],
     [ 22, 13 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    19,
+    19,
+    19,
+    19,
+    19,
+    19,
+    18,
+    18,
     20,
     20,
-    null,
-    null,
     [ 20, 15 ],
     [ 20, 15 ],
     [ 18, 14 ],
@@ -1760,4 +1760,7 @@ window.cooldowns = [
     [ 11, 7 ],
     [ 13, 9 ],
     [ 13, 9 ],
+    null,
+    null,
+    [ 19, 13 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index a67db85c0..53967480e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6004,12 +6004,14 @@ window.details = {
         sailor: "Boosts ATK of [QCK] characters by 40"
     },
     1191: {
-        captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
+        captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
         specialName: "Ice Age",
     },
     1192: {
-        captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
+        captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
         specialName: "Ice Age",
     },
@@ -6163,7 +6165,8 @@ window.details = {
         specialName: "Everybody Confusing Fragrance",
     },
     1219: {//Byrnndi World Coliseum
-        captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x.",
+        captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
@@ -6182,7 +6185,8 @@ window.details = {
         specialName: "More More, 10 Times \"Iron Hammer\"",
     },
     1220: {//Byrnndi World Coliseum
-        captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x If you did not defeat an enemy, lose all ATK boost stacks.",
+        captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x.",
+        captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
@@ -8870,11 +8874,13 @@ window.details = {
     1594: {//Fujitora
         captain: "Cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
+        specialNotes: "#{ignoreBarrier}",
         specialName: "Gravity Blade: Fierce Tiger",
     },
     1595: {//Fujitora
         captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.2x, cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
+        specialNotes: "#{ignoreBarrier}",
         specialName: "Gravity Blade: Fierce Tiger",
     },
     1596: {//Shirahoshi
@@ -9742,6 +9748,18 @@ window.details = {
         sailorNotes: "#{rewind : 3}",
         specialName: "Shining Brightly Upon the Oasis",
     },
+    1732: {//Nekomamushi
+        captain: "Boosts ATK of [STR] characters by 2x, boosts HP of Striker and Powerhouse characters by 1.1x",
+        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn. If enemies have debuff protection at the time the special was activated, changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        specialNotes: "#{ignoreBarrier}",
+        specialName: "Nekomamushi Special",
+    },
+    1733: {//Nekomamushi
+        captain: "Boosts ATK of [STR] characters by 2.5x, boosts HP of Striker and Powerhouse characters by 1.25x",
+        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn. If enemies have debuff protection at the time the special was activated, changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        specialNotes: "#{ignoreBarrier}",
+        specialName: "Nekomamushi Special",
+    },
     1734: {//Sugar
         captain: "Boosts ATK of Cerebral and Fighter characters by 1.5x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
@@ -9753,12 +9771,12 @@ window.details = {
         specialName: "Toy's Close Combat",
     },
     1736: {//Trebol
-        captain: "Boosts ATK of INT characters by 2.25x. Reduces damage received by 10%",
+        captain: "Boosts ATK of [INT] characters by 2.25x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
         specialName: "Sticky Sticky Burning Explosion",
     },
     1737: {//Trebol
-        captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.2x. Reduces damage received by 10%",
+        captain: "Boosts ATK of [INT] characters by 2.25x and their HP by 1.2x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
         specialName: "Sticky Sticky Burning Explosion",
     },
@@ -9772,12 +9790,60 @@ window.details = {
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
         specialName: "Spring Hopper - Bullet [Neo]",
     },
-    1746: {//Korea Boa
+    1740: {//Sandersonia
+        captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [DEX] characters by 1.1x",
+        special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by ???% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
+        sailor: "Makes [STR] orbs \"beneficial\" for this unit",
+        specialName: "Snake Hair Possession: Eight-Headed Serpent",
+    },
+    1741: {//Sandersonia
+        captain: "Boosts ATK of Striker and Powerhouse characters by 2.5x and boosts HP of [DEX] characters by 1.3x",
+        special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by ???% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
+        sailor: "Makes [STR] orbs \"beneficial\" for this unit",
+        specialName: "Snake Hair Possession: Eight-Headed Serpent",
+    },
+    1742: {//Marigold
+        captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [STR] characters by 1.1x",
+        special: "Changes [QCK] and [DEX] orbs into Matching orbs, boosts ATK against enemies with reduced defense by 1.75x for 2 turns and reduces damage received by 60% for 1 turn",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Snake Hair Possession: Salamander",
+    },
+    1743: {//Marigold
+        captain: "Boosts ATK of Striker and Powerhouse characters by 2.5x and boosts HP of [STR] characters by 1.3x",
+        special: "Changes [QCK] and [DEX] orbs into Matching orbs, boosts ATK against enemies with reduced defense by 1.75x for 2 turns and reduces damage received by 60% for 1 turn",
+        sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
+        specialName: "Snake Hair Possession: Salamander",
+    },
+    1744: {//Marguerite
+        captain: "Boosts ATK of Shooter characters by 2x",
+        special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
+        sailor: "Boosts ATK, HP and RCV of Shooter characters by 30",
+        specialName: "Defender's Spade-Shaped Arrow",
+    },
+    1745: {//Marguerite
+        captain: "Boosts ATK of Shooter characters by 2x and recovers 2x character's RCV in HP at the end of each turn",
+        special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
+        sailor: "Boosts ATK, HP and RCV of Shooter characters by 30",
+        specialName: "Defender's Spade-Shaped Arrow",
+    },
+    1746: {//Bepo
+        captain: "Boosts ATK and HP of QCK characters by 1.5x",
+        special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
+        sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
+        specialName: "Bear Rush Out",
+    },
+    1747: {//Bepo
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK and HP of QCK characters by 2x",
+        special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
+        sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
+        specialName: "Bear Rush Out",
+    },
+    1748: {//Boa
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },
-    1747: {//Korea Boa
+    1749: {//Boa
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
@@ -9874,4 +9940,11 @@ window.details = {
         sailorNotes: "#{silence}<br>#{rewind : 2}",
         specialName: "Intelligent Monster",
     },
+    1764: {
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 5 times to a maximum of 3.5x.",
+        captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
+        special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn, locks the chain multiplier at 2.5x for 1 turn and deals 100000 fixed damage to all enemies that will ignore damage negating abilities and barriers.",
+        specialNotes: "#{ignoreBarrier}",
+        specialName: "Determined Man's Ice Attack",
+    },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index 3a0c7ffdd..fb39b5d6a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1124,7 +1124,7 @@ window.drops = {
             condition: 'No Units above the cost of 49 is allowed',
             challenge: 'Total number of hits over 50,000',
             challengeData: [['4 Times','1x Blue Elder'],['8 Times','1x Rainbow Gem, 1x HP Cotton Candy'],['22 Times','2x Rainbow Gems, 1x Orb Matching Forbidden Tome']],
-            'All Difficulties': [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -359, -64 ]
+            'All Difficulties': [ 634, 636, 637, -636, -464, -451, -396, -370, -367, -1619, -359, -64 ]
         },
 
         {
@@ -1174,8 +1174,8 @@ window.drops = {
             global: true,
             gamewith: 5451,
             condition: 'You can only bring INT, PSY and QCK units',
-            'Japan': [ 721, 723, -590, -564, -563, -530, -526, -384, -361, -219, -1173 ],
-            'Global': [ 721, 723, -590, -564, -563, -530, -641, -384, -361, -219 ]
+            'Japan': [ 721, 723, -590, -564, -563, -530, -1707, -526, -384, -361, -219, -1173 ],
+            'Global': [ 721, 723, -590, -564, -563, -530, -1707, -641, -384, -361, -219 ]
         },
 
         {
@@ -1204,8 +1204,8 @@ window.drops = {
             global: true,
             gamewith: 25101,
             condition: 'None',
-            'Japan': [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -223, -1175 ],
-            'Global': [ 762, 766, 767, 768, 769, -431, -367, -291, -253, -251, -223, -212, -75 ]
+            'Japan': [ 762, 766, 767, 768, 769, -629, -611, -569, -554, -431, -410, -367, -1619, -223, -1175 ],
+            'Global': [ 762, 766, 767, 768, 769, -431, -367, -1619, -291, -253, -251, -223, -212, -75 ]
         },
 
         {
@@ -1327,7 +1327,7 @@ window.drops = {
             thumb: 1003,
             global: true,
             gamewith: 26908,
-            'All Difficulties': [ 1002, 1004, 1005, -748, -844, -558, -846, -737, -1006, -785, -564, -1208 ]
+            'All Difficulties': [ 1002, 1004, 1005, -748, -1663, -844, -558, -846, -737, -1006, -785, -564, -1208 ]
         },
         
         {
@@ -1336,8 +1336,8 @@ window.drops = {
             condition: 'None',
             global: true,
             gamewith: 27631,
-            'Global': [ 1010, 1012, 1013, 1014, -1014, -530, -840, -671, -880, -739, -1550, -812, -565 ],
-            'Japan': [ 1010, 1012, 1013, 1014, -1014, -530, -840, -560, -880, -739, -1550, -812, -565, -1212 ]
+            'Global': [ 1010, 1012, 1013, 1014, -1014, -530, -1707, -840, -671, -880, -739, -1550, -812, -565 ],
+            'Japan': [ 1010, 1012, 1013, 1014, -1014, -530, -1707, -840, -560, -880, -739, -1550, -812, -565, -1212 ]
         },
         
         {
@@ -1491,7 +1491,7 @@ window.drops = {
             global: true,
             gamewith: 46658,
             condition: 'Limited amount of turns to complete the mission.',
-            'All Difficulties': [ 1383, 1385, -748, -1234, -1075, -1230, -1155, -1154, -846, -842, -739, -1550 ]
+            'All Difficulties': [ 1383, 1385, -748, -1663, -1234, -1075, -1230, -1155, -1154, -846, -842, -739, -1550 ]
         },
         
         {
@@ -1500,7 +1500,7 @@ window.drops = {
             global: true,
             gamewith: 47247,
             condition: 'Your captain will be switched with your middle right character when you encounter Law.',
-            'All Difficulties': [ 1396, 1398, -1192, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
+            'All Difficulties': [ 1396, 1398, -1192, -1764, -1232, -1238, -844, -838, -1159, -1389, -12, -737, -257 ]
         },
         
         {
@@ -1991,7 +1991,7 @@ window.drops = {
             global: true,
             challenge:'Total number of hits above 50,000',
             challengeData: [['6 Times','1x Forbidden Tome + 1x Red Elder'],['14 Times','1x Forbidden Tome, 1x RCV Cotton Candy, 1x Rainbow Gem'],['32 Times','1x Bind Resistance Forbidden Tome, 2x Rainbow Gems']],
-            'All Difficulties': [ -367, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8, -1388 ]
+            'All Difficulties': [ -367, -1619, -316, -314, -312, -308, -259, -257, -255, -253, -251, -221, -218, -217, -210, -75, -30, -16, -1446, -15, -8, -1388 ]
         },
 
         {
@@ -2047,7 +2047,7 @@ window.drops = {
             teamDatabase: 'coliseums',
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732 ]
         },
         
         {
@@ -2084,7 +2084,7 @@ window.drops = {
             'Characters': [ 927, 296, 299, 773, 774, 1224 ],
             'Boosters and Evolvers': [ 351, 193, 114, 266, 83, 118 ],
             'Global': [ -261, -1413, -562, -720, -8, -1388, -219, -75, -255, -314, -316, -357, -410, -408, -449, -451, -455, -641, -643, -754, -760, -840, -880, -906, -910, -999, -554, -1175, -528, -1177, -560, -1212, -1245, -218, -22, -1448, -24, -204, -384, -504, -508, -785, -789 ],
-            'Japan': [ -261, -562, -720, -748, -935, -1413 ]
+            'Japan': [ -261, -562, -720, -748, -1663, -935, -1413 ]
         },
         
         {
@@ -2094,8 +2094,8 @@ window.drops = {
             condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Almighty Book.',
             'Characters': [ 67, 69, 262, 264, 298 ],
             'Boosters and Evolvers': [ 113, 192, 350, 266, 83, 118 ],
-            'Global': [ -416, -459, -530, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1550, -1445 ],
-            'Japan': [ -416, -459, -530, -669, -1492, -578, -1121, -1445 ]
+            'Global': [ -416, -459, -530, -1707, -217, -004, -1387, -12, -221, -1389, -77, -210, -253, -259, -310, -312, -361, -363, -414, -453, -645, -647, -752, -756, -937, -939, -991, -520, -1115, -524, -1119, -558, -1208, -1245, -25, -202, -208, -206, -502, -787, -789, -739, -1550, -1445 ],
+            'Japan': [ -416, -459, -530, -1707, -669, -1492, -578, -1121, -1445 ]
         },
         
         {
@@ -2105,8 +2105,8 @@ window.drops = {
             condition: '10, 20, 30, 35 stamina difficulty. 30 and 35 Stamina has a chance of dropping the Silver Almighty Book.',
             'Characters': [ 968, 969, 970, 971, 972, 231, 775, 1223, 49, 43 ],
             'Boosters and Evolvers': [ 112, 191, 349, 266, 83, 118 ],
-            'Global': [ -367, -649, -718, -16, -1446, -20, -1447, -73, -251, -257, -308, -359, -365, -412, -457, -639, -750, -758, -912, -914, -941, -993, -522, -1117, -526, -1173, -556, -1210, -1245, -223, -15, -23, -25, -200, -225, -546, -500, -506, -569, -791, -793 ],
-            'Japan': [ -367, -649, -718, -870, -1001 ]
+            'Global': [ -367, -1619, -649, -718, -16, -1446, -20, -1447, -73, -251, -257, -308, -359, -365, -412, -457, -639, -750, -758, -912, -914, -941, -993, -522, -1117, -526, -1173, -556, -1210, -1245, -223, -15, -23, -25, -200, -225, -546, -500, -506, -569, -791, -793 ],
+            'Japan': [ -367, -1619, -649, -718, -870, -1001 ]
         },
         
         {
@@ -2149,7 +2149,7 @@ window.drops = {
             gamewith: 56742,
             showManual: true,
             condition: 'High chance of dropping 6* skillbooks. Only Evolvers and Booster characters will drop posters.',
-            'Black Clad Shanks': [ 301, 101, 96, 79, 90, 348, -530, -316, -910, -995, -1236, -1364, -465, -590, -967, -813, -888 ],
+            'Black Clad Shanks': [ 301, 101, 96, 79, 90, 348, -530, -1707, -316, -910, -995, -1236, -1364, -465, -590, -967, -813, -888 ],
             'Donquixote Doflamingo': [ 304, 104, 88, 99, 82, 93, 351, -870, -312, -645, -838, -876, -880, -1190, -396, -586, -631, -567 ],
             'Trafalgar Law': [ 300, 100, 84, 95, 78, 89, 347, -964, -1045, -219, -308, -675, -991, -1077, -504, -1159, -212, -892 ],
             'Black Clad Ace': [ 302, 102, 86, 97, 80, 91, 349, -562, -310, -359, -941, -560, -1212, -1406, -789, -966, -432, -565, -566 ],
@@ -2158,14 +2158,14 @@ window.drops = {
             'Crocodile': [ 302, 102, 86, 97, 80, 91, 349, -720, -410, -908, -1208, -558, -1234, -1366, -544, -731, -236, -814, -1224 ],
             'Log Luffy': [ 300, 100, 84, 95, 78, 89, 347, -1121, -578, -1075, -1131, -1133, -1115, -520, -1177, -528, -1387, -4, -816, -426, -542, -563 ],
             'Corazon': [ 303, 103, 87, 98, 81, 92, 350, -1001, -451, -878, -1079, -1183, -1316, -1446, -16, -223, -327, -628, -614 ],
-            'Kuzan': [ 301, 101, 96, 79, 90, 348, -1192, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
+            'Kuzan': [ 301, 101, 96, 79, 90, 348, -1192, -1764, -255, -365, -449, -1210, -556, -1370, -200, -384, -1060, -428, -703 ],
             'Issho': [ 301, 101, 96, 79, 90, 348, -1085, -965, -414, -457, -999, -1270, -218, -15, -785, -1228, -467 ],
             'Dracule Mihawk': [ 303, 103, 87, 98, 81, 92, 350, -718, -639, -846, -906, -1129, -1238, -1322, -463, -729, -791, -215 ],
             'Sabo': [ 304, 104, 88, 99, 82, 93, 351, -669, -874, -937, -1027, -1119, -524, -1318, -216, -332, -502, -737, -1062 ],
-            'Rayleigh': [ 300, 100, 84, 95, 78, 89, 347, -367, -210, -894, -997, -1389, -12, -1412, -208, -431, -544, -954, -1151 ],
+            'Rayleigh': [ 300, 100, 84, 95, 78, 89, 347, -367, -1619, -210, -894, -997, -1389, -12, -1412, -208, -431, -544, -954, -1151 ],
             'Jinbei': [ 302, 102, 86, 97, 80, 91, 349, -935, -408, -641, -671, -673, -1187, -1274, -1368, -333, -704, -956 ],
             'Sakazuki': [ 303, 103, 87, 98, 81, 92, 350, -1314, -73, -259, -412, -455, -647, -1324, -292, -329, -1283, -955 ],
-            'Rob Lucci': [ 300, 100, 84, 95, 78, 89, 347, -748, -314, -756, -912, -1238, -1447, -20, -633, -787, -731, -427, -1279 ],
+            'Rob Lucci': [ 300, 100, 84, 95, 78, 89, 347, -748, -1663, -314, -756, -912, -1238, -1447, -20, -633, -787, -731, -427, -1279 ],
             'Sengoku': [ 304, 104, 88, 99, 82, 93, 351, -459, -453, -1117, -522, -1186, -1175, -554, -1549, -709, -400, -500, -974, -1152, -1153 ],
             'Whitebeard': [ 302, 102, 86, 97, 80, 91, 349, -261, -1413, -361, -363, -752, -872, -939, -204, -1280, -564, -701, -1154 ],
             'Marco': [ 301, 101, 96, 79, 90, 348, -649, -251, -750, -842, -993, -1173, -508, -631, -378, -891, -1226 ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f632818fa..1d49586bd 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2657,46 +2657,66 @@ window.evolutions = {
     },
     1712: {
         evolution: 1713,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 97, 302, 102 ]
     },
     1720: {
         evolution: 1721,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 96, 301, 101 ]
     },
     1722: {
         evolution: 1723,
-        evolvers: [  ]
+        evolvers: [ 117, 81, 87, 98, 103 ]
     },
     1724: {
         evolution: 1725,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1726: {
         evolution: 1727,
-        evolvers: [  ]
+        evolvers: [ 118, 87, 266, 303, 103 ]
     },
     1728: {
         evolution: 1729,
-        evolvers: [  ]
+        evolvers: [ 116, 117, 78, 84, 95 ]
     },
     1730: {
         evolution: 1731,
+        evolvers: [ 115, 115, 93, 99, 304 ]
+    },
+    1732: {
+        evolution: 1733,
         evolvers: [  ]
     },
     1734: {
         evolution: 1735,
-        evolvers: [  ]
+        evolvers: [ 117, 78, 84, 95, 100 ]
     },
     1736: {
         evolution: 1737,
-        evolvers: [  ]
+        evolvers: [ 117, 82, 88, 99, 104 ]
     },
     1738: {
         evolution: 1739,
         evolvers: [  ]
     },
-    1747: {
-        evolution: 1748,
+    1740: {
+        evolution: 1741,
+        evolvers: [  ]
+    },
+    1742: {
+        evolution: 1743,
+        evolvers: [  ]
+    },
+    1744: {
+        evolution: 1745,
+        evolvers: [  ]
+    },
+    1746: {
+        evolution: 1747,
+        evolvers: [  ]
+    },
+    1748: {
+        evolution: 1749,
         evolvers: [  ]
     },
     1750: {
diff --git a/common/data/families.js b/common/data/families.js
index ed5b8486e..f4a580eec 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1730,24 +1730,24 @@ window.families = [
     "Tashigi",
     "Nefertari Vivi",
     "Nefertari Vivi",
-    null,
-    null,
+    "Nekomamushi",
+    "Nekomamushi",
     "Sugar",
     "Sugar",
     "Trebol",
     "Trebol",
     "Bellamy",
     "Bellamy",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Boa Sandersonia",
+    "Boa Sandersonia",
+    "Boa Marigold",
+    "Boa Marigold",
+    "Marguerite",
+    "Marguerite",
+    "Bepo",
+    "Bepo",
     "Boa Hancock",
     "Boa Hancock",
-    null,
-    null,
     "Trafalgar Law",
     "Trafalgar Law",
     "Roronoa Zoro",
@@ -1760,4 +1760,7 @@ window.families = [
     "Brook",
     "Tony Tony Chopper",
     "Tony Tony Chopper",
+    null,
+    null,
+    "Aokiji",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index b426197f9..bd86abba8 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1505,9 +1505,17 @@ window.flags = {
     1728: { special: 1 },
     1729: { special: 1 },
     1730: { rr: 1, rro: 1, lrr: 1 },
-    1731: { rr: 1, rro: 1, lrr: 1 },   
+    1731: { rr: 1, rro: 1, lrr: 1 },
+    1740: { rr: 1, rro: 1 },
+    1741: { rr: 1, rro: 1 },
+    1742: { rr: 1, rro: 1 },
+    1743: { rr: 1, rro: 1 },
+    1744: { rr: 1, rro: 1 },
+    1745: { rr: 1, rro: 1 },
     1746: { rr: 1, rro: 1 },
-    1747: { rr: 1, rro: 1 },  
+    1747: { rr: 1, rro: 1 },
+    1748: { rr: 1, rro: 1 },
+    1749: { rr: 1, rro: 1 },
     1750: { rr: 1, rro: 1, global: 1 },
     1751: { rr: 1, rro: 1, global: 1 },
     1752: { rr: 1, rro: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index 09fb61b86..5a98015b0 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3393,6 +3393,14 @@ window.specials = {
     1727: {
         staticMult: function(p) { return 55; }
     },
+    1732: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        type: "class"
+    },
+    1733: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        type: "class"
+    },
     1736: {
         delay: function(p) { return 1; },
     },
@@ -3405,24 +3413,48 @@ window.specials = {
     1739: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
-    1746: {
+    1740: {
+        def: function(p) { return .2; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        type: "class"
+    },
+    1741: {
+        def: function(p) { return .2; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        type: "class"
+    },
+    1742: {
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
+    },
+    1743: {
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
+    },
+    1744: {
+        orb: function(p) { return (p.unit.class.has("Shooter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1745: {
+        orb: function(p) { return (p.unit.class.has("Shooter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1748: {
         delay: function(p) { return 1; },
         turnedOn: false,
         onActivation: function(p) {
-            window.specials[1746].turnedOn = true;
+            window.specials[1748].turnedOn = true;
         },
         onDeactivation: function(p) {
-            window.specials[1746].turnedOn = false;
+            window.specials[1748].turnedOn = false;
         }
     },
-    1747: {
+    1749: {
         delay: function(p) { return 1; },
         turnedOn: false,
         onActivation: function(p) {
-            window.specials[1747].turnedOn = true;
+            window.specials[1749].turnedOn = true;
         },
         onDeactivation: function(p) {
-            window.specials[1747].turnedOn = false;
+            window.specials[1749].turnedOn = false;
         }
     },
     1750:{
@@ -3483,4 +3515,11 @@ window.specials = {
     1759: {
         delay: function(p) { return 1; },
     },
+    1764: {
+        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') ? 2.5 : 1;
+        }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 5f3e7edf3..37e36f166 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1730,24 +1730,24 @@ window.units = [
     [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, 4000000, 813, 400, 151, 1770, 1090, 357, 1 ],
     [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, 1 ],
     [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 4, 25, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "'Ruler of Night' Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, null, null, null, 2440, 1375, 315, null ],
     [ "Sugar, Hobby Hobby Fruit Ability User", "STR", [ "Cerebral", "Fighter" ], 3, 13, 4, 2, 50, 392109, 150, 102, 30, 646, 367, 220, 1 ],
     [ "Sugar, Trebol Army Special Executive", "STR", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 597, 311, 203, 1830, 975, 320, 1 ],
     [ "Trebol, Sticky Sticky Fruit Ability User", "INT", [ "Cerebral", "Driven" ], 3, 13, 5, 2, 50, 392109, 230, 156, 9, 1020, 519, 107, 1 ],
     [ "Trebol, Donquiote Family Elite Executive", "INT", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 99, 3000000, 975, 476, 97, 2540, 1220, 120, 1 ],
     [ "Bellamy the Hyena [Neo], Former Captain of the Bellamy Pirates", "STR", [ "Fighter", "Driven" ], 4, 30, 4, 2, 70, 1066998, 173, 125, 31, null, null, null, null ],
     [ "Bellamy the Hyena [Neo], Bullet of Dressrosa", "STR", [ "Fighter", "Driven" ], 5, 50, 4, 3, 99, 5000000, 893, 634, 149, 2014, 1320, 308, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Boa", "PSY", [ "Shooter", "Fighter" ], 5, 30, 4, 3, 70, 1066998, 294, 255, 77, 1326, 790, 189, null ],
+    [ "Boa Sandersonia, Strawhat Luffy's Cooperator", "DEX", [ "Striker", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Boa Sandersonia, Strawhat Luffy's Accomplice", "DEX", [ "Striker", "Powerhouse" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2503, 1267, 320, null ],
+    [ "Boa Marigold, Strawhat Luffy's Cooperator", "STR", [ "Striker", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Boa Marigold, Strawhat Luffy's Accomplice", "STR", [ "Striker", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1, 1, 1, 2520, 1319, 294, null ],
+    [ "Marguerite, Strawhat Luffy's Cooperator", "INT", "Shooter", 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Marguerite, Strawhat Luffy's Accomplice", "INT", "Shooter", 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2062, 1063, 450, null ],
+    [ "Bepo, Strawhat Luffy's Cooperator", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Bepo, Strawhat Luffy's Accomplice", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2357, 1129, 384, null ],
+    [ "Boa Hancock, Strawhat Luffy's Cooperator", "PSY", [ "Shooter", "Fighter" ], 5, 30, 4, 3, 70, 1066998, 294, 255, 77, 1326, 790, 189, null ],
     [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
     [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
     [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1240, 710, 159, null ],
@@ -1760,6 +1760,9 @@ window.units = [
     [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, 1076, 569, 148, 2274, 1336, 333, null ],
     [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1184, 589, 240, null ],
     [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1, 1, 1, 3478, 1501, 420, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 470911a00..da301a36b 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -451,11 +451,11 @@ window.zombies = {
         type: 'healer',
         multiplier: 3
     },
-    1746: { // Boa
+    1748: { // Boa
         type: 'healer',
         amount: 1000
     },
-    1747: { // Boa
+    1749: { // Boa
         type: 'healer',
         amount: 1000
     },
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index ccf11b757..88ff3ac5f 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -192,11 +192,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn || window.specials[1463]. turnedOn || window.specials[1462]. turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Powerhouse")) orb = (window.specials[1528].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Free Spirit")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
-            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn || window.specials[1746].turnedOn || window.specials[1747].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn || window.specials[1748].turnedOn || window.specials[1749].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Striker")) orb = (window.specials[1651].turnedOn || window.specials[1652].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1528].turnedOn && x.unit.class.has("Powerhouse")) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit"))) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")) || ((window.specials[1746].turnedOn || window.specials[1747].turnedOn) && x.unit.class.has("Shooter"))) ? 2 : 1;
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1528].turnedOn && x.unit.class.has("Powerhouse")) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit"))) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")) || ((window.specials[1748].turnedOn || window.specials[1749].turnedOn) && x.unit.class.has("Shooter"))) ? 2 : 1;
             
             if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1330].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
             
@@ -784,7 +784,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
                     enabledSpecials.push(jQuery.extend({ sourceSlot: n },specials[id]));
             }
             // activate turn counter if necessary
-            if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562 || id == 1712 || id == 1713))
+            if (n < 2 && (id == 794 || id == 795 || id == 1124 || id == 1125 || id == 1191 || id == 1192 || id == 1219 || id == 1220 || id == 1288 || id == 1289 || id == 1361 || id == 1362 || id == 1525 || id == 1557 || id == 1558 || id == 1559 || id == 1560 || id == 1561 || id == 1562 || id == 1712 || id == 1713 || id == 1764))
                 $scope.tdata.turnCounter.enabled = true;
             if (n < 2 && (id == 1609 || id == 1610))
                 $scope.tdata.healCounter.enabled = true;
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 1685be12f..3efad4bb1 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -153,7 +153,7 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
-    if(window.specials[1746].turnedOn || window.specials[1747].turnedOn){
+    if(window.specials[1748].turnedOn || window.specials[1749].turnedOn){
         if(uclass.has("Shooter")){
             if (orb == 'str') return boostedMultiplier;
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;

From bd0b3f851dbefdc0e2f927d17deed054566b7413 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Mon, 28 Aug 2017 01:51:27 -0400
Subject: [PATCH 1310/1569] Bellamy CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 033b41582..b24afa0fc 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1736,8 +1736,8 @@ window.cooldowns = [
     [ 13, 6 ],
     [ 22, 14 ],
     [ 22, 14 ],
-    [ 22, 13 ],
-    [ 22, 13 ],
+    [ 22, 14 ],
+    [ 22, 14 ],
     19,
     19,
     19,

From 5625d520f78120d9ab703f888996f8e689394418 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 28 Aug 2017 02:16:00 -0500
Subject: [PATCH 1311/1569] Hancock fix

tnd/rcv orbs
---
 common/data/details.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 53967480e..cb2106778 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9838,13 +9838,13 @@ window.details = {
         sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
         specialName: "Bear Rush Out",
     },
-    1748: {//Boa
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
+    1748: {//Boa Hancock
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting TND/RCV orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },
-    1749: {//Boa
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn",
+    1749: {//Boa Hancock
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting TND/RCV orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },
@@ -9940,7 +9940,7 @@ window.details = {
         sailorNotes: "#{silence}<br>#{rewind : 2}",
         specialName: "Intelligent Monster",
     },
-    1764: {
+    1764: {//6+ Aokiji
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 5 times to a maximum of 3.5x.",
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn, locks the chain multiplier at 2.5x for 1 turn and deals 100000 fixed damage to all enemies that will ignore damage negating abilities and barriers.",

From 573a1c23dd3be34925318f137901b8dedb5c8202 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Mon, 28 Aug 2017 02:18:58 -0500
Subject: [PATCH 1312/1569] format

tnd/rcv
---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index cb2106778..c57cd7638 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9839,12 +9839,12 @@ window.details = {
         specialName: "Bear Rush Out",
     },
     1748: {//Boa Hancock
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting TND/RCV orbs",
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },
     1749: {//Boa Hancock
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting TND/RCV orbs",
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },

From 0563e628d643b51e4373a51a99427a45e18a57a6 Mon Sep 17 00:00:00 2001
From: John <nguyen3@ualberta.ca>
Date: Mon, 28 Aug 2017 20:08:11 -0600
Subject: [PATCH 1313/1569] add new labels to night mode

---
 damage/css/edgy.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/css/edgy.css b/damage/css/edgy.css
index 795515977..8dd648bcb 100644
--- a/damage/css/edgy.css
+++ b/damage/css/edgy.css
@@ -2,7 +2,7 @@ html, body {
     background-color: #2b303b;
 }
 
-#hp-rcv, .tip {
+#hp-rcv, .tip, #turnLabel, #healLabel {
     color: white;
 }
 

From 3fe4d855d80d592349404918d9adff39d5ad7f08 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 29 Aug 2017 08:29:07 -0400
Subject: [PATCH 1314/1569] Ben Beckman and Flags

---
 common/data/aliases.js    | 34 +++++++++++--------
 common/data/captains.js   | 16 +++++++++
 common/data/cooldowns.js  |  7 +++-
 common/data/details.js    | 12 ++++++-
 common/data/drops.js      | 22 +++++++------
 common/data/evolutions.js | 18 +++++++---
 common/data/families.js   | 10 ++++--
 common/data/flags.js      | 69 +++++++++++++++++++++++++++------------
 common/data/gw.js         |  9 +++++
 common/data/specials.js   | 10 ++++++
 common/data/units.js      | 36 +++++++++++---------
 11 files changed, 174 insertions(+), 69 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ab796aca5..2ba07f6e8 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -950,8 +950,8 @@ window.aliases = {
     949: ['サッチ 白ひげ海賊団４番隊隊長',''],
     950: ['火拳のエース','','Coliseum Ace'],
     951: ['火拳のエース 白ひげ海賊団２番隊隊長','', 'Coliseum Ace'],
-    952: ['ベン・ベックマン','', 'Coliseum Ben Beckman'],
-    953: ['ベン・ベックマン 赤髪海賊団','', 'Coliseum Ben Beckman'],
+    952: ['ベン・ベックマン','', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman'],
+    953: ['ベン・ベックマン 赤髪海賊団','', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman'],
     954: ['ギャロ',''],
     955: ['マクロ','','Makuro'],
     956: ['タンスイ',''],
@@ -1736,8 +1736,8 @@ window.aliases = {
     1735: ['シュガー トレーボル軍　特別幹部', '', ''],
     1736: ['トレーボル ベタベタの実の能力者', '', ''],
     1737: ['トレーボル ドンキホーテファミリー最高幹部', '', ''],
-    1738: ['', '', 'Neo Bellamy'],
-    1739: ['', '', 'Neo Bellamy'],
+    1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy'],
+    1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy'],
     1740: ['', '', ''],
     1741: ['', '', ''],
     1742: ['', '', ''],
@@ -1750,19 +1750,25 @@ window.aliases = {
     1749: ['', '', 'Korea Boa'],
     1750: ['', '', 'Korea Law'],
     1751: ['', '', 'Korea Law'],
-    1752: ['', '', '20th Anniversary Zoro'],
-    1753: ['', '', '20th Anniversary Zoro'],
-    1754: ['', '', '20th Anniversary Sanji'],
-    1755: ['', '', '20th Anniversary Sanji'],
-    1756: ['', '', '20th Anniversary Nami'],
-    1757: ['', '', '20th Anniversary Nami'],
-    1758: ['', '', '20th Anniversary Brook'],
-    1759: ['', '', '20th Anniversary Brook'],
-    1760: ['', '', '20th Anniversary Chopper'],
-    1761: ['', '', '20th Anniversary Chopper'],
+    1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro'],
+    1753: ['ロロノア・ゾロ 20th Anniversary Memorial Treasure', '', '20th Anniversary Zoro'],
+    1754: ['サンジ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Sanji'],
+    1755: ['サンジ 20th Anniversary Memorial Treasure', '', '20th Anniversary Sanji'],
+    1756: ['ナミ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Nami'],
+    1757: ['ナミ 20th Anniversary Memorial Treasure', '', '20th Anniversary Nami'],
+    1758: ['ブルック Celebrate 20th Anniversary Cruise', '', '20th Anniversary Brook'],
+    1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook'],
+    1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper'],
+    1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper'],
     1762: ['', '', ''],
     1763: ['', '', ''],
     1764: ['', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
+    1765: ['', '', ''],
+    1766: ['', '', ''],
+    1767: ['', '', ''],
+    1768: ['', '', ''],
+    1769: ['', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
+    1770: ['', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index f9ac33676..a990b3d2d 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5348,4 +5348,20 @@ window.captains = {
         },
         hp: function(p) { return 1.25; }
     },
+    1769: {///Change for unevolved
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Cerebral") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
+    1770: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Cerebral") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b24afa0fc..b352293e9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1762,5 +1762,10 @@ window.cooldowns = [
     [ 13, 9 ],
     null,
     null,
-    [ 19, 13 ]
+    [ 19, 13 ],
+    null,
+    null,
+    null,
+    [ 13, 9 ]
+    [ 13, 9 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index c57cd7638..d06d9686b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9601,7 +9601,7 @@ window.details = {
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
     },
     1706: {//Bon Clay
-        captain: "Boosts ATK of [STR] characters by 2.5x. Boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
+        captain: "Boosts ATK of [STR] characters by 2.5x at the start of the chain, and boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
         special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
@@ -9947,4 +9947,14 @@ window.details = {
         specialNotes: "#{ignoreBarrier}",
         specialName: "Determined Man's Ice Attack",
     },
+    1769: {//Ben Beckman
+        captain: "Boosts ATK of Cerebral characters by ???x",
+        special: "Delays all enemies for 1 turn. If your caprain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
+        specialName: "Restraining Gunpoint",
+    },
+    1770: {//Ben Beckman
+        captain: "Boosts ATK of Cerebral characters by 2.5x and their HP by 1.2x at the start of the chain, and boosts ATK of Cerebral characters by 3.25x following a chain of Good > Great > Perfect hits",
+        special: "Delays all enemies for 1 turn. If your caprain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
+        specialName: "Restraining Gunpoint",
+    },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index fb39b5d6a..e0d29ac41 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -711,23 +711,22 @@ window.drops = {
             name: 'Punk Hazard Ice Lands - First Floor Room R',
             shortName: 'Punk Hazard 2',
             thumb: 1716,
-            completion: 'Something',
+            completion: '10x Rainbow Gems',
             gamewith: 65822,
-            '01': [ 1714, 1715, 1716, 1717, 1718, 1719 ],
+            '01': [ 1636 ],
             '02': [  ],
             '03': [  ],
             '04': [  ],
             '05': [  ],
-            '06': [  ],
-            '07': [  ],
+            '06': [ 1717 ],
+            '07': [ 1636 ],
             '08': [  ],
-            '09': [  ],
-            '10': [  ],
+            '09': [ 1714 ],
+            '10': [ 1714 ],
             '11': [  ],
-            '12': [  ],
-            '13': [  ],
-            '14': [  ],
-            '15': [  ],
+            '12': [ 1718, 1719 ],
+            '13': [ 1715 ],
+            '14': [ 1636 ],
         },
         
     ],
@@ -1267,6 +1266,7 @@ window.drops = {
         {
             name: 'Riverside Banquet! Enter the Crazy Ones!',
             thumb: 885,
+            global: true,
             gamewith: 22421,
             condition: 'Highly increased chance of TND, Bomb, and G orbs',
             'All Difficulties': [ 885, 886, 887, -887, -704, -703, -677, -675, -504, -453, -416, -1445 ]
@@ -1506,6 +1506,7 @@ window.drops = {
         {
             name: 'Marines! Sengoku the Fleet Admiral!',
             thumb: 1416,
+            global: true,
             gamewith: 48079,
             condition: 'You can only bring INT units',
             'All Difficulties': [ 1415, 1417, 1418, -1418, -870, -1276, -1274, -1236, -874, -253, -1223, -813 ]
@@ -1758,6 +1759,7 @@ window.drops = {
         {
             name: 'Clash Neo!! Aokiji',
             thumb: 1669,
+            global: true,
             condition: '1 Master version and 3 different Ultimate versions with different conditions. Master: Free Spirit/Shooter/Striker Only. Ultimate: Free Spirit Only, Shooter Only, and Striker Only',
             gamewith: 61262,
             Ultimate: [ 86, 112, 118, 302, 1668 ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 1d49586bd..d49e2082e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2697,7 +2697,7 @@ window.evolutions = {
     },
     1738: {
         evolution: 1739,
-        evolvers: [  ]
+        evolvers: [ 118, 78, 84, 94, 95 ]
     },
     1740: {
         evolution: 1741,
@@ -2725,22 +2725,30 @@ window.evolutions = {
     },
     1752: {
         evolution: 1753,
-        evolvers: [  ]
+        evolvers: [ 82, 88, 93, 99, 104 ]
     },
     1754: {
         evolution: 1755,
-        evolvers: [  ]
+        evolvers: [ 81, 87, 92, 98, 103 ]
     },
     1756: {
         evolution: 1757,
-        evolvers: [  ]
+        evolvers: [ 78, 84, 89, 95, 100 ]
     },
     1758: {
         evolution: 1759,
-        evolvers: [  ]
+        evolvers: [ 79, 85, 90, 96, 101 ]
     },
     1760: {
         evolution: 1761,
+        evolvers: [ 80, 86, 91, 97, 102 ]
+    },
+    1192: {
+        evolution: 1764,
+        evolvers: [  ]
+    },
+    1769: {
+        evolution: 1770,
         evolvers: [  ]
     },
 };
diff --git a/common/data/families.js b/common/data/families.js
index f4a580eec..4d214a560 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -950,8 +950,8 @@ window.families = [
     "Thatch",
     "Portgas D. Ace",
     "Portgas D. Ace",
-    "Beckman",
-    "Beckman",
+    "Ben Beckman",
+    "Ben Beckman",
     "Gyaro",
     "Makuro",
     "Tansui",
@@ -1763,4 +1763,10 @@ window.families = [
     null,
     null,
     "Aokiji",
+    null,
+    null,
+    null,
+    null,
+    "Ben Beckman",
+    "Ben Beckman",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index bd86abba8..6f064c351 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -512,7 +512,7 @@ window.flags = {
     511: { global: 1 },
     512: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
     513: { global: 1, rr: 1, rro: 1, lrr: 1, promo: 1 },
-    514: { special: 1, shop: 1 },
+    514: { special: 1, shop: 1, global: 1 },
     515: { global: 1 },
     516: { global: 1 },
     517: { global: 1 },
@@ -653,13 +653,14 @@ window.flags = {
     652: { global: 1 },
     653: { global: 1 },
     654: { global: 1 },
-    655: { global: 1},
-    656: { global: 1},
-    657: { global: 1},
-    658: { global: 1},
+    655: { global: 1 },
+    656: { global: 1 },
+    657: { global: 1 },
+    658: { global: 1 },
+    659: { global: 1 },
     660: { rr: 1, rro: 1, lrr: 1, global: 1 },
     661: { rr: 1, rro: 1, lrr: 1, global: 1 },
-    662: { shop: 1 },
+    662: { shop: 1, global: 1 },
     663: { global: 1 },
     664: { global: 1 },
     665: { global: 1 },
@@ -879,6 +880,9 @@ window.flags = {
     882: { global: 1 },
     883: { global: 1 },
     884: { global: 1 },
+    885: { global: 1 },
+    886: { global: 1 },
+    887: { global: 1 },
     888: { global: 1 },
     889: { global: 1 },
     890: { global: 1 },
@@ -1340,6 +1344,10 @@ window.flags = {
     1393: { global: 1 },
     1394: { rr: 1, rro: 1, lrr: 1, },
     1395: { rr: 1, rro: 1, lrr: 1, },
+    1396: { global: 1 },
+    1397: { global: 1 },
+    1398: { global: 1 },
+    1399: { global: 1 },
     1403: { rr: 1, rro: 1, global: 1 },
     1404: { rr: 1, rro: 1, global: 1 },
     1405: { rr: 1, rro: 1, global: 1 },
@@ -1352,6 +1360,10 @@ window.flags = {
     1412: { rr: 1, rro: 1, global: 1 },
     1413: { rr: 1, rro: 1, global: 1 },
     1414: { shop: 1 },
+    1415: { global: 1 },
+    1416: { global: 1 },
+    1417: { global: 1 },
+    1418: { global: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
     1420: { rr: 1, rro: 1, lrr: 1, },
     1429: { rr: 1, rro: 1, lrr: 1, },
@@ -1374,24 +1386,30 @@ window.flags = {
     1448: { global: 1 },
     1453: { rr: 1, rro: 1, lrr: 1, },
     1454: { rr: 1, rro: 1, lrr: 1, },
+    1455: { global: 1 },
+    1456: { global: 1 },
+    1457: { global: 1 },
+    1458: { global: 1 },
+    1459: { global: 1 },
+    1460: { global: 1 },
     1461: { special: 1 },
     1466: { rr: 1, rro: 1, lrr: 1 },
     1467: { rr: 1, rro: 1, lrr: 1 },
-    1472: { rr: 1, rro: 1 },
-    1473: { rr: 1, rro: 1 },
-    1474: { rr: 1, rro: 1 },
-    1475: { rr: 1, rro: 1 },
-    1476: { rr: 1, rro: 1 },
-    1477: { rr: 1, rro: 1 },
-    1478: { rr: 1, rro: 1 },
-    1479: { rr: 1, rro: 1 },
-    1480: { rr: 1, rro: 1 },
-    1481: { rr: 1, rro: 1 },
-    1482: { rr: 1, rro: 1 },
-    1483: { rr: 1, rro: 1 },
-    1484: { shop: 1 },
-    1485: { shop: 1 },
-    1492: { rr: 1, rro: 1 },
+    1472: { rr: 1, rro: 1, global: 1 },
+    1473: { rr: 1, rro: 1, global: 1 },
+    1474: { rr: 1, rro: 1, global: 1 },
+    1475: { rr: 1, rro: 1, global: 1 },
+    1476: { rr: 1, rro: 1, global: 1 },
+    1477: { rr: 1, rro: 1, global: 1 },
+    1478: { rr: 1, rro: 1, global: 1 },
+    1479: { rr: 1, rro: 1, global: 1 },
+    1480: { rr: 1, rro: 1, global: 1 },
+    1481: { rr: 1, rro: 1, global: 1 },
+    1482: { rr: 1, rro: 1, global: 1 },
+    1483: { rr: 1, rro: 1, global: 1 },
+    1484: { shop: 1, global: 1 },
+    1485: { shop: 1, global: 1 },
+    1492: { rr: 1, rro: 1, global: 1 },
     1493: { global: 1 },
     1494: { global: 1 },
     1495: { global: 1 },
@@ -1456,6 +1474,8 @@ window.flags = {
     1619: { rr: 1, rro: 1 },
     1620: { rr: 1, rro: 1, lrr: 1 },
     1621: { rr: 1, rro: 1, lrr: 1 },
+    1622: { global: 1 },
+    1623: { global: 1 },
     1631: { rr: 1, rro: 1, lrr: 1 },
     1632: { rr: 1, rro: 1, lrr: 1 },
     1651: { rr: 1, rro: 1 },
@@ -1473,12 +1493,16 @@ window.flags = {
     1663: { rr: 1, rro: 1 },
     1664: { rr: 1, rro: 1, lrr: 1 },
     1665: { rr: 1, rro: 1, lrr: 1 },
+    1668: { global: 1 },
+    1669: { global: 1 },
     1673: { rr: 1, rro: 1, lrr: 1 },
     1674: { rr: 1, rro: 1, lrr: 1 },
     1675: { special: 1 },
     1676: { special: 1 },
     1677: { rr: 1, rro: 1, lrr: 1 },
     1678: { rr: 1, rro: 1, lrr: 1 },
+    1679: { global: 1 },
+    1680: { global: 1 },
     1681: { rr: 1, rro: 1 },
     1682: { rr: 1, rro: 1 },
     1683: { rr: 1, rro: 1 },
@@ -1528,4 +1552,7 @@ window.flags = {
     1759: { rr: 1, rro: 1 },
     1760: { rr: 1, rro: 1 },
     1761: { rr: 1, rro: 1 },
+    1764: { rr: 1, rro: 1 },
+    1769: { rr: 1, rro: 1, lrr: 1 },
+    1770: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 45d3d6987..d6e909672 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1760,4 +1760,13 @@ window.gw=[
     65831,
     65834,
     65834,
+    null,
+    null,
+    35281,
+    null,
+    null,
+    null,
+    null,
+    66691,
+    66691,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 5a98015b0..1d6fe2a88 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2970,6 +2970,7 @@ window.specials = {
     },
     1598: {
         atk: function(p) { return 1.2 },
+        type: "class",
     },
     1599: {
         def: function(p) { return 0.5 },
@@ -2986,6 +2987,7 @@ window.specials = {
     },
     1607: {
         atk: function(p) { return (p.unit.class.has("Shooter")) ? 1.5 : 1; },
+        type: "class",
     },
     1613: {
         def: function(p) { return 0.5 },
@@ -3522,4 +3524,12 @@ window.specials = {
             return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
+    1769: {
+        atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
+        type: "condition",
+    },
+    1770: {
+        atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
+        type: "condition",
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 37e36f166..e37738d82 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1022,8 +1022,8 @@ window.units = [
     [ "Sugar Cherry", "INT", ["Shooter","Cerebral"], 5, 20, 5, 3, 99, 3000000, 731, 300, 198, 1621, 717, 442, 1],
     [ "Monkey D. Luffy Road to Pirate King", "PSY", ["Fighter","Free Spirit"], 4, 15, 4, 2, 99, 2000000, 200, 56, 55, 2000, 1000, 300, 1 ],
     [ "Portgas D. Ace Dream that Lead to the Pirate King", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 5, 2, 99, 2000000, 159, 98, 41, 1773, 1310, 221, 1.5 ],
-    [ "Don Chin Jao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
-    [ "Don Chin Jao, Kano Kingdom Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
+    [ "Don Chinjao", "INT", [ "Powerhouse","Fighter" ], 4, 18, 6, 3, 70, 1066998, 226, 187, 17, 1505, 808, 100, 1 ],
+    [ "Don Chinjao, Kano Kingdom Gang", "INT", [ "Powerhouse","Striker" ], 5, 30, 4, 4, 99, 4000000, 1433, 746, 68, 2818, 1424, 185, 1 ],
     [ "Blue Gilly", "QCK", [ "Fighter","Free Spirit" ], 4, 18, 6, 3, 70, 1066998, 197, 138, 37, 1330, 689, 162, 1 ],
     [ "Blue Gilly, Jiaokungdo Fighter", "QCK", [ "Fighter","Free Spirit" ], 5, 30, 7, 4, 99, 4000000, 1253, 630, 129, 2552, 1300, 277, 1 ],
     [ "Funk Brothers", "DEX", [ "Fighter","Driven" ], 4, 18, 5, 3, 70, 1066998, 60, 172, 44, 937, 824, 109, 1 ],
@@ -1397,7 +1397,7 @@ window.units = [
     [ "Tashigi Shambles", "DEX", [ "Striker", "Driven" ], 3, 11, 6, 1, 50, 392109, 103, 34, 23, 1034, 543, 113, 1 ],
     [ "Tashigi Shambles, 7 Foot Jitte", "DEX", [ "Striker", "Driven" ], 4, 19, 5, 3, 99, 3000000, 914, 463, 103, 2134, 1043, 231, 1 ],
     [ "Smoker Shambles", "QCK", [ "Slasher", "Cerebral" ], 3, 11, 6, 1, 50, 392109, 76, 26, 41, 886, 466, 186, 1 ],
-    [ "Smoker Shambles, Shigure", "QCK", [ "Slasher", "Cerebral" ], 4, 19, 4, 3, 99, 3000000, 706, 416, 160, 1606, 910, 361, 1 ],
+    [ "Smoker Shambles, Autumn Rain", "QCK", [ "Slasher", "Cerebral" ], 4, 19, 4, 3, 99, 3000000, 706, 416, 160, 1606, 910, 361, 1 ],
     [ "Gladius, Pop-Pop Man", "STR", [ "Driven", "Shooter" ], 4, 25, 7, 2, 70, 1066998, 186, 168, 39, 1088, 786, 98, 1 ],
     [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, 4, 3, 99, 4000000, 986, 698, 86, 2188, 1419, 208, 1 ],
     [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 6, 2, 70, 1778330, 160, 106, 19, 1061, 961, 235, 1 ],
@@ -1736,8 +1736,8 @@ window.units = [
     [ "Sugar, Trebol Army Special Executive", "STR", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 597, 311, 203, 1830, 975, 320, 1 ],
     [ "Trebol, Sticky Sticky Fruit Ability User", "INT", [ "Cerebral", "Driven" ], 3, 13, 5, 2, 50, 392109, 230, 156, 9, 1020, 519, 107, 1 ],
     [ "Trebol, Donquiote Family Elite Executive", "INT", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 99, 3000000, 975, 476, 97, 2540, 1220, 120, 1 ],
-    [ "Bellamy the Hyena [Neo], Former Captain of the Bellamy Pirates", "STR", [ "Fighter", "Driven" ], 4, 30, 4, 2, 70, 1066998, 173, 125, 31, null, null, null, null ],
-    [ "Bellamy the Hyena [Neo], Bullet of Dressrosa", "STR", [ "Fighter", "Driven" ], 5, 50, 4, 3, 99, 5000000, 893, 634, 149, 2014, 1320, 308, null ],
+    [ "Bellamy the Hyena [Neo], Former Captain of the Bellamy Pirates", "STR", [ "Fighter", "Driven" ], 4, 30, 4, 1, 70, 1066998, 173, 125, 31, 977, 711, 194, 1 ],
+    [ "Bellamy the Hyena [Neo], Bullet of Dressrosa", "STR", [ "Fighter", "Driven" ], 5, 50, 4, 3, 99, 5000000, 893, 634, 149, 2014, 1320, 308, 1 ],
     [ "Boa Sandersonia, Strawhat Luffy's Cooperator", "DEX", [ "Striker", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Boa Sandersonia, Strawhat Luffy's Accomplice", "DEX", [ "Striker", "Powerhouse" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2503, 1267, 320, null ],
     [ "Boa Marigold, Strawhat Luffy's Cooperator", "STR", [ "Striker", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
@@ -1750,19 +1750,25 @@ window.units = [
     [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, null ],
     [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
     [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
-    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1240, 710, 159, null ],
-    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, 1043, 554, 94, 2503, 1400, 269, null ],
-    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 650, 394, 41, 1230, 698, 200, null ],
-    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1032, 574, 137, 2417, 1353, 305, null ],
-    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, 4, 3, 50, 392109, null, null, null, 1001, 554, 287, null ],
-    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, 6, 5, 99, 4000000, 820, 420, 220, 2076, 1179, 417, null ],
-    [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, 1076, 569, 148, 2274, 1336, 333, null ],
-    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 6, 3, 50, 392109, null, null, null, 1184, 589, 240, null ],
-    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, null ],
+    [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 669, 404, 32, 1240, 710, 159, 1 ],
+    [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, 1043, 554, 94, 2503, 1400, 269, 1 ],
+    [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 650, 394, 41, 1230, 698, 200, 1 ],
+    [ "Sanji, 20th Anniversary Memorial Treasure", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1032, 574, 137, 2417, 1353, 305, 1 ],
+    [ "Nami, Celebrate 20th Anniversary Cruise", "STR", [ "Striker", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 598, 303, 80, 1001, 554, 287, 1 ],
+    [ "Nami, 20th Anniversary Memorial Treasure", "STR", [ "Striker", "Cerebral" ], 5, 30, 6, 5, 99, 4000000, 820, 420, 220, 2076, 1179, 417, 1 ],
+    [ "Brook, Celebrate 20th Anniversary Cruise", "QCK", [ "Free Spirit", "Slasher" ], 4, 15, 7, 3, 50, 392109, 642, 387, 42, 1187, 670, 223, 1 ],
+    [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, 1076, 569, 148, 2274, 1336, 333, 1 ],
+    [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 644, 343, 44, 1184, 589, 240, 1 ],
+    [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1, 1, 1, 3478, 1501, 420, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ben Beckman, Red Hair Pirates", "INT", [ "Cerebral", "Striker" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2295, 367, 1384, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 646e331cd5e548e1a9964f4531845b78e48d109f Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 29 Aug 2017 08:33:56 -0400
Subject: [PATCH 1315/1569] Whoops

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index e37738d82..7e91ad5f8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1768,7 +1768,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ben Beckman, Red Hair Pirates", "INT", [ "Cerebral", "Striker" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2295, 367, 1384, null ],
+    [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2295, 1384, 367, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 8c0ed270505f75c2d405fa76a38a108558bf8505 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 30 Aug 2017 15:44:11 +0200
Subject: [PATCH 1316/1569] Added Stainless Alias

Global name of #1418 is Kaiser Mustache, while in the DB (and in Japanese) is named Stainless.
---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2ba07f6e8..056f5f7d1 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1416,7 +1416,7 @@ window.aliases = {
     1415: ['センゴク 智将', '', ''],
     1416: ['仏のセンゴク 智将', '', ''],
     1417: ['ロンズ', '', ''],
-    1418: ['カイゼルヒゲ', '', ''],
+    1418: ['カイゼルヒゲ', '', 'Kaiser Mustache'],
     1419: ['ロブ・ルッチ 紋付袴の手招き', '', 'Kimono Lucci'],
     1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci'],
     1421: ['ディアマンテ はためく旗（フラッグ）人間', '', 'Coliseum Diamante'],

From 4d409d7016dcb6e3e2fccba5e2c6ad1baedc8543 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 30 Aug 2017 22:47:11 -0400
Subject: [PATCH 1317/1569] Kizaru double special activation fix

---
 common/data/captains.js | 16 ++++++++++++++--
 common/data/specials.js | 12 ++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index a990b3d2d..fa64eba2e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3219,12 +3219,24 @@ window.captains = {
     },
     1239: {
         atk: function(p){ 
-            return window.specials[1239].turnedOn || window.specials[1240].turnedOn ? 3 : 2; },
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1239].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]==true){specialEnabled = true;}
+            }
+            return specialEnabled ? 3 : 2; },
         rcv: function(p) { return 1.3 }
     },
     1240: {
         atk: function(p){ 
-            return window.specials[1239].turnedOn || window.specials[1240].turnedOn ? 3 : 2; },
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1239].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]==true){specialEnabled = true;}
+            }
+            return specialEnabled ? 3 : 2; },
         rcv: function(p) { return 1.3 }
     },
     1241: {
diff --git a/common/data/specials.js b/common/data/specials.js
index 1d6fe2a88..9fd507746 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1804,29 +1804,29 @@ window.specials = {
         type: "condition"
     },
     1239: {
-        turnedOn: false,
+        turnedOn: [ false, false ],
         onActivation: function(p) {
-            window.specials[1239].turnedOn = true;
+            window.specials[1239].turnedOn[p.slot] = true;
             p.scope.notify({
                 text: 'Only affects damage if Kizaru is your captain',
                 name: '1239warning'
             });
         },
         onDeactivation: function(p) {
-            window.specials[1239].turnedOn = false;
+            window.specials[1239].turnedOn[p.slot] = false;
         }
     },
     1240: {
-        turnedOn: false,
+        turnedOn: [ false, false ],
         onActivation: function(p) {
-            window.specials[1240].turnedOn = true;
+            window.specials[1240].turnedOn[p.slot] = true;
             p.scope.notify({
                 text: 'Only affects damage if Kizaru is your captain',
                 name: '1240warning'
             });
         },
         onDeactivation: function(p) {
-            window.specials[1240].turnedOn = false;
+            window.specials[1240].turnedOn[p.slot] = false;
         }
     },
     1241: {

From 08589d7579ef74e38674c699e59d5ae88ff08628 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 30 Aug 2017 23:45:47 -0400
Subject: [PATCH 1318/1569] Limit Break update

---
 characters/views/details.html |  15 +++++
 characters/views/sidebar.html |   7 ++
 common/data/cooldowns.js      |  20 +++---
 common/data/details.js        | 118 +++++++++++++++++++++++++++++-----
 common/data/matchers.js       |   8 +++
 5 files changed, 141 insertions(+), 27 deletions(-)

diff --git a/characters/views/details.html b/characters/views/details.html
index 898961a20..9d56d6372 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -196,6 +196,21 @@ <h3 class="page-header" ng-hide="hidden.abilities">Abilities</h3>
                                         <span class="notes" ng-if="details.specialNotes" ng-bind-html="details.specialNotes | notes | decorate"></span>
                                     </td>
                                 </tr>
+                                <tr>
+                                    <td>Limit Break</td>
+                                    <td>
+                                        <!-- same limit break (differences across versions) -->
+                                        <div ng-if="!isLimitHybrid" ng-bind-html="details.limit | decorate"></div>
+                                        <!-- different sailor abilities -->
+                                        <div ng-if="isLimitHybrid">
+                                            <span class="badge badge-japan">Japan</span>
+                                            <div ng-bind-html="details.limit.japan | decorate"></div>
+                                            <span class="badge badge-global">Global</span>
+                                            <div ng-bind-html="details.limit.global | decorate"></div>
+                                        </div>
+                                        <span class="notes" ng-if="details.limitNotes" ng-bind-html="details.limitNotes | notes | decorate"></span>
+                                    </td>
+                                </tr>
                                 <tr ng-if="cooldown && !isSpecialStaged">
                                     <td>Cooldown</td>
                                     <td>
diff --git a/characters/views/sidebar.html b/characters/views/sidebar.html
index 004daad87..07ad9c611 100644
--- a/characters/views/sidebar.html
+++ b/characters/views/sidebar.html
@@ -115,6 +115,13 @@
         ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
 </div>
 
+<div class="filter-container">
+    <span class="filter-header">Limit Break filters</span>
+    <span class="filter width-12 custom" ng-repeat="(n,filter) in filterData" ng-if="filter.target.indexOf('limit') == 0"
+        ng-model="filters.custom[n]" ng-class="{ active: filters.custom[n] }"
+        ng-click="filters.custom[n] = !filters.custom[n]">{{filter.name}}</span>
+</div>
+
 <div class="filter-container" ng-if="showLogFilters">
     <span class="filter-header">Character Log filters</span>
     <span class="filter width-12 custom" ng-model="filters.noLog" ng-class="{ active: filters.noLog }"
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index b352293e9..fd6ed1b5c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1738,16 +1738,16 @@ window.cooldowns = [
     [ 22, 14 ],
     [ 22, 14 ],
     [ 22, 14 ],
-    19,
-    19,
-    19,
-    19,
-    19,
-    19,
-    18,
-    18,
-    20,
-    20,
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 18, 11 ],
+    [ 18, 11 ],
+    [ 20, 15 ],
+    [ 20, 15 ],
     [ 20, 15 ],
     [ 20, 15 ],
     [ 18, 14 ],
diff --git a/common/data/details.js b/common/data/details.js
index d06d9686b..ecc725d0e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -16,7 +16,9 @@ window.details = {
     4: {
         captain: "Boosts ATK of STR characters by 2x, and ATK of all others by 1.5x",
         special: "Deals 25x character's ATK in STR damage to one enemy",
-        specialName: "Gum-Gum Twin Jet Pistol"
+        specialName: "Gum-Gum Twin Jet Pistol",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     5: {
         special: "Deals 7x character's ATK in DEX damage to one enemy",
@@ -812,7 +814,9 @@ window.details = {
     227: {
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Black Blade Ship Cutter",
-        captain: "Boosts ATK of Slasher characters by 2.5x"
+        captain: "Boosts ATK of Slasher characters by 2.5x",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     228: {
         special: "Reduces Bind duration by 2 turns",
@@ -953,7 +957,9 @@ window.details = {
     257: {
         special: "Changes [STR] and [QCK] orbs into [DEX] orbs",
         specialName: "Beautiful Dual Flintlocks",
-        captain: "Boosts ATK and RCV of DEX characters by 2x"
+        captain: "Boosts ATK and RCV of DEX characters by 2x",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     258: {
         special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
@@ -1327,7 +1333,9 @@ window.details = {
     353: {
         special: "Boosts ATK of Shooter characters by 1.75x for 2 turns",
         specialName: "Smash Buster",
-        captain: "Boosts ATK of Shooter characters by 2.5x"
+        captain: "Boosts ATK of Shooter characters by 2.5x",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     354: {
         special: "Reduces Bind and Despair duration by 3 turns",
@@ -1359,7 +1367,9 @@ window.details = {
         special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
         specialName: "Scratch Body",
         specialNotes: "#{random : 5,000 : 20,000}",
-        captain: "Boosts ATK of DEX characters by 3x if HP is above 99% at the start of the turn"
+        captain: "Boosts ATK of DEX characters by 3x if HP is above 99% at the start of the turn",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     360: {
         special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
@@ -1798,7 +1808,9 @@ window.details = {
     447: {
         special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
         specialName: "Black Hole",
-        captain: "Increases damage received by 2x, boosts ATK of STR characters by 2.5x and their HP by 2.25x"
+        captain: "Increases damage received by 2x, boosts ATK of STR characters by 2.5x and their HP by 2.25x",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     448: {
         special: "Boosts chances of getting [QCK] orbs for 3 turns",
@@ -2370,7 +2382,9 @@ window.details = {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     557: {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
@@ -3843,7 +3857,9 @@ window.details = {
     846: {
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 30th hit, by 3.5x after the 40th hit",
         specialName: "Gust: Matasaburo",
-        special: "Randomizes all orbs and changes own orb into [QCK]"
+        special: "Randomizes all orbs and changes own orb into [QCK]",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     847: {
         captain: "Boosts ATK of all characters by 1.5x if HP is below 30% at the start of the turn",
@@ -4645,7 +4661,9 @@ window.details = {
                 "cooldown": [ 25, 11 ]
             }
         ],
-        specialNotes: "#{stages}"
+        specialNotes: "#{stages}",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     979: {
         captain: "Boosts ATK of [PSY] and [DEX] characters by 1.75x and their RCV by 1.2x",
@@ -4715,7 +4733,9 @@ window.details = {
     993: {
         captain: "Boosts ATK of [QCK] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
-        specialName: "Punc Rock Fest"
+        specialName: "Punc Rock Fest",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     994: {
         captain: "Boosts amount of Beli received by 2x",
@@ -4934,7 +4954,9 @@ window.details = {
         captainNotes: "A character with both classes will get both boosts",
         special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
         specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
-        specialName: "Eight-Impact Fist! Blow of Resentment"
+        specialName: "Eight-Impact Fist! Blow of Resentment",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1026: {
         captain: "Boosts ATK and RCV of Fighter characters by 1.5x",
@@ -4976,7 +4998,9 @@ window.details = {
     1033: {
         captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turns at the start of the fight",
         special: "Reduces Special Cooldown of Slasher and Striker specials by 1 turn. For Slasher and Striker characters, changes Badly Matching orbs into [RCV] orbs.",
-        specialName: "Surprise Pincer Attack"
+        specialName: "Surprise Pincer Attack",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1034: {
         captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
@@ -5249,7 +5273,9 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Haute Couture: Patchwork"
+        specialName: "Haute Couture: Patchwork",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1078: {
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
@@ -5309,7 +5335,9 @@ window.details = {
         captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
         special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
         specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
-        specialName: "Drill Dragon: Drill Nail"
+        specialName: "Drill Dragon: Drill Nail",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1084: {
         captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
@@ -5321,7 +5349,9 @@ window.details = {
         captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
         specialNotes: "Does not stack with other 'end of turn damage' abilities",
-        specialName: "Gravito: Heavens Fall"
+        specialName: "Gravito: Heavens Fall",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1086: {
         captain: "Boosts ATK and RCV of Driven characters by 1.5x",
@@ -6114,7 +6144,9 @@ window.details = {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter characters by 10"
+        sailor: "Boosts RCV of Shooter characters by 10",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1211: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
@@ -6203,6 +6235,8 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         specialName: "More More, 10 Times \"Iron Hammer\"",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1221: {//Coliseum Oars Jr
         captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
@@ -6619,6 +6653,8 @@ window.details = {
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces Blindness duration by 5 turns",
         specialName: "Other Side of Fate",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1273: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.2",
@@ -6877,6 +6913,8 @@ window.details = {
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1315: {//Coby
         captain: "Boosts ATK by 2x after the 2nd Perfect and by 3x after the 5th Perfect.",
@@ -6945,6 +6983,8 @@ window.details = {
         specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 32,000 : for each hit}",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "A Decree of the Veteran",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1321: {//Momonga
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
@@ -7458,6 +7498,8 @@ window.details = {
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. Boosts ATK by 2.8125x after scoring 4 Perfects in a row",
         special: "Deals 40x character's ATK in [STR] damage to all enemies, and delays all enemies for 1 turn",
         specialName: "Gum Gum: Elephant Gun",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1388: {//Zoro 5+
         captain: "Boosts ATK of [DEX] characters by 2.5x",
@@ -7556,6 +7598,8 @@ window.details = {
         ],
         specialName: "Stonewall Punk",
         specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1402: {//Colo Dalton
         captain: "Boosts ATK of [PSY] and [QCK] characters by 2x",
@@ -8112,6 +8156,8 @@ window.details = {
         specialNotes: "#{randomHits : 15}",
         sailor: "Completely resists Paralysis on this character",
         specialName: "Swamp-Swamp Gatling Gun",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1480: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row",
@@ -8473,6 +8519,8 @@ window.details = {
         specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
         specialName: "Long-Range Attack: Bagworm",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1533: {//Rayleigh
         captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect.",
@@ -8542,6 +8590,8 @@ window.details = {
         special: "Cuts the current HP of each enemy by 10%. If enemies have Delay Prevention, ignores it and Delays all enemies for 1 turn. Otherwise, Delays all enemies for 3 turns",
         sailor: "Completely resists Blindness",
         specialName: "Green Star, Impact Wolf",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1544: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 1.75x and heals for .3x her RCV at the end of the turn each time you hit a Perfect",
@@ -9033,6 +9083,8 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise and boosts HP of Striker characters by 1.2x",
         special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
         specialName: "Double Steel Magnetic Arm",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1622: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
@@ -9120,6 +9172,8 @@ window.details = {
         special: "Boosts ATK of Powerhouse characters by 1.75x for 3 turns",
         specialName: "Rebellion against the \"Prohibition\" - Taboo",
         sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1633: {//Punk Hazard Dragon
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
@@ -9334,6 +9388,8 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
         special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1666: {//Kyros
         captain: "Boosts ATK of Striker characters by 2x",
@@ -9407,6 +9463,8 @@ window.details = {
         captain: "Boosts ATK of Slasher characters by 2.5x at the start of the chain, by 3.25x after the 3rd Perfect",
         special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
         specialName: "ROOM: Kikoku",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1679: {//Kai Mihawk
         special: "Cuts the current HP of each enemy by 30%",
@@ -9527,6 +9585,8 @@ window.details = {
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 50x character's attack and increases by 2x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Venom Cloud",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1699: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.2x",
@@ -9541,6 +9601,8 @@ window.details = {
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
         sailor: "Boosts ATK of Fighter characters by 75",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1701: {//Ivankov
         captain: "Boosts ATK of Free Spirit characters by 2x",
@@ -9581,6 +9643,8 @@ window.details = {
         specialName: "Hair Removal Fist",
         specialNotes: "#{stages}",
         sailor: "Completely resists Paralysis on this character",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1703: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2x",
@@ -9593,6 +9657,8 @@ window.details = {
         special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflicted with Toxic by 1.75x for 2 turns",
         specialName: "Inferno Hell Wheel",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1705: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2x",
@@ -9605,6 +9671,8 @@ window.details = {
         special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1707: {//Shanks 6+
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
@@ -9646,6 +9714,8 @@ window.details = {
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Deals 50x character's ATK as typeless damage to all enemies. Amplifies the effect of orbs for Driven characters by 2x for 1 turn.",
         specialName: "Blazing Hound Crimson Lotus",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1714: {//Monet
         captain: "Boosts ATK of INT characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
@@ -9686,7 +9756,9 @@ window.details = {
     1721: {//Secret Jinbe
         captain: "Boosts HP of Fighter characters by 1.4x and boosts ATK by 2.75x if they have a matching orb, by 2.5x otherwise.",
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
-        specialName: "Passive Agressive Boss"
+        specialName: "Passive Agressive Boss",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1722: {//Neptune
         captain: "Boosts ATK of Striker characters by 2x.",
@@ -9801,6 +9873,8 @@ window.details = {
         special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by ???% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
         specialName: "Snake Hair Possession: Eight-Headed Serpent",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1742: {//Marigold
         captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [STR] characters by 1.1x",
@@ -9813,6 +9887,8 @@ window.details = {
         special: "Changes [QCK] and [DEX] orbs into Matching orbs, boosts ATK against enemies with reduced defense by 1.75x for 2 turns and reduces damage received by 60% for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
         specialName: "Snake Hair Possession: Salamander",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1744: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x",
@@ -9825,6 +9901,8 @@ window.details = {
         special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
         sailor: "Boosts ATK, HP and RCV of Shooter characters by 30",
         specialName: "Defender's Spade-Shaped Arrow",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1746: {//Bepo
         captain: "Boosts ATK and HP of QCK characters by 1.5x",
@@ -9837,6 +9915,8 @@ window.details = {
         special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
         sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
         specialName: "Bear Rush Out",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1748: {//Boa Hancock
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting [TND] / [RCV] orbs",
@@ -9847,6 +9927,8 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
@@ -9956,5 +10038,7 @@ window.details = {
         captain: "Boosts ATK of Cerebral characters by 2.5x and their HP by 1.2x at the start of the chain, and boosts ATK of Cerebral characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Delays all enemies for 1 turn. If your caprain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
         specialName: "Restraining Gunpoint",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
 };
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 3b5324b1b..4f7864f62 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -525,5 +525,13 @@ window.matchers = [
         target: 'sailor',
         matcher: /Restores (his|her) own special/i
     },
+    
+    /* * * * * Limit Break * * * * */
+    
+    {
+        name: 'Has Limit Break',
+        target: 'limit',
+        matcher: /\S/i
+    },
 
 ];

From e440c73d58e6cc20d3f5705b283312401c3e9113 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 31 Aug 2017 02:27:58 -0400
Subject: [PATCH 1319/1569] Bug

I squish
---
 common/data/details.js  | 15 ++++++---------
 common/data/specials.js |  2 ++
 common/data/units.js    |  4 ++--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index ecc725d0e..4dfc22b9c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7651,14 +7651,14 @@ window.details = {
     1405: {//Timeskip Usopp
         captain: "Boosts ATK of Shooter characters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
-        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
+        specialNotes: "#{randomHits : 10}",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boosts ATK of Shooter characters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
-        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.<br> #{randomHits : 10}",
+        specialNotes: "#{randomHits : 10}",
         specialName: "Assault Meteor Shower",
         sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
     },
@@ -7783,7 +7783,6 @@ window.details = {
         captain: "Boosts amount of Beli received by 1.5x, and gives chance of duplicating a drop upon completion of the island",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
-        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts or Orb boosts.",
         specialName: "Looting the Losers",
     },
     1429: {//Valentines Mansherry
@@ -8178,14 +8177,12 @@ window.details = {
     1482: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
-        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
         specialName: "Foretold Catastrophe",
     },
     1483: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2.5x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
-        specialNotes: "This is a new form of Conditional Boost. The boost does not act like a Monet or Dalmatian boost, but is only activated if conditions are met and does not stack with other Class boosts.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
         specialName: "Foretold Catastrophe",
     },
@@ -9822,13 +9819,13 @@ window.details = {
     },
     1732: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2x, boosts HP of Striker and Powerhouse characters by 1.1x",
-        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn. If enemies have debuff protection at the time the special was activated, changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
         specialName: "Nekomamushi Special",
     },
     1733: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2.5x, boosts HP of Striker and Powerhouse characters by 1.25x",
-        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn. If enemies have debuff protection at the time the special was activated, changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
         specialName: "Nekomamushi Special",
     },
@@ -10031,12 +10028,12 @@ window.details = {
     },
     1769: {//Ben Beckman
         captain: "Boosts ATK of Cerebral characters by ???x",
-        special: "Delays all enemies for 1 turn. If your caprain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
+        special: "Delays all enemies for 1 turn. If your captain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
         specialName: "Restraining Gunpoint",
     },
     1770: {//Ben Beckman
         captain: "Boosts ATK of Cerebral characters by 2.5x and their HP by 1.2x at the start of the chain, and boosts ATK of Cerebral characters by 3.25x following a chain of Good > Great > Perfect hits",
-        special: "Delays all enemies for 1 turn. If your caprain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
+        special: "Delays all enemies for 1 turn. If your captain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
         specialName: "Restraining Gunpoint",
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
diff --git a/common/data/specials.js b/common/data/specials.js
index 9fd507746..645c36869 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3397,10 +3397,12 @@ window.specials = {
     },
     1732: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
         type: "class"
     },
     1733: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
         type: "class"
     },
     1736: {
diff --git a/common/data/units.js b/common/data/units.js
index 7e91ad5f8..edb5302cc 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1730,8 +1730,8 @@ window.units = [
     [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, 4000000, 813, 400, 151, 1770, 1090, 357, 1 ],
     [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, 1 ],
     [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, 1 ],
-    [ "Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 4, 25, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "'Ruler of Night' Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, null, null, null, 2440, 1375, 315, null ],
+    [ "Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 70, 1066998, 563, 292, 38, 1285, 747, 205, null ],
+    [ "'Ruler of Night' Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1200, 678, 149, 2440, 1375, 315, null ],
     [ "Sugar, Hobby Hobby Fruit Ability User", "STR", [ "Cerebral", "Fighter" ], 3, 13, 4, 2, 50, 392109, 150, 102, 30, 646, 367, 220, 1 ],
     [ "Sugar, Trebol Army Special Executive", "STR", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 597, 311, 203, 1830, 975, 320, 1 ],
     [ "Trebol, Sticky Sticky Fruit Ability User", "INT", [ "Cerebral", "Driven" ], 3, 13, 5, 2, 50, 392109, 230, 156, 9, 1020, 519, 107, 1 ],

From c1badf1a5120b5afb58742fa079c5cae1f22d187 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 31 Aug 2017 11:51:28 -0400
Subject: [PATCH 1320/1569] Neo Kuma

---
 common/data/aliases.js    |  2 ++
 common/data/captains.js   |  8 ++++++++
 common/data/cooldowns.js  |  7 +++++--
 common/data/details.js    | 12 ++++++++++++
 common/data/drops.js      |  9 +++++++++
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  2 ++
 common/data/specials.js   |  6 ++++++
 common/data/units.js      |  2 ++
 9 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 056f5f7d1..81e7179cc 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1769,6 +1769,8 @@ window.aliases = {
     1768: ['', '', ''],
     1769: ['', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
     1770: ['', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
+    1771: ['', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
+    1772: ['', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index fa64eba2e..c1ce3abe8 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5376,4 +5376,12 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
+    1771: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    1772: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index fd6ed1b5c..94c1b4321 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1766,6 +1766,9 @@ window.cooldowns = [
     null,
     null,
     null,
-    [ 13, 9 ]
-    [ 13, 9 ]
+    null,
+    [ 13, 9 ],
+    [ 13, 9 ],
+    [ 23, 14 ],
+    [ 23, 14 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 4dfc22b9c..f8627ae99 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10038,4 +10038,16 @@ window.details = {
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
+    1771: {
+        captain: "Boosts ATK and HP of Cerebral characters by 2x",
+        specialName: "Thrust Pad Cannon [Neo]",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{orb : 1.75x}"
+    },
+    1772: {
+        captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in STR damage to all enemies at the end of each turn",
+        specialName: "Thrust Pad Cannon [Neo]",
+        special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{orb : 1.75x}"
+    },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index e0d29ac41..083f58590 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1819,6 +1819,15 @@ window.drops = {
             Master: [ 835 ]
         },
 
+        {
+            name: 'Clash Neo!! Tyrant Kuma',
+            thumb: 1772,
+            gamewith: null,
+            condition: '1 Master version and 3 Ultimate versions with different conditions. Master: Shooter/Slasher/Cerebral Only. Can only complete 10 times each. Ultimate: Shooter Only, Slasher Only, and Cerebral Only',
+            Ultimate: [ 1771 ],
+            Master: [ 1771 ]
+        },
+
         {
             name: 'Clash!! Pirate Empress Hancock',
             thumb: 865,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d49e2082e..dceabaf77 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2751,4 +2751,8 @@ window.evolutions = {
         evolution: 1770,
         evolvers: [  ]
     },
+    1771: {
+        evolution: 1772,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 4d214a560..ac5ad4557 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1769,4 +1769,6 @@ window.families = [
     null,
     "Ben Beckman",
     "Ben Beckman",
+    "Bartholomew Kuma",
+    "Bartholomew Kuma",
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 645c36869..669c43dd9 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3534,4 +3534,10 @@ window.specials = {
         atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
         type: "condition",
     },
+    1771: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
+    1772: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index edb5302cc..d410ca89e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1769,6 +1769,8 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ben Beckman, Red Hair Pirates", "INT", [ "Cerebral", "Striker" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2295, 1384, 367, null ],
+    [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, null, null, null, 3070, 1445, 90, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 612c3129c19a2ddb3a6a69fcc1dad64005dbe98e Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 2 Sep 2017 01:19:50 -0400
Subject: [PATCH 1321/1569] Bugs and Typos

---
 common/data/captains.js  |  3 +++
 common/data/cooldowns.js |  4 ++--
 common/data/details.js   | 14 +++++++-------
 common/data/gw.js        | 20 ++++++++++----------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c1ce3abe8..4ab3d38a4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4065,6 +4065,9 @@ window.captains = {
     1441: {
         atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
+    1442: {
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+    },
     1443: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
         hitAtk: function(p) {
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 94c1b4321..6624a45be 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1730,8 +1730,8 @@ window.cooldowns = [
     [ 8, 8 ],
     [ 16, 16 ],
     [ 16, 16 ],
-    21,
-    21,
+    [ 21, 9 ],
+    [ 21, 9 ],
     [ 13, 6 ],
     [ 13, 6 ],
     [ 22, 14 ],
diff --git a/common/data/details.js b/common/data/details.js
index f8627ae99..5130cb7e3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9659,13 +9659,13 @@ window.details = {
     },
     1705: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2x",
-        special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
+        special: "Removes all positive buffs on your team. If the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
     },
     1706: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2.5x at the start of the chain, and boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
-        special: "Removes all positive buffs on your team. If the special is activated with more than ??% health remaining, protects from defeat for 1 turn",
+        special: "Removes all positive buffs on your team. If the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
         sailor: "Boosts HP, RCV, and ATK of all characters by 50",
         limit: "This unit has a Limit Break skill tree",
@@ -9819,13 +9819,13 @@ window.details = {
     },
     1732: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2x, boosts HP of Striker and Powerhouse characters by 1.1x",
-        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
         specialName: "Nekomamushi Special",
     },
     1733: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2.5x, boosts HP of Striker and Powerhouse characters by 1.25x",
-        special: "Deals 50x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
         specialName: "Nekomamushi Special",
     },
@@ -9916,12 +9916,12 @@ window.details = {
         limitNotes: "This will be updated soon"
     },
     1748: {//Boa Hancock
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting [TND] / [RCV] orbs",
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
     },
     1749: {//Boa Hancock
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Grealy reduces chances of getting [TND] / [RCV] orbs",
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
         limit: "This unit has a Limit Break skill tree",
@@ -10045,7 +10045,7 @@ window.details = {
         specialNotes: "#{orb : 1.75x}"
     },
     1772: {
-        captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in STR damage to all enemies at the end of each turn",
+        captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
         specialName: "Thrust Pad Cannon [Neo]",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{orb : 1.75x}"
diff --git a/common/data/gw.js b/common/data/gw.js
index d6e909672..c30077d02 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1738,16 +1738,16 @@ window.gw=[
     66025,
     66094,
     66094,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    66499,
+    66499,
+    66498,
+    66498,
+    66497,
+    66497,
+    66495,
+    66495,
+    66496,
+    66496,
     null,
     null,
     65830,

From c76eed8b4139735cab308c82d0e0dd0e135a7203 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 5 Sep 2017 00:04:16 -0400
Subject: [PATCH 1322/1569] Lonz
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

because Bandai… -.-
---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 81e7179cc..357cb0b2d 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1415,7 +1415,7 @@ window.aliases = {
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
     1415: ['センゴク 智将', '', ''],
     1416: ['仏のセンゴク 智将', '', ''],
-    1417: ['ロンズ', '', ''],
+    1417: ['ロンズ', '', 'Lonz'],
     1418: ['カイゼルヒゲ', '', 'Kaiser Mustache'],
     1419: ['ロブ・ルッチ 紋付袴の手招き', '', 'Kimono Lucci'],
     1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci'],

From d5b25ca3c879a2e155bf8fec63a668ebe1ee384b Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 5 Sep 2017 23:11:46 -0400
Subject: [PATCH 1323/1569] Fortnight

---
 common/data/aliases.js    |  8 +++---
 common/data/captains.js   | 40 ++++++++++++++++-----------
 common/data/cooldowns.js  | 12 ++++----
 common/data/details.js    | 58 ++++++++++++++++++++++++++-------------
 common/data/drops.js      |  7 +++++
 common/data/evolutions.js | 20 ++++++++------
 common/data/families.js   | 12 ++++----
 common/data/gw.js         |  8 +++---
 common/data/specials.js   | 22 +++++++++++----
 common/data/units.js      | 38 ++++++++++++-------------
 damage/js/cruncher.js     |  4 +--
 damage/js/utils.js        |  2 +-
 12 files changed, 140 insertions(+), 91 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 357cb0b2d..fdd167681 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1744,10 +1744,10 @@ window.aliases = {
     1743: ['', '', ''],
     1744: ['', '', ''],
     1745: ['', '', ''],
-    1746: ['', '', ''],
-    1747: ['', '', ''],
-    1748: ['', '', 'Korea Boa'],
-    1749: ['', '', 'Korea Boa'],
+    1746: ['', '', 'Korea Boa'],
+    1747: ['', '', 'Korea Boa'],
+    1748: ['', '', ''],
+    1749: ['', '', ''],
     1750: ['', '', 'Korea Law'],
     1751: ['', '', 'Korea Law'],
     1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 4ab3d38a4..4a607ecb0 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5293,14 +5293,6 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1746: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
-    },
-    1747: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
-    },
-    1748: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
@@ -5309,7 +5301,7 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    1749: {
+    1747: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
@@ -5318,6 +5310,14 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
+    1748: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
+    1749: {
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+    },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
@@ -5363,13 +5363,21 @@ window.captains = {
         },
         hp: function(p) { return 1.25; }
     },
-    1769: {///Change for unevolved
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Cerebral") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 2.5;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    1765: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+    },
+    1766: {
+        chainModifier: function(p) { return 1.5; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+    },
+    1767: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+    },
+    1767: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; },
+    },
+    1769: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
     1770: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6624a45be..e2b33e850 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1744,10 +1744,10 @@ window.cooldowns = [
     [ 19, 14 ],
     [ 19, 14 ],
     [ 19, 14 ],
-    [ 18, 11 ],
-    [ 18, 11 ],
     [ 20, 15 ],
     [ 20, 15 ],
+    [ 18, 11 ],
+    [ 18, 11 ],
     [ 20, 15 ],
     [ 20, 15 ],
     [ 18, 14 ],
@@ -1763,10 +1763,10 @@ window.cooldowns = [
     null,
     null,
     [ 19, 13 ],
-    null,
-    null,
-    null,
-    null,
+    [ 17, 11 ],
+    [ 17, 11 ],
+    [ 18, 12 ],
+    [ 20, 14 ],
     [ 13, 9 ],
     [ 13, 9 ],
     [ 23, 14 ],
diff --git a/common/data/details.js b/common/data/details.js
index 5130cb7e3..4d0a1eb09 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9278,7 +9278,7 @@ window.details = {
     },
     1650: {//Brook x5
         captain: "Boosts RCV of [DEX] characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
-        special: "Changes [BLOCK], [TND], [EMPTY], and [BOMB] orbs into [DEX] orbs and amplifies the effect of orbs by 1.5x for 1 turns",
+        special: "Changes [BLOCK], [TND], [EMPTY], and [BOMB] orbs into [DEX] orbs and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Eyes Blinded by True Beauty",
     },
     1651: {//Nekomamushi
@@ -9674,7 +9674,7 @@ window.details = {
     1707: {//Shanks 6+
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
         captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
-        special: "Deals 75x character's ATK in typeless damage to one enemy, reduces the defense of all enemies by 100% for 1 turns and changes all orbs to [PSY] orbs",
+        special: "Deals 75x character's ATK in typeless damage to one enemy, reduces the defense of all enemies by 100% for 1 turn and changes all orbs to [PSY] orbs",
         specialName: "One-Armed Man that Splits the Heavens",
     },
     1708: {//Summer Nami
@@ -9901,13 +9901,25 @@ window.details = {
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
-    1746: {//Bepo
+    1746: {//Boa Hancock
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
+        special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
+        specialName: "Pistol Kisses",
+    },
+    1747: {//Boa Hancock
+        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
+        special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
+        specialName: "Pistol Kisses",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
+    },
+    1748: {//Bepo
         captain: "Boosts ATK and HP of QCK characters by 1.5x",
         special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
         sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
         specialName: "Bear Rush Out",
     },
-    1747: {//Bepo
+    1749: {//Bepo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK and HP of QCK characters by 2x",
         special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
         sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
@@ -9915,18 +9927,6 @@ window.details = {
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
-    1748: {//Boa Hancock
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
-        special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
-        specialName: "Pistol Kisses",
-    },
-    1749: {//Boa Hancock
-        captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
-        special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
-        specialName: "Pistol Kisses",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
-    },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
         special: [
@@ -10026,8 +10026,28 @@ window.details = {
         specialNotes: "#{ignoreBarrier}",
         specialName: "Determined Man's Ice Attack",
     },
+    1765: {//Blue Gilly
+        captain: "Boosts ATK of Fighter characters by 1.5x",
+        special: "Deals 10 hits of 5x character's ATK in typeless damage to random enemies, reduces the defense of all enemies by 50% for 1 turn, randomizes non-matching orbs, including [BLOCK] orbs",
+        specialName: "Jao Kun Do Consecutive Thrusting Kick",
+    },
+    1766: {//Blue Gilly
+        captain: "Boosts chain multiplier by 1.5x and boosts ATK of Fighter characters by 1.5x",
+        special: "Deals 10 hits of 5x character's ATK in typeless damage to random enemies, reduces the defense of all enemies by 50% for 1 turn, randomizes non-matching orbs, including [BLOCK] orbs",
+        specialName: "Jao Kun Do Consecutive Thrusting Kick",
+    },
+    1767: {//Funk Bros
+        captain: "Boosts ATK of Fighter characters by 1.75x",
+        special: "Delays all enemies for 1 turn, following the activation of the special, if every unit scores a Great hit, boosts ATK of Fighter characters by 1.5x in the following turn",
+        specialName: "Prideless Surprise Attack",
+    },
+    1768: {//Abdullah and Jeet
+        captain: "Boosts ATK of Striker and Slasher characters by 1.5x",
+        special: "At the end of the turn, cuts the current HP of each enemy by 10% for 2 turns",
+        specialName: "Nasty Final Blow",
+    },
     1769: {//Ben Beckman
-        captain: "Boosts ATK of Cerebral characters by ???x",
+        captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Delays all enemies for 1 turn. If your captain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
         specialName: "Restraining Gunpoint",
     },
@@ -10038,13 +10058,13 @@ window.details = {
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
-    1771: {
+    1771: {//Kuma
         captain: "Boosts ATK and HP of Cerebral characters by 2x",
         specialName: "Thrust Pad Cannon [Neo]",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{orb : 1.75x}"
     },
-    1772: {
+    1772: {//Kuma
         captain: "Boosts ATK and HP of Cerebral characters by 2x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
         specialName: "Thrust Pad Cannon [Neo]",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
diff --git a/common/data/drops.js b/common/data/drops.js
index 083f58590..1426dc9f5 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1635,6 +1635,13 @@ window.drops = {
             'All Difficulties': [ 1734, 1736, -1571, -1573, -1654, -641, -1182, -1188, -1210, -556, -964, -1354 ]
         },
         
+        {
+            name: 'Battle Royale!',
+            thumb: 1776,
+            gamewith: 67118,
+            'All Difficulties': [ 1765, 1767, 1768, -1192, -1764, -520, -1115, -1184, -1190, -554, -1175, -1612, -1614, -1353, -1393 ]
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index dceabaf77..40c0e21a8 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2685,7 +2685,7 @@ window.evolutions = {
     },
     1732: {
         evolution: 1733,
-        evolvers: [  ]
+        evolvers: [ 118, 95, 1180, 300, 100 ]
     },
     1734: {
         evolution: 1735,
@@ -2701,23 +2701,23 @@ window.evolutions = {
     },
     1740: {
         evolution: 1741,
-        evolvers: [  ]
+        evolvers: [ 117, 86, 1180, 302, 102 ]
     },
     1742: {
         evolution: 1743,
-        evolvers: [  ]
+        evolvers: [ 117, 84, 1180, 300, 100 ]
     },
     1744: {
         evolution: 1745,
-        evolvers: [  ]
+        evolvers: [ 83, 88, 94, 99, 104 ]
     },
     1746: {
         evolution: 1747,
-        evolvers: [  ]
+        evolvers: [ 118, 266, 94, 98, 267 ]
     },
     1748: {
         evolution: 1749,
-        evolvers: [  ]
+        evolvers: [ 83, 85, 94, 96, 101 ]
     },
     1750: {
         evolution: 1751,
@@ -2745,11 +2745,15 @@ window.evolutions = {
     },
     1192: {
         evolution: 1764,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 301, 267 ]
+    },
+    1765: {
+        evolution: 1766,
+        evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1769: {
         evolution: 1770,
-        evolvers: [  ]
+        evolvers: [ 118, 88, 99, 304, 104 ]
     },
     1771: {
         evolution: 1772,
diff --git a/common/data/families.js b/common/data/families.js
index ac5ad4557..be1643ac5 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1744,10 +1744,10 @@ window.families = [
     "Boa Marigold",
     "Marguerite",
     "Marguerite",
-    "Bepo",
-    "Bepo",
     "Boa Hancock",
     "Boa Hancock",
+    "Bepo",
+    "Bepo",
     "Trafalgar Law",
     "Trafalgar Law",
     "Roronoa Zoro",
@@ -1763,10 +1763,10 @@ window.families = [
     null,
     null,
     "Aokiji",
-    null,
-    null,
-    null,
-    null,
+    "Blue Gilly",
+    "Blue Gilly",
+    "Funk Brothers",
+    "Abdullah and Jeet",
     "Ben Beckman",
     "Ben Beckman",
     "Bartholomew Kuma",
diff --git a/common/data/gw.js b/common/data/gw.js
index c30077d02..1f08c35f9 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1763,10 +1763,10 @@ window.gw=[
     null,
     null,
     35281,
-    null,
-    null,
-    null,
-    null,
+    67113,
+    67113,
+    67114,
+    67115,
     66691,
     66691,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 669c43dd9..569548f0f 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3441,24 +3441,24 @@ window.specials = {
     1745: {
         orb: function(p) { return (p.unit.class.has("Shooter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1748: {
+    1746: {
         delay: function(p) { return 1; },
         turnedOn: false,
         onActivation: function(p) {
-            window.specials[1748].turnedOn = true;
+            window.specials[1746].turnedOn = true;
         },
         onDeactivation: function(p) {
-            window.specials[1748].turnedOn = false;
+            window.specials[1746].turnedOn = false;
         }
     },
-    1749: {
+    1747: {
         delay: function(p) { return 1; },
         turnedOn: false,
         onActivation: function(p) {
-            window.specials[1749].turnedOn = true;
+            window.specials[1747].turnedOn = true;
         },
         onDeactivation: function(p) {
-            window.specials[1749].turnedOn = false;
+            window.specials[1747].turnedOn = false;
         }
     },
     1750:{
@@ -3526,6 +3526,16 @@ window.specials = {
             return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
+    1765: {
+        def: function(p) { return .5; },
+    },
+    1766: {
+        def: function(p) { return .5; },
+    },
+    1767: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1},
+        type: "class"
+    },
     1769: {
         atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
         type: "condition",
diff --git a/common/data/units.js b/common/data/units.js
index d410ca89e..05a755f4c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1730,24 +1730,24 @@ window.units = [
     [ "Tashigi, Holiday Captain-chan", "STR", [ "Slasher", "Cerebral" ], 5, 20, 4, 3, 99, 4000000, 813, 400, 151, 1770, 1090, 357, 1 ],
     [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, 1 ],
     [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, 1 ],
-    [ "Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 70, 1066998, 563, 292, 38, 1285, 747, 205, null ],
-    [ "'Ruler of Night' Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1200, 678, 149, 2440, 1375, 315, null ],
+    [ "Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 70, 1066998, 563, 292, 38, 1285, 747, 205, 1 ],
+    [ "'Ruler of Night' Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1200, 678, 149, 2440, 1375, 315, 1 ],
     [ "Sugar, Hobby Hobby Fruit Ability User", "STR", [ "Cerebral", "Fighter" ], 3, 13, 4, 2, 50, 392109, 150, 102, 30, 646, 367, 220, 1 ],
     [ "Sugar, Trebol Army Special Executive", "STR", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 597, 311, 203, 1830, 975, 320, 1 ],
     [ "Trebol, Sticky Sticky Fruit Ability User", "INT", [ "Cerebral", "Driven" ], 3, 13, 5, 2, 50, 392109, 230, 156, 9, 1020, 519, 107, 1 ],
     [ "Trebol, Donquiote Family Elite Executive", "INT", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 99, 3000000, 975, 476, 97, 2540, 1220, 120, 1 ],
     [ "Bellamy the Hyena [Neo], Former Captain of the Bellamy Pirates", "STR", [ "Fighter", "Driven" ], 4, 30, 4, 1, 70, 1066998, 173, 125, 31, 977, 711, 194, 1 ],
     [ "Bellamy the Hyena [Neo], Bullet of Dressrosa", "STR", [ "Fighter", "Driven" ], 5, 50, 4, 3, 99, 5000000, 893, 634, 149, 2014, 1320, 308, 1 ],
-    [ "Boa Sandersonia, Strawhat Luffy's Cooperator", "DEX", [ "Striker", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Boa Sandersonia, Strawhat Luffy's Accomplice", "DEX", [ "Striker", "Powerhouse" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2503, 1267, 320, null ],
-    [ "Boa Marigold, Strawhat Luffy's Cooperator", "STR", [ "Striker", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Boa Marigold, Strawhat Luffy's Accomplice", "STR", [ "Striker", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1, 1, 1, 2520, 1319, 294, null ],
-    [ "Marguerite, Strawhat Luffy's Cooperator", "INT", "Shooter", 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Marguerite, Strawhat Luffy's Accomplice", "INT", "Shooter", 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2062, 1063, 450, null ],
-    [ "Bepo, Strawhat Luffy's Cooperator", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Bepo, Strawhat Luffy's Accomplice", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2357, 1129, 384, null ],
-    [ "Boa Hancock, Strawhat Luffy's Cooperator", "PSY", [ "Shooter", "Fighter" ], 5, 30, 4, 3, 70, 1066998, 294, 255, 77, 1326, 790, 189, null ],
-    [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, null ],
+    [ "Boa Sandersonia, Strawhat Luffy's Cooperator", "DEX", [ "Striker", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 187, 118, 30, 1148, 531, 169, 1 ],
+    [ "Boa Sandersonia, Strawhat Luffy's Accomplice", "DEX", [ "Striker", "Powerhouse" ], 5, 30, 7, 4, 99, 4000000, 1085, 459, 126, 2503, 1267, 320, 1 ],
+    [ "Boa Marigold, Strawhat Luffy's Cooperator", "STR", [ "Striker", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 190, 126, 25, 1155, 556, 147, 1 ],
+    [ "Boa Marigold, Strawhat Luffy's Accomplice", "STR", [ "Striker", "Powerhouse" ], 5, 30, 5, 4, 99, 4000000, 1091, 477, 103, 2520, 1319, 294, 1 ],
+    [ "Marguerite, Strawhat Luffy's Cooperator", "INT", "Shooter", 4, 15, 5, 3, 50, 392109, 144, 94, 41, 1031, 488, 203, 1 ],
+    [ "Marguerite, Strawhat Luffy's Accomplice", "INT", "Shooter", 5, 30, 4, 4, 99, 4000000, 974, 434, 162, 2062, 1063, 450, 1 ],
+    [ "Boa Hancock, Strawhat Luffy's Cooperator", "PSY", [ "Shooter", "Fighter" ], 5, 30, 4, 3, 70, 1066998, 294, 255, 77, 1326, 790, 189, 1 ],
+    [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, 1 ],
+    [ "Bepo, Strawhat Luffy's Cooperator", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 169, 108, 33, 1100, 501, 191, 1 ],
+    [ "Bepo, Strawhat Luffy's Accomplice", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1054, 446, 151, 2357, 1129, 384, 1 ],
     [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
     [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
     [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 669, 404, 32, 1240, 710, 159, 1 ],
@@ -1762,13 +1762,13 @@ window.units = [
     [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1, 1, 1, 3478, 1501, 420, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ben Beckman, Red Hair Pirates", "INT", [ "Cerebral", "Striker" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2295, 1384, 367, null ],
+    [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1558, 751, 198, 3478, 1501, 420, 1 ],
+    [ "Longleg Blue Gilly", "DEX", [ "Fighter", "Free Spirit" ], 3, 13, 6, 1, 50, 392109, 120, 98, 17, 1110, 585, 90, 1 ],
+    [ "Longleg Blue Gilly, Jao Kun Do Martial Artist", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 972, 480, 88, 2208, 1185, 187, 1 ],
+    [ "Assassin Funk Brothers", "QCK", [ "Fighter", "Driven" ], 3, 15, 5, 2, 70, 1066998, 134, 68, 43, 1204, 964, 118, 1 ],
+    [ "Abdullah & Jeet, Vicious Criminals", "STR", [ "Slasher", "Striker" ], 3, 15, 7, 2, 70, 1066998, 152, 53, 41, 1452, 888, 102, 1 ],
+    [ "Ben Beckman, Red Hair Pirates First Mate", "INT", [ "Cerebral", "Striker" ], 4, 20, 6, 3, 70, 1066998, 129, 120, 38, 1190, 735, 209, 1 ],
+    [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, null, null, null, 3070, 1445, 90, null ],
     ];
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 88ff3ac5f..71cc9613a 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -192,11 +192,11 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Fighter")) orb = (window.specials[1593].turnedOn || window.specials[1463]. turnedOn || window.specials[1462]. turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Powerhouse")) orb = (window.specials[1528].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Free Spirit")) orb = (window.specials[1593].turnedOn) ? 2 : 0.5;
-            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn || window.specials[1748].turnedOn || window.specials[1749].turnedOn) ? 2 : 0.5;
+            if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Shooter")) orb = (window.specials[1640].turnedOn || window.specials[1746].turnedOn || window.specials[1747].turnedOn) ? 2 : 0.5;
             if (orb == 0.5 && x.unit.type == 'DEX' && x.unit.class.has("Striker")) orb = (window.specials[1651].turnedOn || window.specials[1652].turnedOn) ? 2 : 0.5;
             if (orb == 'str') orb = (window.specials[1221].turnedOn || window.specials[1222].turnedOn 
                                  || (window.specials[1259].turnedOn && x.unit.class.has("Driven")) || (window.specials[1260].turnedOn && x.unit.class.has("Driven")) 
-                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1528].turnedOn && x.unit.class.has("Powerhouse")) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit"))) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")) || ((window.specials[1748].turnedOn || window.specials[1749].turnedOn) && x.unit.class.has("Shooter"))) ? 2 : 1;
+                                 || (window.specials[1323].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1324].turnedOn && (x.unit.class.has("Driven") || x.unit.class.has("Slasher"))) || (window.specials[1528].turnedOn && x.unit.class.has("Powerhouse")) || (window.specials[1593].turnedOn && (x.unit.class.has("Fighter") || x.unit.class.has("Free Spirit"))) || (window.specials[1640].turnedOn && x.unit.class.has("Shooter")) || ((window.specials[1651].turnedOn || window.specials[1652].turnedOn) && x.unit.class.has("Striker")) || ((window.specials[1746].turnedOn || window.specials[1747].turnedOn) && x.unit.class.has("Shooter"))) ? 2 : 1;
             
             if (orb == 0.5) orb = (window.specials[1269].turnedOn || window.specials[1270].turnedOn || window.specials[1330].turnedOn || window.specials[1546].turnedOn || window.specials[1547].turnedOn || window.specials[1557].turnedOn) ? 1 : .5;
             
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 3efad4bb1..1685be12f 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -153,7 +153,7 @@ window.CrunchUtils.getOrbMultiplier = function(orb, type, uclass, baseMultiplier
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;
         }
     }
-    if(window.specials[1748].turnedOn || window.specials[1749].turnedOn){
+    if(window.specials[1746].turnedOn || window.specials[1747].turnedOn){
         if(uclass.has("Shooter")){
             if (orb == 'str') return boostedMultiplier;
             if (orb == 0.5 && type == 'DEX') return boostedMultiplier;

From 4f4eebd45035a8f8a3204192caff0e5dc344d332 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 6 Sep 2017 12:46:02 -0400
Subject: [PATCH 1324/1569] Momo and TSL

---
 common/data/aliases.js | 4 ++--
 common/data/details.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index fdd167681..99573c003 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1401,8 +1401,8 @@ window.aliases = {
     1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius'],
     1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius'],
     1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton'],
-    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy'],
-    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy'],
+    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
+    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
     1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
     1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
     1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin', 'Timeskip Robin', 'TS Robin'],
diff --git a/common/data/details.js b/common/data/details.js
index 4d0a1eb09..158009fcd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8794,7 +8794,7 @@ window.details = {
         specialName: "Flaming Flash",
     },
     1578: {//Momonosuke
-        captain: "Protects from defeat as long as HP is above ???%",
+        captain: "Protects from defeat as long as HP is above 50%",
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",
@@ -8814,7 +8814,7 @@ window.details = {
         specialName: "Miraculous Flying Dragon",
     },
     1579: {//Momonosuke
-        captain: "Boosts ATK, HP and RCV of all characters by 1.25x, protects from defeat as long as HP is above 30%",
+        captain: "Boosts ATK, HP and RCV of all characters by 1.25x, protects from defeat as long as HP is above 50%",
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",

From 6fd82a8a7ae32d82d9ccf1e3a65bc06c63d706e3 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 7 Sep 2017 00:23:22 -0400
Subject: [PATCH 1325/1569] Benn

---
 common/data/specials.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 569548f0f..1cea80e79 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3537,10 +3537,12 @@ window.specials = {
         type: "class"
     },
     1769: {
+        delay: function(p) { return 1; },
         atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
         type: "condition",
     },
     1770: {
+        delay: function(p) { return 1; },
         atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
         type: "condition",
     },

From a9bf466ee567d5f6ec49ca9289d35f12cad4a167 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 7 Sep 2017 03:19:36 -0400
Subject: [PATCH 1326/1569] Kachow

---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 99573c003..ff39ce379 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1601,7 +1601,7 @@ window.aliases = {
     1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy'],
     1601: ['シリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
     1602: ['雨のシリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
-    1603: ['雷卿マクガイ', '', 'Coliseum McGuy'],
+    1603: ['雷卿マクガイ', '', 'Coliseum McGuy', 'Lightning McGuy'],
     1604: ['ポートガス・D・エース ルフィの“兄”', '', '0 Stamina Ace'],
     1605: ['ポートガス・D・エース 白ひげの“息子”', '', '0 Stamina Ace'],
     1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet'],

From 913f26b5fb7896c0c3aac6421b679869e299dc61 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 7 Sep 2017 03:31:19 -0400
Subject: [PATCH 1327/1569] Trebol

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index e2b33e850..35a3f0090 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1734,8 +1734,8 @@ window.cooldowns = [
     [ 21, 9 ],
     [ 13, 6 ],
     [ 13, 6 ],
-    [ 22, 14 ],
-    [ 22, 14 ],
+    [ 19, 12 ],
+    [ 19, 12 ],
     [ 22, 14 ],
     [ 22, 14 ],
     [ 19, 14 ],

From 1510435ee1fd193db72b6adb4af0a03fa8110cc7 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 7 Sep 2017 03:42:36 -0400
Subject: [PATCH 1328/1569] Kuma

---
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 40c0e21a8..7bb2b417a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2757,6 +2757,6 @@ window.evolutions = {
     },
     1771: {
         evolution: 1772,
-        evolvers: [  ]
+        evolvers: [ 118, 88, 266, 304, 104 ]
     },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 05a755f4c..869039491 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1769,8 +1769,8 @@ window.units = [
     [ "Abdullah & Jeet, Vicious Criminals", "STR", [ "Slasher", "Striker" ], 3, 15, 7, 2, 70, 1066998, 152, 53, 41, 1452, 888, 102, 1 ],
     [ "Ben Beckman, Red Hair Pirates First Mate", "INT", [ "Cerebral", "Striker" ], 4, 20, 6, 3, 70, 1066998, 129, 120, 38, 1190, 735, 209, 1 ],
     [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
-    [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 3, 99, 5000000, null, null, null, 3070, 1445, 90, null ],
+    [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, null ],
+    [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From e1eb518667bbc7ca5c627aa489e850bcb540a149 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 7 Sep 2017 11:57:41 -0400
Subject: [PATCH 1329/1569] Dalton

fix
---
 common/data/specials.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 1cea80e79..a10c044d2 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -2271,11 +2271,12 @@ window.specials = {
     },
     1402: {
         atk: function(p) { return p.unit.type == "PSY" ? window.specials[1402].multiplier : 1; },
+        type: "type",
         onActivation: function(p) {
             var n = (window.specials[1402].multiplier == 1.3 ? 1 : 0);
             window.specials[1402].multiplier = [1.3, 1.5][n];
             p.scope.notify({
-                text: 'Using the ' + [1.3, 1.5][n] + 'x Affinity boost. To switch to the ' + [1.5, 1.3][n] + 'x Affinity boost, disable and re-enable this special',
+                text: 'Using the ' + [1.3, 1.5][n] + 'x Type boost. To switch to the ' + [1.5, 1.3][n] + 'x Type boost, disable and re-enable this special',
                 name: '1402warning'
             });
         },

From 43ff6264bb391acb72aa88d791906e197ec887a2 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 8 Sep 2017 15:16:24 -0400
Subject: [PATCH 1330/1569] Lucci

---
 common/data/aliases.js    |  4 +--
 common/data/captains.js   | 20 +++++++++++
 common/data/cooldowns.js  |  4 +--
 common/data/details.js    | 74 +++++++++++++++++++++++----------------
 common/data/evolutions.js |  4 +++
 common/data/families.js   |  4 +--
 common/data/flags.js      |  2 ++
 common/data/specials.js   |  6 ++++
 common/data/units.js      |  4 +--
 9 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ff39ce379..2cd278892 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1760,8 +1760,8 @@ window.aliases = {
     1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook'],
     1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper'],
     1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper'],
-    1762: ['', '', ''],
-    1763: ['', '', ''],
+    1762: ['', '', 'Rob Lucci'],
+    1763: ['', '', 'Rob Lucci'],
     1764: ['', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
     1765: ['', '', ''],
     1766: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 4a607ecb0..934bfe110 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5357,6 +5357,26 @@ window.captains = {
     1761: {
         atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
     },
+    1762: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4.026275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.66025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.3275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 3.025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.75 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        rcv: function(p) { return 0.5; },
+    },
+    1763: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4.026275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.66025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.3275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 3.025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.75 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        rcv: function(p) { return 0.5; },
+    },
     1764: {
         atk: function(p) {
             return Math.min(3.5, 2.25 + 0.25 * p.turnCounter);
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 35a3f0090..5131aee5e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1760,8 +1760,8 @@ window.cooldowns = [
     [ 11, 7 ],
     [ 13, 9 ],
     [ 13, 9 ],
-    null,
-    null,
+    20,
+    20,
     [ 19, 13 ],
     [ 17, 11 ],
     [ 17, 11 ],
diff --git a/common/data/details.js b/common/data/details.js
index 158009fcd..8f2ac9387 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -5059,7 +5059,7 @@ window.details = {
         specialName: "Hitting Size"
     },
     1044: {
-        captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
+        captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect in a row and by 4x after the 5th Perfect in a row.",
         specialName: "Gamma Knife",
         special: [
             {
@@ -5074,7 +5074,7 @@ window.details = {
         specialNotes: "#{stages}"
     },
     1045: {
-        captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect and by 4x after the 5th Perfect.",
+        captain: "Boosts ATK of Slasher and Free Spirit characters by 2x at the start of the chain, by 3x after the 3rd Perfect in a row and by 4x after the 5th Perfect in a row.",
         specialName: "Gamma Knife",
         special: [
             {
@@ -5332,7 +5332,7 @@ window.details = {
         specialName: "Drill Dragon: Drill Nail"
     },
     1083: {
-        captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect",
+        captain: "Boosts ATK of Striker and Fighter characters by 1.5x at the start of the chain, and by 3x after the 3rd Perfect in a row",
         special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
         specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
         specialName: "Drill Dragon: Drill Nail",
@@ -5409,12 +5409,12 @@ window.details = {
         specialName: "Mass Juggling"
     },
     1096: {
-        captain: "Boosts ATK of Powerhouse characters by 3x after the 5th Perfect.",
+        captain: "Boosts ATK of Powerhouse characters by 3x after the 5th Perfect in a row.",
         special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
         specialName: "Crash Drumming"
     },
     1097: {
-        captain: "Boosts ATK of Powerhouse characters by 3.5x after the 5th Perfect.",
+        captain: "Boosts ATK of Powerhouse characters by 3.5x after the 5th Perfect in a row.",
         special: "Deals [INT] damage to one enemy. Boosts own ATK by 1.75x for 1 turn.",
         specialName: "Crash Drumming"
     },
@@ -6174,24 +6174,24 @@ window.details = {
         special: "Recovers 10x character's RCV in HP. For 4 turns, makes [BOMB] orbs \"beneficial\"",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function."
     },
-    1215: { //Gairam
+    1215: {//Gairam
         captain: "Boosts ATK by 2.5x following a chain of [QCK] > [PSY] > [DEX] attacks no lower than Good",
         special: "Deals 5 hits of 2,000 fixed damage to random enemies and reduces any damage received above 5,000 HP by 80% for 1 turn",
         specialNotes: "#{randomHits : 5}",
         specialName: "Totem Cube"
     },
-    1216: { //sebastian
+    1216: {//Sebastian
         captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage received based on current HP by up to 20%",
         captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
         special: "Reduces damage received by 50% for 1 turn, and changes own orb into [QCK]",
         specialName: "Camouflage Air",
     },
-    1217: { //nightin
+    1217: {//Nightin
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Paralysis and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
         specialName: "Catepillar Soul Shot",
     },
-    1218: {//hancock
+    1218: {//Hancock
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
         special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
         specialName: "Everybody Confusing Fragrance",
@@ -6733,7 +6733,7 @@ window.details = {
         specialName: "Wild Hunt",
     },
     1285: {//Wild Luffy Evolved
-        captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. After scoring 3 Perfects in a row, boosts ATK of Striker characters by 3.375x instead.",
+        captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. Boosts ATK of Striker characters by 3.375x after scoring 3 Perfects in a row.",
         special: "Reduces Bind and Silence duration by 3 turns. Randomizes non-matching orbs including [BLOCK] orbs",
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this character by 3 turns",
@@ -6917,7 +6917,7 @@ window.details = {
         limitNotes: "This will be updated soon"
     },
     1315: {//Coby
-        captain: "Boosts ATK by 2x after the 2nd Perfect and by 3x after the 5th Perfect.",
+        captain: "Boosts ATK of all characters by 2x after the 2nd Perfect in a row and by 3x after the 5th Perfect in a row.",
         special: [
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
@@ -6937,7 +6937,7 @@ window.details = {
         specialName: "Echoing Cry of the Soul",
     },
     1316: {//Coby
-        captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
+        captain: "Boosts ATK of all characters by 2.5x after the 2nd Perfect in a row and by 3.5x after the 5th Perfect in a row.",
         special: [
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
@@ -7218,7 +7218,7 @@ window.details = {
         specialName: "Covering Fire",
     },
     1352: {//Ivankov
-        captain: "Boosts ATK of Fighter characters by 2x, boosts Atk of Fighter characters by 3.5x after the 5th Perfect",
+        captain: "Boosts ATK of Fighter characters by 2x at the start of the chain, boosts Atk of Fighter characters by 3.5x after the 5th Perfect in a row",
         special: "Following the activation of the special, if every unit scores a Perfect hit, reduces damage received by 90% in the following turn",
         specialName: "Rolling Beauty",
     },
@@ -7379,14 +7379,14 @@ window.details = {
         specialName: "Kakuho: Elf",
     },
     1371: {//Wild Zoro
-        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 2nd Perfect and by 2.5x after the 4th Perfect.",
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 2nd Perfect in a row and by 2.5x after the 4th Perfect in a row.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
         specialName: "Wild Plan",
     },
     1372: {//Wild Zoro
-        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 2nd Perfect and by 3x after the 4th Perfect.",
+        captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 2nd Perfect in a row and by 3x after the 4th Perfect in a row.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
@@ -7495,7 +7495,7 @@ window.details = {
         specialName: "Mother's Promise",
     },
     1387: {//Luffy 5+
-        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. Boosts ATK by 2.8125x after scoring 4 Perfects in a row",
+        captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x, boosts ATK by 2.8125x after scoring 4 Perfects in a row",
         special: "Deals 40x character's ATK in [STR] damage to all enemies, and delays all enemies for 1 turn",
         specialName: "Gum Gum: Elephant Gun",
         limit: "This unit has a Limit Break skill tree",
@@ -7884,12 +7884,14 @@ window.details = {
     1441: {//Zeo
         captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
+        specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
     },
     1442: {//Zeo
         captain: "Boosts ATK of [INT] characters by 2.25x and reduces damage received by 20%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
+        specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
     },
@@ -8020,7 +8022,7 @@ window.details = {
         specialName: "Crescendo Stone",
     },
     1461: {//Snow Zoro
-        captain: "Boosts ATK of [QCK] characters by 2x at the start of the chain, by 2.6x after the 3rd Perfect.",
+        captain: "Boosts ATK of [QCK] characters by 2x at the start of the chain, by 2.6x after the 3rd Perfect in a row.",
         special: "Deals 11x character's ATK in [QCK] damage to one enemy, boosts ATK of [QCK] characters by 1.5x for 1 turn",
         specialName: "Demoltion: Ice Crush",
     },
@@ -8167,7 +8169,7 @@ window.details = {
         specialName: "Stalking Rose Axe",
     },
     1481: {//Vander Decken IX
-        captain: "Boosts ATK by 2.5x after the 2nd Perfect and by 3.5x after the 5th Perfect.",
+        captain: "Boosts ATK by 2.5x after the 2nd Perfect in a row and by 3.5x after the 5th Perfect in a row.",
         special: "Deals 200,000 fixed damage to one enemy that will ignore damage negating abilities and barriers, reduces Bind and Silence duration by 2 turns",
         specialNotes: "#{ignoreBarrier}<br>#{silence}",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
@@ -8520,13 +8522,13 @@ window.details = {
         limitNotes: "This will be updated soon"
     },
     1533: {//Rayleigh
-        captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect.",
+        captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect in a row.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
         specialName: "The Teacher's Final Ordeal",
     },
     1534: {//Rayleigh
-        captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect.",
+        captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect in a row.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
         specialName: "The Teacher's Final Ordeal",
@@ -8687,7 +8689,7 @@ window.details = {
         specialName: "Drugs From Heaven",
     },
     1563: {//Elizabello
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.75x at the start of the chain and by 2.1875x after the 5th Perfect",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 1.75x at the start of the chain and by 2.1875x after the 5th Perfect in a row",
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
@@ -8703,7 +8705,7 @@ window.details = {
         sailor: "Boosts own ATK by 350 if this character is the last in the chain to attack",
     },
     1564: {//Elizabello
-        captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect",
+        captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect in a row",
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
@@ -8962,7 +8964,7 @@ window.details = {
         sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
     },
     1602: {//Power Creep Shiryu
-        captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect",
+        captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect in a row",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
         specialName: "Blood Stained 'Iron Wall'",
         sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
@@ -9378,12 +9380,12 @@ window.details = {
     },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
-        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
+        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter character, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
     },
     1665: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
-        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
+        special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter character, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
@@ -9457,7 +9459,7 @@ window.details = {
         specialName: "ROOM: Kikoku",
     },
     1678: {//Log Law
-        captain: "Boosts ATK of Slasher characters by 2.5x at the start of the chain, by 3.25x after the 3rd Perfect",
+        captain: "Boosts ATK of Slasher characters by 2.5x at the start of the chain, by 3.25x after the 3rd Perfect in a row",
         special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
         specialName: "ROOM: Kikoku",
         limit: "This unit has a Limit Break skill tree",
@@ -9480,7 +9482,7 @@ window.details = {
         sailor: "Boosts HP and ATK of all characters by 56",
     },
     1682: {//20th Anni Luffy
-        captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect",
+        captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
         specialName: "Gomu Gomu no Tako Stamp",
         sailor: "Boosts HP and ATK of all characters by 56",
@@ -9674,7 +9676,7 @@ window.details = {
     1707: {//Shanks 6+
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
         captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
-        special: "Deals 75x character's ATK in typeless damage to one enemy, reduces the defense of all enemies by 100% for 1 turn and changes all orbs to [PSY] orbs",
+        special: "Reduces the defense of all enemies by 100% for 1 turn, deals 75x character's ATK in typeless damage to one enemy and changes all orbs to [PSY] orbs",
         specialName: "One-Armed Man that Splits the Heavens",
     },
     1708: {//Summer Nami
@@ -9959,13 +9961,13 @@ window.details = {
     },
     1752: {//20th Anni Zoro
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
-        special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
+        special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
         sailor: "Boosts ATK of Slasher characters by 50",
         specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
     1753: {//20th Anni Zoro
-        captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect",
-        special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters by 2x in the following turn.",
+        captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
+        special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
         sailor: "Boosts ATK of Slasher characters by 50",
         specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
@@ -10019,6 +10021,16 @@ window.details = {
         sailorNotes: "#{silence}<br>#{rewind : 2}",
         specialName: "Intelligent Monster",
     },
+    1762: {//Rob Lucci
+        captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
+        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs.",
+        specialName: "Flying Finger Gun: Fire Sting",
+    },
+    1763: {//Rob Lucci
+        captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
+        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs.",
+        specialName: "Flying Finger Gun: Fire Sting",
+    },
     1764: {//6+ Aokiji
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 5 times to a maximum of 3.5x.",
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 7bb2b417a..b4a02492f 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2743,6 +2743,10 @@ window.evolutions = {
         evolution: 1761,
         evolvers: [ 80, 86, 91, 97, 102 ]
     },
+    1762: {
+        evolution: 1763,
+        evolvers: [  ]
+    },
     1192: {
         evolution: 1764,
         evolvers: [ 118, 85, 301, 267 ]
diff --git a/common/data/families.js b/common/data/families.js
index be1643ac5..ece6f0683 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1760,8 +1760,8 @@ window.families = [
     "Brook",
     "Tony Tony Chopper",
     "Tony Tony Chopper",
-    null,
-    null,
+    "Rob Lucci",
+    "Rob Lucci",
     "Aokiji",
     "Blue Gilly",
     "Blue Gilly",
diff --git a/common/data/flags.js b/common/data/flags.js
index 6f064c351..3857a91c7 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1552,6 +1552,8 @@ window.flags = {
     1759: { rr: 1, rro: 1 },
     1760: { rr: 1, rro: 1 },
     1761: { rr: 1, rro: 1 },
+    1762: { rr: 1, rro: 1 },
+    1763: { rr: 1, rro: 1 },
     1764: { rr: 1, rro: 1 },
     1769: { rr: 1, rro: 1, lrr: 1 },
     1770: { rr: 1, rro: 1, lrr: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index a10c044d2..3bd261d59 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3520,6 +3520,12 @@ window.specials = {
     1759: {
         delay: function(p) { return 1; },
     },
+    1762: {
+        def: function(p) { return .2; },
+    },
+    1763: {
+        def: function(p) { return .2; },
+    },
     1764: {
         chain: function(p) { return 2.5; },
         chainLimiter: function(p) {
diff --git a/common/data/units.js b/common/data/units.js
index 869039491..2ebd22d0b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1760,8 +1760,8 @@ window.units = [
     [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, 1076, 569, 148, 2274, 1336, 333, 1 ],
     [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 644, 343, 44, 1184, 589, 240, 1 ],
     [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rob Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Human Beast Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3205, 1540, 323, null ],
     [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1558, 751, 198, 3478, 1501, 420, 1 ],
     [ "Longleg Blue Gilly", "DEX", [ "Fighter", "Free Spirit" ], 3, 13, 6, 1, 50, 392109, 120, 98, 17, 1110, 585, 90, 1 ],
     [ "Longleg Blue Gilly, Jao Kun Do Martial Artist", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 972, 480, 88, 2208, 1185, 187, 1 ],

From f66ecb00107db3a9dc2f224269aa01e869654354 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 8 Sep 2017 15:30:23 -0400
Subject: [PATCH 1331/1569] Forgot the heal

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 8f2ac9387..2499ebe2d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10023,12 +10023,12 @@ window.details = {
     },
     1762: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
-        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs.",
+        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
     },
     1763: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
-        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs.",
+        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
     },
     1764: {//6+ Aokiji

From a87ff5ffea14893a8e2454e875fe17d650e7c3b4 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 10 Sep 2017 12:39:39 -0400
Subject: [PATCH 1332/1569] Skulls

---
 characters/js/directives.js |  1 +
 common/data/evolutions.js   | 36 ++++++++++-----------
 common/js/utils.js          | 62 ++++++++++++++++++-------------------
 3 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 280e3af05..c392477f7 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -254,6 +254,7 @@ directives.evolution = function($state, $stateParams) {
         templateUrl: 'views/evolution.html',
         link: function(scope, element, attrs) {
             scope.goToState = function(id) {
+                if (!Number.isInteger(id)) return;
                 if (id == parseInt($stateParams.id,10)) return;
                 var previous = $stateParams.previous.concat([ $stateParams.id ]);
                 $state.go('main.search.view',{ id: id, previous: previous });
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index b4a02492f..bf4429b97 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2113,15 +2113,15 @@ window.evolutions = {
     },
     4: {
         evolution: 1387,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullLuffy', 267 ]
     },
     8: {
         evolution: 1388,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullZoro', 267 ]
     },
     12: {
         evolution: 1389,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullNami', 267 ]
     },
     1390: {
         evolution: 1391,
@@ -2165,7 +2165,7 @@ window.evolutions = {
     },
     261: {
         evolution: 1413,
-        evolvers: [ 118, 84, 300, 267 ]
+        evolvers: [ 'skullSTR', 118, 84, 300, 267 ]
     },
     1415: {
         evolution: 1416,
@@ -2217,19 +2217,19 @@ window.evolutions = {
     },
     416: {
         evolution: 1445,
-        evolvers: [ 118, 85, 301, 267 ]
+        evolvers: [ 'skullQCK', 118, 85, 301, 267 ]
     },
     16: {
         evolution: 1446,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullUsopp', 267 ]
     },
     20: {
         evolution: 1447,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullSanji', 267 ]
     },
     22: {
         evolution: 1448,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullChopper', 267 ]
     },
     1449: {
         evolution: 1450,
@@ -2313,7 +2313,7 @@ window.evolutions = {
     },
     669: {
         evolution: 1492,
-        evolvers: [ 118, 87, 303, 267 ]
+        evolvers: [ 'skullPSY', 118, 87, 303, 267 ]
     },
     1505: {
         evolution: [ 1506, 1562 ],
@@ -2377,7 +2377,7 @@ window.evolutions = {
     },
     1532: {
         evolution: 1543,
-        evolvers: [ 118, 86, 302, 267 ]
+        evolvers: [ 'skullDEX', 118, 86, 302, 267 ]
     },
     1544: {
         evolution: 1545,
@@ -2389,15 +2389,15 @@ window.evolutions = {
     },
     709: {
         evolution: 1549,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullRobin', 267 ]
     },
     739: {
         evolution: 1550,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullFranky', 267 ]
     },
     896: {
         evolution: 1551,
-        evolvers: [ 267 ]
+        evolvers: [ 'skullBrook', 267 ]
     },
     1552: {
         evolution: 1553,
@@ -2453,7 +2453,7 @@ window.evolutions = {
     },
     1404: {
         evolution: 1593,
-        evolvers: [ 98, 303, 267 ]
+        evolvers: [ 'skullQCK', 'skullPSY', 98, 303, 267 ]
     },
     1587: {
         evolution: 1588,
@@ -2505,7 +2505,7 @@ window.evolutions = {
     },
     367: {
         evolution: 1619,
-        evolvers: [ 118, 304, 99, 267 ]
+        evolvers: [ 'skullINT', 118, 304, 99, 267 ]
     },
     1620: {
         evolution: 1621,
@@ -2565,7 +2565,7 @@ window.evolutions = {
     },
     748: {
         evolution: 1663,
-        evolvers: [ 118, 95, 300, 267 ]
+        evolvers: [ 'skullSTR', 118, 95, 300, 267 ]
     },
     1664: {
         evolution: 1665,
@@ -2645,7 +2645,7 @@ window.evolutions = {
     },
     530: {
         evolution: 1707,
-        evolvers: [ 118, 98, 303, 267 ]
+        evolvers: [ 'skullPSY', 118, 98, 303, 267 ]
     },
     1708: {
         evolution: 1709,
@@ -2749,7 +2749,7 @@ window.evolutions = {
     },
     1192: {
         evolution: 1764,
-        evolvers: [ 118, 85, 301, 267 ]
+        evolvers: [ 'skullQCK', 118, 85, 301, 267 ]
     },
     1765: {
         evolution: 1766,
diff --git a/common/js/utils.js b/common/js/utils.js
index b8b49463d..aa6fc9571 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -81,47 +81,47 @@
     };
 
     utils.getThumbnailUrl = function (n) {
-        switch (id){
-            case id == 'skullLuffy':
+        switch (n){
+            case 'skullLuffy':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_luffy.png';
                 break;
-            case id == 'skullZoro':
+            case 'skullZoro':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_zoro.png';
                 break;
-            case id == 'skullNami':
+            case 'skullNami':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_nami.png';
                 break;
-            case id == 'skullUsopp':
+            case 'skullUsopp':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_usopp_f.png';
                 break;
-            case id == 'skullSanji':
+            case 'skullSanji':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_sanji_f.png';
                 break;
-            case id == 'skullChopper':
+            case 'skullChopper':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_chopper_f.png';
                 break;
-            case id == 'skullRobin':
+            case 'skullRobin':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_robin_f.png';
                 break;
-            case id == 'skullFranky':
+            case 'skullFranky':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_franky_f.png';
                 break;
-            case id == 'skullBrook':
+            case 'skullBrook':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/skull_brook_f.png';
                 break;
-            case id == 'skullSTR':
+            case 'skullSTR':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/red_skull_f.png';
                 break;
-            case id == 'skullQCK':
+            case 'skullQCK':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/blue_skull_f.png';
                 break;
-            case id == 'skullPSY':
+            case 'skullPSY':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/yellow_skull2_f.png';
                 break;
-            case id == 'skullDEX':
+            case 'skullDEX':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/green_skull2_f.png';
                 break;
-            case id == 'skullINT':
+            case 'skullINT':
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/black_skull_f.png';
                 break;
         }
@@ -134,48 +134,48 @@
     };
 
     utils.getBigThumbnailUrl = function (n) {
-        switch (id){
-            case id == 'skullLuffy':
+        switch (n){
+            case 'skullLuffy':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_luffy_c.png';
                 break;
-            case id == 'skullZoro':
+            case 'skullZoro':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_zoro_c.png';
                 break;
-            case id == 'skullNami':
+            case 'skullNami':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_nami_c.png';
                 break;
-            case id == 'skullUsopp':
+            case 'skullUsopp':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_usopp_c.png';
                 break;
-            case id == 'skullSanji':
+            case 'skullSanji':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_sanji_c.png';
                 break;
-            case id == 'skullChopper':
+            case 'skullChopper':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_chopper_c.png';
                 break;
-            case id == 'skullRobin':
+            case 'skullRobin':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_robin_c.png';
                 break;
-            case id == 'skullFranky':
+            case 'skullFranky':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_franky_c.png';
                 break;
-            case id == 'skullBrook':
+            case 'skullBrook':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/skull_brook_c.png';
                 break;
-            case id == 'skullSTR':
+            case 'skullSTR':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/red_skull_c.png';
                 break;
-            case id == 'skullQCK':
+            case 'skullQCK':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/blue_skull_c.png';
                 break;
-            case id == 'skullPSY':
+            case 'skullPSY':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/yellow_skull2_c.png';
                 break;
-            case id == 'skullDEX':
+            case 'skullDEX':
                 return 'http://onepiece-treasurecruise.com/wp-content/uploads/green_skull2_c.png';
                 break;
-            case id == 'skullINT':
-                return 'http://onepiece-treasurecruise.com/wp-content/uploads/black_skull2_c.png';
+            case 'skullINT':
+                return 'http://onepiece-treasurecruise.com/wp-content/uploads/black_skull_c.png';
                 break;
         }
         if (window.units[n - 1].incomplete)

From c59239019b549c3249f682907c7083bd9fac798f Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 10 Sep 2017 12:56:10 -0400
Subject: [PATCH 1333/1569] Skulls in Drops

---
 common/data/drops.js | 22 +++++++++++-----------
 common/js/utils.js   |  2 +-
 drops/index.html     |  5 +++++
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 1426dc9f5..2b5b82272 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -610,15 +610,15 @@ window.drops = {
             '03': [  ],
             '04': [ 1344 ],
             '05': [ 1345 ],
-            '06': [ 1346 ],
-            '07': [ 1347 ],
-            '08': [ 1348 ],
-            '09': [ 1349 ],
+            '06': [ 1346, 'skullUsopp' ],
+            '07': [ 1347, 'skullChopper' ],
+            '08': [ 1348, 'skullZoro' ],
+            '09': [ 1349, 'skullNami' ],
             '10': [  ],
-            '11': [ 1350 ],
-            '12': [ 1351 ],
-            '13': [ 1352 ],
-            '14': [ 1353 ],
+            '11': [ 1350, 'skullBrook' ],
+            '12': [ 1351, 'skullRobin' ],
+            '13': [ 1352, 'skullSanji' ],
+            '14': [ 1353, 'skullLuffy' ],
         },
         
         {
@@ -2074,7 +2074,7 @@ window.drops = {
             global: true,
             gamewith: 38237,
             condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard. Can drop a Super Evolution Skull.',
-            'All Difficulties': [ 1257 ]
+            'All Difficulties': [ 1257, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
         },
         
         {
@@ -2083,7 +2083,7 @@ window.drops = {
             global: true,
             gamewith: 46369,
             condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks. Can drop a Super Evolution Skull.',
-            'All Difficulties': [ 1379, 952, 776 ]
+            'All Difficulties': [ 1379, 952, 776, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
         },
         
         {
@@ -2091,7 +2091,7 @@ window.drops = {
             thumb: 1530,
             gamewith: 53621,
             condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish. Can drop a Super Evolution Skull.',
-            'All Difficulties': [ 1529 ]
+            'All Difficulties': [ 1529, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
         },
         
         {
diff --git a/common/js/utils.js b/common/js/utils.js
index aa6fc9571..7e307ad84 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -2,7 +2,7 @@
 
     var FODDER_REGEX = new RegExp('(' + [
         'Group', 'Ensign Navy HQ', 'Armed \\w+ Unit', '[BM]illions Baroque', 'Eneru\'s Elect',
-        'Skypiea (Guard|Enforcer)', 'Shandian',
+        'Skypiea (Guard|Enforcer)', '(Adept|Nomad|Hunter), Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
         '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard', 'Fishman (Guard|Outlaw)', 'Punk Hazard Gas Mask Patrol Soldier', 'Punk Hazard Patrol Troop Corps'
diff --git a/drops/index.html b/drops/index.html
index 124c71468..fe6f40cb0 100644
--- a/drops/index.html
+++ b/drops/index.html
@@ -115,6 +115,11 @@ <h3>
                                 uib-tooltip="{{getTooltipText(uid)}}"
                                 tooltip-placement="bottom" tooltip-trigger="mouseenter"
                                 tooltip-enable="{{isTooltipEnabled(uid)}}" tooltip-append-to-body="true"></a>
+                            <a ng-repeat="uid in data | smartSort:'false'" ng-if="uid.includes('skull')"
+                                decorate-slot uid="uid" class="slot small" 
+                                uib-tooltip="{{getTooltipText(uid)}}"
+                                tooltip-placement="bottom" tooltip-trigger="mouseenter"
+                                tooltip-enable="{{isTooltipEnabled(uid)}}" tooltip-append-to-body="true"></a>
                             <h4 ng-if="type == 'Fortnight' || island.showManual">Manuals:</h4>
                             <a ng-repeat="uid in data | smartSort:'true'" ng-if="uid < 0"
                                 decorate-slot uid="-uid" class="slot small"

From 242e989e7e4bc3e44844a8514e3b41ab002a7d28 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 10 Sep 2017 12:58:45 -0400
Subject: [PATCH 1334/1569] Kuzan aliases

---
 common/data/aliases.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2cd278892..74d0c22f6 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1662,12 +1662,12 @@ window.aliases = {
     1661: ['コラソン 消したい雨雲', '', ''],
     1662: ['コラソン 消える雨音', '', ''],
     1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci'],
-    1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji'],
-    1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji'],
+    1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji', 'Secret Kuzan'],
+    1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji', 'Secret Kuzan'],
     1666: ['キュロス 無敗の剣闘士', '', ''],
     1667: ['キュロス リク王軍軍隊長', '', ''],
-    1668: ['青キジ「改」', '', 'Kai Aokiji'],
-    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji'],
+    1668: ['青キジ「改」', '', 'Kai Aokiji', 'Kai Kuzan'],
+    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji', 'Kai Kuzan'],
     1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley'],
     1671: ['ケイミー マーメイドカフェ', '', ''],
     1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug'],

From 131c3a9047f06aad545abef299e69a225c66dbbb Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 11 Sep 2017 22:02:59 -0400
Subject: [PATCH 1335/1569] Momo and Kinemon

---
 common/data/aliases.js    |  4 ++++
 common/data/details.js    | 18 ++++++++++++++++++
 common/data/drops.js      | 10 +++++++++-
 common/data/evolutions.js |  8 ++++++++
 common/data/families.js   |  4 ++++
 common/data/units.js      |  4 ++++
 damage/js/cruncher.js     |  2 +-
 7 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 74d0c22f6..0ac42638e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1771,6 +1771,10 @@ window.aliases = {
     1770: ['', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
     1771: ['', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
     1772: ['', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
+    1773: ['', '', 'Kin\'emon'],
+    1774: ['', '', 'Kin\'emon'],
+    1775: ['', '', ''],
+    1776: ['', '', ''],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/details.js b/common/data/details.js
index 2499ebe2d..1f2baf74f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10082,4 +10082,22 @@ window.details = {
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into Matching orbs, amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{orb : 1.75x}"
     },
+    1773: {//Kinemon
+        captain: "Not Released",
+        special: "Deals 20x character's ATK in ??? damage to one enemy, boosts chances of getting matching orbs for Free Spirit characters for 1 turn",
+        sailor: "Boosts ATK of Free Spirit characters by 25"
+    },
+    1774: {//Kinemon
+        captain: "Boosts ATK of Free Spirit characters by 2.25x and their HP by 1.25x",
+        special: "Deals 20x character's ATK in ??? damage to one enemy, boosts chances of getting matching orbs for Free Spirit characters for 1 turn",
+        sailor: "Boosts ATK of Free Spirit characters by 25"
+    },
+    1775: {//Momonosuke
+        captain: "Not Released",
+        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
+    },
+    1776: {//Momonosuke
+        captain: "Boosts ATK and RCV of QCK characters by 1.75x, boosts chances of getting [QCK] orbs",
+        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
+    },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index 2b5b82272..f9cdff525 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1637,11 +1637,19 @@ window.drops = {
         
         {
             name: 'Battle Royale!',
-            thumb: 1776,
+            thumb: 1766,
             gamewith: 67118,
             'All Difficulties': [ 1765, 1767, 1768, -1192, -1764, -520, -1115, -1184, -1190, -554, -1175, -1612, -1614, -1353, -1393 ]
         },
         
+        {
+            name: 'Wano Samurai!',
+            thumb: 1774,
+            condition: 'Shooter and Free Spirit characters get a boost (???x ATK boost on 30 stamina)',
+            gamewith: null,
+            'All Difficulties': [ 1773, 1775, -963, -1588, -451, -1186, -528, -1177, -1208, -558, -1616, -1618, -1392 ]
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index bf4429b97..8d60bf842 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2763,4 +2763,12 @@ window.evolutions = {
         evolution: 1772,
         evolvers: [ 118, 88, 266, 304, 104 ]
     },
+    1773: {
+        evolution: 1774,
+        evolvers: [  ]
+    },
+    1775: {
+        evolution: 1776,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index ece6f0683..d4b26f197 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1771,4 +1771,8 @@ window.families = [
     "Ben Beckman",
     "Bartholomew Kuma",
     "Bartholomew Kuma",
+    "Kinemon",
+    "Kinemon",
+    "Momonosuke",
+    "Momonosuke",
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 2ebd22d0b..a8d631ed6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1771,6 +1771,10 @@ window.units = [
     [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, null ],
     [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, null ],
+    [ "Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kinemon, Evolved", "INT", [ "Free Spirit", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 71cc9613a..3bab73dbc 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -377,7 +377,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         
         //Apply Static Bonus Damage From Specials
         var staticBonusDamage = computeFlatBonusDamage(hitModifier);
-        if ((staticBonusDamage > 0) && ((staticBonusDamage - currentDefense)>0)) {
+        if ((staticBonusDamage > 0) && ((staticBonusDamage - currentDefense)>0) && (result.result > 0)) {
             result.result += (staticBonusDamage - currentDefense);
         }
         

From e3b2a3833775d173a1a67f351af98d0a3acf0460 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 12 Sep 2017 23:32:16 -0400
Subject: [PATCH 1336/1569] New units Limit Break

---
 common/data/details.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 1f2baf74f..ebff7c34f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -9958,6 +9958,8 @@ window.details = {
         ],
         specialNotes:"#{stages}",
         specialName: "Injection Shot",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1752: {//20th Anni Zoro
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
@@ -10030,6 +10032,8 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
         special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1764: {//6+ Aokiji
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 5 times to a maximum of 3.5x.",

From 696f7d69ffb9f048ad098139bb597601c88fe72d Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 13 Sep 2017 17:45:09 -0400
Subject: [PATCH 1337/1569] Kizaru and his Twin

---
 characters/js/directives.js |  4 ++--
 common/data/aliases.js      |  4 ++++
 common/data/captains.js     | 19 +++++++++++++++++
 common/data/cooldowns.js    |  8 +++++++
 common/data/details.js      | 42 +++++++++++++++++++++++++++++++++++++
 common/data/drops.js        |  9 ++++++++
 common/data/evolutions.js   |  8 +++++++
 common/data/families.js     |  4 ++++
 common/data/flags.js        |  2 ++
 common/data/sailors.js      |  6 ++++++
 common/data/specials.js     | 12 +++++++++++
 common/data/units.js        |  4 ++++
 common/data/zombies.js      |  8 +++++--
 13 files changed, 126 insertions(+), 4 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index c392477f7..bea5a2202 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -457,11 +457,11 @@ directives.addLinks = function($stateParams) {
             }
             if (!incomplete) {
                 if (id == 1478){
-                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/カリブー-カリブー海賊団船長/" target="_blank">' +
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/blog/カリブー-カリブー海賊団船長/" target="_blank">' +
                         'Official Guide (Japanese)</a></li>'));
                 }
                 else{
-                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/c-' + id + '" target="_blank">' +
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/blog/c-' + id + '" target="_blank">' +
                         'Official Guide (Japanese)</a></li>'));
                 }
             }
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 0ac42638e..418391c42 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1775,6 +1775,10 @@ window.aliases = {
     1774: ['', '', 'Kin\'emon'],
     1775: ['', '', ''],
     1776: ['', '', ''],
+    1777: ['', '', 'Secret Kizaru', 'Secret Borsalino'],
+    1778: ['', '', 'Secret Kizaru', 'Secret Borsalino'],
+    1779: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino'],
+    1780: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino'],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index 934bfe110..66bcf8698 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5415,4 +5415,23 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
+    1774: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.25 : 1; }
+    },
+    1776: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; }
+    },
+    1778: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
+    1779: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    1780: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5131aee5e..cecfb2f28 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1771,4 +1771,12 @@ window.cooldowns = [
     [ 13, 9 ],
     [ 23, 14 ],
     [ 23, 14 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 20, 11 ],
+    [ 20, 11 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index ebff7c34f..afa0632ab 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10104,4 +10104,46 @@ window.details = {
         captain: "Boosts ATK and RCV of QCK characters by 1.75x, boosts chances of getting [QCK] orbs",
         special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
     },
+    1777:{
+        captain: "Not Translated",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers, changes [BLOCK], [STR], and [INT] orbs into Matching orbs for Free Spirit characters and adds .2x to Chain multiplier for 3 turns",
+        specialName: "Devil Destroyer's Light Arrow",
+        specialNotes: "#{beneficial}<br>#{ignoreBarrier}"
+    },
+    1778:{
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, and their HP by 1.2x. Recovers 1.5x character's RCV in HP at the end of each turn",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers, changes [BLOCK], [STR], and [INT] orbs into Matching orbs for Free Spirit characters and adds .2x to Chain multiplier for 3 turns",
+        specialName: "Devil Destroyer's Light Arrow",
+        specialNotes: "#{beneficial}<br>#{ignoreBarrier}"
+    },
+    1779:{
+        captain: "Boosts ATK of Shooter characters by 2x",
+        specialName: "Yata no Kagami (Sacred Mirror) Neo",
+        special: [
+            {
+                "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn",
+                "cooldown": [ 19, 5 ]
+            },
+            {
+                "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn. Adds .5x to Chain multiplier for 2 turns",
+                "cooldown": [ 25, 11 ]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
+    1780:{
+        captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.25x and boosts HP of Shooter characters by 1.5x",
+        specialName: "Yata no Kagami (Sacred Mirror) Neo",
+        special: [
+            {
+                "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn",
+                "cooldown": [ 19, 5 ]
+            },
+            {
+                "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn. Adds .5x to Chain multiplier for 2 turns",
+                "cooldown": [ 25, 11 ]
+            }
+        ],
+        specialNotes: "#{stages}",
+    },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index f9cdff525..756f2d923 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1883,6 +1883,15 @@ window.drops = {
             Master: [ 977 ]
         },
         
+        {
+            name: 'Clash Neo!! Kizaru',
+            thumb: 1780,
+            gamewith: null,
+            condition: '1 Master version and 3 Ultimate versions with different conditions. Master: Free Spirit/Striker/Powerhouse Only. Can only complete 10 times each. Ultimate: Free Spirit Only, Striker Only, and Powerhouse Only',
+            Ultimate: [ 1779 ],
+            Master: [ 1779 ]
+        },
+        
         {
             name: 'Clash!? Impostor Straw Hat Pirates',
             showManual: true,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8d60bf842..82c95334a 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2771,4 +2771,12 @@ window.evolutions = {
         evolution: 1776,
         evolvers: [  ]
     },
+    1777: {
+        evolution: 1778,
+        evolvers: [  ]
+    },
+    1779: {
+        evolution: 1780,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index d4b26f197..7f023ed5c 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1775,4 +1775,8 @@ window.families = [
     "Kinemon",
     "Momonosuke",
     "Momonosuke",
+    "Kizaru",
+    "Kizaru",
+    "Kizaru",
+    "Kizaru",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 3857a91c7..c7be90696 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1557,4 +1557,6 @@ window.flags = {
     1764: { rr: 1, rro: 1 },
     1769: { rr: 1, rro: 1, lrr: 1 },
     1770: { rr: 1, rro: 1, lrr: 1 },
+    1777: { rr: 1, rro: 1, lrr: 1 },
+    1778: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 32f34642f..0b0078e8d 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -340,4 +340,10 @@ window.sailors = {
         rcvStatic: function(p) { return 40; },
         hpStatic: function(p) { return 40; },
     },
+    1773: {
+        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; },
+    },
+    1774: {
+        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 3bd261d59..92150b70c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3559,4 +3559,16 @@ window.specials = {
     1772: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
+    1777: {
+        chainAddition: function(p){ return 0.2;}
+    },
+    1778: {
+        chainAddition: function(p){ return 0.2;}
+    },
+    1779: {
+        chainAddition: function(p) {return 0.5;}
+    },
+    1780: {
+        chainAddition: function(p){ return 0.5;}
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index a8d631ed6..c52763d4a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1775,6 +1775,10 @@ window.units = [
     [ "Kinemon, Evolved", "INT", [ "Free Spirit", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kizaru", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Kizaru [Neo], Light Human", "DEX", [ "Fighter", "Shooter" ], 5, 50, 5, 4, 99, 5000000, 1, 1, 1, 2486, 1415, 279, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index da301a36b..c41914ca2 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -435,6 +435,10 @@ window.zombies = {
         type: 'healer',
         multiplier: 4
     },
+    1714: { // Monet
+        type: 'healer',
+        multiplier: 2
+    },
     1728: { // Tashigi
         type: 'healer',
         multiplier: 2
@@ -467,8 +471,8 @@ window.zombies = {
         type: 'healer',
         multiplier: 5
     },
-    1714: { // Monet
+    1778: { // Kizaru
         type: 'healer',
-        multiplier: 2
+        multiplier: 1.5
     },
 };

From e60475b0ea68d6e667a8e7005b42dc5aa12b65da Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 13 Sep 2017 17:45:40 -0400
Subject: [PATCH 1338/1569] Whoops

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index afa0632ab..fbd810e4f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10122,11 +10122,11 @@ window.details = {
         special: [
             {
                 "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn",
-                "cooldown": [ 19, 5 ]
+                "cooldown": [ 14, 5 ]
             },
             {
                 "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn. Adds .5x to Chain multiplier for 2 turns",
-                "cooldown": [ 25, 11 ]
+                "cooldown": [ 20, 11 ]
             }
         ],
         specialNotes: "#{stages}"
@@ -10137,11 +10137,11 @@ window.details = {
         special: [
             {
                 "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn",
-                "cooldown": [ 19, 5 ]
+                "cooldown": [ 14, 5 ]
             },
             {
                 "description": "Changes own orb into [DEX]. Reduces Special Cooldown of Shooter and Fighter specials by 1 turn. Adds .5x to Chain multiplier for 2 turns",
-                "cooldown": [ 25, 11 ]
+                "cooldown": [ 20, 11 ]
             }
         ],
         specialNotes: "#{stages}",

From 62b4ef6a118c911f44443b91b5752adb53eb57f2 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 13 Sep 2017 18:57:42 -0400
Subject: [PATCH 1339/1569] Kidd and Ango cost

---
 common/data/aliases.js | 18 +++++++++---------
 common/data/events.js  | 20 ++++++++++++++++++++
 common/data/units.js   |  2 +-
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 418391c42..fda92951a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -354,8 +354,8 @@ window.aliases = {
     353: ['ゼファー NEO海軍総帥','','Raid'],
     354: ['アイン','','Raid'],
     355: ['アイン NEO海軍バイス・アドミラル','','Raid'],
-    356: ['ユースタス・キッド','','Supernova'],
-    357: ['キャプテン・キッド','','Supernova'],
+    356: ['ユースタス・キッド','','Supernova', 'Kidd'],
+    357: ['キャプテン・キッド','','Supernova', 'Kidd'],
     358: ['スクラッチメン・アプー','','Supernova'],
     359: ['海鳴り スクラッチメン・アプー','','Supernova'],
     360: ['X・ドレーク','','Supernova'],
@@ -921,8 +921,8 @@ window.aliases = {
     920: ['スイトピー','', 'Sweet Pea'],
     921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
     922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
-    923: ['南の海のキャプテン・キッド','','Coliseum Kid'],
-    924: ['キャプテン・キッド キッド海賊団船長','','Coliseum Kid'],
+    923: ['南の海のキャプテン・キッド','','Coliseum Kid', 'Coliseum Kidd'],
+    924: ['キャプテン・キッド キッド海賊団船長','','Coliseum Kid', 'Coliseum Kidd'],
     925: ['獄卒長サディちゃん','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
     926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
     927: ['ドーベルマン 海軍本部中将','','Coliseum Doberman'],
@@ -964,7 +964,7 @@ window.aliases = {
     963: ['チャルロス聖',''],
     964: ['ロズワード聖',''],
     965: ['シャルリア宮',''],
-    966: ['ユースタス・キッド 超新星（スーパールーキー）',''],
+    966: ['ユースタス・キッド 超新星（スーパールーキー）','', 'Story Kidd'],
     967: ['トラファルガー・ロー 超新星（スーパールーキー）',''],
     968: ['パシフィスタ　ＰＸ－1',''],
     969: ['パシフィスタ　ＰＸ－2',''],
@@ -1618,8 +1618,8 @@ window.aliases = {
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
     1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
-    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid'],
-    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid'],
+    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
+    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
     1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy', 'INT Doflamingo'],
     1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'INT Doffy', 'INT Doflamingo'],
     1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
@@ -1687,8 +1687,8 @@ window.aliases = {
     1686: ['ウソップ 20th Anniversary Memorial Treasure', '', '20th Anniversary Usopp'],
     1687: ['フランキー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Franky'],
     1688: ['フランキー 20th Anniversary Memorial Treasure', '', '20th Anniversary Franky'],
-    1689: ['ユースタス・キッド “南の海”出身の超新星', '', ''],
-    1690: ['キャプテン・キッド “南の海”出身の超新星', '', ''],
+    1689: ['ユースタス・キッド “南の海”出身の超新星', '', 'Fortnight Kidd'],
+    1690: ['キャプテン・キッド “南の海”出身の超新星', '', 'Fortnight Kidd'],
     1691: ['ヒート', '', ''],
     1692: ['ワイヤー', '', ''],
     1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
diff --git a/common/data/events.js b/common/data/events.js
index 58cca2f6d..af28e3b6d 100644
--- a/common/data/events.js
+++ b/common/data/events.js
@@ -169,6 +169,26 @@ window.events = {
                 $scope.notify({ text: 'Disabling [RAINBOW] orbs support.' });
         }
     },
+    1523: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
+    1524: {
+        onInsertion: function($scope) {
+            if (++$scope.options.gOrbsEnabled == 1)
+                $scope.notify({ text: 'Enabling [G] orbs support.' });
+        },
+        onRemoval: function($scope) {
+            if (--$scope.options.gOrbsEnabled === 0)
+                $scope.notify({ text: 'Disabling [G] orbs support.' });
+        }
+    },
     1531: {
         onInsertion: function($scope) {
             if (++$scope.options.meatOrbsEnabled == 1)
diff --git a/common/data/units.js b/common/data/units.js
index c52763d4a..f40cc9d52 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1426,7 +1426,7 @@ window.units = [
     [ "Don Sai, Happo Navy", "QCK", [ "Fighter", "Striker" ], 3, 13, 5, 1, 50, 392109, 105, 59, 19, 1205, 620, 106, 1],
     [ "Don Sai, Happo Navy's 13th Leader", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 3, 99, 3000000, 1123, 527, 57, 2192, 1301, 181, 1],
     [ "Boo, Happo Navy", "QCK", [ "Fighter", "Driven" ], 4, 15, 6, 3, 70, 1066998, 305, 159, 29, 1672, 1005, 111, 1],
-    [ "Jean Ango", "DEX", [ "Slasher" , "Shooter" ], 3, 12, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
+    [ "Jean Ango", "DEX", [ "Slasher" , "Shooter" ], 3, 13, 6, 2, 70, 1066998, 158, 173, 21, 1055, 1196, 73, 1 ],
     [ "Mansherry, February's Favorite", "DEX", [ "Striker", "Free Spirit" ], 4, 13, 6, 2, 50, 392109, 42, 24, 66, 890, 329, 261, 1 ],
     [ "Mansherry, March's Courage", "DEX", [ "Striker", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 803, 251, 213, 1777, 656, 486, 1 ],
     [ "Shogun Franky", "PSY", [ "Free Spirit", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 400, 165, 20, 1550, 736, 102, 1 ],

From ae7c75bc4ecebc7d6b3fbb4ce936f8a5ec8622a1 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 14 Sep 2017 23:05:15 -0400
Subject: [PATCH 1340/1569] Kizaru stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index f40cc9d52..c94b82d7e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1776,7 +1776,7 @@ window.units = [
     [ "Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kizaru", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2613, 1342, 315, null ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Kizaru [Neo], Light Human", "DEX", [ "Fighter", "Shooter" ], 5, 50, 5, 4, 99, 5000000, 1, 1, 1, 2486, 1415, 279, null ],
     ];

From cbbf4afe9dcabe066383e8cf4b3072c64a99a08a Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 14 Sep 2017 23:31:39 -0400
Subject: [PATCH 1341/1569] Bonney

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index fbd810e4f..cceeac1b6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -6072,12 +6072,12 @@ window.details = {
     },
     1198: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
-        special: "Empties all slots with [RCV] orbs, recover 20% of crew's MAX HP",
+        special: "Empties all slots with [RCV] orbs, recovers 20% of crew's MAX HP",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1199: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
-        special: "Empties all slots with [RCV] orbs, recover 20% of crew's MAX HP",
+        special: "Empties all slots with [RCV] orbs, recovers 20% of crew's MAX HP",
         specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1200: {

From 1588728ce2723ab3ae43940ad9955f31b03083b8 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 15 Sep 2017 16:36:06 -0400
Subject: [PATCH 1342/1569] Negative Defense

---
 damage/views/sidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/views/sidebar.html b/damage/views/sidebar.html
index 58179925c..f5ddf1895 100644
--- a/damage/views/sidebar.html
+++ b/damage/views/sidebar.html
@@ -29,7 +29,7 @@
             <div id="defenseContainer" title="Middle-click or CTRL-click for details" defense-on-click>
                 <i class="fa fa-level-up comodity" ui-sref="main.defense"></i>
                 <i class="fa fa-shield"></i>
-                Enemy Defense: <input type="number" id="defense" to-int ng-model="data.defense"></input>
+                Enemy Defense: <input type="number" id="defense" min = 0 to-int ng-model="data.defense"></input>
             </div>
         </li>
 

From ad9b8e1d926cd5ac35a603ba1558602246d11da7 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 15 Sep 2017 20:52:59 -0400
Subject: [PATCH 1343/1569] Limit Break part 1

---
 characters/js/controllers.js  |   2 +
 characters/views/details.html |  52 +-
 common/data/aliases.js        |  46 +-
 common/data/details.js        | 931 +++++++++++++++++++++++++++++-----
 common/data/drops.js          |   2 +-
 common/data/units.js          |  12 +-
 common/js/utils.js            |  22 +-
 res/blank_dex.png             | Bin 0 -> 6280 bytes
 res/blank_int.png             | Bin 0 -> 6440 bytes
 res/blank_psy.png             | Bin 0 -> 6412 bytes
 res/blank_qck.png             | Bin 0 -> 6345 bytes
 11 files changed, 914 insertions(+), 153 deletions(-)
 create mode 100644 res/blank_dex.png
 create mode 100644 res/blank_int.png
 create mode 100644 res/blank_psy.png
 create mode 100644 res/blank_qck.png

diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index 6caa6d3bb..c7c9015b3 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -196,6 +196,8 @@ app.controller('DetailsCtrl',function($scope, $rootScope, $state, $stateParams,
     $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);
+    $scope.isLimitStaged = ($scope.details && $scope.details.limit && $scope.details.limit.constructor == Array);
+    $scope.isPotentialStaged = ($scope.details && $scope.details.potential && $scope.details.potential.constructor == Array);
 
     $scope.$watch('customLevel.level',function(level) {
         if (isNaN(level) || level < 1 || level > $scope.unit.maxLevel) {
diff --git a/characters/views/details.html b/characters/views/details.html
index 9d56d6372..e4f2612f9 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -196,12 +196,31 @@ <h3 class="page-header" ng-hide="hidden.abilities">Abilities</h3>
                                         <span class="notes" ng-if="details.specialNotes" ng-bind-html="details.specialNotes | notes | decorate"></span>
                                     </td>
                                 </tr>
+                                <tr ng-if="cooldown && !isSpecialStaged">
+                                    <td>Cooldown</td>
+                                    <td>
+                                        {{cooldown.length ? cooldown[0] : cooldown}} turns
+                                        {{cooldown.length ? ' \u2192 ' + cooldown[1] + ' turns' : ''}}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                    <div class="panel panel-default" ng-hide="hidden.abilities">
+                        <table class="table table-striped-column abilities">
+                            <tbody>
                                 <tr>
                                     <td>Limit Break</td>
                                     <td>
                                         <!-- same limit break (differences across versions) -->
-                                        <div ng-if="!isLimitHybrid" ng-bind-html="details.limit | decorate"></div>
-                                        <!-- different sailor abilities -->
+                                        <div ng-if="!isLimitHybrid && !isLimitStaged" ng-bind-html="details.limit | decorate"></div>
+                                        <!-- different limit abilities -->
+                                        <div ng-if="!isLimitHybrid && isLimitStaged">
+                                            <div ng-repeat="stage in details.limit track by $index">
+                                                <strong>Level {{$index + 1}}:</strong>
+                                                <span ng-bind-html="stage.description | decorate"></span>
+                                            </div>
+                                        </div>
                                         <div ng-if="isLimitHybrid">
                                             <span class="badge badge-japan">Japan</span>
                                             <div ng-bind-html="details.limit.japan | decorate"></div>
@@ -211,11 +230,32 @@ <h3 class="page-header" ng-hide="hidden.abilities">Abilities</h3>
                                         <span class="notes" ng-if="details.limitNotes" ng-bind-html="details.limitNotes | notes | decorate"></span>
                                     </td>
                                 </tr>
-                                <tr ng-if="cooldown && !isSpecialStaged">
-                                    <td>Cooldown</td>
+                                <tr>
+                                    <td>Potential Abilties</td>
                                     <td>
-                                        {{cooldown.length ? cooldown[0] : cooldown}} turns
-                                        {{cooldown.length ? ' \u2192 ' + cooldown[1] + ' turns' : ''}}
+                                        <!-- same potential break (differences across versions) -->
+                                        <div ng-if="!isPotentialHybrid && !isPotentialStaged" ng-bind-html="details.potential | decorate"></div>
+                                        <!-- different potential abilities -->
+                                        <div ng-if="!isPotentialHybrid && isPotentialStaged">
+                                            <div ng-repeat="stage in details.potential track by $index">
+                                                <strong>Potential Ability {{$index + 1}}:</strong>
+                                                 {{stage.Name}}
+                                                <br>
+                                                <span ng-bind-html="stage.description[0] | decorate"></span><br>
+                                                <span ng-bind-html="stage.description[1] | decorate"></span><br>
+                                                <span ng-bind-html="stage.description[2] | decorate"></span><br>
+                                                <span ng-bind-html="stage.description[3] | decorate"></span><br>
+                                                <span ng-bind-html="stage.description[4] | decorate"></span><br>
+                                                <br>
+                                            </div>
+                                        </div>
+                                        <div ng-if="isPotentialHybrid">
+                                            <span class="badge badge-japan">Japan</span>
+                                            <div ng-bind-html="details.potential.japan | decorate"></div>
+                                            <span class="badge badge-global">Global</span>
+                                            <div ng-bind-html="details.potential.global | decorate"></div>
+                                        </div>
+                                        <span class="notes" ng-if="details.potentialNotes" ng-bind-html="details.potentialNotes | notes | decorate"></span>
                                     </td>
                                 </tr>
                             </tbody>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index fda92951a..d39ec7e31 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1738,18 +1738,18 @@ window.aliases = {
     1737: ['トレーボル ドンキホーテファミリー最高幹部', '', ''],
     1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy'],
     1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy'],
-    1740: ['', '', ''],
-    1741: ['', '', ''],
-    1742: ['', '', ''],
-    1743: ['', '', ''],
-    1744: ['', '', ''],
-    1745: ['', '', ''],
-    1746: ['', '', 'Korea Boa'],
-    1747: ['', '', 'Korea Boa'],
-    1748: ['', '', ''],
-    1749: ['', '', ''],
-    1750: ['', '', 'Korea Law'],
-    1751: ['', '', 'Korea Law'],
+    1740: ['ボア・サンダーソニア 麦わらのルフィの協力者', '', ''],
+    1741: ['ボア・サンダーソニア 麦わらのルフィの共犯者', '', ''],
+    1742: ['ボア・マリーゴールド 麦わらのルフィの協力者', '', ''],
+    1743: ['ボア・マリーゴールド 麦わらのルフィの共犯者', '', ''],
+    1744: ['マーガレット 麦わらのルフィの協力者', '', ''],
+    1745: ['マーガレット 麦わらのルフィの共犯者', '', ''],
+    1746: ['ボア・ハンコック 麦わらのルフィの協力者', '', 'Korea Boa'],
+    1747: ['ボア・ハンコック 麦わらのルフィの共犯者', '', 'Korea Boa'],
+    1748: ['ベポ 麦わらのルフィの協力者', '', ''],
+    1749: ['ベポ 麦わらのルフィの共犯者', '', ''],
+    1750: ['“死の外科医”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
+    1751: ['“王下七武海”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
     1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro'],
     1753: ['ロロノア・ゾロ 20th Anniversary Memorial Treasure', '', '20th Anniversary Zoro'],
     1754: ['サンジ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Sanji'],
@@ -1760,17 +1760,17 @@ window.aliases = {
     1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook'],
     1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper'],
     1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper'],
-    1762: ['', '', 'Rob Lucci'],
-    1763: ['', '', 'Rob Lucci'],
-    1764: ['', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
-    1765: ['', '', ''],
-    1766: ['', '', ''],
-    1767: ['', '', ''],
-    1768: ['', '', ''],
-    1769: ['', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
-    1770: ['', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
-    1771: ['', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
-    1772: ['', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
+    1762: ['ロブ・ルッチ 世界政府の怪物', '', 'Rob Lucci'],
+    1763: ['ルッチ　獣人 世界政府の怪物', '', 'Rob Lucci'],
+    1764: ['クザン 元海軍本部最高戦力', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
+    1765: ['足長族　ブルーギリー', '', ''],
+    1766: ['足長族　ブルーギリー 脚功道格闘家', '', ''],
+    1767: ['殺し屋　ファンク兄弟', '', ''],
+    1768: ['アブドーラ＆ジェット 凶悪犯罪者', '', ''],
+    1769: ['ベン・ベックマン 赤髪海賊団副船長', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
+    1770: ['ベン・ベックマン “四皇”赤髪の右腕', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
+    1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
+    1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
     1773: ['', '', 'Kin\'emon'],
     1774: ['', '', 'Kin\'emon'],
     1775: ['', '', ''],
diff --git a/common/data/details.js b/common/data/details.js
index cceeac1b6..e3cfc4dbb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -17,8 +17,46 @@ window.details = {
         captain: "Boosts ATK of STR characters by 2x, and ATK of all others by 1.5x",
         special: "Deals 25x character's ATK in STR damage to one enemy",
         specialName: "Gum-Gum Twin Jet Pistol",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Sailor Ability 1: Boosts own base ATK by 100 if this character is the last in the chain to attack" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 2 turns",
+                    "Level 4: Reduces No Healing duration by 3 turns",
+                    "Level 5: Reduces No Healing duration by 4 turns"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     5: {
         special: "Deals 7x character's ATK in DEX damage to one enemy",
@@ -815,8 +853,45 @@ window.details = {
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Black Blade Ship Cutter",
         captain: "Boosts ATK of Slasher characters by 2.5x",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ]
     },
     228: {
         special: "Reduces Bind duration by 2 turns",
@@ -958,8 +1033,46 @@ window.details = {
         special: "Changes [STR] and [QCK] orbs into [DEX] orbs",
         specialName: "Beautiful Dual Flintlocks",
         captain: "Boosts ATK and RCV of DEX characters by 2x",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of [DEX] characters by 50" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 150" },
+            { "description": "Aquire new Captain Ability: Boosts ATK and RCV of DEX characters by 2x and boosts ATK of Shooter characters by 1.2x" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of Shooter characters by 50" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        limitnotes: "Captain boosts stack, so [DEX] and Shooter character's ATK will be boosted by 2.4x",
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+        ]
     },
     258: {
         special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
@@ -1334,8 +1447,46 @@ window.details = {
         special: "Boosts ATK of Shooter characters by 1.75x for 2 turns",
         specialName: "Smash Buster",
         captain: "Boosts ATK of Shooter characters by 2.5x",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Shooter characters by 20" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x and recovers 300 HP at end of each turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     354: {
         special: "Reduces Bind and Despair duration by 3 turns",
@@ -1368,22 +1519,59 @@ window.details = {
         specialName: "Scratch Body",
         specialNotes: "#{random : 5,000 : 20,000}",
         captain: "Boosts ATK of DEX characters by 3x if HP is above 99% at the start of the turn",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Boosts base ATK by 100" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of [DEX] characters by 30" },
+            { "description": "Boosts base HP by 150" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of Shooter characters by 50" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of [DEX] characters by 3x if HP is above 99% at the start of the turn, 2x otherwise" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 50% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
     },
     360: {
         special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Prehistoric Power",
         specialNotes: "#{zombie}",
         captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts HP of Powerhouse characters by 100"
+        sailor: "Boosts base HP of Powerhouse characters by 100"
     },
     361: {
         special: "Deals 10x character's ATK in INT damage to all enemies, protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Prehistoric Power",
         specialNotes: "#{zombie}",
         captain: "Boosts ATK of INT characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts HP of Powerhouse characters by 100"
+        sailor: "Boosts base HP of Powerhouse characters by 100"
     },
     362: {
         special: "For 2 turns, boosts the amount healed by RCV orbs by 1.5x, then 2x, then 2.5x from the third crew member onward",
@@ -1399,13 +1587,13 @@ window.details = {
         special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
         specialName: "Gang Fortress",
         captain: "Boosts ATK and RCV of QCK characters by 2x",
-        sailor: "Boosts RCV of all characters by 10"
+        sailor: "Boosts base RCV of all characters by 10"
     },
     365: {
         special: "Changes [STR] and [DEX] orbs into [QCK] orbs",
         specialName: "Gang Fortress",
         captain: "Boosts ATK and RCV of QCK characters by 2x",
-        sailor: "Boosts RCV of all characters by 10"
+        sailor: "Boosts base RCV of all characters by 10"
     },
     366: {
         special: "Deals 20x character's ATK in INT damage to all enemies, reduces Bind duration by 5 turns",
@@ -1809,8 +1997,45 @@ window.details = {
         special: "Deals 10 times the damage received in the previous turn in typeless damage to all enemies",
         specialName: "Black Hole",
         captain: "Increases damage received by 2x, boosts ATK of STR characters by 2.5x and their HP by 2.25x",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 10" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Aquire Sailor Ability 1: Boosts base HP of [STR] characters by 120" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
     },
     448: {
         special: "Boosts chances of getting [QCK] orbs for 3 turns",
@@ -1826,13 +2051,13 @@ window.details = {
         special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
         specialName: "Number Eight's One Hit",
         captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
-        sailor: "Boosts ATK of Fighter characters by 20"
+        sailor: "Boosts base ATK of Fighter characters by 20"
     },
     451: {
         special: "Boosts ATK of Fighter characters by 1.5x for 1 turn, deals 25x character's ATK in DEX damage to one enemy",
         specialName: "Number Eight's One Hit",
         captain: "Boosts ATK of Fighter characters by 2x and their HP by 1.5x",
-        sailor: "Boosts ATK of Fighter characters by 20"
+        sailor: "Boosts base ATK of Fighter characters by 20"
     },
     452: {
         special: "Changes own orb and the captain's orb into [PSY]",
@@ -2214,13 +2439,13 @@ window.details = {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x",
-        sailor: "Boosts RCV of PSY characters by 15"
+        sailor: "Boosts base RCV of PSY characters by 15"
     },
     526: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
-        sailor: "Boosts RCV of PSY characters by 15"
+        sailor: "Boosts base RCV of PSY characters by 15"
     },
     527: {
         special: "Removes Poison, recovers 15x character's RCV in HP",
@@ -2363,28 +2588,65 @@ window.details = {
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher characters by 20"
+        sailor: "Boosts base ATK of Slasher characters by 20"
     },
     554: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher characters by 20"
+        sailor: "Boosts base ATK of Slasher characters by 20"
     },
     555: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x",
-        sailor: "Boosts RCV of Shooter characters by 10"
+        sailor: "Boosts base RCV of Shooter characters by 10"
     },
     556: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter characters by 10",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        sailor: "Boosts base RCV of Shooter characters by 10",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 120" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 50" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: If there are 6 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 2: If there are 5 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 3: If there are 4 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 4: If there are 4 Shooter characters in your crew, reduces No Healing duration by 2 turns",
+                    "Level 5: If there are 4 Shooter characters in your crew, reduces No Healing duration by 3 turns"
+                ]
+            },
+        ]
     },
     557: {
         special: "Boosts chances of getting [INT] orbs for 3 turns",
@@ -2403,14 +2665,14 @@ window.details = {
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter characters by 20"
+        sailor: "Boosts base ATK of Shooter characters by 20"
     },
     560: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter characters by 20"
+        sailor: "Boosts base ATK of Shooter characters by 20"
     },
     561: {
         special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, locks all orbs for 1 turn",
@@ -2807,25 +3069,25 @@ window.details = {
         special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
         specialName: "Witch's Icebreaker",
         captain: "Boosts ATK of INT characters by 2x",
-        sailor: "Boosts ATK and RCV of INT characters by 20"
+        sailor: "Boosts base ATK and RCV of INT characters by 20"
     },
     645: {
         special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
         specialName: "Witch's Icebreaker",
         captain: "Boosts ATK of INT characters by 2.5x",
-        sailor: "Boosts ATK and RCV of INT characters by 20"
+        sailor: "Boosts base ATK and RCV of INT characters by 20"
     },
     646: {
         special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
         specialName: "Vanguard Breaker",
         captain: "Boosts ATK of Shooter characters by 2.5x if HP is below 30% at the start of the turn",
-        sailor: "Boosts HP of STR characters by 30"
+        sailor: "Boosts base HP of STR characters by 30"
     },
     647: {
         special: "Deals 20x character's ATK in STR damage to all enemies, boosts chances of getting [STR] orbs for 3 turns",
         specialName: "Vanguard Breaker",
         captain: "Boosts ATK of Shooter characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts HP of STR characters by 30"
+        sailor: "Boosts base HP of STR characters by 30"
     },
     648: {
         special: "Recovers 100x character's RCV in HP, amplifies the effect of orbs by 1.5x for 2 turns",
@@ -3858,8 +4120,45 @@ window.details = {
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 30th hit, by 3.5x after the 40th hit",
         specialName: "Gust: Matasaburo",
         special: "Randomizes all orbs and changes own orb into [QCK]",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 10" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of all characters by 30" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 100" },
+            { "description": "Aquire Sailor Ability 2: Boosts this character's attack against [DEX] characters by 2x" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ]
     },
     847: {
         captain: "Boosts ATK of all characters by 1.5x if HP is below 30% at the start of the turn",
@@ -4662,8 +4961,45 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: Boosts ATK, HP and RCV of Shooter characters by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire new Captain Ability: Reduces cooldown of Shooter specials by 3 turns at the start of the fight, boosts ATK of Shooter characters by 2.35x and boosts HP of Shooter characters by 1.5x" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
     },
     979: {
         captain: "Boosts ATK of [PSY] and [DEX] characters by 1.75x and their RCV by 1.2x",
@@ -4734,8 +5070,45 @@ window.details = {
         captain: "Boosts ATK of [QCK] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 20% and changes own orb into [QCK]",
         specialName: "Punc Rock Fest",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of [QCK] characters by 2.75x" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 1: Boosts HP, RCV, and ATK of [QCK] characters by 30" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
     },
     994: {
         captain: "Boosts amount of Beli received by 2x",
@@ -4955,8 +5328,46 @@ window.details = {
         special: "Amplifies the effect of orbs for 2 turns, the exact multiplier changes depending on the current HP at the time the special was activated. ",
         specialNotes: "Below 30% -> 1.75x orb boost, between 30% and 70% -> 1.5x, above 70% -> 1.25x",
         specialName: "Eight-Impact Fist! Blow of Resentment",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Sailor Ability 1: Boosts ATK and HP of Powerhouse and Striker characters by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire new Captain Ability: Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Powerhouse characters by 2.25x and boosts the HP of Striker characters by 2x" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1026: {
         captain: "Boosts ATK and RCV of Fighter characters by 1.5x",
@@ -4999,8 +5410,46 @@ window.details = {
         captain: "Boosts ATK of Striker and Slasher characters by 2.25x and reduces cooldown of Slasher and Striker characters by 2 turns at the start of the fight",
         special: "Reduces Special Cooldown of Slasher and Striker specials by 1 turn. For Slasher and Striker characters, changes Badly Matching orbs into [RCV] orbs.",
         specialName: "Surprise Pincer Attack",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Boosts ATK and HP of Slasher and Striker characters by 50" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 2: Restores his own special by 1 turn when it is rewinded" },
+            { "description": "Aquire Potential #: Critical Hit" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 40",
+                    "Level 3: Boosts base ATK by 60",
+                    "Level 4: Boosts base ATK by 80",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 25% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 30% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 40% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 7% of this character's attack in extra damage"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1034: {
         captain: "Boosts ATK of Striker characters by a variable amount depending on how many Strikers are on your team. If you don't attack with Bartolomeo, reduces damage received by 30% for that turn.",
@@ -5274,8 +5723,45 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         specialName: "Haute Couture: Patchwork",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 50" },
+            { "description": "Aquire Sailor Ability 1: Boosts ATK of Striker characters by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Striker and Free Spirit characters by 2.45x and their RCV by 1.5x" },
+            { "description": "Aquire Sailor Ability 2: Boosts this character's attack against DEX characters by 2x" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 30% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ]
     },
     1078: {
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
@@ -5336,8 +5822,46 @@ window.details = {
         special: "Deals 20x ATK in [STR] damage to all enemies. For 2 turns, boosts ATK of Striker and Fighter characters by a variable amount depending on the current HP at the time the special was activated.",
         specialNotes: "Below 30% -> 1.75 boost, between 30% and 70% -> 1.5, above 70% -> 1.2",
         specialName: "Drill Dragon: Drill Nail",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 10" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base ATK by 100" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 5% chance to deal 5% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 5% chance to deal 7% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 5% chance to deal 10% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 10% chance to deal 10% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 15% chance to deal 15% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1084: {
         captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
@@ -5350,8 +5874,71 @@ window.details = {
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
         specialNotes: "Does not stack with other 'end of turn damage' abilities",
         specialName: "Gravito: Heavens Fall",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 25" },
+            { "description": "Boosts base HP by 25" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Aquire Sailor Ability 1: Cannot be Blown Away" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 2: Boosts ATK, HP and RCV of Powerhouse and Driven characters by 50" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 40",
+                    "Level 3: Boosts base ATK by 60",
+                    "Level 4: Boosts base ATK by 80",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 30% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 40% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 50% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 3 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 7 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 10 turns on this character",
+                    "Level 5: Reduces Slot Bind completely on this character"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1086: {
         captain: "Boosts ATK and RCV of Driven characters by 1.5x",
@@ -5895,27 +6482,27 @@ window.details = {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x",
-        sailor: "Boosts RCV of PSY characters by 15"
+        sailor: "Boosts base base RCV of PSY characters by 15"
     },
     1173: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
         specialName: "Three-Verse Humming: Arrow-Notch Slash",
         captain: "Boosts ATK of PSY characters by 2x, reduces damage received from INT enemies by 30%",
-        sailor: "Boosts RCV of PSY characters by 15"
+        sailor: "Boosts base RCV of PSY characters by 15"
     },
     1174: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 2.75x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher characters by 20"
+        sailor: "Boosts base ATK of Slasher characters by 20"
     },
     1175: {
         special: "Changes adjacent orbs into [DEX], deals 1,000 fixed damage to all enemies",
         specialName: "Ashura Ugui",
         specialNotes: "#{fixed}",
         captain: "Boosts ATK of DEX characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Boosts ATK of Slasher characters by 20"
+        sailor: "Boosts base ATK of Slasher characters by 20"
     },
     1176: {
         special: "Removes Poison, recovers 15x character's RCV in HP",
@@ -6008,14 +6595,14 @@ window.details = {
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
         specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
         specialName: "Advancing Continuous Sword Attack",
-        sailor: "Boosts ATK, HP, and RCV of all characters by 20"
+        sailor: "Boosts base ATK, HP, and RCV of all characters by 20"
     },
     1188: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
         special: "Deals 7 hits of random damage to random enemies. Reduces Bind and Despair duration by 3 turns",
         specialNotes: "#{randomHits : 7}<br>#{random : 5000 : 20000 : for each hit}",
         specialName: "Advancing Continuous Sword Attack",
-        sailor: "Boosts ATK, HP, and RCV of all characters by 20"
+        sailor: "Boosts base ATK, HP, and RCV of all characters by 20"
     },
     1189: {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
@@ -6023,7 +6610,7 @@ window.details = {
         special: "Reduces enemy Barrier duration by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
-        sailor: "Boosts ATK of [QCK] characters by 40"
+        sailor: "Boosts base ATK of [QCK] characters by 40"
     },
     1190: {
         captain: "Boosts ATK of [QCK] characters by 2.25x, makes [DEX] orbs \"beneficial\" to [QCK] characters",
@@ -6031,7 +6618,7 @@ window.details = {
         special: "Reduces enemy Barrier duration by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
-        sailor: "Boosts ATK of [QCK] characters by 40"
+        sailor: "Boosts base ATK of [QCK] characters by 40"
     },
     1191: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
@@ -6138,29 +6725,66 @@ window.details = {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x",
-        sailor: "Boosts RCV of Shooter characters by 10"
+        sailor: "Boosts base RCV of Shooter characters by 10"
     },
     1210: {
         special: "Delays all enemies for 3 turns, cuts the current HP of each enemy by 10%",
         specialName: "Heavenly Dragon Star",
         captain: "Boosts ATK of Shooter characters by 2x and their RCV by 1.5x",
-        sailor: "Boosts RCV of Shooter characters by 10",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        sailor: "Boosts base RCV of Shooter characters by 10",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 120" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 50" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: If there are 6 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 2: If there are 5 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 3: If there are 4 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 4: If there are 4 Shooter characters in your crew, reduces No Healing duration by 2 turns",
+                    "Level 5: If there are 4 Shooter characters in your crew, reduces No Healing duration by 3 turns"
+                ]
+            },
+        ]
     },
     1211: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter characters by 20"
+        sailor: "Boosts base ATK of Shooter characters by 20"
     },
     1212: {
         special: "Changes own orb into [STR], amplifies the effect of orbs by 1.5x for 2 turns",
         specialNotes: "#{orb : 1.5x}",
         specialName: "Roar! Zarley Davison",
         captain: "Boosts ATK of STR characters by 2.25x, deals 2x character's ATK in STR damage to all enemies at the end of each turn",
-        sailor: "Boosts ATK of Shooter characters by 20"
+        sailor: "Boosts base ATK of Shooter characters by 20"
     },
     1213: {
         captain: "Boosts ATK of Slasher characters by 1.5x, the HP of Striker characters by 1.2x, and the RCV of Shooter characters by 1.2x",
@@ -6235,8 +6859,46 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         specialName: "More More, 10 Times \"Iron Hammer\"",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 10" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Sailor Ability 1: Boosts own ATK by 100 if this character is the last in the chain to attack" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1221: {//Coliseum Oars Jr
         captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
@@ -6326,7 +6988,7 @@ window.details = {
         special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
         specialName: "Armed - White Launcher",
-        sailor: "Boosts ATK of Striker characters by 50",
+        sailor: "Boosts base ATK of Striker characters by 50",
     },
     1232: {//Smoker
         captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.3x",
@@ -6334,7 +6996,7 @@ window.details = {
         special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
         specialName: "Armed - White Launcher",
-        sailor: "Boosts ATK of Striker characters by 50",
+        sailor: "Boosts base ATK of Striker characters by 50",
     },
     1233: {//Tashigi
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
@@ -6342,7 +7004,7 @@ window.details = {
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
-        sailor: "Boosts RCV of Slasher characters by 30",
+        sailor: "Boosts base RCV of Slasher characters by 30",
     },
     1234: {//Tashigi
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
@@ -6350,7 +7012,7 @@ window.details = {
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
-        sailor: "Boosts RCV of Slasher characters by 30",
+        sailor: "Boosts base RCV of Slasher characters by 30",
     },
     1235: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 1.75x, deals 3x character's ATK to all enemies at the end of each turn",
@@ -6529,7 +7191,7 @@ window.details = {
     1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
         special: "For Slasher and Driven characters, randomizes non-matching orbs, boosts Atk against enemies with increased defense by 1.3x for 1 turn",
-        sailor: "Boosts ATK and RCV of Driven characters by 10",
+        sailor: "Boosts base ATK and RCV of Driven characters by 10",
         specialName: "Icebreaker Breakthrough Force",
     },
     1257: {//Young Whitebeard
@@ -6632,14 +7294,14 @@ window.details = {
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 3x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
-        sailor: "Boosts ATK of all characters by 100 if your captain is a Driven character",
+        sailor: "Boosts base ATK of all characters by 100 if your captain is a Driven character",
         specialName: "Horrifying Suggestion",
     },
     1270: {//Laffitte
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 7x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
-        sailor: "Boosts ATK of all characters by 100 if your captain is a Driven character",
+        sailor: "Boosts base ATK of all characters by 100 if your captain is a Driven character",
         specialName: "Horrifying Suggestion",
     },
     1271: {//Van Augur
@@ -6653,21 +7315,58 @@ window.details = {
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces Blindness duration by 5 turns",
         specialName: "Other Side of Fate",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 60" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 50% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
     },
     1273: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x and their HP by 1.2",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.44x HP",
         special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
-        sailor: "Boosts HP of all characters by 75",
+        sailor: "Boosts base HP of all characters by 75",
         specialName: "Champion of the Wild Roar",
     },
     1274: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.2x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.44x HP",
         special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
-        sailor: "Boosts HP of all characters by 75",
+        sailor: "Boosts base HP of all characters by 75",
         specialName: "Champion of the Wild Roar",
     },
     1275: {//Shiliew
@@ -6960,14 +7659,14 @@ window.details = {
         captain: "Boosts ATK of [STR] and [PSY] characters by 2x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "#{ignoreBarrier}",
-        sailor: "Boosts HP of all characters by 75",
+        sailor: "Boosts base HP of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "#{ignoreBarrier}",
-        sailor: "Boosts HP of all characters by 75",
+        sailor: "Boosts base HP of all characters by 75",
         specialName: "Super Large Iron Ball",
     },
     1319: {//Lady Tsuru
@@ -6990,13 +7689,13 @@ window.details = {
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
-        sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
+        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1322: {//Momonga
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.5x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
-        sailor: "Boosts ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
+        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1323: {//Onigumo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.3x",
@@ -7282,14 +7981,14 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2x, reduces damage received by 10%",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        sailor: "Boosts HP of [PSY] characters by 100",
+        sailor: "Boosts base HP of [PSY] characters by 100",
         specialName: "Franky Fireball",
     },
     1364: {//Timeskip Franky
         captain: "Boosts ATK of [PSY] characters by 2.5x, reduces damage received by 10%",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        sailor: "Boosts HP of [PSY] characters by 100",
+        sailor: "Boosts base HP of [PSY] characters by 100",
         specialName: "Franky Fireball",
     },
     1365: {//Timeskip Nami
@@ -7347,7 +8046,7 @@ window.details = {
             },
         ],
         specialNotes: "#{orb : 1.75x}<br>#{stages}",
-        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+        sailor: "Boosts base ATK, HP and RCV of all characters by 50",
         specialName: "Sky Walk",
     },
     1368: {//Timeskip Sanji
@@ -7363,7 +8062,7 @@ window.details = {
             },
         ],
         specialNotes: "#{orb : 1.75x}<br>#{stages}",
-        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+        sailor: "Boosts base ATK, HP and RCV of all characters by 50",
         specialName: "Sky Walk",
     },
     1369: {//Timeskip Chopper
@@ -7842,14 +8541,14 @@ window.details = {
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boosts ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1436: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 2.5x and HP of Powerhouse characters by 1.25x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boosts ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1437: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
@@ -8134,14 +8833,14 @@ window.details = {
     1476: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
-        sailor: "Boosts HP, RCV and ATK of all characters by 50",
+        sailor: "Boosts base HP, RCV and ATK of all characters by 50",
         specialName: "Merman Gujutsu - Spear of the Ages",
     },
     1477: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2.5x and boosts HP of Powerhouse characters by 1.25x",
         captainNotes: "This effect does stack for characters that have both classes, so Striker/Powerhouse characters will have 2.5x ATK and 1.25x HP",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
-        sailor: "Boosts HP, RCV and ATK of all characters by 50",
+        sailor: "Boosts base HP, RCV and ATK of all characters by 50",
         specialName: "Merman Gujutsu - Spear of the Ages",
     },
     1478: {//Caribou
@@ -8325,14 +9024,14 @@ window.details = {
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 1.69x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
-        sailor: "Boosts ATK of all characters by 15",
+        sailor: "Boosts base ATK of all characters by 15",
         specialName: "Diable Jambe - Concassé Baked",
     },
     1508: {//White Day Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
-        sailor: "Boosts ATK of all characters by 15",
+        sailor: "Boosts base ATK of all characters by 15",
         specialName: "Diable Jambe - Concassé Baked",
     },
     1509: {//Haruta
@@ -8352,7 +9051,7 @@ window.details = {
         captain: "Boosts ATK of PSY characters by 2x",
         special: "Reduces Despair duration by 3 turns, boosts own ATK by 1.5x for 1 turn",
         specialName: "Buffalo Roar",
-        sailor: "Boosts ATK of Powerhouse characters by 20 if your captain is a Powerhouse character",
+        sailor: "Boosts base ATK of Powerhouse characters by 20 if your captain is a Powerhouse character",
     },
     1512: {//Kingdew
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
@@ -8548,25 +9247,25 @@ window.details = {
     1537: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooter and Striker characters by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
-        sailor: "Boosts HP of STR characters by 150",
+        sailor: "Boosts base HP of STR characters by 150",
         specialName: "Greenstone Threat",
     },
     1538: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2.5x and boosts HP of Shooter and Striker characters by 1.25x",
         special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
-        sailor: "Boosts HP of STR characters by 150",
+        sailor: "Boosts base HP of STR characters by 150",
         specialName: "Greenstone Threat",
     },
     1539: {//Perona
         captain: "Boosts ATK and RCV of characters with cost 20 or less by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
-        sailor: "Boosts ATK of INT characters by 50",
+        sailor: "Boosts base ATK of INT characters by 50",
         specialName: "Negative Hollow: You're All Rotten Imbeciles",
     },
     1540: {//Perona
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
-        sailor: "Boosts ATK of INT characters by 50",
+        sailor: "Boosts base ATK of INT characters by 50",
         specialName: "Negative Hollow: You're All Rotten Imbeciles",
     },
     1541: {//Elizabeth
@@ -8702,7 +9401,7 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
-        sailor: "Boosts own ATK by 350 if this character is the last in the chain to attack",
+        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack",
     },
     1564: {//Elizabello
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect in a row",
@@ -8718,7 +9417,7 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
-        sailor: "Boosts own ATK by 350 if this character is the last in the chain to attack",
+        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack",
     },
     1565: {//Dagama
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 1.75x",
@@ -8961,13 +9660,13 @@ window.details = {
         captain: "Boosts ATK of Slasher characters by 2x",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
         specialName: "Blood Stained 'Iron Wall'",
-        sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
+        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack",
     },
     1602: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect in a row",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
         specialName: "Blood Stained 'Iron Wall'",
-        sailor: "Boosts own ATK by 100 if this character is the last in the chain to attack",
+        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack",
     },
     1603: {//McGuy
         captain: "Boosts ATK of [STR] characters by 2.25x and their RCV by 1.25x",
@@ -9308,13 +10007,13 @@ window.details = {
     1655: {//Carrot
         captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
         special: "Boosts ATK of QCK characters by 2x for 1 turn",
-        sailor: "Boosts ATK and RCV of [QCK] characters by 75",
+        sailor: "Boosts base ATK and RCV of [QCK] characters by 75",
         specialName: "Electric Fist",
     },
     1656: {//Carrot
         captain: "Boosts ATK of [QCK] characters by 2.25x and their RCV by 1.5x",
         special: "Boosts ATK of QCK characters by 2x for 1 turn",
-        sailor: "Boosts ATK and RCV of [QCK] characters by 75",
+        sailor: "Boosts base ATK and RCV of [QCK] characters by 75",
         specialName: "Electric Fist",
     },
     1657: {//Kanjuro
@@ -9479,13 +10178,13 @@ window.details = {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
         specialName: "Gomu Gomu no Tako Stamp",
-        sailor: "Boosts HP and ATK of all characters by 56",
+        sailor: "Boosts base HP and ATK of all characters by 56",
     },
     1682: {//20th Anni Luffy
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
         specialName: "Gomu Gomu no Tako Stamp",
-        sailor: "Boosts HP and ATK of all characters by 56",
+        sailor: "Boosts base HP and ATK of all characters by 56",
     },
     1683: {//20th Anni Robin
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.3x",
@@ -9592,14 +10291,14 @@ window.details = {
         special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit and Chain Coeffiecient Reduction duration by 3 turns",
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
-        sailor: "Boosts ATK of Fighter characters by 75",
+        sailor: "Boosts base ATK of Fighter characters by 75",
     },
     1700: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x, and their HP by 1.3x",
         special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit and Chain Coeffiecient Reduction duration by 3 turns",
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
-        sailor: "Boosts ATK of Fighter characters by 75",
+        sailor: "Boosts base ATK of Fighter characters by 75",
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
@@ -9663,13 +10362,13 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2x",
         special: "Removes all positive buffs on your team. If the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
-        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+        sailor: "Boosts base ATK, HP and RCV of all characters by 50",
     },
     1706: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2.5x at the start of the chain, and boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
         special: "Removes all positive buffs on your team. If the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
-        sailor: "Boosts HP, RCV, and ATK of all characters by 50",
+        sailor: "Boosts base ATK, HP and RCV of all characters by 50",
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
@@ -9796,13 +10495,13 @@ window.details = {
     1728: {//Tashigi
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2x",
         special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, remove enemies' ATK Up Buffs, and recovers 2,000 HP",
-        sailor: "Boosts HP, RCV, and ATK of [STR], [DEX], and [QCK] characters by 30",
+        sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
         specialName: "Destructive Water Splash",
     },
     1729: {//Tashigi
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.25x and their HP by 1.25x. Recovers 3x character's RCV in HP at the end of each turn",
         special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, remove enemies' ATK Up Buffs, and recovers 2,000 HP",
-        sailor: "Boosts HP, RCV, and ATK of [STR], [DEX], and [QCK] characters by 30",
+        sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
         specialName: "Destructive Water Splash",
     },
     1730: {//Vivi
@@ -9892,13 +10591,13 @@ window.details = {
     1744: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
-        sailor: "Boosts ATK, HP and RCV of Shooter characters by 30",
+        sailor: "Boosts base ATK, HP and RCV of Shooter characters by 30",
         specialName: "Defender's Spade-Shaped Arrow",
     },
     1745: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x and recovers 2x character's RCV in HP at the end of each turn",
         special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
-        sailor: "Boosts ATK, HP and RCV of Shooter characters by 30",
+        sailor: "Boosts base ATK, HP and RCV of Shooter characters by 30",
         specialName: "Defender's Spade-Shaped Arrow",
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
@@ -9964,25 +10663,25 @@ window.details = {
     1752: {//20th Anni Zoro
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
-        sailor: "Boosts ATK of Slasher characters by 50",
+        sailor: "Boosts base ATK of Slasher characters by 50",
         specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
     1753: {//20th Anni Zoro
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
-        sailor: "Boosts ATK of Slasher characters by 50",
+        sailor: "Boosts base ATK of Slasher characters by 50",
         specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
     1754: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
-        sailor: "Boosts HP, RCV, and ATK of all characters by 40",
+        sailor: "Boosts base ATK, HP and RCV of all characters by 40",
         specialName: "Diable Jambe: Collier Strike",
     },
     1755: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2.5x and their HP by 1.2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
-        sailor: "Boosts HP, RCV, and ATK of all characters by 40",
+        sailor: "Boosts base ATK, HP and RCV of all characters by 40",
         specialName: "Diable Jambe: Collier Strike",
     },
     1756: {//20th Anni Nami
@@ -10089,12 +10788,12 @@ window.details = {
     1773: {//Kinemon
         captain: "Not Released",
         special: "Deals 20x character's ATK in ??? damage to one enemy, boosts chances of getting matching orbs for Free Spirit characters for 1 turn",
-        sailor: "Boosts ATK of Free Spirit characters by 25"
+        sailor: "Boosts base ATK of Free Spirit characters by 25"
     },
     1774: {//Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2.25x and their HP by 1.25x",
         special: "Deals 20x character's ATK in ??? damage to one enemy, boosts chances of getting matching orbs for Free Spirit characters for 1 turn",
-        sailor: "Boosts ATK of Free Spirit characters by 25"
+        sailor: "Boosts base ATK of Free Spirit characters by 25"
     },
     1775: {//Momonosuke
         captain: "Not Released",
diff --git a/common/data/drops.js b/common/data/drops.js
index 756f2d923..666b43b7e 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -614,7 +614,7 @@ window.drops = {
             '07': [ 1347, 'skullChopper' ],
             '08': [ 1348, 'skullZoro' ],
             '09': [ 1349, 'skullNami' ],
-            '10': [  ],
+            '10': [ 'skullFranky' ],
             '11': [ 1350, 'skullBrook' ],
             '12': [ 1351, 'skullRobin' ],
             '13': [ 1352, 'skullSanji' ],
diff --git a/common/data/units.js b/common/data/units.js
index c94b82d7e..f9708811e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1748,8 +1748,8 @@ window.units = [
     [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, 1 ],
     [ "Bepo, Strawhat Luffy's Cooperator", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 169, 108, 33, 1100, 501, 191, 1 ],
     [ "Bepo, Strawhat Luffy's Accomplice", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1054, 446, 151, 2357, 1129, 384, 1 ],
-    [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, null ],
-    [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, null ],
+    [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, 1 ],
+    [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, 1 ],
     [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 669, 404, 32, 1240, 710, 159, 1 ],
     [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, 1043, 554, 94, 2503, 1400, 269, 1 ],
     [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 650, 394, 41, 1230, 698, 200, 1 ],
@@ -1760,8 +1760,8 @@ window.units = [
     [ "Brook, 20th Anniversary Memorial Treasure", "QCK", [ "Free Spirit", "Slasher" ], 5, 30, 4, 5, 99, 4000000, 1076, 569, 148, 2274, 1336, 333, 1 ],
     [ "Tony Tony Chopper, Celebrate 20th Anniversary Cruise", "DEX", [ "Fighter", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 644, 343, 44, 1184, 589, 240, 1 ],
     [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, 1 ],
-    [ "Rob Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Human Beast Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1, 1, 1, 3205, 1540, 323, null ],
+    [ "Rob Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 398, 231, 33, 1358, 769, 197, 1 ],
+    [ "Human Beast Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1287, 722, 141, 3205, 1540, 323, 1 ],
     [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1558, 751, 198, 3478, 1501, 420, 1 ],
     [ "Longleg Blue Gilly", "DEX", [ "Fighter", "Free Spirit" ], 3, 13, 6, 1, 50, 392109, 120, 98, 17, 1110, 585, 90, 1 ],
     [ "Longleg Blue Gilly, Jao Kun Do Martial Artist", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 972, 480, 88, 2208, 1185, 187, 1 ],
@@ -1769,8 +1769,8 @@ window.units = [
     [ "Abdullah & Jeet, Vicious Criminals", "STR", [ "Slasher", "Striker" ], 3, 15, 7, 2, 70, 1066998, 152, 53, 41, 1452, 888, 102, 1 ],
     [ "Ben Beckman, Red Hair Pirates First Mate", "INT", [ "Cerebral", "Striker" ], 4, 20, 6, 3, 70, 1066998, 129, 120, 38, 1190, 735, 209, 1 ],
     [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
-    [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, null ],
-    [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, null ],
+    [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, 1 ],
+    [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, 1 ],
     [ "Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kinemon, Evolved", "INT", [ "Free Spirit", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/utils.js b/common/js/utils.js
index 7e307ad84..007b94be4 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -125,8 +125,28 @@
                 return 'https://onepiece-treasurecruise.com/wp-content/uploads/black_skull_f.png';
                 break;
         }
-        if (n === null || n === undefined || (window.units && window.units[n - 1].incomplete))
+        if (n === null || n === undefined)
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+        if ((window.units && window.units[n - 1].incomplete)){
+            switch (window.units[n - 1].type){
+                case 'STR':
+                    return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+                    break;
+                case 'DEX':
+                    return '../res/blank_dex.png';
+                    break;
+                case 'QCK':
+                    return '../res/blank_qck.png';
+                    break;
+                case 'PSY':
+                    return '../res/blank_psy.png';
+                    break;
+                case 'INT':
+                    return '../res/blank_int.png';
+                    break;
+                
+            }
+        }
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
         if (id == '0742')
             return 'https://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
diff --git a/res/blank_dex.png b/res/blank_dex.png
new file mode 100644
index 0000000000000000000000000000000000000000..7533ba0d02226b5a885477020de22b3f4aeb44b8
GIT binary patch
literal 6280
zcmV;37<cE1P)<h;3K|Lk000e1NJLTq003|R003|Z0{{R3@je8300003b3#c}2nYz<
z;ZNWI00RI}OjJbx000OD1`i7g5)cj;4+$O*4Hgs<8yFS~B?cuH4<8#CDHshFBn~VZ
z4h$>_BOV$bB@`<l88RLaFC8K+A{!1h4JIZfFC-l^B^Wd&88RjxH76Q5B^Nm&F*Yb0
z6Fe0)DIqs095^Z+Dl#26D<e589tTDj4?-6!FEBbQAUP}|IxQnYDjhp6Bqcl^JTN2!
zP9O_PATT!~JTN92L>oOZCq6PLKQk#LNeDnRDnT_X5>XyPHY`IoEd*I8Of@4wKQ&1_
zE*(@aO+PYJJthigFa>lETSF`uY!pRIN;X<DHDL`?Nk3poFa~}O5_B^Zdk#rkE?!PJ
zDQq@SR#<3JHC|ImQerI?em@a~C1zGX9)$}deJ%u$CqisSa#%SRiYIJaMJa_R7>+Dw
zVpMZqM>B#$TXH%gk}Gy%Nl=9id1g!=m_93)D1v4|On*{(XiXKV9X^vSe{4`>fjTRl
zM>w1<if>4PaaTQ*UUYPGNuC=`mONXCUnr?ZiFQ~<qcK;QK8tu;lXy;4qa<>TNsfD5
zn|VoNqXiebUMRXUMWtSmeqLXlMTCHRNU$SokZo6{FrR%*lYn8Cfnr>!H=}@3mxN|u
zt2?EGR+)!qYNSz{iD_l6K|jVXSiK&di)*NeT6~*#U9E7SjBa$Z8*Q&nlaGvisy?oa
zT%(U~CDd=FlX0_>U}(q`sFrqtt8}cGceR&fSJ5@En|isNXRw`ph`C>P(+jenfxMq;
zrlX&=qJY1lZa3qAx1@u?q;GcAN07@jyQYZ4rggijhnK`<#;JI)tf+tE3%;w2zpReQ
ztbD?)j#=l9wX(0nv5>{GlgYG$#<Y}}&ybPePLk^qySKH_yM?sLs;1v+#K633^`F<n
zjLXNv-^!4(^+L(juH(&>uIz=;&dlV|mWlqayX3j()ScMX)9Tis>)52j^?cmf*Qx!x
z?%k{4-rVxxve)gz<>KP=<G0xQoWuRk`02ar=;re8?dkl*;QiY6^YQxl_x}9)|NsBG
zcl^8n02MSzL_t(|0d$eSYuij1$HPlB7^B5q{Rec&(k+`Z7(_%h7?Ng-m(pxXp#ej|
zbkJ~1hj0PGjhE%+AcAmk%N0=#fkMd?0+j|;R8&|v^alxKF*fh_gb7~W556DIJ$KKC
z$J%h#>36$*%vN^|>;Ez7o}u6GAy~)iIZyQ3EH3q(es9CM$+98?1?Dd-7=@hqolTVM
zbZpzQ?5)ATb=`qua9!VZoB;yNuD?GT1>?XB61w)L-2t{4R>uj%HA)tyc3|22!8qhH
z$@Z-cCo8L}#Hh-uD4Rlk7>(I@<PV&!XB~Usk0Pz4)PfL7xRf#?LP|;q5n4)R4nhKC
z9QyFIv^o{X`Z{Y$)V}e95^GVGg%K8IT{nh$hRt2^`QyRx;O!ab5eY*PajBGo(D<-n
zA(L8CN{N6?X(Sj!7)uq0BM^)M*Q!Nd7j;vW8C-Q!*JZWpuxWv|xHuUeo`S<|?}(=g
zGTo90N`*=_rx9gRGAyz^*Nn@E(nutzkDOpk$RyFLcS>L3Z~IeMGYDpl5%zdlL1oBJ
zyh)zlFTp&|C)>lbWc3b0!nN_mQbZ(zVkML$)(9cg3j0KHN@%NmBFU<m@vVfGU(^ud
zckWH5%jIG|&GYGev0U6=dc%t}K^K5UN~5t@A&MD<hz)`vhlt~zh-4}$<%~okURUay
z(kN$j31Qdf5Td=K;~$H8e(LS+?(DqWJ3P<l^XcTpJC&vykEK$K5^ky_X-uIo>O|2v
zRVL&rHG9pN)HopM8QGOoX?)D)?yeQ~EI+I3*;jA!IKTCtzy9~zuZM@f-#@+IJHCB<
zyz~yjIJruUGv*N$+GymHP+&obj%6BSNHm$CO#r3RYkj6!RW(Lv+j7<v@cn-C&#RyR
zkzT(sZJc);z;}R&NgNy(95$0dO0j7PkSoxr64F(5F>NW#lhBwejMIk5tr}Ac1SF8e
zi?*UIpaRK+hqWdM(@+>VwV+lZ3>GSbmnjL15fXz#!k<J<f!G;h!UX%-?>QSE=k3+@
zJ)b4}g+Kb<@41HqdA;z$aeejf*~d@ElDJ|2XCgSC`pL=r7>vlix$sD(ed>6XGma4Q
zdNw!LaW=h6$5oEU?b7lK7n<S4q$Mbq*y*^`5tQ_Ns0!)reH&)TIr(Uz7Cd3f2KKzb
zt*ku6S>J3>-F{r11zsS{Y?%$i!Gf_3I*2LQgLRw@V9L<<letq4Nz?}Ncvk1;|B1ct
zuJlh&Pd{95P&sZ(m7lS~;1ISB?~ERRArV8@F=&B?oTCd173~g1*phd1bM?upYkp<@
z;mrK}{CCsSH>OvPS3By3`*zXUy&dKQ6Z(sNyLa>U@#qr{c!h_AhMwu@xD)~RlNFXL
zfCo&ECRL7Z;wvxA&F(^8`^?InPB(IQ_TT95zwzz6!^4y~;l&+E*v^Y^h?!4uv9Yl~
zf&7@AXg;)zx`;O*izOTHrT1&w9pq2ln~N)p<|X7Yc8+yctf95q-(9(K^=khw)weZb
zMiK`HQ~t!oVKX+E4241RO|TuAa6<q`KWgvhHh30iW~K&R$n&+`<KBYXV#~edYHq#y
ziFEk9G!Ao&_KH6NGtfR3NC=AzhlYH(OZ66$fo^C#>nM(zdw%E6$P%nlggmqM*)6m+
zXP=*HY-~N9uIrWo$58A9*Zfa$7Y$l)K|{(O04vnPWa0D0k&%(HyKBfhXD%;#&xKs?
z6_uWDZ9Ml`ynI+LPM|F~{|AweL90dIYwgPBVDKYFH@D{bNZ-gvYxxq|`lM*gY}`O@
zv-#V`#&cEYUY8CRA7Q9uV3}iw$|6BzgEmu}#d>k?UJR<_=R+F))rWH$K%*Ubyz~~}
z{=BrRwCeSj&ljg}|1coQJHxO$hsktg8us?uu9@Br<6w}I5e-i-U+(KGE1E|h<i5Lw
zo@fUVa+M$Z_*iKYUm<(R_oEDUh{ZA_Xe^PLA>^9nXaqETppwaH@N#2^9lEWaQG3vn
zcq2l0fBu0|@j=pl1qEP$JA{*ZXgfZe?#awD&Ua6;KuGUzQaAus6ex(A#k#t>D!iF`
z&it&@g%I2z-p_O1m&+Bxm+6M$fW;0r>G)fM$Sj>8u<hb6@C<9!)!e)(06(^`Z2(wS
zW=1$mIdZv7CgUbS!&iJ977qK80ViaKDW*l(dxBODfGq&RAJw+so;(20r9Il}_$YH-
znXar-J%>E?Wpz2@;JFHN6yQ<eQUJF(EU^M4W3oFkU`q?%di}c1WWeBozueQR<;3y!
zVvVjiX9-`@;&%p-7tJO~C>bS-=P6`aFD3ihfhNw#NKQ@^9faQxm>31oPl6Z#f%G+m
z2a};Tz5de|@aEm4t>o@CmMDtf*RCS3`W^EcLNLzNnk<r}Leom9Oq!$1C5oa2fy98D
zk%&=WOJ<PFRizs?^Sg#@u$}6U?)lLRUw(gIRWBzBt7X(#4?^x)H(bspX_E`cTuK<G
zP>^Zh(OpC_*eNVL@#|BCg?Tg@ElLE_PeR8a5!ULi767kVtzGc2mk*$RdAUie6Nahe
zq-y-HgH1-)pjJwe5^2rsxKu(&HL|31Uprhb@Am@}|L|vG;7_MO1vA0d5=yc~ToJ%O
zHuG&aEqa4N58$4Y%RfBGt=5Ecq%u+{6iP@kUP4kNNk&GJB(YzkkffzzE>$EDd^m6m
zAXY}d_>jK1c$Oft<`@7k@NHK7&}YEUG^duG&H+_>Nhl$ta7bFi@05h#Rl)=_uy;5{
zklOS2|C-S+pl38D10BUXRt^o`95O&b6a9$sgVXuUsH!jF5?m5I;QViq;AyDLbl_e)
z7$eC0+eDDW<eNfhDW)&$cE<o1jzLowfNd5UbS^ueIcp2*HAw`)m4Hdnr;s3|;Jr$F
zuZaYCqZ2!GYl5Axp{0oF$Xrw(*k*tccG)nP|G)|0a&2z4PRS#P5UvCg8A1^I)w+@_
z@E}JH3Q|XJvGeB>Z$;;w_>%eJS5Pt)i|jG_Kr8&Y*Xw)p0nEM!AcU8t)ajIIyf6Y1
z#!EY<)5yro^uyRY5+mpd^8OHmBZ_`AK#qR%CKdw~{TCI$W>_>f8~ih*e*+fH8<Wpy
zkfW4Jm6f_mwX&c<sjk#%<YeZ*8MA|sII=Vj;5$ioKtgXQx8cPKIAu~2sOpNd+gL?6
z_KL(^FS;8VG7vM6m?Z}p79>I<B+!Wo?j>``s^cg-unk@mCD_D(VI@LZ8k{<L%4G-y
z79@RW8XCOr_r3S|RXsFe|B@L<4nO|id#~!*edP}>%+vQhWB3<6;F*@~nWhj6zwFXq
zz8f|KPBlJM1|d5Y0NXR$4F%r0bM3dk|I>Fj{sy`6*FS!9`3jsr>G?T3Jy3eLx3{}T
z*~$ty@P4i@XA7~mN7)6@v;lOZol0O>3v1Qt4jzlt26zg*dFs-oOJ84xHN5=wl}oOR
zUKYF{*K4NJ*@@SCd!XWfz6H<glX1i-dGHS}J;UbXNEIbm3HPC5Rf5aSX6p#V+n~BM
zIF9mq(Su~&v=HN~ySs09cXwCOEA**Y0{@OO%|qo?1aSV`<b##k{*DBb)6J-1XBXbj
z&_hspK6?3lpKl2vic9Yx<HGd%3Mzf3SbY~|04nzIDk|`Y`Ewt)N)MJc!w~=z)6KdB
zZ{NK66@cJD<ogH@pdXM2@ogXrvs<r(uyX|pG+d5>(|8(LWbp8?zWaRY=^!>-!d=<|
z@XpPzV4@7-M8ONtLl9GNOd+yGC|KYK@ixlVnj!3Lydr>4=Fc@-t;6R2Y)1Z$-$aiZ
z0!S;U7bFjYq-h82<;1|-|3rCf7+C~qqbl&Hb4auf8`lwBL$K9K-o6bDmB*luAbAiX
zoUBvecw!784uV;aDl*st51wbY@EmS68!ZqMx9?md(2-sbc>pp;>B|*3mYCg&$1r+(
zqly;+oJSBu1)k09Ax9v11cE2QK=ZUv!GYJYyn1aIK7!s6*a_gz0Ky#W671h^L||78
zq%;3zut$jJ!0^xO1tSe0&6FBG`njzo^L|i1yfqNK7#J{kvS$l1{z}VKTDX3e_bFV(
z&%AgdK{yOcaMe!^eSlM;z`x)~+0(YniJoN&F}<OuV3<D5R0lzX52D)P1>CGRT1Q~F
z4hCNUa}IDL3mY$E+1Mzhh0P$&6u@WHu=y^PYX8mI!T0s3A$U4S-Z3zX?S|(FqO84K
zb<(Em!$=A2R^U$nLiREMwx=??t(HDgm%-f0U=Kc4N1v~8D63b~!t#9-;|*U(u-W){
zD|r?UeqyZ|8!0{3z62sym{?w0js2|QpP2%9P7tVy)UYc88&4AmCO0DRB7rV=p8@m8
zO|2f!>?qy>tbjpR9YhA}AHT<jZOIK9>30P3bA~|OGle@DW0uwb7ACF=^lU#zU^LQ)
z1U7#iX~Tx8^~0lvrx4^d)Is*HE-n8%mgVK;sj<8;CFkUF8rZFY@B7=@p<(~ZheK*e
zpaUc2SA`DR;_3oPl$mcG>;{_c1o`}DLC9NqEE3l%;ip3#{Om4uM1J94@yr&5s^;~=
zm8$OquqzHG0ZhWDr~8e={|n5SVrpq=fqo#94s^5atmo(9it{<}2im0vYyEN!Z*9NX
zZyplZ{Uy*A#f2zy3lq=|Cn^7xL0=y!fhaci`*D}{S9ZeptvKlNvs4F7F*7^IS(tIa
z>ka4~i2)BmewKnK!DLH{2L}MA+8$J^wc4)?g2<r0YkI`c+}tex%ngC(_Z4(7h(Jev
zR0QBWf%T67CWbbvwJ@w61CO5zON`Gx=gdxm=Mne$h73aL&@h=<48aR)3gkzPr$B9{
zrkI{ViZV>MQ{Bt?3WS2v!(BRmCTf@*+1Zhz1iSP_)Zh4l7?_EtTi7|>(+e{A3>z{y
zR4Ic;pcT#3BQO#@QJk6P%uGN*_9D<{knW|Yp&^Y_f!pQvP;VG}n))%&7GnUFO42J$
zj|el+3(_g<rHd(pPq^U$j&yrvaXqXN2%-Y@eM${Q@5tCxsZ_#0rGjPkv8PWoOA}Qf
zkM!`9T*LKpd8HCE$S;f&M0`SvLh)`1Q6W6$bdO&Z=ygKF7Yc0De}p?tKYY4SE?0F>
zzekZ6ctK!W0y8i=F(xekxW^zD#D)mMz4X7cDY&%_mdlGP>pKL3$e@?iDxw7k&vz_|
zn!?KKUc8_JxnTmpM(cehDM9!IWiyOG5~Gc(#JsSEd!%G%ecLik%OOt(!Q+V%_zXe3
zd9P&<#7|J(Fo+fTr5GP7ya^{KCq}QzdY0GgWj)q_qZQ;c!38^H!zO@@#;5B^wT3I(
zF;KsKvuLG9CuQyy2hg;^(d+R7Y6UNxe)t$b2>vpIV0jS^B7vP;QQN2}iuCxzBxPc3
z*b;f>G%t%D?NP{ujyQN-fw+V<30~+#@FcM}?M}qgBXZg_={<-m=(_AdL2UR~Yq*GD
zEo3mNNMhE9Sm~h{H-1-Gn#b!$9)L%mn4VG~cnq%WgyDAL27(v5w4riG*EB}QzmHN(
zTe&=8sL?!W0pkUs;Ufldq#5`wF$~`<5{M!l4ca*B0+%+>;|xeJM*&Xv2<!x~<Me%Q
z*uY;%fA`?WO1QbWk|Yp^sxKo>)iJW;@t6Q|fP?5Bg1|w}+^2@kgHH&y-70TZ7T0SG
z($U~$lv6d0p}04e7LKw&3y7l=Pac3$Jb&iiLj)VtFqs%CuPjz-wKf7tgo?3s>@kfI
zDczMBA2Ea*sQ5HZsK*{1di4eEnR|~OC!3g0b!?az{Kw*Ejlhlz`cQeV+J<2SL!*F=
zq1bPjzOs-b&vW&DUFe;MhW8O{K$>!-nFs6e$zm12Kc6~({zMVTZec*o{-Oj8!}4|R
zn1@^h0tVoL1lyk0svw?IpzPSiq6BHIcG|#P94HnI(@_|4;JNJ4LsWST0@-|%X$LU%
zPw2;>6g#zbq>>QF7KTdN*1qrJdip%ki@^E^`TJpFr1D0A*ARrE(p0sv^4DvgV+rs~
z!a!qA^E#;?fPcStUxC}16f{gdg|8C1Ay(|@&_tRmwZz%F-Q8A?io}>B4?`Y-Z4%r}
z0hk=DY@%0VQ0qufIU=bh=LC+t&f{RczCYLo4KwBK>Q1$`%^-G+i%9C`|2j2)*7l7!
zjMKy_2qO$Nbjv%?E9l}3rpe+oiv~k~$TS_gSgT%uhU^*y8Z~<GP=l6$z=Oa`r%Yaq
z;NakphLCsA=h1PluTF}a&*{(IS-FqCr;Lxm$Y`U^_8pT7zb&;;H37e&8}GK;T~!=~
z<ljcyX>$@Fpbc1w3<y~vXjM$%Ab5GH%OW%XG#}S!E6;6KbU<&XU19guNwxA=;Urma
z@+=?yqARp&q!LCzBb_!zM$B%S&u0nY>$<k`A@sZ`&wv(MMypCHjT9EsAhHuKW;-q6
zxC3u;f9F8xCPkWCLQAQQ#%V*Bo%<lv*}`QnY?TZkbp5<4vb^{}NTb==qt;-#%wAgM
zoe5h-p)+08FGW_4=JTJwW5Nh0v6M8iS<-*xEDk>2OnrJ0c1|j!&=~~GN9C(tcy&##
zKIQs<bM^gC%U;-07^1@KV9ShKG5Qro@POk1S8)F|9`7GdSwQHty-<Wq?#(uJ1*W(2
z&soeDHcyKun?FpmS+Xr}e{Vsj`foUi<8n*mZ2aw9WCPKe2j?fiq#6C$5~U=B2wy(O
z)s~sbXmm3=Wjq?&-25lwbC?%)e{}Y(M)tx$HF2_qu`Du>rr8=fjg+~~O};{GcAc*J
zh-tNx{Ld!s*HEe#Htjx2cg#l?&siV-txNdm*kH0QbG!ma<zK4ng}7V@E#~QCg+jdV
zqpW836otX01G*RzWK>g@i*8lEwn7SVxlc)nLmH!Kv{1G0byRRkq__)u;nS2=pXt^{
z)cC3zAmnA`DZHI*gfYrS3mYL+w~1C*9>$azUmdqDajeofP8fS$bD}Kwha@>PLJ6h#
z@+}wZPlFloX9^Do2x-KykrakqgFkGGD9w@>LHIC6q8n>h6^`|Dbmvc^9LYjNgR!Zb
z*z+>cmx;F*jnF-F0}^u>^GDT)dX_;a^xT0J4yS3HfY|qa&vS`C4Z>g+f?#&XDQ|)f
z=Fnz%#!I=p(Qs{cV3JMW2e@z`5WW}}{kCEP4}=UQJ1+6u0WJUrXMpAoaK(+29I%fO
yhhwNOBAnoH|77eVF?3{jDL)LIOBr%qYy3B$=myGJ$`UF70000<MNUMnLSTZDgS^H7

literal 0
HcmV?d00001

diff --git a/res/blank_int.png b/res/blank_int.png
new file mode 100644
index 0000000000000000000000000000000000000000..347357436c38fbcf0310a5bde98d7574ca494a63
GIT binary patch
literal 6440
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

literal 0
HcmV?d00001

diff --git a/res/blank_psy.png b/res/blank_psy.png
new file mode 100644
index 0000000000000000000000000000000000000000..6361e102636d12d75d0b538f11dd7b42ce85cbf8
GIT binary patch
literal 6412
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
a*NsnipMKVtV^X#N0000<MNUMnLSTY38T<(V

literal 0
HcmV?d00001

diff --git a/res/blank_qck.png b/res/blank_qck.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc1c85599d3a7b59d90bcf5a15164ff25fce162f
GIT binary patch
literal 6345
zcmV;)7&hmLP)<h;3K|Lk000e1NJLTq003|R003|Z0{{R3@je8300003b3#c}2nYz<
z;ZNWI00RI}OjJbx000OA2M7=o4-gLm3rQFc2@ez$9}f-(6*3kS6CV)`0Rw&|6%QO5
z85A8Y8yy}g84e>I7a$%S1|nA-A}InHd@LOyD<ByTBu_IR5fvpyB_t#*A{#Fx9UCb;
zGbI=|ATKl~88Rjx2rFqNDl|1G8aXByHYgi4DIqs090DPjI4T`1EiN}JBRMM`Ix8SK
zEFwWE8Z<5{IxQnRE+i{7Iy^8WJTN9bF((%;gg!DT0w=LQGbuncDnT_XLN+WzH!Vvx
zAx<_UG&f%nHJ>*=K?E|n4@q=MJT3$`#4kT|O+PYKJ|_-9vPV8?S3)ruKe8rKYC}j%
z20_VPL@XXmom5CZ7dg>fN;3>g$Wu>3VoNX`KGG*V&t6VAA7O(|QdI&?-a$`<XHYaJ
zMAKeVNgq<fW>!B1T;gt5HZ4rlQCxFtSwbUds$X4NLtv9JRMl=>Ndj!=AYsvXUOIDM
zM-hIs9bf8pVo7dhQaD`JKy;FMW=w!(KOu9{XKHRYaJ_qIO;&52K4jS<hPZ!hP>E|o
zf^k?0i2N*l-$8NPUv;62aY{Fexp{YUiFR0#bxAgX;EQ-$CywPxc;0Y(o?m{qj(c1{
zg5sKaOp$(FM1|#rfP0^PO+u8*lYn8CfnrLB=URZ}qkvK?oA;N5W~GBxQ;F%Bhi7t(
zxsHm3n~7<thgqGAYlVxcU5@HFqxqnWZmW!0qmOTxl8La7U!{|BSfKBYl(ndqc0#fI
zw3TF=nV77YcdwgzJH7w8nrB+9_^_RQf1}x?pq#s&X|kYzzM*WjqJX!ggTbV4m#M;V
zu==~Eh{dLLyQ+u2tBk*_j>)Wh!mW;dx%joRu*0#C#j=ykw1CF6l)1RJ$hno#yMeO4
z&XLRd#lgMU!;ZMd*PPP&-pY^8%gEx+ljP8uuG{^^*5>Hbo7L3P>D8a=*Q49m*zDV<
z@7}G#=KbN|-}2(I^W(SY<mA)q`s?WE`Rcsy?CR$9{q*qf_Vn`l_xJJr|NZ;=|Ns9I
zGZyav02OsfL_t(|0eq3MYx_nN$Fl^3@Sw3;I(q7oKfy6sg2-Sz#fwQM6UgKxgE4sU
zQqy`d<)BB0gM*f92hl5q>u}5c4m5<4$utru2nh>0lt43NaMSN84b9ZA&rk2^-Mx>$
z=Y#G?b$q{r*z$cW$UR&CBWwtqI-LOdN40|grUvM?d~E7;JHbJBlO$OJWr(+YI#~%m
zY#(}_*Ty-|^N+$X91Ox^r*JSFAcp_um*dHFF`Z183$hychkm>5<Adn6kEe2jk(ryl
z@chf^k_c^+%ho|R$%`V-3xp!etL)R)lO<n{hvD&2&<?`kgc+^0i3p)YD5V&YN>f5e
z<lbwo*or_(0_n9IIb5WrvUf?9WA<h^&5JUJG6&4^x~}R9s>`z4WuLwp_0Mm<5rUBw
ziI~s^lK}(|<N1nfqbQ|BYK;~eoTCI=uEyi>WU*K-m%^Y2*}JT&i#*BlysRo%8aED0
z;D9WvI{RUEcClW6xxV<kcm1P%KZX@i8kyJ#$|zTg<Dso}9WE53lu5T4y-2V~S^IuY
z+gn`QpH+eR@KwNJAYc~-nD?{Od7A$93caN1ym$7ULp3}b5z+9Jju>S?Q0-b)5oJ)a
z2oOc3)q)ZlxgUe|CYu!X4g^?oz}7G;0fWnLPv={(_S-bwz94!2{`BmZ*uIG~V_-}o
z)sj0;x)~X9V>xYrHex!)Z3|8tmv1u8<|g0m954sa_eEI%e}6T9c-=p&NB#cENq=<p
z)5HGn?fkPF9XqB`4o8G_iY0A;4o+okTq$&HT+TV(OSojRxf&-R-JiMJHNe0dBxPCu
z-kZPd)BYFNKmYOg^z@kiHXF^-{qwKA^Odx>)=3FQrD?JTXd6?;m2j+LiLYiVwy^2M
zBCy|mY7-}AQ8}RRtGdd1|Bzn4F>Rc89Kd@CPAH}X>JY;cdx{+hb-)E`LLI+LP^eid
zg;85-GO4pCkXy^~N~&7x(!@fO5|7jyqgYHPOs*Y}Q)DwbiifLGlo4+@GYuiE^A;y@
zNN7p;LsX&z5<mMrcjnIL<<<5*b0|i-kG{X>?)0Q}b;-D?aRwz|s8r@J{kUUxB`nC{
z{h!Is`Ve4P)bVd_<B?_`oV<5m-?9>~%DRD2BC)zM8;{3g@ujCTCycRKuhQDN5of2<
z>2x`%lPj5Ce5A%toj9pHK1SCJz5!s?`TO_m=A~Fp<zoaOc(JL`evij99AB~<r)FD}
zZLA0%CY>%O9FeR0F@C6mUd!MS04qY@U8{@53wDrb{@ce-SC;_ne!uw~WH@d&#-@}S
z+q2U4jC6A1q~nKVhsLRj&~WS9_wJqW&c4N)dwS>2eDvF;_|#~3_|DDun<3|}o^Zq*
zg6-Q<vweHcHu{sp{^3O`+t}n#=Pg?{Z?^jVz1f3bg~kDdhQ)*Tzt+e6#HFY4%X4VX
z7Y+x!t@8-Anyl8-hI8FNy?j+E-}h2V_HE=PIOOcV_7)Wt?S}l28{tlv_zrjn1!1N~
z@VoT3-4UxTTv?hL3a=+_{AHaa$tMZ4Mv`lDhURniEmPJqR+6U&Q_1Yzi_M~R@_7LB
z2Ho&XCBX@!-@mzQb!uqTF^8VaL?I+f+`18sUN#t-Uq5u!sVv4EtG%2IV>0cFFbO6X
zboJ)JQ|g9y2L)bgiJ5lXn(cKBwFMBG>$n-cMItnF<7QZ6Xl~Yt9YeLiu@pDyHUC?D
z(TPEL4~52hDslllV;+?rTe)g$bJ?uqvN?<pxsDQGBCF0|FbMRcnzDVA1wa3TxD$hs
zF?TRBa3l+ZM$J&BeWlZ4vss#2G_o*SI}=5uaR!m52A$3zI5gT+%~IvSvPX)_B|+qZ
zgMDL>3%R)%)E{jlx@Ii~%Smt8>xG7iFXqsiZy6<Mu*%g`xp84Y%2UI#sf)>WWJekd
zMnb_icv~@8^An;g2E%*vW&)vrcXbWnJRwPw8bra)cWO%Mi?Y}&9F`?POBVs`1rQSY
z>b-1ec-L6-4$(CQU35o%2!)l(C<QLp9euN*p+P4owbblkIIwUOuWW?2sh;dw?xmke
z26O=k3I4WXD+V<m5N80?8B{F*^35a#CVYH#gIe7nsG>kQV{wB`D#?~0vbRneIB?--
zcn$65k28*4)<M(`gnV@f&CjFtd4wFY!-v)C45dZ6=Vi>%*nT?I^sf|CPKogDNxO4k
z4Jj}**7y7K#jr2^li4XN^jXw8oy-i+;rHl{K8n`#VT8P@!)nzQjYV3z!C{FLAXzi5
zBMUn7BIDzc!JZ2M7XR&EC#)xlU;G;8CxZtcJ?`N1XAsKgcg%QYDs}!gTa%!)oNfo2
zyt=x)yi8I8*Jn(Of|w*hWI!MR{KT0D8xz<bxIZj>t~mJJC9^9d*U_M=0S77?_2yga
z-?!@Zz80lQwW-clTTqEPs$7|5myn4F-0Cun(k<DAWIDn!zJS4j&}7i<cE6qbT;XRA
zZtMLgiDMtAl*=d@Ai+!|Py*Y_N)?}HJ1rH%<)|(a5q26IPyOy}W22TrcS*{?q)B$H
zsZ)KS^OMfJF}P)5vv(Z8iwh6!zwDRt^lE-fSjyLT1Ofq{&j+VKt4c=Hdo%@=bUR#5
z`-dyj|4e53%4cV_l(~;?2_?B=5f&*hGCAh%>2U*?d;Z~ryLBIXGI>gsEMF#*@!7~^
zM3v{XU{5vX6cVBE-7D7t;$-5}cd6mxwFHs7ju@mHPQtqlHs*LwbN1oG#V_=u?VAaK
zj2l%xv9rHjDz3!devwe|`9GeSiBGjq6O&9wdCHvwU|Zf~s0RuT0=V_P2MdoDyFkn#
zGV?iL1|jbE)E1Ni_iBkqsQr36O=9z9BeaxLV`Vxf!QB)X9O&uk>!bHH3k!>ji)Zws
z{j~&<!I1eG1W`Y{;k_ymYA2>sbA6hdKSN6i+mRhA4fgfG5)MQ#c>FFjTwJi%b&vc?
zOkfj|v56q6x<}fv2RTq8R7_mw=C7xIv`c&HkL(w}fszU=rY+<17>wZmk+_2xJo0a7
z_~_B2OsQ#j<fD2qkAU#R_3b15ZwY=-x*vN7M8eP0yo(|n$*$KJa^lO^u*g(Q4s|yT
zPDWsd;XVjA&B1RLDKM)^skHWw40nG7=^h^GH%SZjR4QPe2M#EN+H2f^Cn+gYNF*ZB
z#cLDEFaNF;im0iwLuElY#)AMBR)mt^$)CTTDb<)xw|hM8HdC#%Kn%|x<^6|HI|yy#
zO5*^&WD&)}2YL4}Rab9ArwtwxMvRfrh+!lvJ`@)Rd}v6$xbY?JniL;4Yyx80Er{SX
zH3sdPfHx_{4vR!!m4hv82*$w#Y_A28jZcQnp%79C5gHgBeBJMR-|U-Dk>mZFw6s3_
z_<!%c(epS?&P<GzUmP7B9tGL61sr%MH<B}j*gOhy2%>J{GKM=9!TWeDjsa}o%{#sg
z9)Z8Rp#SE#AAR`AC%^viqfb9IQ|Q^?xw)*KNZ6(4M@OLIKfVDkJtAX?8RGC8Pt%%7
z6)jb<4=&*YTgN9&2%f`O9XSC103hB5>BH2r$jhP!u~P{liuJ?8gTuqaI(mf>iXr6x
zqb#YRs#WZRp8$SUTHI)!G!TqOmpo5_gLog5cO?YLbI{A@M;t>4G5z=jq$u?CNP#k<
zi~5T&V^A@pRuLN_IPiL}y!d4IcnZMCvfuU?2p&X!9^nCme&j(M6Uf5K-ZLT09AX$~
zxW>RGJdH}Eh5(+PwvSd8AK)5BD}Fm{c$vT?fV5*=7d-?q1xpvgo`!-26(J77>}_ho
zw0T8r_``tT>74risSM*9K7oE60KW}D6fLW_AbJoab<<T|PK+J=JIsNm*$4(3RW@7z
z&<C>P-NaqGiCzc5Z(-Armn4vO40!|+VcAw#FfDE?4TGSq&LT7<5IcG8TX+ul{5Jkq
z1RD})NiRblf}F#Q<O(W=SlQ#zv}{&Y#F+y4Xh8OBBN!V#!hW4j1RH`EfZ$2c<(>*J
zIQE?7*>g>E5KIRkG(@lim3#u>(S|&MLkK1Vkk0)1U`B|Cz^Je16)gcE&6G97N`B|%
zReE?6_%(vyg$=<|;MtxjMDbZy<`W|2*lM4`Rh&TZJpTz?^*^`<A5S0>c$pXETjos9
z(1lpq?oL6|9X3-0zh8LNFTqzgqX6E*b5GzG7v5Py_Z%>10XJFMe#)}FT}}v7fjH9;
z^t=Ojd5j}%aS+c01Ig<JZESaam0^(0r*$i#ryLw9fk_2oj)r6LU&Q0EO(6u*sYod>
zcQ%;8$Lh?(&398DPYA<tP~;8&P9tsqd<RAvi$^wn-jJT7=Yhx-N^6^S_O*$BmJ8rn
zu1ghzhC_Yd-zU)XmLhR@*B0IOSwjL-;JpXTBR5~~&B_ek0t{DyDLROK->HUw!G^Ku
zHhLW7&lv)lr;F4aW7g<jmD0FC&vbGD7>@M2`;Ve1_&-hcBN*R0<zTpm9Aw`3<FzL&
zYin!svm-*6oR!OUfk_5>-pkQ`7-@8L;}wd$p&V&8dj@EV@e0!*%imbo4K&ko^Z7Hu
z9{_|L#ADDfa&xEI0+EC7-KCbuSN_GbGAXE9Ity2-ku$&{2F9Y;aB8=4;++Ec_2>T&
z%;{qO@#9MH1(~y;n`zo<Cy!U0b3woTrap>m7`wB-d*Yu)zLH?_JkS)=l`yN7612lf
z;&(&PdCy4U^YG*f9*fbPM)PHdgDLhb<)AK>S5{Rj%NBT9H~5UifQO)ZmV(FD(0lU+
zz*zrc18&7XDG)>k@?Db=6RWE$>T7iZJO{tSK{o^~`Kl-c{q}1BBiDACcrES)d(MR+
ziYpIQR_4G<lXgzSE)W`iFkC&x1fY7<qzUYrsV<h5ABMTEZl~PKIRrvM>2a|28o;T>
zt`sFW)U$}}6W<kM%REWCoidLVJQHjqcx`LFdBQ<<4Ms2&(_(sgNoBbN1w&7P4xcD^
z2>t^>2!Z>x4c@T(Y3eZ06t@8?m!(%;niRU*U64*8cywzcaPXG|`q=O-fz=HKf{0+x
zKBa~tJ9&G)TrT6Ea=|e84&@WIgNZT_bJ~&(H>$Putq^1%7(F6Bp+#Z(ZW&P_(wyU7
zCcLw8u-&S_6=SqogY3TxTD&5OZrXKCLtw^cO0&XndOZ#%If(btpDXbg+-YjH>iR|_
z0M$(CuFor?1qaWu3`C)-k?;0+!4SNJU<57|Ugza-RD$rzW=D?nGYOK&HY$mEVO-Bh
z$+R8Q&~?L79tXiw6Ai!x0CCH->ca@)8<brIVny|#$cJi*@wvIu%($#)q_b%|O&W1D
z(eO;DiGEBV#A~(Sst;=jn`U2a8VJ9AhoX^~nUlFYJ%*-<5Ua-)kQF5GK7c5;C0MK0
z=vdtN{K6os$Tlj9B2g@n2t{YF8zLWa+@m9bAiWq0K~I6Wgalq1MDQ#zn@E*-G9t&P
z8O+nh6-=c<Z%~2@T@9-N_~nhy5M&ht(RLt4VuEqSyTagJxPE~LAiXi=VEcdII(#7R
z6L@Keiz(GHrE4?AKZlu47&){MLyhJcEFde0;2!~`f~}hf{)kVu-70}3;?YnWhc0jl
z4Ly}H1WAJ+*X<EFh+rRq9)KP+jK%-@&yC}q>PD168Y*8#6m3hhi#$4jD!@UyJp_SM
zAb8%J7J~h^YVe+KtI0q}k}V@nRo5oCH=7U^S)jSZ;eKHrfKt3DLG*$(j7-(mt6Rs-
zehDfODzbIV=-Q-|?#dJ=HIZ^D4ows5DGxyOWI<?nZz1ZT__ig%s}JBo(<Ja?64g-E
zUNtpMb0=m1yN%)%O?Svb4m=ts?+2mZ%@Bxb`*(1p!;4!@NdH#=Uc7jw2xL-d5dF&J
zEP|S5INe;22V4*MR<2?H-;NO+_)>zh<4`Cf7>w0SXqd}m)6<%65f*T`dZ9-<lspFd
z{_b!Lz}SzC27=U3ii2t$SxJax3XPI5yMEuL>UGZ(JOuwF!FKDF{0TTRwYA@5AP$wL
z%EzjHy_U8N0iGUUs1e6K{>wE4?-96<FBM|(2MuW02toME23%BgrIt9`R5EE~C=v@f
z^3;YQ@b~xb^-FMv-ePR+@{#h680v_ms>##KkvG@_w%e_ftN3DQxVGQKiVDPzTqKg4
zJQiuhb$J&t2>!QJGiGtzh@&{f_yWQZxiP5o2T0>OodX7geHd;*9Cl~3pj0l>#NcW{
zl?t~mTnSvMa=1za)ChqJ7gq)1!XPvt#%v&;An(m;SkEaem*h8d(#)JzKmH>d6@HJK
zr_M8kvher}I{|%Jq=kwvji%G&E<m7c`U`IgQJ|~>3fo?qozo~Zg$<*jY}#~mz<hqD
zP{?0x2(97n6Y^EZ?n(*G8mWX4&`4(!CDT5>Axs~I8wgoqHh|E!{bLBakA{#&qe?2Z
z6c*heY9w5^ou;t&OvFX~ZqeCAhochyK%uGBM(s4AtC9O)d8TkpA)ld8sjtB?!;VJ(
zAXG-Zvs!DQU3xDY<!Rv!NLlf1VNFhF7?bY89kn1qR~Sl~8q!xei-V6RU7x;*A(Tr9
z+e<_w@y74E?&zD=J58$z7T^7ATHpP++1ypguLZ(=c@lM3FoN-T#5S6aXXEMAWuHx5
z_75``P4&7h>hlaEbp8WV&BqVZkJH)Xdi`WUhi6zq=yc{tx`4@h_bnFg0-fMURxj<2
zpV;nLYc}tHfe%7e;n4S!oW^<o4c$E}!vjo@=_B9&CKZ+7hh~1+2U!kfyzTb8uk^m4
z-$#FoUK8epJ3Z@<+V>({Rz<MOQ>ITs!1!&RMa+-p$&oSL_;6A?kbV}=^8Zi?xumd=
zSAWmPNDW$y4=sIA#5h13#>$v{mi(ku|6M4QuoQn@w&6K_F@}^J8CO-HOct$-Y4W=i
zRVk!Y&WgRZ8`J7_pwhscDMV2VtH1JXggwpT5UJc0d&@8~!4fmwC^*MTmRw{3O2)MH
zO#uZQDF;v5Dnu!YQiwX$T^1gNyumHro}hs75T^;E<Ea9}!_MFBLvFO1U#`3T6@MTY
z)5cNMJ_<2Gqg!&oR+iUmscPgEg`m*86++x@r|lu!`+@KM956PWU{BFM?Y9qu;r7U6
zA?IoA+jdy0GRsmh{;ozm)`)sop%-O74~3|B0siC43hl`u*nwa$7~su829u??oO@t7
ze{is14>7<RR_3_IInYOV=B?B~(8V#pL5a@~mJ?x}%R;CMojPG}+ie~|$7)+vTVbJd
z5pxW=fNLDvfn4Kx>;Q)b-Vm2N9Mo41`BRX_{z_o{_G__uUt|6^D}5n)1{!2!00000
LNkvXXu0mjf*eTw1

literal 0
HcmV?d00001


From 32c1ad2da19e0b250a3330c447ad1c6000d7a333 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 16 Sep 2017 23:28:39 -0400
Subject: [PATCH 1344/1569] Limit Break Part 2

---
 common/data/cooldowns.js  |    4 +-
 common/data/details.js    | 1354 ++++++++++++++++++++++++++++++++++---
 common/data/drops.js      |   18 +-
 common/data/evolutions.js |    4 +-
 common/data/gw.js         |   22 +-
 common/data/units.js      |    2 +-
 6 files changed, 1287 insertions(+), 117 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index cecfb2f28..50f66f03d 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1760,8 +1760,8 @@ window.cooldowns = [
     [ 11, 7 ],
     [ 13, 9 ],
     [ 13, 9 ],
-    20,
-    20,
+    [ 20, 15 ],
+    [ 20, 15 ],
     [ 19, 13 ],
     [ 17, 11 ],
     [ 17, 11 ],
diff --git a/common/data/details.js b/common/data/details.js
index e3cfc4dbb..3a429c486 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7612,8 +7612,72 @@ window.details = {
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Sailor Ability 1: Boosts this character's attack against [QCK] characters by 2x" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 30% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 40% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 50% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 40",
+                    "Level 3: Boosts base ATK by 60",
+                    "Level 4: Boosts base ATK by 80",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 3 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 7 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 10 turns on this character",
+                    "Level 5: Reduces Slot Bind completely on this character"
+                ]
+            },
+        ],
+        
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1315: {//Coby
         captain: "Boosts ATK of all characters by 2x after the 2nd Perfect in a row and by 3x after the 5th Perfect in a row.",
@@ -7682,8 +7746,45 @@ window.details = {
         specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 32,000 : for each hit}",
         sailor: "Reduces Paralysis duration by 1 turn",
         specialName: "A Decree of the Veteran",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Reduce base Special Cooldown by 1" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Aquire Sailor Ability 1: Reduces Blindness duration by 3 turn" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all characters by 1.2x, heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .3x her RCV at the end of the turn each time you hit a Perfect" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 50% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+        ]
     },
     1321: {//Momonga
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
@@ -8197,8 +8298,46 @@ window.details = {
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x, boosts ATK by 2.8125x after scoring 4 Perfects in a row",
         special: "Deals 40x character's ATK in [STR] damage to all enemies, and delays all enemies for 1 turn",
         specialName: "Gum Gum: Elephant Gun",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Sailor Ability 1: Boosts own base ATK by 100 if this character is the last in the chain to attack" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 2 turns",
+                    "Level 4: Reduces No Healing duration by 3 turns",
+                    "Level 5: Reduces No Healing duration by 4 turns"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1388: {//Zoro 5+
         captain: "Boosts ATK of [DEX] characters by 2.5x",
@@ -8297,8 +8436,46 @@ window.details = {
         ],
         specialName: "Stonewall Punk",
         specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 1: " },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1402: {//Colo Dalton
         captain: "Boosts ATK of [PSY] and [QCK] characters by 2x",
@@ -8856,8 +9033,46 @@ window.details = {
         specialNotes: "#{randomHits : 15}",
         sailor: "Completely resists Paralysis on this character",
         specialName: "Swamp-Swamp Gatling Gun",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by " },
+            { "description": "Aquire Sailor Ability #: " },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 40",
+                    "Level 3: Boosts base ATK by 60",
+                    "Level 4: Boosts base ATK by 80",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1480: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after scoring 2 Perfects in a row",
@@ -9217,34 +9432,96 @@ window.details = {
         specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
         specialName: "Long-Range Attack: Bagworm",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
-    },
-    1533: {//Rayleigh
-        captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect in a row.",
-        special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
-        sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "The Teacher's Final Ordeal",
-    },
-    1534: {//Rayleigh
-        captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect in a row.",
-        special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
-        sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "The Teacher's Final Ordeal",
-    },
-    1535: {//Duval
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [PSY] characters by 2.5x if they have matching orbs",
-        special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
-        sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Prideful Memories",
-    },
-    1536: {//Duval
-        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
-        special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
-        sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Prideful Memories",
-    },
-    1537: {//Heracles'n
+        limit: [
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Reduce No Healing duration" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Aquire Sailor Ability 1: Boosts base HP of Shooter characters by 100" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Aquire Potential 3: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 30% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 40% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 50% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 90%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 70%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 50%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 30%"
+                ]
+            },
+        ]
+    },
+    1533: {//Rayleigh
+        captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect in a row.",
+        special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
+        sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        specialName: "The Teacher's Final Ordeal",
+    },
+    1534: {//Rayleigh
+        captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect in a row.",
+        special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
+        sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
+        specialName: "The Teacher's Final Ordeal",
+    },
+    1535: {//Duval
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [PSY] characters by 2.5x if they have matching orbs",
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
+        sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
+        specialName: "Prideful Memories",
+    },
+    1536: {//Duval
+        captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
+        special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
+        sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
+        specialName: "Prideful Memories",
+    },
+    1537: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooter and Striker characters by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts base HP of STR characters by 150",
@@ -9288,8 +9565,70 @@ window.details = {
         special: "Cuts the current HP of each enemy by 10%. If enemies have Delay Prevention, ignores it and Delays all enemies for 1 turn. Otherwise, Delays all enemies for 3 turns",
         sailor: "Completely resists Blindness",
         specialName: "Green Star, Impact Wolf",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Reduce No Healing duration" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Aquire Sailor Ability 1: Boosts base HP of Shooter characters by 100" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Aquire Potential 3: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 30% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 40% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 50% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 90%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 70%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 50%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 30%"
+                ]
+            },
+        ]
     },
     1544: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 1.75x and heals for .3x her RCV at the end of the turn each time you hit a Perfect",
@@ -9781,8 +10120,45 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise and boosts HP of Striker characters by 1.2x",
         special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
         specialName: "Double Steel Magnetic Arm",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability #: Boosts base ATK of Striker characters by 75" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Sailor Ability #: Boosts base HP of Driven characters by 75" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ]
     },
     1622: {//Reborn Doffy
         special: "Switches orbs between slots twice, amplifies the effect of orbs by 2x for 1 turn",
@@ -9870,8 +10246,45 @@ window.details = {
         special: "Boosts ATK of Powerhouse characters by 1.75x for 3 turns",
         specialName: "Rebellion against the \"Prohibition\" - Taboo",
         sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Sailor Ability #: " },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ]
     },
     1633: {//Punk Hazard Dragon
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
@@ -10086,8 +10499,45 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
         special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter character, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
         specialName: "Ice Saber",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: Reduce No Healing duration" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Boosts base HP of Shooter characters by 50" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of Shooter characters by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: If there are 6 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 2: If there are 6 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 3: If there are 6 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 4: If there are 6 Shooter characters in your crew, reduces No Healing duration by 2 turns",
+                    "Level 5: If there are 6 Shooter characters in your crew, reduces No Healing duration by 3 turns"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
     },
     1666: {//Kyros
         captain: "Boosts ATK of Striker characters by 2x",
@@ -10161,16 +10611,53 @@ window.details = {
         captain: "Boosts ATK of Slasher characters by 2.5x at the start of the chain, by 3.25x after the 3rd Perfect in a row",
         special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
         specialName: "ROOM: Kikoku",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
-    },
-    1679: {//Kai Mihawk
-        special: "Cuts the current HP of each enemy by 30%",
-        specialName: "Black Blade Ship Cutter [Neo]",
-        captain: "Boosts ATK of Slasher characters by 2x"
-    },
-    1680: {//Kai Mihawk
-        special: "Cuts the current HP of each enemy by 30%",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base RCV by 35" },
+            { "description": "Aquire Sailor Ability 1: Completely resists Silence on this character" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 85" },
+            { "description": "Aquire Sailor Ability 2: Reduces Paralysis duration by 1 turn" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
+    },
+    1679: {//Kai Mihawk
+        special: "Cuts the current HP of each enemy by 30%",
+        specialName: "Black Blade Ship Cutter [Neo]",
+        captain: "Boosts ATK of Slasher characters by 2x"
+    },
+    1680: {//Kai Mihawk
+        special: "Cuts the current HP of each enemy by 30%",
         specialName: "Black Blade Ship Cutter [Neo]",
         captain: "Boosts ATK of Slasher characters by 2.5x"
     },
@@ -10283,8 +10770,70 @@ window.details = {
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 50x character's attack and increases by 2x at the end of every turn until 2,000,000 damage per turn.",
         specialName: "Venom Cloud",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Aquire Sailor Ability 1: Cannot be blown away" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Aquire Potential 3: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 30% at the start of the turn, heals for 3x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 90%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 70%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 50%",
+                    "Level 5: This character's attack will ignore barriers"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 2 turns",
+                    "Level 3: Reduces No Healing duration by 3 turns",
+                    "Level 4: Reduces No Healing duration by 4 turns",
+                    "Level 5: Reduces No Healing duration by 5 turns"
+                ]
+            },
+        ]
     },
     1699: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.2x",
@@ -10299,8 +10848,46 @@ window.details = {
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
         sailor: "Boosts base ATK of Fighter characters by 75",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Sailor Ability #: " },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1701: {//Ivankov
         captain: "Boosts ATK of Free Spirit characters by 2x",
@@ -10341,8 +10928,45 @@ window.details = {
         specialName: "Hair Removal Fist",
         specialNotes: "#{stages}",
         sailor: "Completely resists Paralysis on this character",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Sailor Ability 1: When any other Free Spirit character uses a special, reduces own cooldown by 1 turn" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 30% chance to deal 7% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+        ]
     },
     1703: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2x",
@@ -10355,8 +10979,46 @@ window.details = {
         special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflicted with Toxic by 1.75x for 2 turns",
         specialName: "Inferno Hell Wheel",
         sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit if your Captain is a Driven character" },
+            { "description": "Boosts base HP by 200" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 5% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 5% at the start of the turn, heals for 1.25x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 5% at the start of the turn, heals for 1.5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 10% at the start of the turn, heals for 1.5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 20% at the start of the turn, heals for 1.5x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1705: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2x",
@@ -10369,8 +11031,46 @@ window.details = {
         special: "Removes all positive buffs on your team. If the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
         sailor: "Boosts base ATK, HP and RCV of all characters by 50",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 130" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential #: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for .5x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 50% at the start of the turn, heals for 1x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1707: {//Shanks 6+
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
@@ -10412,22 +11112,60 @@ window.details = {
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Deals 50x character's ATK as typeless damage to all enemies. Amplifies the effect of orbs for Driven characters by 2x for 1 turn.",
         specialName: "Blazing Hound Crimson Lotus",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
-    },
-    1714: {//Monet
-        captain: "Boosts ATK of INT characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
-        special: "Deals 10x character's ATK in [INT] damage to all enemies. Randomly changes all orbs into either [TND], [BOMB] or [RCV] orbs.",
-        specialName: "Devouring Blizzard",
-    },
-    1715: {//Vergo
-        captain: "Boosts ATK of Striker characters by 2.5x if they have a matching orb, by 2x otherwise",
-        special: "Changes own orb into [QCK], locks all orbs for 1 turn",
-        specialName: "Sealed Mouth Exterminator",
-    },
-    1716: {//Caesar
-        captain: "Reduces HP of all characters by 50%, boosts ATK of Driven characters by 1.2x, increases his own ATK multiplier by 0.1x at the end of each turn until it reaches 3x",
-        special: "Delays all enemies for 1 turn. For Driven characters, Changes [EMPTY] orbs into Matching orbs. Boosts ATK of Driven characters by 1.75x if HP is below 30% when the special is activated.",
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Aquire Sailor Ability 1: " },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Sailor Ability 2: " },
+            { "description": "Aquire Potential #: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
+    },
+    1714: {//Monet
+        captain: "Boosts ATK of INT characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
+        special: "Deals 10x character's ATK in [INT] damage to all enemies. Randomly changes all orbs into either [TND], [BOMB] or [RCV] orbs.",
+        specialName: "Devouring Blizzard",
+    },
+    1715: {//Vergo
+        captain: "Boosts ATK of Striker characters by 2.5x if they have a matching orb, by 2x otherwise",
+        special: "Changes own orb into [QCK], locks all orbs for 1 turn",
+        specialName: "Sealed Mouth Exterminator",
+    },
+    1716: {//Caesar
+        captain: "Reduces HP of all characters by 50%, boosts ATK of Driven characters by 1.2x, increases his own ATK multiplier by 0.1x at the end of each turn until it reaches 3x",
+        special: "Delays all enemies for 1 turn. For Driven characters, Changes [EMPTY] orbs into Matching orbs. Boosts ATK of Driven characters by 1.75x if HP is below 30% when the special is activated.",
         specialName: "Massacre GAS",
     },
     1717: {//Vegapunk Dragon
@@ -10455,8 +11193,46 @@ window.details = {
         captain: "Boosts HP of Fighter characters by 1.4x and boosts ATK by 2.75x if they have a matching orb, by 2.5x otherwise.",
         special: "If your Captain is a Fighter character, changes adjacent orbs into matching orbs and locks the chain multiplier at 2.5x for 1 turn",
         specialName: "Passive Agressive Boss",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability 1: Makes [STR] and [DEX] orbs \"beneficial\" for this unit" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ]
+
     },
     1722: {//Neptune
         captain: "Boosts ATK of Striker characters by 2x.",
@@ -10571,8 +11347,46 @@ window.details = {
         special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by ???% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
         specialName: "Snake Hair Possession: Eight-Headed Serpent",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Boosts this character's attack against [STR] characters by 2x" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 40",
+                    "Level 3: Boosts base ATK by 60",
+                    "Level 4: Boosts base ATK by 80",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1742: {//Marigold
         captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [STR] characters by 1.1x",
@@ -10585,8 +11399,45 @@ window.details = {
         special: "Changes [QCK] and [DEX] orbs into Matching orbs, boosts ATK against enemies with reduced defense by 1.75x for 2 turns and reduces damage received by 60% for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
         specialName: "Snake Hair Possession: Salamander",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Boosts this character's attack against [DEX] characters by 2x" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 40",
+                    "Level 3: Boosts base ATK by 60",
+                    "Level 4: Boosts base ATK by 80",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+        ]
     },
     1744: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x",
@@ -10599,8 +11450,45 @@ window.details = {
         special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
         sailor: "Boosts base ATK, HP and RCV of Shooter characters by 30",
         specialName: "Defender's Spade-Shaped Arrow",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: Reduce No Healing duration" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Sailor Ability 1: Reduces Blindness duration by 3 turns" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: If there are 6 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 2: If there are 5 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 3: If there are 4 Shooter characters in your crew, reduces No Healing duration by 1 turn",
+                    "Level 4: If there are 4 Shooter characters in your crew, reduces No Healing duration by 2 turns",
+                    "Level 5: If there are 4 Shooter characters in your crew, reduces No Healing duration by 3 turns"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+        ]
     },
     1746: {//Boa Hancock
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
@@ -10611,8 +11499,70 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
         specialName: "Pistol Kisses",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Sailor Ability 1: Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Free Spirit character" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire Potential 3: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 50% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 2 turns",
+                    "Level 3: Reduces No Healing duration by 3 turns",
+                    "Level 4: Reduces No Healing duration by 4 turns",
+                    "Level 5: Reduces No Healing duration by 5 turns"
+                ]
+            },
+        ]
     },
     1748: {//Bepo
         captain: "Boosts ATK and HP of QCK characters by 1.5x",
@@ -10625,8 +11575,45 @@ window.details = {
         special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
         sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
         specialName: "Bear Rush Out",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Sailor Ability #: Makes [DEX] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 10 turns on this character"
+                ]
+            },
+        ]
     },
     1750: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
@@ -10657,8 +11644,70 @@ window.details = {
         ],
         specialNotes:"#{stages}",
         specialName: "Injection Shot",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker characters by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: Reduce No Healing Duration" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability 2: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire Potential 3: Barrier Penetration" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 50% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 2 turns",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 70%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 50%",
+                    "Level 5: This character's attack will ignore barriers"
+                ]
+            },
+        ]
     },
     1752: {//20th Anni Zoro
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
@@ -10731,8 +11780,71 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
         special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Pinch Healing" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker characters by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability 2: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Pinch Healing",
+                "description": [ 
+                    "Level 1: If HP is below 10% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 2: If HP is below 15% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 3: If HP is below 20% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 4: If HP is below 30% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect",
+                    "Level 5: If HP is below 50% at the start of the turn, heals for 2x this character's RCV at the end of the turn each time you hit a Perfect"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 3 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 7 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 10 turns on this character",
+                    "Level 5: Reduces Slot Bind completely on this character"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1764: {//6+ Aokiji
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 5 times to a maximum of 3.5x.",
@@ -10770,8 +11882,46 @@ window.details = {
         captain: "Boosts ATK of Cerebral characters by 2.5x and their HP by 1.2x at the start of the chain, and boosts ATK of Cerebral characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Delays all enemies for 1 turn. If your captain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
         specialName: "Restraining Gunpoint",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability 1: Reduces Blindness duration by 3 turns" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 2: Adds 2x character's ATK as Additional Typeless Damage" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 50",
+                    "Level 3: Boosts base ATK by 80",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1771: {//Kuma
         captain: "Boosts ATK and HP of Cerebral characters by 2x",
@@ -10813,7 +11963,9 @@ window.details = {
         captain: "Boosts ATK of Free Spirit characters by 2.5x, and their HP by 1.2x. Recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers, changes [BLOCK], [STR], and [INT] orbs into Matching orbs for Free Spirit characters and adds .2x to Chain multiplier for 3 turns",
         specialName: "Devil Destroyer's Light Arrow",
-        specialNotes: "#{beneficial}<br>#{ignoreBarrier}"
+        specialNotes: "#{beneficial}<br>#{ignoreBarrier}",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1779:{
         captain: "Boosts ATK of Shooter characters by 2x",
diff --git a/common/data/drops.js b/common/data/drops.js
index 666b43b7e..c63e960a9 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1630,7 +1630,7 @@ window.drops = {
         {
             name: 'Underground Trade Port! Escape!',
             thumb: 1735,
-            gamewith: null,
+            gamewith: 66021,
             condition: 'Limited amount of turns to complete the mission.',
             'All Difficulties': [ 1734, 1736, -1571, -1573, -1654, -641, -1182, -1188, -1210, -556, -964, -1354 ]
         },
@@ -1837,7 +1837,7 @@ window.drops = {
         {
             name: 'Clash Neo!! Tyrant Kuma',
             thumb: 1772,
-            gamewith: null,
+            gamewith: 67120,
             condition: '1 Master version and 3 Ultimate versions with different conditions. Master: Shooter/Slasher/Cerebral Only. Can only complete 10 times each. Ultimate: Shooter Only, Slasher Only, and Cerebral Only',
             Ultimate: [ 1771 ],
             Master: [ 1771 ]
@@ -2021,7 +2021,7 @@ window.drops = {
         },
 
         {
-            name: 'Battle Royal! Oars',
+            name: 'Battle Royale! Oars',
             thumb: 893,
             global: true,
             challenge:'Total number of hits above 50,000',
@@ -2145,7 +2145,7 @@ window.drops = {
         },
         
         {
-            name: 'Big Battle! The Three Admirals',
+            name: 'Battle Royale! The Three Admirals',
             thumb: 1314,
             gamewith: 61665,
             condition: 'Chance of dropping the Silver Almighty Book.',
@@ -2154,7 +2154,7 @@ window.drops = {
         },
         
         {
-            name: 'Big Battle! Straw Hat Pirates',
+            name: 'Battle Royale! Straw Hat Pirates',
             thumb: 1404,
             gamewith: 65078,
             condition: 'Chance of dropping the Silver Almighty Book.',
@@ -2162,6 +2162,14 @@ window.drops = {
             'Chopperman Missions': [ 1728 ],
         },
         
+        {
+            name: 'Battle Royale! Doflamingo Family',
+            thumb: 870,
+            gamewith: 68282,
+            condition: 'Chance of dropping the Silver Almighty Book, Guidence Fragments and Guidence Crystals.',
+            'All Bosses': [ -1621, -1632, -1665, -1678, -1713, -1721, -1770 ],
+        },
+        
         {
             name: 'The Flashback Before the Reunion! Fight all your Enemies!',
             thumb: 1353,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 82c95334a..538cbe71b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2721,7 +2721,7 @@ window.evolutions = {
     },
     1750: {
         evolution: 1751,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 266, 301, 267 ]
     },
     1752: {
         evolution: 1753,
@@ -2745,7 +2745,7 @@ window.evolutions = {
     },
     1762: {
         evolution: 1763,
-        evolvers: [  ]
+        evolvers: [ 118, 79, 1180, 301, 267 ]
     },
     1192: {
         evolution: 1764,
diff --git a/common/data/gw.js b/common/data/gw.js
index 1f08c35f9..9f7f5e42f 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1730,8 +1730,8 @@ window.gw=[
     65077,
     64838,
     64838,
-    null,
-    null,
+    66571,
+    66571,
     66024,
     66024,
     66025,
@@ -1748,8 +1748,8 @@ window.gw=[
     66495,
     66496,
     66496,
-    null,
-    null,
+    68240,
+    68240,
     65830,
     65830,
     65835,
@@ -1760,8 +1760,8 @@ window.gw=[
     65831,
     65834,
     65834,
-    null,
-    null,
+    68239,
+    68239,
     35281,
     67113,
     67113,
@@ -1769,4 +1769,14 @@ window.gw=[
     67115,
     66691,
     66691,
+    67128,
+    67128,
+    null,
+    null,
+    null,
+    null,
+    68472,
+    68472,
+    null,
+    null,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f9708811e..7fd577bd3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1400,7 +1400,7 @@ window.units = [
     [ "Smoker Shambles, Autumn Rain", "QCK", [ "Slasher", "Cerebral" ], 4, 19, 4, 3, 99, 3000000, 706, 416, 160, 1606, 910, 361, 1 ],
     [ "Gladius, Pop-Pop Man", "STR", [ "Driven", "Shooter" ], 4, 25, 7, 2, 70, 1066998, 186, 168, 39, 1088, 786, 98, 1 ],
     [ "Gladius, Pica Military Executive", "STR", [ "Driven", "Shooter" ], 5, 40, 4, 3, 99, 4000000, 986, 698, 86, 2188, 1419, 208, 1 ],
-    [ "Coliseum Dalton", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 6, 2, 70, 1778330, 160, 106, 19, 1061, 961, 235, 1 ],
+    [ "Dalton, Drum Island Civilian Escort Team Leader", "PSY", [ "Slasher", "Cerebral" ], 4, 20, 6, 2, 70, 1778330, 160, 106, 19, 1061, 961, 235, 1 ],
     [ "Monkey D. Luffy, Gathering of the Straw Hats", "QCK", [ "Fighter", "Free Spirit" ], 5, 30, 4, 3, 70, 1066998, 313, 300, 70, 1422, 840, 210, 1 ],
     [ "Monkey D. Luffy, Reunion of the Straw Hat Pirates", "QCK", [ "Fighter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1369, 762, 168, 3080, 1550, 390, 1 ],
     [ "Usopp, Gathering of the Straw Hats", "PSY", "Shooter", 4, 15, 4, 3, 50, 392109, 255, 99, 31, 1201, 481, 182, 1 ],

From 919c5f56ce1ac2321ead39bdd7e0641e6012420e Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 18 Sep 2017 21:51:48 -0400
Subject: [PATCH 1345/1569] STR and Lucci damage

---
 common/data/details.js |   4 ++--
 common/js/utils.js     |   2 +-
 res/blank_str.png      | Bin 0 -> 6357 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 res/blank_str.png

diff --git a/common/data/details.js b/common/data/details.js
index 3a429c486..d1e080cf5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11773,12 +11773,12 @@ window.details = {
     },
     1762: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
-        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
+        special: "Reduces the defense of all enemies by ???% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
     },
     1763: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
-        special: "Reduces the defense of all enemies by ???% for 2 turns, deals ???x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
+        special: "Reduces the defense of all enemies by ???% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
         limit: [
             { "description": "Boosts base ATK by 10" },
diff --git a/common/js/utils.js b/common/js/utils.js
index 007b94be4..8e3a2733f 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -130,7 +130,7 @@
         if ((window.units && window.units[n - 1].incomplete)){
             switch (window.units[n - 1].type){
                 case 'STR':
-                    return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+                    return '../res/blank_str.png';
                     break;
                 case 'DEX':
                     return '../res/blank_dex.png';
diff --git a/res/blank_str.png b/res/blank_str.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2d517bf7a8eedd471921a448532f7f205550eee
GIT binary patch
literal 6357
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
X(DDlOrVMM-00000NkvXXu0mjf{TH~f

literal 0
HcmV?d00001


From d8103485156bbe865978c6511062d7f47fc13a98 Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 18 Sep 2017 23:04:08 -0700
Subject: [PATCH 1346/1569] Kinemon FN stuff

---
 common/data/cooldowns.js  | 8 ++++----
 common/data/drops.js      | 2 +-
 common/data/evolutions.js | 4 ++--
 common/data/units.js      | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 50f66f03d..1a6b7c9ab 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1771,10 +1771,10 @@ window.cooldowns = [
     [ 13, 9 ],
     [ 23, 14 ],
     [ 23, 14 ],
-    null,
-    null,
-    null,
-    null,
+    [ 21, 14 ],
+    [ 21, 14 ],
+    [ 12, 9 ],
+    [ 12, 9],
     null,
     null,
     [ 20, 11 ],
diff --git a/common/data/drops.js b/common/data/drops.js
index c63e960a9..0a02e3165 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1645,7 +1645,7 @@ window.drops = {
         {
             name: 'Wano Samurai!',
             thumb: 1774,
-            condition: 'Shooter and Free Spirit characters get a boost (???x ATK boost on 30 stamina)',
+            condition: 'Shooter and Free Spirit characters get a boost (1.2x ATK boost on 30 stamina)',
             gamewith: null,
             'All Difficulties': [ 1773, 1775, -963, -1588, -451, -1186, -528, -1177, -1208, -558, -1616, -1618, -1392 ]
         },
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 538cbe71b..6af62e90e 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2765,11 +2765,11 @@ window.evolutions = {
     },
     1773: {
         evolution: 1774,
-        evolvers: [  ]
+        evolvers: [ 117, 82, 88, 99, 104 ]
     },
     1775: {
         evolution: 1776,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 85, 96, 101 ]
     },
     1777: {
         evolution: 1778,
diff --git a/common/data/units.js b/common/data/units.js
index 7fd577bd3..0df22c188 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1771,10 +1771,10 @@ window.units = [
     [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, 1 ],
-    [ "Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kinemon, Evolved", "INT", [ "Free Spirit", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, null ],
+    [ "Kinemon, Evolved", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, null, 890, 560, 65, 2058, 1245, 192, null ],
+    [ "Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, null ],
+    [ "Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, null, 646, 259, 80, null, null, null, null ],
     [ "Kizaru", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2613, 1342, 315, null ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],

From 05168f245ee04e6ebbe5d517a789d7f67889c72d Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Mon, 18 Sep 2017 23:25:26 -0700
Subject: [PATCH 1347/1569] added more stuff

---
 common/data/captains.js |  8 ++++++++
 common/data/details.js  | 10 +++++-----
 common/data/specials.js |  6 ++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 66bcf8698..29398d305 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5415,10 +5415,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
+    1773: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
     1774: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
+    1775: {
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+    },
     1776: {
         atk: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; },
         rcv: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; }
diff --git a/common/data/details.js b/common/data/details.js
index d1e080cf5..32dd3f132 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11936,17 +11936,17 @@ window.details = {
         specialNotes: "#{orb : 1.75x}"
     },
     1773: {//Kinemon
-        captain: "Not Released",
-        special: "Deals 20x character's ATK in ??? damage to one enemy, boosts chances of getting matching orbs for Free Spirit characters for 1 turn",
+        captain: "Boosts ATK of Free Spirit characters by 2x and their HP by 1.2x and reduces damage received by 10%",
+        special: "Deals 20x character's ATK in [INT] damage to one enemy, amplifies the effect of orbs for Free Spirit characters by 1.5x for 1 turn",
         sailor: "Boosts base ATK of Free Spirit characters by 25"
     },
     1774: {//Kinemon
-        captain: "Boosts ATK of Free Spirit characters by 2.25x and their HP by 1.25x",
-        special: "Deals 20x character's ATK in ??? damage to one enemy, boosts chances of getting matching orbs for Free Spirit characters for 1 turn",
+        captain: "Boosts ATK of Free Spirit characters by 2.25x and their HP by 1.25x and reduces damage received by 15%",
+        special: "Deals 20x character's ATK in [INT] damage to one enemy, amplifies the effect of orbs for Free Spirit characters by 1.75x for 1 turn",
         sailor: "Boosts base ATK of Free Spirit characters by 25"
     },
     1775: {//Momonosuke
-        captain: "Not Released",
+        captain: "Boosts ATK and RCV of QCK characters by 1.5x, and slightly boosts chances of getting [QCK] orbs",
         special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
     },
     1776: {//Momonosuke
diff --git a/common/data/specials.js b/common/data/specials.js
index 92150b70c..38c217b34 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3559,6 +3559,12 @@ window.specials = {
     1772: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
+    1773: {
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1774: {
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
     1777: {
         chainAddition: function(p){ return 0.2;}
     },

From eb88716fc21eaa9973efa7e0b3806a2ea8c240b3 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 20 Sep 2017 00:31:45 -0400
Subject: [PATCH 1348/1569] Lucy sugo

---
 common/data/cooldowns.js  | 14 ++++++++
 common/data/details.js    | 72 +++++++++++++++++++++++++++++++++++----
 common/data/evolutions.js | 20 +++++++++++
 common/data/families.js   | 22 ++++++++++++
 common/data/flags.js      | 10 ++++++
 common/data/units.js      | 22 ++++++++++++
 6 files changed, 154 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1a6b7c9ab..8d4c2b61b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1779,4 +1779,18 @@ window.cooldowns = [
     null,
     [ 20, 11 ],
     [ 20, 11 ],
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    19,
+    19,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 32dd3f132..176866edd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11953,21 +11953,21 @@ window.details = {
         captain: "Boosts ATK and RCV of QCK characters by 1.75x, boosts chances of getting [QCK] orbs",
         special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
     },
-    1777:{
+    1777:{//Kizaru
         captain: "Not Translated",
         special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers, changes [BLOCK], [STR], and [INT] orbs into Matching orbs for Free Spirit characters and adds .2x to Chain multiplier for 3 turns",
         specialName: "Devil Destroyer's Light Arrow",
-        specialNotes: "#{beneficial}<br>#{ignoreBarrier}"
+        specialNotes: "#{ignoreBarrier}"
     },
-    1778:{
+    1778:{//Kizaru
         captain: "Boosts ATK of Free Spirit characters by 2.5x, and their HP by 1.2x. Recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers, changes [BLOCK], [STR], and [INT] orbs into Matching orbs for Free Spirit characters and adds .2x to Chain multiplier for 3 turns",
         specialName: "Devil Destroyer's Light Arrow",
-        specialNotes: "#{beneficial}<br>#{ignoreBarrier}",
+        specialNotes: "#{ignoreBarrier}",
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
-    1779:{
+    1779:{//Kizaru
         captain: "Boosts ATK of Shooter characters by 2x",
         specialName: "Yata no Kagami (Sacred Mirror) Neo",
         special: [
@@ -11982,7 +11982,7 @@ window.details = {
         ],
         specialNotes: "#{stages}"
     },
-    1780:{
+    1780:{//Kizaru
         captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.25x and boosts HP of Shooter characters by 1.5x",
         specialName: "Yata no Kagami (Sacred Mirror) Neo",
         special: [
@@ -11997,4 +11997,64 @@ window.details = {
         ],
         specialNotes: "#{stages}",
     },
+    1793:{//Lucy Sabo
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
+        captainNotes: "#{beneficial}",
+        special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
+        specialName: "Sabo Special",
+    },
+    1794:{//Lucy Sabo
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
+        captainNotes: "#{beneficial}",
+        special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
+        specialName: "Sabo Special",
+    },
+    1795:{//Diamante
+        captain: "Boosts ATK of Slasher and Driven characters by 2x",
+        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
+        sailor: "Boosts this character's attack against [STR] characters by 1.1x",
+        specialName: "Diamante Special",
+    },
+    1796:{//Diamante
+        captain: "Boosts ATK of Slasher and Driven characters by ???x",
+        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
+        sailor: "Boosts this character's attack against [STR] characters by 1.1x",
+        specialName: "Diamante Special",
+    },
+    1797:{//Jesus Burgess
+        captain: "Boosts ATK of Fighter characters by 2.25x",
+        special: "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
+        sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
+        specialName: "Jesus Burgess Special",
+    },
+    1798:{//Jesus Burgess
+        captain: "Boosts ATK of Fighter characters by ???x",
+        special: "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
+        sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
+        specialName: "Jesus Burgess Special",
+    },
+    1799:{//Cavendish
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.25x",
+        special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
+        sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
+        specialName: "Cavendish Special",
+    },
+    1800:{//Cavendish
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by ???x",
+        special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
+        sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
+        specialName: "Cavendish Special",
+    },
+    1801:{//Bartolomeo
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
+        special: "Deal 3x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        sailor: "Reduces Paralysis for 3 turns for himself",
+        specialName: "Bartolomeo Special",
+    },
+    1802:{//Bartolomeo
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by ???x and if you don't attack with Bartolomeo, reduces damage received by ???% for that turn.",
+        special: "Deal 3x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        sailor: "Reduces Paralysis for 3 turns for himself",
+        specialName: "Bartolomeo Special",
+    },
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 6af62e90e..889698fec 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2779,4 +2779,24 @@ window.evolutions = {
         evolution: 1780,
         evolvers: [  ]
     },
+    1793: {
+        evolution: 1794,
+        evolvers: [  ]
+    },
+    1795: {
+        evolution: 1796,
+        evolvers: [  ]
+    },
+    1797: {
+        evolution: 1798,
+        evolvers: [  ]
+    },
+    1799: {
+        evolution: 1800,
+        evolvers: [  ]
+    },
+    1781: {
+        evolution: 1802,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 7f023ed5c..b3801adfd 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1779,4 +1779,26 @@ window.families = [
     "Kizaru",
     "Kizaru",
     "Kizaru",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Sabo",
+    "Sabo",
+    "Diamante",
+    "Diamante",
+    "Jesus Burgess",
+    "Jesus Burgess",
+    "Cavendish",
+    "Cavendish",
+    "Bartolomeo",
+    "Bartolomeo",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index c7be90696..48e7d6479 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1559,4 +1559,14 @@ window.flags = {
     1770: { rr: 1, rro: 1, lrr: 1 },
     1777: { rr: 1, rro: 1, lrr: 1 },
     1778: { rr: 1, rro: 1, lrr: 1 },
+    1793: { rr: 1, rro: 1 },
+    1794: { rr: 1, rro: 1 },
+    1795: { rr: 1, rro: 1 },
+    1796: { rr: 1, rro: 1 },
+    1797: { rr: 1, rro: 1 },
+    1798: { rr: 1, rro: 1 },
+    1799: { rr: 1, rro: 1 },
+    1800: { rr: 1, rro: 1 },
+    1801: { rr: 1, rro: 1 },
+    1802: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index 0df22c188..e30316f8f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1779,6 +1779,28 @@ window.units = [
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2613, 1342, 315, null ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Kizaru [Neo], Light Human", "DEX", [ "Fighter", "Shooter" ], 5, 50, 5, 4, 99, 5000000, 1, 1, 1, 2486, 1415, 279, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lucy", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Lucy, Evolved", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, null, null, null, null ],
+    [ "Diamante", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Diamante, Evolved", "QCK", [ "Driven", "Slasher" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess", "DEX", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess, Evolved", "DEX", [ "Fighter", "Driven" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Cavendish", "DEX", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Cavendish, Evolved", "DEX", [ "Driven", "Slasher" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Bartolomeo", "QCK", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Bartolomeo, Evolved", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From ace9e622612eb198c07385be8590877cf9766822 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 20 Sep 2017 01:01:22 -0400
Subject: [PATCH 1349/1569] stuff

---
 common/data/captains.js | 64 +++++++++++++++++++++++++++++++++++++++++
 common/data/sailors.js  |  8 ++++++
 common/data/specials.js | 52 +++++++++++++++++++++++++++++++++
 common/data/units.js    |  2 +-
 4 files changed, 125 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 29398d305..b2d4c2010 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5442,4 +5442,68 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
+    1793: {
+        atk: function(p) { 
+            if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
+                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                    return 3.7125;
+                else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+                    return 2.75;
+                else
+                    return 1; 
+                }
+                else
+                    return 1;
+        },
+        hp: function(p) { 
+            if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.3;
+            else
+                return 1; 
+               },
+    },
+    1794: {
+        atk: function(p) { 
+            if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
+                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                    return 3.7125;
+                else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+                    return 2.75;
+                else
+                    return 1; 
+                }
+                else
+                    return 1;
+        },
+        hp: function(p) { 
+            if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.3;
+            else
+                return 1; 
+               },
+    },
+    1795: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1796: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1 : 1; },
+    },
+    1797: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+    },
+    1798: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1 : 1; }
+    },
+    1799: {
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.25 : 1; }
+    },
+    1800: {
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : 1; }
+    },
+    1801: {
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2 : 1; }
+    },
+    1802: {
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : 1; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 0b0078e8d..783f4bc2b 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -346,4 +346,12 @@ window.sailors = {
     1774: {
         atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; },
     },
+    1797: {
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+    },
+    1798: {
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 38c217b34..4883d6395 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3577,4 +3577,56 @@ window.specials = {
     1780: {
         chainAddition: function(p){ return 0.5;}
     },
+    1793: {
+        atk: function(p) { return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : window.specials[1793].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1793].multiplier == 1.75 ? 1 : 0);
+            window.specials[1793].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1793warning'
+            });
+        }
+    },
+    1794: {
+        atk: function(p) { return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : window.specials[1794].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1794].multiplier == 1.75 ? 1 : 0);
+            window.specials[1794].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1794warning'
+            });
+        }
+    },
+    1795: {
+        delay: function(p) { return 1; },
+    },
+    1796: {
+        delay: function(p) { return 1; },
+    },
+    1797: {
+        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        type: "condition",
+    },
+    1798: {
+        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        type: "condition",
+    },
+    1799: {
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
+    },
+    1800: {
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
+    },
+    1801: {
+        def: function(p) { return 0.1; }
+    },
+    1802: {
+        def: function(p) { return 0.1; }
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index e30316f8f..f412f408a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1792,7 +1792,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lucy", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Lucy, Evolved", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, null, null, null, null ],
+    [ "Lucy, Evolved", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3000, 1500, 500, null ],
     [ "Diamante", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
     [ "Diamante, Evolved", "QCK", [ "Driven", "Slasher" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
     [ "Jesus Burgess", "DEX", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],

From 1c846065700a1df4a78656c23936507c39e69db5 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 20 Sep 2017 01:45:41 -0400
Subject: [PATCH 1350/1569] Bart evo

---
 common/data/evolutions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 889698fec..69a5339a9 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2795,7 +2795,7 @@ window.evolutions = {
         evolution: 1800,
         evolvers: [  ]
     },
-    1781: {
+    1801: {
         evolution: 1802,
         evolvers: [  ]
     },

From 6321268cfcd49104cddc9f9b5f5d3a31789c168d Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 20 Sep 2017 01:49:47 -0400
Subject: [PATCH 1351/1569] Names

---
 common/data/details.js | 20 ++++++++++----------
 common/data/units.js   | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 176866edd..3ab817143 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12001,60 +12001,60 @@ window.details = {
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
-        specialName: "Sabo Special",
+        specialName: "Dragon's Claw: Reverse Wave Motion",
     },
     1794:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
-        specialName: "Sabo Special",
+        specialName: "Dragon's Claw: Reverse Wave Motion",
     },
     1795:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2x",
         special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
-        specialName: "Diamante Special",
+        specialName: "Snake Sword",
     },
     1796:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by ???x",
         special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
-        specialName: "Diamante Special",
+        specialName: "Snake Sword",
     },
     1797:{//Jesus Burgess
         captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
-        specialName: "Jesus Burgess Special",
+        specialName: "Shockwave Elbow",
     },
     1798:{//Jesus Burgess
         captain: "Boosts ATK of Fighter characters by ???x",
         special: "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
-        specialName: "Jesus Burgess Special",
+        specialName: "Shockwave Elbow",
     },
     1799:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.25x",
         special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
-        specialName: "Cavendish Special",
+        specialName: "Beautiful Sword: Round Table",
     },
     1800:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by ???x",
         special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
-        specialName: "Cavendish Special",
+        specialName: "Beautiful Sword: Round Table",
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
         special: "Deal 3x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself",
-        specialName: "Bartolomeo Special",
+        specialName: "Barrier Bulls",
     },
     1802:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by ???x and if you don't attack with Bartolomeo, reduces damage received by ???% for that turn.",
         special: "Deal 3x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself",
-        specialName: "Bartolomeo Special",
+        specialName: "Barrier Bulls",
     },
 };
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index f412f408a..c4bd14578 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1791,15 +1791,15 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lucy", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Lucy, Evolved", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3000, 1500, 500, null ],
-    [ "Diamante", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Lucy, Corrida Colosseum Final Round Lucky Adventurer", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3000, 1500, 500, null ],
+    [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
     [ "Diamante, Evolved", "QCK", [ "Driven", "Slasher" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "Jesus Burgess", "DEX", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess, Corrida Colosseum A Block's 'Champion'", "DEX", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
     [ "Jesus Burgess, Evolved", "DEX", [ "Fighter", "Driven" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "Cavendish", "DEX", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Cavendish, Corrida Colosseum D Block's 'Hakuba'", "DEX", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
     [ "Cavendish, Evolved", "DEX", [ "Driven", "Slasher" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
-    [ "Bartolomeo", "QCK", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
     [ "Bartolomeo, Evolved", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
     ];
     

From 1a1568505469585b4053e455838bf1786543ad4a Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 20 Sep 2017 11:29:38 -0400
Subject: [PATCH 1352/1569] New Lucy again

---
 common/data/aliases.js    | 25 ++++++++++++
 common/data/captains.js   | 24 +++++++++---
 common/data/cooldowns.js  | 12 +++++-
 common/data/details.js    | 62 +++++++++++++++++++++++++-----
 common/data/drops.js      |  5 ++-
 common/data/evolutions.js |  4 ++
 common/data/families.js   |  4 +-
 common/data/flags.js      | 80 +++++++++++++++++++++++++++------------
 common/data/specials.js   |  6 +++
 common/data/units.js      | 14 +++----
 damage/js/utils.js        |  2 +-
 11 files changed, 185 insertions(+), 53 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index d39ec7e31..a9a264068 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1779,6 +1779,31 @@ window.aliases = {
     1778: ['', '', 'Secret Kizaru', 'Secret Borsalino'],
     1779: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino'],
     1780: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino'],
+    1781: ['', '', ''],
+    1782: ['', '', ''],
+    1783: ['', '', ''],
+    1784: ['', '', ''],
+    1785: ['', '', ''],
+    1786: ['', '', ''],
+    1787: ['', '', ''],
+    1788: ['', '', ''],
+    1789: ['', '', ''],
+    1790: ['', '', ''],
+    1791: ['', '', 'Luffy'],
+    1792: ['', '', 'Luffy'],
+    1793: ['', '', 'Sabo'],
+    1794: ['', '', 'Sabo'],
+    1795: ['', '', ''],
+    1796: ['', '', ''],
+    1797: ['', '', ''],
+    1798: ['', '', ''],
+    1799: ['', '', ''],
+    1800: ['', '', ''],
+    1801: ['', '', ''],
+    1802: ['', '', ''],
+    1803: ['', '', ''],
+    1804: ['', '', ''],
+    1805: ['', '', ''],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index b2d4c2010..317361383 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -3660,7 +3660,7 @@ window.captains = {
         atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1341: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, "QCK"); }, 
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["QCK"]); }, 
         hitAtk: function(p) {
             if (!(p.unit.type == "QCK")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 2.625 : 1.75;
@@ -4158,7 +4158,7 @@ window.captains = {
         hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
     1461: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.6, "QCK"); }, 
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.6, ["QCK"]); }, 
         hitAtk: function(p) {
             if (!(p.unit.type == "QCK")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.6 : 2;
@@ -4440,6 +4440,7 @@ window.captains = {
         atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
     },
     1533: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
         hitAtk: function(p) {
             return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
         },
@@ -4447,6 +4448,7 @@ window.captains = {
         hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1534: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
         hitAtk: function(p) {
             return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
         },
@@ -5148,6 +5150,7 @@ window.captains = {
         atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
     },
     1706: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["STR"]); }, 
         hitAtk: function(p) {
             return !p.unit.type == "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
         },
@@ -5442,6 +5445,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
+    1792: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 3.25, [ "QCK", "STR", "DEX" ]); }, 
+        hitAtk: function(p) {
+            return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
     1793: {
         atk: function(p) { 
             if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
@@ -5486,24 +5496,26 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
     },
     1796: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1797: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1798: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Driven") ? 1.25 : 1; },
     },
     1799: {
         atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.25 : 1; }
     },
     1800: {
-        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : 1; }
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; },
+        rcv: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1.2 : 1; }
     },
     1801: {
         atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2 : 1; }
     },
     1802: {
-        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : 1; }
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; }
     },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 8d4c2b61b..1ba87389e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1789,8 +1789,16 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
-    null,
+    28,
+    28,
     19,
     19,
+    18,
+    18,
+    21,
+    21,
+    16,
+    16,
+    18,
+    18,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 3ab817143..e8bedbf8b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11997,6 +11997,20 @@ window.details = {
         ],
         specialNotes: "#{stages}",
     },
+    1791:{//Lucy Luffy
+        captain: "Not Translated",
+        special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{ignorebarriers}",
+        sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
+        specialName: "Dragon's Claw: Reverse Wave Motion",
+    },
+    1792:{//Lucy Luffy
+        captain: "Boosts RCV of [STR], [DEX] and [QCK] characters by 1.2x and boosts ATK of [STR], [DEX] and [QCK] characters by 3.25x after scoring 3 Perfects in a row",
+        special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
+        specialNotes: "#{ignorebarriers}",
+        sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
+        specialName: "Dragon's Claw: Reverse Wave Motion",
+    },
     1793:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
         captainNotes: "#{beneficial}",
@@ -12016,20 +12030,48 @@ window.details = {
         specialName: "Snake Sword",
     },
     1796:{//Diamante
-        captain: "Boosts ATK of Slasher and Driven characters by ???x",
+        captain: "Boosts ATK of Slasher and Driven characters by 2.5x",
         special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
         specialName: "Snake Sword",
     },
     1797:{//Jesus Burgess
         captain: "Boosts ATK of Fighter characters by 2.25x",
-        special: "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
+        special: [
+            {
+                "description": "Cuts the current HP of each enemy by 10%",
+                "cooldown": [ 15, null ]
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 20%",
+                "cooldown": [ 18, null ]
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
+                "cooldown": [ 21, null ]
+            }
+        ],
+        specialNotes: "#{stages}",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
         specialName: "Shockwave Elbow",
     },
     1798:{//Jesus Burgess
-        captain: "Boosts ATK of Fighter characters by ???x",
-        special: "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
+        captain: "Boosts ATK of Fighter characters by 2.5x, boosts HP of Powerhouse and Driven characters by 1.25x",
+        special: [
+            {
+                "description": "Cuts the current HP of each enemy by 10%",
+                "cooldown": [ 15, null ]
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 20%",
+                "cooldown": [ 18, null ]
+            },
+            {
+                "description": "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
+                "cooldown": [ 21, null ]
+            }
+        ],
+        specialNotes: "#{stages}",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
         specialName: "Shockwave Elbow",
     },
@@ -12040,21 +12082,21 @@ window.details = {
         specialName: "Beautiful Sword: Round Table",
     },
     1800:{//Cavendish
-        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by ???x",
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and their RCV by 1.2x",
         special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
         specialName: "Beautiful Sword: Round Table",
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
-        special: "Deal 3x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
-        sailor: "Reduces Paralysis for 3 turns for himself",
+        special: "Deal 30x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",
     },
     1802:{//Bartolomeo
-        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by ???x and if you don't attack with Bartolomeo, reduces damage received by ???% for that turn.",
-        special: "Deal 3x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
-        sailor: "Reduces Paralysis for 3 turns for himself",
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15 for that turn.",
+        special: "Deal 30x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",
     },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index 0a02e3165..b920b1f4a 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1955,6 +1955,7 @@ window.drops = {
         {
             name: 'Clash!! Warden Magellan',
             thumb: 1374,
+            global: true,
             condition: 'Take 7% MAX Health in Environmental Damage',
             gamewith: 45906,
             Master: [ 1373 ],
@@ -1972,6 +1973,7 @@ window.drops = {
         {
             name: 'Clash!! Bellamy',
             thumb: 1518,
+            global: true,
             gamewith: '%20%2053151',
             Master: [ 1517 ],
             Expert: [ 1517 ],
@@ -2017,6 +2019,7 @@ window.drops = {
         {
             name: 'Ace Training Ground',
             thumb: 1605,
+            global: true,
             'All Difficulties': [ 1604 ],
         },
 
@@ -2082,7 +2085,7 @@ window.drops = {
             teamDatabase: 'coliseums',
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791 ]
         },
         
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 69a5339a9..207ced39d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2779,6 +2779,10 @@ window.evolutions = {
         evolution: 1780,
         evolvers: [  ]
     },
+    1791: {
+        evolution: 1792,
+        evolvers: [  ]
+    },
     1793: {
         evolution: 1794,
         evolvers: [  ]
diff --git a/common/data/families.js b/common/data/families.js
index b3801adfd..07b2c2d25 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1789,8 +1789,8 @@ window.families = [
     null,
     null,
     null,
-    null,
-    null,
+    "Monkey D. Luffy",
+    "Monkey D. Luffy",
     "Sabo",
     "Sabo",
     "Diamante",
diff --git a/common/data/flags.js b/common/data/flags.js
index 48e7d6479..d4068d8aa 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -890,13 +890,16 @@ window.flags = {
     892: { global: 1 },
     893: { global: 1 },
     894: { global: 1 },
+    895: { special: 1, global: 1 },
+    896: { special: 1, global: 1 },
+    897: { global: 1 },
+    898: { global: 1 },
+    899: { global: 1 },
     900: { global: 1 },
     901: { global: 1 },
     902: { global: 1 },
     903: { global: 1 },
     904: { global: 1 },
-    895: { special: 1, global: 1 },
-    896: { special: 1, global: 1 },
     905: { rr: 1, rro: 1, global: 1 },
     906: { rr: 1, rro: 1, global: 1 },
     907: { rr: 1, rro: 1, global: 1 },
@@ -1183,6 +1186,10 @@ window.flags = {
     1192: { rr: 1, rro: 1, global: 1 },
     1193: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1194: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1198: { global: 1 },
+    1199: { global: 1 },
+    1200: { global: 1 },
+    1201: { global: 1 },
     1202: { global: 1 },
     1203: { global: 1 },
     1204: { global: 1 },
@@ -1274,6 +1281,8 @@ window.flags = {
     1304: { global: 1 },
     1307: { rr: 1, rro: 1, lrr: 1 },
     1308: { rr: 1, rro: 1, lrr: 1 },
+    1309: { global: 1 },
+    1310: { global: 1 },
     1313: { rr: 1, rro: 1, global: 1 },
     1314: { rr: 1, rro: 1, global: 1 },
     1315: { rr: 1, rro: 1, global: 1 },
@@ -1296,6 +1305,8 @@ window.flags = {
     1334: { global: 1 },
     1335: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1336: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1337: { global: 1 },
+    1338: { global: 1 },
     1342: { global: 1 },
     1343: { global: 1 },
     1344: { global: 1 },
@@ -1327,6 +1338,10 @@ window.flags = {
     1370: { rr: 1, rro: 1, global: 1 },
     1371: { shop: 1, global: 1, global: 1 },
     1372: { shop: 1, global: 1, global: 1 },
+    1373: { global: 1 },
+    1374: { global: 1 },
+    1377: { global: 1 },
+    1378: { global: 1 },
     1379: { global: 1 },
     1380: { global: 1 },
     1381: { rr: 1, rro: 1, lrr: 1, global: 1 },
@@ -1366,6 +1381,10 @@ window.flags = {
     1418: { global: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
     1420: { rr: 1, rro: 1, lrr: 1, },
+    1425: { global: 1 },
+    1426: { global: 1 },
+    1427: { global: 1 },
+    1428: { global: 1 },
     1429: { rr: 1, rro: 1, lrr: 1, },
     1430: { rr: 1, rro: 1, lrr: 1, },
     1433: { rr: 1, rro: 1, global: 1 },
@@ -1384,6 +1403,10 @@ window.flags = {
     1446: { global: 1 },
     1447: { global: 1 },
     1448: { global: 1 },
+    1449: { global: 1 },
+    1450: { global: 1 },
+    1451: { global: 1 },
+    1452: { global: 1 },
     1453: { rr: 1, rro: 1, lrr: 1, },
     1454: { rr: 1, rro: 1, lrr: 1, },
     1455: { global: 1 },
@@ -1426,8 +1449,12 @@ window.flags = {
     1506: { global: 1 },
     1513: { rr: 1, rro: 1, lrr: 1 },
     1514: { rr: 1, rro: 1, lrr: 1 },
+    1517: { global: 1 },
+    1518: { global: 1 },
     1523: { rr: 1, rro: 1, lrr: 1 },
     1524: { rr: 1, rro: 1, lrr: 1 },
+    1529: { global: 1 },
+    1530: { global: 1 },
     1531: { rr: 1, rro: 1 },
     1532: { rr: 1, rro: 1 },
     1533: { rr: 1, rro: 1 },
@@ -1441,19 +1468,22 @@ window.flags = {
     1541: { rr: 1, rro: 1 },
     1542: { rr: 1, rro: 1 },
     1543: { rr: 1, rro: 1 },
+    1549: { global: 1 },
+    1550: { global: 1 },
+    1551: { global: 1 },
     1567: { rr: 1, rro: 1, lrr: 1 },
     1568: { rr: 1, rro: 1, lrr: 1 },
     1569: { special: 1, global: 1 },
-    1570: { rr: 1, rro: 1 },
-    1571: { rr: 1, rro: 1 },
-    1572: { rr: 1, rro: 1 },
-    1573: { rr: 1, rro: 1 },
-    1574: { rr: 1, rro: 1 },
-    1575: { rr: 1, rro: 1 },
-    1576: { rr: 1, rro: 1 },
-    1577: { rr: 1, rro: 1 },
-    1578: { rr: 1, rro: 1 },
-    1579: { rr: 1, rro: 1 },
+    1570: { rr: 1, rro: 1, global: 1 },
+    1571: { rr: 1, rro: 1, global: 1 },
+    1572: { rr: 1, rro: 1, global: 1 },
+    1573: { rr: 1, rro: 1, global: 1 },
+    1574: { rr: 1, rro: 1, global: 1 },
+    1575: { rr: 1, rro: 1, global: 1 },
+    1576: { rr: 1, rro: 1, global: 1 },
+    1577: { rr: 1, rro: 1, global: 1 },
+    1578: { rr: 1, rro: 1, global: 1 },
+    1579: { rr: 1, rro: 1, global: 1 },
     1587: { rr: 1, rro: 1 },
     1588: { rr: 1, rro: 1 },
     1589: { rr: 1, rro: 1, lrr: 1 },
@@ -1461,6 +1491,8 @@ window.flags = {
     1591: { rr: 1, rro: 1, lrr: 1 },
     1592: { rr: 1, rro: 1, lrr: 1 },
     1593: { rr: 1, rro: 1 },
+    1604: { global: 1 },
+    1605: { global: 1 },
     1609: { rr: 1, rro: 1 },
     1610: { rr: 1, rro: 1 },
     1611: { rr: 1, rro: 1 },
@@ -1472,22 +1504,22 @@ window.flags = {
     1617: { rr: 1, rro: 1 },
     1618: { rr: 1, rro: 1 },
     1619: { rr: 1, rro: 1 },
-    1620: { rr: 1, rro: 1, lrr: 1 },
-    1621: { rr: 1, rro: 1, lrr: 1 },
+    1620: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1621: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1622: { global: 1 },
     1623: { global: 1 },
     1631: { rr: 1, rro: 1, lrr: 1 },
     1632: { rr: 1, rro: 1, lrr: 1 },
-    1651: { rr: 1, rro: 1 },
-    1652: { rr: 1, rro: 1 },
-    1653: { rr: 1, rro: 1 },
-    1654: { rr: 1, rro: 1 },
-    1655: { rr: 1, rro: 1 },
-    1656: { rr: 1, rro: 1 },
-    1657: { rr: 1, rro: 1 },
-    1658: { rr: 1, rro: 1 },
-    1659: { rr: 1, rro: 1 },
-    1660: { rr: 1, rro: 1 },
+    1651: { rr: 1, rro: 1, global: 1 },
+    1652: { rr: 1, rro: 1, global: 1 },
+    1653: { rr: 1, rro: 1, global: 1 },
+    1654: { rr: 1, rro: 1, global: 1 },
+    1655: { rr: 1, rro: 1, global: 1 },
+    1656: { rr: 1, rro: 1, global: 1 },
+    1657: { rr: 1, rro: 1, global: 1 },
+    1658: { rr: 1, rro: 1, global: 1 },
+    1659: { rr: 1, rro: 1, global: 1 },
+    1660: { rr: 1, rro: 1, global: 1 },
     1661: { shop: 1 },
     1662: { shop: 1 },
     1663: { rr: 1, rro: 1 },
diff --git a/common/data/specials.js b/common/data/specials.js
index 4883d6395..51e68e4cd 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3577,6 +3577,12 @@ window.specials = {
     1780: {
         chainAddition: function(p){ return 0.5;}
     },
+    1791: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
+    1792: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+    },
     1793: {
         atk: function(p) { return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : window.specials[1793].multiplier; },
         type: "class",
diff --git a/common/data/units.js b/common/data/units.js
index c4bd14578..89a63f004 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1789,18 +1789,18 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2059, 1500, 271, null ],
     [ "Lucy, Corrida Colosseum Final Round Lucky Adventurer", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3000, 1500, 500, null ],
+    [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3020, 1539, 390, null ],
     [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Diamante, Evolved", "QCK", [ "Driven", "Slasher" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Diamante, Evolved", "QCK", [ "Driven", "Slasher" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2401, 1487, 230, null ],
     [ "Jesus Burgess, Corrida Colosseum A Block's 'Champion'", "DEX", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Jesus Burgess, Evolved", "DEX", [ "Fighter", "Driven" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Jesus Burgess, Evolved", "DEX", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2743, 1364, 238, null ],
     [ "Cavendish, Corrida Colosseum D Block's 'Hakuba'", "DEX", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Cavendish, Evolved", "DEX", [ "Driven", "Slasher" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Cavendish, Evolved", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2046, 1466, 314, null ],
     [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Bartolomeo, Evolved", "QCK", [ "Striker", "Driven" ], 5, 30, null, null, 99, 4000000, null, null, null, null, null, null, null ],
+    [ "Bartolomeo, Evolved", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2789, 1289, 251, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/utils.js b/damage/js/utils.js
index 1685be12f..f95026d34 100644
--- a/damage/js/utils.js
+++ b/damage/js/utils.js
@@ -98,7 +98,7 @@ window.CrunchUtils.lowCostSort = function(array, costMultiplier, cost) {
 window.CrunchUtils.typeSort = function(array, typeMultiplier, types) {
     var result = [ ];
     function isUnitAMatch(unit) {
-        if (unit.type == types) {
+        if (types.includes(unit.type)) {
             return true;
         }
         else {

From a4ee4345394d7fb5987e14f19de306850987857f Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 20 Sep 2017 12:01:33 -0400
Subject: [PATCH 1353/1569] Lucy unevolved

---
 common/data/captains.js | 7 +++++++
 common/data/details.js  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 317361383..164b9a1b6 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5445,6 +5445,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
+    1791: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, [ "QCK", "STR", "DEX" ]); }, 
+        hitAtk: function(p) {
+            return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
     1792: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 3.25, [ "QCK", "STR", "DEX" ]); }, 
         hitAtk: function(p) {
diff --git a/common/data/details.js b/common/data/details.js
index e8bedbf8b..188479c1d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11998,7 +11998,7 @@ window.details = {
         specialNotes: "#{stages}",
     },
     1791:{//Lucy Luffy
-        captain: "Not Translated",
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x after scoring 3 Perfects in a row",
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{ignorebarriers}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",

From a5c03013406fd906d1388803ab219dead9e20d83 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 20 Sep 2017 12:08:54 -0400
Subject: [PATCH 1354/1569] oops

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 188479c1d..ca2d819ee 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12000,16 +12000,16 @@ window.details = {
     1791:{//Lucy Luffy
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x after scoring 3 Perfects in a row",
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialNotes: "#{ignorebarriers}",
+        specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
-        specialName: "Dragon's Claw: Reverse Wave Motion",
+        specialName: "Luffy Special",
     },
     1792:{//Lucy Luffy
         captain: "Boosts RCV of [STR], [DEX] and [QCK] characters by 1.2x and boosts ATK of [STR], [DEX] and [QCK] characters by 3.25x after scoring 3 Perfects in a row",
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialNotes: "#{ignorebarriers}",
+        specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
-        specialName: "Dragon's Claw: Reverse Wave Motion",
+        specialName: "Luffy Special",
     },
     1793:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",

From aca71f2e458750f4694ff8a61e7642eda434a00a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 22 Sep 2017 14:48:22 +0200
Subject: [PATCH 1355/1569] Added aliases to Jinbe #1699/1700

---
 common/data/aliases.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index a9a264068..87071fd29 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1697,8 +1697,8 @@ window.aliases = {
     1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo'],
     1697: ['マゼラン 監獄の支配者', '', ''],
     1698: ['マゼラン 地獄の支配者', '', ''],
-    1699: ['ジンベエ “無限地獄”の囚人', '', ''],
-    1700: ['ジンベエ “地獄”の七武海', '', ''],
+    1699: ['ジンベエ “無限地獄”の囚人', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
+    1700: ['ジンベエ “地獄”の七武海', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
     1701: ['エンポリオ・イワンコフ “ニューカマーランド”の囚人', '', ''],
     1702: ['エンポリオ・イワンコフ “地獄”の革命家', '', ''],
     1703: ['ハンニャバル 支配者の腹心', '', ''],

From 3694d892fcb36af6d3febb7cad9559b33237fcbc Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 23 Sep 2017 11:32:46 -0400
Subject: [PATCH 1356/1569] Free Koala

---
 common/data/captains.js  |  3 +++
 common/data/cooldowns.js | 11 +++++++++++
 common/data/details.js   |  9 +++++++--
 common/data/families.js  | 11 +++++++++++
 common/data/flags.js     |  1 +
 common/data/specials.js  |  4 ++++
 common/data/units.js     | 21 ++++++++++++++++-----
 7 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 164b9a1b6..dea344261 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5525,4 +5525,7 @@ window.captains = {
     1802: {
         atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; }
     },
+    1813: {
+        atk: function(p) { return 2.25; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1ba87389e..1bc774d55 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1801,4 +1801,15 @@ window.cooldowns = [
     16,
     18,
     18,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    12,
 ];
diff --git a/common/data/details.js b/common/data/details.js
index ca2d819ee..2d2bbf8c5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12002,14 +12002,14 @@ window.details = {
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
-        specialName: "Luffy Special",
+        specialName: "Gomu Gomu no Hawk Rifle",
     },
     1792:{//Lucy Luffy
         captain: "Boosts RCV of [STR], [DEX] and [QCK] characters by 1.2x and boosts ATK of [STR], [DEX] and [QCK] characters by 3.25x after scoring 3 Perfects in a row",
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
-        specialName: "Luffy Special",
+        specialName: "Gomu Gomu no Hawk Rifle",
     },
     1793:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
@@ -12099,4 +12099,9 @@ window.details = {
         sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",
     },
+    1813: {//Koala
+        captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
+        special: "Changes Captain's orb into Matching and boosts ATK of your Captain by 1.5x for 1 turn",
+        specialName: "Revolutionary Soldier's Anger",
+    },
 };
\ No newline at end of file
diff --git a/common/data/families.js b/common/data/families.js
index 07b2c2d25..549be9f0e 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1801,4 +1801,15 @@ window.families = [
     "Cavendish",
     "Bartolomeo",
     "Bartolomeo",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Koala",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index d4068d8aa..e0a0ced9e 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1601,4 +1601,5 @@ window.flags = {
     1800: { rr: 1, rro: 1 },
     1801: { rr: 1, rro: 1 },
     1802: { rr: 1, rro: 1 },
+    1813: { special: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 51e68e4cd..7de957a9b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3635,4 +3635,8 @@ window.specials = {
     1802: {
         def: function(p) { return 0.1; }
     },
+    1813: {
+        atk: function(p) { return p.slot == 1 ? 1.5 : 1; },
+        type: "class"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index 89a63f004..b2ac8ddc1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1790,17 +1790,28 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2059, 1500, 271, null ],
+    [ "Lucy, Corrida Colosseum C Block's Bold Opportunist", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2059, 1500, 271, null ],
     [ "Lucy, Corrida Colosseum Final Round Lucky Adventurer", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3020, 1539, 390, null ],
     [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Diamante, Evolved", "QCK", [ "Driven", "Slasher" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2401, 1487, 230, null ],
+    [ "Diamante, Dressrosa Current King's Family Member", "QCK", [ "Driven", "Slasher" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2401, 1487, 230, null ],
     [ "Jesus Burgess, Corrida Colosseum A Block's 'Champion'", "DEX", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Jesus Burgess, Evolved", "DEX", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2743, 1364, 238, null ],
+    [ "Jesus Burgess, The Hidden Shadow within the Birdcage", "DEX", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2743, 1364, 238, null ],
     [ "Cavendish, Corrida Colosseum D Block's 'Hakuba'", "DEX", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Cavendish, Evolved", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2046, 1466, 314, null ],
+    [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2046, 1466, 314, null ],
     [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Bartolomeo, Evolved", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2789, 1289, 251, null ],
+    [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2789, 1289, 251, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 09bbc096830c2a3ac2f6cca2df78aa029cb75c6f Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 23 Sep 2017 16:58:32 -0400
Subject: [PATCH 1357/1569] Koala CD

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 1bc774d55..a228eae76 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1811,5 +1811,5 @@ window.cooldowns = [
     null,
     null,
     null,
-    12,
+    [ 12, 8 ],
 ];

From 7956e591f2b33095606f6031534042925ffbe2f2 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 24 Sep 2017 12:22:09 -0400
Subject: [PATCH 1358/1569] Stuff

---
 common/data/details.js |  2 +-
 common/data/drops.js   | 19 ++++++++++++++-----
 common/data/gw.js      | 22 ++++++++++++++++++++--
 common/data/units.js   | 10 +++++-----
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2d2bbf8c5..7c43a7b8a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10089,7 +10089,7 @@ window.details = {
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces cooldown of Striker specials by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
diff --git a/common/data/drops.js b/common/data/drops.js
index b920b1f4a..15c8a4490 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1646,7 +1646,7 @@ window.drops = {
             name: 'Wano Samurai!',
             thumb: 1774,
             condition: 'Shooter and Free Spirit characters get a boost (1.2x ATK boost on 30 stamina)',
-            gamewith: null,
+            gamewith: 68608,
             'All Difficulties': [ 1773, 1775, -963, -1588, -451, -1186, -528, -1177, -1208, -558, -1616, -1618, -1392 ]
         },
         
@@ -1886,7 +1886,7 @@ window.drops = {
         {
             name: 'Clash Neo!! Kizaru',
             thumb: 1780,
-            gamewith: null,
+            gamewith: 68681,
             condition: '1 Master version and 3 Ultimate versions with different conditions. Master: Free Spirit/Striker/Powerhouse Only. Can only complete 10 times each. Ultimate: Free Spirit Only, Striker Only, and Powerhouse Only',
             Ultimate: [ 1779 ],
             Master: [ 1779 ]
@@ -2083,9 +2083,9 @@ window.drops = {
             global: true,
             gamewith: 17473,
             teamDatabase: 'coliseums',
-            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1402, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791 ]
+            Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1195, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
+            Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1195, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791 ]
         },
         
         {
@@ -2231,6 +2231,15 @@ window.drops = {
             'All Difficulties': [ -1121, -578, -1404, -1593, -217, -210, -908, -937, -941, -943, -1115, -520, -1208, -558, -1210, -556, -1212, -560, -1364, -1408, -1387, -4, -1446, -16, -1549, -709, -1550, -739, -223, -15, -629, -209 ],
         },
         
+        {
+            name: '20th Anniversary! Sanji!',
+            thumb: 1755,
+            gamewith: 66019,
+            showManual: true,
+            condition: 'No characters will drop posters.',
+            'All Difficulties': [ -1388, -1362, -1175, -906, -554, -219, -218, -8, -1447, -1368, -1117, -912, -522, -20, -19, -1389, -1366, -1119, -221, -12, -11, -1410, -1551, -1173, -914, -896, -526, -1412, -1370, -1448, -1177, -910, -528, -23, -22 ],
+        },
+        
         {
             name: '20th Anniversary! Straw Hats!',
             thumb: 1686,
diff --git a/common/data/gw.js b/common/data/gw.js
index 9f7f5e42f..4f493ecd0 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1771,12 +1771,30 @@ window.gw=[
     66691,
     67128,
     67128,
+    68612,
+    68612,
+    68613,
+    68613,
+    68472,
+    68472,
+    68680,
+    68680,
+    null,
     null,
     null,
     null,
     null,
-    68472,
-    68472,
     null,
     null,
+    69286,
+    69286,
+    69404,
+    69404,
+    69424,
+    69424,
+    69430,
+    69430,
+    69439,
+    69439,
+    69787,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index b2ac8ddc1..74227aedb 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1784,11 +1784,11 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dressrosa Fodder #1", "STR", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dressrosa Fodder #2", "QCK", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dressrosa Fodder #3", "DEX", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dressrosa Fodder #4", "INT", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Dressrosa Fodder #5", "PSY", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Lucy, Corrida Colosseum C Block's Bold Opportunist", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2059, 1500, 271, null ],
     [ "Lucy, Corrida Colosseum Final Round Lucky Adventurer", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],

From 533994c125b6e845a58fec480f5b72f97cee0c16 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 24 Sep 2017 16:04:12 -0400
Subject: [PATCH 1359/1569] typo

---
 common/data/captains.js | 2 +-
 common/data/drops.js    | 2 +-
 common/js/directives.js | 2 +-
 damage/js/cruncher.js   | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index dea344261..bcd23cd03 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -231,7 +231,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     227: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; },
     },
     228: {
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
diff --git a/common/data/drops.js b/common/data/drops.js
index 15c8a4490..ac226bf76 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1645,7 +1645,7 @@ window.drops = {
         {
             name: 'Wano Samurai!',
             thumb: 1774,
-            condition: 'Shooter and Free Spirit characters get a boost (1.2x ATK boost on 30 stamina)',
+            condition: 'Shooter and Free Spirit characters get a boost (1.2x ATK, HP and RCV boost on 30 stamina)',
             gamewith: 68608,
             'All Difficulties': [ 1773, 1775, -963, -1588, -451, -1186, -528, -1177, -1208, -558, -1616, -1618, -1392 ]
         },
diff --git a/common/js/directives.js b/common/js/directives.js
index b947765de..7ec43b930 100644
--- a/common/js/directives.js
+++ b/common/js/directives.js
@@ -26,7 +26,7 @@ var notes = {
     colorAffinity: "'Color Affinity' boosts color type advantages. For example, a STR unit normally deals 2x to a DEX unit and .5x to QCK. With this Color Affinity boost, it will deal (2*#1)x to DEX and (0.5/#1)x to QCK.",
     instantKill: "The chance for this character to instantly kill any enemy is #1. The kills can not be reset by exiting the game, but can change by passing the turn or killing an enemy on that stage.",
     additionalDamage: "Every attacking character gains additional damage if they land a hit no less than Good.",
-    beneficial: "\"Beneficial\" orbs grant the same ATK boost as matching orbs and activate any Captain Abilities that are enabled by mathcing orbs.",
+    beneficial: "\"Beneficial\" orbs grant the same ATK boost as matching orbs and activate any Captain Abilities that are enabled by matching orbs.",
 };
 
 /***********
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 3bab73dbc..44391670b 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -891,7 +891,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     };
     
     var getParameters = function(slotNumber, chainPosition) {
-        //console.log($scope.data.actionleft)
         return {
             unit: team[slotNumber].unit,
             orb: $scope.tdata.team[slotNumber].orb,

From 5bf9c52b73cddce3ea8da918c97a8c85a6e1f369 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 24 Sep 2017 18:43:24 -0400
Subject: [PATCH 1360/1569] Per-cent

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 7c43a7b8a..9dd922326 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12094,7 +12094,7 @@ window.details = {
         specialName: "Barrier Bulls",
     },
     1802:{//Bartolomeo
-        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15 for that turn.",
+        captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15% for that turn.",
         special: "Deal 30x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",

From 5f95542e61fce00ef42781e39f70734e78a25f60 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 25 Sep 2017 20:44:56 -0400
Subject: [PATCH 1361/1569] DK

---
 common/data/effects.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/effects.js b/common/data/effects.js
index 78e876da0..1c6799395 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -395,5 +395,12 @@ window.effects = {
         atk: function(p) { return 1.3; },
         chainModifier: function(p) { return 0.5 ; }
     },
+
+    'Kyros Colisuem - Chain multiplier limiter (1.5x)': {
+        description: 'Limits chain multiplier to 1.5x',
+        thumb: 1667,
+        id: 42, // don't change this
+        chainLimiter: function() { return 1.5; }
+    },
     
 };
\ No newline at end of file

From b278f59c3e8377aeab1e0c80c21c52d00d46f5dd Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 26 Sep 2017 10:38:53 -0400
Subject: [PATCH 1362/1569] Sanji and Ace

---
 common/data/captains.js   | 20 ++++++++++++++++++++
 common/data/cooldowns.js  |  3 +++
 common/data/details.js    | 19 +++++++++++++++++--
 common/data/evolutions.js |  8 ++++++++
 common/data/families.js   |  3 +++
 common/data/gw.js         | 18 ++++++++++++++++++
 common/data/ships.js      | 16 +++++++++++++++-
 common/data/units.js      |  3 +++
 damage/js/cruncher.js     |  4 ++--
 9 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index bcd23cd03..2cb350667 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5528,4 +5528,24 @@ window.captains = {
     1813: {
         atk: function(p) { return 2.25; }
     },
+    1814: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1815: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1816: {
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.25 : 2.25); },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a228eae76..055239727 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1812,4 +1812,7 @@ window.cooldowns = [
     null,
     null,
     [ 12, 8 ],
+    30,
+    30,
+    [ 20, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 9dd922326..f5a61fe48 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12089,13 +12089,13 @@ window.details = {
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
-        special: "Deal 30x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",
     },
     1802:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15% for that turn.",
-        special: "Deal 30x character's ATk in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",
     },
@@ -12104,4 +12104,19 @@ window.details = {
         special: "Changes Captain's orb into Matching and boosts ATK of your Captain by 1.5x for 1 turn",
         specialName: "Revolutionary Soldier's Anger",
     },
+    1814: {//Raid Sanji
+        captain: "Boosts ATK of Powerhouse characters by 2.5x until the first hit other than Perfect and recovers 100 HP at end of each turn",
+        specialName: "Sanji Special",
+        special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
+    },
+    1815: {//Raid Sanji
+        captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 300 HP at end of each turn",
+        specialName: "Sanji Special",
+        special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
+    },
+    1816: {// Ace 6+
+        special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, boosts ATK of Shooter characters by 2x for 1 turn",
+        specialName: "Great Flame Commandment: Flame Emperor • Flame Wheel",
+        captain: "Boosts HP of Shooter characters by 1.5x and boosts ATK by 3.25x if they have a matching orb, by 2.25x otherwise"
+    },
 };
\ No newline at end of file
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 207ced39d..3d4b878c0 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2803,4 +2803,12 @@ window.evolutions = {
         evolution: 1802,
         evolvers: [  ]
     },
+    1814: {
+        evolution: 1815,
+        evolvers: [  ]
+    },
+    562: {
+        evolution: 1816,
+        evolvers: [ 'skullDEX', 118, 86, 302, 267 ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 549be9f0e..a935d18bb 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1812,4 +1812,7 @@ window.families = [
     null,
     null,
     "Koala",
+    "Sanji",
+    "Sanji",
+    "Portgas D. Ace",
 ];
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 4f493ecd0..01a736d3b 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1786,6 +1786,11 @@ window.gw=[
     null,
     null,
     null,
+    null,
+    null,
+    null,
+    null,
+    null,
     69286,
     69286,
     69404,
@@ -1796,5 +1801,18 @@ window.gw=[
     69430,
     69439,
     69439,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
     69787,
+    null,
+    null,
+    12647,
 ];
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index bbf42dad0..04728bb0c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -418,7 +418,7 @@ window.ships = [
     { //32
         name: "Marshal D. Teach Pirate Ship",
         thumb: 'ship_0034_c.png',
-        description: 'Boosts HP by 1.25x and reduces special cooldown of all characters by 1 at the start of the adventure. Boosts ATK by 1.55x if you have a Striker, Shooter, Fighter, and Slasher on your crew.',
+        description: 'Boosts HP by 1.25x and reduces special cooldown of all characters by 1 at the start of the adventure. Boosts ATK by 1.55x if you have a Striker, Shooter, Fighter, and Slasher character on your crew.',
         atk: function(p) { 
             return (p.classCount.Striker >= 1 && p.classCount.Fighter >= 1 && p.classCount.Shooter >= 1 && p.classCount.Slasher >= 1) ? [ 1.2, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.5, 1.55 ][p.boatLevel - 1] : 1;
         },
@@ -426,5 +426,19 @@ window.ships = [
             return [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.25 ][p.boatLevel - 1];
         }
     },
+    
+    
+    
+    { //33
+        name: "Revolutionary Black Crow",
+        thumb: null,
+        description: 'Boosts HP by 1.2x and reduces special cooldown of all characters by 1 at the start of the adventure. Boosts ATK of [STR], [DEX] and [QCK] characters by 1.55x if you have a [STR], [DEX] and [QCK] character on your crew.',
+        atk: function(p) { 
+            return (p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) ? [ 1.2, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.5, 1.55 ][p.boatLevel - 1] : 1;
+        },
+        hp: function(p) {
+            return [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
+        }
+    },
 
 ];
diff --git a/common/data/units.js b/common/data/units.js
index 74227aedb..396ac6cb1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1812,6 +1812,9 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
+    [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Sanji, Evolved", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, null, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
+    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1, 1, 1, 3000, 1550, 300, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 44391670b..94e6cbecd 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -411,8 +411,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             if (key.indexOf(type) !== 0) continue;
             var isStatic = (key.indexOf('Static') !== -1);
             if (isStatic != static) continue;
-            if (static) result += shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot, classCount: classCounter() });
-            else result *= shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot, classCount: classCounter()  });
+            if (static) result += shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot, classCount: classCounter(), colorCount: colorCounter() });
+            else result *= shipBonus.bonus[key]({ boatLevel: shipBonus.level, unit: unit, slot: slot, classCount: classCounter(), colorCount: colorCounter()  });
         }
         return result;
     };

From 97419b37a89080084952edc3ee838a9bcb6daa5c Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 26 Sep 2017 10:39:53 -0400
Subject: [PATCH 1363/1569] Ace stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 396ac6cb1..c13421aaa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1814,7 +1814,7 @@ window.units = [
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Vinsmoke Sanji, Evolved", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, null, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
-    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1, 1, 1, 3000, 1550, 300, null ],
+    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1, 1, 1, 3922, 1466, 358, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b694052defb21e179fec22e472a934ede99bbe98 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 26 Sep 2017 10:40:36 -0400
Subject: [PATCH 1364/1569] Sanji sockets

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index c13421aaa..c2b66b465 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1813,7 +1813,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Sanji, Evolved", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, null, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
+    [ "Vinsmoke Sanji, Evolved", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
     [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1, 1, 1, 3922, 1466, 358, null ],
     ];
     

From 55a582e59d9d06a39aba8ae30da3452dacf626f8 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 26 Sep 2017 10:45:10 -0400
Subject: [PATCH 1365/1569] Sanji special

---
 common/data/specials.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 7de957a9b..a12127383 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3639,4 +3639,16 @@ window.specials = {
         atk: function(p) { return p.slot == 1 ? 1.5 : 1; },
         type: "class"
     },
+    1814: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        type: "class"
+    },
+    1815: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        type: "class"
+    },
+    1816: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        type: "class"
+    },
 };

From 413f4bebcdbbc93567e9103d252b7a985fb6659d Mon Sep 17 00:00:00 2001
From: ribcrush <marc.karam10@gmail.com>
Date: Tue, 26 Sep 2017 10:38:02 -0700
Subject: [PATCH 1366/1569] fixed drops page error, added 6+ ace's base stats,
 and reworded croc 1616

---
 common/data/details.js | 2 +-
 common/data/drops.js   | 2 +-
 common/data/units.js   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f5a61fe48..e81fe0f97 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10089,7 +10089,7 @@ window.details = {
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces cooldown of Striker specials by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces special cooldown of Striker characters by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
diff --git a/common/data/drops.js b/common/data/drops.js
index ac226bf76..37c4d2d4c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1437,7 +1437,7 @@ window.drops = {
             thumb: 1254,
             global: true,
             gamewith: 38336,
-            condition: 'Driven Characters have their cooldowns reduced by 10 turns at the start of the fight',
+            condition: 'You can only bring STR units and Driven Characters have their cooldowns reduced by 10 turns at the start of the fight',
             'All Difficulties': [ 1254, 1255, 1256, -669, -1492, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },
         
diff --git a/common/data/units.js b/common/data/units.js
index c2b66b465..777b0018c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1814,7 +1814,7 @@ window.units = [
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Vinsmoke Sanji, Evolved", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
-    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1, 1, 1, 3922, 1466, 358, null ],
+    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 0f8a1b3f78c75c598e6f27633bccb3a65d115f20 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Tue, 26 Sep 2017 14:41:33 -0400
Subject: [PATCH 1367/1569] Typos and Flags

---
 common/data/details.js |  4 ++--
 common/data/drops.js   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e81fe0f97..aad62e4a1 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -10082,14 +10082,14 @@ window.details = {
     },
     1615: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2x",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Striker cooldowns by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Striker characters by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
-        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces special cooldown of Striker characters by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
+        special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Striker characters by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
diff --git a/common/data/drops.js b/common/data/drops.js
index 37c4d2d4c..ce0830a35 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1437,7 +1437,7 @@ window.drops = {
             thumb: 1254,
             global: true,
             gamewith: 38336,
-            condition: 'You can only bring STR units and Driven Characters have their cooldowns reduced by 10 turns at the start of the fight',
+            condition: 'Driven Characters have their cooldowns reduced by 10 turns at the start of the fight',
             'All Difficulties': [ 1254, 1255, 1256, -669, -1492, -1077, -1079, -967, -972, -974, -750, -701, -500 ]
         },
         
@@ -2004,6 +2004,15 @@ window.drops = {
             Master: [ 1695 ],
             Expert: [ 1695 ]
         },
+        
+        {
+            name: 'Clash!! Vinsmoke Sanji',
+            thumb: 1815,
+            gamewith: null,
+            Ultimate: [ 1814 ],
+            Master: [ 1814 ],
+            Expert: [ 1814 ]
+        },
 
     ],
 

From a00629103c252df6e5af0e5e64052c59c0a186a2 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Tue, 26 Sep 2017 17:08:51 -0400
Subject: [PATCH 1368/1569] Aliases

---
 common/data/aliases.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 87071fd29..db687d76b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1620,8 +1620,8 @@ window.aliases = {
     1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
     1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
     1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
-    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'INT Doffy', 'INT Doflamingo'],
-    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'INT Doffy', 'INT Doflamingo'],
+    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],
+    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],
     1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
     1625: ['ダルマ 深海の魚人海賊', '', ''],
     1626: ['ドスン 深海の魚人海賊', '', ''],
@@ -1644,8 +1644,8 @@ window.aliases = {
     1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', ''],
     1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', ''],
     1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', ''],
-    1646: ['ピーカ「改」', '', 'Kai Pica', 'STR Pica'],
-    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica', 'STR Pica'],
+    1646: ['ピーカ「改」', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica'],
+    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica'],
     1648: ['ジョーラ 芸術人間', '', 'Jora'],
     1649: ['ジョーラ トレーボル軍', '', 'Jora'],
     1650: ['ブルック サイケデリックアート', '', ''],
@@ -1666,8 +1666,8 @@ window.aliases = {
     1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji', 'Secret Kuzan'],
     1666: ['キュロス 無敗の剣闘士', '', ''],
     1667: ['キュロス リク王軍軍隊長', '', ''],
-    1668: ['青キジ「改」', '', 'Kai Aokiji', 'Kai Kuzan'],
-    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji', 'Kai Kuzan'],
+    1668: ['青キジ「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan'],
+    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan'],
     1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley'],
     1671: ['ケイミー マーメイドカフェ', '', ''],
     1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug'],
@@ -1677,8 +1677,8 @@ window.aliases = {
     1676: ['ロロノア・ゾロ 雨濡れ剣客', '', 'Kimono Zoro'],
     1677: ['トラファルガー・ロー 終わらぬ夢の航跡・ハートの海賊団', '', 'Log Law', 'Secret Law'],
     1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law'],
-    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk'],
-    1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk'],
+    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
+    1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
     1681: ['モンキー・D・ルフィ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Luffy'],
     1682: ['モンキー・D・ルフィ 20th Anniversary Memorial Treasure', '', '20th Anniversary Luffy'],
     1683: ['ニコ・ロビン Celebrate 20th Anniversary Cruise', '', '20th Anniversary Robin'],
@@ -1724,8 +1724,8 @@ window.aliases = {
     1723: ['海神ネプチューン リュウグウ王国国王', '', ''],
     1724: ['フカボシ ネプチューン家三兄弟　長男', '', ''],
     1725: ['フカボシ 王国軍三強', '', ''],
-    1726: ['サボ「改」 竜の爪', '', 'Kai Sabo'],
-    1727: ['サボ「改」 革命軍参謀総長', '', 'Kai Sabo'],
+    1726: ['サボ「改」 竜の爪', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo'],
+    1727: ['サボ「改」 革命軍参謀総長', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo'],
     1728: ['たしぎ ビーチの大佐', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
     1729: ['たしぎ バカンスの大佐ちゃん', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
     1730: ['ネフェルタリ・ビビ 眩しい純白', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
@@ -1736,8 +1736,8 @@ window.aliases = {
     1735: ['シュガー トレーボル軍　特別幹部', '', ''],
     1736: ['トレーボル ベタベタの実の能力者', '', ''],
     1737: ['トレーボル ドンキホーテファミリー最高幹部', '', ''],
-    1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy'],
-    1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy'],
+    1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy'],
+    1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy'],
     1740: ['ボア・サンダーソニア 麦わらのルフィの協力者', '', ''],
     1741: ['ボア・サンダーソニア 麦わらのルフィの共犯者', '', ''],
     1742: ['ボア・マリーゴールド 麦わらのルフィの協力者', '', ''],
@@ -1769,16 +1769,16 @@ window.aliases = {
     1768: ['アブドーラ＆ジェット 凶悪犯罪者', '', ''],
     1769: ['ベン・ベックマン 赤髪海賊団副船長', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
     1770: ['ベン・ベックマン “四皇”赤髪の右腕', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
-    1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
-    1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma'],
+    1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
+    1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
     1773: ['', '', 'Kin\'emon'],
     1774: ['', '', 'Kin\'emon'],
     1775: ['', '', ''],
     1776: ['', '', ''],
     1777: ['', '', 'Secret Kizaru', 'Secret Borsalino'],
     1778: ['', '', 'Secret Kizaru', 'Secret Borsalino'],
-    1779: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino'],
-    1780: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino'],
+    1779: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
+    1780: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
     1781: ['', '', ''],
     1782: ['', '', ''],
     1783: ['', '', ''],

From a47c4b77c1eff539f371527e4f8c6bceae5f3ac3 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 27 Sep 2017 09:51:32 -0400
Subject: [PATCH 1369/1569] Lucy info

---
 common/data/cooldowns.js  | 4 ++--
 common/data/drops.js      | 2 +-
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 055239727..7a8e70454 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1789,8 +1789,8 @@ window.cooldowns = [
     null,
     null,
     null,
-    28,
-    28,
+    [ 28, 14 ],
+    [ 28, 14 ],
     19,
     19,
     18,
diff --git a/common/data/drops.js b/common/data/drops.js
index ac226bf76..200e9dd82 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -711,7 +711,7 @@ window.drops = {
             name: 'Punk Hazard Ice Lands - First Floor Room R',
             shortName: 'Punk Hazard 2',
             thumb: 1716,
-            completion: '10x Rainbow Gems',
+            completion: '5x Rainbow Gems',
             gamewith: 65822,
             '01': [ 1636 ],
             '02': [  ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3d4b878c0..ec567110f 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2781,7 +2781,7 @@ window.evolutions = {
     },
     1791: {
         evolution: 1792,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 1180, 302, 102 ]
     },
     1793: {
         evolution: 1794,
diff --git a/common/data/units.js b/common/data/units.js
index c2b66b465..4ca213590 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1789,8 +1789,8 @@ window.units = [
     [ "Dressrosa Fodder #3", "DEX", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dressrosa Fodder #4", "INT", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dressrosa Fodder #5", "PSY", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lucy, Corrida Colosseum C Block's Bold Opportunist", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2059, 1500, 271, null ],
+    [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 4, 25, 4, 3, 70, 1066998, 425, 365, 54, 1001, 699, 145, null ],
+    [ "Lucy, Corrida Colosseum C Block's Bold Opportunist", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 912, 613, 99, 2059, 1500, 271, null ],
     [ "Lucy, Corrida Colosseum Final Round Lucky Adventurer", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3020, 1539, 390, null ],
     [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],

From 2b9bcf625621a1eaebb765a7a797061fa13a3c9b Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 27 Sep 2017 10:09:27 -0400
Subject: [PATCH 1370/1569] Chopper

---
 common/data/matchers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/matchers.js b/common/data/matchers.js
index 4f7864f62..b7018c680 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -275,7 +275,7 @@ window.matchers = [
         name: 'Orb matchers',
         target: 'special',
         matcher: /(Changes.+(orb|orbs))[^,]+Matching/i,
-        include: [ 1036, 1037, 1445 ]
+        include: [ 1036, 1037, 1445, 1369, 1370 ]
     },
 
     {

From d4d4706e7e146948b7698138649d90323361b857 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 27 Sep 2017 17:54:43 -0400
Subject: [PATCH 1371/1569] Changes for future

---
 common/data/captains.js          | 3 +--
 common/data/units.js             | 2 +-
 damage/js/cruncher.js            | 8 ++++++--
 damage/js/directives.js          | 3 +--
 damage/js/transfer.js            | 1 +
 damage/views/fragments/slot.html | 3 +++
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 2cb350667..918b38916 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -2828,8 +2828,7 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1122: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1;
-        }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
     },
     1123: {
         atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
diff --git a/common/data/units.js b/common/data/units.js
index 65da3fe2d..c40cc8ed4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1458,7 +1458,7 @@ window.units = [
     [ "Klahadore the Butler", "INT", [ "Slasher", "Cerebral" ], 3, 16, 6, 2, 50, 392109, 109, 109, 30, 892, 557, 187, 1 ],
     [ "Pirate Kuro of a Hundred Plans", "INT", [ "Slasher", "Cerebral" ], 4, 26, 10, 3, 99, 3000000, 805, 489, 131, 1664, 1299, 310, 1 ],
     [ "Miss Valentine, Kilo Human", "STR", [ "Fighter", "Free Spirit" ], 3, 10, 5, 2, 35, 136167, 92, 49, 26, 755, 390, 148, 1 ],
-    [ "Miss Valentine, Baroque Works Officer Agent", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1778330, 687, 319, 90, 1402, 774, 250, 1 ],
+    [ "Miss Valentine, Baroque Works Officer Agent", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 70, 1066998, 687, 319, 90, 1402, 774, 250, 1 ],
     [ "Zoro's Winter Training", "QCK", [ "Slasher", "Driven" ], 4, 20, 6, 3, 99, 2000000, 111, 49, 22, 2303, 919, 244, 1 ],
     [ "Break Time Luffy", "PSY", [ "Fighter", "Free Spirit" ], 4, 12, 4, 2, 50, 392109, 132, 94, 26, 968, 505, 146, 1 ],
     [ "Luffy's Tea Party", "PSY", [ "Fighter", "Free Spirit" ], 5, 20, 8, 3, 99, 3000000, 881, 409, 98, 2051, 1138, 276, 1 ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 94e6cbecd..3461594e0 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -474,12 +474,16 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
     var applyCaptainEffectsToHP = function(slotNumber,hp) {
         var params = getParameters(slotNumber);
         for (var i=0;i<enabledEffects.length;++i) {
-            if (enabledEffects[i].hasOwnProperty('hpStatic'))
+            if (enabledEffects[i].hasOwnProperty('hpStatic')){
+                params["sourceSlot"] = enabledEffects[i].sourceSlot;
                 hp += enabledEffects[i].hpStatic(params);
+            }
         }
         for (var i=0;i<enabledEffects.length;++i) {
-            if (enabledEffects[i].hasOwnProperty('hp'))
+            if (enabledEffects[i].hasOwnProperty('hp')){
+                params["sourceSlot"] = enabledEffects[i].sourceSlot; 
                 hp *= enabledEffects[i].hp(params);
+            }
         }
         return hp;
     };
diff --git a/damage/js/directives.js b/damage/js/directives.js
index 8b0725dfd..978e2941b 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -612,7 +612,6 @@ directives.levelSlider = function($timeout) {
 };
 
 directives.unitOrb = function($rootScope) {
-    //var ORBS = [ 0.5, 1, 2, 'g', 'rainbow', 'meat', 'str' ];//STR has to go last for simplicity, but will change if 6+ Shanks makes a turn in the same direction
     var ORBS = [ 0.5, 1, 2 ];
     return {
         restrict: 'E',
@@ -866,7 +865,7 @@ directives.candySlider = function($compile, $timeout) {
             };
             var updateMax = function(data) {
                 var used = Object.keys(data).reduce(function(prev,next) { return prev + (next == scope.type ? 0 : data[next]); },0);
-                input.trigger('configure',{ max: Math.min(100,200 - used) });
+                input.trigger('configure',{ max: Math.min(500,2000 - used) });
                 currentValue = data[scope.type];
                 input.val(currentValue).trigger('change');
                 scope.actualBonus = currentValue * { hp: 5, atk: 2, rcv: 1 }[scope.type];
diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index e18683fe6..c57693e75 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -99,6 +99,7 @@ var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
         if (team[i] === null) continue;
         $scope.data.team[i].unit = window.units[team[i].id - 1];
         $scope.data.team[i].level = team[i].level;
+        $scope.data.team[i].limitLevel = team[i].limitLevel;
         $scope.data.team[i].candies = jQuery.extend($scope.data.team[i].candies, team[i].candies);
         $scope.slotChanged(i);
     }
diff --git a/damage/views/fragments/slot.html b/damage/views/fragments/slot.html
index 82bb2032a..019d59590 100644
--- a/damage/views/fragments/slot.html
+++ b/damage/views/fragments/slot.html
@@ -11,6 +11,7 @@
         ng-if="slot > 1">Click to add</span>
 
     <level-label ng-if="data.team[slot].unit">Lv. {{ data.team[slot].level }}</level-label>
+    <limit-level-label ng-if="data.team[slot].unit">Lv. {{ data.team[slot].limitLevel }}</limit-level-label>
 
     <div class="unitContainer" ng-show="data.team[slot].unit" draggable="slot" stop-propagation removable>
         <div class="unitPortrait" decorate-slot="notitle" uid="data.team[slot].unit.number + 1" udata="numbers.team[slot]"></div>
@@ -22,6 +23,8 @@
     </div>
 
     <level-slider></level-slider>
+    <limit-level-slider></limit-level-slider>
+    
 
     <div class="ribbon-container" ng-if="slot < 2">
         <div class="corner-ribbon orange" ng-if="slot < 1">Friend</div>

From fad0abacb8f67e9b6b4b4af5bb42f967d060c7c1 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 27 Sep 2017 17:56:09 -0400
Subject: [PATCH 1372/1569] whoops

---
 damage/views/fragments/slot.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/damage/views/fragments/slot.html b/damage/views/fragments/slot.html
index 019d59590..548acc659 100644
--- a/damage/views/fragments/slot.html
+++ b/damage/views/fragments/slot.html
@@ -11,7 +11,6 @@
         ng-if="slot > 1">Click to add</span>
 
     <level-label ng-if="data.team[slot].unit">Lv. {{ data.team[slot].level }}</level-label>
-    <limit-level-label ng-if="data.team[slot].unit">Lv. {{ data.team[slot].limitLevel }}</limit-level-label>
 
     <div class="unitContainer" ng-show="data.team[slot].unit" draggable="slot" stop-propagation removable>
         <div class="unitPortrait" decorate-slot="notitle" uid="data.team[slot].unit.number + 1" udata="numbers.team[slot]"></div>
@@ -23,7 +22,6 @@
     </div>
 
     <level-slider></level-slider>
-    <limit-level-slider></limit-level-slider>
     
 
     <div class="ribbon-container" ng-if="slot < 2">

From d8b487626e9b7be858a32c0434d8645a3a95af6b Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 27 Sep 2017 17:56:36 -0400
Subject: [PATCH 1373/1569] Whoops 2

---
 damage/js/transfer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index c57693e75..e18683fe6 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -99,7 +99,6 @@ var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
         if (team[i] === null) continue;
         $scope.data.team[i].unit = window.units[team[i].id - 1];
         $scope.data.team[i].level = team[i].level;
-        $scope.data.team[i].limitLevel = team[i].limitLevel;
         $scope.data.team[i].candies = jQuery.extend($scope.data.team[i].candies, team[i].candies);
         $scope.slotChanged(i);
     }

From 3205483c2e82c32f1b3202a8dd6f77de7372b349 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 27 Sep 2017 18:04:01 -0400
Subject: [PATCH 1374/1569] Meat

---
 common/data/matchers.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/matchers.js b/common/data/matchers.js
index b7018c680..8632ca794 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -338,7 +338,7 @@ window.matchers = [
         matcher: /Reduces.+defense/i
     },
 
-    {
+    /*{
         name: 'Meat producers',
         target: 'special',
         matcher: /into( either)?[\s,\[\]A-Zor]+\[RCV\]/
@@ -348,7 +348,7 @@ window.matchers = [
         name: 'Meat converters',
         target: 'special',
         matcher: /\[RCV\].+into/i
-    },
+    },*/
 
     {
         name: 'Damage reducers',

From 26292008145c7de6c2617828963c68527b2e4fae Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 28 Sep 2017 00:24:03 -0400
Subject: [PATCH 1375/1569] Limit Breaks

---
 common/data/details.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index aad62e4a1..8457e0af0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12010,6 +12010,8 @@ window.details = {
         specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
         specialName: "Gomu Gomu no Hawk Rifle",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1793:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
@@ -12022,6 +12024,8 @@ window.details = {
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1795:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2x",
@@ -12034,6 +12038,8 @@ window.details = {
         special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
         specialName: "Snake Sword",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1797:{//Jesus Burgess
         captain: "Boosts ATK of Fighter characters by 2.25x",
@@ -12074,6 +12080,8 @@ window.details = {
         specialNotes: "#{stages}",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
         specialName: "Shockwave Elbow",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1799:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.25x",
@@ -12086,6 +12094,8 @@ window.details = {
         special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
         specialName: "Beautiful Sword: Round Table",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
@@ -12098,6 +12108,8 @@ window.details = {
         special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1813: {//Koala
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
@@ -12113,6 +12125,8 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 300 HP at end of each turn",
         specialName: "Sanji Special",
         special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
+        limit: "This unit has a Limit Break skill tree",
+        limitNotes: "This will be updated soon"
     },
     1816: {// Ace 6+
         special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, boosts ATK of Shooter characters by 2x for 1 turn",

From a9d57d4f3076aa3cfcadf6b70260a435ea449160 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Thu, 28 Sep 2017 12:18:11 -0400
Subject: [PATCH 1376/1569] Story

---
 common/data/captains.js  | 15 +++++++++++++++
 common/data/cooldowns.js | 16 ++++++++--------
 common/data/details.js   | 30 ++++++++++++++++++++++++++++--
 common/data/drops.js     | 20 ++++++++++++++++++++
 common/data/gw.js        | 10 +++++-----
 common/data/specials.js  | 13 +++++++++++++
 common/data/units.js     | 10 +++++-----
 common/data/zombies.js   |  4 ++++
 8 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 918b38916..de09e39b1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5444,6 +5444,19 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
+    1781: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+    },
+    1782: {
+        atk: function(p) { return p.unit.type == "2.25" ? 1.75 : 1; },
+    },
+    1783: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1784: {
+        atk: function(p) { return p.unit.stars <= 4 ? 2.5 : 1; }
+    },
     1791: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, [ "QCK", "STR", "DEX" ]); }, 
         hitAtk: function(p) {
@@ -5485,6 +5498,8 @@ window.captains = {
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
+                else if((p.colorCount.INT>=1 && p.colorCount.PSY==0) || (p.colorCount.INT==0 && p.colorCount.PSY>=1))
+                    return 1.35;
                 else
                     return 1; 
                 }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 7a8e70454..d8e705849 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1774,16 +1774,16 @@ window.cooldowns = [
     [ 21, 14 ],
     [ 21, 14 ],
     [ 12, 9 ],
-    [ 12, 9],
-    null,
-    null,
+    [ 12, 9 ],
+    [ 15, 11 ],
+    [ 15, 11 ],
     [ 20, 11 ],
     [ 20, 11 ],
-    null,
-    null,
-    null,
-    null,
-    null,
+    25,
+    24,
+    22,
+    25,
+    22,
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index aad62e4a1..c6d36026d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11997,6 +11997,32 @@ window.details = {
         ],
         specialNotes: "#{stages}",
     },
+    1781: {//Fighting Fish
+        captain: "Boosts ATK of Powerhouse characters by 1.75x. Makes [TND] and [RCV] orbs \"beneficial\" to Powerhouse characters",
+        special: "Boosts ATK of ??? characters by 1.3x for 1 turn, changes own orb into STR and deals 5x character's ATK in [STR] damage to all enemies",
+        specialName: "Fish Special",
+    },
+    1782: {//Chinjao
+        captain: "Boosts ATK of [QCK] characters by 2.25x, boosts damage of QCK specials by 1.75x",
+        captainNotes: "#{noFixedPerc}",
+        special: "Delays all enemies for 2 turns, deals 25x character's ATK in STR damage to all enemies",
+        specialName: "Chinjao Special",
+    },
+    1783: {//Hajrudin
+        captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
+        special: "Locks all orbs for 1 turn. If during that turn you score 4 Perfect hits, amplifies the effect of orbs by 1.5x for 1 turn.",
+        specialName: "Chinjao Special",
+    },
+    1784: {//Fujitora
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with fewer than 4 stars by 2.5x",
+        special: "Deals random [INT] damage to all enemies, reduces Special Cooldown of all characters by 1 turn and boosts ATK of all characters by 1.5x for 1 turn",
+        specialName: "Fujitora Special",
+    },
+    1785: {//Spartan
+        captain: "Recovers 3x character's RCV in HP at the end of each turn",
+        special: "Recovers 3000 HP and amplifies the effect of orbs by 1.25x for 1 turn",
+        specialName: "Spartan Special",
+    },
     1791:{//Lucy Luffy
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x after scoring 3 Perfects in a row",
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
@@ -12012,13 +12038,13 @@ window.details = {
         specialName: "Gomu Gomu no Hawk Rifle",
     },
     1793:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
     },
     1794:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x. If there are no [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead. Lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
diff --git a/common/data/drops.js b/common/data/drops.js
index 574241353..2449e71d2 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -729,6 +729,26 @@ window.drops = {
             '14': [ 1636 ],
         },
         
+        {
+            name: 'Dressrosa - Harbor Town Acacia Colosseum',
+            shortName: 'Dressrosa 1',
+            thumb: 1782,
+            completion: '5x Rainbow Gems',
+            gamewith: 70405,
+            '01': [  ],
+            '02': [ 1785 ],
+            '03': [  ],
+            '04': [ 1781 ],
+            '05': [ 1782 ],
+            '06': [ 1648 ],
+            '07': [  ],
+            '08': [ 1784 ],
+            '09': [ 1783 ],
+            '10': [  ],
+            '11': [ 1648 ],
+            '12': [ 1782 ],
+        },
+        
     ],
 
     'Weekly Island': [
diff --git a/common/data/gw.js b/common/data/gw.js
index 01a736d3b..351aff4a9 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1779,11 +1779,11 @@ window.gw=[
     68472,
     68680,
     68680,
-    null,
-    null,
-    null,
-    null,
-    null,
+    70601,
+    70444,
+    70443,
+    70445,
+    70442,
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index a12127383..e2cd0ead7 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3577,6 +3577,19 @@ window.specials = {
     1780: {
         chainAddition: function(p){ return 0.5;}
     },
+    1782: {
+        delay: function(p) { return 1; },
+    },
+    1783: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    },
+    1784: {
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
+    1785: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+    },
     1791: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
diff --git a/common/data/units.js b/common/data/units.js
index c40cc8ed4..e316596ef 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1779,11 +1779,11 @@ window.units = [
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2613, 1342, 315, null ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Kizaru [Neo], Light Human", "DEX", [ "Fighter", "Shooter" ], 5, 50, 5, 4, 99, 5000000, 1, 1, 1, 2486, 1415, 279, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fighting Fish", "STR", [ "Fighter", "Powerhouse" ], 3, 15, 4, 2, 70, 1066998, 177, 122, 24, 1239, 854, 171, null ],
+    [ "Don Chinjao", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 2, 99, 3000000, 669, 652, 67, 1339, 1305, 135, null ],
+    [ "Hajrudin", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 4000000, 521, 301, 0, 2084, 1205, 0, null ],
+    [ "Fujitora", "INT", [ "Slasher", "Shooter" ], 4, 20, 5, 2, 99, 3000000, 896, 425, 30, 2690, 1276, 120, null ],
+    [ "Spartan", "PSY", [ "Fighter", "Driven" ], 3, 15, 6, 2, 70, 1066998, 415, 247, 20, 1660, 991, 93, null ],
     [ "Dressrosa Fodder #1", "STR", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dressrosa Fodder #2", "QCK", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Dressrosa Fodder #3", "DEX", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index c41914ca2..a2fb214aa 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -475,4 +475,8 @@ window.zombies = {
         type: 'healer',
         multiplier: 1.5
     },
+    1785: { // Spartan
+        type: 'healer',
+        multiplier: 3
+    },
 };

From 6ddea15987209748a8da57335d704f84bd577ffd Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 29 Sep 2017 00:37:59 -0400
Subject: [PATCH 1377/1569] Bunch of shit

---
 common/data/aliases.js    | 60 +++++++++++++++++-----------------
 common/data/cooldowns.js  | 28 ++++++++--------
 common/data/details.js    | 60 ++++++++++++++++++++++++++++------
 common/data/drops.js      |  8 +++++
 common/data/evolutions.js | 20 ++++++++----
 common/data/gw.js         | 14 ++++----
 common/data/units.js      | 68 +++++++++++++++++++--------------------
 common/js/utils.js        |  2 +-
 8 files changed, 159 insertions(+), 101 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index db687d76b..e57cada03 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1771,36 +1771,36 @@ window.aliases = {
     1770: ['ベン・ベックマン “四皇”赤髪の右腕', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
     1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
     1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
-    1773: ['', '', 'Kin\'emon'],
-    1774: ['', '', 'Kin\'emon'],
-    1775: ['', '', ''],
-    1776: ['', '', ''],
-    1777: ['', '', 'Secret Kizaru', 'Secret Borsalino'],
-    1778: ['', '', 'Secret Kizaru', 'Secret Borsalino'],
-    1779: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
-    1780: ['', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
-    1781: ['', '', ''],
-    1782: ['', '', ''],
-    1783: ['', '', ''],
-    1784: ['', '', ''],
-    1785: ['', '', ''],
-    1786: ['', '', ''],
-    1787: ['', '', ''],
-    1788: ['', '', ''],
-    1789: ['', '', ''],
-    1790: ['', '', ''],
-    1791: ['', '', 'Luffy'],
-    1792: ['', '', 'Luffy'],
-    1793: ['', '', 'Sabo'],
-    1794: ['', '', 'Sabo'],
-    1795: ['', '', ''],
-    1796: ['', '', ''],
-    1797: ['', '', ''],
-    1798: ['', '', ''],
-    1799: ['', '', ''],
-    1800: ['', '', ''],
-    1801: ['', '', ''],
-    1802: ['', '', ''],
+    1773: ['“侍”　錦えもん', '', 'Kin\'emon'],
+    1774: ['“侍”　狐火の錦えもん', '', 'Kin\'emon'],
+    1775: ['“侍”　モモの助', '', ''],
+    1776: ['“龍”　モモの助', '', ''],
+    1777: ['黄猿 聖地からの使者', '', 'Secret Kizaru', 'Secret Borsalino'],
+    1778: ['黄猿 聖地からの光臨', '', 'Secret Kizaru', 'Secret Borsalino'],
+    1779: ['黄猿「改」', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
+    1780: ['黄猿「改」　光人間', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
+    1781: ['闘魚', '', ''],
+    1782: ['首領・チンジャオ チンジャオファミリー', '', ''],
+    1783: ['ハイルディン 巨人傭兵', '', ''],
+    1784: ['藤虎 海軍本部大将', '', ''],
+    1785: ['スパルタン', '', ''],
+    1786: ['ドンキホーテ海賊団構成員 格闘部隊下級兵', '', ''],
+    1787: ['ドンキホーテ海賊団構成員 特攻部隊下級兵', '', ''],
+    1788: ['ドンキホーテ海賊団構成員 特殊部隊下級兵', '', ''],
+    1789: ['ドンキホーテ海賊団構成員 偵察部隊下級兵', '', ''],
+    1790: ['ドンキホーテ海賊団構成員 諜報部隊下級兵', '', ''],
+    1791: ['ルーシー コリーダコロシアムＣブロックの謎の剣闘士', '', 'Luffy'],
+    1792: ['ルーシー コリーダコロシアムＣブロックの風雲児', '', 'Luffy'],
+    1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo'],
+    1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo'],
+    1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', ''],
+    1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', ''],
+    1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', ''],
+    1798: ['ジーザス・バージェス 鳥カゴの中の暗躍者', '', ''],
+    1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', ''],
+    1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', ''],
+    1801: ['バルトロメオ コリーダコロシアムＢブロックの“人食い”', '', ''],
+    1802: ['バルトロメオ 鳥カゴの中の反逆者', '', ''],
     1803: ['', '', ''],
     1804: ['', '', ''],
     1805: ['', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d8e705849..934fa79de 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1791,26 +1791,26 @@ window.cooldowns = [
     null,
     [ 28, 14 ],
     [ 28, 14 ],
-    19,
-    19,
-    18,
-    18,
-    21,
-    21,
-    16,
-    16,
-    18,
-    18,
-    null,
-    null,
-    null,
-    null,
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
+    [ 16, 10 ],
+    [ 16, 10 ],
+    [ 18, 12 ],
+    [ 18, 12 ],
     null,
     null,
     null,
     null,
     null,
     null,
+    15,
+    15,
+    21,
+    21,
     [ 12, 8 ],
     30,
     30,
diff --git a/common/data/details.js b/common/data/details.js
index db386b17d..f6060cd98 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8827,12 +8827,12 @@ window.details = {
     },
     1451: {//Moustache Sanji
         captain: "Boosts ATK of [DEX] characters by 2.25x if they have a matching orb, by 1.5x otherwise. Slightly boosts chances of getting [DEX] orbs",
-        special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 1 turn",
+        special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 2 turns",
         specialName: "Diable Jambe: Love Shot",
     },
     1452: {//Moustache Sanji
         captain: "Boosts ATK of [DEX] characters by 2.5x if they have a matching orb, by 2x otherwise. Slightly boosts chances of getting [DEX] orbs",
-        special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 1 turn",
+        special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 2 turns",
         specialName: "Diable Jambe: Love Shot",
     },
     1453: {//Valentines Margeurite
@@ -10312,7 +10312,7 @@ window.details = {
         specialName: "Gastanet",
     },
     1638: {//STR Gas Mask Fodder
-        special: "Boosts chances of getting [RCV] orbs",
+        special: "Boosts chances of getting [RCV] orbs for 2 turns",
         specialName: "Meat for Meat",
     },
     1639: {//QCK Gas Mask Fodder
@@ -12005,13 +12005,13 @@ window.details = {
     1782: {//Chinjao
         captain: "Boosts ATK of [QCK] characters by 2.25x, boosts damage of QCK specials by 1.75x",
         captainNotes: "#{noFixedPerc}",
-        special: "Delays all enemies for 2 turns, deals 25x character's ATK in STR damage to all enemies",
+        special: "Delays all enemies for 2 turns, deals 25x character's ATK in [QCK] damage to all enemies",
         specialName: "Chinjao Special",
     },
     1783: {//Hajrudin
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Locks all orbs for 1 turn. If during that turn you score 4 Perfect hits, amplifies the effect of orbs by 1.5x for 1 turn.",
-        specialName: "Chinjao Special",
+        specialName: "Hajrudin Special",
     },
     1784: {//Fujitora
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with fewer than 4 stars by 2.5x",
@@ -12023,6 +12023,26 @@ window.details = {
         special: "Recovers 3000 HP and amplifies the effect of orbs by 1.25x for 1 turn",
         specialName: "Spartan Special",
     },
+    1786: {
+        special: "Makes [QCK] orbs \"beneficial\" to Shooter characters for 1 turn",
+        specialName: "Shooter Beneficial Slot: [QCK]"
+    },
+    1787: {
+        special: "Reduces crew's current HP by 50%, deals 5x the amount of HP subtracted in typeless damage to one enemy",
+        specialName: "Risky Attack"
+    },
+    1788: {
+        special: "Boosts ATK of Shooter characters by 1.2x for 1 turn",
+        specialName: "Attack Boost: Shooter"
+    },
+    1789: {
+        special: "Boosts chances of getting [RCV] orbs for 2 turns",
+        specialName: "Meat for Meat",
+    },
+    1790: {
+        special: "Recovers 3x character's RCV in HP at the end of each turn for 3 turns",
+        specialName: "Auto Light Recovery"
+    },
     1791:{//Lucy Luffy
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x after scoring 3 Perfects in a row",
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
@@ -12040,13 +12060,13 @@ window.details = {
         limitNotes: "This will be updated soon"
     },
     1793:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
     },
     1794:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to some characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
@@ -12111,13 +12131,13 @@ window.details = {
     },
     1799:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.25x",
-        special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
+        special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 2 turns",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
         specialName: "Beautiful Sword: Round Table",
     },
     1800:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and their RCV by 1.2x",
-        special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 1 turn",
+        special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 2 turns",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
         specialName: "Beautiful Sword: Round Table",
         limit: "This unit has a Limit Break skill tree",
@@ -12137,6 +12157,28 @@ window.details = {
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
     },
+    1809: {//Wanda
+        captain: "Boosts ATK by 2.25x after scoring 2 Perfects in a row",
+        special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Striker character, makes Perfects easier to hit for 1 turn",
+        sailor: "Reduces Paralysis for 1 turn for herself",
+        specialName: "Wanda Special",
+    },
+    1810: {//Wanda
+        captain: "Boosts chances of getting Matching orbs, boosts ATK by 2.25x after scoring 2 Perfects in a row",
+        special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Striker character, makes Perfects easier to hit for 1 turn",
+        sailor: "Reduces Paralysis for 1 turn for herself",
+        specialName: "Wanda Special",
+    },
+    1811: {//Carrot
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2x",
+        special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
+        specialName: "Carrot Special",
+    },
+    1812: {//Carrot
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2x",
+        special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
+        specialName: "Carrot Special",
+    },
     1813: {//Koala
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
         special: "Changes Captain's orb into Matching and boosts ATK of your Captain by 1.5x for 1 turn",
diff --git a/common/data/drops.js b/common/data/drops.js
index 2449e71d2..7bfc9bc21 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1670,6 +1670,14 @@ window.drops = {
             'All Difficulties': [ 1773, 1775, -963, -1588, -451, -1186, -528, -1177, -1208, -558, -1616, -1618, -1392 ]
         },
         
+        {
+            name: 'Zou Royal Guard!',
+            thumb: 1812,
+            condition: 'Powerhouse Characters will be weakened',
+            gamewith: null,
+            'All Difficulties': [ 1811, 1809, -1240, -1575, -1658, -1232, -1238, -1117, -522, -1119, -524, -1504, -1503 ]
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index ec567110f..1a2fbbc60 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2773,11 +2773,11 @@ window.evolutions = {
     },
     1777: {
         evolution: 1778,
-        evolvers: [  ]
+        evolvers: [ 118, 85, 96, 301, 101 ]
     },
     1779: {
         evolution: 1780,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 266, 302, 102 ]
     },
     1791: {
         evolution: 1792,
@@ -2785,22 +2785,30 @@ window.evolutions = {
     },
     1793: {
         evolution: 1794,
-        evolvers: [  ]
+        evolvers: [ 118, 100, 101, 102, 267 ]
     },
     1795: {
         evolution: 1796,
-        evolvers: [  ]
+        evolvers: [ 85, 96, 1180, 301, 101 ]
     },
     1797: {
         evolution: 1798,
-        evolvers: [  ]
+        evolvers: [ 83, 94, 97, 302, 102 ]
     },
     1799: {
         evolution: 1800,
-        evolvers: [  ]
+        evolvers: [ 118, 86, 97, 302, 102 ]
     },
     1801: {
         evolution: 1802,
+        evolvers: [ 85, 266, 96, 301, 101 ]
+    },
+    1809: {
+        evolution: 1810,
+        evolvers: [  ]
+    },
+    1811: {
+        evolution: 1812,
         evolvers: [  ]
     },
     1814: {
diff --git a/common/data/gw.js b/common/data/gw.js
index 351aff4a9..497545375 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1784,13 +1784,13 @@ window.gw=[
     70443,
     70445,
     70442,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    70552,
+    70553,
+    70554,
+    70556,
+    70555,
+    70188,
+    70188,
     69286,
     69286,
     69404,
diff --git a/common/data/units.js b/common/data/units.js
index e316596ef..5c7951475 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1771,46 +1771,46 @@ window.units = [
     [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, 1 ],
-    [ "Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, null ],
-    [ "Kinemon, Evolved", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, null, 890, 560, 65, 2058, 1245, 192, null ],
-    [ "Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, null ],
-    [ "Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, null, 646, 259, 80, null, null, null, null ],
-    [ "Kizaru", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1, 1, 1, 2613, 1342, 315, null ],
-    [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Kizaru [Neo], Light Human", "DEX", [ "Fighter", "Shooter" ], 5, 50, 5, 4, 99, 5000000, 1, 1, 1, 2486, 1415, 279, null ],
-    [ "Fighting Fish", "STR", [ "Fighter", "Powerhouse" ], 3, 15, 4, 2, 70, 1066998, 177, 122, 24, 1239, 854, 171, null ],
-    [ "Don Chinjao", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 2, 99, 3000000, 669, 652, 67, 1339, 1305, 135, null ],
-    [ "Hajrudin", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 4000000, 521, 301, 0, 2084, 1205, 0, null ],
-    [ "Fujitora", "INT", [ "Slasher", "Shooter" ], 4, 20, 5, 2, 99, 3000000, 896, 425, 30, 2690, 1276, 120, null ],
-    [ "Spartan", "PSY", [ "Fighter", "Driven" ], 3, 15, 6, 2, 70, 1066998, 415, 247, 20, 1660, 991, 93, null ],
-    [ "Dressrosa Fodder #1", "STR", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dressrosa Fodder #2", "QCK", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dressrosa Fodder #3", "DEX", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dressrosa Fodder #4", "INT", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Dressrosa Fodder #5", "PSY", [ "Shooter", "Driven" ], 3, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Lucy", "DEX", [ "Fighter", "Free Spirit" ], 4, 25, 4, 3, 70, 1066998, 425, 365, 54, 1001, 699, 145, null ],
-    [ "Lucy, Corrida Colosseum C Block's Bold Opportunist", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 912, 613, 99, 2059, 1500, 271, null ],
-    [ "Lucy, Corrida Colosseum Final Round Lucky Adventurer", "STR", [ "Striker", "Fighter" ], 5, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3020, 1539, 390, null ],
-    [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Diamante, Dressrosa Current King's Family Member", "QCK", [ "Driven", "Slasher" ], 5, 30, 7, 4, 99, 4000000, null, null, null, 2401, 1487, 230, null ],
-    [ "Jesus Burgess, Corrida Colosseum A Block's 'Champion'", "DEX", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Jesus Burgess, The Hidden Shadow within the Birdcage", "DEX", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2743, 1364, 238, null ],
-    [ "Cavendish, Corrida Colosseum D Block's 'Hakuba'", "DEX", [ "Driven", "Slasher" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2046, 1466, 314, null ],
-    [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, null, null, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2789, 1289, 251, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Samurai' Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
+    [ "'Samurai' Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
+    [ "'Samurai' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
+    [ "'Dragon' Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
+    [ "Kizaru, Emissary of the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, 5, 3, 70, 1066998, 160, 114, 38, 1292, 700, 177, 1 ],
+    [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1230, 1342, 315, 2613, 1342, 315, 1 ],
+    [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, 2, 70, 1066998, 217, 171, 37, 1221, 746, 162, 1 ],
+    [ "Kizaru [Neo], Light Human", "DEX", [ "Fighter", "Shooter" ], 5, 50, 5, 4, 99, 5000000, 1164, 670, 132, 2486, 1415, 279, 1 ],
+    [ "Fighting Fish", "STR", [ "Fighter", "Powerhouse" ], 3, 15, 4, 2, 70, 1066998, 177, 122, 24, 1239, 854, 171, 1 ],
+    [ "Don Chinjao", "QCK", [ "Fighter", "Striker" ], 4, 20, 4, 2, 99, 3000000, 669, 652, 67, 1339, 1305, 135, 1 ],
+    [ "Hajrudin", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 4000000, 521, 301, 0, 2084, 1205, 0, 1 ],
+    [ "Fujitora", "INT", [ "Slasher", "Shooter" ], 4, 20, 5, 2, 99, 3000000, 896, 425, 30, 2690, 1276, 120, 1 ],
+    [ "Spartan", "PSY", [ "Fighter", "Driven" ], 3, 15, 6, 2, 70, 1066998, 415, 247, 20, 1660, 991, 93, 1 ],
+    [ "Donquixote Pirates Member, Fighting Corps Low Class Soldier", "STR", [ "Shooter", "Driven" ], 3, 12, 7, 1, 60, 449516, 99, 49, 12, 1543, 756, 123, 1 ],
+    [ "Donquixote Pirates Member, Special Attack Corps Low Class Soldier", "QCK", [ "Shooter", "Driven" ], 3, 12, 7, 1, 60, 449516, 118, 43, 9, 1656, 602, 124, 1 ],
+    [ "Donquixote Pirates Member, Special Forces Low Class Soldier", "DEX", [ "Shooter", "Driven" ], 3, 12, 7, 1, 60, 449516, 70, 46, 10, 1120, 746, 167, 1 ],
+    [ "Donquixote Pirates Member, Reconnaissance Corps Low Class Soldier", "INT", [ "Shooter", "Driven" ], 3, 12, 7, 1, 60, 449516, 83, 56, 10, 1170, 791, 143, 1 ],
+    [ "Donquixote Pirates Member, Secret Intelligence Corps Low Class Soldier", "PSY", [ "Shooter", "Driven" ], 3, 12, 7, 1, 60, 449516, 89, 39, 9, 1336, 663, 161, 1 ],
+    [ "Lucy, Corrida Colosseum C Block's Mysterious Gladiator", "DEX", [ "Fighter", "Free Spirit" ], 4, 25, 4, 3, 70, 1066998, 425, 365, 54, 1001, 699, 145, 1 ],
+    [ "Lucy, Corrida Colosseum C Block's Bold Opportunist", "DEX", [ "Fighter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 912, 613, 99, 2059, 1500, 271, 1 ],
+    [ "Lucy, Corrida Colosseum Final Round Lucky Adventurer", "STR", [ "Striker", "Fighter" ], 5, 30, 4, 3, 70, 1066998, 394, 237, 61, 1394, 798, 242, 1 ],
+    [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3020, 1539, 390, 1 ],
+    [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 151, 155, 22, 1234, 692, 101, 1 ],
+    [ "Diamante, Dressrosa Current King's Family Member", "QCK", [ "Driven", "Slasher" ], 5, 30, 7, 4, 99, 4000000, 1156, 604, 69, 2401, 1487, 230, 1 ],
+    [ "Jesus Burgess, Corrida Colosseum A Block's 'Champion'", "DEX", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 209, 143, 29, 1164, 633, 120, 1 ],
+    [ "Jesus Burgess, The Hidden Shadow within the Birdcage", "DEX", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1093, 554, 86, 2743, 1364, 238, 1 ],
+    [ "Cavendish, Corrida Colosseum D Block's 'Hakuba'", "DEX", [ "Driven", "Slasher" ], 4, 15, 5, 3, 50, 392109, 133, 153, 40, 1172, 679, 167, 1 ],
+    [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
+    [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
+    [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wanda", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Vinsmoke Sanji, Evolved", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
diff --git a/common/js/utils.js b/common/js/utils.js
index 8e3a2733f..61fa6ab18 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -5,7 +5,7 @@
         'Skypiea (Guard|Enforcer)', '(Adept|Nomad|Hunter), Shandian',
         '(Seaman|Major|Corporal) Navy', 'Hoodlum.+Bounty Hunter', 'Black Cat Pirates',
         'Arlong crewmember', 'Gunner|Cannoneer|Assassin Master', '^(Female|Giant).*Pirates',
-        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard', 'Fishman (Guard|Outlaw)', 'Punk Hazard Gas Mask Patrol Soldier', 'Punk Hazard Patrol Troop Corps'
+        '(Soldier|General) Zombie.*Shadow', 'Wild Zombie', 'Street Punk', 'Kuja Warriors', '(Naginata|Rifle|Saber|Bazooka|Knuckle) (Corporal|Major)', '(Strong|Speedy|Crafty|Hate-Filled|Egotistical) Soldier Zombie', '(Powerful|Sneaky|Blazing) General Zombie', '(Quick-Draw|Scheming|Technical|Quick-Strike|Strong-Arm|Bold) Gunman', '(Suppressor|Emergency|Perimeter) Jailer', '(Contemplative|All-Action) Guard', 'Fishman (Guard|Outlaw)', 'Punk Hazard Gas Mask Patrol Soldier', 'Punk Hazard Patrol Troop Corps', 'Donquixote Pirates Member'
     ].join(')|(') + ')', 'i');
 
     var utils = {};

From e39b2f80c070e36cedd0c3c0c7bf489b388f6cfc Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 29 Sep 2017 10:00:25 -0400
Subject: [PATCH 1378/1569] Typos

---
 common/data/details.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index f6060cd98..91f7384eb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12075,13 +12075,13 @@ window.details = {
     },
     1795:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2x",
-        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
+        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
         specialName: "Snake Sword",
     },
     1796:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2.5x",
-        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column into Matching orbs",
+        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
         specialName: "Snake Sword",
         limit: "This unit has a Limit Break skill tree",
@@ -12092,15 +12092,15 @@ window.details = {
         special: [
             {
                 "description": "Cuts the current HP of each enemy by 10%",
-                "cooldown": [ 15, null ]
+                "cooldown": [ 15, 9 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 20%",
-                "cooldown": [ 18, null ]
+                "cooldown": [ 18, 12 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
-                "cooldown": [ 21, null ]
+                "cooldown": [ 21, 15 ]
             }
         ],
         specialNotes: "#{stages}",
@@ -12112,15 +12112,15 @@ window.details = {
         special: [
             {
                 "description": "Cuts the current HP of each enemy by 10%",
-                "cooldown": [ 15, null ]
+                "cooldown": [ 15, 9 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 20%",
-                "cooldown": [ 18, null ]
+                "cooldown": [ 18, 12 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 20% and boosts ATK against delayed enemies by 1.5x for 2 turns.",
-                "cooldown": [ 21, null ]
+                "cooldown": [ 21, 15 ]
             }
         ],
         specialNotes: "#{stages}",
@@ -12159,13 +12159,13 @@ window.details = {
     },
     1809: {//Wanda
         captain: "Boosts ATK by 2.25x after scoring 2 Perfects in a row",
-        special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Striker character, makes Perfects easier to hit for 1 turn",
+        special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
         specialName: "Wanda Special",
     },
     1810: {//Wanda
         captain: "Boosts chances of getting Matching orbs, boosts ATK by 2.25x after scoring 2 Perfects in a row",
-        special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Striker character, makes Perfects easier to hit for 1 turn",
+        special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
         specialName: "Wanda Special",
     },

From ff97e4bb5c1adf27db2fdf91050b19297bb4464b Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 29 Sep 2017 16:28:37 -0400
Subject: [PATCH 1379/1569] Limit Breaks for new Units

---
 characters/js/directives.js |   8 +
 characters/js/index.js      |   2 +-
 common/data/cooldowns.js    |   4 +-
 common/data/details.js      | 325 +++++++++++++++++++++++++++++++++---
 common/data/matchers.js     |  46 ++++-
 5 files changed, 358 insertions(+), 27 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index bea5a2202..430ea89d3 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -436,6 +436,14 @@ directives.addTags = function($stateParams, $rootScope) {
                     name = name.replace(/iing/,'ying');
                     element.append($('<span class="tag special">' + name + '</div>'));
                 }
+                // limit
+                if (matcher.target.indexOf('limit') === 0 && matcher.matcher.test(data[matcher.target])) {
+                    name = matcher.name;
+                    if (!/limit$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' limit';
+                    else name = name.replace(/s$/,'');
+                    name = name.replace(/iing/,'ying');
+                    element.append($('<span class="tag limit">' + name + '</div>'));
+                }
             });
         }
     };
diff --git a/characters/js/index.js b/characters/js/index.js
index 61a15c11b..c77e4e724 100644
--- a/characters/js/index.js
+++ b/characters/js/index.js
@@ -12,7 +12,7 @@ Utils.parseUnits(false);
 
 var reverseMatcherMap = { };
 for (var i=0;i<window.matchers.length;++i) {
-    var data = window.matchers[i], type = (data.target == 'captain' ? 'captain' : data.target == 'special' ? 'special' : 'sailor');
+    var data = window.matchers[i], type = (data.target == 'captain' ? 'captain' : data.target == 'special' ? 'special' : data.target == 'sailor' ? 'sailor' : 'limit' );
     var name = data.name.replace(/-/g,' ').replace(/\s(.)/g,function(x,y) { return y.toUpperCase(); });
     reverseMatcherMap[type + '.' + name] = i;
 }
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 934fa79de..cd2e833bb 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1780,9 +1780,9 @@ window.cooldowns = [
     [ 20, 11 ],
     [ 20, 11 ],
     25,
-    24,
+    [ 24, 18 ],
     22,
-    25,
+    [ 25, 19 ],
     22,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 91f7384eb..cc58c3b70 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11964,8 +11964,45 @@ window.details = {
         special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers, changes [BLOCK], [STR], and [INT] orbs into Matching orbs for Free Spirit characters and adds .2x to Chain multiplier for 3 turns",
         specialName: "Devil Destroyer's Light Arrow",
         specialNotes: "#{ignoreBarrier}",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability 1: Makes [DEX] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK, HP and RCV of Shooter and Free Spirit characters by 50" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ]
     },
     1779:{//Kizaru
         captain: "Boosts ATK of Shooter characters by 2x",
@@ -12023,23 +12060,23 @@ window.details = {
         special: "Recovers 3000 HP and amplifies the effect of orbs by 1.25x for 1 turn",
         specialName: "Spartan Special",
     },
-    1786: {
+    1786: {//Dressrosa Fodder
         special: "Makes [QCK] orbs \"beneficial\" to Shooter characters for 1 turn",
         specialName: "Shooter Beneficial Slot: [QCK]"
     },
-    1787: {
+    1787: {//Dressrosa Fodder
         special: "Reduces crew's current HP by 50%, deals 5x the amount of HP subtracted in typeless damage to one enemy",
         specialName: "Risky Attack"
     },
-    1788: {
+    1788: {//Dressrosa Fodder
         special: "Boosts ATK of Shooter characters by 1.2x for 1 turn",
         specialName: "Attack Boost: Shooter"
     },
-    1789: {
+    1789: {//Dressrosa Fodder
         special: "Boosts chances of getting [RCV] orbs for 2 turns",
         specialName: "Meat for Meat",
     },
-    1790: {
+    1790: {//Dressrosa Fodder
         special: "Recovers 3x character's RCV in HP at the end of each turn for 3 turns",
         specialName: "Auto Light Recovery"
     },
@@ -12056,8 +12093,46 @@ window.details = {
         specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
         specialName: "Gomu Gomu no Hawk Rifle",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: " },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 30% chance to deal 3% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 30% chance to deal 3% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 50% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 7% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 120",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1793:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
@@ -12070,8 +12145,71 @@ window.details = {
         captainNotes: "#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base HP by 75" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Boosts base HP by 85" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 50" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 30% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 30% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 50% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 60",
+                    "Level 2: Boosts base ATK by 90",
+                    "Level 3: Boosts base ATK by 120",
+                    "Level 4: Boosts base ATK by 150",
+                    "Level 5: Boosts base ATK by 200"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 3 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 7 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 10 turns on this character",
+                    "Level 5: Reduces Slot Bind completely on this character"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1795:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2x",
@@ -12084,8 +12222,45 @@ window.details = {
         special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
         specialName: "Snake Sword",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Potential 1: Barrier Penetration" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Sailor Ability 1: Reduces Silence duration on this character by 3 turns" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Barrier Penetration",
+                "description": [ 
+                    "Level 1: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 2: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 3: This character's attack will ignore barriers if HP is above 99%",
+                    "Level 4: This character's attack will ignore barriers if HP is above 80%",
+                    "Level 5: This character's attack will ignore barriers if HP is above 50%"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 10 turns on this character"
+                ]
+            },
+        ]
     },
     1797:{//Jesus Burgess
         captain: "Boosts ATK of Fighter characters by 2.25x",
@@ -12126,8 +12301,46 @@ window.details = {
         specialNotes: "#{stages}",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
         specialName: "Shockwave Elbow",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 10" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Sailor Ability 1: Reduces Silence duration on this character by 3 turns" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base HP by 90" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 40% chance to deal 7% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 50",
+                    "Level 3: Boosts base ATK by 70",
+                    "Level 4: Boosts base ATK by 100",
+                    "Level 5: Boosts base ATK by 150"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1799:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.25x",
@@ -12140,8 +12353,45 @@ window.details = {
         special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 2 turns",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
         specialName: "Beautiful Sword: Round Table",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: Reduce No Healing duration" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 50" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 10 turns on this character"
+                ]
+            },
+        ]
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
@@ -12154,8 +12404,45 @@ window.details = {
         special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself?",
         specialName: "Barrier Bulls",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 10" },
+            { "description": "Boosts base HP by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: Reduce No Healing duration" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 50" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 60" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by 1 turn",
+                    "Level 3: Reduces No Healing duration by 1 turn",
+                    "Level 4: Reduces No Healing duration by 2 turns",
+                    "Level 5: Reduces No Healing duration by 3 turns"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 10 turns on this character"
+                ]
+            },
+        ]
     },
     1809: {//Wanda
         captain: "Boosts ATK by 2.25x after scoring 2 Perfects in a row",
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 8632ca794..28cc95b0f 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -469,31 +469,31 @@ window.matchers = [
     {
         name: 'Type-boosting sailors',
         target: 'sailor',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(STR|DEX|QCK|PSY|INT)\b/i
+        matcher: /Boosts base (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(STR|DEX|QCK|PSY|INT)\b/i
     },
     
     {
         name: 'Class-boosting sailors',
         target: 'sailor',
-        matcher: /Boosts (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Driven)/i
+        matcher: /Boosts base (ATK|HP|RCV|ATK and HP|ATK and RCV|HP and RCV|ATK, HP and RCV) of[^,]+(Slasher|Striker|Fighter|Shooter|Free Spirit|Cerebral|Powerhouse|Driven)/i
     },
     
     {
         name: 'ATK boosting sailors',
         target: 'sailor',
-        matcher: /Boosts ATK/i
+        matcher: /Boosts base ATK/i
     },
 
     {
         name: 'HP boosting sailors',
         target: 'sailor',
-        matcher: /Boosts (HP|ATK and HP|ATK, HP)|Boosts.+and their HP/i
+        matcher: /Boosts base (HP|ATK and HP|ATK, HP)|Boosts.+and their HP/i
     },
 
     {
         name: 'RCV boosting sailors',
         target: 'sailor',
-        matcher: /Boosts (RCV|ATK and RCV|HP and RCV|ATK, HP and RCV)|Boosts.+and their RCV/i
+        matcher: /Boosts base (RCV|ATK and RCV|HP and RCV|ATK, HP and RCV)|Boosts.+and their RCV/i
     },
     
     {
@@ -533,5 +533,41 @@ window.matchers = [
         target: 'limit',
         matcher: /\S/i
     },
+    
+    {
+        name: 'Enrage Potential Ability',
+        target: 'limit',
+        matcher: /Enrage/i
+    },
+    
+    {
+        name: 'Reduce No Healing Potential Ability',
+        target: 'limit',
+        matcher: /Reduce No Healing/i
+    },
+    
+    {
+        name: 'Critical Hit Potential Ability',
+        target: 'limit',
+        matcher: /Critical Hit/i
+    },
+    
+    {
+        name: 'Slot Bind Self-reduction Potential Ability',
+        target: 'limit',
+        matcher: /Slot Bind Self-reduction/i
+    },
+    
+    {
+        name: 'Barrier Penetration Potential Ability',
+        target: 'limit',
+        matcher: /Barrier Penetration/i
+    },
+    
+    {
+        name: 'Pinch Healing Potential Ability',
+        target: 'limit',
+        matcher: /Pinch Healing/i
+    },
 
 ];

From eb149cdb769145096c395e893db0ccad0933d621 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 29 Sep 2017 18:13:05 -0400
Subject: [PATCH 1380/1569] Lucy clarification

---
 common/data/details.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index cc58c3b70..ca056937d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12135,14 +12135,14 @@ window.details = {
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1793:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
-        captainNotes: "#{beneficial}",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not both [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
+        captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and either [PSY] or [INT] or neither type, but not both [PSY] and [INT] characters<br>#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
     },
     1794:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are no [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
-        captainNotes: "#{beneficial}",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not both [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
+        captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and either [PSY] or [INT] or neither type, but not both [PSY] and [INT] characters<br>#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
         limit: [

From 6309deec8b01bfa5a4439fcd7714305e33863f59 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 29 Sep 2017 18:21:34 -0400
Subject: [PATCH 1381/1569] This works

---
 common/data/captains.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index de09e39b1..4f79980bd 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5474,10 +5474,12 @@ window.captains = {
     1793: {
         atk: function(p) { 
             if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
-                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                if((p.colorCount.INT>=0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)  || (p.colorCount.INT==0 && p.colorCount.PSY>=0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1))
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
+                else if((p.colorCount.INT>=1 && p.colorCount.PSY==0) || (p.colorCount.INT==0 && p.colorCount.PSY>=1))
+                    return 1.35;
                 else
                     return 1; 
                 }
@@ -5494,7 +5496,7 @@ window.captains = {
     1794: {
         atk: function(p) { 
             if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
-                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                if((p.colorCount.INT>=0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)  || (p.colorCount.INT==0 && p.colorCount.PSY>=0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1))
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;

From 2d3ec486d758f3432cdf6ea339011f65118ef181 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 30 Sep 2017 16:27:35 -0400
Subject: [PATCH 1382/1569] Lucy bug

---
 common/data/captains.js | 8 ++++----
 common/data/details.js  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 4f79980bd..da39b9cfa 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5474,11 +5474,11 @@ window.captains = {
     1793: {
         atk: function(p) { 
             if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
-                if((p.colorCount.INT>=0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)  || (p.colorCount.INT==0 && p.colorCount.PSY>=0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1))
+                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
-                else if((p.colorCount.INT>=1 && p.colorCount.PSY==0) || (p.colorCount.INT==0 && p.colorCount.PSY>=1))
+                else if(p.colorCount.INT==0 && p.colorCount.PSY==0)
                     return 1.35;
                 else
                     return 1; 
@@ -5496,11 +5496,11 @@ window.captains = {
     1794: {
         atk: function(p) { 
             if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
-                if((p.colorCount.INT>=0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)  || (p.colorCount.INT==0 && p.colorCount.PSY>=0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1))
+                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
-                else if((p.colorCount.INT>=1 && p.colorCount.PSY==0) || (p.colorCount.INT==0 && p.colorCount.PSY>=1))
+                else if(p.colorCount.INT==0 && p.colorCount.PSY==0)
                     return 1.35;
                 else
                     return 1; 
diff --git a/common/data/details.js b/common/data/details.js
index ca056937d..de2d37814 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12135,14 +12135,14 @@ window.details = {
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1793:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not both [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
-        captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and either [PSY] or [INT] or neither type, but not both [PSY] and [INT] characters<br>#{beneficial}",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, lowers chances of getting [STR] orbs and makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead.",
+        captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and no [PSY] or [INT] characters at all.<br>#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
     },
     1794:{//Lucy Sabo
-        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, and lowers chances of getting [STR] orbs, makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not both [PSY] and [INT] characters on your crew, boosts ATK by 3.7125x instead.",
-        captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and either [PSY] or [INT] or neither type, but not both [PSY] and [INT] characters<br>#{beneficial}",
+        captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, lowers chances of getting [STR] orbs and makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead.",
+        captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and no [PSY] or [INT] characters at all.<br>#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
         specialName: "Dragon's Claw: Reverse Wave Motion",
         limit: [

From 38d8052a37628c4ff79b4f4841317e96e962b844 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Sun, 1 Oct 2017 03:34:40 -0400
Subject: [PATCH 1383/1569] Sang

---
 common/data/cooldowns.js | 4 ++--
 common/data/details.js   | 4 ++--
 common/data/units.js     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index cd2e833bb..75b6260d1 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1812,7 +1812,7 @@ window.cooldowns = [
     21,
     21,
     [ 12, 8 ],
-    30,
-    30,
+    [ 30, 15 ],
+    [ 30, 15 ],
     [ 20, 15 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index de2d37814..4bedea5ac 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12473,12 +12473,12 @@ window.details = {
     },
     1814: {//Raid Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x until the first hit other than Perfect and recovers 100 HP at end of each turn",
-        specialName: "Sanji Special",
+        specialName: "Joue Shoot",
         special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
     },
     1815: {//Raid Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 300 HP at end of each turn",
-        specialName: "Sanji Special",
+        specialName: "Joue Shoot",
         special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
         limit: "This unit has a Limit Break skill tree",
         limitNotes: "This will be updated soon"
diff --git a/common/data/units.js b/common/data/units.js
index 5c7951475..ab0f919f5 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1812,8 +1812,8 @@ window.units = [
     [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
-    [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Sanji, Evolved", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
+    [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, null ],
+    [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
     [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, null ],
     ];
     

From 4924209463ad26fc2b80cd2017476c8cebde0fba Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 2 Oct 2017 16:53:12 -0400
Subject: [PATCH 1384/1569] Sanji

---
 common/data/aliases.js    | 25 +++++++++++++++++++++
 common/data/details.js    | 44 ++++++++++++++++++++++++++++++++++---
 common/data/evolutions.js |  2 +-
 common/data/flags.js      | 46 ++++++++++++++++++++++++++++-----------
 common/data/units.js      | 10 ++++-----
 5 files changed, 105 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index e57cada03..28a86e7fe 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1804,6 +1804,31 @@ window.aliases = {
     1803: ['', '', ''],
     1804: ['', '', ''],
     1805: ['', '', ''],
+    1806: ['', '', ''],
+    1807: ['', '', ''],
+    1808: ['', '', ''],
+    1809: ['', '', ''],
+    1810: ['', '', ''],
+    1811: ['', '', ''],
+    1812: ['', '', ''],
+    1813: ['コアラ 極秘任務の革命軍', '', ''],
+    1814: ['ヴィンスモーク・サンジ', '', ''],
+    1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', ''],
+    1816: ['ポートガス・D・エース 闇討つ太陽', '', ''],
+    1817: ['', '', ''],
+    1818: ['', '', ''],
+    1819: ['', '', ''],
+    1820: ['', '', ''],
+    1821: ['', '', ''],
+    1822: ['', '', ''],
+    1823: ['', '', ''],
+    1824: ['', '', ''],
+    1825: ['', '', ''],
+    1826: ['', '', ''],
+    1827: ['', '', ''],
+    1828: ['', '', ''],
+    1829: ['', '', ''],
+    1830: ['', '', ''],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/details.js b/common/data/details.js
index 4bedea5ac..9b63ec5fd 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11791,7 +11791,7 @@ window.details = {
             { "description": "Boosts base RCV by 10" },
             { "description": "Boosts base RCV by 10" },
             { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker characters by 50" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Powerhouse characters by 50" },
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base HP by 40" },
@@ -12480,8 +12480,46 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 300 HP at end of each turn",
         specialName: "Joue Shoot",
         special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
-        limit: "This unit has a Limit Break skill tree",
-        limitNotes: "This will be updated soon"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: Enrage" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [RCV] orbs \"beneficial\" for all characters" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 20",
+                    "Level 2: Boosts base ATK by 30",
+                    "Level 3: Boosts base ATK by 40",
+                    "Level 4: Boosts base ATK by 50",
+                    "Level 5: Boosts base ATK by 100"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ],
+        potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1816: {// Ace 6+
         special: "Reduces crew's current HP by 40%, deals 15x the amount of HP subtracted in typeless damage to all enemies, boosts ATK of Shooter characters by 2x for 1 turn",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 1a2fbbc60..c41bb15ec 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2813,7 +2813,7 @@ window.evolutions = {
     },
     1814: {
         evolution: 1815,
-        evolvers: [  ]
+        evolvers: [ 118, 95, 1180, 300, 100 ]
     },
     562: {
         evolution: 1816,
diff --git a/common/data/flags.js b/common/data/flags.js
index e0a0ced9e..80f214582 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1207,6 +1207,8 @@ window.flags = {
     1216: { global: 1 },
     1217: { global: 1 },
     1218: { global: 1 },
+    1219: { global: 1 },
+    1220: { global: 1 },
     1223: { global: 1 },
     1224: { global: 1 },
     1225: { global: 1 },
@@ -1275,10 +1277,14 @@ window.flags = {
     1296: { rr: 1, rro: 1, lrr: 1 },
     1297: { global: 1 },
     1298: { global: 1 },
+    1299: { global: 1 },
+    1300: { global: 1 },
     1301: { global: 1 },
     1302: { global: 1 },
     1303: { global: 1 },
     1304: { global: 1 },
+    1305: { global: 1 },
+    1306: { global: 1 },
     1307: { rr: 1, rro: 1, lrr: 1 },
     1308: { rr: 1, rro: 1, lrr: 1 },
     1309: { global: 1 },
@@ -1295,6 +1301,8 @@ window.flags = {
     1322: { rr: 1, rro: 1, global: 1 },
     1323: { rr: 1, rro: 1, global: 1 },
     1324: { rr: 1, rro: 1, global: 1 },
+    1325: { global: 1 },
+    1326: { global: 1 },
     1327: { global: 1 },
     1328: { global: 1 },
     1329: { global: 1 },
@@ -1418,6 +1426,10 @@ window.flags = {
     1461: { special: 1 },
     1466: { rr: 1, rro: 1, lrr: 1 },
     1467: { rr: 1, rro: 1, lrr: 1 },
+    1468: { global: 1 },
+    1469: { global: 1 },
+    1470: { global: 1 },
+    1471: { global: 1 },
     1472: { rr: 1, rro: 1, global: 1 },
     1473: { rr: 1, rro: 1, global: 1 },
     1474: { rr: 1, rro: 1, global: 1 },
@@ -1453,24 +1465,32 @@ window.flags = {
     1518: { global: 1 },
     1523: { rr: 1, rro: 1, lrr: 1 },
     1524: { rr: 1, rro: 1, lrr: 1 },
+    1525: { global: 1 },
     1529: { global: 1 },
     1530: { global: 1 },
-    1531: { rr: 1, rro: 1 },
-    1532: { rr: 1, rro: 1 },
-    1533: { rr: 1, rro: 1 },
-    1534: { rr: 1, rro: 1 },
-    1535: { rr: 1, rro: 1 },
-    1536: { rr: 1, rro: 1 },
-    1537: { rr: 1, rro: 1 },
-    1538: { rr: 1, rro: 1 },
-    1539: { rr: 1, rro: 1 },
-    1540: { rr: 1, rro: 1 },
-    1541: { rr: 1, rro: 1 },
-    1542: { rr: 1, rro: 1 },
-    1543: { rr: 1, rro: 1 },
+    1531: { rr: 1, rro: 1, global: 1 },
+    1532: { rr: 1, rro: 1, global: 1 },
+    1533: { rr: 1, rro: 1, global: 1 },
+    1534: { rr: 1, rro: 1, global: 1 },
+    1535: { rr: 1, rro: 1, global: 1 },
+    1536: { rr: 1, rro: 1, global: 1 },
+    1537: { rr: 1, rro: 1, global: 1 },
+    1538: { rr: 1, rro: 1, global: 1 },
+    1539: { rr: 1, rro: 1, global: 1 },
+    1540: { rr: 1, rro: 1, global: 1 },
+    1541: { rr: 1, rro: 1, global: 1 },
+    1542: { rr: 1, rro: 1, global: 1 },
+    1543: { rr: 1, rro: 1, global: 1 },
     1549: { global: 1 },
     1550: { global: 1 },
     1551: { global: 1 },
+    1556: { global: 1 },
+    1557: { global: 1 },
+    1558: { global: 1 },
+    1559: { global: 1 },
+    1560: { global: 1 },
+    1561: { global: 1 },
+    1562: { global: 1 },
     1567: { rr: 1, rro: 1, lrr: 1 },
     1568: { rr: 1, rro: 1, lrr: 1 },
     1569: { special: 1, global: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index ab0f919f5..f0c0600f1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1203,7 +1203,7 @@ window.units = [
     [ "Yorki", "PSY", [ "Slasher", "Free Spirit" ], 3, 12, 6, 1, 50, 392109, 102, 91, 36, 902, 584, 201, 1 ],
     [ "Calico Yorki", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 840, 516, 170, 1583, 1153, 315, 1 ],
     [ "Rumbar Pirates Brook", "QCK", [ "Slasher", "Free Spirit" ], 3, 12, 5, 1, 50, 392109, 139, 80, 31, 1006, 528, 184, 1 ],
-    [ "Rumbar Pirates Musician and Swordman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
+    [ "Rumbar Pirates Musical Swordsman Brook", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 4, 2, 99, 3000000, 942, 466, 139, 1894, 984, 299, 1 ],
     [ "Rumbar Pirates Laboon", "STR", "Fighter", 3, 9, 6, 1, 50, 392109, 155, 55, 23, 1302, 570, 151, 1 ],
     [ "Nico Robin, Dream Chaser", "INT", [ "Fighter", "Cerebral" ], 4, 17, 4, 3, 70, 1066998, 213, 96, 45, 1147, 626, 216, 1 ],
     [ "Nico Robin, A Pirate Who Lives By Her Code", "INT", [ "Fighter", "Cerebral" ], 5, 27, 4, 4, 99, 4000000, 1098, 551, 180, 2076, 1099, 400, 1 ],
@@ -1811,10 +1811,10 @@ window.units = [
     [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, null, 238, 82, 18, 2422, 1012, 249, null ],
-    [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, null ],
-    [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1, 1, 1, 2267, 1468, 346, null ],
-    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, null ],
+    [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 238, 82, 18, 2422, 1012, 249, 1 ],
+    [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
+    [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
+    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 447f3869c36658be203c39075756eb4d3c15dad2 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 2 Oct 2017 23:55:33 -0400
Subject: [PATCH 1385/1569] New FN units

---
 common/data/evolutions.js | 4 ++--
 common/data/units.js      | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index c41bb15ec..e357dbae8 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2805,11 +2805,11 @@ window.evolutions = {
     },
     1809: {
         evolution: 1810,
-        evolvers: [  ]
+        evolvers: [ 117, 81, 87, 98, 103 ]
     },
     1811: {
         evolution: 1812,
-        evolvers: [  ]
+        evolvers: [ 117, 80, 86, 97, 102 ]
     },
     1814: {
         evolution: 1815,
diff --git a/common/data/units.js b/common/data/units.js
index f0c0600f1..ffe175e05 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1807,10 +1807,10 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wanda", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Wanda", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, null, null, null, null ],
+    [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, null, 714, 501, 137, null, null, null, null ],
+    [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, null, null, null, null ],
+    [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, 5, 3, 99, null, 689, 729, 65, null, null, null, null ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 238, 82, 18, 2422, 1012, 249, 1 ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
     [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1099, 677, 157, 2267, 1468, 346, 1 ],

From a484168394c21d9aa7c816fa56ed4f74397cbe9d Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 3 Oct 2017 12:22:02 -0400
Subject: [PATCH 1386/1569] Magellan Cost

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index ffe175e05..a7aaa2ef8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1696,7 +1696,7 @@ window.units = [
     [ "Demon Bamboo Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, 1 ],
     [ "Demon Bamboo Vergo, Donquiote Family Senior Executive", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, 1 ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, 1 ],
-    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 50, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, 1 ],
+    [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 55, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, 1 ],
     [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 156, 137, 30, 1120, 674, 196, 1 ],
     [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1056, 620, 132, 2188, 1392, 320, 1 ],
     [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, 1 ],

From 1a2f675aa6336d91f17a3d5ca238f45f317b2ad8 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Tue, 3 Oct 2017 18:10:17 -0400
Subject: [PATCH 1387/1569] Bugs

---
 common/data/flags.js | 1 +
 common/data/gw.js    | 4 ++--
 common/data/units.js | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/data/flags.js b/common/data/flags.js
index 80f214582..8fd8d5068 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1622,4 +1622,5 @@ window.flags = {
     1801: { rr: 1, rro: 1 },
     1802: { rr: 1, rro: 1 },
     1813: { special: 1 },
+    1816: { rr: 1, rro: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 497545375..a0aba72f6 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1812,7 +1812,7 @@ window.gw=[
     null,
     null,
     69787,
-    null,
-    null,
+    70377,
+    70377,
     12647,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index a7aaa2ef8..b75d9a0d8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1813,7 +1813,7 @@ window.units = [
     [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, 5, 3, 99, null, 689, 729, 65, null, null, null, null ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 238, 82, 18, 2422, 1012, 249, 1 ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
-    [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 5000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
+    [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 4000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
     [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
     ];
     

From 71dc0eb66c714632ca2292b826cfe2500d7773f4 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 8 Oct 2017 18:41:44 -0400
Subject: [PATCH 1388/1569] cds

---
 common/data/cooldowns.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 75b6260d1..0584ac7ec 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1807,10 +1807,10 @@ window.cooldowns = [
     null,
     null,
     null,
-    15,
-    15,
-    21,
-    21,
+    [ 15, 9 ],
+    [ 15, 9 ],
+    [ 21, 15 ],
+    [ 21, 15 ],
     [ 12, 8 ],
     [ 30, 15 ],
     [ 30, 15 ],

From a5200c2ee3a65d25037c0e574678790906dc9b80 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 11 Oct 2017 12:06:48 -0400
Subject: [PATCH 1389/1569] Sanji boi

---
 common/data/aliases.js    | 12 +++++-----
 common/data/captains.js   | 25 +++++++++++++++++++++
 common/data/cooldowns.js  |  6 +++++
 common/data/details.js    | 46 ++++++++++++++++++++++++++++++++++++++-
 common/data/drops.js      | 10 ++++++++-
 common/data/evolutions.js |  8 +++++++
 common/data/families.js   |  6 +++++
 common/data/flags.js      |  2 ++
 common/data/gw.js         | 14 ++++++++----
 common/data/specials.js   | 16 ++++++++++++++
 common/data/units.js      | 14 ++++++++----
 common/data/zombies.js    |  8 +++++++
 12 files changed, 151 insertions(+), 16 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 28a86e7fe..7e914fa19 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1807,10 +1807,10 @@ window.aliases = {
     1806: ['', '', ''],
     1807: ['', '', ''],
     1808: ['', '', ''],
-    1809: ['', '', ''],
-    1810: ['', '', ''],
-    1811: ['', '', ''],
-    1812: ['', '', ''],
+    1809: ['ワンダ モコモ公国', '', ''],
+    1810: ['王の鳥　ワンダ モコモ公国', '', ''],
+    1811: ['キャロット モコモ公国', '', ''],
+    1812: ['王の鳥　キャロット モコモ公国', '', ''],
     1813: ['コアラ 極秘任務の革命軍', '', ''],
     1814: ['ヴィンスモーク・サンジ', '', ''],
     1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', ''],
@@ -1819,8 +1819,8 @@ window.aliases = {
     1818: ['', '', ''],
     1819: ['', '', ''],
     1820: ['', '', ''],
-    1821: ['', '', ''],
-    1822: ['', '', ''],
+    1821: ['', '', 'Husbando Sanji'],
+    1822: ['', '', 'Husbando Sanji'],
     1823: ['', '', ''],
     1824: ['', '', ''],
     1825: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index da39b9cfa..35086b6ae 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5541,6 +5541,24 @@ window.captains = {
     1802: {
         atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; }
     },
+    1809: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1810: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1811: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+    },
+    1812: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+    },
     1813: {
         atk: function(p) { return 2.25; }
     },
@@ -5564,4 +5582,11 @@ window.captains = {
         atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.25 : 2.25); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
+    1818: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;
+        },
+        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return 1.2; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0584ac7ec..5d3b1994b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1815,4 +1815,10 @@ window.cooldowns = [
     [ 30, 15 ],
     [ 30, 15 ],
     [ 20, 15 ],
+    20,
+    20,
+    null,
+    null,
+    [ 14, 14 ],
+    [ 14, 14 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 9b63ec5fd..157c76be4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12462,7 +12462,7 @@ window.details = {
         specialName: "Carrot Special",
     },
     1812: {//Carrot
-        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2x",
+        captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2.25x",
         special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
         specialName: "Carrot Special",
     },
@@ -12526,4 +12526,48 @@ window.details = {
         specialName: "Great Flame Commandment: Flame Emperor • Flame Wheel",
         captain: "Boosts HP of Shooter characters by 1.5x and boosts ATK by 3.25x if they have a matching orb, by 2.25x otherwise"
     },
+    1817: {// Riku
+        captain: "Boosts ATK of all characters by ???x and their HP by ???x, boosts ATK by ???x after scoring 3 Greats in a row",
+        special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
+        specialName: "Riku Special",
+        sailor: "Restores his own special by 1 turn when it is rewinded",
+        sailorNotes: "#{rewind : 1}",
+    },
+    1818: {// Riku
+        captain: "Boosts ATK of all characters by 1.5x and their HP by 1.2x, boosts ATK by 2.5x after scoring 3 Greats in a row",
+        special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
+        specialName: "Riku Special",
+        sailor: "Restores his own special by 1 turn when it is rewinded",
+        sailorNotes: "#{rewind : 1}",
+    },
+    1821: {//Sanji
+        captain: "Boosts ATK of all characters by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Recovers 4x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
+                "cooldown": [ 8, 8 ]
+            },
+            {
+                "description": "Recovers 10x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
+                "cooldown": [ 14, 14 ]
+            },
+        ],
+        specialName: "Sanji Special",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+    },
+    1822: {//Sanji
+        captain: "Boosts ATK of all characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
+        special: [
+            {
+                "description": "Recovers 4x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
+                "cooldown": [ 8, 8 ]
+            },
+            {
+                "description": "Recovers 10x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
+                "cooldown": [ 14, 14 ]
+            },
+        ],
+        specialName: "Sanji Special",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+    },
 };
\ No newline at end of file
diff --git a/common/data/drops.js b/common/data/drops.js
index 7bfc9bc21..8f226de79 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1674,10 +1674,18 @@ window.drops = {
             name: 'Zou Royal Guard!',
             thumb: 1812,
             condition: 'Powerhouse Characters will be weakened',
-            gamewith: null,
+            gamewith: 71416,
             'All Difficulties': [ 1811, 1809, -1240, -1575, -1658, -1232, -1238, -1117, -522, -1119, -524, -1504, -1503 ]
         },
         
+        {
+            name: 'Dressrosa Royal Family!',
+            thumb: 1818,
+            condition: '',
+            gamewith: null,
+            'All Difficulties': [ 1817, 1819, 1820 ]
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index e357dbae8..3a17082ce 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2819,4 +2819,12 @@ window.evolutions = {
         evolution: 1816,
         evolvers: [ 'skullDEX', 118, 86, 302, 267 ]
     },
+    1817: {
+        evolution: 1818,
+        evolvers: [  ]
+    },
+    1821: {
+        evolution: 1822,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index a935d18bb..29c638b0a 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1815,4 +1815,10 @@ window.families = [
     "Sanji",
     "Sanji",
     "Portgas D. Ace",
+    "Ricky",
+    "Ricky",
+    "Princess Scarlet",
+    "Tank",
+    "Sanji",
+    "Sanji",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index 8fd8d5068..7dead1082 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1623,4 +1623,6 @@ window.flags = {
     1802: { rr: 1, rro: 1 },
     1813: { special: 1 },
     1816: { rr: 1, rro: 1 },
+    1821: { shop: 1 },
+    1822: { shop: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index a0aba72f6..10d31b4f5 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1807,12 +1807,18 @@ window.gw=[
     null,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
+    71419,
+    71419,
+    71420,
+    71420,
     69787,
     70377,
     70377,
     12647,
+    null,
+    null,
+    null,
+    null,
+    72324,
+    72324,
 ];
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index e2cd0ead7..b42fce59c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3648,6 +3648,14 @@ window.specials = {
     1802: {
         def: function(p) { return 0.1; }
     },
+    1811: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
+    1812: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
+    },
     1813: {
         atk: function(p) { return p.slot == 1 ? 1.5 : 1; },
         type: "class"
@@ -3664,4 +3672,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
         type: "class"
     },
+    1817: {
+        atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
+        type: "class"
+    },
+    1818: {
+        atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
+        type: "class"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index b75d9a0d8..b7efcb628 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1807,14 +1807,20 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Wanda", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, null, null, null, null ],
-    [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, null, 714, 501, 137, null, null, null, null ],
-    [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, null, null, null, null ],
-    [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, 5, 3, 99, null, 689, 729, 65, null, null, null, null ],
+    [ "Wanda", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
+    [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
+    [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
+    [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, 5, 3, 99, 3000000, 689, 729, 65, 2166, 1220, 189, 1 ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 238, 82, 18, 2422, 1012, 249, 1 ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
     [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 4000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
     [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
+    [ "King Riku", "INT", [ "Cerebral", "Striker" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "King Riku, Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Tank", "DEX", [ "Powerhouse", "Striker" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Ray Shop Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 4, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Ray Shop Sanji, Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, null, null, null, 1602, 1231, 550, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index a2fb214aa..da6407295 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -479,4 +479,12 @@ window.zombies = {
         type: 'healer',
         multiplier: 3
     },
+    1821: { // Sanji
+        type: 'healer',
+        multiplier: 1
+    },
+    1822: { // Sanji
+        type: 'healer',
+        multiplier: 2
+    },
 };

From 1d99d0f2515ef84aa59da15fcbcca9122786f9f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 12 Oct 2017 16:57:24 +0200
Subject: [PATCH 1390/1569] Added Raid Aliases, Log Crocodile

Fixed Raid Garp, Zephyr, Ain, Ivankov, BB, Heracles, Duval, Onigumo, Dalmatian, Momonga, Shu, Berry Good, Strawberry [ETC] Aliases
---
 common/data/aliases.js | 110 ++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7e914fa19..73d3cc23e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -224,8 +224,8 @@ window.aliases = {
     223: ['ウソップ（衝撃（インパクト））',''],
     224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji', 'Mr Prince Mutton Shot'],
     225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji', 'Mr Prince Veau Shot' ],
-    226: ['ジュラキュール・ミホーク','','Raidhawk'],
-    227: ['鷹の目のミホーク','','Raidhawk'],
+    226: ['ジュラキュール・ミホーク','','Raidhawk', 'Raid Mihawk'],
+    227: ['鷹の目のミホーク','','Raidhawk', 'Raid Mihawk'],
     228: ['脱獄モーガン',''],
     229: ['寝返りのジャンゴ',''],
     230: ['両鉄拳のフルボディ',''],
@@ -246,8 +246,8 @@ window.aliases = {
     245: ['ピストルビリオンズ バロックワークス',''],
     246: ['バズーカビリオンズ バロックワークス',''],  
     247: ['チョッパーマン','', 'Chopperman', 'Chopper Man' ],
-    248: ['トニートニー・チョッパー 暴走前','', 'Raid Monster Chopper' ],
-    249: ['トニートニー・チョッパー 暴走後','', 'Raid Monster Chopper' ],
+    248: ['トニートニー・チョッパー 暴走前','', 'Raid Monster Chopper', 'MC' ],
+    249: ['トニートニー・チョッパー 暴走後','', 'Raid Monster Chopper', 'MC' ],
     250: ['マルコ',''],
     251: ['不死鳥マルコ',''],
     252: ['ジョズ',''],
@@ -303,8 +303,8 @@ window.aliases = {
     302: ['緑アーマーロブスター',''],
     303: ['黄アーマーロブスター',''],
     304: ['黒アーマーロブスター',''],
-    305: ['モンキー・D・ガープ','','Raid'],
-    306: ['ゲンコツのガープ','','Raid'],
+    305: ['モンキー・D・ガープ','','Raid Garp'],
+    306: ['ゲンコツのガープ','','Raid Garp'],
     307: ['トラファルガー・ロー','','Supernova'],
     308: ['トラファルガー・ロー ROOMバジル・ホーキンス','','Supernova'],
     309: ['バジル・ホーキンス','','Supernova'],
@@ -350,10 +350,10 @@ window.aliases = {
     349: ['エメラルドパワース豚（トーン）','','Pig','Pork'],
     350: ['トパーズパワース豚（トーン）','','Pig','Pork'],
     351: ['アメジストパワース豚（トーン）','','Pig','Pork'],
-    352: ['ゼファー','','Raid'],
-    353: ['ゼファー NEO海軍総帥','','Raid'],
-    354: ['アイン','','Raid'],
-    355: ['アイン NEO海軍バイス・アドミラル','','Raid'],
+    352: ['ゼファー','','Raid Zephyr'],
+    353: ['ゼファー NEO海軍総帥','','Raid Zephyr'],
+    354: ['アイン','','Raid Ain'],
+    355: ['アイン NEO海軍バイス・アドミラル','','Raid Ain'],
     356: ['ユースタス・キッド','','Supernova', 'Kidd'],
     357: ['キャプテン・キッド','','Supernova', 'Kidd'],
     358: ['スクラッチメン・アプー','','Supernova'],
@@ -387,8 +387,8 @@ window.aliases = {
     386: ['ドクトル・ホグバック',''],
     387: ['シンドリーちゃん',''],
     388: ['ビクトリア・シンドリー',''],
-    389: ['エンポリオ・イワンコフ','','Raid'],
-    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】','','Raid'],
+    389: ['エンポリオ・イワンコフ','','Raid Ivankov'],
+    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】','','Raid Ivankov'],
     391: ['ペローナ',''],
     392: ['ペローナ ゴーストプリンセス',''],
     393: ['クマシー','', 'Kumashi' ],
@@ -415,8 +415,8 @@ window.aliases = {
     414: ['ゲッコー・モリア 王下七武海','', 'Gekko Moriah Warlord of the Sea'],
     415: ['ボア・ハンコック',''],
     416: ['ボア・ハンコック 王下七武海',''],
-    417: ['ドンキホーテ・ドフラミンゴ','', 'Raid Doffy' ],
-    418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Raid Doffy' ],
+    417: ['ドンキホーテ・ドフラミンゴ','', 'Raid Doffy', 'Raid Doflaming' ],
+    418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Raid Doffy', 'Raid Doflaming' ],
     419: ['サンジ 整形ショット(パラージュショット)　“嵐”','', 'Kimono Sanji' ],
     420: ['モンキー・D・ルフィ ゴムゴムのバズーカ“覇”','', 'Kimono Luffy' ],
     421: ['ロロノア・ゾロ 三・千・世・界“斬”','', 'Kimono Zoro' ],
@@ -444,8 +444,8 @@ window.aliases = {
     443: ['ケンタロウスとヒコイチ 超カルガモ部隊',''],
     444: ['カルー','', 'Carue', 'Karue' ],
     445: ['カルー隊長と超カルガモ部隊','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
-    446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard' ],
-    447: ['黒ひげ','','Raid'],
+    446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard', 'BB' ],
+    447: ['黒ひげ','', 'Raid Blackbeard', 'BB'],
     448: ['サッチ',''],
     449: ['双剣のサッチ',''],
     450: ['ナミュール','', 'Namur' ],
@@ -513,10 +513,10 @@ window.aliases = {
     512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
     513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
     514: ['ニコ・ロビン トロピカル', '','Summertime Robin', 'Swimsuit Robin'],
-    515: ['ヘラクレスン','','Raid'],
-    516: ['ヘラクレスン 森の勇者','','Raid'],
-    517: ['ウソップン','', 'Raid Usoppun' ],
-    518: ['ウソップン ヘラクレスンの生徒','', 'Raid Usoppun, Pupil of Heracles\'n', 'fat usopp' ],
+    515: ['ヘラクレスン','','Raid Heracles-un','Raid Heracles'],
+    516: ['ヘラクレスン 森の勇者','','Raid Heracles-un','Raid Heracles'],
+    517: ['ウソップン','', 'Raid Usoppun', 'Raid Usopp' ],
+    518: ['ウソップン ヘラクレスンの生徒','', 'Raid Usoppun, Pupil of Heracles\'n', 'fat usopp', 'Raid Usopp' ],
     519: ['モンキー・Ｄ・ルフィ メルヴィユの冒険者','', 'Strong World Luffy', 'SW Luffy' ],
     520: ['モンキー・Ｄ・ルフィ 特攻の麦わらの一味','', 'Strong World Luffy', 'SW Luffy' ],
     521: ['サンジ メルヴィユの冒険者','', 'Strong World Sanji', 'SW Sanji' ],
@@ -572,8 +572,8 @@ window.aliases = {
     571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット','', 'Afro Luffy', 'Afroluffy' ],
     572: ['ウソップ デービーバックファイト・セコンド',''],
     573: ['トニートニー・チョッパー デービーバックファイト・マスク',''],
-    574: ['青キジ','','Raid Kuzan' ],
-    575: ['青キジ　氷結人間','','Raid Kuzan' ],
+    574: ['青キジ','','Raid Kuzan', 'Raid Aokiji' ],
+    575: ['青キジ　氷結人間','','Raid Kuzan', 'Raid Aokiji' ],
     576: ['ナミのティータイム',''],
     577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy' ],
     578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy' ],
@@ -650,9 +650,9 @@ window.aliases = {
     649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
     650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami', 'Nami, Wakes of the Endless Dream, Straw Hat Crew' ],
     651: ['ナミ 航海の夢「世界地図」','', 'Log Nami', 'Nami, A Vow in the Great Age of Pirates - World Map' ],
-    652: ['鉄仮面のデュバル','','Raid'],
-    653: ['デュバル トビウオライダーズ ヘッド','','Raid'],
-    654: ['デュバル 人生バラ色ライダーズ ヘッド','','Raid'],
+    652: ['鉄仮面のデュバル','','Raid Duval'],
+    653: ['デュバル トビウオライダーズ ヘッド','','Raid Duval'],
+    654: ['デュバル 人生バラ色ライダーズ ヘッド','','Raid Duval'],
     655: ['海賊アーロン','','Young Arlong'],
     656: ['アーロン タイヨウの海賊団','','Young Arlong'],
     657: ['クロオビ タイヨウの海賊団','','Young Kuroobi'],
@@ -768,12 +768,12 @@ window.aliases = {
     767: ['ニコ・ロビン セクシーデビル','', 'Halloween Robin' ],
     768: ['サンジ ゴーストナイト','', 'Halloween Sanji' ],
     769: ['ブルック こわがりスケルトン','', 'Halloween Brook' ],
-    770: ['ダルメシアン 海軍本部中将','','Raid'],
-    771: ['モモンガ 海軍本部中将','','Raid'],
-    772: ['オニグモ 海軍本部中将','','Raid'],
-    773: ['シュウ','','Raid'],
-    774: ['ベリーグッド','','Very Good','Raid'],
-    775: ['ストロベリー 海軍本部中将','','Raid'],
+    770: ['ダルメシアン 海軍本部中将','','Raid Dalmatian'],
+    771: ['モモンガ 海軍本部中将','','Raid Momonga'],
+    772: ['オニグモ 海軍本部中将','','Raid Onigumo'],
+    773: ['シュウ','','Raid Shu'],
+    774: ['ベリーグッド','','Very Good','Raid Berry Good'],
+    775: ['ストロベリー 海軍本部中将','','Raid Strawberry'],
     776: ['ラッキー・ルウ','','Coliseum Lucky Roo'],
     777: ['ラッキー・ルウ 赤髪海賊団','','Coliseum Lucky Roo'],
     778: ['レベッカ 囚人剣闘士','','Coliseum Rebecca'],
@@ -792,8 +792,8 @@ window.aliases = {
     791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団','', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
     792: ['アイスバーグ','', 'Iceberg' ],
     793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
-    794: ['モンキー・D・ルフィ 希望の星','','Raid'],
-    795: ['ナイトメア・ルフィ 希望の戦士','','Raid'],
+    794: ['モンキー・D・ルフィ 希望の星','','Raid NM Luffy', 'Raid Luffy'],
+    795: ['ナイトメア・ルフィ 希望の戦士','','Raid NM Luffy', 'Raid Luffy'],
     796: ['ブリード',''],
     797: ['ブリード ペトペトの実の能力者',''],
     798: ['クンフージュゴン 海獣海賊団',''],
@@ -833,8 +833,8 @@ window.aliases = {
     832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Coliseum Wyper' ],
     833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Coliseum Wyper' ],
     834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day', 'Coliseum Mr 7', 'Coliseum Miss Fathers Day'],
-    835: ['暴君バーソロミュー・くま','','Raid'],
-    836: ['暴君バーソロミュー・くま 政府の人間兵器','','Raid'],
+    835: ['暴君バーソロミュー・くま','','Raid Kuma'],
+    836: ['暴君バーソロミュー・くま 政府の人間兵器','','Raid Kuma'],
     837: ['シーザー・クラウン',''],
     838: ['Ｍ（マスター）・シーザー',''],
     839: ['ヴェルゴ',''],
@@ -862,8 +862,8 @@ window.aliases = {
     861: ['レディー・アルビダ うるわしき美女','','Coliseum Alvida'],
     862: ['レディー・アルビダ 絶世の美女','','Coliseum Alvida'],
     863: ['銀世界のナミ','', 'Winter Nami'],
-    864: ['ボア・ハンコック 九蛇海賊団船長','','Raid'],
-    865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid'],
+    864: ['ボア・ハンコック 九蛇海賊団船長','','Raid Boa'],
+    865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid Boa'],
     866: ['ニコ・ロビン 百花繚乱 ウイング“華”','', 'Kimono Robin' ],
     867: ['ウソップ タバスコ星“撃”','', 'Kimono Usopp' ],
     868: ['トニートニー・チョッパー 重量ゴング“獣”','', 'Kimono Chopper' ],
@@ -930,8 +930,8 @@ window.aliases = {
     929: ['ハンニャバル','','Hannibal'],
     930: ['サルデス',''],
     931: ['ブルゴリ ','','Blue Gorilla'],
-    932: ['ピーカ','','Raid'],
-    933: ['ピーカ ドンキホーテ海賊団','','Raid'],
+    932: ['ピーカ','','Raid Pica'],
+    933: ['ピーカ ドンキホーテ海賊団','','Raid Pica'],
     934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
     935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
     936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者','','Timeskip Luffy','3D2Y Luffy'],
@@ -975,8 +975,8 @@ window.aliases = {
     974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
     975: ['スモーカー あらくれの一匹オオカミ','','Kid Smoker'],
     976: ['スモーカー 孤高の一匹オオカミ','','Kid Smoker'],
-    977: ['黄猿','','Raid'],
-    978: ['黄猿　光人間','','Raid'],
+    977: ['黄猿','','Raid Borsalino', 'Raid Kizaru'],
+    978: ['黄猿　光人間','','Raid Borsalino', 'Raid Kizaru'],
     979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
     980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
     981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
@@ -1044,8 +1044,8 @@ window.aliases = {
     1043: [ '“殺戮武人”キラー キッド海賊団', '','Coliseum Killer' ],
     1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
     1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
-    1046: [ 'サボ 竜の爪', '','Raid' ],
-    1047: [ 'サボ 革命軍参謀総長', '','Raid' ],
+    1046: [ 'サボ 竜の爪', '','Raid Sabo' ],
+    1047: [ 'サボ 革命軍参謀総長', '','Raid Sabo' ],
     1048: [ 'ニコ・オルビア', '' ],
     1049: [ 'ニコ・オルビア オハラの考古学者', '' ],
     1050: [ 'ハグワール・D・サウロ', '' ],
@@ -1105,8 +1105,8 @@ window.aliases = {
     1104: [ 'アイン ゼファー最後の教え子', '','Coliseum Ain' ],
     1105: [ 'ビンズ ＮＥＯ海軍', '','Coliseum Binz' ],
     1106: [ 'ビンズ ゼファー最後の教え子', '','Coliseum Binz' ],
-    1107: [ '金獅子のシキ', '','Raid' ],
-    1108: [ '金獅子のシキ 金獅子海賊団', '','Raid' ],
+    1107: [ '金獅子のシキ', '','Raid Shiki' ],
+    1108: [ '金獅子のシキ 金獅子海賊団', '','Raid Shiki' ],
     1109: [ 'ナミ 若返った航海士', '' ],
     1110: [ 'ナミ 酒場のお茶目なアイドル', '' ],
     1111: [ 'ニコ・ロビン 若返った考古学者', '' ],
@@ -1295,8 +1295,8 @@ window.aliases = {
     1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女','','Coliseum Sandersonia','Coliseum Boa Sandersonia'],
     1295: ['カリファ　グラマラスミイラ','','Halloween Kalifa'],
     1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード','','Halloween Kalifa'],
-    1297: ['赤犬','','Raid Sakazuki'],
-    1298: ['赤犬 マグマ人間','','Raid Sakazuki'],
+    1297: ['赤犬','','Raid Sakazuki', 'Raid Akainu'],
+    1298: ['赤犬 マグマ人間','','Raid Sakazuki', 'Raid Akainu'],
     1299: ['レベッカ　ラブリーモンスターキャット','','Halloween Rebecca'],
     1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード','','Halloween Rebecca'],
     1301: ['受刑者　バギー','','Baggy'],
@@ -1429,8 +1429,8 @@ window.aliases = {
     1428: ['ジャン・アンゴ', '', ''],
     1429: ['マンシェリー ２月の本命', '', 'Valentine Mansherry'],
     1430: ['マンシェリー ３月への勇気', '', 'Valentine Mansherry'],
-    1431: ['フランキー将軍', '', 'General Franky'],
-    1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky'],
+    1431: ['フランキー将軍', '', 'General Franky', 'Raid Franky'],
+    1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky', 'Raid Franky'],
     1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
     1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', ''],
     1435: ['ヒョウゾウ 新魚人海賊団', '', ''],
@@ -1592,8 +1592,8 @@ window.aliases = {
     1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
     1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
     1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy', 'Super Luffy'],
-    1594: ['藤虎 海軍本部最高戦力', '', 'Raid Fujitora'],
-    1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Fujitora'],
+    1594: ['藤虎 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
+    1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
     1596: ['しらほし', '', ''],
     1597: ['しらほし リュウグウ王国王女', '', ''],
     1598: ['リュウボシ', '', ''],
@@ -1613,8 +1613,8 @@ window.aliases = {
     1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
     1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
     1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', ''],
-    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile'],
-    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile'],
+    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile'],
+    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile'],
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
     1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
@@ -1812,8 +1812,8 @@ window.aliases = {
     1811: ['キャロット モコモ公国', '', ''],
     1812: ['王の鳥　キャロット モコモ公国', '', ''],
     1813: ['コアラ 極秘任務の革命軍', '', ''],
-    1814: ['ヴィンスモーク・サンジ', '', ''],
-    1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', ''],
+    1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji'],
+    1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji'],
     1816: ['ポートガス・D・エース 闇討つ太陽', '', ''],
     1817: ['', '', ''],
     1818: ['', '', ''],

From 90aca97ec4bf3b83460f2617dd3ddf1fb8321a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 12 Oct 2017 17:03:05 +0200
Subject: [PATCH 1391/1569] Aliases

Teach into Raid and God Blackbeard (Only evo forms) and added BB alias on God Blackbeard
---
 common/data/aliases.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 73d3cc23e..9ba820180 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -444,8 +444,8 @@ window.aliases = {
     443: ['ケンタロウスとヒコイチ 超カルガモ部隊',''],
     444: ['カルー','', 'Carue', 'Karue' ],
     445: ['カルー隊長と超カルガモ部隊','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
-    446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard', 'BB' ],
-    447: ['黒ひげ','', 'Raid Blackbeard', 'BB'],
+    446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard', 'BB'],
+    447: ['黒ひげ','', 'Raid Blackbeard', 'BB', 'Teach'],
     448: ['サッチ',''],
     449: ['双剣のサッチ',''],
     450: ['ナミュール','', 'Namur' ],
@@ -1265,8 +1265,8 @@ window.aliases = {
     1264: ['ヴェルゴ “北の海”の闇','','Young Vergo'],
     1265: ['エース 黄昏の道草','','Kimono Ace'],
     1266: ['エース 月下の艶肌','','Kimono Ace'],
-    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','',''],
-    1268: ['黒ひげ 黒ひげ海賊団船長','',''],
+    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','','BB'],
+    1268: ['黒ひげ 黒ひげ海賊団船長','','BB', 'Teach'],
     1269: ['ラフィット','','Lafitte'],
     1270: ['“鬼保安官”ラフィット','','Lafitte'],
     1271: ['ヴァン・オーガー','','Vaper', 'Van Ogre'],

From b6492764eac2f7a2d946d658803349ca868ac60c Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 13 Oct 2017 00:10:46 -0400
Subject: [PATCH 1392/1569] Loads of new shit

---
 common/data/cooldowns.js  | 12 ++---
 common/data/details.js    | 93 ++++++++++++++++++++++++++++++++-------
 common/data/drops.js      |  6 +++
 common/data/evolutions.js | 12 +++++
 common/data/families.js   | 20 ++++-----
 common/data/flags.js      | 20 ++++++---
 common/data/units.js      | 12 ++---
 7 files changed, 131 insertions(+), 44 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5d3b1994b..386768675 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1801,12 +1801,12 @@ window.cooldowns = [
     [ 16, 10 ],
     [ 18, 12 ],
     [ 18, 12 ],
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    [ 9, 9 ],
+    [ 9, 9 ],
+    [ 15, 15 ],
+    [ 15, 15 ],
+    [ 37, 14 ],
+    [ 37, 14 ],
     [ 15, 9 ],
     [ 15, 9 ],
     [ 21, 15 ],
diff --git a/common/data/details.js b/common/data/details.js
index 157c76be4..44030460b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -76,7 +76,8 @@ window.details = {
     8: {
         special: "Deals 15x character's ATK in DEX damage to all enemies",
         specialName: "Ashura Ichibugin",
-        captain: "Boosts ATK and HP of DEX characters by 2x"
+        captain: "Boosts ATK and HP of DEX characters by 2x",
+        limit: "This character has a limit break path",
     },
     9: {
         special: "Recovers 1,000 HP",
@@ -822,7 +823,8 @@ window.details = {
     221: {
         special: "Changes [PSY] orbs into [INT] orbs",
         specialName: "Happiness Punch",
-        captain: "Boosts ATK of INT characters by 2.5x"
+        captain: "Boosts ATK of INT characters by 2.5x",
+        limit: "This character has a limit break path",
     },
     222: {
         special: "Boosts ATK of PSY characters by 1.5x for 1 turn",
@@ -1082,7 +1084,8 @@ window.details = {
     259: {
         special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
         specialName: "Pocket Mallet",
-        captain: "Boosts ATK and RCV of STR characters by 2x"
+        captain: "Boosts ATK and RCV of STR characters by 2x",
+        limit: "This character has a limit break path",
     },
     260: {
         special: "Cuts the current HP of each enemy by 30%",
@@ -1092,7 +1095,8 @@ window.details = {
     261: {
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Seaquake",
-        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn"
+        captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn",
+        limit: "This character has a limit break path",
     },
     262: {
         captain: "Recovers 2x character's RCV in HP at the end of each turn"
@@ -1283,7 +1287,8 @@ window.details = {
     310: {
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% for 3 turns",
         specialName: "Demon Face",
-        captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%"
+        captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%",
+        limit: "This character has a limit break path",
     },
     311: {
         special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
@@ -1307,7 +1312,8 @@ window.details = {
     314: {
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
         specialName: "Karmic Punishment",
-        captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x"
+        captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
+        limit: "This character has a limit break path",
     },
     315: {
         special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
@@ -1506,7 +1512,8 @@ window.details = {
         special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
         specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
         specialName: "Steel Magnetic Arm",
-        captain: "Boosts ATK of Striker characters by 2.5x"
+        captain: "Boosts ATK of Striker characters by 2.5x",
+        limit: "This character has a limit break path",
     },
     358: {
         special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
@@ -2745,7 +2752,8 @@ window.details = {
     575: {
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
         specialName: "Ice Block - Pheasant Beak",
-        captain: "Boosts ATK and HP of Striker characters by 2x"
+        captain: "Boosts ATK and HP of Striker characters by 2x",
+        limit: "This character has a limit break path",
     },
     576: {
         special: "Changes [PSY] orbs into [INT] orbs, boosts RCV of all characters by 1.5x for 1 turn",
@@ -3063,7 +3071,8 @@ window.details = {
         specialNotes: "#{fixed} #{orb : 1.75x}",
         specialName: "Raging Greatsword",
         captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
-        sailor: "Recovers 2 turns of Paralysis on self"
+        sailor: "Recovers 2 turns of Paralysis on self",
+        limit: "This character has a limit break path",
     },
     644: {
         special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
@@ -4089,7 +4098,8 @@ window.details = {
     840: {
         captain: "Boosts ATK of Striker characters by 2.5x",
         specialName: "Demon Bamboo",
-        special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy"
+        special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy",
+        limit: "This character has a limit break path",
     },
     841: {
         captain: "Recovers 3x character's RCV in HP at the end of each turn, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
@@ -5185,7 +5195,8 @@ window.details = {
     999: {
         captain: "Boosts ATK of Driven characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
-        special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns"
+        special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns",
+        limit: "This character has a limit break path",
     },
     1000: {
         captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
@@ -5463,7 +5474,8 @@ window.details = {
         captainNotes: "ATK boost with 1 Striker is 1.25x. With 2 Strikers: 1.5x. With 3 Strikers: 1.75x. With 4 Strikers: 2x. With 5 Stikers: 2.5x. With 6 Strikers: 2.75x",
         special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
         specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
-        specialName: "Bari Bari No Pistol"
+        specialName: "Bari Bari No Pistol",
+        limit: "This character has a limit break path",
     },
     1036: {
         captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
@@ -5692,7 +5704,8 @@ window.details = {
     1075: {
         captain: "Boosts ATK and HP of [INT] characters by 2x",
         special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
-        specialName: "Tenacious Sword of Destruction"
+        specialName: "Tenacious Sword of Destruction",
+        limit: "This character has a limit break path",
     },
     1076:{
         captain: "Boosts ATK of Striker and Free Spirit characters by 1.75x",
@@ -5799,7 +5812,8 @@ window.details = {
             },
         ],
         specialNotes: "#{stages}",
-        specialName: "Chiyupopo"
+        specialName: "Chiyupopo",
+        limit: "This character has a limit break path",
     },
     1080: {
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
@@ -6618,7 +6632,8 @@ window.details = {
         special: "Reduces enemy Barrier duration by 1 turn",
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
-        sailor: "Boosts base ATK of [QCK] characters by 40"
+        sailor: "Boosts base ATK of [QCK] characters by 40",
+        limit: "This character has a limit break path",
     },
     1191: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
@@ -6651,6 +6666,7 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2x. Recovers 5x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
         specialName: "Split Air Hole",
+        limit: "This character has a limit break path",
     },
     1197: {
         captain: "Boosts ATK of Cerebral and Powerhouse characters by 2.5x if they have a matching orb, by 1x otherwise, reduces crew's RCV to 0",
@@ -6997,6 +7013,7 @@ window.details = {
         specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
         specialName: "Armed - White Launcher",
         sailor: "Boosts base ATK of Striker characters by 50",
+        limit: "This character has a limit break path",
     },
     1233: {//Tashigi
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
@@ -7396,6 +7413,7 @@ window.details = {
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
+        limit: "This character has a limit break path",
     },
     1279: {//John Giant
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
@@ -7940,6 +7958,7 @@ window.details = {
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
         special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
+        limit: "This character has a limit break path",
     },
     1339: {//Chopper Jump Point
         captain: "Boosts ATK of [DEX] characters by 2.25x",
@@ -8133,6 +8152,7 @@ window.details = {
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
         specialName: "Black Ball - Thundercloud Rod",
+        limit: "This character has a limit break path",
     },
     1367: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 2x",
@@ -8343,6 +8363,7 @@ window.details = {
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 10%. Reduces special cooldown of [DEX] specials by 1 turn.",
         specialName: "Ittoriyu: Unfortunate Port Bird",
+        limit: "This character has a limit break path",
     },
     1389: {//Nami 5+
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x.",
@@ -8582,6 +8603,7 @@ window.details = {
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
         special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs including [BLOCK] orbs.",
         specialName: "Emperor's Pride",
+        limit: "This character has a limit break path",
     },
     1414: {//Shop Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
@@ -8993,6 +9015,7 @@ window.details = {
         specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
+        limit: "This character has a limit break path",
     },
     1474: {//King Neptune
         captain: "Boosts ATK of all characters by 1.5x and EXP gained by 1.5x",
@@ -9019,6 +9042,7 @@ window.details = {
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
         sailor: "Boosts base HP, RCV and ATK of all characters by 50",
         specialName: "Merman Gujutsu - Spear of the Ages",
+        limit: "This character has a limit break path",
     },
     1478: {//Caribou
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 1.75x after the 22nd hit, by 2x after the 33th hit, by 3x after the 44th hit",
@@ -9897,6 +9921,7 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
         specialName: "Admiral Hug",
+        limit: "This character has a limit break path",
     },
     1585: {//Coliseum Helmeppo
         captain: "Boosts ATK and RCV of Slasher and Driven characters by 1.5x",
@@ -10093,6 +10118,7 @@ window.details = {
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
+        limit: "This character has a limit break path",
     },
     1617: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
@@ -10404,6 +10430,7 @@ window.details = {
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
         special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
         specialName: "Daybreak Ruler's Spear",
+        limit: "This character has a limit break path",
     },
     1653: {//Pedro
         captain: "Boosts ATK of [INT] characters by 2x",
@@ -10758,6 +10785,7 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
         specialName: "The Darkest Demon",
+        limit: "This character has a limit break path",
     },
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
@@ -12396,13 +12424,13 @@ window.details = {
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
         special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
-        sailor: "Reduces Paralysis for 3 turns for himself?",
+        sailor: "Reduces Paralysis for 3 turns for himself",
         specialName: "Barrier Bulls",
     },
     1802:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15% for that turn.",
         special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
-        sailor: "Reduces Paralysis for 3 turns for himself?",
+        sailor: "Reduces Paralysis for 3 turns for himself",
         specialName: "Barrier Bulls",
         limit: [
             { "description": "Boosts base HP by 10" },
@@ -12444,6 +12472,37 @@ window.details = {
             },
         ]
     },
+    1803: {//Zoro
+        captain: "Boosts ATK of Slasher characters by 2x",
+        special: "Deals 13x character's ATK in [DEX] to one enemy, remove enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
+        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
+    },
+    1804: {//Zoro
+        captain: "Boosts ATK of Slasher characters by 2.25x and their HP by 1.3x",
+        special: "Deals 13x character's ATK in [DEX] to one enemy, remove enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
+        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
+    },
+    1805: {//Buggy
+        captain: "Boosts ATK of characters with cost 30 or less by 1.5x and their HP by 1.2x",
+        special: "Reduces the defense of all enemies by 100% for 1 turn, reduces damage received from STR enemies by 80% for 1 turn, Amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "Deceiving the World with the Most Evil Show",
+    },
+    1806: {//Buggy
+        captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
+        special: "Reduces the defense of all enemies by 100% for 1 turn, reduces damage received from STR enemies by 80% for 1 turn, Amplifies the effect of orbs by 1.5x for 1 turn",
+        specialName: "Deceiving the World with the Most Evil Show",
+    },
+    1807: {//Mihawk
+        captain: "Not Translated",
+        special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
+        specialName: "Black Blade • The Ultimate Sword",
+    },
+    1808: {//Mihawk
+        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" THIS MIHAWK (maybe?) boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
+        special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
+        specialName: "Black Blade • The Ultimate Sword",
+        limit: "This character has a limit break path",
+    },
     1809: {//Wanda
         captain: "Boosts ATK by 2.25x after scoring 2 Perfects in a row",
         special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
diff --git a/common/data/drops.js b/common/data/drops.js
index 8f226de79..47cbfbd9d 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -2132,6 +2132,12 @@ window.drops = {
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1195, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791 ]
         },
+
+        {
+            name: 'Adventure Mode',
+            thumb: 1808,
+            Adventure: [ 1807 ]
+        },
         
         {
             name: 'Invasion! Young Whitebeard',
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3a17082ce..e75ceeae9 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2803,6 +2803,18 @@ window.evolutions = {
         evolution: 1802,
         evolvers: [ 85, 266, 96, 301, 101 ]
     },
+    1803: {
+        evolution: 1804,
+        evolvers: [  ]
+    },
+    1805: {
+        evolution: 1806,
+        evolvers: [  ]
+    },
+    1807: {
+        evolution: 1808,
+        evolvers: [  ]
+    },
     1809: {
         evolution: 1810,
         evolvers: [ 117, 81, 87, 98, 103 ]
diff --git a/common/data/families.js b/common/data/families.js
index 29c638b0a..6d5073b0f 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1801,16 +1801,16 @@ window.families = [
     "Cavendish",
     "Bartolomeo",
     "Bartolomeo",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Roronoa Zoro",
+    "Roronoa Zoro",
+    "Buggy",
+    "Buggy",
+    "Dracule Mihawk",
+    "Dracule Mihawk",
+    "Wanda",
+    "Wanda",
+    "Carrot",
+    "Carrot",
     "Koala",
     "Sanji",
     "Sanji",
diff --git a/common/data/flags.js b/common/data/flags.js
index 7dead1082..c830ef792 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -744,7 +744,7 @@ window.flags = {
     743: { global: 1 },
     744: { rr: 1, rro: 1, lrr: 1 },
     745: { rr: 1, rro: 1, lrr: 1 },
-    746: { promo: 1, shop: 1 },
+    746: { promo: 1, shop: 1, global: 1 },
     747: { rr: 1, rro: 1, global: 1 },
     748: { rr: 1, rro: 1, global: 1 },
     749: { rr: 1, rro: 1, global: 1 },
@@ -1186,6 +1186,8 @@ window.flags = {
     1192: { rr: 1, rro: 1, global: 1 },
     1193: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1194: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1195: { global: 1 },
+    1196: { global: 1 },
     1198: { global: 1 },
     1199: { global: 1 },
     1200: { global: 1 },
@@ -1459,6 +1461,10 @@ window.flags = {
     1504: { global: 1 },
     1505: { global: 1 },
     1506: { global: 1 },
+    1509: { global: 1 },
+    1510: { global: 1 },
+    1511: { global: 1 },
+    1512: { global: 1 },
     1513: { rr: 1, rro: 1, lrr: 1 },
     1514: { rr: 1, rro: 1, lrr: 1 },
     1517: { global: 1 },
@@ -1528,8 +1534,8 @@ window.flags = {
     1621: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1622: { global: 1 },
     1623: { global: 1 },
-    1631: { rr: 1, rro: 1, lrr: 1 },
-    1632: { rr: 1, rro: 1, lrr: 1 },
+    1631: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1632: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1651: { rr: 1, rro: 1, global: 1 },
     1652: { rr: 1, rro: 1, global: 1 },
     1653: { rr: 1, rro: 1, global: 1 },
@@ -1604,8 +1610,8 @@ window.flags = {
     1759: { rr: 1, rro: 1 },
     1760: { rr: 1, rro: 1 },
     1761: { rr: 1, rro: 1 },
-    1762: { rr: 1, rro: 1 },
-    1763: { rr: 1, rro: 1 },
+    1762: { rr: 1, rro: 1, global: 1 },
+    1763: { rr: 1, rro: 1, global: 1 },
     1764: { rr: 1, rro: 1 },
     1769: { rr: 1, rro: 1, lrr: 1 },
     1770: { rr: 1, rro: 1, lrr: 1 },
@@ -1621,6 +1627,10 @@ window.flags = {
     1800: { rr: 1, rro: 1 },
     1801: { rr: 1, rro: 1 },
     1802: { rr: 1, rro: 1 },
+    1803: { rr: 1, rro: 1 },
+    1804: { rr: 1, rro: 1 },
+    1805: { rr: 1, rro: 1 },
+    1806: { rr: 1, rro: 1 },
     1813: { special: 1 },
     1816: { rr: 1, rro: 1 },
     1821: { shop: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index b7efcb628..83e1833ef 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1801,12 +1801,12 @@ window.units = [
     [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
     [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
     [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, null, null, null, null, 2014, 1111, 270, null ],
+    [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, null, null, null, null, 2143, 1000, 304, null ],
+    [ "Hawk Eyes Mihawk", "STR", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, null, null, null, null, 3460, 1628, 266, null ],
     [ "Wanda", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],

From efb82ad6d1e603eb8bba8b3fdbfdd5bdb6aebc7d Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 13 Oct 2017 00:16:12 -0400
Subject: [PATCH 1393/1569] Barto Def reduction

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 44030460b..50961c0b4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12423,13 +12423,13 @@ window.details = {
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
-        special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by 80% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself",
         specialName: "Barrier Bulls",
     },
     1802:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15% for that turn.",
-        special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by ???% for 2 turns",
+        special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by 80% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself",
         specialName: "Barrier Bulls",
         limit: [

From 2e241639d822d853a192d8dfd43224bcc52d53c4 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 13 Oct 2017 00:20:57 -0400
Subject: [PATCH 1394/1569] Lucci Def red

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 50961c0b4..6779d2d1c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11801,12 +11801,12 @@ window.details = {
     },
     1762: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
-        special: "Reduces the defense of all enemies by ???% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
+        special: "Reduces the defense of all enemies by 80% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
     },
     1763: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
-        special: "Reduces the defense of all enemies by ???% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
+        special: "Reduces the defense of all enemies by 80% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
         specialName: "Flying Finger Gun: Fire Sting",
         limit: [
             { "description": "Boosts base ATK by 10" },

From 2c273e74361443a9b7c17ce252eb83cbc7690a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 13 Oct 2017 19:27:37 +0200
Subject: [PATCH 1395/1569] Colo and Supernova Aliases

Some units were missing the "Coliseum <Name>" Alias, and Supernova units didn't have the name (and killer and drake colo didn't even have supernova on it)
---
 common/data/aliases.js | 3538 ++++++++++++++++++++--------------------
 1 file changed, 1769 insertions(+), 1769 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9ba820180..2a57dd535 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,1051 +1,1051 @@
 window.aliases = {
-    1: ['モンキー・D・ルフィ','Monkey D. Luffy'],
-    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)','Monkey D. Luffy Gum-Gum Carabine'],
-    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ','Monkey D. Luffy Gum-Gum Bazooka'],
-    4: ['モンキー・D・ルフィ ギア２','Monkey D. Luffy Gear 2','Monkey D. Luffy', ' G2'],
-    5: ['ロロノア・ゾロ','Roronoa Zoro'],
-    6: ['ロロノア・ゾロ 三・千・世・界','Roronoa Zoro Moulinet Infernal'],
-    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）','Roronoa Zoro Calibre'],
-    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）','Roronoa Zoro Brume Argentée'],
-    9: ['ナミ','Nami'],
-    10: ['ナミ トルネード=テンポ','Nami Tornado Tempo'],
-    11: ['ナミ 蜃気楼＝テンポ','Nami MirageTempo'],
-    12: ['ナミ サンダーボルト=テンポ','Nami Fulguro Tempo'],
-    13: ['ウソップ','Usopp'],
-    14: ['ウソップ タバスコ星','Usopp Etoile Piquante'],
-    15: ['ウソップ ゴールデンパウンド','Usopp Usopp-Pilon doré','GPU'],
-    16: [ 'そげキング','Sniperking','Usopp'],
-    17: ['サンジ','Sanji'],
-    18: ['サンジ 整形ショット(パラージュショット)','Sanji Tir esthétique'],
-    19: ['料理人サンジ 焼き石シチュー','Chef Sanji Ragoût bouillonnant'],
-    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)','Sanji Jambe du diable'],
-    21: ['トニートニー・チョッパー','Tony Tony Chopper'],
-    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）','Tony Tony Chopper Weight Boost'],
-    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）','Tony Tony Chopper Brain Boost'],
-    24: ['トニートニー・チョッパー 腕力強化（アームポイント）','Tony Tony Chopper Arm Boost'],
-    25: ['トニートニー・チョッパー 角強化（ホーンポイント）','Tony Tony Chopper Horn Boost'],
-    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）','Tony Tony Chopper Guard Boost'],
-    27: ['ヒグマ','Higuma'],
-    28: ['近海の主（ヌシ）','Seigneur de la côte'],
-    29: ['金棒のアルビダ','Alvida à la Massue'],
-    30: ['金棒のアルビダ スベスベの実','Alvida à la Massue Fruit Glisse-Glisse'],
-    31: ['コビー','Kobby'],
-    32: ['雑用コビー','Kobby le mousse'],
-    33: ['ヘルメッポ','Hermep'],
-    34: ['雑用ヘルメッポ','Hermep le mousse'],
-    35: ['斧手のモーガン','Morgan le Hacheur'],
-    36: ['モージ＆リッチー','Morge et Richy'],
-    37: ['曲芸のカバジ','Cabaji l\'acrobate'],
-    38: ['バギー','Baggy'],
-    39: ['道化のバギー','Baggy le Clown'],
-    40: ['ガイモン','Gaimon'],
-    41: ['シャム','Sham'],
-    42: ['ブチ','Buchi'],
-    43: ['１・２のジャンゴ','Jango l\'hypnotiseur'],
-    44: ['ダンシングジャンゴ','Jango le danseur'],
-    45: ['キャプテン・クロ','Capitaine Kuro'],
-    46: ['百計のクロ','Kuro les pattes de velours'],
-    47: ['ヨサク','Yosaku'],
-    48: ['ジョニー','Jhonny'],
-    49: ['鉄拳のフルボディ','Fullbody au poing d\'acier'],
-    50: ['パティ','Patty'],
-    51: ['カルネ','Carne'],
-    52: ['料理長ゼフ','Zeff le chef'],
-    53: ['ギン','Gyn'],
-    54: ['鬼人ギン','Gyn le démon enragé'],
-    55: ['パール','Pearl'],
-    56: ['ファイヤーパール','Fire Pearl'],
-    57: ['首領・クリーク','Don Krieg '],
-    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」','Don Krieg Bombe à gaz toxique MH5'],
-    59: ['ネズミ','Nezumi'],
-    60: ['モーム','Meuh-Meuh'],
-    61: ['チュウ','Smack'],
-    62: ['クロオビ','Kuroobi'],
-    63: ['はっちゃん','Octy', 'Hachi' ],
-    64: ['六刀流のハチ','Octy aux six lames', 'Hatchan'],
-    65: ['アーロン','Arlong'],
-    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）','Arlong enragé Squalo Crunch'],
-    67: ['たしぎ','Tashigi'],
-    68: ['たしぎ 海軍本部少尉','Tashigi Lieutenant-colonel de la Marine'],
-    69: ['スモーカー','Smoker'],
-    70: ['白猟のスモーカー','Smoker le chasseur blanc'],
-    71: ['ミス・ウェンズデー','Miss Wednesday'],
-    72: ['ネフェルタリ・ビビ','Vivi Nerfertari'],
-    73: ['王女ビビ','Princesse Vivi'],
-    74: ['ポートガス・D・エース','Portgas D. Ace'],
-    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）','Portgas D. Ace Pyro-miroir'],
-    76: ['シャンクス','Shanks'],
-    77: ['赤髪のシャンクス','Shanks le Roux'],
-    78: ['赤盗人ペンギン','Pingouin chapardeur rouge'],
-    79: ['青盗人ペンギン','Pingouin chapardeur bleu'],
-    80: ['緑盗人ペンギン','Pingouin chapardeur vert'],
-    81: ['黄盗人ペンギン','Pingouin chapardeur jaune'],
-    82: ['黒盗人ペンギン','Pingouin chapardeur noir'],
-    83: ['虹盗人ペンギン','Pingouin chapardeur arc-en-ciel'],
-    84: ['赤海賊ペンギン','Pingouin pirate rouge'],
-    85: ['赤海賊ペンギン','Pingouin pirate bleu'],
-    86: ['赤海賊ペンギン','Pingouin pirate vert'],
-    87: ['赤海賊ペンギン','Pingouin pirate jaune'],
-    88: ['赤海賊ペンギン','Pingouin pirate noir'],
-    89: ['赤カブトヤドカリ','Bernard-l\'ermite rouge'],
-    90: ['赤カブトヤドカリ','Bernard-l\'ermite bleu'],
-    91: ['赤カブトヤドカリ','Bernard-l\'ermite vert'],
-    92: ['赤カブトヤドカリ','Bernard-l\'ermite jaune'],
-    93: ['赤カブトヤドカリ','Bernard-l\'ermite noir'],
-    94: ['赤カブトヤドカリ','Bernard-l\'ermite arc-en-ciel'],
-    95: ['赤ヨロイガニ','Crabe blindé rouge'],
-    96: ['赤ヨロイガニ','Crabe blindé bleu'],
-    97: ['赤ヨロイガニ','Crabe blindé vert'],
-    98: ['赤ヨロイガニ','Crabe blindé jaune'],
-    99: ['赤ヨロイガニ','Crabe blindé noir'],
-    100: ['赤しま番竜','Dragon rayé rouge'],
-    101: ['赤しま番竜','Dragon rayé bleu'],
-    102: ['赤しま番竜','Dragon rayé vert'],
-    103: ['赤しま番竜','Dragon rayé jaune'],
-    104: ['赤しま番竜','Dragon rayé noir'],
-    105: ['赤タカラガメ','Tortue-trésor rouge','Baby Turtle'],
-    106: ['赤タカラガメ','Tortue-trésor bleue','Baby Turtle'],
-    107: ['赤タカラガメ','Tortue-trésor verte','Baby Turtle'],
-    108: ['赤タカラガメ','Tortue-trésor jaune','Baby Turtle'],
-    109: ['赤タカラガメ','Tortue-trésor noire','Baby Turtle'],
-    110: ['赤ダイミョウガメ','Tortue noble rouge'],
-    111: ['赤ダイミョウガメ','Tortue noble bleue'],
-    112: ['赤ダイミョウガメ','Tortue noble verte'],
-    113: ['赤ダイミョウガメ','Tortue noble jaune'],
-    114: ['赤ダイミョウガメ','Tortue noble noire'],
-    115: ['タツノコ','Poney marin'],
-    116: ['タツノワカ','Poulain marin'],
-    117: ['タツノミコト','Cheval marin'],
-    118: ['タツノオウ','Étalon marin'],
-    119: ['カタナ山賊',''],
-    120: ['ピストル山賊',''],
-    121: ['格闘隊 雑用 レッドパイレーツ',''],
-    122: ['格闘隊 雑用 ブルーパイレーツ',''],
-    123: ['格闘隊 雑用 グリーンパイレーツ',''],
-    124: ['格闘隊 雑用 イエローパイレーツ',''],
-    125: ['格闘隊 雑用 ブラックパイレーツ',''],
-    126: ['斬撃隊 雑用 レッドパイレーツ',''],
-    127: ['斬撃隊 雑用 ブルーパイレーツ',''],
-    128: ['斬撃隊 雑用 グリーンパイレーツ',''],
-    129: ['斬撃隊 雑用 イエローパイレーツ',''],
-    130: ['斬撃隊 雑用 ブラックパイレーツ',''],
-    131: ['突撃隊 雑用 レッドパイレーツ',''],
-    132: ['突撃隊 雑用 ブルーパイレーツ',''],
-    133: ['突撃隊 雑用 グリーンパイレーツ',''],
-    134: ['突撃隊 雑用 イエローパイレーツ',''],
-    135: ['突撃隊 雑用 ブラックパイレーツ',''],
-    136: ['狙撃隊 雑用 レッドパイレーツ',''],
-    137: ['狙撃隊 雑用 ブルーパイレーツ',''],
-    138: ['狙撃隊 雑用 グリーンパイレーツ',''],
-    139: ['狙撃隊 雑用 イエローパイレーツ',''],
-    140: ['狙撃隊 雑用 ブラックパイレーツ',''],
-    141: ['砲撃手 雑用',''],
-    142: ['格闘隊 隊員 レッドパイレーツ',''],
-    143: ['格闘隊 隊員 ブルーパイレーツ',''],
-    144: ['格闘隊 隊員 グリーンパイレーツ',''],
-    145: ['格闘隊 隊員 イエローパイレーツ',''],
-    146: ['格闘隊 隊員 ブラックパイレーツ',''],
-    147: ['斬撃隊 隊員 レッドパイレーツ',''],
-    148: ['斬撃隊 隊員 ブルーパイレーツ',''],
-    149: ['斬撃隊 隊員 グリーンパイレーツ',''],
-    150: ['斬撃隊 隊員 イエローパイレーツ',''],
-    151: ['斬撃隊 隊員 ブラックパイレーツ',''],
-    152: ['突撃隊 隊員 レッドパイレーツ',''],
-    153: ['突撃隊 隊員 ブルーパイレーツ',''],
-    154: ['突撃隊 隊員 グリーンパイレーツ',''],
-    155: ['突撃隊 隊員 イエローパイレーツ',''],
-    156: ['突撃隊 隊員 ブラックパイレーツ',''],
-    157: ['狙撃隊 隊員 レッドパイレーツ',''],
-    158: ['狙撃隊 隊員 ブルーパイレーツ',''],
-    159: ['狙撃隊 隊員 グリーンパイレーツ',''],
-    160: ['狙撃隊 隊員 イエローパイレーツ',''],
-    161: ['狙撃隊 隊員 ブラックパイレーツ',''],
-    162: ['砲撃手 腕利き',''],
-    163: ['ボディガード・サングラス',''],
-    164: ['ボディガード・ヒゲ',''],
-    165: ['ナックルごろつき クロネコ海賊団',''],
-    166: ['サーベルごろつき クロネコ海賊団',''],
-    167: ['ナギナタごろつき クロネコ海賊団',''],
-    168: ['ピストルごろつき クロネコ海賊団',''],
-    169: ['バズーカごろつき クロネコ海賊団',''],
-    170: ['格闘隊 隊長',''],
-    171: ['斬撃隊 隊長',''],
-    172: ['突撃隊 隊長',''],
-    173: ['狙撃隊 隊長',''],
-    174: ['遊撃手 凄腕',''],
-    175: ['空手使いの魚人 アーロン一味',''],
-    176: ['カタナ使いの魚人 アーロン一味',''],
-    177: ['ヤリ使いの魚人 アーロン一味',''],
-    178: ['銃使いの魚人 アーロン一味',''],
-    179: ['ナックル三等兵 海軍',''],
-    180: ['サーベル三等兵 海軍',''],
-    181: ['ナギナタ三等兵 海軍',''],
-    182: ['ピストル三等兵 海軍',''],
-    183: ['バズーカ三等兵 海軍',''],
-    184: ['ナックル一等兵 海軍',''],
-    185: ['サーベル一等兵 海軍',''],
-    186: ['ナギナタ一等兵 海軍',''],
-    187: ['ピストル一等兵 海軍',''],
-    188: ['バズーカ一等兵 海軍',''],
-    189: ['赤タイロウガメ',''],
-    190: ['青タイロウガメ',''],
-    191: ['青タイロウガメ',''],
-    192: ['青タイロウガメ',''],
-    193: ['青タイロウガメ',''],
-    194: ['ナックル少尉 海軍本部',''],
-    195: ['サーベル少尉 海軍本部',''],
-    196: ['ナギナタ少尉 海軍本部',''],
-    197: ['ピストル少尉 海軍本部',''],
-    198: ['バズーカ少尉 海軍本部',''],
-    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)','', 'Mr 5'],
-    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）','', 'Mr 5'],
-    201: ['ミス・バレンタイン',''],
-    202: ['ミス・バレンタイン 1万キロギロチン',''],
-    203: ['Mr.3','','Mr 3'],
-    204: ['Mr.3 特大キャンドルサービスセット','', 'Mr 3'],
-    205: ['ミス・ゴールデンウィーク',''],
-    206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑',''],
-    207: ['Mr.2・ボン・クレー ','', 'Mr. 2 Bonclay', 'Mr 2 Bonclay' ],
-    208: ['Mr.2・ボン・クレー  爆撃白鳥アラベスク(ボンバルディエ)','', 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
-    209: ['ミス・オールサンデー バロックワークス副社長','', 'Nico Robin' ],
-    210: ['ニコ・ロビン',''],
-    211: ['Mr.9','','Mr 9'],
-    212: ['Mr.9 （熱血ナイン根性バット）','','Mr 9 Hot Blooded Bat'],
-    213: ['ラブーン',''],
-    214: ['ラブーン(ルフィ落書き)',''],
-    215: ['大王イカ',''],
-    216: ['モンキー・D・ルフィ（ゴムゴムの風船）',''],
-    217: ['モンキー・D・ルフィ（ギア３）','', 'Mistake', 'G3','Gear 3' ],
-    218: ['ゾロ_刀狼流し（とうろうながし）',''],
-    219: ['ロロノア・ゾロ_獅子歌歌（ししソンソン）','','LS Zoro'],
-    220: ['ナミ（ファイン=テンポ）',''],
-    221: ['ナミ（幸せパンチ）','', 'Towel Nami','TNami' ],
-    222: ['ウソップ（ウソップハンマー）',''],
-    223: ['ウソップ（衝撃（インパクト））',''],
-    224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji', 'Mr Prince Mutton Shot'],
-    225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji', 'Mr Prince Veau Shot' ],
-    226: ['ジュラキュール・ミホーク','','Raidhawk', 'Raid Mihawk'],
-    227: ['鷹の目のミホーク','','Raidhawk', 'Raid Mihawk'],
-    228: ['脱獄モーガン',''],
-    229: ['寝返りのジャンゴ',''],
-    230: ['両鉄拳のフルボディ',''],
-    231: ['ヒナ',''],
-    232: ['黒檻のヒナ',''],
-    233: ['Mr.8','','mr 8'],
-    234: ['Mr.8 イガラッパッパ','','mr 8'],
-    235: ['ミス・マンデー',''],
-    236: ['ミス・マンデー カ・イ・リ・キ メリケン',''],
-    237: ['ナックルミリオンズ バロックワークス',''],
-    238: ['サーベルミリオンズ バロックワークス',''],
-    239: ['ナギナタミリオンズ バロックワークス',''],
-    240: ['ピストルミリオンズ バロックワークス',''],
-    241: ['バズーカミリオンズ バロックワークス',''],
-    242: ['ナックルビリオンズ バロックワークス',''],
-    243: ['サーベルビリオンズ バロックワークス',''],
-    244: ['ナギナタビリオンズ バロックワークス',''],
-    245: ['ピストルビリオンズ バロックワークス',''],
-    246: ['バズーカビリオンズ バロックワークス',''],  
-    247: ['チョッパーマン','', 'Chopperman', 'Chopper Man' ],
-    248: ['トニートニー・チョッパー 暴走前','', 'Raid Monster Chopper', 'MC' ],
-    249: ['トニートニー・チョッパー 暴走後','', 'Raid Monster Chopper', 'MC' ],
-    250: ['マルコ',''],
-    251: ['不死鳥マルコ',''],
-    252: ['ジョズ',''],
-    253: ['ダイヤモンド・ジョズ',''],
-    254: ['ビスタ',''],
-    255: ['花剣のビスタ',''],
-    256: ['イゾウ',''],
-    257: ['短筒使いのイゾウ',''],
-    258: ['ブラメンコ',''],
-    259: ['大槌のブラメンコ',''],
-    260: ['エドワード・ニューゲート','', 'Whitebeard', 'WB' ],
-    261: ['白ひげ','','Edward Newgate', 'WB'],
-    262: ['特訓コビー',''],
-    263: ['曹長コビー',''],
-    264: ['特訓ヘルメッポ',''],
-    265: ['軍曹ヘルメッポ',''],
-    266: ['虹海賊ペンギン',''],
-    267: ['虹しま番竜',''],
-    268: ['白猟のスモーカー ビローアバイク','','WC Smoker'],
-    269: ['格闘隊　武装隊員 レッドパイレーツ',''],
-    270: ['格闘隊　武装隊員 ブルーパイレーツ',''],
-    271: ['格闘隊　武装隊員 グリーンパイレーツ',''],
-    272: ['格闘隊　武装隊員 イエローパイレーツ',''],
-    273: ['格闘隊　武装隊員 ブラックパイレーツ',''],
-    274: ['斬撃隊　武装隊員 レッドパイレーツ',''],
-    275: ['斬撃隊　武装隊員 ブルーパイレーツ',''],
-    276: ['斬撃隊　武装隊員 グリーンパイレーツ',''],
-    277: ['斬撃隊　武装隊員 イエローパイレーツ',''],
-    278: ['斬撃隊　武装隊員 ブラックパイレーツ',''],
-    279: ['突撃隊　武装隊員 レッドパイレーツ',''],
-    280: ['突撃隊　武装隊員 ブルーパイレーツ',''],
-    281: ['突撃隊　武装隊員 グリーンパイレーツ',''],
-    282: ['突撃隊　武装隊員 イエローパイレーツ',''],
-    283: ['突撃隊　武装隊員 ブラックパイレーツ',''],
-    284: ['狙撃隊　武装隊員 レッドパイレーツ',''],
-    285: ['狙撃隊　武装隊員 ブルーパイレーツ',''],
-    286: ['狙撃隊　武装隊員 グリーンパイレーツ',''],
-    287: ['狙撃隊　武装隊員 イエローパイレーツ',''],
-    288: ['狙撃隊　武装隊員 ブラックパイレーツ',''],
-    289: ['砲撃手　敏腕',''],
-    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）','','Mr 13 and Ms Friday the Unluckies'],
-    291: ['ドリー',''],
-    292: ['ブロギー',''],
-    293: ['トリケラトプス',''],
-    294: ['レックス',''],
-    295: ['ブロントザウルス',''],
-    296: ['おつるさん',''],
-    297: ['大参謀つる',''],
-    298: ['モモンガ',''],
-    299: ['オニグモ',''],
-    300: ['赤アーマーロブスター',''],
-    301: ['青アーマーロブスター',''],
-    302: ['緑アーマーロブスター',''],
-    303: ['黄アーマーロブスター',''],
-    304: ['黒アーマーロブスター',''],
-    305: ['モンキー・D・ガープ','','Raid Garp'],
-    306: ['ゲンコツのガープ','','Raid Garp'],
-    307: ['トラファルガー・ロー','','Supernova'],
-    308: ['トラファルガー・ロー ROOMバジル・ホーキンス','','Supernova'],
-    309: ['バジル・ホーキンス','','Supernova'],
-    310: ['魔術師バジル・ホーキンス','','Supernova'],
-    311: ['キラー','','Supernova'],
-    312: ['殺戮武人キラー','','Supernova'],
-    313: ['ウルージ','','Supernova'],
-    314: ['怪僧ウルージ','','Supernova'],
-    315: ['ベポ',''],
-    316: ['武闘家のベポ',''],
-    317: ['カリファ','', 'Califa', 'Calipha', 'Kalipha' ],
-    318: ['美人秘書カリファ','', 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
-    319: ['パウリー',''],
-    320: ['パウリー 1番ドック艤装(ぎそう)・マスト職職長',''],
-    321: ['ロブ・ルッチ',''],
-    322: ['ロブ・ルッチ 1番ドック木びき・木釘職職長',''],
-    323: ['カク',''],
-    324: ['カク 1番ドック大工職職長',''],
-    325: ['ルル',''],
-    326: ['ワポル',''],
-    327: ['ワポルハウス',''],
-    328: ['ドルトン',''],
-    329: ['ドルトン 野牛（バイソン）',''],
-    330: ['チェス',''],
-    331: ['クロマーリモ',''],
-    332: ['チェスマーリモ',''],
-    333: ['Dr.くれは',''],
-    334: ['ラパーン','', 'Lapahn', 'Lapan', 'Rapan' ],
-    335: ['ラパーン 成獣','', 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
-    336: ['フランキー',''],
-    337: ['解体屋フランキー',''],
-    338: ['キウイ',''],
-    339: ['モズ',''],
-    340: ['クラーケン スルメ',''],
-    341: ['クラーケン 北極の怪物',''],
-    342: ['赤パワース豚（トーン）','','Pig','Pork'],
-    343: ['青パワース豚（トーン）','','Pig','Pork'],
-    344: ['緑パワース豚（トーン）','','Pig','Pork'],
-    345: ['黄パワース豚（トーン）','','Pig','Pork'],
-    346: ['黒パワース豚（トーン）','','Pig','Pork'],
-    347: ['ルビーパワース豚（トーン）','','Pig','Pork'],
-    348: ['サファイアパワース豚（トーン）','','Pig','Pork'],
-    349: ['エメラルドパワース豚（トーン）','','Pig','Pork'],
-    350: ['トパーズパワース豚（トーン）','','Pig','Pork'],
-    351: ['アメジストパワース豚（トーン）','','Pig','Pork'],
-    352: ['ゼファー','','Raid Zephyr'],
-    353: ['ゼファー NEO海軍総帥','','Raid Zephyr'],
-    354: ['アイン','','Raid Ain'],
-    355: ['アイン NEO海軍バイス・アドミラル','','Raid Ain'],
-    356: ['ユースタス・キッド','','Supernova', 'Kidd'],
-    357: ['キャプテン・キッド','','Supernova', 'Kidd'],
-    358: ['スクラッチメン・アプー','','Supernova'],
-    359: ['海鳴り スクラッチメン・アプー','','Supernova'],
-    360: ['X・ドレーク','','Supernova'],
-    361: ['赤旗 X・ドレーク','','Supernova'],
-    362: ['ジュエリー・ボニー','','Supernova'],
-    363: ['大喰らい ジュエリー・ボニー','','Supernova'],
-    364: ['カポネ・ベッジ','','Supernova'],
-    365: ['カポネ・ギャング・ベッジ','','Supernova'],
-    366: ['シルバーズ・レイリー',''],
-    367: ['冥王レイリー',''],
-    368: ['巨人斬撃隊 レッドパイレーツ',''],
-    369: ['巨人射撃隊 ブルーパイレーツ',''],
-    370: ['巨人女戦士隊 グリーンパイレーツ',''],
-    371: ['巨人格闘隊 イエローパイレーツ',''],
-    372: ['巨人突撃隊 ブラックパイレーツ',''],
-    373: ['巨人斬撃近衛隊 レッドパイレーツ',''],
-    374: ['巨人射撃近衛隊 ブルーパイレーツ',''],
-    375: ['巨人女戦士近衛隊 グリーンパイレーツ',''],
-    376: ['巨人格闘近衛隊 イエローパイレーツ',''],
-    377: ['巨人突撃近衛隊 ブラックパイレーツ',''],
-    378: ['海ネコ',''],
-    379: ['クンフージュゴン',''],
-    380: ['クンフージュゴン 兄弟弟子',''],
-    381: ['バナナワニ',''],
-    382: ['サンドラ大トカゲ',''],
-    383: ['Mr.0 バロックワークス社長','', 'Crocodile', 'Mr 0' ],
-    384: ['サー・クロコダイル','', 'Strikerdile', 'Impactdile', 'Mr 0','Mr. 0' ],
-    385: ['ホグバック',''],
-    386: ['ドクトル・ホグバック',''],
-    387: ['シンドリーちゃん',''],
-    388: ['ビクトリア・シンドリー',''],
-    389: ['エンポリオ・イワンコフ','','Raid Ivankov'],
-    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】','','Raid Ivankov'],
-    391: ['ペローナ',''],
-    392: ['ペローナ ゴーストプリンセス',''],
-    393: ['クマシー','', 'Kumashi' ],
-    394: ['犬ッペ','', 'Inuppe' ],
-    395: ['ミス・メリークリスマス',''],
-    396: ['ミス・メリークリスマス モグラ人間',''],
-    397: ['Mr.4','','Mr 4'],
-    398: ['Mr.4と犬銃ラッスー','','Mr 4 and Lassoo the Dog-Gun'],
-    399: ['ミス・ダブルフィンガー',''],
-    400: ['ミス・ダブルフィンガー 棘（とげ）人間',''],
-    401: ['Mr.1','','mr 1','Daz Bones'],
-    402: ['Mr.1 全身刃物人間','','Mr 1','Daz Bones'],
-    403: ['レベッカ',''],
-    404: ['アブサロム',''],
-    405: ['墓場のアブサロム',''],
-    406: ['将軍ゾンビ',''],
-    407: ['風のジゴロウ',''],
-    408: ['サー・クロコダイル 王下七武海','', 'Slasherdile' ],
-    409: ['ジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei' ],
-    410: ['ジンベエ 王下七武海','', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
-    411: ['バーソロミュー・くま',''],
-    412: ['バーソロミュー・くま 王下七武海',''],
-    413: ['ゲッコー・モリア','', 'Gekko Moriah'],
-    414: ['ゲッコー・モリア 王下七武海','', 'Gekko Moriah Warlord of the Sea'],
-    415: ['ボア・ハンコック',''],
-    416: ['ボア・ハンコック 王下七武海',''],
-    417: ['ドンキホーテ・ドフラミンゴ','', 'Raid Doffy', 'Raid Doflaming' ],
-    418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Raid Doffy', 'Raid Doflaming' ],
-    419: ['サンジ 整形ショット(パラージュショット)　“嵐”','', 'Kimono Sanji' ],
-    420: ['モンキー・D・ルフィ ゴムゴムのバズーカ“覇”','', 'Kimono Luffy' ],
-    421: ['ロロノア・ゾロ 三・千・世・界“斬”','', 'Kimono Zoro' ],
-    422: ['ナミ 蜃気楼＝テンポ“天”','', 'Kimono Nami' ],
-    423: ['ブルック',''],
-    424: ['鼻唄のブルック',''],
-    425: ['リューマ','', 'Ryuuma' ],
-    426: ['マシラ','','Harambe'],
-    427: ['ショウジョウ',''],
-    428: ['モンブラン・クリケット',''],
-    429: ['サウスバードと森の住民',''],
-    430: ['ベラミー',''],
-    431: ['ハイエナのベラミー',''],
-    432: ['サーキース','', 'Sarkies' ],
-    433: ['エリザベス',''],
-    434: ['キャロライン',''],
-    435: ['サンジ カマバッカ王国伝統の決闘スタイル',''],
-    436: ['サンジ キャンディーちゃん',''],
-    437: ['ペローナ　スイート','', 'Valentine Perona' ],
-    438: ['ペローナ　スイート ゴーストプリンセス','', 'Valentine Perona' ],
-    439: ['ネフェルタリ・ビビ　ラブ','', 'Valentine Vivi' ],
-    440: ['王女ビビ　ラブ','', 'Valentine Vivi' ],
-    441: ['カウボーイとバーボンJr. 超カルガモ部隊',''],
-    442: ['ストンプとイワンX 超カルガモ部隊',''],
-    443: ['ケンタロウスとヒコイチ 超カルガモ部隊',''],
-    444: ['カルー','', 'Carue', 'Karue' ],
-    445: ['カルー隊長と超カルガモ部隊','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
-    446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard', 'BB'],
-    447: ['黒ひげ','', 'Raid Blackbeard', 'BB', 'Teach'],
-    448: ['サッチ',''],
-    449: ['双剣のサッチ',''],
-    450: ['ナミュール','', 'Namur' ],
-    451: ['一撃のナミュール','', 'One-Hit Namur' ],
-    452: ['ラクヨウ',''],
-    453: ['モーニングスターのラクヨウ',''],
-    454: ['フォッサ',''],
-    455: ['火炎刀のフォッサ',''],
-    456: ['クリエル',''],
-    457: ['重火器使いのクリエル',''],
-    458: ['センゴク',''],
-    459: ['仏のセンゴク',''],
-    460: ['犯罪者ギャルディーノ Mr.3','Mr 3',''],
-    461: ['脱走者ベンサム Mr.2・ボン・クレー','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
-    462: ['脱獄名人ベンサム Mr.2・ボン・クレー','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
-    463: ['サトリ',''],
-    464: ['シュラ',''],
-    465: ['ゲダツ',''],
-    466: ['ブラハム',''],
-    467: ['ヤマ',''],
-    468: ['黄のホワイトベレー部隊　隊員 スカイピア神隊',''],
-    469: ['黒のホワイトベレー部隊　隊員 スカイピア神隊',''],
-    470: ['黄のホワイトベレー部隊　隊長 スカイピア神隊',''],
-    471: ['黒のホワイトベレー部隊　隊長 スカイピア神隊',''],
-    472: ['赤のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
-    473: ['青のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
-    474: ['緑のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
-    475: ['黄のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
-    476: ['黒のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
-    477: ['赤の突撃隊　隊員 スカイピア神兵',''],
-    478: ['青の突撃隊　隊員 スカイピア神兵',''],
-    479: ['緑の突撃隊　隊員 スカイピア神兵',''],
-    480: ['黄の突撃隊　隊員 スカイピア神兵',''],
-    481: ['黒の突撃隊　隊員 スカイピア神兵',''],
-    482: ['赤の突撃隊　エリート スカイピア神兵',''],
-    483: ['青の突撃隊　エリート スカイピア神兵',''],
-    484: ['緑の突撃隊　エリート スカイピア神兵',''],
-    485: ['黄の突撃隊　エリート スカイピア神兵',''],
-    486: ['黒の突撃隊　エリート スカイピア神兵',''],
-    487: ['赤の遊牧隊　隊員 シャンディアの戦士',''],
-    488: ['青の遊牧隊　隊員 シャンディアの戦士',''],
-    489: ['緑の遊牧隊　隊員 シャンディアの戦士',''],
-    490: ['赤の遊牧隊　達人 シャンディアの戦士',''],
-    491: ['青の遊牧隊　達人 シャンディアの戦士',''],
-    492: ['緑の遊牧隊　達人 シャンディアの戦士',''],
-    493: ['黄の狩猟隊　隊員 シャンディアの戦士',''],
-    494: ['黒の狩猟隊　隊員 シャンディアの戦士',''],
-    495: ['黄の狩猟隊　達人 シャンディアの戦士',''],
-    496: ['黒の狩猟隊　達人 シャンディアの戦士',''],
-    497: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟','','Kid Ace'],
-    498: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Ace'],
-    499: ['ベルメール',''],
-    500: ['ベルメール ナミとノジコの養母',''],
-    501: ['カヤ',''],
-    502: ['カヤ シロップ村のお嬢様',''],
-    503: ['ホトリ・コトリ',''],
-    504: ['ホトリ・コトリ スカイピア副神兵長',''],
-    505: ['ペル',''],
-    506: ['ペル アラバスタの守護神ファルコン',''],
-    507: ['チャカ',''],
-    508: ['チャカ アラバスタの守護神ジャッカル',''],
-    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長','','Mr 0', 'Mr. 0','Crocodile','Prisondile'],
-    510: ['最強の囚人サー・クロコダイル 元王下七武海','','Mr 0','Mr. 0','Prisondile'],
-    511: ['服役囚ダズ・ボーネス Mr.1','','Mr 1','Daz Bones'],
-    512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
-    513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
-    514: ['ニコ・ロビン トロピカル', '','Summertime Robin', 'Swimsuit Robin'],
-    515: ['ヘラクレスン','','Raid Heracles-un','Raid Heracles'],
-    516: ['ヘラクレスン 森の勇者','','Raid Heracles-un','Raid Heracles'],
-    517: ['ウソップン','', 'Raid Usoppun', 'Raid Usopp' ],
-    518: ['ウソップン ヘラクレスンの生徒','', 'Raid Usoppun, Pupil of Heracles\'n', 'fat usopp', 'Raid Usopp' ],
-    519: ['モンキー・Ｄ・ルフィ メルヴィユの冒険者','', 'Strong World Luffy', 'SW Luffy' ],
-    520: ['モンキー・Ｄ・ルフィ 特攻の麦わらの一味','', 'Strong World Luffy', 'SW Luffy' ],
-    521: ['サンジ メルヴィユの冒険者','', 'Strong World Sanji', 'SW Sanji' ],
-    522: ['サンジ 特攻の麦わらの一味','', 'Strong World Sanji', 'SW Sanji' ],
-    523: ['ナミ メルヴィユの冒険者','', 'Strong World Nami', 'SW Nami' ],
-    524: ['ナミと雷鳥ビリー','', 'Strong World Nami', 'SW Nami' ],
-    525: ['ブルック メルヴィユの冒険者','', 'Strong World Brook', 'SW Brook' ],
-    526: ['ブルック 特攻の麦わらの一味','', 'Strong World Brook', 'SW Brook' ],
-    527: ['チョッパー メルヴィユの冒険者','', 'Strong World Chopper', 'SW Chopper' ],
-    528: ['チョッパー 特攻の麦わらの一味','', 'Strong World Chopper', 'SW Chopper' ],
-    529: ['シャンクス 黒衣の赤髪','', 'Strong World Shanks', 'SW Shanks' ],
-    530: ['シャンクス 黒衣の四皇','', 'Strong World Shanks', 'SW Shanks' ],
-    531: ['ニコ・ロビン　桜吹雪','', 'Sakura Robin' ],
-    532: ['ニコ・ロビン　桜満開','', 'Sakura Robin' ],
-    533: ['ブルック　チェリーヘッド','', 'Sakura Brook' ],
-    534: ['ブルック　桜音色','', 'Sakura Brook' ],
-    535: ['ナミ　桜雲','', 'Sakura Nami' ],
-    536: ['ナミ　桜日和','', 'Sakura Nami' ],
-    537: ['ドミノ',''],
-    538: ['ドミノ インペルダウン副看守長',''],
-    539: ['ミノリノケロス',''],
-    540: ['バシリスク',''],
-    541: ['オーム',''],
-    542: ['ノラ ウワバミ',''],
-    543: ['ワイパー','', 'Wiper' ],
-    544: ['ワイパー 大戦士カルガラの子孫','', 'Wiper, Descendant of Great Warrior Calgara' ],
-    545: ['エネル','', 'Enel' ],
-    546: ['ゴッド・エネル','', 'God Enel' ],
-    547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟','','Kid Luffy'],
-    548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Luffy'],
-    549: ['サディちゃん',''],
-    550: ['サディちゃん インペルダウン獄卒長',''],
-    551: ['ミノコアラ',''],
-    552: ['マンティコラ',''],
-    553: ['ロロノア・ゾロ メルヴィユの冒険者','', 'Strong World Zoro', 'SW Zoro' ],
-    554: ['ロロノア・ゾロ 特攻の麦わらの一味','', 'Strong World Zoro', 'SW Zoro' ],
-    555: ['ウソップ メルヴィユの冒険者','', 'Strong World Usopp', 'SW Usopp' ],
-    556: ['ウソップ 特攻の麦わらの一味','', 'Strong World Usopp', 'SW Usopp' ],
-    557: ['ニコ・ロビン メルヴィユの冒険者','', 'Strong World Robin', 'SW Robin' ],
-    558: ['ニコ・ロビン 特攻の麦わらの一味','', 'Strong World Robin', 'SW Robin' ],
-    559: ['フランキー メルヴィユの冒険者','', 'Strong World Franky', 'SW Franky' ],
-    560: ['フランキー 特攻の麦わらの一味','', 'Strong World Franky', 'SW Franky' ],
-    561: ['ポートガス・D・エース 黒衣の火拳','', 'Strong World Ace', 'SW Ace' ],
-    562: ['ポートガス・D・エース 黒衣の白ひげ海賊団2番隊隊長','', 'Strong World Ace', 'SW Ace' ],
-    563: ['ポルチェ',''],
-    564: ['ポーティ',''],
-    565: ['ハンバーグ',''],
-    566: ['ピクルス',''],
-    567: ['ビッグパン','', 'Big Pan' ],
-    568: ['フォクシー',''],
-    569: ['銀ギツネのフォクシー',''],
-    570: ['モンキー・Ｄ・ルフィ デービーバックファイト・アフロ','', 'Afro Luffy', 'Afroluffy' ],
-    571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット','', 'Afro Luffy', 'Afroluffy' ],
-    572: ['ウソップ デービーバックファイト・セコンド',''],
-    573: ['トニートニー・チョッパー デービーバックファイト・マスク',''],
-    574: ['青キジ','','Raid Kuzan', 'Raid Aokiji' ],
-    575: ['青キジ　氷結人間','','Raid Kuzan', 'Raid Aokiji' ],
-    576: ['ナミのティータイム',''],
-    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy' ],
-    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy' ],
-    579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro', 'Roronoa Zoro, Wakes of the Endless Dream, Straw Hat Crew' ],
-    580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro', 'Roronoa Zoro, A Vow in the Great Age of Pirates - Master Swordsman' ],
-    581: ['ゲンボウ',''],
-    582: ['カマキリ',''],
-    583: ['ラキ','', 'Laki' ],
-    584: ['アイサ',''],
-    585: ['ノジコ',''],
-    586: ['ノジコ ナミの義姉妹',''],
-    587: ['クロッカス',''],
-    588: ['クロッカス 双子岬の灯台守',''],
-    589: ['コーザ',''],
-    590: ['コーザ 反乱軍リーダー',''],
-    591: ['朱の竜宮カメ姫','', 'Princess Turtle' ],
-    592: ['蒼の竜宮カメ姫','', 'Princess Turtle' ],
-    593: ['翠の竜宮カメ姫','', 'Princess Turtle' ],
-    594: ['琥珀の竜宮カメ姫','', 'Princess Turtle' ],
-    595: ['漆黒の竜宮カメ姫','', 'Princess Turtle' ],
-    596: ['トニートニー・チョッパー 航海の記録・麦わらの一味','', 'Log Chopper', 'Tony Tony Chopper, Wakes of the Endless Dream, Straw Hat Crew' ],
-    597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」','', 'Log Chopper', 'Tony Tony Chopper, A Vow in the Great Age of Pirates - Great Doctor' ],
-    598: ['バギー 海賊見習い','','Young Buggy', 'Baggy'],
-    599: ['バギー ロジャー海賊団','','Young Buggy', 'Baggy'],
-    600: ['シャンクス 海賊見習い','','Young Shanks'],
-    601: ['シャンクス ロジャー海賊団','','Young Shanks'],
-    602: ['エネル ２億Ｖ　雷神','', 'Raid Enel, 200 Million Volt Thunder God' ],
-    603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God' ],
-    604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji', 'Sanji, Wakes of the Endless Dream, Straw Hat Crew' ],
-    605: ['サンジ 航海の夢「オールブルー」','', 'Log Sanji' ],
-    606: ['海賊ゼフ',''],
-    607: ['赫足のゼフ クック海賊団船長',''],
-    608: ['ごろつきパティ',''],
-    609: ['ごろつきカルネ',''],
-    610: ['ハイキングベア',''],
-    611: ['プリンプリン','', 'Pudding Pudding' ],
-    612: ['ブルック 航海の記録・麦わらの一味','', 'Log Brook', 'Brook, Wakes of the Endless Dream, Straw Hat Crew' ],
-    613: ['ブルック 航海の夢「約束の再会」','','Log Brook', 'Brook, A Vow in the Great Age of Pirates - Promised Meeting' ],
-    614: ['ザンバイ',''],
-    615: ['怪力デストロイヤーズ 斧使い',''],
-    616: ['怪力デストロイヤーズ 槍使い',''],
-    617: ['怪力デストロイヤーズ 大砲使い','','Gunner'],
-    618: ['ナックルチンピラ 赤の賞金稼ぎ',''],
-    619: ['ナックルチンピラ 緑の賞金稼ぎ',''],
-    620: ['カタナチンピラ 青の賞金稼ぎ',''],
-    621: ['カタナチンピラ 赤の賞金稼ぎ',''],
-    622: ['ピストルチンピラ 緑の賞金稼ぎ',''],
-    623: ['ピストルチンピラ 黄の賞金稼ぎ',''],
-    624: ['棍棒チンピラ 黄の賞金稼ぎ',''],
-    625: ['棍棒チンピラ 黒の賞金稼ぎ',''],
-    626: ['ガトリングチンピラ 黒の賞金稼ぎ',''],
-    627: ['ガトリングチンピラ 青の賞金稼ぎ',''],
-    628: ['タイルストン',''],
-    629: ['フランキー フランキー一家棟梁',''],
-    630: ['カク サイファーポールNo.9',''],
-    631: ['カク 六式 サイファーポールNo.9',''],
-    632: ['ロブ・ルッチ サイファーポールNo.9',''],
-    633: ['ロブ・ルッチ 六式 サイファーポールNo.9',''],
-    634: ['ケイミー','','Keimi'],
-    635: ['ケイミー タコ焼き屋店員','','Keimi, Takoyaki Stand Assistant'],
-    636: ['パッパグ','', 'Pappug'],
-    637: ['はっちゃん タコ焼き屋店主','', 'Hachi, Takoyaki Stand Owner' ],
-    638: ['ドーマ',''],
-    639: ['遊騎士ドーマ',''],
-    640: ['ディカルバン兄弟',''],
-    641: ['絆のディカルバン兄弟',''],
-    642: ['スクアード','','Squardo'],
-    643: ['大渦蜘蛛スクアード','','Maelstrom Spider Squardo'],
-    644: ['ホワイティベイ',''],
-    645: ['氷の魔女ホワイティベイ',''],
-    646: ['リトルオーズJr.',''],
-    647: ['猛攻のリトルオーズJr.',''],
-    648: ['マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
-    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
-    650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami', 'Nami, Wakes of the Endless Dream, Straw Hat Crew' ],
-    651: ['ナミ 航海の夢「世界地図」','', 'Log Nami', 'Nami, A Vow in the Great Age of Pirates - World Map' ],
-    652: ['鉄仮面のデュバル','','Raid Duval'],
-    653: ['デュバル トビウオライダーズ ヘッド','','Raid Duval'],
-    654: ['デュバル 人生バラ色ライダーズ ヘッド','','Raid Duval'],
-    655: ['海賊アーロン','','Young Arlong'],
-    656: ['アーロン タイヨウの海賊団','','Young Arlong'],
-    657: ['クロオビ タイヨウの海賊団','','Young Kuroobi'],
-    658: ['チュウ タイヨウの海賊団','','Young Choo'],
-    659: ['モンキー・D・ルフィ うきわ','','Summertime Luffy','Swimsuit Luffy'],
+    1: ['モンキー・D・ルフィ', 'Monkey D. Luffy' ],
+    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)', 'Monkey D. Luffy Gum-Gum Carabine' ],
+    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ', 'Monkey D. Luffy Gum-Gum Bazooka' ],
+    4: ['モンキー・D・ルフィ ギア２', 'Monkey D. Luffy Gear 2', 'Monkey D. Luffy', ' G2' ],
+    5: ['ロロノア・ゾロ', 'Roronoa Zoro' ],
+    6: ['ロロノア・ゾロ 三・千・世・界', 'Roronoa Zoro Moulinet Infernal' ],
+    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）', 'Roronoa Zoro Calibre' ],
+    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）', 'Roronoa Zoro Brume Argentée' ],
+    9: ['ナミ', 'Nami' ],
+    10: ['ナミ トルネード=テンポ', 'Nami Tornado Tempo' ],
+    11: ['ナミ 蜃気楼＝テンポ', 'Nami MirageTempo' ],
+    12: ['ナミ サンダーボルト=テンポ', 'Nami Fulguro Tempo' ],
+    13: ['ウソップ', 'Usopp' ],
+    14: ['ウソップ タバスコ星', 'Usopp Etoile Piquante' ],
+    15: ['ウソップ ゴールデンパウンド', 'Usopp Usopp-Pilon doré', 'GPU' ],
+    16: [ 'そげキング', 'Sniperking', 'Usopp' ],
+    17: ['サンジ', 'Sanji' ],
+    18: ['サンジ 整形ショット(パラージュショット)', 'Sanji Tir esthétique' ],
+    19: ['料理人サンジ 焼き石シチュー', 'Chef Sanji Ragoût bouillonnant' ],
+    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)', 'Sanji Jambe du diable' ],
+    21: ['トニートニー・チョッパー', 'Tony Tony Chopper' ],
+    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）', 'Tony Tony Chopper Weight Boost' ],
+    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）', 'Tony Tony Chopper Brain Boost' ],
+    24: ['トニートニー・チョッパー 腕力強化（アームポイント）', 'Tony Tony Chopper Arm Boost' ],
+    25: ['トニートニー・チョッパー 角強化（ホーンポイント）', 'Tony Tony Chopper Horn Boost' ],
+    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）', 'Tony Tony Chopper Guard Boost' ],
+    27: ['ヒグマ', 'Higuma' ],
+    28: ['近海の主（ヌシ）', 'Seigneur de la côte' ],
+    29: ['金棒のアルビダ', 'Alvida à la Massue' ],
+    30: ['金棒のアルビダ スベスベの実', 'Alvida à la Massue Fruit Glisse-Glisse' ],
+    31: ['コビー', 'Kobby' ],
+    32: ['雑用コビー', 'Kobby le mousse' ],
+    33: ['ヘルメッポ', 'Hermep' ],
+    34: ['雑用ヘルメッポ', 'Hermep le mousse' ],
+    35: ['斧手のモーガン', 'Morgan le Hacheur' ],
+    36: ['モージ＆リッチー', 'Morge et Richy' ],
+    37: ['曲芸のカバジ', 'Cabaji l\'acrobate' ],
+    38: ['バギー', 'Baggy' ],
+    39: ['道化のバギー', 'Baggy le Clown' ],
+    40: ['ガイモン', 'Gaimon' ],
+    41: ['シャム', 'Sham' ],
+    42: ['ブチ', 'Buchi' ],
+    43: ['１・２のジャンゴ', 'Jango l\'hypnotiseur' ],
+    44: ['ダンシングジャンゴ', 'Jango le danseur' ],
+    45: ['キャプテン・クロ', 'Capitaine Kuro' ],
+    46: ['百計のクロ', 'Kuro les pattes de velours' ],
+    47: ['ヨサク', 'Yosaku' ],
+    48: ['ジョニー', 'Jhonny' ],
+    49: ['鉄拳のフルボディ', 'Fullbody au poing d\'acier' ],
+    50: ['パティ', 'Patty' ],
+    51: ['カルネ', 'Carne' ],
+    52: ['料理長ゼフ', 'Zeff le chef' ],
+    53: ['ギン', 'Gyn' ],
+    54: ['鬼人ギン', 'Gyn le démon enragé' ],
+    55: ['パール', 'Pearl' ],
+    56: ['ファイヤーパール', 'Fire Pearl' ],
+    57: ['首領・クリーク', 'Don Krieg ' ],
+    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」', 'Don Krieg Bombe à gaz toxique MH5' ],
+    59: ['ネズミ', 'Nezumi' ],
+    60: ['モーム', 'Meuh-Meuh' ],
+    61: ['チュウ', 'Smack' ],
+    62: ['クロオビ', 'Kuroobi' ],
+    63: ['はっちゃん', 'Octy', 'Hachi' ],
+    64: ['六刀流のハチ', 'Octy aux six lames', 'Hatchan' ],
+    65: ['アーロン', 'Arlong' ],
+    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）', 'Arlong enragé Squalo Crunch' ],
+    67: ['たしぎ', 'Tashigi' ],
+    68: ['たしぎ 海軍本部少尉', 'Tashigi Lieutenant-colonel de la Marine' ],
+    69: ['スモーカー', 'Smoker' ],
+    70: ['白猟のスモーカー', 'Smoker le chasseur blanc' ],
+    71: ['ミス・ウェンズデー', 'Miss Wednesday' ],
+    72: ['ネフェルタリ・ビビ', 'Vivi Nerfertari' ],
+    73: ['王女ビビ', 'Princesse Vivi' ],
+    74: ['ポートガス・D・エース', 'Portgas D. Ace' ],
+    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）', 'Portgas D. Ace Pyro-miroir' ],
+    76: ['シャンクス', 'Shanks' ],
+    77: ['赤髪のシャンクス', 'Shanks le Roux' ],
+    78: ['赤盗人ペンギン', 'Pingouin chapardeur rouge' ],
+    79: ['青盗人ペンギン', 'Pingouin chapardeur bleu' ],
+    80: ['緑盗人ペンギン', 'Pingouin chapardeur vert' ],
+    81: ['黄盗人ペンギン', 'Pingouin chapardeur jaune' ],
+    82: ['黒盗人ペンギン', 'Pingouin chapardeur noir' ],
+    83: ['虹盗人ペンギン', 'Pingouin chapardeur arc-en-ciel' ],
+    84: ['赤海賊ペンギン', 'Pingouin pirate rouge' ],
+    85: ['赤海賊ペンギン', 'Pingouin pirate bleu' ],
+    86: ['赤海賊ペンギン', 'Pingouin pirate vert' ],
+    87: ['赤海賊ペンギン', 'Pingouin pirate jaune' ],
+    88: ['赤海賊ペンギン', 'Pingouin pirate noir' ],
+    89: ['赤カブトヤドカリ', 'Bernard-l\'ermite rouge' ],
+    90: ['赤カブトヤドカリ', 'Bernard-l\'ermite bleu' ],
+    91: ['赤カブトヤドカリ', 'Bernard-l\'ermite vert' ],
+    92: ['赤カブトヤドカリ', 'Bernard-l\'ermite jaune' ],
+    93: ['赤カブトヤドカリ', 'Bernard-l\'ermite noir' ],
+    94: ['赤カブトヤドカリ', 'Bernard-l\'ermite arc-en-ciel' ],
+    95: ['赤ヨロイガニ', 'Crabe blindé rouge' ],
+    96: ['赤ヨロイガニ', 'Crabe blindé bleu' ],
+    97: ['赤ヨロイガニ', 'Crabe blindé vert' ],
+    98: ['赤ヨロイガニ', 'Crabe blindé jaune' ],
+    99: ['赤ヨロイガニ', 'Crabe blindé noir' ],
+    100: ['赤しま番竜', 'Dragon rayé rouge' ],
+    101: ['赤しま番竜', 'Dragon rayé bleu' ],
+    102: ['赤しま番竜', 'Dragon rayé vert' ],
+    103: ['赤しま番竜', 'Dragon rayé jaune' ],
+    104: ['赤しま番竜', 'Dragon rayé noir' ],
+    105: ['赤タカラガメ', 'Tortue-trésor rouge', 'Baby Turtle' ],
+    106: ['赤タカラガメ', 'Tortue-trésor bleue', 'Baby Turtle' ],
+    107: ['赤タカラガメ', 'Tortue-trésor verte', 'Baby Turtle' ],
+    108: ['赤タカラガメ', 'Tortue-trésor jaune', 'Baby Turtle' ],
+    109: ['赤タカラガメ', 'Tortue-trésor noire', 'Baby Turtle' ],
+    110: ['赤ダイミョウガメ', 'Tortue noble rouge' ],
+    111: ['赤ダイミョウガメ', 'Tortue noble bleue' ],
+    112: ['赤ダイミョウガメ', 'Tortue noble verte' ],
+    113: ['赤ダイミョウガメ', 'Tortue noble jaune' ],
+    114: ['赤ダイミョウガメ', 'Tortue noble noire' ],
+    115: ['タツノコ', 'Poney marin' ],
+    116: ['タツノワカ', 'Poulain marin' ],
+    117: ['タツノミコト', 'Cheval marin' ],
+    118: ['タツノオウ', 'Étalon marin' ],
+    119: ['カタナ山賊', '' ],
+    120: ['ピストル山賊', '' ],
+    121: ['格闘隊 雑用 レッドパイレーツ', '' ],
+    122: ['格闘隊 雑用 ブルーパイレーツ', '' ],
+    123: ['格闘隊 雑用 グリーンパイレーツ', '' ],
+    124: ['格闘隊 雑用 イエローパイレーツ', '' ],
+    125: ['格闘隊 雑用 ブラックパイレーツ', '' ],
+    126: ['斬撃隊 雑用 レッドパイレーツ', '' ],
+    127: ['斬撃隊 雑用 ブルーパイレーツ', '' ],
+    128: ['斬撃隊 雑用 グリーンパイレーツ', '' ],
+    129: ['斬撃隊 雑用 イエローパイレーツ', '' ],
+    130: ['斬撃隊 雑用 ブラックパイレーツ', '' ],
+    131: ['突撃隊 雑用 レッドパイレーツ', '' ],
+    132: ['突撃隊 雑用 ブルーパイレーツ', '' ],
+    133: ['突撃隊 雑用 グリーンパイレーツ', '' ],
+    134: ['突撃隊 雑用 イエローパイレーツ', '' ],
+    135: ['突撃隊 雑用 ブラックパイレーツ', '' ],
+    136: ['狙撃隊 雑用 レッドパイレーツ', '' ],
+    137: ['狙撃隊 雑用 ブルーパイレーツ', '' ],
+    138: ['狙撃隊 雑用 グリーンパイレーツ', '' ],
+    139: ['狙撃隊 雑用 イエローパイレーツ', '' ],
+    140: ['狙撃隊 雑用 ブラックパイレーツ', '' ],
+    141: ['砲撃手 雑用', '' ],
+    142: ['格闘隊 隊員 レッドパイレーツ', '' ],
+    143: ['格闘隊 隊員 ブルーパイレーツ', '' ],
+    144: ['格闘隊 隊員 グリーンパイレーツ', '' ],
+    145: ['格闘隊 隊員 イエローパイレーツ', '' ],
+    146: ['格闘隊 隊員 ブラックパイレーツ', '' ],
+    147: ['斬撃隊 隊員 レッドパイレーツ', '' ],
+    148: ['斬撃隊 隊員 ブルーパイレーツ', '' ],
+    149: ['斬撃隊 隊員 グリーンパイレーツ', '' ],
+    150: ['斬撃隊 隊員 イエローパイレーツ', '' ],
+    151: ['斬撃隊 隊員 ブラックパイレーツ', '' ],
+    152: ['突撃隊 隊員 レッドパイレーツ', '' ],
+    153: ['突撃隊 隊員 ブルーパイレーツ', '' ],
+    154: ['突撃隊 隊員 グリーンパイレーツ', '' ],
+    155: ['突撃隊 隊員 イエローパイレーツ', '' ],
+    156: ['突撃隊 隊員 ブラックパイレーツ', '' ],
+    157: ['狙撃隊 隊員 レッドパイレーツ', '' ],
+    158: ['狙撃隊 隊員 ブルーパイレーツ', '' ],
+    159: ['狙撃隊 隊員 グリーンパイレーツ', '' ],
+    160: ['狙撃隊 隊員 イエローパイレーツ', '' ],
+    161: ['狙撃隊 隊員 ブラックパイレーツ', '' ],
+    162: ['砲撃手 腕利き', '' ],
+    163: ['ボディガード・サングラス', '' ],
+    164: ['ボディガード・ヒゲ', '' ],
+    165: ['ナックルごろつき クロネコ海賊団', '' ],
+    166: ['サーベルごろつき クロネコ海賊団', '' ],
+    167: ['ナギナタごろつき クロネコ海賊団', '' ],
+    168: ['ピストルごろつき クロネコ海賊団', '' ],
+    169: ['バズーカごろつき クロネコ海賊団', '' ],
+    170: ['格闘隊 隊長', '' ],
+    171: ['斬撃隊 隊長', '' ],
+    172: ['突撃隊 隊長', '' ],
+    173: ['狙撃隊 隊長', '' ],
+    174: ['遊撃手 凄腕', '' ],
+    175: ['空手使いの魚人 アーロン一味', '' ],
+    176: ['カタナ使いの魚人 アーロン一味', '' ],
+    177: ['ヤリ使いの魚人 アーロン一味', '' ],
+    178: ['銃使いの魚人 アーロン一味', '' ],
+    179: ['ナックル三等兵 海軍', '' ],
+    180: ['サーベル三等兵 海軍', '' ],
+    181: ['ナギナタ三等兵 海軍', '' ],
+    182: ['ピストル三等兵 海軍', '' ],
+    183: ['バズーカ三等兵 海軍', '' ],
+    184: ['ナックル一等兵 海軍', '' ],
+    185: ['サーベル一等兵 海軍', '' ],
+    186: ['ナギナタ一等兵 海軍', '' ],
+    187: ['ピストル一等兵 海軍', '' ],
+    188: ['バズーカ一等兵 海軍', '' ],
+    189: ['赤タイロウガメ', '' ],
+    190: ['青タイロウガメ', '' ],
+    191: ['青タイロウガメ', '' ],
+    192: ['青タイロウガメ', '' ],
+    193: ['青タイロウガメ', '' ],
+    194: ['ナックル少尉 海軍本部', '' ],
+    195: ['サーベル少尉 海軍本部', '' ],
+    196: ['ナギナタ少尉 海軍本部', '' ],
+    197: ['ピストル少尉 海軍本部', '' ],
+    198: ['バズーカ少尉 海軍本部', '' ],
+    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)', '', 'Mr 5' ],
+    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）', '', 'Mr 5' ],
+    201: ['ミス・バレンタイン', '' ],
+    202: ['ミス・バレンタイン 1万キロギロチン', '' ],
+    203: ['Mr.3', '', 'Mr 3' ],
+    204: ['Mr.3 特大キャンドルサービスセット', '', 'Mr 3' ],
+    205: ['ミス・ゴールデンウィーク', '' ],
+    206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑', '' ],
+    207: ['Mr.2・ボン・クレー ', '', 'Mr. 2 Bonclay', 'Mr 2 Bonclay' ],
+    208: ['Mr.2・ボン・クレー  爆撃白鳥アラベスク(ボンバルディエ)', '', 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
+    209: ['ミス・オールサンデー バロックワークス副社長', '', 'Nico Robin' ],
+    210: ['ニコ・ロビン', '' ],
+    211: ['Mr.9', '', 'Mr 9' ],
+    212: ['Mr.9 （熱血ナイン根性バット）', '', 'Mr 9 Hot Blooded Bat' ],
+    213: ['ラブーン', '' ],
+    214: ['ラブーン(ルフィ落書き)', '' ],
+    215: ['大王イカ', '' ],
+    216: ['モンキー・D・ルフィ（ゴムゴムの風船）', '' ],
+    217: ['モンキー・D・ルフィ（ギア３）', '', 'Mistake', 'G3', 'Gear 3' ],
+    218: ['ゾロ_刀狼流し（とうろうながし）', '' ],
+    219: ['ロロノア・ゾロ_獅子歌歌（ししソンソン）', '', 'LS Zoro' ],
+    220: ['ナミ（ファイン=テンポ）', '' ],
+    221: ['ナミ（幸せパンチ）', '', 'Towel Nami', 'TNami' ],
+    222: ['ウソップ（ウソップハンマー）', '' ],
+    223: ['ウソップ（衝撃（インパクト））', '' ],
+    224: ['Mr.プリンス（羊肉（ムートン）ショット）', '', 'Sanji', 'Mr Prince Mutton Shot' ],
+    225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）', '', 'Sanji', 'Mr Prince Veau Shot' ],
+    226: ['ジュラキュール・ミホーク', '', 'Raidhawk', 'Raid Mihawk' ],
+    227: ['鷹の目のミホーク', '', 'Raidhawk', 'Raid Mihawk' ],
+    228: ['脱獄モーガン', '' ],
+    229: ['寝返りのジャンゴ', '' ],
+    230: ['両鉄拳のフルボディ', '' ],
+    231: ['ヒナ', '' ],
+    232: ['黒檻のヒナ', '' ],
+    233: ['Mr.8', '', 'mr 8' ],
+    234: ['Mr.8 イガラッパッパ', '', 'mr 8' ],
+    235: ['ミス・マンデー', '' ],
+    236: ['ミス・マンデー カ・イ・リ・キ メリケン', '' ],
+    237: ['ナックルミリオンズ バロックワークス', '' ],
+    238: ['サーベルミリオンズ バロックワークス', '' ],
+    239: ['ナギナタミリオンズ バロックワークス', '' ],
+    240: ['ピストルミリオンズ バロックワークス', '' ],
+    241: ['バズーカミリオンズ バロックワークス', '' ],
+    242: ['ナックルビリオンズ バロックワークス', '' ],
+    243: ['サーベルビリオンズ バロックワークス', '' ],
+    244: ['ナギナタビリオンズ バロックワークス', '' ],
+    245: ['ピストルビリオンズ バロックワークス', '' ],
+    246: ['バズーカビリオンズ バロックワークス', '' ],  
+    247: ['チョッパーマン', '', 'Chopperman', 'Chopper Man' ],
+    248: ['トニートニー・チョッパー 暴走前', '', 'Raid Monster Chopper', 'MC' ],
+    249: ['トニートニー・チョッパー 暴走後', '', 'Raid Monster Chopper', 'MC' ],
+    250: ['マルコ', '' ],
+    251: ['不死鳥マルコ', '' ],
+    252: ['ジョズ', '' ],
+    253: ['ダイヤモンド・ジョズ', '' ],
+    254: ['ビスタ', '' ],
+    255: ['花剣のビスタ', '' ],
+    256: ['イゾウ', '' ],
+    257: ['短筒使いのイゾウ', '' ],
+    258: ['ブラメンコ', '' ],
+    259: ['大槌のブラメンコ', '' ],
+    260: ['エドワード・ニューゲート', '', 'Whitebeard', 'WB' ],
+    261: ['白ひげ', '', 'Edward Newgate', 'WB' ],
+    262: ['特訓コビー', '' ],
+    263: ['曹長コビー', '' ],
+    264: ['特訓ヘルメッポ', '' ],
+    265: ['軍曹ヘルメッポ', '' ],
+    266: ['虹海賊ペンギン', '' ],
+    267: ['虹しま番竜', '' ],
+    268: ['白猟のスモーカー ビローアバイク', '', 'WC Smoker' ],
+    269: ['格闘隊　武装隊員 レッドパイレーツ', '' ],
+    270: ['格闘隊　武装隊員 ブルーパイレーツ', '' ],
+    271: ['格闘隊　武装隊員 グリーンパイレーツ', '' ],
+    272: ['格闘隊　武装隊員 イエローパイレーツ', '' ],
+    273: ['格闘隊　武装隊員 ブラックパイレーツ', '' ],
+    274: ['斬撃隊　武装隊員 レッドパイレーツ', '' ],
+    275: ['斬撃隊　武装隊員 ブルーパイレーツ', '' ],
+    276: ['斬撃隊　武装隊員 グリーンパイレーツ', '' ],
+    277: ['斬撃隊　武装隊員 イエローパイレーツ', '' ],
+    278: ['斬撃隊　武装隊員 ブラックパイレーツ', '' ],
+    279: ['突撃隊　武装隊員 レッドパイレーツ', '' ],
+    280: ['突撃隊　武装隊員 ブルーパイレーツ', '' ],
+    281: ['突撃隊　武装隊員 グリーンパイレーツ', '' ],
+    282: ['突撃隊　武装隊員 イエローパイレーツ', '' ],
+    283: ['突撃隊　武装隊員 ブラックパイレーツ', '' ],
+    284: ['狙撃隊　武装隊員 レッドパイレーツ', '' ],
+    285: ['狙撃隊　武装隊員 ブルーパイレーツ', '' ],
+    286: ['狙撃隊　武装隊員 グリーンパイレーツ', '' ],
+    287: ['狙撃隊　武装隊員 イエローパイレーツ', '' ],
+    288: ['狙撃隊　武装隊員 ブラックパイレーツ', '' ],
+    289: ['砲撃手　敏腕', '' ],
+    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）', '', 'Mr 13 and Ms Friday the Unluckies' ],
+    291: ['ドリー', '' ],
+    292: ['ブロギー', '' ],
+    293: ['トリケラトプス', '' ],
+    294: ['レックス', '' ],
+    295: ['ブロントザウルス', '' ],
+    296: ['おつるさん', '' ],
+    297: ['大参謀つる', '' ],
+    298: ['モモンガ', '' ],
+    299: ['オニグモ', '' ],
+    300: ['赤アーマーロブスター', '' ],
+    301: ['青アーマーロブスター', '' ],
+    302: ['緑アーマーロブスター', '' ],
+    303: ['黄アーマーロブスター', '' ],
+    304: ['黒アーマーロブスター', '' ],
+    305: ['モンキー・D・ガープ', '', 'Raid Garp' ],
+    306: ['ゲンコツのガープ', '', 'Raid Garp' ],
+    307: ['トラファルガー・ロー', '', 'Supernova Law' ],
+    308: ['トラファルガー・ロー ROOMバジル・ホーキンス', '', 'Supernova Law' ],
+    309: ['バジル・ホーキンス', '', 'Supernova Hawkins' ],
+    310: ['魔術師バジル・ホーキンス', '', 'Supernova Hawkins' ],
+    311: ['キラー', '', 'Supernova Killer' ],
+    312: ['殺戮武人キラー', '', 'Supernova Killer' ],
+    313: ['ウルージ', '', 'Supernova Urouge' ],
+    314: ['怪僧ウルージ', '', 'Supernova Urouge' ],
+    315: ['ベポ', '' ],
+    316: ['武闘家のベポ', '' ],
+    317: ['カリファ', '', 'Califa', 'Calipha', 'Kalipha' ],
+    318: ['美人秘書カリファ', '', 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
+    319: ['パウリー', '' ],
+    320: ['パウリー 1番ドック艤装(ぎそう)・マスト職職長', '' ],
+    321: ['ロブ・ルッチ', '' ],
+    322: ['ロブ・ルッチ 1番ドック木びき・木釘職職長', '' ],
+    323: ['カク', '' ],
+    324: ['カク 1番ドック大工職職長', '' ],
+    325: ['ルル', '' ],
+    326: ['ワポル', '' ],
+    327: ['ワポルハウス', '' ],
+    328: ['ドルトン', '' ],
+    329: ['ドルトン 野牛（バイソン）', '' ],
+    330: ['チェス', '' ],
+    331: ['クロマーリモ', '' ],
+    332: ['チェスマーリモ', '' ],
+    333: ['Dr.くれは', '' ],
+    334: ['ラパーン', '', 'Lapahn', 'Lapan', 'Rapan' ],
+    335: ['ラパーン 成獣', '', 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
+    336: ['フランキー', '' ],
+    337: ['解体屋フランキー', '' ],
+    338: ['キウイ', '' ],
+    339: ['モズ', '' ],
+    340: ['クラーケン スルメ', '' ],
+    341: ['クラーケン 北極の怪物', '' ],
+    342: ['赤パワース豚（トーン）', '', 'Pig', 'Pork' ],
+    343: ['青パワース豚（トーン）', '', 'Pig', 'Pork' ],
+    344: ['緑パワース豚（トーン）', '', 'Pig', 'Pork' ],
+    345: ['黄パワース豚（トーン）', '', 'Pig', 'Pork' ],
+    346: ['黒パワース豚（トーン）', '', 'Pig', 'Pork' ],
+    347: ['ルビーパワース豚（トーン）', '', 'Pig', 'Pork' ],
+    348: ['サファイアパワース豚（トーン）', '', 'Pig', 'Pork' ],
+    349: ['エメラルドパワース豚（トーン）', '', 'Pig', 'Pork' ],
+    350: ['トパーズパワース豚（トーン）', '', 'Pig', 'Pork' ],
+    351: ['アメジストパワース豚（トーン）', '', 'Pig', 'Pork' ],
+    352: ['ゼファー', '', 'Raid Zephyr' ],
+    353: ['ゼファー NEO海軍総帥', '', 'Raid Zephyr' ],
+    354: ['アイン', '', 'Raid Ain' ],
+    355: ['アイン NEO海軍バイス・アドミラル', '', 'Raid Ain' ],
+    356: ['ユースタス・キッド', '', 'Supernova Kid', 'Supernova Kidd', 'Kidd' ],
+    357: ['キャプテン・キッド', '', 'Supernova Kid', 'Supernova Kidd', 'Kidd' ],
+    358: ['スクラッチメン・アプー', '', 'Supernova Apoo' ],
+    359: ['海鳴り スクラッチメン・アプー', '', 'Supernova Apoo' ],
+    360: ['X・ドレーク', '', 'Supernova Drake', 'Supernova X Drake' ],
+    361: ['赤旗 X・ドレーク', '', 'Supernova Drake', 'Supernova X Drake' ],
+    362: ['ジュエリー・ボニー', '', 'Supernova Bonney' ],
+    363: ['大喰らい ジュエリー・ボニー', '', 'Supernova Bonney' ],
+    364: ['カポネ・ベッジ', '', 'Supernova Capone' ],
+    365: ['カポネ・ギャング・ベッジ', '', 'Supernova Capone' ],
+    366: ['シルバーズ・レイリー', '' ],
+    367: ['冥王レイリー', '' ],
+    368: ['巨人斬撃隊 レッドパイレーツ', '' ],
+    369: ['巨人射撃隊 ブルーパイレーツ', '' ],
+    370: ['巨人女戦士隊 グリーンパイレーツ', '' ],
+    371: ['巨人格闘隊 イエローパイレーツ', '' ],
+    372: ['巨人突撃隊 ブラックパイレーツ', '' ],
+    373: ['巨人斬撃近衛隊 レッドパイレーツ', '' ],
+    374: ['巨人射撃近衛隊 ブルーパイレーツ', '' ],
+    375: ['巨人女戦士近衛隊 グリーンパイレーツ', '' ],
+    376: ['巨人格闘近衛隊 イエローパイレーツ', '' ],
+    377: ['巨人突撃近衛隊 ブラックパイレーツ', '' ],
+    378: ['海ネコ', '' ],
+    379: ['クンフージュゴン', '' ],
+    380: ['クンフージュゴン 兄弟弟子', '' ],
+    381: ['バナナワニ', '' ],
+    382: ['サンドラ大トカゲ', '' ],
+    383: ['Mr.0 バロックワークス社長', '', 'Crocodile', 'Mr 0' ],
+    384: ['サー・クロコダイル', '', 'Strikerdile', 'Impactdile', 'Mr 0', 'Mr. 0' ],
+    385: ['ホグバック', '' ],
+    386: ['ドクトル・ホグバック', '' ],
+    387: ['シンドリーちゃん', '' ],
+    388: ['ビクトリア・シンドリー', '' ],
+    389: ['エンポリオ・イワンコフ', '', 'Raid Ivankov' ],
+    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】', '', 'Raid Ivankov' ],
+    391: ['ペローナ', '' ],
+    392: ['ペローナ ゴーストプリンセス', '' ],
+    393: ['クマシー', '', 'Kumashi' ],
+    394: ['犬ッペ', '', 'Inuppe' ],
+    395: ['ミス・メリークリスマス', '' ],
+    396: ['ミス・メリークリスマス モグラ人間', '' ],
+    397: ['Mr.4', '', 'Mr 4' ],
+    398: ['Mr.4と犬銃ラッスー', '', 'Mr 4 and Lassoo the Dog-Gun' ],
+    399: ['ミス・ダブルフィンガー', '' ],
+    400: ['ミス・ダブルフィンガー 棘（とげ）人間', '' ],
+    401: ['Mr.1', '', 'mr 1', 'Daz Bones' ],
+    402: ['Mr.1 全身刃物人間', '', 'Mr 1', 'Daz Bones' ],
+    403: ['レベッカ', '' ],
+    404: ['アブサロム', '' ],
+    405: ['墓場のアブサロム', '' ],
+    406: ['将軍ゾンビ', '' ],
+    407: ['風のジゴロウ', '' ],
+    408: ['サー・クロコダイル 王下七武海', '', 'Slasherdile' ],
+    409: ['ジンベエ', '', 'Jinbe', 'Jimbei', 'Jinbei' ],
+    410: ['ジンベエ 王下七武海', '', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
+    411: ['バーソロミュー・くま', '' ],
+    412: ['バーソロミュー・くま 王下七武海', '' ],
+    413: ['ゲッコー・モリア', '', 'Gekko Moriah' ],
+    414: ['ゲッコー・モリア 王下七武海', '', 'Gekko Moriah Warlord of the Sea' ],
+    415: ['ボア・ハンコック', '' ],
+    416: ['ボア・ハンコック 王下七武海', '' ],
+    417: ['ドンキホーテ・ドフラミンゴ', '', 'Raid Doffy', 'Raid Doflaming' ],
+    418: ['ドンキホーテ・ドフラミンゴ 王下七武海', '', 'Raid Doffy', 'Raid Doflaming' ],
+    419: ['サンジ 整形ショット(パラージュショット)　“嵐”', '', 'Kimono Sanji' ],
+    420: ['モンキー・D・ルフィ ゴムゴムのバズーカ“覇”', '', 'Kimono Luffy' ],
+    421: ['ロロノア・ゾロ 三・千・世・界“斬”', '', 'Kimono Zoro' ],
+    422: ['ナミ 蜃気楼＝テンポ“天”', '', 'Kimono Nami' ],
+    423: ['ブルック', '' ],
+    424: ['鼻唄のブルック', '' ],
+    425: ['リューマ', '', 'Ryuuma' ],
+    426: ['マシラ', '', 'Harambe' ],
+    427: ['ショウジョウ', '' ],
+    428: ['モンブラン・クリケット', '' ],
+    429: ['サウスバードと森の住民', '' ],
+    430: ['ベラミー', '' ],
+    431: ['ハイエナのベラミー', '' ],
+    432: ['サーキース', '', 'Sarkies' ],
+    433: ['エリザベス', '' ],
+    434: ['キャロライン', '' ],
+    435: ['サンジ カマバッカ王国伝統の決闘スタイル', '' ],
+    436: ['サンジ キャンディーちゃん', '' ],
+    437: ['ペローナ　スイート', '', 'Valentine Perona' ],
+    438: ['ペローナ　スイート ゴーストプリンセス', '', 'Valentine Perona' ],
+    439: ['ネフェルタリ・ビビ　ラブ', '', 'Valentine Vivi' ],
+    440: ['王女ビビ　ラブ', '', 'Valentine Vivi' ],
+    441: ['カウボーイとバーボンJr. 超カルガモ部隊', '' ],
+    442: ['ストンプとイワンX 超カルガモ部隊', '' ],
+    443: ['ケンタロウスとヒコイチ 超カルガモ部隊', '' ],
+    444: ['カルー', '', 'Carue', 'Karue' ],
+    445: ['カルー隊長と超カルガモ部隊', '', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
+    446: ['マーシャル・Ｄ・ティーチ', '', 'Raid Blackbeard', 'BB' ],
+    447: ['黒ひげ', '', 'Raid Blackbeard', 'BB', 'Teach' ],
+    448: ['サッチ', '' ],
+    449: ['双剣のサッチ', '' ],
+    450: ['ナミュール', '', 'Namur' ],
+    451: ['一撃のナミュール', '', 'One-Hit Namur' ],
+    452: ['ラクヨウ', '' ],
+    453: ['モーニングスターのラクヨウ', '' ],
+    454: ['フォッサ', '' ],
+    455: ['火炎刀のフォッサ', '' ],
+    456: ['クリエル', '' ],
+    457: ['重火器使いのクリエル', '' ],
+    458: ['センゴク', '' ],
+    459: ['仏のセンゴク', '' ],
+    460: ['犯罪者ギャルディーノ Mr.3', 'Mr 3', '' ],
+    461: ['脱走者ベンサム Mr.2・ボン・クレー', '', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
+    462: ['脱獄名人ベンサム Mr.2・ボン・クレー', '', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
+    463: ['サトリ', '' ],
+    464: ['シュラ', '' ],
+    465: ['ゲダツ', '' ],
+    466: ['ブラハム', '' ],
+    467: ['ヤマ', '' ],
+    468: ['黄のホワイトベレー部隊　隊員 スカイピア神隊', '' ],
+    469: ['黒のホワイトベレー部隊　隊員 スカイピア神隊', '' ],
+    470: ['黄のホワイトベレー部隊　隊長 スカイピア神隊', '' ],
+    471: ['黒のホワイトベレー部隊　隊長 スカイピア神隊', '' ],
+    472: ['赤のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
+    473: ['青のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
+    474: ['緑のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
+    475: ['黄のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
+    476: ['黒のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
+    477: ['赤の突撃隊　隊員 スカイピア神兵', '' ],
+    478: ['青の突撃隊　隊員 スカイピア神兵', '' ],
+    479: ['緑の突撃隊　隊員 スカイピア神兵', '' ],
+    480: ['黄の突撃隊　隊員 スカイピア神兵', '' ],
+    481: ['黒の突撃隊　隊員 スカイピア神兵', '' ],
+    482: ['赤の突撃隊　エリート スカイピア神兵', '' ],
+    483: ['青の突撃隊　エリート スカイピア神兵', '' ],
+    484: ['緑の突撃隊　エリート スカイピア神兵', '' ],
+    485: ['黄の突撃隊　エリート スカイピア神兵', '' ],
+    486: ['黒の突撃隊　エリート スカイピア神兵', '' ],
+    487: ['赤の遊牧隊　隊員 シャンディアの戦士', '' ],
+    488: ['青の遊牧隊　隊員 シャンディアの戦士', '' ],
+    489: ['緑の遊牧隊　隊員 シャンディアの戦士', '' ],
+    490: ['赤の遊牧隊　達人 シャンディアの戦士', '' ],
+    491: ['青の遊牧隊　達人 シャンディアの戦士', '' ],
+    492: ['緑の遊牧隊　達人 シャンディアの戦士', '' ],
+    493: ['黄の狩猟隊　隊員 シャンディアの戦士', '' ],
+    494: ['黒の狩猟隊　隊員 シャンディアの戦士', '' ],
+    495: ['黄の狩猟隊　達人 シャンディアの戦士', '' ],
+    496: ['黒の狩猟隊　達人 シャンディアの戦士', '' ],
+    497: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟', '', 'Kid Ace' ],
+    498: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟“兄弟盃”', '', 'Kid Ace' ],
+    499: ['ベルメール', '' ],
+    500: ['ベルメール ナミとノジコの養母', '' ],
+    501: ['カヤ', '' ],
+    502: ['カヤ シロップ村のお嬢様', '' ],
+    503: ['ホトリ・コトリ', '' ],
+    504: ['ホトリ・コトリ スカイピア副神兵長', '' ],
+    505: ['ペル', '' ],
+    506: ['ペル アラバスタの守護神ファルコン', '' ],
+    507: ['チャカ', '' ],
+    508: ['チャカ アラバスタの守護神ジャッカル', '' ],
+    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長', '', 'Mr 0', 'Mr. 0', 'Crocodile', 'Prisondile' ],
+    510: ['最強の囚人サー・クロコダイル 元王下七武海', '', 'Mr 0', 'Mr. 0', 'Prisondile' ],
+    511: ['服役囚ダズ・ボーネス Mr.1', '', 'Mr 1', 'Daz Bones' ],
+    512: ['サボ コルボ山の悪ガキ３兄弟', '', 'Kid Sabo' ],
+    513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”', '', 'Kid Sabo' ],
+    514: ['ニコ・ロビン トロピカル', '', 'Summertime Robin', 'Swimsuit Robin' ],
+    515: ['ヘラクレスン', '', 'Raid Heracles-un', 'Raid Heracles' ],
+    516: ['ヘラクレスン 森の勇者', '', 'Raid Heracles-un', 'Raid Heracles' ],
+    517: ['ウソップン', '', 'Raid Usoppun', 'Raid Usopp' ],
+    518: ['ウソップン ヘラクレスンの生徒', '', 'Raid Usoppun, Pupil of Heracles\'n', 'fat usopp', 'Raid Usopp' ],
+    519: ['モンキー・Ｄ・ルフィ メルヴィユの冒険者', '', 'Strong World Luffy', 'SW Luffy' ],
+    520: ['モンキー・Ｄ・ルフィ 特攻の麦わらの一味', '', 'Strong World Luffy', 'SW Luffy' ],
+    521: ['サンジ メルヴィユの冒険者', '', 'Strong World Sanji', 'SW Sanji' ],
+    522: ['サンジ 特攻の麦わらの一味', '', 'Strong World Sanji', 'SW Sanji' ],
+    523: ['ナミ メルヴィユの冒険者', '', 'Strong World Nami', 'SW Nami' ],
+    524: ['ナミと雷鳥ビリー', '', 'Strong World Nami', 'SW Nami' ],
+    525: ['ブルック メルヴィユの冒険者', '', 'Strong World Brook', 'SW Brook' ],
+    526: ['ブルック 特攻の麦わらの一味', '', 'Strong World Brook', 'SW Brook' ],
+    527: ['チョッパー メルヴィユの冒険者', '', 'Strong World Chopper', 'SW Chopper' ],
+    528: ['チョッパー 特攻の麦わらの一味', '', 'Strong World Chopper', 'SW Chopper' ],
+    529: ['シャンクス 黒衣の赤髪', '', 'Strong World Shanks', 'SW Shanks' ],
+    530: ['シャンクス 黒衣の四皇', '', 'Strong World Shanks', 'SW Shanks' ],
+    531: ['ニコ・ロビン　桜吹雪', '', 'Sakura Robin' ],
+    532: ['ニコ・ロビン　桜満開', '', 'Sakura Robin' ],
+    533: ['ブルック　チェリーヘッド', '', 'Sakura Brook' ],
+    534: ['ブルック　桜音色', '', 'Sakura Brook' ],
+    535: ['ナミ　桜雲', '', 'Sakura Nami' ],
+    536: ['ナミ　桜日和', '', 'Sakura Nami' ],
+    537: ['ドミノ', '' ],
+    538: ['ドミノ インペルダウン副看守長', '' ],
+    539: ['ミノリノケロス', '' ],
+    540: ['バシリスク', '' ],
+    541: ['オーム', '' ],
+    542: ['ノラ ウワバミ', '' ],
+    543: ['ワイパー', '', 'Wiper' ],
+    544: ['ワイパー 大戦士カルガラの子孫', '', 'Wiper, Descendant of Great Warrior Calgara' ],
+    545: ['エネル', '', 'Enel' ],
+    546: ['ゴッド・エネル', '', 'God Enel' ],
+    547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟', '', 'Kid Luffy' ],
+    548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”', '', 'Kid Luffy' ],
+    549: ['サディちゃん', '' ],
+    550: ['サディちゃん インペルダウン獄卒長', '' ],
+    551: ['ミノコアラ', '' ],
+    552: ['マンティコラ', '' ],
+    553: ['ロロノア・ゾロ メルヴィユの冒険者', '', 'Strong World Zoro', 'SW Zoro' ],
+    554: ['ロロノア・ゾロ 特攻の麦わらの一味', '', 'Strong World Zoro', 'SW Zoro' ],
+    555: ['ウソップ メルヴィユの冒険者', '', 'Strong World Usopp', 'SW Usopp' ],
+    556: ['ウソップ 特攻の麦わらの一味', '', 'Strong World Usopp', 'SW Usopp' ],
+    557: ['ニコ・ロビン メルヴィユの冒険者', '', 'Strong World Robin', 'SW Robin' ],
+    558: ['ニコ・ロビン 特攻の麦わらの一味', '', 'Strong World Robin', 'SW Robin' ],
+    559: ['フランキー メルヴィユの冒険者', '', 'Strong World Franky', 'SW Franky' ],
+    560: ['フランキー 特攻の麦わらの一味', '', 'Strong World Franky', 'SW Franky' ],
+    561: ['ポートガス・D・エース 黒衣の火拳', '', 'Strong World Ace', 'SW Ace' ],
+    562: ['ポートガス・D・エース 黒衣の白ひげ海賊団2番隊隊長', '', 'Strong World Ace', 'SW Ace' ],
+    563: ['ポルチェ', '' ],
+    564: ['ポーティ', '' ],
+    565: ['ハンバーグ', '' ],
+    566: ['ピクルス', '' ],
+    567: ['ビッグパン', '', 'Big Pan' ],
+    568: ['フォクシー', '' ],
+    569: ['銀ギツネのフォクシー', '' ],
+    570: ['モンキー・Ｄ・ルフィ デービーバックファイト・アフロ', '', 'Afro Luffy', 'Afroluffy' ],
+    571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット', '', 'Afro Luffy', 'Afroluffy' ],
+    572: ['ウソップ デービーバックファイト・セコンド', '' ],
+    573: ['トニートニー・チョッパー デービーバックファイト・マスク', '' ],
+    574: ['青キジ', '', 'Raid Kuzan', 'Raid Aokiji' ],
+    575: ['青キジ　氷結人間', '', 'Raid Kuzan', 'Raid Aokiji' ],
+    576: ['ナミのティータイム', '' ],
+    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味', '', 'Log Luffy', 'Logfy' ],
+    578: ['モンキー・D・ルフィ 航海の夢「海賊王」', '', 'Log Luffy', 'Logfy' ],
+    579: ['ロロノア・ゾロ 航海の記録・麦わらの一味', '', 'Log Zoro', 'Roronoa Zoro, Wakes of the Endless Dream, Straw Hat Crew' ],
+    580: ['ロロノア・ゾロ 航海の夢「大剣豪」', '', 'Log Zoro', 'Roronoa Zoro, A Vow in the Great Age of Pirates - Master Swordsman' ],
+    581: ['ゲンボウ', '' ],
+    582: ['カマキリ', '' ],
+    583: ['ラキ', '', 'Laki' ],
+    584: ['アイサ', '' ],
+    585: ['ノジコ', '' ],
+    586: ['ノジコ ナミの義姉妹', '' ],
+    587: ['クロッカス', '' ],
+    588: ['クロッカス 双子岬の灯台守', '' ],
+    589: ['コーザ', '' ],
+    590: ['コーザ 反乱軍リーダー', '' ],
+    591: ['朱の竜宮カメ姫', '', 'Princess Turtle' ],
+    592: ['蒼の竜宮カメ姫', '', 'Princess Turtle' ],
+    593: ['翠の竜宮カメ姫', '', 'Princess Turtle' ],
+    594: ['琥珀の竜宮カメ姫', '', 'Princess Turtle' ],
+    595: ['漆黒の竜宮カメ姫', '', 'Princess Turtle' ],
+    596: ['トニートニー・チョッパー 航海の記録・麦わらの一味', '', 'Log Chopper', 'Tony Tony Chopper, Wakes of the Endless Dream, Straw Hat Crew' ],
+    597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」', '', 'Log Chopper', 'Tony Tony Chopper, A Vow in the Great Age of Pirates - Great Doctor' ],
+    598: ['バギー 海賊見習い', '', 'Young Buggy', 'Baggy' ],
+    599: ['バギー ロジャー海賊団', '', 'Young Buggy', 'Baggy' ],
+    600: ['シャンクス 海賊見習い', '', 'Young Shanks' ],
+    601: ['シャンクス ロジャー海賊団', '', 'Young Shanks' ],
+    602: ['エネル ２億Ｖ　雷神', '', 'Raid Enel, 200 Million Volt Thunder God' ],
+    603: ['エネル　雷人間 ２億Ｖ　雷神', '', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God' ],
+    604: ['サンジ 航海の記録・麦わらの一味', '', 'Log Sanji', 'Sanji, Wakes of the Endless Dream, Straw Hat Crew' ],
+    605: ['サンジ 航海の夢「オールブルー」', '', 'Log Sanji' ],
+    606: ['海賊ゼフ', '' ],
+    607: ['赫足のゼフ クック海賊団船長', '' ],
+    608: ['ごろつきパティ', '' ],
+    609: ['ごろつきカルネ', '' ],
+    610: ['ハイキングベア', '' ],
+    611: ['プリンプリン', '', 'Pudding Pudding' ],
+    612: ['ブルック 航海の記録・麦わらの一味', '', 'Log Brook', 'Brook, Wakes of the Endless Dream, Straw Hat Crew' ],
+    613: ['ブルック 航海の夢「約束の再会」', '', 'Log Brook', 'Brook, A Vow in the Great Age of Pirates - Promised Meeting' ],
+    614: ['ザンバイ', '' ],
+    615: ['怪力デストロイヤーズ 斧使い', '' ],
+    616: ['怪力デストロイヤーズ 槍使い', '' ],
+    617: ['怪力デストロイヤーズ 大砲使い', '', 'Gunner' ],
+    618: ['ナックルチンピラ 赤の賞金稼ぎ', '' ],
+    619: ['ナックルチンピラ 緑の賞金稼ぎ', '' ],
+    620: ['カタナチンピラ 青の賞金稼ぎ', '' ],
+    621: ['カタナチンピラ 赤の賞金稼ぎ', '' ],
+    622: ['ピストルチンピラ 緑の賞金稼ぎ', '' ],
+    623: ['ピストルチンピラ 黄の賞金稼ぎ', '' ],
+    624: ['棍棒チンピラ 黄の賞金稼ぎ', '' ],
+    625: ['棍棒チンピラ 黒の賞金稼ぎ', '' ],
+    626: ['ガトリングチンピラ 黒の賞金稼ぎ', '' ],
+    627: ['ガトリングチンピラ 青の賞金稼ぎ', '' ],
+    628: ['タイルストン', '' ],
+    629: ['フランキー フランキー一家棟梁', '' ],
+    630: ['カク サイファーポールNo.9', '' ],
+    631: ['カク 六式 サイファーポールNo.9', '' ],
+    632: ['ロブ・ルッチ サイファーポールNo.9', '' ],
+    633: ['ロブ・ルッチ 六式 サイファーポールNo.9', '' ],
+    634: ['ケイミー', '', 'Keimi' ],
+    635: ['ケイミー タコ焼き屋店員', '', 'Keimi, Takoyaki Stand Assistant' ],
+    636: ['パッパグ', '', 'Pappug' ],
+    637: ['はっちゃん タコ焼き屋店主', '', 'Hachi, Takoyaki Stand Owner' ],
+    638: ['ドーマ', '' ],
+    639: ['遊騎士ドーマ', '' ],
+    640: ['ディカルバン兄弟', '' ],
+    641: ['絆のディカルバン兄弟', '' ],
+    642: ['スクアード', '', 'Squardo' ],
+    643: ['大渦蜘蛛スクアード', '', 'Maelstrom Spider Squardo' ],
+    644: ['ホワイティベイ', '' ],
+    645: ['氷の魔女ホワイティベイ', '' ],
+    646: ['リトルオーズJr.', '' ],
+    647: ['猛攻のリトルオーズJr.', '' ],
+    648: ['マルコ 白ひげ海賊団１番隊隊長', '', 'LMarco', 'QMarco' ],
+    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長', '', 'LMarco', 'QMarco' ],
+    650: ['ナミ 航海の記録・麦わらの一味', '', 'Log Nami', 'Nami, Wakes of the Endless Dream, Straw Hat Crew' ],
+    651: ['ナミ 航海の夢「世界地図」', '', 'Log Nami', 'Nami, A Vow in the Great Age of Pirates - World Map' ],
+    652: ['鉄仮面のデュバル', '', 'Raid Duval' ],
+    653: ['デュバル トビウオライダーズ ヘッド', '', 'Raid Duval' ],
+    654: ['デュバル 人生バラ色ライダーズ ヘッド', '', 'Raid Duval' ],
+    655: ['海賊アーロン', '', 'Young Arlong' ],
+    656: ['アーロン タイヨウの海賊団', '', 'Young Arlong' ],
+    657: ['クロオビ タイヨウの海賊団', '', 'Young Kuroobi' ],
+    658: ['チュウ タイヨウの海賊団', '', 'Young Choo' ],
+    659: ['モンキー・D・ルフィ うきわ', '', 'Summertime Luffy', 'Swimsuit Luffy' ],
     660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp', 'Usopp, Wakes of the Endless Dream, Straw Hat Crew' ],
-    661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp', 'Usopp, A Vow in the Great Age of Pirates - Brave Sea Warrior' ],
-    662: ['ナミ バカンス', '', 'Summertime Nami', 'Swimsuit Nami'],
-    663: ['ネフェルタリ・ビビ アラバスタ王国王女','','Young Vivi'],
-    664: ['ネフェルタリ・ビビ 砂砂団　副リーダー','','Young Vivi'],
-    665: ['コーザ アラバスタ住民','','Young Koza'],
-    666: ['コーザ 砂砂団　リーダー','','Young Koza'],
-    667: ['ネフェルタリ・コブラ アラバスタ王国国王',''],
-    668: ['サボ',''],
-    669: ['サボ 革命軍',''],
-    670: ['コアラ',''],
-    671: ['コアラ 革命軍',''],
-    672: ['ハック',''],
-    673: ['ハック 革命軍',''],
-    674: ['エンポリオ・イワンコフ ニューカマー拳法　師範','','INTvankov'],
-    675: ['エンポリオ・イワンコフ 革命軍','','INTvankov'],
-    676: ['イナズマ',''],
-    677: ['イナズマ 革命軍',''],
-    678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin', 'Nico Robin, Wakes of the Endless Dream, Straw Hat Crew' ],
-    679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」','', 'Log Robin', 'Nico Robin, A Vow in the Great Age of Pirates - 100-Year Void' ],
-    680: ['アイス大好きナミ','','Summertime Nami','Swimsuit Nami'],
-    681: ['アイス大好きナミ レモンアイス','','Summertime Nami','Swimsuit Nami'],
-    682: ['アイス大好きロビン','','Summertime Robin','Swimsuit Robin'],
-    683: ['アイス大好きロビン チョコアイス','','Summertime Robin','Swimsuit Robin'],
-    684: ['アイス大好きペローナ','','Summertime Perona','Swimsuit Perona'],
-    685: ['アイス大好きペローナ ストロベリーアイス','','Summertime Perona','Swimsuit Perona'],
-    686: ['ビビのひとやすみ','', 'Summertime Vivi', 'Swimsuit Vivi' ],
-    687: ['カルガラ',''],
-    688: ['カルガラ シャンディアの大戦士',''],
-    689: ['モンブラン・ノーランド',''],
-    690: ['モンブラン・ノーランド ルブニール王国探検船提督',''],
-    691: ['ナギナタ伍長 海軍本部',''],
-    692: ['ピストル伍長 海軍本部',''],
-    693: ['サーベル伍長 海軍本部',''],
-    694: ['バズーカ伍長 海軍本部',''],
-    695: ['ナックル伍長 海軍本部',''],
-    696: ['ナギナタ少佐 海軍本部',''],
-    697: ['ピストル少佐 海軍本部',''],
-    698: ['サーベル少佐 海軍本部',''],
-    699: ['バズーカ少佐 海軍本部',''],
-    700: ['ナックル少佐 海軍本部',''],
-    701: ['オイモ',''],
-    702: ['カーシ―',''],
-    703: ['法の番犬部隊',''],
-    704: ['有罪陪審員',''],
-    705: ['３つ首のバスカビル',''],
-    706: ['ブルーノ サイファーポールNo.9',''],
-    707: ['ブルーノ 六式 サイファーポールNo.9',''],
-    708: ['ニコ・ロビン 悪魔の子',''],
-    709: ['ニコ・ロビン 麦わらの一味',''],
-    710: ['フランキー 航海の記録・麦わらの一味','', 'Log Franky', 'Franky, Wakes of the Endless Dream, Straw Hat Crew' ],
-    711: ['フランキー 航海の夢「海の果てを旅する船」','', 'Log Franky', 'Franky, A Vow in the Great Age of Pirates - Ship of the Seven Seas' ],
-    712: ['ガン・フォール','','Gan Fall','ganfall'],
-    713: ['ガン・フォール 空の騎士','','Gan Fall the Knight of the Sky','ganfall'],
-    714: ['ピエール',''],
-    715: ['コニス',''],
-    716: ['コニス スカイピアの少女',''],
-    717: ['ジュラキュール・ミホーク 王下七武海','','INThawk'],
-    718: ['鷹の目のミホーク 世界最強の剣士','','INThawk'],
-    719: ['サー・クロコダイル　ロギア 王下七武海',''],
-    720: ['サー・クロコダイル　ロギア 元王下七武海',''],
-    721: ['ジェリー',''],
-    722: ['ジェリー サイファーポールNo.6',''],
-    723: ['Tボーン',''],
-    724: ['船斬りTボーン 海軍本部大佐',''],
-    725: ['ネフェルタリ・ビビ 航海の記録・アラバスタ王国王女','', 'Log Vivi' ],
-    726: ['ネフェルタリ・ビビ 航海の夢「海賊女王」','', 'Log Vivi' ],
-    727: ['モンキー・D・ルフィ ゴムゴムの銃乱打 (ガトリング)',''],
-    728: ['カリファ サイファーポールNo.9','', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
-    729: ['カリファ　六式 サイファーポールNo.9','', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
-    730: ['ジャブラ サイファーポールNo.9','','Jabura'],
-    731: ['ジャブラ　六式 サイファーポールNo.9','','Jabura'],
-    732: ['フクロウ サイファーポールNo.9',''],
-    733: ['フクロウ　六式 サイファーポールNo.9',''],
-    734: ['クマドリ サイファーポールNo.9',''],
-    735: ['クマドリ　六式 サイファーポールNo.9',''],
-    736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）','','Box Kaku'],
-    737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）','','rob lucci'],
-    738: ['スパンダム',''],
-    739: ['フランキー 麦わらの一味',''],
-    740: ['ネロ',''],
-    741: ['ネロ サイファーポールNo.9',''],
-    742: ['ワンゼ',''],
-    743: ['ワンゼ サイファーポールNo.7',''],
-    744: ['ポートガス・D・エース 航海の記録・白ひげ海賊団','', 'Log Ace' ],
-    745: ['ポートガス・D・エース 航海の夢「海賊の高み」','', 'Log Ace' ],
-    746: ['メガロ＆しらほし姫',''],
-    747: ['ロブ・ルッチ 闇の正義の「ＣＰ９」',''],
-    748: ['ロブ・ルッチ 歴代最強の「ＣＰ９」',''],
-    749: ['カク 闇の正義の「ＣＰ９」',''],
-    750: ['カク 歴代最強の「ＣＰ９」',''],
-    751: ['カリファ 闇の正義の「ＣＰ９」','', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
-    752: ['カリファ 歴代最強の「ＣＰ９」','', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
-    753: ['ジャブラ 闇の正義の「ＣＰ９」','','Jabura'],
-    754: ['ジャブラ 歴代最強の「ＣＰ９」','','Jabura'],
-    755: ['ブルーノ 闇の正義の「ＣＰ９」',''],
-    756: ['ブルーノ 歴代最強の「ＣＰ９」',''],
-    757: ['フクロウ 闇の正義の「ＣＰ９」',''],
-    758: ['フクロウ 歴代最強の「ＣＰ９」',''],
-    759: ['クマドリ 闇の正義の「ＣＰ９」',''],
-    760: ['クマドリ 歴代最強の「ＣＰ９」',''],
-    761: ['モンキー・D・ルフィ ハロウィンモンスター','', 'Halloween Luffy' ],
-    762: ['ウソップ うそつき狼','', 'Halloween Usopp' ],
-    763: ['フランキー フランケンシュタイン','', 'Halloween Franky' ],
-    764: ['ナミ かぼちゃランタン','', 'Halloween Nami' ],
-    765: ['トニートニー・チョッパー リトルヴァンパイア','', 'Halloween Chopper' ],
-    766: ['ロロノア・ゾロ ジャック・ザ・リッパ―','', 'Halloween Zoro' ],
-    767: ['ニコ・ロビン セクシーデビル','', 'Halloween Robin' ],
-    768: ['サンジ ゴーストナイト','', 'Halloween Sanji' ],
-    769: ['ブルック こわがりスケルトン','', 'Halloween Brook' ],
-    770: ['ダルメシアン 海軍本部中将','','Raid Dalmatian'],
-    771: ['モモンガ 海軍本部中将','','Raid Momonga'],
-    772: ['オニグモ 海軍本部中将','','Raid Onigumo'],
-    773: ['シュウ','','Raid Shu'],
-    774: ['ベリーグッド','','Very Good','Raid Berry Good'],
-    775: ['ストロベリー 海軍本部中将','','Raid Strawberry'],
-    776: ['ラッキー・ルウ','','Coliseum Lucky Roo'],
-    777: ['ラッキー・ルウ 赤髪海賊団','','Coliseum Lucky Roo'],
-    778: ['レベッカ 囚人剣闘士','','Coliseum Rebecca'],
-    779: ['レベッカ コロシアム専属剣闘士','','Coliseum Rebecca'],
-    780: ['ウルージ 破戒僧海賊団船長','','Supernova','Coliseum Urouge'],
-    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova','Coliseum Urouge'],
-    782: ['たしぎ 正義の華','', 'Kimono Tashigi' ],
-    783: ['たしぎ 海軍本部少尉・正義の華','', 'Kimono Tashigi' ],
-    784: ['ゲンさん',''],
-    785: ['ゲンゾウ ココヤシ村の駐在',''],
-    786: ['Dr.ヒルルク','', 'Dr. Hiruruk', 'Dr Hiruruk'],
-    787: ['Dr.ヒルルク ヤブ医者','', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
-    788: ['くいな',''],
-    789: ['くいな シモツキ村の少女剣士',''],
-    790: ['たまねぎ＆ピーマン＆にんじん','', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
-    791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団','', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
-    792: ['アイスバーグ','', 'Iceberg' ],
-    793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
-    794: ['モンキー・D・ルフィ 希望の星','','Raid NM Luffy', 'Raid Luffy'],
-    795: ['ナイトメア・ルフィ 希望の戦士','','Raid NM Luffy', 'Raid Luffy'],
-    796: ['ブリード',''],
-    797: ['ブリード ペトペトの実の能力者',''],
-    798: ['クンフージュゴン 海獣海賊団',''],
-    799: ['シーラパーン 海獣海賊団','', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
-    800: ['たこボクサー 海獣海賊団',''],
-    801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','mr 2' ],
-    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
-    803: ['ヒナ 海軍本部大佐','','Coliseum Hina'],
-    804: ['黒檻のヒナ 海軍本部大佐','','Coliseum Hina'],
-    805: ['スモーカー 海軍本部大佐','','Coliseum Smoker'],
-    806: ['白猟のスモーカー 海軍本部大佐','','Coliseum Smoker'],
-    807: ['純白の天使ナミ ウエディング','','Bridal Nami'],
-    808: ['純白の女神ナミ ウエディング','','Bridal Nami'],
-    809: ['ローラ スリラーバークの花嫁',''],
-    810: ['求愛のローラ スリラーバークの花嫁',''],
-    811: ['リスキー兄弟',''],
-    812: ['ケルベロス',''],
-    813: ['タララン','', 'Spider Monkey' ],
-    814: ['敷きグマ',''],
-    815: ['ゲッコー・モリア スリラーバークの怪人','', 'Gekko Moriah, Thriller Bark\'s Mysterious Four'],
-    816: ['ゲッコー・モリア スリラーバークの支配者','', 'Gekko Moriah, Ruler of Thriller Bark'],
-    817: ['ソルジャーゾンビ　力自慢の影',''],
-    818: ['ソルジャーゾンビ　素早さの影',''],
-    819: ['ソルジャーゾンビ　悪巧みの影',''],
-    820: ['ソルジャーゾンビ　憎しみの影',''],
-    821: ['ソルジャーゾンビ　自尊心の影',''],
-    822: ['トリッキー・ワイルドゾンビ',''],
-    823: ['インテリ・ワイルドゾンビ',''],
-    824: ['ハートフル・ワイルドゾンビ',''],
-    825: ['ジェネラルゾンビ　怪力の影',''],
-    826: ['ジェネラルゾンビ　奇技の影',''],
-    827: ['ジェネラルゾンビ　疾速の影',''],
-    828: ['？？？','','Kid Law','Young Law'],
-    829: ['？？？','','Kid Law','Young Law'],
-    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum Hawkins', 'Coliseum Basil Hawkins'],
-    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova','Coliseum Hawkins', 'Coliseum Basil Hawkins'],
-    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Coliseum Wyper' ],
-    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Coliseum Wyper' ],
-    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day', 'Coliseum Mr 7', 'Coliseum Miss Fathers Day'],
-    835: ['暴君バーソロミュー・くま','','Raid Kuma'],
-    836: ['暴君バーソロミュー・くま 政府の人間兵器','','Raid Kuma'],
-    837: ['シーザー・クラウン',''],
-    838: ['Ｍ（マスター）・シーザー',''],
-    839: ['ヴェルゴ',''],
-    840: ['ヴェルゴ ドンキホーテ海賊団',''],
-    841: ['モネ',''],
-    842: ['モネ ドンキホーテ海賊団',''],
-    843: ['ベビー５',''],
-    844: ['ベビー５ ドンキホーテ海賊団',''],
-    845: ['バッファロー',''],
-    846: ['バッファロー ドンキホーテ海賊団',''],
-    847: ['トム トムズ　ワーカーズ',''],
-    848: ['伝説の船大工トム トムズ　ワーカーズ',''],
-    849: ['カティ・フラム トムズ　ワーカーズ','', 'Franky, Tom\'s Workers','Young Franky' ],
-    850: ['アイスバーグ トムズ　ワーカーズ','', 'Iceburg, Tom\'s Workers','Young Iceberg' ],
-    851: ['ブリキのワポル',''],
-    852: ['スリムアップワポル',''],
-    853: ['ロブソン',''],
-    854: ['チョッパーの雪遊び','', 'Winter Chopper'],
-    855: ['トラファルガー・ロー 聖夜の紳士','','Supernova','Christmas Law','CLaw'],
-    856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova','Christmas Law','CLaw'],
-    857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova'],
-    858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ','','Supernova'],
-    859: ['コビー 海軍本部曹長','','Coliseum Coby'],
-    860: ['戦火の勇士コビー 海軍本部曹長','','Coliseum Coby'],
-    861: ['レディー・アルビダ うるわしき美女','','Coliseum Alvida'],
-    862: ['レディー・アルビダ 絶世の美女','','Coliseum Alvida'],
-    863: ['銀世界のナミ','', 'Winter Nami'],
-    864: ['ボア・ハンコック 九蛇海賊団船長','','Raid Boa'],
-    865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid Boa'],
-    866: ['ニコ・ロビン 百花繚乱 ウイング“華”','', 'Kimono Robin' ],
-    867: ['ウソップ タバスコ星“撃”','', 'Kimono Usopp' ],
-    868: ['トニートニー・チョッパー 重量ゴング“獣”','', 'Kimono Chopper' ],
-    869: ['ドンキホーテ・ドフラミンゴ ドンキホーテ海賊団','', 'Doffy' ],
-    870: ['天夜叉ドフラミンゴ','', 'Doffy' ],
-    871: ['シュガー',''],
-    872: ['シュガー ドンキホーテ海賊団',''],
-    873: ['セニョール・ピンク','', 'Senor Pink', 'Senior Pink' ],
-    874: ['セニョール・ピンク ドンキホーテ海賊団','', 'Senor Pink', 'Senior Pink' ],
-    875: ['トレーボル',''],
-    876: ['トレーボル ドンキホーテ海賊団',''],
-    877: ['ジョーラ','', 'Giolla', 'Jora' ],
-    878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates', 'Jora' ],
-    879: ['ラオＧ',''],
-    880: ['ラオＧ ドンキホーテ海賊団',''],
-    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum Apoo'],
-    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova','Coliseum Apoo'],
-    883: ['ドリー 巨兵海賊団','','Coliseum Dorry'],
-    884: ['青鬼のドリー','','Coliseum Dorry'],
-    885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
-    886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
-    887: ['バギー 陽気なかぶき者','', 'Kimono Buggy', 'Baggy'],
-    888: ['ホロホロゴースト',''],
-    889: ['ペローナ スリラーバークの怪人',''],
-    890: ['ペローナ 巨大なゴーストプリンセス',''],
-    891: ['ドクトル・ホグバック スリラーバークの怪人',''],
-    892: ['墓場のアブサロム スリラーバークの怪人',''],
-    893: ['オーズ 特別ゾンビ',''],
-    894: ['ゲッコー・モリア 影の集合地（シャドーズ・アスガルド）','', 'Gekko Moriah, Shadow\'s Asgard'],
-    895: ['ブルック 紳士なガイコツ',''],
-    896: ['ブルック 麦わらの一味',''],
-    897: ['サー・クロコダイル 砂の武将','', 'Kimono Crocodile' ],
-    898: ['Mr.3 姑息な楽士','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
-    899: ['Mr.2・ボン・クレー あやふやな侍','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
-    900: ['フレッシュ・フランキー 健康第一','','Coliseum Franky'],
-    901: ['鉄人（サイボーグ）フランキー','','Coliseum Franky'],
-    902: ['ブロギー 巨兵海賊団','','Coliseum Broggy'],
-    903: ['赤鬼のブロギー','','Coliseum Broggy'],
-    904: ['ヨコヅナ','','Coliseum Yokozuna'],
-    905: ['ロロノア・ゾロ クライガナ島をさすらう剣士','','3D2Y Zoro','Timeskip Zoro'],
-    906: ['ロロノア・ゾロ 世界最強剣士の門弟','','3D2Y Zoro','Timeskip Zoro'],
-    907: ['ニコ・ロビン テキーラウルフの収監者','','3D2Y Robin','Timeskip Robin'],
-    908: ['ニコ・ロビン 革命の灯火（ともしび）','','3D2Y Robin','Timeskip Robin'],
-    909: ['トニートニー・チョッパー トリノ王国の平和の架け橋','','3D2Y Chopper','Timeskip Chopper'],
-    910: ['チョッパーマスク 世界の平和を守るヒーロー','','3D2Y Chopper','Timeskip Chopper'],
-    911: ['サンジ カマバッカ王国の逃走者','','3D2Y Sanji','Timeskip Sanji'],
-    912: ['サンジ 男を懸けた愛の料理人','','3D2Y Sanji','Timeskip Sanji'],
-    913: ['ブルック ハラヘッターニャの悪魔王','','3D2Y Brook','Timeskip Brook'],
-    914: ['ブルック 骨（ボーン） to be wild!!!','','3D2Y Brook','Timeskip Brook'],
-    915: ['ニコ・ロビン オハラの花嫁','','Wedding Nico Robin'],
-    916: ['麗らかな才女 ロビン ウエディング','','Bride Nico Robin'],
-    917: ['マーガレット',''],
-    918: ['マーガレット 護国の戦士',''],
-    919: ['アフェランドラ',''],
-    920: ['スイトピー','', 'Sweet Pea'],
-    921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
-    922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
-    923: ['南の海のキャプテン・キッド','','Coliseum Kid', 'Coliseum Kidd'],
-    924: ['キャプテン・キッド キッド海賊団船長','','Coliseum Kid', 'Coliseum Kidd'],
-    925: ['獄卒長サディちゃん','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
-    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
-    927: ['ドーベルマン 海軍本部中将','','Coliseum Doberman'],
-    928: ['ハンニャバル','','Hannibal'],
-    929: ['ハンニャバル','','Hannibal'],
-    930: ['サルデス',''],
-    931: ['ブルゴリ ','','Blue Gorilla'],
-    932: ['ピーカ','','Raid Pica'],
-    933: ['ピーカ ドンキホーテ海賊団','','Raid Pica'],
-    934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
-    935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
-    936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者','','Timeskip Luffy','3D2Y Luffy'],
-    937: ['モンキー・Ｄ・ルフィ 仲間との誓い『３Ｄ２Ｙ』','','Timeskip Luffy','3D2Y Luffy'],
-    938: ['ナミ 天候の科学の探求者','','Timeskip Nami','3D2Y Nami'],
-    939: ['ナミ 空島ウェザリアの泥棒ネコ','','Timeskip Nami','3D2Y Nami'],
-    940: ['ウソップ ボーイン列島の大食漢','','Timeskip Usopp','3D2Y Usopp'],
-    941: ['ウソップ おいはぎの森の果敢な戦士','','Timeskip Usopp','3D2Y Usopp'],
-    942: ['フランキー メカアニマルと戦う改造人間','','Timeskip Franky','3D2Y Franky'],
-    943: ['鉄人（サイボーグ）フランキー バルジモアの霊獣','','Timeskip Franky','3D2Y Franky'],
-    944: ['？？？','','Wedding Perona'],
-    945: ['？？？','','Bride Perona'],
-    946: ['ラクヨウ 白ひげ海賊団７番隊隊長',''],
-    947: ['フォッサ 白ひげ海賊団１５番隊隊長',''],
-    948: ['クリエル 白ひげ海賊団１０番隊隊長',''],
-    949: ['サッチ 白ひげ海賊団４番隊隊長',''],
-    950: ['火拳のエース','','Coliseum Ace'],
-    951: ['火拳のエース 白ひげ海賊団２番隊隊長','', 'Coliseum Ace'],
-    952: ['ベン・ベックマン','', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman'],
-    953: ['ベン・ベックマン 赤髪海賊団','', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman'],
-    954: ['ギャロ',''],
-    955: ['マクロ','','Makuro'],
-    956: ['タンスイ',''],
-    957: ['早業のガンマン 青のボディガード',''],
-    958: ['計略のガンマン 黒のボディガード',''],
-    959: ['技巧のガンマン 緑のボディガード',''],
-    960: ['速攻のガンマン 青のボディガード',''],
-    961: ['豪腕のガンマン 赤のボディガード',''],
-    962: ['強心のガンマン 黄のボディガード',''],
-    963: ['チャルロス聖',''],
-    964: ['ロズワード聖',''],
-    965: ['シャルリア宮',''],
-    966: ['ユースタス・キッド 超新星（スーパールーキー）','', 'Story Kidd'],
-    967: ['トラファルガー・ロー 超新星（スーパールーキー）',''],
-    968: ['パシフィスタ　ＰＸ－1',''],
-    969: ['パシフィスタ　ＰＸ－2',''],
-    970: ['パシフィスタ　ＰＸ－３',''],
-    971: ['パシフィスタ　ＰＸ－４',''],
-    972: ['パシフィスタ　ＰＸ－５',''],
-    973: ['戦桃丸','','Sentoumaru'],
-    974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
-    975: ['スモーカー あらくれの一匹オオカミ','','Kid Smoker'],
-    976: ['スモーカー 孤高の一匹オオカミ','','Kid Smoker'],
-    977: ['黄猿','','Raid Borsalino', 'Raid Kizaru'],
-    978: ['黄猿　光人間','','Raid Borsalino', 'Raid Kizaru'],
-    979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
-    980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
-    981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
-    982: ['ビスタ 白ひげ海賊団５番隊隊長','','Coliseum Vista'],
-    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Coliseum Vista'],
-    984: ['パウリー ガレーラカンパニー１番ドック職長','','Coliseum Paulie'],
-    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
-    986: ['ココア＆のらギツネ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
-    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
-    988: ['マウンブルテン＆トルコ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
-    989: ['ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
-    990: ['マッハ・バイス','','Mach Vise'],
-    991: ['マッハ・バイス ドンキホーテ海賊団', '', 'Mach Vise'],
-    992: ['グラディウス',''],
-    993: ['グラディウス ドンキホーテ海賊団',''],
-    994: ['ヴァイオレット','', 'Viola'],
-    995: ['ヴァイオレット ドンキホーテ海賊団','', 'Viola'],
-    996: ['デリンジャー',''],
-    997: ['デリンジャー ドンキホーテ海賊団',''],
-    998: ['ディアマンテ',''],
-    999: ['ディアマンテ ドンキホーテ海賊団',''],
-    1000: ['コラソン ドンキホーテ海賊団','','Rocinante','Rosinante'],
-    1001: ['ドンキホーテ・ロシナンテ','','Rocinante','Corazon'],
-    1002: ['ベポ ハートの海賊団',''],
-    1003: ['武闘家のベポ ハートの海賊団',''],
-    1004: ['シャチ＆ペンギン ハートの海賊団',''],
-    1005: ['ジャンバール',''],
-    1006: ['ジャンバール ハートの海賊団',''],
-    1007: ['モネ　寒桜','','Sakura Monet'],
-    1008: ['モネ　大寒桜','','Sakura Monet'],
-    1009: ['キズナBOOOOSTルフィ','', 'Afro Luffy', 'Afroluffy' ],
-    1010: ['バトラー伯爵',''],
-    1011: ['バトラー伯爵（王なる力）',''],
-    1012: ['ヘビー総裁',''],
-    1013: ['ホットドッグ将軍',''],
-    1014: ['トニートニー・チョッパー 動物王',''],
-    1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Coliseum Capone Bege'],
-    1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Coliseum Capone Bege'],
-    1017: ['茶ひげ','','Coliseum Brownbeard'],
-    1018: ['茶ひげ ワニのケンタウロス','','Coliseum Brownbeard'],
-    1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum Lulu'],
-    1020: ['シュガー　実桜','','Sakura Sugar'],
-    1021: ['シュガー　桜桃','','Sakura Sugar'],
-    1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
-    1023: ['ポートガス・D・エース 海賊王に馳せた夢',''],
-    1024: ['首領・チンジャオ','Don Chinjao'],
-    1025: ['首領・チンジャオ 花ノ国のギャング','Don Chinjao'],
-    1026: ['ブルーギリー',''],
-    1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）',''],
-    1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ',''],
-    1029: ['ファンク兄弟 モガロ王国の殺し屋',''],
-    1030: ['ハイルディン',''],
-    1031: ['ハイルディン 海賊傭兵',''],
-    1032: ['アブドーラ＆ジェット','','Abdullah and Jeet'],
-    1033: ['アブドーラ＆ジェット 元賞金稼ぎ','','Abdullah and Jeet, Former Bounty Hunters'],
-    1034: ['バルトロメオ',''],
-    1035: ['人食いのバルトロメオ',''],
-    1036: ['エンポリオ・イワンコフ 秘密の花園の女王',''],
-    1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
-    1038: ['イナズマ 秘密の花園の乙女',''],
-    1039: ['イナズマ 変革を画策する乙女',''],
-    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum Jozu' ],
-    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum Jozu' ],
-    1042: [ 'キラー キッド海賊団', '','Coliseum Killer' ],
-    1043: [ '“殺戮武人”キラー キッド海賊団', '','Coliseum Killer' ],
-    1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
-    1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
-    1046: [ 'サボ 竜の爪', '','Raid Sabo' ],
-    1047: [ 'サボ 革命軍参謀総長', '','Raid Sabo' ],
+    661: ['ウソップ 航海の夢「勇敢なる海の戦士」', '', 'Log Usopp', 'Usopp, A Vow in the Great Age of Pirates - Brave Sea Warrior' ],
+    662: ['ナミ バカンス', '', 'Summertime Nami', 'Swimsuit Nami' ],
+    663: ['ネフェルタリ・ビビ アラバスタ王国王女', '', 'Young Vivi' ],
+    664: ['ネフェルタリ・ビビ 砂砂団　副リーダー', '', 'Young Vivi' ],
+    665: ['コーザ アラバスタ住民', '', 'Young Koza' ],
+    666: ['コーザ 砂砂団　リーダー', '', 'Young Koza' ],
+    667: ['ネフェルタリ・コブラ アラバスタ王国国王', '' ],
+    668: ['サボ', '' ],
+    669: ['サボ 革命軍', '' ],
+    670: ['コアラ', '' ],
+    671: ['コアラ 革命軍', '' ],
+    672: ['ハック', '' ],
+    673: ['ハック 革命軍', '' ],
+    674: ['エンポリオ・イワンコフ ニューカマー拳法　師範', '', 'INTvankov' ],
+    675: ['エンポリオ・イワンコフ 革命軍', '', 'INTvankov' ],
+    676: ['イナズマ', '' ],
+    677: ['イナズマ 革命軍', '' ],
+    678: ['ニコ・ロビン 航海の記録・麦わらの一味', '', 'Log Robin', 'Nico Robin, Wakes of the Endless Dream, Straw Hat Crew' ],
+    679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」', '', 'Log Robin', 'Nico Robin, A Vow in the Great Age of Pirates - 100-Year Void' ],
+    680: ['アイス大好きナミ', '', 'Summertime Nami', 'Swimsuit Nami' ],
+    681: ['アイス大好きナミ レモンアイス', '', 'Summertime Nami', 'Swimsuit Nami' ],
+    682: ['アイス大好きロビン', '', 'Summertime Robin', 'Swimsuit Robin' ],
+    683: ['アイス大好きロビン チョコアイス', '', 'Summertime Robin', 'Swimsuit Robin' ],
+    684: ['アイス大好きペローナ', '', 'Summertime Perona', 'Swimsuit Perona' ],
+    685: ['アイス大好きペローナ ストロベリーアイス', '', 'Summertime Perona', 'Swimsuit Perona' ],
+    686: ['ビビのひとやすみ', '', 'Summertime Vivi', 'Swimsuit Vivi' ],
+    687: ['カルガラ', '' ],
+    688: ['カルガラ シャンディアの大戦士', '' ],
+    689: ['モンブラン・ノーランド', '' ],
+    690: ['モンブラン・ノーランド ルブニール王国探検船提督', '' ],
+    691: ['ナギナタ伍長 海軍本部', '' ],
+    692: ['ピストル伍長 海軍本部', '' ],
+    693: ['サーベル伍長 海軍本部', '' ],
+    694: ['バズーカ伍長 海軍本部', '' ],
+    695: ['ナックル伍長 海軍本部', '' ],
+    696: ['ナギナタ少佐 海軍本部', '' ],
+    697: ['ピストル少佐 海軍本部', '' ],
+    698: ['サーベル少佐 海軍本部', '' ],
+    699: ['バズーカ少佐 海軍本部', '' ],
+    700: ['ナックル少佐 海軍本部', '' ],
+    701: ['オイモ', '' ],
+    702: ['カーシ―', '' ],
+    703: ['法の番犬部隊', '' ],
+    704: ['有罪陪審員', '' ],
+    705: ['３つ首のバスカビル', '' ],
+    706: ['ブルーノ サイファーポールNo.9', '' ],
+    707: ['ブルーノ 六式 サイファーポールNo.9', '' ],
+    708: ['ニコ・ロビン 悪魔の子', '' ],
+    709: ['ニコ・ロビン 麦わらの一味', '' ],
+    710: ['フランキー 航海の記録・麦わらの一味', '', 'Log Franky', 'Franky, Wakes of the Endless Dream, Straw Hat Crew' ],
+    711: ['フランキー 航海の夢「海の果てを旅する船」', '', 'Log Franky', 'Franky, A Vow in the Great Age of Pirates - Ship of the Seven Seas' ],
+    712: ['ガン・フォール', '', 'Gan Fall', 'ganfall' ],
+    713: ['ガン・フォール 空の騎士', '', 'Gan Fall the Knight of the Sky', 'ganfall' ],
+    714: ['ピエール', '' ],
+    715: ['コニス', '' ],
+    716: ['コニス スカイピアの少女', '' ],
+    717: ['ジュラキュール・ミホーク 王下七武海', '', 'INThawk' ],
+    718: ['鷹の目のミホーク 世界最強の剣士', '', 'INThawk' ],
+    719: ['サー・クロコダイル　ロギア 王下七武海', '' ],
+    720: ['サー・クロコダイル　ロギア 元王下七武海', '' ],
+    721: ['ジェリー', '' ],
+    722: ['ジェリー サイファーポールNo.6', '' ],
+    723: ['Tボーン', '' ],
+    724: ['船斬りTボーン 海軍本部大佐', '' ],
+    725: ['ネフェルタリ・ビビ 航海の記録・アラバスタ王国王女', '', 'Log Vivi' ],
+    726: ['ネフェルタリ・ビビ 航海の夢「海賊女王」', '', 'Log Vivi' ],
+    727: ['モンキー・D・ルフィ ゴムゴムの銃乱打 (ガトリング)', '' ],
+    728: ['カリファ サイファーポールNo.9', '', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
+    729: ['カリファ　六式 サイファーポールNo.9', '', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
+    730: ['ジャブラ サイファーポールNo.9', '', 'Jabura' ],
+    731: ['ジャブラ　六式 サイファーポールNo.9', '', 'Jabura' ],
+    732: ['フクロウ サイファーポールNo.9', '' ],
+    733: ['フクロウ　六式 サイファーポールNo.9', '' ],
+    734: ['クマドリ サイファーポールNo.9', '' ],
+    735: ['クマドリ　六式 サイファーポールNo.9', '' ],
+    736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）', '', 'Box Kaku' ],
+    737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）', '', 'rob lucci' ],
+    738: ['スパンダム', '' ],
+    739: ['フランキー 麦わらの一味', '' ],
+    740: ['ネロ', '' ],
+    741: ['ネロ サイファーポールNo.9', '' ],
+    742: ['ワンゼ', '' ],
+    743: ['ワンゼ サイファーポールNo.7', '' ],
+    744: ['ポートガス・D・エース 航海の記録・白ひげ海賊団', '', 'Log Ace' ],
+    745: ['ポートガス・D・エース 航海の夢「海賊の高み」', '', 'Log Ace' ],
+    746: ['メガロ＆しらほし姫', '' ],
+    747: ['ロブ・ルッチ 闇の正義の「ＣＰ９」', '' ],
+    748: ['ロブ・ルッチ 歴代最強の「ＣＰ９」', '' ],
+    749: ['カク 闇の正義の「ＣＰ９」', '' ],
+    750: ['カク 歴代最強の「ＣＰ９」', '' ],
+    751: ['カリファ 闇の正義の「ＣＰ９」', '', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
+    752: ['カリファ 歴代最強の「ＣＰ９」', '', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
+    753: ['ジャブラ 闇の正義の「ＣＰ９」', '', 'Jabura' ],
+    754: ['ジャブラ 歴代最強の「ＣＰ９」', '', 'Jabura' ],
+    755: ['ブルーノ 闇の正義の「ＣＰ９」', '' ],
+    756: ['ブルーノ 歴代最強の「ＣＰ９」', '' ],
+    757: ['フクロウ 闇の正義の「ＣＰ９」', '' ],
+    758: ['フクロウ 歴代最強の「ＣＰ９」', '' ],
+    759: ['クマドリ 闇の正義の「ＣＰ９」', '' ],
+    760: ['クマドリ 歴代最強の「ＣＰ９」', '' ],
+    761: ['モンキー・D・ルフィ ハロウィンモンスター', '', 'Halloween Luffy' ],
+    762: ['ウソップ うそつき狼', '', 'Halloween Usopp' ],
+    763: ['フランキー フランケンシュタイン', '', 'Halloween Franky' ],
+    764: ['ナミ かぼちゃランタン', '', 'Halloween Nami' ],
+    765: ['トニートニー・チョッパー リトルヴァンパイア', '', 'Halloween Chopper' ],
+    766: ['ロロノア・ゾロ ジャック・ザ・リッパ―', '', 'Halloween Zoro' ],
+    767: ['ニコ・ロビン セクシーデビル', '', 'Halloween Robin' ],
+    768: ['サンジ ゴーストナイト', '', 'Halloween Sanji' ],
+    769: ['ブルック こわがりスケルトン', '', 'Halloween Brook' ],
+    770: ['ダルメシアン 海軍本部中将', '', 'Raid Dalmatian' ],
+    771: ['モモンガ 海軍本部中将', '', 'Raid Momonga' ],
+    772: ['オニグモ 海軍本部中将', '', 'Raid Onigumo' ],
+    773: ['シュウ', '', 'Raid Shu' ],
+    774: ['ベリーグッド', '', 'Very Good', 'Raid Berry Good' ],
+    775: ['ストロベリー 海軍本部中将', '', 'Raid Strawberry' ],
+    776: ['ラッキー・ルウ', '', 'Coliseum Lucky Roo' ],
+    777: ['ラッキー・ルウ 赤髪海賊団', '', 'Coliseum Lucky Roo' ],
+    778: ['レベッカ 囚人剣闘士', '', 'Coliseum Rebecca' ],
+    779: ['レベッカ コロシアム専属剣闘士', '', 'Coliseum Rebecca' ],
+    780: ['ウルージ 破戒僧海賊団船長', '', 'Supernova Urouge', 'Coliseum Urouge' ],
+    781: ['怪僧ウルージ 破戒僧海賊団船長', '', 'Supernova Urouge', 'Coliseum Urouge' ],
+    782: ['たしぎ 正義の華', '', 'Kimono Tashigi' ],
+    783: ['たしぎ 海軍本部少尉・正義の華', '', 'Kimono Tashigi' ],
+    784: ['ゲンさん', '' ],
+    785: ['ゲンゾウ ココヤシ村の駐在', '' ],
+    786: ['Dr.ヒルルク', '', 'Dr. Hiruruk', 'Dr Hiruruk' ],
+    787: ['Dr.ヒルルク ヤブ医者', '', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
+    788: ['くいな', '' ],
+    789: ['くいな シモツキ村の少女剣士', '' ],
+    790: ['たまねぎ＆ピーマン＆にんじん', '', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
+    791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団', '', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
+    792: ['アイスバーグ', '', 'Iceberg' ],
+    793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長', '', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
+    794: ['モンキー・D・ルフィ 希望の星', '', 'Raid NM Luffy', 'Raid Luffy' ],
+    795: ['ナイトメア・ルフィ 希望の戦士', '', 'Raid NM Luffy', 'Raid Luffy' ],
+    796: ['ブリード', '' ],
+    797: ['ブリード ペトペトの実の能力者', '' ],
+    798: ['クンフージュゴン 海獣海賊団', '' ],
+    799: ['シーラパーン 海獣海賊団', '', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
+    800: ['たこボクサー 海獣海賊団', '' ],
+    801: ['Mr.2・ボン・クレー 航海の記録・B・W', '', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
+    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」', '', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
+    803: ['ヒナ 海軍本部大佐', '', 'Coliseum Hina' ],
+    804: ['黒檻のヒナ 海軍本部大佐', '', 'Coliseum Hina' ],
+    805: ['スモーカー 海軍本部大佐', '', 'Coliseum Smoker' ],
+    806: ['白猟のスモーカー 海軍本部大佐', '', 'Coliseum Smoker' ],
+    807: ['純白の天使ナミ ウエディング', '', 'Bridal Nami' ],
+    808: ['純白の女神ナミ ウエディング', '', 'Bridal Nami' ],
+    809: ['ローラ スリラーバークの花嫁', '' ],
+    810: ['求愛のローラ スリラーバークの花嫁', '' ],
+    811: ['リスキー兄弟', '' ],
+    812: ['ケルベロス', '' ],
+    813: ['タララン', '', 'Spider Monkey' ],
+    814: ['敷きグマ', '' ],
+    815: ['ゲッコー・モリア スリラーバークの怪人', '', 'Gekko Moriah, Thriller Bark\'s Mysterious Four' ],
+    816: ['ゲッコー・モリア スリラーバークの支配者', '', 'Gekko Moriah, Ruler of Thriller Bark' ],
+    817: ['ソルジャーゾンビ　力自慢の影', '' ],
+    818: ['ソルジャーゾンビ　素早さの影', '' ],
+    819: ['ソルジャーゾンビ　悪巧みの影', '' ],
+    820: ['ソルジャーゾンビ　憎しみの影', '' ],
+    821: ['ソルジャーゾンビ　自尊心の影', '' ],
+    822: ['トリッキー・ワイルドゾンビ', '' ],
+    823: ['インテリ・ワイルドゾンビ', '' ],
+    824: ['ハートフル・ワイルドゾンビ', '' ],
+    825: ['ジェネラルゾンビ　怪力の影', '' ],
+    826: ['ジェネラルゾンビ　奇技の影', '' ],
+    827: ['ジェネラルゾンビ　疾速の影', '' ],
+    828: ['？？？', '', 'Kid Law', 'Young Law' ],
+    829: ['？？？', '', 'Kid Law', 'Young Law' ],
+    830: ['バジル・ホーキンス ホーキンス海賊団船長', '', 'Supernova Hawkins', 'Coliseum Hawkins', 'Coliseum Basil Hawkins' ],
+    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長', '', 'Supernova Hawkins', 'Coliseum Hawkins', 'Coliseum Basil Hawkins' ],
+    832: ['ワイパー シャンディアの戦士', '', 'Wiper, Warrior of Shandia', 'Coliseum Wyper' ],
+    833: ['戦鬼ワイパー シャンディアの戦士', '', 'Berserker Wiper, Warrior of Shandia', 'Coliseum Wyper' ],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ', '', 'Mr 7 and Miss Fathers Day', 'Coliseum Mr 7', 'Coliseum Miss Fathers Day' ],
+    835: ['暴君バーソロミュー・くま', '', 'Raid Kuma' ],
+    836: ['暴君バーソロミュー・くま 政府の人間兵器', '', 'Raid Kuma' ],
+    837: ['シーザー・クラウン', '' ],
+    838: ['Ｍ（マスター）・シーザー', '' ],
+    839: ['ヴェルゴ', '' ],
+    840: ['ヴェルゴ ドンキホーテ海賊団', '' ],
+    841: ['モネ', '' ],
+    842: ['モネ ドンキホーテ海賊団', '' ],
+    843: ['ベビー５', '' ],
+    844: ['ベビー５ ドンキホーテ海賊団', '' ],
+    845: ['バッファロー', '' ],
+    846: ['バッファロー ドンキホーテ海賊団', '' ],
+    847: ['トム トムズ　ワーカーズ', '' ],
+    848: ['伝説の船大工トム トムズ　ワーカーズ', '' ],
+    849: ['カティ・フラム トムズ　ワーカーズ', '', 'Franky, Tom\'s Workers', 'Young Franky' ],
+    850: ['アイスバーグ トムズ　ワーカーズ', '', 'Iceburg, Tom\'s Workers', 'Young Iceberg' ],
+    851: ['ブリキのワポル', '' ],
+    852: ['スリムアップワポル', '' ],
+    853: ['ロブソン', '' ],
+    854: ['チョッパーの雪遊び', '', 'Winter Chopper' ],
+    855: ['トラファルガー・ロー 聖夜の紳士', '', 'Supernova Law', 'Christmas Law', 'CLaw' ],
+    856: ['トラファルガー・ロー 聖夜の貴公子', '', 'Supernova Law', 'Christmas Law', 'CLaw' ],
+    857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ', '', 'Supernova Bonney' ],
+    858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ', '', 'Supernova Bonney' ],
+    859: ['コビー 海軍本部曹長', '', 'Coliseum Coby' ],
+    860: ['戦火の勇士コビー 海軍本部曹長', '', 'Coliseum Coby' ],
+    861: ['レディー・アルビダ うるわしき美女', '', 'Coliseum Alvida' ],
+    862: ['レディー・アルビダ 絶世の美女', '', 'Coliseum Alvida' ],
+    863: ['銀世界のナミ', '', 'Winter Nami' ],
+    864: ['ボア・ハンコック 九蛇海賊団船長', '', 'Raid Boa' ],
+    865: ['女帝ボア・ハンコック 九蛇海賊団船長', '', 'Raid Boa' ],
+    866: ['ニコ・ロビン 百花繚乱 ウイング“華”', '', 'Kimono Robin' ],
+    867: ['ウソップ タバスコ星“撃”', '', 'Kimono Usopp' ],
+    868: ['トニートニー・チョッパー 重量ゴング“獣”', '', 'Kimono Chopper' ],
+    869: ['ドンキホーテ・ドフラミンゴ ドンキホーテ海賊団', '', 'Doffy' ],
+    870: ['天夜叉ドフラミンゴ', '', 'Doffy' ],
+    871: ['シュガー', '' ],
+    872: ['シュガー ドンキホーテ海賊団', '' ],
+    873: ['セニョール・ピンク', '', 'Senor Pink', 'Senior Pink' ],
+    874: ['セニョール・ピンク ドンキホーテ海賊団', '', 'Senor Pink', 'Senior Pink' ],
+    875: ['トレーボル', '' ],
+    876: ['トレーボル ドンキホーテ海賊団', '' ],
+    877: ['ジョーラ', '', 'Giolla', 'Jora' ],
+    878: ['ジョーラ ドンキホーテ海賊団', '', 'Giolla, Donquixote Pirates', 'Jora' ],
+    879: ['ラオＧ', '' ],
+    880: ['ラオＧ ドンキホーテ海賊団', '' ],
+    881: ['スクラッチメン・アプー オンエア海賊団船長', '', 'Supernova Apoo', 'Coliseum Apoo' ],
+    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長', '', 'Supernova Apoo', 'Coliseum Apoo' ],
+    883: ['ドリー 巨兵海賊団', '', 'Coliseum Dorry' ],
+    884: ['青鬼のドリー', '', 'Coliseum Dorry' ],
+    885: ['ジンベエ 鮫の武人', '', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
+    886: ['Mr.1 西の海の剣客', '', 'Kimono Mr. 1', 'Kimono Mr 1', 'daz bones' ],
+    887: ['バギー 陽気なかぶき者', '', 'Kimono Buggy', 'Baggy' ],
+    888: ['ホロホロゴースト', '' ],
+    889: ['ペローナ スリラーバークの怪人', '' ],
+    890: ['ペローナ 巨大なゴーストプリンセス', '' ],
+    891: ['ドクトル・ホグバック スリラーバークの怪人', '' ],
+    892: ['墓場のアブサロム スリラーバークの怪人', '' ],
+    893: ['オーズ 特別ゾンビ', '' ],
+    894: ['ゲッコー・モリア 影の集合地（シャドーズ・アスガルド）', '', 'Gekko Moriah, Shadow\'s Asgard' ],
+    895: ['ブルック 紳士なガイコツ', '' ],
+    896: ['ブルック 麦わらの一味', '' ],
+    897: ['サー・クロコダイル 砂の武将', '', 'Kimono Crocodile' ],
+    898: ['Mr.3 姑息な楽士', '', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
+    899: ['Mr.2・ボン・クレー あやふやな侍', '', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
+    900: ['フレッシュ・フランキー 健康第一', '', 'Coliseum Franky' ],
+    901: ['鉄人（サイボーグ）フランキー', '', 'Coliseum Franky' ],
+    902: ['ブロギー 巨兵海賊団', '', 'Coliseum Broggy' ],
+    903: ['赤鬼のブロギー', '', 'Coliseum Broggy' ],
+    904: ['ヨコヅナ', '', 'Coliseum Yokozuna' ],
+    905: ['ロロノア・ゾロ クライガナ島をさすらう剣士', '', '3D2Y Zoro', 'Timeskip Zoro' ],
+    906: ['ロロノア・ゾロ 世界最強剣士の門弟', '', '3D2Y Zoro', 'Timeskip Zoro' ],
+    907: ['ニコ・ロビン テキーラウルフの収監者', '', '3D2Y Robin', 'Timeskip Robin' ],
+    908: ['ニコ・ロビン 革命の灯火（ともしび）', '', '3D2Y Robin', 'Timeskip Robin' ],
+    909: ['トニートニー・チョッパー トリノ王国の平和の架け橋', '', '3D2Y Chopper', 'Timeskip Chopper' ],
+    910: ['チョッパーマスク 世界の平和を守るヒーロー', '', '3D2Y Chopper', 'Timeskip Chopper' ],
+    911: ['サンジ カマバッカ王国の逃走者', '', '3D2Y Sanji', 'Timeskip Sanji' ],
+    912: ['サンジ 男を懸けた愛の料理人', '', '3D2Y Sanji', 'Timeskip Sanji' ],
+    913: ['ブルック ハラヘッターニャの悪魔王', '', '3D2Y Brook', 'Timeskip Brook' ],
+    914: ['ブルック 骨（ボーン） to be wild!!!', '', '3D2Y Brook', 'Timeskip Brook' ],
+    915: ['ニコ・ロビン オハラの花嫁', '', 'Wedding Nico Robin' ],
+    916: ['麗らかな才女 ロビン ウエディング', '', 'Bride Nico Robin' ],
+    917: ['マーガレット', '' ],
+    918: ['マーガレット 護国の戦士', '' ],
+    919: ['アフェランドラ', '' ],
+    920: ['スイトピー', '', 'Sweet Pea' ],
+    921: ['ボア・ハンコック 女ヶ島の花嫁', '', 'Bridal Boa Hancock', " Wedding Hancock"],
+    922: ['愛に生きる女帝ハンコック ウエディング', '', 'Bridal Boa Hancock' ],
+    923: ['南の海のキャプテン・キッド', '', 'Coliseum Kid', 'Coliseum Kidd' ],
+    924: ['キャプテン・キッド キッド海賊団船長', '', 'Coliseum Kid', 'Coliseum Kidd' ],
+    925: ['獄卒長サディちゃん', '', 'Coliseum Sadie', 'Secuurity Chief Sadie-chan' ],
+    926: ['獄卒長サディちゃん 獄卒獣の指揮官', '', 'Coliseum Sadie', 'Secuurity Chief Sadie-chan' ],
+    927: ['ドーベルマン 海軍本部中将', '', 'Coliseum Doberman' ],
+    928: ['ハンニャバル', '', 'Hannibal' ],
+    929: ['ハンニャバル', '', 'Hannibal' ],
+    930: ['サルデス', '' ],
+    931: ['ブルゴリ ', '', 'Blue Gorilla' ],
+    932: ['ピーカ', '', 'Raid Pica' ],
+    933: ['ピーカ ドンキホーテ海賊団', '', 'Raid Pica' ],
+    934: ['海峡のジンベエ', '', 'Jinbe', 'Jimbei', 'Jinbei', 'INTbe' ],
+    935: ['海峡のジンベエ 元王下七武海', '', 'Jinbe', 'Jimbei', 'Jinbei', 'INTbe' ],
+    936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者', '', 'Timeskip Luffy', '3D2Y Luffy' ],
+    937: ['モンキー・Ｄ・ルフィ 仲間との誓い『３Ｄ２Ｙ』', '', 'Timeskip Luffy', '3D2Y Luffy' ],
+    938: ['ナミ 天候の科学の探求者', '', 'Timeskip Nami', '3D2Y Nami' ],
+    939: ['ナミ 空島ウェザリアの泥棒ネコ', '', 'Timeskip Nami', '3D2Y Nami' ],
+    940: ['ウソップ ボーイン列島の大食漢', '', 'Timeskip Usopp', '3D2Y Usopp' ],
+    941: ['ウソップ おいはぎの森の果敢な戦士', '', 'Timeskip Usopp', '3D2Y Usopp' ],
+    942: ['フランキー メカアニマルと戦う改造人間', '', 'Timeskip Franky', '3D2Y Franky' ],
+    943: ['鉄人（サイボーグ）フランキー バルジモアの霊獣', '', 'Timeskip Franky', '3D2Y Franky' ],
+    944: ['？？？', '', 'Wedding Perona' ],
+    945: ['？？？', '', 'Bride Perona' ],
+    946: ['ラクヨウ 白ひげ海賊団７番隊隊長', '' ],
+    947: ['フォッサ 白ひげ海賊団１５番隊隊長', '' ],
+    948: ['クリエル 白ひげ海賊団１０番隊隊長', '' ],
+    949: ['サッチ 白ひげ海賊団４番隊隊長', '' ],
+    950: ['火拳のエース', '', 'Coliseum Ace' ],
+    951: ['火拳のエース 白ひげ海賊団２番隊隊長', '', 'Coliseum Ace' ],
+    952: ['ベン・ベックマン', '', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman' ],
+    953: ['ベン・ベックマン 赤髪海賊団', '', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman' ],
+    954: ['ギャロ', '' ],
+    955: ['マクロ', '', 'Makuro' ],
+    956: ['タンスイ', '' ],
+    957: ['早業のガンマン 青のボディガード', '' ],
+    958: ['計略のガンマン 黒のボディガード', '' ],
+    959: ['技巧のガンマン 緑のボディガード', '' ],
+    960: ['速攻のガンマン 青のボディガード', '' ],
+    961: ['豪腕のガンマン 赤のボディガード', '' ],
+    962: ['強心のガンマン 黄のボディガード', '' ],
+    963: ['チャルロス聖', '' ],
+    964: ['ロズワード聖', '' ],
+    965: ['シャルリア宮', '' ],
+    966: ['ユースタス・キッド 超新星（スーパールーキー）', '', 'Story Kidd' ],
+    967: ['トラファルガー・ロー 超新星（スーパールーキー）', '' ],
+    968: ['パシフィスタ　ＰＸ－1', '' ],
+    969: ['パシフィスタ　ＰＸ－2', '' ],
+    970: ['パシフィスタ　ＰＸ－３', '' ],
+    971: ['パシフィスタ　ＰＸ－４', '' ],
+    972: ['パシフィスタ　ＰＸ－５', '' ],
+    973: ['戦桃丸', '', 'Sentoumaru' ],
+    974: ['戦桃丸 海軍本部科学部隊隊長', '', 'Sentoumaru' ],
+    975: ['スモーカー あらくれの一匹オオカミ', '', 'Kid Smoker' ],
+    976: ['スモーカー 孤高の一匹オオカミ', '', 'Kid Smoker' ],
+    977: ['黄猿', '', 'Raid Borsalino', 'Raid Kizaru' ],
+    978: ['黄猿　光人間', '', 'Raid Borsalino', 'Raid Kizaru' ],
+    979: ['イゾウ 白ひげ海賊団１６番隊隊長', '' ],
+    980: ['ブラメンコ 白ひげ海賊団６番隊隊長', '' ],
+    981: ['ナミュール 白ひげ海賊団８番隊隊長', '' ],
+    982: ['ビスタ 白ひげ海賊団５番隊隊長', '', 'Coliseum Vista' ],
+    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長', '', 'Coliseum Vista' ],
+    984: ['パウリー ガレーラカンパニー１番ドック職長', '', 'Coliseum Paulie' ],
+    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
+    986: ['ココア＆のらギツネ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
+    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
+    988: ['マウンブルテン＆トルコ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
+    989: ['ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
+    990: ['マッハ・バイス', '', 'Mach Vise' ],
+    991: ['マッハ・バイス ドンキホーテ海賊団', '', 'Mach Vise' ],
+    992: ['グラディウス', '' ],
+    993: ['グラディウス ドンキホーテ海賊団', '' ],
+    994: ['ヴァイオレット', '', 'Viola' ],
+    995: ['ヴァイオレット ドンキホーテ海賊団', '', 'Viola' ],
+    996: ['デリンジャー', '' ],
+    997: ['デリンジャー ドンキホーテ海賊団', '' ],
+    998: ['ディアマンテ', '' ],
+    999: ['ディアマンテ ドンキホーテ海賊団', '' ],
+    1000: ['コラソン ドンキホーテ海賊団', '', 'Rocinante', 'Rosinante' ],
+    1001: ['ドンキホーテ・ロシナンテ', '', 'Rocinante', 'Corazon' ],
+    1002: ['ベポ ハートの海賊団', '' ],
+    1003: ['武闘家のベポ ハートの海賊団', '' ],
+    1004: ['シャチ＆ペンギン ハートの海賊団', '' ],
+    1005: ['ジャンバール', '' ],
+    1006: ['ジャンバール ハートの海賊団', '' ],
+    1007: ['モネ　寒桜', '', 'Sakura Monet' ],
+    1008: ['モネ　大寒桜', '', 'Sakura Monet' ],
+    1009: ['キズナBOOOOSTルフィ', '', 'Afro Luffy', 'Afroluffy' ],
+    1010: ['バトラー伯爵', '' ],
+    1011: ['バトラー伯爵（王なる力）', '' ],
+    1012: ['ヘビー総裁', '' ],
+    1013: ['ホットドッグ将軍', '' ],
+    1014: ['トニートニー・チョッパー 動物王', '' ],
+    1015: ['カポネ・ベッジ ファイアタンク海賊団船長', '', 'Coliseum Capone Bege' ],
+    1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長', '', 'Coliseum Capone Bege' ],
+    1017: ['茶ひげ', '', 'Coliseum Brownbeard' ],
+    1018: ['茶ひげ ワニのケンタウロス', '', 'Coliseum Brownbeard' ],
+    1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長', '', 'Coliseum Lulu' ],
+    1020: ['シュガー　実桜', '', 'Sakura Sugar' ],
+    1021: ['シュガー　桜桃', '', 'Sakura Sugar' ],
+    1022: ['モンキー・D・ルフィ 海賊王への軌跡', '', 'Anniversary Luffy' ],
+    1023: ['ポートガス・D・エース 海賊王に馳せた夢', '' ],
+    1024: ['首領・チンジャオ', 'Don Chinjao' ],
+    1025: ['首領・チンジャオ 花ノ国のギャング', 'Don Chinjao' ],
+    1026: ['ブルーギリー', '' ],
+    1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）', '' ],
+    1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ', '' ],
+    1029: ['ファンク兄弟 モガロ王国の殺し屋', '' ],
+    1030: ['ハイルディン', '' ],
+    1031: ['ハイルディン 海賊傭兵', '' ],
+    1032: ['アブドーラ＆ジェット', '', 'Abdullah and Jeet' ],
+    1033: ['アブドーラ＆ジェット 元賞金稼ぎ', '', 'Abdullah and Jeet, Former Bounty Hunters' ],
+    1034: ['バルトロメオ', '' ],
+    1035: ['人食いのバルトロメオ', '' ],
+    1036: ['エンポリオ・イワンコフ 秘密の花園の女王', '' ],
+    1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王', '' ],
+    1038: ['イナズマ 秘密の花園の乙女', '' ],
+    1039: ['イナズマ 変革を画策する乙女', '' ],
+    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '', 'Coliseum Jozu' ],
+    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '', 'Coliseum Jozu' ],
+    1042: [ 'キラー キッド海賊団', '', 'Coliseum Killer', 'Supernova Killer' ],
+    1043: [ '“殺戮武人”キラー キッド海賊団', '', 'Coliseum Killer', 'Supernova Killer' ],
+    1044: [ 'トラファルガー・ロー 最悪の世代', '', 'LLaw', 'PLaw' ],
+    1045: [ 'トラファルガー・ロー 王下七武海', '', 'LLaw', 'PLaw' ],
+    1046: [ 'サボ 竜の爪', '', 'Raid Sabo' ],
+    1047: [ 'サボ 革命軍参謀総長', '', 'Raid Sabo' ],
     1048: [ 'ニコ・オルビア', '' ],
     1049: [ 'ニコ・オルビア オハラの考古学者', '' ],
     1050: [ 'ハグワール・D・サウロ', '' ],
@@ -1084,14 +1084,14 @@ window.aliases = {
     1083: [ '首領・サイ 花ノ国のギャング', '' ],
     1084: [ '藤虎', '' ],
     1085: [ 'イッショウ', '', 'Fujitora' ],
-    1086: [ 'ムッシュール', '','Coliseum Musshuru' ],
-    1087: [ 'ムッシュール 毒胞子人間', '','Coliseum Musshuru' ],
-    1088: [ 'サガ', '','Coliseum Saga' ],
-    1089: [ 'サガ 呪われた聖剣', '','Coliseum Saga' ],
-    1090: [ 'X・ドレーク ドレーク海賊団', '','Coliseum X Drake' ],
-    1091: [ '赤旗 X・ドレーク ドレーク海賊団', '','Coliseum X Drake' ],
-    1092: [ 'レベッカ パラソルのリズム', '','Kid Rebecca' ],
-    1093: [ 'レベッカ 虹のメロディ', '','Kid Rebecca' ],
+    1086: [ 'ムッシュール', '', 'Coliseum Musshuru' ],
+    1087: [ 'ムッシュール 毒胞子人間', '', 'Coliseum Musshuru' ],
+    1088: [ 'サガ', '', 'Coliseum Saga' ],
+    1089: [ 'サガ 呪われた聖剣', '', 'Coliseum Saga' ],
+    1090: [ 'X・ドレーク ドレーク海賊団', '', 'Coliseum Drake', 'Coliseum X Drake', 'Supernova Drake', 'Supernova X Drake' ],
+    1091: [ '赤旗 X・ドレーク ドレーク海賊団', 'Coliseum Drake', 'Coliseum X Drake', 'Supernova Drake', 'Supernova X Drake' ],
+    1092: [ 'レベッカ パラソルのリズム', '', 'Kid Rebecca' ],
+    1093: [ 'レベッカ 虹のメロディ', '', 'Kid Rebecca' ],
     1094: [ 'Dr.インディゴ', '' ],
     1095: [ 'Dr.インディゴ 金獅子海賊団', '' ],
     1096: [ 'スカーレット隊長', '' ],
@@ -1099,14 +1099,14 @@ window.aliases = {
     1098: [ '雷鳥ビリー', '' ],
     1099: [ 'コビー 雨の中の曹長', '' ],
     1100: [ 'コビー 露にきらめく曹長', '' ],
-    1101: [ '黒腕のゼファー', '','Coliseum Zephyr' ],
-    1102: [ '黒腕のゼファー 元海軍本部大将', '','Coliseum Zephyr' ],
-    1103: [ 'アイン ＮＥＯ海軍', '','Coliseum Ain' ],
-    1104: [ 'アイン ゼファー最後の教え子', '','Coliseum Ain' ],
-    1105: [ 'ビンズ ＮＥＯ海軍', '','Coliseum Binz' ],
-    1106: [ 'ビンズ ゼファー最後の教え子', '','Coliseum Binz' ],
-    1107: [ '金獅子のシキ', '','Raid Shiki' ],
-    1108: [ '金獅子のシキ 金獅子海賊団', '','Raid Shiki' ],
+    1101: [ '黒腕のゼファー', '', 'Coliseum Zephyr' ],
+    1102: [ '黒腕のゼファー 元海軍本部大将', '', 'Coliseum Zephyr' ],
+    1103: [ 'アイン ＮＥＯ海軍', '', 'Coliseum Ain' ],
+    1104: [ 'アイン ゼファー最後の教え子', '', 'Coliseum Ain' ],
+    1105: [ 'ビンズ ＮＥＯ海軍', '', 'Coliseum Binz' ],
+    1106: [ 'ビンズ ゼファー最後の教え子', '', 'Coliseum Binz' ],
+    1107: [ '金獅子のシキ', '', 'Raid Shiki' ],
+    1108: [ '金獅子のシキ 金獅子海賊団', '', 'Raid Shiki' ],
     1109: [ 'ナミ 若返った航海士', '' ],
     1110: [ 'ナミ 酒場のお茶目なアイドル', '' ],
     1111: [ 'ニコ・ロビン 若返った考古学者', '' ],
@@ -1120,715 +1120,715 @@ window.aliases = {
     1119: [ 'ナミ 信念に生きる麦わらの一味', 'New Strong World Nami', 'SW Nami' ],
     1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy' ],
     1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy' ],
-    1122: [ 'キャベンディッシュ', '','Hakuba', 'Cabbage' ],
-    1123: [ '白馬のキャベンディッシュ', '','Hakuba', 'Cabbage' ],
-    1124: ['スレイマン',''],
-    1125: ['首はねスレイマン',''],
-    1126: ['オオロンブス',''],
-    1127: ['オオロンブス 殺戮支配者',''],
-    1128: ['ダガマ',''],
-    1129: ['ダガマ プロデンス王国軍師',''],
-    1130: ['エリザベローII世',''],
-    1131: ['エリザベローII世 プロデンス王国国王',''],
-    1132: ['イデオ',''],
-    1133: ['イデオ 破壊砲',''],
-    1134: ['たしぎ がむしゃらな剣道少女','','Young Tashigi', 'Kid Tashigi'],
-    1135: ['たしぎ 夢見る剣道少女','','Young Tashigi', 'Kid Tashigi'],
-    1136: ['フクロウ 世界政府直下暗躍諜報機関',''],
-    1137: ['ジャブラ 世界政府直下暗躍諜報機関','','Jabura'],
-    1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
-    1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
-    1140: ['ゲッコー・モリア 魔の三角地帯の主','','Coliseum Gekko Moriah'],
-    1141: ['ゲッコー・モリア 魔の三角地帯の支配者','','Coliseum Gekko Moriah'],
-    1142: ['フォクシー ドーナツレースの邪魔者','','Coliseum Foxy','Dying Foxy'],
-    1143: ['フォクシー コンバットの卑怯者','','Coliseum Foxy','Nurse Foxy'],
-    1144: ['ポルチェ お花チアリーダーズ','','Coliseum Porche'],
-    1145: ['ポルチェ キューティバトンの使い手','','Coliseum Porche'],
-    1146: ['制圧の制服看守',''],
-    1147: ['火急の制服看守',''],
-    1148: ['包囲の制服看守',''],
-    1149: ['理論派獄卒',''],
-    1150: ['行動派獄卒',''],
-    1151: ['ミノタウロス',''],
-    1152: ['ミノゼブラ',''],
-    1153: ['スフィンクス',''],
-    1154: ['サルデス 牢番長',''],
-    1155: ['軍隊ウルフ',''],
-    1156: ['ハンニャバル副署長',''],
-    1157: ['ハンニャバル副署長 海底監獄インペルダウン',''],
-    1158: ['マゼラン署長',''],
-    1159: ['マゼラン署長 海底監獄インペルダウン',''],
-    1160: ['コアラ ビーチの天使','','Summertime Koala','Swimsuit Koala'],
-    1161: ['コアラ 楽園の女神','','Summertime Koala','Swimsuit Koala'],
-    1162: ['ギルド・テゾーロ','','Raid Tesoro'],
-    1163: ['ギルド・テゾーロ 黄金船のカジノ王','','Raid Tesoro'],
-    1164: ['カリーナ','','Raid Carina'],
-    1165: ['カリーナ 黄金船の歌姫','','Raid Carina'],
-    1166: ['バカラ',''],
-    1167: ['バカラ 黄金船のコンシェルジュ',''],
-    1168: ['ダイス',''],
-    1169: ['ダイス 黄金船のディーラー',''],
-    1170: ['タナカさん',''],
-    1171: ['タナカさん 黄金船の警備担当',''],
-    1172: ['ブルック 夢を追い求める冒険者','','New Strong World Brook', 'SW Brook' ],
-    1173: ['ブルック 信念に生きる麦わらの一味','','New Strong World Brook', 'SW Brook' ],
-    1174: ['ロロノア・ゾロ 夢を追い求める冒険者','','New Strong World Zoro', 'SW Zoro' ],
-    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味','','New Strong World Zoro', 'SW Zoro' ],
-    1176: ['チョッパー 夢を追い求める冒険者','','New Strong World Chopper', 'SW Chopper' ],
-    1177: ['チョッパー 信念に生きる麦わらの一味','','New Strong World Chopper', 'SW Chopper' ],
-    1178: ['オーズ','','Oz'],
-    1179: ['魔人オーズ','','Oz'],
-    1180: ['虹ヨロイガニ',''],
-    1181: ['ブレンハイム',''],
-    1182: ['カトラスのブレンハイム',''],
-    1183: ['キングデュー','','Heman'],
-    1184: ['双拳ガントレットのキングデュー','','Heman'],
-    1185: ['ハルタ',''],
-    1186: ['疾風の小剣士ハルタ',''],
-    1187: ['アトモス',''],
-    1188: ['水牛のアトモス',''],
-    1189: ['スピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
-    1190: ['シールドランスのスピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
-    1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
-    1192: ['クザン','','Aokiji'],
-    1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
-    1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
-    1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall', 'Ganfall'],
-    1196: ['ガン・フォール スカイピアの神','','Coliseum Gan Fall', 'Ganfall'],
-    1197: ['スカイブリーダー・オーム','','Coliseum Ohm'],
-    1198: ['ジュエリー・ボニー 弾けるサファイア','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
-    1199: ['ジュエリー・ボニー パールホワイトの煌き','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
-    1200: ['ヴァイオレット 挑発のバカンス','','Summertime Viola','Swimsuit Viola'],
-    1201: ['ヴァイオレット 紅潮のバカンス','','Summertime Viola','Swimsuit Viola'],
-    1202: ['ヨーキ',''],
-    1203: ['キャラコのヨーキ',''],
-    1204: ['ブルック ルンバー海賊団',''],
-    1205: ['“音楽家兼剣士”ブルック ルンバー海賊団',''],
-    1206: ['ラブーン ルンバー海賊団',''],
-    1207: ['ニコ・ロビン 夢を追い求める冒険者','','New Strong World Robin', 'SW Robin' ],
-    1208: ['ニコ・ロビン 信念に生きる麦わらの一味','','New Strong World Robin', 'SW Robin' ],
-    1209: ['ウソップ 夢を追い求める冒険者','','New Strong World Usopp', 'SW Usopp' ],
-    1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp', 'SW Usopp' ],
-    1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky', 'SW Franky' ],
-    1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky', 'SW Franky' ],
-    1213: ['ベビー５ ドルフィンフロート','','Summertime Baby 5','Swimsuit Baby 5'],
-    1214: ['ベビー５ ドルフィンライダー','','Summertime Baby 5','Swimsuit Baby 5'],
-    1215: ['ガイラム ワールド海賊団','',''],
-    1216: ['セバスチャン ワールド海賊団','',''],
-    1217: ['ナイチン ワールド海賊団','',''],
-    1218: ['ボア・ハンコック アマゾン・リリー皇帝','',''],
-    1219: ['バーンディ・ワールド','',''],
-    1220: ['バーンディ・ワールド ワールド海賊団船長','',''],
-    1221: ['リトルオーズJr. 白ひげ海賊団傘下','',''],
-    1222: ['猛攻のリトルオーズJr. 白ひげ海賊団傘下','',''],
-    1223: ['バスティーユ','',''],
-    1224: ['ヤマカジ','',''],
-    1225: ['ヒナ 黒檻部隊','',''],
-    1226: ['スモーカー 海軍本部准将','',''],
-    1227: ['ジュラキュール・ミホーク 鷹の目','',''],
-    1228: ['黄猿 海軍本部大将','',''],
-    1229: ['戦桃丸 海軍本部将校','','Sentoumaru'],
-    1230: ['鉞の戦桃丸 海軍本部将校','','Sentoumaru'],
-    1231: ['スモーカー 海軍ＧＬ第５支部','',''],
-    1232: ['スモーカー 海軍ＧＬ第５支部「Ｇ‐５」中将','',''],
-    1233: ['たしぎ 海軍ＧＬ第５支部','','Thiccshigi'],
-    1234: ['たしぎ 海軍ＧＬ第５支部「Ｇ‐５」大佐','','Thiccshigi'],
-    1235: ['メイナード 海軍本部中将','',''],
-    1236: ['追撃のメイナード 海軍本部中将','',''],
-    1237: ['バスティーユ 海軍本部中将','',''],
-    1238: ['鮫切りバスティーユ 海軍本部中将','',''],
-    1239: ['黄猿 海軍本部最高戦力','','Kizaru'],
-    1240: ['ボルサリーノ','','Kizaru'],
-    1241: ['コアラ 魚人空手師範代','',''],
-    1242: ['コアラ 革命軍・魚人空手師範代','',''],
-    1243: ['ハック 魚人空手師範','',''],
-    1244: ['ハック 革命軍・魚人空手師範','',''],
-    1245: ['モンキー・D・ルフィ マリンフォードに舞う“麦わら”','',''],
-    1246: ['ポートガス・D・エース 処刑台の“火拳”','',''],
-    1247: ['ポートガス・D・エース マリンフォードに舞う“火拳”','',''],
-    1248: ['マルコ 秋風にはためく襟元','','Kimono Marco'],
-    1249: ['マルコ ほろ酔いの着崩れ','','Kimono Marco'],
-    1250: ['マルコ 白ひげ海賊団','','Coliseum Marco'],
-    1251: ['マルコ　復活の炎 白ひげ海賊団','','Coliseum Marco'],
-    1252: ['遊騎士ドーマ 白ひげ海賊団傘下','','Coliseum Doma'],
-    1253: ['スカイライダー・シュラ','','Coliseum Shura'],
-    1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','',''],
-    1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下','',''],
-    1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下','',''],
-    1257: ['エドワード・ニューゲート 海賊王のライバル','', 'Edward Newgate', 'Young Whitebeard', 'YWB'],
-    1258: ['エドワード・ニューゲート 大海賊“白ひげ”','', 'Edward Newgate', 'Young Whitebeard', 'YWB'],
-    1259: ['ドンキホーテ・ドフラミンゴ “北の海”の海賊','','Young Doffy','Donquixote Doflamingo'],
-    1260: ['ドンキホーテ・ドフラミンゴ “北の海”の闇','','Young Doffy','Donquixote Doflamingo'],
-    1261: ['セニョール・ピンク “北の海”の海賊','','Senor Pink', 'Young Senior Pink'],
-    1262: ['セニョール・ピンク “北の海”の闇','','Senor Pink', 'Young Senior Pink'],
-    1263: ['ヴェルゴ “北の海”の海賊','','Young Vergo'],
-    1264: ['ヴェルゴ “北の海”の闇','','Young Vergo'],
-    1265: ['エース 黄昏の道草','','Kimono Ace'],
-    1266: ['エース 月下の艶肌','','Kimono Ace'],
-    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','','BB'],
-    1268: ['黒ひげ 黒ひげ海賊団船長','','BB', 'Teach'],
-    1269: ['ラフィット','','Lafitte'],
-    1270: ['“鬼保安官”ラフィット','','Lafitte'],
-    1271: ['ヴァン・オーガー','','Vaper', 'Van Ogre'],
-    1272: ['“音越”ヴァン・オーガー','','Vaper', 'Van Ogre'],
-    1273: ['ジーザス・バージェス','',''],
-    1274: ['“チャンピオン”ジーザス・バージェス','',''],
-    1275: ['シリュウ','','Shiliew'],
-    1276: ['雨のシリュウ','','Shiliew'],
-    1277: ['ドクＱ','',''],
-    1278: ['“死神”ドクＱ','',''],
-    1279: ['ジョン・ジャイアント','',''],
-    1280: ['青キジ 海軍本部大将','','Kuzan'],
-    1281: ['ガープ 海軍本部中将','',''],
-    1282: ['センゴク 海軍本部元帥','',''],
-    1283: ['赤犬 海軍本部大将','','Sakazuki'],
-    1284: ['モンキー・D・ルフィ 野生の海賊','','Wild Luffy'],
-    1285: ['モンキー・D・ルフィ 大地の開拓者','','Wild Luffy'],
-    1286: ['ベビー５ スパイダーマイルズの少女','','Kid Baby 5'],
-    1287: ['ベビー５ ドンキホーテファミリーの一員','','Kid Baby 5'],
-    1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law', 'Kid Law'],
-    1289: ['トラファルガー・ロー ドンキホーテファミリーの一員','','Kid Trafalgar Law', 'Kid Law'],
-    1290: ['バッファロー ドンキホーテファミリーの一員','','Kid Buffalo'],
-    1291: ['ラオＧ 地翁拳の使い手','','Coliseum Lao G'],
-    1292: ['ラオＧ ディアマンテ軍幹部','','Coliseum Lao G'],
-    1293: ['ボア・サンダーソニア 九蛇の戦士','','Coliseum Sandersonia','Coliseum Boa Sandersonia'],
-    1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女','','Coliseum Sandersonia','Coliseum Boa Sandersonia'],
-    1295: ['カリファ　グラマラスミイラ','','Halloween Kalifa'],
-    1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード','','Halloween Kalifa'],
-    1297: ['赤犬','','Raid Sakazuki', 'Raid Akainu'],
-    1298: ['赤犬 マグマ人間','','Raid Sakazuki', 'Raid Akainu'],
-    1299: ['レベッカ　ラブリーモンスターキャット','','Halloween Rebecca'],
-    1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード','','Halloween Rebecca'],
-    1301: ['受刑者　バギー','','Baggy'],
-    1302: ['受刑者　道化のバギー 脱獄同盟','','Baggy'],
-    1303: ['脱走囚　ギャルディーノ','','Mr 3', 'Mr. 3'],
-    1304: ['脱走囚　ギャルディーノ 脱獄同盟','','Mr 3', 'Mr. 3'],
-    1305: ['シュガー　リトルサキュバス','','Halloween Sugar'],
-    1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','','Halloween Sugar'],
-    1307: ['バルトロメオ　フルムーンウルフ','','Halloween Bartolomeo'],
-    1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード','','Halloween Bartolomeo'],
-    1309: ['錦えもん','','Coliseum Kinemon','Coliseum Kin\'emon'],
-    1310: ['狐火の錦えもん','','Coliseum Kinemon','Coliseum Kin\'emon'],
-    1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum Marigold','Coliseum Boa Marigold'],
-    1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女','','Coliseum Marigold','Coliseum Boa Marigold'],
-    1313: ['赤犬 海軍本部最高戦力','','Sakazuki'],
-    1314: ['サカズキ','','Akainu'],
-    1315: ['海軍本部曹長　コビー “偉大なる航路”の海兵','',''],
-    1316: ['海軍本部曹長　コビー “海軍の英雄”の教え子','',''],
-    1317: ['モンキー・D・ガープ 海軍本部中将','',''],
-    1318: ['ゲンコツのガープ 海軍本部中将','',''],
-    1319: ['つる 海軍本部中将','',''],
-    1320: ['“大参謀”つる 海軍本部中将','',''],
-    1321: ['モモンガ 怪物斬りの名将','',''],
-    1322: ['海軍本部中将モモンガ 怪物斬りの名将','',''],
-    1323: ['オニグモ 八刀流の剣士','',''],
-    1324: ['海軍本部中将オニグモ 八刀流の剣士','',''],
-    1325: ['コラソン　ロイヤルヴァンパイア','','Halloween Corazon'],
-    1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード','','Halloween Corazon'],
-    1327: ['レオ トンタッタ族トンタ兵団','',''],
-    1328: ['戦士レオ トンタッタ族トンタ兵団','',''],
-    1329: ['ウィッカ','','Wicka'],
-    1330: ['ガンチョ','',''],
-    1331: ['マンシェリー トンタ長の娘','',''],
-    1332: ['マンシェリー トンタッタ王国の姫','',''],
-    1333: ['カブ','',''],
-    1334: ['ビアン','',''],
-    1335: ['サボ 貴女との一幕','','Gentleman Sabo'],
-    1336: ['サボ 劇場の怪人','','Gentleman Sabo'],
-    1337: ['カン十郎','','Coliseum Kanjuro'],
-    1338: ['夕立ち　カン十郎','','Coliseum Kanjuro'],
-    1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）','','Coliseum Chopper','Coliseum Tony Tony Chopper'],
-    1340: ['ゲダツ スカイピア神官','','Coliseum Gedatsu'],
-    1341: ['空番長　ゲダツ スカイピア神官','','Coliseum Gedatsu'],
-    1342: ['カーリー・ダダン','',''],
-    1343: ['ポルシェーミ','',''],
-    1344: ['ブルージャム','',''],
-    1345: ['ジンベエ 魚人海賊団船長','','Jinbe','Jimbei','Jinbei'],
-    1346: ['ヘラクレス おいはぎの森のスゴ腕先生','',''],
-    1347: ['トリノ王国の怪鳥','',''],
-    1348: ['ヒューマンドリル','',''],
-    1349: ['ハレダス','',''],
-    1350: ['テーナ・ゲーナ王国の手長族','',''],
-    1351: ['テキーラウルフの警備兵','',''],
-    1352: ['エンポリオ・イワンコフ キングオブニューカマー','',''],
-    1353: ['シルバーズ・レイリー 海賊王の船員','',''],
-    1354: ['シルバーズ・レイリー 眠らぬ街のマスター','','Secret Rayleigh'],
-    1355: ['シルバーズ・レイリー ライムライトに煌く冥王','','Secret Rayleigh'],
-    1356: ['ペコムズ','',''],
-    1357: ['ペコムズ ビッグ・マム海賊団','',''],
-    1358: ['タマゴ男爵','',''],
-    1359: ['タマゴ男爵 ビッグ・マム海賊団','',''],
-    1360: ['ルフィの冬島冒険','','Winter Luffy'],
-    1361: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
-    1362: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
-    1363: ['フランキー 集結の麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
-    1364: ['フランキー 新生・麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
-    1365: ['ナミ 集結の麦わらの一味','','New World Nami', 'Timeskip Nami', 'TS Nami'],
-    1366: ['ナミ 新生・麦わらの一味','','New World Nami', 'Timeskip Nami', 'TS Nami'],
-    1367: ['サンジ 集結の麦わらの一味','','New World Sanji', 'Timeskip Sanji', 'TS Sanji'],
-    1368: ['サンジ 新生・麦わらの一味','','New World Sanji', 'Timeskip Sanji', 'TS Sanji'],
-    1369: ['トニートニー・チョッパー 集結の麦わらの一味','','New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
-    1370: ['トニートニー・チョッパー 新生・麦わらの一味','','New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
-    1371: ['ロロノア・ゾロ 野生の海賊','','Wild Zoro'],
-    1372: ['ロロノア・ゾロ 大地の開拓者','','Wild Zoro'],
-    1373: ['マゼラン','','Raid Magellan'],
-    1374: ['マゼラン 監獄署長','','Raid Magellan'],
-    1375: ['デリンジャー 闘魚の血を引く半魚人', '', 'Coliseum Dellinger'],
-    1376: ['デリンジャー ディアマンテ軍戦闘員', '', 'Coliseum Dellinger'],
-    1377: ['マーガレット アマゾン・リリーの弓兵', '', 'Coliseum Marguerite'],
-    1378: ['マーガレット 九蛇の覇気使い', '', 'Coliseum Marguerite'],
-    1379: ['シャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
-    1380: ['赤髪のシャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
-    1381: ['', '', 'Christmas Tashigi'],
-    1382: ['', '', 'Christmas Tashigi'],
-    1383: ['オモチャの兵隊さん', '', 'Toy Soldier', 'Kyros'],
-    1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
-    1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
-    1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
-    1387: ['', '', 'Mega Luffy', 'Super Luffy'],
-    1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro', 'Super Zoro'],
-    1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami', 'Super Nami'],
-    1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy'],
-    1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
-    1392: ['戦桃丸 シャボンディ諸島の壁', '', ''],
-    1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
-    1394: ['ベビー５ 神前の晴れ着', '', 'Kimono Baby 5'],
-    1395: ['ベビー５ ぎこちない振袖', '', 'Kimono Baby 5'],
-    1396: ['たしぎ シャンブルズ', '', 'Smoker'],
-    1397: ['たしぎ　七尺十手 シャンブルズ', '', 'Smoker'],
-    1398: ['スモーカー シャンブルズ', '', 'Tashigi'],
-    1399: ['スモーカー　時雨 シャンブルズ', '', 'Tashigi'],
-    1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius'],
-    1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius'],
-    1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton'],
-    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
-    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
-    1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
-    1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
-    1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin', 'Timeskip Robin', 'TS Robin'],
-    1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin',, 'Timeskip Robin', 'TS Robin'],
-    1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
-    1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
-    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
-    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
+    1122: [ 'キャベンディッシュ', '', 'Hakuba', 'Cabbage' ],
+    1123: [ '白馬のキャベンディッシュ', '', 'Hakuba', 'Cabbage' ],
+    1124: ['スレイマン', '' ],
+    1125: ['首はねスレイマン', '' ],
+    1126: ['オオロンブス', '' ],
+    1127: ['オオロンブス 殺戮支配者', '' ],
+    1128: ['ダガマ', '' ],
+    1129: ['ダガマ プロデンス王国軍師', '' ],
+    1130: ['エリザベローII世', '' ],
+    1131: ['エリザベローII世 プロデンス王国国王', '' ],
+    1132: ['イデオ', '' ],
+    1133: ['イデオ 破壊砲', '' ],
+    1134: ['たしぎ がむしゃらな剣道少女', '', 'Young Tashigi', 'Kid Tashigi' ],
+    1135: ['たしぎ 夢見る剣道少女', '', 'Young Tashigi', 'Kid Tashigi' ],
+    1136: ['フクロウ 世界政府直下暗躍諜報機関', '' ],
+    1137: ['ジャブラ 世界政府直下暗躍諜報機関', '', 'Jabura' ],
+    1138: ['ブルーノ 世界政府直下暗躍諜報機関', '' ],
+    1139: ['クマドリ 世界政府直下暗躍諜報機関', '' ],
+    1140: ['ゲッコー・モリア 魔の三角地帯の主', '', 'Coliseum Gekko Moriah' ],
+    1141: ['ゲッコー・モリア 魔の三角地帯の支配者', '', 'Coliseum Gekko Moriah' ],
+    1142: ['フォクシー ドーナツレースの邪魔者', '', 'Coliseum Foxy', 'Dying Foxy' ],
+    1143: ['フォクシー コンバットの卑怯者', '', 'Coliseum Foxy', 'Nurse Foxy' ],
+    1144: ['ポルチェ お花チアリーダーズ', '', 'Coliseum Porche' ],
+    1145: ['ポルチェ キューティバトンの使い手', '', 'Coliseum Porche' ],
+    1146: ['制圧の制服看守', '' ],
+    1147: ['火急の制服看守', '' ],
+    1148: ['包囲の制服看守', '' ],
+    1149: ['理論派獄卒', '' ],
+    1150: ['行動派獄卒', '' ],
+    1151: ['ミノタウロス', '' ],
+    1152: ['ミノゼブラ', '' ],
+    1153: ['スフィンクス', '' ],
+    1154: ['サルデス 牢番長', '' ],
+    1155: ['軍隊ウルフ', '' ],
+    1156: ['ハンニャバル副署長', '' ],
+    1157: ['ハンニャバル副署長 海底監獄インペルダウン', '' ],
+    1158: ['マゼラン署長', '' ],
+    1159: ['マゼラン署長 海底監獄インペルダウン', '' ],
+    1160: ['コアラ ビーチの天使', '', 'Summertime Koala', 'Swimsuit Koala' ],
+    1161: ['コアラ 楽園の女神', '', 'Summertime Koala', 'Swimsuit Koala' ],
+    1162: ['ギルド・テゾーロ', '', 'Raid Tesoro' ],
+    1163: ['ギルド・テゾーロ 黄金船のカジノ王', '', 'Raid Tesoro' ],
+    1164: ['カリーナ', '', 'Raid Carina' ],
+    1165: ['カリーナ 黄金船の歌姫', '', 'Raid Carina' ],
+    1166: ['バカラ', '' ],
+    1167: ['バカラ 黄金船のコンシェルジュ', '' ],
+    1168: ['ダイス', '' ],
+    1169: ['ダイス 黄金船のディーラー', '' ],
+    1170: ['タナカさん', '' ],
+    1171: ['タナカさん 黄金船の警備担当', '' ],
+    1172: ['ブルック 夢を追い求める冒険者', '', 'New Strong World Brook', 'SW Brook' ],
+    1173: ['ブルック 信念に生きる麦わらの一味', '', 'New Strong World Brook', 'SW Brook' ],
+    1174: ['ロロノア・ゾロ 夢を追い求める冒険者', '', 'New Strong World Zoro', 'SW Zoro' ],
+    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味', '', 'New Strong World Zoro', 'SW Zoro' ],
+    1176: ['チョッパー 夢を追い求める冒険者', '', 'New Strong World Chopper', 'SW Chopper' ],
+    1177: ['チョッパー 信念に生きる麦わらの一味', '', 'New Strong World Chopper', 'SW Chopper' ],
+    1178: ['オーズ', '', 'Oz' ],
+    1179: ['魔人オーズ', '', 'Oz' ],
+    1180: ['虹ヨロイガニ', '' ],
+    1181: ['ブレンハイム', '' ],
+    1182: ['カトラスのブレンハイム', '' ],
+    1183: ['キングデュー', '', 'Heman' ],
+    1184: ['双拳ガントレットのキングデュー', '', 'Heman' ],
+    1185: ['ハルタ', '' ],
+    1186: ['疾風の小剣士ハルタ', '' ],
+    1187: ['アトモス', '' ],
+    1188: ['水牛のアトモス', '' ],
+    1189: ['スピード・ジル', '', 'Speed Jiru', 'Genocide Jil' ],
+    1190: ['シールドランスのスピード・ジル', '', 'Speed Jiru', 'Genocide Jil' ],
+    1191: ['青キジ 海軍本部最高戦力', '', 'Aokiji', 'Kuzan' ],
+    1192: ['クザン', '', 'Aokiji' ],
+    1193: ['ボア・ハンコック 渚にたたずむ女帝', '', 'Summertime Hancock', 'Swimsuit Hancock' ],
+    1194: ['ボア・ハンコック 恋に溺れた乙女', '', 'Summertime Hancock', 'Swimsuit Hancock' ],
+    1195: ['ガン・フォール 先代“神”', '', 'Coliseum Gan Fall', 'Coliseum Ganfor', 'Ganfall' ],
+    1196: ['ガン・フォール スカイピアの神', '', 'Coliseum Gan Fall', 'Coliseum Ganfor', 'Ganfall' ],
+    1197: ['スカイブリーダー・オーム', '', 'Coliseum Ohm' ],
+    1198: ['ジュエリー・ボニー 弾けるサファイア', '', 'Summertime Jewelry Bonney', 'Swimsuit Jewelry Bonney' ],
+    1199: ['ジュエリー・ボニー パールホワイトの煌き', '', 'Summertime Jewelry Bonney', 'Swimsuit Jewelry Bonney' ],
+    1200: ['ヴァイオレット 挑発のバカンス', '', 'Summertime Viola', 'Swimsuit Viola' ],
+    1201: ['ヴァイオレット 紅潮のバカンス', '', 'Summertime Viola', 'Swimsuit Viola' ],
+    1202: ['ヨーキ', '' ],
+    1203: ['キャラコのヨーキ', '' ],
+    1204: ['ブルック ルンバー海賊団', '' ],
+    1205: ['“音楽家兼剣士”ブルック ルンバー海賊団', '' ],
+    1206: ['ラブーン ルンバー海賊団', '' ],
+    1207: ['ニコ・ロビン 夢を追い求める冒険者', '', 'New Strong World Robin', 'SW Robin' ],
+    1208: ['ニコ・ロビン 信念に生きる麦わらの一味', '', 'New Strong World Robin', 'SW Robin' ],
+    1209: ['ウソップ 夢を追い求める冒険者', '', 'New Strong World Usopp', 'SW Usopp' ],
+    1210: ['ウソップ 信念に生きる麦わらの一味', '', 'New Strong World Usopp', 'SW Usopp' ],
+    1211: ['フランキー 夢を追い求める冒険者', '', 'New Strong World Franky', 'SW Franky' ],
+    1212: ['フランキー 信念に生きる麦わらの一味', '', 'New Strong World Franky', 'SW Franky' ],
+    1213: ['ベビー５ ドルフィンフロート', '', 'Summertime Baby 5', 'Swimsuit Baby 5' ],
+    1214: ['ベビー５ ドルフィンライダー', '', 'Summertime Baby 5', 'Swimsuit Baby 5' ],
+    1215: ['ガイラム ワールド海賊団', '', '' ],
+    1216: ['セバスチャン ワールド海賊団', '', '' ],
+    1217: ['ナイチン ワールド海賊団', '', '' ],
+    1218: ['ボア・ハンコック アマゾン・リリー皇帝', '', '' ],
+    1219: ['バーンディ・ワールド', '', 'Coliseum World', 'Coliseum Byrnndi World' ],
+    1220: ['バーンディ・ワールド ワールド海賊団船長', '', 'Coliseum World', 'Coliseum Byrnndi World' ],
+    1221: ['リトルオーズJr. 白ひげ海賊団傘下', '', 'Coliseum Oars Jr.' ],
+    1222: ['猛攻のリトルオーズJr. 白ひげ海賊団傘下', '', 'Coliseum Oars Jr.' ],
+    1223: ['バスティーユ', '', '' ],
+    1224: ['ヤマカジ', '', '' ],
+    1225: ['ヒナ 黒檻部隊', '', '' ],
+    1226: ['スモーカー 海軍本部准将', '', '' ],
+    1227: ['ジュラキュール・ミホーク 鷹の目', '', '' ],
+    1228: ['黄猿 海軍本部大将', '', '' ],
+    1229: ['戦桃丸 海軍本部将校', '', 'Sentoumaru' ],
+    1230: ['鉞の戦桃丸 海軍本部将校', '', 'Sentoumaru' ],
+    1231: ['スモーカー 海軍ＧＬ第５支部', '', '' ],
+    1232: ['スモーカー 海軍ＧＬ第５支部「Ｇ‐５」中将', '', '' ],
+    1233: ['たしぎ 海軍ＧＬ第５支部', '', 'Thiccshigi' ],
+    1234: ['たしぎ 海軍ＧＬ第５支部「Ｇ‐５」大佐', '', 'Thiccshigi' ],
+    1235: ['メイナード 海軍本部中将', '', '' ],
+    1236: ['追撃のメイナード 海軍本部中将', '', '' ],
+    1237: ['バスティーユ 海軍本部中将', '', '' ],
+    1238: ['鮫切りバスティーユ 海軍本部中将', '', '' ],
+    1239: ['黄猿 海軍本部最高戦力', '', 'Kizaru' ],
+    1240: ['ボルサリーノ', '', 'Kizaru' ],
+    1241: ['コアラ 魚人空手師範代', '', '' ],
+    1242: ['コアラ 革命軍・魚人空手師範代', '', '' ],
+    1243: ['ハック 魚人空手師範', '', '' ],
+    1244: ['ハック 革命軍・魚人空手師範', '', '' ],
+    1245: ['モンキー・D・ルフィ マリンフォードに舞う“麦わら”', '', '' ],
+    1246: ['ポートガス・D・エース 処刑台の“火拳”', '', '' ],
+    1247: ['ポートガス・D・エース マリンフォードに舞う“火拳”', '', '' ],
+    1248: ['マルコ 秋風にはためく襟元', '', 'Kimono Marco' ],
+    1249: ['マルコ ほろ酔いの着崩れ', '', 'Kimono Marco' ],
+    1250: ['マルコ 白ひげ海賊団', '', 'Coliseum Marco' ],
+    1251: ['マルコ　復活の炎 白ひげ海賊団', '', 'Coliseum Marco' ],
+    1252: ['遊騎士ドーマ 白ひげ海賊団傘下', '', 'Coliseum Doma' ],
+    1253: ['スカイライダー・シュラ', '', 'Coliseum Shura' ],
+    1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下', '', '' ],
+    1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下', '', '' ],
+    1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下', '', '' ],
+    1257: ['エドワード・ニューゲート 海賊王のライバル', '', 'Edward Newgate', 'Young Whitebeard', 'YWB' ],
+    1258: ['エドワード・ニューゲート 大海賊“白ひげ”', '', 'Edward Newgate', 'Young Whitebeard', 'YWB' ],
+    1259: ['ドンキホーテ・ドフラミンゴ “北の海”の海賊', '', 'Young Doffy', 'Donquixote Doflamingo' ],
+    1260: ['ドンキホーテ・ドフラミンゴ “北の海”の闇', '', 'Young Doffy', 'Donquixote Doflamingo' ],
+    1261: ['セニョール・ピンク “北の海”の海賊', '', 'Senor Pink', 'Young Senior Pink' ],
+    1262: ['セニョール・ピンク “北の海”の闇', '', 'Senor Pink', 'Young Senior Pink' ],
+    1263: ['ヴェルゴ “北の海”の海賊', '', 'Young Vergo' ],
+    1264: ['ヴェルゴ “北の海”の闇', '', 'Young Vergo' ],
+    1265: ['エース 黄昏の道草', '', 'Kimono Ace' ],
+    1266: ['エース 月下の艶肌', '', 'Kimono Ace' ],
+    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長', '', 'BB' ],
+    1268: ['黒ひげ 黒ひげ海賊団船長', '', 'BB', 'Teach' ],
+    1269: ['ラフィット', '', 'Lafitte' ],
+    1270: ['“鬼保安官”ラフィット', '', 'Lafitte' ],
+    1271: ['ヴァン・オーガー', '', 'Vaper', 'Van Ogre' ],
+    1272: ['“音越”ヴァン・オーガー', '', 'Vaper', 'Van Ogre' ],
+    1273: ['ジーザス・バージェス', '', '' ],
+    1274: ['“チャンピオン”ジーザス・バージェス', '', '' ],
+    1275: ['シリュウ', '', 'Shiliew' ],
+    1276: ['雨のシリュウ', '', 'Shiliew' ],
+    1277: ['ドクＱ', '', '' ],
+    1278: ['“死神”ドクＱ', '', '' ],
+    1279: ['ジョン・ジャイアント', '', '' ],
+    1280: ['青キジ 海軍本部大将', '', 'Kuzan' ],
+    1281: ['ガープ 海軍本部中将', '', '' ],
+    1282: ['センゴク 海軍本部元帥', '', '' ],
+    1283: ['赤犬 海軍本部大将', '', 'Sakazuki' ],
+    1284: ['モンキー・D・ルフィ 野生の海賊', '', 'Wild Luffy' ],
+    1285: ['モンキー・D・ルフィ 大地の開拓者', '', 'Wild Luffy' ],
+    1286: ['ベビー５ スパイダーマイルズの少女', '', 'Kid Baby 5' ],
+    1287: ['ベビー５ ドンキホーテファミリーの一員', '', 'Kid Baby 5' ],
+    1288: ['トラファルガー・ロー スパイダーマイルズの少年', '', 'Kid Trafalgar Law', 'Kid Law' ],
+    1289: ['トラファルガー・ロー ドンキホーテファミリーの一員', '', 'Kid Trafalgar Law', 'Kid Law' ],
+    1290: ['バッファロー ドンキホーテファミリーの一員', '', 'Kid Buffalo' ],
+    1291: ['ラオＧ 地翁拳の使い手', '', 'Coliseum Lao G' ],
+    1292: ['ラオＧ ディアマンテ軍幹部', '', 'Coliseum Lao G' ],
+    1293: ['ボア・サンダーソニア 九蛇の戦士', '', 'Coliseum Sandersonia', 'Coliseum Boa Sandersonia' ],
+    1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女', '', 'Coliseum Sandersonia', 'Coliseum Boa Sandersonia' ],
+    1295: ['カリファ　グラマラスミイラ', '', 'Halloween Kalifa' ],
+    1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード', '', 'Halloween Kalifa' ],
+    1297: ['赤犬', '', 'Raid Sakazuki', 'Raid Akainu' ],
+    1298: ['赤犬 マグマ人間', '', 'Raid Sakazuki', 'Raid Akainu' ],
+    1299: ['レベッカ　ラブリーモンスターキャット', '', 'Halloween Rebecca' ],
+    1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード', '', 'Halloween Rebecca' ],
+    1301: ['受刑者　バギー', '', 'Baggy' ],
+    1302: ['受刑者　道化のバギー 脱獄同盟', '', 'Baggy' ],
+    1303: ['脱走囚　ギャルディーノ', '', 'Mr 3', 'Mr. 3' ],
+    1304: ['脱走囚　ギャルディーノ 脱獄同盟', '', 'Mr 3', 'Mr. 3' ],
+    1305: ['シュガー　リトルサキュバス', '', 'Halloween Sugar' ],
+    1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード', '', 'Halloween Sugar' ],
+    1307: ['バルトロメオ　フルムーンウルフ', '', 'Halloween Bartolomeo' ],
+    1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード', '', 'Halloween Bartolomeo' ],
+    1309: ['錦えもん', '', 'Coliseum Kinemon', 'Coliseum Kin\'emon' ],
+    1310: ['狐火の錦えもん', '', 'Coliseum Kinemon', 'Coliseum Kin\'emon' ],
+    1311: ['ボア・マリーゴールド 九蛇の戦士', '', 'Coliseum Marigold', 'Coliseum Boa Marigold' ],
+    1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女', '', 'Coliseum Marigold', 'Coliseum Boa Marigold' ],
+    1313: ['赤犬 海軍本部最高戦力', '', 'Sakazuki' ],
+    1314: ['サカズキ', '', 'Akainu' ],
+    1315: ['海軍本部曹長　コビー “偉大なる航路”の海兵', '', '' ],
+    1316: ['海軍本部曹長　コビー “海軍の英雄”の教え子', '', '' ],
+    1317: ['モンキー・D・ガープ 海軍本部中将', '', '' ],
+    1318: ['ゲンコツのガープ 海軍本部中将', '', '' ],
+    1319: ['つる 海軍本部中将', '', '' ],
+    1320: ['“大参謀”つる 海軍本部中将', '', '' ],
+    1321: ['モモンガ 怪物斬りの名将', '', '' ],
+    1322: ['海軍本部中将モモンガ 怪物斬りの名将', '', '' ],
+    1323: ['オニグモ 八刀流の剣士', '', '' ],
+    1324: ['海軍本部中将オニグモ 八刀流の剣士', '', '' ],
+    1325: ['コラソン　ロイヤルヴァンパイア', '', 'Halloween Corazon' ],
+    1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード', '', 'Halloween Corazon' ],
+    1327: ['レオ トンタッタ族トンタ兵団', '', '' ],
+    1328: ['戦士レオ トンタッタ族トンタ兵団', '', '' ],
+    1329: ['ウィッカ', '', 'Wicka' ],
+    1330: ['ガンチョ', '', '' ],
+    1331: ['マンシェリー トンタ長の娘', '', '' ],
+    1332: ['マンシェリー トンタッタ王国の姫', '', '' ],
+    1333: ['カブ', '', '' ],
+    1334: ['ビアン', '', '' ],
+    1335: ['サボ 貴女との一幕', '', 'Gentleman Sabo' ],
+    1336: ['サボ 劇場の怪人', '', 'Gentleman Sabo' ],
+    1337: ['カン十郎', '', 'Coliseum Kanjuro' ],
+    1338: ['夕立ち　カン十郎', '', 'Coliseum Kanjuro' ],
+    1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）', '', 'Coliseum Chopper', 'Coliseum Tony Tony Chopper' ],
+    1340: ['ゲダツ スカイピア神官', '', 'Coliseum Gedatsu' ],
+    1341: ['空番長　ゲダツ スカイピア神官', '', 'Coliseum Gedatsu' ],
+    1342: ['カーリー・ダダン', '', '' ],
+    1343: ['ポルシェーミ', '', '' ],
+    1344: ['ブルージャム', '', '' ],
+    1345: ['ジンベエ 魚人海賊団船長', '', 'Jinbe', 'Jimbei', 'Jinbei' ],
+    1346: ['ヘラクレス おいはぎの森のスゴ腕先生', '', '' ],
+    1347: ['トリノ王国の怪鳥', '', '' ],
+    1348: ['ヒューマンドリル', '', '' ],
+    1349: ['ハレダス', '', '' ],
+    1350: ['テーナ・ゲーナ王国の手長族', '', '' ],
+    1351: ['テキーラウルフの警備兵', '', '' ],
+    1352: ['エンポリオ・イワンコフ キングオブニューカマー', '', '' ],
+    1353: ['シルバーズ・レイリー 海賊王の船員', '', '' ],
+    1354: ['シルバーズ・レイリー 眠らぬ街のマスター', '', 'Secret Rayleigh' ],
+    1355: ['シルバーズ・レイリー ライムライトに煌く冥王', '', 'Secret Rayleigh' ],
+    1356: ['ペコムズ', '', '' ],
+    1357: ['ペコムズ ビッグ・マム海賊団', '', '' ],
+    1358: ['タマゴ男爵', '', '' ],
+    1359: ['タマゴ男爵 ビッグ・マム海賊団', '', '' ],
+    1360: ['ルフィの冬島冒険', '', 'Winter Luffy' ],
+    1361: ['ロロノア・ゾロ 集結の麦わらの一味', '', 'New World Zoro', 'Timeskip Zoro', 'TS Zoro' ],
+    1362: ['ロロノア・ゾロ 新生・麦わらの一味', '', 'New World Zoro', 'Timeskip Zoro', 'TS Zoro' ],
+    1363: ['フランキー 集結の麦わらの一味', '', 'New World Franky', 'Timeskip Franky', 'TS Franky' ],
+    1364: ['フランキー 新生・麦わらの一味', '', 'New World Franky', 'Timeskip Franky', 'TS Franky' ],
+    1365: ['ナミ 集結の麦わらの一味', '', 'New World Nami', 'Timeskip Nami', 'TS Nami' ],
+    1366: ['ナミ 新生・麦わらの一味', '', 'New World Nami', 'Timeskip Nami', 'TS Nami' ],
+    1367: ['サンジ 集結の麦わらの一味', '', 'New World Sanji', 'Timeskip Sanji', 'TS Sanji' ],
+    1368: ['サンジ 新生・麦わらの一味', '', 'New World Sanji', 'Timeskip Sanji', 'TS Sanji' ],
+    1369: ['トニートニー・チョッパー 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
+    1370: ['トニートニー・チョッパー 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
+    1371: ['ロロノア・ゾロ 野生の海賊', '', 'Wild Zoro' ],
+    1372: ['ロロノア・ゾロ 大地の開拓者', '', 'Wild Zoro' ],
+    1373: ['マゼラン', '', 'Raid Magellan' ],
+    1374: ['マゼラン 監獄署長', '', 'Raid Magellan' ],
+    1375: ['デリンジャー 闘魚の血を引く半魚人', '', 'Coliseum Dellinger' ],
+    1376: ['デリンジャー ディアマンテ軍戦闘員', '', 'Coliseum Dellinger' ],
+    1377: ['マーガレット アマゾン・リリーの弓兵', '', 'Coliseum Marguerite' ],
+    1378: ['マーガレット 九蛇の覇気使い', '', 'Coliseum Marguerite' ],
+    1379: ['シャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks' ],
+    1380: ['赤髪のシャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks' ],
+    1381: ['', '', 'Christmas Tashigi' ],
+    1382: ['', '', 'Christmas Tashigi' ],
+    1383: ['オモチャの兵隊さん', '', 'Toy Soldier', 'Kyros' ],
+    1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros' ],
+    1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca' ],
+    1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca' ],
+    1387: ['', '', 'Mega Luffy', 'Super Luffy' ],
+    1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro', 'Super Zoro' ],
+    1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami', 'Super Nami' ],
+    1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy' ],
+    1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy' ],
+    1392: ['戦桃丸 シャボンディ諸島の壁', '', '' ],
+    1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat' ],
+    1394: ['ベビー５ 神前の晴れ着', '', 'Kimono Baby 5' ],
+    1395: ['ベビー５ ぎこちない振袖', '', 'Kimono Baby 5' ],
+    1396: ['たしぎ シャンブルズ', '', 'Smoker' ],
+    1397: ['たしぎ　七尺十手 シャンブルズ', '', 'Smoker' ],
+    1398: ['スモーカー シャンブルズ', '', 'Tashigi' ],
+    1399: ['スモーカー　時雨 シャンブルズ', '', 'Tashigi' ],
+    1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius' ],
+    1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius' ],
+    1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton' ],
+    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL' ],
+    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL' ],
+    1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp' ],
+    1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp' ],
+    1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin', 'Timeskip Robin', 'TS Robin' ],
+    1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin',, 'Timeskip Robin', 'TS Robin' ],
+    1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook' ],
+    1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook' ],
+    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
+    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
     1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate', 'Super Whitebeard', 'Super WB',],
-    1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
-    1415: ['センゴク 智将', '', ''],
-    1416: ['仏のセンゴク 智将', '', ''],
-    1417: ['ロンズ', '', 'Lonz'],
-    1418: ['カイゼルヒゲ', '', 'Kaiser Mustache'],
-    1419: ['ロブ・ルッチ 紋付袴の手招き', '', 'Kimono Lucci'],
-    1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci'],
-    1421: ['ディアマンテ はためく旗（フラッグ）人間', '', 'Coliseum Diamante'],
-    1422: ['ディアマンテ ドンキホーテファミリー最高幹部', '', 'Coliseum Diamante'],
-    1423: ['Tボーン 海軍本部大佐', '', 'Coliseum T-Bone'],
-    1424: ['ギン 海賊艦隊　戦闘“総隊長”', '', 'Coliseum Gin'],
-    1425: ['サイ 八宝水軍', '', ''],
-    1426: ['サイ 八宝水軍第１３代棟梁', '', ''],
-    1427: ['ブー 八宝水軍', '', ''],
-    1428: ['ジャン・アンゴ', '', ''],
-    1429: ['マンシェリー ２月の本命', '', 'Valentine Mansherry'],
-    1430: ['マンシェリー ３月への勇気', '', 'Valentine Mansherry'],
-    1431: ['フランキー将軍', '', 'General Franky', 'Raid Franky'],
-    1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky', 'Raid Franky'],
-    1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
-    1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', ''],
-    1435: ['ヒョウゾウ 新魚人海賊団', '', ''],
-    1436: ['ヒョウゾウ 魚人街の亡霊', '', ''],
-    1437: ['イカロス・ムッヒ 新魚人海賊団', '', ''],
-    1438: ['イカロス・ムッヒ 魚人街の亡霊', '', ''],
-    1439: ['ダルマ 新魚人海賊団', '', ''],
-    1440: ['ダルマ 魚人街の亡霊', '', ''],
-    1441: ['ゼオ 新魚人海賊団', '', ''],
-    1442: ['ゼオ 魚人街の亡霊', '', ''],
-    1443: ['ドスン 新魚人海賊団', '', ''],
-    1444: ['ドスン 魚人街の亡霊', '', ''],
-    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock', 'Super Boa Hancock'],
-    1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp', 'Super Usopp'],
-    1447: ['サンジ グリル＝ショット', '', 'Mega Sanji', 'Super Sanji'],
-    1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper', 'Super Chopper'],
-    1449: ['ヴァイオレット 踊り娘', '', 'Viola'],
-    1450: ['ヴァイオレット 追われる女', '', 'Viola'],
-    1451: ['サンジ 恋人通りの変装男', '', ''],
-    1452: ['サンジ となり町までの護衛', '', ''],
-    1453: ['マーガレット １３日の胸騒ぎ', '', 'Valentine Marguerite'],
-    1454: ['マーガレット １４日の記念日', '', 'Valentine Marguerite'],
-    1455: ['首領・チンジャオ 八宝水軍', '', 'Coliseum Don Chinjao'],
-    1456: ['首領・チンジャオ 元八宝水軍第１２代棟梁', '', 'Coliseum Don Chinjao'],
-    1457: ['クラハドール 執事', '', 'Coliseum Kuro'],
-    1458: ['百計のクロ 海賊', '', 'Coliseum Kuro'],
-    1459: ['ミス・バレンタイン キロキロの実の能力者', '', 'Coliseum Miss Valentine'],
-    1460: ['ミス・バレンタイン Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Miss Valentine'],
-    1461: ['ゾロの寒稽古', '', 'Winter Zoro'],
-    1462: ['ルフィのブレイクタイム', '', 'White Day Luffy'],
-    1463: ['ルフィのティーパーティ', '', 'White Day Luffy'],
-    1464: ['チョッパーのブレイクタイム', '', 'White Day Chopper'],
-    1465: ['チョッパーのティーパーティ', '', 'White Day Chopper'],
-    1466: ['キャベンディッシュ 白い日の優男', '', 'White Day Cavendish', 'White Day Cabbage'],
-    1467: ['キャベンディッシュ 白い日の白昼夢', '', 'White Day Cavendish', 'White Day Cabbage'],
-    1468: ['戦桃丸 海兵', '', ''],
-    1469: ['鉞の戦桃丸 海兵', '', ''],
-    1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service'],
-    1471: ['深手の・アルビオン', '', ''],
-    1472: ['しらほし姫', '', ''],
-    1473: ['しらほし姫 リュウグウ王国王女', '', ''],
-    1474: ['ネプチューン', '', ''],
-    1475: ['ネプチューン リュウグウ王国国王', '', ''],
-    1476: ['フカボシ', '', ''],
-    1477: ['フカボシ リュウグウ王国王子', '', ''],
-    1478: ['カリブー カリブー海賊団船長', '', ''],
-    1479: ['濡れ髪のカリブー カリブー海賊団船長', '', ''],
-    1480: ['バンダー・デッケン九世 幽霊船の主', '', ''],
-    1481: ['バンダー・デッケン九世 フライング海賊団船長', '', ''],
-    1482: ['マダム・シャーリー', '', '', 'Madame Shirley'],
-    1483: ['マダム・シャーリー 占い師', '', '', 'Madame Shirley'],
-    1484: ['サンジ 野生の海賊', '', 'Wild Sanji'],
-    1485: ['サンジ 大地の開拓者', '', 'Wild Sanji'],
-    1486: ['イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
-    1487: ['破壊砲　イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
-    1488: ['首領・クリーク 海賊艦隊「提督」', '', 'Coliseum Don Krieg'],
-    1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg'],
-    1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5'],
-    1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5'],
-    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo'],
-    1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', ''],
-    1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
-    1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
-    1496: ['一発必中の砲撃部隊 魚人街の無法者', '', ''],
-    1497: ['一発入魂の砲撃部隊 魚人街の無法者', '', ''],
-    1498: ['赤のアンモナイツ 丈夫な警備隊', '', ''],
-    1499: ['青のアンモナイツ 機敏な警備隊', '', ''],
-    1500: ['緑のアンモナイツ 利発な警備隊', '', ''],
-    1501: ['カリブー', '', ''],
-    1502: ['コリブー', '', ''],
-    1503: ['ハモンド', '', ''],
-    1504: ['バンダー・デッケン九世', '', ''],
-    1505: ['ホーディ・ジョーンズ', '', ''],
-    1506: ['ホーディ・ジョーンズ 覚醒', '', ''],
-    1507: ['サンジのブレイクタイム', '', 'White Day Sanji'],
-    1508: ['サンジのティーパーティ', '', 'White Day Sanji'],
-    1509: ['ハルタ 白ひげ海賊団１２番隊隊長', '', ''],
-    1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', ''],
-    1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', ''],
-    1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', 'Heman'],
-    1513: ['サンジ 春先のお付き添い', '', 'Spring Sanji', 'White Day Sanji'],
-    1514: ['サンジ 記念日の手作り', '', 'Spring Sanji', 'White Day Sanji'],
-    1515: ['ブルックのブレイクタイム', '', 'White Day Brook'],
-    1516: ['ブルックのティーパーティ', '', 'White Day Brook'],
-    1517: ['ハイエナのベラミー 元ベラミー海賊団船長', '', 'Raid Bellamy'],
-    1518: ['ハイエナのベラミー ドレスローザの凶弾', '', 'Raid Bellamy'],
-    1519: ['カーリー・ダダン コルボ山　山賊', '', ''],
-    1520: ['カーリー・ダダン ダダン一家　棟梁', '', ''],
-    1521: ['ドグラ', '', ''],
-    1522: ['ポートガス・D・エース 隠された鬼の子', '', 'Kid Ace'],
-    1523: ['トニートニー・チョッパー フラスコの中の大きな夢', '', 'Spring Chopper', 'Sakura Chopper'],
-    1524: ['トニートニー・チョッパー 冬島に見た春の景色', '', 'Spring Chopper', 'Sakura Chopper'],
-    1525: ['首はねスレイマン ディアス海戦Ａ級戦犯', '', 'Coliseum Suleiman'],
-    1526: ['アーロン アーロン一味船長', '', 'Coliseum Arlong'],
-    1527: ['ノコギリのアーロン アーロン一味船長', '', 'Coliseum Arlong'],
-    1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim'],
-    1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
-    1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
-    1531: ['ウソランド', '', 'God Usopp'],
-    1532: ['ゴッド・ウソップ', '', 'God Usopp'],
-    1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', ''],
-    1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', ''],
-    1535: ['デュバル 麦わらの一味の協力者', '', ''],
-    1536: ['デュバル 麦わらの一味の共犯者', '', ''],
-    1537: ['ヘラクレス 麦わらの一味の協力者', '', ''],
-    1538: ['ヘラクレス 麦わらの一味の共犯者', '', ''],
-    1539: ['ペローナ 麦わらの一味の協力者', '', ''],
-    1540: ['ペローナ 麦わらの一味の共犯者', '', ''],
-    1541: ['エリザベス 麦わらの一味の協力者', '', ''],
-    1542: ['エリザベス 麦わらの一味の共犯者', '', ''],
-    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp', 'Super Usopp'],
-    1544: ['コアラ 桜色の待ち合わせ', '', 'Sakura Koala'],
-    1545: ['コアラ 桜色の口元', '', 'Sakura Koala'],
-    1546: ['ソウルキング', '', 'Brook'],
-    1547: ['“ソウルキング”ブルック 海賊', '', 'Brook'],
-    1548: ['テーナ・ゲーナ王国の手長族 “ソウルキング”マネージャー', '', ''],
-    1549: ['ニコ・ロビン 千紫万紅　花畑', '', 'Mega Robin', 'Super Robin'],
-    1550: ['フランキー フランキ～～～ロケットランチャ――', '', 'Mega Franky', 'Super Franky'],
-    1551: ['ブルック 掠り唄　吹雪斬り', '', 'Mega Brook', 'Super Brook'],
-    1552: ['ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
-    1553: ['海賊傭兵　ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
-    1554: ['リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma'],
-    1555: ['剣豪リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma'],
-    1556: ['ワダツミ', '', ''],
-    1557: ['ゼオ', '', ''],
-    1558: ['イカロス', '', ''],
-    1559: ['ヒョウゾウ', '', ''],
-    1560: ['ダルマ', '', ''],
-    1561: ['ドスン', '', ''],
-    1562: ['ホーディ・ジョーンズ 暴走', '', ''],
-    1563: ['“戦う王”エリザベローII世', '', ''],
-    1564: ['“戦う王”エリザベローII世 プロデンス王国', '', ''],
-    1565: ['軍師ダガマ', '', ''],
-    1566: ['軍師ダガマ プロデンス王国', '', ''],
-    1567: ['ボア・ハンコック 少女戦士', '', 'Kid Boa Hancock'],
-    1568: ['ボア・ハンコック お姫さまの片鱗', '', 'Kid Boa Hancock'],
-    1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law'],
-    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
-    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
-    1572: ['ワンダ', '', ''],
-    1573: ['王の鳥　ワンダ', '', ''],
-    1574: ['シシリアン', '', ''],
-    1575: ['全力のシシリアン', '', ''],
-    1576: ['錦えもん ワノ国の侍', '', 'Kin\'emon'],
-    1577: ['狐火の錦えもん ワノ国の侍', '', 'Kin\'emon'],
-    1578: ['モモの助', '', ''],
-    1579: ['モモの助 ワノ国の子', '', ''],
-    1580: ['トラファルガー・ロー パンクハザードの滞在者', '', ''],
-    1581: ['トラファルガー・ロー 二人目の救いの神', '', ''],
-    1582: ['モネ ユキユキの実の雪女', '', ''],
-    1583: ['オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus'],
-    1584: ['殺戮支配者オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus'],
-    1585: ['ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
-    1586: ['勇士の戦友ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
-    1587: ['サンジ ヴィンスモーク家　三男', '', ''],
-    1588: ['サンジ ジェルマ王国　プリンス', '', ''],
-    1589: ['シャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
-    1590: ['赤髪のシャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
-    1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
-    1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
-    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy', 'Super Luffy'],
-    1594: ['藤虎 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
-    1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
-    1596: ['しらほし', '', ''],
-    1597: ['しらほし リュウグウ王国王女', '', ''],
-    1598: ['リュウボシ', '', ''],
-    1599: ['マンボシ', '', ''],
-    1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy'],
-    1601: ['シリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
-    1602: ['雨のシリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
-    1603: ['雷卿マクガイ', '', 'Coliseum McGuy', 'Lightning McGuy'],
-    1604: ['ポートガス・D・エース ルフィの“兄”', '', '0 Stamina Ace'],
-    1605: ['ポートガス・D・エース 白ひげの“息子”', '', '0 Stamina Ace'],
-    1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet'],
-    1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre'],
-    1608: ['ドクＱ 黒ひげ海賊団', '', ''],
-    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', ''],
-    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', ''],
-    1611: ['バーソロミュー・くま 終わらぬ夢の宿敵', '', ''],
-    1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
-    1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
-    1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', ''],
-    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile'],
-    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile'],
-    1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
-    1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
-    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
-    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
-    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
-    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],
-    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],
-    1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
-    1625: ['ダルマ 深海の魚人海賊', '', ''],
-    1626: ['ドスン 深海の魚人海賊', '', ''],
-    1627: ['マッハ・バイス 超体重人間', '', 'Coliseum Mach Vise'],
-    1628: ['マッハ・バイス ディアマンテ軍幹部', '', 'Coliseum Mach Vise'],
-    1629: ['イカロス・ムッヒ 深海の魚人海賊', '', 'Coliseum Ikaros Much'],
-    1630: ['イカロス・ムッヒ 反逆の魚人海賊', '', 'Coliseum Ikaros Much'],
-    1631: ['フィッシャー・タイガー', '', 'Secret Fisher Tiger'],
-    1632: ['フィッシャー・タイガー タイヨウの海賊団船長', '', 'Secret Fisher Tiger'],
-    1633: ['Ｄｒａｇｏｎ パンクハザード生息', '', ''],
-    1634: ['ロック＆スコッチ', '', ''],
-    1635: ['茶ひげ ＰＨ巡回部隊“ボス”', '', ''],
-    1636: ['シーザー・クラウン 元政府の科学者', '', ''],
-    1637: ['Ｍ（マスター）・シーザー 元政府の科学者', '', ''],
-    1638: ['ＰＨガスマスク巡回兵・[力]', '', ''],
-    1639: ['ＰＨガスマスク巡回兵・[速]', '', ''],
-    1640: ['ＰＨガスマスク巡回兵・[技]', '', ''],
-    1641: ['ＰＨガスマスク巡回兵・[知]', '', ''],
-    1642: ['ＰＨガスマスク巡回兵・[心]', '', ''],
-    1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', ''],
-    1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', ''],
-    1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', ''],
-    1646: ['ピーカ「改」', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica'],
-    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica'],
-    1648: ['ジョーラ 芸術人間', '', 'Jora'],
-    1649: ['ジョーラ トレーボル軍', '', 'Jora'],
-    1650: ['ブルック サイケデリックアート', '', ''],
-    1651: ['ネコマムシ', '', 'Cat Viper', 'Nekopara'],
-    1652: ['“夜の王”ネコマムシ', '', 'Cat Viper', 'Nekopara'],
-    1653: ['ペドロ', '', ''],
-    1654: ['木の上のペドロ', '', ''],
-    1655: ['キャロット', '', ''],
-    1656: ['王の鳥　キャロット', '', ''],
-    1657: ['カン十郎 ワノ国の侍', '', ''],
-    1658: ['夕立ち　カン十郎 ワノ国の侍', '', ''],
-    1659: ['雷ぞう', '', ''],
-    1660: ['霧の雷ぞう', '', ''],
-    1661: ['コラソン 消したい雨雲', '', ''],
-    1662: ['コラソン 消える雨音', '', ''],
-    1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci'],
-    1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji', 'Secret Kuzan'],
-    1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji', 'Secret Kuzan'],
-    1666: ['キュロス 無敗の剣闘士', '', ''],
-    1667: ['キュロス リク王軍軍隊長', '', ''],
-    1668: ['青キジ「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan'],
-    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan'],
-    1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley'],
-    1671: ['ケイミー マーメイドカフェ', '', ''],
-    1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug'],
-    1673: ['ペローナ 暗い浜辺のプリンセス', '', 'Swimsuit Perona', 'Summer Perona'],
-    1674: ['ペローナ 大胆水着なプリンセス', '', 'Swimsuit Perona', 'Summer Perona'],
-    1675: ['ロロノア・ゾロ からかさ剣士', '', 'Kimono Zoro'],
-    1676: ['ロロノア・ゾロ 雨濡れ剣客', '', 'Kimono Zoro'],
-    1677: ['トラファルガー・ロー 終わらぬ夢の航跡・ハートの海賊団', '', 'Log Law', 'Secret Law'],
-    1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law'],
-    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
-    1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
-    1681: ['モンキー・D・ルフィ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Luffy'],
-    1682: ['モンキー・D・ルフィ 20th Anniversary Memorial Treasure', '', '20th Anniversary Luffy'],
-    1683: ['ニコ・ロビン Celebrate 20th Anniversary Cruise', '', '20th Anniversary Robin'],
-    1684: ['ニコ・ロビン 20th Anniversary Memorial Treasure', '', '20th Anniversary Robin'],
-    1685: ['ウソップ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Usopp'],
-    1686: ['ウソップ 20th Anniversary Memorial Treasure', '', '20th Anniversary Usopp'],
-    1687: ['フランキー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Franky'],
-    1688: ['フランキー 20th Anniversary Memorial Treasure', '', '20th Anniversary Franky'],
-    1689: ['ユースタス・キッド “南の海”出身の超新星', '', 'Fortnight Kidd'],
-    1690: ['キャプテン・キッド “南の海”出身の超新星', '', 'Fortnight Kidd'],
-    1691: ['ヒート', '', ''],
-    1692: ['ワイヤー', '', ''],
-    1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
-    1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
-    1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo'],
-    1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo'],
-    1697: ['マゼラン 監獄の支配者', '', ''],
-    1698: ['マゼラン 地獄の支配者', '', ''],
+    1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji' ],
+    1415: ['センゴク 智将', '', '' ],
+    1416: ['仏のセンゴク 智将', '', '' ],
+    1417: ['ロンズ', '', 'Lonz' ],
+    1418: ['カイゼルヒゲ', '', 'Kaiser Mustache' ],
+    1419: ['ロブ・ルッチ 紋付袴の手招き', '', 'Kimono Lucci' ],
+    1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci' ],
+    1421: ['ディアマンテ はためく旗（フラッグ）人間', '', 'Coliseum Diamante' ],
+    1422: ['ディアマンテ ドンキホーテファミリー最高幹部', '', 'Coliseum Diamante' ],
+    1423: ['Tボーン 海軍本部大佐', '', 'Coliseum T-Bone' ],
+    1424: ['ギン 海賊艦隊　戦闘“総隊長”', '', 'Coliseum Gin' ],
+    1425: ['サイ 八宝水軍', '', '' ],
+    1426: ['サイ 八宝水軍第１３代棟梁', '', '' ],
+    1427: ['ブー 八宝水軍', '', '' ],
+    1428: ['ジャン・アンゴ', '', '' ],
+    1429: ['マンシェリー ２月の本命', '', 'Valentine Mansherry' ],
+    1430: ['マンシェリー ３月への勇気', '', 'Valentine Mansherry' ],
+    1431: ['フランキー将軍', '', 'General Franky', 'Raid Franky' ],
+    1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky', 'Raid Franky' ],
+    1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', '' ],
+    1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', '' ],
+    1435: ['ヒョウゾウ 新魚人海賊団', '', '' ],
+    1436: ['ヒョウゾウ 魚人街の亡霊', '', '' ],
+    1437: ['イカロス・ムッヒ 新魚人海賊団', '', '' ],
+    1438: ['イカロス・ムッヒ 魚人街の亡霊', '', '' ],
+    1439: ['ダルマ 新魚人海賊団', '', '' ],
+    1440: ['ダルマ 魚人街の亡霊', '', '' ],
+    1441: ['ゼオ 新魚人海賊団', '', '' ],
+    1442: ['ゼオ 魚人街の亡霊', '', '' ],
+    1443: ['ドスン 新魚人海賊団', '', '' ],
+    1444: ['ドスン 魚人街の亡霊', '', '' ],
+    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock', 'Super Boa Hancock' ],
+    1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp', 'Super Usopp' ],
+    1447: ['サンジ グリル＝ショット', '', 'Mega Sanji', 'Super Sanji' ],
+    1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper', 'Super Chopper' ],
+    1449: ['ヴァイオレット 踊り娘', '', 'Viola' ],
+    1450: ['ヴァイオレット 追われる女', '', 'Viola' ],
+    1451: ['サンジ 恋人通りの変装男', '', '' ],
+    1452: ['サンジ となり町までの護衛', '', '' ],
+    1453: ['マーガレット １３日の胸騒ぎ', '', 'Valentine Marguerite' ],
+    1454: ['マーガレット １４日の記念日', '', 'Valentine Marguerite' ],
+    1455: ['首領・チンジャオ 八宝水軍', '', 'Coliseum Don Chinjao' ],
+    1456: ['首領・チンジャオ 元八宝水軍第１２代棟梁', '', 'Coliseum Don Chinjao' ],
+    1457: ['クラハドール 執事', '', 'Coliseum Kuro' ],
+    1458: ['百計のクロ 海賊', '', 'Coliseum Kuro' ],
+    1459: ['ミス・バレンタイン キロキロの実の能力者', '', 'Coliseum Miss Valentine' ],
+    1460: ['ミス・バレンタイン Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Miss Valentine' ],
+    1461: ['ゾロの寒稽古', '', 'Winter Zoro' ],
+    1462: ['ルフィのブレイクタイム', '', 'White Day Luffy' ],
+    1463: ['ルフィのティーパーティ', '', 'White Day Luffy' ],
+    1464: ['チョッパーのブレイクタイム', '', 'White Day Chopper' ],
+    1465: ['チョッパーのティーパーティ', '', 'White Day Chopper' ],
+    1466: ['キャベンディッシュ 白い日の優男', '', 'White Day Cavendish', 'White Day Cabbage' ],
+    1467: ['キャベンディッシュ 白い日の白昼夢', '', 'White Day Cavendish', 'White Day Cabbage' ],
+    1468: ['戦桃丸 海兵', '', '' ],
+    1469: ['鉞の戦桃丸 海兵', '', '' ],
+    1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service' ],
+    1471: ['深手の・アルビオン', '', '' ],
+    1472: ['しらほし姫', '', '' ],
+    1473: ['しらほし姫 リュウグウ王国王女', '', '' ],
+    1474: ['ネプチューン', '', '' ],
+    1475: ['ネプチューン リュウグウ王国国王', '', '' ],
+    1476: ['フカボシ', '', '' ],
+    1477: ['フカボシ リュウグウ王国王子', '', '' ],
+    1478: ['カリブー カリブー海賊団船長', '', '' ],
+    1479: ['濡れ髪のカリブー カリブー海賊団船長', '', '' ],
+    1480: ['バンダー・デッケン九世 幽霊船の主', '', '' ],
+    1481: ['バンダー・デッケン九世 フライング海賊団船長', '', '' ],
+    1482: ['マダム・シャーリー', '', '', 'Madame Shirley' ],
+    1483: ['マダム・シャーリー 占い師', '', '', 'Madame Shirley' ],
+    1484: ['サンジ 野生の海賊', '', 'Wild Sanji' ],
+    1485: ['サンジ 大地の開拓者', '', 'Wild Sanji' ],
+    1486: ['イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo' ],
+    1487: ['破壊砲　イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo' ],
+    1488: ['首領・クリーク 海賊艦隊「提督」', '', 'Coliseum Don Krieg' ],
+    1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg' ],
+    1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5' ],
+    1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5' ],
+    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo' ],
+    1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', '' ],
+    1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', '' ],
+    1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', '' ],
+    1496: ['一発必中の砲撃部隊 魚人街の無法者', '', '' ],
+    1497: ['一発入魂の砲撃部隊 魚人街の無法者', '', '' ],
+    1498: ['赤のアンモナイツ 丈夫な警備隊', '', '' ],
+    1499: ['青のアンモナイツ 機敏な警備隊', '', '' ],
+    1500: ['緑のアンモナイツ 利発な警備隊', '', '' ],
+    1501: ['カリブー', '', '' ],
+    1502: ['コリブー', '', '' ],
+    1503: ['ハモンド', '', '' ],
+    1504: ['バンダー・デッケン九世', '', '' ],
+    1505: ['ホーディ・ジョーンズ', '', '' ],
+    1506: ['ホーディ・ジョーンズ 覚醒', '', '' ],
+    1507: ['サンジのブレイクタイム', '', 'White Day Sanji' ],
+    1508: ['サンジのティーパーティ', '', 'White Day Sanji' ],
+    1509: ['ハルタ 白ひげ海賊団１２番隊隊長', '', '' ],
+    1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', '' ],
+    1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', '' ],
+    1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', 'Heman' ],
+    1513: ['サンジ 春先のお付き添い', '', 'Spring Sanji', 'White Day Sanji' ],
+    1514: ['サンジ 記念日の手作り', '', 'Spring Sanji', 'White Day Sanji' ],
+    1515: ['ブルックのブレイクタイム', '', 'White Day Brook' ],
+    1516: ['ブルックのティーパーティ', '', 'White Day Brook' ],
+    1517: ['ハイエナのベラミー 元ベラミー海賊団船長', '', 'Raid Bellamy' ],
+    1518: ['ハイエナのベラミー ドレスローザの凶弾', '', 'Raid Bellamy' ],
+    1519: ['カーリー・ダダン コルボ山　山賊', '', '' ],
+    1520: ['カーリー・ダダン ダダン一家　棟梁', '', '' ],
+    1521: ['ドグラ', '', '' ],
+    1522: ['ポートガス・D・エース 隠された鬼の子', '', 'Kid Ace' ],
+    1523: ['トニートニー・チョッパー フラスコの中の大きな夢', '', 'Spring Chopper', 'Sakura Chopper' ],
+    1524: ['トニートニー・チョッパー 冬島に見た春の景色', '', 'Spring Chopper', 'Sakura Chopper' ],
+    1525: ['首はねスレイマン ディアス海戦Ａ級戦犯', '', 'Coliseum Suleiman' ],
+    1526: ['アーロン アーロン一味船長', '', 'Coliseum Arlong' ],
+    1527: ['ノコギリのアーロン アーロン一味船長', '', 'Coliseum Arlong' ],
+    1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim' ],
+    1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage' ],
+    1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage' ],
+    1531: ['ウソランド', '', 'God Usopp' ],
+    1532: ['ゴッド・ウソップ', '', 'God Usopp' ],
+    1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', '' ],
+    1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', '' ],
+    1535: ['デュバル 麦わらの一味の協力者', '', '' ],
+    1536: ['デュバル 麦わらの一味の共犯者', '', '' ],
+    1537: ['ヘラクレス 麦わらの一味の協力者', '', '' ],
+    1538: ['ヘラクレス 麦わらの一味の共犯者', '', '' ],
+    1539: ['ペローナ 麦わらの一味の協力者', '', '' ],
+    1540: ['ペローナ 麦わらの一味の共犯者', '', '' ],
+    1541: ['エリザベス 麦わらの一味の協力者', '', '' ],
+    1542: ['エリザベス 麦わらの一味の共犯者', '', '' ],
+    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp', 'Super Usopp' ],
+    1544: ['コアラ 桜色の待ち合わせ', '', 'Sakura Koala' ],
+    1545: ['コアラ 桜色の口元', '', 'Sakura Koala' ],
+    1546: ['ソウルキング', '', 'Brook' ],
+    1547: ['“ソウルキング”ブルック 海賊', '', 'Brook' ],
+    1548: ['テーナ・ゲーナ王国の手長族 “ソウルキング”マネージャー', '', '' ],
+    1549: ['ニコ・ロビン 千紫万紅　花畑', '', 'Mega Robin', 'Super Robin' ],
+    1550: ['フランキー フランキ～～～ロケットランチャ――', '', 'Mega Franky', 'Super Franky' ],
+    1551: ['ブルック 掠り唄　吹雪斬り', '', 'Mega Brook', 'Super Brook' ],
+    1552: ['ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin' ],
+    1553: ['海賊傭兵　ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin' ],
+    1554: ['リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma' ],
+    1555: ['剣豪リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma' ],
+    1556: ['ワダツミ', '', '' ],
+    1557: ['ゼオ', '', '' ],
+    1558: ['イカロス', '', '' ],
+    1559: ['ヒョウゾウ', '', '' ],
+    1560: ['ダルマ', '', '' ],
+    1561: ['ドスン', '', '' ],
+    1562: ['ホーディ・ジョーンズ 暴走', '', '' ],
+    1563: ['“戦う王”エリザベローII世', '', '' ],
+    1564: ['“戦う王”エリザベローII世 プロデンス王国', '', '' ],
+    1565: ['軍師ダガマ', '', '' ],
+    1566: ['軍師ダガマ プロデンス王国', '', '' ],
+    1567: ['ボア・ハンコック 少女戦士', '', 'Kid Boa Hancock' ],
+    1568: ['ボア・ハンコック お姫さまの片鱗', '', 'Kid Boa Hancock' ],
+    1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law' ],
+    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm', 'Dog Storm', 'Doggo Storm' ],
+    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm', 'Dog Storm', 'Doggo Storm' ],
+    1572: ['ワンダ', '', '' ],
+    1573: ['王の鳥　ワンダ', '', '' ],
+    1574: ['シシリアン', '', '' ],
+    1575: ['全力のシシリアン', '', '' ],
+    1576: ['錦えもん ワノ国の侍', '', 'Kin\'emon' ],
+    1577: ['狐火の錦えもん ワノ国の侍', '', 'Kin\'emon' ],
+    1578: ['モモの助', '', '' ],
+    1579: ['モモの助 ワノ国の子', '', '' ],
+    1580: ['トラファルガー・ロー パンクハザードの滞在者', '', '' ],
+    1581: ['トラファルガー・ロー 二人目の救いの神', '', '' ],
+    1582: ['モネ ユキユキの実の雪女', '', '' ],
+    1583: ['オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus' ],
+    1584: ['殺戮支配者オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus' ],
+    1585: ['ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo' ],
+    1586: ['勇士の戦友ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo' ],
+    1587: ['サンジ ヴィンスモーク家　三男', '', '' ],
+    1588: ['サンジ ジェルマ王国　プリンス', '', '' ],
+    1589: ['シャンクス Celebrate the long cruise', '', 'Anniversary Shanks' ],
+    1590: ['赤髪のシャンクス Celebrate the long cruise', '', 'Anniversary Shanks' ],
+    1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa' ],
+    1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa' ],
+    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy', 'Super Luffy' ],
+    1594: ['藤虎 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora' ],
+    1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora' ],
+    1596: ['しらほし', '', '' ],
+    1597: ['しらほし リュウグウ王国王女', '', '' ],
+    1598: ['リュウボシ', '', '' ],
+    1599: ['マンボシ', '', '' ],
+    1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy' ],
+    1601: ['シリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu' ],
+    1602: ['雨のシリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu' ],
+    1603: ['雷卿マクガイ', '', 'Coliseum McGuy', 'Lightning McGuy' ],
+    1604: ['ポートガス・D・エース ルフィの“兄”', '', '0 Stamina Ace' ],
+    1605: ['ポートガス・D・エース 白ひげの“息子”', '', '0 Stamina Ace' ],
+    1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet' ],
+    1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre' ],
+    1608: ['ドクＱ 黒ひげ海賊団', '', '' ],
+    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', '' ],
+    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', '' ],
+    1611: ['バーソロミュー・くま 終わらぬ夢の宿敵', '', '' ],
+    1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', '' ],
+    1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', '' ],
+    1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', '' ],
+    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile' ],
+    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile' ],
+    1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', '' ],
+    1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', '' ],
+    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh' ],
+    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd' ],
+    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd' ],
+    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo' ],
+    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo' ],
+    1624: ['ヒョウゾウ 魚人海賊の用心棒', '', '' ],
+    1625: ['ダルマ 深海の魚人海賊', '', '' ],
+    1626: ['ドスン 深海の魚人海賊', '', '' ],
+    1627: ['マッハ・バイス 超体重人間', '', 'Coliseum Mach Vise', 'Coliseum Machvise' ],
+    1628: ['マッハ・バイス ディアマンテ軍幹部', '', 'Coliseum Mach Vise', 'Coliseum Machvise' ],
+    1629: ['イカロス・ムッヒ 深海の魚人海賊', '', 'Coliseum Ikaros Much' ],
+    1630: ['イカロス・ムッヒ 反逆の魚人海賊', '', 'Coliseum Ikaros Much' ],
+    1631: ['フィッシャー・タイガー', '', 'Secret Fisher Tiger' ],
+    1632: ['フィッシャー・タイガー タイヨウの海賊団船長', '', 'Secret Fisher Tiger' ],
+    1633: ['Ｄｒａｇｏｎ パンクハザード生息', '', '' ],
+    1634: ['ロック＆スコッチ', '', '' ],
+    1635: ['茶ひげ ＰＨ巡回部隊“ボス”', '', '' ],
+    1636: ['シーザー・クラウン 元政府の科学者', '', '' ],
+    1637: ['Ｍ（マスター）・シーザー 元政府の科学者', '', '' ],
+    1638: ['ＰＨガスマスク巡回兵・[力]', '', '' ],
+    1639: ['ＰＨガスマスク巡回兵・[速]', '', '' ],
+    1640: ['ＰＨガスマスク巡回兵・[技]', '', '' ],
+    1641: ['ＰＨガスマスク巡回兵・[知]', '', '' ],
+    1642: ['ＰＨガスマスク巡回兵・[心]', '', '' ],
+    1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', '' ],
+    1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', '' ],
+    1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', '' ],
+    1646: ['ピーカ「改」', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica' ],
+    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica' ],
+    1648: ['ジョーラ 芸術人間', '', 'Jora' ],
+    1649: ['ジョーラ トレーボル軍', '', 'Jora' ],
+    1650: ['ブルック サイケデリックアート', '', '' ],
+    1651: ['ネコマムシ', '', 'Cat Viper', 'Nekopara' ],
+    1652: ['“夜の王”ネコマムシ', '', 'Cat Viper', 'Nekopara' ],
+    1653: ['ペドロ', '', '' ],
+    1654: ['木の上のペドロ', '', '' ],
+    1655: ['キャロット', '', '' ],
+    1656: ['王の鳥　キャロット', '', '' ],
+    1657: ['カン十郎 ワノ国の侍', '', '' ],
+    1658: ['夕立ち　カン十郎 ワノ国の侍', '', '' ],
+    1659: ['雷ぞう', '', '' ],
+    1660: ['霧の雷ぞう', '', '' ],
+    1661: ['コラソン 消したい雨雲', '', '' ],
+    1662: ['コラソン 消える雨音', '', '' ],
+    1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci' ],
+    1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji', 'Secret Kuzan' ],
+    1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji', 'Secret Kuzan' ],
+    1666: ['キュロス 無敗の剣闘士', '', 'Coliseum Kyros' ],
+    1667: ['キュロス リク王軍軍隊長', '', 'Coliseum Kyros' ],
+    1668: ['青キジ「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan' ],
+    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan' ],
+    1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley' ],
+    1671: ['ケイミー マーメイドカフェ', '', '' ],
+    1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug' ],
+    1673: ['ペローナ 暗い浜辺のプリンセス', '', 'Swimsuit Perona', 'Summer Perona' ],
+    1674: ['ペローナ 大胆水着なプリンセス', '', 'Swimsuit Perona', 'Summer Perona' ],
+    1675: ['ロロノア・ゾロ からかさ剣士', '', 'Kimono Zoro' ],
+    1676: ['ロロノア・ゾロ 雨濡れ剣客', '', 'Kimono Zoro' ],
+    1677: ['トラファルガー・ロー 終わらぬ夢の航跡・ハートの海賊団', '', 'Log Law', 'Secret Law' ],
+    1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law' ],
+    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk' ],
+    1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk' ],
+    1681: ['モンキー・D・ルフィ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Luffy' ],
+    1682: ['モンキー・D・ルフィ 20th Anniversary Memorial Treasure', '', '20th Anniversary Luffy' ],
+    1683: ['ニコ・ロビン Celebrate 20th Anniversary Cruise', '', '20th Anniversary Robin' ],
+    1684: ['ニコ・ロビン 20th Anniversary Memorial Treasure', '', '20th Anniversary Robin' ],
+    1685: ['ウソップ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Usopp' ],
+    1686: ['ウソップ 20th Anniversary Memorial Treasure', '', '20th Anniversary Usopp' ],
+    1687: ['フランキー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Franky' ],
+    1688: ['フランキー 20th Anniversary Memorial Treasure', '', '20th Anniversary Franky' ],
+    1689: ['ユースタス・キッド “南の海”出身の超新星', '', 'Fortnight Kidd' ],
+    1690: ['キャプテン・キッド “南の海”出身の超新星', '', 'Fortnight Kidd' ],
+    1691: ['ヒート', '', '' ],
+    1692: ['ワイヤー', '', '' ],
+    1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo' ],
+    1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo' ],
+    1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo' ],
+    1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo' ],
+    1697: ['マゼラン 監獄の支配者', '', '' ],
+    1698: ['マゼラン 地獄の支配者', '', '' ],
     1699: ['ジンベエ “無限地獄”の囚人', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
     1700: ['ジンベエ “地獄”の七武海', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
-    1701: ['エンポリオ・イワンコフ “ニューカマーランド”の囚人', '', ''],
-    1702: ['エンポリオ・イワンコフ “地獄”の革命家', '', ''],
-    1703: ['ハンニャバル 支配者の腹心', '', ''],
-    1704: ['ハンニャバル 今は支配者の腹心', '', ''],
-    1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', ''],
-    1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', ''],
-    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks'],
-    1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
-    1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
-    1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
-    1711: ['ニコ・ロビン 文化の象徴', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
-    1712: ['赤犬 頂上戦争の火蓋', '', 'Secret Akainu'],
-    1713: ['赤犬 頂上戦争の業火', '', 'Secret Akainu'],
-    1714: ['モネ 氷雪の化身', '', ''],
-    1715: ['ヴェルゴ 海軍「Ｇ‐５」基地長', '', ''],
-    1716: ['シーザー・クラウン 死の国の王', '', ''],
-    1717: ['ベガパンクの竜（小型）', '', ''],
-    1718: ['バッファロー ドンキホーテ海賊団　戦闘員', '', ''],
-    1719: ['ベビー５ ドンキホーテ海賊団　使用人兼殺し屋', '', ''],
-    1720: ['ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
-    1721: ['“親分”ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
-    1722: ['海神ネプチューン', '', ''],
-    1723: ['海神ネプチューン リュウグウ王国国王', '', ''],
-    1724: ['フカボシ ネプチューン家三兄弟　長男', '', ''],
-    1725: ['フカボシ 王国軍三強', '', ''],
-    1726: ['サボ「改」 竜の爪', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo'],
-    1727: ['サボ「改」 革命軍参謀総長', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo'],
-    1728: ['たしぎ ビーチの大佐', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
-    1729: ['たしぎ バカンスの大佐ちゃん', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
-    1730: ['ネフェルタリ・ビビ 眩しい純白', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
-    1731: ['ネフェルタリ・ビビ 魅惑の透明感', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
-    1732: ['', '', 'Nekopara', 'Coliseum Nekomamushi'],
-    1733: ['', '', 'Nekopara', 'Coliseum Nekomamushi'],
-    1734: ['シュガー ホビホビの実の能力者', '', ''],
-    1735: ['シュガー トレーボル軍　特別幹部', '', ''],
-    1736: ['トレーボル ベタベタの実の能力者', '', ''],
-    1737: ['トレーボル ドンキホーテファミリー最高幹部', '', ''],
-    1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy'],
-    1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy'],
-    1740: ['ボア・サンダーソニア 麦わらのルフィの協力者', '', ''],
-    1741: ['ボア・サンダーソニア 麦わらのルフィの共犯者', '', ''],
-    1742: ['ボア・マリーゴールド 麦わらのルフィの協力者', '', ''],
-    1743: ['ボア・マリーゴールド 麦わらのルフィの共犯者', '', ''],
-    1744: ['マーガレット 麦わらのルフィの協力者', '', ''],
-    1745: ['マーガレット 麦わらのルフィの共犯者', '', ''],
-    1746: ['ボア・ハンコック 麦わらのルフィの協力者', '', 'Korea Boa'],
-    1747: ['ボア・ハンコック 麦わらのルフィの共犯者', '', 'Korea Boa'],
-    1748: ['ベポ 麦わらのルフィの協力者', '', ''],
-    1749: ['ベポ 麦わらのルフィの共犯者', '', ''],
-    1750: ['“死の外科医”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
-    1751: ['“王下七武海”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
-    1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro'],
-    1753: ['ロロノア・ゾロ 20th Anniversary Memorial Treasure', '', '20th Anniversary Zoro'],
-    1754: ['サンジ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Sanji'],
-    1755: ['サンジ 20th Anniversary Memorial Treasure', '', '20th Anniversary Sanji'],
-    1756: ['ナミ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Nami'],
-    1757: ['ナミ 20th Anniversary Memorial Treasure', '', '20th Anniversary Nami'],
-    1758: ['ブルック Celebrate 20th Anniversary Cruise', '', '20th Anniversary Brook'],
-    1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook'],
-    1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper'],
-    1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper'],
-    1762: ['ロブ・ルッチ 世界政府の怪物', '', 'Rob Lucci'],
-    1763: ['ルッチ　獣人 世界政府の怪物', '', 'Rob Lucci'],
-    1764: ['クザン 元海軍本部最高戦力', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
-    1765: ['足長族　ブルーギリー', '', ''],
-    1766: ['足長族　ブルーギリー 脚功道格闘家', '', ''],
-    1767: ['殺し屋　ファンク兄弟', '', ''],
-    1768: ['アブドーラ＆ジェット 凶悪犯罪者', '', ''],
-    1769: ['ベン・ベックマン 赤髪海賊団副船長', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
-    1770: ['ベン・ベックマン “四皇”赤髪の右腕', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
-    1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
-    1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
-    1773: ['“侍”　錦えもん', '', 'Kin\'emon'],
-    1774: ['“侍”　狐火の錦えもん', '', 'Kin\'emon'],
-    1775: ['“侍”　モモの助', '', ''],
-    1776: ['“龍”　モモの助', '', ''],
-    1777: ['黄猿 聖地からの使者', '', 'Secret Kizaru', 'Secret Borsalino'],
-    1778: ['黄猿 聖地からの光臨', '', 'Secret Kizaru', 'Secret Borsalino'],
-    1779: ['黄猿「改」', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
-    1780: ['黄猿「改」　光人間', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
-    1781: ['闘魚', '', ''],
-    1782: ['首領・チンジャオ チンジャオファミリー', '', ''],
-    1783: ['ハイルディン 巨人傭兵', '', ''],
-    1784: ['藤虎 海軍本部大将', '', ''],
-    1785: ['スパルタン', '', ''],
-    1786: ['ドンキホーテ海賊団構成員 格闘部隊下級兵', '', ''],
-    1787: ['ドンキホーテ海賊団構成員 特攻部隊下級兵', '', ''],
-    1788: ['ドンキホーテ海賊団構成員 特殊部隊下級兵', '', ''],
-    1789: ['ドンキホーテ海賊団構成員 偵察部隊下級兵', '', ''],
-    1790: ['ドンキホーテ海賊団構成員 諜報部隊下級兵', '', ''],
-    1791: ['ルーシー コリーダコロシアムＣブロックの謎の剣闘士', '', 'Luffy'],
-    1792: ['ルーシー コリーダコロシアムＣブロックの風雲児', '', 'Luffy'],
-    1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo'],
-    1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo'],
-    1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', ''],
-    1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', ''],
-    1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', ''],
-    1798: ['ジーザス・バージェス 鳥カゴの中の暗躍者', '', ''],
-    1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', ''],
-    1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', ''],
-    1801: ['バルトロメオ コリーダコロシアムＢブロックの“人食い”', '', ''],
-    1802: ['バルトロメオ 鳥カゴの中の反逆者', '', ''],
-    1803: ['', '', ''],
-    1804: ['', '', ''],
-    1805: ['', '', ''],
-    1806: ['', '', ''],
-    1807: ['', '', ''],
-    1808: ['', '', ''],
-    1809: ['ワンダ モコモ公国', '', ''],
-    1810: ['王の鳥　ワンダ モコモ公国', '', ''],
-    1811: ['キャロット モコモ公国', '', ''],
-    1812: ['王の鳥　キャロット モコモ公国', '', ''],
-    1813: ['コアラ 極秘任務の革命軍', '', ''],
-    1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji'],
-    1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji'],
-    1816: ['ポートガス・D・エース 闇討つ太陽', '', ''],
-    1817: ['', '', ''],
-    1818: ['', '', ''],
-    1819: ['', '', ''],
-    1820: ['', '', ''],
-    1821: ['', '', 'Husbando Sanji'],
-    1822: ['', '', 'Husbando Sanji'],
-    1823: ['', '', ''],
-    1824: ['', '', ''],
-    1825: ['', '', ''],
-    1826: ['', '', ''],
-    1827: ['', '', ''],
-    1828: ['', '', ''],
-    1829: ['', '', ''],
-    1830: ['', '', ''],
+    1701: ['エンポリオ・イワンコフ “ニューカマーランド”の囚人', '', '' ],
+    1702: ['エンポリオ・イワンコフ “地獄”の革命家', '', '' ],
+    1703: ['ハンニャバル 支配者の腹心', '', '' ],
+    1704: ['ハンニャバル 今は支配者の腹心', '', '' ],
+    1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', '' ],
+    1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', '' ],
+    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks' ],
+    1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami' ],
+    1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami' ],
+    1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin' ],
+    1711: ['ニコ・ロビン 文化の象徴', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin' ],
+    1712: ['赤犬 頂上戦争の火蓋', '', 'Secret Akainu' ],
+    1713: ['赤犬 頂上戦争の業火', '', 'Secret Akainu' ],
+    1714: ['モネ 氷雪の化身', '', '' ],
+    1715: ['ヴェルゴ 海軍「Ｇ‐５」基地長', '', '' ],
+    1716: ['シーザー・クラウン 死の国の王', '', '' ],
+    1717: ['ベガパンクの竜（小型）', '', '' ],
+    1718: ['バッファロー ドンキホーテ海賊団　戦闘員', '', '' ],
+    1719: ['ベビー５ ドンキホーテ海賊団　使用人兼殺し屋', '', '' ],
+    1720: ['ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe' ],
+    1721: ['“親分”ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe' ],
+    1722: ['海神ネプチューン', '', '' ],
+    1723: ['海神ネプチューン リュウグウ王国国王', '', '' ],
+    1724: ['フカボシ ネプチューン家三兄弟　長男', '', '' ],
+    1725: ['フカボシ 王国軍三強', '', '' ],
+    1726: ['サボ「改」 竜の爪', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo' ],
+    1727: ['サボ「改」 革命軍参謀総長', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo' ],
+    1728: ['たしぎ ビーチの大佐', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi' ],
+    1729: ['たしぎ バカンスの大佐ちゃん', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi' ],
+    1730: ['ネフェルタリ・ビビ 眩しい純白', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi' ],
+    1731: ['ネフェルタリ・ビビ 魅惑の透明感', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi' ],
+    1732: ['', '', 'Nekopara', 'Coliseum Nekomamushi' ],
+    1733: ['', '', 'Nekopara', 'Coliseum Nekomamushi' ],
+    1734: ['シュガー ホビホビの実の能力者', '', '' ],
+    1735: ['シュガー トレーボル軍　特別幹部', '', '' ],
+    1736: ['トレーボル ベタベタの実の能力者', '', '' ],
+    1737: ['トレーボル ドンキホーテファミリー最高幹部', '', '' ],
+    1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy' ],
+    1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy' ],
+    1740: ['ボア・サンダーソニア 麦わらのルフィの協力者', '', '' ],
+    1741: ['ボア・サンダーソニア 麦わらのルフィの共犯者', '', '' ],
+    1742: ['ボア・マリーゴールド 麦わらのルフィの協力者', '', '' ],
+    1743: ['ボア・マリーゴールド 麦わらのルフィの共犯者', '', '' ],
+    1744: ['マーガレット 麦わらのルフィの協力者', '', '' ],
+    1745: ['マーガレット 麦わらのルフィの共犯者', '', '' ],
+    1746: ['ボア・ハンコック 麦わらのルフィの協力者', '', 'Korea Boa' ],
+    1747: ['ボア・ハンコック 麦わらのルフィの共犯者', '', 'Korea Boa' ],
+    1748: ['ベポ 麦わらのルフィの協力者', '', '' ],
+    1749: ['ベポ 麦わらのルフィの共犯者', '', '' ],
+    1750: ['“死の外科医”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law' ],
+    1751: ['“王下七武海”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law' ],
+    1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro' ],
+    1753: ['ロロノア・ゾロ 20th Anniversary Memorial Treasure', '', '20th Anniversary Zoro' ],
+    1754: ['サンジ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Sanji' ],
+    1755: ['サンジ 20th Anniversary Memorial Treasure', '', '20th Anniversary Sanji' ],
+    1756: ['ナミ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Nami' ],
+    1757: ['ナミ 20th Anniversary Memorial Treasure', '', '20th Anniversary Nami' ],
+    1758: ['ブルック Celebrate 20th Anniversary Cruise', '', '20th Anniversary Brook' ],
+    1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook' ],
+    1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper' ],
+    1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper' ],
+    1762: ['ロブ・ルッチ 世界政府の怪物', '', 'Rob Lucci' ],
+    1763: ['ルッチ　獣人 世界政府の怪物', '', 'Rob Lucci' ],
+    1764: ['クザン 元海軍本部最高戦力', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan' ],
+    1765: ['足長族　ブルーギリー', '', '' ],
+    1766: ['足長族　ブルーギリー 脚功道格闘家', '', '' ],
+    1767: ['殺し屋　ファンク兄弟', '', '' ],
+    1768: ['アブドーラ＆ジェット 凶悪犯罪者', '', '' ],
+    1769: ['ベン・ベックマン 赤髪海賊団副船長', '', 'Secret Benn Beckman', 'Secret Ben Beckman' ],
+    1770: ['ベン・ベックマン “四皇”赤髪の右腕', '', 'Secret Benn Beckman', 'Secret Ben Beckman' ],
+    1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma' ],
+    1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma' ],
+    1773: ['“侍”　錦えもん', '', 'Kin\'emon' ],
+    1774: ['“侍”　狐火の錦えもん', '', 'Kin\'emon' ],
+    1775: ['“侍”　モモの助', '', '' ],
+    1776: ['“龍”　モモの助', '', '' ],
+    1777: ['黄猿 聖地からの使者', '', 'Secret Kizaru', 'Secret Borsalino' ],
+    1778: ['黄猿 聖地からの光臨', '', 'Secret Kizaru', 'Secret Borsalino' ],
+    1779: ['黄猿「改」', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino' ],
+    1780: ['黄猿「改」　光人間', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino' ],
+    1781: ['闘魚', '', '' ],
+    1782: ['首領・チンジャオ チンジャオファミリー', '', '' ],
+    1783: ['ハイルディン 巨人傭兵', '', '' ],
+    1784: ['藤虎 海軍本部大将', '', '' ],
+    1785: ['スパルタン', '', '' ],
+    1786: ['ドンキホーテ海賊団構成員 格闘部隊下級兵', '', '' ],
+    1787: ['ドンキホーテ海賊団構成員 特攻部隊下級兵', '', '' ],
+    1788: ['ドンキホーテ海賊団構成員 特殊部隊下級兵', '', '' ],
+    1789: ['ドンキホーテ海賊団構成員 偵察部隊下級兵', '', '' ],
+    1790: ['ドンキホーテ海賊団構成員 諜報部隊下級兵', '', '' ],
+    1791: ['ルーシー コリーダコロシアムＣブロックの謎の剣闘士', '', 'Luffy', 'Coliseum Luffy', 'Coliseum Lucy' ],
+    1792: ['ルーシー コリーダコロシアムＣブロックの風雲児', '', 'Luffy', 'Coliseum Luffy', 'Coliseum Lucy' ],
+    1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo' ],
+    1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo' ],
+    1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', '' ],
+    1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', '' ],
+    1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', '' ],
+    1798: ['ジーザス・バージェス 鳥カゴの中の暗躍者', '', '' ],
+    1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', '' ],
+    1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', '' ],
+    1801: ['バルトロメオ コリーダコロシアムＢブロックの“人食い”', '', '' ],
+    1802: ['バルトロメオ 鳥カゴの中の反逆者', '', '' ],
+    1803: ['', '', '' ],
+    1804: ['', '', '' ],
+    1805: ['', '', '' ],
+    1806: ['', '', '' ],
+    1807: ['', '', '' ],
+    1808: ['', '', '' ],
+    1809: ['ワンダ モコモ公国', '', '' ],
+    1810: ['王の鳥　ワンダ モコモ公国', '', '' ],
+    1811: ['キャロット モコモ公国', '', '' ],
+    1812: ['王の鳥　キャロット モコモ公国', '', '' ],
+    1813: ['コアラ 極秘任務の革命軍', '', '' ],
+    1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji' ],
+    1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji' ],
+    1816: ['ポートガス・D・エース 闇討つ太陽', '', '' ],
+    1817: ['', '', '' ],
+    1818: ['', '', '' ],
+    1819: ['', '', '' ],
+    1820: ['', '', '' ],
+    1821: ['', '', 'Husbando Sanji' ],
+    1822: ['', '', 'Husbando Sanji' ],
+    1823: ['', '', '' ],
+    1824: ['', '', '' ],
+    1825: ['', '', '' ],
+    1826: ['', '', '' ],
+    1827: ['', '', '' ],
+    1828: ['', '', '' ],
+    1829: ['', '', '' ],
+    1830: ['', '', '' ],
 };
 
-//  xxxx: ['JPN', 'FR', 'Other'],
+//  xxxx: ['JPN', 'FR', 'Other' ],

From 4352ffe1ef5ab4dd5b9831e26b6cefee7f031f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 13 Oct 2017 19:32:04 +0200
Subject: [PATCH 1396/1569] Aliases still

Sorry I did mess the previous commit. This is the same but with way less green on screen [allegedly]
---
 common/data/aliases.js | 3534 ++++++++++++++++++++--------------------
 1 file changed, 1767 insertions(+), 1767 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 2a57dd535..1b3db72e6 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1,1051 +1,1051 @@
 window.aliases = {
-    1: ['モンキー・D・ルフィ', 'Monkey D. Luffy' ],
-    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)', 'Monkey D. Luffy Gum-Gum Carabine' ],
-    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ', 'Monkey D. Luffy Gum-Gum Bazooka' ],
-    4: ['モンキー・D・ルフィ ギア２', 'Monkey D. Luffy Gear 2', 'Monkey D. Luffy', ' G2' ],
-    5: ['ロロノア・ゾロ', 'Roronoa Zoro' ],
-    6: ['ロロノア・ゾロ 三・千・世・界', 'Roronoa Zoro Moulinet Infernal' ],
-    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）', 'Roronoa Zoro Calibre' ],
-    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）', 'Roronoa Zoro Brume Argentée' ],
-    9: ['ナミ', 'Nami' ],
-    10: ['ナミ トルネード=テンポ', 'Nami Tornado Tempo' ],
-    11: ['ナミ 蜃気楼＝テンポ', 'Nami MirageTempo' ],
-    12: ['ナミ サンダーボルト=テンポ', 'Nami Fulguro Tempo' ],
-    13: ['ウソップ', 'Usopp' ],
-    14: ['ウソップ タバスコ星', 'Usopp Etoile Piquante' ],
-    15: ['ウソップ ゴールデンパウンド', 'Usopp Usopp-Pilon doré', 'GPU' ],
-    16: [ 'そげキング', 'Sniperking', 'Usopp' ],
-    17: ['サンジ', 'Sanji' ],
-    18: ['サンジ 整形ショット(パラージュショット)', 'Sanji Tir esthétique' ],
-    19: ['料理人サンジ 焼き石シチュー', 'Chef Sanji Ragoût bouillonnant' ],
-    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)', 'Sanji Jambe du diable' ],
-    21: ['トニートニー・チョッパー', 'Tony Tony Chopper' ],
-    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）', 'Tony Tony Chopper Weight Boost' ],
-    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）', 'Tony Tony Chopper Brain Boost' ],
-    24: ['トニートニー・チョッパー 腕力強化（アームポイント）', 'Tony Tony Chopper Arm Boost' ],
-    25: ['トニートニー・チョッパー 角強化（ホーンポイント）', 'Tony Tony Chopper Horn Boost' ],
-    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）', 'Tony Tony Chopper Guard Boost' ],
-    27: ['ヒグマ', 'Higuma' ],
-    28: ['近海の主（ヌシ）', 'Seigneur de la côte' ],
-    29: ['金棒のアルビダ', 'Alvida à la Massue' ],
-    30: ['金棒のアルビダ スベスベの実', 'Alvida à la Massue Fruit Glisse-Glisse' ],
-    31: ['コビー', 'Kobby' ],
-    32: ['雑用コビー', 'Kobby le mousse' ],
-    33: ['ヘルメッポ', 'Hermep' ],
-    34: ['雑用ヘルメッポ', 'Hermep le mousse' ],
-    35: ['斧手のモーガン', 'Morgan le Hacheur' ],
-    36: ['モージ＆リッチー', 'Morge et Richy' ],
-    37: ['曲芸のカバジ', 'Cabaji l\'acrobate' ],
-    38: ['バギー', 'Baggy' ],
-    39: ['道化のバギー', 'Baggy le Clown' ],
-    40: ['ガイモン', 'Gaimon' ],
-    41: ['シャム', 'Sham' ],
-    42: ['ブチ', 'Buchi' ],
-    43: ['１・２のジャンゴ', 'Jango l\'hypnotiseur' ],
-    44: ['ダンシングジャンゴ', 'Jango le danseur' ],
-    45: ['キャプテン・クロ', 'Capitaine Kuro' ],
-    46: ['百計のクロ', 'Kuro les pattes de velours' ],
-    47: ['ヨサク', 'Yosaku' ],
-    48: ['ジョニー', 'Jhonny' ],
-    49: ['鉄拳のフルボディ', 'Fullbody au poing d\'acier' ],
-    50: ['パティ', 'Patty' ],
-    51: ['カルネ', 'Carne' ],
-    52: ['料理長ゼフ', 'Zeff le chef' ],
-    53: ['ギン', 'Gyn' ],
-    54: ['鬼人ギン', 'Gyn le démon enragé' ],
-    55: ['パール', 'Pearl' ],
-    56: ['ファイヤーパール', 'Fire Pearl' ],
-    57: ['首領・クリーク', 'Don Krieg ' ],
-    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」', 'Don Krieg Bombe à gaz toxique MH5' ],
-    59: ['ネズミ', 'Nezumi' ],
-    60: ['モーム', 'Meuh-Meuh' ],
-    61: ['チュウ', 'Smack' ],
-    62: ['クロオビ', 'Kuroobi' ],
-    63: ['はっちゃん', 'Octy', 'Hachi' ],
-    64: ['六刀流のハチ', 'Octy aux six lames', 'Hatchan' ],
-    65: ['アーロン', 'Arlong' ],
-    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）', 'Arlong enragé Squalo Crunch' ],
-    67: ['たしぎ', 'Tashigi' ],
-    68: ['たしぎ 海軍本部少尉', 'Tashigi Lieutenant-colonel de la Marine' ],
-    69: ['スモーカー', 'Smoker' ],
-    70: ['白猟のスモーカー', 'Smoker le chasseur blanc' ],
-    71: ['ミス・ウェンズデー', 'Miss Wednesday' ],
-    72: ['ネフェルタリ・ビビ', 'Vivi Nerfertari' ],
-    73: ['王女ビビ', 'Princesse Vivi' ],
-    74: ['ポートガス・D・エース', 'Portgas D. Ace' ],
-    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）', 'Portgas D. Ace Pyro-miroir' ],
-    76: ['シャンクス', 'Shanks' ],
-    77: ['赤髪のシャンクス', 'Shanks le Roux' ],
-    78: ['赤盗人ペンギン', 'Pingouin chapardeur rouge' ],
-    79: ['青盗人ペンギン', 'Pingouin chapardeur bleu' ],
-    80: ['緑盗人ペンギン', 'Pingouin chapardeur vert' ],
-    81: ['黄盗人ペンギン', 'Pingouin chapardeur jaune' ],
-    82: ['黒盗人ペンギン', 'Pingouin chapardeur noir' ],
-    83: ['虹盗人ペンギン', 'Pingouin chapardeur arc-en-ciel' ],
-    84: ['赤海賊ペンギン', 'Pingouin pirate rouge' ],
-    85: ['赤海賊ペンギン', 'Pingouin pirate bleu' ],
-    86: ['赤海賊ペンギン', 'Pingouin pirate vert' ],
-    87: ['赤海賊ペンギン', 'Pingouin pirate jaune' ],
-    88: ['赤海賊ペンギン', 'Pingouin pirate noir' ],
-    89: ['赤カブトヤドカリ', 'Bernard-l\'ermite rouge' ],
-    90: ['赤カブトヤドカリ', 'Bernard-l\'ermite bleu' ],
-    91: ['赤カブトヤドカリ', 'Bernard-l\'ermite vert' ],
-    92: ['赤カブトヤドカリ', 'Bernard-l\'ermite jaune' ],
-    93: ['赤カブトヤドカリ', 'Bernard-l\'ermite noir' ],
-    94: ['赤カブトヤドカリ', 'Bernard-l\'ermite arc-en-ciel' ],
-    95: ['赤ヨロイガニ', 'Crabe blindé rouge' ],
-    96: ['赤ヨロイガニ', 'Crabe blindé bleu' ],
-    97: ['赤ヨロイガニ', 'Crabe blindé vert' ],
-    98: ['赤ヨロイガニ', 'Crabe blindé jaune' ],
-    99: ['赤ヨロイガニ', 'Crabe blindé noir' ],
-    100: ['赤しま番竜', 'Dragon rayé rouge' ],
-    101: ['赤しま番竜', 'Dragon rayé bleu' ],
-    102: ['赤しま番竜', 'Dragon rayé vert' ],
-    103: ['赤しま番竜', 'Dragon rayé jaune' ],
-    104: ['赤しま番竜', 'Dragon rayé noir' ],
-    105: ['赤タカラガメ', 'Tortue-trésor rouge', 'Baby Turtle' ],
-    106: ['赤タカラガメ', 'Tortue-trésor bleue', 'Baby Turtle' ],
-    107: ['赤タカラガメ', 'Tortue-trésor verte', 'Baby Turtle' ],
-    108: ['赤タカラガメ', 'Tortue-trésor jaune', 'Baby Turtle' ],
-    109: ['赤タカラガメ', 'Tortue-trésor noire', 'Baby Turtle' ],
-    110: ['赤ダイミョウガメ', 'Tortue noble rouge' ],
-    111: ['赤ダイミョウガメ', 'Tortue noble bleue' ],
-    112: ['赤ダイミョウガメ', 'Tortue noble verte' ],
-    113: ['赤ダイミョウガメ', 'Tortue noble jaune' ],
-    114: ['赤ダイミョウガメ', 'Tortue noble noire' ],
-    115: ['タツノコ', 'Poney marin' ],
-    116: ['タツノワカ', 'Poulain marin' ],
-    117: ['タツノミコト', 'Cheval marin' ],
-    118: ['タツノオウ', 'Étalon marin' ],
-    119: ['カタナ山賊', '' ],
-    120: ['ピストル山賊', '' ],
-    121: ['格闘隊 雑用 レッドパイレーツ', '' ],
-    122: ['格闘隊 雑用 ブルーパイレーツ', '' ],
-    123: ['格闘隊 雑用 グリーンパイレーツ', '' ],
-    124: ['格闘隊 雑用 イエローパイレーツ', '' ],
-    125: ['格闘隊 雑用 ブラックパイレーツ', '' ],
-    126: ['斬撃隊 雑用 レッドパイレーツ', '' ],
-    127: ['斬撃隊 雑用 ブルーパイレーツ', '' ],
-    128: ['斬撃隊 雑用 グリーンパイレーツ', '' ],
-    129: ['斬撃隊 雑用 イエローパイレーツ', '' ],
-    130: ['斬撃隊 雑用 ブラックパイレーツ', '' ],
-    131: ['突撃隊 雑用 レッドパイレーツ', '' ],
-    132: ['突撃隊 雑用 ブルーパイレーツ', '' ],
-    133: ['突撃隊 雑用 グリーンパイレーツ', '' ],
-    134: ['突撃隊 雑用 イエローパイレーツ', '' ],
-    135: ['突撃隊 雑用 ブラックパイレーツ', '' ],
-    136: ['狙撃隊 雑用 レッドパイレーツ', '' ],
-    137: ['狙撃隊 雑用 ブルーパイレーツ', '' ],
-    138: ['狙撃隊 雑用 グリーンパイレーツ', '' ],
-    139: ['狙撃隊 雑用 イエローパイレーツ', '' ],
-    140: ['狙撃隊 雑用 ブラックパイレーツ', '' ],
-    141: ['砲撃手 雑用', '' ],
-    142: ['格闘隊 隊員 レッドパイレーツ', '' ],
-    143: ['格闘隊 隊員 ブルーパイレーツ', '' ],
-    144: ['格闘隊 隊員 グリーンパイレーツ', '' ],
-    145: ['格闘隊 隊員 イエローパイレーツ', '' ],
-    146: ['格闘隊 隊員 ブラックパイレーツ', '' ],
-    147: ['斬撃隊 隊員 レッドパイレーツ', '' ],
-    148: ['斬撃隊 隊員 ブルーパイレーツ', '' ],
-    149: ['斬撃隊 隊員 グリーンパイレーツ', '' ],
-    150: ['斬撃隊 隊員 イエローパイレーツ', '' ],
-    151: ['斬撃隊 隊員 ブラックパイレーツ', '' ],
-    152: ['突撃隊 隊員 レッドパイレーツ', '' ],
-    153: ['突撃隊 隊員 ブルーパイレーツ', '' ],
-    154: ['突撃隊 隊員 グリーンパイレーツ', '' ],
-    155: ['突撃隊 隊員 イエローパイレーツ', '' ],
-    156: ['突撃隊 隊員 ブラックパイレーツ', '' ],
-    157: ['狙撃隊 隊員 レッドパイレーツ', '' ],
-    158: ['狙撃隊 隊員 ブルーパイレーツ', '' ],
-    159: ['狙撃隊 隊員 グリーンパイレーツ', '' ],
-    160: ['狙撃隊 隊員 イエローパイレーツ', '' ],
-    161: ['狙撃隊 隊員 ブラックパイレーツ', '' ],
-    162: ['砲撃手 腕利き', '' ],
-    163: ['ボディガード・サングラス', '' ],
-    164: ['ボディガード・ヒゲ', '' ],
-    165: ['ナックルごろつき クロネコ海賊団', '' ],
-    166: ['サーベルごろつき クロネコ海賊団', '' ],
-    167: ['ナギナタごろつき クロネコ海賊団', '' ],
-    168: ['ピストルごろつき クロネコ海賊団', '' ],
-    169: ['バズーカごろつき クロネコ海賊団', '' ],
-    170: ['格闘隊 隊長', '' ],
-    171: ['斬撃隊 隊長', '' ],
-    172: ['突撃隊 隊長', '' ],
-    173: ['狙撃隊 隊長', '' ],
-    174: ['遊撃手 凄腕', '' ],
-    175: ['空手使いの魚人 アーロン一味', '' ],
-    176: ['カタナ使いの魚人 アーロン一味', '' ],
-    177: ['ヤリ使いの魚人 アーロン一味', '' ],
-    178: ['銃使いの魚人 アーロン一味', '' ],
-    179: ['ナックル三等兵 海軍', '' ],
-    180: ['サーベル三等兵 海軍', '' ],
-    181: ['ナギナタ三等兵 海軍', '' ],
-    182: ['ピストル三等兵 海軍', '' ],
-    183: ['バズーカ三等兵 海軍', '' ],
-    184: ['ナックル一等兵 海軍', '' ],
-    185: ['サーベル一等兵 海軍', '' ],
-    186: ['ナギナタ一等兵 海軍', '' ],
-    187: ['ピストル一等兵 海軍', '' ],
-    188: ['バズーカ一等兵 海軍', '' ],
-    189: ['赤タイロウガメ', '' ],
-    190: ['青タイロウガメ', '' ],
-    191: ['青タイロウガメ', '' ],
-    192: ['青タイロウガメ', '' ],
-    193: ['青タイロウガメ', '' ],
-    194: ['ナックル少尉 海軍本部', '' ],
-    195: ['サーベル少尉 海軍本部', '' ],
-    196: ['ナギナタ少尉 海軍本部', '' ],
-    197: ['ピストル少尉 海軍本部', '' ],
-    198: ['バズーカ少尉 海軍本部', '' ],
-    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)', '', 'Mr 5' ],
-    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）', '', 'Mr 5' ],
-    201: ['ミス・バレンタイン', '' ],
-    202: ['ミス・バレンタイン 1万キロギロチン', '' ],
-    203: ['Mr.3', '', 'Mr 3' ],
-    204: ['Mr.3 特大キャンドルサービスセット', '', 'Mr 3' ],
-    205: ['ミス・ゴールデンウィーク', '' ],
-    206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑', '' ],
-    207: ['Mr.2・ボン・クレー ', '', 'Mr. 2 Bonclay', 'Mr 2 Bonclay' ],
-    208: ['Mr.2・ボン・クレー  爆撃白鳥アラベスク(ボンバルディエ)', '', 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
-    209: ['ミス・オールサンデー バロックワークス副社長', '', 'Nico Robin' ],
-    210: ['ニコ・ロビン', '' ],
-    211: ['Mr.9', '', 'Mr 9' ],
-    212: ['Mr.9 （熱血ナイン根性バット）', '', 'Mr 9 Hot Blooded Bat' ],
-    213: ['ラブーン', '' ],
-    214: ['ラブーン(ルフィ落書き)', '' ],
-    215: ['大王イカ', '' ],
-    216: ['モンキー・D・ルフィ（ゴムゴムの風船）', '' ],
-    217: ['モンキー・D・ルフィ（ギア３）', '', 'Mistake', 'G3', 'Gear 3' ],
-    218: ['ゾロ_刀狼流し（とうろうながし）', '' ],
-    219: ['ロロノア・ゾロ_獅子歌歌（ししソンソン）', '', 'LS Zoro' ],
-    220: ['ナミ（ファイン=テンポ）', '' ],
-    221: ['ナミ（幸せパンチ）', '', 'Towel Nami', 'TNami' ],
-    222: ['ウソップ（ウソップハンマー）', '' ],
-    223: ['ウソップ（衝撃（インパクト））', '' ],
-    224: ['Mr.プリンス（羊肉（ムートン）ショット）', '', 'Sanji', 'Mr Prince Mutton Shot' ],
-    225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）', '', 'Sanji', 'Mr Prince Veau Shot' ],
-    226: ['ジュラキュール・ミホーク', '', 'Raidhawk', 'Raid Mihawk' ],
-    227: ['鷹の目のミホーク', '', 'Raidhawk', 'Raid Mihawk' ],
-    228: ['脱獄モーガン', '' ],
-    229: ['寝返りのジャンゴ', '' ],
-    230: ['両鉄拳のフルボディ', '' ],
-    231: ['ヒナ', '' ],
-    232: ['黒檻のヒナ', '' ],
-    233: ['Mr.8', '', 'mr 8' ],
-    234: ['Mr.8 イガラッパッパ', '', 'mr 8' ],
-    235: ['ミス・マンデー', '' ],
-    236: ['ミス・マンデー カ・イ・リ・キ メリケン', '' ],
-    237: ['ナックルミリオンズ バロックワークス', '' ],
-    238: ['サーベルミリオンズ バロックワークス', '' ],
-    239: ['ナギナタミリオンズ バロックワークス', '' ],
-    240: ['ピストルミリオンズ バロックワークス', '' ],
-    241: ['バズーカミリオンズ バロックワークス', '' ],
-    242: ['ナックルビリオンズ バロックワークス', '' ],
-    243: ['サーベルビリオンズ バロックワークス', '' ],
-    244: ['ナギナタビリオンズ バロックワークス', '' ],
-    245: ['ピストルビリオンズ バロックワークス', '' ],
-    246: ['バズーカビリオンズ バロックワークス', '' ],  
-    247: ['チョッパーマン', '', 'Chopperman', 'Chopper Man' ],
-    248: ['トニートニー・チョッパー 暴走前', '', 'Raid Monster Chopper', 'MC' ],
-    249: ['トニートニー・チョッパー 暴走後', '', 'Raid Monster Chopper', 'MC' ],
-    250: ['マルコ', '' ],
-    251: ['不死鳥マルコ', '' ],
-    252: ['ジョズ', '' ],
-    253: ['ダイヤモンド・ジョズ', '' ],
-    254: ['ビスタ', '' ],
-    255: ['花剣のビスタ', '' ],
-    256: ['イゾウ', '' ],
-    257: ['短筒使いのイゾウ', '' ],
-    258: ['ブラメンコ', '' ],
-    259: ['大槌のブラメンコ', '' ],
-    260: ['エドワード・ニューゲート', '', 'Whitebeard', 'WB' ],
-    261: ['白ひげ', '', 'Edward Newgate', 'WB' ],
-    262: ['特訓コビー', '' ],
-    263: ['曹長コビー', '' ],
-    264: ['特訓ヘルメッポ', '' ],
-    265: ['軍曹ヘルメッポ', '' ],
-    266: ['虹海賊ペンギン', '' ],
-    267: ['虹しま番竜', '' ],
-    268: ['白猟のスモーカー ビローアバイク', '', 'WC Smoker' ],
-    269: ['格闘隊　武装隊員 レッドパイレーツ', '' ],
-    270: ['格闘隊　武装隊員 ブルーパイレーツ', '' ],
-    271: ['格闘隊　武装隊員 グリーンパイレーツ', '' ],
-    272: ['格闘隊　武装隊員 イエローパイレーツ', '' ],
-    273: ['格闘隊　武装隊員 ブラックパイレーツ', '' ],
-    274: ['斬撃隊　武装隊員 レッドパイレーツ', '' ],
-    275: ['斬撃隊　武装隊員 ブルーパイレーツ', '' ],
-    276: ['斬撃隊　武装隊員 グリーンパイレーツ', '' ],
-    277: ['斬撃隊　武装隊員 イエローパイレーツ', '' ],
-    278: ['斬撃隊　武装隊員 ブラックパイレーツ', '' ],
-    279: ['突撃隊　武装隊員 レッドパイレーツ', '' ],
-    280: ['突撃隊　武装隊員 ブルーパイレーツ', '' ],
-    281: ['突撃隊　武装隊員 グリーンパイレーツ', '' ],
-    282: ['突撃隊　武装隊員 イエローパイレーツ', '' ],
-    283: ['突撃隊　武装隊員 ブラックパイレーツ', '' ],
-    284: ['狙撃隊　武装隊員 レッドパイレーツ', '' ],
-    285: ['狙撃隊　武装隊員 ブルーパイレーツ', '' ],
-    286: ['狙撃隊　武装隊員 グリーンパイレーツ', '' ],
-    287: ['狙撃隊　武装隊員 イエローパイレーツ', '' ],
-    288: ['狙撃隊　武装隊員 ブラックパイレーツ', '' ],
-    289: ['砲撃手　敏腕', '' ],
-    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）', '', 'Mr 13 and Ms Friday the Unluckies' ],
-    291: ['ドリー', '' ],
-    292: ['ブロギー', '' ],
-    293: ['トリケラトプス', '' ],
-    294: ['レックス', '' ],
-    295: ['ブロントザウルス', '' ],
-    296: ['おつるさん', '' ],
-    297: ['大参謀つる', '' ],
-    298: ['モモンガ', '' ],
-    299: ['オニグモ', '' ],
-    300: ['赤アーマーロブスター', '' ],
-    301: ['青アーマーロブスター', '' ],
-    302: ['緑アーマーロブスター', '' ],
-    303: ['黄アーマーロブスター', '' ],
-    304: ['黒アーマーロブスター', '' ],
-    305: ['モンキー・D・ガープ', '', 'Raid Garp' ],
-    306: ['ゲンコツのガープ', '', 'Raid Garp' ],
-    307: ['トラファルガー・ロー', '', 'Supernova Law' ],
-    308: ['トラファルガー・ロー ROOMバジル・ホーキンス', '', 'Supernova Law' ],
-    309: ['バジル・ホーキンス', '', 'Supernova Hawkins' ],
-    310: ['魔術師バジル・ホーキンス', '', 'Supernova Hawkins' ],
-    311: ['キラー', '', 'Supernova Killer' ],
-    312: ['殺戮武人キラー', '', 'Supernova Killer' ],
-    313: ['ウルージ', '', 'Supernova Urouge' ],
-    314: ['怪僧ウルージ', '', 'Supernova Urouge' ],
-    315: ['ベポ', '' ],
-    316: ['武闘家のベポ', '' ],
-    317: ['カリファ', '', 'Califa', 'Calipha', 'Kalipha' ],
-    318: ['美人秘書カリファ', '', 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
-    319: ['パウリー', '' ],
-    320: ['パウリー 1番ドック艤装(ぎそう)・マスト職職長', '' ],
-    321: ['ロブ・ルッチ', '' ],
-    322: ['ロブ・ルッチ 1番ドック木びき・木釘職職長', '' ],
-    323: ['カク', '' ],
-    324: ['カク 1番ドック大工職職長', '' ],
-    325: ['ルル', '' ],
-    326: ['ワポル', '' ],
-    327: ['ワポルハウス', '' ],
-    328: ['ドルトン', '' ],
-    329: ['ドルトン 野牛（バイソン）', '' ],
-    330: ['チェス', '' ],
-    331: ['クロマーリモ', '' ],
-    332: ['チェスマーリモ', '' ],
-    333: ['Dr.くれは', '' ],
-    334: ['ラパーン', '', 'Lapahn', 'Lapan', 'Rapan' ],
-    335: ['ラパーン 成獣', '', 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
-    336: ['フランキー', '' ],
-    337: ['解体屋フランキー', '' ],
-    338: ['キウイ', '' ],
-    339: ['モズ', '' ],
-    340: ['クラーケン スルメ', '' ],
-    341: ['クラーケン 北極の怪物', '' ],
-    342: ['赤パワース豚（トーン）', '', 'Pig', 'Pork' ],
-    343: ['青パワース豚（トーン）', '', 'Pig', 'Pork' ],
-    344: ['緑パワース豚（トーン）', '', 'Pig', 'Pork' ],
-    345: ['黄パワース豚（トーン）', '', 'Pig', 'Pork' ],
-    346: ['黒パワース豚（トーン）', '', 'Pig', 'Pork' ],
-    347: ['ルビーパワース豚（トーン）', '', 'Pig', 'Pork' ],
-    348: ['サファイアパワース豚（トーン）', '', 'Pig', 'Pork' ],
-    349: ['エメラルドパワース豚（トーン）', '', 'Pig', 'Pork' ],
-    350: ['トパーズパワース豚（トーン）', '', 'Pig', 'Pork' ],
-    351: ['アメジストパワース豚（トーン）', '', 'Pig', 'Pork' ],
-    352: ['ゼファー', '', 'Raid Zephyr' ],
-    353: ['ゼファー NEO海軍総帥', '', 'Raid Zephyr' ],
-    354: ['アイン', '', 'Raid Ain' ],
-    355: ['アイン NEO海軍バイス・アドミラル', '', 'Raid Ain' ],
-    356: ['ユースタス・キッド', '', 'Supernova Kid', 'Supernova Kidd', 'Kidd' ],
-    357: ['キャプテン・キッド', '', 'Supernova Kid', 'Supernova Kidd', 'Kidd' ],
-    358: ['スクラッチメン・アプー', '', 'Supernova Apoo' ],
-    359: ['海鳴り スクラッチメン・アプー', '', 'Supernova Apoo' ],
-    360: ['X・ドレーク', '', 'Supernova Drake', 'Supernova X Drake' ],
-    361: ['赤旗 X・ドレーク', '', 'Supernova Drake', 'Supernova X Drake' ],
-    362: ['ジュエリー・ボニー', '', 'Supernova Bonney' ],
-    363: ['大喰らい ジュエリー・ボニー', '', 'Supernova Bonney' ],
-    364: ['カポネ・ベッジ', '', 'Supernova Capone' ],
-    365: ['カポネ・ギャング・ベッジ', '', 'Supernova Capone' ],
-    366: ['シルバーズ・レイリー', '' ],
-    367: ['冥王レイリー', '' ],
-    368: ['巨人斬撃隊 レッドパイレーツ', '' ],
-    369: ['巨人射撃隊 ブルーパイレーツ', '' ],
-    370: ['巨人女戦士隊 グリーンパイレーツ', '' ],
-    371: ['巨人格闘隊 イエローパイレーツ', '' ],
-    372: ['巨人突撃隊 ブラックパイレーツ', '' ],
-    373: ['巨人斬撃近衛隊 レッドパイレーツ', '' ],
-    374: ['巨人射撃近衛隊 ブルーパイレーツ', '' ],
-    375: ['巨人女戦士近衛隊 グリーンパイレーツ', '' ],
-    376: ['巨人格闘近衛隊 イエローパイレーツ', '' ],
-    377: ['巨人突撃近衛隊 ブラックパイレーツ', '' ],
-    378: ['海ネコ', '' ],
-    379: ['クンフージュゴン', '' ],
-    380: ['クンフージュゴン 兄弟弟子', '' ],
-    381: ['バナナワニ', '' ],
-    382: ['サンドラ大トカゲ', '' ],
-    383: ['Mr.0 バロックワークス社長', '', 'Crocodile', 'Mr 0' ],
-    384: ['サー・クロコダイル', '', 'Strikerdile', 'Impactdile', 'Mr 0', 'Mr. 0' ],
-    385: ['ホグバック', '' ],
-    386: ['ドクトル・ホグバック', '' ],
-    387: ['シンドリーちゃん', '' ],
-    388: ['ビクトリア・シンドリー', '' ],
-    389: ['エンポリオ・イワンコフ', '', 'Raid Ivankov' ],
-    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】', '', 'Raid Ivankov' ],
-    391: ['ペローナ', '' ],
-    392: ['ペローナ ゴーストプリンセス', '' ],
-    393: ['クマシー', '', 'Kumashi' ],
-    394: ['犬ッペ', '', 'Inuppe' ],
-    395: ['ミス・メリークリスマス', '' ],
-    396: ['ミス・メリークリスマス モグラ人間', '' ],
-    397: ['Mr.4', '', 'Mr 4' ],
-    398: ['Mr.4と犬銃ラッスー', '', 'Mr 4 and Lassoo the Dog-Gun' ],
-    399: ['ミス・ダブルフィンガー', '' ],
-    400: ['ミス・ダブルフィンガー 棘（とげ）人間', '' ],
-    401: ['Mr.1', '', 'mr 1', 'Daz Bones' ],
-    402: ['Mr.1 全身刃物人間', '', 'Mr 1', 'Daz Bones' ],
-    403: ['レベッカ', '' ],
-    404: ['アブサロム', '' ],
-    405: ['墓場のアブサロム', '' ],
-    406: ['将軍ゾンビ', '' ],
-    407: ['風のジゴロウ', '' ],
-    408: ['サー・クロコダイル 王下七武海', '', 'Slasherdile' ],
-    409: ['ジンベエ', '', 'Jinbe', 'Jimbei', 'Jinbei' ],
-    410: ['ジンベエ 王下七武海', '', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
-    411: ['バーソロミュー・くま', '' ],
-    412: ['バーソロミュー・くま 王下七武海', '' ],
-    413: ['ゲッコー・モリア', '', 'Gekko Moriah' ],
-    414: ['ゲッコー・モリア 王下七武海', '', 'Gekko Moriah Warlord of the Sea' ],
-    415: ['ボア・ハンコック', '' ],
-    416: ['ボア・ハンコック 王下七武海', '' ],
-    417: ['ドンキホーテ・ドフラミンゴ', '', 'Raid Doffy', 'Raid Doflaming' ],
-    418: ['ドンキホーテ・ドフラミンゴ 王下七武海', '', 'Raid Doffy', 'Raid Doflaming' ],
-    419: ['サンジ 整形ショット(パラージュショット)　“嵐”', '', 'Kimono Sanji' ],
-    420: ['モンキー・D・ルフィ ゴムゴムのバズーカ“覇”', '', 'Kimono Luffy' ],
-    421: ['ロロノア・ゾロ 三・千・世・界“斬”', '', 'Kimono Zoro' ],
-    422: ['ナミ 蜃気楼＝テンポ“天”', '', 'Kimono Nami' ],
-    423: ['ブルック', '' ],
-    424: ['鼻唄のブルック', '' ],
-    425: ['リューマ', '', 'Ryuuma' ],
-    426: ['マシラ', '', 'Harambe' ],
-    427: ['ショウジョウ', '' ],
-    428: ['モンブラン・クリケット', '' ],
-    429: ['サウスバードと森の住民', '' ],
-    430: ['ベラミー', '' ],
-    431: ['ハイエナのベラミー', '' ],
-    432: ['サーキース', '', 'Sarkies' ],
-    433: ['エリザベス', '' ],
-    434: ['キャロライン', '' ],
-    435: ['サンジ カマバッカ王国伝統の決闘スタイル', '' ],
-    436: ['サンジ キャンディーちゃん', '' ],
-    437: ['ペローナ　スイート', '', 'Valentine Perona' ],
-    438: ['ペローナ　スイート ゴーストプリンセス', '', 'Valentine Perona' ],
-    439: ['ネフェルタリ・ビビ　ラブ', '', 'Valentine Vivi' ],
-    440: ['王女ビビ　ラブ', '', 'Valentine Vivi' ],
-    441: ['カウボーイとバーボンJr. 超カルガモ部隊', '' ],
-    442: ['ストンプとイワンX 超カルガモ部隊', '' ],
-    443: ['ケンタロウスとヒコイチ 超カルガモ部隊', '' ],
-    444: ['カルー', '', 'Carue', 'Karue' ],
-    445: ['カルー隊長と超カルガモ部隊', '', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
-    446: ['マーシャル・Ｄ・ティーチ', '', 'Raid Blackbeard', 'BB' ],
-    447: ['黒ひげ', '', 'Raid Blackbeard', 'BB', 'Teach' ],
-    448: ['サッチ', '' ],
-    449: ['双剣のサッチ', '' ],
-    450: ['ナミュール', '', 'Namur' ],
-    451: ['一撃のナミュール', '', 'One-Hit Namur' ],
-    452: ['ラクヨウ', '' ],
-    453: ['モーニングスターのラクヨウ', '' ],
-    454: ['フォッサ', '' ],
-    455: ['火炎刀のフォッサ', '' ],
-    456: ['クリエル', '' ],
-    457: ['重火器使いのクリエル', '' ],
-    458: ['センゴク', '' ],
-    459: ['仏のセンゴク', '' ],
-    460: ['犯罪者ギャルディーノ Mr.3', 'Mr 3', '' ],
-    461: ['脱走者ベンサム Mr.2・ボン・クレー', '', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
-    462: ['脱獄名人ベンサム Mr.2・ボン・クレー', '', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
-    463: ['サトリ', '' ],
-    464: ['シュラ', '' ],
-    465: ['ゲダツ', '' ],
-    466: ['ブラハム', '' ],
-    467: ['ヤマ', '' ],
-    468: ['黄のホワイトベレー部隊　隊員 スカイピア神隊', '' ],
-    469: ['黒のホワイトベレー部隊　隊員 スカイピア神隊', '' ],
-    470: ['黄のホワイトベレー部隊　隊長 スカイピア神隊', '' ],
-    471: ['黒のホワイトベレー部隊　隊長 スカイピア神隊', '' ],
-    472: ['赤のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
-    473: ['青のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
-    474: ['緑のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
-    475: ['黄のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
-    476: ['黒のゴッド近衛隊　隊員 スカイピア神兵', '', 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
-    477: ['赤の突撃隊　隊員 スカイピア神兵', '' ],
-    478: ['青の突撃隊　隊員 スカイピア神兵', '' ],
-    479: ['緑の突撃隊　隊員 スカイピア神兵', '' ],
-    480: ['黄の突撃隊　隊員 スカイピア神兵', '' ],
-    481: ['黒の突撃隊　隊員 スカイピア神兵', '' ],
-    482: ['赤の突撃隊　エリート スカイピア神兵', '' ],
-    483: ['青の突撃隊　エリート スカイピア神兵', '' ],
-    484: ['緑の突撃隊　エリート スカイピア神兵', '' ],
-    485: ['黄の突撃隊　エリート スカイピア神兵', '' ],
-    486: ['黒の突撃隊　エリート スカイピア神兵', '' ],
-    487: ['赤の遊牧隊　隊員 シャンディアの戦士', '' ],
-    488: ['青の遊牧隊　隊員 シャンディアの戦士', '' ],
-    489: ['緑の遊牧隊　隊員 シャンディアの戦士', '' ],
-    490: ['赤の遊牧隊　達人 シャンディアの戦士', '' ],
-    491: ['青の遊牧隊　達人 シャンディアの戦士', '' ],
-    492: ['緑の遊牧隊　達人 シャンディアの戦士', '' ],
-    493: ['黄の狩猟隊　隊員 シャンディアの戦士', '' ],
-    494: ['黒の狩猟隊　隊員 シャンディアの戦士', '' ],
-    495: ['黄の狩猟隊　達人 シャンディアの戦士', '' ],
-    496: ['黒の狩猟隊　達人 シャンディアの戦士', '' ],
-    497: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟', '', 'Kid Ace' ],
-    498: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟“兄弟盃”', '', 'Kid Ace' ],
-    499: ['ベルメール', '' ],
-    500: ['ベルメール ナミとノジコの養母', '' ],
-    501: ['カヤ', '' ],
-    502: ['カヤ シロップ村のお嬢様', '' ],
-    503: ['ホトリ・コトリ', '' ],
-    504: ['ホトリ・コトリ スカイピア副神兵長', '' ],
-    505: ['ペル', '' ],
-    506: ['ペル アラバスタの守護神ファルコン', '' ],
-    507: ['チャカ', '' ],
-    508: ['チャカ アラバスタの守護神ジャッカル', '' ],
-    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長', '', 'Mr 0', 'Mr. 0', 'Crocodile', 'Prisondile' ],
-    510: ['最強の囚人サー・クロコダイル 元王下七武海', '', 'Mr 0', 'Mr. 0', 'Prisondile' ],
-    511: ['服役囚ダズ・ボーネス Mr.1', '', 'Mr 1', 'Daz Bones' ],
-    512: ['サボ コルボ山の悪ガキ３兄弟', '', 'Kid Sabo' ],
-    513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”', '', 'Kid Sabo' ],
-    514: ['ニコ・ロビン トロピカル', '', 'Summertime Robin', 'Swimsuit Robin' ],
-    515: ['ヘラクレスン', '', 'Raid Heracles-un', 'Raid Heracles' ],
-    516: ['ヘラクレスン 森の勇者', '', 'Raid Heracles-un', 'Raid Heracles' ],
-    517: ['ウソップン', '', 'Raid Usoppun', 'Raid Usopp' ],
-    518: ['ウソップン ヘラクレスンの生徒', '', 'Raid Usoppun, Pupil of Heracles\'n', 'fat usopp', 'Raid Usopp' ],
-    519: ['モンキー・Ｄ・ルフィ メルヴィユの冒険者', '', 'Strong World Luffy', 'SW Luffy' ],
-    520: ['モンキー・Ｄ・ルフィ 特攻の麦わらの一味', '', 'Strong World Luffy', 'SW Luffy' ],
-    521: ['サンジ メルヴィユの冒険者', '', 'Strong World Sanji', 'SW Sanji' ],
-    522: ['サンジ 特攻の麦わらの一味', '', 'Strong World Sanji', 'SW Sanji' ],
-    523: ['ナミ メルヴィユの冒険者', '', 'Strong World Nami', 'SW Nami' ],
-    524: ['ナミと雷鳥ビリー', '', 'Strong World Nami', 'SW Nami' ],
-    525: ['ブルック メルヴィユの冒険者', '', 'Strong World Brook', 'SW Brook' ],
-    526: ['ブルック 特攻の麦わらの一味', '', 'Strong World Brook', 'SW Brook' ],
-    527: ['チョッパー メルヴィユの冒険者', '', 'Strong World Chopper', 'SW Chopper' ],
-    528: ['チョッパー 特攻の麦わらの一味', '', 'Strong World Chopper', 'SW Chopper' ],
-    529: ['シャンクス 黒衣の赤髪', '', 'Strong World Shanks', 'SW Shanks' ],
-    530: ['シャンクス 黒衣の四皇', '', 'Strong World Shanks', 'SW Shanks' ],
-    531: ['ニコ・ロビン　桜吹雪', '', 'Sakura Robin' ],
-    532: ['ニコ・ロビン　桜満開', '', 'Sakura Robin' ],
-    533: ['ブルック　チェリーヘッド', '', 'Sakura Brook' ],
-    534: ['ブルック　桜音色', '', 'Sakura Brook' ],
-    535: ['ナミ　桜雲', '', 'Sakura Nami' ],
-    536: ['ナミ　桜日和', '', 'Sakura Nami' ],
-    537: ['ドミノ', '' ],
-    538: ['ドミノ インペルダウン副看守長', '' ],
-    539: ['ミノリノケロス', '' ],
-    540: ['バシリスク', '' ],
-    541: ['オーム', '' ],
-    542: ['ノラ ウワバミ', '' ],
-    543: ['ワイパー', '', 'Wiper' ],
-    544: ['ワイパー 大戦士カルガラの子孫', '', 'Wiper, Descendant of Great Warrior Calgara' ],
-    545: ['エネル', '', 'Enel' ],
-    546: ['ゴッド・エネル', '', 'God Enel' ],
-    547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟', '', 'Kid Luffy' ],
-    548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”', '', 'Kid Luffy' ],
-    549: ['サディちゃん', '' ],
-    550: ['サディちゃん インペルダウン獄卒長', '' ],
-    551: ['ミノコアラ', '' ],
-    552: ['マンティコラ', '' ],
-    553: ['ロロノア・ゾロ メルヴィユの冒険者', '', 'Strong World Zoro', 'SW Zoro' ],
-    554: ['ロロノア・ゾロ 特攻の麦わらの一味', '', 'Strong World Zoro', 'SW Zoro' ],
-    555: ['ウソップ メルヴィユの冒険者', '', 'Strong World Usopp', 'SW Usopp' ],
-    556: ['ウソップ 特攻の麦わらの一味', '', 'Strong World Usopp', 'SW Usopp' ],
-    557: ['ニコ・ロビン メルヴィユの冒険者', '', 'Strong World Robin', 'SW Robin' ],
-    558: ['ニコ・ロビン 特攻の麦わらの一味', '', 'Strong World Robin', 'SW Robin' ],
-    559: ['フランキー メルヴィユの冒険者', '', 'Strong World Franky', 'SW Franky' ],
-    560: ['フランキー 特攻の麦わらの一味', '', 'Strong World Franky', 'SW Franky' ],
-    561: ['ポートガス・D・エース 黒衣の火拳', '', 'Strong World Ace', 'SW Ace' ],
-    562: ['ポートガス・D・エース 黒衣の白ひげ海賊団2番隊隊長', '', 'Strong World Ace', 'SW Ace' ],
-    563: ['ポルチェ', '' ],
-    564: ['ポーティ', '' ],
-    565: ['ハンバーグ', '' ],
-    566: ['ピクルス', '' ],
-    567: ['ビッグパン', '', 'Big Pan' ],
-    568: ['フォクシー', '' ],
-    569: ['銀ギツネのフォクシー', '' ],
-    570: ['モンキー・Ｄ・ルフィ デービーバックファイト・アフロ', '', 'Afro Luffy', 'Afroluffy' ],
-    571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット', '', 'Afro Luffy', 'Afroluffy' ],
-    572: ['ウソップ デービーバックファイト・セコンド', '' ],
-    573: ['トニートニー・チョッパー デービーバックファイト・マスク', '' ],
-    574: ['青キジ', '', 'Raid Kuzan', 'Raid Aokiji' ],
-    575: ['青キジ　氷結人間', '', 'Raid Kuzan', 'Raid Aokiji' ],
-    576: ['ナミのティータイム', '' ],
-    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味', '', 'Log Luffy', 'Logfy' ],
-    578: ['モンキー・D・ルフィ 航海の夢「海賊王」', '', 'Log Luffy', 'Logfy' ],
-    579: ['ロロノア・ゾロ 航海の記録・麦わらの一味', '', 'Log Zoro', 'Roronoa Zoro, Wakes of the Endless Dream, Straw Hat Crew' ],
-    580: ['ロロノア・ゾロ 航海の夢「大剣豪」', '', 'Log Zoro', 'Roronoa Zoro, A Vow in the Great Age of Pirates - Master Swordsman' ],
-    581: ['ゲンボウ', '' ],
-    582: ['カマキリ', '' ],
-    583: ['ラキ', '', 'Laki' ],
-    584: ['アイサ', '' ],
-    585: ['ノジコ', '' ],
-    586: ['ノジコ ナミの義姉妹', '' ],
-    587: ['クロッカス', '' ],
-    588: ['クロッカス 双子岬の灯台守', '' ],
-    589: ['コーザ', '' ],
-    590: ['コーザ 反乱軍リーダー', '' ],
-    591: ['朱の竜宮カメ姫', '', 'Princess Turtle' ],
-    592: ['蒼の竜宮カメ姫', '', 'Princess Turtle' ],
-    593: ['翠の竜宮カメ姫', '', 'Princess Turtle' ],
-    594: ['琥珀の竜宮カメ姫', '', 'Princess Turtle' ],
-    595: ['漆黒の竜宮カメ姫', '', 'Princess Turtle' ],
-    596: ['トニートニー・チョッパー 航海の記録・麦わらの一味', '', 'Log Chopper', 'Tony Tony Chopper, Wakes of the Endless Dream, Straw Hat Crew' ],
-    597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」', '', 'Log Chopper', 'Tony Tony Chopper, A Vow in the Great Age of Pirates - Great Doctor' ],
-    598: ['バギー 海賊見習い', '', 'Young Buggy', 'Baggy' ],
-    599: ['バギー ロジャー海賊団', '', 'Young Buggy', 'Baggy' ],
-    600: ['シャンクス 海賊見習い', '', 'Young Shanks' ],
-    601: ['シャンクス ロジャー海賊団', '', 'Young Shanks' ],
-    602: ['エネル ２億Ｖ　雷神', '', 'Raid Enel, 200 Million Volt Thunder God' ],
-    603: ['エネル　雷人間 ２億Ｖ　雷神', '', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God' ],
-    604: ['サンジ 航海の記録・麦わらの一味', '', 'Log Sanji', 'Sanji, Wakes of the Endless Dream, Straw Hat Crew' ],
-    605: ['サンジ 航海の夢「オールブルー」', '', 'Log Sanji' ],
-    606: ['海賊ゼフ', '' ],
-    607: ['赫足のゼフ クック海賊団船長', '' ],
-    608: ['ごろつきパティ', '' ],
-    609: ['ごろつきカルネ', '' ],
-    610: ['ハイキングベア', '' ],
-    611: ['プリンプリン', '', 'Pudding Pudding' ],
-    612: ['ブルック 航海の記録・麦わらの一味', '', 'Log Brook', 'Brook, Wakes of the Endless Dream, Straw Hat Crew' ],
-    613: ['ブルック 航海の夢「約束の再会」', '', 'Log Brook', 'Brook, A Vow in the Great Age of Pirates - Promised Meeting' ],
-    614: ['ザンバイ', '' ],
-    615: ['怪力デストロイヤーズ 斧使い', '' ],
-    616: ['怪力デストロイヤーズ 槍使い', '' ],
-    617: ['怪力デストロイヤーズ 大砲使い', '', 'Gunner' ],
-    618: ['ナックルチンピラ 赤の賞金稼ぎ', '' ],
-    619: ['ナックルチンピラ 緑の賞金稼ぎ', '' ],
-    620: ['カタナチンピラ 青の賞金稼ぎ', '' ],
-    621: ['カタナチンピラ 赤の賞金稼ぎ', '' ],
-    622: ['ピストルチンピラ 緑の賞金稼ぎ', '' ],
-    623: ['ピストルチンピラ 黄の賞金稼ぎ', '' ],
-    624: ['棍棒チンピラ 黄の賞金稼ぎ', '' ],
-    625: ['棍棒チンピラ 黒の賞金稼ぎ', '' ],
-    626: ['ガトリングチンピラ 黒の賞金稼ぎ', '' ],
-    627: ['ガトリングチンピラ 青の賞金稼ぎ', '' ],
-    628: ['タイルストン', '' ],
-    629: ['フランキー フランキー一家棟梁', '' ],
-    630: ['カク サイファーポールNo.9', '' ],
-    631: ['カク 六式 サイファーポールNo.9', '' ],
-    632: ['ロブ・ルッチ サイファーポールNo.9', '' ],
-    633: ['ロブ・ルッチ 六式 サイファーポールNo.9', '' ],
-    634: ['ケイミー', '', 'Keimi' ],
-    635: ['ケイミー タコ焼き屋店員', '', 'Keimi, Takoyaki Stand Assistant' ],
-    636: ['パッパグ', '', 'Pappug' ],
-    637: ['はっちゃん タコ焼き屋店主', '', 'Hachi, Takoyaki Stand Owner' ],
-    638: ['ドーマ', '' ],
-    639: ['遊騎士ドーマ', '' ],
-    640: ['ディカルバン兄弟', '' ],
-    641: ['絆のディカルバン兄弟', '' ],
-    642: ['スクアード', '', 'Squardo' ],
-    643: ['大渦蜘蛛スクアード', '', 'Maelstrom Spider Squardo' ],
-    644: ['ホワイティベイ', '' ],
-    645: ['氷の魔女ホワイティベイ', '' ],
-    646: ['リトルオーズJr.', '' ],
-    647: ['猛攻のリトルオーズJr.', '' ],
-    648: ['マルコ 白ひげ海賊団１番隊隊長', '', 'LMarco', 'QMarco' ],
-    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長', '', 'LMarco', 'QMarco' ],
-    650: ['ナミ 航海の記録・麦わらの一味', '', 'Log Nami', 'Nami, Wakes of the Endless Dream, Straw Hat Crew' ],
-    651: ['ナミ 航海の夢「世界地図」', '', 'Log Nami', 'Nami, A Vow in the Great Age of Pirates - World Map' ],
-    652: ['鉄仮面のデュバル', '', 'Raid Duval' ],
-    653: ['デュバル トビウオライダーズ ヘッド', '', 'Raid Duval' ],
-    654: ['デュバル 人生バラ色ライダーズ ヘッド', '', 'Raid Duval' ],
-    655: ['海賊アーロン', '', 'Young Arlong' ],
-    656: ['アーロン タイヨウの海賊団', '', 'Young Arlong' ],
-    657: ['クロオビ タイヨウの海賊団', '', 'Young Kuroobi' ],
-    658: ['チュウ タイヨウの海賊団', '', 'Young Choo' ],
-    659: ['モンキー・D・ルフィ うきわ', '', 'Summertime Luffy', 'Swimsuit Luffy' ],
+    1: ['モンキー・D・ルフィ','Monkey D. Luffy'],
+    2: ['モンキー・D・ルフィ ゴムゴムの銃(ピストル)','Monkey D. Luffy Gum-Gum Carabine'],
+    3: ['モンキー・D・ルフィ ゴムゴムのバズーカ','Monkey D. Luffy Gum-Gum Bazooka'],
+    4: ['モンキー・D・ルフィ ギア２','Monkey D. Luffy Gear 2','Monkey D. Luffy', ' G2'],
+    5: ['ロロノア・ゾロ','Roronoa Zoro'],
+    6: ['ロロノア・ゾロ 三・千・世・界','Roronoa Zoro Moulinet Infernal'],
+    7: ['ロロノア・ゾロ 煩悩鳳（ポンドほう）','Roronoa Zoro Calibre'],
+    8: ['ロロノア・ゾロ 阿修羅弌霧銀（あしゅらいちぶぎん）','Roronoa Zoro Brume Argentée'],
+    9: ['ナミ','Nami'],
+    10: ['ナミ トルネード=テンポ','Nami Tornado Tempo'],
+    11: ['ナミ 蜃気楼＝テンポ','Nami MirageTempo'],
+    12: ['ナミ サンダーボルト=テンポ','Nami Fulguro Tempo'],
+    13: ['ウソップ','Usopp'],
+    14: ['ウソップ タバスコ星','Usopp Etoile Piquante'],
+    15: ['ウソップ ゴールデンパウンド','Usopp Usopp-Pilon doré','GPU'],
+    16: [ 'そげキング','Sniperking','Usopp'],
+    17: ['サンジ','Sanji'],
+    18: ['サンジ 整形ショット(パラージュショット)','Sanji Tir esthétique'],
+    19: ['料理人サンジ 焼き石シチュー','Chef Sanji Ragoût bouillonnant'],
+    20: ['サンジ 悪魔風脚 (ディアブルジャンブ)','Sanji Jambe du diable'],
+    21: ['トニートニー・チョッパー','Tony Tony Chopper'],
+    22: ['トニートニー・チョッパー 重量強化（ヘビーポイント）','Tony Tony Chopper Weight Boost'],
+    23: ['トニートニー・チョッパー 頭脳強化（ブレーンポイント）','Tony Tony Chopper Brain Boost'],
+    24: ['トニートニー・チョッパー 腕力強化（アームポイント）','Tony Tony Chopper Arm Boost'],
+    25: ['トニートニー・チョッパー 角強化（ホーンポイント）','Tony Tony Chopper Horn Boost'],
+    26: ['トニートニー・チョッパー 毛皮強化（ガードポイント）','Tony Tony Chopper Guard Boost'],
+    27: ['ヒグマ','Higuma'],
+    28: ['近海の主（ヌシ）','Seigneur de la côte'],
+    29: ['金棒のアルビダ','Alvida à la Massue'],
+    30: ['金棒のアルビダ スベスベの実','Alvida à la Massue Fruit Glisse-Glisse'],
+    31: ['コビー','Kobby'],
+    32: ['雑用コビー','Kobby le mousse'],
+    33: ['ヘルメッポ','Hermep'],
+    34: ['雑用ヘルメッポ','Hermep le mousse'],
+    35: ['斧手のモーガン','Morgan le Hacheur'],
+    36: ['モージ＆リッチー','Morge et Richy'],
+    37: ['曲芸のカバジ','Cabaji l\'acrobate'],
+    38: ['バギー','Baggy'],
+    39: ['道化のバギー','Baggy le Clown'],
+    40: ['ガイモン','Gaimon'],
+    41: ['シャム','Sham'],
+    42: ['ブチ','Buchi'],
+    43: ['１・２のジャンゴ','Jango l\'hypnotiseur'],
+    44: ['ダンシングジャンゴ','Jango le danseur'],
+    45: ['キャプテン・クロ','Capitaine Kuro'],
+    46: ['百計のクロ','Kuro les pattes de velours'],
+    47: ['ヨサク','Yosaku'],
+    48: ['ジョニー','Jhonny'],
+    49: ['鉄拳のフルボディ','Fullbody au poing d\'acier'],
+    50: ['パティ','Patty'],
+    51: ['カルネ','Carne'],
+    52: ['料理長ゼフ','Zeff le chef'],
+    53: ['ギン','Gyn'],
+    54: ['鬼人ギン','Gyn le démon enragé'],
+    55: ['パール','Pearl'],
+    56: ['ファイヤーパール','Fire Pearl'],
+    57: ['首領・クリーク','Don Krieg '],
+    58: ['首領・クリーク 猛毒ガス弾「Ｍ・Ｈ・５」','Don Krieg Bombe à gaz toxique MH5'],
+    59: ['ネズミ','Nezumi'],
+    60: ['モーム','Meuh-Meuh'],
+    61: ['チュウ','Smack'],
+    62: ['クロオビ','Kuroobi'],
+    63: ['はっちゃん','Octy', 'Hachi' ],
+    64: ['六刀流のハチ','Octy aux six lames', 'Hatchan'],
+    65: ['アーロン','Arlong'],
+    66: ['ブチ切れアーロン 鮫（シャ－ク）・ＯＮ･歯車（トゥース）','Arlong enragé Squalo Crunch'],
+    67: ['たしぎ','Tashigi'],
+    68: ['たしぎ 海軍本部少尉','Tashigi Lieutenant-colonel de la Marine'],
+    69: ['スモーカー','Smoker'],
+    70: ['白猟のスモーカー','Smoker le chasseur blanc'],
+    71: ['ミス・ウェンズデー','Miss Wednesday'],
+    72: ['ネフェルタリ・ビビ','Vivi Nerfertari'],
+    73: ['王女ビビ','Princesse Vivi'],
+    74: ['ポートガス・D・エース','Portgas D. Ace'],
+    75: ['ポートガス・D・エース 鏡火炎（きょうかえん）','Portgas D. Ace Pyro-miroir'],
+    76: ['シャンクス','Shanks'],
+    77: ['赤髪のシャンクス','Shanks le Roux'],
+    78: ['赤盗人ペンギン','Pingouin chapardeur rouge'],
+    79: ['青盗人ペンギン','Pingouin chapardeur bleu'],
+    80: ['緑盗人ペンギン','Pingouin chapardeur vert'],
+    81: ['黄盗人ペンギン','Pingouin chapardeur jaune'],
+    82: ['黒盗人ペンギン','Pingouin chapardeur noir'],
+    83: ['虹盗人ペンギン','Pingouin chapardeur arc-en-ciel'],
+    84: ['赤海賊ペンギン','Pingouin pirate rouge'],
+    85: ['赤海賊ペンギン','Pingouin pirate bleu'],
+    86: ['赤海賊ペンギン','Pingouin pirate vert'],
+    87: ['赤海賊ペンギン','Pingouin pirate jaune'],
+    88: ['赤海賊ペンギン','Pingouin pirate noir'],
+    89: ['赤カブトヤドカリ','Bernard-l\'ermite rouge'],
+    90: ['赤カブトヤドカリ','Bernard-l\'ermite bleu'],
+    91: ['赤カブトヤドカリ','Bernard-l\'ermite vert'],
+    92: ['赤カブトヤドカリ','Bernard-l\'ermite jaune'],
+    93: ['赤カブトヤドカリ','Bernard-l\'ermite noir'],
+    94: ['赤カブトヤドカリ','Bernard-l\'ermite arc-en-ciel'],
+    95: ['赤ヨロイガニ','Crabe blindé rouge'],
+    96: ['赤ヨロイガニ','Crabe blindé bleu'],
+    97: ['赤ヨロイガニ','Crabe blindé vert'],
+    98: ['赤ヨロイガニ','Crabe blindé jaune'],
+    99: ['赤ヨロイガニ','Crabe blindé noir'],
+    100: ['赤しま番竜','Dragon rayé rouge'],
+    101: ['赤しま番竜','Dragon rayé bleu'],
+    102: ['赤しま番竜','Dragon rayé vert'],
+    103: ['赤しま番竜','Dragon rayé jaune'],
+    104: ['赤しま番竜','Dragon rayé noir'],
+    105: ['赤タカラガメ','Tortue-trésor rouge','Baby Turtle'],
+    106: ['赤タカラガメ','Tortue-trésor bleue','Baby Turtle'],
+    107: ['赤タカラガメ','Tortue-trésor verte','Baby Turtle'],
+    108: ['赤タカラガメ','Tortue-trésor jaune','Baby Turtle'],
+    109: ['赤タカラガメ','Tortue-trésor noire','Baby Turtle'],
+    110: ['赤ダイミョウガメ','Tortue noble rouge'],
+    111: ['赤ダイミョウガメ','Tortue noble bleue'],
+    112: ['赤ダイミョウガメ','Tortue noble verte'],
+    113: ['赤ダイミョウガメ','Tortue noble jaune'],
+    114: ['赤ダイミョウガメ','Tortue noble noire'],
+    115: ['タツノコ','Poney marin'],
+    116: ['タツノワカ','Poulain marin'],
+    117: ['タツノミコト','Cheval marin'],
+    118: ['タツノオウ','Étalon marin'],
+    119: ['カタナ山賊',''],
+    120: ['ピストル山賊',''],
+    121: ['格闘隊 雑用 レッドパイレーツ',''],
+    122: ['格闘隊 雑用 ブルーパイレーツ',''],
+    123: ['格闘隊 雑用 グリーンパイレーツ',''],
+    124: ['格闘隊 雑用 イエローパイレーツ',''],
+    125: ['格闘隊 雑用 ブラックパイレーツ',''],
+    126: ['斬撃隊 雑用 レッドパイレーツ',''],
+    127: ['斬撃隊 雑用 ブルーパイレーツ',''],
+    128: ['斬撃隊 雑用 グリーンパイレーツ',''],
+    129: ['斬撃隊 雑用 イエローパイレーツ',''],
+    130: ['斬撃隊 雑用 ブラックパイレーツ',''],
+    131: ['突撃隊 雑用 レッドパイレーツ',''],
+    132: ['突撃隊 雑用 ブルーパイレーツ',''],
+    133: ['突撃隊 雑用 グリーンパイレーツ',''],
+    134: ['突撃隊 雑用 イエローパイレーツ',''],
+    135: ['突撃隊 雑用 ブラックパイレーツ',''],
+    136: ['狙撃隊 雑用 レッドパイレーツ',''],
+    137: ['狙撃隊 雑用 ブルーパイレーツ',''],
+    138: ['狙撃隊 雑用 グリーンパイレーツ',''],
+    139: ['狙撃隊 雑用 イエローパイレーツ',''],
+    140: ['狙撃隊 雑用 ブラックパイレーツ',''],
+    141: ['砲撃手 雑用',''],
+    142: ['格闘隊 隊員 レッドパイレーツ',''],
+    143: ['格闘隊 隊員 ブルーパイレーツ',''],
+    144: ['格闘隊 隊員 グリーンパイレーツ',''],
+    145: ['格闘隊 隊員 イエローパイレーツ',''],
+    146: ['格闘隊 隊員 ブラックパイレーツ',''],
+    147: ['斬撃隊 隊員 レッドパイレーツ',''],
+    148: ['斬撃隊 隊員 ブルーパイレーツ',''],
+    149: ['斬撃隊 隊員 グリーンパイレーツ',''],
+    150: ['斬撃隊 隊員 イエローパイレーツ',''],
+    151: ['斬撃隊 隊員 ブラックパイレーツ',''],
+    152: ['突撃隊 隊員 レッドパイレーツ',''],
+    153: ['突撃隊 隊員 ブルーパイレーツ',''],
+    154: ['突撃隊 隊員 グリーンパイレーツ',''],
+    155: ['突撃隊 隊員 イエローパイレーツ',''],
+    156: ['突撃隊 隊員 ブラックパイレーツ',''],
+    157: ['狙撃隊 隊員 レッドパイレーツ',''],
+    158: ['狙撃隊 隊員 ブルーパイレーツ',''],
+    159: ['狙撃隊 隊員 グリーンパイレーツ',''],
+    160: ['狙撃隊 隊員 イエローパイレーツ',''],
+    161: ['狙撃隊 隊員 ブラックパイレーツ',''],
+    162: ['砲撃手 腕利き',''],
+    163: ['ボディガード・サングラス',''],
+    164: ['ボディガード・ヒゲ',''],
+    165: ['ナックルごろつき クロネコ海賊団',''],
+    166: ['サーベルごろつき クロネコ海賊団',''],
+    167: ['ナギナタごろつき クロネコ海賊団',''],
+    168: ['ピストルごろつき クロネコ海賊団',''],
+    169: ['バズーカごろつき クロネコ海賊団',''],
+    170: ['格闘隊 隊長',''],
+    171: ['斬撃隊 隊長',''],
+    172: ['突撃隊 隊長',''],
+    173: ['狙撃隊 隊長',''],
+    174: ['遊撃手 凄腕',''],
+    175: ['空手使いの魚人 アーロン一味',''],
+    176: ['カタナ使いの魚人 アーロン一味',''],
+    177: ['ヤリ使いの魚人 アーロン一味',''],
+    178: ['銃使いの魚人 アーロン一味',''],
+    179: ['ナックル三等兵 海軍',''],
+    180: ['サーベル三等兵 海軍',''],
+    181: ['ナギナタ三等兵 海軍',''],
+    182: ['ピストル三等兵 海軍',''],
+    183: ['バズーカ三等兵 海軍',''],
+    184: ['ナックル一等兵 海軍',''],
+    185: ['サーベル一等兵 海軍',''],
+    186: ['ナギナタ一等兵 海軍',''],
+    187: ['ピストル一等兵 海軍',''],
+    188: ['バズーカ一等兵 海軍',''],
+    189: ['赤タイロウガメ',''],
+    190: ['青タイロウガメ',''],
+    191: ['青タイロウガメ',''],
+    192: ['青タイロウガメ',''],
+    193: ['青タイロウガメ',''],
+    194: ['ナックル少尉 海軍本部',''],
+    195: ['サーベル少尉 海軍本部',''],
+    196: ['ナギナタ少尉 海軍本部',''],
+    197: ['ピストル少尉 海軍本部',''],
+    198: ['バズーカ少尉 海軍本部',''],
+    199: ['Mr.5 鼻空想砲（ノーズファンシーキャノン)','', 'Mr 5'],
+    200: ['Mr.5 そよ風息爆弾（ブリーズ・ブレス・ボム）','', 'Mr 5'],
+    201: ['ミス・バレンタイン',''],
+    202: ['ミス・バレンタイン 1万キロギロチン',''],
+    203: ['Mr.3','','Mr 3'],
+    204: ['Mr.3 特大キャンドルサービスセット','', 'Mr 3'],
+    205: ['ミス・ゴールデンウィーク',''],
+    206: ['ミス・ゴールデンウィーク カラーズトラップ なごみの緑',''],
+    207: ['Mr.2・ボン・クレー ','', 'Mr. 2 Bonclay', 'Mr 2 Bonclay' ],
+    208: ['Mr.2・ボン・クレー  爆撃白鳥アラベスク(ボンバルディエ)','', 'Mr. 2 Bonclay Bombardier Arabesque', 'Mr 2 Bonclay Bombardier Arabesque' ],
+    209: ['ミス・オールサンデー バロックワークス副社長','', 'Nico Robin' ],
+    210: ['ニコ・ロビン',''],
+    211: ['Mr.9','','Mr 9'],
+    212: ['Mr.9 （熱血ナイン根性バット）','','Mr 9 Hot Blooded Bat'],
+    213: ['ラブーン',''],
+    214: ['ラブーン(ルフィ落書き)',''],
+    215: ['大王イカ',''],
+    216: ['モンキー・D・ルフィ（ゴムゴムの風船）',''],
+    217: ['モンキー・D・ルフィ（ギア３）','', 'Mistake', 'G3','Gear 3' ],
+    218: ['ゾロ_刀狼流し（とうろうながし）',''],
+    219: ['ロロノア・ゾロ_獅子歌歌（ししソンソン）','','LS Zoro'],
+    220: ['ナミ（ファイン=テンポ）',''],
+    221: ['ナミ（幸せパンチ）','', 'Towel Nami','TNami' ],
+    222: ['ウソップ（ウソップハンマー）',''],
+    223: ['ウソップ（衝撃（インパクト））',''],
+    224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji', 'Mr Prince Mutton Shot'],
+    225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji', 'Mr Prince Veau Shot' ],
+    226: ['ジュラキュール・ミホーク','','Raidhawk', 'Raid Mihawk'],
+    227: ['鷹の目のミホーク','','Raidhawk', 'Raid Mihawk'],
+    228: ['脱獄モーガン',''],
+    229: ['寝返りのジャンゴ',''],
+    230: ['両鉄拳のフルボディ',''],
+    231: ['ヒナ',''],
+    232: ['黒檻のヒナ',''],
+    233: ['Mr.8','','mr 8'],
+    234: ['Mr.8 イガラッパッパ','','mr 8'],
+    235: ['ミス・マンデー',''],
+    236: ['ミス・マンデー カ・イ・リ・キ メリケン',''],
+    237: ['ナックルミリオンズ バロックワークス',''],
+    238: ['サーベルミリオンズ バロックワークス',''],
+    239: ['ナギナタミリオンズ バロックワークス',''],
+    240: ['ピストルミリオンズ バロックワークス',''],
+    241: ['バズーカミリオンズ バロックワークス',''],
+    242: ['ナックルビリオンズ バロックワークス',''],
+    243: ['サーベルビリオンズ バロックワークス',''],
+    244: ['ナギナタビリオンズ バロックワークス',''],
+    245: ['ピストルビリオンズ バロックワークス',''],
+    246: ['バズーカビリオンズ バロックワークス',''],  
+    247: ['チョッパーマン','', 'Chopperman', 'Chopper Man' ],
+    248: ['トニートニー・チョッパー 暴走前','', 'Raid Monster Chopper', 'MC' ],
+    249: ['トニートニー・チョッパー 暴走後','', 'Raid Monster Chopper', 'MC' ],
+    250: ['マルコ',''],
+    251: ['不死鳥マルコ',''],
+    252: ['ジョズ',''],
+    253: ['ダイヤモンド・ジョズ',''],
+    254: ['ビスタ',''],
+    255: ['花剣のビスタ',''],
+    256: ['イゾウ',''],
+    257: ['短筒使いのイゾウ',''],
+    258: ['ブラメンコ',''],
+    259: ['大槌のブラメンコ',''],
+    260: ['エドワード・ニューゲート','', 'Whitebeard', 'WB' ],
+    261: ['白ひげ','','Edward Newgate', 'WB'],
+    262: ['特訓コビー',''],
+    263: ['曹長コビー',''],
+    264: ['特訓ヘルメッポ',''],
+    265: ['軍曹ヘルメッポ',''],
+    266: ['虹海賊ペンギン',''],
+    267: ['虹しま番竜',''],
+    268: ['白猟のスモーカー ビローアバイク','','WC Smoker'],
+    269: ['格闘隊　武装隊員 レッドパイレーツ',''],
+    270: ['格闘隊　武装隊員 ブルーパイレーツ',''],
+    271: ['格闘隊　武装隊員 グリーンパイレーツ',''],
+    272: ['格闘隊　武装隊員 イエローパイレーツ',''],
+    273: ['格闘隊　武装隊員 ブラックパイレーツ',''],
+    274: ['斬撃隊　武装隊員 レッドパイレーツ',''],
+    275: ['斬撃隊　武装隊員 ブルーパイレーツ',''],
+    276: ['斬撃隊　武装隊員 グリーンパイレーツ',''],
+    277: ['斬撃隊　武装隊員 イエローパイレーツ',''],
+    278: ['斬撃隊　武装隊員 ブラックパイレーツ',''],
+    279: ['突撃隊　武装隊員 レッドパイレーツ',''],
+    280: ['突撃隊　武装隊員 ブルーパイレーツ',''],
+    281: ['突撃隊　武装隊員 グリーンパイレーツ',''],
+    282: ['突撃隊　武装隊員 イエローパイレーツ',''],
+    283: ['突撃隊　武装隊員 ブラックパイレーツ',''],
+    284: ['狙撃隊　武装隊員 レッドパイレーツ',''],
+    285: ['狙撃隊　武装隊員 ブルーパイレーツ',''],
+    286: ['狙撃隊　武装隊員 グリーンパイレーツ',''],
+    287: ['狙撃隊　武装隊員 イエローパイレーツ',''],
+    288: ['狙撃隊　武装隊員 ブラックパイレーツ',''],
+    289: ['砲撃手　敏腕',''],
+    290: ['Mr.13&ミス・フライデー 13日の金曜日（アンラッキーズ）','','Mr 13 and Ms Friday the Unluckies'],
+    291: ['ドリー',''],
+    292: ['ブロギー',''],
+    293: ['トリケラトプス',''],
+    294: ['レックス',''],
+    295: ['ブロントザウルス',''],
+    296: ['おつるさん',''],
+    297: ['大参謀つる',''],
+    298: ['モモンガ',''],
+    299: ['オニグモ',''],
+    300: ['赤アーマーロブスター',''],
+    301: ['青アーマーロブスター',''],
+    302: ['緑アーマーロブスター',''],
+    303: ['黄アーマーロブスター',''],
+    304: ['黒アーマーロブスター',''],
+    305: ['モンキー・D・ガープ','','Raid Garp'],
+    306: ['ゲンコツのガープ','','Raid Garp'],
+    307: ['トラファルガー・ロー','','Supernova Law'],
+    308: ['トラファルガー・ロー ROOMバジル・ホーキンス','','Supernova Law'],
+    309: ['バジル・ホーキンス','','Supernova Hawkins'],
+    310: ['魔術師バジル・ホーキンス','','Supernova Hawkins'],
+    311: ['キラー','','Supernova Killer'],
+    312: ['殺戮武人キラー','','Supernova Killer'],
+    313: ['ウルージ','','Supernova Urouge'],
+    314: ['怪僧ウルージ','','Supernova Urouge'],
+    315: ['ベポ',''],
+    316: ['武闘家のベポ',''],
+    317: ['カリファ','', 'Califa', 'Calipha', 'Kalipha' ],
+    318: ['美人秘書カリファ','', 'Beautiful Secretary Califa', 'Beautiful Secretary Calipha', 'Beautiful Secretary Kalipha' ],
+    319: ['パウリー',''],
+    320: ['パウリー 1番ドック艤装(ぎそう)・マスト職職長',''],
+    321: ['ロブ・ルッチ',''],
+    322: ['ロブ・ルッチ 1番ドック木びき・木釘職職長',''],
+    323: ['カク',''],
+    324: ['カク 1番ドック大工職職長',''],
+    325: ['ルル',''],
+    326: ['ワポル',''],
+    327: ['ワポルハウス',''],
+    328: ['ドルトン',''],
+    329: ['ドルトン 野牛（バイソン）',''],
+    330: ['チェス',''],
+    331: ['クロマーリモ',''],
+    332: ['チェスマーリモ',''],
+    333: ['Dr.くれは',''],
+    334: ['ラパーン','', 'Lapahn', 'Lapan', 'Rapan' ],
+    335: ['ラパーン 成獣','', 'Lapahn Adult', 'Lapan Adult', 'Rapan Adult' ],
+    336: ['フランキー',''],
+    337: ['解体屋フランキー',''],
+    338: ['キウイ',''],
+    339: ['モズ',''],
+    340: ['クラーケン スルメ',''],
+    341: ['クラーケン 北極の怪物',''],
+    342: ['赤パワース豚（トーン）','','Pig','Pork'],
+    343: ['青パワース豚（トーン）','','Pig','Pork'],
+    344: ['緑パワース豚（トーン）','','Pig','Pork'],
+    345: ['黄パワース豚（トーン）','','Pig','Pork'],
+    346: ['黒パワース豚（トーン）','','Pig','Pork'],
+    347: ['ルビーパワース豚（トーン）','','Pig','Pork'],
+    348: ['サファイアパワース豚（トーン）','','Pig','Pork'],
+    349: ['エメラルドパワース豚（トーン）','','Pig','Pork'],
+    350: ['トパーズパワース豚（トーン）','','Pig','Pork'],
+    351: ['アメジストパワース豚（トーン）','','Pig','Pork'],
+    352: ['ゼファー','','Raid Zephyr'],
+    353: ['ゼファー NEO海軍総帥','','Raid Zephyr'],
+    354: ['アイン','','Raid Ain'],
+    355: ['アイン NEO海軍バイス・アドミラル','','Raid Ain'],
+    356: ['ユースタス・キッド','','Supernova Kid','Supernova Kidd', 'Kidd'],
+    357: ['キャプテン・キッド','','Supernova Kid','Supernova Kidd', 'Kidd'],
+    358: ['スクラッチメン・アプー','','Supernova Apoo'],
+    359: ['海鳴り スクラッチメン・アプー','','Supernova Apoo'],
+    360: ['X・ドレーク','','Supernova Drake','Supernova X Drake'],
+    361: ['赤旗 X・ドレーク','','Supernova Drake', 'Supernova X Drake'],
+    362: ['ジュエリー・ボニー','','Supernova Bonney'],
+    363: ['大喰らい ジュエリー・ボニー','','Supernova Bonney'],
+    364: ['カポネ・ベッジ','','Supernova Capone'],
+    365: ['カポネ・ギャング・ベッジ','','Supernova Capone'],
+    366: ['シルバーズ・レイリー',''],
+    367: ['冥王レイリー',''],
+    368: ['巨人斬撃隊 レッドパイレーツ',''],
+    369: ['巨人射撃隊 ブルーパイレーツ',''],
+    370: ['巨人女戦士隊 グリーンパイレーツ',''],
+    371: ['巨人格闘隊 イエローパイレーツ',''],
+    372: ['巨人突撃隊 ブラックパイレーツ',''],
+    373: ['巨人斬撃近衛隊 レッドパイレーツ',''],
+    374: ['巨人射撃近衛隊 ブルーパイレーツ',''],
+    375: ['巨人女戦士近衛隊 グリーンパイレーツ',''],
+    376: ['巨人格闘近衛隊 イエローパイレーツ',''],
+    377: ['巨人突撃近衛隊 ブラックパイレーツ',''],
+    378: ['海ネコ',''],
+    379: ['クンフージュゴン',''],
+    380: ['クンフージュゴン 兄弟弟子',''],
+    381: ['バナナワニ',''],
+    382: ['サンドラ大トカゲ',''],
+    383: ['Mr.0 バロックワークス社長','', 'Crocodile', 'Mr 0' ],
+    384: ['サー・クロコダイル','', 'Strikerdile', 'Impactdile', 'Mr 0','Mr. 0' ],
+    385: ['ホグバック',''],
+    386: ['ドクトル・ホグバック',''],
+    387: ['シンドリーちゃん',''],
+    388: ['ビクトリア・シンドリー',''],
+    389: ['エンポリオ・イワンコフ','','Raid Ivankov'],
+    390: ['エンポリオ・イワンコフ カマバッカ王国女王【永久欠番】','','Raid Ivankov'],
+    391: ['ペローナ',''],
+    392: ['ペローナ ゴーストプリンセス',''],
+    393: ['クマシー','', 'Kumashi' ],
+    394: ['犬ッペ','', 'Inuppe' ],
+    395: ['ミス・メリークリスマス',''],
+    396: ['ミス・メリークリスマス モグラ人間',''],
+    397: ['Mr.4','','Mr 4'],
+    398: ['Mr.4と犬銃ラッスー','','Mr 4 and Lassoo the Dog-Gun'],
+    399: ['ミス・ダブルフィンガー',''],
+    400: ['ミス・ダブルフィンガー 棘（とげ）人間',''],
+    401: ['Mr.1','','mr 1','Daz Bones'],
+    402: ['Mr.1 全身刃物人間','','Mr 1','Daz Bones'],
+    403: ['レベッカ',''],
+    404: ['アブサロム',''],
+    405: ['墓場のアブサロム',''],
+    406: ['将軍ゾンビ',''],
+    407: ['風のジゴロウ',''],
+    408: ['サー・クロコダイル 王下七武海','', 'Slasherdile' ],
+    409: ['ジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei' ],
+    410: ['ジンベエ 王下七武海','', 'Jinbe Warlord of the Sea', 'Jimbei Warlord of the Sea', 'Jinbei Warlord of the Sea' ],
+    411: ['バーソロミュー・くま',''],
+    412: ['バーソロミュー・くま 王下七武海',''],
+    413: ['ゲッコー・モリア','', 'Gekko Moriah'],
+    414: ['ゲッコー・モリア 王下七武海','', 'Gekko Moriah Warlord of the Sea'],
+    415: ['ボア・ハンコック',''],
+    416: ['ボア・ハンコック 王下七武海',''],
+    417: ['ドンキホーテ・ドフラミンゴ','', 'Raid Doffy', 'Raid Doflaming' ],
+    418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Raid Doffy', 'Raid Doflaming' ],
+    419: ['サンジ 整形ショット(パラージュショット)　“嵐”','', 'Kimono Sanji' ],
+    420: ['モンキー・D・ルフィ ゴムゴムのバズーカ“覇”','', 'Kimono Luffy' ],
+    421: ['ロロノア・ゾロ 三・千・世・界“斬”','', 'Kimono Zoro' ],
+    422: ['ナミ 蜃気楼＝テンポ“天”','', 'Kimono Nami' ],
+    423: ['ブルック',''],
+    424: ['鼻唄のブルック',''],
+    425: ['リューマ','', 'Ryuuma' ],
+    426: ['マシラ','','Harambe'],
+    427: ['ショウジョウ',''],
+    428: ['モンブラン・クリケット',''],
+    429: ['サウスバードと森の住民',''],
+    430: ['ベラミー',''],
+    431: ['ハイエナのベラミー',''],
+    432: ['サーキース','', 'Sarkies' ],
+    433: ['エリザベス',''],
+    434: ['キャロライン',''],
+    435: ['サンジ カマバッカ王国伝統の決闘スタイル',''],
+    436: ['サンジ キャンディーちゃん',''],
+    437: ['ペローナ　スイート','', 'Valentine Perona' ],
+    438: ['ペローナ　スイート ゴーストプリンセス','', 'Valentine Perona' ],
+    439: ['ネフェルタリ・ビビ　ラブ','', 'Valentine Vivi' ],
+    440: ['王女ビビ　ラブ','', 'Valentine Vivi' ],
+    441: ['カウボーイとバーボンJr. 超カルガモ部隊',''],
+    442: ['ストンプとイワンX 超カルガモ部隊',''],
+    443: ['ケンタロウスとヒコイチ 超カルガモ部隊',''],
+    444: ['カルー','', 'Carue', 'Karue' ],
+    445: ['カルー隊長と超カルガモ部隊','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
+    446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard', 'BB'],
+    447: ['黒ひげ','', 'Raid Blackbeard', 'BB', 'Teach'],
+    448: ['サッチ',''],
+    449: ['双剣のサッチ',''],
+    450: ['ナミュール','', 'Namur' ],
+    451: ['一撃のナミュール','', 'One-Hit Namur' ],
+    452: ['ラクヨウ',''],
+    453: ['モーニングスターのラクヨウ',''],
+    454: ['フォッサ',''],
+    455: ['火炎刀のフォッサ',''],
+    456: ['クリエル',''],
+    457: ['重火器使いのクリエル',''],
+    458: ['センゴク',''],
+    459: ['仏のセンゴク',''],
+    460: ['犯罪者ギャルディーノ Mr.3','Mr 3',''],
+    461: ['脱走者ベンサム Mr.2・ボン・クレー','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
+    462: ['脱獄名人ベンサム Mr.2・ボン・クレー','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
+    463: ['サトリ',''],
+    464: ['シュラ',''],
+    465: ['ゲダツ',''],
+    466: ['ブラハム',''],
+    467: ['ヤマ',''],
+    468: ['黄のホワイトベレー部隊　隊員 スカイピア神隊',''],
+    469: ['黒のホワイトベレー部隊　隊員 スカイピア神隊',''],
+    470: ['黄のホワイトベレー部隊　隊長 スカイピア神隊',''],
+    471: ['黒のホワイトベレー部隊　隊長 スカイピア神隊',''],
+    472: ['赤のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Red Guard Skypiea Enforcer' ],
+    473: ['青のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Blue Guard Skypiea Enforcer' ],
+    474: ['緑のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Green Guard Skypiea Enforcer' ],
+    475: ['黄のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Yellow Guard Skypiea Enforcer' ],
+    476: ['黒のゴッド近衛隊　隊員 スカイピア神兵','', 'Enel\'s Elect: Black Guard Skypiea Enforcer' ],
+    477: ['赤の突撃隊　隊員 スカイピア神兵',''],
+    478: ['青の突撃隊　隊員 スカイピア神兵',''],
+    479: ['緑の突撃隊　隊員 スカイピア神兵',''],
+    480: ['黄の突撃隊　隊員 スカイピア神兵',''],
+    481: ['黒の突撃隊　隊員 スカイピア神兵',''],
+    482: ['赤の突撃隊　エリート スカイピア神兵',''],
+    483: ['青の突撃隊　エリート スカイピア神兵',''],
+    484: ['緑の突撃隊　エリート スカイピア神兵',''],
+    485: ['黄の突撃隊　エリート スカイピア神兵',''],
+    486: ['黒の突撃隊　エリート スカイピア神兵',''],
+    487: ['赤の遊牧隊　隊員 シャンディアの戦士',''],
+    488: ['青の遊牧隊　隊員 シャンディアの戦士',''],
+    489: ['緑の遊牧隊　隊員 シャンディアの戦士',''],
+    490: ['赤の遊牧隊　達人 シャンディアの戦士',''],
+    491: ['青の遊牧隊　達人 シャンディアの戦士',''],
+    492: ['緑の遊牧隊　達人 シャンディアの戦士',''],
+    493: ['黄の狩猟隊　隊員 シャンディアの戦士',''],
+    494: ['黒の狩猟隊　隊員 シャンディアの戦士',''],
+    495: ['黄の狩猟隊　達人 シャンディアの戦士',''],
+    496: ['黒の狩猟隊　達人 シャンディアの戦士',''],
+    497: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟','','Kid Ace'],
+    498: ['ポートガス・Ｄ・エース コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Ace'],
+    499: ['ベルメール',''],
+    500: ['ベルメール ナミとノジコの養母',''],
+    501: ['カヤ',''],
+    502: ['カヤ シロップ村のお嬢様',''],
+    503: ['ホトリ・コトリ',''],
+    504: ['ホトリ・コトリ スカイピア副神兵長',''],
+    505: ['ペル',''],
+    506: ['ペル アラバスタの守護神ファルコン',''],
+    507: ['チャカ',''],
+    508: ['チャカ アラバスタの守護神ジャッカル',''],
+    509: ['最強の囚人サー・クロコダイル Mr.0　バロックワークス社元社長','','Mr 0', 'Mr. 0','Crocodile','Prisondile'],
+    510: ['最強の囚人サー・クロコダイル 元王下七武海','','Mr 0','Mr. 0','Prisondile'],
+    511: ['服役囚ダズ・ボーネス Mr.1','','Mr 1','Daz Bones'],
+    512: ['サボ コルボ山の悪ガキ３兄弟','','Kid Sabo'],
+    513: ['サボ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Sabo'],
+    514: ['ニコ・ロビン トロピカル', '','Summertime Robin', 'Swimsuit Robin'],
+    515: ['ヘラクレスン','','Raid Heracles-un','Raid Heracles'],
+    516: ['ヘラクレスン 森の勇者','','Raid Heracles-un','Raid Heracles'],
+    517: ['ウソップン','', 'Raid Usoppun', 'Raid Usopp' ],
+    518: ['ウソップン ヘラクレスンの生徒','', 'Raid Usoppun, Pupil of Heracles\'n', 'fat usopp', 'Raid Usopp' ],
+    519: ['モンキー・Ｄ・ルフィ メルヴィユの冒険者','', 'Strong World Luffy', 'SW Luffy' ],
+    520: ['モンキー・Ｄ・ルフィ 特攻の麦わらの一味','', 'Strong World Luffy', 'SW Luffy' ],
+    521: ['サンジ メルヴィユの冒険者','', 'Strong World Sanji', 'SW Sanji' ],
+    522: ['サンジ 特攻の麦わらの一味','', 'Strong World Sanji', 'SW Sanji' ],
+    523: ['ナミ メルヴィユの冒険者','', 'Strong World Nami', 'SW Nami' ],
+    524: ['ナミと雷鳥ビリー','', 'Strong World Nami', 'SW Nami' ],
+    525: ['ブルック メルヴィユの冒険者','', 'Strong World Brook', 'SW Brook' ],
+    526: ['ブルック 特攻の麦わらの一味','', 'Strong World Brook', 'SW Brook' ],
+    527: ['チョッパー メルヴィユの冒険者','', 'Strong World Chopper', 'SW Chopper' ],
+    528: ['チョッパー 特攻の麦わらの一味','', 'Strong World Chopper', 'SW Chopper' ],
+    529: ['シャンクス 黒衣の赤髪','', 'Strong World Shanks', 'SW Shanks' ],
+    530: ['シャンクス 黒衣の四皇','', 'Strong World Shanks', 'SW Shanks' ],
+    531: ['ニコ・ロビン　桜吹雪','', 'Sakura Robin' ],
+    532: ['ニコ・ロビン　桜満開','', 'Sakura Robin' ],
+    533: ['ブルック　チェリーヘッド','', 'Sakura Brook' ],
+    534: ['ブルック　桜音色','', 'Sakura Brook' ],
+    535: ['ナミ　桜雲','', 'Sakura Nami' ],
+    536: ['ナミ　桜日和','', 'Sakura Nami' ],
+    537: ['ドミノ',''],
+    538: ['ドミノ インペルダウン副看守長',''],
+    539: ['ミノリノケロス',''],
+    540: ['バシリスク',''],
+    541: ['オーム',''],
+    542: ['ノラ ウワバミ',''],
+    543: ['ワイパー','', 'Wiper' ],
+    544: ['ワイパー 大戦士カルガラの子孫','', 'Wiper, Descendant of Great Warrior Calgara' ],
+    545: ['エネル','', 'Enel' ],
+    546: ['ゴッド・エネル','', 'God Enel' ],
+    547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟','','Kid Luffy'],
+    548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Luffy'],
+    549: ['サディちゃん',''],
+    550: ['サディちゃん インペルダウン獄卒長',''],
+    551: ['ミノコアラ',''],
+    552: ['マンティコラ',''],
+    553: ['ロロノア・ゾロ メルヴィユの冒険者','', 'Strong World Zoro', 'SW Zoro' ],
+    554: ['ロロノア・ゾロ 特攻の麦わらの一味','', 'Strong World Zoro', 'SW Zoro' ],
+    555: ['ウソップ メルヴィユの冒険者','', 'Strong World Usopp', 'SW Usopp' ],
+    556: ['ウソップ 特攻の麦わらの一味','', 'Strong World Usopp', 'SW Usopp' ],
+    557: ['ニコ・ロビン メルヴィユの冒険者','', 'Strong World Robin', 'SW Robin' ],
+    558: ['ニコ・ロビン 特攻の麦わらの一味','', 'Strong World Robin', 'SW Robin' ],
+    559: ['フランキー メルヴィユの冒険者','', 'Strong World Franky', 'SW Franky' ],
+    560: ['フランキー 特攻の麦わらの一味','', 'Strong World Franky', 'SW Franky' ],
+    561: ['ポートガス・D・エース 黒衣の火拳','', 'Strong World Ace', 'SW Ace' ],
+    562: ['ポートガス・D・エース 黒衣の白ひげ海賊団2番隊隊長','', 'Strong World Ace', 'SW Ace' ],
+    563: ['ポルチェ',''],
+    564: ['ポーティ',''],
+    565: ['ハンバーグ',''],
+    566: ['ピクルス',''],
+    567: ['ビッグパン','', 'Big Pan' ],
+    568: ['フォクシー',''],
+    569: ['銀ギツネのフォクシー',''],
+    570: ['モンキー・Ｄ・ルフィ デービーバックファイト・アフロ','', 'Afro Luffy', 'Afroluffy' ],
+    571: ['モンキー・Ｄ・ルフィ デービーバックファイト・コンバット','', 'Afro Luffy', 'Afroluffy' ],
+    572: ['ウソップ デービーバックファイト・セコンド',''],
+    573: ['トニートニー・チョッパー デービーバックファイト・マスク',''],
+    574: ['青キジ','','Raid Kuzan', 'Raid Aokiji' ],
+    575: ['青キジ　氷結人間','','Raid Kuzan', 'Raid Aokiji' ],
+    576: ['ナミのティータイム',''],
+    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy' ],
+    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy' ],
+    579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro', 'Roronoa Zoro, Wakes of the Endless Dream, Straw Hat Crew' ],
+    580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro', 'Roronoa Zoro, A Vow in the Great Age of Pirates - Master Swordsman' ],
+    581: ['ゲンボウ',''],
+    582: ['カマキリ',''],
+    583: ['ラキ','', 'Laki' ],
+    584: ['アイサ',''],
+    585: ['ノジコ',''],
+    586: ['ノジコ ナミの義姉妹',''],
+    587: ['クロッカス',''],
+    588: ['クロッカス 双子岬の灯台守',''],
+    589: ['コーザ',''],
+    590: ['コーザ 反乱軍リーダー',''],
+    591: ['朱の竜宮カメ姫','', 'Princess Turtle' ],
+    592: ['蒼の竜宮カメ姫','', 'Princess Turtle' ],
+    593: ['翠の竜宮カメ姫','', 'Princess Turtle' ],
+    594: ['琥珀の竜宮カメ姫','', 'Princess Turtle' ],
+    595: ['漆黒の竜宮カメ姫','', 'Princess Turtle' ],
+    596: ['トニートニー・チョッパー 航海の記録・麦わらの一味','', 'Log Chopper', 'Tony Tony Chopper, Wakes of the Endless Dream, Straw Hat Crew' ],
+    597: ['トニートニー・チョッパー 航海の憧れ「偉大な医者」','', 'Log Chopper', 'Tony Tony Chopper, A Vow in the Great Age of Pirates - Great Doctor' ],
+    598: ['バギー 海賊見習い','','Young Buggy', 'Baggy'],
+    599: ['バギー ロジャー海賊団','','Young Buggy', 'Baggy'],
+    600: ['シャンクス 海賊見習い','','Young Shanks'],
+    601: ['シャンクス ロジャー海賊団','','Young Shanks'],
+    602: ['エネル ２億Ｖ　雷神','', 'Raid Enel, 200 Million Volt Thunder God' ],
+    603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God' ],
+    604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji', 'Sanji, Wakes of the Endless Dream, Straw Hat Crew' ],
+    605: ['サンジ 航海の夢「オールブルー」','', 'Log Sanji' ],
+    606: ['海賊ゼフ',''],
+    607: ['赫足のゼフ クック海賊団船長',''],
+    608: ['ごろつきパティ',''],
+    609: ['ごろつきカルネ',''],
+    610: ['ハイキングベア',''],
+    611: ['プリンプリン','', 'Pudding Pudding' ],
+    612: ['ブルック 航海の記録・麦わらの一味','', 'Log Brook', 'Brook, Wakes of the Endless Dream, Straw Hat Crew' ],
+    613: ['ブルック 航海の夢「約束の再会」','','Log Brook', 'Brook, A Vow in the Great Age of Pirates - Promised Meeting' ],
+    614: ['ザンバイ',''],
+    615: ['怪力デストロイヤーズ 斧使い',''],
+    616: ['怪力デストロイヤーズ 槍使い',''],
+    617: ['怪力デストロイヤーズ 大砲使い','','Gunner'],
+    618: ['ナックルチンピラ 赤の賞金稼ぎ',''],
+    619: ['ナックルチンピラ 緑の賞金稼ぎ',''],
+    620: ['カタナチンピラ 青の賞金稼ぎ',''],
+    621: ['カタナチンピラ 赤の賞金稼ぎ',''],
+    622: ['ピストルチンピラ 緑の賞金稼ぎ',''],
+    623: ['ピストルチンピラ 黄の賞金稼ぎ',''],
+    624: ['棍棒チンピラ 黄の賞金稼ぎ',''],
+    625: ['棍棒チンピラ 黒の賞金稼ぎ',''],
+    626: ['ガトリングチンピラ 黒の賞金稼ぎ',''],
+    627: ['ガトリングチンピラ 青の賞金稼ぎ',''],
+    628: ['タイルストン',''],
+    629: ['フランキー フランキー一家棟梁',''],
+    630: ['カク サイファーポールNo.9',''],
+    631: ['カク 六式 サイファーポールNo.9',''],
+    632: ['ロブ・ルッチ サイファーポールNo.9',''],
+    633: ['ロブ・ルッチ 六式 サイファーポールNo.9',''],
+    634: ['ケイミー','','Keimi'],
+    635: ['ケイミー タコ焼き屋店員','','Keimi, Takoyaki Stand Assistant'],
+    636: ['パッパグ','', 'Pappug'],
+    637: ['はっちゃん タコ焼き屋店主','', 'Hachi, Takoyaki Stand Owner' ],
+    638: ['ドーマ',''],
+    639: ['遊騎士ドーマ',''],
+    640: ['ディカルバン兄弟',''],
+    641: ['絆のディカルバン兄弟',''],
+    642: ['スクアード','','Squardo'],
+    643: ['大渦蜘蛛スクアード','','Maelstrom Spider Squardo'],
+    644: ['ホワイティベイ',''],
+    645: ['氷の魔女ホワイティベイ',''],
+    646: ['リトルオーズJr.',''],
+    647: ['猛攻のリトルオーズJr.',''],
+    648: ['マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
+    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
+    650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami', 'Nami, Wakes of the Endless Dream, Straw Hat Crew' ],
+    651: ['ナミ 航海の夢「世界地図」','', 'Log Nami', 'Nami, A Vow in the Great Age of Pirates - World Map' ],
+    652: ['鉄仮面のデュバル','','Raid Duval'],
+    653: ['デュバル トビウオライダーズ ヘッド','','Raid Duval'],
+    654: ['デュバル 人生バラ色ライダーズ ヘッド','','Raid Duval'],
+    655: ['海賊アーロン','','Young Arlong'],
+    656: ['アーロン タイヨウの海賊団','','Young Arlong'],
+    657: ['クロオビ タイヨウの海賊団','','Young Kuroobi'],
+    658: ['チュウ タイヨウの海賊団','','Young Choo'],
+    659: ['モンキー・D・ルフィ うきわ','','Summertime Luffy','Swimsuit Luffy'],
     660: ['ウソップ 航海の記録・麦わらの一味', '', 'Log Usopp', 'Usopp, Wakes of the Endless Dream, Straw Hat Crew' ],
-    661: ['ウソップ 航海の夢「勇敢なる海の戦士」', '', 'Log Usopp', 'Usopp, A Vow in the Great Age of Pirates - Brave Sea Warrior' ],
-    662: ['ナミ バカンス', '', 'Summertime Nami', 'Swimsuit Nami' ],
-    663: ['ネフェルタリ・ビビ アラバスタ王国王女', '', 'Young Vivi' ],
-    664: ['ネフェルタリ・ビビ 砂砂団　副リーダー', '', 'Young Vivi' ],
-    665: ['コーザ アラバスタ住民', '', 'Young Koza' ],
-    666: ['コーザ 砂砂団　リーダー', '', 'Young Koza' ],
-    667: ['ネフェルタリ・コブラ アラバスタ王国国王', '' ],
-    668: ['サボ', '' ],
-    669: ['サボ 革命軍', '' ],
-    670: ['コアラ', '' ],
-    671: ['コアラ 革命軍', '' ],
-    672: ['ハック', '' ],
-    673: ['ハック 革命軍', '' ],
-    674: ['エンポリオ・イワンコフ ニューカマー拳法　師範', '', 'INTvankov' ],
-    675: ['エンポリオ・イワンコフ 革命軍', '', 'INTvankov' ],
-    676: ['イナズマ', '' ],
-    677: ['イナズマ 革命軍', '' ],
-    678: ['ニコ・ロビン 航海の記録・麦わらの一味', '', 'Log Robin', 'Nico Robin, Wakes of the Endless Dream, Straw Hat Crew' ],
-    679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」', '', 'Log Robin', 'Nico Robin, A Vow in the Great Age of Pirates - 100-Year Void' ],
-    680: ['アイス大好きナミ', '', 'Summertime Nami', 'Swimsuit Nami' ],
-    681: ['アイス大好きナミ レモンアイス', '', 'Summertime Nami', 'Swimsuit Nami' ],
-    682: ['アイス大好きロビン', '', 'Summertime Robin', 'Swimsuit Robin' ],
-    683: ['アイス大好きロビン チョコアイス', '', 'Summertime Robin', 'Swimsuit Robin' ],
-    684: ['アイス大好きペローナ', '', 'Summertime Perona', 'Swimsuit Perona' ],
-    685: ['アイス大好きペローナ ストロベリーアイス', '', 'Summertime Perona', 'Swimsuit Perona' ],
-    686: ['ビビのひとやすみ', '', 'Summertime Vivi', 'Swimsuit Vivi' ],
-    687: ['カルガラ', '' ],
-    688: ['カルガラ シャンディアの大戦士', '' ],
-    689: ['モンブラン・ノーランド', '' ],
-    690: ['モンブラン・ノーランド ルブニール王国探検船提督', '' ],
-    691: ['ナギナタ伍長 海軍本部', '' ],
-    692: ['ピストル伍長 海軍本部', '' ],
-    693: ['サーベル伍長 海軍本部', '' ],
-    694: ['バズーカ伍長 海軍本部', '' ],
-    695: ['ナックル伍長 海軍本部', '' ],
-    696: ['ナギナタ少佐 海軍本部', '' ],
-    697: ['ピストル少佐 海軍本部', '' ],
-    698: ['サーベル少佐 海軍本部', '' ],
-    699: ['バズーカ少佐 海軍本部', '' ],
-    700: ['ナックル少佐 海軍本部', '' ],
-    701: ['オイモ', '' ],
-    702: ['カーシ―', '' ],
-    703: ['法の番犬部隊', '' ],
-    704: ['有罪陪審員', '' ],
-    705: ['３つ首のバスカビル', '' ],
-    706: ['ブルーノ サイファーポールNo.9', '' ],
-    707: ['ブルーノ 六式 サイファーポールNo.9', '' ],
-    708: ['ニコ・ロビン 悪魔の子', '' ],
-    709: ['ニコ・ロビン 麦わらの一味', '' ],
-    710: ['フランキー 航海の記録・麦わらの一味', '', 'Log Franky', 'Franky, Wakes of the Endless Dream, Straw Hat Crew' ],
-    711: ['フランキー 航海の夢「海の果てを旅する船」', '', 'Log Franky', 'Franky, A Vow in the Great Age of Pirates - Ship of the Seven Seas' ],
-    712: ['ガン・フォール', '', 'Gan Fall', 'ganfall' ],
-    713: ['ガン・フォール 空の騎士', '', 'Gan Fall the Knight of the Sky', 'ganfall' ],
-    714: ['ピエール', '' ],
-    715: ['コニス', '' ],
-    716: ['コニス スカイピアの少女', '' ],
-    717: ['ジュラキュール・ミホーク 王下七武海', '', 'INThawk' ],
-    718: ['鷹の目のミホーク 世界最強の剣士', '', 'INThawk' ],
-    719: ['サー・クロコダイル　ロギア 王下七武海', '' ],
-    720: ['サー・クロコダイル　ロギア 元王下七武海', '' ],
-    721: ['ジェリー', '' ],
-    722: ['ジェリー サイファーポールNo.6', '' ],
-    723: ['Tボーン', '' ],
-    724: ['船斬りTボーン 海軍本部大佐', '' ],
-    725: ['ネフェルタリ・ビビ 航海の記録・アラバスタ王国王女', '', 'Log Vivi' ],
-    726: ['ネフェルタリ・ビビ 航海の夢「海賊女王」', '', 'Log Vivi' ],
-    727: ['モンキー・D・ルフィ ゴムゴムの銃乱打 (ガトリング)', '' ],
-    728: ['カリファ サイファーポールNo.9', '', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
-    729: ['カリファ　六式 サイファーポールNo.9', '', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
-    730: ['ジャブラ サイファーポールNo.9', '', 'Jabura' ],
-    731: ['ジャブラ　六式 サイファーポールNo.9', '', 'Jabura' ],
-    732: ['フクロウ サイファーポールNo.9', '' ],
-    733: ['フクロウ　六式 サイファーポールNo.9', '' ],
-    734: ['クマドリ サイファーポールNo.9', '' ],
-    735: ['クマドリ　六式 サイファーポールNo.9', '' ],
-    736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）', '', 'Box Kaku' ],
-    737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）', '', 'rob lucci' ],
-    738: ['スパンダム', '' ],
-    739: ['フランキー 麦わらの一味', '' ],
-    740: ['ネロ', '' ],
-    741: ['ネロ サイファーポールNo.9', '' ],
-    742: ['ワンゼ', '' ],
-    743: ['ワンゼ サイファーポールNo.7', '' ],
-    744: ['ポートガス・D・エース 航海の記録・白ひげ海賊団', '', 'Log Ace' ],
-    745: ['ポートガス・D・エース 航海の夢「海賊の高み」', '', 'Log Ace' ],
-    746: ['メガロ＆しらほし姫', '' ],
-    747: ['ロブ・ルッチ 闇の正義の「ＣＰ９」', '' ],
-    748: ['ロブ・ルッチ 歴代最強の「ＣＰ９」', '' ],
-    749: ['カク 闇の正義の「ＣＰ９」', '' ],
-    750: ['カク 歴代最強の「ＣＰ９」', '' ],
-    751: ['カリファ 闇の正義の「ＣＰ９」', '', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
-    752: ['カリファ 歴代最強の「ＣＰ９」', '', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
-    753: ['ジャブラ 闇の正義の「ＣＰ９」', '', 'Jabura' ],
-    754: ['ジャブラ 歴代最強の「ＣＰ９」', '', 'Jabura' ],
-    755: ['ブルーノ 闇の正義の「ＣＰ９」', '' ],
-    756: ['ブルーノ 歴代最強の「ＣＰ９」', '' ],
-    757: ['フクロウ 闇の正義の「ＣＰ９」', '' ],
-    758: ['フクロウ 歴代最強の「ＣＰ９」', '' ],
-    759: ['クマドリ 闇の正義の「ＣＰ９」', '' ],
-    760: ['クマドリ 歴代最強の「ＣＰ９」', '' ],
-    761: ['モンキー・D・ルフィ ハロウィンモンスター', '', 'Halloween Luffy' ],
-    762: ['ウソップ うそつき狼', '', 'Halloween Usopp' ],
-    763: ['フランキー フランケンシュタイン', '', 'Halloween Franky' ],
-    764: ['ナミ かぼちゃランタン', '', 'Halloween Nami' ],
-    765: ['トニートニー・チョッパー リトルヴァンパイア', '', 'Halloween Chopper' ],
-    766: ['ロロノア・ゾロ ジャック・ザ・リッパ―', '', 'Halloween Zoro' ],
-    767: ['ニコ・ロビン セクシーデビル', '', 'Halloween Robin' ],
-    768: ['サンジ ゴーストナイト', '', 'Halloween Sanji' ],
-    769: ['ブルック こわがりスケルトン', '', 'Halloween Brook' ],
-    770: ['ダルメシアン 海軍本部中将', '', 'Raid Dalmatian' ],
-    771: ['モモンガ 海軍本部中将', '', 'Raid Momonga' ],
-    772: ['オニグモ 海軍本部中将', '', 'Raid Onigumo' ],
-    773: ['シュウ', '', 'Raid Shu' ],
-    774: ['ベリーグッド', '', 'Very Good', 'Raid Berry Good' ],
-    775: ['ストロベリー 海軍本部中将', '', 'Raid Strawberry' ],
-    776: ['ラッキー・ルウ', '', 'Coliseum Lucky Roo' ],
-    777: ['ラッキー・ルウ 赤髪海賊団', '', 'Coliseum Lucky Roo' ],
-    778: ['レベッカ 囚人剣闘士', '', 'Coliseum Rebecca' ],
-    779: ['レベッカ コロシアム専属剣闘士', '', 'Coliseum Rebecca' ],
-    780: ['ウルージ 破戒僧海賊団船長', '', 'Supernova Urouge', 'Coliseum Urouge' ],
-    781: ['怪僧ウルージ 破戒僧海賊団船長', '', 'Supernova Urouge', 'Coliseum Urouge' ],
-    782: ['たしぎ 正義の華', '', 'Kimono Tashigi' ],
-    783: ['たしぎ 海軍本部少尉・正義の華', '', 'Kimono Tashigi' ],
-    784: ['ゲンさん', '' ],
-    785: ['ゲンゾウ ココヤシ村の駐在', '' ],
-    786: ['Dr.ヒルルク', '', 'Dr. Hiruruk', 'Dr Hiruruk' ],
-    787: ['Dr.ヒルルク ヤブ医者', '', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
-    788: ['くいな', '' ],
-    789: ['くいな シモツキ村の少女剣士', '' ],
-    790: ['たまねぎ＆ピーマン＆にんじん', '', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
-    791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団', '', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
-    792: ['アイスバーグ', '', 'Iceberg' ],
-    793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長', '', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
-    794: ['モンキー・D・ルフィ 希望の星', '', 'Raid NM Luffy', 'Raid Luffy' ],
-    795: ['ナイトメア・ルフィ 希望の戦士', '', 'Raid NM Luffy', 'Raid Luffy' ],
-    796: ['ブリード', '' ],
-    797: ['ブリード ペトペトの実の能力者', '' ],
-    798: ['クンフージュゴン 海獣海賊団', '' ],
-    799: ['シーラパーン 海獣海賊団', '', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
-    800: ['たこボクサー 海獣海賊団', '' ],
-    801: ['Mr.2・ボン・クレー 航海の記録・B・W', '', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
-    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」', '', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
-    803: ['ヒナ 海軍本部大佐', '', 'Coliseum Hina' ],
-    804: ['黒檻のヒナ 海軍本部大佐', '', 'Coliseum Hina' ],
-    805: ['スモーカー 海軍本部大佐', '', 'Coliseum Smoker' ],
-    806: ['白猟のスモーカー 海軍本部大佐', '', 'Coliseum Smoker' ],
-    807: ['純白の天使ナミ ウエディング', '', 'Bridal Nami' ],
-    808: ['純白の女神ナミ ウエディング', '', 'Bridal Nami' ],
-    809: ['ローラ スリラーバークの花嫁', '' ],
-    810: ['求愛のローラ スリラーバークの花嫁', '' ],
-    811: ['リスキー兄弟', '' ],
-    812: ['ケルベロス', '' ],
-    813: ['タララン', '', 'Spider Monkey' ],
-    814: ['敷きグマ', '' ],
-    815: ['ゲッコー・モリア スリラーバークの怪人', '', 'Gekko Moriah, Thriller Bark\'s Mysterious Four' ],
-    816: ['ゲッコー・モリア スリラーバークの支配者', '', 'Gekko Moriah, Ruler of Thriller Bark' ],
-    817: ['ソルジャーゾンビ　力自慢の影', '' ],
-    818: ['ソルジャーゾンビ　素早さの影', '' ],
-    819: ['ソルジャーゾンビ　悪巧みの影', '' ],
-    820: ['ソルジャーゾンビ　憎しみの影', '' ],
-    821: ['ソルジャーゾンビ　自尊心の影', '' ],
-    822: ['トリッキー・ワイルドゾンビ', '' ],
-    823: ['インテリ・ワイルドゾンビ', '' ],
-    824: ['ハートフル・ワイルドゾンビ', '' ],
-    825: ['ジェネラルゾンビ　怪力の影', '' ],
-    826: ['ジェネラルゾンビ　奇技の影', '' ],
-    827: ['ジェネラルゾンビ　疾速の影', '' ],
-    828: ['？？？', '', 'Kid Law', 'Young Law' ],
-    829: ['？？？', '', 'Kid Law', 'Young Law' ],
-    830: ['バジル・ホーキンス ホーキンス海賊団船長', '', 'Supernova Hawkins', 'Coliseum Hawkins', 'Coliseum Basil Hawkins' ],
-    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長', '', 'Supernova Hawkins', 'Coliseum Hawkins', 'Coliseum Basil Hawkins' ],
-    832: ['ワイパー シャンディアの戦士', '', 'Wiper, Warrior of Shandia', 'Coliseum Wyper' ],
-    833: ['戦鬼ワイパー シャンディアの戦士', '', 'Berserker Wiper, Warrior of Shandia', 'Coliseum Wyper' ],
-    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ', '', 'Mr 7 and Miss Fathers Day', 'Coliseum Mr 7', 'Coliseum Miss Fathers Day' ],
-    835: ['暴君バーソロミュー・くま', '', 'Raid Kuma' ],
-    836: ['暴君バーソロミュー・くま 政府の人間兵器', '', 'Raid Kuma' ],
-    837: ['シーザー・クラウン', '' ],
-    838: ['Ｍ（マスター）・シーザー', '' ],
-    839: ['ヴェルゴ', '' ],
-    840: ['ヴェルゴ ドンキホーテ海賊団', '' ],
-    841: ['モネ', '' ],
-    842: ['モネ ドンキホーテ海賊団', '' ],
-    843: ['ベビー５', '' ],
-    844: ['ベビー５ ドンキホーテ海賊団', '' ],
-    845: ['バッファロー', '' ],
-    846: ['バッファロー ドンキホーテ海賊団', '' ],
-    847: ['トム トムズ　ワーカーズ', '' ],
-    848: ['伝説の船大工トム トムズ　ワーカーズ', '' ],
-    849: ['カティ・フラム トムズ　ワーカーズ', '', 'Franky, Tom\'s Workers', 'Young Franky' ],
-    850: ['アイスバーグ トムズ　ワーカーズ', '', 'Iceburg, Tom\'s Workers', 'Young Iceberg' ],
-    851: ['ブリキのワポル', '' ],
-    852: ['スリムアップワポル', '' ],
-    853: ['ロブソン', '' ],
-    854: ['チョッパーの雪遊び', '', 'Winter Chopper' ],
-    855: ['トラファルガー・ロー 聖夜の紳士', '', 'Supernova Law', 'Christmas Law', 'CLaw' ],
-    856: ['トラファルガー・ロー 聖夜の貴公子', '', 'Supernova Law', 'Christmas Law', 'CLaw' ],
-    857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ', '', 'Supernova Bonney' ],
-    858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ', '', 'Supernova Bonney' ],
-    859: ['コビー 海軍本部曹長', '', 'Coliseum Coby' ],
-    860: ['戦火の勇士コビー 海軍本部曹長', '', 'Coliseum Coby' ],
-    861: ['レディー・アルビダ うるわしき美女', '', 'Coliseum Alvida' ],
-    862: ['レディー・アルビダ 絶世の美女', '', 'Coliseum Alvida' ],
-    863: ['銀世界のナミ', '', 'Winter Nami' ],
-    864: ['ボア・ハンコック 九蛇海賊団船長', '', 'Raid Boa' ],
-    865: ['女帝ボア・ハンコック 九蛇海賊団船長', '', 'Raid Boa' ],
-    866: ['ニコ・ロビン 百花繚乱 ウイング“華”', '', 'Kimono Robin' ],
-    867: ['ウソップ タバスコ星“撃”', '', 'Kimono Usopp' ],
-    868: ['トニートニー・チョッパー 重量ゴング“獣”', '', 'Kimono Chopper' ],
-    869: ['ドンキホーテ・ドフラミンゴ ドンキホーテ海賊団', '', 'Doffy' ],
-    870: ['天夜叉ドフラミンゴ', '', 'Doffy' ],
-    871: ['シュガー', '' ],
-    872: ['シュガー ドンキホーテ海賊団', '' ],
-    873: ['セニョール・ピンク', '', 'Senor Pink', 'Senior Pink' ],
-    874: ['セニョール・ピンク ドンキホーテ海賊団', '', 'Senor Pink', 'Senior Pink' ],
-    875: ['トレーボル', '' ],
-    876: ['トレーボル ドンキホーテ海賊団', '' ],
-    877: ['ジョーラ', '', 'Giolla', 'Jora' ],
-    878: ['ジョーラ ドンキホーテ海賊団', '', 'Giolla, Donquixote Pirates', 'Jora' ],
-    879: ['ラオＧ', '' ],
-    880: ['ラオＧ ドンキホーテ海賊団', '' ],
-    881: ['スクラッチメン・アプー オンエア海賊団船長', '', 'Supernova Apoo', 'Coliseum Apoo' ],
-    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長', '', 'Supernova Apoo', 'Coliseum Apoo' ],
-    883: ['ドリー 巨兵海賊団', '', 'Coliseum Dorry' ],
-    884: ['青鬼のドリー', '', 'Coliseum Dorry' ],
-    885: ['ジンベエ 鮫の武人', '', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
-    886: ['Mr.1 西の海の剣客', '', 'Kimono Mr. 1', 'Kimono Mr 1', 'daz bones' ],
-    887: ['バギー 陽気なかぶき者', '', 'Kimono Buggy', 'Baggy' ],
-    888: ['ホロホロゴースト', '' ],
-    889: ['ペローナ スリラーバークの怪人', '' ],
-    890: ['ペローナ 巨大なゴーストプリンセス', '' ],
-    891: ['ドクトル・ホグバック スリラーバークの怪人', '' ],
-    892: ['墓場のアブサロム スリラーバークの怪人', '' ],
-    893: ['オーズ 特別ゾンビ', '' ],
-    894: ['ゲッコー・モリア 影の集合地（シャドーズ・アスガルド）', '', 'Gekko Moriah, Shadow\'s Asgard' ],
-    895: ['ブルック 紳士なガイコツ', '' ],
-    896: ['ブルック 麦わらの一味', '' ],
-    897: ['サー・クロコダイル 砂の武将', '', 'Kimono Crocodile' ],
-    898: ['Mr.3 姑息な楽士', '', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
-    899: ['Mr.2・ボン・クレー あやふやな侍', '', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
-    900: ['フレッシュ・フランキー 健康第一', '', 'Coliseum Franky' ],
-    901: ['鉄人（サイボーグ）フランキー', '', 'Coliseum Franky' ],
-    902: ['ブロギー 巨兵海賊団', '', 'Coliseum Broggy' ],
-    903: ['赤鬼のブロギー', '', 'Coliseum Broggy' ],
-    904: ['ヨコヅナ', '', 'Coliseum Yokozuna' ],
-    905: ['ロロノア・ゾロ クライガナ島をさすらう剣士', '', '3D2Y Zoro', 'Timeskip Zoro' ],
-    906: ['ロロノア・ゾロ 世界最強剣士の門弟', '', '3D2Y Zoro', 'Timeskip Zoro' ],
-    907: ['ニコ・ロビン テキーラウルフの収監者', '', '3D2Y Robin', 'Timeskip Robin' ],
-    908: ['ニコ・ロビン 革命の灯火（ともしび）', '', '3D2Y Robin', 'Timeskip Robin' ],
-    909: ['トニートニー・チョッパー トリノ王国の平和の架け橋', '', '3D2Y Chopper', 'Timeskip Chopper' ],
-    910: ['チョッパーマスク 世界の平和を守るヒーロー', '', '3D2Y Chopper', 'Timeskip Chopper' ],
-    911: ['サンジ カマバッカ王国の逃走者', '', '3D2Y Sanji', 'Timeskip Sanji' ],
-    912: ['サンジ 男を懸けた愛の料理人', '', '3D2Y Sanji', 'Timeskip Sanji' ],
-    913: ['ブルック ハラヘッターニャの悪魔王', '', '3D2Y Brook', 'Timeskip Brook' ],
-    914: ['ブルック 骨（ボーン） to be wild!!!', '', '3D2Y Brook', 'Timeskip Brook' ],
-    915: ['ニコ・ロビン オハラの花嫁', '', 'Wedding Nico Robin' ],
-    916: ['麗らかな才女 ロビン ウエディング', '', 'Bride Nico Robin' ],
-    917: ['マーガレット', '' ],
-    918: ['マーガレット 護国の戦士', '' ],
-    919: ['アフェランドラ', '' ],
-    920: ['スイトピー', '', 'Sweet Pea' ],
-    921: ['ボア・ハンコック 女ヶ島の花嫁', '', 'Bridal Boa Hancock', " Wedding Hancock"],
-    922: ['愛に生きる女帝ハンコック ウエディング', '', 'Bridal Boa Hancock' ],
-    923: ['南の海のキャプテン・キッド', '', 'Coliseum Kid', 'Coliseum Kidd' ],
-    924: ['キャプテン・キッド キッド海賊団船長', '', 'Coliseum Kid', 'Coliseum Kidd' ],
-    925: ['獄卒長サディちゃん', '', 'Coliseum Sadie', 'Secuurity Chief Sadie-chan' ],
-    926: ['獄卒長サディちゃん 獄卒獣の指揮官', '', 'Coliseum Sadie', 'Secuurity Chief Sadie-chan' ],
-    927: ['ドーベルマン 海軍本部中将', '', 'Coliseum Doberman' ],
-    928: ['ハンニャバル', '', 'Hannibal' ],
-    929: ['ハンニャバル', '', 'Hannibal' ],
-    930: ['サルデス', '' ],
-    931: ['ブルゴリ ', '', 'Blue Gorilla' ],
-    932: ['ピーカ', '', 'Raid Pica' ],
-    933: ['ピーカ ドンキホーテ海賊団', '', 'Raid Pica' ],
-    934: ['海峡のジンベエ', '', 'Jinbe', 'Jimbei', 'Jinbei', 'INTbe' ],
-    935: ['海峡のジンベエ 元王下七武海', '', 'Jinbe', 'Jimbei', 'Jinbei', 'INTbe' ],
-    936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者', '', 'Timeskip Luffy', '3D2Y Luffy' ],
-    937: ['モンキー・Ｄ・ルフィ 仲間との誓い『３Ｄ２Ｙ』', '', 'Timeskip Luffy', '3D2Y Luffy' ],
-    938: ['ナミ 天候の科学の探求者', '', 'Timeskip Nami', '3D2Y Nami' ],
-    939: ['ナミ 空島ウェザリアの泥棒ネコ', '', 'Timeskip Nami', '3D2Y Nami' ],
-    940: ['ウソップ ボーイン列島の大食漢', '', 'Timeskip Usopp', '3D2Y Usopp' ],
-    941: ['ウソップ おいはぎの森の果敢な戦士', '', 'Timeskip Usopp', '3D2Y Usopp' ],
-    942: ['フランキー メカアニマルと戦う改造人間', '', 'Timeskip Franky', '3D2Y Franky' ],
-    943: ['鉄人（サイボーグ）フランキー バルジモアの霊獣', '', 'Timeskip Franky', '3D2Y Franky' ],
-    944: ['？？？', '', 'Wedding Perona' ],
-    945: ['？？？', '', 'Bride Perona' ],
-    946: ['ラクヨウ 白ひげ海賊団７番隊隊長', '' ],
-    947: ['フォッサ 白ひげ海賊団１５番隊隊長', '' ],
-    948: ['クリエル 白ひげ海賊団１０番隊隊長', '' ],
-    949: ['サッチ 白ひげ海賊団４番隊隊長', '' ],
-    950: ['火拳のエース', '', 'Coliseum Ace' ],
-    951: ['火拳のエース 白ひげ海賊団２番隊隊長', '', 'Coliseum Ace' ],
-    952: ['ベン・ベックマン', '', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman' ],
-    953: ['ベン・ベックマン 赤髪海賊団', '', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman' ],
-    954: ['ギャロ', '' ],
-    955: ['マクロ', '', 'Makuro' ],
-    956: ['タンスイ', '' ],
-    957: ['早業のガンマン 青のボディガード', '' ],
-    958: ['計略のガンマン 黒のボディガード', '' ],
-    959: ['技巧のガンマン 緑のボディガード', '' ],
-    960: ['速攻のガンマン 青のボディガード', '' ],
-    961: ['豪腕のガンマン 赤のボディガード', '' ],
-    962: ['強心のガンマン 黄のボディガード', '' ],
-    963: ['チャルロス聖', '' ],
-    964: ['ロズワード聖', '' ],
-    965: ['シャルリア宮', '' ],
-    966: ['ユースタス・キッド 超新星（スーパールーキー）', '', 'Story Kidd' ],
-    967: ['トラファルガー・ロー 超新星（スーパールーキー）', '' ],
-    968: ['パシフィスタ　ＰＸ－1', '' ],
-    969: ['パシフィスタ　ＰＸ－2', '' ],
-    970: ['パシフィスタ　ＰＸ－３', '' ],
-    971: ['パシフィスタ　ＰＸ－４', '' ],
-    972: ['パシフィスタ　ＰＸ－５', '' ],
-    973: ['戦桃丸', '', 'Sentoumaru' ],
-    974: ['戦桃丸 海軍本部科学部隊隊長', '', 'Sentoumaru' ],
-    975: ['スモーカー あらくれの一匹オオカミ', '', 'Kid Smoker' ],
-    976: ['スモーカー 孤高の一匹オオカミ', '', 'Kid Smoker' ],
-    977: ['黄猿', '', 'Raid Borsalino', 'Raid Kizaru' ],
-    978: ['黄猿　光人間', '', 'Raid Borsalino', 'Raid Kizaru' ],
-    979: ['イゾウ 白ひげ海賊団１６番隊隊長', '' ],
-    980: ['ブラメンコ 白ひげ海賊団６番隊隊長', '' ],
-    981: ['ナミュール 白ひげ海賊団８番隊隊長', '' ],
-    982: ['ビスタ 白ひげ海賊団５番隊隊長', '', 'Coliseum Vista' ],
-    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長', '', 'Coliseum Vista' ],
-    984: ['パウリー ガレーラカンパニー１番ドック職長', '', 'Coliseum Paulie' ],
-    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
-    986: ['ココア＆のらギツネ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
-    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
-    988: ['マウンブルテン＆トルコ ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
-    989: ['ニセ麦わらの一味', '', 'Raid', 'Imposter', 'Fake' ],
-    990: ['マッハ・バイス', '', 'Mach Vise' ],
-    991: ['マッハ・バイス ドンキホーテ海賊団', '', 'Mach Vise' ],
-    992: ['グラディウス', '' ],
-    993: ['グラディウス ドンキホーテ海賊団', '' ],
-    994: ['ヴァイオレット', '', 'Viola' ],
-    995: ['ヴァイオレット ドンキホーテ海賊団', '', 'Viola' ],
-    996: ['デリンジャー', '' ],
-    997: ['デリンジャー ドンキホーテ海賊団', '' ],
-    998: ['ディアマンテ', '' ],
-    999: ['ディアマンテ ドンキホーテ海賊団', '' ],
-    1000: ['コラソン ドンキホーテ海賊団', '', 'Rocinante', 'Rosinante' ],
-    1001: ['ドンキホーテ・ロシナンテ', '', 'Rocinante', 'Corazon' ],
-    1002: ['ベポ ハートの海賊団', '' ],
-    1003: ['武闘家のベポ ハートの海賊団', '' ],
-    1004: ['シャチ＆ペンギン ハートの海賊団', '' ],
-    1005: ['ジャンバール', '' ],
-    1006: ['ジャンバール ハートの海賊団', '' ],
-    1007: ['モネ　寒桜', '', 'Sakura Monet' ],
-    1008: ['モネ　大寒桜', '', 'Sakura Monet' ],
-    1009: ['キズナBOOOOSTルフィ', '', 'Afro Luffy', 'Afroluffy' ],
-    1010: ['バトラー伯爵', '' ],
-    1011: ['バトラー伯爵（王なる力）', '' ],
-    1012: ['ヘビー総裁', '' ],
-    1013: ['ホットドッグ将軍', '' ],
-    1014: ['トニートニー・チョッパー 動物王', '' ],
-    1015: ['カポネ・ベッジ ファイアタンク海賊団船長', '', 'Coliseum Capone Bege' ],
-    1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長', '', 'Coliseum Capone Bege' ],
-    1017: ['茶ひげ', '', 'Coliseum Brownbeard' ],
-    1018: ['茶ひげ ワニのケンタウロス', '', 'Coliseum Brownbeard' ],
-    1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長', '', 'Coliseum Lulu' ],
-    1020: ['シュガー　実桜', '', 'Sakura Sugar' ],
-    1021: ['シュガー　桜桃', '', 'Sakura Sugar' ],
-    1022: ['モンキー・D・ルフィ 海賊王への軌跡', '', 'Anniversary Luffy' ],
-    1023: ['ポートガス・D・エース 海賊王に馳せた夢', '' ],
-    1024: ['首領・チンジャオ', 'Don Chinjao' ],
-    1025: ['首領・チンジャオ 花ノ国のギャング', 'Don Chinjao' ],
-    1026: ['ブルーギリー', '' ],
-    1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）', '' ],
-    1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ', '' ],
-    1029: ['ファンク兄弟 モガロ王国の殺し屋', '' ],
-    1030: ['ハイルディン', '' ],
-    1031: ['ハイルディン 海賊傭兵', '' ],
-    1032: ['アブドーラ＆ジェット', '', 'Abdullah and Jeet' ],
-    1033: ['アブドーラ＆ジェット 元賞金稼ぎ', '', 'Abdullah and Jeet, Former Bounty Hunters' ],
-    1034: ['バルトロメオ', '' ],
-    1035: ['人食いのバルトロメオ', '' ],
-    1036: ['エンポリオ・イワンコフ 秘密の花園の女王', '' ],
-    1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王', '' ],
-    1038: ['イナズマ 秘密の花園の乙女', '' ],
-    1039: ['イナズマ 変革を画策する乙女', '' ],
-    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '', 'Coliseum Jozu' ],
-    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '', 'Coliseum Jozu' ],
-    1042: [ 'キラー キッド海賊団', '', 'Coliseum Killer', 'Supernova Killer' ],
-    1043: [ '“殺戮武人”キラー キッド海賊団', '', 'Coliseum Killer', 'Supernova Killer' ],
-    1044: [ 'トラファルガー・ロー 最悪の世代', '', 'LLaw', 'PLaw' ],
-    1045: [ 'トラファルガー・ロー 王下七武海', '', 'LLaw', 'PLaw' ],
-    1046: [ 'サボ 竜の爪', '', 'Raid Sabo' ],
-    1047: [ 'サボ 革命軍参謀総長', '', 'Raid Sabo' ],
+    661: ['ウソップ 航海の夢「勇敢なる海の戦士」','', 'Log Usopp', 'Usopp, A Vow in the Great Age of Pirates - Brave Sea Warrior' ],
+    662: ['ナミ バカンス', '', 'Summertime Nami', 'Swimsuit Nami'],
+    663: ['ネフェルタリ・ビビ アラバスタ王国王女','','Young Vivi'],
+    664: ['ネフェルタリ・ビビ 砂砂団　副リーダー','','Young Vivi'],
+    665: ['コーザ アラバスタ住民','','Young Koza'],
+    666: ['コーザ 砂砂団　リーダー','','Young Koza'],
+    667: ['ネフェルタリ・コブラ アラバスタ王国国王',''],
+    668: ['サボ',''],
+    669: ['サボ 革命軍',''],
+    670: ['コアラ',''],
+    671: ['コアラ 革命軍',''],
+    672: ['ハック',''],
+    673: ['ハック 革命軍',''],
+    674: ['エンポリオ・イワンコフ ニューカマー拳法　師範','','INTvankov'],
+    675: ['エンポリオ・イワンコフ 革命軍','','INTvankov'],
+    676: ['イナズマ',''],
+    677: ['イナズマ 革命軍',''],
+    678: ['ニコ・ロビン 航海の記録・麦わらの一味','', 'Log Robin', 'Nico Robin, Wakes of the Endless Dream, Straw Hat Crew' ],
+    679: ['ニコ・ロビン 航海の夢「空白の歴史の解明」','', 'Log Robin', 'Nico Robin, A Vow in the Great Age of Pirates - 100-Year Void' ],
+    680: ['アイス大好きナミ','','Summertime Nami','Swimsuit Nami'],
+    681: ['アイス大好きナミ レモンアイス','','Summertime Nami','Swimsuit Nami'],
+    682: ['アイス大好きロビン','','Summertime Robin','Swimsuit Robin'],
+    683: ['アイス大好きロビン チョコアイス','','Summertime Robin','Swimsuit Robin'],
+    684: ['アイス大好きペローナ','','Summertime Perona','Swimsuit Perona'],
+    685: ['アイス大好きペローナ ストロベリーアイス','','Summertime Perona','Swimsuit Perona'],
+    686: ['ビビのひとやすみ','', 'Summertime Vivi', 'Swimsuit Vivi' ],
+    687: ['カルガラ',''],
+    688: ['カルガラ シャンディアの大戦士',''],
+    689: ['モンブラン・ノーランド',''],
+    690: ['モンブラン・ノーランド ルブニール王国探検船提督',''],
+    691: ['ナギナタ伍長 海軍本部',''],
+    692: ['ピストル伍長 海軍本部',''],
+    693: ['サーベル伍長 海軍本部',''],
+    694: ['バズーカ伍長 海軍本部',''],
+    695: ['ナックル伍長 海軍本部',''],
+    696: ['ナギナタ少佐 海軍本部',''],
+    697: ['ピストル少佐 海軍本部',''],
+    698: ['サーベル少佐 海軍本部',''],
+    699: ['バズーカ少佐 海軍本部',''],
+    700: ['ナックル少佐 海軍本部',''],
+    701: ['オイモ',''],
+    702: ['カーシ―',''],
+    703: ['法の番犬部隊',''],
+    704: ['有罪陪審員',''],
+    705: ['３つ首のバスカビル',''],
+    706: ['ブルーノ サイファーポールNo.9',''],
+    707: ['ブルーノ 六式 サイファーポールNo.9',''],
+    708: ['ニコ・ロビン 悪魔の子',''],
+    709: ['ニコ・ロビン 麦わらの一味',''],
+    710: ['フランキー 航海の記録・麦わらの一味','', 'Log Franky', 'Franky, Wakes of the Endless Dream, Straw Hat Crew' ],
+    711: ['フランキー 航海の夢「海の果てを旅する船」','', 'Log Franky', 'Franky, A Vow in the Great Age of Pirates - Ship of the Seven Seas' ],
+    712: ['ガン・フォール','','Gan Fall','ganfall'],
+    713: ['ガン・フォール 空の騎士','','Gan Fall the Knight of the Sky','ganfall'],
+    714: ['ピエール',''],
+    715: ['コニス',''],
+    716: ['コニス スカイピアの少女',''],
+    717: ['ジュラキュール・ミホーク 王下七武海','','INThawk'],
+    718: ['鷹の目のミホーク 世界最強の剣士','','INThawk'],
+    719: ['サー・クロコダイル　ロギア 王下七武海',''],
+    720: ['サー・クロコダイル　ロギア 元王下七武海',''],
+    721: ['ジェリー',''],
+    722: ['ジェリー サイファーポールNo.6',''],
+    723: ['Tボーン',''],
+    724: ['船斬りTボーン 海軍本部大佐',''],
+    725: ['ネフェルタリ・ビビ 航海の記録・アラバスタ王国王女','', 'Log Vivi' ],
+    726: ['ネフェルタリ・ビビ 航海の夢「海賊女王」','', 'Log Vivi' ],
+    727: ['モンキー・D・ルフィ ゴムゴムの銃乱打 (ガトリング)',''],
+    728: ['カリファ サイファーポールNo.9','', 'Califa, Cipher Pol No.9', 'Calipha, Cipher Pol No.9', 'Kalipha, Cipher Pol No.9' ],
+    729: ['カリファ　六式 サイファーポールNo.9','', 'Califa Rokushiki, Cipher Pol No.9', 'Calipha Rokushiki, Cipher Pol No.9', 'Kalipha Rokushiki, Cipher Pol No.9' ],
+    730: ['ジャブラ サイファーポールNo.9','','Jabura'],
+    731: ['ジャブラ　六式 サイファーポールNo.9','','Jabura'],
+    732: ['フクロウ サイファーポールNo.9',''],
+    733: ['フクロウ　六式 サイファーポールNo.9',''],
+    734: ['クマドリ サイファーポールNo.9',''],
+    735: ['クマドリ　六式 サイファーポールNo.9',''],
+    736: ['カク　獣人 ウシウシの実　モデル麒麟（ジラフ）','','Box Kaku'],
+    737: ['ルッチ　獣人 ネコネコの実　モデル豹（レオパルド）','','rob lucci'],
+    738: ['スパンダム',''],
+    739: ['フランキー 麦わらの一味',''],
+    740: ['ネロ',''],
+    741: ['ネロ サイファーポールNo.9',''],
+    742: ['ワンゼ',''],
+    743: ['ワンゼ サイファーポールNo.7',''],
+    744: ['ポートガス・D・エース 航海の記録・白ひげ海賊団','', 'Log Ace' ],
+    745: ['ポートガス・D・エース 航海の夢「海賊の高み」','', 'Log Ace' ],
+    746: ['メガロ＆しらほし姫',''],
+    747: ['ロブ・ルッチ 闇の正義の「ＣＰ９」',''],
+    748: ['ロブ・ルッチ 歴代最強の「ＣＰ９」',''],
+    749: ['カク 闇の正義の「ＣＰ９」',''],
+    750: ['カク 歴代最強の「ＣＰ９」',''],
+    751: ['カリファ 闇の正義の「ＣＰ９」','', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
+    752: ['カリファ 歴代最強の「ＣＰ９」','', 'Califa, CP9\'s Strongest Generation', 'Calipha, CP9\'s Strongest Generation', 'Kalipha, CP9\'s Strongest Generation' ],
+    753: ['ジャブラ 闇の正義の「ＣＰ９」','','Jabura'],
+    754: ['ジャブラ 歴代最強の「ＣＰ９」','','Jabura'],
+    755: ['ブルーノ 闇の正義の「ＣＰ９」',''],
+    756: ['ブルーノ 歴代最強の「ＣＰ９」',''],
+    757: ['フクロウ 闇の正義の「ＣＰ９」',''],
+    758: ['フクロウ 歴代最強の「ＣＰ９」',''],
+    759: ['クマドリ 闇の正義の「ＣＰ９」',''],
+    760: ['クマドリ 歴代最強の「ＣＰ９」',''],
+    761: ['モンキー・D・ルフィ ハロウィンモンスター','', 'Halloween Luffy' ],
+    762: ['ウソップ うそつき狼','', 'Halloween Usopp' ],
+    763: ['フランキー フランケンシュタイン','', 'Halloween Franky' ],
+    764: ['ナミ かぼちゃランタン','', 'Halloween Nami' ],
+    765: ['トニートニー・チョッパー リトルヴァンパイア','', 'Halloween Chopper' ],
+    766: ['ロロノア・ゾロ ジャック・ザ・リッパ―','', 'Halloween Zoro' ],
+    767: ['ニコ・ロビン セクシーデビル','', 'Halloween Robin' ],
+    768: ['サンジ ゴーストナイト','', 'Halloween Sanji' ],
+    769: ['ブルック こわがりスケルトン','', 'Halloween Brook' ],
+    770: ['ダルメシアン 海軍本部中将','','Raid Dalmatian'],
+    771: ['モモンガ 海軍本部中将','','Raid Momonga'],
+    772: ['オニグモ 海軍本部中将','','Raid Onigumo'],
+    773: ['シュウ','','Raid Shu'],
+    774: ['ベリーグッド','','Very Good','Raid Berry Good'],
+    775: ['ストロベリー 海軍本部中将','','Raid Strawberry'],
+    776: ['ラッキー・ルウ','','Coliseum Lucky Roo'],
+    777: ['ラッキー・ルウ 赤髪海賊団','','Coliseum Lucky Roo'],
+    778: ['レベッカ 囚人剣闘士','','Coliseum Rebecca'],
+    779: ['レベッカ コロシアム専属剣闘士','','Coliseum Rebecca'],
+    780: ['ウルージ 破戒僧海賊団船長','','Supernova Urouge','Coliseum Urouge'],
+    781: ['怪僧ウルージ 破戒僧海賊団船長','','Supernova Urouge','Coliseum Urouge'],
+    782: ['たしぎ 正義の華','', 'Kimono Tashigi' ],
+    783: ['たしぎ 海軍本部少尉・正義の華','', 'Kimono Tashigi' ],
+    784: ['ゲンさん',''],
+    785: ['ゲンゾウ ココヤシ村の駐在',''],
+    786: ['Dr.ヒルルク','', 'Dr. Hiruruk', 'Dr Hiruruk'],
+    787: ['Dr.ヒルルク ヤブ医者','', 'Dr. Hiruruk, Quack Doctor', 'Dr Hiruruk, Quack Doctor' ],
+    788: ['くいな',''],
+    789: ['くいな シモツキ村の少女剣士',''],
+    790: ['たまねぎ＆ピーマン＆にんじん','', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
+    791: ['たまねぎ＆ピーマン＆にんじん ウソップ海賊団','', 'Usopp Pirates', 'Tamanegi, Piiman & Ninjin' ],
+    792: ['アイスバーグ','', 'Iceberg' ],
+    793: ['アイスバーグ Ｗ７市長＆ガレーラカンパニー社長','', 'Iceberg, Mayor of W7 and President of Galley-La Company' ],
+    794: ['モンキー・D・ルフィ 希望の星','','Raid NM Luffy', 'Raid Luffy'],
+    795: ['ナイトメア・ルフィ 希望の戦士','','Raid NM Luffy', 'Raid Luffy'],
+    796: ['ブリード',''],
+    797: ['ブリード ペトペトの実の能力者',''],
+    798: ['クンフージュゴン 海獣海賊団',''],
+    799: ['シーラパーン 海獣海賊団','', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
+    800: ['たこボクサー 海獣海賊団',''],
+    801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','mr 2' ],
+    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
+    803: ['ヒナ 海軍本部大佐','','Coliseum Hina'],
+    804: ['黒檻のヒナ 海軍本部大佐','','Coliseum Hina'],
+    805: ['スモーカー 海軍本部大佐','','Coliseum Smoker'],
+    806: ['白猟のスモーカー 海軍本部大佐','','Coliseum Smoker'],
+    807: ['純白の天使ナミ ウエディング','','Bridal Nami'],
+    808: ['純白の女神ナミ ウエディング','','Bridal Nami'],
+    809: ['ローラ スリラーバークの花嫁',''],
+    810: ['求愛のローラ スリラーバークの花嫁',''],
+    811: ['リスキー兄弟',''],
+    812: ['ケルベロス',''],
+    813: ['タララン','', 'Spider Monkey' ],
+    814: ['敷きグマ',''],
+    815: ['ゲッコー・モリア スリラーバークの怪人','', 'Gekko Moriah, Thriller Bark\'s Mysterious Four'],
+    816: ['ゲッコー・モリア スリラーバークの支配者','', 'Gekko Moriah, Ruler of Thriller Bark'],
+    817: ['ソルジャーゾンビ　力自慢の影',''],
+    818: ['ソルジャーゾンビ　素早さの影',''],
+    819: ['ソルジャーゾンビ　悪巧みの影',''],
+    820: ['ソルジャーゾンビ　憎しみの影',''],
+    821: ['ソルジャーゾンビ　自尊心の影',''],
+    822: ['トリッキー・ワイルドゾンビ',''],
+    823: ['インテリ・ワイルドゾンビ',''],
+    824: ['ハートフル・ワイルドゾンビ',''],
+    825: ['ジェネラルゾンビ　怪力の影',''],
+    826: ['ジェネラルゾンビ　奇技の影',''],
+    827: ['ジェネラルゾンビ　疾速の影',''],
+    828: ['？？？','','Kid Law','Young Law'],
+    829: ['？？？','','Kid Law','Young Law'],
+    830: ['バジル・ホーキンス ホーキンス海賊団船長','','Supernova Hawkins','Coliseum Hawkins', 'Coliseum Basil Hawkins'],
+    831: ['魔術師バジル・ホーキンス ホーキンス海賊団船長','','Supernova Hawkins','Coliseum Hawkins', 'Coliseum Basil Hawkins'],
+    832: ['ワイパー シャンディアの戦士','', 'Wiper, Warrior of Shandia','Coliseum Wyper' ],
+    833: ['戦鬼ワイパー シャンディアの戦士','', 'Berserker Wiper, Warrior of Shandia','Coliseum Wyper' ],
+    834: ['Mr.7 & ﾐｽ･ﾌｧｰｻﾞｰｽﾞﾃﾞｰ','', 'Mr 7 and Miss Fathers Day', 'Coliseum Mr 7', 'Coliseum Miss Fathers Day'],
+    835: ['暴君バーソロミュー・くま','','Raid Kuma'],
+    836: ['暴君バーソロミュー・くま 政府の人間兵器','','Raid Kuma'],
+    837: ['シーザー・クラウン',''],
+    838: ['Ｍ（マスター）・シーザー',''],
+    839: ['ヴェルゴ',''],
+    840: ['ヴェルゴ ドンキホーテ海賊団',''],
+    841: ['モネ',''],
+    842: ['モネ ドンキホーテ海賊団',''],
+    843: ['ベビー５',''],
+    844: ['ベビー５ ドンキホーテ海賊団',''],
+    845: ['バッファロー',''],
+    846: ['バッファロー ドンキホーテ海賊団',''],
+    847: ['トム トムズ　ワーカーズ',''],
+    848: ['伝説の船大工トム トムズ　ワーカーズ',''],
+    849: ['カティ・フラム トムズ　ワーカーズ','', 'Franky, Tom\'s Workers','Young Franky' ],
+    850: ['アイスバーグ トムズ　ワーカーズ','', 'Iceburg, Tom\'s Workers','Young Iceberg' ],
+    851: ['ブリキのワポル',''],
+    852: ['スリムアップワポル',''],
+    853: ['ロブソン',''],
+    854: ['チョッパーの雪遊び','', 'Winter Chopper'],
+    855: ['トラファルガー・ロー 聖夜の紳士','','Supernova Law','Christmas Law','CLaw'],
+    856: ['トラファルガー・ロー 聖夜の貴公子','','Supernova Law','Christmas Law','CLaw'],
+    857: ['ジュエリー・ボニー 食いしん坊のわがままサンタ','','Supernova Bonney'],
+    858: ['ジュエリー・ボニー 食いしん坊の欲張りサンタ','','Supernova Bonney'],
+    859: ['コビー 海軍本部曹長','','Coliseum Coby'],
+    860: ['戦火の勇士コビー 海軍本部曹長','','Coliseum Coby'],
+    861: ['レディー・アルビダ うるわしき美女','','Coliseum Alvida'],
+    862: ['レディー・アルビダ 絶世の美女','','Coliseum Alvida'],
+    863: ['銀世界のナミ','', 'Winter Nami'],
+    864: ['ボア・ハンコック 九蛇海賊団船長','','Raid Boa'],
+    865: ['女帝ボア・ハンコック 九蛇海賊団船長','','Raid Boa'],
+    866: ['ニコ・ロビン 百花繚乱 ウイング“華”','', 'Kimono Robin' ],
+    867: ['ウソップ タバスコ星“撃”','', 'Kimono Usopp' ],
+    868: ['トニートニー・チョッパー 重量ゴング“獣”','', 'Kimono Chopper' ],
+    869: ['ドンキホーテ・ドフラミンゴ ドンキホーテ海賊団','', 'Doffy' ],
+    870: ['天夜叉ドフラミンゴ','', 'Doffy' ],
+    871: ['シュガー',''],
+    872: ['シュガー ドンキホーテ海賊団',''],
+    873: ['セニョール・ピンク','', 'Senor Pink', 'Senior Pink' ],
+    874: ['セニョール・ピンク ドンキホーテ海賊団','', 'Senor Pink', 'Senior Pink' ],
+    875: ['トレーボル',''],
+    876: ['トレーボル ドンキホーテ海賊団',''],
+    877: ['ジョーラ','', 'Giolla', 'Jora' ],
+    878: ['ジョーラ ドンキホーテ海賊団','', 'Giolla, Donquixote Pirates', 'Jora' ],
+    879: ['ラオＧ',''],
+    880: ['ラオＧ ドンキホーテ海賊団',''],
+    881: ['スクラッチメン・アプー オンエア海賊団船長','','Supernova Apoo','Coliseum Apoo'],
+    882: ['海鳴りスクラッチメン・アプー オンエア海賊団船長','','Supernova Apoo','Coliseum Apoo'],
+    883: ['ドリー 巨兵海賊団','','Coliseum Dorry'],
+    884: ['青鬼のドリー','','Coliseum Dorry'],
+    885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
+    886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
+    887: ['バギー 陽気なかぶき者','', 'Kimono Buggy', 'Baggy'],
+    888: ['ホロホロゴースト',''],
+    889: ['ペローナ スリラーバークの怪人',''],
+    890: ['ペローナ 巨大なゴーストプリンセス',''],
+    891: ['ドクトル・ホグバック スリラーバークの怪人',''],
+    892: ['墓場のアブサロム スリラーバークの怪人',''],
+    893: ['オーズ 特別ゾンビ',''],
+    894: ['ゲッコー・モリア 影の集合地（シャドーズ・アスガルド）','', 'Gekko Moriah, Shadow\'s Asgard'],
+    895: ['ブルック 紳士なガイコツ',''],
+    896: ['ブルック 麦わらの一味',''],
+    897: ['サー・クロコダイル 砂の武将','', 'Kimono Crocodile' ],
+    898: ['Mr.3 姑息な楽士','', 'Kimono Mr. 3', 'Kimono Galdino', 'Kimono Mr 3' ],
+    899: ['Mr.2・ボン・クレー あやふやな侍','', 'Kimono Mr. 2', 'Kimono Bonclay', 'Kimono Bon Clay', 'Kimono Mr 2' ],
+    900: ['フレッシュ・フランキー 健康第一','','Coliseum Franky'],
+    901: ['鉄人（サイボーグ）フランキー','','Coliseum Franky'],
+    902: ['ブロギー 巨兵海賊団','','Coliseum Broggy'],
+    903: ['赤鬼のブロギー','','Coliseum Broggy'],
+    904: ['ヨコヅナ','','Coliseum Yokozuna'],
+    905: ['ロロノア・ゾロ クライガナ島をさすらう剣士','','3D2Y Zoro','Timeskip Zoro'],
+    906: ['ロロノア・ゾロ 世界最強剣士の門弟','','3D2Y Zoro','Timeskip Zoro'],
+    907: ['ニコ・ロビン テキーラウルフの収監者','','3D2Y Robin','Timeskip Robin'],
+    908: ['ニコ・ロビン 革命の灯火（ともしび）','','3D2Y Robin','Timeskip Robin'],
+    909: ['トニートニー・チョッパー トリノ王国の平和の架け橋','','3D2Y Chopper','Timeskip Chopper'],
+    910: ['チョッパーマスク 世界の平和を守るヒーロー','','3D2Y Chopper','Timeskip Chopper'],
+    911: ['サンジ カマバッカ王国の逃走者','','3D2Y Sanji','Timeskip Sanji'],
+    912: ['サンジ 男を懸けた愛の料理人','','3D2Y Sanji','Timeskip Sanji'],
+    913: ['ブルック ハラヘッターニャの悪魔王','','3D2Y Brook','Timeskip Brook'],
+    914: ['ブルック 骨（ボーン） to be wild!!!','','3D2Y Brook','Timeskip Brook'],
+    915: ['ニコ・ロビン オハラの花嫁','','Wedding Nico Robin'],
+    916: ['麗らかな才女 ロビン ウエディング','','Bride Nico Robin'],
+    917: ['マーガレット',''],
+    918: ['マーガレット 護国の戦士',''],
+    919: ['アフェランドラ',''],
+    920: ['スイトピー','', 'Sweet Pea'],
+    921: ['ボア・ハンコック 女ヶ島の花嫁','','Bridal Boa Hancock', " Wedding Hancock"],
+    922: ['愛に生きる女帝ハンコック ウエディング','','Bridal Boa Hancock'],
+    923: ['南の海のキャプテン・キッド','','Coliseum Kid', 'Coliseum Kidd'],
+    924: ['キャプテン・キッド キッド海賊団船長','','Coliseum Kid', 'Coliseum Kidd'],
+    925: ['獄卒長サディちゃん','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
+    926: ['獄卒長サディちゃん 獄卒獣の指揮官','','Coliseum Sadie', 'Secuurity Chief Sadie-chan'],
+    927: ['ドーベルマン 海軍本部中将','','Coliseum Doberman'],
+    928: ['ハンニャバル','','Hannibal'],
+    929: ['ハンニャバル','','Hannibal'],
+    930: ['サルデス',''],
+    931: ['ブルゴリ ','','Blue Gorilla'],
+    932: ['ピーカ','','Raid Pica'],
+    933: ['ピーカ ドンキホーテ海賊団','','Raid Pica'],
+    934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
+    935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
+    936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者','','Timeskip Luffy','3D2Y Luffy'],
+    937: ['モンキー・Ｄ・ルフィ 仲間との誓い『３Ｄ２Ｙ』','','Timeskip Luffy','3D2Y Luffy'],
+    938: ['ナミ 天候の科学の探求者','','Timeskip Nami','3D2Y Nami'],
+    939: ['ナミ 空島ウェザリアの泥棒ネコ','','Timeskip Nami','3D2Y Nami'],
+    940: ['ウソップ ボーイン列島の大食漢','','Timeskip Usopp','3D2Y Usopp'],
+    941: ['ウソップ おいはぎの森の果敢な戦士','','Timeskip Usopp','3D2Y Usopp'],
+    942: ['フランキー メカアニマルと戦う改造人間','','Timeskip Franky','3D2Y Franky'],
+    943: ['鉄人（サイボーグ）フランキー バルジモアの霊獣','','Timeskip Franky','3D2Y Franky'],
+    944: ['？？？','','Wedding Perona'],
+    945: ['？？？','','Bride Perona'],
+    946: ['ラクヨウ 白ひげ海賊団７番隊隊長',''],
+    947: ['フォッサ 白ひげ海賊団１５番隊隊長',''],
+    948: ['クリエル 白ひげ海賊団１０番隊隊長',''],
+    949: ['サッチ 白ひげ海賊団４番隊隊長',''],
+    950: ['火拳のエース','','Coliseum Ace'],
+    951: ['火拳のエース 白ひげ海賊団２番隊隊長','', 'Coliseum Ace'],
+    952: ['ベン・ベックマン','', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman'],
+    953: ['ベン・ベックマン 赤髪海賊団','', 'Coliseum Ben Beckman', 'Coliseum Benn Beckman'],
+    954: ['ギャロ',''],
+    955: ['マクロ','','Makuro'],
+    956: ['タンスイ',''],
+    957: ['早業のガンマン 青のボディガード',''],
+    958: ['計略のガンマン 黒のボディガード',''],
+    959: ['技巧のガンマン 緑のボディガード',''],
+    960: ['速攻のガンマン 青のボディガード',''],
+    961: ['豪腕のガンマン 赤のボディガード',''],
+    962: ['強心のガンマン 黄のボディガード',''],
+    963: ['チャルロス聖',''],
+    964: ['ロズワード聖',''],
+    965: ['シャルリア宮',''],
+    966: ['ユースタス・キッド 超新星（スーパールーキー）','', 'Story Kidd'],
+    967: ['トラファルガー・ロー 超新星（スーパールーキー）',''],
+    968: ['パシフィスタ　ＰＸ－1',''],
+    969: ['パシフィスタ　ＰＸ－2',''],
+    970: ['パシフィスタ　ＰＸ－３',''],
+    971: ['パシフィスタ　ＰＸ－４',''],
+    972: ['パシフィスタ　ＰＸ－５',''],
+    973: ['戦桃丸','','Sentoumaru'],
+    974: ['戦桃丸 海軍本部科学部隊隊長','','Sentoumaru'],
+    975: ['スモーカー あらくれの一匹オオカミ','','Kid Smoker'],
+    976: ['スモーカー 孤高の一匹オオカミ','','Kid Smoker'],
+    977: ['黄猿','','Raid Borsalino', 'Raid Kizaru'],
+    978: ['黄猿　光人間','','Raid Borsalino', 'Raid Kizaru'],
+    979: ['イゾウ 白ひげ海賊団１６番隊隊長',''],
+    980: ['ブラメンコ 白ひげ海賊団６番隊隊長',''],
+    981: ['ナミュール 白ひげ海賊団８番隊隊長',''],
+    982: ['ビスタ 白ひげ海賊団５番隊隊長','','Coliseum Vista'],
+    983: ['花剣のビスタ 白ひげ海賊団５番隊隊長','','Coliseum Vista'],
+    984: ['パウリー ガレーラカンパニー１番ドック職長','','Coliseum Paulie'],
+    985: ['デマロ・ブラック＆ショコラ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    986: ['ココア＆のらギツネ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    987: ['マンジャロウ＆ドリップ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    988: ['マウンブルテン＆トルコ ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    989: ['ニセ麦わらの一味','','Raid', 'Imposter', 'Fake'],
+    990: ['マッハ・バイス','','Mach Vise'],
+    991: ['マッハ・バイス ドンキホーテ海賊団', '', 'Mach Vise'],
+    992: ['グラディウス',''],
+    993: ['グラディウス ドンキホーテ海賊団',''],
+    994: ['ヴァイオレット','', 'Viola'],
+    995: ['ヴァイオレット ドンキホーテ海賊団','', 'Viola'],
+    996: ['デリンジャー',''],
+    997: ['デリンジャー ドンキホーテ海賊団',''],
+    998: ['ディアマンテ',''],
+    999: ['ディアマンテ ドンキホーテ海賊団',''],
+    1000: ['コラソン ドンキホーテ海賊団','','Rocinante','Rosinante'],
+    1001: ['ドンキホーテ・ロシナンテ','','Rocinante','Corazon'],
+    1002: ['ベポ ハートの海賊団',''],
+    1003: ['武闘家のベポ ハートの海賊団',''],
+    1004: ['シャチ＆ペンギン ハートの海賊団',''],
+    1005: ['ジャンバール',''],
+    1006: ['ジャンバール ハートの海賊団',''],
+    1007: ['モネ　寒桜','','Sakura Monet'],
+    1008: ['モネ　大寒桜','','Sakura Monet'],
+    1009: ['キズナBOOOOSTルフィ','', 'Afro Luffy', 'Afroluffy' ],
+    1010: ['バトラー伯爵',''],
+    1011: ['バトラー伯爵（王なる力）',''],
+    1012: ['ヘビー総裁',''],
+    1013: ['ホットドッグ将軍',''],
+    1014: ['トニートニー・チョッパー 動物王',''],
+    1015: ['カポネ・ベッジ ファイアタンク海賊団船長','','Coliseum Capone Bege'],
+    1016: ['カポネ・“ギャング”ベッジ ファイアタンク海賊団船長','','Coliseum Capone Bege'],
+    1017: ['茶ひげ','','Coliseum Brownbeard'],
+    1018: ['茶ひげ ワニのケンタウロス','','Coliseum Brownbeard'],
+    1019: ['ピープリー・ルル ガレーラカンパニー１番ドック職長','','Coliseum Lulu'],
+    1020: ['シュガー　実桜','','Sakura Sugar'],
+    1021: ['シュガー　桜桃','','Sakura Sugar'],
+    1022: ['モンキー・D・ルフィ 海賊王への軌跡','','Anniversary Luffy'],
+    1023: ['ポートガス・D・エース 海賊王に馳せた夢',''],
+    1024: ['首領・チンジャオ','Don Chinjao'],
+    1025: ['首領・チンジャオ 花ノ国のギャング','Don Chinjao'],
+    1026: ['ブルーギリー',''],
+    1027: ['ブルーギリー 脚功道格闘家（ジャオクンドー）',''],
+    1028: ['ﾎﾞﾋﾞｰ･ﾌｧﾝｸ＆ｹﾘｰ･ﾌｧﾝｸ',''],
+    1029: ['ファンク兄弟 モガロ王国の殺し屋',''],
+    1030: ['ハイルディン',''],
+    1031: ['ハイルディン 海賊傭兵',''],
+    1032: ['アブドーラ＆ジェット','','Abdullah and Jeet'],
+    1033: ['アブドーラ＆ジェット 元賞金稼ぎ','','Abdullah and Jeet, Former Bounty Hunters'],
+    1034: ['バルトロメオ',''],
+    1035: ['人食いのバルトロメオ',''],
+    1036: ['エンポリオ・イワンコフ 秘密の花園の女王',''],
+    1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
+    1038: ['イナズマ 秘密の花園の乙女',''],
+    1039: ['イナズマ 変革を画策する乙女',''],
+    1040: [ 'ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum Jozu' ],
+    1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum Jozu' ],
+    1042: [ 'キラー キッド海賊団', '','Coliseum Killer', 'Supernova Killer' ],
+    1043: [ '“殺戮武人”キラー キッド海賊団', '','Coliseum Killer', 'Supernova Killer' ],
+    1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
+    1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
+    1046: [ 'サボ 竜の爪', '','Raid Sabo' ],
+    1047: [ 'サボ 革命軍参謀総長', '','Raid Sabo' ],
     1048: [ 'ニコ・オルビア', '' ],
     1049: [ 'ニコ・オルビア オハラの考古学者', '' ],
     1050: [ 'ハグワール・D・サウロ', '' ],
@@ -1084,14 +1084,14 @@ window.aliases = {
     1083: [ '首領・サイ 花ノ国のギャング', '' ],
     1084: [ '藤虎', '' ],
     1085: [ 'イッショウ', '', 'Fujitora' ],
-    1086: [ 'ムッシュール', '', 'Coliseum Musshuru' ],
-    1087: [ 'ムッシュール 毒胞子人間', '', 'Coliseum Musshuru' ],
-    1088: [ 'サガ', '', 'Coliseum Saga' ],
-    1089: [ 'サガ 呪われた聖剣', '', 'Coliseum Saga' ],
+    1086: [ 'ムッシュール', '','Coliseum Musshuru' ],
+    1087: [ 'ムッシュール 毒胞子人間', '','Coliseum Musshuru' ],
+    1088: [ 'サガ', '','Coliseum Saga' ],
+    1089: [ 'サガ 呪われた聖剣', '','Coliseum Saga' ],
     1090: [ 'X・ドレーク ドレーク海賊団', '', 'Coliseum Drake', 'Coliseum X Drake', 'Supernova Drake', 'Supernova X Drake' ],
     1091: [ '赤旗 X・ドレーク ドレーク海賊団', 'Coliseum Drake', 'Coliseum X Drake', 'Supernova Drake', 'Supernova X Drake' ],
-    1092: [ 'レベッカ パラソルのリズム', '', 'Kid Rebecca' ],
-    1093: [ 'レベッカ 虹のメロディ', '', 'Kid Rebecca' ],
+    1092: [ 'レベッカ パラソルのリズム', '','Kid Rebecca' ],
+    1093: [ 'レベッカ 虹のメロディ', '','Kid Rebecca' ],
     1094: [ 'Dr.インディゴ', '' ],
     1095: [ 'Dr.インディゴ 金獅子海賊団', '' ],
     1096: [ 'スカーレット隊長', '' ],
@@ -1099,14 +1099,14 @@ window.aliases = {
     1098: [ '雷鳥ビリー', '' ],
     1099: [ 'コビー 雨の中の曹長', '' ],
     1100: [ 'コビー 露にきらめく曹長', '' ],
-    1101: [ '黒腕のゼファー', '', 'Coliseum Zephyr' ],
-    1102: [ '黒腕のゼファー 元海軍本部大将', '', 'Coliseum Zephyr' ],
-    1103: [ 'アイン ＮＥＯ海軍', '', 'Coliseum Ain' ],
-    1104: [ 'アイン ゼファー最後の教え子', '', 'Coliseum Ain' ],
-    1105: [ 'ビンズ ＮＥＯ海軍', '', 'Coliseum Binz' ],
-    1106: [ 'ビンズ ゼファー最後の教え子', '', 'Coliseum Binz' ],
-    1107: [ '金獅子のシキ', '', 'Raid Shiki' ],
-    1108: [ '金獅子のシキ 金獅子海賊団', '', 'Raid Shiki' ],
+    1101: [ '黒腕のゼファー', '','Coliseum Zephyr' ],
+    1102: [ '黒腕のゼファー 元海軍本部大将', '','Coliseum Zephyr' ],
+    1103: [ 'アイン ＮＥＯ海軍', '','Coliseum Ain' ],
+    1104: [ 'アイン ゼファー最後の教え子', '','Coliseum Ain' ],
+    1105: [ 'ビンズ ＮＥＯ海軍', '','Coliseum Binz' ],
+    1106: [ 'ビンズ ゼファー最後の教え子', '','Coliseum Binz' ],
+    1107: [ '金獅子のシキ', '','Raid Shiki' ],
+    1108: [ '金獅子のシキ 金獅子海賊団', '','Raid Shiki' ],
     1109: [ 'ナミ 若返った航海士', '' ],
     1110: [ 'ナミ 酒場のお茶目なアイドル', '' ],
     1111: [ 'ニコ・ロビン 若返った考古学者', '' ],
@@ -1120,715 +1120,715 @@ window.aliases = {
     1119: [ 'ナミ 信念に生きる麦わらの一味', 'New Strong World Nami', 'SW Nami' ],
     1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy' ],
     1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy' ],
-    1122: [ 'キャベンディッシュ', '', 'Hakuba', 'Cabbage' ],
-    1123: [ '白馬のキャベンディッシュ', '', 'Hakuba', 'Cabbage' ],
-    1124: ['スレイマン', '' ],
-    1125: ['首はねスレイマン', '' ],
-    1126: ['オオロンブス', '' ],
-    1127: ['オオロンブス 殺戮支配者', '' ],
-    1128: ['ダガマ', '' ],
-    1129: ['ダガマ プロデンス王国軍師', '' ],
-    1130: ['エリザベローII世', '' ],
-    1131: ['エリザベローII世 プロデンス王国国王', '' ],
-    1132: ['イデオ', '' ],
-    1133: ['イデオ 破壊砲', '' ],
-    1134: ['たしぎ がむしゃらな剣道少女', '', 'Young Tashigi', 'Kid Tashigi' ],
-    1135: ['たしぎ 夢見る剣道少女', '', 'Young Tashigi', 'Kid Tashigi' ],
-    1136: ['フクロウ 世界政府直下暗躍諜報機関', '' ],
-    1137: ['ジャブラ 世界政府直下暗躍諜報機関', '', 'Jabura' ],
-    1138: ['ブルーノ 世界政府直下暗躍諜報機関', '' ],
-    1139: ['クマドリ 世界政府直下暗躍諜報機関', '' ],
-    1140: ['ゲッコー・モリア 魔の三角地帯の主', '', 'Coliseum Gekko Moriah' ],
-    1141: ['ゲッコー・モリア 魔の三角地帯の支配者', '', 'Coliseum Gekko Moriah' ],
-    1142: ['フォクシー ドーナツレースの邪魔者', '', 'Coliseum Foxy', 'Dying Foxy' ],
-    1143: ['フォクシー コンバットの卑怯者', '', 'Coliseum Foxy', 'Nurse Foxy' ],
-    1144: ['ポルチェ お花チアリーダーズ', '', 'Coliseum Porche' ],
-    1145: ['ポルチェ キューティバトンの使い手', '', 'Coliseum Porche' ],
-    1146: ['制圧の制服看守', '' ],
-    1147: ['火急の制服看守', '' ],
-    1148: ['包囲の制服看守', '' ],
-    1149: ['理論派獄卒', '' ],
-    1150: ['行動派獄卒', '' ],
-    1151: ['ミノタウロス', '' ],
-    1152: ['ミノゼブラ', '' ],
-    1153: ['スフィンクス', '' ],
-    1154: ['サルデス 牢番長', '' ],
-    1155: ['軍隊ウルフ', '' ],
-    1156: ['ハンニャバル副署長', '' ],
-    1157: ['ハンニャバル副署長 海底監獄インペルダウン', '' ],
-    1158: ['マゼラン署長', '' ],
-    1159: ['マゼラン署長 海底監獄インペルダウン', '' ],
-    1160: ['コアラ ビーチの天使', '', 'Summertime Koala', 'Swimsuit Koala' ],
-    1161: ['コアラ 楽園の女神', '', 'Summertime Koala', 'Swimsuit Koala' ],
-    1162: ['ギルド・テゾーロ', '', 'Raid Tesoro' ],
-    1163: ['ギルド・テゾーロ 黄金船のカジノ王', '', 'Raid Tesoro' ],
-    1164: ['カリーナ', '', 'Raid Carina' ],
-    1165: ['カリーナ 黄金船の歌姫', '', 'Raid Carina' ],
-    1166: ['バカラ', '' ],
-    1167: ['バカラ 黄金船のコンシェルジュ', '' ],
-    1168: ['ダイス', '' ],
-    1169: ['ダイス 黄金船のディーラー', '' ],
-    1170: ['タナカさん', '' ],
-    1171: ['タナカさん 黄金船の警備担当', '' ],
-    1172: ['ブルック 夢を追い求める冒険者', '', 'New Strong World Brook', 'SW Brook' ],
-    1173: ['ブルック 信念に生きる麦わらの一味', '', 'New Strong World Brook', 'SW Brook' ],
-    1174: ['ロロノア・ゾロ 夢を追い求める冒険者', '', 'New Strong World Zoro', 'SW Zoro' ],
-    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味', '', 'New Strong World Zoro', 'SW Zoro' ],
-    1176: ['チョッパー 夢を追い求める冒険者', '', 'New Strong World Chopper', 'SW Chopper' ],
-    1177: ['チョッパー 信念に生きる麦わらの一味', '', 'New Strong World Chopper', 'SW Chopper' ],
-    1178: ['オーズ', '', 'Oz' ],
-    1179: ['魔人オーズ', '', 'Oz' ],
-    1180: ['虹ヨロイガニ', '' ],
-    1181: ['ブレンハイム', '' ],
-    1182: ['カトラスのブレンハイム', '' ],
-    1183: ['キングデュー', '', 'Heman' ],
-    1184: ['双拳ガントレットのキングデュー', '', 'Heman' ],
-    1185: ['ハルタ', '' ],
-    1186: ['疾風の小剣士ハルタ', '' ],
-    1187: ['アトモス', '' ],
-    1188: ['水牛のアトモス', '' ],
-    1189: ['スピード・ジル', '', 'Speed Jiru', 'Genocide Jil' ],
-    1190: ['シールドランスのスピード・ジル', '', 'Speed Jiru', 'Genocide Jil' ],
-    1191: ['青キジ 海軍本部最高戦力', '', 'Aokiji', 'Kuzan' ],
-    1192: ['クザン', '', 'Aokiji' ],
-    1193: ['ボア・ハンコック 渚にたたずむ女帝', '', 'Summertime Hancock', 'Swimsuit Hancock' ],
-    1194: ['ボア・ハンコック 恋に溺れた乙女', '', 'Summertime Hancock', 'Swimsuit Hancock' ],
-    1195: ['ガン・フォール 先代“神”', '', 'Coliseum Gan Fall', 'Coliseum Ganfor', 'Ganfall' ],
-    1196: ['ガン・フォール スカイピアの神', '', 'Coliseum Gan Fall', 'Coliseum Ganfor', 'Ganfall' ],
-    1197: ['スカイブリーダー・オーム', '', 'Coliseum Ohm' ],
-    1198: ['ジュエリー・ボニー 弾けるサファイア', '', 'Summertime Jewelry Bonney', 'Swimsuit Jewelry Bonney' ],
-    1199: ['ジュエリー・ボニー パールホワイトの煌き', '', 'Summertime Jewelry Bonney', 'Swimsuit Jewelry Bonney' ],
-    1200: ['ヴァイオレット 挑発のバカンス', '', 'Summertime Viola', 'Swimsuit Viola' ],
-    1201: ['ヴァイオレット 紅潮のバカンス', '', 'Summertime Viola', 'Swimsuit Viola' ],
-    1202: ['ヨーキ', '' ],
-    1203: ['キャラコのヨーキ', '' ],
-    1204: ['ブルック ルンバー海賊団', '' ],
-    1205: ['“音楽家兼剣士”ブルック ルンバー海賊団', '' ],
-    1206: ['ラブーン ルンバー海賊団', '' ],
-    1207: ['ニコ・ロビン 夢を追い求める冒険者', '', 'New Strong World Robin', 'SW Robin' ],
-    1208: ['ニコ・ロビン 信念に生きる麦わらの一味', '', 'New Strong World Robin', 'SW Robin' ],
-    1209: ['ウソップ 夢を追い求める冒険者', '', 'New Strong World Usopp', 'SW Usopp' ],
-    1210: ['ウソップ 信念に生きる麦わらの一味', '', 'New Strong World Usopp', 'SW Usopp' ],
-    1211: ['フランキー 夢を追い求める冒険者', '', 'New Strong World Franky', 'SW Franky' ],
-    1212: ['フランキー 信念に生きる麦わらの一味', '', 'New Strong World Franky', 'SW Franky' ],
-    1213: ['ベビー５ ドルフィンフロート', '', 'Summertime Baby 5', 'Swimsuit Baby 5' ],
-    1214: ['ベビー５ ドルフィンライダー', '', 'Summertime Baby 5', 'Swimsuit Baby 5' ],
-    1215: ['ガイラム ワールド海賊団', '', '' ],
-    1216: ['セバスチャン ワールド海賊団', '', '' ],
-    1217: ['ナイチン ワールド海賊団', '', '' ],
-    1218: ['ボア・ハンコック アマゾン・リリー皇帝', '', '' ],
-    1219: ['バーンディ・ワールド', '', 'Coliseum World', 'Coliseum Byrnndi World' ],
-    1220: ['バーンディ・ワールド ワールド海賊団船長', '', 'Coliseum World', 'Coliseum Byrnndi World' ],
-    1221: ['リトルオーズJr. 白ひげ海賊団傘下', '', 'Coliseum Oars Jr.' ],
-    1222: ['猛攻のリトルオーズJr. 白ひげ海賊団傘下', '', 'Coliseum Oars Jr.' ],
-    1223: ['バスティーユ', '', '' ],
-    1224: ['ヤマカジ', '', '' ],
-    1225: ['ヒナ 黒檻部隊', '', '' ],
-    1226: ['スモーカー 海軍本部准将', '', '' ],
-    1227: ['ジュラキュール・ミホーク 鷹の目', '', '' ],
-    1228: ['黄猿 海軍本部大将', '', '' ],
-    1229: ['戦桃丸 海軍本部将校', '', 'Sentoumaru' ],
-    1230: ['鉞の戦桃丸 海軍本部将校', '', 'Sentoumaru' ],
-    1231: ['スモーカー 海軍ＧＬ第５支部', '', '' ],
-    1232: ['スモーカー 海軍ＧＬ第５支部「Ｇ‐５」中将', '', '' ],
-    1233: ['たしぎ 海軍ＧＬ第５支部', '', 'Thiccshigi' ],
-    1234: ['たしぎ 海軍ＧＬ第５支部「Ｇ‐５」大佐', '', 'Thiccshigi' ],
-    1235: ['メイナード 海軍本部中将', '', '' ],
-    1236: ['追撃のメイナード 海軍本部中将', '', '' ],
-    1237: ['バスティーユ 海軍本部中将', '', '' ],
-    1238: ['鮫切りバスティーユ 海軍本部中将', '', '' ],
-    1239: ['黄猿 海軍本部最高戦力', '', 'Kizaru' ],
-    1240: ['ボルサリーノ', '', 'Kizaru' ],
-    1241: ['コアラ 魚人空手師範代', '', '' ],
-    1242: ['コアラ 革命軍・魚人空手師範代', '', '' ],
-    1243: ['ハック 魚人空手師範', '', '' ],
-    1244: ['ハック 革命軍・魚人空手師範', '', '' ],
-    1245: ['モンキー・D・ルフィ マリンフォードに舞う“麦わら”', '', '' ],
-    1246: ['ポートガス・D・エース 処刑台の“火拳”', '', '' ],
-    1247: ['ポートガス・D・エース マリンフォードに舞う“火拳”', '', '' ],
-    1248: ['マルコ 秋風にはためく襟元', '', 'Kimono Marco' ],
-    1249: ['マルコ ほろ酔いの着崩れ', '', 'Kimono Marco' ],
-    1250: ['マルコ 白ひげ海賊団', '', 'Coliseum Marco' ],
-    1251: ['マルコ　復活の炎 白ひげ海賊団', '', 'Coliseum Marco' ],
-    1252: ['遊騎士ドーマ 白ひげ海賊団傘下', '', 'Coliseum Doma' ],
-    1253: ['スカイライダー・シュラ', '', 'Coliseum Shura' ],
-    1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下', '', '' ],
-    1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下', '', '' ],
-    1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下', '', '' ],
-    1257: ['エドワード・ニューゲート 海賊王のライバル', '', 'Edward Newgate', 'Young Whitebeard', 'YWB' ],
-    1258: ['エドワード・ニューゲート 大海賊“白ひげ”', '', 'Edward Newgate', 'Young Whitebeard', 'YWB' ],
-    1259: ['ドンキホーテ・ドフラミンゴ “北の海”の海賊', '', 'Young Doffy', 'Donquixote Doflamingo' ],
-    1260: ['ドンキホーテ・ドフラミンゴ “北の海”の闇', '', 'Young Doffy', 'Donquixote Doflamingo' ],
-    1261: ['セニョール・ピンク “北の海”の海賊', '', 'Senor Pink', 'Young Senior Pink' ],
-    1262: ['セニョール・ピンク “北の海”の闇', '', 'Senor Pink', 'Young Senior Pink' ],
-    1263: ['ヴェルゴ “北の海”の海賊', '', 'Young Vergo' ],
-    1264: ['ヴェルゴ “北の海”の闇', '', 'Young Vergo' ],
-    1265: ['エース 黄昏の道草', '', 'Kimono Ace' ],
-    1266: ['エース 月下の艶肌', '', 'Kimono Ace' ],
-    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長', '', 'BB' ],
-    1268: ['黒ひげ 黒ひげ海賊団船長', '', 'BB', 'Teach' ],
-    1269: ['ラフィット', '', 'Lafitte' ],
-    1270: ['“鬼保安官”ラフィット', '', 'Lafitte' ],
-    1271: ['ヴァン・オーガー', '', 'Vaper', 'Van Ogre' ],
-    1272: ['“音越”ヴァン・オーガー', '', 'Vaper', 'Van Ogre' ],
-    1273: ['ジーザス・バージェス', '', '' ],
-    1274: ['“チャンピオン”ジーザス・バージェス', '', '' ],
-    1275: ['シリュウ', '', 'Shiliew' ],
-    1276: ['雨のシリュウ', '', 'Shiliew' ],
-    1277: ['ドクＱ', '', '' ],
-    1278: ['“死神”ドクＱ', '', '' ],
-    1279: ['ジョン・ジャイアント', '', '' ],
-    1280: ['青キジ 海軍本部大将', '', 'Kuzan' ],
-    1281: ['ガープ 海軍本部中将', '', '' ],
-    1282: ['センゴク 海軍本部元帥', '', '' ],
-    1283: ['赤犬 海軍本部大将', '', 'Sakazuki' ],
-    1284: ['モンキー・D・ルフィ 野生の海賊', '', 'Wild Luffy' ],
-    1285: ['モンキー・D・ルフィ 大地の開拓者', '', 'Wild Luffy' ],
-    1286: ['ベビー５ スパイダーマイルズの少女', '', 'Kid Baby 5' ],
-    1287: ['ベビー５ ドンキホーテファミリーの一員', '', 'Kid Baby 5' ],
-    1288: ['トラファルガー・ロー スパイダーマイルズの少年', '', 'Kid Trafalgar Law', 'Kid Law' ],
-    1289: ['トラファルガー・ロー ドンキホーテファミリーの一員', '', 'Kid Trafalgar Law', 'Kid Law' ],
-    1290: ['バッファロー ドンキホーテファミリーの一員', '', 'Kid Buffalo' ],
-    1291: ['ラオＧ 地翁拳の使い手', '', 'Coliseum Lao G' ],
-    1292: ['ラオＧ ディアマンテ軍幹部', '', 'Coliseum Lao G' ],
-    1293: ['ボア・サンダーソニア 九蛇の戦士', '', 'Coliseum Sandersonia', 'Coliseum Boa Sandersonia' ],
-    1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女', '', 'Coliseum Sandersonia', 'Coliseum Boa Sandersonia' ],
-    1295: ['カリファ　グラマラスミイラ', '', 'Halloween Kalifa' ],
-    1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード', '', 'Halloween Kalifa' ],
-    1297: ['赤犬', '', 'Raid Sakazuki', 'Raid Akainu' ],
-    1298: ['赤犬 マグマ人間', '', 'Raid Sakazuki', 'Raid Akainu' ],
-    1299: ['レベッカ　ラブリーモンスターキャット', '', 'Halloween Rebecca' ],
-    1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード', '', 'Halloween Rebecca' ],
-    1301: ['受刑者　バギー', '', 'Baggy' ],
-    1302: ['受刑者　道化のバギー 脱獄同盟', '', 'Baggy' ],
-    1303: ['脱走囚　ギャルディーノ', '', 'Mr 3', 'Mr. 3' ],
-    1304: ['脱走囚　ギャルディーノ 脱獄同盟', '', 'Mr 3', 'Mr. 3' ],
-    1305: ['シュガー　リトルサキュバス', '', 'Halloween Sugar' ],
-    1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード', '', 'Halloween Sugar' ],
-    1307: ['バルトロメオ　フルムーンウルフ', '', 'Halloween Bartolomeo' ],
-    1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード', '', 'Halloween Bartolomeo' ],
-    1309: ['錦えもん', '', 'Coliseum Kinemon', 'Coliseum Kin\'emon' ],
-    1310: ['狐火の錦えもん', '', 'Coliseum Kinemon', 'Coliseum Kin\'emon' ],
-    1311: ['ボア・マリーゴールド 九蛇の戦士', '', 'Coliseum Marigold', 'Coliseum Boa Marigold' ],
-    1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女', '', 'Coliseum Marigold', 'Coliseum Boa Marigold' ],
-    1313: ['赤犬 海軍本部最高戦力', '', 'Sakazuki' ],
-    1314: ['サカズキ', '', 'Akainu' ],
-    1315: ['海軍本部曹長　コビー “偉大なる航路”の海兵', '', '' ],
-    1316: ['海軍本部曹長　コビー “海軍の英雄”の教え子', '', '' ],
-    1317: ['モンキー・D・ガープ 海軍本部中将', '', '' ],
-    1318: ['ゲンコツのガープ 海軍本部中将', '', '' ],
-    1319: ['つる 海軍本部中将', '', '' ],
-    1320: ['“大参謀”つる 海軍本部中将', '', '' ],
-    1321: ['モモンガ 怪物斬りの名将', '', '' ],
-    1322: ['海軍本部中将モモンガ 怪物斬りの名将', '', '' ],
-    1323: ['オニグモ 八刀流の剣士', '', '' ],
-    1324: ['海軍本部中将オニグモ 八刀流の剣士', '', '' ],
-    1325: ['コラソン　ロイヤルヴァンパイア', '', 'Halloween Corazon' ],
-    1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード', '', 'Halloween Corazon' ],
-    1327: ['レオ トンタッタ族トンタ兵団', '', '' ],
-    1328: ['戦士レオ トンタッタ族トンタ兵団', '', '' ],
-    1329: ['ウィッカ', '', 'Wicka' ],
-    1330: ['ガンチョ', '', '' ],
-    1331: ['マンシェリー トンタ長の娘', '', '' ],
-    1332: ['マンシェリー トンタッタ王国の姫', '', '' ],
-    1333: ['カブ', '', '' ],
-    1334: ['ビアン', '', '' ],
-    1335: ['サボ 貴女との一幕', '', 'Gentleman Sabo' ],
-    1336: ['サボ 劇場の怪人', '', 'Gentleman Sabo' ],
-    1337: ['カン十郎', '', 'Coliseum Kanjuro' ],
-    1338: ['夕立ち　カン十郎', '', 'Coliseum Kanjuro' ],
-    1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）', '', 'Coliseum Chopper', 'Coliseum Tony Tony Chopper' ],
-    1340: ['ゲダツ スカイピア神官', '', 'Coliseum Gedatsu' ],
-    1341: ['空番長　ゲダツ スカイピア神官', '', 'Coliseum Gedatsu' ],
-    1342: ['カーリー・ダダン', '', '' ],
-    1343: ['ポルシェーミ', '', '' ],
-    1344: ['ブルージャム', '', '' ],
-    1345: ['ジンベエ 魚人海賊団船長', '', 'Jinbe', 'Jimbei', 'Jinbei' ],
-    1346: ['ヘラクレス おいはぎの森のスゴ腕先生', '', '' ],
-    1347: ['トリノ王国の怪鳥', '', '' ],
-    1348: ['ヒューマンドリル', '', '' ],
-    1349: ['ハレダス', '', '' ],
-    1350: ['テーナ・ゲーナ王国の手長族', '', '' ],
-    1351: ['テキーラウルフの警備兵', '', '' ],
-    1352: ['エンポリオ・イワンコフ キングオブニューカマー', '', '' ],
-    1353: ['シルバーズ・レイリー 海賊王の船員', '', '' ],
-    1354: ['シルバーズ・レイリー 眠らぬ街のマスター', '', 'Secret Rayleigh' ],
-    1355: ['シルバーズ・レイリー ライムライトに煌く冥王', '', 'Secret Rayleigh' ],
-    1356: ['ペコムズ', '', '' ],
-    1357: ['ペコムズ ビッグ・マム海賊団', '', '' ],
-    1358: ['タマゴ男爵', '', '' ],
-    1359: ['タマゴ男爵 ビッグ・マム海賊団', '', '' ],
-    1360: ['ルフィの冬島冒険', '', 'Winter Luffy' ],
-    1361: ['ロロノア・ゾロ 集結の麦わらの一味', '', 'New World Zoro', 'Timeskip Zoro', 'TS Zoro' ],
-    1362: ['ロロノア・ゾロ 新生・麦わらの一味', '', 'New World Zoro', 'Timeskip Zoro', 'TS Zoro' ],
-    1363: ['フランキー 集結の麦わらの一味', '', 'New World Franky', 'Timeskip Franky', 'TS Franky' ],
-    1364: ['フランキー 新生・麦わらの一味', '', 'New World Franky', 'Timeskip Franky', 'TS Franky' ],
-    1365: ['ナミ 集結の麦わらの一味', '', 'New World Nami', 'Timeskip Nami', 'TS Nami' ],
-    1366: ['ナミ 新生・麦わらの一味', '', 'New World Nami', 'Timeskip Nami', 'TS Nami' ],
-    1367: ['サンジ 集結の麦わらの一味', '', 'New World Sanji', 'Timeskip Sanji', 'TS Sanji' ],
-    1368: ['サンジ 新生・麦わらの一味', '', 'New World Sanji', 'Timeskip Sanji', 'TS Sanji' ],
-    1369: ['トニートニー・チョッパー 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
-    1370: ['トニートニー・チョッパー 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
-    1371: ['ロロノア・ゾロ 野生の海賊', '', 'Wild Zoro' ],
-    1372: ['ロロノア・ゾロ 大地の開拓者', '', 'Wild Zoro' ],
-    1373: ['マゼラン', '', 'Raid Magellan' ],
-    1374: ['マゼラン 監獄署長', '', 'Raid Magellan' ],
-    1375: ['デリンジャー 闘魚の血を引く半魚人', '', 'Coliseum Dellinger' ],
-    1376: ['デリンジャー ディアマンテ軍戦闘員', '', 'Coliseum Dellinger' ],
-    1377: ['マーガレット アマゾン・リリーの弓兵', '', 'Coliseum Marguerite' ],
-    1378: ['マーガレット 九蛇の覇気使い', '', 'Coliseum Marguerite' ],
-    1379: ['シャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks' ],
-    1380: ['赤髪のシャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks' ],
-    1381: ['', '', 'Christmas Tashigi' ],
-    1382: ['', '', 'Christmas Tashigi' ],
-    1383: ['オモチャの兵隊さん', '', 'Toy Soldier', 'Kyros' ],
-    1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros' ],
-    1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca' ],
-    1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca' ],
-    1387: ['', '', 'Mega Luffy', 'Super Luffy' ],
-    1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro', 'Super Zoro' ],
-    1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami', 'Super Nami' ],
-    1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy' ],
-    1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy' ],
-    1392: ['戦桃丸 シャボンディ諸島の壁', '', '' ],
-    1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat' ],
-    1394: ['ベビー５ 神前の晴れ着', '', 'Kimono Baby 5' ],
-    1395: ['ベビー５ ぎこちない振袖', '', 'Kimono Baby 5' ],
-    1396: ['たしぎ シャンブルズ', '', 'Smoker' ],
-    1397: ['たしぎ　七尺十手 シャンブルズ', '', 'Smoker' ],
-    1398: ['スモーカー シャンブルズ', '', 'Tashigi' ],
-    1399: ['スモーカー　時雨 シャンブルズ', '', 'Tashigi' ],
-    1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius' ],
-    1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius' ],
-    1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton' ],
-    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL' ],
-    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL' ],
-    1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp' ],
-    1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp' ],
-    1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin', 'Timeskip Robin', 'TS Robin' ],
-    1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin',, 'Timeskip Robin', 'TS Robin' ],
-    1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook' ],
-    1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook' ],
-    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
-    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper' ],
+    1122: [ 'キャベンディッシュ', '','Hakuba', 'Cabbage' ],
+    1123: [ '白馬のキャベンディッシュ', '','Hakuba', 'Cabbage' ],
+    1124: ['スレイマン',''],
+    1125: ['首はねスレイマン',''],
+    1126: ['オオロンブス',''],
+    1127: ['オオロンブス 殺戮支配者',''],
+    1128: ['ダガマ',''],
+    1129: ['ダガマ プロデンス王国軍師',''],
+    1130: ['エリザベローII世',''],
+    1131: ['エリザベローII世 プロデンス王国国王',''],
+    1132: ['イデオ',''],
+    1133: ['イデオ 破壊砲',''],
+    1134: ['たしぎ がむしゃらな剣道少女','','Young Tashigi', 'Kid Tashigi'],
+    1135: ['たしぎ 夢見る剣道少女','','Young Tashigi', 'Kid Tashigi'],
+    1136: ['フクロウ 世界政府直下暗躍諜報機関',''],
+    1137: ['ジャブラ 世界政府直下暗躍諜報機関','','Jabura'],
+    1138: ['ブルーノ 世界政府直下暗躍諜報機関',''],
+    1139: ['クマドリ 世界政府直下暗躍諜報機関',''],
+    1140: ['ゲッコー・モリア 魔の三角地帯の主','','Coliseum Gekko Moriah'],
+    1141: ['ゲッコー・モリア 魔の三角地帯の支配者','','Coliseum Gekko Moriah'],
+    1142: ['フォクシー ドーナツレースの邪魔者','','Coliseum Foxy','Dying Foxy'],
+    1143: ['フォクシー コンバットの卑怯者','','Coliseum Foxy','Nurse Foxy'],
+    1144: ['ポルチェ お花チアリーダーズ','','Coliseum Porche'],
+    1145: ['ポルチェ キューティバトンの使い手','','Coliseum Porche'],
+    1146: ['制圧の制服看守',''],
+    1147: ['火急の制服看守',''],
+    1148: ['包囲の制服看守',''],
+    1149: ['理論派獄卒',''],
+    1150: ['行動派獄卒',''],
+    1151: ['ミノタウロス',''],
+    1152: ['ミノゼブラ',''],
+    1153: ['スフィンクス',''],
+    1154: ['サルデス 牢番長',''],
+    1155: ['軍隊ウルフ',''],
+    1156: ['ハンニャバル副署長',''],
+    1157: ['ハンニャバル副署長 海底監獄インペルダウン',''],
+    1158: ['マゼラン署長',''],
+    1159: ['マゼラン署長 海底監獄インペルダウン',''],
+    1160: ['コアラ ビーチの天使','','Summertime Koala','Swimsuit Koala'],
+    1161: ['コアラ 楽園の女神','','Summertime Koala','Swimsuit Koala'],
+    1162: ['ギルド・テゾーロ','','Raid Tesoro'],
+    1163: ['ギルド・テゾーロ 黄金船のカジノ王','','Raid Tesoro'],
+    1164: ['カリーナ','','Raid Carina'],
+    1165: ['カリーナ 黄金船の歌姫','','Raid Carina'],
+    1166: ['バカラ',''],
+    1167: ['バカラ 黄金船のコンシェルジュ',''],
+    1168: ['ダイス',''],
+    1169: ['ダイス 黄金船のディーラー',''],
+    1170: ['タナカさん',''],
+    1171: ['タナカさん 黄金船の警備担当',''],
+    1172: ['ブルック 夢を追い求める冒険者','','New Strong World Brook', 'SW Brook' ],
+    1173: ['ブルック 信念に生きる麦わらの一味','','New Strong World Brook', 'SW Brook' ],
+    1174: ['ロロノア・ゾロ 夢を追い求める冒険者','','New Strong World Zoro', 'SW Zoro' ],
+    1175: ['ロロノア・ゾロ 信念に生きる麦わらの一味','','New Strong World Zoro', 'SW Zoro' ],
+    1176: ['チョッパー 夢を追い求める冒険者','','New Strong World Chopper', 'SW Chopper' ],
+    1177: ['チョッパー 信念に生きる麦わらの一味','','New Strong World Chopper', 'SW Chopper' ],
+    1178: ['オーズ','','Oz'],
+    1179: ['魔人オーズ','','Oz'],
+    1180: ['虹ヨロイガニ',''],
+    1181: ['ブレンハイム',''],
+    1182: ['カトラスのブレンハイム',''],
+    1183: ['キングデュー','','Heman'],
+    1184: ['双拳ガントレットのキングデュー','','Heman'],
+    1185: ['ハルタ',''],
+    1186: ['疾風の小剣士ハルタ',''],
+    1187: ['アトモス',''],
+    1188: ['水牛のアトモス',''],
+    1189: ['スピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
+    1190: ['シールドランスのスピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
+    1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
+    1192: ['クザン','','Aokiji'],
+    1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
+    1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
+    1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall', 'Coliseum Ganfor', 'Ganfall'],
+    1196: ['ガン・フォール スカイピアの神','','Coliseum Gan Fall', 'Coliseum Ganfor', 'Ganfall'],
+    1197: ['スカイブリーダー・オーム','','Coliseum Ohm'],
+    1198: ['ジュエリー・ボニー 弾けるサファイア','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
+    1199: ['ジュエリー・ボニー パールホワイトの煌き','','Summertime Jewelry Bonney','Swimsuit Jewelry Bonney'],
+    1200: ['ヴァイオレット 挑発のバカンス','','Summertime Viola','Swimsuit Viola'],
+    1201: ['ヴァイオレット 紅潮のバカンス','','Summertime Viola','Swimsuit Viola'],
+    1202: ['ヨーキ',''],
+    1203: ['キャラコのヨーキ',''],
+    1204: ['ブルック ルンバー海賊団',''],
+    1205: ['“音楽家兼剣士”ブルック ルンバー海賊団',''],
+    1206: ['ラブーン ルンバー海賊団',''],
+    1207: ['ニコ・ロビン 夢を追い求める冒険者','','New Strong World Robin', 'SW Robin' ],
+    1208: ['ニコ・ロビン 信念に生きる麦わらの一味','','New Strong World Robin', 'SW Robin' ],
+    1209: ['ウソップ 夢を追い求める冒険者','','New Strong World Usopp', 'SW Usopp' ],
+    1210: ['ウソップ 信念に生きる麦わらの一味','','New Strong World Usopp', 'SW Usopp' ],
+    1211: ['フランキー 夢を追い求める冒険者','','New Strong World Franky', 'SW Franky' ],
+    1212: ['フランキー 信念に生きる麦わらの一味','','New Strong World Franky', 'SW Franky' ],
+    1213: ['ベビー５ ドルフィンフロート','','Summertime Baby 5','Swimsuit Baby 5'],
+    1214: ['ベビー５ ドルフィンライダー','','Summertime Baby 5','Swimsuit Baby 5'],
+    1215: ['ガイラム ワールド海賊団','',''],
+    1216: ['セバスチャン ワールド海賊団','',''],
+    1217: ['ナイチン ワールド海賊団','',''],
+    1218: ['ボア・ハンコック アマゾン・リリー皇帝','',''],
+    1219: ['バーンディ・ワールド','','Coliseum World', 'Coliseum Byrnndi World'],
+    1220: ['バーンディ・ワールド ワールド海賊団船長','','Coliseum World', 'Coliseum Byrnndi World'],
+    1221: ['リトルオーズJr. 白ひげ海賊団傘下','','Coliseum Oars Jr.'],
+    1222: ['猛攻のリトルオーズJr. 白ひげ海賊団傘下','','Coliseum Oars Jr.'],
+    1223: ['バスティーユ','',''],
+    1224: ['ヤマカジ','',''],
+    1225: ['ヒナ 黒檻部隊','',''],
+    1226: ['スモーカー 海軍本部准将','',''],
+    1227: ['ジュラキュール・ミホーク 鷹の目','',''],
+    1228: ['黄猿 海軍本部大将','',''],
+    1229: ['戦桃丸 海軍本部将校','','Sentoumaru'],
+    1230: ['鉞の戦桃丸 海軍本部将校','','Sentoumaru'],
+    1231: ['スモーカー 海軍ＧＬ第５支部','',''],
+    1232: ['スモーカー 海軍ＧＬ第５支部「Ｇ‐５」中将','',''],
+    1233: ['たしぎ 海軍ＧＬ第５支部','','Thiccshigi'],
+    1234: ['たしぎ 海軍ＧＬ第５支部「Ｇ‐５」大佐','','Thiccshigi'],
+    1235: ['メイナード 海軍本部中将','',''],
+    1236: ['追撃のメイナード 海軍本部中将','',''],
+    1237: ['バスティーユ 海軍本部中将','',''],
+    1238: ['鮫切りバスティーユ 海軍本部中将','',''],
+    1239: ['黄猿 海軍本部最高戦力','','Kizaru'],
+    1240: ['ボルサリーノ','','Kizaru'],
+    1241: ['コアラ 魚人空手師範代','',''],
+    1242: ['コアラ 革命軍・魚人空手師範代','',''],
+    1243: ['ハック 魚人空手師範','',''],
+    1244: ['ハック 革命軍・魚人空手師範','',''],
+    1245: ['モンキー・D・ルフィ マリンフォードに舞う“麦わら”','',''],
+    1246: ['ポートガス・D・エース 処刑台の“火拳”','',''],
+    1247: ['ポートガス・D・エース マリンフォードに舞う“火拳”','',''],
+    1248: ['マルコ 秋風にはためく襟元','','Kimono Marco'],
+    1249: ['マルコ ほろ酔いの着崩れ','','Kimono Marco'],
+    1250: ['マルコ 白ひげ海賊団','','Coliseum Marco'],
+    1251: ['マルコ　復活の炎 白ひげ海賊団','','Coliseum Marco'],
+    1252: ['遊騎士ドーマ 白ひげ海賊団傘下','','Coliseum Doma'],
+    1253: ['スカイライダー・シュラ','','Coliseum Shura'],
+    1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','',''],
+    1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下','',''],
+    1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下','',''],
+    1257: ['エドワード・ニューゲート 海賊王のライバル','', 'Edward Newgate', 'Young Whitebeard', 'YWB'],
+    1258: ['エドワード・ニューゲート 大海賊“白ひげ”','', 'Edward Newgate', 'Young Whitebeard', 'YWB'],
+    1259: ['ドンキホーテ・ドフラミンゴ “北の海”の海賊','','Young Doffy','Donquixote Doflamingo'],
+    1260: ['ドンキホーテ・ドフラミンゴ “北の海”の闇','','Young Doffy','Donquixote Doflamingo'],
+    1261: ['セニョール・ピンク “北の海”の海賊','','Senor Pink', 'Young Senior Pink'],
+    1262: ['セニョール・ピンク “北の海”の闇','','Senor Pink', 'Young Senior Pink'],
+    1263: ['ヴェルゴ “北の海”の海賊','','Young Vergo'],
+    1264: ['ヴェルゴ “北の海”の闇','','Young Vergo'],
+    1265: ['エース 黄昏の道草','','Kimono Ace'],
+    1266: ['エース 月下の艶肌','','Kimono Ace'],
+    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','','BB'],
+    1268: ['黒ひげ 黒ひげ海賊団船長','','BB', 'Teach'],
+    1269: ['ラフィット','','Lafitte'],
+    1270: ['“鬼保安官”ラフィット','','Lafitte'],
+    1271: ['ヴァン・オーガー','','Vaper', 'Van Ogre'],
+    1272: ['“音越”ヴァン・オーガー','','Vaper', 'Van Ogre'],
+    1273: ['ジーザス・バージェス','',''],
+    1274: ['“チャンピオン”ジーザス・バージェス','',''],
+    1275: ['シリュウ','','Shiliew'],
+    1276: ['雨のシリュウ','','Shiliew'],
+    1277: ['ドクＱ','',''],
+    1278: ['“死神”ドクＱ','',''],
+    1279: ['ジョン・ジャイアント','',''],
+    1280: ['青キジ 海軍本部大将','','Kuzan'],
+    1281: ['ガープ 海軍本部中将','',''],
+    1282: ['センゴク 海軍本部元帥','',''],
+    1283: ['赤犬 海軍本部大将','','Sakazuki'],
+    1284: ['モンキー・D・ルフィ 野生の海賊','','Wild Luffy'],
+    1285: ['モンキー・D・ルフィ 大地の開拓者','','Wild Luffy'],
+    1286: ['ベビー５ スパイダーマイルズの少女','','Kid Baby 5'],
+    1287: ['ベビー５ ドンキホーテファミリーの一員','','Kid Baby 5'],
+    1288: ['トラファルガー・ロー スパイダーマイルズの少年','','Kid Trafalgar Law', 'Kid Law'],
+    1289: ['トラファルガー・ロー ドンキホーテファミリーの一員','','Kid Trafalgar Law', 'Kid Law'],
+    1290: ['バッファロー ドンキホーテファミリーの一員','','Kid Buffalo'],
+    1291: ['ラオＧ 地翁拳の使い手','','Coliseum Lao G'],
+    1292: ['ラオＧ ディアマンテ軍幹部','','Coliseum Lao G'],
+    1293: ['ボア・サンダーソニア 九蛇の戦士','','Coliseum Sandersonia','Coliseum Boa Sandersonia'],
+    1294: ['ボア・サンダーソニア ゴルゴン三姉妹・次女','','Coliseum Sandersonia','Coliseum Boa Sandersonia'],
+    1295: ['カリファ　グラマラスミイラ','','Halloween Kalifa'],
+    1296: ['カリファ　グラマラスミイラ ハロウィンナイト・マスカレード','','Halloween Kalifa'],
+    1297: ['赤犬','','Raid Sakazuki', 'Raid Akainu'],
+    1298: ['赤犬 マグマ人間','','Raid Sakazuki', 'Raid Akainu'],
+    1299: ['レベッカ　ラブリーモンスターキャット','','Halloween Rebecca'],
+    1300: ['レベッカ　ラブリーモンスターキャット ハロウィンナイト・マスカレード','','Halloween Rebecca'],
+    1301: ['受刑者　バギー','','Baggy'],
+    1302: ['受刑者　道化のバギー 脱獄同盟','','Baggy'],
+    1303: ['脱走囚　ギャルディーノ','','Mr 3', 'Mr. 3'],
+    1304: ['脱走囚　ギャルディーノ 脱獄同盟','','Mr 3', 'Mr. 3'],
+    1305: ['シュガー　リトルサキュバス','','Halloween Sugar'],
+    1306: ['シュガー　リトルサキュバス ハロウィンナイト・マスカレード','','Halloween Sugar'],
+    1307: ['バルトロメオ　フルムーンウルフ','','Halloween Bartolomeo'],
+    1308: ['バルトロメオ　フルムーンウルフ ハロウィンナイト・マスカレード','','Halloween Bartolomeo'],
+    1309: ['錦えもん','','Coliseum Kinemon','Coliseum Kin\'emon'],
+    1310: ['狐火の錦えもん','','Coliseum Kinemon','Coliseum Kin\'emon'],
+    1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum Marigold','Coliseum Boa Marigold'],
+    1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女','','Coliseum Marigold','Coliseum Boa Marigold'],
+    1313: ['赤犬 海軍本部最高戦力','','Sakazuki'],
+    1314: ['サカズキ','','Akainu'],
+    1315: ['海軍本部曹長　コビー “偉大なる航路”の海兵','',''],
+    1316: ['海軍本部曹長　コビー “海軍の英雄”の教え子','',''],
+    1317: ['モンキー・D・ガープ 海軍本部中将','',''],
+    1318: ['ゲンコツのガープ 海軍本部中将','',''],
+    1319: ['つる 海軍本部中将','',''],
+    1320: ['“大参謀”つる 海軍本部中将','',''],
+    1321: ['モモンガ 怪物斬りの名将','',''],
+    1322: ['海軍本部中将モモンガ 怪物斬りの名将','',''],
+    1323: ['オニグモ 八刀流の剣士','',''],
+    1324: ['海軍本部中将オニグモ 八刀流の剣士','',''],
+    1325: ['コラソン　ロイヤルヴァンパイア','','Halloween Corazon'],
+    1326: ['コラソン　ロイヤルヴァンパイア ハロウィンナイト・マスカレード','','Halloween Corazon'],
+    1327: ['レオ トンタッタ族トンタ兵団','',''],
+    1328: ['戦士レオ トンタッタ族トンタ兵団','',''],
+    1329: ['ウィッカ','','Wicka'],
+    1330: ['ガンチョ','',''],
+    1331: ['マンシェリー トンタ長の娘','',''],
+    1332: ['マンシェリー トンタッタ王国の姫','',''],
+    1333: ['カブ','',''],
+    1334: ['ビアン','',''],
+    1335: ['サボ 貴女との一幕','','Gentleman Sabo'],
+    1336: ['サボ 劇場の怪人','','Gentleman Sabo'],
+    1337: ['カン十郎','','Coliseum Kanjuro'],
+    1338: ['夕立ち　カン十郎','','Coliseum Kanjuro'],
+    1339: ['トニートニー・チョッパー 飛力強化（ジャンピングポイント）','','Coliseum Chopper','Coliseum Tony Tony Chopper'],
+    1340: ['ゲダツ スカイピア神官','','Coliseum Gedatsu'],
+    1341: ['空番長　ゲダツ スカイピア神官','','Coliseum Gedatsu'],
+    1342: ['カーリー・ダダン','',''],
+    1343: ['ポルシェーミ','',''],
+    1344: ['ブルージャム','',''],
+    1345: ['ジンベエ 魚人海賊団船長','','Jinbe','Jimbei','Jinbei'],
+    1346: ['ヘラクレス おいはぎの森のスゴ腕先生','',''],
+    1347: ['トリノ王国の怪鳥','',''],
+    1348: ['ヒューマンドリル','',''],
+    1349: ['ハレダス','',''],
+    1350: ['テーナ・ゲーナ王国の手長族','',''],
+    1351: ['テキーラウルフの警備兵','',''],
+    1352: ['エンポリオ・イワンコフ キングオブニューカマー','',''],
+    1353: ['シルバーズ・レイリー 海賊王の船員','',''],
+    1354: ['シルバーズ・レイリー 眠らぬ街のマスター','','Secret Rayleigh'],
+    1355: ['シルバーズ・レイリー ライムライトに煌く冥王','','Secret Rayleigh'],
+    1356: ['ペコムズ','',''],
+    1357: ['ペコムズ ビッグ・マム海賊団','',''],
+    1358: ['タマゴ男爵','',''],
+    1359: ['タマゴ男爵 ビッグ・マム海賊団','',''],
+    1360: ['ルフィの冬島冒険','','Winter Luffy'],
+    1361: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
+    1362: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
+    1363: ['フランキー 集結の麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
+    1364: ['フランキー 新生・麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
+    1365: ['ナミ 集結の麦わらの一味','','New World Nami', 'Timeskip Nami', 'TS Nami'],
+    1366: ['ナミ 新生・麦わらの一味','','New World Nami', 'Timeskip Nami', 'TS Nami'],
+    1367: ['サンジ 集結の麦わらの一味','','New World Sanji', 'Timeskip Sanji', 'TS Sanji'],
+    1368: ['サンジ 新生・麦わらの一味','','New World Sanji', 'Timeskip Sanji', 'TS Sanji'],
+    1369: ['トニートニー・チョッパー 集結の麦わらの一味','','New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
+    1370: ['トニートニー・チョッパー 新生・麦わらの一味','','New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
+    1371: ['ロロノア・ゾロ 野生の海賊','','Wild Zoro'],
+    1372: ['ロロノア・ゾロ 大地の開拓者','','Wild Zoro'],
+    1373: ['マゼラン','','Raid Magellan'],
+    1374: ['マゼラン 監獄署長','','Raid Magellan'],
+    1375: ['デリンジャー 闘魚の血を引く半魚人', '', 'Coliseum Dellinger'],
+    1376: ['デリンジャー ディアマンテ軍戦闘員', '', 'Coliseum Dellinger'],
+    1377: ['マーガレット アマゾン・リリーの弓兵', '', 'Coliseum Marguerite'],
+    1378: ['マーガレット 九蛇の覇気使い', '', 'Coliseum Marguerite'],
+    1379: ['シャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
+    1380: ['赤髪のシャンクス 赤髪海賊団大頭', '', 'Coliseum Shanks'],
+    1381: ['', '', 'Christmas Tashigi'],
+    1382: ['', '', 'Christmas Tashigi'],
+    1383: ['オモチャの兵隊さん', '', 'Toy Soldier', 'Kyros'],
+    1384: ['オモチャの兵隊さん 雷兵', '', 'Toy Soldier', 'Kyros'],
+    1385: ['レベッカ 生き残った旧王家の血', '', 'Kid Rebecca'],
+    1386: ['レベッカ 狙われる旧王家の血', '', 'Kid Rebecca'],
+    1387: ['', '', 'Mega Luffy', 'Super Luffy'],
+    1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro', 'Super Zoro'],
+    1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami', 'Super Nami'],
+    1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy'],
+    1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
+    1392: ['戦桃丸 シャボンディ諸島の壁', '', ''],
+    1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
+    1394: ['ベビー５ 神前の晴れ着', '', 'Kimono Baby 5'],
+    1395: ['ベビー５ ぎこちない振袖', '', 'Kimono Baby 5'],
+    1396: ['たしぎ シャンブルズ', '', 'Smoker'],
+    1397: ['たしぎ　七尺十手 シャンブルズ', '', 'Smoker'],
+    1398: ['スモーカー シャンブルズ', '', 'Tashigi'],
+    1399: ['スモーカー　時雨 シャンブルズ', '', 'Tashigi'],
+    1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius'],
+    1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius'],
+    1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton'],
+    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
+    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
+    1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
+    1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
+    1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin', 'Timeskip Robin', 'TS Robin'],
+    1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin',, 'Timeskip Robin', 'TS Robin'],
+    1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
+    1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
+    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
+    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
     1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate', 'Super Whitebeard', 'Super WB',],
-    1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji' ],
-    1415: ['センゴク 智将', '', '' ],
-    1416: ['仏のセンゴク 智将', '', '' ],
-    1417: ['ロンズ', '', 'Lonz' ],
-    1418: ['カイゼルヒゲ', '', 'Kaiser Mustache' ],
-    1419: ['ロブ・ルッチ 紋付袴の手招き', '', 'Kimono Lucci' ],
-    1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci' ],
-    1421: ['ディアマンテ はためく旗（フラッグ）人間', '', 'Coliseum Diamante' ],
-    1422: ['ディアマンテ ドンキホーテファミリー最高幹部', '', 'Coliseum Diamante' ],
-    1423: ['Tボーン 海軍本部大佐', '', 'Coliseum T-Bone' ],
-    1424: ['ギン 海賊艦隊　戦闘“総隊長”', '', 'Coliseum Gin' ],
-    1425: ['サイ 八宝水軍', '', '' ],
-    1426: ['サイ 八宝水軍第１３代棟梁', '', '' ],
-    1427: ['ブー 八宝水軍', '', '' ],
-    1428: ['ジャン・アンゴ', '', '' ],
-    1429: ['マンシェリー ２月の本命', '', 'Valentine Mansherry' ],
-    1430: ['マンシェリー ３月への勇気', '', 'Valentine Mansherry' ],
-    1431: ['フランキー将軍', '', 'General Franky', 'Raid Franky' ],
-    1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky', 'Raid Franky' ],
-    1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', '' ],
-    1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', '' ],
-    1435: ['ヒョウゾウ 新魚人海賊団', '', '' ],
-    1436: ['ヒョウゾウ 魚人街の亡霊', '', '' ],
-    1437: ['イカロス・ムッヒ 新魚人海賊団', '', '' ],
-    1438: ['イカロス・ムッヒ 魚人街の亡霊', '', '' ],
-    1439: ['ダルマ 新魚人海賊団', '', '' ],
-    1440: ['ダルマ 魚人街の亡霊', '', '' ],
-    1441: ['ゼオ 新魚人海賊団', '', '' ],
-    1442: ['ゼオ 魚人街の亡霊', '', '' ],
-    1443: ['ドスン 新魚人海賊団', '', '' ],
-    1444: ['ドスン 魚人街の亡霊', '', '' ],
-    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock', 'Super Boa Hancock' ],
-    1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp', 'Super Usopp' ],
-    1447: ['サンジ グリル＝ショット', '', 'Mega Sanji', 'Super Sanji' ],
-    1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper', 'Super Chopper' ],
-    1449: ['ヴァイオレット 踊り娘', '', 'Viola' ],
-    1450: ['ヴァイオレット 追われる女', '', 'Viola' ],
-    1451: ['サンジ 恋人通りの変装男', '', '' ],
-    1452: ['サンジ となり町までの護衛', '', '' ],
-    1453: ['マーガレット １３日の胸騒ぎ', '', 'Valentine Marguerite' ],
-    1454: ['マーガレット １４日の記念日', '', 'Valentine Marguerite' ],
-    1455: ['首領・チンジャオ 八宝水軍', '', 'Coliseum Don Chinjao' ],
-    1456: ['首領・チンジャオ 元八宝水軍第１２代棟梁', '', 'Coliseum Don Chinjao' ],
-    1457: ['クラハドール 執事', '', 'Coliseum Kuro' ],
-    1458: ['百計のクロ 海賊', '', 'Coliseum Kuro' ],
-    1459: ['ミス・バレンタイン キロキロの実の能力者', '', 'Coliseum Miss Valentine' ],
-    1460: ['ミス・バレンタイン Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Miss Valentine' ],
-    1461: ['ゾロの寒稽古', '', 'Winter Zoro' ],
-    1462: ['ルフィのブレイクタイム', '', 'White Day Luffy' ],
-    1463: ['ルフィのティーパーティ', '', 'White Day Luffy' ],
-    1464: ['チョッパーのブレイクタイム', '', 'White Day Chopper' ],
-    1465: ['チョッパーのティーパーティ', '', 'White Day Chopper' ],
-    1466: ['キャベンディッシュ 白い日の優男', '', 'White Day Cavendish', 'White Day Cabbage' ],
-    1467: ['キャベンディッシュ 白い日の白昼夢', '', 'White Day Cavendish', 'White Day Cabbage' ],
-    1468: ['戦桃丸 海兵', '', '' ],
-    1469: ['鉞の戦桃丸 海兵', '', '' ],
-    1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service' ],
-    1471: ['深手の・アルビオン', '', '' ],
-    1472: ['しらほし姫', '', '' ],
-    1473: ['しらほし姫 リュウグウ王国王女', '', '' ],
-    1474: ['ネプチューン', '', '' ],
-    1475: ['ネプチューン リュウグウ王国国王', '', '' ],
-    1476: ['フカボシ', '', '' ],
-    1477: ['フカボシ リュウグウ王国王子', '', '' ],
-    1478: ['カリブー カリブー海賊団船長', '', '' ],
-    1479: ['濡れ髪のカリブー カリブー海賊団船長', '', '' ],
-    1480: ['バンダー・デッケン九世 幽霊船の主', '', '' ],
-    1481: ['バンダー・デッケン九世 フライング海賊団船長', '', '' ],
-    1482: ['マダム・シャーリー', '', '', 'Madame Shirley' ],
-    1483: ['マダム・シャーリー 占い師', '', '', 'Madame Shirley' ],
-    1484: ['サンジ 野生の海賊', '', 'Wild Sanji' ],
-    1485: ['サンジ 大地の開拓者', '', 'Wild Sanji' ],
-    1486: ['イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo' ],
-    1487: ['破壊砲　イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo' ],
-    1488: ['首領・クリーク 海賊艦隊「提督」', '', 'Coliseum Don Krieg' ],
-    1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg' ],
-    1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5' ],
-    1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5' ],
-    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo' ],
-    1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', '' ],
-    1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', '' ],
-    1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', '' ],
-    1496: ['一発必中の砲撃部隊 魚人街の無法者', '', '' ],
-    1497: ['一発入魂の砲撃部隊 魚人街の無法者', '', '' ],
-    1498: ['赤のアンモナイツ 丈夫な警備隊', '', '' ],
-    1499: ['青のアンモナイツ 機敏な警備隊', '', '' ],
-    1500: ['緑のアンモナイツ 利発な警備隊', '', '' ],
-    1501: ['カリブー', '', '' ],
-    1502: ['コリブー', '', '' ],
-    1503: ['ハモンド', '', '' ],
-    1504: ['バンダー・デッケン九世', '', '' ],
-    1505: ['ホーディ・ジョーンズ', '', '' ],
-    1506: ['ホーディ・ジョーンズ 覚醒', '', '' ],
-    1507: ['サンジのブレイクタイム', '', 'White Day Sanji' ],
-    1508: ['サンジのティーパーティ', '', 'White Day Sanji' ],
-    1509: ['ハルタ 白ひげ海賊団１２番隊隊長', '', '' ],
-    1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', '' ],
-    1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', '' ],
-    1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', 'Heman' ],
-    1513: ['サンジ 春先のお付き添い', '', 'Spring Sanji', 'White Day Sanji' ],
-    1514: ['サンジ 記念日の手作り', '', 'Spring Sanji', 'White Day Sanji' ],
-    1515: ['ブルックのブレイクタイム', '', 'White Day Brook' ],
-    1516: ['ブルックのティーパーティ', '', 'White Day Brook' ],
-    1517: ['ハイエナのベラミー 元ベラミー海賊団船長', '', 'Raid Bellamy' ],
-    1518: ['ハイエナのベラミー ドレスローザの凶弾', '', 'Raid Bellamy' ],
-    1519: ['カーリー・ダダン コルボ山　山賊', '', '' ],
-    1520: ['カーリー・ダダン ダダン一家　棟梁', '', '' ],
-    1521: ['ドグラ', '', '' ],
-    1522: ['ポートガス・D・エース 隠された鬼の子', '', 'Kid Ace' ],
-    1523: ['トニートニー・チョッパー フラスコの中の大きな夢', '', 'Spring Chopper', 'Sakura Chopper' ],
-    1524: ['トニートニー・チョッパー 冬島に見た春の景色', '', 'Spring Chopper', 'Sakura Chopper' ],
-    1525: ['首はねスレイマン ディアス海戦Ａ級戦犯', '', 'Coliseum Suleiman' ],
-    1526: ['アーロン アーロン一味船長', '', 'Coliseum Arlong' ],
-    1527: ['ノコギリのアーロン アーロン一味船長', '', 'Coliseum Arlong' ],
-    1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim' ],
-    1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage' ],
-    1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage' ],
-    1531: ['ウソランド', '', 'God Usopp' ],
-    1532: ['ゴッド・ウソップ', '', 'God Usopp' ],
-    1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', '' ],
-    1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', '' ],
-    1535: ['デュバル 麦わらの一味の協力者', '', '' ],
-    1536: ['デュバル 麦わらの一味の共犯者', '', '' ],
-    1537: ['ヘラクレス 麦わらの一味の協力者', '', '' ],
-    1538: ['ヘラクレス 麦わらの一味の共犯者', '', '' ],
-    1539: ['ペローナ 麦わらの一味の協力者', '', '' ],
-    1540: ['ペローナ 麦わらの一味の共犯者', '', '' ],
-    1541: ['エリザベス 麦わらの一味の協力者', '', '' ],
-    1542: ['エリザベス 麦わらの一味の共犯者', '', '' ],
-    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp', 'Super Usopp' ],
-    1544: ['コアラ 桜色の待ち合わせ', '', 'Sakura Koala' ],
-    1545: ['コアラ 桜色の口元', '', 'Sakura Koala' ],
-    1546: ['ソウルキング', '', 'Brook' ],
-    1547: ['“ソウルキング”ブルック 海賊', '', 'Brook' ],
-    1548: ['テーナ・ゲーナ王国の手長族 “ソウルキング”マネージャー', '', '' ],
-    1549: ['ニコ・ロビン 千紫万紅　花畑', '', 'Mega Robin', 'Super Robin' ],
-    1550: ['フランキー フランキ～～～ロケットランチャ――', '', 'Mega Franky', 'Super Franky' ],
-    1551: ['ブルック 掠り唄　吹雪斬り', '', 'Mega Brook', 'Super Brook' ],
-    1552: ['ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin' ],
-    1553: ['海賊傭兵　ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin' ],
-    1554: ['リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma' ],
-    1555: ['剣豪リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma' ],
-    1556: ['ワダツミ', '', '' ],
-    1557: ['ゼオ', '', '' ],
-    1558: ['イカロス', '', '' ],
-    1559: ['ヒョウゾウ', '', '' ],
-    1560: ['ダルマ', '', '' ],
-    1561: ['ドスン', '', '' ],
-    1562: ['ホーディ・ジョーンズ 暴走', '', '' ],
-    1563: ['“戦う王”エリザベローII世', '', '' ],
-    1564: ['“戦う王”エリザベローII世 プロデンス王国', '', '' ],
-    1565: ['軍師ダガマ', '', '' ],
-    1566: ['軍師ダガマ プロデンス王国', '', '' ],
-    1567: ['ボア・ハンコック 少女戦士', '', 'Kid Boa Hancock' ],
-    1568: ['ボア・ハンコック お姫さまの片鱗', '', 'Kid Boa Hancock' ],
-    1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law' ],
-    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm', 'Dog Storm', 'Doggo Storm' ],
-    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm', 'Dog Storm', 'Doggo Storm' ],
-    1572: ['ワンダ', '', '' ],
-    1573: ['王の鳥　ワンダ', '', '' ],
-    1574: ['シシリアン', '', '' ],
-    1575: ['全力のシシリアン', '', '' ],
-    1576: ['錦えもん ワノ国の侍', '', 'Kin\'emon' ],
-    1577: ['狐火の錦えもん ワノ国の侍', '', 'Kin\'emon' ],
-    1578: ['モモの助', '', '' ],
-    1579: ['モモの助 ワノ国の子', '', '' ],
-    1580: ['トラファルガー・ロー パンクハザードの滞在者', '', '' ],
-    1581: ['トラファルガー・ロー 二人目の救いの神', '', '' ],
-    1582: ['モネ ユキユキの実の雪女', '', '' ],
-    1583: ['オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus' ],
-    1584: ['殺戮支配者オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus' ],
-    1585: ['ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo' ],
-    1586: ['勇士の戦友ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo' ],
-    1587: ['サンジ ヴィンスモーク家　三男', '', '' ],
-    1588: ['サンジ ジェルマ王国　プリンス', '', '' ],
-    1589: ['シャンクス Celebrate the long cruise', '', 'Anniversary Shanks' ],
-    1590: ['赤髪のシャンクス Celebrate the long cruise', '', 'Anniversary Shanks' ],
-    1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa' ],
-    1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa' ],
-    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy', 'Super Luffy' ],
-    1594: ['藤虎 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora' ],
-    1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora' ],
-    1596: ['しらほし', '', '' ],
-    1597: ['しらほし リュウグウ王国王女', '', '' ],
-    1598: ['リュウボシ', '', '' ],
-    1599: ['マンボシ', '', '' ],
-    1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy' ],
-    1601: ['シリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu' ],
-    1602: ['雨のシリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu' ],
-    1603: ['雷卿マクガイ', '', 'Coliseum McGuy', 'Lightning McGuy' ],
-    1604: ['ポートガス・D・エース ルフィの“兄”', '', '0 Stamina Ace' ],
-    1605: ['ポートガス・D・エース 白ひげの“息子”', '', '0 Stamina Ace' ],
-    1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet' ],
-    1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre' ],
-    1608: ['ドクＱ 黒ひげ海賊団', '', '' ],
-    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', '' ],
-    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', '' ],
-    1611: ['バーソロミュー・くま 終わらぬ夢の宿敵', '', '' ],
-    1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', '' ],
-    1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', '' ],
-    1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', '' ],
-    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile' ],
-    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile' ],
-    1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', '' ],
-    1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', '' ],
-    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh' ],
-    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd' ],
-    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd' ],
-    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo' ],
-    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo' ],
-    1624: ['ヒョウゾウ 魚人海賊の用心棒', '', '' ],
-    1625: ['ダルマ 深海の魚人海賊', '', '' ],
-    1626: ['ドスン 深海の魚人海賊', '', '' ],
-    1627: ['マッハ・バイス 超体重人間', '', 'Coliseum Mach Vise', 'Coliseum Machvise' ],
-    1628: ['マッハ・バイス ディアマンテ軍幹部', '', 'Coliseum Mach Vise', 'Coliseum Machvise' ],
-    1629: ['イカロス・ムッヒ 深海の魚人海賊', '', 'Coliseum Ikaros Much' ],
-    1630: ['イカロス・ムッヒ 反逆の魚人海賊', '', 'Coliseum Ikaros Much' ],
-    1631: ['フィッシャー・タイガー', '', 'Secret Fisher Tiger' ],
-    1632: ['フィッシャー・タイガー タイヨウの海賊団船長', '', 'Secret Fisher Tiger' ],
-    1633: ['Ｄｒａｇｏｎ パンクハザード生息', '', '' ],
-    1634: ['ロック＆スコッチ', '', '' ],
-    1635: ['茶ひげ ＰＨ巡回部隊“ボス”', '', '' ],
-    1636: ['シーザー・クラウン 元政府の科学者', '', '' ],
-    1637: ['Ｍ（マスター）・シーザー 元政府の科学者', '', '' ],
-    1638: ['ＰＨガスマスク巡回兵・[力]', '', '' ],
-    1639: ['ＰＨガスマスク巡回兵・[速]', '', '' ],
-    1640: ['ＰＨガスマスク巡回兵・[技]', '', '' ],
-    1641: ['ＰＨガスマスク巡回兵・[知]', '', '' ],
-    1642: ['ＰＨガスマスク巡回兵・[心]', '', '' ],
-    1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', '' ],
-    1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', '' ],
-    1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', '' ],
-    1646: ['ピーカ「改」', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica' ],
-    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica' ],
-    1648: ['ジョーラ 芸術人間', '', 'Jora' ],
-    1649: ['ジョーラ トレーボル軍', '', 'Jora' ],
-    1650: ['ブルック サイケデリックアート', '', '' ],
-    1651: ['ネコマムシ', '', 'Cat Viper', 'Nekopara' ],
-    1652: ['“夜の王”ネコマムシ', '', 'Cat Viper', 'Nekopara' ],
-    1653: ['ペドロ', '', '' ],
-    1654: ['木の上のペドロ', '', '' ],
-    1655: ['キャロット', '', '' ],
-    1656: ['王の鳥　キャロット', '', '' ],
-    1657: ['カン十郎 ワノ国の侍', '', '' ],
-    1658: ['夕立ち　カン十郎 ワノ国の侍', '', '' ],
-    1659: ['雷ぞう', '', '' ],
-    1660: ['霧の雷ぞう', '', '' ],
-    1661: ['コラソン 消したい雨雲', '', '' ],
-    1662: ['コラソン 消える雨音', '', '' ],
-    1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci' ],
-    1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji', 'Secret Kuzan' ],
-    1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji', 'Secret Kuzan' ],
-    1666: ['キュロス 無敗の剣闘士', '', 'Coliseum Kyros' ],
-    1667: ['キュロス リク王軍軍隊長', '', 'Coliseum Kyros' ],
-    1668: ['青キジ「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan' ],
-    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan' ],
-    1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley' ],
-    1671: ['ケイミー マーメイドカフェ', '', '' ],
-    1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug' ],
-    1673: ['ペローナ 暗い浜辺のプリンセス', '', 'Swimsuit Perona', 'Summer Perona' ],
-    1674: ['ペローナ 大胆水着なプリンセス', '', 'Swimsuit Perona', 'Summer Perona' ],
-    1675: ['ロロノア・ゾロ からかさ剣士', '', 'Kimono Zoro' ],
-    1676: ['ロロノア・ゾロ 雨濡れ剣客', '', 'Kimono Zoro' ],
-    1677: ['トラファルガー・ロー 終わらぬ夢の航跡・ハートの海賊団', '', 'Log Law', 'Secret Law' ],
-    1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law' ],
-    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk' ],
-    1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk' ],
-    1681: ['モンキー・D・ルフィ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Luffy' ],
-    1682: ['モンキー・D・ルフィ 20th Anniversary Memorial Treasure', '', '20th Anniversary Luffy' ],
-    1683: ['ニコ・ロビン Celebrate 20th Anniversary Cruise', '', '20th Anniversary Robin' ],
-    1684: ['ニコ・ロビン 20th Anniversary Memorial Treasure', '', '20th Anniversary Robin' ],
-    1685: ['ウソップ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Usopp' ],
-    1686: ['ウソップ 20th Anniversary Memorial Treasure', '', '20th Anniversary Usopp' ],
-    1687: ['フランキー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Franky' ],
-    1688: ['フランキー 20th Anniversary Memorial Treasure', '', '20th Anniversary Franky' ],
-    1689: ['ユースタス・キッド “南の海”出身の超新星', '', 'Fortnight Kidd' ],
-    1690: ['キャプテン・キッド “南の海”出身の超新星', '', 'Fortnight Kidd' ],
-    1691: ['ヒート', '', '' ],
-    1692: ['ワイヤー', '', '' ],
-    1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo' ],
-    1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo' ],
-    1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo' ],
-    1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo' ],
-    1697: ['マゼラン 監獄の支配者', '', '' ],
-    1698: ['マゼラン 地獄の支配者', '', '' ],
+    1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
+    1415: ['センゴク 智将', '', ''],
+    1416: ['仏のセンゴク 智将', '', ''],
+    1417: ['ロンズ', '', 'Lonz'],
+    1418: ['カイゼルヒゲ', '', 'Kaiser Mustache'],
+    1419: ['ロブ・ルッチ 紋付袴の手招き', '', 'Kimono Lucci'],
+    1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci'],
+    1421: ['ディアマンテ はためく旗（フラッグ）人間', '', 'Coliseum Diamante'],
+    1422: ['ディアマンテ ドンキホーテファミリー最高幹部', '', 'Coliseum Diamante'],
+    1423: ['Tボーン 海軍本部大佐', '', 'Coliseum T-Bone'],
+    1424: ['ギン 海賊艦隊　戦闘“総隊長”', '', 'Coliseum Gin'],
+    1425: ['サイ 八宝水軍', '', ''],
+    1426: ['サイ 八宝水軍第１３代棟梁', '', ''],
+    1427: ['ブー 八宝水軍', '', ''],
+    1428: ['ジャン・アンゴ', '', ''],
+    1429: ['マンシェリー ２月の本命', '', 'Valentine Mansherry'],
+    1430: ['マンシェリー ３月への勇気', '', 'Valentine Mansherry'],
+    1431: ['フランキー将軍', '', 'General Franky', 'Raid Franky'],
+    1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky', 'Raid Franky'],
+    1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
+    1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', ''],
+    1435: ['ヒョウゾウ 新魚人海賊団', '', ''],
+    1436: ['ヒョウゾウ 魚人街の亡霊', '', ''],
+    1437: ['イカロス・ムッヒ 新魚人海賊団', '', ''],
+    1438: ['イカロス・ムッヒ 魚人街の亡霊', '', ''],
+    1439: ['ダルマ 新魚人海賊団', '', ''],
+    1440: ['ダルマ 魚人街の亡霊', '', ''],
+    1441: ['ゼオ 新魚人海賊団', '', ''],
+    1442: ['ゼオ 魚人街の亡霊', '', ''],
+    1443: ['ドスン 新魚人海賊団', '', ''],
+    1444: ['ドスン 魚人街の亡霊', '', ''],
+    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock', 'Super Boa Hancock'],
+    1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp', 'Super Usopp'],
+    1447: ['サンジ グリル＝ショット', '', 'Mega Sanji', 'Super Sanji'],
+    1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper', 'Super Chopper'],
+    1449: ['ヴァイオレット 踊り娘', '', 'Viola'],
+    1450: ['ヴァイオレット 追われる女', '', 'Viola'],
+    1451: ['サンジ 恋人通りの変装男', '', ''],
+    1452: ['サンジ となり町までの護衛', '', ''],
+    1453: ['マーガレット １３日の胸騒ぎ', '', 'Valentine Marguerite'],
+    1454: ['マーガレット １４日の記念日', '', 'Valentine Marguerite'],
+    1455: ['首領・チンジャオ 八宝水軍', '', 'Coliseum Don Chinjao'],
+    1456: ['首領・チンジャオ 元八宝水軍第１２代棟梁', '', 'Coliseum Don Chinjao'],
+    1457: ['クラハドール 執事', '', 'Coliseum Kuro'],
+    1458: ['百計のクロ 海賊', '', 'Coliseum Kuro'],
+    1459: ['ミス・バレンタイン キロキロの実の能力者', '', 'Coliseum Miss Valentine'],
+    1460: ['ミス・バレンタイン Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Miss Valentine'],
+    1461: ['ゾロの寒稽古', '', 'Winter Zoro'],
+    1462: ['ルフィのブレイクタイム', '', 'White Day Luffy'],
+    1463: ['ルフィのティーパーティ', '', 'White Day Luffy'],
+    1464: ['チョッパーのブレイクタイム', '', 'White Day Chopper'],
+    1465: ['チョッパーのティーパーティ', '', 'White Day Chopper'],
+    1466: ['キャベンディッシュ 白い日の優男', '', 'White Day Cavendish', 'White Day Cabbage'],
+    1467: ['キャベンディッシュ 白い日の白昼夢', '', 'White Day Cavendish', 'White Day Cabbage'],
+    1468: ['戦桃丸 海兵', '', ''],
+    1469: ['鉞の戦桃丸 海兵', '', ''],
+    1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service'],
+    1471: ['深手の・アルビオン', '', ''],
+    1472: ['しらほし姫', '', ''],
+    1473: ['しらほし姫 リュウグウ王国王女', '', ''],
+    1474: ['ネプチューン', '', ''],
+    1475: ['ネプチューン リュウグウ王国国王', '', ''],
+    1476: ['フカボシ', '', ''],
+    1477: ['フカボシ リュウグウ王国王子', '', ''],
+    1478: ['カリブー カリブー海賊団船長', '', ''],
+    1479: ['濡れ髪のカリブー カリブー海賊団船長', '', ''],
+    1480: ['バンダー・デッケン九世 幽霊船の主', '', ''],
+    1481: ['バンダー・デッケン九世 フライング海賊団船長', '', ''],
+    1482: ['マダム・シャーリー', '', '', 'Madame Shirley'],
+    1483: ['マダム・シャーリー 占い師', '', '', 'Madame Shirley'],
+    1484: ['サンジ 野生の海賊', '', 'Wild Sanji'],
+    1485: ['サンジ 大地の開拓者', '', 'Wild Sanji'],
+    1486: ['イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
+    1487: ['破壊砲　イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
+    1488: ['首領・クリーク 海賊艦隊「提督」', '', 'Coliseum Don Krieg'],
+    1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg'],
+    1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5'],
+    1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5'],
+    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo'],
+    1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', ''],
+    1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
+    1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
+    1496: ['一発必中の砲撃部隊 魚人街の無法者', '', ''],
+    1497: ['一発入魂の砲撃部隊 魚人街の無法者', '', ''],
+    1498: ['赤のアンモナイツ 丈夫な警備隊', '', ''],
+    1499: ['青のアンモナイツ 機敏な警備隊', '', ''],
+    1500: ['緑のアンモナイツ 利発な警備隊', '', ''],
+    1501: ['カリブー', '', ''],
+    1502: ['コリブー', '', ''],
+    1503: ['ハモンド', '', ''],
+    1504: ['バンダー・デッケン九世', '', ''],
+    1505: ['ホーディ・ジョーンズ', '', ''],
+    1506: ['ホーディ・ジョーンズ 覚醒', '', ''],
+    1507: ['サンジのブレイクタイム', '', 'White Day Sanji'],
+    1508: ['サンジのティーパーティ', '', 'White Day Sanji'],
+    1509: ['ハルタ 白ひげ海賊団１２番隊隊長', '', ''],
+    1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', ''],
+    1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', ''],
+    1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', 'Heman'],
+    1513: ['サンジ 春先のお付き添い', '', 'Spring Sanji', 'White Day Sanji'],
+    1514: ['サンジ 記念日の手作り', '', 'Spring Sanji', 'White Day Sanji'],
+    1515: ['ブルックのブレイクタイム', '', 'White Day Brook'],
+    1516: ['ブルックのティーパーティ', '', 'White Day Brook'],
+    1517: ['ハイエナのベラミー 元ベラミー海賊団船長', '', 'Raid Bellamy'],
+    1518: ['ハイエナのベラミー ドレスローザの凶弾', '', 'Raid Bellamy'],
+    1519: ['カーリー・ダダン コルボ山　山賊', '', ''],
+    1520: ['カーリー・ダダン ダダン一家　棟梁', '', ''],
+    1521: ['ドグラ', '', ''],
+    1522: ['ポートガス・D・エース 隠された鬼の子', '', 'Kid Ace'],
+    1523: ['トニートニー・チョッパー フラスコの中の大きな夢', '', 'Spring Chopper', 'Sakura Chopper'],
+    1524: ['トニートニー・チョッパー 冬島に見た春の景色', '', 'Spring Chopper', 'Sakura Chopper'],
+    1525: ['首はねスレイマン ディアス海戦Ａ級戦犯', '', 'Coliseum Suleiman'],
+    1526: ['アーロン アーロン一味船長', '', 'Coliseum Arlong'],
+    1527: ['ノコギリのアーロン アーロン一味船長', '', 'Coliseum Arlong'],
+    1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim'],
+    1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
+    1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
+    1531: ['ウソランド', '', 'God Usopp'],
+    1532: ['ゴッド・ウソップ', '', 'God Usopp'],
+    1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', ''],
+    1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', ''],
+    1535: ['デュバル 麦わらの一味の協力者', '', ''],
+    1536: ['デュバル 麦わらの一味の共犯者', '', ''],
+    1537: ['ヘラクレス 麦わらの一味の協力者', '', ''],
+    1538: ['ヘラクレス 麦わらの一味の共犯者', '', ''],
+    1539: ['ペローナ 麦わらの一味の協力者', '', ''],
+    1540: ['ペローナ 麦わらの一味の共犯者', '', ''],
+    1541: ['エリザベス 麦わらの一味の協力者', '', ''],
+    1542: ['エリザベス 麦わらの一味の共犯者', '', ''],
+    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp', 'Super Usopp'],
+    1544: ['コアラ 桜色の待ち合わせ', '', 'Sakura Koala'],
+    1545: ['コアラ 桜色の口元', '', 'Sakura Koala'],
+    1546: ['ソウルキング', '', 'Brook'],
+    1547: ['“ソウルキング”ブルック 海賊', '', 'Brook'],
+    1548: ['テーナ・ゲーナ王国の手長族 “ソウルキング”マネージャー', '', ''],
+    1549: ['ニコ・ロビン 千紫万紅　花畑', '', 'Mega Robin', 'Super Robin'],
+    1550: ['フランキー フランキ～～～ロケットランチャ――', '', 'Mega Franky', 'Super Franky'],
+    1551: ['ブルック 掠り唄　吹雪斬り', '', 'Mega Brook', 'Super Brook'],
+    1552: ['ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
+    1553: ['海賊傭兵　ハイルディン 「エルバフ」“新時代”の戦士', '', 'Coliseum Hajrudin'],
+    1554: ['リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma'],
+    1555: ['剣豪リューマ 侍の将軍ゾンビ', '', 'Coliseum Ryuma'],
+    1556: ['ワダツミ', '', ''],
+    1557: ['ゼオ', '', ''],
+    1558: ['イカロス', '', ''],
+    1559: ['ヒョウゾウ', '', ''],
+    1560: ['ダルマ', '', ''],
+    1561: ['ドスン', '', ''],
+    1562: ['ホーディ・ジョーンズ 暴走', '', ''],
+    1563: ['“戦う王”エリザベローII世', '', ''],
+    1564: ['“戦う王”エリザベローII世 プロデンス王国', '', ''],
+    1565: ['軍師ダガマ', '', ''],
+    1566: ['軍師ダガマ プロデンス王国', '', ''],
+    1567: ['ボア・ハンコック 少女戦士', '', 'Kid Boa Hancock'],
+    1568: ['ボア・ハンコック お姫さまの片鱗', '', 'Kid Boa Hancock'],
+    1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law'],
+    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
+    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
+    1572: ['ワンダ', '', ''],
+    1573: ['王の鳥　ワンダ', '', ''],
+    1574: ['シシリアン', '', ''],
+    1575: ['全力のシシリアン', '', ''],
+    1576: ['錦えもん ワノ国の侍', '', 'Kin\'emon'],
+    1577: ['狐火の錦えもん ワノ国の侍', '', 'Kin\'emon'],
+    1578: ['モモの助', '', ''],
+    1579: ['モモの助 ワノ国の子', '', ''],
+    1580: ['トラファルガー・ロー パンクハザードの滞在者', '', ''],
+    1581: ['トラファルガー・ロー 二人目の救いの神', '', ''],
+    1582: ['モネ ユキユキの実の雪女', '', ''],
+    1583: ['オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus'],
+    1584: ['殺戮支配者オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus'],
+    1585: ['ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
+    1586: ['勇士の戦友ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
+    1587: ['サンジ ヴィンスモーク家　三男', '', ''],
+    1588: ['サンジ ジェルマ王国　プリンス', '', ''],
+    1589: ['シャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
+    1590: ['赤髪のシャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
+    1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
+    1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
+    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy', 'Super Luffy'],
+    1594: ['藤虎 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
+    1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
+    1596: ['しらほし', '', ''],
+    1597: ['しらほし リュウグウ王国王女', '', ''],
+    1598: ['リュウボシ', '', ''],
+    1599: ['マンボシ', '', ''],
+    1600: ['モンキー・D・ルフィ 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Luffy'],
+    1601: ['シリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
+    1602: ['雨のシリュウ 黒ひげ海賊団', '', 'Coliseum Shiryu'],
+    1603: ['雷卿マクガイ', '', 'Coliseum McGuy', 'Lightning McGuy'],
+    1604: ['ポートガス・D・エース ルフィの“兄”', '', '0 Stamina Ace'],
+    1605: ['ポートガス・D・エース 白ひげの“息子”', '', '0 Stamina Ace'],
+    1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet'],
+    1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre'],
+    1608: ['ドクＱ 黒ひげ海賊団', '', ''],
+    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', ''],
+    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', ''],
+    1611: ['バーソロミュー・くま 終わらぬ夢の宿敵', '', ''],
+    1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
+    1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
+    1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', ''],
+    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile'],
+    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile'],
+    1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
+    1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
+    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
+    1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
+    1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
+    1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],
+    1623: ['ドンキホーテ・ドフラミンゴ「改」 王下七武海', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],
+    1624: ['ヒョウゾウ 魚人海賊の用心棒', '', ''],
+    1625: ['ダルマ 深海の魚人海賊', '', ''],
+    1626: ['ドスン 深海の魚人海賊', '', ''],
+    1627: ['マッハ・バイス 超体重人間', '', 'Coliseum Mach Vise', 'Coliseum Machvise'],
+    1628: ['マッハ・バイス ディアマンテ軍幹部', '', 'Coliseum Mach Vise', 'Coliseum Machvise'],
+    1629: ['イカロス・ムッヒ 深海の魚人海賊', '', 'Coliseum Ikaros Much'],
+    1630: ['イカロス・ムッヒ 反逆の魚人海賊', '', 'Coliseum Ikaros Much'],
+    1631: ['フィッシャー・タイガー', '', 'Secret Fisher Tiger'],
+    1632: ['フィッシャー・タイガー タイヨウの海賊団船長', '', 'Secret Fisher Tiger'],
+    1633: ['Ｄｒａｇｏｎ パンクハザード生息', '', ''],
+    1634: ['ロック＆スコッチ', '', ''],
+    1635: ['茶ひげ ＰＨ巡回部隊“ボス”', '', ''],
+    1636: ['シーザー・クラウン 元政府の科学者', '', ''],
+    1637: ['Ｍ（マスター）・シーザー 元政府の科学者', '', ''],
+    1638: ['ＰＨガスマスク巡回兵・[力]', '', ''],
+    1639: ['ＰＨガスマスク巡回兵・[速]', '', ''],
+    1640: ['ＰＨガスマスク巡回兵・[技]', '', ''],
+    1641: ['ＰＨガスマスク巡回兵・[知]', '', ''],
+    1642: ['ＰＨガスマスク巡回兵・[心]', '', ''],
+    1643: ['剛脚のケンタウロス ＰＨ巡回部隊隊員', '', ''],
+    1644: ['快足のケンタウロス ＰＨ巡回部隊隊員', '', ''],
+    1645: ['足業のケンタウロス ＰＨ巡回部隊隊員', '', ''],
+    1646: ['ピーカ「改」', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica'],
+    1647: ['ピーカ「改」 ドンキホーテ海賊団', '', 'Kai Pica', 'STR Pica', 'Neo Pica', 'Raid Pica'],
+    1648: ['ジョーラ 芸術人間', '', 'Jora'],
+    1649: ['ジョーラ トレーボル軍', '', 'Jora'],
+    1650: ['ブルック サイケデリックアート', '', ''],
+    1651: ['ネコマムシ', '', 'Cat Viper', 'Nekopara'],
+    1652: ['“夜の王”ネコマムシ', '', 'Cat Viper', 'Nekopara'],
+    1653: ['ペドロ', '', ''],
+    1654: ['木の上のペドロ', '', ''],
+    1655: ['キャロット', '', ''],
+    1656: ['王の鳥　キャロット', '', ''],
+    1657: ['カン十郎 ワノ国の侍', '', ''],
+    1658: ['夕立ち　カン十郎 ワノ国の侍', '', ''],
+    1659: ['雷ぞう', '', ''],
+    1660: ['霧の雷ぞう', '', ''],
+    1661: ['コラソン 消したい雨雲', '', ''],
+    1662: ['コラソン 消える雨音', '', ''],
+    1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci'],
+    1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji', 'Secret Kuzan'],
+    1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji', 'Secret Kuzan'],
+    1666: ['キュロス 無敗の剣闘士', '', 'Coliseum Kyros'],
+    1667: ['キュロス リク王軍軍隊長', '', 'Coliseum Kyros'],
+    1668: ['青キジ「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan'],
+    1669: ['青キジ　氷結人間「改」', '', 'Kai Aokiji', 'Kai Kuzan', 'Raid Aokiji', 'Raid Kuzan', 'Neo Aokiji', 'Neo Kuzan'],
+    1670: ['マダム・シャーリー マーメイドカフェ　店長', '', 'Madame Shirley'],
+    1671: ['ケイミー マーメイドカフェ', '', ''],
+    1672: ['パッパグ “クリミナルブランド社”社長兼超人気セレブデザイナー', '', 'Pappug'],
+    1673: ['ペローナ 暗い浜辺のプリンセス', '', 'Swimsuit Perona', 'Summer Perona'],
+    1674: ['ペローナ 大胆水着なプリンセス', '', 'Swimsuit Perona', 'Summer Perona'],
+    1675: ['ロロノア・ゾロ からかさ剣士', '', 'Kimono Zoro'],
+    1676: ['ロロノア・ゾロ 雨濡れ剣客', '', 'Kimono Zoro'],
+    1677: ['トラファルガー・ロー 終わらぬ夢の航跡・ハートの海賊団', '', 'Log Law', 'Secret Law'],
+    1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law'],
+    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
+    1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
+    1681: ['モンキー・D・ルフィ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Luffy'],
+    1682: ['モンキー・D・ルフィ 20th Anniversary Memorial Treasure', '', '20th Anniversary Luffy'],
+    1683: ['ニコ・ロビン Celebrate 20th Anniversary Cruise', '', '20th Anniversary Robin'],
+    1684: ['ニコ・ロビン 20th Anniversary Memorial Treasure', '', '20th Anniversary Robin'],
+    1685: ['ウソップ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Usopp'],
+    1686: ['ウソップ 20th Anniversary Memorial Treasure', '', '20th Anniversary Usopp'],
+    1687: ['フランキー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Franky'],
+    1688: ['フランキー 20th Anniversary Memorial Treasure', '', '20th Anniversary Franky'],
+    1689: ['ユースタス・キッド “南の海”出身の超新星', '', 'Fortnight Kidd'],
+    1690: ['キャプテン・キッド “南の海”出身の超新星', '', 'Fortnight Kidd'],
+    1691: ['ヒート', '', ''],
+    1692: ['ワイヤー', '', ''],
+    1693: ['イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
+    1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
+    1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo'],
+    1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo'],
+    1697: ['マゼラン 監獄の支配者', '', ''],
+    1698: ['マゼラン 地獄の支配者', '', ''],
     1699: ['ジンベエ “無限地獄”の囚人', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
     1700: ['ジンベエ “地獄”の七武海', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
-    1701: ['エンポリオ・イワンコフ “ニューカマーランド”の囚人', '', '' ],
-    1702: ['エンポリオ・イワンコフ “地獄”の革命家', '', '' ],
-    1703: ['ハンニャバル 支配者の腹心', '', '' ],
-    1704: ['ハンニャバル 今は支配者の腹心', '', '' ],
-    1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', '' ],
-    1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', '' ],
-    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks' ],
-    1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami' ],
-    1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami' ],
-    1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin' ],
-    1711: ['ニコ・ロビン 文化の象徴', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin' ],
-    1712: ['赤犬 頂上戦争の火蓋', '', 'Secret Akainu' ],
-    1713: ['赤犬 頂上戦争の業火', '', 'Secret Akainu' ],
-    1714: ['モネ 氷雪の化身', '', '' ],
-    1715: ['ヴェルゴ 海軍「Ｇ‐５」基地長', '', '' ],
-    1716: ['シーザー・クラウン 死の国の王', '', '' ],
-    1717: ['ベガパンクの竜（小型）', '', '' ],
-    1718: ['バッファロー ドンキホーテ海賊団　戦闘員', '', '' ],
-    1719: ['ベビー５ ドンキホーテ海賊団　使用人兼殺し屋', '', '' ],
-    1720: ['ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe' ],
-    1721: ['“親分”ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe' ],
-    1722: ['海神ネプチューン', '', '' ],
-    1723: ['海神ネプチューン リュウグウ王国国王', '', '' ],
-    1724: ['フカボシ ネプチューン家三兄弟　長男', '', '' ],
-    1725: ['フカボシ 王国軍三強', '', '' ],
-    1726: ['サボ「改」 竜の爪', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo' ],
-    1727: ['サボ「改」 革命軍参謀総長', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo' ],
-    1728: ['たしぎ ビーチの大佐', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi' ],
-    1729: ['たしぎ バカンスの大佐ちゃん', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi' ],
-    1730: ['ネフェルタリ・ビビ 眩しい純白', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi' ],
-    1731: ['ネフェルタリ・ビビ 魅惑の透明感', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi' ],
-    1732: ['', '', 'Nekopara', 'Coliseum Nekomamushi' ],
-    1733: ['', '', 'Nekopara', 'Coliseum Nekomamushi' ],
-    1734: ['シュガー ホビホビの実の能力者', '', '' ],
-    1735: ['シュガー トレーボル軍　特別幹部', '', '' ],
-    1736: ['トレーボル ベタベタの実の能力者', '', '' ],
-    1737: ['トレーボル ドンキホーテファミリー最高幹部', '', '' ],
-    1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy' ],
-    1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy' ],
-    1740: ['ボア・サンダーソニア 麦わらのルフィの協力者', '', '' ],
-    1741: ['ボア・サンダーソニア 麦わらのルフィの共犯者', '', '' ],
-    1742: ['ボア・マリーゴールド 麦わらのルフィの協力者', '', '' ],
-    1743: ['ボア・マリーゴールド 麦わらのルフィの共犯者', '', '' ],
-    1744: ['マーガレット 麦わらのルフィの協力者', '', '' ],
-    1745: ['マーガレット 麦わらのルフィの共犯者', '', '' ],
-    1746: ['ボア・ハンコック 麦わらのルフィの協力者', '', 'Korea Boa' ],
-    1747: ['ボア・ハンコック 麦わらのルフィの共犯者', '', 'Korea Boa' ],
-    1748: ['ベポ 麦わらのルフィの協力者', '', '' ],
-    1749: ['ベポ 麦わらのルフィの共犯者', '', '' ],
-    1750: ['“死の外科医”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law' ],
-    1751: ['“王下七武海”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law' ],
-    1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro' ],
-    1753: ['ロロノア・ゾロ 20th Anniversary Memorial Treasure', '', '20th Anniversary Zoro' ],
-    1754: ['サンジ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Sanji' ],
-    1755: ['サンジ 20th Anniversary Memorial Treasure', '', '20th Anniversary Sanji' ],
-    1756: ['ナミ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Nami' ],
-    1757: ['ナミ 20th Anniversary Memorial Treasure', '', '20th Anniversary Nami' ],
-    1758: ['ブルック Celebrate 20th Anniversary Cruise', '', '20th Anniversary Brook' ],
-    1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook' ],
-    1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper' ],
-    1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper' ],
-    1762: ['ロブ・ルッチ 世界政府の怪物', '', 'Rob Lucci' ],
-    1763: ['ルッチ　獣人 世界政府の怪物', '', 'Rob Lucci' ],
-    1764: ['クザン 元海軍本部最高戦力', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan' ],
-    1765: ['足長族　ブルーギリー', '', '' ],
-    1766: ['足長族　ブルーギリー 脚功道格闘家', '', '' ],
-    1767: ['殺し屋　ファンク兄弟', '', '' ],
-    1768: ['アブドーラ＆ジェット 凶悪犯罪者', '', '' ],
-    1769: ['ベン・ベックマン 赤髪海賊団副船長', '', 'Secret Benn Beckman', 'Secret Ben Beckman' ],
-    1770: ['ベン・ベックマン “四皇”赤髪の右腕', '', 'Secret Benn Beckman', 'Secret Ben Beckman' ],
-    1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma' ],
-    1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma' ],
-    1773: ['“侍”　錦えもん', '', 'Kin\'emon' ],
-    1774: ['“侍”　狐火の錦えもん', '', 'Kin\'emon' ],
-    1775: ['“侍”　モモの助', '', '' ],
-    1776: ['“龍”　モモの助', '', '' ],
-    1777: ['黄猿 聖地からの使者', '', 'Secret Kizaru', 'Secret Borsalino' ],
-    1778: ['黄猿 聖地からの光臨', '', 'Secret Kizaru', 'Secret Borsalino' ],
-    1779: ['黄猿「改」', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino' ],
-    1780: ['黄猿「改」　光人間', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino' ],
-    1781: ['闘魚', '', '' ],
-    1782: ['首領・チンジャオ チンジャオファミリー', '', '' ],
-    1783: ['ハイルディン 巨人傭兵', '', '' ],
-    1784: ['藤虎 海軍本部大将', '', '' ],
-    1785: ['スパルタン', '', '' ],
-    1786: ['ドンキホーテ海賊団構成員 格闘部隊下級兵', '', '' ],
-    1787: ['ドンキホーテ海賊団構成員 特攻部隊下級兵', '', '' ],
-    1788: ['ドンキホーテ海賊団構成員 特殊部隊下級兵', '', '' ],
-    1789: ['ドンキホーテ海賊団構成員 偵察部隊下級兵', '', '' ],
-    1790: ['ドンキホーテ海賊団構成員 諜報部隊下級兵', '', '' ],
-    1791: ['ルーシー コリーダコロシアムＣブロックの謎の剣闘士', '', 'Luffy', 'Coliseum Luffy', 'Coliseum Lucy' ],
-    1792: ['ルーシー コリーダコロシアムＣブロックの風雲児', '', 'Luffy', 'Coliseum Luffy', 'Coliseum Lucy' ],
-    1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo' ],
-    1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo' ],
-    1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', '' ],
-    1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', '' ],
-    1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', '' ],
-    1798: ['ジーザス・バージェス 鳥カゴの中の暗躍者', '', '' ],
-    1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', '' ],
-    1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', '' ],
-    1801: ['バルトロメオ コリーダコロシアムＢブロックの“人食い”', '', '' ],
-    1802: ['バルトロメオ 鳥カゴの中の反逆者', '', '' ],
-    1803: ['', '', '' ],
-    1804: ['', '', '' ],
-    1805: ['', '', '' ],
-    1806: ['', '', '' ],
-    1807: ['', '', '' ],
-    1808: ['', '', '' ],
-    1809: ['ワンダ モコモ公国', '', '' ],
-    1810: ['王の鳥　ワンダ モコモ公国', '', '' ],
-    1811: ['キャロット モコモ公国', '', '' ],
-    1812: ['王の鳥　キャロット モコモ公国', '', '' ],
-    1813: ['コアラ 極秘任務の革命軍', '', '' ],
-    1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji' ],
-    1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji' ],
-    1816: ['ポートガス・D・エース 闇討つ太陽', '', '' ],
-    1817: ['', '', '' ],
-    1818: ['', '', '' ],
-    1819: ['', '', '' ],
-    1820: ['', '', '' ],
-    1821: ['', '', 'Husbando Sanji' ],
-    1822: ['', '', 'Husbando Sanji' ],
-    1823: ['', '', '' ],
-    1824: ['', '', '' ],
-    1825: ['', '', '' ],
-    1826: ['', '', '' ],
-    1827: ['', '', '' ],
-    1828: ['', '', '' ],
-    1829: ['', '', '' ],
-    1830: ['', '', '' ],
+    1701: ['エンポリオ・イワンコフ “ニューカマーランド”の囚人', '', ''],
+    1702: ['エンポリオ・イワンコフ “地獄”の革命家', '', ''],
+    1703: ['ハンニャバル 支配者の腹心', '', ''],
+    1704: ['ハンニャバル 今は支配者の腹心', '', ''],
+    1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', ''],
+    1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', ''],
+    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks'],
+    1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
+    1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
+    1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
+    1711: ['ニコ・ロビン 文化の象徴', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
+    1712: ['赤犬 頂上戦争の火蓋', '', 'Secret Akainu'],
+    1713: ['赤犬 頂上戦争の業火', '', 'Secret Akainu'],
+    1714: ['モネ 氷雪の化身', '', ''],
+    1715: ['ヴェルゴ 海軍「Ｇ‐５」基地長', '', ''],
+    1716: ['シーザー・クラウン 死の国の王', '', ''],
+    1717: ['ベガパンクの竜（小型）', '', ''],
+    1718: ['バッファロー ドンキホーテ海賊団　戦闘員', '', ''],
+    1719: ['ベビー５ ドンキホーテ海賊団　使用人兼殺し屋', '', ''],
+    1720: ['ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
+    1721: ['“親分”ジンベエ リュウグウ王国ネプチューン軍兵士', '', 'Secret Jinbe', 'Secret Jimbe', 'Young Jinbe', 'Young Jimbe'],
+    1722: ['海神ネプチューン', '', ''],
+    1723: ['海神ネプチューン リュウグウ王国国王', '', ''],
+    1724: ['フカボシ ネプチューン家三兄弟　長男', '', ''],
+    1725: ['フカボシ 王国軍三強', '', ''],
+    1726: ['サボ「改」 竜の爪', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo'],
+    1727: ['サボ「改」 革命軍参謀総長', '', 'Kai Sabo', 'Neo Sabo', 'Raid Sabo'],
+    1728: ['たしぎ ビーチの大佐', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
+    1729: ['たしぎ バカンスの大佐ちゃん', '', 'Summertime Tashigi', 'Swimsuit Tashigi', 'Summer Tashigi'],
+    1730: ['ネフェルタリ・ビビ 眩しい純白', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
+    1731: ['ネフェルタリ・ビビ 魅惑の透明感', '', 'Summertime Vivi', 'Swimsuit Vivi', 'Summer Vivi', 'Secret Vivi'],
+    1732: ['', '', 'Nekopara', 'Coliseum Nekomamushi'],
+    1733: ['', '', 'Nekopara', 'Coliseum Nekomamushi'],
+    1734: ['シュガー ホビホビの実の能力者', '', ''],
+    1735: ['シュガー トレーボル軍　特別幹部', '', ''],
+    1736: ['トレーボル ベタベタの実の能力者', '', ''],
+    1737: ['トレーボル ドンキホーテファミリー最高幹部', '', ''],
+    1738: ['ハイエナのベラミー「改」 元ベラミー海賊団船長', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy'],
+    1739: ['ハイエナのベラミー「改」 ドレスローザの凶弾', '', 'Neo Bellamy', 'Kai Bellamy', 'Raid Bellamy'],
+    1740: ['ボア・サンダーソニア 麦わらのルフィの協力者', '', ''],
+    1741: ['ボア・サンダーソニア 麦わらのルフィの共犯者', '', ''],
+    1742: ['ボア・マリーゴールド 麦わらのルフィの協力者', '', ''],
+    1743: ['ボア・マリーゴールド 麦わらのルフィの共犯者', '', ''],
+    1744: ['マーガレット 麦わらのルフィの協力者', '', ''],
+    1745: ['マーガレット 麦わらのルフィの共犯者', '', ''],
+    1746: ['ボア・ハンコック 麦わらのルフィの協力者', '', 'Korea Boa'],
+    1747: ['ボア・ハンコック 麦わらのルフィの共犯者', '', 'Korea Boa'],
+    1748: ['ベポ 麦わらのルフィの協力者', '', ''],
+    1749: ['ベポ 麦わらのルフィの共犯者', '', ''],
+    1750: ['“死の外科医”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
+    1751: ['“王下七武海”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
+    1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro'],
+    1753: ['ロロノア・ゾロ 20th Anniversary Memorial Treasure', '', '20th Anniversary Zoro'],
+    1754: ['サンジ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Sanji'],
+    1755: ['サンジ 20th Anniversary Memorial Treasure', '', '20th Anniversary Sanji'],
+    1756: ['ナミ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Nami'],
+    1757: ['ナミ 20th Anniversary Memorial Treasure', '', '20th Anniversary Nami'],
+    1758: ['ブルック Celebrate 20th Anniversary Cruise', '', '20th Anniversary Brook'],
+    1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook'],
+    1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper'],
+    1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper'],
+    1762: ['ロブ・ルッチ 世界政府の怪物', '', 'Rob Lucci'],
+    1763: ['ルッチ　獣人 世界政府の怪物', '', 'Rob Lucci'],
+    1764: ['クザン 元海軍本部最高戦力', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
+    1765: ['足長族　ブルーギリー', '', ''],
+    1766: ['足長族　ブルーギリー 脚功道格闘家', '', ''],
+    1767: ['殺し屋　ファンク兄弟', '', ''],
+    1768: ['アブドーラ＆ジェット 凶悪犯罪者', '', ''],
+    1769: ['ベン・ベックマン 赤髪海賊団副船長', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
+    1770: ['ベン・ベックマン “四皇”赤髪の右腕', '', 'Secret Benn Beckman', 'Secret Ben Beckman'],
+    1771: ['暴君バーソロミュー・くま「改」', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
+    1772: ['暴君バーソロミュー・くま「改」 政府の人間兵器', '', 'Neo Bartholomew Kuma', 'Neo Kuma', 'Kai Bartholomew Kuma', 'Kai Kuma', 'Raid Bartholomew Kuma', 'Raid Kuma'],
+    1773: ['“侍”　錦えもん', '', 'Kin\'emon'],
+    1774: ['“侍”　狐火の錦えもん', '', 'Kin\'emon'],
+    1775: ['“侍”　モモの助', '', ''],
+    1776: ['“龍”　モモの助', '', ''],
+    1777: ['黄猿 聖地からの使者', '', 'Secret Kizaru', 'Secret Borsalino'],
+    1778: ['黄猿 聖地からの光臨', '', 'Secret Kizaru', 'Secret Borsalino'],
+    1779: ['黄猿「改」', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
+    1780: ['黄猿「改」　光人間', '', 'Neo Kizaru', 'Neo Borsalino', 'Kai Kizaru', 'Kai Borsalino', 'Raid Kizaru', 'Raid Borsalino'],
+    1781: ['闘魚', '', ''],
+    1782: ['首領・チンジャオ チンジャオファミリー', '', ''],
+    1783: ['ハイルディン 巨人傭兵', '', ''],
+    1784: ['藤虎 海軍本部大将', '', ''],
+    1785: ['スパルタン', '', ''],
+    1786: ['ドンキホーテ海賊団構成員 格闘部隊下級兵', '', ''],
+    1787: ['ドンキホーテ海賊団構成員 特攻部隊下級兵', '', ''],
+    1788: ['ドンキホーテ海賊団構成員 特殊部隊下級兵', '', ''],
+    1789: ['ドンキホーテ海賊団構成員 偵察部隊下級兵', '', ''],
+    1790: ['ドンキホーテ海賊団構成員 諜報部隊下級兵', '', ''],
+    1791: ['ルーシー コリーダコロシアムＣブロックの謎の剣闘士', '', 'Luffy', 'Coliseum Luffy', 'Coliseum Lucy'],
+    1792: ['ルーシー コリーダコロシアムＣブロックの風雲児', '', 'Luffy', 'Coliseum Luffy', 'Coliseum Lucy'],
+    1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo'],
+    1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo'],
+    1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', ''],
+    1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', ''],
+    1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', ''],
+    1798: ['ジーザス・バージェス 鳥カゴの中の暗躍者', '', ''],
+    1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', ''],
+    1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', ''],
+    1801: ['バルトロメオ コリーダコロシアムＢブロックの“人食い”', '', ''],
+    1802: ['バルトロメオ 鳥カゴの中の反逆者', '', ''],
+    1803: ['', '', ''],
+    1804: ['', '', ''],
+    1805: ['', '', ''],
+    1806: ['', '', ''],
+    1807: ['', '', ''],
+    1808: ['', '', ''],
+    1809: ['ワンダ モコモ公国', '', ''],
+    1810: ['王の鳥　ワンダ モコモ公国', '', ''],
+    1811: ['キャロット モコモ公国', '', ''],
+    1812: ['王の鳥　キャロット モコモ公国', '', ''],
+    1813: ['コアラ 極秘任務の革命軍', '', ''],
+    1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji'],
+    1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji'],
+    1816: ['ポートガス・D・エース 闇討つ太陽', '', ''],
+    1817: ['', '', ''],
+    1818: ['', '', ''],
+    1819: ['', '', ''],
+    1820: ['', '', ''],
+    1821: ['', '', 'Husbando Sanji'],
+    1822: ['', '', 'Husbando Sanji'],
+    1823: ['', '', ''],
+    1824: ['', '', ''],
+    1825: ['', '', ''],
+    1826: ['', '', ''],
+    1827: ['', '', ''],
+    1828: ['', '', ''],
+    1829: ['', '', ''],
+    1830: ['', '', ''],
 };
 
-//  xxxx: ['JPN', 'FR', 'Other' ],
+//  xxxx: ['JPN', 'FR', 'Other'],

From 519706d7f62904c1165eac93c00b344b1fc44c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Sun, 15 Oct 2017 01:07:02 +0200
Subject: [PATCH 1397/1569] Sandersonia defense reduction

---
 common/data/details.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6779d2d1c..b8951235d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11366,13 +11366,13 @@ window.details = {
     },
     1740: {//Sandersonia
         captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [DEX] characters by 1.1x",
-        special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by ???% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
+        special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by 80% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
         specialName: "Snake Hair Possession: Eight-Headed Serpent",
     },
     1741: {//Sandersonia
         captain: "Boosts ATK of Striker and Powerhouse characters by 2.5x and boosts HP of [DEX] characters by 1.3x",
-        special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by ???% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
+        special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by 80% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
         specialName: "Snake Hair Possession: Eight-Headed Serpent",
         limit: [
@@ -12629,4 +12629,4 @@ window.details = {
         specialName: "Sanji Special",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
-};
\ No newline at end of file
+};

From 5157ab2774cc0cd392e1c93c27b68766266e9fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Sun, 15 Oct 2017 01:15:20 +0200
Subject: [PATCH 1398/1569] Added extra Alias to Log Croc + 6*+ stuff

---
 common/data/aliases.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 9ba820180..6efab5851 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1613,8 +1613,8 @@ window.aliases = {
     1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
     1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
     1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', ''],
-    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile'],
-    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile'],
+    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile', 'MrUtopia'],
+    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile', 'MrUtopia'],
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
     1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
@@ -1705,7 +1705,7 @@ window.aliases = {
     1704: ['ハンニャバル 今は支配者の腹心', '', ''],
     1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', ''],
     1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', ''],
-    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks'],
+    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks', 'SW Shanks'],
     1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
@@ -1814,7 +1814,7 @@ window.aliases = {
     1813: ['コアラ 極秘任務の革命軍', '', ''],
     1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji'],
     1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji'],
-    1816: ['ポートガス・D・エース 闇討つ太陽', '', ''],
+    1816: ['ポートガス・D・エース 闇討つ太陽', '', 'Super Ace', 'Mega Ace', 'SW Ace'],
     1817: ['', '', ''],
     1818: ['', '', ''],
     1819: ['', '', ''],

From 6568dcbb327e1f384c3a450e7b5c9b0e7a295268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Sun, 15 Oct 2017 01:32:46 +0200
Subject: [PATCH 1399/1569] Aliases for "Mr." into "Mr" for easier search

Kept Mr. tho
---
 common/data/aliases.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6efab5851..afccd89aa 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -231,8 +231,8 @@ window.aliases = {
     230: ['両鉄拳のフルボディ',''],
     231: ['ヒナ',''],
     232: ['黒檻のヒナ',''],
-    233: ['Mr.8','','mr 8'],
-    234: ['Mr.8 イガラッパッパ','','mr 8'],
+    233: ['Mr.8','','Mr 8'],
+    234: ['Mr.8 イガラッパッパ','','Mr 8'],
     235: ['ミス・マンデー',''],
     236: ['ミス・マンデー カ・イ・リ・キ メリケン',''],
     237: ['ナックルミリオンズ バロックワークス',''],
@@ -399,7 +399,7 @@ window.aliases = {
     398: ['Mr.4と犬銃ラッスー','','Mr 4 and Lassoo the Dog-Gun'],
     399: ['ミス・ダブルフィンガー',''],
     400: ['ミス・ダブルフィンガー 棘（とげ）人間',''],
-    401: ['Mr.1','','mr 1','Daz Bones'],
+    401: ['Mr.1','','Mr 1','Daz Bones'],
     402: ['Mr.1 全身刃物人間','','Mr 1','Daz Bones'],
     403: ['レベッカ',''],
     404: ['アブサロム',''],
@@ -458,7 +458,7 @@ window.aliases = {
     457: ['重火器使いのクリエル',''],
     458: ['センゴク',''],
     459: ['仏のセンゴク',''],
-    460: ['犯罪者ギャルディーノ Mr.3','Mr 3',''],
+    460: ['犯罪者ギャルディーノ Mr.3','','Mr 3'],
     461: ['脱走者ベンサム Mr.2・ボン・クレー','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
     462: ['脱獄名人ベンサム Mr.2・ボン・クレー','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
     463: ['サトリ',''],
@@ -575,8 +575,8 @@ window.aliases = {
     574: ['青キジ','','Raid Kuzan', 'Raid Aokiji' ],
     575: ['青キジ　氷結人間','','Raid Kuzan', 'Raid Aokiji' ],
     576: ['ナミのティータイム',''],
-    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy' ],
-    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy' ],
+    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy', 'LL' ],
+    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy', 'LL' ],
     579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro', 'Roronoa Zoro, Wakes of the Endless Dream, Straw Hat Crew' ],
     580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro', 'Roronoa Zoro, A Vow in the Great Age of Pirates - Master Swordsman' ],
     581: ['ゲンボウ',''],
@@ -799,8 +799,8 @@ window.aliases = {
     798: ['クンフージュゴン 海獣海賊団',''],
     799: ['シーラパーン 海獣海賊団','', 'Sea Lapahn, Sea Animal Pirates', 'Sea Lapan, Sea Animal Pirates', 'Sea Rapan, Sea Animal Pirates' ],
     800: ['たこボクサー 海獣海賊団',''],
-    801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','mr 2' ],
-    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'mr 2' ],
+    801: ['Mr.2・ボン・クレー 航海の記録・B・W','', 'Log Bon Clay', 'Log Bonclay','Mr 2' ],
+    802: ['Mr.2・ボン・クレー 航海の生き様「おかま道」','', 'Log Bon Clay', 'Log Bonclay', 'Mr 2' ],
     803: ['ヒナ 海軍本部大佐','','Coliseum Hina'],
     804: ['黒檻のヒナ 海軍本部大佐','','Coliseum Hina'],
     805: ['スモーカー 海軍本部大佐','','Coliseum Smoker'],
@@ -884,7 +884,7 @@ window.aliases = {
     883: ['ドリー 巨兵海賊団','','Coliseum Dorry'],
     884: ['青鬼のドリー','','Coliseum Dorry'],
     885: ['ジンベエ 鮫の武人','', 'Kimono Jinbe', 'Kimono Jimbei', 'Kimono Jinbei' ],
-    886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','daz bones' ],
+    886: ['Mr.1 西の海の剣客','', 'Kimono Mr. 1', 'Kimono Mr 1','Daz Bones' ],
     887: ['バギー 陽気なかぶき者','', 'Kimono Buggy', 'Baggy'],
     888: ['ホロホロゴースト',''],
     889: ['ペローナ スリラーバークの怪人',''],
@@ -1118,8 +1118,8 @@ window.aliases = {
     1117: [ 'サンジ 信念に生きる麦わらの一味', 'New Strong World Sanji', 'SW Sanji' ],
     1118: [ 'ナミ 夢を追い求める冒険者', 'New Strong World Nami', 'SW Nami' ],
     1119: [ 'ナミ 信念に生きる麦わらの一味', 'New Strong World Nami', 'SW Nami' ],
-    1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy' ],
-    1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy' ],
+    1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy', 'Logfy', 'LL' ],
+    1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy', 'Logfy', 'LL' ],
     1122: [ 'キャベンディッシュ', '','Hakuba', 'Cabbage' ],
     1123: [ '白馬のキャベンディッシュ', '','Hakuba', 'Cabbage' ],
     1124: ['スレイマン',''],
@@ -1488,8 +1488,8 @@ window.aliases = {
     1487: ['破壊砲　イデオ ＸＸＸ級ボクサー', '', 'Coliseum Ideo'],
     1488: ['首領・クリーク 海賊艦隊「提督」', '', 'Coliseum Don Krieg'],
     1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg'],
-    1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5'],
-    1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5'],
+    1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5', 'Mr 5'],
+    1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5', 'Mr 5'],
     1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo'],
     1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', ''],
     1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
@@ -1613,8 +1613,8 @@ window.aliases = {
     1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
     1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
     1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', ''],
-    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile', 'MrUtopia'],
-    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile', 'MrUtopia'],
+    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile', 'MrUtopia', 'Mr 0'],
+    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile', 'MrUtopia', 'Mr 0'],
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
     1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
@@ -1703,8 +1703,8 @@ window.aliases = {
     1702: ['エンポリオ・イワンコフ “地獄”の革命家', '', ''],
     1703: ['ハンニャバル 支配者の腹心', '', ''],
     1704: ['ハンニャバル 今は支配者の腹心', '', ''],
-    1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', ''],
-    1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', ''],
+    1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', 'Mr 2'],
+    1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', 'Mr 2'],
     1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks', 'SW Shanks'],
     1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
@@ -1793,8 +1793,8 @@ window.aliases = {
     1792: ['ルーシー コリーダコロシアムＣブロックの風雲児', '', 'Luffy'],
     1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo'],
     1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo'],
-    1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', ''],
-    1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', ''],
+    1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', 'Mr Diamante'],
+    1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', 'Mr Diamante'],
     1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', ''],
     1798: ['ジーザス・バージェス 鳥カゴの中の暗躍者', '', ''],
     1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', ''],

From 4b39be5737d926ea7984685e62eb34180d87787a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Sun, 15 Oct 2017 01:46:40 +0200
Subject: [PATCH 1400/1569] Added full name to ray

Speed Jil int added Jiru like RR one
---
 common/data/aliases.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index afccd89aa..6b458f6cd 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -364,8 +364,8 @@ window.aliases = {
     363: ['大喰らい ジュエリー・ボニー','','Supernova'],
     364: ['カポネ・ベッジ','','Supernova'],
     365: ['カポネ・ギャング・ベッジ','','Supernova'],
-    366: ['シルバーズ・レイリー',''],
-    367: ['冥王レイリー',''],
+    366: ['シルバーズ・レイリー','', 'Silvers Rayleigh'],
+    367: ['冥王レイリー','', 'Silvers Rayleigh'],
     368: ['巨人斬撃隊 レッドパイレーツ',''],
     369: ['巨人射撃隊 ブルーパイレーツ',''],
     370: ['巨人女戦士隊 グリーンパイレーツ',''],
@@ -1351,9 +1351,9 @@ window.aliases = {
     1350: ['テーナ・ゲーナ王国の手長族','',''],
     1351: ['テキーラウルフの警備兵','',''],
     1352: ['エンポリオ・イワンコフ キングオブニューカマー','',''],
-    1353: ['シルバーズ・レイリー 海賊王の船員','',''],
-    1354: ['シルバーズ・レイリー 眠らぬ街のマスター','','Secret Rayleigh'],
-    1355: ['シルバーズ・レイリー ライムライトに煌く冥王','','Secret Rayleigh'],
+    1353: ['シルバーズ・レイリー 海賊王の船員','','Silvers Rayleigh'],
+    1354: ['シルバーズ・レイリー 眠らぬ街のマスター','','Secret Rayleigh', 'Silvers Rayleigh'],
+    1355: ['シルバーズ・レイリー ライムライトに煌く冥王','','Secret Rayleigh', 'Silvers Rayleigh'],
     1356: ['ペコムズ','',''],
     1357: ['ペコムズ ビッグ・マム海賊団','',''],
     1358: ['タマゴ男爵','',''],
@@ -1508,7 +1508,7 @@ window.aliases = {
     1507: ['サンジのブレイクタイム', '', 'White Day Sanji'],
     1508: ['サンジのティーパーティ', '', 'White Day Sanji'],
     1509: ['ハルタ 白ひげ海賊団１２番隊隊長', '', ''],
-    1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', ''],
+    1510: ['スピード・ジル 白ひげ海賊団１４番隊隊長', '', 'Speed Jiru', 'Genocide Jil'],
     1511: ['アトモス 白ひげ海賊団１３番隊隊長', '', ''],
     1512: ['キングデュー 白ひげ海賊団１１番隊隊長', '', 'Heman'],
     1513: ['サンジ 春先のお付き添い', '', 'Spring Sanji', 'White Day Sanji'],
@@ -1531,8 +1531,8 @@ window.aliases = {
     1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
     1531: ['ウソランド', '', 'God Usopp'],
     1532: ['ゴッド・ウソップ', '', 'God Usopp'],
-    1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', ''],
-    1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', ''],
+    1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', 'Silvers Rayleigh'],
+    1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', 'Silvers Rayleigh'],
     1535: ['デュバル 麦わらの一味の協力者', '', ''],
     1536: ['デュバル 麦わらの一味の共犯者', '', ''],
     1537: ['ヘラクレス 麦わらの一味の協力者', '', ''],
@@ -1613,11 +1613,11 @@ window.aliases = {
     1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
     1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
     1614: ['ロブ・ルッチ 大海賊時代の死闘「闇の正義」', '', ''],
-    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile', 'MrUtopia', 'Mr 0'],
-    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile', 'MrUtopia', 'Mr 0'],
+    1615: ['Mr.0 終わらぬ夢の宿敵', '', 'Crocodile', 'Log Crocodile', 'MrUtopia', 'Mr Utopia', 'Mr 0'],
+    1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile', 'MrUtopia', 'Mr Utopia' , 'Mr 0'],
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
-    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh'],
+    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh', 'Silvers Rayleigh'],
     1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
     1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
     1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],

From f33f926f0654636398090e1b01779878edf53773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Sun, 15 Oct 2017 04:15:19 +0200
Subject: [PATCH 1401/1569] Fullname to 6* & 6*+

Plus "Legend <Name>" standard started with Legend Buggy
Also some Yonko and Shichibukai
Most of 'em has been as requests
---
 common/data/aliases.js | 176 ++++++++++++++++++++---------------------
 1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6b458f6cd..a7942c5b7 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -258,8 +258,8 @@ window.aliases = {
     257: ['短筒使いのイゾウ',''],
     258: ['ブラメンコ',''],
     259: ['大槌のブラメンコ',''],
-    260: ['エドワード・ニューゲート','', 'Whitebeard', 'WB' ],
-    261: ['白ひげ','','Edward Newgate', 'WB'],
+    260: ['エドワード・ニューゲート','', 'Whitebeard', 'WB', 'Legend WB', 'Legend Whitebeard', 'Yonko'],
+    261: ['白ひげ','','Edward Newgate', 'WB', 'Legend WB', 'Legend Whitebeard', 'Yonko'],
     262: ['特訓コビー',''],
     263: ['曹長コビー',''],
     264: ['特訓ヘルメッポ',''],
@@ -364,8 +364,8 @@ window.aliases = {
     363: ['大喰らい ジュエリー・ボニー','','Supernova'],
     364: ['カポネ・ベッジ','','Supernova'],
     365: ['カポネ・ギャング・ベッジ','','Supernova'],
-    366: ['シルバーズ・レイリー','', 'Silvers Rayleigh'],
-    367: ['冥王レイリー','', 'Silvers Rayleigh'],
+    366: ['シルバーズ・レイリー','', 'Dark King Rayliegh', 'Legend Rayliegh'],
+    367: ['冥王レイリー','', 'Silvers Rayleigh', 'Legend Rayliegh'],
     368: ['巨人斬撃隊 レッドパイレーツ',''],
     369: ['巨人射撃隊 ブルーパイレーツ',''],
     370: ['巨人女戦士隊 グリーンパイレーツ',''],
@@ -413,8 +413,8 @@ window.aliases = {
     412: ['バーソロミュー・くま 王下七武海',''],
     413: ['ゲッコー・モリア','', 'Gekko Moriah'],
     414: ['ゲッコー・モリア 王下七武海','', 'Gekko Moriah Warlord of the Sea'],
-    415: ['ボア・ハンコック',''],
-    416: ['ボア・ハンコック 王下七武海',''],
+    415: ['ボア・ハンコック','', 'Shichibukai', 'Legend Boa Hancock'],
+    416: ['ボア・ハンコック 王下七武海','', 'Shichibukai', 'Legend Boa Hancock'],
     417: ['ドンキホーテ・ドフラミンゴ','', 'Raid Doffy', 'Raid Doflaming' ],
     418: ['ドンキホーテ・ドフラミンゴ 王下七武海','', 'Raid Doffy', 'Raid Doflaming' ],
     419: ['サンジ 整形ショット(パラージュショット)　“嵐”','', 'Kimono Sanji' ],
@@ -456,8 +456,8 @@ window.aliases = {
     455: ['火炎刀のフォッサ',''],
     456: ['クリエル',''],
     457: ['重火器使いのクリエル',''],
-    458: ['センゴク',''],
-    459: ['仏のセンゴク',''],
+    458: ['センゴク','', 'Legend Sengoku', 'Legend Goku'],
+    459: ['仏のセンゴク','', 'Legend Sengoku', 'Legend Goku'],
     460: ['犯罪者ギャルディーノ Mr.3','','Mr 3'],
     461: ['脱走者ベンサム Mr.2・ボン・クレー','', 'Fugitive Bentham Mr. 2 Bonclay', 'Fugitive Bentham Mr 2 Bonclay' ],
     462: ['脱獄名人ベンサム Mr.2・ボン・クレー','', 'Prison Break Expert Mr. 2 Bonclay', 'Prison Break Expert Mr 2 Bonclay' ],
@@ -527,8 +527,8 @@ window.aliases = {
     526: ['ブルック 特攻の麦わらの一味','', 'Strong World Brook', 'SW Brook' ],
     527: ['チョッパー メルヴィユの冒険者','', 'Strong World Chopper', 'SW Chopper' ],
     528: ['チョッパー 特攻の麦わらの一味','', 'Strong World Chopper', 'SW Chopper' ],
-    529: ['シャンクス 黒衣の赤髪','', 'Strong World Shanks', 'SW Shanks' ],
-    530: ['シャンクス 黒衣の四皇','', 'Strong World Shanks', 'SW Shanks' ],
+    529: ['シャンクス 黒衣の赤髪','', 'Strong World Shanks', 'SW Shanks', 'Legend Shanks', 'Yonko' ],
+    530: ['シャンクス 黒衣の四皇','', 'Strong World Shanks', 'SW Shanks', 'Legend Shanks', 'Yonko' ],
     531: ['ニコ・ロビン　桜吹雪','', 'Sakura Robin' ],
     532: ['ニコ・ロビン　桜満開','', 'Sakura Robin' ],
     533: ['ブルック　チェリーヘッド','', 'Sakura Brook' ],
@@ -559,8 +559,8 @@ window.aliases = {
     558: ['ニコ・ロビン 特攻の麦わらの一味','', 'Strong World Robin', 'SW Robin' ],
     559: ['フランキー メルヴィユの冒険者','', 'Strong World Franky', 'SW Franky' ],
     560: ['フランキー 特攻の麦わらの一味','', 'Strong World Franky', 'SW Franky' ],
-    561: ['ポートガス・D・エース 黒衣の火拳','', 'Strong World Ace', 'SW Ace' ],
-    562: ['ポートガス・D・エース 黒衣の白ひげ海賊団2番隊隊長','', 'Strong World Ace', 'SW Ace' ],
+    561: ['ポートガス・D・エース 黒衣の火拳','', 'Strong World Ace', 'SW Ace', 'Legend Ace'],
+    562: ['ポートガス・D・エース 黒衣の白ひげ海賊団2番隊隊長','', 'Strong World Ace', 'SW Ace', 'Legend Ace' ],
     563: ['ポルチェ',''],
     564: ['ポーティ',''],
     565: ['ハンバーグ',''],
@@ -575,8 +575,8 @@ window.aliases = {
     574: ['青キジ','','Raid Kuzan', 'Raid Aokiji' ],
     575: ['青キジ　氷結人間','','Raid Kuzan', 'Raid Aokiji' ],
     576: ['ナミのティータイム',''],
-    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy', 'LL' ],
-    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy', 'LL' ],
+    577: ['モンキー・D・ルフィ 航海の記録・麦わらの一味','', 'Log Luffy','Logfy', 'LL', 'Legend Luffy', 'Legend LL' ],
+    578: ['モンキー・D・ルフィ 航海の夢「海賊王」','', 'Log Luffy','Logfy', 'LL', 'Legend Luffy', 'Legend LL' ],
     579: ['ロロノア・ゾロ 航海の記録・麦わらの一味','', 'Log Zoro', 'Roronoa Zoro, Wakes of the Endless Dream, Straw Hat Crew' ],
     580: ['ロロノア・ゾロ 航海の夢「大剣豪」','', 'Log Zoro', 'Roronoa Zoro, A Vow in the Great Age of Pirates - Master Swordsman' ],
     581: ['ゲンボウ',''],
@@ -646,8 +646,8 @@ window.aliases = {
     645: ['氷の魔女ホワイティベイ',''],
     646: ['リトルオーズJr.',''],
     647: ['猛攻のリトルオーズJr.',''],
-    648: ['マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
-    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco'],
+    648: ['マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco', 'Legend Marco'],
+    649: ['不死鳥マルコ 白ひげ海賊団１番隊隊長','','LMarco','QMarco', 'Legend Marco'],
     650: ['ナミ 航海の記録・麦わらの一味','', 'Log Nami', 'Nami, Wakes of the Endless Dream, Straw Hat Crew' ],
     651: ['ナミ 航海の夢「世界地図」','', 'Log Nami', 'Nami, A Vow in the Great Age of Pirates - World Map' ],
     652: ['鉄仮面のデュバル','','Raid Duval'],
@@ -666,8 +666,8 @@ window.aliases = {
     665: ['コーザ アラバスタ住民','','Young Koza'],
     666: ['コーザ 砂砂団　リーダー','','Young Koza'],
     667: ['ネフェルタリ・コブラ アラバスタ王国国王',''],
-    668: ['サボ',''],
-    669: ['サボ 革命軍',''],
+    668: ['サボ','', 'Legend Sabo'],
+    669: ['サボ 革命軍','', 'Legend Sabo'],
     670: ['コアラ',''],
     671: ['コアラ 革命軍',''],
     672: ['ハック',''],
@@ -715,10 +715,10 @@ window.aliases = {
     714: ['ピエール',''],
     715: ['コニス',''],
     716: ['コニス スカイピアの少女',''],
-    717: ['ジュラキュール・ミホーク 王下七武海','','INThawk'],
-    718: ['鷹の目のミホーク 世界最強の剣士','','INThawk'],
-    719: ['サー・クロコダイル　ロギア 王下七武海',''],
-    720: ['サー・クロコダイル　ロギア 元王下七武海',''],
+    717: ['ジュラキュール・ミホーク 王下七武海','','INThawk', 'Legend Mihawk', 'Legend Dracule Mihawk', 'Shichibukai'],
+    718: ['鷹の目のミホーク 世界最強の剣士','','INThawk', 'Legend Mihawk', 'Legend Dracule Mihawk', 'Shichibukai'],
+    719: ['サー・クロコダイル　ロギア 王下七武海','', 'Legend Crocodile', 'Shichibukai'],
+    720: ['サー・クロコダイル　ロギア 元王下七武海','', 'Legend Crocodile', 'Shichibukai'],
     721: ['ジェリー',''],
     722: ['ジェリー サイファーポールNo.6',''],
     723: ['Tボーン',''],
@@ -745,8 +745,8 @@ window.aliases = {
     744: ['ポートガス・D・エース 航海の記録・白ひげ海賊団','', 'Log Ace' ],
     745: ['ポートガス・D・エース 航海の夢「海賊の高み」','', 'Log Ace' ],
     746: ['メガロ＆しらほし姫',''],
-    747: ['ロブ・ルッチ 闇の正義の「ＣＰ９」',''],
-    748: ['ロブ・ルッチ 歴代最強の「ＣＰ９」',''],
+    747: ['ロブ・ルッチ 闇の正義の「ＣＰ９」','', 'Legend Lucci', 'Legend Rob Lucci'],
+    748: ['ロブ・ルッチ 歴代最強の「ＣＰ９」','', 'Legend Lucci', 'Legend Rob Lucci'],
     749: ['カク 闇の正義の「ＣＰ９」',''],
     750: ['カク 歴代最強の「ＣＰ９」',''],
     751: ['カリファ 闇の正義の「ＣＰ９」','', 'Califa, CP9\'s Dark Justice', 'Calipha, CP9\'s Dark Justice', 'Kalipha, CP9\'s Dark Justice' ],
@@ -867,8 +867,8 @@ window.aliases = {
     866: ['ニコ・ロビン 百花繚乱 ウイング“華”','', 'Kimono Robin' ],
     867: ['ウソップ タバスコ星“撃”','', 'Kimono Usopp' ],
     868: ['トニートニー・チョッパー 重量ゴング“獣”','', 'Kimono Chopper' ],
-    869: ['ドンキホーテ・ドフラミンゴ ドンキホーテ海賊団','', 'Doffy' ],
-    870: ['天夜叉ドフラミンゴ','', 'Doffy' ],
+    869: ['ドンキホーテ・ドフラミンゴ ドンキホーテ海賊団','', 'Doffy', 'Legend Doflamingo', 'Legend Doffy', 'Shichibukai' ],
+    870: ['天夜叉ドフラミンゴ','', 'Doffy', 'Legend Doflamingo', 'Legend Doffy', 'Shichibukai' ],
     871: ['シュガー',''],
     872: ['シュガー ドンキホーテ海賊団',''],
     873: ['セニョール・ピンク','', 'Senor Pink', 'Senior Pink' ],
@@ -932,8 +932,8 @@ window.aliases = {
     931: ['ブルゴリ ','','Blue Gorilla'],
     932: ['ピーカ','','Raid Pica'],
     933: ['ピーカ ドンキホーテ海賊団','','Raid Pica'],
-    934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
-    935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe'],
+    934: ['海峡のジンベエ','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe', 'Legend Jinbe', 'Legend Jimbei', 'Legend Jinbei', 'Shichibukai'],
+    935: ['海峡のジンベエ 元王下七武海','', 'Jinbe', 'Jimbei', 'Jinbei','INTbe', 'Legend Jinbe', 'Legend Jimbei', 'Legend Jinbei', 'Shichibukai'],
     936: ['モンキー・Ｄ・ルフィ 頂上戦争の生還者','','Timeskip Luffy','3D2Y Luffy'],
     937: ['モンキー・Ｄ・ルフィ 仲間との誓い『３Ｄ２Ｙ』','','Timeskip Luffy','3D2Y Luffy'],
     938: ['ナミ 天候の科学の探求者','','Timeskip Nami','3D2Y Nami'],
@@ -998,8 +998,8 @@ window.aliases = {
     997: ['デリンジャー ドンキホーテ海賊団',''],
     998: ['ディアマンテ',''],
     999: ['ディアマンテ ドンキホーテ海賊団',''],
-    1000: ['コラソン ドンキホーテ海賊団','','Rocinante','Rosinante'],
-    1001: ['ドンキホーテ・ロシナンテ','','Rocinante','Corazon'],
+    1000: ['コラソン ドンキホーテ海賊団','','Rocinante','Rosinante', 'Corasan', 'Legend Corazon', 'Donquixote Rosinante'],
+    1001: ['ドンキホーテ・ロシナンテ','','Rocinante','Corazon', 'Corasan', 'Legend Corazon'],
     1002: ['ベポ ハートの海賊団',''],
     1003: ['武闘家のベポ ハートの海賊団',''],
     1004: ['シャチ＆ペンギン ハートの海賊団',''],
@@ -1032,8 +1032,8 @@ window.aliases = {
     1031: ['ハイルディン 海賊傭兵',''],
     1032: ['アブドーラ＆ジェット','','Abdullah and Jeet'],
     1033: ['アブドーラ＆ジェット 元賞金稼ぎ','','Abdullah and Jeet, Former Bounty Hunters'],
-    1034: ['バルトロメオ',''],
-    1035: ['人食いのバルトロメオ',''],
+    1034: ['バルトロメオ','', 'Legend Bartolomeo'],
+    1035: ['人食いのバルトロメオ','', 'Legend Bartolomeo'],
     1036: ['エンポリオ・イワンコフ 秘密の花園の女王',''],
     1037: ['エンポリオ・イワンコフ 奇跡を起こす花園の女王',''],
     1038: ['イナズマ 秘密の花園の乙女',''],
@@ -1042,8 +1042,8 @@ window.aliases = {
     1041: [ '“ダイヤモンド”・ジョズ 白ひげ海賊団３番隊隊長', '','Coliseum Jozu' ],
     1042: [ 'キラー キッド海賊団', '','Coliseum Killer' ],
     1043: [ '“殺戮武人”キラー キッド海賊団', '','Coliseum Killer' ],
-    1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw' ],
-    1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw' ],
+    1044: [ 'トラファルガー・ロー 最悪の世代', '','LLaw','PLaw', 'Legend Trafalgar Law', 'Legend Law', 'Shichibukai'],
+    1045: [ 'トラファルガー・ロー 王下七武海', '','LLaw','PLaw', 'Legend Trafalgar Law', 'Legend Law', 'Shichibukai' ],
     1046: [ 'サボ 竜の爪', '','Raid Sabo' ],
     1047: [ 'サボ 革命軍参謀総長', '','Raid Sabo' ],
     1048: [ 'ニコ・オルビア', '' ],
@@ -1082,8 +1082,8 @@ window.aliases = {
     1081: [ 'キュロス 元リク王軍軍隊長', '' ],
     1082: [ '首領・サイ', '' ],
     1083: [ '首領・サイ 花ノ国のギャング', '' ],
-    1084: [ '藤虎', '' ],
-    1085: [ 'イッショウ', '', 'Fujitora' ],
+    1084: [ '藤虎', '', 'Issho', 'Legend Issho', 'Legend Fujitora'],
+    1085: [ 'イッショウ', '', 'Fujitora', 'Legend Issho', 'Legend Fujitora' ],
     1086: [ 'ムッシュール', '','Coliseum Musshuru' ],
     1087: [ 'ムッシュール 毒胞子人間', '','Coliseum Musshuru' ],
     1088: [ 'サガ', '','Coliseum Saga' ],
@@ -1118,10 +1118,10 @@ window.aliases = {
     1117: [ 'サンジ 信念に生きる麦わらの一味', 'New Strong World Sanji', 'SW Sanji' ],
     1118: [ 'ナミ 夢を追い求める冒険者', 'New Strong World Nami', 'SW Nami' ],
     1119: [ 'ナミ 信念に生きる麦わらの一味', 'New Strong World Nami', 'SW Nami' ],
-    1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy', 'Logfy', 'LL' ],
-    1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy', 'Logfy', 'LL' ],
-    1122: [ 'キャベンディッシュ', '','Hakuba', 'Cabbage' ],
-    1123: [ '白馬のキャベンディッシュ', '','Hakuba', 'Cabbage' ],
+    1120: [ 'モンキー・D・ルフィ 終わらぬ夢の航跡・麦わらの一味', '', 'Log Luffy', 'Logfy', 'LL', 'Legend Luffy', 'Legend LL' ],
+    1121: [ 'モンキー・D・ルフィ 大海賊時代への誓い「海賊王」', '', 'Log Luffy', 'Logfy', 'LL', 'Legend Luffy', 'Legend LL' ],
+    1122: [ 'キャベンディッシュ', '','Hakuba', 'Cabbage', 'Legend Cavendish', 'Legend Hakuba' ],
+    1123: [ '白馬のキャベンディッシュ', '','Hakuba', 'Cabbage', 'Legend Cavendish', 'Legend Hakuba' ],
     1124: ['スレイマン',''],
     1125: ['首はねスレイマン',''],
     1126: ['オオロンブス',''],
@@ -1189,8 +1189,8 @@ window.aliases = {
     1188: ['水牛のアトモス',''],
     1189: ['スピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
     1190: ['シールドランスのスピード・ジル','', 'Speed Jiru', 'Genocide Jil' ],
-    1191: ['青キジ 海軍本部最高戦力','','Aokiji','Kuzan'],
-    1192: ['クザン','','Aokiji'],
+    1191: ['青キジ 海軍本部最高戦力','','Kuzan','Legend Kuzan', 'Legend Aokiji'],
+    1192: ['クザン','','Aokiji','Legend Kuzan', 'Legend Aokiji'],
     1193: ['ボア・ハンコック 渚にたたずむ女帝','','Summertime Hancock','Swimsuit Hancock'],
     1194: ['ボア・ハンコック 恋に溺れた乙女','','Summertime Hancock','Swimsuit Hancock'],
     1195: ['ガン・フォール 先代“神”','','Coliseum Gan Fall', 'Ganfall'],
@@ -1237,8 +1237,8 @@ window.aliases = {
     1236: ['追撃のメイナード 海軍本部中将','',''],
     1237: ['バスティーユ 海軍本部中将','',''],
     1238: ['鮫切りバスティーユ 海軍本部中将','',''],
-    1239: ['黄猿 海軍本部最高戦力','','Kizaru'],
-    1240: ['ボルサリーノ','','Kizaru'],
+    1239: ['黄猿 海軍本部最高戦力','','Borsalino', 'Legend Kizaru', 'Legend Borsalino'],
+    1240: ['ボルサリーノ','','Kizaru', 'Legend Kizaru', 'Legend Borsalino'],
     1241: ['コアラ 魚人空手師範代','',''],
     1242: ['コアラ 革命軍・魚人空手師範代','',''],
     1243: ['ハック 魚人空手師範','',''],
@@ -1265,8 +1265,8 @@ window.aliases = {
     1264: ['ヴェルゴ “北の海”の闇','','Young Vergo'],
     1265: ['エース 黄昏の道草','','Kimono Ace'],
     1266: ['エース 月下の艶肌','','Kimono Ace'],
-    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','','BB'],
-    1268: ['黒ひげ 黒ひげ海賊団船長','','BB', 'Teach'],
+    1267: ['マーシャル・D・ティーチ 黒ひげ海賊団船長','','BB', 'Legend Blackbeard', 'Legend BB', 'Legend Marshall D. Teach', 'Legend Teach', 'Yonko'],
+    1268: ['黒ひげ 黒ひげ海賊団船長','','BB', 'Teach', 'Legend Blackbeard', 'Legend BB', 'Legend Marshall D. Teach', 'Legend Teach', 'Yonko'],
     1269: ['ラフィット','','Lafitte'],
     1270: ['“鬼保安官”ラフィット','','Lafitte'],
     1271: ['ヴァン・オーガー','','Vaper', 'Van Ogre'],
@@ -1311,8 +1311,8 @@ window.aliases = {
     1310: ['狐火の錦えもん','','Coliseum Kinemon','Coliseum Kin\'emon'],
     1311: ['ボア・マリーゴールド 九蛇の戦士','','Coliseum Marigold','Coliseum Boa Marigold'],
     1312: ['ボア・マリーゴールド ゴルゴン三姉妹・三女','','Coliseum Marigold','Coliseum Boa Marigold'],
-    1313: ['赤犬 海軍本部最高戦力','','Sakazuki'],
-    1314: ['サカズキ','','Akainu'],
+    1313: ['赤犬 海軍本部最高戦力','','Sakazuki', 'Legend Sakazuki', 'Legend Akainu'],
+    1314: ['サカズキ','','Akainu', 'Legend Sakazuki', 'Legend Akainu'],
     1315: ['海軍本部曹長　コビー “偉大なる航路”の海兵','',''],
     1316: ['海軍本部曹長　コビー “海軍の英雄”の教え子','',''],
     1317: ['モンキー・D・ガープ 海軍本部中将','',''],
@@ -1359,8 +1359,8 @@ window.aliases = {
     1358: ['タマゴ男爵','',''],
     1359: ['タマゴ男爵 ビッグ・マム海賊団','',''],
     1360: ['ルフィの冬島冒険','','Winter Luffy'],
-    1361: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
-    1362: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro'],
+    1361: ['ロロノア・ゾロ 集結の麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro', 'Legend Zoro', 'Legend Roronoa Zoro'],
+    1362: ['ロロノア・ゾロ 新生・麦わらの一味','','New World Zoro', 'Timeskip Zoro', 'TS Zoro', 'Legend Zoro', 'Legend Roronoa Zoro'],
     1363: ['フランキー 集結の麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
     1364: ['フランキー 新生・麦わらの一味','','New World Franky', 'Timeskip Franky', 'TS Franky'],
     1365: ['ナミ 集結の麦わらの一味','','New World Nami', 'Timeskip Nami', 'TS Nami'],
@@ -1388,8 +1388,8 @@ window.aliases = {
     1387: ['', '', 'Mega Luffy', 'Super Luffy'],
     1388: ['ロロノア・ゾロ 厄港鳥（ヤッコウドリ）', '', 'Mega Zoro', 'Super Zoro'],
     1389: ['ナミ サンダーブリード＝テンポ', '', 'Mega Nami', 'Super Nami'],
-    1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy'],
-    1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy'],
+    1390: ['道化のバギー バギー海賊団船長', '', 'Legend Buggy', 'Legend Baggy', 'Shichibukai'],
+    1391: ['キャプテン・バギー', '', 'Legend Buggy', 'Legend Baggy', 'Shichibukai'],
     1392: ['戦桃丸 シャボンディ諸島の壁', '', ''],
     1393: ['デマロ・ブラック', '', 'Fake Straw Hat', 'Impostor Straw Hat', 'Imposter Straw Hat'],
     1394: ['ベビー５ 神前の晴れ着', '', 'Kimono Baby 5'],
@@ -1401,8 +1401,8 @@ window.aliases = {
     1400: ['グラディウス 破裂人間', '', 'Coliseum Gladius'],
     1401: ['グラディウス ピーカ軍幹部', '', 'Coliseum Gladius'],
     1402: ['ドルトン ドラム島民間護衛団団長', '', 'Coliseum Dalton'],
-    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
-    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL'],
+    1403: ['モンキー・D・ルフィ 集結の麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL', 'Legend Luffy', 'Legend TSL', 'Legend Monkey D. Luffy'],
+    1404: ['モンキー・D・ルフィ 新生・麦わらの一味', '', 'New World Luffy', 'Timeskip Luffy', 'TS Luffy', 'TSL', 'Legend Luffy', 'Legend TSL', 'Legend Monkey D. Luffy'],
     1405: ['ウソップ 集結の麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
     1406: ['ウソップ 新生・麦わらの一味', '', 'New World Usopp', 'Timeskip Usopp', 'TS Usopp'],
     1407: ['ニコ・ロビン 集結の麦わらの一味', '', 'New World Robin', 'Timeskip Robin', 'TS Robin'],
@@ -1411,7 +1411,7 @@ window.aliases = {
     1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
     1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
     1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
-    1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate', 'Super Whitebeard', 'Super WB',],
+    1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate', 'Super Whitebeard', 'Super WB', 'Yonko', 'Legend Whitebeard', 'Legend WB'],
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
     1415: ['センゴク 智将', '', ''],
     1416: ['仏のセンゴク 智将', '', ''],
@@ -1431,8 +1431,8 @@ window.aliases = {
     1430: ['マンシェリー ３月への勇気', '', 'Valentine Mansherry'],
     1431: ['フランキー将軍', '', 'General Franky', 'Raid Franky'],
     1432: ['フランキー将軍 鉄の海賊（アイアンパイレーツ）', '', 'Shogun Franky', 'Raid Franky'],
-    1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', ''],
-    1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', ''],
+    1433: ['ホーディ・ジョーンズ 新魚人海賊団船長', '', 'Legend Hody Jones'],
+    1434: ['ホーディ・ジョーンズ 魚人街の亡霊', '', 'Legend Hody Jones'],
     1435: ['ヒョウゾウ 新魚人海賊団', '', ''],
     1436: ['ヒョウゾウ 魚人街の亡霊', '', ''],
     1437: ['イカロス・ムッヒ 新魚人海賊団', '', ''],
@@ -1443,7 +1443,7 @@ window.aliases = {
     1442: ['ゼオ 魚人街の亡霊', '', ''],
     1443: ['ドスン 新魚人海賊団', '', ''],
     1444: ['ドスン 魚人街の亡霊', '', ''],
-    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock', 'Super Boa Hancock'],
+    1445: ['ボア・ハンコック 蛇姫', '', 'Mega Boa Hancock', 'Super Boa Hancock', 'Shichibukai', 'Legend Boa Hancock'],
     1446: ['ウソップ 「プラタナス」手裏剣', '', 'Mega Usopp', 'Super Usopp'],
     1447: ['サンジ グリル＝ショット', '', 'Mega Sanji', 'Super Sanji'],
     1448: ['トニートニー・チョッパー ヘビーゴング', '', 'Mega Chopper', 'Super Chopper'],
@@ -1470,8 +1470,8 @@ window.aliases = {
     1469: ['鉞の戦桃丸 海兵', '', ''],
     1470: ['リップ・“サービス”・ドウティ', '', 'Lip Service'],
     1471: ['深手の・アルビオン', '', ''],
-    1472: ['しらほし姫', '', ''],
-    1473: ['しらほし姫 リュウグウ王国王女', '', ''],
+    1472: ['しらほし姫', '', 'Legend Shirahoshi-hime'],
+    1473: ['しらほし姫 リュウグウ王国王女', '', 'Legend Shirahoshi-hime'],
     1474: ['ネプチューン', '', ''],
     1475: ['ネプチューン リュウグウ王国国王', '', ''],
     1476: ['フカボシ', '', ''],
@@ -1490,7 +1490,7 @@ window.aliases = {
     1489: ['首領・クリーク 東の海の覇者', '', 'Coliseum Don Krieg'],
     1490: ['Mr.5 爆弾人間', '', 'Coliseum Mr. 5', 'Mr 5'],
     1491: ['Mr.5 Ｂ・Ｗオフィサーエージェント', '', 'Coliseum Mr. 5', 'Mr 5'],
-    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo'],
+    1492: ['サボ メラメラの実の能力者', '', 'Mega Sabo', 'Super Sabo', 'Legend Sabo'],
     1493: ['荒くれのトゲ付き棍棒部隊 魚人街の無法者', '', ''],
     1494: ['速足のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
     1495: ['やり手のトゲ付き棍棒部隊 魚人街の無法者', '', ''],
@@ -1529,8 +1529,8 @@ window.aliases = {
     1528: ['ブレンハイム 白ひげ海賊団９番隊隊長', '', 'Coliseum Blenheim'],
     1529: ['キャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
     1530: ['白馬のキャベンディッシュ 美しき海賊団船長', '', 'Invasion Cavendish', 'Invasion Cabbage'],
-    1531: ['ウソランド', '', 'God Usopp'],
-    1532: ['ゴッド・ウソップ', '', 'God Usopp'],
+    1531: ['ウソランド', '', 'God Usopp', 'Legend Usopp', 'Legend Usoland', 'Legend God Usopp'],
+    1532: ['ゴッド・ウソップ', '', 'God Usopp', 'Usoland', 'Legend Usopp', 'Legend Usoland', 'Legend God Usopp'],
     1533: ['シルバーズ・レイリー 麦わらの一味の協力者', '', 'Silvers Rayleigh'],
     1534: ['シルバーズ・レイリー 麦わらの一味の共犯者', '', 'Silvers Rayleigh'],
     1535: ['デュバル 麦わらの一味の協力者', '', ''],
@@ -1541,7 +1541,7 @@ window.aliases = {
     1540: ['ペローナ 麦わらの一味の共犯者', '', ''],
     1541: ['エリザベス 麦わらの一味の協力者', '', ''],
     1542: ['エリザベス 麦わらの一味の共犯者', '', ''],
-    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp', 'Super Usopp'],
+    1543: ['キャプテン・ウソップ 男ウソップ大冒険　～第二章～', '', 'God Usopp', 'Mega Usopp', 'Super Usopp', 'Usoland', 'Legend Usopp', 'Legend Usoland', 'Legend God Usopp'],
     1544: ['コアラ 桜色の待ち合わせ', '', 'Sakura Koala'],
     1545: ['コアラ 桜色の口元', '', 'Sakura Koala'],
     1546: ['ソウルキング', '', 'Brook'],
@@ -1568,8 +1568,8 @@ window.aliases = {
     1567: ['ボア・ハンコック 少女戦士', '', 'Kid Boa Hancock'],
     1568: ['ボア・ハンコック お姫さまの片鱗', '', 'Kid Boa Hancock'],
     1569: ['トラファルガー・ロー 麦わらの一味・ハートの海賊団海賊同盟', '', 'Anniversary Law'],
-    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
-    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm'],
+    1570: ['イヌアラシ', '', 'Inuyasha', 'Dogstorm', 'Dog Storm', 'Doggo Storm', 'Legend Inuarashi', 'Legend Dogstorm'],
+    1571: ['“昼の王”イヌアラシ', '', 'Inuyasha', 'Dogstorm','Dog Storm', 'Doggo Storm', 'Legend Inuarashi', 'Legend Dogstorm'],
     1572: ['ワンダ', '', ''],
     1573: ['王の鳥　ワンダ', '', ''],
     1574: ['シシリアン', '', ''],
@@ -1585,13 +1585,13 @@ window.aliases = {
     1584: ['殺戮支配者オオロンブス ヨンタマリア大船団提督', '', 'Coliseum Orlumbus'],
     1585: ['ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
     1586: ['勇士の戦友ヘルメッポ 海軍本部軍曹', '', 'Coliseum Helmeppo'],
-    1587: ['サンジ ヴィンスモーク家　三男', '', ''],
-    1588: ['サンジ ジェルマ王国　プリンス', '', ''],
+    1587: ['サンジ ヴィンスモーク家　三男', '', 'Vinsmoke Sanji', 'Germa Sanji', 'Legend Vinsmoke Sanji', 'Legend Germa Sanji', 'Legend Sanji'],
+    1588: ['サンジ ジェルマ王国　プリンス', '', 'Vinsmoke Sanji', 'Germa Sanji', 'Legend Vinsmoke Sanji', 'Legend Germa Sanji', 'Legend Sanji'],
     1589: ['シャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
     1590: ['赤髪のシャンクス Celebrate the long cruise', '', 'Anniversary Shanks'],
     1591: ['ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
     1592: ['“女帝”ボア・ハンコック Celebrate the long cruise', '', 'Anniversary Boa'],
-    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'Mega Luffy', 'Super Luffy'],
+    1593: ['モンキー・D・ルフィ ギア“４”　「弾む男（バウンドマン）」', '', 'Gear 4 Luffy', 'G4', 'G4 Luffy', 'Mega Luffy', 'Super Luffy', 'Legend Luffy', 'Legend Gear 4 Luffy', 'Legend G4 Luffy'],
     1594: ['藤虎 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
     1595: ['藤虎　重力刀 海軍本部最高戦力', '', 'Raid Issho', 'Raid Fujitora'],
     1596: ['しらほし', '', ''],
@@ -1607,8 +1607,8 @@ window.aliases = {
     1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet'],
     1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre'],
     1608: ['ドクＱ 黒ひげ海賊団', '', ''],
-    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', ''],
-    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', ''],
+    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', 'God Enel', 'Legend Enel', 'Legend God Enel'],
+    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', 'God Enel', 'Legend Enel', 'Legend God Enel'],
     1611: ['バーソロミュー・くま 終わらぬ夢の宿敵', '', ''],
     1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
     1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],
@@ -1617,7 +1617,7 @@ window.aliases = {
     1616: ['Mr.0 大海賊時代の死闘「理想郷」', '', 'Crocodile', 'Log Crocodile', 'MrUtopia', 'Mr Utopia' , 'Mr 0'],
     1617: ['ゲッコー・モリア 終わらぬ夢の宿敵', '', ''],
     1618: ['ゲッコー・モリア 大海賊時代の死闘「最強の部下」', '', ''],
-    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh', 'Silvers Rayleigh'],
+    1619: ['“冥王”シルバーズ・レイリー 海賊王の右腕', '', 'Mega Rayleigh', 'Super Rayleigh', 'Legend Rayliegh'],
     1620: ['ユースタス・キッド 終わらぬ夢の航跡・キッド海賊団', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
     1621: ['ユースタス・キッド 大海賊時代への誓い「海賊王」', '', 'Log Kid', 'Secret Kid', 'Log Kidd', 'Secret Kidd'],
     1622: ['ドンキホーテ・ドフラミンゴ「改」', '', 'Kai Doffy', 'Kai Doflamingo', 'Neo Doffy', 'Neo Doflamingo', 'Raid Doffy', 'Raid Doflamingo'],
@@ -1649,8 +1649,8 @@ window.aliases = {
     1648: ['ジョーラ 芸術人間', '', 'Jora'],
     1649: ['ジョーラ トレーボル軍', '', 'Jora'],
     1650: ['ブルック サイケデリックアート', '', ''],
-    1651: ['ネコマムシ', '', 'Cat Viper', 'Nekopara'],
-    1652: ['“夜の王”ネコマムシ', '', 'Cat Viper', 'Nekopara'],
+    1651: ['ネコマムシ', '', 'Cat Viper', 'Nekopara', 'Legend Nekomamushi'],
+    1652: ['“夜の王”ネコマムシ', '', 'Cat Viper', 'Nekopara', 'Legend Nekomamushi'],
     1653: ['ペドロ', '', ''],
     1654: ['木の上のペドロ', '', ''],
     1655: ['キャロット', '', ''],
@@ -1661,7 +1661,7 @@ window.aliases = {
     1660: ['霧の雷ぞう', '', ''],
     1661: ['コラソン 消したい雨雲', '', ''],
     1662: ['コラソン 消える雨音', '', ''],
-    1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci'],
+    1663: ['ロブ・ルッチ　“生命帰還” 歴代最強の「ＣＰ９」', '', 'Mega Rob Lucci', 'Mega Lucci', 'Super Rob Lucci', 'Super Lucci', 'Legend Lucci', 'Legend Rob Lucci'],
     1664: ['青キジ “一騎討ち”の相手', '', 'Secret Aokiji', 'Secret Kuzan'],
     1665: ['青キジ “一騎討ち”の勝者', '', 'Secret Aokiji', 'Secret Kuzan'],
     1666: ['キュロス 無敗の剣闘士', '', ''],
@@ -1695,8 +1695,8 @@ window.aliases = {
     1694: ['“昼の王”イヌアラシ モコモ公国', '', 'Coliseum Inuarashi', 'Dog Storm', 'Dogstorm', 'Doggo'],
     1695: ['鬼竹のヴェルゴ', '', 'Raid Vergo'],
     1696: ['鬼竹のヴェルゴ ドンキホーテファミリー最高幹部', '', 'Raid Vergo'],
-    1697: ['マゼラン 監獄の支配者', '', ''],
-    1698: ['マゼラン 地獄の支配者', '', ''],
+    1697: ['マゼラン 監獄の支配者', '', 'Legend Magellan'],
+    1698: ['マゼラン 地獄の支配者', '', 'Legend Magellan'],
     1699: ['ジンベエ “無限地獄”の囚人', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
     1700: ['ジンベエ “地獄”の七武海', '', "Jinbe, 'Eternal Hell' Prisoner", "Jimbei, 'Eternal Hell' Prisoner", "Jimbe, 'Eternal Hell' Prisoner", "Jinbei, 'Eternal Hell' Prisoner"],
     1701: ['エンポリオ・イワンコフ “ニューカマーランド”の囚人', '', ''],
@@ -1705,7 +1705,7 @@ window.aliases = {
     1704: ['ハンニャバル 今は支配者の腹心', '', ''],
     1705: ['Mr.2　ボン・クレー “飢餓地獄”の囚人', '', 'Mr 2'],
     1706: ['Mr.2　ボン・クレー “地獄”の友達（ダチ）', '', 'Mr 2'],
-    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks', 'SW Shanks'],
+    1707: ['赤髪のシャンクス 四皇', '', 'Mega Shanks', 'Super Shanks', 'SW Shanks', 'Yonko'],
     1708: ['ナミ 真夏のドキドキ', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1709: ['ナミ 真夏のワクワク', '', 'Summer Nami', 'Swimsuit Nami', 'Summertime Nami'],
     1710: ['ニコ・ロビン 健康的な美貌', '', 'Summer Robin', 'Swimsuit Robin', 'Summertime Robin'],
@@ -1744,12 +1744,12 @@ window.aliases = {
     1743: ['ボア・マリーゴールド 麦わらのルフィの共犯者', '', ''],
     1744: ['マーガレット 麦わらのルフィの協力者', '', ''],
     1745: ['マーガレット 麦わらのルフィの共犯者', '', ''],
-    1746: ['ボア・ハンコック 麦わらのルフィの協力者', '', 'Korea Boa'],
-    1747: ['ボア・ハンコック 麦わらのルフィの共犯者', '', 'Korea Boa'],
+    1746: ['ボア・ハンコック 麦わらのルフィの協力者', '', 'Korean Boa', 'Legend Korean Boa', 'Legend Boa Hancock', 'Legend Boa', 'Shichibukai'],
+    1747: ['ボア・ハンコック 麦わらのルフィの共犯者', '', 'Korean Boa', 'Legend Korean Boa', 'Legend Boa Hancock', 'Legend Boa', 'Shichibukai'],
     1748: ['ベポ 麦わらのルフィの協力者', '', ''],
     1749: ['ベポ 麦わらのルフィの共犯者', '', ''],
-    1750: ['“死の外科医”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
-    1751: ['“王下七武海”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korea Law'],
+    1750: ['“死の外科医”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korean Law', 'Legend Korean Law', 'Legend Trafalgar Law', 'Legend Law', 'Shichibukai'],
+    1751: ['“王下七武海”トラファルガー・ロー “ジョーカー”を狙う“ハート”', '', 'Korean Law', 'Legend Korean Law', 'Legend Trafalgar Law', 'Legend Law', 'Shichibukai'],
     1752: ['ロロノア・ゾロ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Zoro'],
     1753: ['ロロノア・ゾロ 20th Anniversary Memorial Treasure', '', '20th Anniversary Zoro'],
     1754: ['サンジ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Sanji'],
@@ -1760,9 +1760,9 @@ window.aliases = {
     1759: ['ブルック 20th Anniversary Memorial Treasure', '', '20th Anniversary Brook'],
     1760: ['トニートニー・チョッパー Celebrate 20th Anniversary Cruise', '', '20th Anniversary Chopper'],
     1761: ['トニートニー・チョッパー 20th Anniversary Memorial Treasure', '', '20th Anniversary Chopper'],
-    1762: ['ロブ・ルッチ 世界政府の怪物', '', 'Rob Lucci'],
-    1763: ['ルッチ　獣人 世界政府の怪物', '', 'Rob Lucci'],
-    1764: ['クザン 元海軍本部最高戦力', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan'],
+    1762: ['ロブ・ルッチ 世界政府の怪物', '', 'Rob Lucci', 'Legend Rob Lucci', 'Legend Lucci'],
+    1763: ['ルッチ　獣人 世界政府の怪物', '', 'Rob Lucci', 'Legend Rob Lucci', 'Legend Lucci'],
+    1764: ['クザン 元海軍本部最高戦力', '', 'Super Aokiji', 'Mega Aokiji', 'Super Kuzan', 'Mega Kuzan', 'Legend Aokiji', 'Legend Kuzan'],
     1765: ['足長族　ブルーギリー', '', ''],
     1766: ['足長族　ブルーギリー 脚功道格闘家', '', ''],
     1767: ['殺し屋　ファンク兄弟', '', ''],
@@ -1791,8 +1791,8 @@ window.aliases = {
     1790: ['ドンキホーテ海賊団構成員 諜報部隊下級兵', '', ''],
     1791: ['ルーシー コリーダコロシアムＣブロックの謎の剣闘士', '', 'Luffy'],
     1792: ['ルーシー コリーダコロシアムＣブロックの風雲児', '', 'Luffy'],
-    1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo'],
-    1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo'],
+    1793: ['ルーシー コリーダコロシアム決勝戦の風雲児', '', 'Sabo', 'Legend Lucy', 'Legend Sabo'],
+    1794: ['ルーシー コリーダコロシアム優勝者', '', 'Sabo', 'Legend Lucy', 'Legend Sabo'],
     1795: ['Mr.ディアマンテ コリーダコロシアムの英雄', '', 'Mr Diamante'],
     1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', 'Mr Diamante'],
     1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', ''],
@@ -1814,7 +1814,7 @@ window.aliases = {
     1813: ['コアラ 極秘任務の革命軍', '', ''],
     1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji'],
     1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji'],
-    1816: ['ポートガス・D・エース 闇討つ太陽', '', 'Super Ace', 'Mega Ace', 'SW Ace'],
+    1816: ['ポートガス・D・エース 闇討つ太陽', '', 'Super Ace', 'Mega Ace', 'SW Ace', 'Legend Ace',],
     1817: ['', '', ''],
     1818: ['', '', ''],
     1819: ['', '', ''],

From 1deda5d90c301313da9fd8e603a55a5ef2996a2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Sun, 15 Oct 2017 14:24:23 +0200
Subject: [PATCH 1402/1569] TBone, T Bone

---
 common/data/aliases.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index a7942c5b7..8f54ff17a 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -721,8 +721,8 @@ window.aliases = {
     720: ['サー・クロコダイル　ロギア 元王下七武海','', 'Legend Crocodile', 'Shichibukai'],
     721: ['ジェリー',''],
     722: ['ジェリー サイファーポールNo.6',''],
-    723: ['Tボーン',''],
-    724: ['船斬りTボーン 海軍本部大佐',''],
+    723: ['Tボーン','', 'TBone', 'T Bone'],
+    724: ['船斬りTボーン 海軍本部大佐','', 'TBone', 'T Bone'],
     725: ['ネフェルタリ・ビビ 航海の記録・アラバスタ王国王女','', 'Log Vivi' ],
     726: ['ネフェルタリ・ビビ 航海の夢「海賊女王」','', 'Log Vivi' ],
     727: ['モンキー・D・ルフィ ゴムゴムの銃乱打 (ガトリング)',''],
@@ -1421,7 +1421,7 @@ window.aliases = {
     1420: ['ロブ・ルッチ 羽二重のほころび', '', 'Kimono Lucci'],
     1421: ['ディアマンテ はためく旗（フラッグ）人間', '', 'Coliseum Diamante'],
     1422: ['ディアマンテ ドンキホーテファミリー最高幹部', '', 'Coliseum Diamante'],
-    1423: ['Tボーン 海軍本部大佐', '', 'Coliseum T-Bone'],
+    1423: ['Tボーン 海軍本部大佐', '', 'Coliseum T-Bone', 'TBone', 'Coliseum TBone', 'T Bone', 'Coliseum T Bone'],
     1424: ['ギン 海賊艦隊　戦闘“総隊長”', '', 'Coliseum Gin'],
     1425: ['サイ 八宝水軍', '', ''],
     1426: ['サイ 八宝水軍第１３代棟梁', '', ''],

From 2edbcece0f2c81b93a369ae10936c75a4ce9274b Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 15 Oct 2017 17:21:14 -0400
Subject: [PATCH 1403/1569] Sailors

---
 common/data/details.js | 30 ++++++++++++++++++++++++++----
 common/data/sailors.js | 12 ++++++------
 common/data/units.js   |  8 ++++----
 damage/js/cruncher.js  | 10 +++++++---
 4 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 6779d2d1c..544a1fda8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12502,28 +12502,50 @@ window.details = {
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
         limit: "This character has a limit break path",
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by 2 turns on this character",
+                    "Level 3: Reduces Slot Bind duration by 3 turns on this character",
+                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                ]
+            },
+        ],
     },
     1809: {//Wanda
         captain: "Boosts ATK by 2.25x after scoring 2 Perfects in a row",
         special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
-        specialName: "Wanda Special",
+        specialName: "Super Express Beast Path",
     },
     1810: {//Wanda
         captain: "Boosts chances of getting Matching orbs, boosts ATK by 2.25x after scoring 2 Perfects in a row",
         special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
-        specialName: "Wanda Special",
+        specialName: "Super Express Beast Path",
     },
     1811: {//Carrot
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2x",
         special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Carrot Special",
+        specialName: "Rabbit Mink's Air Step",
     },
     1812: {//Carrot
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2.25x",
         special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Carrot Special",
+        specialName: "Rabbit Mink's Air Step",
     },
     1813: {//Koala
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
diff --git a/common/data/sailors.js b/common/data/sailors.js
index 783f4bc2b..c7e62caed 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -29,10 +29,10 @@ window.sailors = {
     526: {
         rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
     },
-    527: {//not working
+    527: {
         rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
-    528: {//not working
+    528: {
         rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
     553: {
@@ -85,10 +85,10 @@ window.sailors = {
     1175: {
         atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
     },
-    1176: {//not working
+    1176: {
         rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
-    1177: {//not working
+    1177: {
         rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
     1183: {
@@ -270,10 +270,10 @@ window.sailors = {
     1540: {
         atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
     },
-    1574: {//not working
+    1574: {
         atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
-    1575: {//not working
+    1575: {
         atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
     1613: {//not working
diff --git a/common/data/units.js b/common/data/units.js
index 83e1833ef..88c3f934f 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1807,10 +1807,10 @@ window.units = [
     [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, null, null, null, null, 2143, 1000, 304, null ],
     [ "Hawk Eyes Mihawk", "STR", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, null, null, null, null, 3460, 1628, 266, null ],
-    [ "Wanda", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
-    [ "Wanda, Evolved", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
-    [ "Carrot", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
-    [ "Carrot, Evolved", "DEX", [ "Fighter", "Slasher" ], 4, 20, 5, 3, 99, 3000000, 689, 729, 65, 2166, 1220, 189, 1 ],
+    [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
+    [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
+    [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
+    [ "Kingsbird Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 4, 20, 5, 3, 99, 3000000, 689, 729, 65, 2166, 1220, 189, 1 ],
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 238, 82, 18, 2422, 1012, 249, 1 ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
     [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 4000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 3461594e0..4cf9c4eba 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -225,7 +225,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         // apply static multipliers and static bonuses
         for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('atkStatic'))
-                result = applyCaptainEffectsToDamage(result,enabledEffects[i].atkStatic,null,true);
+                result = applyCaptainEffectsToDamage(result,enabledEffects[i].atkStatic,null,true,enabledEffects[i].sourceSlot);
             if (enabledEffects[i].hasOwnProperty('atk'))
                 result = applyCaptainEffectsToDamage(result,enabledEffects[i].atk,null,false,enabledEffects[i].sourceSlot);
         }
@@ -492,12 +492,16 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         var params = getParameters(slotNumber);
         // static rcv
         for (var h=0;h<enabledSpecials.length;++h) {
-            if (enabledSpecials[h].hasOwnProperty('rcvStatic'))
+            if (enabledSpecials[h].hasOwnProperty('rcvStatic')){
+                params["sourceSlot"] = enabledEffects[h].sourceSlot;
                 rcv += enabledSpecials[h].rcvStatic(params);
+            }
         }
         for (var j=0;j<enabledEffects.length;++j) {
-            if (enabledEffects[j].hasOwnProperty('rcvStatic'))
+            if (enabledEffects[j].hasOwnProperty('rcvStatic')){
+                params["sourceSlot"] = enabledEffects[j].sourceSlot;
                 rcv += enabledEffects[j].rcvStatic(params);
+            }
         }
         // non-static rcv
         for (var i=0;i<enabledEffects.length;++i) {

From 3223f0477a5f5f3c1412c912d7854dd61e28e430 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 15 Oct 2017 17:52:48 -0400
Subject: [PATCH 1404/1569] mihawk stuffs

---
 common/data/details.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index ef5747b1a..0b2df4838 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12507,10 +12507,10 @@ window.details = {
                 "Name": "Critical Hit",
                 "description": [ 
                     "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
-                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
-                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
-                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
-                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                    "Level 2: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 25% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 7% of this character's attack in extra damage"
                 ]
             },
             {
@@ -12519,8 +12519,8 @@ window.details = {
                     "Level 1: Reduces Slot Bind duration by 1 turn on this character",
                     "Level 2: Reduces Slot Bind duration by 2 turns on this character",
                     "Level 3: Reduces Slot Bind duration by 3 turns on this character",
-                    "Level 4: Reduces Slot Bind duration by 4 turns on this character",
-                    "Level 5: Reduces Slot Bind duration by 5 turns on this character"
+                    "Level 4: Reduces Slot Bind duration by 5 turns on this character",
+                    "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
             },
         ],

From 7f65a215d3334189275a3c78897008cf7f62dfa3 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 15 Oct 2017 19:33:47 -0400
Subject: [PATCH 1405/1569] More Mihawk stuff

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 386768675..4fbc653e7 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1805,8 +1805,8 @@ window.cooldowns = [
     [ 9, 9 ],
     [ 15, 15 ],
     [ 15, 15 ],
-    [ 37, 14 ],
-    [ 37, 14 ],
+    [ 37, 29 ],
+    [ 37, 29 ],
     [ 15, 9 ],
     [ 15, 9 ],
     [ 21, 15 ],

From 4280fbd258a3fdf7201d2316f8376f1e57af3d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 16 Oct 2017 01:41:51 +0200
Subject: [PATCH 1406/1569] Corrected STRHawk lvl99 stats

Was showing Limit Broken stats
---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 88c3f934f..1cc77d88a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1806,7 +1806,7 @@ window.units = [
     [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, null, null, null, null, 2143, 1000, 304, null ],
     [ "Hawk Eyes Mihawk", "STR", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, null, null, null, null, 3460, 1628, 266, null ],
+    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 1, 99, null, null, null, null, 2530, 1403, 186, null ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
@@ -1825,4 +1825,4 @@ window.units = [
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ],
-// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ],
+// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, Sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ],

From 6f5fcca4fa335934ca9e24eccf820758748f6f12 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 16 Oct 2017 00:01:51 -0400
Subject: [PATCH 1407/1569] Stats

---
 common/data/units.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 88c3f934f..5c91ff828 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1801,10 +1801,10 @@ window.units = [
     [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
     [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
     [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
-    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, null, null, null, null, 2014, 1111, 270, null ],
-    [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, null, null, null, null, 2143, 1000, 304, null ],
+    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 392109, 157, 96, 22, null, null, null, null ],
+    [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, null ],
+    [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 392109, 166, 87, 29, null, null, null, null ],
+    [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, null ],
     [ "Hawk Eyes Mihawk", "STR", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, null, null, null, null, 3460, 1628, 266, null ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
@@ -1819,8 +1819,8 @@ window.units = [
     [ "King Riku, Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Tank", "DEX", [ "Powerhouse", "Striker" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ray Shop Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 4, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Ray Shop Sanji, Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, null, null, null, 1602, 1231, 550, null ],
+    [ "Ray Shop Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
+    [ "Ray Shop Sanji, Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 94a593e4283885a406190f6314260a4ac7d327e8 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 16 Oct 2017 16:11:57 -0400
Subject: [PATCH 1408/1569] World

---
 common/data/cooldowns.js |  2 ++
 common/data/details.js   | 39 +++++++++++++++++++++++++++++++++++++++
 common/data/families.js  |  2 ++
 common/data/flags.js     | 10 ++++++----
 common/data/gw.js        | 12 ++++++------
 common/data/units.js     | 34 +++++++++++++++++++++++++++++++---
 6 files changed, 86 insertions(+), 13 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 4fbc653e7..d492e2d4c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1821,4 +1821,6 @@ window.cooldowns = [
     null,
     [ 14, 14 ],
     [ 14, 14 ],
+    [ 22, 18 ],
+    [ 22, 18 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 0b2df4838..46188f5be 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12651,4 +12651,43 @@ window.details = {
         specialName: "Sanji Special",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
+    1823: {//World
+        captain: "Not Translated",
+        special: [
+            {
+                "description": "Deals 100,000 fixed damage to one enemy and removes ATK down debuff from your team",
+                "cooldown": [ 14, 10 ]
+            },
+            {
+                "description": "Deals 300,000 fixed damage to one enemy and removes ATK down debuff from your team",
+                "cooldown": [ 18, 14 ]
+            },
+            {
+                "description": "Deals 500,000 fixed damage to one enemy, removes ATK down debuff from your team and reduces enemy Barrier duration by 1 turn",
+                "cooldown": [ 22, 18 ]
+            }
+        ],
+        specialNotes:"#{stages}",
+        specialName: "More More: Hundredfold Artillery Cannon",
+    },
+    1824: {//World
+        captain: "Boosts ATK of Shooter characters by 2.2x at the start of the chain.<br>Boosts ATK of Shooter characters by 2.42x after the 1st Perfect in a row, by 2.662x after the 2nd Perfect in a row, by 2.9282x after the 3rd Perfect in a row, by 3.22102x after the 4th Perfect in a row, and by 3.543122x after the 5th Perfect in a row.",
+        special: [
+            {
+                "description": "Deals 100,000 fixed damage to one enemy and removes ATK down debuff from your team",
+                "cooldown": [ 14, 10 ]
+            },
+            {
+                "description": "Deals 300,000 fixed damage to one enemy and removes ATK down debuff from your team",
+                "cooldown": [ 18, 14 ]
+            },
+            {
+                "description": "Deals 500,000 fixed damage to one enemy, removes ATK down debuff from your team and reduces enemy Barrier duration by 1 turn",
+                "cooldown": [ 22, 18 ]
+            }
+        ],
+        specialNotes:"#{stages}",
+        specialName: "More More: Hundredfold Artillery Cannon",
+        limit: "This character has a limit break path",
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index 6d5073b0f..c81e60ce8 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1821,4 +1821,6 @@ window.families = [
     "Tank",
     "Sanji",
     "Sanji",
+    "Byrnndi World",
+    "Byrnndi World",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index c830ef792..e27ac7b98 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1627,12 +1627,14 @@ window.flags = {
     1800: { rr: 1, rro: 1 },
     1801: { rr: 1, rro: 1 },
     1802: { rr: 1, rro: 1 },
-    1803: { rr: 1, rro: 1 },
-    1804: { rr: 1, rro: 1 },
-    1805: { rr: 1, rro: 1 },
-    1806: { rr: 1, rro: 1 },
+    1803: { rr: 1, rro: 1, lrr: 1 },
+    1804: { rr: 1, rro: 1, lrr: 1 },
+    1805: { rr: 1, rro: 1, lrr: 1 },
+    1806: { rr: 1, rro: 1, lrr: 1 },
     1813: { special: 1 },
     1816: { rr: 1, rro: 1 },
     1821: { shop: 1 },
     1822: { shop: 1 },
+    1823: { rr: 1, rro: 1, lrr: 1 },
+    1824: { rr: 1, rro: 1, lrr: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index 10d31b4f5..28bc93fdf 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1801,12 +1801,12 @@ window.gw=[
     69430,
     69439,
     69439,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    72450,
+    72450,
+    72451,
+    72451,
+    72510,
+    72510,
     71419,
     71419,
     71420,
diff --git a/common/data/units.js b/common/data/units.js
index 5c91ff828..2cfbe2457 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1529,7 +1529,7 @@ window.units = [
     [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
     [ "Cavendish, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1588, 801, 249, 1 ],
     [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
-    [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],
+    [ "Usoland", "DEX", "Shooter", 5, 30, 6, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],
     [ "God Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1493, 566, 162, 3141, 1291, 441, 1 ],
     [ "Rayleigh, Straw Hat Pirates Companion", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 141, 107, 32, 1034, 566, 197, 1 ],
     [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 957, 500, 147, 2350, 1298, 351, 1 ],
@@ -1805,8 +1805,8 @@ window.units = [
     [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, null ],
     [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 392109, 166, 87, 29, null, null, null, null ],
     [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, null ],
-    [ "Hawk Eyes Mihawk", "STR", "Slasher", 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, null, null, null, null, 3460, 1628, 266, null ],
+    [ "Hawk Eyes Mihawk", "STR", "Slasher", 4, 30, 6, 1, 50, null, null, null, null, 974, 456, 94, null ],
+    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, null, 847, 332, 57, null, null, null, null ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
@@ -1821,6 +1821,34 @@ window.units = [
     [ "Tank", "DEX", [ "Powerhouse", "Striker" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Ray Shop Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
     [ "Ray Shop Sanji, Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
+    [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 058960c4463f31662924e10c0d7f3df0fc5e5ebc Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 16 Oct 2017 16:28:31 -0400
Subject: [PATCH 1409/1569] Nami

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 46188f5be..13832c6e8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4758,7 +4758,8 @@ window.details = {
     939: {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
         specialName: "Cyclone Burst",
-        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs"
+        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs",
+        limit: "This character has a limit break path",
     },
     940: {
         captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
@@ -8152,7 +8153,6 @@ window.details = {
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
         specialName: "Black Ball - Thundercloud Rod",
-        limit: "This character has a limit break path",
     },
     1367: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 2x",

From cd79cb1d849bf3b717073f2378d2839e98e4b51b Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 16 Oct 2017 16:33:16 -0400
Subject: [PATCH 1410/1569] Limit Tag fix

---
 characters/js/directives.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 430ea89d3..84e1c9db5 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -442,7 +442,9 @@ directives.addTags = function($stateParams, $rootScope) {
                     if (!/limit$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' limit';
                     else name = name.replace(/s$/,'');
                     name = name.replace(/iing/,'ying');
-                    element.append($('<span class="tag limit">' + name + '</div>'));
+                    if (name.contains("Has Limit Break limit")){
+                        element.append($('<span class="tag limit">' + name + '</div>'));
+                    }
                 }
             });
         }

From 79d378505b78821e06599ed8f42d8e0b82c29357 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 17 Oct 2017 21:33:52 -0400
Subject: [PATCH 1411/1569] Quick push

---
 common/data/aliases.js  | 12 ++++++------
 common/data/captains.js | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index be0057d39..511dc2028 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1801,12 +1801,12 @@ window.aliases = {
     1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', ''],
     1801: ['バルトロメオ コリーダコロシアムＢブロックの“人食い”', '', ''],
     1802: ['バルトロメオ 鳥カゴの中の反逆者', '', ''],
-    1803: ['', '', ''],
-    1804: ['', '', ''],
-    1805: ['', '', ''],
-    1806: ['', '', ''],
-    1807: ['', '', ''],
-    1808: ['', '', ''],
+    1803: ['ロロノア・ゾロ “東の海”の海賊', '', ''],
+    1804: ['ロロノア・ゾロ “東の海”の剣豪', '', ''],
+    1805: ['道化のバギー 斬っても斬れないバラバラ人間', '', ''],
+    1806: ['キャプテン・バギー 斬っても斬れないバラバラ人間', '', ''],
+    1807: ['ジュラキュール・ミホーク 世界中の剣士の頂点に立つ男', '', ''],
+    1808: ['鷹の目のミホーク 世界中の剣士の頂点に立つ男', '', ''],
     1809: ['ワンダ モコモ公国', '', ''],
     1810: ['王の鳥　ワンダ モコモ公国', '', ''],
     1811: ['キャロット モコモ公国', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 35086b6ae..38fecba5a 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5541,6 +5541,21 @@ window.captains = {
     1802: {
         atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; }
     },
+    1803: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+    },
+    1804: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; },
+    },
+    1805: {
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
+    },
+    1806: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
+    },
     1809: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;

From 33630f341a1ad012e52f4a22b6de4da6a31f410d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 03:35:34 +0200
Subject: [PATCH 1412/1569] Mihawk STR Special

Chain works, orbs are commented.
---
 common/data/specials.js | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index b42fce59c..e42c23f2b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3648,6 +3648,30 @@ window.specials = {
     1802: {
         def: function(p) { return 0.1; }
     },
+    1805: {
+		def: function(p) { return .0; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    },
+    1806: {
+		def: function(p) { return .0; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    },
+    1807: {
+        chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
+        }
+//        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1808: {
+        chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
+        }
+//        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
     1811: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
         type: "class"
@@ -3680,4 +3704,7 @@ window.specials = {
         atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
         type: "class"
     },
+    1826: {
+        affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
+    },
 };

From 54906cc07f4c166ec197924b160ad6f58b5aecb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 04:27:20 +0200
Subject: [PATCH 1413/1569] STRHawk CA

Works using Captain Action
---
 common/data/captains.js | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 38fecba5a..266dd54b8 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5556,6 +5556,18 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
         hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
     },
+    1807: {
+        atk: function(p){ 
+            return p.unit.class.has("Slasher") ? p.actions[p.sourceSlot] ? 3.5 : 2.5 : 1;
+        },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+    },
+    1808: {
+        atk: function(p){ 
+            return p.unit.class.has("Slasher") ? p.actions[p.sourceSlot] ? 3.5 : 2.5 : 1;
+        },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+    },
     1809: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
@@ -5604,4 +5616,20 @@ window.captains = {
         hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return 1.2; },
     },
-};
\ No newline at end of file
+    1826: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+};

From c0b8dae3d2954147d2c561db3bca67109e9a3432 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 17 Oct 2017 23:36:27 -0400
Subject: [PATCH 1414/1569] Loads of New things

---
 characters/js/directives.js   |  2 +-
 characters/views/details.html |  1 -
 common/data/aliases.js        |  8 ++---
 common/data/captains.js       | 36 +++++++++++++++++++++
 common/data/cooldowns.js      |  4 +--
 common/data/details.js        | 61 ++++++++++++++++++++++++++++++++---
 common/data/drops.js          |  7 ++--
 common/data/evolutions.js     | 12 ++++---
 common/data/specials.js       | 30 +++++++++++++----
 common/data/units.js          | 26 +++++++--------
 common/js/utils.js            |  3 ++
 11 files changed, 150 insertions(+), 40 deletions(-)

diff --git a/characters/js/directives.js b/characters/js/directives.js
index 84e1c9db5..5418baa65 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -442,7 +442,7 @@ directives.addTags = function($stateParams, $rootScope) {
                     if (!/limit$/.test(name)) name = name.replace(/ers$/,'ing').replace(/s$/,'') + ' limit';
                     else name = name.replace(/s$/,'');
                     name = name.replace(/iing/,'ying');
-                    if (name.contains("Has Limit Break limit")){
+                    if (name != "Has Limit Break limit"){
                         element.append($('<span class="tag limit">' + name + '</div>'));
                     }
                 }
diff --git a/characters/views/details.html b/characters/views/details.html
index e4f2612f9..32d892cd5 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -246,7 +246,6 @@ <h3 class="page-header" ng-hide="hidden.abilities">Abilities</h3>
                                                 <span ng-bind-html="stage.description[2] | decorate"></span><br>
                                                 <span ng-bind-html="stage.description[3] | decorate"></span><br>
                                                 <span ng-bind-html="stage.description[4] | decorate"></span><br>
-                                                <br>
                                             </div>
                                         </div>
                                         <div ng-if="isPotentialHybrid">
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 511dc2028..5e1903c2b 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1815,10 +1815,10 @@ window.aliases = {
     1814: ['ヴィンスモーク・サンジ', '', 'Raid Sanji'],
     1815: ['ヴィンスモーク・サンジ ジェルマ王国', '', 'Raid Sanji'],
     1816: ['ポートガス・D・エース 闇討つ太陽', '', 'Super Ace', 'Mega Ace', 'SW Ace', 'Legend Ace',],
-    1817: ['', '', ''],
-    1818: ['', '', ''],
-    1819: ['', '', ''],
-    1820: ['', '', ''],
+    1817: ['リク王', '', ''],
+    1818: ['リク・ドルド３世', '', ''],
+    1819: ['タンク・レパント', '', ''],
+    1820: ['スカーレット', '', ''],
     1821: ['', '', 'Husbando Sanji'],
     1822: ['', '', 'Husbando Sanji'],
     1823: ['', '', ''],
diff --git a/common/data/captains.js b/common/data/captains.js
index 38fecba5a..dfc780c52 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5556,6 +5556,29 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
         hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
     },
+    1807: {
+        atk: function(p){ 
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
+            }
+            return p.unit.class.has("Slasher") ? specialEnabled ? 1.35 : 1 : 1; 
+        },
+    },
+    1808: {
+        atk: function(p){ 
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
+            }
+            return p.unit.class.has("Slasher") ? specialEnabled ? 1.62 : 1.2: 1; 
+        },
+        hp: function(p) { return 1.1 }
+    },
     1809: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
@@ -5597,6 +5620,12 @@ window.captains = {
         atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.25 : 2.25); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
+    1817: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2 : 1;
+        },
+        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
+    },
     1818: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;
@@ -5604,4 +5633,11 @@ window.captains = {
         hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return 1.2; },
     },
+    1819: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+    },
+    1820: {
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+    },
 };
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d492e2d4c..dbc206b6b 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1817,8 +1817,8 @@ window.cooldowns = [
     [ 20, 15 ],
     20,
     20,
-    null,
-    null,
+    16,
+    18,
     [ 14, 14 ],
     [ 14, 14 ],
     [ 22, 18 ],
diff --git a/common/data/details.js b/common/data/details.js
index 13832c6e8..628d8c2e5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12498,10 +12498,51 @@ window.details = {
         specialName: "Black Blade • The Ultimate Sword",
     },
     1808: {//Mihawk
-        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" THIS MIHAWK (maybe?) boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
+        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Slasher characters by 50" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 1.4x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.89x instead for 1 turn." },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Reduce base Special Cooldown by 4 turns" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 75" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 5 turns" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn." },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
         potential: [
             {
                 "Name": "Critical Hit",
@@ -12608,19 +12649,29 @@ window.details = {
         captain: "Boosts HP of Shooter characters by 1.5x and boosts ATK by 3.25x if they have a matching orb, by 2.25x otherwise"
     },
     1817: {// Riku
-        captain: "Boosts ATK of all characters by ???x and their HP by ???x, boosts ATK by ???x after scoring 3 Greats in a row",
+        captain: "Boosts ATK by 2x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
-        specialName: "Riku Special",
+        specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
     },
     1818: {// Riku
         captain: "Boosts ATK of all characters by 1.5x and their HP by 1.2x, boosts ATK by 2.5x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
-        specialName: "Riku Special",
+        specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
     },
+    1819: {//Tank
+        captain: "Boosts ATK of Powerhouse and Stiker characters by 1.75x",
+        special: "Boosts own ATK by 1.75x for 1 turn",
+        specialName: "Shameful Hidden Activity",
+    },
+    1820: {//Scarlet
+        captain: "Boosts HP and RCV of [PSY] characters by 1.5x",
+        special: "Locks all orbs for 1 turn and recovers 5x character's RCV in HP.",
+        specialName: "Frontier Love",
+    },
     1821: {//Sanji
         captain: "Boosts ATK of all characters by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
         special: [
diff --git a/common/data/drops.js b/common/data/drops.js
index 47cbfbd9d..8df2a4fa1 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1679,11 +1679,10 @@ window.drops = {
         },
         
         {
-            name: 'Dressrosa Royal Family!',
+            name: 'Crisis of the 800 Year Old Kingdom!',
             thumb: 1818,
-            condition: '',
-            gamewith: null,
-            'All Difficulties': [ 1817, 1819, 1820 ]
+            gamewith: 72655,
+            'All Difficulties': [ 1817, 1819, 1820, -1610, -1656, -1660, -1230, -1236, -1173, -526, -643, -1506, -964 ]
         },
         
     ],
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index e75ceeae9..3b030d3d1 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2805,15 +2805,15 @@ window.evolutions = {
     },
     1803: {
         evolution: 1804,
-        evolvers: [  ]
+        evolvers: [ 117, 80, 91, 97, 102 ]
     },
     1805: {
         evolution: 1806,
-        evolvers: [  ]
+        evolvers: [ 117, 79, 90, 96, 101 ]
     },
     1807: {
         evolution: 1808,
-        evolvers: [  ]
+        evolvers: [ 115, 116, 117, 118, 100 ]
     },
     1809: {
         evolution: 1810,
@@ -2833,10 +2833,14 @@ window.evolutions = {
     },
     1817: {
         evolution: 1818,
-        evolvers: [  ]
+        evolvers: [ 117, 82, 88, 99, 104 ]
     },
     1821: {
         evolution: 1822,
         evolvers: [  ]
     },
+    1823: {
+        evolution: 1824,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index e42c23f2b..7638ff5fb 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3649,28 +3649,42 @@ window.specials = {
         def: function(p) { return 0.1; }
     },
     1805: {
-		def: function(p) { return .0; },
+		def: function(p) { return 0.0; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1806: {
-		def: function(p) { return .0; },
+		def: function(p) { return 0.0; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1807: {
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1807].turnedOn[p.slot] = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1807].turnedOn[p.slot] = false;
+        },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
-        }
-//        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        },
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1808: {
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1808].turnedOn[p.slot] = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1808].turnedOn[p.slot] = false;
+        },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
-        }
-//        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        },
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1811: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -3704,6 +3718,10 @@ window.specials = {
         atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
         type: "class"
     },
+    1819: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type"
+    },
     1826: {
         affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
     },
diff --git a/common/data/units.js b/common/data/units.js
index d57e47212..fe8a09989 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1646,7 +1646,7 @@ window.units = [
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
     [ "Pica [Neo]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
     [ "Pica [Neo], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
-    [ "Giolla, Art-Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
+    [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
@@ -1801,12 +1801,12 @@ window.units = [
     [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
     [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
     [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
-    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 392109, 157, 96, 22, null, null, null, null ],
-    [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, null ],
-    [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 392109, 166, 87, 29, null, null, null, null ],
-    [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, null ],
-    [ "Hawk Eyes Mihawk", "STR", "Slasher", 4, 30, 6, 1, 50, null, null, null, null, 974, 456, 94, null ],
-    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, null, 847, 332, 57, 2530, 1403, 186, null ],
+    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 261406, 157, 96, 22, 957, 555, 134, 1 ],
+    [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, 1 ],
+    [ "Buggy the Clown, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 261406, 166, 87, 29, 987, 509, 151, 1 ],
+    [ "Captain Buggy, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
+    [ "Dracule Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 4, 30, 6, 1, 50, 130703, 324, 157, 23, 974, 456, 94, 1 ],
+    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 5, 99, 5000000, 847, 332, 57, 2990, 1403, 186, 1 ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
@@ -1815,12 +1815,12 @@ window.units = [
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
     [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 4000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
     [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
-    [ "King Riku", "INT", [ "Cerebral", "Striker" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "King Riku, Evolved", "INT", [ "Cerebral", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Tank", "DEX", [ "Powerhouse", "Striker" ], 3, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Ray Shop Sanji", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
-    [ "Ray Shop Sanji, Evolved", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
+    [ "King Riku", "INT", [ "Cerebral", "Striker" ], 3, 13, 6, 2, 50, 392109, 150, 102, 30, 720, 396, 198, 1 ],
+    [ "Riku Doldo III", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 612, 354, 189, 2066, 992, 275, 1 ],
+    [ "Tank Lepanto", "DEX", [ "Powerhouse", "Striker" ], 3, 15, 5, 1, 70, 1066998, 199, 112, 8, 1674, 1011, 24, 1 ],
+    [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 741, 128, 252, 1920, 630, 420, 1 ],
+    [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
+    [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
     [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/utils.js b/common/js/utils.js
index 61fa6ab18..569fbee09 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -144,6 +144,9 @@
                 case 'INT':
                     return '../res/blank_int.png';
                     break;
+                default:
+                    return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
+                    break;
                 
             }
         }

From 0655a22ebf90256e17b6d4dc1ed1127d452af2f6 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 17 Oct 2017 23:55:09 -0400
Subject: [PATCH 1415/1569] Red Dog

---
 common/data/captains.js   | 19 +++++++++++++++++--
 common/data/cooldowns.js  |  2 ++
 common/data/details.js    | 12 ++++++++++++
 common/data/evolutions.js |  4 ++++
 common/data/specials.js   |  3 +++
 common/data/units.js      |  4 ++--
 6 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index edcf426d2..aaab003a1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5640,6 +5640,22 @@ window.captains = {
         hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
     },
+    1826: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
     1826: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
         hitAtk: function(p) {
@@ -5656,5 +5672,4 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-};
-};
+};
\ No newline at end of file
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index dbc206b6b..68c1445fa 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1823,4 +1823,6 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 22, 18 ],
     [ 22, 18 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 628d8c2e5..1cd6af8f7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12741,4 +12741,16 @@ window.details = {
         specialName: "More More: Hundredfold Artillery Cannon",
         limit: "This character has a limit break path",
     },
+    1825: {//Akainu
+        captain: "Boosts ATK by 2.5x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
+        special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
+        specialNotes: "#{colorAffinity : 1.75}",
+        specialName: "Great Eruption [Neo]",
+    },
+    1826: {//Akainu
+        captain: "Boosts ATK by 3x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
+        special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
+        specialNotes: "#{colorAffinity : 1.75}",
+        specialName: "Great Eruption [Neo]",
+    },
 };
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 3b030d3d1..f4a338e6c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2843,4 +2843,8 @@ window.evolutions = {
         evolution: 1824,
         evolvers: [  ]
     },
+    1825: {
+        evolution: 1826,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/specials.js b/common/data/specials.js
index 7638ff5fb..a5003a74c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3722,6 +3722,9 @@ window.specials = {
         atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
+    1825: {
+        affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
+    },
     1826: {
         affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
     },
diff --git a/common/data/units.js b/common/data/units.js
index fe8a09989..57a3fae47 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1823,8 +1823,8 @@ window.units = [
     [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
     [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 4951faf75b2f6651c0bad30ff2283938596ad523 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 17 Oct 2017 23:55:26 -0400
Subject: [PATCH 1416/1569] Neo Akainu

---
 common/data/drops.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/drops.js b/common/data/drops.js
index 8df2a4fa1..5b578b236 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1987,6 +1987,13 @@ window.drops = {
             Ultimate: [ 1297 ]
         },
         
+        {
+            name: 'Clash Neo!! Akainu',
+            thumb: 1826,
+            condition: '3 different Ultimate versions with different conditions. Ultimate: Shooter Only, Striker Only, and Slasher Only',
+            Ultimate: [ 1825 ]
+        },
+        
         {
             name: 'Clash!! Warden Magellan',
             thumb: 1374,

From 413f1a0ffe9b828b726fedbca18d5579f1906e43 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 18 Oct 2017 02:05:46 -0400
Subject: [PATCH 1417/1569] Sockets

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 57a3fae47..517e610a3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1806,7 +1806,7 @@ window.units = [
     [ "Buggy the Clown, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 261406, 166, 87, 29, 987, 509, 151, 1 ],
     [ "Captain Buggy, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
     [ "Dracule Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 4, 30, 6, 1, 50, 130703, 324, 157, 23, 974, 456, 94, 1 ],
-    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 5, 99, 5000000, 847, 332, 57, 2990, 1403, 186, 1 ],
+    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 1, 99, 5000000, 847, 332, 57, 2990, 1403, 186, 1 ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],

From 01a76b15abe9b9c0dd388298935f538974432d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 16:04:37 +0200
Subject: [PATCH 1418/1569] Sicilian units.js

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 517e610a3..49aa9d479 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1825,8 +1825,8 @@ window.units = [
     [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sicilian 4*", "INT", [ "Slasher", "Powerhouse" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sicilian", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 5000000, null, null, null, 2270, 1421, 328, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 38786485dd394e91aa2747a889578055d986bbba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 16:07:44 +0200
Subject: [PATCH 1419/1569] Naming

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 49aa9d479..6ecaa03e7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1825,8 +1825,8 @@ window.units = [
     [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
-    [ "Sicilian 4*", "INT", [ "Slasher", "Powerhouse" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sicilian", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 5000000, null, null, null, 2270, 1421, 328, null ],
+    [ "Sicilian Coloseum", "INT", [ "Slasher", "Powerhouse" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 5000000, null, null, null, 2270, 1421, 328, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 541d9ea4a54c8400e47314ec414fb867ca0a04e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 16:43:56 +0200
Subject: [PATCH 1420/1569] More Sicilian

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 6ecaa03e7..5ac892404 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1825,8 +1825,8 @@ window.units = [
     [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
-    [ "Sicilian Coloseum", "INT", [ "Slasher", "Powerhouse" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 5000000, null, null, null, 2270, 1421, 328, null ],
+    [ "Sicilian Coloseum", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], null, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 989e3fb6feb87530e5ff1510bf36c8a08aa28df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 16:53:53 +0200
Subject: [PATCH 1421/1569] null

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 5ac892404..873ce651d 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1824,9 +1824,9 @@ window.units = [
     [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
+    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, null, null, null, 3156, 1450, 99, null ],
     [ "Sicilian Coloseum", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], null, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
+    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, null, null, null, 2270, 1421, 328, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 51ca9286b684aecfe48240e04219257d23736897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:15:08 +0200
Subject: [PATCH 1422/1569] CALC WORK

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 873ce651d..ed7e112a7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1822,11 +1822,11 @@ window.units = [
     [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
     [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
     [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, null, null, null, 2462, 1408, 319, null ],
+    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2462, 1408, 319, null ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, null, null, null, 3156, 1450, 99, null ],
+    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
     [ "Sicilian Coloseum", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, null, null, null, 2270, 1421, 328, null ],
+    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From d2770ca6f98d13d1e451889475e7ddd481a34917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:20:23 +0200
Subject: [PATCH 1423/1569] Just a tweak

---
 common/data/units.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index ed7e112a7..cd926acd7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1529,7 +1529,7 @@ window.units = [
     [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
     [ "Cavendish, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1588, 801, 249, 1 ],
     [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
-    [ "Usoland", "DEX", "Shooter", 5, 30, 6, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],
+    [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],
     [ "God Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1493, 566, 162, 3141, 1291, 441, 1 ],
     [ "Rayleigh, Straw Hat Pirates Companion", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 141, 107, 32, 1034, 566, 197, 1 ],
     [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 957, 500, 147, 2350, 1298, 351, 1 ],
@@ -1646,7 +1646,7 @@ window.units = [
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
     [ "Pica [Neo]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
     [ "Pica [Neo], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
-    [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
+    [ "Giolla, Art-Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
@@ -1801,12 +1801,12 @@ window.units = [
     [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
     [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
     [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
-    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 261406, 157, 96, 22, 957, 555, 134, 1 ],
+    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 392109, 157, 96, 22, null, null, null, null ],
     [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, 1 ],
-    [ "Buggy the Clown, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 261406, 166, 87, 29, 987, 509, 151, 1 ],
-    [ "Captain Buggy, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
-    [ "Dracule Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 4, 30, 6, 1, 50, 130703, 324, 157, 23, 974, 456, 94, 1 ],
-    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 1, 99, 5000000, 847, 332, 57, 2990, 1403, 186, 1 ],
+    [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 392109, 166, 87, 29, null, null, null, null ],
+    [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
+    [ "Hawk Eyes Mihawk, 4*", "STR", "Slasher", 5, 60, 4, 5, 99, 5000000, 847, 332, 57, 3460, 1628, 266, 1 ],
+    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, 5000000, 847, 332, 57, 3460, 1628, 266, 1 ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
@@ -1853,4 +1853,4 @@ window.units = [
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ],
-// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, Sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ],
+// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ],

From a3a1c99bd02a58948b4403bb6a0c99764be888b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:21:13 +0200
Subject: [PATCH 1424/1569] Update specials.js

---
 common/data/specials.js | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index a5003a74c..3368824f5 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3649,42 +3649,28 @@ window.specials = {
         def: function(p) { return 0.1; }
     },
     1805: {
-		def: function(p) { return 0.0; },
+		def: function(p) { return .0; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1806: {
-		def: function(p) { return 0.0; },
+		def: function(p) { return .0; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1807: {
-        turnedOn: [ false, false ],
-        onActivation: function(p) {
-            window.specials[1807].turnedOn[p.slot] = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1807].turnedOn[p.slot] = false;
-        },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
         },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1808: {
-        turnedOn: [ false, false ],
-        onActivation: function(p) {
-            window.specials[1808].turnedOn[p.slot] = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1808].turnedOn[p.slot] = false;
-        },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
         },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1811: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -3718,14 +3704,18 @@ window.specials = {
         atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
         type: "class"
     },
-    1819: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-        type: "type"
-    },
     1825: {
         affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
     },
     1826: {
         affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
     },
+    1827: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        type: "type"
+    },
+    1828: {
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        type: "type"
+    },
 };

From dd32cfc8306e8a945517ce436405b86536517103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:21:41 +0200
Subject: [PATCH 1425/1569] World

---
 common/data/captains.js | 59 ++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 24 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index aaab003a1..24ad9d29e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5558,26 +5558,15 @@ window.captains = {
     },
     1807: {
         atk: function(p){ 
-            var specialEnabled = false;
-            for(var i=0;i<2;i++)
-            {
-                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
-            }
-            return p.unit.class.has("Slasher") ? specialEnabled ? 1.35 : 1 : 1; 
+            return p.unit.class.has("Slasher") ? p.actions[p.sourceSlot] ? 3.5 : 2.5 : 1;
         },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
     },
     1808: {
         atk: function(p){ 
-            var specialEnabled = false;
-            for(var i=0;i<2;i++)
-            {
-                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
-            }
-            return p.unit.class.has("Slasher") ? specialEnabled ? 1.62 : 1.2: 1; 
+            return p.unit.class.has("Slasher") ? p.actions[p.sourceSlot] ? 3.5 : 2.5 : 1;
         },
-        hp: function(p) { return 1.1 }
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
     },
     1809: {
         hitAtk: function(p) {
@@ -5620,12 +5609,6 @@ window.captains = {
         atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.25 : 2.25); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
-    1817: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2 : 1;
-        },
-        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
-    },
     1818: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;
@@ -5640,7 +5623,29 @@ window.captains = {
         hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
     },
-    1826: {
+    1821: {
+        atk: function(p) { return 1.5; }
+    },
+    1822: {
+        atk: function(p) { return 2; }
+    },
+    1823: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
+    1824: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
+    1825: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
         hitAtk: function(p) {
             return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
@@ -5652,7 +5657,7 @@ window.captains = {
             }, {
                 type: 'INT',
                 minModifier: 'Good'
-            }]) ? 2.5 : 1;
+            }]) ? 3 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -5672,4 +5677,10 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-};
\ No newline at end of file
+    1827: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 2.5; }
+    },
+    1828: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 2.5; }
+    },
+};

From c3b6e74459840c67c937854994e43fe9be98a7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:21:53 +0200
Subject: [PATCH 1426/1569] World, Sicilian

---
 common/data/cooldowns.js | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 68c1445fa..76099cbdb 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1817,12 +1817,15 @@ window.cooldowns = [
     [ 20, 15 ],
     20,
     20,
-    16,
-    18,
+    null,
+    null,
     [ 14, 14 ],
     [ 14, 14 ],
-    [ 22, 18 ],
-    [ 22, 18 ],
-    [ 25, 16 ],
-    [ 25, 16 ],
+    [ 22, 18 ],//Limited World
+    [ 22, 18 ],//Limited World
+    [ 25, 16 ],//Akainu Kai
+    [ 25, 16 ],//Akainu Kai
+    [ 25, 10 ],//Sicilian Coli
+    [ 25, 10 ],//Sicilian Coli
+    null,
 ];

From a486bb69b1f4bb91e71521400f7e2e2d9bc1811b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:22:21 +0200
Subject: [PATCH 1427/1569] Sicilian

---
 common/data/details.js | 75 +++++++++---------------------------------
 1 file changed, 16 insertions(+), 59 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 1cd6af8f7..c37196037 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4758,8 +4758,7 @@ window.details = {
     939: {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
         specialName: "Cyclone Burst",
-        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs",
-        limit: "This character has a limit break path",
+        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs"
     },
     940: {
         captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
@@ -8153,6 +8152,7 @@ window.details = {
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
         specialName: "Black Ball - Thundercloud Rod",
+        limit: "This character has a limit break path",
     },
     1367: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 2x",
@@ -12498,51 +12498,10 @@ window.details = {
         specialName: "Black Blade • The Ultimate Sword",
     },
     1808: {//Mihawk
-        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
+        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" THIS MIHAWK (maybe?) boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
-        limit: [
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Boosts base ATK by 10" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base RCV by 5" },
-            { "description": "Aquire Potential 1: Critical Hit" },
-            { "description": "Aquire new Captain Ability: " },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Slasher characters by 50" },
-            { "description": "Boosts base ATK by 15" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 1.4x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.89x instead for 1 turn." },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base RCV by 15" },
-            { "description": "Aquire new Captain Ability: " },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Reduce base Special Cooldown by 3 turns" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base HP by 65" },
-            { "description": "Reduce base Special Cooldown by 4 turns" },
-            { "description": "Aquire new Captain Ability: " },
-            { "description": "Boosts base ATK by 35" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 75" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Reduce base Special Cooldown by 5 turns" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire new Captain Ability: " },
-            { "description": "Boosts base ATK by 50" },
-            { "description": "Boosts base HP by 80" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn." },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
-        ],
+        limit: "This character has a limit break path",
         potential: [
             {
                 "Name": "Critical Hit",
@@ -12649,29 +12608,19 @@ window.details = {
         captain: "Boosts HP of Shooter characters by 1.5x and boosts ATK by 3.25x if they have a matching orb, by 2.25x otherwise"
     },
     1817: {// Riku
-        captain: "Boosts ATK by 2x after scoring 3 Greats in a row",
+        captain: "Boosts ATK of all characters by ???x and their HP by ???x, boosts ATK by ???x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
-        specialName: "Divine Sword",
+        specialName: "Riku Special",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
     },
     1818: {// Riku
         captain: "Boosts ATK of all characters by 1.5x and their HP by 1.2x, boosts ATK by 2.5x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
-        specialName: "Divine Sword",
+        specialName: "Riku Special",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
     },
-    1819: {//Tank
-        captain: "Boosts ATK of Powerhouse and Stiker characters by 1.75x",
-        special: "Boosts own ATK by 1.75x for 1 turn",
-        specialName: "Shameful Hidden Activity",
-    },
-    1820: {//Scarlet
-        captain: "Boosts HP and RCV of [PSY] characters by 1.5x",
-        special: "Locks all orbs for 1 turn and recovers 5x character's RCV in HP.",
-        specialName: "Frontier Love",
-    },
     1821: {//Sanji
         captain: "Boosts ATK of all characters by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
         special: [
@@ -12748,9 +12697,17 @@ window.details = {
         specialName: "Great Eruption [Neo]",
     },
     1826: {//Akainu
-        captain: "Boosts ATK by 3x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
+        captain: "Boosts ATK by 2.5x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
         special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption [Neo]",
     },
+    1827: {//Sicilian Colo
+        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
+        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
+    },
+    1828: {//Sicilian Colo
+        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
+        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
+    },
 };

From 49fe44c46ed8c951287f23cf58b3cb396e1c9544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:27:01 +0200
Subject: [PATCH 1428/1569] Riku

---
 common/data/captains.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index 24ad9d29e..7f9003aea 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5609,6 +5609,12 @@ window.captains = {
         atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.25 : 2.25); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
+    1817: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2 : 1;
+        },
+        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
+    },
     1818: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;

From c55b756c875e385515be1fb57837046f483a7c25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:28:10 +0200
Subject: [PATCH 1429/1569] Akainu kai 4*

---
 common/data/captains.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 7f9003aea..9ceeca0a3 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5663,7 +5663,7 @@ window.captains = {
             }, {
                 type: 'INT',
                 minModifier: 'Good'
-            }]) ? 3 : 1;
+            }]) ? 2.5 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },

From 84e8bb9175ea563140d3f9375d9f4d24a290d2e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:28:35 +0200
Subject: [PATCH 1430/1569] Tank&Scarlett

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 76099cbdb..d3d6aa744 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1817,8 +1817,8 @@ window.cooldowns = [
     [ 20, 15 ],
     20,
     20,
-    null,
-    null,
+    16,
+    18,
     [ 14, 14 ],
     [ 14, 14 ],
     [ 22, 18 ],//Limited World

From 1ff7c23061662d69f412febef998e2c945a35e57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:34:32 +0200
Subject: [PATCH 1431/1569] Units

---
 common/data/units.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index cd926acd7..ed7e112a7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1529,7 +1529,7 @@ window.units = [
     [ "Blenheim, Whitebeard 9th Div. Commander", "PSY", [ "Powerhouse", "Slasher" ], 4, 26, 6, 3, 99, 3000000, 168, 98, 29, 1959, 1246, 248, 1 ],
     [ "Cavendish, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 4, 30, 6, 2, 70, 1778330, 1072, 535, 131, 1588, 801, 249, 1 ],
     [ "Cavendish of Hakuba, Beautiful Pirates Captain", "QCK", [ "Slasher", "Free Spirit" ], 5, 50, 5, 3, 99, 5000000, 1500, 737, 202, 2487, 1477, 361, 1 ],
-    [ "Usoland", "DEX", "Shooter", 5, 30, 4, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],
+    [ "Usoland", "DEX", "Shooter", 5, 30, 6, 3, 70, 1066998, 466, 139, 51, 1551, 637, 220, 1 ],
     [ "God Usopp", "DEX", "Shooter", 6, 55, 4, 5, 99, 5000000, 1493, 566, 162, 3141, 1291, 441, 1 ],
     [ "Rayleigh, Straw Hat Pirates Companion", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 141, 107, 32, 1034, 566, 197, 1 ],
     [ "Rayleigh, Straw Hat Pirates Accomplice", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 957, 500, 147, 2350, 1298, 351, 1 ],
@@ -1646,7 +1646,7 @@ window.units = [
     [ "Skilled Footwork Centaur, Punk Hazard Patrol Troop Corps", "DEX", [ "Slasher", "Powerhouse" ], 3, 12, 6, 1, 60, 449516, 59, 35, 16, 1182, 700, 169, 1 ],
     [ "Pica [Neo]", "STR", [ "Powerhouse", "Driven" ], 4, 30, 4, 2, 70, 1066998, 270, 129, 1, 1700, 660, 2, 1 ],
     [ "Pica [Neo], Donquixote Pirates", "STR", [ "Powerhouse", "Driven" ], 5, 50, 4, 3, 99, 5000000, 1630, 582, 1, 4020, 1210, 5, 1 ],
-    [ "Giolla, Art-Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
+    [ "Giolla, Art Human", "STR", [ "Shooter", "Free Spirit" ], 3, 13, 4, 3, 50, 392109, 73, 55, 13, 700, 505, 165, 1 ],
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
@@ -1801,12 +1801,12 @@ window.units = [
     [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
     [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
     [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
-    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 392109, 157, 96, 22, null, null, null, null ],
+    [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 261406, 157, 96, 22, 957, 555, 134, 1 ],
     [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, 1 ],
-    [ "Buggy the Clown, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 392109, 166, 87, 29, null, null, null, null ],
-    [ "Captain Buggy, The Chop-Chop Man Who Can't be Sliced by a Sword", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
-    [ "Hawk Eyes Mihawk, 4*", "STR", "Slasher", 5, 60, 4, 5, 99, 5000000, 847, 332, 57, 3460, 1628, 266, 1 ],
-    [ "Hawk Eyes Mihawk, The Man Standing on Top of the World as the Strongest Swordsman", "STR", "Slasher", 5, 60, 4, 5, 99, 5000000, 847, 332, 57, 3460, 1628, 266, 1 ],
+    [ "Buggy the Clown, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 261406, 166, 87, 29, 987, 509, 151, 1 ],
+    [ "Captain Buggy, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
+    [ "Dracule Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 4, 30, 6, 1, 50, 130703, 324, 157, 23, 974, 456, 94, 1 ],
+    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 1, 99, 5000000, 847, 332, 57, 2990, 1403, 186, 1 ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
@@ -1853,4 +1853,4 @@ window.units = [
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
 // or [ "Name", "Type", "Class1", null, null, null, null, null, null, null, null, null, null, null, null, null ],
-// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ],
+// [ "Name", "Type", [ "Class1", "Class2" ], Stars, Cost, Combo, Sockets, maxLVL, EXPToMax, lvl1HP, lvl1ATK, lvl1RCV, MAXHP, MAXATK, MAXRCV, Growth Rate ],

From 6e278d9f9f227c8c953e3fc1fd860eefd048039c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:36:08 +0200
Subject: [PATCH 1432/1569] hawk

---
 common/data/captains.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 9ceeca0a3..c3f4c67d4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5558,15 +5558,26 @@ window.captains = {
     },
     1807: {
         atk: function(p){ 
-            return p.unit.class.has("Slasher") ? p.actions[p.sourceSlot] ? 3.5 : 2.5 : 1;
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
+            }
+            return p.unit.class.has("Slasher") ? specialEnabled ? 1.35 : 1 : 1; 
         },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
     },
     1808: {
         atk: function(p){ 
-            return p.unit.class.has("Slasher") ? p.actions[p.sourceSlot] ? 3.5 : 2.5 : 1;
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
+            }
+            return p.unit.class.has("Slasher") ? specialEnabled ? 1.62 : 1.2: 1; 
         },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+        hp: function(p) { return 1.1 }
     },
     1809: {
         hitAtk: function(p) {

From dec8df02f8c57e3e5ca0792351911ed07821ec2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:36:16 +0200
Subject: [PATCH 1433/1569] Hawk

---
 common/data/specials.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index 3368824f5..97c7be525 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3649,14 +3649,21 @@ window.specials = {
         def: function(p) { return 0.1; }
     },
     1805: {
-		def: function(p) { return .0; },
+		def: function(p) { return 0.0; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1806: {
-		def: function(p) { return .0; },
+		def: function(p) { return 0.0; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1807: {
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1807].turnedOn[p.slot] = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1807].turnedOn[p.slot] = false;
+        },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         chainLimiter: function(p) {
             var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
@@ -3665,6 +3672,13 @@ window.specials = {
         orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1808: {
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1808].turnedOn[p.slot] = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1808].turnedOn[p.slot] = false;
+        },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         chainLimiter: function(p) {
             var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
@@ -3704,6 +3718,10 @@ window.specials = {
         atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
         type: "class"
     },
+    1819: {
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type"
+    },
     1825: {
         affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
     },

From eb8ac542da1981def1b43cbe319e45000191c5e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:38:06 +0200
Subject: [PATCH 1434/1569] hawk

---
 common/data/details.js | 48 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c37196037..e5e565767 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -4758,7 +4758,8 @@ window.details = {
     939: {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
         specialName: "Cyclone Burst",
-        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs"
+        special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs",
+        limit: "This character has a limit break path",
     },
     940: {
         captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
@@ -12498,10 +12499,51 @@ window.details = {
         specialName: "Black Blade • The Ultimate Sword",
     },
     1808: {//Mihawk
-        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" THIS MIHAWK (maybe?) boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
+        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Slasher characters by 50" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 1.4x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.89x instead for 1 turn." },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Reduce base Special Cooldown by 4 turns" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 75" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 5 turns" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire new Captain Ability: " },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn." },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
         potential: [
             {
                 "Name": "Critical Hit",

From d4ac61643bd4011b0525f5982913def8447e3dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 18 Oct 2017 17:38:41 +0200
Subject: [PATCH 1435/1569] Mirror

---
 common/data/details.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index e5e565767..1cd6af8f7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8153,7 +8153,6 @@ window.details = {
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
         specialName: "Black Ball - Thundercloud Rod",
-        limit: "This character has a limit break path",
     },
     1367: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 2x",
@@ -12650,19 +12649,29 @@ window.details = {
         captain: "Boosts HP of Shooter characters by 1.5x and boosts ATK by 3.25x if they have a matching orb, by 2.25x otherwise"
     },
     1817: {// Riku
-        captain: "Boosts ATK of all characters by ???x and their HP by ???x, boosts ATK by ???x after scoring 3 Greats in a row",
+        captain: "Boosts ATK by 2x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
-        specialName: "Riku Special",
+        specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
     },
     1818: {// Riku
         captain: "Boosts ATK of all characters by 1.5x and their HP by 1.2x, boosts ATK by 2.5x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
-        specialName: "Riku Special",
+        specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
     },
+    1819: {//Tank
+        captain: "Boosts ATK of Powerhouse and Stiker characters by 1.75x",
+        special: "Boosts own ATK by 1.75x for 1 turn",
+        specialName: "Shameful Hidden Activity",
+    },
+    1820: {//Scarlet
+        captain: "Boosts HP and RCV of [PSY] characters by 1.5x",
+        special: "Locks all orbs for 1 turn and recovers 5x character's RCV in HP.",
+        specialName: "Frontier Love",
+    },
     1821: {//Sanji
         captain: "Boosts ATK of all characters by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
         special: [
@@ -12739,17 +12748,9 @@ window.details = {
         specialName: "Great Eruption [Neo]",
     },
     1826: {//Akainu
-        captain: "Boosts ATK by 2.5x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
+        captain: "Boosts ATK by 3x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
         special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption [Neo]",
     },
-    1827: {//Sicilian Colo
-        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
-        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
-    },
-    1828: {//Sicilian Colo
-        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
-        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
-    },
 };

From 1c89ddcbbab26e2b6265ddc4a5604bae53b4ba1a Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 18 Oct 2017 18:48:54 -0400
Subject: [PATCH 1436/1569] Sicilian Fix and Corazon fix

---
 common/data/captains.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c3f4c67d4..cf08bcd80 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -4942,7 +4942,7 @@ window.captains = {
         atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
     },
     1662: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2.5 : 1; },
     },
     1663: {
         atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.5 : 2.5); },
@@ -5695,9 +5695,9 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1827: {
-        atk: function(p) { return p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1828: {
-        atk: function(p) { return p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
 };

From d4e964fce0a83fe54249dea615249e644807b431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 19 Oct 2017 02:22:19 +0200
Subject: [PATCH 1437/1569] Map Effect for the new mode

I couldn't make Lucy + BuggyZoro to work so just Buggy and Zoro
---
 common/data/effects.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 1c6799395..5015229d8 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -402,5 +402,29 @@ window.effects = {
         id: 42, // don't change this
         chainLimiter: function() { return 1.5; }
     },
+
+    'Treasure Map [Mihawk Season]': {
+        description: 'Boost stats of Buggy & Zoro 2.5x',
+        thumb: 1808,
+        id: 43, // don't change this
+        atk: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1803 && id < 1806) ||
+                    [ 1804, 1806 ].indexOf(id) != -1);
+            return !matching ? 1 : 2.5;
+        },
+        hp: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1803 && id < 1806) ||
+                    [ 1804, 1806 ].indexOf(id) != -1);
+            return !matching ? 1 : 2.5;
+        },
+        rcv: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1803 && id < 1806) ||
+                    [ 1804, 1806 ].indexOf(id) != -1);
+            return !matching ? 1 : 2.5;
+        },
+	},
     
-};
\ No newline at end of file
+};

From f0a0de20da69193bec9b802868ae5c342c230f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 19 Oct 2017 06:00:06 +0200
Subject: [PATCH 1438/1569] Neo Akainu Boosted Units

Was requested on Marineford Discord
---
 common/data/effects.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/common/data/effects.js b/common/data/effects.js
index 5015229d8..ad5229d54 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -426,5 +426,29 @@ window.effects = {
             return !matching ? 1 : 2.5;
         },
 	},
+	
+	'Akainu Neo - Slasher Raid Boost': {
+        description: 'Certain units boosted',
+        thumb: 1826,
+        id: 44, // don't change this
+        atk: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1742 && id < 1745) ||
+                    [ 1795, 1796, 1539, 1540, 1823, 1844, 1277, 1278 ].indexOf(id) != -1);
+            return !matching ? 1 : 1.75;
+        },
+        hp: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1742 && id < 1745) ||
+                    [ 1795, 1796, 1539, 1540, 1823, 1844, 1277, 1278 ].indexOf(id) != -1);
+            return !matching ? 1 : 1.75;
+        },
+        rcv: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1742 && id < 1745) ||
+                    [ 1795, 1796, 1539, 1540, 1823, 1844, 1277, 1278 ].indexOf(id) != -1);
+            return !matching ? 1 : 1.75;
+        },
+	},
     
 };

From 5c9fc751ccdd7250f5fdbd1c4319c7d020b06dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 19 Oct 2017 06:01:56 +0200
Subject: [PATCH 1439/1569] Name

---
 common/data/effects.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index ad5229d54..a45433715 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -427,7 +427,7 @@ window.effects = {
         },
 	},
 	
-	'Akainu Neo - Slasher Raid Boost': {
+	'Akainu Neo': {
         description: 'Certain units boosted',
         thumb: 1826,
         id: 44, // don't change this

From e5d078ba8804fad01b851656cc655df73f5064fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 19 Oct 2017 06:05:24 +0200
Subject: [PATCH 1440/1569] Added DEX Sandersonia

---
 common/data/effects.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index a45433715..99e1c1c60 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -433,19 +433,19 @@ window.effects = {
         id: 44, // don't change this
         atk: function(p) {
             var id = p.number + 1,
-                matching = ((id > 1742 && id < 1745) ||
+                matching = ((id > 1740 && id < 1745) ||
                     [ 1795, 1796, 1539, 1540, 1823, 1844, 1277, 1278 ].indexOf(id) != -1);
             return !matching ? 1 : 1.75;
         },
         hp: function(p) {
             var id = p.number + 1,
-                matching = ((id > 1742 && id < 1745) ||
+                matching = ((id > 1740 && id < 1745) ||
                     [ 1795, 1796, 1539, 1540, 1823, 1844, 1277, 1278 ].indexOf(id) != -1);
             return !matching ? 1 : 1.75;
         },
         rcv: function(p) {
             var id = p.number + 1,
-                matching = ((id > 1742 && id < 1745) ||
+                matching = ((id > 1740 && id < 1745) ||
                     [ 1795, 1796, 1539, 1540, 1823, 1844, 1277, 1278 ].indexOf(id) != -1);
             return !matching ? 1 : 1.75;
         },

From 40f50f09a6aee27a5781e6e405906846bc20e673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 19 Oct 2017 20:07:58 +0200
Subject: [PATCH 1441/1569] #1743 STR Marigold LB info fix

---
 common/data/details.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index 1cd6af8f7..1ec4bbcec 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11438,7 +11438,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 70" },
             { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Sailor Ability 1: Boosts this character's attack against [DEX] characters by 2x" },
+            { "description": "Aquire Sailor Ability 1: Boosts this character's attack against [QCK] characters by 2x" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },

From ba65496911dd0a591e8fffcb78b6871e4f1a19b8 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 20 Oct 2017 10:54:55 -0400
Subject: [PATCH 1442/1569] Dogra Ace mismatch

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d3d6aa744..d4108008e 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1519,8 +1519,8 @@ window.cooldowns = [
     [ 28, 15 ],
     [ 17, 8 ],
     [ 17, 8 ],
-    [ 15, 4 ],
     [ 16, 8 ],
+    [ 15, 4 ],
     [ 11, 11 ],
     [ 11, 11 ],
     [ 30, 16 ],

From 387f4d7bd922a2affaf410c44ef7598316d28e4c Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 20 Oct 2017 14:53:42 -0400
Subject: [PATCH 1443/1569] Rayleigh

Global is bad
---
 common/data/aliases.js    |   2 +
 common/data/captains.js   |   6 ++
 common/data/cooldowns.js  | 172 ++++++++++++++++++++++++++++++++++++
 common/data/details.js    |  24 ++++--
 common/data/drops.js      |  16 +++-
 common/data/evolutions.js |   4 +
 common/data/families.js   | 177 ++++++++++++++++++++++++++++++++++++++
 common/data/flags.js      |   2 +
 common/data/matchers.js   |   6 ++
 common/data/specials.js   |  10 ++-
 common/data/units.js      | 159 +++++++++++++++++++++++++++++++++-
 common/data/zombies.js    |   4 +
 12 files changed, 567 insertions(+), 15 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 5e1903c2b..6be861cd9 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1829,6 +1829,8 @@ window.aliases = {
     1828: ['', '', ''],
     1829: ['', '', ''],
     1830: ['', '', ''],
+    2000: ['', '', 'Global Rayleigh', 'Raidleigh'],
+    2001: ['', '', 'Global Rayleigh', 'Raidleigh'],
 };
 
 //  xxxx: ['JPN', 'FR', 'Other'],
diff --git a/common/data/captains.js b/common/data/captains.js
index cf08bcd80..eac6a5d5c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5700,4 +5700,10 @@ window.captains = {
     1828: {
         atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
+    2000: {
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
+    },
+    2001: {
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d4108008e..5b930b8c8 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1828,4 +1828,176 @@ window.cooldowns = [
     [ 25, 10 ],//Sicilian Coli
     [ 25, 10 ],//Sicilian Coli
     null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ null, 16 ],
+    [ null, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index 1cd6af8f7..02bf63a34 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8833,7 +8833,7 @@ window.details = {
     },
     1448: {//Chopper 5+
         captain: "Boosts ATK of Fighter characters by 2.5x.",
-        special: "Deals PSY damage according to HP. Changes [BLOCK] orbs on Fighter characters into matching.",
+        special: "Deals PSY damage according to HP. For Fighter characters, Changes [BLOCK] orbs into matching orbs.",
         specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the higher the HP is. The formula used is ???? * (current HP) / (total HP)",
         specialName: "Weight Gain: Heavy Gong",
     },
@@ -11438,7 +11438,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 70" },
             { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Sailor Ability 1: Boosts this character's attack against [DEX] characters by 2x" },
+            { "description": "Aquire Sailor Ability 1: Boosts this character's attack against [STR] characters by 2x" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
@@ -12507,18 +12507,18 @@ window.details = {
             { "description": "Boosts base HP by 30" },
             { "description": "Boosts base RCV by 5" },
             { "description": "Aquire Potential 1: Critical Hit" },
-            { "description": "Aquire new Captain Ability: " },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 1.35x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.8225x instead for 1 turn." },
             { "description": "Aquire Sailor Ability 1: Boosts base ATK of Slasher characters by 50" },
             { "description": "Boosts base ATK by 15" },
             { "description": "Boosts base HP by 40" },
             { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 1.4x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.89x instead for 1 turn." },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 1.6x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.16x instead for 1 turn." },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Boosts base ATK by 20" },
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base RCV by 15" },
-            { "description": "Aquire new Captain Ability: " },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 1.8x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.43x instead for 1 turn." },
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Boosts base ATK by 25" },
             { "description": "Boosts base HP by 60" },
@@ -12528,7 +12528,7 @@ window.details = {
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base HP by 65" },
             { "description": "Reduce base Special Cooldown by 4 turns" },
-            { "description": "Aquire new Captain Ability: " },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn." },
             { "description": "Boosts base ATK by 35" },
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
@@ -12537,7 +12537,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Reduce base Special Cooldown by 5 turns" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire new Captain Ability: " },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn." },
             { "description": "Boosts base ATK by 50" },
             { "description": "Boosts base HP by 80" },
             { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn." },
@@ -12753,4 +12753,14 @@ window.details = {
         specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption [Neo]",
     },
+    2000: {//Rayleigh
+        captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
+        special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
+        specialName: "Maelstrom at Sea",
+    },
+    2001: {//Rayleigh
+        captain: "Boosts ATK of Slasher and Cerebral characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
+        special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
+        specialName: "Maelstrom at Sea",
+    },
 };
diff --git a/common/data/drops.js b/common/data/drops.js
index 5b578b236..a1c285b8b 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1990,8 +1990,10 @@ window.drops = {
         {
             name: 'Clash Neo!! Akainu',
             thumb: 1826,
-            condition: '3 different Ultimate versions with different conditions. Ultimate: Shooter Only, Striker Only, and Slasher Only',
-            Ultimate: [ 1825 ]
+            gamewith: 73951,
+            condition: '1 Master version and 3 different Ultimate versions with different conditions. Master: Shooter/Striker/Slaher Only. Ultimate: Shooter Only, Striker Only, and Slasher Only',
+            Ultimate: [ 1825 ],
+            Master: [ 1825 ],
         },
         
         {
@@ -2050,11 +2052,19 @@ window.drops = {
         {
             name: 'Clash!! Vinsmoke Sanji',
             thumb: 1815,
-            gamewith: null,
+            gamewith: 70374,
             Ultimate: [ 1814 ],
             Master: [ 1814 ],
             Expert: [ 1814 ]
         },
+        
+        {
+            name: 'Clash!! Rayleigh',
+            thumb: 2001,
+            gamewith: null,
+            Ultimate: [ 2000 ],
+            Master: [ 2000 ]
+        },
 
     ],
 
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index f4a338e6c..24f69386d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2847,4 +2847,8 @@ window.evolutions = {
         evolution: 1826,
         evolvers: [  ]
     },
+    2000: {
+        evolution: 2001,
+        evolvers: [  ]
+    },
 };
diff --git a/common/data/families.js b/common/data/families.js
index c81e60ce8..920e460f0 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1823,4 +1823,181 @@ window.families = [
     "Sanji",
     "Byrnndi World",
     "Byrnndi World",
+    "Akainu",
+    "Akainu",
+    "Sicilian",
+    "Sicilian",
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    "Silvers Rayleigh",
+    "Silvers Rayleigh",
 ];
\ No newline at end of file
diff --git a/common/data/flags.js b/common/data/flags.js
index e27ac7b98..88b51ed6d 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1637,4 +1637,6 @@ window.flags = {
     1822: { shop: 1 },
     1823: { rr: 1, rro: 1, lrr: 1 },
     1824: { rr: 1, rro: 1, lrr: 1 },
+    2000: { global: 1 },
+    2001: { global: 1 },
 };
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 28cc95b0f..2abd5a67b 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -320,6 +320,12 @@ window.matchers = [
         matcher: /Deals.+fixed damage/i
     },
 
+    {
+        name: 'Typeless damage dealers',
+        target: 'special',
+        matcher: /Deals.+typeless damage/i
+    },
+
     {
         name: 'Health cutters',
         target: 'special',
diff --git a/common/data/specials.js b/common/data/specials.js
index 97c7be525..3430ecb2d 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1884,7 +1884,7 @@ window.specials = {
         type: "class"
     },
     1254: {
-        def: function(p) { return 0.5; } //TODO: get correct value
+        def: function(p) { return 0.2; }
     },
     1255: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3736,4 +3736,12 @@ window.specials = {
         atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
         type: "type"
     },
+    2000: {
+        atk: function(p) { return 1.75; },
+        type: "class"
+    },
+    2001: {
+        atk: function(p) { return 1.75; },
+        type: "class"
+    },
 };
diff --git a/common/data/units.js b/common/data/units.js
index ed7e112a7..293243521 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1821,12 +1821,12 @@ window.units = [
     [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 741, 128, 252, 1920, 630, 420, 1 ],
     [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
     [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
-    [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2462, 1408, 319, null ],
+    [ "Byrnndi World, World Destroyer", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Byrnndi World, Wielder of the More-More Fruit", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2462, 1408, 319, null ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
-    [ "Sicilian Coloseum", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Sicilian Coloseum Evolved", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
+    [ "Sicilian, Mokomo Dukedom ", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1849,6 +1849,157 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Silvers Rayleigh", "STR", [ "Slasher", "Cerebral" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Silvers Rayleigh, Right Hand of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, null, null, null, 2510, 1315, 353, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index da6407295..36b2bd6f7 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -487,4 +487,8 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    2001: { // Rayleigh CHANGE THIS WHEN YOU CHANGE RAYLEIGH
+        type: 'healer',
+        multiplier: 2
+    },
 };

From 6c1198ff9c96df8d5228ada7209fb74db405a7e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 23 Oct 2017 05:16:08 +0200
Subject: [PATCH 1444/1569] Marshall D. Teach

---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 6be861cd9..cdc845a23 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -445,7 +445,7 @@ window.aliases = {
     444: ['カルー','', 'Carue', 'Karue' ],
     445: ['カルー隊長と超カルガモ部隊','', 'Captain Karue and the Supersonic Duck Squadron', 'Captain Carue and the Supersonic Duck Squadron' ],
     446: ['マーシャル・Ｄ・ティーチ','', 'Raid Blackbeard', 'BB'],
-    447: ['黒ひげ','', 'Raid Blackbeard', 'BB', 'Teach'],
+    447: ['黒ひげ','', 'Raid Blackbeard', 'BB', 'Teach', 'Marshall D. Teach'],
     448: ['サッチ',''],
     449: ['双剣のサッチ',''],
     450: ['ナミュール','', 'Namur' ],

From 80e1bf885dae5265a3e94bb0203663c2f5374066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 23 Oct 2017 05:20:28 +0200
Subject: [PATCH 1445/1569] God Enel / Kami Eneru

---
 common/data/aliases.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index cdc845a23..43c2a4617 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -543,7 +543,7 @@ window.aliases = {
     542: ['ノラ ウワバミ',''],
     543: ['ワイパー','', 'Wiper' ],
     544: ['ワイパー 大戦士カルガラの子孫','', 'Wiper, Descendant of Great Warrior Calgara' ],
-    545: ['エネル','', 'Enel' ],
+    545: ['エネル','', 'Enel', 'God Enel' ],
     546: ['ゴッド・エネル','', 'God Enel' ],
     547: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟','','Kid Luffy'],
     548: ['モンキー・D・ルフィ コルボ山の悪ガキ３兄弟“兄弟盃”','','Kid Luffy'],
@@ -600,8 +600,8 @@ window.aliases = {
     599: ['バギー ロジャー海賊団','','Young Buggy', 'Baggy'],
     600: ['シャンクス 海賊見習い','','Young Shanks'],
     601: ['シャンクス ロジャー海賊団','','Young Shanks'],
-    602: ['エネル ２億Ｖ　雷神','', 'Raid Enel, 200 Million Volt Thunder God' ],
-    603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God' ],
+    602: ['エネル ２億Ｖ　雷神','', 'Raid Enel, 200 Million Volt Thunder God', 'God Enel', 'Kami Eneru' ],
+    603: ['エネル　雷人間 ２億Ｖ　雷神','', 'Raid Enel the Lightning Human, 200 Million Volt Thunder God', 'God Enel', 'Kami Eneru' ],
     604: ['サンジ 航海の記録・麦わらの一味','', 'Log Sanji', 'Sanji, Wakes of the Endless Dream, Straw Hat Crew' ],
     605: ['サンジ 航海の夢「オールブルー」','', 'Log Sanji' ],
     606: ['海賊ゼフ',''],
@@ -1607,8 +1607,8 @@ window.aliases = {
     1606: ['ラフィット 黒ひげ海賊団', '', 'La Feet'],
     1607: ['ヴァン・オーガー 黒ひげ海賊団', '', 'Vaper', 'Van Ogre'],
     1608: ['ドクＱ 黒ひげ海賊団', '', ''],
-    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', 'God Enel', 'Legend Enel', 'Legend God Enel'],
-    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', 'God Enel', 'Legend Enel', 'Legend God Enel'],
+    1609: ['ゴッド・エネル 終わらぬ夢の宿敵', '', 'God Enel', 'Legend Enel', 'Legend God Enel', 'Kami Eneru'],
+    1610: ['ゴッド・エネル 大海賊時代の死闘「限りない大地」', '', 'God Enel', 'Legend Enel', 'Legend God Enel', 'Kami Eneru'],
     1611: ['バーソロミュー・くま 終わらぬ夢の宿敵', '', ''],
     1612: ['バーソロミュー・くま 大海賊時代の死闘「一味抹殺」', '', ''],
     1613: ['ロブ・ルッチ 終わらぬ夢の宿敵', '', ''],

From 4cafdb9f3ae5dba2c2eeb1e512496f8befaa9616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 23 Oct 2017 05:23:15 +0200
Subject: [PATCH 1446/1569] Hawk, Kaikainu

---
 common/data/aliases.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 43c2a4617..70029c674 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -224,7 +224,7 @@ window.aliases = {
     223: ['ウソップ（衝撃（インパクト））',''],
     224: ['Mr.プリンス（羊肉（ムートン）ショット）','', 'Sanji', 'Mr Prince Mutton Shot'],
     225: ['Mr.プリンス（仔牛肉（ヴォー）ショット）','', 'Sanji', 'Mr Prince Veau Shot' ],
-    226: ['ジュラキュール・ミホーク','','Raidhawk', 'Raid Mihawk'],
+    226: ['ジュラキュール・ミホーク','','Raidhawk', 'Raid Mihawk', 'Hawk' ],
     227: ['鷹の目のミホーク','','Raidhawk', 'Raid Mihawk'],
     228: ['脱獄モーガン',''],
     229: ['寝返りのジャンゴ',''],
@@ -715,7 +715,7 @@ window.aliases = {
     714: ['ピエール',''],
     715: ['コニス',''],
     716: ['コニス スカイピアの少女',''],
-    717: ['ジュラキュール・ミホーク 王下七武海','','INThawk', 'Legend Mihawk', 'Legend Dracule Mihawk', 'Shichibukai'],
+    717: ['ジュラキュール・ミホーク 王下七武海','','INThawk', 'Legend Mihawk', 'Legend Dracule Mihawk', 'Shichibukai', 'Hawk' ],
     718: ['鷹の目のミホーク 世界最強の剣士','','INThawk', 'Legend Mihawk', 'Legend Dracule Mihawk', 'Shichibukai'],
     719: ['サー・クロコダイル　ロギア 王下七武海','', 'Legend Crocodile', 'Shichibukai'],
     720: ['サー・クロコダイル　ロギア 元王下七武海','', 'Legend Crocodile', 'Shichibukai'],
@@ -1677,7 +1677,7 @@ window.aliases = {
     1676: ['ロロノア・ゾロ 雨濡れ剣客', '', 'Kimono Zoro'],
     1677: ['トラファルガー・ロー 終わらぬ夢の航跡・ハートの海賊団', '', 'Log Law', 'Secret Law'],
     1678: ['トラファルガー・ロー 大海賊時代への誓い「自由」', '', 'Log Law', 'Secret Law'],
-    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
+    1679: ['ジュラキュール・ミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk', 'Hawk' ],
     1680: ['鷹の目のミホーク「改」', '', 'Kai Mihawk', 'Neo Mihawk', 'Raid Mihawk'],
     1681: ['モンキー・D・ルフィ Celebrate 20th Anniversary Cruise', '', '20th Anniversary Luffy'],
     1682: ['モンキー・D・ルフィ 20th Anniversary Memorial Treasure', '', '20th Anniversary Luffy'],
@@ -1805,7 +1805,7 @@ window.aliases = {
     1804: ['ロロノア・ゾロ “東の海”の剣豪', '', ''],
     1805: ['道化のバギー 斬っても斬れないバラバラ人間', '', ''],
     1806: ['キャプテン・バギー 斬っても斬れないバラバラ人間', '', ''],
-    1807: ['ジュラキュール・ミホーク 世界中の剣士の頂点に立つ男', '', ''],
+    1807: ['ジュラキュール・ミホーク 世界中の剣士の頂点に立つ男', '', 'Hawk' ],
     1808: ['鷹の目のミホーク 世界中の剣士の頂点に立つ男', '', ''],
     1809: ['ワンダ モコモ公国', '', ''],
     1810: ['王の鳥　ワンダ モコモ公国', '', ''],
@@ -1823,8 +1823,8 @@ window.aliases = {
     1822: ['', '', 'Husbando Sanji'],
     1823: ['', '', ''],
     1824: ['', '', ''],
-    1825: ['', '', ''],
-    1826: ['', '', ''],
+    1825: ['', '', 'Kaikainu'],
+    1826: ['', '', 'Kaikainu'],
     1827: ['', '', ''],
     1828: ['', '', ''],
     1829: ['', '', ''],

From 0893465fc1385970e5c8f3984756b4c1dd1cb326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 23 Oct 2017 09:06:06 +0200
Subject: [PATCH 1447/1569] Monkey D[DOT] Luffy

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 293243521..ab8a656ca 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1243,7 +1243,7 @@ window.units = [
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "'Straw Hat' Monkey D Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
+    [ "'Straw Hat' Monkey D. Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
     [ "'Fire Fist' Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
     [ "'Fire Fist' Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
     [ "Marco, Collar Fluttering in the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
@@ -1591,14 +1591,14 @@ window.units = [
     [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, 1 ],
     [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 141, 121, 36, 1134, 589, 233, 1 ],
     [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
-    [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
+    [ "Monkey D. Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
     [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, 1 ],
     [ "Princess Shirahoshi, Ryugu Kingdom", "INT", "Striker", 4, 20, 4, 3, 99, 3000000, 620, 330, 200, 1536, 858, 408, 1 ],
     [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, 1 ],
     [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, 1 ],
-    [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
+    [ "Monkey D. Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
     [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, 1 ],
     [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, 1 ],
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, 3000000, 151, 90, 98, 1760, 1190, 257, 1 ],

From 1590170f7811b8768dd5af385643f88372c2c469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 23 Oct 2017 09:33:35 +0200
Subject: [PATCH 1448/1569] Blitz Battle! The Three Admirals [GLB]

---
 common/data/effects.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 99e1c1c60..bba5ce2d1 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 42
+    // last ID used: 45
     // Use p.type instead of p.unit.type here
 
     'Baroque Works (pre-v4.0)': {
@@ -451,4 +451,28 @@ window.effects = {
         },
 	},
     
+    'Blitz Battle! The Three Admirals': {
+        description: 'Lot of units boosted',
+        thumb: 1314,
+        id: 45, // don't change this
+        atk: function(p) {
+            var id = p.number + 1,
+            matching = ((id > 446 && id < 457) || (id > 638 && id < 659) ||
+                [ 1, 2, 3, 4, 216, 1245, 217, 250, 251, 252, 1248, 1249, 253, 254, 255, 420, 547, 548, 570, 571, 577, 578, 727, 761, 794, 946, 947, 948, 936, 937, 1022, 1114, 1115, 1120, 1121, 1285, 1387, 1403, 1404, 38, 39, 598, 599, 887, 1301, 1302, 1390, 1391, 74, 75, 497, 498, 561, 562, 950, 951, 1023, 1246, 1247, 1265, 1266, 1604, 1605, 1040, 1041, 982, 983, 260, 261, 1257, 1258, 1413, 383, 384, 408, 509, 510, 719, 720, 897, 389, 390, 674, 675, 1036, 1037, 1352, 409, 410, 885, 934, 935, 1345, 415, 416, 864, 865, 921, 922, 1193, 1194, 1218, 1445, 981, 1255, 1254, 1256, 676, 677, 1038, 1039, 1181, 1182, 1183, 1184, 1512, 1187, 1188, 1511, 1189, 1190, 1510, 1267, 1268, 321, 322, 632, 633, 737, 747, 748, 1762, 1763, 949, 366, 367, 1353, 1354, 1355, 1533, 1534, 1619, 2000, 2001, 545, 546, 602, 603, 226, 227, 717, 718, 1227, 1679, 1680, 391, 392, 437, 438, 684, 685, 889, 890, 944, 945, 1539, 1540, 1309, 1310, 1576, 1577, 1337, 1338, 1657, 1658, 1570, 1571, 1572, 1573, 1574, 1575, 1578, 1579, 1651, 1652, 1653, 1654, 1655, 1656, 1659, 1660, 1158, 1159, 1373, 1374, 1697, 1698, 928, 929, 1156, 1157, 207, 208, 461, 462, 899 ].indexOf(id) != -1);
+            return !matching ? 1 : 1.5;
+        },    
+        hp: function(p) {
+            var id = p.number + 1,
+            matching = ((id > 446 && id < 457) || (id > 638 && id < 659) ||
+                [ 1, 2, 3, 4, 216, 1245, 217, 250, 251, 252, 1248, 1249, 253, 254, 255, 420, 547, 548, 570, 571, 577, 578, 727, 761, 794, 946, 947, 948, 936, 937, 1022, 1114, 1115, 1120, 1121, 1285, 1387, 1403, 1404, 38, 39, 598, 599, 887, 1301, 1302, 1390, 1391, 74, 75, 497, 498, 561, 562, 950, 951, 1023, 1246, 1247, 1265, 1266, 1604, 1605, 1040, 1041, 982, 983, 260, 261, 1257, 1258, 1413, 383, 384, 408, 509, 510, 719, 720, 897, 389, 390, 674, 675, 1036, 1037, 1352, 409, 410, 885, 934, 935, 1345, 415, 416, 864, 865, 921, 922, 1193, 1194, 1218, 1445, 981, 1255, 1254, 1256, 676, 677, 1038, 1039, 1181, 1182, 1183, 1184, 1512, 1187, 1188, 1511, 1189, 1190, 1510, 1267, 1268, 321, 322, 632, 633, 737, 747, 748, 1762, 1763, 949, 366, 367, 1353, 1354, 1355, 1533, 1534, 1619, 2000, 2001, 545, 546, 602, 603, 226, 227, 717, 718, 1227, 1679, 1680, 391, 392, 437, 438, 684, 685, 889, 890, 944, 945, 1539, 1540, 1309, 1310, 1576, 1577, 1337, 1338, 1657, 1658, 1570, 1571, 1572, 1573, 1574, 1575, 1578, 1579, 1651, 1652, 1653, 1654, 1655, 1656, 1659, 1660, 1158, 1159, 1373, 1374, 1697, 1698, 928, 929, 1156, 1157, 207, 208, 461, 462, 899 ].indexOf(id) != -1);
+            return !matching ? 1 : 1.5;
+        },    
+        rcv: function(p) {
+            var id = p.number + 1,
+            matching = ((id > 446 && id < 457) || (id > 638 && id < 659) ||
+                [ 1, 2, 3, 4, 216, 1245, 217, 250, 251, 252, 1248, 1249, 253, 254, 255, 420, 547, 548, 570, 571, 577, 578, 727, 761, 794, 946, 947, 948, 936, 937, 1022, 1114, 1115, 1120, 1121, 1285, 1387, 1403, 1404, 38, 39, 598, 599, 887, 1301, 1302, 1390, 1391, 74, 75, 497, 498, 561, 562, 950, 951, 1023, 1246, 1247, 1265, 1266, 1604, 1605, 1040, 1041, 982, 983, 260, 261, 1257, 1258, 1413, 383, 384, 408, 509, 510, 719, 720, 897, 389, 390, 674, 675, 1036, 1037, 1352, 409, 410, 885, 934, 935, 1345, 415, 416, 864, 865, 921, 922, 1193, 1194, 1218, 1445, 981, 1255, 1254, 1256, 676, 677, 1038, 1039, 1181, 1182, 1183, 1184, 1512, 1187, 1188, 1511, 1189, 1190, 1510, 1267, 1268, 321, 322, 632, 633, 737, 747, 748, 1762, 1763, 949, 366, 367, 1353, 1354, 1355, 1533, 1534, 1619, 2000, 2001, 545, 546, 602, 603, 226, 227, 717, 718, 1227, 1679, 1680, 391, 392, 437, 438, 684, 685, 889, 890, 944, 945, 1539, 1540, 1309, 1310, 1576, 1577, 1337, 1338, 1657, 1658, 1570, 1571, 1572, 1573, 1574, 1575, 1578, 1579, 1651, 1652, 1653, 1654, 1655, 1656, 1659, 1660, 1158, 1159, 1373, 1374, 1697, 1698, 928, 929, 1156, 1157, 207, 208, 461, 462, 899 ].indexOf(id) != -1);
+            return !matching ? 1 : 1.5;
+        },    
+    },
+    
 };

From 7674acc5a062178c320f5704e65c79ed2300ed74 Mon Sep 17 00:00:00 2001
From: Marc Karam <karam105@mail.chapman.edu>
Date: Mon, 23 Oct 2017 11:03:57 -0700
Subject: [PATCH 1449/1569] Begin adding in the vinsmoke batch of characters

---
 common/data/details.js    | 84 +++++++++++++++++++++++++++++++++++++++
 common/data/evolutions.js | 28 +++++++++++++
 common/data/units.js      | 24 +++++------
 3 files changed, 124 insertions(+), 12 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 7a671d20a..efab50e1f 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12753,6 +12753,90 @@ window.details = {
         specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption [Neo]",
     },
+    1829: {//Raid Caesar
+        captain: "Boosts ATK of Cerebral and Driven characters by 2x",
+        special: "Deals 45x character's ATK in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for Cerebral and Driven characters for 2 turns, and poisons all enemies",
+        spcialName: "Flammable Type: Miok GAS",
+    },
+    1830: {//Raid Caesar
+        captain: "Boosts ATK of Cerebral and Driven characters by 2.5x",
+        special: "Deals 45x character's ATK in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for Cerebral and Driven characters for 2 turns, and poisons all enemies",
+        spcialName:"Flammable Type: Miok GAS",
+        limit: "This character has a limit break path",
+    },
+    1831: {//6* Judge
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ARK of al characters by 2.25x.  If any character has a matching orb, boosts THEIR attack by 3.9x (MIGHT BE DIFFERENT DUE TO THIS BEING THE UNEVOLVED FORM)",
+        special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
+        specialName: "Dengi Crack",
+    },
+    1832: {//6* Judge
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ARK of al characters by 2.25x.  If any character has a matching orb, boosts THEIR attack by 3.9x",
+        special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
+        specialName: "Dengi Crack",
+        limit: "This character has a limit break path",
+    },
+    1833: {//Reiju
+        captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x (boosts stack on an [INT] Powerhouse character so boost effectively beomces 2.1x) and the RCV of Powerhouse by 1.1x",
+        special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a powerhouse character, reduces damage recieved by 70% for 2 turns ",
+        specialName: "Dangerous Healing",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
+    1834: {//Reiju
+        captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x (boosts stack on an [INT] Powerhouse character so boost effectively beomces 2.1x) and the RCV of Powerhouse by 1.1x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a powerhouse character, reduces damage recieved by 70% for 2 turns ",
+        specialName: "Dangerous Healing",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+        limit: "This character has a limit break path",
+    },
+    1835: {//Ichiji
+        captain: "Boosts Atk of [STR] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [STR] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x",
+        special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
+        specialName: "Majestic Impact",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
+    1836: {//Ichiji
+        captain: "Boosts Atk of [STR] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [STR] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
+        specialName: "Majestic Impact",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+        limit: "This character has a limit break path",
+    },
+    1837: {//Niji
+        captain: "Boosts Atk of [QCK] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [QCK] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x",
+        special: "If your captain is a [QCK] or [PSY] character, boosts Atk of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
+        specialName: "Blitz Needle",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
+    1838: {//Niji
+        captain: "Boosts Atk of [QCK] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [QCK] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        special: "If your captain is a [QCK] or [PSY] character, boosts Atk of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
+        specialName: "Blitz Needle",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+        limit: "This character has a limit break path",
+    },
+    1839: {//Yonji
+        captain: "Boosts Atk of [DEX] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [DEX] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x",
+        special: "If your captain is [DEX] or [PSY] character, boosts Atk against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters Atk as additional typeless damage for 2 turns",
+        specialName: "Burst End Kick",
+        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters <br> MIGHT BE DIFFERENT NUMBERS.  NUMBERS WERE TAKEN FROM SABO",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
+    1840: {//Yonji
+        captain: "Boosts Atk of [DEX] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [DEX] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        special: "If your captain is [DEX] or [PSY] character, boosts Atk against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters Atk as additional typeless damage for 2 turns",
+        specialName: "Burst End Kick",
+        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters <br> MIGHT BE DIFFERENT NUMBERS.  NUMBERS WERE TAKEN FROM SABO",
+        sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+        limit: "This character has a limit break path",
+    },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 24f69386d..71cd46925 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2847,6 +2847,34 @@ window.evolutions = {
         evolution: 1826,
         evolvers: [  ]
     },
+    1827: {
+        evolution: 1828,
+        evolvers: [  ],
+    },
+    1829: {
+        evolution: 1830,
+        evolvers: [  ],
+    },
+    1831: {
+        evolution: 1832,
+        evolvers: [  ],
+    },
+    1833: {
+        evolution: 1834,
+        evolvers: [  ],
+    },
+    1835: {
+        evolution: 1836,
+        evolvers: [  ],
+    },
+    1837: {
+        evolution: 1838,
+        evolvers: [  ],
+    },
+    1839: {
+        evolution: 1840,
+        evolvers: [  ],
+    },
     2000: {
         evolution: 2001,
         evolvers: [  ]
diff --git a/common/data/units.js b/common/data/units.js
index ab8a656ca..777bb28b3 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1827,18 +1827,18 @@ window.units = [
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
     [ "Sicilian, Mokomo Dukedom ", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caesar", "INT", [ "Cerebral", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 5, 55, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From cf9ec073989bcb6f042328d46d14ac405a80d040 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 23 Oct 2017 18:48:18 -0400
Subject: [PATCH 1450/1569] Part 1 of Vinsmoke

---
 common/data/captains.js  | 52 ++++++++++++++++++++++++++++++++++++++++
 common/data/cooldowns.js | 40 +++++++++++++++----------------
 common/data/details.js   | 32 +++++++++++++++----------
 common/data/specials.js  |  6 +++++
 common/data/units.js     | 24 +++++++++----------
 5 files changed, 110 insertions(+), 44 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index eac6a5d5c..66f6125fe 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5700,6 +5700,58 @@ window.captains = {
     1828: {
         atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
+    1831: {
+        atk: function(p) { 
+            if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9 : 2.25;
+            }
+            else
+                return 1; 
+        },
+        hp: function(p) { return 1.25; }
+    },
+    1832: {
+        atk: function(p) { 
+            if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9 : 2.25;
+            }
+            else
+                return 1; 
+        },
+        hp: function(p) { return 1.25; }
+    },
+    1833: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "INT" ? 1.2 :
+                1;
+        }
+    },
+    1835: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "STR" ? 1.2 :
+                1;
+        }
+    },
+    1837: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "QCK" ? 1.2 :
+                1;
+        }
+    },
+    1839: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "DEX" ? 1.2 :
+                1;
+        }
+    },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 5b930b8c8..3281c3cca 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1821,24 +1821,24 @@ window.cooldowns = [
     18,
     [ 14, 14 ],
     [ 14, 14 ],
-    [ 22, 18 ],//Limited World
-    [ 22, 18 ],//Limited World
-    [ 25, 16 ],//Akainu Kai
-    [ 25, 16 ],//Akainu Kai
-    [ 25, 10 ],//Sicilian Coli
-    [ 25, 10 ],//Sicilian Coli
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    [ 22, 18 ],
+    [ 22, 18 ],
+    [ 25, 16 ],
+    [ 25, 16 ],
+    [ 25, 10 ],
+    [ 25, 10 ],
+    [ 29, 15 ],
+    [ 29, 15 ],
+    [ 19, 14 ],
+    [ 19, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
     null,
     null,
     null,
@@ -1998,6 +1998,6 @@ window.cooldowns = [
     null,
     null,
     null,
-    [ null, 16 ],
-    [ null, 16 ],
+    [ 30, 16 ],
+    [ 30, 16 ],
 ];
diff --git a/common/data/details.js b/common/data/details.js
index efab50e1f..689355acb 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12765,25 +12765,27 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1831: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ARK of al characters by 2.25x.  If any character has a matching orb, boosts THEIR attack by 3.9x (MIGHT BE DIFFERENT DUE TO THIS BEING THE UNEVOLVED FORM)",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
         specialName: "Dengi Crack",
     },
     1832: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ARK of al characters by 2.25x.  If any character has a matching orb, boosts THEIR attack by 3.9x",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
         specialName: "Dengi Crack",
         limit: "This character has a limit break path",
     },
     1833: {//Reiju
-        captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x (boosts stack on an [INT] Powerhouse character so boost effectively beomces 2.1x) and the RCV of Powerhouse by 1.1x",
+        captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x and the RCV of Powerhouse by 1.1x",
+        captainNotes: "Attack boost stacks, so an [INT] Powerhouse unit has 2.1x ATK",
         special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
     1834: {//Reiju
-        captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x (boosts stack on an [INT] Powerhouse character so boost effectively beomces 2.1x) and the RCV of Powerhouse by 1.1x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        captain: "Boosts ATK of [INT] characters by ???x and Powerhouse characters by ???x and the RCV of Powerhouse by ???x",
+        captainNotes: "Attack boost stacks, so an [INT] Powerhouse unit has ???x ATK",
         special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
@@ -12791,14 +12793,16 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1835: {//Ichiji
-        captain: "Boosts Atk of [STR] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [STR] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x",
+        captain: "Boosts Atk of [STR] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captainNotes: "Attack boost stacks, so an [STR] Powerhouse unit has 2.1x ATK",
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
     1836: {//Ichiji
-        captain: "Boosts Atk of [STR] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [STR] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        captain: "Boosts Atk of [STR] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
+        captainNotes: "Attack boost stacks, so an [STR] Powerhouse unit has ???x ATK",
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
@@ -12806,14 +12810,16 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1837: {//Niji
-        captain: "Boosts Atk of [QCK] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [QCK] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x",
+        captain: "Boosts Atk of [QCK] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captainNotes: "Attack boost stacks, so an [QCK] Powerhouse unit has 2.1x ATK",
         special: "If your captain is a [QCK] or [PSY] character, boosts Atk of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
     1838: {//Niji
-        captain: "Boosts Atk of [QCK] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [QCK] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        captain: "Boosts Atk of [QCK] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
+        captainNotes: "Attack boost stacks, so an [QCK] Powerhouse unit has ???x ATK",
         special: "If your captain is a [QCK] or [PSY] character, boosts Atk of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
@@ -12821,18 +12827,20 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1839: {//Yonji
-        captain: "Boosts Atk of [DEX] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [DEX] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x",
+        captain: "Boosts Atk of [DEX] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has 2.1x ATK",
         special: "If your captain is [DEX] or [PSY] character, boosts Atk against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters Atk as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
-        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters <br> MIGHT BE DIFFERENT NUMBERS.  NUMBERS WERE TAKEN FROM SABO",
+        specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
     1840: {//Yonji
-        captain: "Boosts Atk of [DEX] by 1.75x, Powerhouse by 1.2x (boosts stacks on a [DEX] Powerhouse character so boost effectively becomes 2.1x), and the HP of Powerhouse by 1.2x (MIGHT BE DIFFERENT DUE TO THIS BEING THE EVOLVED FORM)",
+        captain: "Boosts Atk of [DEX] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
+        captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has ???x ATK",
         special: "If your captain is [DEX] or [PSY] character, boosts Atk against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters Atk as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
-        specialNotes: "#{random : 10,000 : 30,000} <br> Extra Damage can only be boosted by conditional Boosters <br> MIGHT BE DIFFERENT NUMBERS.  NUMBERS WERE TAKEN FROM SABO",
+        specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
         limit: "This character has a limit break path",
diff --git a/common/data/specials.js b/common/data/specials.js
index 3430ecb2d..01d3ae35b 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3736,6 +3736,12 @@ window.specials = {
         atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
         type: "type"
     },
+    1831: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+    },
+    1832: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+    },
     2000: {
         atk: function(p) { return 1.75; },
         type: "class"
diff --git a/common/data/units.js b/common/data/units.js
index 777bb28b3..83c29e403 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1828,17 +1828,17 @@ window.units = [
     [ "Sicilian, Mokomo Dukedom ", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
     [ "Caesar", "INT", [ "Cerebral", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1, 1, 1, 1811, 1404, 324, null ],
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 5, 55, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Driven" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 5, 55, 5, 5, 99, 5000000, 1, 1, 1, 4212, 1510, 201, null ],
+    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 1984, 1312, 432, null ],
+    [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 2912, 1421, 241, null ],
+    [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 2834, 1382, 267, null ],
+    [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 2406, 1341, 352, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1998,8 +1998,8 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Silvers Rayleigh", "STR", [ "Slasher", "Cerebral" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Silvers Rayleigh, Right Hand of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, null, null, null, 2510, 1315, 353, null ],
+    [ "Silvers Rayleigh", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, null, null, null, null ],
+    [ "Silvers Rayleigh, Right Hand of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From fda3be1d8c87c220386c48a01373ce4726560b23 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:22:46 -0400
Subject: [PATCH 1451/1569] rest of it

---
 common/data/families.js | 24 +++++++--------
 common/data/specials.js | 66 +++++++++++++++++++++++++++++++----------
 common/data/units.js    |  8 ++---
 3 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/common/data/families.js b/common/data/families.js
index 920e460f0..162a5d0c1 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1827,18 +1827,18 @@ window.families = [
     "Akainu",
     "Sicilian",
     "Sicilian",
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    "Caesar Clown",
+    "Caesar Clown",
+    "Vinsmoke Judge",
+    "Vinsmoke Judge",
+    "Vinsmoke Reiju",
+    "Vinsmoke Reiju",
+    "Vinsmoke Ichiji",
+    "Vinsmoke Ichiji",
+    "Vinsmoke Niji",
+    "Vinsmoke Niji",
+    "Vinsmoke Yonji",
+    "Vinsmoke Yonji",
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index 01d3ae35b..f8fbde6ac 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -9,7 +9,7 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     16: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 2; },
     },
     18: {
         def: function(p) { return 0.5; }
@@ -456,11 +456,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     644: {
-        atk: function(p) { return p.delayed ? 1.2 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
         type: "condition",
     },
     645: {
-        atk: function(p) { return p.delayed ? 1.2 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
         type: "condition",
     },
     648: {
@@ -663,7 +663,7 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     770: {
-        atk: function(p) { return p.delayed ? 1.3 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
         type: "condition",
     },
     771: {
@@ -848,12 +848,12 @@ window.specials = {
     },
     841: {
         delay: function(p) { return 1; },
-        atk: function(p) { return p.delayed ? 1.25 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
         type: "condition",
     },
     842: {
         delay: function(p) { return 1; },
-        atk: function(p) { return p.delayed ? 1.25 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
         type: "condition",
     },
     843: {
@@ -1312,7 +1312,7 @@ window.specials = {
         type: "type"
     },
     1013: {
-        atk: function(p) { return p.delayed ? 1.2 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
         type: "condition",
     },
     1015: {
@@ -2028,11 +2028,11 @@ window.specials = {
         type: "class"
     },
     1321: {
-        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
     },
     1322: {
-        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
     },
     1323: {
@@ -2383,12 +2383,12 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     1437: {
-        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
         orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1438: {
-        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
         orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
@@ -2647,7 +2647,7 @@ window.specials = {
     },
     1525: {
         delay: function(p) { return 1; },
-        atk: function(p) { return p.delayed ? 1.3 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
         type: "condition",
     },
     1526: {
@@ -3545,12 +3545,12 @@ window.specials = {
     },
     1769: {
         delay: function(p) { return 1; },
-        atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
+        atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
         type: "condition",
     },
     1770: {
         delay: function(p) { return 1; },
-        atk: function(p) { return (p.delayed && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
+        atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
         type: "condition",
     },
     1771: {
@@ -3627,11 +3627,11 @@ window.specials = {
         delay: function(p) { return 1; },
     },
     1797: {
-        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
     },
     1798: {
-        atk: function(p) { return p.delayed ? 1.5 : 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
     },
     1799: {
@@ -3742,6 +3742,40 @@ window.specials = {
     1832: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
+    1835: {
+        chain: function(p) { return (p.captain.type == "STR" || p.captain.type == "PSY") ? 2.5 : 1; },
+        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') ? 2.5 : 1;
+        },
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; },
+    },
+    1836: {
+        chain: function(p) { return (p.captain.type == "STR" || p.captain.type == "PSY") ? 2.5 : 1; },
+        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') ? 2.5 : 1;
+        },
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; },
+    },
+    1837: {
+        atk: function(p) { return (p.captain.type == "QCK" || p.captain.type == "PSY") ? 1.75 : 1; },
+        type: "class",
+    },
+    1838: {
+        atk: function(p) { return (p.captain.type == "QCK" || p.captain.type == "PSY") ? 1.75 : 1; },
+        type: "class",
+    },
+    1839: {
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type == "DEX" || p.captain.type == "PSY")) ? 1.75 : 1; },
+        type: "condition",
+        staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
+    },
+    1840: {
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type == "DEX" || p.captain.type == "PSY")) ? 1.75 : 1; },
+        type: "condition",
+        staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
+    },
     2000: {
         atk: function(p) { return 1.75; },
         type: "class"
diff --git a/common/data/units.js b/common/data/units.js
index 83c29e403..1084ec1c1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1832,13 +1832,13 @@ window.units = [
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 5, 55, 5, 5, 99, 5000000, 1, 1, 1, 4212, 1510, 201, null ],
     [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 1984, 1312, 432, null ],
+    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 1984, 1312, 432, null ],
     [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 2912, 1421, 241, null ],
+    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2912, 1421, 241, null ],
     [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 2834, 1382, 267, null ],
+    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2834, 1382, 267, null ],
     [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, null, 4, 99, 4000000, 1, 1, 1, 2406, 1341, 352, null ],
+    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2406, 1341, 352, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From a3355cee4bf979845c26b137d3c3878f6b26ec95 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:33:16 -0400
Subject: [PATCH 1452/1569] CDs and Caesar

---
 common/data/captains.js  | 6 ++++++
 common/data/cooldowns.js | 8 ++++----
 common/data/specials.js  | 6 ++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 66f6125fe..e784b69b4 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5700,6 +5700,12 @@ window.captains = {
     1828: {
         atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
+    1829: {
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1830: {
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.5 : 1; },
+    },
     1831: {
         atk: function(p) { 
             if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3281c3cca..3ff3d8043 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1815,10 +1815,10 @@ window.cooldowns = [
     [ 30, 15 ],
     [ 30, 15 ],
     [ 20, 15 ],
-    20,
-    20,
-    16,
-    18,
+    [ 20, 13 ],
+    [ 20, 13 ],
+    [ 16, 10 ],
+    [ 18, 14 ],
     [ 14, 14 ],
     [ 14, 14 ],
     [ 22, 18 ],
diff --git a/common/data/specials.js b/common/data/specials.js
index f8fbde6ac..9cda2787a 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3736,6 +3736,12 @@ window.specials = {
         atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
         type: "type"
     },
+    1829: {
+        orb: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1830: {
+        orb: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
     1831: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },

From 9a39379bce169012517e7e43c284a9da2561c234 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 23 Oct 2017 19:34:59 -0400
Subject: [PATCH 1453/1569] capitalization stuff

---
 common/data/details.js | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 689355acb..baca79d07 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7208,7 +7208,7 @@ window.details = {
     },
     1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
-        special: "For Slasher and Driven characters, randomizes non-matching orbs, boosts Atk against enemies with increased defense by 1.3x for 1 turn",
+        special: "For Slasher and Driven characters, randomizes non-matching orbs, boosts ATK against enemies with increased defense by 1.3x for 1 turn",
         sailor: "Boosts base ATK and RCV of Driven characters by 10",
         specialName: "Icebreaker Breakthrough Force",
     },
@@ -7998,7 +7998,7 @@ window.details = {
     },
     1343: {//Porchemy
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2x.",
-        special: "Deals 13x character's Atk in [DEX] damage to one enemy, and boosts ATK against enemies with reduced defense by 1.3x for 1 turn",
+        special: "Deals 13x character's ATK in [DEX] damage to one enemy, and boosts ATK against enemies with reduced defense by 1.3x for 1 turn",
         specialName: "Spiked Glove of Punishment",
     },
     1344: {//Bluejam
@@ -8038,7 +8038,7 @@ window.details = {
         specialName: "Covering Fire",
     },
     1352: {//Ivankov
-        captain: "Boosts ATK of Fighter characters by 2x at the start of the chain, boosts Atk of Fighter characters by 3.5x after the 5th Perfect in a row",
+        captain: "Boosts ATK of Fighter characters by 2x at the start of the chain, boosts ATK of Fighter characters by 3.5x after the 5th Perfect in a row",
         special: "Following the activation of the special, if every unit scores a Perfect hit, reduces damage received by 90% in the following turn",
         specialName: "Rolling Beauty",
     },
@@ -12778,7 +12778,7 @@ window.details = {
     1833: {//Reiju
         captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x and the RCV of Powerhouse by 1.1x",
         captainNotes: "Attack boost stacks, so an [INT] Powerhouse unit has 2.1x ATK",
-        special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a powerhouse character, reduces damage recieved by 70% for 2 turns ",
+        special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a Powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
@@ -12786,14 +12786,14 @@ window.details = {
     1834: {//Reiju
         captain: "Boosts ATK of [INT] characters by ???x and Powerhouse characters by ???x and the RCV of Powerhouse by ???x",
         captainNotes: "Attack boost stacks, so an [INT] Powerhouse unit has ???x ATK",
-        special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a powerhouse character, reduces damage recieved by 70% for 2 turns ",
+        special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a Powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
         limit: "This character has a limit break path",
     },
     1835: {//Ichiji
-        captain: "Boosts Atk of [STR] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captain: "Boosts ATK of [STR] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
         captainNotes: "Attack boost stacks, so an [STR] Powerhouse unit has 2.1x ATK",
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
@@ -12801,7 +12801,7 @@ window.details = {
         sailorNotes: "#{beneficial}",
     },
     1836: {//Ichiji
-        captain: "Boosts Atk of [STR] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
+        captain: "Boosts ATK of [STR] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
         captainNotes: "Attack boost stacks, so an [STR] Powerhouse unit has ???x ATK",
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
@@ -12810,35 +12810,35 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1837: {//Niji
-        captain: "Boosts Atk of [QCK] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captain: "Boosts ATK of [QCK] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
         captainNotes: "Attack boost stacks, so an [QCK] Powerhouse unit has 2.1x ATK",
-        special: "If your captain is a [QCK] or [PSY] character, boosts Atk of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
+        special: "If your captain is a [QCK] or [PSY] character, boosts ATK of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
     1838: {//Niji
-        captain: "Boosts Atk of [QCK] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
+        captain: "Boosts ATK of [QCK] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
         captainNotes: "Attack boost stacks, so an [QCK] Powerhouse unit has ???x ATK",
-        special: "If your captain is a [QCK] or [PSY] character, boosts Atk of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
+        special: "If your captain is a [QCK] or [PSY] character, boosts ATK of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
         limit: "This character has a limit break path",
     },
     1839: {//Yonji
-        captain: "Boosts Atk of [DEX] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captain: "Boosts ATK of [DEX] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
         captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has 2.1x ATK",
-        special: "If your captain is [DEX] or [PSY] character, boosts Atk against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters Atk as additional typeless damage for 2 turns",
+        special: "If your captain is [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
     1840: {//Yonji
-        captain: "Boosts Atk of [DEX] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
+        captain: "Boosts ATK of [DEX] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
         captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has ???x ATK",
-        special: "If your captain is [DEX] or [PSY] character, boosts Atk against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters Atk as additional typeless damage for 2 turns",
+        special: "If your captain is [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",

From 14cb1e83661f0d4ff0d5d163bfad862b862e2c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 24 Oct 2017 02:36:09 +0200
Subject: [PATCH 1454/1569] Sicilian Coloseum

New batch 1.25x stats boost
---
 common/data/effects.js | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index bba5ce2d1..9f0b43dc5 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -2,7 +2,7 @@ window.effects = {
 
     // always use unique IDs, and don't ever change an ID once you've set it
     // IDs must always be greater than 0
-    // last ID used: 45
+    // last ID used: 46
     // Use p.type instead of p.unit.type here
 
     'Baroque Works (pre-v4.0)': {
@@ -475,4 +475,28 @@ window.effects = {
         },    
     },
     
+    'Sicilian Coloseum': {
+        description: 'Certain units boosted',
+        thumb: 1828,
+        id: 46, // don't change this
+        atk: function(p) {
+            var id = p.number + 1,
+            matching = ((id > 1831 && id < 1840) ||
+                [ ].indexOf(id) != -1);
+            return !matching ? 1 : 1.25;
+        },    
+        hp: function(p) {
+            var id = p.number + 1,
+            matching = ((id > 1831 && id < 1840) ||
+                [ ].indexOf(id) != -1);
+            return !matching ? 1 : 1.25;
+        },    
+        rcv: function(p) {
+            var id = p.number + 1,
+            matching = ((id > 1831 && id < 1840) ||
+                [ ].indexOf(id) != -1);
+            return !matching ? 1 : 1.25;
+        },    
+    },
+    
 };

From 2cca2d6a396b92edeba940c2b01b65aec9a72d8d Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 23 Oct 2017 23:33:53 -0400
Subject: [PATCH 1455/1569] Evolved captains

---
 common/data/captains.js | 48 +++++++++++++++++++++++++++++++++++++----
 common/data/details.js  | 24 ++++++++++-----------
 2 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index e784b69b4..2952f651c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5732,7 +5732,17 @@ window.captains = {
                 !p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 1.75 :
                 p.unit.class.has("Powerhouse") && !p.unit.type == "INT" ? 1.2 :
                 1;
-        }
+        },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.1 : 1; },
+    },
+    1834: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "INT" ? 1.3 :
+                1;
+        },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1835: {
         atk: function(p) { 
@@ -5740,7 +5750,17 @@ window.captains = {
                 !p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 1.75 :
                 p.unit.class.has("Powerhouse") && !p.unit.type == "STR" ? 1.2 :
                 1;
-        }
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1836: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "STR" ? 1.3 :
+                1;
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1837: {
         atk: function(p) { 
@@ -5748,7 +5768,17 @@ window.captains = {
                 !p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 1.75 :
                 p.unit.class.has("Powerhouse") && !p.unit.type == "QCK" ? 1.2 :
                 1;
-        }
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1838: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "QCK" ? 1.3 :
+                1;
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1839: {
         atk: function(p) { 
@@ -5756,7 +5786,17 @@ window.captains = {
                 !p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 1.75 :
                 p.unit.class.has("Powerhouse") && !p.unit.type == "DEX" ? 1.2 :
                 1;
-        }
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+    },
+    1840: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "DEX" ? 1.3 :
+                1;
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
diff --git a/common/data/details.js b/common/data/details.js
index baca79d07..eab4fa52c 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12776,7 +12776,7 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1833: {//Reiju
-        captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x and the RCV of Powerhouse by 1.1x",
+        captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x and the RCV of Powerhouse characters by 1.1x",
         captainNotes: "Attack boost stacks, so an [INT] Powerhouse unit has 2.1x ATK",
         special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a Powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
@@ -12784,8 +12784,8 @@ window.details = {
         sailorNotes: "#{beneficial}",
     },
     1834: {//Reiju
-        captain: "Boosts ATK of [INT] characters by ???x and Powerhouse characters by ???x and the RCV of Powerhouse by ???x",
-        captainNotes: "Attack boost stacks, so an [INT] Powerhouse unit has ???x ATK",
+        captain: "Boosts ATK of [INT] characters by 2.25x and Powerhouse characters by 1.3x and the RCV of Powerhouse characters by 1.2x",
+        captainNotes: "Attack boost stacks, so an [INT] Powerhouse unit has 2.925x ATK",
         special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a Powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
@@ -12793,7 +12793,7 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1835: {//Ichiji
-        captain: "Boosts ATK of [STR] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captain: "Boosts ATK of [STR] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Attack boost stacks, so an [STR] Powerhouse unit has 2.1x ATK",
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
@@ -12801,8 +12801,8 @@ window.details = {
         sailorNotes: "#{beneficial}",
     },
     1836: {//Ichiji
-        captain: "Boosts ATK of [STR] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
-        captainNotes: "Attack boost stacks, so an [STR] Powerhouse unit has ???x ATK",
+        captain: "Boosts ATK of [STR] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
+        captainNotes: "Attack boost stacks, so an [STR] Powerhouse unit has 2.925x ATK",
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
@@ -12810,7 +12810,7 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1837: {//Niji
-        captain: "Boosts ATK of [QCK] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captain: "Boosts ATK of [QCK] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Attack boost stacks, so an [QCK] Powerhouse unit has 2.1x ATK",
         special: "If your captain is a [QCK] or [PSY] character, boosts ATK of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
@@ -12818,8 +12818,8 @@ window.details = {
         sailorNotes: "#{beneficial}",
     },
     1838: {//Niji
-        captain: "Boosts ATK of [QCK] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
-        captainNotes: "Attack boost stacks, so an [QCK] Powerhouse unit has ???x ATK",
+        captain: "Boosts ATK of [QCK] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
+        captainNotes: "Attack boost stacks, so an [QCK] Powerhouse unit has 2.925x ATK",
         special: "If your captain is a [QCK] or [PSY] character, boosts ATK of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
@@ -12827,7 +12827,7 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1839: {//Yonji
-        captain: "Boosts ATK of [DEX] by 1.75x, Powerhouse by 1.2x, and the HP of Powerhouse by 1.2x",
+        captain: "Boosts ATK of [DEX] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has 2.1x ATK",
         special: "If your captain is [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
@@ -12836,8 +12836,8 @@ window.details = {
         sailorNotes: "#{beneficial}",
     },
     1840: {//Yonji
-        captain: "Boosts ATK of [DEX] by ???x, Powerhouse by ???x, and the HP of Powerhouse by ???x",
-        captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has ???x ATK",
+        captain: "Boosts ATK of [DEX] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
+        captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has 2.925x ATK",
         special: "If your captain is [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",

From 6b02faa6e4a99d99723de0f60340f3e69cab7855 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Tue, 24 Oct 2017 14:41:51 -0400
Subject: [PATCH 1456/1569] Neo Akainu

---
 common/data/evolutions.js | 2 +-
 common/data/units.js      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 71cd46925..41b764494 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2845,7 +2845,7 @@ window.evolutions = {
     },
     1825: {
         evolution: 1826,
-        evolvers: [  ]
+        evolvers: [ 118, 94, 304, 304, 104 ]
     },
     1827: {
         evolution: 1828,
diff --git a/common/data/units.js b/common/data/units.js
index 1084ec1c1..4017a8b46 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1823,8 +1823,8 @@ window.units = [
     [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
     [ "Byrnndi World, World Destroyer", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Byrnndi World, Wielder of the More-More Fruit", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2462, 1408, 319, null ],
-    [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1, 1, 1, 3156, 1450, 99, null ],
+    [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 284, 217, 0, 1612, 819, 49, null ],
+    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1506, 717, 44, 3156, 1450, 99, null ],
     [ "Sicilian, Mokomo Dukedom ", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
     [ "Caesar", "INT", [ "Cerebral", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],

From 687c97895a7c457a3f324c0c2b7adc97d2819e87 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 24 Oct 2017 22:19:51 -0400
Subject: [PATCH 1457/1569] Judge typo

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 4017a8b46..99e15f79a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1829,8 +1829,8 @@ window.units = [
     [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
     [ "Caesar", "INT", [ "Cerebral", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1, 1, 1, 1811, 1404, 324, null ],
-    [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 5, 55, 5, 5, 99, 5000000, 1, 1, 1, 4212, 1510, 201, null ],
+    [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1, 1, 1, 4212, 1510, 201, null ],
     [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 1984, 1312, 432, null ],
     [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],

From 1aeb7c7554f716e2b8a33bfc349af124160a1059 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 24 Oct 2017 22:25:38 -0400
Subject: [PATCH 1458/1569] Sekapoko matchers

he asked nicely
---
 common/data/details.js  | 12 ++++++------
 common/data/matchers.js | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index eab4fa52c..de31ddaa5 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8695,12 +8695,12 @@ window.details = {
     },
     1431: {//Raid Franky
         captain: "Boosts ATK of all characters by 2x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.2x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
-        special: "Deals 100x character's ATK in typeless damage to all enemies, remove enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
+        special: "Deals 100x character's ATK in typeless damage to all enemies, removes enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
         specialName: "General Cannon",
     },
     1432: {//Raid Franky
         captain: "Boosts ATK of all characters by 2.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.5x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
-        special: "Deals 100x character's ATK in typeless damage to all enemies, remove enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
+        special: "Deals 100x character's ATK in typeless damage to all enemies, removes enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
         specialName: "General Cannon",
     },
     1433: {//Hody Jones
@@ -11298,13 +11298,13 @@ window.details = {
     },
     1728: {//Tashigi
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2x",
-        special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, remove enemies' ATK Up Buffs, and recovers 2,000 HP",
+        special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, removes enemies' ATK Up Buffs, and recovers 2,000 HP",
         sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
         specialName: "Destructive Water Splash",
     },
     1729: {//Tashigi
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.25x and their HP by 1.25x. Recovers 3x character's RCV in HP at the end of each turn",
-        special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, remove enemies' ATK Up Buffs, and recovers 2,000 HP",
+        special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, removes enemies' ATK Up Buffs, and recovers 2,000 HP",
         sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
         specialName: "Destructive Water Splash",
     },
@@ -12474,12 +12474,12 @@ window.details = {
     },
     1803: {//Zoro
         captain: "Boosts ATK of Slasher characters by 2x",
-        special: "Deals 13x character's ATK in [DEX] to one enemy, remove enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
+        special: "Deals 13x character's ATK in [DEX] to one enemy, removes enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
         specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
     },
     1804: {//Zoro
         captain: "Boosts ATK of Slasher characters by 2.25x and their HP by 1.3x",
-        special: "Deals 13x character's ATK in [DEX] to one enemy, remove enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
+        special: "Deals 13x character's ATK in [DEX] to one enemy, removes enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
         specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
     },
     1805: {//Buggy
diff --git a/common/data/matchers.js b/common/data/matchers.js
index 2abd5a67b..f0d36e6b2 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -434,6 +434,30 @@ window.matchers = [
         matcher: /removes.+poison/i 
     },
 
+    {
+        name: 'Crew positive buff remover',
+        target: 'special',
+        matcher: /removes.+positive buffs/i 
+    },
+
+    {
+        name: 'End of Turn buff remover',
+        target: 'special',
+        matcher: /removes.+End of Turn/i 
+    },
+
+    {
+        name: 'Enrage buff remover',
+        target: 'special',
+        matcher: /removes.+Enrage/i 
+    },
+
+    {
+        name: 'Enemy ATK buff remover',
+        target: 'special',
+        matcher: /(removes|reduces).+ATK up/i 
+    },
+
     {
         name: 'Zombies',
         target: 'special',

From a9bbfd8afdf4dd26dda6b68a1d3a8bf3261e2baf Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 24 Oct 2017 22:44:03 -0400
Subject: [PATCH 1459/1569] Typos and matchers

---
 common/data/details.js  |  8 ++++----
 common/data/matchers.js | 22 ++++++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index de31ddaa5..809d82d71 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8587,14 +8587,14 @@ window.details = {
     },
     1411: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
-        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
+        special: "Reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
         specialName: "Carving Hoof Palm: Coconut",
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1412: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's RCV to 0",
-        special: "Reduce enemies Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
+        special: "Reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shield buff enemies have",
         specialName: "Carving Hoof Palm: Coconut",
         sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
@@ -12241,13 +12241,13 @@ window.details = {
     },
     1795:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2x",
-        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
+        special: "Delays all enemies for 2 turns, reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
         specialName: "Snake Sword",
     },
     1796:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2.5x",
-        special: "Delays all enemies for 2 turns, reduce enemies Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
+        special: "Delays all enemies for 2 turns, reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
         specialName: "Snake Sword",
         limit: [
diff --git a/common/data/matchers.js b/common/data/matchers.js
index f0d36e6b2..a1865df06 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -441,13 +441,13 @@ window.matchers = [
     },
 
     {
-        name: 'End of Turn buff remover',
+        name: 'Enemy End of Turn buff remover',
         target: 'special',
         matcher: /removes.+End of Turn/i 
     },
 
     {
-        name: 'Enrage buff remover',
+        name: 'Enemy Enrage buff remover',
         target: 'special',
         matcher: /removes.+Enrage/i 
     },
@@ -458,6 +458,24 @@ window.matchers = [
         matcher: /(removes|reduces).+ATK up/i 
     },
 
+    {
+        name: 'Enemy Threshold Damage Reduction remover',
+        target: 'special',
+        matcher: /(removes|reduces).+Threshold Damage Reduction/i 
+    },
+
+    {
+        name: 'Enemy Percent Damage Reduction remover',
+        target: 'special',
+        matcher: /(removes|reduces).+Percent Damage Reduction/i 
+    },
+
+    {
+        name: 'Enemy Increased Defense remover',
+        target: 'special',
+        matcher: /(removes|reduces).+Increased Defense/i 
+    },
+
     {
         name: 'Zombies',
         target: 'special',

From 4f7a6265cbcacecfbffa6411587af94aa2769f6e Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Tue, 24 Oct 2017 23:42:35 -0500
Subject: [PATCH 1460/1569] Limit Break Mihawk

Temp fix for Limit Break Mihawk
---
 common/data/captains.js | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 2952f651c..e63621d58 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5575,9 +5575,26 @@ window.captains = {
                 if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
                 if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
             }
-            return p.unit.class.has("Slasher") ? specialEnabled ? 1.62 : 1.2: 1; 
+            if(p.unit.class.has("Slasher")){
+                if(p.actions[p.sourceSlot]){
+                    if (specialEnabled){
+                        return 3.5;
+                    } else {
+                        return 2.5;
+                    }
+                } else {
+                    if (specialEnabled){
+                        return 1.62;
+                    } else {
+                        return 1.2;
+                    }
+                }
+            }else{
+                return 1;
+            }
+            // return p.unit.class.has("Slasher") ? specialEnabled ? 1.62 : 1.2 : 1; 
         },
-        hp: function(p) { return 1.1 }
+        hp: function(p) { return p.actions[p.sourceSlot] ? 1.3 : 1.1 }
     },
     1809: {
         hitAtk: function(p) {

From 34783c878d66322d934692857300a88d9df33122 Mon Sep 17 00:00:00 2001
From: Zach <Zee_n1@yahoo.com>
Date: Wed, 25 Oct 2017 01:21:40 -0500
Subject: [PATCH 1461/1569] typo

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 809d82d71..9149d30a8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12829,7 +12829,7 @@ window.details = {
     1839: {//Yonji
         captain: "Boosts ATK of [DEX] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has 2.1x ATK",
-        special: "If your captain is [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
+        special: "If your captain is a [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
@@ -12838,7 +12838,7 @@ window.details = {
     1840: {//Yonji
         captain: "Boosts ATK of [DEX] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Attack boost stacks, so an [DEX] Powerhouse unit has 2.925x ATK",
-        special: "If your captain is [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
+        special: "If your captain is a [DEX] or [PSY] character, boosts ATK against delayed enemies by 1.75x for 1 turn. If your captain is a Powerhouse character, adds 40x characters ATK as additional typeless damage for 2 turns",
         specialName: "Burst End Kick",
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",

From a4b48f8303aa1d34d2e7e46163ae1b73ca3c9cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 25 Oct 2017 14:59:17 +0200
Subject: [PATCH 1462/1569] Goku CA

---
 common/data/captains.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index e63621d58..5f66844b1 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5815,6 +5815,17 @@ window.captains = {
         },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
+    1847: {
+        atk: function(p) {  
+    
+            if(p.unit.cost <= 29){
+                return 3.25;
+            }else if(p.unit.cost == 54){
+                return 3;
+            }
+        },
+        hp: function(p) { p.unit.cost <= 29 ? 1.2 : 1; },
+    },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },

From 413ec092b7bb785761d2819a62889a3b2a5ec87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 25 Oct 2017 15:00:59 +0200
Subject: [PATCH 1463/1569] Goku CD

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 3ff3d8043..d3325360a 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1845,7 +1845,7 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
+    [ 23, 14 ],
     null,
     null,
     null,

From b2e1c1bee36027efdc88752ee2d9d6c25226c1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 25 Oct 2017 15:01:19 +0200
Subject: [PATCH 1464/1569] Goku details

---
 common/data/details.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 9149d30a8..c26ad4fdc 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12845,6 +12845,10 @@ window.details = {
         sailorNotes: "#{beneficial}",
         limit: "This character has a limit break path",
     },
+    1847: {//Goku+
+        captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, HP 1.2x, boost ATK of characters with cost 54 by 3x",
+        special: "Do random large INT Damage to all enemies, for 1 turn boost ATK by 1.5x, change orbs of Characters that are 29 cost or lower to matching orbs",
+    },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",

From 2920d616fcaa1d5c2632fc2499dc3f2772000240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 25 Oct 2017 15:01:32 +0200
Subject: [PATCH 1465/1569] Goku SP

---
 common/data/specials.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 9cda2787a..9d2344ffe 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3782,6 +3782,10 @@ window.specials = {
         type: "condition",
         staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
+    1847: {
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
     2000: {
         atk: function(p) { return 1.75; },
         type: "class"

From 8f68ed7d6fc5a7ba1197444a15f959d9f637fe0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 25 Oct 2017 15:02:18 +0200
Subject: [PATCH 1466/1569] Goku stats

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 99e15f79a..45824f84a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1845,7 +1845,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Sengoku the Garbo", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c97b8b40bd75edf706c15754f5582eeb2695b229 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 25 Oct 2017 10:51:39 -0400
Subject: [PATCH 1467/1569] cmonBruh

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 45824f84a..c228db138 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1845,7 +1845,7 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sengoku the Garbo", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
+    [ "Sengoku the Buddha", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 5e377a79b7edd4f66f31ccf4c3eb55351f192074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 26 Oct 2017 13:58:35 +0200
Subject: [PATCH 1468/1569] Sanji Shop, Sicilian Colo and Railiegh evolvers

---
 common/data/evolutions.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 41b764494..8eb6924f2 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2837,7 +2837,7 @@ window.evolutions = {
     },
     1821: {
         evolution: 1822,
-        evolvers: [  ]
+        evolvers: [ 78, 84, 89, 95, 100 ]
     },
     1823: {
         evolution: 1824,
@@ -2849,7 +2849,7 @@ window.evolutions = {
     },
     1827: {
         evolution: 1828,
-        evolvers: [  ],
+        evolvers: [  118, 99, 1180, 304, 104 ]
     },
     1829: {
         evolution: 1830,
@@ -2877,6 +2877,6 @@ window.evolutions = {
     },
     2000: {
         evolution: 2001,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 266, 300, 100 ]
     },
 };

From 302976dbd3ec734d2f329c3bac0d1af9aef2393a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 26 Oct 2017 14:02:03 +0200
Subject: [PATCH 1469/1569] Sicilian Colo

---
 common/data/details.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index c26ad4fdc..2c8832427 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12753,6 +12753,14 @@ window.details = {
         specialNotes: "#{colorAffinity : 1.75}",
         specialName: "Great Eruption [Neo]",
     },
+    1827: {//Sicilian Colo
+        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
+        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
+    },
+    1828: {//Sicilian Colo
+        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
+        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
+    },
     1829: {//Raid Caesar
         captain: "Boosts ATK of Cerebral and Driven characters by 2x",
         special: "Deals 45x character's ATK in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for Cerebral and Driven characters for 2 turns, and poisons all enemies",

From 1b02fc9461d74f8b003e7244c5e776695b17f27b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 26 Oct 2017 14:08:16 +0200
Subject: [PATCH 1470/1569] Sicilian Raidleigh & NeoKainu stats

Also renaming for Raidleigh
---
 common/data/units.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index c228db138..be26363f8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1821,12 +1821,12 @@ window.units = [
     [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 741, 128, 252, 1920, 630, 420, 1 ],
     [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
     [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
-    [ "Byrnndi World, World Destroyer", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Byrnndi World, Wielder of the More-More Fruit", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2462, 1408, 319, null ],
+    [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2462, 1408, 319, null ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 284, 217, 0, 1612, 819, 49, null ],
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1506, 717, 44, 3156, 1450, 99, null ],
-    [ "Sicilian, Mokomo Dukedom ", "INT", [ "Slasher", "Free Powerhouse" ], 4, 25, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 4, 99, 4000000, 1, 1, 1, 2270, 1421, 328, null ],
+    [ "Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 3, 70, 1066998, 537, 299, 40, 1181, 787, 209, null ],
+    [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1122, 690, 158, 2270, 1421, 328, null ],
     [ "Caesar", "INT", [ "Cerebral", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1, 1, 1, 1811, 1404, 324, null ],
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1998,8 +1998,8 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Silvers Rayleigh", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, null, null, null, null ],
-    [ "Silvers Rayleigh, Right Hand of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, null ],
+    [ "Silvers Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, 1258, 714, 194, null ],
+    [ "Dark King Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 5293cd49d2a0dcc8dbb7d117b834f4816db5c09d Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 27 Oct 2017 16:06:35 -0400
Subject: [PATCH 1471/1569] Units details

---
 common/data/aliases.js    | 16 +++++------
 common/data/details.js    | 58 +++++++++++++++++++++++++++++++++------
 common/data/evolutions.js |  4 +--
 common/data/gw.js         | 27 +++++++++++++++---
 common/data/units.js      | 16 +++++------
 5 files changed, 90 insertions(+), 31 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 70029c674..ca8fe75f5 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1819,14 +1819,14 @@ window.aliases = {
     1818: ['リク・ドルド３世', '', ''],
     1819: ['タンク・レパント', '', ''],
     1820: ['スカーレット', '', ''],
-    1821: ['', '', 'Husbando Sanji'],
-    1822: ['', '', 'Husbando Sanji'],
-    1823: ['', '', ''],
-    1824: ['', '', ''],
-    1825: ['', '', 'Kaikainu'],
-    1826: ['', '', 'Kaikainu'],
-    1827: ['', '', ''],
-    1828: ['', '', ''],
+    1821: ['サンジ ステージ衣装の海賊', '', 'Husbando Sanji'],
+    1822: ['サンジ ステージ衣装の王子様', '', 'Husbando Sanji'],
+    1823: ['バーンディ・ワールド モアモアの実の能力者', '', 'Secret World', 'Secret Byrnndi World'],
+    1824: ['バーンディ・ワールド 世界の破壊者', '', 'Secret World', 'Secret Byrnndi World'],
+    1825: ['赤犬「改」', '', 'Kaikainu', 'Kai Akainu', 'Neo Akainu'],
+    1826: ['赤犬「改」 マグマ人間', '', 'Kaikainu', 'Kai Akainu', 'Neo Akainu'],
+    1827: ['シシリアン モコモ公国', '', ''],
+    1828: ['全力のシシリアン モコモ公国', '', ''],
     1829: ['', '', ''],
     1830: ['', '', ''],
     2000: ['', '', 'Global Rayleigh', 'Raidleigh'],
diff --git a/common/data/details.js b/common/data/details.js
index 2c8832427..304801462 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8171,7 +8171,7 @@ window.details = {
         specialName: "Sky Walk",
     },
     1368: {//Timeskip Sanji
-        captain: "Boosts ATK of [STR] characters by 2.5x, by 3x if HP is below 30% at the start of the turn",
+        captain: "Boosts ATK of [STR] characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: [
             {
                 "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
@@ -11316,7 +11316,7 @@ window.details = {
         specialName: "Shining Brightly Upon the Oasis",
     },
     1731: {//Vivi
-        captain: "Boosts ATK of all characters by 2x, boosts amount of Beli received by 2.5x",
+        captain: "Boosts amount of Beli received by 2.5x and boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
         sailor: "Restores her own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
@@ -11326,13 +11326,13 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2x, boosts HP of Striker and Powerhouse characters by 1.1x",
         special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Nekomamushi Special",
+        specialName: "Battle Guardian",
     },
     1733: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2.5x, boosts HP of Striker and Powerhouse characters by 1.25x",
         special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Nekomamushi Special",
+        specialName: "Battle Guardian",
     },
     1734: {//Sugar
         captain: "Boosts ATK of Cerebral and Fighter characters by 1.5x and recovers 3x character's RCV in HP at the end of each turn",
@@ -12739,7 +12739,6 @@ window.details = {
         ],
         specialNotes:"#{stages}",
         specialName: "More More: Hundredfold Artillery Cannon",
-        limit: "This character has a limit break path",
     },
     1825: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
@@ -12754,12 +12753,53 @@ window.details = {
         specialName: "Great Eruption [Neo]",
     },
     1827: {//Sicilian Colo
-        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
-        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
+        captain: "Boosts ATK of [INT] characters by 2x",
+        special: "Reduce crew's current HP by 50%, Boosts ATK of [INT] characters by 2x for 1 turn and randomize non-matching orbs, including [BLOCK] orbs",
+        specialName: "Explosive Spirit",
     },
     1828: {//Sicilian Colo
-        captain: "2,5x Atk for INT characters, 3x if your HP is under 30%",
-        special: "Reduce crew HP by 50%, 2x Atk boost for INT characters and randomize non-matching orbs (block included)",
+        captain: "Boosts ATK of [INT] characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
+        special: "Reduce crew's current HP by 50%, Boosts ATK of [INT] characters by 2x for 1 turn and randomize non-matching orbs, including [BLOCK] orbs",
+        specialName: "Explosive Spirit",
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Slasher characters by 40" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Aquire Potential 1: [PSY] Damage Reduction" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+        ],
+        potential: [
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduces Damage recieved from [PSY] enemies by 1%",
+                    "Level 2: Reduces Damage recieved from [PSY] enemies by 2%",
+                    "Level 3: Reduces Damage recieved from [PSY] enemies by 3%",
+                    "Level 4: Reduces Damage recieved from [PSY] enemies by 4%",
+                    "Level 5: Reduces Damage recieved from [PSY] enemies by 5%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a 10% chance to deal 5% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a 15% chance to deal 5% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
+                ]
+            },
+        ]
     },
     1829: {//Raid Caesar
         captain: "Boosts ATK of Cerebral and Driven characters by 2x",
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 8eb6924f2..45980f517 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2841,7 +2841,7 @@ window.evolutions = {
     },
     1823: {
         evolution: 1824,
-        evolvers: [  ]
+        evolvers: [ 118, 84, 95, 300, 100 ]
     },
     1825: {
         evolution: 1826,
@@ -2849,7 +2849,7 @@ window.evolutions = {
     },
     1827: {
         evolution: 1828,
-        evolvers: [  118, 99, 1180, 304, 104 ]
+        evolvers: [ 118, 99, 1180, 304, 104 ]
     },
     1829: {
         evolution: 1830,
diff --git a/common/data/gw.js b/common/data/gw.js
index 28bc93fdf..076213256 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1815,10 +1815,29 @@ window.gw=[
     70377,
     70377,
     12647,
-    null,
-    null,
-    null,
-    null,
+    72658,
+    72658,
+    72660,
+    72659,
     72324,
     72324,
+    73186,
+    73186,
+    73957,
+    73957,
+    74132,
+    74132,
+    null,
+    null,
+    74384,
+    74384,
+    74388,
+    74388,
+    74387,
+    74387,
+    74386,
+    74386,
+    74385,
+    74385,
+    11070,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index be26363f8..939102ccd 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1819,14 +1819,14 @@ window.units = [
     [ "Riku Doldo III", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 612, 354, 189, 2066, 992, 275, 1 ],
     [ "Tank Lepanto", "DEX", [ "Powerhouse", "Striker" ], 3, 15, 5, 1, 70, 1066998, 199, 112, 8, 1674, 1011, 24, 1 ],
     [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 741, 128, 252, 1920, 630, 420, 1 ],
-    [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, null ],
-    [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, null ],
-    [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, null, 3, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2462, 1408, 319, null ],
-    [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 284, 217, 0, 1612, 819, 49, null ],
-    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1506, 717, 44, 3156, 1450, 99, null ],
-    [ "Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 3, 70, 1066998, 537, 299, 40, 1181, 787, 209, null ],
-    [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1122, 690, 158, 2270, 1421, 328, null ],
+    [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, 1 ],
+    [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, 1 ],
+    [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, 4, 3, 70, 1066998, 162, 135, 33, 1332, 742, 157, 1 ],
+    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1185, 688, 122, 2462, 1408, 319, 1 ],
+    [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 284, 217, 0, 1612, 819, 49, 1 ],
+    [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1506, 717, 44, 3156, 1450, 99, 1 ],
+    [ "Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 3, 70, 1066998, 537, 299, 40, 1181, 787, 209, 1 ],
+    [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1122, 690, 158, 2270, 1421, 328, 1 ],
     [ "Caesar", "INT", [ "Cerebral", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1, 1, 1, 1811, 1404, 324, null ],
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],

From 903b6c1d0f78e86af2b9baaaf0f399b521e3ac1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Sat, 28 Oct 2017 09:40:38 +0200
Subject: [PATCH 1472/1569] Fixed Sengoku HP

Wasn't displaying HP http://puu.sh/y91UT/4724be6f4b.png
---
 common/data/captains.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 5f66844b1..f091cc07c 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5822,9 +5822,11 @@ window.captains = {
                 return 3.25;
             }else if(p.unit.cost == 54){
                 return 3;
+            }else{
+                return 1;
             }
         },
-        hp: function(p) { p.unit.cost <= 29 ? 1.2 : 1; },
+        hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; },
     },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },

From e79dafca0e13a122a1d46f55686e01b5732a1ec1 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 28 Oct 2017 16:21:16 -0400
Subject: [PATCH 1473/1569] Bug Fixes

BlazingGamer saves
---
 common/data/details.js | 22 +++++++++++-----------
 common/data/units.js   |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 304801462..93444bc20 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -8467,7 +8467,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 40" },
             { "description": "Boosts base RCV by 40" },
-            { "description": "Aquire Sailor Ability 1: " },
+            { "description": "Aquire Sailor Ability 1: Reduces Silence duration against this unit by 2 turns" },
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire 1 additional Socket slot" },
@@ -9064,8 +9064,8 @@ window.details = {
             { "description": "Aquire Potential 1: Enrage" },
             { "description": "Boosts base RCV by 20" },
             { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base ATK by " },
-            { "description": "Aquire Sailor Ability #: " },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base HP by 70" },
             { "description": "Boosts base HP by 90" },
             { "description": "Boosts base RCV by 40" },
@@ -10283,7 +10283,7 @@ window.details = {
             { "description": "Boosts base HP by 40" },
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base ATK by 20" },
-            { "description": "Aquire Sailor Ability #: " },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Powerhouse characters by 50" },
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire 1 additional Socket slot" },
@@ -10889,7 +10889,7 @@ window.details = {
             { "description": "Boosts base HP by 70" },
             { "description": "Boosts base RCV by 20" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Sailor Ability #: " },
+            { "description": "Aquire Sailor Ability 1: Boost HP of all characters by 40 if your Captain is a Fighter character" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire Potential 2: Enrage" },
         ],
@@ -11149,13 +11149,13 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base ATK by 10" },
             { "description": "Boosts base ATK by 10" },
-            { "description": "Aquire Sailor Ability 1: " },
+            { "description": "Aquire Sailor Ability 1: Makes [STR] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base ATK by 10" },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base HP by 100" },
             { "description": "Boosts base ATK by 20" },
-            { "description": "Aquire Sailor Ability 2: " },
-            { "description": "Aquire Potential #: Slot Bind Self-reduction" },
+            { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for Driven characters" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -12131,7 +12131,7 @@ window.details = {
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base RCV by 10" },
             { "description": "Boosts base RCV by 20" },
-            { "description": "Aquire Sailor Ability 1: " },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK and HP of STR, DEX, and QCK characters by 75 if your Captain is a [STR] character" },
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base ATK by 50" },
@@ -12650,14 +12650,14 @@ window.details = {
     },
     1817: {// Riku
         captain: "Boosts ATK by 2x after scoring 3 Greats in a row",
-        special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
+        special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn and reduces special cooldown of all non-Captain specials by 1 turn",
         specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
     },
     1818: {// Riku
         captain: "Boosts ATK of all characters by 1.5x and their HP by 1.2x, boosts ATK by 2.5x after scoring 3 Greats in a row",
-        special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn",
+        special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn and reduces special cooldown of all non-Captain specials by 1 turn",
         specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
         sailorNotes: "#{rewind : 1}",
diff --git a/common/data/units.js b/common/data/units.js
index 939102ccd..8aafd8887 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1774,7 +1774,7 @@ window.units = [
     [ "'Samurai' Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
     [ "'Samurai' Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
     [ "'Samurai' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
-    [ "'Dragon' Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
+    [ "'Dragon' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
     [ "Kizaru, Emissary of the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, 5, 3, 70, 1066998, 160, 114, 38, 1292, 700, 177, 1 ],
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1230, 1342, 315, 2613, 1342, 315, 1 ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, 2, 70, 1066998, 217, 171, 37, 1221, 746, 162, 1 ],

From fd53237967e9ab22733056787cdc245b2bd5d5e2 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 28 Oct 2017 16:54:36 -0400
Subject: [PATCH 1474/1569] bugs

---
 common/data/drops.js |   3 +-
 common/data/flags.js | 108 +++++++++++++++++++++++++------------------
 common/data/units.js |   4 +-
 3 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index a1c285b8b..beb1411bd 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1280,7 +1280,8 @@ window.drops = {
             condition: 'None',
             challenge:'Total number of hits above 50,000',
             challengeData: [['4 Times','1x INT Elder'],['9 Times','1x ATK Cotton Candy, 1x Rainbow Gem'],['22 Times','1x Despair Resistance Forbidden Tome, 2x Rainbow Gems']],
-            'All Difficulties': [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -1549, -673, -671, -633, -500, -467, -465, -451, -431 ]
+            'Japan': [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -709, -1549, -673, -671, -633, -500, -467, -465, -451, -431 ],
+            'Global': [ 41, 42, 53, 235, 395, 397, 419, 426, 427, 432, 563, 564, 866, 867, 868, -451, -558, -1208, -560, -1212, -465, -500, -633, -709, -1549, -467 ]
         },
 
         {
diff --git a/common/data/flags.js b/common/data/flags.js
index 88b51ed6d..befcd9657 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -517,16 +517,16 @@ window.flags = {
     516: { global: 1 },
     517: { global: 1 },
     518: { global: 1 },
-    519: { rr: 1, rro: 1 },
-    520: { rr: 1, rro: 1 },
-    521: { rr: 1, rro: 1 },
-    522: { rr: 1, rro: 1 },
-    523: { rr: 1, rro: 1 },
-    524: { rr: 1, rro: 1 },
-    525: { rr: 1, rro: 1 },
-    526: { rr: 1, rro: 1 },
-    527: { rr: 1, rro: 1 },
-    528: { rr: 1, rro: 1 },
+//    519: { rr: 1, rro: 1 },
+//    520: { rr: 1, rro: 1 },
+//    521: { rr: 1, rro: 1 },
+//    522: { rr: 1, rro: 1 },
+//    523: { rr: 1, rro: 1 },
+//    524: { rr: 1, rro: 1 },
+//    525: { rr: 1, rro: 1 },
+//    526: { rr: 1, rro: 1 },
+//    527: { rr: 1, rro: 1 },
+//    528: { rr: 1, rro: 1 },
     529: { global: 1, rr: 1, rro: 1 },
     530: { global: 1, rr: 1, rro: 1 },
     531: { promo: 1, global: 1, shop: 1 },
@@ -551,14 +551,14 @@ window.flags = {
     550: { global: 1 },
     551: { global: 1 },
     552: { global: 1 },
-    553: { rr: 1, rro: 1 },
-    554: { rr: 1, rro: 1 },
-    555: { rr: 1, rro: 1 },
-    556: { rr: 1, rro: 1 },
-    557: { rr: 1, rro: 1 },
-    558: { rr: 1, rro: 1 },
-    559: { rr: 1, rro: 1 },
-    560: { rr: 1, rro: 1 },
+//    553: { rr: 1, rro: 1 },
+//    554: { rr: 1, rro: 1 },
+//    555: { rr: 1, rro: 1 },
+//    556: { rr: 1, rro: 1 },
+//    557: { rr: 1, rro: 1 },
+//    558: { rr: 1, rro: 1 },
+//    559: { rr: 1, rro: 1 },
+//    560: { rr: 1, rro: 1 },
     561: { rr: 1, rro: 1, global: 1 },
     562: { rr: 1, rro: 1, global: 1 },
     563: { global: 1 },
@@ -575,8 +575,8 @@ window.flags = {
     574: { global: 1 },
     575: { global: 1 },
     576: { special: 1, shop: 1, global: 1 },
-    577: { rr: 1, rro: 1, global: 1 },
-    578: { rr: 1, rro: 1, global: 1 },
+//    577: { rr: 1, rro: 1, global: 1 },
+//    578: { rr: 1, rro: 1, global: 1 },
     579: { global: 1, rr: 1, rro: 1, lrr: 1 },
     580: { global: 1, rr: 1, rro: 1, lrr: 1 },
     581: { global: 1 },
@@ -1238,6 +1238,8 @@ window.flags = {
     1246: { special: 1, global: 1 },
     1247: { special: 1, global: 1 },
     1249: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1250: { global: 1 },
+    1251: { global: 1 },
     1254: { global: 1 },
     1255: { global: 1 },
     1256: { global: 1 },
@@ -1275,8 +1277,8 @@ window.flags = {
     1288: { global: 1 },
     1289: { global: 1 },
     1290: { global: 1 },
-    1295: { rr: 1, rro: 1, lrr: 1 },
-    1296: { rr: 1, rro: 1, lrr: 1 },
+    1295: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1296: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1297: { global: 1 },
     1298: { global: 1 },
     1299: { global: 1 },
@@ -1287,8 +1289,8 @@ window.flags = {
     1304: { global: 1 },
     1305: { global: 1 },
     1306: { global: 1 },
-    1307: { rr: 1, rro: 1, lrr: 1 },
-    1308: { rr: 1, rro: 1, lrr: 1 },
+    1307: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1308: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1309: { global: 1 },
     1310: { global: 1 },
     1313: { rr: 1, rro: 1, global: 1 },
@@ -1373,6 +1375,8 @@ window.flags = {
     1397: { global: 1 },
     1398: { global: 1 },
     1399: { global: 1 },
+    1400: { global: 1 },
+    1401: { global: 1 },
     1403: { rr: 1, rro: 1, global: 1 },
     1404: { rr: 1, rro: 1, global: 1 },
     1405: { rr: 1, rro: 1, global: 1 },
@@ -1391,6 +1395,7 @@ window.flags = {
     1418: { global: 1 },
     1419: { rr: 1, rro: 1, lrr: 1, },
     1420: { rr: 1, rro: 1, lrr: 1, },
+    1423: { global: 1 },
     1425: { global: 1 },
     1426: { global: 1 },
     1427: { global: 1 },
@@ -1446,6 +1451,8 @@ window.flags = {
     1483: { rr: 1, rro: 1, global: 1 },
     1484: { shop: 1, global: 1 },
     1485: { shop: 1, global: 1 },
+    1486: { global: 1 },
+    1487: { global: 1 },
     1492: { rr: 1, rro: 1, global: 1 },
     1493: { global: 1 },
     1494: { global: 1 },
@@ -1469,6 +1476,10 @@ window.flags = {
     1514: { rr: 1, rro: 1, lrr: 1 },
     1517: { global: 1 },
     1518: { global: 1 },
+    1519: { global: 1 },
+    1520: { global: 1 },
+    1521: { global: 1 },
+    1522: { global: 1 },
     1523: { rr: 1, rro: 1, lrr: 1 },
     1524: { rr: 1, rro: 1, lrr: 1 },
     1525: { global: 1 },
@@ -1487,6 +1498,9 @@ window.flags = {
     1541: { rr: 1, rro: 1, global: 1 },
     1542: { rr: 1, rro: 1, global: 1 },
     1543: { rr: 1, rro: 1, global: 1 },
+    1546: { global: 1 },
+    1547: { global: 1 },
+    1548: { global: 1 },
     1549: { global: 1 },
     1550: { global: 1 },
     1551: { global: 1 },
@@ -1510,6 +1524,8 @@ window.flags = {
     1577: { rr: 1, rro: 1, global: 1 },
     1578: { rr: 1, rro: 1, global: 1 },
     1579: { rr: 1, rro: 1, global: 1 },
+    1583: { global: 1 },
+    1584: { global: 1 },
     1587: { rr: 1, rro: 1 },
     1588: { rr: 1, rro: 1 },
     1589: { rr: 1, rro: 1, lrr: 1 },
@@ -1553,37 +1569,37 @@ window.flags = {
     1665: { rr: 1, rro: 1, lrr: 1 },
     1668: { global: 1 },
     1669: { global: 1 },
-    1673: { rr: 1, rro: 1, lrr: 1 },
-    1674: { rr: 1, rro: 1, lrr: 1 },
+    1673: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1674: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1675: { special: 1 },
     1676: { special: 1 },
     1677: { rr: 1, rro: 1, lrr: 1 },
     1678: { rr: 1, rro: 1, lrr: 1 },
     1679: { global: 1 },
     1680: { global: 1 },
-    1681: { rr: 1, rro: 1 },
-    1682: { rr: 1, rro: 1 },
-    1683: { rr: 1, rro: 1 },
-    1684: { rr: 1, rro: 1 },
-    1685: { rr: 1, rro: 1 },
-    1686: { rr: 1, rro: 1 },
-    1687: { rr: 1, rro: 1 },
-    1688: { rr: 1, rro: 1 },
-    1697: { rr: 1, rro: 1 },
-    1698: { rr: 1, rro: 1 },
-    1699: { rr: 1, rro: 1 },
-    1700: { rr: 1, rro: 1 },
-    1701: { rr: 1, rro: 1 },
-    1702: { rr: 1, rro: 1 },
-    1703: { rr: 1, rro: 1 },
-    1704: { rr: 1, rro: 1 },
-    1705: { rr: 1, rro: 1 },
-    1706: { rr: 1, rro: 1 },
+    1681: { rr: 1, rro: 1, global: 1 },
+    1682: { rr: 1, rro: 1, global: 1 },
+    1683: { rr: 1, rro: 1, global: 1 },
+    1684: { rr: 1, rro: 1, global: 1 },
+    1685: { rr: 1, rro: 1, global: 1 },
+    1686: { rr: 1, rro: 1, global: 1 },
+    1687: { rr: 1, rro: 1, global: 1 },
+    1688: { rr: 1, rro: 1, global: 1 },
+    1697: { rr: 1, rro: 1, global: 1 },
+    1698: { rr: 1, rro: 1, global: 1 },
+    1699: { rr: 1, rro: 1, global: 1 },
+    1700: { rr: 1, rro: 1, global: 1 },
+    1701: { rr: 1, rro: 1, global: 1 },
+    1702: { rr: 1, rro: 1, global: 1 },
+    1703: { rr: 1, rro: 1, global: 1 },
+    1704: { rr: 1, rro: 1, global: 1 },
+    1705: { rr: 1, rro: 1, global: 1 },
+    1706: { rr: 1, rro: 1, global: 1 },
     1707: { rr: 1, rro: 1 },
     1712: { rr: 1, rro: 1, lrr: 1 },
     1713: { rr: 1, rro: 1, lrr: 1 },
-    1720: { rr: 1, rro: 1, lrr: 1 },
-    1721: { rr: 1, rro: 1, lrr: 1 },
+    1720: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1721: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1728: { special: 1 },
     1729: { special: 1 },
     1730: { rr: 1, rro: 1, lrr: 1 },
diff --git a/common/data/units.js b/common/data/units.js
index 8aafd8887..22b863188 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1821,8 +1821,8 @@ window.units = [
     [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 741, 128, 252, 1920, 630, 420, 1 ],
     [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, 1 ],
     [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, 1 ],
-    [ "Byrnndi World", "STR", [ "Shooter", "Driven" ], 4, 20, 4, 3, 70, 1066998, 162, 135, 33, 1332, 742, 157, 1 ],
-    [ "Byrnndi World, Evolved", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1185, 688, 122, 2462, 1408, 319, 1 ],
+    [ "Byrnndi World, Wielder of the More-More Fruit", "STR", [ "Shooter", "Driven" ], 4, 20, 4, 3, 70, 1066998, 162, 135, 33, 1332, 742, 157, 1 ],
+    [ "Byrnndi World, World Destroyer", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1185, 688, 122, 2462, 1408, 319, 1 ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 284, 217, 0, 1612, 819, 49, 1 ],
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1506, 717, 44, 3156, 1450, 99, 1 ],
     [ "Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 3, 70, 1066998, 537, 299, 40, 1181, 787, 209, 1 ],

From c24b5e3b7e143f0ca5d97260fadaa0ae298ceaf6 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 31 Oct 2017 00:55:35 -0400
Subject: [PATCH 1475/1569] new FN

---
 common/data/aliases.js    |  4 ++--
 common/data/captains.js   | 14 +++++++++++++-
 common/data/cooldowns.js  |  8 ++++----
 common/data/details.js    | 25 +++++++++++++++++++++++--
 common/data/drops.js      | 19 ++++++++++++++++++-
 common/data/evolutions.js | 10 +++++++++-
 common/data/families.js   |  8 ++++----
 common/data/specials.js   |  8 ++++++++
 common/data/units.js      | 14 +++++++-------
 9 files changed, 88 insertions(+), 22 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ca8fe75f5..7d5891040 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1827,8 +1827,8 @@ window.aliases = {
     1826: ['赤犬「改」 マグマ人間', '', 'Kaikainu', 'Kai Akainu', 'Neo Akainu'],
     1827: ['シシリアン モコモ公国', '', ''],
     1828: ['全力のシシリアン モコモ公国', '', ''],
-    1829: ['', '', ''],
-    1830: ['', '', ''],
+    1829: ['シーザー・クラウン 大気の支配者', '', ''],
+    1830: ['Ｍ（マスター）・シーザー 大気の支配者', '', ''],
     2000: ['', '', 'Global Rayleigh', 'Raidleigh'],
     2001: ['', '', 'Global Rayleigh', 'Raidleigh'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index f091cc07c..5ef407653 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5202,7 +5202,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1721: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2.5); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1722: {
@@ -5815,6 +5815,18 @@ window.captains = {
         },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
+    1841: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+    },
+    1842: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+    },
+    1843: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.5 : 1; },
+    },
+    1844: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; },
+    },
     1847: {
         atk: function(p) {  
     
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d3325360a..9421b5caa 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1839,10 +1839,10 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 20, 14 ],
     [ 20, 14 ],
-    null,
-    null,
-    null,
-    null,
+    16,
+    16,
+    12,
+    12,
     null,
     null,
     [ 23, 14 ],
diff --git a/common/data/details.js b/common/data/details.js
index 93444bc20..6a043c5d6 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12893,9 +12893,30 @@ window.details = {
         sailorNotes: "#{beneficial}",
         limit: "This character has a limit break path",
     },
+    1841: {//Caribou
+        captain: "Boosts ATK of Driven characters by 1.5x, deals 2x character's ATK in [DEX] damage to all enemies at the end of each turn",
+        special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
+        specialName: "Fathomless Infinite Hell",
+    },
+    1842: {//Caribou
+        captain: "Boosts ATK of Driven characters by 1.5x, deals 4x character's ATK in [DEX] damage to all enemies at the end of each turn",
+        special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
+        specialName: "Fathomless Infinite Hell",
+    },
+    1843: {//Coribou
+        captain: "Boosts ATK of Driven and Striker characters by 1.5x",
+        special: "Removes blindness and recovers 4x character's RCV in HP",
+        specialName: "Frantic Funeral",
+    },
+    1844: {//Coribou
+        captain: "Boosts ATK of Driven and Striker characters by 1.75x",
+        special: "Removes blindness and recovers 4x character's RCV in HP",
+        specialName: "Frantic Funeral",
+    },
     1847: {//Goku+
-        captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, HP 1.2x, boost ATK of characters with cost 54 by 3x",
-        special: "Do random large INT Damage to all enemies, for 1 turn boost ATK by 1.5x, change orbs of Characters that are 29 cost or lower to matching orbs",
+        captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, and their HP by 1.2x, boost ATK of characters with cost 54 by 3x",
+        special: "Deals random large INT Damage to all enemies, boost ATK of all characters by 1.5x for 1 turn, changes orbs to matching orbs for chatacters that are 29 cost or lower",
+        specialName: "Requiem Shockwave",
     },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
diff --git a/common/data/drops.js b/common/data/drops.js
index beb1411bd..1fc206862 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1686,6 +1686,14 @@ window.drops = {
             'All Difficulties': [ 1817, 1819, 1820, -1610, -1656, -1660, -1230, -1236, -1173, -526, -643, -1506, -964 ]
         },
         
+        {
+            name: 'Caribou Pirates!',
+            thumb: 1842,
+            gamewith: null,
+            condition: '[STR] orbs will not appear naturally',
+            'All Difficulties': [ 1841, 1843, -1268, -639, -645, -1234, -1270, -1700, -1704, -1501, -1502 ]
+        },
+        
     ],
 
             
@@ -2025,7 +2033,7 @@ window.drops = {
         },
         
         {
-            name: 'Clash!! Bellamy',
+            name: 'Clash Neo!! Bellamy',
             thumb: 1738,
             gamewith: 66087,
             condition: '1 Expert version and 3 Master versions with different conditions. Expert: Driven/Free Spirit/Striker Only. Can only complete 10 times each. Master: Driven Only, Free Spirit Only, and Striker Only',
@@ -2059,6 +2067,15 @@ window.drops = {
             Expert: [ 1814 ]
         },
         
+        {
+            name: 'Clash!! Caesar',
+            thumb: 1830,
+            gamewith: null,
+            condition: 'Take 10% MAX Health in Environmental Damage every 2 turns',
+            Master: [ 1829 ],
+            Expert: [ 1829 ]
+        },
+        
         {
             name: 'Clash!! Rayleigh',
             thumb: 2001,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 45980f517..30aef00ba 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2853,7 +2853,7 @@ window.evolutions = {
     },
     1829: {
         evolution: 1830,
-        evolvers: [  ],
+        evolvers: [ 118, 88, 266, 304, 104 ],
     },
     1831: {
         evolution: 1832,
@@ -2875,6 +2875,14 @@ window.evolutions = {
         evolution: 1840,
         evolvers: [  ],
     },
+    1841: {
+        evolution: 1842,
+        evolvers: [  ],
+    },
+    1843: {
+        evolution: 1844,
+        evolvers: [  ],
+    },
     2000: {
         evolution: 2001,
         evolvers: [ 118, 84, 266, 300, 100 ]
diff --git a/common/data/families.js b/common/data/families.js
index 162a5d0c1..ca2b3fed5 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1839,10 +1839,10 @@ window.families = [
     "Vinsmoke Niji",
     "Vinsmoke Yonji",
     "Vinsmoke Yonji",
-    null,
-    null,
-    null,
-    null,
+    "Caribou",
+    "Caribou",
+    "Coribou",
+    "Coribou",
     null,
     null,
     null,
diff --git a/common/data/specials.js b/common/data/specials.js
index 9d2344ffe..886193c69 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3782,6 +3782,14 @@ window.specials = {
         type: "condition",
         staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
+    1841: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
+    },
+    1842: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
+    },
     1847: {
         atk: function(p) { return 1.5; },
         type: "type"
diff --git a/common/data/units.js b/common/data/units.js
index 22b863188..9e7a184f6 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1827,8 +1827,8 @@ window.units = [
     [ "Akainu [Neo], Magma Man", "INT", [ "Driven", "Fighter" ], 5, 50, 4, 4, 99, 5000000, 1506, 717, 44, 3156, 1450, 99, 1 ],
     [ "Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 4, 25, 4, 3, 70, 1066998, 537, 299, 40, 1181, 787, 209, 1 ],
     [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1122, 690, 158, 2270, 1421, 328, 1 ],
-    [ "Caesar", "INT", [ "Cerebral", "Driven" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 1, 1, 1, 1811, 1404, 324, null ],
+    [ "Caesar Clown, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 4, 30, 4, 1, 70, 1066998, 61, 181, 65, 890, 780, 182, 1 ],
+    [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 848, 735, 162, 1811, 1404, 324, 1 ],
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1, 1, 1, 4212, 1510, 201, null ],
     [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
@@ -1839,13 +1839,13 @@ window.units = [
     [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2834, 1382, 267, null ],
     [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2406, 1341, 352, null ],
+    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Sengoku the Buddha", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
+    [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 2c106c9938ff509ba692694b1ff12d9abb954c09 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MacBook-Pro-2.local>
Date: Tue, 31 Oct 2017 15:07:19 -0400
Subject: [PATCH 1476/1569] Gary and other fixes

I meant Garp
---
 common/data/aliases.js    | 30 ++++++++++++++++++++++++++++++
 common/data/captains.js   |  6 ++++++
 common/data/cooldowns.js  |  4 ++--
 common/data/details.js    | 10 ++++++++++
 common/data/drops.js      | 16 ++++++++++++----
 common/data/evolutions.js |  4 ++++
 common/data/families.js   |  6 +++---
 common/data/flags.js      |  1 +
 common/data/specials.js   |  6 ++++++
 common/data/units.js      | 12 ++++++------
 damage/js/cruncher.js     | 18 +++++++++++++++---
 11 files changed, 95 insertions(+), 18 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 7d5891040..34ebdc07d 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1829,6 +1829,36 @@ window.aliases = {
     1828: ['全力のシシリアン モコモ公国', '', ''],
     1829: ['シーザー・クラウン 大気の支配者', '', ''],
     1830: ['Ｍ（マスター）・シーザー 大気の支配者', '', ''],
+    1831: ['', '', ''],
+    1832: ['', '', ''],
+    1833: ['', '', ''],
+    1834: ['', '', ''],
+    1835: ['', '', ''],
+    1836: ['', '', ''],
+    1837: ['', '', ''],
+    1838: ['', '', ''],
+    1839: ['', '', ''],
+    1840: ['', '', ''],
+    1841: ['', '', ''],
+    1842: ['', '', ''],
+    1843: ['', '', ''],
+    1844: ['', '', ''],
+    1845: ['', '', 'Invasion Garp', 'Ambush Garp'],
+    1846: ['', '', 'Invasion Garp', 'Ambush Garp'],
+    1847: ['', '', ''],
+    1848: ['', '', ''],
+    1849: ['', '', ''],
+    1850: ['', '', ''],
+    1851: ['', '', ''],
+    1852: ['', '', ''],
+    1853: ['', '', ''],
+    1854: ['', '', ''],
+    1855: ['', '', ''],
+    1856: ['', '', ''],
+    1857: ['', '', ''],
+    1858: ['', '', ''],
+    1859: ['', '', ''],
+    1860: ['', '', ''],
     2000: ['', '', 'Global Rayleigh', 'Raidleigh'],
     2001: ['', '', 'Global Rayleigh', 'Raidleigh'],
 };
diff --git a/common/data/captains.js b/common/data/captains.js
index 5ef407653..331e67eec 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5827,6 +5827,12 @@ window.captains = {
     1844: {
         atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; },
     },
+    1845: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+    },
+    1846: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.75 : 1; },
+    },
     1847: {
         atk: function(p) {  
     
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 9421b5caa..0fbec144f 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1843,8 +1843,8 @@ window.cooldowns = [
     16,
     12,
     12,
-    null,
-    null,
+    [ 32, 15 ],
+    [ 32, 15 ],
     [ 23, 14 ],
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 6a043c5d6..eb9f99409 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12913,6 +12913,16 @@ window.details = {
         special: "Removes blindness and recovers 4x character's RCV in HP",
         specialName: "Frantic Funeral",
     },
+    1845: {//Garp
+        captain: "Boosts ATK of Fighter characters by 2.5x and reduce damage received by 5%",
+        special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
+        specialName: "Garp Special",
+    },
+    1846: {//Garp
+        captain: "Boosts ATK of Fighter characters by 2.75x and reduce damage received by 15%",
+        special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
+        specialName: "Garp Special",
+    },
     1847: {//Goku+
         captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, and their HP by 1.2x, boost ATK of characters with cost 54 by 3x",
         special: "Deals random large INT Damage to all enemies, boost ATK of all characters by 1.5x for 1 turn, changes orbs to matching orbs for chatacters that are 29 cost or lower",
diff --git a/common/data/drops.js b/common/data/drops.js
index 1fc206862..9e27f669c 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -2164,7 +2164,7 @@ window.drops = {
             teamDatabase: 'coliseums',
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1195, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1195, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791, 1827 ]
         },
 
         {
@@ -2178,7 +2178,7 @@ window.drops = {
             thumb: 1258,
             global: true,
             gamewith: 38237,
-            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard. Can drop a Super Evolution Skull.',
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Young Whitebeard.',
             'All Difficulties': [ 1257, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
         },
         
@@ -2187,7 +2187,7 @@ window.drops = {
             thumb: 1380,
             global: true,
             gamewith: 46369,
-            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks. Can drop a Super Evolution Skull.',
+            condition: 'Has a chance of appearing at the end of ANY Raid boss when available. You MUST use the same team that you just used to complete the raid boss to fight Shanks.',
             'All Difficulties': [ 1379, 952, 776, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
         },
         
@@ -2195,10 +2195,18 @@ window.drops = {
             name: 'Invasion! Cavendish',
             thumb: 1530,
             gamewith: 53621,
-            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish. Can drop a Super Evolution Skull.',
+            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.',
             'All Difficulties': [ 1529, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
         },
         
+        {
+            name: 'Invasion! Garp',
+            thumb: 1846,
+            gamewith: null,
+            condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Garp.',
+            'All Difficulties': [ 1845, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
+        },
+        
         {
             name: 'Rescue Ace Event - Akainu',
             thumb: 1283,
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 30aef00ba..32ea54b86 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2883,6 +2883,10 @@ window.evolutions = {
         evolution: 1844,
         evolvers: [  ],
     },
+    1845: {
+        evolution: 1846,
+        evolvers: [  ],
+    },
     2000: {
         evolution: 2001,
         evolvers: [ 118, 84, 266, 300, 100 ]
diff --git a/common/data/families.js b/common/data/families.js
index ca2b3fed5..325f46535 100644
--- a/common/data/families.js
+++ b/common/data/families.js
@@ -1843,9 +1843,9 @@ window.families = [
     "Caribou",
     "Coribou",
     "Coribou",
-    null,
-    null,
-    null,
+    "Monkey D. Garp",
+    "Monkey D. Garp",
+    "Sengoku",
     null,
     null,
     null,
diff --git a/common/data/flags.js b/common/data/flags.js
index befcd9657..78834a25e 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -1653,6 +1653,7 @@ window.flags = {
     1822: { shop: 1 },
     1823: { rr: 1, rro: 1, lrr: 1 },
     1824: { rr: 1, rro: 1, lrr: 1 },
+    1847: { rr: 1, rro: 1 },
     2000: { global: 1 },
     2001: { global: 1 },
 };
\ No newline at end of file
diff --git a/common/data/specials.js b/common/data/specials.js
index 886193c69..530ce058c 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3790,6 +3790,12 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
         type: "class"
     },
+    1845: {
+        def: function(p) { return 0; }
+    },
+    1846: {
+        def: function(p) { return 0; }
+    },
     1847: {
         atk: function(p) { return 1.5; },
         type: "type"
diff --git a/common/data/units.js b/common/data/units.js
index 9e7a184f6..c90cb96c8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1839,12 +1839,12 @@ window.units = [
     [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2834, 1382, 267, null ],
     [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2406, 1341, 352, null ],
-    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, null, null, null, null ],
+    [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, null, null, null, null ],
+    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, null, null, null, null ],
+    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, null, null, null, null ],
+    [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, null, null, null, 3750, 1550, 10, null ],
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 4cf9c4eba..e41cf27f0 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -109,8 +109,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             // hp
             var hp = getStatOfUnit(x,'hp');
             hp += getShipBonus('hp',true,x.unit,n);
-            hp *= getShipBonus('hp',false,x.unit,n);
+            hp = applyStaticEffectsToHP(n,hp);
             hp *= getEffectBonus('hp',x.unit);
+            hp *= getShipBonus('hp',false,x.unit,n);
             hpMax += Math.floor(applyCaptainEffectsToHP(n,hp));
             // rcv
             var rcv = getStatOfUnit(x,'rcv');
@@ -473,12 +474,12 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
 
     var applyCaptainEffectsToHP = function(slotNumber,hp) {
         var params = getParameters(slotNumber);
-        for (var i=0;i<enabledEffects.length;++i) {
+        /*for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('hpStatic')){
                 params["sourceSlot"] = enabledEffects[i].sourceSlot;
                 hp += enabledEffects[i].hpStatic(params);
             }
-        }
+        }*/
         for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('hp')){
                 params["sourceSlot"] = enabledEffects[i].sourceSlot; 
@@ -488,6 +489,17 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         return hp;
     };
 
+    var applyStaticEffectsToHP = function(slotNumber,hp) {
+        var params = getParameters(slotNumber);
+        for (var i=0;i<enabledEffects.length;++i) {
+            if (enabledEffects[i].hasOwnProperty('hpStatic')){
+                params["sourceSlot"] = enabledEffects[i].sourceSlot;
+                hp += enabledEffects[i].hpStatic(params);
+            }
+        }
+        return hp;
+    };
+
     var applyCaptainEffectsAndSpecialsToRCV = function(slotNumber,rcv) {
         var params = getParameters(slotNumber);
         // static rcv

From feb55c3629773940d79a3e2074fe6d795f40365f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Wed, 1 Nov 2017 15:44:19 +0100
Subject: [PATCH 1477/1569] Bug exporting link with 500CC

Context https://www.reddit.com/r/OnePieceTC/comments/7a0u7q/jpninvasion_hero_of_the_marines_garp_the_fist/dp6u108/?context=10000
---
 damage/js/transfer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/transfer.js b/damage/js/transfer.js
index e18683fe6..a0acffbaa 100644
--- a/damage/js/transfer.js
+++ b/damage/js/transfer.js
@@ -42,7 +42,7 @@ var ImportCtrl = function($scope, $rootScope, $state, $stateParams) {
                 rcv = parseInt(matches[5],10) || 0;
             if (id < 1 || id > window.units.length || window.units[id - 1].length === 0) break;
             if (level < 1 || level > window.units[id - 1].maxLevel) break;
-            if (atk > 100 || hp > 100 || rcv > 100 || (atk + hp + rcv) > 200) break;
+            if (atk > 200 || hp > 200 || rcv > 200 || (atk + hp + rcv) > 500) break;
             team.push({ id: id, level: level, candies: { atk: atk, hp: hp, rcv: rcv }});
         }
     }

From 56bab96e864371f31e0793b59d79ef98f3751663 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 1 Nov 2017 11:08:29 -0400
Subject: [PATCH 1478/1569] Judge Stats - Ribcrush

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index c90cb96c8..96d83d6ed 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1829,8 +1829,8 @@ window.units = [
     [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1122, 690, 158, 2270, 1421, 328, 1 ],
     [ "Caesar Clown, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 4, 30, 4, 1, 70, 1066998, 61, 181, 65, 890, 780, 182, 1 ],
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 848, 735, 162, 1811, 1404, 324, 1 ],
-    [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1, 1, 1, 4212, 1510, 201, null ],
+    [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, 5, 3, 70, 1066998, 808, 177, 12, 1906, 782, 162, null ],
+    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1602, 740, 138, 4212, 1510, 201, null ],
     [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
     [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 1984, 1312, 432, null ],
     [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],

From 4ad0ee229fe8aec9a459b26d0ae439c1315ac69d Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 1 Nov 2017 11:17:13 -0400
Subject: [PATCH 1479/1569] Evolutions

---
 common/data/evolutions.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 32ea54b86..d61f6e80b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2865,27 +2865,31 @@ window.evolutions = {
     },
     1835: {
         evolution: 1836,
-        evolvers: [  ],
+        evolvers: [ 83, 94, 95, 300, 100 ],
     },
     1837: {
         evolution: 1838,
-        evolvers: [  ],
+        evolvers: [ 118, 85, 96, 301, 101 ],
     },
     1839: {
         evolution: 1840,
-        evolvers: [  ],
+        evolvers: [ 86, 266, 97, 302, 102 ],
     },
     1841: {
         evolution: 1842,
-        evolvers: [  ],
+        evolvers: [ 117, 80, 86, 97, 102 ],
     },
     1843: {
         evolution: 1844,
-        evolvers: [  ],
+        evolvers: [ 117, 78, 84, 95, 100 ],
     },
     1845: {
         evolution: 1846,
-        evolvers: [  ],
+        evolvers: [ 118, 84, 266, 95, 267 ],
+    },
+    459: {
+        evolution: 1847,
+        evolvers: [ 'skullINT', 118, 88, 304, 267 ],
     },
     2000: {
         evolution: 2001,

From 3e69036d179d6e8252884bc14cb7b538367437b9 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Thu, 2 Nov 2017 02:34:14 -0400
Subject: [PATCH 1480/1569] Caribou CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0fbec144f..c4b7f12ee 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1839,8 +1839,8 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 20, 14 ],
     [ 20, 14 ],
-    16,
-    16,
+    [ 16, 10 ],
+    [ 16, 10 ],
     12,
     12,
     [ 32, 15 ],

From 7c9bed2a462696d59e9d5cbcf27ab2eecd2a819c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 10:09:48 +0100
Subject: [PATCH 1481/1569] Coribou CD

---
 common/data/cooldowns.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index c4b7f12ee..0ff64dbfe 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1841,8 +1841,8 @@ window.cooldowns = [
     [ 20, 14 ],
     [ 16, 10 ],
     [ 16, 10 ],
-    12,
-    12,
+    [ 12, 6 ],
+    [ 12, 6 ],
     [ 32, 15 ],
     [ 32, 15 ],
     [ 23, 14 ],

From c63669c250cfa82aa3d0896cc358875783c021fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 10:11:48 +0100
Subject: [PATCH 1482/1569] Germa66 stats, C@ribou Stats

---
 common/data/units.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 96d83d6ed..ab34ad0a0 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1243,7 +1243,7 @@ window.units = [
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "'Straw Hat' Monkey D. Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
+    [ "'Straw Hat' Monkey D Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
     [ "'Fire Fist' Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
     [ "'Fire Fist' Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
     [ "Marco, Collar Fluttering in the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
@@ -1591,14 +1591,14 @@ window.units = [
     [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, 1 ],
     [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 141, 121, 36, 1134, 589, 233, 1 ],
     [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
-    [ "Monkey D. Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
+    [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
     [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, 1 ],
     [ "Princess Shirahoshi, Ryugu Kingdom", "INT", "Striker", 4, 20, 4, 3, 99, 3000000, 620, 330, 200, 1536, 858, 408, 1 ],
     [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, 1 ],
     [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, 1 ],
-    [ "Monkey D. Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
+    [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
     [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, 1 ],
     [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, 1 ],
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, 3000000, 151, 90, 98, 1760, 1190, 257, 1 ],
@@ -1774,7 +1774,7 @@ window.units = [
     [ "'Samurai' Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
     [ "'Samurai' Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
     [ "'Samurai' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
-    [ "'Dragon' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
+    [ "'Dragon' Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
     [ "Kizaru, Emissary of the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, 5, 3, 70, 1066998, 160, 114, 38, 1292, 700, 177, 1 ],
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1230, 1342, 315, 2613, 1342, 315, 1 ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, 2, 70, 1066998, 217, 171, 37, 1221, 746, 162, 1 ],
@@ -1806,7 +1806,7 @@ window.units = [
     [ "Buggy the Clown, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 261406, 166, 87, 29, 987, 509, 151, 1 ],
     [ "Captain Buggy, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
     [ "Dracule Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 4, 30, 6, 1, 50, 130703, 324, 157, 23, 974, 456, 94, 1 ],
-    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 1, 99, 5000000, 847, 332, 57, 2990, 1403, 186, 1 ],
+    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 1, 99, 5000000, 847, 332, 57, 3460, 1628, 266, 1 ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],
@@ -1831,20 +1831,20 @@ window.units = [
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 848, 735, 162, 1811, 1404, 324, 1 ],
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, 5, 3, 70, 1066998, 808, 177, 12, 1906, 782, 162, null ],
     [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1602, 740, 138, 4212, 1510, 201, null ],
-    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 1984, 1312, 432, null ],
-    [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2912, 1421, 241, null ],
-    [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2834, 1382, 267, null ],
-    [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, null, 3, 50, 392109, null, null, null, null, null, null, null ],
-    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1, 1, 1, 2406, 1341, 352, null ],
-    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, null, null, null, null ],
+    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 202, 76, 41, null, null, null, null ],
+    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 822, 336, 201, 1984, 1312, 432, null ],
+    [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 268, 82, 28, 1346, 647, 110, null ],
+    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1120, 544, 82, 2912, 1421, 241, null ],
+    [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, 5, 3, 50, 392109, 250, 79, 32, 1332, 630, 118, null ],
+    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 98, 2834, 1382, 267, null ],
+    [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 218, 77, 38, 1128, 492, 198, null ],
+    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 982, 403, 152, 2406, 1341, 352, null ],
+    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, null ],
     [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, null, null, null, null ],
-    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, null, null, null, null ],
+    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, null ],
     [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, null, null, null, null ],
-    [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, null, null, null, 3750, 1550, 10, null ],
+    [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, 4, 2, 70, 1015, 494, 0, null, null, null, null, null ],
+    [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, null ],
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 403770d29e213dd4a82e85df0407ded284df1760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 10:12:56 +0100
Subject: [PATCH 1483/1569] Mistakes, D.

---
 common/data/units.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index ab34ad0a0..e75dcd7c9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1243,7 +1243,7 @@ window.units = [
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "'Straw Hat' Monkey D Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
+    [ "'Straw Hat' Monkey D. Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
     [ "'Fire Fist' Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
     [ "'Fire Fist' Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
     [ "Marco, Collar Fluttering in the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
@@ -1591,14 +1591,14 @@ window.units = [
     [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, 1 ],
     [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 141, 121, 36, 1134, 589, 233, 1 ],
     [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
-    [ "Monkey D Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
+    [ "Monkey D. Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
     [ "Shirahoshi", "INT", "Striker", 3, 13, 6, 2, 50, 392109, 62, 45, 35, 690, 360, 215, 1 ],
     [ "Princess Shirahoshi, Ryugu Kingdom", "INT", "Striker", 4, 20, 4, 3, 99, 3000000, 620, 330, 200, 1536, 858, 408, 1 ],
     [ "Ryuboshi", "STR", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 123, 87, 29, 1362, 699, 180, 1 ],
     [ "Manboshi", "QCK", [ "Powerhouse", "Slasher" ], 3, 15, 6, 1, 70, 1066998, 79, 90, 40, 864, 768, 240, 1 ],
-    [ "Monkey D Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
+    [ "Monkey D. Luffy, Straw Hat • Heart Pirates Alliance", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 209, 113, 12, 2105, 1244, 224, 1 ],
     [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, 1 ],
     [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, 1 ],
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, 3000000, 151, 90, 98, 1760, 1190, 257, 1 ],

From 2bca7865626b63a2aef4603f86b7c6219a21331d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 10:15:03 +0100
Subject: [PATCH 1484/1569] mistakes again

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index e75dcd7c9..389100356 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1774,7 +1774,7 @@ window.units = [
     [ "'Samurai' Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
     [ "'Samurai' Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
     [ "'Samurai' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
-    [ "'Dragon' Momonosuke, Evolved", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
+    [ "'Dragon' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
     [ "Kizaru, Emissary of the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, 5, 3, 70, 1066998, 160, 114, 38, 1292, 700, 177, 1 ],
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1230, 1342, 315, 2613, 1342, 315, 1 ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, 2, 70, 1066998, 217, 171, 37, 1221, 746, 162, 1 ],
@@ -1806,7 +1806,7 @@ window.units = [
     [ "Buggy the Clown, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 4, 12, 5, 3, 50, 261406, 166, 87, 29, 987, 509, 151, 1 ],
     [ "Captain Buggy, The Uncuttable Chop-Chop Man", "QCK", [ "Shooter", "Driven" ], 5, 20, 4, 4, 99, 2000000, 920, 447, 112, 2143, 1000, 304, 1 ],
     [ "Dracule Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 4, 30, 6, 1, 50, 130703, 324, 157, 23, 974, 456, 94, 1 ],
-    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 1, 99, 5000000, 847, 332, 57, 3460, 1628, 266, 1 ],
+    [ "Hawk Eyes Mihawk, The Strongest Swordsman Standing on Top of the World", "STR", "Slasher", 5, 60, 4, 1, 99, 5000000, 847, 332, 57, 2990, 1403, 186, 1 ],
     [ "Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 740, 530, 150, 1 ],
     [ "Kingsbird Wanda, Mokomo Dukedom", "PSY", [ "Slasher", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 714, 501, 137, 2042, 1139, 230, 1 ],
     [ "Carrot, Mokomo Dukedom", "DEX", [ "Fighter", "Slasher" ], 3, 13, 6, 2, 50, 392109, 104, 130, 6, 726, 768, 73, 1 ],

From 2decc2e3db4dc8981434626c00682da8a8f0e456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:10:07 +0100
Subject: [PATCH 1485/1569] Sailor Icon Opening

---
 damage/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/index.html b/damage/index.html
index c224e8f23..e82a23bf2 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -96,7 +96,7 @@
 
     <body ng-controller="SharedRootCtrl" ng-class="{ shifted: options.sidebarVisible, picking: picking }">
 
-        <div ui-view></div>
+	<div ui-view></div>
 
         <error-report></error-report>
         

From e57f04fc6db85e4c5d8d92283671f27b484ded94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:11:45 +0100
Subject: [PATCH 1486/1569] Sailor "Slot"

---
 damage/views/fragments/slot.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/damage/views/fragments/slot.html b/damage/views/fragments/slot.html
index 548acc659..6fa497ddf 100644
--- a/damage/views/fragments/slot.html
+++ b/damage/views/fragments/slot.html
@@ -19,6 +19,7 @@
         <unit-removed></unit-removed>
         <unit-silence ng-if="slot < 2"></unit-silence>
         <unit-candies></unit-candies>
+		<unit-sailor ng-if="slot >= 2 "></unit-sailor>
     </div>
 
     <level-slider></level-slider>

From 07198dd9190a94fcbec21beb40341721c3e2f9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:12:32 +0100
Subject: [PATCH 1487/1569] Spaces instead of tabs

---
 damage/views/fragments/slot.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/views/fragments/slot.html b/damage/views/fragments/slot.html
index 6fa497ddf..ff242dd61 100644
--- a/damage/views/fragments/slot.html
+++ b/damage/views/fragments/slot.html
@@ -19,7 +19,7 @@
         <unit-removed></unit-removed>
         <unit-silence ng-if="slot < 2"></unit-silence>
         <unit-candies></unit-candies>
-		<unit-sailor ng-if="slot >= 2 "></unit-sailor>
+        <unit-sailor ng-if="slot >= 2 "></unit-sailor>
     </div>
 
     <level-slider></level-slider>

From cd3d7af3a4082c2057d66af1909e692b8413721a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:13:20 +0100
Subject: [PATCH 1488/1569] Spaces instead of tabs

---
 damage/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/index.html b/damage/index.html
index e82a23bf2..da654215c 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -96,7 +96,7 @@
 
     <body ng-controller="SharedRootCtrl" ng-class="{ shifted: options.sidebarVisible, picking: picking }">
 
-	<div ui-view></div>
+    <div ui-view></div>
 
         <error-report></error-report>
         

From 7bb7426b4001f51581c9fc630ca5f9b26ca48cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:14:19 +0100
Subject: [PATCH 1489/1569] Forgot 4 spaces

---
 damage/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/index.html b/damage/index.html
index da654215c..c224e8f23 100644
--- a/damage/index.html
+++ b/damage/index.html
@@ -96,7 +96,7 @@
 
     <body ng-controller="SharedRootCtrl" ng-class="{ shifted: options.sidebarVisible, picking: picking }">
 
-    <div ui-view></div>
+        <div ui-view></div>
 
         <error-report></error-report>
         

From ad6fbf8640670ab9738263281b4bcaa6a056a2b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:15:20 +0100
Subject: [PATCH 1490/1569] Sailors Icon

---
 damage/js/directives.js | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/damage/js/directives.js b/damage/js/directives.js
index 978e2941b..4ea738f29 100644
--- a/damage/js/directives.js
+++ b/damage/js/directives.js
@@ -10,12 +10,12 @@ var directives = { };
  *****************/
 
 directives.autoFocus = function($timeout) {
-	return {
-		restrict: 'A',
-		link: function(scope, element, attrs) {
-			$timeout(function(){ element[0].focus(); });
-		}
-	};
+    return {
+        restrict: 'A',
+        link: function(scope, element, attrs) {
+            $timeout(function(){ element[0].focus(); });
+        }
+    };
 };
 
 directives.decorateSlot = function($rootScope) {
@@ -256,8 +256,8 @@ directives.floatingHeader = function($timeout) {
 };
 
 directives.goBack = function($state) {
-	return {
-		restrict: 'A',
+    return {
+        restrict: 'A',
         link: function(scope, element, attrs) {
             element.click(function(e) {
                 if (!e.target || e.target.className.indexOf('inner-container') == -1) return;
@@ -268,8 +268,8 @@ directives.goBack = function($state) {
 };
 
 directives.quickPick = function() {
-	return {
-		restrict: 'A',
+    return {
+        restrict: 'A',
         link: function(scope, element, attrs) {
             var fuse = new Fuse(window.units, { keys: [ 'name' ], id: 'number', threshold: 0.3, distance: 200 });
             element.textcomplete([{
@@ -349,6 +349,8 @@ directives.slot = function() {
         scope: true,
         link: function(scope, element, attrs) {
             scope.slot = element.index();
+            var id = scope.data.team[scope.slot].unit.number + 1;
+            scope.sailors = window.sailors[id] ? JSON.parse(JSON.stringify(window.sailors[id])) : null;  
             scope.onDrop = function(i, j) {
                 var temp = scope.data.team[i];
                 scope.data.team[i] = scope.data.team[j];
@@ -806,6 +808,21 @@ directives.unitCandies = function() {
     };
 };
 
+directives.unitSailor = function() {
+    return {
+        restrict: 'E',
+        replace: true,
+        scope: true,
+        template: '<div class="unitSailor" ng-show="hasSailor"><i class="fa fa-anchor"></div>',
+        link: function(scope, element, attrs) {
+            scope.hasSailor = false;
+            scope.$watch('data.team[slot].unit',function(unit) {
+                scope.hasSailor = unit && window.sailors.hasOwnProperty(unit.number+1);
+            });
+        }
+    };
+};
+
 directives.special = function($rootScope) {
     return {
         restrict: 'E',

From 9319f4f90811671cd69f27444d377e782d04f9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:17:21 +0100
Subject: [PATCH 1491/1569] Sailors Icon on Export IMG

CC moved top (Notice Line #127 changes for the CC movement)
And yeah added Sailor icon on the Canvas too
---
 damage/js/images.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/damage/js/images.js b/damage/js/images.js
index 7fd016696..5e2b0c1f5 100644
--- a/damage/js/images.js
+++ b/damage/js/images.js
@@ -124,7 +124,12 @@ app.controller('ImageGeneratorCtrl', function($scope, $filter, $timeout) {
                 var total = data.candies.hp + data.candies.atk + data.candies.rcv;
                 if (total > 0) {
                     type(context, { text: '+' + total, style: 'bold 14px "Open Sans"',
-                        x: baseX + 7, y: baseY + 103, color: 'gold', stroke: 'black', strokeWidth: 3 });
+                        x: baseX + 40, y: baseY + 18, color: 'gold', stroke: 'black', strokeWidth: 3 });
+                }
+                
+                if (n >= 2 && window.sailors.hasOwnProperty(unit.number +1)) {
+                    awesome(context, { text: 'f13d', 
+                        x: baseX + 3, y: baseY + 105, color: 'gold', stroke: 'black', strokeWidth: 3 });
                 }
             };
             image.src = Utils.getThumbnailUrl(unit.number + 1);

From ebf035c4e580170c9275959927ff4a77e3a88b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:18:09 +0100
Subject: [PATCH 1492/1569] Added Sailor Icon/Module/Function

---
 damage/js/cruncher.js | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index e41cf27f0..4cf9c4eba 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -109,9 +109,8 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             // hp
             var hp = getStatOfUnit(x,'hp');
             hp += getShipBonus('hp',true,x.unit,n);
-            hp = applyStaticEffectsToHP(n,hp);
-            hp *= getEffectBonus('hp',x.unit);
             hp *= getShipBonus('hp',false,x.unit,n);
+            hp *= getEffectBonus('hp',x.unit);
             hpMax += Math.floor(applyCaptainEffectsToHP(n,hp));
             // rcv
             var rcv = getStatOfUnit(x,'rcv');
@@ -474,12 +473,12 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
 
     var applyCaptainEffectsToHP = function(slotNumber,hp) {
         var params = getParameters(slotNumber);
-        /*for (var i=0;i<enabledEffects.length;++i) {
+        for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('hpStatic')){
                 params["sourceSlot"] = enabledEffects[i].sourceSlot;
                 hp += enabledEffects[i].hpStatic(params);
             }
-        }*/
+        }
         for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('hp')){
                 params["sourceSlot"] = enabledEffects[i].sourceSlot; 
@@ -489,17 +488,6 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         return hp;
     };
 
-    var applyStaticEffectsToHP = function(slotNumber,hp) {
-        var params = getParameters(slotNumber);
-        for (var i=0;i<enabledEffects.length;++i) {
-            if (enabledEffects[i].hasOwnProperty('hpStatic')){
-                params["sourceSlot"] = enabledEffects[i].sourceSlot;
-                hp += enabledEffects[i].hpStatic(params);
-            }
-        }
-        return hp;
-    };
-
     var applyCaptainEffectsAndSpecialsToRCV = function(slotNumber,rcv) {
         var params = getParameters(slotNumber);
         // static rcv

From b0726a57b88b20ff5d4f2ff57062bff64c93c1b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:18:51 +0100
Subject: [PATCH 1493/1569] Sailor CSS

CC moved top center, sailor bottom left
---
 damage/css/main.css | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/damage/css/main.css b/damage/css/main.css
index b9c74d494..d720b3ad2 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -944,8 +944,8 @@ nav > li > div {
 
 .unitCandies {
     position: absolute;
-    bottom: 2px;
-    left: 7px;
+    top: 5px;
+    right: 40px;
     z-index: 4;
     font-weight: bold;
     color: gold;
@@ -954,6 +954,23 @@ nav > li > div {
                  0 0 black, 0 1px black, 1px 0 black, 1px 1px black, 0 -1px black, -1px 0 black, -1px -1px black;
 }
 
+.unitSailor {
+    position: absolute;
+    width: 19px;
+    height: 21px;
+    bottom: -1px;
+    z-index: 4;
+    font-size: 9pt;
+    color: powderblue;
+    border: 2px solid gold;
+    border-left: 1px solid black;
+    border-radius: 4px;
+    background-color: SteelBlue;
+    pointer-events: none;
+    text-shadow: 2px 0 0 #003366, -2px 0 0 #003366, 0 2px 0 #003366, 0 -2px 0 #003366, 1px 1px #003366, -1px -1px 0 #003366, 1px -1px 0 #003366, -1px 1px 0 #003366;
+    box-shadow: inset 0px 0px 1px blue, 0px 0px 1px blue;
+}
+
 .unitAbilities {
     width: 20px;
     height: 20px;
@@ -1160,3 +1177,4 @@ body > .popover .popover-content {
     }
 
 }
+

From 94ee8460db2d704e2225fd7b1befc66e0414b3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 18:19:22 +0100
Subject: [PATCH 1494/1569] Spaaaaaaaaaces

---
 damage/css/main.css | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/damage/css/main.css b/damage/css/main.css
index d720b3ad2..2b81656c1 100644
--- a/damage/css/main.css
+++ b/damage/css/main.css
@@ -1,12 +1,12 @@
 @font-face {
-	font-family: 'icomoon';
-	src:url('../../res/icomoon.eot?xewvs9');
-	src:url('../../res/icomoon.eot?xewvs9#iefix') format('embedded-opentype'),
-		url('../../res/icomoon.ttf?xewvs9') format('truetype'),
-		url('../../res/icomoon.woff?xewvs9') format('woff'),
-		url('../../res/icomoon.svg?xewvs9#icomoon') format('svg');
-	font-weight: normal;
-	font-style: normal;
+    font-family: 'icomoon';
+    src:url('../../res/icomoon.eot?xewvs9');
+    src:url('../../res/icomoon.eot?xewvs9#iefix') format('embedded-opentype'),
+        url('../../res/icomoon.ttf?xewvs9') format('truetype'),
+        url('../../res/icomoon.woff?xewvs9') format('woff'),
+        url('../../res/icomoon.svg?xewvs9#icomoon') format('svg');
+    font-weight: normal;
+    font-style: normal;
 }
 
 /***************

From 140404d76dd0000d7e61b58ab8f8cf1520c5a316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Thu, 2 Nov 2017 19:48:51 +0100
Subject: [PATCH 1495/1569] OPTC-DB up to date

---
 damage/js/cruncher.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 4cf9c4eba..e41cf27f0 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -109,8 +109,9 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             // hp
             var hp = getStatOfUnit(x,'hp');
             hp += getShipBonus('hp',true,x.unit,n);
-            hp *= getShipBonus('hp',false,x.unit,n);
+            hp = applyStaticEffectsToHP(n,hp);
             hp *= getEffectBonus('hp',x.unit);
+            hp *= getShipBonus('hp',false,x.unit,n);
             hpMax += Math.floor(applyCaptainEffectsToHP(n,hp));
             // rcv
             var rcv = getStatOfUnit(x,'rcv');
@@ -473,12 +474,12 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
 
     var applyCaptainEffectsToHP = function(slotNumber,hp) {
         var params = getParameters(slotNumber);
-        for (var i=0;i<enabledEffects.length;++i) {
+        /*for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('hpStatic')){
                 params["sourceSlot"] = enabledEffects[i].sourceSlot;
                 hp += enabledEffects[i].hpStatic(params);
             }
-        }
+        }*/
         for (var i=0;i<enabledEffects.length;++i) {
             if (enabledEffects[i].hasOwnProperty('hp')){
                 params["sourceSlot"] = enabledEffects[i].sourceSlot; 
@@ -488,6 +489,17 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
         return hp;
     };
 
+    var applyStaticEffectsToHP = function(slotNumber,hp) {
+        var params = getParameters(slotNumber);
+        for (var i=0;i<enabledEffects.length;++i) {
+            if (enabledEffects[i].hasOwnProperty('hpStatic')){
+                params["sourceSlot"] = enabledEffects[i].sourceSlot;
+                hp += enabledEffects[i].hpStatic(params);
+            }
+        }
+        return hp;
+    };
+
     var applyCaptainEffectsAndSpecialsToRCV = function(slotNumber,rcv) {
         var params = getParameters(slotNumber);
         // static rcv

From 279481e74f61e3b2c0f0556696ed54a530c68ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 3 Nov 2017 17:58:19 +0100
Subject: [PATCH 1496/1569] Caribou max stats & Garp 4*

Thanks RyanNL from Discord for Caribou stats
---
 common/data/units.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 389100356..5d9fec022 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1829,23 +1829,23 @@ window.units = [
     [ "Full Power Sicilian, Mokomo Dukedom", "INT", [ "Slasher", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1122, 690, 158, 2270, 1421, 328, 1 ],
     [ "Caesar Clown, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 4, 30, 4, 1, 70, 1066998, 61, 181, 65, 890, 780, 182, 1 ],
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 848, 735, 162, 1811, 1404, 324, 1 ],
-    [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, 5, 3, 70, 1066998, 808, 177, 12, 1906, 782, 162, null ],
-    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1602, 740, 138, 4212, 1510, 201, null ],
-    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 202, 76, 41, null, null, null, null ],
-    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 822, 336, 201, 1984, 1312, 432, null ],
-    [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 268, 82, 28, 1346, 647, 110, null ],
-    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1120, 544, 82, 2912, 1421, 241, null ],
-    [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, 5, 3, 50, 392109, 250, 79, 32, 1332, 630, 118, null ],
-    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 98, 2834, 1382, 267, null ],
-    [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 218, 77, 38, 1128, 492, 198, null ],
-    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 982, 403, 152, 2406, 1341, 352, null ],
-    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, null ],
-    [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, null, null, null, null ],
-    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, null ],
-    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, null, null, null, null ],
-    [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, 4, 2, 70, 1015, 494, 0, null, null, null, null, null ],
-    [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, null ],
-    [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, null ],
+    [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, 5, 3, 70, 1066998, 808, 177, 12, 1906, 782, 162, 1 ],
+    [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1602, 740, 138, 4212, 1510, 201, 1 ],
+    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 202, 76, 41, null, null, null, 1 ],
+    [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 822, 336, 201, 1984, 1312, 432, 1 ],
+    [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 268, 82, 28, 1346, 647, 110, 1 ],
+    [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1120, 544, 82, 2912, 1421, 241, 1 ],
+    [ "Vinsmoke Niji", "QCK", [ "Powerhouse", "Fighter" ], 4, 15, 5, 3, 50, 392109, 250, 79, 32, 1332, 630, 118, 1 ],
+    [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 98, 2834, 1382, 267, 1 ],
+    [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 218, 77, 38, 1128, 492, 198, 1 ],
+    [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 982, 403, 152, 2406, 1341, 352, 1 ],
+    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, 1 ],
+    [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, 1598, 1402, -300, 1 ],
+    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, 1 ],
+    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, null, null, null, 1 ],
+    [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1015, 494, 0, 1852, 688, 5, 1 ],
+    [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, 1 ],
+    [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, 1 ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 68d281afcb9f23c92483222a432df7d8f3aa0f2f Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 3 Nov 2017 15:04:58 -0400
Subject: [PATCH 1497/1569] GW and drops

---
 common/data/drops.js |  4 ++--
 common/data/gw.js    | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 9e27f669c..ca42fae12 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1689,7 +1689,7 @@ window.drops = {
         {
             name: 'Caribou Pirates!',
             thumb: 1842,
-            gamewith: null,
+            gamewith: 75879,
             condition: '[STR] orbs will not appear naturally',
             'All Difficulties': [ 1841, 1843, -1268, -639, -645, -1234, -1270, -1700, -1704, -1501, -1502 ]
         },
@@ -2202,7 +2202,7 @@ window.drops = {
         {
             name: 'Invasion! Garp',
             thumb: 1846,
-            gamewith: null,
+            gamewith: 75260,
             condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Garp.',
             'All Difficulties': [ 1845, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
         },
diff --git a/common/data/gw.js b/common/data/gw.js
index 076213256..e9c09d6cc 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1827,8 +1827,8 @@ window.gw=[
     73957,
     74132,
     74132,
-    null,
-    null,
+    75006,
+    75006,
     74384,
     74384,
     74388,
@@ -1839,5 +1839,11 @@ window.gw=[
     74386,
     74385,
     74385,
+    75882,
+    75882,
+    75881,
+    75881,
+    75037,
+    75037,
     11070,
 ];
\ No newline at end of file

From 8c7338cbf236ff7adfc0003b596ee3cb0f1ad6cd Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sat, 4 Nov 2017 11:18:18 -0400
Subject: [PATCH 1498/1569] Judge gets the Akainu treatment

---
 common/data/captains.js | 4 ++--
 common/data/details.js  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 331e67eec..f13d26044 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5726,7 +5726,7 @@ window.captains = {
     1831: {
         atk: function(p) { 
             if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9 : 2.25;
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9375 : 2.25;
             }
             else
                 return 1; 
@@ -5736,7 +5736,7 @@ window.captains = {
     1832: {
         atk: function(p) { 
             if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9 : 2.25;
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9375 : 2.25;
             }
             else
                 return 1; 
diff --git a/common/data/details.js b/common/data/details.js
index eb9f99409..c68100df7 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -7621,13 +7621,13 @@ window.details = {
         specialName: "King Cobra Machetes",
     },
     1313: {//Akainu
-        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
+        captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
     },
     1314: {//Akainu
-        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
+        captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
@@ -12813,12 +12813,12 @@ window.details = {
         limit: "This character has a limit break path",
     },
     1831: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9375x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
         specialName: "Dengi Crack",
     },
     1832: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9375x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
         specialName: "Dengi Crack",
         limit: "This character has a limit break path",

From 4e009e74a3b877b79514b2a0c967027474622ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 20:27:00 +0100
Subject: [PATCH 1499/1569] Treasure Map Akainu & Squard

---
 common/data/units.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 5d9fec022..e452ff60e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1846,10 +1846,10 @@ window.units = [
     [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1015, 494, 0, 1852, 688, 5, 1 ],
     [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, 1 ],
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, 1 ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
+    [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, null, null, null, 2662, 1312, 99, null ],
+    [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
+    [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, null, null, null, 1992, 1098, 282, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From dbe9f6c4c45ff9eceb8059085733d168f377fca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 20:37:46 +0100
Subject: [PATCH 1500/1569]  Treasure Map Akainu & Squard

---
 common/data/captains.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index f13d26044..66f0dcf06 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5846,6 +5846,13 @@ window.captains = {
         },
         hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; },
     },
+    1850: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+    },
+    1851: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+    },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },

From 9265e4976ec253b4bbe3370d384083c033345f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 20:40:32 +0100
Subject: [PATCH 1501/1569]  Treasure Map Akainu & Squard

---
 common/data/cooldowns.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 0ff64dbfe..90a48ce04 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1846,10 +1846,10 @@ window.cooldowns = [
     [ 32, 15 ],
     [ 32, 15 ],
     [ 23, 14 ],
-    null,
-    null,
-    null,
-    null,
+    [ 14, 14 ],
+    [ 14, 14 ],
+    [ 13, 13 ],
+    [ 13, 13 ],
     null,
     null,
     null,

From 66d9666ea02c4f3f0f19bc5a57a5f8c656cc2faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 20:41:17 +0100
Subject: [PATCH 1502/1569]  Treasure Map Akainu & Squard

---
 common/data/details.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index c68100df7..91a69852d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12928,6 +12928,34 @@ window.details = {
         special: "Deals random large INT Damage to all enemies, boost ATK of all characters by 1.5x for 1 turn, changes orbs to matching orbs for chatacters that are 29 cost or lower",
         specialName: "Requiem Shockwave",
     },
+    1848: {//Treasure Map Akainu
+        captain: "Boosts ATK of Powerhouse characters by 2x",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
+        specialName: "Hellhound Bite",
+        sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
+    1849: {//Treasure Map Akainu
+        captain: "Boosts ATK of Powerhouse characters by 2.25x and their HP by 1.3x",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
+        specialName: "Hellhound Bite",
+        sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
+    1850: {//Treasure Map Squard
+        captain: "Boosts ATK of Driven characters by 2x",
+        special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
+        specialName: "Piercing Hatred",
+        sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
+    1851: {//Treasure Map Squard
+        captain: "Boosts ATK of Driven characters by 2.25x and their HP by 1.3x",
+        special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
+        specialName: "Piercing Hatred",
+        sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}",
+    },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",

From 804f0a10bc5d776f55b84641376679cce30d6038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 20:42:28 +0100
Subject: [PATCH 1503/1569]  Treasure Map Akainu & Squard

---
 common/data/specials.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 530ce058c..d72748933 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3800,6 +3800,12 @@ window.specials = {
         atk: function(p) { return 1.5; },
         type: "type"
     },
+    1850: {
+        chainAddition: function(p) {return 0.5;}
+    },
+    1851: {
+        chainAddition: function(p) {return 0.5;}
+    },
     2000: {
         atk: function(p) { return 1.75; },
         type: "class"

From 12e4192b6f5ef4673a7781e30ebda1f7dd994fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 20:47:21 +0100
Subject: [PATCH 1504/1569]  Treasure Map Akainu & Squard

---
 common/data/aliases.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index 34ebdc07d..ca1384d4e 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1848,7 +1848,7 @@ window.aliases = {
     1847: ['', '', ''],
     1848: ['', '', ''],
     1849: ['', '', ''],
-    1850: ['', '', ''],
+    1850: ['', '', 'Akainu'],
     1851: ['', '', ''],
     1852: ['', '', ''],
     1853: ['', '', ''],

From 4c13856fe2c1d29dc45e9bd29ab3ba3f9c0280d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 20:48:46 +0100
Subject: [PATCH 1505/1569]  Treasure Map Akainu & Squard

---
 common/data/aliases.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ca1384d4e..103062229 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1847,8 +1847,8 @@ window.aliases = {
     1846: ['', '', 'Invasion Garp', 'Ambush Garp'],
     1847: ['', '', ''],
     1848: ['', '', ''],
-    1849: ['', '', ''],
-    1850: ['', '', 'Akainu'],
+    1849: ['', '', 'Akainu'],
+    1850: ['', '', ''],
     1851: ['', '', ''],
     1852: ['', '', ''],
     1853: ['', '', ''],

From 8f4d529ca736e56d1b4480c66dd74878d987540f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 21:02:40 +0100
Subject: [PATCH 1506/1569] Treasure Map Akainu & Squard

---
 common/data/effects.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/common/data/effects.js b/common/data/effects.js
index 9f0b43dc5..85424b470 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -498,5 +498,29 @@ window.effects = {
             return !matching ? 1 : 1.25;
         },    
     },
+
+    'Treasure Map [Whitebeard Season]': {
+        description: 'Boost stats of Akainu & Squard 2.5x',
+        thumb: 1853,
+        id: 47, // don't change this
+        atk: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1848 && id < 1851) ||
+                    [  ].indexOf(id) != -1);
+            return !matching ? 1 : 2.5;
+        },
+        hp: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1848 && id < 1851) ||
+                    [ ].indexOf(id) != -1);
+            return !matching ? 1 : 2.5;
+        },
+        rcv: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1848 && id < 1851) ||
+                    [ ].indexOf(id) != -1);
+            return !matching ? 1 : 2.5;
+        },
+    },
     
 };

From 56344423f3373afda307a84d6fc0e9c3dcbd8061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 21:03:46 +0100
Subject: [PATCH 1507/1569] Treasure Map Akainu & Squard

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index e452ff60e..efa7ecf93 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1847,9 +1847,9 @@ window.units = [
     [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, 1 ],
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, 1 ],
     [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
-    [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, null, null, null, 2662, 1312, 99, null ],
+    [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 2662, 1312, 99, null ],
     [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
-    [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, null, null, null, 1992, 1098, 282, null ],
+    [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 2964bee0ebe2f96c12b01c82b45f5165989dc5d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 6 Nov 2017 21:11:53 +0100
Subject: [PATCH 1508/1569] 1851

---
 common/data/effects.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index 85424b470..11825703d 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -506,19 +506,19 @@ window.effects = {
         atk: function(p) {
             var id = p.number + 1,
                 matching = ((id > 1848 && id < 1851) ||
-                    [  ].indexOf(id) != -1);
+                    [ 1851 ].indexOf(id) != -1);
             return !matching ? 1 : 2.5;
         },
         hp: function(p) {
             var id = p.number + 1,
                 matching = ((id > 1848 && id < 1851) ||
-                    [ ].indexOf(id) != -1);
+                    [ 1851 ].indexOf(id) != -1);
             return !matching ? 1 : 2.5;
         },
         rcv: function(p) {
             var id = p.number + 1,
                 matching = ((id > 1848 && id < 1851) ||
-                    [ ].indexOf(id) != -1);
+                    [ 1851 ].indexOf(id) != -1);
             return !matching ? 1 : 2.5;
         },
     },

From dc5e5c63a4462ca790a0ea61053fbfd56ea904cc Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 7 Nov 2017 10:58:59 -0500
Subject: [PATCH 1509/1569] new limit break units

---
 common/data/captains.js |  7 +++++
 common/data/details.js  | 64 +++++++++++++++++++++++++++++------------
 common/data/specials.js |  4 +--
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 66f0dcf06..92ecb01cd 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5846,6 +5846,13 @@ window.captains = {
         },
         hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; },
     },
+    1848: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+    },
+    1849: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; },
+    },
     1850: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
diff --git a/common/data/details.js b/common/data/details.js
index 91a69852d..686e1649e 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -117,7 +117,8 @@ window.details = {
     16: {
         special: "Delays all enemies for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
         specialName: "Fire Bird Star",
-        captain: "Boosts ATK and HP of PSY characters by 1.5x"
+        captain: "Boosts ATK and HP of PSY characters by 1.5x",
+        limit: "This character has a limit break path",
     },
     17: {
         special: "Recovers 10x character's RCV in HP",
@@ -992,7 +993,8 @@ window.details = {
         special: "Deals random STR damage to one enemy",
         specialName: "Rampage",
         specialNotes: "#{random : 2,000 : 200,000}",
-        captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%"
+        captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%",
+        limit: "This character has a limit break path",
     },
     250: {
         special: "Recovers all missing HP",
@@ -1002,7 +1004,8 @@ window.details = {
     251: {
         special: "Recovers all missing HP",
         specialName: "Blue Flame Rebirth",
-        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
+        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn",
+        limit: "This character has a limit break path",
     },
     252: {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
@@ -1012,7 +1015,8 @@ window.details = {
     253: {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
         specialName: "Brilliant Punk",
-        captain: "Boosts ATK and HP of QCK characters by 2x"
+        captain: "Boosts ATK and HP of QCK characters by 2x",
+        limit: "This character has a limit break path",
     },
     254: {
         special: "Deals 5,000 fixed damage to all enemies",
@@ -1267,7 +1271,8 @@ window.details = {
     306: {
         special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
         specialName: "Meteor Fist Shower",
-        captain: "Boosts ATK and HP of PSY characters by 2x"
+        captain: "Boosts ATK and HP of PSY characters by 2x",
+        limit: "This character has a limit break path",
     },
     307: {
         special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
@@ -1325,7 +1330,8 @@ window.details = {
         special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
         specialName: "Aye Aye, Captain!",
         captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
-        sailor: "Reduces Paralysis for 2 turns for himself"
+        sailor: "Reduces Paralysis for 2 turns for himself",
+        limit: "This character has a limit break path",
     },
     317: {
         special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
@@ -2110,8 +2116,8 @@ window.details = {
         special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
         specialName: "Zen Shockwave",
         specialNotes: "#{random : 30,000 : 150,000}",
-        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x as well as himself",
-        captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku characters in the team are included in the bonus."
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less or 54 cost exactly by 3x",
+        captainNotes: "His captain ability also affects his evolved forms, his base form will NOT receive the boost. All evolved and plus evolved Sengoku characters in the team are included in the bonus."
     },
     460: {
         special: "Recovers 33 HP after the end of each turn for 999 turns, delays all enemies for 1 turn",
@@ -3619,7 +3625,8 @@ window.details = {
     748: {
         special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
         specialName: "Rokuougan",
-        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
+        limit: "This character has a limit break path",
     },
     749: {
         special: "Deals random DEX damage to all enemies, randomizes all orbs",
@@ -3633,7 +3640,8 @@ window.details = {
         specialName: "Tempest Kick: Sky Slicer",
         specialNotes: "#{random : 10,000 : 90,000}",
         captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
-        captainNotes: "#{noFixedPerc}"
+        captainNotes: "#{noFixedPerc}",
+        limit: "This character has a limit break path",
     },
     751: {
         special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
@@ -3655,7 +3663,8 @@ window.details = {
         special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{orb : 1.75x}",
         specialName: "Moonlight Ten Finger Pistol",
-        captain: "Boosts ATK of Powerhouse characters by 2.5x"
+        captain: "Boosts ATK of Powerhouse characters by 2.5x",
+        limit: "This character has a limit break path",
     },
     755: {
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
@@ -3665,7 +3674,8 @@ window.details = {
     756: {
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
         specialName: "Tekkai - Rin",
-        captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%"
+        captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%",
+        limit: "This character has a limit break path",
     },
     757: {
         special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
@@ -3685,7 +3695,8 @@ window.details = {
     760: {
         special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
         specialName: "Life Return: Shishi Finger Pistol",
-        captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn"
+        captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn",
+        limit: "This character has a limit break path",
     },
     761: {
         special: "Deals 15x character's ATK in DEX damage to one enemy, boosts ATK of all characters by 1.2x for 1 turn",
@@ -3800,7 +3811,8 @@ window.details = {
         special: "Boosts own ATK by a variable factor for 1 turn",
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 1.5x; between 20% HP and 50% HP, it's 1.75x; below 20% HP, it's 2x.",
         specialName: "Precept Deification",
-        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn"
+        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
+        limit: "This character has a limit break path",
     },
     782: {
         special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
@@ -4724,7 +4736,8 @@ window.details = {
                 "cooldown": [ 31, 17 ]
             }
         ],
-        specialNotes: "#{stages}"
+        specialNotes: "#{stages}",
+        limit: "This character has a limit break path",
     },
     934: {
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
@@ -5186,7 +5199,8 @@ window.details = {
             }
         ],
         specialName: "Decapitation High Heel",
-        specialNotes: "#{stages}"
+        specialNotes: "#{stages}",
+        limit: "This character has a limit break path",
     },
     998: {
         captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turn at the start of the fight",
@@ -5824,7 +5838,8 @@ window.details = {
     1081: {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
-        specialName: "Trueno Bastardo"
+        specialName: "Trueno Bastardo",
+        limit: "This character has a limit break path",
     },
     1082: {
         captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
@@ -7181,6 +7196,7 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         specialName: "Burning Vanguard",
+        limit: "This character has a limit break path",
     },
     1252: {// Coliseum Doma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
@@ -8734,6 +8750,7 @@ window.details = {
         ],
         specialNotes: "#{ignoreBarrier}<br>#{stages}",
         specialName: "Water Bullets",
+        limit: "This character has a limit break path",
     },
     1435: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 2x and HP of Powerhouse characters by 1.2x",
@@ -8748,6 +8765,7 @@ window.details = {
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
         sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
+        limit: "This character has a limit break path",
     },
     1437: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
@@ -8778,6 +8796,7 @@ window.details = {
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
+        limit: "This character has a limit break path",
     },
     1441: {//Zeo
         captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
@@ -8792,6 +8811,7 @@ window.details = {
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
+        limit: "This character has a limit break path",
     },
     1443: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 2.75x following a chain of Good > Great > Perfect hits",
@@ -8804,6 +8824,7 @@ window.details = {
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
         sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
+        limit: "This character has a limit break path",
     },
     1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
@@ -8815,6 +8836,7 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by 2x and RCV of Shooter characters by 1.25x.",
         special: "Deals random PSY damage to all enemies and delays enemies by 3 turns.",
         specialName: "Green Star: Platanus Shuriken",
+        limit: "This character has a limit break path",
     },
     1447: {//Sanji 5+
         captain: "Boosts ATK of Powerhouse characters by 2.5x and reduces damage take by 10%.",
@@ -9704,6 +9726,7 @@ window.details = {
         captain: "Boosts ATK of characters with 40 cost by 2.75x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
         specialName: "Thunder Giant",
+        limit: "This character has a limit break path",
     },
     1554: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2x",
@@ -10515,7 +10538,8 @@ window.details = {
     1663: {//6+ Rob Lucci
         special: "Deals 75x character's ATK in typeless damage to one enemy, greatly boosts chances of getting matching orbs for 3 turns",
         specialName: "Six Powers Supreme: Six King Gun",
-        captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+        captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
+        limit: "This character has a limit break path",
     },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
@@ -12739,6 +12763,7 @@ window.details = {
         ],
         specialNotes:"#{stages}",
         specialName: "More More: Hundredfold Artillery Cannon",
+        limit: "This character has a limit break path",
     },
     1825: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
@@ -12923,8 +12948,9 @@ window.details = {
         special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
         specialName: "Garp Special",
     },
-    1847: {//Goku+
+    1847: {//Sengoku+
         captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, and their HP by 1.2x, boost ATK of characters with cost 54 by 3x",
+        captainNotes: "His captain ability also affects his evolved forms, his base form will NOT receive the boost. All evolved and plus evolved Sengoku characters in the team are included in the bonus.",
         special: "Deals random large INT Damage to all enemies, boost ATK of all characters by 1.5x for 1 turn, changes orbs to matching orbs for chatacters that are 29 cost or lower",
         specialName: "Requiem Shockwave",
     },
diff --git a/common/data/specials.js b/common/data/specials.js
index d72748933..f3d1352d7 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3801,10 +3801,10 @@ window.specials = {
         type: "type"
     },
     1850: {
-        chainAddition: function(p) {return 0.5;}
+        chainAddition: function(p) { return 0.5; }
     },
     1851: {
-        chainAddition: function(p) {return 0.5;}
+        chainAddition: function(p) { return 0.5; }
     },
     2000: {
         atk: function(p) { return 1.75; },

From 94f74898dff7ca6e57cd7bf5d66a13de24bd9cf9 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 7 Nov 2017 21:58:57 -0500
Subject: [PATCH 1510/1569] bugs

---
 common/data/details.js | 4 ++--
 common/data/units.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 686e1649e..715f8bab3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -11348,13 +11348,13 @@ window.details = {
     },
     1732: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2x, boosts HP of Striker and Powerhouse characters by 1.1x",
-        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
         specialName: "Battle Guardian",
     },
     1733: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2.5x, boosts HP of Striker and Powerhouse characters by 1.25x",
-        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
         specialName: "Battle Guardian",
     },
diff --git a/common/data/units.js b/common/data/units.js
index efa7ecf93..24b6b3a3e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1819,8 +1819,8 @@ window.units = [
     [ "Riku Doldo III", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 612, 354, 189, 2066, 992, 275, 1 ],
     [ "Tank Lepanto", "DEX", [ "Powerhouse", "Striker" ], 3, 15, 5, 1, 70, 1066998, 199, 112, 8, 1674, 1011, 24, 1 ],
     [ "Scarlet", "PSY", [ "Free Spirit", "Fighter" ], 4, 20, 5, 3, 99, 3000000, 741, 128, 252, 1920, 630, 420, 1 ],
-    [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 392109, 184, 106, 50, 830, 475, 301, 1 ],
-    [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 4000000, 815, 450, 297, 1602, 1231, 550, 1 ],
+    [ "Sanji, Stage Costume Pirate", "STR", [ "Fighter", "Powerhouse" ], 4, 13, 7, 3, 50, 261406, 184, 106, 50, 830, 475, 301, 1 ],
+    [ "Sanji, Mr. Prince's Stage Costume", "STR", [ "Fighter", "Powerhouse" ], 5, 20, 4, 4, 99, 2000000, 815, 450, 297, 1602, 1231, 550, 1 ],
     [ "Byrnndi World, Wielder of the More-More Fruit", "STR", [ "Shooter", "Driven" ], 4, 20, 4, 3, 70, 1066998, 162, 135, 33, 1332, 742, 157, 1 ],
     [ "Byrnndi World, World Destroyer", "STR", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1185, 688, 122, 2462, 1408, 319, 1 ],
     [ "Akainu [Neo]", "INT", [ "Driven", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 284, 217, 0, 1612, 819, 49, 1 ],

From f584c2c6c8c44f2a9a0b002fb07bf786afa08f20 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Wed, 8 Nov 2017 01:13:38 -0500
Subject: [PATCH 1511/1569] He's still at 2000 and 2001
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’ll change him when I feel like it. i.e. when he’s added to JPN or JPN
gets to 2000.
---
 common/data/units.js | 6 +++---
 common/js/utils.js   | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 24b6b3a3e..7b63eafa8 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1842,7 +1842,7 @@ window.units = [
     [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, 1 ],
     [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, 1598, 1402, -300, 1 ],
     [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, 1 ],
-    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, null, null, null, 1 ],
+    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, 1806, 879, 356, 1 ],
     [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1015, 494, 0, 1852, 688, 5, 1 ],
     [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, 1 ],
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, 1 ],
@@ -1998,8 +1998,8 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Silvers Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, 1258, 714, 194, null ],
-    [ "Dark King Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, null ],
+    [ "Silvers Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, 1258, 714, 194, 1 ],
+    [ "Dark King Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, 1 ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
diff --git a/common/js/utils.js b/common/js/utils.js
index 569fbee09..c56d0505c 100644
--- a/common/js/utils.js
+++ b/common/js/utils.js
@@ -153,6 +153,10 @@
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
         if (id == '0742')
             return 'https://onepiece-treasurecruise.com/wp-content/uploads/f0742-2.png';
+        if (id == '2000')
+            return 'http://onepiece-treasurecruise.com/en/wp-content/uploads/sites/2/f5009.png';
+        if (id == '2001')
+            return 'http://onepiece-treasurecruise.com/en/wp-content/uploads/sites/2/f5010.png';
         return 'https://onepiece-treasurecruise.com/wp-content/uploads/f' + id + '.png';
     };
 
@@ -204,6 +208,10 @@
         if (window.units[n - 1].incomplete)
             return 'https://onepiece-treasurecruise.com/wp-content/themes/onepiece-treasurecruise/images/noimage.png';
         var id = ('0000' + n).slice(-4).replace(/(057[54])/, '0$1'); // missing aokiji image
+        if (id == '2000')
+            return 'http://onepiece-treasurecruise.com/en/wp-content/uploads/sites/2/c5009.png';
+        if (id == '2001')
+            return 'http://onepiece-treasurecruise.com/en/wp-content/uploads/sites/2/c5010.png';
         return 'https://onepiece-treasurecruise.com/wp-content/uploads/c' + id + '.png';
     };
 

From 114f18c60524c3a8b024651633c143f20d400a63 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 8 Nov 2017 12:22:37 -0500
Subject: [PATCH 1512/1569] WB

---
 common/data/captains.js |  6 ++++++
 common/data/details.js  | 11 +++++++++++
 common/data/units.js    |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 92ecb01cd..487679a9e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5860,6 +5860,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
     },
+    1853: {
+        atk: function(p) {
+            return (1 + 1.25 * ((100 - p.percHP) / 100));
+        },
+        hp: function(p) { return 1.2; },
+    },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },
diff --git a/common/data/details.js b/common/data/details.js
index 715f8bab3..e860e8c61 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12982,6 +12982,17 @@ window.details = {
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
+    1852: {//Whitebeard
+        captain: "Not Translated",
+        special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
+        specialName: "Whitebeard Special",
+    },
+    1853: {//Whitebeard
+        captain: "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
+        captainNotes: "#{captainProportional : lower : 1 + 1.25 * (1 - (remaining HP) / (total HP)) : 1 : 2.25}",
+        special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
+        specialName: "Whitebeard Special",
+    },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
diff --git a/common/data/units.js b/common/data/units.js
index 7b63eafa8..4cb3d8ab7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1850,8 +1850,8 @@ window.units = [
     [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 2662, 1312, 99, null ],
     [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
     [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, null, null, 50, 130703, null, null, null, null, null, null, null ],
+    [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, null, 99, 5000000, null, null, null, 3564, 1595, 283, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b2ee343f2ad757feb4fae9f4a7c1f71881ddbf5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 10 Nov 2017 18:24:19 +0100
Subject: [PATCH 1513/1569] Download data

Placeholders for new FN [Apoo and X-Drake]
New RR Limited Leo [Missing 4* info and LVL1 stats]
---
 common/data/units.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 4cb3d8ab7..a80499c0e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1852,12 +1852,12 @@ window.units = [
     [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
     [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, null, null, 50, 130703, null, null, null, null, null, null, null ],
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, null, 99, 5000000, null, null, null, 3564, 1595, 283, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "X-Drake FN", "PSY", [ "Powerhouse", "Cerebral" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "X-Drake FN Evolved", "PSY", [ "Powerhouse", "Cerebral" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Scratchmen Apoo FN", "STR", [ "Free Spirit", "Shooter" ], 3, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Scratchmen Apoo FN Evolved", "STR", [ "Free Spirit", "Slasher" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Limited RR Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Limited RR Leo Evolved", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 062c99858d6d01530b32826047096f7555436674 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 10 Nov 2017 18:26:34 +0100
Subject: [PATCH 1514/1569]  Download data

---
 common/data/ships.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 04728bb0c..dcf76ee9b 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -431,7 +431,7 @@ window.ships = [
     
     { //33
         name: "Revolutionary Black Crow",
-        thumb: null,
+        thumb: 'ship_0034_c.png',
         description: 'Boosts HP by 1.2x and reduces special cooldown of all characters by 1 at the start of the adventure. Boosts ATK of [STR], [DEX] and [QCK] characters by 1.55x if you have a [STR], [DEX] and [QCK] character on your crew.',
         atk: function(p) { 
             return (p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) ? [ 1.2, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.5, 1.55 ][p.boatLevel - 1] : 1;
@@ -440,5 +440,19 @@ window.ships = [
             return [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
         }
     },
+    
+    
+    
+    { //34
+        name: "Zunisha", //Levels are placeholders, specific boost of each one is unkown 
+        thumb: null,
+        description: 'Boost ATK of Powerhouse and Cerebral units by 1.55x and their HP by 1.25x, makes Perfects easier to hit, and makes TND and Meat orbs beneficial to Powerhouse and Cerebral units.',
+        atk: function(p) {
+            return !(p.unit.class.has('Powerhouse') || p.unit.class.has('Cerebral')) ? 1 : [ 1.55, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55, 1.55 ][p.boatLevel - 1];
+        },
+        hp: function(p) {
+            return !(p.unit.class.has('Powerhouse') || p.unit.class.has('Cerebral')) ? 1 : [ 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25 ][p.boatLevel - 1];
+        },
+    },
 
 ];

From 7aaa7c1af02e9de3bac4d25b29562b83bc7c8dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 10 Nov 2017 18:27:35 +0100
Subject: [PATCH 1515/1569]  Download data

---
 common/data/details.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index e860e8c61..257b4ac3a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -12993,6 +12993,15 @@ window.details = {
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special",
     },
+    1857: {//Apoo FN
+        captain: "Boosts ATK of Free Spirit characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect in a row and by 3x after the 5th Perfect in a row",
+        special: "For 1 turn boost orbs and ATK by 1.5x for Free Spirit Characters",
+    },
+    1859: {//Limited RR Leo
+        captain: "Boosts ATK of Striker Characters by 2.5x, HP 1.2x, boost ATK by an additional 1.3x after hitting 3 consecutive PERFECT (effectively becoming 3.25x)",
+        special: "Reduce 3 turns of paralysis, randomize non-matching orbs (including BLOCK orbs), adds 65x character's ATK as additional typeless damage on top of the tap timing bonus for 1 turns, when the captain is a Striker Character reduces enemies Percent Damage Reduction (damage threshold cut excluded) duration by 3 turns",
+        sailor: "If he has a INT orb and you hit a Perfect with him, keep his INT orb for the next turn",
+    },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",

From f1be9af8ccace095f92b2e6ba0a073e1635e01a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 10 Nov 2017 18:30:06 +0100
Subject: [PATCH 1516/1569]  Download data

WB's CD (LB tho)
---
 common/data/cooldowns.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 90a48ce04..d16f67ef2 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1850,14 +1850,14 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 13, 13 ],
     [ 13, 13 ],
+    [ 37, 15 ],
+    [ 37, 15 ],
+    20,
+    20,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
+    [ 18, 14 ],
+    [ 18, 14 ],
     null,
     null,
     null,

From 46ffa137bb1cf64fddabdbae6be14fbb892f01ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 10 Nov 2017 18:30:47 +0100
Subject: [PATCH 1517/1569]  Download data

---
 common/data/captains.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index 487679a9e..0670e6223 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5866,6 +5866,14 @@ window.captains = {
         },
         hp: function(p) { return 1.2; },
     },
+    1859: {
+        hitAtk: function(p) {
+            if (!(p.unit.class.has("Striker"))) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },

From 0dec5b367f425541fb17d3d80104a2ce6ca91128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Fri, 10 Nov 2017 18:33:54 +0100
Subject: [PATCH 1518/1569]  Download data

---
 common/data/specials.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index f3d1352d7..1dd7c7465 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3806,6 +3806,9 @@ window.specials = {
     1851: {
         chainAddition: function(p) { return 0.5; }
     },
+    1859: {
+        staticMult: function(p) { return 65; }
+    },
     2000: {
         atk: function(p) { return 1.75; },
         type: "class"

From 03c95170babebd6e58d809a1bfa3cd28801348ad Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Fri, 10 Nov 2017 14:49:26 -0500
Subject: [PATCH 1519/1569] Ship image

---
 common/data/ships.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index dcf76ee9b..39e26223c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -431,7 +431,7 @@ window.ships = [
     
     { //33
         name: "Revolutionary Black Crow",
-        thumb: 'ship_0034_c.png',
+        thumb: 'ship_0035_c.png',
         description: 'Boosts HP by 1.2x and reduces special cooldown of all characters by 1 at the start of the adventure. Boosts ATK of [STR], [DEX] and [QCK] characters by 1.55x if you have a [STR], [DEX] and [QCK] character on your crew.',
         atk: function(p) { 
             return (p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) ? [ 1.2, 1.2, 1.25, 1.3, 1.35, 1.4, 1.45, 1.5, 1.5, 1.55 ][p.boatLevel - 1] : 1;

From 3c2360c855536668ae90669b41657377dd385017 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 12 Nov 2017 01:20:55 -0500
Subject: [PATCH 1520/1569] Big update

I fixed some wordings and other stuff, nothing major
---
 characters/css/index.css      |  27 +-
 characters/js/controllers.js  |   2 +-
 characters/js/directives.js   |   6 +-
 characters/views/details.html |  22 +-
 common/data/aliases.js        |  16 +-
 common/data/cooldowns.js      |   8 +-
 common/data/details.js        | 911 ++++++++++++++++++++++++++++++++--
 common/data/drops.js          |  27 +-
 common/data/flags.js          |  58 ++-
 common/data/gw.js             |   4 +
 common/data/matchers.js       |   8 +-
 common/data/specials.js       |  19 +
 common/data/units.js          |  14 +-
 13 files changed, 1045 insertions(+), 77 deletions(-)

diff --git a/characters/css/index.css b/characters/css/index.css
index 5391c6611..7397aad68 100644
--- a/characters/css/index.css
+++ b/characters/css/index.css
@@ -152,12 +152,37 @@ input[type="text"] {
     margin-right: 5px;
 }
 
-.badge-japan + div, .badge-global + div {
+.badge-base {
+    float: left;
+    position: relative;
+    top: 2px;
+    width: 125px;
+    text-align: center;
+    margin-right: 5px;
+}
+
+.badge-level1, .badge-level2, .badge-level3, .badge-level4, .badge-level5, .badge-level6 {
+    float: left;
+    position: relative;
+    top: 2px;
+    width: 200px;
+    text-align: center;
+    margin-right: 5px;
+}
+
+.badge-japan + div, .badge-global + div, .badge-base + div, .badge-level1 + div, .badge-level2 + div, .badge-level3 + div, .badge-level4 + div, .badge-level5 + div, .badge-level6 + div {
     margin-bottom: 2px;
 }
 
 .badge-japan { background: mediumvioletred; }
 .badge-global { background: rebeccapurple; }
+.badge-base { background: darkred; }
+.badge-level1 { background: crimson; }
+.badge-level2 { background: crimson; }
+.badge-level3 { background: crimson; }
+.badge-level4 { background: crimson; }
+.badge-level5 { background: crimson; }
+.badge-level6 { background: crimson; }
 
 .stars:before, .stars:after {
     font-weight: bold;
diff --git a/characters/js/controllers.js b/characters/js/controllers.js
index c7c9015b3..4d66c3c98 100644
--- a/characters/js/controllers.js
+++ b/characters/js/controllers.js
@@ -192,7 +192,7 @@ app.controller('DetailsCtrl',function($scope, $rootScope, $state, $stateParams,
         $('#compare').prop('disabled', false);
     };
     $scope.getPrevious = function() { return $stateParams.previous.concat($scope.id); };
-    $scope.isCaptainHybrid = ($scope.details && $scope.details.captain && $scope.details.captain.global);
+    $scope.isCaptainHybrid = ($scope.details && $scope.details.captain && ($scope.details.captain.global || $scope.details.captain.base));
     $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);
diff --git a/characters/js/directives.js b/characters/js/directives.js
index 5418baa65..8ffb675e4 100644
--- a/characters/js/directives.js
+++ b/characters/js/directives.js
@@ -462,16 +462,16 @@ directives.addLinks = function($stateParams) {
             var incomplete = units[id - 1].incomplete;
             var ul = $('<ul></ul>');
             if (!incomplete && window.flags[id] && window.flags[id].global) {
-                var link = 'http://onepiece-treasurecruise.com/en/' + (id == '5' ? 'roronoa-zoro' : 'c-' + id);
+                var link = 'http://onepiece-treasurecruise.com/en/' + (id == '5' ? 'roronoa-zoro' : id == 1254 ? 'maelstrom-spider-squard-whitebeard-pirates-family' : 'c-' + id);
                 ul.append($('<li><a href="' + link + '" target="_blank">Official Guide (English)</a></li>'));
             }
             if (!incomplete) {
                 if (id == 1478){
-                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/blog/カリブー-カリブー海賊団船長/" target="_blank">' +
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/カリブー-カリブー海賊団船長/" target="_blank">' +
                         'Official Guide (Japanese)</a></li>'));
                 }
                 else{
-                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/blog/c-' + id + '" target="_blank">' +
+                    ul.append($('<li><a href="http://onepiece-treasurecruise.com/c-' + id + '" target="_blank">' +
                         'Official Guide (Japanese)</a></li>'));
                 }
             }
diff --git a/characters/views/details.html b/characters/views/details.html
index 32d892cd5..a2f201791 100644
--- a/characters/views/details.html
+++ b/characters/views/details.html
@@ -149,10 +149,24 @@ <h3 class="page-header" ng-hide="hidden.abilities">Abilities</h3>
                                         <div ng-if="!isCaptainHybrid" ng-bind-html="details.captain | decorate"></div>
                                         <!-- different captain abilities -->
                                         <div ng-if="isCaptainHybrid">
-                                            <span class="badge badge-japan">Japan</span>
-                                            <div ng-bind-html="details.captain.japan | decorate"></div>
-                                            <span class="badge badge-global">Global</span>
-                                            <div ng-bind-html="details.captain.global | decorate"></div>
+                                            <span class="badge badge-japan" ng-show="details.captain.japan">Japan</span>
+                                            <div  ng-show="details.captain.japan" ng-bind-html="details.limit.japan | decorate"></div>
+                                            <span class="badge badge-global" ng-show="details.captain.global">Global</span>
+                                            <div  ng-show="details.captain.global" ng-bind-html="details.limit.global | decorate"></div>
+                                            <span class="badge badge-base" ng-show="details.captain.base">Base Captain Ability</span>
+                                            <div ng-show="details.captain.base" ng-bind-html="details.captain.base | decorate"></div>
+                                            <span class="badge badge-level1" ng-show="details.captain.level1">Limit Break Level 1 Captain Ability</span>
+                                            <div ng-show="details.captain.level1" ng-bind-html="details.captain.level1 | decorate"></div>
+                                            <span class="badge badge-level2" ng-show="details.captain.level2">Limit Break Level 2 Captain Ability</span>
+                                            <div ng-show="details.captain.level2" ng-bind-html="details.captain.level2 | decorate"></div>
+                                            <span class="badge badge-level3" ng-show="details.captain.level3">Limit Break Level 3 Captain Ability</span>
+                                            <div ng-show="details.captain.level3" ng-bind-html="details.captain.level3 | decorate"></div>
+                                            <span class="badge badge-level4" ng-show="details.captain.level4">Limit Break Level 4 Captain Ability</span>
+                                            <div ng-show="details.captain.level4" ng-bind-html="details.captain.level4 | decorate"></div>
+                                            <span class="badge badge-level5" ng-show="details.captain.level5">Limit Break Level 5 Captain Ability</span>
+                                            <div ng-show="details.captain.level5" ng-bind-html="details.captain.level5 | decorate"></div>
+                                            <span class="badge badge-level6" ng-show="details.captain.level6">Limit Break Level 6 Captain Ability</span>
+                                            <div ng-show="details.captain.level6" ng-bind-html="details.captain.level6 | decorate"></div>
                                         </div>
                                         <span class="notes" ng-if="details.captainNotes" ng-bind-html="details.captainNotes | notes | decorate"></span>
                                     </td>
diff --git a/common/data/aliases.js b/common/data/aliases.js
index 103062229..ca720ecad 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1252,7 +1252,7 @@ window.aliases = {
     1251: ['マルコ　復活の炎 白ひげ海賊団','','Coliseum Marco'],
     1252: ['遊騎士ドーマ 白ひげ海賊団傘下','','Coliseum Doma'],
     1253: ['スカイライダー・シュラ','','Coliseum Shura'],
-    1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','',''],
+    1254: ['大渦蜘蛛スクアード 白ひげ海賊団傘下','','Squardo'],
     1255: ['絆のディカルバン兄弟 白ひげ海賊団傘下','',''],
     1256: ['“氷の魔女”ホワイティベイ 白ひげ海賊団傘下','',''],
     1257: ['エドワード・ニューゲート 海賊王のライバル','', 'Edward Newgate', 'Young Whitebeard', 'YWB'],
@@ -1409,8 +1409,8 @@ window.aliases = {
     1408: ['ニコ・ロビン 新生・麦わらの一味', '', 'New World Robin',, 'Timeskip Robin', 'TS Robin'],
     1409: ['ブルック 集結の麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
     1410: ['ブルック 新生・麦わらの一味', '', 'New World Brook', 'Timeskip Brook', 'TS Brook'],
-    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
-    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper'],
+    1411: ['トニートニー・チョッパー　脚力強化 集結の麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper', 'Monster Chopper'],
+    1412: ['トニートニー・チョッパー　怪物強化 新生・麦わらの一味', '', 'New World Chopper', 'Timeskip Chopper', 'TS Chopper', 'Monster Chopper'],
     1413: ['白ひげ 四皇', '', 'Mega Whitebeard', 'Mega WB', 'Edward Newgate', 'Super Whitebeard', 'Super WB', 'Yonko', 'Legend Whitebeard', 'Legend WB'],
     1414: ['サンジ 料理を作って一服中', '', 'Naked Sanji'],
     1415: ['センゴク 智将', '', ''],
@@ -1846,12 +1846,12 @@ window.aliases = {
     1845: ['', '', 'Invasion Garp', 'Ambush Garp'],
     1846: ['', '', 'Invasion Garp', 'Ambush Garp'],
     1847: ['', '', ''],
-    1848: ['', '', ''],
+    1848: ['', '', 'Sakazuki'],
     1849: ['', '', 'Akainu'],
-    1850: ['', '', ''],
-    1851: ['', '', ''],
-    1852: ['', '', ''],
-    1853: ['', '', ''],
+    1850: ['', '', 'Squardo'],
+    1851: ['', '', 'Squardo'],
+    1852: ['', '', 'Adventure Whitebeard'],
+    1853: ['', '', 'Adventure Whitebeard'],
     1854: ['', '', ''],
     1855: ['', '', ''],
     1856: ['', '', ''],
diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index d16f67ef2..6a2e44b7c 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1852,10 +1852,10 @@ window.cooldowns = [
     [ 13, 13 ],
     [ 37, 15 ],
     [ 37, 15 ],
-    20,
-    20,
-    null,
-    null,
+    [ 20, 13 ],
+    [ 20, 13 ],
+    [ null, 7 ],
+    [ null, 7 ],
     [ 18, 14 ],
     [ 18, 14 ],
     null,
diff --git a/common/data/details.js b/common/data/details.js
index 257b4ac3a..927993e8b 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -77,7 +77,45 @@ window.details = {
         special: "Deals 15x character's ATK in DEX damage to all enemies",
         specialName: "Ashura Ichibugin",
         captain: "Boosts ATK and HP of DEX characters by 2x",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 1 turn when it is rewinded" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+        ],
+        potential: [
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            },
+        ]
     },
     9: {
         special: "Recovers 1,000 HP",
@@ -825,7 +863,45 @@ window.details = {
         special: "Changes [PSY] orbs into [INT] orbs",
         specialName: "Happiness Punch",
         captain: "Boosts ATK of INT characters by 2.5x",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of [INT] characters by 2.5x and their RCV by 1.2x" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of [INT] characters by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Aquire Sailor Ability 2: Makes [TND] orbs \"beneficial\" for [INT] characters" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            },
+        ]
     },
     222: {
         special: "Boosts ATK of PSY characters by 1.5x for 1 turn",
@@ -1089,7 +1165,45 @@ window.details = {
         special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
         specialName: "Pocket Mallet",
         captain: "Boosts ATK and RCV of STR characters by 2x",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [PSY] orbs \"beneficial\" for this unit" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [DEX] Damage Reduction" },
+        ],
+        potential: [
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+        ]
     },
     260: {
         special: "Cuts the current HP of each enemy by 30%",
@@ -1100,7 +1214,70 @@ window.details = {
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Seaquake",
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 5" },
+            { "description": "Boosts base HP by 5" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker and Powerhouse characters by 60" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 15" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Potential 3: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
+                    "Level 2: Reduce damage taken from [DEX] characters by 3%",
+                    "Level 3: Reduce damage taken from [DEX] characters by 4%",
+                    "Level 4: Reduce damage taken from [DEX] characters by 5%",
+                    "Level 5: Reduce damage taken from [DEX] characters by 7%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 25",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            },
+        ]
     },
     262: {
         captain: "Recovers 2x character's RCV in HP at the end of each turn"
@@ -1318,7 +1495,45 @@ window.details = {
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
         specialName: "Karmic Punishment",
         captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all Striker characters proportionally to the crew's current HP and their HP by 1.5x" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 30" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            },
+        ]
     },
     315: {
         special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
@@ -1510,16 +1725,52 @@ window.details = {
     },
     356: {
         special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
-        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
         specialName: "Steel Magnetic Arm",
         captain: "Boosts ATK of Striker characters by 2x"
     },
     357: {
         special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
-        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
         specialName: "Steel Magnetic Arm",
         captain: "Boosts ATK of Striker characters by 2.5x",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Striker characters by 2.5x and reduces damage received by 7%" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker characters by 75" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base RCV by 50" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            },
+        ]
     },
     358: {
         special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
@@ -2759,7 +3010,45 @@ window.details = {
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
         specialName: "Ice Block - Pheasant Beak",
         captain: "Boosts ATK and HP of Striker characters by 2x",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: Slot Bind Self-reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 50" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            },
+        ]
     },
     576: {
         special: "Changes [PSY] orbs into [INT] orbs, boosts RCV of all characters by 1.5x for 1 turn",
@@ -3078,7 +3367,45 @@ window.details = {
         specialName: "Raging Greatsword",
         captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Recovers 2 turns of Paralysis on self",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 35" },
+            { "description": "Aquire Potential 1: [STR] Damage Reduction" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 1: Reduces Blindness duration by 2 turns" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base RCV by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [INT] Damage Reduction" },
+        ],
+        potential: [
+            {
+                "Name": "[STR] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [STR] characters by 1%",
+                    "Level 2: Reduce damage taken from [STR] characters by ?%",
+                    "Level 3: Reduce damage taken from [STR] characters by ?%",
+                    "Level 4: Reduce damage taken from [STR] characters by ?%",
+                    "Level 5: Reduce damage taken from [STR] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+        ]
     },
     644: {
         special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
@@ -4111,7 +4438,45 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2.5x",
         specialName: "Demon Bamboo",
         special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Potential 1: [PSY] Damage Reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Striker characters by 2.5x and reduces damage received by 7%" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Sailor Ability 1: If Vergo has a [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            },
+        ]
     },
     841: {
         captain: "Recovers 3x character's RCV in HP at the end of each turn, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
@@ -5211,7 +5576,45 @@ window.details = {
         captain: "Boosts ATK of Driven characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [DEX] Damage Reduction" },
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+        ]
     },
     1000: {
         captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
@@ -5490,7 +5893,70 @@ window.details = {
         special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
         specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
         specialName: "Bari Bari No Pistol",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of STR characters by 60" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 55" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: Completely resists Paralysis on this character" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Aquire Potential 3: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by ? turn",
+                    "Level 2: Reduces No Healing duration by ? turn",
+                    "Level 3: Reduces No Healing duration by ? turn",
+                    "Level 4: Reduces No Healing duration by ? turns",
+                    "Level 5: Reduces No Healing duration by ? turns"
+                ]
+            },
+        ]
     },
     1036: {
         captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
@@ -5828,7 +6294,45 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         specialName: "Chiyupopo",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Reduces Paralysis for 1 turn for herself" },
+            { "description": "Boosts base HP by 55" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Aquire Sailor Ability 2: Reduces Silence duration against this unit by 2 turns" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by ? turn",
+                    "Level 3: Reduces No Healing duration by ? turns",
+                    "Level 4: Reduces No Healing duration by ? turns",
+                    "Level 5: Reduces No Healing duration by ? turns"
+                ]
+            },
+        ]
     },
     1080: {
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
@@ -7975,7 +8479,45 @@ window.details = {
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
         special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
+                ]
+            },
+        ]
     },
     1339: {//Chopper Jump Point
         captain: "Boosts ATK of [DEX] characters by 2.25x",
@@ -8379,7 +8921,45 @@ window.details = {
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 10%. Reduces special cooldown of [DEX] specials by 1 turn.",
         specialName: "Ittoriyu: Unfortunate Port Bird",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 1 turn when it is rewinded" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+        ],
+        potential: [
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            },
+        ]
     },
     1389: {//Nami 5+
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x.",
@@ -8619,7 +9199,70 @@ window.details = {
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
         special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs including [BLOCK] orbs.",
         specialName: "Emperor's Pride",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 5" },
+            { "description": "Boosts base HP by 5" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker and Powerhouse characters by 60" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 15" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Potential 3: Enrage" },
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
+                    "Level 2: Reduce damage taken from [DEX] characters by 3%",
+                    "Level 3: Reduce damage taken from [DEX] characters by 4%",
+                    "Level 4: Reduce damage taken from [DEX] characters by 5%",
+                    "Level 5: Reduce damage taken from [DEX] characters by 7%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 25",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            },
+        ]
     },
     1414: {//Shop Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
@@ -9944,7 +10587,45 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
         specialName: "Admiral Hug",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [TND] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            },
+        ]
     },
     1585: {//Coliseum Helmeppo
         captain: "Boosts ATK and RCV of Slasher and Driven characters by 1.5x",
@@ -10141,7 +10822,45 @@ window.details = {
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 1: Reduces Silence duration against this character by 3 turns" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            },
+        ]
     },
     1617: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
@@ -10453,7 +11172,70 @@ window.details = {
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
         special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
         specialName: "Daybreak Ruler's Spear",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [STR] Damage Reduction" },
+            { "description": "Boosts base HP by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 25" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 70" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base HP by 55" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Boosts base ATK by 55" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+        ],
+        potential: [
+            {
+                "Name": "[STR] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [STR] characters by ?%",
+                    "Level 2: Reduce damage taken from [STR] characters by ?%",
+                    "Level 3: Reduce damage taken from [STR] characters by ?%",
+                    "Level 4: Reduce damage taken from [STR] characters by ?%",
+                    "Level 5: Reduce damage taken from [STR] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by ? turn on this character",
+                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
+                ]
+            },
+        ]
     },
     1653: {//Pedro
         captain: "Boosts ATK of [INT] characters by 2x",
@@ -10809,7 +11591,45 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
         specialName: "The Darkest Demon",
-        limit: "This character has a limit break path",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 25" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [QCK] Damage Reduction" },
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 1%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by 1%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            },
+        ]
     },
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
@@ -12522,7 +13342,15 @@ window.details = {
         specialName: "Black Blade • The Ultimate Sword",
     },
     1808: {//Mihawk
-        captain: "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
+        captain: {
+            "base": "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
+            "level1": "Boosts ATK of Slasher characters by 1.35x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.8225x instead for 1 turn.",
+            "level2": "Boosts ATK of Slasher characters by 1.6x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.16x instead for 1 turn.",
+            "level3": "Boosts ATK of Slasher characters by 1.8x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.43x instead for 1 turn.",
+            "level4": "Boosts ATK of Slasher characters by 2x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
+            "level5": "Boosts ATK of Slasher characters by 2x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
+            "level6": "Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn.",
+        },
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
         limit: [
@@ -12922,11 +13750,13 @@ window.details = {
         captain: "Boosts ATK of Driven characters by 1.5x, deals 2x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
         specialName: "Fathomless Infinite Hell",
+        sailor: "When any other character uses a special, reduces own cooldown by 5 turn",
     },
     1842: {//Caribou
         captain: "Boosts ATK of Driven characters by 1.5x, deals 4x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
         specialName: "Fathomless Infinite Hell",
+        sailor: "When any other character uses a special, reduces own cooldown by 5 turn",        
     },
     1843: {//Coribou
         captain: "Boosts ATK of Driven and Striker characters by 1.5x",
@@ -12956,14 +13786,14 @@ window.details = {
     },
     1848: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2x",
-        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
     },
     1849: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2.25x and their HP by 1.3x",
-        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
@@ -12993,14 +13823,35 @@ window.details = {
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special",
     },
-    1857: {//Apoo FN
+    1854: {//Apoo
+        captain: "Boosts ATK of Free Spirit characters by 2x",
+        special: "Amplifies the effect of orbs for Free Spirit characters by 1.5x and boosts ATK of Free Spirit characters by 1.5x for 1 turn",
+        specialName: "Fighting Musical Performance",
+    },
+    1855: {//Apoo
         captain: "Boosts ATK of Free Spirit characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect in a row and by 3x after the 5th Perfect in a row",
-        special: "For 1 turn boost orbs and ATK by 1.5x for Free Spirit Characters",
+        special: "Amplifies the effect of orbs for Free Spirit characters by 1.5x and boosts ATK of Free Spirit characters by 1.5x for 1 turn",
+        specialName: "Fighting Musical Performance",
     },
-    1859: {//Limited RR Leo
-        captain: "Boosts ATK of Striker Characters by 2.5x, HP 1.2x, boost ATK by an additional 1.3x after hitting 3 consecutive PERFECT (effectively becoming 3.25x)",
-        special: "Reduce 3 turns of paralysis, randomize non-matching orbs (including BLOCK orbs), adds 65x character's ATK as additional typeless damage on top of the tap timing bonus for 1 turns, when the captain is a Striker Character reduces enemies Percent Damage Reduction (damage threshold cut excluded) duration by 3 turns",
-        sailor: "If he has a INT orb and you hit a Perfect with him, keep his INT orb for the next turn",
+    1856: {//X Drake
+        captain: "Boosts ATK of Powerhouse characters by 2x",
+        special: "Cuts the current HP of each enemy by 7%. Boosts the Color Affinity of Powerhouse characters by 1.25x",
+        specialName: "Intervening A Fierce Battle",
+    },
+    1857: {//X Drake
+        captain: "Boosts ATK of Powerhouse characters by 2.5 and recovers 200 HP at end of each turnx",
+        special: "Cuts the current HP of each enemy by 7%. Boosts the Color Affinity of Powerhouse characters by 1.25x",
+        specialName: "Intervening A Fierce Battle",
+    },
+    1858: {//Leo
+        captain: "Boosts ATK of Striker characters by 2x at the start of the chain. Boosts ATK of Striker characters by 2.4x after scoring 3 Perfects in a row.",
+        special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns",
+        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
+    },
+    1859: {//Leo
+        captain: "Boosts ATK of Striker characters by 2.5x and their HP by 1.2x at the start of the chain. Boosts ATK of Striker characters by 3.25x after scoring 3 Perfects in a row.",
+        special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns",
+        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
     },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
diff --git a/common/data/drops.js b/common/data/drops.js
index ca42fae12..6ebf5deb1 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -666,6 +666,7 @@ window.drops = {
             name: 'King Neptune\'s Execution Site - Noah\'s Ark',
             shortName: 'Fishman Island 2',
             thumb: 1562,
+            global: true,
             completion: '5x Rainbow Gems',
             gamewith: 54695,
             '01': [  ],
@@ -688,6 +689,7 @@ window.drops = {
             name: 'Punk Hazard Burning Lands - Laboratory',
             shortName: 'Punk Hazard 1',
             thumb: 1637,
+            global: true,
             completion: '5x Rainbow Gems',
             gamewith: 60126,
             '01': [ 1633 ],
@@ -1536,6 +1538,7 @@ window.drops = {
         {
             name: 'Chinjao Family!',
             thumb: 1426,
+            global: true,
             gamewith: 49862,
             condition: 'You can only bring DEX units',
             'All Difficulties': [ 1425, 1427, 1428, -1240, -1272, -1270, -1227, -1224, -872, -878, -255, -812 ]
@@ -1544,6 +1547,7 @@ window.drops = {
         {
             name: 'Fugitive of Love and Passion!!',
             thumb: 1450,
+            global: true,
             gamewith: 50895,
             condition: 'You can only bring STR units',
             'All Difficulties': [ 1449, 1451, -935, -1278, -1318, -1324, -880, -876, -259, -1226, -814 ]
@@ -1552,6 +1556,7 @@ window.drops = {
         {
             name: 'Gatekeeper of the New World!',
             thumb: 1469,
+            global: true,
             gamewith: 51926,
             condition: 'You can only bring QCK units',
             'All Difficulties': [ 1468, 1470, 1471, -1268, -1322, -1228, -906, -914, -310, -1061, -1470, -1320 ]
@@ -1560,6 +1565,7 @@ window.drops = {
         {
             name: 'Departure! Whitebeard Pirates',
             thumb: 1509,
+            global: true,
             gamewith: 52629,
             condition: 'You can only bring PSY units',
             'All Difficulties': [ 1509, 1510, 1511, 1512, -1001, -1316, -1280, -314, -908, -16, -1446, -1370, -1368, -816 ],
@@ -1568,6 +1574,7 @@ window.drops = {
         {
             name: 'Bandits! Dadan Family!',
             thumb: 1520,
+            global: true,
             gamewith: 53569,
             'All Difficulties': [ 1519, 1521, 1522, -1314, -1366, -1364, -912, -937, -316, -1281, -891, -22, -1448 ],
         },
@@ -1575,6 +1582,7 @@ window.drops = {
         {
             name: 'Encourage the Soul!',
             thumb: 1547,
+            global: true,
             gamewith: 54302,
             condition: 'Strawhat Pirates get ATK, HP, and RCV boosted by 1.5x and reduces cooldown of specials by 9 turns at the start of the fight',
             'All Difficulties': [ 1546, 1548, -1035, -1410, -1406, -939, -943, -312, -1279, -1282, -1447, -20 ],
@@ -1583,6 +1591,7 @@ window.drops = {
         {
             name: 'Fight for your Friends!',
             thumb: 1564,
+            global: true,
             gamewith: 55145,
             condition: 'Elizabello will kill you with one punch',
             'All Difficulties': [ 1563, 1565, -1362, -1408, -1412, -941, -991, -308, -1283, -892, -1549, -709 ],
@@ -1958,6 +1967,7 @@ window.drops = {
         
         {
             name: 'Clash Neo!! Sabo',
+            global: true,
             gamewith: 64230,
             thumb: 1727,
             condition: '1 Expert version, 1 Master version, and 3 different Ultimate versions with different conditions. Expert/Master: Shooter/Fighter/Cerebral Only. Can only complete 10 times each. Ultimate: Shooter Only, Fighter Only, and Cerebral Only',
@@ -2078,6 +2088,7 @@ window.drops = {
         
         {
             name: 'Clash!! Rayleigh',
+            global: true,
             thumb: 2001,
             gamewith: null,
             Ultimate: [ 2000 ],
@@ -2124,6 +2135,7 @@ window.drops = {
         
         {
             name: 'Halloween Event Characters',
+            global: true,
             thumb: 1300,
             'All Difficulties': [ 1299, 1305, 1325 ],
         },
@@ -2141,12 +2153,14 @@ window.drops = {
         {
             name: 'Straw Hat Pirates!',
             thumb: 1387,
+            global: true,
             'All Difficulties': [ 2, 5, 9, 13, 17, 21, 708, 629, 895 ],
         },
         
         {
             name: '2nd Anniversary Celebration! Duel! Ace',
             thumb: 1023,
+            global: true,
             'All Difficulties': [ 1023 ]
         },
         
@@ -2170,7 +2184,7 @@ window.drops = {
         {
             name: 'Adventure Mode',
             thumb: 1808,
-            Adventure: [ 1807 ]
+            Adventure: [ 1807, 1852 ]
         },
         
         {
@@ -2194,6 +2208,7 @@ window.drops = {
         {
             name: 'Invasion! Cavendish',
             thumb: 1530,
+            global: true,
             gamewith: 53621,
             condition: 'Has a chance of appearing at the end of ANY Chaos Coliseum boss. You MUST use the same team that you just used to complete the Coliseum boss to fight Cavendish.',
             'All Difficulties': [ 1529, 'skullSTR', 'skullDEX', 'skullQCK', 'skullPSY', 'skullINT' ]
@@ -2241,8 +2256,9 @@ window.drops = {
         },
         
         {
-            name: 'Battle Royale! The Three Admirals',
+            name: 'Battle Blitz! The Three Admirals',
             thumb: 1314,
+            global: true,
             gamewith: 61665,
             condition: 'Chance of dropping the Silver Almighty Book.',
             'All Bosses': [ -1621, -1632, -1665 ],
@@ -2250,7 +2266,7 @@ window.drops = {
         },
         
         {
-            name: 'Battle Royale! Straw Hat Pirates',
+            name: 'Battle Blitz! Straw Hat Pirates',
             thumb: 1404,
             gamewith: 65078,
             condition: 'Chance of dropping the Silver Almighty Book.',
@@ -2259,7 +2275,7 @@ window.drops = {
         },
         
         {
-            name: 'Battle Royale! Doflamingo Family',
+            name: 'Battle Blitz! Doflamingo Family',
             thumb: 870,
             gamewith: 68282,
             condition: 'Chance of dropping the Silver Almighty Book, Guidence Fragments and Guidence Crystals.',
@@ -2318,6 +2334,7 @@ window.drops = {
         {
             name: '20th Anniversary! Nico Robin!',
             thumb: 1684,
+            global: true,
             gamewith: 62383,
             showManual: true,
             condition: 'No characters will drop posters.',
@@ -2336,6 +2353,7 @@ window.drops = {
         {
             name: '20th Anniversary! Straw Hats!',
             thumb: 1686,
+            global: true,
             gamewith: 62386,
             condition: 'Gain gems by completeing the missions. Once you complete a mission, it will no longer be available and the next difficulty will be available. Total of 46 gems possible. Only Booster characters will drop posters.',
             'All Difficulties': [ 591, 592, 593, 594, 595, 189, 190, 191, 192, 193 ],
@@ -2429,6 +2447,7 @@ window.drops = {
             name: 'Forest of Training: ROOM',
             thumb: 1045,
             gamewith: 44527,
+            global: true,
             completion: 'Ship: Polar Tang',
         },
         
diff --git a/common/data/flags.js b/common/data/flags.js
index 78834a25e..8c4d6ee60 100644
--- a/common/data/flags.js
+++ b/common/data/flags.js
@@ -576,7 +576,9 @@ window.flags = {
     575: { global: 1 },
     576: { special: 1, shop: 1, global: 1 },
 //    577: { rr: 1, rro: 1, global: 1 },
+    577: { global: 1 },
 //    578: { rr: 1, rro: 1, global: 1 },
+    578: { global: 1 },
     579: { global: 1, rr: 1, rro: 1, lrr: 1 },
     580: { global: 1, rr: 1, rro: 1, lrr: 1 },
     581: { global: 1 },
@@ -864,6 +866,9 @@ window.flags = {
     863: { special: 1, global: 1, shop: 1 },
     864: { global: 1 },
     865: { global: 1 },
+    866: { global: 1 },
+    867: { global: 1 },
+    868: { global: 1 },
     869: { rr: 1, rro: 1, global: 1 },
     870: { rr: 1, rro: 1, global: 1 },
     871: { rr: 1, rro: 1, global: 1 },
@@ -1511,6 +1516,10 @@ window.flags = {
     1560: { global: 1 },
     1561: { global: 1 },
     1562: { global: 1 },
+    1563: { global: 1 },
+    1564: { global: 1 },
+    1565: { global: 1 },
+    1566: { global: 1 },
     1567: { rr: 1, rro: 1, lrr: 1 },
     1568: { rr: 1, rro: 1, lrr: 1 },
     1569: { special: 1, global: 1 },
@@ -1552,6 +1561,19 @@ window.flags = {
     1623: { global: 1 },
     1631: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1632: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1633: { global: 1 },
+    1634: { global: 1 },
+    1635: { global: 1 },
+    1636: { global: 1 },
+    1637: { global: 1 },
+    1638: { global: 1 },
+    1639: { global: 1 },
+    1640: { global: 1 },
+    1641: { global: 1 },
+    1642: { global: 1 },
+    1643: { global: 1 },
+    1644: { global: 1 },
+    1645: { global: 1 },
     1651: { rr: 1, rro: 1, global: 1 },
     1652: { rr: 1, rro: 1, global: 1 },
     1653: { rr: 1, rro: 1, global: 1 },
@@ -1562,8 +1584,8 @@ window.flags = {
     1658: { rr: 1, rro: 1, global: 1 },
     1659: { rr: 1, rro: 1, global: 1 },
     1660: { rr: 1, rro: 1, global: 1 },
-    1661: { shop: 1 },
-    1662: { shop: 1 },
+    1661: { shop: 1, global: 1 },
+    1662: { shop: 1, global: 1 },
     1663: { rr: 1, rro: 1 },
     1664: { rr: 1, rro: 1, lrr: 1 },
     1665: { rr: 1, rro: 1, lrr: 1 },
@@ -1571,8 +1593,8 @@ window.flags = {
     1669: { global: 1 },
     1673: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1674: { rr: 1, rro: 1, lrr: 1, global: 1 },
-    1675: { special: 1 },
-    1676: { special: 1 },
+    1675: { special: 1, global: 1 },
+    1676: { special: 1, global: 1 },
     1677: { rr: 1, rro: 1, lrr: 1 },
     1678: { rr: 1, rro: 1, lrr: 1 },
     1679: { global: 1 },
@@ -1600,20 +1622,22 @@ window.flags = {
     1713: { rr: 1, rro: 1, lrr: 1 },
     1720: { rr: 1, rro: 1, lrr: 1, global: 1 },
     1721: { rr: 1, rro: 1, lrr: 1, global: 1 },
+    1726: { global: 1 },
+    1727: { global: 1 },
     1728: { special: 1 },
     1729: { special: 1 },
     1730: { rr: 1, rro: 1, lrr: 1 },
     1731: { rr: 1, rro: 1, lrr: 1 },
-    1740: { rr: 1, rro: 1 },
-    1741: { rr: 1, rro: 1 },
-    1742: { rr: 1, rro: 1 },
-    1743: { rr: 1, rro: 1 },
-    1744: { rr: 1, rro: 1 },
-    1745: { rr: 1, rro: 1 },
-    1746: { rr: 1, rro: 1 },
-    1747: { rr: 1, rro: 1 },
-    1748: { rr: 1, rro: 1 },
-    1749: { rr: 1, rro: 1 },
+    1740: { rr: 1, rro: 1, global: 1 },
+    1741: { rr: 1, rro: 1, global: 1 },
+    1742: { rr: 1, rro: 1, global: 1 },
+    1743: { rr: 1, rro: 1, global: 1 },
+    1744: { rr: 1, rro: 1, global: 1 },
+    1745: { rr: 1, rro: 1, global: 1 },
+    1746: { rr: 1, rro: 1, global: 1 },
+    1747: { rr: 1, rro: 1, global: 1 },
+    1748: { rr: 1, rro: 1, global: 1 },
+    1749: { rr: 1, rro: 1, global: 1 },
     1750: { rr: 1, rro: 1, global: 1 },
     1751: { rr: 1, rro: 1, global: 1 },
     1752: { rr: 1, rro: 1 },
@@ -1654,6 +1678,12 @@ window.flags = {
     1823: { rr: 1, rro: 1, lrr: 1 },
     1824: { rr: 1, rro: 1, lrr: 1 },
     1847: { rr: 1, rro: 1 },
+    1848: { rr: 1, rro: 1, lrr: 1 },
+    1849: { rr: 1, rro: 1, lrr: 1 },
+    1850: { rr: 1, rro: 1, lrr: 1 },
+    1851: { rr: 1, rro: 1, lrr: 1 },
+    1858: { rr: 1, rro: 1, lrr: 1 },
+    1859: { rr: 1, rro: 1, lrr: 1 },
     2000: { global: 1 },
     2001: { global: 1 },
 };
\ No newline at end of file
diff --git a/common/data/gw.js b/common/data/gw.js
index e9c09d6cc..693b2d8c5 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1846,4 +1846,8 @@ window.gw=[
     75037,
     75037,
     11070,
+    78759,
+    78759,
+    78758,
+    78758,
 ];
\ No newline at end of file
diff --git a/common/data/matchers.js b/common/data/matchers.js
index a1865df06..c0fbcc7e1 100644
--- a/common/data/matchers.js
+++ b/common/data/matchers.js
@@ -553,7 +553,7 @@ window.matchers = [
     {
         name: 'Paralysis reducers',
         target: 'sailor',
-        matcher: /(reduces|removes).+Paralysis/i 
+        matcher: /(reduces|removes|resists).+Paralysis/i 
     },
 
     {
@@ -617,5 +617,11 @@ window.matchers = [
         target: 'limit',
         matcher: /Pinch Healing/i
     },
+    
+    {
+        name: 'Damage Reduction Potential Ability',
+        target: 'limit',
+        matcher: /Damage Reduction/i
+    },
 
 ];
diff --git a/common/data/specials.js b/common/data/specials.js
index 1dd7c7465..1b9e27246 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3806,6 +3806,25 @@ window.specials = {
     1851: {
         chainAddition: function(p) { return 0.5; }
     },
+    1854: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1855: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    },
+    1856: {
+        affinity: function(p){ return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    1857: {
+        affinity: function(p){ return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    1858: {
+        staticMult: function(p) { return 65; }
+    },
     1859: {
         staticMult: function(p) { return 65; }
     },
diff --git a/common/data/units.js b/common/data/units.js
index a80499c0e..40e7cd4d9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1252,7 +1252,7 @@ window.units = [
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
     [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
     [ "'Sky Rider' Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
-    [ "Maelstrom Spider Squardo, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
+    [ "Maelstrom Spider Squard, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
     [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
     [ "Edward Newgate, Rival of the Pirate King", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
@@ -1852,12 +1852,12 @@ window.units = [
     [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
     [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, null, null, 50, 130703, null, null, null, null, null, null, null ],
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, null, 99, 5000000, null, null, null, 3564, 1595, 283, null ],
-    [ "X-Drake FN", "PSY", [ "Powerhouse", "Cerebral" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "X-Drake FN Evolved", "PSY", [ "Powerhouse", "Cerebral" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Scratchmen Apoo FN", "STR", [ "Free Spirit", "Shooter" ], 3, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Scratchmen Apoo FN Evolved", "STR", [ "Free Spirit", "Slasher" ], 4, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Limited RR Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
-    [ "Limited RR Leo Evolved", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
+    [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, null, null, null, null, 2136, 1211, 221, null ],
+    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, null, null, null, 2978, 1267, 50, null ],
+    [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
+    [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From d717e0fffa2061bb677aed9e6e5da96f4deaed1b Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 12 Nov 2017 14:47:43 -0500
Subject: [PATCH 1521/1569] Leo typo

---
 common/data/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 927993e8b..4961c3cb4 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13845,12 +13845,12 @@ window.details = {
     },
     1858: {//Leo
         captain: "Boosts ATK of Striker characters by 2x at the start of the chain. Boosts ATK of Striker characters by 2.4x after scoring 3 Perfects in a row.",
-        special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns",
+        special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
         sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
     },
     1859: {//Leo
         captain: "Boosts ATK of Striker characters by 2.5x and their HP by 1.2x at the start of the chain. Boosts ATK of Striker characters by 3.25x after scoring 3 Perfects in a row.",
-        special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns",
+        special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
         sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
     },
     2000: {//Rayleigh

From 2602bf4c268813eaafe3817ae834b5e7506fc5cd Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 12 Nov 2017 16:44:29 -0500
Subject: [PATCH 1522/1569] Cabbage

---
 common/data/aliases.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/aliases.js b/common/data/aliases.js
index ca720ecad..dfe68e107 100644
--- a/common/data/aliases.js
+++ b/common/data/aliases.js
@@ -1797,8 +1797,8 @@ window.aliases = {
     1796: ['ディアマンテ ドレスローザ現国王のファミリー', '', 'Mr Diamante'],
     1797: ['ジーザス・バージェス コリーダコロシアムＡブロックの“チャンピオン”', '', ''],
     1798: ['ジーザス・バージェス 鳥カゴの中の暗躍者', '', ''],
-    1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', ''],
-    1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', ''],
+    1799: ['キャベンディッシュ コリーダコロシアムＤブロックの“白馬”', '', 'Cabbage'],
+    1800: ['キャベンディッシュ 鳥カゴの中の反逆者', '', 'Cabbage'],
     1801: ['バルトロメオ コリーダコロシアムＢブロックの“人食い”', '', ''],
     1802: ['バルトロメオ 鳥カゴの中の反逆者', '', ''],
     1803: ['ロロノア・ゾロ “東の海”の海賊', '', ''],

From 99375827cfad83065e4b6784c5f22a55b880e2e4 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 12 Nov 2017 17:38:05 -0500
Subject: [PATCH 1523/1569] Combo Barrier Bug

idk why this fixes it
---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index e41cf27f0..5c6ea6c1c 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -371,7 +371,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             --mapEffect.shieldLeft;
         }
         // apply hit bonus
-        if (bonusDamageBase > 0 && mapEffect.shieldLeft == 0) {
+        if (bonusDamageBase > 0 && mapEffect.shieldLeft == 0 && mapEffect.comboType) {
             if (lastHit > 1) result.result += Math.ceil(lastAtk * 0.9 * bonusDamageBase);
             else result.result += Math.max(0,Math.ceil(lastAtk * (0.9 * bonusDamageBase + 1 / unit.combo)) - currentDefense);
         }

From f7e3f3059381bedc4253ae79738f5f401da1d5e7 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Sun, 12 Nov 2017 20:30:33 -0500
Subject: [PATCH 1524/1569] nope, bug fix introduced more bugs

This is a revert
---
 damage/js/cruncher.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/damage/js/cruncher.js b/damage/js/cruncher.js
index 5c6ea6c1c..e41cf27f0 100644
--- a/damage/js/cruncher.js
+++ b/damage/js/cruncher.js
@@ -371,7 +371,7 @@ var CruncherCtrl = function($scope, $rootScope, $timeout) {
             --mapEffect.shieldLeft;
         }
         // apply hit bonus
-        if (bonusDamageBase > 0 && mapEffect.shieldLeft == 0 && mapEffect.comboType) {
+        if (bonusDamageBase > 0 && mapEffect.shieldLeft == 0) {
             if (lastHit > 1) result.result += Math.ceil(lastAtk * 0.9 * bonusDamageBase);
             else result.result += Math.max(0,Math.ceil(lastAtk * (0.9 * bonusDamageBase + 1 / unit.combo)) - currentDefense);
         }

From 17553db36ec5df1e8778c146ee0456b6a7c0bb34 Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 14 Nov 2017 01:52:57 -0500
Subject: [PATCH 1525/1569] new FN

---
 common/data/drops.js      | 7 +++++++
 common/data/evolutions.js | 8 ++++++++
 common/data/units.js      | 6 +++---
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/common/data/drops.js b/common/data/drops.js
index 6ebf5deb1..609dd34fa 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -1703,6 +1703,13 @@ window.drops = {
             'All Difficulties': [ 1841, 1843, -1268, -639, -645, -1234, -1270, -1700, -1704, -1501, -1502 ]
         },
         
+        {
+            name: 'Supernova! Worst Generation!',
+            thumb: 1855,
+            gamewith: null,
+            'All Difficulties': [ 1854, 1856, -1652, -1272, -1278, -1620, -1702, -1558 ]
+        },
+        
     ],
 
             
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index d61f6e80b..481760f5d 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2891,6 +2891,14 @@ window.evolutions = {
         evolution: 1847,
         evolvers: [ 'skullINT', 118, 88, 304, 267 ],
     },
+    1854: {
+        evolution: 1855,
+        evolvers: [ 81, 87, 92, 98, 103 ],
+    },
+    1856: {
+        evolution: 1857,
+        evolvers: [ 78, 84, 89, 95, 100 ],
+    },
     2000: {
         evolution: 2001,
         evolvers: [ 118, 84, 266, 300, 100 ]
diff --git a/common/data/units.js b/common/data/units.js
index 40e7cd4d9..018cc58bf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1852,10 +1852,10 @@ window.units = [
     [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
     [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, null, null, 50, 130703, null, null, null, null, null, null, null ],
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, null, 99, 5000000, null, null, null, 3564, 1595, 283, null ],
-    [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, null ],
     [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, null, null, null, null, 2136, 1211, 221, null ],
-    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, null, null, null, 2978, 1267, 50, null ],
+    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, null, null, null, null ],
+    [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, 1472, 567, 30, 2978, 1267, 50, null ],
     [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From cfdaeaef3eb456e5434aa1e83b6d76ba0543cb9a Mon Sep 17 00:00:00 2001
From: JNathwani <iKing@Jaylens-MBP-2.fios-router.home>
Date: Tue, 14 Nov 2017 01:58:54 -0500
Subject: [PATCH 1526/1569] WB

---
 common/data/evolutions.js | 4 ++++
 common/data/units.js      | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 481760f5d..6dfe8050b 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2891,6 +2891,10 @@ window.evolutions = {
         evolution: 1847,
         evolvers: [ 'skullINT', 118, 88, 304, 267 ],
     },
+    1852: {
+        evolution: 1853,
+        evolvers: [ 115, 116, 117, 118, 104 ],
+    },
     1854: {
         evolution: 1855,
         evolvers: [ 81, 87, 92, 98, 103 ],
diff --git a/common/data/units.js b/common/data/units.js
index 018cc58bf..08ce95afa 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1850,8 +1850,8 @@ window.units = [
     [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 2662, 1312, 99, null ],
     [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
     [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
-    [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, null, null, 50, 130703, null, null, null, null, null, null, null ],
-    [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, null, 99, 5000000, null, null, null, 3564, 1595, 283, null ],
+    [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, 4, 1, 50, 130703, null, null, null, 1044, 421, 100, null ],
+    [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, 1, 99, 5000000, 920, 320, 69, 3064, 1390, 203, null ],
     [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, null ],
     [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, null, null, null, null, 2136, 1211, 221, null ],
     [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, null, null, null, null ],

From 7d7fa83c45d1d19eb6d7278e3a7d4ba8c3a033cd Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 15 Nov 2017 18:16:49 -0500
Subject: [PATCH 1527/1569] new units

---
 common/data/captains.js   | 24 ++++++++++++++++++++++++
 common/data/evolutions.js |  4 ++--
 common/data/units.js      |  2 +-
 common/data/zombies.js    |  4 ++++
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 0670e6223..eb0ba0789 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5866,6 +5866,30 @@ window.captains = {
         },
         hp: function(p) { return 1.2; },
     },
+    1854: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+    },
+    1855: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1856: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+    },
+    1857: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+    },
+    1858: {
+        hitAtk: function(p) {
+            if (!(p.unit.class.has("Striker"))) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+    },
     1859: {
         hitAtk: function(p) {
             if (!(p.unit.class.has("Striker"))) return 1;
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index 6dfe8050b..a09a18e94 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2897,11 +2897,11 @@ window.evolutions = {
     },
     1854: {
         evolution: 1855,
-        evolvers: [ 81, 87, 92, 98, 103 ],
+        evolvers: [ 78, 84, 89, 95, 100 ],
     },
     1856: {
         evolution: 1857,
-        evolvers: [ 78, 84, 89, 95, 100 ],
+        evolvers: [ 81, 87, 92, 98, 103 ],
     },
     2000: {
         evolution: 2001,
diff --git a/common/data/units.js b/common/data/units.js
index 08ce95afa..bef285cdf 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1854,7 +1854,7 @@ window.units = [
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, 1, 99, 5000000, 920, 320, 69, 3064, 1390, 203, null ],
     [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, null ],
     [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, null, null, null, null, 2136, 1211, 221, null ],
-    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, null, null, null, null ],
+    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, 1674, 611, 50, null ],
     [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, 1472, 567, 30, 2978, 1267, 50, null ],
     [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
diff --git a/common/data/zombies.js b/common/data/zombies.js
index 36b2bd6f7..ee4424aa2 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -487,6 +487,10 @@ window.zombies = {
         type: 'healer',
         multiplier: 2
     },
+    1857: { // X Drake
+        type: 'healer',
+        amount: 200
+    },
     2001: { // Rayleigh CHANGE THIS WHEN YOU CHANGE RAYLEIGH
         type: 'healer',
         multiplier: 2

From 29fa2bf4e2af450127932d0935bd863a2c3070e7 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Wed, 15 Nov 2017 21:26:00 -0500
Subject: [PATCH 1528/1569] whoops

---
 common/data/zombies.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/zombies.js b/common/data/zombies.js
index ee4424aa2..62150061f 100644
--- a/common/data/zombies.js
+++ b/common/data/zombies.js
@@ -455,11 +455,11 @@ window.zombies = {
         type: 'healer',
         multiplier: 3
     },
-    1748: { // Boa
+    1746: { // Boa
         type: 'healer',
         amount: 1000
     },
-    1749: { // Boa
+    1747: { // Boa
         type: 'healer',
         amount: 1000
     },

From 620441155453167e15a272f9cfbe50379076b578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 01:03:31 +0100
Subject: [PATCH 1529/1569] Neo Kinemon for JPN and Neo Kizaru for Global

---
 common/data/effects.js | 66 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/common/data/effects.js b/common/data/effects.js
index 11825703d..d4c4a5d91 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -523,4 +523,70 @@ window.effects = {
         },
     },
     
+    'Coloseum Kinemon Neo': {
+        description: 'Certain units boosted',
+        thumb: 1863,
+        id: 68, // don't change this
+        atk: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1858 && id < 1859) ||
+                    [ 1720, 1621, 1631, 1632, 1777, 1778, 1833, 1834, 871, 872, 1695, 1696, 1791, 1792, 1431, 1432 ].indexOf(id) !== -1);
+            return !matching ? 1 : 1.75;
+        },
+        hp: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1858 && id < 1859) ||
+                    [ 1720, 1621, 1631, 1632, 1777, 1778, 1833, 1834, 871, 872, 1695, 1696, 1791, 1792, 1431, 1432 ].indexOf(id) !== -1);
+            return !matching ? 1 : 1.75;
+        },
+        rcv: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1858 && id < 1859) ||
+                    [ 1720, 1621, 1631, 1632, 1777, 1778, 1833, 1834, 871, 872, 1695, 1696, 1791, 1792, 1431, 1432 ].indexOf(id) !== -1);
+            return !matching ? 1 : 1.75;
+        }
+    },
+    
+    'Kizaru Neo [GLOBAL] - Free Spirit': {
+        description: 'Chain multiplier reduced.',
+        thumb: 1780,
+        id: 69,
+        //orb: function(p) { return p.orb === 2.0 ? 1.2 : (p.orb === 0.5 ? 5/6 : 1); },
+        atk: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1777 && id < 1778) ||
+                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749 ].indexOf(id) !== -1);
+            return !matching ? 1 : 1.75;
+        },
+        chainModifier: function(p) { return 0.5 ; }//Chain by half
+    },
+    
+    'Kizaru Neo [GLOBAL] - Striker': {
+        description: 'Chain multiplier halved.',
+        thumb: 1780,
+        id: 70,
+        //orb: function(p) { return p.orb === 2.0 ? 1.2 : (p.orb === 0.5 ? 5/6 : 1); },
+        atk: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1777 && id < 1778) ||
+                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749 ].indexOf(id) !== -1);
+            return !matching ? 1 : 1.75;
+        },
+        chainModifier: function(p) { return 0.5 ; }//Chain by half
+    },
+    
+    'Kizaru Neo [GLOBAL] - Powerhouse': {
+        description: 'Chain multiplier locked at 1.1x.',
+        thumb: 1780,
+        id: 71,
+        //orb: function(p) { return p.orb === 2.0 ? 1.2 : (p.orb === 0.5 ? 5/6 : 1); },
+        atk: function(p) {
+            var id = p.number + 1,
+                matching = ((id > 1777 && id < 1778) ||
+                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749 ].indexOf(id) !== -1);
+            return !matching ? 1 : 1.75;
+        },
+        chainLimiter: function() { return 2.0; } //Chain locked at 2x
+    }
+    
 };

From 17064c3fa577100b507f5d62c7a5c1132756eb3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 01:08:15 +0100
Subject: [PATCH 1530/1569] Added Raizo and Kinemon placeholders

LB Raizo
---
 common/data/units.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index bef285cdf..a8ec9fe0e 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1858,10 +1858,11 @@ window.units = [
     [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, 1472, 567, 30, 2978, 1267, 50, null ],
     [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
+    [ "Raizo Colo", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Raizo Colo Evolved", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2322, 1519, 372, null ],
+    [ "Kinemon Neo Colo", "PSY", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kinemon Neo Colo Evolved", "PSY", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2071, 1430, 324, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From b2cc07d1b6def4dec3d6dc9b126a48f01f2ea508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 01:09:01 +0100
Subject: [PATCH 1531/1569]  Added Raizo and Kinemon placeholders

Only evolved Captains
---
 common/data/captains.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index eb0ba0789..3f22fbb14 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5898,6 +5898,12 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
+    1861: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
+    },
+    1863: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+    },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },

From d3d7c669b968c2156cb7c6725c693048a268b092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 01:09:51 +0100
Subject: [PATCH 1532/1569]  Added Raizo and Kinemon placeholders

Again, only 5*
---
 common/data/details.js | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index 4961c3cb4..b2d87c173 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13853,6 +13853,29 @@ window.details = {
         special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
         sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
     },
+    1861: {//Coloseum Raizo
+        captain: "Reduce CD by 2 at the start of the adventure, Shooter Type Characters ATK 2.5x",
+        special: [
+            {
+                "description": "3x Character ATK in QCK damage to all enemies, change RCV and TND orbs of Shooter Type Characters to matching orbs",
+                "cooldown": [ 19, 4 ]
+            },
+            {
+                "description": "7x Character ATK in QCK damage to all enemies, change RCV and TND orbs of Shooter Type Characters to matching orbs, if the captain is a Shooter Type Character boost ATK against delayed enemies by 1.35x for 1 turn",
+                "cooldown": [ 24, 9 ]
+            },
+            {
+                "description": "11x Character ATK in QCK damage to all enemies, change RCV and TND orbs of Shooter Type Characters to matching orbs, if the captain is a Shooter Type Character boost ATK against delayed enemies by 1.75x for 1 turn",
+                "cooldown": [ 30, 15 ]
+            }
+        ],
+        specialNotes: "#{stages}"
+    },
+    1863: {//Neo Coliseum Kinemon
+        captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
+        special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
+        specialName: "Poof [NEO]",
+    },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",

From 2b5b60984c3ade839910840ea85f5b112419288c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 01:12:31 +0100
Subject: [PATCH 1533/1569]  Added Raizo special placeholder

Just the greater boost, it needs a two-staged (or 3? Even though first stage doesn't do anything to the calc) special. Felt lazy that day.
---
 common/data/specials.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index 1b9e27246..e3acde9d2 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3828,6 +3828,10 @@ window.specials = {
     1859: {
         staticMult: function(p) { return 65; }
     },
+    1861: {
+        atk: function(p) { return (p.delayed > 0 && (p.captain.class.has("Shooter"))) ? 1.75 : 1; },
+        type: "condition",
+    },
     2000: {
         atk: function(p) { return 1.75; },
         type: "class"

From 41b7c7562712013b9f11eb8aaf3af0578f69eedd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 01:15:58 +0100
Subject: [PATCH 1534/1569] Fixed id's on newer additions and chain limiter

---
 common/data/effects.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index d4c4a5d91..b75fd5b49 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -526,7 +526,7 @@ window.effects = {
     'Coloseum Kinemon Neo': {
         description: 'Certain units boosted',
         thumb: 1863,
-        id: 68, // don't change this
+        id: 48, // don't change this
         atk: function(p) {
             var id = p.number + 1,
                 matching = ((id > 1858 && id < 1859) ||
@@ -550,7 +550,7 @@ window.effects = {
     'Kizaru Neo [GLOBAL] - Free Spirit': {
         description: 'Chain multiplier reduced.',
         thumb: 1780,
-        id: 69,
+        id: 49,
         //orb: function(p) { return p.orb === 2.0 ? 1.2 : (p.orb === 0.5 ? 5/6 : 1); },
         atk: function(p) {
             var id = p.number + 1,
@@ -564,7 +564,7 @@ window.effects = {
     'Kizaru Neo [GLOBAL] - Striker': {
         description: 'Chain multiplier halved.',
         thumb: 1780,
-        id: 70,
+        id: 50,
         //orb: function(p) { return p.orb === 2.0 ? 1.2 : (p.orb === 0.5 ? 5/6 : 1); },
         atk: function(p) {
             var id = p.number + 1,
@@ -578,7 +578,7 @@ window.effects = {
     'Kizaru Neo [GLOBAL] - Powerhouse': {
         description: 'Chain multiplier locked at 1.1x.',
         thumb: 1780,
-        id: 71,
+        id: 51,
         //orb: function(p) { return p.orb === 2.0 ? 1.2 : (p.orb === 0.5 ? 5/6 : 1); },
         atk: function(p) {
             var id = p.number + 1,
@@ -586,7 +586,7 @@ window.effects = {
                     [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749 ].indexOf(id) !== -1);
             return !matching ? 1 : 1.75;
         },
-        chainLimiter: function() { return 2.0; } //Chain locked at 2x
+        chainLimiter: function() { return 1.1; } //Chain locked at 1.1x
     }
     
 };

From c1e4b406e8a88ff0d08d85209336d4c823f9e11f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 13:53:18 +0100
Subject: [PATCH 1535/1569] Story Ikaros CD

---
 common/data/cooldowns.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index 6a2e44b7c..ce89de084 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1556,7 +1556,7 @@ window.cooldowns = [
     [ 16, 7 ],
     20,
     [ 12, 6 ],
-    20,
+    [ 20, 12 ],
     [ 19, 14 ],
     [ 11, 5 ],
     [ 23, 17 ],

From 291d7636cf7dd95945c048c574f26de785f191a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 15:39:29 +0100
Subject: [PATCH 1536/1569] Urouge and Hawkins FN

---
 common/data/captains.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/common/data/captains.js b/common/data/captains.js
index 3f22fbb14..5dbf4b53f 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5904,6 +5904,13 @@ window.captains = {
     1863: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
     },
+    1865: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+    },
+    1867: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        chainModifier: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },

From b9b4b7813b3b226d2edd641a7709f2369a879dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 15:40:46 +0100
Subject: [PATCH 1537/1569]  Urouge and Hawkins FN

---
 common/data/cooldowns.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ce89de084..88155f0d4 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1862,10 +1862,10 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
+    [ 22, 15 ],
+    [ 22, 15 ],
+    [ 24, 17 ],
+    [ 24, 17 ],
     null,
     null,
     null,

From 90d852c5dfe19122abb1baf9a1b17e765c682d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 15:41:39 +0100
Subject: [PATCH 1538/1569]  Urouge and Hawkins FN

---
 common/data/units.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index a8ec9fe0e..bd716ab2a 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1863,10 +1863,10 @@ window.units = [
     [ "Raizo Colo Evolved", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2322, 1519, 372, null ],
     [ "Kinemon Neo Colo", "PSY", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kinemon Neo Colo Evolved", "PSY", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2071, 1430, 324, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Urouge FN", "DEX", [ "Striker", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Urouge FN Evolved", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
+    [ "Basil Hawkins FN", "QCK", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Basil Hawkins FN Evolved", "QCK", [ "Slasher", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From e989287f22598dd1f992a1a5496281c257b8a573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 15:42:27 +0100
Subject: [PATCH 1539/1569]  Urouge and Hawkins FN

---
 common/data/details.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/common/data/details.js b/common/data/details.js
index b2d87c173..93651d8b3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13876,6 +13876,15 @@ window.details = {
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
         specialName: "Poof [NEO]",
     },
+    1865: {//Urouge FN
+        captain: "Striker Characters ATK 1.75x, protects from defeat as long as HP is above a certain percent",
+        captainNotes: "PERFECT hits don't count, it has to GREAT hits",
+        special: "Recover 5000 HP, for 1 turn boost ATK by 1.5x for Striker Characters, if you hit 4 or more GREAT this turn boost ATK by 1.75x for Striker Characters the next turn"
+    },
+    1867: {//Hawkins FN
+        captain: "Cerebral Characters ATK 2x, boost chain multiplier by 1.5x",
+        special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%"
+    },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",

From b6e69a9fb9c8cac1facf3634e244bf879b8a503b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 15:42:56 +0100
Subject: [PATCH 1540/1569]  Urouge and Hawkins FN

---
 common/data/specials.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/common/data/specials.js b/common/data/specials.js
index e3acde9d2..9949364d7 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -3832,6 +3832,18 @@ window.specials = {
         atk: function(p) { return (p.delayed > 0 && (p.captain.class.has("Shooter"))) ? 1.75 : 1; },
         type: "condition",
     },
+    1865: {//Urouge FN
+        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1865].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1865].multiplier === 1.5 ? 1 : 0);
+            window.specials[1865].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1865warning'
+            });
+        }
+    },
     2000: {
         atk: function(p) { return 1.75; },
         type: "class"

From a179882e816a5db7d5656bbea169ca626fd0936f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 15:48:01 +0100
Subject: [PATCH 1541/1569] Story Caesar second evolution materials

---
 common/data/evolutions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a09a18e94..07f357369 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2529,7 +2529,7 @@ window.evolutions = {
     },
     1636: {
         evolution: [ 1637, 1716 ],
-        evolvers: [ [ 118, 96, 97, 301, 302 ], [ ] ]
+        evolvers: [ [ 118, 96, 97, 301, 302 ], [ 118, 83, 84, 95, 100 ] ]
     },
     1646: {
         evolution: 1647,

From ac273a86b7c9a15d371b856aeb2c2115157e52d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 16:12:44 +0100
Subject: [PATCH 1542/1569] Urouge and Hawkins FN names

---
 common/data/units.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index bd716ab2a..2457d88b9 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1863,10 +1863,10 @@ window.units = [
     [ "Raizo Colo Evolved", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2322, 1519, 372, null ],
     [ "Kinemon Neo Colo", "PSY", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kinemon Neo Colo Evolved", "PSY", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2071, 1430, 324, null ],
-    [ "Urouge FN", "DEX", [ "Striker", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Urouge FN Evolved", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
-    [ "Basil Hawkins FN", "QCK", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Basil Hawkins FN Evolved", "QCK", [ "Slasher", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
+    [ "Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'Mad Monk' Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
+    [ "Basil Hawkins, Supernova", "QCK", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'The Magician' Basil Hawkins, Supernova ", "QCK", [ "Slasher", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 9ac34241c5cba80fbc5c12a47959f408536e7d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 16:13:32 +0100
Subject: [PATCH 1543/1569] Urouge and Hawkins FN

---
 common/data/details.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 93651d8b3..e7c6fa03a 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13879,11 +13879,13 @@ window.details = {
     1865: {//Urouge FN
         captain: "Striker Characters ATK 1.75x, protects from defeat as long as HP is above a certain percent",
         captainNotes: "PERFECT hits don't count, it has to GREAT hits",
-        special: "Recover 5000 HP, for 1 turn boost ATK by 1.5x for Striker Characters, if you hit 4 or more GREAT this turn boost ATK by 1.75x for Striker Characters the next turn"
+        special: "Recover 5000 HP, for 1 turn boost ATK by 1.5x for Striker Characters, if you hit 4 or more GREAT this turn boost ATK by 1.75x for Striker Characters the next turn",
+        specialName: "Culling the Criminals from this Earthly World"
     },
     1867: {//Hawkins FN
         captain: "Cerebral Characters ATK 2x, boost chain multiplier by 1.5x",
-        special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%"
+        special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%",
+        specialName: "Fortune-Telling from the Shadow of Death"
     },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",

From 4383db943023e065b7352f39dcda18a5e85e8446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 19:25:49 +0100
Subject: [PATCH 1544/1569] Hawkins 3* is slasher and 4* striker

---
 common/data/units.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 2457d88b9..39f2dbcd1 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1865,8 +1865,8 @@ window.units = [
     [ "Kinemon Neo Colo Evolved", "PSY", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2071, 1430, 324, null ],
     [ "Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "'Mad Monk' Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
-    [ "Basil Hawkins, Supernova", "QCK", [ "Striker", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'The Magician' Basil Hawkins, Supernova ", "QCK", [ "Slasher", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
+    [ "Basil Hawkins, Supernova", "QCK", [ "Slasher", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "'The Magician' Basil Hawkins, Supernova ", "QCK", [ "Striker", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From fadec73e9db402b4cd467a032530aa20eec9acc5 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 20 Nov 2017 15:10:09 -0500
Subject: [PATCH 1545/1569] typo

---
 common/data/units.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index a8ec9fe0e..cb2728180 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1858,7 +1858,6 @@ window.units = [
     [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, 1472, 567, 30, 2978, 1267, 50, null ],
     [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
-    [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
     [ "Raizo Colo", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raizo Colo Evolved", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2322, 1519, 372, null ],
     [ "Kinemon Neo Colo", "PSY", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],

From 7a5066ed1aa2347453953355bd66baa649e964cc Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Mon, 20 Nov 2017 16:44:50 -0500
Subject: [PATCH 1546/1569] Nomenclature

---
 common/data/cooldowns.js  |  8 ++++----
 common/data/details.js    | 37 +++++++++++++++++++++++++++++++------
 common/data/drops.js      |  3 ++-
 common/data/evolutions.js | 20 ++++++++++++++++++++
 common/data/gw.js         | 10 ++++++++++
 common/data/units.js      | 28 ++++++++++++++--------------
 6 files changed, 81 insertions(+), 25 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ce89de084..b3c8881a9 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1850,16 +1850,16 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 13, 13 ],
     [ 13, 13 ],
-    [ 37, 15 ],
-    [ 37, 15 ],
+    [ 37, 30 ],
+    [ 37, 30 ],
     [ 20, 13 ],
     [ 20, 13 ],
     [ null, 7 ],
     [ null, 7 ],
     [ 18, 14 ],
     [ 18, 14 ],
-    null,
-    null,
+    [ 30, 15 ],
+    [ 30, 15 ],
     null,
     null,
     null,
diff --git a/common/data/details.js b/common/data/details.js
index b2d87c173..c6f1c54e0 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13853,28 +13853,53 @@ window.details = {
         special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
         sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
     },
+    1860: {//Coloseum Raizo
+        captain: "Not Translated",
+        special: [
+            {
+                "description": "Deals 3x character's ATK in QCK damage to all enemies, changes [TND] and [RCV] orbs on Shooter characters into Matching Orbs,",
+                "cooldown": [ 19, 4 ]
+            },
+            {
+                "description": "Deals 7x character's ATK in QCK damage to all enemies, changes [TND] and [RCV] orbs on Shooter characters into Matching Orbs. If your captain is a Shooter Character, boosts ATK against delayed enemies by 1.35x for 1 turn",
+                "cooldown": [ 24, 9 ]
+            },
+            {
+                "description": "Deals 11x character's ATK in QCK damage to all enemies, changes [TND] and [RCV] orbs on Shooter characters into Matching Orbs. If your captain is a Shooter Character, boosts ATK against delayed enemies by 1.75x for 1 turn",
+                "cooldown": [ 30, 15 ]
+            }
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Raizo Special",
+    },
     1861: {//Coloseum Raizo
-        captain: "Reduce CD by 2 at the start of the adventure, Shooter Type Characters ATK 2.5x",
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.5x",
         special: [
             {
-                "description": "3x Character ATK in QCK damage to all enemies, change RCV and TND orbs of Shooter Type Characters to matching orbs",
+                "description": "Deals 3x character's ATK in QCK damage to all enemies, changes [TND] and [RCV] orbs on Shooter characters into Matching Orbs,",
                 "cooldown": [ 19, 4 ]
             },
             {
-                "description": "7x Character ATK in QCK damage to all enemies, change RCV and TND orbs of Shooter Type Characters to matching orbs, if the captain is a Shooter Type Character boost ATK against delayed enemies by 1.35x for 1 turn",
+                "description": "Deals 7x character's ATK in QCK damage to all enemies, changes [TND] and [RCV] orbs on Shooter characters into Matching Orbs. If your captain is a Shooter Character, boosts ATK against delayed enemies by 1.35x for 1 turn",
                 "cooldown": [ 24, 9 ]
             },
             {
-                "description": "11x Character ATK in QCK damage to all enemies, change RCV and TND orbs of Shooter Type Characters to matching orbs, if the captain is a Shooter Type Character boost ATK against delayed enemies by 1.75x for 1 turn",
+                "description": "Deals 11x character's ATK in QCK damage to all enemies, changes [TND] and [RCV] orbs on Shooter characters into Matching Orbs. If your captain is a Shooter Character, boosts ATK against delayed enemies by 1.75x for 1 turn",
                 "cooldown": [ 30, 15 ]
             }
         ],
-        specialNotes: "#{stages}"
+        specialNotes: "#{stages}",
+        specialName: "Raizo Special",
+    },
+    1862: {//Neo Coliseum Kinemon
+        captain: "Boosts ATK of Free Spirit characters by 2x, recovers 1x character's RCV in HP at the end of each turn",
+        special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
+        specialName: "Poof [Neo]",
     },
     1863: {//Neo Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
-        specialName: "Poof [NEO]",
+        specialName: "Poof [Neo]",
     },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
diff --git a/common/data/drops.js b/common/data/drops.js
index 609dd34fa..908ae8337 100644
--- a/common/data/drops.js
+++ b/common/data/drops.js
@@ -2185,7 +2185,8 @@ window.drops = {
             teamDatabase: 'coliseums',
             Exhibition: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1195, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
             Underground: [ 776, 778, 803, 832, 834, 859, 861, 883, 902, 904, 925, 927, 952, 984, 1017, 1019, 1103, 1105, 1195, 1197, 1221, 1252, 1253, 1293, 1311, 1339, 1340, 1377, 1402, 1423, 1424, 1457, 1459, 1488, 1490, 1526, 1528, 1552, 1585, 1603, 1629 ],
-            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791, 1827 ]
+            Chaos: [ 776, 778, 780, 803, 805, 830, 832, 834, 859, 861, 881, 883, 900, 902, 923, 925, 950, 982, 984, 1017, 1015, 1040, 1042, 1086, 1088, 1090, 1101, 1103, 1105, 1140, 1142, 1144, 1195, 1219, 1221, 1250, 1252, 1291, 1293, 1309, 1311, 1337, 1339, 1340, 1375, 1377, 1400, 1421, 1423, 1455, 1457, 1486, 1488, 1525, 1526, 1528, 1552, 1554, 1583, 1585, 1601, 1603, 1627, 1629, 1666, 1693, 1732, 1791, 1827, 1860 ],
+            Neo: [ 1862 ]
         },
 
         {
diff --git a/common/data/evolutions.js b/common/data/evolutions.js
index a09a18e94..763dfc23c 100644
--- a/common/data/evolutions.js
+++ b/common/data/evolutions.js
@@ -2891,6 +2891,14 @@ window.evolutions = {
         evolution: 1847,
         evolvers: [ 'skullINT', 118, 88, 304, 267 ],
     },
+    1848: {
+        evolution: 1849,
+        evolvers: [ 117, 78, 89, 95, 100 ],
+    },
+    1850: {
+        evolution: 1851,
+        evolvers: [ 117, 80, 91, 97, 102 ],
+    },
     1852: {
         evolution: 1853,
         evolvers: [ 115, 116, 117, 118, 104 ],
@@ -2903,6 +2911,18 @@ window.evolutions = {
         evolution: 1857,
         evolvers: [ 81, 87, 92, 98, 103 ],
     },
+    1858: {
+        evolution: 1859,
+        evolvers: [  ],
+    },
+    1860: {
+        evolution: 1861,
+        evolvers: [  ],
+    },
+    1862: {
+        evolution: 1863,
+        evolvers: [  ],
+    },
     2000: {
         evolution: 2001,
         evolvers: [ 118, 84, 266, 300, 100 ]
diff --git a/common/data/gw.js b/common/data/gw.js
index 693b2d8c5..079636f29 100644
--- a/common/data/gw.js
+++ b/common/data/gw.js
@@ -1850,4 +1850,14 @@ window.gw=[
     78759,
     78758,
     78758,
+    79258,
+    79258,
+    79682,
+    79682,
+    79681,
+    79681,
+    79745,
+    79745,
+    80284,
+    80284,
 ];
\ No newline at end of file
diff --git a/common/data/units.js b/common/data/units.js
index cb2728180..5d043fa92 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1831,7 +1831,7 @@ window.units = [
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 848, 735, 162, 1811, 1404, 324, 1 ],
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, 5, 3, 70, 1066998, 808, 177, 12, 1906, 782, 162, 1 ],
     [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1602, 740, 138, 4212, 1510, 201, 1 ],
-    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 202, 76, 41, null, null, null, 1 ],
+    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 202, 76, 41, 920, 434, 252, 1 ],
     [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 822, 336, 201, 1984, 1312, 432, 1 ],
     [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 268, 82, 28, 1346, 647, 110, 1 ],
     [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1120, 544, 82, 2912, 1421, 241, 1 ],
@@ -1839,23 +1839,23 @@ window.units = [
     [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 98, 2834, 1382, 267, 1 ],
     [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 218, 77, 38, 1128, 492, 198, 1 ],
     [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 982, 403, 152, 2406, 1341, 352, 1 ],
-    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, 1 ],
-    [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, 1598, 1402, -300, 1 ],
-    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, 1 ],
-    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, 1806, 879, 356, 1 ],
+    [ "Caribou, Next Generation Supernova", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, 1 ],
+    [ "Wet Haired Caribou, Next Generation Supernova", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, 1598, 1402, -300, 1 ],
+    [ "Coribou, Next Generation Supernova", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, 1 ],
+    [ "Blood-Splatterer Coribou, Next Generation Supernova", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, 1806, 879, 356, 1 ],
     [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1015, 494, 0, 1852, 688, 5, 1 ],
     [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, 1 ],
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, 1 ],
-    [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
-    [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 2662, 1312, 99, null ],
-    [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
-    [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
-    [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, 4, 1, 50, 130703, null, null, null, 1044, 421, 100, null ],
+    [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, 5, 3, 50, 261406, 210, 105, 10, 1212, 690, 48, 1 ],
+    [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1014, 621, 24, 2662, 1312, 99, 1 ],
+    [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, 6, 3, 50, 261406, 182, 92, 19, 1010, 512, 141, 1 ],
+    [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 950, 482, 81, 1992, 1098, 282, 1 ],
+    [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, 4, 1, 50, 130703, 335, 144, 25, 1044, 421, 100, null ],
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, 1, 99, 5000000, 920, 320, 69, 3064, 1390, 203, null ],
-    [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, null ],
-    [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, null, null, null, null, 2136, 1211, 221, null ],
-    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, 1674, 611, 50, null ],
-    [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, 1472, 567, 30, 2978, 1267, 50, null ],
+    [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, 1 ],
+    [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, 1000000, 1067, 534, 95, 2136, 1211, 221, 1 ],
+    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, 1674, 611, 50, 1 ],
+    [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, 1000000, 1472, 567, 30, 2978, 1267, 50, 1 ],
     [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
     [ "Raizo Colo", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],

From f33b7c611b2fd1015ca1d43a1d2f2609bff39b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 23:55:28 +0100
Subject: [PATCH 1547/1569] ' into \"

Units used to use " instead of ' in their names.
---
 common/data/units.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 5d043fa92..0aa41584c 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1252,7 +1252,7 @@ window.units = [
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
     [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
     [ "'Sky Rider' Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
-    [ "Maelstrom Spider Squard, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
+    [ "Maelstrom Spider Squardo, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
     [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
     [ "Edward Newgate, Rival of the Pirate King", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
@@ -1661,7 +1661,7 @@ window.units = [
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, 1 ],
     [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, 1 ],
     [ "Corazon, Silencing the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, 1 ],
-    [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, 1 ],
+    [ "Rob Lucci \"Life Return\", CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, 1 ],
     [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, 7, 3, 70, 1066998, 126, 130, 49, 1220, 724, 195, 1 ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1174, 655, 155, 2364, 1406, 336, 1 ],
     [ "Kyros, Undefeated Gladiator", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, 1 ],
@@ -1692,18 +1692,18 @@ window.units = [
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, 1201, 955, 122, 1 ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, 1449, 896, 101, 1 ],
     [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, 545, 303, 36, 1241, 751, 190, 1 ],
-    [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, 1 ],
+    [ "\"Ruler of Day\" Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, 1 ],
     [ "Demon Bamboo Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, 1 ],
     [ "Demon Bamboo Vergo, Donquiote Family Senior Executive", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, 1 ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, 1 ],
     [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 55, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, 1 ],
-    [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 156, 137, 30, 1120, 674, 196, 1 ],
+    [ "Jinbe, \"Eternal Hell\" Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 156, 137, 30, 1120, 674, 196, 1 ],
     [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1056, 620, 132, 2188, 1392, 320, 1 ],
-    [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, 1 ],
+    [ "Emporio Ivankov, \"Newkama Land\" Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, 1 ],
     [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1148, 550, 176, 2389, 1244, 340, 1 ],
     [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, 6, 3, 50, 392109, 198, 125, 20, 1340, 669, 101, 1 ],
     [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1277, 589, 57, 2910, 1309, 221, 1 ],
-    [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, 6, 3, 50, 392109, 172, 98, 40, 1210, 596, 212, 1 ],
+    [ "Mr. 2 Bon Clay, \"Starvation Hell\" Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, 6, 3, 50, 392109, 172, 98, 40, 1210, 596, 212, 1 ],
     [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, 7, 4, 99, 4000000, 1145, 542, 170, 2402, 1202, 355, 1 ],
     [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, 1 ],
     [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, 1 ],
@@ -1719,7 +1719,7 @@ window.units = [
     [ "Buffalo, Donquixote Pirates' Combatant", "DEX", [ "Free Spirit", "Driven" ], 4, 20, 8, 2, 70, 1066998, 191, 81, 55, 1731, 755, 220, 1 ],
     [ "Baby 5, Donquixote Pirates' Servant and Assassin", "PSY", [ "Shooter", "Slasher" ], 4, 20, 8, 2, 70, 1066998, 154, 111, 47, 1239, 1161, 171, 1 ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 70, 1066998, 158, 113, 39, 1284, 698, 178, 1 ],
-    [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
+    [ "\"Boss\" Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
     [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 159, 56, 51, 611, 498, 189, 1 ],
     [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 598, 445, 175, 1737, 1011, 324, 1 ],
     [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, 6, 2, 50, 392019, 166, 52, 44, 655, 588, 164, 1 ],
@@ -1731,7 +1731,7 @@ window.units = [
     [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, 1 ],
     [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, 1 ],
     [ "Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 70, 1066998, 563, 292, 38, 1285, 747, 205, 1 ],
-    [ "'Ruler of Night' Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1200, 678, 149, 2440, 1375, 315, 1 ],
+    [ "\"Ruler of Night\" Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1200, 678, 149, 2440, 1375, 315, 1 ],
     [ "Sugar, Hobby Hobby Fruit Ability User", "STR", [ "Cerebral", "Fighter" ], 3, 13, 4, 2, 50, 392109, 150, 102, 30, 646, 367, 220, 1 ],
     [ "Sugar, Trebol Army Special Executive", "STR", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 597, 311, 203, 1830, 975, 320, 1 ],
     [ "Trebol, Sticky Sticky Fruit Ability User", "INT", [ "Cerebral", "Driven" ], 3, 13, 5, 2, 50, 392109, 230, 156, 9, 1020, 519, 107, 1 ],
@@ -1748,8 +1748,8 @@ window.units = [
     [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, 1 ],
     [ "Bepo, Strawhat Luffy's Cooperator", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 169, 108, 33, 1100, 501, 191, 1 ],
     [ "Bepo, Strawhat Luffy's Accomplice", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1054, 446, 151, 2357, 1129, 384, 1 ],
-    [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, 1 ],
-    [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, 1 ],
+    [ "\"Surgeon of Death\" Trafalgar Law, Search for \"Joker\"", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, 1 ],
+    [ "\"Warlord of the Sea\" Trafalgar Law, Aim for \"Joker\"", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, 1 ],
     [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 669, 404, 32, 1240, 710, 159, 1 ],
     [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, 1043, 554, 94, 2503, 1400, 269, 1 ],
     [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 650, 394, 41, 1230, 698, 200, 1 ],
@@ -1771,10 +1771,10 @@ window.units = [
     [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, 1 ],
-    [ "'Samurai' Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
-    [ "'Samurai' Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
-    [ "'Samurai' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
-    [ "'Dragon' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
+    [ "\"Samurai\" Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
+    [ "\"Samurai\" Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
+    [ "\"Samurai\" Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
+    [ "\"Dragon\" Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
     [ "Kizaru, Emissary of the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, 5, 3, 70, 1066998, 160, 114, 38, 1292, 700, 177, 1 ],
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1230, 1342, 315, 2613, 1342, 315, 1 ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, 2, 70, 1066998, 217, 171, 37, 1221, 746, 162, 1 ],
@@ -1848,14 +1848,14 @@ window.units = [
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, 1 ],
     [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, 5, 3, 50, 261406, 210, 105, 10, 1212, 690, 48, 1 ],
     [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1014, 621, 24, 2662, 1312, 99, 1 ],
-    [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, 6, 3, 50, 261406, 182, 92, 19, 1010, 512, 141, 1 ],
+    [ "Squard, Treacherous \"Son\"", "DEX", [ "Slasher", "Driven" ], 4, 12, 6, 3, 50, 261406, 182, 92, 19, 1010, 512, 141, 1 ],
     [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 950, 482, 81, 1992, 1098, 282, 1 ],
     [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, 4, 1, 50, 130703, 335, 144, 25, 1044, 421, 100, null ],
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, 1, 99, 5000000, 920, 320, 69, 3064, 1390, 203, null ],
     [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, 1 ],
-    [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, 1000000, 1067, 534, 95, 2136, 1211, 221, 1 ],
+    [ "\"Roar of the Sea\" Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, 1000000, 1067, 534, 95, 2136, 1211, 221, 1 ],
     [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, 1674, 611, 50, 1 ],
-    [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, 1000000, 1472, 567, 30, 2978, 1267, 50, 1 ],
+    [ "\"Red Flag\" X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, 1000000, 1472, 567, 30, 2978, 1267, 50, 1 ],
     [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
     [ "Raizo Colo", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],

From 2b73b1892986d2e587ced1d432167e061a498b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Mon, 20 Nov 2017 23:56:45 +0100
Subject: [PATCH 1548/1569] His name is still Squard, not Squardo.

---
 common/data/units.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/data/units.js b/common/data/units.js
index 0aa41584c..f42dad02b 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1252,7 +1252,7 @@ window.units = [
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
     [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
     [ "'Sky Rider' Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
-    [ "Maelstrom Spider Squardo, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
+    [ "Maelstrom Spider Squard, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
     [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
     [ "Edward Newgate, Rival of the Pirate King", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],

From cb756018f95a74db0350dc57e1df206f402b892e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:10:28 +0100
Subject: [PATCH 1549/1569] Formating

---
 common/data/units.js | 116 +++++++++++++++++++++----------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index f42dad02b..33fe2cdd4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -161,7 +161,7 @@ window.units = [
     [ "Shooter Group Crew Yellow Pirates", "PSY", "Shooter", 2, 7, 5, 0, 30, 57558, 55, 15, 66, 227, 98, 219, 1 ],
     [ "Shooter Group Crew Black Pirates", "INT", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 29, 58, 299, 155, 198, 1 ],
     [ "Cannoneer Skilled", "INT", "Shooter", 2, 12, 5, 0, 50, 261406, 203, 105, 3, 1350, 550, 30, 1 ],
-    [ "Bodyguard, ‘Sunglasses'", "DEX", "Shooter", 1, 4, 5, 0, 20, 8728, 115, 50, 30, 370, 180, 90, 0.7 ],
+    [ "Bodyguard, \"Sunglasses\"", "DEX", "Shooter", 1, 4, 5, 0, 20, 8728, 115, 50, 30, 370, 180, 90, 0.7 ],
     [ "Bearded Bodyguard", "QCK", "Shooter", 1, 4, 5, 0, 20, 8728, 105, 70, 25, 370, 210, 80, 0.7 ],
     [ "Knuckle Punk Black Cat Pirates", "STR", "Fighter", 2, 6, 6, 0, 25, 33626, 30, 129, 2, 267, 612, 3, 1 ],
     [ "Saber Punk Black Cat Pirates", "DEX", "Slasher", 2, 6, 5, 0, 25, 33626, 42, 120, 3, 295, 592, 5, 1 ],
@@ -716,7 +716,7 @@ window.units = [
     [ "Conis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
     [ "Conis, Skypiea Girl", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
     [ "Dracule Mihawk, Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
-    [ "'Hawk Eyes' Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
+    [ "\"Hawk Eyes\" Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
     [ "Sir Crocodile: Logia, Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
     [ "Sir Crocodile: Logia, Ex-Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
     [ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
@@ -1014,7 +1014,7 @@ window.units = [
     [ "General Hotdog", "DEX", ["Fighter","Driven"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Powerhouse"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
     [ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
-    [ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
+    [ "Capone \"Gang\" Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
     [ "Brownbeard", "PSY", ["Slasher","Driven"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
     [ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Powerhouse"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
     [ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
@@ -1039,9 +1039,9 @@ window.units = [
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
     [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ],
     [ "Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 4, 25, 6, 2, 70, 1066998, 626, 252, 60, 1464, 700, 169, 1 ],
-    [ "'Diamond' Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
+    [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, 1066998, 455, 310, 36, 949, 797, 113, 1 ],
-    [ "'Massacre Soldier' Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
+    [ "\"Massacre Soldier\" Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 549, 341, 138, 1378, 813, 297, 1 ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, 5000000, 1302, 747, 241, 2790, 1484, 470, 1 ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
@@ -1068,7 +1068,7 @@ window.units = [
     [ "Proficient Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
     [ "Nimble Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
     [ "Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
-    [ "'Pirate Executioner' Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
+    [ "\"Pirate Executioner\" Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
     [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, 392109, 129, 67, 18, 1494, 571, 101, 1 ],
     [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Striker" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
     [ "Needless", "QCK", [ "Slasher", "Driven" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
@@ -1089,7 +1089,7 @@ window.units = [
     [ "Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 143, 115, 21, 977, 551, 141, 1 ],
     [ "Saga, Cursed Holy Sword", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, 1 ],
     [ "X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 545, 220, 52, 1353, 693, 179, 1 ],
-    [ "'Red Flag' X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
+    [ "\"Red Flag\" X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
     [ "Rebecca, Parasol Rhytm", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, 90778, 59, 14, 79, 462, 130, 328, 1 ],
     [ "Rebecca, Rainbow Melody", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, 1066998, 400, 93, 262, 896, 300, 505, 1 ],
     [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, 392109, 66, 36, 41, 965, 497, 209, 1 ],
@@ -1236,47 +1236,47 @@ window.units = [
     [ "Maynard, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 120, 140, 34, 1172, 614, 153, 1 ],
     [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1100, 549, 101, 2201, 1380, 303, 1 ],
     [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 139, 123, 26, 1293, 594, 133, 1 ],
-    [ "'Shark Cutter' Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
+    [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
     [ "Kizaru, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
     [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
     [ "Koala, Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 33, 40, 49, 764, 543, 196, 1 ],
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "'Straw Hat' Monkey D. Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
-    [ "'Fire Fist' Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
-    [ "'Fire Fist' Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
+    [ "\"Straw Hat\" Monkey D. Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
+    [ "\"Fire Fist\" Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
+    [ "\"Fire Fist\" Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
     [ "Marco, Collar Fluttering in the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
     [ "Marco, Tipsy Kimono", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
     [ "Marco, Whitebeard Pirates", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
-    [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
-    [ "'Sky Rider' Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
+    [ "\"Bohemian Knight\" Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
+    [ "\"Sky Rider\" Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
     [ "Maelstrom Spider Squard, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
-    [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
+    [ "\"Ice Witch\" Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
     [ "Edward Newgate, Rival of the Pirate King", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
-    [ "'Whitebeard' Edward Newgate, Grand Pirate", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
-    [ "Donquixote Doflamingo, Pirates of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
-    [ "Donquixote Doflamingo, Darkness of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
-    [ "Señor Pink, Pirates of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
-    [ "Señor Pink, Darkness of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
-    [ "Vergo, Pirates of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
-    [ "Vergo, Darkness of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
+    [ "\"Whitebeard\" Edward Newgate, Grand Pirate", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
+    [ "Donquixote Doflamingo, Pirates of the \"North Blue\"", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
+    [ "Donquixote Doflamingo, Darkness of the \"North Blue\"", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
+    [ "Señor Pink, Pirates of the \"North Blue\"", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
+    [ "Señor Pink, Darkness of the \"North Blue\"", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
+    [ "Vergo, Pirates of the \"North Blue\"", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
+    [ "Vergo, Darkness of the \"North Blue\"", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
     [ "Ace, Wasting Time Until Twilight", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, 392109, 152, 90, 30, 961, 584, 174, 1 ],
     [ "Ace, Face Glowing in the Moonlight", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, 3000000, 890, 541, 130, 1948, 1187, 289, 1 ],
     [ "Marshall D. Teach, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, 1066998, 429, 287, 39, 1674, 854, 127, 1 ],
     [ "Blackbeard, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1600, 789, 73, 3350, 1520, 244, 1 ],
     [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, 392109, 109, 92, 51, 995, 506, 202, 1 ],
-    [ "'Demon Sheriff' Laffitte", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 917, 415, 152, 2094, 1132, 406, 1 ],
+    [ "\"Demon Sheriff\" Laffitte", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 917, 415, 152, 2094, 1132, 406, 1 ],
     [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 99, 130, 48, 903, 620, 183, 1 ],
-    [ "'The Supersonic' Van Augur", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
+    [ "\"The Supersonic\" Van Augur", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
     [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 187, 122, 1, 1520, 603, 1, 1 ],
-    [ "'Champion' Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
+    [ "\"Champion\" Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
     [ "Shiryu", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 132, 142, -300, 1244, 689, -300, 1 ],
     [ "Shiryu of the Rain", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1168, 622, -300, 2500, 1490, -300, 1 ],
     [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, 4, 3, 50, 392109, 52, 131, 89, 703, 624, 254, 1 ],
-    [ "'Grim Reaper' Doc Q", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
+    [ "\"Grim Reaper\" Doc Q", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
     [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, 1066998, 301, 92, 59, 1794, 709, 140, 1 ],
     [ "Aokiji, Navy HQ Admiral", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, 3000000, 257, 129, 58, 2206, 1152, 227, 1 ],
     [ "Garp, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 171, 64, 62, 2094, 1002, 266, 1 ],
@@ -1316,9 +1316,9 @@ window.units = [
     [ "Coby of the Grand Line, Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 103, 94, 48, 941, 511, 209, 1 ],
     [ "Coby, Student of the 'Hero of the Navy', Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 877, 447, 164, 2024, 1151, 414, 1 ],
     [ "Monkey D. Garp, Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, 392109, 106, 144, 29, 959, 677, 151, 1 ],
-    [ "'Garp the Fist', Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 5, 4, 99, 4000000, 901, 602, 106, 2110, 1474, 290, 1 ],
+    [ "\"Garp the Fist\", Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 5, 4, 99, 4000000, 901, 602, 106, 2110, 1474, 290, 1 ],
     [ "Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 4, 15, 4, 3, 50, 392109, 292, 205, 89, 902, 534, 213, 1 ],
-    [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
+    [ "\"Grand Staff Officer\" Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
     [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 136, 120, 35, 993, 591, 172, 1 ],
     [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, 2342, 1296, 330, 1 ],
     [ "Onigumo, Swordsman of the Eight-Sword Style", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
@@ -1339,7 +1339,7 @@ window.units = [
     [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, 2414, 1253, 330, 1],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 162, 91, 29, 2334, 892, 296, 1],
     [ "Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, 392109, 109, 122, 38, 753, 505, 193, 1],
-    [ "'Sky Boss' Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, 3000000, 692, 448, 142, 1443, 1220, 288, 1],
+    [ "\"Sky Boss\" Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, 3000000, 692, 448, 142, 1443, 1220, 288, 1],
     [ "Curly Dadan", "PSY", [ "Slasher", "Powerhouse" ], 3, 12, 6, 2, 50, 392109, 144, 62, 33, 1844, 703, 151, 1],
     [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, 392109, 125, 106, 6, 1734, 891, 34, 1],
     [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, 1066998, 131, 133, 1, 1809, 1043, 9, 1],
@@ -1378,7 +1378,7 @@ window.units = [
     [ "Marguerite, Amazon Lily Archer", "DEX", [ "Shooter", "Slasher" ], 4, 16, 5, 2, 50, 392109, 93, 72, 62, 895, 520, 206, 1 ],
     [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 5, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
     [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
-    [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
+    [ "\"Red Hair\" Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
     [ "Tashigi, Silent Night Star", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, 1 ],
     [ "Tashigi, Holy Night Heroine", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 5, 4, 99, 3000000, 742, 416, 198, 1764, 909, 426, 1 ],
     [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, 5, 2, 50, 392109, 81, 72, 28, 867, 611, 186, 1 ],
@@ -1468,8 +1468,8 @@ window.units = [
     [ "Cavendish, Daydream of White Day", "PSY", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 3000000, 1003, 421, 129, 1953, 1101, 311, 1 ],
     [ "Sentomaru, Navy HQ", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 95, 45, 21, 1055, 595, 101, 1 ],
     [ "Sentomaru of the Axe, Navy HQ", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, 1 ],
-    [ "Lip 'Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
-    [ "'Gashed' Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
+    [ "Lip \"Service\" Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
+    [ "\"Gashed\" Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
     [ "Shirahoshi-hime", "PSY", "Striker", 5, 30, 4, 3, 70, 1066998, 433, 131, 60, 1296, 620, 286, 1 ],
     [ "Shirahoshi-hime, Ryugu Kingdom Princess", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, 1 ],
     [ "Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, 392109, 171, 149, 25, 1176, 667, 118, 1 ],
@@ -1545,13 +1545,13 @@ window.units = [
     [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 50, 392109, 87, 63, 45, 922, 521, 205, 1 ],
     [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 873, 463, 173, 1701, 1205, 358, 1 ],
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
-    [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
-    [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
+    [ "\"Soul King\" Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
+    [ "Long Arm Tribe of Tehna Gehna Kingdom, \"Soul King\" Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
     [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], "5+", 30, 4, 3, 99, 3000000, 979, 487, 171, 2105, 1187, 401, 1 ],
     [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], "5+", 30, 4, 3, 99, 3000000, 1655, 803, 91, 2687, 1359, 244, 1 ],
     [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], "5+", 30, 6, 3, 99, 3000000, 1043, 481, 187, 2204, 1277, 351, 1 ],
-    [ "Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 4, 25, 4, 1, 70, 1066998, 551, 299, 21, 1306, 757, 139, 1 ],
-    [ "Pirate Mercenary Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1225, 683, 89, 2840, 1381, 206, 1 ],
+    [ "Hajrudin, Elbaf Warriors \"New Generation\"", "STR", [ "Powerhouse", "Striker" ], 4, 25, 4, 1, 70, 1066998, 551, 299, 21, 1306, 757, 139, 1 ],
+    [ "Pirate Mercenary Hajrudin, Elbaf Warriors \"New Generation\"", "STR", [ "Powerhouse", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1225, 683, 89, 2840, 1381, 206, 1 ],
     [ "Ryuma, Samurai General Zombie", "DEX", "Slasher", 3, 16, 6, 1, 50, 392109, 131, 111, 0, 1094, 525, 99, 1 ],
     [ "Swordsman Ryuma, Samurai General Zombie", "DEX", "Slasher", 4, 26, 6, 3, 99, 3000000, 1031, 450, 99, 2017, 1192, 244, 1 ],
     [ "Wadatsumi", "STR", [ "Powerhouse", "Fighter" ], 3, 30, 6, 2, 70, 1066998, 436, 106, 0, 3000, 801, 0, 1 ],
@@ -1561,15 +1561,15 @@ window.units = [
     [ "Daruma", "QCK", [ "Powerhouse", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 70, 83, 24, 1039, 1191, 173, 1 ],
     [ "Dosun", "INT", [ "Powerhouse", "Striker" ], 3, 15, 4, 2, 70, 1066998, 101, 77, 18, 1465, 1092, 133, 1 ],
     [ "Hody Jones, Rampage", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1115, 660, 0, 3115, 1395, -150, 1 ],
-    [ "'The Fighting King' Elizabello II", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 91, 48, 19, 1021, 602, 99, 1 ],
-    [ "'The Fighting King' Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
+    [ "\"The Fighting King\" Elizabello II", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 91, 48, 19, 1021, 602, 99, 1 ],
+    [ "\"The Fighting King\" Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
     [ "Tactician Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, 101, 45, 70, 1012, 511, 160, 1 ],
     [ "Tactician Dagama, Prodence Kingdom", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, 2022, 1011, 276, 1 ],
     [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, 3, 35, 136167, 92, 33, 83, 603, 304, 289, 1 ],
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, 4, 5, 70, 1066998, 534, 255, 249, 1030, 603, 436, 1 ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, 2000000, 197, 109, 15, 2017, 1230, 245, 1 ],
     [ "Inuarashi", "STR", [ "Slasher", "Cerebral" ], 5, 30, 6, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, 1 ],
-    [ "'King of the Day' Inuarashi", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, 1 ],
+    [ "\"King of the Day\" Inuarashi", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, 1 ],
     [ "Wanda", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 135, 103, 38, 1019, 547, 213, 1 ],
     [ "Ruler's Aide Wanda", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 938, 470, 167, 2177, 1243, 367, 1 ],
     [ "Sicilian", "INT", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 142, 155, 19, 1202, 658, 127, 1 ],
@@ -1590,7 +1590,7 @@ window.units = [
     [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 143, 144, 29, 1152, 626, 206, 1 ],
     [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, 1 ],
     [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 141, 121, 36, 1134, 589, 233, 1 ],
-    [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
+    [ "\"Empress\" Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
     [ "Monkey D. Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
@@ -1602,8 +1602,8 @@ window.units = [
     [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, 1 ],
     [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, 1 ],
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, 3000000, 151, 90, 98, 1760, 1190, 257, 1 ],
-    [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, 261406, 50, 30, 10, 950, 500, 150, 1 ],
-    [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, 2000000, 880, 410, 110, 1850, 1090, 260, 1 ],
+    [ "Portgas D. Ace, Luffy's \"Brother\"", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, 261406, 50, 30, 10, 950, 500, 150, 1 ],
+    [ "Portgas D. Ace, Whitebeard's \"Son\"", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, 2000000, 880, 410, 110, 1850, 1090, 260, 1 ],
     [ "Laffitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, 93, 49, 29, 2044, 949, 323, 1 ],
     [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, 3000000, 87, 55, 22, 2006, 1050, 280, 1 ],
     [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, 51, 59, 31, 1502, 1138, 340, 1 ],
@@ -1617,7 +1617,7 @@ window.units = [
     [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1131, 540, 59, 2760, 1457, 197, 1 ],
     [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, 1390, 699, 0, 1 ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, 1 ],
-    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 5, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, 1 ],
+    [ "\"Dark King\" Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 5, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, 1 ],
     [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, 1066998, 281, 190, 30, 1424, 690, 151, 1 ],
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, 1 ],
     [ "Donquixote Doflamingo [Neo]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
@@ -1650,7 +1650,7 @@ window.units = [
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
-    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, 1 ],
+    [ "\"King of the Night\" Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, 1 ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 110, 148, 58, 957, 620, 213, 1 ],
     [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 878, 544, 162, 2009, 1438, 325, 1 ],
     [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 113, 99, 60, 1006, 539, 220, 1 ],
@@ -1661,7 +1661,7 @@ window.units = [
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, 1 ],
     [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, 1 ],
     [ "Corazon, Silencing the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, 1 ],
-    [ "Rob Lucci \"Life Return\", CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, 1 ],
+    [ "Rob Lucci \"Life Return\", CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, 1 ],
     [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, 7, 3, 70, 1066998, 126, 130, 49, 1220, 724, 195, 1 ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1174, 655, 155, 2364, 1406, 336, 1 ],
     [ "Kyros, Undefeated Gladiator", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, 1 ],
@@ -1705,7 +1705,7 @@ window.units = [
     [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1277, 589, 57, 2910, 1309, 221, 1 ],
     [ "Mr. 2 Bon Clay, \"Starvation Hell\" Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, 6, 3, 50, 392109, 172, 98, 40, 1210, 596, 212, 1 ],
     [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, 7, 4, 99, 4000000, 1145, 542, 170, 2402, 1202, 355, 1 ],
-    [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, 1 ],
+    [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], "6+", 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, 1 ],
     [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, 1 ],
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, 3000000, 832, 334, 142, 1903, 940, 386, 1 ],
     [ "Nico Robin, Healthful Beauty", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
@@ -1762,13 +1762,13 @@ window.units = [
     [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, 1 ],
     [ "Rob Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 398, 231, 33, 1358, 769, 197, 1 ],
     [ "Human Beast Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1287, 722, 141, 3205, 1540, 323, 1 ],
-    [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1558, 751, 198, 3478, 1501, 420, 1 ],
+    [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], "6+", 65, 4, 4, 99, 5000000, 1558, 751, 198, 3478, 1501, 420, 1 ],
     [ "Longleg Blue Gilly", "DEX", [ "Fighter", "Free Spirit" ], 3, 13, 6, 1, 50, 392109, 120, 98, 17, 1110, 585, 90, 1 ],
     [ "Longleg Blue Gilly, Jao Kun Do Martial Artist", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 972, 480, 88, 2208, 1185, 187, 1 ],
     [ "Assassin Funk Brothers", "QCK", [ "Fighter", "Driven" ], 3, 15, 5, 2, 70, 1066998, 134, 68, 43, 1204, 964, 118, 1 ],
     [ "Abdullah & Jeet, Vicious Criminals", "STR", [ "Slasher", "Striker" ], 3, 15, 7, 2, 70, 1066998, 152, 53, 41, 1452, 888, 102, 1 ],
     [ "Ben Beckman, Red Hair Pirates First Mate", "INT", [ "Cerebral", "Striker" ], 4, 20, 6, 3, 70, 1066998, 129, 120, 38, 1190, 735, 209, 1 ],
-    [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
+    [ "Ben Beckman, \"Four Emperors\" Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, 1 ],
     [ "\"Samurai\" Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
@@ -1795,11 +1795,11 @@ window.units = [
     [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3020, 1539, 390, 1 ],
     [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 151, 155, 22, 1234, 692, 101, 1 ],
     [ "Diamante, Dressrosa Current King's Family Member", "QCK", [ "Driven", "Slasher" ], 5, 30, 7, 4, 99, 4000000, 1156, 604, 69, 2401, 1487, 230, 1 ],
-    [ "Jesus Burgess, Corrida Colosseum A Block's 'Champion'", "DEX", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 209, 143, 29, 1164, 633, 120, 1 ],
+    [ "Jesus Burgess, Corrida Colosseum A Block's \"Champion\"", "DEX", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 209, 143, 29, 1164, 633, 120, 1 ],
     [ "Jesus Burgess, The Hidden Shadow within the Birdcage", "DEX", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1093, 554, 86, 2743, 1364, 238, 1 ],
-    [ "Cavendish, Corrida Colosseum D Block's 'Hakuba'", "DEX", [ "Driven", "Slasher" ], 4, 15, 5, 3, 50, 392109, 133, 153, 40, 1172, 679, 167, 1 ],
+    [ "Cavendish, Corrida Colosseum D Block's \"Hakuba\"", "DEX", [ "Driven", "Slasher" ], 4, 15, 5, 3, 50, 392109, 133, 153, 40, 1172, 679, 167, 1 ],
     [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
-    [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
+    [ "Bartolomeo, Corrida Colosseum B Block's \"Cannibal\"", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
     [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
     [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 261406, 157, 96, 22, 957, 555, 134, 1 ],
     [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, 1 ],
@@ -1814,7 +1814,7 @@ window.units = [
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 238, 82, 18, 2422, 1012, 249, 1 ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
     [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 4000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
-    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
+    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
     [ "King Riku", "INT", [ "Cerebral", "Striker" ], 3, 13, 6, 2, 50, 392109, 150, 102, 30, 720, 396, 198, 1 ],
     [ "Riku Doldo III", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 612, 354, 189, 2066, 992, 275, 1 ],
     [ "Tank Lepanto", "DEX", [ "Powerhouse", "Striker" ], 3, 15, 5, 1, 70, 1066998, 199, 112, 8, 1674, 1011, 24, 1 ],
@@ -1849,7 +1849,7 @@ window.units = [
     [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, 5, 3, 50, 261406, 210, 105, 10, 1212, 690, 48, 1 ],
     [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1014, 621, 24, 2662, 1312, 99, 1 ],
     [ "Squard, Treacherous \"Son\"", "DEX", [ "Slasher", "Driven" ], 4, 12, 6, 3, 50, 261406, 182, 92, 19, 1010, 512, 141, 1 ],
-    [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 950, 482, 81, 1992, 1098, 282, 1 ],
+    [ "Maelstrom Spider Squard, Treacherous \"Son\"", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 950, 482, 81, 1992, 1098, 282, 1 ],
     [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, 4, 1, 50, 130703, 335, 144, 25, 1044, 421, 100, null ],
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, 1, 99, 5000000, 920, 320, 69, 3064, 1390, 203, null ],
     [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, 1 ],
@@ -1862,6 +1862,10 @@ window.units = [
     [ "Raizo Colo Evolved", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2322, 1519, 372, null ],
     [ "Kinemon Neo Colo", "PSY", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kinemon Neo Colo Evolved", "PSY", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2071, 1430, 324, null ],
+    [ "Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "\"Mad Monk\" Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
+    [ "Basil Hawkins, Supernova", "QCK", [ "Slasher", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "\"The Magician\" Basil Hawkins, Supernova ", "QCK", [ "Striker", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1994,12 +1998,8 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Silvers Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, 1258, 714, 194, 1 ],
-    [ "Dark King Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, 1 ],
+    [ "Silvers Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, 1258, 714, 194, null ],
+    [ "Dark King Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From 0e0caad5ea4badb4a23098f230015e1ce1e4e3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:11:44 +0100
Subject: [PATCH 1550/1569] Formatting

---
 common/data/units.js | 163 +++++++++++++++++++++----------------------
 1 file changed, 81 insertions(+), 82 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 39f2dbcd1..33fe2cdd4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -161,7 +161,7 @@ window.units = [
     [ "Shooter Group Crew Yellow Pirates", "PSY", "Shooter", 2, 7, 5, 0, 30, 57558, 55, 15, 66, 227, 98, 219, 1 ],
     [ "Shooter Group Crew Black Pirates", "INT", "Shooter", 2, 7, 5, 0, 30, 57558, 75, 29, 58, 299, 155, 198, 1 ],
     [ "Cannoneer Skilled", "INT", "Shooter", 2, 12, 5, 0, 50, 261406, 203, 105, 3, 1350, 550, 30, 1 ],
-    [ "Bodyguard, ‘Sunglasses'", "DEX", "Shooter", 1, 4, 5, 0, 20, 8728, 115, 50, 30, 370, 180, 90, 0.7 ],
+    [ "Bodyguard, \"Sunglasses\"", "DEX", "Shooter", 1, 4, 5, 0, 20, 8728, 115, 50, 30, 370, 180, 90, 0.7 ],
     [ "Bearded Bodyguard", "QCK", "Shooter", 1, 4, 5, 0, 20, 8728, 105, 70, 25, 370, 210, 80, 0.7 ],
     [ "Knuckle Punk Black Cat Pirates", "STR", "Fighter", 2, 6, 6, 0, 25, 33626, 30, 129, 2, 267, 612, 3, 1 ],
     [ "Saber Punk Black Cat Pirates", "DEX", "Slasher", 2, 6, 5, 0, 25, 33626, 42, 120, 3, 295, 592, 5, 1 ],
@@ -716,7 +716,7 @@ window.units = [
     [ "Conis", "PSY", "Free Spirit", 3, 9, 5, 2, 35, 136167, 58, 10, 32, 503, 190, 232, 1 ],
     [ "Conis, Skypiea Girl", "PSY", "Free Spirit", 4, 15, 4, 3, 70, 1066998, 458, 145, 196, 912, 388, 387, 1 ],
     [ "Dracule Mihawk, Warlord of the Sea", "INT", "Slasher", 5, 30, 4, 4, 70, 1066998, 623, 328, 10, 1921, 850, 58, 1.5 ],
-    [ "'Hawk Eyes' Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
+    [ "\"Hawk Eyes\" Mihawk, World's Strongest Swordsman", "INT", "Slasher", 6, 55, 5, 4, 99, 5000000, 1857, 799, 31, 3900, 1490, 120, 1.5 ],
     [ "Sir Crocodile: Logia, Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 70, 1066998, 500, 293, 104, 1780, 831, 226, 1.5 ],
     [ "Sir Crocodile: Logia, Ex-Warlord of the Sea", "DEX", [ "Cerebral", "Striker" ], 6, 55, 4, 4, 99, 5000000, 1724, 765, 174, 3621, 1435, 310, 1.5 ],
     [ "Jerry", "STR", [ "Fighter", "Free Spirit" ], 3, 9, 5, 1, 35, 136167, 72, 100, 32, 492, 380, 104, 1 ],
@@ -1014,7 +1014,7 @@ window.units = [
     [ "General Hotdog", "DEX", ["Fighter","Driven"], 3, 15, 4, 1, 70, 1422664, 105, 86, 24, 1147, 890, 181, 1 ],
     [ "Tony Tony Chopper, Animal King", "PSY", ["Fighter","Powerhouse"], 4, 16, 4, 2, 70, 1422664, 63, 40, 44, 1154, 719, 280, 1 ],
     [ "Capone Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 4, 25, 4, 2, 70, 1066998, 494, 313, 80, 962, 749, 244, 1],
-    [ "Capone 'Gang' Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
+    [ "Capone \"Gang\" Bege, Captain of the Firetank Pirates", "INT", ["Shooter","Driven"], 5, 40, 6, 3, 99, 4000000, 900, 688, 197, 1903, 1361, 379, 1],
     [ "Brownbeard", "PSY", ["Slasher","Driven"], 4, 18, 6, 2, 50, 392109, 230, 101, 33, 1202, 504, 137, 1],
     [ "Brownbeard, Alligator Centaur", "PSY", ["Slasher","Powerhouse"], 5, 30, 6, 2, 99, 3000000, 1127, 444, 90, 2500, 1000, 220, 1],
     [ "Peeply Lulu Galley-La Company Dock One Foreman ", "DEX", "Slasher", 4, 20, 6, 2, 70, 1778330, 155, 93, 40, 1184, 720, 280, 1],
@@ -1039,9 +1039,9 @@ window.units = [
     [ "Inazuma Maiden of the Secret Garden", "DEX", [ "Free Spirit","Fighter" ], 3, 7, 6, 1, 35, 136167, 39, 22, 30, 797, 321, 149, 1 ],
     [ "Inazuma Maiden Planning to Change ", "DEX", [ "Free Spirit","Fighter" ], 4, 15, 4, 2, 99, 1066998, 730, 267, 100, 1209, 694, 229, 1 ],
     [ "Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 4, 25, 6, 2, 70, 1066998, 626, 252, 60, 1464, 700, 169, 1 ],
-    [ "'Diamond' Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
+    [ "\"Diamond\" Jozu Whitebeard 3rd Div. Commander", "STR", [ "Fighter", "Powerhouse" ], 5, 40, 5, 3, 99, 4000000, 1392, 640, 120, 2748, 1299, 249, 1 ],
     [ "Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 4, 25, 6, 2, 70, 1066998, 455, 310, 36, 949, 797, 113, 1 ],
-    [ "'Massacre Soldier' Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
+    [ "\"Massacre Soldier\" Killer, Kid Pirates", "DEX", [ "Striker", "Slasher" ], 5, 40, 4, 3, 99, 4000000, 887, 728, 64, 1879, 1424, 189, 1 ],
     [ "Trafalgar Law, Worst Generation", "PSY", [ "Slasher", "Free Spirit" ], 5, 30, 4, 4, 70, 1066998, 549, 341, 138, 1378, 813, 297, 1 ],
     [ "Trafalgar Law Warlord of the Sea", "PSY", [ "Slasher", "Free Spirit" ], 6, 55, 6, 5, 99, 5000000, 1302, 747, 241, 2790, 1484, 470, 1 ],
     [ "Sabo, Dragon Claw", "DEX", [ "Free Spirit", "Fighter" ], 4, 30, 5, 2, 70, 1066998, 233, 140, 34, 1296, 686, 186, 1 ],
@@ -1068,7 +1068,7 @@ window.units = [
     [ "Proficient Fighter, Kuja Warriors", "DEX", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 120, 50, 26, 1204, 668, 175, 1 ],
     [ "Nimble Fighter, Kuja Warriors", "QCK", [ "Fighter", "Powerhouse" ], 3, 10, 6, 1, 60, 674274, 128, 47, 24, 1261, 649, 170, 1 ],
     [ "Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 3, 9, 5, 2, 35, 136167, 402, 190, 65, 879, 410, 127, 1 ],
-    [ "'Pirate Executioner' Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
+    [ "\"Pirate Executioner\" Shuraiya Bascud", "DEX", [ "Fighter", "Driven" ], 4, 15, 4, 2, 70, 1066998, 812, 358, 80, 1474, 742, 188, 1 ],
     [ "Gasparde", "STR", [ "Powerhouse", "Fighter" ], 3, 12, 5, 1, 50, 392109, 129, 67, 18, 1494, 571, 101, 1 ],
     [ "Gasparde, Gasparde Pirates", "STR", [ "Powerhouse", "Striker" ], 4, 20, 5, 4, 99, 3000000, 1437, 516, 63, 2501, 1002, 198, 1 ],
     [ "Needless", "QCK", [ "Slasher", "Driven" ], 3, 14, 6, 1, 70, 1066998, 88, 120, 37, 973, 802, 223, 1 ],
@@ -1089,7 +1089,7 @@ window.units = [
     [ "Saga", "QCK", [ "Slasher", "Driven" ], 3, 16, 5, 2, 50, 392109, 143, 115, 21, 977, 551, 141, 1 ],
     [ "Saga, Cursed Holy Sword", "QCK", [ "Slasher", "Driven" ], 4, 26, 4, 3, 99, 3000000, 912, 497, 93, 1952, 1093, 220, 1 ],
     [ "X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Slasher" ], 4, 25, 5, 2, 70, 1066998, 545, 220, 52, 1353, 693, 179, 1 ],
-    [ "'Red Flag' X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
+    [ "\"Red Flag\" X Drake, Captain of the Drake Pirates", "PSY", [ "Cerebral", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1297, 631, 130, 2599, 1230, 300, 1 ],
     [ "Rebecca, Parasol Rhytm", "PSY", [ "Striker", "Free Spirit" ], 4, 10, 6, 2, 35, 90778, 59, 14, 79, 462, 130, 328, 1 ],
     [ "Rebecca, Rainbow Melody", "PSY", [ "Striker", "Free Spirit" ], 5, 17, 4, 3, 70, 1066998, 400, 93, 262, 896, 300, 505, 1 ],
     [ "Dr. Indigo", "DEX", [ "Cerebral", "Shooter" ], 3, 12, 4, 1, 50, 392109, 66, 36, 41, 965, 497, 209, 1 ],
@@ -1236,47 +1236,47 @@ window.units = [
     [ "Maynard, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 120, 140, 34, 1172, 614, 153, 1 ],
     [ "Maynard the Pursuer, Navy HQ Vice Admiral", "PSY", [ "Slasher", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1100, 549, 101, 2201, 1380, 303, 1 ],
     [ "Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 139, 123, 26, 1293, 594, 133, 1 ],
-    [ "'Shark Cutter' Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
+    [ "\"Shark Cutter\" Bastille, Navy HQ Vice Admiral", "STR", [ "Slasher", "Driven" ], 5, 30, 7, 4, 99, 4000000, 1222, 519, 83, 2606, 1313, 259, 1 ],
     [ "Kizaru, Navy HQ's Strongest Forces", "PSY", [ "Slasher", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 316, 293, 101, 1376, 841, 279, 1 ],
     [ "Borsalino", "PSY", [ "Slasher", "Shooter" ], 6, 55, 4, 4, 99, 5000000, 1321, 776, 231, 2590, 1489, 500, 1 ],
     [ "Koala, Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 3, 12, 4, 1, 50, 392109, 33, 40, 49, 764, 543, 196, 1 ],
     [ "Koala, Revolutionary Army Fishman Karate Assistant Instructor", "STR", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 700, 481, 137, 1426, 1190, 357, 1 ],
     [ "Hack, Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 3, 12, 6, 1, 50, 392109, 79, 55, 12, 904, 570, 91, 1 ],
     [ "Hack, Revolutionary Army Fishman Karate Instructor", "INT", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 849, 523, 51, 1872, 1201, 172, 1 ],
-    [ "'Straw Hat' Monkey D. Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
-    [ "'Fire Fist' Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
-    [ "'Fire Fist' Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
+    [ "\"Straw Hat\" Monkey D. Luffy, Marineford Flight ", "QCK", [ "Fighter", "Striker" ], 5, 25, 4, 3, 99, 3000000, 340, 195, 22, 1890, 1242, 309, 1 ],
+    [ "\"Fire Fist\" Portgas D. Ace, On the Execution Platform", "STR", [ "Fighter", "Shooter" ], 4, 12, 4, 0, 35, 136167, 79, 30, 2, 590, 302, 5, 1 ],
+    [ "\"Fire Fist\" Portgas D. Ace, Marineford Flight", "STR", [ "Fighter", "Shooter" ], 5, 25, 4, 3, 99, 4000000, 1403, 793, 121, 2120, 1281, 246, 1 ],
     [ "Marco, Collar Fluttering in the Autumn Breeze", "DEX", [ "Fighter", "Powerhouse" ], 4, 13, 4, 2, 50, 392109, 142, 79, 40, 940, 504, 201, 1 ],
     [ "Marco, Tipsy Kimono", "DEX", [ "Fighter", "Powerhouse" ], 5, 20, 4, 3, 99, 3000000, 870, 452, 164, 1804, 1017, 374, 1 ],
     [ "Marco, Whitebeard Pirates", "QCK", [ "Fighter", "Powerhouse" ], 4, 25, 4, 2, 70, 1066998, 740, 322, 100, 1377, 684, 187, 1 ],
     [ "Whitebeard Pirates Marco, Revival of Flame", "QCK", [ "Fighter", "Powerhouse" ], 5, 40, 4, 3, 99, 4000000, 1309, 620, 142, 2370, 1236, 335, 1 ],
-    [ "'Bohemian Knight' Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
-    [ "'Sky Rider' Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
+    [ "\"Bohemian Knight\" Doma, Subordinates of the Whitebeard Pirates", "INT", "Slasher", 4, 30, 6, 3, 99, 3000000, 201, 102, 21, 2001, 1201, 251, 1 ],
+    [ "\"Sky Rider\" Shura", "DEX", "Striker", 4, 20, 4, 2, 70, 1778330, 254, 240, 48, 1092, 1029, 179, 1 ],
     [ "Maelstrom Spider Squard, Subordinates of the Whitebeard Pirates", "QCK", [ "Striker", "Slasher" ], 4, 25, 6, 3, 99, 3000000, 96, 69, -48, 2096, 1246, 96, 1 ],
     [ "Decalvan Brothers, Subordinates of the Whitebeard Pirates", "PSY", "Fighter", 4, 25, 8, 3, 99, 3000000, 122, 52, 22, 2525, 1122, 152, 1 ],
-    [ "'Ice Witch' Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
+    [ "\"Ice Witch\" Whitey Bay, Subordinates of the Whitebeard Pirates", "DEX", [ "Slasher", "Driven" ], 4, 25, 6, 3, 99, 3000000, 81, 31, 31, 1931, 913, 301, 1 ],
     [ "Edward Newgate, Rival of the Pirate King", "PSY", [ "Powerhouse", "Striker" ], 4, 30, 4, 2, 70, 1778330, 1116, 587, 51, 1744, 894, 103, 1 ],
-    [ "'Whitebeard' Edward Newgate, Grand Pirate", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
-    [ "Donquixote Doflamingo, Pirates of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
-    [ "Donquixote Doflamingo, Darkness of the 'North Blue'", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
-    [ "Señor Pink, Pirates of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
-    [ "Señor Pink, Darkness of the 'North Blue'", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
-    [ "Vergo, Pirates of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
-    [ "Vergo, Darkness of the 'North Blue'", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
+    [ "\"Whitebeard\" Edward Newgate, Grand Pirate", "PSY", [ "Powerhouse", "Striker" ], 5, 50, 4, 3, 99, 5000000, 1597, 762, 70, 2702, 1570, 170, 1 ],
+    [ "Donquixote Doflamingo, Pirates of the \"North Blue\"", "STR", [ "Cerebral", "Driven" ], 4, 20, 4, 3, 70, 711332, 142, 109, 44, 1024, 679, 201, 1 ],
+    [ "Donquixote Doflamingo, Darkness of the \"North Blue\"", "STR", [ "Cerebral", "Driven" ], 5, 30, 4, 4, 99, 4000000, 941, 603, 152, 1997, 1418, 344, 1 ],
+    [ "Señor Pink, Pirates of the \"North Blue\"", "INT", [ "Shooter", "Free Spirit" ], 4, 20, 6, 3, 70, 711332, 277, 66, 31, 1526, 503, 174, 1 ],
+    [ "Señor Pink, Darkness of the \"North Blue\"", "INT", [ "Shooter", "Free Spirit" ], 5, 30, 4, 4, 99, 4000000, 1472, 440, 130, 3050, 990, 310, 1 ],
+    [ "Vergo, Pirates of the \"North Blue\"", "QCK", [ "Powerhouse", "Fighter" ], 4, 20, 5, 3, 70, 711332, 208, 98, 9, 1250, 559, 48, 1 ],
+    [ "Vergo, Darkness of the \"North Blue\"", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 6, 4, 99, 4000000, 1250, 559, 48, 2694, 1389, 139, 1 ],
     [ "Ace, Wasting Time Until Twilight", "STR", [ "Free Spirit", "Shooter" ], 4, 13, 6, 2, 50, 392109, 152, 90, 30, 961, 584, 174, 1 ],
     [ "Ace, Face Glowing in the Moonlight", "STR", [ "Free Spirit", "Shooter" ], 5, 20, 4, 3, 99, 3000000, 890, 541, 130, 1948, 1187, 289, 1 ],
     [ "Marshall D. Teach, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 5, 30, 4, 3, 70, 1066998, 429, 287, 39, 1674, 854, 127, 1 ],
     [ "Blackbeard, Captain of the Blackbeard Pirates", "DEX", [ "Driven", "Powerhouse" ], 6, 55, 4, 4, 99, 5000000, 1600, 789, 73, 3350, 1520, 244, 1 ],
     [ "Laffitte", "DEX", [ "Shooter", "Driven" ], 4, 15, 6, 3, 50, 392109, 109, 92, 51, 995, 506, 202, 1 ],
-    [ "'Demon Sheriff' Laffitte", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 917, 415, 152, 2094, 1132, 406, 1 ],
+    [ "\"Demon Sheriff\" Laffitte", "DEX", [ "Shooter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 917, 415, 152, 2094, 1132, 406, 1 ],
     [ "Van Augur", "QCK", [ "Shooter", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 99, 130, 48, 903, 620, 183, 1 ],
-    [ "'The Supersonic' Van Augur", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
+    [ "\"The Supersonic\" Van Augur", "QCK", [ "Shooter", "Cerebral" ], 5, 30, 6, 4, 99, 4000000, 831, 578, 140, 1890, 1371, 357, 1 ],
     [ "Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 187, 122, 1, 1520, 603, 1, 1 ],
-    [ "'Champion' Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
+    [ "\"Champion\" Jesus Burgess", "STR", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1439, 522, 1, 3870, 1368, 1, 1 ],
     [ "Shiryu", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 132, 142, -300, 1244, 689, -300, 1 ],
     [ "Shiryu of the Rain", "INT", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1168, 622, -300, 2500, 1490, -300, 1 ],
     [ "Doc Q", "PSY", [ "Slasher", "Striker" ], 4, 15, 4, 3, 50, 392109, 52, 131, 89, 703, 624, 254, 1 ],
-    [ "'Grim Reaper' Doc Q", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
+    [ "\"Grim Reaper\" Doc Q", "PSY", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, 4000000, 609, 549, 201, 1403, 1290, 491, 1 ],
     [ "John Giant", "DEX", [ "Slasher", "Driven" ], 3, 15, 6, 3, 70, 1066998, 301, 92, 59, 1794, 709, 140, 1 ],
     [ "Aokiji, Navy HQ Admiral", "PSY", [ "Slasher", "Free Spirit" ], 4, 30, 4, 3, 99, 3000000, 257, 129, 58, 2206, 1152, 227, 1 ],
     [ "Garp, Navy HQ Vice Admiral", "STR", [ "Fighter", "Powerhouse" ], 4, 30, 5, 3, 99, 3000000, 171, 64, 62, 2094, 1002, 266, 1 ],
@@ -1316,9 +1316,9 @@ window.units = [
     [ "Coby of the Grand Line, Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 103, 94, 48, 941, 511, 209, 1 ],
     [ "Coby, Student of the 'Hero of the Navy', Navy HQ Master Chief Petty Officer", "PSY", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 877, 447, 164, 2024, 1151, 414, 1 ],
     [ "Monkey D. Garp, Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, 392109, 106, 144, 29, 959, 677, 151, 1 ],
-    [ "'Garp the Fist', Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 5, 4, 99, 4000000, 901, 602, 106, 2110, 1474, 290, 1 ],
+    [ "\"Garp the Fist\", Navy HQ Vice Admiral", "STR", [ "Powerhouse", "Free Spirit" ], 5, 30, 5, 4, 99, 4000000, 901, 602, 106, 2110, 1474, 290, 1 ],
     [ "Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 4, 15, 4, 3, 50, 392109, 292, 205, 89, 902, 534, 213, 1 ],
-    [ "'Grand Staff Officer' Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
+    [ "\"Grand Staff Officer\" Tsuru, Navy HQ Vice Admiral", "QCK", [ "Cerebral", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 832, 467, 175, 1960, 1252, 419, 1 ],
     [ "Momonga, Monster Slash of the Great Commander", "DEX", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 136, 120, 35, 993, 591, 172, 1 ],
     [ "Momonga, Monster Slash of the Great Commander, Navy Vice Admiral", "DEX", [ "Cerebral", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 939, 529, 133, 2342, 1296, 330, 1 ],
     [ "Onigumo, Swordsman of the Eight-Sword Style", "INT", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 172, 136, 5, 1294, 638, 99, 1 ],
@@ -1339,7 +1339,7 @@ window.units = [
     [ "Evening Shower Kanjuro", "PSY", [ "Striker", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1209, 645, 133, 2414, 1253, 330, 1],
     [ "Tony Tony Chopper Jump Point", "DEX", [ "Fighter", "Powerhouse" ], 4, 20, 5, 2, 99, 3000000, 162, 91, 29, 2334, 892, 296, 1],
     [ "Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 4, 16, 4, 2, 50, 392109, 109, 122, 38, 753, 505, 193, 1],
-    [ "'Sky Boss' Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, 3000000, 692, 448, 142, 1443, 1220, 288, 1],
+    [ "\"Sky Boss\" Gedatsu, Skypean Priest", "QCK", [ "Driven", "Free Spirit" ], 5, 26, 4, 3, 99, 3000000, 692, 448, 142, 1443, 1220, 288, 1],
     [ "Curly Dadan", "PSY", [ "Slasher", "Powerhouse" ], 3, 12, 6, 2, 50, 392109, 144, 62, 33, 1844, 703, 151, 1],
     [ "Porchemy", "DEX", [ "Fighter", "Driven" ], 3, 13, 6, 1, 50, 392109, 125, 106, 6, 1734, 891, 34, 1],
     [ "Bluejam", "STR", [ "Shooter", "Driven" ], 3, 13, 5, 1, 70, 1066998, 131, 133, 1, 1809, 1043, 9, 1],
@@ -1378,7 +1378,7 @@ window.units = [
     [ "Marguerite, Amazon Lily Archer", "DEX", [ "Shooter", "Slasher" ], 4, 16, 5, 2, 50, 392109, 93, 72, 62, 895, 520, 206, 1 ],
     [ "Marguerite, Ambition of the Kuja Pirates", "DEX", [ "Shooter", "Slasher" ], 5, 26, 5, 3, 99, 3000000, 830, 452, 143, 1759, 974, 403, 1 ],
     [ "Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1094, 514, 126, 1674, 767, 242, 1 ],
-    [ "'Red Hair' Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
+    [ "\"Red Hair\" Shanks, Captain of the Red Hair Pirates", "INT", [ "Cerebral", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1600, 692, 200, 2552, 1440, 353, 1 ],
     [ "Tashigi, Silent Night Star", "PSY", [ "Slasher", "Cerebral" ], 4, 13, 6, 3, 50, 392109, 109, 74, 55, 802, 474, 244, 1 ],
     [ "Tashigi, Holy Night Heroine", "PSY", [ "Slasher", "Cerebral" ], 5, 20, 5, 4, 99, 3000000, 742, 416, 198, 1764, 909, 426, 1 ],
     [ "Toy Soldier", "QCK", [ "Striker", "Shooter" ], 3, 13, 5, 2, 50, 392109, 81, 72, 28, 867, 611, 186, 1 ],
@@ -1468,8 +1468,8 @@ window.units = [
     [ "Cavendish, Daydream of White Day", "PSY", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 3000000, 1003, 421, 129, 1953, 1101, 311, 1 ],
     [ "Sentomaru, Navy HQ", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 95, 45, 21, 1055, 595, 101, 1 ],
     [ "Sentomaru of the Axe, Navy HQ", "STR", [ "Striker", "Powerhouse" ], 4, 20, 6, 3, 99, 3000000, 945, 485, 95, 2170, 1150, 205, 1 ],
-    [ "Lip 'Service' Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
-    [ "'Gashed' Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
+    [ "Lip \"Service\" Doughty", "STR", [ "Slasher", "Powerhouse" ], 3, 15, 6, 1, 70, 1066998, 140, 115, 11, 1310, 850, 139, 1 ],
+    [ "\"Gashed\" Albion", "DEX", [ "Slasher", "Driven" ], 3, 15, 4, 1, 70, 1066998, 120, 110, 12, 985, 840, 198, 1 ],
     [ "Shirahoshi-hime", "PSY", "Striker", 5, 30, 4, 3, 70, 1066998, 433, 131, 60, 1296, 620, 286, 1 ],
     [ "Shirahoshi-hime, Ryugu Kingdom Princess", "PSY", "Striker", 6, 55, 4, 5, 99, 5000000, 1238, 558, 233, 2650, 1202, 560, 1 ],
     [ "Neptune", "STR", [ "Powerhouse", "Free Spirit" ], 4, 15, 5, 3, 50, 392109, 171, 149, 25, 1176, 667, 118, 1 ],
@@ -1545,13 +1545,13 @@ window.units = [
     [ "Koala, Cherry Blossom Meeting", "INT", [ "Fighter", "Free Spirit" ], 4, 13, 6, 3, 50, 392109, 87, 63, 45, 922, 521, 205, 1 ],
     [ "Koala, Cherry Blossom Mouth", "INT", [ "Fighter", "Free Spirit" ], 5, 20, 4, 4, 99, 3000000, 873, 463, 173, 1701, 1205, 358, 1 ],
     [ "Soul King", "QCK", [ "Slasher", "Free Spirit" ], 3, 13, 6, 2, 50, 392109, 100, 43, 38, 1094, 434, 182, 1 ],
-    [ "'Soul King' Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
-    [ "Long Arm Tribe of Tehna Gehna Kingdom, 'Soul King' Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
+    [ "\"Soul King\" Brook the Pirate", "QCK", [ "Slasher", "Free Spirit" ], 4, 20, 8, 4, 99, 3000000, 1043, 434, 143, 2043, 1043, 304, 1 ],
+    [ "Long Arm Tribe of Tehna Gehna Kingdom, \"Soul King\" Managers", "STR", [ "Shooter", "Driven" ], 3, 13, 6, 2, 70, 1066998, 52, 31, 40, 962, 775, 226, 1 ],
     [ "Nico Robin, Mil Fluer: Campo de Flores", "PSY", [ "Fighter", "Cerebral" ], "5+", 30, 4, 3, 99, 3000000, 979, 487, 171, 2105, 1187, 401, 1 ],
     [ "Franky, Rocket Launcher", "INT", [ "Shooter", "Free Spirit" ], "5+", 30, 4, 3, 99, 3000000, 1655, 803, 91, 2687, 1359, 244, 1 ],
     [ "Brook, Song of Scratches: Blizzard Slash", "DEX", [ "Slasher", "Free Spirit" ], "5+", 30, 6, 3, 99, 3000000, 1043, 481, 187, 2204, 1277, 351, 1 ],
-    [ "Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 4, 25, 4, 1, 70, 1066998, 551, 299, 21, 1306, 757, 139, 1 ],
-    [ "Pirate Mercenary Hajrudin, Elbaf Warriors 'New Generation'", "STR", [ "Powerhouse", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1225, 683, 89, 2840, 1381, 206, 1 ],
+    [ "Hajrudin, Elbaf Warriors \"New Generation\"", "STR", [ "Powerhouse", "Striker" ], 4, 25, 4, 1, 70, 1066998, 551, 299, 21, 1306, 757, 139, 1 ],
+    [ "Pirate Mercenary Hajrudin, Elbaf Warriors \"New Generation\"", "STR", [ "Powerhouse", "Striker" ], 5, 40, 5, 3, 99, 4000000, 1225, 683, 89, 2840, 1381, 206, 1 ],
     [ "Ryuma, Samurai General Zombie", "DEX", "Slasher", 3, 16, 6, 1, 50, 392109, 131, 111, 0, 1094, 525, 99, 1 ],
     [ "Swordsman Ryuma, Samurai General Zombie", "DEX", "Slasher", 4, 26, 6, 3, 99, 3000000, 1031, 450, 99, 2017, 1192, 244, 1 ],
     [ "Wadatsumi", "STR", [ "Powerhouse", "Fighter" ], 3, 30, 6, 2, 70, 1066998, 436, 106, 0, 3000, 801, 0, 1 ],
@@ -1561,15 +1561,15 @@ window.units = [
     [ "Daruma", "QCK", [ "Powerhouse", "Fighter" ], 3, 15, 4, 2, 70, 1066998, 70, 83, 24, 1039, 1191, 173, 1 ],
     [ "Dosun", "INT", [ "Powerhouse", "Striker" ], 3, 15, 4, 2, 70, 1066998, 101, 77, 18, 1465, 1092, 133, 1 ],
     [ "Hody Jones, Rampage", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 4, 99, 4000000, 1115, 660, 0, 3115, 1395, -150, 1 ],
-    [ "'The Fighting King' Elizabello II", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 91, 48, 19, 1021, 602, 99, 1 ],
-    [ "'The Fighting King' Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
+    [ "\"The Fighting King\" Elizabello II", "STR", [ "Fighter", "Powerhouse" ], 3, 13, 6, 2, 50, 392109, 91, 48, 19, 1021, 602, 99, 1 ],
+    [ "\"The Fighting King\" Elizabello II, Prodence Kingdom", "STR", [ "Fighter", "Powerhouse" ], 4, 20, 4, 4, 99, 3000000, 931, 495, 90, 2151, 1200, 192, 1 ],
     [ "Tactician Dagama", "DEX", [ "Driven", "Cerebral" ], 3, 13, 4, 2, 50, 392109, 101, 45, 70, 1012, 511, 160, 1 ],
     [ "Tactician Dagama, Prodence Kingdom", "DEX", [ "Driven", "Cerebral" ], 4, 20, 6, 4, 99, 3000000, 912, 451, 99, 2022, 1011, 276, 1 ],
     [ "Boa Hancock, Maiden Warrior", "QCK", [ "Free Spirit", "Fighter" ], 4, 10, 5, 3, 35, 136167, 92, 33, 83, 603, 304, 289, 1 ],
     [ "Boa Hancock, A Glimpse of a Princess", "QCK", [ "Free Spirit", "Fighter" ], 5, 18, 4, 5, 70, 1066998, 534, 255, 249, 1030, 603, 436, 1 ],
     [ "Trafalgar Law, Straw Hat • Heart Pirates Alliance", "INT", [ "Free Spirit", "Striker" ], 4, 15, 4, 4, 99, 2000000, 197, 109, 15, 2017, 1230, 245, 1 ],
     [ "Inuarashi", "STR", [ "Slasher", "Cerebral" ], 5, 30, 6, 3, 70, 1066998, 357, 247, 34, 1291, 829, 210, 1 ],
-    [ "'King of the Day' Inuarashi", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, 1 ],
+    [ "\"King of the Day\" Inuarashi", "STR", [ "Slasher", "Cerebral" ], 6, 55, 4, 5, 99, 5000000, 1220, 754, 153, 2978, 1535, 389, 1 ],
     [ "Wanda", "QCK", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 135, 103, 38, 1019, 547, 213, 1 ],
     [ "Ruler's Aide Wanda", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 938, 470, 167, 2177, 1243, 367, 1 ],
     [ "Sicilian", "INT", [ "Slasher", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 142, 155, 19, 1202, 658, 127, 1 ],
@@ -1590,7 +1590,7 @@ window.units = [
     [ "Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 4, 15, 6, 3, 50, 392109, 143, 144, 29, 1152, 626, 206, 1 ],
     [ "Red Hair Shanks, Celebrate the Long Cruise", "QCK", [ "Cerebral", "Slasher" ], 5, 30, 5, 5, 99, 4000000, 1076, 548, 145, 2326, 1323, 362, 1 ],
     [ "Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 141, 121, 36, 1134, 589, 233, 1 ],
-    [ "'Empress' Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
+    [ "\"Empress\" Boa Hancock, Celebrate the Long Cruise", "INT", [ "Fighter", "Free Spirit" ], 5, 30, 7, 5, 99, 4000000, 1087, 529, 187, 2195, 1289, 401, 1 ],
     [ "Monkey D. Luffy, Gear 4th - Boundman", "PSY", [ "Fighter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1402, 777, 177, 3380, 1600, 400, 1 ],
     [ "Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 4, 30, 6, 2, 70, 1066998, 303, 165, 29, 1344, 700, 144, 1 ],
     [ "Gravity Blade Fujitora, Navy HQ Greatest Military Power", "PSY", [ "Powerhouse", "Slasher" ], 5, 50, 4, 3, 99, 5000000, 1268, 634, 109, 2825, 1420, 254, 1 ],
@@ -1602,8 +1602,8 @@ window.units = [
     [ "Shiryu, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 4, 25, 6, 3, 70, 1066998, 444, 444, -300, 1099, 750, -300, 1 ],
     [ "Shiryu of the Rain, Blackbeard Pirates", "INT", [ "Slasher", "Driven" ], 5, 40, 5, 5, 99, 4000000, 1020, 670, -300, 3000, 1505, -300, 1 ],
     [ "Thunder Lord McGuy", "STR", [ "Slasher", "Cerebral" ], 4, 26, 6, 3, 99, 3000000, 151, 90, 98, 1760, 1190, 257, 1 ],
-    [ "Portgas D. Ace, Luffy's 'Brother'", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, 261406, 50, 30, 10, 950, 500, 150, 1 ],
-    [ "Portgas D. Ace, Whitebeard's 'Son'", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, 2000000, 880, 410, 110, 1850, 1090, 260, 1 ],
+    [ "Portgas D. Ace, Luffy's \"Brother\"", "STR", [ "Free Spirit", "Shooter" ], 3, 8, 5, 2, 50, 261406, 50, 30, 10, 950, 500, 150, 1 ],
+    [ "Portgas D. Ace, Whitebeard's \"Son\"", "STR", [ "Free Spirit", "Shooter" ], 4, 15, 4, 3, 99, 2000000, 880, 410, 110, 1850, 1090, 260, 1 ],
     [ "Laffitte, Blackbeard Pirates", "PSY", [ "Shooter", "Cerebral" ], 4, 25, 7, 4, 99, 3000000, 93, 49, 29, 2044, 949, 323, 1 ],
     [ "Van Augur, BlackBeard Pirates", "DEX", [ "Shooter", "Driven" ], 4, 25, 5, 4, 99, 3000000, 87, 55, 22, 2006, 1050, 280, 1 ],
     [ "Doc Q, BlackBeard Pirates", "INT", [ "Free Spirit", "Shooter" ], 4, 25, 4, 4, 99, 3000000, 51, 59, 31, 1502, 1138, 340, 1 ],
@@ -1617,7 +1617,7 @@ window.units = [
     [ "Mr. 0, Clash of the Great Pirate Era [Utopia]", "INT", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1131, 540, 59, 2760, 1457, 197, 1 ],
     [ "Gecko Moria, Endless Dreams of Arch Enemies", "STR", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 190, 150, 0, 1390, 699, 0, 1 ],
     [ "Gecko Moria, Clash of the Great Pirate Era [The Strongest Crew]", "STR", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1328, 620, 0, 3002, 1501, 0, 1 ],
-    [ "'Dark King' Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 5, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, 1 ],
+    [ "\"Dark King\" Silvers Rayleigh, Right Hand of the Pirate King", "INT", [ "Slasher", "Fighter" ], "6+", 65, 5, 4, 99, 5000000, 1500, 800, 300, 3121, 1472, 515, 1 ],
     [ "Eustass Kid, Wakes of an Endless Dream, Kid Pirates", "STR", [ "Striker", "Driven" ], 4, 20, 4, 3, 70, 1066998, 281, 190, 30, 1424, 690, 151, 1 ],
     [ "Eustass Kid, A Vow in the Great Age of Pirates - Pirate King", "STR", [ "Striker", "Driven" ], 5, 30, 5, 4, 99, 4000000, 1339, 620, 109, 2795, 1324, 287, 1 ],
     [ "Donquixote Doflamingo [Neo]", "INT", [ "Slasher", "Driven" ], 4, 30, 4, 2, 70, 1066998, 184, 191, 31, 1030, 794, 149, 1 ],
@@ -1650,7 +1650,7 @@ window.units = [
     [ "Giolla, Trebol Army", "STR", [ "Shooter", "Free Spirit" ], 4, 20, 4, 4, 99, 3000000, 653, 456, 157, 2040, 936, 298, 1 ],
     [ "Brook, Psychedelic Arts", "DEX", [ "Slasher", "Free Spirit" ], 4, 20, 6, 4, 99, 3000000, 203, 130, 29, 1830, 1140, 265, 1 ],
     [ "Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 5, 30, 7, 3, 70, 1066998, 475, 167, 38, 1593, 666, 189, 1 ],
-    [ "'King of the Night' Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, 1 ],
+    [ "\"King of the Night\" Nekomamushi", "PSY", [ "Striker", "Powerhouse" ], 6, 55, 4, 5, 99, 5000000, 1509, 613, 132, 3404, 1451, 352, 1 ],
     [ "Pedro", "INT", [ "Slasher", "Cerebral" ], 4, 15, 5, 3, 50, 392109, 110, 148, 58, 957, 620, 213, 1 ],
     [ "Pedro of the Treetops", "INT", [ "Slasher", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 878, 544, 162, 2009, 1438, 325, 1 ],
     [ "Carrot", "QCK", [ "Fighter", "Free Spirit" ], 4, 15, 6, 3, 50, 392109, 113, 99, 60, 1006, 539, 220, 1 ],
@@ -1661,7 +1661,7 @@ window.units = [
     [ "Raizo of the Mist", "STR", [ "Shooter", "Free Spirit" ], 5, 30, 8, 4, 99, 4000000, 1067, 526, 110, 2353, 1363, 290, 1 ],
     [ "Corazon, Wish to Remove the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 225, 111, 60, 1167, 465, 187, 1 ],
     [ "Corazon, Silencing the Rain", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1076, 411, 178, 2511, 1022, 320, 1 ],
-    [ "Rob Lucci \"Life Return,\" CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], '6+', 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, 1 ],
+    [ "Rob Lucci \"Life Return\", CP9's Strongest", "STR", [ "Powerhouse", "Fighter" ], "6+", 65, 4, 4, 99, 5000000, 1704, 790, 230, 3480, 1570, 390, 1 ],
     [ "Aokiji, \"One-on-One Fight\" Opponent", "STR", [ "Shooter", "Slasher" ], 4, 20, 7, 3, 70, 1066998, 126, 130, 49, 1220, 724, 195, 1 ],
     [ "Aokiji, \"One-on-One Fight\" Winner", "STR", [ "Shooter", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1174, 655, 155, 2364, 1406, 336, 1 ],
     [ "Kyros, Undefeated Gladiator", "QCK", [ "Powerhouse", "Striker" ], 4, 25, 4, 3, 70, 1066998, 245, 178, 34, 1320, 701, 177, 1 ],
@@ -1692,20 +1692,20 @@ window.units = [
     [ "Heat", "STR", [ "Shooter", "Driven" ], 3, 15, 4, 3, 70, 1066998, 133, 66, 45, 1201, 955, 122, 1 ],
     [ "Wire", "DEX", [ "Striker", "Driven" ], 3, 15, 6, 3, 70, 1066998, 145, 55, 41, 1449, 896, 101, 1 ],
     [ "Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 4, 25, 6, 3, 70, 1066998, 545, 303, 36, 1241, 751, 190, 1 ],
-    [ "'Ruler of Day' Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, 1 ],
+    [ "\"Ruler of Day\" Inuarashi, Mokomo Dukedom", "PSY", [ "Slasher", "Cerebral" ], 5, 40, 4, 5, 99, 4000000, 1188, 688, 148, 2330, 1405, 301, 1 ],
     [ "Demon Bamboo Vergo", "DEX", [ "Fighter", "Striker" ], 4, 30, 4, 1, 70, 1066998, 280, 158, 34, 1253, 697, 152, 1 ],
     [ "Demon Bamboo Vergo, Donquiote Family Senior Executive", "DEX", [ "Fighter", "Striker" ], 5, 50, 5, 2, 99, 5000000, 1016, 626, 108, 2265, 1402, 245, 1 ],
     [ "Magellan, Prison Ruler", "DEX", [ "Striker", "Shooter" ], 5, 30, 6, 3, 70, 1066998, 480, 220, 24, 1552, 755, 145, 1 ],
     [ "Magellan, Hell's Ruler", "DEX", [ "Striker", "Shooter" ], 6, 55, 5, 5, 99, 5000000, 1470, 700, 99, 3527, 1499, 291, 1 ],
-    [ "Jinbe, 'Eternal Hell' Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 156, 137, 30, 1120, 674, 196, 1 ],
+    [ "Jinbe, \"Eternal Hell\" Prisoner", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 156, 137, 30, 1120, 674, 196, 1 ],
     [ "Jinbe, Hell's Warlord of the Sea", "PSY", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1056, 620, 132, 2188, 1392, 320, 1 ],
-    [ "Emporio Ivankov, 'Newkama Land' Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, 1 ],
+    [ "Emporio Ivankov, \"Newkama Land\" Prisoner", "QCK", [ "Free Spirit", "Cerebral" ], 4, 15, 6, 3, 50, 392109, 166, 110, 37, 1200, 634, 208, 1 ],
     [ "Emporio Ivankov, Hell's Revolutionary Army Officer", "QCK", [ "Free Spirit", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 1148, 550, 176, 2389, 1244, 340, 1 ],
     [ "Hannyabal, Ruler's Confidant", "INT", [ "Driven", "Striker" ], 4, 15, 6, 3, 50, 392109, 198, 125, 20, 1340, 669, 101, 1 ],
     [ "Hannyabal, Now the Ruler's Trusted Retainer", "INT", [ "Driven", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1277, 589, 57, 2910, 1309, 221, 1 ],
-    [ "Mr. 2 Bon Clay, 'Starvation Hell' Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, 6, 3, 50, 392109, 172, 98, 40, 1210, 596, 212, 1 ],
+    [ "Mr. 2 Bon Clay, \"Starvation Hell\" Prisoner", "STR", [ "Free Spirit", "Fighter" ], 4, 15, 6, 3, 50, 392109, 172, 98, 40, 1210, 596, 212, 1 ],
     [ "Mr. 2 Bon Clay, A Friend in Hell", "STR", [ "Free Spirit", "Fighter" ], 5, 30, 7, 4, 99, 4000000, 1145, 542, 170, 2402, 1202, 355, 1 ],
-    [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], '6+', 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, 1 ],
+    [ "Red Hair Shanks, Four Emperors", "PSY", [ "Slasher", "Cerebral" ], "6+", 65, 5, 5, 99, 5000000, 1574, 752, 277, 3204, 1510, 464, 1 ],
     [ "Nami, Midsummer Heartbeat", "QCK", [ "Cerebral", "Fighter" ], 4, 12, 6, 2, 50, 261406, 72, 72, 72, 906, 402, 196, 1 ],
     [ "Nami, Midsummer Excitement", "QCK", [ "Cerebral", "Striker" ], 5, 20, 4, 3, 99, 3000000, 832, 334, 142, 1903, 940, 386, 1 ],
     [ "Nico Robin, Healthful Beauty", "PSY", [ "Fighter", "Cerebral" ], 4, 12, 5, 2, 50, 261406, 72, 72, 72, 920, 417, 179, 1 ],
@@ -1719,7 +1719,7 @@ window.units = [
     [ "Buffalo, Donquixote Pirates' Combatant", "DEX", [ "Free Spirit", "Driven" ], 4, 20, 8, 2, 70, 1066998, 191, 81, 55, 1731, 755, 220, 1 ],
     [ "Baby 5, Donquixote Pirates' Servant and Assassin", "PSY", [ "Shooter", "Slasher" ], 4, 20, 8, 2, 70, 1066998, 154, 111, 47, 1239, 1161, 171, 1 ],
     [ "Jinbe", "QCK", [ "Striker", "Fighter" ], 4, 20, 6, 3, 70, 1066998, 158, 113, 39, 1284, 698, 178, 1 ],
-    [ "'Boss' Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
+    [ "\"Boss\" Jinbe, Ryugu Kingdom Neptune's Soldier", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1220, 614, 132, 2594, 1330, 320, 1 ],
     [ "Sea God Neptune", "PSY", [ "Striker", "Cerebral" ], 3, 13, 6, 2, 50, 392109, 159, 56, 51, 611, 498, 189, 1 ],
     [ "Sea God Neptune, King of Ryugu Kingdom", "PSY", [ "Striker", "Cerebral" ], 4, 20, 4, 3, 99, 3000000, 598, 445, 175, 1737, 1011, 324, 1 ],
     [ "Fukaboshi, Neptune Family Three Brothers - The First Son", "QCK", [ "Striker", "Powerhouse" ], 3, 13, 6, 2, 50, 392019, 166, 52, 44, 655, 588, 164, 1 ],
@@ -1731,7 +1731,7 @@ window.units = [
     [ "Nefeltari Vivi, Dazzling Pure White", "INT", [ "Free Spirit", "Striker" ], 4, 20, 4, 3, 70, 1066998, 130, 73, 51, 957, 484, 214, 1 ],
     [ "Nefeltari Vivi, Alluring Sensation", "INT", [ "Free Spirit", "Striker" ], 5, 30, 5, 4, 99, 4000000, 889, 403, 157, 1990, 996, 445, 1 ],
     [ "Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 4, 25, 6, 3, 70, 1066998, 563, 292, 38, 1285, 747, 205, 1 ],
-    [ "'Ruler of Night' Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1200, 678, 149, 2440, 1375, 315, 1 ],
+    [ "\"Ruler of Night\" Nekomamushi, Guardian of the Whale Forest", "STR", [ "Striker", "Powerhouse" ], 5, 40, 4, 5, 99, 4000000, 1200, 678, 149, 2440, 1375, 315, 1 ],
     [ "Sugar, Hobby Hobby Fruit Ability User", "STR", [ "Cerebral", "Fighter" ], 3, 13, 4, 2, 50, 392109, 150, 102, 30, 646, 367, 220, 1 ],
     [ "Sugar, Trebol Army Special Executive", "STR", [ "Cerebral", "Fighter" ], 4, 20, 4, 3, 99, 3000000, 597, 311, 203, 1830, 975, 320, 1 ],
     [ "Trebol, Sticky Sticky Fruit Ability User", "INT", [ "Cerebral", "Driven" ], 3, 13, 5, 2, 50, 392109, 230, 156, 9, 1020, 519, 107, 1 ],
@@ -1748,8 +1748,8 @@ window.units = [
     [ "Boa Hancock, Strawhat Luffy's Accomplice", "PSY", [ "Shooter", "Free Spirit" ], 6, 55, 4, 5, 99, 5000000, 1265, 734, 230, 2795, 1430, 478, 1 ],
     [ "Bepo, Strawhat Luffy's Cooperator", "QCK", [ "Fighter", "Powerhouse" ], 4, 15, 5, 3, 50, 392109, 169, 108, 33, 1100, 501, 191, 1 ],
     [ "Bepo, Strawhat Luffy's Accomplice", "QCK", [ "Fighter", "Powerhouse" ], 5, 30, 4, 4, 99, 4000000, 1054, 446, 151, 2357, 1129, 384, 1 ],
-    [ "'Surgeon of Death' Trafalgar Law, Search for 'Joker'", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, 1 ],
-    [ "'Warlord of the Sea' Trafalgar Law, Aim for 'Joker'", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, 1 ],
+    [ "\"Surgeon of Death\" Trafalgar Law, Search for \"Joker\"", "QCK", [ "Striker", "Slasher" ], 5, 30, 4, 3, 70, 1066998, 429, 232, 49, 1560, 775, 202, 1 ],
+    [ "\"Warlord of the Sea\" Trafalgar Law, Aim for \"Joker\"", "QCK", [ "Striker", "Slasher" ], 6, 55, 4, 5, 99, 5000000, 1482, 703, 152, 3003, 1502, 401, 1 ],
     [ "Roronoa Zoro, Celebrate 20th Anniversary Cruise", "INT", [ "Slasher", "Driven" ], 4, 15, 6, 3, 50, 392109, 669, 404, 32, 1240, 710, 159, 1 ],
     [ "Roronoa Zoro, 20th Anniversary Memorial Treasure", "INT", [ "Slasher", "Driven" ], 5, 30, 4, 5, 99, 4000000, 1043, 554, 94, 2503, 1400, 269, 1 ],
     [ "Sanji, Celebrate 20th Anniversary Cruise", "PSY", [ "Fighter", "Powerhouse" ], 4, 15, 6, 3, 50, 392109, 650, 394, 41, 1230, 698, 200, 1 ],
@@ -1762,19 +1762,19 @@ window.units = [
     [ "Tony Tony Chopper, 20th Anniversary Memorial Treasure", "DEX", [ "Fighter", "Cerebral" ], 5, 30, 4, 5, 99, 4000000, 1023, 474, 187, 2330, 1258, 351, 1 ],
     [ "Rob Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 5, 30, 4, 3, 70, 1066998, 398, 231, 33, 1358, 769, 197, 1 ],
     [ "Human Beast Lucci, World Government Monster", "QCK", [ "Powerhouse", "Shooter" ], 6, 55, 4, 5, 99, 5000000, 1287, 722, 141, 3205, 1540, 323, 1 ],
-    [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], '6+', 65, 4, 4, 99, 5000000, 1558, 751, 198, 3478, 1501, 420, 1 ],
+    [ "Kuzan, Former Navy HQ Greatest Military Power", "QCK", [ "Shooter", "Striker" ], "6+", 65, 4, 4, 99, 5000000, 1558, 751, 198, 3478, 1501, 420, 1 ],
     [ "Longleg Blue Gilly", "DEX", [ "Fighter", "Free Spirit" ], 3, 13, 6, 1, 50, 392109, 120, 98, 17, 1110, 585, 90, 1 ],
     [ "Longleg Blue Gilly, Jao Kun Do Martial Artist", "DEX", [ "Fighter", "Free Spirit" ], 4, 20, 4, 3, 99, 3000000, 972, 480, 88, 2208, 1185, 187, 1 ],
     [ "Assassin Funk Brothers", "QCK", [ "Fighter", "Driven" ], 3, 15, 5, 2, 70, 1066998, 134, 68, 43, 1204, 964, 118, 1 ],
     [ "Abdullah & Jeet, Vicious Criminals", "STR", [ "Slasher", "Striker" ], 3, 15, 7, 2, 70, 1066998, 152, 53, 41, 1452, 888, 102, 1 ],
     [ "Ben Beckman, Red Hair Pirates First Mate", "INT", [ "Cerebral", "Striker" ], 4, 20, 6, 3, 70, 1066998, 129, 120, 38, 1190, 735, 209, 1 ],
-    [ "Ben Beckman, 'Four Emperors' Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
+    [ "Ben Beckman, \"Four Emperors\" Red Hair's Right Hand Man", "INT", [ "Cerebral", "Striker" ], 5, 30, 4, 4, 99, 4000000, 1126, 672, 136, 2295, 1384, 367, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo]", "INT", [ "Cerebral", "Powerhouse" ], 4, 30, 4, 2, 70, 1066998, 258, 171, 90, 1189, 629, 190, 1 ],
     [ "Tyrant Bartholomew Kuma [Neo], Government Human Weapon", "INT", [ "Cerebral", "Powerhouse" ], 5, 50, 7, 4, 99, 5000000, 1147, 578, 190, 3070, 1445, 90, 1 ],
-    [ "'Samurai' Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
-    [ "'Samurai' Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
-    [ "'Samurai' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
-    [ "'Dragon' Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
+    [ "\"Samurai\" Kinemon", "INT", [ "Free Spirit", "Slasher" ], 3, 13, 6, 2, 50, 392109, 184, 106, 24, 990, 621, 78, 1 ],
+    [ "\"Samurai\" Foxfire Kinemon", "INT", [ "Free Spirit", "Slasher" ], 4, 20, 4, 3, 99, 3000000, 890, 560, 65, 2058, 1245, 192, 1 ],
+    [ "\"Samurai\" Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 3, 9, 5, 2, 35, 136167, 54, 45, 6, 622, 427, 80, 1 ],
+    [ "\"Dragon\" Momonosuke", "QCK", [ "Free Spirit", "Striker" ], 4, 15, 4, 3, 70, 1066998, 646, 259, 80, 1596, 747, 160, 1 ],
     [ "Kizaru, Emissary of the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 4, 20, 5, 3, 70, 1066998, 160, 114, 38, 1292, 700, 177, 1 ],
     [ "Kizaru, A Visit from the Holy Land", "QCK", [ "Free Spirit", "Shooter" ], 5, 30, 7, 4, 99, 4000000, 1230, 1342, 315, 2613, 1342, 315, 1 ],
     [ "Kizaru [Neo]", "DEX", [ "Fighter", "Shooter" ], 4, 30, 4, 2, 70, 1066998, 217, 171, 37, 1221, 746, 162, 1 ],
@@ -1795,11 +1795,11 @@ window.units = [
     [ "Lucy, Corrida Colosseum Champion", "STR", [ "Striker", "Fighter" ], 6, 55, 4, 5, 99, 5000000, 1306, 720, 194, 3020, 1539, 390, 1 ],
     [ "Mr. Diamante, Hero of the Corrida Colosseum", "QCK", [ "Driven", "Slasher" ], 4, 15, 6, 3, 50, 392109, 151, 155, 22, 1234, 692, 101, 1 ],
     [ "Diamante, Dressrosa Current King's Family Member", "QCK", [ "Driven", "Slasher" ], 5, 30, 7, 4, 99, 4000000, 1156, 604, 69, 2401, 1487, 230, 1 ],
-    [ "Jesus Burgess, Corrida Colosseum A Block's 'Champion'", "DEX", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 209, 143, 29, 1164, 633, 120, 1 ],
+    [ "Jesus Burgess, Corrida Colosseum A Block's \"Champion\"", "DEX", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 209, 143, 29, 1164, 633, 120, 1 ],
     [ "Jesus Burgess, The Hidden Shadow within the Birdcage", "DEX", [ "Fighter", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1093, 554, 86, 2743, 1364, 238, 1 ],
-    [ "Cavendish, Corrida Colosseum D Block's 'Hakuba'", "DEX", [ "Driven", "Slasher" ], 4, 15, 5, 3, 50, 392109, 133, 153, 40, 1172, 679, 167, 1 ],
+    [ "Cavendish, Corrida Colosseum D Block's \"Hakuba\"", "DEX", [ "Driven", "Slasher" ], 4, 15, 5, 3, 50, 392109, 133, 153, 40, 1172, 679, 167, 1 ],
     [ "Cavendish, The Rebel within the Birdcage", "DEX", [ "Driven", "Slasher" ], 5, 30, 4, 4, 99, 4000000, 1099, 622, 132, 2046, 1466, 314, 1 ],
-    [ "Bartolomeo, Corrida Colosseum B Block's 'Cannibal'", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
+    [ "Bartolomeo, Corrida Colosseum B Block's \"Cannibal\"", "QCK", [ "Fighter", "Driven" ], 4, 15, 5, 3, 50, 392109, 226, 115, 31, 1305, 546, 139, 1 ],
     [ "Bartolomeo, The Rebel within the Birdcage", "QCK", [ "Striker", "Driven" ], 5, 30, 4, 4, 99, 4000000, 1221, 487, 99, 2789, 1289, 251, 1 ],
     [ "Roronoa Zoro, East Blue Pirate", "DEX", [ "Slasher", "Driven" ], 4, 12, 5, 3, 50, 261406, 157, 96, 22, 957, 555, 134, 1 ],
     [ "Roronoa Zoro, East Blue Swordsman", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 886, 478, 79, 2014, 1111, 270, 1 ],
@@ -1814,7 +1814,7 @@ window.units = [
     [ "Koala, Revolutionary Army's Secret Task Force", "PSY", [ "Fighter", "Free Spirit" ], 4, 15, 4, 4, 99, 2000000, 238, 82, 18, 2422, 1012, 249, 1 ],
     [ "Vinsmoke Sanji", "STR", [ "Powerhouse", "Fighter" ], 4, 30, 4, 2, 70, 1066998, 225, 176, 37, 1194, 749, 198, 1 ],
     [ "Vinsmoke Sanji, Germa Kingdom", "STR", [ "Powerhouse", "Fighter" ], 5, 50, 4, 3, 99, 4000000, 1099, 677, 157, 2267, 1468, 346, 1 ],
-    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], '6+', 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
+    [ "Portgas D. Ace, The Sun that will Destroy the Darkness", "DEX", [ "Shooter", "Free Spirit" ], "6+", 65, 4, 5, 99, 5000000, 1911, 711, 215, 3922, 1466, 358, 1 ],
     [ "King Riku", "INT", [ "Cerebral", "Striker" ], 3, 13, 6, 2, 50, 392109, 150, 102, 30, 720, 396, 198, 1 ],
     [ "Riku Doldo III", "INT", [ "Cerebral", "Striker" ], 4, 20, 4, 3, 99, 3000000, 612, 354, 189, 2066, 992, 275, 1 ],
     [ "Tank Lepanto", "DEX", [ "Powerhouse", "Striker" ], 3, 15, 5, 1, 70, 1066998, 199, 112, 8, 1674, 1011, 24, 1 ],
@@ -1831,7 +1831,7 @@ window.units = [
     [ "Master Caesar, Ruler of the Atmosphere", "INT", [ "Cerebral", "Driven" ], 5, 50, 4, 2, 99, 5000000, 848, 735, 162, 1811, 1404, 324, 1 ],
     [ "Vinsmoke Judge", "PSY", [ "Powerhouse", "Driven" ], 5, 30, 5, 3, 70, 1066998, 808, 177, 12, 1906, 782, 162, 1 ],
     [ "Vinsmoke Judge, Germa 66 Science Combat Force", "PSY", [ "Powerhouse", "Driven" ], 6, 55, 5, 5, 99, 5000000, 1602, 740, 138, 4212, 1510, 201, 1 ],
-    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 202, 76, 41, null, null, null, 1 ],
+    [ "Vinsmoke Reiju", "INT", [ "Powerhouse", "Cerebral" ], 4, 15, 4, 3, 50, 392109, 202, 76, 41, 920, 434, 252, 1 ],
     [ "Vinsmoke Reiju, Germa 66 Science Combat Force", "INT", [ "Powerhouse", "Cerebral" ], 5, 30, 4, 4, 99, 4000000, 822, 336, 201, 1984, 1312, 432, 1 ],
     [ "Vinsmoke Ichiji", "STR", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 268, 82, 28, 1346, 647, 110, 1 ],
     [ "Vinsmoke Ichiji, Germa 66 Science Combat Force", "STR", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1120, 544, 82, 2912, 1421, 241, 1 ],
@@ -1839,34 +1839,33 @@ window.units = [
     [ "Vinsmoke Niji, Germa 66 Science Combat Force", "QCK", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 1112, 500, 98, 2834, 1382, 267, 1 ],
     [ "Vinsmoke Yonji", "DEX", [ "Powerhouse", "Fighter" ], 4, 15, 6, 3, 50, 392109, 218, 77, 38, 1128, 492, 198, 1 ],
     [ "Vinsmoke Yonji, Germa 66 Science Combat Force", "DEX", [ "Powerhouse", "Fighter" ], 5, 30, 4, 4, 99, 4000000, 982, 403, 152, 2406, 1341, 352, 1 ],
-    [ "Caribou", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, 1 ],
-    [ "Caribou, Evolved", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, 1598, 1402, -300, 1 ],
-    [ "Coribou", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, 1 ],
-    [ "Coribou, Evolved", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, 1806, 879, 356, 1 ],
+    [ "Caribou, Next Generation Supernova", "DEX", [ "Driven", "Striker" ], 3, 13, 4, 2, 50, 392109, 296, 392, 0, 740, 980, 0, 1 ],
+    [ "Wet Haired Caribou, Next Generation Supernova", "DEX", [ "Driven", "Shooter" ], 4, 20, 6, 3, 99, 3000000, 723, 921, -300, 1598, 1402, -300, 1 ],
+    [ "Coribou, Next Generation Supernova", "STR", [ "Driven", "Striker" ], 3, 13, 6, 2, 50, 392109, 130, 102, 26, 534, 489, 198, 1 ],
+    [ "Blood-Splatterer Coribou, Next Generation Supernova", "STR", [ "Driven", "Striker" ], 4, 20, 4, 3, 99, 3000000, 520, 430, 178, 1806, 879, 356, 1 ],
     [ "Garp, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 4, 30, 4, 2, 70, 1778330, 1015, 494, 0, 1852, 688, 5, 1 ],
     [ "Garp the Fist, Hero of the Marines", "STR", [ "Fighter", "Free Spirit" ], 5, 50, 4, 3, 99, 5000000, 1773, 611, 3, 3750, 1550, 10, 1 ],
     [ "Sengoku the Buddha, Marine Fleet Admiral", "INT", [ "Fighter", "Cerebral" ], "6+", 54, 4, 5, 99, 5000000, 1998, 729, 194, 3696, 1458, 398, 1 ],
-    [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
-    [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 2662, 1312, 99, null ],
-    [ "Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 4, 12, null, 3, 50, 261406, null, null, null, null, null, null, null ],
-    [ "Maelstrom Spider Squard, Treacherous 'Son'", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1, 1, 1, 1992, 1098, 282, null ],
-    [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, 4, 1, 50, 130703, null, null, null, 1044, 421, 100, null ],
+    [ "Akainu, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 4, 12, 5, 3, 50, 261406, 210, 105, 10, 1212, 690, 48, 1 ],
+    [ "Sakazuki, Trembling Calamity", "STR", [ "Powerhouse", "Driven" ], 5, 20, 4, 4, 99, 2000000, 1014, 621, 24, 2662, 1312, 99, 1 ],
+    [ "Squard, Treacherous \"Son\"", "DEX", [ "Slasher", "Driven" ], 4, 12, 6, 3, 50, 261406, 182, 92, 19, 1010, 512, 141, 1 ],
+    [ "Maelstrom Spider Squard, Treacherous \"Son\"", "DEX", [ "Slasher", "Driven" ], 5, 20, 4, 4, 99, 2000000, 950, 482, 81, 1992, 1098, 282, 1 ],
+    [ "Adventure Mode Whitebeard", "INT", [ "Powerhouse", "Striker" ], 4, 30, 4, 1, 50, 130703, 335, 144, 25, 1044, 421, 100, null ],
     [ "Adventure Mode Whitebeard, Evolved", "INT", [ "Powerhouse", "Striker" ], 5, 60, 4, 1, 99, 5000000, 920, 320, 69, 3064, 1390, 203, null ],
-    [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, null ],
-    [ "'Roar of the Sea' Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, null, null, null, null, 2136, 1211, 221, null ],
-    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, 1674, 611, 50, null ],
-    [ "'Red Flag' X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, null, 1472, 567, 30, 2978, 1267, 50, null ],
+    [ "Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Shooter" ], 3, 13, 3, 6, 50, 130703, 141, 69, 27, 1134, 622, 109, 1 ],
+    [ "\"Roar of the Sea\" Scracthmen Apoo, Supernova", "STR", [ "Free Spirit", "Slasher" ], 4, 20, 4, 4, 99, 1000000, 1067, 534, 95, 2136, 1211, 221, 1 ],
+    [ "X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 3, 13, 3, 6, 50, 130703, 199, 112, 10, 1674, 611, 50, 1 ],
+    [ "\"Red Flag\" X Drake, Supernova", "PSY", [ "Powerhouse", "Cerebral" ], 4, 20, 5, 4, 99, 1000000, 1472, 567, 30, 2978, 1267, 50, 1 ],
     [ "Leo", "INT", [ "Striker", "Powerhouse" ], 4, 20, null, null, 70, 1066998, null, null, null, null, null, null, null ],
     [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
-    [ "Warrior Leo, Courageous Dwarf", "INT", [ "Striker", "Powerhouse" ], 5, 30, 4, 5, 99, 4000000, 1, 1, 1, 2233, 1422, 354, null ],
     [ "Raizo Colo", "QCK", [ "Shooter", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Raizo Colo Evolved", "QCK", [ "Shooter", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2322, 1519, 372, null ],
     [ "Kinemon Neo Colo", "PSY", [ "Slasher", "Free Spirit" ], 4, 25, null, null, null, null, null, null, null, null, null, null, null ],
     [ "Kinemon Neo Colo Evolved", "PSY", [ "Slasher", "Free Spirit" ], 5, 40, 4, 5, 99, 4000000, 1, 1, 1, 2071, 1430, 324, null ],
     [ "Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'Mad Monk' Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
+    [ "\"Mad Monk\" Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
     [ "Basil Hawkins, Supernova", "QCK", [ "Slasher", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "'The Magician' Basil Hawkins, Supernova ", "QCK", [ "Striker", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
+    [ "\"The Magician\" Basil Hawkins, Supernova ", "QCK", [ "Striker", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
@@ -1999,8 +1998,8 @@ window.units = [
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Silvers Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, 1258, 714, 194, 1 ],
-    [ "Dark King Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, 1 ],
+    [ "Silvers Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 4, 30, 6, 1, 70, 1066998, 224, 151, 40, 1258, 714, 194, null ],
+    [ "Dark King Rayleigh, First Mate of the Roger Pirates", "STR", [ "Slasher", "Cerebral" ], 5, 50, 5, 3, 99, 5000000, 1190, 650, 143, 2510, 1315, 353, null ],
     ];
     
 // [ "Name", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c20c13684aba81b492798077f78b3af5c655b16f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:13:46 +0100
Subject: [PATCH 1551/1569] Formating

---
 common/data/details.js | 2813 ++++++++++++++--------------------------
 1 file changed, 986 insertions(+), 1827 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index c6f1c54e0..2bfa176b9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -32,7 +32,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -54,7 +54,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 3 turns",
                     "Level 5: Reduces No Healing duration by 4 turns"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -77,45 +77,7 @@ window.details = {
         special: "Deals 15x character's ATK in DEX damage to all enemies",
         specialName: "Ashura Ichibugin",
         captain: "Boosts ATK and HP of DEX characters by 2x",
-        limit: [
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Aquire Sailor Ability 1: Restores his own special by 1 turn when it is rewinded" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Critical Hit" },
-        ],
-        potential: [
-            {
-                "Name": "[QCK] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Critical Hit",
-                "description": [ 
-                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
-                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     9: {
         special: "Recovers 1,000 HP",
@@ -155,8 +117,7 @@ window.details = {
     16: {
         special: "Delays all enemies for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
         specialName: "Fire Bird Star",
-        captain: "Boosts ATK and HP of PSY characters by 1.5x",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK and HP of PSY characters by 1.5x"
     },
     17: {
         special: "Recovers 10x character's RCV in HP",
@@ -863,45 +824,7 @@ window.details = {
         special: "Changes [PSY] orbs into [INT] orbs",
         specialName: "Happiness Punch",
         captain: "Boosts ATK of INT characters by 2.5x",
-        limit: [
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of [INT] characters by 2.5x and their RCV by 1.2x" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of [INT] characters by 30" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Aquire Sailor Ability 2: Makes [TND] orbs \"beneficial\" for [INT] characters" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
-        ],
-        potential: [
-            {
-                "Name": "[INT] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [INT] characters by 1%",
-                    "Level 2: Reduce damage taken from [INT] characters by ?%",
-                    "Level 3: Reduce damage taken from [INT] characters by ?%",
-                    "Level 4: Reduce damage taken from [INT] characters by ?%",
-                    "Level 5: Reduce damage taken from [INT] characters by ?%"
-                ]
-            },
-            {
-                "Name": "[PSY] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
-                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     222: {
         special: "Boosts ATK of PSY characters by 1.5x for 1 turn",
@@ -947,7 +870,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -969,7 +892,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ]
     },
     228: {
@@ -1069,8 +992,7 @@ window.details = {
         special: "Deals random STR damage to one enemy",
         specialName: "Rampage",
         specialNotes: "#{random : 2,000 : 200,000}",
-        captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%"
     },
     250: {
         special: "Recovers all missing HP",
@@ -1080,8 +1002,7 @@ window.details = {
     251: {
         special: "Recovers all missing HP",
         specialName: "Blue Flame Rebirth",
-        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
     },
     252: {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
@@ -1091,8 +1012,7 @@ window.details = {
     253: {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
         specialName: "Brilliant Punk",
-        captain: "Boosts ATK and HP of QCK characters by 2x",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK and HP of QCK characters by 2x"
     },
     254: {
         special: "Deals 5,000 fixed damage to all enemies",
@@ -1130,7 +1050,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Boosts base ATK by 60" },
             { "description": "Aquire Sailor Ability 2: Boosts base ATK of Shooter characters by 50" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         limitnotes: "Captain boosts stack, so [DEX] and Shooter character's ATK will be boosted by 2.4x",
         potential: [
@@ -1153,7 +1073,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            },
+            }
         ]
     },
     258: {
@@ -1165,45 +1085,7 @@ window.details = {
         special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
         specialName: "Pocket Mallet",
         captain: "Boosts ATK and RCV of STR characters by 2x",
-        limit: [
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Sailor Ability 1: Makes [PSY] orbs \"beneficial\" for this unit" },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for this unit" },
-            { "description": "Boosts base ATK by 60" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Boosts base HP by 80" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [DEX] Damage Reduction" },
-        ],
-        potential: [
-            {
-                "Name": "[QCK] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
-                ]
-            },
-            {
-                "Name": "[DEX] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     260: {
         special: "Cuts the current HP of each enemy by 30%",
@@ -1214,70 +1096,7 @@ window.details = {
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Seaquake",
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn",
-        limit: [
-            { "description": "Boosts base ATK by 5" },
-            { "description": "Boosts base HP by 5" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
-            { "description": "Boosts base RCV by 15" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker and Powerhouse characters by 60" },
-            { "description": "Boosts base ATK by 10" },
-            { "description": "Boosts base HP by 15" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base HP by 35" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire Potential 2: Critical Hit" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 45" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base HP by 65" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Boosts base HP by 80" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base ATK by 50" },
-            { "description": "Aquire Potential 3: Enrage" },
-        ],
-        potential: [
-            {
-                "Name": "[DEX] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
-                    "Level 2: Reduce damage taken from [DEX] characters by 3%",
-                    "Level 3: Reduce damage taken from [DEX] characters by 4%",
-                    "Level 4: Reduce damage taken from [DEX] characters by 5%",
-                    "Level 5: Reduce damage taken from [DEX] characters by 7%"
-                ]
-            },
-            {
-                "Name": "Critical Hit",
-                "description": [ 
-                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
-                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
-                ]
-            },
-            {
-                "Name": "Enrage",
-                "description": [ 
-                    "Level 1: Boosts base ATK by 25",
-                    "Level 2: Boosts base ATK by ??",
-                    "Level 3: Boosts base ATK by ??",
-                    "Level 4: Boosts base ATK by ??",
-                    "Level 5: Boosts base ATK by ??"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     262: {
         captain: "Recovers 2x character's RCV in HP at the end of each turn"
@@ -1448,8 +1267,7 @@ window.details = {
     306: {
         special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
         specialName: "Meteor Fist Shower",
-        captain: "Boosts ATK and HP of PSY characters by 2x",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK and HP of PSY characters by 2x"
     },
     307: {
         special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
@@ -1470,7 +1288,7 @@ window.details = {
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% for 3 turns",
         specialName: "Demon Face",
         captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     311: {
         special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
@@ -1495,45 +1313,7 @@ window.details = {
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
         specialName: "Karmic Punishment",
         captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
-        limit: [
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Boosts base RCV by 25" },
-            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
-            { "description": "Reduce base Special Cooldown by 3 turns" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of all Striker characters proportionally to the crew's current HP and their HP by 1.5x" },
-            { "description": "Reduce base Special Cooldown by 3 turns" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 30" },
-            { "description": "Boosts base ATK by 60" },
-            { "description": "Boosts base RCV by 25" },
-            { "description": "Reduce base Special Cooldown by 3 turns" },
-            { "description": "Boosts base HP by 80" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" },
-        ],
-        potential: [
-            {
-                "Name": "[INT] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [INT] characters by 1%",
-                    "Level 2: Reduce damage taken from [INT] characters by ?%",
-                    "Level 3: Reduce damage taken from [INT] characters by ?%",
-                    "Level 4: Reduce damage taken from [INT] characters by ?%",
-                    "Level 5: Reduce damage taken from [INT] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Enrage",
-                "description": [ 
-                    "Level 1: Boosts base ATK by 30",
-                    "Level 2: Boosts base ATK by ??",
-                    "Level 3: Boosts base ATK by ??",
-                    "Level 4: Boosts base ATK by ??",
-                    "Level 5: Boosts base ATK by ??"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     315: {
         special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
@@ -1545,8 +1325,7 @@ window.details = {
         special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
         specialName: "Aye Aye, Captain!",
         captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
-        sailor: "Reduces Paralysis for 2 turns for himself",
-        limit: "This character has a limit break path",
+        sailor: "Reduces Paralysis for 2 turns for himself"
     },
     317: {
         special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
@@ -1689,7 +1468,7 @@ window.details = {
             { "description": "Boosts base RCV by 40" },
             { "description": "Aquire new Captain Ability: Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x and recovers 300 HP at end of each turn" },
             { "description": "Boosts base HP by 50" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -1711,7 +1490,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -1725,52 +1504,16 @@ window.details = {
     },
     356: {
         special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
+        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
         specialName: "Steel Magnetic Arm",
         captain: "Boosts ATK of Striker characters by 2x"
     },
     357: {
         special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
+        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
         specialName: "Steel Magnetic Arm",
         captain: "Boosts ATK of Striker characters by 2.5x",
-        limit: [
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of Striker characters by 2.5x and reduces damage received by 7%" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker characters by 75" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base RCV by 50" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Boosts base ATK by 50" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" },
-        ],
-        potential: [
-            {
-                "Name": "[DEX] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Enrage",
-                "description": [ 
-                    "Level 1: Boosts base ATK by 30",
-                    "Level 2: Boosts base ATK by ??",
-                    "Level 3: Boosts base ATK by ??",
-                    "Level 4: Boosts base ATK by ??",
-                    "Level 5: Boosts base ATK by ??"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     358: {
         special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
@@ -1798,7 +1541,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Aquire new Captain Ability: Boosts ATK of [DEX] characters by 3x if HP is above 99% at the start of the turn, 2x otherwise" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -1820,7 +1563,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     360: {
@@ -2276,7 +2019,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -2298,7 +2041,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     448: {
@@ -2367,8 +2110,8 @@ window.details = {
         special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
         specialName: "Zen Shockwave",
         specialNotes: "#{random : 30,000 : 150,000}",
-        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less or 54 cost exactly by 3x",
-        captainNotes: "His captain ability also affects his evolved forms, his base form will NOT receive the boost. All evolved and plus evolved Sengoku characters in the team are included in the bonus."
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x as well as himself",
+        captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku characters in the team are included in the bonus."
     },
     460: {
         special: "Recovers 33 HP after the end of each turn for 999 turns, delays all enemies for 1 turn",
@@ -2887,7 +2630,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 120" },
             { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 50" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -2909,7 +2652,7 @@ window.details = {
                     "Level 4: If there are 4 Shooter characters in your crew, reduces No Healing duration by 2 turns",
                     "Level 5: If there are 4 Shooter characters in your crew, reduces No Healing duration by 3 turns"
                 ]
-            },
+            }
         ]
     },
     557: {
@@ -3010,45 +2753,7 @@ window.details = {
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
         specialName: "Ice Block - Pheasant Beak",
         captain: "Boosts ATK and HP of Striker characters by 2x",
-        limit: [
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Aquire Potential 1: Slot Bind Self-reduction" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 50" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
-        ],
-        potential: [
-            {
-                "Name": "Slot Bind Self-reduction",
-                "description": [ 
-                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
-                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
-                ]
-            },
-            {
-                "Name": "[PSY] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
-                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     576: {
         special: "Changes [PSY] orbs into [INT] orbs, boosts RCV of all characters by 1.5x for 1 turn",
@@ -3331,14 +3036,14 @@ window.details = {
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     639: {
         special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     640: {
         special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
@@ -3367,45 +3072,7 @@ window.details = {
         specialName: "Raging Greatsword",
         captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Recovers 2 turns of Paralysis on self",
-        limit: [
-            { "description": "Boosts base RCV by 25" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base RCV by 35" },
-            { "description": "Aquire Potential 1: [STR] Damage Reduction" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Aquire Sailor Ability 1: Reduces Blindness duration by 2 turns" },
-            { "description": "Boosts base ATK by 60" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Boosts base RCV by 50" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [INT] Damage Reduction" },
-        ],
-        potential: [
-            {
-                "Name": "[STR] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [STR] characters by 1%",
-                    "Level 2: Reduce damage taken from [STR] characters by ?%",
-                    "Level 3: Reduce damage taken from [STR] characters by ?%",
-                    "Level 4: Reduce damage taken from [STR] characters by ?%",
-                    "Level 5: Reduce damage taken from [STR] characters by ?%"
-                ]
-            },
-            {
-                "Name": "[INT] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [INT] characters by 1%",
-                    "Level 2: Reduce damage taken from [INT] characters by ?%",
-                    "Level 3: Reduce damage taken from [INT] characters by ?%",
-                    "Level 4: Reduce damage taken from [INT] characters by ?%",
-                    "Level 5: Reduce damage taken from [INT] characters by ?%"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     644: {
         special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
@@ -3952,8 +3619,7 @@ window.details = {
     748: {
         special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
         specialName: "Rokuougan",
-        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
     },
     749: {
         special: "Deals random DEX damage to all enemies, randomizes all orbs",
@@ -3967,8 +3633,7 @@ window.details = {
         specialName: "Tempest Kick: Sky Slicer",
         specialNotes: "#{random : 10,000 : 90,000}",
         captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
-        captainNotes: "#{noFixedPerc}",
-        limit: "This character has a limit break path",
+        captainNotes: "#{noFixedPerc}"
     },
     751: {
         special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
@@ -3990,8 +3655,7 @@ window.details = {
         special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{orb : 1.75x}",
         specialName: "Moonlight Ten Finger Pistol",
-        captain: "Boosts ATK of Powerhouse characters by 2.5x",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of Powerhouse characters by 2.5x"
     },
     755: {
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
@@ -4001,8 +3665,7 @@ window.details = {
     756: {
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
         specialName: "Tekkai - Rin",
-        captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%"
     },
     757: {
         special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
@@ -4022,8 +3685,7 @@ window.details = {
     760: {
         special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
         specialName: "Life Return: Shishi Finger Pistol",
-        captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn"
     },
     761: {
         special: "Deals 15x character's ATK in DEX damage to one enemy, boosts ATK of all characters by 1.2x for 1 turn",
@@ -4138,8 +3800,7 @@ window.details = {
         special: "Boosts own ATK by a variable factor for 1 turn",
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 1.5x; between 20% HP and 50% HP, it's 1.75x; below 20% HP, it's 2x.",
         specialName: "Precept Deification",
-        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn"
     },
     782: {
         special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
@@ -4438,45 +4099,7 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2.5x",
         specialName: "Demon Bamboo",
         special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy",
-        limit: [
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Potential 1: [PSY] Damage Reduction" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of Striker characters by 2.5x and reduces damage received by 7%" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Aquire Sailor Ability 1: If Vergo has a [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" },
-        ],
-        potential: [
-            {
-                "Name": "[PSY] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
-                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Enrage",
-                "description": [ 
-                    "Level 1: Boosts base ATK by 30",
-                    "Level 2: Boosts base ATK by ??",
-                    "Level 3: Boosts base ATK by ??",
-                    "Level 4: Boosts base ATK by ??",
-                    "Level 5: Boosts base ATK by ??"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     841: {
         captain: "Recovers 3x character's RCV in HP at the end of each turn, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
@@ -4522,7 +4145,7 @@ window.details = {
             { "description": "Boosts base ATK by 100" },
             { "description": "Aquire Sailor Ability 2: Boosts this character's attack against [DEX] characters by 2x" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -4544,7 +4167,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ]
     },
     847: {
@@ -5101,8 +4724,7 @@ window.details = {
                 "cooldown": [ 31, 17 ]
             }
         ],
-        specialNotes: "#{stages}",
-        limit: "This character has a limit break path",
+        specialNotes: "#{stages}"
     },
     934: {
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
@@ -5137,7 +4759,7 @@ window.details = {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
         specialName: "Cyclone Burst",
         special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     940: {
         captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
@@ -5184,13 +4806,13 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by 1.5x and their RCV by 1.2x",
         specialName: "Twin Cannons",
         special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage",
-        specialNotes: "#{random : 7,000 : 18,000}",
+        specialNotes: "#{random : 7,000 : 18,000}"
     },
     949: {
         captain: "Boosts ATK of Slasher characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         specialName: "Ties with Ace",
         special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
-        specialNotes: "#{silence}",
+        specialNotes: "#{silence}"
     },
     950: {
         captain: "Boosts ATK of Fighter and Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
@@ -5365,7 +4987,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire new Captain Ability: Reduces cooldown of Shooter specials by 3 turns at the start of the fight, boosts ATK of Shooter characters by 2.35x and boosts HP of Shooter characters by 1.5x" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -5387,13 +5009,13 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     979: {
         captain: "Boosts ATK of [PSY] and [DEX] characters by 1.75x and their RCV by 1.2x",
         specialName: "Flintlock Barrage",
-        special: "Randomly changes all orbs into either [PSY] or [DEX] orbs, deals random PSY damage to all enemies",
+        special: "Randomly changes all orbs into either [PSY] or [DEX] orbs, deals random PSY damage to all enemies"
     },
     980: {
         captain: "Boosts ATK of [DEX] and [STR] characters by 1.75x and their RCV by 1.2x",
@@ -5474,7 +5096,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire Sailor Ability 1: Boosts HP, RCV, and ATK of [QCK] characters by 30" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -5496,12 +5118,11 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     994: {
         captain: "Boosts amount of Beli received by 2x",
-        special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
         specialName: "Peeping Mind",
         special: [
             {
@@ -5513,13 +5134,12 @@ window.details = {
                 "cooldown": [ 20, 14 ]
             }
         ],
-        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'<br>#{stages}",
+        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, \"Specials based on turns\", and \"Effect after Death\"<br>#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     995:{
         captain: "Boosts amount of Beli received by 3x",
-        special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
         specialName: "Peeping Mind",
         special: [
             {
@@ -5531,9 +5151,9 @@ window.details = {
                 "cooldown": [ 20, 14 ]
             }
         ],
-        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'<br>#{stages}",
+        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, \"Specials based on turns\", and \"Effect after Death\"<br>#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
@@ -5564,8 +5184,7 @@ window.details = {
             }
         ],
         specialName: "Decapitation High Heel",
-        specialNotes: "#{stages}",
-        limit: "This character has a limit break path",
+        specialNotes: "#{stages}"
     },
     998: {
         captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turn at the start of the fight",
@@ -5576,45 +5195,7 @@ window.details = {
         captain: "Boosts ATK of Driven characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns",
-        limit: [
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Aquire Potential 1: Critical Hit" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [DEX] Damage Reduction" },
-        ],
-        potential: [
-            {
-                "Name": "Critical Hit",
-                "description": [ 
-                    "Level 1: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
-                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
-                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
-                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
-                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage"
-                ]
-            },
-            {
-                "Name": "[DEX] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1000: {
         captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
@@ -5709,13 +5290,13 @@ window.details = {
         captain: "Boosts HP of Slasher characters by 1.5x",
         special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
         specialName: "Ravaging Cutlass Dance",
-        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
+        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}"
     },
     1018: {
         captain: "Boosts ATK of Slasher characters by 1.5x and their HP by 2x",
         special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
         specialName: "Ravaging Cutlass Dance",
-        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
+        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}"
     },
     1019: {
         captain: "Reduces damage received from [QCK] enemies by 50%",
@@ -5772,7 +5353,7 @@ window.details = {
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Aquire Potential 2: Enrage" }
         ],
         potential: [
             {
@@ -5794,7 +5375,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -5854,7 +5435,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire Sailor Ability 2: Restores his own special by 1 turn when it is rewinded" },
-            { "description": "Aquire Potential #: Critical Hit" },
+            { "description": "Aquire Potential #: Critical Hit" }
         ],
         potential: [
             {
@@ -5876,7 +5457,7 @@ window.details = {
                     "Level 4: If you hit a perfect with this character, there is a 40% chance to deal 5% of this character's attack in extra damage",
                     "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 7% of this character's attack in extra damage"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -5893,70 +5474,7 @@ window.details = {
         special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
         specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
         specialName: "Bari Bari No Pistol",
-        limit: [
-            { "description": "Boosts base ATK by 10" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
-            { "description": "Boosts base RCV by 15" },
-            { "description": "Boosts base HP by 35" },
-            { "description": "Boosts base ATK by 15" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK of STR characters by 60" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Boosts base HP by 45" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Aquire Potential 2: Enrage" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 55" },
-            { "description": "Boosts base HP by 65" },
-            { "description": "Boosts base ATK by 35" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Boosts base HP by 80" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Aquire Sailor Ability 2: Completely resists Paralysis on this character" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base ATK by 45" },
-            { "description": "Aquire Potential 3: Reduce No Healing duration" },
-        ],
-        potential: [
-            {
-                "Name": "[DEX] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
-                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Enrage",
-                "description": [ 
-                    "Level 1: Boosts base ATK by 30",
-                    "Level 2: Boosts base ATK by ??",
-                    "Level 3: Boosts base ATK by ??",
-                    "Level 4: Boosts base ATK by ??",
-                    "Level 5: Boosts base ATK by ??"
-                ]
-            },
-            {
-                "Name": "Reduce No Healing duration",
-                "description": [ 
-                    "Level 1: Reduces No Healing duration by ? turn",
-                    "Level 2: Reduces No Healing duration by ? turn",
-                    "Level 3: Reduces No Healing duration by ? turn",
-                    "Level 4: Reduces No Healing duration by ? turns",
-                    "Level 5: Reduces No Healing duration by ? turns"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1036: {
         captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
@@ -6067,7 +5585,7 @@ window.details = {
         captain: "Recovers 1,000 HP at the end of each turn",
         special: "Reduces Silence duration by 2 turns",
         specialName: "Knowledge the World is Afraid of",
-        specialNotes: "#{silence}",
+        specialNotes: "#{silence}"
     },
     1053: {
         captain: "Boosts RCV of Cerebral characters by 1.5x",
@@ -6186,7 +5704,7 @@ window.details = {
         captain: "Boosts ATK and HP of [INT] characters by 2x",
         special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
         specialName: "Tenacious Sword of Destruction",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1076:{
         captain: "Boosts ATK of Striker and Free Spirit characters by 1.75x",
@@ -6232,7 +5750,7 @@ window.details = {
             { "description": "Aquire new Captain Ability: Boosts ATK of Striker and Free Spirit characters by 2.45x and their RCV by 1.5x" },
             { "description": "Aquire Sailor Ability 2: Boosts this character's attack against DEX characters by 2x" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -6254,7 +5772,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1078: {
@@ -6271,7 +5789,7 @@ window.details = {
             {
                 "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
                 "cooldown": [ 24, 18 ]
-            },
+            }
         ],
         specialNotes: "#{stages}",
         specialName: "Chiyupopo"
@@ -6290,49 +5808,11 @@ window.details = {
             {
                 "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
                 "cooldown": [ 24, 18 ]
-            },
+            }
         ],
         specialNotes: "#{stages}",
         specialName: "Chiyupopo",
-        limit: [
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Sailor Ability 1: Reduces Paralysis for 1 turn for herself" },
-            { "description": "Boosts base HP by 55" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base ATK by 45" },
-            { "description": "Aquire Sailor Ability 2: Reduces Silence duration against this unit by 2 turns" },
-            { "description": "Boosts base HP by 65" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
-        ],
-        potential: [
-            {
-                "Name": "[INT] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [INT] characters by 1%",
-                    "Level 2: Reduce damage taken from [INT] characters by ?%",
-                    "Level 3: Reduce damage taken from [INT] characters by ?%",
-                    "Level 4: Reduce damage taken from [INT] characters by ?%",
-                    "Level 5: Reduce damage taken from [INT] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Reduce No Healing duration",
-                "description": [ 
-                    "Level 1: Reduces No Healing duration by 1 turn",
-                    "Level 2: Reduces No Healing duration by ? turn",
-                    "Level 3: Reduces No Healing duration by ? turns",
-                    "Level 4: Reduces No Healing duration by ? turns",
-                    "Level 5: Reduces No Healing duration by ? turns"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1080: {
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
@@ -6342,8 +5822,7 @@ window.details = {
     1081: {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
-        specialName: "Trueno Bastardo",
-        limit: "This character has a limit break path",
+        specialName: "Trueno Bastardo"
     },
     1082: {
         captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
@@ -6371,7 +5850,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Aquire Potential 2: Enrage" }
         ],
         potential: [
             {
@@ -6393,20 +5872,20 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1084: {
         captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-        specialNotes: "Does not stack with other 'end of turn damage' abilities",
+        specialNotes: "Does not stack with other \"end of turn damage\" abilities",
         specialName: "Gravito: Heavens Fall"
     },
     1085: {
         captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-        specialNotes: "Does not stack with other 'end of turn damage' abilities",
+        specialNotes: "Does not stack with other \"end of turn damage\" abilities",
         specialName: "Gravito: Heavens Fall",
         limit: [
             { "description": "Boosts base HP by 25" },
@@ -6438,7 +5917,7 @@ window.details = {
             { "description": "Boosts base HP by 70" },
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -6470,7 +5949,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -6578,7 +6057,7 @@ window.details = {
             {
                 "description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
                 "cooldown": [ 27, 17 ]
-            },
+            }
         ],
         specialNotes: "#{stages}",
         specialName: "Return Return Fruit"
@@ -6597,7 +6076,7 @@ window.details = {
             {
                 "description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
                 "cooldown": [ 27, 17 ]
-            },
+            }
         ],
         specialNotes: "#{stages}",
         specialName: "Return Return Fruit"
@@ -6761,7 +6240,7 @@ window.details = {
             {
                 "description": "Deals 25x character's ATK in typeless damage to all enemies",
                 "cooldown": [ 26, 20 ]
-            },
+            }
         ],
         specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.<br>#{stages}",
         specialName: "King Punch"
@@ -6780,7 +6259,7 @@ window.details = {
             {
                 "description": "Deals 25x character's ATK in typeless damage to all enemies",
                 "cooldown": [ 26, 20 ]
-            },
+            }
         ],
         specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.<br>#{stages}",
         specialName: "King Punch"
@@ -6818,22 +6297,22 @@ window.details = {
     1134: {
         captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.2x",
         special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-        specialName: "Non-Negotiable Quest",
+        specialName: "Non-Negotiable Quest"
     },
     1135: {
         captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.5x",
         special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-        specialName: "Non-Negotiable Quest",
+        specialName: "Non-Negotiable Quest"
     },
     1136: { //Fortnight Fukuro
         captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
         special: "For [QCK] characters, changes [TND] and [RCV] orbs into [QCK] orbs",
-        specialName: "Stern Beast: Secret Technique: 'Owl Thrasher' Sneak Attack"
+        specialName: "Stern Beast: Secret Technique: \"Owl Thrasher\" Sneak Attack"
     },
     1137: { //Fortnight Jabra
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
         special: "Deals 13x character's ATK in [STR] damage to one enemy. For Free Spirit characters, amplifies the effects of orbs by 1.5x for 2 turns",
-        specialName: "Fatal Sneak Attack",
+        specialName: "Fatal Sneak Attack"
     },
     1138: {
         captain: "Reduces damage received by 25%",
@@ -6883,7 +6362,7 @@ window.details = {
     },
     1147:{
         special: "Recovers 7x character's RCV in HP",
-        specialName: "Moderate Healing",
+        specialName: "Moderate Healing"
     },
     1148:{
         specialName: "Paralysis Recovery - Light",
@@ -6892,11 +6371,11 @@ window.details = {
     1149:{
         special: "Deals 3x character's ATK in INT damage to all enemies, Poisons all enemies",
         specialNotes: "#{poison}",
-        specialName: "Poison Attack",
+        specialName: "Poison Attack"
     },
     1150:{
         special: "Changes Captain orb into Matching orb",
-        specialName: "Captain Orb Change",
+        specialName: "Captain Orb Change"
     },
     1151: {//Minotaur
         special: "Cuts the current HP of one enemy by 10%",
@@ -6905,7 +6384,7 @@ window.details = {
     1152: {
         special: "Deals 3 hits of 7x character's ATK in [INT] damage to random enemies.",
         specialNotes: "#{randomHits : 3}",
-        specialName: "Shy Jailer Beast: Spiked Mace",
+        specialName: "Shy Jailer Beast: Spiked Mace"
     },
     1153: {
         special: "Reduces the defense of all enemies by 100% and boosts ATK of Powerhouse characters by 1.25x for 1 turn",
@@ -6914,7 +6393,7 @@ window.details = {
     1154: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.3x",
         special: "Reduces crew's current HP by 30%. Boosts ATK of Powerhouse characters by 1.5x",
-        specialName: "Leader of the Jailers",
+        specialName: "Leader of the Jailers"
     },
     1155: {
         special: "Deals 7x character's ATK in QCK damage to all enemies",
@@ -6924,13 +6403,13 @@ window.details = {
         captain: "Boosts ATK of Driven characters by 1.2x if HP is above 50% at the start of the turn",
         special: "Removes Poison. Protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Abyss Road",
-        specialNotes: "#{zombie}",
+        specialNotes: "#{zombie}"
     },
     1157: {
         captain: "Boosts ATK of Driven and Striker characters by 1.75x and protects from defeat as long as HP is above 50% at the start of the turn",
         special: "Removes Poison. Protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Abyss Road",
-        specialNotes: "#{zombie}",
+        specialNotes: "#{zombie}"
     },
     1158: {
         captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
@@ -6959,58 +6438,58 @@ window.details = {
     1162: {//Tesoro
         captain: "Boosts ATK of [PSY] characters by 1.75x and boosts amount of Beli received by 1.5x",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
-        specialName: "Gold-Gold Fruit",
+        specialName: "Gold-Gold Fruit"
     },
     1163: {//Tesoro Evolved
         captain: "Boosts ATK of PSY characters by 1.75x. Also boosts ATK of Driven and Cerebral characters by 1.5x. Boosts amount of Beli received by 2x",
         captainNotes: "The two Boosts stack with each other so a PSY Driven or a PSY Cerebral Unit will be boosted by 2.625",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
-        specialName: "Gold-Gold Fruit",
+        specialName: "Gold-Gold Fruit"
     },
     1164: {//Carina
         captain: "Boosts RCV of all characters by 1.2x",
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
-        specialName: "Sexy Diva",
+        specialName: "Sexy Diva"
     },
     1165: {//Carina Evolved
         captain: "Boosts RCV of all characters by 1.5x",
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
-        specialName: "Sexy Diva",
+        specialName: "Sexy Diva"
     },
     1166: {//Baccarat
         captain: "Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
-        specialName: "Lucky-Lucky Fruit",
+        specialName: "Lucky-Lucky Fruit"
     },
     1167: {//Baccarat Evolved
         captain: "Boosts ATK of all characters by 1.2x. Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
-        specialName: "Lucky-Lucky Fruit",
+        specialName: "Lucky-Lucky Fruit"
     },
     1168: {//Dice
         captain: "Boosts ATK of [STR] characters by 2x if HP is below 30% at the start of the turn",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated<br>HP > 50%: 1.1x<br>50% > HP > 30%: 1.25x<br>30% > HP > 10%: 1.5x<br>HP < 10%: 1.75x",
-        specialName: "Trump Card Dealer",
+        specialName: "Trump Card Dealer"
     },
     1169: {//Dice Evolved
         captain: "Boosts ATK of [STR] characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated<br>HP > 50%: 1.1x<br>50% > HP > 30%: 1.25x<br>30% > HP > 10%: 1.5x<br>HP < 10%: 1.75x",
-        specialName: "Trump Card Dealer",
+        specialName: "Trump Card Dealer"
     },
     1170: {//Tanaka
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-        specialName: "Escape-Escape Fruit",
+        specialName: "Escape-Escape Fruit"
     },
     1171: {//Tanaka Evolved
         captain: "Boosts ATK of [QCK] characters by 2x",
         special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-        specialName: "Escape-Escape Fruit",
+        specialName: "Escape-Escape Fruit"
     },
     1172: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
@@ -7054,13 +6533,13 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
         specialName: "Not Rubber Gum-Gum Jet Gatling",
-        specialNotes: "#{random : 30,000 : 150,000}",
+        specialNotes: "#{random : 30,000 : 150,000}"
     },
     1179: {
         captain: "Boosts ATK of [STR] characters by 2.75x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
         specialName: "Not Rubber Gum-Gum Jet Gatling",
-        specialNotes: "#{random : 30,000 : 150,000}",
+        specialNotes: "#{random : 30,000 : 150,000}"
     },
     1181: { //Blenheim
         captain: "Boosts ATK of [DEX] characters by 2.5x",
@@ -7094,17 +6573,17 @@ window.details = {
         special: [
             {
                 "description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
-                "cooldown": [ 8, 3 ],
+                "cooldown": [ 8, 3 ]
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
-                "cooldown": [ 17, 12 ],
+                "cooldown": [ 17, 12 ]
             }
         ],
         specialNotes : "#{stages}",
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     1186: {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
@@ -7112,17 +6591,17 @@ window.details = {
         special: [
             {
                 "description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
-                "cooldown": [ 8, 3 ],
+                "cooldown": [ 8, 3 ]
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
-                "cooldown": [ 17, 12 ],
+                "cooldown": [ 17, 12 ]
             }
         ],
         specialNotes : "#{stages}",
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     1187: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
@@ -7153,71 +6632,71 @@ window.details = {
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
         sailor: "Boosts base ATK of [QCK] characters by 40",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1191: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
-        specialName: "Ice Age",
+        specialName: "Ice Age"
     },
     1192: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
-        specialName: "Ice Age",
+        specialName: "Ice Age"
     },
     1193: {
         captain: "Boosts ATK of Free Spirit characters by 2x",
         special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
-        specialName: "Sweet Style Petrification",
+        specialName: "Sweet Style Petrification"
     },
     1194: {
         captain: "Boosts ATK of Free Spirit characters by 2.5x",
         special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
-        specialName: "Sweet Style Petrification",
+        specialName: "Sweet Style Petrification"
     },
     1195: {
         captain: "Boosts ATK of Striker characters by 1.75x. Recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
-        specialName: "Split Air Hole",
+        specialName: "Split Air Hole"
     },
     1196: {
         captain: "Boosts ATK of Striker characters by 2x. Recovers 5x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
         specialName: "Split Air Hole",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1197: {
         captain: "Boosts ATK of Cerebral and Powerhouse characters by 2.5x if they have a matching orb, by 1x otherwise, reduces crew's RCV to 0",
         special: "For Cerebral and Powerhouse characters, changes all orbs including [BLOCK] orbs to Badly Matching. Deals [INT] damage to all enemies",
-        specialName: "Investigator of Sorrow",
+        specialName: "Investigator of Sorrow"
     },
     1198: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Empties all slots with [RCV] orbs, recovers 20% of crew's MAX HP",
-        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
+        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?"
     },
     1199: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Empties all slots with [RCV] orbs, recovers 20% of crew's MAX HP",
-        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
+        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?"
     },
     1200: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
-        specialName: "Passionate Look, 'I'm a Bad Guy...'",
+        specialName: "Passionate Look, \"I'm a Bad Guy...\"",
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this unit by 2 turns",
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}"
     },
     1201: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
-        specialName: "Passionate Look, 'I'm a Bad Guy...'",
+        specialName: "Passionate Look, \"I'm a Bad Guy...\"",
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this unit by 2 turns",
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}"
     },
     1202: {
         captain: "Boosts ATK of Free Spirit characters by 1.5x",
@@ -7283,7 +6762,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 120" },
             { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 50" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -7305,7 +6784,7 @@ window.details = {
                     "Level 4: If there are 4 Shooter characters in your crew, reduces No Healing duration by 2 turns",
                     "Level 5: If there are 4 Shooter characters in your crew, reduces No Healing duration by 3 turns"
                 ]
-            },
+            }
         ]
     },
     1211: {
@@ -7344,17 +6823,17 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage received based on current HP by up to 20%",
         captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
         special: "Reduces damage received by 50% for 1 turn, and changes own orb into [QCK]",
-        specialName: "Camouflage Air",
+        specialName: "Camouflage Air"
     },
     1217: {//Nightin
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Paralysis and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
-        specialName: "Catepillar Soul Shot",
+        specialName: "Catepillar Soul Shot"
     },
     1218: {//Hancock
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
         special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
-        specialName: "Everybody Confusing Fragrance",
+        specialName: "Everybody Confusing Fragrance"
     },
     1219: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x.",
@@ -7362,19 +6841,19 @@ window.details = {
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
-                "cooldown": [ 22, 6 ],
+                "cooldown": [ 22, 6 ]
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 28, 12 ],
+                "cooldown": [ 28, 12 ]
             },
             {
                 "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
-                "cooldown": [ 34, 18 ],
-            },
+                "cooldown": [ 34, 18 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "More More, 10 Times \"Iron Hammer\"",
+        specialName: "More More, 10 Times \"Iron Hammer\""
     },
     1220: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x.",
@@ -7382,16 +6861,16 @@ window.details = {
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
-                "cooldown": [ 22, 6 ],
+                "cooldown": [ 22, 6 ]
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 28, 12 ],
+                "cooldown": [ 28, 12 ]
             },
             {
                 "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
-                "cooldown": [ 34, 18 ],
-            },
+                "cooldown": [ 34, 18 ]
+            }
         ],
         specialNotes: "#{stages}",
         specialName: "More More, 10 Times \"Iron Hammer\"",
@@ -7410,7 +6889,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Aquire Sailor Ability 1: Boosts own ATK by 100 if this character is the last in the chain to attack" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -7432,7 +6911,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -7440,83 +6919,83 @@ window.details = {
         captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-        specialName: "Blood of the Devil Warrior",
+        specialName: "Blood of the Devil Warrior"
     },
     1222: {//Coliseum Oars Jr
         captain: "Boosts ATK of Slasher characters by 2x and the HP of Powerhouse characters by 1.75x",
         special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-        specialName: "Blood of the Devil Warrior",
+        specialName: "Blood of the Devil Warrior"
     },
     1223: { // Story Bastille
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Deals 25x character's ATK in [INT] damage to all enemies",
-        specialName: "Shark Knife - Flash",
+        specialName: "Shark Knife - Flash"
     },
     1224: { // Story Yamakaji
         captain: "Boosts ATK of Slasher characters by 2x",
         special: "Reduces damage received by 60% for 1 turn",
-        specialName: "Appreciation For The Great Men",
+        specialName: "Appreciation For The Great Men"
     },
     1225: { // Story Hina
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Delays all enemies for 1 turn, and locks own orb for 1 turn",
-        specialName: "Binding Iron Tablet",
+        specialName: "Binding Iron Tablet"
     },
     1226: { // Story Smoker
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Cuts the current HP of one enemy by 10% and changes own orb into [PSY]",
-        specialName: "Seastone Truncheon",
+        specialName: "Seastone Truncheon"
     },
     1227: { //Story Mihawk
         captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight. Boosts ATK of Slasher characters by 2.25x",
         special: "Deals 100,000 fixed damage to one enemy, and boosts own ATK by 1.75x for 1 turn ",
-        specialName: "Black Blade - Slashing Burial Drop",
+        specialName: "Black Blade - Slashing Burial Drop"
     },
     1228: { // Story Kizaru
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "For Shooter characters, changes [BLOCK] orbs into Matching, and deals large [DEX] damage to all enemies",
-        specialName: "The Cave of the Sun Goddess",
+        specialName: "The Cave of the Sun Goddess"
     },
     1229: {//Sentomaru
         captain: "Boosts ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
         special: [
             {
                 "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 11, 4 ],
+                "cooldown": [ 11, 4 ]
             },
             {
                 "description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 15, 8 ],
+                "cooldown": [ 15, 8 ]
             },
             {
                 "description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-                "cooldown": [ 22, 15 ], 
-            },
+                "cooldown": [ 22, 15 ]
+            }
         ],
         specialNotes: "#{stages}",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-        specialName: "Leg-Locked Heave-Ho",
+        specialName: "Leg-Locked Heave-Ho"
     },
     1230: {//Sentomaru
         captain: "Boosts ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
         special: [
             {
                 "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 11, 4 ],
+                "cooldown": [ 11, 4 ]
             },
             {
                 "description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 15, 8 ],
+                "cooldown": [ 15, 8 ]
             },
             {
                 "description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-                "cooldown": [ 22, 15 ], 
-            },
+                "cooldown": [ 22, 15 ]
+            }
         ],
         specialNotes: "#{stages}",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-        specialName: "Leg-Locked Heave-Ho",
+        specialName: "Leg-Locked Heave-Ho"
     },
     1231: {//Smoker
         captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.25x",
@@ -7524,7 +7003,7 @@ window.details = {
         special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
         specialName: "Armed - White Launcher",
-        sailor: "Boosts base ATK of Striker characters by 50",
+        sailor: "Boosts base ATK of Striker characters by 50"
     },
     1232: {//Smoker
         captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.3x",
@@ -7533,7 +7012,7 @@ window.details = {
         specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
         specialName: "Armed - White Launcher",
         sailor: "Boosts base ATK of Striker characters by 50",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1233: {//Tashigi
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
@@ -7541,7 +7020,7 @@ window.details = {
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
-        sailor: "Boosts base RCV of Slasher characters by 30",
+        sailor: "Boosts base RCV of Slasher characters by 30"
     },
     1234: {//Tashigi
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
@@ -7549,21 +7028,21 @@ window.details = {
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
-        sailor: "Boosts base RCV of Slasher characters by 30",
+        sailor: "Boosts base RCV of Slasher characters by 30"
     },
     1235: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 1.75x, deals 3x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
         specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
-        sailor: "Reduces Blindness duration for 3 turns",
+        sailor: "Reduces Blindness duration for 3 turns"
     },
     1236: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
         specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
-        sailor: "Reduces Blindness duration for 3 turns",
+        sailor: "Reduces Blindness duration for 3 turns"
     },
     1237: {//Bastille
         captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
@@ -7583,18 +7062,18 @@ window.details = {
         special: [
             {
                 "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
-                "cooldown": [ 6, 3 ],
+                "cooldown": [ 6, 3 ]
             },
             {
                 "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
-                "cooldown": [ 12, 9 ],
+                "cooldown": [ 12, 9 ]
             },
             {
                 "description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
-                "cooldown": [ 20, 17 ], 
-            },
+                "cooldown": [ 20, 17 ]
+            }
         ],    
-        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}"
     },
     1240: {//6* Kizaru
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and boosts RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
@@ -7602,30 +7081,30 @@ window.details = {
         special: [
             {
                 "description": "For Shooter and Slasher characters,randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
-                "cooldown": [ 6, 3 ],
+                "cooldown": [ 6, 3 ]
             },
             {
                 "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
-                "cooldown": [ 12, 9 ],
+                "cooldown": [ 12, 9 ]
             },
             {
                 "description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
-                "cooldown": [ 20, 17 ],
-            },
+                "cooldown": [ 20, 17 ]
+            }
         ],    
-        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}",
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}"
     },
     1241: {//Fortnight Koala
         captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
         special: "Deals 11x character's ATK in [STR] damage to one enemy. Adds 15x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 15x}",
-        specialName: "Fishman Karate, Midair Upwards Kick",
+        specialName: "Fishman Karate, Midair Upwards Kick"
     },
     1242: {//Fortnight Koala
         captain: "Boosts chain multiplier by 2x. Recovers 2x character's RCV in HP at the end of each turn",
         special: "Deals 11x character's ATK in [STR] damage to one enemy. Adds 15x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 15x}",
-        specialName: "Fishman Karate, Midair Upwards Kick",
+        specialName: "Fishman Karate, Midair Upwards Kick"
     },
     1243: {// Fortnight Hack
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
@@ -7645,29 +7124,29 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 1.75x. If HP is below 10%, boosts ATK of Fighter characters by 3x instead.",
         special: "Deals random [QCK] damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Firefly Light, Fiery Doll\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
         specialName:"Gomu Gomu no Stamp Gatling",
-        specialNotes: "Firefly Light, Fiery Doll is Event Ace's special ability.",
+        specialNotes: "Firefly Light, Fiery Doll is Event Ace's special ability."
     },
     1246: {// Event Ace
         captain: "Boosts ATK of Fighter characters by 1.2x",
         special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
-        specialName:"Firefly Light, Fiery Doll",
+        specialName:"Firefly Light, Fiery Doll"
     },
     1247: {// Event Ace
         captain: "Boosts HP of Fighter characters by 1.2x and their ATK by 2.75x if they have a matching orb, by 2x otherwise",
         special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
-        specialName:"Firefly Light, Fiery Doll",
+        specialName:"Firefly Light, Fiery Doll"
     },
     1248: {// Kimono Marco
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
         captainNotes: "Ability stacks, so Fighter/Powerhouse characters gets ATK boosted by 1.69x",
         special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
-        specialName:"Shining Daylight - Dayflower",
+        specialName:"Shining Daylight - Dayflower"
     },
     1249: {// Kimono Marco
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x",
         captainNotes: "Ability stacks, so Fighter/Powerhouse characters gets ATK boosted by 2.56x",
         special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
-        specialName:"Shining Daylight - Dayflower",
+        specialName:"Shining Daylight - Dayflower"
     },
     1250: {// Coliseum Marco
         captain: "Boosts ATK of Powerhouse characters by 1.5x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
@@ -7675,15 +7154,15 @@ window.details = {
         special: [
             {
                 "description": "Randomizes all orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 21, 6 ],
+                "cooldown": [ 21, 6 ]
             },
             {
                 "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 24, 9 ],
-            },
+                "cooldown": [ 24, 9 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Burning Vanguard",
+        specialName: "Burning Vanguard"
     },
     1251: {// Coliseum Marco
         captain: "Boosts ATK of Powerhouse characters by 2x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
@@ -7691,28 +7170,27 @@ window.details = {
         special: [
             {
                 "description": "Randomizes all orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 21, 6 ],
+                "cooldown": [ 21, 6 ]
             },
             {
                 "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 24, 9 ],
-            },
+                "cooldown": [ 24, 9 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Burning Vanguard",
-        limit: "This character has a limit break path",
+        specialName: "Burning Vanguard"
     },
     1252: {// Coliseum Doma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
         special: "Changes adjacent orbs into [INT] orbs. Deals 20x character's ATK in [INT] damage to all enemies.",
         specialName: "Reversed Twin Blades - Surprise Thrust",
         sailor: "Reduces own Silence by 1 turn",
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}"
     },
     1253: {// Coliseum Shura
         captain: "Boosts ATK of [DEX] characters by 2.25x if HP is above 99% at the start of the turn",
         special: "Makes Perfects harder to hit for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [DEX] characters by 1.75x in the following turn.",
-        specialName: "Angry Instigator",
+        specialName: "Angry Instigator"
     },
     1254: {//FN Squard
         captain: "Boosts ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
@@ -7724,129 +7202,129 @@ window.details = {
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2x after the 16th hit, by 2.5x after the 22nd hit",
         special: "For 1 turn, makes Perfects slightly easier to hit and amplifies the effect of orbs by 1.5x",
         sailor: "When HP is below 30% at the start of the turn, boost base ATK of Fighter characters by 40",
-        specialName: "Large Fleet Commander",
+        specialName: "Large Fleet Commander"
     },
     1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
         special: "For Slasher and Driven characters, randomizes non-matching orbs, boosts ATK against enemies with increased defense by 1.3x for 1 turn",
         sailor: "Boosts base ATK and RCV of Driven characters by 10",
-        specialName: "Icebreaker Breakthrough Force",
+        specialName: "Icebreaker Breakthrough Force"
     },
     1257: {//Young Whitebeard
         captain: "Boosts ATK of all characters by 2x if HP is below 50% at the start of the turn",
         special: [
             {
                 "description": "Cuts the current HP of each enemy by 10%",
-                "cooldown": [ 23, 11 ],
+                "cooldown": [ 23, 11 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 20%",
-                "cooldown": [ 28, 16 ],
+                "cooldown": [ 28, 16 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 40%",
-                "cooldown": [ 36, 24 ],
-            },
+                "cooldown": [ 36, 24 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Earth Shattering Fist",
+        specialName: "Earth Shattering Fist"
     },
     1258: {//Young Whitebeard Evolved
         captain: "Boosts ATK of all characters by 2.5x if HP is below 50% at the start of the turn",
         special: [
             {
                 "description": "Cuts the current HP of each enemy by 10%",
-                "cooldown": [ 23, 11 ],
+                "cooldown": [ 23, 11 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 20%",
-                "cooldown": [ 28, 16 ],
+                "cooldown": [ 28, 16 ]
             },
             {
                 "description": "Cuts the current HP of each enemy by 40%",
-                "cooldown": [ 36, 24 ],
-            },
+                "cooldown": [ 36, 24 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Earth Shattering Fist",
+        specialName: "Earth Shattering Fist"
     },
     1259: {//Young Doflamingo
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Deals 25x character's ATK in typeless damage to all enemies. For 3 turns, makes [STR], [DEX], [QCK], [PSY], and [INT] orbs \"beneficial\" for Driven characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
-        specialName: "Five Color Strings (Goshikito)",
+        specialName: "Five Color Strings (Goshikito)"
     },
     1260: {//Young Doflamingo
         captain: "Reduces cooldown of Driven specials by 1 turn at the start of the fight. Boosts ATK of Driven characters by 2.5x",
         special: "Deals 25x character's ATK in typeless damage to all enemies. For 3 turns, makes [STR], [DEX], [QCK], [PSY], and [INT] orbs \"beneficial\" for Driven characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
-        specialName: "Five Color Strings (Goshikito)",
+        specialName: "Five Color Strings (Goshikito)"
     },
     1261: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.5x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
         specialNotes: "#{colorAffinity : 1.5}",
-        specialName: "Blood and Gunpowder of the Underground Family",
+        specialName: "Blood and Gunpowder of the Underground Family"
     },
     1262: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.75x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
         specialNotes: "#{colorAffinity : 1.5}",
-        specialName: "Blood and Gunpowder of the Underground Family",
+        specialName: "Blood and Gunpowder of the Underground Family"
     },
     1263: {//Young Vergo
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
         special: "Deals 20,000 fixed damage to one enemy. Boosts own ATK by 2x for 2 turns",
-        specialName: "Iron Leg Sanctions",
+        specialName: "Iron Leg Sanctions"
     },
     1264: {//Young Vergo
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals 20,000 fixed damage to one enemy. Boosts own ATK by 2x for 2 turns",
-        specialName: "Iron Leg Sanctions",
+        specialName: "Iron Leg Sanctions"
     },
     1265: {//Kimono Ace
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Looking to the Full Moon",
+        specialName: "Looking to the Full Moon"
     },
     1266: {//Kimono Ace Evo
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Looking to the Full Moon",
+        specialName: "Looking to the Full Moon"
     },
     1267: {//Legend Blackbeard
         captain: "Boosts ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
         captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
-        specialName: "World Shaking Impact",
+        specialName: "World Shaking Impact"
     },
     1268: {//Legend Blackbeard
         captain: "Boosts ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
         captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
-        specialName: "World Shaking Impact",
+        specialName: "World Shaking Impact"
     },
     1269: {//Laffitte
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 3x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
         sailor: "Boosts base ATK of all characters by 100 if your captain is a Driven character",
-        specialName: "Horrifying Suggestion",
+        specialName: "Horrifying Suggestion"
     },
     1270: {//Laffitte
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 7x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
         sailor: "Boosts base ATK of all characters by 100 if your captain is a Driven character",
-        specialName: "Horrifying Suggestion",
+        specialName: "Horrifying Suggestion"
     },
     1271: {//Van Augur
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces Blindness duration by 5 turns",
-        specialName: "Other Side of Fate",
+        specialName: "Other Side of Fate"
     },
     1272: {//Van Augur
         captain: "Reduces cooldown of Shooter specials by 1 turn at the start of the fight. Boosts ATK of Shooter characters by 2.5x.",
@@ -7868,7 +7346,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -7890,7 +7368,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     1273: {//Jesus Burgess
@@ -7898,14 +7376,14 @@ window.details = {
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.44x HP",
         special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Champion of the Wild Roar",
+        specialName: "Champion of the Wild Roar"
     },
     1274: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.2x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.44x HP",
         special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Champion of the Wild Roar",
+        specialName: "Champion of the Wild Roar"
     },
     1275: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
@@ -7913,7 +7391,7 @@ window.details = {
         specialNotes: "#{instantKill : 25%}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Handling Hell",
+        specialName: "Handling Hell"
     },
     1276: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 2x",
@@ -7921,46 +7399,46 @@ window.details = {
         specialNotes: "#{instantKill : 25%}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Handling Hell",
+        specialName: "Handling Hell"
     },
     1277: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.25x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
-        specialName: "Reaping of Desperate Lives",
+        specialName: "Reaping of Desperate Lives"
     },
     1278: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1279: {//John Giant
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
         special: "Reduces damage received in the next turn by 50% if the special is activated with less than 50% health remaining",
-        specialName: "Manifesto to the Weak",
+        specialName: "Manifesto to the Weak"
     },
     1280: {//Marineford Aokiji
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Deals 10,000 fixed damage to all enemies and locks all orbs for 1 turn",
-        specialName: "Ice Chunks - Trident",
+        specialName: "Ice Chunks - Trident"
     },
     1281: {//Marineford Garp
         captain: "Boosts ATK of Fighter characters by 2.25x and reduces damage received by 10%",
         special: "Deals 25x character's ATK in [STR] damage to one enemy that will ignore damage negating abilities and barriers.",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Fist of Love - Falling Fortress",
+        specialName: "Fist of Love - Falling Fortress"
     },
     1282: {//Marineford Sengoku
         captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces cooldown of all specials by 1 turn. Boosts ATK of all characters by 1.2x and amplifies the effect of orbs by 1.2x for 1 turn",
-        specialName: "Encircling Wall around Marineford Bay",
+        specialName: "Encircling Wall around Marineford Bay"
     },
     1283: {//Marineford Akainu
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Deals 35x character's ATK in [INT] damage to one enemy. Boosts ATK of Driven characters by 1.5x for 1 turn",
-        specialName: "Dark Dog",
+        specialName: "Dark Dog"
     },
     1284: {//Wild Luffy
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
@@ -7968,7 +7446,7 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this character by 3 turns",
         sailorNotes: "#{silence}",
-        specialName: "Wild Hunt",
+        specialName: "Wild Hunt"
     },
     1285: {//Wild Luffy Evolved
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. Boosts ATK of Striker characters by 3.375x after scoring 3 Perfects in a row.",
@@ -7976,178 +7454,178 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this character by 3 turns",
         sailorNotes: "#{silence}",
-        specialName: "Wild Hunt",
+        specialName: "Wild Hunt"
     },
     1286: {//Kid Baby 5
         captain: "Boosts ATK and RCV of [PSY] characters by 1.3x",
         special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Handgun Legs",
+        specialName: "Handgun Legs"
     },
     1287: {//Kid Baby 5
         captain: "Boosts ATK and RCV of [PSY] characters by 1.5x",
         special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Handgun Legs",
+        specialName: "Handgun Legs"
     },
     1288: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.5x on the first turn, 2.4x on the second, 2.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces Special Cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces Special Cooldown of Driven specials by 1 turn.",
-        specialName: "Outcome of Sparta",
+        specialName: "Outcome of Sparta"
     },
     1289: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.75x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.75x on the first turn, 2.65x on the second, 2.55x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces Special Cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces Special Cooldown of Driven specials by 1 turn.",
-        specialName: "Outcome of Sparta",
+        specialName: "Outcome of Sparta"
     },
     1290: {//Kid Buffalo
         captain: "Recovers 500 HP at the end of each turn",
         special: "Changes own orb into [INT], and Captain orb into [BOMB]",
-        specialName: "Rude Prank",
+        specialName: "Rude Prank"
     },
     1291: {//Lao G, Coliseum
         captain: "Boosts ATK of Driven characters by 1.75x",
         special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
-        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact",
+        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact"
     },
     1292: {//Lao G, Coliseum
         captain: "Boosts ATK of Driven characters by 2.5x if they have a matching orb, by 2x otherwise",
         special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
-        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact",
+        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact"
     },
     1293: {//Coliseum Sandersonia
         captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
-                "cooldown": [ 21, 11 ],
+                "cooldown": [ 21, 11 ]
             },
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
-                "cooldown": [ 26, 16 ],
-            },
+                "cooldown": [ 26, 16 ]
+            }
         ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.<br>#{stages}",
-        specialName: "Snake Dance",
+        specialName: "Snake Dance"
     },
     1294: {//Coliseum Sandersonia
         captain: "Boosts ATK of Powerhouse characters by 2x, deals 4 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
-                "cooldown": [ 21, 11 ],
+                "cooldown": [ 21, 11 ]
             },
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
-                "cooldown": [ 26, 16 ],
-            },
+                "cooldown": [ 26, 16 ]
+            }
         ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.<br>#{stages}",
-        specialName: "Snake Dance",
+        specialName: "Snake Dance"
     },
     1295: {//Halloween Kalifa
         captain: "Boosts ATK and RCV of [STR] characters by 1.5x",
         special: "Reduces Paralysis duration by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
-        specialName: "Mysterious Hour of the Dark Night",
+        specialName: "Mysterious Hour of the Dark Night"
     },
     1296: {//Halloween Kalifa
         captain: "Boosts ATK of [STR] characters by 2x and their RCV by 1.5x",
         special: "Reduces Paralysis duration by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
-        specialName: "Mysterious Hour of the Dark Night",
+        specialName: "Mysterious Hour of the Dark Night"
     },
     1297: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption",
+        specialName: "Great Eruption"
     },
     1298: {//Akainu
         captain: "Boosts ATK by 3x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption",
+        specialName: "Great Eruption"
     },
     1299: {//Halloween Rebecca
         captain: "Boosts ATK and RCV of [INT] characters by 1.2x",
         special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
-        specialName: "Driving Away Evil Spirits of Sin - Cat Pose",
+        specialName: "Driving Away Evil Spirits of Sin - Cat Pose"
     },
     1300: {//Halloween Rebecca
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
-        specialName: "Driving Away Evil Spirits of Sin - Cat Pose",
+        specialName: "Driving Away Evil Spirits of Sin - Cat Pose"
     },
     1301: {//Jailbreak Buggy
         captain: "Boosts ATK of Slasher characters by 1.75x",
         special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
-        specialName: "Special Muggy Ball",
+        specialName: "Special Muggy Ball"
     },
     1302: {//Jailbreak Buggy
         captain: "Boosts ATK of Slasher characters by 1.75x and boosts ATK of Driven characters by 1.5x",
         captainNotes: "The bonus is cumulative. Slasher Driven characters get a 2.625x bonus.",
         special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
-        specialName: "Special Muggy Ball",
+        specialName: "Special Muggy Ball"
     },
     1303: {//Jailbreak Mr. 3
         captain: "Boosts ATK of Cerebral characters by 1.5x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 60% for 2 turns",
-        specialName: "Extra Large Candle Wall",
+        specialName: "Extra Large Candle Wall"
     },
     1304: {//Jailbreak Mr. 3
         captain: "Boosts ATK of Cerebral characters by 2x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 60% for 2 turns",
-        specialName: "Extra Large Candle Wall",
+        specialName: "Extra Large Candle Wall"
     },
     1305: {//Halloween Sugar
         captain:  "Boosts ATK of Cerebral characters by 1.3x and recovers 500 HP at the end of each turn",
         special: "Changes Badly Matching, [BLOCK], and [BOMB] orbs into [G] orbs. Reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Aggressive 'Trick-Or-Treat'",
+        specialName: "Aggressive \"Trick-Or-Treat\""
     },
     1306: {//Halloween Sugar
         captain:  "Boosts ATK of Cerebral characters by 1.75x and recovers 1,000 HP at the end of each turn",
         special: "Changes Badly Matching, [BLOCK], and [BOMB] orbs into [G] orbs. Reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Aggressive 'Trick-Or-Treat'",
+        specialName: "Aggressive \"Trick-Or-Treat\""
     },
     1307: {//Halloween Bartolomeo
         captain: "Boosts ATK of Driven characters by 1.75x. If you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
-        specialName: "Vulgar Provocation",
+        specialName: "Vulgar Provocation"
     },
     1308: {//Halloween Bartolomeo
         captain: "Boosts ATK of Driven characters by 2x. If you don't attack with Bartolomeo, reduces damage received by 20% for that turn.",
         special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
-        specialName: "Vulgar Provocation",
+        specialName: "Vulgar Provocation"
     },
     1309: {//Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2x, recovers 1x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
-        specialName: "Poof",
+        specialName: "Poof"
     },
     1310: {//Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
-        specialName: "Poof",
+        specialName: "Poof"
     },
     1311: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
         specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage received over a certain amount",
-        specialName: "King Cobra Machetes",
+        specialName: "King Cobra Machetes"
     },
     1312: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.75x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
         specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage received over a certain amount",
-        specialName: "King Cobra Machetes",
+        specialName: "King Cobra Machetes"
     },
     1313: {//Akainu
-        captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
+        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
-        specialName: "Meteor Volcano",
+        specialName: "Meteor Volcano"
     },
     1314: {//Akainu
-        captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
+        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
@@ -8181,7 +7659,7 @@ window.details = {
             { "description": "Boosts base ATK by 25" },
             { "description": "Boosts base ATK by 25" },
             { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -8213,7 +7691,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            },
+            }
         ],
         
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
@@ -8223,61 +7701,61 @@ window.details = {
         special: [
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
-                "cooldown": [ 15, 9 ],
+                "cooldown": [ 15, 9 ]
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
-                "cooldown": [ 20, 14 ],
+                "cooldown": [ 20, 14 ]
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, removes No Healing debuff. Recovers 13x character's RCV in HP",
-                "cooldown": [ 24, 18 ],
-            },
+                "cooldown": [ 24, 18 ]
+            }
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
         sailor: "Reduces Blindness duration by 5 turns",
-        specialName: "Echoing Cry of the Soul",
+        specialName: "Echoing Cry of the Soul"
     },
     1316: {//Coby
         captain: "Boosts ATK of all characters by 2.5x after the 2nd Perfect in a row and by 3.5x after the 5th Perfect in a row.",
         special: [
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
-                "cooldown": [ 15, 9 ],
+                "cooldown": [ 15, 9 ]
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
-                "cooldown": [ 20, 14 ],
+                "cooldown": [ 20, 14 ]
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, removes No Healing debuff. Recovers 13x character's RCV in HP",
-                "cooldown": [ 24, 18 ],
-            },
+                "cooldown": [ 24, 18 ]
+            }
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
         sailor: "Reduces Blindness duration by 5 turns",
-        specialName: "Echoing Cry of the Soul",
+        specialName: "Echoing Cry of the Soul"
     },
     1317: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "#{ignoreBarrier}",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Super Large Iron Ball",
+        specialName: "Super Large Iron Ball"
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "#{ignoreBarrier}",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Super Large Iron Ball",
+        specialName: "Super Large Iron Ball"
     },
     1319: {//Lady Tsuru
         captain: "Heals for 1x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
         specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 32,000 : for each hit}",
         sailor: "Reduces Paralysis duration by 1 turn",
-        specialName: "A Decree of the Veteran",
+        specialName: "A Decree of the Veteran"
     },
     1320: {//Lady Tsuru
         captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
@@ -8300,7 +7778,7 @@ window.details = {
             { "description": "Aquire new Captain Ability: Boosts ATK of all characters by 1.2x, heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .3x her RCV at the end of the turn each time you hit a Perfect" },
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -8322,20 +7800,20 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            },
+            }
         ]
     },
     1321: {//Momonga
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
-        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
+        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character"
     },
     1322: {//Momonga
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.5x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
-        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
+        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character"
     },
     1323: {//Onigumo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.3x",
@@ -8356,42 +7834,42 @@ window.details = {
     1325: {//Halloween Corazon
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "If HP is above 99%, changes [STR], [DEX], and [QCK] orbs into Matching orbs for Cerebral and Free Spirit characters",
-        specialName: "Amulet Flame",
+        specialName: "Amulet Flame"
     },
     1326: {//Halloween Corazon
         captain: "Boosts ATK by 1.3x and recovers 4x character's RCV in HP at the end of each turn",
         special: "If HP is above 99%, changes [STR], [DEX], and [QCK] orbs into Matching orbs for Cerebral and Free Spirit characters",
-        specialName: "Amulet Flame",
+        specialName: "Amulet Flame"
     },
     1327: {//Fornight Leo
         captain: "Boosts ATK of characters with cost 20 or less by 2x",
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
-                "cooldown": [ 11, 4 ],
+                "cooldown": [ 11, 4 ]
             },
             {
                 "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
-                "cooldown": [ 19, 12 ],
+                "cooldown": [ 19, 12 ]
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Tail Hammer",
+        specialName: "Tail Hammer"
     },
     1328: {//Fornight Leo
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
-                "cooldown": [ 11, 4 ],
+                "cooldown": [ 11, 4 ]
             },
             {
                 "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
-                "cooldown": [ 19, 12 ],
+                "cooldown": [ 19, 12 ]
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Tail Hammer",
+        specialName: "Tail Hammer"
     },
     1329: {//Wicca
         captain: "Reduces cooldown of Fighter and Free Spirit specials by 1 turn at the start of the fight. Gives chance of duplicating a drop upon completion of the island.",
@@ -8399,223 +7877,185 @@ window.details = {
         special: [
             {
                 "description": "Deals 6 fixed damage to all enemies. Randomizes orbs of upper row characters",
-                "cooldown": [ 9, 3 ],
+                "cooldown": [ 9, 3 ]
             },
             {
                 "description": "Deals 15 fixed damage to all enemies. Recovers 3x character's RCV in HP",
-                "cooldown": [ 11, 5 ],
+                "cooldown": [ 11, 5 ]
             },
             {
                 "description": "Deals 300 fixed damage to all enemies. Boosts the Color Affinity of Fighter and Free Spirit characters by 1.25x",
-                "cooldown": [ 16, 10 ],
-            },
+                "cooldown": [ 16, 10 ]
+            }
         ],
         specialName: "The Work of Fairies",
-        specialNotes: "#{colorAffinity : 1.25}<br>#{stages}",
+        specialNotes: "#{colorAffinity : 1.25}<br>#{stages}"
     },
     1330: {//Gancho
         captain: "Boosts ATK of Striker characters by 1.5x and recovers 2x character's RCV in HP at the end of each turn",
         special: "Switches orbs between slots twice. Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
-        specialName: "Tonta Knowledge",
+        specialName: "Tonta Knowledge"
     },
     1331: {//Mansherry
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: [
             {
                 "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
-                "cooldown": [ 18, 11 ],
+                "cooldown": [ 18, 11 ]
             },
             {
                 "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
-                "cooldown": [ 24, 17 ],
-            },
+                "cooldown": [ 24, 17 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Tears of Healing",
+        specialName: "Tears of Healing"
     },
     1332: {//Mansherry
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: [
             {
                 "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
-                "cooldown": [ 18, 11 ],
+                "cooldown": [ 18, 11 ]
             },
             {
                 "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
-                "cooldown": [ 24, 17 ],
-            },
+                "cooldown": [ 24, 17 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Tears of Healing",
+        specialName: "Tears of Healing"
     },
     1333: {//Kabu
         captain: "Boosts ATK of [STR] and Powerhouse characters by 1.4x",
         captainNotes: "The bonus is cumulative. [STR] Powerhouse characters get a 1.96x bonus.",
         special: "Slightly boosts chances of getting [STR] orbs and boosts own ATK by 1.2x for 2 turns",
-        specialName: "Yellow Kabu Squad",
+        specialName: "Yellow Kabu Squad"
     },
     1334: {//Bian
         captain: "Boosts ATK of [DEX] and Free Spirit characters by 1.4x",
         captainNotes: "The bonus is cumulative. [DEX] Free Spirit characters get a 1.96x bonus.",
         special: "Poisons all enemies and randomizes all orbs",
-        specialName: "Pink Bee Squad",
+        specialName: "Pink Bee Squad"
     },
     1335: {//Wedding Sabo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight. Boosts ATK of Free Spirit characters by 1.5x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
-        specialName: "Gentleman's Welcome",
+        specialName: "Gentleman's Welcome"
     },
     1336: {//Wedding Sabo
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
-        specialName: "Gentleman's Welcome",
+        specialName: "Gentleman's Welcome"
     },
     1337: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
         special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
-        specialName: "Brushman's Brush",
+        specialName: "Brushman's Brush"
     },
     1338: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
         special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
-        limit: [
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
-        ],
-        potential: [
-            {
-                "Name": "[INT] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [INT] characters by 1%",
-                    "Level 2: Reduce damage taken from [INT] characters by ?%",
-                    "Level 3: Reduce damage taken from [INT] characters by ?%",
-                    "Level 4: Reduce damage taken from [INT] characters by ?%",
-                    "Level 5: Reduce damage taken from [INT] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Slot Bind Self-reduction",
-                "description": [ 
-                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
-                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1339: {//Chopper Jump Point
         captain: "Boosts ATK of [DEX] characters by 2.25x",
         special: [
             {
                 "description": "Reduces Paralysis duration by 1 turn. Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 18, 8 ],
+                "cooldown": [ 18, 8 ]
             },
             {
                 "description": "Reduces Paralysis duration by 2 turn. Adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 23, 13 ],
+                "cooldown": [ 23, 13 ]
             },
             {
                 "description": "Reduces Paralysis duration by 2 turn. Adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 25, 15 ],
-            },
+                "cooldown": [ 25, 15 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Flight Power Strengthening - Jump Point",
+        specialName: "Flight Power Strengthening - Jump Point"
     },
     1340: {//Gedatsu
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
-        specialName: "Swamp Cloud Burger",
+        specialName: "Swamp Cloud Burger"
     },
     1341: {//Getdatsu
         captain: "Boosts ATK of [QCK] characters by 1.75x. After scoring 3 hits below Good in a row, boosts ATK of [QCK] characters by 2.625x instead.",
         special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
-        specialName: "Swamp Cloud Burger",
+        specialName: "Swamp Cloud Burger"
     },
     1342: {//Dadan
         captain: "Boosts HP of [PSY] characters by 1.75x",
         special: "Reduces Silence duration by 2 turns",
         specialNotes: "#{silence}",
-        specialName: "Rogue Threat",
+        specialName: "Rogue Threat"
     },
     1343: {//Porchemy
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2x.",
         special: "Deals 13x character's ATK in [DEX] damage to one enemy, and boosts ATK against enemies with reduced defense by 1.3x for 1 turn",
-        specialName: "Spiked Glove of Punishment",
+        specialName: "Spiked Glove of Punishment"
     },
     1344: {//Bluejam
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2.25x.",
         special: "Deals 20x character's ATK in [STR] damage to all enemies, and boosts ATK of Driven characters by 1.3x for 1 turn",
-        specialName: "Bullet Purge",
+        specialName: "Bullet Purge"
     },
     1345: {//Jimbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
         special: "Reduces Despair duration by 5 turns. Reduces Special Cooldown of your top row by 1 turn",
-        specialName: "Gathering Strength for a Counter Attack",
+        specialName: "Gathering Strength for a Counter Attack"
     },
     1346: {//Heracles'n
         captain: "Boosts ATK, HP and RCV of Shooter and Cerebral characters by 1.5x",
         special: "Randomizes all orbs, including [BLOCK] orbs, switches orbs between slots 3 times",
-        specialName: "Survival Techniques of the Hungry Baron",
+        specialName: "Survival Techniques of the Hungry Baron"
     },
     1347: {//Torino Kingdom Monsters
         special: "Change own orb into [PSY], and deals 25x character's attack in [PSY] damage to one enemy",
-        specialName: "Tsubami Behemoth",
+        specialName: "Tsubami Behemoth"
     },
     1348: {//Humandrills
         special: "Boosts ATK of all characters by 1.2x for 2 turns and amplifies the effect of orbs by 1.2x for 2 turns",
-        specialName: "Imitation Tactics",
+        specialName: "Imitation Tactics"
     },
     1349: {//Haredas
         captain: "Boosts ATK of Cerebral characters by 1.5x and their RCV by 1.75x",
         special: "Empty all slots including [BLOCK] orbs, and boosts ATK of Cerebral characters by 1.2x for 1 turn",
-        specialName: "Gust 'Wind Knot'",
+        specialName: "Gust \"Wind Knot\""
     },
     1350: {//Longarm Tribe Theives
         special: "Switches orbs between slots 3 times",
-        specialName: "Longarm Tribe of Tehna Gehna",
+        specialName: "Longarm Tribe of Tehna Gehna"
     },
     1351: {//Tequila Wolf Guard
         special: "Reduces the defense of all by 50% and delays all enemies for 1 turn",
-        specialName: "Covering Fire",
+        specialName: "Covering Fire"
     },
     1352: {//Ivankov
         captain: "Boosts ATK of Fighter characters by 2x at the start of the chain, boosts ATK of Fighter characters by 3.5x after the 5th Perfect in a row",
         special: "Following the activation of the special, if every unit scores a Perfect hit, reduces damage received by 90% in the following turn",
-        specialName: "Rolling Beauty",
+        specialName: "Rolling Beauty"
     },
     1353: {//Rayleigh
         captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Deals 50,000 Fixed damage to one enemy, adds 0.5 to Chain multiplier for 1 turn",
-        specialName: "Guidence to Control Haki",
+        specialName: "Guidence to Control Haki"
     },
     1354: {//Secret Rayleigh
         captain: "Boosts chain multiplier by 2x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Straight Stimultaion",
-        specialNotes: "#{orb : 1.5x}",
+        specialNotes: "#{orb : 1.5x}"
     },
     1355: {//Secret Rayleigh
         captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Straight Stimultaion",
-        specialNotes: "#{orb : 1.5x}",
+        specialNotes: "#{orb : 1.5x}"
     },
     1356: {//Pekoms
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
@@ -8632,245 +8072,243 @@ window.details = {
     1358: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.5x and the HP of Striker characters by 1.5x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
-        specialName: "The Long Legged Gentleman's Resolution",
+        specialName: "The Long Legged Gentleman's Resolution"
     },
     1359: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.75x and the HP of Striker characters by 1.75x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
-        specialName: "The Long Legged Gentleman's Resolution",
+        specialName: "The Long Legged Gentleman's Resolution"
     },
     1360: {//Winter Luffy
         captain: "Boosts ATK characters with cost 30 or less by 2x and their HP by 1.2x",
         special: "Changes own orb into [QCK], deals 15x character's ATK in [QCK] damage to one enemy",
-        specialName: "Gum-Gum Twin Jet Pistol: Snowflake",
+        specialName: "Gum-Gum Twin Jet Pistol: Snowflake"
     },
     1361: {//6* Zoro
         captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
         special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain or Friend/Guest Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
-        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
+        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths"
     },
     1362: {//6* Zoro
         captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
         special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain or Friend/Guest Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
-        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
+        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths"
     },
     1363: {//Timeskip Franky
         captain: "Boosts ATK of [PSY] characters by 2x, reduces damage received by 10%",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts base HP of [PSY] characters by 100",
-        specialName: "Franky Fireball",
+        specialName: "Franky Fireball"
     },
     1364: {//Timeskip Franky
         captain: "Boosts ATK of [PSY] characters by 2.5x, reduces damage received by 10%",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts base HP of [PSY] characters by 100",
-        specialName: "Franky Fireball",
+        specialName: "Franky Fireball"
     },
     1365: {//Timeskip Nami
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: [
             {
                 "description": "Reduces Paralysis and Silence duration by 1 turn. Delays all enemies for 1 turn",
-                "cooldown": [ 13, 8 ],
+                "cooldown": [ 13, 8 ]
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 2 turns. Delays all enemies for 1 turn",
-                "cooldown": [ 15, 10 ],
+                "cooldown": [ 15, 10 ]
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": [ 18, 13 ],
-            },
+                "cooldown": [ 18, 13 ]
+            }
         ],
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}<br>#{stages}",
-        specialName: "Black Ball - Thundercloud Rod",
+        specialName: "Black Ball - Thundercloud Rod"
     },
     1366: {//Timeskip Nami
         captain: "Boosts RCV of Cerebral characters by 1.5x and their ATK by 2.75x if they have a matching orb, by 1.5x otherwise",
         special: [
             {
                 "description": "Reduces Paralysis and Silence duration by 1 turn. Delays all enemies for 1 turn",
-                "cooldown": [ 13, 8 ],
+                "cooldown": [ 13, 8 ]
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 2 turns. Delays all enemies for 1 turn",
-                "cooldown": [ 15, 10 ],
+                "cooldown": [ 15, 10 ]
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": [ 18, 13 ],
-            },
+                "cooldown": [ 18, 13 ]
+            }
         ],
         sailorNotes: "#{silence}<br>#{stages}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
-        specialName: "Black Ball - Thundercloud Rod",
+        specialName: "Black Ball - Thundercloud Rod"
     },
     1367: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 2x",
         special: [
             {
                 "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
-                "cooldown": [ 11, 6 ],
+                "cooldown": [ 11, 6 ]
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": [ 20, 15 ],
-            },
+                "cooldown": [ 20, 15 ]
+            }
         ],
         specialNotes: "#{orb : 1.75x}<br>#{stages}",
         sailor: "Boosts base ATK, HP and RCV of all characters by 50",
-        specialName: "Sky Walk",
+        specialName: "Sky Walk"
     },
     1368: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: [
             {
                 "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
-                "cooldown": [ 11, 6 ],
+                "cooldown": [ 11, 6 ]
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": [ 20, 15 ],
-            },
+                "cooldown": [ 20, 15 ]
+            }
         ],
         specialNotes: "#{orb : 1.75x}<br>#{stages}",
         sailor: "Boosts base ATK, HP and RCV of all characters by 50",
-        specialName: "Sky Walk",
+        specialName: "Sky Walk"
     },
     1369: {//Timeskip Chopper
         captain: "Boosts ATK of [QCK] characters by 1.5x and their HP and RCV by 1.2x",
         special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Kakuho: Elf",
+        specialName: "Kakuho: Elf"
     },
     1370: {//Timeskip Chopper
         captain: "Boosts ATK of [QCK] characters by 2x and their HP and RCV by 1.2x",
         special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Kakuho: Elf",
+        specialName: "Kakuho: Elf"
     },
     1371: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 2nd Perfect in a row and by 2.5x after the 4th Perfect in a row.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
-        specialName: "Wild Plan",
+        specialName: "Wild Plan"
     },
     1372: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 2nd Perfect in a row and by 3x after the 4th Perfect in a row.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
-        specialName: "Wild Plan",
+        specialName: "Wild Plan"
     },
     1373: {//Magellan
         captain: "Boosts ATK of INT characters by 1.5x and their HP by 1.2x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Poisons all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 25, 10 ],
+                "cooldown": [ 25, 10 ]
             },
             {
                 "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 31, 16 ],
-            },
+                "cooldown": [ 31, 16 ]
+            }
         ],
         specialName: "Poison Dragon",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}"
     },
     1374: {//Magellan
         captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.5x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Poisons all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 25, 10 ],
+                "cooldown": [ 25, 10 ]
             },
             {
                 "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 31, 16 ],
-            },
+                "cooldown": [ 31, 16 ]
+            }
         ],
         specialName: "Poison Dragon",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}",
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}"
     },
     1375: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, Increases damage received by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
-        specialName: "Deadly Fangs of Rage",
+        specialName: "Deadly Fangs of Rage"
     },
     1376: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, Increases damage received by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
-        specialName: "Deadly Fangs of Rage",
+        specialName: "Deadly Fangs of Rage"
     },
     1377: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.3x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
         sailor: "Boosts amount healed from [RCV] orbs by 125 each",
-        specialName: "Sincere Devotion",
+        specialName: "Sincere Devotion"
     },
     1378: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.75x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
         sailor: "Boosts amount healed from [RCV] orbs by 125 each",
-        specialName: "Sincere Devotion",
+        specialName: "Sincere Devotion"
     },
     1379: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turn.",
         specialName: "A Decision Made over Sake",
-        specialNotes: "#{orb : 2x}",
+        specialNotes: "#{orb : 2x}"
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turn.",
         specialName: "A Decision Made over Sake",
-        specialNotes: "#{orb : 2x}",
+        specialNotes: "#{orb : 2x}"
     },
     1381: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Strawberry Smile",
-        specialNotes: "#{silence}",
+        specialNotes: "#{silence}"
     },
     1382: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.75x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
-        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Strawberry Smile",
-        specialNotes: "#{silence}",
+        specialNotes: "#{silence}"
     },
     1383: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialNotes: "#{silence}",
-        specialName: "Angry Extermination of Bugs",
+        specialName: "Angry Extermination of Bugs"
     },
     1384: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2.5x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialNotes: "#{silence}",
-        specialName: "Angry Extermination of Bugs",
+        specialName: "Angry Extermination of Bugs"
     },
     1385: {//Rebecca
         captain: "Reduces damage received by 20%",
         special: "Removes blindness",
-        specialName: "Mother's Promise",
+        specialName: "Mother's Promise"
     },
     1386: {//Rebecca
         captain: "Reduces damage received by 25%",
         special: "Removes blindness",
-        specialName: "Mother's Promise",
+        specialName: "Mother's Promise"
     },
     1387: {//Luffy 5+
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x, boosts ATK by 2.8125x after scoring 4 Perfects in a row",
@@ -8891,7 +8329,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -8913,7 +8351,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 3 turns",
                     "Level 5: Reduces No Healing duration by 4 turns"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -8921,106 +8359,68 @@ window.details = {
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 10%. Reduces special cooldown of [DEX] specials by 1 turn.",
         specialName: "Ittoriyu: Unfortunate Port Bird",
-        limit: [
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Aquire Sailor Ability 1: Restores his own special by 1 turn when it is rewinded" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Critical Hit" },
-        ],
-        potential: [
-            {
-                "Name": "[QCK] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Critical Hit",
-                "description": [ 
-                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
-                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1389: {//Nami 5+
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x.",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn",
         specialName: "Weather Egg: Thunder Breed Tempo",
-        specialNotes: "#{orb : 1.75x}",
+        specialNotes: "#{orb : 1.75x}"
     },
     1390: {//Buggy Legend
         captain: "Boosts ATK of characters with cost 40 or less by 1.5x and boosts the HP and ATK of characters with cost 41 or greater by 0.5x. Guarantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
-        specialName: "Chop-Chop Clown Car",
+        specialName: "Chop-Chop Clown Car"
     },
     1391: {//Buggy Legend
         captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of characters with cost 41 and greater by 0.5x. Guarantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
-        specialName: "Chop-Chop Clown Car",
+        specialName: "Chop-Chop Clown Car"
     },
     1392: {//Sentomaru
         captain: "Boosts ATK of Striker characters by 2x and boosts the HP of [PSY] characters by 1.25x",
         captainNotes: "A character with both classes will get both boosts",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies. If during that turn every unit scores a Perfect hit, boosts ATK of [PSY] characters by 1.75x in the following turn.",
-        specialName: "Large Cutting Axe",
+        specialName: "Large Cutting Axe"
     },
     1393: {//Demaro Black
         captain: "Boosts ATK of characters with cost 30 or less by 2x",
         special: "Boosts ATK of all characters by 1.1x, slightly boosts chances of getting matching orbs and amplifies the effect of orbs by 1.1x for 7 turns",
-        specialName: "Three Forked Tongue",
+        specialName: "Three Forked Tongue"
     },
     1394: {//Kimono Baby 5
         captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x and their RCV by 1.1x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
-        specialName: "Nation's Ambition",
+        specialName: "Nation's Ambition"
     },
     1395: {//Kimono Baby 5
         captain: "Boosts ATK of [STR] and [QCK] characters by 2.25x and their RCV by 1.2x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
-        specialName: "Nation's Ambition",
+        specialName: "Nation's Ambition"
     },
     1396: {//Tashigi Shambles
         captain: "Boosts ATK of Driven characters by 1.75x and the HP of Striker Characters by 1.25x",
         special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
-        specialNotes: "#{randomHits : 7}",
+        specialNotes: "#{randomHits : 7}"
     },
     1397: {//Tashigi Shambles
         captain: "Boosts ATK of Driven characters by 2x and the HP of Striker Characters by 1.5x",
         special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
-        specialNotes: "#{randomHits : 7}",
+        specialNotes: "#{randomHits : 7}"
     },
     1398: {//Smoker Shambles
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x",
         special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
-        specialName: "Out-of-Control White Smoke",
+        specialName: "Out-of-Control White Smoke"
     },
     1399: {//Smoker Shambles
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, reduces damage received by 15%",
         special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
-        specialName: "Out-of-Control White Smoke",
+        specialName: "Out-of-Control White Smoke"
     },
     1400: {//Colo Gladius
         captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.3x",
@@ -9028,15 +8428,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 13x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 26, 11 ],
+                "cooldown": [ 26, 11 ]
             },
             {
                 "description": "Deals 30x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
-                "cooldown": [ 33, 18 ],
-            },
+                "cooldown": [ 33, 18 ]
+            }
         ],
         specialName: "Stonewall Punk",
-        specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
+        specialNotes: "#{colorAffinity : 1.75}<br>#{stages}"
     },
     1401: {//Colo Gladius
         captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.5x",
@@ -9044,12 +8444,12 @@ window.details = {
         special: [
             {
                 "description": "Deals 13x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 26, 11 ],
+                "cooldown": [ 26, 11 ]
             },
             {
                 "description": "Deals 30x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
-                "cooldown": [ 33, 18 ],
-            },
+                "cooldown": [ 33, 18 ]
+            }
         ],
         specialName: "Stonewall Punk",
         specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
@@ -9068,7 +8468,7 @@ window.details = {
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -9090,7 +8490,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -9099,15 +8499,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 3x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.3x for 1 turn",
-                "cooldown": [ 14, 4 ],
+                "cooldown": [ 14, 4 ]
             },
             {
                 "description": "Deals 13x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.5x for 1 turn",
-                "cooldown": [ 18, 8 ],
-            },
+                "cooldown": [ 18, 8 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Offense Battle Axe",
+        specialName: "Offense Battle Axe"
     },
     1403: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x and reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
@@ -9115,15 +8515,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
-                "cooldown": [ 13, 8 ],
+                "cooldown": [ 13, 8 ]
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
-                "cooldown": [ 18, 13 ],
-            },
+                "cooldown": [ 18, 13 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Gomu Gomu no Red Hawk",
+        specialName: "Gomu Gomu no Red Hawk"
     },
     1404: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x and reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
@@ -9131,236 +8531,173 @@ window.details = {
         special: [
             {
                 "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
-                "cooldown": [ 13, 8 ],
+                "cooldown": [ 13, 8 ]
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
-                "cooldown": [ 18, 13 ],
-            },
+                "cooldown": [ 18, 13 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Gomu Gomu no Red Hawk",
+        specialName: "Gomu Gomu no Red Hawk"
     },
     1405: {//Timeskip Usopp
         captain: "Boosts ATK of Shooter characters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "#{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100"
     },
     1406: {//Timeskip Usopp
         captain: "Boosts ATK of Shooter characters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "#{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100"
     },
     1407: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x and their RCV by 1.25x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
-        sailor: "Reduces Blindness duration by 3 turns",
+        sailor: "Reduces Blindness duration by 3 turns"
     },
     1408: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 2.25x and their RCV by 1.5x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
-        sailor: "Reduces Blindness duration by 3 turns",
+        sailor: "Reduces Blindness duration by 3 turns"
     },
     1409: {//Timeskip Brook
         captain: "Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Soul's Murder Soul: Soul Solid",
-        sailor: "Completely resists Paralysis on this character",
+        sailor: "Completely resists Paralysis on this character"
     },
     1410: {//Timeskip Brook
         captain: "Boosts chain multiplier by 2.5x. Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Soul's Murder Soul: Soul Solid",
-        sailor: "Completely resists Paralysis on this character",
+        sailor: "Completely resists Paralysis on this character"
     },
     1411: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
         special: "Reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
         specialName: "Carving Hoof Palm: Coconut",
-        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
+        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn"
     },
     1412: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's RCV to 0",
         special: "Reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shield buff enemies have",
         specialName: "Carving Hoof Palm: Coconut",
-        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
+        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn"
     },
     1413: {//6+ Whitebeard
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
         special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs including [BLOCK] orbs.",
         specialName: "Emperor's Pride",
-        limit: [
-            { "description": "Boosts base ATK by 5" },
-            { "description": "Boosts base HP by 5" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
-            { "description": "Boosts base RCV by 15" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker and Powerhouse characters by 60" },
-            { "description": "Boosts base ATK by 10" },
-            { "description": "Boosts base HP by 15" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base HP by 35" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire Potential 2: Critical Hit" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 45" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base HP by 65" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Boosts base HP by 80" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base ATK by 50" },
-            { "description": "Aquire Potential 3: Enrage" },
-        ],
-        potential: [
-            {
-                "Name": "[DEX] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
-                    "Level 2: Reduce damage taken from [DEX] characters by 3%",
-                    "Level 3: Reduce damage taken from [DEX] characters by 4%",
-                    "Level 4: Reduce damage taken from [DEX] characters by 5%",
-                    "Level 5: Reduce damage taken from [DEX] characters by 7%"
-                ]
-            },
-            {
-                "Name": "Critical Hit",
-                "description": [ 
-                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
-                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
-                ]
-            },
-            {
-                "Name": "Enrage",
-                "description": [ 
-                    "Level 1: Boosts base ATK by 25",
-                    "Level 2: Boosts base ATK by ??",
-                    "Level 3: Boosts base ATK by ??",
-                    "Level 4: Boosts base ATK by ??",
-                    "Level 5: Boosts base ATK by ??"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
-    1414: {//Shop Sanji
+    1414: {//Naked Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
         special: "Changes own orb into [INT] and reduces Special Cooldown of Powerhouse characters by 1 turn.",
-        specialName: "Are you ready?",
+        specialName: "Are you ready?"
     },
     1415: {//Fortnight Sengoku
         captain: "Boosts ATK of characters with cost 30 or less by 1.5x",
         special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
-        specialName: "Unshakeable Resolution of the Wise Master",
+        specialName: "Unshakeable Resolution of the Wise Master"
     },
     1416: {//Fortnight Sengoku
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
         special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
-        specialName: "Unshakeable Resolution of the Wise Master",
+        specialName: "Unshakeable Resolution of the Wise Master"
     },
     1417: {//Ronse
         captain: "Boosts ATK and HP of [STR] characters by 1.5x",
         special: "Cuts the current HP of all enemies by 10%, changes [BLOCK] orbs into [STR] orbs for Slasher characters",
-        specialName: "Raid Battle-Axe: One Flash",
+        specialName: "Raid Battle-Axe: One Flash"
     },
     1418: {//Stainless
         captain: "Boosts ATK and RCV of INT characters by 1.5x",
         special: "Reduces any damage received above 5,000 HP by 99% for 1 turn",
-        specialName: "Defence of the Command Line",
+        specialName: "Defence of the Command Line"
     },
     1419: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2x, reduce damage received by 10%",
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turn",
-        specialName: "Demonic Style",
+        specialName: "Demonic Style"
     },
     1420: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduce damage received by 10%",
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turn",
-        specialName: "Demonic Style",
+        specialName: "Demonic Style"
     },
     1421: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Deals 20x Character's ATK in [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
-        specialName: "Half Moon Glaive",
+        specialName: "Half Moon Glaive"
     },
     1422: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2.25x and boosts HP of Striker and Slasher characters by 1.5x",
         special: "Deals 20x Character's ATK in [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
-        specialName: "Half Moon Glaive",
+        specialName: "Half Moon Glaive"
     },
     1423: {//Coliseum T-Bone
         captain: "Boosts ATK of the whole crew by 1.75x and recovers 918 HP at end of each turn,",
         special: "If HP is below 500, reduces damage received by 99% for 1 turn",
-        specialName: "For the Sake of Justice",
+        specialName: "For the Sake of Justice"
     },
     1424: {//Coliseum Gin
         captain: "Boosts ATK of Striker characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : higher : 1 + 1.25 * (remaining HP) / (total HP) : 2.25 : 1}",
         special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
-        specialName: "General Commander's Fight",
+        specialName: "General Commander's Fight"
     },
     1425: {//Don Sai
         captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
         special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "Military Leg Heel",
+        specialName: "Military Leg Heel"
     },
     1426: {//Don Sai
         captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
         special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "Military Leg Heel",
+        specialName: "Military Leg Heel"
     },
     1427: {//Boo
         captain: "Boosts ATK of QCK characters by 2x",
         special: "Deals 15x character's ATK in QCK damage to one enemy that will ignore damage negating abilities and barriers.",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Unblockable Eight Fists",
+        specialName: "Unblockable Eight Fists"
     },
     1428: {//Jean Ango
         captain: "Boosts amount of Beli received by 1.5x, and gives chance of duplicating a drop upon completion of the island",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
-        specialName: "Looting the Losers",
+        specialName: "Looting the Losers"
     },
     1429: {//Valentines Mansherry
         captain: "Boosts the RCV of Striker and Free Spirit characters by 1.5x",
         special: "Reduces Bind, Despair, and Paralysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
-        specialName: "Boy's Unknown Taste of Hard Work",
+        specialName: "Boy's Unknown Taste of Hard Work"
     },
     1430: {//Valentines Mansherry
         captain: "Boosts the RCV of Striker and Free Spirit characters by 2x",
         special: "Reduces Bind, Despair, and Paralysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
-        specialName: "Boy's Unknown Taste of Hard Work",
+        specialName: "Boy's Unknown Taste of Hard Work"
     },
     1431: {//Raid Franky
         captain: "Boosts ATK of all characters by 2x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.2x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
         special: "Deals 100x character's ATK in typeless damage to all enemies, removes enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
-        specialName: "General Cannon",
+        specialName: "General Cannon"
     },
     1432: {//Raid Franky
         captain: "Boosts ATK of all characters by 2.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.5x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
         special: "Deals 100x character's ATK in typeless damage to all enemies, removes enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
-        specialName: "General Cannon",
+        specialName: "General Cannon"
     },
     1433: {//Hody Jones
         captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and boosts HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
@@ -9368,15 +8705,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 10x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
-                "cooldown": [ 12, 7 ],
+                "cooldown": [ 12, 7 ]
             },
             {
                 "description": "Deals 60x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
-                "cooldown": [ 22, 17 ],
-            },
+                "cooldown": [ 22, 17 ]
+            }
         ],
         specialNotes: "#{ignoreBarrier}<br>#{stages}",
-        specialName: "Water Bullets",
+        specialName: "Water Bullets"
     },
     1434: {//Hody Jones
         captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and boosts HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
@@ -9384,45 +8721,43 @@ window.details = {
         special: [
             {
                 "description": "Deals 10x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
-                "cooldown": [ 12, 7 ],
+                "cooldown": [ 12, 7 ]
             },
             {
                 "description": "Deals 60x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
-                "cooldown": [ 22, 17 ],
-            },
+                "cooldown": [ 22, 17 ]
+            }
         ],
         specialNotes: "#{ignoreBarrier}<br>#{stages}",
-        specialName: "Water Bullets",
-        limit: "This character has a limit break path",
+        specialName: "Water Bullets"
     },
     1435: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 2x and HP of Powerhouse characters by 1.2x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew"
     },
     1436: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 2.5x and HP of Powerhouse characters by 1.25x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
-        limit: "This character has a limit break path",
+        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew"
     },
     1437: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
         captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 1.69x bonus.",
         special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by 1.75x and boosts ATK against delayed enemies by 1.5x for 1 turn",
         specialName: "Squid Spear",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew"
     },
     1438: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.6x",
         captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 2.56x bonus.",
         special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by 1.75x and boosts ATK against delayed enemies by 1.5x for 1 turn",
         specialName: "Squid Spear",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew"
     },
     1439: {//Daruma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.2x",
@@ -9430,7 +8765,7 @@ window.details = {
         specialNotes: "#{silence}",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}"
     },
     1440: {//Daruma
         captain: "Reduces cooldown of all specials by 4 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.5x",
@@ -9438,36 +8773,33 @@ window.details = {
         specialNotes: "#{silence}",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "#{silence}",
-        limit: "This character has a limit break path",
+        sailorNotes: "#{silence}"
     },
     1441: {//Zeo
         captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
-        sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
+        sailor: "Completely resists Blindness if your Captain is a Powerhouse character"
     },
     1442: {//Zeo
         captain: "Boosts ATK of [INT] characters by 2.25x and reduces damage received by 20%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
-        sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
-        limit: "This character has a limit break path",
+        sailor: "Completely resists Blindness if your Captain is a Powerhouse character"
     },
     1443: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 2.75x following a chain of Good > Great > Perfect hits",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
-        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
+        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew"
     },
     1444: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
-        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
-        limit: "This character has a limit break path",
+        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew"
     },
     1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
@@ -9478,228 +8810,227 @@ window.details = {
     1446: {//Sogeking 5+
         captain: "Boosts ATK of Shooter characters by 2x and RCV of Shooter characters by 1.25x.",
         special: "Deals random PSY damage to all enemies and delays enemies by 3 turns.",
-        specialName: "Green Star: Platanus Shuriken",
-        limit: "This character has a limit break path",
+        specialName: "Green Star: Platanus Shuriken"
     },
     1447: {//Sanji 5+
         captain: "Boosts ATK of Powerhouse characters by 2.5x and reduces damage take by 10%.",
         special: [
             {
                 "description": "Deals 5,000 fixed damage to all enemies and boosts own ATK by 1.2x for 1 turn.",
-                "cooldown": [ 15, 10 ],
+                "cooldown": [ 15, 10 ]
             },
             {
                 "description": "Deals 50,000 fixed damage to all enemies and boosts own ATK by 1.5x for 1 turn.",
-                "cooldown": [ 20, 15 ],
-            },
+                "cooldown": [ 20, 15 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Grill Shot",
+        specialName: "Grill Shot"
     },
     1448: {//Chopper 5+
         captain: "Boosts ATK of Fighter characters by 2.5x.",
         special: "Deals PSY damage according to HP. For Fighter characters, Changes [BLOCK] orbs into matching orbs.",
         specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the higher the HP is. The formula used is ???? * (current HP) / (total HP)",
-        specialName: "Weight Gain: Heavy Gong",
+        specialName: "Weight Gain: Heavy Gong"
     },
     1449: {//Violet
         captain: "Boosts ATK of Cerebral characters by 1.5x. Heals for .3x character's RCV at the end of the turn each time you hit a Great.",
         special: "Reduces the defense of all enemies by 50% for 1 turn, and if HP is below 50%, randomly changes all orbs to either [RCV] or [TND] orbs",
-        specialName: "Clairvoyance",
+        specialName: "Clairvoyance"
     },
     1450: {//Violet
         captain: "Boosts ATK of Cerebral characters by 1.75x. Heals for .5x character's RCV at the end of the turn each time you hit a Great.",
         special: "Reduces the defense of all enemies by 50% for 1 turn, and if HP is below 50%, randomly changes all orbs to either [RCV] or [TND] orbs",
-        specialName: "Clairvoyance",
+        specialName: "Clairvoyance"
     },
     1451: {//Moustache Sanji
         captain: "Boosts ATK of [DEX] characters by 2.25x if they have a matching orb, by 1.5x otherwise. Slightly boosts chances of getting [DEX] orbs",
         special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 2 turns",
-        specialName: "Diable Jambe: Love Shot",
+        specialName: "Diable Jambe: Love Shot"
     },
     1452: {//Moustache Sanji
         captain: "Boosts ATK of [DEX] characters by 2.5x if they have a matching orb, by 2x otherwise. Slightly boosts chances of getting [DEX] orbs",
         special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 2 turns",
-        specialName: "Diable Jambe: Love Shot",
+        specialName: "Diable Jambe: Love Shot"
     },
     1453: {//Valentines Margeurite
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.5x",
         special: "Changes all orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
-        specialName: "Doki Doki Heart",
+        specialName: "Doki Doki Heart"
     },
     1454: {//Valentines Margeurite
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x and their RCV by 1.5x",
         special: "Changes all orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [DEX], bottom row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
-        specialName: "Doki Doki Heart",
+        specialName: "Doki Doki Heart"
     },
     1455: {//Coliseum Don Chinjao
         captain: "Boosts ATK of Driven characters by 2.5x until the first hit other than Perfect and recovers 120 HP at end of each turn",
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
-                "cooldown": [ 25, 10 ],
+                "cooldown": [ 25, 10 ]
             },
             {
                 "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
-                "cooldown": [ 30, 15 ],
-            },
+                "cooldown": [ 30, 15 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Legend told to the Grandchild",
+        specialName: "Legend told to the Grandchild"
     },
     1456: {//Coliseum Don Chinjao
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 120 HP at end of each turn",
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
-                "cooldown": [ 25, 10 ],
+                "cooldown": [ 25, 10 ]
             },
             {
                 "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
-                "cooldown": [ 30, 15 ],
-            },
+                "cooldown": [ 30, 15 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Legend told to the Grandchild",
+        specialName: "Legend told to the Grandchild"
     },
     1457: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 1.75x",
         special: "Reduces Bind and Despair duration by 2 turns, for Slasher and Cerebral characters, randomizes non-matching orbs and changes own orb into [INT]",
-        specialName: "Pussyfoot Maneuver",
+        specialName: "Pussyfoot Maneuver"
     },
     1458: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 2x",
         special: "Reduces Bind and Despair duration by 2 turns, for Slasher and Cerebral characters, randomizes non-matching orbs and changes own orb into [INT]",
-        specialName: "Pussyfoot Maneuver",
+        specialName: "Pussyfoot Maneuver"
     },
     1459: {//Coliseum Miss Valentine
         captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great > Perfect hits",
         special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
-        specialName: "Crescendo Stone",
+        specialName: "Crescendo Stone"
     },
     1460: {//Coliseum Miss Valentine
         captain: "Boosts ATK by 2.14x following a chain of Good > Good > Great > Perfect hits",
         special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
-        specialName: "Crescendo Stone",
+        specialName: "Crescendo Stone"
     },
     1461: {//Snow Zoro
         captain: "Boosts ATK of [QCK] characters by 2x at the start of the chain, by 2.6x after the 3rd Perfect in a row.",
         special: "Deals 11x character's ATK in [QCK] damage to one enemy, boosts ATK of [QCK] characters by 1.5x for 1 turn",
-        specialName: "Demoltion: Ice Crush",
+        specialName: "Demoltion: Ice Crush"
     },
     1462: {//White Day Luffy
         captain: "Boosts chain multiplier by 2x",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters for 1 turn",
         sailor: "Reduces Paralysis for 2 turns for himself",
-        specialName: "Gum-Gum Gigant Axe - Sweets",
+        specialName: "Gum-Gum Gigant Axe - Sweets"
     },
     1463: {//White Day Luffy
         captain: "Boosts chain multiplier by 2.5x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters for 1 turn",
         sailor: "Reduces Paralysis for 2 turns for himself",
-        specialName: "Gum-Gum Gigant Axe - Sweets",
+        specialName: "Gum-Gum Gigant Axe - Sweets"
     },
     1464: {//White Day Chopper
         captain: "Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
-        specialName: "Devoted Healing - \"Instant Recovery\"",
+        specialName: "Devoted Healing - \"Instant Recovery\""
     },
     1465: {//White Day Chopper
         captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
-        specialName: "Devoted Healing - \"Instant Recovery\"",
+        specialName: "Devoted Healing - \"Instant Recovery\""
     },
     1466: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2x",
         special: "Reduces the defense of all enemies by 100% for 1 turn and changes own orb into [PSY] and friend captain's orb into [STR]",
-        specialName: "Rosy Pleasure",
+        specialName: "Rosy Pleasure"
     },
     1467: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2.25x and their RCV by 1.3x",
         special: "Reduces the defense of all enemies by 100% for 1 turn and changes own orb into [PSY] and friend captain's orb into [STR]",
-        specialName: "Rosy Pleasure",
+        specialName: "Rosy Pleasure"
     },
     1468: {//Fortnight Sentomaru 
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
         special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
-        specialName: "Warning of the New World",
+        specialName: "Warning of the New World"
     },
     1469: {//Fortnight Sentomaru Evolved
         captain: "Boosts ATK of [STR] characters by 2x and the HP of Powerhouse characters by 1.25x",
         captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
         special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
-        specialName: "Warning of the New World",
+        specialName: "Warning of the New World"
     },
     1470: {//Lip Service Doughty
         captain: "Boosts ATK of Slasher and Powerhouse characters by 1.5x, but boost his OWN ATK by 3x",
         captainNotes: "Captain ability does not stack with itself (Will not boost another Doughty by 3x)",
         special: "Deals 8x character's ATK as [STR] damage to one enemy. Changes captain orb into [RCV]",
-        specialName: "Meat Grinder Blade",
+        specialName: "Meat Grinder Blade"
     },
     1471: {//Albion
         captain: "Boosts ATK of Slasher and Driven characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1 + 1 * (1 - (remaining HP) / (total HP)) : 1 : 2}",
         special: "Reduces crew's HP by 90%, deals 1x the removed HP as damage to all enemies.",
-        specialName: "Deep Claw Stab",
+        specialName: "Deep Claw Stab"
     },
     1472: {//Shirahoshi
         captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
         special: [
             {
                 "description": "Changes adjacent orbs, including [BLOCK] orbs, into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
-                "cooldown": [ 13, 9 ],
+                "cooldown": [ 13, 9 ]
             },
             {
                 "description": "Changes all orbs, including [BLOCK] orbs, into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-                "cooldown": [ 22, 18 ],
-            },
+                "cooldown": [ 22, 18 ]
+            }
         ],
         specialNotes: "Rainbow orbs are the beneficial form of [BLOCK] orbs. They can not be shuffled by you or your opponent. They count as beneficial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
-        specialName: "Tears of Courage",
+        specialName: "Tears of Courage"
     },
     1473: {//Shirahoshi
         captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
         special: [
             {
                 "description": "Changes adjacent orbs, including [BLOCK] orbs into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
-                "cooldown": [ 13, 9 ],
+                "cooldown": [ 13, 9 ]
             },
             {
                 "description": "Changes all orbs, including [BLOCK] orbs into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-                "cooldown": [ 22, 18 ],
-            },
+                "cooldown": [ 22, 18 ]
+            }
         ],
         specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1474: {//King Neptune
         captain: "Boosts ATK of all characters by 1.5x and EXP gained by 1.5x",
         special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
-        specialName: "Merman Gujutsu - Ultramarine",
+        specialName: "Merman Gujutsu - Ultramarine"
     },
     1475: {//King Neptune
         captain: "Boosts ATK of all characters by 2.25x and EXP gained by 1.5x",
         captainNotes: "EXP boost does not take effect if he becomes your capatin in the middle of the adventure.",
         special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
-        specialName: "Merman Gujutsu - Ultramarine",
+        specialName: "Merman Gujutsu - Ultramarine"
     },
     1476: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
         sailor: "Boosts base HP, RCV and ATK of all characters by 50",
-        specialName: "Merman Gujutsu - Spear of the Ages",
+        specialName: "Merman Gujutsu - Spear of the Ages"
     },
     1477: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2.5x and boosts HP of Powerhouse characters by 1.25x",
@@ -9707,14 +9038,14 @@ window.details = {
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
         sailor: "Boosts base HP, RCV and ATK of all characters by 50",
         specialName: "Merman Gujutsu - Spear of the Ages",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1478: {//Caribou
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 1.75x after the 22nd hit, by 2x after the 33th hit, by 3x after the 44th hit",
         special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
         specialNotes: "#{randomHits : 15}",
         sailor: "Completely resists Paralysis on this character",
-        specialName: "Swamp-Swamp Gatling Gun",
+        specialName: "Swamp-Swamp Gatling Gun"
     },
     1479: {//Caribou
         captain: "Boosts ATK of all characters by 1.75x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 33th hit, by 3.5x after the 44th hit",
@@ -9737,7 +9068,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -9759,7 +9090,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -9769,7 +9100,7 @@ window.details = {
         specialNotes: "#{ignoreBarrier}<br>#{silence}",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "#{rewind : 1}<br>#{silence}",
-        specialName: "Stalking Rose Axe",
+        specialName: "Stalking Rose Axe"
     },
     1481: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after the 2nd Perfect in a row and by 3.5x after the 5th Perfect in a row.",
@@ -9777,63 +9108,63 @@ window.details = {
         specialNotes: "#{ignoreBarrier}<br>#{silence}",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "#{rewind : 1}<br>#{silence}",
-        specialName: "Stalking Rose Axe",
+        specialName: "Stalking Rose Axe"
     },
     1482: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
-        specialName: "Foretold Catastrophe",
+        specialName: "Foretold Catastrophe"
     },
     1483: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2.5x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
-        specialName: "Foretold Catastrophe",
+        specialName: "Foretold Catastrophe"
     },
     1484: {//Wild Sanji
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
         special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
         sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
-        specialName: "Wild Shot",
+        specialName: "Wild Shot"
     },
     1485: {//Wild Sanji
         captain: "Boosts HP and RCV of all characters by 1.2x and boosts ATK by 3.25x after scoring 3 Perfects in a row",
         special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
         sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
-        specialName: "Wild Shot",
+        specialName: "Wild Shot"
     },
     1486: {//Coliseum Ideo
         captain: "Boosts ATK of Fighter characters by 2.5x if they have a matching orb.",
         special: "Increases damage received by 2x for 2 turns, deals 15x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Destruction Cannon: Hidden Bullet",
+        specialName: "Destruction Cannon: Hidden Bullet"
     },
     1487: {//Coliseum Ideo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 3x if they have a matching orb.",
         special: "Increases damage received by 2x for 2 turns, deals 15x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Destruction Cannon: Hidden Bullet",
+        specialName: "Destruction Cannon: Hidden Bullet"
     },
     1488: {//Coliseum Don Krieg
         captain: "Boosts ATK of Driven characters by 1.5x, reduces damage received by 20%",
         special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Rate Up and Orb Rate Down Buffs",
-        specialName: "Great Battle Spear",
+        specialName: "Great Battle Spear"
     },
     1489: {//Coliseum Don Krieg
         captain: "Boosts ATK of Driven characters by 2x, reduces damage received by 20%",
         special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Rate Up and Orb Rate Down Buffs",
-        specialName: "Great Battle Spear",
+        specialName: "Great Battle Spear"
     },
     1490: {//Coliseum Mr. 5
         captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
-        specialName: "Explosion Blocking Escape",
+        specialName: "Explosion Blocking Escape"
     },
     1491: {//Coliseum Mr. 5
         captain: "Boosts ATK by 2x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
-        specialName: "Explosion Blocking Escape",
+        specialName: "Explosion Blocking Escape"
     },
     1492: {//6+ Sabo
         captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
@@ -9841,282 +9172,282 @@ window.details = {
         special: [
             {
                 "description": "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn you score 5 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ 18, 12 ],
+                "cooldown": [ 18, 12 ]
             },
             {
                 "description": "Boosts ATK of Free Spirit characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ 23, 17 ],
-            },
+                "cooldown": [ 23, 17 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Reborn - Fire",
+        specialName: "Reborn - Fire"
     },
     1493: {//STR Fishman Outlaw
         captain: "Boosts ATK of [STR] characters by 1.5x",
         special: "Deals 5 hits of random typeless damage to random enemies",
         specialNotes: "#{randomHits : 5}",
-        specialName: "Random Light Blows",
+        specialName: "Random Light Blows"
     },
     1494: {//QCK Fishman Outlaw
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Locks captain's orb for 1 turn",
-        specialName: "Captain Slot Hold: Light",
+        specialName: "Captain Slot Hold: Light"
     },
     1495: {//DEX Fishman Outlaw
         captain: "Boosts ATK of [DEX] characters by 1.5x",
         special: "Reduces Silence duration by 1 turn",
         specialNotes: "#{silence}",
-        specialName: "Special Seal Recovery: Light",
+        specialName: "Special Seal Recovery: Light"
     },
     1496: {//INT Fishman Outlaw
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
         special: "Reduces Despair duration by 2 turns",
-        specialName: "Captain Soul Recovery",
+        specialName: "Captain Soul Recovery"
     },
     1497: {//PSY Fishman Outlaw
         captain: "Boosts ATK of Shooter characters by 1.5x",
         special: "Boosts own ATK by 1.5x for 1 turn",
-        specialName: "Light Attack Boost",
+        specialName: "Light Attack Boost"
     },
     1498: {//STR Fishman Guard
         captain: "Boosts ATK, HP and RCV of [STR] characters by 1.2x",
         special: "Changes Captain's orb into [STR]",
-        specialName: "Captain Slot Change - [STR]",
+        specialName: "Captain Slot Change - [STR]"
     },
     1499: {//QCK Fishman Guard
         captain: "Boosts ATK, HP and RCV of [QCK] characters by 1.2x",
         special: "Changes Captain's [BLOCK] orbs into Matching orbs",
-        specialName: "Captain [BLOCK] Slot Change - Matching",
+        specialName: "Captain [BLOCK] Slot Change - Matching"
     },
     1500: {//DEX Fishman Guard
         captain: "Boosts ATK, HP and RCV of [DEX] characters by 1.2x",
         special: "Recovers 2000 HP",
-        specialName: "First Aid",
+        specialName: "First Aid"
     },
     1501: {//Caribou
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of characters with cost 15 or less by 2x",
         special: "Reduces crew's current HP by 50%, boosts ATK of all characters by 1.3x for 1 turn",
-        specialName: "Conviction of God's Will",
+        specialName: "Conviction of God's Will"
     },
     1502: {//Coribou
         captain: "Reduces damage received from [PSY] and [INT] enemies by 30%",
         special: "For Driven characters, randomizes non-matching orbs",
-        specialName: "Confession Burial",
+        specialName: "Confession Burial"
     },
     1503: {//Hammond
         captain: "Boosts ATK of Powerhouse characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : ??? + ??? * (1 - (remaining HP) / (total HP)) : ??? : 2.25}",
         special: "Changes own orb into [QCK] and changes adjacent orbs into [EMPTY] orbs",
-        specialName: "Absurd Invitation",
+        specialName: "Absurd Invitation"
     },
     1504: {//Vander Decken IX
         captain: "Boosts ATK of Driven characters by 2x. After scoring 3 Perfects in a row, boosts ATK of Driven characters by 2.4x instead.",
         special: "Changes the orbs in the middle row into [EMPTY] orbs and deals 20x character's ATK as [DEX] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Inescapable Pursuit",
+        specialName: "Inescapable Pursuit"
     },
     1505: {//Hody Jones
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.25x if HP is below 30% at the start of the turn",
         special: "Deals 15x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
-        specialName: "Shark Arrows",
+        specialName: "Shark Arrows"
     },
     1506: {//Hody Jones
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.5x if HP is below 30% at the start of the turn, 2.25x otherwise",
         special: "Deals 15x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
-        specialName: "Shark Arrows",
+        specialName: "Shark Arrows"
     },
     1507: {//White Day Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 1.69x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
         sailor: "Boosts base ATK of all characters by 15",
-        specialName: "Diable Jambe - Concassé Baked",
+        specialName: "Diable Jambe - Concassé Baked"
     },
     1508: {//White Day Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
         sailor: "Boosts base ATK of all characters by 15",
-        specialName: "Diable Jambe - Concassé Baked",
+        specialName: "Diable Jambe - Concassé Baked"
     },
     1509: {//Haruta
         captain: "Reduces cooldown of Slasher and Cerebral specials by 1 turn at the start of the fight. Boosts ATK of [INT] characters by 2x.",
         special: "Deals 12x character's ATK in INT damage to one enemy and reduces damage received from PSY enemies by 80%.",
         specialName: "Honorable Blade",
         sailor: "Reduces Silence duration against this unit by 2 turns",
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}"
     },
     1510: {//Speed Jiru
         captain: "Boosts ATK of Driven and Striker characters by 2x",
         special: "Deals 12,500 fixed damage to one enemy",
         specialName: "Acceleration Lance",
-        sailor: "When HP is above 70% at the start of the turn, boosts ATK of Striker characters by 20",
+        sailor: "When HP is above 70% at the start of the turn, boosts ATK of Striker characters by 20"
     },
     1511: {//Atmos
         captain: "Boosts ATK of PSY characters by 2x",
         special: "Reduces Despair duration by 3 turns, boosts own ATK by 1.5x for 1 turn",
         specialName: "Buffalo Roar",
-        sailor: "Boosts base ATK of Powerhouse characters by 20 if your captain is a Powerhouse character",
+        sailor: "Boosts base ATK of Powerhouse characters by 20 if your captain is a Powerhouse character"
     },
     1512: {//Kingdew
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
         special: "Removes Poison, boosts ATK of Powerhouse characters by 1.5x for 1 turn if HP is below 30% when the special is activated",
         specialName: "Enlightened Spirit",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character"
     },
     1513: {//Anniversary Sanji
         captain: "Boosts ATK of Fighter characters by 1.75x and RCV of Powerhouse characters by 1.2x",
         special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Unfamiliar Escort",
+        specialName: "Unfamiliar Escort"
     },
     1514: {//Anniversary Sanji
         captain: "Boosts ATK of Fighter characters by 2.5x and RCV of Powerhouse characters by 1.2x",
         special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Unfamiliar Escort",
+        specialName: "Unfamiliar Escort"
     },
     1515: {//White Day Brook
         captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x",
         special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
         specialName: "Three-Verse Humming: Arrow-Notch Slash - Hail",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
     },
     1516: {//White Day Brook
         captain: "Boosts ATK of [STR] and [QCK] characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
         specialName: "Three-Verse Humming: Arrow-Notch Slash - Hail",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
     },
     1517: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet",
+        specialName: "Spring Hopper - Bullet"
     },
     1518: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet",
+        specialName: "Spring Hopper - Bullet"
     },
     1519: {//Dadan
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of Slasher characters by 1.5x",
         special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
-        specialName: "Break by the Fireplace",
+        specialName: "Break by the Fireplace"
     },
     1520: {//Dadan
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of Slasher characters by 2x",
         special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
-        specialName: "Break by the Fireplace",
+        specialName: "Break by the Fireplace"
     },
     1521: {//Dogra
         captain: "Boosts ATK of [QCK] and Slasher characters by 1.2x",
         captainNotes: "The bonus is cumulative. [QCK] Slasher characters get a 1.44x bonus.",
         special: "Reduces Despair duration by 1 turn, recovers 1000 HP at the end of each turn for 2 turns",
-        specialName: "Affectionate Circumstances",
+        specialName: "Affectionate Circumstances"
     },
     1522: {//Ace
         captain: "Boosts ATK of [DEX] characters by 1.75x and their HP by 1.2x",
         special: "Removes blindness, boosts own ATK by 1.75x for 1 turn",
-        specialName: "Demon's Temper",
+        specialName: "Demon's Temper"
     },
     1523: {//Spring Chopper
         captain: "Boosts ATK of [PSY] characters by 1.75x and recovers 1,000 HP at end of each turn",
         special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
-        specialName: "The Life Risked for the 'Sakura' Miracle",
-        sailor: "Boosts amount healed from [RCV] orbs by 124 each",
+        specialName: "The Life Risked for the \"Sakura\" Miracle",
+        sailor: "Boosts amount healed from [RCV] orbs by 124 each"
     },
     1524: {//Spring Chopper
         captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 1,224 HP at end of each turn",
         special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
-        specialName: "The Life Risked for the 'Sakura' Miracle",
-        sailor: "Boosts amount healed from [RCV] orbs by 124 each",
+        specialName: "The Life Risked for the \"Sakura\" Miracle",
+        sailor: "Boosts amount healed from [RCV] orbs by 124 each"
     },
     1525: {//Sulieman
         captain: "Boosts ATK of Slasher characters by 3.25x, reduces his own ATK multiplier by 0.0625x at the end of each turn until it is 2x",
         special: "Deals 3 hits of random typeless damage to random enemies, delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.3x for 2 turns",
         specialNotes: "#{randomHits : 3}<br>#{random : 50,000 : 150,000 : per hit}",
-        specialName: "Sorrowful Execution",
+        specialName: "Sorrowful Execution"
     },
     1526: {//Arlong
         captain: "Boosts ATK of [INT] characters by 1.75x",
         special: [
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.5x for 1 turn",
-                "cooldown": [ 16, 7 ],
+                "cooldown": [ 16, 7 ]
             },
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.75x for 1 turn",
-                "cooldown": [ 21, 12 ],
-            },
+                "cooldown": [ 21, 12 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Just 'Water Play'",
+        specialName: "Just \"Water Play\""
     },
     1527: {//Arlong
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of [INT] characters by 2x",
         special: [
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.5x for 1 turn",
-                "cooldown": [ 16, 7 ],
+                "cooldown": [ 16, 7 ]
             },
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.75x for 1 turn",
-                "cooldown": [ 21, 12 ],
-            },
+                "cooldown": [ 21, 12 ]
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Just 'Water Play'",
+        specialName: "Just \"Water Play\""
     },
     1528: {//Blenheim
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
         special: "Reduces Despair duration by 2 turns, makes STR, DEX, and QCK orbs \"beneficial\" to Powerhouse characters for 1 turn if HP is below 30% at the start of the turn",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
-        specialName: "Australian Army Aid Blade",
+        specialName: "Australian Army Aid Blade"
     },
     1529: {//Cavendish
         captain: "Boosts ATK of all characters by 1.5x, but boosts his OWN attack by 3x",
         special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
         sailor: "Reduces ATK of all characters by .5x if your captain is a [STR] or [QCK] character",
-        specialName: "Blue Bird Sword",
+        specialName: "Blue Bird Sword"
     },
     1530: {//Cavendish
         captain: "Boosts ATK of all characters by 1.75x, but boosts his OWN attack by 3.5x",
         special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
         sailor: "Reduces ATK of all characters by .5x if your captain is a [STR] or [QCK] character",
-        specialName: "Blue Bird Sword",
+        specialName: "Blue Bird Sword"
     },
     1531: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
         special: [
             {
                 "description": "Delays all enemies for 3 turns",
-                "cooldown": [ 13, 10 ],
+                "cooldown": [ 13, 10 ]
             },
             {
                 "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
-                "cooldown": [ 18, 15 ],
+                "cooldown": [ 18, 15 ]
             },
             {
                 "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
-                "cooldown": [ 24, 21 ],
-            },
+                "cooldown": [ 24, 21 ]
+            }
         ],
         specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
-        specialName: "Long-Range Attack: Bagworm",
+        specialName: "Long-Range Attack: Bagworm"
     },
     1532: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
         special: [
             {
                 "description": "Delays all enemies for 3 turns",
-                "cooldown": [ 13, 10 ],
+                "cooldown": [ 13, 10 ]
             },
             {
                 "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
-                "cooldown": [ 18, 15 ],
+                "cooldown": [ 18, 15 ]
             },
             {
                 "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
-                "cooldown": [ 24, 21 ],
-            },
+                "cooldown": [ 24, 21 ]
+            }
         ],
         specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
@@ -10151,7 +9482,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base RCV by 25" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Barrier Penetration" },
+            { "description": "Aquire Potential 3: Barrier Penetration" }
         ],
         potential: [
             {
@@ -10183,70 +9514,70 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 50%",
                     "Level 5: This character's attack will ignore barriers if HP is above 30%"
                 ]
-            },
+            }
         ]
     },
     1533: {//Rayleigh
         captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect in a row.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "The Teacher's Final Ordeal",
+        specialName: "The Teacher's Final Ordeal"
     },
     1534: {//Rayleigh
         captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect in a row.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "The Teacher's Final Ordeal",
+        specialName: "The Teacher's Final Ordeal"
     },
     1535: {//Duval
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [PSY] characters by 2.5x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Prideful Memories",
+        specialName: "Prideful Memories"
     },
     1536: {//Duval
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Prideful Memories",
+        specialName: "Prideful Memories"
     },
     1537: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooter and Striker characters by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts base HP of STR characters by 150",
-        specialName: "Greenstone Threat",
+        specialName: "Greenstone Threat"
     },
     1538: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2.5x and boosts HP of Shooter and Striker characters by 1.25x",
         special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts base HP of STR characters by 150",
-        specialName: "Greenstone Threat",
+        specialName: "Greenstone Threat"
     },
     1539: {//Perona
         captain: "Boosts ATK and RCV of characters with cost 20 or less by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts base ATK of INT characters by 50",
-        specialName: "Negative Hollow: You're All Rotten Imbeciles",
+        specialName: "Negative Hollow: You're All Rotten Imbeciles"
     },
     1540: {//Perona
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts base ATK of INT characters by 50",
-        specialName: "Negative Hollow: You're All Rotten Imbeciles",
+        specialName: "Negative Hollow: You're All Rotten Imbeciles"
     },
     1541: {//Elizabeth
         captain: "Boosts ATK by 2x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 1}",
-        specialName: "Soft and Gentle Fluffy Kisses",
+        specialName: "Soft and Gentle Fluffy Kisses"
     },
     1542: {//Elizabeth
         captain: "Boosts RCV and HP by 1.2x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 1}",
-        specialName: "Soft and Gentle Fluffy Kisses",
+        specialName: "Soft and Gentle Fluffy Kisses"
     },
     1543: {//6+ Usopp
         captain: "Boosts ATK of Shooter characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to Shooter characters. At the beginning of each Stage, increases the Attack Timer of all enemies by 1 turn",
@@ -10284,7 +9615,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base RCV by 25" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Barrier Penetration" },
+            { "description": "Aquire Potential 3: Barrier Penetration" }
         ],
         potential: [
             {
@@ -10316,505 +9647,466 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 50%",
                     "Level 5: This character's attack will ignore barriers if HP is above 30%"
                 ]
-            },
+            }
         ]
     },
     1544: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 1.75x and heals for .3x her RCV at the end of the turn each time you hit a Perfect",
         special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Bean Paste under the Petal Snow",
+        specialName: "Bean Paste under the Petal Snow"
     },
     1545: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 2.25x and heals for .5x her RCV at the end of the turn each time you hit a Perfect",
         special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Bean Paste under the Petal Snow",
+        specialName: "Bean Paste under the Petal Snow"
     },
     1546: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 1.5x and boosts HP of Free Spirit characters by 1.2x",
         special: "Boosts ATK of Free Spirit characters by 1.5x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
-        specialName: "Dawn of A Big Star",
+        specialName: "Dawn of A Big Star"
     },
     1547: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 2x and boosts HP of Free Spirit characters by 1.3x",
         special: "Boosts ATK of Free Spirit characters by 1.5x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
-        specialName: "Dawn of A Big Star",
+        specialName: "Dawn of A Big Star"
     },
     1548: {//Soul King Managers
         captain: "Boosts ATK of Driven characters by 1.5x",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 1 turn",
-        specialName: "Former Thief's Box Office",
+        specialName: "Former Thief's Box Office"
     },
     1549: {//5+ Robin
         captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Reduces Bind, Despair and Silence duration by 3 turns, and reduces Special Cooldown of all characters by 1 turn",
         specialName: "Mil Fluer: Campo de Flores",
-        specialNotes: "#{silence}",
+        specialNotes: "#{silence}"
     },
     1550: {//5+ Franky
         captain: "Boosts ATK of [INT] characters by 2.5x, reduces damage received by 10%",
         special: "Deals 35x character's ATK in [INT] damage to all enemies. Changes [TND] and [RCV] orbs on Shooter and Free Spirit characters into Matching Orbs.",
-        specialName: "Franky's Rocket Launcher",
+        specialName: "Franky's Rocket Launcher"
     },
     1551: {//5+ Brook
         captain: "Boosts ATK of Free Spirit characters by 2.5x and recovers 430 HP at end of each turn",
         special: "Delays all enemies for 1 turn and locks all orbs for 1 turn",
-        specialName: "Song of Scratches: Blizzard Slash",
+        specialName: "Song of Scratches: Blizzard Slash"
     },
     1552: {//Coliseum Hajrudin
         captain: "Boosts ATK of characters with 40 cost by 2.5x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
-        specialName: "Thunder Giant",
+        specialName: "Thunder Giant"
     },
     1553: {//Coliseum Hajrudin
         captain: "Boosts ATK of characters with 40 cost by 2.75x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
-        specialName: "Thunder Giant",
-        limit: "This character has a limit break path",
+        specialName: "Thunder Giant"
     },
     1554: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2x",
         special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
-        specialName: "Pure Body and Soul",
+        specialName: "Pure Body and Soul"
     },
     1555: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2.25x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
-        specialName: "Pure Body and Soul",
+        specialName: "Pure Body and Soul"
     },
     1556: {//Wadatsumi
         captain: "Boosts HP of STR characters by 2x",
         special: "If the HP of the enemy with the highest HP percentage is above 3,000,000 HP, boosts own ATK by 2x for 1 turn",
-        specialName: "Sailboat Sinking Fist",
+        specialName: "Sailboat Sinking Fist"
     },
     1557: {//Zeo
         captain: "Boosts ATK of Striker characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
-        specialName: "Super Sole Headbutt",
+        specialName: "Super Sole Headbutt"
     },
     1558: {//Ikaros
         captain: "Boosts ATK of Shooter characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Cuts the current HP of each enemy by 15%",
-        specialName: "Stamping Press",
+        specialName: "Stamping Press"
     },
     1559: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Reduces crew's HP by 50%, deals 55x ATK in Typeless damage to all enemies",
-        specialName: "Disorderly Drunken Frenzy Killing",
+        specialName: "Disorderly Drunken Frenzy Killing"
     },
     1560: {//Daruma
         captain: "Boosts ATK of Fighter characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Empties all slots including those with [BLOCK] orbs",
-        specialName: "Daruma Drop",
+        specialName: "Daruma Drop"
     },
     1561: {//Dosun
         captain: "Boosts ATK of [INT] characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in [INT] damage to one enemy",
-        specialName: "Explosive Nail Hammer",
+        specialName: "Explosive Nail Hammer"
     },
     1562: {//Hody Jones
         captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces own ATK multiplier by 0.1x at the end of each turn until it is 1.5x, reduces crew's current HP by 10% at the end of each turn",
         special: "Deals 60x character's ATK in [QCK] damage to one enemy, increases damage received by 2x for 2 turns, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
-        specialName: "Drugs From Heaven",
+        specialName: "Drugs From Heaven"
     },
     1563: {//Elizabello
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.75x at the start of the chain and by 2.1875x after the 5th Perfect in a row",
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
-                "cooldown": [ 17, 9 ],
+                "cooldown": [ 17, 9 ]
             },
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 15x character's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 24, 16 ],
-            },
+                "cooldown": [ 24, 16 ]
+            }
         ],
         specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
-        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack",
+        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack"
     },
     1564: {//Elizabello
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect in a row",
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
-                "cooldown": [ 17, 9 ],
+                "cooldown": [ 17, 9 ]
             },
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 15x character's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 24, 16 ],
-            },
+                "cooldown": [ 24, 16 ]
+            }
         ],
         specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
-        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack",
+        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack"
     },
     1565: {//Dagama
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 1.75x",
         special: "Reduces Special Cooldown of all characters by 1 turn and reduces crew's current HP by 10%",
-        specialName: "War of Mislead Order",
+        specialName: "War of Mislead Order"
     },
     1566: {//Dagama
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 1 turn and reduces crew's current HP by 10%",
-        specialName: "War of Mislead Order",
+        specialName: "War of Mislead Order"
     },
     1567: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
         special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "The Princess' Principle",
+        specialName: "The Princess' Principle"
     },
     1568: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 2x",
         special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "The Princess' Principle",
+        specialName: "The Princess' Principle"
     },
     1569: {//Anniversary Law
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
         special: "Randomizes all non-matching orbs, including [BLOCK] orbs and switches orbs between slots three times",
-        specialName: "ROOM Shambles・Junction",
+        specialName: "ROOM Shambles・Junction"
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
         special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. Adds 80x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 80x}",
-        specialName: "King Sword Shine",
+        specialName: "King Sword Shine"
     },
     1571: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
         special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. Adds 80x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 80x}",
-        specialName: "King Sword Shine",
+        specialName: "King Sword Shine"
     },
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
         special: "Randomly changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
-        specialName: "Ruler's Aide Flight",
+        specialName: "Ruler's Aide Flight"
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
         special: "Randomly changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
-        specialName: "Ruler's Aide Flight",
+        specialName: "Ruler's Aide Flight"
     },
     1574: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.25x",
         special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below 30% at the start of the turn, boosts own ATK by 200",
-        specialName: "Dash - Dive - Destroy",
+        specialName: "Dash - Dive - Destroy"
     },
     1575: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.25x",
         special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below 30% at the start of the turn, boosts own ATK by 200",
-        specialName: "Dash - Dive - Destroy",
+        specialName: "Dash - Dive - Destroy"
     },
     1576: {//Kin'emon
         captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. This will not override other [BLOCK] orbs.",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
-        specialName: "Flaming Flash",
+        specialName: "Flaming Flash"
     },
     1577: {//Kin'emon
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. This will not override other [BLOCK] orbs.",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
-        specialName: "Flaming Flash",
+        specialName: "Flaming Flash"
     },
     1578: {//Momonosuke
         captain: "Protects from defeat as long as HP is above 50%",
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 8, 3 ],
+                "cooldown": [ 8, 3 ]
             },
             {
                 "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 11, 6 ],
+                "cooldown": [ 11, 6 ]
             },
             {
                 "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 14, 9 ],
-            },
+                "cooldown": [ 14, 9 ]
+            }
         ],
         specialNotes: "#{stages}",
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
-        specialName: "Miraculous Flying Dragon",
+        specialName: "Miraculous Flying Dragon"
     },
     1579: {//Momonosuke
         captain: "Boosts ATK, HP and RCV of all characters by 1.25x, protects from defeat as long as HP is above 50%",
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 8, 3 ],
+                "cooldown": [ 8, 3 ]
             },
             {
                 "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 11, 6 ],
+                "cooldown": [ 11, 6 ]
             },
             {
                 "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 14, 9 ],
-            },
+                "cooldown": [ 14, 9 ]
+            }
         ],
         specialNotes: "#{stages}",
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
-        specialName: "Miraculous Flying Dragon",
+        specialName: "Miraculous Flying Dragon"
     },
     1580: {//Fortnight Law
         captain: "Boosts ATK of Free Spirit characters by 1.5x and boosts RCV of DEX characters by 1.2x",
         special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "ROOM Tact",
+        specialName: "ROOM Tact"
     },
     1581: {//Fortnight Law
         captain: "Boosts ATK of Free Spirit characters by 2x and boosts RCV of DEX characters by 1.5x",
         special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "ROOM Tact",
+        specialName: "ROOM Tact"
     },
     1582: {//Fortnight Monet
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
         special: "Recovers 10x character's RCV in HP. Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn",
-        specialName: "Observing within the Snow Storm",
+        specialName: "Observing within the Snow Storm"
     },
     1583: {//Coliseum Orlumbus
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
-        specialName: "Admiral Hug",
+        specialName: "Admiral Hug"
     },
     1584: {//Coliseum Orlumbus
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
         specialName: "Admiral Hug",
-        limit: [
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Sailor Ability 1: Makes [TND] orbs \"beneficial\" for this unit" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Critical Hit" },
-        ],
-        potential: [
-            {
-                "Name": "[INT] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [INT] characters by 1%",
-                    "Level 2: Reduce damage taken from [INT] characters by ?%",
-                    "Level 3: Reduce damage taken from [INT] characters by ?%",
-                    "Level 4: Reduce damage taken from [INT] characters by ?%",
-                    "Level 5: Reduce damage taken from [INT] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Critical Hit",
-                "description": [ 
-                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
-                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
-                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1585: {//Coliseum Helmeppo
         captain: "Boosts ATK and RCV of Slasher and Driven characters by 1.5x",
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
-        specialName: "Firey Morale",
+        specialName: "Firey Morale"
     },
     1586: {//Coliseum Helmeppo
         captain: "Boosts ATK of Slasher and Driven characters by 2x and their RCV by 1.5x",
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
-        specialName: "Firey Morale",
+        specialName: "Firey Morale"
     },
     1587: {//Legend Sanji
         captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Sky Walks into the air for 1 turn, preventing all debuffs to himself. This does not remove the his own Captain boost while he is unable to attack. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
         captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
-        specialName: "Hell Memories",
+        specialName: "Hell Memories"
     },
     1588: {//Legend Sanji
         captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Sky Walks into the air for 1 turn, preventing all debuffs to himself. This does not remove the his own Captain boost while he is unable to attack. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
         captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
-        specialName: "Hell Memories",
+        specialName: "Hell Memories"
     },
     1589: {//Anniversary Shanks
         captain: "Boosts Chain Multiplier by 3x",
         special: "Recovers 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
-        specialName: "Sharing a Cup Filled with Emotions",
+        specialName: "Sharing a Cup Filled with Emotions"
     },
     1590: {//Anniversary Shanks
         captain: "Boosts Chain Multiplier by 3.5x, Boosts HP and RCV of all characters by 1.2x",
         special: "Recovers 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
-        specialName: "Sharing a Cup Filled with Emotions",
+        specialName: "Sharing a Cup Filled with Emotions"
     },	
     1591: {//Anniversary Boa
         captain: "Boosts ATK and RCV of Fighter and Free Spirit characters by 1.5x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit and Fighter characters by 1.75x for 1 turn",
-        specialName: "Immoral Gaze",
+        specialName: "Immoral Gaze"
     },
     1592: {//Anniversary Boa
         captain: "Boosts ATK of Fighter and Free Spirit characters by 2.25x and their RCV by 1.75x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit and Fighter characters by 1.75x for 1 turn",
-        specialName: "Immoral Gaze",
+        specialName: "Immoral Gaze"
     },
     1593: {//Gear 4 Luffy
         captain: "Boosts ATK of Fighter characters by 2.5x. If you use \"King Kong Gun\" THIS LUFFY boosts ATK of Fighter characters by 4x instead for 3 turns and reduces damage taken by 56% for 3 turns.",
         special: [
             {
                 "description": "Deals 100x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter characters for 1 turn.  After 3 turns, Binds and Despairs himself for 7 turns.",
-                "cooldown": [ 13, 8 ],
+                "cooldown": [ 13, 8 ]
             },
             {
                 "description": "Deals 200x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 3 turns. After 3 turns, Binds and Despairs himself for 7 turns.",
-                "cooldown": [ 18, 13 ],
-            },
+                "cooldown": [ 18, 13 ]
+            }
         ],
         specialNotes: "#{stages}",
         sailor: "Completely resists Paralysis on this character",
-        specialName: "King Kong Gun",
+        specialName: "King Kong Gun"
     },
     1594: {//Fujitora
         captain: "Cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Gravity Blade: Fierce Tiger",
+        specialName: "Gravity Blade: Fierce Tiger"
     },
     1595: {//Fujitora
         captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.2x, cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Gravity Blade: Fierce Tiger",
+        specialName: "Gravity Blade: Fierce Tiger"
     },
     1596: {//Shirahoshi
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
-        specialName: "Great Dinner Buffet",
+        specialName: "Great Dinner Buffet"
     },
     1597: {//Shirahoshi
         captain: "Boosts ATK and RCV of [INT] characters by 1.75x",
         special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
-        specialName: "Great Dinner Buffet",
+        specialName: "Great Dinner Buffet"
     },
     1598: {//Ryuboshi
         captain: "Boosts HP of Powerhouse characters by 1.5x",
         special: "Boosts ATK of all characters by 1.2x and recovers 5x character's RCV in HP at the end of each turn for 3 turns",
-        specialName: "Musical Scale",
+        specialName: "Musical Scale"
     },
     1599: {//Manboshi
         captain: "Boosts ATK of Powerhouse characters by 1.75x",
         special: "Reduces the defense of all enemies by 50% for 1 turn. Changes own orb into [QCK]",
-        specialName: "Happy Dance",
+        specialName: "Happy Dance"
     },
     1600: {//3rd Anniversary Luffy
         captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
         special: "Deals 20x character's ATK in [PSY] damage to one enemy, locks orbs for 1 turn, and amplifies the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
-        specialName: "Right Leg Armament: Gum-Gum Battle Axe",
+        specialName: "Right Leg Armament: Gum-Gum Battle Axe"
     },
     1601: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
-        specialName: "Blood Stained 'Iron Wall'",
-        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack",
+        specialName: "Blood Stained \"Iron Wall\"",
+        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack"
     },
     1602: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect in a row",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
-        specialName: "Blood Stained 'Iron Wall'",
-        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack",
+        specialName: "Blood Stained \"Iron Wall\"",
+        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack"
     },
     1603: {//McGuy
         captain: "Boosts ATK of [STR] characters by 2.25x and their RCV by 1.25x",
         special: "Delays all enemies for 2 turns",
-        specialName: "Numb Crosscut",
+        specialName: "Numb Crosscut"
     },
     1604: {//Training Forest Ace
         captain: "Boosts ATK of [STR] characters by 1.5x",
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
-        specialName: "Fist of the Demon's Child 'Fire'",
+        specialName: "Fist of the Demon's Child \"Fire\""
     },
     1605: {//Training Forest Ace
         captain: "Boosts ATK of [STR] characters by 2x and recovers 500 HP at end of each turn",
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
-        specialName: "Fist of the Demon's Child 'Fire'",
+        specialName: "Fist of the Demon's Child \"Fire\""
     },
     1606: {//Lafitte
         captain: "Boosts ATK and RCV of [PSY] characters by 1.75x",
         special: "Randomly shuffles non-matching orbs on Shooter characters, reduces enemies defense by 50% for 1 turn and delays all enemies for 1 turn",
-        specialName: "Deprivation of Self-Consciousness",
+        specialName: "Deprivation of Self-Consciousness"
     },
     1607: {//Van augur
         captain: "Boosts ATK of Shooters by 2x",
         special: "Deals 10x character's ATK in [DEX] damage to one enemy, locks orbs for 1 turn, and boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Painless Bullet",
+        specialName: "Painless Bullet"
     },
     1608: {//Doc Q
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "For each enemy, has an extremely small chance to instantly defeat that enemy.",
         specialNotes: "#{instantKill : <1%}",
-        specialName: "Vile Fruit",
+        specialName: "Vile Fruit"
     },
     1609: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x. The exact boost is calculated as 2 + <HP recovered in the previous turn> * 0.000125 and maxes at 10k HP healed. This ignores your max HP, so it doesn't stop counting if you over-heal.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
-        specialName: "Heavy Thunder",
+        specialName: "Heavy Thunder"
     },
     1610: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x. The exact boost is calculated as 2 + <HP recovered in the previous turn> * 0.000125 and maxes at 10k HP healed. This ignores your max HP, so it doesn't stop counting if you over-heal.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
-        specialName: "Heavy Thunder",
+        specialName: "Heavy Thunder"
     },
     1611: {//Kuma
         captain: "Boosts ATK of Shooter characters by 1.75x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
         specialNotes: "#{instantKill : 10%}",
         specialName: "Paw Paw Fruit: Scatter and Fly Away",
-        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
+        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn"
     },
     1612: {//Kuma
         captain: "Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
         specialNotes: "#{instantKill : 10%}",
         specialName: "Paw Paw Fruit: Scatter and Fly Away",
-        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
+        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn"
     },
     1613: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
         sailor: "Adds 2x character's ATK as Additional Typeless Damage",
-        sailorNotes: "#{additionalDamage : 2x}",
+        sailorNotes: "#{additionalDamage : 2x}"
     },
     1614: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
         sailor: "Adds 2x character's ATK as Additional Typeless Damage",
-        sailorNotes: "#{additionalDamage : 2x}",
+        sailorNotes: "#{additionalDamage : 2x}"
     },
     1615: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Striker characters by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "#{rewind : 2}",
+        sailorNotes: "#{rewind : 2}"
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
@@ -10822,67 +10114,29 @@ window.details = {
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
-        limit: [
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Aquire Sailor Ability 1: Reduces Silence duration against this character by 3 turns" },
-            { "description": "Boosts base ATK by 45" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
-        ],
-        potential: [
-            {
-                "Name": "[INT] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [INT] characters by 1%",
-                    "Level 2: Reduce damage taken from [INT] characters by ?%",
-                    "Level 3: Reduce damage taken from [INT] characters by ?%",
-                    "Level 4: Reduce damage taken from [INT] characters by ?%",
-                    "Level 5: Reduce damage taken from [INT] characters by ?%"
-                ]
-            },
-            {
-                "Name": "[PSY] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
-                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1617: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
         special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
         specialName: "Shadow Asgard: \"Baptism\" from the Royal Shichibukai",
-        sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
+        sailor: "When any other character uses a special, reduces own cooldown by 1 turn"
     },
     1618: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2.5x",
         special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
         specialName: "Shadow Asgard: \"Baptism\" from the Royal Shichibukai",
-        sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
+        sailor: "When any other character uses a special, reduces own cooldown by 1 turn"
     },
     1619: {//6+ Raybae/Rayleigh
         captain: "Boosts chain multiplier by 4x and boosts HP and RCV of all characters by 1.2x",
         special: "Reduces Bind, Despair, and Paralysis duration by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
-        specialName: "Netherworld Conqueror",
+        specialName: "Netherworld Conqueror"
     },
     1620: {//Log Kid
         captain: "Boosts ATK of Strikers characters by 2.5x if HP is below 30% at the start of the turn",
         special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
-        specialName: "Double Steel Magnetic Arm",
+        specialName: "Double Steel Magnetic Arm"
     },
     1621: {//Log Kid
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise and boosts HP of Striker characters by 1.2x",
@@ -10903,7 +10157,7 @@ window.details = {
             { "description": "Aquire Sailor Ability #: Boosts base HP of Driven characters by 75" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -10925,7 +10179,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1622: {//Reborn Doffy
@@ -10943,17 +10197,17 @@ window.details = {
     1624: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 1.5x and boosts HP of Powerhouse characters by 1.25x",
         special: "Randomizes all orbs, cuts the current HP of all enemies by 10%, and Poisons all enemies.",
-        specialName: "Flexible Six Swords",
+        specialName: "Flexible Six Swords"
     },
     1625: {//Daruma
         captain: "Boosts ATK of Powerhouse and Fighter characters by 1.75x",
         special: "Randomizes all orbs, including [BLOCK] orbs, and reduces damage received by 50% for 1 turn.",
-        specialName: "Arching Fangs",
+        specialName: "Arching Fangs"
     },
     1626: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 20x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.5x for 1 turn",
-        specialName: "The Calm Before The Storm",
+        specialName: "The Calm Before The Storm"
     },
     1627: {//Mach Vise
         captain: "Boosts ATK Free Spirit characters by 2x",
@@ -10969,10 +10223,10 @@ window.details = {
             {
                 "description": "Reduces Chain Multiplier Limit duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
                 "cooldown": [ 31, 17 ]
-            },
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Thousand Ton Destruction",
+        specialName: "Thousand Ton Destruction"
     },
     1628: {//Mach Vise
         captain: "Boosts ATK Free Spirit and Striker characters by 2.25x and their RCV by 1.5x",
@@ -10988,26 +10242,26 @@ window.details = {
             {
                 "description": "Reduces Chain Multiplier Limit duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
                 "cooldown": [ 31, 17 ]
-            },
+            }
         ],
         specialNotes: "#{stages}",
-        specialName: "Thousand Ton Destruction",
+        specialName: "Thousand Ton Destruction"
     },
     1629: {//Ikaros Much
         captain: "Boosts ATK and HP of Striker characters by 1.5x",
         special: "Randomly changes all orbs, including [BLOCK] orbs, into [STR], [DEX], [QCK], [INT], or [PSY] orbs and changes own orb into [INT]",
-        specialName: "The Spear that Penetrated the Undersea Mountain",
+        specialName: "The Spear that Penetrated the Undersea Mountain"
     },
     1630: {//Ikaros Much
         captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
         special: "Randomly changes all orbs, including [BLOCK] orbs, into [STR], [DEX], [QCK], [INT], or [PSY] orbs and changes own orb into [INT]",
-        specialName: "The Spear that Penetrated the Undersea Mountain",
+        specialName: "The Spear that Penetrated the Undersea Mountain"
     },
     1631: {//Fisher Tiger
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
         special: "Boosts ATK of Powerhouse characters by 1.75x for 3 turns",
         specialName: "Rebellion against the \"Prohibition\" - Taboo",
-        sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn",
+        sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn"
     },
     1632: {//Fisher Tiger
         captain: "Boosts ATK of Powerhouse characters by 2.75x",
@@ -11029,7 +10283,7 @@ window.details = {
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -11051,72 +10305,72 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1633: {//Punk Hazard Dragon
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         special: "Deals 15x character's ATK in [STR] damage to all enemies and amplifies the effect of orbs by 1.25x for 1 turn",
-        specialName: "Flame Breath",
+        specialName: "Flame Breath"
     },
     1634: {//Rock and Scotch
         captain: "Boosts HP of [INT] characters by 2x",
         special: "Reduces damage received by 50% for 1 turn",
-        specialName: "COOL Ambush",
+        specialName: "COOL Ambush"
     },
     1635: {//Brownbeard
         captain: "Boosts OWN ATK by 1.5x and the ATK of Cerebral characters by 2x",
         special: "Cuts the HP of all enemies by 20% and binds himself for 5 turns",
-        specialName: "Crocodile Thrust",
+        specialName: "Crocodile Thrust"
     },
     1636: {//Caesar Clown
         captain: "Boosts ATK of Cerebral characters by 2x",
         special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns and changes [BOMB] orbs into matching orbs",
-        specialName: "Gastanet",
+        specialName: "Gastanet"
     },
     1637: {//Caesar Clown Evolved
         captain: "Boosts ATK of Cerebral characters by 2.25x and reduces damage received by 15%",
         special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns and changes [BOMB] orbs into matching orbs",
-        specialName: "Gastanet",
+        specialName: "Gastanet"
     },
     1638: {//STR Gas Mask Fodder
         special: "Boosts chances of getting [RCV] orbs for 2 turns",
-        specialName: "Meat for Meat",
+        specialName: "Meat for Meat"
     },
     1639: {//QCK Gas Mask Fodder
         special: "Reduces Paralysis duration by 1 turn",
-        specialName: "Shock Recovery: Light",
+        specialName: "Shock Recovery: Light"
     },
     1640: {//DEX Gas Mask Fodder
         special: "For 1 turn, makes STR orb \"beneficial\" for Shooter characters",
-        specialName: "Shooter Beneficial Slot: STR",
+        specialName: "Shooter Beneficial Slot: STR"
     },
     1641: {//INT Gas Mask Fodder
         special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.2x for 1 turn",
-        specialName: "Rising Damage: Poison",
+        specialName: "Rising Damage: Poison"
     },
     1642: {//PSY Gas Mask Fodder
         special: "Deals 3x character's ATK in typeless damage to all enemies, Poisons all enemies",
         specialNotes: "#{poison}",
-        specialName: "Poison Attack",
+        specialName: "Poison Attack"
     },
     1643: {//STR Centaur Fodder
         captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight",
         special: "Boosts ATK of Slasher characters for 1 turn",
-        specialName: "Attack Boost: Slasher",
+        specialName: "Attack Boost: Slasher"
     },
     1644: {//QCK Centaur Fodder
         captain: "Boosts ATK of [QCK] characters by 2x, reduces crew's current HP by ???% at the end of each turn",
         special: "Reduces Silence duration by 1 turn",
         specialNotes: "#{silence}",
-        specialName: "Special Seal Recovery: Light",
+        specialName: "Special Seal Recovery: Light"
     },
     1645: {//DEX Centaur Fodder
         captain: "Boosts ATK of [DEX] characters by 1.5x and Slasher characters by 1.3x",
         captainNotes: "The bonus is cumulative. [DEX] Slasher characters get a 1.95x bonus.",
         special: "Deals 5 hits of random typeless damage to random enemies",
         specialNotes: "#{randomHits : 5}",
-        specialName: "Random Light Blows",
+        specialName: "Random Light Blows"
     },
     1646: {//Reborn Pica
         captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
@@ -11151,127 +10405,64 @@ window.details = {
     1648: {//Giolla
         captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 2.4x after scoring 4 Perfects in a row",
         special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
-        specialName: "Sprouting with Beautiful Passion",
+        specialName: "Sprouting with Beautiful Passion"
     },
     1649: {//Giolla
         captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 3x after scoring 4 Perfects in a row",
         special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
-        specialName: "Sprouting with Beautiful Passion",
+        specialName: "Sprouting with Beautiful Passion"
     },
     1650: {//Brook x5
         captain: "Boosts RCV of [DEX] characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
         special: "Changes [BLOCK], [TND], [EMPTY], and [BOMB] orbs into [DEX] orbs and amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Eyes Blinded by True Beauty",
+        specialName: "Eyes Blinded by True Beauty"
     },
     1651: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
         special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
-        specialName: "Daybreak Ruler's Spear",
+        specialName: "Daybreak Ruler's Spear"
     },
     1652: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
         special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
         specialName: "Daybreak Ruler's Spear",
-        limit: [
-            { "description": "Boosts base RCV by 5" },
-            { "description": "Boosts base RCV by 5" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire Potential 1: [STR] Damage Reduction" },
-            { "description": "Boosts base HP by 15" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base HP by 25" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 70" },
-            { "description": "Boosts base ATK by 10" },
-            { "description": "Boosts base ATK by 15" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base HP by 35" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 45" },
-            { "description": "Boosts base HP by 55" },
-            { "description": "Boosts base HP by 65" },
-            { "description": "Boosts base ATK by 35" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Boosts base HP by 80" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base RCV by 40" },
-            { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for this unit" },
-            { "description": "Boosts base ATK by 45" },
-            { "description": "Boosts base ATK by 55" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
-        ],
-        potential: [
-            {
-                "Name": "[STR] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [STR] characters by ?%",
-                    "Level 2: Reduce damage taken from [STR] characters by ?%",
-                    "Level 3: Reduce damage taken from [STR] characters by ?%",
-                    "Level 4: Reduce damage taken from [STR] characters by ?%",
-                    "Level 5: Reduce damage taken from [STR] characters by ?%"
-                ]
-            },
-            {
-                "Name": "[PSY] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
-                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
-                ]
-            },
-            {
-                "Name": "Slot Bind Self-reduction",
-                "description": [ 
-                    "Level 1: Reduces Slot Bind duration by ? turn on this character",
-                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
-                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1653: {//Pedro
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduces crew's HP to 1, deals 7x the amount of HP subtracted in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Makes INT orbs \"beneficial\" for Slasher and Cerebral characters",
-        specialName: "Charge Drive",
+        specialName: "Charge Drive"
     },
     1654: {//Pedro
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2.5x",
         special: "Reduces crew's HP to 1, deals 7x the amount of HP subtracted in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Makes INT orbs \"beneficial\" for Slasher and Cerebral characters",
-        specialName: "Charge Drive",
+        specialName: "Charge Drive"
     },
     1655: {//Carrot
         captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
         special: "Boosts ATK of QCK characters by 2x for 1 turn",
         sailor: "Boosts base ATK and RCV of [QCK] characters by 75",
-        specialName: "Electric Fist",
+        specialName: "Electric Fist"
     },
     1656: {//Carrot
         captain: "Boosts ATK of [QCK] characters by 2.25x and their RCV by 1.5x",
         special: "Boosts ATK of QCK characters by 2x for 1 turn",
         sailor: "Boosts base ATK and RCV of [QCK] characters by 75",
-        specialName: "Electric Fist",
+        specialName: "Electric Fist"
     },
     1657: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
         special: "Reduces Bind and Despair duration by 5 turns. If your Captain is a Striker character, locks the chain multiplier at 2.75x for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
-        specialName: "Summon Dragon",
+        specialName: "Summon Dragon"
     },
     1658: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.5x",
         special: "Reduces Bind and Despair duration by 5 turns. If your Captain is a Striker character, locks the chain multiplier at 2.75x for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
-        specialName: "Summon Dragon",
+        specialName: "Summon Dragon"
     },
     1659: {//Raizo
         captain: "Boosts ATK of Shooter characters by 2x",
@@ -11279,7 +10470,7 @@ window.details = {
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
-        specialName: "Ninja Arts - Bunshin no Jutsu",
+        specialName: "Ninja Arts - Bunshin no Jutsu"
     },
     1660: {//Raizo
         captain: "Boosts ATK of Shooter characters by 2.5x and makes [TND] and [RCV] orbs \"beneficial\" to Shooter characters",
@@ -11287,7 +10478,7 @@ window.details = {
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
-        specialName: "Ninja Arts - Bunshin no Jutsu",
+        specialName: "Ninja Arts - Bunshin no Jutsu"
     },
     1661: {//Corazon
         captain: "Boosts ATK of [PSY], [QCK], and [DEX] characters by 2x and recovers 300 HP at end of each turn",
@@ -11301,7 +10492,7 @@ window.details = {
                 "cooldown": [ 10, 10 ]
             }
         ],
-        specialName: "The Sun under the Rain",
+        specialName: "The Sun under the Rain"
     },
     1662: {//Corazon
         captain: "Boosts ATK of [PSY], [QCK], and [DEX] characters by 2.5x and recovers 500 HP at end of each turn",
@@ -11315,18 +10506,17 @@ window.details = {
                 "cooldown": [ 10, 10 ]
             }
         ],
-        specialName: "The Sun under the Rain",
+        specialName: "The Sun under the Rain"
     },
     1663: {//6+ Rob Lucci
         special: "Deals 75x character's ATK in typeless damage to one enemy, greatly boosts chances of getting matching orbs for 3 turns",
         specialName: "Six Powers Supreme: Six King Gun",
-        captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
-        limit: "This character has a limit break path",
+        captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
     },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter character, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
-        specialName: "Ice Saber",
+        specialName: "Ice Saber"
     },
     1665: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
@@ -11347,7 +10537,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire Sailor Ability 2: Boosts base ATK of Shooter characters by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -11369,18 +10559,18 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     1666: {//Kyros
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
-        specialName: "Trueno Bastardo",
+        specialName: "Trueno Bastardo"
     },
     1667: {//Kyros
         captain: "Boosts HP of Striker characters by 1.2x and boosts ATK of Striker characters by 2.75x if HP is below 30% at the start of the turn, 2.25x otherwise",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
-        specialName: "Trueno Bastardo",
+        specialName: "Trueno Bastardo"
     },
     1668: {//Reborn Aokiji
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
@@ -11395,17 +10585,17 @@ window.details = {
     1670: {//Shyarly
         captain: "Boosts ATK of [DEX] characters by 1.75x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots two times, and delays all enemies for 1 turn",
-        specialName: "A Warning to the Fool",
+        specialName: "A Warning to the Fool"
     },
     1671: {//Camie
         captain: "Boosts RCV of Free Spirit characters by 1.5x",
         special: "Recovers 15% of crew's MAX HP and amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Cheerfulness that Shines in the Deep Sea",
+        specialName: "Cheerfulness that Shines in the Deep Sea"
     },
     1672: {//Pappagu
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Binds himself for 2 turns and reduces Despair and Silence duration by 3 turns",
-        specialName: "A Starfish Reaching for His Beliefs",
+        specialName: "A Starfish Reaching for His Beliefs"
     },
     1673: {//Swinsuit Perona
         captain: "Boosts ATK of all characters by 1.75x and boosts EXP gained by 1.2x",
@@ -11413,7 +10603,7 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Romantic Princess",
+        specialName: "Romantic Princess"
     },
     1674: {//Swinsuit Perona
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP gained by 1.5x",
@@ -11421,24 +10611,24 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Romantic Princess",
+        specialName: "Romantic Princess"
     },
     1675: {//Kimono Zoro
         captain: "Boosts chain multiplier by 2x",
         special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, changes adjacent orbs into matching orbs and reduces Paralysis and Despair duration by 2 turns",
         sailor: "Reduces Blindness duration by 1 turn",
-        specialName: "Great Swordsman Under the Umbrella",
+        specialName: "Great Swordsman Under the Umbrella"
     },
     1676: {//Kimono Zoro
         captain: "Boosts chain multiplier by 3.25 and reduce damage received by 10%",
         special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, changes adjacent orbs into matching orbs and reduces Paralysis and Despair duration by 2 turns",
         sailor: "Reduces Blindness duration by 1 turn",
-        specialName: "Great Swordsman Under the Umbrella",
+        specialName: "Great Swordsman Under the Umbrella"
     },
     1677: {//Log Law
         captain: "Boosts ATK of Slasher characters by 2.5x",
         special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
-        specialName: "ROOM: Kikoku",
+        specialName: "ROOM: Kikoku"
     },
     1678: {//Log Law
         captain: "Boosts ATK of Slasher characters by 2.5x at the start of the chain, by 3.25x after the 3rd Perfect in a row",
@@ -11459,7 +10649,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base HP by 85" },
             { "description": "Aquire Sailor Ability 2: Reduces Paralysis duration by 1 turn" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -11481,7 +10671,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     1679: {//Kai Mihawk
@@ -11498,41 +10688,41 @@ window.details = {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
         specialName: "Gomu Gomu no Tako Stamp",
-        sailor: "Boosts base HP and ATK of all characters by 56",
+        sailor: "Boosts base HP and ATK of all characters by 56"
     },
     1682: {//20th Anni Luffy
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
         specialName: "Gomu Gomu no Tako Stamp",
-        sailor: "Boosts base HP and ATK of all characters by 56",
+        sailor: "Boosts base HP and ATK of all characters by 56"
     },
     1683: {//20th Anni Robin
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.3x",
         special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
         specialName: "Mil Fleur: Gigantesco Mano",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
-        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
+        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character"
     },
     1684: {//20th Anni Robin
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.3x",
         special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
         specialName: "Mil Fleur: Gigantesco Mano",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
-        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
+        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character"
     },
     1685: {//20th Anni Usopp
         captain: "Boosts ATK of Shooter characters by 2.75x following a chain of Good > Great > Perfect hits",
         special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
         specialName: "Green Star: Bamboo Javelin-Grove",
         sailor: "Reduces Silence duration on this character by 4 turns",
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}"
     },
     1686: {//20th Anni Usopp
         captain: "Boosts ATK of Shooter characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
         specialName: "Green Star: Bamboo Javelin-Grove",
         sailor: "Reduces Silence duration on this character by 4 turns",
-        sailorNotes: "#{silence}",
+        sailorNotes: "#{silence}"
     },
     1687: {//20th Anni Franky
         captain: "Boosts ATK of Fighter characters by 2x and reduce damage received by 10%",
@@ -11540,7 +10730,7 @@ window.details = {
         specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
         specialName: "Franky Iron BOXING",
         sailor: "Restores his own special by 3 turns when it is rewinded",
-        sailorNotes: "#{rewind : 3}",
+        sailorNotes: "#{rewind : 3}"
     },
     1688: {//20th Anni Franky
         captain: "Boosts ATK of Fighter characters by 2.5x and reduce damage received by 15%",
@@ -11548,94 +10738,56 @@ window.details = {
         specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
         specialName: "Franky Iron BOXING",
         sailor: "Restores his own special by 3 turns when it is rewinded",
-        sailorNotes: "#{rewind : 3}",
+        sailorNotes: "#{rewind : 3}"
     },
     1689: {//Fortnight Kid
         captain: "Boosts ATK of all characters by 1.5x at the start of the chain, by 2.25x following a chain of STR > DEX > INT attacks no lower than Good",
         special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
-        specialName: "Iron Giant Palm Slam",
+        specialName: "Iron Giant Palm Slam"
     },
     1690: {//Fortnight Kid
         captain: "Boosts ATK of all characters by 2x at the start of the chain, by 3x following a chain of STR > DEX > INT attacks no lower than Good",
         special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
-        specialName: "Iron Giant Palm Slam",
+        specialName: "Iron Giant Palm Slam"
     },
     1691: {//Heat
         captain: "Boosts ATK of Shooter characters by 1.75x",
         special: "Boosts ATK against enemies with reduced defense by 1.3x for 1 turn, changes the captain's [STR], [DEX], [QCK], [INT], or [PSY] orbs into Matching orbs.",
-        specialName: "Aim and Burn",
+        specialName: "Aim and Burn"
     },
     1692: {//Wire
         captain: "Boosts HP of Driven characters by 1.5x",
         special: "Adds .3x to Chain multiplier, and reduces the defense of all enemies by 50% for 1 turn",
-        specialName: "Three Wind Tunnels",
+        specialName: "Three Wind Tunnels"
     },
     1693: {//Inuarashi
         captain: "Boosts ATK of [PSY] characters by 2x",
         special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
-        specialName: "King's Lightning Burial",
+        specialName: "King's Lightning Burial"
     },
     1694: {//Inuarashi
         captain: "Boosts ATK of [PSY] characters by 2.75x",
         special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
-        specialName: "King's Lightning Burial",
+        specialName: "King's Lightning Burial"
     },
     1695: {//Vergo
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
-        specialName: "The Darkest Demon",
+        specialName: "The Darkest Demon"
     },
     1696: {//Vergo
         captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
         specialName: "The Darkest Demon",
-        limit: [
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Boosts base HP by 20" },
-            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 25" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [QCK] Damage Reduction" },
-        ],
-        potential: [
-            {
-                "Name": "[DEX] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [DEX] characters by 1%",
-                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
-                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
-                ]
-            },
-            {
-                "Name": "[QCK] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduce damage taken from [QCK] characters by 1%",
-                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
-                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
-                ]
-            },
-        ]
+        limit: "This character has a limit break path"
     },
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 50x character's attack and increases by 2x at the end of every turn until 2,000,000 damage per turn.",
-        specialName: "Venom Cloud",
+        specialName: "Venom Cloud"
     },
     1698: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
@@ -11672,7 +10824,7 @@ window.details = {
             { "description": "Boosts base HP by 90" },
             { "description": "Boosts base RCV by 20" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Reduce No Healing duration" },
+            { "description": "Aquire Potential 3: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -11704,7 +10856,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 4 turns",
                     "Level 5: Reduces No Healing duration by 5 turns"
                 ]
-            },
+            }
         ]
     },
     1699: {//Jinbe
@@ -11712,7 +10864,7 @@ window.details = {
         special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit and Chain Coeffiecient Reduction duration by 3 turns",
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
-        sailor: "Boosts base ATK of Fighter characters by 75",
+        sailor: "Boosts base ATK of Fighter characters by 75"
     },
     1700: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x, and their HP by 1.3x",
@@ -11735,7 +10887,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Aquire Sailor Ability 1: Boost HP of all characters by 40 if your Captain is a Fighter character" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Aquire Potential 2: Enrage" }
         ],
         potential: [
             {
@@ -11757,7 +10909,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -11779,7 +10931,7 @@ window.details = {
         ],
         specialName: "Hair Removal Fist",
         specialNotes: "#{stages}",
-        sailor: "Completely resists Paralysis on this character",
+        sailor: "Completely resists Paralysis on this character"
     },
     1702: {//Ivankov
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
@@ -11815,7 +10967,7 @@ window.details = {
             { "description": "Boosts base ATK by 20" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire Sailor Ability 1: When any other Free Spirit character uses a special, reduces own cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -11837,14 +10989,14 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            },
+            }
         ]
     },
     1703: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflicted with Toxic by 1.75x for 2 turns",
         specialName: "Inferno Hell Wheel",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character"
     },
     1704: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
@@ -11866,7 +11018,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit if your Captain is a Driven character" },
             { "description": "Boosts base HP by 200" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Aquire Potential 2: Enrage" }
         ],
         potential: [
             {
@@ -11888,7 +11040,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -11896,7 +11048,7 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2x",
         special: "Removes all positive buffs on your team. If the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
-        sailor: "Boosts base ATK, HP and RCV of all characters by 50",
+        sailor: "Boosts base ATK, HP and RCV of all characters by 50"
     },
     1706: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2.5x at the start of the chain, and boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
@@ -11918,7 +11070,7 @@ window.details = {
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential #: Enrage" },
+            { "description": "Aquire Potential #: Enrage" }
         ],
         potential: [
             {
@@ -11940,7 +11092,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -11948,36 +11100,36 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
         captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
         special: "Reduces the defense of all enemies by 100% for 1 turn, deals 75x character's ATK in typeless damage to one enemy and changes all orbs to [PSY] orbs",
-        specialName: "One-Armed Man that Splits the Heavens",
+        specialName: "One-Armed Man that Splits the Heavens"
     },
     1708: {//Summer Nami
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
         specialName: "Cat Burglar's Eye Contact",
-        sailor: "Makes [TND] orbs \"beneficial\" for this unit",
+        sailor: "Makes [TND] orbs \"beneficial\" for this unit"
     },
     1709: {//Summer Nami
         captain: "Boosts ATK of all characters by 1.5x, recovers 4x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
         specialName: "Cat Burglar's Eye Contact",
-        sailor: "Makes [TND] orbs \"beneficial\" for this unit",
+        sailor: "Makes [TND] orbs \"beneficial\" for this unit"
     },
     1710: {//Summer Robin
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
         specialName: "Charmed by a Lovely Adult",
-        sailor: "Reduces Blindness duration by 2 turns",
+        sailor: "Reduces Blindness duration by 2 turns"
     },
     1711: {//Summer Robin
         captain: "Boosts RCV of Cerebral characters by 1.2x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
         specialName: "Charmed by a Lovely Adult",
-        sailor: "Reduces Blindness duration by 2 turns",
+        sailor: "Reduces Blindness duration by 2 turns"
     },
     1712: {//Akainu
         captain: "Boosts ATK of Driven characters by 2.5x.",
         special: "Deals 50x character's ATK as typeless damage to all enemies. Amplifies the effect of orbs for Driven characters by 2x for 1 turn.",
-        specialName: "Blazing Hound Crimson Lotus",
+        specialName: "Blazing Hound Crimson Lotus"
     },
     1713: {//Akainu
         captain: "Boosts ATK of Driven characters by 2.5x. If you defeat an enemy last turn, increases ATK boost slighty. Stacks up to 3 times to a maximum of 3.25x.",
@@ -11999,7 +11151,7 @@ window.details = {
             { "description": "Boosts base HP by 100" },
             { "description": "Boosts base ATK by 20" },
             { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for Driven characters" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -12021,40 +11173,40 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1714: {//Monet
         captain: "Boosts ATK of INT characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
         special: "Deals 10x character's ATK in [INT] damage to all enemies. Randomly changes all orbs into either [TND], [BOMB] or [RCV] orbs.",
-        specialName: "Devouring Blizzard",
+        specialName: "Devouring Blizzard"
     },
     1715: {//Vergo
         captain: "Boosts ATK of Striker characters by 2.5x if they have a matching orb, by 2x otherwise",
         special: "Changes own orb into [QCK], locks all orbs for 1 turn",
-        specialName: "Sealed Mouth Exterminator",
+        specialName: "Sealed Mouth Exterminator"
     },
     1716: {//Caesar
         captain: "Reduces HP of all characters by 50%, boosts ATK of Driven characters by 1.2x, increases his own ATK multiplier by 0.1x at the end of each turn until it reaches 3x",
         special: "Delays all enemies for 1 turn. For Driven characters, Changes [EMPTY] orbs into Matching orbs. Boosts ATK of Driven characters by 1.75x if HP is below 30% when the special is activated.",
-        specialName: "Massacre GAS",
+        specialName: "Massacre GAS"
     },
     1717: {//Vegapunk Dragon
         captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight",
         special: "Deals 3x character's ATK in [QCK] damage to all enemies",
-        specialName: "High Maneuverable Fireball Blast",
+        specialName: "High Maneuverable Fireball Blast"
     },
     1718: {//Buffalo
         captain: "Boosts ATK of Driven characters by 2.5x until the first hit other than Perfect",
         special: "Boosts ATK of Driven characters by 1.25x for 5 turns",
-        specialName: "Rolling Rotation",
+        specialName: "Rolling Rotation"
     },
     1719: {//Baby 5
         captain: "Boosts ATK of [PSY] characters by 2x if they have matching orbs, makes INT orbs \"beneficial\" to PSY characters",
         captainNotes: "#{beneficial}",
         special: "Changes adjacent orbs into [G] orbs",
-        specialName: "Phantasmagoric \"Weapon-Morphosis\"",
+        specialName: "Phantasmagoric \"Weapon-Morphosis\""
     },
     1720: {//Secret Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
@@ -12080,7 +11232,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire Sailor Ability 1: Makes [STR] and [DEX] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -12102,7 +11254,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ]
 
     },
@@ -12144,75 +11296,75 @@ window.details = {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2x",
         special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, removes enemies' ATK Up Buffs, and recovers 2,000 HP",
         sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
-        specialName: "Destructive Water Splash",
+        specialName: "Destructive Water Splash"
     },
     1729: {//Tashigi
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.25x and their HP by 1.25x. Recovers 3x character's RCV in HP at the end of each turn",
         special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, removes enemies' ATK Up Buffs, and recovers 2,000 HP",
         sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
-        specialName: "Destructive Water Splash",
+        specialName: "Destructive Water Splash"
     },
     1730: {//Vivi
         captain: "Boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
         sailor: "Restores her own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
-        specialName: "Shining Brightly Upon the Oasis",
+        specialName: "Shining Brightly Upon the Oasis"
     },
     1731: {//Vivi
         captain: "Boosts amount of Beli received by 2.5x and boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
         sailor: "Restores her own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
-        specialName: "Shining Brightly Upon the Oasis",
+        specialName: "Shining Brightly Upon the Oasis"
     },
     1732: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2x, boosts HP of Striker and Powerhouse characters by 1.1x",
-        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Battle Guardian",
+        specialName: "Battle Guardian"
     },
     1733: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2.5x, boosts HP of Striker and Powerhouse characters by 1.25x",
-        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Battle Guardian",
+        specialName: "Battle Guardian"
     },
     1734: {//Sugar
         captain: "Boosts ATK of Cerebral and Fighter characters by 1.5x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
-        specialName: "Toy's Close Combat",
+        specialName: "Toy's Close Combat"
     },
     1735: {//Sugar
         captain: "Boosts ATK of Cerebral and Fighter characters by 1.75x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
-        specialName: "Toy's Close Combat",
+        specialName: "Toy's Close Combat"
     },
     1736: {//Trebol
         captain: "Boosts ATK of [INT] characters by 2.25x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Sticky Sticky Burning Explosion",
+        specialName: "Sticky Sticky Burning Explosion"
     },
     1737: {//Trebol
         captain: "Boosts ATK of [INT] characters by 2.25x and their HP by 1.2x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Sticky Sticky Burning Explosion",
+        specialName: "Sticky Sticky Burning Explosion"
     },
     1738: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet [Neo]",
+        specialName: "Spring Hopper - Bullet [Neo]"
     },
     1739: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet [Neo]",
+        specialName: "Spring Hopper - Bullet [Neo]"
     },
     1740: {//Sandersonia
         captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [DEX] characters by 1.1x",
         special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by 80% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Snake Hair Possession: Eight-Headed Serpent",
+        specialName: "Snake Hair Possession: Eight-Headed Serpent"
     },
     1741: {//Sandersonia
         captain: "Boosts ATK of Striker and Powerhouse characters by 2.5x and boosts HP of [DEX] characters by 1.3x",
@@ -12234,7 +11386,7 @@ window.details = {
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -12256,7 +11408,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -12264,7 +11416,7 @@ window.details = {
         captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [STR] characters by 1.1x",
         special: "Changes [QCK] and [DEX] orbs into Matching orbs, boosts ATK against enemies with reduced defense by 1.75x for 2 turns and reduces damage received by 60% for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Snake Hair Possession: Salamander",
+        specialName: "Snake Hair Possession: Salamander"
     },
     1743: {//Marigold
         captain: "Boosts ATK of Striker and Powerhouse characters by 2.5x and boosts HP of [STR] characters by 1.3x",
@@ -12286,7 +11438,7 @@ window.details = {
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -12308,14 +11460,14 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            },
+            }
         ]
     },
     1744: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
         sailor: "Boosts base ATK, HP and RCV of Shooter characters by 30",
-        specialName: "Defender's Spade-Shaped Arrow",
+        specialName: "Defender's Spade-Shaped Arrow"
     },
     1745: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x and recovers 2x character's RCV in HP at the end of each turn",
@@ -12337,7 +11489,7 @@ window.details = {
             { "description": "Boosts base HP by 70" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" },
+            { "description": "Aquire Potential 2: Barrier Penetration" }
         ],
         potential: [
             {
@@ -12359,13 +11511,13 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            },
+            }
         ]
     },
     1746: {//Boa Hancock
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
-        specialName: "Pistol Kisses",
+        specialName: "Pistol Kisses"
     },
     1747: {//Boa Hancock
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
@@ -12401,7 +11553,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 3: Reduce No Healing duration" },
+            { "description": "Aquire Potential 3: Reduce No Healing duration" }
         ],
         potential: [
             {
@@ -12433,14 +11585,14 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 4 turns",
                     "Level 5: Reduces No Healing duration by 5 turns"
                 ]
-            },
+            }
         ]
     },
     1748: {//Bepo
         captain: "Boosts ATK and HP of QCK characters by 1.5x",
         special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
         sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
-        specialName: "Bear Rush Out",
+        specialName: "Bear Rush Out"
     },
     1749: {//Bepo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK and HP of QCK characters by 2x",
@@ -12462,7 +11614,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -12484,7 +11636,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1750: {//Korea Law
@@ -12500,7 +11652,7 @@ window.details = {
             }
         ],
         specialNotes:"#{stages}",
-        specialName: "Injection Shot",
+        specialName: "Injection Shot"
     },
     1751: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
@@ -12546,7 +11698,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire Sailor Ability 2: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 3: Barrier Penetration" },
+            { "description": "Aquire Potential 3: Barrier Penetration" }
         ],
         potential: [
             {
@@ -12578,75 +11730,75 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 50%",
                     "Level 5: This character's attack will ignore barriers"
                 ]
-            },
+            }
         ]
     },
     1752: {//20th Anni Zoro
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
         sailor: "Boosts base ATK of Slasher characters by 50",
-        specialName: "Three Sword Style: Ultra Tiger Hunting",
+        specialName: "Three Sword Style: Ultra Tiger Hunting"
     },
     1753: {//20th Anni Zoro
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
         sailor: "Boosts base ATK of Slasher characters by 50",
-        specialName: "Three Sword Style: Ultra Tiger Hunting",
+        specialName: "Three Sword Style: Ultra Tiger Hunting"
     },
     1754: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
         sailor: "Boosts base ATK, HP and RCV of all characters by 40",
-        specialName: "Diable Jambe: Collier Strike",
+        specialName: "Diable Jambe: Collier Strike"
     },
     1755: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2.5x and their HP by 1.2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
         sailor: "Boosts base ATK, HP and RCV of all characters by 40",
-        specialName: "Diable Jambe: Collier Strike",
+        specialName: "Diable Jambe: Collier Strike"
     },
     1756: {//20th Anni Nami
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Gust Sword",
+        specialName: "Gust Sword"
     },
     1757: {//20th Anni Nami
         captain: "Recovers 5x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Gust Sword",
+        specialName: "Gust Sword"
     },
     1758: {//20th Anni Brook
         captain: "Boosts ATK of Free Spirit characters by 2x and their HP by 1.1x",
         special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
-        specialName: "Party Music: Quinte Tierce Fantasia",
+        specialName: "Party Music: Quinte Tierce Fantasia"
     },
     1759: {//20th Anni Brook
         captain: "Boosts ATK of Free Spirit characters by 2.5x and their HP by 1.2x",
         special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
-        specialName: "Party Music: Quinte Tierce Fantasia",
+        specialName: "Party Music: Quinte Tierce Fantasia"
     },
     1760: {//20th Anni Chopper
         captain: "Boosts ATK of [DEX] and [INT] characters by 2x",
         special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
         sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
         sailorNotes: "#{silence}<br>#{rewind : 2}",
-        specialName: "Intelligent Monster",
+        specialName: "Intelligent Monster"
     },
     1761: {//20th Anni Chopper
         captain: "Boosts ATK of [DEX] and [INT] characters by 2.5x",
         special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
         sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
         sailorNotes: "#{silence}<br>#{rewind : 2}",
-        specialName: "Intelligent Monster",
+        specialName: "Intelligent Monster"
     },
     1762: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
         special: "Reduces the defense of all enemies by 80% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
-        specialName: "Flying Finger Gun: Fire Sting",
+        specialName: "Flying Finger Gun: Fire Sting"
     },
     1763: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
@@ -12682,7 +11834,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire Sailor Ability 2: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -12714,7 +11866,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -12723,32 +11875,32 @@ window.details = {
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn, locks the chain multiplier at 2.5x for 1 turn and deals 100000 fixed damage to all enemies that will ignore damage negating abilities and barriers.",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Determined Man's Ice Attack",
+        specialName: "Determined Man's Ice Attack"
     },
     1765: {//Blue Gilly
         captain: "Boosts ATK of Fighter characters by 1.5x",
         special: "Deals 10 hits of 5x character's ATK in typeless damage to random enemies, reduces the defense of all enemies by 50% for 1 turn, randomizes non-matching orbs, including [BLOCK] orbs",
-        specialName: "Jao Kun Do Consecutive Thrusting Kick",
+        specialName: "Jao Kun Do Consecutive Thrusting Kick"
     },
     1766: {//Blue Gilly
         captain: "Boosts chain multiplier by 1.5x and boosts ATK of Fighter characters by 1.5x",
         special: "Deals 10 hits of 5x character's ATK in typeless damage to random enemies, reduces the defense of all enemies by 50% for 1 turn, randomizes non-matching orbs, including [BLOCK] orbs",
-        specialName: "Jao Kun Do Consecutive Thrusting Kick",
+        specialName: "Jao Kun Do Consecutive Thrusting Kick"
     },
     1767: {//Funk Bros
         captain: "Boosts ATK of Fighter characters by 1.75x",
         special: "Delays all enemies for 1 turn, following the activation of the special, if every unit scores a Great hit, boosts ATK of Fighter characters by 1.5x in the following turn",
-        specialName: "Prideless Surprise Attack",
+        specialName: "Prideless Surprise Attack"
     },
     1768: {//Abdullah and Jeet
         captain: "Boosts ATK of Striker and Slasher characters by 1.5x",
         special: "At the end of the turn, cuts the current HP of each enemy by 10% for 2 turns",
-        specialName: "Nasty Final Blow",
+        specialName: "Nasty Final Blow"
     },
     1769: {//Ben Beckman
         captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Delays all enemies for 1 turn. If your captain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
-        specialName: "Restraining Gunpoint",
+        specialName: "Restraining Gunpoint"
     },
     1770: {//Ben Beckman
         captain: "Boosts ATK of Cerebral characters by 2.5x and their HP by 1.2x at the start of the chain, and boosts ATK of Cerebral characters by 3.25x following a chain of Good > Great > Perfect hits",
@@ -12769,7 +11921,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Aquire Sailor Ability 2: Adds 2x character's ATK as Additional Typeless Damage" },
-            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Aquire Potential 2: Enrage" }
         ],
         potential: [
             {
@@ -12791,7 +11943,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -12819,11 +11971,11 @@ window.details = {
     },
     1775: {//Momonosuke
         captain: "Boosts ATK and RCV of QCK characters by 1.5x, and slightly boosts chances of getting [QCK] orbs",
-        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
+        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice"
     },
     1776: {//Momonosuke
         captain: "Boosts ATK and RCV of QCK characters by 1.75x, boosts chances of getting [QCK] orbs",
-        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
+        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice"
     },
     1777:{//Kizaru
         captain: "Not Translated",
@@ -12851,7 +12003,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Aquire Sailor Ability 2: Boosts base ATK, HP and RCV of Shooter and Free Spirit characters by 50" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -12873,7 +12025,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1779:{//Kizaru
@@ -12904,33 +12056,33 @@ window.details = {
                 "cooldown": [ 20, 11 ]
             }
         ],
-        specialNotes: "#{stages}",
+        specialNotes: "#{stages}"
     },
     1781: {//Fighting Fish
         captain: "Boosts ATK of Powerhouse characters by 1.75x. Makes [TND] and [RCV] orbs \"beneficial\" to Powerhouse characters",
         special: "Boosts ATK of ??? characters by 1.3x for 1 turn, changes own orb into STR and deals 5x character's ATK in [STR] damage to all enemies",
-        specialName: "Fish Special",
+        specialName: "Fish Special"
     },
     1782: {//Chinjao
         captain: "Boosts ATK of [QCK] characters by 2.25x, boosts damage of QCK specials by 1.75x",
         captainNotes: "#{noFixedPerc}",
         special: "Delays all enemies for 2 turns, deals 25x character's ATK in [QCK] damage to all enemies",
-        specialName: "Chinjao Special",
+        specialName: "Chinjao Special"
     },
     1783: {//Hajrudin
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Locks all orbs for 1 turn. If during that turn you score 4 Perfect hits, amplifies the effect of orbs by 1.5x for 1 turn.",
-        specialName: "Hajrudin Special",
+        specialName: "Hajrudin Special"
     },
     1784: {//Fujitora
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with fewer than 4 stars by 2.5x",
         special: "Deals random [INT] damage to all enemies, reduces Special Cooldown of all characters by 1 turn and boosts ATK of all characters by 1.5x for 1 turn",
-        specialName: "Fujitora Special",
+        specialName: "Fujitora Special"
     },
     1785: {//Spartan
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "Recovers 3000 HP and amplifies the effect of orbs by 1.25x for 1 turn",
-        specialName: "Spartan Special",
+        specialName: "Spartan Special"
     },
     1786: {//Dressrosa Fodder
         special: "Makes [QCK] orbs \"beneficial\" to Shooter characters for 1 turn",
@@ -12946,7 +12098,7 @@ window.details = {
     },
     1789: {//Dressrosa Fodder
         special: "Boosts chances of getting [RCV] orbs for 2 turns",
-        specialName: "Meat for Meat",
+        specialName: "Meat for Meat"
     },
     1790: {//Dressrosa Fodder
         special: "Recovers 3x character's RCV in HP at the end of each turn for 3 turns",
@@ -12957,7 +12109,7 @@ window.details = {
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
-        specialName: "Gomu Gomu no Hawk Rifle",
+        specialName: "Gomu Gomu no Hawk Rifle"
     },
     1792:{//Lucy Luffy
         captain: "Boosts RCV of [STR], [DEX] and [QCK] characters by 1.2x and boosts ATK of [STR], [DEX] and [QCK] characters by 3.25x after scoring 3 Perfects in a row",
@@ -12980,7 +12132,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Aquire Potential 2: Enrage" }
         ],
         potential: [
             {
@@ -13002,7 +12154,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 120",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13010,7 +12162,7 @@ window.details = {
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, lowers chances of getting [STR] orbs and makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead.",
         captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and no [PSY] or [INT] characters at all.<br>#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
-        specialName: "Dragon's Claw: Reverse Wave Motion",
+        specialName: "Dragon's Claw: Reverse Wave Motion"
     },
     1794:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, lowers chances of getting [STR] orbs and makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead.",
@@ -13047,7 +12199,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 50" },
             { "description": "Boosts base HP by 100" },
             { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -13079,7 +12231,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13087,7 +12239,7 @@ window.details = {
         captain: "Boosts ATK of Slasher and Driven characters by 2x",
         special: "Delays all enemies for 2 turns, reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
-        specialName: "Snake Sword",
+        specialName: "Snake Sword"
     },
     1796:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2.5x",
@@ -13109,7 +12261,7 @@ window.details = {
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -13131,7 +12283,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1797:{//Jesus Burgess
@@ -13152,7 +12304,7 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
-        specialName: "Shockwave Elbow",
+        specialName: "Shockwave Elbow"
     },
     1798:{//Jesus Burgess
         captain: "Boosts ATK of Fighter characters by 2.5x, boosts HP of Powerhouse and Driven characters by 1.25x",
@@ -13188,7 +12340,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Aquire Potential 2: Enrage" }
         ],
         potential: [
             {
@@ -13210,7 +12362,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13218,7 +12370,7 @@ window.details = {
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.25x",
         special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 2 turns",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
-        specialName: "Beautiful Sword: Round Table",
+        specialName: "Beautiful Sword: Round Table"
     },
     1800:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and their RCV by 1.2x",
@@ -13240,7 +12392,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -13262,14 +12414,14 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
         special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by 80% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself",
-        specialName: "Barrier Bulls",
+        specialName: "Barrier Bulls"
     },
     1802:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15% for that turn.",
@@ -13291,7 +12443,7 @@ window.details = {
             { "description": "Boosts base RCV by 60" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -13313,44 +12465,36 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            },
+            }
         ]
     },
     1803: {//Zoro
         captain: "Boosts ATK of Slasher characters by 2x",
         special: "Deals 13x character's ATK in [DEX] to one enemy, removes enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
-        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
+        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai"
     },
     1804: {//Zoro
         captain: "Boosts ATK of Slasher characters by 2.25x and their HP by 1.3x",
         special: "Deals 13x character's ATK in [DEX] to one enemy, removes enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
-        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
+        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai"
     },
     1805: {//Buggy
         captain: "Boosts ATK of characters with cost 30 or less by 1.5x and their HP by 1.2x",
         special: "Reduces the defense of all enemies by 100% for 1 turn, reduces damage received from STR enemies by 80% for 1 turn, Amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Deceiving the World with the Most Evil Show",
+        specialName: "Deceiving the World with the Most Evil Show"
     },
     1806: {//Buggy
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
         special: "Reduces the defense of all enemies by 100% for 1 turn, reduces damage received from STR enemies by 80% for 1 turn, Amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Deceiving the World with the Most Evil Show",
+        specialName: "Deceiving the World with the Most Evil Show"
     },
     1807: {//Mihawk
         captain: "Not Translated",
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
-        specialName: "Black Blade • The Ultimate Sword",
+        specialName: "Black Blade • The Ultimate Sword"
     },
     1808: {//Mihawk
-        captain: {
-            "base": "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
-            "level1": "Boosts ATK of Slasher characters by 1.35x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.8225x instead for 1 turn.",
-            "level2": "Boosts ATK of Slasher characters by 1.6x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.16x instead for 1 turn.",
-            "level3": "Boosts ATK of Slasher characters by 1.8x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.43x instead for 1 turn.",
-            "level4": "Boosts ATK of Slasher characters by 2x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
-            "level5": "Boosts ATK of Slasher characters by 2x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
-            "level6": "Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn.",
-        },
+        captain: " Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn (Limit Broken)",
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
         limit: [
@@ -13393,7 +12537,7 @@ window.details = {
             { "description": "Boosts base ATK by 50" },
             { "description": "Boosts base HP by 80" },
             { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn." },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -13415,40 +12559,40 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            },
-        ],
+            }
+        ]
     },
     1809: {//Wanda
         captain: "Boosts ATK by 2.25x after scoring 2 Perfects in a row",
         special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
-        specialName: "Super Express Beast Path",
+        specialName: "Super Express Beast Path"
     },
     1810: {//Wanda
         captain: "Boosts chances of getting Matching orbs, boosts ATK by 2.25x after scoring 2 Perfects in a row",
         special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
-        specialName: "Super Express Beast Path",
+        specialName: "Super Express Beast Path"
     },
     1811: {//Carrot
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2x",
         special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Rabbit Mink's Air Step",
+        specialName: "Rabbit Mink's Air Step"
     },
     1812: {//Carrot
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2.25x",
         special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Rabbit Mink's Air Step",
+        specialName: "Rabbit Mink's Air Step"
     },
     1813: {//Koala
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
         special: "Changes Captain's orb into Matching and boosts ATK of your Captain by 1.5x for 1 turn",
-        specialName: "Revolutionary Soldier's Anger",
+        specialName: "Revolutionary Soldier's Anger"
     },
     1814: {//Raid Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x until the first hit other than Perfect and recovers 100 HP at end of each turn",
         specialName: "Joue Shoot",
-        special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
+        special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn"
     },
     1815: {//Raid Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 300 HP at end of each turn",
@@ -13469,7 +12613,7 @@ window.details = {
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Aquire Sailor Ability 1: Makes [RCV] orbs \"beneficial\" for all characters" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
         ],
         potential: [
             {
@@ -13491,7 +12635,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            },
+            }
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13505,24 +12649,24 @@ window.details = {
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn and reduces special cooldown of all non-Captain specials by 1 turn",
         specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     1818: {// Riku
         captain: "Boosts ATK of all characters by 1.5x and their HP by 1.2x, boosts ATK by 2.5x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn and reduces special cooldown of all non-Captain specials by 1 turn",
         specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}",
+        sailorNotes: "#{rewind : 1}"
     },
     1819: {//Tank
         captain: "Boosts ATK of Powerhouse and Stiker characters by 1.75x",
         special: "Boosts own ATK by 1.75x for 1 turn",
-        specialName: "Shameful Hidden Activity",
+        specialName: "Shameful Hidden Activity"
     },
     1820: {//Scarlet
         captain: "Boosts HP and RCV of [PSY] characters by 1.5x",
         special: "Locks all orbs for 1 turn and recovers 5x character's RCV in HP.",
-        specialName: "Frontier Love",
+        specialName: "Frontier Love"
     },
     1821: {//Sanji
         captain: "Boosts ATK of all characters by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
@@ -13534,10 +12678,10 @@ window.details = {
             {
                 "description": "Recovers 10x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
                 "cooldown": [ 14, 14 ]
-            },
+            }
         ],
         specialName: "Sanji Special",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
     },
     1822: {//Sanji
         captain: "Boosts ATK of all characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
@@ -13549,10 +12693,10 @@ window.details = {
             {
                 "description": "Recovers 10x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
                 "cooldown": [ 14, 14 ]
-            },
+            }
         ],
         specialName: "Sanji Special",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
     },
     1823: {//World
         captain: "Not Translated",
@@ -13571,7 +12715,7 @@ window.details = {
             }
         ],
         specialNotes:"#{stages}",
-        specialName: "More More: Hundredfold Artillery Cannon",
+        specialName: "More More: Hundredfold Artillery Cannon"
     },
     1824: {//World
         captain: "Boosts ATK of Shooter characters by 2.2x at the start of the chain.<br>Boosts ATK of Shooter characters by 2.42x after the 1st Perfect in a row, by 2.662x after the 2nd Perfect in a row, by 2.9282x after the 3rd Perfect in a row, by 3.22102x after the 4th Perfect in a row, and by 3.543122x after the 5th Perfect in a row.",
@@ -13590,25 +12734,24 @@ window.details = {
             }
         ],
         specialNotes:"#{stages}",
-        specialName: "More More: Hundredfold Artillery Cannon",
-        limit: "This character has a limit break path",
+        specialName: "More More: Hundredfold Artillery Cannon"
     },
     1825: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
         special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption [Neo]",
+        specialName: "Great Eruption [Neo]"
     },
     1826: {//Akainu
         captain: "Boosts ATK by 3x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
         special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption [Neo]",
+        specialName: "Great Eruption [Neo]"
     },
     1827: {//Sicilian Colo
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduce crew's current HP by 50%, Boosts ATK of [INT] characters by 2x for 1 turn and randomize non-matching orbs, including [BLOCK] orbs",
-        specialName: "Explosive Spirit",
+        specialName: "Explosive Spirit"
     },
     1828: {//Sicilian Colo
         captain: "Boosts ATK of [INT] characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
@@ -13629,7 +12772,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Aquire Potential 2: Critical Hit" }
         ],
         potential: [
             {
@@ -13651,30 +12794,30 @@ window.details = {
                     "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
                     "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
                 ]
-            },
+            }
         ]
     },
     1829: {//Raid Caesar
         captain: "Boosts ATK of Cerebral and Driven characters by 2x",
         special: "Deals 45x character's ATK in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for Cerebral and Driven characters for 2 turns, and poisons all enemies",
-        spcialName: "Flammable Type: Miok GAS",
+        spcialName: "Flammable Type: Miok GAS"
     },
     1830: {//Raid Caesar
         captain: "Boosts ATK of Cerebral and Driven characters by 2.5x",
         special: "Deals 45x character's ATK in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for Cerebral and Driven characters for 2 turns, and poisons all enemies",
         spcialName:"Flammable Type: Miok GAS",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1831: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9375x if they have a matching orb, by 2.25x otherwise",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
-        specialName: "Dengi Crack",
+        specialName: "Dengi Crack"
     },
     1832: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9375x if they have a matching orb, by 2.25x otherwise",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
         specialName: "Dengi Crack",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1833: {//Reiju
         captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x and the RCV of Powerhouse characters by 1.1x",
@@ -13682,7 +12825,7 @@ window.details = {
         special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a Powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
     },
     1834: {//Reiju
         captain: "Boosts ATK of [INT] characters by 2.25x and Powerhouse characters by 1.3x and the RCV of Powerhouse characters by 1.2x",
@@ -13691,7 +12834,7 @@ window.details = {
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1835: {//Ichiji
         captain: "Boosts ATK of [STR] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
@@ -13699,7 +12842,7 @@ window.details = {
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
     },
     1836: {//Ichiji
         captain: "Boosts ATK of [STR] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
@@ -13708,7 +12851,7 @@ window.details = {
         specialName: "Majestic Impact",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1837: {//Niji
         captain: "Boosts ATK of [QCK] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
@@ -13716,7 +12859,7 @@ window.details = {
         special: "If your captain is a [QCK] or [PSY] character, boosts ATK of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
     },
     1838: {//Niji
         captain: "Boosts ATK of [QCK] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
@@ -13725,7 +12868,7 @@ window.details = {
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1839: {//Yonji
         captain: "Boosts ATK of [DEX] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
@@ -13734,7 +12877,7 @@ window.details = {
         specialName: "Burst End Kick",
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
     },
     1840: {//Yonji
         captain: "Boosts ATK of [DEX] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
@@ -13744,114 +12887,119 @@ window.details = {
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path",
+        limit: "This character has a limit break path"
     },
     1841: {//Caribou
         captain: "Boosts ATK of Driven characters by 1.5x, deals 2x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
-        specialName: "Fathomless Infinite Hell",
-        sailor: "When any other character uses a special, reduces own cooldown by 5 turn",
+        specialName: "Fathomless Infinite Hell"
     },
     1842: {//Caribou
         captain: "Boosts ATK of Driven characters by 1.5x, deals 4x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
-        specialName: "Fathomless Infinite Hell",
-        sailor: "When any other character uses a special, reduces own cooldown by 5 turn",        
+        specialName: "Fathomless Infinite Hell"
     },
     1843: {//Coribou
         captain: "Boosts ATK of Driven and Striker characters by 1.5x",
         special: "Removes blindness and recovers 4x character's RCV in HP",
-        specialName: "Frantic Funeral",
+        specialName: "Frantic Funeral"
     },
     1844: {//Coribou
         captain: "Boosts ATK of Driven and Striker characters by 1.75x",
         special: "Removes blindness and recovers 4x character's RCV in HP",
-        specialName: "Frantic Funeral",
+        specialName: "Frantic Funeral"
     },
     1845: {//Garp
         captain: "Boosts ATK of Fighter characters by 2.5x and reduce damage received by 5%",
         special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
-        specialName: "Garp Special",
+        specialName: "Garp Special"
     },
     1846: {//Garp
         captain: "Boosts ATK of Fighter characters by 2.75x and reduce damage received by 15%",
         special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
-        specialName: "Garp Special",
+        specialName: "Garp Special"
     },
-    1847: {//Sengoku+
+    1847: {//Goku+
         captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, and their HP by 1.2x, boost ATK of characters with cost 54 by 3x",
-        captainNotes: "His captain ability also affects his evolved forms, his base form will NOT receive the boost. All evolved and plus evolved Sengoku characters in the team are included in the bonus.",
         special: "Deals random large INT Damage to all enemies, boost ATK of all characters by 1.5x for 1 turn, changes orbs to matching orbs for chatacters that are 29 cost or lower",
-        specialName: "Requiem Shockwave",
+        specialName: "Requiem Shockwave"
     },
     1848: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2x",
-        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
     },
     1849: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2.25x and their HP by 1.3x",
-        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
     },
     1850: {//Treasure Map Squard
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
         specialName: "Piercing Hatred",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
     },
     1851: {//Treasure Map Squard
         captain: "Boosts ATK of Driven characters by 2.25x and their HP by 1.3x",
         special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
         specialName: "Piercing Hatred",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}",
+        sailorNotes: "#{beneficial}"
+    },
+    1851: {//Treasure Map Squard
+        captain: "Boosts ATK of Driven characters by 2.25x and their HP by 1.3x",
+        special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
+        specialName: "Piercing Hatred",
+        sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
+        sailorNotes: "#{beneficial}"
     },
-    1852: {//Whitebeard
+    1852: {//Treasure Map WB
         captain: "Not Translated",
-        special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
-        specialName: "Whitebeard Special",
+        special: "Change own orb to INT, 100x character ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, if the enemy has delay protection/debuff protection boost orbs by 2x for 1 turn, if the enemy has a barrier boost ATK of himself by 2.25x for 1 turn",
+        specialName: "Whitebeard Special"
     },
-    1853: {//Whitebeard
-        captain: "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
-        captainNotes: "#{captainProportional : lower : 1 + 1.25 * (1 - (remaining HP) / (total HP)) : 1 : 2.25}",
-        special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
+    1853: {//Treasure Map WB
+        captain: "Boosts ATK of all characters proportionally to the crew's current HP, boost HP of all characters by 1.35x",
+        captainNotes: "#{captainProportional : lower : 1 + 2.25 * (1 - (remaining HP) / (total HP)) : 1 : 3.25}",
+        special: "Change own orb to INT, 100x character ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, if the enemy has delay protection/debuff protection boost orbs by 2x for 1 turn, if the enemy has a barrier boost ATK of himself by 2.25x for 1 turn",
         specialName: "Whitebeard Special",
+        sailor: "Limit Broken: +100HP +50ATK to all characters"
     },
     1854: {//Apoo
         captain: "Boosts ATK of Free Spirit characters by 2x",
         special: "Amplifies the effect of orbs for Free Spirit characters by 1.5x and boosts ATK of Free Spirit characters by 1.5x for 1 turn",
-        specialName: "Fighting Musical Performance",
+        specialName: "Fighting Musical Performance"
     },
     1855: {//Apoo
         captain: "Boosts ATK of Free Spirit characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect in a row and by 3x after the 5th Perfect in a row",
         special: "Amplifies the effect of orbs for Free Spirit characters by 1.5x and boosts ATK of Free Spirit characters by 1.5x for 1 turn",
-        specialName: "Fighting Musical Performance",
+        specialName: "Fighting Musical Performance"
     },
     1856: {//X Drake
         captain: "Boosts ATK of Powerhouse characters by 2x",
         special: "Cuts the current HP of each enemy by 7%. Boosts the Color Affinity of Powerhouse characters by 1.25x",
-        specialName: "Intervening A Fierce Battle",
+        specialName: "Intervening A Fierce Battle"
     },
     1857: {//X Drake
         captain: "Boosts ATK of Powerhouse characters by 2.5 and recovers 200 HP at end of each turnx",
         special: "Cuts the current HP of each enemy by 7%. Boosts the Color Affinity of Powerhouse characters by 1.25x",
-        specialName: "Intervening A Fierce Battle",
+        specialName: "Intervening A Fierce Battle"
     },
     1858: {//Leo
         captain: "Boosts ATK of Striker characters by 2x at the start of the chain. Boosts ATK of Striker characters by 2.4x after scoring 3 Perfects in a row.",
         special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
-        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
+        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn"
     },
     1859: {//Leo
         captain: "Boosts ATK of Striker characters by 2.5x and their HP by 1.2x at the start of the chain. Boosts ATK of Striker characters by 3.25x after scoring 3 Perfects in a row.",
         special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
-        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
+        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn"
     },
     1860: {//Coloseum Raizo
         captain: "Not Translated",
@@ -13870,7 +13018,7 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Raizo Special",
+        specialName: "Raizo Special"
     },
     1861: {//Coloseum Raizo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.5x",
@@ -13889,26 +13037,37 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Raizo Special",
+        specialName: "Raizo Special"
     },
     1862: {//Neo Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2x, recovers 1x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
-        specialName: "Poof [Neo]",
+        specialName: "Poof [Neo]"
     },
     1863: {//Neo Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
-        specialName: "Poof [Neo]",
+        specialName: "Poof [Neo]"
+    },
+    1865: {//Urouge FN
+        captain: "Striker Characters ATK 1.75x, protects from defeat as long as HP is above a certain percent",
+        captainNotes: "PERFECT hits don't count, it has to GREAT hits",
+        special: "Recover 5000 HP, for 1 turn boost ATK by 1.5x for Striker Characters, if you hit 4 or more GREAT this turn boost ATK by 1.75x for Striker Characters the next turn",
+        specialName: "Culling the Criminals from this Earthly World"
+    },
+    1867: {//Hawkins FN
+        captain: "Cerebral Characters ATK 2x, boost chain multiplier by 1.5x",
+        special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%",
+        specialName: "Fortune-Telling from the Shadow of Death"
     },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
-        specialName: "Maelstrom at Sea",
+        specialName: "Maelstrom at Sea"
     },
     2001: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
-        specialName: "Maelstrom at Sea",
-    },
+        specialName: "Maelstrom at Sea"
+    }
 };

From a6d245fe8b1a0d0abab50da969c4a66c4feefc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:48:28 +0100
Subject: [PATCH 1552/1569] Formating

---
 common/data/details.js | 978 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 917 insertions(+), 61 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 2bfa176b9..3a2b13bde 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -77,7 +77,45 @@ window.details = {
         special: "Deals 15x character's ATK in DEX damage to all enemies",
         specialName: "Ashura Ichibugin",
         captain: "Boosts ATK and HP of DEX characters by 2x",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 1 turn when it is rewinded" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Critical Hit" }
+        ],
+        potential: [
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            }
+        ]
     },
     9: {
         special: "Recovers 1,000 HP",
@@ -117,7 +155,8 @@ window.details = {
     16: {
         special: "Delays all enemies for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
         specialName: "Fire Bird Star",
-        captain: "Boosts ATK and HP of PSY characters by 1.5x"
+        captain: "Boosts ATK and HP of PSY characters by 1.5x",
+        limit: "This character has a limit break path"
     },
     17: {
         special: "Recovers 10x character's RCV in HP",
@@ -824,7 +863,45 @@ window.details = {
         special: "Changes [PSY] orbs into [INT] orbs",
         specialName: "Happiness Punch",
         captain: "Boosts ATK of INT characters by 2.5x",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of [INT] characters by 2.5x and their RCV by 1.2x" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of [INT] characters by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Aquire Sailor Ability 2: Makes [TND] orbs \"beneficial\" for [INT] characters" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" }
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            }
+        ]
     },
     222: {
         special: "Boosts ATK of PSY characters by 1.5x for 1 turn",
@@ -992,7 +1069,8 @@ window.details = {
         special: "Deals random STR damage to one enemy",
         specialName: "Rampage",
         specialNotes: "#{random : 2,000 : 200,000}",
-        captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%"
+        captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%",
+        limit: "This character has a limit break path"
     },
     250: {
         special: "Recovers all missing HP",
@@ -1002,7 +1080,8 @@ window.details = {
     251: {
         special: "Recovers all missing HP",
         specialName: "Blue Flame Rebirth",
-        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn"
+        captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn",
+        limit: "This character has a limit break path"
     },
     252: {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
@@ -1012,7 +1091,8 @@ window.details = {
     253: {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
         specialName: "Brilliant Punk",
-        captain: "Boosts ATK and HP of QCK characters by 2x"
+        captain: "Boosts ATK and HP of QCK characters by 2x",
+        limit: "This character has a limit break path"
     },
     254: {
         special: "Deals 5,000 fixed damage to all enemies",
@@ -1085,7 +1165,45 @@ window.details = {
         special: "Changes [DEX] and [QCK] orbs into [STR] orbs",
         specialName: "Pocket Mallet",
         captain: "Boosts ATK and RCV of STR characters by 2x",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [PSY] orbs \"beneficial\" for this unit" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [DEX] Damage Reduction" }
+        ],
+        potential: [
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            }
+        ]
     },
     260: {
         special: "Cuts the current HP of each enemy by 30%",
@@ -1096,7 +1214,70 @@ window.details = {
         special: "Cuts the current HP of each enemy by 30%",
         specialName: "Seaquake",
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 5" },
+            { "description": "Boosts base HP by 5" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker and Powerhouse characters by 60" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 15" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Potential 3: Enrage" }
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
+                    "Level 2: Reduce damage taken from [DEX] characters by 3%",
+                    "Level 3: Reduce damage taken from [DEX] characters by 4%",
+                    "Level 4: Reduce damage taken from [DEX] characters by 5%",
+                    "Level 5: Reduce damage taken from [DEX] characters by 7%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 25",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            }
+        ]
     },
     262: {
         captain: "Recovers 2x character's RCV in HP at the end of each turn"
@@ -1267,7 +1448,8 @@ window.details = {
     306: {
         special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
         specialName: "Meteor Fist Shower",
-        captain: "Boosts ATK and HP of PSY characters by 2x"
+        captain: "Boosts ATK and HP of PSY characters by 2x",
+        limit: "This character has a limit break path"
     },
     307: {
         special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
@@ -1313,7 +1495,45 @@ window.details = {
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in PSY damage to one enemy",
         specialName: "Karmic Punishment",
         captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all Striker characters proportionally to the crew's current HP and their HP by 1.5x" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 30" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" }
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            }
+        ]
     },
     315: {
         special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
@@ -1325,7 +1545,8 @@ window.details = {
         special: "Changes [PSY] and [INT] orbs into [STR] orbs, empties slots with [DEX] and [QCK] orbs",
         specialName: "Aye Aye, Captain!",
         captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
-        sailor: "Reduces Paralysis for 2 turns for himself"
+        sailor: "Reduces Paralysis for 2 turns for himself",
+        limit: "This character has a limit break path"
     },
     317: {
         special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
@@ -1510,10 +1731,47 @@ window.details = {
     },
     357: {
         special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
-        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
         specialName: "Steel Magnetic Arm",
         captain: "Boosts ATK of Striker characters by 2.5x",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Striker characters by 2.5x and reduces damage received by 7%" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker characters by 75" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base RCV by 50" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" }
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            }
+        ]
     },
     358: {
         special: "Changes [TND] and [RCV] orbs into [DEX] orbs, deals random DEX damage to all enemies",
@@ -2110,8 +2368,8 @@ window.details = {
         special: "Deals random PSY damage to all enemies, boosts ATK of all characters by 1.5x for 1 turn",
         specialName: "Zen Shockwave",
         specialNotes: "#{random : 30,000 : 150,000}",
-        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less by 3x as well as himself",
-        captainNotes: "His captain ability only affects his evolved form, his base form will NOT receive the boost. All evolved Sengoku characters in the team are included in the bonus."
+        captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with cost 20 or less or 54 cost exactly by 3x",
+        captainNotes: "His captain ability also affects his evolved forms, his base form will NOT receive the boost. All evolved and plus evolved Sengoku characters in the team are included in the bonus."
     },
     460: {
         special: "Recovers 33 HP after the end of each turn for 999 turns, delays all enemies for 1 turn",
@@ -2753,7 +3011,45 @@ window.details = {
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
         specialName: "Ice Block - Pheasant Beak",
         captain: "Boosts ATK and HP of Striker characters by 2x",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: Slot Bind Self-reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 50" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" }
+        ],
+        potential: [
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            }
+        ]
     },
     576: {
         special: "Changes [PSY] orbs into [INT] orbs, boosts RCV of all characters by 1.5x for 1 turn",
@@ -3072,7 +3368,45 @@ window.details = {
         specialName: "Raging Greatsword",
         captain: "Boosts ATK of PSY characters by 3x if HP is below 30% at the start of the turn",
         sailor: "Recovers 2 turns of Paralysis on self",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base RCV by 25" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 35" },
+            { "description": "Aquire Potential 1: [STR] Damage Reduction" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 1: Reduces Blindness duration by 2 turns" },
+            { "description": "Boosts base ATK by 60" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base RCV by 50" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [INT] Damage Reduction" }
+        ],
+        potential: [
+            {
+                "Name": "[STR] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [STR] characters by 1%",
+                    "Level 2: Reduce damage taken from [STR] characters by ?%",
+                    "Level 3: Reduce damage taken from [STR] characters by ?%",
+                    "Level 4: Reduce damage taken from [STR] characters by ?%",
+                    "Level 5: Reduce damage taken from [STR] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            }
+        ]
     },
     644: {
         special: "Reduces Bind and Despair duration by 2 turns, boosts ATK against delayed enemies by 1.2x for 3 turns",
@@ -3619,7 +3953,8 @@ window.details = {
     748: {
         special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
         specialName: "Rokuougan",
-        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+        captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
+        limit: "This character has a limit break path"
     },
     749: {
         special: "Deals random DEX damage to all enemies, randomizes all orbs",
@@ -3638,7 +3973,8 @@ window.details = {
     751: {
         special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
         specialName: "Sheep Cloud Tidal Wave",
-        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
+        limit: "This character has a limit break path"
     },
     752: {
         special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
@@ -3665,7 +4001,8 @@ window.details = {
     756: {
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
         specialName: "Tekkai - Rin",
-        captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%"
+        captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%",
+        limit: "This character has a limit break path"
     },
     757: {
         special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
@@ -3685,12 +4022,14 @@ window.details = {
     760: {
         special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
         specialName: "Life Return: Shishi Finger Pistol",
-        captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn"
+        captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn",
+        limit: "This character has a limit break path"
     },
     761: {
         special: "Deals 15x character's ATK in DEX damage to one enemy, boosts ATK of all characters by 1.2x for 1 turn",
         specialName: "Gum-Gum Monster Pistol",
-        captain: "Boosts ATK of Fighter characters by 2x"
+        captain: "Boosts ATK of Fighter characters by 2x",
+        limit: "This character has a limit break path"
     },
     762: {
         special: "Boosts ATK of PSY characters by 1.75x for 1 turn",
@@ -4099,7 +4438,45 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2.5x",
         specialName: "Demon Bamboo",
         special: "Changes own orb into [INT], boosts own ATK by 2x for 1 turn, deals 15x character's ATK in INT damage to one enemy",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Potential 1: [PSY] Damage Reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of Striker characters by 2.5x and reduces damage received by 7%" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Sailor Ability 1: If Vergo has a [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Enrage" }
+        ],
+        potential: [
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            }
+        ]
     },
     841: {
         captain: "Recovers 3x character's RCV in HP at the end of each turn, deals 3x character's ATK in PSY damage to all enemies at the end of each turn",
@@ -4724,7 +5101,8 @@ window.details = {
                 "cooldown": [ 31, 17 ]
             }
         ],
-        specialNotes: "#{stages}"
+        specialNotes: "#{stages}",
+        limit: "This character has a limit break path"
     },
     934: {
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
@@ -5184,7 +5562,8 @@ window.details = {
             }
         ],
         specialName: "Decapitation High Heel",
-        specialNotes: "#{stages}"
+        specialNotes: "#{stages}",
+        limit: "This character has a limit break path"
     },
     998: {
         captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turn at the start of the fight",
@@ -5195,7 +5574,45 @@ window.details = {
         captain: "Boosts ATK of Driven characters by 2.25x and reduces cooldown of all specials by 2 turns at the start of the fight",
         specialName: "Hira Release: Death Enjambre",
         special: "Delays all enemies for 2 turns, deals 50x character's ATK as typeless damage to all enemies at the end of the turn for 5 turns",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Aquire Potential 1: Critical Hit" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [DEX] Damage Reduction" }
+        ],
+        potential: [
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ??% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            }
+        ]
     },
     1000: {
         captain: "Boosts ATK of all characters proportionally to the crew's current HP. Heals for 1.5x his RCV at the end of the turn each time you hit a Good. Heals for .5x his RCV at the end of the turn each time you hit a Great",
@@ -5474,7 +5891,70 @@ window.details = {
         special: "Protects from defeat for 1 turn, and deals several times character's ATK in Typeless damage to one enemy",
         specialNotes: "#{specialProportional : lower : 150 * ( 1 - (remaining HP) / (total HP) )} <br> #{zombie}",
         specialName: "Bari Bari No Pistol",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of STR characters by 60" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Aquire Potential 2: Enrage" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 55" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: Completely resists Paralysis on this character" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Aquire Potential 3: Reduce No Healing duration" }
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by ? turn",
+                    "Level 2: Reduces No Healing duration by ? turn",
+                    "Level 3: Reduces No Healing duration by ? turn",
+                    "Level 4: Reduces No Healing duration by ? turns",
+                    "Level 5: Reduces No Healing duration by ? turns"
+                ]
+            }
+        ]
     },
     1036: {
         captain: "Boosts ATK of Free Spirit characters by 2x after scoring 3 Perfects in a row",
@@ -5806,13 +6286,51 @@ window.details = {
                 "cooldown": [ 19, 13 ]
             },
             {
-                "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
-                "cooldown": [ 24, 18 ]
+                "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
+                "cooldown": [ 24, 18 ]
+            }
+        ],
+        specialNotes: "#{stages}",
+        specialName: "Chiyupopo",
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Aquire Sailor Ability 1: Reduces Paralysis for 1 turn for herself" },
+            { "description": "Boosts base HP by 55" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Aquire Sailor Ability 2: Reduces Silence duration against this unit by 2 turns" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Reduce No Healing duration",
+                "description": [ 
+                    "Level 1: Reduces No Healing duration by 1 turn",
+                    "Level 2: Reduces No Healing duration by ? turn",
+                    "Level 3: Reduces No Healing duration by ? turns",
+                    "Level 4: Reduces No Healing duration by ? turns",
+                    "Level 5: Reduces No Healing duration by ? turns"
+                ]
             }
-        ],
-        specialNotes: "#{stages}",
-        specialName: "Chiyupopo",
-        limit: "This character has a limit break path"
+        ]
     },
     1080: {
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
@@ -5822,7 +6340,8 @@ window.details = {
     1081: {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
-        specialName: "Trueno Bastardo"
+        specialName: "Trueno Bastardo",
+        limit: "This character has a limit break path"
     },
     1082: {
         captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
@@ -7178,7 +7697,8 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Burning Vanguard"
+        specialName: "Burning Vanguard",
+        limit: "This character has a limit break path"
     },
     1252: {// Coliseum Doma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
@@ -7619,13 +8139,13 @@ window.details = {
         specialName: "King Cobra Machetes"
     },
     1313: {//Akainu
-        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
+        captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano"
     },
     1314: {//Akainu
-        captain: "Boosts ATK by 2.25x. If any character has a [STR] orb, boosts ATK by 3.9375x instead. Boosts chances of getting [STR] orbs",
+        captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
         specialName: "Meteor Volcano",
@@ -7957,7 +8477,45 @@ window.details = {
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
         special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
         specialName: "Brushman's Brush",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by 1 turn on this character",
+                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
+                ]
+            }
+        ]
     },
     1339: {//Chopper Jump Point
         captain: "Boosts ATK of [DEX] characters by 2.25x",
@@ -8359,7 +8917,45 @@ window.details = {
         captain: "Boosts ATK of [DEX] characters by 2.5x",
         special: "Cuts the current HP of each enemy by 10%. Reduces special cooldown of [DEX] specials by 1 turn.",
         specialName: "Ittoriyu: Unfortunate Port Bird",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [QCK] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Aquire Sailor Ability 1: Restores his own special by 1 turn when it is rewinded" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: Critical Hit" }
+        ],
+        potential: [
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            }
+        ]
     },
     1389: {//Nami 5+
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x.",
@@ -8599,7 +9195,70 @@ window.details = {
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
         special: "Cuts the current HP of each enemy by 30%, reduces special cooldown of all non-Captain specials by 1 turn, and randomizes non-matching orbs including [BLOCK] orbs.",
         specialName: "Emperor's Pride",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 5" },
+            { "description": "Boosts base HP by 5" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK of Striker and Powerhouse characters by 60" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 15" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: Critical Hit" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base ATK by 50" },
+            { "description": "Aquire Potential 3: Enrage" }
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 2%",
+                    "Level 2: Reduce damage taken from [DEX] characters by 3%",
+                    "Level 3: Reduce damage taken from [DEX] characters by 4%",
+                    "Level 4: Reduce damage taken from [DEX] characters by 5%",
+                    "Level 5: Reduce damage taken from [DEX] characters by 7%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 20% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 25",
+                    "Level 2: Boosts base ATK by ??",
+                    "Level 3: Boosts base ATK by ??",
+                    "Level 4: Boosts base ATK by ??",
+                    "Level 5: Boosts base ATK by ??"
+                ]
+            }
+        ]
     },
     1414: {//Naked Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
@@ -8713,7 +9372,8 @@ window.details = {
             }
         ],
         specialNotes: "#{ignoreBarrier}<br>#{stages}",
-        specialName: "Water Bullets"
+        specialName: "Water Bullets",
+        limit: "This character has a limit break path"
     },
     1434: {//Hody Jones
         captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and boosts HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
@@ -8743,7 +9403,8 @@ window.details = {
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew"
+        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
+        limit: "This character has a limit break path"
     },
     1437: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
@@ -8773,7 +9434,8 @@ window.details = {
         specialNotes: "#{silence}",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
+        limit: "This character has a limit break path"
     },
     1441: {//Zeo
         captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
@@ -8787,7 +9449,8 @@ window.details = {
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
-        sailor: "Completely resists Blindness if your Captain is a Powerhouse character"
+        sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
+        limit: "This character has a limit break path"
     },
     1443: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 2.75x following a chain of Good > Great > Perfect hits",
@@ -8799,7 +9462,8 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
-        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew"
+        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
+        limit: "This character has a limit break path"
     },
     1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
@@ -8810,7 +9474,8 @@ window.details = {
     1446: {//Sogeking 5+
         captain: "Boosts ATK of Shooter characters by 2x and RCV of Shooter characters by 1.25x.",
         special: "Deals random PSY damage to all enemies and delays enemies by 3 turns.",
-        specialName: "Green Star: Platanus Shuriken"
+        specialName: "Green Star: Platanus Shuriken",
+        limit: "This character has a limit break path"
     },
     1447: {//Sanji 5+
         captain: "Boosts ATK of Powerhouse characters by 2.5x and reduces damage take by 10%.",
@@ -9699,7 +10364,8 @@ window.details = {
     1553: {//Coliseum Hajrudin
         captain: "Boosts ATK of characters with 40 cost by 2.75x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
-        specialName: "Thunder Giant"
+        specialName: "Thunder Giant",
+        limit: "This character has a limit break path"
     },
     1554: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2x",
@@ -9917,7 +10583,45 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
         specialName: "Admiral Hug",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Aquire Sailor Ability 1: Makes [TND] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Aquire Potential 2: Critical Hit" }
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Critical Hit",
+                "description": [ 
+                    "Level 1: If you hit a perfect with this character, there is a 10% chance to deal 3% of this character's attack in extra damage",
+                    "Level 2: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 3: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
+                    "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
+                ]
+            }
+        ]
     },
     1585: {//Coliseum Helmeppo
         captain: "Boosts ATK and RCV of Slasher and Driven characters by 1.5x",
@@ -10114,7 +10818,45 @@ window.details = {
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [INT] Damage Reduction" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 1: Reduces Silence duration against this character by 3 turns" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" }
+        ],
+        potential: [
+            {
+                "Name": "[INT] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [INT] characters by 1%",
+                    "Level 2: Reduce damage taken from [INT] characters by ?%",
+                    "Level 3: Reduce damage taken from [INT] characters by ?%",
+                    "Level 4: Reduce damage taken from [INT] characters by ?%",
+                    "Level 5: Reduce damage taken from [INT] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by 1%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            }
+        ]
     },
     1617: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
@@ -10426,7 +11168,70 @@ window.details = {
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
         special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
         specialName: "Daybreak Ruler's Spear",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire Potential 1: [STR] Damage Reduction" },
+            { "description": "Boosts base HP by 15" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 25" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 70" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base HP by 35" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 45" },
+            { "description": "Boosts base HP by 55" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Boosts base HP by 80" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base RCV by 40" },
+            { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for this unit" },
+            { "description": "Boosts base ATK by 45" },
+            { "description": "Boosts base ATK by 55" },
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
+        ],
+        potential: [
+            {
+                "Name": "[STR] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [STR] characters by ?%",
+                    "Level 2: Reduce damage taken from [STR] characters by ?%",
+                    "Level 3: Reduce damage taken from [STR] characters by ?%",
+                    "Level 4: Reduce damage taken from [STR] characters by ?%",
+                    "Level 5: Reduce damage taken from [STR] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 2: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 3: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 4: Reduce damage taken from [PSY] characters by ?%",
+                    "Level 5: Reduce damage taken from [PSY] characters by ?%"
+                ]
+            },
+            {
+                "Name": "Slot Bind Self-reduction",
+                "description": [ 
+                    "Level 1: Reduces Slot Bind duration by ? turn on this character",
+                    "Level 2: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 3: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 4: Reduces Slot Bind duration by ? turns on this character",
+                    "Level 5: Reduces Slot Bind duration by ? turns on this character"
+                ]
+            }
+        ]
     },
     1653: {//Pedro
         captain: "Boosts ATK of [INT] characters by 2x",
@@ -10511,7 +11316,8 @@ window.details = {
     1663: {//6+ Rob Lucci
         special: "Deals 75x character's ATK in typeless damage to one enemy, greatly boosts chances of getting matching orbs for 3 turns",
         specialName: "Six Powers Supreme: Six King Gun",
-        captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0"
+        captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
+        limit: "This character has a limit break path"
     },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
@@ -10781,7 +11587,45 @@ window.details = {
         captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
         specialName: "The Darkest Demon",
-        limit: "This character has a limit break path"
+        limit: [
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Boosts base HP by 20" },
+            { "description": "Aquire Potential 1: [DEX] Damage Reduction" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 25" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire Potential 2: [QCK] Damage Reduction" }
+        ],
+        potential: [
+            {
+                "Name": "[DEX] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [DEX] characters by 1%",
+                    "Level 2: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 3: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 4: Reduce damage taken from [DEX] characters by ?%",
+                    "Level 5: Reduce damage taken from [DEX] characters by ?%"
+                ]
+            },
+            {
+                "Name": "[QCK] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduce damage taken from [QCK] characters by 1%",
+                    "Level 2: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 3: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 4: Reduce damage taken from [QCK] characters by ?%",
+                    "Level 5: Reduce damage taken from [QCK] characters by ?%"
+                ]
+            }
+        ]
     },
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
@@ -12494,7 +13338,15 @@ window.details = {
         specialName: "Black Blade • The Ultimate Sword"
     },
     1808: {//Mihawk
-        captain: " Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn (Limit Broken)",
+        captain: {
+            "base": "Boosts ATK of Slasher characters by 1.2x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.62x instead for 1 turn.",
+            "level1": "Boosts ATK of Slasher characters by 1.35x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 1.8225x instead for 1 turn.",
+            "level2": "Boosts ATK of Slasher characters by 1.6x and their HP by 1.1x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.16x instead for 1 turn.",
+            "level3": "Boosts ATK of Slasher characters by 1.8x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.43x instead for 1 turn.",
+            "level4": "Boosts ATK of Slasher characters by 2x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
+            "level5": "Boosts ATK of Slasher characters by 2x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
+            "level6": "Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn."
+        },
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
         limit: [
@@ -12715,7 +13567,8 @@ window.details = {
             }
         ],
         specialNotes:"#{stages}",
-        specialName: "More More: Hundredfold Artillery Cannon"
+        specialName: "More More: Hundredfold Artillery Cannon",
+        limit: "This character has a limit break path"
     },
     1824: {//World
         captain: "Boosts ATK of Shooter characters by 2.2x at the start of the chain.<br>Boosts ATK of Shooter characters by 2.42x after the 1st Perfect in a row, by 2.662x after the 2nd Perfect in a row, by 2.9282x after the 3rd Perfect in a row, by 3.22102x after the 4th Perfect in a row, and by 3.543122x after the 5th Perfect in a row.",
@@ -12892,12 +13745,14 @@ window.details = {
     1841: {//Caribou
         captain: "Boosts ATK of Driven characters by 1.5x, deals 2x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
-        specialName: "Fathomless Infinite Hell"
+        specialName: "Fathomless Infinite Hell",
+        sailor: "When any other character uses a special, reduces own cooldown by 5 turn"
     },
     1842: {//Caribou
         captain: "Boosts ATK of Driven characters by 1.5x, deals 4x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
-        specialName: "Fathomless Infinite Hell"
+        specialName: "Fathomless Infinite Hell",
+        sailor: "When any other character uses a special, reduces own cooldown by 5 turn"
     },
     1843: {//Coribou
         captain: "Boosts ATK of Driven and Striker characters by 1.5x",
@@ -12919,21 +13774,22 @@ window.details = {
         special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
         specialName: "Garp Special"
     },
-    1847: {//Goku+
+    1847: {//Sengoku+
         captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, and their HP by 1.2x, boost ATK of characters with cost 54 by 3x",
+        captainNotes: "His captain ability also affects his evolved forms, his base form will NOT receive the boost. All evolved and plus evolved Sengoku characters in the team are included in the bonus.",
         special: "Deals random large INT Damage to all enemies, boost ATK of all characters by 1.5x for 1 turn, changes orbs to matching orbs for chatacters that are 29 cost or lower",
         specialName: "Requiem Shockwave"
     },
     1848: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2x",
-        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}"
     },
     1849: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2.25x and their HP by 1.3x",
-        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by ?% for 1 turn",
+        special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}"
@@ -12961,13 +13817,13 @@ window.details = {
     },
     1852: {//Treasure Map WB
         captain: "Not Translated",
-        special: "Change own orb to INT, 100x character ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, if the enemy has delay protection/debuff protection boost orbs by 2x for 1 turn, if the enemy has a barrier boost ATK of himself by 2.25x for 1 turn",
+        special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special"
     },
     1853: {//Treasure Map WB
         captain: "Boosts ATK of all characters proportionally to the crew's current HP, boost HP of all characters by 1.35x",
         captainNotes: "#{captainProportional : lower : 1 + 2.25 * (1 - (remaining HP) / (total HP)) : 1 : 3.25}",
-        special: "Change own orb to INT, 100x character ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers, if the enemy has delay protection/debuff protection boost orbs by 2x for 1 turn, if the enemy has a barrier boost ATK of himself by 2.25x for 1 turn",
+        special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special",
         sailor: "Limit Broken: +100HP +50ATK to all characters"
     },

From 9b2205dfe55263dbd995bae2befb6a8c07825e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:50:24 +0100
Subject: [PATCH 1553/1569] Formating

---
 common/data/captains.js | 1951 +++++++++++++++++++--------------------
 1 file changed, 974 insertions(+), 977 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 3f22fbb14..147fa319e 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -6,77 +6,77 @@ window.captains = {
         atk: function(p) { return 1.5; }
     },
     4: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1.5; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1.5; }
     },
     5: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     6: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     7: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     8: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     10: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     11: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     12: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     13: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     14: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     15: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     16: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     17: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     18: {
-        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     19: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     20: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     21: {
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     22: {
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     23: {
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     24: {
-        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     25: {
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     26: {
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     27: {
-        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     28: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
@@ -85,40 +85,40 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
     36: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     37: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     38: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     39: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     41: {
-        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     42: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
     },
     45: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     46: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     49: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     52: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     59: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     60: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     61: {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -139,34 +139,34 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     74: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     75: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1; }
     },
     76: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     77: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     194: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     195: {
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     196: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     198: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     199: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     200: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     201: {
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
@@ -175,18 +175,18 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     205: {
-        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     206: {
-        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     209: {
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     210: {
-        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     211: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
@@ -204,16 +204,16 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     220: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     221: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     222: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     223: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     224: {
         hitAtk: function(p) {
@@ -231,25 +231,25 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     227: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
     228: {
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     230: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     231: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     232: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     233: {
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     234: {
-        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     235: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
@@ -258,50 +258,50 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     248: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
     },
     249: {
-        atk: function(p) { return p.unit.type == "STR" ? 3 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 3 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
     },
     250: {
-        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
     },
     251: {
-        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
     },
     252: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     253: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     254: {
-        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     255: {
-        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     256: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     257: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     258: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     259: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     260: {
         atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
@@ -313,7 +313,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     265: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     267: {
         atk: function(p) { return 1.5; },
@@ -324,13 +324,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     293: {
-        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     294: {
-        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     295: {
-        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     296: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
@@ -339,24 +339,24 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     298: {
-        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     299: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     305: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     306: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     307: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
     },
     308: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
     },
     311: {
         hitAtk: function(p) {
@@ -395,18 +395,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     321: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     322: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     323: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     324: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     328: {
         rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
@@ -420,14 +420,14 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     333: {
-        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; }
     },
     336: {
-        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2 : 0.8); }
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2 : 0.8); }
     },
     337: {
-        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2.5 : 0.8); }
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2.5 : 0.8); }
     },
     340: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -448,32 +448,32 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
     358: {
-        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
     },
     359: {
-        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 3 : 1; }
     },
     360: {
-        atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
     },
     361: {
-        atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
     },
     362: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     363: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     364: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     365: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     366: {
         chainModifier: function(p) { return 4; }
@@ -500,26 +500,26 @@ window.captains = {
         rcv: function(p) { return 1.5; }
     },
     380: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     383: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     384: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     385: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     386: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     387: {
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     388: {
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     389: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
@@ -554,18 +554,18 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     391: {
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     392: {
-        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     395: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     396: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     397: {
         hitAtk: function(p) {
@@ -612,33 +612,33 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     411: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     412: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     413: {
-        atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
     },
     414: {
-        atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 3 : 1; }
     },
     415: {
         atk: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         },
         rcv: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
         }
     },
     416: {
         atk: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         },
         rcv: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
         }
     },
     417: {
@@ -649,22 +649,22 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     419: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     420: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     421: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     422: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     424: {
         atk: function(p) { return p.percHP >= 70.0 ? 1.5 : 1; }
@@ -674,20 +674,20 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     426: {
-        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     427: {
-        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     428: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     430: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     431: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     433: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'STR', 'DEX']); },
@@ -738,10 +738,10 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     437: {
-        rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
     },
     438: {
-        rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 5 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 5 : 1; }
     },
     444: {
         atk: function(p) {
@@ -754,18 +754,18 @@ window.captains = {
         }
     },
     446: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     447: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
     },
     448: {
-        atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
     },
     449: {
-        atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
     },
     450: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
@@ -782,10 +782,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     454: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     455: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     456: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
@@ -799,7 +799,7 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 20 ? 3 : 1; }
     },
     459: {
-        atk: function(p) { return p.unit.number == 458 || p.unit.cost <= 20 ? 3 : 1; }
+        atk: function(p) { return p.unit.number === 458 || p.unit.cost <= 20 ? 3 : 1; }
     },
     461: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
@@ -808,7 +808,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     463: {
-        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     464: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -825,26 +825,26 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     467: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     470: {
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     471: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     482: {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     483: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     485: {
-        hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     486: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
@@ -857,17 +857,17 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     492: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     496: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     497: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     498: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     499: {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -876,28 +876,28 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     501: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     502: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     503: {
-        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     504: {
-        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     507: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
     },
     508: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     509: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -909,10 +909,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     513: {
-        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
     },
     514: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     515: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
@@ -925,16 +925,16 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     517: {
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     518: {
-        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     519: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     520: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
     },
     523: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -945,36 +945,36 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     525: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     526: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     527: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     528: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     529: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
     },
     530: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
     },
     533: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     534: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     535: {
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     536: {
-        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     537: {
         chainModifier: function(p) { return 2; }
@@ -983,7 +983,7 @@ window.captains = {
         chainModifier: function(p) { return 2; }
     },
     541: {
-        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
     },
     542: {
         hp: function(p) { return 1.5; }
@@ -999,10 +999,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
     },
     545: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     546: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     548: {
         atk: function(p) { return 1.2; }
@@ -1020,10 +1020,10 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     553: {
-        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
     },
     554: {
-        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
     },
     555: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
@@ -1033,25 +1033,25 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     557: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     558: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     559: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     560: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
     },
     561: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     562: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     568: {
@@ -1066,15 +1066,15 @@ window.captains = {
     },
     570: {
         atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
-                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
+            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
+                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
                 1;
         }
     },
     571: {
         atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
-                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
+            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
+                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
                 1;
         }
     },
@@ -1108,13 +1108,13 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     579: {
-        atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 1.5 : 1; }
+        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 1.5 : 1; }
     },
     580: {
-        atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 2 : 1; }
+        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 2 : 1; }
     },
     581: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     582: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -1130,11 +1130,11 @@ window.captains = {
         rcv: function(p) { return 0.1; }
     },
     585: {
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     586: {
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     589: {
         atk: function(p) { return 1.5; },
@@ -1147,10 +1147,10 @@ window.captains = {
         rcv: function(p) { return 0.2; }
     },
     596: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     597: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
     },
     598: {
         atk: function(p) { return p.unit.stars < 3 ? 2.5 : 1; }
@@ -1159,16 +1159,16 @@ window.captains = {
         atk: function(p) { return p.unit.stars < 3 ? 3 : 1; }
     },
     600: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     601: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     602: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     603: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
     },
     604: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
@@ -1211,12 +1211,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     634: {
-        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; }
     },
     635: {
-        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; }
     },
     636: {
         atk: function(p) { return p.unit.cost <= 2 ? 3 : 1; }
@@ -1237,16 +1237,16 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     642: {
-        atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     643: {
-        atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 3 : 1; }
     },
     644: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     645: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     646: {
         atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.5 : 1; }
@@ -1256,36 +1256,36 @@ window.captains = {
     },
     648: {
         atk: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         }
     },
     649: {
         atk: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         }
     },
     650: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     651: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     652: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2 : 1); }
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
     },
     653: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.25 : 1); }
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1); }
     },
     654: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1); }
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1); }
     },
     655: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     656: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     657: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
@@ -1306,7 +1306,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     662: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     665: {
         atk: function(p) { return 1.2; },
@@ -1357,12 +1357,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     678: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     679: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     681: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -1410,33 +1410,33 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
     },
     701: {
-        hp: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
     },
     702: {
-        hp: function(p) { return p.unit.type == "INT" ? 2.25 : 1; }
+        hp: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
     },
     705: {
         atk: function(p) {
-            return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
+            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
         },
         hp: function(p) {
-            return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
+            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
         }
     },
     706: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     707: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     708: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     709: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     710: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -1461,7 +1461,7 @@ window.captains = {
         hitAtk: function(p) {
             if (!p.unit.class.has('Slasher')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
+            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -1470,7 +1470,7 @@ window.captains = {
         hitAtk: function(p) {
             if (!p.unit.class.has('Slasher')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
+            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -1502,30 +1502,30 @@ window.captains = {
         }
     },
     728: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     730: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     731: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     732: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     733: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     734: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     735: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     736: {
         atk: function(p) { return p.unit.class.has("Slasher") && p.percHP >= 50.0 ? 2.5 : 1; }
@@ -1554,18 +1554,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     747: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     748: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     749: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     750: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     751: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
@@ -1582,53 +1582,53 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     755: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     756: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     757: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     758: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     759: {
-        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     760: {
-        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 3 : 1; }
     },
     761: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     762: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     763: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     764: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     766: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     767: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     768: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     769: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     770: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     771: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
@@ -1644,12 +1644,12 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     776: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
     },
     777: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     780: {
         atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
@@ -1699,18 +1699,18 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     801: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     802: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     803: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     804: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     805: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -1767,16 +1767,16 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     825: {
-        atk: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; }
     },
     826: {
-        atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
     },
     827: {
-        atk: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; }
     },
     830: {
         atk: function(p) {
@@ -1867,7 +1867,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     854: {
-        atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
     },
     855: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
@@ -1876,11 +1876,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
     857: {
-        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
+        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
     },
     858: {
-        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
+        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
     },
     859: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
@@ -1889,10 +1889,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     862: {
-        atk: function(p) { return p.unit.type == 'QCK' ? 2 : 1; }
+        atk: function(p) { return p.unit.type === 'QCK' ? 2 : 1; }
     },
     863: {
-        atk: function(p) { return p.unit.type == 'QCK' ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === 'QCK' ? 1.75 : 1; }
     },
     864: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
@@ -1914,7 +1914,7 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -1922,17 +1922,17 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     871: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     872: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     873: {
         atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.5 : 1; }
@@ -1993,12 +1993,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     889: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     890: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     891: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -2081,12 +2081,12 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
     },
     909: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     910: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     911: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -2097,10 +2097,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     913: {
-        atk: function(p) { return p.unit.type != "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); }
+        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
     },
     914: {
-        atk: function(p) { return p.unit.type != "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.2); }
+        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.2); }
     },
     915: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -2215,20 +2215,20 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     940: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     941: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
     },
     942: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     943: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
     },
     944: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; },
@@ -2242,7 +2242,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
     },
     947: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     948: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
@@ -2286,16 +2286,16 @@ window.captains = {
         }
     },
     954: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     955: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     956: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     963: {
         atk: function(p) { 
@@ -2348,25 +2348,25 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     979: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.2 : 1; }
     },
     980: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.2 : 1; }
     },
     981: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
         rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 0.1 : 1; }
     },
     982: {
-        atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1}
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1; }
     },
     983: {
-        atk: function(p) {return p.unit.class.has("Slasher") ? 2.25  : 1}
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2.25  : 1; }
     },
     984: {
-        atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1}
+        atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1; }
     },
     989: {
         atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; },
@@ -2379,10 +2379,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.75 : 1; }
     },
     992: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1 ; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1 ; }
     },
     993: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1 ; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1 ; }
     },
     996: {
          atk: function(p) {return p.unit.class.has("Powerhouse") ? 2  : 1; }
@@ -2426,8 +2426,8 @@ window.captains = {
     },
     1009: {
         atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
-                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
+            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
+                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
                 1;
         }
     },
@@ -2449,10 +2449,10 @@ window.captains = {
         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1015: {
-        atk: function(p) { return p.unit.type == "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1) : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1) : 1; }
     },
     1016: {
-        atk: function(p) { return p.unit.type == "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5) : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
     },
     1017: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
@@ -2513,10 +2513,10 @@ window.captains = {
     },
     1034: {
         atk: function(p) { 
-            return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
+            return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
     },
     1035: {
-        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
     },
     1036: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Free Spirit" ]); },
@@ -2533,25 +2533,25 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1038: {
-        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.2 : 1; }
     },
     1039: {
-        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1040: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     1041: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1042: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2 : 1;},
         rcv: function(p) { return 0; }
     },
     1043: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2) : 1;},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2) : 1;},
         rcv: function(p) { return 0; }
     },
     1044: {
@@ -2585,18 +2585,18 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1048: {
-        atk: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
     },
     1049: {
-        atk: function(p) { return p.unit.type == 'PSY' ? (p.percHP >= 30.0 ? 1.5 : 2.25) : 1; },
-        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === 'PSY' ? (p.percHP >= 30.0 ? 1.5 : 2.25) : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
     },
     1050: {
-        atk: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
     },
     1051: {
-        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
+        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
     },
     1056:{
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
@@ -2625,15 +2625,15 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
     },
     1064: {
-        atk: function(p) { return p.unit.type == 'INT' ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == 'INT' ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; }
     },
     1065:{
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
     },
     1066: {
-        atk: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
     },
     1067:{
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1;}
@@ -2658,11 +2658,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
     },
     1074: {
-        atk: function(p) { return p.unit.type == 'INT' ? 2 : 1; }
+        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
     },
     1075: {
-        atk: function(p) { return p.unit.type == 'INT' ? 2 : 1; },
-        hp: function(p) { return p.unit.type == 'INT' ? 2 : 1; }
+        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; },
+        hp: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
     },
     1076: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
@@ -2689,11 +2689,11 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1084: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1085: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1086:{
@@ -2755,13 +2755,13 @@ window.captains = {
     },
     1101: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.25 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.25 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1102: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -2788,7 +2788,7 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1110: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; }  
+        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }  
     },
     1111: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; },
@@ -2799,13 +2799,13 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1113: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }  
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }  
     },
     1114: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1115: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
     },
     1118: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2828,10 +2828,10 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1122: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
     },
     1123: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
     },
     1124: {
         atk: function(p) {
@@ -2844,12 +2844,12 @@ window.captains = {
         }
     },
     1126: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     1127: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     1128: {
         atk: function(p) { return 1.75; }
@@ -2882,8 +2882,8 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1136: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1137: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
@@ -2905,11 +2905,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1144: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1145: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     1154: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
@@ -2936,10 +2936,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
     },
     1162: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1163: {
-        atk: function(p) { return (p.unit.type == "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type == "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type == "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
+        atk: function(p) { return (p.unit.type === "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type === "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type === "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
     },
     1164: {
         rcv: function(p) { return 1.2; }
@@ -2951,56 +2951,56 @@ window.captains = {
         atk: function(p) { return 1.2; }
     },
     1168: {
-        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2 : 1; }
     },
     1169: {
         atk: function(p) {
-            return p.unit.type == "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+            return p.unit.type === "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
         }
     },
     1170: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1171: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     1172: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1173: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1174: {
-        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
     },
     1175: {
-        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
     },
     1176: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     1177: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     1178: {
-        atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2 : 1; }
     },
     1179: {
-        atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
     },
     1181: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
     },
     1182: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
     },
     1183: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     1184: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     1185: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
@@ -3009,16 +3009,16 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1187: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
     },
     1188: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
     },
     1189: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
     },
     1190: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
     },
     1191: {
         atk: function(p) {
@@ -3045,7 +3045,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1197: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1) : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1) : 1; }
     },
     1198: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
@@ -3073,12 +3073,12 @@ window.captains = {
         hp: function(p) { return 1.3; }
     },
     1207: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1208: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1209: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
@@ -3088,20 +3088,20 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1211: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1212: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
     },
     1213: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     1214: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1215: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'PSY', 'DEX']); },
@@ -3144,21 +3144,21 @@ window.captains = {
     },
     1221: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     }, 
     1222: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1223: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1224: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1225: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1226: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
@@ -3170,18 +3170,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1229: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
     },
     1230: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.75 : p.unit.class.has("Powerhouse") ? 2.5 : 1; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.75 : p.unit.class.has("Powerhouse") ? 2.5 : 1; }  
     },
     1231: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.1875 : 1.75) : 1; },
-        rcv: function(p) { return .5 }
+        rcv: function(p) { return .5; }
     },
     1232: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.925 : 2.25) : 1; },
-        rcv: function(p) { return .5 }
+        rcv: function(p) { return .5; }
     },
     1233: {
         atk: function(p) {
@@ -3200,10 +3200,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1; }
     },
     1235: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1236: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1237: {
         hit: function(n) {
@@ -3221,22 +3221,22 @@ window.captains = {
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1239].turnedOn[i]==true){specialEnabled = true;}
-                if(window.specials[1240].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
             }
             return specialEnabled ? 3 : 2; },
-        rcv: function(p) { return 1.3 }
+        rcv: function(p) { return 1.3; }
     },
     1240: {
         atk: function(p){ 
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1239].turnedOn[i]==true){specialEnabled = true;}
-                if(window.specials[1240].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
             }
             return specialEnabled ? 3 : 2; },
-        rcv: function(p) { return 1.3 }
+        rcv: function(p) { return 1.3; }
     },
     1241: {
         chainModifier: function(p) { return 1.5; }
@@ -3249,7 +3249,7 @@ window.captains = {
             return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
                 p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
                 1;
-        },
+        }
     },
     1244: {
         atk: function(p) {
@@ -3257,7 +3257,7 @@ window.captains = {
                 p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.75 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3 :
                 1;
-        },
+        }
     },
     1245: {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
@@ -3266,7 +3266,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1247: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1248: {
@@ -3274,35 +3274,35 @@ window.captains = {
             return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
                 p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
                 1;
-        },
+        }
     },
     1249: {
         atk: function(p) {
             return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
                 p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.6 :
                 1;
-        },
+        }
     },
     1250: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1251: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1252: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1253: {
-        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
     },
     1254: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? p.unit.class.has("Striker") ? 2.75 : 1 : 1; },
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? p.unit.class.has("Striker") ? 2.75 : 1 : 1; },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1256: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; }
     },
     1257: {
         atk: function(p) { return p.percHP <= 50.0 ? 2 : 1; }
@@ -3311,16 +3311,16 @@ window.captains = {
         atk: function(p) { return p.percHP <= 50.0 ? 2.5 : 1; }
     },
     1259: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1260: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1261: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1262: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
     },
     1263: {
         atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
@@ -3329,10 +3329,10 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
     },
     1265: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1266: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1267: {
         atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
@@ -3344,7 +3344,7 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               },
+               }
     },
     1268: {
         atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
@@ -3356,13 +3356,13 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               },
+               }
     },
     1271: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1272: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1273: {
         atk: function(p) {
@@ -3376,7 +3376,7 @@ window.captains = {
                 p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
                 1;
-        },
+        }
     },
     1274: {
         atk: function(p) {
@@ -3390,43 +3390,43 @@ window.captains = {
                 p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
                 1;
-        },
+        }
     },
     1275: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1276: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1277: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.25 : 1; },
-        rcv: function(p) { return .01; },
+        rcv: function(p) { return .01; }
     },
     1278: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.75 : 1; },
-        rcv: function(p) { return .01; },
+        rcv: function(p) { return .01; }
     },
     1279: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1280: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     1281: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1282: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
     },
     1283: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1284: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     1285: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.375, [ "Striker" ]); },
@@ -3438,12 +3438,12 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1286: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
     },
     1287: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
     },
     1288: {
         atk: function(p) {
@@ -3456,16 +3456,16 @@ window.captains = {
         }
     },
     1291: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
     },
     1292: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
     },
     1293: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
     },
     1294: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     
     1297: {
@@ -3501,15 +3501,15 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1299: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1300: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1301: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
     },
     1302: {
         atk: function(p) {
@@ -3517,50 +3517,50 @@ window.captains = {
                 p.unit.class.has("Slasher") && !p.unit.class.has("Driven") ? 1.75 : 
                 !p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.5 :
                 1;
-        },
+        }
     },
     1303: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1304: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1305: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
     },
     1306: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1307: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
     },
     1308: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1309: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1310: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1311: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1312: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1313: {
         atk: function(p) {
-            return p.unit.type == "STR" ? ((p.orb == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
-        },
+        }
     },
     1314: {
         atk: function(p) {
-            return p.unit.type == "STR" ? ((p.orb == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
-        },
+            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
+        }
     },
     1315: {
         hitAtk: function(p) {
@@ -3581,24 +3581,24 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1317: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2 : 1; }
     },
     1318: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2.5 : 1; }
     },
     1321: {
         atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher"))) 
                 return 2.25;
             else
                 return 1; 
-               },
+               }
     },
     1322: {
         atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher")))
                 return 2.5;
             else
                 return 1; 
-               },
+               }
     },
     1323: {
         atk: function(p) {
@@ -3615,28 +3615,28 @@ window.captains = {
         }
     },
     1326: {
-        atk: function(p) { return 1.3; },
+        atk: function(p) { return 1.3; }
     },
     1327: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2 : 1; },
+        atk: function(p) { return p.unit.cost <= 20 ? 2 : 1; }
     },
     1328: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; },
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
     },
     1330: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     1333: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 1.96 :
-                p.unit.class.has("Powerhouse") || p.unit.type == "STR" ? 1.4 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.96 :
+                p.unit.class.has("Powerhouse") || p.unit.type === "STR" ? 1.4 :
                 1;
         }
     },
     1334: {
         atk: function(p) { 
-            return p.unit.class.has("Free Spirit") && p.unit.type == "DEX" ? 1.96 :
-                p.unit.class.has("Free Spirit") || p.unit.type == "DEX" ? 1.4 :
+            return p.unit.class.has("Free Spirit") && p.unit.type === "DEX" ? 1.96 :
+                p.unit.class.has("Free Spirit") || p.unit.type === "DEX" ? 1.4 :
                 1;
         }
     },
@@ -3653,41 +3653,41 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; }
     },
     1339: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
     },
     1340: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1341: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["QCK"]); }, 
         hitAtk: function(p) {
-            if (!(p.unit.type == "QCK")) return 1;
+            if (!(p.unit.type === "QCK")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 2.625 : 1.75;
         },
         hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
     },
     1342: {
-        hp: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
+        hp: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1343: {
         hp: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1344: {
         hp: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
     },
     1345: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1346: {
         hp: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
         atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1349: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1352: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, ["Fighter"]); },
@@ -3698,7 +3698,7 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1353: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
     },
     1354: {
         chainModifier: function(p) { return 2; }
@@ -3707,7 +3707,7 @@ window.captains = {
         chainModifier: function(p) { return 3; }
     },
     1356:{
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1357:{
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -3729,42 +3729,42 @@ window.captains = {
     1361: {
         atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
         hp: function(p) { return p.unit.class.has("Slasher") ?
-            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
     },
     1362: {
         atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
         hp: function(p) { return p.unit.class.has("Slasher") ?
-            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
     },
     1363: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1364: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     1365: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1366: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1367: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1368: {
-        atk: function(p) { return !(p.unit.type == "STR") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type === "STR") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1369: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     1370: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     1371: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
@@ -3783,18 +3783,18 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1373: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1374: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1375: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1376: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
     },
     1377: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; },
@@ -3805,10 +3805,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; }
     },
     1379: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1380: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
     },
     1381: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -3819,24 +3819,24 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1383: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1384: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
     1387: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.8125 : 2.25;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.25; },
+        hp: function(p) { return 1.25; }
     },
     1388: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
     },
     1389: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1390: {
         atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
@@ -3848,26 +3848,26 @@ window.captains = {
     },
     1392: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
     },
     1393: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; }
     },
     1394: {
-        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.1 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.1 : 1; }
     },
     1395: {
-        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.2 : 1; }
     },
     1396: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1397: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     1398: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
@@ -3880,46 +3880,41 @@ window.captains = {
             return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.275 :
                 p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
                 !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.3 :
-                1;
-        },
+                1; }
     },
     1401: {
         atk: function(p) {
             return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.625 :
                 p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
                 !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.5 :
-                1;
-        },
+                1; }
     },
     1402: {
-        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 2 : 1; }
     },
     1403: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
-            
-        },
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
     },
     1404: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
-        },
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
     },
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; }
     },
     1406: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1407: {
-        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.25 : 1; }
     },
     1408: {
-        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.5 : 1; }
     },
     1410: {
         chainModifier: function(p) { return 2.5; }
@@ -3937,57 +3932,57 @@ window.captains = {
         hp: function(p) { return 1.2; }
     },
     1414: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1415: {
-        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
     },
     1416: {
         atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
     },
     1417: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     1418: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1419: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1420: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1422: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1422: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     1423: {
-        atk: function(p) { return 1.75; },
+        atk: function(p) { return 1.75; }
     },
     1424: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1 + 1.25 * p.percHP / 100 : 1; }
     },
     1425: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; }
     },
     1426: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1427: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     1429: {
-        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     1430: {
-        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; }
     },
     1431: {
         atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
@@ -3999,7 +3994,7 @@ window.captains = {
                 return 1.2;
             else
                 return 1; 
-               },
+               }
     },
     1432: {
         atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
@@ -4011,61 +4006,57 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               },
+               }
     },
     1433: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.5 : p.classCount.Powerhouse==4 ? 1.4 : p.classCount.Powerhouse==3 ? 1.3 : p.classCount.Powerhouse==2 ? 1.2 : p.classCount.Powerhouse==1 ? 1.1 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
     },
     1434: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.5 : p.classCount.Powerhouse==4 ? 1.4 : p.classCount.Powerhouse==3 ? 1.3 : p.classCount.Powerhouse==2 ? 1.2 : p.classCount.Powerhouse==1 ? 1.1 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
     },
     1435: {
         atk: function(p) { 
             return p.unit.class.has("Slasher") ? 2 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+            return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1436: {
         atk: function(p) { 
             return p.unit.class.has("Slasher") ? 2.5 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+            return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1437: {
         atk: function(p) {
             return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 1.69 :
                 p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.3 :
-                1;
-        }
+                1; }
     },
     1438: {
         atk: function(p) {
             return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 2.56 :
                 p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.6 :
-                1;
-        }
+                1; }
     },
     1439: {
         atk: function(p) {
-            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1;
-        }
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1440: {
         atk: function(p) {
-            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.5 : 1;
-        }
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1441: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1442: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
     },
     1443: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
@@ -4087,10 +4078,10 @@ window.captains = {
     },
     1445: {
         atk: function(p) { 
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") ? 2.25 + 0.5 * p.percHP / 100 : 1; 
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") ? 2.25 + 0.5 * p.percHP / 100 : 1; 
         },
         rcv: function(p) {
-            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
         }
     },
     1446: {
@@ -4098,35 +4089,35 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1447: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1448: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1449: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1450: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1451: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.25 : 1.5); }
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1.5); }
     },
     1452: {
-        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); }
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
     },
     1453: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1454: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1455: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -4134,15 +4125,15 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1457: {
-        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 1.75 : 1; }
     },
     1458: {
-        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1459: {
         hitAtk: function(p) {
@@ -4159,7 +4150,7 @@ window.captains = {
     1461: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.6, ["QCK"]); }, 
         hitAtk: function(p) {
-            if (!(p.unit.type == "QCK")) return 1;
+            if (!(p.unit.type === "QCK")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.6 : 2;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
@@ -4175,22 +4166,22 @@ window.captains = {
         rcv: function(p) { return 1.25; }
     },
     1466: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1467: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.3 : 1; }
     },
     1468: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1469: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1470: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 3 : p.unit.class.has("Powerhouse") || p.unit.class.has("Slasher") ? 1.5 : 1; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 3 : p.unit.class.has("Powerhouse") || p.unit.class.has("Slasher") ? 1.5 : 1; }  
     },
     1471: {
         atk: function(p) {
@@ -4198,10 +4189,10 @@ window.captains = {
         }
     },
     1472: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.125 : 2.25; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
     },
     1473: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.125 : 2.25; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
     },
     1474: {
         atk: function(p) { return 1.5; }  
@@ -4210,11 +4201,11 @@ window.captains = {
         atk: function(p) { return 2.25; }  
     },
     1476: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1477: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1478: {
         hit: function(n) {
@@ -4246,12 +4237,12 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1482: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1483: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1484: {
         hitAtk: function(p) {
@@ -4265,19 +4256,19 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
     },
     1486: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
     },
     1487: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
     },
     1488: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1489: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1490: {
         hitAtk: function(p) {
@@ -4297,34 +4288,34 @@ window.captains = {
         rcv: function(p) { return 1.2; }
     },
     1493: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     1494: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1495: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     1496: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1497: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1498: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
     },
     1499: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     1500: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     1501: {
         atk: function(p) { return p.unit.cost <= 15 ? 2 : 1; }
@@ -4358,59 +4349,59 @@ window.captains = {
         }
     },
     1509: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1510: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1; }
     },
     1511: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1512: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1513: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1514: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1515: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1516: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1517: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1518: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1519: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1520: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1521: {
         atk: function(p) { 
-            return p.unit.class.has("Slasher") && p.unit.type == "QCK" ? 1.44 :
-                p.unit.class.has("Slasher") || p.unit.type == "QCK" ? 1.2 :
+            return p.unit.class.has("Slasher") && p.unit.type === "QCK" ? 1.44 :
+                p.unit.class.has("Slasher") || p.unit.type === "QCK" ? 1.2 :
                 1;
         }
     },
     1522: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     1523: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1524: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
     },
     1525: {
         atk: function(p) {
@@ -4418,19 +4409,19 @@ window.captains = {
         }
     },
     1526: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1527: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1528: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
     },
     1529: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 3 : 1.5; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 3 : 1.5; }  
     },
     1530: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 3.5 : 1.75; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 3.5 : 1.75; }  
     },
     1531: {
         atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
@@ -4441,31 +4432,31 @@ window.captains = {
     1533: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
         hitAtk: function(p) {
-            return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
+            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     1534: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
         hitAtk: function(p) {
-            return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
+            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     1535: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1); }
+        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
     },
     1536: {
-        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); }
+        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
     },
     1537: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1538: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.25 : 1; }
     },
     1539: {
@@ -4520,39 +4511,39 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1546: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     1547: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; }
     },
     1548: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1549: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
     },
     1550: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     1551: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1552: {
-        atk: function(p) { return p.unit.cost == 40 ? 2.5 : 1; },
+        atk: function(p) { return p.unit.cost === 40 ? 2.5 : 1; }
     },
     1553: {
-        atk: function(p) { return p.unit.cost == 40 ? 2.75 : 1; },
+        atk: function(p) { return p.unit.cost === 40 ? 2.75 : 1; }
     },
     1554: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     1555: {
-        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
     },
     1556: {
-        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1557: {
         atk: function(p) {
@@ -4576,7 +4567,7 @@ window.captains = {
     },
     1561: {
         atk: function(p) {
-            return p.unit.type == "INT" ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+            return p.unit.type === "INT" ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
         }
     },
     1562: {
@@ -4607,12 +4598,12 @@ window.captains = {
         atk: function(p) { return 2; }
     },
     1567: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1568: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     1569: {
         atk: function(p) { return 2.25; }
@@ -4634,11 +4625,11 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1574: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
     },
     1575: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.25 : 1; }
     },
     1576: {
         hitAtk: function(p) {
@@ -4655,19 +4646,19 @@ window.captains = {
     1579: {
         atk: function(p) { return 1.3; },
         rcv: function(p) { return 1.3; },
-        hp: function(p) { return 1.3; },
+        hp: function(p) { return 1.3; }
     },
     1580: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     1581: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     1582: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1583: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -4677,52 +4668,52 @@ window.captains = {
     },
     1585: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1586: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1587: {
-        atk: function(p) { return (p.slot == p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
-        hp: function(p) { return 1.3 },
+        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
+        hp: function(p) { return 1.3; }
     },
     1588: {
-        atk: function(p) { return (p.slot == p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
-        hp: function(p) { return 1.3 },
+        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
+        hp: function(p) { return 1.3; }
     },
     1589: {
-        chainModifier: function(p) { return 3; },
+        chainModifier: function(p) { return 3; }
     },
     1590: {
         chainModifier: function(p) { return 3.5; },
-        rcv: function(p) { return 1.2 },
-        hp: function(p) { return 1.2 },
+        rcv: function(p) { return 1.2; },
+        hp: function(p) { return 1.2; }
     },
     1591: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1592: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
     },
     1593: {
         atk: function(p){ 
             return p.unit.class.has("Fighter") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
-        },
+        }
     },
     1595: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1596: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1597: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.75 : 1; }
     },
     1598: {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
@@ -4731,7 +4722,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1600: {
-        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 2.5 : 1; }
     },
     1601: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
@@ -4745,65 +4736,65 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1603: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type == "STR" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.25 : 1; }
     },
     1604: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     1605: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1606: {//BB Pirates FN Lafitte
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1607: {//BB Pirates FN Van Augur
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1608: {//BB Pirates FN Doc Q
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1609: {//Enel TO DO
-        hp: function(p) { return 0.8 },
-        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); },
+        hp: function(p) { return 0.8; },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
     },
     1610: {//Enel TO DO
-        hp: function(p) { return 0.8 },
-        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); },
+        hp: function(p) { return 0.8; },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
     },
     1611: {
         atk: function(p) {return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1612: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1613: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1614: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; }
     },
     1615: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1616: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
     1617: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
     },
     1618: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
     },
     1619: {
         chainModifier: function(p) { return 4; },
-        hp: function(p) { return 1.2 },
-        rcv: function(p) { return 1.2 },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
     },
     1620: {
         atk: function(p) { return p.unit.class.has("Striker") && p.percHP <= 30.0 ? 2.5 : 1; }
@@ -4824,7 +4815,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1625: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1626: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
@@ -4838,7 +4829,7 @@ window.captains = {
     },
     1628: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1629: {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -4855,14 +4846,14 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
     },
     1633: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1634: {
-        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1635: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1636: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
@@ -4871,13 +4862,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25: 1; }
     },
     1644: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     1645: {
         atk: function(p) { 
-            return p.unit.class.has("Slasher") && p.unit.type == "DEX" ? 1.96 :
-                p.unit.class.has("Slasher") && !p.unit.type == "DEX" ? 1.3 :
-                !p.unit.class.has("Slasher") && p.unit.type == "DEX" ? 1.5 :
+            return p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.96 :
+                p.unit.class.has("Slasher") && !p.unit.type === "DEX" ? 1.3 :
+                !p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.5 :
                 1;
         }
     },
@@ -4893,38 +4884,38 @@ window.captains = {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.4 : 1.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1649: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1650: {
-        atk: function(p) { return p.unit.type == "DEX" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5) : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
     },
     1651: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1652: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1653: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1654: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     1655: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1656: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1657: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
@@ -4939,13 +4930,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1661: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1662: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.5 : 1; }
     },
     1663: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.5 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.5 : 2.5); },
         rcv: function(p) { return 0; }
     },
     1664: {
@@ -4972,8 +4963,8 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1670: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     1671: {
         rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
@@ -5046,10 +5037,10 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1687: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     1688: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1689: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
@@ -5090,10 +5081,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1693: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1694: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; }
     },
     1695: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -5111,7 +5102,7 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               },
+               }
     },
     1698: {
         atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
@@ -5123,7 +5114,7 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               },
+               }
     },
     1699: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
@@ -5134,40 +5125,40 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.3 : 1; }
     },
     1701: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1702: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1703: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1704: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     1705: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1706: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["STR"]); }, 
         hitAtk: function(p) {
-            return !p.unit.type == "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
+            return !p.unit.type === "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1707: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2.75 : 1; },
-        hp: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
     },
     1709: {
-        atk: function(p) { return 1.5; },
+        atk: function(p) { return 1.5; }
     },
     1710: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1711: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1712: {
@@ -5177,10 +5168,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? Math.min(3.25, 2.5 + 0.25 * p.turnCounter) : 1; }
     },
     1714: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1715: {
-        atk: function(p) { return !p.unit.class.has("Striker") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); },
+        atk: function(p) { return !p.unit.class.has("Striker") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
     },
     1716: {
         atk: function(p) {
@@ -5191,18 +5182,18 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Driven" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.5 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1719: {
-        atk: function(p) { return p.unit.type != "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2 : 1); }
+        atk: function(p) { return p.unit.type !== "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
     },
     1720: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1721: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2.5); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1722: {
@@ -5233,73 +5224,73 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1728: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1729: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1; }
     },
     1730: {
-        atk: function(p) { return 2; },
+        atk: function(p) { return 2; }
     },
     1731: {
-        atk: function(p) { return 2; },
+        atk: function(p) { return 2; }
     },
     1732: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.1 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.1 : 1; }
     },
     1733: {
-        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1734: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1735: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1736: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
     },
     1737: {
-        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1738: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1739: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1740: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.1 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.1 : 1; }
     },
     1741: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type == "DEX" ? 1.3 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.3 : 1; }
     },
     1742: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.1 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.1 : 1; }
     },
     1743: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type == "STR" ? 1.3 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.3 : 1; }
     },
     1744: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1745: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1746: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2.5 : (prev == 'Good' ? 2.75 : (prev == 'Great' ? 3 : (prev == 'Perfect' ? 3.25 : 2.5)));
+            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -5308,17 +5299,17 @@ window.captains = {
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2.5 : (prev == 'Good' ? 2.75 : (prev == 'Great' ? 3 : (prev == 'Perfect' ? 3.25 : 2.5)));
+            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1748: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1749: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
@@ -5339,25 +5330,25 @@ window.captains = {
         hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
     },
     1754: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1755: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1758: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.1 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.1 : 1; }
     },
     1759: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     1760: {
-        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
     },
     1761: {
-        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
     },
     1762: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
@@ -5367,7 +5358,7 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-        rcv: function(p) { return 0.5; },
+        rcv: function(p) { return 0.5; }
     },
     1763: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
@@ -5377,7 +5368,7 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-        rcv: function(p) { return 0.5; },
+        rcv: function(p) { return 0.5; }
     },
     1764: {
         atk: function(p) {
@@ -5386,20 +5377,20 @@ window.captains = {
         hp: function(p) { return 1.25; }
     },
     1765: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1766: {
         chainModifier: function(p) { return 1.5; },
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1769: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
     },
     1770: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
@@ -5426,12 +5417,12 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
     1775: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1776: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; }
     },
     1778: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
@@ -5448,7 +5439,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1782: {
-        atk: function(p) { return p.unit.type == "2.25" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "2.25" ? 1.75 : 1; }
     },
     1783: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -5460,25 +5451,25 @@ window.captains = {
     1791: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, [ "QCK", "STR", "DEX" ]); }, 
         hitAtk: function(p) {
-            return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1792: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 3.25, [ "QCK", "STR", "DEX" ]); }, 
         hitAtk: function(p) {
-            return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
+            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1793: {
         atk: function(p) { 
-            if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
-                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
+                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
-                else if(p.colorCount.INT==0 && p.colorCount.PSY==0)
+                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
                     return 1.35;
                 else
                     return 1; 
@@ -5491,16 +5482,16 @@ window.captains = {
                 return 1.3;
             else
                 return 1; 
-               },
+               }
     },
     1794: {
         atk: function(p) { 
-            if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
-                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
+                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
-                else if(p.colorCount.INT==0 && p.colorCount.PSY==0)
+                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
                     return 1.35;
                 else
                     return 1; 
@@ -5513,67 +5504,67 @@ window.captains = {
                 return 1.3;
             else
                 return 1; 
-               },
+               }
     },
     1795: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; }
     },
     1796: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1797: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1798: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Driven") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Driven") ? 1.25 : 1; }
     },
     1799: {
-        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.25 : 1; }
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.25 : 1; }
     },
     1800: {
-        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; },
-        rcv: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1.2 : 1; }
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; },
+        rcv: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1.2 : 1; }
     },
     1801: {
-        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2 : 1; }
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2 : 1; }
     },
     1802: {
-        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; }
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; }
     },
     1803: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1804: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; }
     },
     1805: {
         atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
     },
     1806: {
         atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
     },
     1807: {
         atk: function(p){ 
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
             }
             return p.unit.class.has("Slasher") ? specialEnabled ? 1.35 : 1 : 1; 
-        },
+        }
     },
     1808: {
         atk: function(p){ 
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
             }
             if(p.unit.class.has("Slasher")){
                 if(p.actions[p.sourceSlot]){
@@ -5592,9 +5583,8 @@ window.captains = {
             }else{
                 return 1;
             }
-            // return p.unit.class.has("Slasher") ? specialEnabled ? 1.62 : 1.2 : 1; 
         },
-        hp: function(p) { return p.actions[p.sourceSlot] ? 1.3 : 1.1 }
+        hp: function(p) { return p.actions[p.sourceSlot] ? 1.3 : 1.1; }
     },
     1809: {
         hitAtk: function(p) {
@@ -5609,10 +5599,10 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1811: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     1812: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1813: {
         atk: function(p) { return 2.25; }
@@ -5621,7 +5611,7 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.5 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -5629,33 +5619,33 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1816: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.25 : 2.25); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.25 : 2.25); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1817: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2 : 1;
         },
-        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"]
     },
     1818: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;
         },
         hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.2; },
+        hp: function(p) { return 1.2; }
     },
     1819: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1820: {
-        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     1821: {
         atk: function(p) { return 1.5; }
@@ -5669,7 +5659,7 @@ window.captains = {
             if (!p.unit.class.has("Shooter")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1824: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
@@ -5677,7 +5667,7 @@ window.captains = {
             if (!p.unit.class.has("Shooter")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1825: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
@@ -5712,21 +5702,21 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1827: {
-        atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1828: {
-        atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1829: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1; }
     },
     1830: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1831: {
         atk: function(p) { 
             if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9375 : 2.25;
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
             }
             else
                 return 1; 
@@ -5736,7 +5726,7 @@ window.captains = {
     1832: {
         atk: function(p) { 
             if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9375 : 2.25;
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
             }
             else
                 return 1; 
@@ -5745,129 +5735,129 @@ window.captains = {
     },
     1833: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "INT" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.2 :
                 1;
         },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.1 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.1 : 1; }
     },
     1834: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "INT" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.3 :
                 1;
         },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1835: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "STR" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.2 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1836: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "STR" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.3 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1837: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "QCK" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.2 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1838: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "QCK" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.3 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1839: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "DEX" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.2 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1840: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type == "DEX" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.3 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1841: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1842: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1843: {
-        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     1844: {
-        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; }
     },
     1845: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1846: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.75 : 1; }
     },
     1847: {
         atk: function(p) {  
     
             if(p.unit.cost <= 29){
                 return 3.25;
-            }else if(p.unit.cost == 54){
+            }else if(p.unit.cost === 54){
                 return 3;
             }else{
                 return 1;
             }
         },
-        hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; },
+        hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; }
     },
     1848: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1849: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; }
     },
     1850: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1851: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; }
     },
     1853: {
         atk: function(p) {
             return (1 + 1.25 * ((100 - p.percHP) / 100));
         },
-        hp: function(p) { return 1.2; },
+        hp: function(p) { return 1.2; }
     },
     1854: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1855: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Free Spirit" ]); },
@@ -5878,17 +5868,17 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1856: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1857: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1858: {
         hitAtk: function(p) {
             if (!(p.unit.class.has("Striker"))) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1859: {
         hitAtk: function(p) {
@@ -5899,15 +5889,22 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     1861: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1863: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    1865: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
+    1867: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        chainModifier: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     2000: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; }
     },
     2001: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2.5 : 1; },
-    },
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2.5 : 1; }
+    }
 };

From 8c8f66d30c69ccf532c78681aaa941dd0d144f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:52:03 +0100
Subject: [PATCH 1554/1569] Formating

---
 common/data/sailors.js | 234 ++++++++++++++++++++---------------------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/common/data/sailors.js b/common/data/sailors.js
index c7e62caed..e83049ff7 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -1,280 +1,280 @@
 window.sailors = {
     311: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; }
     },
     312: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; }
     },
     360: {
-        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; },
+        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; }
     },
     361: {
-        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; },
+        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; }
     },
     364: {
-        rcvStatic: function(p) { return 10; },
+        rcvStatic: function(p) { return 10; }
     },
     365: {
-        rcvStatic: function(p) { return 10; },
+        rcvStatic: function(p) { return 10; }
     },
     450: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; }
     },
     451: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; }
     },
     525: {
-        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
     },
     526: {
-        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
     },
     527: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
     },
     528: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
     },
     553: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
     },
     554: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
     },
     555: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
     },
     556: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
     },
     559: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
     },
     560: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
     },
     640: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; }
     },
     641: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; }
     },
     644: {
-        rcvStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
-        atkStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; }
     },
     645: {
-        rcvStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
-        atkStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; }
     },
     646: {
-        hpStatic: function(p) { return p.unit.type == "STR" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" ? 30 : 0; }
     },
     647: {
-        hpStatic: function(p) { return p.unit.type == "STR" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" ? 30 : 0; }
     },
     1172: {
-        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
     },
     1173: {
-        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
     },
     1174: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
     },
     1175: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
     },
     1176: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
     },
     1177: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
     },
     1183: {
-        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type == "PSY" ? 75 : 0; },
+        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type === "PSY" ? 75 : 0; }
     },
     1184: {
-        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type == "PSY" ? 75 : 0; },
+        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type === "PSY" ? 75 : 0; }
     },
     1187: {
         atkStatic: function(p) { return 20; },
         rcvStatic: function(p) { return 20; },
-        hpStatic: function(p) { return 20; },
+        hpStatic: function(p) { return 20; }
     },
     1188: {
         atkStatic: function(p) { return 20; },
         rcvStatic: function(p) { return 20; },
-        hpStatic: function(p) { return 20; },
+        hpStatic: function(p) { return 20; }
     },
     1189: {
-        atkStatic: function(p) { return p.unit.type == "QCK" ? 40 : 0; },
+        atkStatic: function(p) { return p.unit.type === "QCK" ? 40 : 0; }
     },
     1190: {
-        atkStatic: function(p) { return p.unit.type == "QCK" ? 40 : 0; },
+        atkStatic: function(p) { return p.unit.type === "QCK" ? 40 : 0; }
     },
     1209: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
     },
     1210: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
     },
     1211: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
     },
     1212: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
     },
     1231: {
-        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; }
     },
     1232: {
-        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; }
     },
     1233: {
-        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; }
     },
     1234: {
-        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; }
     },
     1255: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 40 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 40 : 0; }
     },
     1256: {
         rcvStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; },
-        atkStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; }
     },
     1271: {
-        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Driven") ? 100 : 0 : 0; },
+        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Driven") ? 100 : 0 : 0; }
     },
     1270: {
-        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Driven") ? 100 : 0 : 0; },
+        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Driven") ? 100 : 0 : 0; }
     },
     1273: {
-        hpStatic: function(p) { return 75; },
+        hpStatic: function(p) { return 75; }
     },
     1274: {
-        hpStatic: function(p) { return 75; },
+        hpStatic: function(p) { return 75; }
     },
     1277: {
-        rcvAdded: function(p) { return 150; },
+        rcvAdded: function(p) { return 150; }
     },
     1278: {
-        rcvAdded: function(p) { return 150; },
+        rcvAdded: function(p) { return 150; }
     },
     1317: {
-        hpStatic: function(p) { return 75; },
+        hpStatic: function(p) { return 75; }
     },
     1318: {
-        hpStatic: function(p) { return 75; },
+        hpStatic: function(p) { return 75; }
     },
     1321: {
-        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; },
+        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; }
     },
     1322: {
-        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; },
+        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; }
     },
     1363: {
-        hpStatic: function(p) { return p.unit.type == "PSY" ? 100 : 0; },
+        hpStatic: function(p) { return p.unit.type === "PSY" ? 100 : 0; }
     },
     1364: {
-        hpStatic: function(p) { return p.unit.type == "PSY" ? 100 : 0; },
+        hpStatic: function(p) { return p.unit.type === "PSY" ? 100 : 0; }
     },
     1367: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; }
     },
     1368: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; }
     },
     1377: {
-        rcvAdded: function(p) { return 125; },
+        rcvAdded: function(p) { return 125; }
     },
     1378: {
-        rcvAdded: function(p) { return 125; },
+        rcvAdded: function(p) { return 125; }
     },
     1405: {
         atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; }
     },
     1406: {
         atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; }
     },
     1435: {
-        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; }
     },
     1436: {
-        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; }
     },
     1443: {
-        hpStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
-        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 50 : 0; },
+        hpStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 50 : 0; }
     },
     1444: {
-        hpStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
-        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 50 : 0; },
+        hpStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 50 : 0; }
     },
     1464: {
-        rcvAdded: function(p) { return 100; },
+        rcvAdded: function(p) { return 100; }
     },
     1465: {
-        rcvAdded: function(p) { return 100; },
+        rcvAdded: function(p) { return 100; }
     },
     1476: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; }
     },
     1477: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; }
     },
     1507: {
-        atkStatic: function(p) { return 15; },
+        atkStatic: function(p) { return 15; }
     },
     1508: {
-        atkStatic: function(p) { return 15; },
+        atkStatic: function(p) { return 15; }
     },
     1510: {
-        atkStatic: function(p) { return p.percHP >= 70.0 && p.unit.class.has("Striker") ? 20 : 0; },
+        atkStatic: function(p) { return p.percHP >= 70.0 && p.unit.class.has("Striker") ? 20 : 0; }
     },
     1511: {
-        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Powerhouse") ? p.unit.class.has("Powerhouse") ? 20 : 0 : 0 : 0; },
+        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Powerhouse") ? p.unit.class.has("Powerhouse") ? 20 : 0 : 0 : 0; }
     },
     1523: {
-        rcvAdded: function(p) { return 124; },
+        rcvAdded: function(p) { return 124; }
     },
     1524: {
-        rcvAdded: function(p) { return 124; },
+        rcvAdded: function(p) { return 124; }
     },
     1529: {
-        atk: function(p) { return p.captain != null ? p.captain.type == "STR" || p.captain.type == "QCK" ? .5 : 1 : 1; },
+        atk: function(p) { return p.captain !== null ? p.captain.type === "STR" || p.captain.type === "QCK" ? .5 : 1 : 1; }
     },
     1530: {
-        atk: function(p) { return p.captain != null ? p.captain.type == "STR" || p.captain.type == "QCK" ? .5 : 1 : 1; },
+        atk: function(p) { return p.captain !== null ? p.captain.type === "STR" || p.captain.type === "QCK" ? .5 : 1 : 1; }
     },
     1537: {
-        hpStatic: function(p) { return p.unit.type == "STR" ? 150 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" ? 150 : 0; }
     },
     1538: {
-        hpStatic: function(p) { return p.unit.type == "STR" ? 150 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" ? 150 : 0; }
     },
     1539: {
-        atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
+        atkStatic: function(p) { return p.unit.type === "INT" ? 50 : 0; }
     },
     1540: {
-        atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
+        atkStatic: function(p) { return p.unit.type === "INT" ? 50 : 0; }
     },
     1574: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 200 : 0; }
     },
     1575: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 200 : 0; }
     },
     1613: {//not working
         staticMult: function(p) { return 2; }
@@ -283,75 +283,75 @@ window.sailors = {
         staticMult: function(p) { return 2; }
     },
     1655: {
-        atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
-        rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+        atkStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; }
     },
     1656: {
-        atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
-        rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+        atkStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; }
     },
     1681: {
         atkStatic: function(p) { return 56; },
-        hpStatic: function(p) { return 56; },
+        hpStatic: function(p) { return 56; }
     },
     1682: {
         atkStatic: function(p) { return 56; },
-        hpStatic: function(p) { return 56; },
+        hpStatic: function(p) { return 56; }
     },
     1699: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; }
     },
     1700: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; }
     },
     1728: {
-        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
-        rcvStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
-        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; }
     },
     1729: {
-        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
-        rcvStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
-        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; }
     },
     1705: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; }
     },
     1706: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; },
+        hpStatic: function(p) { return 50; }
     },
     1752: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
     },
     1753: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
     },
     1754: {
         atkStatic: function(p) { return 40; },
         rcvStatic: function(p) { return 40; },
-        hpStatic: function(p) { return 40; },
+        hpStatic: function(p) { return 40; }
     },
     1755: {
         atkStatic: function(p) { return 40; },
         rcvStatic: function(p) { return 40; },
-        hpStatic: function(p) { return 40; },
+        hpStatic: function(p) { return 40; }
     },
     1773: {
-        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; }
     },
     1774: {
-        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; },
+        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; }
     },
     1797: {
-        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
-        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; }
     },
     1798: {
-        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
-        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; },
+        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; }
     },
-};
\ No newline at end of file
+};

From 2e1e91c5ea74aa4861df141248cb1d694ef9ddfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:52:32 +0100
Subject: [PATCH 1555/1569] Formating

---
 common/data/ships.js | 70 ++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/common/data/ships.js b/common/data/ships.js
index 39e26223c..f4d9af7f2 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -12,7 +12,7 @@ window.ships = [
                                       1.3 ;
         },
         rcvStatic: function(p) {
-            return p.slot != 1 ? 0 :
+            return p.slot !== 1 ? 0 :
                 [ 30, 40, 50, 60, 70, 80, 90, 100, 110, 120 ][p.boatLevel - 1];
         }
     },
@@ -22,7 +22,7 @@ window.ships = [
         thumb: 'ship_0002_c.png',
         description: 'Boosts ATK by 1.5x, boosts captain\'s HP by 300 units',
         hpStatic: function(p) {
-            return p.slot != 1 ? 0 :
+            return p.slot !== 1 ? 0 :
                 [ 100, 130, 150, 170, 190, 210, 230, 250, 270, 300 ][p.boatLevel - 1];
         },
         atk: function(p) {
@@ -52,7 +52,7 @@ window.ships = [
         thumb: 'ship_0004_c.png',
         description: 'Boosts captain\'s HP by 2000 units',
         hpStatic: function(p) {
-            return p.slot != 1 ? 0 :
+            return p.slot !== 1 ? 0 :
                 [ 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 2000 ][p.boatLevel - 1];
         }
     },
@@ -70,7 +70,7 @@ window.ships = [
                 [ 1.1, 1.1, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         rcvStatic: function(p) {
-            return p.slot != 1 ? 0 : -700;
+            return p.slot !== 1 ? 0 : -700;
         }
     },
 
@@ -125,10 +125,10 @@ window.ships = [
         thumb: 'ship_0010_c1.png',
         description: 'Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of QCK characters by 1.4x and their HP by 1.3x',
         atk: function(p) {
-            return p.unit.type != 'QCK' ? 1 : [ 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.25, 1.3, 1.3, 1.4 ][p.boatLevel - 1];
+            return p.unit.type !== 'QCK' ? 1 : [ 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.25, 1.3, 1.3, 1.4 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return p.unit.type != 'QCK' ? 1 : [ 1, 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.3, 1.3 ][p.boatLevel - 1];
+            return p.unit.type !== 'QCK' ? 1 : [ 1, 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.3, 1.3 ][p.boatLevel - 1];
         }
     },
 
@@ -197,10 +197,10 @@ window.ships = [
         thumb: 'ship_0016_c1.png',
         description: 'Boosts ATK of QCK and PSY characters by 1.5x and their HP by 1.2x. Special: Deals 56560 fixed Damage to all enemies (cooldown: 17 Turns)',
         atk: function(p) {
-            return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
+            return p.unit.type === "PSY" || p.unit.type === "QCK" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.1, 1.2 ][p.boatLevel - 1] : 1;
+            return p.unit.type === "PSY" || p.unit.type === "QCK" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.1, 1.2 ][p.boatLevel - 1] : 1;
         }
     },
     
@@ -221,7 +221,7 @@ window.ships = [
         thumb: 'ship_0018_c1.png',
         //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
         description: 'Boosts ATK by 1.2x.',
-        atk: function(p) { return 1.2; },
+        atk: function(p) { return 1.2; }
     }, 
     
     { // 18
@@ -230,11 +230,11 @@ window.ships = [
         description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units.',
         atk: function(p) {
             return !p.unit.class.has('Fighter') ? .05 :
-                [ p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.01 : p.classCount.Fighter == 3 ? 1.02 : p.classCount.Fighter == 4 ? 1.03 : p.classCount.Fighter == 5 ? 1.04 : p.classCount.Fighter == 6 ? 1.05 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.04 : p.classCount.Fighter == 5 ? 1.05 : p.classCount.Fighter == 6 ? 1.1 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.05 : p.classCount.Fighter == 5 ? 1.1 : p.classCount.Fighter == 6 ? 1.15 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.05 : p.classCount.Fighter == 4 ? 1.1 : p.classCount.Fighter == 5 ? 1.15 : p.classCount.Fighter == 6 ? 1.2 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.25 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.3 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.25 : p.classCount.Fighter == 6 ? 1.35 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.4 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.45 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.2 : p.classCount.Fighter == 4 ? 1.3 : p.classCount.Fighter == 5 ? 1.4 : p.classCount.Fighter == 6 ? 1.5 : 0][p.boatLevel - 1];
+                [ p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.01 : p.classCount.Fighter === 3 ? 1.02 : p.classCount.Fighter === 4 ? 1.03 : p.classCount.Fighter === 5 ? 1.04 : p.classCount.Fighter === 6 ? 1.05 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.04 : p.classCount.Fighter === 5 ? 1.05 : p.classCount.Fighter === 6 ? 1.1 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.05 : p.classCount.Fighter === 5 ? 1.1 : p.classCount.Fighter === 6 ? 1.15 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.05 : p.classCount.Fighter === 4 ? 1.1 : p.classCount.Fighter === 5 ? 1.15 : p.classCount.Fighter === 6 ? 1.2 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.25 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.3 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.25 : p.classCount.Fighter === 6 ? 1.35 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.4 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.45 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.2 : p.classCount.Fighter === 4 ? 1.3 : p.classCount.Fighter === 5 ? 1.4 : p.classCount.Fighter === 6 ? 1.5 : 0][p.boatLevel - 1];
         },
         hp: function(p) {
             return !p.unit.class.has('Fighter') ? .05 :
-                [ p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.01 : p.classCount.Fighter == 3 ? 1.02 : p.classCount.Fighter == 4 ? 1.03 : p.classCount.Fighter == 5 ? 1.04 : p.classCount.Fighter == 6 ? 1.05 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.04 : p.classCount.Fighter == 5 ? 1.05 : p.classCount.Fighter == 6 ? 1.1 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.05 : p.classCount.Fighter == 5 ? 1.1 : p.classCount.Fighter == 6 ? 1.15 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.05 : p.classCount.Fighter == 4 ? 1.1 : p.classCount.Fighter == 5 ? 1.15 : p.classCount.Fighter == 6 ? 1.2 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.25 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.3 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.25 : p.classCount.Fighter == 6 ? 1.35 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.4 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.45 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.2 : p.classCount.Fighter == 4 ? 1.3 : p.classCount.Fighter == 5 ? 1.4 : p.classCount.Fighter == 6 ? 1.5 : 0][p.boatLevel - 1];
+                [ p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.01 : p.classCount.Fighter === 3 ? 1.02 : p.classCount.Fighter === 4 ? 1.03 : p.classCount.Fighter === 5 ? 1.04 : p.classCount.Fighter === 6 ? 1.05 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.04 : p.classCount.Fighter === 5 ? 1.05 : p.classCount.Fighter === 6 ? 1.1 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.05 : p.classCount.Fighter === 5 ? 1.1 : p.classCount.Fighter === 6 ? 1.15 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.05 : p.classCount.Fighter === 4 ? 1.1 : p.classCount.Fighter === 5 ? 1.15 : p.classCount.Fighter === 6 ? 1.2 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.25 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.3 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.25 : p.classCount.Fighter === 6 ? 1.35 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.4 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.45 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.2 : p.classCount.Fighter === 4 ? 1.3 : p.classCount.Fighter === 5 ? 1.4 : p.classCount.Fighter === 6 ? 1.5 : 0][p.boatLevel - 1];
         }
     },
     
@@ -242,16 +242,16 @@ window.ships = [
         name: "Doflamingo Ship",
         thumb: 'ship_0020_c.png',
         description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. Special: Adds 0.2 to Chain  (cooldown MAX: 15 Turns)',
-        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
-        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
+        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]; },
+        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]; }
     },
     
     { // 19.2
         name: "Doflamingo Ship - Special ACTIVATED",
         thumb: 'ship_0020_c.png',
         description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. ACTIVATED Special: Adds 0.2 to Chain  (cooldown MAX: 15 Turns)',
-        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
-        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
+        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]; },
+        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]; }
     },
     
     { // 20
@@ -265,8 +265,8 @@ window.ships = [
             return p.unit.class.has('Powerhouse') ? 1 : 0.01;
         },
         heal: function(p) {
-            return p.classCount.Powerhouse == 1 ? 1 : p.classCount.Powerhouse == 2 ? 10 : p.classCount.Powerhouse == 3 ? 20 : p.classCount.Powerhouse == 4 ? 30 : p.classCount.Powerhouse == 5 ? 100 : p.classCount.Powerhouse == 6 ? 900 : 0;  
-        },
+            return p.classCount.Powerhouse === 1 ? 1 : p.classCount.Powerhouse === 2 ? 10 : p.classCount.Powerhouse === 3 ? 20 : p.classCount.Powerhouse === 4 ? 30 : p.classCount.Powerhouse === 5 ? 100 : p.classCount.Powerhouse === 6 ? 900 : 0;  
+        }
         
     },
     
@@ -277,7 +277,7 @@ window.ships = [
         description: 'Boosts HP by 1.3x.',
         hp: function(p) {
             return 1.3;
-        },
+        }
     },
     
     { // 22
@@ -285,11 +285,11 @@ window.ships = [
         thumb: 'ship_0023_c.png',
         description: 'Boosts ATK of [STR] and [PSY] characters by 1.5x, and their HP by 1.25x',
         atk: function(p) {
-            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
+            return p.unit.type === "PSY" || p.unit.type === "STR" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
-        },
+            return p.unit.type === "PSY" || p.unit.type === "STR" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
+        }
     },
     
     { //23
@@ -301,7 +301,7 @@ window.ships = [
         },
         hp: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Free Spirit')) ? 1 : [ 1.1, 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.25, 1.25 ][p.boatLevel - 1];
-        },
+        }
     },
     { // 24
         name: 'New Year\'s Big Top',
@@ -336,11 +336,11 @@ window.ships = [
         thumb: 'ship_0028_c.png',
         description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x if there are 6 Striker characters in your crew. Reduces special cooldown of Striker characters by 1 at the start of the adventure.  Special: Reduces any damage received above 10,000 HP by 97% (cooldown: 17 turns).',
         atk: function(p) {
-            return !(p.classCount.Striker == 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
+            return !(p.classCount.Striker === 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
                 [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !(p.classCount.Striker == 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
+            return !(p.classCount.Striker === 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
                 [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
         }
     },
@@ -350,11 +350,11 @@ window.ships = [
         thumb: 'ship_0029_c.png',
         description: 'Boosts ATK of [DEX] and [INT] characters by 1.5x and their HP by 1.25x',
         atk: function(p) {
-            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
+            return p.unit.type === "DEX" || p.unit.type === "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
-        },
+            return p.unit.type === "DEX" || p.unit.type === "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
+        }
     },
     
     { //29
@@ -368,7 +368,7 @@ window.ships = [
         hp: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.02;
         },*/
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     
     { //29.2
@@ -382,7 +382,7 @@ window.ships = [
         hp: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.02;
         },*/
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     
     
@@ -392,7 +392,7 @@ window.ships = [
         thumb: 'ship_0032_c.png',
         //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
         description: 'Boosts ATK by 1.2x.',
-        atk: function(p) { return 1.2; },
+        atk: function(p) { return 1.2; }
     },
     
     
@@ -401,7 +401,7 @@ window.ships = [
         name: "Flying Dutchman",
         thumb: 'ship_0033_c.png',
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
-        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
+        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; }
     },
     
     
@@ -410,7 +410,7 @@ window.ships = [
         name: "Flying Dutchman - Special ACTIVATED",
         thumb: 'ship_0033_c.png',
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. ACTIVATED Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
-        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
+        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; }
     },
     
     
@@ -444,7 +444,7 @@ window.ships = [
     
     
     { //34
-        name: "Zunisha", //Levels are placeholders, specific boost of each one is unkown 
+        name: "Zunisha",
         thumb: null,
         description: 'Boost ATK of Powerhouse and Cerebral units by 1.55x and their HP by 1.25x, makes Perfects easier to hit, and makes TND and Meat orbs beneficial to Powerhouse and Cerebral units.',
         atk: function(p) {
@@ -452,7 +452,7 @@ window.ships = [
         },
         hp: function(p) {
             return !(p.unit.class.has('Powerhouse') || p.unit.class.has('Cerebral')) ? 1 : [ 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25 ][p.boatLevel - 1];
-        },
-    },
+        }
+    }
 
 ];

From 612b022d25cb6a83fa50d5cc2d4b1793455b8278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 01:53:28 +0100
Subject: [PATCH 1556/1569] Fixed Kid Smoker special

Oh and Formating
---
 common/data/specials.js | 873 +++++++++++++++++++++-------------------
 1 file changed, 452 insertions(+), 421 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index e3acde9d2..e2911c097 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1,15 +1,15 @@
 window.specials = {
     13: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     14: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     15: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     16: {
-        delay: function(p) { return 2; },
+        delay: function(p) { return 2; }
     },
     18: {
         def: function(p) { return 0.5; }
@@ -33,25 +33,25 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     204: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     206: {
         def: function(p) { return 0.5; }
     },
     209: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
         type: "type"
     },
     210: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
         type: "type"
     },
     222: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
         type: "type"
     },
     223: {
-        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
         type: "type"
     },
     263: {
@@ -121,11 +121,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     399: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
         type: "type"
     },
     400: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
         type: "type"
     },
     401: {
@@ -147,10 +147,10 @@ window.specials = {
         type: "type"
     },
     415: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     416: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     417: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
@@ -168,7 +168,7 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     426: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.05 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.05 : 1; },
         type: "type"
     },
     429: {
@@ -192,11 +192,11 @@ window.specials = {
         type: "class"
     },
     454: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
         type: "type"
     },
     455: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
         type: "type"
     },
     458: {
@@ -208,7 +208,7 @@ window.specials = {
         type: "type"
     },
     460: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     461: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
@@ -222,7 +222,7 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     466: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     468: {
         rcv: function(p) { return 1.5; }
@@ -231,41 +231,41 @@ window.specials = {
         rcv: function(p) { return 1.5; }
     },
     487: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
         type: "type"
     },
     488: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
         type: "type"
     },
     489: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
         type: "type"
     },
     490: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
         type: "type"
     },
     491: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
         type: "type"
     },
     492: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
         type: "type"
     },
     499: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     500: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     505: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
         type: "type"
     },
     506: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
         type: "type"
     },
     509: {
@@ -282,7 +282,7 @@ window.specials = {
     },
     514: {
         def: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
         type: "type"
     },
     517: {
@@ -294,11 +294,11 @@ window.specials = {
         type: "type"
     },
     519: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
         type: "type"
     },
     520: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
         type: "type"
     },
     529: {
@@ -317,11 +317,11 @@ window.specials = {
         rcv: function(p) { return 2; }
     },
     545: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
         type: "type"
     },
     546: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
         type: "type"
     },
     549: {
@@ -336,10 +336,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     555: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     556: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     559: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -359,7 +359,7 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
         type: "class",
         onActivation: function(p) { p.tdata.lock = Math.max(1, p.tdata.lock); },
-        onDeactivation: function(p) { if (p.tdata.lock == 1) p.tdata.lock = 0; }
+        onDeactivation: function(p) { if (p.tdata.lock === 1) p.tdata.lock = 0; }
     },
     574: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
@@ -373,11 +373,11 @@ window.specials = {
         rcv: function(p) { return 1.5; }
     },
     582: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
         type: "type"
     },
     583: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 300: 0; },
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 300: 0; }
     },
     589: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
@@ -394,19 +394,19 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     600: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
         type: "type"
     },
     601: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
         type: "type"
     },
     602: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
         type: "type"
     },
     603: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
         type: "type"
     },
     612: {
@@ -437,11 +437,11 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     634: {
-        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
         type: "type"
     },
     635: {
-        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
         type: "type"
     },
     637: {
@@ -457,11 +457,11 @@ window.specials = {
     },
     644: {
         atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition",
+        type: "condition"
     },
     645: {
         atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition",
+        type: "condition"
     },
     648: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -501,7 +501,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[668].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[668].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[668].multiplier === 1.5 ? 1 : 0);
             window.specials[668].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -513,7 +513,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[669].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[669].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[669].multiplier === 1.5 ? 1 : 0);
             window.specials[669].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -530,17 +530,17 @@ window.specials = {
         type: "class"
     },
     680: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
         type: "type"
     },
     681: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
         type: "type"
     },
     686: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     687: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
@@ -587,7 +587,7 @@ window.specials = {
             var n = (p.percHP <= 30 ? 2 : 1.5);
             window.specials[719].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '719warning'
             });
         }
@@ -599,7 +599,7 @@ window.specials = {
             var n = (p.percHP <= 30 ? 2 : 1.5);
             window.specials[720].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '720warning'
             });
         }
@@ -608,11 +608,11 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     730: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
         type: "type"
     },
     731: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
         type: "type"
     },
     732: {
@@ -656,22 +656,22 @@ window.specials = {
         type: "type"
     },
     762: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
         type: "type"
     },
     766: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     770: {
         atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
-        type: "condition",
+        type: "condition"
     },
     771: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
         type: "type"
     },
     780: {
-        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[780].multiplier : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[780].multiplier : 1; },
         type: "type",
         onActivation: function(p) {
             var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
@@ -683,7 +683,7 @@ window.specials = {
         }
     },
     781: {
-        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[781].multiplier : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[781].multiplier : 1; },
         type: "type",
         onActivation: function(p) {
             var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
@@ -695,16 +695,16 @@ window.specials = {
         }
     },
     782: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     783: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     786: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     787: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     788: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
@@ -723,17 +723,17 @@ window.specials = {
         type: "type"
     },
     794: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     795: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     796: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     797: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     798: {
@@ -799,7 +799,7 @@ window.specials = {
             var n = (p.percHP < 20 ? 1.75 : 1);
             window.specials[828].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
                 name: '828warning'
             });
         }  
@@ -811,7 +811,7 @@ window.specials = {
             var n = (p.percHP < 20 ? 1.75 : 1);
             window.specials[829].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
                 name: '829warning'
             });
         }
@@ -839,22 +839,22 @@ window.specials = {
         type: "class"
     },
     839: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     840: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     841: {
         delay: function(p) { return 1; },
         atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
-        type: "condition",
+        type: "condition"
     },
     842: {
         delay: function(p) { return 1; },
         atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
-        type: "condition",
+        type: "condition"
     },
     843: {
         atk: function(p) {
@@ -906,11 +906,11 @@ window.specials = {
         type: "class"
     },
     857: {
-        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
         type: "type"
     },
     858: {
-        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
         type: "type"
     },
     861: {
@@ -926,16 +926,16 @@ window.specials = {
         delay: function(p) { return 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     865: {
         delay: function(p) { return 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     866: {
@@ -945,7 +945,7 @@ window.specials = {
         type: "class"
     },
     867: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     869: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
@@ -1003,7 +1003,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[883].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[883].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[883].multiplier === 1.5 ? 1 : 0);
             window.specials[883].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1015,7 +1015,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[884].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[884].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[884].multiplier === 1.5 ? 1 : 0);
             window.specials[884].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1058,7 +1058,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[902].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[902].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[902].multiplier === 1.5 ? 1 : 0);
             window.specials[902].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1070,7 +1070,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[903].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[903].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[903].multiplier === 1.5 ? 1 : 0);
             window.specials[903].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1079,13 +1079,13 @@ window.specials = {
         }
     },
     904: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     905: {
         atk: function(p) {
-            if (!window.specials[905].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
-            if (window.specials[905].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-            if (window.specials[905].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+            if (!window.specials[905].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
+            if (window.specials[905].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[905].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
         },
         type: "class",
         stage: -1,
@@ -1099,9 +1099,9 @@ window.specials = {
     },
     906: {
         atk: function(p) {
-            if (!window.specials[906].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
-            if (window.specials[906].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-            if (window.specials[906].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+            if (!window.specials[906].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
+            if (window.specials[906].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[906].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
         },
         type: "class",
         stage: -1,
@@ -1114,23 +1114,23 @@ window.specials = {
         }
     },
     907: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     908: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     909: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
         type: "type"
     },
     910: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
         type: "type"
     },
     911: {
         atk: function(p) {
             if (!window.specials[911].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-            if (window.specials[911].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+            if (window.specials[911].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1145,7 +1145,7 @@ window.specials = {
     912: {
         atk: function(p) {
             if (!window.specials[912].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-            if (window.specials[912].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+            if (window.specials[912].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1168,10 +1168,10 @@ window.specials = {
         type: "class"
     },
     917: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     918: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     921: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -1204,11 +1204,11 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
     940: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
         type: "type"
     },
     941: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
         type: "type"
     },
     944: {
@@ -1222,7 +1222,7 @@ window.specials = {
         type: "class"
     },
     947: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.3 : 1; },
         type: "type"
     },
     954: {
@@ -1246,7 +1246,7 @@ window.specials = {
         atk: function(p) { return window.specials[964].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[964].multiplier == 1.1 ? 1 : 0);
+            var n = (window.specials[964].multiplier === 1.1 ? 1 : 0);
             window.specials[964].multiplier = [1.1, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
@@ -1258,7 +1258,7 @@ window.specials = {
         atk: function(p) { return window.specials[965].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[965].multiplier == 1.1 ? 1 : 0);
+            var n = (window.specials[965].multiplier === 1.1 ? 1 : 0);
             window.specials[965].multiplier = [1.1, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
@@ -1267,13 +1267,11 @@ window.specials = {
         }
     },
     975: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
+        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
         type: "class"
     },
     976: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
+        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
         type: "class"
     },
     977: {
@@ -1283,56 +1281,56 @@ window.specials = {
         chainAddition: function(p){ return 0.5;}
     },
     984: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     981: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     998: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     999: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1005: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1006: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1010: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
         type: "type"
     },
     1011: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
         type: "type"
     },
     1013: {
         atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1015: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
         type: "type"
     },
     1016: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
         type: "type"
     },
     1017: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         type: "class"
     },
     1018: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         type: "class"
     },
     1023: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1},
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
         type: "class"
     },
     1024: {
@@ -1341,7 +1339,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1024].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
                 name: '1024warning'
             });
         }
@@ -1352,7 +1350,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1025].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
                 name: '1025warning'
             });
         }
@@ -1368,11 +1366,11 @@ window.specials = {
         type: "condition"
     },
     1030: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1031: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1040: {
@@ -1424,12 +1422,12 @@ window.specials = {
     1061: {
         chain: function(p) { return 2; },
         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') ? 2 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2 : 1;
         }
     },
     1063: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1},
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1; },
         type: "class"
     },
     1065: {
@@ -1439,29 +1437,29 @@ window.specials = {
         chainAddition: function(p){ return 0.1;}
     },
     1067: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
         type: "type"
     },
     1071: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class"
     },
     1072: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class"
     },
     1076: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1077: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1080: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1081: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1082: {
@@ -1471,7 +1469,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1082].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
                 name: '1082warning'
             });
         }
@@ -1483,7 +1481,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1083].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
                 name: '1083warning'
             });
         }
@@ -1495,19 +1493,19 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1088: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
         type: "class"
     },
     1089: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
         type: "class"
     },
     1096: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1097: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1099: {
@@ -1517,11 +1515,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1101: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
         type: "type"
     },
     1102: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
         type: "type"
     },
     1105: {
@@ -1551,28 +1549,28 @@ window.specials = {
         type: "type"
     },
     1114: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
         type: "type" 
     },
     1115: {
-        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
         type: "type" 
     },
     1122: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1123: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1132].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1132].multiplier === 1.5 ? 1 : 0);
             window.specials[1132].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1584,7 +1582,7 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? window.specials[1133].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1133].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1133].multiplier === 1.5 ? 1 : 0);
             window.specials[1133].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1596,22 +1594,22 @@ window.specials = {
         orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1138: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1; },
         type: "class"
     },
     1142: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1143: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1153: {
         def: function(p) { return 0; },
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1},
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
         type: "class" 
     },
     1154: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class"
     },
     1164: {
@@ -1623,25 +1621,25 @@ window.specials = {
         rcv: function(p) { return 1.5; }
     },
     1168: {
-        atk: function(p) { return p.unit.type == "STR" ? window.specials[1168].multiplier : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? window.specials[1168].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
             var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
             window.specials[1168].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' ' + (n == 1.75 ? '10%' : n == 1.5 ? '10%' : n == 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
                 name: '1168warning'
             });
         }
     },
     1169: {
-        atk: function(p) { return p.unit.type == "STR" ? window.specials[1169].multiplier : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? window.specials[1169].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
             var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
             window.specials[1169].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' ' + (n == 1.75 ? '10%' : n == 1.5 ? '10%' : n == 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
                 name: '1168warning'
             });
         }
@@ -1667,15 +1665,15 @@ window.specials = {
     1193: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1194: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1195: {
@@ -1687,10 +1685,10 @@ window.specials = {
         type: "class"
     },
     1209: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1210: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1211: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -1701,8 +1699,8 @@ window.specials = {
     1219: {
         atk: function(p) {
             if (!window.specials[1219].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-            if (window.specials[1219].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            if (window.specials[1219].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
+            if (window.specials[1219].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1219].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1717,8 +1715,8 @@ window.specials = {
     1220: {
         atk: function(p) {
             if (!window.specials[1220].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-            if (window.specials[1220].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            if (window.specials[1220].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
+            if (window.specials[1220].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1220].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1749,10 +1747,10 @@ window.specials = {
         }
     },
     1225: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1227: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1231: {
@@ -1788,10 +1786,10 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1235: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1236: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1237: {
         //TODO
@@ -1839,7 +1837,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1245].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1245].multiplier == 1.3 ? 1 : 0);
+            var n = (window.specials[1245].multiplier === 1.3 ? 1 : 0);
             window.specials[1245].multiplier = [1.3, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
@@ -1851,7 +1849,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1246].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1246].multiplier == 1.3 ? 1 : 0);
+            var n = (window.specials[1246].multiplier === 1.3 ? 1 : 0);
             window.specials[1246].multiplier = [1.3, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
@@ -1863,7 +1861,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1247].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1247].multiplier == 1.3 ? 1 : 0);
+            var n = (window.specials[1247].multiplier === 1.3 ? 1 : 0);
             window.specials[1247].multiplier = [1.3, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
@@ -1880,7 +1878,7 @@ window.specials = {
         type: "class"
     },
     1253: {
-        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
         type: "class"
     },
     1254: {
@@ -1890,7 +1888,7 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1256: {
-        atk: function(p) { return 1.3 },
+        atk: function(p) { return 1.3; },
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
@@ -1919,11 +1917,11 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1263: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1264: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1265: {
@@ -1969,7 +1967,7 @@ window.specials = {
     1282: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
     },
     1283: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
@@ -1990,17 +1988,17 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1297: {
-        affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
     },
     1298: {
-        affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
     },
     1299: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
         type: "class"
     },
     1300: {
-        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
         type: "class"
     },
     1313: {
@@ -2029,11 +2027,11 @@ window.specials = {
     },
     1321: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1322: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1323: {
         turnedOn: false,
@@ -2074,8 +2072,8 @@ window.specials = {
     1339: {
         chainAddition: function(p) {
             if (!window.specials[1339].stage) return 0.2;
-            if (window.specials[1339].stage == 1) return 0.3;
-            if (window.specials[1339].stage == 2) return 0.5;
+            if (window.specials[1339].stage === 1) return 0.3;
+            if (window.specials[1339].stage === 2) return 0.5;
         },
         stage: -1,
         onActivation: function(p) {
@@ -2087,10 +2085,10 @@ window.specials = {
         }
     },
     1340: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1341: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1343: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -2103,7 +2101,7 @@ window.specials = {
     1348: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
     },
     1349: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -2117,10 +2115,10 @@ window.specials = {
         chainAddition: function(p){ return 0.5; }
     },
     1354: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1355: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1358: {
         delay: function(p) { return 1; },
@@ -2132,61 +2130,61 @@ window.specials = {
     },
     1361: {
         atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
-        type: "class",
+        type: "class"
     },
     1362: {
         atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
-        type: "class",
+        type: "class"
     },
     1363: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
+        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1364: {
-        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
+        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1365: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1366: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1367:{
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1367].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1367].multiplier === 1.5 ? 1 : 0);
             window.specials[1367].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1367warning'
             });
-        },
+        }
     },
     1368:{
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1368].multiplier, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1368].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1368].multiplier === 1.5 ? 1 : 0);
             window.specials[1368].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1368warning'
             });
-        },
+        }
     },
     1373: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1374: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1375: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1376: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1379: {
         turnedOn: false,
@@ -2209,10 +2207,10 @@ window.specials = {
         orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1387: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1389: {
-        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
+        orb: function(p) { return p.unit.type === "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1390: {
         atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
@@ -2223,13 +2221,13 @@ window.specials = {
         type: "class"
     },
     1392: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
         type: "class"
     },
     1393: {
         atk: function(p) { return 1.1; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1, [p.friendCaptain, p.captain]); }
     },
     1394: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2250,36 +2248,36 @@ window.specials = {
     1400: {
         affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1400].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1400].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1400].multiplier === 1.5 ? 1 : 0);
             window.specials[1400].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
                 name: '1400warning'
             });
-        },
+        }
     },
     1401: {
         affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1401].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1401].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1401].multiplier === 1.5 ? 1 : 0);
             window.specials[1401].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
                 name: '1401warning'
             });
-        },
+        }
     },
     1402: {
-        atk: function(p) { return p.unit.type == "PSY" ? window.specials[1402].multiplier : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? window.specials[1402].multiplier : 1; },
         type: "type",
         onActivation: function(p) {
-            var n = (window.specials[1402].multiplier == 1.3 ? 1 : 0);
+            var n = (window.specials[1402].multiplier === 1.3 ? 1 : 0);
             window.specials[1402].multiplier = [1.3, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 1.5][n] + 'x Type boost. To switch to the ' + [1.5, 1.3][n] + 'x Type boost, disable and re-enable this special',
                 name: '1402warning'
             });
-        },
+        }
     },
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
@@ -2294,11 +2292,11 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1407: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
         type: "type"
     },
     1408: {
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
         type: "type"
     },
     1409: {
@@ -2335,10 +2333,10 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1421].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (p.percHP == 100 ? 2 : 1.5);
+            var n = (p.percHP === 100 ? 2 : 1.5);
             window.specials[1421].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
                 name: '1421warning'
             });
         }
@@ -2347,10 +2345,10 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1422].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (p.percHP == 100 ? 2 : 1.5);
+            var n = (p.percHP === 100 ? 2 : 1.5);
             window.specials[1422].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
                 name: '1422warning'
             });
         }
@@ -2364,7 +2362,7 @@ window.specials = {
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1428: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "class",
         warning: "Selected special (%name%) assumes that the enemy has been Delayed."
     },
@@ -2377,20 +2375,20 @@ window.specials = {
         type: "type"
     },
     1435: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1436: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1437: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1438: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1439: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
@@ -2403,41 +2401,41 @@ window.specials = {
     1441: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1442: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1443: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1444: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1445: {
         delay: function(p) { return 1; },
-        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
         type: "type"
     },
     1446: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1447: {
-        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1447].multiplier : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[1447].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1447].multiplier == 1.2 ? 1 : 0);
+            var n = (window.specials[1447].multiplier === 1.2 ? 1 : 0);
             window.specials[1447].multiplier = [1.2, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.2, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.2][n] + 'x multiplier, disable and re-enable this special',
@@ -2460,7 +2458,7 @@ window.specials = {
         type: "condition"
     },
     1461: {
-        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
         type: "type"
     },
     1462: {
@@ -2488,10 +2486,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1468: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1469: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1476: {
         delay: function(p) { return 1; },
@@ -2508,49 +2506,49 @@ window.specials = {
         type: "class"
     },
     1478: {
-        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
         type: "type"
     },
     1479: {
-        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
         type: "type"
     },
     1482: {
         atk: function(p) { return window.specials[1482].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1482].multiplier == 1.25 ? 1 : 0);
+            var n = (window.specials[1482].multiplier === 1.25 ? 1 : 0);
             window.specials[1482].multiplier = [1.25, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
                 name: '1482warning'
             });
-        },
+        }
     },
     1483: {
         atk: function(p) { return window.specials[1483].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1483].multiplier == 1.25 ? 1 : 0);
+            var n = (window.specials[1483].multiplier === 1.25 ? 1 : 0);
             window.specials[1483].multiplier = [1.25, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
                 name: '1483warning'
             });
-        },
+        }
     },
     1484: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1485: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1486: {
@@ -2569,7 +2567,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1492].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1492].multiplier == 1.5 ? 1 : window.specials[1492].multiplier == 1.75 ? 2 : 0);
+            var n = (window.specials[1492].multiplier === 1.5 ? 1 : window.specials[1492].multiplier === 1.75 ? 2 : 0);
             window.specials[1492].multiplier = [1.5, 1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [1.75, 2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -2578,7 +2576,7 @@ window.specials = {
         }
     },
     1497: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
         type: "type"
     },
     1501: {
@@ -2586,11 +2584,11 @@ window.specials = {
         type: "type"
     },
     1505: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1506: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1507: {
@@ -2602,7 +2600,7 @@ window.specials = {
         type: "class"
     },
     1511: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
         type: "type"
     },
     1512: {
@@ -2612,7 +2610,7 @@ window.specials = {
             var n = (p.percHP <= 30 ? 1.5 : 1);
             window.specials[1512].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.5 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 1.5 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '1512warning'
             });
         }
@@ -2642,37 +2640,37 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1522: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
-        type: "type",
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     1525: {
         delay: function(p) { return 1; },
         atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1526: {
         atk: function(p) { return p.slot < 2 ? window.specials[1526].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1526].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1526].multiplier === 1.5 ? 1 : 0);
             window.specials[1526].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
                 name: '1526warning'
             });
-        },
+        }
     },
     1527: {
         atk: function(p) { return p.slot < 2 ? window.specials[1527].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1527].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1527].multiplier === 1.5 ? 1 : 0);
             window.specials[1527].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
                 name: '1527warning'
             });
-        },
+        }
     },
     1528: {
         turnedOn: false,
@@ -2691,7 +2689,7 @@ window.specials = {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1529].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
                 name: '1529warning'
             });
         }
@@ -2702,7 +2700,7 @@ window.specials = {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1530].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
                 name: '1530warning'
             });
         }
@@ -2711,7 +2709,7 @@ window.specials = {
         delay: function(p) { return 1; },
         chainAddition: function(p) {return window.specials[1531].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1531].multiplier == 0.2 ? 1 : 0);
+            var n = (window.specials[1531].multiplier === 0.2 ? 1 : 0);
             window.specials[1531].multiplier = [0.2, 0.3][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2723,7 +2721,7 @@ window.specials = {
         delay: function(p) { return 1; },
         chainAddition: function(p) {return window.specials[1532].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1532].multiplier == 0.2 ? 1 : 0);
+            var n = (window.specials[1532].multiplier === 0.2 ? 1 : 0);
             window.specials[1532].multiplier = [0.2, 0.3][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2732,11 +2730,11 @@ window.specials = {
         }
     },
     1535: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
         type: "type"
     },
     1536: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
         type: "type"
     },
     1539: {
@@ -2754,7 +2752,7 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1543: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1544: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -2791,28 +2789,28 @@ window.specials = {
         chainAddition: function(p){ return 0.2;}
     },
     1551: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1552: {
-        atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
+        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
         type: "class"
     },
     1553: {
-        atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
+        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
         type: "class"
     },
     1554: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        type: "type",
+        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        type: "type"
     },
     1555: {
-        atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        type: "type",
+        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        type: "type"
     },
     1556: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type",
         warning: "Selected special (%name%) assumes that the enemy has over 3,000,000 HP."
     },
@@ -2823,7 +2821,7 @@ window.specials = {
         },
         onDeactivation: function(p) {
             window.specials[1557].turnedOn = false;
-        },
+        }
     },
     1561: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2860,15 +2858,15 @@ window.specials = {
         type: "class"
     },
     1574: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1575: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1578: {
         chainAddition: function(p) {return window.specials[1578].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1578].multiplier == 0.2 ? 1 : window.specials[1578].multiplier == 0.3 ? 2 : 0);
+            var n = (window.specials[1578].multiplier === 0.2 ? 1 : window.specials[1578].multiplier === 0.3 ? 2 : 0);
             window.specials[1578].multiplier = [0.2, 0.3, 0.5][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2879,7 +2877,7 @@ window.specials = {
     1579: {
         chainAddition: function(p) {return window.specials[1579].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1579].multiplier == 0.2 ? 1 : window.specials[1579].multiplier == 0.3 ? 2 : 0);
+            var n = (window.specials[1579].multiplier === 0.2 ? 1 : window.specials[1579].multiplier === 0.3 ? 2 : 0);
             window.specials[1579].multiplier = [0.2, 0.3, 0.5][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2901,24 +2899,24 @@ window.specials = {
     1583:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1583].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1583].multiplier === 1.5 ? 1 : 0);
             window.specials[1583].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1583warning'
             });
-        },
+        }
     },
     1584:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1584].multiplier == 1.5 ? 1 : 0);
+            var n = (window.specials[1584].multiplier === 1.5 ? 1 : 0);
             window.specials[1584].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1584warning'
             });
-        },
+        }
     },
     1585: {
         atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
@@ -2931,11 +2929,11 @@ window.specials = {
         type: "class"
     },
     1587: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },  
     1588: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1591: {
@@ -2970,32 +2968,32 @@ window.specials = {
         orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1598: {
-        atk: function(p) { return 1.2 },
-        type: "class",
+        atk: function(p) { return 1.2; },
+        type: "class"
     },
     1599: {
-        def: function(p) { return 0.5 },
+        def: function(p) { return 0.5; }
     },
     1600: {
-        orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
+        orb: function(p) { return (p.unit.type === "INT" || p.unit.type === "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1603: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1606: {
         delay: function(p) { return 1; },
-        def: function(p) { return 0.5 },
+        def: function(p) { return 0.5; }
     },
     1607: {
         atk: function(p) { return (p.unit.class.has("Shooter")) ? 1.5 : 1; },
-        type: "class",
+        type: "class"
     },
     1613: {
-        def: function(p) { return 0.5 },
+        def: function(p) { return 0.5; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1614: {
-        def: function(p) { return 0.5 },
+        def: function(p) { return 0.5; },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1615: {
@@ -3009,23 +3007,23 @@ window.specials = {
         orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1617: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
         type: "type"
     },
     1618: {
-        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
         type: "type"
     },
     1619: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1620: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        type: "class",
+        type: "class"
     },
     1621: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        type: "class",
+        type: "class"
     },
     1622: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
@@ -3034,13 +3032,13 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1626: {
-        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
         type: "type"
     },
     1627: {
         affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1627].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1627].multiplier == 1.25 ? 1 : window.specials[1627].multiplier == 1.5 ? 2 : 0);
+            var n = (window.specials[1627].multiplier === 1.25 ? 1 : window.specials[1627].multiplier === 1.5 ? 2 : 0);
             window.specials[1627].multiplier = [1.25, 1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
@@ -3051,7 +3049,7 @@ window.specials = {
     1628: {
         affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1628].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1628].multiplier == 1.25 ? 1 : window.specials[1628].multiplier == 1.5 ? 2 : 0);
+            var n = (window.specials[1628].multiplier === 1.25 ? 1 : window.specials[1628].multiplier === 1.5 ? 2 : 0);
             window.specials[1628].multiplier = [1.25, 1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
@@ -3061,11 +3059,11 @@ window.specials = {
     },
     1631: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class",
+        type: "class"
     },
     1632: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class",
+        type: "class"
     },
     1633: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
@@ -3096,7 +3094,7 @@ window.specials = {
     },
     1643: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
-        type: "class",
+        type: "class"
     },
     1650: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3126,48 +3124,48 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1655: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
         type: "type"
     },
     1656: {
-        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
         type: "type"
     },
     1657: {
         chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.75 : 1;
         }
     },
     1658: {
         chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.75 : 1;
         }
     },
     1661: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1662: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1664: {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
-        type: "class",
+        type: "class"
     },
     1665: {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
-        type: "class",
+        type: "class"
     },
     1666: {
         orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1666].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
@@ -3175,7 +3173,7 @@ window.specials = {
             var n = (p.percHP <= 70 ? 1 : 1.5);
             window.specials[1666].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
                 name: '1666warning'
             });
         }
@@ -3186,7 +3184,7 @@ window.specials = {
             var n = (p.percHP <= 70 ? 1 : 1.5);
             window.specials[1667].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
                 name: '1667warning'
             });
         }
@@ -3200,7 +3198,7 @@ window.specials = {
         type: "class"
     },
     1670: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1671: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3212,11 +3210,11 @@ window.specials = {
         def: function(p) { return 0.1; }
     },
     1675: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
         type: "class"
     },
     1676: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
         type: "class"
     },
     1677: {
@@ -3231,7 +3229,7 @@ window.specials = {
             var n = (p.slot > 1 ? 0.5 : 0);
             window.specials[1681].multiplier = n;
             p.scope.notify({
-                text: 'Luffy is ' + (n == 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
+                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
                 name: '1681warning'
             });
         }
@@ -3242,7 +3240,7 @@ window.specials = {
             var n = (p.slot > 1 ? 0.5 : 0);
             window.specials[1682].multiplier = n;
             p.scope.notify({
-                text: 'Luffy is ' + (n == 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
+                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
                 name: '1682warning'
             });
         }
@@ -3256,10 +3254,10 @@ window.specials = {
         type: "condition"
     },
     1685: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1686: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1687: {
         def: function(p) { return 0; }
@@ -3268,11 +3266,11 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1689: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1690: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1691: {
@@ -3284,20 +3282,20 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     1693: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1694: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type",
-        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1695: {
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1696: {
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1699: {
         chainAddition: function(p) { return 0.3; }
@@ -3337,27 +3335,27 @@ window.specials = {
             var n = (p.percHP <= 30 ? 1.75 : 1);
             window.specials[1716].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '1716warning'
             });
         }
     },
     1718: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.25 : 1},
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.25 : 1; },
         type: "class"
     },
     1720: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1721: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1722: {
@@ -3397,20 +3395,20 @@ window.specials = {
         staticMult: function(p) { return 55; }
     },
     1732: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
         type: "class"
     },
     1733: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
         type: "class"
     },
     1736: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1737: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1738: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
@@ -3420,12 +3418,12 @@ window.specials = {
     },
     1740: {
         def: function(p) { return .2; },
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         type: "class"
     },
     1741: {
         def: function(p) { return .2; },
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
         type: "class"
     },
     1742: {
@@ -3465,30 +3463,30 @@ window.specials = {
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1750].multiplier == 1.75 ? 1 : 0);
+            var n = (window.specials[1750].multiplier === 1.75 ? 1 : 0);
             window.specials[1750].multiplier = [1.75, 2.25][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1584warning'
             });
-        },
+        }
     },
     1751:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1751].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1751].multiplier == 1.75 ? 1 : 0);
+            var n = (window.specials[1751].multiplier === 1.75 ? 1 : 0);
             window.specials[1751].multiplier = [1.75, 2.25][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1584warning'
             });
-        },
+        }
     },
     1752: {
         atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1752].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1752].multiplier == 1.75 ? 1 : 0);
+            var n = (window.specials[1752].multiplier === 1.75 ? 1 : 0);
             window.specials[1752].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3500,7 +3498,7 @@ window.specials = {
         atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1753].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1753].multiplier == 1.75 ? 1 : 0);
+            var n = (window.specials[1753].multiplier === 1.75 ? 1 : 0);
             window.specials[1753].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3515,43 +3513,43 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1758: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1759: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1762: {
-        def: function(p) { return .2; },
+        def: function(p) { return .2; }
     },
     1763: {
-        def: function(p) { return .2; },
+        def: function(p) { return .2; }
     },
     1764: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         }
     },
     1765: {
-        def: function(p) { return .5; },
+        def: function(p) { return .5; }
     },
     1766: {
-        def: function(p) { return .5; },
+        def: function(p) { return .5; }
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1},
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
         type: "class"
     },
     1769: {
         delay: function(p) { return 1; },
         atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1770: {
         delay: function(p) { return 1; },
         atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1771: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
@@ -3578,7 +3576,7 @@ window.specials = {
         chainAddition: function(p){ return 0.5;}
     },
     1782: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1783: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3597,10 +3595,10 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1793: {
-        atk: function(p) { return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : window.specials[1793].multiplier; },
+        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1793].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1793].multiplier == 1.75 ? 1 : 0);
+            var n = (window.specials[1793].multiplier === 1.75 ? 1 : 0);
             window.specials[1793].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3609,10 +3607,10 @@ window.specials = {
         }
     },
     1794: {
-        atk: function(p) { return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : window.specials[1794].multiplier; },
+        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1794].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1794].multiplier == 1.75 ? 1 : 0);
+            var n = (window.specials[1794].multiplier === 1.75 ? 1 : 0);
             window.specials[1794].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3621,18 +3619,18 @@ window.specials = {
         }
     },
     1795: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1796: {
-        delay: function(p) { return 1; },
+        delay: function(p) { return 1; }
     },
     1797: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1798: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition",
+        type: "condition"
     },
     1799: {
         atk: function(p) { return p.defenseDown ? 1.75 : 1; },
@@ -3666,10 +3664,10 @@ window.specials = {
         },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.75 : 1;
         },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1808: {
         turnedOn: [ false, false ],
@@ -3681,10 +3679,10 @@ window.specials = {
         },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.75 : 1;
         },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1811: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -3695,7 +3693,7 @@ window.specials = {
         type: "class"
     },
     1813: {
-        atk: function(p) { return p.slot == 1 ? 1.5 : 1; },
+        atk: function(p) { return p.slot === 1 ? 1.5 : 1; },
         type: "class"
     },
     1814: {
@@ -3719,21 +3717,21 @@ window.specials = {
         type: "class"
     },
     1819: {
-        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1825: {
-        affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
     },
     1826: {
-        affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
     },
     1827: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
         type: "type"
     },
     1828: {
-        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
         type: "type"
     },
     1829: {
@@ -3749,36 +3747,36 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1835: {
-        chain: function(p) { return (p.captain.type == "STR" || p.captain.type == "PSY") ? 2.5 : 1; },
+        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         },
-        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; },
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
     },
     1836: {
-        chain: function(p) { return (p.captain.type == "STR" || p.captain.type == "PSY") ? 2.5 : 1; },
+        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1];
+            return p.chainPosition === 0 ? 1 : (prev === 'Good'  || prev === 'Great' || prev === 'Perfect') ? 2.5 : 1;
         },
-        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; },
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
     },
     1837: {
-        atk: function(p) { return (p.captain.type == "QCK" || p.captain.type == "PSY") ? 1.75 : 1; },
-        type: "class",
+        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
+        type: "class"
     },
     1838: {
-        atk: function(p) { return (p.captain.type == "QCK" || p.captain.type == "PSY") ? 1.75 : 1; },
-        type: "class",
+        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
+        type: "class"
     },
     1839: {
-        atk: function(p) { return (p.delayed > 0 && (p.captain.type == "DEX" || p.captain.type == "PSY")) ? 1.75 : 1; },
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
         type: "condition",
         staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
     1840: {
-        atk: function(p) { return (p.delayed > 0 && (p.captain.type == "DEX" || p.captain.type == "PSY")) ? 1.75 : 1; },
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
         type: "condition",
         staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
@@ -3806,10 +3804,31 @@ window.specials = {
     1851: {
         chainAddition: function(p) { return 0.5; }
     },
-    1854: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    1853: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+    },
+    1853: {
+        atk: function(p) { return window.specials[1853].multiplier; },
+        type: "type",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); },
+        stage: -1,
+        onActivation: function(p) {
+            var n = (window.specials[1853].multiplier === 1 ? 1 : 0);
+            window.specials[1853].multiplier = [1, 1.5][n];
+            if(1853){
+            p.scope.notify({
+                text: 'Using only Orb Boost. To switch to the ATK and Orb boost, disable and re-enable this special',
+                name: '1853warning'
+            });
+        }else{
+           p.scope.notify({
+                text: 'Using ATK and Orb Boost. To switch to the Orb boost, disable and re-enable this special',
+                name: '1853warning'
+            }); 
+        }
+        }
     },
     1855: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
@@ -3830,7 +3849,19 @@ window.specials = {
     },
     1861: {
         atk: function(p) { return (p.delayed > 0 && (p.captain.class.has("Shooter"))) ? 1.75 : 1; },
-        type: "condition",
+        type: "condition"
+    },
+    1865: {//Urouge FN
+        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1865].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1865].multiplier === 1.5 ? 1 : 0);
+            window.specials[1865].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1865warning'
+            });
+        }
     },
     2000: {
         atk: function(p) { return 1.75; },
@@ -3839,5 +3870,5 @@ window.specials = {
     2001: {
         atk: function(p) { return 1.75; },
         type: "class"
-    },
+    }
 };

From 88951871b99f0764b3cac84d565344e71bc6aea2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 02:01:35 +0100
Subject: [PATCH 1557/1569] Added TM Whitebeard LB Tree

Thanks Ribcrush!
---
 common/data/details.js | 79 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 3a2b13bde..0b9f7ece8 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13820,12 +13820,83 @@ window.details = {
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special"
     },
-    1853: {//Treasure Map WB
-        captain: "Boosts ATK of all characters proportionally to the crew's current HP, boost HP of all characters by 1.35x",
-        captainNotes: "#{captainProportional : lower : 1 + 2.25 * (1 - (remaining HP) / (total HP)) : 1 : 3.25}",
+    1853: {//Whitebeard
+        captain: {
+            "base": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
+            "level1": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
+            "level2": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
+            "level3": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
+            "level4": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
+            "level5": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x",
+            "level6": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x"
+        },
+        captainNotes: "#{captainProportional : lower : 1 + 1.25 (1.35, 1.45, 1.55, 1.65, 1.75, & 2.25 respectively) * (1 - (remaining HP) / (total HP)) : 1 : 2.25(2.35, 2.45, 2.55, 2.65, 2.75, & 3.25 respectively)}",
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special",
-        sailor: "Limit Broken: +100HP +50ATK to all characters"
+        limit: [
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 10" },
+            { "description": "Boosts base HP by 30" },
+            { "description": "Boosts base RCV by 5" },
+            { "description": "Aquire Potential 1: [PSY] Damage Reduction" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
+            { "description": "Aquire Sailor Ability 1: Boosts base HP of all characters by 100" },
+            { "description": "Boosts base ATK by 15" },
+            { "description": "Boosts base HP by 40" },
+            { "description": "Boosts base RCV by 10" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Reduce base Special Cooldown by 1 turn" },
+            { "description": "Boosts base ATK by 20" },
+            { "description": "Boosts base HP by 50" },
+            { "description": "Boosts base RCV by 15" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
+            { "description": "Reduce base Special Cooldown by 2 turns" },
+            { "description": "Boosts base ATK by 25" },
+            { "description": "Boosts base HP by 60" },
+            { "description": "Boosts base RCV by 20" },
+            { "description": "Reduce base Special Cooldown by 3 turns" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Boosts base ATK by 30" },
+            { "description": "Boosts base HP by 65" },
+            { "description": "Reduce base Special Cooldown by 4 turns" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Boosts base HP by 70" },
+            { "description": "Aquire Sailor Ability 2: Boosts base ATK of all characters by 50" },
+            { "description": "Boosts base ATK by 35" },
+            { "description": "Boosts base HP by 85" },
+            { "description": "Boosts base RCV by 30" },
+            { "description": "Reduce base Special Cooldown by 5 turns" },
+            { "description": "Aquire 1 additional Socket slot" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x" },
+            { "description": "Boosts base ATK by 40" },
+            { "description": "Boosts base HP by 100" },
+            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x" },
+            { "description": "Aquire Potential 2: Enrage" }
+        ],
+        potential: [
+            {
+                "Name": "[PSY] Damage Reduction",
+                "description": [ 
+                    "Level 1: Reduces Damage recieved from [PSY] enemies by 1%",
+                    "Level 2: Reduces Damage recieved from [PSY] enemies by 2%",
+                    "Level 3: Reduces Damage recieved from [PSY] enemies by 3%",
+                    "Level 4: Reduces Damage recieved from [PSY] enemies by 4%",
+                    "Level 5: Reduces Damage recieved from [PSY] enemies by 5%"
+                ]
+            },
+            {
+                "Name": "Enrage",
+                "description": [ 
+                    "Level 1: Boosts base ATK by 30",
+                    "Level 2: Boosts base ATK by 60",
+                    "Level 3: Boosts base ATK by 90",
+                    "Level 4: Boosts base ATK by 120",
+                    "Level 5: Boosts base ATK by 200"
+                ]
+            }
+        ]
     },
     1854: {//Apoo
         captain: "Boosts ATK of Free Spirit characters by 2x",

From 6924ac74427d13e730e22d6fd1124ffa07f2ff60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 10:53:22 +0100
Subject: [PATCH 1558/1569] Updated Kizaru Neo Map Effect with INT Croc

---
 common/data/effects.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/data/effects.js b/common/data/effects.js
index b75fd5b49..d7a9085a8 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -545,7 +545,6 @@ window.effects = {
                     [ 1720, 1621, 1631, 1632, 1777, 1778, 1833, 1834, 871, 872, 1695, 1696, 1791, 1792, 1431, 1432 ].indexOf(id) !== -1);
             return !matching ? 1 : 1.75;
         }
-    },
     
     'Kizaru Neo [GLOBAL] - Free Spirit': {
         description: 'Chain multiplier reduced.',
@@ -555,7 +554,7 @@ window.effects = {
         atk: function(p) {
             var id = p.number + 1,
                 matching = ((id > 1777 && id < 1778) ||
-                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749 ].indexOf(id) !== -1);
+                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749, 1615, 1616 ].indexOf(id) !== -1);
             return !matching ? 1 : 1.75;
         },
         chainModifier: function(p) { return 0.5 ; }//Chain by half
@@ -569,24 +568,23 @@ window.effects = {
         atk: function(p) {
             var id = p.number + 1,
                 matching = ((id > 1777 && id < 1778) ||
-                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749 ].indexOf(id) !== -1);
+                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749, 1615, 1616 ].indexOf(id) !== -1);
             return !matching ? 1 : 1.75;
         },
         chainModifier: function(p) { return 0.5 ; }//Chain by half
     },
     
     'Kizaru Neo [GLOBAL] - Powerhouse': {
-        description: 'Chain multiplier locked at 1.1x.',
+        description: 'Chain multiplier locked at 1.1x after revive.',
         thumb: 1780,
         id: 51,
         //orb: function(p) { return p.orb === 2.0 ? 1.2 : (p.orb === 0.5 ? 5/6 : 1); },
         atk: function(p) {
             var id = p.number + 1,
                 matching = ((id > 1777 && id < 1778) ||
-                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749 ].indexOf(id) !== -1);
+                    [ 1441, 1442, 1701, 1702, 1659, 1660, 1631, 1632, 1699, 1700, 1748, 1749, 1615, 1616 ].indexOf(id) !== -1);
             return !matching ? 1 : 1.75;
         },
         chainLimiter: function() { return 1.1; } //Chain locked at 1.1x
     }
-    
 };

From 6f7a0befd20c078fc5237ddc801f808ed81e1b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 15:22:15 +0100
Subject: [PATCH 1559/1569] New Batch

---
 common/data/units.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/data/units.js b/common/data/units.js
index 33fe2cdd4..0be3fa6f7 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1866,16 +1866,16 @@ window.units = [
     [ "\"Mad Monk\" Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
     [ "Basil Hawkins, Supernova", "QCK", [ "Slasher", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "\"The Magician\" Basil Hawkins, Supernova ", "QCK", [ "Striker", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora", "INT", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Fujitora evo", "INT", [ "Slasher", "Powerhouse" ], 6, 55, 6, 5, 99, null, 1, 1, 1, 3222, 1576, 344, null ],
+    [ "Bellamy", "PSY", [ "Driven", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Bellamy evo", "PSY", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, null, 1, 1, 1, 3020, 1408, 292, null ],
+    [ "Kyros", "STR", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Kyros evo", "STR", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, null, 1, 1, 1, 2620, 1496, 301, null ],
+    [ "Violet", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Violet evo", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 6, 4, 99, null, 1, 1, 1, 1999, 1099, 446, null ],
+    [ "Rebecca", "DEX", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "Rebecca evo", "DEX", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, null, 1, 1, 1, 2051, 1203, 403, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],

From c790cf5ba369a0038e242953454e961a88c6f0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 15:24:33 +0100
Subject: [PATCH 1560/1569]  New Batch

---
 common/data/cooldowns.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index a05aa1906..ced0670d5 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1556,7 +1556,7 @@ window.cooldowns = [
     [ 16, 7 ],
     20,
     [ 12, 6 ],
-    [ 20, 12 ],
+    20,
     [ 19, 14 ],
     [ 11, 5 ],
     [ 23, 17 ],
@@ -1850,22 +1850,32 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 13, 13 ],
     [ 13, 13 ],
-    [ 37, 30 ],
-    [ 37, 30 ],
+    [ 37, 15 ],
+    [ 37, 15 ],
     [ 20, 13 ],
     [ 20, 13 ],
-    [ null, 7 ],
-    [ null, 7 ],
+    [ 14, 7 ],
+    [ 14, 7 ],
     [ 18, 14 ],
     [ 18, 14 ],
-    [ 30, 15 ],
-    [ 30, 15 ],
+    null,
+    null,
     null,
     null,
     [ 22, 15 ],
     [ 22, 15 ],
     [ 24, 17 ],
     [ 24, 17 ],
+    [ 18, 13 ],
+    [ 18, 13 ],
+    [ 17, 10 ],
+    [ 17, 10 ],
+    [ 20, 14 ],
+    [ 20, 14 ],
+    [ 14, 9 ],
+    [ 14, 9 ],
+    [ 16, 9 ],
+    [ 16, 9 ],
     null,
     null,
     null,
@@ -1988,16 +1998,6 @@ window.cooldowns = [
     null,
     null,
     null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    null,
-    [ 30, 16 ],
     [ 30, 16 ],
+    [ 30, 16 ]
 ];

From 20ec83959ea61aaaf070755759b140c3aab12f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 15:28:34 +0100
Subject: [PATCH 1561/1569] New Batch

---
 common/data/details.js | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/common/data/details.js b/common/data/details.js
index 7b884323f..b7a3457a9 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13833,6 +13833,7 @@ window.details = {
         captainNotes: "#{captainProportional : lower : 1 + 1.25 (1.35, 1.45, 1.55, 1.65, 1.75, & 2.25 respectively) * (1 - (remaining HP) / (total HP)) : 1 : 2.25(2.35, 2.45, 2.55, 2.65, 2.75, & 3.25 respectively)}",
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special",
+        sailor: "Limit Broken: +100HP +50ATK to all characters",
         limit: [
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base ATK by 10" },
@@ -13987,16 +13988,34 @@ window.details = {
         special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%",
         specialName: "Fortune-Telling from the Shadow of Death"
     },
-    1865: {//Urouge FN
-        captain: "Striker Characters ATK 1.75x, protects from defeat as long as HP is above a certain percent",
-        captainNotes: "PERFECT hits don't count, it has to GREAT hits",
-        special: "Recover 5000 HP, for 1 turn boost ATK by 1.5x for Striker Characters, if you hit 4 or more GREAT this turn boost ATK by 1.75x for Striker Characters the next turn",
-        specialName: "Culling the Criminals from this Earthly World"
+    1869: {//Fujitora V2
+        captain: "Increases damage taken slightly, boosts slashers attack by 3.25x and hp by 1.2x, boosts slashers attack by a further 1.3x following a chain of good, great, perfect. Total boost: 4.225x",
+        special: "Deal 20x characters damage in typeless damage to random enemies 10 times, if this character is your captain, change all orbs to matching, delay all enemies by one turn",
+        limit: "This character has a limit break path"
     },
-    1867: {//Hawkins FN
-        captain: "Cerebral Characters ATK 2x, boost chain multiplier by 1.5x",
-        special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%",
-        specialName: "Fortune-Telling from the Shadow of Death"
+    1871: {//Bellamy RR
+        captain: "2.25x driven ATK",
+        sailor: "1.1x damage to INT enemies",
+        special: "Remove 50% hp of team, deal 10x the amount removed to one enemy in typeless damage, remove three turns of threshold/attack up/defence up on one enemy, changes own slot to psy",
+        limit: "This character has a limit break path"
+    },
+    1873: {//Kyros RR
+        captain: "2.25x striker/slasher attack damage",
+        sailor: "2x attack addition on tap",
+        special: "30x attack damage in str damage to one enemy, recover two turns of despair/chain, boosts slashers attack by 1.75x for 3 turns",
+        limit: "This character has a limit break path"
+    },
+    1875: {//Violet RR
+        captain: "2.5x Belis",
+        sailor: "Avoid special seal",
+        special: "Change meat/block/empty/tandem to matching orbs, removes two turns of paralyze/special seal, adds 0.5x to chain multiplier for one turn",
+        limit: "This character has a limit break path"
+    },
+    1877: {//Rebecca RR
+        captain: "2x slashers attack and 10% damage reduction",
+        sailor: "Treat str orbs as matching",
+        special: "50000 fixed damage to one enemy, recover 5 turns of chain lock/cap, change neighbouring orbs to matching",
+        limit: "This character has a limit break path"
     },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",

From 01dda213b2f8ff96181aa8305a45358ac249816f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 15:30:52 +0100
Subject: [PATCH 1562/1569] New Batch

---
 common/data/captains.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c20b2b4c9..3c4135e40 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -5901,12 +5901,22 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
         chainModifier: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
-    1865: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+    1869: {
+        hitAtk: function(p) {
+            if (!(p.unit.class.has("Slasher"))) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4.225 : 3.25;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
-    1867: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        chainModifier: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    1871: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+    },
+    1873: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
+    },
+    1877: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     2000: {
         atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; }

From bf70b09c2326ee7d2fe8c9bbf7ad9cf4ec069850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 15:31:30 +0100
Subject: [PATCH 1563/1569] New Batch

---
 common/data/captains.js | 6857 ++++++++++++++-------------------------
 1 file changed, 2407 insertions(+), 4450 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 3c4135e40..c5dc1d4d7 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1,5927 +1,3884 @@
-window.captains = {
-    2: {
-        atk: function(p) { return 1.5; }
-    },
-    3: {
-        atk: function(p) { return 1.5; }
-    },
-    4: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1.5; }
-    },
-    5: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    6: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    7: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    8: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    10: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    11: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    12: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
+window.specials = {
     13: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
     14: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     15: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     16: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    17: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        delay: function(p) { return 2; }
     },
     18: {
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    19: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    20: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    21: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
-    },
-    22: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    23: {
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
     24: {
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    25: {
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    26: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    27: {
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
-    },
-    28: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
-    },
-    35: {
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
-    },
-    36: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    37: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    38: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    39: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    41: {
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
-    },
-    42: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
+        def: function(p) { return 0.5; }
     },
-    45: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+    34: {
+        def: function(p) { return 0; }
     },
-    46: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    127: {
+        def: function(p) { return 0.5; }
     },
-    49: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    137: {
+        def: function(p) { return 0.5; }
     },
-    52: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+    148: {
+        def: function(p) { return 0.5; }
     },
-    59: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+    158: {
+        def: function(p) { return 0.5; }
     },
-    60: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    61: {
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    62: {
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    65: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    66: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    67: {
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    68: {
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    74: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    75: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1; }
-    },
-    76: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    77: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
-    },
-    194: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    195: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    196: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    198: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    199: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    200: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    201: {
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    202: {
-        hp: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    205: {
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+    204: {
+        delay: function(p) { return 1; }
     },
     206: {
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        def: function(p) { return 0.5; }
     },
     209: {
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        type: "type"
     },
     210: {
-        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    211: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-    },
-    212: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    215: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    217: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    220: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    221: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        type: "type"
     },
     222: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        type: "type"
     },
     223: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    224: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    225: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    226: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    227: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
-    },
-    228: {
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    230: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    231: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    232: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    233: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    234: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    235: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
-    },
-    236: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    248: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
-    },
-    249: {
-        atk: function(p) { return p.unit.type === "STR" ? 3 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
-    },
-    250: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
-    },
-    251: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
-    },
-    252: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    253: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    254: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    255: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    256: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    257: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    258: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    259: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    260: {
-        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
-    },
-    261: {
-        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        type: "type"
     },
     263: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    265: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     267: {
-        atk: function(p) { return 1.5; },
-        hp: function(p) { return 1.5; },
-        rcv: function(p) { return 1.5; }
-    },
-    290: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
-    293: {
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    275: {
+        def: function(p) { return 0.5; }
     },
-    294: {
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    285: {
+        def: function(p) { return 0.5; }
     },
     295: {
-        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    296: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-    },
-    297: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-    },
-    298: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    299: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    305: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    306: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    307: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+        def: function(p) { return 0.5; }
     },
-    308: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+    309: {
+        def: function(p) { return 0.5; }
     },
-    311: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
-        },
-        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
-    },
-    312: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
-        },
-        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
+    310: {
+        def: function(p) { return 0.5; }
     },
     313: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     314: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    315: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    316: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    319: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    320: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    321: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    322: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     323: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     324: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    328: {
-        rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
-    },
-    329: {
-        rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
-    },
-    332: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-    },
-    333: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    336: {
-        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2 : 0.8); }
-    },
-    337: {
-        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2.5 : 0.8); }
-    },
-    340: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    341: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     352: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        type: "class"
     },
     353: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
-    },
-    356: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    357: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
-    },
-    358: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
-    },
-    359: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 3 : 1; }
-    },
-    360: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
-    },
-    361: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
-    },
-    362: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    363: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    364: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    365: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    366: {
-        chainModifier: function(p) { return 4; }
-    },
-    367: {
-        chainModifier: function(p) { return 4; }
-    },
-    373: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    374: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    375: {
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    376: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    377: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    378: {
-        rcv: function(p) { return 1.5; }
-    },
-    380: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    383: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        type: "class"
     },
-    384: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    382: {
+        def: function(p) { return 0.5; }
     },
     385: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
     },
     386: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    387: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    388: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    389: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'DEX',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'QCK',
-                minModifier: 'Good'
-            }]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    390: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'DEX',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'QCK',
-                minModifier: 'Good'
-            }]) ? 2.75 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
     },
     391: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        def: function(p) { return 0.2; }
     },
     392: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        def: function(p) { return 0.2; }
     },
     395: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     396: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    397: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    398: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     399: {
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        type: "type"
     },
     400: {
-        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        type: "type"
     },
     401: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+        type: "class"
     },
     402: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    403: {
-        rcv: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+        type: "class"
     },
     404: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        rcv: function(p) { return 2; }
     },
     405: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        rcv: function(p) { return 2; }
     },
-    408: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    409: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    410: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
-    },
-    411: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    412: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    413: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
-    },
-    414: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 3 : 1; }
+    406: {
+        atk: function(p) { return 1.2; },
+        type: "type"
     },
     415: {
-        atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-        },
-        rcv: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
-        }
+        delay: function(p) { return 1; }
     },
     416: {
-        atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-        },
-        rcv: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
-        }
+        delay: function(p) { return 1; }
     },
     417: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     418: {
-        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     419: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        def: function(p) { return 0.5; }
     },
-    420: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    421: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    422: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    423: {
+        def: function(p) { return 0.5; }
     },
     424: {
-        atk: function(p) { return p.percHP >= 70.0 ? 1.5 : 1; }
-    },
-    425: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
     426: {
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    427: {
-        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.05 : 1; },
+        type: "type"
     },
-    428: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    429: {
+        def: function(p) { return 0.5; }
     },
     430: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     431: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    433: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'STR', 'DEX']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'QCK',
-                minModifier: 'Good'
-            }, {
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     434: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['PSY', 'INT', 'INT']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'PSY',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    435: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'PSY', 'QCK']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'PSY',
-                minModifier: 'Good'
-            }, {
-                type: 'QCK',
-                minModifier: 'Good'
-            }]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    437: {
-        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
-    },
-    438: {
-        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 5 : 1; }
-    },
-    444: {
-        atk: function(p) {
-            return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2 : 1;
-        }
-    },
-    445: {
-        atk: function(p) {
-            return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2.5 : 1;
-        }
-    },
-    446: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    447: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
-    },
-    448: {
-        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
-    },
-    449: {
-        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     450: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     451: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    452: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    453: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     454: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        type: "type"
     },
     455: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    456: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    457: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        type: "type"
     },
     458: {
-        atk: function(p) { return p.unit.cost <= 20 ? 3 : 1; }
+        atk: function(p) { return 1.5; },
+        type: "type"
     },
     459: {
-        atk: function(p) { return p.unit.number === 458 || p.unit.cost <= 20 ? 3 : 1; }
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
+    460: {
+        delay: function(p) { return 1; }
     },
     461: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
     },
     462: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    463: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    464: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
+        type: "class"
     },
     465: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good", "Below Good"]) ? 3 : 1;
-        },
-        hitModifiers: ["Below Good", "Below Good", "Below Good", "Below Good", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     466: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
-    467: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    468: {
+        rcv: function(p) { return 1.5; }
     },
     470: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    471: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        rcv: function(p) { return 1.5; }
     },
-    482: {
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    487: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        type: "type"
     },
-    483: {
+    488: {
         atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
-    },
-    485: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        type: "type"
     },
-    486: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    489: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        type: "type"
     },
     490: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        type: "type"
     },
     491: {
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        type: "type"
     },
     492: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    496: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    497: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    498: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        type: "type"
     },
     499: {
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     500: {
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-    },
-    501: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
-    502: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    503: {
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    505: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
+        type: "type"
     },
-    504: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    507: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
-    },
-    508: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    506: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
+        type: "type"
     },
     509: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     510: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     511: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    513: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
+        type: "class"
     },
     514: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    515: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    516: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        def: function(p) { return 0.5; },
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        type: "type"
     },
     517: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return 1.05; },
+        type: "type"
     },
     518: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return 1.05; },
+        type: "type"
     },
     519: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        type: "type"
     },
     520: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
-    },
-    523: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    524: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    525: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    526: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    527: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    528: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        type: "type"
     },
     529: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+        def: function(p) { return 0; }
     },
     530: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+        def: function(p) { return 0; }
     },
     533: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     534: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    535: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    536: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    537: {
-        chainModifier: function(p) { return 2; }
-    },
-    538: {
-        chainModifier: function(p) { return 2; }
-    },
-    541: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     542: {
-        hp: function(p) { return 1.5; }
-    },
-    543: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
-    },
-    544: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
+        rcv: function(p) { return 2; }
     },
     545: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        type: "type"
     },
     546: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    548: {
-        atk: function(p) { return 1.2; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        type: "type"
     },
     549: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     550: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
-    553: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
-    },
-    554: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+    552: {
+        def: function(p) { return 0; }
     },
     555: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        delay: function(p) { return 1; }
     },
     556: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    557: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    558: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        delay: function(p) { return 1; }
     },
     559: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     560: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
-    },
-    561: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    562: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     568: {
-        atk: function(p) { return 1.25; },
-        hp: function(p) { return 1.25; },
-        rcv: function(p) { return 1.25; }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.5; }
     },
     569: {
-        atk: function(p) { return 1.5; },
-        hp: function(p) { return 1.5; },
-        rcv: function(p) { return 1.5; }
-    },
-    570: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
-                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
-                1;
-        }
-    },
-    571: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
-                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
-                1;
-        }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.5; }
     },
     572: {
-        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2.5 : 1; }
-    },
-    573: {
-        rcv: function(p) { return 1.2; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        type: "class",
+        onActivation: function(p) { p.tdata.lock = Math.max(1, p.tdata.lock); },
+        onDeactivation: function(p) { if (p.tdata.lock === 1) p.tdata.lock = 0; }
     },
     574: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
     },
     575: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
     },
     576: {
-        atk: function(p) { return 1.5; },
-        rcv: function(p) { return 1.2; }
-    },
-    577: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    578: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    579: {
-        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 1.5 : 1; }
-    },
-    580: {
-        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 2 : 1; }
-    },
-    581: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        rcv: function(p) { return 1.5; }
     },
     582: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        type: "type"
     },
     583: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    584: {
-        atk: function(p) { return 0.1; },
-        hp: function(p) { return 0.1; },
-        rcv: function(p) { return 0.1; }
-    },
-    585: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    586: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 300: 0; }
     },
     589: {
-        atk: function(p) { return 1.5; },
-        hp: function(p) { return 0.2; },
-        rcv: function(p) { return 0.2; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        type: "class"
     },
     590: {
-        atk: function(p) { return 1.5; },
-        hp: function(p) { return 0.2; },
-        rcv: function(p) { return 0.2; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        type: "class"
     },
     596: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
     597: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
-    },
-    598: {
-        atk: function(p) { return p.unit.stars < 3 ? 2.5 : 1; }
-    },
-    599: {
-        atk: function(p) { return p.unit.stars < 3 ? 3 : 1; }
+        def: function(p) { return 0.5; }
     },
     600: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        type: "type"
     },
     601: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        type: "type"
     },
     602: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        type: "type"
     },
     603: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
-    },
-    604: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    605: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    606: {
-        atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    607: {
-        atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        type: "type"
     },
     612: {
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atkStatic: function(p) { return 45; },
+        rcvStatic: function(p) { return 45; },
+        type: "type"
     },
     613: {
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atkStatic: function(p) { return 45; },
+        rcvStatic: function(p) { return 45; },
+        type: "type"
     },
     614: {
-        atk: function(p) { return p.unit.cost <= 20 && p.percHP <= 30.0 ? 2.25 : 1; }
+        def: function(p) { return 0.5; }
     },
-    629: {
-        atk: function(p) { return p.unit.stars <= 3 ? 2 : 1; }
+    617: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        type: "class"
     },
-    630: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    631: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    622: {
+        rcvStatic: function(p) { return 100; },
+        type: "type"
     },
     632: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
     633: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        def: function(p) { return 0.5; }
     },
     634: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
+        type: "type"
     },
     635: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    636: {
-        atk: function(p) { return p.unit.cost <= 2 ? 3 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
+        type: "type"
     },
     637: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    638: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    639: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    640: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    641: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     642: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     643: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 3 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     644: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
+        type: "condition"
     },
     645: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
-    },
-    646: {
-        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.5 : 1; }
-    },
-    647: {
-        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.75 : 1; }
+        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
+        type: "condition"
     },
     648: {
-        atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-        }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     649: {
-        atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
-        }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     650: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     651: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    652: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
-    },
-    653: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1); }
-    },
-    654: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     655: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     656: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    657: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    658: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    659: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     660: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.5; }
     },
     661: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-    },
-    662: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.5; }
     },
     665: {
-        atk: function(p) { return 1.2; },
-        hp: function(p) { return 0.2; },
-        rcv: function(p) { return 0.2; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     666: {
-        atk: function(p) { return 1.75; },
-        hp: function(p) { return 0.2; },
-        rcv: function(p) { return 0.2; }
-    },
-    667: {
-        atk: function(p) { return 1.75; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     668: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
-        hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; }
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[668].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[668].multiplier === 1.5 ? 1 : 0);
+            window.specials[668].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '668warning'
+            });
+        }
     },
     669: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
-        hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; }
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[669].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[669].multiplier === 1.5 ? 1 : 0);
+            window.specials[669].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '669warning'
+            });
+        }
     },
     670: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
     },
     671: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    672: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    673: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    674: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-    },
-    675: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-    },
-    676: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    677: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    678: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
     },
-    679: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    680: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        type: "type"
     },
     681: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    683: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    684: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        type: "type"
     },
     686: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     687: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
+        type: "class"
     },
     688: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
+        type: "class"
     },
     689: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     690: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    696: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
-    },
-    697: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
-    },
-    698: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
-    },
-    699: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 500 : 0; }
-    },
-    700: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
-    },
-    701: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
-    },
-    702: {
-        hp: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
-    },
-    705: {
-        atk: function(p) {
-            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
-        },
-        hp: function(p) {
-            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
-        }
-    },
-    706: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    707: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    708: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
-    },
-    709: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     710: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        type: "class"
     },
     711: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        type: "class"
     },
     712: {
-        atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2 : 1; }
+        atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
+        type: "class"
     },
     713: {
-        atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2.5 : 1; }
+        atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
+        type: "class"
     },
     715: {
-        rcv: function(p) { return p.percHP <= 30 ? 3 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
     },
     716: {
-        rcv: function(p) { return p.percHP <= 30 ? 5 : 1; }
-    },
-    717: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has('Slasher')) return 1;
-            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    718: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has('Slasher')) return 1;
-            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
     },
     719: {
-        atk: function(p) {
-            return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+        atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[719].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 2 : 1.5);
+            window.specials[719].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '719warning'
+            });
         }
     },
     720: {
-        atk: function(p) {
-            return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
+        atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[720].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 2 : 1.5);
+            window.specials[720].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '720warning'
+            });
         }
     },
-    721: {
-        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 1.5 : 1; }
-    },
-    722: {
-        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2 : 1; }
-    },
-    723: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    724: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
-    },
     727: {
-        atk: function(p) {
-            return p.unit.class.has("Free Spirit") || p.unit.class.has("Fighter") ? 1.75 : 1;
-        }
-    },
-    728: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        def: function(p) { return 0.5; }
     },
     730: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        type: "type"
     },
     731: {
         atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        type: "type"
     },
     732: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
     733: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    734: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
-    },
-    735: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
-    736: {
-        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP >= 50.0 ? 2.5 : 1; }
-    },
-    737: {
-        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.75 : 1; }
-    },
-    738: {
-        atk: function(p) { return p.unit.cost >= 21 ? 2 : 1; }
+    740: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
-    739: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    741: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     742: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     743: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-    },
-    744: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-    },
-    745: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-    },
-    747: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
-        rcv: function(p) { return 0; }
-    },
-    748: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
-        rcv: function(p) { return 0; }
-    },
-    749: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    750: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    751: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    752: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     753: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     754: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     755: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     756: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    757: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    758: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    759: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
-    },
-    760: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     761: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        atk: function(p) { return 1.2; },
+        type: "type"
     },
     762: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    763: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    764: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        type: "type"
     },
     766: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    767: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    768: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    769: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     770: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
+        type: "condition"
     },
     771: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
-    },
-    772: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    774: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-    },
-    775: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    776: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
-    },
-    777: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        type: "type"
     },
     780: {
-        atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[780].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
+            window.specials[780].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x Self Attack boost.',
+                name: '780warning'
+            });
+        }
     },
     781: {
-        atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[781].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
+            window.specials[781].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x Self Attack boost.',
+                name: '781warning'
+            });
+        }
     },
     782: {
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     783: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
+    },
+    786: {
+        delay: function(p) { return 1; }
+    },
+    787: {
+        delay: function(p) { return 1; }
+    },
+    788: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        type: "class"
     },
     789: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        type: "class"
     },
-    791: {
-        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
-        hp: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
-        rcv: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; }
+    790: {
+        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
+        type: "type"
     },
-    793: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    791: {
+        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
+        type: "type"
     },
     794: {
-        atk: function(p) {
-            return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-        }
+        delay: function(p) { return 1; }
     },
     795: {
-        atk: function(p) {
-            return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
-        }
+        delay: function(p) { return 1; }
     },
     796: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     797: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     798: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    801: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    802: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
     },
     803: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return 1.1; },
+        type: "type"
     },
     804: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return 1.1; },
+        type: "type"
     },
     805: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     806: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     807: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     808: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     809: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
+        def: function(p) { return 0.2; }
     },
-    810: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    815: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    816: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }]) ? 2.75 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    810: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
+        def: function(p) { return 0.2; }
+    },
+    813: {
+        delay: function(p) { return 1; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+    },
+    822: {
+        rcvStatic: function(p) { return 100; },
+        type: "type"
     },
     825: {
-        atk: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; }
+        atkStatic: function(p) { return 200; },
+        type: "type"
     },
     826: {
-        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
+        delay: function(p) { return 1; },
+        atk: function(p) { return 0.2; },
+        type: "type"
     },
     827: {
-        atk: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; }
-    },
-    830: {
-        atk: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.75 : 1;
-        }
-    },
-    831: {
-        atk: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 2 : 1;
+        atk: function(p) { return 1.05; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+    },
+    828: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[828].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP < 20 ? 1.75 : 1);
+            window.specials[828].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                name: '828warning'
+            });
+        }  
+    },
+    829: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[829].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP < 20 ? 1.75 : 1);
+            window.specials[829].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                name: '829warning'
+            });
         }
     },
     832: {
-        atk: function(p) {
-            return p.unit.class.has("Free Spirit") ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
     },
     833: {
-        atk: function(p) {
-            return p.unit.class.has("Free Spirit") ? 1 + 1.75 * ((100 - p.percHP) / 100) : 1;
-        }
-    },
-    834: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
     },
     835: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     836: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     837: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
     },
     838: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
     },
     839: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     840: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },
+    841: {
+        delay: function(p) { return 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
+        type: "condition"
+    },
+    842: {
+        delay: function(p) { return 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
+        type: "condition"
     },
     843: {
         atk: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
+            if (window.specials[843].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[843].first = !window.specials[843].first;
+            p.scope.notify({
+                text: (window.specials[843].first ?
+                    'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
+                    'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
+                name: '843warning'
+            });
         }
     },
     844: {
         atk: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 2 : 1;
-        }
-    },
-    845: {
-        hit: function(n) {
-            return n > 22 ? 2.5 :
-                n > 11 ? 1.5 : 1;
-        }
-    },
-    846: {
-        hit: function(n) {
-            return n > 40 ? 3.5 :
-                n > 30 ? 2.75 :
-                n > 22 ? 2.5 :
-                n > 11 ? 1.5 : 1;
+            if (window.specials[844].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[844].first = !window.specials[844].first;
+            p.scope.notify({
+                text: (window.specials[844].first ?
+                    'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
+                    'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
+                name: '844warning'
+            });
         }
     },
     847: {
-        atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
+        atk: function(p) { return 1.05; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15, [p.friendCaptain, p.captain]); },
+        type: "class"
     },
     848: {
-        atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
+        atk: function(p) { return 1.05; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15, [p.friendCaptain, p.captain]); },
+        type: "class"
     },
     849: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
-    },
-    850: {
-        atk: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
-        }
-    },
-    851: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    852: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-    },
-    854: {
-        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
+        def: function() { return 0.5; }
     },
-    855: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    856: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+    853: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; },
+        type: "class"
     },
     857: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
+        type: "type"
     },
     858: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
-    },
-    859: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
+        type: "type"
     },
-    860: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    861: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     862: {
-        atk: function(p) { return p.unit.type === 'QCK' ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     863: {
-        atk: function(p) { return p.unit.type === 'QCK' ? 1.75 : 1; }
+        def: function(p) { return 0.5; }
     },
     864: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        delay: function(p) { return 1; },
+        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') ? 2.5 : 1;
+        }
     },
     865: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        delay: function(p) { return 1; },
+        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') ? 2.5 : 1;
+        }
     },
     866: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1;
+        },
+        type: "class"
     },
     867: {
-        hit: function(n) { return n > 11 ? 1.5 : 1; }
-    },
-    868: {
-        atk: function(p) { return 1.2; }
+        delay: function(p) { return 1; }
     },
     869: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
     },
     870: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    871: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    872: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
     },
     873: {
-        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.5 : 1; }
-    },
-    874: {
-        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 3 : 1; }
-    },
-    875: {
-        atk: function(p) {
-            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
+        orb: function(p) {
+            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[873].first = !window.specials[873].first;
+            p.scope.notify({
+                text: (window.specials[873].first ?
+                    'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
+                    'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
+                name: '873warning'
+            });
         }
     },
-    876: {
-        atk: function(p) {
-            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.25 : 1;
+    874: {
+        orb: function(p) {
+            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
+            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
+        },
+        type: "class",
+        onActivation: function(p) {
+            window.specials[874].first = !window.specials[874].first;
+            p.scope.notify({
+                text: (window.specials[874].first ?
+                    'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
+                    'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
+                name: '874warning'
+            });
         }
     },
-    878: {
-        atk: function(p) { return 1.5; }
-    },
-    879: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
-    },
-    880: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
     881: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Shooter", "Free Spirit" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2 : 1;
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
         },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        rcv: function(p) { return 0.1; },
+        type: "class"
     },
     882: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter", "Free Spirit" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
         },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        rcv: function(p) { return 0.1; },
+        type: "class"
     },
     883: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[883].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[883].multiplier === 1.5 ? 1 : 0);
+            window.specials[883].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '883warning'
+            });
+        }
     },
     884: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[884].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[884].multiplier === 1.5 ? 1 : 0);
+            window.specials[884].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '884warning'
+            });
+        }
     },
     885: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has('Fighter') ? window.specials[885].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[885].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '885warning'
+            });
+        }
     },
     886: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has('Slasher') ? window.specials[886].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[886].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '886warning'
+            });
+        }
     },
     887: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    889: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
-    },
-    890: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        def: function(p) { return 0.2; }
     },
     891: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    892: {
-        chainModifier: function(p) { return 2; }
-    },
-    893: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    894: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    895: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        type: "class"
     },
-    896: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    902: {
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[902].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[902].multiplier === 1.5 ? 1 : 0);
+            window.specials[902].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '902warning'
+            });
+        }
     },
-    897: {
-        atk: function(p) {
-            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
+    903: {
+        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[903].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[903].multiplier === 1.5 ? 1 : 0);
+            window.specials[903].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '902warning'
+            });
         }
     },
-    898: {
+    904: {
+        delay: function(p) { return 1; }
+    },
+    905: {
         atk: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
+            if (!window.specials[905].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
+            if (window.specials[905].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[905].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
         },
-        hp: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[905].stage = (window.specials[905].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[905].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '905warning'
+            });
         }
     },
-    899: {
+    906: {
         atk: function(p) {
-            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+            if (!window.specials[906].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
+            if (window.specials[906].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[906].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
         },
-        hp: function(p) {
-            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1;
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[906].stage = (window.specials[906].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[906].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '906warning'
+            });
         }
     },
-    900: {
-        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2 : 1; }
-    },
-    901: {
-        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2.75 : 1; }
-    },
-    902: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
-    },
-    903: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
-    },
-    905: {
-        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.5 : 1; }
-    },
-    906: {
-        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.75 : 1; }
-    },
     907: {
-        atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     908: {
-        atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
+        delay: function(p) { return 1; }
     },
     909: {
         atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        type: "type"
     },
     910: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        type: "type"
     },
     911: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) {
+            if (!window.specials[911].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
+            if (window.specials[911].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[911].stage = (window.specials[911].stage + 1) % 2;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[911].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '911warning'
+            });
+        }
     },
     912: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    913: {
-        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
-    },
-    914: {
-        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.2); }
+        atk: function(p) {
+            if (!window.specials[912].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
+            if (window.specials[912].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[912].stage = (window.specials[912].stage + 1) % 2;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[912].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '912warning'
+            });
+        }
     },
     915: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        type: "class"
     },
     916: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        type: "class"
     },
     917: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     918: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+        delay: function(p) { return 1; }
     },
     921: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     922: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
-    },
-    923: {
-        atk: function(p) {
-            if(p.percHP<30){ 
-                return p.unit.class.has("Driven") ? 2.5 : 1;
-            } else {
-                return p.unit.class.has("Driven") ? 2 : 1;
-            }	
-        }
-    },
-    924: {
-        atk: function(p) {
-            if(p.percHP<30){
-                return p.unit.class.has("Driven") ? 2.75 : 1;
-            } else {
-                return p.unit.class.has("Driven") ? 2 : 1;
-            }
-        }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     925: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     926: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     927: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    928: {
-        atk: function(p) {
-            if(p.percHP<30){
-                return p.unit.class.has("Driven") ? 1.75 : 1;
-            } else {
-                return p.unit.class.has("Striker") ? 1.75 : 1;
-            }
-        }
-    },
-    929: {
-        atk: function(p) {
-            if(p.percHP<30){
-                return p.unit.class.has("Driven") ? 2.25 : 1;
-            } else {
-                return p.unit.class.has("Striker") ? 2.25 : 1;
-            }
-        }
-    },
-    930: {
-        chainModifier: function(p) { return 2; }
-    },
-    932: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    933: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    934: {
-        atk: function(p) {
-            if(p.percHP<30 || p.percHP>70){
-                return p.unit.class.has("Fighter") ? 2.75 : 1;
-            } else {
-                return p.unit.class.has("Fighter") ? 2 : 1;
-            }
-        },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    935: {
         atk: function(p) {
-            if(p.percHP<30 || p.percHP>70){
-                return p.unit.class.has("Fighter") ? 2.75 : 1;
-            } else {
-                return p.unit.class.has("Fighter") ? 2 : 1;
-            }
+            return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.2 : 1;
         },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    936: {
-        chainModifier: function(p) { return 3; }
+        type: "class"
     },
-    937: {
-        chainModifier: function(p) { return 3.5; },
-        hp: function(p) { return 1.25; }
-    },
-    938: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    928: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
-    939: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    929: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
     940: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        type: "type"
     },
     941: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
-    },
-    942: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    943: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        type: "type"
     },
     944: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     945: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
-    },
-    946: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     947: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    948: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
-    },
-    949: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    950: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    951: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    952: {
-        atk: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
-        },
-        hp: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
-        }
-    },
-    953: {
-        atk: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
-        },
-        hp: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
-        }
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.3 : 1; },
+        type: "type"
     },
     954: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        def: function(p) { return 0.2; }		
     },
     955: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.2 : 1; },
+        type: "condition"
     },
     956: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        type: "class"
+    },
+    961: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     963: {
-        atk: function(p) { 
-            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 2; 
-            return 1;
-        }
+        def: function(p) { return 0; }
     },
     964: {
-        atk: function(p) { 
-            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-            return 1;
-        },
-        hp: function(p) { 
-            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-            return 1;
-        },
-        rcv: function(p) { 
-            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-            return 1;
+        atk: function(p) { return window.specials[964].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[964].multiplier === 1.1 ? 1 : 0);
+            window.specials[964].multiplier = [1.1, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
+                name: '965warning'
+            });
         }
     },
     965: {
-        atk: function(p) { 
-            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
-            return 1;
+        atk: function(p) { return window.specials[965].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[965].multiplier === 1.1 ? 1 : 0);
+            window.specials[965].multiplier = [1.1, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
+                name: '965warning'
+            });
         }
     },
-    966: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
-    },
-    967: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
-    },
-    973: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2 : 1; }
-    },
-    974: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
+    975: {
+        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
+        type: "class"
     },
     976: {
-        atk: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1;
-        }
+        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
+        type: "class"
     },
     977: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        chainAddition: function(p) {return 0.5;}
     },
     978: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    979: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.2 : 1; }
-    },
-    980: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.2 : 1; }
-    },
-    981: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 0.1 : 1; }
-    },
-    982: {
-        atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1; }
-    },
-    983: {
-        atk: function(p) {return p.unit.class.has("Slasher") ? 2.25  : 1; }
+        chainAddition: function(p){ return 0.5;}
     },
     984: {
-        atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1; }
-    },
-    989: {
-        atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; },
-        hp: function(p) { return 0.1 ; }
-    },
-    990: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.5 : 1; }
-    },
-    991: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.75 : 1; }
-    },
-    992: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1 ; }
+        delay: function(p) { return 1; }
     },
-    993: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1 ; }
-    },
-    996: {
-         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2  : 1; }
-    },
-    997: {
-         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2.25  : 1; }
+    981: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     998: {
-         atk: function(p) {return p.unit.class.has("Driven") ? 2  : 1; }
+        delay: function(p) { return 1; }
     },
     999: {
-         atk: function(p) {return p.unit.class.has("Driven") ? 2.25  : 1; }
-    },
-    1000: {
-        atk: function(p) { return  1 + p.percHP / 100; }
-    },
-    1001: {
-        atk: function(p) { return  1 + p.percHP / 100; }
-    },
-    1002: {
-        atk: function(p) {return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    1003: {
-        atk: function(p) {return p.unit.class.has("Fighter") ? 2 : 1; }
-    },
-    1004: {
-        rcv: function(p) { return 1.5; }
+        delay: function(p) { return 1; }
     },
     1005: {
-        atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     1006: {
-        atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    1007: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    1008: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 2 : 1; }
-    },
-    1009: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
-                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
-                1;
-        }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
-    1010:{
-        atk: function(p) {return p.unit.class.has("Driven") ? 1.5 : 1; }
+    1010: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
+        type: "type"
     },
-    1011:{
-        atk: function(p) {
-            if (p.unit.class.has("Driven") && p.unit.class.has("Powerhouse")){
-                return 2.625;
-            } else if (p.unit.class.has("Driven")){
-                    return 1.75;
-                } else if (p.unit.class.has("Powerhouse")){
-                    return 1.5;
-                } return 1;
-        }
+    1011: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
+        type: "type"
     },
-    1014:{
-        atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    1013: {
+        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
+        type: "condition"
     },
     1015: {
-        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1) : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        type: "type"
     },
     1016: {
-        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        type: "type"
     },
     1017: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        type: "class"
     },
     1018: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    1020: {
-        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    1021: {
-        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1022: {
-        atk: function(p) { return 2; }
+        type: "class"
     },
     1023: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        type: "class"
     },
     1024: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1024].multiplier, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1024].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                name: '1024warning'
+            });
+        }
     },
     1025: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    1026: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    1027: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1025].multiplier, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1025].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                name: '1025warning'
+            });
+        }
     },
     1028: {
-        hit: function(n) { return n > 21 ? 2.5 : 1; }
+        //TODO
+        hit: function(n) { return n > 30 ? 1.75 : 1; },
+        type: "condition"
     },
     1029: {
-        hit: function(n) {
-            return n > 36 ? 3.5 :
-                n > 21 ? 2.5 : 1;
-        }
+        //TODO
+        hit: function(n) { return n > 30 ? 1.75 : 1; },
+        type: "condition"
     },
     1030: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type"
     },
     1031: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.75 : 1; }
-    },
-    1032: {
-         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    1033: {
-         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
-    },
-    1034: {
-        atk: function(p) { 
-            return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
-    },
-    1035: {
-        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
-    },
-    1036: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1037: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1038: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.2 : 1; }
-    },
-    1039: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type"
     },
     1040: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    1041: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    1042: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2 : 1;},
-        rcv: function(p) { return 0; }
-    },
-    1043: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2) : 1;},
-        rcv: function(p) { return 0; }
-    },
-    1044: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1045: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1046: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1047: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1048: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
-    },
-    1049: {
-        atk: function(p) { return p.unit.type === 'PSY' ? (p.percHP >= 30.0 ? 1.5 : 2.25) : 1; },
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
-    },
-    1050: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
-    },
-    1051: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
-    },
-    1056:{
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
-        rcv: function(p) { return 1.25; }
-    },
-    1058:{
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
-        hp: function(p) { return 1.25; }
+        atk: function(p) { return window.specials[1040].multiplier; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1040].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '1040warning'
+            });
+        }
     },
-    1059:{
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;},
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
+    1041: {
+        atk: function(p) { return window.specials[1041].multiplier; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1041].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x ATK boost.',
+                name: '1041warning'
+            });
+        }
     },
-    1060:{
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1;},
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1;}
+    1046: {
+        staticMult: function(p) { return 55; }
     },
-    1061:{
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1;}
+    1047: {
+        staticMult: function(p) { return 55; }
     },
-    1062:{
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1;}
+    1055: {
+        atk: function(p) { return 1.4; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
     },
-    1063:{
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;},
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
+    1056: {
+        atk: function(p) { return 1.4; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
     },
-    1064: {
-        atk: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; }
+    1059: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
-    1065:{
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
+    1060: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
-    1066: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
+    1061: {
+        chain: function(p) { return 2; },
+        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') ? 2 : 1;
+        }
     },
-    1067:{
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1;}
+    1063: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1; },
+        type: "class"
     },
-    1068: {
-        chainModifier: function(p) { return 1.5; }
+    1065: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
-    1069:{
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
+    1066: {
+        chainAddition: function(p){ return 0.1;}
     },
-    1070:{
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1;}
+    1067: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        type: "type"
     },
     1071: {
-        atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class"
     },
     1072: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1;}
-    },
-    1073:{
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
-    },
-    1074: {
-        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
-    },
-    1075: {
-        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; },
-        hp: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class"
     },
     1076: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+        delay: function(p) { return 1; }
     },
     1077: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1080: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1081: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1082: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1; }
+        atk: function(p) { return (p.unit.class.has("Striker") || p.unit.class.has("Fighter")) ? window.specials[1082].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1082].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                name: '1082warning'
+            });
+        }
     },
     1083: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Striker", "Fighter" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Striker") && !p.unit.class.has("Fighter")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1084: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    1085: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    1086:{
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;},
-        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
-    },
-    1087:{
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1;},
-        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
-    },
-    1088:{
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;}
-    },
-    1089:{
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;},
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1;}
-    },
-    1090: {
-        atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
-    },
-    1091: {
-        atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
+        atk: function(p) { return (p.unit.class.has("Striker") || p.unit.class.has("Fighter")) ? window.specials[1083].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
+            window.specials[1083].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                name: '1083warning'
+            });
+        }
     },
-    1092: {
-        rcv: function(p) { return 1 + .5 * ((100 - p.percHP) / 100); }
+    1086: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
-    1093: {
-        rcv: function(p) { return 1 + 1 * ((100 - p.percHP) / 100);	}
+    1087: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
-    1094: {
-        atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
+    1088: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
-    1095: {
-        atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
+    1089: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     1096: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     1097: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1098: {
-        chainModifier: function(p) { return 2; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     1099: {
-        atk: function(p) { return p.unit.class.has('Fighter') ? 2.0 : 1.0; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1100: {
-        atk: function(p) { return p.unit.class.has('Fighter') ? 2.25 : 1.0; },
-        rcv: function(p) { return p.unit.class.has('Fighter') ? 1.2 : 1.0; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1101: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.25 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
+        type: "type"
     },
     1102: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1103: {
-        atk: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; },
-        rcv: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; }
-    },
-    1104: {
-        atk: function(p) { return p.unit.class.has('Cerebral') ? 1.75 : 1.0; },
-        rcv: function(p) { return p.unit.class.has('Cerebral') ? 1.75 : 1.0; }
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
+        type: "type"
     },
     1105: {
-         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        delay: function(p) { return 1; },
+        chainAddition: function(p){ return 0.2;}
     },
     1106: {
-         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
+        delay: function(p) { return 1; },
+        chainAddition: function(p){ return 0.2;}
     },
     1107: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
     },
     1108: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-    },
-    1110: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }  
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        type: "class"
     },
     1111: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; }  
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1112: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1113: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }  
+        atk: function(p) { return 1.2; },
+        type: "type"
     },
     1114: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        type: "type" 
     },
     1115: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
-    },
-    1118: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1119: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1120: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1121: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        type: "type" 
     },
     1122: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1123: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
-    },
-    1124: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-        }
-    },
-    1125: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
-        }
-    },
-    1126: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    1127: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    1128: {
-        atk: function(p) { return 1.75; }
-    },
-    1129: {
-        atk: function(p) { return 2; }
-    },
-    1130: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    1131: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1132: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1132].multiplier === 1.5 ? 1 : 0);
+            window.specials[1132].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1132warning'
+            });
+        }
     },
     1133: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
-    },
-    1134: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.2 : 1; }
-    },
-    1135: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    1136: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? window.specials[1133].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1133].multiplier === 1.5 ? 1 : 0);
+            window.specials[1133].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1133warning'
+            });
+        }
     },
     1137: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1139: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1140: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-    },
-    1141: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+    1138: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1; },
+        type: "class"
     },
     1142: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1143: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-    },
-    1144: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        delay: function(p) { return 1; }
     },
-    1145: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    1153: {
+        def: function(p) { return 0; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        type: "class" 
     },
     1154: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; }
-    },
-    1156: {
-        atk: function(p) { return ( p.unit.class.has("Driven") || p.unit.class.has("Striker") ) && p.percHP >= 50.0 ? 1.2 : 1; }
-    },
-    1157: {
-        atk: function(p) { return ( p.unit.class.has("Driven") || p.unit.class.has("Striker") )  && p.percHP >= 50.0 ? 1.75 : 1; }
-    },
-    1158: {
-        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
-    },
-    1159: {
-        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.25 : 1; }
-    },
-    1160: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },  
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
-    },
-    1161: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },  
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
-    },
-    1162: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
-    },
-    1163: {
-        atk: function(p) { return (p.unit.type === "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type === "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type === "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class"
     },
     1164: {
-        rcv: function(p) { return 1.2; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
+        rcv: function(p) { return 1.5; }
     },
     1165: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         rcv: function(p) { return 1.5; }
     },
-    1167: {
-        atk: function(p) { return 1.2; }
-    },
     1168: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? window.specials[1168].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
+            window.specials[1168].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
+                name: '1168warning'
+            });
+        }
     },
     1169: {
-        atk: function(p) {
-            return p.unit.type === "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+        atk: function(p) { return p.unit.type === "STR" ? window.specials[1169].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
+            window.specials[1169].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
+                name: '1168warning'
+            });
         }
     },
-    1170: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    1171: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    1172: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    1173: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
-    },
-    1174: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
-    },
-    1175: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
-    },
-    1176: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    1177: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    1178: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2 : 1; }
-    },
-    1179: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
-    },
     1181: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
-    },
-    1182: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
-    },
-    1183: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
-    },
-    1184: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
-    },
-    1185: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1186: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1187: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
-    },
-    1188: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
-    },
-    1189: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
-    },
-    1190: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
-    },
-    1191: {
-        atk: function(p) {
-            return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1181].turnedOn = true;
         },
-        hp: function(p) { return 1.2; }
+        onDeactivation: function(p) {
+            window.specials[1181].turnedOn = false;
+        }
     },
-    1192: {
-        atk: function(p) {
-            return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
+    1182: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1182].turnedOn = true;
         },
-        hp: function(p) { return 1.2; }
+        onDeactivation: function(p) {
+            window.specials[1182].turnedOn = false;
+        }
     },
     1193: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        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') ? 2.5 : 1;
+        }
     },
     1194: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+        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') ? 2.5 : 1;
+        }
     },
     1195: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
     },
     1196: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    1197: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1) : 1; }
-    },
-    1198: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-    },
-    1199: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-    },
-    1202: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-    },
-    1203: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
-    },
-    1204: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
-    },
-    1205: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-    },
-    1206: {
-        hp: function(p) { return 1.3; }
-    },
-    1207: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    1208: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
     },
     1209: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        delay: function(p) { return 1; }
     },
     1210: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1211: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1212: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
-    },
-    1213: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-    },
-    1214: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
-    },
-    1215: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'PSY', 'DEX']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'QCK',
-                minModifier: 'Good'
-            }, {
-                type: 'PSY',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1216: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
-    },
-    1217: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    1218: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1219: {
         atk: function(p) {
-            return p.unit.class.has("Shooter") ? Math.min(3, 1 + 0.125 * p.turnCounter) : 1;
+            if (!window.specials[1219].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
+            if (window.specials[1219].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1219].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[1219].stage = (window.specials[1219].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[1219].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '1219warning'
+            });
         }
     },
     1220: {
         atk: function(p) {
-            return p.unit.class.has("Shooter") ? Math.min(3.25, 1 + 0.225 * p.turnCounter) : 1;
+            if (!window.specials[1220].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
+            if (window.specials[1220].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1220].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
+        },
+        type: "class",
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[1220].stage = (window.specials[1220].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[1220].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '1219warning'
+            });
         }
     },
     1221: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
-    }, 
-    1222: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
-    },
-    1223: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1221].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1221].turnedOn = false;
+        }
     },
-    1224: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    1222: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1222].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1222].turnedOn = false;
+        }
     },
     1225: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    1226: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        delay: function(p) { return 1; }
     },
     1227: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; }
-    },
-    1228: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
-    },
-    1229: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
-    },
-    1230: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.75 : p.unit.class.has("Powerhouse") ? 2.5 : 1; }  
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     1231: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.1875 : 1.75) : 1; },
-        rcv: function(p) { return .5; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1231].turnedOn = true;
+            p.scope.notify({
+                text: 'Only affects damage if Smoker is your captain',
+                name: '1231warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1231].turnedOn = false;
+        }
     },
     1232: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.925 : 2.25) : 1; },
-        rcv: function(p) { return .5; }
-    },
-    1233: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.25 :
-                p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 :
-                1;
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1232].turnedOn = true;
+            p.scope.notify({
+                text: 'Only affects damage if Smoker is your captain',
+                name: '1232warning'
+            });
         },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        onDeactivation: function(p) {
+            window.specials[1232].turnedOn = false;
+        }
     },
-    1234: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.56 :
-                p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.6 :
-                1;
-        },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1; }
+    1233: {//Tashigi
+        affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1234: {//Tashigi
+        affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1235: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        delay: function(p) { return 1; }
     },
     1236: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        delay: function(p) { return 1; }
     },
     1237: {
-        hit: function(n) {
-            return n > 15 ? 2 : 1;
-        }
+        //TODO
+        hit: function(n) { return n > 30 ? 2 : 1; },
+        type: "condition"
     },
     1238: {
-        hit: function(n) {
-            return n > 30 ? 3 :
-                n > 15 ? 2 : 1;
-        }
+        //TODO
+        hit: function(n) { return n > 30 ? 2 : 1; },
+        type: "condition"
     },
     1239: {
-        atk: function(p){ 
-            var specialEnabled = false;
-            for(var i=0;i<2;i++)
-            {
-                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
-            }
-            return specialEnabled ? 3 : 2; },
-        rcv: function(p) { return 1.3; }
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1239].turnedOn[p.slot] = true;
+            p.scope.notify({
+                text: 'Only affects damage if Kizaru is your captain',
+                name: '1239warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1239].turnedOn[p.slot] = false;
+        }
     },
     1240: {
-        atk: function(p){ 
-            var specialEnabled = false;
-            for(var i=0;i<2;i++)
-            {
-                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
-            }
-            return specialEnabled ? 3 : 2; },
-        rcv: function(p) { return 1.3; }
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1240].turnedOn[p.slot] = true;
+            p.scope.notify({
+                text: 'Only affects damage if Kizaru is your captain',
+                name: '1240warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1240].turnedOn[p.slot] = false;
+        }
     },
     1241: {
-        chainModifier: function(p) { return 1.5; }
+        staticMult: function(p) { return 15; }
     },
     1242: {
-        chainModifier: function(p) { return 2; }
-    },
-    1243: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
-                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
-                1;
-        }
-    },
-    1244: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.276 :
-                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.75 : 
-                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3 :
-                1;
-        }
+        staticMult: function(p) { return 15; }
     },
     1245: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
+        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1245].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1245].multiplier === 1.3 ? 1 : 0);
+            window.specials[1245].multiplier = [1.3, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1245warning'
+            });
+        }
     },
     1246: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
-    },
-    1247: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2); },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
-    },
-    1248: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
-                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
-                1;
+        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1246].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1246].multiplier === 1.3 ? 1 : 0);
+            window.specials[1246].multiplier = [1.3, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1246warning'
+            });
         }
     },
-    1249: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
-                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.6 :
-                1;
+    1247: {
+        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1247].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1247].multiplier === 1.3 ? 1 : 0);
+            window.specials[1247].multiplier = [1.3, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
+                name: '1247warning'
+            });
         }
     },
     1250: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class"
     },
     1251: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
-    },
-    1252: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class"
     },
     1253: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
+        type: "class"
     },
     1254: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? p.unit.class.has("Striker") ? 2.75 : 1 : 1; },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1256: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; }
+        def: function(p) { return 0.2; }
     },
-    1257: {
-        atk: function(p) { return p.percHP <= 50.0 ? 2 : 1; }
+    1255: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
-    1258: {
-        atk: function(p) { return p.percHP <= 50.0 ? 2.5 : 1; }
+    1256: {
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
     1259: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1259].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1259].turnedOn = false;
+        }
     },
     1260: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1260].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1260].turnedOn = false;
+        }
     },
-    1261: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    1261: {//Young Senor Pink
+        affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
-    1262: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+    1262: {//Young Senor Pink
+        affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1263: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1264: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1265: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        type: "class"
     },
     1266: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
-    },
-    1267: {
-        atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
-                return 2.75;
-            else
-                return 1; 
-               },
-        hp: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
-                return 1.5;
-            else
-                return 1; 
-               }
-    },
-    1268: {
-        atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
-                return 2.75;
-            else
-                return 1; 
-               },
-        hp: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
-                return 1.5;
-            else
-                return 1; 
-               }
-    },
-    1271: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-    },
-    1272: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        type: "class"
     },
-    1273: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
-                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.5 : 
-                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.5 :
-                1;
+    1269: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1269].turnedOn = true;
         },
-        hp: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.44 :
-                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
-                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
-                1;
+        onDeactivation: function(p) {
+            window.specials[1269].turnedOn = false;
         }
     },
-    1274: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
-                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.6 : 
-                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.6 :
-                1;
+    1270: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1270].turnedOn = true;
         },
-        hp: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.44 :
-                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
-                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
-                1;
+        onDeactivation: function(p) {
+            window.specials[1270].turnedOn = false;
         }
     },
-    1275: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    1276: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    1277: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.25 : 1; },
-        rcv: function(p) { return .01; }
-    },
-    1278: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.75 : 1; },
-        rcv: function(p) { return .01; }
+    1271: {
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1279: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    1272: {
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1280: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+    1273: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
-    1281: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+    1274: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     1282: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+        atk: function(p) { return 1.2; },
+        type: "class",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
     },
     1283: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
-    },
-    1284: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
-    },
-    1285: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.375, [ "Striker" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Striker")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.375 : 1.5;
-        },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     1286: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        type: "class"
     },
     1287: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
-    },
-    1288: {
-        atk: function(p) {
-            return p.unit.class.has("Driven") ? Math.max(1.0, 2.5 - 0.1 * p.turnCounter) : 1;
-        }
-    },
-    1289: {
-        atk: function(p) {
-            return p.unit.class.has("Driven") ? Math.max(1.0, 2.75 - 0.1 * p.turnCounter) : 1;
-        }
-    },
-    1291: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
-    },
-    1292: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        type: "class"
     },
-    1293: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    1295: {
+        def: function(p) { return 0; }
     },
-    1294: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    1296: {
+        def: function(p) { return 0; }
     },
-    
     1297: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'STR', 'STR']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'STR',
-                minModifier: 'Good'
-            }]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1298: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'STR', 'STR']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'STR',
-                minModifier: 'Good'
-            }]) ? 3 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1299: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
-    },
-    1300: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    1301: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
-    },
-    1302: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.625 :
-                p.unit.class.has("Slasher") && !p.unit.class.has("Driven") ? 1.75 : 
-                !p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.5 :
-                1;
-        }
-    },
-    1303: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    1304: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
-    },
-    1305: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
-    },
-    1306: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1307: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
-    },
-    1308: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
-    },
-    1309: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
     },
-    1310: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    1298: {
+        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
     },
-    1311: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    1299: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
+        type: "class"
     },
-    1312: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+    1300: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
+        type: "class"
     },
     1313: {
-        atk: function(p) {
-            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
-            $scope.notify({ text: p.orb });
-        }
+        atk: function(p) { return p.unit.cost >= 50 ? 1.75 : 1; },
+        type: "class"
     },
     1314: {
-        atk: function(p) {
-            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
-        }
-    },
-    1315: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 
-            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
-            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1316: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
-            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
-            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.cost >= 50 ? 1.75 : 1; },
+        type: "class"
     },
     1317: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2 : 1; }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.2; }
     },
     1318: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2.5 : 1; }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.2; }
+    },
+    1319: {
+        atk: function(p) { return 1.5; },
+        type: "class"
+    },
+    1320: {
+        atk: function(p) { return 1.5; },
+        type: "class"
     },
     1321: {
-        atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher"))) 
-                return 2.25;
-            else
-                return 1; 
-               }
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
+        type: "condition"
     },
     1322: {
-        atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher")))
-                return 2.5;
-            else
-                return 1; 
-               }
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
+        type: "condition"
     },
     1323: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.69 :
-                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.3 :
-                1;
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1323].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1323].turnedOn = false;
         }
     },
     1324: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.56 :
-                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.6 :
-                1;
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1324].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1324].turnedOn = false;
         }
     },
-    1326: {
-        atk: function(p) { return 1.3; }
-    },
-    1327: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2 : 1; }
-    },
-    1328: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+    1329: {
+        affinity: function(p){ return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
     1330: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1333: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.96 :
-                p.unit.class.has("Powerhouse") || p.unit.type === "STR" ? 1.4 :
-                1;
-        }
-    },
-    1334: {
-        atk: function(p) { 
-            return p.unit.class.has("Free Spirit") && p.unit.type === "DEX" ? 1.96 :
-                p.unit.class.has("Free Spirit") || p.unit.type === "DEX" ? 1.4 :
-                1;
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1330].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1330].turnedOn = false;
         }
     },
     1335: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        chainAddition: function(p){ return 0.5; }
     },
     1336: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-    },
-    1337: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
-    },
-    1338: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+        chainAddition: function(p){ return 0.5; }
     },
     1339: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
+        chainAddition: function(p) {
+            if (!window.specials[1339].stage) return 0.2;
+            if (window.specials[1339].stage === 1) return 0.3;
+            if (window.specials[1339].stage === 2) return 0.5;
+        },
+        stage: -1,
+        onActivation: function(p) {
+            window.specials[1339].stage = (window.specials[1339].stage + 1) % 3;
+            p.scope.notify({
+                text: 'Activating stage #' + (window.specials[1339].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
+                name: '1339warning'
+            });
+        }
     },
     1340: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1341: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["QCK"]); }, 
-        hitAtk: function(p) {
-            if (!(p.unit.type === "QCK")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 2.625 : 1.75;
-        },
-        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
-    },
-    1342: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        delay: function(p) { return 1; }
     },
     1343: {
-        hp: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     1344: {
-        hp: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+        type: "class"
     },
-    1345: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
-    },
-    1346: {
-        hp: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    1348: {
+        atk: function(p) { return 1.2; },
+        type: "class",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
     },
     1349: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        type: "class"
     },
-    1352: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, ["Fighter"]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Fighter")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    1351: {
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.5; }
     },
     1353: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+        chainAddition: function(p){ return 0.5; }
     },
     1354: {
-        chainModifier: function(p) { return 2; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1355: {
-        chainModifier: function(p) { return 3; }
-    },
-    1356:{
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    1357:{
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1358: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        delay: function(p) { return 1; },
+        rcv: function(p){ return 1.75; }
     },
     1359: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
-    },
-    1360: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+        delay: function(p) { return 1; },
+        rcv: function(p){ return 1.75; }
     },
     1361: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
-        hp: function(p) { return p.unit.class.has("Slasher") ?
-            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
+        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
+        type: "class"
     },
     1362: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
-        hp: function(p) { return p.unit.class.has("Slasher") ?
-            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
+        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
+        type: "class"
     },
     1363: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1364: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1365: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1366: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1.5); },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    1367: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    1368: {
-        atk: function(p) { return !(p.unit.type === "STR") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
-    },
-    1369: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
-    },
-    1370: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
-    },
-    1371: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1372: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        delay: function(p) { return 1; }
+    },
+    1367:{
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1367].multiplier === 1.5 ? 1 : 0);
+            window.specials[1367].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1367warning'
+            });
+        }
+    },
+    1368:{
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1368].multiplier, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1368].multiplier === 1.5 ? 1 : 0);
+            window.specials[1368].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1368warning'
+            });
+        }
     },
     1373: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
     1374: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1375: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1376: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
-    },
-    1377: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; }
-    },
-    1378: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1379: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1379].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1379].turnedOn = false;
+        },
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1380: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
-    },
-    1381: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; }
-    },
-    1382: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1383: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    1384: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
-    },
-    1387: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.8125 : 2.25;
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1380].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1380].turnedOn = false;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.25; }
+        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1388: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+    1387: {
+        delay: function(p) { return 1; }
     },
     1389: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        orb: function(p) { return p.unit.type === "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1390: {
-        atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
-        hp: function(p) { return p.unit.cost <= 40 ? 1 : 0.5; }
+        atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
+        type: "class"
     },
     1391: {
-        atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
-        hp: function(p) { return p.unit.cost <= 40 ? 1 : 0.5; }
+        atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
+        type: "class"
     },
     1392: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        type: "class"
     },
     1393: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; }
+        atk: function(p) { return 1.1; },
+        type: "class",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1, [p.friendCaptain, p.captain]); }
     },
     1394: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.1 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     1395: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     1396: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.2; }
     },
     1397: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1398: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    1399: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.2; }
     },
     1400: {
-        atk: function(p) {
-            return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.275 :
-                p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
-                !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.3 :
-                1; }
+        affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1400].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1400].multiplier === 1.5 ? 1 : 0);
+            window.specials[1400].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
+                name: '1400warning'
+            });
+        }
     },
     1401: {
-        atk: function(p) {
-            return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.625 :
-                p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
-                !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.5 :
-                1; }
+        affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1401].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1401].multiplier === 1.5 ? 1 : 0);
+            window.specials[1401].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
+                name: '1401warning'
+            });
+        }
     },
     1402: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 2 : 1; }
-    },
-    1403: {
-        atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
-    },
-    1404: {
-        atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? window.specials[1402].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (window.specials[1402].multiplier === 1.3 ? 1 : 0);
+            window.specials[1402].multiplier = [1.3, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.3, 1.5][n] + 'x Type boost. To switch to the ' + [1.5, 1.3][n] + 'x Type boost, disable and re-enable this special',
+                name: '1402warning'
+            });
+        }
     },
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; }
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1406: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1407: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
+        type: "type"
     },
     1408: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    1410: {
-        chainModifier: function(p) { return 2.5; }
-    },
-    1411: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        rcv: function(p) { return 0; }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
+        type: "type"
     },
-    1412: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; },
-        rcv: function(p) { return 0; }
-    },
-    1413: {
-        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1.75; },
-        hp: function(p) { return 1.2; }
+    1409: {
+        delay: function(p) { return 1; },
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
     },
-    1414: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+    1410: {
+        delay: function(p) { return 1; },
+        atk: function(p) {
+            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
     },
     1415: {
-        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+        type: "class"
     },
     1416: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
-    },
-    1417: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    1418: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+        type: "class"
     },
     1419: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
     },
     1420: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
     },
-    1422: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    1421: {
+        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1421].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP === 100 ? 2 : 1.5);
+            window.specials[1421].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                name: '1421warning'
+            });
+        }
     },
     1422: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1423: {
-        atk: function(p) { return 1.75; }
-    },
-    1424: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1 + 1.25 * p.percHP / 100 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1422].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP === 100 ? 2 : 1.5);
+            window.specials[1422].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                name: '1422warning'
+            });
+        }
     },
     1425: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
+        warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1426: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.25 : 1; }
-    },
-    1427: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
+        warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
-    1429: {
-        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1430: {
-        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; }
+    1428: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "class",
+        warning: "Selected special (%name%) assumes that the enemy has been Delayed."
     },
     1431: {
-        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 2;
-            else
-                return 1; 
-               },
-        hp: function(p) { if(p.classCount.FreeSpirit>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1 && p.classCount.Powerhouse>=1 && p.classCount.Driven>=1) 
-                return 1.2;
-            else
-                return 1; 
-               }
+        atk: function(p) { return 1.5; },
+        type: "type"
     },
     1432: {
-        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 2.5;
-            else
-                return 1; 
-               },
-        hp: function(p) { if(p.classCount.FreeSpirit>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1 && p.classCount.Powerhouse>=1 && p.classCount.Driven>=1) 
-                return 1.5;
-            else
-                return 1; 
-               }
-    },
-    1433: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
-        hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
-    },
-    1434: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
-        hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
+        atk: function(p) { return 1.5; },
+        type: "type"
     },
     1435: {
-        atk: function(p) { 
-            return p.unit.class.has("Slasher") ? 2 : 1; },
-        hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
     1436: {
-        atk: function(p) { 
-            return p.unit.class.has("Slasher") ? 2.5 : 1; },
-        hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        delay: function(p) { return 1; }
     },
     1437: {
-        atk: function(p) {
-            return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 1.69 :
-                p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.3 :
-                1; }
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
+        type: "condition",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1438: {
-        atk: function(p) {
-            return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 2.56 :
-                p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.6 :
-                1; }
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
+        type: "condition",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1439: {
-        atk: function(p) {
-            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     1440: {
-        atk: function(p) {
-            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     1441: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        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') ? 2.5 : 1;
+        }
     },
     1442: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+        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') ? 2.5 : 1;
+        }
     },
     1443: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1444: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1445: {
-        atk: function(p) { 
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") ? 2.25 + 0.5 * p.percHP / 100 : 1; 
-        },
-        rcv: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
-        }
+        delay: function(p) { return 1; },
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
+        type: "type"
     },
     1446: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
     1447: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
-    },
-    1448: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[1447].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1447].multiplier === 1.2 ? 1 : 0);
+            window.specials[1447].multiplier = [1.2, 1.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.2, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.2][n] + 'x multiplier, disable and re-enable this special',
+                name: '1447warning'
+            });
+        }
     },
     1449: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        def: function(p) { return 0.5; }
     },
     1450: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
-    },
-    1451: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1.5); }
-    },
-    1452: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
-    },
-    1453: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    1454: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    1455: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1456: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1457: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 1.75 : 1; }
-    },
-    1458: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; }
+        def: function(p) { return 0.5; }
     },
     1459: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 1.75 : 1;
-        },
-        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
     },
     1460: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 2.14 : 1;
-        },
-        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
     },
     1461: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.6, ["QCK"]); }, 
-        hitAtk: function(p) {
-            if (!(p.unit.type === "QCK")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.6 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        type: "type"
     },
     1462: {
-        chainModifier: function(p) { return 2; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1462].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1462].turnedOn = false;
+        }
     },
     1463: {
-        chainModifier: function(p) { return 2.5; }
-    },
-    1465: {
-        atk: function(p) { return 1.25; },
-        rcv: function(p) { return 1.25; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1463].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1463].turnedOn = false;
+        }
     },
     1466: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2 : 1; }
+        def: function(p) { return 0; }
     },
     1467: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.3 : 1; }
+        def: function(p) { return 0; }
     },
     1468: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
     1469: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
-    },
-    1470: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 3 : p.unit.class.has("Powerhouse") || p.unit.class.has("Slasher") ? 1.5 : 1; }  
-    },
-    1471: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") ? 1 + 1 * ((100 - p.percHP) / 100) : 1;
-        }
-    },
-    1472: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
-    },
-    1473: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
-    },
-    1474: {
-        atk: function(p) { return 1.5; }  
-    },
-    1475: {
-        atk: function(p) { return 2.25; }  
+        delay: function(p) { return 1; }
     },
     1476: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        delay: function(p) { return 1; },
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
+        },
+        type: "class"
     },
     1477: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        delay: function(p) { return 1; },
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
+        },
+        type: "class"
     },
     1478: {
-        hit: function(n) {
-            return n > 44 ? 3 :
-                n > 33 ? 2 :
-                n > 22 ? 1.75 :
-                n > 11 ? 1.5 : 1;
-        }
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
+        type: "type"
     },
     1479: {
-        hit: function(n) {
-            return n > 44 ? 3.5 :
-                n > 33 ? 2.75 :
-                n > 22 ? 2.5 :
-                n > 11 ? 1.75 : 1;
-        }
-    },
-    1480: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1481: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
-            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
+        type: "type"
     },
     1482: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return window.specials[1482].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1482].multiplier === 1.25 ? 1 : 0);
+            window.specials[1482].multiplier = [1.25, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
+                name: '1482warning'
+            });
+        }
     },
     1483: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return window.specials[1483].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1483].multiplier === 1.25 ? 1 : 0);
+            window.specials[1483].multiplier = [1.25, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
+                name: '1483warning'
+            });
+        }
     },
     1484: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        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') ? 2.5 : 1;
+        }
     },
     1485: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; }
+        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') ? 2.5 : 1;
+        }
     },
     1486: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1487: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
-    },
-    1488: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    1489: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1490: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great"]) ? 1.75 : 1;
-        },
-        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+        def: function(p) { return 0.5; }
     },
     1491: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great"]) ? 2 : 1;
-        },
-        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
+        def: function(p) { return 0.5; }
     },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
-        hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; }
-    },
-    1493: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    1494: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    1495: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
-    },
-    1496: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1492].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1492].multiplier === 1.5 ? 1 : window.specials[1492].multiplier === 1.75 ? 2 : 0);
+            window.specials[1492].multiplier = [1.5, 1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [1.75, 2, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1492warning'
+            });
+        }
     },
     1497: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    1498: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
-    },
-    1499: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
-    },
-    1500: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        type: "type"
     },
     1501: {
-        atk: function(p) { return p.unit.cost <= 15 ? 2 : 1; }
-    },
-    1504: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.4, [ "Driven" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return 1.3; },
+        type: "type"
     },
     1505: {
-        atk: function(p) { return !(p.unit.class.has("Powerhouse")) ? 1 : p.percHP <= 30.0 ? 2.25 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type"
     },
     1506: {
-        atk: function(p) { return !(p.unit.class.has("Powerhouse")) ? 1 : p.percHP <= 30.0 ? 2.5 : 2.25; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type"
     },
     1507: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
-                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
-                1;
-        }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
     },
     1508: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
-                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 :
-                1;
-        }
-    },
-    1509: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    1510: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        type: "class"
     },
     1511: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        type: "type"
     },
     1512: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
-    },
-    1513: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
-    },
-    1514: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? window.specials[1512].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1512].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.5 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '1512warning'
+            });
+        }
     },
     1515: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 1.5 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1515].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1515].turnedOn = false;
+        }
     },
     1516: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 2 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1516].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1516].turnedOn = false;
+        }
     },
     1517: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1518: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
-    },
-    1519: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    1520: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    1521: {
-        atk: function(p) { 
-            return p.unit.class.has("Slasher") && p.unit.type === "QCK" ? 1.44 :
-                p.unit.class.has("Slasher") || p.unit.type === "QCK" ? 1.2 :
-                1;
-        }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1522: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
-    },
-    1523: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
-    },
-    1524: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     1525: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") ? Math.max(2.0, 3.25 - 0.0625 * p.turnCounter) : 1;
-        }
+        delay: function(p) { return 1; },
+        atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
+        type: "condition"
     },
     1526: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.slot < 2 ? window.specials[1526].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1526].multiplier === 1.5 ? 1 : 0);
+            window.specials[1526].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1526warning'
+            });
+        }
     },
     1527: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.slot < 2 ? window.specials[1527].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1527].multiplier === 1.5 ? 1 : 0);
+            window.specials[1527].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1527warning'
+            });
+        }
     },
     1528: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            if(p.percHP < 30){
+                window.specials[1528].turnedOn = true;
+            }
+        },
+        onDeactivation: function(p) {
+            window.specials[1528].turnedOn = false;
+        }
     },
     1529: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 3 : 1.5; }  
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1529].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 50 ? 2.25 : 2);
+            window.specials[1529].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
+                name: '1529warning'
+            });
+        }
     },
     1530: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 3.5 : 1.75; }  
+        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1530].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP >= 50 ? 2.25 : 2);
+            window.specials[1530].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
+                name: '1530warning'
+            });
+        }
     },
     1531: {
-        atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
+        delay: function(p) { return 1; },
+        chainAddition: function(p) {return window.specials[1531].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1531].multiplier === 0.2 ? 1 : 0);
+            window.specials[1531].multiplier = [0.2, 0.3][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1531warning'
+            });
+        }
     },
     1532: {
-        atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
-    },
-    1533: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
-        hitAtk: function(p) {
-            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
-    },
-    1534: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
-        hitAtk: function(p) {
-            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        delay: function(p) { return 1; },
+        chainAddition: function(p) {return window.specials[1532].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1532].multiplier === 0.2 ? 1 : 0);
+            window.specials[1532].multiplier = [0.2, 0.3][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1532warning'
+            });
+        }
     },
     1535: {
-        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        type: "type"
     },
     1536: {
-        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
-    },
-    1537: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.2 : 1; }
-    },
-    1538: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        type: "type"
     },
     1539: {
-        atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
+        def: function(p) { return 0.1; }
     },
     1540: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
+        def: function(p) { return 0.1; }
     },
     1541: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'QCK']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }, {
-                type: 'QCK',
-                minModifier: 'Good'
-            }]) ? 2 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        chainAddition: function(p) { return 0.5; },
+        def: function(p) { return 0; }
     },
     1542: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'QCK']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }, {
-                type: 'QCK',
-                minModifier: 'Good'
-            }]) ? 2.5 : 1;
-        },
-        rcv: function(p) { return 1.2; },
-        hp: function(p) { return 1.2; },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        chainAddition: function(p){ return 0.5; },
+        def: function(p) { return 0; }
     },
     1543: {
-        atk: function(p) { return !(p.unit.class.has("Shooter")) ? 1 : p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1544: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     1545: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     1546: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1546].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1546].turnedOn = false;
+        },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
     },
     1547: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1547].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1547].turnedOn = false;
+        },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class"
     },
     1548: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    1549: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
-    },
-    1550: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        delay: function(p) { return 1; },
+        chainAddition: function(p){ return 0.2;}
     },
     1551: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1552: {
-        atk: function(p) { return p.unit.cost === 40 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
+        type: "class"
     },
     1553: {
-        atk: function(p) { return p.unit.cost === 40 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
+        type: "class"
     },
     1554: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
-    },
-    1555: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
-    },
-    1556: {
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    1557: {
-        atk: function(p) {
-            return p.unit.class.has("Striker") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-        }
-    },
-    1558: {
-        atk: function(p) {
-            return p.unit.class.has("Shooter") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-        }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        type: "type"
     },
-    1559: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-        }
+    1555: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        type: "type"
     },
-    1560: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+    1556: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type",
+        warning: "Selected special (%name%) assumes that the enemy has over 3,000,000 HP."
+    },
+    1557: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1557].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1557].turnedOn = false;
         }
     },
     1561: {
-        atk: function(p) {
-            return p.unit.type === "INT" ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class"
     },
     1562: {
-        atk: function(p) {
-            return p.unit.class.has("Powerhouse") ? Math.max(1.5, 3.5 - 0.1 * p.turnCounter) : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     1563: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Fighter", "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.1875 : 1.75;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        chainAddition: function(p) { return 0.3; }
     },
     1564: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Fighter", "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1565: {
-        atk: function(p) { return 1.75; }
-    },
-    1566: {
-        atk: function(p) { return 2; }
+        chainAddition: function(p) { return 0.3; }
     },
     1567: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1568: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
-    },
-    1569: {
-        atk: function(p) { return 2.25; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1570: {
-        atk: function(p) { return !(p.unit.class.has("Cerebral")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.5; },
-        chainModifier: function(p) { return  p.percHP <= 30.0 ? 1.5 : 1; }
+        staticMult: function(p) { return 80; }
     },
     1571: {
-        atk: function(p) { return !(p.unit.class.has("Cerebral")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.5; },
-        chainModifier: function(p) { return  p.percHP <= 30.0 ? 1.5 : 1; }
+        staticMult: function(p) { return 80; }
     },
     1572: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        type: "class"
     },
     1573: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        type: "class"
     },
     1574: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+        delay: function(p) { return 1; }
     },
     1575: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.25 : 1; }
-    },
-    1576: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        delay: function(p) { return 1; }
     },
-    1577: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    1578: {
+        chainAddition: function(p) {return window.specials[1578].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1578].multiplier === 0.2 ? 1 : window.specials[1578].multiplier === 0.3 ? 2 : 0);
+            window.specials[1578].multiplier = [0.2, 0.3, 0.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1578warning'
+            });
+        }
     },
     1579: {
-        atk: function(p) { return 1.3; },
-        rcv: function(p) { return 1.3; },
-        hp: function(p) { return 1.3; }
+        chainAddition: function(p) {return window.specials[1579].multiplier;},
+        onActivation: function(p) {
+            var n = (window.specials[1579].multiplier === 0.2 ? 1 : window.specials[1579].multiplier === 0.3 ? 2 : 0);
+            window.specials[1579].multiplier = [0.2, 0.3, 0.5][n];
+            p.scope.notify({
+                text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
+                name: '1579warning'
+            });
+        }
     },
     1580: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1581: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1582: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
-    },
-    1583: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
-    },
-    1584: {
-        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        type: "class"
+    },
+    1583:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1583].multiplier === 1.5 ? 1 : 0);
+            window.specials[1583].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1583warning'
+            });
+        }
+    },
+    1584:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1584].multiplier === 1.5 ? 1 : 0);
+            window.specials[1584].multiplier = [1.5, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1584warning'
+            });
+        }
     },
     1585: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
+        atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
+        rcv: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
+        type: "class"
     },
     1586: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
+        atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
+        rcv: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
+        type: "class"
     },
     1587: {
-        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
-        hp: function(p) { return 1.3; }
-    },
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
+    },  
     1588: {
-        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
-        hp: function(p) { return 1.3; }
-    },
-    1589: {
-        chainModifier: function(p) { return 3; }
-    },
-    1590: {
-        chainModifier: function(p) { return 3.5; },
-        rcv: function(p) { return 1.2; },
-        hp: function(p) { return 1.2; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1591: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        atk: function(p) {
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
     },
     1592: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+        atk: function(p) {
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        },
+        type: "class"
     },
     1593: {
-        atk: function(p){ 
-            return p.unit.class.has("Fighter") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1593].turnedOn = true;
+            p.scope.notify({
+                text: 'This does not activate G4 Captain boost, only the "beneficial" Orb Effect, to enable G4\' 4x boost, use the Captain Action checkboxes.',
+                name: '1593warning'
+            });
+        },
+        onDeactivation: function(p) {
+            window.specials[1593].turnedOn = false;
         }
     },
-    1595: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    1596: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    1594: {
+        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1597: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.75 : 1; }
+    1595: {
+        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1598: {
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return 1.2; },
+        type: "class"
     },
     1599: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+        def: function(p) { return 0.5; }
     },
     1600: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 2.5 : 1; }
-    },
-    1601: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    1602: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Slasher" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Slasher")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return (p.unit.type === "INT" || p.unit.type === "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1603: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.25 : 1; }
-    },
-    1604: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
-    },
-    1605: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    1606: {//BB Pirates FN Lafitte
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
-    },
-    1607: {//BB Pirates FN Van Augur
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-    },
-    1608: {//BB Pirates FN Doc Q
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
-    },
-    1609: {//Enel TO DO
-        hp: function(p) { return 0.8; },
-        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
-    },
-    1610: {//Enel TO DO
-        hp: function(p) { return 0.8; },
-        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
+        delay: function(p) { return 1; }
     },
-    1611: {
-        atk: function(p) {return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+    1606: {
+        delay: function(p) { return 1; },
+        def: function(p) { return 0.5; }
     },
-    1612: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+    1607: {
+        atk: function(p) { return (p.unit.class.has("Shooter")) ? 1.5 : 1; },
+        type: "class"
     },
     1613: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        def: function(p) { return 0.5; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1614: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; }
+        def: function(p) { return 0.5; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1615: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1616: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1617: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
+        type: "type"
     },
     1618: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
+        type: "type"
     },
     1619: {
-        chainModifier: function(p) { return 4; },
-        hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; }
+        delay: function(p) { return 1; }
     },
     1620: {
-        atk: function(p) { return p.unit.class.has("Striker") && p.percHP <= 30.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        type: "class"
     },
     1621: {
-        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        type: "class"
     },
     1622: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1623: {
-        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    1624: {
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
-    },
-    1625: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1626: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Powerhouse") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        type: "type"
     },
     1627: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1627].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1627].multiplier === 1.25 ? 1 : window.specials[1627].multiplier === 1.5 ? 2 : 0);
+            window.specials[1627].multiplier = [1.25, 1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
+                name: '1627warning'
+            });
+        }
     },
     1628: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-    },
-    1629: {
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1630: {
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1628].multiplier : 1; },
+        onActivation: function(p) {
+            var n = (window.specials[1628].multiplier === 1.25 ? 1 : window.specials[1628].multiplier === 1.5 ? 2 : 0);
+            window.specials[1628].multiplier = [1.25, 1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
+                name: '1628warning'
+            });
+        }
     },
     1631: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     1632: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     1633: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
-    },
-    1634: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    1635: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : p.unit.class.has("Cerebral") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1636: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
     1637: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25: 1; }
-    },
-    1644: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return 1.3; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
-    1645: {
-        atk: function(p) { 
-            return p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.96 :
-                p.unit.class.has("Slasher") && !p.unit.type === "DEX" ? 1.3 :
-                !p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.5 :
-                1;
+    1640: {
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1640].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1640].turnedOn = false;
         }
     },
-    1646: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    1647: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
-    },
-    1648: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.4 : 1.2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    1641: {
+        atk: function(p) { return 1.2; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
-    1649: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1.2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    1643: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
+        type: "class"
     },
     1650: {
-        atk: function(p) { return p.unit.type === "DEX" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1651: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1651].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1651].turnedOn = false;
+        }
     },
     1652: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1652].turnedOn = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1652].turnedOn = false;
+        }
     },
     1653: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1654: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1655: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        type: "type"
     },
     1656: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        type: "type"
     },
     1657: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
+        chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
+        }
     },
     1658: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-    },
-    1659: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
-    },
-    1660: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
+        }
     },
     1661: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
+        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') ? 2.5 : 1;
+        }
     },
     1662: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.5 : 1; }
-    },
-    1663: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.5 : 2.5); },
-        rcv: function(p) { return 0; }
+        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') ? 2.5 : 1;
+        }
     },
     1664: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
+        type: "class"
     },
     1665: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Shooter")) return 1;
-            return p.modifiers.slice(0, p.chainPosition)
-                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
+        type: "class"
+    },
+    1666: {
+        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1666].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP <= 70 ? 1 : 1.5);
+            window.specials[1666].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                name: '1666warning'
+            });
+        }
     },
     1667: {
-        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.25; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1667].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (p.percHP <= 70 ? 1 : 1.5);
+            window.specials[1667].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                name: '1667warning'
+            });
+        }
     },
     1668: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
     },
     1669: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
+        type: "class"
     },
     1670: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
     1671: {
-        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
-    },
-    1672: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1673: {
-        atk: function(p) { return 1.75; }
+        def: function(p) { return 0.1; }
     },
     1674: {
-        atk: function(p) { return 2.25; }
+        def: function(p) { return 0.1; }
     },
     1675: {
-        chainModifier: function(p) { return 2; }
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     1676: {
-        chainModifier: function(p) { return 3.25; }
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     1677: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+        affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1678: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Slasher" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Slasher")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1679: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    1680: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+        affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1681: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+        chainAddition: function(p) { return window.specials[1681].multiplier; },
+        onActivation: function(p) {
+            var n = (p.slot > 1 ? 0.5 : 0);
+            window.specials[1681].multiplier = n;
+            p.scope.notify({
+                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
+                name: '1681warning'
+            });
+        }
     },
     1682: {
-        damageSorter: function(d) { return CrunchUtils.lowCostSort(d, 3.5, 30); },
-        hitAtk: function(p) {
-            if (!(p.unit.cost <= 30)) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
+        chainAddition: function(p) { return window.specials[1682].multiplier; },
+        onActivation: function(p) {
+            var n = (p.slot > 1 ? 0.5 : 0);
+            window.specials[1682].multiplier = n;
+            p.scope.notify({
+                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
+                name: '1682warning'
+            });
+        }
     },
     1683: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
     },
     1684: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
+        type: "condition"
     },
     1685: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Shooter" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Shooter") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        delay: function(p) { return 1; }
     },
     1686: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Shooter") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        delay: function(p) { return 1; }
     },
     1687: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        def: function(p) { return 0; }
     },
     1688: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        def: function(p) { return 0; }
     },
     1689: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }]) ? 2.25 : 1.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1690: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'STR',
-                minModifier: 'Good'
-            }, {
-                type: 'DEX',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }]) ? 3 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        type: "type"
     },
     1691: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
+        type: "condition"
     },
     1692: {
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+        chainAddition: function(p){ return 0.3; },
+        def: function(p) { return 0.5; }
     },
     1693: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1694: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type",
+        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1695: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1696: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
-    },
-    1697: {
-        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 2.25;
-            else
-                return 1; 
-               },
-        hp: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 1.5;
-            else
-                return 1; 
-               }
-    },
-    1698: {
-        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 2.25;
-            else
-                return 1; 
-               },
-        hp: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 1.5;
-            else
-                return 1; 
-               }
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1699: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+        chainAddition: function(p) { return 0.3; }
     },
     1700: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.3 : 1; }
-    },
-    1701: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
-    },
-    1702: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+        chainAddition: function(p) { return 0.3; }
     },
     1703: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return 1.75; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been inflicted with Toxin."
     },
     1704: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
-    },
-    1705: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
-    },
-    1706: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["STR"]); }, 
-        hitAtk: function(p) {
-            return !p.unit.type === "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return 1.75; },
+        type: "condition",
+        warning: "Selected special (%name%) assumes that the enemy has been inflicted with Toxin."
     },
     1707: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
-    },
-    1709: {
-        atk: function(p) { return 1.5; }
+        def: function(p) { return 0; }
     },
     1710: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1711: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1712: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        orb: function(p) { return (p.unit.class.has("Driven")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1713: {
-        atk: function(p) { return p.unit.class.has("Driven") ? Math.min(3.25, 2.5 + 0.25 * p.turnCounter) : 1; }
-    },
-    1714: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
-    },
-    1715: {
-        atk: function(p) { return !p.unit.class.has("Striker") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
+        orb: function(p) { return (p.unit.class.has("Driven")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1716: {
-        atk: function(p) {
-            return p.unit.class.has("Driven") ? Math.min(3, 1.2 + 0.1 * p.turnCounter) : 1;
+        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1716].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.75 : 1);
+            window.specials[1716].multiplier = n;
+            p.scope.notify({
+                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                name: '1716warning'
+            });
         }
     },
     1718: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Driven" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1719: {
-        atk: function(p) { return p.unit.type !== "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.25 : 1; },
+        type: "class"
     },
     1720: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
+        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') ? 2.5 : 1;
+        }
     },
     1721: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2.5); },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
+        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') ? 2.5 : 1;
+        }
     },
     1722: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1722].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1722].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x multiplier.',
+                name: '1722warning'
+            });
+        }
     },
     1723: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1723].multiplier : 1; },
+        type: "type",
+        onActivation: function(p) {
+            var n = (p.percHP <= 30 ? 1.5 : 1);
+            window.specials[1723].multiplier = n;
+            p.scope.notify({
+                text: 'Using the ' + n + 'x multiplier.',
+                name: '1723warning'
+            });
+        }
     },
     1724: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        staticMult: function(p) { return 25; }
     },
     1725: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        staticMult: function(p) { return 25; }
     },
     1726: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+        staticMult: function(p) { return 55; }
     },
     1727: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1728: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
-    },
-    1729: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1; }
-    },
-    1730: {
-        atk: function(p) { return 2; }
-    },
-    1731: {
-        atk: function(p) { return 2; }
+        staticMult: function(p) { return 55; }
     },
     1732: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.1 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
+        type: "class"
     },
     1733: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.25 : 1; }
-    },
-    1734: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
-    },
-    1735: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
+        type: "class"
     },
     1736: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+        delay: function(p) { return 1; }
     },
     1737: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        delay: function(p) { return 1; }
     },
     1738: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1739: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1740: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.1 : 1; }
+        def: function(p) { return .2; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     1741: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.3 : 1; }
+        def: function(p) { return .2; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        type: "class"
     },
     1742: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.1 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
     },
     1743: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.3 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
     },
     1744: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Shooter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1745: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Shooter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1746: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has('Shooter')) return 1;
-            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
+        delay: function(p) { return 1; },
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1746].turnedOn = true;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        onDeactivation: function(p) {
+            window.specials[1746].turnedOn = false;
+        }
     },
     1747: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has('Shooter')) return 1;
-            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
+        delay: function(p) { return 1; },
+        turnedOn: false,
+        onActivation: function(p) {
+            window.specials[1747].turnedOn = true;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1748: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    1749: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        onDeactivation: function(p) {
+            window.specials[1747].turnedOn = false;
+        }
     },
-    1750: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
+    1750:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1750].multiplier === 1.75 ? 1 : 0);
+            window.specials[1750].multiplier = [1.75, 2.25][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1584warning'
+            });
+        }
     },
-    1751: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
+    1751:{
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1751].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        onActivation: function(p) {
+            var n = (window.specials[1751].multiplier === 1.75 ? 1 : 0);
+            window.specials[1751].multiplier = [1.75, 2.25][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
+                name: '1584warning'
+            });
+        }
     },
     1752: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
+        atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1752].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1752].multiplier === 1.75 ? 1 : 0);
+            window.specials[1752].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1752warning'
+            });
+        }
     },
     1753: {
-        damageSorter: function(d) { return CrunchUtils.lowCostSort(d, 3.5, 30); },
-        hitAtk: function(p) {
-            if (!(p.unit.cost <= 30)) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
+        atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1753].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1753].multiplier === 1.75 ? 1 : 0);
+            window.specials[1753].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1753warning'
+            });
+        }
     },
     1754: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1755: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1758: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.1 : 1; }
+        delay: function(p) { return 1; }
     },
     1759: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
-    },
-    1760: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
-    },
-    1761: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1762: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4.026275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.66025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.3275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 3.025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.75 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-        rcv: function(p) { return 0.5; }
+        def: function(p) { return .2; }
     },
     1763: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4.026275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.66025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.3275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 3.025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.75 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-        rcv: function(p) { return 0.5; }
+        def: function(p) { return .2; }
     },
     1764: {
-        atk: function(p) {
-            return Math.min(3.5, 2.25 + 0.25 * p.turnCounter);
-        },
-        hp: function(p) { return 1.25; }
+        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') ? 2.5 : 1;
+        }
     },
     1765: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        def: function(p) { return .5; }
     },
     1766: {
-        chainModifier: function(p) { return 1.5; },
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        def: function(p) { return .5; }
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
-    },
-    1767: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     1769: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+        delay: function(p) { return 1; },
+        atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
+        type: "condition"
     },
     1770: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
-        hitAtk: function(p) {
-            return !p.unit.class.has("Cerebral") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 2.5;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        delay: function(p) { return 1; },
+        atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
+        type: "condition"
     },
     1771: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1772: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1773: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1774: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.25 : 1; }
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
-    1775: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
-    },
-    1776: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; }
+    1777: {
+        chainAddition: function(p){ return 0.2;}
     },
     1778: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+        chainAddition: function(p){ return 0.2;}
     },
     1779: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        chainAddition: function(p) {return 0.5;}
     },
     1780: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
-    },
-    1781: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+        chainAddition: function(p){ return 0.5;}
     },
     1782: {
-        atk: function(p) { return p.unit.type === "2.25" ? 1.75 : 1; }
+        delay: function(p) { return 1; }
     },
     1783: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1784: {
-        atk: function(p) { return p.unit.stars <= 4 ? 2.5 : 1; }
+        atk: function(p) { return 1.5; },
+        type: "type"
+    },
+    1785: {
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     1791: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, [ "QCK", "STR", "DEX" ]); }, 
-        hitAtk: function(p) {
-            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1792: {
-        damageSorter: function(d) { return CrunchUtils.typeSort(d, 3.25, [ "QCK", "STR", "DEX" ]); }, 
-        hitAtk: function(p) {
-            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1793: {
-        atk: function(p) { 
-            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
-                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
-                    return 3.7125;
-                else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
-                    return 2.75;
-                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
-                    return 1.35;
-                else
-                    return 1; 
-                }
-                else
-                    return 1;
-        },
-        hp: function(p) { 
-            if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 1.3;
-            else
-                return 1; 
-               }
+        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1793].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1793].multiplier === 1.75 ? 1 : 0);
+            window.specials[1793].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1793warning'
+            });
+        }
     },
     1794: {
-        atk: function(p) { 
-            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
-                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
-                    return 3.7125;
-                else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
-                    return 2.75;
-                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
-                    return 1.35;
-                else
-                    return 1; 
-                }
-                else
-                    return 1;
-        },
-        hp: function(p) { 
-            if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
-                return 1.3;
-            else
-                return 1; 
-               }
+        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1794].multiplier; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1794].multiplier === 1.75 ? 1 : 0);
+            window.specials[1794].multiplier = [1.75, 2][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
+                name: '1794warning'
+            });
+        }
     },
     1795: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; }
+        delay: function(p) { return 1; }
     },
     1796: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2.5 : 1; }
+        delay: function(p) { return 1; }
     },
     1797: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
+        type: "condition"
     },
     1798: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Driven") ? 1.25 : 1; }
+        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
+        type: "condition"
     },
     1799: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.25 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
     },
     1800: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; },
-        rcv: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1.2 : 1; }
+        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
+        type: "condition"
     },
     1801: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2 : 1; }
+        def: function(p) { return 0.1; }
     },
     1802: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; }
-    },
-    1803: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
-    },
-    1804: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; }
+        def: function(p) { return 0.1; }
     },
     1805: {
-        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+		def: function(p) { return 0.0; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1806: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+		def: function(p) { return 0.0; },
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1807: {
-        atk: function(p){ 
-            var specialEnabled = false;
-            for(var i=0;i<2;i++)
-            {
-                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
-            }
-            return p.unit.class.has("Slasher") ? specialEnabled ? 1.35 : 1 : 1; 
-        }
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1807].turnedOn[p.slot] = true;
+        },
+        onDeactivation: function(p) {
+            window.specials[1807].turnedOn[p.slot] = false;
+        },
+        chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
+        },
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1808: {
-        atk: function(p){ 
-            var specialEnabled = false;
-            for(var i=0;i<2;i++)
-            {
-                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
-            }
-            if(p.unit.class.has("Slasher")){
-                if(p.actions[p.sourceSlot]){
-                    if (specialEnabled){
-                        return 3.5;
-                    } else {
-                        return 2.5;
-                    }
-                } else {
-                    if (specialEnabled){
-                        return 1.62;
-                    } else {
-                        return 1.2;
-                    }
-                }
-            }else{
-                return 1;
-            }
+        turnedOn: [ false, false ],
+        onActivation: function(p) {
+            window.specials[1808].turnedOn[p.slot] = true;
         },
-        hp: function(p) { return p.actions[p.sourceSlot] ? 1.3 : 1.1; }
-    },
-    1809: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
+        onDeactivation: function(p) {
+            window.specials[1808].turnedOn[p.slot] = false;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1810: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
+        chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
+        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') ? 2.75 : 1;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
     },
     1811: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     1812: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        type: "class"
     },
     1813: {
-        atk: function(p) { return 2.25; }
+        atk: function(p) { return p.slot === 1 ? 1.5 : 1; },
+        type: "class"
     },
     1814: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        type: "class"
     },
     1815: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        type: "class"
     },
     1816: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.25 : 2.25); },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        type: "class"
     },
     1817: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2 : 1;
-        },
-        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
+        type: "class"
     },
     1818: {
-        hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;
-        },
-        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.2; }
+        atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
+        type: "class"
     },
     1819: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
-    },
-    1820: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
-    },
-    1821: {
-        atk: function(p) { return 1.5; }
-    },
-    1822: {
-        atk: function(p) { return 2; }
-    },
-    1823: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Shooter")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
-    },
-    1824: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Shooter")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        type: "type"
     },
     1825: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }]) ? 2.5 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
     },
     1826: {
-        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
-        hitAtk: function(p) {
-            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }, {
-                type: 'INT',
-                minModifier: 'Good'
-            }]) ? 3 : 1;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
     },
     1827: {
-        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        type: "type"
     },
     1828: {
-        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        type: "type"
     },
     1829: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1; }
+        orb: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1830: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.5 : 1; }
+        orb: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1831: {
-        atk: function(p) { 
-            if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
-            }
-            else
-                return 1; 
-        },
-        hp: function(p) { return 1.25; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1832: {
-        atk: function(p) { 
-            if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
-            }
-            else
-                return 1; 
-        },
-        hp: function(p) { return 1.25; }
-    },
-    1833: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.2 :
-                1;
-        },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.1 : 1; }
-    },
-    1834: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.3 :
-                1;
-        },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1835: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.2 :
-                1;
+        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
+        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') ? 2.5 : 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
     },
     1836: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.3 :
-                1;
+        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
+        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') ? 2.5 : 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
     },
     1837: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.2 :
-                1;
-        },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
+        type: "class"
     },
     1838: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.3 :
-                1;
-        },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
+        type: "class"
     },
     1839: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.2 :
-                1;
-        },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
+        type: "condition",
+        staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
     1840: {
-        atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.3 :
-                1;
-        },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
+        type: "condition",
+        staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
     1841: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     1842: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
-    },
-    1843: {
-        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.5 : 1; }
-    },
-    1844: {
-        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        type: "class"
     },
     1845: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        def: function(p) { return 0; }
     },
     1846: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.75 : 1; }
+        def: function(p) { return 0; }
     },
     1847: {
-        atk: function(p) {  
-    
-            if(p.unit.cost <= 29){
-                return 3.25;
-            }else if(p.unit.cost === 54){
-                return 3;
-            }else{
-                return 1;
-            }
-        },
-        hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; }
-    },
-    1848: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
-    },
-    1849: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; }
+        atk: function(p) { return 1.5; },
+        type: "type"
     },
     1850: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        chainAddition: function(p) { return 0.5; }
     },
     1851: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; }
+        chainAddition: function(p) { return 0.5; }
     },
     1853: {
-        atk: function(p) {
-            return (1 + 1.25 * ((100 - p.percHP) / 100));
-        },
-        hp: function(p) { return 1.2; }
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        type: "type",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
-    1854: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    1853: {
+        atk: function(p) { return window.specials[1853].multiplier; },
+        type: "type",
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); },
+        stage: -1,
+        onActivation: function(p) {
+            var n = (window.specials[1853].multiplier === 1 ? 1 : 0);
+            window.specials[1853].multiplier = [1, 1.5][n];
+            if(1853){
+            p.scope.notify({
+                text: 'Using only Orb Boost. To switch to the ATK and Orb boost, disable and re-enable this special',
+                name: '1853warning'
+            });
+        }else{
+           p.scope.notify({
+                text: 'Using ATK and Orb Boost. To switch to the Orb boost, disable and re-enable this special',
+                name: '1853warning'
+            }); 
+        }
+        }
     },
     1855: {
-        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Free Spirit" ]); },
-        hitAtk: function(p) {
-            if (!p.unit.class.has("Free Spirit")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1856: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        affinity: function(p){ return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1857: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        affinity: function(p){ return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1858: {
-        hitAtk: function(p) {
-            if (!(p.unit.class.has("Striker"))) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        staticMult: function(p) { return 65; }
     },
     1859: {
-        hitAtk: function(p) {
-            if (!(p.unit.class.has("Striker"))) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
-        },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+        staticMult: function(p) { return 65; }
     },
     1861: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        atk: function(p) { return (p.delayed > 0 && (p.captain.class.has("Shooter"))) ? 1.75 : 1; },
+        type: "condition"
     },
-    1863: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-    },
-    1865: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
-    },
-    1867: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        chainModifier: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+    1865: {//Urouge FN
+        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1865].multiplier : 1; },
+        type: "class",
+        onActivation: function(p) {
+            var n = (window.specials[1865].multiplier === 1.5 ? 1 : 0);
+            window.specials[1865].multiplier = [1.5, 1.75][n];
+            p.scope.notify({
+                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
+                name: '1865warning'
+            });
+        }
     },
     1869: {
-        hitAtk: function(p) {
-            if (!(p.unit.class.has("Slasher"))) return 1;
-            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4.225 : 3.25;
-        },
-        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
-    },
-    1871: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+        delay: function(p) { return 1; }
     },
     1873: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        type: "class"
     },
-    1877: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    1875: {
+        chainAddition: function(p) {return 0.5;}
     },
     2000: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; }
+        atk: function(p) { return 1.75; },
+        type: "class"
     },
     2001: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2.5 : 1; }
+        atk: function(p) { return 1.75; },
+        type: "class"
     }
 };

From 9cf87e3e337e036b4a87f3f91c0b175bfc573008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ravent=C3=B3s?= <janraven55@gmail.com>
Date: Tue, 21 Nov 2017 15:33:06 +0100
Subject: [PATCH 1564/1569] That didn't belong here

---
 common/data/details.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/data/details.js b/common/data/details.js
index b7a3457a9..72d0b121d 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13833,7 +13833,6 @@ window.details = {
         captainNotes: "#{captainProportional : lower : 1 + 1.25 (1.35, 1.45, 1.55, 1.65, 1.75, & 2.25 respectively) * (1 - (remaining HP) / (total HP)) : 1 : 2.25(2.35, 2.45, 2.55, 2.65, 2.75, & 3.25 respectively)}",
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special",
-        sailor: "Limit Broken: +100HP +50ATK to all characters",
         limit: [
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base ATK by 10" },

From 8d9f0ca8f2a9c0ef6627d5ed9c1458bf18b86d66 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:39:46 -0500
Subject: [PATCH 1565/1569] Commas

---
 common/data/effects.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/data/effects.js b/common/data/effects.js
index d7a9085a8..53213a06e 100644
--- a/common/data/effects.js
+++ b/common/data/effects.js
@@ -545,6 +545,7 @@ window.effects = {
                     [ 1720, 1621, 1631, 1632, 1777, 1778, 1833, 1834, 871, 872, 1695, 1696, 1791, 1792, 1431, 1432 ].indexOf(id) !== -1);
             return !matching ? 1 : 1.75;
         }
+    },
     
     'Kizaru Neo [GLOBAL] - Free Spirit': {
         description: 'Chain multiplier reduced.',

From 2c71cec84f8193fa3059e42837cb4b5dc57e4982 Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:46:43 -0500
Subject: [PATCH 1566/1569] Revert "New Batch"

This reverts commit bf70b09c2326ee7d2fe8c9bbf7ad9cf4ec069850.
---
 common/data/captains.js | 6851 +++++++++++++++++++++++++--------------
 1 file changed, 4447 insertions(+), 2404 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index c5dc1d4d7..3c4135e40 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -1,3884 +1,5927 @@
-window.specials = {
+window.captains = {
+    2: {
+        atk: function(p) { return 1.5; }
+    },
+    3: {
+        atk: function(p) { return 1.5; }
+    },
+    4: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1.5; }
+    },
+    5: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    6: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    7: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    8: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    10: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    11: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    12: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
     13: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     14: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     15: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     16: {
-        delay: function(p) { return 2; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    17: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     18: {
-        def: function(p) { return 0.5; }
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    19: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    20: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    21: {
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+    },
+    22: {
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    23: {
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     24: {
-        def: function(p) { return 0.5; }
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    25: {
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    26: {
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    27: {
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+    },
+    28: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
+    35: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+    },
+    36: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    37: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    38: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    39: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    41: {
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+    },
+    42: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
     },
-    34: {
-        def: function(p) { return 0; }
+    45: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
-    127: {
-        def: function(p) { return 0.5; }
+    46: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
-    137: {
-        def: function(p) { return 0.5; }
+    49: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
-    148: {
-        def: function(p) { return 0.5; }
+    52: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
-    158: {
-        def: function(p) { return 0.5; }
+    59: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
-    204: {
-        delay: function(p) { return 1; }
+    60: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    61: {
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    62: {
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    65: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    66: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    67: {
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    68: {
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    74: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    75: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1; }
+    },
+    76: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    77: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+    },
+    194: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    195: {
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    196: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    198: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    199: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    200: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    201: {
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    202: {
+        hp: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    205: {
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     206: {
-        def: function(p) { return 0.5; }
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     209: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        type: "type"
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     210: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        type: "type"
+        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    211: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    212: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    215: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    217: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    220: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    221: {
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     222: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
     223: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    224: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    225: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    226: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    227: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+    },
+    228: {
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    230: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    231: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    232: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    233: {
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    234: {
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    235: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
+    236: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    248: {
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
+    },
+    249: {
+        atk: function(p) { return p.unit.type === "STR" ? 3 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
+    },
+    250: {
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    251: {
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    252: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    253: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    254: {
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    255: {
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    256: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    257: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    258: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    259: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    260: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
+    },
+    261: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
     },
     263: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    265: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     267: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 1.5; },
+        rcv: function(p) { return 1.5; }
+    },
+    290: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
-    275: {
-        def: function(p) { return 0.5; }
+    293: {
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
-    285: {
-        def: function(p) { return 0.5; }
+    294: {
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     295: {
-        def: function(p) { return 0.5; }
+        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    296: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    297: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
-    309: {
-        def: function(p) { return 0.5; }
+    298: {
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
-    310: {
-        def: function(p) { return 0.5; }
+    299: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    305: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    306: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    307: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+    },
+    308: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+    },
+    311: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
+    },
+    312: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
     },
     313: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     314: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    315: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    316: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    319: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    320: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    321: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    322: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     323: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     324: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    328: {
+        rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
+    },
+    329: {
+        rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
+    },
+    332: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    333: {
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    336: {
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2 : 0.8); }
+    },
+    337: {
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2.5 : 0.8); }
+    },
+    340: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    341: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     352: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     353: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
+    356: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    357: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+    },
+    358: {
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    359: {
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    360: {
+        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    361: {
+        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    362: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    363: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    364: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    365: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    366: {
+        chainModifier: function(p) { return 4; }
+    },
+    367: {
+        chainModifier: function(p) { return 4; }
+    },
+    373: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
-    382: {
-        def: function(p) { return 0.5; }
+    374: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    375: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    376: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    377: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    378: {
+        rcv: function(p) { return 1.5; }
+    },
+    380: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    383: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    384: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     385: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     386: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    387: {
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    388: {
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    389: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    390: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     391: {
-        def: function(p) { return 0.2; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     392: {
-        def: function(p) { return 0.2; }
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     395: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     396: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    397: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    398: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     399: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        type: "type"
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     400: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        type: "type"
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     401: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     402: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    403: {
+        rcv: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
     },
     404: {
-        rcv: function(p) { return 2; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     405: {
-        rcv: function(p) { return 2; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
-    406: {
-        atk: function(p) { return 1.2; },
-        type: "type"
+    408: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    409: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    410: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+    },
+    411: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    412: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    413: {
+        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    414: {
+        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 3 : 1; }
     },
     415: {
-        delay: function(p) { return 1; }
+        atk: function(p) {
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        },
+        rcv: function(p) {
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+        }
     },
     416: {
-        delay: function(p) { return 1; }
+        atk: function(p) {
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        },
+        rcv: function(p) {
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+        }
     },
     417: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     418: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     419: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
-    423: {
-        def: function(p) { return 0.5; }
+    420: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    421: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    422: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     424: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.percHP >= 70.0 ? 1.5 : 1; }
+    },
+    425: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     426: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.05 : 1; },
-        type: "type"
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    427: {
+        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
-    429: {
-        def: function(p) { return 0.5; }
+    428: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     430: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     431: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    433: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'STR', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'QCK',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     434: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['PSY', 'INT', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'PSY',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    435: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'PSY', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'PSY',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    437: {
+        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    438: {
+        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 5 : 1; }
+    },
+    444: {
+        atk: function(p) {
+            return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2 : 1;
+        }
+    },
+    445: {
+        atk: function(p) {
+            return p.percHP >= 50.0 && (p.unit.class.has("Booster") || p.unit.class.has("Evolver")) ? 2.5 : 1;
+        }
+    },
+    446: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    447: {
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
+    },
+    448: {
+        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+    },
+    449: {
+        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
     },
     450: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     451: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    452: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    453: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     454: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     455: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    456: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    457: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     458: {
-        atk: function(p) { return 1.5; },
-        type: "type"
+        atk: function(p) { return p.unit.cost <= 20 ? 3 : 1; }
     },
     459: {
-        atk: function(p) { return 1.5; },
-        type: "type"
-    },
-    460: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.number === 458 || p.unit.cost <= 20 ? 3 : 1; }
     },
     461: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     462: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    463: {
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    464: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     465: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good", "Below Good"]) ? 3 : 1;
+        },
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Below Good", "Perfect", "Perfect"]
     },
     466: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
-    468: {
-        rcv: function(p) { return 1.5; }
+    467: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     470: {
-        rcv: function(p) { return 1.5; }
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
-    487: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        type: "type"
+    471: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+    },
+    482: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
-    488: {
+    483: {
         atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        type: "type"
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
-    489: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        type: "type"
+    485: {
+        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+    },
+    486: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     490: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     491: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        type: "type"
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     492: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    496: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    497: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    498: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     499: {
-        delay: function(p) { return 1; }
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     500: {
-        delay: function(p) { return 1; }
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
-    505: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
-        type: "type"
+    501: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+    },
+    502: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
-    506: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
-        type: "type"
+    503: {
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    504: {
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    507: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
+    },
+    508: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     509: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     510: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     511: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    513: {
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
     },
     514: {
-        def: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    515: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    516: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     517: {
-        atk: function(p) { return 1.05; },
-        type: "type"
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     518: {
-        atk: function(p) { return 1.05; },
-        type: "type"
+        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     519: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     520: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+    },
+    523: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    524: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    525: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    526: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    527: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    528: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     529: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
     },
     530: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
     },
     533: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     534: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    535: {
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    536: {
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    537: {
+        chainModifier: function(p) { return 2; }
+    },
+    538: {
+        chainModifier: function(p) { return 2; }
+    },
+    541: {
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
     },
     542: {
-        rcv: function(p) { return 2; }
+        hp: function(p) { return 1.5; }
+    },
+    543: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
+    },
+    544: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
     },
     545: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     546: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    548: {
+        atk: function(p) { return 1.2; }
     },
     549: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     550: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    552: {
-        def: function(p) { return 0; }
+    553: {
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+    },
+    554: {
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
     },
     555: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     556: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    557: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    558: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     559: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     560: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
+    },
+    561: {
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    562: {
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     568: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.5; }
+        atk: function(p) { return 1.25; },
+        hp: function(p) { return 1.25; },
+        rcv: function(p) { return 1.25; }
     },
     569: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.5; }
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 1.5; },
+        rcv: function(p) { return 1.5; }
+    },
+    570: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
+                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
+                1;
+        }
+    },
+    571: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
+                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
+                1;
+        }
     },
     572: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
-        type: "class",
-        onActivation: function(p) { p.tdata.lock = Math.max(1, p.tdata.lock); },
-        onDeactivation: function(p) { if (p.tdata.lock === 1) p.tdata.lock = 0; }
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    573: {
+        rcv: function(p) { return 1.2; }
     },
     574: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     575: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     576: {
-        rcv: function(p) { return 1.5; }
+        atk: function(p) { return 1.5; },
+        rcv: function(p) { return 1.2; }
+    },
+    577: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    578: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    579: {
+        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 1.5 : 1; }
+    },
+    580: {
+        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 2 : 1; }
+    },
+    581: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     582: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     583: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 300: 0; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    584: {
+        atk: function(p) { return 0.1; },
+        hp: function(p) { return 0.1; },
+        rcv: function(p) { return 0.1; }
+    },
+    585: {
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    586: {
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     589: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
     },
     590: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return 1.5; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
     },
     596: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     597: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
+    },
+    598: {
+        atk: function(p) { return p.unit.stars < 3 ? 2.5 : 1; }
+    },
+    599: {
+        atk: function(p) { return p.unit.stars < 3 ? 3 : 1; }
     },
     600: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     601: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     602: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     603: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
+    },
+    604: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    605: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    606: {
+        atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    607: {
+        atk: function(p) { return p.percHP >= 50.0 && p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     612: {
-        atkStatic: function(p) { return 45; },
-        rcvStatic: function(p) { return 45; },
-        type: "type"
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     613: {
-        atkStatic: function(p) { return 45; },
-        rcvStatic: function(p) { return 45; },
-        type: "type"
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     614: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.cost <= 20 && p.percHP <= 30.0 ? 2.25 : 1; }
     },
-    617: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
-        type: "class"
+    629: {
+        atk: function(p) { return p.unit.stars <= 3 ? 2 : 1; }
     },
-    622: {
-        rcvStatic: function(p) { return 100; },
-        type: "type"
+    630: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    631: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     632: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     633: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     634: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; }
     },
     635: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    636: {
+        atk: function(p) { return p.unit.cost <= 2 ? 3 : 1; }
     },
     637: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    638: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    639: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    640: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    641: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     642: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     643: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 3 : 1; }
     },
     644: {
-        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     645: {
-        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+    },
+    646: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    647: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.75 : 1; }
     },
     648: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) {
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        }
     },
     649: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) {
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+        }
     },
     650: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     651: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    652: {
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
+    },
+    653: {
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1); }
+    },
+    654: {
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1); }
     },
     655: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     656: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    657: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    658: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    659: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     660: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     661: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    662: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     665: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return 1.2; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
     },
     666: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return 1.75; },
+        hp: function(p) { return 0.2; },
+        rcv: function(p) { return 0.2; }
+    },
+    667: {
+        atk: function(p) { return 1.75; }
     },
     668: {
-        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[668].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[668].multiplier === 1.5 ? 1 : 0);
-            window.specials[668].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '668warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
     },
     669: {
-        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[669].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[669].multiplier === 1.5 ? 1 : 0);
-            window.specials[669].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '669warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 + 0.75 * p.percHP / 100 : 1; },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
     },
     670: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     671: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    672: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
-    680: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
-        type: "type"
+    673: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    674: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    675: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    676: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    677: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    678: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+    },
+    679: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     681: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    683: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    684: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     686: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     687: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     688: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     689: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
     690: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    696: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
+    697: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+    },
+    698: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
+    },
+    699: {
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 500 : 0; }
+    },
+    700: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    },
+    701: {
+        hp: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
+    },
+    702: {
+        hp: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+    },
+    705: {
+        atk: function(p) {
+            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
+        },
+        hp: function(p) {
+            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
+        }
+    },
+    706: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    707: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    708: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+    },
+    709: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     710: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     711: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     712: {
-        atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2 : 1; }
     },
     713: {
-        atk: function(p) { return p.slot < 2 ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") && p.percHP >= 50 ? 2.5 : 1; }
     },
     715: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class"
+        rcv: function(p) { return p.percHP <= 30 ? 3 : 1; }
     },
     716: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class"
+        rcv: function(p) { return p.percHP <= 30 ? 5 : 1; }
+    },
+    717: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Slasher')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    718: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Slasher')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     719: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[719].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 2 : 1.5);
-            window.specials[719].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-                name: '719warning'
-            });
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
         }
     },
     720: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? window.specials[720].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 2 : 1.5);
-            window.specials[720].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-                name: '720warning'
-            });
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") ? 1.5 + 1.75 * ((100 - p.percHP) / 100) : 1;
         }
     },
+    721: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 1.5 : 1; }
+    },
+    722: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    723: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    724: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
+    },
     727: {
-        def: function(p) { return 0.5; }
+        atk: function(p) {
+            return p.unit.class.has("Free Spirit") || p.unit.class.has("Fighter") ? 1.75 : 1;
+        }
+    },
+    728: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     730: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     731: {
         atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        type: "type"
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     732: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     733: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
-    740: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+    734: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
     },
-    741: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+    735: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    736: {
+        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP >= 50.0 ? 2.5 : 1; }
+    },
+    737: {
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.75 : 1; }
+    },
+    738: {
+        atk: function(p) { return p.unit.cost >= 21 ? 2 : 1; }
+    },
+    739: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     742: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     743: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    744: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    745: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    747: {
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
+        rcv: function(p) { return 0; }
+    },
+    748: {
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
+        rcv: function(p) { return 0; }
+    },
+    749: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    750: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    751: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    752: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     753: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     754: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     755: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     756: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    757: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    758: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    759: {
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    760: {
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 3 : 1; }
     },
     761: {
-        atk: function(p) { return 1.2; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     762: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    763: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    764: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     766: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    767: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    768: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    769: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     770: {
-        atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     771: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+    },
+    772: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    774: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    775: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    776: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
+    },
+    777: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     780: {
-        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[780].multiplier : 1; },
-        type: "type",
-        onActivation: function(p) {
-            var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
-            window.specials[780].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x Self Attack boost.',
-                name: '780warning'
-            });
-        }
+        atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
     },
     781: {
-        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[781].multiplier : 1; },
-        type: "type",
-        onActivation: function(p) {
-            var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
-            window.specials[781].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x Self Attack boost.',
-                name: '781warning'
-            });
-        }
+        atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
     },
     782: {
-        delay: function(p) { return 1; }
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     783: {
-        delay: function(p) { return 1; }
-    },
-    786: {
-        delay: function(p) { return 1; }
-    },
-    787: {
-        delay: function(p) { return 1; }
-    },
-    788: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     789: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-        type: "class"
-    },
-    790: {
-        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     791: {
-        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.2 : 1; },
-        type: "type"
+        atk: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
+        hp: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; },
+        rcv: function(p) { return /STR|DEX|QCK/.test(p.unit.type) ? 1.25 : 1; }
+    },
+    793: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     794: {
-        delay: function(p) { return 1; }
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
     },
     795: {
-        delay: function(p) { return 1; }
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
+        }
     },
     796: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     797: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     798: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        type: "class"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    801: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    802: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     803: {
-        atk: function(p) { return 1.1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     804: {
-        atk: function(p) { return 1.1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     805: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     806: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     807: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     808: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     809: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
-        def: function(p) { return 0.2; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     810: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
-        def: function(p) { return 0.2; }
-    },
-    813: {
-        delay: function(p) { return 1; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
-    },
-    822: {
-        rcvStatic: function(p) { return 100; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    815: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    816: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'INT', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     825: {
-        atkStatic: function(p) { return 200; },
-        type: "type"
+        atk: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; }
     },
     826: {
-        delay: function(p) { return 1; },
-        atk: function(p) { return 0.2; },
-        type: "type"
+        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
     },
     827: {
-        atk: function(p) { return 1.05; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
-    },
-    828: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[828].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP < 20 ? 1.75 : 1);
-            window.specials[828].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
-                name: '828warning'
-            });
-        }  
-    },
-    829: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? window.specials[829].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP < 20 ? 1.75 : 1);
-            window.specials[829].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
-                name: '829warning'
-            });
+        atk: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; }
+    },
+    830: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.75 : 1;
+        }
+    },
+    831: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 2 : 1;
         }
     },
     832: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Free Spirit") ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+        }
     },
     833: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Free Spirit") ? 1 + 1.75 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
+    834: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     835: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     836: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     837: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     838: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     839: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     840: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
-    },
-    841: {
-        delay: function(p) { return 1; },
-        atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
-        type: "condition"
-    },
-    842: {
-        delay: function(p) { return 1; },
-        atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
     843: {
         atk: function(p) {
-            if (window.specials[843].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
-        },
-        type: "class",
-        onActivation: function(p) {
-            window.specials[843].first = !window.specials[843].first;
-            p.scope.notify({
-                text: (window.specials[843].first ?
-                    'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
-                    'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
-                name: '843warning'
-            });
+            return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
         }
     },
     844: {
         atk: function(p) {
-            if (window.specials[844].first) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            else return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1;
-        },
-        type: "class",
-        onActivation: function(p) {
-            window.specials[844].first = !window.specials[844].first;
-            p.scope.notify({
-                text: (window.specials[844].first ?
-                    'Boosting Shooters. To switch to the second multiplier, disable and re-enable this special' :
-                    'Boosting Shooters, Slashers and Strikers. To switch to the first multiplier, disable and re-enable this special'),
-                name: '844warning'
-            });
+            return p.unit.class.has("Shooter") || p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 2 : 1;
+        }
+    },
+    845: {
+        hit: function(n) {
+            return n > 22 ? 2.5 :
+                n > 11 ? 1.5 : 1;
+        }
+    },
+    846: {
+        hit: function(n) {
+            return n > 40 ? 3.5 :
+                n > 30 ? 2.75 :
+                n > 22 ? 2.5 :
+                n > 11 ? 1.5 : 1;
         }
     },
     847: {
-        atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15, [p.friendCaptain, p.captain]); },
-        type: "class"
+        atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
     },
     848: {
-        atk: function(p) { return 1.05; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.15, [p.friendCaptain, p.captain]); },
-        type: "class"
+        atk: function(p) { return p.percHP <= 30.0 ? 1.5 : 1; }
     },
     849: {
-        def: function() { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
+    },
+    850: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
+        }
+    },
+    851: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    852: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    854: {
+        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
     },
-    853: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; },
-        type: "class"
+    855: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    856: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
     857: {
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
     },
     858: {
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
+    },
+    859: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
-    861: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    860: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     862: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === 'QCK' ? 2 : 1; }
     },
     863: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.type === 'QCK' ? 1.75 : 1; }
     },
     864: {
-        delay: function(p) { return 1; },
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     865: {
-        delay: function(p) { return 1; },
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     866: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1;
-        },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     867: {
-        delay: function(p) { return 1; }
+        hit: function(n) { return n > 11 ? 1.5 : 1; }
+    },
+    868: {
+        atk: function(p) { return 1.2; }
     },
     869: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     870: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    871: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    872: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
     873: {
-        orb: function(p) {
-            if (window.specials[873].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
-            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
-        },
-        type: "class",
-        onActivation: function(p) {
-            window.specials[873].first = !window.specials[873].first;
-            p.scope.notify({
-                text: (window.specials[873].first ?
-                    'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
-                    'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
-                name: '873warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     874: {
-        orb: function(p) {
-            if (window.specials[874].first) return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]);
-            else return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]);
-        },
-        type: "class",
-        onActivation: function(p) {
-            window.specials[874].first = !window.specials[874].first;
-            p.scope.notify({
-                text: (window.specials[874].first ?
-                    'Activating the first stage. To switch to the second stage, disable and re-enable this special' :
-                    'Activating the second stage. To switch to the first stage, disable and re-enable this special'),
-                name: '874warning'
-            });
+        atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    875: {
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
         }
     },
-    881: {
+    876: {
         atk: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.25 : 1;
+        }
+    },
+    878: {
+        atk: function(p) { return 1.5; }
+    },
+    879: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    },
+    880: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    881: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Shooter", "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2 : 1;
         },
-        rcv: function(p) { return 0.1; },
-        type: "class"
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     882: {
-        atk: function(p) {
-            return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter", "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
         },
-        rcv: function(p) { return 0.1; },
-        type: "class"
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     883: {
-        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[883].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[883].multiplier === 1.5 ? 1 : 0);
-            window.specials[883].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '883warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     884: {
-        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[884].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[884].multiplier === 1.5 ? 1 : 0);
-            window.specials[884].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '884warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     885: {
-        atk: function(p) { return p.unit.class.has('Fighter') ? window.specials[885].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.5 : 1);
-            window.specials[885].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x ATK boost.',
-                name: '885warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     886: {
-        atk: function(p) { return p.unit.class.has('Slasher') ? window.specials[886].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.5 : 1);
-            window.specials[886].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x ATK boost.',
-                name: '886warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     887: {
-        def: function(p) { return 0.2; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    889: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+    },
+    890: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     891: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
-    902: {
-        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[902].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[902].multiplier === 1.5 ? 1 : 0);
-            window.specials[902].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '902warning'
-            });
-        }
+    892: {
+        chainModifier: function(p) { return 2; }
     },
-    903: {
-        atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[903].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[903].multiplier === 1.5 ? 1 : 0);
-            window.specials[903].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '902warning'
-            });
-        }
+    893: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    894: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Good", "Great", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    904: {
-        delay: function(p) { return 1; }
+    895: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
-    905: {
+    896: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    897: {
+        atk: function(p) {
+            return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1;
+        }
+    },
+    898: {
         atk: function(p) {
-            if (!window.specials[905].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
-            if (window.specials[905].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-            if (window.specials[905].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
         },
-        type: "class",
-        stage: -1,
-        onActivation: function(p) {
-            window.specials[905].stage = (window.specials[905].stage + 1) % 3;
-            p.scope.notify({
-                text: 'Activating stage #' + (window.specials[905].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-                name: '905warning'
-            });
+        hp: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Cerebral") ? 1.5 : 1;
         }
     },
-    906: {
+    899: {
         atk: function(p) {
-            if (!window.specials[906].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
-            if (window.specials[906].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-            if (window.specials[906].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
         },
-        type: "class",
-        stage: -1,
-        onActivation: function(p) {
-            window.specials[906].stage = (window.specials[906].stage + 1) % 3;
-            p.scope.notify({
-                text: 'Activating stage #' + (window.specials[906].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-                name: '906warning'
-            });
+        hp: function(p) {
+            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1;
         }
     },
+    900: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    901: {
+        atk: function(p) { return p.unit.class.has("Shooter") && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
+    902: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    903: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    905: {
+        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.5 : 1; }
+    },
+    906: {
+        atk: function(p) { return p.unit.class.has("Slasher") && p.percHP <= 30 ? 2.75 : 1; }
+    },
     907: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.5 : 1; }
     },
     908: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
     },
     909: {
         atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        type: "type"
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     910: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     911: {
-        atk: function(p) {
-            if (!window.specials[911].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-            if (window.specials[911].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
-        },
-        type: "class",
-        stage: -1,
-        onActivation: function(p) {
-            window.specials[911].stage = (window.specials[911].stage + 1) % 2;
-            p.scope.notify({
-                text: 'Activating stage #' + (window.specials[911].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-                name: '911warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     912: {
-        atk: function(p) {
-            if (!window.specials[912].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-            if (window.specials[912].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
-        },
-        type: "class",
-        stage: -1,
-        onActivation: function(p) {
-            window.specials[912].stage = (window.specials[912].stage + 1) % 2;
-            p.scope.notify({
-                text: 'Activating stage #' + (window.specials[912].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-                name: '912warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    913: {
+        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
+    },
+    914: {
+        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.2); }
     },
     915: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     916: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     917: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     918: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
     },
     921: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     922: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+    },
+    923: {
+        atk: function(p) {
+            if(p.percHP<30){ 
+                return p.unit.class.has("Driven") ? 2.5 : 1;
+            } else {
+                return p.unit.class.has("Driven") ? 2 : 1;
+            }	
+        }
+    },
+    924: {
+        atk: function(p) {
+            if(p.percHP<30){
+                return p.unit.class.has("Driven") ? 2.75 : 1;
+            } else {
+                return p.unit.class.has("Driven") ? 2 : 1;
+            }
+        }
     },
     925: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     926: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     927: {
-        atk: function(p) {
-            return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.2 : 1;
-        },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     928: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+        atk: function(p) {
+            if(p.percHP<30){
+                return p.unit.class.has("Driven") ? 1.75 : 1;
+            } else {
+                return p.unit.class.has("Striker") ? 1.75 : 1;
+            }
+        }
     },
     929: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+        atk: function(p) {
+            if(p.percHP<30){
+                return p.unit.class.has("Driven") ? 2.25 : 1;
+            } else {
+                return p.unit.class.has("Striker") ? 2.25 : 1;
+            }
+        }
+    },
+    930: {
+        chainModifier: function(p) { return 2; }
+    },
+    932: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    933: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    934: {
+        atk: function(p) {
+            if(p.percHP<30 || p.percHP>70){
+                return p.unit.class.has("Fighter") ? 2.75 : 1;
+            } else {
+                return p.unit.class.has("Fighter") ? 2 : 1;
+            }
+        },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    935: {
+        atk: function(p) {
+            if(p.percHP<30 || p.percHP>70){
+                return p.unit.class.has("Fighter") ? 2.75 : 1;
+            } else {
+                return p.unit.class.has("Fighter") ? 2 : 1;
+            }
+        },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    936: {
+        chainModifier: function(p) { return 3; }
+    },
+    937: {
+        chainModifier: function(p) { return 3.5; },
+        hp: function(p) { return 1.25; }
+    },
+    938: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    939: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     940: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     941: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
+    },
+    942: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    943: {
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
     },
     944: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; }
     },
     945: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
+    },
+    946: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
     },
     947: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.3 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    948: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+    },
+    949: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    950: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    951: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    952: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
+        },
+        hp: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.2 : 1;
+        }
+    },
+    953: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
+        },
+        hp: function(p) {
+            return p.unit.class.has("Shooter") || p.unit.class.has("Striker") ? 1.5 : 1;
+        }
     },
     954: {
-        def: function(p) { return 0.2; }		
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     955: {
-        atk: function(p) { return p.defenseDown ? 1.2 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     956: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-        type: "class"
-    },
-    961: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     963: {
-        def: function(p) { return 0; }
+        atk: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 2; 
+            return 1;
+        }
     },
     964: {
-        atk: function(p) { return window.specials[964].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[964].multiplier === 1.1 ? 1 : 0);
-            window.specials[964].multiplier = [1.1, 1.5][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
-                name: '965warning'
-            });
+        atk: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
+        },
+        hp: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
+        },
+        rcv: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
         }
     },
     965: {
-        atk: function(p) { return window.specials[965].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[965].multiplier === 1.1 ? 1 : 0);
-            window.specials[965].multiplier = [1.1, 1.5][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
-                name: '965warning'
-            });
+        atk: function(p) { 
+            if(p.unit.cost >= 50 && p.unit.cost <= 55) return 1.5; 
+            return 1;
         }
     },
-    975: {
-        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
-        type: "class"
+    966: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+    },
+    967: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+    },
+    973: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    974: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
     },
     976: {
-        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1;
+        }
     },
     977: {
-        chainAddition: function(p) {return 0.5;}
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     978: {
-        chainAddition: function(p){ return 0.5;}
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
-    984: {
-        delay: function(p) { return 1; }
+    979: {
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.2 : 1; }
+    },
+    980: {
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.2 : 1; }
     },
     981: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 0.1 : 1; }
+    },
+    982: {
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1; }
+    },
+    983: {
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2.25  : 1; }
+    },
+    984: {
+        atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1; }
+    },
+    989: {
+        atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; },
+        hp: function(p) { return 0.1 ; }
+    },
+    990: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.5 : 1; }
+    },
+    991: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
+    992: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1 ; }
+    },
+    993: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1 ; }
+    },
+    996: {
+         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2  : 1; }
+    },
+    997: {
+         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2.25  : 1; }
     },
     998: {
-        delay: function(p) { return 1; }
+         atk: function(p) {return p.unit.class.has("Driven") ? 2  : 1; }
     },
     999: {
-        delay: function(p) { return 1; }
+         atk: function(p) {return p.unit.class.has("Driven") ? 2.25  : 1; }
+    },
+    1000: {
+        atk: function(p) { return  1 + p.percHP / 100; }
+    },
+    1001: {
+        atk: function(p) { return  1 + p.percHP / 100; }
+    },
+    1002: {
+        atk: function(p) {return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    1003: {
+        atk: function(p) {return p.unit.class.has("Fighter") ? 2 : 1; }
+    },
+    1004: {
+        rcv: function(p) { return 1.5; }
     },
     1005: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1006: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) {return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1007: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1008: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral") ? 2 : 1; }
+    },
+    1009: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
+                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
+                1;
+        }
     },
-    1010: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
-        type: "type"
+    1010:{
+        atk: function(p) {return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
-    1011: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
-        type: "type"
+    1011:{
+        atk: function(p) {
+            if (p.unit.class.has("Driven") && p.unit.class.has("Powerhouse")){
+                return 2.625;
+            } else if (p.unit.class.has("Driven")){
+                    return 1.75;
+                } else if (p.unit.class.has("Powerhouse")){
+                    return 1.5;
+                } return 1;
+        }
     },
-    1013: {
-        atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition"
+    1014:{
+        atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1015: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1) : 1; }
     },
     1016: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
     },
     1017: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1018: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        type: "class"
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1020: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1021: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1022: {
+        atk: function(p) { return 2; }
     },
     1023: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
     },
     1024: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1024].multiplier, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
-            window.specials[1024].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
-                name: '1024warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1025: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1025].multiplier, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
-            window.specials[1025].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
-                name: '1025warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1026: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    1027: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     1028: {
-        //TODO
-        hit: function(n) { return n > 30 ? 1.75 : 1; },
-        type: "condition"
+        hit: function(n) { return n > 21 ? 2.5 : 1; }
     },
     1029: {
-        //TODO
-        hit: function(n) { return n > 30 ? 1.75 : 1; },
-        type: "condition"
+        hit: function(n) {
+            return n > 36 ? 3.5 :
+                n > 21 ? 2.5 : 1;
+        }
     },
     1030: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.5 : 1; }
     },
     1031: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Powerhouse") && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
+    1032: {
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1033: {
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
+    },
+    1034: {
+        atk: function(p) { 
+            return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
+    },
+    1035: {
+        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
+    },
+    1036: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1037: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit")? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1038: {
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.2 : 1; }
+    },
+    1039: {
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1040: {
-        atk: function(p) { return window.specials[1040].multiplier; },
-        type: "type",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.5 : 1);
-            window.specials[1040].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x ATK boost.',
-                name: '1040warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
     },
     1041: {
-        atk: function(p) { return window.specials[1041].multiplier; },
-        type: "type",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.5 : 1);
-            window.specials[1041].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x ATK boost.',
-                name: '1041warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    1042: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2 : 1;},
+        rcv: function(p) { return 0; }
+    },
+    1043: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2) : 1;},
+        rcv: function(p) { return 0; }
+    },
+    1044: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1045: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1046: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1047: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1048: {
+        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
+    },
+    1049: {
+        atk: function(p) { return p.unit.type === 'PSY' ? (p.percHP >= 30.0 ? 1.5 : 2.25) : 1; },
+        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
+    },
+    1050: {
+        atk: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
     },
-    1046: {
-        staticMult: function(p) { return 55; }
+    1051: {
+        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
     },
-    1047: {
-        staticMult: function(p) { return 55; }
+    1056:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
+        rcv: function(p) { return 1.25; }
     },
-    1055: {
-        atk: function(p) { return 1.4; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
+    1058:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
+        hp: function(p) { return 1.25; }
     },
-    1056: {
-        atk: function(p) { return 1.4; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been STRONGLY Poisoned."
+    1059:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;},
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
     },
-    1059: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    1060:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1;},
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1;}
     },
-    1060: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    1061:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1;}
     },
-    1061: {
-        chain: function(p) { return 2; },
-        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') ? 2 : 1;
-        }
+    1062:{
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1;}
+    },
+    1063:{
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;},
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
     },
-    1063: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1; },
-        type: "class"
+    1064: {
+        atk: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; }
     },
-    1065: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+    1065:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
     },
     1066: {
-        chainAddition: function(p){ return 0.1;}
+        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
     },
-    1067: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
-        type: "type"
+    1067:{
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1;}
+    },
+    1068: {
+        chainModifier: function(p) { return 1.5; }
+    },
+    1069:{
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
+    },
+    1070:{
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1;}
     },
     1071: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
     },
     1072: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1;}
+    },
+    1073:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
+    },
+    1074: {
+        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
+    },
+    1075: {
+        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; },
+        hp: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
     },
     1076: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
     },
     1077: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1080: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
     },
     1081: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
     },
     1082: {
-        atk: function(p) { return (p.unit.class.has("Striker") || p.unit.class.has("Fighter")) ? window.specials[1082].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
-            window.specials[1082].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
-                name: '1082warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1083: {
-        atk: function(p) { return (p.unit.class.has("Striker") || p.unit.class.has("Fighter")) ? window.specials[1083].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
-            window.specials[1083].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
-                name: '1083warning'
-            });
-        }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Striker", "Fighter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Striker") && !p.unit.class.has("Fighter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 1.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    1086: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    1084: {
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
-    1087: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+    1085: {
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
-    1088: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+    1086:{
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;},
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
     },
-    1089: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+    1087:{
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1;},
+        rcv: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1;}
+    },
+    1088:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;}
+    },
+    1089:{
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1;},
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1;}
+    },
+    1090: {
+        atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
+    },
+    1091: {
+        atk: function(p) { return p.percHP <= 30.0 ? 2.5 : 1; }
+    },
+    1092: {
+        rcv: function(p) { return 1 + .5 * ((100 - p.percHP) / 100); }
+    },
+    1093: {
+        rcv: function(p) { return 1 + 1 * ((100 - p.percHP) / 100);	}
+    },
+    1094: {
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
+    },
+    1095: {
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 2.0 : 1.0; }
     },
     1096: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1097: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            return !(p.unit.class.has('Powerhouse')) ? 1.0 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1098: {
+        chainModifier: function(p) { return 2; }
     },
     1099: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has('Fighter') ? 2.0 : 1.0; }
     },
     1100: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has('Fighter') ? 2.25 : 1.0; },
+        rcv: function(p) { return p.unit.class.has('Fighter') ? 1.2 : 1.0; }
     },
     1101: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
-        type: "type"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1102: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
-        type: "type"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1103: {
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; },
+        rcv: function(p) { return p.unit.class.has('Cerebral') ? 1.5 : 1.0; }
+    },
+    1104: {
+        atk: function(p) { return p.unit.class.has('Cerebral') ? 1.75 : 1.0; },
+        rcv: function(p) { return p.unit.class.has('Cerebral') ? 1.75 : 1.0; }
     },
     1105: {
-        delay: function(p) { return 1; },
-        chainAddition: function(p){ return 0.2;}
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1106: {
-        delay: function(p) { return 1; },
-        chainAddition: function(p){ return 0.2;}
+         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1107: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1108: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    1110: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }  
     },
     1111: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; }  
     },
     1112: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1113: {
-        atk: function(p) { return 1.2; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }  
     },
     1114: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        type: "type" 
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1115: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        type: "type" 
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+    },
+    1118: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1119: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1120: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1121: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1122: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
     },
     1123: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
     },
-    1132: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1132].multiplier === 1.5 ? 1 : 0);
-            window.specials[1132].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1132warning'
-            });
+    1124: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
         }
     },
-    1133: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? window.specials[1133].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1133].multiplier === 1.5 ? 1 : 0);
-            window.specials[1133].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1133warning'
-            });
+    1125: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.5 - 0.1 * p.turnCounter) : 1;
         }
     },
+    1126: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    1127: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    1128: {
+        atk: function(p) { return 1.75; }
+    },
+    1129: {
+        atk: function(p) { return 2; }
+    },
+    1130: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1131: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    1132: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    1133: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+    },
+    1134: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.2 : 1; }
+    },
+    1135: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1136: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
     1137: {
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
     },
-    1138: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1; },
-        type: "class"
+    1139: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1140: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    1141: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
     },
     1142: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1143: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
-    1153: {
-        def: function(p) { return 0; },
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
-        type: "class" 
+    1144: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+    },
+    1145: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
     },
     1154: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; }
+    },
+    1156: {
+        atk: function(p) { return ( p.unit.class.has("Driven") || p.unit.class.has("Striker") ) && p.percHP >= 50.0 ? 1.2 : 1; }
+    },
+    1157: {
+        atk: function(p) { return ( p.unit.class.has("Driven") || p.unit.class.has("Striker") )  && p.percHP >= 50.0 ? 1.75 : 1; }
+    },
+    1158: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+    },
+    1159: {
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+    },
+    1160: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },  
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
+    },
+    1161: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },  
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
+    },
+    1162: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+    },
+    1163: {
+        atk: function(p) { return (p.unit.type === "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type === "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type === "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
     },
     1164: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
-        rcv: function(p) { return 1.5; }
+        rcv: function(p) { return 1.2; }
     },
     1165: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
         rcv: function(p) { return 1.5; }
     },
+    1167: {
+        atk: function(p) { return 1.2; }
+    },
     1168: {
-        atk: function(p) { return p.unit.type === "STR" ? window.specials[1168].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
-            window.specials[1168].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
-                name: '1168warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2 : 1; }
     },
     1169: {
-        atk: function(p) { return p.unit.type === "STR" ? window.specials[1169].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
-            window.specials[1169].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
-                name: '1168warning'
-            });
+        atk: function(p) {
+            return p.unit.type === "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
         }
     },
+    1170: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    1171: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    1172: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    1173: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+    },
+    1174: {
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+    },
+    1175: {
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+    },
+    1176: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    1177: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+    },
+    1178: {
+        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2 : 1; }
+    },
+    1179: {
+        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
+    },
     1181: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1181].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1181].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
     },
     1182: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1182].turnedOn = true;
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+    },
+    1183: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+    },
+    1184: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+    },
+    1185: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1186: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1187: {
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+    },
+    1188: {
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+    },
+    1189: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
+    },
+    1190: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
+    },
+    1191: {
+        atk: function(p) {
+            return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
         },
-        onDeactivation: function(p) {
-            window.specials[1182].turnedOn = false;
-        }
+        hp: function(p) { return 1.2; }
+    },
+    1192: {
+        atk: function(p) {
+            return Math.min(3.5, 2.0 + 0.1875 * p.turnCounter);
+        },
+        hp: function(p) { return 1.2; }
     },
     1193: {
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1194: {
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1195: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
     },
     1196: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1197: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1) : 1; }
+    },
+    1198: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1199: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1202: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1203: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; }
+    },
+    1204: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
+    1205: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1206: {
+        hp: function(p) { return 1.3; }
+    },
+    1207: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    1208: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1209: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1210: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1211: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
     },
     1212: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
+    },
+    1213: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    1214: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+    },
+    1215: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'PSY', 'DEX']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'QCK',
+                minModifier: 'Good'
+            }, {
+                type: 'PSY',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1216: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    1217: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1218: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1219: {
         atk: function(p) {
-            if (!window.specials[1219].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-            if (window.specials[1219].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            if (window.specials[1219].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
-        },
-        type: "class",
-        stage: -1,
-        onActivation: function(p) {
-            window.specials[1219].stage = (window.specials[1219].stage + 1) % 3;
-            p.scope.notify({
-                text: 'Activating stage #' + (window.specials[1219].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-                name: '1219warning'
-            });
+            return p.unit.class.has("Shooter") ? Math.min(3, 1 + 0.125 * p.turnCounter) : 1;
         }
     },
     1220: {
         atk: function(p) {
-            if (!window.specials[1220].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-            if (window.specials[1220].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            if (window.specials[1220].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
-        },
-        type: "class",
-        stage: -1,
-        onActivation: function(p) {
-            window.specials[1220].stage = (window.specials[1220].stage + 1) % 3;
-            p.scope.notify({
-                text: 'Activating stage #' + (window.specials[1220].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-                name: '1219warning'
-            });
+            return p.unit.class.has("Shooter") ? Math.min(3.25, 1 + 0.225 * p.turnCounter) : 1;
         }
     },
     1221: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1221].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1221].turnedOn = false;
-        }
-    },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+    }, 
     1222: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1222].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1222].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+    },
+    1223: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    1224: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1225: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    1226: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1227: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; }
+    },
+    1228: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
+    1229: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
+    },
+    1230: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 2.75 : p.unit.class.has("Powerhouse") ? 2.5 : 1; }  
     },
     1231: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1231].turnedOn = true;
-            p.scope.notify({
-                text: 'Only affects damage if Smoker is your captain',
-                name: '1231warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1231].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.1875 : 1.75) : 1; },
+        rcv: function(p) { return .5; }
     },
     1232: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1232].turnedOn = true;
-            p.scope.notify({
-                text: 'Only affects damage if Smoker is your captain',
-                name: '1232warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1232].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.925 : 2.25) : 1; },
+        rcv: function(p) { return .5; }
     },
-    1233: {//Tashigi
-        affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    1233: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.25 :
+                p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 :
+                1;
+        },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
-    1234: {//Tashigi
-        affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    1234: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Cerebral") ? 2.56 :
+                p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.6 :
+                1;
+        },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1; }
     },
     1235: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1236: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1237: {
-        //TODO
-        hit: function(n) { return n > 30 ? 2 : 1; },
-        type: "condition"
+        hit: function(n) {
+            return n > 15 ? 2 : 1;
+        }
     },
     1238: {
-        //TODO
-        hit: function(n) { return n > 30 ? 2 : 1; },
-        type: "condition"
+        hit: function(n) {
+            return n > 30 ? 3 :
+                n > 15 ? 2 : 1;
+        }
     },
     1239: {
-        turnedOn: [ false, false ],
-        onActivation: function(p) {
-            window.specials[1239].turnedOn[p.slot] = true;
-            p.scope.notify({
-                text: 'Only affects damage if Kizaru is your captain',
-                name: '1239warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1239].turnedOn[p.slot] = false;
-        }
+        atk: function(p){ 
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
+            }
+            return specialEnabled ? 3 : 2; },
+        rcv: function(p) { return 1.3; }
     },
     1240: {
-        turnedOn: [ false, false ],
-        onActivation: function(p) {
-            window.specials[1240].turnedOn[p.slot] = true;
-            p.scope.notify({
-                text: 'Only affects damage if Kizaru is your captain',
-                name: '1240warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1240].turnedOn[p.slot] = false;
-        }
+        atk: function(p){ 
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
+            }
+            return specialEnabled ? 3 : 2; },
+        rcv: function(p) { return 1.3; }
     },
     1241: {
-        staticMult: function(p) { return 15; }
+        chainModifier: function(p) { return 1.5; }
     },
     1242: {
-        staticMult: function(p) { return 15; }
+        chainModifier: function(p) { return 2; }
     },
-    1245: {
-        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1245].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1245].multiplier === 1.3 ? 1 : 0);
-            window.specials[1245].multiplier = [1.3, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-                name: '1245warning'
-            });
+    1243: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+                1;
         }
     },
-    1246: {
-        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1246].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1246].multiplier === 1.3 ? 1 : 0);
-            window.specials[1246].multiplier = [1.3, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-                name: '1246warning'
-            });
+    1244: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.276 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.75 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3 :
+                1;
         }
     },
+    1245: {
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
+    },
+    1246: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
     1247: {
-        atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1247].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1247].multiplier === 1.3 ? 1 : 0);
-            window.specials[1247].multiplier = [1.3, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
-                name: '1247warning'
-            });
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2); },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
+    },
+    1248: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+                1;
+        }
+    },
+    1249: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.6 :
+                1;
         }
     },
     1250: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1251: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    1252: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1253: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
     },
     1254: {
-        def: function(p) { return 0.2; }
-    },
-    1255: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? p.unit.class.has("Striker") ? 2.75 : 1 : 1; },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1256: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; }
+    },
+    1257: {
+        atk: function(p) { return p.percHP <= 50.0 ? 2 : 1; }
+    },
+    1258: {
+        atk: function(p) { return p.percHP <= 50.0 ? 2.5 : 1; }
     },
     1259: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1259].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1259].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1260: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1260].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1260].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
-    1261: {//Young Senor Pink
-        affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    1261: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
-    1262: {//Young Senor Pink
-        affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    1262: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
     },
     1263: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
     },
     1264: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
     },
     1265: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1266: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+    },
+    1267: {
+        atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 2.75;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 1.5;
+            else
+                return 1; 
+               }
+    },
+    1268: {
+        atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 2.75;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
+                return 1.5;
+            else
+                return 1; 
+               }
+    },
+    1271: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    1272: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
-    1269: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1269].turnedOn = true;
+    1273: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.5 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.5 :
+                1;
         },
-        onDeactivation: function(p) {
-            window.specials[1269].turnedOn = false;
+        hp: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.44 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
+                1;
         }
     },
-    1270: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1270].turnedOn = true;
+    1274: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.6 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.6 :
+                1;
         },
-        onDeactivation: function(p) {
-            window.specials[1270].turnedOn = false;
+        hp: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.44 :
+                p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
+                !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
+                1;
         }
     },
-    1271: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    1275: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
-    1272: {
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+    1276: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
-    1273: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+    1277: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.25 : 1; },
+        rcv: function(p) { return .01; }
     },
-    1274: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+    1278: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.75 : 1; },
+        rcv: function(p) { return .01; }
+    },
+    1279: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1280: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+    },
+    1281: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1282: {
-        atk: function(p) { return 1.2; },
-        type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
     },
     1283: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+    },
+    1284: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+    },
+    1285: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.375, [ "Striker" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Striker")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.375 : 1.5;
+        },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1286: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
+    },
+    1287: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
+    },
+    1288: {
+        atk: function(p) {
+            return p.unit.class.has("Driven") ? Math.max(1.0, 2.5 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1289: {
+        atk: function(p) {
+            return p.unit.class.has("Driven") ? Math.max(1.0, 2.75 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1291: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
+    },
+    1292: {
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
+    },
+    1293: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    },
+    1294: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+    },
+    
+    1297: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'STR', 'STR']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1298: {
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'STR', 'STR']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'STR',
+                minModifier: 'Good'
+            }]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1299: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+    },
+    1300: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    1301: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
+    },
+    1302: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.625 :
+                p.unit.class.has("Slasher") && !p.unit.class.has("Driven") ? 1.75 : 
+                !p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.5 :
+                1;
+        }
+    },
+    1303: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1304: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
-    1287: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
-        type: "class"
+    1305: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
     },
-    1295: {
-        def: function(p) { return 0; }
+    1306: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
-    1296: {
-        def: function(p) { return 0; }
+    1307: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
     },
-    1297: {
-        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
+    1308: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
-    1298: {
-        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
+    1309: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
-    1299: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
-        type: "class"
+    1310: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
-    1300: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
-        type: "class"
+    1311: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1312: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1313: {
-        atk: function(p) { return p.unit.cost >= 50 ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
+            $scope.notify({ text: p.orb });
+        }
     },
     1314: {
-        atk: function(p) { return p.unit.cost >= 50 ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
+        }
+    },
+    1315: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1316: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 :
+            //p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.75 :
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1317: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.2; }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2 : 1; }
     },
     1318: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.2; }
-    },
-    1319: {
-        atk: function(p) { return 1.5; },
-        type: "class"
-    },
-    1320: {
-        atk: function(p) { return 1.5; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2.5 : 1; }
     },
     1321: {
-        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher"))) 
+                return 2.25;
+            else
+                return 1; 
+               }
     },
     1322: {
-        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher")))
+                return 2.5;
+            else
+                return 1; 
+               }
     },
     1323: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1323].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1323].turnedOn = false;
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.69 :
+                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.3 :
+                1;
         }
     },
     1324: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1324].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1324].turnedOn = false;
+        atk: function(p) {
+            return p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 2.56 :
+                p.unit.class.has("Driven") || p.unit.class.has("Slasher") ? 1.6 :
+                1;
         }
     },
-    1329: {
-        affinity: function(p){ return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.25 : 1; }
+    1326: {
+        atk: function(p) { return 1.3; }
+    },
+    1327: {
+        atk: function(p) { return p.unit.cost <= 20 ? 2 : 1; }
+    },
+    1328: {
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
     },
     1330: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1330].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1330].turnedOn = false;
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1333: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.96 :
+                p.unit.class.has("Powerhouse") || p.unit.type === "STR" ? 1.4 :
+                1;
+        }
+    },
+    1334: {
+        atk: function(p) { 
+            return p.unit.class.has("Free Spirit") && p.unit.type === "DEX" ? 1.96 :
+                p.unit.class.has("Free Spirit") || p.unit.type === "DEX" ? 1.4 :
+                1;
         }
     },
     1335: {
-        chainAddition: function(p){ return 0.5; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1336: {
-        chainAddition: function(p){ return 0.5; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1337: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1338: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; }
     },
     1339: {
-        chainAddition: function(p) {
-            if (!window.specials[1339].stage) return 0.2;
-            if (window.specials[1339].stage === 1) return 0.3;
-            if (window.specials[1339].stage === 2) return 0.5;
-        },
-        stage: -1,
-        onActivation: function(p) {
-            window.specials[1339].stage = (window.specials[1339].stage + 1) % 3;
-            p.scope.notify({
-                text: 'Activating stage #' + (window.specials[1339].stage + 1) + '. To move onto the next stage, disable and re-enable this special.',
-                name: '1339warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
     },
     1340: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1341: {
-        delay: function(p) { return 1; }
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["QCK"]); }, 
+        hitAtk: function(p) {
+            if (!(p.unit.type === "QCK")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 2.625 : 1.75;
+        },
+        hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
+    },
+    1342: {
+        hp: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1343: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        hp: function(p) { return 0.5; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1344: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
-        type: "class"
+        hp: function(p) { return 0.5; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
     },
-    1348: {
-        atk: function(p) { return 1.2; },
-        type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
+    1345: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+    },
+    1346: {
+        hp: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1349: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
-    1351: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.5; }
+    1352: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, ["Fighter"]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1353: {
-        chainAddition: function(p){ return 0.5; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
     },
     1354: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        chainModifier: function(p) { return 2; }
     },
     1355: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        chainModifier: function(p) { return 3; }
+    },
+    1356:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1357:{
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1358: {
-        delay: function(p) { return 1; },
-        rcv: function(p){ return 1.75; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     1359: {
-        delay: function(p) { return 1; },
-        rcv: function(p){ return 1.75; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
+    1360: {
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
     },
     1361: {
-        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
+        hp: function(p) { return p.unit.class.has("Slasher") ?
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
     },
     1362: {
-        atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
+        hp: function(p) { return p.unit.class.has("Slasher") ?
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
     },
     1363: {
-        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1364: {
-        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
     },
     1365: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1366: {
-        delay: function(p) { return 1; }
-    },
-    1367:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (window.specials[1367].multiplier === 1.5 ? 1 : 0);
-            window.specials[1367].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
-                name: '1367warning'
-            });
-        }
-    },
-    1368:{
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1368].multiplier, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (window.specials[1368].multiplier === 1.5 ? 1 : 0);
-            window.specials[1368].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
-                name: '1368warning'
-            });
-        }
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1.5); },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1367: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    1368: {
+        atk: function(p) { return !(p.unit.type === "STR") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+    },
+    1369: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+    },
+    1370: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+    },
+    1371: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1372: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1373: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1374: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1375: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
-        type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1376: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
-        type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
+    },
+    1377: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; }
+    },
+    1378: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; }
     },
     1379: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1379].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1379].turnedOn = false;
-        },
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1380: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1380].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1380].turnedOn = false;
-        },
-        orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+    },
+    1381: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
+    1382: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1383: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1384: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
     1387: {
-        delay: function(p) { return 1; }
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.8125 : 2.25;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return 1.25; }
+    },
+    1388: {
+        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
     },
     1389: {
-        orb: function(p) { return p.unit.type === "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1390: {
-        atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
+        hp: function(p) { return p.unit.cost <= 40 ? 1 : 0.5; }
     },
     1391: {
-        atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
+        hp: function(p) { return p.unit.cost <= 40 ? 1 : 0.5; }
     },
     1392: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
     },
     1393: {
-        atk: function(p) { return 1.1; },
-        type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; }
     },
     1394: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.1 : 1; }
     },
     1395: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.2 : 1; }
     },
     1396: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.2; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1397: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.2; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1398: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1399: {
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1400: {
-        affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1400].multiplier : 1; },
-        onActivation: function(p) {
-            var n = (window.specials[1400].multiplier === 1.5 ? 1 : 0);
-            window.specials[1400].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
-                name: '1400warning'
-            });
-        }
+        atk: function(p) {
+            return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.275 :
+                p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
+                !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.3 :
+                1; }
     },
     1401: {
-        affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1401].multiplier : 1; },
-        onActivation: function(p) {
-            var n = (window.specials[1401].multiplier === 1.5 ? 1 : 0);
-            window.specials[1401].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
-                name: '1401warning'
-            });
-        }
+        atk: function(p) {
+            return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.625 :
+                p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
+                !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.5 :
+                1; }
     },
     1402: {
-        atk: function(p) { return p.unit.type === "PSY" ? window.specials[1402].multiplier : 1; },
-        type: "type",
-        onActivation: function(p) {
-            var n = (window.specials[1402].multiplier === 1.3 ? 1 : 0);
-            window.specials[1402].multiplier = [1.3, 1.5][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.3, 1.5][n] + 'x Type boost. To switch to the ' + [1.5, 1.3][n] + 'x Type boost, disable and re-enable this special',
-                name: '1402warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 2 : 1; }
+    },
+    1403: {
+        atk: function(p){ 
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
+    },
+    1404: {
+        atk: function(p){ 
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
     },
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; }
     },
     1406: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Shooter") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1407: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.25 : 1; }
     },
     1408: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
-        type: "type"
-    },
-    1409: {
-        delay: function(p) { return 1; },
-        atk: function(p) {
-            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
-        },
-        type: "class"
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.5 : 1; }
     },
     1410: {
-        delay: function(p) { return 1; },
-        atk: function(p) {
-            return p.unit.class.has("Slasher") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
-        },
-        type: "class"
+        chainModifier: function(p) { return 2.5; }
+    },
+    1411: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        rcv: function(p) { return 0; }
+    },
+    1412: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; },
+        rcv: function(p) { return 0; }
+    },
+    1413: {
+        atk: function(p) { return p.percHP <= 30.0 ? 3 : 1.75; },
+        hp: function(p) { return 1.2; }
+    },
+    1414: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1415: {
-        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
     },
     1416: {
-        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+    },
+    1417: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    1418: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1419: {
-        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1420: {
-        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
-    1421: {
-        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1421].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP === 100 ? 2 : 1.5);
-            window.specials[1421].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
-                name: '1421warning'
-            });
-        }
+    1422: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1422: {
-        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1422].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP === 100 ? 2 : 1.5);
-            window.specials[1422].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
-                name: '1422warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1423: {
+        atk: function(p) { return 1.75; }
+    },
+    1424: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1 + 1.25 * p.percHP / 100 : 1; }
     },
     1425: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
-        warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; }
     },
     1426: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
-        warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.25 : 1; }
+    },
+    1427: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
     },
-    1428: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "class",
-        warning: "Selected special (%name%) assumes that the enemy has been Delayed."
+    1429: {
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1430: {
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; }
     },
     1431: {
-        atk: function(p) { return 1.5; },
-        type: "type"
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.FreeSpirit>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1 && p.classCount.Powerhouse>=1 && p.classCount.Driven>=1) 
+                return 1.2;
+            else
+                return 1; 
+               }
     },
     1432: {
-        atk: function(p) { return 1.5; },
-        type: "type"
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2.5;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.classCount.FreeSpirit>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1 && p.classCount.Powerhouse>=1 && p.classCount.Driven>=1) 
+                return 1.5;
+            else
+                return 1; 
+               }
+    },
+    1433: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
+    },
+    1434: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
     },
     1435: {
-        delay: function(p) { return 1; }
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") ? 2 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1436: {
-        delay: function(p) { return 1; }
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") ? 2.5 : 1; },
+        hp: function(p) { 
+            return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1437: {
-        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 1.69 :
+                p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.3 :
+                1; }
     },
     1438: {
-        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 2.56 :
+                p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.6 :
+                1; }
     },
     1439: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1440: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1441: {
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
     },
     1442: {
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
     },
     1443: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1444: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1445: {
-        delay: function(p) { return 1; },
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { 
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") ? 2.25 + 0.5 * p.percHP / 100 : 1; 
+        },
+        rcv: function(p) {
+            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
+        }
     },
     1446: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1447: {
-        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[1447].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1447].multiplier === 1.2 ? 1 : 0);
-            window.specials[1447].multiplier = [1.2, 1.5][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.2, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.2][n] + 'x multiplier, disable and re-enable this special',
-                name: '1447warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+    },
+    1448: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1449: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1450: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+    },
+    1451: {
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1.5); }
+    },
+    1452: {
+        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
+    },
+    1453: {
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    1454: {
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    1455: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1456: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1457: {
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 1.75 : 1; }
+    },
+    1458: {
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1459: {
-        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
-        type: "condition"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 1.75 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
     1460: {
-        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
-        type: "condition"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great", "Perfect"]) ? 2.14 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
     1461: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        type: "type"
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.6, ["QCK"]); }, 
+        hitAtk: function(p) {
+            if (!(p.unit.type === "QCK")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.6 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1462: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1462].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1462].turnedOn = false;
-        }
+        chainModifier: function(p) { return 2; }
     },
     1463: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1463].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1463].turnedOn = false;
-        }
+        chainModifier: function(p) { return 2.5; }
+    },
+    1465: {
+        atk: function(p) { return 1.25; },
+        rcv: function(p) { return 1.25; }
     },
     1466: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1467: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.3 : 1; }
     },
     1468: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1469: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
-    1476: {
-        delay: function(p) { return 1; },
+    1470: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 3 : p.unit.class.has("Powerhouse") || p.unit.class.has("Slasher") ? 1.5 : 1; }  
+    },
+    1471: {
         atk: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
-        },
-        type: "class"
+            return p.unit.class.has("Slasher") ? 1 + 1 * ((100 - p.percHP) / 100) : 1;
+        }
+    },
+    1472: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
+    },
+    1473: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
+    },
+    1474: {
+        atk: function(p) { return 1.5; }  
+    },
+    1475: {
+        atk: function(p) { return 2.25; }  
+    },
+    1476: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1477: {
-        delay: function(p) { return 1; },
-        atk: function(p) {
-            return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1;
-        },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
     },
     1478: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
-        type: "type"
+        hit: function(n) {
+            return n > 44 ? 3 :
+                n > 33 ? 2 :
+                n > 22 ? 1.75 :
+                n > 11 ? 1.5 : 1;
+        }
     },
     1479: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
-        type: "type"
+        hit: function(n) {
+            return n > 44 ? 3.5 :
+                n > 33 ? 2.75 :
+                n > 22 ? 2.5 :
+                n > 11 ? 1.75 : 1;
+        }
+    },
+    1480: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1481: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.5 : 
+            p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1482: {
-        atk: function(p) { return window.specials[1482].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1482].multiplier === 1.25 ? 1 : 0);
-            window.specials[1482].multiplier = [1.25, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
-                name: '1482warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1483: {
-        atk: function(p) { return window.specials[1483].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1483].multiplier === 1.25 ? 1 : 0);
-            window.specials[1483].multiplier = [1.25, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
-                name: '1483warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1484: {
-        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') ? 2.5 : 1;
-        }
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1485: {
-        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') ? 2.5 : 1;
-        }
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
     },
     1486: {
-        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
     },
     1487: {
-        orb: function(p) { return (p.unit.class.has("Fighter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
+    },
+    1488: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    1489: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1490: {
-        def: function(p) { return 0.5; }
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great"]) ? 1.75 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
     1491: {
-        def: function(p) { return 0.5; }
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Good", "Great"]) ? 2 : 1;
+        },
+        hitModifiers: ["Good", "Good", "Great", "Perfect", "Perfect", "Perfect"]
     },
     1492: {//CHANGE THIS IF THIS ISN'T SABO
-        atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1492].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1492].multiplier === 1.5 ? 1 : window.specials[1492].multiplier === 1.75 ? 2 : 0);
-            window.specials[1492].multiplier = [1.5, 1.75, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [1.75, 2, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1492warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.75 : 1; },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
+    },
+    1493: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    1494: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    1495: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+    },
+    1496: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1497: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    1498: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
+    },
+    1499: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+    },
+    1500: {
+        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     1501: {
-        atk: function(p) { return 1.3; },
-        type: "type"
+        atk: function(p) { return p.unit.cost <= 15 ? 2 : 1; }
+    },
+    1504: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.4, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1505: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type"
+        atk: function(p) { return !(p.unit.class.has("Powerhouse")) ? 1 : p.percHP <= 30.0 ? 2.25 : 1; }
     },
     1506: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type"
+        atk: function(p) { return !(p.unit.class.has("Powerhouse")) ? 1 : p.percHP <= 30.0 ? 2.5 : 2.25; }
     },
     1507: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
+                1;
+        }
     },
     1508: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.25 :
+                p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.5 :
+                1;
+        }
+    },
+    1509: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    1510: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1; }
     },
     1511: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1512: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? window.specials[1512].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.5 : 1);
-            window.specials[1512].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.5 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-                name: '1512warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    1513: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+    },
+    1514: {
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1515: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1515].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1515].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1516: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1516].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1516].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1517: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1518: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+    },
+    1519: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1520: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1521: {
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") && p.unit.type === "QCK" ? 1.44 :
+                p.unit.class.has("Slasher") || p.unit.type === "QCK" ? 1.2 :
+                1;
+        }
     },
     1522: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+    },
+    1523: {
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+    },
+    1524: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
     },
     1525: {
-        delay: function(p) { return 1; },
-        atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(2.0, 3.25 - 0.0625 * p.turnCounter) : 1;
+        }
     },
     1526: {
-        atk: function(p) { return p.slot < 2 ? window.specials[1526].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1526].multiplier === 1.5 ? 1 : 0);
-            window.specials[1526].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1526warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
     },
     1527: {
-        atk: function(p) { return p.slot < 2 ? window.specials[1527].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1527].multiplier === 1.5 ? 1 : 0);
-            window.specials[1527].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1527warning'
-            });
-        }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1528: {
-        turnedOn: false,
-        onActivation: function(p) {
-            if(p.percHP < 30){
-                window.specials[1528].turnedOn = true;
-            }
-        },
-        onDeactivation: function(p) {
-            window.specials[1528].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
     },
     1529: {
-        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1529].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (p.percHP >= 50 ? 2.25 : 2);
-            window.specials[1529].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
-                name: '1529warning'
-            });
-        }
+        atk: function(p) { return p.slot === p.sourceSlot ? 3 : 1.5; }  
     },
     1530: {
-        orb: function(p) { return (p.unit.class.has("Slasher")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1530].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (p.percHP >= 50 ? 2.25 : 2);
-            window.specials[1530].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
-                name: '1530warning'
-            });
-        }
+        atk: function(p) { return p.slot === p.sourceSlot ? 3.5 : 1.75; }  
     },
     1531: {
-        delay: function(p) { return 1; },
-        chainAddition: function(p) {return window.specials[1531].multiplier;},
-        onActivation: function(p) {
-            var n = (window.specials[1531].multiplier === 0.2 ? 1 : 0);
-            window.specials[1531].multiplier = [0.2, 0.3][n];
-            p.scope.notify({
-                text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
-                name: '1531warning'
-            });
-        }
+        atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
     },
     1532: {
-        delay: function(p) { return 1; },
-        chainAddition: function(p) {return window.specials[1532].multiplier;},
-        onActivation: function(p) {
-            var n = (window.specials[1532].multiplier === 0.2 ? 1 : 0);
-            window.specials[1532].multiplier = [0.2, 0.3][n];
-            p.scope.notify({
-                text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
-                name: '1532warning'
-            });
-        }
+        atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
+    },
+    1533: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
+        hitAtk: function(p) {
+            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+    },
+    1534: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
+        hitAtk: function(p) {
+            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
     },
     1535: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
     },
     1536: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
+    },
+    1537: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.2 : 1; }
+    },
+    1538: {
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.25 : 1; }
     },
     1539: {
-        def: function(p) { return 0.1; }
+        atk: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.cost <= 20 ? 1.5 : 1; }
     },
     1540: {
-        def: function(p) { return 0.1; }
+        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
     },
     1541: {
-        chainAddition: function(p) { return 0.5; },
-        def: function(p) { return 0; }
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1542: {
-        chainAddition: function(p){ return 0.5; },
-        def: function(p) { return 0; }
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'QCK']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'QCK',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        rcv: function(p) { return 1.2; },
+        hp: function(p) { return 1.2; },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1543: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return !(p.unit.class.has("Shooter")) ? 1 : p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
     },
     1544: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
     },
     1545: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1546: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1546].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1546].turnedOn = false;
-        },
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     1547: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1547].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1547].turnedOn = false;
-        },
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; }
     },
     1548: {
-        delay: function(p) { return 1; },
-        chainAddition: function(p){ return 0.2;}
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    1549: {
+        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
+    },
+    1550: {
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     1551: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1552: {
-        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost === 40 ? 2.5 : 1; }
     },
     1553: {
-        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.cost === 40 ? 2.75 : 1; }
     },
     1554: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
     },
     1555: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        type: "type"
+        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
+    },
+    1556: {
+        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    1557: {
+        atk: function(p) {
+            return p.unit.class.has("Striker") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
+    },
+    1558: {
+        atk: function(p) {
+            return p.unit.class.has("Shooter") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
     },
-    1556: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type",
-        warning: "Selected special (%name%) assumes that the enemy has over 3,000,000 HP."
+    1559: {
+        atk: function(p) {
+            return p.unit.class.has("Slasher") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
     },
-    1557: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1557].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1557].turnedOn = false;
+    1560: {
+        atk: function(p) {
+            return p.unit.class.has("Fighter") ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
         }
     },
     1561: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.type === "INT" ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+        }
     },
     1562: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) {
+            return p.unit.class.has("Powerhouse") ? Math.max(1.5, 3.5 - 0.1 * p.turnCounter) : 1;
+        }
     },
     1563: {
-        chainAddition: function(p) { return 0.3; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Fighter", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.1875 : 1.75;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1564: {
-        chainAddition: function(p) { return 0.3; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Fighter", "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1565: {
+        atk: function(p) { return 1.75; }
+    },
+    1566: {
+        atk: function(p) { return 2; }
     },
     1567: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1568: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    1569: {
+        atk: function(p) { return 2.25; }
     },
     1570: {
-        staticMult: function(p) { return 80; }
+        atk: function(p) { return !(p.unit.class.has("Cerebral")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.5; },
+        chainModifier: function(p) { return  p.percHP <= 30.0 ? 1.5 : 1; }
     },
     1571: {
-        staticMult: function(p) { return 80; }
+        atk: function(p) { return !(p.unit.class.has("Cerebral")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.5; },
+        chainModifier: function(p) { return  p.percHP <= 30.0 ? 1.5 : 1; }
     },
     1572: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1573: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1574: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
     },
     1575: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.25 : 1; }
     },
-    1578: {
-        chainAddition: function(p) {return window.specials[1578].multiplier;},
-        onActivation: function(p) {
-            var n = (window.specials[1578].multiplier === 0.2 ? 1 : window.specials[1578].multiplier === 0.3 ? 2 : 0);
-            window.specials[1578].multiplier = [0.2, 0.3, 0.5][n];
-            p.scope.notify({
-                text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
-                name: '1578warning'
-            });
-        }
+    1576: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1577: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1579: {
-        chainAddition: function(p) {return window.specials[1579].multiplier;},
-        onActivation: function(p) {
-            var n = (window.specials[1579].multiplier === 0.2 ? 1 : window.specials[1579].multiplier === 0.3 ? 2 : 0);
-            window.specials[1579].multiplier = [0.2, 0.3, 0.5][n];
-            p.scope.notify({
-                text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
-                name: '1579warning'
-            });
-        }
+        atk: function(p) { return 1.3; },
+        rcv: function(p) { return 1.3; },
+        hp: function(p) { return 1.3; }
     },
     1580: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     1581: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
     },
     1582: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        type: "class"
-    },
-    1583:{
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (window.specials[1583].multiplier === 1.5 ? 1 : 0);
-            window.specials[1583].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
-                name: '1583warning'
-            });
-        }
-    },
-    1584:{
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (window.specials[1584].multiplier === 1.5 ? 1 : 0);
-            window.specials[1584].multiplier = [1.5, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
-                name: '1584warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+    },
+    1583: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+    },
+    1584: {
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1585: {
-        atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
-        rcv: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1586: {
-        atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
-        rcv: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1587: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
-    },  
+        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
+        hp: function(p) { return 1.3; }
+    },
     1588: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
+        hp: function(p) { return 1.3; }
+    },
+    1589: {
+        chainModifier: function(p) { return 3; }
+    },
+    1590: {
+        chainModifier: function(p) { return 3.5; },
+        rcv: function(p) { return 1.2; },
+        hp: function(p) { return 1.2; }
     },
     1591: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
-        },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1592: {
-        atk: function(p) {
-            return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1;
-        },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
     },
     1593: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1593].turnedOn = true;
-            p.scope.notify({
-                text: 'This does not activate G4 Captain boost, only the "beneficial" Orb Effect, to enable G4\' 4x boost, use the Captain Action checkboxes.',
-                name: '1593warning'
-            });
-        },
-        onDeactivation: function(p) {
-            window.specials[1593].turnedOn = false;
+        atk: function(p){ 
+            return p.unit.class.has("Fighter") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
         }
     },
-    1594: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
-    },
     1595: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1596: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    1597: {
+        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.75 : 1; }
     },
     1598: {
-        atk: function(p) { return 1.2; },
-        type: "class"
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1599: {
-        def: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1600: {
-        orb: function(p) { return (p.unit.type === "INT" || p.unit.type === "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 2.5 : 1; }
+    },
+    1601: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1602: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1603: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "STR" ? 1.25 : 1; }
+    },
+    1604: {
+        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+    },
+    1605: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    1606: {//BB Pirates FN Lafitte
+        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+    },
+    1607: {//BB Pirates FN Van Augur
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    1608: {//BB Pirates FN Doc Q
+        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+    },
+    1609: {//Enel TO DO
+        hp: function(p) { return 0.8; },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
+    },
+    1610: {//Enel TO DO
+        hp: function(p) { return 0.8; },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
     },
-    1606: {
-        delay: function(p) { return 1; },
-        def: function(p) { return 0.5; }
+    1611: {
+        atk: function(p) {return p.unit.class.has("Shooter") ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
-    1607: {
-        atk: function(p) { return (p.unit.class.has("Shooter")) ? 1.5 : 1; },
-        type: "class"
+    1612: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1613: {
-        def: function(p) { return 0.5; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1614: {
-        def: function(p) { return 0.5; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; }
     },
     1615: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1616: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
     1617: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
     },
     1618: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
     },
     1619: {
-        delay: function(p) { return 1; }
+        chainModifier: function(p) { return 4; },
+        hp: function(p) { return 1.2; },
+        rcv: function(p) { return 1.2; }
     },
     1620: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     1621: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        type: "class"
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 3 : 2.5; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
     1622: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1623: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1624: {
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+    },
+    1625: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1626: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        type: "type"
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Powerhouse") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1627: {
-        affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1627].multiplier : 1; },
-        onActivation: function(p) {
-            var n = (window.specials[1627].multiplier === 1.25 ? 1 : window.specials[1627].multiplier === 1.5 ? 2 : 0);
-            window.specials[1627].multiplier = [1.25, 1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
-                name: '1627warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1628: {
-        affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1628].multiplier : 1; },
-        onActivation: function(p) {
-            var n = (window.specials[1628].multiplier === 1.25 ? 1 : window.specials[1628].multiplier === 1.5 ? 2 : 0);
-            window.specials[1628].multiplier = [1.25, 1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
-                name: '1628warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1629: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1630: {
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1631: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
     },
     1632: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
     },
     1633: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+    },
+    1634: {
+        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    1635: {
+        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1636: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1637: {
-        atk: function(p) { return 1.3; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25: 1; }
     },
-    1640: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1640].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1640].turnedOn = false;
+    1644: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    1645: {
+        atk: function(p) { 
+            return p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.96 :
+                p.unit.class.has("Slasher") && !p.unit.type === "DEX" ? 1.3 :
+                !p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.5 :
+                1;
         }
     },
-    1641: {
-        atk: function(p) { return 1.2; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
+    1646: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
-    1643: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
-        type: "class"
+    1647: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+    },
+    1648: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.4 : 1.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1649: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1650: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "DEX" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
     },
     1651: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1651].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1651].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1652: {
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1652].turnedOn = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1652].turnedOn = false;
-        }
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1653: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1654: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
     },
     1655: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1656: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
     1657: {
-        chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
-        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') ? 2.75 : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1658: {
-        chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
-        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') ? 2.75 : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    1659: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+    },
+    1660: {
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1661: {
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
     },
     1662: {
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.5 : 1; }
+    },
+    1663: {
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.5 : 2.5); },
+        rcv: function(p) { return 0; }
     },
     1664: {
-        atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1665: {
-        atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
-        type: "class"
-    },
-    1666: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1666].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (p.percHP <= 70 ? 1 : 1.5);
-            window.specials[1666].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
-                name: '1666warning'
-            });
-        }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition)
+                .subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1667: {
-        orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1667].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (p.percHP <= 70 ? 1 : 1.5);
-            window.specials[1667].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
-                name: '1667warning'
-            });
-        }
+        atk: function(p) { return !(p.unit.class.has("Striker")) ? 1 : p.percHP <= 30.0 ? 2.75 : 2.25; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
     1668: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1669: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1670: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
     },
     1671: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+    },
+    1672: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1673: {
-        def: function(p) { return 0.1; }
+        atk: function(p) { return 1.75; }
     },
     1674: {
-        def: function(p) { return 0.1; }
+        atk: function(p) { return 2.25; }
     },
     1675: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+        chainModifier: function(p) { return 2; }
     },
     1676: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+        chainModifier: function(p) { return 3.25; }
     },
     1677: {
-        affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
     1678: {
-        affinity: function(p){ return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Slasher" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Slasher")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1679: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1680: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
     1681: {
-        chainAddition: function(p) { return window.specials[1681].multiplier; },
-        onActivation: function(p) {
-            var n = (p.slot > 1 ? 0.5 : 0);
-            window.specials[1681].multiplier = n;
-            p.scope.notify({
-                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
-                name: '1681warning'
-            });
-        }
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
     },
     1682: {
-        chainAddition: function(p) { return window.specials[1682].multiplier; },
-        onActivation: function(p) {
-            var n = (p.slot > 1 ? 0.5 : 0);
-            window.specials[1682].multiplier = n;
-            p.scope.notify({
-                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
-                name: '1682warning'
-            });
-        }
+        damageSorter: function(d) { return CrunchUtils.lowCostSort(d, 3.5, 30); },
+        hitAtk: function(p) {
+            if (!(p.unit.cost <= 30)) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
     },
     1683: {
-        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
     },
     1684: {
-        atk: function(p) { return p.defenseDown ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
     },
     1685: {
-        delay: function(p) { return 1; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Shooter") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1686: {
-        delay: function(p) { return 1; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Shooter") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1687: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     1688: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1689: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 2.25 : 1.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1690: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
-        type: "type"
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'STR',
+                minModifier: 'Good'
+            }, {
+                type: 'DEX',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 3 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1691: {
-        atk: function(p) { return p.defenseDown ? 1.3 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; }
     },
     1692: {
-        chainAddition: function(p){ return 0.3; },
-        def: function(p) { return 0.5; }
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1693: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
     },
     1694: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; }
     },
     1695: {
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1696: {
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+    },
+    1697: {
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2.25;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.5;
+            else
+                return 1; 
+               }
+    },
+    1698: {
+        atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 2.25;
+            else
+                return 1; 
+               },
+        hp: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.5;
+            else
+                return 1; 
+               }
     },
     1699: {
-        chainAddition: function(p) { return 0.3; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1700: {
-        chainAddition: function(p) { return 0.3; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.3 : 1; }
+    },
+    1701: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+    },
+    1702: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1703: {
-        atk: function(p) { return 1.75; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been inflicted with Toxin."
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
     },
     1704: {
-        atk: function(p) { return 1.75; },
-        type: "condition",
-        warning: "Selected special (%name%) assumes that the enemy has been inflicted with Toxin."
+        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+    },
+    1705: {
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+    },
+    1706: {
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["STR"]); }, 
+        hitAtk: function(p) {
+            return !p.unit.type === "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1707: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; },
+        hp: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
+    },
+    1709: {
+        atk: function(p) { return 1.5; }
     },
     1710: {
-        orb: function(p) { return (p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1711: {
-        orb: function(p) { return (p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1712: {
-        orb: function(p) { return (p.unit.class.has("Driven")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1713: {
-        orb: function(p) { return (p.unit.class.has("Driven")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Driven") ? Math.min(3.25, 2.5 + 0.25 * p.turnCounter) : 1; }
+    },
+    1714: {
+        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+    },
+    1715: {
+        atk: function(p) { return !p.unit.class.has("Striker") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
     },
     1716: {
-        atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1716].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.75 : 1);
-            window.specials[1716].multiplier = n;
-            p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
-                name: '1716warning'
-            });
+        atk: function(p) {
+            return p.unit.class.has("Driven") ? Math.min(3, 1.2 + 0.1 * p.turnCounter) : 1;
         }
     },
     1718: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.25 : 1; },
-        type: "class"
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Driven" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Driven")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1719: {
+        atk: function(p) { return p.unit.type !== "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
     },
     1720: {
-        chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1721: {
-        chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2.5); },
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1722: {
-        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1722].multiplier : 1; },
-        type: "type",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.5 : 1);
-            window.specials[1722].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x multiplier.',
-                name: '1722warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1723: {
-        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1723].multiplier : 1; },
-        type: "type",
-        onActivation: function(p) {
-            var n = (p.percHP <= 30 ? 1.5 : 1);
-            window.specials[1723].multiplier = n;
-            p.scope.notify({
-                text: 'Using the ' + n + 'x multiplier.',
-                name: '1723warning'
-            });
-        }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1724: {
-        staticMult: function(p) { return 25; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1725: {
-        staticMult: function(p) { return 25; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1726: {
-        staticMult: function(p) { return 55; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 2.75 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1727: {
-        staticMult: function(p) { return 55; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Free Spirit") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.5 : 1;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1728: {
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
+    },
+    1729: {
+        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1; }
+    },
+    1730: {
+        atk: function(p) { return 2; }
+    },
+    1731: {
+        atk: function(p) { return 2; }
     },
     1732: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
-        type: "class"
+        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.1 : 1; }
     },
     1733: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
-        type: "class"
+        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+    },
+    1734: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+    },
+    1735: {
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1736: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
     },
     1737: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
     },
     1738: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1739: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1740: {
-        def: function(p) { return .2; },
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.1 : 1; }
     },
     1741: {
-        def: function(p) { return .2; },
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "DEX" ? 1.3 : 1; }
     },
     1742: {
-        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.1 : 1; }
     },
     1743: {
-        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type === "STR" ? 1.3 : 1; }
     },
     1744: {
-        orb: function(p) { return (p.unit.class.has("Shooter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1745: {
-        orb: function(p) { return (p.unit.class.has("Shooter")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1746: {
-        delay: function(p) { return 1; },
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1746].turnedOn = true;
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Shooter')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
         },
-        onDeactivation: function(p) {
-            window.specials[1746].turnedOn = false;
-        }
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1747: {
-        delay: function(p) { return 1; },
-        turnedOn: false,
-        onActivation: function(p) {
-            window.specials[1747].turnedOn = true;
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has('Shooter')) return 1;
+            var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
+            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
         },
-        onDeactivation: function(p) {
-            window.specials[1747].turnedOn = false;
-        }
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
-    1750:{
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (window.specials[1750].multiplier === 1.75 ? 1 : 0);
-            window.specials[1750].multiplier = [1.75, 2.25][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
-                name: '1584warning'
-            });
-        }
+    1748: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
     },
-    1751:{
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1751].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        onActivation: function(p) {
-            var n = (window.specials[1751].multiplier === 1.75 ? 1 : 0);
-            window.specials[1751].multiplier = [1.75, 2.25][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
-                name: '1584warning'
-            });
-        }
+    1749: {
+        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+    },
+    1750: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
+    },
+    1751: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
     },
     1752: {
-        atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1752].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1752].multiplier === 1.75 ? 1 : 0);
-            window.specials[1752].multiplier = [1.75, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
-                name: '1752warning'
-            });
-        }
+        atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
     },
     1753: {
-        atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1753].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1753].multiplier === 1.75 ? 1 : 0);
-            window.specials[1753].multiplier = [1.75, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
-                name: '1753warning'
-            });
-        }
+        damageSorter: function(d) { return CrunchUtils.lowCostSort(d, 3.5, 30); },
+        hitAtk: function(p) {
+            if (!(p.unit.cost <= 30)) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.5 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
     },
     1754: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1755: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1758: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.1 : 1; }
     },
     1759: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+    },
+    1760: {
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
+    },
+    1761: {
+        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
     },
     1762: {
-        def: function(p) { return .2; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4.026275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.66025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.3275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 3.025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.75 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        rcv: function(p) { return 0.5; }
     },
     1763: {
-        def: function(p) { return .2; }
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 4.026275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.66025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.3275 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 3.025 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.75 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
+        rcv: function(p) { return 0.5; }
     },
     1764: {
-        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') ? 2.5 : 1;
-        }
+        atk: function(p) {
+            return Math.min(3.5, 2.25 + 0.25 * p.turnCounter);
+        },
+        hp: function(p) { return 1.25; }
     },
     1765: {
-        def: function(p) { return .5; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1766: {
-        def: function(p) { return .5; }
+        chainModifier: function(p) { return 1.5; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+    },
+    1767: {
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1769: {
-        delay: function(p) { return 1; },
-        atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
     },
     1770: {
-        delay: function(p) { return 1; },
-        atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
-        type: "condition"
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
+        hitAtk: function(p) {
+            return !p.unit.class.has("Cerebral") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1771: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1772: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1773: {
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     1774: {
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
-    1777: {
-        chainAddition: function(p){ return 0.2;}
+    1775: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+    },
+    1776: {
+        atk: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; }
     },
     1778: {
-        chainAddition: function(p){ return 0.2;}
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     1779: {
-        chainAddition: function(p) {return 0.5;}
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     1780: {
-        chainAddition: function(p){ return 0.5;}
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+    },
+    1781: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1782: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.type === "2.25" ? 1.75 : 1; }
     },
     1783: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1784: {
-        atk: function(p) { return 1.5; },
-        type: "type"
-    },
-    1785: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.stars <= 4 ? 2.5 : 1; }
     },
     1791: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, [ "QCK", "STR", "DEX" ]); }, 
+        hitAtk: function(p) {
+            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1792: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
+        damageSorter: function(d) { return CrunchUtils.typeSort(d, 3.25, [ "QCK", "STR", "DEX" ]); }, 
+        hitAtk: function(p) {
+            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1793: {
-        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1793].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1793].multiplier === 1.75 ? 1 : 0);
-            window.specials[1793].multiplier = [1.75, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
-                name: '1793warning'
-            });
-        }
+        atk: function(p) { 
+            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
+                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+                    return 3.7125;
+                else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+                    return 2.75;
+                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
+                    return 1.35;
+                else
+                    return 1; 
+                }
+                else
+                    return 1;
+        },
+        hp: function(p) { 
+            if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.3;
+            else
+                return 1; 
+               }
     },
     1794: {
-        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1794].multiplier; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1794].multiplier === 1.75 ? 1 : 0);
-            window.specials[1794].multiplier = [1.75, 2][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
-                name: '1794warning'
-            });
-        }
+        atk: function(p) { 
+            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
+                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+                    return 3.7125;
+                else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+                    return 2.75;
+                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
+                    return 1.35;
+                else
+                    return 1; 
+                }
+                else
+                    return 1;
+        },
+        hp: function(p) { 
+            if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
+                return 1.3;
+            else
+                return 1; 
+               }
     },
     1795: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; }
     },
     1796: {
-        delay: function(p) { return 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1797: {
-        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1798: {
-        atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Driven") ? 1.25 : 1; }
     },
     1799: {
-        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
-        type: "condition"
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.25 : 1; }
     },
     1800: {
-        atk: function(p) { return p.defenseDown ? 1.75 : 1; },
-        type: "condition"
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; },
+        rcv: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1.2 : 1; }
     },
     1801: {
-        def: function(p) { return 0.1; }
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2 : 1; }
     },
     1802: {
-        def: function(p) { return 0.1; }
+        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; }
+    },
+    1803: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+    },
+    1804: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; }
     },
     1805: {
-		def: function(p) { return 0.0; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
     },
     1806: {
-		def: function(p) { return 0.0; },
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
     },
     1807: {
-        turnedOn: [ false, false ],
-        onActivation: function(p) {
-            window.specials[1807].turnedOn[p.slot] = true;
-        },
-        onDeactivation: function(p) {
-            window.specials[1807].turnedOn[p.slot] = false;
-        },
-        chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
-        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') ? 2.75 : 1;
-        },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        atk: function(p){ 
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
+            }
+            return p.unit.class.has("Slasher") ? specialEnabled ? 1.35 : 1 : 1; 
+        }
     },
     1808: {
-        turnedOn: [ false, false ],
-        onActivation: function(p) {
-            window.specials[1808].turnedOn[p.slot] = true;
+        atk: function(p){ 
+            var specialEnabled = false;
+            for(var i=0;i<2;i++)
+            {
+                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
+            }
+            if(p.unit.class.has("Slasher")){
+                if(p.actions[p.sourceSlot]){
+                    if (specialEnabled){
+                        return 3.5;
+                    } else {
+                        return 2.5;
+                    }
+                } else {
+                    if (specialEnabled){
+                        return 1.62;
+                    } else {
+                        return 1.2;
+                    }
+                }
+            }else{
+                return 1;
+            }
         },
-        onDeactivation: function(p) {
-            window.specials[1808].turnedOn[p.slot] = false;
+        hp: function(p) { return p.actions[p.sourceSlot] ? 1.3 : 1.1; }
+    },
+    1809: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
         },
-        chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
-        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') ? 2.75 : 1;
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1810: {
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.25 : 1;
         },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1811: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     1812: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1813: {
-        atk: function(p) { return p.slot === 1 ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return 2.25; }
     },
     1814: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
-        type: "class"
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1815: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
-        type: "class"
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Powerhouse")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1816: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
-        type: "class"
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.25 : 2.25); },
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1817: {
-        atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
-        type: "class"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2 : 1;
+        },
+        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"]
     },
     1818: {
-        atk: function(p) { return p.slot > 1 ? 1.2 : 1; },
-        type: "class"
+        hitAtk: function(p) {
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;
+        },
+        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return 1.2; }
     },
     1819: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+    },
+    1820: {
+        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+    },
+    1821: {
+        atk: function(p) { return 1.5; }
+    },
+    1822: {
+        atk: function(p) { return 2; }
+    },
+    1823: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+    },
+    1824: {
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Shooter")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1825: {
-        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 2.5 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1826: {
-        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
+        damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
+        hitAtk: function(p) {
+            return CrunchUtils.okamaCheck(p.damage.slice(0, p.chainPosition), p.modifiers, [{
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }, {
+                type: 'INT',
+                minModifier: 'Good'
+            }]) ? 3 : 1;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1827: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1828: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        type: "type"
+        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1829: {
-        orb: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1; }
     },
     1830: {
-        orb: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.5 : 1; }
     },
     1831: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+        atk: function(p) { 
+            if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
+            }
+            else
+                return 1; 
+        },
+        hp: function(p) { return 1.25; }
     },
     1832: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+        atk: function(p) { 
+            if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
+            }
+            else
+                return 1; 
+        },
+        hp: function(p) { return 1.25; }
+    },
+    1833: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.2 :
+                1;
+        },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.1 : 1; }
+    },
+    1834: {
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.3 :
+                1;
+        },
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1835: {
-        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
-        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') ? 2.5 : 1;
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.2 :
+                1;
         },
-        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1836: {
-        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
-        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') ? 2.5 : 1;
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.3 :
+                1;
         },
-        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1837: {
-        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.2 :
+                1;
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1838: {
-        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.3 :
+                1;
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1839: {
-        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
-        type: "condition",
-        staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.2 :
+                1;
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1840: {
-        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
-        type: "condition",
-        staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
+        atk: function(p) { 
+            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.3 :
+                1;
+        },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1841: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1842: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+    },
+    1843: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.5 : 1; }
+    },
+    1844: {
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; }
     },
     1845: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1846: {
-        def: function(p) { return 0; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.75 : 1; }
     },
     1847: {
-        atk: function(p) { return 1.5; },
-        type: "type"
+        atk: function(p) {  
+    
+            if(p.unit.cost <= 29){
+                return 3.25;
+            }else if(p.unit.cost === 54){
+                return 3;
+            }else{
+                return 1;
+            }
+        },
+        hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; }
+    },
+    1848: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+    },
+    1849: {
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; }
     },
     1850: {
-        chainAddition: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1851: {
-        chainAddition: function(p) { return 0.5; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; }
     },
     1853: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
+        atk: function(p) {
+            return (1 + 1.25 * ((100 - p.percHP) / 100));
+        },
+        hp: function(p) { return 1.2; }
     },
-    1853: {
-        atk: function(p) { return window.specials[1853].multiplier; },
-        type: "type",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); },
-        stage: -1,
-        onActivation: function(p) {
-            var n = (window.specials[1853].multiplier === 1 ? 1 : 0);
-            window.specials[1853].multiplier = [1, 1.5][n];
-            if(1853){
-            p.scope.notify({
-                text: 'Using only Orb Boost. To switch to the ATK and Orb boost, disable and re-enable this special',
-                name: '1853warning'
-            });
-        }else{
-           p.scope.notify({
-                text: 'Using ATK and Orb Boost. To switch to the Orb boost, disable and re-enable this special',
-                name: '1853warning'
-            }); 
-        }
-        }
+    1854: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1855: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        type: "class",
-        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
+        damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Free Spirit" ]); },
+        hitAtk: function(p) {
+            if (!p.unit.class.has("Free Spirit")) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1856: {
-        affinity: function(p){ return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1857: {
-        affinity: function(p){ return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     1858: {
-        staticMult: function(p) { return 65; }
+        hitAtk: function(p) {
+            if (!(p.unit.class.has("Striker"))) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1859: {
-        staticMult: function(p) { return 65; }
+        hitAtk: function(p) {
+            if (!(p.unit.class.has("Striker"))) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 2.5;
+        },
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     1861: {
-        atk: function(p) { return (p.delayed > 0 && (p.captain.class.has("Shooter"))) ? 1.75 : 1; },
-        type: "condition"
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
-    1865: {//Urouge FN
-        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1865].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1865].multiplier === 1.5 ? 1 : 0);
-            window.specials[1865].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1865warning'
-            });
-        }
+    1863: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+    },
+    1865: {
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
+    },
+    1867: {
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
+        chainModifier: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1869: {
-        delay: function(p) { return 1; }
+        hitAtk: function(p) {
+            if (!(p.unit.class.has("Slasher"))) return 1;
+            return p.modifiers.slice(0, p.chainPosition).subcontains(["Good", "Great", "Perfect"]) ? 4.225 : 3.25;
+        },
+        hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"],
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
+    },
+    1871: {
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
     },
     1873: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2.25 : 1; }
     },
-    1875: {
-        chainAddition: function(p) {return 0.5;}
+    1877: {
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     2000: {
-        atk: function(p) { return 1.75; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; }
     },
     2001: {
-        atk: function(p) { return 1.75; },
-        type: "class"
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2.5 : 1; }
     }
 };

From ddb95f331917fee9ef1ce9d939c4e2e3e7c14bba Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:52:54 -0500
Subject: [PATCH 1567/1569] Revert "Fixed Kid Smoker special"

This reverts commit 612b022d25cb6a83fa50d5cc2d4b1793455b8278.
---
 common/data/specials.js | 873 +++++++++++++++++++---------------------
 1 file changed, 421 insertions(+), 452 deletions(-)

diff --git a/common/data/specials.js b/common/data/specials.js
index cf0df55ad..9949364d7 100644
--- a/common/data/specials.js
+++ b/common/data/specials.js
@@ -1,15 +1,15 @@
 window.specials = {
     13: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     14: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     15: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     16: {
-        delay: function(p) { return 2; }
+        delay: function(p) { return 2; },
     },
     18: {
         def: function(p) { return 0.5; }
@@ -33,25 +33,25 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     204: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     206: {
         def: function(p) { return 0.5; }
     },
     209: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
         type: "type"
     },
     210: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
         type: "type"
     },
     222: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
     },
     223: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
         type: "type"
     },
     263: {
@@ -121,11 +121,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     399: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
         type: "type"
     },
     400: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
         type: "type"
     },
     401: {
@@ -147,10 +147,10 @@ window.specials = {
         type: "type"
     },
     415: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     416: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     417: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
@@ -168,7 +168,7 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     426: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.05 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 1.05 : 1; },
         type: "type"
     },
     429: {
@@ -192,11 +192,11 @@ window.specials = {
         type: "class"
     },
     454: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
         type: "type"
     },
     455: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
         type: "type"
     },
     458: {
@@ -208,7 +208,7 @@ window.specials = {
         type: "type"
     },
     460: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     461: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
@@ -222,7 +222,7 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
     },
     466: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     468: {
         rcv: function(p) { return 1.5; }
@@ -231,41 +231,41 @@ window.specials = {
         rcv: function(p) { return 1.5; }
     },
     487: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
         type: "type"
     },
     488: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
         type: "type"
     },
     489: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
         type: "type"
     },
     490: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
         type: "type"
     },
     491: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
         type: "type"
     },
     492: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
         type: "type"
     },
     499: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     500: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     505: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
         type: "type"
     },
     506: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 1.25 : 1; },
         type: "type"
     },
     509: {
@@ -282,7 +282,7 @@ window.specials = {
     },
     514: {
         def: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
         type: "type"
     },
     517: {
@@ -294,11 +294,11 @@ window.specials = {
         type: "type"
     },
     519: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
         type: "type"
     },
     520: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
         type: "type"
     },
     529: {
@@ -317,11 +317,11 @@ window.specials = {
         rcv: function(p) { return 2; }
     },
     545: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
     },
     546: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
     },
     549: {
@@ -336,10 +336,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     555: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     556: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     559: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -359,7 +359,7 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
         type: "class",
         onActivation: function(p) { p.tdata.lock = Math.max(1, p.tdata.lock); },
-        onDeactivation: function(p) { if (p.tdata.lock === 1) p.tdata.lock = 0; }
+        onDeactivation: function(p) { if (p.tdata.lock == 1) p.tdata.lock = 0; }
     },
     574: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; },
@@ -373,11 +373,11 @@ window.specials = {
         rcv: function(p) { return 1.5; }
     },
     582: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
         type: "type"
     },
     583: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 300: 0; }
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 300: 0; },
     },
     589: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
@@ -394,19 +394,19 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     600: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
         type: "type"
     },
     601: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
         type: "type"
     },
     602: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
         type: "type"
     },
     603: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
         type: "type"
     },
     612: {
@@ -437,11 +437,11 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     634: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
         type: "type"
     },
     635: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.2 : 1; },
         type: "type"
     },
     637: {
@@ -457,11 +457,11 @@ window.specials = {
     },
     644: {
         atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition"
+        type: "condition",
     },
     645: {
         atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition"
+        type: "condition",
     },
     648: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -501,7 +501,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[668].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[668].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[668].multiplier == 1.5 ? 1 : 0);
             window.specials[668].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -513,7 +513,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[669].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[669].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[669].multiplier == 1.5 ? 1 : 0);
             window.specials[669].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -530,17 +530,17 @@ window.specials = {
         type: "class"
     },
     680: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
         type: "type"
     },
     681: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.25 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.25 : 1; },
         type: "type"
     },
     686: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     687: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; },
@@ -587,7 +587,7 @@ window.specials = {
             var n = (p.percHP <= 30 ? 2 : 1.5);
             window.specials[719].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '719warning'
             });
         }
@@ -599,7 +599,7 @@ window.specials = {
             var n = (p.percHP <= 30 ? 2 : 1.5);
             window.specials[720].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '720warning'
             });
         }
@@ -608,11 +608,11 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     730: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
         type: "type"
     },
     731: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
         type: "type"
     },
     732: {
@@ -656,22 +656,22 @@ window.specials = {
         type: "type"
     },
     762: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
         type: "type"
     },
     766: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     770: {
         atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
-        type: "condition"
+        type: "condition",
     },
     771: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
         type: "type"
     },
     780: {
-        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[780].multiplier : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[780].multiplier : 1; },
         type: "type",
         onActivation: function(p) {
             var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
@@ -683,7 +683,7 @@ window.specials = {
         }
     },
     781: {
-        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[781].multiplier : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[781].multiplier : 1; },
         type: "type",
         onActivation: function(p) {
             var n = (p.percHP <= 20 ? 2 : (p.percHP <= 50 ? 1.75 : 1.5));
@@ -695,16 +695,16 @@ window.specials = {
         }
     },
     782: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     783: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     786: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     787: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     788: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
@@ -723,17 +723,17 @@ window.specials = {
         type: "type"
     },
     794: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     795: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     796: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     797: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     798: {
@@ -799,7 +799,7 @@ window.specials = {
             var n = (p.percHP < 20 ? 1.75 : 1);
             window.specials[828].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
                 name: '828warning'
             });
         }  
@@ -811,7 +811,7 @@ window.specials = {
             var n = (p.percHP < 20 ? 1.75 : 1);
             window.specials[829].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 20%, using the ' + n + 'x multiplier.',
                 name: '829warning'
             });
         }
@@ -839,22 +839,22 @@ window.specials = {
         type: "class"
     },
     839: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     840: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     841: {
         delay: function(p) { return 1; },
         atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
-        type: "condition"
+        type: "condition",
     },
     842: {
         delay: function(p) { return 1; },
         atk: function(p) { return p.delayed > 0 ? 1.25 : 1; },
-        type: "condition"
+        type: "condition",
     },
     843: {
         atk: function(p) {
@@ -906,11 +906,11 @@ window.specials = {
         type: "class"
     },
     857: {
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
         type: "type"
     },
     858: {
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; },
         type: "type"
     },
     861: {
@@ -926,16 +926,16 @@ window.specials = {
         delay: function(p) { return 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     865: {
         delay: function(p) { return 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     866: {
@@ -945,7 +945,7 @@ window.specials = {
         type: "class"
     },
     867: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     869: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2.0, [p.friendCaptain, p.captain]); }
@@ -1003,7 +1003,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[883].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[883].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[883].multiplier == 1.5 ? 1 : 0);
             window.specials[883].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1015,7 +1015,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[884].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[884].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[884].multiplier == 1.5 ? 1 : 0);
             window.specials[884].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1058,7 +1058,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[902].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[902].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[902].multiplier == 1.5 ? 1 : 0);
             window.specials[902].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1070,7 +1070,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Powerhouse') ? 1 : window.specials[903].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[903].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[903].multiplier == 1.5 ? 1 : 0);
             window.specials[903].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1079,13 +1079,13 @@ window.specials = {
         }
     },
     904: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     905: {
         atk: function(p) {
-            if (!window.specials[905].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
-            if (window.specials[905].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-            if (window.specials[905].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+            if (!window.specials[905].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
+            if (window.specials[905].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[905].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
         },
         type: "class",
         stage: -1,
@@ -1099,9 +1099,9 @@ window.specials = {
     },
     906: {
         atk: function(p) {
-            if (!window.specials[906].stage) return p.slot === p.sourceSlot ? 1.5 : 1;
-            if (window.specials[906].stage === 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
-            if (window.specials[906].stage === 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
+            if (!window.specials[906].stage) return p.slot == p.sourceSlot ? 1.5 : 1;
+            if (window.specials[906].stage == 1) return p.unit.class.has("Slasher") ? 1.5 : 1;
+            if (window.specials[906].stage == 2) return p.unit.class.has("Slasher") ? 1.75 : 1;
         },
         type: "class",
         stage: -1,
@@ -1114,23 +1114,23 @@ window.specials = {
         }
     },
     907: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     908: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     909: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
     },
     910: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
     },
     911: {
         atk: function(p) {
             if (!window.specials[911].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-            if (window.specials[911].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+            if (window.specials[911].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1145,7 +1145,7 @@ window.specials = {
     912: {
         atk: function(p) {
             if (!window.specials[912].stage) return p.unit.class.has("Powerhouse") ? 1.2 : 1;
-            if (window.specials[912].stage === 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
+            if (window.specials[912].stage == 1) return p.unit.class.has("Powerhouse") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1168,10 +1168,10 @@ window.specials = {
         type: "class"
     },
     917: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     918: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     921: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -1204,11 +1204,11 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has been poisoned or STRONGLY Poisoned."
     },
     940: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
         type: "type"
     },
     941: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
         type: "type"
     },
     944: {
@@ -1222,7 +1222,7 @@ window.specials = {
         type: "class"
     },
     947: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.3 : 1; },
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.3 : 1; },
         type: "type"
     },
     954: {
@@ -1246,7 +1246,7 @@ window.specials = {
         atk: function(p) { return window.specials[964].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[964].multiplier === 1.1 ? 1 : 0);
+            var n = (window.specials[964].multiplier == 1.1 ? 1 : 0);
             window.specials[964].multiplier = [1.1, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
@@ -1258,7 +1258,7 @@ window.specials = {
         atk: function(p) { return window.specials[965].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[965].multiplier === 1.1 ? 1 : 0);
+            var n = (window.specials[965].multiplier == 1.1 ? 1 : 0);
             window.specials[965].multiplier = [1.1, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.1, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.1][n] + 'x multiplier, disable and re-enable this special',
@@ -1267,11 +1267,13 @@ window.specials = {
         }
     },
     975: {
-        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
         type: "class"
     },
     976: {
-        atk: function(p) { return (p.unit.class.has("Driven") || p.unit.class.has("Striker")) ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? 1.3 : 1; },
         type: "class"
     },
     977: {
@@ -1281,56 +1283,56 @@ window.specials = {
         chainAddition: function(p){ return 0.5;}
     },
     984: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     981: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     998: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     999: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1005: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1006: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1010: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
         type: "type"
     },
     1011: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.3 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.3 : 1; },
         type: "type"
     },
     1013: {
         atk: function(p) { return p.delayed > 0 ? 1.2 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1015: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
         type: "type"
     },
     1016: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
         type: "type"
     },
     1017: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
         type: "class"
     },
     1018: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1},
         type: "class"
     },
     1023: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1},
         type: "class"
     },
     1024: {
@@ -1339,7 +1341,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1024].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
                 name: '1024warning'
             });
         }
@@ -1350,7 +1352,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.25 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1025].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Orb boost.',
                 name: '1025warning'
             });
         }
@@ -1366,11 +1368,11 @@ window.specials = {
         type: "condition"
     },
     1030: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1031: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1040: {
@@ -1422,12 +1424,12 @@ window.specials = {
     1061: {
         chain: function(p) { return 2; },
         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') ? 2 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2 : 1;
         }
     },
     1063: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.3 : 1},
         type: "class"
     },
     1065: {
@@ -1437,29 +1439,29 @@ window.specials = {
         chainAddition: function(p){ return 0.1;}
     },
     1067: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type"
     },
     1071: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
         type: "class"
     },
     1072: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
         type: "class"
     },
     1076: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1077: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1080: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1081: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1082: {
@@ -1469,7 +1471,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1082].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
                 name: '1082warning'
             });
         }
@@ -1481,7 +1483,7 @@ window.specials = {
             var n = (p.percHP >= 70 ? 1.2 : p.percHP >= 30 ? 1.5 : 1.75);
             window.specials[1083].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below 30%' : n === 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
+                text: 'HP ' + (n == 1.75 ? 'below 30%' : n == 1.5 ? 'between 70% and 30%' : 'above 70%') + ', using the ' + n + 'x Attack boost.',
                 name: '1083warning'
             });
         }
@@ -1493,19 +1495,19 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1088: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
         type: "class"
     },
     1089: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
         type: "class"
     },
     1096: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1097: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1099: {
@@ -1515,11 +1517,11 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1101: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
         type: "type"
     },
     1102: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" ? 1.75 : 1; },
         type: "type"
     },
     1105: {
@@ -1549,28 +1551,28 @@ window.specials = {
         type: "type"
     },
     1114: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
         type: "type" 
     },
     1115: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
         type: "type" 
     },
     1122: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1123: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1132: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter")  ? window.specials[1132].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1132].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1132].multiplier == 1.5 ? 1 : 0);
             window.specials[1132].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1582,7 +1584,7 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Shooter") ? window.specials[1133].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1133].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1133].multiplier == 1.5 ? 1 : 0);
             window.specials[1133].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -1594,22 +1596,22 @@ window.specials = {
         orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1138: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.3 : 1},
         type: "class"
     },
     1142: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1143: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1153: {
         def: function(p) { return 0; },
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1},
         type: "class" 
     },
     1154: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1},
         type: "class"
     },
     1164: {
@@ -1621,25 +1623,25 @@ window.specials = {
         rcv: function(p) { return 1.5; }
     },
     1168: {
-        atk: function(p) { return p.unit.type === "STR" ? window.specials[1168].multiplier : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? window.specials[1168].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
             var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
             window.specials[1168].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' ' + (n == 1.75 ? '10%' : n == 1.5 ? '10%' : n == 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
                 name: '1168warning'
             });
         }
     },
     1169: {
-        atk: function(p) { return p.unit.type === "STR" ? window.specials[1169].multiplier : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? window.specials[1169].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
             var n = (p.percHP <= 10 ? 1.75 : p.percHP <= 30 ? 1.5 : p.percHP <= 50 ? 1.25 : 1.1);
             window.specials[1169].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' ' + (n === 1.75 ? '10%' : n === 1.5 ? '10%' : n === 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' ' + (n == 1.75 ? '10%' : n == 1.5 ? '10%' : n == 1.25 ? '30%' : '50%') + ', using the ' + n + 'x multiplier.',
                 name: '1168warning'
             });
         }
@@ -1665,15 +1667,15 @@ window.specials = {
     1193: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1194: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1195: {
@@ -1685,10 +1687,10 @@ window.specials = {
         type: "class"
     },
     1209: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1210: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1211: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -1699,8 +1701,8 @@ window.specials = {
     1219: {
         atk: function(p) {
             if (!window.specials[1219].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-            if (window.specials[1219].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            if (window.specials[1219].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
+            if (window.specials[1219].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1219].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1715,8 +1717,8 @@ window.specials = {
     1220: {
         atk: function(p) {
             if (!window.specials[1220].stage) return p.unit.class.has("Shooter") ? 1.2 : 1;
-            if (window.specials[1220].stage === 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
-            if (window.specials[1220].stage === 2) return p.unit.class.has("Shooter") ? 2 : 1;
+            if (window.specials[1220].stage == 1) return p.unit.class.has("Shooter") ? 1.5 : 1;
+            if (window.specials[1220].stage == 2) return p.unit.class.has("Shooter") ? 2 : 1;
         },
         type: "class",
         stage: -1,
@@ -1747,10 +1749,10 @@ window.specials = {
         }
     },
     1225: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1227: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1231: {
@@ -1786,10 +1788,10 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1235: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1236: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1237: {
         //TODO
@@ -1837,7 +1839,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1245].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1245].multiplier === 1.3 ? 1 : 0);
+            var n = (window.specials[1245].multiplier == 1.3 ? 1 : 0);
             window.specials[1245].multiplier = [1.3, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
@@ -1849,7 +1851,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1246].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1246].multiplier === 1.3 ? 1 : 0);
+            var n = (window.specials[1246].multiplier == 1.3 ? 1 : 0);
             window.specials[1246].multiplier = [1.3, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
@@ -1861,7 +1863,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Fighter') ? 1 : window.specials[1247].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1247].multiplier === 1.3 ? 1 : 0);
+            var n = (window.specials[1247].multiplier == 1.3 ? 1 : 0);
             window.specials[1247].multiplier = [1.3, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.3][n] + 'x multiplier, disable and re-enable this special',
@@ -1878,7 +1880,7 @@ window.specials = {
         type: "class"
     },
     1253: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
         type: "class"
     },
     1254: {
@@ -1888,7 +1890,7 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
     },
     1256: {
-        atk: function(p) { return 1.3; },
+        atk: function(p) { return 1.3 },
         type: "condition",
         warning: "Selected special (%name%) assumes that the enemy has a defense buff active."
     },
@@ -1917,11 +1919,11 @@ window.specials = {
         affinity: function(p){ return p.unit.class.has("Shooter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
     },
     1263: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1264: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1265: {
@@ -1967,7 +1969,7 @@ window.specials = {
     1282: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); },
     },
     1283: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
@@ -1988,17 +1990,17 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1297: {
-        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
     },
     1298: {
-        affinity: function(p){ return p.unit.type === "STR" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type == "STR" ? 1.75 : 1; }
     },
     1299: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
         type: "class"
     },
     1300: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
         type: "class"
     },
     1313: {
@@ -2027,11 +2029,11 @@ window.specials = {
     },
     1321: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1322: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1323: {
         turnedOn: false,
@@ -2072,8 +2074,8 @@ window.specials = {
     1339: {
         chainAddition: function(p) {
             if (!window.specials[1339].stage) return 0.2;
-            if (window.specials[1339].stage === 1) return 0.3;
-            if (window.specials[1339].stage === 2) return 0.5;
+            if (window.specials[1339].stage == 1) return 0.3;
+            if (window.specials[1339].stage == 2) return 0.5;
         },
         stage: -1,
         onActivation: function(p) {
@@ -2085,10 +2087,10 @@ window.specials = {
         }
     },
     1340: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1341: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1343: {
         atk: function(p) { return p.defenseDown ? 1.3 : 1; },
@@ -2101,7 +2103,7 @@ window.specials = {
     1348: {
         atk: function(p) { return 1.2; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.2, [p.friendCaptain, p.captain]); },
     },
     1349: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -2115,10 +2117,10 @@ window.specials = {
         chainAddition: function(p){ return 0.5; }
     },
     1354: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
     },
     1355: {
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); },
     },
     1358: {
         delay: function(p) { return 1; },
@@ -2130,61 +2132,61 @@ window.specials = {
     },
     1361: {
         atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
-        type: "class"
+        type: "class",
     },
     1362: {
         atk: function(p) { return !p.unit.class.has('Slasher') ? 1 : p.sourceSlot < 2 ? 2 : 1.75 ; },
-        type: "class"
+        type: "class",
     },
     1363: {
-        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1364: {
-        orb: function(p) { return p.unit.type === "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.type == "PSY" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1365: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1366: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1367:{
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1367].multiplier, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1367].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1367].multiplier == 1.5 ? 1 : 0);
             window.specials[1367].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1367warning'
             });
-        }
+        },
     },
     1368:{
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1368].multiplier, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1368].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1368].multiplier == 1.5 ? 1 : 0);
             window.specials[1368].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Orb boost. To switch to the ' + [1.75, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1368warning'
             });
-        }
+        },
     },
     1373: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1374: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1375: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1376: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1379: {
         turnedOn: false,
@@ -2207,10 +2209,10 @@ window.specials = {
         orb: function(p) { return (p.unit.class.has("Free Spirit") || p.unit.class.has("Cerebral")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1387: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1389: {
-        orb: function(p) { return p.unit.type === "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.type == "INT" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1390: {
         atk: function(p) { return p.unit.cost <= 40 ? 1.75 : 1; },
@@ -2221,13 +2223,13 @@ window.specials = {
         type: "class"
     },
     1392: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
         type: "class"
     },
     1393: {
         atk: function(p) { return 1.1; },
         type: "class",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.1, [p.friendCaptain, p.captain]); },
     },
     1394: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2248,36 +2250,36 @@ window.specials = {
     1400: {
         affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1400].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1400].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1400].multiplier == 1.5 ? 1 : 0);
             window.specials[1400].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
                 name: '1400warning'
             });
-        }
+        },
     },
     1401: {
         affinity: function(p) { return p.unit.class.has("Shooter") ? window.specials[1401].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1401].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1401].multiplier == 1.5 ? 1 : 0);
             window.specials[1401].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x Affinity boost. To switch to the ' + [1.75, 1.5][n] + 'x Affinity boost, disable and re-enable this special',
                 name: '1401warning'
             });
-        }
+        },
     },
     1402: {
-        atk: function(p) { return p.unit.type === "PSY" ? window.specials[1402].multiplier : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? window.specials[1402].multiplier : 1; },
         type: "type",
         onActivation: function(p) {
-            var n = (window.specials[1402].multiplier === 1.3 ? 1 : 0);
+            var n = (window.specials[1402].multiplier == 1.3 ? 1 : 0);
             window.specials[1402].multiplier = [1.3, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.3, 1.5][n] + 'x Type boost. To switch to the ' + [1.5, 1.3][n] + 'x Type boost, disable and re-enable this special',
                 name: '1402warning'
             });
-        }
+        },
     },
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
@@ -2292,11 +2294,11 @@ window.specials = {
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection."
     },
     1407: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 2 : 1; },
         type: "type"
     },
     1408: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 2 : 1; },
         type: "type"
     },
     1409: {
@@ -2333,10 +2335,10 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1421].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (p.percHP === 100 ? 2 : 1.5);
+            var n = (p.percHP == 100 ? 2 : 1.5);
             window.specials[1421].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
                 name: '1421warning'
             });
         }
@@ -2345,10 +2347,10 @@ window.specials = {
         atk: function(p) { return p.unit.class.has("Driven") ? window.specials[1422].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (p.percHP === 100 ? 2 : 1.5);
+            var n = (p.percHP == 100 ? 2 : 1.5);
             window.specials[1422].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2 ? 'equal to' : 'below') + ' 100%, using the ' + n + 'x multiplier.',
                 name: '1422warning'
             });
         }
@@ -2362,7 +2364,7 @@ window.specials = {
         warning: "Selected special (%name%) assumes that an ally has been inflicted with Bind."
     },
     1428: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "class",
         warning: "Selected special (%name%) assumes that the enemy has been Delayed."
     },
@@ -2375,20 +2377,20 @@ window.specials = {
         type: "type"
     },
     1435: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1436: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1437: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1438: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
         type: "condition",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1439: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
@@ -2401,41 +2403,41 @@ window.specials = {
     1441: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1442: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1443: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1444: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
         type: "class",
-        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.class.has("Powerhouse") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1445: {
         delay: function(p) { return 1; },
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.75 : 1; },
         type: "type"
     },
     1446: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1447: {
-        atk: function(p) { return p.slot === p.sourceSlot ? window.specials[1447].multiplier : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? window.specials[1447].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1447].multiplier === 1.2 ? 1 : 0);
+            var n = (window.specials[1447].multiplier == 1.2 ? 1 : 0);
             window.specials[1447].multiplier = [1.2, 1.5][n];
             p.scope.notify({
                 text: 'Using the ' + [1.2, 1.5][n] + 'x ATK multiplier. To switch to the ' + [1.5, 1.2][n] + 'x multiplier, disable and re-enable this special',
@@ -2458,7 +2460,7 @@ window.specials = {
         type: "condition"
     },
     1461: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
         type: "type"
     },
     1462: {
@@ -2486,10 +2488,10 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1468: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1469: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1476: {
         delay: function(p) { return 1; },
@@ -2506,49 +2508,49 @@ window.specials = {
         type: "class"
     },
     1478: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
         type: "type"
     },
     1479: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
         type: "type"
     },
     1482: {
         atk: function(p) { return window.specials[1482].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1482].multiplier === 1.25 ? 1 : 0);
+            var n = (window.specials[1482].multiplier == 1.25 ? 1 : 0);
             window.specials[1482].multiplier = [1.25, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
                 name: '1482warning'
             });
-        }
+        },
     },
     1483: {
         atk: function(p) { return window.specials[1483].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1483].multiplier === 1.25 ? 1 : 0);
+            var n = (window.specials[1483].multiplier == 1.25 ? 1 : 0);
             window.specials[1483].multiplier = [1.25, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.25][n] + 'x multiplier, disable and re-enable this special',
                 name: '1483warning'
             });
-        }
+        },
     },
     1484: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1485: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1486: {
@@ -2567,7 +2569,7 @@ window.specials = {
         atk: function(p) { return !p.unit.class.has('Free Spirit') ? 1 : window.specials[1492].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1492].multiplier === 1.5 ? 1 : window.specials[1492].multiplier === 1.75 ? 2 : 0);
+            var n = (window.specials[1492].multiplier == 1.5 ? 1 : window.specials[1492].multiplier == 1.75 ? 2 : 0);
             window.specials[1492].multiplier = [1.5, 1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [1.75, 2, 1.5][n] + 'x multiplier, disable and re-enable this special',
@@ -2576,7 +2578,7 @@ window.specials = {
         }
     },
     1497: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type"
     },
     1501: {
@@ -2584,11 +2586,11 @@ window.specials = {
         type: "type"
     },
     1505: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1506: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.25 : 1; },
         type: "type"
     },
     1507: {
@@ -2600,7 +2602,7 @@ window.specials = {
         type: "class"
     },
     1511: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : 1; },
         type: "type"
     },
     1512: {
@@ -2610,7 +2612,7 @@ window.specials = {
             var n = (p.percHP <= 30 ? 1.5 : 1);
             window.specials[1512].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.5 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 1.5 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '1512warning'
             });
         }
@@ -2640,37 +2642,37 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1522: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
-        type: "type"
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
+        type: "type",
     },
     1525: {
         delay: function(p) { return 1; },
         atk: function(p) { return p.delayed > 0 ? 1.3 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1526: {
         atk: function(p) { return p.slot < 2 ? window.specials[1526].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1526].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1526].multiplier == 1.5 ? 1 : 0);
             window.specials[1526].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
                 name: '1526warning'
             });
-        }
+        },
     },
     1527: {
         atk: function(p) { return p.slot < 2 ? window.specials[1527].multiplier : 1; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1527].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1527].multiplier == 1.5 ? 1 : 0);
             window.specials[1527].multiplier = [1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
                 name: '1527warning'
             });
-        }
+        },
     },
     1528: {
         turnedOn: false,
@@ -2689,7 +2691,7 @@ window.specials = {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1529].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
                 name: '1529warning'
             });
         }
@@ -2700,7 +2702,7 @@ window.specials = {
             var n = (p.percHP >= 50 ? 2.25 : 2);
             window.specials[1530].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 2.25 ? 'above' : 'below') + ' 50%, using the ' + n + 'x multiplier.',
                 name: '1530warning'
             });
         }
@@ -2709,7 +2711,7 @@ window.specials = {
         delay: function(p) { return 1; },
         chainAddition: function(p) {return window.specials[1531].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1531].multiplier === 0.2 ? 1 : 0);
+            var n = (window.specials[1531].multiplier == 0.2 ? 1 : 0);
             window.specials[1531].multiplier = [0.2, 0.3][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2721,7 +2723,7 @@ window.specials = {
         delay: function(p) { return 1; },
         chainAddition: function(p) {return window.specials[1532].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1532].multiplier === 0.2 ? 1 : 0);
+            var n = (window.specials[1532].multiplier == 0.2 ? 1 : 0);
             window.specials[1532].multiplier = [0.2, 0.3][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3][n] + 'x chain addition. To switch to the ' + [0.3, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2730,11 +2732,11 @@ window.specials = {
         }
     },
     1535: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
         type: "type"
     },
     1536: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
         type: "type"
     },
     1539: {
@@ -2752,7 +2754,7 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1543: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1544: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -2789,28 +2791,28 @@ window.specials = {
         chainAddition: function(p){ return 0.2;}
     },
     1551: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1552: {
-        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
+        atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
         type: "class"
     },
     1553: {
-        atk: function(p) { return p.unit.cost === 40 ? 1.75 : 1; },
+        atk: function(p) { return p.unit.cost == 40 ? 1.75 : 1; },
         type: "class"
     },
     1554: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        type: "type"
+        atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        type: "type",
     },
     1555: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.35 : 1; },
-        orb: function(p) { return p.unit.type === "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
-        type: "type"
+        atk: function(p) { return p.unit.type == "DEX" ? 1.35 : 1; },
+        orb: function(p) { return p.unit.type == "DEX" ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.35, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
+        type: "type",
     },
     1556: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type",
         warning: "Selected special (%name%) assumes that the enemy has over 3,000,000 HP."
     },
@@ -2821,7 +2823,7 @@ window.specials = {
         },
         onDeactivation: function(p) {
             window.specials[1557].turnedOn = false;
-        }
+        },
     },
     1561: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2858,15 +2860,15 @@ window.specials = {
         type: "class"
     },
     1574: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1575: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1578: {
         chainAddition: function(p) {return window.specials[1578].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1578].multiplier === 0.2 ? 1 : window.specials[1578].multiplier === 0.3 ? 2 : 0);
+            var n = (window.specials[1578].multiplier == 0.2 ? 1 : window.specials[1578].multiplier == 0.3 ? 2 : 0);
             window.specials[1578].multiplier = [0.2, 0.3, 0.5][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2877,7 +2879,7 @@ window.specials = {
     1579: {
         chainAddition: function(p) {return window.specials[1579].multiplier;},
         onActivation: function(p) {
-            var n = (window.specials[1579].multiplier === 0.2 ? 1 : window.specials[1579].multiplier === 0.3 ? 2 : 0);
+            var n = (window.specials[1579].multiplier == 0.2 ? 1 : window.specials[1579].multiplier == 0.3 ? 2 : 0);
             window.specials[1579].multiplier = [0.2, 0.3, 0.5][n];
             p.scope.notify({
                 text: 'Using the ' + [0.2, 0.3, 0.5][n] + 'x chain addition. To switch to the ' + [0.3, 0.5, 0.2][n] + 'x chain addition, disable and re-enable this special',
@@ -2899,24 +2901,24 @@ window.specials = {
     1583:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1583].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1583].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1583].multiplier == 1.5 ? 1 : 0);
             window.specials[1583].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1583warning'
             });
-        }
+        },
     },
     1584:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1584].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1584].multiplier === 1.5 ? 1 : 0);
+            var n = (window.specials[1584].multiplier == 1.5 ? 1 : 0);
             window.specials[1584].multiplier = [1.5, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.5, 2][n] + 'x Orb boost. To switch to the ' + [2, 1.5][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1584warning'
             });
-        }
+        },
     },
     1585: {
         atk: function(p) { return (p.percHP*p.maxHP/100 < 5000 && (p.unit.class.has("Slasher") || p.unit.class.has("Driven"))) ? 1.75 : 1; },
@@ -2929,11 +2931,11 @@ window.specials = {
         type: "class"
     },
     1587: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },  
     1588: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1591: {
@@ -2968,32 +2970,32 @@ window.specials = {
         orb: function(p) { return (p.unit.class.has("Powerhouse")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1598: {
-        atk: function(p) { return 1.2; },
-        type: "class"
+        atk: function(p) { return 1.2 },
+        type: "class",
     },
     1599: {
-        def: function(p) { return 0.5; }
+        def: function(p) { return 0.5 },
     },
     1600: {
-        orb: function(p) { return (p.unit.type === "INT" || p.unit.type === "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return (p.unit.type == "INT" || p.unit.type == "PSY") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },	
     },
     1603: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1606: {
         delay: function(p) { return 1; },
-        def: function(p) { return 0.5; }
+        def: function(p) { return 0.5 },
     },
     1607: {
         atk: function(p) { return (p.unit.class.has("Shooter")) ? 1.5 : 1; },
-        type: "class"
+        type: "class",
     },
     1613: {
-        def: function(p) { return 0.5; },
+        def: function(p) { return 0.5 },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1614: {
-        def: function(p) { return 0.5; },
+        def: function(p) { return 0.5 },
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1615: {
@@ -3007,23 +3009,23 @@ window.specials = {
         orb: function(p) { return p.unit.class.has("Striker") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1617: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
         type: "type"
     },
     1618: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "INT" || p.unit.type === "DEX" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "INT" || p.unit.type == "DEX" ? 1.75 : 1; },
         type: "type"
     },
     1619: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1620: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        type: "class"
+        type: "class",
     },
     1621: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        type: "class"
+        type: "class",
     },
     1622: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
@@ -3032,13 +3034,13 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1626: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
         type: "type"
     },
     1627: {
         affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1627].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1627].multiplier === 1.25 ? 1 : window.specials[1627].multiplier === 1.5 ? 2 : 0);
+            var n = (window.specials[1627].multiplier == 1.25 ? 1 : window.specials[1627].multiplier == 1.5 ? 2 : 0);
             window.specials[1627].multiplier = [1.25, 1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
@@ -3049,7 +3051,7 @@ window.specials = {
     1628: {
         affinity: function(p){ return p.unit.class.has("Striker") ? window.specials[1628].multiplier : 1; },
         onActivation: function(p) {
-            var n = (window.specials[1628].multiplier === 1.25 ? 1 : window.specials[1628].multiplier === 1.5 ? 2 : 0);
+            var n = (window.specials[1628].multiplier == 1.25 ? 1 : window.specials[1628].multiplier == 1.5 ? 2 : 0);
             window.specials[1628].multiplier = [1.25, 1.5, 1.75][n];
             p.scope.notify({
                 text: 'Using the ' + [1.25, 1.5, 1.75][n] + 'x affinity boost. To switch to the ' + [1.5, 1.75, 1.25][n] + 'x affinity boost, disable and re-enable this special',
@@ -3059,11 +3061,11 @@ window.specials = {
     },
     1631: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        type: "class",
     },
     1632: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        type: "class"
+        type: "class",
     },
     1633: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.25, [p.friendCaptain, p.captain]); }
@@ -3094,7 +3096,7 @@ window.specials = {
     },
     1643: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; },
-        type: "class"
+        type: "class",
     },
     1650: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3124,48 +3126,48 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1655: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
         type: "type"
     },
     1656: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
         type: "type"
     },
     1657: {
         chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         }
     },
     1658: {
         chain: function(p) { return p.captain.class.has("Striker") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         }
     },
     1661: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1662: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1664: {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
-        type: "class"
+        type: "class",
     },
     1665: {
         atk: function(p) { return p.captain.class.has("Shooter") ? p.unit.class.has("Shooter") ? 2 : 1 : 1; },
-        type: "class"
+        type: "class",
     },
     1666: {
         orb: function(p) { return (p.unit.class.has("Powerhouse") || p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1666].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
@@ -3173,7 +3175,7 @@ window.specials = {
             var n = (p.percHP <= 70 ? 1 : 1.5);
             window.specials[1666].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                text: 'HP ' + (n == 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
                 name: '1666warning'
             });
         }
@@ -3184,7 +3186,7 @@ window.specials = {
             var n = (p.percHP <= 70 ? 1 : 1.5);
             window.specials[1667].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
+                text: 'HP ' + (n == 1.5 ? 'above' : 'below') + ' 70%, using the ' + n + 'x orb boost.',
                 name: '1667warning'
             });
         }
@@ -3198,7 +3200,7 @@ window.specials = {
         type: "class"
     },
     1670: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1671: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3210,11 +3212,11 @@ window.specials = {
         def: function(p) { return 0.1; }
     },
     1675: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
         type: "class"
     },
     1676: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1},
         type: "class"
     },
     1677: {
@@ -3229,7 +3231,7 @@ window.specials = {
             var n = (p.slot > 1 ? 0.5 : 0);
             window.specials[1681].multiplier = n;
             p.scope.notify({
-                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
+                text: 'Luffy is ' + (n == 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
                 name: '1681warning'
             });
         }
@@ -3240,7 +3242,7 @@ window.specials = {
             var n = (p.slot > 1 ? 0.5 : 0);
             window.specials[1682].multiplier = n;
             p.scope.notify({
-                text: 'Luffy is ' + (n === 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
+                text: 'Luffy is ' + (n == 0.5 ? 'not captain' : 'captain') + ', using the ' + n + ' Chain Addition.',
                 name: '1682warning'
             });
         }
@@ -3254,10 +3256,10 @@ window.specials = {
         type: "condition"
     },
     1685: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1686: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1687: {
         def: function(p) { return 0; }
@@ -3266,11 +3268,11 @@ window.specials = {
         def: function(p) { return 0; }
     },
     1689: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1690: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : 1; },
         type: "type"
     },
     1691: {
@@ -3282,20 +3284,20 @@ window.specials = {
         def: function(p) { return 0.5; }
     },
     1693: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1694: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type",
-        orb: function(p) { return p.slot === p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.slot == p.sourceSlot ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain])}
     },
     1695: {
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1696: {
-        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1699: {
         chainAddition: function(p) { return 0.3; }
@@ -3335,27 +3337,27 @@ window.specials = {
             var n = (p.percHP <= 30 ? 1.75 : 1);
             window.specials[1716].multiplier = n;
             p.scope.notify({
-                text: 'HP ' + (n === 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
+                text: 'HP ' + (n == 1.75 ? 'below' : 'above') + ' 30%, using the ' + n + 'x multiplier.',
                 name: '1716warning'
             });
         }
     },
     1718: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.25 : 1; },
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.25 : 1},
         type: "class"
     },
     1720: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1721: {
         chain: function(p) { return p.captain.class.has("Fighter") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1722: {
@@ -3395,20 +3397,20 @@ window.specials = {
         staticMult: function(p) { return 55; }
     },
     1732: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
         type: "class"
     },
     1733: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
         warning: "Selected special (%name%) assumes that the enemy has Delay Protection.",
         type: "class"
     },
     1736: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1737: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1738: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
@@ -3418,12 +3420,12 @@ window.specials = {
     },
     1740: {
         def: function(p) { return .2; },
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
         type: "class"
     },
     1741: {
         def: function(p) { return .2; },
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1},
         type: "class"
     },
     1742: {
@@ -3463,30 +3465,30 @@ window.specials = {
     1750:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1750].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1750].multiplier === 1.75 ? 1 : 0);
+            var n = (window.specials[1750].multiplier == 1.75 ? 1 : 0);
             window.specials[1750].multiplier = [1.75, 2.25][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1584warning'
             });
-        }
+        },
     },
     1751:{
         orb: function(p) { return (p.unit.class.has("Striker")) ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, window.specials[1751].multiplier, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
         onActivation: function(p) {
-            var n = (window.specials[1751].multiplier === 1.75 ? 1 : 0);
+            var n = (window.specials[1751].multiplier == 1.75 ? 1 : 0);
             window.specials[1751].multiplier = [1.75, 2.25][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2.25][n] + 'x Orb boost. To switch to the ' + [2.25, 1.75][n] + 'x Orb boost, disable and re-enable this special',
                 name: '1584warning'
             });
-        }
+        },
     },
     1752: {
         atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1752].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1752].multiplier === 1.75 ? 1 : 0);
+            var n = (window.specials[1752].multiplier == 1.75 ? 1 : 0);
             window.specials[1752].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3498,7 +3500,7 @@ window.specials = {
         atk: function(p) { return !(p.unit.cost <= 30) ? 1 : window.specials[1753].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1753].multiplier === 1.75 ? 1 : 0);
+            var n = (window.specials[1753].multiplier == 1.75 ? 1 : 0);
             window.specials[1753].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3513,43 +3515,43 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1758: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1759: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1762: {
-        def: function(p) { return .2; }
+        def: function(p) { return .2; },
     },
     1763: {
-        def: function(p) { return .2; }
+        def: function(p) { return .2; },
     },
     1764: {
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         }
     },
     1765: {
-        def: function(p) { return .5; }
+        def: function(p) { return .5; },
     },
     1766: {
-        def: function(p) { return .5; }
+        def: function(p) { return .5; },
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1},
         type: "class"
     },
     1769: {
         delay: function(p) { return 1; },
         atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1770: {
         delay: function(p) { return 1; },
         atk: function(p) { return (p.delayed > 0 && p.captain.class.has("Cerebral")) ? 1.5 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1771: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
@@ -3576,7 +3578,7 @@ window.specials = {
         chainAddition: function(p){ return 0.5;}
     },
     1782: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1783: {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]); }
@@ -3595,10 +3597,10 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.75, [p.friendCaptain, p.captain]); }
     },
     1793: {
-        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1793].multiplier; },
+        atk: function(p) { return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : window.specials[1793].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1793].multiplier === 1.75 ? 1 : 0);
+            var n = (window.specials[1793].multiplier == 1.75 ? 1 : 0);
             window.specials[1793].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3607,10 +3609,10 @@ window.specials = {
         }
     },
     1794: {
-        atk: function(p) { return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : window.specials[1794].multiplier; },
+        atk: function(p) { return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : window.specials[1794].multiplier; },
         type: "class",
         onActivation: function(p) {
-            var n = (window.specials[1794].multiplier === 1.75 ? 1 : 0);
+            var n = (window.specials[1794].multiplier == 1.75 ? 1 : 0);
             window.specials[1794].multiplier = [1.75, 2][n];
             p.scope.notify({
                 text: 'Using the ' + [1.75, 2][n] + 'x ATK multiplier. To switch to the ' + [2, 1.75][n] + 'x multiplier, disable and re-enable this special',
@@ -3619,18 +3621,18 @@ window.specials = {
         }
     },
     1795: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1796: {
-        delay: function(p) { return 1; }
+        delay: function(p) { return 1; },
     },
     1797: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1798: {
         atk: function(p) { return p.delayed > 0 ? 1.5 : 1; },
-        type: "condition"
+        type: "condition",
     },
     1799: {
         atk: function(p) { return p.defenseDown ? 1.75 : 1; },
@@ -3664,10 +3666,10 @@ window.specials = {
         },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1808: {
         turnedOn: [ false, false ],
@@ -3679,10 +3681,10 @@ window.specials = {
         },
         chain: function(p) { return p.captain.class.has("Slasher") ? 2.75 : 1; },
         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') ? 2.75 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.75 : 1;
         },
-        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }
+        orb: function(p) { return p.unit.class.has("Slasher") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); },
     },
     1811: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
@@ -3693,7 +3695,7 @@ window.specials = {
         type: "class"
     },
     1813: {
-        atk: function(p) { return p.slot === 1 ? 1.5 : 1; },
+        atk: function(p) { return p.slot == 1 ? 1.5 : 1; },
         type: "class"
     },
     1814: {
@@ -3717,21 +3719,21 @@ window.specials = {
         type: "class"
     },
     1819: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.75 : 1; },
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.75 : 1; },
         type: "type"
     },
     1825: {
-        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
     },
     1826: {
-        affinity: function(p){ return p.unit.type === "INT" ? 1.75 : 1; }
+        affinity: function(p){ return p.unit.type == "INT" ? 1.75 : 1; }
     },
     1827: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
         type: "type"
     },
     1828: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
         type: "type"
     },
     1829: {
@@ -3747,36 +3749,36 @@ window.specials = {
         orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
     },
     1835: {
-        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
+        chain: function(p) { return (p.captain.type == "STR" || p.captain.type == "PSY") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         },
-        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; },
     },
     1836: {
-        chain: function(p) { return (p.captain.type === "STR" || p.captain.type === "PSY") ? 2.5 : 1; },
+        chain: function(p) { return (p.captain.type == "STR" || p.captain.type == "PSY") ? 2.5 : 1; },
         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') ? 2.5 : 1;
+            var prev = p.hitcombo[p.hitcombo.length - 1][p.chainPosition - 1]
+            return p.chainPosition === 0 ? 1 : (prev == 'Good'  || prev == 'Great' || prev == 'Perfect') ? 2.5 : 1;
         },
-        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; }
+        delay: function(p) { return p.captain.class.has("Powerhouse") ? 1 : 0; },
     },
     1837: {
-        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return (p.captain.type == "QCK" || p.captain.type == "PSY") ? 1.75 : 1; },
+        type: "class",
     },
     1838: {
-        atk: function(p) { return (p.captain.type === "QCK" || p.captain.type === "PSY") ? 1.75 : 1; },
-        type: "class"
+        atk: function(p) { return (p.captain.type == "QCK" || p.captain.type == "PSY") ? 1.75 : 1; },
+        type: "class",
     },
     1839: {
-        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type == "DEX" || p.captain.type == "PSY")) ? 1.75 : 1; },
         type: "condition",
         staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
     1840: {
-        atk: function(p) { return (p.delayed > 0 && (p.captain.type === "DEX" || p.captain.type === "PSY")) ? 1.75 : 1; },
+        atk: function(p) { return (p.delayed > 0 && (p.captain.type == "DEX" || p.captain.type == "PSY")) ? 1.75 : 1; },
         type: "condition",
         staticMult: function(p) { return p.captain.class.has("Powerhouse") ? 40 : 0; }
     },
@@ -3804,31 +3806,10 @@ window.specials = {
     1851: {
         chainAddition: function(p) { return 0.5; }
     },
-    1853: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.25 : 1; },
-        type: "type",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); }
-    },
-    1853: {
-        atk: function(p) { return window.specials[1853].multiplier; },
-        type: "type",
-        orb: function(p) { return CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]); },
-        stage: -1,
-        onActivation: function(p) {
-            var n = (window.specials[1853].multiplier === 1 ? 1 : 0);
-            window.specials[1853].multiplier = [1, 1.5][n];
-            if(1853){
-            p.scope.notify({
-                text: 'Using only Orb Boost. To switch to the ATK and Orb boost, disable and re-enable this special',
-                name: '1853warning'
-            });
-        }else{
-           p.scope.notify({
-                text: 'Using ATK and Orb Boost. To switch to the Orb boost, disable and re-enable this special',
-                name: '1853warning'
-            }); 
-        }
-        }
+    1854: {
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
+        type: "class",
+        orb: function(p) { return p.unit.class.has("Free Spirit") ? CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1.5, [p.friendCaptain, p.captain]) : CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 1, [p.friendCaptain, p.captain]); }	
     },
     1855: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
@@ -3849,19 +3830,7 @@ window.specials = {
     },
     1861: {
         atk: function(p) { return (p.delayed > 0 && (p.captain.class.has("Shooter"))) ? 1.75 : 1; },
-        type: "condition"
-    },
-    1865: {//Urouge FN
-        atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1865].multiplier : 1; },
-        type: "class",
-        onActivation: function(p) {
-            var n = (window.specials[1865].multiplier === 1.5 ? 1 : 0);
-            window.specials[1865].multiplier = [1.5, 1.75][n];
-            p.scope.notify({
-                text: 'Using the ' + [1.5, 1.75][n] + 'x ATK multiplier. To switch to the ' + [1.75, 1.5][n] + 'x multiplier, disable and re-enable this special',
-                name: '1865warning'
-            });
-        }
+        type: "condition",
     },
     1865: {//Urouge FN
         atk: function(p) { return p.unit.class.has("Striker") ? window.specials[1865].multiplier : 1; },
@@ -3882,5 +3851,5 @@ window.specials = {
     2001: {
         atk: function(p) { return 1.75; },
         type: "class"
-    }
+    },
 };

From c019b26097f978533306e900a7c557cc4d52d8ae Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 21 Nov 2017 10:56:51 -0500
Subject: [PATCH 1568/1569] Revert "Merge pull request #166 from
 Intervencion/patch-38"

This reverts commit d708682340f5465ab5042bff9304e0f851c610bc, reversing
changes made to 7c65d723479211e928d60ba4b7512bdf885c99e6.
---
 common/data/captains.js | 1951 ++++++++++++++++++-------------------
 common/data/details.js  | 2052 +++++++++++++++++++--------------------
 common/data/sailors.js  |  234 ++---
 common/data/ships.js    |   70 +-
 4 files changed, 2112 insertions(+), 2195 deletions(-)

diff --git a/common/data/captains.js b/common/data/captains.js
index 3c4135e40..fedeafc22 100644
--- a/common/data/captains.js
+++ b/common/data/captains.js
@@ -6,77 +6,77 @@ window.captains = {
         atk: function(p) { return 1.5; }
     },
     4: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1.5; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1.5; }
     },
     5: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     6: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     7: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     8: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     10: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     11: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     12: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     13: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     14: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     15: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     16: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     17: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     18: {
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     19: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     20: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     21: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
     },
     22: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     23: {
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     24: {
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     25: {
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     26: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     27: {
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     28: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
@@ -85,40 +85,40 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.2 : 1; }
     },
     36: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     37: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     38: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     39: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     41: {
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
     },
     42: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
     },
     45: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     46: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     49: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     52: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     59: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
     },
     60: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     61: {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -139,34 +139,34 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     74: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     75: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1; }
     },
     76: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     77: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
     },
     194: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     195: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     196: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     198: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     199: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     200: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     201: {
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
@@ -175,18 +175,18 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     205: {
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     206: {
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     209: {
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     210: {
-        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     211: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
@@ -204,16 +204,16 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     220: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     221: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
     },
     222: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
     },
     223: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     224: {
         hitAtk: function(p) {
@@ -231,25 +231,25 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     227: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; },
     },
     228: {
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     230: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     231: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     232: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     233: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     234: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     235: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
@@ -258,50 +258,50 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     248: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
     },
     249: {
-        atk: function(p) { return p.unit.type === "STR" ? 3 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 0.4 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 3 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 0.4 : 1; }
     },
     250: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
     },
     251: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 99.0 ? 3 : 1; }
     },
     252: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     253: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     254: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     255: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     256: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     257: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     258: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     259: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     260: {
         atk: function(p) { return p.percHP <= 30.0 ? 3 : 1; }
@@ -313,7 +313,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     265: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     267: {
         atk: function(p) { return 1.5; },
@@ -324,13 +324,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     293: {
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     294: {
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     295: {
-        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     296: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
@@ -339,24 +339,24 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     298: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     299: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     305: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     306: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     307: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
     },
     308: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
     },
     311: {
         hitAtk: function(p) {
@@ -395,18 +395,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     321: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     322: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     323: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     324: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     328: {
         rcv: function(p) { return p.percHP <= 30.0 ? 5 : 1; }
@@ -420,14 +420,14 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     333: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 1.5 : 1; }
     },
     336: {
-        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2 : 0.8); }
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2 : 0.8); }
     },
     337: {
-        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type === "PSY" ? 2.5 : 0.8); }
+        atk: function(p) { return p.percHP <= 50.0 ? 1 : (p.unit.type == "PSY" ? 2.5 : 0.8); }
     },
     340: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -448,32 +448,32 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
     },
     358: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.5 : 1; }
     },
     359: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 3 : 1; }
     },
     360: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
     },
     361: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "INT" && p.percHP <= 30.0 ? 3 : 1; }
     },
     362: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     363: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     364: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     365: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     366: {
         chainModifier: function(p) { return 4; }
@@ -500,26 +500,26 @@ window.captains = {
         rcv: function(p) { return 1.5; }
     },
     380: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     383: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     384: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     385: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     386: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     387: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     388: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     389: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['DEX', 'INT', 'QCK']); },
@@ -554,18 +554,18 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     391: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     392: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     395: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     396: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     397: {
         hitAtk: function(p) {
@@ -612,33 +612,33 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     411: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     412: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     413: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 2.5 : 1; }
     },
     414: {
-        atk: function(p) { return p.unit.type === "INT" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "INT" && p.percHP >= 99.0 ? 3 : 1; }
     },
     415: {
         atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         },
         rcv: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
         }
     },
     416: {
         atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         },
         rcv: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 1.5 : 1;
         }
     },
     417: {
@@ -649,22 +649,22 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     419: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     420: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     421: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     422: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     424: {
         atk: function(p) { return p.percHP >= 70.0 ? 1.5 : 1; }
@@ -674,20 +674,20 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     426: {
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     427: {
-        hp: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     428: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     430: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     431: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     433: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'STR', 'DEX']); },
@@ -738,10 +738,10 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     437: {
-        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
     },
     438: {
-        rcv: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 5 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 5 : 1; }
     },
     444: {
         atk: function(p) {
@@ -754,18 +754,18 @@ window.captains = {
         }
     },
     446: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     447: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
     },
     448: {
-        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
     },
     449: {
-        atk: function(p) { return p.unit.type === "QCK" && p.percHP >= 99.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" && p.percHP >= 99.0 ? 3 : 1; }
     },
     450: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
@@ -782,10 +782,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     454: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     455: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     456: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
@@ -799,7 +799,7 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 20 ? 3 : 1; }
     },
     459: {
-        atk: function(p) { return p.unit.number === 458 || p.unit.cost <= 20 ? 3 : 1; }
+        atk: function(p) { return p.unit.number == 458 || p.unit.cost <= 20 ? 3 : 1; }
     },
     461: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
@@ -808,7 +808,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     463: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     464: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -825,26 +825,26 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     467: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     470: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     471: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
     },
     482: {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     483: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     485: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
     },
     486: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
@@ -857,17 +857,17 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     492: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     496: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     497: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     498: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     499: {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -876,28 +876,28 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     501: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
     },
     502: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     503: {
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     504: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     507: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
     },
     508: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     509: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -909,10 +909,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     513: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP >= 50.0 ? 1.5 : 1; }
     },
     514: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     515: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
@@ -925,16 +925,16 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     517: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     518: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     519: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     520: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
     },
     523: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -945,36 +945,36 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     525: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     526: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     527: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     528: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     529: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
     },
     530: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 + 0.75 * p.percHP / 100 : 1; }
     },
     533: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     534: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     535: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     536: {
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     537: {
         chainModifier: function(p) { return 2; }
@@ -983,7 +983,7 @@ window.captains = {
         chainModifier: function(p) { return 2; }
     },
     541: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 50.0 ? 2.5 : 1; }
     },
     542: {
         hp: function(p) { return 1.5; }
@@ -999,10 +999,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 0 : 1; }
     },
     545: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     546: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     548: {
         atk: function(p) { return 1.2; }
@@ -1020,10 +1020,10 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     553: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
     },
     554: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
     },
     555: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
@@ -1033,25 +1033,25 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     557: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     558: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     559: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     560: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
     },
     561: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     562: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     568: {
@@ -1066,15 +1066,15 @@ window.captains = {
     },
     570: {
         atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
-                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
+            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
+                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
                 1;
         }
     },
     571: {
         atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
-                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
+            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
+                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
                 1;
         }
     },
@@ -1108,13 +1108,13 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     579: {
-        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 1.5 : 1; }
+        atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 1.5 : 1; }
     },
     580: {
-        atk: function(p) { return (p.unit.type === "QCK" || p.unit.type === "DEX") ? 2 : 1; }
+        atk: function(p) { return (p.unit.type == "QCK" || p.unit.type == "DEX") ? 2 : 1; }
     },
     581: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     582: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -1130,11 +1130,11 @@ window.captains = {
         rcv: function(p) { return 0.1; }
     },
     585: {
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     586: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     589: {
         atk: function(p) { return 1.5; },
@@ -1147,10 +1147,10 @@ window.captains = {
         rcv: function(p) { return 0.2; }
     },
     596: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     597: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
     },
     598: {
         atk: function(p) { return p.unit.stars < 3 ? 2.5 : 1; }
@@ -1159,16 +1159,16 @@ window.captains = {
         atk: function(p) { return p.unit.stars < 3 ? 3 : 1; }
     },
     600: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     601: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     602: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     603: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
     },
     604: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
@@ -1211,12 +1211,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     634: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.25 : 1; }
     },
     635: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 1.5 : 1; }
     },
     636: {
         atk: function(p) { return p.unit.cost <= 2 ? 3 : 1; }
@@ -1237,16 +1237,16 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     642: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     643: {
-        atk: function(p) { return p.unit.type === "PSY" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" && p.percHP <= 30.0 ? 3 : 1; }
     },
     644: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     645: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
     },
     646: {
         atk: function(p) { return p.unit.class.has("Shooter") && p.percHP <= 30.0 ? 2.5 : 1; }
@@ -1256,36 +1256,36 @@ window.captains = {
     },
     648: {
         atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         }
     },
     649: {
         atk: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP >= 70.0 ? 2.75 : 1;
         }
     },
     650: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     651: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     652: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2 : 1); }
     },
     653: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.25 : 1); }
     },
     654: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1); }
     },
     655: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     656: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     657: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
@@ -1306,7 +1306,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
     },
     662: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     665: {
         atk: function(p) { return 1.2; },
@@ -1357,12 +1357,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     678: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
     },
     679: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     681: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -1410,33 +1410,33 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
     },
     701: {
-        hp: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; }
     },
     702: {
-        hp: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 2.25 : 1; }
     },
     705: {
         atk: function(p) {
-            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
+            return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
         },
         hp: function(p) {
-            return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1;
+            return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1;
         }
     },
     706: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     707: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     708: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
     },
     709: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     710: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
@@ -1461,7 +1461,7 @@ window.captains = {
         hitAtk: function(p) {
             if (!p.unit.class.has('Slasher')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
+            return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -1470,7 +1470,7 @@ window.captains = {
         hitAtk: function(p) {
             if (!p.unit.class.has('Slasher')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2 : (prev === 'Good' ? 2.25 : (prev === 'Great' ? 2.5 : (prev === 'Perfect' ? 2.75 : 2)));
+            return p.chainPosition === 0 ? 2 : (prev == 'Good' ? 2.25 : (prev == 'Great' ? 2.5 : (prev == 'Perfect' ? 2.75 : 2)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -1502,30 +1502,30 @@ window.captains = {
         }
     },
     728: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     730: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
     },
     731: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     732: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     733: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     734: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.2 : 1; }
     },
     735: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     736: {
         atk: function(p) { return p.unit.class.has("Slasher") && p.percHP >= 50.0 ? 2.5 : 1; }
@@ -1554,18 +1554,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     747: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     748: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 2.5); },
         rcv: function(p) { return 0; }
     },
     749: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     750: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     751: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
@@ -1582,53 +1582,53 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
     },
     755: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     756: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     757: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     758: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     759: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2.5 : 1; }
     },
     760: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 3 : 1; }
     },
     761: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
     },
     762: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     763: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     764: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     766: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     767: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     768: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     769: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     770: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     771: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
@@ -1644,12 +1644,12 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     776: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; }
     },
     777: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
     },
     780: {
         atk: function(p) { return p.percHP <= 30.0 ? 2 : 1; }
@@ -1699,18 +1699,18 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     801: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     802: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
     },
     803: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     804: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     805: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -1767,16 +1767,16 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     825: {
-        atk: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === 'STR' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == 'STR' ? 1.5 : 1; }
     },
     826: {
-        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
     },
     827: {
-        atk: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === 'QCK' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == 'QCK' ? 1.5 : 1; }
     },
     830: {
         atk: function(p) {
@@ -1867,7 +1867,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     854: {
-        atk: function(p) { return p.unit.type === 'DEX' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == 'DEX' ? 1.5 : 1; }
     },
     855: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
@@ -1876,11 +1876,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2.5 : 1; }
     },
     857: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
+        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
     },
     858: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
+        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
     },
     859: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
@@ -1889,10 +1889,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     862: {
-        atk: function(p) { return p.unit.type === 'QCK' ? 2 : 1; }
+        atk: function(p) { return p.unit.type == 'QCK' ? 2 : 1; }
     },
     863: {
-        atk: function(p) { return p.unit.type === 'QCK' ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == 'QCK' ? 1.75 : 1; }
     },
     864: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
@@ -1914,7 +1914,7 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -1922,17 +1922,17 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3, [ "Driven" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 3 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 3 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     871: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     872: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     873: {
         atk: function(p) { return p.unit.class.has("Fighter") && p.percHP <= 30.0 ? 2.5 : 1; }
@@ -1993,12 +1993,12 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     889: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     890: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     891: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -2081,12 +2081,12 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") && p.percHP <= 30 ? 1.75 : 1; }
     },
     909: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     910: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     911: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -2097,10 +2097,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     913: {
-        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); }
     },
     914: {
-        atk: function(p) { return p.unit.type !== "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.2); }
+        atk: function(p) { return p.unit.type != "QCK" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.2); }
     },
     915: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -2215,20 +2215,20 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     940: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     941: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
     },
     942: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     943: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.75 : 1; }
     },
     944: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.2 : 1; },
@@ -2242,7 +2242,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
     },
     947: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     948: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
@@ -2286,16 +2286,16 @@ window.captains = {
         }
     },
     954: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     955: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     956: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     963: {
         atk: function(p) { 
@@ -2348,25 +2348,25 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     979: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" ? 1.2 : 1; }
     },
     980: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" ? 1.2 : 1; }
     },
     981: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
         rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 0.1 : 1; }
     },
     982: {
-        atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1; }
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2  : 1}
     },
     983: {
-        atk: function(p) {return p.unit.class.has("Slasher") ? 2.25  : 1; }
+        atk: function(p) {return p.unit.class.has("Slasher") ? 2.25  : 1}
     },
     984: {
-        atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1; }
+        atk: function(p) {return p.unit.class.has("Striker") ? 2.25  : 1}
     },
     989: {
         atk: function(p) { return p.unit.cost < 30 && p.unit.cost >20 ? 2.5 : 1; },
@@ -2379,10 +2379,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") && p.percHP >= 99.0 ? 2.75 : 1; }
     },
     992: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1 ; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1 ; }
     },
     993: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.5 : 1 ; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2.5 : 1 ; }
     },
     996: {
          atk: function(p) {return p.unit.class.has("Powerhouse") ? 2  : 1; }
@@ -2426,8 +2426,8 @@ window.captains = {
     },
     1009: {
         atk: function(p) {
-            return p.unit.class.has("Fighter") && p.unit.type === "STR" ? 2.25 :
-                p.unit.type === "STR" || p.unit.class.has("Fighter") ? 1.5 :
+            return p.unit.class.has("Fighter") && p.unit.type == "STR" ? 2.25 :
+                p.unit.type == "STR" || p.unit.class.has("Fighter") ? 1.5 :
                 1;
         }
     },
@@ -2449,10 +2449,10 @@ window.captains = {
         atk: function(p) {return p.unit.class.has("Powerhouse") ? 2 : 1; }
     },
     1015: {
-        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1) : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1) : 1; },
     },
     1016: {
-        atk: function(p) { return p.unit.type === "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5) : 1; },
     },
     1017: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
@@ -2513,10 +2513,10 @@ window.captains = {
     },
     1034: {
         atk: function(p) { 
-            return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
+            return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
     },
     1035: {
-        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker===6 ? 2.75 : p.classCount.Striker===5 ? 2.5 : p.classCount.Striker===4 ? 2 : p.classCount.Striker===3 ? 1.75 : p.classCount.Striker===2 ? 1.5 : p.classCount.Striker===1 ? 1.25 : 1 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? p.classCount.Striker==6 ? 2.75 : p.classCount.Striker==5 ? 2.5 : p.classCount.Striker==4 ? 2 : p.classCount.Striker==3 ? 1.75 : p.classCount.Striker==2 ? 1.5 : p.classCount.Striker==1 ? 1.25 : 1 : 1; }
     },
     1036: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2, [ "Free Spirit" ]); },
@@ -2533,25 +2533,25 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1038: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1039: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1040: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.5 : 1; }
     },
     1041: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     1042: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 2 : 1;},
         rcv: function(p) { return 0; }
     },
     1043: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2) : 1;},
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2) : 1;},
         rcv: function(p) { return 0; }
     },
     1044: {
@@ -2585,18 +2585,18 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1048: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; }
     },
     1049: {
-        atk: function(p) { return p.unit.type === 'PSY' ? (p.percHP >= 30.0 ? 1.5 : 2.25) : 1; },
-        rcv: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == 'PSY' ? (p.percHP >= 30.0 ? 1.5 : 2.25) : 1; },
+        rcv: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; }
     },
     1050: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == 'PSY' ? 1.5 : 1; }
     },
     1051: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 2 : 1; }
+        atk: function(p) { return p.unit.type == 'PSY' ? 2 : 1; }
     },
     1056:{
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1;},
@@ -2625,15 +2625,15 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1;}
     },
     1064: {
-        atk: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === 'INT' ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == 'INT' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == 'INT' ? 1.2 : 1; }
     },
     1065:{
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
     },
     1066: {
-        atk: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === 'PSY' ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == 'PSY' ? 1.2 : 1; }
     },
     1067:{
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1;}
@@ -2658,11 +2658,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1;}
     },
     1074: {
-        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
+        atk: function(p) { return p.unit.type == 'INT' ? 2 : 1; }
     },
     1075: {
-        atk: function(p) { return p.unit.type === 'INT' ? 2 : 1; },
-        hp: function(p) { return p.unit.type === 'INT' ? 2 : 1; }
+        atk: function(p) { return p.unit.type == 'INT' ? 2 : 1; },
+        hp: function(p) { return p.unit.type == 'INT' ? 2 : 1; }
     },
     1076: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
@@ -2689,11 +2689,11 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1084: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1085: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1086:{
@@ -2755,13 +2755,13 @@ window.captains = {
     },
     1101: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.25 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.25 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1102: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -2788,7 +2788,7 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
     },
     1110: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }  
+        atk: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; }  
     },
     1111: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.25 : 1; },
@@ -2799,13 +2799,13 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1113: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }  
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }  
     },
     1114: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     1115: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
     },
     1118: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -2828,10 +2828,10 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1122: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
     },
     1123: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 4 : p.unit.type === "STR" || p.unit.type === "QCK" || p.unit.type === "DEX" ? 2.5 : 1; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 4 : p.unit.type == "STR" || p.unit.type == "QCK" || p.unit.type == "DEX" ? 2.5 : 1; }  
     },
     1124: {
         atk: function(p) {
@@ -2844,12 +2844,12 @@ window.captains = {
         }
     },
     1126: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     1127: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     1128: {
         atk: function(p) { return 1.75; }
@@ -2882,8 +2882,8 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1136: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1137: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
@@ -2905,11 +2905,11 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
     },
     1144: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
     },
     1145: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; }
     },
     1154: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
@@ -2936,10 +2936,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }  
     },
     1162: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
     },
     1163: {
-        atk: function(p) { return (p.unit.type === "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type === "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type === "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
+        atk: function(p) { return (p.unit.type == "PSY" && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 2.625 : (p.unit.type == "PSY" && !(p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.75 : (!(p.unit.type == "PSY") && (p.unit.class.has("Driven") || p.unit.class.has("Cerebral"))) ? 1.5 : 1; }
     },
     1164: {
         rcv: function(p) { return 1.2; }
@@ -2951,56 +2951,56 @@ window.captains = {
         atk: function(p) { return 1.2; }
     },
     1168: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP <= 30.0 ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" && p.percHP <= 30.0 ? 2 : 1; }
     },
     1169: {
         atk: function(p) {
-            return p.unit.type === "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
+            return p.unit.type == "STR" ? 1 + 1.5 * ((100 - p.percHP) / 100) : 1;
         }
     },
     1170: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1171: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     1172: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     1173: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     1174: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 2.75 : 1; }
     },
     1175: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP <= 30.0 ? 3 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP <= 30.0 ? 3 : 1; }
     },
     1176: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; }
     },
     1177: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 2 : 1; }
     },
     1178: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2 : 1; }
     },
     1179: {
-        atk: function(p) { return p.unit.type === "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.type == "STR" && p.percHP >= 99.0 ? 2.75 : 1; }
     },
     1181: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
     },
     1182: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; }
     },
     1183: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
     },
     1184: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
     },
     1185: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
@@ -3009,16 +3009,16 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1187: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
     },
     1188: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; }
     },
     1189: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
     },
     1190: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; }
     },
     1191: {
         atk: function(p) {
@@ -3045,7 +3045,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1197: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1) : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Cerebral") ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1) : 1; }
     },
     1198: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
@@ -3073,12 +3073,12 @@ window.captains = {
         hp: function(p) { return 1.3; }
     },
     1207: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     1208: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     1209: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
@@ -3088,20 +3088,20 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1211: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     1212: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; }
     },
     1213: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
     },
     1214: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
     },
     1215: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['QCK', 'PSY', 'DEX']); },
@@ -3144,21 +3144,21 @@ window.captains = {
     },
     1221: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     }, 
     1222: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
     1223: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     1224: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     1225: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1226: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
@@ -3170,18 +3170,18 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1229: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 2 : p.unit.class.has("Powerhouse") ? 2 : 1; }  
     },
     1230: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 2.75 : p.unit.class.has("Powerhouse") ? 2.5 : 1; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 2.75 : p.unit.class.has("Powerhouse") ? 2.5 : 1; }  
     },
     1231: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.1875 : 1.75) : 1; },
-        rcv: function(p) { return .5; }
+        rcv: function(p) { return .5 }
     },
     1232: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? (window.specials[1231].turnedOn || window.specials[1232].turnedOn ? 2.925 : 2.25) : 1; },
-        rcv: function(p) { return .5; }
+        rcv: function(p) { return .5 }
     },
     1233: {
         atk: function(p) {
@@ -3200,10 +3200,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.3 : 1; }
     },
     1235: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
     },
     1236: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
     },
     1237: {
         hit: function(n) {
@@ -3221,22 +3221,22 @@ window.captains = {
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1239].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]==true){specialEnabled = true;}
             }
             return specialEnabled ? 3 : 2; },
-        rcv: function(p) { return 1.3; }
+        rcv: function(p) { return 1.3 }
     },
     1240: {
         atk: function(p){ 
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1239].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1240].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1239].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1240].turnedOn[i]==true){specialEnabled = true;}
             }
             return specialEnabled ? 3 : 2; },
-        rcv: function(p) { return 1.3; }
+        rcv: function(p) { return 1.3 }
     },
     1241: {
         chainModifier: function(p) { return 1.5; }
@@ -3249,7 +3249,7 @@ window.captains = {
             return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
                 p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
                 1;
-        }
+        },
     },
     1244: {
         atk: function(p) {
@@ -3257,7 +3257,7 @@ window.captains = {
                 p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.75 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.3 :
                 1;
-        }
+        },
     },
     1245: {
         atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : p.percHP <= 10.0 && p.unit.class.has("Fighter") ? 3 : 1.75; }
@@ -3266,7 +3266,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1247: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.2 : 1; }
     },
     1248: {
@@ -3274,35 +3274,35 @@ window.captains = {
             return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.69 :
                 p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.3 :
                 1;
-        }
+        },
     },
     1249: {
         atk: function(p) {
             return p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 2.56 :
                 p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.6 :
                 1;
-        }
+        },
     },
     1250: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
     },
     1251: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
     },
     1252: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
     },
     1253: {
-        atk: function(p) { return p.unit.type === "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" && p.percHP >= 99.0 ? 2.25 : 1; }
     },
     1254: {
         hitAtk: function(p) {
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? p.unit.class.has("Striker") ? 2.75 : 1 : 1; },
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? p.unit.class.has("Striker") ? 2.75 : 1 : 1; },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1256: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; }
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 0.1 : 1; },
     },
     1257: {
         atk: function(p) { return p.percHP <= 50.0 ? 2 : 1; }
@@ -3311,16 +3311,16 @@ window.captains = {
         atk: function(p) { return p.percHP <= 50.0 ? 2.5 : 1; }
     },
     1259: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1260: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1261: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
     },
     1262: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.75 : 1; },
     },
     1263: {
         atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
@@ -3329,10 +3329,10 @@ window.captains = {
         atk: function(p) { return p.unit.cost <= 30 ? 2.5 : 1; }
     },
     1265: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1266: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
     },
     1267: {
         atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
@@ -3344,7 +3344,7 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               }
+               },
     },
     1268: {
         atk: function(p) { if(p.classCount.Striker>=1 && p.classCount.Fighter>=1 && p.classCount.Shooter>=1 && p.classCount.Slasher>=1) 
@@ -3356,13 +3356,13 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               }
+               },
     },
     1271: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1272: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
     },
     1273: {
         atk: function(p) {
@@ -3376,7 +3376,7 @@ window.captains = {
                 p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
                 1;
-        }
+        },
     },
     1274: {
         atk: function(p) {
@@ -3390,43 +3390,43 @@ window.captains = {
                 p.unit.class.has("Fighter") && !p.unit.class.has("Powerhouse") ? 1.2 : 
                 !p.unit.class.has("Fighter") && p.unit.class.has("Powerhouse") ? 1.2 :
                 1;
-        }
+        },
     },
     1275: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
     },
     1276: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+        hp: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
     },
     1277: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.25 : 1; },
-        rcv: function(p) { return .01; }
+        rcv: function(p) { return .01; },
     },
     1278: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") && p.percHP >= 99.0 ? 2.75 : 1; },
-        rcv: function(p) { return .01; }
+        rcv: function(p) { return .01; },
     },
     1279: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
     },
     1280: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; },
     },
     1281: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
     },
     1282: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
     1283: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1284: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; },
     },
     1285: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.375, [ "Striker" ]); },
@@ -3438,12 +3438,12 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1286: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
     },
     1287: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
     },
     1288: {
         atk: function(p) {
@@ -3456,16 +3456,16 @@ window.captains = {
         }
     },
     1291: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
     },
     1292: {
-        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
+        atk: function(p) { return !p.unit.class.has("Driven") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); },
     },
     1293: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
     },
     1294: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     
     1297: {
@@ -3501,15 +3501,15 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1299: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
     },
     1300: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1301: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.75 : 1; },
     },
     1302: {
         atk: function(p) {
@@ -3517,50 +3517,50 @@ window.captains = {
                 p.unit.class.has("Slasher") && !p.unit.class.has("Driven") ? 1.75 : 
                 !p.unit.class.has("Slasher") && p.unit.class.has("Driven") ? 1.5 :
                 1;
-        }
+        },
     },
     1303: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
     },
     1304: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
     },
     1305: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.3 : 1; },
     },
     1306: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
     },
     1307: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
     },
     1308: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1309: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
     },
     1310: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
     },
     1311: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
     },
     1312: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
     1313: {
         atk: function(p) {
-            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
+            return p.unit.type == "STR" ? ((p.orb == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
             $scope.notify({ text: p.orb });
-        }
+        },
     },
     1314: {
         atk: function(p) {
-            return p.unit.type === "STR" ? ((p.orb === 2) ? 3.9375 : 2.25) : (p.unit.type === "DEX" ? (p.orb === 0.5 ? 3.9375 : 2.25) : (p.orb === 'str' ? 3.9375 : 2.25));
-        }
+            return p.unit.type == "STR" ? ((p.orb == 2) ? 3.9375 : 2.25) : (p.unit.type == "DEX" ? (p.orb == 0.5 ? 3.9375 : 2.25) : (p.orb == 'str' ? 3.9375 : 2.25));
+        },
     },
     1315: {
         hitAtk: function(p) {
@@ -3581,24 +3581,24 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1317: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2 : 1; },
     },
     1318: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "STR" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "STR" ? 2.5 : 1; },
     },
     1321: {
         atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher"))) 
                 return 2.25;
             else
                 return 1; 
-               }
+               },
     },
     1322: {
         atk: function(p) { if((p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) && (p.unit.class.has("Cerebral") || p.unit.class.has("Slasher")))
                 return 2.5;
             else
                 return 1; 
-               }
+               },
     },
     1323: {
         atk: function(p) {
@@ -3615,28 +3615,28 @@ window.captains = {
         }
     },
     1326: {
-        atk: function(p) { return 1.3; }
+        atk: function(p) { return 1.3; },
     },
     1327: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2 : 1; }
+        atk: function(p) { return p.unit.cost <= 20 ? 2 : 1; },
     },
     1328: {
-        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.cost <= 20 ? 2.5 : 1; },
     },
     1330: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
     },
     1333: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.96 :
-                p.unit.class.has("Powerhouse") || p.unit.type === "STR" ? 1.4 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 1.96 :
+                p.unit.class.has("Powerhouse") || p.unit.type == "STR" ? 1.4 :
                 1;
         }
     },
     1334: {
         atk: function(p) { 
-            return p.unit.class.has("Free Spirit") && p.unit.type === "DEX" ? 1.96 :
-                p.unit.class.has("Free Spirit") || p.unit.type === "DEX" ? 1.4 :
+            return p.unit.class.has("Free Spirit") && p.unit.type == "DEX" ? 1.96 :
+                p.unit.class.has("Free Spirit") || p.unit.type == "DEX" ? 1.4 :
                 1;
         }
     },
@@ -3653,41 +3653,41 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; }
     },
     1339: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; }
     },
     1340: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1341: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["QCK"]); }, 
         hitAtk: function(p) {
-            if (!(p.unit.type === "QCK")) return 1;
+            if (!(p.unit.type == "QCK")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Below Good", "Below Good", "Below Good"]) ? 2.625 : 1.75;
         },
         hitModifiers: ["Below Good", "Below Good", "Below Good", "Perfect", "Perfect", "Perfect"]
     },
     1342: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; }
     },
     1343: {
         hp: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1344: {
         hp: function(p) { return 0.5; },
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
     },
     1345: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
     },
     1346: {
         hp: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
         atk: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Shooter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
     },
     1349: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
     },
     1352: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.5, ["Fighter"]); },
@@ -3698,7 +3698,7 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1353: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
     1354: {
         chainModifier: function(p) { return 2; }
@@ -3707,7 +3707,7 @@ window.captains = {
         chainModifier: function(p) { return 3; }
     },
     1356:{
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
     },
     1357:{
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -3729,42 +3729,42 @@ window.captains = {
     1361: {
         atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
         hp: function(p) { return p.unit.class.has("Slasher") ?
-            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
     },
     1362: {
         atk: function(p) { return p.unit.class.has("Slasher") ? p.classCount.Slasher>=5 ? Math.max(2.5, 2.5 + .5 * Math.min(p.turnCounter,1)) : 1 : Math.max(1, 1 + .2 * Math.min(p.turnCounter,1)); },
         hp: function(p) { return p.unit.class.has("Slasher") ?
-            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; }
+            p.classCount.Slasher>=5 ? 1.5 : 1 : 1; },
     },
     1363: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; }
     },
     1364: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.5 : 1; }
     },
     1365: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1366: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
     },
     1367: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; }
     },
     1368: {
-        atk: function(p) { return !(p.unit.type === "STR") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type == "STR") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1369: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1370: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1371: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Slasher", "Powerhouse" ]); },
@@ -3783,18 +3783,18 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1373: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
     },
     1374: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1375: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
     1376: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; },
     },
     1377: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.3 : 1; },
@@ -3805,10 +3805,10 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Shooter") ? 1.75 : 1; }
     },
     1379: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
     },
     1380: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
     1381: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.2 : 1; },
@@ -3819,24 +3819,24 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
     },
     1383: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
     },
     1384: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
     1387: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.8125 : 2.25;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.25; }
+        hp: function(p) { return 1.25; },
     },
     1388: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.5 : 1; },
     },
     1389: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1390: {
         atk: function(p) { return p.unit.cost <= 40 ? 1.5 : 0.5; },
@@ -3848,26 +3848,26 @@ window.captains = {
     },
     1392: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.25 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 1.25 : 1; },
     },
     1393: {
-        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; }
+        atk: function(p) { return p.unit.cost <= 30 ? 2 : 1; },
     },
     1394: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.1 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.1 : 1; },
     },
     1395: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" || p.unit.type === "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" || p.unit.type == "STR" ? 1.2 : 1; },
     },
     1396: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; },
     },
     1397: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; }
+        hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
     },
     1398: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
@@ -3880,41 +3880,46 @@ window.captains = {
             return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.275 :
                 p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
                 !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.3 :
-                1; }
+                1;
+        },
     },
     1401: {
         atk: function(p) {
             return p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 2.625 :
                 p.unit.class.has("Shooter") && !p.unit.class.has("Driven") ? 1.75 : 
                 !p.unit.class.has("Shooter") && p.unit.class.has("Driven") ? 1.5 :
-                1; }
+                1;
+        },
     },
     1402: {
-        atk: function(p) { return p.unit.type === "QCK" || p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" || p.unit.type == "PSY" ? 2 : 1; },
     },
     1403: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
+            
+        },
     },
     1404: {
         atk: function(p){ 
-            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1; }
+            return p.unit.class.has("Free Spirit") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
+        },
     },
     1405: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; }
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.25 : 1; },
     },
     1406: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
     },
     1407: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.25 : 1; },
     },
     1408: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" || p.unit.type === "PSY" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" || p.unit.type == "PSY" ? 1.5 : 1; },
     },
     1410: {
         chainModifier: function(p) { return 2.5; }
@@ -3932,57 +3937,57 @@ window.captains = {
         hp: function(p) { return 1.2; }
     },
     1414: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
     1415: {
-        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; }
+        atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
     },
     1416: {
         atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
     },
     1417: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
     },
     1418: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1419: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
     },
     1420: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
     1422: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1422: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; }
+        hp: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Striker") ? 1.5 : 1; },
     },
     1423: {
-        atk: function(p) { return 1.75; }
+        atk: function(p) { return 1.75; },
     },
     1424: {
         atk: function(p) { return p.unit.class.has("Striker") ? 1 + 1.25 * p.percHP / 100 : 1; }
     },
     1425: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Fighter") ? 1.75 : 1; },
     },
     1426: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.25 : 1; }
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Striker") ? 1.25 : 1; },
     },
     1427: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
     },
     1429: {
-        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 1.5 : 1; },
     },
     1430: {
-        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; }
+        rcv: function(p) { return p.unit.class.has("Free Spirit") || p.unit.class.has("Striker") ? 2 : 1; },
     },
     1431: {
         atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
@@ -3994,7 +3999,7 @@ window.captains = {
                 return 1.2;
             else
                 return 1; 
-               }
+               },
     },
     1432: {
         atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
@@ -4006,57 +4011,61 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               }
+               },
     },
     1433: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.5 : p.classCount.Powerhouse==4 ? 1.4 : p.classCount.Powerhouse==3 ? 1.3 : p.classCount.Powerhouse==2 ? 1.2 : p.classCount.Powerhouse==1 ? 1.1 : 1 : 1; },
     },
     1434: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 3 : 1 : 1; },
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 3 : 1 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse===6 ? 2 : p.classCount.Powerhouse===5 ? 1.5 : p.classCount.Powerhouse===4 ? 1.4 : p.classCount.Powerhouse===3 ? 1.3 : p.classCount.Powerhouse===2 ? 1.2 : p.classCount.Powerhouse===1 ? 1.1 : 1 : 1; }
+            return p.unit.class.has("Powerhouse") ? p.classCount.Powerhouse==6 ? 2 : p.classCount.Powerhouse==5 ? 1.5 : p.classCount.Powerhouse==4 ? 1.4 : p.classCount.Powerhouse==3 ? 1.3 : p.classCount.Powerhouse==2 ? 1.2 : p.classCount.Powerhouse==1 ? 1.1 : 1 : 1; },
     },
     1435: {
         atk: function(p) { 
             return p.unit.class.has("Slasher") ? 2 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+            return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1436: {
         atk: function(p) { 
             return p.unit.class.has("Slasher") ? 2.5 : 1; },
         hp: function(p) { 
-            return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+            return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
     },
     1437: {
         atk: function(p) {
             return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 1.69 :
                 p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.3 :
-                1; }
+                1;
+        }
     },
     1438: {
         atk: function(p) {
             return p.unit.class.has("Powerhouse") && p.unit.class.has("Striker") ? 2.56 :
                 p.unit.class.has("Powerhouse") || p.unit.class.has("Striker") ? 1.6 :
-                1; }
+                1;
+        }
     },
     1439: {
         atk: function(p) {
-            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1; }
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.2 : 1;
+        }
     },
     1440: {
         atk: function(p) {
-            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.5 : 1; }
+            return p.unit.class.has("Powerhouse") || p.unit.class.has("Fighter") ? 1.5 : 1;
+        }
     },
     1441: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1442: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
     },
     1443: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
@@ -4078,10 +4087,10 @@ window.captains = {
     },
     1445: {
         atk: function(p) { 
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") ? 2.25 + 0.5 * p.percHP / 100 : 1; 
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") ? 2.25 + 0.5 * p.percHP / 100 : 1; 
         },
         rcv: function(p) {
-            return (p.unit.type === "QCK" || p.unit.type === "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
+            return (p.unit.type == "QCK" || p.unit.type == "PSY") && p.percHP <= 50.0 ? 1.5 : 1;
         }
     },
     1446: {
@@ -4089,35 +4098,35 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1447: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
     1448: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
     },
     1449: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.5 : 1; },
     },
     1450: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 1.75 : 1; },
     },
     1451: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.25 : 1.5); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.25 : 1.5); }
     },
     1452: {
-        atk: function(p) { return p.unit.type !== "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
+        atk: function(p) { return p.unit.type != "DEX" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); }
     },
     1453: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; },
     },
     1454: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.5 : 1; },
     },
     1455: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -4125,15 +4134,15 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1457: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 1.75 : 1; },
     },
     1458: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "QCK" ? 2 : 1; },
     },
     1459: {
         hitAtk: function(p) {
@@ -4150,7 +4159,7 @@ window.captains = {
     1461: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.6, ["QCK"]); }, 
         hitAtk: function(p) {
-            if (!(p.unit.type === "QCK")) return 1;
+            if (!(p.unit.type == "QCK")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.6 : 2;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
@@ -4166,22 +4175,22 @@ window.captains = {
         rcv: function(p) { return 1.25; }
     },
     1466: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 2 : 1; },
     },
     1467: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" || p.unit.type === "QCK" ? 1.3 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" || p.unit.type == "QCK" ? 1.3 : 1; },
     },
     1468: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1469: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
     },
     1470: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 3 : p.unit.class.has("Powerhouse") || p.unit.class.has("Slasher") ? 1.5 : 1; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 3 : p.unit.class.has("Powerhouse") || p.unit.class.has("Slasher") ? 1.5 : 1; }  
     },
     1471: {
         atk: function(p) {
@@ -4189,10 +4198,10 @@ window.captains = {
         }
     },
     1472: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.125 : 2.25; }  
     },
     1473: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.125 : 2.25; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.125 : 2.25; }  
     },
     1474: {
         atk: function(p) { return 1.5; }  
@@ -4201,11 +4210,11 @@ window.captains = {
         atk: function(p) { return 2.25; }  
     },
     1476: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
     },
     1477: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.25 : 1; },
     },
     1478: {
         hit: function(n) {
@@ -4237,12 +4246,12 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1482: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
     },
     1483: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.2 : 1; }
     },
     1484: {
         hitAtk: function(p) {
@@ -4256,19 +4265,19 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; }
+        rcv: function(p) { return 1.2; },
     },
     1486: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1); },
     },
     1487: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); },
     },
     1488: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1489: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1490: {
         hitAtk: function(p) {
@@ -4288,34 +4297,34 @@ window.captains = {
         rcv: function(p) { return 1.2; }
     },
     1493: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
     },
     1494: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
     },
     1495: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
     },
     1496: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
     },
     1497: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; },
     },
     1498: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "STR" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.2 : 1; }
     },
     1499: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1500: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     1501: {
         atk: function(p) { return p.unit.cost <= 15 ? 2 : 1; }
@@ -4349,59 +4358,59 @@ window.captains = {
         }
     },
     1509: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
     },
     1510: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Driven") ? 2 : 1; },
     },
     1511: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
     },
     1512: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
     },
     1513: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1514: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1515: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 1.5 : 1; },
     },
     1516: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "QCK" ? 2 : 1; },
     },
     1517: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1518: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1519: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; },
     },
     1520: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
     },
     1521: {
         atk: function(p) { 
-            return p.unit.class.has("Slasher") && p.unit.type === "QCK" ? 1.44 :
-                p.unit.class.has("Slasher") || p.unit.type === "QCK" ? 1.2 :
+            return p.unit.class.has("Slasher") && p.unit.type == "QCK" ? 1.44 :
+                p.unit.class.has("Slasher") || p.unit.type == "QCK" ? 1.2 :
                 1;
         }
     },
     1522: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        hp: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     1523: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
     },
     1524: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; },
     },
     1525: {
         atk: function(p) {
@@ -4409,19 +4418,19 @@ window.captains = {
         }
     },
     1526: {
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
     },
     1527: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
     },
     1528: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
     },
     1529: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 3 : 1.5; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 3 : 1.5; }  
     },
     1530: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 3.5 : 1.75; }  
+        atk: function(p) { return p.slot == p.sourceSlot ? 3.5 : 1.75; }  
     },
     1531: {
         atk: function(p) { return p.percHP <= 30.0 ? 1.75 : p.percHP <= 50.0 ? 1.5 : 1; }
@@ -4432,31 +4441,31 @@ window.captains = {
     1533: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
         hitAtk: function(p) {
-            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
+            return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.5 : 2;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1534: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, ["QCK"]); }, 
         hitAtk: function(p) {
-            return !p.unit.type === "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
+            return !p.unit.type == "QCK" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 2.5;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return p.unit.type === "QCK" ? 1.2 : 1; }
+        hp: function(p) { return p.unit.type == "QCK" ? 1.2 : 1; }
     },
     1535: {
-        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 1); }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 1); }
     },
     1536: {
-        atk: function(p) { return !p.unit.type === "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1); }
+        atk: function(p) { return !p.unit.type == "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1); }
     },
     1537: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.2 : 1; }
     },
     1538: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Shooter") ? 1.25 : 1; }
     },
     1539: {
@@ -4511,39 +4520,39 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1546: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
     },
     1547: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.3 : 1; }
     },
     1548: {
         atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1549: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.25 : 1; },
     },
     1550: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
     },
     1551: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
     },
     1552: {
-        atk: function(p) { return p.unit.cost === 40 ? 2.5 : 1; }
+        atk: function(p) { return p.unit.cost == 40 ? 2.5 : 1; },
     },
     1553: {
-        atk: function(p) { return p.unit.cost === 40 ? 2.75 : 1; }
+        atk: function(p) { return p.unit.cost == 40 ? 2.75 : 1; },
     },
     1554: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2 : 1; },
     },
     1555: {
-        atk: function(p) { return p.unit.type === "DEX" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 2.25 : 1; },
     },
     1556: {
-        hp: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "STR" ? 2 : 1; },
     },
     1557: {
         atk: function(p) {
@@ -4567,7 +4576,7 @@ window.captains = {
     },
     1561: {
         atk: function(p) {
-            return p.unit.type === "INT" ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
+            return p.unit.type == "INT" ? Math.max(1.0, 3.0 - 0.1 * p.turnCounter) : 1;
         }
     },
     1562: {
@@ -4598,12 +4607,12 @@ window.captains = {
         atk: function(p) { return 2; }
     },
     1567: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1568: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     1569: {
         atk: function(p) { return 2.25; }
@@ -4625,11 +4634,11 @@ window.captains = {
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1574: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
     },
     1575: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.25 : 1; }
     },
     1576: {
         hitAtk: function(p) {
@@ -4646,19 +4655,19 @@ window.captains = {
     1579: {
         atk: function(p) { return 1.3; },
         rcv: function(p) { return 1.3; },
-        hp: function(p) { return 1.3; }
+        hp: function(p) { return 1.3; },
     },
     1580: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; },
     },
     1581: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.5 : 1; },
     },
     1582: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; },
     },
     1583: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -4668,52 +4677,52 @@ window.captains = {
     },
     1585: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1586: {
         atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
-        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1587: {
-        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
-        hp: function(p) { return 1.3; }
+        atk: function(p) { return (p.slot == p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
+        hp: function(p) { return 1.3 },
     },
     1588: {
-        atk: function(p) { return (p.slot === p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
-        hp: function(p) { return 1.3; }
+        atk: function(p) { return (p.slot == p.sourceSlot && p.actions[p.sourceSlot]) ? 6.25 : 2.5; },
+        hp: function(p) { return 1.3 },
     },
     1589: {
-        chainModifier: function(p) { return 3; }
+        chainModifier: function(p) { return 3; },
     },
     1590: {
         chainModifier: function(p) { return 3.5; },
-        rcv: function(p) { return 1.2; },
-        hp: function(p) { return 1.2; }
+        rcv: function(p) { return 1.2 },
+        hp: function(p) { return 1.2 },
     },
     1591: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
     },
     1592: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1; }
+        rcv: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Free Spirit") ? 1.75 : 1; },
     },
     1593: {
         atk: function(p){ 
             return p.unit.class.has("Fighter") ? p.actions[p.sourceSlot] ? 4 : 2.5 : 1;
-        }
+        },
     },
     1595: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
     },
     1596: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; }
     },
     1597: {
-        atk: function(p) { return p.unit.type === "INT" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.75 : 1; }
     },
     1598: {
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; }
@@ -4722,7 +4731,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1600: {
-        atk: function(p) { return p.unit.type === "INT" || p.unit.type === "PSY" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" || p.unit.type == "PSY" ? 2.5 : 1; },
     },
     1601: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
@@ -4736,65 +4745,65 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1603: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "STR" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "STR" ? 1.25 : 1; }
     },
     1604: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 1.5 : 1; },
     },
     1605: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
     },
     1606: {//BB Pirates FN Lafitte
-        atk: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.75 : 1; },
     },
     1607: {//BB Pirates FN Van Augur
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1608: {//BB Pirates FN Doc Q
-        atk: function(p) { return p.unit.type === "INT" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "INT" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "INT" ? 1.5 : 1; },
     },
     1609: {//Enel TO DO
-        hp: function(p) { return 0.8; },
-        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
+        hp: function(p) { return 0.8 },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); },
     },
     1610: {//Enel TO DO
-        hp: function(p) { return 0.8; },
-        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); }
+        hp: function(p) { return 0.8 },
+        atk: function(p) { return Math.max(2.0, 2.0 + 0.000125 * p.healCounter); },
     },
     1611: {
         atk: function(p) {return p.unit.class.has("Shooter") ? 1.75 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
     1612: {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
     1613: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
     },
     1614: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; }
+        hp: function(p) { return p.unit.class.has("Fighter") ? 1.25 : 1; },
     },
     1615: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; },
     },
     1616: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") ? 2.5 : 1; },
     },
     1617: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2 : 1; },
     },
     1618: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
     },
     1619: {
         chainModifier: function(p) { return 4; },
-        hp: function(p) { return 1.2; },
-        rcv: function(p) { return 1.2; }
+        hp: function(p) { return 1.2 },
+        rcv: function(p) { return 1.2 },
     },
     1620: {
         atk: function(p) { return p.unit.class.has("Striker") && p.percHP <= 30.0 ? 2.5 : 1; }
@@ -4815,7 +4824,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 1.5 : 1; }
     },
     1625: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
     1626: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
@@ -4829,7 +4838,7 @@ window.captains = {
     },
     1628: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; }
+        rcv: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 1.5 : 1; },
     },
     1629: {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.5 : 1; },
@@ -4846,14 +4855,14 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.75 : 1; }
     },
     1633: {
-        atk: function(p) { return p.unit.type === "STR" ? 1.75 : 1; },
+        atk: function(p) { return p.unit.type == "STR" ? 1.75 : 1; },
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
     },
     1634: {
-        hp: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        hp: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     1635: {
-        atk: function(p) { return p.slot === p.sourceSlot ? 1.5 : p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) { return p.slot == p.sourceSlot ? 1.5 : p.unit.class.has("Cerebral") ? 2 : 1; }
     },
     1636: {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
@@ -4862,13 +4871,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Cerebral") ? 2.25: 1; }
     },
     1644: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     1645: {
         atk: function(p) { 
-            return p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.96 :
-                p.unit.class.has("Slasher") && !p.unit.type === "DEX" ? 1.3 :
-                !p.unit.class.has("Slasher") && p.unit.type === "DEX" ? 1.5 :
+            return p.unit.class.has("Slasher") && p.unit.type == "DEX" ? 1.96 :
+                p.unit.class.has("Slasher") && !p.unit.type == "DEX" ? 1.3 :
+                !p.unit.class.has("Slasher") && p.unit.type == "DEX" ? 1.5 :
                 1;
         }
     },
@@ -4884,38 +4893,38 @@ window.captains = {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 2.4 : 1.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1649: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3 : 1.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1650: {
-        atk: function(p) { return p.unit.type === "DEX" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5) : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5) : 1; },
     },
     1651: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1652: {
-        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb === 'meat' || p.orb === 'g') ? 1 : 3.75 : 1; },
+        atk: function(p) { return p.unit.class.has("Striker") ? (p.orb == 'meat' || p.orb == 'g') ? 1 : 3.75 : 1; },
         hp: function(p) { return p.unit.class.has("Striker") ? 1.25 : 1; }
     },
     1653: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; }
     },
     1654: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; }
     },
     1655: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1656: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2.25 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2.25 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1657: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Free Spirit") ? 2 : 1; }
@@ -4930,13 +4939,13 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
     },
     1661: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
     },
     1662: {
-        atk: function(p) { return p.unit.type === "PSY" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2.5 : 1; },
     },
     1663: {
-        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.5 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Powerhouse") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.5 : 2.5); },
         rcv: function(p) { return 0; }
     },
     1664: {
@@ -4963,8 +4972,8 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
     },
     1670: {
-        atk: function(p) { return p.unit.type === "DEX" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "DEX" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "DEX" ? 1.2 : 1; }
     },
     1671: {
         rcv: function(p) { return p.unit.class.has("Free Spirit") ? 1.5 : 1; }
@@ -5037,10 +5046,10 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1687: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
     },
     1688: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
     },
     1689: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['STR', 'DEX', 'INT']); },
@@ -5081,10 +5090,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
     },
     1693: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2 : 1; },
     },
     1694: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.75 : 1; },
     },
     1695: {
         atk: function(p) { return p.unit.class.has("Striker") ? 2 : 1; }
@@ -5102,7 +5111,7 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               }
+               },
     },
     1698: {
         atk: function(p) { if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1) 
@@ -5114,7 +5123,7 @@ window.captains = {
                 return 1.5;
             else
                 return 1; 
-               }
+               },
     },
     1699: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
@@ -5125,40 +5134,40 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.3 : 1; }
     },
     1701: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
     },
     1702: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
     },
     1703: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
     },
     1704: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.5 : 1; },
     },
     1705: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
     },
     1706: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.625, ["STR"]); }, 
         hitAtk: function(p) {
-            return !p.unit.type === "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
+            return !p.unit.type == "STR" ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.125 : 2.5;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1707: {
-        atk: function(p) { return p.unit.type === "PSY" ? 2.75 : 1; },
-        hp: function(p) { return p.unit.type === "PSY" ? 1.3 : 1; }
+        atk: function(p) { return p.unit.type == "PSY" ? 2.75 : 1; },
+        hp: function(p) { return p.unit.type == "PSY" ? 1.3 : 1; },
     },
     1709: {
-        atk: function(p) { return 1.5; }
+        atk: function(p) { return 1.5; },
     },
     1710: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1711: {
-        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3 : 1.5); },
+        atk: function(p) { return !p.unit.class.has("Cerebral") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3 : 1.5); },
         rcv: function(p) { return p.unit.class.has("Cerebral") ? 1.2 : 1; }
     },
     1712: {
@@ -5168,10 +5177,10 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Driven") ? Math.min(3.25, 2.5 + 0.25 * p.turnCounter) : 1; }
     },
     1714: {
-        atk: function(p) { return p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2 : 1; },
     },
     1715: {
-        atk: function(p) { return !p.unit.class.has("Striker") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.5 : 2); }
+        atk: function(p) { return !p.unit.class.has("Striker") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.5 : 2); },
     },
     1716: {
         atk: function(p) {
@@ -5182,18 +5191,18 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Driven" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Driven")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.5 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1719: {
-        atk: function(p) { return p.unit.type !== "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2 : 1); }
+        atk: function(p) { return p.unit.type != "PSY" ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2 : 1); }
     },
     1720: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
     },
     1721: {
-        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 2.75 : 2.5); },
+        atk: function(p) { return !p.unit.class.has("Fighter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 2.75 : 2.5); },
         hp: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
     },
     1722: {
@@ -5224,73 +5233,73 @@ window.captains = {
         hitModifiers: ["Good", "Great", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1728: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2 : 1; },
     },
     1729: {
-        atk: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 1.25 : 1; },
     },
     1730: {
-        atk: function(p) { return 2; }
+        atk: function(p) { return 2; },
     },
     1731: {
-        atk: function(p) { return 2; }
+        atk: function(p) { return 2; },
     },
     1732: {
-        atk: function(p) { return p.unit.type === "STR" ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.1 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.1 : 1; },
     },
     1733: {
-        atk: function(p) { return p.unit.type === "STR" ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.25 : 1; }
+        atk: function(p) { return p.unit.type == "STR" ? 2.5 : 1; },
+        hp: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.25 : 1; },
     },
     1734: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.5 : 1; },
     },
     1735: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Cerebral") ? 1.75 : 1; },
     },
     1736: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
     },
     1737: {
-        atk: function(p) { return p.unit.type === "INT" ? 2.25 : 1; },
-        hp: function(p) { return p.unit.type === "INT" ? 1.2 : 1; }
+        atk: function(p) { return p.unit.type == "INT" ? 2.25 : 1; },
+        hp: function(p) { return p.unit.type == "INT" ? 1.2 : 1; },
     },
     1738: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1739: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1740: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.1 : 1; }
+        hp: function(p) { return p.unit.type == "DEX" ? 1.1 : 1; },
     },
     1741: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "DEX" ? 1.3 : 1; }
+        hp: function(p) { return p.unit.type == "DEX" ? 1.3 : 1; },
     },
     1742: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.1 : 1; }
+        hp: function(p) { return p.unit.type == "STR" ? 1.1 : 1; },
     },
     1743: {
         atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.type === "STR" ? 1.3 : 1; }
+        hp: function(p) { return p.unit.type == "STR" ? 1.3 : 1; },
     },
     1744: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1745: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2 : 1; },
     },
     1746: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Shooter" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
+            return p.chainPosition === 0 ? 2.5 : (prev == 'Good' ? 2.75 : (prev == 'Great' ? 3 : (prev == 'Perfect' ? 3.25 : 2.5)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -5299,17 +5308,17 @@ window.captains = {
         hitAtk: function(p) {
             if (!p.unit.class.has('Shooter')) return 1;
             var prev = p.modifiers.slice(p.chainPosition - 1, p.chainPosition)[0];
-            return p.chainPosition === 0 ? 2.5 : (prev === 'Good' ? 2.75 : (prev === 'Great' ? 3 : (prev === 'Perfect' ? 3.25 : 2.5)));
+            return p.chainPosition === 0 ? 2.5 : (prev == 'Good' ? 2.75 : (prev == 'Great' ? 3 : (prev == 'Perfect' ? 3.25 : 2.5)));
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1748: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1749: {
-        atk: function(p) { return p.unit.type === "QCK" ? 2 : 1; },
-        hp: function(p) { return p.unit.type === "QCK" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 2 : 1; },
+        hp: function(p) { return p.unit.type == "QCK" ? 2 : 1; }
     },
     1750: {
         atk: function(p) { return p.unit.class.has("Striker") ? 3 : 1; }
@@ -5330,25 +5339,25 @@ window.captains = {
         hp: function(p) { return p.unit.cost <= 30 ? 1.3 : 1; }
     },
     1754: {
-        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2 : 1; },
     },
     1755: {
         atk: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Fighter") || p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1758: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.1 : 1; }
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.1 : 1; },
     },
     1759: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.2 : 1; },
     },
     1760: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2 : 1; },
     },
     1761: {
-        atk: function(p) { return p.unit.type === "DEX" || p.unit.type === "INT" ? 2.5 : 1; }
+        atk: function(p) { return p.unit.type == "DEX" || p.unit.type == "INT" ? 2.5 : 1; },
     },
     1762: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
@@ -5358,7 +5367,7 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-        rcv: function(p) { return 0.5; }
+        rcv: function(p) { return 0.5; },
     },
     1763: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4.026275, [ "Powerhouse" ]); },
@@ -5368,7 +5377,7 @@ window.captains = {
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
         hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
-        rcv: function(p) { return 0.5; }
+        rcv: function(p) { return 0.5; },
     },
     1764: {
         atk: function(p) {
@@ -5377,20 +5386,20 @@ window.captains = {
         hp: function(p) { return 1.25; }
     },
     1765: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
     },
     1766: {
         chainModifier: function(p) { return 1.5; },
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.5 : 1; },
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 1.75 : 1; },
     },
     1767: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Slasher") ? 1.5 : 1; },
     },
     1769: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") ? 2.5 : 1; },
     },
     1770: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.25, [ "Cerebral" ]); },
@@ -5417,12 +5426,12 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Free Spirit") ? 1.25 : 1; }
     },
     1775: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.5 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.5 : 1; }
     },
     1776: {
-        atk: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; },
-        rcv: function(p) { return p.unit.type === "QCK" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; },
+        rcv: function(p) { return p.unit.type == "QCK" ? 1.75 : 1; }
     },
     1778: {
         atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
@@ -5439,7 +5448,7 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.75 : 1; }
     },
     1782: {
-        atk: function(p) { return p.unit.type === "2.25" ? 1.75 : 1; }
+        atk: function(p) { return p.unit.type == "2.25" ? 1.75 : 1; },
     },
     1783: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 1.5 : 1; },
@@ -5451,25 +5460,25 @@ window.captains = {
     1791: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 2.5, [ "QCK", "STR", "DEX" ]); }, 
         hitAtk: function(p) {
-            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
+            return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.5 : 1;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1792: {
         damageSorter: function(d) { return CrunchUtils.typeSort(d, 3.25, [ "QCK", "STR", "DEX" ]); }, 
         hitAtk: function(p) {
-            return !(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
+            return !(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 3.25 : 1;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1793: {
         atk: function(p) { 
-            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
-                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+            if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
+                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
-                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
+                else if(p.colorCount.INT==0 && p.colorCount.PSY==0)
                     return 1.35;
                 else
                     return 1; 
@@ -5482,16 +5491,16 @@ window.captains = {
                 return 1.3;
             else
                 return 1; 
-               }
+               },
     },
     1794: {
         atk: function(p) { 
-            if(p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK"){
-                if(p.colorCount.INT===0 && p.colorCount.PSY===0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
+            if(p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK"){
+                if(p.colorCount.INT==0 && p.colorCount.PSY==0 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 3.7125;
                 else if(p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1)
                     return 2.75;
-                else if(p.colorCount.INT===0 && p.colorCount.PSY===0)
+                else if(p.colorCount.INT==0 && p.colorCount.PSY==0)
                     return 1.35;
                 else
                     return 1; 
@@ -5504,67 +5513,67 @@ window.captains = {
                 return 1.3;
             else
                 return 1; 
-               }
+               },
     },
     1795: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2 : 1; },
     },
     1796: {
-        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") || p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1797: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
     },
     1798: {
         atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Driven") ? 1.25 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") || p.unit.class.has("Driven") ? 1.25 : 1; },
     },
     1799: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.25 : 1; }
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.25 : 1; }
     },
     1800: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; },
-        rcv: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 1.2 : 1; }
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; },
+        rcv: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 1.2 : 1; }
     },
     1801: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2 : 1; }
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2 : 1; }
     },
     1802: {
-        atk: function(p) { return (p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK") ? 2.5 : 1; }
+        atk: function(p) { return (p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK") ? 2.5 : 1; }
     },
     1803: {
-        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; },
     },
     1804: {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; }
+        hp: function(p) { return p.unit.class.has("Slasher") ? 1.3 : 1; },
     },
     1805: {
         atk: function(p) { return p.unit.cost <= 30 ? 1.5 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
     },
     1806: {
         atk: function(p) { return p.unit.cost <= 30 ? 2.25 : 1; },
-        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; }
+        hp: function(p) { return p.unit.cost <= 30 ? 1.2 : 1; },
     },
     1807: {
         atk: function(p){ 
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
             }
             return p.unit.class.has("Slasher") ? specialEnabled ? 1.35 : 1 : 1; 
-        }
+        },
     },
     1808: {
         atk: function(p){ 
             var specialEnabled = false;
             for(var i=0;i<2;i++)
             {
-                if(window.specials[1807].turnedOn[i]===true){specialEnabled = true;}
-                if(window.specials[1808].turnedOn[i]===true){specialEnabled = true;}
+                if(window.specials[1807].turnedOn[i]==true){specialEnabled = true;}
+                if(window.specials[1808].turnedOn[i]==true){specialEnabled = true;}
             }
             if(p.unit.class.has("Slasher")){
                 if(p.actions[p.sourceSlot]){
@@ -5583,8 +5592,9 @@ window.captains = {
             }else{
                 return 1;
             }
+            // return p.unit.class.has("Slasher") ? specialEnabled ? 1.62 : 1.2 : 1; 
         },
-        hp: function(p) { return p.actions[p.sourceSlot] ? 1.3 : 1.1; }
+        hp: function(p) { return p.actions[p.sourceSlot] ? 1.3 : 1.1 }
     },
     1809: {
         hitAtk: function(p) {
@@ -5599,10 +5609,10 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1811: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2 : 1; },
     },
     1812: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.25 : 1; },
     },
     1813: {
         atk: function(p) { return 2.25; }
@@ -5611,7 +5621,7 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.5, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.5 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.5 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
@@ -5619,33 +5629,33 @@ window.captains = {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 2.75, [ "Powerhouse" ]); },
         hitAtk: function(p) {
             if (!p.unit.class.has("Powerhouse")) return 1;
-            return p.modifiers.slice(0, p.chainPosition).count("Perfect") === p.chainPosition ? 2.75 : 1;
+            return p.modifiers.slice(0, p.chainPosition).count("Perfect") == p.chainPosition ? 2.75 : 1;
         },
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1816: {
-        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.25 : 2.25); },
+        atk: function(p) { return !p.unit.class.has("Shooter") ? 1 : (((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.25 : 2.25); },
         hp: function(p) { return p.unit.class.has("Shooter") ? 1.5 : 1; }
     },
     1817: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2 : 1;
         },
-        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
     },
     1818: {
         hitAtk: function(p) {
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Great", "Great", "Great"]) ? 2.5 : 1.5;
         },
         hitModifiers: ["Great", "Great", "Great", "Perfect", "Perfect", "Perfect"],
-        hp: function(p) { return 1.2; }
+        hp: function(p) { return 1.2; },
     },
     1819: {
-        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Striker") || p.unit.class.has("Powerhouse") ? 1.75 : 1; },
     },
     1820: {
-        hp: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; },
-        rcv: function(p) { return p.unit.type === "PSY" ? 1.5 : 1; }
+        hp: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
+        rcv: function(p) { return p.unit.type == "PSY" ? 1.5 : 1; },
     },
     1821: {
         atk: function(p) { return 1.5; }
@@ -5659,7 +5669,7 @@ window.captains = {
             if (!p.unit.class.has("Shooter")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1824: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 3.543122, [ "Shooter" ]); },
@@ -5667,7 +5677,7 @@ window.captains = {
             if (!p.unit.class.has("Shooter")) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.543122 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect", "Perfect"]) ? 3.22102 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.9282 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect"]) ? 2.662 : p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect"]) ? 2.42 : 2.2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1825: {
         damageSorter: function(d) { return CrunchUtils.okamaSort(d, ['INT', 'INT', 'INT']); },
@@ -5702,21 +5712,21 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1827: {
-        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1828: {
-        atk: function(p) { return !(p.unit.type === "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
+        atk: function(p) { return !(p.unit.type == "INT") ? 1 : p.percHP <= 30.0 ? 3 : 2.5; }
     },
     1829: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2 : 1; },
     },
     1830: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Driven") ? 2.5 : 1; },
     },
     1831: {
         atk: function(p) { 
             if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9375 : 2.25;
             }
             else
                 return 1; 
@@ -5726,7 +5736,7 @@ window.captains = {
     1832: {
         atk: function(p) { 
             if(p.colorCount.INT>=1 && p.colorCount.PSY>=1 && p.colorCount.STR>=1 && p.colorCount.DEX>=1 && p.colorCount.QCK>=1){
-                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) === 2) && (p.orb !== 'g')) ? 3.9375 : 2.25;
+                return ((CrunchUtils.getOrbMultiplier(p.orb, p.unit.type, p.unit.class, 1, 2, [p.friendCaptain, p.captain]) == 2) && (p.orb != 'g')) ? 3.9375 : 2.25;
             }
             else
                 return 1; 
@@ -5735,129 +5745,129 @@ window.captains = {
     },
     1833: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "INT" ? 1.2 :
                 1;
         },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.1 : 1; }
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.1 : 1; },
     },
     1834: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "INT" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "INT" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "INT" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "INT" ? 1.3 :
                 1;
         },
-        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        rcv: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1835: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "STR" ? 1.2 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1836: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "STR" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "STR" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "STR" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "STR" ? 1.3 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1837: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "QCK" ? 1.2 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1838: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "QCK" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "QCK" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "QCK" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "QCK" ? 1.3 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1839: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.1 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 1.75 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.2 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.1 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 1.75 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "DEX" ? 1.2 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1840: {
         atk: function(p) { 
-            return p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.925 :
-                !p.unit.class.has("Powerhouse") && p.unit.type === "DEX" ? 2.25 :
-                p.unit.class.has("Powerhouse") && !p.unit.type === "DEX" ? 1.3 :
+            return p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.925 :
+                !p.unit.class.has("Powerhouse") && p.unit.type == "DEX" ? 2.25 :
+                p.unit.class.has("Powerhouse") && !p.unit.type == "DEX" ? 1.3 :
                 1;
         },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.2 : 1; },
     },
     1841: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1842: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 1.5 : 1; },
     },
     1843: {
-        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.5 : 1; },
     },
     1844: {
-        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") || p.unit.class.has("Striker") ? 1.75 : 1; },
     },
     1845: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.5 : 1; },
     },
     1846: {
-        atk: function(p) { return p.unit.class.has("Fighter") ? 2.75 : 1; }
+        atk: function(p) { return p.unit.class.has("Fighter") ? 2.75 : 1; },
     },
     1847: {
         atk: function(p) {  
     
             if(p.unit.cost <= 29){
                 return 3.25;
-            }else if(p.unit.cost === 54){
+            }else if(p.unit.cost == 54){
                 return 3;
             }else{
                 return 1;
             }
         },
-        hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; }
+        hp: function(p) { return p.unit.cost <= 29 ? 1.2 : 1; },
     },
     1848: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
     },
     1849: {
         atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; }
+        hp: function(p) { return p.unit.class.has("Powerhouse") ? 1.3 : 1; },
     },
     1850: {
-        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Driven") ? 2 : 1; },
     },
     1851: {
         atk: function(p) { return p.unit.class.has("Driven") ? 2.25 : 1; },
-        hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; }
+        hp: function(p) { return p.unit.class.has("Driven") ? 1.3 : 1; },
     },
     1853: {
         atk: function(p) {
             return (1 + 1.25 * ((100 - p.percHP) / 100));
         },
-        hp: function(p) { return 1.2; }
+        hp: function(p) { return 1.2; },
     },
     1854: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2 : 1; },
     },
     1855: {
         damageSorter: function(d) { return CrunchUtils.classSort(d, 4, [ "Free Spirit" ]); },
@@ -5868,17 +5878,17 @@ window.captains = {
         hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
     },
     1856: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2 : 1; },
     },
     1857: {
-        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Powerhouse") ? 2.5 : 1; },
     },
     1858: {
         hitAtk: function(p) {
             if (!(p.unit.class.has("Striker"))) return 1;
             return p.modifiers.slice(0, p.chainPosition).subcontains(["Perfect", "Perfect", "Perfect"]) ? 2.4 : 2;
         },
-        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"]
+        hitModifiers: ["Perfect", "Perfect", "Perfect", "Perfect", "Perfect", "Perfect"],
     },
     1859: {
         hitAtk: function(p) {
@@ -5889,17 +5899,10 @@ window.captains = {
         hp: function(p) { return p.unit.class.has("Striker") ? 1.2 : 1; }
     },
     1861: {
-        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 2.5 : 1; },
     },
     1863: {
-        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; }
-    },
-    1865: {
-        atk: function(p) { return p.unit.class.has("Striker") ? 1.75 : 1; }
-    },
-    1867: {
-        atk: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; },
-        chainModifier: function(p) { return p.unit.class.has("Cerebral") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Free Spirit") ? 2.5 : 1; },
     },
     1869: {
         hitAtk: function(p) {
@@ -5919,9 +5922,9 @@ window.captains = {
         atk: function(p) { return p.unit.class.has("Slasher") ? 2 : 1; }
     },
     2000: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; }
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2 : 1; },
     },
     2001: {
-        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2.5 : 1; }
-    }
+        atk: function(p) { return p.unit.class.has("Cerebral") || p.unit.class.has("Slasher") ? 2.5 : 1; },
+    },
 };
diff --git a/common/data/details.js b/common/data/details.js
index 72d0b121d..ab4f200bf 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -32,7 +32,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -54,7 +54,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 3 turns",
                     "Level 5: Reduces No Healing duration by 4 turns"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -92,7 +92,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Critical Hit" }
+            { "description": "Aquire Potential 2: Critical Hit" },
         ],
         potential: [
             {
@@ -114,7 +114,7 @@ window.details = {
                     "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
                     "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
                 ]
-            }
+            },
         ]
     },
     9: {
@@ -156,7 +156,7 @@ window.details = {
         special: "Delays all enemies for 3 turns, deals 15x character's ATK in PSY damage to all enemies",
         specialName: "Fire Bird Star",
         captain: "Boosts ATK and HP of PSY characters by 1.5x",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     17: {
         special: "Recovers 10x character's RCV in HP",
@@ -878,7 +878,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Makes [TND] orbs \"beneficial\" for [INT] characters" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [PSY] Damage Reduction" }
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
         ],
         potential: [
             {
@@ -900,7 +900,7 @@ window.details = {
                     "Level 4: Reduce damage taken from [PSY] characters by ?%",
                     "Level 5: Reduce damage taken from [PSY] characters by ?%"
                 ]
-            }
+            },
         ]
     },
     222: {
@@ -947,7 +947,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -969,7 +969,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ]
     },
     228: {
@@ -1070,7 +1070,7 @@ window.details = {
         specialName: "Rampage",
         specialNotes: "#{random : 2,000 : 200,000}",
         captain: "Boosts ATK of STR characters by 3x and reduces their HP by 60%",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     250: {
         special: "Recovers all missing HP",
@@ -1081,7 +1081,7 @@ window.details = {
         special: "Recovers all missing HP",
         specialName: "Blue Flame Rebirth",
         captain: "Boosts ATK of PSY characters by 3x if HP is above 99% at the start of the turn",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     252: {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
@@ -1092,7 +1092,7 @@ window.details = {
         special: "Reduces damage received from DEX enemies by 100% for 1 turn",
         specialName: "Brilliant Punk",
         captain: "Boosts ATK and HP of QCK characters by 2x",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     254: {
         special: "Deals 5,000 fixed damage to all enemies",
@@ -1130,7 +1130,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Boosts base ATK by 60" },
             { "description": "Aquire Sailor Ability 2: Boosts base ATK of Shooter characters by 50" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         limitnotes: "Captain boosts stack, so [DEX] and Shooter character's ATK will be boosted by 2.4x",
         potential: [
@@ -1153,7 +1153,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            }
+            },
         ]
     },
     258: {
@@ -1180,7 +1180,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Boosts base HP by 80" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [DEX] Damage Reduction" }
+            { "description": "Aquire Potential 2: [DEX] Damage Reduction" },
         ],
         potential: [
             {
@@ -1202,7 +1202,7 @@ window.details = {
                     "Level 4: Reduce damage taken from [DEX] characters by ?%",
                     "Level 5: Reduce damage taken from [DEX] characters by ?%"
                 ]
-            }
+            },
         ]
     },
     260: {
@@ -1244,7 +1244,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base ATK by 50" },
-            { "description": "Aquire Potential 3: Enrage" }
+            { "description": "Aquire Potential 3: Enrage" },
         ],
         potential: [
             {
@@ -1276,7 +1276,7 @@ window.details = {
                     "Level 4: Boosts base ATK by ??",
                     "Level 5: Boosts base ATK by ??"
                 ]
-            }
+            },
         ]
     },
     262: {
@@ -1449,7 +1449,7 @@ window.details = {
         special: "Randomly changes all orbs into either [PSY] or [RCV] orbs",
         specialName: "Meteor Fist Shower",
         captain: "Boosts ATK and HP of PSY characters by 2x",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     307: {
         special: "Randomly changes all orbs other than [DEX] into either [DEX], [RCV] or [TND] orbs",
@@ -1470,7 +1470,7 @@ window.details = {
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% for 3 turns",
         specialName: "Demon Face",
         captain: "Reduces RCV of all characters by 90%, reduces damage received by 40%",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     311: {
         special: "Deals 100x character's ATK in fixed damage to one enemy, reduces crew's HP to 1",
@@ -1510,7 +1510,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 3 turns" },
             { "description": "Boosts base HP by 80" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -1532,7 +1532,7 @@ window.details = {
                     "Level 4: Boosts base ATK by ??",
                     "Level 5: Boosts base ATK by ??"
                 ]
-            }
+            },
         ]
     },
     315: {
@@ -1546,7 +1546,7 @@ window.details = {
         specialName: "Aye Aye, Captain!",
         captain: "Boosts ATK, HP and RCV of Fighter characters by 1.5x",
         sailor: "Reduces Paralysis for 2 turns for himself",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     317: {
         special: "Randomly changes all orbs into either [DEX] or [STR] orbs, deals random DEX damage to all enemies",
@@ -1689,7 +1689,7 @@ window.details = {
             { "description": "Boosts base RCV by 40" },
             { "description": "Aquire new Captain Ability: Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x and recovers 300 HP at end of each turn" },
             { "description": "Boosts base HP by 50" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -1711,7 +1711,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -1725,7 +1725,6 @@ window.details = {
     },
     356: {
         special: "Changes own orb into [STR], deals 9x character's ATK in STR damage to all enemies",
-        specialNotes: "The in-game description is wrong, the special does not deal 7x damage",
         specialName: "Steel Magnetic Arm",
         captain: "Boosts ATK of Striker characters by 2x"
     },
@@ -1748,7 +1747,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -1770,7 +1769,7 @@ window.details = {
                     "Level 4: Boosts base ATK by ??",
                     "Level 5: Boosts base ATK by ??"
                 ]
-            }
+            },
         ]
     },
     358: {
@@ -1799,7 +1798,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Aquire new Captain Ability: Boosts ATK of [DEX] characters by 3x if HP is above 99% at the start of the turn, 2x otherwise" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -1821,7 +1820,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     360: {
@@ -2277,7 +2276,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -2299,7 +2298,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     448: {
@@ -2888,7 +2887,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 120" },
             { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 50" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -2910,7 +2909,7 @@ window.details = {
                     "Level 4: If there are 4 Shooter characters in your crew, reduces No Healing duration by 2 turns",
                     "Level 5: If there are 4 Shooter characters in your crew, reduces No Healing duration by 3 turns"
                 ]
-            }
+            },
         ]
     },
     557: {
@@ -3026,7 +3025,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 50" },
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [PSY] Damage Reduction" }
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
         ],
         potential: [
             {
@@ -3048,7 +3047,7 @@ window.details = {
                     "Level 4: Reduce damage taken from [PSY] characters by ?%",
                     "Level 5: Reduce damage taken from [PSY] characters by ?%"
                 ]
-            }
+            },
         ]
     },
     576: {
@@ -3332,14 +3331,14 @@ window.details = {
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     639: {
         special: "Changes [PSY] and [INT] orbs into [QCK] orbs, reduces Bind duration by 1 turn",
         specialName: "Bohemian Reverse Slash",
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Slasher characters by 2x",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     640: {
         special: "Changes own orb into [DEX], deals several times the character's ATK in DEX damage to one enemy",
@@ -3383,7 +3382,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Boosts base RCV by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [INT] Damage Reduction" }
+            { "description": "Aquire Potential 2: [INT] Damage Reduction" },
         ],
         potential: [
             {
@@ -3405,7 +3404,7 @@ window.details = {
                     "Level 4: Reduce damage taken from [INT] characters by ?%",
                     "Level 5: Reduce damage taken from [INT] characters by ?%"
                 ]
-            }
+            },
         ]
     },
     644: {
@@ -3954,7 +3953,7 @@ window.details = {
         special: "Deals 35x character's ATK in STR damage to one enemy, boosts chances of getting matching orbs for 3 turns",
         specialName: "Rokuougan",
         captain: "Boosts ATK of Powerhouse characters by 3x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     749: {
         special: "Deals random DEX damage to all enemies, randomizes all orbs",
@@ -3968,13 +3967,13 @@ window.details = {
         specialName: "Tempest Kick: Sky Slicer",
         specialNotes: "#{random : 10,000 : 90,000}",
         captain: "Boosts ATK of DEX characters by 2x, boosts damage of DEX specials by 2x",
-        captainNotes: "#{noFixedPerc}"
+        captainNotes: "#{noFixedPerc}",
+        limit: "This character has a limit break path",
     },
     751: {
         special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
         specialName: "Sheep Cloud Tidal Wave",
-        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
-        limit: "This character has a limit break path"
+        captain: "Boosts ATK and RCV of Cerebral characters by 1.5x"
     },
     752: {
         special: "Reduces damage received in the next turn by 50% if the special is activated with more than 50% health remaining, by 80% if activated with less than 50% but more than 10% health remaining, by 100% if activated with less than 10% health remaining",
@@ -3991,7 +3990,8 @@ window.details = {
         special: "Deals 15x character's ATK in QCK damage to one enemy, amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{orb : 1.75x}",
         specialName: "Moonlight Ten Finger Pistol",
-        captain: "Boosts ATK of Powerhouse characters by 2.5x"
+        captain: "Boosts ATK of Powerhouse characters by 2.5x",
+        limit: "This character has a limit break path",
     },
     755: {
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
@@ -4002,7 +4002,7 @@ window.details = {
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
         specialName: "Tekkai - Rin",
         captain: "Boosts ATK of INT characters by 2x, reduces damage received from PSY enemies by 30%",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     757: {
         special: "Changes [DEX] and [QCK] orbs into [PSY] orbs",
@@ -4023,13 +4023,12 @@ window.details = {
         special: "Switches orbs between slots 3 times, locks all orbs for 1 turn",
         specialName: "Life Return: Shishi Finger Pistol",
         captain: "Boosts ATK of STR characters by 3x if HP is below 30% at the start of the turn",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     761: {
         special: "Deals 15x character's ATK in DEX damage to one enemy, boosts ATK of all characters by 1.2x for 1 turn",
         specialName: "Gum-Gum Monster Pistol",
-        captain: "Boosts ATK of Fighter characters by 2x",
-        limit: "This character has a limit break path"
+        captain: "Boosts ATK of Fighter characters by 2x"
     },
     762: {
         special: "Boosts ATK of PSY characters by 1.75x for 1 turn",
@@ -4139,7 +4138,8 @@ window.details = {
         special: "Boosts own ATK by a variable factor for 1 turn",
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 1.5x; between 20% HP and 50% HP, it's 1.75x; below 20% HP, it's 2x.",
         specialName: "Precept Deification",
-        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn"
+        captain: "Boosts ATK of all characters by 2.5x if HP is below 30% at the start of the turn",
+        limit: "This character has a limit break path",
     },
     782: {
         special: "Delays all enemies for 1 turn, recovers a small random amount of HP",
@@ -4453,7 +4453,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -4475,7 +4475,7 @@ window.details = {
                     "Level 4: Boosts base ATK by ??",
                     "Level 5: Boosts base ATK by ??"
                 ]
-            }
+            },
         ]
     },
     841: {
@@ -4522,7 +4522,7 @@ window.details = {
             { "description": "Boosts base ATK by 100" },
             { "description": "Aquire Sailor Ability 2: Boosts this character's attack against [DEX] characters by 2x" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -4544,7 +4544,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ]
     },
     847: {
@@ -5102,7 +5102,7 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     934: {
         captain: "Boosts ATK of Fighter characters by 2x, and their HP by 1.5x. If HP is above 70% or below 30%, boosts ATK of Fighter characters by 2.75 instead",
@@ -5137,7 +5137,7 @@ window.details = {
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of Cerebral characters by 2x",
         specialName: "Cyclone Burst",
         special: "Reduces Bind duration for one character completely. For Striker and Cerebral characters, changes Badly Matching orbs into Matching orbs",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     940: {
         captain: "Boosts ATK and HP of [DEX] characters by 1.5x",
@@ -5184,13 +5184,13 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by 1.5x and their RCV by 1.2x",
         specialName: "Twin Cannons",
         special: "Randomly changes all orbs to either [STR] or [INT]. Deals random [STR] damage",
-        specialNotes: "#{random : 7,000 : 18,000}"
+        specialNotes: "#{random : 7,000 : 18,000}",
     },
     949: {
         captain: "Boosts ATK of Slasher characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         specialName: "Ties with Ace",
         special: "Reduces Silence duration by 3 turns, and recovers 4,000 HP",
-        specialNotes: "#{silence}"
+        specialNotes: "#{silence}",
     },
     950: {
         captain: "Boosts ATK of Fighter and Free Spirit characters by 2.5x after scoring 3 Perfects in a row",
@@ -5365,7 +5365,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire new Captain Ability: Reduces cooldown of Shooter specials by 3 turns at the start of the fight, boosts ATK of Shooter characters by 2.35x and boosts HP of Shooter characters by 1.5x" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -5387,13 +5387,13 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     979: {
         captain: "Boosts ATK of [PSY] and [DEX] characters by 1.75x and their RCV by 1.2x",
         specialName: "Flintlock Barrage",
-        special: "Randomly changes all orbs into either [PSY] or [DEX] orbs, deals random PSY damage to all enemies"
+        special: "Randomly changes all orbs into either [PSY] or [DEX] orbs, deals random PSY damage to all enemies",
     },
     980: {
         captain: "Boosts ATK of [DEX] and [STR] characters by 1.75x and their RCV by 1.2x",
@@ -5474,7 +5474,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire Sailor Ability 1: Boosts HP, RCV, and ATK of [QCK] characters by 30" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -5496,11 +5496,12 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     994: {
         captain: "Boosts amount of Beli received by 2x",
+        special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
         specialName: "Peeping Mind",
         special: [
             {
@@ -5512,12 +5513,13 @@ window.details = {
                 "cooldown": [ 20, 14 ]
             }
         ],
-        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, \"Specials based on turns\", and \"Effect after Death\"<br>#{stages}",
+        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'<br>#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     995:{
         captain: "Boosts amount of Beli received by 3x",
+        special: "Reduces Special Cooldown of Cerebral and Fighter characters, and shows the stats of enemies",
         specialName: "Peeping Mind",
         special: [
             {
@@ -5529,9 +5531,9 @@ window.details = {
                 "cooldown": [ 20, 14 ]
             }
         ],
-        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, \"Specials based on turns\", and \"Effect after Death\"<br>#{stages}",
+        specialNotes: "Status includes Enemy Attack, Defense, Combo Hits, Current / Total HP, Attack Interval, 'Specials based on turns', and 'Effect after Death'<br>#{stages}",
         sailor: "Restores her own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     996: {
         captain: "Boosts ATK of Powerhouse characters by 2x",
@@ -5563,7 +5565,7 @@ window.details = {
         ],
         specialName: "Decapitation High Heel",
         specialNotes: "#{stages}",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     998: {
         captain: "Boosts ATK of Driven characters by 2x and reduces cooldown of all specials by 1 turn at the start of the fight",
@@ -5589,7 +5591,7 @@ window.details = {
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [DEX] Damage Reduction" }
+            { "description": "Aquire Potential 2: [DEX] Damage Reduction" },
         ],
         potential: [
             {
@@ -5611,7 +5613,7 @@ window.details = {
                     "Level 4: Reduce damage taken from [DEX] characters by ?%",
                     "Level 5: Reduce damage taken from [DEX] characters by ?%"
                 ]
-            }
+            },
         ]
     },
     1000: {
@@ -5707,13 +5709,13 @@ window.details = {
         captain: "Boosts HP of Slasher characters by 1.5x",
         special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
         specialName: "Ravaging Cutlass Dance",
-        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}"
+        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
     },
     1018: {
         captain: "Boosts ATK of Slasher characters by 1.5x and their HP by 2x",
         special: "Changes own orb into [PSY]. Deals several times the character's ATK in [PSY] damage to one enemy. Boosts ATK of Slasher characters by 1.5x for 1 turn",
         specialName: "Ravaging Cutlass Dance",
-        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}"
+        specialNotes: "#{specialProportional : lower : 75 * ( 1 - (remaining HP) / (total HP) )}",
     },
     1019: {
         captain: "Reduces damage received from [QCK] enemies by 50%",
@@ -5770,7 +5772,7 @@ window.details = {
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -5792,7 +5794,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -5852,7 +5854,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire Sailor Ability 2: Restores his own special by 1 turn when it is rewinded" },
-            { "description": "Aquire Potential #: Critical Hit" }
+            { "description": "Aquire Potential #: Critical Hit" },
         ],
         potential: [
             {
@@ -5874,7 +5876,7 @@ window.details = {
                     "Level 4: If you hit a perfect with this character, there is a 40% chance to deal 5% of this character's attack in extra damage",
                     "Level 5: If you hit a perfect with this character, there is a 50% chance to deal 7% of this character's attack in extra damage"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -5921,7 +5923,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Completely resists Paralysis on this character" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base ATK by 45" },
-            { "description": "Aquire Potential 3: Reduce No Healing duration" }
+            { "description": "Aquire Potential 3: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -5953,7 +5955,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by ? turns",
                     "Level 5: Reduces No Healing duration by ? turns"
                 ]
-            }
+            },
         ]
     },
     1036: {
@@ -6065,7 +6067,7 @@ window.details = {
         captain: "Recovers 1,000 HP at the end of each turn",
         special: "Reduces Silence duration by 2 turns",
         specialName: "Knowledge the World is Afraid of",
-        specialNotes: "#{silence}"
+        specialNotes: "#{silence}",
     },
     1053: {
         captain: "Boosts RCV of Cerebral characters by 1.5x",
@@ -6184,7 +6186,7 @@ window.details = {
         captain: "Boosts ATK and HP of [INT] characters by 2x",
         special: "Changes [QCK] and [PSY] orbs into [INT] orbs.",
         specialName: "Tenacious Sword of Destruction",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1076:{
         captain: "Boosts ATK of Striker and Free Spirit characters by 1.75x",
@@ -6230,7 +6232,7 @@ window.details = {
             { "description": "Aquire new Captain Ability: Boosts ATK of Striker and Free Spirit characters by 2.45x and their RCV by 1.5x" },
             { "description": "Aquire Sailor Ability 2: Boosts this character's attack against DEX characters by 2x" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -6252,7 +6254,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1078: {
@@ -6269,7 +6271,7 @@ window.details = {
             {
                 "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
                 "cooldown": [ 24, 18 ]
-            }
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "Chiyupopo"
@@ -6288,7 +6290,7 @@ window.details = {
             {
                 "description": "Recovers 50x character's RCV in HP. Removes Paralysis, Poison, RCV Down, and Blindness",
                 "cooldown": [ 24, 18 ]
-            }
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "Chiyupopo",
@@ -6307,7 +6309,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Reduces Silence duration against this unit by 2 turns" },
             { "description": "Boosts base HP by 65" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -6329,7 +6331,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by ? turns",
                     "Level 5: Reduces No Healing duration by ? turns"
                 ]
-            }
+            },
         ]
     },
     1080: {
@@ -6341,7 +6343,7 @@ window.details = {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals [DEX] damage to one enemy, changes own orb to [DEX] and boosts own ATK by 2x for 1 turn",
         specialName: "Trueno Bastardo",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1082: {
         captain: "Boosts ATK of Striker and Fighter characters by 1.2x",
@@ -6369,7 +6371,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -6391,20 +6393,20 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1084: {
         captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-        specialNotes: "Does not stack with other \"end of turn damage\" abilities",
+        specialNotes: "Does not stack with other 'end of turn damage' abilities",
         specialName: "Gravito: Heavens Fall"
     },
     1085: {
         captain: "Boosts HP of Driven characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise. Makes [TND] and [RCV] orbs \"beneficial\" to Driven characters",
         special: "Cuts the current HP of each enemy by 20%. At the end of the turn, cuts the current HP of each enemy by 20% for 3 turns",
-        specialNotes: "Does not stack with other \"end of turn damage\" abilities",
+        specialNotes: "Does not stack with other 'end of turn damage' abilities",
         specialName: "Gravito: Heavens Fall",
         limit: [
             { "description": "Boosts base HP by 25" },
@@ -6436,7 +6438,7 @@ window.details = {
             { "description": "Boosts base HP by 70" },
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -6468,7 +6470,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -6576,7 +6578,7 @@ window.details = {
             {
                 "description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
                 "cooldown": [ 27, 17 ]
-            }
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "Return Return Fruit"
@@ -6595,7 +6597,7 @@ window.details = {
             {
                 "description": "Recovers 36% of crew's MAX HP and randomizes all orbs including [BLOCK] orbs",
                 "cooldown": [ 27, 17 ]
-            }
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "Return Return Fruit"
@@ -6759,7 +6761,7 @@ window.details = {
             {
                 "description": "Deals 25x character's ATK in typeless damage to all enemies",
                 "cooldown": [ 26, 20 ]
-            }
+            },
         ],
         specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.<br>#{stages}",
         specialName: "King Punch"
@@ -6778,7 +6780,7 @@ window.details = {
             {
                 "description": "Deals 25x character's ATK in typeless damage to all enemies",
                 "cooldown": [ 26, 20 ]
-            }
+            },
         ],
         specialNotes: "For each turn AFTER Elizabello's special reaches stage 3, damage is boosted by 23.75x per turn for an additional 20 turns, for a max damage of 500x character's ATK to all enemies.<br>#{stages}",
         specialName: "King Punch"
@@ -6816,22 +6818,22 @@ window.details = {
     1134: {
         captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.2x",
         special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-        specialName: "Non-Negotiable Quest"
+        specialName: "Non-Negotiable Quest",
     },
     1135: {
         captain: "Boosts ATK and RCV for Striker and Slasher characters by 1.5x",
         special: "Reduces Special Cooldown of [INT] characters by 1 turn.",
-        specialName: "Non-Negotiable Quest"
+        specialName: "Non-Negotiable Quest",
     },
     1136: { //Fortnight Fukuro
         captain: "Boosts ATK and HP of [QCK] characters by 1.5x",
         special: "For [QCK] characters, changes [TND] and [RCV] orbs into [QCK] orbs",
-        specialName: "Stern Beast: Secret Technique: \"Owl Thrasher\" Sneak Attack"
+        specialName: "Stern Beast: Secret Technique: 'Owl Thrasher' Sneak Attack"
     },
     1137: { //Fortnight Jabra
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
         special: "Deals 13x character's ATK in [STR] damage to one enemy. For Free Spirit characters, amplifies the effects of orbs by 1.5x for 2 turns",
-        specialName: "Fatal Sneak Attack"
+        specialName: "Fatal Sneak Attack",
     },
     1138: {
         captain: "Reduces damage received by 25%",
@@ -6881,7 +6883,7 @@ window.details = {
     },
     1147:{
         special: "Recovers 7x character's RCV in HP",
-        specialName: "Moderate Healing"
+        specialName: "Moderate Healing",
     },
     1148:{
         specialName: "Paralysis Recovery - Light",
@@ -6890,11 +6892,11 @@ window.details = {
     1149:{
         special: "Deals 3x character's ATK in INT damage to all enemies, Poisons all enemies",
         specialNotes: "#{poison}",
-        specialName: "Poison Attack"
+        specialName: "Poison Attack",
     },
     1150:{
         special: "Changes Captain orb into Matching orb",
-        specialName: "Captain Orb Change"
+        specialName: "Captain Orb Change",
     },
     1151: {//Minotaur
         special: "Cuts the current HP of one enemy by 10%",
@@ -6903,7 +6905,7 @@ window.details = {
     1152: {
         special: "Deals 3 hits of 7x character's ATK in [INT] damage to random enemies.",
         specialNotes: "#{randomHits : 3}",
-        specialName: "Shy Jailer Beast: Spiked Mace"
+        specialName: "Shy Jailer Beast: Spiked Mace",
     },
     1153: {
         special: "Reduces the defense of all enemies by 100% and boosts ATK of Powerhouse characters by 1.25x for 1 turn",
@@ -6912,7 +6914,7 @@ window.details = {
     1154: {
         captain: "Boosts ATK of Powerhouse characters by 2x and their HP by 1.3x",
         special: "Reduces crew's current HP by 30%. Boosts ATK of Powerhouse characters by 1.5x",
-        specialName: "Leader of the Jailers"
+        specialName: "Leader of the Jailers",
     },
     1155: {
         special: "Deals 7x character's ATK in QCK damage to all enemies",
@@ -6922,13 +6924,13 @@ window.details = {
         captain: "Boosts ATK of Driven characters by 1.2x if HP is above 50% at the start of the turn",
         special: "Removes Poison. Protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Abyss Road",
-        specialNotes: "#{zombie}"
+        specialNotes: "#{zombie}",
     },
     1157: {
         captain: "Boosts ATK of Driven and Striker characters by 1.75x and protects from defeat as long as HP is above 50% at the start of the turn",
         special: "Removes Poison. Protects from defeat as long as HP is above 50% for 1 turn",
         specialName: "Abyss Road",
-        specialNotes: "#{zombie}"
+        specialNotes: "#{zombie}",
     },
     1158: {
         captain: "Boosts ATK of Shooter, Striker, and Powerhouse characters by 1.75x",
@@ -6957,58 +6959,58 @@ window.details = {
     1162: {//Tesoro
         captain: "Boosts ATK of [PSY] characters by 1.75x and boosts amount of Beli received by 1.5x",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
-        specialName: "Gold-Gold Fruit"
+        specialName: "Gold-Gold Fruit",
     },
     1163: {//Tesoro Evolved
         captain: "Boosts ATK of PSY characters by 1.75x. Also boosts ATK of Driven and Cerebral characters by 1.5x. Boosts amount of Beli received by 2x",
         captainNotes: "The two Boosts stack with each other so a PSY Driven or a PSY Cerebral Unit will be boosted by 2.625",
         special: "Deals large [PSY] damage to all enemies, and if HP is above 50%, changes all orbs to [PSY] orbs",
-        specialName: "Gold-Gold Fruit"
+        specialName: "Gold-Gold Fruit",
     },
     1164: {//Carina
         captain: "Boosts RCV of all characters by 1.2x",
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
-        specialName: "Sexy Diva"
+        specialName: "Sexy Diva",
     },
     1165: {//Carina Evolved
         captain: "Boosts RCV of all characters by 1.5x",
         special: "Boosts RCV by 1.5x for 1 turn and amplifies the effects of orbs by 1.5x for 1 turn",
-        specialName: "Sexy Diva"
+        specialName: "Sexy Diva",
     },
     1166: {//Baccarat
         captain: "Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
-        specialName: "Lucky-Lucky Fruit"
+        specialName: "Lucky-Lucky Fruit",
     },
     1167: {//Baccarat Evolved
         captain: "Boosts ATK of all characters by 1.2x. Gives chance of duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if she was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Boosts chance of matching orbs and reduces the ATK of enemies for 1 turn",
-        specialName: "Lucky-Lucky Fruit"
+        specialName: "Lucky-Lucky Fruit",
     },
     1168: {//Dice
         captain: "Boosts ATK of [STR] characters by 2x if HP is below 30% at the start of the turn",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated<br>HP > 50%: 1.1x<br>50% > HP > 30%: 1.25x<br>30% > HP > 10%: 1.5x<br>HP < 10%: 1.75x",
-        specialName: "Trump Card Dealer"
+        specialName: "Trump Card Dealer",
     },
     1169: {//Dice Evolved
         captain: "Boosts ATK of [STR] characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1 + 1.5 * (1 - (remaining HP) / (total HP)) : 1 : 2.5}",
         special: "Boosts ATK of [STR] characters by a variable factor for 1 turn",
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated<br>HP > 50%: 1.1x<br>50% > HP > 30%: 1.25x<br>30% > HP > 10%: 1.5x<br>HP < 10%: 1.75x",
-        specialName: "Trump Card Dealer"
+        specialName: "Trump Card Dealer",
     },
     1170: {//Tanaka
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-        specialName: "Escape-Escape Fruit"
+        specialName: "Escape-Escape Fruit",
     },
     1171: {//Tanaka Evolved
         captain: "Boosts ATK of [QCK] characters by 2x",
         special: "Reduces Bind duration by 3 turns and swaps Badly Matching, [BLOCK], and [BOMB] orbs to [EMPTY]",
-        specialName: "Escape-Escape Fruit"
+        specialName: "Escape-Escape Fruit",
     },
     1172: {
         special: "Deals random PSY damage to all enemies, randomizes all orbs",
@@ -7052,13 +7054,13 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
         specialName: "Not Rubber Gum-Gum Jet Gatling",
-        specialNotes: "#{random : 30,000 : 150,000}"
+        specialNotes: "#{random : 30,000 : 150,000}",
     },
     1179: {
         captain: "Boosts ATK of [STR] characters by 2.75x if HP is above 99% at the start of the turn. Reduces damage received by 50%",
         special: "Deals random typeless damage to all enemies. Randomizes all orbs including [BLOCK] orbs.",
         specialName: "Not Rubber Gum-Gum Jet Gatling",
-        specialNotes: "#{random : 30,000 : 150,000}"
+        specialNotes: "#{random : 30,000 : 150,000}",
     },
     1181: { //Blenheim
         captain: "Boosts ATK of [DEX] characters by 2.5x",
@@ -7092,17 +7094,17 @@ window.details = {
         special: [
             {
                 "description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
-                "cooldown": [ 8, 3 ]
+                "cooldown": [ 8, 3 ],
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
-                "cooldown": [ 17, 12 ]
+                "cooldown": [ 17, 12 ],
             }
         ],
         specialNotes : "#{stages}",
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     1186: {
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.75x. Gives chance of duplicating a drop upon completion of the island.",
@@ -7110,17 +7112,17 @@ window.details = {
         special: [
             {
                 "description": "Deals 4x character's ATK in [INT] damage to all enemies. Changes own orb into [INT].",
-                "cooldown": [ 8, 3 ]
+                "cooldown": [ 8, 3 ],
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to all enemies. Changes own orb into [INT]. Reduces Special Cooldown of Slasher and Cerebral characters by 1 turn",
-                "cooldown": [ 17, 12 ]
+                "cooldown": [ 17, 12 ],
             }
         ],
         specialNotes : "#{stages}",
         specialName: "Extreme Speed - One Sword Style, Ten Slashes",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     1187: {
         captain: "Boosts ATK of [STR] characters by 2.5x",
@@ -7151,71 +7153,71 @@ window.details = {
         specialNotes: "Does not affect DEF Boost or % Damage reduction buffs. Reduces timers for Barriers such as Perfect/Great/Good Barriers, Combo Hit Barriers and Orb Hit Barriers",
         specialName: "Break Bullet",
         sailor: "Boosts base ATK of [QCK] characters by 40",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1191: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
-        specialName: "Ice Age"
+        specialName: "Ice Age",
     },
     1192: {
         captain: "Boosts ATK of all characters by 2x and their HP by 1.2x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 8 times to a maximum of 3.5x.",
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn",
-        specialName: "Ice Age"
+        specialName: "Ice Age",
     },
     1193: {
         captain: "Boosts ATK of Free Spirit characters by 2x",
         special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
-        specialName: "Sweet Style Petrification"
+        specialName: "Sweet Style Petrification",
     },
     1194: {
         captain: "Boosts ATK of Free Spirit characters by 2.5x",
         special: "Recovers 13x character's RCV in HP and locks the chain multiplier at 2.5x for 1 turn",
-        specialName: "Sweet Style Petrification"
+        specialName: "Sweet Style Petrification",
     },
     1195: {
         captain: "Boosts ATK of Striker characters by 1.75x. Recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
-        specialName: "Split Air Hole"
+        specialName: "Split Air Hole",
     },
     1196: {
         captain: "Boosts ATK of Striker characters by 2x. Recovers 5x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 60%, deals 8x the amount of HP subtracted in typeless damage to all enemies. Boosts ATK of Striker characters by 1.75x for 1 turn",
         specialName: "Split Air Hole",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1197: {
         captain: "Boosts ATK of Cerebral and Powerhouse characters by 2.5x if they have a matching orb, by 1x otherwise, reduces crew's RCV to 0",
         special: "For Cerebral and Powerhouse characters, changes all orbs including [BLOCK] orbs to Badly Matching. Deals [INT] damage to all enemies",
-        specialName: "Investigator of Sorrow"
+        specialName: "Investigator of Sorrow",
     },
     1198: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Empties all slots with [RCV] orbs, recovers 20% of crew's MAX HP",
-        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?"
+        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1199: {
         captain: "Boosts ATK and RCV of Free Spirit characters by 1.5x",
         special: "Empties all slots with [RCV] orbs, recovers 20% of crew's MAX HP",
-        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?"
+        specialName: "Appetite Or Sex Appeal - Has it Switched Yet!?",
     },
     1200: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
-        specialName: "Passionate Look, \"I'm a Bad Guy...\"",
+        specialName: "Passionate Look, 'I'm a Bad Guy...'",
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this unit by 2 turns",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
     },
     1201: {
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Silence duration by 2 turns. If your HP is below 30%, changes top row into Matching Orbs",
-        specialName: "Passionate Look, \"I'm a Bad Guy...\"",
+        specialName: "Passionate Look, 'I'm a Bad Guy...'",
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this unit by 2 turns",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
     },
     1202: {
         captain: "Boosts ATK of Free Spirit characters by 1.5x",
@@ -7281,7 +7283,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 120" },
             { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 50" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -7303,7 +7305,7 @@ window.details = {
                     "Level 4: If there are 4 Shooter characters in your crew, reduces No Healing duration by 2 turns",
                     "Level 5: If there are 4 Shooter characters in your crew, reduces No Healing duration by 3 turns"
                 ]
-            }
+            },
         ]
     },
     1211: {
@@ -7342,17 +7344,17 @@ window.details = {
         captain: "Boosts ATK of Powerhouse characters by 2x and reduces damage received based on current HP by up to 20%",
         captainNotes: "The lower the HP, the larger the damage reduction. At 50% HP you take 10% reduced damage",
         special: "Reduces damage received by 50% for 1 turn, and changes own orb into [QCK]",
-        specialName: "Camouflage Air"
+        specialName: "Camouflage Air",
     },
     1217: {//Nightin
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: "Reduces Paralysis and Bind duration by 2 turns. Deal 10x her ATK in [PSY] damage to one enemy",
-        specialName: "Catepillar Soul Shot"
+        specialName: "Catepillar Soul Shot",
     },
     1218: {//Hancock
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
         special: "Locks all orbs for 1 turn. If HP is below 30%, changes own orb and the captain's orb into matching. ",
-        specialName: "Everybody Confusing Fragrance"
+        specialName: "Everybody Confusing Fragrance",
     },
     1219: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 16 times to a maximum of 3x.",
@@ -7360,19 +7362,19 @@ window.details = {
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
-                "cooldown": [ 22, 6 ]
+                "cooldown": [ 22, 6 ],
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 28, 12 ]
+                "cooldown": [ 28, 12 ],
             },
             {
                 "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
-                "cooldown": [ 34, 18 ]
-            }
+                "cooldown": [ 34, 18 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "More More, 10 Times \"Iron Hammer\""
+        specialName: "More More, 10 Times \"Iron Hammer\"",
     },
     1220: {//Byrnndi World Coliseum
         captain: "Boosts ATK of Shooter characters by 1x. If you defeat an enemy, increases ATK boost slighty. Stacks up to 10 times to a maximum of 3.25x.",
@@ -7380,16 +7382,16 @@ window.details = {
         special: [
             {
                 "description": "Deals 7x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.2x for 1 turn",
-                "cooldown": [ 22, 6 ]
+                "cooldown": [ 22, 6 ],
             },
             {
                 "description": "Deals 15x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 28, 12 ]
+                "cooldown": [ 28, 12 ],
             },
             {
                 "description": "Deals 25x character's ATK in [INT] damage to one enemy. Reduces crew's current HP by 50%. Boosts ATK of Shooter characters by 2x for 1 turn",
-                "cooldown": [ 34, 18 ]
-            }
+                "cooldown": [ 34, 18 ],
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "More More, 10 Times \"Iron Hammer\"",
@@ -7408,7 +7410,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Aquire Sailor Ability 1: Boosts own ATK by 100 if this character is the last in the chain to attack" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -7430,7 +7432,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -7438,83 +7440,83 @@ window.details = {
         captain: "Boosts ATK of Slasher characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-        specialName: "Blood of the Devil Warrior"
+        specialName: "Blood of the Devil Warrior",
     },
     1222: {//Coliseum Oars Jr
         captain: "Boosts ATK of Slasher characters by 2x and the HP of Powerhouse characters by 1.75x",
         special: "Deals 25x character's ATK in [STR] damage to one enemy. For 1 turn, makes [STR] orb \"beneficial\" for all characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs.",
-        specialName: "Blood of the Devil Warrior"
+        specialName: "Blood of the Devil Warrior",
     },
     1223: { // Story Bastille
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Deals 25x character's ATK in [INT] damage to all enemies",
-        specialName: "Shark Knife - Flash"
+        specialName: "Shark Knife - Flash",
     },
     1224: { // Story Yamakaji
         captain: "Boosts ATK of Slasher characters by 2x",
         special: "Reduces damage received by 60% for 1 turn",
-        specialName: "Appreciation For The Great Men"
+        specialName: "Appreciation For The Great Men",
     },
     1225: { // Story Hina
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Delays all enemies for 1 turn, and locks own orb for 1 turn",
-        specialName: "Binding Iron Tablet"
+        specialName: "Binding Iron Tablet",
     },
     1226: { // Story Smoker
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Cuts the current HP of one enemy by 10% and changes own orb into [PSY]",
-        specialName: "Seastone Truncheon"
+        specialName: "Seastone Truncheon",
     },
     1227: { //Story Mihawk
         captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight. Boosts ATK of Slasher characters by 2.25x",
         special: "Deals 100,000 fixed damage to one enemy, and boosts own ATK by 1.75x for 1 turn ",
-        specialName: "Black Blade - Slashing Burial Drop"
+        specialName: "Black Blade - Slashing Burial Drop",
     },
     1228: { // Story Kizaru
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "For Shooter characters, changes [BLOCK] orbs into Matching, and deals large [DEX] damage to all enemies",
-        specialName: "The Cave of the Sun Goddess"
+        specialName: "The Cave of the Sun Goddess",
     },
     1229: {//Sentomaru
         captain: "Boosts ATK of Powerhouse characters by 2x, and his OWN ATK by 2x.",
         special: [
             {
                 "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 11, 4 ]
+                "cooldown": [ 11, 4 ],
             },
             {
                 "description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 15, 8 ]
+                "cooldown": [ 15, 8 ],
             },
             {
                 "description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-                "cooldown": [ 22, 15 ]
-            }
+                "cooldown": [ 22, 15 ], 
+            },
         ],
         specialNotes: "#{stages}",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-        specialName: "Leg-Locked Heave-Ho"
+        specialName: "Leg-Locked Heave-Ho",
     },
     1230: {//Sentomaru
         captain: "Boosts ATK of Powerhouse characters by 2.5x, but boost his OWN ATK by 2.75x. Reduces damage received by 10%",
         special: [
             {
                 "description": "Deals 500 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 11, 4 ]
+                "cooldown": [ 11, 4 ],
             },
             {
                 "description": "Deals 5,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 1 turn",
-                "cooldown": [ 15, 8 ]
+                "cooldown": [ 15, 8 ],
             },
             {
                 "description": "Deals 100,000 fixed damage to one enemy. Reduces Special Cooldown of your top row by 2 turns",
-                "cooldown": [ 22, 15 ]
-            }
+                "cooldown": [ 22, 15 ], 
+            },
         ],
         specialNotes: "#{stages}",
         sailor: "Cannot be Blown Away (Such as Raid Boss Kuma)",
-        specialName: "Leg-Locked Heave-Ho"
+        specialName: "Leg-Locked Heave-Ho",
     },
     1231: {//Smoker
         captain: "Boosts ATK of Striker and Driven characters by 1.75x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.25x",
@@ -7522,7 +7524,7 @@ window.details = {
         special: "Deals large [DEX] damage to one enemy. Swaps this unit with your captain for 2 turns",
         specialNotes: "This is the same type of ability as raid boss Shiki's swap.",
         specialName: "Armed - White Launcher",
-        sailor: "Boosts base ATK of Striker characters by 50"
+        sailor: "Boosts base ATK of Striker characters by 50",
     },
     1232: {//Smoker
         captain: "Boosts ATK of Striker and Driven characters by 2.25x and reduces RCV of all characters by 50%. If this character becomes your captain in the middle of an island, reduces damage received by 30% and further boosts ATK of Striker and Driven characters by 1.3x",
@@ -7531,7 +7533,7 @@ window.details = {
         specialNotes: "This is the same type of ability as raid boss Shiki's swap. You cannot use it if another effect swaps your captain. (Such as if Shiki swaps first)",
         specialName: "Armed - White Launcher",
         sailor: "Boosts base ATK of Striker characters by 50",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1233: {//Tashigi
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, and their RCV by 1.2x",
@@ -7539,7 +7541,7 @@ window.details = {
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
-        sailor: "Boosts base RCV of Slasher characters by 30"
+        sailor: "Boosts base RCV of Slasher characters by 30",
     },
     1234: {//Tashigi
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.6x, and their RCV by 1.3x",
@@ -7547,21 +7549,21 @@ window.details = {
         special: "Deals 15x character's ATK in [QCK] damage to all enemies. Boosts the Color Affinity of Slasher and Cerebral characters by 1.5x for 2 turns",
         specialNotes: "#{colorAffinity : 1.5}",
         specialName: "Cutting Drizzle",
-        sailor: "Boosts base RCV of Slasher characters by 30"
+        sailor: "Boosts base RCV of Slasher characters by 30",
     },
     1235: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 1.75x, deals 3x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
         specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
-        sailor: "Reduces Blindness duration for 3 turns"
+        sailor: "Reduces Blindness duration for 3 turns",
     },
     1236: {//Maynard
         captain: "Boosts ATK of [PSY] characters by 2x, deals 5x character's ATK to all enemies at the end of each turn",
         special: "Deals several times the character's ATK in [PSY] damage to one enemy. Delays all enemies for 1 turn",
         specialNotes: "#{specialProportional : higher : 10x + (25x * (remaining HP) / (total HP)) }",
         specialName: "Sword of Silence",
-        sailor: "Reduces Blindness duration for 3 turns"
+        sailor: "Reduces Blindness duration for 3 turns",
     },
     1237: {//Bastille
         captain: "Boosts ATK of all characters by 2x after the 15th hit in the chain",
@@ -7581,18 +7583,18 @@ window.details = {
         special: [
             {
                 "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
-                "cooldown": [ 6, 3 ]
+                "cooldown": [ 6, 3 ],
             },
             {
                 "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
-                "cooldown": [ 12, 9 ]
+                "cooldown": [ 12, 9 ],
             },
             {
                 "description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
-                "cooldown": [ 20, 17 ]
-            }
+                "cooldown": [ 20, 17 ], 
+            },
         ],    
-        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}"
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}",
     },
     1240: {//6* Kizaru
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of all characters by 2x, and boosts RCV of all characters by 1.3x. If you use \"Yasakani no Magatama\" boosts ATK of all characters by 3x instead.",
@@ -7600,30 +7602,30 @@ window.details = {
         special: [
             {
                 "description": "For Shooter and Slasher characters,randomizes all non-matching orbs. Deals 10 hits of small random typeless damage to random enemies.",
-                "cooldown": [ 6, 3 ]
+                "cooldown": [ 6, 3 ],
             },
             {
                 "description": "For Shooter and Slasher characters, randomizes all non-matching orbs. Recovers 5x character's RCV in HP. Deals 10 hits of random typeless damage to random enemies.",
-                "cooldown": [ 12, 9 ]
+                "cooldown": [ 12, 9 ],
             },
             {
                 "description": "Changes all orbs on Shooter and Slasher characters into Matching orbs. Recovers 10x character's RCV in HP. Deals 10 hits of large random typeless damage to random enemies.",
-                "cooldown": [ 20, 17 ]
-            }
+                "cooldown": [ 20, 17 ],
+            },
         ],    
-        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}"
+        specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 3,000 : for each hit on Stage 1}<br>#{random : 3,000 : 6,000 : for each hit on Stage 2}<br>#{random : 10,000 : 16,000 : for each hit on Stage 3}<br>#{stages}",
     },
     1241: {//Fortnight Koala
         captain: "Boosts chain multiplier by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
         special: "Deals 11x character's ATK in [STR] damage to one enemy. Adds 15x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 15x}",
-        specialName: "Fishman Karate, Midair Upwards Kick"
+        specialName: "Fishman Karate, Midair Upwards Kick",
     },
     1242: {//Fortnight Koala
         captain: "Boosts chain multiplier by 2x. Recovers 2x character's RCV in HP at the end of each turn",
         special: "Deals 11x character's ATK in [STR] damage to one enemy. Adds 15x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 15x}",
-        specialName: "Fishman Karate, Midair Upwards Kick"
+        specialName: "Fishman Karate, Midair Upwards Kick",
     },
     1243: {// Fortnight Hack
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
@@ -7643,29 +7645,29 @@ window.details = {
         captain: "Boosts ATK of Fighter characters by 1.75x. If HP is below 10%, boosts ATK of Fighter characters by 3x instead.",
         special: "Deals random [QCK] damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Firefly Light, Fiery Doll\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
         specialName:"Gomu Gomu no Stamp Gatling",
-        specialNotes: "Firefly Light, Fiery Doll is Event Ace's special ability."
+        specialNotes: "Firefly Light, Fiery Doll is Event Ace's special ability.",
     },
     1246: {// Event Ace
         captain: "Boosts ATK of Fighter characters by 1.2x",
         special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
-        specialName:"Firefly Light, Fiery Doll"
+        specialName:"Firefly Light, Fiery Doll",
     },
     1247: {// Event Ace
         captain: "Boosts HP of Fighter characters by 1.2x and their ATK by 2.75x if they have a matching orb, by 2x otherwise",
         special: "Reduces crew's current HP by 90%, deals 55x character's ATK in typeless damage to all enemies, and boosts ATK of Fighter characters by 1.3x for 1 turn. If \"Gomu Gomu no Stamp Gatling\" is used again in the same turn the special is activated in, boosts ATK of Fighter characters by 2x instead.",
-        specialName:"Firefly Light, Fiery Doll"
+        specialName:"Firefly Light, Fiery Doll",
     },
     1248: {// Kimono Marco
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
         captainNotes: "Ability stacks, so Fighter/Powerhouse characters gets ATK boosted by 1.69x",
         special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
-        specialName:"Shining Daylight - Dayflower"
+        specialName:"Shining Daylight - Dayflower",
     },
     1249: {// Kimono Marco
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x",
         captainNotes: "Ability stacks, so Fighter/Powerhouse characters gets ATK boosted by 2.56x",
         special: "Recovers 3,000 HP and reduces damage received by 50% for 1 turn",
-        specialName:"Shining Daylight - Dayflower"
+        specialName:"Shining Daylight - Dayflower",
     },
     1250: {// Coliseum Marco
         captain: "Boosts ATK of Powerhouse characters by 1.5x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
@@ -7673,15 +7675,15 @@ window.details = {
         special: [
             {
                 "description": "Randomizes all orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 21, 6 ]
+                "cooldown": [ 21, 6 ],
             },
             {
                 "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 24, 9 ]
-            }
+                "cooldown": [ 24, 9 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Burning Vanguard"
+        specialName: "Burning Vanguard",
     },
     1251: {// Coliseum Marco
         captain: "Boosts ATK of Powerhouse characters by 2x and Recovers a variable amount of character's RCV in HP at the end of each turn depending on how many Powerhouse characters are on your team",
@@ -7689,28 +7691,28 @@ window.details = {
         special: [
             {
                 "description": "Randomizes all orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 21, 6 ]
+                "cooldown": [ 21, 6 ],
             },
             {
                 "description": "Randomizes non-matching orbs, and boosts ATK of Powerhouse characters by 1.5x for 1 turn",
-                "cooldown": [ 24, 9 ]
-            }
+                "cooldown": [ 24, 9 ],
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "Burning Vanguard",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1252: {// Coliseum Doma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2x",
         special: "Changes adjacent orbs into [INT] orbs. Deals 20x character's ATK in [INT] damage to all enemies.",
         specialName: "Reversed Twin Blades - Surprise Thrust",
         sailor: "Reduces own Silence by 1 turn",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
     },
     1253: {// Coliseum Shura
         captain: "Boosts ATK of [DEX] characters by 2.25x if HP is above 99% at the start of the turn",
         special: "Makes Perfects harder to hit for 1 turn. If during that turn every unit scores a Perfect hit, boosts ATK of [DEX] characters by 1.75x in the following turn.",
-        specialName: "Angry Instigator"
+        specialName: "Angry Instigator",
     },
     1254: {//FN Squard
         captain: "Boosts ATK of Striker characters by 2.5x until the first hit other than Perfect. Reduce crew's current HP by 5% at the end of each turn.",
@@ -7722,129 +7724,129 @@ window.details = {
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 2x after the 16th hit, by 2.5x after the 22nd hit",
         special: "For 1 turn, makes Perfects slightly easier to hit and amplifies the effect of orbs by 1.5x",
         sailor: "When HP is below 30% at the start of the turn, boost base ATK of Fighter characters by 40",
-        specialName: "Large Fleet Commander"
+        specialName: "Large Fleet Commander",
     },
     1256: {//FN Whitey Bay
         captain: "Boosts ATK of Slasher and Driven characters by 2x and reduces their RCV by 90%",
         special: "For Slasher and Driven characters, randomizes non-matching orbs, boosts ATK against enemies with increased defense by 1.3x for 1 turn",
         sailor: "Boosts base ATK and RCV of Driven characters by 10",
-        specialName: "Icebreaker Breakthrough Force"
+        specialName: "Icebreaker Breakthrough Force",
     },
     1257: {//Young Whitebeard
         captain: "Boosts ATK of all characters by 2x if HP is below 50% at the start of the turn",
         special: [
             {
                 "description": "Cuts the current HP of each enemy by 10%",
-                "cooldown": [ 23, 11 ]
+                "cooldown": [ 23, 11 ],
             },
             {
                 "description": "Cuts the current HP of each enemy by 20%",
-                "cooldown": [ 28, 16 ]
+                "cooldown": [ 28, 16 ],
             },
             {
                 "description": "Cuts the current HP of each enemy by 40%",
-                "cooldown": [ 36, 24 ]
-            }
+                "cooldown": [ 36, 24 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Earth Shattering Fist"
+        specialName: "Earth Shattering Fist",
     },
     1258: {//Young Whitebeard Evolved
         captain: "Boosts ATK of all characters by 2.5x if HP is below 50% at the start of the turn",
         special: [
             {
                 "description": "Cuts the current HP of each enemy by 10%",
-                "cooldown": [ 23, 11 ]
+                "cooldown": [ 23, 11 ],
             },
             {
                 "description": "Cuts the current HP of each enemy by 20%",
-                "cooldown": [ 28, 16 ]
+                "cooldown": [ 28, 16 ],
             },
             {
                 "description": "Cuts the current HP of each enemy by 40%",
-                "cooldown": [ 36, 24 ]
-            }
+                "cooldown": [ 36, 24 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Earth Shattering Fist"
+        specialName: "Earth Shattering Fist",
     },
     1259: {//Young Doflamingo
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Deals 25x character's ATK in typeless damage to all enemies. For 3 turns, makes [STR], [DEX], [QCK], [PSY], and [INT] orbs \"beneficial\" for Driven characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
-        specialName: "Five Color Strings (Goshikito)"
+        specialName: "Five Color Strings (Goshikito)",
     },
     1260: {//Young Doflamingo
         captain: "Reduces cooldown of Driven specials by 1 turn at the start of the fight. Boosts ATK of Driven characters by 2.5x",
         special: "Deals 25x character's ATK in typeless damage to all enemies. For 3 turns, makes [STR], [DEX], [QCK], [PSY], and [INT] orbs \"beneficial\" for Driven characters",
         specialNotes: "\"Beneficial\" orbs grant the same ATK boost as matching orbs while retaining their original function.",
-        specialName: "Five Color Strings (Goshikito)"
+        specialName: "Five Color Strings (Goshikito)",
     },
     1261: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.5x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
         specialNotes: "#{colorAffinity : 1.5}",
-        specialName: "Blood and Gunpowder of the Underground Family"
+        specialName: "Blood and Gunpowder of the Underground Family",
     },
     1262: {//Young Senor Pink
         captain: "Boosts ATK of Free Spirit characters by 1.75x. Heals for .75x his RCV at the end of the turn each time you hit a Perfect.",
         special: "Randomizes all orbs. Boosts the Color Affinity of Free Spirit and Shooter characters by 1.5x for 1 turn",
         specialNotes: "#{colorAffinity : 1.5}",
-        specialName: "Blood and Gunpowder of the Underground Family"
+        specialName: "Blood and Gunpowder of the Underground Family",
     },
     1263: {//Young Vergo
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
         special: "Deals 20,000 fixed damage to one enemy. Boosts own ATK by 2x for 2 turns",
-        specialName: "Iron Leg Sanctions"
+        specialName: "Iron Leg Sanctions",
     },
     1264: {//Young Vergo
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals 20,000 fixed damage to one enemy. Boosts own ATK by 2x for 2 turns",
-        specialName: "Iron Leg Sanctions"
+        specialName: "Iron Leg Sanctions",
     },
     1265: {//Kimono Ace
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Looking to the Full Moon"
+        specialName: "Looking to the Full Moon",
     },
     1266: {//Kimono Ace Evo
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit characters by 1.75x for 1 turn",
-        specialName: "Looking to the Full Moon"
+        specialName: "Looking to the Full Moon",
     },
     1267: {//Legend Blackbeard
         captain: "Boosts ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
         captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
-        specialName: "World Shaking Impact"
+        specialName: "World Shaking Impact",
     },
     1268: {//Legend Blackbeard
         captain: "Boosts ATK of all characters by 2.75x and their HP by 1.5x if you have a Striker, Shooter, Fighter, and Slasher on your crew. Attacks will ignore defensive barriers and buffs.",
         captainNotes: "Attacks are still affected by DEF value. DEF boost buffs (Blue shield) still reduce your damage, but Damage Negating (Yellow shield) and % Damage Reduction (Rainbow shield) are ignored). Multiple class characters count as a character of each class. Enemy attacks will go through YOUR defensive buffs.",
         special: "Cuts the current HP of each enemy by 30%. If Blackbeard is a captain, this ability will ignore damage negating abilities and barriers",
         specialNotes: "If Blackbeard is not a captain, the effect works exactly like Whitebeard special and is affected by barriers.",
-        specialName: "World Shaking Impact"
+        specialName: "World Shaking Impact",
     },
     1269: {//Laffitte
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 3x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
         sailor: "Boosts base ATK of all characters by 100 if your captain is a Driven character",
-        specialName: "Horrifying Suggestion"
+        specialName: "Horrifying Suggestion",
     },
     1270: {//Laffitte
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Deals 7x character's ATK in [DEX] damage to all enemies at the end of each turn.",
         special: "Reduces Bind and Despair duration by 2 turns. Makes Badly Matching and [BLOCK] orbs not reduce damage for 4 turns",
         specialNotes: "Ex. A STR character with a QCK orb will still deal regular damage",
         sailor: "Boosts base ATK of all characters by 100 if your captain is a Driven character",
-        specialName: "Horrifying Suggestion"
+        specialName: "Horrifying Suggestion",
     },
     1271: {//Van Augur
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Changes orbs in the top row into Matching orbs. For Shooter characters, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Reduces Blindness duration by 5 turns",
-        specialName: "Other Side of Fate"
+        specialName: "Other Side of Fate",
     },
     1272: {//Van Augur
         captain: "Reduces cooldown of Shooter specials by 1 turn at the start of the fight. Boosts ATK of Shooter characters by 2.5x.",
@@ -7866,7 +7868,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire Sailor Ability 1: Boosts base ATK of Shooter characters by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -7888,7 +7890,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     1273: {//Jesus Burgess
@@ -7896,14 +7898,14 @@ window.details = {
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK and 1.44x HP",
         special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Champion of the Wild Roar"
+        specialName: "Champion of the Wild Roar",
     },
     1274: {//Jesus Burgess
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.6x and their HP by 1.2x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.56x ATK and 1.44x HP",
         special: "Deals 20x character's ATK in [STR] damage to all enemies. Boosts ATK of Fighter characters by 1.5x for 5 turns",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Champion of the Wild Roar"
+        specialName: "Champion of the Wild Roar",
     },
     1275: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
@@ -7911,7 +7913,7 @@ window.details = {
         specialNotes: "#{instantKill : 25%}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Handling Hell"
+        specialName: "Handling Hell",
     },
     1276: {//Shiliew
         captain: "Boosts ATK and HP of Slasher characters by 2x",
@@ -7919,46 +7921,46 @@ window.details = {
         specialNotes: "#{instantKill : 25%}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Handling Hell"
+        specialName: "Handling Hell",
     },
     1277: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.25x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
-        specialName: "Reaping of Desperate Lives"
+        specialName: "Reaping of Desperate Lives",
     },
     1278: {//Doc Q
         captain: "Reduces RCV of all characters by 99%. Boosts ATK of Slasher and Striker characters by 2.75x if HP is above 99% at the start of the turn",
         special: "Reduces crew's current HP by 10%. Changes [BLOCK], [TND], and [RCV] orbs on Slasher and Striker characters into Matching Orbs.",
         sailor: "Boosts amount healed from [RCV] orbs by 150 each",
         specialName: "Reaping of Desperate Lives",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1279: {//John Giant
         captain: "Boosts ATK and HP of Slasher characters by 1.5x",
         special: "Reduces damage received in the next turn by 50% if the special is activated with less than 50% health remaining",
-        specialName: "Manifesto to the Weak"
+        specialName: "Manifesto to the Weak",
     },
     1280: {//Marineford Aokiji
         captain: "Boosts ATK of [PSY] characters by 2.5x",
         special: "Deals 10,000 fixed damage to all enemies and locks all orbs for 1 turn",
-        specialName: "Ice Chunks - Trident"
+        specialName: "Ice Chunks - Trident",
     },
     1281: {//Marineford Garp
         captain: "Boosts ATK of Fighter characters by 2.25x and reduces damage received by 10%",
         special: "Deals 25x character's ATK in [STR] damage to one enemy that will ignore damage negating abilities and barriers.",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Fist of Love - Falling Fortress"
+        specialName: "Fist of Love - Falling Fortress",
     },
     1282: {//Marineford Sengoku
         captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces cooldown of all specials by 1 turn. Boosts ATK of all characters by 1.2x and amplifies the effect of orbs by 1.2x for 1 turn",
-        specialName: "Encircling Wall around Marineford Bay"
+        specialName: "Encircling Wall around Marineford Bay",
     },
     1283: {//Marineford Akainu
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Deals 35x character's ATK in [INT] damage to one enemy. Boosts ATK of Driven characters by 1.5x for 1 turn",
-        specialName: "Dark Dog"
+        specialName: "Dark Dog",
     },
     1284: {//Wild Luffy
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.2x",
@@ -7966,7 +7968,7 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this character by 3 turns",
         sailorNotes: "#{silence}",
-        specialName: "Wild Hunt"
+        specialName: "Wild Hunt",
     },
     1285: {//Wild Luffy Evolved
         captain: "Boosts ATK of Striker characters by 1.5x and their HP by 1.25x. Boosts ATK of Striker characters by 3.375x after scoring 3 Perfects in a row.",
@@ -7974,175 +7976,175 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Reduces Silence duration against this character by 3 turns",
         sailorNotes: "#{silence}",
-        specialName: "Wild Hunt"
+        specialName: "Wild Hunt",
     },
     1286: {//Kid Baby 5
         captain: "Boosts ATK and RCV of [PSY] characters by 1.3x",
         special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Handgun Legs"
+        specialName: "Handgun Legs",
     },
     1287: {//Kid Baby 5
         captain: "Boosts ATK and RCV of [PSY] characters by 1.5x",
         special: "Cuts the current HP of each enemy by 10%. Boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Handgun Legs"
+        specialName: "Handgun Legs",
     },
     1288: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.5x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.5x on the first turn, 2.4x on the second, 2.3x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces Special Cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces Special Cooldown of Driven specials by 1 turn.",
-        specialName: "Outcome of Sparta"
+        specialName: "Outcome of Sparta",
     },
     1289: {//Kid Law
         captain: "Boosts ATK of Driven characters by 2.75x, reduces crew's current HP by 10% at the end of each turn, reduces his own ATK multiplier by 0.1x at the end of each turn",
         captainNotes: "His ATK multiplier will be 2.75x on the first turn, 2.65x on the second, 2.55x on the third and so on. The reduction stops once the multiplier is 1.0x. The multiplier affects all Driven characters. You will not die to the HP reduction",
         special: "Reduces Special Cooldown of Driven specials by 1 turn. If during that turn every unit scores a Perfect hit, reduces Special Cooldown of Driven specials by 1 turn.",
-        specialName: "Outcome of Sparta"
+        specialName: "Outcome of Sparta",
     },
     1290: {//Kid Buffalo
         captain: "Recovers 500 HP at the end of each turn",
         special: "Changes own orb into [INT], and Captain orb into [BOMB]",
-        specialName: "Rude Prank"
+        specialName: "Rude Prank",
     },
     1291: {//Lao G, Coliseum
         captain: "Boosts ATK of Driven characters by 1.75x",
         special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
-        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact"
+        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact",
     },
     1292: {//Lao G, Coliseum
         captain: "Boosts ATK of Driven characters by 2.5x if they have a matching orb, by 2x otherwise",
         special: "Changes [PSY], [INT], [RCV], and [TND] orbs into [G] orbs. Locks orbs for 1 turn. If during that turn every unit scores a Perfect hit, changes [G] orbs into Matching Orbs",
-        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact"
+        specialName: "Lower Back Pain Stance - The Eyes of Blight Impact",
     },
     1293: {//Coliseum Sandersonia
         captain: "Boosts ATK of Fighter characters by 1.75x, deals 2 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
-                "cooldown": [ 21, 11 ]
+                "cooldown": [ 21, 11 ],
             },
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
-                "cooldown": [ 26, 16 ]
-            }
+                "cooldown": [ 26, 16 ],
+            },
         ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.<br>#{stages}",
-        specialName: "Snake Dance"
+        specialName: "Snake Dance",
     },
     1294: {//Coliseum Sandersonia
         captain: "Boosts ATK of Powerhouse characters by 2x, deals 4 times the damage received in the previous turn in [PSY] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by 40%",
-                "cooldown": [ 21, 11 ]
+                "cooldown": [ 21, 11 ],
             },
             {
                 "description": "Changes Captain orb into Matching, and reduces damage received from [PSY] enemies by a variable factor.",
-                "cooldown": [ 26, 16 ]
-            }
+                "cooldown": [ 26, 16 ],
+            },
         ],
         specialNotes: "The exact multiplier used is chosen based on the crew's current HP at the time the special is activated: above 50% HP, the multiplier used is 50%; between 50% and 10%, it's 80%; below 10% HP, it's 100%.<br>#{stages}",
-        specialName: "Snake Dance"
+        specialName: "Snake Dance",
     },
     1295: {//Halloween Kalifa
         captain: "Boosts ATK and RCV of [STR] characters by 1.5x",
         special: "Reduces Paralysis duration by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
-        specialName: "Mysterious Hour of the Dark Night"
+        specialName: "Mysterious Hour of the Dark Night",
     },
     1296: {//Halloween Kalifa
         captain: "Boosts ATK of [STR] characters by 2x and their RCV by 1.5x",
         special: "Reduces Paralysis duration by 3 turns, removes Poison, and reduces the defense of all enemies by 100% for 1 turn",
-        specialName: "Mysterious Hour of the Dark Night"
+        specialName: "Mysterious Hour of the Dark Night",
     },
     1297: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption"
+        specialName: "Great Eruption",
     },
     1298: {//Akainu
         captain: "Boosts ATK by 3x following a chain of [STR] > [STR] > [STR] attacks no lower than Good",
         special: "Deals 50x character's ATK in [STR] damage to all enemies. Changes orbs for [STR] characters into [STR] orbs. Boosts the Color Affinity of [STR] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption"
+        specialName: "Great Eruption",
     },
     1299: {//Halloween Rebecca
         captain: "Boosts ATK and RCV of [INT] characters by 1.2x",
         special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
-        specialName: "Driving Away Evil Spirits of Sin - Cat Pose"
+        specialName: "Driving Away Evil Spirits of Sin - Cat Pose",
     },
     1300: {//Halloween Rebecca
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Recovers 3,000 HP and boosts ATK of [INT] characters by 1.75x for 1 turn",
-        specialName: "Driving Away Evil Spirits of Sin - Cat Pose"
+        specialName: "Driving Away Evil Spirits of Sin - Cat Pose",
     },
     1301: {//Jailbreak Buggy
         captain: "Boosts ATK of Slasher characters by 1.75x",
         special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
-        specialName: "Special Muggy Ball"
+        specialName: "Special Muggy Ball",
     },
     1302: {//Jailbreak Buggy
         captain: "Boosts ATK of Slasher characters by 1.75x and boosts ATK of Driven characters by 1.5x",
         captainNotes: "The bonus is cumulative. Slasher Driven characters get a 2.625x bonus.",
         special: "Reduces crew's HP to 1, empties all slots, and deals 30x character's ATK in [QCK] damage to all enemies",
-        specialName: "Special Muggy Ball"
+        specialName: "Special Muggy Ball",
     },
     1303: {//Jailbreak Mr. 3
         captain: "Boosts ATK of Cerebral characters by 1.5x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 60% for 2 turns",
-        specialName: "Extra Large Candle Wall"
+        specialName: "Extra Large Candle Wall",
     },
     1304: {//Jailbreak Mr. 3
         captain: "Boosts ATK of Cerebral characters by 2x. If you don't attack with Mr. 3, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 60% for 2 turns",
-        specialName: "Extra Large Candle Wall"
+        specialName: "Extra Large Candle Wall",
     },
     1305: {//Halloween Sugar
         captain:  "Boosts ATK of Cerebral characters by 1.3x and recovers 500 HP at the end of each turn",
         special: "Changes Badly Matching, [BLOCK], and [BOMB] orbs into [G] orbs. Reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Aggressive \"Trick-Or-Treat\""
+        specialName: "Aggressive 'Trick-Or-Treat'",
     },
     1306: {//Halloween Sugar
         captain:  "Boosts ATK of Cerebral characters by 1.75x and recovers 1,000 HP at the end of each turn",
         special: "Changes Badly Matching, [BLOCK], and [BOMB] orbs into [G] orbs. Reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Aggressive \"Trick-Or-Treat\""
+        specialName: "Aggressive 'Trick-Or-Treat'",
     },
     1307: {//Halloween Bartolomeo
         captain: "Boosts ATK of Driven characters by 1.75x. If you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
         special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
-        specialName: "Vulgar Provocation"
+        specialName: "Vulgar Provocation",
     },
     1308: {//Halloween Bartolomeo
         captain: "Boosts ATK of Driven characters by 2x. If you don't attack with Bartolomeo, reduces damage received by 20% for that turn.",
         special: "Reduces damage received by 50% for 1 turn. If during that turn every unit scores a Perfect hit, reduces damage received by 80% in the following turn",
-        specialName: "Vulgar Provocation"
+        specialName: "Vulgar Provocation",
     },
     1309: {//Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2x, recovers 1x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
-        specialName: "Poof"
+        specialName: "Poof",
     },
     1310: {//Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and if HP is above 70%, changes adjacent orbs into Matching Orbs",
-        specialName: "Poof"
+        specialName: "Poof",
     },
     1311: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
         specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage received over a certain amount",
-        specialName: "King Cobra Machetes"
+        specialName: "King Cobra Machetes",
     },
     1312: {//Coliseum Marigold
         captain: "Boosts ATK and HP of Powerhouse characters by 1.75x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Reduces enemy Damage Threshold timers by 1 turn",
         specialNotes: "Damage Threshold is the buff enemies gain that grealy reduces damage received over a certain amount",
-        specialName: "King Cobra Machetes"
+        specialName: "King Cobra Machetes",
     },
     1313: {//Akainu
         captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
         captainNotes: "If a character has a [STR] orb, regardless of type, they will have a 3.9375x ATK boost",
         special: "Deals 125x character's ATK typeless damage to all enemies and randomizes non-[STR] orbs. Boosts ATK of characters with cost 50 or higher by 1.75x for 2 turns",
-        specialName: "Meteor Volcano"
+        specialName: "Meteor Volcano",
     },
     1314: {//Akainu
         captain: "If any character has a [STR] orb, boosts ATK by 3.9375x, boosts ATK by 2.25x otherwise. Boosts chances of getting [STR] orbs",
@@ -8179,7 +8181,7 @@ window.details = {
             { "description": "Boosts base ATK by 25" },
             { "description": "Boosts base ATK by 25" },
             { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -8211,7 +8213,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            }
+            },
         ],
         
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
@@ -8221,61 +8223,61 @@ window.details = {
         special: [
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
-                "cooldown": [ 15, 9 ]
+                "cooldown": [ 15, 9 ],
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
-                "cooldown": [ 20, 14 ]
+                "cooldown": [ 20, 14 ],
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, removes No Healing debuff. Recovers 13x character's RCV in HP",
-                "cooldown": [ 24, 18 ]
-            }
+                "cooldown": [ 24, 18 ],
+            },
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
         sailor: "Reduces Blindness duration by 5 turns",
-        specialName: "Echoing Cry of the Soul"
+        specialName: "Echoing Cry of the Soul",
     },
     1316: {//Coby
         captain: "Boosts ATK of all characters by 2.5x after the 2nd Perfect in a row and by 3.5x after the 5th Perfect in a row.",
         special: [
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 1 turn. Recovers 3x character's RCV in HP",
-                "cooldown": [ 15, 9 ]
+                "cooldown": [ 15, 9 ],
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, reduces No Healing debuff by 3 turns. Recovers 6x character's RCV in HP",
-                "cooldown": [ 20, 14 ]
+                "cooldown": [ 20, 14 ],
             },
             {
                 "description": "If HP is below 3,000 when the special is activated, removes No Healing debuff. Recovers 13x character's RCV in HP",
-                "cooldown": [ 24, 18 ]
-            }
+                "cooldown": [ 24, 18 ],
+            },
         ],
         specialNotes: "No Healing debuff completely stops healing abilities. This is the debuff used in Akainu raid<br>#{stages}",
         sailor: "Reduces Blindness duration by 5 turns",
-        specialName: "Echoing Cry of the Soul"
+        specialName: "Echoing Cry of the Soul",
     },
     1317: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "#{ignoreBarrier}",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Super Large Iron Ball"
+        specialName: "Super Large Iron Ball",
     },
     1318: {//Garp
         captain: "Boosts ATK of [STR] and [PSY] characters by 2.5x",
         special: "Deals 30x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers. Delays all enemies for 1 turn. Reduces the defense of all enemies by 80% for 1 turn.",
         specialNotes: "#{ignoreBarrier}",
         sailor: "Boosts base HP of all characters by 75",
-        specialName: "Super Large Iron Ball"
+        specialName: "Super Large Iron Ball",
     },
     1319: {//Lady Tsuru
         captain: "Heals for 1x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
         special: "Deals 10 hits of random [QCK] damage to random enemies. Boosts ATK of all characters by 1.5x for 1 turn",
         specialNotes: "#{randomHits : 10}<br>#{random : 1,000 : 32,000 : for each hit}",
         sailor: "Reduces Paralysis duration by 1 turn",
-        specialName: "A Decree of the Veteran"
+        specialName: "A Decree of the Veteran",
     },
     1320: {//Lady Tsuru
         captain: "Heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .1x her RCV at the end of the turn each time you hit a Perfect",
@@ -8298,7 +8300,7 @@ window.details = {
             { "description": "Aquire new Captain Ability: Boosts ATK of all characters by 1.2x, heals for 1.5x her RCV at the end of the turn each time you hit a Good. Heals for .3x her RCV at the end of the turn each time you hit a Perfect" },
             { "description": "Reduce base Special Cooldown by 2 turns" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -8320,20 +8322,20 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            }
+            },
         ]
     },
     1321: {//Momonga
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.25x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
-        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character"
+        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1322: {//Momonga
         captain: "Boosts ATK of Cerebral and Slasher characters by 2.5x and reduces damage received by 10% if there's a [STR], [DEX], [QCK], [INT], and [PSY] character on your crew.",
         special: "Deals 15x character's ATK as [DEX] damage to all enemies. Boosts ATK against delayed enemies by 1.5x for 2 turns",
         specialName: "Front Line Dissection",
-        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character"
+        sailor: "Boosts base ATK of Slasher and Cerebral characters by 75 if your captain is a Cerebral character",
     },
     1323: {//Onigumo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Slasher and Driven characters by 1.3x",
@@ -8354,42 +8356,42 @@ window.details = {
     1325: {//Halloween Corazon
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "If HP is above 99%, changes [STR], [DEX], and [QCK] orbs into Matching orbs for Cerebral and Free Spirit characters",
-        specialName: "Amulet Flame"
+        specialName: "Amulet Flame",
     },
     1326: {//Halloween Corazon
         captain: "Boosts ATK by 1.3x and recovers 4x character's RCV in HP at the end of each turn",
         special: "If HP is above 99%, changes [STR], [DEX], and [QCK] orbs into Matching orbs for Cerebral and Free Spirit characters",
-        specialName: "Amulet Flame"
+        specialName: "Amulet Flame",
     },
     1327: {//Fornight Leo
         captain: "Boosts ATK of characters with cost 20 or less by 2x",
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
-                "cooldown": [ 11, 4 ]
+                "cooldown": [ 11, 4 ],
             },
             {
                 "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
-                "cooldown": [ 19, 12 ]
+                "cooldown": [ 19, 12 ],
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Tail Hammer"
+        specialName: "Tail Hammer",
     },
     1328: {//Fornight Leo
         captain: "Boosts ATK of characters with cost 20 or less by 2.5x",
         special: [
             {
                 "description": "Deals 3x character's ATK as [DEX] damage to one enemy, change own orb into [DEX]",
-                "cooldown": [ 11, 4 ]
+                "cooldown": [ 11, 4 ],
             },
             {
                 "description": "Deal 15x character's ATK as [DEX] damage to one enemy, changes own and friend's orb into Matching orbs",
-                "cooldown": [ 19, 12 ]
+                "cooldown": [ 19, 12 ],
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Tail Hammer"
+        specialName: "Tail Hammer",
     },
     1329: {//Wicca
         captain: "Reduces cooldown of Fighter and Free Spirit specials by 1 turn at the start of the fight. Gives chance of duplicating a drop upon completion of the island.",
@@ -8397,81 +8399,81 @@ window.details = {
         special: [
             {
                 "description": "Deals 6 fixed damage to all enemies. Randomizes orbs of upper row characters",
-                "cooldown": [ 9, 3 ]
+                "cooldown": [ 9, 3 ],
             },
             {
                 "description": "Deals 15 fixed damage to all enemies. Recovers 3x character's RCV in HP",
-                "cooldown": [ 11, 5 ]
+                "cooldown": [ 11, 5 ],
             },
             {
                 "description": "Deals 300 fixed damage to all enemies. Boosts the Color Affinity of Fighter and Free Spirit characters by 1.25x",
-                "cooldown": [ 16, 10 ]
-            }
+                "cooldown": [ 16, 10 ],
+            },
         ],
         specialName: "The Work of Fairies",
-        specialNotes: "#{colorAffinity : 1.25}<br>#{stages}"
+        specialNotes: "#{colorAffinity : 1.25}<br>#{stages}",
     },
     1330: {//Gancho
         captain: "Boosts ATK of Striker characters by 1.5x and recovers 2x character's RCV in HP at the end of each turn",
         special: "Switches orbs between slots twice. Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
-        specialName: "Tonta Knowledge"
+        specialName: "Tonta Knowledge",
     },
     1331: {//Mansherry
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: [
             {
                 "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
-                "cooldown": [ 18, 11 ]
+                "cooldown": [ 18, 11 ],
             },
             {
                 "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
-                "cooldown": [ 24, 17 ]
-            }
+                "cooldown": [ 24, 17 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Tears of Healing"
+        specialName: "Tears of Healing",
     },
     1332: {//Mansherry
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: [
             {
                 "description": "Reduces Bind duration for one character by 4 turns. Recovers 7x character's RCV in HP.",
-                "cooldown": [ 18, 11 ]
+                "cooldown": [ 18, 11 ],
             },
             {
                 "description": "Reduces Bind duration for one character by 7 turns. Recovers 15x character's RCV in HP.",
-                "cooldown": [ 24, 17 ]
-            }
+                "cooldown": [ 24, 17 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Tears of Healing"
+        specialName: "Tears of Healing",
     },
     1333: {//Kabu
         captain: "Boosts ATK of [STR] and Powerhouse characters by 1.4x",
         captainNotes: "The bonus is cumulative. [STR] Powerhouse characters get a 1.96x bonus.",
         special: "Slightly boosts chances of getting [STR] orbs and boosts own ATK by 1.2x for 2 turns",
-        specialName: "Yellow Kabu Squad"
+        specialName: "Yellow Kabu Squad",
     },
     1334: {//Bian
         captain: "Boosts ATK of [DEX] and Free Spirit characters by 1.4x",
         captainNotes: "The bonus is cumulative. [DEX] Free Spirit characters get a 1.96x bonus.",
         special: "Poisons all enemies and randomizes all orbs",
-        specialName: "Pink Bee Squad"
+        specialName: "Pink Bee Squad",
     },
     1335: {//Wedding Sabo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight. Boosts ATK of Free Spirit characters by 1.5x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
-        specialName: "Gentleman's Welcome"
+        specialName: "Gentleman's Welcome",
     },
     1336: {//Wedding Sabo
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight. Boosts ATK of Free Spirit characters by 2x.",
         special: "Changes Friend Captain orb into matching. Adds .5x to Chain multiplier for 1 turn",
-        specialName: "Gentleman's Welcome"
+        specialName: "Gentleman's Welcome",
     },
     1337: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
         special: "Changes [RCV], [TND], [EMPTY], [G] and [BOMB] orbs into Badly Matching orbs and [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Free Spirit and Striker characters.",
-        specialName: "Brushman's Brush"
+        specialName: "Brushman's Brush",
     },
     1338: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.25x, reduces damage received by 10%",
@@ -8492,7 +8494,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
             { "description": "Boosts base HP by 60" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -8514,7 +8516,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by ? turns on this character",
                     "Level 5: Reduces Slot Bind duration by ? turns on this character"
                 ]
-            }
+            },
         ]
     },
     1339: {//Chopper Jump Point
@@ -8522,98 +8524,98 @@ window.details = {
         special: [
             {
                 "description": "Reduces Paralysis duration by 1 turn. Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 18, 8 ]
+                "cooldown": [ 18, 8 ],
             },
             {
                 "description": "Reduces Paralysis duration by 2 turn. Adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 23, 13 ]
+                "cooldown": [ 23, 13 ],
             },
             {
                 "description": "Reduces Paralysis duration by 2 turn. Adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 25, 15 ]
-            }
+                "cooldown": [ 25, 15 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Flight Power Strengthening - Jump Point"
+        specialName: "Flight Power Strengthening - Jump Point",
     },
     1340: {//Gedatsu
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
-        specialName: "Swamp Cloud Burger"
+        specialName: "Swamp Cloud Burger",
     },
     1341: {//Getdatsu
         captain: "Boosts ATK of [QCK] characters by 1.75x. After scoring 3 hits below Good in a row, boosts ATK of [QCK] characters by 2.625x instead.",
         special: "Delays all enemies for 1 turn. Cuts the current HP of all enemies by 10%",
-        specialName: "Swamp Cloud Burger"
+        specialName: "Swamp Cloud Burger",
     },
     1342: {//Dadan
         captain: "Boosts HP of [PSY] characters by 1.75x",
         special: "Reduces Silence duration by 2 turns",
         specialNotes: "#{silence}",
-        specialName: "Rogue Threat"
+        specialName: "Rogue Threat",
     },
     1343: {//Porchemy
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2x.",
         special: "Deals 13x character's ATK in [DEX] damage to one enemy, and boosts ATK against enemies with reduced defense by 1.3x for 1 turn",
-        specialName: "Spiked Glove of Punishment"
+        specialName: "Spiked Glove of Punishment",
     },
     1344: {//Bluejam
         captain: "Reduces crew's current HP by 50%. Boosts ATK of Driven characters by 2.25x.",
         special: "Deals 20x character's ATK in [STR] damage to all enemies, and boosts ATK of Driven characters by 1.3x for 1 turn",
-        specialName: "Bullet Purge"
+        specialName: "Bullet Purge",
     },
     1345: {//Jimbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
         special: "Reduces Despair duration by 5 turns. Reduces Special Cooldown of your top row by 1 turn",
-        specialName: "Gathering Strength for a Counter Attack"
+        specialName: "Gathering Strength for a Counter Attack",
     },
     1346: {//Heracles'n
         captain: "Boosts ATK, HP and RCV of Shooter and Cerebral characters by 1.5x",
         special: "Randomizes all orbs, including [BLOCK] orbs, switches orbs between slots 3 times",
-        specialName: "Survival Techniques of the Hungry Baron"
+        specialName: "Survival Techniques of the Hungry Baron",
     },
     1347: {//Torino Kingdom Monsters
         special: "Change own orb into [PSY], and deals 25x character's attack in [PSY] damage to one enemy",
-        specialName: "Tsubami Behemoth"
+        specialName: "Tsubami Behemoth",
     },
     1348: {//Humandrills
         special: "Boosts ATK of all characters by 1.2x for 2 turns and amplifies the effect of orbs by 1.2x for 2 turns",
-        specialName: "Imitation Tactics"
+        specialName: "Imitation Tactics",
     },
     1349: {//Haredas
         captain: "Boosts ATK of Cerebral characters by 1.5x and their RCV by 1.75x",
         special: "Empty all slots including [BLOCK] orbs, and boosts ATK of Cerebral characters by 1.2x for 1 turn",
-        specialName: "Gust \"Wind Knot\""
+        specialName: "Gust 'Wind Knot'",
     },
     1350: {//Longarm Tribe Theives
         special: "Switches orbs between slots 3 times",
-        specialName: "Longarm Tribe of Tehna Gehna"
+        specialName: "Longarm Tribe of Tehna Gehna",
     },
     1351: {//Tequila Wolf Guard
         special: "Reduces the defense of all by 50% and delays all enemies for 1 turn",
-        specialName: "Covering Fire"
+        specialName: "Covering Fire",
     },
     1352: {//Ivankov
         captain: "Boosts ATK of Fighter characters by 2x at the start of the chain, boosts ATK of Fighter characters by 3.5x after the 5th Perfect in a row",
         special: "Following the activation of the special, if every unit scores a Perfect hit, reduces damage received by 90% in the following turn",
-        specialName: "Rolling Beauty"
+        specialName: "Rolling Beauty",
     },
     1353: {//Rayleigh
         captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Deals 50,000 Fixed damage to one enemy, adds 0.5 to Chain multiplier for 1 turn",
-        specialName: "Guidence to Control Haki"
+        specialName: "Guidence to Control Haki",
     },
     1354: {//Secret Rayleigh
         captain: "Boosts chain multiplier by 2x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Straight Stimultaion",
-        specialNotes: "#{orb : 1.5x}"
+        specialNotes: "#{orb : 1.5x}",
     },
     1355: {//Secret Rayleigh
         captain: "Boosts chain multiplier by 3x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Recovers 15x character's RCV in HP, amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Straight Stimultaion",
-        specialNotes: "#{orb : 1.5x}"
+        specialNotes: "#{orb : 1.5x}",
     },
     1356: {//Pekoms
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
@@ -8630,243 +8632,245 @@ window.details = {
     1358: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.5x and the HP of Striker characters by 1.5x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
-        specialName: "The Long Legged Gentleman's Resolution"
+        specialName: "The Long Legged Gentleman's Resolution",
     },
     1359: {//Tamago
         captain: "Boosts ATK of Cerebral characters by 1.75x and the HP of Striker characters by 1.75x",
         special: "Boosts RCV of all characters by 1.75x and delays all enemies by 1 turn.",
-        specialName: "The Long Legged Gentleman's Resolution"
+        specialName: "The Long Legged Gentleman's Resolution",
     },
     1360: {//Winter Luffy
         captain: "Boosts ATK characters with cost 30 or less by 2x and their HP by 1.2x",
         special: "Changes own orb into [QCK], deals 15x character's ATK in [QCK] damage to one enemy",
-        specialName: "Gum-Gum Twin Jet Pistol: Snowflake"
+        specialName: "Gum-Gum Twin Jet Pistol: Snowflake",
     },
     1361: {//6* Zoro
         captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
         special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain or Friend/Guest Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
-        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths"
+        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1362: {//6* Zoro
         captain: "If you have 5 or more Slashers in your crew, boosts ATK of Slasher characters by 2.5x and their HP by 1.5x. If you defeated an enemy last turn, boosts ATK of Slasher characters by 3x instead and boosts ATK of all other characters by 1.2x",
         captainNotes: "You only need to kill at least 1 character in the last turn to gain his 3x ATK boost. If a character dies and revives, you will retain the 3x ATK boost",
         special: "Deals 60x character's ATK as typeless damage to all enemies. If Zoro is your Captain or Friend/Guest Captain, boosts ATK of Slasher characters by 2x for 1 turn. If he is a Sailor, boosts ATK of Slasher characters by 1.75x for 1 turn instead",
-        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths"
+        specialName: "Three Blade Style Secret Skill: Crossroad of Six Paths",
     },
     1363: {//Timeskip Franky
         captain: "Boosts ATK of [PSY] characters by 2x, reduces damage received by 10%",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts base HP of [PSY] characters by 100",
-        specialName: "Franky Fireball"
+        specialName: "Franky Fireball",
     },
     1364: {//Timeskip Franky
         captain: "Boosts ATK of [PSY] characters by 2.5x, reduces damage received by 10%",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies, amplifies the effect of orbs for [PSY] characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
         sailor: "Boosts base HP of [PSY] characters by 100",
-        specialName: "Franky Fireball"
+        specialName: "Franky Fireball",
     },
     1365: {//Timeskip Nami
         captain: "Boosts ATK and RCV of Cerebral characters by 1.5x",
         special: [
             {
                 "description": "Reduces Paralysis and Silence duration by 1 turn. Delays all enemies for 1 turn",
-                "cooldown": [ 13, 8 ]
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 2 turns. Delays all enemies for 1 turn",
-                "cooldown": [ 15, 10 ]
+                "cooldown": [ 15, 10 ],
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": [ 18, 13 ]
-            }
+                "cooldown": [ 18, 13 ],
+            },
         ],
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}<br>#{stages}",
-        specialName: "Black Ball - Thundercloud Rod"
+        specialName: "Black Ball - Thundercloud Rod",
     },
     1366: {//Timeskip Nami
         captain: "Boosts RCV of Cerebral characters by 1.5x and their ATK by 2.75x if they have a matching orb, by 1.5x otherwise",
         special: [
             {
                 "description": "Reduces Paralysis and Silence duration by 1 turn. Delays all enemies for 1 turn",
-                "cooldown": [ 13, 8 ]
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 2 turns. Delays all enemies for 1 turn",
-                "cooldown": [ 15, 10 ]
+                "cooldown": [ 15, 10 ],
             },
             {
                 "description": "Reduces Paralysis and Silence duration by 5 turns. Delays all enemies for 2 turns",
-                "cooldown": [ 18, 13 ]
-            }
+                "cooldown": [ 18, 13 ],
+            },
         ],
         sailorNotes: "#{silence}<br>#{stages}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
-        specialName: "Black Ball - Thundercloud Rod"
+        specialName: "Black Ball - Thundercloud Rod",
     },
     1367: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 2x",
         special: [
             {
                 "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
-                "cooldown": [ 11, 6 ]
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": [ 20, 15 ]
-            }
+                "cooldown": [ 20, 15 ],
+            },
         ],
         specialNotes: "#{orb : 1.75x}<br>#{stages}",
         sailor: "Boosts base ATK, HP and RCV of all characters by 50",
-        specialName: "Sky Walk"
+        specialName: "Sky Walk",
     },
     1368: {//Timeskip Sanji
         captain: "Boosts ATK of [STR] characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
         special: [
             {
                 "description": "Reduces damage received by 50% and amplifies the effect of orbs by 1.5x for 1 turn.",
-                "cooldown": [ 11, 6 ]
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Reduces damage received by 70% and amplifies the effect of orbs by 1.75x for 1 turn.",
-                "cooldown": [ 20, 15 ]
-            }
+                "cooldown": [ 20, 15 ],
+            },
         ],
         specialNotes: "#{orb : 1.75x}<br>#{stages}",
         sailor: "Boosts base ATK, HP and RCV of all characters by 50",
-        specialName: "Sky Walk"
+        specialName: "Sky Walk",
     },
     1369: {//Timeskip Chopper
         captain: "Boosts ATK of [QCK] characters by 1.5x and their HP and RCV by 1.2x",
         special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Kakuho: Elf"
+        specialName: "Kakuho: Elf",
     },
     1370: {//Timeskip Chopper
         captain: "Boosts ATK of [QCK] characters by 2x and their HP and RCV by 1.2x",
         special: "Changes [DEX] and [RCV] on [QCK] characters into [QCK], cuts the current HP of one enemy by 15%",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Kakuho: Elf"
+        specialName: "Kakuho: Elf",
     },
     1371: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.25x after the 2nd Perfect in a row and by 2.5x after the 4th Perfect in a row.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
-        specialName: "Wild Plan"
+        specialName: "Wild Plan",
     },
     1372: {//Wild Zoro
         captain: "Boosts ATK of Slasher and Powerhouse characters by 2x at the start of the chain, by 2.5x after the 2nd Perfect in a row and by 3x after the 4th Perfect in a row.",
         special: "Reduces Despair duration by 3 turns. Reduces Special Cooldown of Slasher and Powerhouse characters by 2 turns",
         sailor: "Restores his own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 2}",
-        specialName: "Wild Plan"
+        specialName: "Wild Plan",
     },
     1373: {//Magellan
         captain: "Boosts ATK of INT characters by 1.5x and their HP by 1.2x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Poisons all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 25, 10 ]
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 31, 16 ]
-            }
+                "cooldown": [ 31, 16 ],
+            },
         ],
         specialName: "Poison Dragon",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}"
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}",
     },
     1374: {//Magellan
         captain: "Boosts ATK of INT characters by 2.25x and their HP by 1.5x, deals 5 times the damage received in the previous turn in [INT] damage to all enemies at the end of each turn",
         special: [
             {
                 "description": "Poisons all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 25, 10 ]
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Inflicts Toxic to all enemies and delays all enemies for 1 turn.",
-                "cooldown": [ 31, 16 ]
-            }
+                "cooldown": [ 31, 16 ],
+            },
         ],
         specialName: "Poison Dragon",
-        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}"
+        specialNotes: "Toxic starts at 0.5x character's attack and increases by 3x at the end of every turn until 1,500,000 damage per turn.<br>#{stages}",
     },
     1375: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduces crew's HP by 50%, Increases damage received by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
-        specialName: "Deadly Fangs of Rage"
+        specialName: "Deadly Fangs of Rage",
     },
     1376: {//Dellinger
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's HP by 20%, Increases damage received by 2x",
         special: "Deals 20x character's ATK in [QCK] damage to one enemy, Boosts Dellinger's ATK by 1.5x for 1 turn, amplifies the effect of Dellinger's orb by 1.5x for 1 turn, and changes own orb to [QCK].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the Dellinger who uses his Special.",
-        specialName: "Deadly Fangs of Rage"
+        specialName: "Deadly Fangs of Rage",
     },
     1377: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.3x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
         sailor: "Boosts amount healed from [RCV] orbs by 125 each",
-        specialName: "Sincere Devotion"
+        specialName: "Sincere Devotion",
     },
     1378: {//Marguerite
         captain: "Boosts ATK and RCV of Slasher and Shooter characters by 1.75x",
         special: "Recovers 18x character's RCV in HP. Reduces damage received by 50% for 1 turn",
         sailor: "Boosts amount healed from [RCV] orbs by 125 each",
-        specialName: "Sincere Devotion"
+        specialName: "Sincere Devotion",
     },
     1379: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turn.",
         specialName: "A Decision Made over Sake",
-        specialNotes: "#{orb : 2x}"
+        specialNotes: "#{orb : 2x}",
     },
     1380: {//Shanks
         captain: "Boosts chances of getting Matching orbs, boosts ATK of Cerebral characters by 2.5x",
         special: "Reduces Paralysis duration by 3 turns. For Cerebral and Free Spirit characters, amplifies the effects of orbs by 2x for 1 turn. Makes [RCV] and [TND] orbs \"beneficial\" to Cerebral and Free Spirit characters for 1 turn.",
         specialName: "A Decision Made over Sake",
-        specialNotes: "#{orb : 2x}"
+        specialNotes: "#{orb : 2x}",
     },
     1381: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.2x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Strawberry Smile",
-        specialNotes: "#{silence}"
+        specialNotes: "#{silence}",
     },
     1382: {//Christmas Tashigi
         captain: "Boosts ATK and RCV of Slasher and Cerebral characters by 1.75x",
         special: "Reduces Silence duration by 1 turn, and recovers 12,240 HP",
+        specialNotes: "Silence will refer to effects that prevent you from activating Special Abilities",
         specialName: "Strawberry Smile",
-        specialNotes: "#{silence}"
+        specialNotes: "#{silence}",
     },
     1383: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialNotes: "#{silence}",
-        specialName: "Angry Extermination of Bugs"
+        specialName: "Angry Extermination of Bugs",
     },
     1384: {//Soldier-San
         captain: "Boosts ATK of Striker characters by 2.5x. Increases damage received by 1.5x",
         special: "Reduces Paralysis, Bind, Despair, and Silence duration by 1 turn. Randomizes all Badly Matching, [BLOCK], or [EMPTY] orbs",
         specialNotes: "#{silence}",
-        specialName: "Angry Extermination of Bugs"
+        specialName: "Angry Extermination of Bugs",
     },
     1385: {//Rebecca
         captain: "Reduces damage received by 20%",
         special: "Removes blindness",
-        specialName: "Mother's Promise"
+        specialName: "Mother's Promise",
     },
     1386: {//Rebecca
         captain: "Reduces damage received by 25%",
         special: "Removes blindness",
-        specialName: "Mother's Promise"
+        specialName: "Mother's Promise",
     },
     1387: {//Luffy 5+
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.25x, boosts ATK by 2.8125x after scoring 4 Perfects in a row",
@@ -8887,7 +8891,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire Sailor Ability 2: Makes [QCK] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -8909,7 +8913,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 3 turns",
                     "Level 5: Reduces No Healing duration by 4 turns"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -8932,7 +8936,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Boosts base ATK of [DEX] characters by 40" },
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Critical Hit" }
+            { "description": "Aquire Potential 2: Critical Hit" },
         ],
         potential: [
             {
@@ -8954,69 +8958,69 @@ window.details = {
                     "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
                     "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
                 ]
-            }
+            },
         ]
     },
     1389: {//Nami 5+
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, Boosts ATK of [INT] characters by 2x and their RCV by 1.5x.",
         special: "Deals 20x character's ATK in [INT] damage to all enemies. Amplifies the effect of orbs for [INT] characters by 1.75x for 1 turn",
         specialName: "Weather Egg: Thunder Breed Tempo",
-        specialNotes: "#{orb : 1.75x}"
+        specialNotes: "#{orb : 1.75x}",
     },
     1390: {//Buggy Legend
         captain: "Boosts ATK of characters with cost 40 or less by 1.5x and boosts the HP and ATK of characters with cost 41 or greater by 0.5x. Guarantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
-        specialName: "Chop-Chop Clown Car"
+        specialName: "Chop-Chop Clown Car",
     },
     1391: {//Buggy Legend
         captain: "Boosts ATK of characters with cost 40 or less by 1.5x and reduces the HP and ATK of characters with cost 41 and greater by 0.5x. Guarantees duplicating a drop upon completion of the island.",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "Randomizes all orbs. Boosts ATK of characters with cost 40 or less by 1.75x for 2 turns",
-        specialName: "Chop-Chop Clown Car"
+        specialName: "Chop-Chop Clown Car",
     },
     1392: {//Sentomaru
         captain: "Boosts ATK of Striker characters by 2x and boosts the HP of [PSY] characters by 1.25x",
         captainNotes: "A character with both classes will get both boosts",
         special: "Deals 25x character's ATK in [PSY] damage to all enemies. If during that turn every unit scores a Perfect hit, boosts ATK of [PSY] characters by 1.75x in the following turn.",
-        specialName: "Large Cutting Axe"
+        specialName: "Large Cutting Axe",
     },
     1393: {//Demaro Black
         captain: "Boosts ATK of characters with cost 30 or less by 2x",
         special: "Boosts ATK of all characters by 1.1x, slightly boosts chances of getting matching orbs and amplifies the effect of orbs by 1.1x for 7 turns",
-        specialName: "Three Forked Tongue"
+        specialName: "Three Forked Tongue",
     },
     1394: {//Kimono Baby 5
         captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x and their RCV by 1.1x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
-        specialName: "Nation's Ambition"
+        specialName: "Nation's Ambition",
     },
     1395: {//Kimono Baby 5
         captain: "Boosts ATK of [STR] and [QCK] characters by 2.25x and their RCV by 1.2x",
         special: "Recovers 7x character's RCV in HP. Boosts ATK of Fighter and Striker characters by 1.5x for 1 turn",
-        specialName: "Nation's Ambition"
+        specialName: "Nation's Ambition",
     },
     1396: {//Tashigi Shambles
         captain: "Boosts ATK of Driven characters by 1.75x and the HP of Striker Characters by 1.25x",
         special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
-        specialNotes: "#{randomHits : 7}"
+        specialNotes: "#{randomHits : 7}",
     },
     1397: {//Tashigi Shambles
         captain: "Boosts ATK of Driven characters by 2x and the HP of Striker Characters by 1.5x",
         special: "Deals 7 hits of random [DEX] damage to random enemies. Reduces the defense of all enemies by 80% and delays all enemies for 1 turn",
         specialName: "Surprise Jitte Onslaught",
-        specialNotes: "#{randomHits : 7}"
+        specialNotes: "#{randomHits : 7}",
     },
     1398: {//Smoker Shambles
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x",
         special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
-        specialName: "Out-of-Control White Smoke"
+        specialName: "Out-of-Control White Smoke",
     },
     1399: {//Smoker Shambles
         captain: "Boosts ATK of Slasher and Cerebral characters by 1.5x, reduces damage received by 15%",
         special: "For Slasher characters, randomizes all non-matching orbs. Swaps this unit with your captain for 2 turns",
-        specialName: "Out-of-Control White Smoke"
+        specialName: "Out-of-Control White Smoke",
     },
     1400: {//Colo Gladius
         captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.3x",
@@ -9024,15 +9028,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 13x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 26, 11 ]
+                "cooldown": [ 26, 11 ],
             },
             {
                 "description": "Deals 30x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
-                "cooldown": [ 33, 18 ]
-            }
+                "cooldown": [ 33, 18 ],
+            },
         ],
         specialName: "Stonewall Punk",
-        specialNotes: "#{colorAffinity : 1.75}<br>#{stages}"
+        specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
     },
     1401: {//Colo Gladius
         captain: "Boosts ATK of Shooter characters by 1.75x and boosts ATK of Driven characters by 1.5x",
@@ -9040,12 +9044,12 @@ window.details = {
         special: [
             {
                 "description": "Deals 13x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 1 turn and boosts the Color Affinity of Shooter characters by 1.5x for 1 turn",
-                "cooldown": [ 26, 11 ]
+                "cooldown": [ 26, 11 ],
             },
             {
                 "description": "Deals 30x character's ATK in [STR] damage to all enemies, reduces Bind and Despair duration by 2 turns and boosts the Color Affinity of Shooter characters by 1.75x for 1 turn",
-                "cooldown": [ 33, 18 ]
-            }
+                "cooldown": [ 33, 18 ],
+            },
         ],
         specialName: "Stonewall Punk",
         specialNotes: "#{colorAffinity : 1.75}<br>#{stages}",
@@ -9064,7 +9068,7 @@ window.details = {
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -9086,7 +9090,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -9095,15 +9099,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 3x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.3x for 1 turn",
-                "cooldown": [ 14, 4 ]
+                "cooldown": [ 14, 4 ],
             },
             {
                 "description": "Deals 13x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.5x for 1 turn",
-                "cooldown": [ 18, 8 ]
-            }
+                "cooldown": [ 18, 8 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Offense Battle Axe"
+        specialName: "Offense Battle Axe",
     },
     1403: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x and reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
@@ -9111,15 +9115,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
-                "cooldown": [ 13, 8 ]
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
-                "cooldown": [ 18, 13 ]
-            }
+                "cooldown": [ 18, 13 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Gomu Gomu no Red Hawk"
+        specialName: "Gomu Gomu no Red Hawk",
     },
     1404: {//Timeskip Luffy
         captain: "Boosts ATK of Free Spirit characters by 2.5x and reduce damage received by 15%. If you use \"Gomu Gomu no Red Hawk\" THIS LUFFY boosts ATK of Free Spirit characters by 4x instead for 3 turns.",
@@ -9127,69 +9131,69 @@ window.details = {
         special: [
             {
                 "description": "Deals 25x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" to Fighter and Free Spirit characters for 1 turn",
-                "cooldown": [ 13, 8 ]
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Deals 60x character's ATK in [QCK] damage to one enemy, and makes [QCK], [DEX], and [PSY] orbs \"beneficial\" for 3 turns",
-                "cooldown": [ 18, 13 ]
-            }
+                "cooldown": [ 18, 13 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Gomu Gomu no Red Hawk"
+        specialName: "Gomu Gomu no Red Hawk",
     },
     1405: {//Timeskip Usopp
         captain: "Boosts ATK of Shooter characters by 1.75x, and their RCV by 1.25x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "#{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100"
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
     },
     1406: {//Timeskip Usopp
         captain: "Boosts ATK of Shooter characters by 2.25x, and their RCV by 1.5x",
         special: "Deals 10 hits of 2,000 fixed damage to random enemies, and if enemies have delay protection at the time the special was activated, boosts ATK of Shooter characters by 1.75x and amplifies the effect of orbs for Shooter characters by 1.75x for 1 turn",
         specialNotes: "#{randomHits : 10}",
         specialName: "Assault Meteor Shower",
-        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100"
+        sailor: "When HP is below 30% at the start of the turn, boosts ATK and RCV of Shooter characters by 100",
     },
     1407: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 1.75x and their RCV by 1.25x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
-        sailor: "Reduces Blindness duration by 3 turns"
+        sailor: "Reduces Blindness duration by 3 turns",
     },
     1408: {//Timeskip Robin
         captain: "Boosts ATK of [DEX] and [PSY] characters by 2.25x and their RCV by 1.5x",
         special: "Reduces Despair duration by 3 turns and boosts ATK of [DEX] and [PSY] characters by 2x for 1 turn",
         specialName: "Mil Fleur: Gigantesco Mano Stomp",
-        sailor: "Reduces Blindness duration by 3 turns"
+        sailor: "Reduces Blindness duration by 3 turns",
     },
     1409: {//Timeskip Brook
         captain: "Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Soul's Murder Soul: Soul Solid",
-        sailor: "Completely resists Paralysis on this character"
+        sailor: "Completely resists Paralysis on this character",
     },
     1410: {//Timeskip Brook
         captain: "Boosts chain multiplier by 2.5x. Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Delays all enemies by 1 turn, and boosts ATK of Slasher and Free Spirit characters by 1.75x for 1 turn",
         specialName: "Soul's Murder Soul: Soul Solid",
-        sailor: "Completely resists Paralysis on this character"
+        sailor: "Completely resists Paralysis on this character",
     },
     1411: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.25x, reduces crew's RCV to 0",
         special: "Reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shiled buff enemies have",
         specialName: "Carving Hoof Palm: Coconut",
-        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn"
+        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1412: {//Timeskip Chopper Again
         captain: "Boosts ATK of Powerhouse characters by 2.75x, reduces crew's RCV to 0",
         special: "Reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and deals 60x character's ATK in typeless damage to all enemies",
         specialNotes: "This does not affect threshold damage reduction. Damage Reduction is the rainbow shield buff enemies have, and Increased Defense is the blue shield buff enemies have",
         specialName: "Carving Hoof Palm: Coconut",
-        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn"
+        sailor: "If Chopper has a [STR] orb and you hit a Perfect with him, keep his [STR] orb for the next turn",
     },
     1413: {//6+ Whitebeard
         captain: "Boosts ATK of all characters by 3x if HP is below 30% at the start of the turn, 1.75x otherwise and boosts the HP of all characters by 1.2x",
@@ -9225,7 +9229,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: 	Completely resists Paralysis on this character" },
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base ATK by 50" },
-            { "description": "Aquire Potential 3: Enrage" }
+            { "description": "Aquire Potential 3: Enrage" },
         ],
         potential: [
             {
@@ -9257,106 +9261,106 @@ window.details = {
                     "Level 4: Boosts base ATK by ??",
                     "Level 5: Boosts base ATK by ??"
                 ]
-            }
+            },
         ]
     },
-    1414: {//Naked Sanji
+    1414: {//Shop Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x",
         special: "Changes own orb into [INT] and reduces Special Cooldown of Powerhouse characters by 1 turn.",
-        specialName: "Are you ready?"
+        specialName: "Are you ready?",
     },
     1415: {//Fortnight Sengoku
         captain: "Boosts ATK of characters with cost 30 or less by 1.5x",
         special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
-        specialName: "Unshakeable Resolution of the Wise Master"
+        specialName: "Unshakeable Resolution of the Wise Master",
     },
     1416: {//Fortnight Sengoku
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
         special: "Reduces Special Cooldown of all characters with cost 30 or less by 1 turn and boosts ATK of characters with cost 30 or less by 1.5x for 1 turn",
-        specialName: "Unshakeable Resolution of the Wise Master"
+        specialName: "Unshakeable Resolution of the Wise Master",
     },
     1417: {//Ronse
         captain: "Boosts ATK and HP of [STR] characters by 1.5x",
         special: "Cuts the current HP of all enemies by 10%, changes [BLOCK] orbs into [STR] orbs for Slasher characters",
-        specialName: "Raid Battle-Axe: One Flash"
+        specialName: "Raid Battle-Axe: One Flash",
     },
     1418: {//Stainless
         captain: "Boosts ATK and RCV of INT characters by 1.5x",
         special: "Reduces any damage received above 5,000 HP by 99% for 1 turn",
-        specialName: "Defence of the Command Line"
+        specialName: "Defence of the Command Line",
     },
     1419: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2x, reduce damage received by 10%",
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turn",
-        specialName: "Demonic Style"
+        specialName: "Demonic Style",
     },
     1420: {//Kimono Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x, reduce damage received by 10%",
         special: "Recovers 5,000 HP and boosts ATK against enemies with reduced defense by 1.5x for 1 turn",
-        specialName: "Demonic Style"
+        specialName: "Demonic Style",
     },
     1421: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Deals 20x Character's ATK in [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
-        specialName: "Half Moon Glaive"
+        specialName: "Half Moon Glaive",
     },
     1422: {//Coliseum Diamante
         captain: "Boosts ATK of Driven characters by 2.25x and boosts HP of Striker and Slasher characters by 1.5x",
         special: "Deals 20x Character's ATK in [INT] damage to all enemies. If HP is full at the time the special was activated, boosts ATK of Driven characters by 2x for 1 turn, 1.5x otherwise",
-        specialName: "Half Moon Glaive"
+        specialName: "Half Moon Glaive",
     },
     1423: {//Coliseum T-Bone
         captain: "Boosts ATK of the whole crew by 1.75x and recovers 918 HP at end of each turn,",
         special: "If HP is below 500, reduces damage received by 99% for 1 turn",
-        specialName: "For the Sake of Justice"
+        specialName: "For the Sake of Justice",
     },
     1424: {//Coliseum Gin
         captain: "Boosts ATK of Striker characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : higher : 1 + 1.25 * (remaining HP) / (total HP) : 2.25 : 1}",
         special: "Deals 500 fixed damage to all enemies and reduces Special Cooldown of Striker characters by 1 turn.",
-        specialName: "General Commander's Fight"
+        specialName: "General Commander's Fight",
     },
     1425: {//Don Sai
         captain: "Boosts ATK of Fighter and Striker characters by 1.75x",
         special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "Military Leg Heel"
+        specialName: "Military Leg Heel",
     },
     1426: {//Don Sai
         captain: "Boosts ATK of Fighter and Striker characters by 2x and their HP by 1.25x",
         special: "Deals 25x character's ATK in QCK damage to one enemy. If a character is locked at the time the special was activated, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "Military Leg Heel"
+        specialName: "Military Leg Heel",
     },
     1427: {//Boo
         captain: "Boosts ATK of QCK characters by 2x",
         special: "Deals 15x character's ATK in QCK damage to one enemy that will ignore damage negating abilities and barriers.",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Unblockable Eight Fists"
+        specialName: "Unblockable Eight Fists",
     },
     1428: {//Jean Ango
         captain: "Boosts amount of Beli received by 1.5x, and gives chance of duplicating a drop upon completion of the island",
         captainNotes: "Does not work if he was not your captain upon starting the island. Stacks with other addional drop captains, giving you two chances of getting an extra drop.",
         special: "If the enemy is delayed at the time the special is activated, reduces Special Cooldown of all characters by 1 turn and boosts own attack by 1.75x for 1 turn",
-        specialName: "Looting the Losers"
+        specialName: "Looting the Losers",
     },
     1429: {//Valentines Mansherry
         captain: "Boosts the RCV of Striker and Free Spirit characters by 1.5x",
         special: "Reduces Bind, Despair, and Paralysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
-        specialName: "Boy's Unknown Taste of Hard Work"
+        specialName: "Boy's Unknown Taste of Hard Work",
     },
     1430: {//Valentines Mansherry
         captain: "Boosts the RCV of Striker and Free Spirit characters by 2x",
         special: "Reduces Bind, Despair, and Paralysis duration by 3 turns and recovers 2000 HP at the end of each turn for 3 turns",
-        specialName: "Boy's Unknown Taste of Hard Work"
+        specialName: "Boy's Unknown Taste of Hard Work",
     },
     1431: {//Raid Franky
         captain: "Boosts ATK of all characters by 2x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.2x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
         special: "Deals 100x character's ATK in typeless damage to all enemies, removes enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
-        specialName: "General Cannon"
+        specialName: "General Cannon",
     },
     1432: {//Raid Franky
         captain: "Boosts ATK of all characters by 2.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew, and boosts their HP by 1.5x if there's a Fighter, Slasher, Shooter, Driven, Free Spirit, and Powerhouse character in your crew",
         special: "Deals 100x character's ATK in typeless damage to all enemies, removes enemies' ATK Up, Enrage, End of Turn Damage/Percent Cut, and End of Turn Heal Buffs, and boosts ATK of all characters by 1.5x for 1 turn",
-        specialName: "General Cannon"
+        specialName: "General Cannon",
     },
     1433: {//Hody Jones
         captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and boosts HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
@@ -9364,16 +9368,15 @@ window.details = {
         special: [
             {
                 "description": "Deals 10x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
-                "cooldown": [ 12, 7 ]
+                "cooldown": [ 12, 7 ],
             },
             {
                 "description": "Deals 60x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
-                "cooldown": [ 22, 17 ]
-            }
+                "cooldown": [ 22, 17 ],
+            },
         ],
         specialNotes: "#{ignoreBarrier}<br>#{stages}",
         specialName: "Water Bullets",
-        limit: "This character has a limit break path"
     },
     1434: {//Hody Jones
         captain: "Reduces cooldown of Powerhouse specials by 1 turn at the start of the fight, reduces crew's current HP by 10% at the end of each turn, and boosts ATK of Powerhouse characters by 3x if there are 6 Powerhouse characters in your crew and boosts HP of Powerhouse characters by up to 2x depending on how many Powerhouse characters are in your crew.",
@@ -9381,22 +9384,23 @@ window.details = {
         special: [
             {
                 "description": "Deals 10x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 1 turn, reduces damage received by 60% for 1 turn",
-                "cooldown": [ 12, 7 ]
+                "cooldown": [ 12, 7 ],
             },
             {
                 "description": "Deals 60x character's ATK in [INT] damage to one enemy that will ignore damage negating abilities and barriers, reduces Special Cooldown of Powerhouse characters by 2 turns, reduces damage received by 90% for 1 turn",
-                "cooldown": [ 22, 17 ]
-            }
+                "cooldown": [ 22, 17 ],
+            },
         ],
         specialNotes: "#{ignoreBarrier}<br>#{stages}",
-        specialName: "Water Bullets"
+        specialName: "Water Bullets",
+        limit: "This character has a limit break path",
     },
     1435: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 2x and HP of Powerhouse characters by 1.2x",
         special: "Makes Perfects harder to hit for 1 turn, changes [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Powerhouse characters, delays all enemies for 1 turn, recovers 20% of crew's MAX HP.",
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
-        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew"
+        sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
     },
     1436: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 2.5x and HP of Powerhouse characters by 1.25x",
@@ -9404,21 +9408,21 @@ window.details = {
         specialName: "Staggering Slash",
         specialNotes: "Decreases timing window to hit a Perfect. (Animation remains the same)",
         sailor: "Boosts base ATK of all characters by 150 if there are 6 Powerhouse characters in your crew",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1437: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.3x",
         captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 1.69x bonus.",
         special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by 1.75x and boosts ATK against delayed enemies by 1.5x for 1 turn",
         specialName: "Squid Spear",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew"
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
     },
     1438: {//Ikaros Much
         captain: "Boosts ATK of Powerhouse and Striker characters by 1.6x",
         captainNotes: "The bonus is cumulative. Powerhouse + Striker characters get a 2.56x bonus.",
         special: "Reduce crew's current HP by 50%, amplifies the effect of orbs for Powerhouse characters by 1.75x and boosts ATK against delayed enemies by 1.5x for 1 turn",
         specialName: "Squid Spear",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew"
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if there are 6 Powerhouse characters in your crew",
     },
     1439: {//Daruma
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.2x",
@@ -9426,7 +9430,7 @@ window.details = {
         specialNotes: "#{silence}",
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
     },
     1440: {//Daruma
         captain: "Reduces cooldown of all specials by 4 turns at the start of the fight, boosts ATK of Powerhouse and Fighter characters by 1.5x",
@@ -9435,14 +9439,14 @@ window.details = {
         specialName: "Fire Daruma Cutter",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1441: {//Zeo
         captain: "Boosts ATK of [INT] characters by 1.5x, and reduces damage received by 10%",
         special: "Makes Perfects easier to hit, locks all orbs, and locks the chain multiplier at 2.5x for 1 turn",
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
-        sailor: "Completely resists Blindness if your Captain is a Powerhouse character"
+        sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
     },
     1442: {//Zeo
         captain: "Boosts ATK of [INT] characters by 2.25x and reduces damage received by 20%",
@@ -9450,20 +9454,20 @@ window.details = {
         specialNotes: "Increases timing window to hit a Perfect. (Animation remains the same)",
         specialName: "Flail Hidden From God",
         sailor: "Completely resists Blindness if your Captain is a Powerhouse character",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1443: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 2.75x following a chain of Good > Great > Perfect hits",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
-        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew"
+        sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
     },
     1444: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Changes [RCV], [TND], [EMPTY], [BLOCK] and [BOMB] orbs into [STR], [QCK], [DEX], [PSY] or [INT] orbs, boosts ATK of Powerhouse characters by 1.5x and amplifies the effect of orbs by 1.5x for 1 turn",
         specialName: "Papara Hammer",
         sailor: "Boost HP of all characters by 150 and also ATK of all characters by 50 if there are 6 Powerhouse characters in your crew",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1445: {//Boa Hancock+
         captain: "Boosts ATK of [QCK] and [PSY] characters proportionally to the crew's current HP. If HP is below 50%, Boosts RCV of [QCK] and [PSY] units by 1.5x.",
@@ -9475,227 +9479,227 @@ window.details = {
         captain: "Boosts ATK of Shooter characters by 2x and RCV of Shooter characters by 1.25x.",
         special: "Deals random PSY damage to all enemies and delays enemies by 3 turns.",
         specialName: "Green Star: Platanus Shuriken",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1447: {//Sanji 5+
         captain: "Boosts ATK of Powerhouse characters by 2.5x and reduces damage take by 10%.",
         special: [
             {
                 "description": "Deals 5,000 fixed damage to all enemies and boosts own ATK by 1.2x for 1 turn.",
-                "cooldown": [ 15, 10 ]
+                "cooldown": [ 15, 10 ],
             },
             {
                 "description": "Deals 50,000 fixed damage to all enemies and boosts own ATK by 1.5x for 1 turn.",
-                "cooldown": [ 20, 15 ]
-            }
+                "cooldown": [ 20, 15 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Grill Shot"
+        specialName: "Grill Shot",
     },
     1448: {//Chopper 5+
         captain: "Boosts ATK of Fighter characters by 2.5x.",
         special: "Deals PSY damage according to HP. For Fighter characters, Changes [BLOCK] orbs into matching orbs.",
         specialNotes: "The exact damage is proportional to the crew's remaining HP and is higher the higher the HP is. The formula used is ???? * (current HP) / (total HP)",
-        specialName: "Weight Gain: Heavy Gong"
+        specialName: "Weight Gain: Heavy Gong",
     },
     1449: {//Violet
         captain: "Boosts ATK of Cerebral characters by 1.5x. Heals for .3x character's RCV at the end of the turn each time you hit a Great.",
         special: "Reduces the defense of all enemies by 50% for 1 turn, and if HP is below 50%, randomly changes all orbs to either [RCV] or [TND] orbs",
-        specialName: "Clairvoyance"
+        specialName: "Clairvoyance",
     },
     1450: {//Violet
         captain: "Boosts ATK of Cerebral characters by 1.75x. Heals for .5x character's RCV at the end of the turn each time you hit a Great.",
         special: "Reduces the defense of all enemies by 50% for 1 turn, and if HP is below 50%, randomly changes all orbs to either [RCV] or [TND] orbs",
-        specialName: "Clairvoyance"
+        specialName: "Clairvoyance",
     },
     1451: {//Moustache Sanji
         captain: "Boosts ATK of [DEX] characters by 2.25x if they have a matching orb, by 1.5x otherwise. Slightly boosts chances of getting [DEX] orbs",
         special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 2 turns",
-        specialName: "Diable Jambe: Love Shot"
+        specialName: "Diable Jambe: Love Shot",
     },
     1452: {//Moustache Sanji
         captain: "Boosts ATK of [DEX] characters by 2.5x if they have a matching orb, by 2x otherwise. Slightly boosts chances of getting [DEX] orbs",
         special: "Deals 15x character's ATK in DEX damage to one enemy, and boosts chances of getting DEX orbs for 2 turns",
-        specialName: "Diable Jambe: Love Shot"
+        specialName: "Diable Jambe: Love Shot",
     },
     1453: {//Valentines Margeurite
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.5x",
         special: "Changes all orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
-        specialName: "Doki Doki Heart"
+        specialName: "Doki Doki Heart",
     },
     1454: {//Valentines Margeurite
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x and their RCV by 1.5x",
         special: "Changes all orbs depending on the current HP",
         specialNotes: "<br> HP>70%: Top row to [QCK], middle row to [DEX], bottom row to [STR] <br> HP<30%: Top row to [RCV], middle row to [QCK], bottom row to [STR]",
-        specialName: "Doki Doki Heart"
+        specialName: "Doki Doki Heart",
     },
     1455: {//Coliseum Don Chinjao
         captain: "Boosts ATK of Driven characters by 2.5x until the first hit other than Perfect and recovers 120 HP at end of each turn",
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
-                "cooldown": [ 25, 10 ]
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
-                "cooldown": [ 30, 15 ]
-            }
+                "cooldown": [ 30, 15 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Legend told to the Grandchild"
+        specialName: "Legend told to the Grandchild",
     },
     1456: {//Coliseum Don Chinjao
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 120 HP at end of each turn",
         special: [
             {
                 "description": "Cuts the current HP of one enemy by 20%, reduces damage received by 50% for 1 turn",
-                "cooldown": [ 25, 10 ]
+                "cooldown": [ 25, 10 ],
             },
             {
                 "description": "Cuts the current HP of one enemy by 25%, reduces damage received by 70% for 1 turn",
-                "cooldown": [ 30, 15 ]
-            }
+                "cooldown": [ 30, 15 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Legend told to the Grandchild"
+        specialName: "Legend told to the Grandchild",
     },
     1457: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 1.75x",
         special: "Reduces Bind and Despair duration by 2 turns, for Slasher and Cerebral characters, randomizes non-matching orbs and changes own orb into [INT]",
-        specialName: "Pussyfoot Maneuver"
+        specialName: "Pussyfoot Maneuver",
     },
     1458: {//Coliseum Kuro
         captain: "Reduces cooldown of all specials by 2 turn at the start of the fight, boosts ATK of [QCK] and [INT] characters by 2x",
         special: "Reduces Bind and Despair duration by 2 turns, for Slasher and Cerebral characters, randomizes non-matching orbs and changes own orb into [INT]",
-        specialName: "Pussyfoot Maneuver"
+        specialName: "Pussyfoot Maneuver",
     },
     1459: {//Coliseum Miss Valentine
         captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great > Perfect hits",
         special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
-        specialName: "Crescendo Stone"
+        specialName: "Crescendo Stone",
     },
     1460: {//Coliseum Miss Valentine
         captain: "Boosts ATK by 2.14x following a chain of Good > Good > Great > Perfect hits",
         special: "Binds self for 2 turns, makes [BOMB] orbs \"beneficial\" and boosts ATK against enemies with reduced defense by 1.5x for 1 turn.",
-        specialName: "Crescendo Stone"
+        specialName: "Crescendo Stone",
     },
     1461: {//Snow Zoro
         captain: "Boosts ATK of [QCK] characters by 2x at the start of the chain, by 2.6x after the 3rd Perfect in a row.",
         special: "Deals 11x character's ATK in [QCK] damage to one enemy, boosts ATK of [QCK] characters by 1.5x for 1 turn",
-        specialName: "Demoltion: Ice Crush"
+        specialName: "Demoltion: Ice Crush",
     },
     1462: {//White Day Luffy
         captain: "Boosts chain multiplier by 2x",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters for 1 turn",
         sailor: "Reduces Paralysis for 2 turns for himself",
-        specialName: "Gum-Gum Gigant Axe - Sweets"
+        specialName: "Gum-Gum Gigant Axe - Sweets",
     },
     1463: {//White Day Luffy
         captain: "Boosts chain multiplier by 2.5x, recovers 1.5x character's RCV in HP at the end of each turn",
         special: "Reduces crew's current HP by 50%, cuts the current HP of each enemy by 20%, and makes [PSY] and [STR] orbs \"beneficial\" to Fighter characters for 1 turn",
         sailor: "Reduces Paralysis for 2 turns for himself",
-        specialName: "Gum-Gum Gigant Axe - Sweets"
+        specialName: "Gum-Gum Gigant Axe - Sweets",
     },
     1464: {//White Day Chopper
         captain: "Protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
-        specialName: "Devoted Healing - \"Instant Recovery\""
+        specialName: "Devoted Healing - \"Instant Recovery\"",
     },
     1465: {//White Day Chopper
         captain: "Boosts ATK and RCV of all characters by 1.25x, protects from defeat as long as HP is above 50%",
         captainNotes: "#{zombie}",
         special: "Recovers 6x character's RCV in HP and reduces Paralysis duration by 2 turns",
         sailor: "Boosts amount healed from [RCV] orbs by 100 each",
-        specialName: "Devoted Healing - \"Instant Recovery\""
+        specialName: "Devoted Healing - \"Instant Recovery\"",
     },
     1466: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2x",
         special: "Reduces the defense of all enemies by 100% for 1 turn and changes own orb into [PSY] and friend captain's orb into [STR]",
-        specialName: "Rosy Pleasure"
+        specialName: "Rosy Pleasure",
     },
     1467: {//White Day Cavendish
         captain: "Boosts ATK of [QCK] and [PSY] characters by 2.25x and their RCV by 1.3x",
         special: "Reduces the defense of all enemies by 100% for 1 turn and changes own orb into [PSY] and friend captain's orb into [STR]",
-        specialName: "Rosy Pleasure"
+        specialName: "Rosy Pleasure",
     },
     1468: {//Fortnight Sentomaru 
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
         special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
-        specialName: "Warning of the New World"
+        specialName: "Warning of the New World",
     },
     1469: {//Fortnight Sentomaru Evolved
         captain: "Boosts ATK of [STR] characters by 2x and the HP of Powerhouse characters by 1.25x",
         captainNotes: "Captain ability stacks, so a [STR] Powerhouse character benefits from both parts",
         special: "Delays all enemies for 1 turn. Changes own orb into Matching orb",
-        specialName: "Warning of the New World"
+        specialName: "Warning of the New World",
     },
     1470: {//Lip Service Doughty
         captain: "Boosts ATK of Slasher and Powerhouse characters by 1.5x, but boost his OWN ATK by 3x",
         captainNotes: "Captain ability does not stack with itself (Will not boost another Doughty by 3x)",
         special: "Deals 8x character's ATK as [STR] damage to one enemy. Changes captain orb into [RCV]",
-        specialName: "Meat Grinder Blade"
+        specialName: "Meat Grinder Blade",
     },
     1471: {//Albion
         captain: "Boosts ATK of Slasher and Driven characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : 1 + 1 * (1 - (remaining HP) / (total HP)) : 1 : 2}",
         special: "Reduces crew's HP by 90%, deals 1x the removed HP as damage to all enemies.",
-        specialName: "Deep Claw Stab"
+        specialName: "Deep Claw Stab",
     },
     1472: {//Shirahoshi
         captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
         special: [
             {
                 "description": "Changes adjacent orbs, including [BLOCK] orbs, into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
-                "cooldown": [ 13, 9 ]
+                "cooldown": [ 13, 9 ],
             },
             {
                 "description": "Changes all orbs, including [BLOCK] orbs, into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-                "cooldown": [ 22, 18 ]
-            }
+                "cooldown": [ 22, 18 ],
+            },
         ],
         specialNotes: "Rainbow orbs are the beneficial form of [BLOCK] orbs. They can not be shuffled by you or your opponent. They count as beneficial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
-        specialName: "Tears of Courage"
+        specialName: "Tears of Courage",
     },
     1473: {//Shirahoshi
         captain: "Boosts ATK of all characters by 2.25x, but boosts her OWN attack by 1.125x, recovers 5x character's RCV in HP at the end of each turn and if you don't attack with her, reduces damage received by 10% for that turn.",
         special: [
             {
                 "description": "Changes adjacent orbs, including [BLOCK] orbs into [RAINBOW] orbs, recovers 9x character's RCV in HP.",
-                "cooldown": [ 13, 9 ]
+                "cooldown": [ 13, 9 ],
             },
             {
                 "description": "Changes all orbs, including [BLOCK] orbs into [RAINBOW] orbs, recovers 100x character's RCV in HP.",
-                "cooldown": [ 22, 18 ]
-            }
+                "cooldown": [ 22, 18 ],
+            },
         ],
         specialNotes: "Rainbow orbs are the benefittial form of [BLOCK] orbs. They can not be shuffled or swapped by you or your opponent. They count as benefittial orbs to any character. They do not count as STR orbs for Sakazuki but do act like Matching orbs for Black Clad Ace or Fujitora captain abilities.<br>#{stages}",
         sailor: "Changes all orbs into [RAINBOW] orbs at the start of the fight.",
         specialName: "Tears of Courage",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1474: {//King Neptune
         captain: "Boosts ATK of all characters by 1.5x and EXP gained by 1.5x",
         special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
-        specialName: "Merman Gujutsu - Ultramarine"
+        specialName: "Merman Gujutsu - Ultramarine",
     },
     1475: {//King Neptune
         captain: "Boosts ATK of all characters by 2.25x and EXP gained by 1.5x",
         captainNotes: "EXP boost does not take effect if he becomes your capatin in the middle of the adventure.",
         special: "Locks all orbs for 1 turn. If the HP of the enemy with the highest HP percentage is above 50%, cuts the current HP of all enemies by 20%, otherwise, deals 140x character's ATK in typeless damage to all enemies.",
         sailor: "Makes [INT], [PSY], and [TND] orbs \"beneficial\" for this unit",
-        specialName: "Merman Gujutsu - Ultramarine"
+        specialName: "Merman Gujutsu - Ultramarine",
     },
     1476: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
         sailor: "Boosts base HP, RCV and ATK of all characters by 50",
-        specialName: "Merman Gujutsu - Spear of the Ages"
+        specialName: "Merman Gujutsu - Spear of the Ages",
     },
     1477: {//Fukaboshi
         captain: "Boosts ATK of Striker characters by 2.5x and boosts HP of Powerhouse characters by 1.25x",
@@ -9703,14 +9707,14 @@ window.details = {
         special: "Delays all enemies by 1 turn, and boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn",
         sailor: "Boosts base HP, RCV and ATK of all characters by 50",
         specialName: "Merman Gujutsu - Spear of the Ages",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1478: {//Caribou
         captain: "Boosts ATK of all characters by 1.5x after the 11th hit in the chain, by 1.75x after the 22nd hit, by 2x after the 33th hit, by 3x after the 44th hit",
         special: "Deals 15 hits of 12x character's ATK in typeless damage to random enemies and boosts ATK of [QCK] and [INT] characters by 2x for 1 turn",
         specialNotes: "#{randomHits : 15}",
         sailor: "Completely resists Paralysis on this character",
-        specialName: "Swamp-Swamp Gatling Gun"
+        specialName: "Swamp-Swamp Gatling Gun",
     },
     1479: {//Caribou
         captain: "Boosts ATK of all characters by 1.75x after the 11th hit in the chain, by 2.5x after the 22nd hit, by 2.75x after the 33th hit, by 3.5x after the 44th hit",
@@ -9733,7 +9737,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -9755,7 +9759,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -9765,7 +9769,7 @@ window.details = {
         specialNotes: "#{ignoreBarrier}<br>#{silence}",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "#{rewind : 1}<br>#{silence}",
-        specialName: "Stalking Rose Axe"
+        specialName: "Stalking Rose Axe",
     },
     1481: {//Vander Decken IX
         captain: "Boosts ATK by 2.5x after the 2nd Perfect in a row and by 3.5x after the 5th Perfect in a row.",
@@ -9773,63 +9777,63 @@ window.details = {
         specialNotes: "#{ignoreBarrier}<br>#{silence}",
         sailor: "Restores his own special by 1 turn when it is rewinded and reduces Silence for 3 turns for himself",
         sailorNotes: "#{rewind : 1}<br>#{silence}",
-        specialName: "Stalking Rose Axe"
+        specialName: "Stalking Rose Axe",
     },
     1482: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
-        specialName: "Foretold Catastrophe"
+        specialName: "Foretold Catastrophe",
     },
     1483: {//Madame Shyarly
         captain: "Boosts ATK of INT characters by 2.5x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots twice, and if enemies have a barrier at the time the special was activated, boosts ATK of all characters by 1.75x, 1.25x otherwise.",
         sailor: "[INT] characters will deal an extra 1.1x to non [PSY] enemies",
-        specialName: "Foretold Catastrophe"
+        specialName: "Foretold Catastrophe",
     },
     1484: {//Wild Sanji
         captain: "Boosts ATK by 2.5x after scoring 3 Perfects in a row",
         special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
         sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
-        specialName: "Wild Shot"
+        specialName: "Wild Shot",
     },
     1485: {//Wild Sanji
         captain: "Boosts HP and RCV of all characters by 1.2x and boosts ATK by 3.25x after scoring 3 Perfects in a row",
         special: "Locks the chain multiplier at 2.5x for 1 turn, reduces Bind duration by 5 turns",
         sailor: "Changes all orbs into [RCV] orbs at the start of the fight.",
-        specialName: "Wild Shot"
+        specialName: "Wild Shot",
     },
     1486: {//Coliseum Ideo
         captain: "Boosts ATK of Fighter characters by 2.5x if they have a matching orb.",
         special: "Increases damage received by 2x for 2 turns, deals 15x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Destruction Cannon: Hidden Bullet"
+        specialName: "Destruction Cannon: Hidden Bullet",
     },
     1487: {//Coliseum Ideo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Fighter characters by 3x if they have a matching orb.",
         special: "Increases damage received by 2x for 2 turns, deals 15x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Fighter characters by 2x for 1 turn",
         specialNotes: "#{orb : 2x}",
-        specialName: "Destruction Cannon: Hidden Bullet"
+        specialName: "Destruction Cannon: Hidden Bullet",
     },
     1488: {//Coliseum Don Krieg
         captain: "Boosts ATK of Driven characters by 1.5x, reduces damage received by 20%",
         special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Rate Up and Orb Rate Down Buffs",
-        specialName: "Great Battle Spear"
+        specialName: "Great Battle Spear",
     },
     1489: {//Coliseum Don Krieg
         captain: "Boosts ATK of Driven characters by 2x, reduces damage received by 20%",
         special: "Deals 20x character's ATK in STR damage to one enemy and removes any Orb Rate Up and Orb Rate Down Buffs",
-        specialName: "Great Battle Spear"
+        specialName: "Great Battle Spear",
     },
     1490: {//Coliseum Mr. 5
         captain: "Boosts ATK by 1.75x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
-        specialName: "Explosion Blocking Escape"
+        specialName: "Explosion Blocking Escape",
     },
     1491: {//Coliseum Mr. 5
         captain: "Boosts ATK by 2x following a chain of Good > Good > Great hits",
         special: "Changes orbs on the top row to [BOMB], reduces Bind duration by 2 turns, and reduces the defense of all enemies by 50% for one turn.",
-        specialName: "Explosion Blocking Escape"
+        specialName: "Explosion Blocking Escape",
     },
     1492: {//6+ Sabo
         captain: "Boosts HP and RCV of all characters by 1.2x, boosts ATK of Free Spirit characters by 2.75x",
@@ -9837,282 +9841,282 @@ window.details = {
         special: [
             {
                 "description": "Boosts ATK of Free Spirit characters by 1.5x for 1 turn. If during that turn you score 5 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ 18, 12 ]
+                "cooldown": [ 18, 12 ],
             },
             {
                 "description": "Boosts ATK of Free Spirit characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of Free Spirit characters by 2x in the following turn.",
-                "cooldown": [ 23, 17 ]
-            }
+                "cooldown": [ 23, 17 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Reborn - Fire"
+        specialName: "Reborn - Fire",
     },
     1493: {//STR Fishman Outlaw
         captain: "Boosts ATK of [STR] characters by 1.5x",
         special: "Deals 5 hits of random typeless damage to random enemies",
         specialNotes: "#{randomHits : 5}",
-        specialName: "Random Light Blows"
+        specialName: "Random Light Blows",
     },
     1494: {//QCK Fishman Outlaw
         captain: "Boosts ATK of [QCK] characters by 1.5x",
         special: "Locks captain's orb for 1 turn",
-        specialName: "Captain Slot Hold: Light"
+        specialName: "Captain Slot Hold: Light",
     },
     1495: {//DEX Fishman Outlaw
         captain: "Boosts ATK of [DEX] characters by 1.5x",
         special: "Reduces Silence duration by 1 turn",
         specialNotes: "#{silence}",
-        specialName: "Special Seal Recovery: Light"
+        specialName: "Special Seal Recovery: Light",
     },
     1496: {//INT Fishman Outlaw
         captain: "Boosts ATK of Powerhouse characters by 1.5x",
         special: "Reduces Despair duration by 2 turns",
-        specialName: "Captain Soul Recovery"
+        specialName: "Captain Soul Recovery",
     },
     1497: {//PSY Fishman Outlaw
         captain: "Boosts ATK of Shooter characters by 1.5x",
         special: "Boosts own ATK by 1.5x for 1 turn",
-        specialName: "Light Attack Boost"
+        specialName: "Light Attack Boost",
     },
     1498: {//STR Fishman Guard
         captain: "Boosts ATK, HP and RCV of [STR] characters by 1.2x",
         special: "Changes Captain's orb into [STR]",
-        specialName: "Captain Slot Change - [STR]"
+        specialName: "Captain Slot Change - [STR]",
     },
     1499: {//QCK Fishman Guard
         captain: "Boosts ATK, HP and RCV of [QCK] characters by 1.2x",
         special: "Changes Captain's [BLOCK] orbs into Matching orbs",
-        specialName: "Captain [BLOCK] Slot Change - Matching"
+        specialName: "Captain [BLOCK] Slot Change - Matching",
     },
     1500: {//DEX Fishman Guard
         captain: "Boosts ATK, HP and RCV of [DEX] characters by 1.2x",
         special: "Recovers 2000 HP",
-        specialName: "First Aid"
+        specialName: "First Aid",
     },
     1501: {//Caribou
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of characters with cost 15 or less by 2x",
         special: "Reduces crew's current HP by 50%, boosts ATK of all characters by 1.3x for 1 turn",
-        specialName: "Conviction of God's Will"
+        specialName: "Conviction of God's Will",
     },
     1502: {//Coribou
         captain: "Reduces damage received from [PSY] and [INT] enemies by 30%",
         special: "For Driven characters, randomizes non-matching orbs",
-        specialName: "Confession Burial"
+        specialName: "Confession Burial",
     },
     1503: {//Hammond
         captain: "Boosts ATK of Powerhouse characters proportionally to the crew's current HP",
         captainNotes: "#{captainProportional : lower : ??? + ??? * (1 - (remaining HP) / (total HP)) : ??? : 2.25}",
         special: "Changes own orb into [QCK] and changes adjacent orbs into [EMPTY] orbs",
-        specialName: "Absurd Invitation"
+        specialName: "Absurd Invitation",
     },
     1504: {//Vander Decken IX
         captain: "Boosts ATK of Driven characters by 2x. After scoring 3 Perfects in a row, boosts ATK of Driven characters by 2.4x instead.",
         special: "Changes the orbs in the middle row into [EMPTY] orbs and deals 20x character's ATK as [DEX] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Inescapable Pursuit"
+        specialName: "Inescapable Pursuit",
     },
     1505: {//Hody Jones
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.25x if HP is below 30% at the start of the turn",
         special: "Deals 15x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
-        specialName: "Shark Arrows"
+        specialName: "Shark Arrows",
     },
     1506: {//Hody Jones
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Powerhouse characters by 2.5x if HP is below 30% at the start of the turn, 2.25x otherwise",
         special: "Deals 15x character's ATK in [STR] damage to all enemies that will ignore damage negating abilities and barriers, makes Perfects harder to hit for 1 turn, reduces crew's current HP by 90%, boosts own ATK by 2.25x for 1 turn.",
-        specialName: "Shark Arrows"
+        specialName: "Shark Arrows",
     },
     1507: {//White Day Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.3x",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 1.69x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
         sailor: "Boosts base ATK of all characters by 15",
-        specialName: "Diable Jambe - Concassé Baked"
+        specialName: "Diable Jambe - Concassé Baked",
     },
     1508: {//White Day Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.5x. Recovers 2x character's RCV in HP at the end of each turn",
         captainNotes: "Boosts stack, so a Fighter/Powerhouse character gets 2.25x ATK",
         special: "Deals 15x character's ATK in [QCK] damage to one enemy, boosts ATK of Fighter characters by 1.75x for 1 turn",
         sailor: "Boosts base ATK of all characters by 15",
-        specialName: "Diable Jambe - Concassé Baked"
+        specialName: "Diable Jambe - Concassé Baked",
     },
     1509: {//Haruta
         captain: "Reduces cooldown of Slasher and Cerebral specials by 1 turn at the start of the fight. Boosts ATK of [INT] characters by 2x.",
         special: "Deals 12x character's ATK in INT damage to one enemy and reduces damage received from PSY enemies by 80%.",
         specialName: "Honorable Blade",
         sailor: "Reduces Silence duration against this unit by 2 turns",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
     },
     1510: {//Speed Jiru
         captain: "Boosts ATK of Driven and Striker characters by 2x",
         special: "Deals 12,500 fixed damage to one enemy",
         specialName: "Acceleration Lance",
-        sailor: "When HP is above 70% at the start of the turn, boosts ATK of Striker characters by 20"
+        sailor: "When HP is above 70% at the start of the turn, boosts ATK of Striker characters by 20",
     },
     1511: {//Atmos
         captain: "Boosts ATK of PSY characters by 2x",
         special: "Reduces Despair duration by 3 turns, boosts own ATK by 1.5x for 1 turn",
         specialName: "Buffalo Roar",
-        sailor: "Boosts base ATK of Powerhouse characters by 20 if your captain is a Powerhouse character"
+        sailor: "Boosts base ATK of Powerhouse characters by 20 if your captain is a Powerhouse character",
     },
     1512: {//Kingdew
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
         special: "Removes Poison, boosts ATK of Powerhouse characters by 1.5x for 1 turn if HP is below 30% when the special is activated",
         specialName: "Enlightened Spirit",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character"
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit if your captain is a Powerhouse character",
     },
     1513: {//Anniversary Sanji
         captain: "Boosts ATK of Fighter characters by 1.75x and RCV of Powerhouse characters by 1.2x",
         special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Unfamiliar Escort"
+        specialName: "Unfamiliar Escort",
     },
     1514: {//Anniversary Sanji
         captain: "Boosts ATK of Fighter characters by 2.5x and RCV of Powerhouse characters by 1.2x",
         special: "Randomizes all orbs, including [BLOCK] orbs, reduces Special Cooldown of 1 character by 1 turn",
-        specialName: "Unfamiliar Escort"
+        specialName: "Unfamiliar Escort",
     },
     1515: {//White Day Brook
         captain: "Boosts ATK of [STR] and [QCK] characters by 1.5x",
         special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
         specialName: "Three-Verse Humming: Arrow-Notch Slash - Hail",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
     1516: {//White Day Brook
         captain: "Boosts ATK of [STR] and [QCK] characters by 2x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Cuts the current HP of each enemy by 10% and makes [RCV] orbs \"beneficial\" for all characters for 1 turn",
         specialName: "Three-Verse Humming: Arrow-Notch Slash - Hail",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
     1517: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet"
+        specialName: "Spring Hopper - Bullet",
     },
     1518: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet"
+        specialName: "Spring Hopper - Bullet",
     },
     1519: {//Dadan
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of Slasher characters by 1.5x",
         special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
-        specialName: "Break by the Fireplace"
+        specialName: "Break by the Fireplace",
     },
     1520: {//Dadan
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of Slasher characters by 2x",
         special: "Cuts the current HP of one enemy by 10%, if HP is full at the time the special was activated, changes top row orbs into matching orbs",
-        specialName: "Break by the Fireplace"
+        specialName: "Break by the Fireplace",
     },
     1521: {//Dogra
         captain: "Boosts ATK of [QCK] and Slasher characters by 1.2x",
         captainNotes: "The bonus is cumulative. [QCK] Slasher characters get a 1.44x bonus.",
         special: "Reduces Despair duration by 1 turn, recovers 1000 HP at the end of each turn for 2 turns",
-        specialName: "Affectionate Circumstances"
+        specialName: "Affectionate Circumstances",
     },
     1522: {//Ace
         captain: "Boosts ATK of [DEX] characters by 1.75x and their HP by 1.2x",
         special: "Removes blindness, boosts own ATK by 1.75x for 1 turn",
-        specialName: "Demon's Temper"
+        specialName: "Demon's Temper",
     },
     1523: {//Spring Chopper
         captain: "Boosts ATK of [PSY] characters by 1.75x and recovers 1,000 HP at end of each turn",
         special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
-        specialName: "The Life Risked for the \"Sakura\" Miracle",
-        sailor: "Boosts amount healed from [RCV] orbs by 124 each"
+        specialName: "The Life Risked for the 'Sakura' Miracle",
+        sailor: "Boosts amount healed from [RCV] orbs by 124 each",
     },
     1524: {//Spring Chopper
         captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 1,224 HP at end of each turn",
         special: "Changes top row orbs into matching orbs, changes any other [BLOCK] or Badly Matching orbs into [G] orbs",
-        specialName: "The Life Risked for the \"Sakura\" Miracle",
-        sailor: "Boosts amount healed from [RCV] orbs by 124 each"
+        specialName: "The Life Risked for the 'Sakura' Miracle",
+        sailor: "Boosts amount healed from [RCV] orbs by 124 each",
     },
     1525: {//Sulieman
         captain: "Boosts ATK of Slasher characters by 3.25x, reduces his own ATK multiplier by 0.0625x at the end of each turn until it is 2x",
         special: "Deals 3 hits of random typeless damage to random enemies, delays all enemies for 1 turn, boosts ATK against delayed enemies by 1.3x for 2 turns",
         specialNotes: "#{randomHits : 3}<br>#{random : 50,000 : 150,000 : per hit}",
-        specialName: "Sorrowful Execution"
+        specialName: "Sorrowful Execution",
     },
     1526: {//Arlong
         captain: "Boosts ATK of [INT] characters by 1.75x",
         special: [
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.5x for 1 turn",
-                "cooldown": [ 16, 7 ]
+                "cooldown": [ 16, 7 ],
             },
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.75x for 1 turn",
-                "cooldown": [ 21, 12 ]
-            }
+                "cooldown": [ 21, 12 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Just \"Water Play\""
+        specialName: "Just 'Water Play'",
     },
     1527: {//Arlong
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight. Boosts ATK of [INT] characters by 2x",
         special: [
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.5x for 1 turn",
-                "cooldown": [ 16, 7 ]
+                "cooldown": [ 16, 7 ],
             },
             {
                 "description": "Reduces Special Cooldown of your top row by 1 turn, boosts ATK of the characters in the top row by 1.75x for 1 turn",
-                "cooldown": [ 21, 12 ]
-            }
+                "cooldown": [ 21, 12 ],
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Just \"Water Play\""
+        specialName: "Just 'Water Play'",
     },
     1528: {//Blenheim
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
         special: "Reduces Despair duration by 2 turns, makes STR, DEX, and QCK orbs \"beneficial\" to Powerhouse characters for 1 turn if HP is below 30% at the start of the turn",
         sailor: "Makes [TND] orbs \"beneficial\" for this unit",
-        specialName: "Australian Army Aid Blade"
+        specialName: "Australian Army Aid Blade",
     },
     1529: {//Cavendish
         captain: "Boosts ATK of all characters by 1.5x, but boosts his OWN attack by 3x",
         special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
         sailor: "Reduces ATK of all characters by .5x if your captain is a [STR] or [QCK] character",
-        specialName: "Blue Bird Sword"
+        specialName: "Blue Bird Sword",
     },
     1530: {//Cavendish
         captain: "Boosts ATK of all characters by 1.75x, but boosts his OWN attack by 3.5x",
         special: "For Slasher characters, if HP is above 50% at the time the special was activated, amplifies the effects of orbs by 2.25x for 1 turn, 2x otherwise",
         sailor: "Reduces ATK of all characters by .5x if your captain is a [STR] or [QCK] character",
-        specialName: "Blue Bird Sword"
+        specialName: "Blue Bird Sword",
     },
     1531: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
         special: [
             {
                 "description": "Delays all enemies for 3 turns",
-                "cooldown": [ 13, 10 ]
+                "cooldown": [ 13, 10 ],
             },
             {
                 "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
-                "cooldown": [ 18, 15 ]
+                "cooldown": [ 18, 15 ],
             },
             {
                 "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
-                "cooldown": [ 24, 21 ]
-            }
+                "cooldown": [ 24, 21 ],
+            },
         ],
         specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
-        specialName: "Long-Range Attack: Bagworm"
+        specialName: "Long-Range Attack: Bagworm",
     },
     1532: {//Legend Usopp
         captain: "Boosts ATK of all characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to all characters.",
         special: [
             {
                 "description": "Delays all enemies for 3 turns",
-                "cooldown": [ 13, 10 ]
+                "cooldown": [ 13, 10 ],
             },
             {
                 "description": "Delays all enemies for 4 turns, adds 0.2x to Chain multiplier for 4 turns",
-                "cooldown": [ 18, 15 ]
+                "cooldown": [ 18, 15 ],
             },
             {
                 "description": "Delays all enemies for 5 turns, adds 0.3x to Chain multiplier for 4 turns",
-                "cooldown": [ 24, 21 ]
-            }
+                "cooldown": [ 24, 21 ],
+            },
         ],
         specialNotes: "#{stages}",
         sailor: "Completely resists Blindness",
@@ -10147,7 +10151,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base RCV by 25" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Barrier Penetration" }
+            { "description": "Aquire Potential 3: Barrier Penetration" },
         ],
         potential: [
             {
@@ -10179,70 +10183,70 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 50%",
                     "Level 5: This character's attack will ignore barriers if HP is above 30%"
                 ]
-            }
+            },
         ]
     },
     1533: {//Rayleigh
         captain: "Boosts ATK of [QCK] characters by 2x and their HP by 1.2x at the start of the chain, by 2.5x after the 4th Perfect in a row.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "The Teacher's Final Ordeal"
+        specialName: "The Teacher's Final Ordeal",
     },
     1534: {//Rayleigh
         captain: "Boosts ATK of [QCK] characters by 2.5x and their HP by 1.2x at the start of the chain, by 3x after the 4th Perfect in a row.",
         special: "Changes all orbs, including [BLOCK] orbs, to [QCK] orbs",
         sailor: "Makes [STR], [INT], and [DEX] orbs \"beneficial\" for this unit",
-        specialName: "The Teacher's Final Ordeal"
+        specialName: "The Teacher's Final Ordeal",
     },
     1535: {//Duval
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of [PSY] characters by 2.5x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Prideful Memories"
+        specialName: "Prideful Memories",
     },
     1536: {//Duval
         captain: "Reduces cooldown of all specials by 3 turns at the start of the fight, boosts ATK of [PSY] characters by 3x if they have matching orbs",
         special: "Reduces damage received by 50% for 1 turn, boosts ATK of PSY characters by 1.75x for 1 turn",
         sailor: "Makes [INT] orbs \"beneficial\" for [PSY] characters",
-        specialName: "Prideful Memories"
+        specialName: "Prideful Memories",
     },
     1537: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2x and boosts HP of Shooter and Striker characters by 1.2x",
         special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts base HP of STR characters by 150",
-        specialName: "Greenstone Threat"
+        specialName: "Greenstone Threat",
     },
     1538: {//Heracles'n
         captain: "Boosts ATK of [STR] characters by 2.5x and boosts HP of Shooter and Striker characters by 1.25x",
         special: "Cuts the current HP of each enemy by 20%, changes right column [STR], [QCK], [DEX], [PSY] and [INT] orbs into Matching orbs for Shooter and Striker characters",
         sailor: "Boosts base HP of STR characters by 150",
-        specialName: "Greenstone Threat"
+        specialName: "Greenstone Threat",
     },
     1539: {//Perona
         captain: "Boosts ATK and RCV of characters with cost 20 or less by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts base ATK of INT characters by 50",
-        specialName: "Negative Hollow: You're All Rotten Imbeciles"
+        specialName: "Negative Hollow: You're All Rotten Imbeciles",
     },
     1540: {//Perona
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their RCV by 1.5x",
         special: "Reduces damage received by 90% for 1 turn, reduces the defense of all enemies by 90% for 1 turn, reduces enemy's Threshold Damage Reduction and Percent Damage Reduction duration by 2 turns",
         sailor: "Boosts base ATK of INT characters by 50",
-        specialName: "Negative Hollow: You're All Rotten Imbeciles"
+        specialName: "Negative Hollow: You're All Rotten Imbeciles",
     },
     1541: {//Elizabeth
         captain: "Boosts ATK by 2x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 1}",
-        specialName: "Soft and Gentle Fluffy Kisses"
+        specialName: "Soft and Gentle Fluffy Kisses",
     },
     1542: {//Elizabeth
         captain: "Boosts RCV and HP by 1.2x, boosts ATK by 2.5x following a chain of [STR] > [DEX] > [QCK] attacks no lower than Good",
         special: "Recovers 13x character's RCV in HP, adds .5x to Chain multiplier, and reduces the defense of all enemies by 100% for 1 turn",
         sailor: "Restores her own special by 2 turns when it is rewinded",
         sailorNotes: "#{rewind : 1}",
-        specialName: "Soft and Gentle Fluffy Kisses"
+        specialName: "Soft and Gentle Fluffy Kisses",
     },
     1543: {//6+ Usopp
         captain: "Boosts ATK of Shooter characters by 1.5x if HP is below 50% or by 1.75x if HP is below 30% at the start of the turn. Makes [STR], [DEX], [QCK], [PSY], [INT], [RCV], and [TND] orbs \"beneficial\" to Shooter characters. At the beginning of each Stage, increases the Attack Timer of all enemies by 1 turn",
@@ -10280,7 +10284,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base RCV by 25" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Barrier Penetration" }
+            { "description": "Aquire Potential 3: Barrier Penetration" },
         ],
         potential: [
             {
@@ -10312,272 +10316,272 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 50%",
                     "Level 5: This character's attack will ignore barriers if HP is above 30%"
                 ]
-            }
+            },
         ]
     },
     1544: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 1.75x and heals for .3x her RCV at the end of the turn each time you hit a Perfect",
         special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Bean Paste under the Petal Snow"
+        specialName: "Bean Paste under the Petal Snow",
     },
     1545: {//Sakura Koala
         captain: "Boosts ATK of Fighter characters by 2.25x and heals for .5x her RCV at the end of the turn each time you hit a Perfect",
         special: "Changes Captain orb into matching and boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Bean Paste under the Petal Snow"
+        specialName: "Bean Paste under the Petal Snow",
     },
     1546: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 1.5x and boosts HP of Free Spirit characters by 1.2x",
         special: "Boosts ATK of Free Spirit characters by 1.5x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
-        specialName: "Dawn of A Big Star"
+        specialName: "Dawn of A Big Star",
     },
     1547: {//Soul King Brook
         captain: "Boosts ATK of [QCK] characters by 2x and boosts HP of Free Spirit characters by 1.3x",
         special: "Boosts ATK of Free Spirit characters by 1.5x and makes Badly Matching and [BLOCK] orbs not reduce damage for 1 turn",
-        specialName: "Dawn of A Big Star"
+        specialName: "Dawn of A Big Star",
     },
     1548: {//Soul King Managers
         captain: "Boosts ATK of Driven characters by 1.5x",
         special: "Delays all enemies for 1 turn. Adds .2x to Chain multiplier for 1 turn",
-        specialName: "Former Thief's Box Office"
+        specialName: "Former Thief's Box Office",
     },
     1549: {//5+ Robin
         captain: "Boosts ATK of [PSY] characters by 2.25x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Reduces Bind, Despair and Silence duration by 3 turns, and reduces Special Cooldown of all characters by 1 turn",
         specialName: "Mil Fluer: Campo de Flores",
-        specialNotes: "#{silence}"
+        specialNotes: "#{silence}",
     },
     1550: {//5+ Franky
         captain: "Boosts ATK of [INT] characters by 2.5x, reduces damage received by 10%",
         special: "Deals 35x character's ATK in [INT] damage to all enemies. Changes [TND] and [RCV] orbs on Shooter and Free Spirit characters into Matching Orbs.",
-        specialName: "Franky's Rocket Launcher"
+        specialName: "Franky's Rocket Launcher",
     },
     1551: {//5+ Brook
         captain: "Boosts ATK of Free Spirit characters by 2.5x and recovers 430 HP at end of each turn",
         special: "Delays all enemies for 1 turn and locks all orbs for 1 turn",
-        specialName: "Song of Scratches: Blizzard Slash"
+        specialName: "Song of Scratches: Blizzard Slash",
     },
     1552: {//Coliseum Hajrudin
         captain: "Boosts ATK of characters with 40 cost by 2.5x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
-        specialName: "Thunder Giant"
+        specialName: "Thunder Giant",
     },
     1553: {//Coliseum Hajrudin
         captain: "Boosts ATK of characters with 40 cost by 2.75x",
         special: "Deals 300,000 Fixed damage to one enemy, boosts ATK of characters with 40 cost by 1.75x, reduces enemy Barrier duration by 1 turn",
         specialName: "Thunder Giant",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1554: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2x",
         special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
-        specialName: "Pure Body and Soul"
+        specialName: "Pure Body and Soul",
     },
     1555: {//Coliseum Ryuma
         captain: "Boosts ATK of [DEX] characters by 2.25x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Boosts ATK of [DEX] characters and amplifies the effect of orbs for [DEX] characters by 1.35x for 1 turn",
-        specialName: "Pure Body and Soul"
+        specialName: "Pure Body and Soul",
     },
     1556: {//Wadatsumi
         captain: "Boosts HP of STR characters by 2x",
         special: "If the HP of the enemy with the highest HP percentage is above 3,000,000 HP, boosts own ATK by 2x for 1 turn",
-        specialName: "Sailboat Sinking Fist"
+        specialName: "Sailboat Sinking Fist",
     },
     1557: {//Zeo
         captain: "Boosts ATK of Striker characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Makes Badly Matching and [BLOCK] orbs not reduce damage for 2 turns",
-        specialName: "Super Sole Headbutt"
+        specialName: "Super Sole Headbutt",
     },
     1558: {//Ikaros
         captain: "Boosts ATK of Shooter characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Cuts the current HP of each enemy by 15%",
-        specialName: "Stamping Press"
+        specialName: "Stamping Press",
     },
     1559: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Reduces crew's HP by 50%, deals 55x ATK in Typeless damage to all enemies",
-        specialName: "Disorderly Drunken Frenzy Killing"
+        specialName: "Disorderly Drunken Frenzy Killing",
     },
     1560: {//Daruma
         captain: "Boosts ATK of Fighter characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Empties all slots including those with [BLOCK] orbs",
-        specialName: "Daruma Drop"
+        specialName: "Daruma Drop",
     },
     1561: {//Dosun
         captain: "Boosts ATK of [INT] characters by 3x, reduces own ATK multiplier by 0.1x at the end of each turn, reduces crew's current HP by 10% at the end of each turn",
         special: "Boosts ATK of Striker characters by 1.5x for 1 turn, deals 25x character's ATK in [INT] damage to one enemy",
-        specialName: "Explosive Nail Hammer"
+        specialName: "Explosive Nail Hammer",
     },
     1562: {//Hody Jones
         captain: "Boosts ATK of Powerhouse characters by 3.5x, reduces own ATK multiplier by 0.1x at the end of each turn until it is 1.5x, reduces crew's current HP by 10% at the end of each turn",
         special: "Deals 60x character's ATK in [QCK] damage to one enemy, increases damage received by 2x for 2 turns, boosts ATK of Powerhouse characters by 1.75x for 1 turn",
-        specialName: "Drugs From Heaven"
+        specialName: "Drugs From Heaven",
     },
     1563: {//Elizabello
         captain: "Boosts ATK of Fighter and Powerhouse characters by 1.75x at the start of the chain and by 2.1875x after the 5th Perfect in a row",
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
-                "cooldown": [ 17, 9 ]
+                "cooldown": [ 17, 9 ],
             },
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 15x character's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 24, 16 ]
-            }
+                "cooldown": [ 24, 16 ],
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
-        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack"
+        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack",
     },
     1564: {//Elizabello
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x at the start of the chain and by 3x after the 5th Perfect in a row",
         special: [
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 3x character's ATK in typeless damage to random enemies",
-                "cooldown": [ 17, 9 ]
+                "cooldown": [ 17, 9 ],
             },
             {
                 "description": "Changes own orb into [STR], deals 10 hits of 15x character's ATK in typeless damage to random enemies and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 24, 16 ]
-            }
+                "cooldown": [ 24, 16 ],
+            },
         ],
         specialNotes: "#{stages}",
         specialName: "Battle Royale Rush",
-        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack"
+        sailor: "Boosts own base ATK by 350 if this character is the last in the chain to attack",
     },
     1565: {//Dagama
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 1.75x",
         special: "Reduces Special Cooldown of all characters by 1 turn and reduces crew's current HP by 10%",
-        specialName: "War of Mislead Order"
+        specialName: "War of Mislead Order",
     },
     1566: {//Dagama
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 1 turn and reduces crew's current HP by 10%",
-        specialName: "War of Mislead Order"
+        specialName: "War of Mislead Order",
     },
     1567: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
         special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "The Princess' Principle"
+        specialName: "The Princess' Principle",
     },
     1568: {//Kid Boa
         captain: "Boosts ATK and RCV of [QCK] characters by 2x",
         special: "Recovers 13x character's RCV in HP, amplifies the effect of orbs by 1.5x for 3 turns",
-        specialName: "The Princess' Principle"
+        specialName: "The Princess' Principle",
     },
     1569: {//Anniversary Law
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
         special: "Randomizes all non-matching orbs, including [BLOCK] orbs and switches orbs between slots three times",
-        specialName: "ROOM Shambles・Junction"
+        specialName: "ROOM Shambles・Junction",
     },
     1570: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
         special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. Adds 80x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 80x}",
-        specialName: "King Sword Shine"
+        specialName: "King Sword Shine",
     },
     1571: {//Inuarashi
         captain: "Boosts ATK of Cerebral characters by 2.75x and chain by 1.5x if HP is below 30% at the start of the turn, boosts ATK of Cerebral characters by 2.5x otherwise",
         special: "Reduces crew's current HP by 80%, deals 60x character's ATK in STR damage to one enemy. Adds 80x character's ATK as Additional Typeless Damage for 1 turn",
         specialNotes: "#{additionalDamage : 80x}",
-        specialName: "King Sword Shine"
+        specialName: "King Sword Shine",
     },
     1572: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.2x",
         special: "Randomly changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
-        specialName: "Ruler's Aide Flight"
+        specialName: "Ruler's Aide Flight",
     },
     1573: {//Wanda
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.2x",
         special: "Randomly changes all orbs, including [BLOCK] orbs into [STR], [DEX], [QCK], [INT], or [PSY] orbs, boosts ATK of Cerebral characters by 1.75x for 3 turns",
         sailor: "Reduces Paralysis duration by 1 turn",
-        specialName: "Ruler's Aide Flight"
+        specialName: "Ruler's Aide Flight",
     },
     1574: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.25x",
         special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below 30% at the start of the turn, boosts own ATK by 200",
-        specialName: "Dash - Dive - Destroy"
+        specialName: "Dash - Dive - Destroy",
     },
     1575: {//Sicilian
         captain: "Boosts ATK of [INT] characters by 2.5x and their HP by 1.25x",
         special: "Delays all enemies for 1 turn, deals 25x character's ATK [INT] damage to all enemies, and changes [STR], [DEX], [QCK], [INT], or [PSY] orbs on Cerebral characters into Matching orbs.",
         sailor: "When HP is below 30% at the start of the turn, boosts own ATK by 200",
-        specialName: "Dash - Dive - Destroy"
+        specialName: "Dash - Dive - Destroy",
     },
     1576: {//Kin'emon
         captain: "Boosts ATK by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. This will not override other [BLOCK] orbs.",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
-        specialName: "Flaming Flash"
+        specialName: "Flaming Flash",
     },
     1577: {//Kin'emon
         captain: "Recovers 3x character's RCV in HP at the end of each turn. Boosts ATK by 3.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 60x character's ATK in typeless damage to all enemies, and changes all orbs on all characters into Kinemon's orb.",
         specialNotes: "Upon activating the special, all orbs will be changed to the orb Kinemon has, including [RAINBOW] and [BLOCK] orbs. This will not override other [BLOCK] orbs.",
         sailor: "Makes [STR] and [QCK] orbs \"beneficial\" for this unit",
-        specialName: "Flaming Flash"
+        specialName: "Flaming Flash",
     },
     1578: {//Momonosuke
         captain: "Protects from defeat as long as HP is above 50%",
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 8, 3 ]
+                "cooldown": [ 8, 3 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 11, 6 ]
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 14, 9 ]
-            }
+                "cooldown": [ 14, 9 ],
+            },
         ],
         specialNotes: "#{stages}",
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
-        specialName: "Miraculous Flying Dragon"
+        specialName: "Miraculous Flying Dragon",
     },
     1579: {//Momonosuke
         captain: "Boosts ATK, HP and RCV of all characters by 1.25x, protects from defeat as long as HP is above 50%",
         special: [
             {
                 "description": "Adds .2x to Chain multiplier for 1 turn",
-                "cooldown": [ 8, 3 ]
+                "cooldown": [ 8, 3 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .3x to Chain multiplier for 1 turn",
-                "cooldown": [ 11, 6 ]
+                "cooldown": [ 11, 6 ],
             },
             {
                 "description": "Switches orbs between slots once, and adds .5x to Chain multiplier for 1 turn",
-                "cooldown": [ 14, 9 ]
-            }
+                "cooldown": [ 14, 9 ],
+            },
         ],
         specialNotes: "#{stages}",
         sailor: "Makes [STR], [QCK], [DEX], and [INT] orbs \"beneficial\" for this unit",
-        specialName: "Miraculous Flying Dragon"
+        specialName: "Miraculous Flying Dragon",
     },
     1580: {//Fortnight Law
         captain: "Boosts ATK of Free Spirit characters by 1.5x and boosts RCV of DEX characters by 1.2x",
         special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "ROOM Tact"
+        specialName: "ROOM Tact",
     },
     1581: {//Fortnight Law
         captain: "Boosts ATK of Free Spirit characters by 2x and boosts RCV of DEX characters by 1.5x",
         special: "Changes orbs in right column to [DEX], [PSY], [INT] from top to bottom, switches orbs between slots twice, amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "ROOM Tact"
+        specialName: "ROOM Tact",
     },
     1582: {//Fortnight Monet
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
         special: "Recovers 10x character's RCV in HP. Boosts ATK and RCV of Cerebral characters by 1.5x for 1 turn",
-        specialName: "Observing within the Snow Storm"
+        specialName: "Observing within the Snow Storm",
     },
     1583: {//Coliseum Orlumbus
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Locks all orbs for 1 turn. If there are 4 enemies or more on the stage, amplifies the effect of orbs for Striker characters by 2x for 1 turn, otherwise amplifies the effect of orbs for Striker characters by 1.5x for 1 turn",
-        specialName: "Admiral Hug"
+        specialName: "Admiral Hug",
     },
     1584: {//Coliseum Orlumbus
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
@@ -10598,7 +10602,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 1: Makes [TND] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base HP by 60" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Critical Hit" }
+            { "description": "Aquire Potential 2: Critical Hit" },
         ],
         potential: [
             {
@@ -10620,197 +10624,197 @@ window.details = {
                     "Level 4: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage",
                     "Level 5: If you hit a perfect with this character, there is a ??% chance to deal ?% of this character's attack in extra damage"
                 ]
-            }
+            },
         ]
     },
     1585: {//Coliseum Helmeppo
         captain: "Boosts ATK and RCV of Slasher and Driven characters by 1.5x",
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
-        specialName: "Firey Morale"
+        specialName: "Firey Morale",
     },
     1586: {//Coliseum Helmeppo
         captain: "Boosts ATK of Slasher and Driven characters by 2x and their RCV by 1.5x",
         special: "If HP is below 5,000 when the special is activated, boosts ATK of Driven and Slasher characters by 1.75x for 1 turn and recovers 10x character's RCV in HP",
-        specialName: "Firey Morale"
+        specialName: "Firey Morale",
     },
     1587: {//Legend Sanji
         captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Sky Walks into the air for 1 turn, preventing all debuffs to himself. This does not remove the his own Captain boost while he is unable to attack. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
         captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
-        specialName: "Hell Memories"
+        specialName: "Hell Memories",
     },
     1588: {//Legend Sanji
         captain: "Boosts ATK of all characters by 2.5x and their HP by 1.3x <br> <b>Action:</b> Sanji Sky Walks into the air for 1 turn, preventing all debuffs to himself. This does not remove the his own Captain boost while he is unable to attack. (Including, but not limited to, Bind, Despair, and Silence) Next turn, boosts own ATK by 6.25x instead",
         captainNotes: "Multiple Sanjis can Sky Walk at the same time. Even while Sky Walking, will still boost all characters by 2.5x. Sky Walk is not a type boost, and will stack with other boosts",
         special: "Deals 100,000 fixed damage to all enemies. Changes [BLOCK], [TND], adjacent orbs, and own orb into Matching orbs. Boosts own attack by 2x for 1 turn",
         sailor: "Makes [RCV] orbs \"beneficial\" for all characters",
-        specialName: "Hell Memories"
+        specialName: "Hell Memories",
     },
     1589: {//Anniversary Shanks
         captain: "Boosts Chain Multiplier by 3x",
         special: "Recovers 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
-        specialName: "Sharing a Cup Filled with Emotions"
+        specialName: "Sharing a Cup Filled with Emotions",
     },
     1590: {//Anniversary Shanks
         captain: "Boosts Chain Multiplier by 3.5x, Boosts HP and RCV of all characters by 1.2x",
         special: "Recovers 50% of crew's MAX HP, changes bottom row orbs into matching orbs",
-        specialName: "Sharing a Cup Filled with Emotions"
+        specialName: "Sharing a Cup Filled with Emotions",
     },	
     1591: {//Anniversary Boa
         captain: "Boosts ATK and RCV of Fighter and Free Spirit characters by 1.5x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit and Fighter characters by 1.75x for 1 turn",
-        specialName: "Immoral Gaze"
+        specialName: "Immoral Gaze",
     },
     1592: {//Anniversary Boa
         captain: "Boosts ATK of Fighter and Free Spirit characters by 2.25x and their RCV by 1.75x",
         special: "Recovers 3,000 HP and boosts ATK of Free Spirit and Fighter characters by 1.75x for 1 turn",
-        specialName: "Immoral Gaze"
+        specialName: "Immoral Gaze",
     },
     1593: {//Gear 4 Luffy
         captain: "Boosts ATK of Fighter characters by 2.5x. If you use \"King Kong Gun\" THIS LUFFY boosts ATK of Fighter characters by 4x instead for 3 turns and reduces damage taken by 56% for 3 turns.",
         special: [
             {
                 "description": "Deals 100x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter characters for 1 turn.  After 3 turns, Binds and Despairs himself for 7 turns.",
-                "cooldown": [ 13, 8 ]
+                "cooldown": [ 13, 8 ],
             },
             {
                 "description": "Deals 200x character's ATK in typeless damage to one enemy, and makes [STR], [DEX], [PSY], [INT], [TND], and [RCV] orbs \"beneficial\" for Fighter and Free Spirit characters for 3 turns. After 3 turns, Binds and Despairs himself for 7 turns.",
-                "cooldown": [ 18, 13 ]
-            }
+                "cooldown": [ 18, 13 ],
+            },
         ],
         specialNotes: "#{stages}",
         sailor: "Completely resists Paralysis on this character",
-        specialName: "King Kong Gun"
+        specialName: "King Kong Gun",
     },
     1594: {//Fujitora
         captain: "Cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Gravity Blade: Fierce Tiger"
+        specialName: "Gravity Blade: Fierce Tiger",
     },
     1595: {//Fujitora
         captain: "Boosts ATK of Powerhouse characters by 2.25x, and their HP by 1.2x, cuts the current HP of each enemy by 10% at the end of each turn",
         special: "Deals 50x character's ATK in [PSY] damage to all enemies that will ignore damage negating abilities and barriers, changes adjacent orbs into Matching Orbs, amplifies the effect of orbs for Powerhouse characters by 2x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Gravity Blade: Fierce Tiger"
+        specialName: "Gravity Blade: Fierce Tiger",
     },
     1596: {//Shirahoshi
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
-        specialName: "Great Dinner Buffet"
+        specialName: "Great Dinner Buffet",
     },
     1597: {//Shirahoshi
         captain: "Boosts ATK and RCV of [INT] characters by 1.75x",
         special: "Reduces Bind, Despair and Paralysis duration by 2 turns, reduces damage received by 70% for 1 turn",
-        specialName: "Great Dinner Buffet"
+        specialName: "Great Dinner Buffet",
     },
     1598: {//Ryuboshi
         captain: "Boosts HP of Powerhouse characters by 1.5x",
         special: "Boosts ATK of all characters by 1.2x and recovers 5x character's RCV in HP at the end of each turn for 3 turns",
-        specialName: "Musical Scale"
+        specialName: "Musical Scale",
     },
     1599: {//Manboshi
         captain: "Boosts ATK of Powerhouse characters by 1.75x",
         special: "Reduces the defense of all enemies by 50% for 1 turn. Changes own orb into [QCK]",
-        specialName: "Happy Dance"
+        specialName: "Happy Dance",
     },
     1600: {//3rd Anniversary Luffy
         captain: "Boosts ATK of [PSY] and [INT] characters by 2.5x",
         special: "Deals 20x character's ATK in [PSY] damage to one enemy, locks orbs for 1 turn, and amplifies the effect of orbs on [PSY] and [INT] characters by 1.75x for 1 turn",
-        specialName: "Right Leg Armament: Gum-Gum Battle Axe"
+        specialName: "Right Leg Armament: Gum-Gum Battle Axe",
     },
     1601: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
-        specialName: "Blood Stained \"Iron Wall\"",
-        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack"
+        specialName: "Blood Stained 'Iron Wall'",
+        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack",
     },
     1602: {//Power Creep Shiryu
         captain: "Boosts ATK of Slasher characters by 2x at the start of the chain, by 3x after the 3rd Perfect in a row",
         special: "Instantly defeats all enemies with HP equal to or below 75x character's ATK, removes Poison and reduces damage received by 50% for 3 turns,",
-        specialName: "Blood Stained \"Iron Wall\"",
-        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack"
+        specialName: "Blood Stained 'Iron Wall'",
+        sailor: "Boosts own base ATK by 100 if this character is the last in the chain to attack",
     },
     1603: {//McGuy
         captain: "Boosts ATK of [STR] characters by 2.25x and their RCV by 1.25x",
         special: "Delays all enemies for 2 turns",
-        specialName: "Numb Crosscut"
+        specialName: "Numb Crosscut",
     },
     1604: {//Training Forest Ace
         captain: "Boosts ATK of [STR] characters by 1.5x",
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
-        specialName: "Fist of the Demon's Child \"Fire\""
+        specialName: "Fist of the Demon's Child 'Fire'",
     },
     1605: {//Training Forest Ace
         captain: "Boosts ATK of [STR] characters by 2x and recovers 500 HP at end of each turn",
         special: "Randomizes all non-matching orbs and deals 13x character's ATK in [STR] damage to all enemies",
-        specialName: "Fist of the Demon's Child \"Fire\""
+        specialName: "Fist of the Demon's Child 'Fire'",
     },
     1606: {//Lafitte
         captain: "Boosts ATK and RCV of [PSY] characters by 1.75x",
         special: "Randomly shuffles non-matching orbs on Shooter characters, reduces enemies defense by 50% for 1 turn and delays all enemies for 1 turn",
-        specialName: "Deprivation of Self-Consciousness"
+        specialName: "Deprivation of Self-Consciousness",
     },
     1607: {//Van augur
         captain: "Boosts ATK of Shooters by 2x",
         special: "Deals 10x character's ATK in [DEX] damage to one enemy, locks orbs for 1 turn, and boosts ATK of Shooter characters by 1.5x for 1 turn",
-        specialName: "Painless Bullet"
+        specialName: "Painless Bullet",
     },
     1608: {//Doc Q
         captain: "Boosts ATK and RCV of [INT] characters by 1.5x",
         special: "For each enemy, has an extremely small chance to instantly defeat that enemy.",
         specialNotes: "#{instantKill : <1%}",
-        specialName: "Vile Fruit"
+        specialName: "Vile Fruit",
     },
     1609: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x. The exact boost is calculated as 2 + <HP recovered in the previous turn> * 0.000125 and maxes at 10k HP healed. This ignores your max HP, so it doesn't stop counting if you over-heal.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
-        specialName: "Heavy Thunder"
+        specialName: "Heavy Thunder",
     },
     1610: {//Legend Enel
         captain: "Reduces HP of all characters by 20%, boosts chances of getting [RCV] orbs, makes [RCV] orbs \"beneficial\" to all characters, boosts ATK of all characters proportionally to the amount healed in the last turn.",
         captainNotes: "The range of ATK boost is from 2x to 3.25x. The exact boost is calculated as 2 + <HP recovered in the previous turn> * 0.000125 and maxes at 10k HP healed. This ignores your max HP, so it doesn't stop counting if you over-heal.",
         special: "Deals typeless damage to all enemies equal to 10x how much excess healing done before the special is activated.",
         specialNotes: "The excess healing is counted from the last time the special is used and accumulates when you heal more than your maximum HP. For example, if you are at max HP, and you heal 1,000 HP, you will add 10k damage to the special. The amount of damage possible caps at 2,000,000 damage.",
-        specialName: "Heavy Thunder"
+        specialName: "Heavy Thunder",
     },
     1611: {//Kuma
         captain: "Boosts ATK of Shooter characters by 1.75x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
         specialNotes: "#{instantKill : 10%}",
         specialName: "Paw Paw Fruit: Scatter and Fly Away",
-        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn"
+        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
     1612: {//Kuma
         captain: "Boosts ATK of Shooter characters by 2.5x and their HP by 1.2x",
         special: "Reduces the duration of Bind and Despair by 7 turns.  Recovers 20% of crew's MAX HP, and has low chance to eliminate all enemies",
         specialNotes: "#{instantKill : 10%}",
         specialName: "Paw Paw Fruit: Scatter and Fly Away",
-        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn"
+        sailor: "If Kuma has a [PSY] orb, and you hit a Perfect with him, keep his [PSY] orb for the next turn",
     },
     1613: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
         sailor: "Adds 2x character's ATK as Additional Typeless Damage",
-        sailorNotes: "#{additionalDamage : 2x}"
+        sailorNotes: "#{additionalDamage : 2x}",
     },
     1614: {//Rob Lucci
         captain: "Boosts ATK of Fighter characters by 2.5x and their HP by 1.25x",
         special: "Cuts the current HP of each enemy by 10%, reduces the defense of all enemies by 50% and amplifies the effects of orbs by 1.75x for 1 turn",
         specialName: "4000 Power Level Technique: Tempest Kick",
         sailor: "Adds 2x character's ATK as Additional Typeless Damage",
-        sailorNotes: "#{additionalDamage : 2x}"
+        sailorNotes: "#{additionalDamage : 2x}",
     },
     1615: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Deals 20x character's ATK in [INT] damage to all enemies, reduces Special Cooldown of Striker characters by 1 turn and boosts ATK of Striker characters and amplifies orbs of Striker characters by 1.5x for 1 turn",
         specialName: "Desert Spada",
         sailor: "Restores his own special by 2 turns when it is rewinded",
-        sailorNotes: "#{rewind : 2}"
+        sailorNotes: "#{rewind : 2}",
     },
     1616: {//Crocodile
         captain: "Boosts ATK of Striker characters by 2.5x and recovers 1.5x character's RCV in HP at the end of each turn",
@@ -10833,7 +10837,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 1: Reduces Silence duration against this character by 3 turns" },
             { "description": "Boosts base ATK by 45" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [PSY] Damage Reduction" }
+            { "description": "Aquire Potential 2: [PSY] Damage Reduction" },
         ],
         potential: [
             {
@@ -10855,30 +10859,30 @@ window.details = {
                     "Level 4: Reduce damage taken from [PSY] characters by ?%",
                     "Level 5: Reduce damage taken from [PSY] characters by ?%"
                 ]
-            }
+            },
         ]
     },
     1617: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2x",
         special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
         specialName: "Shadow Asgard: \"Baptism\" from the Royal Shichibukai",
-        sailor: "When any other character uses a special, reduces own cooldown by 1 turn"
+        sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
     },
     1618: {//Moria
         captain: "Boosts ATK of [STR], [INT], and [DEX] characters by 2.5x",
         special: "For [STR], [INT] and [DEX] characters, randomizes all non-matching orbs and boosts ATK of [STR], [INT], [DEX] characters by 1.75x for 2 turns",
         specialName: "Shadow Asgard: \"Baptism\" from the Royal Shichibukai",
-        sailor: "When any other character uses a special, reduces own cooldown by 1 turn"
+        sailor: "When any other character uses a special, reduces own cooldown by 1 turn",
     },
     1619: {//6+ Raybae/Rayleigh
         captain: "Boosts chain multiplier by 4x and boosts HP and RCV of all characters by 1.2x",
         special: "Reduces Bind, Despair, and Paralysis duration by 7 turns, delays all enemies for 1 turn, and makes Perfects easier to hit for 1 turn",
-        specialName: "Netherworld Conqueror"
+        specialName: "Netherworld Conqueror",
     },
     1620: {//Log Kid
         captain: "Boosts ATK of Strikers characters by 2.5x if HP is below 30% at the start of the turn",
         special: "Reduces crew's current HP by 80%, boosts ATK of Striker characters by 2x for 1 turn",
-        specialName: "Double Steel Magnetic Arm"
+        specialName: "Double Steel Magnetic Arm",
     },
     1621: {//Log Kid
         captain: "Boosts ATK of Striker characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise and boosts HP of Striker characters by 1.2x",
@@ -10899,7 +10903,7 @@ window.details = {
             { "description": "Aquire Sailor Ability #: Boosts base HP of Driven characters by 75" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -10921,7 +10925,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1622: {//Reborn Doffy
@@ -10939,17 +10943,17 @@ window.details = {
     1624: {//Hyouzou
         captain: "Boosts ATK of Slasher characters by 1.5x and boosts HP of Powerhouse characters by 1.25x",
         special: "Randomizes all orbs, cuts the current HP of all enemies by 10%, and Poisons all enemies.",
-        specialName: "Flexible Six Swords"
+        specialName: "Flexible Six Swords",
     },
     1625: {//Daruma
         captain: "Boosts ATK of Powerhouse and Fighter characters by 1.75x",
         special: "Randomizes all orbs, including [BLOCK] orbs, and reduces damage received by 50% for 1 turn.",
-        specialName: "Arching Fangs"
+        specialName: "Arching Fangs",
     },
     1626: {//Dosun
         captain: "Boosts ATK of Powerhouse characters by 2.5x following a chain of Good > Great > Perfect hits",
         special: "Deals 20x character's ATK in [PSY] damage to one enemy, boosts ATK of [PSY] characters by 1.5x for 1 turn",
-        specialName: "The Calm Before The Storm"
+        specialName: "The Calm Before The Storm",
     },
     1627: {//Mach Vise
         captain: "Boosts ATK Free Spirit characters by 2x",
@@ -10965,10 +10969,10 @@ window.details = {
             {
                 "description": "Reduces Chain Multiplier Limit duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
                 "cooldown": [ 31, 17 ]
-            }
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Thousand Ton Destruction"
+        specialName: "Thousand Ton Destruction",
     },
     1628: {//Mach Vise
         captain: "Boosts ATK Free Spirit and Striker characters by 2.25x and their RCV by 1.5x",
@@ -10984,26 +10988,26 @@ window.details = {
             {
                 "description": "Reduces Chain Multiplier Limit duration by 5 turns and boosts the Color Affinity of Striker characters by 1.75x for 1 turn",
                 "cooldown": [ 31, 17 ]
-            }
+            },
         ],
         specialNotes: "#{stages}",
-        specialName: "Thousand Ton Destruction"
+        specialName: "Thousand Ton Destruction",
     },
     1629: {//Ikaros Much
         captain: "Boosts ATK and HP of Striker characters by 1.5x",
         special: "Randomly changes all orbs, including [BLOCK] orbs, into [STR], [DEX], [QCK], [INT], or [PSY] orbs and changes own orb into [INT]",
-        specialName: "The Spear that Penetrated the Undersea Mountain"
+        specialName: "The Spear that Penetrated the Undersea Mountain",
     },
     1630: {//Ikaros Much
         captain: "Boosts ATK of Striker characters by 2x and their HP by 1.5x",
         special: "Randomly changes all orbs, including [BLOCK] orbs, into [STR], [DEX], [QCK], [INT], or [PSY] orbs and changes own orb into [INT]",
-        specialName: "The Spear that Penetrated the Undersea Mountain"
+        specialName: "The Spear that Penetrated the Undersea Mountain",
     },
     1631: {//Fisher Tiger
         captain: "Boosts ATK of Powerhouse characters by 2.25x",
         special: "Boosts ATK of Powerhouse characters by 1.75x for 3 turns",
         specialName: "Rebellion against the \"Prohibition\" - Taboo",
-        sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn"
+        sailor: "When any other Powerhouse character uses a special, reduces own cooldown by 1 turn",
     },
     1632: {//Fisher Tiger
         captain: "Boosts ATK of Powerhouse characters by 2.75x",
@@ -11025,7 +11029,7 @@ window.details = {
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -11047,72 +11051,72 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1633: {//Punk Hazard Dragon
         captain: "Boosts ATK of [STR] characters by 1.75x and the HP of Powerhouse characters by 1.2x",
         special: "Deals 15x character's ATK in [STR] damage to all enemies and amplifies the effect of orbs by 1.25x for 1 turn",
-        specialName: "Flame Breath"
+        specialName: "Flame Breath",
     },
     1634: {//Rock and Scotch
         captain: "Boosts HP of [INT] characters by 2x",
         special: "Reduces damage received by 50% for 1 turn",
-        specialName: "COOL Ambush"
+        specialName: "COOL Ambush",
     },
     1635: {//Brownbeard
         captain: "Boosts OWN ATK by 1.5x and the ATK of Cerebral characters by 2x",
         special: "Cuts the HP of all enemies by 20% and binds himself for 5 turns",
-        specialName: "Crocodile Thrust"
+        specialName: "Crocodile Thrust",
     },
     1636: {//Caesar Clown
         captain: "Boosts ATK of Cerebral characters by 2x",
         special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns and changes [BOMB] orbs into matching orbs",
-        specialName: "Gastanet"
+        specialName: "Gastanet",
     },
     1637: {//Caesar Clown Evolved
         captain: "Boosts ATK of Cerebral characters by 2.25x and reduces damage received by 15%",
         special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.3x for 3 turns and changes [BOMB] orbs into matching orbs",
-        specialName: "Gastanet"
+        specialName: "Gastanet",
     },
     1638: {//STR Gas Mask Fodder
         special: "Boosts chances of getting [RCV] orbs for 2 turns",
-        specialName: "Meat for Meat"
+        specialName: "Meat for Meat",
     },
     1639: {//QCK Gas Mask Fodder
         special: "Reduces Paralysis duration by 1 turn",
-        specialName: "Shock Recovery: Light"
+        specialName: "Shock Recovery: Light",
     },
     1640: {//DEX Gas Mask Fodder
         special: "For 1 turn, makes STR orb \"beneficial\" for Shooter characters",
-        specialName: "Shooter Beneficial Slot: STR"
+        specialName: "Shooter Beneficial Slot: STR",
     },
     1641: {//INT Gas Mask Fodder
         special: "Boosts ATK against Poisoned and Strongly Poisoned enemies by 1.2x for 1 turn",
-        specialName: "Rising Damage: Poison"
+        specialName: "Rising Damage: Poison",
     },
     1642: {//PSY Gas Mask Fodder
         special: "Deals 3x character's ATK in typeless damage to all enemies, Poisons all enemies",
         specialNotes: "#{poison}",
-        specialName: "Poison Attack"
+        specialName: "Poison Attack",
     },
     1643: {//STR Centaur Fodder
         captain: "Reduces cooldown of Slasher specials by 2 turns at the start of the fight",
         special: "Boosts ATK of Slasher characters for 1 turn",
-        specialName: "Attack Boost: Slasher"
+        specialName: "Attack Boost: Slasher",
     },
     1644: {//QCK Centaur Fodder
         captain: "Boosts ATK of [QCK] characters by 2x, reduces crew's current HP by ???% at the end of each turn",
         special: "Reduces Silence duration by 1 turn",
         specialNotes: "#{silence}",
-        specialName: "Special Seal Recovery: Light"
+        specialName: "Special Seal Recovery: Light",
     },
     1645: {//DEX Centaur Fodder
         captain: "Boosts ATK of [DEX] characters by 1.5x and Slasher characters by 1.3x",
         captainNotes: "The bonus is cumulative. [DEX] Slasher characters get a 1.95x bonus.",
         special: "Deals 5 hits of random typeless damage to random enemies",
         specialNotes: "#{randomHits : 5}",
-        specialName: "Random Light Blows"
+        specialName: "Random Light Blows",
     },
     1646: {//Reborn Pica
         captain: "Boosts ATK of Powerhouse characters by 1.5x, and their HP by 1.5x",
@@ -11147,22 +11151,22 @@ window.details = {
     1648: {//Giolla
         captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 2.4x after scoring 4 Perfects in a row",
         special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
-        specialName: "Sprouting with Beautiful Passion"
+        specialName: "Sprouting with Beautiful Passion",
     },
     1649: {//Giolla
         captain: "Boosts ATK of all characters by 1.2x. Boosts ATK by 3x after scoring 4 Perfects in a row",
         special: "Reduces damage received by 90% for 1 turn and randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs",
-        specialName: "Sprouting with Beautiful Passion"
+        specialName: "Sprouting with Beautiful Passion",
     },
     1650: {//Brook x5
         captain: "Boosts RCV of [DEX] characters by 1.5x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
         special: "Changes [BLOCK], [TND], [EMPTY], and [BOMB] orbs into [DEX] orbs and amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Eyes Blinded by True Beauty"
+        specialName: "Eyes Blinded by True Beauty",
     },
     1651: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
         special: "Deals 60x character's ATK in [PSY] damage to one enemy and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Striker characters for 1 turn",
-        specialName: "Daybreak Ruler's Spear"
+        specialName: "Daybreak Ruler's Spear",
     },
     1652: {//Nekomamushi
         captain: "Boosts HP of Striker characters by 1.25x and boosts ATK by 3.75x if they have a [STR], [QCK], [DEX], [INT], [PSY] or [RAINBOW] orb",
@@ -11198,7 +11202,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base ATK by 45" },
             { "description": "Boosts base ATK by 55" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -11230,44 +11234,44 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by ? turns on this character",
                     "Level 5: Reduces Slot Bind duration by ? turns on this character"
                 ]
-            }
+            },
         ]
     },
     1653: {//Pedro
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduces crew's HP to 1, deals 7x the amount of HP subtracted in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Makes INT orbs \"beneficial\" for Slasher and Cerebral characters",
-        specialName: "Charge Drive"
+        specialName: "Charge Drive",
     },
     1654: {//Pedro
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of [INT] characters by 2.5x",
         special: "Reduces crew's HP to 1, deals 7x the amount of HP subtracted in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for 1 turn",
         sailor: "Makes INT orbs \"beneficial\" for Slasher and Cerebral characters",
-        specialName: "Charge Drive"
+        specialName: "Charge Drive",
     },
     1655: {//Carrot
         captain: "Boosts ATK and RCV of [QCK] characters by 1.5x",
         special: "Boosts ATK of QCK characters by 2x for 1 turn",
         sailor: "Boosts base ATK and RCV of [QCK] characters by 75",
-        specialName: "Electric Fist"
+        specialName: "Electric Fist",
     },
     1656: {//Carrot
         captain: "Boosts ATK of [QCK] characters by 2.25x and their RCV by 1.5x",
         special: "Boosts ATK of QCK characters by 2x for 1 turn",
         sailor: "Boosts base ATK and RCV of [QCK] characters by 75",
-        specialName: "Electric Fist"
+        specialName: "Electric Fist",
     },
     1657: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2x",
         special: "Reduces Bind and Despair duration by 5 turns. If your Captain is a Striker character, locks the chain multiplier at 2.75x for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
-        specialName: "Summon Dragon"
+        specialName: "Summon Dragon",
     },
     1658: {//Kanjuro
         captain: "Boosts ATK of Striker and Free Spirit characters by 2.5x",
         special: "Reduces Bind and Despair duration by 5 turns. If your Captain is a Striker character, locks the chain multiplier at 2.75x for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for Striker characters if your Captain is a Striker character",
-        specialName: "Summon Dragon"
+        specialName: "Summon Dragon",
     },
     1659: {//Raizo
         captain: "Boosts ATK of Shooter characters by 2x",
@@ -11275,7 +11279,7 @@ window.details = {
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
-        specialName: "Ninja Arts - Bunshin no Jutsu"
+        specialName: "Ninja Arts - Bunshin no Jutsu",
     },
     1660: {//Raizo
         captain: "Boosts ATK of Shooter characters by 2.5x and makes [TND] and [RCV] orbs \"beneficial\" to Shooter characters",
@@ -11283,7 +11287,7 @@ window.details = {
         sailorNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         specialNotes: "#{silence}",
-        specialName: "Ninja Arts - Bunshin no Jutsu"
+        specialName: "Ninja Arts - Bunshin no Jutsu",
     },
     1661: {//Corazon
         captain: "Boosts ATK of [PSY], [QCK], and [DEX] characters by 2x and recovers 300 HP at end of each turn",
@@ -11297,7 +11301,7 @@ window.details = {
                 "cooldown": [ 10, 10 ]
             }
         ],
-        specialName: "The Sun under the Rain"
+        specialName: "The Sun under the Rain",
     },
     1662: {//Corazon
         captain: "Boosts ATK of [PSY], [QCK], and [DEX] characters by 2.5x and recovers 500 HP at end of each turn",
@@ -11311,18 +11315,18 @@ window.details = {
                 "cooldown": [ 10, 10 ]
             }
         ],
-        specialName: "The Sun under the Rain"
+        specialName: "The Sun under the Rain",
     },
     1663: {//6+ Rob Lucci
         special: "Deals 75x character's ATK in typeless damage to one enemy, greatly boosts chances of getting matching orbs for 3 turns",
         specialName: "Six Powers Supreme: Six King Gun",
         captain: "Boosts ATK of Powerhouse characters by 3.5x if they have a matching orb, by 2.5x otherwise, reduces crew's RCV to 0",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1664: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x",
         special: "Locks all orbs for 1 turn. If during that turn, you hit 2 PERFECTS and your Captain is a Shooter character, boosts ATK of Shooter characters by 2x for 1 turn in the following turn.",
-        specialName: "Ice Saber"
+        specialName: "Ice Saber",
     },
     1665: {//STR Aokiji
         captain: "Boosts ATK of Shooter characters by 2.5x and boosts ATK of Shooters by 3.25x after scoring 3 PERFECTS in a row",
@@ -11343,7 +11347,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Aquire Sailor Ability 2: Boosts base ATK of Shooter characters by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -11365,18 +11369,18 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     1666: {//Kyros
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
-        specialName: "Trueno Bastardo"
+        specialName: "Trueno Bastardo",
     },
     1667: {//Kyros
         captain: "Boosts HP of Striker characters by 1.2x and boosts ATK of Striker characters by 2.75x if HP is below 30% at the start of the turn, 2.25x otherwise",
         special: "Changes adjacent orbs into Matching Orbs and if HP is above 70%, amplifies the effect of orbs for Striker and Powerhouse characters by 1.5x for 1 turn",
-        specialName: "Trueno Bastardo"
+        specialName: "Trueno Bastardo",
     },
     1668: {//Reborn Aokiji
         special: "Boosts ATK of Striker characters by 1.75x for 2 turns, locks all orbs for 2 turns",
@@ -11391,17 +11395,17 @@ window.details = {
     1670: {//Shyarly
         captain: "Boosts ATK of [DEX] characters by 1.75x and their RCV by 1.2x",
         special: "Randomizes all non-matching orbs, switches orbs between slots two times, and delays all enemies for 1 turn",
-        specialName: "A Warning to the Fool"
+        specialName: "A Warning to the Fool",
     },
     1671: {//Camie
         captain: "Boosts RCV of Free Spirit characters by 1.5x",
         special: "Recovers 15% of crew's MAX HP and amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Cheerfulness that Shines in the Deep Sea"
+        specialName: "Cheerfulness that Shines in the Deep Sea",
     },
     1672: {//Pappagu
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Binds himself for 2 turns and reduces Despair and Silence duration by 3 turns",
-        specialName: "A Starfish Reaching for His Beliefs"
+        specialName: "A Starfish Reaching for His Beliefs",
     },
     1673: {//Swinsuit Perona
         captain: "Boosts ATK of all characters by 1.75x and boosts EXP gained by 1.2x",
@@ -11409,7 +11413,7 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Romantic Princess"
+        specialName: "Romantic Princess",
     },
     1674: {//Swinsuit Perona
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP gained by 1.5x",
@@ -11417,24 +11421,24 @@ window.details = {
         specialNotes: "#{silence}",
         sailor: "Completely resists Silence on this character",
         sailorNotes: "#{silence}",
-        specialName: "Romantic Princess"
+        specialName: "Romantic Princess",
     },
     1675: {//Kimono Zoro
         captain: "Boosts chain multiplier by 2x",
         special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, changes adjacent orbs into matching orbs and reduces Paralysis and Despair duration by 2 turns",
         sailor: "Reduces Blindness duration by 1 turn",
-        specialName: "Great Swordsman Under the Umbrella"
+        specialName: "Great Swordsman Under the Umbrella",
     },
     1676: {//Kimono Zoro
         captain: "Boosts chain multiplier by 3.25 and reduce damage received by 10%",
         special: "Boosts ATK of Slasher and Driven characters by 1.5x for 1 turn. If your Captain is a Slasher or Driven character, changes adjacent orbs into matching orbs and reduces Paralysis and Despair duration by 2 turns",
         sailor: "Reduces Blindness duration by 1 turn",
-        specialName: "Great Swordsman Under the Umbrella"
+        specialName: "Great Swordsman Under the Umbrella",
     },
     1677: {//Log Law
         captain: "Boosts ATK of Slasher characters by 2.5x",
         special: "Boosts the Color Affinity of Slasher by 1.5x for 1 turn, changes middle row orbs into matching orbs and switches orbs between slots three times",
-        specialName: "ROOM: Kikoku"
+        specialName: "ROOM: Kikoku",
     },
     1678: {//Log Law
         captain: "Boosts ATK of Slasher characters by 2.5x at the start of the chain, by 3.25x after the 3rd Perfect in a row",
@@ -11455,7 +11459,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Boosts base HP by 85" },
             { "description": "Aquire Sailor Ability 2: Reduces Paralysis duration by 1 turn" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -11477,7 +11481,7 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     1679: {//Kai Mihawk
@@ -11494,41 +11498,41 @@ window.details = {
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
         specialName: "Gomu Gomu no Tako Stamp",
-        sailor: "Boosts base HP and ATK of all characters by 56"
+        sailor: "Boosts base HP and ATK of all characters by 56",
     },
     1682: {//20th Anni Luffy
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
         special: "Cuts the current HP of each enemy by 20%, if Luffy is your Captain or Friend/Guest Captain, changes left column into Matching orbs, otherwise, adds .5x to Chain multiplier for 1 turn.",
         specialName: "Gomu Gomu no Tako Stamp",
-        sailor: "Boosts base HP and ATK of all characters by 56"
+        sailor: "Boosts base HP and ATK of all characters by 56",
     },
     1683: {//20th Anni Robin
         captain: "Boosts ATK of Cerebral characters by 2x, and their RCV by 1.3x",
         special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
         specialName: "Mil Fleur: Gigantesco Mano",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
-        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character"
+        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
     },
     1684: {//20th Anni Robin
         captain: "Boosts ATK of Cerebral characters by 2.5x, and their RCV by 1.3x",
         special: "Binds self for 1 turn, empties all slots with [BLOCK] orbs, deals several times the character's ATK in typeless damage to one enemy and boosts ATK against enemies with reduced defense by 1.5x for 2 turns",
         specialName: "Mil Fleur: Gigantesco Mano",
         specialNotes: "The exact multiplier used is chosen based on the number of [BLOCK] orbs consumed: 0 orbs - Unknown; 1 orb - ???x ATK; 2 orbs - ???x ATK; 3 orbs - ???x ATK; 4 orbs - ???x ATK; 5 orbs - ???x ATK; 6 orbs - ???x ATK.",
-        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character"
+        sailor: "Makes [TND] orbs \"beneficial\" for all characters if your Captain is a Fighter character",
     },
     1685: {//20th Anni Usopp
         captain: "Boosts ATK of Shooter characters by 2.75x following a chain of Good > Great > Perfect hits",
         special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
         specialName: "Green Star: Bamboo Javelin-Grove",
         sailor: "Reduces Silence duration on this character by 4 turns",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
     },
     1686: {//20th Anni Usopp
         captain: "Boosts ATK of Shooter characters by 3.25x following a chain of Good > Great > Perfect hits",
         special: "Changes [EMPTY] orbs into Matching orbs, changes Badly Matching orbs into [RCV] orbs and delays all enemies for 1 turn",
         specialName: "Green Star: Bamboo Javelin-Grove",
         sailor: "Reduces Silence duration on this character by 4 turns",
-        sailorNotes: "#{silence}"
+        sailorNotes: "#{silence}",
     },
     1687: {//20th Anni Franky
         captain: "Boosts ATK of Fighter characters by 2x and reduce damage received by 10%",
@@ -11536,7 +11540,7 @@ window.details = {
         specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
         specialName: "Franky Iron BOXING",
         sailor: "Restores his own special by 3 turns when it is rewinded",
-        sailorNotes: "#{rewind : 3}"
+        sailorNotes: "#{rewind : 3}",
     },
     1688: {//20th Anni Franky
         captain: "Boosts ATK of Fighter characters by 2.5x and reduce damage received by 15%",
@@ -11544,44 +11548,44 @@ window.details = {
         specialNotes: "#{randomHits : 15}<br>#{random : ??? : ??? : for each hit}",
         specialName: "Franky Iron BOXING",
         sailor: "Restores his own special by 3 turns when it is rewinded",
-        sailorNotes: "#{rewind : 3}"
+        sailorNotes: "#{rewind : 3}",
     },
     1689: {//Fortnight Kid
         captain: "Boosts ATK of all characters by 1.5x at the start of the chain, by 2.25x following a chain of STR > DEX > INT attacks no lower than Good",
         special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
-        specialName: "Iron Giant Palm Slam"
+        specialName: "Iron Giant Palm Slam",
     },
     1690: {//Fortnight Kid
         captain: "Boosts ATK of all characters by 2x at the start of the chain, by 3x following a chain of STR > DEX > INT attacks no lower than Good",
         special: "Cuts the current HP of one enemy by 20% and and boosts own ATK by 2x for 1 turn",
-        specialName: "Iron Giant Palm Slam"
+        specialName: "Iron Giant Palm Slam",
     },
     1691: {//Heat
         captain: "Boosts ATK of Shooter characters by 1.75x",
         special: "Boosts ATK against enemies with reduced defense by 1.3x for 1 turn, changes the captain's [STR], [DEX], [QCK], [INT], or [PSY] orbs into Matching orbs.",
-        specialName: "Aim and Burn"
+        specialName: "Aim and Burn",
     },
     1692: {//Wire
         captain: "Boosts HP of Driven characters by 1.5x",
         special: "Adds .3x to Chain multiplier, and reduces the defense of all enemies by 50% for 1 turn",
-        specialName: "Three Wind Tunnels"
+        specialName: "Three Wind Tunnels",
     },
     1693: {//Inuarashi
         captain: "Boosts ATK of [PSY] characters by 2x",
         special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
-        specialName: "King's Lightning Burial"
+        specialName: "King's Lightning Burial",
     },
     1694: {//Inuarashi
         captain: "Boosts ATK of [PSY] characters by 2.75x",
         special: "Reduces crew's current HP by 50%, deals 50000 Fixed damage to one enemy, boosts own ATK by 1.75x for 1 turn, amplifies the effect of own orb by 1.75x for 1 turn and changes own orb to [PSY].",
         specialNotes: "Boosted ATK and Orb Effectivess only works for the character who uses their own Special.",
-        specialName: "King's Lightning Burial"
+        specialName: "King's Lightning Burial",
     },
     1695: {//Vergo
         captain: "Boosts ATK of Striker characters by 2x",
         special: "Deals 50x character's ATK in [DEX] damage to one enemy, amplifies the effect of orbs for Striker characters by 1.75x for 1 turn and reduces damage received by 50% for 1 turn",
-        specialName: "The Darkest Demon"
+        specialName: "The Darkest Demon",
     },
     1696: {//Vergo
         captain: "Boosts ATK of Striker characters by 2.5x and reduces damage received by 10%",
@@ -11602,7 +11606,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 1: Boosts base ATK, HP and RCV of Striker characters by 25" },
             { "description": "Boosts base HP by 70" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: [QCK] Damage Reduction" }
+            { "description": "Aquire Potential 2: [QCK] Damage Reduction" },
         ],
         potential: [
             {
@@ -11624,14 +11628,14 @@ window.details = {
                     "Level 4: Reduce damage taken from [QCK] characters by ?%",
                     "Level 5: Reduce damage taken from [QCK] characters by ?%"
                 ]
-            }
+            },
         ]
     },
     1697: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
         special: "Inflicts Toxic to all enemies, recovers 13x character's RCV in HP at the end of each turn for 3 turns",
         specialNotes: "Toxic starts at 50x character's attack and increases by 2x at the end of every turn until 2,000,000 damage per turn.",
-        specialName: "Venom Cloud"
+        specialName: "Venom Cloud",
     },
     1698: {//Magellan
         captain: "Boosts ATK of all characters by 2.25x and their HP by 1.5x if there's a [STR], [DEX], [QCK], [PSY], and [INT] character in your crew. Cuts the current HP of each enemy by 15% at the end of each turn",
@@ -11668,7 +11672,7 @@ window.details = {
             { "description": "Boosts base HP by 90" },
             { "description": "Boosts base RCV by 20" },
             { "description": "Boosts base HP by 100" },
-            { "description": "Aquire Potential 3: Reduce No Healing duration" }
+            { "description": "Aquire Potential 3: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -11700,7 +11704,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 4 turns",
                     "Level 5: Reduces No Healing duration by 5 turns"
                 ]
-            }
+            },
         ]
     },
     1699: {//Jinbe
@@ -11708,7 +11712,7 @@ window.details = {
         special: "Adds .3x to Chain multiplier for 2 turns, reduces Chain Multiplier Limit and Chain Coeffiecient Reduction duration by 3 turns",
         specialName: "Gentle Ultrasound Wave",
         specialNotes: "This is most likely the effect that prevents your chain from exceeding a certain value.",
-        sailor: "Boosts base ATK of Fighter characters by 75"
+        sailor: "Boosts base ATK of Fighter characters by 75",
     },
     1700: {//Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x, and their HP by 1.3x",
@@ -11731,7 +11735,7 @@ window.details = {
             { "description": "Aquire 1 additional Socket slot" },
             { "description": "Aquire Sailor Ability 1: Boost HP of all characters by 40 if your Captain is a Fighter character" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -11753,7 +11757,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -11775,7 +11779,7 @@ window.details = {
         ],
         specialName: "Hair Removal Fist",
         specialNotes: "#{stages}",
-        sailor: "Completely resists Paralysis on this character"
+        sailor: "Completely resists Paralysis on this character",
     },
     1702: {//Ivankov
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
@@ -11811,7 +11815,7 @@ window.details = {
             { "description": "Boosts base ATK by 20" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire Sailor Ability 1: When any other Free Spirit character uses a special, reduces own cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -11833,14 +11837,14 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            }
+            },
         ]
     },
     1703: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduces damage received by 50% for 2 turns and boosts ATK against enemies inflicted with Toxic by 1.75x for 2 turns",
         specialName: "Inferno Hell Wheel",
-        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character"
+        sailor: "Makes [STR], [QCK], [DEX], [PSY] and [INT] orbs \"beneficial\" for this unit if your Captain is a Striker character",
     },
     1704: {//Hannyabal
         captain: "Boosts ATK of [INT] characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
@@ -11862,7 +11866,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 1: Makes [RCV] and [TND] orbs \"beneficial\" for this unit if your Captain is a Driven character" },
             { "description": "Boosts base HP by 200" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -11884,7 +11888,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -11892,7 +11896,7 @@ window.details = {
         captain: "Boosts ATK of [STR] characters by 2x",
         special: "Removes all positive buffs on your team. If the special is activated with more than 50% health remaining, protects from defeat for 1 turn",
         specialName: "A Speech Left in Hell",
-        sailor: "Boosts base ATK, HP and RCV of all characters by 50"
+        sailor: "Boosts base ATK, HP and RCV of all characters by 50",
     },
     1706: {//Bon Clay
         captain: "Boosts ATK of [STR] characters by 2.5x at the start of the chain, and boosts ATK of [STR] characters by 3.125x after scoring 3 Perfects in a row",
@@ -11914,7 +11918,7 @@ window.details = {
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire Sailor Ability 1: Restores his own special by 2 turns when it is rewinded" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential #: Enrage" }
+            { "description": "Aquire Potential #: Enrage" },
         ],
         potential: [
             {
@@ -11936,7 +11940,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -11944,36 +11948,36 @@ window.details = {
         captain: "Boosts ATK of [PSY] characters by 2.75x and their HP by 1.3x. Boosts chances of getting [PSY] orbs proportionally to the crew's current HP.",
         captainNotes: "At 1 HP, the rate of [PSY] orbs is ???% and at full HP, the rate of [PSY] orbs is ???%",
         special: "Reduces the defense of all enemies by 100% for 1 turn, deals 75x character's ATK in typeless damage to one enemy and changes all orbs to [PSY] orbs",
-        specialName: "One-Armed Man that Splits the Heavens"
+        specialName: "One-Armed Man that Splits the Heavens",
     },
     1708: {//Summer Nami
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
         specialName: "Cat Burglar's Eye Contact",
-        sailor: "Makes [TND] orbs \"beneficial\" for this unit"
+        sailor: "Makes [TND] orbs \"beneficial\" for this unit",
     },
     1709: {//Summer Nami
         captain: "Boosts ATK of all characters by 1.5x, recovers 4x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Striker and Cerebral characters by 1 turn, reduces Paralysis duration by 2 turns, and randomizes all non-matching orbs",
         specialName: "Cat Burglar's Eye Contact",
-        sailor: "Makes [TND] orbs \"beneficial\" for this unit"
+        sailor: "Makes [TND] orbs \"beneficial\" for this unit",
     },
     1710: {//Summer Robin
         captain: "Boosts ATK and RCV of Cerebral characters by 1.2x",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
         specialName: "Charmed by a Lovely Adult",
-        sailor: "Reduces Blindness duration by 2 turns"
+        sailor: "Reduces Blindness duration by 2 turns",
     },
     1711: {//Summer Robin
         captain: "Boosts RCV of Cerebral characters by 1.2x and boosts ATK by 3x if they have a matching orb, by 1.5x otherwise.",
         special: "Amplifies the effect of orbs for Cerebral characters by 1.75x for 1 turn and reduces damage received by 30% for 2 turns",
         specialName: "Charmed by a Lovely Adult",
-        sailor: "Reduces Blindness duration by 2 turns"
+        sailor: "Reduces Blindness duration by 2 turns",
     },
     1712: {//Akainu
         captain: "Boosts ATK of Driven characters by 2.5x.",
         special: "Deals 50x character's ATK as typeless damage to all enemies. Amplifies the effect of orbs for Driven characters by 2x for 1 turn.",
-        specialName: "Blazing Hound Crimson Lotus"
+        specialName: "Blazing Hound Crimson Lotus",
     },
     1713: {//Akainu
         captain: "Boosts ATK of Driven characters by 2.5x. If you defeat an enemy last turn, increases ATK boost slighty. Stacks up to 3 times to a maximum of 3.25x.",
@@ -11995,7 +11999,7 @@ window.details = {
             { "description": "Boosts base HP by 100" },
             { "description": "Boosts base ATK by 20" },
             { "description": "Aquire Sailor Ability 2: Makes [INT] orbs \"beneficial\" for Driven characters" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -12017,40 +12021,40 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
     1714: {//Monet
         captain: "Boosts ATK of INT characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
         special: "Deals 10x character's ATK in [INT] damage to all enemies. Randomly changes all orbs into either [TND], [BOMB] or [RCV] orbs.",
-        specialName: "Devouring Blizzard"
+        specialName: "Devouring Blizzard",
     },
     1715: {//Vergo
         captain: "Boosts ATK of Striker characters by 2.5x if they have a matching orb, by 2x otherwise",
         special: "Changes own orb into [QCK], locks all orbs for 1 turn",
-        specialName: "Sealed Mouth Exterminator"
+        specialName: "Sealed Mouth Exterminator",
     },
     1716: {//Caesar
         captain: "Reduces HP of all characters by 50%, boosts ATK of Driven characters by 1.2x, increases his own ATK multiplier by 0.1x at the end of each turn until it reaches 3x",
         special: "Delays all enemies for 1 turn. For Driven characters, Changes [EMPTY] orbs into Matching orbs. Boosts ATK of Driven characters by 1.75x if HP is below 30% when the special is activated.",
-        specialName: "Massacre GAS"
+        specialName: "Massacre GAS",
     },
     1717: {//Vegapunk Dragon
         captain: "Reduces cooldown of Shooter specials by 2 turns at the start of the fight",
         special: "Deals 3x character's ATK in [QCK] damage to all enemies",
-        specialName: "High Maneuverable Fireball Blast"
+        specialName: "High Maneuverable Fireball Blast",
     },
     1718: {//Buffalo
         captain: "Boosts ATK of Driven characters by 2.5x until the first hit other than Perfect",
         special: "Boosts ATK of Driven characters by 1.25x for 5 turns",
-        specialName: "Rolling Rotation"
+        specialName: "Rolling Rotation",
     },
     1719: {//Baby 5
         captain: "Boosts ATK of [PSY] characters by 2x if they have matching orbs, makes INT orbs \"beneficial\" to PSY characters",
         captainNotes: "#{beneficial}",
         special: "Changes adjacent orbs into [G] orbs",
-        specialName: "Phantasmagoric \"Weapon-Morphosis\""
+        specialName: "Phantasmagoric \"Weapon-Morphosis\"",
     },
     1720: {//Secret Jinbe
         captain: "Boosts ATK of Fighter characters by 2.5x",
@@ -12076,7 +12080,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire Sailor Ability 1: Makes [STR] and [DEX] orbs \"beneficial\" for this unit" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -12098,7 +12102,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ]
 
     },
@@ -12140,75 +12144,75 @@ window.details = {
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2x",
         special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, removes enemies' ATK Up Buffs, and recovers 2,000 HP",
         sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
-        specialName: "Destructive Water Splash"
+        specialName: "Destructive Water Splash",
     },
     1729: {//Tashigi
         captain: "Boosts ATK of [STR], [DEX], and [QCK] characters by 2.25x and their HP by 1.25x. Recovers 3x character's RCV in HP at the end of each turn",
         special: "Randomly changes all orbs, includiong [BLOCK] orbs, into either [STR], [DEX] or [QCK] orbs, removes enemies' ATK Up Buffs, and recovers 2,000 HP",
         sailor: "Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 30",
-        specialName: "Destructive Water Splash"
+        specialName: "Destructive Water Splash",
     },
     1730: {//Vivi
         captain: "Boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
         sailor: "Restores her own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
-        specialName: "Shining Brightly Upon the Oasis"
+        specialName: "Shining Brightly Upon the Oasis",
     },
     1731: {//Vivi
         captain: "Boosts amount of Beli received by 2.5x and boosts ATK of all characters by 2x",
         special: "Reduces Special Cooldown of all characters by 2 turns, reduces Paralysis duration by 3 turns, reduces damage received by 60% for 2 turns",
         sailor: "Restores her own special by 3 turns when it is rewinded",
         sailorNotes: "#{rewind : 3}",
-        specialName: "Shining Brightly Upon the Oasis"
+        specialName: "Shining Brightly Upon the Oasis",
     },
     1732: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2x, boosts HP of Striker and Powerhouse characters by 1.1x",
-        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Battle Guardian"
+        specialName: "Battle Guardian",
     },
     1733: {//Nekomamushi
         captain: "Boosts ATK of [STR] characters by 2.5x, boosts HP of Striker and Powerhouse characters by 1.25x",
-        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have debuff protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
+        special: "Deals 50x character's ATK in typeless damage to one enemy that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, boosts ATK of Striker and Powerhouse characters by 1.75x for 1 turn and changes all orbs, including [BLOCK] orbs, into Matching orbs",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Battle Guardian"
+        specialName: "Battle Guardian",
     },
     1734: {//Sugar
         captain: "Boosts ATK of Cerebral and Fighter characters by 1.5x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
-        specialName: "Toy's Close Combat"
+        specialName: "Toy's Close Combat",
     },
     1735: {//Sugar
         captain: "Boosts ATK of Cerebral and Fighter characters by 1.75x and recovers 3x character's RCV in HP at the end of each turn",
         special: "Changes bottom right orb to [STR] and bottom left orb to [INT]. Switches orbs between slots twice.",
-        specialName: "Toy's Close Combat"
+        specialName: "Toy's Close Combat",
     },
     1736: {//Trebol
         captain: "Boosts ATK of [INT] characters by 2.25x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Sticky Sticky Burning Explosion"
+        specialName: "Sticky Sticky Burning Explosion",
     },
     1737: {//Trebol
         captain: "Boosts ATK of [INT] characters by 2.25x and their HP by 1.2x. Reduces damage received by 10%",
         special: "Delays all enemies for 1 turn and deals 20x character's ATK as [INT] damage to all enemies at the end of the turn for 2 turns",
-        specialName: "Sticky Sticky Burning Explosion"
+        specialName: "Sticky Sticky Burning Explosion",
     },
     1738: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet [Neo]"
+        specialName: "Spring Hopper - Bullet [Neo]",
     },
     1739: {//Raid Bellamy
         captain: "Boosts ATK of Driven characters by 2.5x",
         special: "Cuts the current HP of one enemy by 10%, makes [PSY] and [INT] orbs \"beneficial\" for 1 turn and amplifies the effect of orbs by 1.75x for 1 turn",
-        specialName: "Spring Hopper - Bullet [Neo]"
+        specialName: "Spring Hopper - Bullet [Neo]",
     },
     1740: {//Sandersonia
         captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [DEX] characters by 1.1x",
         special: "Changes all orbs to [DEX] orbs, reduces the defense of all enemies by 80% for 2 turns, and boosts ATK of Striker and Powerhouse characters by 1.75x for 2 turns",
         sailor: "Makes [STR] orbs \"beneficial\" for this unit",
-        specialName: "Snake Hair Possession: Eight-Headed Serpent"
+        specialName: "Snake Hair Possession: Eight-Headed Serpent",
     },
     1741: {//Sandersonia
         captain: "Boosts ATK of Striker and Powerhouse characters by 2.5x and boosts HP of [DEX] characters by 1.3x",
@@ -12230,7 +12234,7 @@ window.details = {
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -12252,7 +12256,7 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -12260,7 +12264,7 @@ window.details = {
         captain: "Boosts ATK of Striker and Powerhouse characters by 2x and boosts HP of [STR] characters by 1.1x",
         special: "Changes [QCK] and [DEX] orbs into Matching orbs, boosts ATK against enemies with reduced defense by 1.75x for 2 turns and reduces damage received by 60% for 1 turn",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Snake Hair Possession: Salamander"
+        specialName: "Snake Hair Possession: Salamander",
     },
     1743: {//Marigold
         captain: "Boosts ATK of Striker and Powerhouse characters by 2.5x and boosts HP of [STR] characters by 1.3x",
@@ -12282,7 +12286,7 @@ window.details = {
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Reduce No Healing duration" }
+            { "description": "Aquire Potential 2: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -12304,14 +12308,14 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 2 turns",
                     "Level 5: Reduces No Healing duration by 3 turns"
                 ]
-            }
+            },
         ]
     },
     1744: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x",
         special: "Cuts the current HP of one enemy by 7% and amplifies the effect of orbs for Shooter characters by 1.75x for 3 turns",
         sailor: "Boosts base ATK, HP and RCV of Shooter characters by 30",
-        specialName: "Defender's Spade-Shaped Arrow"
+        specialName: "Defender's Spade-Shaped Arrow",
     },
     1745: {//Marguerite
         captain: "Boosts ATK of Shooter characters by 2x and recovers 2x character's RCV in HP at the end of each turn",
@@ -12333,7 +12337,7 @@ window.details = {
             { "description": "Boosts base HP by 70" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Barrier Penetration" }
+            { "description": "Aquire Potential 2: Barrier Penetration" },
         ],
         potential: [
             {
@@ -12355,13 +12359,13 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 80%",
                     "Level 5: This character's attack will ignore barriers if HP is above 50%"
                 ]
-            }
+            },
         ]
     },
     1746: {//Boa Hancock
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
         special: "Deals 6 hits of 20,000 fixed damage to random enemies, delays all enemies for 1 turn and makes [STR], [DEX], [QCK], [PSY] and [INT] orbs \"beneficial\" for Shooter characters for 2 turns",
-        specialName: "Pistol Kisses"
+        specialName: "Pistol Kisses",
     },
     1747: {//Boa Hancock
         captain: "Boosts ATK of Shooter characters by a variable factor between 2.5x and 3.25x based on the timing of the attack of the previous unit in the chain and recovers 1,000 HP at end of each turn. Greatly reduces chances of getting [TND] / [RCV] orbs",
@@ -12397,7 +12401,7 @@ window.details = {
             { "description": "Boosts base HP by 80" },
             { "description": "Boosts base ATK by 30" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 3: Reduce No Healing duration" }
+            { "description": "Aquire Potential 3: Reduce No Healing duration" },
         ],
         potential: [
             {
@@ -12429,14 +12433,14 @@ window.details = {
                     "Level 4: Reduces No Healing duration by 4 turns",
                     "Level 5: Reduces No Healing duration by 5 turns"
                 ]
-            }
+            },
         ]
     },
     1748: {//Bepo
         captain: "Boosts ATK and HP of QCK characters by 1.5x",
         special: "Cuts the current HP of one enemy by 15% and reduces enemy's Threshold Damage Reduction duration by 5 turns",
         sailor: "If Bepo has a [QCK] orb and you hit a Perfect with him, keep his [QCK] orb for the next turn",
-        specialName: "Bear Rush Out"
+        specialName: "Bear Rush Out",
     },
     1749: {//Bepo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK and HP of QCK characters by 2x",
@@ -12458,7 +12462,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -12480,7 +12484,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1750: {//Korea Law
@@ -12496,7 +12500,7 @@ window.details = {
             }
         ],
         specialNotes:"#{stages}",
-        specialName: "Injection Shot"
+        specialName: "Injection Shot",
     },
     1751: {//Korea Law
         captain: "Boosts ATK of Striker characters by 3x and heals for .5x his RCV at the end of the turn each time you hit a Perfect",
@@ -12542,7 +12546,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire Sailor Ability 2: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 3: Barrier Penetration" }
+            { "description": "Aquire Potential 3: Barrier Penetration" },
         ],
         potential: [
             {
@@ -12574,75 +12578,75 @@ window.details = {
                     "Level 4: This character's attack will ignore barriers if HP is above 50%",
                     "Level 5: This character's attack will ignore barriers"
                 ]
-            }
+            },
         ]
     },
     1752: {//20th Anni Zoro
         captain: "Boosts ATK of characters with cost 30 or less by 2.5x",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
         sailor: "Boosts base ATK of Slasher characters by 50",
-        specialName: "Three Sword Style: Ultra Tiger Hunting"
+        specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
     1753: {//20th Anni Zoro
         captain: "Boosts HP of characters with cost 30 or less by 1.3x and boosts ATK of characters with cost 30 or less by 2.5x at the start of the chain, 3.5x after the 3rd Perfect in a row",
         special: "Deals 60x character's ATK in [INT] damage to one enemy. Boosts ATK of characters with 30 cost or less by 1.75x for 1 turn. If Zoro is a Capain or Friend/Guest Captain, then if during that turn you score 4 Perfect hits, boosts ATK of characters with 30 cost or less by 2x in the following turn.",
         sailor: "Boosts base ATK of Slasher characters by 50",
-        specialName: "Three Sword Style: Ultra Tiger Hunting"
+        specialName: "Three Sword Style: Ultra Tiger Hunting",
     },
     1754: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
         sailor: "Boosts base ATK, HP and RCV of all characters by 40",
-        specialName: "Diable Jambe: Collier Strike"
+        specialName: "Diable Jambe: Collier Strike",
     },
     1755: {//20th Anni Sanji
         captain: "Boosts ATK of Fighter and Powerhouse characters by 2.5x and their HP by 1.2x",
         special: "Cuts the current HP of one enemy by 15%, removes Poison and amplifies the effects of orbs by 1.75x for 1 turn",
         sailor: "Boosts base ATK, HP and RCV of all characters by 40",
-        specialName: "Diable Jambe: Collier Strike"
+        specialName: "Diable Jambe: Collier Strike",
     },
     1756: {//20th Anni Nami
         captain: "Recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Gust Sword"
+        specialName: "Gust Sword",
     },
     1757: {//20th Anni Nami
         captain: "Recovers 5x character's RCV in HP at the end of each turn",
         special: "Reduces damage received by 80% for 1 turn, reduces enemy's Threshold Damage Reduction and ATK UP duration by 3 turns",
         sailor: "Makes [DEX] orbs \"beneficial\" for this unit",
-        specialName: "Gust Sword"
+        specialName: "Gust Sword",
     },
     1758: {//20th Anni Brook
         captain: "Boosts ATK of Free Spirit characters by 2x and their HP by 1.1x",
         special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
-        specialName: "Party Music: Quinte Tierce Fantasia"
+        specialName: "Party Music: Quinte Tierce Fantasia",
     },
     1759: {//20th Anni Brook
         captain: "Boosts ATK of Free Spirit characters by 2.5x and their HP by 1.2x",
         special: "Delays all enemies for 1 turn, reduces Paralysis, Bind and Despair duration by 1 turn.",
         sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
-        specialName: "Party Music: Quinte Tierce Fantasia"
+        specialName: "Party Music: Quinte Tierce Fantasia",
     },
     1760: {//20th Anni Chopper
         captain: "Boosts ATK of [DEX] and [INT] characters by 2x",
         special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
         sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
         sailorNotes: "#{silence}<br>#{rewind : 2}",
-        specialName: "Intelligent Monster"
+        specialName: "Intelligent Monster",
     },
     1761: {//20th Anni Chopper
         captain: "Boosts ATK of [DEX] and [INT] characters by 2.5x",
         special: "Changes the orbs in the left column into [INT], [RCV] and [DEX], the orbs in the right column into [INT], [PSY] and [DEX]",
         sailor: "Restores his own special by 2 turns when it is rewinded and reduces Silence duration on this character by 2 turns",
         sailorNotes: "#{silence}<br>#{rewind : 2}",
-        specialName: "Intelligent Monster"
+        specialName: "Intelligent Monster",
     },
     1762: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
         special: "Reduces the defense of all enemies by 80% for 2 turns, deals 50x character's ATK in typeless damage to all enemies and changes all orbs on Powerhouse characters into Matching orbs, recover 20% of crew's MAX HP.",
-        specialName: "Flying Finger Gun: Fire Sting"
+        specialName: "Flying Finger Gun: Fire Sting",
     },
     1763: {//Rob Lucci
         captain: "Boosts ATK of Powerhouse characters by 2.5x and their HP by 1.2x at the start of the chain. Reduces RCV of all characters by 50%.<br>Boosts ATK of Powerhouse characters by 2.75x after the 1st Perfect in a row, by 3.025x after the 2nd Perfect in a row, by 3.3275x after the 3rd Perfect in a row, by 3.66025x after the 4th Perfect in a row, and by 4.026275x after the 5th Perfect in a row.",
@@ -12678,7 +12682,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Aquire Sailor Ability 2: Makes [RCV] and [TND] orbs \"beneficial\" for this unit" },
             { "description": "Boosts base HP by 90" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -12710,7 +12714,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -12719,32 +12723,32 @@ window.details = {
         captainNotes: "If a character dies and revives, it counts as killing a character. If you did not defeat an enemy, lose all ATK boost stacks.",
         special: "Increases duration of any Class/Type boosting buffs and Orb Amplification buffs by 1 turn, locks the chain multiplier at 2.5x for 1 turn and deals 100000 fixed damage to all enemies that will ignore damage negating abilities and barriers.",
         specialNotes: "#{ignoreBarrier}",
-        specialName: "Determined Man's Ice Attack"
+        specialName: "Determined Man's Ice Attack",
     },
     1765: {//Blue Gilly
         captain: "Boosts ATK of Fighter characters by 1.5x",
         special: "Deals 10 hits of 5x character's ATK in typeless damage to random enemies, reduces the defense of all enemies by 50% for 1 turn, randomizes non-matching orbs, including [BLOCK] orbs",
-        specialName: "Jao Kun Do Consecutive Thrusting Kick"
+        specialName: "Jao Kun Do Consecutive Thrusting Kick",
     },
     1766: {//Blue Gilly
         captain: "Boosts chain multiplier by 1.5x and boosts ATK of Fighter characters by 1.5x",
         special: "Deals 10 hits of 5x character's ATK in typeless damage to random enemies, reduces the defense of all enemies by 50% for 1 turn, randomizes non-matching orbs, including [BLOCK] orbs",
-        specialName: "Jao Kun Do Consecutive Thrusting Kick"
+        specialName: "Jao Kun Do Consecutive Thrusting Kick",
     },
     1767: {//Funk Bros
         captain: "Boosts ATK of Fighter characters by 1.75x",
         special: "Delays all enemies for 1 turn, following the activation of the special, if every unit scores a Great hit, boosts ATK of Fighter characters by 1.5x in the following turn",
-        specialName: "Prideless Surprise Attack"
+        specialName: "Prideless Surprise Attack",
     },
     1768: {//Abdullah and Jeet
         captain: "Boosts ATK of Striker and Slasher characters by 1.5x",
         special: "At the end of the turn, cuts the current HP of each enemy by 10% for 2 turns",
-        specialName: "Nasty Final Blow"
+        specialName: "Nasty Final Blow",
     },
     1769: {//Ben Beckman
         captain: "Boosts ATK of Cerebral characters by 2.5x",
         special: "Delays all enemies for 1 turn. If your captain is a Cerebral Character, boosts ATK against delayed enemies by 1.5x for 1 turn and changes adjacent orbs into Matching Orbs",
-        specialName: "Restraining Gunpoint"
+        specialName: "Restraining Gunpoint",
     },
     1770: {//Ben Beckman
         captain: "Boosts ATK of Cerebral characters by 2.5x and their HP by 1.2x at the start of the chain, and boosts ATK of Cerebral characters by 3.25x following a chain of Good > Great > Perfect hits",
@@ -12765,7 +12769,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Aquire Sailor Ability 2: Adds 2x character's ATK as Additional Typeless Damage" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -12787,7 +12791,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -12815,11 +12819,11 @@ window.details = {
     },
     1775: {//Momonosuke
         captain: "Boosts ATK and RCV of QCK characters by 1.5x, and slightly boosts chances of getting [QCK] orbs",
-        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice"
+        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
     },
     1776: {//Momonosuke
         captain: "Boosts ATK and RCV of QCK characters by 1.75x, boosts chances of getting [QCK] orbs",
-        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice"
+        special: "Reduces damage received by 50% for 1 turn and switches orbs between slots twice",
     },
     1777:{//Kizaru
         captain: "Not Translated",
@@ -12847,7 +12851,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Aquire Sailor Ability 2: Boosts base ATK, HP and RCV of Shooter and Free Spirit characters by 50" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -12869,7 +12873,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1779:{//Kizaru
@@ -12900,33 +12904,33 @@ window.details = {
                 "cooldown": [ 20, 11 ]
             }
         ],
-        specialNotes: "#{stages}"
+        specialNotes: "#{stages}",
     },
     1781: {//Fighting Fish
         captain: "Boosts ATK of Powerhouse characters by 1.75x. Makes [TND] and [RCV] orbs \"beneficial\" to Powerhouse characters",
         special: "Boosts ATK of ??? characters by 1.3x for 1 turn, changes own orb into STR and deals 5x character's ATK in [STR] damage to all enemies",
-        specialName: "Fish Special"
+        specialName: "Fish Special",
     },
     1782: {//Chinjao
         captain: "Boosts ATK of [QCK] characters by 2.25x, boosts damage of QCK specials by 1.75x",
         captainNotes: "#{noFixedPerc}",
         special: "Delays all enemies for 2 turns, deals 25x character's ATK in [QCK] damage to all enemies",
-        specialName: "Chinjao Special"
+        specialName: "Chinjao Special",
     },
     1783: {//Hajrudin
         captain: "Boosts ATK and HP of Powerhouse characters by 1.5x",
         special: "Locks all orbs for 1 turn. If during that turn you score 4 Perfect hits, amplifies the effect of orbs by 1.5x for 1 turn.",
-        specialName: "Hajrudin Special"
+        specialName: "Hajrudin Special",
     },
     1784: {//Fujitora
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of characters with fewer than 4 stars by 2.5x",
         special: "Deals random [INT] damage to all enemies, reduces Special Cooldown of all characters by 1 turn and boosts ATK of all characters by 1.5x for 1 turn",
-        specialName: "Fujitora Special"
+        specialName: "Fujitora Special",
     },
     1785: {//Spartan
         captain: "Recovers 3x character's RCV in HP at the end of each turn",
         special: "Recovers 3000 HP and amplifies the effect of orbs by 1.25x for 1 turn",
-        specialName: "Spartan Special"
+        specialName: "Spartan Special",
     },
     1786: {//Dressrosa Fodder
         special: "Makes [QCK] orbs \"beneficial\" to Shooter characters for 1 turn",
@@ -12942,7 +12946,7 @@ window.details = {
     },
     1789: {//Dressrosa Fodder
         special: "Boosts chances of getting [RCV] orbs for 2 turns",
-        specialName: "Meat for Meat"
+        specialName: "Meat for Meat",
     },
     1790: {//Dressrosa Fodder
         special: "Recovers 3x character's RCV in HP at the end of each turn for 3 turns",
@@ -12953,7 +12957,7 @@ window.details = {
         special: "Cuts the current HP of one enemy by 20% that will ignore damage negating abilities and barriers. Changes the orbs in the top row into [STR] orbs, changes the orbs in the middle row into [QCK] orbs, changes the orbs in the bottom row into [DEX] orbs and amplifies the effect of orbs by 1.75x for 1 turn",
         specialNotes: "#{ignoreBarrier}",
         sailor: "If you captain is a [STR] character, boosts this character's attack against [STR] characters by 1.5x",
-        specialName: "Gomu Gomu no Hawk Rifle"
+        specialName: "Gomu Gomu no Hawk Rifle",
     },
     1792:{//Lucy Luffy
         captain: "Boosts RCV of [STR], [DEX] and [QCK] characters by 1.2x and boosts ATK of [STR], [DEX] and [QCK] characters by 3.25x after scoring 3 Perfects in a row",
@@ -12976,7 +12980,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -12998,7 +13002,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 120",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13006,7 +13010,7 @@ window.details = {
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, lowers chances of getting [STR] orbs and makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead.",
         captainNotes: "Sabo boosts ATK by 3.7125x if you have [STR], [DEX] and [QCK] type characters, and no [PSY] or [INT] characters at all.<br>#{beneficial}",
         special: "Boosts ATK of [STR], [DEX] and [QCK] characters by 1.75x for 1 turn. If during that turn you score 4 Perfect hits, boosts ATK of [STR], [DEX] and [QCK] characters by 2x in the following turn.",
-        specialName: "Dragon's Claw: Reverse Wave Motion"
+        specialName: "Dragon's Claw: Reverse Wave Motion",
     },
     1794:{//Lucy Sabo
         captain: "If there is a [STR], [DEX] and [QCK] character in your crew, boosts ATK of [STR], [DEX] and [QCK] characters by 2.75x and their HP by 1.3x, lowers chances of getting [STR] orbs and makes [DEX] and [QCK] orbs \"beneficial\" to [STR], [DEX] and [QCK] characters. If there are not [PSY] or [INT] characters on your crew, boosts ATK by 3.7125x instead.",
@@ -13043,7 +13047,7 @@ window.details = {
             { "description": "Aquire Sailor Ability 2: Boosts base ATK, HP and RCV of [STR], [DEX], and [QCK] characters by 50" },
             { "description": "Boosts base HP by 100" },
             { "description": "Boosts base ATK by 40" },
-            { "description": "Aquire Potential 3: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 3: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -13075,7 +13079,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 10 turns on this character",
                     "Level 5: Reduces Slot Bind completely on this character"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13083,7 +13087,7 @@ window.details = {
         captain: "Boosts ATK of Slasher and Driven characters by 2x",
         special: "Delays all enemies for 2 turns, reduces enemies Percent Damage Reduction and Increased Defense duration by 3 turns and changes right column [STR], [DEX], [QCK], [PSY] and [INT] orbs into Matching orbs",
         sailor: "Boosts this character's attack against [STR] characters by 1.1x",
-        specialName: "Snake Sword"
+        specialName: "Snake Sword",
     },
     1796:{//Diamante
         captain: "Boosts ATK of Slasher and Driven characters by 2.5x",
@@ -13105,7 +13109,7 @@ window.details = {
             { "description": "Boosts base ATK by 40" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -13127,7 +13131,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1797:{//Jesus Burgess
@@ -13148,7 +13152,7 @@ window.details = {
         ],
         specialNotes: "#{stages}",
         sailor: "Boosts base ATK and HP of [STR], [DEX], and [QCK] characters by 75",
-        specialName: "Shockwave Elbow"
+        specialName: "Shockwave Elbow",
     },
     1798:{//Jesus Burgess
         captain: "Boosts ATK of Fighter characters by 2.5x, boosts HP of Powerhouse and Driven characters by 1.25x",
@@ -13184,7 +13188,7 @@ window.details = {
             { "description": "Boosts base RCV by 30" },
             { "description": "Boosts base HP by 90" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Enrage" }
+            { "description": "Aquire Potential 2: Enrage" },
         ],
         potential: [
             {
@@ -13206,7 +13210,7 @@ window.details = {
                     "Level 4: Boosts base ATK by 100",
                     "Level 5: Boosts base ATK by 150"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13214,7 +13218,7 @@ window.details = {
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.25x",
         special: "Changes [BLOCK] orbs into Matching orbs, locks all orbs for 1 turn, boosts ATK against enemies with reduced defense by 1.75x for 2 turns",
         sailor: "Makes [INT] and [PSY] orbs \"beneficial\" for this unit",
-        specialName: "Beautiful Sword: Round Table"
+        specialName: "Beautiful Sword: Round Table",
     },
     1800:{//Cavendish
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and their RCV by 1.2x",
@@ -13236,7 +13240,7 @@ window.details = {
             { "description": "Boosts base HP by 60" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -13258,14 +13262,14 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1801:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2x and if you don't attack with Bartolomeo, reduces damage received by 10% for that turn.",
         special: "Deal 30x character's ATK in [QCK] damage to all enemies, reduces damage received by 90% for 1 turn and reduces the defense of all enemies by 80% for 2 turns",
         sailor: "Reduces Paralysis for 3 turns for himself",
-        specialName: "Barrier Bulls"
+        specialName: "Barrier Bulls",
     },
     1802:{//Bartolomeo
         captain: "Boosts ATK of [STR], [DEX] and [QCK] characters by 2.5x and if you don't attack with Bartolomeo, reduces damage received by 15% for that turn.",
@@ -13287,7 +13291,7 @@ window.details = {
             { "description": "Boosts base RCV by 60" },
             { "description": "Boosts base ATK by 50" },
             { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -13309,33 +13313,33 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            }
+            },
         ]
     },
     1803: {//Zoro
         captain: "Boosts ATK of Slasher characters by 2x",
         special: "Deals 13x character's ATK in [DEX] to one enemy, removes enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
-        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai"
+        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
     },
     1804: {//Zoro
         captain: "Boosts ATK of Slasher characters by 2.25x and their HP by 1.3x",
         special: "Deals 13x character's ATK in [DEX] to one enemy, removes enemies' End of Turn Damage/Percent Cut, and randomizes all orbs, including [BLOCK] orbs",
-        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai"
+        specialName: "To Become Stronger. Santoryu Ogi: Sanzen Sekai",
     },
     1805: {//Buggy
         captain: "Boosts ATK of characters with cost 30 or less by 1.5x and their HP by 1.2x",
         special: "Reduces the defense of all enemies by 100% for 1 turn, reduces damage received from STR enemies by 80% for 1 turn, Amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Deceiving the World with the Most Evil Show"
+        specialName: "Deceiving the World with the Most Evil Show",
     },
     1806: {//Buggy
         captain: "Boosts ATK of characters with cost 30 or less by 2.25x and their HP by 1.2x",
         special: "Reduces the defense of all enemies by 100% for 1 turn, reduces damage received from STR enemies by 80% for 1 turn, Amplifies the effect of orbs by 1.5x for 1 turn",
-        specialName: "Deceiving the World with the Most Evil Show"
+        specialName: "Deceiving the World with the Most Evil Show",
     },
     1807: {//Mihawk
         captain: "Not Translated",
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
-        specialName: "Black Blade • The Ultimate Sword"
+        specialName: "Black Blade • The Ultimate Sword",
     },
     1808: {//Mihawk
         captain: {
@@ -13345,7 +13349,7 @@ window.details = {
             "level3": "Boosts ATK of Slasher characters by 1.8x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.43x instead for 1 turn.",
             "level4": "Boosts ATK of Slasher characters by 2x and their HP by 1.2x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
             "level5": "Boosts ATK of Slasher characters by 2x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 2.7x instead for 1 turn.",
-            "level6": "Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn."
+            "level6": "Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn.",
         },
         special: "Deals 100x character's ATK in typeless damage to all enemies, if your Captain is a Slasher character, locks the chain multiplier at 2.75x for 1 turn and  amplifies the effects of orbs for Slasher characters by 2x for 1 turn",
         specialName: "Black Blade • The Ultimate Sword",
@@ -13389,7 +13393,7 @@ window.details = {
             { "description": "Boosts base ATK by 50" },
             { "description": "Boosts base HP by 80" },
             { "description": "Aquire new Captain Ability: Boosts ATK of Slasher characters by 2.5x and their HP by 1.3x. If you use \"Black Blade • The Ultimate Sword\" boosts ATK of Slasher characters by 3.5x instead for 1 turn." },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -13411,40 +13415,40 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 5 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 10 turns on this character"
                 ]
-            }
-        ]
+            },
+        ],
     },
     1809: {//Wanda
         captain: "Boosts ATK by 2.25x after scoring 2 Perfects in a row",
         special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
-        specialName: "Super Express Beast Path"
+        specialName: "Super Express Beast Path",
     },
     1810: {//Wanda
         captain: "Boosts chances of getting Matching orbs, boosts ATK by 2.25x after scoring 2 Perfects in a row",
         special: "Reduces Bind and Paralysis duration by 2 turns. If your Captain is a Slasher character, makes Perfects easier to hit for 1 turn",
         sailor: "Reduces Paralysis for 1 turn for herself",
-        specialName: "Super Express Beast Path"
+        specialName: "Super Express Beast Path",
     },
     1811: {//Carrot
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2x",
         special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Rabbit Mink's Air Step"
+        specialName: "Rabbit Mink's Air Step",
     },
     1812: {//Carrot
         captain: "Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of Fighter characters by 2.25x",
         special: "Reduces Special Cooldown of your top row by 2 turns, boosts ATK of Fighter characters by 1.5x for 1 turn",
-        specialName: "Rabbit Mink's Air Step"
+        specialName: "Rabbit Mink's Air Step",
     },
     1813: {//Koala
         captain: "Boosts ATK of all characters by 2.25x and boosts EXP and amount of Beli recieved by 1.2x",
         special: "Changes Captain's orb into Matching and boosts ATK of your Captain by 1.5x for 1 turn",
-        specialName: "Revolutionary Soldier's Anger"
+        specialName: "Revolutionary Soldier's Anger",
     },
     1814: {//Raid Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.5x until the first hit other than Perfect and recovers 100 HP at end of each turn",
         specialName: "Joue Shoot",
-        special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn"
+        special: "Deal 150x character's ATK in typeless damage to one enemy, boosts ATK of Powerhouse characters by 2x for 1 turn",
     },
     1815: {//Raid Sanji
         captain: "Boosts ATK of Powerhouse characters by 2.75x until the first hit other than Perfect and recovers 300 HP at end of each turn",
@@ -13465,7 +13469,7 @@ window.details = {
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base ATK by 40" },
             { "description": "Aquire Sailor Ability 1: Makes [RCV] orbs \"beneficial\" for all characters" },
-            { "description": "Aquire Potential 2: Slot Bind Self-reduction" }
+            { "description": "Aquire Potential 2: Slot Bind Self-reduction" },
         ],
         potential: [
             {
@@ -13487,7 +13491,7 @@ window.details = {
                     "Level 4: Reduces Slot Bind duration by 4 turns on this character",
                     "Level 5: Reduces Slot Bind duration by 5 turns on this character"
                 ]
-            }
+            },
         ],
         potentialNotes: "Enrage is activated when your crew took damage from your enemies in the previous turn"
     },
@@ -13501,24 +13505,24 @@ window.details = {
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn and reduces special cooldown of all non-Captain specials by 1 turn",
         specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     1818: {// Riku
         captain: "Boosts ATK of all characters by 1.5x and their HP by 1.2x, boosts ATK by 2.5x after scoring 3 Greats in a row",
         special: "Cuts the current HP of one enemy by 7%, boosts ATK of the characters in the bottom and middle row by 1.2x for 1 turn and reduces special cooldown of all non-Captain specials by 1 turn",
         specialName: "Divine Sword",
         sailor: "Restores his own special by 1 turn when it is rewinded",
-        sailorNotes: "#{rewind : 1}"
+        sailorNotes: "#{rewind : 1}",
     },
     1819: {//Tank
         captain: "Boosts ATK of Powerhouse and Stiker characters by 1.75x",
         special: "Boosts own ATK by 1.75x for 1 turn",
-        specialName: "Shameful Hidden Activity"
+        specialName: "Shameful Hidden Activity",
     },
     1820: {//Scarlet
         captain: "Boosts HP and RCV of [PSY] characters by 1.5x",
         special: "Locks all orbs for 1 turn and recovers 5x character's RCV in HP.",
-        specialName: "Frontier Love"
+        specialName: "Frontier Love",
     },
     1821: {//Sanji
         captain: "Boosts ATK of all characters by 1.5x. Recovers 1x character's RCV in HP at the end of each turn",
@@ -13530,10 +13534,10 @@ window.details = {
             {
                 "description": "Recovers 10x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
                 "cooldown": [ 14, 14 ]
-            }
+            },
         ],
         specialName: "Sanji Special",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
     1822: {//Sanji
         captain: "Boosts ATK of all characters by 2x. Recovers 2x character's RCV in HP at the end of each turn",
@@ -13545,10 +13549,10 @@ window.details = {
             {
                 "description": "Recovers 10x character's RCV in HP, reduces damage received by 50% for 1 turn. Randomly changes all orbs, including [BLOCK] orbs, into either [STR], [DEX], [QCK] or [RCV] orbs.",
                 "cooldown": [ 14, 14 ]
-            }
+            },
         ],
         specialName: "Sanji Special",
-        sailor: "Makes [RCV] orbs \"beneficial\" for this unit"
+        sailor: "Makes [RCV] orbs \"beneficial\" for this unit",
     },
     1823: {//World
         captain: "Not Translated",
@@ -13568,7 +13572,6 @@ window.details = {
         ],
         specialNotes:"#{stages}",
         specialName: "More More: Hundredfold Artillery Cannon",
-        limit: "This character has a limit break path"
     },
     1824: {//World
         captain: "Boosts ATK of Shooter characters by 2.2x at the start of the chain.<br>Boosts ATK of Shooter characters by 2.42x after the 1st Perfect in a row, by 2.662x after the 2nd Perfect in a row, by 2.9282x after the 3rd Perfect in a row, by 3.22102x after the 4th Perfect in a row, and by 3.543122x after the 5th Perfect in a row.",
@@ -13587,24 +13590,25 @@ window.details = {
             }
         ],
         specialNotes:"#{stages}",
-        specialName: "More More: Hundredfold Artillery Cannon"
+        specialName: "More More: Hundredfold Artillery Cannon",
+        limit: "This character has a limit break path",
     },
     1825: {//Akainu
         captain: "Boosts ATK by 2.5x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
         special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption [Neo]"
+        specialName: "Great Eruption [Neo]",
     },
     1826: {//Akainu
         captain: "Boosts ATK by 3x following a chain of [INT] > [INT] > [INT] attacks no lower than Good",
         special: "Deals 50x character's ATK in [INT] damage to all enemies. Changes orbs for [INT] characters into [INT] orbs. Boosts the Color Affinity of [INT] characters by 1.75x for 1 turn",
         specialNotes: "#{colorAffinity : 1.75}",
-        specialName: "Great Eruption [Neo]"
+        specialName: "Great Eruption [Neo]",
     },
     1827: {//Sicilian Colo
         captain: "Boosts ATK of [INT] characters by 2x",
         special: "Reduce crew's current HP by 50%, Boosts ATK of [INT] characters by 2x for 1 turn and randomize non-matching orbs, including [BLOCK] orbs",
-        specialName: "Explosive Spirit"
+        specialName: "Explosive Spirit",
     },
     1828: {//Sicilian Colo
         captain: "Boosts ATK of [INT] characters by 3x if HP is below 30% at the start of the turn, by 2.5x otherwise",
@@ -13625,7 +13629,7 @@ window.details = {
             { "description": "Reduce base Special Cooldown by 1 turn" },
             { "description": "Boosts base HP by 50" },
             { "description": "Boosts base ATK by 30" },
-            { "description": "Aquire Potential 2: Critical Hit" }
+            { "description": "Aquire Potential 2: Critical Hit" },
         ],
         potential: [
             {
@@ -13647,30 +13651,30 @@ window.details = {
                     "Level 4: If you hit a perfect with this character, there is a 20% chance to deal 5% of this character's attack in extra damage",
                     "Level 5: If you hit a perfect with this character, there is a 20% chance to deal 10% of this character's attack in extra damage"
                 ]
-            }
+            },
         ]
     },
     1829: {//Raid Caesar
         captain: "Boosts ATK of Cerebral and Driven characters by 2x",
         special: "Deals 45x character's ATK in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for Cerebral and Driven characters for 2 turns, and poisons all enemies",
-        spcialName: "Flammable Type: Miok GAS"
+        spcialName: "Flammable Type: Miok GAS",
     },
     1830: {//Raid Caesar
         captain: "Boosts ATK of Cerebral and Driven characters by 2.5x",
         special: "Deals 45x character's ATK in typeless damage to all enemies, amplifies the effect of orbs by 1.75x for Cerebral and Driven characters for 2 turns, and poisons all enemies",
         spcialName:"Flammable Type: Miok GAS",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1831: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9375x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
-        specialName: "Dengi Crack"
+        specialName: "Dengi Crack",
     },
     1832: {//6* Judge
-        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9x if they have a matching orb, by 2.25x otherwise",
+        captain: "Increase the rate of PSY orbs, reduces damage recieved by 15%, boosts the HP of all characters by 1.25x and if there is a [STR], [DEX], [QCK], [PSY], and [INT] characters in your crew, boosts ATK of all characters by 3.9375x if they have a matching orb, by 2.25x otherwise",
         special: "Reduces bind duration by 7 turns and amplifies the effect of orbs by 2x for 1 turn.  If this character is the captain or the friend captain, slightly boosts the rate of [PSY] orbs and randomly shuffles all orbs including [BLOCK] orbs",
         specialName: "Dengi Crack",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1833: {//Reiju
         captain: "Boosts ATK of [INT] characters by 1.75x and Powerhouse characters by 1.2x and the RCV of Powerhouse characters by 1.1x",
@@ -13678,7 +13682,7 @@ window.details = {
         special: "If your captain is [INT] or [PSY], recovers 7,000 HP, removes poison, and reduces the duration of paralysis, despair, and silence by 3 turns.  If the captain is a Powerhouse character, reduces damage recieved by 70% for 2 turns ",
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
     1834: {//Reiju
         captain: "Boosts ATK of [INT] characters by 2.25x and Powerhouse characters by 1.3x and the RCV of Powerhouse characters by 1.2x",
@@ -13687,7 +13691,7 @@ window.details = {
         specialName: "Dangerous Healing",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1835: {//Ichiji
         captain: "Boosts ATK of [STR] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
@@ -13695,7 +13699,7 @@ window.details = {
         special: "If your captain is [STR] or[PSY] character, locks chain multiplier at 2.5x for 2 turns. If your Captain is a Powerhouse character, delays all enemies for 2 turns",
         specialName: "Majestic Impact",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
     1836: {//Ichiji
         captain: "Boosts ATK of [STR] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
@@ -13704,7 +13708,7 @@ window.details = {
         specialName: "Majestic Impact",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1837: {//Niji
         captain: "Boosts ATK of [QCK] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
@@ -13712,7 +13716,7 @@ window.details = {
         special: "If your captain is a [QCK] or [PSY] character, boosts ATK of all characters by 1.75x for 2 turns. If your captain is a Powerhouse character, locks all orbs for 1 turn",
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
     1838: {//Niji
         captain: "Boosts ATK of [QCK] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
@@ -13721,7 +13725,7 @@ window.details = {
         specialName: "Blitz Needle",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1839: {//Yonji
         captain: "Boosts ATK of [DEX] characters by 1.75x, boosts ATK of Powerhouse characters by 1.2x, and the HP of Powerhouse characters by 1.2x",
@@ -13730,7 +13734,7 @@ window.details = {
         specialName: "Burst End Kick",
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
     1840: {//Yonji
         captain: "Boosts ATK of [DEX] characters by 2.25x, boosts ATK of Powerhouse characters by 1.3x, and the HP of Powerhouse characters by 1.2x",
@@ -13740,193 +13744,114 @@ window.details = {
         specialNotes: "Extra Damage can only be boosted by conditional Boosters.",
         sailor: "Makes [PSY] orbs \"beneficial\" for this unit",
         sailorNotes: "#{beneficial}",
-        limit: "This character has a limit break path"
+        limit: "This character has a limit break path",
     },
     1841: {//Caribou
         captain: "Boosts ATK of Driven characters by 1.5x, deals 2x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
         specialName: "Fathomless Infinite Hell",
-        sailor: "When any other character uses a special, reduces own cooldown by 5 turn"
+        sailor: "When any other character uses a special, reduces own cooldown by 5 turn",
     },
     1842: {//Caribou
         captain: "Boosts ATK of Driven characters by 1.5x, deals 4x character's ATK in [DEX] damage to all enemies at the end of each turn",
         special: "Boosts ATK of Driven characters by 1.5x for 1 turn, reduces enemy's Threshold Damage Reduction by 2 turns and ATK Up duration by 3 turns",
         specialName: "Fathomless Infinite Hell",
-        sailor: "When any other character uses a special, reduces own cooldown by 5 turn"
+        sailor: "When any other character uses a special, reduces own cooldown by 5 turn",        
     },
     1843: {//Coribou
         captain: "Boosts ATK of Driven and Striker characters by 1.5x",
         special: "Removes blindness and recovers 4x character's RCV in HP",
-        specialName: "Frantic Funeral"
+        specialName: "Frantic Funeral",
     },
     1844: {//Coribou
         captain: "Boosts ATK of Driven and Striker characters by 1.75x",
         special: "Removes blindness and recovers 4x character's RCV in HP",
-        specialName: "Frantic Funeral"
+        specialName: "Frantic Funeral",
     },
     1845: {//Garp
         captain: "Boosts ATK of Fighter characters by 2.5x and reduce damage received by 5%",
         special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
-        specialName: "Garp Special"
+        specialName: "Garp Special",
     },
     1846: {//Garp
         captain: "Boosts ATK of Fighter characters by 2.75x and reduce damage received by 15%",
         special: "Reduces the defense of all enemies by 100% for 1 turn. If the targeted enemy has less than 25% HP, instantly defeats them, otherwise, cuts the current HP of one enemy by 30%",
-        specialName: "Garp Special"
+        specialName: "Garp Special",
     },
     1847: {//Sengoku+
         captain: "Reduce CD by 2 at the start of the adventure, boost ATK of characters that are 29 cost or lower by 3.25x, and their HP by 1.2x, boost ATK of characters with cost 54 by 3x",
         captainNotes: "His captain ability also affects his evolved forms, his base form will NOT receive the boost. All evolved and plus evolved Sengoku characters in the team are included in the bonus.",
         special: "Deals random large INT Damage to all enemies, boost ATK of all characters by 1.5x for 1 turn, changes orbs to matching orbs for chatacters that are 29 cost or lower",
-        specialName: "Requiem Shockwave"
+        specialName: "Requiem Shockwave",
     },
     1848: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2x",
         special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
     1849: {//Treasure Map Akainu
         captain: "Boosts ATK of Powerhouse characters by 2.25x and their HP by 1.3x",
         special: "Deals 50x character's Atk in Str damage to one enemy, reduces enemy Barrier duration by 1 turn, and reduces any damage above 3000 by 80% for 1 turn",
         specialName: "Hellhound Bite",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
     1850: {//Treasure Map Squard
         captain: "Boosts ATK of Driven characters by 2x",
         special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
         specialName: "Piercing Hatred",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
-    },
-    1851: {//Treasure Map Squard
-        captain: "Boosts ATK of Driven characters by 2.25x and their HP by 1.3x",
-        special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
-        specialName: "Piercing Hatred",
-        sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
     1851: {//Treasure Map Squard
         captain: "Boosts ATK of Driven characters by 2.25x and their HP by 1.3x",
         special: "Deals 40x character's Atk in Dex damage to one enemy that will ignore damage negating abilities and barriers, makes Perfects easier to hit for 1 turn, and adds .5x to Chain multiplier for 1 turn",
         specialName: "Piercing Hatred",
         sailor: "Makes [PSY] and [INT] orbs \"beneficial\" for this unit",
-        sailorNotes: "#{beneficial}"
+        sailorNotes: "#{beneficial}",
     },
-    1852: {//Treasure Map WB
+    1852: {//Whitebeard
         captain: "Not Translated",
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
-        specialName: "Whitebeard Special"
+        specialName: "Whitebeard Special",
     },
     1853: {//Whitebeard
-        captain: {
-            "base": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
-            "level1": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
-            "level2": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
-            "level3": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
-            "level4": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
-            "level5": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x",
-            "level6": "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x"
-        },
-        captainNotes: "#{captainProportional : lower : 1 + 1.25 (1.35, 1.45, 1.55, 1.65, 1.75, & 2.25 respectively) * (1 - (remaining HP) / (total HP)) : 1 : 2.25(2.35, 2.45, 2.55, 2.65, 2.75, & 3.25 respectively)}",
+        captain: "Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x",
+        captainNotes: "#{captainProportional : lower : 1 + 1.25 * (1 - (remaining HP) / (total HP)) : 1 : 2.25}",
         special: "Changes own orb into [INT], deals 100x character's ATK in typeless damage to all enemies that will ignore damage negating abilities and barriers. If enemies have All Debuff Protection or Delay Debuff Protection at the time the special was activated, amplifies the effect of orbs by 2x for 1 turn. If enemies have a barrier at the time the special was activated, boosts own ATK by 2.25x",
         specialName: "Whitebeard Special",
-        limit: [
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Boosts base ATK by 10" },
-            { "description": "Boosts base HP by 30" },
-            { "description": "Boosts base RCV by 5" },
-            { "description": "Aquire Potential 1: [PSY] Damage Reduction" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
-            { "description": "Aquire Sailor Ability 1: Boosts base HP of all characters by 100" },
-            { "description": "Boosts base ATK by 15" },
-            { "description": "Boosts base HP by 40" },
-            { "description": "Boosts base RCV by 10" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Reduce base Special Cooldown by 1 turn" },
-            { "description": "Boosts base ATK by 20" },
-            { "description": "Boosts base HP by 50" },
-            { "description": "Boosts base RCV by 15" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
-            { "description": "Reduce base Special Cooldown by 2 turns" },
-            { "description": "Boosts base ATK by 25" },
-            { "description": "Boosts base HP by 60" },
-            { "description": "Boosts base RCV by 20" },
-            { "description": "Reduce base Special Cooldown by 3 turns" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Boosts base ATK by 30" },
-            { "description": "Boosts base HP by 65" },
-            { "description": "Reduce base Special Cooldown by 4 turns" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.2x" },
-            { "description": "Boosts base ATK by 35" },
-            { "description": "Boosts base HP by 70" },
-            { "description": "Aquire Sailor Ability 2: Boosts base ATK of all characters by 50" },
-            { "description": "Boosts base ATK by 35" },
-            { "description": "Boosts base HP by 85" },
-            { "description": "Boosts base RCV by 30" },
-            { "description": "Reduce base Special Cooldown by 5 turns" },
-            { "description": "Aquire 1 additional Socket slot" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x" },
-            { "description": "Boosts base ATK by 40" },
-            { "description": "Boosts base HP by 100" },
-            { "description": "Aquire new Captain Ability: Boosts ATK of all characters proportionally to the crew's current HP and their HP by 1.35x" },
-            { "description": "Aquire Potential 2: Enrage" }
-        ],
-        potential: [
-            {
-                "Name": "[PSY] Damage Reduction",
-                "description": [ 
-                    "Level 1: Reduces Damage recieved from [PSY] enemies by 1%",
-                    "Level 2: Reduces Damage recieved from [PSY] enemies by 2%",
-                    "Level 3: Reduces Damage recieved from [PSY] enemies by 3%",
-                    "Level 4: Reduces Damage recieved from [PSY] enemies by 4%",
-                    "Level 5: Reduces Damage recieved from [PSY] enemies by 5%"
-                ]
-            },
-            {
-                "Name": "Enrage",
-                "description": [ 
-                    "Level 1: Boosts base ATK by 30",
-                    "Level 2: Boosts base ATK by 60",
-                    "Level 3: Boosts base ATK by 90",
-                    "Level 4: Boosts base ATK by 120",
-                    "Level 5: Boosts base ATK by 200"
-                ]
-            }
-        ]
     },
     1854: {//Apoo
         captain: "Boosts ATK of Free Spirit characters by 2x",
         special: "Amplifies the effect of orbs for Free Spirit characters by 1.5x and boosts ATK of Free Spirit characters by 1.5x for 1 turn",
-        specialName: "Fighting Musical Performance"
+        specialName: "Fighting Musical Performance",
     },
     1855: {//Apoo
         captain: "Boosts ATK of Free Spirit characters by 2x at the start of the chain, by 2.5x after the 3rd Perfect in a row and by 3x after the 5th Perfect in a row",
         special: "Amplifies the effect of orbs for Free Spirit characters by 1.5x and boosts ATK of Free Spirit characters by 1.5x for 1 turn",
-        specialName: "Fighting Musical Performance"
+        specialName: "Fighting Musical Performance",
     },
     1856: {//X Drake
         captain: "Boosts ATK of Powerhouse characters by 2x",
         special: "Cuts the current HP of each enemy by 7%. Boosts the Color Affinity of Powerhouse characters by 1.25x",
-        specialName: "Intervening A Fierce Battle"
+        specialName: "Intervening A Fierce Battle",
     },
     1857: {//X Drake
         captain: "Boosts ATK of Powerhouse characters by 2.5 and recovers 200 HP at end of each turnx",
         special: "Cuts the current HP of each enemy by 7%. Boosts the Color Affinity of Powerhouse characters by 1.25x",
-        specialName: "Intervening A Fierce Battle"
+        specialName: "Intervening A Fierce Battle",
     },
     1858: {//Leo
         captain: "Boosts ATK of Striker characters by 2x at the start of the chain. Boosts ATK of Striker characters by 2.4x after scoring 3 Perfects in a row.",
         special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
-        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn"
+        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
     },
     1859: {//Leo
         captain: "Boosts ATK of Striker characters by 2.5x and their HP by 1.2x at the start of the chain. Boosts ATK of Striker characters by 3.25x after scoring 3 Perfects in a row.",
         special: "Reduce 3 turns of paralysis, randomize non-matching orbs, including [BLOCK] orbs, Adds 65x character's ATK as Additional Typeless Damage for 1 turn, when the captain is a Striker Character reduces enemies Percent Damage Reduction duration by 3 turns",
-        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn"
+        sailor: "If Leo has an [INT] orb and you hit a Perfect with him, keep his [INT] orb for the next turn",
     },
     1860: {//Coloseum Raizo
         captain: "Not Translated",
@@ -13945,7 +13870,7 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Raizo Special"
+        specialName: "Raizo Special",
     },
     1861: {//Coloseum Raizo
         captain: "Reduces cooldown of all specials by 2 turns at the start of the fight, boosts ATK of Shooter characters by 2.5x",
@@ -13964,28 +13889,17 @@ window.details = {
             }
         ],
         specialNotes: "#{stages}",
-        specialName: "Raizo Special"
+        specialName: "Raizo Special",
     },
     1862: {//Neo Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2x, recovers 1x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
-        specialName: "Poof [Neo]"
+        specialName: "Poof [Neo]",
     },
     1863: {//Neo Coliseum Kinemon
         captain: "Boosts ATK of Free Spirit characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
-        specialName: "Poof [Neo]"
-    },
-    1865: {//Urouge FN
-        captain: "Striker Characters ATK 1.75x, protects from defeat as long as HP is above a certain percent",
-        captainNotes: "PERFECT hits don't count, it has to GREAT hits",
-        special: "Recover 5000 HP, for 1 turn boost ATK by 1.5x for Striker Characters, if you hit 4 or more GREAT this turn boost ATK by 1.75x for Striker Characters the next turn",
-        specialName: "Culling the Criminals from this Earthly World"
-    },
-    1867: {//Hawkins FN
-        captain: "Cerebral Characters ATK 2x, boost chain multiplier by 1.5x",
-        special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%",
-        specialName: "Fortune-Telling from the Shadow of Death"
+        specialName: "Poof [Neo]",
     },
     1869: {//Fujitora V2
         captain: "Increases damage taken slightly, boosts slashers attack by 3.25x and hp by 1.2x, boosts slashers attack by a further 1.3x following a chain of good, great, perfect. Total boost: 4.225x",
@@ -14019,11 +13933,11 @@ window.details = {
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
-        specialName: "Maelstrom at Sea"
+        specialName: "Maelstrom at Sea",
     },
     2001: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2.5x, recovers 2x character's RCV in HP at the end of each turn",
         special: "Randomizes all non-matching orbs, boosts ATK of all characters by 1.75x for 1 turn",
-        specialName: "Maelstrom at Sea"
-    }
+        specialName: "Maelstrom at Sea",
+    },
 };
diff --git a/common/data/sailors.js b/common/data/sailors.js
index e83049ff7..c7e62caed 100644
--- a/common/data/sailors.js
+++ b/common/data/sailors.js
@@ -1,280 +1,280 @@
 window.sailors = {
     311: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; }
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; },
     },
     312: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; }
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Cerebral") ? 50 : 0; },
     },
     360: {
-        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; }
+        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; },
     },
     361: {
-        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; }
+        hpStatic: function(p) { return p.unit.class.has("Powerhouse") ? 100 : 0; },
     },
     364: {
-        rcvStatic: function(p) { return 10; }
+        rcvStatic: function(p) { return 10; },
     },
     365: {
-        rcvStatic: function(p) { return 10; }
+        rcvStatic: function(p) { return 10; },
     },
     450: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; },
     },
     451: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 20 : 0; },
     },
     525: {
-        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
     },
     526: {
-        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
     },
     527: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
     528: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
     553: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
     },
     554: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
     },
     555: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
     },
     556: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
     },
     559: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
     },
     560: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
     },
     640: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; }
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; },
     },
     641: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; }
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 100 : 0; },
     },
     644: {
-        rcvStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; },
-        atkStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; }
+        rcvStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
     },
     645: {
-        rcvStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; },
-        atkStatic: function(p) { return p.unit.type === "INT" ? 20 : 0; }
+        rcvStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
+        atkStatic: function(p) { return p.unit.type == "INT" ? 20 : 0; },
     },
     646: {
-        hpStatic: function(p) { return p.unit.type === "STR" ? 30 : 0; }
+        hpStatic: function(p) { return p.unit.type == "STR" ? 30 : 0; },
     },
     647: {
-        hpStatic: function(p) { return p.unit.type === "STR" ? 30 : 0; }
+        hpStatic: function(p) { return p.unit.type == "STR" ? 30 : 0; },
     },
     1172: {
-        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
     },
     1173: {
-        rcvStatic: function(p) { return p.unit.type === "PSY" ? 15 : 0; }
+        rcvStatic: function(p) { return p.unit.type == "PSY" ? 15 : 0; },
     },
     1174: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
     },
     1175: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
     },
     1176: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
     1177: {
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 50 : 0; }
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 50 : 0; },
     },
     1183: {
-        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type === "PSY" ? 75 : 0; }
+        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type == "PSY" ? 75 : 0; },
     },
     1184: {
-        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type === "PSY" ? 75 : 0; }
+        atkStatic: function(p) { return p.percHP >= 99.0 && p.unit.type == "PSY" ? 75 : 0; },
     },
     1187: {
         atkStatic: function(p) { return 20; },
         rcvStatic: function(p) { return 20; },
-        hpStatic: function(p) { return 20; }
+        hpStatic: function(p) { return 20; },
     },
     1188: {
         atkStatic: function(p) { return 20; },
         rcvStatic: function(p) { return 20; },
-        hpStatic: function(p) { return 20; }
+        hpStatic: function(p) { return 20; },
     },
     1189: {
-        atkStatic: function(p) { return p.unit.type === "QCK" ? 40 : 0; }
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 40 : 0; },
     },
     1190: {
-        atkStatic: function(p) { return p.unit.type === "QCK" ? 40 : 0; }
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 40 : 0; },
     },
     1209: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
     },
     1210: {
-        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; }
+        rcvStatic: function(p) { return p.unit.class.has("Shooter") ? 10 : 0; },
     },
     1211: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
     },
     1212: {
-        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Shooter") ? 20 : 0; },
     },
     1231: {
-        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; },
     },
     1232: {
-        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Striker") ? 50 : 0; },
     },
     1233: {
-        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; }
+        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; },
     },
     1234: {
-        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; }
+        rcvStatic: function(p) { return p.unit.class.has("Slasher") ? 30 : 0; },
     },
     1255: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 40 : 0; }
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Fighter") ? 40 : 0; },
     },
     1256: {
         rcvStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; },
-        atkStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Driven") ? 10 : 0; },
     },
     1271: {
-        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Driven") ? 100 : 0 : 0; }
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Driven") ? 100 : 0 : 0; },
     },
     1270: {
-        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Driven") ? 100 : 0 : 0; }
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Driven") ? 100 : 0 : 0; },
     },
     1273: {
-        hpStatic: function(p) { return 75; }
+        hpStatic: function(p) { return 75; },
     },
     1274: {
-        hpStatic: function(p) { return 75; }
+        hpStatic: function(p) { return 75; },
     },
     1277: {
-        rcvAdded: function(p) { return 150; }
+        rcvAdded: function(p) { return 150; },
     },
     1278: {
-        rcvAdded: function(p) { return 150; }
+        rcvAdded: function(p) { return 150; },
     },
     1317: {
-        hpStatic: function(p) { return 75; }
+        hpStatic: function(p) { return 75; },
     },
     1318: {
-        hpStatic: function(p) { return 75; }
+        hpStatic: function(p) { return 75; },
     },
     1321: {
-        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; }
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; },
     },
     1322: {
-        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; }
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Cerebral") ? p.unit.class.has("Slasher") || p.unit.class.has("Cerebral") ? 75 : 0 : 0 : 0; },
     },
     1363: {
-        hpStatic: function(p) { return p.unit.type === "PSY" ? 100 : 0; }
+        hpStatic: function(p) { return p.unit.type == "PSY" ? 100 : 0; },
     },
     1364: {
-        hpStatic: function(p) { return p.unit.type === "PSY" ? 100 : 0; }
+        hpStatic: function(p) { return p.unit.type == "PSY" ? 100 : 0; },
     },
     1367: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; }
+        hpStatic: function(p) { return 50; },
     },
     1368: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; }
+        hpStatic: function(p) { return 50; },
     },
     1377: {
-        rcvAdded: function(p) { return 125; }
+        rcvAdded: function(p) { return 125; },
     },
     1378: {
-        rcvAdded: function(p) { return 125; }
+        rcvAdded: function(p) { return 125; },
     },
     1405: {
         atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; }
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
     },
     1406: {
         atkStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
-        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; }
+        rcvStatic: function(p) { return p.percHP <= 30.0 && p.unit.class.has("Shooter") ? 100 : 0; },
     },
     1435: {
-        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; }
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
     },
     1436: {
-        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; }
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
     },
     1443: {
-        hpStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; },
-        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 50 : 0; }
+        hpStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 50 : 0; },
     },
     1444: {
-        hpStatic: function(p) { return p.classCount.Powerhouse === 6 ? 150 : 0; },
-        atkStatic: function(p) { return p.classCount.Powerhouse === 6 ? 50 : 0; }
+        hpStatic: function(p) { return p.classCount.Powerhouse == 6 ? 150 : 0; },
+        atkStatic: function(p) { return p.classCount.Powerhouse == 6 ? 50 : 0; },
     },
     1464: {
-        rcvAdded: function(p) { return 100; }
+        rcvAdded: function(p) { return 100; },
     },
     1465: {
-        rcvAdded: function(p) { return 100; }
+        rcvAdded: function(p) { return 100; },
     },
     1476: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; }
+        hpStatic: function(p) { return 50; },
     },
     1477: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; }
+        hpStatic: function(p) { return 50; },
     },
     1507: {
-        atkStatic: function(p) { return 15; }
+        atkStatic: function(p) { return 15; },
     },
     1508: {
-        atkStatic: function(p) { return 15; }
+        atkStatic: function(p) { return 15; },
     },
     1510: {
-        atkStatic: function(p) { return p.percHP >= 70.0 && p.unit.class.has("Striker") ? 20 : 0; }
+        atkStatic: function(p) { return p.percHP >= 70.0 && p.unit.class.has("Striker") ? 20 : 0; },
     },
     1511: {
-        atkStatic: function(p) { return p.captain !== null ? p.captain.class.has("Powerhouse") ? p.unit.class.has("Powerhouse") ? 20 : 0 : 0 : 0; }
+        atkStatic: function(p) { return p.captain != null ? p.captain.class.has("Powerhouse") ? p.unit.class.has("Powerhouse") ? 20 : 0 : 0 : 0; },
     },
     1523: {
-        rcvAdded: function(p) { return 124; }
+        rcvAdded: function(p) { return 124; },
     },
     1524: {
-        rcvAdded: function(p) { return 124; }
+        rcvAdded: function(p) { return 124; },
     },
     1529: {
-        atk: function(p) { return p.captain !== null ? p.captain.type === "STR" || p.captain.type === "QCK" ? .5 : 1 : 1; }
+        atk: function(p) { return p.captain != null ? p.captain.type == "STR" || p.captain.type == "QCK" ? .5 : 1 : 1; },
     },
     1530: {
-        atk: function(p) { return p.captain !== null ? p.captain.type === "STR" || p.captain.type === "QCK" ? .5 : 1 : 1; }
+        atk: function(p) { return p.captain != null ? p.captain.type == "STR" || p.captain.type == "QCK" ? .5 : 1 : 1; },
     },
     1537: {
-        hpStatic: function(p) { return p.unit.type === "STR" ? 150 : 0; }
+        hpStatic: function(p) { return p.unit.type == "STR" ? 150 : 0; },
     },
     1538: {
-        hpStatic: function(p) { return p.unit.type === "STR" ? 150 : 0; }
+        hpStatic: function(p) { return p.unit.type == "STR" ? 150 : 0; },
     },
     1539: {
-        atkStatic: function(p) { return p.unit.type === "INT" ? 50 : 0; }
+        atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
     },
     1540: {
-        atkStatic: function(p) { return p.unit.type === "INT" ? 50 : 0; }
+        atkStatic: function(p) { return p.unit.type == "INT" ? 50 : 0; },
     },
     1574: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 200 : 0; }
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
     1575: {
-        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot === p.sourceSlot ? 200 : 0; }
+        atkStatic: function(p) { return p.percHP <= 30.0 && p.slot == p.sourceSlot ? 200 : 0; },
     },
     1613: {//not working
         staticMult: function(p) { return 2; }
@@ -283,75 +283,75 @@ window.sailors = {
         staticMult: function(p) { return 2; }
     },
     1655: {
-        atkStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; },
-        rcvStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; }
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
     },
     1656: {
-        atkStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; },
-        rcvStatic: function(p) { return p.unit.type === "QCK" ? 75 : 0; }
+        atkStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "QCK" ? 75 : 0; },
     },
     1681: {
         atkStatic: function(p) { return 56; },
-        hpStatic: function(p) { return 56; }
+        hpStatic: function(p) { return 56; },
     },
     1682: {
         atkStatic: function(p) { return 56; },
-        hpStatic: function(p) { return 56; }
+        hpStatic: function(p) { return 56; },
     },
     1699: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; },
     },
     1700: {
-        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Fighter") ? 75 : 0; },
     },
     1728: {
-        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
-        rcvStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
-        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; }
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
     },
     1729: {
-        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
-        rcvStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; },
-        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 30 : 0; }
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        rcvStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 30 : 0; },
     },
     1705: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; }
+        hpStatic: function(p) { return 50; },
     },
     1706: {
         atkStatic: function(p) { return 50; },
         rcvStatic: function(p) { return 50; },
-        hpStatic: function(p) { return 50; }
+        hpStatic: function(p) { return 50; },
     },
     1752: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
     },
     1753: {
-        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Slasher") ? 20 : 0; },
     },
     1754: {
         atkStatic: function(p) { return 40; },
         rcvStatic: function(p) { return 40; },
-        hpStatic: function(p) { return 40; }
+        hpStatic: function(p) { return 40; },
     },
     1755: {
         atkStatic: function(p) { return 40; },
         rcvStatic: function(p) { return 40; },
-        hpStatic: function(p) { return 40; }
+        hpStatic: function(p) { return 40; },
     },
     1773: {
-        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; },
     },
     1774: {
-        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; }
+        atkStatic: function(p) { return p.unit.class.has("Free Spirit") ? 25 : 0; },
     },
     1797: {
-        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; },
-        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; }
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
     },
     1798: {
-        atkStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; },
-        hpStatic: function(p) { return p.unit.type === "STR" || p.unit.type === "DEX" || p.unit.type === "QCK" ? 75 : 0; }
+        atkStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
+        hpStatic: function(p) { return p.unit.type == "STR" || p.unit.type == "DEX" || p.unit.type == "QCK" ? 75 : 0; },
     },
-};
+};
\ No newline at end of file
diff --git a/common/data/ships.js b/common/data/ships.js
index f4d9af7f2..39e26223c 100644
--- a/common/data/ships.js
+++ b/common/data/ships.js
@@ -12,7 +12,7 @@ window.ships = [
                                       1.3 ;
         },
         rcvStatic: function(p) {
-            return p.slot !== 1 ? 0 :
+            return p.slot != 1 ? 0 :
                 [ 30, 40, 50, 60, 70, 80, 90, 100, 110, 120 ][p.boatLevel - 1];
         }
     },
@@ -22,7 +22,7 @@ window.ships = [
         thumb: 'ship_0002_c.png',
         description: 'Boosts ATK by 1.5x, boosts captain\'s HP by 300 units',
         hpStatic: function(p) {
-            return p.slot !== 1 ? 0 :
+            return p.slot != 1 ? 0 :
                 [ 100, 130, 150, 170, 190, 210, 230, 250, 270, 300 ][p.boatLevel - 1];
         },
         atk: function(p) {
@@ -52,7 +52,7 @@ window.ships = [
         thumb: 'ship_0004_c.png',
         description: 'Boosts captain\'s HP by 2000 units',
         hpStatic: function(p) {
-            return p.slot !== 1 ? 0 :
+            return p.slot != 1 ? 0 :
                 [ 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 2000 ][p.boatLevel - 1];
         }
     },
@@ -70,7 +70,7 @@ window.ships = [
                 [ 1.1, 1.1, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         rcvStatic: function(p) {
-            return p.slot !== 1 ? 0 : -700;
+            return p.slot != 1 ? 0 : -700;
         }
     },
 
@@ -125,10 +125,10 @@ window.ships = [
         thumb: 'ship_0010_c1.png',
         description: 'Reduces cooldown of all specials by 1 turn at the start of the fight, boosts ATK of QCK characters by 1.4x and their HP by 1.3x',
         atk: function(p) {
-            return p.unit.type !== 'QCK' ? 1 : [ 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.25, 1.3, 1.3, 1.4 ][p.boatLevel - 1];
+            return p.unit.type != 'QCK' ? 1 : [ 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.25, 1.3, 1.3, 1.4 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return p.unit.type !== 'QCK' ? 1 : [ 1, 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.3, 1.3 ][p.boatLevel - 1];
+            return p.unit.type != 'QCK' ? 1 : [ 1, 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.3, 1.3 ][p.boatLevel - 1];
         }
     },
 
@@ -197,10 +197,10 @@ window.ships = [
         thumb: 'ship_0016_c1.png',
         description: 'Boosts ATK of QCK and PSY characters by 1.5x and their HP by 1.2x. Special: Deals 56560 fixed Damage to all enemies (cooldown: 17 Turns)',
         atk: function(p) {
-            return p.unit.type === "PSY" || p.unit.type === "QCK" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
+            return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1.2, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.3, 1.4, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type === "PSY" || p.unit.type === "QCK" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.1, 1.2 ][p.boatLevel - 1] : 1;
+            return p.unit.type == "PSY" || p.unit.type == "QCK" ? [ 1, 1, 1, 1, 1, 1.1, 1.1, 1.1, 1.1, 1.2 ][p.boatLevel - 1] : 1;
         }
     },
     
@@ -221,7 +221,7 @@ window.ships = [
         thumb: 'ship_0018_c1.png',
         //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
         description: 'Boosts ATK by 1.2x.',
-        atk: function(p) { return 1.2; }
+        atk: function(p) { return 1.2; },
     }, 
     
     { // 18
@@ -230,11 +230,11 @@ window.ships = [
         description: 'Boosts ATK and HP of Fighter characters depending on the number of Fighters on the team. Sharply reduces ATK and HP of non-Fighter units.',
         atk: function(p) {
             return !p.unit.class.has('Fighter') ? .05 :
-                [ p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.01 : p.classCount.Fighter === 3 ? 1.02 : p.classCount.Fighter === 4 ? 1.03 : p.classCount.Fighter === 5 ? 1.04 : p.classCount.Fighter === 6 ? 1.05 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.04 : p.classCount.Fighter === 5 ? 1.05 : p.classCount.Fighter === 6 ? 1.1 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.05 : p.classCount.Fighter === 5 ? 1.1 : p.classCount.Fighter === 6 ? 1.15 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.05 : p.classCount.Fighter === 4 ? 1.1 : p.classCount.Fighter === 5 ? 1.15 : p.classCount.Fighter === 6 ? 1.2 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.25 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.3 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.25 : p.classCount.Fighter === 6 ? 1.35 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.4 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.45 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.2 : p.classCount.Fighter === 4 ? 1.3 : p.classCount.Fighter === 5 ? 1.4 : p.classCount.Fighter === 6 ? 1.5 : 0][p.boatLevel - 1];
+                [ p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.01 : p.classCount.Fighter == 3 ? 1.02 : p.classCount.Fighter == 4 ? 1.03 : p.classCount.Fighter == 5 ? 1.04 : p.classCount.Fighter == 6 ? 1.05 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.04 : p.classCount.Fighter == 5 ? 1.05 : p.classCount.Fighter == 6 ? 1.1 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.05 : p.classCount.Fighter == 5 ? 1.1 : p.classCount.Fighter == 6 ? 1.15 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.05 : p.classCount.Fighter == 4 ? 1.1 : p.classCount.Fighter == 5 ? 1.15 : p.classCount.Fighter == 6 ? 1.2 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.25 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.3 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.25 : p.classCount.Fighter == 6 ? 1.35 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.4 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.45 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.2 : p.classCount.Fighter == 4 ? 1.3 : p.classCount.Fighter == 5 ? 1.4 : p.classCount.Fighter == 6 ? 1.5 : 0][p.boatLevel - 1];
         },
         hp: function(p) {
             return !p.unit.class.has('Fighter') ? .05 :
-                [ p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.01 : p.classCount.Fighter === 3 ? 1.02 : p.classCount.Fighter === 4 ? 1.03 : p.classCount.Fighter === 5 ? 1.04 : p.classCount.Fighter === 6 ? 1.05 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.04 : p.classCount.Fighter === 5 ? 1.05 : p.classCount.Fighter === 6 ? 1.1 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.03 : p.classCount.Fighter === 4 ? 1.05 : p.classCount.Fighter === 5 ? 1.1 : p.classCount.Fighter === 6 ? 1.15 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.02 : p.classCount.Fighter === 3 ? 1.05 : p.classCount.Fighter === 4 ? 1.1 : p.classCount.Fighter === 5 ? 1.15 : p.classCount.Fighter === 6 ? 1.2 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.25 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.05 : p.classCount.Fighter === 3 ? 1.1 : p.classCount.Fighter === 4 ? 1.15 : p.classCount.Fighter === 5 ? 1.2 : p.classCount.Fighter === 6 ? 1.3 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.25 : p.classCount.Fighter === 6 ? 1.35 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.4 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.15 : p.classCount.Fighter === 4 ? 1.2 : p.classCount.Fighter === 5 ? 1.3 : p.classCount.Fighter === 6 ? 1.45 : 0, p.classCount.Fighter === 1 ? 1 : p.classCount.Fighter === 2 ? 1.1 : p.classCount.Fighter === 3 ? 1.2 : p.classCount.Fighter === 4 ? 1.3 : p.classCount.Fighter === 5 ? 1.4 : p.classCount.Fighter === 6 ? 1.5 : 0][p.boatLevel - 1];
+                [ p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.01 : p.classCount.Fighter == 3 ? 1.02 : p.classCount.Fighter == 4 ? 1.03 : p.classCount.Fighter == 5 ? 1.04 : p.classCount.Fighter == 6 ? 1.05 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.04 : p.classCount.Fighter == 5 ? 1.05 : p.classCount.Fighter == 6 ? 1.1 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.03 : p.classCount.Fighter == 4 ? 1.05 : p.classCount.Fighter == 5 ? 1.1 : p.classCount.Fighter == 6 ? 1.15 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.02 : p.classCount.Fighter == 3 ? 1.05 : p.classCount.Fighter == 4 ? 1.1 : p.classCount.Fighter == 5 ? 1.15 : p.classCount.Fighter == 6 ? 1.2 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.25 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.05 : p.classCount.Fighter == 3 ? 1.1 : p.classCount.Fighter == 4 ? 1.15 : p.classCount.Fighter == 5 ? 1.2 : p.classCount.Fighter == 6 ? 1.3 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.25 : p.classCount.Fighter == 6 ? 1.35 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.4 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.15 : p.classCount.Fighter == 4 ? 1.2 : p.classCount.Fighter == 5 ? 1.3 : p.classCount.Fighter == 6 ? 1.45 : 0, p.classCount.Fighter == 1 ? 1 : p.classCount.Fighter == 2 ? 1.1 : p.classCount.Fighter == 3 ? 1.2 : p.classCount.Fighter == 4 ? 1.3 : p.classCount.Fighter == 5 ? 1.4 : p.classCount.Fighter == 6 ? 1.5 : 0][p.boatLevel - 1];
         }
     },
     
@@ -242,16 +242,16 @@ window.ships = [
         name: "Doflamingo Ship",
         thumb: 'ship_0020_c.png',
         description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. Special: Adds 0.2 to Chain  (cooldown MAX: 15 Turns)',
-        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]; },
-        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]; }
+        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
+        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
     },
     
     { // 19.2
         name: "Doflamingo Ship - Special ACTIVATED",
         thumb: 'ship_0020_c.png',
         description: 'Boosts ATK of Driven Characters by 1.5x and their HP by 1.35x. Makes Perfects easier to Hit for Driven characters. ACTIVATED Special: Adds 0.2 to Chain  (cooldown MAX: 15 Turns)',
-        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]; },
-        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]; }
+        atk: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.2, 1.2, 1.3, 1.3, 1.3, 1.3, 1.4, 1.4, 1.4, 1.5][p.boatLevel - 1]},
+        hp: function(p) { return !p.unit.class.has('Driven') ? 1 : [ 1.1, 1.1, 1.1, 1.15, 1.2, 1.2, 1.2, 1.2, 1.2, 1.35][p.boatLevel - 1]}
     },
     
     { // 20
@@ -265,8 +265,8 @@ window.ships = [
             return p.unit.class.has('Powerhouse') ? 1 : 0.01;
         },
         heal: function(p) {
-            return p.classCount.Powerhouse === 1 ? 1 : p.classCount.Powerhouse === 2 ? 10 : p.classCount.Powerhouse === 3 ? 20 : p.classCount.Powerhouse === 4 ? 30 : p.classCount.Powerhouse === 5 ? 100 : p.classCount.Powerhouse === 6 ? 900 : 0;  
-        }
+            return p.classCount.Powerhouse == 1 ? 1 : p.classCount.Powerhouse == 2 ? 10 : p.classCount.Powerhouse == 3 ? 20 : p.classCount.Powerhouse == 4 ? 30 : p.classCount.Powerhouse == 5 ? 100 : p.classCount.Powerhouse == 6 ? 900 : 0;  
+        },
         
     },
     
@@ -277,7 +277,7 @@ window.ships = [
         description: 'Boosts HP by 1.3x.',
         hp: function(p) {
             return 1.3;
-        }
+        },
     },
     
     { // 22
@@ -285,11 +285,11 @@ window.ships = [
         thumb: 'ship_0023_c.png',
         description: 'Boosts ATK of [STR] and [PSY] characters by 1.5x, and their HP by 1.25x',
         atk: function(p) {
-            return p.unit.type === "PSY" || p.unit.type === "STR" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
+            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type === "PSY" || p.unit.type === "STR" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
-        }
+            return p.unit.type == "PSY" || p.unit.type == "STR" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
+        },
     },
     
     { //23
@@ -301,7 +301,7 @@ window.ships = [
         },
         hp: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Free Spirit')) ? 1 : [ 1.1, 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.25, 1.25 ][p.boatLevel - 1];
-        }
+        },
     },
     { // 24
         name: 'New Year\'s Big Top',
@@ -336,11 +336,11 @@ window.ships = [
         thumb: 'ship_0028_c.png',
         description: 'Boosts ATK of Striker characters by 1.5x and their HP by 1.2x if there are 6 Striker characters in your crew. Reduces special cooldown of Striker characters by 1 at the start of the adventure.  Special: Reduces any damage received above 10,000 HP by 97% (cooldown: 17 turns).',
         atk: function(p) {
-            return !(p.classCount.Striker === 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
+            return !(p.classCount.Striker == 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
                 [ 1.1, 1.2, 1.2, 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.5 ][p.boatLevel - 1];
         },
         hp: function(p) {
-            return !(p.classCount.Striker === 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
+            return !(p.classCount.Striker == 6) ? 1 : !p.unit.class.has('Striker') ? 1 :
                 [ 1.1, 1.1, 1.1, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2, 1.2 ][p.boatLevel - 1];
         }
     },
@@ -350,11 +350,11 @@ window.ships = [
         thumb: 'ship_0029_c.png',
         description: 'Boosts ATK of [DEX] and [INT] characters by 1.5x and their HP by 1.25x',
         atk: function(p) {
-            return p.unit.type === "DEX" || p.unit.type === "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
+            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.2, 1.25, 1.25, 1.3, 1.35, 1.35, 1.4, 1.4, 1.45, 1.5 ][p.boatLevel - 1] : 1;
         },
         hp: function(p) {
-            return p.unit.type === "DEX" || p.unit.type === "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
-        }
+            return p.unit.type == "DEX" || p.unit.type == "INT" ? [ 1.1, 1.1, 1.15, 1.15, 1.15, 1.2, 1.2, 1.25, 1.25, 1.25 ][p.boatLevel - 1] : 1;
+        },
     },
     
     { //29
@@ -368,7 +368,7 @@ window.ships = [
         hp: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.02;
         },*/
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
     
     { //29.2
@@ -382,7 +382,7 @@ window.ships = [
         hp: function(p) {
             return !(p.unit.class.has('Slasher') || p.unit.class.has('Striker') || p.unit.class.has('Fighter') || p.unit.class.has('Free Spirit') || p.unit.class.has('Cerebral') || p.unit.class.has('Powerhouse') || p.unit.class.has('Driven')) ? 2 : 1.02;
         },*/
-        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; }
+        atk: function(p) { return p.unit.class.has("Shooter") ? 1.2 : 1; },
     },
     
     
@@ -392,7 +392,7 @@ window.ships = [
         thumb: 'ship_0032_c.png',
         //description: 'Boosts ATK by 1.5x. At the start of the adventure, all specials start at MAX charge.',
         description: 'Boosts ATK by 1.2x.',
-        atk: function(p) { return 1.2; }
+        atk: function(p) { return 1.2; },
     },
     
     
@@ -401,7 +401,7 @@ window.ships = [
         name: "Flying Dutchman",
         thumb: 'ship_0033_c.png',
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
-        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; }
+        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
     },
     
     
@@ -410,7 +410,7 @@ window.ships = [
         name: "Flying Dutchman - Special ACTIVATED",
         thumb: 'ship_0033_c.png',
         description: 'Boosts ATK by 1.5x. Boosts EXP gained by 1.5x. ACTIVATED Special: Reduces the defense of all enemies by 25% for 1 turn (cooldown: 16 turns).',
-        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; }
+        atk: function(p) { return [ 1.2, 1.2, 1.3, 1.3, 1.4, 1.4, 1.4, 1.4, 1.4, 1.5 ][p.boatLevel - 1]; },
     },
     
     
@@ -444,7 +444,7 @@ window.ships = [
     
     
     { //34
-        name: "Zunisha",
+        name: "Zunisha", //Levels are placeholders, specific boost of each one is unkown 
         thumb: null,
         description: 'Boost ATK of Powerhouse and Cerebral units by 1.55x and their HP by 1.25x, makes Perfects easier to hit, and makes TND and Meat orbs beneficial to Powerhouse and Cerebral units.',
         atk: function(p) {
@@ -452,7 +452,7 @@ window.ships = [
         },
         hp: function(p) {
             return !(p.unit.class.has('Powerhouse') || p.unit.class.has('Cerebral')) ? 1 : [ 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25 ][p.boatLevel - 1];
-        }
-    }
+        },
+    },
 
 ];

From 128749fefb3ffdfd69e112ca696329042d24072f Mon Sep 17 00:00:00 2001
From: JNathwani <JNathwani@users.noreply.github.com>
Date: Tue, 21 Nov 2017 11:46:43 -0500
Subject: [PATCH 1569/1569] Revert "Merge pull request #168 from
 Intervencion/patch-40"

This reverts commit 103e2c222dd743bf8402150953a40371ccc6605b, reversing
changes made to 2c22c077fc751159ab1af2b941871470eb3ba28b.
---
 common/data/cooldowns.js | 36 ++++++++++++++++++------------------
 common/data/details.js   | 38 ++++++++++----------------------------
 common/data/units.js     | 20 ++++++++++----------
 3 files changed, 38 insertions(+), 56 deletions(-)

diff --git a/common/data/cooldowns.js b/common/data/cooldowns.js
index ced0670d5..a05aa1906 100644
--- a/common/data/cooldowns.js
+++ b/common/data/cooldowns.js
@@ -1556,7 +1556,7 @@ window.cooldowns = [
     [ 16, 7 ],
     20,
     [ 12, 6 ],
-    20,
+    [ 20, 12 ],
     [ 19, 14 ],
     [ 11, 5 ],
     [ 23, 17 ],
@@ -1850,32 +1850,22 @@ window.cooldowns = [
     [ 14, 14 ],
     [ 13, 13 ],
     [ 13, 13 ],
-    [ 37, 15 ],
-    [ 37, 15 ],
+    [ 37, 30 ],
+    [ 37, 30 ],
     [ 20, 13 ],
     [ 20, 13 ],
-    [ 14, 7 ],
-    [ 14, 7 ],
+    [ null, 7 ],
+    [ null, 7 ],
     [ 18, 14 ],
     [ 18, 14 ],
-    null,
-    null,
+    [ 30, 15 ],
+    [ 30, 15 ],
     null,
     null,
     [ 22, 15 ],
     [ 22, 15 ],
     [ 24, 17 ],
     [ 24, 17 ],
-    [ 18, 13 ],
-    [ 18, 13 ],
-    [ 17, 10 ],
-    [ 17, 10 ],
-    [ 20, 14 ],
-    [ 20, 14 ],
-    [ 14, 9 ],
-    [ 14, 9 ],
-    [ 16, 9 ],
-    [ 16, 9 ],
     null,
     null,
     null,
@@ -1998,6 +1988,16 @@ window.cooldowns = [
     null,
     null,
     null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    null,
+    [ 30, 16 ],
     [ 30, 16 ],
-    [ 30, 16 ]
 ];
diff --git a/common/data/details.js b/common/data/details.js
index ab4f200bf..db31deae3 100644
--- a/common/data/details.js
+++ b/common/data/details.js
@@ -13901,34 +13901,16 @@ window.details = {
         special: "Reduces Special Cooldown of Slasher and Free Spirit characters by 1 turn and changes adjacent orbs into Matching Orbs",
         specialName: "Poof [Neo]",
     },
-    1869: {//Fujitora V2
-        captain: "Increases damage taken slightly, boosts slashers attack by 3.25x and hp by 1.2x, boosts slashers attack by a further 1.3x following a chain of good, great, perfect. Total boost: 4.225x",
-        special: "Deal 20x characters damage in typeless damage to random enemies 10 times, if this character is your captain, change all orbs to matching, delay all enemies by one turn",
-        limit: "This character has a limit break path"
-    },
-    1871: {//Bellamy RR
-        captain: "2.25x driven ATK",
-        sailor: "1.1x damage to INT enemies",
-        special: "Remove 50% hp of team, deal 10x the amount removed to one enemy in typeless damage, remove three turns of threshold/attack up/defence up on one enemy, changes own slot to psy",
-        limit: "This character has a limit break path"
-    },
-    1873: {//Kyros RR
-        captain: "2.25x striker/slasher attack damage",
-        sailor: "2x attack addition on tap",
-        special: "30x attack damage in str damage to one enemy, recover two turns of despair/chain, boosts slashers attack by 1.75x for 3 turns",
-        limit: "This character has a limit break path"
-    },
-    1875: {//Violet RR
-        captain: "2.5x Belis",
-        sailor: "Avoid special seal",
-        special: "Change meat/block/empty/tandem to matching orbs, removes two turns of paralyze/special seal, adds 0.5x to chain multiplier for one turn",
-        limit: "This character has a limit break path"
-    },
-    1877: {//Rebecca RR
-        captain: "2x slashers attack and 10% damage reduction",
-        sailor: "Treat str orbs as matching",
-        special: "50000 fixed damage to one enemy, recover 5 turns of chain lock/cap, change neighbouring orbs to matching",
-        limit: "This character has a limit break path"
+    1865: {//Urouge FN
+        captain: "Striker Characters ATK 1.75x, protects from defeat as long as HP is above a certain percent",
+        captainNotes: "PERFECT hits don't count, it has to GREAT hits",
+        special: "Recover 5000 HP, for 1 turn boost ATK by 1.5x for Striker Characters, if you hit 4 or more GREAT this turn boost ATK by 1.75x for Striker Characters the next turn",
+        specialName: "Culling the Criminals from this Earthly World"
+    },
+    1867: {//Hawkins FN
+        captain: "Cerebral Characters ATK 2x, boost chain multiplier by 1.5x",
+        special: "Cut HP of all enemies by 10%, for 3 turns cut HP of all enemies by 10%, reduce incoming damage by 40%",
+        specialName: "Fortune-Telling from the Shadow of Death"
     },
     2000: {//Rayleigh
         captain: "Boosts ATK of Slasher and Cerebral characters by 2x",
diff --git a/common/data/units.js b/common/data/units.js
index 0be3fa6f7..33fe2cdd4 100644
--- a/common/data/units.js
+++ b/common/data/units.js
@@ -1866,16 +1866,16 @@ window.units = [
     [ "\"Mad Monk\" Urouge, Supernova", "DEX", [ "Striker", "Free Spirit" ], 4, 20, 4, 4, 99, null, 1, 1, 1, 2036, 1311, 204, null ],
     [ "Basil Hawkins, Supernova", "QCK", [ "Slasher", "Cerebral" ], 3, 13, null, null, null, null, null, null, null, null, null, null, null ],
     [ "\"The Magician\" Basil Hawkins, Supernova ", "QCK", [ "Striker", "Cerebral" ], 4, 20, 7, 4, 99, null, 1, 1, 1, 2078, 1079, 287, null ],
-    [ "Fujitora", "INT", [ "Slasher", "Powerhouse" ], 5, 30, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Fujitora evo", "INT", [ "Slasher", "Powerhouse" ], 6, 55, 6, 5, 99, null, 1, 1, 1, 3222, 1576, 344, null ],
-    [ "Bellamy", "PSY", [ "Driven", "Fighter" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Bellamy evo", "PSY", [ "Driven", "Fighter" ], 5, 30, 4, 4, 99, null, 1, 1, 1, 3020, 1408, 292, null ],
-    [ "Kyros", "STR", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Kyros evo", "STR", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, null, 1, 1, 1, 2620, 1496, 301, null ],
-    [ "Violet", "QCK", [ "Slasher", "Cerebral" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Violet evo", "QCK", [ "Slasher", "Cerebral" ], 5, 30, 6, 4, 99, null, 1, 1, 1, 1999, 1099, 446, null ],
-    [ "Rebecca", "DEX", [ "Slasher", "Striker" ], 4, 15, null, null, null, null, null, null, null, null, null, null, null ],
-    [ "Rebecca evo", "DEX", [ "Slasher", "Striker" ], 5, 30, 4, 4, 99, null, 1, 1, 1, 2051, 1203, 403, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
+    [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],
     [ "", "Type", [ "Class1", "Class2" ], null, null, null, null, null, null, null, null, null, null, null, null, null ],